tm-grammars 1.22.2 → 1.22.4

package/grammars/polar.json

@@ -85,7 +85,7 @@
           "name": "constant.numeric.float"
         },
         {
-          "match": "\\b(\\+|-)[\\d]+\\b",
+          "match": "\\b(\\+|\\-)[\\d]+\\b",
           "name": "constant.numeric.integer"
         },
         {
@@ -95,7 +95,7 @@
       ]
     },
     "object-literal": {
-      "begin": "([a-zA-Z_]\\w*(?:::\\w+)*)\\s*\\{",
+      "begin": "([a-zA-Z_][a-zA-Z0-9_]*(?:::[a-zA-Z0-9_]+)*)\\s*\\{",
       "beginCaptures": {
         "1": {
           "name": "entity.name.type.resource"
@@ -124,7 +124,7 @@
       "match": "(\\+|-|\\*|\\/|<|>|=|!)"
     },
     "resource-block": {
-      "begin": "(?<resourceType>[a-zA-Z_]\\w*(?:::\\w+)*){0}((?:(resource|actor)\\s+(\\g<resourceType>)(?:\\s+(extends)\\s+(\\g<resourceType>(?:\\s*,\\s*\\g<resourceType>)*)\\s*,?\\s*)?)|(global))\\s*{",
+      "begin": "(?<resourceType>[a-zA-Z_][a-zA-Z0-9_]*(?:::[a-zA-Z0-9_]+)*){0}((?:(resource|actor)\\s+(\\g<resourceType>)(?:\\s+(extends)\\s+(\\g<resourceType>(?:\\s*,\\s*\\g<resourceType>)*)\\s*,?\\s*)?)|(global))\\s*{",
       "beginCaptures": {
         "3": {
           "comment": "actor|resource",
@@ -142,7 +142,7 @@
           "comment": "list of extended resources",
           "patterns": [
             {
-              "match": "([a-zA-Z_]\\w*(?:::\\w+)*)",
+              "match": "([a-zA-Z_][a-zA-Z0-9_]*(?:::[a-zA-Z0-9_]+)*)",
               "name": "entity.name.type"
             }
           ]
@@ -207,7 +207,7 @@
       ]
     },
     "rule-functor": {
-      "begin": "([a-zA-Z_]\\w*(?:::\\w+)*)\\s*\\(",
+      "begin": "([a-zA-Z_][a-zA-Z0-9_]*(?:::[a-zA-Z0-9_]+)*)\\s*\\(",
       "beginCaptures": {
         "1": {
           "name": "support.function.rule"
@@ -248,7 +248,7 @@
           "name": "entity.name.type.resource"
         }
       },
-      "match": "[a-zA-Z_]\\w*(?:::\\w+)*\\s*:\\s*([a-zA-Z_]\\w*(?:::\\w+)*)"
+      "match": "[a-zA-Z_][a-zA-Z0-9_]*(?:::[a-zA-Z0-9_]+)*\\s*:\\s*([a-zA-Z_][a-zA-Z0-9_]*(?:::[a-zA-Z0-9_]+)*)"
     },
     "string": {
       "begin": "\"",

package/grammars/postcss.json

@@ -195,7 +195,7 @@
       "include": "#function-content"
     },
     {
-      "begin": "(?<!-|\\()\\b(a|abbr|acronym|address|applet|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|datalist|dd|del|details|dfn|dialog|div|dl|dt|em|embed|eventsource|fieldset|figure|figcaption|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|label|legend|li|link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|picture|pre|progress|q|samp|script|section|select|small|source|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video|main|svg|rect|ruby|center|circle|ellipse|line|polyline|polygon|path|text|u|x)\\b(?!-|\\)|:\\s)|&",
+      "begin": "(?<!\\-|\\()\\b(a|abbr|acronym|address|applet|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|datalist|dd|del|details|dfn|dialog|div|dl|dt|em|embed|eventsource|fieldset|figure|figcaption|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|label|legend|li|link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|picture|pre|progress|q|samp|script|section|select|small|source|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video|main|svg|rect|ruby|center|circle|ellipse|line|polyline|polygon|path|text|u|x)\\b(?!-|\\)|:\\s)|&",
       "end": "(?=\\s|,|;|\\(|\\)|\\.|\\[|{|>|-|_)",
       "name": "entity.name.tag.css.postcss.symbol",
       "patterns": [
@@ -262,7 +262,7 @@
       "name": "keyword.other.important.css.postcss"
     },
     "function": {
-      "match": "(?<=[\\s|(|,|:])(?!url|format|attr)[\\w-][\\w-]*(?=\\()",
+      "match": "(?<=[\\s|\\(|,|:])(?!url|format|attr)[\\w-][\\w-]*(?=\\()",
       "name": "support.function.name.postcss"
     },
     "function-content": {
@@ -299,7 +299,7 @@
       ]
     },
     "numeric": {
-      "match": "(-|\\.)?\\d+(\\.\\d+)?",
+      "match": "(-|\\.)?[0-9]+(\\.[0-9]+)?",
       "name": "constant.numeric.css.postcss"
     },
     "operator": {

package/grammars/powerquery.json

@@ -83,7 +83,7 @@
           "match": "(#|\\h{4}|\\h{8}|cr|lf|tab)(?:,(#|\\h{4}|\\h{8}|cr|lf|tab))*"
         },
         {
-          "match": "[^)]",
+          "match": "[^\\)]",
           "name": "invalid.illegal.escapesequence.powerquery"
         }
       ]

package/grammars/powershell.json

@@ -188,7 +188,7 @@
       "name": "keyword.control.powershell"
     },
     {
-      "match": "(?<!\\w|-|[^)]\\.)((?i:(foreach|where)(?!-object))|%|\\?)(?!\\w)",
+      "match": "(?<!\\w|-|[^\\)]\\.)((?i:(foreach|where)(?!-object))|%|\\?)(?!\\w)",
       "name": "keyword.control.powershell"
     },
     {
@@ -262,7 +262,7 @@
     },
     {
       "comment": "This is very imprecise, is there a syntax for 'must come after...' ",
-      "match": "(?<!\\s|^)\\.\\.(?=-?\\d|\\(|\\$)",
+      "match": "(?<!\\s|^)\\.\\.(?=\\-?\\d|\\(|\\$)",
       "name": "keyword.operator.range.powershell"
     }
   ],
@@ -278,7 +278,7 @@
       "name": "meta.requires.powershell",
       "patterns": [
         {
-          "match": "-(?i:Modules|PSSnapin|RunAsAdministrator|ShellId|Version|Assembly|PSEdition)",
+          "match": "\\-(?i:Modules|PSSnapin|RunAsAdministrator|ShellId|Version|Assembly|PSEdition)",
           "name": "keyword.other.powershell"
         },
         {
@@ -358,7 +358,7 @@
       "patterns": [
         {
           "comment": "Verb-Noun pattern:",
-          "match": "(?:(\\p{L}|\\d|_|-|\\\\|:)*\\\\)?\\b(?i:Add|Approve|Assert|Backup|Block|Build|Checkpoint|Clear|Close|Compare|Complete|Compress|Confirm|Connect|Convert|ConvertFrom|ConvertTo|Copy|Debug|Deny|Deploy|Disable|Disconnect|Dismount|Edit|Enable|Enter|Exit|Expand|Export|Find|Format|Get|Grant|Group|Hide|Import|Initialize|Install|Invoke|Join|Limit|Lock|Measure|Merge|Mount|Move|New|Open|Optimize|Out|Ping|Pop|Protect|Publish|Push|Read|Receive|Redo|Register|Remove|Rename|Repair|Request|Reset|Resize|Resolve|Restart|Restore|Resume|Revoke|Save|Search|Select|Send|Set|Show|Skip|Split|Start|Step|Stop|Submit|Suspend|Switch|Sync|Test|Trace|Unblock|Undo|Uninstall|Unlock|Unprotect|Unpublish|Unregister|Update|Use|Wait|Watch|Write)-.+?(?:\\.(?i:exe|cmd|bat|ps1))?\\b",
+          "match": "(?:(\\p{L}|\\d|_|-|\\\\|\\:)*\\\\)?\\b(?i:Add|Approve|Assert|Backup|Block|Build|Checkpoint|Clear|Close|Compare|Complete|Compress|Confirm|Connect|Convert|ConvertFrom|ConvertTo|Copy|Debug|Deny|Deploy|Disable|Disconnect|Dismount|Edit|Enable|Enter|Exit|Expand|Export|Find|Format|Get|Grant|Group|Hide|Import|Initialize|Install|Invoke|Join|Limit|Lock|Measure|Merge|Mount|Move|New|Open|Optimize|Out|Ping|Pop|Protect|Publish|Push|Read|Receive|Redo|Register|Remove|Rename|Repair|Request|Reset|Resize|Resolve|Restart|Restore|Resume|Revoke|Save|Search|Select|Send|Set|Show|Skip|Split|Start|Step|Stop|Submit|Suspend|Switch|Sync|Test|Trace|Unblock|Undo|Uninstall|Unlock|Unprotect|Unpublish|Unregister|Update|Use|Wait|Watch|Write)\\-.+?(?:\\.(?i:exe|cmd|bat|ps1))?\\b",
           "name": "support.function.powershell"
         },
         {
@@ -608,7 +608,7 @@
               "name": "keyword.other.powershell"
             }
           },
-          "match": "(?<!\\w)([-+]?(?:[0-9_]+)?\\.[0-9_]+(?:(?:e|E)\\d+)?(?:F|f|D|d|M|m)?)((?i:[kmgtp]b)?)\\b"
+          "match": "(?<!\\w)([-+]?(?:[0-9_]+)?\\.[0-9_]+(?:(?:e|E)[0-9]+)?(?:F|f|D|d|M|m)?)((?i:[kmgtp]b)?)\\b"
         },
         {
           "captures": {

package/grammars/prisma.json

@@ -174,7 +174,7 @@
           "include": "#string_interpolation"
         },
         {
-          "match": "([\\w\\-\\/\\._\\\\%@:?=]+)",
+          "match": "([\\w\\-\\/\\._\\\\%@:\\?=]+)",
           "name": "string.quoted.double.prisma"
         }
       ]
@@ -259,7 +259,7 @@
               "name": "invalid.illegal.required_type.prisma"
             }
           },
-          "match": "^\\s*(\\w+)(\\s*:)?\\s+((?!(?:Int|BigInt|String|DateTime|Bytes|Decimal|Float|Json|Boolean)\\b)\\b\\w+)?(Int|BigInt|String|DateTime|Bytes|Decimal|Float|Json|Boolean)?(\\[\\])?(\\?)?(!)?"
+          "match": "^\\s*(\\w+)(\\s*:)?\\s+((?!(?:Int|BigInt|String|DateTime|Bytes|Decimal|Float|Json|Boolean)\\b)\\b\\w+)?(Int|BigInt|String|DateTime|Bytes|Decimal|Float|Json|Boolean)?(\\[\\])?(\\?)?(\\!)?"
         },
         {
           "include": "#attribute_with_arguments"
@@ -385,7 +385,7 @@
       ]
     },
     "number": {
-      "match": "((0(x|X)[0-9a-fA-F]*)|(\\+|-)?\\b((\\d+\\.?\\d*)|(\\.\\d+))((e|E)(\\+|-)?\\d+)?)([LlFfUuDdg]|UL|ul)?\\b",
+      "match": "((0(x|X)[0-9a-fA-F]*)|(\\+|-)?\\b(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)([LlFfUuDdg]|UL|ul)?\\b",
       "name": "constant.numeric.prisma"
     },
     "string_interpolation": {

package/grammars/prolog.json

@@ -44,7 +44,7 @@
       ]
     },
     {
-      "begin": "^\\s*([a-z]\\w*)(\\(?)(?=.*:-.*)",
+      "begin": "^\\s*([a-z][a-zA-Z0-9_]*)(\\(?)(?=.*:-.*)",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.clause.prolog"
@@ -76,7 +76,7 @@
       ]
     },
     {
-      "begin": "^\\s*([a-z]\\w*)(\\(?)(?=.*-->.*)",
+      "begin": "^\\s*([a-z][a-zA-Z0-9_]*)(\\(?)(?=.*-->.*)",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.dcg.prolog"
@@ -139,7 +139,7 @@
       ]
     },
     {
-      "begin": "^\\s*([a-zA-Z]\\w*)(\\(?)(?!.*(:-|-->).*)",
+      "begin": "^\\s*([a-zA-Z][a-zA-Z0-9_]*)(\\(?)(?!.*(:-|-->).*)",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.fact.prolog"
@@ -178,7 +178,7 @@
     "atom": {
       "patterns": [
         {
-          "match": "(?<!\\w)[a-z]\\w*(?!\\s*\\(|\\w)",
+          "match": "(?<![a-zA-Z0-9_])[a-z][a-zA-Z0-9_]*(?!\\s*\\(|[a-zA-Z0-9_])",
           "name": "constant.other.atom.simple.prolog"
         },
         {
@@ -276,7 +276,7 @@
           "name": "keyword.control.cut.prolog"
         },
         {
-          "match": "(\\s(is)\\s)|=:=|=\\.\\.|=?\\\\?=|\\\\\\+|@?>|@?=?<|\\+|\\*|-",
+          "match": "(\\s(is)\\s)|=:=|=\\.\\.|=?\\\\?=|\\\\\\+|@?>|@?=?<|\\+|\\*|\\-",
           "name": "keyword.operator.prolog"
         }
       ]
@@ -284,7 +284,7 @@
     "variable": {
       "patterns": [
         {
-          "match": "(?<!\\w)[A-Z]\\w*",
+          "match": "(?<![a-zA-Z0-9_])[A-Z][a-zA-Z0-9_]*",
           "name": "variable.parameter.uppercase.prolog"
         },
         {

package/grammars/proto.json

@@ -71,7 +71,7 @@
           "include": "#comments"
         },
         {
-          "begin": "([A-Za-z][A-Za-z0-9_]*)\\s*(=)\\s*(0[xX][0-9a-fA-F]+|\\d+)",
+          "begin": "([A-Za-z][A-Za-z0-9_]*)\\s*(=)\\s*(0[xX][0-9a-fA-F]+|[0-9]+)",
           "beginCaptures": {
             "1": {
               "name": "variable.other.proto"
@@ -98,7 +98,7 @@
       ]
     },
     "field": {
-      "begin": "\\s*(optional|repeated|required)?\\s*\\b([\\w.]+)\\s+(\\w+)\\s*(=)\\s*(0[xX][0-9a-fA-F]+|\\d+)",
+      "begin": "\\s*(optional|repeated|required)?\\s*\\b([\\w.]+)\\s+(\\w+)\\s*(=)\\s*(0[xX][0-9a-fA-F]+|[0-9]+)",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.proto"
@@ -311,7 +311,7 @@
       ]
     },
     "number": {
-      "match": "\\b((0(x|X)[0-9a-fA-F]*)|((\\d+\\.?\\d*)|(\\.\\d+))((e|E)(\\+|-)?\\d+)?)\\b",
+      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)\\b",
       "name": "constant.numeric.proto"
     },
     "oneof": {

package/grammars/pug.json

@@ -368,7 +368,7 @@
           "include": "#printed_expression"
         },
         {
-          "begin": "\\G(?=(#[^{\\w-])|[^\\w.#])",
+          "begin": "\\G(?=(#[^\\{\\w-])|[^\\w.#])",
           "comment": "Line starting with characters incompatible with tag name/id/class is standalone text.",
           "end": "$",
           "patterns": [
@@ -619,7 +619,7 @@
     "html_entity": {
       "patterns": [
         {
-          "match": "(&)([a-zA-Z0-9]+|#\\d+|#x[0-9a-fA-F]+)(;)",
+          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
           "name": "constant.character.entity.html.text.pug"
         },
         {
@@ -834,7 +834,7 @@
       "match": "(mixin\\s+)([\\w-]+)(?:(\\()\\s*((?:[a-zA-Z_]\\w*\\s*)(?:,\\s*[a-zA-Z_]\\w*\\s*)*)(\\)))?$"
     },
     "printed_expression": {
-      "begin": "(!?=)\\s*",
+      "begin": "(!?\\=)\\s*",
       "captures": {
         "1": {
           "name": "constant"
@@ -1007,7 +1007,7 @@
       ]
     },
     "unbuffered_code": {
-      "begin": "(-|((\\w+)\\s+=))",
+      "begin": "(-|(([a-zA-Z0-9_]+)\\s+=))",
       "beginCaptures": {
         "3": {
           "name": "variable.parameter.javascript.embedded.pug"

package/grammars/puppet.json

@@ -269,7 +269,7 @@
       "name": "constant.character.escape.puppet"
     },
     "function_call": {
-      "begin": "([a-zA-Z_]\\w*)(\\()",
+      "begin": "([a-zA-Z_][a-zA-Z0-9_]*)(\\()",
       "end": "\\)",
       "name": "meta.function-call.puppet",
       "patterns": [
@@ -312,13 +312,13 @@
     "heredoc": {
       "patterns": [
         {
-          "begin": "@\\([ \\t]*\"([^:\\/) \\t]+)\"[ \\t]*(:[ \\t]*[a-z][a-zA-Z0-9_+]*[ \\t]*)?(\\/[ \\t]*[tsrnL$]*)?[ \\t]*\\)",
+          "begin": "@\\([[:blank:]]*\"([^:\\/) \\t]+)\"[[:blank:]]*(:[[:blank:]]*[a-z][a-zA-Z0-9_+]*[[:blank:]]*)?(\\/[[:blank:]]*[tsrnL$]*)?[[:blank:]]*\\)",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.puppet"
             }
           },
-          "end": "^[ \\t]*(\\|[ \\t]*-|\\||-)?[ \\t]*\\1",
+          "end": "^[[:blank:]]*(\\|[[:blank:]]*-|\\||-)?[[:blank:]]*\\1",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.puppet"
@@ -335,13 +335,13 @@
           ]
         },
         {
-          "begin": "@\\([ \\t]*([^:\\/) \\t]+)[ \\t]*(:[ \\t]*[a-z][a-zA-Z0-9_+]*[ \\t]*)?(\\/[ \\t]*[tsrnL$]*)?[ \\t]*\\)",
+          "begin": "@\\([[:blank:]]*([^:\\/) \\t]+)[[:blank:]]*(:[[:blank:]]*[a-z][a-zA-Z0-9_+]*[[:blank:]]*)?(\\/[[:blank:]]*[tsrnL$]*)?[[:blank:]]*\\)",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.puppet"
             }
           },
-          "end": "^[ \\t]*(\\|[ \\t]*-|\\||-)?[ \\t]*\\1",
+          "end": "^[[:blank:]]*(\\|[[:blank:]]*-|\\||-)?[[:blank:]]*\\1",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.puppet"
@@ -378,7 +378,7 @@
           ]
         },
         {
-          "begin": "(\\${)(_\\w*)",
+          "begin": "(\\${)(_[a-zA-Z0-9_]*)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.section.embedded.begin.puppet"
@@ -643,7 +643,7 @@
       "patterns": [
         {
           "comment": "Puppet Data type",
-          "match": "(?<![a-zA-Z$])([A-Z]\\w*)(?!\\w)",
+          "match": "(?<![a-zA-Z\\$])([A-Z][a-zA-Z0-9_]*)(?![a-zA-Z0-9_])",
           "name": "storage.type.puppet"
         }
       ]
@@ -685,11 +685,11 @@
               "name": "punctuation.definition.variable.puppet"
             }
           },
-          "match": "((\\$+)[a-zA-Z_]\\w*)\\s*(?=,|\\))",
+          "match": "((\\$+)[a-zA-Z_][a-zA-Z0-9_]*)\\s*(?=,|\\))",
           "name": "meta.function.argument.puppet"
         },
         {
-          "begin": "((\\$+)[a-zA-Z_]\\w*)(?:\\s*(=)\\s*)\\s*",
+          "begin": "((\\$+)[a-zA-Z_][a-zA-Z0-9_]*)(?:\\s*(=)\\s*)\\s*",
           "captures": {
             "1": {
               "name": "variable.other.puppet"
@@ -758,7 +758,7 @@
               "name": "punctuation.definition.variable.puppet"
             }
           },
-          "match": "(\\$)_\\w*",
+          "match": "(\\$)_[a-zA-Z0-9_]*",
           "name": "variable.other.readwrite.global.puppet"
         },
         {
@@ -767,7 +767,7 @@
               "name": "punctuation.definition.variable.puppet"
             }
           },
-          "match": "(\\$)(([a-z]\\w*)?(?:::[a-z]\\w*)*)",
+          "match": "(\\$)(([a-z][a-zA-Z0-9_]*)?(?:::[a-z][a-zA-Z0-9_]*)*)",
           "name": "variable.other.readwrite.global.puppet"
         }
       ]

package/grammars/purescript.json

@@ -180,7 +180,7 @@
       ]
     },
     {
-      "begin": "^(\\s)*(data|newtype)\\s+(.+?)\\s*(?==|$)",
+      "begin": "^(\\s)*(data|newtype)\\s+(.+?)\\s*(?=\\=|$)",
       "beginCaptures": {
         "2": {
           "name": "storage.type.data.purescript"
@@ -242,7 +242,7 @@
       ]
     },
     {
-      "begin": "^(\\s)*(type)\\s+(.+?)\\s*(?==|$)",
+      "begin": "^(\\s)*(type)\\s+(.+?)\\s*(?=\\=|$)",
       "beginCaptures": {
         "2": {
           "name": "storage.type.data.purescript"
@@ -323,7 +323,7 @@
           "name": "meta.delimiter.decimal.period.purescript"
         }
       },
-      "match": "(?<!\\$)(?:(?:\\b\\d+(\\.)\\d+[eE][+-]?\\d+\\b)|(?:\\b\\d+[eE][+-]?\\d+\\b)|(?:\\b\\d+(\\.)\\d+\\b)|(?:\\b\\d+\\b(?!\\.)))(?!\\$)",
+      "match": "(?<!\\$)(?:(?:\\b[0-9]+(\\.)[0-9]+[eE][+-]?[0-9]+\\b)|(?:\\b[0-9]+[eE][+-]?[0-9]+\\b)|(?:\\b[0-9]+(\\.)[0-9]+\\b)|(?:\\b[0-9]+\\b(?!\\.)))(?!\\$)",
       "name": "constant.numeric.decimal.purescript"
     },
     {
@@ -331,7 +331,7 @@
       "name": "constant.language.boolean.purescript"
     },
     {
-      "match": "\\b((\\d+_?)*\\d+|0([xX][0-9a-fA-F]+|[oO][0-7]+))\\b",
+      "match": "\\b(([0-9]+_?)*[0-9]+|0([xX][0-9a-fA-F]+|[oO][0-7]+))\\b",
       "name": "constant.numeric.purescript"
     },
     {
@@ -462,7 +462,7 @@
       "include": "#infix_op"
     },
     {
-      "match": "<-|->",
+      "match": "\\<-|-\\>",
       "name": "keyword.other.arrow.purescript"
     },
     {