TM: Optimize operator regex

Author: cbuttner

syntaxes/c3.tmLanguage.json

@@ -752,6 +752,9 @@
               },
               "end": "(?=;)",
               "patterns": [
+                {
+                  "include": "#attribute"
+                },
                 {
                   "include": "#expression"
                 }
@@ -853,11 +856,11 @@
           "name": "keyword.declaration.function.arrow.c3"
         },
         {
-          "match": "\\+=|-=|\\*=|/=|%=|&=|\\|=|\\^=|>>=|<<=",
+          "match": "(?:[-%&*+/^|]|>>|<<)=",
           "name": "keyword.operator.assignment.augmented.c3"
         },
         {
-          "match": "<=|>=|==|<|>|\\!=",
+          "match": "<=|>=|==|<|>|!=",
           "name": "keyword.operator.comparison.c3"
         },
         {
@@ -877,15 +880,15 @@
           "name": "keyword.operator.arithmetic.c3"
         },
         {
-          "match": "\\+|\\-|/|%|\\||\\^|~",
+          "match": "[-%+/^|~]",
           "name": "keyword.operator.arithmetic.c3"
         },
         {
           "match": "=",
           "name": "keyword.operator.assignment.c3"
         },
         {
-          "match": "!|\\?[?:]?|\\*|&|:",
+          "match": "!|\\?[?:]?|[&*:]",
           "name": "keyword.operator.c3"
         }
       ]
@@ -923,6 +926,10 @@
         }
       ]
     },
+    "escape_sequence": {
+      "match": "\\\\([0abefnrtv'\"\\\\]|x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})",
+      "name": "constant.character.escape.c3"
+    },
     "char_literal": {
       "begin": "'",
       "beginCaptures": {
@@ -939,8 +946,7 @@
       "contentName": "string.quoted.single.c3",
       "patterns": [
         {
-          "match": "\\\\.",
-          "name": "constant.character.escape.c3"
+          "include": "#escape_sequence"
         }
       ]
     },
@@ -960,8 +966,7 @@
       "contentName": "string.quoted.double.c3",
       "patterns": [
         {
-          "match": "\\\\([0abefnrtv'\"\\\\]|x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})",
-          "name": "constant.character.escape.c3"
+          "include": "#escape_sequence"
         }
       ]
     },
@@ -1258,13 +1263,13 @@
     "attribute": {
       "patterns": [
         {
-          "begin": "@(?:(?:align|benchmark|bigendian|builtin|callconv|compact|const|deprecated|dynamic|export|extern|finalizer|format|if|inline|init|link|littleendian|local|maydiscard|naked|noalias|nodiscard|noinit|noinline|nopadding|norecurse|noreturn|nosanitize|nostrip|obfuscate|operator|operator_r|operator_s|optional|overlap|packed|private|public|pure|reflect|safemacro|section|tag|test|unused|used|wasm|weak|winmain)|(?:\\b_*[A-Z][_A-Z0-9]*[a-z][_a-zA-Z0-9]*\\b))",
+          "begin": "@(?:(?:align|benchmark|bigendian|builtin|callconv|compact|const|deprecated|dynamic|export|extern|finalizer|format|if|inline|init|link|littleendian|local|maydiscard|naked|noalias|nodiscard|noinit|noinline|nopadding|norecurse|noreturn|nosanitize|nostrip|obfuscate|operator|operator_r|operator_s|optional|overlap|packed|private|public|pure|reflect|safemacro|section|tag|test|unused|used|wasm|weak|winmain)\\b|(?:\\b_*[A-Z][_A-Z0-9]*[a-z][_a-zA-Z0-9]*\\b))",
           "beginCaptures": {
             "0": {
               "name": "keyword.annotation.c3"
             }
           },
-          "end": "(?=[^\\s\\(])|(?<=\\))",
+          "end": "(?=[^\\s(])|(?<=\\))",
           "name": "meta.annotation.c3",
           "patterns": [
             {
@@ -1424,6 +1429,9 @@
         {
           "include": "#control_statements"
         },
+        {
+          "include": "#attribute"
+        },
         {
           "include": "#block"
         },
@@ -1433,12 +1441,9 @@
       ]
     },
     "variable": {
-      "begin": "(?<!#)(?:(@(?:\\b_*[a-z][_a-zA-Z0-9]*\\b))|(\\$?(?:\\b_*[a-z][_a-zA-Z0-9]*\\b)))",
+      "begin": "(?<!#)(\\$?(?:\\b_*[a-z][_a-zA-Z0-9]*\\b))",
       "beginCaptures": {
         "1": {
-          "name": "entity.name.function.c3"
-        },
-        "2": {
           "name": "variable.other.c3"
         }
       },
@@ -1449,6 +1454,28 @@
         }
       ]
     },
+    "leftover_at_ident": {
+      "patterns": [
+        {
+          "match": "@(?:pure|inline|noinline)",
+          "name": "meta.annotation.c3 keyword.annotation.c3"
+        },
+        {
+          "begin": "@(?:\\b_*[a-z][_a-zA-Z0-9]*\\b)",
+          "beginCaptures": {
+            "0": {
+              "name": "entity.name.function.c3"
+            }
+          },
+          "end": "(?=[^{\\s])|(?<=\\})",
+          "patterns": [
+            {
+              "include": "#generic_params"
+            }
+          ]
+        }
+      ]
+    },
     "expression": {
       "patterns": [
         {
@@ -1478,9 +1505,6 @@
         {
           "include": "#path"
         },
-        {
-          "include": "#attribute"
-        },
         {
           "include": "#function_call"
         },
@@ -1498,6 +1522,9 @@
         },
         {
           "include": "#punctuation"
+        },
+        {
+          "include": "#leftover_at_ident"
         }
       ]
     },

syntaxes/c3.tmLanguage.yml

@@ -432,9 +432,9 @@ repository:
     patterns:
       - match: '=>'
         name: keyword.declaration.function.arrow.c3
-      - match: '\+=|-=|\*=|/=|%=|&=|\|=|\^=|>>=|<<='
+      - match: '(?:[-%&*+/^|]|>>|<<)='
         name: keyword.operator.assignment.augmented.c3
-      - match: '<=|>=|==|<|>|\!='
+      - match: '<=|>=|==|<|>|!='
         name: keyword.operator.comparison.c3
       - match: '\.\.\.'
         name: keyword.operator.variadic.c3
@@ -444,11 +444,11 @@ repository:
         name: keyword.operator.arithmetic.c3
       - match: '<<|>>|&&&?|\|\|\|?'
         name: keyword.operator.arithmetic.c3
-      - match: '\+|\-|/|%|\||\^|~'
+      - match: '[-%+/^|~]'
         name: keyword.operator.arithmetic.c3
       - match: '='
         name: keyword.operator.assignment.c3
-      - match: '!|\?[?:]?|\*|&|:'
+      - match: '!|\?[?:]?|[&*:]'
         name: keyword.operator.c3
 
   path: