Merge branch 'issue_778' into 'master'

Unparsing: add configuration for BinOp, UnOp, ConcatOp and RelationOp Closes #1341 See merge request eng/libadalang/libadalang!1612
AdaCore · May 7, 2024 · 300bb9a · 300bb9a
2 parents 0791661 + ead8e31
commit 300bb9a
Show file tree

Hide file tree

Showing 38 changed files with 5,378 additions and 4,745 deletions.
diff --git a/extensions/default_unparsing_config.json b/extensions/default_unparsing_config.json
@@ -1071,10 +1071,13 @@
             "kind": "recurse_field",
             "field": "f_operator"
           },
-          "line",
+          "whitespace",
           {
-            "kind": "recurse_field",
-            "field": "f_operand"
+            "kind": "innerRoot",
+            "contents": {
+              "kind": "recurse_field",
+              "field": "f_operand"
+            }
           }
         ]
       }
@@ -1085,30 +1088,6 @@
         "recurse"
       ]
     },
-    "ConstrainedArrayIndices": {
-      "node": {
-        "kind": "align",
-        "width": 1,
-        "contents": {
-          "kind": "group",
-          "document": [
-            {
-              "kind": "innerRoot",
-              "contents": {
-                "kind": "recurse_field",
-                "field": "f_list"
-              }
-            }
-          ]
-        }
-      }
-    },
-    "ConstraintList": {
-      "sep": [
-        "recurse",
-        "line"
-      ]
-    },
     "ContractCases": {
       "node": {
         "kind": "group",
@@ -1263,6 +1242,30 @@
         ]
       }
     },
+    "ConstrainedArrayIndices": {
+      "node": {
+        "kind": "align",
+        "width": 1,
+        "contents": {
+          "kind": "group",
+          "document": [
+            {
+              "kind": "innerRoot",
+              "contents": {
+                "kind": "recurse_field",
+                "field": "f_list"
+              }
+            }
+          ]
+        }
+      }
+    },
+    "ConstraintList": {
+      "sep": [
+        "recurse",
+        "line"
+      ]
+    },
     "DecimalFixedPointDef": {
       "node": {
         "kind": "group",
@@ -3770,6 +3773,30 @@
         ]
       }
     },
+    "OpAbs": {
+      "node": {
+        "kind": "group",
+        "document": [
+          {
+            "kind": "text",
+            "text": "abs"
+          },
+          "whitespace"
+        ]
+      }
+    },
+    "OpNot": {
+      "node": {
+        "kind": "group",
+        "document": [
+          {
+            "kind": "text",
+            "text": "not"
+          },
+          "whitespace"
+        ]
+      }
+    },
     "OrdinaryFixedPointDef": {
       "node": {
         "kind": "group",
@@ -4779,6 +4806,30 @@
         }
       }
     },
+    "RelationOp": {
+      "node": {
+        "kind": "group",
+        "document": [
+          {
+            "kind": "recurse_field",
+            "field": "f_left"
+          },
+          "line",
+          {
+            "kind": "recurse_field",
+            "field": "f_op"
+          },
+          "whitespace",
+          {
+            "kind": "innerRoot",
+            "contents": {
+              "kind": "recurse_field",
+              "field": "f_right"
+            }
+          }
+        ]
+      }
+    },
     "ReturnStmt": {
       "node": {
         "kind": "align",
@@ -5485,6 +5536,24 @@
         ]
       }
     },
+    "UnOp": {
+      "node": {
+        "kind": "group",
+        "document": [
+          {
+            "kind": "recurse_field",
+            "field": "f_op"
+          },
+          {
+            "kind": "innerRoot",
+            "contents": {
+              "kind": "recurse_field",
+              "field": "f_expr"
+            }
+          }
+        ]
+      }
+    },
     "Variant": {
       "node": [
         {
@@ -5678,4 +5747,4 @@
       }
     }
   }
-}
+}
diff --git a/testsuite/tests/unparsing/bin_op/doc-baseline.json b/testsuite/tests/unparsing/bin_op/doc-baseline.json
@@ -260,4 +260,4 @@
     "break": false,
     "expandedStates": null
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -260,4 +260,4 @@ @@
         "break": false,
         "expandedStates": null
       }
-    }
+    }