feat: add support for old property syntax.

This syntax is deprecated as far as I can tell, however matlab code tends to have a long shelf life.
acristoffers · Aug 19, 2024 · 8365c94 · 8365c94
1 parent ad1c471
commit 8365c94
Show file tree

Hide file tree

Showing 5 changed files with 20,262 additions and 20,093 deletions.
diff --git a/grammar.js b/grammar.js
@@ -620,16 +620,29 @@ module.exports = grammar({
         ),
       ),
     property: ($) =>
-      seq(
-        field(
-          'name',
-          choice($.identifier, $.property_name, $.ignored_argument),
+      choice(
+        seq(
+          field(
+            'name',
+            choice($.identifier, $.property_name, $.ignored_argument),
+          ),
+          optional($.dimensions),
+          optional(choice($.identifier, $.property_name)),
+          optional($.validation_functions),
+          optional($.default_value),
+          $._end_of_line,
         ),
-        optional($.dimensions),
-        optional(choice($.identifier, $.property_name)),
-        optional($.validation_functions),
-        optional($.default_value),
-        $._end_of_line,
+        seq(
+          field(
+            'name',
+            choice($.identifier, $.property_name, $.ignored_argument),
+          ),
+          '@',
+          $.identifier,
+          optional(choice('vector', 'matrix', 'scalar')),
+          optional($.default_value),
+          $._end_of_line,
+        )
       ),
     properties: ($) =>
       seq(

diff --git a/src/grammar.json b/src/grammar.json
@@ -3223,89 +3223,169 @@
       }
     },
     "property": {
-      "type": "SEQ",
+      "type": "CHOICE",
       "members": [
         {
-          "type": "FIELD",
-          "name": "name",
-          "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "identifier"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "property_name"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "ignored_argument"
-              }
-            ]
-          }
-        },
-        {
-          "type": "CHOICE",
+          "type": "SEQ",
           "members": [
             {
-              "type": "SYMBOL",
-              "name": "dimensions"
+              "type": "FIELD",
+              "name": "name",
+              "content": {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "identifier"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "property_name"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "ignored_argument"
+                  }
+                ]
+              }
             },
             {
-              "type": "BLANK"
-            }
-          ]
-        },
-        {
-          "type": "CHOICE",
-          "members": [
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "dimensions"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "SYMBOL",
+                      "name": "identifier"
+                    },
+                    {
+                      "type": "SYMBOL",
+                      "name": "property_name"
+                    }
+                  ]
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
             {
               "type": "CHOICE",
               "members": [
                 {
                   "type": "SYMBOL",
-                  "name": "identifier"
+                  "name": "validation_functions"
                 },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "CHOICE",
+              "members": [
                 {
                   "type": "SYMBOL",
-                  "name": "property_name"
+                  "name": "default_value"
+                },
+                {
+                  "type": "BLANK"
                 }
               ]
             },
             {
-              "type": "BLANK"
+              "type": "SYMBOL",
+              "name": "_end_of_line"
             }
           ]
         },
         {
-          "type": "CHOICE",
+          "type": "SEQ",
           "members": [
             {
-              "type": "SYMBOL",
-              "name": "validation_functions"
+              "type": "FIELD",
+              "name": "name",
+              "content": {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "identifier"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "property_name"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "ignored_argument"
+                  }
+                ]
+              }
             },
             {
-              "type": "BLANK"
-            }
-          ]
-        },
-        {
-          "type": "CHOICE",
-          "members": [
+              "type": "STRING",
+              "value": "@"
+            },
             {
               "type": "SYMBOL",
-              "name": "default_value"
+              "name": "identifier"
             },
             {
-              "type": "BLANK"
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": "vector"
+                    },
+                    {
+                      "type": "STRING",
+                      "value": "matrix"
+                    },
+                    {
+                      "type": "STRING",
+                      "value": "scalar"
+                    }
+                  ]
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "default_value"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "SYMBOL",
+              "name": "_end_of_line"
             }
           ]
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_end_of_line"
         }
       ]
     },
@@ -3950,3 +4030,4 @@
   "inline": [],
   "supertypes": []
 }
+
diff --git a/src/node-types.json b/src/node-types.json
@@ -3475,6 +3475,10 @@
     "type": "line_continuation",
     "named": true
   },
+  {
+    "type": "matrix",
+    "named": false
+  },
   {
     "type": "methods",
     "named": false
@@ -3503,6 +3507,10 @@
     "type": "return_statement",
     "named": true
   },
+  {
+    "type": "scalar",
+    "named": false
+  },
   {
     "type": "set.",
     "named": false
@@ -3523,6 +3531,10 @@
     "type": "try",
     "named": false
   },
+  {
+    "type": "vector",
+    "named": false
+  },
   {
     "type": "while",
     "named": false