Merge branch 'issue_1292' into 'master'

Unparsing: add config for GenericSubpDecl Closes #1292 See merge request eng/libadalang/libadalang!1557
AdaCore · Feb 29, 2024 · 210e57d · 210e57d
2 parents 9a16f76 + f13511b
commit 210e57d
Show file tree

Hide file tree

Showing 9 changed files with 1,524 additions and 0 deletions.
diff --git a/extensions/default_unparsing_config.json b/extensions/default_unparsing_config.json
@@ -1,5 +1,11 @@
 {
   "node_configs": {
+    "AdaNodeList": {
+      "sep": [
+        "recurse",
+        "line"
+      ]
+    },
     "ArrayTypeDef": {
       "node": {
         "kind": "group",
@@ -235,6 +241,52 @@
         "line"
       ]
     },
+    "ConcreteFormalSubpDecl": {
+      "node": {
+        "kind": "align",
+        "width": 2,
+        "contents": {
+          "kind": "group",
+          "document": [
+            {
+              "kind": "text",
+              "text": "with"
+            },
+            "line",
+            {
+              "kind": "recurse_field",
+              "field": "f_overriding"
+            },
+            {
+              "kind": "recurse_field",
+              "field": "f_subp_spec"
+            },
+            {
+              "kind": "recurse_field",
+              "field": "f_default_expr"
+            },
+            {
+              "kind": "align",
+              "width": 2,
+              "contents": {
+                "kind": "recurse_field",
+                "field": "f_aspects"
+              }
+            },
+            {
+              "kind": "text",
+              "text": ";"
+            }
+          ]
+        }
+      },
+      "fields": {
+        "f_default_expr": [
+          "whitespace",
+          "recurse"
+        ]
+      }
+    },
     "ConcreteTypeDecl": {
       "node": {
         "kind": "align",
@@ -454,6 +506,62 @@
         ]
       }
     },
+    "GenericFormalPart": {
+      "node": {
+        "kind": "group",
+        "document": [
+          {
+            "kind": "text",
+            "text": "generic"
+          },
+          {
+            "kind": "indent",
+            "contents": [
+              "hardline",
+              {
+                "kind": "group",
+                "break": true,
+                "document": {
+                  "kind": "recurse_field",
+                  "field": "f_decls"
+                }
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "GenericFormalSubpDecl": {
+      "node": {
+        "kind": "group",
+        "document": [
+          {
+            "kind": "recurse_field",
+            "field": "f_decl"
+          }
+        ]
+      }
+    },
+    "GenericSubpDecl": {
+      "node": {
+        "kind": "group",
+        "document": [
+          {
+            "kind": "recurse_field",
+            "field": "f_formal_part"
+          },
+          "hardline",
+          {
+            "kind": "recurse_field",
+            "field": "f_subp_decl"
+          },
+          {
+            "kind": "text",
+            "text": ";"
+          }
+        ]
+      }
+    },
     "IfStmt": {
       "node": {
         "kind": "group",

diff --git a/testsuite/tests/unparsing/generic_subp_decl/empty_formal_part/doc-baseline.json b/testsuite/tests/unparsing/generic_subp_decl/empty_formal_part/doc-baseline.json
diff --git a/testsuite/tests/unparsing/generic_subp_decl/empty_formal_part/input.ada b/testsuite/tests/unparsing/generic_subp_decl/empty_formal_part/input.ada
@@ -0,0 +1,6 @@
+generic
+function Perform_Comparison_Check
+  (Comparing_Value : Foo_Bar_Baz;
+   Rule_Value : Foo_Bar_Baz;
+   Logic_Operator : Unbounded_String)
+   return Boolean;
diff --git a/testsuite/tests/unparsing/generic_subp_decl/empty_formal_part/test.out b/testsuite/tests/unparsing/generic_subp_decl/empty_formal_part/test.out
@@ -0,0 +1,5 @@
+generic
+function Perform_Comparison_Check
+  (Comparing_Value : Foo_Bar_Baz;
+   Rule_Value : Foo_Bar_Baz;
+   Logic_Operator : Unbounded_String) return Boolean;
diff --git a/testsuite/tests/unparsing/generic_subp_decl/empty_formal_part/test.yaml b/testsuite/tests/unparsing/generic_subp_decl/empty_formal_part/test.yaml
@@ -0,0 +1,11 @@
+driver: unparser
+rule: generic_decl
+description: |
+  Test that there is no line break between the keywords `generic` and
+  `function`.
+control:
+  - [
+      XFAIL,
+      "True",
+      "https://gitlab.adacore-it.com/eng/libadalang/langkit/-/issues/760",
+    ]
diff --git a/testsuite/tests/unparsing/generic_subp_decl/non_empty_formal_part/doc-baseline.json b/testsuite/tests/unparsing/generic_subp_decl/non_empty_formal_part/doc-baseline.json
diff --git a/testsuite/tests/unparsing/generic_subp_decl/non_empty_formal_part/input.ada b/testsuite/tests/unparsing/generic_subp_decl/non_empty_formal_part/input.ada
@@ -0,0 +1,8 @@
+generic
+   type Foo_Bar_Baz is private;
+   with function ">" (Left_Left_Left_Left_Left : Foo_Bar_Baz; Right_Right_Right_Right_Right : Foo_Bar_Baz) return Boolean is <>;
+function Perform_Comparison_Check
+  (Comparing_Value : Foo_Bar_Baz;
+   Rule_Value : Foo_Bar_Baz;
+   Logic_Operator : Unbounded_String)
+   return Boolean;
diff --git a/testsuite/tests/unparsing/generic_subp_decl/non_empty_formal_part/test.out b/testsuite/tests/unparsing/generic_subp_decl/non_empty_formal_part/test.out
@@ -0,0 +1,10 @@
+generic
+   type Foo_Bar_Baz is private;
+   with
+     function ">"
+       (Left_Left_Left_Left_Left : Foo_Bar_Baz;
+        Right_Right_Right_Right_Right : Foo_Bar_Baz) return Boolean is <>;
+function Perform_Comparison_Check
+  (Comparing_Value : Foo_Bar_Baz;
+   Rule_Value : Foo_Bar_Baz;
+   Logic_Operator : Unbounded_String) return Boolean;
diff --git a/testsuite/tests/unparsing/generic_subp_decl/non_empty_formal_part/test.yaml b/testsuite/tests/unparsing/generic_subp_decl/non_empty_formal_part/test.yaml
@@ -0,0 +1,4 @@
+driver: unparser
+rule: generic_decl
+description: |
+  Test that each generic formal declaration is in its own line.