tm-grammars 1.22.18 → 1.23.0

package/grammars/c.json

@@ -119,7 +119,7 @@
   ],
   "repository": {
     "access-method": {
-      "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))\\s*(?:(\\.)|(->))((?:(?:[a-zA-Z_][a-zA-Z_0-9]*)\\s*(?:(?:\\.)|(?:->)))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()",
+      "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\])]))\\s*(?:(\\.)|(->))((?:[a-zA-Z_][a-zA-Z_0-9]*\\s*(?:\\.|->))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()",
       "beginCaptures": {
         "1": {
           "name": "variable.object.c"
@@ -227,11 +227,11 @@
       "name": "support.type.sys-types.c"
     },
     "anon_pattern_9": {
-      "match": "\\b(pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t)\\b",
+      "match": "\\b(pthread_(?:attr_t|cond_t|condattr_t|mutex_t|mutexattr_t|once_t|rwlock_t|rwlockattr_t|t|key_t))\\b",
       "name": "support.type.pthread.c"
     },
     "anon_pattern_range_1": {
-      "begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((#)\\s*define\\b)\\s+((?<!\\w)[a-zA-Z_]\\w*(?!\\w))(?:(\\()([^()\\\\]+)(\\)))?",
+      "begin": "((?:(?:(?>\\s+)|(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((#)\\s*define\\b)\\s+((?<!\\w)[a-zA-Z_]\\w*(?!\\w))(?:(\\()([^()\\\\]+)(\\)))?",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -252,7 +252,7 @@
         "4": {
           "patterns": [
             {
-              "match": "\\*\\/",
+              "match": "\\*/",
               "name": "comment.block.c punctuation.definition.comment.end.c"
             },
             {
@@ -371,7 +371,7 @@
       ]
     },
     "anon_pattern_range_3": {
-      "begin": "^\\s*((#)\\s*(include(?:_next)?|import))\\b\\s*",
+      "begin": "^\\s*((#)\\s*(i(?:nclude(?:_next)?|mport)))\\b\\s*",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.directive.$3.c"
@@ -380,7 +380,7 @@
           "name": "punctuation.definition.directive.c"
         }
       },
-      "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+      "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
       "name": "meta.preprocessor.include.c",
       "patterns": [
         {
@@ -428,7 +428,7 @@
           "name": "punctuation.definition.directive.c"
         }
       },
-      "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+      "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
       "name": "meta.preprocessor.c",
       "patterns": [
         {
@@ -443,7 +443,7 @@
       ]
     },
     "anon_pattern_range_5": {
-      "begin": "^\\s*(?:((#)\\s*undef))\\b",
+      "begin": "^\\s*((#)\\s*undef)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.directive.undef.c"
@@ -452,7 +452,7 @@
           "name": "punctuation.definition.directive.c"
         }
       },
-      "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+      "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
       "name": "meta.preprocessor.c",
       "patterns": [
         {
@@ -465,7 +465,7 @@
       ]
     },
     "anon_pattern_range_6": {
-      "begin": "^\\s*(?:((#)\\s*pragma))\\b",
+      "begin": "^\\s*((#)\\s*pragma)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.directive.pragma.c"
@@ -474,7 +474,7 @@
           "name": "punctuation.definition.directive.c"
         }
       },
-      "end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+      "end": "(?=/[/*])|(?<!\\\\)(?=\\n)",
       "name": "meta.preprocessor.pragma.c",
       "patterns": [
         {
@@ -503,7 +503,7 @@
       ]
     },
     "anon_pattern_range_8": {
-      "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))?(\\[)(?!\\])",
+      "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\])]))?(\\[)(?!])",
       "beginCaptures": {
         "1": {
           "name": "variable.object.c"
@@ -512,7 +512,7 @@
           "name": "punctuation.definition.begin.bracket.square.c"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.end.bracket.square.c"
@@ -526,23 +526,23 @@
       ]
     },
     "anon_pattern_range_9": {
-      "match": "\\[\\s*\\]",
+      "match": "\\[\\s*]",
       "name": "storage.modifier.array.bracket.square.c"
     },
     "backslash_escapes": {
-      "match": "\\\\(\\\\|[abefnprtv'\"?]|[0-3][0-7]{,2}|[4-7]\\d?|x[a-fA-F0-9]{,2}|u[a-fA-F0-9]{,4}|U[a-fA-F0-9]{,8})",
+      "match": "\\\\([\\\\abefnprtv'\"?]|[0-3][0-7]{0,2}|[4-7]\\d?|x\\h{0,2}|u\\h{0,4}|U\\h{0,8})",
       "name": "constant.character.escape.c"
     },
     "block": {
       "patterns": [
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.bracket.curly.c"
             }
           },
-          "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)",
+          "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.c"
@@ -560,13 +560,13 @@
     "block_comment": {
       "patterns": [
         {
-          "begin": "\\s*+(\\/\\*)",
+          "begin": "\\s*+(/\\*)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.comment.begin.c"
             }
           },
-          "end": "\\*\\/",
+          "end": "\\*/",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.end.c"
@@ -575,13 +575,13 @@
           "name": "comment.block.c"
         },
         {
-          "begin": "\\s*+(\\/\\*)",
+          "begin": "\\s*+(/\\*)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.comment.begin.c"
             }
           },
-          "end": "\\*\\/",
+          "end": "\\*/",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.end.c"
@@ -612,7 +612,7 @@
           "include": "#c_function_call"
         },
         {
-          "begin": "(?:(?:(?=\\s)(?<!else|new|return)(?<=\\w)\\s+(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)))((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+          "begin": "(?=\\s)(?<!else|new|return)(?<=\\w)\\s+(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "variable.other.c"
@@ -635,13 +635,13 @@
           ]
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.bracket.curly.c"
             }
           },
-          "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)",
+          "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.c"
@@ -672,7 +672,7 @@
       ]
     },
     "c_function_call": {
-      "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\()",
+      "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[])\\s*\\()",
       "end": "(?<=\\))(?!\\w)",
       "name": "meta.function-call.c",
       "patterns": [
@@ -682,7 +682,7 @@
       ]
     },
     "case_statement": {
-      "begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)case(?!\\w))",
+      "begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)case(?!\\w))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -700,7 +700,7 @@
         "4": {
           "patterns": [
             {
-              "match": "\\*\\/",
+              "match": "\\*/",
               "name": "comment.block.c punctuation.definition.comment.end.c"
             },
             {
@@ -736,7 +736,7 @@
             {
               "patterns": [
                 {
-                  "begin": "(?:^)(?>\\s*)(\\/\\/[!\\/]+)",
+                  "begin": "^(?>\\s*)(//[!/]+)",
                   "beginCaptures": {
                     "1": {
                       "name": "punctuation.definition.comment.documentation.c"
@@ -749,7 +749,7 @@
                       "include": "#line_continuation_character"
                     },
                     {
-                      "match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
+                      "match": "(?<=[\\s*!/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|[$#<>%\".=]|::|\\||--|---)\\b(?:\\{[^}]*})?",
                       "name": "storage.type.class.doxygen.c"
                     },
                     {
@@ -761,7 +761,7 @@
                           "name": "markup.italic.doxygen.c"
                         }
                       },
-                      "match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)"
+                      "match": "((?<=[\\s*!/])[\\\\@](?:a|em|e))\\s+(\\S+)"
                     },
                     {
                       "captures": {
@@ -772,7 +772,7 @@
                           "name": "markup.bold.doxygen.c"
                         }
                       },
-                      "match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)"
+                      "match": "((?<=[\\s*!/])[\\\\@]b)\\s+(\\S+)"
                     },
                     {
                       "captures": {
@@ -783,14 +783,14 @@
                           "name": "markup.inline.raw.string.c"
                         }
                       },
-                      "match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)"
+                      "match": "((?<=[\\s*!/])[\\\\@][cp])\\s+(\\S+)"
                     },
                     {
-                      "match": "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?",
+                      "match": "(?<=[\\s*!/])[\\\\@](?:a|anchor|[bc]|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*})?",
                       "name": "storage.type.class.doxygen.c"
                     },
                     {
-                      "match": "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?",
+                      "match": "(?<=[\\s*!/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*})?",
                       "name": "storage.type.class.doxygen.c"
                     },
                     {
@@ -810,14 +810,14 @@
                           "name": "variable.parameter.c"
                         }
                       },
-                      "match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)"
+                      "match": "((?<=[\\s*!/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)])?\\s+(\\b\\w+\\b)"
                     },
                     {
-                      "match": "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?",
+                      "match": "(?<=[\\s*!/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*})?",
                       "name": "storage.type.class.doxygen.c"
                     },
                     {
-                      "match": "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?",
+                      "match": "(?<=[\\s*!/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*})?",
                       "name": "storage.type.class.doxygen.c"
                     },
                     {
@@ -834,7 +834,7 @@
                     "2": {
                       "patterns": [
                         {
-                          "match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
+                          "match": "(?<=[\\s*!/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|[$#<>%\".=]|::|\\||--|---)\\b(?:\\{[^}]*})?",
                           "name": "storage.type.class.doxygen.c"
                         },
                         {
@@ -846,7 +846,7 @@
                               "name": "markup.italic.doxygen.c"
                             }
                           },
-                          "match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)"
+                          "match": "((?<=[\\s*!/])[\\\\@](?:a|em|e))\\s+(\\S+)"
                         },
                         {
                           "captures": {
@@ -857,7 +857,7 @@
                               "name": "markup.bold.doxygen.c"
                             }
                           },
-                          "match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)"
+                          "match": "((?<=[\\s*!/])[\\\\@]b)\\s+(\\S+)"
                         },
                         {
                           "captures": {
@@ -868,14 +868,14 @@
                               "name": "markup.inline.raw.string.c"
                             }
                           },
-                          "match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)"
+                          "match": "((?<=[\\s*!/])[\\\\@][cp])\\s+(\\S+)"
                         },
                         {
-                          "match": "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?",
+                          "match": "(?<=[\\s*!/])[\\\\@](?:a|anchor|[bc]|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*})?",
                           "name": "storage.type.class.doxygen.c"
                         },
                         {
-                          "match": "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?",
+                          "match": "(?<=[\\s*!/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*})?",
                           "name": "storage.type.class.doxygen.c"
                         },
                         {
@@ -895,14 +895,14 @@
                               "name": "variable.parameter.c"
                             }
                           },
-                          "match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)"
+                          "match": "((?<=[\\s*!/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)])?\\s+(\\b\\w+\\b)"
                         },
                         {
-                          "match": "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?",
+                          "match": "(?<=[\\s*!/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*})?",
                           "name": "storage.type.class.doxygen.c"
                         },
                         {
-                          "match": "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?",
+                          "match": "(?<=[\\s*!/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*})?",
                           "name": "storage.type.class.doxygen.c"
                         },
                         {
@@ -915,17 +915,17 @@
                       "name": "punctuation.definition.comment.end.documentation.c"
                     }
                   },
-                  "match": "(\\/\\*[!*]+(?=\\s))(.+)([!*]*\\*\\/)",
+                  "match": "(/\\*[!*]+(?=\\s))(.+)([!*]*\\*/)",
                   "name": "comment.block.documentation.c"
                 },
                 {
-                  "begin": "((?>\\s*)\\/\\*[!*]+(?:(?:\\n|$)|(?=\\s)))",
+                  "begin": "((?>\\s*)/\\*[!*]+(?:(?:\\n|$)|(?=\\s)))",
                   "beginCaptures": {
                     "1": {
                       "name": "punctuation.definition.comment.begin.documentation.c"
                     }
                   },
-                  "end": "([!*]*\\*\\/)",
+                  "end": "([!*]*\\*/)",
                   "endCaptures": {
                     "1": {
                       "name": "punctuation.definition.comment.end.documentation.c"
@@ -934,7 +934,7 @@
                   "name": "comment.block.documentation.c",
                   "patterns": [
                     {
-                      "match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
+                      "match": "(?<=[\\s*!/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|[$#<>%\".=]|::|\\||--|---)\\b(?:\\{[^}]*})?",
                       "name": "storage.type.class.doxygen.c"
                     },
                     {
@@ -946,7 +946,7 @@
                           "name": "markup.italic.doxygen.c"
                         }
                       },
-                      "match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)"
+                      "match": "((?<=[\\s*!/])[\\\\@](?:a|em|e))\\s+(\\S+)"
                     },
                     {
                       "captures": {
@@ -957,7 +957,7 @@
                           "name": "markup.bold.doxygen.c"
                         }
                       },
-                      "match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)"
+                      "match": "((?<=[\\s*!/])[\\\\@]b)\\s+(\\S+)"
                     },
                     {
                       "captures": {
@@ -968,14 +968,14 @@
                           "name": "markup.inline.raw.string.c"
                         }
                       },
-                      "match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)"
+                      "match": "((?<=[\\s*!/])[\\\\@][cp])\\s+(\\S+)"
                     },
                     {
-                      "match": "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?",
+                      "match": "(?<=[\\s*!/])[\\\\@](?:a|anchor|[bc]|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*})?",
                       "name": "storage.type.class.doxygen.c"
                     },
                     {
-                      "match": "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?",
+                      "match": "(?<=[\\s*!/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*})?",
                       "name": "storage.type.class.doxygen.c"
                     },
                     {
@@ -995,14 +995,14 @@
                           "name": "variable.parameter.c"
                         }
                       },
-                      "match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)"
+                      "match": "((?<=[\\s*!/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)])?\\s+(\\b\\w+\\b)"
                     },
                     {
-                      "match": "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?",
+                      "match": "(?<=[\\s*!/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*})?",
                       "name": "storage.type.class.doxygen.c"
                     },
                     {
-                      "match": "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?",
+                      "match": "(?<=[\\s*!/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*})?",
                       "name": "storage.type.class.doxygen.c"
                     },
                     {
@@ -1017,17 +1017,17 @@
                       "name": "meta.toc-list.banner.block.c"
                     }
                   },
-                  "match": "^\\/\\* =(\\s*.*?)\\s*= \\*\\/$\\n?",
+                  "match": "^/\\* =(\\s*.*?)\\s*= \\*/$\\n?",
                   "name": "comment.block.banner.c"
                 },
                 {
-                  "begin": "(\\/\\*)",
+                  "begin": "(/\\*)",
                   "beginCaptures": {
                     "1": {
                       "name": "punctuation.definition.comment.begin.c"
                     }
                   },
-                  "end": "(\\*\\/)",
+                  "end": "(\\*/)",
                   "endCaptures": {
                     "1": {
                       "name": "punctuation.definition.comment.end.c"
@@ -1041,11 +1041,11 @@
                       "name": "meta.toc-list.banner.line.c"
                     }
                   },
-                  "match": "^\\/\\/ =(\\s*.*?)\\s*=$\\n?",
+                  "match": "^// =(\\s*.*?)\\s*=$\\n?",
                   "name": "comment.line.banner.c"
                 },
                 {
-                  "begin": "((?:^[ \\t]+)?)(?=\\/\\/)",
+                  "begin": "((?:^[ \\t]+)?)(?=//)",
                   "beginCaptures": {
                     "1": {
                       "name": "punctuation.whitespace.comment.leading.c"
@@ -1054,7 +1054,7 @@
                   "end": "(?!\\G)",
                   "patterns": [
                     {
-                      "begin": "(\\/\\/)",
+                      "begin": "(//)",
                       "beginCaptures": {
                         "1": {
                           "name": "punctuation.definition.comment.c"
@@ -1089,7 +1089,7 @@
       ]
     },
     "default_statement": {
-      "begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)default(?!\\w))",
+      "begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)default(?!\\w))",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1107,7 +1107,7 @@
         "4": {
           "patterns": [
             {
-              "match": "\\*\\/",
+              "match": "\\*/",
               "name": "comment.block.c punctuation.definition.comment.end.c"
             },
             {
@@ -1176,7 +1176,7 @@
           "include": "#operators"
         },
         {
-          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.c"
@@ -1236,7 +1236,7 @@
           "include": "#vararg_ellipses"
         },
         {
-          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.c"
@@ -1300,7 +1300,7 @@
                 "3": {
                   "patterns": [
                     {
-                      "match": "\\*\\/",
+                      "match": "\\*/",
                       "name": "comment.block.c punctuation.definition.comment.end.c"
                     },
                     {
@@ -1310,7 +1310,7 @@
                   ]
                 }
               },
-              "match": "(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/))"
+              "match": "(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/))"
             },
             {
               "captures": {
@@ -1323,7 +1323,7 @@
                 "3": {
                   "patterns": [
                     {
-                      "match": "\\*\\/",
+                      "match": "\\*/",
                       "name": "comment.block.c punctuation.definition.comment.end.c"
                     },
                     {
@@ -1333,7 +1333,7 @@
                   ]
                 }
               },
-              "match": "(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/))"
+              "match": "(/\\*)((?:[^*]|\\*++[^/])*+(\\*++/))"
             }
           ]
         },
@@ -1348,7 +1348,7 @@
             "3": {
               "patterns": [
                 {
-                  "match": "\\*\\/",
+                  "match": "\\*/",
                   "name": "comment.block.c punctuation.definition.comment.end.c"
                 },
                 {
@@ -1358,14 +1358,14 @@
               ]
             }
           },
-          "match": "(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/))"
+          "match": "(/\\*)((?:[^*]|\\*++[^/])*+(\\*++/))"
         }
       ]
     },
     "line_comment": {
       "patterns": [
         {
-          "begin": "\\s*+(\\/\\/)",
+          "begin": "\\s*+(//)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.comment.c"
@@ -1382,7 +1382,7 @@
           ]
         },
         {
-          "begin": "\\s*+(\\/\\/)",
+          "begin": "\\s*+(//)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.comment.c"
@@ -1443,7 +1443,7 @@
                   "name": "punctuation.separator.pointer-access.c"
                 }
               },
-              "match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))"
+              "match": "((?:[a-zA-Z_]\\w*|(?<=[\\])]))\\s*)(?:(\\.(?:\\*|))|(->(?:\\*|)))"
             }
           ]
         },
@@ -1451,10 +1451,10 @@
           "name": "variable.other.member.c"
         }
       },
-      "match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*(\\b(?!(?:atomic_uint_least64_t|atomic_uint_least16_t|atomic_uint_least32_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_fast64_t|atomic_uint_fast32_t|atomic_int_least64_t|atomic_int_least32_t|pthread_rwlockattr_t|atomic_uint_fast16_t|pthread_mutexattr_t|atomic_int_fast16_t|atomic_uint_fast8_t|atomic_int_fast64_t|atomic_int_least8_t|atomic_int_fast32_t|atomic_int_fast8_t|pthread_condattr_t|atomic_uintptr_t|atomic_ptrdiff_t|pthread_rwlock_t|atomic_uintmax_t|pthread_mutex_t|atomic_intmax_t|atomic_intptr_t|atomic_char32_t|atomic_char16_t|pthread_attr_t|atomic_wchar_t|uint_least64_t|uint_least32_t|uint_least16_t|pthread_cond_t|pthread_once_t|uint_fast64_t|uint_fast16_t|atomic_size_t|uint_least8_t|int_least64_t|int_least32_t|int_least16_t|pthread_key_t|atomic_ullong|atomic_ushort|uint_fast32_t|atomic_schar|atomic_short|uint_fast8_t|int_fast64_t|int_fast32_t|int_fast16_t|atomic_ulong|atomic_llong|int_least8_t|atomic_uchar|memory_order|suseconds_t|int_fast8_t|atomic_bool|atomic_char|atomic_uint|atomic_long|atomic_int|useconds_t|_Imaginary|blksize_t|pthread_t|in_addr_t|uintptr_t|in_port_t|uintmax_t|uintmax_t|blkcnt_t|uint16_t|unsigned|_Complex|uint32_t|intptr_t|intmax_t|intmax_t|uint64_t|u_quad_t|int64_t|int32_t|ssize_t|caddr_t|clock_t|uint8_t|u_short|swblk_t|segsz_t|int16_t|fixpt_t|daddr_t|nlink_t|qaddr_t|size_t|time_t|mode_t|signed|quad_t|ushort|u_long|u_char|double|int8_t|ino_t|uid_t|pid_t|_Bool|float|dev_t|div_t|short|gid_t|off_t|u_int|key_t|id_t|uint|long|void|char|bool|id_t|int)\\b)[a-zA-Z_]\\w*\\b(?!\\())"
+      "match": "((?:[a-zA-Z_]\\w*|(?<=[\\])]))\\s*)(?:(\\.(?:\\*|))|(->(?:\\*|)))((?:[a-zA-Z_]\\w*\\s*(?:\\.(?:\\*|)|->(?:\\*|))\\s*)*)\\s*(\\b(?!(?:atomic_uint_least64_t|atomic_uint_least16_t|atomic_uint_least32_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_fast64_t|atomic_uint_fast32_t|atomic_int_least64_t|atomic_int_least32_t|pthread_rwlockattr_t|atomic_uint_fast16_t|pthread_mutexattr_t|atomic_int_fast16_t|atomic_uint_fast8_t|atomic_int_fast64_t|atomic_int_least8_t|atomic_int_fast32_t|atomic_int_fast8_t|pthread_condattr_t|atomic_uintptr_t|atomic_ptrdiff_t|pthread_rwlock_t|atomic_uintmax_t|pthread_mutex_t|atomic_intmax_t|atomic_intptr_t|atomic_char32_t|atomic_char16_t|pthread_attr_t|atomic_wchar_t|uint_least64_t|uint_least32_t|uint_least16_t|pthread_cond_t|pthread_once_t|uint_fast64_t|uint_fast16_t|atomic_size_t|uint_least8_t|int_least64_t|int_least32_t|int_least16_t|pthread_key_t|atomic_ullong|atomic_ushort|uint_fast32_t|atomic_schar|atomic_short|uint_fast8_t|int_fast64_t|int_fast32_t|int_fast16_t|atomic_ulong|atomic_llong|int_least8_t|atomic_uchar|memory_order|suseconds_t|int_fast8_t|atomic_bool|atomic_char|atomic_uint|atomic_long|atomic_int|useconds_t|_Imaginary|blksize_t|pthread_t|in_addr_t|uintptr_t|in_port_t|uintmax_t|uintmax_t|blkcnt_t|uint16_t|unsigned|_Complex|uint32_t|intptr_t|intmax_t|intmax_t|uint64_t|u_quad_t|int64_t|int32_t|ssize_t|caddr_t|clock_t|uint8_t|u_short|swblk_t|segsz_t|int16_t|fixpt_t|daddr_t|nlink_t|qaddr_t|size_t|time_t|mode_t|signed|quad_t|ushort|u_long|u_char|double|int8_t|ino_t|uid_t|pid_t|_Bool|float|dev_t|div_t|short|gid_t|off_t|u_int|key_t|id_t|uint|long|void|char|bool|id_t|int)\\b)[a-zA-Z_]\\w*\\b(?!\\())"
     },
     "method_access": {
-      "begin": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*([a-zA-Z_]\\w*)(\\()",
+      "begin": "((?:[a-zA-Z_]\\w*|(?<=[\\])]))\\s*)(?:(\\.(?:\\*|))|(->(?:\\*|)))((?:[a-zA-Z_]\\w*\\s*(?:\\.(?:\\*|)|->(?:\\*|))\\s*)*)\\s*([a-zA-Z_]\\w*)(\\()",
       "beginCaptures": {
         "1": {
           "name": "variable.other.object.access.c"
@@ -1485,7 +1485,7 @@
                   "name": "punctuation.separator.pointer-access.c"
                 }
               },
-              "match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))"
+              "match": "((?:[a-zA-Z_]\\w*|(?<=[\\])]))\\s*)(?:(\\.(?:\\*|))|(->(?:\\*|)))"
             }
           ]
         },
@@ -1529,7 +1529,7 @@
                       "name": "constant.numeric.exponent.hexadecimal.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1541,7 +1541,7 @@
                       "name": "constant.numeric.hexadecimal.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1556,7 +1556,7 @@
                       "name": "constant.numeric.hexadecimal.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1571,7 +1571,7 @@
                       "name": "keyword.operator.plus.exponent.hexadecimal.c"
                     }
                   },
-                  "match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?<!')([pP])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?([lLfF](?!\\w))?$"
+                  "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)?((?:(?<=\\h)\\.|\\.(?=\\h)))(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)?((?<!')([pP])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?([lLfF](?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -1582,7 +1582,7 @@
                       "name": "constant.numeric.exponent.decimal.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1594,7 +1594,7 @@
                       "name": "constant.numeric.decimal.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1609,7 +1609,7 @@
                       "name": "constant.numeric.decimal.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1624,7 +1624,7 @@
                       "name": "keyword.operator.plus.exponent.decimal.c"
                     }
                   },
-                  "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?<!')([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?([lLfF](?!\\w))?$"
+                  "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)?((?<!')([eE])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?([lLfF](?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -1635,7 +1635,7 @@
                       "name": "constant.numeric.binary.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1647,7 +1647,7 @@
                       "name": "keyword.other.unit.suffix.integer.c"
                     }
                   },
-                  "match": "(\\G0[bB])([01](?:[01]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$"
+                  "match": "(\\G0[bB])([01](?:[01]|((?<=\\h)'(?=\\h)))*)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -1658,7 +1658,7 @@
                       "name": "constant.numeric.octal.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1670,7 +1670,7 @@
                       "name": "keyword.other.unit.suffix.integer.c"
                     }
                   },
-                  "match": "(\\G0)((?:[0-7]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))+)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$"
+                  "match": "(\\G0)((?:[0-7]|((?<=\\h)'(?=\\h)))+)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -1681,7 +1681,7 @@
                       "name": "constant.numeric.hexadecimal.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1702,7 +1702,7 @@
                       "name": "constant.numeric.exponent.hexadecimal.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1711,7 +1711,7 @@
                       "name": "keyword.other.unit.suffix.integer.c"
                     }
                   },
-                  "match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?<!')([pP])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$"
+                  "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)((?<!')([pP])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -1719,7 +1719,7 @@
                       "name": "constant.numeric.decimal.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1740,7 +1740,7 @@
                       "name": "constant.numeric.exponent.decimal.c",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)'(?=\\h)",
                           "name": "punctuation.separator.constant.numeric"
                         }
                       ]
@@ -1749,10 +1749,10 @@
                       "name": "keyword.other.unit.suffix.integer.c"
                     }
                   },
-                  "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?<!')([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$"
+                  "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)((?<!')([eE])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$"
                 },
                 {
-                  "match": "(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])+",
+                  "match": "(?:[0-9a-zA-Z_.']|(?<=[eEpP])[+\\-])+",
                   "name": "invalid.illegal.constant.numeric"
                 }
               ]
@@ -1760,7 +1760,7 @@
           ]
         }
       },
-      "match": "(?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])*"
+      "match": "(?<!\\w)\\.?\\d(?:[0-9a-zA-Z_.']|(?<=[eEpP])[+\\-])*"
     },
     "operators": {
       "patterns": [
@@ -1789,7 +1789,7 @@
           "name": "keyword.operator.bitwise.shift.c"
         },
         {
-          "match": "!=|<=|>=|==|<|>",
+          "match": "!=|<=|>=|==|[<>]",
           "name": "keyword.operator.comparison.c"
         },
         {
@@ -1797,7 +1797,7 @@
           "name": "keyword.operator.logical.c"
         },
         {
-          "match": "&|\\||\\^|~",
+          "match": "[\\&|\\^~]",
           "name": "keyword.operator.c"
         },
         {
@@ -1805,7 +1805,7 @@
           "name": "keyword.operator.assignment.c"
         },
         {
-          "match": "%|\\*|/|-|\\+",
+          "match": "[%*/\\-+]",
           "name": "keyword.operator.c"
         },
         {
@@ -1871,7 +1871,7 @@
           "include": "#block_innards"
         },
         {
-          "match": "(?-mix:(?<!:):(?!:))",
+          "match": "(?-im:(?<!:):(?!:))",
           "name": "punctuation.range-based.c"
         }
       ]
@@ -1939,7 +1939,7 @@
           },
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
               "name": "meta.preprocessor.c",
               "patterns": [
@@ -1986,7 +1986,7 @@
               "name": "invalid.illegal.stray-$1.c"
             }
           },
-          "match": "^\\s*#\\s*(else|elif|endif)\\b"
+          "match": "^\\s*#\\s*(e(?:lse|lif|ndif))\\b"
         }
       ]
     },
@@ -2019,7 +2019,7 @@
           },
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
               "name": "meta.preprocessor.c",
               "patterns": [
@@ -2066,14 +2066,14 @@
               "name": "invalid.illegal.stray-$1.c"
             }
           },
-          "match": "^\\s*#\\s*(else|elif|endif)\\b"
+          "match": "^\\s*#\\s*(e(?:lse|lif|ndif))\\b"
         }
       ]
     },
     "preprocessor-rule-conditional-line": {
       "patterns": [
         {
-          "match": "(?:\\bdefined\\b\\s*$)|(?:\\bdefined\\b(?=\\s*\\(*\\s*(?:(?!defined\\b)[a-zA-Z_$][\\w$]*\\b)\\s*\\)*\\s*(?:\\n|//|/\\*|\\?|\\:|&&|\\|\\||\\\\\\s*\\n)))",
+          "match": "\\bdefined\\b(?:\\s*$|(?=\\s*\\(*\\s*(?!defined\\b)[a-zA-Z_$][\\w$]*\\b\\s*\\)*\\s*(?:\\n|//|/\\*|[?:]|&&|\\|\\||\\\\\\s*\\n)))",
           "name": "keyword.control.directive.conditional.c"
         },
         {
@@ -2146,13 +2146,13 @@
     "preprocessor-rule-define-line-blocks": {
       "patterns": [
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.bracket.curly.c"
             }
           },
-          "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)|(?<!\\\\)(?=\\s*\\n)",
+          "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)|(?<!\\\\)(?=\\s*\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.c"
@@ -2178,13 +2178,13 @@
           "include": "#vararg_ellipses"
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.bracket.curly.c"
             }
           },
-          "end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)|(?<!\\\\)(?=\\s*\\n)",
+          "end": "}|(?=\\s*#\\s*e(?:lif|lse|ndif)\\b)|(?<!\\\\)(?=\\s*\\n)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.bracket.curly.c"
@@ -2206,7 +2206,7 @@
           "name": "punctuation.section.parens.end.bracket.round.c"
         },
         {
-          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\()",
+          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[])\\s*\\()",
           "end": "(?<=\\))(?!\\w)|(?<!\\\\)(?=\\s*\\n)",
           "name": "meta.function.c",
           "patterns": [
@@ -2296,7 +2296,7 @@
           "include": "#operators"
         },
         {
-          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])))\\s*(\\()",
+          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.c"
@@ -2370,7 +2370,7 @@
           },
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
               "name": "meta.preprocessor.c",
               "patterns": [
@@ -2404,10 +2404,10 @@
                   "name": "punctuation.definition.directive.c"
                 }
               },
-              "end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lif|lse|ndif)\\b))",
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                   "name": "meta.preprocessor.c",
                   "patterns": [
@@ -2424,7 +2424,7 @@
             {
               "begin": "\\n",
               "contentName": "comment.block.preprocessor.if-branch.c",
-              "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
               "patterns": [
                 {
                   "include": "#disabled"
@@ -2467,7 +2467,7 @@
           },
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
               "name": "meta.preprocessor.c",
               "patterns": [
@@ -2501,10 +2501,10 @@
                   "name": "punctuation.definition.directive.c"
                 }
               },
-              "end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lif|lse|ndif)\\b))",
               "patterns": [
                 {
-                  "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+                  "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
                   "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
                   "name": "meta.preprocessor.c",
                   "patterns": [
@@ -2521,7 +2521,7 @@
             {
               "begin": "\\n",
               "contentName": "comment.block.preprocessor.if-branch.in-block.c",
-              "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
               "patterns": [
                 {
                   "include": "#disabled"
@@ -2548,10 +2548,10 @@
           "name": "punctuation.definition.directive.c"
         }
       },
-      "end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+      "end": "(?=^\\s*((#)\\s*e(?:lif|lse|ndif)\\b))",
       "patterns": [
         {
-          "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+          "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
           "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.c",
           "patterns": [
@@ -2566,7 +2566,7 @@
         {
           "begin": "\\n",
           "contentName": "comment.block.preprocessor.elif-branch.c",
-          "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+          "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
           "patterns": [
             {
               "include": "#disabled"
@@ -2610,7 +2610,7 @@
           },
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
               "name": "meta.preprocessor.c",
               "patterns": [
@@ -2660,7 +2660,7 @@
                 }
               },
               "contentName": "comment.block.preprocessor.if-branch.c",
-              "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
               "patterns": [
                 {
                   "include": "#disabled"
@@ -2672,7 +2672,7 @@
             },
             {
               "begin": "\\n",
-              "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
               "patterns": [
                 {
                   "include": "$self"
@@ -2712,7 +2712,7 @@
           },
           "patterns": [
             {
-              "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+              "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
               "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
               "name": "meta.preprocessor.c",
               "patterns": [
@@ -2762,7 +2762,7 @@
                 }
               },
               "contentName": "comment.block.preprocessor.if-branch.in-block.c",
-              "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
               "patterns": [
                 {
                   "include": "#disabled"
@@ -2774,7 +2774,7 @@
             },
             {
               "begin": "\\n",
-              "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
               "patterns": [
                 {
                   "include": "#block_innards"
@@ -2801,7 +2801,7 @@
       "end": "(?=^\\s*((#)\\s*endif\\b))",
       "patterns": [
         {
-          "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+          "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
           "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.c",
           "patterns": [
@@ -2815,7 +2815,7 @@
         },
         {
           "begin": "\\n",
-          "end": "(?=^\\s*((#)\\s*(?:endif)\\b))",
+          "end": "(?=^\\s*((#)\\s*endif\\b))",
           "patterns": [
             {
               "begin": "^\\s*((#)\\s*(else)\\b)",
@@ -2855,7 +2855,7 @@
                 }
               },
               "contentName": "comment.block.preprocessor.elif-branch.c",
-              "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
               "patterns": [
                 {
                   "include": "#disabled"
@@ -2888,7 +2888,7 @@
       "end": "(?=^\\s*((#)\\s*endif\\b))",
       "patterns": [
         {
-          "begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+          "begin": "\\G(?=.)(?!/(?:/|\\*(?!.*\\\\\\s*\\n)))",
           "end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
           "name": "meta.preprocessor.c",
           "patterns": [
@@ -2902,7 +2902,7 @@
         },
         {
           "begin": "\\n",
-          "end": "(?=^\\s*((#)\\s*(?:endif)\\b))",
+          "end": "(?=^\\s*((#)\\s*endif\\b))",
           "patterns": [
             {
               "begin": "^\\s*((#)\\s*(else)\\b)",
@@ -2942,7 +2942,7 @@
                 }
               },
               "contentName": "comment.block.preprocessor.elif-branch.c",
-              "end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+              "end": "(?=^\\s*((#)\\s*e(?:lse|lif|ndif)\\b))",
               "patterns": [
                 {
                   "include": "#disabled"
@@ -3005,10 +3005,10 @@
           "name": "variable.parameter.probably.c"
         }
       },
-      "match": "(?<=(?:[a-zA-Z_0-9] |[&*>\\]\\)]))\\s*([a-zA-Z_]\\w*)\\s*(?=(?:\\[\\]\\s*)?(?:,|\\)))"
+      "match": "(?<=(?:[a-zA-Z_0-9] |[\\&*>\\])]))\\s*([a-zA-Z_]\\w*)\\s*(?=(?:\\[]\\s*)?[,)])"
     },
     "static_assert": {
-      "begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)static_assert|_Static_assert(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+      "begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)static_assert|_Static_assert(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -3029,7 +3029,7 @@
         "4": {
           "patterns": [
             {
-              "match": "\\*\\/",
+              "match": "\\*/",
               "name": "comment.block.c punctuation.definition.comment.end.c"
             },
             {
@@ -3057,7 +3057,7 @@
         "9": {
           "patterns": [
             {
-              "match": "\\*\\/",
+              "match": "\\*/",
               "name": "comment.block.c punctuation.definition.comment.end.c"
             },
             {
@@ -3075,7 +3075,7 @@
       },
       "patterns": [
         {
-          "begin": "(,)\\s*(?=(?:L|u8|u|U\\s*\\\")?)",
+          "begin": "(,)\\s*(?=(?:L|u8|u|U\\s*\")?)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.separator.delimiter.comma.c"
@@ -3097,15 +3097,15 @@
     "storage_types": {
       "patterns": [
         {
-          "match": "(?-mix:(?<!\\w)(?:unsigned|signed|double|_Bool|short|float|long|void|char|bool|int)(?!\\w))",
+          "match": "(?-im:(?<!\\w)(?:unsigned|signed|double|_Bool|short|float|long|void|char|bool|int)(?!\\w))",
           "name": "storage.type.built-in.primitive.c"
         },
         {
-          "match": "(?-mix:(?<!\\w)(?:atomic_uint_least64_t|atomic_uint_least16_t|atomic_uint_least32_t|pthread_rwlockattr_t|atomic_uint_fast64_t|atomic_uint_fast32_t|atomic_uint_fast16_t|atomic_int_least64_t|atomic_int_least32_t|atomic_int_least16_t|atomic_uint_least8_t|atomic_uint_fast8_t|atomic_int_least8_t|atomic_int_fast16_t|pthread_mutexattr_t|atomic_int_fast32_t|atomic_int_fast64_t|atomic_int_fast8_t|pthread_condattr_t|atomic_ptrdiff_t|pthread_rwlock_t|atomic_uintptr_t|atomic_uintmax_t|atomic_intmax_t|atomic_intptr_t|atomic_char32_t|atomic_char16_t|pthread_mutex_t|pthread_cond_t|atomic_wchar_t|uint_least64_t|uint_least32_t|uint_least16_t|pthread_once_t|pthread_attr_t|int_least32_t|pthread_key_t|int_least16_t|int_least64_t|uint_least8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|atomic_ushort|atomic_ullong|atomic_size_t|int_fast16_t|int_fast64_t|uint_fast8_t|atomic_short|atomic_uchar|atomic_schar|int_least8_t|memory_order|atomic_llong|atomic_ulong|int_fast32_t|atomic_long|atomic_uint|atomic_char|int_fast8_t|suseconds_t|atomic_bool|atomic_int|_Imaginary|useconds_t|in_port_t|uintmax_t|uintmax_t|pthread_t|blksize_t|in_addr_t|uintptr_t|blkcnt_t|uint16_t|uint32_t|uint64_t|u_quad_t|_Complex|intptr_t|intmax_t|intmax_t|segsz_t|u_short|nlink_t|uint8_t|int64_t|int32_t|int16_t|fixpt_t|daddr_t|caddr_t|qaddr_t|ssize_t|clock_t|swblk_t|u_long|mode_t|int8_t|time_t|ushort|u_char|quad_t|size_t|pid_t|gid_t|uid_t|dev_t|div_t|off_t|u_int|key_t|ino_t|uint|id_t|id_t)(?!\\w))",
+          "match": "(?-im:(?<!\\w)(?:atomic_uint_least64_t|atomic_uint_least16_t|atomic_uint_least32_t|pthread_rwlockattr_t|atomic_uint_fast64_t|atomic_uint_fast32_t|atomic_uint_fast16_t|atomic_int_least64_t|atomic_int_least32_t|atomic_int_least16_t|atomic_uint_least8_t|atomic_uint_fast8_t|atomic_int_least8_t|atomic_int_fast16_t|pthread_mutexattr_t|atomic_int_fast32_t|atomic_int_fast64_t|atomic_int_fast8_t|pthread_condattr_t|atomic_ptrdiff_t|pthread_rwlock_t|atomic_uintptr_t|atomic_uintmax_t|atomic_intmax_t|atomic_intptr_t|atomic_char32_t|atomic_char16_t|pthread_mutex_t|pthread_cond_t|atomic_wchar_t|uint_least64_t|uint_least32_t|uint_least16_t|pthread_once_t|pthread_attr_t|int_least32_t|pthread_key_t|int_least16_t|int_least64_t|uint_least8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|atomic_ushort|atomic_ullong|atomic_size_t|int_fast16_t|int_fast64_t|uint_fast8_t|atomic_short|atomic_uchar|atomic_schar|int_least8_t|memory_order|atomic_llong|atomic_ulong|int_fast32_t|atomic_long|atomic_uint|atomic_char|int_fast8_t|suseconds_t|atomic_bool|atomic_int|_Imaginary|useconds_t|in_port_t|uintmax_t|uintmax_t|pthread_t|blksize_t|in_addr_t|uintptr_t|blkcnt_t|uint16_t|uint32_t|uint64_t|u_quad_t|_Complex|intptr_t|intmax_t|intmax_t|segsz_t|u_short|nlink_t|uint8_t|int64_t|int32_t|int16_t|fixpt_t|daddr_t|caddr_t|qaddr_t|ssize_t|clock_t|swblk_t|u_long|mode_t|int8_t|time_t|ushort|u_char|quad_t|size_t|pid_t|gid_t|uid_t|dev_t|div_t|off_t|u_int|key_t|ino_t|uint|id_t|id_t)(?!\\w))",
           "name": "storage.type.built-in.c"
         },
         {
-          "match": "(?-mix:\\b(enum|struct|union)\\b)",
+          "match": "(?-im:\\b(enum|struct|union)\\b)",
           "name": "storage.type.$1.c"
         },
         {
@@ -3139,7 +3139,7 @@
                 "4": {
                   "patterns": [
                     {
-                      "match": "\\*\\/",
+                      "match": "\\*/",
                       "name": "comment.block.c punctuation.definition.comment.end.c"
                     },
                     {
@@ -3149,13 +3149,13 @@
                   ]
                 }
               },
-              "match": "(?:^)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:\\n|$)"
+              "match": "^((?:(?:(?>\\s+)|(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:\\n|$)"
             },
             {
               "include": "#comments"
             },
             {
-              "begin": "(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\()",
+              "begin": "(((?:(?:(?>\\s+)|(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\()",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.section.parens.begin.bracket.round.assembly.c"
@@ -3176,7 +3176,7 @@
                 "5": {
                   "patterns": [
                     {
-                      "match": "\\*\\/",
+                      "match": "\\*/",
                       "name": "comment.block.c punctuation.definition.comment.end.c"
                     },
                     {
@@ -3269,7 +3269,7 @@
                     "4": {
                       "patterns": [
                         {
-                          "match": "\\*\\/",
+                          "match": "\\*/",
                           "name": "comment.block.c punctuation.definition.comment.end.c"
                         },
                         {
@@ -3297,7 +3297,7 @@
                     "9": {
                       "patterns": [
                         {
-                          "match": "\\*\\/",
+                          "match": "\\*/",
                           "name": "comment.block.c punctuation.definition.comment.end.c"
                         },
                         {
@@ -3307,7 +3307,7 @@
                       ]
                     }
                   },
-                  "match": "\\[((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))([a-zA-Z_]\\w*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\]"
+                  "match": "\\[((?:(?:(?>\\s+)|(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))([a-zA-Z_]\\w*)((?:(?:(?>\\s+)|(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))]"
                 },
                 {
                   "match": ":",
@@ -3325,7 +3325,7 @@
     "string_escaped_char": {
       "patterns": [
         {
-          "match": "\\\\(\\\\|[abefnprtv'\"?]|[0-3]\\d{,2}|[4-7]\\d?|x[a-fA-F0-9]{,2}|u[a-fA-F0-9]{,4}|U[a-fA-F0-9]{,8})",
+          "match": "\\\\([\\\\abefnprtv'\"?]|[0-3]\\d{0,2}|[4-7]\\d?|x\\h{0,2}|u\\h{0,4}|U\\h{0,8})",
           "name": "constant.character.escape.c"
         },
         {
@@ -3337,7 +3337,7 @@
     "string_placeholder": {
       "patterns": [
         {
-          "match": "%(\\d+\\$)?[#0\\- +']*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]",
+          "match": "%(\\d+\\$)?[#0\\- +']*[,;:_]?((-?\\d+)|\\*(-?\\d+\\$)?)?(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?(hh|h|ll|[ljtzqL]|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]",
           "name": "constant.other.placeholder.c"
         },
         {
@@ -3404,7 +3404,7 @@
       ]
     },
     "switch_conditional_parentheses": {
-      "begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+      "begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -3422,7 +3422,7 @@
         "4": {
           "patterns": [
             {
-              "match": "\\*\\/",
+              "match": "\\*/",
               "name": "comment.block.c punctuation.definition.comment.end.c"
             },
             {
@@ -3452,7 +3452,7 @@
       ]
     },
     "switch_statement": {
-      "begin": "(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)switch(?!\\w)))",
+      "begin": "(((?>(?:(?:(?>(?<!\\s)\\s+)|(/\\*)((?>(?:[^*]|(?>\\*+)[^/])*)((?>\\*+)/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)switch(?!\\w)))",
       "beginCaptures": {
         "1": {
           "name": "meta.head.switch.c"
@@ -3473,7 +3473,7 @@
         "5": {
           "patterns": [
             {
-              "match": "\\*\\/",
+              "match": "\\*/",
               "name": "comment.block.c punctuation.definition.comment.end.c"
             },
             {
@@ -3486,7 +3486,7 @@
           "name": "keyword.control.switch.c"
         }
       },
-      "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
+      "end": "(?:(?<=}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
       "name": "meta.block.switch.c",
       "patterns": [
         {
@@ -3509,7 +3509,7 @@
         },
         {
           "begin": "(?<=\\{|<%|\\?\\?<)",
-          "end": "(\\}|%>|\\?\\?>)",
+          "end": "(}|%>|\\?\\?>)",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.block.end.bracket.curly.switch.c"
@@ -3532,7 +3532,7 @@
           ]
         },
         {
-          "begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
+          "begin": "(?<=}|%>|\\?\\?>)[\\s\\n]*",
           "end": "[\\s\\n]*(?=;)",
           "name": "meta.tail.switch.c",
           "patterns": [