Merge branch 'mku/protected_types' into 'master'

Adding ProtectedTypes configuration Closes #1328, #1336, and #1335 See merge request eng/libadalang/libadalang!1590
AdaCore · Mar 27, 2024 · 0d83388 · 0d83388
2 parents 4efb1b4 + a8271ea
commit 0d83388
Show file tree

Hide file tree

Showing 50 changed files with 26,121 additions and 20,130 deletions.
diff --git a/extensions/default_unparsing_config.json b/extensions/default_unparsing_config.json
@@ -1021,6 +1021,88 @@
         ]
       }
     },
+    "EntryBody": {
+      "node": {
+        "kind": "group",
+        "document": [
+          {
+            "kind": "text",
+            "text": "entry"
+          },
+          "whitespace",  
+          {
+            "kind": "recurse_field",
+            "field": "f_entry_name"
+          },
+          {
+            "kind": "recurse_field",
+            "field": "f_index_spec"
+          },
+          {
+            "kind": "recurse_field",
+            "field": "f_params"
+          },
+          {
+            "kind": "recurse_field",
+            "field": "f_aspects"
+          },
+          "whitespace",
+          {
+            "kind": "text",
+            "text": "when"
+          }, 
+          {
+            "kind": "recurse_field",
+            "field": "f_barrier"
+          },
+          "hardlineWithoutBreakParent",
+          {
+            "kind": "text",
+            "text": "is"
+          },
+          {
+            "kind": "recurse_field",
+            "field": "f_decls"
+          },
+          {
+            "kind": "text",
+            "text": "begin"
+          },
+          {
+            "kind": "recurse_field",
+            "field": "f_stmts"
+          },
+          "hardlineWithoutBreakParent",
+          {
+            "kind": "text",
+            "text": "end"
+          },
+          {
+            "kind": "recurse_field",
+            "field": "f_end_name"
+          },
+          {
+            "kind": "text",
+            "text": ";"
+          }
+        ]
+      },
+      "fields": {
+        "f_aspects": [
+          "hardline",
+          "recurse"
+        ],
+        "f_decls": [
+          {
+            "kind": "indent",
+            "contents": [
+              "recurse"
+            ]
+          },
+          "hardlineWithoutBreakParent"
+        ]
+      }
+    },
     "EnumLiteralDeclList": {
       "sep": [
         "recurse",
@@ -2905,6 +2987,183 @@
         "hardline"
       ]
     },
+    "ProtectedBody": {
+      "node": [
+        {
+          "kind": "group",
+          "document": [
+            {
+              "kind": "text",
+              "text": "protected"
+            },
+            "whitespace",
+            {
+              "kind": "text",
+              "text": "body"
+            },
+            "whitespace",
+            {
+              "kind": "recurse_field",
+              "field": "f_name"
+            },
+            {
+              "kind": "recurse_field",
+              "field": "f_aspects"
+            },
+            "line",
+            {
+              "kind": "text",
+              "text": "is"
+            }
+          ]
+        },
+        {
+          "kind": "indent",
+          "contents": [
+            {
+              "kind": "recurse_field",
+              "field": "f_decls"
+            }
+          ]
+        },
+        "hardline",
+        {
+          "kind": "text",
+          "text": "end"
+        },
+        {
+          "kind": "recurse_field",
+          "field": "f_end_name"
+        },
+        {
+          "kind": "text",
+          "text": ";"
+        }
+      ],
+      "fields": {
+        "f_aspects": {
+          "kind": "align",
+          "width": 2,
+          "contents": [
+            "hardline",
+            "recurse"
+          ]
+        }
+      }
+    },
+    "ProtectedDef": {
+      "node": {
+        "kind": "group",
+        "document": [
+          {
+            "kind": "indent",
+            "contents": [
+              {
+                "kind": "recurse_field",
+                "field": "f_public_part"
+              } 
+            ] 
+          },
+          "hardline",
+          {
+            "kind": "recurse_field",
+            "field": "f_private_part"
+          },
+          {
+            "kind": "text",
+            "text": "end"
+          },  
+          "whitespace",
+          {
+            "kind": "recurse_field",
+            "field": "f_end_name"
+          }
+        ]
+      },
+      "fields": {
+        "f_private_part": {
+          "kind": "ifEmpty",
+          "then": "recurse",
+          "else": [
+            {
+              "kind": "indent",
+              "contents": "recurse"
+            },
+            "hardline"
+          ]
+        }
+      }
+    },
+    "ProtectedTypeDecl": {
+      "node": {
+        "kind": "group",
+        "document": [
+          {
+            "kind": "group",
+            "document": [
+              {
+                "kind": "text",
+                "text": "protected"
+              },
+              {
+                "kind": "text",
+                "text": "type"
+              },
+              "whitespace",
+              {
+                "kind": "recurse_field",
+                "field": "f_name"
+              },
+              {
+                "kind": "recurse_field",
+                "field": "f_discriminants"
+              },
+              {
+                "kind": "recurse_field",
+                "field": "f_aspects"
+              },
+              "line",  
+              {
+                "kind": "text",
+                "text": "is"
+              }
+            ]
+          },  
+          {
+            "kind": "group",
+            "document": [
+              {
+                "kind": "recurse_field",
+                "field": "f_interfaces"
+              }
+            ]
+          },
+          {
+            "kind": "recurse_field",
+            "field": "f_definition"
+          },
+          {
+            "kind": "text",
+            "text": ";"
+          }
+        ]
+      },
+      "fields": {
+        "f_discriminants": {
+          "kind": "align",
+          "width": 2,
+          "contents": "recurse"
+        },
+        "f_aspects": {
+          "kind": "align",
+          "width": 2,
+          "contents": [
+            "hardline",
+            "recurse"
+          ]
+        }
+      }
+    },
     "RangeSpec": {
       "node": {
         "kind": "align",
@@ -3027,6 +3286,63 @@
         "field": "f_range"
       }
     },
+    "SingleProtectedDecl": {
+      "node": {
+        "kind": "group",
+        "document": [
+          {
+            "kind": "group",
+            "document": [
+              {
+                "kind": "text",
+                "text": "protected"
+              },
+              "whitespace",
+              {
+                "kind": "recurse_field",
+                "field": "f_name"
+              },
+              {
+                "kind": "recurse_field",
+                "field": "f_aspects"
+              },
+              "line",  
+              {
+                "kind": "text",
+                "text": "is"
+              }
+            ]
+          },  
+          {
+            "kind": "group",
+            "document": [
+              {
+                "kind": "recurse_field",
+                "field": "f_interfaces"
+              }
+            ]
+          },
+          {
+            "kind": "recurse_field",
+            "field": "f_definition"
+          },
+          {
+            "kind": "text",
+            "text": ";"
+          }
+        ]
+      },
+      "fields": {
+        "f_aspects": {
+          "kind": "align",
+          "width": 2,
+          "contents": [
+            "hardline",
+            "recurse"
+          ]
+        }
+      }
+    },  
     "StmtList": {
       "sep": [
         "recurse",
@@ -3147,7 +3463,6 @@
               "kind": "recurse_field",
               "field": "f_subp_name"
             },
-            "line",
             {
               "kind": "group",
               "document": [
@@ -3180,6 +3495,14 @@
               "recurse"
             ]
           }
+        },
+        "f_subp_params": {
+          "kind": "ifEmpty",
+          "then": "recurse",
+          "else": [
+            "line", 
+            "recurse"
+          ]
         }
       }
     },