tm-grammars 1.22.19 → 1.23.0

package/grammars/ada.json

@@ -42,13 +42,13 @@
           "name": "punctuation.ada"
         },
         {
-          "match": "\\b(\\w|\\d|\\.|_)+\\b",
+          "match": "\\b([\\w\\d._])+\\b",
           "name": "entity.name.task.ada"
         }
       ]
     },
     "accept_statement": {
-      "begin": "(?i)\\b(accept)\\s+((?:\\w|\\d|\\.|_)+)\\b",
+      "begin": "(?i)\\b(accept)\\s+([\\w\\d._]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.ada"
@@ -105,7 +105,7 @@
           "name": "entity.name.type.ada"
         }
       },
-      "match": "(?i)(not\\s+null\\s+)?(access)\\s+(constant\\s+)?((?:\\w|\\d|\\.|_)+)\\b",
+      "match": "(?i)(not\\s+null\\s+)?(access)\\s+(constant\\s+)?([\\w\\d._]+)\\b",
       "name": "meta.declaration.access.definition.ada"
     },
     "access_type_definition": {
@@ -153,7 +153,7 @@
       ]
     },
     "adding_operator": {
-      "match": "(\\+|-|\\&)",
+      "match": "([+\\-\\&])",
       "name": "keyword.operator.adding.ada"
     },
     "array_aggregate": {
@@ -198,7 +198,7 @@
           ]
         }
       },
-      "match": "(?i)\\b([^(=>)]*)\\s*(=>)\\s*([^,\\)]+)",
+      "match": "(?i)\\b([^(=>)]*)\\s*(=>)\\s*([^,)]+)",
       "name": "meta.definition.array.aggregate.component.ada"
     },
     "array_dimensions": {
@@ -347,7 +347,7 @@
                   ]
                 }
               },
-              "match": "((?:\\w|\\d|_)+)('((?:\\w|\\d|_)+))?"
+              "match": "([\\w\\d_]+)('([\\w\\d_]+))?"
             }
           ]
         }
@@ -360,7 +360,7 @@
           "name": "keyword.other.ada"
         }
       },
-      "end": "(?i)(?=(,|;|\\bis\\b))",
+      "end": "(?i)(?=([,;]|\\bis\\b))",
       "name": "meta.aspect.definition.ada",
       "patterns": [
         {
@@ -380,7 +380,7 @@
           "name": "entity.other.attribute-name.ada"
         }
       },
-      "match": "(?i)\\b((?:\\w|\\d|\\.|_)+)(?:(')(class))?\\b",
+      "match": "(?i)\\b([\\w\\d._]+)(?:(')(class))?\\b",
       "name": "meta.aspect.mark.ada"
     },
     "aspect_specification": {
@@ -450,12 +450,12 @@
       ]
     },
     "assignment_statement": {
-      "begin": "\\b((?:\\w|\\d|\\.|_|\\(|\\)|\"|'|\\s)+)\\s*(:=)",
+      "begin": "\\b([\\w\\d._()\"'\\s]+)\\s*(:=)",
       "beginCaptures": {
         "1": {
           "patterns": [
             {
-              "match": "((?:\\w|\\d|\\.|_)+)",
+              "match": "([\\w\\d._]+)",
               "name": "variable.name.ada"
             },
             {
@@ -503,7 +503,7 @@
           "name": "entity.other.attribute-name.ada"
         }
       },
-      "match": "(')((?:\\w|\\d|_)+)\\b",
+      "match": "(')([\\w\\d_]+)\\b",
       "name": "meta.attribute.ada"
     },
     "based_literal": {
@@ -534,7 +534,7 @@
           ]
         }
       },
-      "match": "(?i)(\\d(?:(_)?\\d)*#)[0-9a-f](?:(_)?[0-9a-f])*(?:(\\.)[0-9a-f](?:(_)?[0-9a-f])*)?(#)([eE](?:\\+|\\-)?\\d(?:_?\\d)*)?",
+      "match": "(?i)(\\d(?:(_)?\\d)*#)[0-9a-f](?:(_)?[0-9a-f])*(?:(\\.)[0-9a-f](?:(_)?[0-9a-f])*)?(#)([eE][+\\-]?\\d(?:_?\\d)*)?",
       "name": "constant.numeric.ada"
     },
     "basic_declaration": {
@@ -594,7 +594,7 @@
           "name": "keyword.ada"
         }
       },
-      "end": "(?i)\\b(end)(\\s+(?:\\w|\\d|_)+)?\\s*(;)",
+      "end": "(?i)\\b(end)(\\s+[\\w\\d_]+)?\\s*(;)",
       "endCaptures": {
         "1": {
           "name": "keyword.ada"
@@ -778,11 +778,11 @@
           "name": "entity.name.section.ada"
         }
       },
-      "match": "--\\s*([^-].*?[^-])\\s*--\\s*$",
+      "match": "--\\s*([^\\-].*?[^\\-])\\s*--\\s*$",
       "name": "comment.line.double-dash.ada"
     },
     "component_clause": {
-      "begin": "(?i)\\b((?:\\w|\\d|_)+)\\b",
+      "begin": "(?i)\\b([\\w\\d_]+)\\b",
       "beginCaptures": {
         "0": {
           "name": "variable.name.ada"
@@ -816,7 +816,7 @@
       ]
     },
     "component_declaration": {
-      "begin": "(?i)\\b((?:\\w|\\d|_)+(?:\\s*,\\s*(?:\\w|\\d|_)+)?)\\s*(:)",
+      "begin": "(?i)\\b([\\w\\d_]+(?:\\s*,\\s*[\\w\\d_]+)?)\\s*(:)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -825,7 +825,7 @@
               "name": "punctuation.ada"
             },
             {
-              "match": "\\b(\\w|\\d|_)+\\b",
+              "match": "\\b([\\w\\d_])+\\b",
               "name": "variable.name.ada"
             }
           ]
@@ -941,7 +941,7 @@
               ]
             }
           },
-          "match": "(?i)\\b((?:\\w|\\d|_)+)\\s*(=>)\\s*([^,\\)])+\\b"
+          "match": "(?i)\\b([\\w\\d_]+)\\s*(=>)\\s*([^,)])+\\b"
         },
         {
           "include": "#expression"
@@ -967,7 +967,7 @@
           ]
         }
       },
-      "match": "\\d(?:(_)?\\d)*(?:(\\.)\\d(?:(_)?\\d)*)?([eE](?:\\+|\\-)?\\d(?:_?\\d)*)?",
+      "match": "\\d(?:(_)?\\d)*(?:(\\.)\\d(?:(_)?\\d)*)?([eE][+\\-]?\\d(?:_?\\d)*)?",
       "name": "constant.numeric.ada"
     },
     "declarative_item": {
@@ -1067,7 +1067,7 @@
       ]
     },
     "discriminant_specification": {
-      "begin": "(?i)\\b((?:\\w|\\d|_)+(?:\\s*,\\s*(?:\\w|\\d|_)+)?)\\s*(:)",
+      "begin": "(?i)\\b([\\w\\d_]+(?:\\s*,\\s*[\\w\\d_]+)?)\\s*(:)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1076,7 +1076,7 @@
               "name": "punctuation.ada"
             },
             {
-              "match": "\\b(\\w|\\d|_)+\\b",
+              "match": "\\b([\\w\\d_])+\\b",
               "name": "variable.name.ada"
             }
           ]
@@ -1085,7 +1085,7 @@
           "name": "punctuation.ada"
         }
       },
-      "end": "(?=(;|\\)))",
+      "end": "(?=([;)]))",
       "patterns": [
         {
           "begin": ":=",
@@ -1094,7 +1094,7 @@
               "name": "keyword.operator.new.ada"
             }
           },
-          "end": "(?=(;|\\)))",
+          "end": "(?=([;)]))",
           "patterns": [
             {
               "include": "#expression"
@@ -1114,7 +1114,7 @@
               ]
             }
           },
-          "match": "(?i)(not\\s+null\\s+)?((?:\\w|\\d|\\.|_)+)\\b"
+          "match": "(?i)(not\\s+null\\s+)?([\\w\\d._]+)\\b"
         },
         {
           "include": "#access_definition"
@@ -1122,7 +1122,7 @@
       ]
     },
     "entry_body": {
-      "begin": "(?i)\\b(entry)\\s+((?:\\w|\\d|_)+)\\b",
+      "begin": "(?i)\\b(entry)\\s+([\\w\\d_]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.ada"
@@ -1192,7 +1192,7 @@
       ]
     },
     "entry_declaration": {
-      "begin": "(?i)\\b(?:(not)?\\s+(overriding)\\s+)?(entry)\\s+((?:\\w|\\d|_)+)\\b",
+      "begin": "(?i)\\b(?:(not)?\\s+(overriding)\\s+)?(entry)\\s+([\\w\\d_]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.ada"
@@ -1239,7 +1239,7 @@
           "name": "punctuation.ada"
         },
         {
-          "match": "\\b(\\w|\\d|_)+\\b",
+          "match": "\\b([\\w\\d_])+\\b",
           "name": "variable.name.ada"
         },
         {
@@ -1248,7 +1248,7 @@
       ]
     },
     "exception_declaration": {
-      "begin": "(?i)\\b((?:\\w|\\d|_)+(?:\\s*,\\s*(?:\\w|\\d|_)+)?)\\s*(:)\\s*(exception)",
+      "begin": "(?i)\\b([\\w\\d_]+(?:\\s*,\\s*[\\w\\d_]+)?)\\s*(:)\\s*(exception)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1257,7 +1257,7 @@
               "name": "punctuation.ada"
             },
             {
-              "match": "\\b(\\w|\\d|_)+\\b",
+              "match": "\\b([\\w\\d_])+\\b",
               "name": "entity.name.exception.ada"
             }
           ]
@@ -1278,7 +1278,7 @@
       "name": "meta.declaration.exception.ada",
       "patterns": [
         {
-          "match": "(?i)\\b(renames)\\s+((\\w|\\d|_|\\.)+)",
+          "match": "(?i)\\b(renames)\\s+(([\\w\\d_.])+)",
           "name": "entity.name.exception.ada"
         }
       ]
@@ -1313,7 +1313,7 @@
           ]
         },
         {
-          "match": "(?:\\w|\\d|_)+",
+          "match": "[\\w\\d_]+",
           "name": "entity.name.label.ada"
         }
       ]
@@ -1330,7 +1330,7 @@
           "name": "punctuation.ada"
         }
       },
-      "match": "([eE])(\\+|\\-)?\\d(?:(_)?\\d)*"
+      "match": "([eE])([+\\-])?\\d(?:(_)?\\d)*"
     },
     "expression": {
       "name": "meta.expression.ada",
@@ -1394,7 +1394,7 @@
           "name": "keyword.control.ada"
         }
       },
-      "end": "(?i)\\b(end)\\s+(loop)(\\s+(?:\\w|\\d|_)+)?\\s*(;)",
+      "end": "(?i)\\b(end)\\s+(loop)(\\s+[\\w\\d_]+)?\\s*(;)",
       "endCaptures": {
         "1": {
           "name": "keyword.control.ada"
@@ -1432,7 +1432,7 @@
                   "name": "keyword.control.ada"
                 }
               },
-              "match": "(?i)\\b((?:\\w|\\d|_)+)\\s+(in)(\\s+reverse)?\\b"
+              "match": "(?i)\\b([\\w\\d_]+)\\s+(in)(\\s+reverse)?\\b"
             },
             {
               "captures": {
@@ -1456,7 +1456,7 @@
                   "name": "keyword.control.ada"
                 }
               },
-              "match": "(?i)\\b((?:\\w|\\d|_)+)(?:\\s*(:)\\s*((?:\\w|\\d|\\.|_)+))?\\s+(of)(\\s+reverse)?\\b"
+              "match": "(?i)\\b([\\w\\d_]+)(?:\\s*(:)\\s*([\\w\\d._]+))?\\s+(of)(\\s+reverse)?\\b"
             },
             {
               "include": "#expression"
@@ -1479,7 +1479,7 @@
       ]
     },
     "function_body": {
-      "begin": "(?i)\\b(overriding\\s+)?(function)\\s+(?:((?:\\w|\\d|\\.|_)+\\b)|(\".+\"))",
+      "begin": "(?i)\\b(overriding\\s+)?(function)\\s+(?:([\\w\\d._]+\\b)|(\".+\"))",
       "beginCaptures": {
         "1": {
           "name": "storage.visibility.ada"
@@ -1559,7 +1559,7 @@
               "name": "meta.declaration.package.generic.ada",
               "patterns": [
                 {
-                  "match": "((?:\\w|\\d|\\.|_)+)",
+                  "match": "([\\w\\d._]+)",
                   "name": "entity.name.function.ada"
                 },
                 {
@@ -1669,7 +1669,7 @@
                       "name": "punctuation.ada"
                     }
                   },
-                  "match": "\\b((?:\\w|\\d|\\.|_)+)\\s*(:)"
+                  "match": "\\b([\\w\\d._]+)\\s*(:)"
                 },
                 {
                   "match": "\\|",
@@ -1680,7 +1680,7 @@
                   "name": "keyword.ada"
                 },
                 {
-                  "match": "(?:\\w|\\d|\\.|_)+",
+                  "match": "[\\w\\d._]+",
                   "name": "entity.name.exception.ada"
                 }
               ]
@@ -1727,7 +1727,7 @@
               "name": "keyword.control.ada"
             }
           },
-          "end": "(?i)(?:(?<!\\sand)\\s+(?=then))",
+          "end": "(?i)(?<!\\sand)\\s+(?=then)",
           "patterns": [
             {
               "include": "#expression"
@@ -1750,7 +1750,7 @@
         },
         {
           "begin": "(?i)(?<=if)\\b",
-          "end": "(?i)(?:(?<!\\sand)\\s+(?=then))",
+          "end": "(?i)(?<!\\sand)\\s+(?=then)",
           "endCaptures": {
             "0": {
               "name": "keyword.control.ada"
@@ -1769,7 +1769,7 @@
               "name": "keyword.control.ada"
             }
           },
-          "end": "(?i)(?=(elsif|else|end))",
+          "end": "(?i)(?=(e(?:lsif|lse|nd)))",
           "patterns": [
             {
               "include": "#statement"
@@ -1834,7 +1834,7 @@
           "name": "keyword.modifier.unknown.ada"
         },
         {
-          "match": "(\\+|-|\\*|/)",
+          "match": "([+\\-*/])",
           "name": "keyword.operator.arithmetic.ada"
         },
         {
@@ -1842,11 +1842,11 @@
           "name": "keyword.operator.assignment.ada"
         },
         {
-          "match": "(=|/=|<|>|<=|>=)",
+          "match": "(=|/=|[<>]|<=|>=)",
           "name": "keyword.operator.logic.ada"
         },
         {
-          "match": "\\&",
+          "match": "&",
           "name": "keyword.operator.concatenation.ada"
         }
       ]
@@ -1882,7 +1882,7 @@
           "name": "punctuation.label.ada"
         }
       },
-      "match": "(<<)?((?:\\w|\\d|_)+)\\s*(:[^=]|>>)",
+      "match": "(<<)?([\\w\\d_]+)\\s*(:[^=]|>>)",
       "name": "meta.label.ada"
     },
     "library_unit": {
@@ -1931,7 +1931,7 @@
       ]
     },
     "multiplying_operator": {
-      "match": "(?i)(\\*|/|\\bmod\\b|\\brem\\b)",
+      "match": "(?i)([*/]|\\bmod\\b|\\brem\\b)",
       "name": "keyword.operator.multiplying.ada"
     },
     "null_statement": {
@@ -1947,7 +1947,7 @@
       "name": "meta.statement.null.ada"
     },
     "object_declaration": {
-      "begin": "(?i)\\b((?:\\w|\\d|_)+(?:\\s*,\\s*(?:\\w|\\d|_)+)*)\\s*(:)",
+      "begin": "(?i)\\b([\\w\\d_]+(?:\\s*,\\s*[\\w\\d_]+)*)\\s*(:)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1956,7 +1956,7 @@
               "name": "punctuation.ada"
             },
             {
-              "match": "\\b(\\w|\\d|_)+\\b",
+              "match": "\\b([\\w\\d_])+\\b",
               "name": "variable.name.ada"
             }
           ]
@@ -2044,7 +2044,7 @@
       ]
     },
     "package_body": {
-      "begin": "(?i)\\b(package)\\s+(body)\\s+((?:\\w|\\d|\\.|_)+)\\b",
+      "begin": "(?i)\\b(package)\\s+(body)\\s+([\\w\\d._]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.ada"
@@ -2099,7 +2099,7 @@
               "name": "keyword.ada"
             }
           },
-          "end": "(?i)(?=(\\bbegin\\b|\\bend\\b))",
+          "end": "(?i)(?=(\\b(?:begin\\b|end\\b)))",
           "patterns": [
             {
               "match": "(?i)\\bprivate\\b",
@@ -2126,11 +2126,11 @@
       ]
     },
     "package_mark": {
-      "match": "\\b(\\w|\\d|\\.|_)+\\b",
+      "match": "\\b([\\w\\d._])+\\b",
       "name": "entity.name.package.ada"
     },
     "package_specification": {
-      "begin": "(?i)\\b(package)\\s+((?:\\w|\\d|\\.|_)+)\\b",
+      "begin": "(?i)\\b(package)\\s+([\\w\\d._]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.ada"
@@ -2216,7 +2216,7 @@
               "name": "keyword.other.ada"
             }
           },
-          "match": "((?:\\w|\\d|_)+)\\s*(=>)"
+          "match": "([\\w\\d_]+)\\s*(=>)"
         },
         {
           "include": "#expression"
@@ -2281,7 +2281,7 @@
           "name": "punctuation.ada"
         },
         {
-          "match": "\\b(?:\\w|\\d|\\.|_)+\\b",
+          "match": "\\b[\\w\\d._]+\\b",
           "name": "variable.parameter.ada"
         },
         {
@@ -2312,7 +2312,7 @@
               ]
             }
           },
-          "match": "(?i)\\b(others)\\s*(=>)\\s*([^,\\)]+)"
+          "match": "(?i)\\b(others)\\s*(=>)\\s*([^,)]+)"
         },
         {
           "include": "#expression"
@@ -2320,7 +2320,7 @@
       ]
     },
     "pragma": {
-      "begin": "(?i)\\b(pragma)\\s+((?:\\w|\\d|_)+)\\b",
+      "begin": "(?i)\\b(pragma)\\s+([\\w\\d_]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.ada"
@@ -2391,7 +2391,7 @@
       ]
     },
     "procedure_body": {
-      "begin": "(?i)\\b(overriding\\s+)?(procedure)\\s+((?:\\w|\\d|\\.|_)+)\\b",
+      "begin": "(?i)\\b(overriding\\s+)?(procedure)\\s+([\\w\\d._]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "storage.visibility.ada"
@@ -2437,7 +2437,7 @@
               "name": "meta.declaration.package.generic.ada",
               "patterns": [
                 {
-                  "match": "((?:\\w|\\d|\\.|_)+)",
+                  "match": "([\\w\\d._]+)",
                   "name": "entity.name.function.ada"
                 },
                 {
@@ -2483,7 +2483,7 @@
       ]
     },
     "procedure_call_statement": {
-      "begin": "(?i)\\b((?:\\w|\\d|_|\\.)+)\\b",
+      "begin": "(?i)\\b([\\w\\d_.]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.ada"
@@ -2516,7 +2516,7 @@
       ]
     },
     "protected_body": {
-      "begin": "(?i)\\b(protected)\\s+(body)\\s+((?:\\w|\\d|\\.|_)+)\\b",
+      "begin": "(?i)\\b(protected)\\s+(body)\\s+([\\w\\d._]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.ada"
@@ -2610,7 +2610,7 @@
               "name": "keyword.ada"
             }
           },
-          "end": "(?=(;|\\)))",
+          "end": "(?=([;)]))",
           "patterns": [
             {
               "include": "#expression"
@@ -2618,7 +2618,7 @@
           ]
         },
         {
-          "match": "\\b(\\w|\\d|_)+\\b",
+          "match": "\\b([\\w\\d_])+\\b",
           "name": "entity.name.exception.ada"
         }
       ]
@@ -2653,7 +2653,7 @@
           ]
         },
         {
-          "match": "\\b(\\w|\\d|\\.|_)+\\b",
+          "match": "\\b([\\w\\d._])+\\b",
           "name": "entity.name.exception.ada"
         }
       ]
@@ -2846,7 +2846,7 @@
           "name": "keyword.control.ada"
         },
         {
-          "match": "\\b(\\w|\\d|\\.|_)+\\b",
+          "match": "\\b([\\w\\d._])+\\b",
           "name": "entity.name.function.ada"
         }
       ]
@@ -2917,7 +2917,7 @@
               "name": "entity.name.type.ada"
             }
           },
-          "match": "\\b((?:\\w|\\d|_)+)\\s*(:)\\s*((?:\\w|\\d|\\.|_)+)\\b"
+          "match": "\\b([\\w\\d_]+)\\s*(:)\\s*([\\w\\d._]+)\\b"
         },
         {
           "match": ":=",
@@ -2932,7 +2932,7 @@
       "name": "meta.declaration.constraint.scalar.ada",
       "patterns": [
         {
-          "begin": "(?i)\\b(digits|delta)\\b",
+          "begin": "(?i)\\b(d(?:igits|elta))\\b",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.ada"
@@ -3039,7 +3039,7 @@
           "name": "keyword.control.ada"
         }
       },
-      "end": "(?i)\\b(end)\\s+(loop)(\\s+(?:\\w|\\d|_)+)?\\s*(;)",
+      "end": "(?i)\\b(end)\\s+(loop)(\\s+[\\w\\d_]+)?\\s*(;)",
       "endCaptures": {
         "1": {
           "name": "keyword.control.ada"
@@ -3062,7 +3062,7 @@
       ]
     },
     "single_protected_declaration": {
-      "begin": "(?i)\\b(protected)\\s+((?:\\w|\\d|_)+)\\b",
+      "begin": "(?i)\\b(protected)\\s+([\\w\\d_]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.ada"
@@ -3133,7 +3133,7 @@
       ]
     },
     "single_task_declaration": {
-      "begin": "(?i)\\b(task)\\s+((?:\\w|\\d|_)+)\\b",
+      "begin": "(?i)\\b(task)\\s+([\\w\\d_]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.ada"
@@ -3318,7 +3318,7 @@
       "end": "(?=(with|;))",
       "patterns": [
         {
-          "match": "(?:\\w|\\d|_|\\.)+",
+          "match": "[\\w\\d_.]+",
           "name": "entity.name.function.ada"
         }
       ]
@@ -3414,7 +3414,7 @@
               "name": "keyword.ada"
             }
           },
-          "end": "(?=(;|\\)))",
+          "end": "(?=([;)]))",
           "patterns": [
             {
               "include": "#parameter_profile"
@@ -3426,7 +3426,7 @@
                   "name": "keyword.ada"
                 }
               },
-              "end": "(?=(;|\\)))",
+              "end": "(?=([;)]))",
               "patterns": [
                 {
                   "include": "#subtype_mark"
@@ -3446,7 +3446,7 @@
               ]
             }
           },
-          "match": "\\b(?:\\w|\\d|\\.|_)+\\b",
+          "match": "\\b[\\w\\d._]+\\b",
           "name": "entity.name.type.ada"
         },
         {
@@ -3455,7 +3455,7 @@
       ]
     },
     "task_body": {
-      "begin": "(?i)\\b(task)\\s+(body)\\s+((\\w|\\d|\\.|_)+)\\b",
+      "begin": "(?i)\\b(task)\\s+(body)\\s+(([\\w\\d._])+)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.ada"
@@ -3525,7 +3525,7 @@
       ]
     },
     "task_type_declaration": {
-      "begin": "(?i)\\b(task)\\s+(type)\\s+((\\w|\\d|\\.|_)+)\\b",
+      "begin": "(?i)\\b(task)\\s+(type)\\s+(([\\w\\d._])+)\\b",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.ada"
@@ -3750,7 +3750,7 @@
           },
           "patterns": [
             {
-              "match": "(?:\\w|\\d|_)+",
+              "match": "[\\w\\d_]+",
               "name": "variable.name.ada"
             },
             {
@@ -3803,7 +3803,7 @@
           "name": "keyword.control.ada"
         }
       },
-      "end": "(?i)\\b(end)\\s+(loop)(\\s+(?:\\w|\\d|_)+)?\\s*(;)",
+      "end": "(?i)\\b(end)\\s+(loop)(\\s+[\\w\\d_]+)?\\s*(;)",
       "endCaptures": {
         "1": {
           "name": "keyword.control.ada"