Merge pull request #25 from lorchrob/polymorphism

Polymorphism
kind2-mc · Aug 1, 2024 · 336ed06 · 336ed06
2 parents 92e7b6b + 439fe1d
commit 336ed06
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 622 deletions.
diff --git a/syntaxes/lustre.tmLanguage.json b/syntaxes/lustre.tmLanguage.json
@@ -480,8 +480,19 @@
         },
         {
           "comment": "User-defined type.",
-          "name": "support.type.lustre",
-          "match": "\\w+"
+          "match": "(\\w+)\\s*(<<[^>]+>>)?",
+          "captures": { 
+            "1" : {
+              "name": "support.type.lustre"
+            },
+            "2" : {
+              "patterns": [
+                {
+                  "include": "#type"
+                }
+              ]
+            }
+          }
         }
       ]
     },
@@ -546,6 +557,9 @@
           "name": "entity.name.function.lustre",
           "match": "\\w+"
         },
+        {
+          "include": "#typeArgs"
+        },
         {
           "begin": "\\(",
           "end": "\\)",
@@ -727,10 +741,17 @@
         },
         {
           "comment": "Node / function call",
-          "begin": "(\\w+)\\s*\\(",
+          "begin": "(\\w+)\\s*(<<[^>]+>>)?\\s*\\(",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#type"
+                }
+              ]
             }
           },
           "end": "\\)",
@@ -1049,6 +1070,18 @@
         }
       ]
     },
+    "typeArgs": {
+      "begin": "<<",
+      "end": ">>",
+      "patterns": [
+        {
+          "include": "#type"
+        },
+        {
+          "include": "#comment"
+        }
+      ]
+    },
     "typeDeclRhs": {
       "patterns": [
         {
@@ -1128,6 +1161,9 @@
           "name": "support.type.lustre",
           "match": "\\w+"
         },
+        {
+          "include": "#typeArgs"
+        },
         {
           "begin": "=",
           "end": "(?=;)",