github-linguist 5.3.3 → 6.0.0

data/grammars/source.parrot.pir.json

@@ -1,94 +1,92 @@
 {
-  "fileTypes": [
-    "pir"
-  ],
-  "keyEquivalent": "^~P",
   "name": "Parrot PIR",
+  "scopeName": "source.parrot.pir",
   "patterns": [
     {
+      "name": "string.quoted.double.pir",
       "begin": "\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "name": "constant.character.escape.pir",
+          "match": "\\\\."
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.pir"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.pir"
         }
-      },
-      "name": "string.quoted.double.pir",
-      "patterns": [
-        {
-          "match": "\\\\.",
-          "name": "constant.character.escape.pir"
-        }
-      ]
+      }
     },
     {
+      "name": "string.quoted.single.pir",
       "begin": "'",
+      "end": "'",
+      "patterns": [
+        {
+          "name": "constant.character.escape.pir",
+          "match": "\\\\."
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.pir"
         }
       },
-      "end": "'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.pir"
         }
-      },
-      "name": "string.quoted.single.pir",
-      "patterns": [
-        {
-          "match": "\\\\.",
-          "name": "constant.character.escape.pir"
-        }
-      ]
+      }
     },
     {
-      "match": "\\b(print|save|restore)\\b",
-      "name": "support.function.pir"
+      "name": "support.function.pir",
+      "match": "\\b(print|save|restore)\\b"
     },
     {
-      "match": "(if|unless|goto|\\.return|\\.end|\\.emit|\\.eot)",
-      "name": "keyword.control.pir"
+      "name": "keyword.control.pir",
+      "match": "(if|unless|goto|\\.return|\\.end|\\.emit|\\.eot)"
     },
     {
-      "match": "(\\.(pcc_begin|pcc_end|pcc_call|nci_call|invocant|meth_call|arg|result|pcc_begin_return|pcc_end_return|pcc_begin_yield|pcc_end_yield|yield))",
-      "name": "keyword.control.pcc.pir"
+      "name": "keyword.control.pcc.pir",
+      "match": "(\\.(pcc_begin|pcc_end|pcc_call|nci_call|invocant|meth_call|arg|result|pcc_begin_return|pcc_end_return|pcc_begin_yield|pcc_end_yield|yield))"
     },
     {
-      "match": "([SNIP]\\d+)",
-      "name": "variable.other.register.pir"
+      "name": "variable.other.register.pir",
+      "match": "([SNIP]\\d+)"
     },
     {
-      "match": "(\\$[SNIP]\\d+)",
-      "name": "variable.other.register.symbolic.pir"
+      "name": "variable.other.register.symbolic.pir",
+      "match": "(\\$[SNIP]\\d+)"
     },
     {
-      "comment": "Label",
-      "match": "^\\s*(\\S+:)\\s*",
-      "name": "keyword.other.label.pir"
+      "name": "keyword.other.label.pir",
+      "match": "^\\s*(\\S+:)\\s*"
     },
     {
-      "match": "(int|float|string|pmc|array|\\.Array|\\.Sub)",
-      "name": "storage.type.pir"
+      "name": "storage.type.pir",
+      "match": "(int|float|string|pmc|array|\\.Array|\\.Sub)"
     },
     {
-      "match": "\\.(namespace|endnamespace)",
-      "name": "storage.type.pir"
+      "name": "storage.type.pir",
+      "match": "\\.(namespace|endnamespace)"
     },
     {
-      "match": "\\.(local|arg|lex|param|global|const)",
-      "name": "storage.modifier.pir"
+      "name": "storage.modifier.pir",
+      "match": "\\.(local|arg|lex|param|global|const)"
     },
     {
-      "match": "!|-|~",
-      "name": "keyword.operator.unary.pir"
+      "name": "keyword.operator.unary.pir",
+      "match": "!|-|~"
     },
     {
+      "name": "meta.function.pir",
+      "match": "(?x)\n\t\t\t\t\\s* (\\.sub) \\s+ ([_a-zA-Z](?:[_a-zA-Z0-9]+)?)\n\t\t\t\t(?:\\s+\n\t\t\t\t\t(?: (:(?:load|init|immediate|postcomp|main|anon|lex)) #sub_pragma\n\t\t\t\t\t| (:vtable \\s* (?: \\(\"\\S+\"\\) )? ) #vtable_pragma\n\t\t\t\t\t| (:multi  \\s* (?: \\( \\))? ) #multi_pragma\n\t\t\t\t\t| (:outer  \\s* (?: \\( \\))? ) #outer_pragma\n\t\t\t\t\t)\\s+\n\t\t\t\t)*",
       "captures": {
         "1": {
           "name": "storage.type.sub.pir"
@@ -108,44 +106,40 @@
         "6": {
           "name": "keyword.other.outer_pragma.pir"
         }
-      },
-      "match": "(?x)\n\t\t\t\t\\s* (\\.sub) \\s+ ([_a-zA-Z](?:[_a-zA-Z0-9]+)?)\n\t\t\t\t(?:\\s+\n\t\t\t\t\t(?: (:(?:load|init|immediate|postcomp|main|anon|lex)) #sub_pragma\n\t\t\t\t\t| (:vtable \\s* (?: \\(\"\\S+\"\\) )? ) #vtable_pragma\n\t\t\t\t\t| (:multi  \\s* (?: \\( \\))? ) #multi_pragma\n\t\t\t\t\t| (:outer  \\s* (?: \\( \\))? ) #outer_pragma\n\t\t\t\t\t)\\s+\n\t\t\t\t)*",
-      "name": "meta.function.pir"
+      }
     },
     {
-      "match": "\\+|-|/|\\*\\*|\\*|%|<<|>>|<>|&&|\\|\\||~~|\\||&|~|\\.",
-      "name": "keyword.operator.binary.pir"
+      "name": "keyword.operator.binary.pir",
+      "match": "\\+|-|/|\\*\\*|\\*|%|\u003c\u003c|\u003e\u003e|\u003c\u003e|\u0026\u0026|\\|\\||~~|\\||\u0026|~|\\."
     },
     {
-      "match": "\\+=|-=|\\=|%=|\\*=|\\.=|&=|\\|=|~=|<<=|>>=|<>=",
-      "name": "keyword.operator.assign.pir"
+      "name": "keyword.operator.assign.pir",
+      "match": "\\+=|-=|\\=|%=|\\*=|\\.=|\u0026=|\\|=|~=|\u003c\u003c=|\u003e\u003e=|\u003c\u003e="
     },
     {
       "begin": "(^[ \\t]+)?(?=#)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.comment.leading.pir"
-        }
-      },
       "end": "(?!\\G)",
       "patterns": [
         {
+          "name": "comment.line.number-sign.pir",
           "begin": "#",
+          "end": "\\n",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.pir"
             }
-          },
-          "end": "\\n",
-          "name": "comment.line.number-sign.pir"
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.comment.leading.pir"
+        }
+      }
     },
     {
-      "match": "\\b([_a-zA-Z]([_a-zA-Z0-9]+)?)\\b",
-      "name": "variable.other.identifier.pir"
+      "name": "variable.other.identifier.pir",
+      "match": "\\b([_a-zA-Z]([_a-zA-Z0-9]+)?)\\b"
     }
-  ],
-  "scopeName": "source.parrot.pir",
-  "uuid": "74BEF177-5D2E-469A-BF43-441F1167AB95"
-}
+  ]
+}

data/grammars/source.pascal.json

@@ -1,16 +1,14 @@
 {
-  "fileTypes": [
-    "pas",
-    "p"
-  ],
-  "keyEquivalent": "^~P",
   "name": "Pascal",
+  "scopeName": "source.pascal",
   "patterns": [
     {
-      "match": "\\b(?i:(absolute|abstract|all|and|and_then|array|as|asm|attribute|begin|bindable|case|class|const|constructor|destructor|div|do|downto|else|end|except|export|exports|external|far|file|finalization|finally|for|forward|generic|goto|helper|if|implementation|import|in|inherited|initialization|interface|interrupt|is|label|library|mod|module|name|near|nil|not|object|of|only|operator|or|or_else|otherwise|packed|pow|private|program|property|protected|public|published|qualified|record|repeat|resident|restricted|segment|set|specialize|shl|shr|then|to|try|type|unit|until|uses|value|var|view|virtual|while|with|xor))\\b",
-      "name": "keyword.control.pascal"
+      "name": "keyword.control.pascal",
+      "match": "\\b(?i:(absolute|abstract|all|and|and_then|array|as|asm|attribute|begin|bindable|case|class|const|constructor|destructor|div|do|downto|else|end|except|export|exports|external|far|file|finalization|finally|for|forward|generic|goto|helper|if|implementation|import|in|inherited|initialization|interface|interrupt|is|label|library|mod|module|name|near|nil|not|object|of|only|operator|or|or_else|otherwise|packed|pow|private|program|property|protected|public|published|qualified|record|repeat|resident|restricted|segment|set|specialize|shl|shr|then|to|try|type|unit|until|uses|value|var|view|virtual|while|with|xor))\\b"
     },
     {
+      "name": "meta.function.prototype.pascal",
+      "match": "\\b(?i:(function|procedure))\\b\\s+(\\w+(\\.\\w+)?)(\\(.*?\\))?;\\s*(?=(?i:attribute|forward|external))",
       "captures": {
         "1": {
           "name": "storage.type.prototype.pascal"
@@ -18,11 +16,11 @@
         "2": {
           "name": "entity.name.function.prototype.pascal"
         }
-      },
-      "match": "\\b(?i:(function|procedure))\\b\\s+(\\w+(\\.\\w+)?)(\\(.*?\\))?;\\s*(?=(?i:attribute|forward|external))",
-      "name": "meta.function.prototype.pascal"
+      }
     },
     {
+      "name": "meta.function.pascal",
+      "match": "\\b(?i:(function|procedure))\\b\\s+(\\w+(\\.\\w+)?)",
       "captures": {
         "1": {
           "name": "storage.type.function.pascal"
@@ -30,121 +28,116 @@
         "2": {
           "name": "entity.name.function.pascal"
         }
-      },
-      "match": "\\b(?i:(function|procedure))\\b\\s+(\\w+(\\.\\w+)?)",
-      "name": "meta.function.pascal"
+      }
     },
     {
-      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b",
-      "name": "constant.numeric.pascal"
+      "name": "constant.numeric.pascal",
+      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b"
     },
     {
       "begin": "(^[ \\t]+)?(?=--)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.comment.leading.pascal"
-        }
-      },
       "end": "(?!\\G)",
       "patterns": [
         {
+          "name": "comment.line.double-dash.pascal.one",
           "begin": "--",
+          "end": "\\n",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.pascal"
             }
-          },
-          "end": "\\n",
-          "name": "comment.line.double-dash.pascal.one"
+          }
         }
-      ]
-    },
-    {
-      "begin": "(^[ \\t]+)?(?=//)",
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.whitespace.comment.leading.pascal"
         }
-      },
+      }
+    },
+    {
+      "begin": "(^[ \\t]+)?(?=//)",
       "end": "(?!\\G)",
       "patterns": [
         {
+          "name": "comment.line.double-slash.pascal.two",
           "begin": "//",
+          "end": "\\n",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.pascal"
             }
-          },
-          "end": "\\n",
-          "name": "comment.line.double-slash.pascal.two"
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.comment.leading.pascal"
+        }
+      }
     },
     {
+      "name": "comment.block.pascal.one",
       "begin": "\\(\\*",
+      "end": "\\*\\)",
       "captures": {
         "0": {
           "name": "punctuation.definition.comment.pascal"
         }
-      },
-      "end": "\\*\\)",
-      "name": "comment.block.pascal.one"
+      }
     },
     {
+      "name": "comment.block.pascal.two",
       "begin": "\\{",
+      "end": "\\}",
       "captures": {
         "0": {
           "name": "punctuation.definition.comment.pascal"
         }
-      },
-      "end": "\\}",
-      "name": "comment.block.pascal.two"
+      }
     },
     {
+      "name": "string.quoted.double.pascal",
       "begin": "\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "name": "constant.character.escape.pascal",
+          "match": "\\\\."
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.pascal"
         }
       },
-      "comment": "Double quoted strings are an extension and (generally) support C-style escape sequences.",
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.pascal"
         }
-      },
-      "name": "string.quoted.double.pascal",
-      "patterns": [
-        {
-          "match": "\\\\.",
-          "name": "constant.character.escape.pascal"
-        }
-      ]
+      }
     },
     {
-      "applyEndPatternLast": 1,
+      "name": "string.quoted.single.pascal",
       "begin": "'",
+      "end": "'",
+      "patterns": [
+        {
+          "name": "constant.character.escape.apostrophe.pascal",
+          "match": "''"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.pascal"
         }
       },
-      "end": "'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.pascal"
         }
       },
-      "name": "string.quoted.single.pascal",
-      "patterns": [
-        {
-          "match": "''",
-          "name": "constant.character.escape.apostrophe.pascal"
-        }
-      ]
+      "applyEndPatternLast": true
     }
-  ],
-  "scopeName": "source.pascal",
-  "uuid": "F42FA544-6B1C-11D9-9517-000D93589AF6"
-}
+  ]
+}

data/grammars/source.pawn.json

@@ -1,40 +1,12 @@
 {
-  "comment": "\n\t\t\thttps://github.com/abusalimov/SublimeCImproved\n\n\t\t\tDerived from C.tmLanguage - the original TextMate and Sublime Text\n\t\t\tsyntax definition.\n\n\t\t\tThe MIT License (MIT)\n\n\t\t\tCopyright (c) 2013-2014 Eldar Abusalimov\n\t\t\tModified for the Pawn Language by Sergei Marochkin 2016\n\n\t\t\tPermission is hereby granted, free of charge, to any person obtaining a copy of\n\t\t\tthis software and associated documentation files (the \"Software\"), to deal in\n\t\t\tthe Software without restriction, including without limitation the rights to\n\t\t\tuse, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of\n\t\t\tthe Software, and to permit persons to whom the Software is furnished to do so,\n\t\t\tsubject to the following conditions:\n\n\t\t\tThe above copyright notice and this permission notice shall be included in all\n\t\t\tcopies or substantial portions of the Software.\n\n\t\t\tTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n\t\t\tIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS\n\t\t\tFOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR\n\t\t\tCOPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\n\t\t\tIN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\n\t\t\tCONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\t",
-  "fileTypes": [
-    "p",
-    "pwn",
-    "inc"
-  ],
-  "firstLineMatch": "-[*]-( Mode:)? C -[*]-",
-  "foldingStartMarker": "(?x)\n\t\t /\\*\\*(?!\\*)\n\t\t|^(?![^{]*?//|[^{]*?/\\*(?!.*?\\*/.*?\\{)).*?\\{\\s*($|//|/\\*(?!.*?\\*/.*\\S))\n\t",
-  "foldingStopMarker": "(?<!\\*)\\*\\*/|^\\s*\\}",
-  "keyEquivalent": "^~C",
   "name": "Pawn",
+  "scopeName": "source.pawn",
   "patterns": [
     {
       "include": "#translation_unit"
     }
   ],
   "repository": {
-    "translation_unit": {
-      "patterns": [
-        {
-          "include": "#lex"
-        },
-        {
-          "include": "#function"
-        },
-        {
-          "include": "#support"
-        },
-        {
-          "include": "#block"
-        },
-        {
-          "include": "#parens"
-        }
-      ]
-    },
     "block": {
       "begin": "(?=\\{)",
       "end": "\\}",
@@ -45,9 +17,9 @@
       ]
     },
     "block-lookahead-end": {
+      "name": "meta.block.c",
       "begin": "\\{",
       "end": "(?=\\})",
-      "name": "meta.block.c",
       "patterns": [
         {
           "include": "#lex"
@@ -66,67 +38,229 @@
         }
       ]
     },
-    "parens": {
-      "begin": "(?=\\()",
+    "call": {
+      "name": "meta.function-call.c",
+      "begin": "(?x)\n\t\t\t\t\\s*\n\t\t\t\t(?= # don't consume to recognize support functions\n\t\t\t\t    (?: [A-Za-z_]\\w*+ | ::[^:] )++\n\t\t\t\t    (?:\\s|/\\*.*?\\*/)*+ \\( )\n\t\t\t",
       "end": "\\)",
       "patterns": [
+        {
+          "include": "#lex"
+        },
+        {
+          "name": "variable.other.dot-access.c support.function.any-method.c",
+          "match": "(?:(?\u003c=\\.)|(?\u003c=-\u003e))\\b([A-Za-z_]\\w*+)\\b"
+        },
+        {
+          "name": "support.function.any-method.c",
+          "match": "(?:[A-Za-z_]\\w*+|::[^:])++"
+        },
         {
           "include": "#parens-lookahead-end"
         }
       ]
     },
-    "parens-lookahead-end": {
-      "begin": "\\(",
-      "end": "(?=\\))",
-      "name": "meta.parens.c",
+    "comment-banner-line": {
+      "match": "(?:(?\u003c=//)|(?\u003c=/\\*)|^)[\\s/*]*(=+\\s*(.*?)\\s*=+(?:(?=[\\s/*+\\-]*\\*/)|$(\\n?)))",
+      "captures": {
+        "1": {
+          "name": "meta.toc-list.banner.c"
+        },
+        "3": {
+          "name": "punctuation.whitespace.newline.c"
+        }
+      }
+    },
+    "comment-innards": {
       "patterns": [
         {
-          "include": "#lex"
+          "include": "#comment-banner-line"
         },
         {
-          "include": "#call"
+          "include": "#comment-task-tag-line"
         },
         {
-          "include": "#support"
+          "include": "#lex-continuation"
         },
         {
-          "include": "$base"
+          "include": "#lex-newline"
         }
       ]
     },
-    "function": {
+    "comment-task-tag-line": {
       "patterns": [
         {
-          "include": "#function-fixup-macro"
+          "name": "meta.toc-list.task-tag.prio-high.c",
+          "begin": "(?ix)\n\t\t\t\t\t    (?= (?-i: @[a-zA-Z_]++ | \\b [A-Z_]++) \\b) @? \\b (?:\n\t\t\t\t\t        (FIXME) | (XXX) | (WTF)\n\t\t\t\t\t    ) \\b\n\t\t\t\t\t",
+          "end": "(?=[\\s/*]*\\*/)|(?\u003c=$\\n)",
+          "patterns": [
+            {
+              "include": "#comment-task-tag-line-innards"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.other.task-tag.prio-high.c"
+            },
+            "1": {
+              "name": "storage.type.class.fixme.c"
+            },
+            "2": {
+              "name": "storage.type.class.xxx.c"
+            },
+            "3": {
+              "name": "storage.type.class.wtf.c"
+            }
+          }
         },
         {
-          "include": "#function-declaration"
+          "name": "meta.toc-list.task-tag.prio-normal.c",
+          "begin": "(?ix)\n\t\t\t\t\t    (?= (?-i: @[a-zA-Z_]++ | \\b [A-Z_]++) \\b) @? \\b (?:\n\t\t\t\t\t        (TODO)\n\t\t\t\t\t    ) \\b\n\t\t\t\t\t",
+          "end": "(?=[\\s/*]*\\*/)|(?\u003c=$\\n)",
+          "patterns": [
+            {
+              "include": "#comment-task-tag-line-innards"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.other.task-tag.prio-normal.c"
+            },
+            "1": {
+              "name": "storage.type.class.todo.c"
+            }
+          }
         },
         {
-          "include": "#function-definition"
+          "name": "meta.toc-list.task-tag.prio-low.c",
+          "begin": "(?ix)\n\t\t\t\t\t    (?= (?-i: @[a-zA-Z_]++ | \\b [A-Z_]++) \\b) @? \\b (?:\n\t\t\t\t\t        (TBD) | (REVIEW)\n\t\t\t\t\t    ) \\b\n\t\t\t\t\t",
+          "end": "(?=[\\s/*]*\\*/)|(?\u003c=$\\n)",
+          "patterns": [
+            {
+              "include": "#comment-task-tag-line-innards"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.other.task-tag.prio-low.c"
+            },
+            "1": {
+              "name": "storage.type.class.tbd.c"
+            },
+            "2": {
+              "name": "storage.type.class.review.c"
+            }
+          }
+        },
+        {
+          "name": "meta.toc-list.task-tag.note.c",
+          "begin": "(?ix)\n\t\t\t\t\t    (?= (?-i: @[a-zA-Z_]++ | \\b [A-Z_]++) \\b) @? \\b (?:\n\t\t\t\t\t        (NOTE) | (NB) | (CHANGED) | (IDEA) | (IMPORTANT) | (HACK) | (BUG)\n\t\t\t\t\t    ) \\b\n\t\t\t\t\t",
+          "end": "(?=[\\s/*]*\\*/)|(?\u003c=$\\n)",
+          "patterns": [
+            {
+              "include": "#comment-task-tag-line-innards"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.other.task-tag.note.c"
+            },
+            "1": {
+              "name": "storage.type.class.note.c"
+            },
+            "2": {
+              "name": "storage.type.class.nb.c"
+            },
+            "3": {
+              "name": "storage.type.class.changed.c"
+            },
+            "4": {
+              "name": "storage.type.class.idea.c"
+            },
+            "5": {
+              "name": "storage.type.class.important.c"
+            },
+            "6": {
+              "name": "storage.type.class.hack.c"
+            },
+            "7": {
+              "name": "storage.type.class.bug.c"
+            }
+          }
         }
       ]
     },
-    "function-fixup-macro": {
-      "begin": "(?x)\n\t\t\t\t^ # Begin of line, capital letters: most probably it is a macro\n\t\t\t\t\\s*\\b\n\t\t\t\t([A-Z0-9_]++)\n\t\t\t\t\\b\n\t\t\t\t(?= (?:\\s|/\\*.*?\\*/)*+ \\( )\n\t\t\t",
-      "end": "\\)",
+    "comment-task-tag-line-innards": {
       "patterns": [
         {
-          "include": "#lex"
+          "include": "#comment-task-tag-line"
         },
         {
-          "include": "#parens-lookahead-end"
+          "include": "#lex-continuation"
+        },
+        {
+          "include": "#lex-newline"
+        }
+      ]
+    },
+    "comments": {
+      "patterns": [
+        {
+          "name": "comment.block.c",
+          "begin": "\\s*(/\\*)",
+          "end": "(\\*/)(\\n?)",
+          "patterns": [
+            {
+              "include": "#comment-innards"
+            }
+          ],
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.comment.block.c"
+            }
+          },
+          "endCaptures": {
+            "2": {
+              "name": "punctuation.whitespace.newline.c"
+            }
+          }
+        },
+        {
+          "name": "invalid.illegal.stray-comment-end.c",
+          "match": "\\*/(?![/*])"
+        },
+        {
+          "name": "comment.line.double-slash.c++",
+          "begin": "\\s*(//)",
+          "end": "(?\u003c=$\\n)(?\u003c!\\\\$\\n)",
+          "patterns": [
+            {
+              "include": "#comment-innards"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.comment.line.double-slash.c++"
+            }
+          }
+        }
+      ]
+    },
+    "function": {
+      "patterns": [
+        {
+          "include": "#function-fixup-macro"
+        },
+        {
+          "include": "#function-declaration"
+        },
+        {
+          "include": "#function-definition"
         }
       ]
     },
     "function-declaration": {
       "name": "meta.function.c",
-      "begin": "(?x)\n\t\t\t\t(?: ^\n\t\t\t\t  | (?<! (?<!\\w) new\n\t\t\t\t        | (?<!\\w) (?:else|enum) | (?<!\\w) (?:class|union)\n\t\t\t\t        | (?<!\\w) (?:struct|return|sizeof|typeof)\n\t\t\t\t        | (?<!\\w) __typeof | (?<!\\w) __typeof__ )\n\t\t\t\t    (?<= \\w ) \\s\n\n\t\t\t\t  | #  or type modifier / closing bracket before name\n\t\t\t\t    (?<= [^&]& | [*>)}\\]] ) ) \\s*\n\n\t\t\t\t(   (?: [A-Za-z_]\\w*+ | ::[^:] )++\n\t\t\t\t    (?: (?<= ^ operator | \\W operator )  # C++ operator?\n\t\t\t\t        (?: [-*&<>=+!]+ | \\(\\) | \\[\\] ) )? )\n\n\t\t\t\t(?= (?:\\s|/\\*.*?\\*/)*+ (?'parens' \\(\n\t\t\t\t            (?> \\g'parens' |\n\t\t\t\t            \t\"(\\\\.|[^\"])*\" | '(\\\\.|[^'])*' | /\\*.*?\\*/ |\n\t\t\t\t            \t(?! /[/*] | [()] ) . )*\n\t\t\t\t        \\) ) \\s* ; )\n\t\t\t",
-      "beginCaptures": {
-        "1": {
-          "name": "entity.name.function.declaration.c"
-        }
-      },
+      "begin": "(?x)\n\t\t\t\t(?: ^\n\t\t\t\t  | (?\u003c! (?\u003c!\\w) new\n\t\t\t\t        | (?\u003c!\\w) (?:else|enum) | (?\u003c!\\w) (?:class|union)\n\t\t\t\t        | (?\u003c!\\w) (?:struct|return|sizeof|typeof)\n\t\t\t\t        | (?\u003c!\\w) __typeof | (?\u003c!\\w) __typeof__ )\n\t\t\t\t    (?\u003c= \\w ) \\s\n\n\t\t\t\t  | #  or type modifier / closing bracket before name\n\t\t\t\t    (?\u003c= [^\u0026]\u0026 | [*\u003e)}\\]] ) ) \\s*\n\n\t\t\t\t(   (?: [A-Za-z_]\\w*+ | ::[^:] )++\n\t\t\t\t    (?: (?\u003c= ^ operator | \\W operator )  # C++ operator?\n\t\t\t\t        (?: [-*\u0026\u003c\u003e=+!]+ | \\(\\) | \\[\\] ) )? )\n\n\t\t\t\t(?= (?:\\s|/\\*.*?\\*/)*+ (?'parens' \\(\n\t\t\t\t            (?\u003e \\g'parens' |\n\t\t\t\t            \t\"(\\\\.|[^\"])*\" | '(\\\\.|[^'])*' | /\\*.*?\\*/ |\n\t\t\t\t            \t(?! /[/*] | [()] ) . )*\n\t\t\t\t        \\) ) \\s* ; )\n\t\t\t",
       "end": ";",
       "patterns": [
         {
@@ -135,16 +269,16 @@
         {
           "include": "#parens"
         }
-      ]
-    },
-    "function-definition": {
-      "name": "meta.function.c",
-      "begin": "(?x)\n\t\t\t\t(?: ^\n\t\t\t\t  | (?<! (?<!\\w) new\n\t\t\t\t        | (?<!\\w) (?:else|enum) | (?<!\\w) (?:class|union)\n\t\t\t\t        | (?<!\\w) (?:struct|return|sizeof|typeof)\n\t\t\t\t        | (?<!\\w) __typeof | (?<!\\w) __typeof__ )\n\t\t\t\t    (?<= \\w ) \\s\n\n\t\t\t\t  | #  or type modifier / closing bracket before name\n\t\t\t\t    (?<= [^&]& | [*>)}\\]\\:] ) ) \\s*\n\n\t\t\t\t(   (?: [A-Za-z_]\\w*+ | ::[^:] )++\n\t\t\t\t    (?: (?<= ^ operator | \\W operator )  # C++ operator?\n\t\t\t\t        (?: [-*&<>=+!]+ | \\(\\) | \\[\\] ) )? )\n\n\t\t\t\t(?= (?:\\s|/\\*.*?\\*/)*+ \\( )\n\t\t\t",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "entity.name.function.definition.c"
+          "name": "entity.name.function.declaration.c"
         }
-      },
+      }
+    },
+    "function-definition": {
+      "name": "meta.function.c",
+      "begin": "(?x)\n\t\t\t\t(?: ^\n\t\t\t\t  | (?\u003c! (?\u003c!\\w) new\n\t\t\t\t        | (?\u003c!\\w) (?:else|enum) | (?\u003c!\\w) (?:class|union)\n\t\t\t\t        | (?\u003c!\\w) (?:struct|return|sizeof|typeof)\n\t\t\t\t        | (?\u003c!\\w) __typeof | (?\u003c!\\w) __typeof__ )\n\t\t\t\t    (?\u003c= \\w ) \\s\n\n\t\t\t\t  | #  or type modifier / closing bracket before name\n\t\t\t\t    (?\u003c= [^\u0026]\u0026 | [*\u003e)}\\]\\:] ) ) \\s*\n\n\t\t\t\t(   (?: [A-Za-z_]\\w*+ | ::[^:] )++\n\t\t\t\t    (?: (?\u003c= ^ operator | \\W operator )  # C++ operator?\n\t\t\t\t        (?: [-*\u0026\u003c\u003e=+!]+ | \\(\\) | \\[\\] ) )? )\n\n\t\t\t\t(?= (?:\\s|/\\*.*?\\*/)*+ \\( )\n\t\t\t",
       "end": "\\}|;",
       "patterns": [
         {
@@ -154,99 +288,116 @@
           "include": "#parens"
         },
         {
-          "match": "\\s*\\b(const|override)\\b",
-          "name": "storage.modifier.c"
+          "name": "storage.modifier.c",
+          "match": "\\s*\\b(const|override)\\b"
         },
         {
           "include": "#block-lookahead-end"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "entity.name.function.definition.c"
+        }
+      }
     },
-    "call": {
-      "name": "meta.function-call.c",
-      "begin": "(?x)\n\t\t\t\t\\s*\n\t\t\t\t(?= # don't consume to recognize support functions\n\t\t\t\t    (?: [A-Za-z_]\\w*+ | ::[^:] )++\n\t\t\t\t    (?:\\s|/\\*.*?\\*/)*+ \\( )\n\t\t\t",
+    "function-fixup-macro": {
+      "begin": "(?x)\n\t\t\t\t^ # Begin of line, capital letters: most probably it is a macro\n\t\t\t\t\\s*\\b\n\t\t\t\t([A-Z0-9_]++)\n\t\t\t\t\\b\n\t\t\t\t(?= (?:\\s|/\\*.*?\\*/)*+ \\( )\n\t\t\t",
       "end": "\\)",
       "patterns": [
         {
           "include": "#lex"
         },
-        {
-          "match": "(?:(?<=\\.)|(?<=->))\\b([A-Za-z_]\\w*+)\\b",
-          "name": "variable.other.dot-access.c support.function.any-method.c"
-        },
-        {
-          "match": "(?:[A-Za-z_]\\w*+|::[^:])++",
-          "name": "support.function.any-method.c"
-        },
         {
           "include": "#parens-lookahead-end"
         }
       ]
     },
-    "preprocessor": {
-      "begin": "(?=^\\s*(#))",
-      "end": "(?!^\\s*(#))",
+    "lex": {
       "patterns": [
         {
-          "include": "#ppline-directive-invalid-usage"
+          "include": "#lex-in-preprocessor"
         },
         {
-          "include": "#ppline-macro"
-        },
+          "include": "#preprocessor"
+        }
+      ]
+    },
+    "lex-constant": {
+      "patterns": [
         {
-          "include": "#ppline-undef"
-        },
-        {
-          "include": "#ppline-pragma-mark"
-        },
+          "match": "\\s*\\b(true|false|TRUE|FALSE)\\b",
+          "captures": {
+            "1": {
+              "name": "constant.language.c"
+            }
+          }
+        }
+      ]
+    },
+    "lex-continuation": {
+      "patterns": [
         {
-          "include": "#ppline-include"
+          "name": "punctuation.separator.continuation.c",
+          "match": "(\\\\)$(\\n?)",
+          "captures": {
+            "1": {
+              "name": "keyword.other.line-continuation.c"
+            },
+            "2": {
+              "name": "punctuation.whitespace.newline.c"
+            }
+          }
         },
         {
-          "include": "#ppline-error"
-        },
+          "match": "\\\\(\\s+?)(?=\\n)$",
+          "captures": {
+            "1": {
+              "name": "invalid.deprecated.space-after-continuation.c"
+            }
+          }
+        }
+      ]
+    },
+    "lex-core": {
+      "patterns": [
         {
-          "include": "#ppline-directive"
+          "include": "#comments"
         },
         {
-          "include": "#ppline-directive-obsolete"
+          "include": "#lex-continuation"
         },
         {
-          "include": "#ppline-directive-emit"
+          "include": "#lex-newline"
         },
         {
-          "include": "#ppline-invalid"
+          "include": "#lex-number"
         },
         {
-          "include": "#ppline-any"
+          "include": "#lex-string"
         }
       ]
     },
-    "preprocessor-lex": {
+    "lex-in-preprocessor": {
       "patterns": [
         {
-          "include": "#comments"
+          "include": "#lex-core"
         },
         {
-          "include": "#lex-continuation"
+          "include": "#lex-keyword"
         },
         {
-          "include": "#lex-newline"
+          "include": "#support-keyword"
+        },
+        {
+          "include": "#lex-constant"
         }
       ]
     },
-    "ppline-macro": {
-      "begin": "^\\s*(#)(?=\\s*(define)\\s+[a-zA-Z_]\\w*+)",
-      "beginCaptures": {
-        "0": {
-          "name": "keyword.other.preprocessor.c"
-        }
-      },
-      "end": "(?<=$\\n)(?<!\\\\$\\n)",
-      "name": "meta.preprocessor.macro.c",
+    "lex-keyword": {
       "patterns": [
         {
-          "match": "\\s*(##)",
+          "match": "\\s*\\b(defined)\\b",
           "captures": {
             "1": {
               "name": "keyword.other.preprocessor.c"
@@ -254,206 +405,386 @@
           }
         },
         {
-          "match": "\\s*(#)\\s*([a-zA-Z_]\\w*+)",
+          "match": "\\s*\\b(sizeof|tagof)\\b",
           "captures": {
             "1": {
-              "name": "keyword.other.preprocessor.c"
-            },
-            "2": {
-              "name": "string.macro.stringify.c"
+              "name": "keyword.operator.c"
             }
           }
         },
         {
-          "include": "#ppline-macro-head-function"
+          "match": "(Iterator:)(\\t)",
+          "captures": {
+            "2": {
+              "name": "invalid.illegal.invalid-indentation"
+            }
+          }
         },
         {
-          "include": "#ppline-macro-head-object"
+          "begin": "^\\s*(case)\\s+",
+          "end": "(:)|(?\u003c=^|[^\\\\])\\s*(\\n)",
+          "patterns": [
+            {
+              "include": "#lex-core"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.c"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "keyword.operator.ternary.c"
+            }
+          }
         },
         {
-          "include": "#ppline-macro-param"
+          "match": "\\s*\\b(assert|break|case|continue|default|do|else|exit|for|goto|if|return|sleep|state|switch|while)\\b",
+          "captures": {
+            "1": {
+              "name": "keyword.control.c"
+            }
+          }
         },
         {
-          "include": "#lex-in-preprocessor"
+          "match": "\\s*\\b(new|enum)\\b",
+          "captures": {
+            "1": {
+              "name": "storage.type.c"
+            }
+          }
         },
         {
-          "include": "#support"
-        }
-      ]
-    },
-    "ppline-macro-head-object": {
-      "match": "(?<!##)(?<=#)(\\s*define)\\s+([a-zA-Z_]\\w*+)(?!\\()[\\s&&[^\\n]]*",
-      "captures": {
-        "1": {
-          "name": "keyword.other.preprocessor.define.c"
-        },
-        "2": {
-          "name": "entity.name.constant.preprocessor.c"
-        }
-      }
-    },
-    "ppline-macro-head-function": {
-      "begin": "(?<!##)(?<=#)(\\s*define)\\s+([a-zA-Z_]\\w*+)(\\()",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.preprocessor.define.c"
-        },
-        "2": {
-          "name": "entity.name.function.preprocessor.c"
+          "match": "\\s*\\b(public|forward|native|char|const|static|stock|hook|task|ptask)\\b",
+          "captures": {
+            "1": {
+              "name": "storage.modifier.c"
+            }
+          }
         },
-        "3": {
-          "name": "meta.preprocessor.macro.parameters.c"
-        }
-      },
-      "end": "(?<=\\))|(?<=^|[^\\\\])\\s*(\\n)?",
-      "endCaptures": {
-        "1": {
-          "name": "invalid.illegal.unexpected-end-of-line.c"
-        }
-      },
-      "contentName": "meta.preprocessor.macro.parameters.c",
-      "patterns": [
         {
-          "include": "#ppline-macro-param"
-        }
-      ]
-    },
-    "ppline-macro-param": {
-      "match": "(%[0-9]+)",
-      "captures": {
-        "1": {
-          "name": "variable.parameter.c"
-        }
-      }
-    },
-    "ppline-undef": {
-      "begin": "(^\\s*(#)\\s*(undef))\\s+([a-zA-Z_]\\w*+)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.preprocessor.c"
+          "name": "storage.modifier.c",
+          "match": "([A-Za-z_]\\w*)\\:"
         },
-        "4": {
-          "name": "variable.macro.undef.c"
-        }
-      },
-      "end": "(?<=$\\n)(?<!\\\\$\\n)",
-      "name": "meta.preprocessor.undef.c",
-      "patterns": [
-
-      ]
-    },
-    "ppline-include": {
-      "begin": "^\\s*(#)\\s*(include|tryinclude)\\b",
-      "beginCaptures": {
-        "0": {
-          "name": "keyword.other.preprocessor.include.c"
-        }
-      },
-      "end": "(?:(\"[^\"]*?)|(<[^>]*?))(\\n)|(?<=$\\n)(?<!\\\\$\\n)",
-      "endCaptures": {
-        "1": {
-          "name": "string.quoted.double.include.c"
+        {
+          "name": "keyword.operator.assignment.c",
+          "match": "(\\-|\\+|\\*|\\/|%|\u0026|\\||\\^|\u003c\u003c|\u003e\u003e)?="
         },
-        "2": {
-          "name": "string.quoted.other.lt-gt.include.c"
+        {
+          "name": "keyword.operator.comparison.c",
+          "match": "(==|!=|\u003c=|\u003e=|\u003c\u003e|\u003c|\u003e)"
         },
-        "3": {
-          "name": "invalid.illegal.unexpected-end-of-line.c"
-        }
-      },
-      "name": "meta.preprocessor.include.c meta.preprocessor.c.include",
-      "patterns": [
         {
-          "include": "#ppline-include-innards"
-        }
-      ]
-    },
-    "ppline-include-innards": {
-      "patterns": [
+          "name": "keyword.operator.increment-decrement.c",
+          "match": "(\\-\\-|\\+\\+)"
+        },
         {
-          "include": "#preprocessor-lex"
+          "name": "keyword.operator.ternary.c",
+          "match": "(\\?|:)"
         },
         {
-          "begin": "\"|(?=.*?\")",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.c"
-            }
-          },
-          "end": "\"|(?<=^|[^\\\\])(?=\\s*\\n)",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.c"
-            }
-          },
-          "name": "string.quoted.double.include.c"
+          "name": "keyword.operator.arithmetic.c",
+          "match": "(\\-|\\+|\\*|\\/|%)"
         },
         {
-          "begin": "<(?=.*?>)",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.c"
-            }
-          },
-          "end": ">|(?<=^|[^\\\\])(?=\\s*\\n)",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.c"
-            }
-          },
-          "name": "string.quoted.other.lt-gt.include.c"
+          "name": "keyword.operator.logical.c",
+          "match": "(!|\u0026\u0026|\\|\\|)"
         },
         {
-          "begin": "\\(",
-          "end": "\\)|(?<=^|[^\\\\])(?=\\s*\\n)",
-          "name": "meta.parens.c",
-          "patterns": [
-            {
-              "include": "#ppline-include-innards"
-            }
-          ]
+          "name": "keyword.operator.bitwise.c",
+          "match": "(~|\u0026|\\||\\^|\u003c\u003c|\u003e\u003e)"
         }
       ]
     },
-    "ppline-error": {
-      "begin": "^\\s*(#)\\s*(error|warning)\\b",
-      "beginCaptures": {
-        "0": {
-          "name": "keyword.other.preprocessor.include.c"
-        }
-      },
-      "end": "(.*)|(?<=$\\n)(?<!\\\\$\\n)",
-      "endCaptures": {
-        "1": {
-          "name": "string.quoted.double.c"
-        }
-      },
-      "name": "meta.preprocessor.include.c meta.preprocessor.c.include"
+    "lex-newline": {
+      "name": "punctuation.whitespace.newline.c",
+      "match": "$\\n"
     },
-    "ppline-pragma-mark": {
-      "begin": "(^\\s*(#)\\s*(pragma\\s+(align|amxlimit|amxram|codepage|compress|ctrlchar|deprecated|dynamic|library|overlay|pack|rational|semicolon|tabsize|unused))\\b)[\\s&&[^\\n]]*",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.preprocessor.pragma.c"
-        }
-      },
-      "end": "(?<=$\\n)(?<!\\\\$\\n)",
-      "name": "meta.preprocessor.directive.c",
+    "lex-number": {
       "patterns": [
         {
-          "include": "#lex-core"
+          "match": "([0-9]+)(\\.{2})([0-9]+)",
+          "captures": {
+            "1": {
+              "name": "constant.numeric.integer.decimal.c"
+            },
+            "2": {
+              "name": "keyword.operator.switch-range.c"
+            },
+            "3": {
+              "name": "constant.numeric.integer.decimal.c"
+            }
+          }
+        },
+        {
+          "name": "constant.numeric.float.hexadecimal.c",
+          "match": "(?ix)  # hexadecimal float\n\t\t\t\t\t\t(?\u003c!\\.) \\b\n\n\t\t\t\t\t\t(0x)\n\n\t\t\t\t\t\t# significand\n\t\t\t\t\t\t(?: (\\.) (?=p)  # invalid\n\t\t\t\t\t\t  |        [0-9a-f]*+ ([0-9a-z]*?) [0-9a-f]*+\n\t\t\t\t\t\t    (?: \\. [0-9a-f]*+ ([0-9a-z.]*?) [0-9a-f]*+ )? )\n\n\t\t\t\t\t\t# exponent (required)\n\t\t\t\t\t\t(?: (p) (?:        [+\\-]  [0-9]++ ([0-9a-z]*?)\n\t\t\t\t\t\t          | (?=[0-9a-z.]) [0-9]*+ ([0-9a-z.]*?) )\n\t\t\t\t\t\t  | (p) )\n\n\t\t\t\t\t\t# remaining valid chars and type\n\t\t\t\t\t\t[0-9]*+ ([fl]?)\n\n\t\t\t\t\t\t\\b (?!\\.)\n\t\t\t\t\t",
+          "captures": {
+            "1": {
+              "name": "storage.type.number.prefix.hexadecimal.c"
+            },
+            "2": {
+              "name": "invalid.illegal.number.missing-fragment.significand.c"
+            },
+            "3": {
+              "name": "invalid.illegal.numeric-literal-character.float.whole-number.c"
+            },
+            "4": {
+              "name": "invalid.illegal.numeric-literal-character.float.fraction.c"
+            },
+            "5": {
+              "name": "keyword.other.exponent.hexadecimal.c"
+            },
+            "6": {
+              "name": "invalid.illegal.numeric-literal-character.float.exponent.c"
+            },
+            "7": {
+              "name": "invalid.illegal.numeric-literal-character.float.exponent.c"
+            },
+            "8": {
+              "name": "invalid.illegal.number.missing-fragment.exponent.c"
+            },
+            "9": {
+              "name": "storage.type.number.suffix.float.c"
+            }
+          }
+        },
+        {
+          "name": "constant.numeric.float.hexadecimal.c",
+          "match": "(?ix)  # hexadecimal float without required exponent\n\t\t\t\t\t\t(?\u003c!\\.) \\b\n\n\t\t\t\t\t\t(0x)\n\n\t\t\t\t\t\t# significand (at least a period)\n\t\t\t\t\t\t     [0-9a-f]*+ ([0-9a-z\u0026\u0026[^p]]*?) [0-9a-f]*+\n\t\t\t\t\t\t(\\.) [0-9a-f]*+ ([0-9a-z.\u0026\u0026[^p]]*?) [0-9a-f]*+\n\n\t\t\t\t\t\t# type\n\t\t\t\t\t\t(l?)\n\n\t\t\t\t\t\t(?:(?\u003c=\\.)|\\b) (?!\\.)\n\t\t\t\t\t",
+          "captures": {
+            "1": {
+              "name": "storage.type.number.prefix.hexadecimal.c"
+            },
+            "2": {
+              "name": "invalid.illegal.numeric-literal-character.float.whole-number.c"
+            },
+            "3": {
+              "name": "invalid.illegal.number.hexadecimal-float-requires-exponent.c"
+            },
+            "4": {
+              "name": "invalid.illegal.numeric-literal-character.float.fraction.c"
+            },
+            "5": {
+              "name": "storage.type.number.suffix.float.c"
+            }
+          }
+        },
+        {
+          "name": "constant.numeric.float.c",
+          "match": "(?ix)  # decimal float literal\n\t\t\t\t\t\t(?\u003c!\\.) (?:(?=\\.)|\\b)\n\n\t\t\t\t\t\t(?!0x)\n\t\t\t\t\t\t# significand\n\t\t\t\t\t\t(?: (?: [0-9]++ ([0-9a-z\u0026\u0026[^e]]*?) [0-9]*+ )?\n\t\t\t\t\t\t    \\.  [0-9]++ ([0-9a-z.\u0026\u0026[^e]]*?) [0-9]*+\n\n\t\t\t\t\t\t  |     [0-9]++ ([0-9a-z\u0026\u0026[^e]]*?) [0-9]*+ (?: \\. | (?=e)) )\n\n\t\t\t\t\t\t# exponent (optional)\n\t\t\t\t\t\t(?: (e) (?: [+\\-]  [0-9]++ ([0-9a-z]*?)\n\t\t\t\t\t\t          |        [0-9]++ ([0-9a-z.]*?) )\n\t\t\t\t\t\t  | ( p     [+\\-]? [0-9]++\n\t\t\t\t\t\t    | [ep]                  [0-9a-z.]*?) )?\n\n\t\t\t\t\t\t# any invalid chars and type\n\t\t\t\t\t\t([0-9a-z]*?) [0-9]*+ ([fl]?)\n\n\t\t\t\t\t\t(?:(?\u003c=\\.)|\\b) (?!\\.)\n\t\t\t\t\t",
+          "captures": {
+            "1": {
+              "name": "invalid.illegal.numeric-literal-character.float.whole-number.c"
+            },
+            "2": {
+              "name": "invalid.illegal.numeric-literal-character.float.fraction.c"
+            },
+            "3": {
+              "name": "invalid.illegal.numeric-literal-character.float.whole-number.c"
+            },
+            "4": {
+              "name": "keyword.other.exponent.decimal.c"
+            },
+            "5": {
+              "name": "invalid.illegal.numeric-literal-character.float.exponent.c"
+            },
+            "6": {
+              "name": "invalid.illegal.numeric-literal-character.float.exponent.c"
+            },
+            "7": {
+              "name": "invalid.illegal.numeric-literal-character.float.exponent.c"
+            },
+            "8": {
+              "name": "invalid.illegal.numeric-literal-character.float.exponent.c"
+            },
+            "9": {
+              "name": "storage.type.number.suffix.float.c"
+            }
+          }
+        },
+        {
+          "name": "constant.numeric.integer.zero.c",
+          "match": "(?ix)\n\t\t\t\t\t\t(?\u003c!\\.) \\b\n\t\t\t\t\t\t(0x)? 0++\n\t\t\t\t\t\t(u?l{0,2}|lul?|llu)\n\t\t\t\t\t\t\\b (?!\\.)\n\t\t\t\t\t",
+          "captures": {
+            "1": {
+              "name": "storage.type.number.prefix.hexadecimal.c"
+            },
+            "2": {
+              "name": "storage.type.number.suffix.c"
+            }
+          }
+        },
+        {
+          "name": "invalid.illegal.invalid-number-literal.c",
+          "match": "(?ix)\n\t\t\t\t\t\t(?\u003c!\\.) \\b\n\n\t\t\t\t\t\t(?: (0x) | (0b) )\n\t\t\t\t\t\t(u?l{0,2}|lul?|llu)\n\n\t\t\t\t\t\t\\b (?!\\.)\n\t\t\t\t\t"
+        },
+        {
+          "name": "constant.numeric.integer.hexadecimal.c",
+          "match": "(?ix)\n\t\t\t\t\t\t(?\u003c!\\.) \\b\n\n\t\t\t\t\t\t(0x) [0-9a-f]++\n\n\t\t\t\t\t\t# any invalid chars\n\t\t\t\t\t\t([0-9a-z]*?)\n\n\t\t\t\t\t\t# the remainder (after invalid chars, if any) and a type\n\t\t\t\t\t\t[0-9a-f]* (u?l{0,2}|lul?|llu)\n\n\t\t\t\t\t\t\\b (?!\\.)\n\t\t\t\t\t",
+          "captures": {
+            "1": {
+              "name": "storage.type.number.prefix.hexadecimal.c"
+            },
+            "2": {
+              "name": "invalid.illegal.numeric-literal-character.integer.c"
+            },
+            "3": {
+              "name": "storage.type.number.suffix.c"
+            }
+          }
+        },
+        {
+          "name": "constant.numeric.integer.binary.c",
+          "match": "(?ix)\n\t\t\t\t\t\t(?\u003c!\\.) \\b\n\n\t\t\t\t\t\t(0b) [01]++\n\n\t\t\t\t\t\t# any invalid chars\n\t\t\t\t\t\t([0-9a-z]*?)\n\n\t\t\t\t\t\t# the remainder (after invalid chars, if any) and a type\n\t\t\t\t\t\t[01]* (u?l{0,2}|lul?|llu)\n\n\t\t\t\t\t\t\\b (?!\\.)\n\t\t\t\t\t",
+          "captures": {
+            "1": {
+              "name": "storage.type.number.prefix.binary.c"
+            },
+            "2": {
+              "name": "invalid.illegal.numeric-literal-character.integer.c"
+            },
+            "3": {
+              "name": "storage.type.number.suffix.c"
+            }
+          }
+        },
+        {
+          "name": "constant.numeric.integer.octal.c",
+          "match": "(?ix)\n\t\t\t\t\t\t(?\u003c!\\.) \\b\n\n\t\t\t\t\t\t(0) [0-7]++\n\n\t\t\t\t\t\t# any invalid chars\n\t\t\t\t\t\t([0-9a-z]*?)\n\n\t\t\t\t\t\t# the remainder (after invalid chars, if any) and a type\n\t\t\t\t\t\t[0-7]* (u?l{0,2}|lul?|llu)\n\n\t\t\t\t\t\t\\b (?!\\.)\n\t\t\t\t\t",
+          "captures": {
+            "1": {
+              "name": "storage.type.number.prefix.octal.c"
+            },
+            "2": {
+              "name": "invalid.illegal.numeric-literal-character.integer.c"
+            },
+            "3": {
+              "name": "storage.type.number.suffix.c"
+            }
+          }
+        },
+        {
+          "name": "constant.numeric.integer.decimal.c",
+          "match": "(?ix)\n\t\t\t\t\t\t\\b\n\n\t\t\t\t\t\t[0-9][0-9_]*\n\n\t\t\t\t\t\t# any invalid chars\n\t\t\t\t\t\t([0-9a-z]*?)\n\n\t\t\t\t\t\t# the remainder (after invalid chars, if any) and a type\n\t\t\t\t\t\t[0-9]* (u?l{0,2}|lul?|llu)\n\n\t\t\t\t\t\t\\b\n\t\t\t\t\t",
+          "captures": {
+            "1": {
+              "name": "invalid.illegal.numeric-literal-character.integer.c"
+            },
+            "2": {
+              "name": "storage.type.number.suffix.c"
+            }
+          }
         }
       ]
     },
-    "ppline-directive": {
-      "begin": "^\\s*(#)\\s*(if|elseif|else|endif|pragma|line|define|undef|section|assert|file|endinput|endscript)\\b",
+    "lex-string": {
+      "patterns": [
+        {
+          "name": "string.quoted.double.c",
+          "begin": "\"",
+          "end": "(\")|(?\u003c=^|[^\\\\])\\s*(\\n)",
+          "patterns": [
+            {
+              "include": "#lex-continuation"
+            },
+            {
+              "include": "#string_escaped_char"
+            },
+            {
+              "include": "#string_placeholder"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.c"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.end.c"
+            },
+            "2": {
+              "name": "invalid.illegal.unexpected-end-of-line.c"
+            }
+          }
+        },
+        {
+          "name": "string.quoted.single.c",
+          "begin": "'",
+          "end": "(')|(?\u003c=^|[^\\\\])\\s*(\\n)",
+          "patterns": [
+            {
+              "include": "#lex-continuation"
+            },
+            {
+              "include": "#string_escaped_char"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.c"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.end.c"
+            },
+            "2": {
+              "name": "invalid.illegal.unexpected-end-of-line.c"
+            }
+          }
+        }
+      ]
+    },
+    "parens": {
+      "begin": "(?=\\()",
+      "end": "\\)",
+      "patterns": [
+        {
+          "include": "#parens-lookahead-end"
+        }
+      ]
+    },
+    "parens-lookahead-end": {
+      "name": "meta.parens.c",
+      "begin": "\\(",
+      "end": "(?=\\))",
+      "patterns": [
+        {
+          "include": "#lex"
+        },
+        {
+          "include": "#call"
+        },
+        {
+          "include": "#support"
+        },
+        {
+          "include": "$base"
+        }
+      ]
+    },
+    "ppline-any": {
+      "name": "meta.preprocessor.directive.null-directive.c",
+      "begin": "^\\s*(#)",
+      "end": "(?\u003c=$\\n)(?\u003c!\\\\$\\n)",
+      "patterns": [
+        {
+          "include": "#lex-core"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "keyword.other.preprocessor.c"
         }
-      },
-      "end": "(?<=$\\n)(?<!\\\\$\\n)",
+      }
+    },
+    "ppline-directive": {
       "name": "meta.preprocessor.directive.c",
+      "begin": "^\\s*(#)\\s*(if|elseif|else|endif|pragma|line|define|undef|section|assert|file|endinput|endscript)\\b",
+      "end": "(?\u003c=$\\n)(?\u003c!\\\\$\\n)",
       "patterns": [
         {
           "include": "#lex-core"
@@ -461,10 +792,25 @@
         {
           "include": "#lex-in-preprocessor"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.other.preprocessor.c"
+        }
+      }
     },
     "ppline-directive-emit": {
+      "name": "meta.preprocessor.directive.emit.c",
       "begin": "(?x)\n\t\t\t\t^\\s*(\\#|@)\\s*(emit) #pre-processor directive\n\t\t\t\t(\\s+\n\t\t\t\t\t([A-Z0-9a-z]+)\n\t\t\t\t\t(\n\t\t\t\t\t\t(\\.)([A-Za-z]+)\n\t\t\t\t\t\t((\\.)([A-Za-z]+))?\n\t\t\t\t\t)?\n\t\t\t\t|\\s*)\n\t\t\t",
+      "end": "(?\u003c=$\\n)(?\u003c!\\\\$\\n)",
+      "patterns": [
+        {
+          "include": "#lex-core"
+        },
+        {
+          "include": "#lex-in-preprocessor"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.other.preprocessor.c"
@@ -481,19 +827,10 @@
         "7": {
           "name": "entity.name.function.preprocessor.c"
         }
-      },
-      "end": "(?<=$\\n)(?<!\\\\$\\n)",
-      "name": "meta.preprocessor.directive.emit.c",
-      "patterns": [
-        {
-          "include": "#lex-core"
-        },
-        {
-          "include": "#lex-in-preprocessor"
-        }
-      ]
+      }
     },
     "ppline-directive-invalid-usage": {
+      "name": "meta.preprocessor.directive.c",
       "match": "(^\\s*(#)\\s*(if|elseif|pragma|define|undef|include|tryinclude)\\b)\\s*?(\\n|$)",
       "captures": {
         "1": {
@@ -502,707 +839,356 @@
         "4": {
           "name": "invalid.illegal.invalid-usage-of-preprocessor-directive.c"
         }
-      },
-      "name": "meta.preprocessor.directive.c"
-    },
-    "ppline-invalid": {
-      "begin": "^\\s*(#)(?!\\s*(?=/[/*]|(?>\\\\\\s*\\n)|\\n|$))\\s*(\\w*)",
-      "end": "(?<=$\\n)(?<!\\\\$\\n)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.preprocessor.c"
-        },
-        "2": {
-          "name": "invalid.illegal.preprocessor.c"
-        }
-      },
-      "name": "meta.preprocessor.directive.illegal.c"
+      }
     },
-    "ppline-any": {
-      "begin": "^\\s*(#)",
+    "ppline-error": {
+      "name": "meta.preprocessor.include.c meta.preprocessor.c.include",
+      "begin": "^\\s*(#)\\s*(error|warning)\\b",
+      "end": "(.*)|(?\u003c=$\\n)(?\u003c!\\\\$\\n)",
       "beginCaptures": {
         "0": {
-          "name": "keyword.other.preprocessor.c"
+          "name": "keyword.other.preprocessor.include.c"
         }
       },
-      "end": "(?<=$\\n)(?<!\\\\$\\n)",
-      "name": "meta.preprocessor.directive.null-directive.c",
-      "patterns": [
-        {
-          "include": "#lex-core"
-        }
-      ]
-    },
-    "support": {
-      "patterns": [
-        {
-          "include": "#support-modifier"
-        },
-        {
-          "include": "#support-keyword"
-        }
-      ]
-    },
-    "support-modifier": {
-      "patterns": [
-        {
-          "match": "\\s*\\b(inline|using)\\b",
-          "captures": {
-            "1": {
-              "name": "storage.modifier.c"
-            }
-          }
-        }
-      ]
-    },
-    "support-keyword": {
-      "patterns": [
-        {
-          "match": "\\s*\\b(foreach)\\b",
-          "captures": {
-            "1": {
-              "name": "keyword.control.c"
-            }
-          }
+      "endCaptures": {
+        "1": {
+          "name": "string.quoted.double.c"
         }
-      ]
+      }
     },
-    "comments": {
+    "ppline-include": {
+      "name": "meta.preprocessor.include.c meta.preprocessor.c.include",
+      "begin": "^\\s*(#)\\s*(include|tryinclude)\\b",
+      "end": "(?:(\"[^\"]*?)|(\u003c[^\u003e]*?))(\\n)|(?\u003c=$\\n)(?\u003c!\\\\$\\n)",
       "patterns": [
         {
-          "begin": "\\s*(/\\*)",
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.comment.block.c"
-            }
-          },
-          "end": "(\\*/)(\\n?)",
-          "endCaptures": {
-            "2": {
-              "name": "punctuation.whitespace.newline.c"
-            }
-          },
-          "name": "comment.block.c",
-          "patterns": [
-            {
-              "include": "#comment-innards"
-            }
-          ]
-        },
-        {
-          "match": "\\*/(?![/*])",
-          "name": "invalid.illegal.stray-comment-end.c"
-        },
-        {
-          "begin": "\\s*(//)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.comment.line.double-slash.c++"
-            }
-          },
-          "end": "(?<=$\\n)(?<!\\\\$\\n)",
-          "name": "comment.line.double-slash.c++",
-          "patterns": [
-            {
-              "include": "#comment-innards"
-            }
-          ]
+          "include": "#ppline-include-innards"
         }
-      ]
-    },
-    "comment-innards": {
-      "patterns": [
-        {
-          "include": "#comment-banner-line"
-        },
-        {
-          "include": "#comment-task-tag-line"
-        },
-        {
-          "include": "#lex-continuation"
-        },
-        {
-          "include": "#lex-newline"
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.other.preprocessor.include.c"
         }
-      ]
-    },
-    "comment-banner-line": {
-      "match": "(?:(?<=//)|(?<=/\\*)|^)[\\s/*]*(=+\\s*(.*?)\\s*=+(?:(?=[\\s/*+\\-]*\\*/)|$(\\n?)))",
-      "captures": {
+      },
+      "endCaptures": {
         "1": {
-          "name": "meta.toc-list.banner.c"
+          "name": "string.quoted.double.include.c"
+        },
+        "2": {
+          "name": "string.quoted.other.lt-gt.include.c"
         },
         "3": {
-          "name": "punctuation.whitespace.newline.c"
+          "name": "invalid.illegal.unexpected-end-of-line.c"
         }
       }
     },
-    "comment-task-tag-line": {
+    "ppline-include-innards": {
       "patterns": [
         {
-          "begin": "(?ix)\n\t\t\t\t\t    (?= (?-i: @[a-zA-Z_]++ | \\b [A-Z_]++) \\b) @? \\b (?:\n\t\t\t\t\t        (FIXME) | (XXX) | (WTF)\n\t\t\t\t\t    ) \\b\n\t\t\t\t\t",
-          "beginCaptures": {
-            "0": {
-              "name": "keyword.other.task-tag.prio-high.c"
-            },
-            "1": {
-              "name": "storage.type.class.fixme.c"
-            },
-            "2": {
-              "name": "storage.type.class.xxx.c"
-            },
-            "3": {
-              "name": "storage.type.class.wtf.c"
-            }
-          },
-          "end": "(?=[\\s/*]*\\*/)|(?<=$\\n)",
-          "name": "meta.toc-list.task-tag.prio-high.c",
-          "patterns": [
-            {
-              "include": "#comment-task-tag-line-innards"
-            }
-          ]
+          "include": "#preprocessor-lex"
         },
         {
-          "begin": "(?ix)\n\t\t\t\t\t    (?= (?-i: @[a-zA-Z_]++ | \\b [A-Z_]++) \\b) @? \\b (?:\n\t\t\t\t\t        (TODO)\n\t\t\t\t\t    ) \\b\n\t\t\t\t\t",
+          "name": "string.quoted.double.include.c",
+          "begin": "\"|(?=.*?\")",
+          "end": "\"|(?\u003c=^|[^\\\\])(?=\\s*\\n)",
           "beginCaptures": {
             "0": {
-              "name": "keyword.other.task-tag.prio-normal.c"
-            },
-            "1": {
-              "name": "storage.type.class.todo.c"
+              "name": "punctuation.definition.string.begin.c"
             }
           },
-          "end": "(?=[\\s/*]*\\*/)|(?<=$\\n)",
-          "name": "meta.toc-list.task-tag.prio-normal.c",
-          "patterns": [
-            {
-              "include": "#comment-task-tag-line-innards"
-            }
-          ]
-        },
-        {
-          "begin": "(?ix)\n\t\t\t\t\t    (?= (?-i: @[a-zA-Z_]++ | \\b [A-Z_]++) \\b) @? \\b (?:\n\t\t\t\t\t        (TBD) | (REVIEW)\n\t\t\t\t\t    ) \\b\n\t\t\t\t\t",
-          "beginCaptures": {
+          "endCaptures": {
             "0": {
-              "name": "keyword.other.task-tag.prio-low.c"
-            },
-            "1": {
-              "name": "storage.type.class.tbd.c"
-            },
-            "2": {
-              "name": "storage.type.class.review.c"
-            }
-          },
-          "end": "(?=[\\s/*]*\\*/)|(?<=$\\n)",
-          "name": "meta.toc-list.task-tag.prio-low.c",
-          "patterns": [
-            {
-              "include": "#comment-task-tag-line-innards"
+              "name": "punctuation.definition.string.end.c"
             }
-          ]
+          }
         },
         {
-          "begin": "(?ix)\n\t\t\t\t\t    (?= (?-i: @[a-zA-Z_]++ | \\b [A-Z_]++) \\b) @? \\b (?:\n\t\t\t\t\t        (NOTE) | (NB) | (CHANGED) | (IDEA) | (IMPORTANT) | (HACK) | (BUG)\n\t\t\t\t\t    ) \\b\n\t\t\t\t\t",
+          "name": "string.quoted.other.lt-gt.include.c",
+          "begin": "\u003c(?=.*?\u003e)",
+          "end": "\u003e|(?\u003c=^|[^\\\\])(?=\\s*\\n)",
           "beginCaptures": {
             "0": {
-              "name": "keyword.other.task-tag.note.c"
-            },
-            "1": {
-              "name": "storage.type.class.note.c"
-            },
-            "2": {
-              "name": "storage.type.class.nb.c"
-            },
-            "3": {
-              "name": "storage.type.class.changed.c"
-            },
-            "4": {
-              "name": "storage.type.class.idea.c"
-            },
-            "5": {
-              "name": "storage.type.class.important.c"
-            },
-            "6": {
-              "name": "storage.type.class.hack.c"
-            },
-            "7": {
-              "name": "storage.type.class.bug.c"
+              "name": "punctuation.definition.string.begin.c"
             }
           },
-          "end": "(?=[\\s/*]*\\*/)|(?<=$\\n)",
-          "name": "meta.toc-list.task-tag.note.c",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.c"
+            }
+          }
+        },
+        {
+          "name": "meta.parens.c",
+          "begin": "\\(",
+          "end": "\\)|(?\u003c=^|[^\\\\])(?=\\s*\\n)",
           "patterns": [
             {
-              "include": "#comment-task-tag-line-innards"
+              "include": "#ppline-include-innards"
             }
           ]
         }
       ]
     },
-    "comment-task-tag-line-innards": {
-      "patterns": [
-        {
-          "include": "#comment-task-tag-line"
-        },
-        {
-          "include": "#lex-continuation"
+    "ppline-invalid": {
+      "name": "meta.preprocessor.directive.illegal.c",
+      "begin": "^\\s*(#)(?!\\s*(?=/[/*]|(?\u003e\\\\\\s*\\n)|\\n|$))\\s*(\\w*)",
+      "end": "(?\u003c=$\\n)(?\u003c!\\\\$\\n)",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.preprocessor.c"
         },
-        {
-          "include": "#lex-newline"
+        "2": {
+          "name": "invalid.illegal.preprocessor.c"
         }
-      ]
+      }
     },
-    "lex": {
+    "ppline-macro": {
+      "name": "meta.preprocessor.macro.c",
+      "begin": "^\\s*(#)(?=\\s*(define)\\s+[a-zA-Z_]\\w*+)",
+      "end": "(?\u003c=$\\n)(?\u003c!\\\\$\\n)",
       "patterns": [
         {
-          "include": "#lex-in-preprocessor"
+          "match": "\\s*(##)",
+          "captures": {
+            "1": {
+              "name": "keyword.other.preprocessor.c"
+            }
+          }
         },
         {
-          "include": "#preprocessor"
-        }
-      ]
-    },
-    "lex-in-preprocessor": {
-      "patterns": [
+          "match": "\\s*(#)\\s*([a-zA-Z_]\\w*+)",
+          "captures": {
+            "1": {
+              "name": "keyword.other.preprocessor.c"
+            },
+            "2": {
+              "name": "string.macro.stringify.c"
+            }
+          }
+        },
         {
-          "include": "#lex-core"
+          "include": "#ppline-macro-head-function"
         },
         {
-          "include": "#lex-keyword"
+          "include": "#ppline-macro-head-object"
         },
         {
-          "include": "#support-keyword"
+          "include": "#ppline-macro-param"
         },
         {
-          "include": "#lex-constant"
+          "include": "#lex-in-preprocessor"
+        },
+        {
+          "include": "#support"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.other.preprocessor.c"
+        }
+      }
     },
-    "lex-core": {
+    "ppline-macro-head-function": {
+      "contentName": "meta.preprocessor.macro.parameters.c",
+      "begin": "(?\u003c!##)(?\u003c=#)(\\s*define)\\s+([a-zA-Z_]\\w*+)(\\()",
+      "end": "(?\u003c=\\))|(?\u003c=^|[^\\\\])\\s*(\\n)?",
       "patterns": [
         {
-          "include": "#comments"
-        },
-        {
-          "include": "#lex-continuation"
-        },
-        {
-          "include": "#lex-newline"
+          "include": "#ppline-macro-param"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.preprocessor.define.c"
         },
-        {
-          "include": "#lex-number"
+        "2": {
+          "name": "entity.name.function.preprocessor.c"
         },
-        {
-          "include": "#lex-string"
+        "3": {
+          "name": "meta.preprocessor.macro.parameters.c"
         }
-      ]
+      },
+      "endCaptures": {
+        "1": {
+          "name": "invalid.illegal.unexpected-end-of-line.c"
+        }
+      }
     },
-    "lex-continuation": {
-      "patterns": [
-        {
-          "match": "(\\\\)$(\\n?)",
-          "name": "punctuation.separator.continuation.c",
-          "captures": {
-            "1": {
-              "name": "keyword.other.line-continuation.c"
-            },
-            "2": {
-              "name": "punctuation.whitespace.newline.c"
-            }
-          }
+    "ppline-macro-head-object": {
+      "match": "(?\u003c!##)(?\u003c=#)(\\s*define)\\s+([a-zA-Z_]\\w*+)(?!\\()[\\s\u0026\u0026[^\\n]]*",
+      "captures": {
+        "1": {
+          "name": "keyword.other.preprocessor.define.c"
         },
-        {
-          "match": "\\\\(\\s+?)(?=\\n)$",
-          "captures": {
-            "1": {
-              "name": "invalid.deprecated.space-after-continuation.c"
-            }
-          }
+        "2": {
+          "name": "entity.name.constant.preprocessor.c"
         }
-      ]
+      }
     },
-    "lex-newline": {
-      "match": "$\\n",
-      "name": "punctuation.whitespace.newline.c"
+    "ppline-macro-param": {
+      "match": "(%[0-9]+)",
+      "captures": {
+        "1": {
+          "name": "variable.parameter.c"
+        }
+      }
     },
-    "lex-keyword": {
+    "ppline-pragma-mark": {
+      "name": "meta.preprocessor.directive.c",
+      "begin": "(^\\s*(#)\\s*(pragma\\s+(align|amxlimit|amxram|codepage|compress|ctrlchar|deprecated|dynamic|library|overlay|pack|rational|semicolon|tabsize|unused))\\b)[\\s\u0026\u0026[^\\n]]*",
+      "end": "(?\u003c=$\\n)(?\u003c!\\\\$\\n)",
       "patterns": [
         {
-          "match": "\\s*\\b(defined)\\b",
-          "captures": {
-            "1": {
-              "name": "keyword.other.preprocessor.c"
-            }
-          }
+          "include": "#lex-core"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.preprocessor.pragma.c"
+        }
+      }
+    },
+    "ppline-undef": {
+      "name": "meta.preprocessor.undef.c",
+      "begin": "(^\\s*(#)\\s*(undef))\\s+([a-zA-Z_]\\w*+)",
+      "end": "(?\u003c=$\\n)(?\u003c!\\\\$\\n)",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.preprocessor.c"
         },
+        "4": {
+          "name": "variable.macro.undef.c"
+        }
+      }
+    },
+    "preprocessor": {
+      "begin": "(?=^\\s*(#))",
+      "end": "(?!^\\s*(#))",
+      "patterns": [
         {
-          "match": "\\s*\\b(sizeof|tagof)\\b",
-          "captures": {
-            "1": {
-              "name": "keyword.operator.c"
-            }
-          }
+          "include": "#ppline-directive-invalid-usage"
         },
         {
-          "match": "(Iterator:)(\\t)",
-          "captures": {
-            "2": {
-              "name": "invalid.illegal.invalid-indentation"
-            }
-          }
+          "include": "#ppline-macro"
         },
         {
-          "begin": "^\\s*(case)\\s+",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control.c"
-            }
-          },
-          "end": "(:)|(?<=^|[^\\\\])\\s*(\\n)",
-          "endCaptures": {
-            "1": {
-              "name": "keyword.operator.ternary.c"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#lex-core"
-            }
-          ]
+          "include": "#ppline-undef"
         },
         {
-          "match": "\\s*\\b(assert|break|case|continue|default|do|else|exit|for|goto|if|return|sleep|state|switch|while)\\b",
-          "captures": {
-            "1": {
-              "name": "keyword.control.c"
-            }
-          }
+          "include": "#ppline-pragma-mark"
         },
         {
-          "match": "\\s*\\b(new|enum)\\b",
-          "captures": {
-            "1": {
-              "name": "storage.type.c"
-            }
-          }
+          "include": "#ppline-include"
         },
         {
-          "match": "\\s*\\b(public|forward|native|char|const|static|stock|hook|task|ptask)\\b",
-          "captures": {
-            "1": {
-              "name": "storage.modifier.c"
-            }
-          }
+          "include": "#ppline-error"
         },
         {
-          "match": "([A-Za-z_]\\w*)\\:",
-          "name": "storage.modifier.c"
+          "include": "#ppline-directive"
         },
         {
-          "match": "(\\-|\\+|\\*|\\/|%|&|\\||\\^|<<|>>)?=",
-          "name": "keyword.operator.assignment.c"
+          "include": "#ppline-directive-obsolete"
         },
         {
-          "match": "(==|!=|<=|>=|<>|<|>)",
-          "name": "keyword.operator.comparison.c"
+          "include": "#ppline-directive-emit"
         },
         {
-          "match": "(\\-\\-|\\+\\+)",
-          "name": "keyword.operator.increment-decrement.c"
+          "include": "#ppline-invalid"
         },
         {
-          "match": "(\\?|:)",
-          "name": "keyword.operator.ternary.c"
-        },
+          "include": "#ppline-any"
+        }
+      ]
+    },
+    "preprocessor-lex": {
+      "patterns": [
         {
-          "match": "(\\-|\\+|\\*|\\/|%)",
-          "name": "keyword.operator.arithmetic.c"
+          "include": "#comments"
         },
         {
-          "match": "(!|&&|\\|\\|)",
-          "name": "keyword.operator.logical.c"
+          "include": "#lex-continuation"
         },
         {
-          "match": "(~|&|\\||\\^|<<|>>)",
-          "name": "keyword.operator.bitwise.c"
+          "include": "#lex-newline"
         }
       ]
     },
-    "lex-constant": {
+    "string_escaped_char": {
       "patterns": [
         {
-          "match": "\\s*\\b(true|false|TRUE|FALSE)\\b",
-          "captures": {
-            "1": {
-              "name": "constant.language.c"
-            }
-          }
+          "name": "constant.character.escape.c",
+          "match": "\\\\(\\\\|[abefnprtv'\"?]|[0-3]\\d{0,2}|[4-7]\\d?|x[a-fA-F0-9]{0,2}|u[a-fA-F0-9]{0,4}|U[a-fA-F0-9]{0,8})"
+        },
+        {
+          "name": "invalid.illegal.unknown-escape.c",
+          "match": "\\\\."
         }
       ]
     },
-    "lex-number": {
+    "string_placeholder": {
       "patterns": [
         {
-          "match": "([0-9]+)(\\.{2})([0-9]+)",
-          "captures": {
-            "1": {
-              "name": "constant.numeric.integer.decimal.c"
-            },
-            "2": {
-              "name": "keyword.operator.switch-range.c"
-            },
-            "3": {
-              "name": "constant.numeric.integer.decimal.c"
-            }
-          }
-        },
-        {
-          "match": "(?ix)  # hexadecimal float\n\t\t\t\t\t\t(?<!\\.) \\b\n\n\t\t\t\t\t\t(0x)\n\n\t\t\t\t\t\t# significand\n\t\t\t\t\t\t(?: (\\.) (?=p)  # invalid\n\t\t\t\t\t\t  |        [0-9a-f]*+ ([0-9a-z]*?) [0-9a-f]*+\n\t\t\t\t\t\t    (?: \\. [0-9a-f]*+ ([0-9a-z.]*?) [0-9a-f]*+ )? )\n\n\t\t\t\t\t\t# exponent (required)\n\t\t\t\t\t\t(?: (p) (?:        [+\\-]  [0-9]++ ([0-9a-z]*?)\n\t\t\t\t\t\t          | (?=[0-9a-z.]) [0-9]*+ ([0-9a-z.]*?) )\n\t\t\t\t\t\t  | (p) )\n\n\t\t\t\t\t\t# remaining valid chars and type\n\t\t\t\t\t\t[0-9]*+ ([fl]?)\n\n\t\t\t\t\t\t\\b (?!\\.)\n\t\t\t\t\t",
-          "name": "constant.numeric.float.hexadecimal.c",
-          "captures": {
-            "1": {
-              "name": "storage.type.number.prefix.hexadecimal.c"
-            },
-            "2": {
-              "name": "invalid.illegal.number.missing-fragment.significand.c"
-            },
-            "3": {
-              "name": "invalid.illegal.numeric-literal-character.float.whole-number.c"
-            },
-            "4": {
-              "name": "invalid.illegal.numeric-literal-character.float.fraction.c"
-            },
-            "5": {
-              "name": "keyword.other.exponent.hexadecimal.c"
-            },
-            "6": {
-              "name": "invalid.illegal.numeric-literal-character.float.exponent.c"
-            },
-            "7": {
-              "name": "invalid.illegal.numeric-literal-character.float.exponent.c"
-            },
-            "8": {
-              "name": "invalid.illegal.number.missing-fragment.exponent.c"
-            },
-            "9": {
-              "name": "storage.type.number.suffix.float.c"
-            }
-          }
-        },
-        {
-          "match": "(?ix)  # hexadecimal float without required exponent\n\t\t\t\t\t\t(?<!\\.) \\b\n\n\t\t\t\t\t\t(0x)\n\n\t\t\t\t\t\t# significand (at least a period)\n\t\t\t\t\t\t     [0-9a-f]*+ ([0-9a-z&&[^p]]*?) [0-9a-f]*+\n\t\t\t\t\t\t(\\.) [0-9a-f]*+ ([0-9a-z.&&[^p]]*?) [0-9a-f]*+\n\n\t\t\t\t\t\t# type\n\t\t\t\t\t\t(l?)\n\n\t\t\t\t\t\t(?:(?<=\\.)|\\b) (?!\\.)\n\t\t\t\t\t",
-          "name": "constant.numeric.float.hexadecimal.c",
-          "captures": {
-            "1": {
-              "name": "storage.type.number.prefix.hexadecimal.c"
-            },
-            "2": {
-              "name": "invalid.illegal.numeric-literal-character.float.whole-number.c"
-            },
-            "3": {
-              "name": "invalid.illegal.number.hexadecimal-float-requires-exponent.c"
-            },
-            "4": {
-              "name": "invalid.illegal.numeric-literal-character.float.fraction.c"
-            },
-            "5": {
-              "name": "storage.type.number.suffix.float.c"
-            }
-          }
-        },
-        {
-          "match": "(?ix)  # decimal float literal\n\t\t\t\t\t\t(?<!\\.) (?:(?=\\.)|\\b)\n\n\t\t\t\t\t\t(?!0x)\n\t\t\t\t\t\t# significand\n\t\t\t\t\t\t(?: (?: [0-9]++ ([0-9a-z&&[^e]]*?) [0-9]*+ )?\n\t\t\t\t\t\t    \\.  [0-9]++ ([0-9a-z.&&[^e]]*?) [0-9]*+\n\n\t\t\t\t\t\t  |     [0-9]++ ([0-9a-z&&[^e]]*?) [0-9]*+ (?: \\. | (?=e)) )\n\n\t\t\t\t\t\t# exponent (optional)\n\t\t\t\t\t\t(?: (e) (?: [+\\-]  [0-9]++ ([0-9a-z]*?)\n\t\t\t\t\t\t          |        [0-9]++ ([0-9a-z.]*?) )\n\t\t\t\t\t\t  | ( p     [+\\-]? [0-9]++\n\t\t\t\t\t\t    | [ep]                  [0-9a-z.]*?) )?\n\n\t\t\t\t\t\t# any invalid chars and type\n\t\t\t\t\t\t([0-9a-z]*?) [0-9]*+ ([fl]?)\n\n\t\t\t\t\t\t(?:(?<=\\.)|\\b) (?!\\.)\n\t\t\t\t\t",
-          "name": "constant.numeric.float.c",
-          "captures": {
-            "1": {
-              "name": "invalid.illegal.numeric-literal-character.float.whole-number.c"
-            },
-            "2": {
-              "name": "invalid.illegal.numeric-literal-character.float.fraction.c"
-            },
-            "3": {
-              "name": "invalid.illegal.numeric-literal-character.float.whole-number.c"
-            },
-            "4": {
-              "name": "keyword.other.exponent.decimal.c"
-            },
-            "5": {
-              "name": "invalid.illegal.numeric-literal-character.float.exponent.c"
-            },
-            "6": {
-              "name": "invalid.illegal.numeric-literal-character.float.exponent.c"
-            },
-            "7": {
-              "name": "invalid.illegal.numeric-literal-character.float.exponent.c"
-            },
-            "8": {
-              "name": "invalid.illegal.numeric-literal-character.float.exponent.c"
-            },
-            "9": {
-              "name": "storage.type.number.suffix.float.c"
-            }
-          }
-        },
-        {
-          "match": "(?ix)\n\t\t\t\t\t\t(?<!\\.) \\b\n\t\t\t\t\t\t(0x)? 0++\n\t\t\t\t\t\t(u?l{0,2}|lul?|llu)\n\t\t\t\t\t\t\\b (?!\\.)\n\t\t\t\t\t",
-          "name": "constant.numeric.integer.zero.c",
-          "captures": {
-            "1": {
-              "name": "storage.type.number.prefix.hexadecimal.c"
-            },
-            "2": {
-              "name": "storage.type.number.suffix.c"
-            }
-          }
-        },
-        {
-          "match": "(?ix)\n\t\t\t\t\t\t(?<!\\.) \\b\n\n\t\t\t\t\t\t(?: (0x) | (0b) )\n\t\t\t\t\t\t(u?l{0,2}|lul?|llu)\n\n\t\t\t\t\t\t\\b (?!\\.)\n\t\t\t\t\t",
-          "name": "invalid.illegal.invalid-number-literal.c"
+          "name": "constant.other.placeholder.c",
+          "match": "(?x)%\n\t\t\t\t\t\t(\\d+\\$)?                             # field (argument #)\n\t\t\t\t\t\t[#0\\- +']*                           # flags\n\t\t\t\t\t\t[,;:_]?                              # separator character (AltiVec)\n\t\t\t\t\t\t((-?\\d+)|\\*(-?\\d+\\$)?)?              # minimum field width\n\t\t\t\t\t\t(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?         # precision\n\t\t\t\t\t\t[diouxXDOUeEfFgGaACcSspnq%]          # conversion type\n\t\t\t\t\t"
         },
         {
-          "match": "(?ix)\n\t\t\t\t\t\t(?<!\\.) \\b\n\n\t\t\t\t\t\t(0x) [0-9a-f]++\n\n\t\t\t\t\t\t# any invalid chars\n\t\t\t\t\t\t([0-9a-z]*?)\n\n\t\t\t\t\t\t# the remainder (after invalid chars, if any) and a type\n\t\t\t\t\t\t[0-9a-f]* (u?l{0,2}|lul?|llu)\n\n\t\t\t\t\t\t\\b (?!\\.)\n\t\t\t\t\t",
-          "name": "constant.numeric.integer.hexadecimal.c",
-          "captures": {
-            "1": {
-              "name": "storage.type.number.prefix.hexadecimal.c"
-            },
-            "2": {
-              "name": "invalid.illegal.numeric-literal-character.integer.c"
-            },
-            "3": {
-              "name": "storage.type.number.suffix.c"
-            }
-          }
-        },
+          "name": "invalid.illegal.placeholder.c",
+          "match": "%"
+        }
+      ]
+    },
+    "support": {
+      "patterns": [
         {
-          "match": "(?ix)\n\t\t\t\t\t\t(?<!\\.) \\b\n\n\t\t\t\t\t\t(0b) [01]++\n\n\t\t\t\t\t\t# any invalid chars\n\t\t\t\t\t\t([0-9a-z]*?)\n\n\t\t\t\t\t\t# the remainder (after invalid chars, if any) and a type\n\t\t\t\t\t\t[01]* (u?l{0,2}|lul?|llu)\n\n\t\t\t\t\t\t\\b (?!\\.)\n\t\t\t\t\t",
-          "name": "constant.numeric.integer.binary.c",
-          "captures": {
-            "1": {
-              "name": "storage.type.number.prefix.binary.c"
-            },
-            "2": {
-              "name": "invalid.illegal.numeric-literal-character.integer.c"
-            },
-            "3": {
-              "name": "storage.type.number.suffix.c"
-            }
-          }
+          "include": "#support-modifier"
         },
         {
-          "match": "(?ix)\n\t\t\t\t\t\t(?<!\\.) \\b\n\n\t\t\t\t\t\t(0) [0-7]++\n\n\t\t\t\t\t\t# any invalid chars\n\t\t\t\t\t\t([0-9a-z]*?)\n\n\t\t\t\t\t\t# the remainder (after invalid chars, if any) and a type\n\t\t\t\t\t\t[0-7]* (u?l{0,2}|lul?|llu)\n\n\t\t\t\t\t\t\\b (?!\\.)\n\t\t\t\t\t",
-          "name": "constant.numeric.integer.octal.c",
-          "captures": {
-            "1": {
-              "name": "storage.type.number.prefix.octal.c"
-            },
-            "2": {
-              "name": "invalid.illegal.numeric-literal-character.integer.c"
-            },
-            "3": {
-              "name": "storage.type.number.suffix.c"
-            }
-          }
-        },
+          "include": "#support-keyword"
+        }
+      ]
+    },
+    "support-keyword": {
+      "patterns": [
         {
-          "match": "(?ix)\n\t\t\t\t\t\t\\b\n\n\t\t\t\t\t\t[0-9][0-9_]*\n\n\t\t\t\t\t\t# any invalid chars\n\t\t\t\t\t\t([0-9a-z]*?)\n\n\t\t\t\t\t\t# the remainder (after invalid chars, if any) and a type\n\t\t\t\t\t\t[0-9]* (u?l{0,2}|lul?|llu)\n\n\t\t\t\t\t\t\\b\n\t\t\t\t\t",
-          "name": "constant.numeric.integer.decimal.c",
+          "match": "\\s*\\b(foreach)\\b",
           "captures": {
             "1": {
-              "name": "invalid.illegal.numeric-literal-character.integer.c"
-            },
-            "2": {
-              "name": "storage.type.number.suffix.c"
+              "name": "keyword.control.c"
             }
           }
         }
       ]
     },
-    "lex-string": {
+    "support-modifier": {
       "patterns": [
         {
-          "begin": "\"",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.c"
-            }
-          },
-          "end": "(\")|(?<=^|[^\\\\])\\s*(\\n)",
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.definition.string.end.c"
-            },
-            "2": {
-              "name": "invalid.illegal.unexpected-end-of-line.c"
-            }
-          },
-          "name": "string.quoted.double.c",
-          "patterns": [
-            {
-              "include": "#lex-continuation"
-            },
-            {
-              "include": "#string_escaped_char"
-            },
-            {
-              "include": "#string_placeholder"
-            }
-          ]
-        },
-        {
-          "begin": "'",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.c"
-            }
-          },
-          "end": "(')|(?<=^|[^\\\\])\\s*(\\n)",
-          "endCaptures": {
+          "match": "\\s*\\b(inline|using)\\b",
+          "captures": {
             "1": {
-              "name": "punctuation.definition.string.end.c"
-            },
-            "2": {
-              "name": "invalid.illegal.unexpected-end-of-line.c"
-            }
-          },
-          "name": "string.quoted.single.c",
-          "patterns": [
-            {
-              "include": "#lex-continuation"
-            },
-            {
-              "include": "#string_escaped_char"
+              "name": "storage.modifier.c"
             }
-          ]
+          }
         }
       ]
     },
-    "string_escaped_char": {
+    "translation_unit": {
       "patterns": [
         {
-          "match": "\\\\(\\\\|[abefnprtv'\"?]|[0-3]\\d{0,2}|[4-7]\\d?|x[a-fA-F0-9]{0,2}|u[a-fA-F0-9]{0,4}|U[a-fA-F0-9]{0,8})",
-          "name": "constant.character.escape.c"
+          "include": "#lex"
         },
         {
-          "match": "\\\\.",
-          "name": "invalid.illegal.unknown-escape.c"
-        }
-      ]
-    },
-    "string_placeholder": {
-      "patterns": [
+          "include": "#function"
+        },
+        {
+          "include": "#support"
+        },
         {
-          "match": "(?x)%\n\t\t\t\t\t\t(\\d+\\$)?                             # field (argument #)\n\t\t\t\t\t\t[#0\\- +']*                           # flags\n\t\t\t\t\t\t[,;:_]?                              # separator character (AltiVec)\n\t\t\t\t\t\t((-?\\d+)|\\*(-?\\d+\\$)?)?              # minimum field width\n\t\t\t\t\t\t(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?         # precision\n\t\t\t\t\t\t[diouxXDOUeEfFgGaACcSspnq%]          # conversion type\n\t\t\t\t\t",
-          "name": "constant.other.placeholder.c"
+          "include": "#block"
         },
         {
-          "match": "%",
-          "name": "invalid.illegal.placeholder.c"
+          "include": "#parens"
         }
       ]
     }
-  },
-  "scopeName": "source.pawn",
-  "uuid": "25066DC2-6B1D-11D9-9D5B-000D93589AF6"
-}
+  }
+}