From d4eb0d408b006f786764cec4df1621cd04f09359 Mon Sep 17 00:00:00 2001 From: Davy Landman Date: Tue, 9 Jul 2024 13:59:40 +0200 Subject: [PATCH] Also generated rascal grammar again --- .../main/rascal/lang/oniguruma/Conversion.rsc | 1 - .../syntaxes/rascal.tmLanguage.json | 28 +++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/rascal-textmate-core/src/main/rascal/lang/oniguruma/Conversion.rsc b/rascal-textmate-core/src/main/rascal/lang/oniguruma/Conversion.rsc index 59ddd55..5b876db 100644 --- a/rascal-textmate-core/src/main/rascal/lang/oniguruma/Conversion.rsc +++ b/rascal-textmate-core/src/main/rascal/lang/oniguruma/Conversion.rsc @@ -187,7 +187,6 @@ str encode(int char) { map[int, str] shorthands = ( 0x09: "\\t", 0x0A: "\\n", - 0x0B: "\\v", 0x0C: "\\f", 0x0D: "\\r", 0x20: " " diff --git a/vscode-extension/syntaxes/rascal.tmLanguage.json b/vscode-extension/syntaxes/rascal.tmLanguage.json index b747e31..3ca7207 100644 --- a/vscode-extension/syntaxes/rascal.tmLanguage.json +++ b/vscode-extension/syntaxes/rascal.tmLanguage.json @@ -1,7 +1,7 @@ { "repository": { "prod(lex(\"Comment\"),[lit(\"//\"),conditional(\\iter-star(\\char-class([range(1,9),range(11,1114111)])),{\\not-follow(\\char-class([range(9,9),range(13,13),range(32,32),range(160,160),range(5760,5760),range(8192,8202),range(8239,8239),range(8287,8287),range(12288,12288)])),\\end-of-line()})],{tag(\"category\"(\"comment\"))})": { - "match": "((?:\\x{2F}\\x{2F})(?:(?:[\\x{1}-\\x{9}]|[\\x{B}-\\x{10FFFF}])*?(?!(?:[\\x{9}-\\x{9}]|[\\x{D}-\\x{D}]|[\\x{20}-\\x{20}]|[\\x{A0}-\\x{A0}]|[\\x{1680}-\\x{1680}]|[\\x{2000}-\\x{200A}]|[\\x{202F}-\\x{202F}]|[\\x{205F}-\\x{205F}]|[\\x{3000}-\\x{3000}]))(?:$)))", + "match": "((?:\\x2F\\x2F)(?:(?:[\\x01-\\t]|[\\x0B-\\x{10FFFF}])*?(?!(?:[\\t-\\t]|[\\r-\\r]|[ - ]|[\\xA0-\\xA0]|[\\x{1680}-\\x{1680}]|[\\x{2000}-\\x{200A}]|[\\x{202F}-\\x{202F}]|[\\x{205F}-\\x{205F}]|[\\x{3000}-\\x{3000}]))(?:$)))", "name": "prod(lex(\"Comment\"),[lit(\"//\"),conditional(\\iter-star(\\char-class([range(1,9),range(11,1114111)])),{\\not-follow(\\char-class([range(9,9),range(13,13),range(32,32),range(160,160),range(5760,5760),range(8192,8202),range(8239,8239),range(8287,8287),range(12288,12288)])),\\end-of-line()})],{tag(\"category\"(\"comment\"))})", "captures": { "1": { @@ -19,16 +19,16 @@ } }, "prod(lex(\"delimiters\"),[alt({lit(\"bottom-up-break\"),lit(\")\"),lit(\"≫\"),lit(\"\\n\"),lit(\"!:=\"),lit(\"\\'\"),lit(\"!=\"),lit(\"\\>=\"),lit(\"://\"),lit(\"non-assoc\"),lit(\"&=\"),lit(\"\\<-\"),lit(\"*=\"),lit(\"+=\"),lit(\"top-down-break\"),lit(\",\"),lit(\"...\"),lit(\"/=\"),lit(\"⇨\"),lit(\"(\"),lit(\"*/\"),lit(\"%\"),lit(\"!\\<\\<\"),lit(\"=\\>\"),lit(\"!\\>\\>\"),lit(\"||\"),lit(\"\\>\\>\"),lit(\"::\"),lit(\"⚠\"),lit(\"&&\"),lit(\"@\"),lit(\":=\"),lit(\"#\"),lit(\"\\<==\\>\"),lit(\"\\\"\"),lit(\"\\<\\<=\"),lit(\"}\"),lit(\"?=\"),lit(\"\\<:\"),lit(\"==\\>\"),lit(\"^\"),lit(\"/*\"),lit(\";\"),lit(\"{\"),lit(\"-=\"),lit(\"$T\")})],{})": { - "match": "(?:(?:bottom\\x{2D}up\\x{2D}break)|(?:\\x{29})|(?:\\x{226B})|(?:\\x{A})|(?:\\x{21}\\x{3A}\\x{3D})|(?:\\x{27})|(?:\\x{21}\\x{3D})|(?:\\x{3E}\\x{3D})|(?:\\x{3A}\\x{2F}\\x{2F})|(?:non\\x{2D}assoc)|(?:\\x{26}\\x{3D})|(?:\\x{3C}\\x{2D})|(?:\\x{2A}\\x{3D})|(?:\\x{2B}\\x{3D})|(?:top\\x{2D}down\\x{2D}break)|(?:\\x{2C})|(?:\\x{2E}\\x{2E}\\x{2E})|(?:\\x{2F}\\x{3D})|(?:\\x{21E8})|(?:\\x{28})|(?:\\x{2A}\\x{2F})|(?:\\x{25})|(?:\\x{21}\\x{3C}\\x{3C})|(?:\\x{3D}\\x{3E})|(?:\\x{21}\\x{3E}\\x{3E})|(?:\\x{7C}\\x{7C})|(?:\\x{3E}\\x{3E})|(?:\\x{3A}\\x{3A})|(?:\\x{26A0})|(?:\\x{26}\\x{26})|(?:\\x{40})|(?:\\x{3A}\\x{3D})|(?:\\x{23})|(?:\\x{3C}\\x{3D}\\x{3D}\\x{3E})|(?:\\x{22})|(?:\\x{3C}\\x{3C}\\x{3D})|(?:\\x{7D})|(?:\\x{3F}\\x{3D})|(?:\\x{3C}\\x{3A})|(?:\\x{3D}\\x{3D}\\x{3E})|(?:\\x{5E})|(?:\\x{2F}\\x{2A})|(?:\\x{3B})|(?:\\x{7B})|(?:\\x{2D}\\x{3D})|(?:\\x{24}T))", + "match": "(?:(?:bottom\\x2Dup\\x2Dbreak)|(?:\\x29)|(?:\\x{226B})|(?:\\n)|(?:\\x21\\x3A\\x3D)|(?:\\x27)|(?:\\x21\\x3D)|(?:\\x3E\\x3D)|(?:\\x3A\\x2F\\x2F)|(?:non\\x2Dassoc)|(?:\\x26\\x3D)|(?:\\x3C\\x2D)|(?:\\x2A\\x3D)|(?:\\x2B\\x3D)|(?:top\\x2Ddown\\x2Dbreak)|(?:\\x2C)|(?:\\x2E\\x2E\\x2E)|(?:\\x2F\\x3D)|(?:\\x{21E8})|(?:\\x28)|(?:\\x2A\\x2F)|(?:\\x25)|(?:\\x21\\x3C\\x3C)|(?:\\x3D\\x3E)|(?:\\x21\\x3E\\x3E)|(?:\\x7C\\x7C)|(?:\\x3E\\x3E)|(?:\\x3A\\x3A)|(?:\\x{26A0})|(?:\\x26\\x26)|(?:\\x40)|(?:\\x3A\\x3D)|(?:\\x23)|(?:\\x3C\\x3D\\x3D\\x3E)|(?:\\x22)|(?:\\x3C\\x3C\\x3D)|(?:\\x7D)|(?:\\x3F\\x3D)|(?:\\x3C\\x3A)|(?:\\x3D\\x3D\\x3E)|(?:\\x5E)|(?:\\x2F\\x2A)|(?:\\x3B)|(?:\\x7B)|(?:\\x2D\\x3D)|(?:\\x24T))", "name": "prod(lex(\"delimiters\"),[alt({lit(\"bottom-up-break\"),lit(\")\"),lit(\"≫\"),lit(\"\\n\"),lit(\"!:=\"),lit(\"\\'\"),lit(\"!=\"),lit(\"\\>=\"),lit(\"://\"),lit(\"non-assoc\"),lit(\"&=\"),lit(\"\\<-\"),lit(\"*=\"),lit(\"+=\"),lit(\"top-down-break\"),lit(\",\"),lit(\"...\"),lit(\"/=\"),lit(\"⇨\"),lit(\"(\"),lit(\"*/\"),lit(\"%\"),lit(\"!\\<\\<\"),lit(\"=\\>\"),lit(\"!\\>\\>\"),lit(\"||\"),lit(\"\\>\\>\"),lit(\"::\"),lit(\"⚠\"),lit(\"&&\"),lit(\"@\"),lit(\":=\"),lit(\"#\"),lit(\"\\<==\\>\"),lit(\"\\\"\"),lit(\"\\<\\<=\"),lit(\"}\"),lit(\"?=\"),lit(\"\\<:\"),lit(\"==\\>\"),lit(\"^\"),lit(\"/*\"),lit(\";\"),lit(\"{\"),lit(\"-=\"),lit(\"$T\")})],{})", - "captures": [] + "captures": {} }, "lit(\"`\"):lit(\"`\")": { - "begin": "(?:\\x{60})", - "end": "(?:\\x{60})", + "begin": "(?:\\x60)", + "end": "(?:\\x60)", "patterns": [ { - "match": "(\\x{5C}\\x{5C})", + "match": "(\\x5C\\x5C)", "name": "prod(label(\"bs\",lex(\"ConcretePart\")),[lit(\"\\\\\\\\\")],{tag(\"category\"(\"string\"))})", "captures": { "1": { @@ -37,7 +37,7 @@ } }, { - "match": "(\\x{5C}\\x{3E})", + "match": "(\\x5C\\x3E)", "name": "prod(label(\"gt\",lex(\"ConcretePart\")),[lit(\"\\\\\\>\")],{tag(\"category\"(\"string\"))})", "captures": { "1": { @@ -46,7 +46,7 @@ } }, { - "match": "((?:[\\x{1}-\\x{9}]|[\\x{B}-\\x{3B}]|[\\x{3D}-\\x{3D}]|[\\x{3F}-\\x{5B}]|[\\x{5D}-\\x{5F}]|[a-\\x{10FFFF}])+?(?!(?:[\\x{1}-\\x{9}]|[\\x{B}-\\x{3B}]|[\\x{3D}-\\x{3D}]|[\\x{3F}-\\x{5B}]|[\\x{5D}-\\x{5F}]|[a-\\x{10FFFF}])))", + "match": "((?:[\\x01-\\t]|[\\x0B-\\x3B]|[\\x3D-\\x3D]|[\\x3F-\\x5B]|[\\x5D-\\x5F]|[a-\\x{10FFFF}])+?(?!(?:[\\x01-\\t]|[\\x0B-\\x3B]|[\\x3D-\\x3D]|[\\x3F-\\x5B]|[\\x5D-\\x5F]|[a-\\x{10FFFF}])))", "name": "prod(label(\"text\",lex(\"ConcretePart\")),[conditional(iter(\\char-class([range(1,9),range(11,59),range(61,61),range(63,91),range(93,95),range(97,1114111)])),{\\not-follow(\\char-class([range(1,9),range(11,59),range(61,61),range(63,91),range(93,95),range(97,1114111)]))})],{tag(\"category\"(\"string\"))})", "captures": { "1": { @@ -55,7 +55,7 @@ } }, { - "match": "(\\x{5C}\\x{3C})", + "match": "(\\x5C\\x3C)", "name": "prod(label(\"lt\",lex(\"ConcretePart\")),[lit(\"\\\\\\<\")],{tag(\"category\"(\"string\"))})", "captures": { "1": { @@ -64,7 +64,7 @@ } }, { - "match": "(\\x{5C}\\x{60})", + "match": "(\\x5C\\x60)", "name": "prod(label(\"bq\",lex(\"ConcretePart\")),[lit(\"\\\\`\")],{tag(\"category\"(\"string\"))})", "captures": { "1": { @@ -76,11 +76,11 @@ "name": "lit(\"`\"):lit(\"`\")" }, "lit(\"[\"):lit(\"]\")": { - "begin": "(?:\\x{5B})", - "end": "(?:\\x{5D})", + "begin": "(?:\\x5B)", + "end": "(?:\\x5D)", "patterns": [ { - "match": "((?:\\x{5C})(?:[\\x{20}-\\x{20}]|[\\x{22}-\\x{22}]|[\\x{27}-\\x{27}]|[\\x{2D}-\\x{2D}]|[\\x{3C}-\\x{3C}]|[\\x{3E}-\\x{3E}]|[\\x{5B}-\\x{5D}]|[b-b]|[f-f]|[n-n]|[r-r]|[t-t]))", + "match": "((?:\\x5C)(?:[ - ]|[\\x22-\\x22]|[\\x27-\\x27]|[\\x2D-\\x2D]|[\\x3C-\\x3C]|[\\x3E-\\x3E]|[\\x5B-\\x5D]|[b-b]|[f-f]|[n-n]|[r-r]|[t-t]))", "name": "prod(lex(\"Char\"),[lit(\"\\\\\"),\\char-class([range(32,32),range(34,34),range(39,39),range(45,45),range(60,60),range(62,62),range(91,93),range(98,98),range(102,102),range(110,110),range(114,114),range(116,116)])],{tag(\"category\"(\"constant\"))})", "captures": { "1": { @@ -89,7 +89,7 @@ } }, { - "match": "((?:(?:\\x{5C})[U-U](?:(?:\\b10\\b)|(?:(?:\\b0\\b)(?:[0-9]|[A-F]|[a-f])))(?:[0-9]|[A-F]|[a-f])(?:[0-9]|[A-F]|[a-f])(?:[0-9]|[A-F]|[a-f])(?:[0-9]|[A-F]|[a-f]))|(?:(?:\\x{5C})[u-u](?:[0-9]|[A-F]|[a-f])(?:[0-9]|[A-F]|[a-f])(?:[0-9]|[A-F]|[a-f])(?:[0-9]|[A-F]|[a-f]))|(?:(?:\\x{5C})[a-a][0-7](?:[0-9]|[A-F]|[a-f])))", + "match": "((?:(?:\\x5C)[U-U](?:(?:\\b10\\b)|(?:(?:\\b0\\b)(?:[0-9]|[A-F]|[a-f])))(?:[0-9]|[A-F]|[a-f])(?:[0-9]|[A-F]|[a-f])(?:[0-9]|[A-F]|[a-f])(?:[0-9]|[A-F]|[a-f]))|(?:(?:\\x5C)[u-u](?:[0-9]|[A-F]|[a-f])(?:[0-9]|[A-F]|[a-f])(?:[0-9]|[A-F]|[a-f])(?:[0-9]|[A-F]|[a-f]))|(?:(?:\\x5C)[a-a][0-7](?:[0-9]|[A-F]|[a-f])))", "name": "prod(lex(\"Char\"),[lex(\"UnicodeEscape\")],{tag(\"category\"(\"constant\"))})", "captures": { "1": {