Merge branch 'mku/MR_contract_cases' into 'master'

Unparsing: Add ContractCases, ContractCaseAssoc and ContractCaseAssocList configs Closes #1368 See merge request eng/libadalang/libadalang!1628
AdaCore · Apr 17, 2024 · 5e102bc · 5e102bc
2 parents 2807442 + 8386066
commit 5e102bc
Show file tree

Hide file tree

Showing 15 changed files with 1,737 additions and 10 deletions.
diff --git a/extensions/default_unparsing_config.json b/extensions/default_unparsing_config.json
@@ -429,10 +429,13 @@
           {
             "kind": "align",
             "width": 2,
-            "contents": {
-              "kind": "recurse_field",
-              "field": "f_expr"
-            }
+            "contents": [
+              "line",
+              {
+                "kind": "recurse_field",
+                "field": "f_expr"
+              }
+            ]
           },
           {
             "kind": "text",
@@ -1106,6 +1109,65 @@
         "line"
       ]
     },
+    "ContractCases": {
+      "node": {
+        "kind": "group",
+        "document": {
+          "kind": "align",
+          "width": 1,
+          "contents": [
+            {
+              "kind": "text",
+              "text": "("
+            },
+            {
+              "kind": "innerRoot",
+              "contents": {
+                "kind": "recurse_field",
+                "field": "f_contract_cases"
+              }
+            },
+            {
+              "kind": "text",
+              "text": ")"
+            }
+          ]
+        }
+      }
+    },
+    "ContractCaseAssoc": {
+      "node": {
+        "kind": "group",
+        "document": [
+          {
+            "kind": "recurse_field",
+            "field": "f_guard"
+          },
+          "whitespace",
+          {
+            "kind": "text",
+            "text": "=>"
+          },
+          {
+            "kind": "align",
+            "width": 2,
+            "contents": [
+              "line",
+              {
+                "kind": "recurse_field",
+                "field": "f_consequence"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "ContractCaseAssocList": {
+      "sep": [
+        "recurse",
+        "line"
+      ]
+    },
     "ConcreteFormalSubpDecl": {
       "node": {
         "kind": "align",

diff --git a/testsuite/tests/unparsing/attribute_def_clause/doc-baseline.json b/testsuite/tests/unparsing/attribute_def_clause/doc-baseline.json
@@ -1,11 +1,11 @@
 {
-  "id": 10,
+  "id": 11,
   "kind": "command",
   "command": {
     "command": "group",
     "id": 0,
     "groupContents": {
-      "id": 9,
+      "id": 10,
       "kind": "list",
       "list": [
         {
@@ -40,7 +40,7 @@
           "text": " use"
         },
         {
-          "id": 7,
+          "id": 8,
           "kind": "command",
           "command": {
             "command": "align",
@@ -49,20 +49,30 @@
               "n": 2
             },
             "alignContents": {
-              "id": 6,
+              "id": 7,
               "kind": "list",
               "list": [
                 {
                   "id": 5,
+                  "kind": "command",
+                  "command": {
+                    "command": "line",
+                    "literal": false,
+                    "soft": false,
+                    "hard": false
+                  }
+                },
+                {
+                  "id": 6,
                   "kind": "text",
-                  "text": " 16"
+                  "text": "16"
                 }
               ]
             }
           }
         },
         {
-          "id": 8,
+          "id": 9,
           "kind": "text",
           "text": ";"
         }