From d9b6e2fea4944c16ccc3aab192b162b18b347aa8 Mon Sep 17 00:00:00 2001 From: Steve McCanne Date: Sun, 3 Nov 2024 20:37:13 -0800 Subject: [PATCH] Unary plus (#5433) --- compiler/parser/parser.go | 4809 ++++++++++++++------------- compiler/parser/parser.peg | 13 +- compiler/semantic/expr.go | 6 +- compiler/ztests/sql/unary-plus.yaml | 11 + 4 files changed, 2448 insertions(+), 2391 deletions(-) create mode 100644 compiler/ztests/sql/unary-plus.yaml diff --git a/compiler/parser/parser.go b/compiler/parser/parser.go index 4cae6b45c0..d57ccc3f58 100644 --- a/compiler/parser/parser.go +++ b/compiler/parser/parser.go @@ -4373,7 +4373,7 @@ var g = &grammar{ }, }, }, - leader: true, + leader: false, leftRecursive: true, }, { @@ -6751,40 +6751,40 @@ var g = &grammar{ label: "first", expr: &ruleRefExpr{ pos: position{line: 1003, col: 11, offset: 24061}, - name: "UnaryMinusExpr", + name: "UnaryPlusOrMinus", }, }, &labeledExpr{ - pos: position{line: 1004, col: 5, offset: 24080}, + pos: position{line: 1004, col: 5, offset: 24082}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1004, col: 10, offset: 24085}, + pos: position{line: 1004, col: 10, offset: 24087}, expr: &actionExpr{ - pos: position{line: 1004, col: 11, offset: 24086}, + pos: position{line: 1004, col: 11, offset: 24088}, run: (*parser).callonConcatExpr7, expr: &seqExpr{ - pos: position{line: 1004, col: 11, offset: 24086}, + pos: position{line: 1004, col: 11, offset: 24088}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1004, col: 11, offset: 24086}, + pos: position{line: 1004, col: 11, offset: 24088}, name: "__", }, &litMatcher{ - pos: position{line: 1004, col: 14, offset: 24089}, + pos: position{line: 1004, col: 14, offset: 24091}, val: "||", ignoreCase: false, want: "\"||\"", }, &ruleRefExpr{ - pos: position{line: 1004, col: 19, offset: 24094}, + pos: position{line: 1004, col: 19, offset: 24096}, name: "__", }, &labeledExpr{ - pos: position{line: 1004, col: 22, offset: 24097}, + pos: position{line: 1004, col: 22, offset: 24099}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1004, col: 27, offset: 24102}, - name: "UnaryMinusExpr", + pos: position{line: 1004, col: 27, offset: 24104}, + name: "UnaryPlusOrMinus", }, }, }, @@ -6799,47 +6799,49 @@ var g = &grammar{ leftRecursive: false, }, { - name: "UnaryMinusExpr", - pos: position{line: 1008, col: 1, offset: 24218}, + name: "UnaryPlusOrMinus", + pos: position{line: 1008, col: 1, offset: 24222}, expr: &choiceExpr{ - pos: position{line: 1009, col: 5, offset: 24237}, + pos: position{line: 1009, col: 5, offset: 24243}, alternatives: []any{ &actionExpr{ - pos: position{line: 1009, col: 5, offset: 24237}, - run: (*parser).callonUnaryMinusExpr2, + pos: position{line: 1009, col: 5, offset: 24243}, + run: (*parser).callonUnaryPlusOrMinus2, expr: &seqExpr{ - pos: position{line: 1009, col: 5, offset: 24237}, + pos: position{line: 1009, col: 5, offset: 24243}, exprs: []any{ ¬Expr{ - pos: position{line: 1009, col: 5, offset: 24237}, + pos: position{line: 1009, col: 5, offset: 24243}, expr: &ruleRefExpr{ - pos: position{line: 1009, col: 6, offset: 24238}, + pos: position{line: 1009, col: 6, offset: 24244}, name: "Literal", }, }, - &litMatcher{ - pos: position{line: 1009, col: 14, offset: 24246}, - val: "-", - ignoreCase: false, - want: "\"-\"", + &labeledExpr{ + pos: position{line: 1009, col: 14, offset: 24252}, + label: "op", + expr: &ruleRefExpr{ + pos: position{line: 1009, col: 17, offset: 24255}, + name: "PlusOrMinusOp", + }, }, &ruleRefExpr{ - pos: position{line: 1009, col: 18, offset: 24250}, + pos: position{line: 1009, col: 31, offset: 24269}, name: "__", }, &labeledExpr{ - pos: position{line: 1009, col: 21, offset: 24253}, + pos: position{line: 1009, col: 34, offset: 24272}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1009, col: 23, offset: 24255}, - name: "UnaryMinusExpr", + pos: position{line: 1009, col: 36, offset: 24274}, + name: "UnaryPlusOrMinus", }, }, }, }, }, &ruleRefExpr{ - pos: position{line: 1017, col: 5, offset: 24428}, + pos: position{line: 1018, col: 5, offset: 24458}, name: "DerefExpr", }, }, @@ -6847,75 +6849,102 @@ var g = &grammar{ leader: false, leftRecursive: false, }, + { + name: "PlusOrMinusOp", + pos: position{line: 1020, col: 1, offset: 24469}, + expr: &actionExpr{ + pos: position{line: 1020, col: 17, offset: 24485}, + run: (*parser).callonPlusOrMinusOp1, + expr: &choiceExpr{ + pos: position{line: 1020, col: 18, offset: 24486}, + alternatives: []any{ + &litMatcher{ + pos: position{line: 1020, col: 18, offset: 24486}, + val: "+", + ignoreCase: false, + want: "\"+\"", + }, + &litMatcher{ + pos: position{line: 1020, col: 24, offset: 24492}, + val: "-", + ignoreCase: false, + want: "\"-\"", + }, + }, + }, + }, + leader: false, + leftRecursive: false, + }, { name: "DerefExpr", - pos: position{line: 1019, col: 1, offset: 24439}, + pos: position{line: 1022, col: 1, offset: 24529}, expr: &choiceExpr{ - pos: position{line: 1020, col: 5, offset: 24453}, + pos: position{line: 1023, col: 5, offset: 24543}, alternatives: []any{ &actionExpr{ - pos: position{line: 1020, col: 5, offset: 24453}, + pos: position{line: 1023, col: 5, offset: 24543}, run: (*parser).callonDerefExpr2, expr: &seqExpr{ - pos: position{line: 1020, col: 5, offset: 24453}, + pos: position{line: 1023, col: 5, offset: 24543}, exprs: []any{ &labeledExpr{ - pos: position{line: 1020, col: 5, offset: 24453}, + pos: position{line: 1023, col: 5, offset: 24543}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1020, col: 10, offset: 24458}, + pos: position{line: 1023, col: 10, offset: 24548}, name: "DerefExpr", }, }, &litMatcher{ - pos: position{line: 1020, col: 20, offset: 24468}, + pos: position{line: 1023, col: 20, offset: 24558}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 1020, col: 24, offset: 24472}, + pos: position{line: 1023, col: 24, offset: 24562}, name: "__", }, &labeledExpr{ - pos: position{line: 1020, col: 27, offset: 24475}, + pos: position{line: 1023, col: 27, offset: 24565}, label: "from", expr: &ruleRefExpr{ - pos: position{line: 1020, col: 32, offset: 24480}, + pos: position{line: 1023, col: 32, offset: 24570}, name: "AdditiveExpr", }, }, &ruleRefExpr{ - pos: position{line: 1020, col: 45, offset: 24493}, + pos: position{line: 1023, col: 45, offset: 24583}, name: "__", }, &litMatcher{ - pos: position{line: 1020, col: 48, offset: 24496}, + pos: position{line: 1023, col: 48, offset: 24586}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1020, col: 52, offset: 24500}, + pos: position{line: 1023, col: 52, offset: 24590}, name: "__", }, &labeledExpr{ - pos: position{line: 1020, col: 55, offset: 24503}, + pos: position{line: 1023, col: 55, offset: 24593}, label: "to", expr: &zeroOrOneExpr{ - pos: position{line: 1020, col: 58, offset: 24506}, + pos: position{line: 1023, col: 58, offset: 24596}, expr: &ruleRefExpr{ - pos: position{line: 1020, col: 58, offset: 24506}, + pos: position{line: 1023, col: 58, offset: 24596}, name: "AdditiveExpr", }, }, }, &ruleRefExpr{ - pos: position{line: 1020, col: 72, offset: 24520}, + pos: position{line: 1023, col: 72, offset: 24610}, name: "__", }, &litMatcher{ - pos: position{line: 1020, col: 75, offset: 24523}, + pos: position{line: 1023, col: 75, offset: 24613}, val: "]", ignoreCase: false, want: "\"]\"", @@ -6924,49 +6953,49 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1032, col: 5, offset: 24762}, + pos: position{line: 1035, col: 5, offset: 24852}, run: (*parser).callonDerefExpr18, expr: &seqExpr{ - pos: position{line: 1032, col: 5, offset: 24762}, + pos: position{line: 1035, col: 5, offset: 24852}, exprs: []any{ &labeledExpr{ - pos: position{line: 1032, col: 5, offset: 24762}, + pos: position{line: 1035, col: 5, offset: 24852}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1032, col: 10, offset: 24767}, + pos: position{line: 1035, col: 10, offset: 24857}, name: "DerefExpr", }, }, &litMatcher{ - pos: position{line: 1032, col: 20, offset: 24777}, + pos: position{line: 1035, col: 20, offset: 24867}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 1032, col: 24, offset: 24781}, + pos: position{line: 1035, col: 24, offset: 24871}, name: "__", }, &litMatcher{ - pos: position{line: 1032, col: 27, offset: 24784}, + pos: position{line: 1035, col: 27, offset: 24874}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1032, col: 31, offset: 24788}, + pos: position{line: 1035, col: 31, offset: 24878}, name: "__", }, &labeledExpr{ - pos: position{line: 1032, col: 34, offset: 24791}, + pos: position{line: 1035, col: 34, offset: 24881}, label: "to", expr: &ruleRefExpr{ - pos: position{line: 1032, col: 37, offset: 24794}, + pos: position{line: 1035, col: 37, offset: 24884}, name: "AdditiveExpr", }, }, &litMatcher{ - pos: position{line: 1032, col: 50, offset: 24807}, + pos: position{line: 1035, col: 50, offset: 24897}, val: "]", ignoreCase: false, want: "\"]\"", @@ -6975,35 +7004,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1040, col: 5, offset: 24971}, + pos: position{line: 1043, col: 5, offset: 25061}, run: (*parser).callonDerefExpr29, expr: &seqExpr{ - pos: position{line: 1040, col: 5, offset: 24971}, + pos: position{line: 1043, col: 5, offset: 25061}, exprs: []any{ &labeledExpr{ - pos: position{line: 1040, col: 5, offset: 24971}, + pos: position{line: 1043, col: 5, offset: 25061}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1040, col: 10, offset: 24976}, + pos: position{line: 1043, col: 10, offset: 25066}, name: "DerefExpr", }, }, &litMatcher{ - pos: position{line: 1040, col: 20, offset: 24986}, + pos: position{line: 1043, col: 20, offset: 25076}, val: "[", ignoreCase: false, want: "\"[\"", }, &labeledExpr{ - pos: position{line: 1040, col: 24, offset: 24990}, + pos: position{line: 1043, col: 24, offset: 25080}, label: "index", expr: &ruleRefExpr{ - pos: position{line: 1040, col: 30, offset: 24996}, + pos: position{line: 1043, col: 30, offset: 25086}, name: "Expr", }, }, &litMatcher{ - pos: position{line: 1040, col: 35, offset: 25001}, + pos: position{line: 1043, col: 35, offset: 25091}, val: "]", ignoreCase: false, want: "\"]\"", @@ -7012,30 +7041,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1048, col: 5, offset: 25171}, + pos: position{line: 1051, col: 5, offset: 25261}, run: (*parser).callonDerefExpr37, expr: &seqExpr{ - pos: position{line: 1048, col: 5, offset: 25171}, + pos: position{line: 1051, col: 5, offset: 25261}, exprs: []any{ &labeledExpr{ - pos: position{line: 1048, col: 5, offset: 25171}, + pos: position{line: 1051, col: 5, offset: 25261}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1048, col: 10, offset: 25176}, + pos: position{line: 1051, col: 10, offset: 25266}, name: "DerefExpr", }, }, &litMatcher{ - pos: position{line: 1048, col: 20, offset: 25186}, + pos: position{line: 1051, col: 20, offset: 25276}, val: ".", ignoreCase: false, want: "\".\"", }, &labeledExpr{ - pos: position{line: 1048, col: 24, offset: 25190}, + pos: position{line: 1051, col: 24, offset: 25280}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 1048, col: 27, offset: 25193}, + pos: position{line: 1051, col: 27, offset: 25283}, name: "Identifier", }, }, @@ -7043,11 +7072,11 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1057, col: 5, offset: 25383}, + pos: position{line: 1060, col: 5, offset: 25473}, name: "FuncExpr", }, &ruleRefExpr{ - pos: position{line: 1058, col: 5, offset: 25396}, + pos: position{line: 1061, col: 5, offset: 25486}, name: "Primary", }, }, @@ -7057,16 +7086,16 @@ var g = &grammar{ }, { name: "FuncExpr", - pos: position{line: 1060, col: 1, offset: 25405}, + pos: position{line: 1063, col: 1, offset: 25495}, expr: &choiceExpr{ - pos: position{line: 1061, col: 5, offset: 25418}, + pos: position{line: 1064, col: 5, offset: 25508}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1061, col: 5, offset: 25418}, + pos: position{line: 1064, col: 5, offset: 25508}, name: "Cast", }, &ruleRefExpr{ - pos: position{line: 1062, col: 5, offset: 25427}, + pos: position{line: 1065, col: 5, offset: 25517}, name: "Function", }, }, @@ -7076,20 +7105,20 @@ var g = &grammar{ }, { name: "FuncGuard", - pos: position{line: 1064, col: 1, offset: 25437}, + pos: position{line: 1067, col: 1, offset: 25527}, expr: &seqExpr{ - pos: position{line: 1064, col: 13, offset: 25449}, + pos: position{line: 1067, col: 13, offset: 25539}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1064, col: 13, offset: 25449}, + pos: position{line: 1067, col: 13, offset: 25539}, name: "NotFuncs", }, &ruleRefExpr{ - pos: position{line: 1064, col: 22, offset: 25458}, + pos: position{line: 1067, col: 22, offset: 25548}, name: "__", }, &litMatcher{ - pos: position{line: 1064, col: 25, offset: 25461}, + pos: position{line: 1067, col: 25, offset: 25551}, val: "(", ignoreCase: false, want: "\"(\"", @@ -7101,16 +7130,16 @@ var g = &grammar{ }, { name: "NotFuncs", - pos: position{line: 1066, col: 1, offset: 25466}, + pos: position{line: 1069, col: 1, offset: 25556}, expr: &choiceExpr{ - pos: position{line: 1067, col: 5, offset: 25479}, + pos: position{line: 1070, col: 5, offset: 25569}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1067, col: 5, offset: 25479}, + pos: position{line: 1070, col: 5, offset: 25569}, name: "NOT", }, &ruleRefExpr{ - pos: position{line: 1068, col: 5, offset: 25487}, + pos: position{line: 1071, col: 5, offset: 25577}, name: "SELECT", }, }, @@ -7120,58 +7149,58 @@ var g = &grammar{ }, { name: "Cast", - pos: position{line: 1070, col: 1, offset: 25495}, + pos: position{line: 1073, col: 1, offset: 25585}, expr: &actionExpr{ - pos: position{line: 1071, col: 5, offset: 25504}, + pos: position{line: 1074, col: 5, offset: 25594}, run: (*parser).callonCast1, expr: &seqExpr{ - pos: position{line: 1071, col: 5, offset: 25504}, + pos: position{line: 1074, col: 5, offset: 25594}, exprs: []any{ &labeledExpr{ - pos: position{line: 1071, col: 5, offset: 25504}, + pos: position{line: 1074, col: 5, offset: 25594}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1071, col: 9, offset: 25508}, + pos: position{line: 1074, col: 9, offset: 25598}, name: "TypeLiteral", }, }, &ruleRefExpr{ - pos: position{line: 1071, col: 21, offset: 25520}, + pos: position{line: 1074, col: 21, offset: 25610}, name: "__", }, &litMatcher{ - pos: position{line: 1071, col: 24, offset: 25523}, + pos: position{line: 1074, col: 24, offset: 25613}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1071, col: 28, offset: 25527}, + pos: position{line: 1074, col: 28, offset: 25617}, name: "__", }, &labeledExpr{ - pos: position{line: 1071, col: 31, offset: 25530}, + pos: position{line: 1074, col: 31, offset: 25620}, label: "expr", expr: &choiceExpr{ - pos: position{line: 1071, col: 37, offset: 25536}, + pos: position{line: 1074, col: 37, offset: 25626}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1071, col: 37, offset: 25536}, + pos: position{line: 1074, col: 37, offset: 25626}, name: "OverExpr", }, &ruleRefExpr{ - pos: position{line: 1071, col: 48, offset: 25547}, + pos: position{line: 1074, col: 48, offset: 25637}, name: "Expr", }, }, }, }, &ruleRefExpr{ - pos: position{line: 1071, col: 54, offset: 25553}, + pos: position{line: 1074, col: 54, offset: 25643}, name: "__", }, &litMatcher{ - pos: position{line: 1071, col: 57, offset: 25556}, + pos: position{line: 1074, col: 57, offset: 25646}, val: ")", ignoreCase: false, want: "\")\"", @@ -7184,85 +7213,85 @@ var g = &grammar{ }, { name: "Function", - pos: position{line: 1075, col: 1, offset: 25669}, + pos: position{line: 1078, col: 1, offset: 25759}, expr: &choiceExpr{ - pos: position{line: 1076, col: 5, offset: 25682}, + pos: position{line: 1079, col: 5, offset: 25772}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1076, col: 5, offset: 25682}, + pos: position{line: 1079, col: 5, offset: 25772}, name: "Grep", }, &actionExpr{ - pos: position{line: 1078, col: 5, offset: 25769}, + pos: position{line: 1081, col: 5, offset: 25859}, run: (*parser).callonFunction3, expr: &seqExpr{ - pos: position{line: 1078, col: 5, offset: 25769}, + pos: position{line: 1081, col: 5, offset: 25859}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1078, col: 5, offset: 25769}, + pos: position{line: 1081, col: 5, offset: 25859}, name: "REGEXP", }, &ruleRefExpr{ - pos: position{line: 1078, col: 12, offset: 25776}, + pos: position{line: 1081, col: 12, offset: 25866}, name: "__", }, &litMatcher{ - pos: position{line: 1078, col: 15, offset: 25779}, + pos: position{line: 1081, col: 15, offset: 25869}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1078, col: 19, offset: 25783}, + pos: position{line: 1081, col: 19, offset: 25873}, name: "__", }, &labeledExpr{ - pos: position{line: 1078, col: 22, offset: 25786}, + pos: position{line: 1081, col: 22, offset: 25876}, label: "arg0", expr: &ruleRefExpr{ - pos: position{line: 1078, col: 27, offset: 25791}, + pos: position{line: 1081, col: 27, offset: 25881}, name: "RegexpPrimitive", }, }, &ruleRefExpr{ - pos: position{line: 1078, col: 43, offset: 25807}, + pos: position{line: 1081, col: 43, offset: 25897}, name: "__", }, &litMatcher{ - pos: position{line: 1078, col: 46, offset: 25810}, + pos: position{line: 1081, col: 46, offset: 25900}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1078, col: 50, offset: 25814}, + pos: position{line: 1081, col: 50, offset: 25904}, name: "__", }, &labeledExpr{ - pos: position{line: 1078, col: 53, offset: 25817}, + pos: position{line: 1081, col: 53, offset: 25907}, label: "arg1", expr: &ruleRefExpr{ - pos: position{line: 1078, col: 58, offset: 25822}, + pos: position{line: 1081, col: 58, offset: 25912}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1078, col: 63, offset: 25827}, + pos: position{line: 1081, col: 63, offset: 25917}, name: "__", }, &litMatcher{ - pos: position{line: 1078, col: 66, offset: 25830}, + pos: position{line: 1081, col: 66, offset: 25920}, val: ")", ignoreCase: false, want: "\")\"", }, &labeledExpr{ - pos: position{line: 1078, col: 70, offset: 25834}, + pos: position{line: 1081, col: 70, offset: 25924}, label: "where", expr: &zeroOrOneExpr{ - pos: position{line: 1078, col: 76, offset: 25840}, + pos: position{line: 1081, col: 76, offset: 25930}, expr: &ruleRefExpr{ - pos: position{line: 1078, col: 76, offset: 25840}, + pos: position{line: 1081, col: 76, offset: 25930}, name: "WhereClause", }, }, @@ -7271,98 +7300,98 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1082, col: 5, offset: 26019}, + pos: position{line: 1085, col: 5, offset: 26109}, run: (*parser).callonFunction21, expr: &seqExpr{ - pos: position{line: 1082, col: 5, offset: 26019}, + pos: position{line: 1085, col: 5, offset: 26109}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1082, col: 5, offset: 26019}, + pos: position{line: 1085, col: 5, offset: 26109}, name: "REGEXP_REPLACE", }, &ruleRefExpr{ - pos: position{line: 1082, col: 20, offset: 26034}, + pos: position{line: 1085, col: 20, offset: 26124}, name: "__", }, &litMatcher{ - pos: position{line: 1082, col: 23, offset: 26037}, + pos: position{line: 1085, col: 23, offset: 26127}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1082, col: 27, offset: 26041}, + pos: position{line: 1085, col: 27, offset: 26131}, name: "__", }, &labeledExpr{ - pos: position{line: 1082, col: 30, offset: 26044}, + pos: position{line: 1085, col: 30, offset: 26134}, label: "arg0", expr: &ruleRefExpr{ - pos: position{line: 1082, col: 35, offset: 26049}, + pos: position{line: 1085, col: 35, offset: 26139}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1082, col: 40, offset: 26054}, + pos: position{line: 1085, col: 40, offset: 26144}, name: "__", }, &litMatcher{ - pos: position{line: 1082, col: 43, offset: 26057}, + pos: position{line: 1085, col: 43, offset: 26147}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1082, col: 47, offset: 26061}, + pos: position{line: 1085, col: 47, offset: 26151}, name: "__", }, &labeledExpr{ - pos: position{line: 1082, col: 50, offset: 26064}, + pos: position{line: 1085, col: 50, offset: 26154}, label: "arg1", expr: &ruleRefExpr{ - pos: position{line: 1082, col: 55, offset: 26069}, + pos: position{line: 1085, col: 55, offset: 26159}, name: "RegexpPrimitive", }, }, &ruleRefExpr{ - pos: position{line: 1082, col: 71, offset: 26085}, + pos: position{line: 1085, col: 71, offset: 26175}, name: "__", }, &litMatcher{ - pos: position{line: 1082, col: 74, offset: 26088}, + pos: position{line: 1085, col: 74, offset: 26178}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1082, col: 78, offset: 26092}, + pos: position{line: 1085, col: 78, offset: 26182}, name: "__", }, &labeledExpr{ - pos: position{line: 1082, col: 81, offset: 26095}, + pos: position{line: 1085, col: 81, offset: 26185}, label: "arg2", expr: &ruleRefExpr{ - pos: position{line: 1082, col: 86, offset: 26100}, + pos: position{line: 1085, col: 86, offset: 26190}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1082, col: 91, offset: 26105}, + pos: position{line: 1085, col: 91, offset: 26195}, name: "__", }, &litMatcher{ - pos: position{line: 1082, col: 94, offset: 26108}, + pos: position{line: 1085, col: 94, offset: 26198}, val: ")", ignoreCase: false, want: "\")\"", }, &labeledExpr{ - pos: position{line: 1082, col: 98, offset: 26112}, + pos: position{line: 1085, col: 98, offset: 26202}, label: "where", expr: &zeroOrOneExpr{ - pos: position{line: 1082, col: 104, offset: 26118}, + pos: position{line: 1085, col: 104, offset: 26208}, expr: &ruleRefExpr{ - pos: position{line: 1082, col: 104, offset: 26118}, + pos: position{line: 1085, col: 104, offset: 26208}, name: "WhereClause", }, }, @@ -7371,65 +7400,65 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1086, col: 5, offset: 26312}, + pos: position{line: 1089, col: 5, offset: 26402}, run: (*parser).callonFunction44, expr: &seqExpr{ - pos: position{line: 1086, col: 5, offset: 26312}, + pos: position{line: 1089, col: 5, offset: 26402}, exprs: []any{ ¬Expr{ - pos: position{line: 1086, col: 5, offset: 26312}, + pos: position{line: 1089, col: 5, offset: 26402}, expr: &ruleRefExpr{ - pos: position{line: 1086, col: 6, offset: 26313}, + pos: position{line: 1089, col: 6, offset: 26403}, name: "FuncGuard", }, }, &labeledExpr{ - pos: position{line: 1086, col: 16, offset: 26323}, + pos: position{line: 1089, col: 16, offset: 26413}, label: "fn", expr: &ruleRefExpr{ - pos: position{line: 1086, col: 19, offset: 26326}, + pos: position{line: 1089, col: 19, offset: 26416}, name: "Identifier", }, }, &ruleRefExpr{ - pos: position{line: 1086, col: 30, offset: 26337}, + pos: position{line: 1089, col: 30, offset: 26427}, name: "__", }, &litMatcher{ - pos: position{line: 1086, col: 33, offset: 26340}, + pos: position{line: 1089, col: 33, offset: 26430}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1086, col: 37, offset: 26344}, + pos: position{line: 1089, col: 37, offset: 26434}, name: "__", }, &labeledExpr{ - pos: position{line: 1086, col: 40, offset: 26347}, + pos: position{line: 1089, col: 40, offset: 26437}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 1086, col: 45, offset: 26352}, + pos: position{line: 1089, col: 45, offset: 26442}, name: "FunctionArgs", }, }, &ruleRefExpr{ - pos: position{line: 1086, col: 58, offset: 26365}, + pos: position{line: 1089, col: 58, offset: 26455}, name: "__", }, &litMatcher{ - pos: position{line: 1086, col: 61, offset: 26368}, + pos: position{line: 1089, col: 61, offset: 26458}, val: ")", ignoreCase: false, want: "\")\"", }, &labeledExpr{ - pos: position{line: 1086, col: 65, offset: 26372}, + pos: position{line: 1089, col: 65, offset: 26462}, label: "where", expr: &zeroOrOneExpr{ - pos: position{line: 1086, col: 71, offset: 26378}, + pos: position{line: 1089, col: 71, offset: 26468}, expr: &ruleRefExpr{ - pos: position{line: 1086, col: 71, offset: 26378}, + pos: position{line: 1089, col: 71, offset: 26468}, name: "WhereClause", }, }, @@ -7444,15 +7473,15 @@ var g = &grammar{ }, { name: "RegexpPrimitive", - pos: position{line: 1090, col: 1, offset: 26446}, + pos: position{line: 1093, col: 1, offset: 26536}, expr: &actionExpr{ - pos: position{line: 1091, col: 5, offset: 26466}, + pos: position{line: 1094, col: 5, offset: 26556}, run: (*parser).callonRegexpPrimitive1, expr: &labeledExpr{ - pos: position{line: 1091, col: 5, offset: 26466}, + pos: position{line: 1094, col: 5, offset: 26556}, label: "pat", expr: &ruleRefExpr{ - pos: position{line: 1091, col: 9, offset: 26470}, + pos: position{line: 1094, col: 9, offset: 26560}, name: "RegexpPattern", }, }, @@ -7462,24 +7491,24 @@ var g = &grammar{ }, { name: "FunctionArgs", - pos: position{line: 1093, col: 1, offset: 26541}, + pos: position{line: 1096, col: 1, offset: 26631}, expr: &choiceExpr{ - pos: position{line: 1094, col: 5, offset: 26558}, + pos: position{line: 1097, col: 5, offset: 26648}, alternatives: []any{ &actionExpr{ - pos: position{line: 1094, col: 5, offset: 26558}, + pos: position{line: 1097, col: 5, offset: 26648}, run: (*parser).callonFunctionArgs2, expr: &labeledExpr{ - pos: position{line: 1094, col: 5, offset: 26558}, + pos: position{line: 1097, col: 5, offset: 26648}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 1094, col: 7, offset: 26560}, + pos: position{line: 1097, col: 7, offset: 26650}, name: "OverExpr", }, }, }, &ruleRefExpr{ - pos: position{line: 1095, col: 5, offset: 26598}, + pos: position{line: 1098, col: 5, offset: 26688}, name: "OptionalExprs", }, }, @@ -7489,96 +7518,96 @@ var g = &grammar{ }, { name: "Grep", - pos: position{line: 1097, col: 1, offset: 26613}, + pos: position{line: 1100, col: 1, offset: 26703}, expr: &actionExpr{ - pos: position{line: 1098, col: 5, offset: 26622}, + pos: position{line: 1101, col: 5, offset: 26712}, run: (*parser).callonGrep1, expr: &seqExpr{ - pos: position{line: 1098, col: 5, offset: 26622}, + pos: position{line: 1101, col: 5, offset: 26712}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1098, col: 5, offset: 26622}, + pos: position{line: 1101, col: 5, offset: 26712}, name: "GREP", }, &ruleRefExpr{ - pos: position{line: 1098, col: 10, offset: 26627}, + pos: position{line: 1101, col: 10, offset: 26717}, name: "__", }, &litMatcher{ - pos: position{line: 1098, col: 13, offset: 26630}, + pos: position{line: 1101, col: 13, offset: 26720}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1098, col: 17, offset: 26634}, + pos: position{line: 1101, col: 17, offset: 26724}, name: "__", }, &labeledExpr{ - pos: position{line: 1098, col: 20, offset: 26637}, + pos: position{line: 1101, col: 20, offset: 26727}, label: "pattern", expr: &choiceExpr{ - pos: position{line: 1098, col: 29, offset: 26646}, + pos: position{line: 1101, col: 29, offset: 26736}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1098, col: 29, offset: 26646}, + pos: position{line: 1101, col: 29, offset: 26736}, name: "Regexp", }, &ruleRefExpr{ - pos: position{line: 1098, col: 38, offset: 26655}, + pos: position{line: 1101, col: 38, offset: 26745}, name: "Glob", }, &ruleRefExpr{ - pos: position{line: 1098, col: 45, offset: 26662}, + pos: position{line: 1101, col: 45, offset: 26752}, name: "Expr", }, }, }, }, &ruleRefExpr{ - pos: position{line: 1098, col: 51, offset: 26668}, + pos: position{line: 1101, col: 51, offset: 26758}, name: "__", }, &labeledExpr{ - pos: position{line: 1098, col: 54, offset: 26671}, + pos: position{line: 1101, col: 54, offset: 26761}, label: "opt", expr: &zeroOrOneExpr{ - pos: position{line: 1098, col: 58, offset: 26675}, + pos: position{line: 1101, col: 58, offset: 26765}, expr: &actionExpr{ - pos: position{line: 1098, col: 59, offset: 26676}, + pos: position{line: 1101, col: 59, offset: 26766}, run: (*parser).callonGrep15, expr: &seqExpr{ - pos: position{line: 1098, col: 59, offset: 26676}, + pos: position{line: 1101, col: 59, offset: 26766}, exprs: []any{ &litMatcher{ - pos: position{line: 1098, col: 59, offset: 26676}, + pos: position{line: 1101, col: 59, offset: 26766}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1098, col: 63, offset: 26680}, + pos: position{line: 1101, col: 63, offset: 26770}, name: "__", }, &labeledExpr{ - pos: position{line: 1098, col: 66, offset: 26683}, + pos: position{line: 1101, col: 66, offset: 26773}, label: "e", expr: &choiceExpr{ - pos: position{line: 1098, col: 69, offset: 26686}, + pos: position{line: 1101, col: 69, offset: 26776}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1098, col: 69, offset: 26686}, + pos: position{line: 1101, col: 69, offset: 26776}, name: "OverExpr", }, &ruleRefExpr{ - pos: position{line: 1098, col: 80, offset: 26697}, + pos: position{line: 1101, col: 80, offset: 26787}, name: "Expr", }, }, }, }, &ruleRefExpr{ - pos: position{line: 1098, col: 86, offset: 26703}, + pos: position{line: 1101, col: 86, offset: 26793}, name: "__", }, }, @@ -7587,7 +7616,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1098, col: 109, offset: 26726}, + pos: position{line: 1101, col: 109, offset: 26816}, val: ")", ignoreCase: false, want: "\")\"", @@ -7600,19 +7629,19 @@ var g = &grammar{ }, { name: "OptionalExprs", - pos: position{line: 1110, col: 1, offset: 26939}, + pos: position{line: 1113, col: 1, offset: 27029}, expr: &choiceExpr{ - pos: position{line: 1111, col: 5, offset: 26957}, + pos: position{line: 1114, col: 5, offset: 27047}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1111, col: 5, offset: 26957}, + pos: position{line: 1114, col: 5, offset: 27047}, name: "Exprs", }, &actionExpr{ - pos: position{line: 1112, col: 5, offset: 26967}, + pos: position{line: 1115, col: 5, offset: 27057}, run: (*parser).callonOptionalExprs3, expr: &ruleRefExpr{ - pos: position{line: 1112, col: 5, offset: 26967}, + pos: position{line: 1115, col: 5, offset: 27057}, name: "__", }, }, @@ -7623,51 +7652,51 @@ var g = &grammar{ }, { name: "Exprs", - pos: position{line: 1114, col: 1, offset: 26995}, + pos: position{line: 1117, col: 1, offset: 27085}, expr: &actionExpr{ - pos: position{line: 1115, col: 5, offset: 27005}, + pos: position{line: 1118, col: 5, offset: 27095}, run: (*parser).callonExprs1, expr: &seqExpr{ - pos: position{line: 1115, col: 5, offset: 27005}, + pos: position{line: 1118, col: 5, offset: 27095}, exprs: []any{ &labeledExpr{ - pos: position{line: 1115, col: 5, offset: 27005}, + pos: position{line: 1118, col: 5, offset: 27095}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1115, col: 11, offset: 27011}, + pos: position{line: 1118, col: 11, offset: 27101}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 1115, col: 16, offset: 27016}, + pos: position{line: 1118, col: 16, offset: 27106}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1115, col: 21, offset: 27021}, + pos: position{line: 1118, col: 21, offset: 27111}, expr: &actionExpr{ - pos: position{line: 1115, col: 22, offset: 27022}, + pos: position{line: 1118, col: 22, offset: 27112}, run: (*parser).callonExprs7, expr: &seqExpr{ - pos: position{line: 1115, col: 22, offset: 27022}, + pos: position{line: 1118, col: 22, offset: 27112}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1115, col: 22, offset: 27022}, + pos: position{line: 1118, col: 22, offset: 27112}, name: "__", }, &litMatcher{ - pos: position{line: 1115, col: 25, offset: 27025}, + pos: position{line: 1118, col: 25, offset: 27115}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1115, col: 29, offset: 27029}, + pos: position{line: 1118, col: 29, offset: 27119}, name: "__", }, &labeledExpr{ - pos: position{line: 1115, col: 32, offset: 27032}, + pos: position{line: 1118, col: 32, offset: 27122}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1115, col: 34, offset: 27034}, + pos: position{line: 1118, col: 34, offset: 27124}, name: "Expr", }, }, @@ -7684,72 +7713,72 @@ var g = &grammar{ }, { name: "Primary", - pos: position{line: 1119, col: 1, offset: 27107}, + pos: position{line: 1122, col: 1, offset: 27197}, expr: &choiceExpr{ - pos: position{line: 1120, col: 5, offset: 27119}, + pos: position{line: 1123, col: 5, offset: 27209}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1120, col: 5, offset: 27119}, + pos: position{line: 1123, col: 5, offset: 27209}, name: "CaseExpr", }, &ruleRefExpr{ - pos: position{line: 1121, col: 5, offset: 27132}, + pos: position{line: 1124, col: 5, offset: 27222}, name: "Record", }, &ruleRefExpr{ - pos: position{line: 1122, col: 5, offset: 27143}, + pos: position{line: 1125, col: 5, offset: 27233}, name: "Array", }, &ruleRefExpr{ - pos: position{line: 1123, col: 5, offset: 27153}, + pos: position{line: 1126, col: 5, offset: 27243}, name: "Set", }, &ruleRefExpr{ - pos: position{line: 1124, col: 5, offset: 27161}, + pos: position{line: 1127, col: 5, offset: 27251}, name: "Map", }, &ruleRefExpr{ - pos: position{line: 1125, col: 5, offset: 27169}, + pos: position{line: 1128, col: 5, offset: 27259}, name: "Literal", }, &ruleRefExpr{ - pos: position{line: 1126, col: 5, offset: 27181}, + pos: position{line: 1129, col: 5, offset: 27271}, name: "Identifier", }, &ruleRefExpr{ - pos: position{line: 1127, col: 5, offset: 27196}, + pos: position{line: 1130, col: 5, offset: 27286}, name: "Tuple", }, &actionExpr{ - pos: position{line: 1128, col: 5, offset: 27206}, + pos: position{line: 1131, col: 5, offset: 27296}, run: (*parser).callonPrimary10, expr: &seqExpr{ - pos: position{line: 1128, col: 5, offset: 27206}, + pos: position{line: 1131, col: 5, offset: 27296}, exprs: []any{ &litMatcher{ - pos: position{line: 1128, col: 5, offset: 27206}, + pos: position{line: 1131, col: 5, offset: 27296}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1128, col: 9, offset: 27210}, + pos: position{line: 1131, col: 9, offset: 27300}, name: "__", }, &labeledExpr{ - pos: position{line: 1128, col: 12, offset: 27213}, + pos: position{line: 1131, col: 12, offset: 27303}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1128, col: 17, offset: 27218}, + pos: position{line: 1131, col: 17, offset: 27308}, name: "OverExpr", }, }, &ruleRefExpr{ - pos: position{line: 1128, col: 26, offset: 27227}, + pos: position{line: 1131, col: 26, offset: 27317}, name: "__", }, &litMatcher{ - pos: position{line: 1128, col: 29, offset: 27230}, + pos: position{line: 1131, col: 29, offset: 27320}, val: ")", ignoreCase: false, want: "\")\"", @@ -7758,35 +7787,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1129, col: 5, offset: 27259}, + pos: position{line: 1132, col: 5, offset: 27349}, run: (*parser).callonPrimary18, expr: &seqExpr{ - pos: position{line: 1129, col: 5, offset: 27259}, + pos: position{line: 1132, col: 5, offset: 27349}, exprs: []any{ &litMatcher{ - pos: position{line: 1129, col: 5, offset: 27259}, + pos: position{line: 1132, col: 5, offset: 27349}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1129, col: 9, offset: 27263}, + pos: position{line: 1132, col: 9, offset: 27353}, name: "__", }, &labeledExpr{ - pos: position{line: 1129, col: 12, offset: 27266}, + pos: position{line: 1132, col: 12, offset: 27356}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1129, col: 17, offset: 27271}, + pos: position{line: 1132, col: 17, offset: 27361}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1129, col: 22, offset: 27276}, + pos: position{line: 1132, col: 22, offset: 27366}, name: "__", }, &litMatcher{ - pos: position{line: 1129, col: 25, offset: 27279}, + pos: position{line: 1132, col: 25, offset: 27369}, val: ")", ignoreCase: false, want: "\")\"", @@ -7801,55 +7830,55 @@ var g = &grammar{ }, { name: "CaseExpr", - pos: position{line: 1131, col: 1, offset: 27305}, + pos: position{line: 1134, col: 1, offset: 27395}, expr: &choiceExpr{ - pos: position{line: 1132, col: 5, offset: 27318}, + pos: position{line: 1135, col: 5, offset: 27408}, alternatives: []any{ &actionExpr{ - pos: position{line: 1132, col: 5, offset: 27318}, + pos: position{line: 1135, col: 5, offset: 27408}, run: (*parser).callonCaseExpr2, expr: &seqExpr{ - pos: position{line: 1132, col: 5, offset: 27318}, + pos: position{line: 1135, col: 5, offset: 27408}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1132, col: 5, offset: 27318}, + pos: position{line: 1135, col: 5, offset: 27408}, name: "CASE", }, &labeledExpr{ - pos: position{line: 1132, col: 10, offset: 27323}, + pos: position{line: 1135, col: 10, offset: 27413}, label: "cases", expr: &oneOrMoreExpr{ - pos: position{line: 1132, col: 16, offset: 27329}, + pos: position{line: 1135, col: 16, offset: 27419}, expr: &ruleRefExpr{ - pos: position{line: 1132, col: 16, offset: 27329}, + pos: position{line: 1135, col: 16, offset: 27419}, name: "When", }, }, }, &labeledExpr{ - pos: position{line: 1132, col: 22, offset: 27335}, + pos: position{line: 1135, col: 22, offset: 27425}, label: "else_", expr: &zeroOrOneExpr{ - pos: position{line: 1132, col: 28, offset: 27341}, + pos: position{line: 1135, col: 28, offset: 27431}, expr: &seqExpr{ - pos: position{line: 1132, col: 29, offset: 27342}, + pos: position{line: 1135, col: 29, offset: 27432}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1132, col: 29, offset: 27342}, + pos: position{line: 1135, col: 29, offset: 27432}, name: "_", }, &litMatcher{ - pos: position{line: 1132, col: 31, offset: 27344}, + pos: position{line: 1135, col: 31, offset: 27434}, val: "else", ignoreCase: false, want: "\"else\"", }, &ruleRefExpr{ - pos: position{line: 1132, col: 38, offset: 27351}, + pos: position{line: 1135, col: 38, offset: 27441}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1132, col: 40, offset: 27353}, + pos: position{line: 1135, col: 40, offset: 27443}, name: "Expr", }, }, @@ -7857,24 +7886,24 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1132, col: 47, offset: 27360}, + pos: position{line: 1135, col: 47, offset: 27450}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1132, col: 49, offset: 27362}, + pos: position{line: 1135, col: 49, offset: 27452}, name: "END", }, &zeroOrOneExpr{ - pos: position{line: 1132, col: 53, offset: 27366}, + pos: position{line: 1135, col: 53, offset: 27456}, expr: &seqExpr{ - pos: position{line: 1132, col: 54, offset: 27367}, + pos: position{line: 1135, col: 54, offset: 27457}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1132, col: 54, offset: 27367}, + pos: position{line: 1135, col: 54, offset: 27457}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1132, col: 56, offset: 27369}, + pos: position{line: 1135, col: 56, offset: 27459}, name: "CASE", }, }, @@ -7884,62 +7913,62 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1156, col: 5, offset: 28018}, + pos: position{line: 1159, col: 5, offset: 28108}, run: (*parser).callonCaseExpr21, expr: &seqExpr{ - pos: position{line: 1156, col: 5, offset: 28018}, + pos: position{line: 1159, col: 5, offset: 28108}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1156, col: 5, offset: 28018}, + pos: position{line: 1159, col: 5, offset: 28108}, name: "CASE", }, &ruleRefExpr{ - pos: position{line: 1156, col: 10, offset: 28023}, + pos: position{line: 1159, col: 10, offset: 28113}, name: "_", }, &labeledExpr{ - pos: position{line: 1156, col: 12, offset: 28025}, + pos: position{line: 1159, col: 12, offset: 28115}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1156, col: 17, offset: 28030}, + pos: position{line: 1159, col: 17, offset: 28120}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 1156, col: 22, offset: 28035}, + pos: position{line: 1159, col: 22, offset: 28125}, label: "whens", expr: &oneOrMoreExpr{ - pos: position{line: 1156, col: 28, offset: 28041}, + pos: position{line: 1159, col: 28, offset: 28131}, expr: &ruleRefExpr{ - pos: position{line: 1156, col: 28, offset: 28041}, + pos: position{line: 1159, col: 28, offset: 28131}, name: "When", }, }, }, &labeledExpr{ - pos: position{line: 1156, col: 34, offset: 28047}, + pos: position{line: 1159, col: 34, offset: 28137}, label: "else_", expr: &zeroOrOneExpr{ - pos: position{line: 1156, col: 40, offset: 28053}, + pos: position{line: 1159, col: 40, offset: 28143}, expr: &seqExpr{ - pos: position{line: 1156, col: 41, offset: 28054}, + pos: position{line: 1159, col: 41, offset: 28144}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1156, col: 41, offset: 28054}, + pos: position{line: 1159, col: 41, offset: 28144}, name: "_", }, &litMatcher{ - pos: position{line: 1156, col: 43, offset: 28056}, + pos: position{line: 1159, col: 43, offset: 28146}, val: "else", ignoreCase: false, want: "\"else\"", }, &ruleRefExpr{ - pos: position{line: 1156, col: 50, offset: 28063}, + pos: position{line: 1159, col: 50, offset: 28153}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1156, col: 52, offset: 28065}, + pos: position{line: 1159, col: 52, offset: 28155}, name: "Expr", }, }, @@ -7947,24 +7976,24 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1156, col: 59, offset: 28072}, + pos: position{line: 1159, col: 59, offset: 28162}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1156, col: 61, offset: 28074}, + pos: position{line: 1159, col: 61, offset: 28164}, name: "END", }, &zeroOrOneExpr{ - pos: position{line: 1156, col: 65, offset: 28078}, + pos: position{line: 1159, col: 65, offset: 28168}, expr: &seqExpr{ - pos: position{line: 1156, col: 66, offset: 28079}, + pos: position{line: 1159, col: 66, offset: 28169}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1156, col: 66, offset: 28079}, + pos: position{line: 1159, col: 66, offset: 28169}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1156, col: 68, offset: 28081}, + pos: position{line: 1159, col: 68, offset: 28171}, name: "CASE", }, }, @@ -7980,50 +8009,50 @@ var g = &grammar{ }, { name: "When", - pos: position{line: 1169, col: 1, offset: 28387}, + pos: position{line: 1172, col: 1, offset: 28477}, expr: &actionExpr{ - pos: position{line: 1170, col: 5, offset: 28396}, + pos: position{line: 1173, col: 5, offset: 28486}, run: (*parser).callonWhen1, expr: &seqExpr{ - pos: position{line: 1170, col: 5, offset: 28396}, + pos: position{line: 1173, col: 5, offset: 28486}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1170, col: 5, offset: 28396}, + pos: position{line: 1173, col: 5, offset: 28486}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1170, col: 7, offset: 28398}, + pos: position{line: 1173, col: 7, offset: 28488}, name: "WHEN", }, &ruleRefExpr{ - pos: position{line: 1170, col: 12, offset: 28403}, + pos: position{line: 1173, col: 12, offset: 28493}, name: "_", }, &labeledExpr{ - pos: position{line: 1170, col: 14, offset: 28405}, + pos: position{line: 1173, col: 14, offset: 28495}, label: "cond", expr: &ruleRefExpr{ - pos: position{line: 1170, col: 19, offset: 28410}, + pos: position{line: 1173, col: 19, offset: 28500}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1170, col: 24, offset: 28415}, + pos: position{line: 1173, col: 24, offset: 28505}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1170, col: 26, offset: 28417}, + pos: position{line: 1173, col: 26, offset: 28507}, name: "THEN", }, &ruleRefExpr{ - pos: position{line: 1170, col: 31, offset: 28422}, + pos: position{line: 1173, col: 31, offset: 28512}, name: "_", }, &labeledExpr{ - pos: position{line: 1170, col: 33, offset: 28424}, + pos: position{line: 1173, col: 33, offset: 28514}, label: "then", expr: &ruleRefExpr{ - pos: position{line: 1170, col: 38, offset: 28429}, + pos: position{line: 1173, col: 38, offset: 28519}, name: "Expr", }, }, @@ -8035,57 +8064,57 @@ var g = &grammar{ }, { name: "OverExpr", - pos: position{line: 1179, col: 1, offset: 28588}, + pos: position{line: 1182, col: 1, offset: 28678}, expr: &actionExpr{ - pos: position{line: 1180, col: 5, offset: 28601}, + pos: position{line: 1183, col: 5, offset: 28691}, run: (*parser).callonOverExpr1, expr: &seqExpr{ - pos: position{line: 1180, col: 5, offset: 28601}, + pos: position{line: 1183, col: 5, offset: 28691}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1180, col: 5, offset: 28601}, + pos: position{line: 1183, col: 5, offset: 28691}, name: "OVER", }, &ruleRefExpr{ - pos: position{line: 1180, col: 10, offset: 28606}, + pos: position{line: 1183, col: 10, offset: 28696}, name: "_", }, &labeledExpr{ - pos: position{line: 1180, col: 12, offset: 28608}, + pos: position{line: 1183, col: 12, offset: 28698}, label: "exprs", expr: &ruleRefExpr{ - pos: position{line: 1180, col: 18, offset: 28614}, + pos: position{line: 1183, col: 18, offset: 28704}, name: "Exprs", }, }, &labeledExpr{ - pos: position{line: 1180, col: 24, offset: 28620}, + pos: position{line: 1183, col: 24, offset: 28710}, label: "locals", expr: &zeroOrOneExpr{ - pos: position{line: 1180, col: 31, offset: 28627}, + pos: position{line: 1183, col: 31, offset: 28717}, expr: &ruleRefExpr{ - pos: position{line: 1180, col: 31, offset: 28627}, + pos: position{line: 1183, col: 31, offset: 28717}, name: "Locals", }, }, }, &ruleRefExpr{ - pos: position{line: 1180, col: 39, offset: 28635}, + pos: position{line: 1183, col: 39, offset: 28725}, name: "__", }, &ruleRefExpr{ - pos: position{line: 1180, col: 42, offset: 28638}, + pos: position{line: 1183, col: 42, offset: 28728}, name: "Pipe", }, &ruleRefExpr{ - pos: position{line: 1180, col: 47, offset: 28643}, + pos: position{line: 1183, col: 47, offset: 28733}, name: "__", }, &labeledExpr{ - pos: position{line: 1180, col: 50, offset: 28646}, + pos: position{line: 1183, col: 50, offset: 28736}, label: "body", expr: &ruleRefExpr{ - pos: position{line: 1180, col: 55, offset: 28651}, + pos: position{line: 1183, col: 55, offset: 28741}, name: "Seq", }, }, @@ -8097,37 +8126,37 @@ var g = &grammar{ }, { name: "Record", - pos: position{line: 1190, col: 1, offset: 28882}, + pos: position{line: 1193, col: 1, offset: 28972}, expr: &actionExpr{ - pos: position{line: 1191, col: 5, offset: 28893}, + pos: position{line: 1194, col: 5, offset: 28983}, run: (*parser).callonRecord1, expr: &seqExpr{ - pos: position{line: 1191, col: 5, offset: 28893}, + pos: position{line: 1194, col: 5, offset: 28983}, exprs: []any{ &litMatcher{ - pos: position{line: 1191, col: 5, offset: 28893}, + pos: position{line: 1194, col: 5, offset: 28983}, val: "{", ignoreCase: false, want: "\"{\"", }, &ruleRefExpr{ - pos: position{line: 1191, col: 9, offset: 28897}, + pos: position{line: 1194, col: 9, offset: 28987}, name: "__", }, &labeledExpr{ - pos: position{line: 1191, col: 12, offset: 28900}, + pos: position{line: 1194, col: 12, offset: 28990}, label: "elems", expr: &ruleRefExpr{ - pos: position{line: 1191, col: 18, offset: 28906}, + pos: position{line: 1194, col: 18, offset: 28996}, name: "RecordElems", }, }, &ruleRefExpr{ - pos: position{line: 1191, col: 30, offset: 28918}, + pos: position{line: 1194, col: 30, offset: 29008}, name: "__", }, &litMatcher{ - pos: position{line: 1191, col: 33, offset: 28921}, + pos: position{line: 1194, col: 33, offset: 29011}, val: "}", ignoreCase: false, want: "\"}\"", @@ -8140,31 +8169,31 @@ var g = &grammar{ }, { name: "RecordElems", - pos: position{line: 1199, col: 1, offset: 29079}, + pos: position{line: 1202, col: 1, offset: 29169}, expr: &choiceExpr{ - pos: position{line: 1200, col: 5, offset: 29095}, + pos: position{line: 1203, col: 5, offset: 29185}, alternatives: []any{ &actionExpr{ - pos: position{line: 1200, col: 5, offset: 29095}, + pos: position{line: 1203, col: 5, offset: 29185}, run: (*parser).callonRecordElems2, expr: &seqExpr{ - pos: position{line: 1200, col: 5, offset: 29095}, + pos: position{line: 1203, col: 5, offset: 29185}, exprs: []any{ &labeledExpr{ - pos: position{line: 1200, col: 5, offset: 29095}, + pos: position{line: 1203, col: 5, offset: 29185}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1200, col: 11, offset: 29101}, + pos: position{line: 1203, col: 11, offset: 29191}, name: "RecordElem", }, }, &labeledExpr{ - pos: position{line: 1200, col: 22, offset: 29112}, + pos: position{line: 1203, col: 22, offset: 29202}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1200, col: 27, offset: 29117}, + pos: position{line: 1203, col: 27, offset: 29207}, expr: &ruleRefExpr{ - pos: position{line: 1200, col: 27, offset: 29117}, + pos: position{line: 1203, col: 27, offset: 29207}, name: "RecordElemTail", }, }, @@ -8173,10 +8202,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1203, col: 5, offset: 29180}, + pos: position{line: 1206, col: 5, offset: 29270}, run: (*parser).callonRecordElems9, expr: &ruleRefExpr{ - pos: position{line: 1203, col: 5, offset: 29180}, + pos: position{line: 1206, col: 5, offset: 29270}, name: "__", }, }, @@ -8187,32 +8216,32 @@ var g = &grammar{ }, { name: "RecordElemTail", - pos: position{line: 1205, col: 1, offset: 29204}, + pos: position{line: 1208, col: 1, offset: 29294}, expr: &actionExpr{ - pos: position{line: 1205, col: 18, offset: 29221}, + pos: position{line: 1208, col: 18, offset: 29311}, run: (*parser).callonRecordElemTail1, expr: &seqExpr{ - pos: position{line: 1205, col: 18, offset: 29221}, + pos: position{line: 1208, col: 18, offset: 29311}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1205, col: 18, offset: 29221}, + pos: position{line: 1208, col: 18, offset: 29311}, name: "__", }, &litMatcher{ - pos: position{line: 1205, col: 21, offset: 29224}, + pos: position{line: 1208, col: 21, offset: 29314}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1205, col: 25, offset: 29228}, + pos: position{line: 1208, col: 25, offset: 29318}, name: "__", }, &labeledExpr{ - pos: position{line: 1205, col: 28, offset: 29231}, + pos: position{line: 1208, col: 28, offset: 29321}, label: "elem", expr: &ruleRefExpr{ - pos: position{line: 1205, col: 33, offset: 29236}, + pos: position{line: 1208, col: 33, offset: 29326}, name: "RecordElem", }, }, @@ -8224,20 +8253,20 @@ var g = &grammar{ }, { name: "RecordElem", - pos: position{line: 1207, col: 1, offset: 29269}, + pos: position{line: 1210, col: 1, offset: 29359}, expr: &choiceExpr{ - pos: position{line: 1208, col: 5, offset: 29284}, + pos: position{line: 1211, col: 5, offset: 29374}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1208, col: 5, offset: 29284}, + pos: position{line: 1211, col: 5, offset: 29374}, name: "Spread", }, &ruleRefExpr{ - pos: position{line: 1209, col: 5, offset: 29295}, + pos: position{line: 1212, col: 5, offset: 29385}, name: "FieldExpr", }, &ruleRefExpr{ - pos: position{line: 1210, col: 5, offset: 29309}, + pos: position{line: 1213, col: 5, offset: 29399}, name: "Identifier", }, }, @@ -8247,28 +8276,28 @@ var g = &grammar{ }, { name: "Spread", - pos: position{line: 1212, col: 1, offset: 29321}, + pos: position{line: 1215, col: 1, offset: 29411}, expr: &actionExpr{ - pos: position{line: 1213, col: 5, offset: 29332}, + pos: position{line: 1216, col: 5, offset: 29422}, run: (*parser).callonSpread1, expr: &seqExpr{ - pos: position{line: 1213, col: 5, offset: 29332}, + pos: position{line: 1216, col: 5, offset: 29422}, exprs: []any{ &litMatcher{ - pos: position{line: 1213, col: 5, offset: 29332}, + pos: position{line: 1216, col: 5, offset: 29422}, val: "...", ignoreCase: false, want: "\"...\"", }, &ruleRefExpr{ - pos: position{line: 1213, col: 11, offset: 29338}, + pos: position{line: 1216, col: 11, offset: 29428}, name: "__", }, &labeledExpr{ - pos: position{line: 1213, col: 14, offset: 29341}, + pos: position{line: 1216, col: 14, offset: 29431}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1213, col: 19, offset: 29346}, + pos: position{line: 1216, col: 19, offset: 29436}, name: "Expr", }, }, @@ -8280,40 +8309,40 @@ var g = &grammar{ }, { name: "FieldExpr", - pos: position{line: 1217, col: 1, offset: 29442}, + pos: position{line: 1220, col: 1, offset: 29532}, expr: &actionExpr{ - pos: position{line: 1218, col: 5, offset: 29456}, + pos: position{line: 1221, col: 5, offset: 29546}, run: (*parser).callonFieldExpr1, expr: &seqExpr{ - pos: position{line: 1218, col: 5, offset: 29456}, + pos: position{line: 1221, col: 5, offset: 29546}, exprs: []any{ &labeledExpr{ - pos: position{line: 1218, col: 5, offset: 29456}, + pos: position{line: 1221, col: 5, offset: 29546}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1218, col: 10, offset: 29461}, + pos: position{line: 1221, col: 10, offset: 29551}, name: "Name", }, }, &ruleRefExpr{ - pos: position{line: 1218, col: 15, offset: 29466}, + pos: position{line: 1221, col: 15, offset: 29556}, name: "__", }, &litMatcher{ - pos: position{line: 1218, col: 18, offset: 29469}, + pos: position{line: 1221, col: 18, offset: 29559}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1218, col: 22, offset: 29473}, + pos: position{line: 1221, col: 22, offset: 29563}, name: "__", }, &labeledExpr{ - pos: position{line: 1218, col: 25, offset: 29476}, + pos: position{line: 1221, col: 25, offset: 29566}, label: "value", expr: &ruleRefExpr{ - pos: position{line: 1218, col: 31, offset: 29482}, + pos: position{line: 1221, col: 31, offset: 29572}, name: "Expr", }, }, @@ -8325,37 +8354,37 @@ var g = &grammar{ }, { name: "Array", - pos: position{line: 1227, col: 1, offset: 29651}, + pos: position{line: 1230, col: 1, offset: 29741}, expr: &actionExpr{ - pos: position{line: 1228, col: 5, offset: 29661}, + pos: position{line: 1231, col: 5, offset: 29751}, run: (*parser).callonArray1, expr: &seqExpr{ - pos: position{line: 1228, col: 5, offset: 29661}, + pos: position{line: 1231, col: 5, offset: 29751}, exprs: []any{ &litMatcher{ - pos: position{line: 1228, col: 5, offset: 29661}, + pos: position{line: 1231, col: 5, offset: 29751}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 1228, col: 9, offset: 29665}, + pos: position{line: 1231, col: 9, offset: 29755}, name: "__", }, &labeledExpr{ - pos: position{line: 1228, col: 12, offset: 29668}, + pos: position{line: 1231, col: 12, offset: 29758}, label: "elems", expr: &ruleRefExpr{ - pos: position{line: 1228, col: 18, offset: 29674}, + pos: position{line: 1231, col: 18, offset: 29764}, name: "VectorElems", }, }, &ruleRefExpr{ - pos: position{line: 1228, col: 30, offset: 29686}, + pos: position{line: 1231, col: 30, offset: 29776}, name: "__", }, &litMatcher{ - pos: position{line: 1228, col: 33, offset: 29689}, + pos: position{line: 1231, col: 33, offset: 29779}, val: "]", ignoreCase: false, want: "\"]\"", @@ -8368,37 +8397,37 @@ var g = &grammar{ }, { name: "Set", - pos: position{line: 1236, col: 1, offset: 29845}, + pos: position{line: 1239, col: 1, offset: 29935}, expr: &actionExpr{ - pos: position{line: 1237, col: 5, offset: 29853}, + pos: position{line: 1240, col: 5, offset: 29943}, run: (*parser).callonSet1, expr: &seqExpr{ - pos: position{line: 1237, col: 5, offset: 29853}, + pos: position{line: 1240, col: 5, offset: 29943}, exprs: []any{ &litMatcher{ - pos: position{line: 1237, col: 5, offset: 29853}, + pos: position{line: 1240, col: 5, offset: 29943}, val: "|[", ignoreCase: false, want: "\"|[\"", }, &ruleRefExpr{ - pos: position{line: 1237, col: 10, offset: 29858}, + pos: position{line: 1240, col: 10, offset: 29948}, name: "__", }, &labeledExpr{ - pos: position{line: 1237, col: 13, offset: 29861}, + pos: position{line: 1240, col: 13, offset: 29951}, label: "elems", expr: &ruleRefExpr{ - pos: position{line: 1237, col: 19, offset: 29867}, + pos: position{line: 1240, col: 19, offset: 29957}, name: "VectorElems", }, }, &ruleRefExpr{ - pos: position{line: 1237, col: 31, offset: 29879}, + pos: position{line: 1240, col: 31, offset: 29969}, name: "__", }, &litMatcher{ - pos: position{line: 1237, col: 34, offset: 29882}, + pos: position{line: 1240, col: 34, offset: 29972}, val: "]|", ignoreCase: false, want: "\"]|\"", @@ -8411,54 +8440,54 @@ var g = &grammar{ }, { name: "VectorElems", - pos: position{line: 1245, col: 1, offset: 30035}, + pos: position{line: 1248, col: 1, offset: 30125}, expr: &choiceExpr{ - pos: position{line: 1246, col: 5, offset: 30051}, + pos: position{line: 1249, col: 5, offset: 30141}, alternatives: []any{ &actionExpr{ - pos: position{line: 1246, col: 5, offset: 30051}, + pos: position{line: 1249, col: 5, offset: 30141}, run: (*parser).callonVectorElems2, expr: &seqExpr{ - pos: position{line: 1246, col: 5, offset: 30051}, + pos: position{line: 1249, col: 5, offset: 30141}, exprs: []any{ &labeledExpr{ - pos: position{line: 1246, col: 5, offset: 30051}, + pos: position{line: 1249, col: 5, offset: 30141}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1246, col: 11, offset: 30057}, + pos: position{line: 1249, col: 11, offset: 30147}, name: "VectorElem", }, }, &labeledExpr{ - pos: position{line: 1246, col: 22, offset: 30068}, + pos: position{line: 1249, col: 22, offset: 30158}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1246, col: 27, offset: 30073}, + pos: position{line: 1249, col: 27, offset: 30163}, expr: &actionExpr{ - pos: position{line: 1246, col: 28, offset: 30074}, + pos: position{line: 1249, col: 28, offset: 30164}, run: (*parser).callonVectorElems8, expr: &seqExpr{ - pos: position{line: 1246, col: 28, offset: 30074}, + pos: position{line: 1249, col: 28, offset: 30164}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1246, col: 28, offset: 30074}, + pos: position{line: 1249, col: 28, offset: 30164}, name: "__", }, &litMatcher{ - pos: position{line: 1246, col: 31, offset: 30077}, + pos: position{line: 1249, col: 31, offset: 30167}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1246, col: 35, offset: 30081}, + pos: position{line: 1249, col: 35, offset: 30171}, name: "__", }, &labeledExpr{ - pos: position{line: 1246, col: 38, offset: 30084}, + pos: position{line: 1249, col: 38, offset: 30174}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1246, col: 40, offset: 30086}, + pos: position{line: 1249, col: 40, offset: 30176}, name: "VectorElem", }, }, @@ -8471,10 +8500,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1249, col: 5, offset: 30168}, + pos: position{line: 1252, col: 5, offset: 30258}, run: (*parser).callonVectorElems15, expr: &ruleRefExpr{ - pos: position{line: 1249, col: 5, offset: 30168}, + pos: position{line: 1252, col: 5, offset: 30258}, name: "__", }, }, @@ -8485,22 +8514,22 @@ var g = &grammar{ }, { name: "VectorElem", - pos: position{line: 1251, col: 1, offset: 30192}, + pos: position{line: 1254, col: 1, offset: 30282}, expr: &choiceExpr{ - pos: position{line: 1252, col: 5, offset: 30207}, + pos: position{line: 1255, col: 5, offset: 30297}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1252, col: 5, offset: 30207}, + pos: position{line: 1255, col: 5, offset: 30297}, name: "Spread", }, &actionExpr{ - pos: position{line: 1253, col: 5, offset: 30218}, + pos: position{line: 1256, col: 5, offset: 30308}, run: (*parser).callonVectorElem3, expr: &labeledExpr{ - pos: position{line: 1253, col: 5, offset: 30218}, + pos: position{line: 1256, col: 5, offset: 30308}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1253, col: 7, offset: 30220}, + pos: position{line: 1256, col: 7, offset: 30310}, name: "Expr", }, }, @@ -8512,37 +8541,37 @@ var g = &grammar{ }, { name: "Map", - pos: position{line: 1255, col: 1, offset: 30311}, + pos: position{line: 1258, col: 1, offset: 30401}, expr: &actionExpr{ - pos: position{line: 1256, col: 5, offset: 30319}, + pos: position{line: 1259, col: 5, offset: 30409}, run: (*parser).callonMap1, expr: &seqExpr{ - pos: position{line: 1256, col: 5, offset: 30319}, + pos: position{line: 1259, col: 5, offset: 30409}, exprs: []any{ &litMatcher{ - pos: position{line: 1256, col: 5, offset: 30319}, + pos: position{line: 1259, col: 5, offset: 30409}, val: "|{", ignoreCase: false, want: "\"|{\"", }, &ruleRefExpr{ - pos: position{line: 1256, col: 10, offset: 30324}, + pos: position{line: 1259, col: 10, offset: 30414}, name: "__", }, &labeledExpr{ - pos: position{line: 1256, col: 13, offset: 30327}, + pos: position{line: 1259, col: 13, offset: 30417}, label: "exprs", expr: &ruleRefExpr{ - pos: position{line: 1256, col: 19, offset: 30333}, + pos: position{line: 1259, col: 19, offset: 30423}, name: "Entries", }, }, &ruleRefExpr{ - pos: position{line: 1256, col: 27, offset: 30341}, + pos: position{line: 1259, col: 27, offset: 30431}, name: "__", }, &litMatcher{ - pos: position{line: 1256, col: 30, offset: 30344}, + pos: position{line: 1259, col: 30, offset: 30434}, val: "}|", ignoreCase: false, want: "\"}|\"", @@ -8555,31 +8584,31 @@ var g = &grammar{ }, { name: "Entries", - pos: position{line: 1264, col: 1, offset: 30498}, + pos: position{line: 1267, col: 1, offset: 30588}, expr: &choiceExpr{ - pos: position{line: 1265, col: 5, offset: 30510}, + pos: position{line: 1268, col: 5, offset: 30600}, alternatives: []any{ &actionExpr{ - pos: position{line: 1265, col: 5, offset: 30510}, + pos: position{line: 1268, col: 5, offset: 30600}, run: (*parser).callonEntries2, expr: &seqExpr{ - pos: position{line: 1265, col: 5, offset: 30510}, + pos: position{line: 1268, col: 5, offset: 30600}, exprs: []any{ &labeledExpr{ - pos: position{line: 1265, col: 5, offset: 30510}, + pos: position{line: 1268, col: 5, offset: 30600}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1265, col: 11, offset: 30516}, + pos: position{line: 1268, col: 11, offset: 30606}, name: "Entry", }, }, &labeledExpr{ - pos: position{line: 1265, col: 17, offset: 30522}, + pos: position{line: 1268, col: 17, offset: 30612}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1265, col: 22, offset: 30527}, + pos: position{line: 1268, col: 22, offset: 30617}, expr: &ruleRefExpr{ - pos: position{line: 1265, col: 22, offset: 30527}, + pos: position{line: 1268, col: 22, offset: 30617}, name: "EntryTail", }, }, @@ -8588,10 +8617,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1268, col: 5, offset: 30585}, + pos: position{line: 1271, col: 5, offset: 30675}, run: (*parser).callonEntries9, expr: &ruleRefExpr{ - pos: position{line: 1268, col: 5, offset: 30585}, + pos: position{line: 1271, col: 5, offset: 30675}, name: "__", }, }, @@ -8602,32 +8631,32 @@ var g = &grammar{ }, { name: "EntryTail", - pos: position{line: 1271, col: 1, offset: 30610}, + pos: position{line: 1274, col: 1, offset: 30700}, expr: &actionExpr{ - pos: position{line: 1271, col: 13, offset: 30622}, + pos: position{line: 1274, col: 13, offset: 30712}, run: (*parser).callonEntryTail1, expr: &seqExpr{ - pos: position{line: 1271, col: 13, offset: 30622}, + pos: position{line: 1274, col: 13, offset: 30712}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1271, col: 13, offset: 30622}, + pos: position{line: 1274, col: 13, offset: 30712}, name: "__", }, &litMatcher{ - pos: position{line: 1271, col: 16, offset: 30625}, + pos: position{line: 1274, col: 16, offset: 30715}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1271, col: 20, offset: 30629}, + pos: position{line: 1274, col: 20, offset: 30719}, name: "__", }, &labeledExpr{ - pos: position{line: 1271, col: 23, offset: 30632}, + pos: position{line: 1274, col: 23, offset: 30722}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1271, col: 25, offset: 30634}, + pos: position{line: 1274, col: 25, offset: 30724}, name: "Entry", }, }, @@ -8639,40 +8668,40 @@ var g = &grammar{ }, { name: "Entry", - pos: position{line: 1273, col: 1, offset: 30659}, + pos: position{line: 1276, col: 1, offset: 30749}, expr: &actionExpr{ - pos: position{line: 1274, col: 5, offset: 30669}, + pos: position{line: 1277, col: 5, offset: 30759}, run: (*parser).callonEntry1, expr: &seqExpr{ - pos: position{line: 1274, col: 5, offset: 30669}, + pos: position{line: 1277, col: 5, offset: 30759}, exprs: []any{ &labeledExpr{ - pos: position{line: 1274, col: 5, offset: 30669}, + pos: position{line: 1277, col: 5, offset: 30759}, label: "key", expr: &ruleRefExpr{ - pos: position{line: 1274, col: 9, offset: 30673}, + pos: position{line: 1277, col: 9, offset: 30763}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1274, col: 14, offset: 30678}, + pos: position{line: 1277, col: 14, offset: 30768}, name: "__", }, &litMatcher{ - pos: position{line: 1274, col: 17, offset: 30681}, + pos: position{line: 1277, col: 17, offset: 30771}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1274, col: 21, offset: 30685}, + pos: position{line: 1277, col: 21, offset: 30775}, name: "__", }, &labeledExpr{ - pos: position{line: 1274, col: 24, offset: 30688}, + pos: position{line: 1277, col: 24, offset: 30778}, label: "value", expr: &ruleRefExpr{ - pos: position{line: 1274, col: 30, offset: 30694}, + pos: position{line: 1277, col: 30, offset: 30784}, name: "Expr", }, }, @@ -8684,61 +8713,61 @@ var g = &grammar{ }, { name: "Tuple", - pos: position{line: 1278, col: 1, offset: 30797}, + pos: position{line: 1281, col: 1, offset: 30887}, expr: &actionExpr{ - pos: position{line: 1279, col: 5, offset: 30807}, + pos: position{line: 1282, col: 5, offset: 30897}, run: (*parser).callonTuple1, expr: &seqExpr{ - pos: position{line: 1279, col: 5, offset: 30807}, + pos: position{line: 1282, col: 5, offset: 30897}, exprs: []any{ &litMatcher{ - pos: position{line: 1279, col: 5, offset: 30807}, + pos: position{line: 1282, col: 5, offset: 30897}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1279, col: 9, offset: 30811}, + pos: position{line: 1282, col: 9, offset: 30901}, name: "__", }, &labeledExpr{ - pos: position{line: 1279, col: 12, offset: 30814}, + pos: position{line: 1282, col: 12, offset: 30904}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1279, col: 18, offset: 30820}, + pos: position{line: 1282, col: 18, offset: 30910}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 1279, col: 23, offset: 30825}, + pos: position{line: 1282, col: 23, offset: 30915}, label: "rest", expr: &oneOrMoreExpr{ - pos: position{line: 1279, col: 28, offset: 30830}, + pos: position{line: 1282, col: 28, offset: 30920}, expr: &actionExpr{ - pos: position{line: 1279, col: 29, offset: 30831}, + pos: position{line: 1282, col: 29, offset: 30921}, run: (*parser).callonTuple9, expr: &seqExpr{ - pos: position{line: 1279, col: 29, offset: 30831}, + pos: position{line: 1282, col: 29, offset: 30921}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1279, col: 29, offset: 30831}, + pos: position{line: 1282, col: 29, offset: 30921}, name: "__", }, &litMatcher{ - pos: position{line: 1279, col: 32, offset: 30834}, + pos: position{line: 1282, col: 32, offset: 30924}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1279, col: 36, offset: 30838}, + pos: position{line: 1282, col: 36, offset: 30928}, name: "__", }, &labeledExpr{ - pos: position{line: 1279, col: 39, offset: 30841}, + pos: position{line: 1282, col: 39, offset: 30931}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1279, col: 41, offset: 30843}, + pos: position{line: 1282, col: 41, offset: 30933}, name: "Expr", }, }, @@ -8748,11 +8777,11 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1279, col: 66, offset: 30868}, + pos: position{line: 1282, col: 66, offset: 30958}, name: "__", }, &litMatcher{ - pos: position{line: 1279, col: 69, offset: 30871}, + pos: position{line: 1282, col: 69, offset: 30961}, val: ")", ignoreCase: false, want: "\")\"", @@ -8765,56 +8794,56 @@ var g = &grammar{ }, { name: "Literal", - pos: position{line: 1289, col: 1, offset: 31052}, + pos: position{line: 1292, col: 1, offset: 31142}, expr: &choiceExpr{ - pos: position{line: 1290, col: 5, offset: 31064}, + pos: position{line: 1293, col: 5, offset: 31154}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1290, col: 5, offset: 31064}, + pos: position{line: 1293, col: 5, offset: 31154}, name: "TypeLiteral", }, &ruleRefExpr{ - pos: position{line: 1291, col: 5, offset: 31080}, + pos: position{line: 1294, col: 5, offset: 31170}, name: "StringLiteral", }, &ruleRefExpr{ - pos: position{line: 1292, col: 5, offset: 31098}, + pos: position{line: 1295, col: 5, offset: 31188}, name: "FString", }, &ruleRefExpr{ - pos: position{line: 1293, col: 5, offset: 31110}, + pos: position{line: 1296, col: 5, offset: 31200}, name: "SubnetLiteral", }, &ruleRefExpr{ - pos: position{line: 1294, col: 5, offset: 31128}, + pos: position{line: 1297, col: 5, offset: 31218}, name: "AddressLiteral", }, &ruleRefExpr{ - pos: position{line: 1295, col: 5, offset: 31147}, + pos: position{line: 1298, col: 5, offset: 31237}, name: "BytesLiteral", }, &ruleRefExpr{ - pos: position{line: 1296, col: 5, offset: 31164}, + pos: position{line: 1299, col: 5, offset: 31254}, name: "Duration", }, &ruleRefExpr{ - pos: position{line: 1297, col: 5, offset: 31177}, + pos: position{line: 1300, col: 5, offset: 31267}, name: "Time", }, &ruleRefExpr{ - pos: position{line: 1298, col: 5, offset: 31186}, + pos: position{line: 1301, col: 5, offset: 31276}, name: "FloatLiteral", }, &ruleRefExpr{ - pos: position{line: 1299, col: 5, offset: 31203}, + pos: position{line: 1302, col: 5, offset: 31293}, name: "IntegerLiteral", }, &ruleRefExpr{ - pos: position{line: 1300, col: 5, offset: 31222}, + pos: position{line: 1303, col: 5, offset: 31312}, name: "BooleanLiteral", }, &ruleRefExpr{ - pos: position{line: 1301, col: 5, offset: 31241}, + pos: position{line: 1304, col: 5, offset: 31331}, name: "NullLiteral", }, }, @@ -8824,28 +8853,28 @@ var g = &grammar{ }, { name: "SubnetLiteral", - pos: position{line: 1303, col: 1, offset: 31254}, + pos: position{line: 1306, col: 1, offset: 31344}, expr: &choiceExpr{ - pos: position{line: 1304, col: 5, offset: 31272}, + pos: position{line: 1307, col: 5, offset: 31362}, alternatives: []any{ &actionExpr{ - pos: position{line: 1304, col: 5, offset: 31272}, + pos: position{line: 1307, col: 5, offset: 31362}, run: (*parser).callonSubnetLiteral2, expr: &seqExpr{ - pos: position{line: 1304, col: 5, offset: 31272}, + pos: position{line: 1307, col: 5, offset: 31362}, exprs: []any{ &labeledExpr{ - pos: position{line: 1304, col: 5, offset: 31272}, + pos: position{line: 1307, col: 5, offset: 31362}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1304, col: 7, offset: 31274}, + pos: position{line: 1307, col: 7, offset: 31364}, name: "IP6Net", }, }, ¬Expr{ - pos: position{line: 1304, col: 14, offset: 31281}, + pos: position{line: 1307, col: 14, offset: 31371}, expr: &ruleRefExpr{ - pos: position{line: 1304, col: 15, offset: 31282}, + pos: position{line: 1307, col: 15, offset: 31372}, name: "IdentifierRest", }, }, @@ -8853,13 +8882,13 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1307, col: 5, offset: 31362}, + pos: position{line: 1310, col: 5, offset: 31452}, run: (*parser).callonSubnetLiteral8, expr: &labeledExpr{ - pos: position{line: 1307, col: 5, offset: 31362}, + pos: position{line: 1310, col: 5, offset: 31452}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1307, col: 7, offset: 31364}, + pos: position{line: 1310, col: 7, offset: 31454}, name: "IP4Net", }, }, @@ -8871,28 +8900,28 @@ var g = &grammar{ }, { name: "AddressLiteral", - pos: position{line: 1311, col: 1, offset: 31433}, + pos: position{line: 1314, col: 1, offset: 31523}, expr: &choiceExpr{ - pos: position{line: 1312, col: 5, offset: 31452}, + pos: position{line: 1315, col: 5, offset: 31542}, alternatives: []any{ &actionExpr{ - pos: position{line: 1312, col: 5, offset: 31452}, + pos: position{line: 1315, col: 5, offset: 31542}, run: (*parser).callonAddressLiteral2, expr: &seqExpr{ - pos: position{line: 1312, col: 5, offset: 31452}, + pos: position{line: 1315, col: 5, offset: 31542}, exprs: []any{ &labeledExpr{ - pos: position{line: 1312, col: 5, offset: 31452}, + pos: position{line: 1315, col: 5, offset: 31542}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1312, col: 7, offset: 31454}, + pos: position{line: 1315, col: 7, offset: 31544}, name: "IP6", }, }, ¬Expr{ - pos: position{line: 1312, col: 11, offset: 31458}, + pos: position{line: 1315, col: 11, offset: 31548}, expr: &ruleRefExpr{ - pos: position{line: 1312, col: 12, offset: 31459}, + pos: position{line: 1315, col: 12, offset: 31549}, name: "IdentifierRest", }, }, @@ -8900,13 +8929,13 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1315, col: 5, offset: 31538}, + pos: position{line: 1318, col: 5, offset: 31628}, run: (*parser).callonAddressLiteral8, expr: &labeledExpr{ - pos: position{line: 1315, col: 5, offset: 31538}, + pos: position{line: 1318, col: 5, offset: 31628}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1315, col: 7, offset: 31540}, + pos: position{line: 1318, col: 7, offset: 31630}, name: "IP", }, }, @@ -8918,15 +8947,15 @@ var g = &grammar{ }, { name: "FloatLiteral", - pos: position{line: 1319, col: 1, offset: 31604}, + pos: position{line: 1322, col: 1, offset: 31694}, expr: &actionExpr{ - pos: position{line: 1320, col: 5, offset: 31621}, + pos: position{line: 1323, col: 5, offset: 31711}, run: (*parser).callonFloatLiteral1, expr: &labeledExpr{ - pos: position{line: 1320, col: 5, offset: 31621}, + pos: position{line: 1323, col: 5, offset: 31711}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1320, col: 7, offset: 31623}, + pos: position{line: 1323, col: 7, offset: 31713}, name: "FloatString", }, }, @@ -8936,15 +8965,15 @@ var g = &grammar{ }, { name: "IntegerLiteral", - pos: position{line: 1324, col: 1, offset: 31701}, + pos: position{line: 1327, col: 1, offset: 31791}, expr: &actionExpr{ - pos: position{line: 1325, col: 5, offset: 31720}, + pos: position{line: 1328, col: 5, offset: 31810}, run: (*parser).callonIntegerLiteral1, expr: &labeledExpr{ - pos: position{line: 1325, col: 5, offset: 31720}, + pos: position{line: 1328, col: 5, offset: 31810}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1325, col: 7, offset: 31722}, + pos: position{line: 1328, col: 7, offset: 31812}, name: "IntString", }, }, @@ -8954,23 +8983,23 @@ var g = &grammar{ }, { name: "BooleanLiteral", - pos: position{line: 1329, col: 1, offset: 31796}, + pos: position{line: 1332, col: 1, offset: 31886}, expr: &choiceExpr{ - pos: position{line: 1330, col: 5, offset: 31815}, + pos: position{line: 1333, col: 5, offset: 31905}, alternatives: []any{ &actionExpr{ - pos: position{line: 1330, col: 5, offset: 31815}, + pos: position{line: 1333, col: 5, offset: 31905}, run: (*parser).callonBooleanLiteral2, expr: &ruleRefExpr{ - pos: position{line: 1330, col: 5, offset: 31815}, + pos: position{line: 1333, col: 5, offset: 31905}, name: "TRUE", }, }, &actionExpr{ - pos: position{line: 1331, col: 5, offset: 31873}, + pos: position{line: 1334, col: 5, offset: 31963}, run: (*parser).callonBooleanLiteral4, expr: &ruleRefExpr{ - pos: position{line: 1331, col: 5, offset: 31873}, + pos: position{line: 1334, col: 5, offset: 31963}, name: "FALSE", }, }, @@ -8981,12 +9010,12 @@ var g = &grammar{ }, { name: "NullLiteral", - pos: position{line: 1333, col: 1, offset: 31929}, + pos: position{line: 1336, col: 1, offset: 32019}, expr: &actionExpr{ - pos: position{line: 1334, col: 5, offset: 31945}, + pos: position{line: 1337, col: 5, offset: 32035}, run: (*parser).callonNullLiteral1, expr: &ruleRefExpr{ - pos: position{line: 1334, col: 5, offset: 31945}, + pos: position{line: 1337, col: 5, offset: 32035}, name: "NULL", }, }, @@ -8995,23 +9024,23 @@ var g = &grammar{ }, { name: "BytesLiteral", - pos: position{line: 1336, col: 1, offset: 31995}, + pos: position{line: 1339, col: 1, offset: 32085}, expr: &actionExpr{ - pos: position{line: 1337, col: 5, offset: 32012}, + pos: position{line: 1340, col: 5, offset: 32102}, run: (*parser).callonBytesLiteral1, expr: &seqExpr{ - pos: position{line: 1337, col: 5, offset: 32012}, + pos: position{line: 1340, col: 5, offset: 32102}, exprs: []any{ &litMatcher{ - pos: position{line: 1337, col: 5, offset: 32012}, + pos: position{line: 1340, col: 5, offset: 32102}, val: "0x", ignoreCase: false, want: "\"0x\"", }, &zeroOrMoreExpr{ - pos: position{line: 1337, col: 10, offset: 32017}, + pos: position{line: 1340, col: 10, offset: 32107}, expr: &ruleRefExpr{ - pos: position{line: 1337, col: 10, offset: 32017}, + pos: position{line: 1340, col: 10, offset: 32107}, name: "HexDigit", }, }, @@ -9023,29 +9052,29 @@ var g = &grammar{ }, { name: "TypeLiteral", - pos: position{line: 1341, col: 1, offset: 32091}, + pos: position{line: 1344, col: 1, offset: 32181}, expr: &actionExpr{ - pos: position{line: 1342, col: 5, offset: 32107}, + pos: position{line: 1345, col: 5, offset: 32197}, run: (*parser).callonTypeLiteral1, expr: &seqExpr{ - pos: position{line: 1342, col: 5, offset: 32107}, + pos: position{line: 1345, col: 5, offset: 32197}, exprs: []any{ &litMatcher{ - pos: position{line: 1342, col: 5, offset: 32107}, + pos: position{line: 1345, col: 5, offset: 32197}, val: "<", ignoreCase: false, want: "\"<\"", }, &labeledExpr{ - pos: position{line: 1342, col: 9, offset: 32111}, + pos: position{line: 1345, col: 9, offset: 32201}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1342, col: 13, offset: 32115}, + pos: position{line: 1345, col: 13, offset: 32205}, name: "Type", }, }, &litMatcher{ - pos: position{line: 1342, col: 18, offset: 32120}, + pos: position{line: 1345, col: 18, offset: 32210}, val: ">", ignoreCase: false, want: "\">\"", @@ -9058,16 +9087,16 @@ var g = &grammar{ }, { name: "Type", - pos: position{line: 1350, col: 1, offset: 32253}, + pos: position{line: 1353, col: 1, offset: 32343}, expr: &choiceExpr{ - pos: position{line: 1351, col: 5, offset: 32262}, + pos: position{line: 1354, col: 5, offset: 32352}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1351, col: 5, offset: 32262}, + pos: position{line: 1354, col: 5, offset: 32352}, name: "AmbiguousType", }, &ruleRefExpr{ - pos: position{line: 1352, col: 5, offset: 32280}, + pos: position{line: 1355, col: 5, offset: 32370}, name: "ComplexType", }, }, @@ -9077,28 +9106,28 @@ var g = &grammar{ }, { name: "AmbiguousType", - pos: position{line: 1354, col: 1, offset: 32293}, + pos: position{line: 1357, col: 1, offset: 32383}, expr: &choiceExpr{ - pos: position{line: 1355, col: 5, offset: 32311}, + pos: position{line: 1358, col: 5, offset: 32401}, alternatives: []any{ &actionExpr{ - pos: position{line: 1355, col: 5, offset: 32311}, + pos: position{line: 1358, col: 5, offset: 32401}, run: (*parser).callonAmbiguousType2, expr: &seqExpr{ - pos: position{line: 1355, col: 5, offset: 32311}, + pos: position{line: 1358, col: 5, offset: 32401}, exprs: []any{ &labeledExpr{ - pos: position{line: 1355, col: 5, offset: 32311}, + pos: position{line: 1358, col: 5, offset: 32401}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1355, col: 10, offset: 32316}, + pos: position{line: 1358, col: 10, offset: 32406}, name: "PrimitiveType", }, }, ¬Expr{ - pos: position{line: 1355, col: 24, offset: 32330}, + pos: position{line: 1358, col: 24, offset: 32420}, expr: &ruleRefExpr{ - pos: position{line: 1355, col: 25, offset: 32331}, + pos: position{line: 1358, col: 25, offset: 32421}, name: "IdentifierRest", }, }, @@ -9106,43 +9135,43 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1356, col: 5, offset: 32371}, + pos: position{line: 1359, col: 5, offset: 32461}, run: (*parser).callonAmbiguousType8, expr: &seqExpr{ - pos: position{line: 1356, col: 5, offset: 32371}, + pos: position{line: 1359, col: 5, offset: 32461}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1356, col: 5, offset: 32371}, + pos: position{line: 1359, col: 5, offset: 32461}, name: "ERROR", }, &ruleRefExpr{ - pos: position{line: 1356, col: 11, offset: 32377}, + pos: position{line: 1359, col: 11, offset: 32467}, name: "__", }, &litMatcher{ - pos: position{line: 1356, col: 14, offset: 32380}, + pos: position{line: 1359, col: 14, offset: 32470}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1356, col: 18, offset: 32384}, + pos: position{line: 1359, col: 18, offset: 32474}, name: "__", }, &labeledExpr{ - pos: position{line: 1356, col: 21, offset: 32387}, + pos: position{line: 1359, col: 21, offset: 32477}, label: "t", expr: &ruleRefExpr{ - pos: position{line: 1356, col: 23, offset: 32389}, + pos: position{line: 1359, col: 23, offset: 32479}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1356, col: 28, offset: 32394}, + pos: position{line: 1359, col: 28, offset: 32484}, name: "__", }, &litMatcher{ - pos: position{line: 1356, col: 31, offset: 32397}, + pos: position{line: 1359, col: 31, offset: 32487}, val: ")", ignoreCase: false, want: "\")\"", @@ -9151,43 +9180,43 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1363, col: 5, offset: 32537}, + pos: position{line: 1366, col: 5, offset: 32627}, run: (*parser).callonAmbiguousType18, expr: &seqExpr{ - pos: position{line: 1363, col: 5, offset: 32537}, + pos: position{line: 1366, col: 5, offset: 32627}, exprs: []any{ &labeledExpr{ - pos: position{line: 1363, col: 5, offset: 32537}, + pos: position{line: 1366, col: 5, offset: 32627}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1363, col: 10, offset: 32542}, + pos: position{line: 1366, col: 10, offset: 32632}, name: "Name", }, }, &labeledExpr{ - pos: position{line: 1363, col: 15, offset: 32547}, + pos: position{line: 1366, col: 15, offset: 32637}, label: "opt", expr: &zeroOrOneExpr{ - pos: position{line: 1363, col: 19, offset: 32551}, + pos: position{line: 1366, col: 19, offset: 32641}, expr: &seqExpr{ - pos: position{line: 1363, col: 20, offset: 32552}, + pos: position{line: 1366, col: 20, offset: 32642}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1363, col: 20, offset: 32552}, + pos: position{line: 1366, col: 20, offset: 32642}, name: "__", }, &litMatcher{ - pos: position{line: 1363, col: 23, offset: 32555}, + pos: position{line: 1366, col: 23, offset: 32645}, val: "=", ignoreCase: false, want: "\"=\"", }, &ruleRefExpr{ - pos: position{line: 1363, col: 27, offset: 32559}, + pos: position{line: 1366, col: 27, offset: 32649}, name: "__", }, &ruleRefExpr{ - pos: position{line: 1363, col: 30, offset: 32562}, + pos: position{line: 1366, col: 30, offset: 32652}, name: "Type", }, }, @@ -9198,31 +9227,31 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1374, col: 5, offset: 32887}, + pos: position{line: 1377, col: 5, offset: 32977}, run: (*parser).callonAmbiguousType29, expr: &seqExpr{ - pos: position{line: 1374, col: 5, offset: 32887}, + pos: position{line: 1377, col: 5, offset: 32977}, exprs: []any{ &litMatcher{ - pos: position{line: 1374, col: 5, offset: 32887}, + pos: position{line: 1377, col: 5, offset: 32977}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1374, col: 9, offset: 32891}, + pos: position{line: 1377, col: 9, offset: 32981}, name: "__", }, &labeledExpr{ - pos: position{line: 1374, col: 12, offset: 32894}, + pos: position{line: 1377, col: 12, offset: 32984}, label: "types", expr: &ruleRefExpr{ - pos: position{line: 1374, col: 18, offset: 32900}, + pos: position{line: 1377, col: 18, offset: 32990}, name: "TypeList", }, }, &litMatcher{ - pos: position{line: 1374, col: 27, offset: 32909}, + pos: position{line: 1377, col: 27, offset: 32999}, val: ")", ignoreCase: false, want: "\")\"", @@ -9237,28 +9266,28 @@ var g = &grammar{ }, { name: "TypeList", - pos: position{line: 1382, col: 1, offset: 33053}, + pos: position{line: 1385, col: 1, offset: 33143}, expr: &actionExpr{ - pos: position{line: 1383, col: 5, offset: 33066}, + pos: position{line: 1386, col: 5, offset: 33156}, run: (*parser).callonTypeList1, expr: &seqExpr{ - pos: position{line: 1383, col: 5, offset: 33066}, + pos: position{line: 1386, col: 5, offset: 33156}, exprs: []any{ &labeledExpr{ - pos: position{line: 1383, col: 5, offset: 33066}, + pos: position{line: 1386, col: 5, offset: 33156}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1383, col: 11, offset: 33072}, + pos: position{line: 1386, col: 11, offset: 33162}, name: "Type", }, }, &labeledExpr{ - pos: position{line: 1383, col: 16, offset: 33077}, + pos: position{line: 1386, col: 16, offset: 33167}, label: "rest", expr: &oneOrMoreExpr{ - pos: position{line: 1383, col: 21, offset: 33082}, + pos: position{line: 1386, col: 21, offset: 33172}, expr: &ruleRefExpr{ - pos: position{line: 1383, col: 21, offset: 33082}, + pos: position{line: 1386, col: 21, offset: 33172}, name: "TypeListTail", }, }, @@ -9271,32 +9300,32 @@ var g = &grammar{ }, { name: "TypeListTail", - pos: position{line: 1387, col: 1, offset: 33140}, + pos: position{line: 1390, col: 1, offset: 33230}, expr: &actionExpr{ - pos: position{line: 1387, col: 16, offset: 33155}, + pos: position{line: 1390, col: 16, offset: 33245}, run: (*parser).callonTypeListTail1, expr: &seqExpr{ - pos: position{line: 1387, col: 16, offset: 33155}, + pos: position{line: 1390, col: 16, offset: 33245}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1387, col: 16, offset: 33155}, + pos: position{line: 1390, col: 16, offset: 33245}, name: "__", }, &litMatcher{ - pos: position{line: 1387, col: 19, offset: 33158}, + pos: position{line: 1390, col: 19, offset: 33248}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1387, col: 23, offset: 33162}, + pos: position{line: 1390, col: 23, offset: 33252}, name: "__", }, &labeledExpr{ - pos: position{line: 1387, col: 26, offset: 33165}, + pos: position{line: 1390, col: 26, offset: 33255}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1387, col: 30, offset: 33169}, + pos: position{line: 1390, col: 30, offset: 33259}, name: "Type", }, }, @@ -9308,40 +9337,40 @@ var g = &grammar{ }, { name: "ComplexType", - pos: position{line: 1389, col: 1, offset: 33195}, + pos: position{line: 1392, col: 1, offset: 33285}, expr: &choiceExpr{ - pos: position{line: 1390, col: 5, offset: 33211}, + pos: position{line: 1393, col: 5, offset: 33301}, alternatives: []any{ &actionExpr{ - pos: position{line: 1390, col: 5, offset: 33211}, + pos: position{line: 1393, col: 5, offset: 33301}, run: (*parser).callonComplexType2, expr: &seqExpr{ - pos: position{line: 1390, col: 5, offset: 33211}, + pos: position{line: 1393, col: 5, offset: 33301}, exprs: []any{ &litMatcher{ - pos: position{line: 1390, col: 5, offset: 33211}, + pos: position{line: 1393, col: 5, offset: 33301}, val: "{", ignoreCase: false, want: "\"{\"", }, &ruleRefExpr{ - pos: position{line: 1390, col: 9, offset: 33215}, + pos: position{line: 1393, col: 9, offset: 33305}, name: "__", }, &labeledExpr{ - pos: position{line: 1390, col: 12, offset: 33218}, + pos: position{line: 1393, col: 12, offset: 33308}, label: "fields", expr: &ruleRefExpr{ - pos: position{line: 1390, col: 19, offset: 33225}, + pos: position{line: 1393, col: 19, offset: 33315}, name: "TypeFieldList", }, }, &ruleRefExpr{ - pos: position{line: 1390, col: 33, offset: 33239}, + pos: position{line: 1393, col: 33, offset: 33329}, name: "__", }, &litMatcher{ - pos: position{line: 1390, col: 36, offset: 33242}, + pos: position{line: 1393, col: 36, offset: 33332}, val: "}", ignoreCase: false, want: "\"}\"", @@ -9350,35 +9379,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1397, col: 5, offset: 33404}, + pos: position{line: 1400, col: 5, offset: 33494}, run: (*parser).callonComplexType10, expr: &seqExpr{ - pos: position{line: 1397, col: 5, offset: 33404}, + pos: position{line: 1400, col: 5, offset: 33494}, exprs: []any{ &litMatcher{ - pos: position{line: 1397, col: 5, offset: 33404}, + pos: position{line: 1400, col: 5, offset: 33494}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 1397, col: 9, offset: 33408}, + pos: position{line: 1400, col: 9, offset: 33498}, name: "__", }, &labeledExpr{ - pos: position{line: 1397, col: 12, offset: 33411}, + pos: position{line: 1400, col: 12, offset: 33501}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1397, col: 16, offset: 33415}, + pos: position{line: 1400, col: 16, offset: 33505}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1397, col: 21, offset: 33420}, + pos: position{line: 1400, col: 21, offset: 33510}, name: "__", }, &litMatcher{ - pos: position{line: 1397, col: 24, offset: 33423}, + pos: position{line: 1400, col: 24, offset: 33513}, val: "]", ignoreCase: false, want: "\"]\"", @@ -9387,35 +9416,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1404, col: 5, offset: 33565}, + pos: position{line: 1407, col: 5, offset: 33655}, run: (*parser).callonComplexType18, expr: &seqExpr{ - pos: position{line: 1404, col: 5, offset: 33565}, + pos: position{line: 1407, col: 5, offset: 33655}, exprs: []any{ &litMatcher{ - pos: position{line: 1404, col: 5, offset: 33565}, + pos: position{line: 1407, col: 5, offset: 33655}, val: "|[", ignoreCase: false, want: "\"|[\"", }, &ruleRefExpr{ - pos: position{line: 1404, col: 10, offset: 33570}, + pos: position{line: 1407, col: 10, offset: 33660}, name: "__", }, &labeledExpr{ - pos: position{line: 1404, col: 13, offset: 33573}, + pos: position{line: 1407, col: 13, offset: 33663}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1404, col: 17, offset: 33577}, + pos: position{line: 1407, col: 17, offset: 33667}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1404, col: 22, offset: 33582}, + pos: position{line: 1407, col: 22, offset: 33672}, name: "__", }, &litMatcher{ - pos: position{line: 1404, col: 25, offset: 33585}, + pos: position{line: 1407, col: 25, offset: 33675}, val: "]|", ignoreCase: false, want: "\"]|\"", @@ -9424,57 +9453,57 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1411, col: 5, offset: 33724}, + pos: position{line: 1414, col: 5, offset: 33814}, run: (*parser).callonComplexType26, expr: &seqExpr{ - pos: position{line: 1411, col: 5, offset: 33724}, + pos: position{line: 1414, col: 5, offset: 33814}, exprs: []any{ &litMatcher{ - pos: position{line: 1411, col: 5, offset: 33724}, + pos: position{line: 1414, col: 5, offset: 33814}, val: "|{", ignoreCase: false, want: "\"|{\"", }, &ruleRefExpr{ - pos: position{line: 1411, col: 10, offset: 33729}, + pos: position{line: 1414, col: 10, offset: 33819}, name: "__", }, &labeledExpr{ - pos: position{line: 1411, col: 13, offset: 33732}, + pos: position{line: 1414, col: 13, offset: 33822}, label: "keyType", expr: &ruleRefExpr{ - pos: position{line: 1411, col: 21, offset: 33740}, + pos: position{line: 1414, col: 21, offset: 33830}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1411, col: 26, offset: 33745}, + pos: position{line: 1414, col: 26, offset: 33835}, name: "__", }, &litMatcher{ - pos: position{line: 1411, col: 29, offset: 33748}, + pos: position{line: 1414, col: 29, offset: 33838}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1411, col: 33, offset: 33752}, + pos: position{line: 1414, col: 33, offset: 33842}, name: "__", }, &labeledExpr{ - pos: position{line: 1411, col: 36, offset: 33755}, + pos: position{line: 1414, col: 36, offset: 33845}, label: "valType", expr: &ruleRefExpr{ - pos: position{line: 1411, col: 44, offset: 33763}, + pos: position{line: 1414, col: 44, offset: 33853}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1411, col: 49, offset: 33768}, + pos: position{line: 1414, col: 49, offset: 33858}, name: "__", }, &litMatcher{ - pos: position{line: 1411, col: 52, offset: 33771}, + pos: position{line: 1414, col: 52, offset: 33861}, val: "}|", ignoreCase: false, want: "\"}|\"", @@ -9489,35 +9518,35 @@ var g = &grammar{ }, { name: "StringLiteral", - pos: position{line: 1420, col: 1, offset: 33945}, + pos: position{line: 1423, col: 1, offset: 34035}, expr: &choiceExpr{ - pos: position{line: 1421, col: 5, offset: 33963}, + pos: position{line: 1424, col: 5, offset: 34053}, alternatives: []any{ &actionExpr{ - pos: position{line: 1421, col: 5, offset: 33963}, + pos: position{line: 1424, col: 5, offset: 34053}, run: (*parser).callonStringLiteral2, expr: &seqExpr{ - pos: position{line: 1421, col: 5, offset: 33963}, + pos: position{line: 1424, col: 5, offset: 34053}, exprs: []any{ &litMatcher{ - pos: position{line: 1421, col: 5, offset: 33963}, + pos: position{line: 1424, col: 5, offset: 34053}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, &labeledExpr{ - pos: position{line: 1421, col: 9, offset: 33967}, + pos: position{line: 1424, col: 9, offset: 34057}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1421, col: 11, offset: 33969}, + pos: position{line: 1424, col: 11, offset: 34059}, expr: &ruleRefExpr{ - pos: position{line: 1421, col: 11, offset: 33969}, + pos: position{line: 1424, col: 11, offset: 34059}, name: "DoubleQuotedChar", }, }, }, &litMatcher{ - pos: position{line: 1421, col: 29, offset: 33987}, + pos: position{line: 1424, col: 29, offset: 34077}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -9526,30 +9555,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1422, col: 5, offset: 34051}, + pos: position{line: 1425, col: 5, offset: 34141}, run: (*parser).callonStringLiteral9, expr: &seqExpr{ - pos: position{line: 1422, col: 5, offset: 34051}, + pos: position{line: 1425, col: 5, offset: 34141}, exprs: []any{ &litMatcher{ - pos: position{line: 1422, col: 5, offset: 34051}, + pos: position{line: 1425, col: 5, offset: 34141}, val: "'", ignoreCase: false, want: "\"'\"", }, &labeledExpr{ - pos: position{line: 1422, col: 9, offset: 34055}, + pos: position{line: 1425, col: 9, offset: 34145}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1422, col: 11, offset: 34057}, + pos: position{line: 1425, col: 11, offset: 34147}, expr: &ruleRefExpr{ - pos: position{line: 1422, col: 11, offset: 34057}, + pos: position{line: 1425, col: 11, offset: 34147}, name: "SingleQuotedChar", }, }, }, &litMatcher{ - pos: position{line: 1422, col: 29, offset: 34075}, + pos: position{line: 1425, col: 29, offset: 34165}, val: "'", ignoreCase: false, want: "\"'\"", @@ -9564,35 +9593,35 @@ var g = &grammar{ }, { name: "FString", - pos: position{line: 1424, col: 1, offset: 34136}, + pos: position{line: 1427, col: 1, offset: 34226}, expr: &choiceExpr{ - pos: position{line: 1425, col: 5, offset: 34148}, + pos: position{line: 1428, col: 5, offset: 34238}, alternatives: []any{ &actionExpr{ - pos: position{line: 1425, col: 5, offset: 34148}, + pos: position{line: 1428, col: 5, offset: 34238}, run: (*parser).callonFString2, expr: &seqExpr{ - pos: position{line: 1425, col: 5, offset: 34148}, + pos: position{line: 1428, col: 5, offset: 34238}, exprs: []any{ &litMatcher{ - pos: position{line: 1425, col: 5, offset: 34148}, + pos: position{line: 1428, col: 5, offset: 34238}, val: "f\"", ignoreCase: false, want: "\"f\\\"\"", }, &labeledExpr{ - pos: position{line: 1425, col: 11, offset: 34154}, + pos: position{line: 1428, col: 11, offset: 34244}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1425, col: 13, offset: 34156}, + pos: position{line: 1428, col: 13, offset: 34246}, expr: &ruleRefExpr{ - pos: position{line: 1425, col: 13, offset: 34156}, + pos: position{line: 1428, col: 13, offset: 34246}, name: "FStringDoubleQuotedElem", }, }, }, &litMatcher{ - pos: position{line: 1425, col: 38, offset: 34181}, + pos: position{line: 1428, col: 38, offset: 34271}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -9601,30 +9630,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1432, col: 5, offset: 34327}, + pos: position{line: 1435, col: 5, offset: 34417}, run: (*parser).callonFString9, expr: &seqExpr{ - pos: position{line: 1432, col: 5, offset: 34327}, + pos: position{line: 1435, col: 5, offset: 34417}, exprs: []any{ &litMatcher{ - pos: position{line: 1432, col: 5, offset: 34327}, + pos: position{line: 1435, col: 5, offset: 34417}, val: "f'", ignoreCase: false, want: "\"f'\"", }, &labeledExpr{ - pos: position{line: 1432, col: 10, offset: 34332}, + pos: position{line: 1435, col: 10, offset: 34422}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1432, col: 12, offset: 34334}, + pos: position{line: 1435, col: 12, offset: 34424}, expr: &ruleRefExpr{ - pos: position{line: 1432, col: 12, offset: 34334}, + pos: position{line: 1435, col: 12, offset: 34424}, name: "FStringSingleQuotedElem", }, }, }, &litMatcher{ - pos: position{line: 1432, col: 37, offset: 34359}, + pos: position{line: 1435, col: 37, offset: 34449}, val: "'", ignoreCase: false, want: "\"'\"", @@ -9639,24 +9668,24 @@ var g = &grammar{ }, { name: "FStringDoubleQuotedElem", - pos: position{line: 1440, col: 1, offset: 34502}, + pos: position{line: 1443, col: 1, offset: 34592}, expr: &choiceExpr{ - pos: position{line: 1441, col: 5, offset: 34530}, + pos: position{line: 1444, col: 5, offset: 34620}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1441, col: 5, offset: 34530}, + pos: position{line: 1444, col: 5, offset: 34620}, name: "FStringExpr", }, &actionExpr{ - pos: position{line: 1442, col: 5, offset: 34546}, + pos: position{line: 1445, col: 5, offset: 34636}, run: (*parser).callonFStringDoubleQuotedElem3, expr: &labeledExpr{ - pos: position{line: 1442, col: 5, offset: 34546}, + pos: position{line: 1445, col: 5, offset: 34636}, label: "v", expr: &oneOrMoreExpr{ - pos: position{line: 1442, col: 7, offset: 34548}, + pos: position{line: 1445, col: 7, offset: 34638}, expr: &ruleRefExpr{ - pos: position{line: 1442, col: 7, offset: 34548}, + pos: position{line: 1445, col: 7, offset: 34638}, name: "FStringDoubleQuotedChar", }, }, @@ -9669,27 +9698,27 @@ var g = &grammar{ }, { name: "FStringDoubleQuotedChar", - pos: position{line: 1446, col: 1, offset: 34671}, + pos: position{line: 1449, col: 1, offset: 34761}, expr: &choiceExpr{ - pos: position{line: 1447, col: 5, offset: 34699}, + pos: position{line: 1450, col: 5, offset: 34789}, alternatives: []any{ &actionExpr{ - pos: position{line: 1447, col: 5, offset: 34699}, + pos: position{line: 1450, col: 5, offset: 34789}, run: (*parser).callonFStringDoubleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1447, col: 5, offset: 34699}, + pos: position{line: 1450, col: 5, offset: 34789}, exprs: []any{ &litMatcher{ - pos: position{line: 1447, col: 5, offset: 34699}, + pos: position{line: 1450, col: 5, offset: 34789}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1447, col: 10, offset: 34704}, + pos: position{line: 1450, col: 10, offset: 34794}, label: "v", expr: &litMatcher{ - pos: position{line: 1447, col: 12, offset: 34706}, + pos: position{line: 1450, col: 12, offset: 34796}, val: "{", ignoreCase: false, want: "\"{\"", @@ -9699,25 +9728,25 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1448, col: 5, offset: 34732}, + pos: position{line: 1451, col: 5, offset: 34822}, run: (*parser).callonFStringDoubleQuotedChar7, expr: &seqExpr{ - pos: position{line: 1448, col: 5, offset: 34732}, + pos: position{line: 1451, col: 5, offset: 34822}, exprs: []any{ ¬Expr{ - pos: position{line: 1448, col: 5, offset: 34732}, + pos: position{line: 1451, col: 5, offset: 34822}, expr: &litMatcher{ - pos: position{line: 1448, col: 7, offset: 34734}, + pos: position{line: 1451, col: 7, offset: 34824}, val: "{", ignoreCase: false, want: "\"{\"", }, }, &labeledExpr{ - pos: position{line: 1448, col: 12, offset: 34739}, + pos: position{line: 1451, col: 12, offset: 34829}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1448, col: 14, offset: 34741}, + pos: position{line: 1451, col: 14, offset: 34831}, name: "DoubleQuotedChar", }, }, @@ -9731,24 +9760,24 @@ var g = &grammar{ }, { name: "FStringSingleQuotedElem", - pos: position{line: 1450, col: 1, offset: 34777}, + pos: position{line: 1453, col: 1, offset: 34867}, expr: &choiceExpr{ - pos: position{line: 1451, col: 5, offset: 34805}, + pos: position{line: 1454, col: 5, offset: 34895}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1451, col: 5, offset: 34805}, + pos: position{line: 1454, col: 5, offset: 34895}, name: "FStringExpr", }, &actionExpr{ - pos: position{line: 1452, col: 5, offset: 34821}, + pos: position{line: 1455, col: 5, offset: 34911}, run: (*parser).callonFStringSingleQuotedElem3, expr: &labeledExpr{ - pos: position{line: 1452, col: 5, offset: 34821}, + pos: position{line: 1455, col: 5, offset: 34911}, label: "v", expr: &oneOrMoreExpr{ - pos: position{line: 1452, col: 7, offset: 34823}, + pos: position{line: 1455, col: 7, offset: 34913}, expr: &ruleRefExpr{ - pos: position{line: 1452, col: 7, offset: 34823}, + pos: position{line: 1455, col: 7, offset: 34913}, name: "FStringSingleQuotedChar", }, }, @@ -9761,27 +9790,27 @@ var g = &grammar{ }, { name: "FStringSingleQuotedChar", - pos: position{line: 1456, col: 1, offset: 34946}, + pos: position{line: 1459, col: 1, offset: 35036}, expr: &choiceExpr{ - pos: position{line: 1457, col: 5, offset: 34974}, + pos: position{line: 1460, col: 5, offset: 35064}, alternatives: []any{ &actionExpr{ - pos: position{line: 1457, col: 5, offset: 34974}, + pos: position{line: 1460, col: 5, offset: 35064}, run: (*parser).callonFStringSingleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1457, col: 5, offset: 34974}, + pos: position{line: 1460, col: 5, offset: 35064}, exprs: []any{ &litMatcher{ - pos: position{line: 1457, col: 5, offset: 34974}, + pos: position{line: 1460, col: 5, offset: 35064}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1457, col: 10, offset: 34979}, + pos: position{line: 1460, col: 10, offset: 35069}, label: "v", expr: &litMatcher{ - pos: position{line: 1457, col: 12, offset: 34981}, + pos: position{line: 1460, col: 12, offset: 35071}, val: "{", ignoreCase: false, want: "\"{\"", @@ -9791,25 +9820,25 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1458, col: 5, offset: 35007}, + pos: position{line: 1461, col: 5, offset: 35097}, run: (*parser).callonFStringSingleQuotedChar7, expr: &seqExpr{ - pos: position{line: 1458, col: 5, offset: 35007}, + pos: position{line: 1461, col: 5, offset: 35097}, exprs: []any{ ¬Expr{ - pos: position{line: 1458, col: 5, offset: 35007}, + pos: position{line: 1461, col: 5, offset: 35097}, expr: &litMatcher{ - pos: position{line: 1458, col: 7, offset: 35009}, + pos: position{line: 1461, col: 7, offset: 35099}, val: "{", ignoreCase: false, want: "\"{\"", }, }, &labeledExpr{ - pos: position{line: 1458, col: 12, offset: 35014}, + pos: position{line: 1461, col: 12, offset: 35104}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1458, col: 14, offset: 35016}, + pos: position{line: 1461, col: 14, offset: 35106}, name: "SingleQuotedChar", }, }, @@ -9823,37 +9852,37 @@ var g = &grammar{ }, { name: "FStringExpr", - pos: position{line: 1460, col: 1, offset: 35052}, + pos: position{line: 1463, col: 1, offset: 35142}, expr: &actionExpr{ - pos: position{line: 1461, col: 5, offset: 35068}, + pos: position{line: 1464, col: 5, offset: 35158}, run: (*parser).callonFStringExpr1, expr: &seqExpr{ - pos: position{line: 1461, col: 5, offset: 35068}, + pos: position{line: 1464, col: 5, offset: 35158}, exprs: []any{ &litMatcher{ - pos: position{line: 1461, col: 5, offset: 35068}, + pos: position{line: 1464, col: 5, offset: 35158}, val: "{", ignoreCase: false, want: "\"{\"", }, &ruleRefExpr{ - pos: position{line: 1461, col: 9, offset: 35072}, + pos: position{line: 1464, col: 9, offset: 35162}, name: "__", }, &labeledExpr{ - pos: position{line: 1461, col: 12, offset: 35075}, + pos: position{line: 1464, col: 12, offset: 35165}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1461, col: 14, offset: 35077}, + pos: position{line: 1464, col: 14, offset: 35167}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1461, col: 19, offset: 35082}, + pos: position{line: 1464, col: 19, offset: 35172}, name: "__", }, &litMatcher{ - pos: position{line: 1461, col: 22, offset: 35085}, + pos: position{line: 1464, col: 22, offset: 35175}, val: "}", ignoreCase: false, want: "\"}\"", @@ -9866,129 +9895,129 @@ var g = &grammar{ }, { name: "PrimitiveType", - pos: position{line: 1469, col: 1, offset: 35220}, + pos: position{line: 1472, col: 1, offset: 35310}, expr: &actionExpr{ - pos: position{line: 1470, col: 5, offset: 35238}, + pos: position{line: 1473, col: 5, offset: 35328}, run: (*parser).callonPrimitiveType1, expr: &choiceExpr{ - pos: position{line: 1470, col: 9, offset: 35242}, + pos: position{line: 1473, col: 9, offset: 35332}, alternatives: []any{ &litMatcher{ - pos: position{line: 1470, col: 9, offset: 35242}, + pos: position{line: 1473, col: 9, offset: 35332}, val: "uint8", ignoreCase: false, want: "\"uint8\"", }, &litMatcher{ - pos: position{line: 1470, col: 19, offset: 35252}, + pos: position{line: 1473, col: 19, offset: 35342}, val: "uint16", ignoreCase: false, want: "\"uint16\"", }, &litMatcher{ - pos: position{line: 1470, col: 30, offset: 35263}, + pos: position{line: 1473, col: 30, offset: 35353}, val: "uint32", ignoreCase: false, want: "\"uint32\"", }, &litMatcher{ - pos: position{line: 1470, col: 41, offset: 35274}, + pos: position{line: 1473, col: 41, offset: 35364}, val: "uint64", ignoreCase: false, want: "\"uint64\"", }, &litMatcher{ - pos: position{line: 1471, col: 9, offset: 35291}, + pos: position{line: 1474, col: 9, offset: 35381}, val: "int8", ignoreCase: false, want: "\"int8\"", }, &litMatcher{ - pos: position{line: 1471, col: 18, offset: 35300}, + pos: position{line: 1474, col: 18, offset: 35390}, val: "int16", ignoreCase: false, want: "\"int16\"", }, &litMatcher{ - pos: position{line: 1471, col: 28, offset: 35310}, + pos: position{line: 1474, col: 28, offset: 35400}, val: "int32", ignoreCase: false, want: "\"int32\"", }, &litMatcher{ - pos: position{line: 1471, col: 38, offset: 35320}, + pos: position{line: 1474, col: 38, offset: 35410}, val: "int64", ignoreCase: false, want: "\"int64\"", }, &litMatcher{ - pos: position{line: 1472, col: 9, offset: 35336}, + pos: position{line: 1475, col: 9, offset: 35426}, val: "float16", ignoreCase: false, want: "\"float16\"", }, &litMatcher{ - pos: position{line: 1472, col: 21, offset: 35348}, + pos: position{line: 1475, col: 21, offset: 35438}, val: "float32", ignoreCase: false, want: "\"float32\"", }, &litMatcher{ - pos: position{line: 1472, col: 33, offset: 35360}, + pos: position{line: 1475, col: 33, offset: 35450}, val: "float64", ignoreCase: false, want: "\"float64\"", }, &litMatcher{ - pos: position{line: 1473, col: 9, offset: 35378}, + pos: position{line: 1476, col: 9, offset: 35468}, val: "bool", ignoreCase: false, want: "\"bool\"", }, &litMatcher{ - pos: position{line: 1473, col: 18, offset: 35387}, + pos: position{line: 1476, col: 18, offset: 35477}, val: "string", ignoreCase: false, want: "\"string\"", }, &litMatcher{ - pos: position{line: 1474, col: 9, offset: 35404}, + pos: position{line: 1477, col: 9, offset: 35494}, val: "duration", ignoreCase: false, want: "\"duration\"", }, &litMatcher{ - pos: position{line: 1474, col: 22, offset: 35417}, + pos: position{line: 1477, col: 22, offset: 35507}, val: "time", ignoreCase: false, want: "\"time\"", }, &litMatcher{ - pos: position{line: 1475, col: 9, offset: 35432}, + pos: position{line: 1478, col: 9, offset: 35522}, val: "bytes", ignoreCase: false, want: "\"bytes\"", }, &litMatcher{ - pos: position{line: 1476, col: 9, offset: 35448}, + pos: position{line: 1479, col: 9, offset: 35538}, val: "ip", ignoreCase: false, want: "\"ip\"", }, &litMatcher{ - pos: position{line: 1476, col: 16, offset: 35455}, + pos: position{line: 1479, col: 16, offset: 35545}, val: "net", ignoreCase: false, want: "\"net\"", }, &litMatcher{ - pos: position{line: 1477, col: 9, offset: 35469}, + pos: position{line: 1480, col: 9, offset: 35559}, val: "type", ignoreCase: false, want: "\"type\"", }, &litMatcher{ - pos: position{line: 1477, col: 18, offset: 35478}, + pos: position{line: 1480, col: 18, offset: 35568}, val: "null", ignoreCase: false, want: "\"null\"", @@ -10001,31 +10030,31 @@ var g = &grammar{ }, { name: "TypeFieldList", - pos: position{line: 1485, col: 1, offset: 35663}, + pos: position{line: 1488, col: 1, offset: 35753}, expr: &choiceExpr{ - pos: position{line: 1486, col: 5, offset: 35681}, + pos: position{line: 1489, col: 5, offset: 35771}, alternatives: []any{ &actionExpr{ - pos: position{line: 1486, col: 5, offset: 35681}, + pos: position{line: 1489, col: 5, offset: 35771}, run: (*parser).callonTypeFieldList2, expr: &seqExpr{ - pos: position{line: 1486, col: 5, offset: 35681}, + pos: position{line: 1489, col: 5, offset: 35771}, exprs: []any{ &labeledExpr{ - pos: position{line: 1486, col: 5, offset: 35681}, + pos: position{line: 1489, col: 5, offset: 35771}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1486, col: 11, offset: 35687}, + pos: position{line: 1489, col: 11, offset: 35777}, name: "TypeField", }, }, &labeledExpr{ - pos: position{line: 1486, col: 21, offset: 35697}, + pos: position{line: 1489, col: 21, offset: 35787}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1486, col: 26, offset: 35702}, + pos: position{line: 1489, col: 26, offset: 35792}, expr: &ruleRefExpr{ - pos: position{line: 1486, col: 26, offset: 35702}, + pos: position{line: 1489, col: 26, offset: 35792}, name: "TypeFieldListTail", }, }, @@ -10034,10 +10063,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1489, col: 5, offset: 35768}, + pos: position{line: 1492, col: 5, offset: 35858}, run: (*parser).callonTypeFieldList9, expr: &litMatcher{ - pos: position{line: 1489, col: 5, offset: 35768}, + pos: position{line: 1492, col: 5, offset: 35858}, val: "", ignoreCase: false, want: "\"\"", @@ -10050,32 +10079,32 @@ var g = &grammar{ }, { name: "TypeFieldListTail", - pos: position{line: 1491, col: 1, offset: 35792}, + pos: position{line: 1494, col: 1, offset: 35882}, expr: &actionExpr{ - pos: position{line: 1491, col: 21, offset: 35812}, + pos: position{line: 1494, col: 21, offset: 35902}, run: (*parser).callonTypeFieldListTail1, expr: &seqExpr{ - pos: position{line: 1491, col: 21, offset: 35812}, + pos: position{line: 1494, col: 21, offset: 35902}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1491, col: 21, offset: 35812}, + pos: position{line: 1494, col: 21, offset: 35902}, name: "__", }, &litMatcher{ - pos: position{line: 1491, col: 24, offset: 35815}, + pos: position{line: 1494, col: 24, offset: 35905}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1491, col: 28, offset: 35819}, + pos: position{line: 1494, col: 28, offset: 35909}, name: "__", }, &labeledExpr{ - pos: position{line: 1491, col: 31, offset: 35822}, + pos: position{line: 1494, col: 31, offset: 35912}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1491, col: 35, offset: 35826}, + pos: position{line: 1494, col: 35, offset: 35916}, name: "TypeField", }, }, @@ -10087,40 +10116,40 @@ var g = &grammar{ }, { name: "TypeField", - pos: position{line: 1493, col: 1, offset: 35857}, + pos: position{line: 1496, col: 1, offset: 35947}, expr: &actionExpr{ - pos: position{line: 1494, col: 5, offset: 35871}, + pos: position{line: 1497, col: 5, offset: 35961}, run: (*parser).callonTypeField1, expr: &seqExpr{ - pos: position{line: 1494, col: 5, offset: 35871}, + pos: position{line: 1497, col: 5, offset: 35961}, exprs: []any{ &labeledExpr{ - pos: position{line: 1494, col: 5, offset: 35871}, + pos: position{line: 1497, col: 5, offset: 35961}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1494, col: 10, offset: 35876}, + pos: position{line: 1497, col: 10, offset: 35966}, name: "Name", }, }, &ruleRefExpr{ - pos: position{line: 1494, col: 15, offset: 35881}, + pos: position{line: 1497, col: 15, offset: 35971}, name: "__", }, &litMatcher{ - pos: position{line: 1494, col: 18, offset: 35884}, + pos: position{line: 1497, col: 18, offset: 35974}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1494, col: 22, offset: 35888}, + pos: position{line: 1497, col: 22, offset: 35978}, name: "__", }, &labeledExpr{ - pos: position{line: 1494, col: 25, offset: 35891}, + pos: position{line: 1497, col: 25, offset: 35981}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1494, col: 29, offset: 35895}, + pos: position{line: 1497, col: 29, offset: 35985}, name: "Type", }, }, @@ -10132,54 +10161,54 @@ var g = &grammar{ }, { name: "Name", - pos: position{line: 1502, col: 1, offset: 36044}, + pos: position{line: 1505, col: 1, offset: 36134}, expr: &choiceExpr{ - pos: position{line: 1503, col: 5, offset: 36053}, + pos: position{line: 1506, col: 5, offset: 36143}, alternatives: []any{ &actionExpr{ - pos: position{line: 1503, col: 5, offset: 36053}, + pos: position{line: 1506, col: 5, offset: 36143}, run: (*parser).callonName2, expr: &labeledExpr{ - pos: position{line: 1503, col: 5, offset: 36053}, + pos: position{line: 1506, col: 5, offset: 36143}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1503, col: 7, offset: 36055}, + pos: position{line: 1506, col: 7, offset: 36145}, name: "DottedIDs", }, }, }, &actionExpr{ - pos: position{line: 1504, col: 5, offset: 36144}, + pos: position{line: 1507, col: 5, offset: 36234}, run: (*parser).callonName5, expr: &labeledExpr{ - pos: position{line: 1504, col: 5, offset: 36144}, + pos: position{line: 1507, col: 5, offset: 36234}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1504, col: 7, offset: 36146}, + pos: position{line: 1507, col: 7, offset: 36236}, name: "IdentifierName", }, }, }, &actionExpr{ - pos: position{line: 1505, col: 5, offset: 36235}, + pos: position{line: 1508, col: 5, offset: 36325}, run: (*parser).callonName8, expr: &labeledExpr{ - pos: position{line: 1505, col: 5, offset: 36235}, + pos: position{line: 1508, col: 5, offset: 36325}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1505, col: 7, offset: 36237}, + pos: position{line: 1508, col: 7, offset: 36327}, name: "QuotedString", }, }, }, &actionExpr{ - pos: position{line: 1506, col: 5, offset: 36326}, + pos: position{line: 1509, col: 5, offset: 36416}, run: (*parser).callonName11, expr: &labeledExpr{ - pos: position{line: 1506, col: 5, offset: 36326}, + pos: position{line: 1509, col: 5, offset: 36416}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1506, col: 7, offset: 36328}, + pos: position{line: 1509, col: 7, offset: 36418}, name: "KSUID", }, }, @@ -10191,22 +10220,22 @@ var g = &grammar{ }, { name: "DottedIDs", - pos: position{line: 1508, col: 1, offset: 36414}, + pos: position{line: 1511, col: 1, offset: 36504}, expr: &actionExpr{ - pos: position{line: 1509, col: 5, offset: 36428}, + pos: position{line: 1512, col: 5, offset: 36518}, run: (*parser).callonDottedIDs1, expr: &seqExpr{ - pos: position{line: 1509, col: 5, offset: 36428}, + pos: position{line: 1512, col: 5, offset: 36518}, exprs: []any{ &choiceExpr{ - pos: position{line: 1509, col: 6, offset: 36429}, + pos: position{line: 1512, col: 6, offset: 36519}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1509, col: 6, offset: 36429}, + pos: position{line: 1512, col: 6, offset: 36519}, name: "IdentifierStart", }, &litMatcher{ - pos: position{line: 1509, col: 24, offset: 36447}, + pos: position{line: 1512, col: 24, offset: 36537}, val: ".", ignoreCase: false, want: "\".\"", @@ -10214,16 +10243,16 @@ var g = &grammar{ }, }, &zeroOrMoreExpr{ - pos: position{line: 1509, col: 29, offset: 36452}, + pos: position{line: 1512, col: 29, offset: 36542}, expr: &choiceExpr{ - pos: position{line: 1509, col: 30, offset: 36453}, + pos: position{line: 1512, col: 30, offset: 36543}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1509, col: 30, offset: 36453}, + pos: position{line: 1512, col: 30, offset: 36543}, name: "IdentifierRest", }, &litMatcher{ - pos: position{line: 1509, col: 47, offset: 36470}, + pos: position{line: 1512, col: 47, offset: 36560}, val: ".", ignoreCase: false, want: "\".\"", @@ -10239,15 +10268,15 @@ var g = &grammar{ }, { name: "Identifier", - pos: position{line: 1511, col: 1, offset: 36508}, + pos: position{line: 1514, col: 1, offset: 36598}, expr: &actionExpr{ - pos: position{line: 1512, col: 5, offset: 36523}, + pos: position{line: 1515, col: 5, offset: 36613}, run: (*parser).callonIdentifier1, expr: &labeledExpr{ - pos: position{line: 1512, col: 5, offset: 36523}, + pos: position{line: 1515, col: 5, offset: 36613}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 1512, col: 8, offset: 36526}, + pos: position{line: 1515, col: 8, offset: 36616}, name: "IdentifierName", }, }, @@ -10257,51 +10286,51 @@ var g = &grammar{ }, { name: "Identifiers", - pos: position{line: 1520, col: 1, offset: 36659}, + pos: position{line: 1523, col: 1, offset: 36749}, expr: &actionExpr{ - pos: position{line: 1521, col: 5, offset: 36675}, + pos: position{line: 1524, col: 5, offset: 36765}, run: (*parser).callonIdentifiers1, expr: &seqExpr{ - pos: position{line: 1521, col: 5, offset: 36675}, + pos: position{line: 1524, col: 5, offset: 36765}, exprs: []any{ &labeledExpr{ - pos: position{line: 1521, col: 5, offset: 36675}, + pos: position{line: 1524, col: 5, offset: 36765}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1521, col: 11, offset: 36681}, + pos: position{line: 1524, col: 11, offset: 36771}, name: "Identifier", }, }, &labeledExpr{ - pos: position{line: 1521, col: 22, offset: 36692}, + pos: position{line: 1524, col: 22, offset: 36782}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1521, col: 27, offset: 36697}, + pos: position{line: 1524, col: 27, offset: 36787}, expr: &actionExpr{ - pos: position{line: 1521, col: 28, offset: 36698}, + pos: position{line: 1524, col: 28, offset: 36788}, run: (*parser).callonIdentifiers7, expr: &seqExpr{ - pos: position{line: 1521, col: 28, offset: 36698}, + pos: position{line: 1524, col: 28, offset: 36788}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1521, col: 28, offset: 36698}, + pos: position{line: 1524, col: 28, offset: 36788}, name: "__", }, &litMatcher{ - pos: position{line: 1521, col: 31, offset: 36701}, + pos: position{line: 1524, col: 31, offset: 36791}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1521, col: 35, offset: 36705}, + pos: position{line: 1524, col: 35, offset: 36795}, name: "__", }, &labeledExpr{ - pos: position{line: 1521, col: 38, offset: 36708}, + pos: position{line: 1524, col: 38, offset: 36798}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1521, col: 43, offset: 36713}, + pos: position{line: 1524, col: 43, offset: 36803}, name: "Identifier", }, }, @@ -10318,29 +10347,29 @@ var g = &grammar{ }, { name: "IdentifierName", - pos: position{line: 1525, col: 1, offset: 36791}, + pos: position{line: 1528, col: 1, offset: 36881}, expr: &choiceExpr{ - pos: position{line: 1526, col: 5, offset: 36810}, + pos: position{line: 1529, col: 5, offset: 36900}, alternatives: []any{ &actionExpr{ - pos: position{line: 1526, col: 5, offset: 36810}, + pos: position{line: 1529, col: 5, offset: 36900}, run: (*parser).callonIdentifierName2, expr: &seqExpr{ - pos: position{line: 1526, col: 5, offset: 36810}, + pos: position{line: 1529, col: 5, offset: 36900}, exprs: []any{ ¬Expr{ - pos: position{line: 1526, col: 5, offset: 36810}, + pos: position{line: 1529, col: 5, offset: 36900}, expr: &seqExpr{ - pos: position{line: 1526, col: 7, offset: 36812}, + pos: position{line: 1529, col: 7, offset: 36902}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1526, col: 7, offset: 36812}, + pos: position{line: 1529, col: 7, offset: 36902}, name: "IDGuard", }, ¬Expr{ - pos: position{line: 1526, col: 15, offset: 36820}, + pos: position{line: 1529, col: 15, offset: 36910}, expr: &ruleRefExpr{ - pos: position{line: 1526, col: 16, offset: 36821}, + pos: position{line: 1529, col: 16, offset: 36911}, name: "IdentifierRest", }, }, @@ -10348,13 +10377,13 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1526, col: 32, offset: 36837}, + pos: position{line: 1529, col: 32, offset: 36927}, name: "IdentifierStart", }, &zeroOrMoreExpr{ - pos: position{line: 1526, col: 48, offset: 36853}, + pos: position{line: 1529, col: 48, offset: 36943}, expr: &ruleRefExpr{ - pos: position{line: 1526, col: 48, offset: 36853}, + pos: position{line: 1529, col: 48, offset: 36943}, name: "IdentifierRest", }, }, @@ -10362,32 +10391,32 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1527, col: 5, offset: 36904}, + pos: position{line: 1530, col: 5, offset: 36994}, run: (*parser).callonIdentifierName12, expr: &litMatcher{ - pos: position{line: 1527, col: 5, offset: 36904}, + pos: position{line: 1530, col: 5, offset: 36994}, val: "$", ignoreCase: false, want: "\"$\"", }, }, &actionExpr{ - pos: position{line: 1528, col: 5, offset: 36943}, + pos: position{line: 1531, col: 5, offset: 37033}, run: (*parser).callonIdentifierName14, expr: &seqExpr{ - pos: position{line: 1528, col: 5, offset: 36943}, + pos: position{line: 1531, col: 5, offset: 37033}, exprs: []any{ &litMatcher{ - pos: position{line: 1528, col: 5, offset: 36943}, + pos: position{line: 1531, col: 5, offset: 37033}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1528, col: 10, offset: 36948}, + pos: position{line: 1531, col: 10, offset: 37038}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 1528, col: 13, offset: 36951}, + pos: position{line: 1531, col: 13, offset: 37041}, name: "IDGuard", }, }, @@ -10395,10 +10424,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1530, col: 5, offset: 37042}, + pos: position{line: 1533, col: 5, offset: 37132}, run: (*parser).callonIdentifierName19, expr: &litMatcher{ - pos: position{line: 1530, col: 5, offset: 37042}, + pos: position{line: 1533, col: 5, offset: 37132}, val: "type", ignoreCase: false, want: "\"type\"", @@ -10411,22 +10440,22 @@ var g = &grammar{ }, { name: "IdentifierStart", - pos: position{line: 1532, col: 1, offset: 37081}, + pos: position{line: 1535, col: 1, offset: 37171}, expr: &choiceExpr{ - pos: position{line: 1533, col: 5, offset: 37101}, + pos: position{line: 1536, col: 5, offset: 37191}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1533, col: 5, offset: 37101}, + pos: position{line: 1536, col: 5, offset: 37191}, name: "UnicodeLetter", }, &litMatcher{ - pos: position{line: 1534, col: 5, offset: 37119}, + pos: position{line: 1537, col: 5, offset: 37209}, val: "$", ignoreCase: false, want: "\"$\"", }, &litMatcher{ - pos: position{line: 1535, col: 5, offset: 37127}, + pos: position{line: 1538, col: 5, offset: 37217}, val: "_", ignoreCase: false, want: "\"_\"", @@ -10438,24 +10467,24 @@ var g = &grammar{ }, { name: "IdentifierRest", - pos: position{line: 1537, col: 1, offset: 37132}, + pos: position{line: 1540, col: 1, offset: 37222}, expr: &choiceExpr{ - pos: position{line: 1538, col: 5, offset: 37151}, + pos: position{line: 1541, col: 5, offset: 37241}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1538, col: 5, offset: 37151}, + pos: position{line: 1541, col: 5, offset: 37241}, name: "IdentifierStart", }, &ruleRefExpr{ - pos: position{line: 1539, col: 5, offset: 37171}, + pos: position{line: 1542, col: 5, offset: 37261}, name: "UnicodeCombiningMark", }, &ruleRefExpr{ - pos: position{line: 1540, col: 5, offset: 37196}, + pos: position{line: 1543, col: 5, offset: 37286}, name: "UnicodeDigit", }, &ruleRefExpr{ - pos: position{line: 1541, col: 5, offset: 37213}, + pos: position{line: 1544, col: 5, offset: 37303}, name: "UnicodeConnectorPunctuation", }, }, @@ -10465,24 +10494,24 @@ var g = &grammar{ }, { name: "IDGuard", - pos: position{line: 1543, col: 1, offset: 37242}, + pos: position{line: 1546, col: 1, offset: 37332}, expr: &choiceExpr{ - pos: position{line: 1544, col: 5, offset: 37254}, + pos: position{line: 1547, col: 5, offset: 37344}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1544, col: 5, offset: 37254}, + pos: position{line: 1547, col: 5, offset: 37344}, name: "BooleanLiteral", }, &ruleRefExpr{ - pos: position{line: 1545, col: 5, offset: 37273}, + pos: position{line: 1548, col: 5, offset: 37363}, name: "NullLiteral", }, &ruleRefExpr{ - pos: position{line: 1546, col: 5, offset: 37289}, + pos: position{line: 1549, col: 5, offset: 37379}, name: "NaN", }, &ruleRefExpr{ - pos: position{line: 1547, col: 5, offset: 37297}, + pos: position{line: 1550, col: 5, offset: 37387}, name: "Infinity", }, }, @@ -10492,25 +10521,25 @@ var g = &grammar{ }, { name: "Time", - pos: position{line: 1549, col: 1, offset: 37307}, + pos: position{line: 1552, col: 1, offset: 37397}, expr: &actionExpr{ - pos: position{line: 1550, col: 5, offset: 37316}, + pos: position{line: 1553, col: 5, offset: 37406}, run: (*parser).callonTime1, expr: &seqExpr{ - pos: position{line: 1550, col: 5, offset: 37316}, + pos: position{line: 1553, col: 5, offset: 37406}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1550, col: 5, offset: 37316}, + pos: position{line: 1553, col: 5, offset: 37406}, name: "FullDate", }, &litMatcher{ - pos: position{line: 1550, col: 14, offset: 37325}, + pos: position{line: 1553, col: 14, offset: 37415}, val: "T", ignoreCase: false, want: "\"T\"", }, &ruleRefExpr{ - pos: position{line: 1550, col: 18, offset: 37329}, + pos: position{line: 1553, col: 18, offset: 37419}, name: "FullTime", }, }, @@ -10521,32 +10550,32 @@ var g = &grammar{ }, { name: "FullDate", - pos: position{line: 1554, col: 1, offset: 37405}, + pos: position{line: 1557, col: 1, offset: 37495}, expr: &seqExpr{ - pos: position{line: 1554, col: 12, offset: 37416}, + pos: position{line: 1557, col: 12, offset: 37506}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1554, col: 12, offset: 37416}, + pos: position{line: 1557, col: 12, offset: 37506}, name: "D4", }, &litMatcher{ - pos: position{line: 1554, col: 15, offset: 37419}, + pos: position{line: 1557, col: 15, offset: 37509}, val: "-", ignoreCase: false, want: "\"-\"", }, &ruleRefExpr{ - pos: position{line: 1554, col: 19, offset: 37423}, + pos: position{line: 1557, col: 19, offset: 37513}, name: "D2", }, &litMatcher{ - pos: position{line: 1554, col: 22, offset: 37426}, + pos: position{line: 1557, col: 22, offset: 37516}, val: "-", ignoreCase: false, want: "\"-\"", }, &ruleRefExpr{ - pos: position{line: 1554, col: 26, offset: 37430}, + pos: position{line: 1557, col: 26, offset: 37520}, name: "D2", }, }, @@ -10556,33 +10585,33 @@ var g = &grammar{ }, { name: "D4", - pos: position{line: 1556, col: 1, offset: 37434}, + pos: position{line: 1559, col: 1, offset: 37524}, expr: &seqExpr{ - pos: position{line: 1556, col: 6, offset: 37439}, + pos: position{line: 1559, col: 6, offset: 37529}, exprs: []any{ &charClassMatcher{ - pos: position{line: 1556, col: 6, offset: 37439}, + pos: position{line: 1559, col: 6, offset: 37529}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1556, col: 11, offset: 37444}, + pos: position{line: 1559, col: 11, offset: 37534}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1556, col: 16, offset: 37449}, + pos: position{line: 1559, col: 16, offset: 37539}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1556, col: 21, offset: 37454}, + pos: position{line: 1559, col: 21, offset: 37544}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10595,19 +10624,19 @@ var g = &grammar{ }, { name: "D2", - pos: position{line: 1557, col: 1, offset: 37460}, + pos: position{line: 1560, col: 1, offset: 37550}, expr: &seqExpr{ - pos: position{line: 1557, col: 6, offset: 37465}, + pos: position{line: 1560, col: 6, offset: 37555}, exprs: []any{ &charClassMatcher{ - pos: position{line: 1557, col: 6, offset: 37465}, + pos: position{line: 1560, col: 6, offset: 37555}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1557, col: 11, offset: 37470}, + pos: position{line: 1560, col: 11, offset: 37560}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10620,16 +10649,16 @@ var g = &grammar{ }, { name: "FullTime", - pos: position{line: 1559, col: 1, offset: 37477}, + pos: position{line: 1562, col: 1, offset: 37567}, expr: &seqExpr{ - pos: position{line: 1559, col: 12, offset: 37488}, + pos: position{line: 1562, col: 12, offset: 37578}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1559, col: 12, offset: 37488}, + pos: position{line: 1562, col: 12, offset: 37578}, name: "PartialTime", }, &ruleRefExpr{ - pos: position{line: 1559, col: 24, offset: 37500}, + pos: position{line: 1562, col: 24, offset: 37590}, name: "TimeOffset", }, }, @@ -10639,49 +10668,49 @@ var g = &grammar{ }, { name: "PartialTime", - pos: position{line: 1561, col: 1, offset: 37512}, + pos: position{line: 1564, col: 1, offset: 37602}, expr: &seqExpr{ - pos: position{line: 1561, col: 15, offset: 37526}, + pos: position{line: 1564, col: 15, offset: 37616}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1561, col: 15, offset: 37526}, + pos: position{line: 1564, col: 15, offset: 37616}, name: "D2", }, &litMatcher{ - pos: position{line: 1561, col: 18, offset: 37529}, + pos: position{line: 1564, col: 18, offset: 37619}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1561, col: 22, offset: 37533}, + pos: position{line: 1564, col: 22, offset: 37623}, name: "D2", }, &litMatcher{ - pos: position{line: 1561, col: 25, offset: 37536}, + pos: position{line: 1564, col: 25, offset: 37626}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1561, col: 29, offset: 37540}, + pos: position{line: 1564, col: 29, offset: 37630}, name: "D2", }, &zeroOrOneExpr{ - pos: position{line: 1561, col: 32, offset: 37543}, + pos: position{line: 1564, col: 32, offset: 37633}, expr: &seqExpr{ - pos: position{line: 1561, col: 33, offset: 37544}, + pos: position{line: 1564, col: 33, offset: 37634}, exprs: []any{ &litMatcher{ - pos: position{line: 1561, col: 33, offset: 37544}, + pos: position{line: 1564, col: 33, offset: 37634}, val: ".", ignoreCase: false, want: "\".\"", }, &oneOrMoreExpr{ - pos: position{line: 1561, col: 37, offset: 37548}, + pos: position{line: 1564, col: 37, offset: 37638}, expr: &charClassMatcher{ - pos: position{line: 1561, col: 37, offset: 37548}, + pos: position{line: 1564, col: 37, offset: 37638}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10698,30 +10727,30 @@ var g = &grammar{ }, { name: "TimeOffset", - pos: position{line: 1563, col: 1, offset: 37558}, + pos: position{line: 1566, col: 1, offset: 37648}, expr: &choiceExpr{ - pos: position{line: 1564, col: 5, offset: 37573}, + pos: position{line: 1567, col: 5, offset: 37663}, alternatives: []any{ &litMatcher{ - pos: position{line: 1564, col: 5, offset: 37573}, + pos: position{line: 1567, col: 5, offset: 37663}, val: "Z", ignoreCase: false, want: "\"Z\"", }, &seqExpr{ - pos: position{line: 1565, col: 5, offset: 37581}, + pos: position{line: 1568, col: 5, offset: 37671}, exprs: []any{ &choiceExpr{ - pos: position{line: 1565, col: 6, offset: 37582}, + pos: position{line: 1568, col: 6, offset: 37672}, alternatives: []any{ &litMatcher{ - pos: position{line: 1565, col: 6, offset: 37582}, + pos: position{line: 1568, col: 6, offset: 37672}, val: "+", ignoreCase: false, want: "\"+\"", }, &litMatcher{ - pos: position{line: 1565, col: 12, offset: 37588}, + pos: position{line: 1568, col: 12, offset: 37678}, val: "-", ignoreCase: false, want: "\"-\"", @@ -10729,34 +10758,34 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1565, col: 17, offset: 37593}, + pos: position{line: 1568, col: 17, offset: 37683}, name: "D2", }, &litMatcher{ - pos: position{line: 1565, col: 20, offset: 37596}, + pos: position{line: 1568, col: 20, offset: 37686}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1565, col: 24, offset: 37600}, + pos: position{line: 1568, col: 24, offset: 37690}, name: "D2", }, &zeroOrOneExpr{ - pos: position{line: 1565, col: 27, offset: 37603}, + pos: position{line: 1568, col: 27, offset: 37693}, expr: &seqExpr{ - pos: position{line: 1565, col: 28, offset: 37604}, + pos: position{line: 1568, col: 28, offset: 37694}, exprs: []any{ &litMatcher{ - pos: position{line: 1565, col: 28, offset: 37604}, + pos: position{line: 1568, col: 28, offset: 37694}, val: ".", ignoreCase: false, want: "\".\"", }, &oneOrMoreExpr{ - pos: position{line: 1565, col: 32, offset: 37608}, + pos: position{line: 1568, col: 32, offset: 37698}, expr: &charClassMatcher{ - pos: position{line: 1565, col: 32, offset: 37608}, + pos: position{line: 1568, col: 32, offset: 37698}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10775,33 +10804,33 @@ var g = &grammar{ }, { name: "Duration", - pos: position{line: 1567, col: 1, offset: 37618}, + pos: position{line: 1570, col: 1, offset: 37708}, expr: &actionExpr{ - pos: position{line: 1568, col: 5, offset: 37631}, + pos: position{line: 1571, col: 5, offset: 37721}, run: (*parser).callonDuration1, expr: &seqExpr{ - pos: position{line: 1568, col: 5, offset: 37631}, + pos: position{line: 1571, col: 5, offset: 37721}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1568, col: 5, offset: 37631}, + pos: position{line: 1571, col: 5, offset: 37721}, expr: &litMatcher{ - pos: position{line: 1568, col: 5, offset: 37631}, + pos: position{line: 1571, col: 5, offset: 37721}, val: "-", ignoreCase: false, want: "\"-\"", }, }, &oneOrMoreExpr{ - pos: position{line: 1568, col: 10, offset: 37636}, + pos: position{line: 1571, col: 10, offset: 37726}, expr: &seqExpr{ - pos: position{line: 1568, col: 11, offset: 37637}, + pos: position{line: 1571, col: 11, offset: 37727}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1568, col: 11, offset: 37637}, + pos: position{line: 1571, col: 11, offset: 37727}, name: "Decimal", }, &ruleRefExpr{ - pos: position{line: 1568, col: 19, offset: 37645}, + pos: position{line: 1571, col: 19, offset: 37735}, name: "TimeUnit", }, }, @@ -10815,27 +10844,27 @@ var g = &grammar{ }, { name: "Decimal", - pos: position{line: 1572, col: 1, offset: 37727}, + pos: position{line: 1575, col: 1, offset: 37817}, expr: &seqExpr{ - pos: position{line: 1572, col: 11, offset: 37737}, + pos: position{line: 1575, col: 11, offset: 37827}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1572, col: 11, offset: 37737}, + pos: position{line: 1575, col: 11, offset: 37827}, name: "UInt", }, &zeroOrOneExpr{ - pos: position{line: 1572, col: 16, offset: 37742}, + pos: position{line: 1575, col: 16, offset: 37832}, expr: &seqExpr{ - pos: position{line: 1572, col: 17, offset: 37743}, + pos: position{line: 1575, col: 17, offset: 37833}, exprs: []any{ &litMatcher{ - pos: position{line: 1572, col: 17, offset: 37743}, + pos: position{line: 1575, col: 17, offset: 37833}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1572, col: 21, offset: 37747}, + pos: position{line: 1575, col: 21, offset: 37837}, name: "UInt", }, }, @@ -10848,60 +10877,60 @@ var g = &grammar{ }, { name: "TimeUnit", - pos: position{line: 1574, col: 1, offset: 37755}, + pos: position{line: 1577, col: 1, offset: 37845}, expr: &choiceExpr{ - pos: position{line: 1575, col: 5, offset: 37768}, + pos: position{line: 1578, col: 5, offset: 37858}, alternatives: []any{ &litMatcher{ - pos: position{line: 1575, col: 5, offset: 37768}, + pos: position{line: 1578, col: 5, offset: 37858}, val: "ns", ignoreCase: false, want: "\"ns\"", }, &litMatcher{ - pos: position{line: 1576, col: 5, offset: 37777}, + pos: position{line: 1579, col: 5, offset: 37867}, val: "us", ignoreCase: false, want: "\"us\"", }, &litMatcher{ - pos: position{line: 1577, col: 5, offset: 37786}, + pos: position{line: 1580, col: 5, offset: 37876}, val: "ms", ignoreCase: false, want: "\"ms\"", }, &litMatcher{ - pos: position{line: 1578, col: 5, offset: 37795}, + pos: position{line: 1581, col: 5, offset: 37885}, val: "s", ignoreCase: false, want: "\"s\"", }, &litMatcher{ - pos: position{line: 1579, col: 5, offset: 37803}, + pos: position{line: 1582, col: 5, offset: 37893}, val: "m", ignoreCase: false, want: "\"m\"", }, &litMatcher{ - pos: position{line: 1580, col: 5, offset: 37811}, + pos: position{line: 1583, col: 5, offset: 37901}, val: "h", ignoreCase: false, want: "\"h\"", }, &litMatcher{ - pos: position{line: 1581, col: 5, offset: 37819}, + pos: position{line: 1584, col: 5, offset: 37909}, val: "d", ignoreCase: false, want: "\"d\"", }, &litMatcher{ - pos: position{line: 1582, col: 5, offset: 37827}, + pos: position{line: 1585, col: 5, offset: 37917}, val: "w", ignoreCase: false, want: "\"w\"", }, &litMatcher{ - pos: position{line: 1583, col: 5, offset: 37835}, + pos: position{line: 1586, col: 5, offset: 37925}, val: "y", ignoreCase: false, want: "\"y\"", @@ -10913,45 +10942,45 @@ var g = &grammar{ }, { name: "IP", - pos: position{line: 1585, col: 1, offset: 37840}, + pos: position{line: 1588, col: 1, offset: 37930}, expr: &actionExpr{ - pos: position{line: 1586, col: 5, offset: 37847}, + pos: position{line: 1589, col: 5, offset: 37937}, run: (*parser).callonIP1, expr: &seqExpr{ - pos: position{line: 1586, col: 5, offset: 37847}, + pos: position{line: 1589, col: 5, offset: 37937}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1586, col: 5, offset: 37847}, + pos: position{line: 1589, col: 5, offset: 37937}, name: "UInt", }, &litMatcher{ - pos: position{line: 1586, col: 10, offset: 37852}, + pos: position{line: 1589, col: 10, offset: 37942}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1586, col: 14, offset: 37856}, + pos: position{line: 1589, col: 14, offset: 37946}, name: "UInt", }, &litMatcher{ - pos: position{line: 1586, col: 19, offset: 37861}, + pos: position{line: 1589, col: 19, offset: 37951}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1586, col: 23, offset: 37865}, + pos: position{line: 1589, col: 23, offset: 37955}, name: "UInt", }, &litMatcher{ - pos: position{line: 1586, col: 28, offset: 37870}, + pos: position{line: 1589, col: 28, offset: 37960}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1586, col: 32, offset: 37874}, + pos: position{line: 1589, col: 32, offset: 37964}, name: "UInt", }, }, @@ -10962,43 +10991,43 @@ var g = &grammar{ }, { name: "IP6", - pos: position{line: 1588, col: 1, offset: 37911}, + pos: position{line: 1591, col: 1, offset: 38001}, expr: &actionExpr{ - pos: position{line: 1589, col: 5, offset: 37919}, + pos: position{line: 1592, col: 5, offset: 38009}, run: (*parser).callonIP61, expr: &seqExpr{ - pos: position{line: 1589, col: 5, offset: 37919}, + pos: position{line: 1592, col: 5, offset: 38009}, exprs: []any{ ¬Expr{ - pos: position{line: 1589, col: 5, offset: 37919}, + pos: position{line: 1592, col: 5, offset: 38009}, expr: &seqExpr{ - pos: position{line: 1589, col: 7, offset: 37921}, + pos: position{line: 1592, col: 7, offset: 38011}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1589, col: 7, offset: 37921}, + pos: position{line: 1592, col: 7, offset: 38011}, name: "Hex", }, &litMatcher{ - pos: position{line: 1589, col: 11, offset: 37925}, + pos: position{line: 1592, col: 11, offset: 38015}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1589, col: 15, offset: 37929}, + pos: position{line: 1592, col: 15, offset: 38019}, name: "Hex", }, ¬Expr{ - pos: position{line: 1589, col: 19, offset: 37933}, + pos: position{line: 1592, col: 19, offset: 38023}, expr: &choiceExpr{ - pos: position{line: 1589, col: 21, offset: 37935}, + pos: position{line: 1592, col: 21, offset: 38025}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1589, col: 21, offset: 37935}, + pos: position{line: 1592, col: 21, offset: 38025}, name: "HexDigit", }, &litMatcher{ - pos: position{line: 1589, col: 32, offset: 37946}, + pos: position{line: 1592, col: 32, offset: 38036}, val: ":", ignoreCase: false, want: "\":\"", @@ -11010,10 +11039,10 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 1589, col: 38, offset: 37952}, + pos: position{line: 1592, col: 38, offset: 38042}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1589, col: 40, offset: 37954}, + pos: position{line: 1592, col: 40, offset: 38044}, name: "IP6Variations", }, }, @@ -11025,32 +11054,32 @@ var g = &grammar{ }, { name: "IP6Variations", - pos: position{line: 1593, col: 1, offset: 38118}, + pos: position{line: 1596, col: 1, offset: 38208}, expr: &choiceExpr{ - pos: position{line: 1594, col: 5, offset: 38136}, + pos: position{line: 1597, col: 5, offset: 38226}, alternatives: []any{ &actionExpr{ - pos: position{line: 1594, col: 5, offset: 38136}, + pos: position{line: 1597, col: 5, offset: 38226}, run: (*parser).callonIP6Variations2, expr: &seqExpr{ - pos: position{line: 1594, col: 5, offset: 38136}, + pos: position{line: 1597, col: 5, offset: 38226}, exprs: []any{ &labeledExpr{ - pos: position{line: 1594, col: 5, offset: 38136}, + pos: position{line: 1597, col: 5, offset: 38226}, label: "a", expr: &oneOrMoreExpr{ - pos: position{line: 1594, col: 7, offset: 38138}, + pos: position{line: 1597, col: 7, offset: 38228}, expr: &ruleRefExpr{ - pos: position{line: 1594, col: 7, offset: 38138}, + pos: position{line: 1597, col: 7, offset: 38228}, name: "HexColon", }, }, }, &labeledExpr{ - pos: position{line: 1594, col: 17, offset: 38148}, + pos: position{line: 1597, col: 17, offset: 38238}, label: "b", expr: &ruleRefExpr{ - pos: position{line: 1594, col: 19, offset: 38150}, + pos: position{line: 1597, col: 19, offset: 38240}, name: "IP6Tail", }, }, @@ -11058,52 +11087,52 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1597, col: 5, offset: 38214}, + pos: position{line: 1600, col: 5, offset: 38304}, run: (*parser).callonIP6Variations9, expr: &seqExpr{ - pos: position{line: 1597, col: 5, offset: 38214}, + pos: position{line: 1600, col: 5, offset: 38304}, exprs: []any{ &labeledExpr{ - pos: position{line: 1597, col: 5, offset: 38214}, + pos: position{line: 1600, col: 5, offset: 38304}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1597, col: 7, offset: 38216}, + pos: position{line: 1600, col: 7, offset: 38306}, name: "Hex", }, }, &labeledExpr{ - pos: position{line: 1597, col: 11, offset: 38220}, + pos: position{line: 1600, col: 11, offset: 38310}, label: "b", expr: &zeroOrMoreExpr{ - pos: position{line: 1597, col: 13, offset: 38222}, + pos: position{line: 1600, col: 13, offset: 38312}, expr: &ruleRefExpr{ - pos: position{line: 1597, col: 13, offset: 38222}, + pos: position{line: 1600, col: 13, offset: 38312}, name: "ColonHex", }, }, }, &litMatcher{ - pos: position{line: 1597, col: 23, offset: 38232}, + pos: position{line: 1600, col: 23, offset: 38322}, val: "::", ignoreCase: false, want: "\"::\"", }, &labeledExpr{ - pos: position{line: 1597, col: 28, offset: 38237}, + pos: position{line: 1600, col: 28, offset: 38327}, label: "d", expr: &zeroOrMoreExpr{ - pos: position{line: 1597, col: 30, offset: 38239}, + pos: position{line: 1600, col: 30, offset: 38329}, expr: &ruleRefExpr{ - pos: position{line: 1597, col: 30, offset: 38239}, + pos: position{line: 1600, col: 30, offset: 38329}, name: "HexColon", }, }, }, &labeledExpr{ - pos: position{line: 1597, col: 40, offset: 38249}, + pos: position{line: 1600, col: 40, offset: 38339}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1597, col: 42, offset: 38251}, + pos: position{line: 1600, col: 42, offset: 38341}, name: "IP6Tail", }, }, @@ -11111,33 +11140,33 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1600, col: 5, offset: 38350}, + pos: position{line: 1603, col: 5, offset: 38440}, run: (*parser).callonIP6Variations22, expr: &seqExpr{ - pos: position{line: 1600, col: 5, offset: 38350}, + pos: position{line: 1603, col: 5, offset: 38440}, exprs: []any{ &litMatcher{ - pos: position{line: 1600, col: 5, offset: 38350}, + pos: position{line: 1603, col: 5, offset: 38440}, val: "::", ignoreCase: false, want: "\"::\"", }, &labeledExpr{ - pos: position{line: 1600, col: 10, offset: 38355}, + pos: position{line: 1603, col: 10, offset: 38445}, label: "a", expr: &zeroOrMoreExpr{ - pos: position{line: 1600, col: 12, offset: 38357}, + pos: position{line: 1603, col: 12, offset: 38447}, expr: &ruleRefExpr{ - pos: position{line: 1600, col: 12, offset: 38357}, + pos: position{line: 1603, col: 12, offset: 38447}, name: "HexColon", }, }, }, &labeledExpr{ - pos: position{line: 1600, col: 22, offset: 38367}, + pos: position{line: 1603, col: 22, offset: 38457}, label: "b", expr: &ruleRefExpr{ - pos: position{line: 1600, col: 24, offset: 38369}, + pos: position{line: 1603, col: 24, offset: 38459}, name: "IP6Tail", }, }, @@ -11145,32 +11174,32 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1603, col: 5, offset: 38440}, + pos: position{line: 1606, col: 5, offset: 38530}, run: (*parser).callonIP6Variations30, expr: &seqExpr{ - pos: position{line: 1603, col: 5, offset: 38440}, + pos: position{line: 1606, col: 5, offset: 38530}, exprs: []any{ &labeledExpr{ - pos: position{line: 1603, col: 5, offset: 38440}, + pos: position{line: 1606, col: 5, offset: 38530}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1603, col: 7, offset: 38442}, + pos: position{line: 1606, col: 7, offset: 38532}, name: "Hex", }, }, &labeledExpr{ - pos: position{line: 1603, col: 11, offset: 38446}, + pos: position{line: 1606, col: 11, offset: 38536}, label: "b", expr: &zeroOrMoreExpr{ - pos: position{line: 1603, col: 13, offset: 38448}, + pos: position{line: 1606, col: 13, offset: 38538}, expr: &ruleRefExpr{ - pos: position{line: 1603, col: 13, offset: 38448}, + pos: position{line: 1606, col: 13, offset: 38538}, name: "ColonHex", }, }, }, &litMatcher{ - pos: position{line: 1603, col: 23, offset: 38458}, + pos: position{line: 1606, col: 23, offset: 38548}, val: "::", ignoreCase: false, want: "\"::\"", @@ -11179,10 +11208,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1606, col: 5, offset: 38526}, + pos: position{line: 1609, col: 5, offset: 38616}, run: (*parser).callonIP6Variations38, expr: &litMatcher{ - pos: position{line: 1606, col: 5, offset: 38526}, + pos: position{line: 1609, col: 5, offset: 38616}, val: "::", ignoreCase: false, want: "\"::\"", @@ -11195,16 +11224,16 @@ var g = &grammar{ }, { name: "IP6Tail", - pos: position{line: 1610, col: 1, offset: 38563}, + pos: position{line: 1613, col: 1, offset: 38653}, expr: &choiceExpr{ - pos: position{line: 1611, col: 5, offset: 38575}, + pos: position{line: 1614, col: 5, offset: 38665}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1611, col: 5, offset: 38575}, + pos: position{line: 1614, col: 5, offset: 38665}, name: "IP", }, &ruleRefExpr{ - pos: position{line: 1612, col: 5, offset: 38582}, + pos: position{line: 1615, col: 5, offset: 38672}, name: "Hex", }, }, @@ -11214,24 +11243,24 @@ var g = &grammar{ }, { name: "ColonHex", - pos: position{line: 1614, col: 1, offset: 38587}, + pos: position{line: 1617, col: 1, offset: 38677}, expr: &actionExpr{ - pos: position{line: 1614, col: 12, offset: 38598}, + pos: position{line: 1617, col: 12, offset: 38688}, run: (*parser).callonColonHex1, expr: &seqExpr{ - pos: position{line: 1614, col: 12, offset: 38598}, + pos: position{line: 1617, col: 12, offset: 38688}, exprs: []any{ &litMatcher{ - pos: position{line: 1614, col: 12, offset: 38598}, + pos: position{line: 1617, col: 12, offset: 38688}, val: ":", ignoreCase: false, want: "\":\"", }, &labeledExpr{ - pos: position{line: 1614, col: 16, offset: 38602}, + pos: position{line: 1617, col: 16, offset: 38692}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1614, col: 18, offset: 38604}, + pos: position{line: 1617, col: 18, offset: 38694}, name: "Hex", }, }, @@ -11243,23 +11272,23 @@ var g = &grammar{ }, { name: "HexColon", - pos: position{line: 1616, col: 1, offset: 38642}, + pos: position{line: 1619, col: 1, offset: 38732}, expr: &actionExpr{ - pos: position{line: 1616, col: 12, offset: 38653}, + pos: position{line: 1619, col: 12, offset: 38743}, run: (*parser).callonHexColon1, expr: &seqExpr{ - pos: position{line: 1616, col: 12, offset: 38653}, + pos: position{line: 1619, col: 12, offset: 38743}, exprs: []any{ &labeledExpr{ - pos: position{line: 1616, col: 12, offset: 38653}, + pos: position{line: 1619, col: 12, offset: 38743}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1616, col: 14, offset: 38655}, + pos: position{line: 1619, col: 14, offset: 38745}, name: "Hex", }, }, &litMatcher{ - pos: position{line: 1616, col: 18, offset: 38659}, + pos: position{line: 1619, col: 18, offset: 38749}, val: ":", ignoreCase: false, want: "\":\"", @@ -11272,32 +11301,32 @@ var g = &grammar{ }, { name: "IP4Net", - pos: position{line: 1618, col: 1, offset: 38697}, + pos: position{line: 1621, col: 1, offset: 38787}, expr: &actionExpr{ - pos: position{line: 1619, col: 5, offset: 38708}, + pos: position{line: 1622, col: 5, offset: 38798}, run: (*parser).callonIP4Net1, expr: &seqExpr{ - pos: position{line: 1619, col: 5, offset: 38708}, + pos: position{line: 1622, col: 5, offset: 38798}, exprs: []any{ &labeledExpr{ - pos: position{line: 1619, col: 5, offset: 38708}, + pos: position{line: 1622, col: 5, offset: 38798}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1619, col: 7, offset: 38710}, + pos: position{line: 1622, col: 7, offset: 38800}, name: "IP", }, }, &litMatcher{ - pos: position{line: 1619, col: 10, offset: 38713}, + pos: position{line: 1622, col: 10, offset: 38803}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 1619, col: 14, offset: 38717}, + pos: position{line: 1622, col: 14, offset: 38807}, label: "m", expr: &ruleRefExpr{ - pos: position{line: 1619, col: 16, offset: 38719}, + pos: position{line: 1622, col: 16, offset: 38809}, name: "UIntString", }, }, @@ -11309,32 +11338,32 @@ var g = &grammar{ }, { name: "IP6Net", - pos: position{line: 1623, col: 1, offset: 38787}, + pos: position{line: 1626, col: 1, offset: 38877}, expr: &actionExpr{ - pos: position{line: 1624, col: 5, offset: 38798}, + pos: position{line: 1627, col: 5, offset: 38888}, run: (*parser).callonIP6Net1, expr: &seqExpr{ - pos: position{line: 1624, col: 5, offset: 38798}, + pos: position{line: 1627, col: 5, offset: 38888}, exprs: []any{ &labeledExpr{ - pos: position{line: 1624, col: 5, offset: 38798}, + pos: position{line: 1627, col: 5, offset: 38888}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1624, col: 7, offset: 38800}, + pos: position{line: 1627, col: 7, offset: 38890}, name: "IP6", }, }, &litMatcher{ - pos: position{line: 1624, col: 11, offset: 38804}, + pos: position{line: 1627, col: 11, offset: 38894}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 1624, col: 15, offset: 38808}, + pos: position{line: 1627, col: 15, offset: 38898}, label: "m", expr: &ruleRefExpr{ - pos: position{line: 1624, col: 17, offset: 38810}, + pos: position{line: 1627, col: 17, offset: 38900}, name: "UIntString", }, }, @@ -11346,15 +11375,15 @@ var g = &grammar{ }, { name: "UInt", - pos: position{line: 1628, col: 1, offset: 38878}, + pos: position{line: 1631, col: 1, offset: 38968}, expr: &actionExpr{ - pos: position{line: 1629, col: 4, offset: 38886}, + pos: position{line: 1632, col: 4, offset: 38976}, run: (*parser).callonUInt1, expr: &labeledExpr{ - pos: position{line: 1629, col: 4, offset: 38886}, + pos: position{line: 1632, col: 4, offset: 38976}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1629, col: 6, offset: 38888}, + pos: position{line: 1632, col: 6, offset: 38978}, name: "UIntString", }, }, @@ -11364,16 +11393,16 @@ var g = &grammar{ }, { name: "IntString", - pos: position{line: 1631, col: 1, offset: 38928}, + pos: position{line: 1634, col: 1, offset: 39018}, expr: &choiceExpr{ - pos: position{line: 1632, col: 5, offset: 38942}, + pos: position{line: 1635, col: 5, offset: 39032}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1632, col: 5, offset: 38942}, + pos: position{line: 1635, col: 5, offset: 39032}, name: "UIntString", }, &ruleRefExpr{ - pos: position{line: 1633, col: 5, offset: 38957}, + pos: position{line: 1636, col: 5, offset: 39047}, name: "MinusIntString", }, }, @@ -11383,14 +11412,14 @@ var g = &grammar{ }, { name: "UIntString", - pos: position{line: 1635, col: 1, offset: 38973}, + pos: position{line: 1638, col: 1, offset: 39063}, expr: &actionExpr{ - pos: position{line: 1635, col: 14, offset: 38986}, + pos: position{line: 1638, col: 14, offset: 39076}, run: (*parser).callonUIntString1, expr: &oneOrMoreExpr{ - pos: position{line: 1635, col: 14, offset: 38986}, + pos: position{line: 1638, col: 14, offset: 39076}, expr: &charClassMatcher{ - pos: position{line: 1635, col: 14, offset: 38986}, + pos: position{line: 1638, col: 14, offset: 39076}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11403,21 +11432,21 @@ var g = &grammar{ }, { name: "MinusIntString", - pos: position{line: 1637, col: 1, offset: 39025}, + pos: position{line: 1640, col: 1, offset: 39115}, expr: &actionExpr{ - pos: position{line: 1638, col: 5, offset: 39044}, + pos: position{line: 1641, col: 5, offset: 39134}, run: (*parser).callonMinusIntString1, expr: &seqExpr{ - pos: position{line: 1638, col: 5, offset: 39044}, + pos: position{line: 1641, col: 5, offset: 39134}, exprs: []any{ &litMatcher{ - pos: position{line: 1638, col: 5, offset: 39044}, + pos: position{line: 1641, col: 5, offset: 39134}, val: "-", ignoreCase: false, want: "\"-\"", }, &ruleRefExpr{ - pos: position{line: 1638, col: 9, offset: 39048}, + pos: position{line: 1641, col: 9, offset: 39138}, name: "UIntString", }, }, @@ -11428,29 +11457,29 @@ var g = &grammar{ }, { name: "FloatString", - pos: position{line: 1640, col: 1, offset: 39091}, + pos: position{line: 1643, col: 1, offset: 39181}, expr: &choiceExpr{ - pos: position{line: 1641, col: 5, offset: 39107}, + pos: position{line: 1644, col: 5, offset: 39197}, alternatives: []any{ &actionExpr{ - pos: position{line: 1641, col: 5, offset: 39107}, + pos: position{line: 1644, col: 5, offset: 39197}, run: (*parser).callonFloatString2, expr: &seqExpr{ - pos: position{line: 1641, col: 5, offset: 39107}, + pos: position{line: 1644, col: 5, offset: 39197}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1641, col: 5, offset: 39107}, + pos: position{line: 1644, col: 5, offset: 39197}, expr: &litMatcher{ - pos: position{line: 1641, col: 5, offset: 39107}, + pos: position{line: 1644, col: 5, offset: 39197}, val: "-", ignoreCase: false, want: "\"-\"", }, }, &oneOrMoreExpr{ - pos: position{line: 1641, col: 10, offset: 39112}, + pos: position{line: 1644, col: 10, offset: 39202}, expr: &charClassMatcher{ - pos: position{line: 1641, col: 10, offset: 39112}, + pos: position{line: 1644, col: 10, offset: 39202}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11458,15 +11487,15 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1641, col: 17, offset: 39119}, + pos: position{line: 1644, col: 17, offset: 39209}, val: ".", ignoreCase: false, want: "\".\"", }, &zeroOrMoreExpr{ - pos: position{line: 1641, col: 21, offset: 39123}, + pos: position{line: 1644, col: 21, offset: 39213}, expr: &charClassMatcher{ - pos: position{line: 1641, col: 21, offset: 39123}, + pos: position{line: 1644, col: 21, offset: 39213}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11474,9 +11503,9 @@ var g = &grammar{ }, }, &zeroOrOneExpr{ - pos: position{line: 1641, col: 28, offset: 39130}, + pos: position{line: 1644, col: 28, offset: 39220}, expr: &ruleRefExpr{ - pos: position{line: 1641, col: 28, offset: 39130}, + pos: position{line: 1644, col: 28, offset: 39220}, name: "ExponentPart", }, }, @@ -11484,30 +11513,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1642, col: 5, offset: 39179}, + pos: position{line: 1645, col: 5, offset: 39269}, run: (*parser).callonFloatString13, expr: &seqExpr{ - pos: position{line: 1642, col: 5, offset: 39179}, + pos: position{line: 1645, col: 5, offset: 39269}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1642, col: 5, offset: 39179}, + pos: position{line: 1645, col: 5, offset: 39269}, expr: &litMatcher{ - pos: position{line: 1642, col: 5, offset: 39179}, + pos: position{line: 1645, col: 5, offset: 39269}, val: "-", ignoreCase: false, want: "\"-\"", }, }, &litMatcher{ - pos: position{line: 1642, col: 10, offset: 39184}, + pos: position{line: 1645, col: 10, offset: 39274}, val: ".", ignoreCase: false, want: "\".\"", }, &oneOrMoreExpr{ - pos: position{line: 1642, col: 14, offset: 39188}, + pos: position{line: 1645, col: 14, offset: 39278}, expr: &charClassMatcher{ - pos: position{line: 1642, col: 14, offset: 39188}, + pos: position{line: 1645, col: 14, offset: 39278}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11515,9 +11544,9 @@ var g = &grammar{ }, }, &zeroOrOneExpr{ - pos: position{line: 1642, col: 21, offset: 39195}, + pos: position{line: 1645, col: 21, offset: 39285}, expr: &ruleRefExpr{ - pos: position{line: 1642, col: 21, offset: 39195}, + pos: position{line: 1645, col: 21, offset: 39285}, name: "ExponentPart", }, }, @@ -11525,17 +11554,17 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1643, col: 5, offset: 39244}, + pos: position{line: 1646, col: 5, offset: 39334}, run: (*parser).callonFloatString22, expr: &choiceExpr{ - pos: position{line: 1643, col: 6, offset: 39245}, + pos: position{line: 1646, col: 6, offset: 39335}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1643, col: 6, offset: 39245}, + pos: position{line: 1646, col: 6, offset: 39335}, name: "NaN", }, &ruleRefExpr{ - pos: position{line: 1643, col: 12, offset: 39251}, + pos: position{line: 1646, col: 12, offset: 39341}, name: "Infinity", }, }, @@ -11548,20 +11577,20 @@ var g = &grammar{ }, { name: "ExponentPart", - pos: position{line: 1646, col: 1, offset: 39294}, + pos: position{line: 1649, col: 1, offset: 39384}, expr: &seqExpr{ - pos: position{line: 1646, col: 16, offset: 39309}, + pos: position{line: 1649, col: 16, offset: 39399}, exprs: []any{ &litMatcher{ - pos: position{line: 1646, col: 16, offset: 39309}, + pos: position{line: 1649, col: 16, offset: 39399}, val: "e", ignoreCase: true, want: "\"e\"i", }, &zeroOrOneExpr{ - pos: position{line: 1646, col: 21, offset: 39314}, + pos: position{line: 1649, col: 21, offset: 39404}, expr: &charClassMatcher{ - pos: position{line: 1646, col: 21, offset: 39314}, + pos: position{line: 1649, col: 21, offset: 39404}, val: "[+-]", chars: []rune{'+', '-'}, ignoreCase: false, @@ -11569,7 +11598,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1646, col: 27, offset: 39320}, + pos: position{line: 1649, col: 27, offset: 39410}, name: "UIntString", }, }, @@ -11579,9 +11608,9 @@ var g = &grammar{ }, { name: "NaN", - pos: position{line: 1648, col: 1, offset: 39332}, + pos: position{line: 1651, col: 1, offset: 39422}, expr: &litMatcher{ - pos: position{line: 1648, col: 7, offset: 39338}, + pos: position{line: 1651, col: 7, offset: 39428}, val: "NaN", ignoreCase: false, want: "\"NaN\"", @@ -11591,23 +11620,23 @@ var g = &grammar{ }, { name: "Infinity", - pos: position{line: 1650, col: 1, offset: 39345}, + pos: position{line: 1653, col: 1, offset: 39435}, expr: &seqExpr{ - pos: position{line: 1650, col: 12, offset: 39356}, + pos: position{line: 1653, col: 12, offset: 39446}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1650, col: 12, offset: 39356}, + pos: position{line: 1653, col: 12, offset: 39446}, expr: &choiceExpr{ - pos: position{line: 1650, col: 13, offset: 39357}, + pos: position{line: 1653, col: 13, offset: 39447}, alternatives: []any{ &litMatcher{ - pos: position{line: 1650, col: 13, offset: 39357}, + pos: position{line: 1653, col: 13, offset: 39447}, val: "-", ignoreCase: false, want: "\"-\"", }, &litMatcher{ - pos: position{line: 1650, col: 19, offset: 39363}, + pos: position{line: 1653, col: 19, offset: 39453}, val: "+", ignoreCase: false, want: "\"+\"", @@ -11616,7 +11645,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1650, col: 25, offset: 39369}, + pos: position{line: 1653, col: 25, offset: 39459}, val: "Inf", ignoreCase: false, want: "\"Inf\"", @@ -11628,14 +11657,14 @@ var g = &grammar{ }, { name: "Hex", - pos: position{line: 1652, col: 1, offset: 39376}, + pos: position{line: 1655, col: 1, offset: 39466}, expr: &actionExpr{ - pos: position{line: 1652, col: 7, offset: 39382}, + pos: position{line: 1655, col: 7, offset: 39472}, run: (*parser).callonHex1, expr: &oneOrMoreExpr{ - pos: position{line: 1652, col: 7, offset: 39382}, + pos: position{line: 1655, col: 7, offset: 39472}, expr: &ruleRefExpr{ - pos: position{line: 1652, col: 7, offset: 39382}, + pos: position{line: 1655, col: 7, offset: 39472}, name: "HexDigit", }, }, @@ -11645,9 +11674,9 @@ var g = &grammar{ }, { name: "HexDigit", - pos: position{line: 1654, col: 1, offset: 39424}, + pos: position{line: 1657, col: 1, offset: 39514}, expr: &charClassMatcher{ - pos: position{line: 1654, col: 12, offset: 39435}, + pos: position{line: 1657, col: 12, offset: 39525}, val: "[0-9a-fA-F]", ranges: []rune{'0', '9', 'a', 'f', 'A', 'F'}, ignoreCase: false, @@ -11658,35 +11687,35 @@ var g = &grammar{ }, { name: "QuotedString", - pos: position{line: 1656, col: 1, offset: 39448}, + pos: position{line: 1659, col: 1, offset: 39538}, expr: &choiceExpr{ - pos: position{line: 1657, col: 5, offset: 39465}, + pos: position{line: 1660, col: 5, offset: 39555}, alternatives: []any{ &actionExpr{ - pos: position{line: 1657, col: 5, offset: 39465}, + pos: position{line: 1660, col: 5, offset: 39555}, run: (*parser).callonQuotedString2, expr: &seqExpr{ - pos: position{line: 1657, col: 5, offset: 39465}, + pos: position{line: 1660, col: 5, offset: 39555}, exprs: []any{ &litMatcher{ - pos: position{line: 1657, col: 5, offset: 39465}, + pos: position{line: 1660, col: 5, offset: 39555}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, &labeledExpr{ - pos: position{line: 1657, col: 9, offset: 39469}, + pos: position{line: 1660, col: 9, offset: 39559}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1657, col: 11, offset: 39471}, + pos: position{line: 1660, col: 11, offset: 39561}, expr: &ruleRefExpr{ - pos: position{line: 1657, col: 11, offset: 39471}, + pos: position{line: 1660, col: 11, offset: 39561}, name: "DoubleQuotedChar", }, }, }, &litMatcher{ - pos: position{line: 1657, col: 29, offset: 39489}, + pos: position{line: 1660, col: 29, offset: 39579}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -11695,30 +11724,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1658, col: 5, offset: 39526}, + pos: position{line: 1661, col: 5, offset: 39616}, run: (*parser).callonQuotedString9, expr: &seqExpr{ - pos: position{line: 1658, col: 5, offset: 39526}, + pos: position{line: 1661, col: 5, offset: 39616}, exprs: []any{ &litMatcher{ - pos: position{line: 1658, col: 5, offset: 39526}, + pos: position{line: 1661, col: 5, offset: 39616}, val: "'", ignoreCase: false, want: "\"'\"", }, &labeledExpr{ - pos: position{line: 1658, col: 9, offset: 39530}, + pos: position{line: 1661, col: 9, offset: 39620}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1658, col: 11, offset: 39532}, + pos: position{line: 1661, col: 11, offset: 39622}, expr: &ruleRefExpr{ - pos: position{line: 1658, col: 11, offset: 39532}, + pos: position{line: 1661, col: 11, offset: 39622}, name: "SingleQuotedChar", }, }, }, &litMatcher{ - pos: position{line: 1658, col: 29, offset: 39550}, + pos: position{line: 1661, col: 29, offset: 39640}, val: "'", ignoreCase: false, want: "\"'\"", @@ -11733,57 +11762,57 @@ var g = &grammar{ }, { name: "DoubleQuotedChar", - pos: position{line: 1660, col: 1, offset: 39584}, + pos: position{line: 1663, col: 1, offset: 39674}, expr: &choiceExpr{ - pos: position{line: 1661, col: 5, offset: 39605}, + pos: position{line: 1664, col: 5, offset: 39695}, alternatives: []any{ &actionExpr{ - pos: position{line: 1661, col: 5, offset: 39605}, + pos: position{line: 1664, col: 5, offset: 39695}, run: (*parser).callonDoubleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1661, col: 5, offset: 39605}, + pos: position{line: 1664, col: 5, offset: 39695}, exprs: []any{ ¬Expr{ - pos: position{line: 1661, col: 5, offset: 39605}, + pos: position{line: 1664, col: 5, offset: 39695}, expr: &choiceExpr{ - pos: position{line: 1661, col: 7, offset: 39607}, + pos: position{line: 1664, col: 7, offset: 39697}, alternatives: []any{ &litMatcher{ - pos: position{line: 1661, col: 7, offset: 39607}, + pos: position{line: 1664, col: 7, offset: 39697}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, &ruleRefExpr{ - pos: position{line: 1661, col: 13, offset: 39613}, + pos: position{line: 1664, col: 13, offset: 39703}, name: "EscapedChar", }, }, }, }, &anyMatcher{ - line: 1661, col: 26, offset: 39626, + line: 1664, col: 26, offset: 39716, }, }, }, }, &actionExpr{ - pos: position{line: 1662, col: 5, offset: 39663}, + pos: position{line: 1665, col: 5, offset: 39753}, run: (*parser).callonDoubleQuotedChar9, expr: &seqExpr{ - pos: position{line: 1662, col: 5, offset: 39663}, + pos: position{line: 1665, col: 5, offset: 39753}, exprs: []any{ &litMatcher{ - pos: position{line: 1662, col: 5, offset: 39663}, + pos: position{line: 1665, col: 5, offset: 39753}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1662, col: 10, offset: 39668}, + pos: position{line: 1665, col: 10, offset: 39758}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1662, col: 12, offset: 39670}, + pos: position{line: 1665, col: 12, offset: 39760}, name: "EscapeSequence", }, }, @@ -11797,28 +11826,28 @@ var g = &grammar{ }, { name: "KeyWord", - pos: position{line: 1664, col: 1, offset: 39704}, + pos: position{line: 1667, col: 1, offset: 39794}, expr: &actionExpr{ - pos: position{line: 1665, col: 5, offset: 39716}, + pos: position{line: 1668, col: 5, offset: 39806}, run: (*parser).callonKeyWord1, expr: &seqExpr{ - pos: position{line: 1665, col: 5, offset: 39716}, + pos: position{line: 1668, col: 5, offset: 39806}, exprs: []any{ &labeledExpr{ - pos: position{line: 1665, col: 5, offset: 39716}, + pos: position{line: 1668, col: 5, offset: 39806}, label: "head", expr: &ruleRefExpr{ - pos: position{line: 1665, col: 10, offset: 39721}, + pos: position{line: 1668, col: 10, offset: 39811}, name: "KeyWordStart", }, }, &labeledExpr{ - pos: position{line: 1665, col: 23, offset: 39734}, + pos: position{line: 1668, col: 23, offset: 39824}, label: "tail", expr: &zeroOrMoreExpr{ - pos: position{line: 1665, col: 28, offset: 39739}, + pos: position{line: 1668, col: 28, offset: 39829}, expr: &ruleRefExpr{ - pos: position{line: 1665, col: 28, offset: 39739}, + pos: position{line: 1668, col: 28, offset: 39829}, name: "KeyWordRest", }, }, @@ -11831,16 +11860,16 @@ var g = &grammar{ }, { name: "KeyWordStart", - pos: position{line: 1667, col: 1, offset: 39801}, + pos: position{line: 1670, col: 1, offset: 39891}, expr: &choiceExpr{ - pos: position{line: 1668, col: 5, offset: 39818}, + pos: position{line: 1671, col: 5, offset: 39908}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1668, col: 5, offset: 39818}, + pos: position{line: 1671, col: 5, offset: 39908}, name: "KeyWordChars", }, &ruleRefExpr{ - pos: position{line: 1669, col: 5, offset: 39835}, + pos: position{line: 1672, col: 5, offset: 39925}, name: "KeyWordEsc", }, }, @@ -11850,16 +11879,16 @@ var g = &grammar{ }, { name: "KeyWordRest", - pos: position{line: 1671, col: 1, offset: 39847}, + pos: position{line: 1674, col: 1, offset: 39937}, expr: &choiceExpr{ - pos: position{line: 1672, col: 5, offset: 39863}, + pos: position{line: 1675, col: 5, offset: 39953}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1672, col: 5, offset: 39863}, + pos: position{line: 1675, col: 5, offset: 39953}, name: "KeyWordStart", }, &charClassMatcher{ - pos: position{line: 1673, col: 5, offset: 39880}, + pos: position{line: 1676, col: 5, offset: 39970}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11872,19 +11901,19 @@ var g = &grammar{ }, { name: "KeyWordChars", - pos: position{line: 1675, col: 1, offset: 39887}, + pos: position{line: 1678, col: 1, offset: 39977}, expr: &actionExpr{ - pos: position{line: 1675, col: 16, offset: 39902}, + pos: position{line: 1678, col: 16, offset: 39992}, run: (*parser).callonKeyWordChars1, expr: &choiceExpr{ - pos: position{line: 1675, col: 17, offset: 39903}, + pos: position{line: 1678, col: 17, offset: 39993}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1675, col: 17, offset: 39903}, + pos: position{line: 1678, col: 17, offset: 39993}, name: "UnicodeLetter", }, &charClassMatcher{ - pos: position{line: 1675, col: 33, offset: 39919}, + pos: position{line: 1678, col: 33, offset: 40009}, val: "[_.:/%#@~]", chars: []rune{'_', '.', ':', '/', '%', '#', '@', '~'}, ignoreCase: false, @@ -11898,31 +11927,31 @@ var g = &grammar{ }, { name: "KeyWordEsc", - pos: position{line: 1677, col: 1, offset: 39963}, + pos: position{line: 1680, col: 1, offset: 40053}, expr: &actionExpr{ - pos: position{line: 1677, col: 14, offset: 39976}, + pos: position{line: 1680, col: 14, offset: 40066}, run: (*parser).callonKeyWordEsc1, expr: &seqExpr{ - pos: position{line: 1677, col: 14, offset: 39976}, + pos: position{line: 1680, col: 14, offset: 40066}, exprs: []any{ &litMatcher{ - pos: position{line: 1677, col: 14, offset: 39976}, + pos: position{line: 1680, col: 14, offset: 40066}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1677, col: 19, offset: 39981}, + pos: position{line: 1680, col: 19, offset: 40071}, label: "s", expr: &choiceExpr{ - pos: position{line: 1677, col: 22, offset: 39984}, + pos: position{line: 1680, col: 22, offset: 40074}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1677, col: 22, offset: 39984}, + pos: position{line: 1680, col: 22, offset: 40074}, name: "KeywordEscape", }, &ruleRefExpr{ - pos: position{line: 1677, col: 38, offset: 40000}, + pos: position{line: 1680, col: 38, offset: 40090}, name: "EscapeSequence", }, }, @@ -11936,42 +11965,42 @@ var g = &grammar{ }, { name: "GlobPattern", - pos: position{line: 1679, col: 1, offset: 40035}, + pos: position{line: 1682, col: 1, offset: 40125}, expr: &actionExpr{ - pos: position{line: 1680, col: 5, offset: 40051}, + pos: position{line: 1683, col: 5, offset: 40141}, run: (*parser).callonGlobPattern1, expr: &seqExpr{ - pos: position{line: 1680, col: 5, offset: 40051}, + pos: position{line: 1683, col: 5, offset: 40141}, exprs: []any{ &andExpr{ - pos: position{line: 1680, col: 5, offset: 40051}, + pos: position{line: 1683, col: 5, offset: 40141}, expr: &ruleRefExpr{ - pos: position{line: 1680, col: 6, offset: 40052}, + pos: position{line: 1683, col: 6, offset: 40142}, name: "GlobProperStart", }, }, &andExpr{ - pos: position{line: 1680, col: 22, offset: 40068}, + pos: position{line: 1683, col: 22, offset: 40158}, expr: &ruleRefExpr{ - pos: position{line: 1680, col: 23, offset: 40069}, + pos: position{line: 1683, col: 23, offset: 40159}, name: "GlobHasStar", }, }, &labeledExpr{ - pos: position{line: 1680, col: 35, offset: 40081}, + pos: position{line: 1683, col: 35, offset: 40171}, label: "head", expr: &ruleRefExpr{ - pos: position{line: 1680, col: 40, offset: 40086}, + pos: position{line: 1683, col: 40, offset: 40176}, name: "GlobStart", }, }, &labeledExpr{ - pos: position{line: 1680, col: 50, offset: 40096}, + pos: position{line: 1683, col: 50, offset: 40186}, label: "tail", expr: &zeroOrMoreExpr{ - pos: position{line: 1680, col: 55, offset: 40101}, + pos: position{line: 1683, col: 55, offset: 40191}, expr: &ruleRefExpr{ - pos: position{line: 1680, col: 55, offset: 40101}, + pos: position{line: 1683, col: 55, offset: 40191}, name: "GlobRest", }, }, @@ -11984,28 +12013,28 @@ var g = &grammar{ }, { name: "GlobProperStart", - pos: position{line: 1684, col: 1, offset: 40170}, + pos: position{line: 1687, col: 1, offset: 40260}, expr: &choiceExpr{ - pos: position{line: 1684, col: 19, offset: 40188}, + pos: position{line: 1687, col: 19, offset: 40278}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1684, col: 19, offset: 40188}, + pos: position{line: 1687, col: 19, offset: 40278}, name: "KeyWordStart", }, &seqExpr{ - pos: position{line: 1684, col: 34, offset: 40203}, + pos: position{line: 1687, col: 34, offset: 40293}, exprs: []any{ &oneOrMoreExpr{ - pos: position{line: 1684, col: 34, offset: 40203}, + pos: position{line: 1687, col: 34, offset: 40293}, expr: &litMatcher{ - pos: position{line: 1684, col: 34, offset: 40203}, + pos: position{line: 1687, col: 34, offset: 40293}, val: "*", ignoreCase: false, want: "\"*\"", }, }, &ruleRefExpr{ - pos: position{line: 1684, col: 39, offset: 40208}, + pos: position{line: 1687, col: 39, offset: 40298}, name: "KeyWordRest", }, }, @@ -12017,19 +12046,19 @@ var g = &grammar{ }, { name: "GlobHasStar", - pos: position{line: 1685, col: 1, offset: 40220}, + pos: position{line: 1688, col: 1, offset: 40310}, expr: &seqExpr{ - pos: position{line: 1685, col: 15, offset: 40234}, + pos: position{line: 1688, col: 15, offset: 40324}, exprs: []any{ &zeroOrMoreExpr{ - pos: position{line: 1685, col: 15, offset: 40234}, + pos: position{line: 1688, col: 15, offset: 40324}, expr: &ruleRefExpr{ - pos: position{line: 1685, col: 15, offset: 40234}, + pos: position{line: 1688, col: 15, offset: 40324}, name: "KeyWordRest", }, }, &litMatcher{ - pos: position{line: 1685, col: 28, offset: 40247}, + pos: position{line: 1688, col: 28, offset: 40337}, val: "*", ignoreCase: false, want: "\"*\"", @@ -12041,23 +12070,23 @@ var g = &grammar{ }, { name: "GlobStart", - pos: position{line: 1687, col: 1, offset: 40252}, + pos: position{line: 1690, col: 1, offset: 40342}, expr: &choiceExpr{ - pos: position{line: 1688, col: 5, offset: 40266}, + pos: position{line: 1691, col: 5, offset: 40356}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1688, col: 5, offset: 40266}, + pos: position{line: 1691, col: 5, offset: 40356}, name: "KeyWordChars", }, &ruleRefExpr{ - pos: position{line: 1689, col: 5, offset: 40283}, + pos: position{line: 1692, col: 5, offset: 40373}, name: "GlobEsc", }, &actionExpr{ - pos: position{line: 1690, col: 5, offset: 40295}, + pos: position{line: 1693, col: 5, offset: 40385}, run: (*parser).callonGlobStart4, expr: &litMatcher{ - pos: position{line: 1690, col: 5, offset: 40295}, + pos: position{line: 1693, col: 5, offset: 40385}, val: "*", ignoreCase: false, want: "\"*\"", @@ -12070,16 +12099,16 @@ var g = &grammar{ }, { name: "GlobRest", - pos: position{line: 1692, col: 1, offset: 40320}, + pos: position{line: 1695, col: 1, offset: 40410}, expr: &choiceExpr{ - pos: position{line: 1693, col: 5, offset: 40333}, + pos: position{line: 1696, col: 5, offset: 40423}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1693, col: 5, offset: 40333}, + pos: position{line: 1696, col: 5, offset: 40423}, name: "GlobStart", }, &charClassMatcher{ - pos: position{line: 1694, col: 5, offset: 40347}, + pos: position{line: 1697, col: 5, offset: 40437}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -12092,31 +12121,31 @@ var g = &grammar{ }, { name: "GlobEsc", - pos: position{line: 1696, col: 1, offset: 40354}, + pos: position{line: 1699, col: 1, offset: 40444}, expr: &actionExpr{ - pos: position{line: 1696, col: 11, offset: 40364}, + pos: position{line: 1699, col: 11, offset: 40454}, run: (*parser).callonGlobEsc1, expr: &seqExpr{ - pos: position{line: 1696, col: 11, offset: 40364}, + pos: position{line: 1699, col: 11, offset: 40454}, exprs: []any{ &litMatcher{ - pos: position{line: 1696, col: 11, offset: 40364}, + pos: position{line: 1699, col: 11, offset: 40454}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1696, col: 16, offset: 40369}, + pos: position{line: 1699, col: 16, offset: 40459}, label: "s", expr: &choiceExpr{ - pos: position{line: 1696, col: 19, offset: 40372}, + pos: position{line: 1699, col: 19, offset: 40462}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1696, col: 19, offset: 40372}, + pos: position{line: 1699, col: 19, offset: 40462}, name: "GlobEscape", }, &ruleRefExpr{ - pos: position{line: 1696, col: 32, offset: 40385}, + pos: position{line: 1699, col: 32, offset: 40475}, name: "EscapeSequence", }, }, @@ -12130,32 +12159,32 @@ var g = &grammar{ }, { name: "GlobEscape", - pos: position{line: 1698, col: 1, offset: 40420}, + pos: position{line: 1701, col: 1, offset: 40510}, expr: &choiceExpr{ - pos: position{line: 1699, col: 5, offset: 40435}, + pos: position{line: 1702, col: 5, offset: 40525}, alternatives: []any{ &actionExpr{ - pos: position{line: 1699, col: 5, offset: 40435}, + pos: position{line: 1702, col: 5, offset: 40525}, run: (*parser).callonGlobEscape2, expr: &litMatcher{ - pos: position{line: 1699, col: 5, offset: 40435}, + pos: position{line: 1702, col: 5, offset: 40525}, val: "=", ignoreCase: false, want: "\"=\"", }, }, &actionExpr{ - pos: position{line: 1700, col: 5, offset: 40463}, + pos: position{line: 1703, col: 5, offset: 40553}, run: (*parser).callonGlobEscape4, expr: &litMatcher{ - pos: position{line: 1700, col: 5, offset: 40463}, + pos: position{line: 1703, col: 5, offset: 40553}, val: "*", ignoreCase: false, want: "\"*\"", }, }, &charClassMatcher{ - pos: position{line: 1701, col: 5, offset: 40493}, + pos: position{line: 1704, col: 5, offset: 40583}, val: "[+-]", chars: []rune{'+', '-'}, ignoreCase: false, @@ -12168,57 +12197,57 @@ var g = &grammar{ }, { name: "SingleQuotedChar", - pos: position{line: 1703, col: 1, offset: 40499}, + pos: position{line: 1706, col: 1, offset: 40589}, expr: &choiceExpr{ - pos: position{line: 1704, col: 5, offset: 40520}, + pos: position{line: 1707, col: 5, offset: 40610}, alternatives: []any{ &actionExpr{ - pos: position{line: 1704, col: 5, offset: 40520}, + pos: position{line: 1707, col: 5, offset: 40610}, run: (*parser).callonSingleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1704, col: 5, offset: 40520}, + pos: position{line: 1707, col: 5, offset: 40610}, exprs: []any{ ¬Expr{ - pos: position{line: 1704, col: 5, offset: 40520}, + pos: position{line: 1707, col: 5, offset: 40610}, expr: &choiceExpr{ - pos: position{line: 1704, col: 7, offset: 40522}, + pos: position{line: 1707, col: 7, offset: 40612}, alternatives: []any{ &litMatcher{ - pos: position{line: 1704, col: 7, offset: 40522}, + pos: position{line: 1707, col: 7, offset: 40612}, val: "'", ignoreCase: false, want: "\"'\"", }, &ruleRefExpr{ - pos: position{line: 1704, col: 13, offset: 40528}, + pos: position{line: 1707, col: 13, offset: 40618}, name: "EscapedChar", }, }, }, }, &anyMatcher{ - line: 1704, col: 26, offset: 40541, + line: 1707, col: 26, offset: 40631, }, }, }, }, &actionExpr{ - pos: position{line: 1705, col: 5, offset: 40578}, + pos: position{line: 1708, col: 5, offset: 40668}, run: (*parser).callonSingleQuotedChar9, expr: &seqExpr{ - pos: position{line: 1705, col: 5, offset: 40578}, + pos: position{line: 1708, col: 5, offset: 40668}, exprs: []any{ &litMatcher{ - pos: position{line: 1705, col: 5, offset: 40578}, + pos: position{line: 1708, col: 5, offset: 40668}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1705, col: 10, offset: 40583}, + pos: position{line: 1708, col: 10, offset: 40673}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1705, col: 12, offset: 40585}, + pos: position{line: 1708, col: 12, offset: 40675}, name: "EscapeSequence", }, }, @@ -12232,16 +12261,16 @@ var g = &grammar{ }, { name: "EscapeSequence", - pos: position{line: 1707, col: 1, offset: 40619}, + pos: position{line: 1710, col: 1, offset: 40709}, expr: &choiceExpr{ - pos: position{line: 1708, col: 5, offset: 40638}, + pos: position{line: 1711, col: 5, offset: 40728}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1708, col: 5, offset: 40638}, + pos: position{line: 1711, col: 5, offset: 40728}, name: "SingleCharEscape", }, &ruleRefExpr{ - pos: position{line: 1709, col: 5, offset: 40659}, + pos: position{line: 1712, col: 5, offset: 40749}, name: "UnicodeEscape", }, }, @@ -12251,87 +12280,87 @@ var g = &grammar{ }, { name: "SingleCharEscape", - pos: position{line: 1711, col: 1, offset: 40674}, + pos: position{line: 1714, col: 1, offset: 40764}, expr: &choiceExpr{ - pos: position{line: 1712, col: 5, offset: 40695}, + pos: position{line: 1715, col: 5, offset: 40785}, alternatives: []any{ &litMatcher{ - pos: position{line: 1712, col: 5, offset: 40695}, + pos: position{line: 1715, col: 5, offset: 40785}, val: "'", ignoreCase: false, want: "\"'\"", }, &actionExpr{ - pos: position{line: 1713, col: 5, offset: 40703}, + pos: position{line: 1716, col: 5, offset: 40793}, run: (*parser).callonSingleCharEscape3, expr: &litMatcher{ - pos: position{line: 1713, col: 5, offset: 40703}, + pos: position{line: 1716, col: 5, offset: 40793}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, }, &litMatcher{ - pos: position{line: 1714, col: 5, offset: 40743}, + pos: position{line: 1717, col: 5, offset: 40833}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &actionExpr{ - pos: position{line: 1715, col: 5, offset: 40752}, + pos: position{line: 1718, col: 5, offset: 40842}, run: (*parser).callonSingleCharEscape6, expr: &litMatcher{ - pos: position{line: 1715, col: 5, offset: 40752}, + pos: position{line: 1718, col: 5, offset: 40842}, val: "b", ignoreCase: false, want: "\"b\"", }, }, &actionExpr{ - pos: position{line: 1716, col: 5, offset: 40781}, + pos: position{line: 1719, col: 5, offset: 40871}, run: (*parser).callonSingleCharEscape8, expr: &litMatcher{ - pos: position{line: 1716, col: 5, offset: 40781}, + pos: position{line: 1719, col: 5, offset: 40871}, val: "f", ignoreCase: false, want: "\"f\"", }, }, &actionExpr{ - pos: position{line: 1717, col: 5, offset: 40810}, + pos: position{line: 1720, col: 5, offset: 40900}, run: (*parser).callonSingleCharEscape10, expr: &litMatcher{ - pos: position{line: 1717, col: 5, offset: 40810}, + pos: position{line: 1720, col: 5, offset: 40900}, val: "n", ignoreCase: false, want: "\"n\"", }, }, &actionExpr{ - pos: position{line: 1718, col: 5, offset: 40839}, + pos: position{line: 1721, col: 5, offset: 40929}, run: (*parser).callonSingleCharEscape12, expr: &litMatcher{ - pos: position{line: 1718, col: 5, offset: 40839}, + pos: position{line: 1721, col: 5, offset: 40929}, val: "r", ignoreCase: false, want: "\"r\"", }, }, &actionExpr{ - pos: position{line: 1719, col: 5, offset: 40868}, + pos: position{line: 1722, col: 5, offset: 40958}, run: (*parser).callonSingleCharEscape14, expr: &litMatcher{ - pos: position{line: 1719, col: 5, offset: 40868}, + pos: position{line: 1722, col: 5, offset: 40958}, val: "t", ignoreCase: false, want: "\"t\"", }, }, &actionExpr{ - pos: position{line: 1720, col: 5, offset: 40897}, + pos: position{line: 1723, col: 5, offset: 40987}, run: (*parser).callonSingleCharEscape16, expr: &litMatcher{ - pos: position{line: 1720, col: 5, offset: 40897}, + pos: position{line: 1723, col: 5, offset: 40987}, val: "v", ignoreCase: false, want: "\"v\"", @@ -12344,32 +12373,32 @@ var g = &grammar{ }, { name: "KeywordEscape", - pos: position{line: 1722, col: 1, offset: 40923}, + pos: position{line: 1725, col: 1, offset: 41013}, expr: &choiceExpr{ - pos: position{line: 1723, col: 5, offset: 40941}, + pos: position{line: 1726, col: 5, offset: 41031}, alternatives: []any{ &actionExpr{ - pos: position{line: 1723, col: 5, offset: 40941}, + pos: position{line: 1726, col: 5, offset: 41031}, run: (*parser).callonKeywordEscape2, expr: &litMatcher{ - pos: position{line: 1723, col: 5, offset: 40941}, + pos: position{line: 1726, col: 5, offset: 41031}, val: "=", ignoreCase: false, want: "\"=\"", }, }, &actionExpr{ - pos: position{line: 1724, col: 5, offset: 40969}, + pos: position{line: 1727, col: 5, offset: 41059}, run: (*parser).callonKeywordEscape4, expr: &litMatcher{ - pos: position{line: 1724, col: 5, offset: 40969}, + pos: position{line: 1727, col: 5, offset: 41059}, val: "*", ignoreCase: false, want: "\"*\"", }, }, &charClassMatcher{ - pos: position{line: 1725, col: 5, offset: 40997}, + pos: position{line: 1728, col: 5, offset: 41087}, val: "[+-]", chars: []rune{'+', '-'}, ignoreCase: false, @@ -12382,42 +12411,42 @@ var g = &grammar{ }, { name: "UnicodeEscape", - pos: position{line: 1727, col: 1, offset: 41003}, + pos: position{line: 1730, col: 1, offset: 41093}, expr: &choiceExpr{ - pos: position{line: 1728, col: 5, offset: 41021}, + pos: position{line: 1731, col: 5, offset: 41111}, alternatives: []any{ &actionExpr{ - pos: position{line: 1728, col: 5, offset: 41021}, + pos: position{line: 1731, col: 5, offset: 41111}, run: (*parser).callonUnicodeEscape2, expr: &seqExpr{ - pos: position{line: 1728, col: 5, offset: 41021}, + pos: position{line: 1731, col: 5, offset: 41111}, exprs: []any{ &litMatcher{ - pos: position{line: 1728, col: 5, offset: 41021}, + pos: position{line: 1731, col: 5, offset: 41111}, val: "u", ignoreCase: false, want: "\"u\"", }, &labeledExpr{ - pos: position{line: 1728, col: 9, offset: 41025}, + pos: position{line: 1731, col: 9, offset: 41115}, label: "chars", expr: &seqExpr{ - pos: position{line: 1728, col: 16, offset: 41032}, + pos: position{line: 1731, col: 16, offset: 41122}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1728, col: 16, offset: 41032}, + pos: position{line: 1731, col: 16, offset: 41122}, name: "HexDigit", }, &ruleRefExpr{ - pos: position{line: 1728, col: 25, offset: 41041}, + pos: position{line: 1731, col: 25, offset: 41131}, name: "HexDigit", }, &ruleRefExpr{ - pos: position{line: 1728, col: 34, offset: 41050}, + pos: position{line: 1731, col: 34, offset: 41140}, name: "HexDigit", }, &ruleRefExpr{ - pos: position{line: 1728, col: 43, offset: 41059}, + pos: position{line: 1731, col: 43, offset: 41149}, name: "HexDigit", }, }, @@ -12427,65 +12456,65 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1731, col: 5, offset: 41122}, + pos: position{line: 1734, col: 5, offset: 41212}, run: (*parser).callonUnicodeEscape11, expr: &seqExpr{ - pos: position{line: 1731, col: 5, offset: 41122}, + pos: position{line: 1734, col: 5, offset: 41212}, exprs: []any{ &litMatcher{ - pos: position{line: 1731, col: 5, offset: 41122}, + pos: position{line: 1734, col: 5, offset: 41212}, val: "u", ignoreCase: false, want: "\"u\"", }, &litMatcher{ - pos: position{line: 1731, col: 9, offset: 41126}, + pos: position{line: 1734, col: 9, offset: 41216}, val: "{", ignoreCase: false, want: "\"{\"", }, &labeledExpr{ - pos: position{line: 1731, col: 13, offset: 41130}, + pos: position{line: 1734, col: 13, offset: 41220}, label: "chars", expr: &seqExpr{ - pos: position{line: 1731, col: 20, offset: 41137}, + pos: position{line: 1734, col: 20, offset: 41227}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1731, col: 20, offset: 41137}, + pos: position{line: 1734, col: 20, offset: 41227}, name: "HexDigit", }, &zeroOrOneExpr{ - pos: position{line: 1731, col: 29, offset: 41146}, + pos: position{line: 1734, col: 29, offset: 41236}, expr: &ruleRefExpr{ - pos: position{line: 1731, col: 29, offset: 41146}, + pos: position{line: 1734, col: 29, offset: 41236}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1731, col: 39, offset: 41156}, + pos: position{line: 1734, col: 39, offset: 41246}, expr: &ruleRefExpr{ - pos: position{line: 1731, col: 39, offset: 41156}, + pos: position{line: 1734, col: 39, offset: 41246}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1731, col: 49, offset: 41166}, + pos: position{line: 1734, col: 49, offset: 41256}, expr: &ruleRefExpr{ - pos: position{line: 1731, col: 49, offset: 41166}, + pos: position{line: 1734, col: 49, offset: 41256}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1731, col: 59, offset: 41176}, + pos: position{line: 1734, col: 59, offset: 41266}, expr: &ruleRefExpr{ - pos: position{line: 1731, col: 59, offset: 41176}, + pos: position{line: 1734, col: 59, offset: 41266}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1731, col: 69, offset: 41186}, + pos: position{line: 1734, col: 69, offset: 41276}, expr: &ruleRefExpr{ - pos: position{line: 1731, col: 69, offset: 41186}, + pos: position{line: 1734, col: 69, offset: 41276}, name: "HexDigit", }, }, @@ -12493,7 +12522,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1731, col: 80, offset: 41197}, + pos: position{line: 1734, col: 80, offset: 41287}, val: "}", ignoreCase: false, want: "\"}\"", @@ -12508,37 +12537,37 @@ var g = &grammar{ }, { name: "RegexpPattern", - pos: position{line: 1735, col: 1, offset: 41251}, + pos: position{line: 1738, col: 1, offset: 41341}, expr: &actionExpr{ - pos: position{line: 1736, col: 5, offset: 41269}, + pos: position{line: 1739, col: 5, offset: 41359}, run: (*parser).callonRegexpPattern1, expr: &seqExpr{ - pos: position{line: 1736, col: 5, offset: 41269}, + pos: position{line: 1739, col: 5, offset: 41359}, exprs: []any{ &litMatcher{ - pos: position{line: 1736, col: 5, offset: 41269}, + pos: position{line: 1739, col: 5, offset: 41359}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 1736, col: 9, offset: 41273}, + pos: position{line: 1739, col: 9, offset: 41363}, label: "body", expr: &ruleRefExpr{ - pos: position{line: 1736, col: 14, offset: 41278}, + pos: position{line: 1739, col: 14, offset: 41368}, name: "RegexpBody", }, }, &litMatcher{ - pos: position{line: 1736, col: 25, offset: 41289}, + pos: position{line: 1739, col: 25, offset: 41379}, val: "/", ignoreCase: false, want: "\"/\"", }, ¬Expr{ - pos: position{line: 1736, col: 29, offset: 41293}, + pos: position{line: 1739, col: 29, offset: 41383}, expr: &ruleRefExpr{ - pos: position{line: 1736, col: 30, offset: 41294}, + pos: position{line: 1739, col: 30, offset: 41384}, name: "KeyWordStart", }, }, @@ -12550,33 +12579,33 @@ var g = &grammar{ }, { name: "RegexpBody", - pos: position{line: 1738, col: 1, offset: 41329}, + pos: position{line: 1741, col: 1, offset: 41419}, expr: &actionExpr{ - pos: position{line: 1739, col: 5, offset: 41344}, + pos: position{line: 1742, col: 5, offset: 41434}, run: (*parser).callonRegexpBody1, expr: &oneOrMoreExpr{ - pos: position{line: 1739, col: 5, offset: 41344}, + pos: position{line: 1742, col: 5, offset: 41434}, expr: &choiceExpr{ - pos: position{line: 1739, col: 6, offset: 41345}, + pos: position{line: 1742, col: 6, offset: 41435}, alternatives: []any{ &charClassMatcher{ - pos: position{line: 1739, col: 6, offset: 41345}, + pos: position{line: 1742, col: 6, offset: 41435}, val: "[^/\\\\]", chars: []rune{'/', '\\'}, ignoreCase: false, inverted: true, }, &seqExpr{ - pos: position{line: 1739, col: 15, offset: 41354}, + pos: position{line: 1742, col: 15, offset: 41444}, exprs: []any{ &litMatcher{ - pos: position{line: 1739, col: 15, offset: 41354}, + pos: position{line: 1742, col: 15, offset: 41444}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &anyMatcher{ - line: 1739, col: 20, offset: 41359, + line: 1742, col: 20, offset: 41449, }, }, }, @@ -12589,9 +12618,9 @@ var g = &grammar{ }, { name: "EscapedChar", - pos: position{line: 1741, col: 1, offset: 41395}, + pos: position{line: 1744, col: 1, offset: 41485}, expr: &charClassMatcher{ - pos: position{line: 1742, col: 5, offset: 41411}, + pos: position{line: 1745, col: 5, offset: 41501}, val: "[\\x00-\\x1f\\\\]", chars: []rune{'\\'}, ranges: []rune{'\x00', '\x1f'}, @@ -12603,11 +12632,11 @@ var g = &grammar{ }, { name: "_", - pos: position{line: 1744, col: 1, offset: 41426}, + pos: position{line: 1747, col: 1, offset: 41516}, expr: &oneOrMoreExpr{ - pos: position{line: 1744, col: 5, offset: 41430}, + pos: position{line: 1747, col: 5, offset: 41520}, expr: &ruleRefExpr{ - pos: position{line: 1744, col: 5, offset: 41430}, + pos: position{line: 1747, col: 5, offset: 41520}, name: "AnySpace", }, }, @@ -12616,11 +12645,11 @@ var g = &grammar{ }, { name: "__", - pos: position{line: 1746, col: 1, offset: 41441}, + pos: position{line: 1749, col: 1, offset: 41531}, expr: &zeroOrMoreExpr{ - pos: position{line: 1746, col: 6, offset: 41446}, + pos: position{line: 1749, col: 6, offset: 41536}, expr: &ruleRefExpr{ - pos: position{line: 1746, col: 6, offset: 41446}, + pos: position{line: 1749, col: 6, offset: 41536}, name: "AnySpace", }, }, @@ -12629,20 +12658,20 @@ var g = &grammar{ }, { name: "AnySpace", - pos: position{line: 1748, col: 1, offset: 41457}, + pos: position{line: 1751, col: 1, offset: 41547}, expr: &choiceExpr{ - pos: position{line: 1749, col: 5, offset: 41470}, + pos: position{line: 1752, col: 5, offset: 41560}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1749, col: 5, offset: 41470}, + pos: position{line: 1752, col: 5, offset: 41560}, name: "WhiteSpace", }, &ruleRefExpr{ - pos: position{line: 1750, col: 5, offset: 41485}, + pos: position{line: 1753, col: 5, offset: 41575}, name: "LineTerminator", }, &ruleRefExpr{ - pos: position{line: 1751, col: 5, offset: 41504}, + pos: position{line: 1754, col: 5, offset: 41594}, name: "Comment", }, }, @@ -12652,32 +12681,32 @@ var g = &grammar{ }, { name: "UnicodeLetter", - pos: position{line: 1753, col: 1, offset: 41513}, + pos: position{line: 1756, col: 1, offset: 41603}, expr: &choiceExpr{ - pos: position{line: 1754, col: 5, offset: 41531}, + pos: position{line: 1757, col: 5, offset: 41621}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1754, col: 5, offset: 41531}, + pos: position{line: 1757, col: 5, offset: 41621}, name: "Lu", }, &ruleRefExpr{ - pos: position{line: 1755, col: 5, offset: 41538}, + pos: position{line: 1758, col: 5, offset: 41628}, name: "Ll", }, &ruleRefExpr{ - pos: position{line: 1756, col: 5, offset: 41545}, + pos: position{line: 1759, col: 5, offset: 41635}, name: "Lt", }, &ruleRefExpr{ - pos: position{line: 1757, col: 5, offset: 41552}, + pos: position{line: 1760, col: 5, offset: 41642}, name: "Lm", }, &ruleRefExpr{ - pos: position{line: 1758, col: 5, offset: 41559}, + pos: position{line: 1761, col: 5, offset: 41649}, name: "Lo", }, &ruleRefExpr{ - pos: position{line: 1759, col: 5, offset: 41566}, + pos: position{line: 1762, col: 5, offset: 41656}, name: "Nl", }, }, @@ -12687,16 +12716,16 @@ var g = &grammar{ }, { name: "UnicodeCombiningMark", - pos: position{line: 1761, col: 1, offset: 41570}, + pos: position{line: 1764, col: 1, offset: 41660}, expr: &choiceExpr{ - pos: position{line: 1762, col: 5, offset: 41595}, + pos: position{line: 1765, col: 5, offset: 41685}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1762, col: 5, offset: 41595}, + pos: position{line: 1765, col: 5, offset: 41685}, name: "Mn", }, &ruleRefExpr{ - pos: position{line: 1763, col: 5, offset: 41602}, + pos: position{line: 1766, col: 5, offset: 41692}, name: "Mc", }, }, @@ -12706,9 +12735,9 @@ var g = &grammar{ }, { name: "UnicodeDigit", - pos: position{line: 1765, col: 1, offset: 41606}, + pos: position{line: 1768, col: 1, offset: 41696}, expr: &ruleRefExpr{ - pos: position{line: 1766, col: 5, offset: 41623}, + pos: position{line: 1769, col: 5, offset: 41713}, name: "Nd", }, leader: false, @@ -12716,9 +12745,9 @@ var g = &grammar{ }, { name: "UnicodeConnectorPunctuation", - pos: position{line: 1768, col: 1, offset: 41627}, + pos: position{line: 1771, col: 1, offset: 41717}, expr: &ruleRefExpr{ - pos: position{line: 1769, col: 5, offset: 41659}, + pos: position{line: 1772, col: 5, offset: 41749}, name: "Pc", }, leader: false, @@ -12726,9 +12755,9 @@ var g = &grammar{ }, { name: "Ll", - pos: position{line: 1775, col: 1, offset: 41840}, + pos: position{line: 1778, col: 1, offset: 41930}, expr: &charClassMatcher{ - pos: position{line: 1775, col: 6, offset: 41845}, + pos: position{line: 1778, col: 6, offset: 41935}, val: "[\\u0061-\\u007A\\u00B5\\u00DF-\\u00F6\\u00F8-\\u00FF\\u0101\\u0103\\u0105\\u0107\\u0109\\u010B\\u010D\\u010F\\u0111\\u0113\\u0115\\u0117\\u0119\\u011B\\u011D\\u011F\\u0121\\u0123\\u0125\\u0127\\u0129\\u012B\\u012D\\u012F\\u0131\\u0133\\u0135\\u0137-\\u0138\\u013A\\u013C\\u013E\\u0140\\u0142\\u0144\\u0146\\u0148-\\u0149\\u014B\\u014D\\u014F\\u0151\\u0153\\u0155\\u0157\\u0159\\u015B\\u015D\\u015F\\u0161\\u0163\\u0165\\u0167\\u0169\\u016B\\u016D\\u016F\\u0171\\u0173\\u0175\\u0177\\u017A\\u017C\\u017E-\\u0180\\u0183\\u0185\\u0188\\u018C-\\u018D\\u0192\\u0195\\u0199-\\u019B\\u019E\\u01A1\\u01A3\\u01A5\\u01A8\\u01AA-\\u01AB\\u01AD\\u01B0\\u01B4\\u01B6\\u01B9-\\u01BA\\u01BD-\\u01BF\\u01C6\\u01C9\\u01CC\\u01CE\\u01D0\\u01D2\\u01D4\\u01D6\\u01D8\\u01DA\\u01DC-\\u01DD\\u01DF\\u01E1\\u01E3\\u01E5\\u01E7\\u01E9\\u01EB\\u01ED\\u01EF-\\u01F0\\u01F3\\u01F5\\u01F9\\u01FB\\u01FD\\u01FF\\u0201\\u0203\\u0205\\u0207\\u0209\\u020B\\u020D\\u020F\\u0211\\u0213\\u0215\\u0217\\u0219\\u021B\\u021D\\u021F\\u0221\\u0223\\u0225\\u0227\\u0229\\u022B\\u022D\\u022F\\u0231\\u0233-\\u0239\\u023C\\u023F-\\u0240\\u0242\\u0247\\u0249\\u024B\\u024D\\u024F-\\u0293\\u0295-\\u02AF\\u0371\\u0373\\u0377\\u037B-\\u037D\\u0390\\u03AC-\\u03CE\\u03D0-\\u03D1\\u03D5-\\u03D7\\u03D9\\u03DB\\u03DD\\u03DF\\u03E1\\u03E3\\u03E5\\u03E7\\u03E9\\u03EB\\u03ED\\u03EF-\\u03F3\\u03F5\\u03F8\\u03FB-\\u03FC\\u0430-\\u045F\\u0461\\u0463\\u0465\\u0467\\u0469\\u046B\\u046D\\u046F\\u0471\\u0473\\u0475\\u0477\\u0479\\u047B\\u047D\\u047F\\u0481\\u048B\\u048D\\u048F\\u0491\\u0493\\u0495\\u0497\\u0499\\u049B\\u049D\\u049F\\u04A1\\u04A3\\u04A5\\u04A7\\u04A9\\u04AB\\u04AD\\u04AF\\u04B1\\u04B3\\u04B5\\u04B7\\u04B9\\u04BB\\u04BD\\u04BF\\u04C2\\u04C4\\u04C6\\u04C8\\u04CA\\u04CC\\u04CE-\\u04CF\\u04D1\\u04D3\\u04D5\\u04D7\\u04D9\\u04DB\\u04DD\\u04DF\\u04E1\\u04E3\\u04E5\\u04E7\\u04E9\\u04EB\\u04ED\\u04EF\\u04F1\\u04F3\\u04F5\\u04F7\\u04F9\\u04FB\\u04FD\\u04FF\\u0501\\u0503\\u0505\\u0507\\u0509\\u050B\\u050D\\u050F\\u0511\\u0513\\u0515\\u0517\\u0519\\u051B\\u051D\\u051F\\u0521\\u0523\\u0525\\u0527\\u0529\\u052B\\u052D\\u052F\\u0560-\\u0588\\u10D0-\\u10FA\\u10FD-\\u10FF\\u13F8-\\u13FD\\u1C80-\\u1C88\\u1D00-\\u1D2B\\u1D6B-\\u1D77\\u1D79-\\u1D9A\\u1E01\\u1E03\\u1E05\\u1E07\\u1E09\\u1E0B\\u1E0D\\u1E0F\\u1E11\\u1E13\\u1E15\\u1E17\\u1E19\\u1E1B\\u1E1D\\u1E1F\\u1E21\\u1E23\\u1E25\\u1E27\\u1E29\\u1E2B\\u1E2D\\u1E2F\\u1E31\\u1E33\\u1E35\\u1E37\\u1E39\\u1E3B\\u1E3D\\u1E3F\\u1E41\\u1E43\\u1E45\\u1E47\\u1E49\\u1E4B\\u1E4D\\u1E4F\\u1E51\\u1E53\\u1E55\\u1E57\\u1E59\\u1E5B\\u1E5D\\u1E5F\\u1E61\\u1E63\\u1E65\\u1E67\\u1E69\\u1E6B\\u1E6D\\u1E6F\\u1E71\\u1E73\\u1E75\\u1E77\\u1E79\\u1E7B\\u1E7D\\u1E7F\\u1E81\\u1E83\\u1E85\\u1E87\\u1E89\\u1E8B\\u1E8D\\u1E8F\\u1E91\\u1E93\\u1E95-\\u1E9D\\u1E9F\\u1EA1\\u1EA3\\u1EA5\\u1EA7\\u1EA9\\u1EAB\\u1EAD\\u1EAF\\u1EB1\\u1EB3\\u1EB5\\u1EB7\\u1EB9\\u1EBB\\u1EBD\\u1EBF\\u1EC1\\u1EC3\\u1EC5\\u1EC7\\u1EC9\\u1ECB\\u1ECD\\u1ECF\\u1ED1\\u1ED3\\u1ED5\\u1ED7\\u1ED9\\u1EDB\\u1EDD\\u1EDF\\u1EE1\\u1EE3\\u1EE5\\u1EE7\\u1EE9\\u1EEB\\u1EED\\u1EEF\\u1EF1\\u1EF3\\u1EF5\\u1EF7\\u1EF9\\u1EFB\\u1EFD\\u1EFF-\\u1F07\\u1F10-\\u1F15\\u1F20-\\u1F27\\u1F30-\\u1F37\\u1F40-\\u1F45\\u1F50-\\u1F57\\u1F60-\\u1F67\\u1F70-\\u1F7D\\u1F80-\\u1F87\\u1F90-\\u1F97\\u1FA0-\\u1FA7\\u1FB0-\\u1FB4\\u1FB6-\\u1FB7\\u1FBE\\u1FC2-\\u1FC4\\u1FC6-\\u1FC7\\u1FD0-\\u1FD3\\u1FD6-\\u1FD7\\u1FE0-\\u1FE7\\u1FF2-\\u1FF4\\u1FF6-\\u1FF7\\u210A\\u210E-\\u210F\\u2113\\u212F\\u2134\\u2139\\u213C-\\u213D\\u2146-\\u2149\\u214E\\u2184\\u2C30-\\u2C5E\\u2C61\\u2C65-\\u2C66\\u2C68\\u2C6A\\u2C6C\\u2C71\\u2C73-\\u2C74\\u2C76-\\u2C7B\\u2C81\\u2C83\\u2C85\\u2C87\\u2C89\\u2C8B\\u2C8D\\u2C8F\\u2C91\\u2C93\\u2C95\\u2C97\\u2C99\\u2C9B\\u2C9D\\u2C9F\\u2CA1\\u2CA3\\u2CA5\\u2CA7\\u2CA9\\u2CAB\\u2CAD\\u2CAF\\u2CB1\\u2CB3\\u2CB5\\u2CB7\\u2CB9\\u2CBB\\u2CBD\\u2CBF\\u2CC1\\u2CC3\\u2CC5\\u2CC7\\u2CC9\\u2CCB\\u2CCD\\u2CCF\\u2CD1\\u2CD3\\u2CD5\\u2CD7\\u2CD9\\u2CDB\\u2CDD\\u2CDF\\u2CE1\\u2CE3-\\u2CE4\\u2CEC\\u2CEE\\u2CF3\\u2D00-\\u2D25\\u2D27\\u2D2D\\uA641\\uA643\\uA645\\uA647\\uA649\\uA64B\\uA64D\\uA64F\\uA651\\uA653\\uA655\\uA657\\uA659\\uA65B\\uA65D\\uA65F\\uA661\\uA663\\uA665\\uA667\\uA669\\uA66B\\uA66D\\uA681\\uA683\\uA685\\uA687\\uA689\\uA68B\\uA68D\\uA68F\\uA691\\uA693\\uA695\\uA697\\uA699\\uA69B\\uA723\\uA725\\uA727\\uA729\\uA72B\\uA72D\\uA72F-\\uA731\\uA733\\uA735\\uA737\\uA739\\uA73B\\uA73D\\uA73F\\uA741\\uA743\\uA745\\uA747\\uA749\\uA74B\\uA74D\\uA74F\\uA751\\uA753\\uA755\\uA757\\uA759\\uA75B\\uA75D\\uA75F\\uA761\\uA763\\uA765\\uA767\\uA769\\uA76B\\uA76D\\uA76F\\uA771-\\uA778\\uA77A\\uA77C\\uA77F\\uA781\\uA783\\uA785\\uA787\\uA78C\\uA78E\\uA791\\uA793-\\uA795\\uA797\\uA799\\uA79B\\uA79D\\uA79F\\uA7A1\\uA7A3\\uA7A5\\uA7A7\\uA7A9\\uA7AF\\uA7B5\\uA7B7\\uA7B9\\uA7FA\\uAB30-\\uAB5A\\uAB60-\\uAB65\\uAB70-\\uABBF\\uFB00-\\uFB06\\uFB13-\\uFB17\\uFF41-\\uFF5A]", chars: []rune{'µ', 'ā', 'ă', 'ą', 'ć', 'ĉ', 'ċ', 'č', 'ď', 'đ', 'ē', 'ĕ', 'ė', 'ę', 'ě', 'ĝ', 'ğ', 'ġ', 'ģ', 'ĥ', 'ħ', 'ĩ', 'ī', 'ĭ', 'į', 'ı', 'ij', 'ĵ', 'ĺ', 'ļ', 'ľ', 'ŀ', 'ł', 'ń', 'ņ', 'ŋ', 'ō', 'ŏ', 'ő', 'œ', 'ŕ', 'ŗ', 'ř', 'ś', 'ŝ', 'ş', 'š', 'ţ', 'ť', 'ŧ', 'ũ', 'ū', 'ŭ', 'ů', 'ű', 'ų', 'ŵ', 'ŷ', 'ź', 'ż', 'ƃ', 'ƅ', 'ƈ', 'ƒ', 'ƕ', 'ƞ', 'ơ', 'ƣ', 'ƥ', 'ƨ', 'ƭ', 'ư', 'ƴ', 'ƶ', 'dž', 'lj', 'nj', 'ǎ', 'ǐ', 'ǒ', 'ǔ', 'ǖ', 'ǘ', 'ǚ', 'ǟ', 'ǡ', 'ǣ', 'ǥ', 'ǧ', 'ǩ', 'ǫ', 'ǭ', 'dz', 'ǵ', 'ǹ', 'ǻ', 'ǽ', 'ǿ', 'ȁ', 'ȃ', 'ȅ', 'ȇ', 'ȉ', 'ȋ', 'ȍ', 'ȏ', 'ȑ', 'ȓ', 'ȕ', 'ȗ', 'ș', 'ț', 'ȝ', 'ȟ', 'ȡ', 'ȣ', 'ȥ', 'ȧ', 'ȩ', 'ȫ', 'ȭ', 'ȯ', 'ȱ', 'ȼ', 'ɂ', 'ɇ', 'ɉ', 'ɋ', 'ɍ', 'ͱ', 'ͳ', 'ͷ', 'ΐ', 'ϙ', 'ϛ', 'ϝ', 'ϟ', 'ϡ', 'ϣ', 'ϥ', 'ϧ', 'ϩ', 'ϫ', 'ϭ', 'ϵ', 'ϸ', 'ѡ', 'ѣ', 'ѥ', 'ѧ', 'ѩ', 'ѫ', 'ѭ', 'ѯ', 'ѱ', 'ѳ', 'ѵ', 'ѷ', 'ѹ', 'ѻ', 'ѽ', 'ѿ', 'ҁ', 'ҋ', 'ҍ', 'ҏ', 'ґ', 'ғ', 'ҕ', 'җ', 'ҙ', 'қ', 'ҝ', 'ҟ', 'ҡ', 'ң', 'ҥ', 'ҧ', 'ҩ', 'ҫ', 'ҭ', 'ү', 'ұ', 'ҳ', 'ҵ', 'ҷ', 'ҹ', 'һ', 'ҽ', 'ҿ', 'ӂ', 'ӄ', 'ӆ', 'ӈ', 'ӊ', 'ӌ', 'ӑ', 'ӓ', 'ӕ', 'ӗ', 'ә', 'ӛ', 'ӝ', 'ӟ', 'ӡ', 'ӣ', 'ӥ', 'ӧ', 'ө', 'ӫ', 'ӭ', 'ӯ', 'ӱ', 'ӳ', 'ӵ', 'ӷ', 'ӹ', 'ӻ', 'ӽ', 'ӿ', 'ԁ', 'ԃ', 'ԅ', 'ԇ', 'ԉ', 'ԋ', 'ԍ', 'ԏ', 'ԑ', 'ԓ', 'ԕ', 'ԗ', 'ԙ', 'ԛ', 'ԝ', 'ԟ', 'ԡ', 'ԣ', 'ԥ', 'ԧ', 'ԩ', 'ԫ', 'ԭ', 'ԯ', 'ḁ', 'ḃ', 'ḅ', 'ḇ', 'ḉ', 'ḋ', 'ḍ', 'ḏ', 'ḑ', 'ḓ', 'ḕ', 'ḗ', 'ḙ', 'ḛ', 'ḝ', 'ḟ', 'ḡ', 'ḣ', 'ḥ', 'ḧ', 'ḩ', 'ḫ', 'ḭ', 'ḯ', 'ḱ', 'ḳ', 'ḵ', 'ḷ', 'ḹ', 'ḻ', 'ḽ', 'ḿ', 'ṁ', 'ṃ', 'ṅ', 'ṇ', 'ṉ', 'ṋ', 'ṍ', 'ṏ', 'ṑ', 'ṓ', 'ṕ', 'ṗ', 'ṙ', 'ṛ', 'ṝ', 'ṟ', 'ṡ', 'ṣ', 'ṥ', 'ṧ', 'ṩ', 'ṫ', 'ṭ', 'ṯ', 'ṱ', 'ṳ', 'ṵ', 'ṷ', 'ṹ', 'ṻ', 'ṽ', 'ṿ', 'ẁ', 'ẃ', 'ẅ', 'ẇ', 'ẉ', 'ẋ', 'ẍ', 'ẏ', 'ẑ', 'ẓ', 'ẟ', 'ạ', 'ả', 'ấ', 'ầ', 'ẩ', 'ẫ', 'ậ', 'ắ', 'ằ', 'ẳ', 'ẵ', 'ặ', 'ẹ', 'ẻ', 'ẽ', 'ế', 'ề', 'ể', 'ễ', 'ệ', 'ỉ', 'ị', 'ọ', 'ỏ', 'ố', 'ồ', 'ổ', 'ỗ', 'ộ', 'ớ', 'ờ', 'ở', 'ỡ', 'ợ', 'ụ', 'ủ', 'ứ', 'ừ', 'ử', 'ữ', 'ự', 'ỳ', 'ỵ', 'ỷ', 'ỹ', 'ỻ', 'ỽ', 'ι', 'ℊ', 'ℓ', 'ℯ', 'ℴ', 'ℹ', 'ⅎ', 'ↄ', 'ⱡ', 'ⱨ', 'ⱪ', 'ⱬ', 'ⱱ', 'ⲁ', 'ⲃ', 'ⲅ', 'ⲇ', 'ⲉ', 'ⲋ', 'ⲍ', 'ⲏ', 'ⲑ', 'ⲓ', 'ⲕ', 'ⲗ', 'ⲙ', 'ⲛ', 'ⲝ', 'ⲟ', 'ⲡ', 'ⲣ', 'ⲥ', 'ⲧ', 'ⲩ', 'ⲫ', 'ⲭ', 'ⲯ', 'ⲱ', 'ⲳ', 'ⲵ', 'ⲷ', 'ⲹ', 'ⲻ', 'ⲽ', 'ⲿ', 'ⳁ', 'ⳃ', 'ⳅ', 'ⳇ', 'ⳉ', 'ⳋ', 'ⳍ', 'ⳏ', 'ⳑ', 'ⳓ', 'ⳕ', 'ⳗ', 'ⳙ', 'ⳛ', 'ⳝ', 'ⳟ', 'ⳡ', 'ⳬ', 'ⳮ', 'ⳳ', 'ⴧ', 'ⴭ', 'ꙁ', 'ꙃ', 'ꙅ', 'ꙇ', 'ꙉ', 'ꙋ', 'ꙍ', 'ꙏ', 'ꙑ', 'ꙓ', 'ꙕ', 'ꙗ', 'ꙙ', 'ꙛ', 'ꙝ', 'ꙟ', 'ꙡ', 'ꙣ', 'ꙥ', 'ꙧ', 'ꙩ', 'ꙫ', 'ꙭ', 'ꚁ', 'ꚃ', 'ꚅ', 'ꚇ', 'ꚉ', 'ꚋ', 'ꚍ', 'ꚏ', 'ꚑ', 'ꚓ', 'ꚕ', 'ꚗ', 'ꚙ', 'ꚛ', 'ꜣ', 'ꜥ', 'ꜧ', 'ꜩ', 'ꜫ', 'ꜭ', 'ꜳ', 'ꜵ', 'ꜷ', 'ꜹ', 'ꜻ', 'ꜽ', 'ꜿ', 'ꝁ', 'ꝃ', 'ꝅ', 'ꝇ', 'ꝉ', 'ꝋ', 'ꝍ', 'ꝏ', 'ꝑ', 'ꝓ', 'ꝕ', 'ꝗ', 'ꝙ', 'ꝛ', 'ꝝ', 'ꝟ', 'ꝡ', 'ꝣ', 'ꝥ', 'ꝧ', 'ꝩ', 'ꝫ', 'ꝭ', 'ꝯ', 'ꝺ', 'ꝼ', 'ꝿ', 'ꞁ', 'ꞃ', 'ꞅ', 'ꞇ', 'ꞌ', 'ꞎ', 'ꞑ', 'ꞗ', 'ꞙ', 'ꞛ', 'ꞝ', 'ꞟ', 'ꞡ', 'ꞣ', 'ꞥ', 'ꞧ', 'ꞩ', 'ꞯ', 'ꞵ', 'ꞷ', 'ꞹ', 'ꟺ'}, ranges: []rune{'a', 'z', 'ß', 'ö', 'ø', 'ÿ', 'ķ', 'ĸ', 'ň', 'ʼn', 'ž', 'ƀ', 'ƌ', 'ƍ', 'ƙ', 'ƛ', 'ƪ', 'ƫ', 'ƹ', 'ƺ', 'ƽ', 'ƿ', 'ǜ', 'ǝ', 'ǯ', 'ǰ', 'ȳ', 'ȹ', 'ȿ', 'ɀ', 'ɏ', 'ʓ', 'ʕ', 'ʯ', 'ͻ', 'ͽ', 'ά', 'ώ', 'ϐ', 'ϑ', 'ϕ', 'ϗ', 'ϯ', 'ϳ', 'ϻ', 'ϼ', 'а', 'џ', 'ӎ', 'ӏ', 'ՠ', 'ֈ', 'ა', 'ჺ', 'ჽ', 'ჿ', 'ᏸ', 'ᏽ', 'ᲀ', 'ᲈ', 'ᴀ', 'ᴫ', 'ᵫ', 'ᵷ', 'ᵹ', 'ᶚ', 'ẕ', 'ẝ', 'ỿ', 'ἇ', 'ἐ', 'ἕ', 'ἠ', 'ἧ', 'ἰ', 'ἷ', 'ὀ', 'ὅ', 'ὐ', 'ὗ', 'ὠ', 'ὧ', 'ὰ', 'ώ', 'ᾀ', 'ᾇ', 'ᾐ', 'ᾗ', 'ᾠ', 'ᾧ', 'ᾰ', 'ᾴ', 'ᾶ', 'ᾷ', 'ῂ', 'ῄ', 'ῆ', 'ῇ', 'ῐ', 'ΐ', 'ῖ', 'ῗ', 'ῠ', 'ῧ', 'ῲ', 'ῴ', 'ῶ', 'ῷ', 'ℎ', 'ℏ', 'ℼ', 'ℽ', 'ⅆ', 'ⅉ', 'ⰰ', 'ⱞ', 'ⱥ', 'ⱦ', 'ⱳ', 'ⱴ', 'ⱶ', 'ⱻ', 'ⳣ', 'ⳤ', 'ⴀ', 'ⴥ', 'ꜯ', 'ꜱ', 'ꝱ', 'ꝸ', 'ꞓ', 'ꞕ', 'ꬰ', 'ꭚ', 'ꭠ', 'ꭥ', 'ꭰ', 'ꮿ', 'ff', 'st', 'ﬓ', 'ﬗ', 'ａ', 'ｚ'}, @@ -12740,9 +12769,9 @@ var g = &grammar{ }, { name: "Lm", - pos: position{line: 1778, col: 1, offset: 45997}, + pos: position{line: 1781, col: 1, offset: 46087}, expr: &charClassMatcher{ - pos: position{line: 1778, col: 6, offset: 46002}, + pos: position{line: 1781, col: 6, offset: 46092}, val: "[\\u02B0-\\u02C1\\u02C6-\\u02D1\\u02E0-\\u02E4\\u02EC\\u02EE\\u0374\\u037A\\u0559\\u0640\\u06E5-\\u06E6\\u07F4-\\u07F5\\u07FA\\u081A\\u0824\\u0828\\u0971\\u0E46\\u0EC6\\u10FC\\u17D7\\u1843\\u1AA7\\u1C78-\\u1C7D\\u1D2C-\\u1D6A\\u1D78\\u1D9B-\\u1DBF\\u2071\\u207F\\u2090-\\u209C\\u2C7C-\\u2C7D\\u2D6F\\u2E2F\\u3005\\u3031-\\u3035\\u303B\\u309D-\\u309E\\u30FC-\\u30FE\\uA015\\uA4F8-\\uA4FD\\uA60C\\uA67F\\uA69C-\\uA69D\\uA717-\\uA71F\\uA770\\uA788\\uA7F8-\\uA7F9\\uA9CF\\uA9E6\\uAA70\\uAADD\\uAAF3-\\uAAF4\\uAB5C-\\uAB5F\\uFF70\\uFF9E-\\uFF9F]", chars: []rune{'ˬ', 'ˮ', 'ʹ', 'ͺ', 'ՙ', 'ـ', 'ߺ', 'ࠚ', 'ࠤ', 'ࠨ', 'ॱ', 'ๆ', 'ໆ', 'ჼ', 'ៗ', 'ᡃ', 'ᪧ', 'ᵸ', 'ⁱ', 'ⁿ', 'ⵯ', 'ⸯ', '々', '〻', 'ꀕ', 'ꘌ', 'ꙿ', 'ꝰ', 'ꞈ', 'ꧏ', 'ꧦ', 'ꩰ', 'ꫝ', 'ｰ'}, ranges: []rune{'ʰ', 'ˁ', 'ˆ', 'ˑ', 'ˠ', 'ˤ', 'ۥ', 'ۦ', 'ߴ', 'ߵ', 'ᱸ', 'ᱽ', 'ᴬ', 'ᵪ', 'ᶛ', 'ᶿ', 'ₐ', 'ₜ', 'ⱼ', 'ⱽ', '〱', '〵', 'ゝ', 'ゞ', 'ー', 'ヾ', 'ꓸ', 'ꓽ', 'ꚜ', 'ꚝ', 'ꜗ', 'ꜟ', 'ꟸ', 'ꟹ', 'ꫳ', 'ꫴ', 'ꭜ', 'ꭟ', 'ﾞ', 'ﾟ'}, @@ -12754,9 +12783,9 @@ var g = &grammar{ }, { name: "Lo", - pos: position{line: 1781, col: 1, offset: 46487}, + pos: position{line: 1784, col: 1, offset: 46577}, expr: &charClassMatcher{ - pos: position{line: 1781, col: 6, offset: 46492}, + pos: position{line: 1784, col: 6, offset: 46582}, val: "[\\u00AA\\u00BA\\u01BB\\u01C0-\\u01C3\\u0294\\u05D0-\\u05EA\\u05EF-\\u05F2\\u0620-\\u063F\\u0641-\\u064A\\u066E-\\u066F\\u0671-\\u06D3\\u06D5\\u06EE-\\u06EF\\u06FA-\\u06FC\\u06FF\\u0710\\u0712-\\u072F\\u074D-\\u07A5\\u07B1\\u07CA-\\u07EA\\u0800-\\u0815\\u0840-\\u0858\\u0860-\\u086A\\u08A0-\\u08B4\\u08B6-\\u08BD\\u0904-\\u0939\\u093D\\u0950\\u0958-\\u0961\\u0972-\\u0980\\u0985-\\u098C\\u098F-\\u0990\\u0993-\\u09A8\\u09AA-\\u09B0\\u09B2\\u09B6-\\u09B9\\u09BD\\u09CE\\u09DC-\\u09DD\\u09DF-\\u09E1\\u09F0-\\u09F1\\u09FC\\u0A05-\\u0A0A\\u0A0F-\\u0A10\\u0A13-\\u0A28\\u0A2A-\\u0A30\\u0A32-\\u0A33\\u0A35-\\u0A36\\u0A38-\\u0A39\\u0A59-\\u0A5C\\u0A5E\\u0A72-\\u0A74\\u0A85-\\u0A8D\\u0A8F-\\u0A91\\u0A93-\\u0AA8\\u0AAA-\\u0AB0\\u0AB2-\\u0AB3\\u0AB5-\\u0AB9\\u0ABD\\u0AD0\\u0AE0-\\u0AE1\\u0AF9\\u0B05-\\u0B0C\\u0B0F-\\u0B10\\u0B13-\\u0B28\\u0B2A-\\u0B30\\u0B32-\\u0B33\\u0B35-\\u0B39\\u0B3D\\u0B5C-\\u0B5D\\u0B5F-\\u0B61\\u0B71\\u0B83\\u0B85-\\u0B8A\\u0B8E-\\u0B90\\u0B92-\\u0B95\\u0B99-\\u0B9A\\u0B9C\\u0B9E-\\u0B9F\\u0BA3-\\u0BA4\\u0BA8-\\u0BAA\\u0BAE-\\u0BB9\\u0BD0\\u0C05-\\u0C0C\\u0C0E-\\u0C10\\u0C12-\\u0C28\\u0C2A-\\u0C39\\u0C3D\\u0C58-\\u0C5A\\u0C60-\\u0C61\\u0C80\\u0C85-\\u0C8C\\u0C8E-\\u0C90\\u0C92-\\u0CA8\\u0CAA-\\u0CB3\\u0CB5-\\u0CB9\\u0CBD\\u0CDE\\u0CE0-\\u0CE1\\u0CF1-\\u0CF2\\u0D05-\\u0D0C\\u0D0E-\\u0D10\\u0D12-\\u0D3A\\u0D3D\\u0D4E\\u0D54-\\u0D56\\u0D5F-\\u0D61\\u0D7A-\\u0D7F\\u0D85-\\u0D96\\u0D9A-\\u0DB1\\u0DB3-\\u0DBB\\u0DBD\\u0DC0-\\u0DC6\\u0E01-\\u0E30\\u0E32-\\u0E33\\u0E40-\\u0E45\\u0E81-\\u0E82\\u0E84\\u0E87-\\u0E88\\u0E8A\\u0E8D\\u0E94-\\u0E97\\u0E99-\\u0E9F\\u0EA1-\\u0EA3\\u0EA5\\u0EA7\\u0EAA-\\u0EAB\\u0EAD-\\u0EB0\\u0EB2-\\u0EB3\\u0EBD\\u0EC0-\\u0EC4\\u0EDC-\\u0EDF\\u0F00\\u0F40-\\u0F47\\u0F49-\\u0F6C\\u0F88-\\u0F8C\\u1000-\\u102A\\u103F\\u1050-\\u1055\\u105A-\\u105D\\u1061\\u1065-\\u1066\\u106E-\\u1070\\u1075-\\u1081\\u108E\\u1100-\\u1248\\u124A-\\u124D\\u1250-\\u1256\\u1258\\u125A-\\u125D\\u1260-\\u1288\\u128A-\\u128D\\u1290-\\u12B0\\u12B2-\\u12B5\\u12B8-\\u12BE\\u12C0\\u12C2-\\u12C5\\u12C8-\\u12D6\\u12D8-\\u1310\\u1312-\\u1315\\u1318-\\u135A\\u1380-\\u138F\\u1401-\\u166C\\u166F-\\u167F\\u1681-\\u169A\\u16A0-\\u16EA\\u16F1-\\u16F8\\u1700-\\u170C\\u170E-\\u1711\\u1720-\\u1731\\u1740-\\u1751\\u1760-\\u176C\\u176E-\\u1770\\u1780-\\u17B3\\u17DC\\u1820-\\u1842\\u1844-\\u1878\\u1880-\\u1884\\u1887-\\u18A8\\u18AA\\u18B0-\\u18F5\\u1900-\\u191E\\u1950-\\u196D\\u1970-\\u1974\\u1980-\\u19AB\\u19B0-\\u19C9\\u1A00-\\u1A16\\u1A20-\\u1A54\\u1B05-\\u1B33\\u1B45-\\u1B4B\\u1B83-\\u1BA0\\u1BAE-\\u1BAF\\u1BBA-\\u1BE5\\u1C00-\\u1C23\\u1C4D-\\u1C4F\\u1C5A-\\u1C77\\u1CE9-\\u1CEC\\u1CEE-\\u1CF1\\u1CF5-\\u1CF6\\u2135-\\u2138\\u2D30-\\u2D67\\u2D80-\\u2D96\\u2DA0-\\u2DA6\\u2DA8-\\u2DAE\\u2DB0-\\u2DB6\\u2DB8-\\u2DBE\\u2DC0-\\u2DC6\\u2DC8-\\u2DCE\\u2DD0-\\u2DD6\\u2DD8-\\u2DDE\\u3006\\u303C\\u3041-\\u3096\\u309F\\u30A1-\\u30FA\\u30FF\\u3105-\\u312F\\u3131-\\u318E\\u31A0-\\u31BA\\u31F0-\\u31FF\\u3400-\\u4DB5\\u4E00-\\u9FEF\\uA000-\\uA014\\uA016-\\uA48C\\uA4D0-\\uA4F7\\uA500-\\uA60B\\uA610-\\uA61F\\uA62A-\\uA62B\\uA66E\\uA6A0-\\uA6E5\\uA78F\\uA7F7\\uA7FB-\\uA801\\uA803-\\uA805\\uA807-\\uA80A\\uA80C-\\uA822\\uA840-\\uA873\\uA882-\\uA8B3\\uA8F2-\\uA8F7\\uA8FB\\uA8FD-\\uA8FE\\uA90A-\\uA925\\uA930-\\uA946\\uA960-\\uA97C\\uA984-\\uA9B2\\uA9E0-\\uA9E4\\uA9E7-\\uA9EF\\uA9FA-\\uA9FE\\uAA00-\\uAA28\\uAA40-\\uAA42\\uAA44-\\uAA4B\\uAA60-\\uAA6F\\uAA71-\\uAA76\\uAA7A\\uAA7E-\\uAAAF\\uAAB1\\uAAB5-\\uAAB6\\uAAB9-\\uAABD\\uAAC0\\uAAC2\\uAADB-\\uAADC\\uAAE0-\\uAAEA\\uAAF2\\uAB01-\\uAB06\\uAB09-\\uAB0E\\uAB11-\\uAB16\\uAB20-\\uAB26\\uAB28-\\uAB2E\\uABC0-\\uABE2\\uAC00-\\uD7A3\\uD7B0-\\uD7C6\\uD7CB-\\uD7FB\\uF900-\\uFA6D\\uFA70-\\uFAD9\\uFB1D\\uFB1F-\\uFB28\\uFB2A-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40-\\uFB41\\uFB43-\\uFB44\\uFB46-\\uFBB1\\uFBD3-\\uFD3D\\uFD50-\\uFD8F\\uFD92-\\uFDC7\\uFDF0-\\uFDFB\\uFE70-\\uFE74\\uFE76-\\uFEFC\\uFF66-\\uFF6F\\uFF71-\\uFF9D\\uFFA0-\\uFFBE\\uFFC2-\\uFFC7\\uFFCA-\\uFFCF\\uFFD2-\\uFFD7\\uFFDA-\\uFFDC]", chars: []rune{'ª', 'º', 'ƻ', 'ʔ', 'ە', 'ۿ', 'ܐ', 'ޱ', 'ऽ', 'ॐ', 'ল', 'ঽ', 'ৎ', 'ৼ', 'ਫ਼', 'ઽ', 'ૐ', 'ૹ', 'ଽ', 'ୱ', 'ஃ', 'ஜ', 'ௐ', 'ఽ', 'ಀ', 'ಽ', 'ೞ', 'ഽ', 'ൎ', 'ල', 'ຄ', 'ຊ', 'ຍ', 'ລ', 'ວ', 'ຽ', 'ༀ', 'ဿ', 'ၡ', 'ႎ', 'ቘ', 'ዀ', 'ៜ', 'ᢪ', '〆', '〼', 'ゟ', 'ヿ', 'ꙮ', 'ꞏ', 'ꟷ', 'ꣻ', 'ꩺ', 'ꪱ', 'ꫀ', 'ꫂ', 'ꫲ', 'יִ', 'מּ'}, ranges: []rune{'ǀ', 'ǃ', 'א', 'ת', 'ׯ', 'ײ', 'ؠ', 'ؿ', 'ف', 'ي', 'ٮ', 'ٯ', 'ٱ', 'ۓ', 'ۮ', 'ۯ', 'ۺ', 'ۼ', 'ܒ', 'ܯ', 'ݍ', 'ޥ', 'ߊ', 'ߪ', 'ࠀ', 'ࠕ', 'ࡀ', 'ࡘ', 'ࡠ', 'ࡪ', 'ࢠ', 'ࢴ', 'ࢶ', 'ࢽ', 'ऄ', 'ह', 'क़', 'ॡ', 'ॲ', 'ঀ', 'অ', 'ঌ', 'এ', 'ঐ', 'ও', 'ন', 'প', 'র', 'শ', 'হ', 'ড়', 'ঢ়', 'য়', 'ৡ', 'ৰ', 'ৱ', 'ਅ', 'ਊ', 'ਏ', 'ਐ', 'ਓ', 'ਨ', 'ਪ', 'ਰ', 'ਲ', 'ਲ਼', 'ਵ', 'ਸ਼', 'ਸ', 'ਹ', 'ਖ਼', 'ੜ', 'ੲ', 'ੴ', 'અ', 'ઍ', 'એ', 'ઑ', 'ઓ', 'ન', 'પ', 'ર', 'લ', 'ળ', 'વ', 'હ', 'ૠ', 'ૡ', 'ଅ', 'ଌ', 'ଏ', 'ଐ', 'ଓ', 'ନ', 'ପ', 'ର', 'ଲ', 'ଳ', 'ଵ', 'ହ', 'ଡ଼', 'ଢ଼', 'ୟ', 'ୡ', 'அ', 'ஊ', 'எ', 'ஐ', 'ஒ', 'க', 'ங', 'ச', 'ஞ', 'ட', 'ண', 'த', 'ந', 'ப', 'ம', 'ஹ', 'అ', 'ఌ', 'ఎ', 'ఐ', 'ఒ', 'న', 'ప', 'హ', 'ౘ', 'ౚ', 'ౠ', 'ౡ', 'ಅ', 'ಌ', 'ಎ', 'ಐ', 'ಒ', 'ನ', 'ಪ', 'ಳ', 'ವ', 'ಹ', 'ೠ', 'ೡ', 'ೱ', 'ೲ', 'അ', 'ഌ', 'എ', 'ഐ', 'ഒ', 'ഺ', 'ൔ', 'ൖ', 'ൟ', 'ൡ', 'ൺ', 'ൿ', 'අ', 'ඖ', 'ක', 'න', 'ඳ', 'ර', 'ව', 'ෆ', 'ก', 'ะ', 'า', 'ำ', 'เ', 'ๅ', 'ກ', 'ຂ', 'ງ', 'ຈ', 'ດ', 'ທ', 'ນ', 'ຟ', 'ມ', 'ຣ', 'ສ', 'ຫ', 'ອ', 'ະ', 'າ', 'ຳ', 'ເ', 'ໄ', 'ໜ', 'ໟ', 'ཀ', 'ཇ', 'ཉ', 'ཬ', 'ྈ', 'ྌ', 'က', 'ဪ', 'ၐ', 'ၕ', 'ၚ', 'ၝ', 'ၥ', 'ၦ', 'ၮ', 'ၰ', 'ၵ', 'ႁ', 'ᄀ', 'ቈ', 'ቊ', 'ቍ', 'ቐ', 'ቖ', 'ቚ', 'ቝ', 'በ', 'ኈ', 'ኊ', 'ኍ', 'ነ', 'ኰ', 'ኲ', 'ኵ', 'ኸ', 'ኾ', 'ዂ', 'ዅ', 'ወ', 'ዖ', 'ዘ', 'ጐ', 'ጒ', 'ጕ', 'ጘ', 'ፚ', 'ᎀ', 'ᎏ', 'ᐁ', 'ᙬ', 'ᙯ', 'ᙿ', 'ᚁ', 'ᚚ', 'ᚠ', 'ᛪ', 'ᛱ', 'ᛸ', 'ᜀ', 'ᜌ', 'ᜎ', 'ᜑ', 'ᜠ', 'ᜱ', 'ᝀ', 'ᝑ', 'ᝠ', 'ᝬ', 'ᝮ', 'ᝰ', 'ក', 'ឳ', 'ᠠ', 'ᡂ', 'ᡄ', 'ᡸ', 'ᢀ', 'ᢄ', 'ᢇ', 'ᢨ', 'ᢰ', 'ᣵ', 'ᤀ', 'ᤞ', 'ᥐ', 'ᥭ', 'ᥰ', 'ᥴ', 'ᦀ', 'ᦫ', 'ᦰ', 'ᧉ', 'ᨀ', 'ᨖ', 'ᨠ', 'ᩔ', 'ᬅ', 'ᬳ', 'ᭅ', 'ᭋ', 'ᮃ', 'ᮠ', 'ᮮ', 'ᮯ', 'ᮺ', 'ᯥ', 'ᰀ', 'ᰣ', 'ᱍ', 'ᱏ', 'ᱚ', 'ᱷ', 'ᳩ', 'ᳬ', 'ᳮ', 'ᳱ', 'ᳵ', 'ᳶ', 'ℵ', 'ℸ', 'ⴰ', 'ⵧ', 'ⶀ', 'ⶖ', 'ⶠ', 'ⶦ', 'ⶨ', 'ⶮ', 'ⶰ', 'ⶶ', 'ⶸ', 'ⶾ', 'ⷀ', 'ⷆ', 'ⷈ', 'ⷎ', 'ⷐ', 'ⷖ', 'ⷘ', 'ⷞ', 'ぁ', 'ゖ', 'ァ', 'ヺ', 'ㄅ', 'ㄯ', 'ㄱ', 'ㆎ', 'ㆠ', 'ㆺ', 'ㇰ', 'ㇿ', '㐀', '䶵', '一', '鿯', 'ꀀ', 'ꀔ', 'ꀖ', 'ꒌ', 'ꓐ', 'ꓷ', 'ꔀ', 'ꘋ', 'ꘐ', 'ꘟ', 'ꘪ', 'ꘫ', 'ꚠ', 'ꛥ', 'ꟻ', 'ꠁ', 'ꠃ', 'ꠅ', 'ꠇ', 'ꠊ', 'ꠌ', 'ꠢ', 'ꡀ', 'ꡳ', 'ꢂ', 'ꢳ', 'ꣲ', 'ꣷ', 'ꣽ', 'ꣾ', 'ꤊ', 'ꤥ', 'ꤰ', 'ꥆ', 'ꥠ', 'ꥼ', 'ꦄ', 'ꦲ', 'ꧠ', 'ꧤ', 'ꧧ', 'ꧯ', 'ꧺ', 'ꧾ', 'ꨀ', 'ꨨ', 'ꩀ', 'ꩂ', 'ꩄ', 'ꩋ', 'ꩠ', 'ꩯ', 'ꩱ', 'ꩶ', 'ꩾ', 'ꪯ', 'ꪵ', 'ꪶ', 'ꪹ', 'ꪽ', 'ꫛ', 'ꫜ', 'ꫠ', 'ꫪ', 'ꬁ', 'ꬆ', 'ꬉ', 'ꬎ', 'ꬑ', 'ꬖ', 'ꬠ', 'ꬦ', 'ꬨ', 'ꬮ', 'ꯀ', 'ꯢ', '가', '힣', 'ힰ', 'ퟆ', 'ퟋ', 'ퟻ', '豈', '舘', '並', '龎', 'ײַ', 'ﬨ', 'שׁ', 'זּ', 'טּ', 'לּ', 'נּ', 'סּ', 'ףּ', 'פּ', 'צּ', 'ﮱ', 'ﯓ', 'ﴽ', 'ﵐ', 'ﶏ', 'ﶒ', 'ﷇ', 'ﷰ', 'ﷻ', 'ﹰ', 'ﹴ', 'ﹶ', 'ﻼ', 'ｦ', 'ｯ', 'ｱ', 'ﾝ', 'ﾠ', 'ﾾ', 'ￂ', 'ￇ', 'ￊ', 'ￏ', 'ￒ', 'ￗ', 'ￚ', 'ￜ'}, @@ -12768,9 +12797,9 @@ var g = &grammar{ }, { name: "Lt", - pos: position{line: 1784, col: 1, offset: 49939}, + pos: position{line: 1787, col: 1, offset: 50029}, expr: &charClassMatcher{ - pos: position{line: 1784, col: 6, offset: 49944}, + pos: position{line: 1787, col: 6, offset: 50034}, val: "[\\u01C5\\u01C8\\u01CB\\u01F2\\u1F88-\\u1F8F\\u1F98-\\u1F9F\\u1FA8-\\u1FAF\\u1FBC\\u1FCC\\u1FFC]", chars: []rune{'Dž', 'Lj', 'Nj', 'Dz', 'ᾼ', 'ῌ', 'ῼ'}, ranges: []rune{'ᾈ', 'ᾏ', 'ᾘ', 'ᾟ', 'ᾨ', 'ᾯ'}, @@ -12782,9 +12811,9 @@ var g = &grammar{ }, { name: "Lu", - pos: position{line: 1787, col: 1, offset: 50050}, + pos: position{line: 1790, col: 1, offset: 50140}, expr: &charClassMatcher{ - pos: position{line: 1787, col: 6, offset: 50055}, + pos: position{line: 1790, col: 6, offset: 50145}, val: "[\\u0041-\\u005A\\u00C0-\\u00D6\\u00D8-\\u00DE\\u0100\\u0102\\u0104\\u0106\\u0108\\u010A\\u010C\\u010E\\u0110\\u0112\\u0114\\u0116\\u0118\\u011A\\u011C\\u011E\\u0120\\u0122\\u0124\\u0126\\u0128\\u012A\\u012C\\u012E\\u0130\\u0132\\u0134\\u0136\\u0139\\u013B\\u013D\\u013F\\u0141\\u0143\\u0145\\u0147\\u014A\\u014C\\u014E\\u0150\\u0152\\u0154\\u0156\\u0158\\u015A\\u015C\\u015E\\u0160\\u0162\\u0164\\u0166\\u0168\\u016A\\u016C\\u016E\\u0170\\u0172\\u0174\\u0176\\u0178-\\u0179\\u017B\\u017D\\u0181-\\u0182\\u0184\\u0186-\\u0187\\u0189-\\u018B\\u018E-\\u0191\\u0193-\\u0194\\u0196-\\u0198\\u019C-\\u019D\\u019F-\\u01A0\\u01A2\\u01A4\\u01A6-\\u01A7\\u01A9\\u01AC\\u01AE-\\u01AF\\u01B1-\\u01B3\\u01B5\\u01B7-\\u01B8\\u01BC\\u01C4\\u01C7\\u01CA\\u01CD\\u01CF\\u01D1\\u01D3\\u01D5\\u01D7\\u01D9\\u01DB\\u01DE\\u01E0\\u01E2\\u01E4\\u01E6\\u01E8\\u01EA\\u01EC\\u01EE\\u01F1\\u01F4\\u01F6-\\u01F8\\u01FA\\u01FC\\u01FE\\u0200\\u0202\\u0204\\u0206\\u0208\\u020A\\u020C\\u020E\\u0210\\u0212\\u0214\\u0216\\u0218\\u021A\\u021C\\u021E\\u0220\\u0222\\u0224\\u0226\\u0228\\u022A\\u022C\\u022E\\u0230\\u0232\\u023A-\\u023B\\u023D-\\u023E\\u0241\\u0243-\\u0246\\u0248\\u024A\\u024C\\u024E\\u0370\\u0372\\u0376\\u037F\\u0386\\u0388-\\u038A\\u038C\\u038E-\\u038F\\u0391-\\u03A1\\u03A3-\\u03AB\\u03CF\\u03D2-\\u03D4\\u03D8\\u03DA\\u03DC\\u03DE\\u03E0\\u03E2\\u03E4\\u03E6\\u03E8\\u03EA\\u03EC\\u03EE\\u03F4\\u03F7\\u03F9-\\u03FA\\u03FD-\\u042F\\u0460\\u0462\\u0464\\u0466\\u0468\\u046A\\u046C\\u046E\\u0470\\u0472\\u0474\\u0476\\u0478\\u047A\\u047C\\u047E\\u0480\\u048A\\u048C\\u048E\\u0490\\u0492\\u0494\\u0496\\u0498\\u049A\\u049C\\u049E\\u04A0\\u04A2\\u04A4\\u04A6\\u04A8\\u04AA\\u04AC\\u04AE\\u04B0\\u04B2\\u04B4\\u04B6\\u04B8\\u04BA\\u04BC\\u04BE\\u04C0-\\u04C1\\u04C3\\u04C5\\u04C7\\u04C9\\u04CB\\u04CD\\u04D0\\u04D2\\u04D4\\u04D6\\u04D8\\u04DA\\u04DC\\u04DE\\u04E0\\u04E2\\u04E4\\u04E6\\u04E8\\u04EA\\u04EC\\u04EE\\u04F0\\u04F2\\u04F4\\u04F6\\u04F8\\u04FA\\u04FC\\u04FE\\u0500\\u0502\\u0504\\u0506\\u0508\\u050A\\u050C\\u050E\\u0510\\u0512\\u0514\\u0516\\u0518\\u051A\\u051C\\u051E\\u0520\\u0522\\u0524\\u0526\\u0528\\u052A\\u052C\\u052E\\u0531-\\u0556\\u10A0-\\u10C5\\u10C7\\u10CD\\u13A0-\\u13F5\\u1C90-\\u1CBA\\u1CBD-\\u1CBF\\u1E00\\u1E02\\u1E04\\u1E06\\u1E08\\u1E0A\\u1E0C\\u1E0E\\u1E10\\u1E12\\u1E14\\u1E16\\u1E18\\u1E1A\\u1E1C\\u1E1E\\u1E20\\u1E22\\u1E24\\u1E26\\u1E28\\u1E2A\\u1E2C\\u1E2E\\u1E30\\u1E32\\u1E34\\u1E36\\u1E38\\u1E3A\\u1E3C\\u1E3E\\u1E40\\u1E42\\u1E44\\u1E46\\u1E48\\u1E4A\\u1E4C\\u1E4E\\u1E50\\u1E52\\u1E54\\u1E56\\u1E58\\u1E5A\\u1E5C\\u1E5E\\u1E60\\u1E62\\u1E64\\u1E66\\u1E68\\u1E6A\\u1E6C\\u1E6E\\u1E70\\u1E72\\u1E74\\u1E76\\u1E78\\u1E7A\\u1E7C\\u1E7E\\u1E80\\u1E82\\u1E84\\u1E86\\u1E88\\u1E8A\\u1E8C\\u1E8E\\u1E90\\u1E92\\u1E94\\u1E9E\\u1EA0\\u1EA2\\u1EA4\\u1EA6\\u1EA8\\u1EAA\\u1EAC\\u1EAE\\u1EB0\\u1EB2\\u1EB4\\u1EB6\\u1EB8\\u1EBA\\u1EBC\\u1EBE\\u1EC0\\u1EC2\\u1EC4\\u1EC6\\u1EC8\\u1ECA\\u1ECC\\u1ECE\\u1ED0\\u1ED2\\u1ED4\\u1ED6\\u1ED8\\u1EDA\\u1EDC\\u1EDE\\u1EE0\\u1EE2\\u1EE4\\u1EE6\\u1EE8\\u1EEA\\u1EEC\\u1EEE\\u1EF0\\u1EF2\\u1EF4\\u1EF6\\u1EF8\\u1EFA\\u1EFC\\u1EFE\\u1F08-\\u1F0F\\u1F18-\\u1F1D\\u1F28-\\u1F2F\\u1F38-\\u1F3F\\u1F48-\\u1F4D\\u1F59\\u1F5B\\u1F5D\\u1F5F\\u1F68-\\u1F6F\\u1FB8-\\u1FBB\\u1FC8-\\u1FCB\\u1FD8-\\u1FDB\\u1FE8-\\u1FEC\\u1FF8-\\u1FFB\\u2102\\u2107\\u210B-\\u210D\\u2110-\\u2112\\u2115\\u2119-\\u211D\\u2124\\u2126\\u2128\\u212A-\\u212D\\u2130-\\u2133\\u213E-\\u213F\\u2145\\u2183\\u2C00-\\u2C2E\\u2C60\\u2C62-\\u2C64\\u2C67\\u2C69\\u2C6B\\u2C6D-\\u2C70\\u2C72\\u2C75\\u2C7E-\\u2C80\\u2C82\\u2C84\\u2C86\\u2C88\\u2C8A\\u2C8C\\u2C8E\\u2C90\\u2C92\\u2C94\\u2C96\\u2C98\\u2C9A\\u2C9C\\u2C9E\\u2CA0\\u2CA2\\u2CA4\\u2CA6\\u2CA8\\u2CAA\\u2CAC\\u2CAE\\u2CB0\\u2CB2\\u2CB4\\u2CB6\\u2CB8\\u2CBA\\u2CBC\\u2CBE\\u2CC0\\u2CC2\\u2CC4\\u2CC6\\u2CC8\\u2CCA\\u2CCC\\u2CCE\\u2CD0\\u2CD2\\u2CD4\\u2CD6\\u2CD8\\u2CDA\\u2CDC\\u2CDE\\u2CE0\\u2CE2\\u2CEB\\u2CED\\u2CF2\\uA640\\uA642\\uA644\\uA646\\uA648\\uA64A\\uA64C\\uA64E\\uA650\\uA652\\uA654\\uA656\\uA658\\uA65A\\uA65C\\uA65E\\uA660\\uA662\\uA664\\uA666\\uA668\\uA66A\\uA66C\\uA680\\uA682\\uA684\\uA686\\uA688\\uA68A\\uA68C\\uA68E\\uA690\\uA692\\uA694\\uA696\\uA698\\uA69A\\uA722\\uA724\\uA726\\uA728\\uA72A\\uA72C\\uA72E\\uA732\\uA734\\uA736\\uA738\\uA73A\\uA73C\\uA73E\\uA740\\uA742\\uA744\\uA746\\uA748\\uA74A\\uA74C\\uA74E\\uA750\\uA752\\uA754\\uA756\\uA758\\uA75A\\uA75C\\uA75E\\uA760\\uA762\\uA764\\uA766\\uA768\\uA76A\\uA76C\\uA76E\\uA779\\uA77B\\uA77D-\\uA77E\\uA780\\uA782\\uA784\\uA786\\uA78B\\uA78D\\uA790\\uA792\\uA796\\uA798\\uA79A\\uA79C\\uA79E\\uA7A0\\uA7A2\\uA7A4\\uA7A6\\uA7A8\\uA7AA-\\uA7AE\\uA7B0-\\uA7B4\\uA7B6\\uA7B8\\uFF21-\\uFF3A]", chars: []rune{'Ā', 'Ă', 'Ą', 'Ć', 'Ĉ', 'Ċ', 'Č', 'Ď', 'Đ', 'Ē', 'Ĕ', 'Ė', 'Ę', 'Ě', 'Ĝ', 'Ğ', 'Ġ', 'Ģ', 'Ĥ', 'Ħ', 'Ĩ', 'Ī', 'Ĭ', 'Į', 'İ', 'IJ', 'Ĵ', 'Ķ', 'Ĺ', 'Ļ', 'Ľ', 'Ŀ', 'Ł', 'Ń', 'Ņ', 'Ň', 'Ŋ', 'Ō', 'Ŏ', 'Ő', 'Œ', 'Ŕ', 'Ŗ', 'Ř', 'Ś', 'Ŝ', 'Ş', 'Š', 'Ţ', 'Ť', 'Ŧ', 'Ũ', 'Ū', 'Ŭ', 'Ů', 'Ű', 'Ų', 'Ŵ', 'Ŷ', 'Ż', 'Ž', 'Ƅ', 'Ƣ', 'Ƥ', 'Ʃ', 'Ƭ', 'Ƶ', 'Ƽ', 'DŽ', 'LJ', 'NJ', 'Ǎ', 'Ǐ', 'Ǒ', 'Ǔ', 'Ǖ', 'Ǘ', 'Ǚ', 'Ǜ', 'Ǟ', 'Ǡ', 'Ǣ', 'Ǥ', 'Ǧ', 'Ǩ', 'Ǫ', 'Ǭ', 'Ǯ', 'DZ', 'Ǵ', 'Ǻ', 'Ǽ', 'Ǿ', 'Ȁ', 'Ȃ', 'Ȅ', 'Ȇ', 'Ȉ', 'Ȋ', 'Ȍ', 'Ȏ', 'Ȑ', 'Ȓ', 'Ȕ', 'Ȗ', 'Ș', 'Ț', 'Ȝ', 'Ȟ', 'Ƞ', 'Ȣ', 'Ȥ', 'Ȧ', 'Ȩ', 'Ȫ', 'Ȭ', 'Ȯ', 'Ȱ', 'Ȳ', 'Ɂ', 'Ɉ', 'Ɋ', 'Ɍ', 'Ɏ', 'Ͱ', 'Ͳ', 'Ͷ', 'Ϳ', 'Ά', 'Ό', 'Ϗ', 'Ϙ', 'Ϛ', 'Ϝ', 'Ϟ', 'Ϡ', 'Ϣ', 'Ϥ', 'Ϧ', 'Ϩ', 'Ϫ', 'Ϭ', 'Ϯ', 'ϴ', 'Ϸ', 'Ѡ', 'Ѣ', 'Ѥ', 'Ѧ', 'Ѩ', 'Ѫ', 'Ѭ', 'Ѯ', 'Ѱ', 'Ѳ', 'Ѵ', 'Ѷ', 'Ѹ', 'Ѻ', 'Ѽ', 'Ѿ', 'Ҁ', 'Ҋ', 'Ҍ', 'Ҏ', 'Ґ', 'Ғ', 'Ҕ', 'Җ', 'Ҙ', 'Қ', 'Ҝ', 'Ҟ', 'Ҡ', 'Ң', 'Ҥ', 'Ҧ', 'Ҩ', 'Ҫ', 'Ҭ', 'Ү', 'Ұ', 'Ҳ', 'Ҵ', 'Ҷ', 'Ҹ', 'Һ', 'Ҽ', 'Ҿ', 'Ӄ', 'Ӆ', 'Ӈ', 'Ӊ', 'Ӌ', 'Ӎ', 'Ӑ', 'Ӓ', 'Ӕ', 'Ӗ', 'Ә', 'Ӛ', 'Ӝ', 'Ӟ', 'Ӡ', 'Ӣ', 'Ӥ', 'Ӧ', 'Ө', 'Ӫ', 'Ӭ', 'Ӯ', 'Ӱ', 'Ӳ', 'Ӵ', 'Ӷ', 'Ӹ', 'Ӻ', 'Ӽ', 'Ӿ', 'Ԁ', 'Ԃ', 'Ԅ', 'Ԇ', 'Ԉ', 'Ԋ', 'Ԍ', 'Ԏ', 'Ԑ', 'Ԓ', 'Ԕ', 'Ԗ', 'Ԙ', 'Ԛ', 'Ԝ', 'Ԟ', 'Ԡ', 'Ԣ', 'Ԥ', 'Ԧ', 'Ԩ', 'Ԫ', 'Ԭ', 'Ԯ', 'Ⴧ', 'Ⴭ', 'Ḁ', 'Ḃ', 'Ḅ', 'Ḇ', 'Ḉ', 'Ḋ', 'Ḍ', 'Ḏ', 'Ḑ', 'Ḓ', 'Ḕ', 'Ḗ', 'Ḙ', 'Ḛ', 'Ḝ', 'Ḟ', 'Ḡ', 'Ḣ', 'Ḥ', 'Ḧ', 'Ḩ', 'Ḫ', 'Ḭ', 'Ḯ', 'Ḱ', 'Ḳ', 'Ḵ', 'Ḷ', 'Ḹ', 'Ḻ', 'Ḽ', 'Ḿ', 'Ṁ', 'Ṃ', 'Ṅ', 'Ṇ', 'Ṉ', 'Ṋ', 'Ṍ', 'Ṏ', 'Ṑ', 'Ṓ', 'Ṕ', 'Ṗ', 'Ṙ', 'Ṛ', 'Ṝ', 'Ṟ', 'Ṡ', 'Ṣ', 'Ṥ', 'Ṧ', 'Ṩ', 'Ṫ', 'Ṭ', 'Ṯ', 'Ṱ', 'Ṳ', 'Ṵ', 'Ṷ', 'Ṹ', 'Ṻ', 'Ṽ', 'Ṿ', 'Ẁ', 'Ẃ', 'Ẅ', 'Ẇ', 'Ẉ', 'Ẋ', 'Ẍ', 'Ẏ', 'Ẑ', 'Ẓ', 'Ẕ', 'ẞ', 'Ạ', 'Ả', 'Ấ', 'Ầ', 'Ẩ', 'Ẫ', 'Ậ', 'Ắ', 'Ằ', 'Ẳ', 'Ẵ', 'Ặ', 'Ẹ', 'Ẻ', 'Ẽ', 'Ế', 'Ề', 'Ể', 'Ễ', 'Ệ', 'Ỉ', 'Ị', 'Ọ', 'Ỏ', 'Ố', 'Ồ', 'Ổ', 'Ỗ', 'Ộ', 'Ớ', 'Ờ', 'Ở', 'Ỡ', 'Ợ', 'Ụ', 'Ủ', 'Ứ', 'Ừ', 'Ử', 'Ữ', 'Ự', 'Ỳ', 'Ỵ', 'Ỷ', 'Ỹ', 'Ỻ', 'Ỽ', 'Ỿ', 'Ὑ', 'Ὓ', 'Ὕ', 'Ὗ', 'ℂ', 'ℇ', 'ℕ', 'ℤ', 'Ω', 'ℨ', 'ⅅ', 'Ↄ', 'Ⱡ', 'Ⱨ', 'Ⱪ', 'Ⱬ', 'Ⱳ', 'Ⱶ', 'Ⲃ', 'Ⲅ', 'Ⲇ', 'Ⲉ', 'Ⲋ', 'Ⲍ', 'Ⲏ', 'Ⲑ', 'Ⲓ', 'Ⲕ', 'Ⲗ', 'Ⲙ', 'Ⲛ', 'Ⲝ', 'Ⲟ', 'Ⲡ', 'Ⲣ', 'Ⲥ', 'Ⲧ', 'Ⲩ', 'Ⲫ', 'Ⲭ', 'Ⲯ', 'Ⲱ', 'Ⲳ', 'Ⲵ', 'Ⲷ', 'Ⲹ', 'Ⲻ', 'Ⲽ', 'Ⲿ', 'Ⳁ', 'Ⳃ', 'Ⳅ', 'Ⳇ', 'Ⳉ', 'Ⳋ', 'Ⳍ', 'Ⳏ', 'Ⳑ', 'Ⳓ', 'Ⳕ', 'Ⳗ', 'Ⳙ', 'Ⳛ', 'Ⳝ', 'Ⳟ', 'Ⳡ', 'Ⳣ', 'Ⳬ', 'Ⳮ', 'Ⳳ', 'Ꙁ', 'Ꙃ', 'Ꙅ', 'Ꙇ', 'Ꙉ', 'Ꙋ', 'Ꙍ', 'Ꙏ', 'Ꙑ', 'Ꙓ', 'Ꙕ', 'Ꙗ', 'Ꙙ', 'Ꙛ', 'Ꙝ', 'Ꙟ', 'Ꙡ', 'Ꙣ', 'Ꙥ', 'Ꙧ', 'Ꙩ', 'Ꙫ', 'Ꙭ', 'Ꚁ', 'Ꚃ', 'Ꚅ', 'Ꚇ', 'Ꚉ', 'Ꚋ', 'Ꚍ', 'Ꚏ', 'Ꚑ', 'Ꚓ', 'Ꚕ', 'Ꚗ', 'Ꚙ', 'Ꚛ', 'Ꜣ', 'Ꜥ', 'Ꜧ', 'Ꜩ', 'Ꜫ', 'Ꜭ', 'Ꜯ', 'Ꜳ', 'Ꜵ', 'Ꜷ', 'Ꜹ', 'Ꜻ', 'Ꜽ', 'Ꜿ', 'Ꝁ', 'Ꝃ', 'Ꝅ', 'Ꝇ', 'Ꝉ', 'Ꝋ', 'Ꝍ', 'Ꝏ', 'Ꝑ', 'Ꝓ', 'Ꝕ', 'Ꝗ', 'Ꝙ', 'Ꝛ', 'Ꝝ', 'Ꝟ', 'Ꝡ', 'Ꝣ', 'Ꝥ', 'Ꝧ', 'Ꝩ', 'Ꝫ', 'Ꝭ', 'Ꝯ', 'Ꝺ', 'Ꝼ', 'Ꞁ', 'Ꞃ', 'Ꞅ', 'Ꞇ', 'Ꞌ', 'Ɥ', 'Ꞑ', 'Ꞓ', 'Ꞗ', 'Ꞙ', 'Ꞛ', 'Ꞝ', 'Ꞟ', 'Ꞡ', 'Ꞣ', 'Ꞥ', 'Ꞧ', 'Ꞩ', 'Ꞷ', 'Ꞹ'}, ranges: []rune{'A', 'Z', 'À', 'Ö', 'Ø', 'Þ', 'Ÿ', 'Ź', 'Ɓ', 'Ƃ', 'Ɔ', 'Ƈ', 'Ɖ', 'Ƌ', 'Ǝ', 'Ƒ', 'Ɠ', 'Ɣ', 'Ɩ', 'Ƙ', 'Ɯ', 'Ɲ', 'Ɵ', 'Ơ', 'Ʀ', 'Ƨ', 'Ʈ', 'Ư', 'Ʊ', 'Ƴ', 'Ʒ', 'Ƹ', 'Ƕ', 'Ǹ', 'Ⱥ', 'Ȼ', 'Ƚ', 'Ⱦ', 'Ƀ', 'Ɇ', 'Έ', 'Ί', 'Ύ', 'Ώ', 'Α', 'Ρ', 'Σ', 'Ϋ', 'ϒ', 'ϔ', 'Ϲ', 'Ϻ', 'Ͻ', 'Я', 'Ӏ', 'Ӂ', 'Ա', 'Ֆ', 'Ⴀ', 'Ⴥ', 'Ꭰ', 'Ᏽ', 'Ა', 'Ჺ', 'Ჽ', 'Ჿ', 'Ἀ', 'Ἇ', 'Ἐ', 'Ἕ', 'Ἠ', 'Ἧ', 'Ἰ', 'Ἷ', 'Ὀ', 'Ὅ', 'Ὠ', 'Ὧ', 'Ᾰ', 'Ά', 'Ὲ', 'Ή', 'Ῐ', 'Ί', 'Ῠ', 'Ῥ', 'Ὸ', 'Ώ', 'ℋ', 'ℍ', 'ℐ', 'ℒ', 'ℙ', 'ℝ', 'K', 'ℭ', 'ℰ', 'ℳ', 'ℾ', 'ℿ', 'Ⰰ', 'Ⱞ', 'Ɫ', 'Ɽ', 'Ɑ', 'Ɒ', 'Ȿ', 'Ⲁ', 'Ᵹ', 'Ꝿ', 'Ɦ', 'Ɪ', 'Ʞ', 'Ꞵ', 'Ａ', 'Ｚ'}, @@ -12796,9 +12825,9 @@ var g = &grammar{ }, { name: "Mc", - pos: position{line: 1790, col: 1, offset: 54056}, + pos: position{line: 1793, col: 1, offset: 54146}, expr: &charClassMatcher{ - pos: position{line: 1790, col: 6, offset: 54061}, + pos: position{line: 1793, col: 6, offset: 54151}, val: "[\\u0903\\u093B\\u093E-\\u0940\\u0949-\\u094C\\u094E-\\u094F\\u0982-\\u0983\\u09BE-\\u09C0\\u09C7-\\u09C8\\u09CB-\\u09CC\\u09D7\\u0A03\\u0A3E-\\u0A40\\u0A83\\u0ABE-\\u0AC0\\u0AC9\\u0ACB-\\u0ACC\\u0B02-\\u0B03\\u0B3E\\u0B40\\u0B47-\\u0B48\\u0B4B-\\u0B4C\\u0B57\\u0BBE-\\u0BBF\\u0BC1-\\u0BC2\\u0BC6-\\u0BC8\\u0BCA-\\u0BCC\\u0BD7\\u0C01-\\u0C03\\u0C41-\\u0C44\\u0C82-\\u0C83\\u0CBE\\u0CC0-\\u0CC4\\u0CC7-\\u0CC8\\u0CCA-\\u0CCB\\u0CD5-\\u0CD6\\u0D02-\\u0D03\\u0D3E-\\u0D40\\u0D46-\\u0D48\\u0D4A-\\u0D4C\\u0D57\\u0D82-\\u0D83\\u0DCF-\\u0DD1\\u0DD8-\\u0DDF\\u0DF2-\\u0DF3\\u0F3E-\\u0F3F\\u0F7F\\u102B-\\u102C\\u1031\\u1038\\u103B-\\u103C\\u1056-\\u1057\\u1062-\\u1064\\u1067-\\u106D\\u1083-\\u1084\\u1087-\\u108C\\u108F\\u109A-\\u109C\\u17B6\\u17BE-\\u17C5\\u17C7-\\u17C8\\u1923-\\u1926\\u1929-\\u192B\\u1930-\\u1931\\u1933-\\u1938\\u1A19-\\u1A1A\\u1A55\\u1A57\\u1A61\\u1A63-\\u1A64\\u1A6D-\\u1A72\\u1B04\\u1B35\\u1B3B\\u1B3D-\\u1B41\\u1B43-\\u1B44\\u1B82\\u1BA1\\u1BA6-\\u1BA7\\u1BAA\\u1BE7\\u1BEA-\\u1BEC\\u1BEE\\u1BF2-\\u1BF3\\u1C24-\\u1C2B\\u1C34-\\u1C35\\u1CE1\\u1CF2-\\u1CF3\\u1CF7\\u302E-\\u302F\\uA823-\\uA824\\uA827\\uA880-\\uA881\\uA8B4-\\uA8C3\\uA952-\\uA953\\uA983\\uA9B4-\\uA9B5\\uA9BA-\\uA9BB\\uA9BD-\\uA9C0\\uAA2F-\\uAA30\\uAA33-\\uAA34\\uAA4D\\uAA7B\\uAA7D\\uAAEB\\uAAEE-\\uAAEF\\uAAF5\\uABE3-\\uABE4\\uABE6-\\uABE7\\uABE9-\\uABEA\\uABEC]", chars: []rune{'ः', 'ऻ', 'ৗ', 'ਃ', 'ઃ', 'ૉ', 'ା', 'ୀ', 'ୗ', 'ௗ', 'ಾ', 'ൗ', 'ཿ', 'ေ', 'း', 'ႏ', 'ា', 'ᩕ', 'ᩗ', 'ᩡ', 'ᬄ', 'ᬵ', 'ᬻ', 'ᮂ', 'ᮡ', '᮪', 'ᯧ', 'ᯮ', '᳡', '᳷', 'ꠧ', 'ꦃ', 'ꩍ', 'ꩻ', 'ꩽ', 'ꫫ', 'ꫵ', '꯬'}, ranges: []rune{'ा', 'ी', 'ॉ', 'ौ', 'ॎ', 'ॏ', 'ং', 'ঃ', 'া', 'ী', 'ে', 'ৈ', 'ো', 'ৌ', 'ਾ', 'ੀ', 'ા', 'ી', 'ો', 'ૌ', 'ଂ', 'ଃ', 'େ', 'ୈ', 'ୋ', 'ୌ', 'ா', 'ி', 'ு', 'ூ', 'ெ', 'ை', 'ொ', 'ௌ', 'ఁ', 'ః', 'ు', 'ౄ', 'ಂ', 'ಃ', 'ೀ', 'ೄ', 'ೇ', 'ೈ', 'ೊ', 'ೋ', 'ೕ', 'ೖ', 'ം', 'ഃ', 'ാ', 'ീ', 'െ', 'ൈ', 'ൊ', 'ൌ', 'ං', 'ඃ', 'ා', 'ෑ', 'ෘ', 'ෟ', 'ෲ', 'ෳ', '༾', '༿', 'ါ', 'ာ', 'ျ', 'ြ', 'ၖ', 'ၗ', 'ၢ', 'ၤ', 'ၧ', 'ၭ', 'ႃ', 'ႄ', 'ႇ', 'ႌ', 'ႚ', 'ႜ', 'ើ', 'ៅ', 'ះ', 'ៈ', 'ᤣ', 'ᤦ', 'ᤩ', 'ᤫ', 'ᤰ', 'ᤱ', 'ᤳ', 'ᤸ', 'ᨙ', 'ᨚ', 'ᩣ', 'ᩤ', 'ᩭ', 'ᩲ', 'ᬽ', 'ᭁ', 'ᭃ', '᭄', 'ᮦ', 'ᮧ', 'ᯪ', 'ᯬ', '᯲', '᯳', 'ᰤ', 'ᰫ', 'ᰴ', 'ᰵ', 'ᳲ', 'ᳳ', '〮', '〯', 'ꠣ', 'ꠤ', 'ꢀ', 'ꢁ', 'ꢴ', 'ꣃ', 'ꥒ', '꥓', 'ꦴ', 'ꦵ', 'ꦺ', 'ꦻ', 'ꦽ', '꧀', 'ꨯ', 'ꨰ', 'ꨳ', 'ꨴ', 'ꫮ', 'ꫯ', 'ꯣ', 'ꯤ', 'ꯦ', 'ꯧ', 'ꯩ', 'ꯪ'}, @@ -12810,9 +12839,9 @@ var g = &grammar{ }, { name: "Mn", - pos: position{line: 1793, col: 1, offset: 55249}, + pos: position{line: 1796, col: 1, offset: 55339}, expr: &charClassMatcher{ - pos: position{line: 1793, col: 6, offset: 55254}, + pos: position{line: 1796, col: 6, offset: 55344}, val: "[\\u0300-\\u036F\\u0483-\\u0487\\u0591-\\u05BD\\u05BF\\u05C1-\\u05C2\\u05C4-\\u05C5\\u05C7\\u0610-\\u061A\\u064B-\\u065F\\u0670\\u06D6-\\u06DC\\u06DF-\\u06E4\\u06E7-\\u06E8\\u06EA-\\u06ED\\u0711\\u0730-\\u074A\\u07A6-\\u07B0\\u07EB-\\u07F3\\u07FD\\u0816-\\u0819\\u081B-\\u0823\\u0825-\\u0827\\u0829-\\u082D\\u0859-\\u085B\\u08D3-\\u08E1\\u08E3-\\u0902\\u093A\\u093C\\u0941-\\u0948\\u094D\\u0951-\\u0957\\u0962-\\u0963\\u0981\\u09BC\\u09C1-\\u09C4\\u09CD\\u09E2-\\u09E3\\u09FE\\u0A01-\\u0A02\\u0A3C\\u0A41-\\u0A42\\u0A47-\\u0A48\\u0A4B-\\u0A4D\\u0A51\\u0A70-\\u0A71\\u0A75\\u0A81-\\u0A82\\u0ABC\\u0AC1-\\u0AC5\\u0AC7-\\u0AC8\\u0ACD\\u0AE2-\\u0AE3\\u0AFA-\\u0AFF\\u0B01\\u0B3C\\u0B3F\\u0B41-\\u0B44\\u0B4D\\u0B56\\u0B62-\\u0B63\\u0B82\\u0BC0\\u0BCD\\u0C00\\u0C04\\u0C3E-\\u0C40\\u0C46-\\u0C48\\u0C4A-\\u0C4D\\u0C55-\\u0C56\\u0C62-\\u0C63\\u0C81\\u0CBC\\u0CBF\\u0CC6\\u0CCC-\\u0CCD\\u0CE2-\\u0CE3\\u0D00-\\u0D01\\u0D3B-\\u0D3C\\u0D41-\\u0D44\\u0D4D\\u0D62-\\u0D63\\u0DCA\\u0DD2-\\u0DD4\\u0DD6\\u0E31\\u0E34-\\u0E3A\\u0E47-\\u0E4E\\u0EB1\\u0EB4-\\u0EB9\\u0EBB-\\u0EBC\\u0EC8-\\u0ECD\\u0F18-\\u0F19\\u0F35\\u0F37\\u0F39\\u0F71-\\u0F7E\\u0F80-\\u0F84\\u0F86-\\u0F87\\u0F8D-\\u0F97\\u0F99-\\u0FBC\\u0FC6\\u102D-\\u1030\\u1032-\\u1037\\u1039-\\u103A\\u103D-\\u103E\\u1058-\\u1059\\u105E-\\u1060\\u1071-\\u1074\\u1082\\u1085-\\u1086\\u108D\\u109D\\u135D-\\u135F\\u1712-\\u1714\\u1732-\\u1734\\u1752-\\u1753\\u1772-\\u1773\\u17B4-\\u17B5\\u17B7-\\u17BD\\u17C6\\u17C9-\\u17D3\\u17DD\\u180B-\\u180D\\u1885-\\u1886\\u18A9\\u1920-\\u1922\\u1927-\\u1928\\u1932\\u1939-\\u193B\\u1A17-\\u1A18\\u1A1B\\u1A56\\u1A58-\\u1A5E\\u1A60\\u1A62\\u1A65-\\u1A6C\\u1A73-\\u1A7C\\u1A7F\\u1AB0-\\u1ABD\\u1B00-\\u1B03\\u1B34\\u1B36-\\u1B3A\\u1B3C\\u1B42\\u1B6B-\\u1B73\\u1B80-\\u1B81\\u1BA2-\\u1BA5\\u1BA8-\\u1BA9\\u1BAB-\\u1BAD\\u1BE6\\u1BE8-\\u1BE9\\u1BED\\u1BEF-\\u1BF1\\u1C2C-\\u1C33\\u1C36-\\u1C37\\u1CD0-\\u1CD2\\u1CD4-\\u1CE0\\u1CE2-\\u1CE8\\u1CED\\u1CF4\\u1CF8-\\u1CF9\\u1DC0-\\u1DF9\\u1DFB-\\u1DFF\\u20D0-\\u20DC\\u20E1\\u20E5-\\u20F0\\u2CEF-\\u2CF1\\u2D7F\\u2DE0-\\u2DFF\\u302A-\\u302D\\u3099-\\u309A\\uA66F\\uA674-\\uA67D\\uA69E-\\uA69F\\uA6F0-\\uA6F1\\uA802\\uA806\\uA80B\\uA825-\\uA826\\uA8C4-\\uA8C5\\uA8E0-\\uA8F1\\uA8FF\\uA926-\\uA92D\\uA947-\\uA951\\uA980-\\uA982\\uA9B3\\uA9B6-\\uA9B9\\uA9BC\\uA9E5\\uAA29-\\uAA2E\\uAA31-\\uAA32\\uAA35-\\uAA36\\uAA43\\uAA4C\\uAA7C\\uAAB0\\uAAB2-\\uAAB4\\uAAB7-\\uAAB8\\uAABE-\\uAABF\\uAAC1\\uAAEC-\\uAAED\\uAAF6\\uABE5\\uABE8\\uABED\\uFB1E\\uFE00-\\uFE0F\\uFE20-\\uFE2F]", chars: []rune{'ֿ', 'ׇ', 'ٰ', 'ܑ', '߽', 'ऺ', '़', '्', 'ঁ', '়', '্', '৾', '਼', 'ੑ', 'ੵ', '઼', '્', 'ଁ', '଼', 'ି', '୍', 'ୖ', 'ஂ', 'ீ', '்', 'ఀ', 'ఄ', 'ಁ', '಼', 'ಿ', 'ೆ', '്', '්', 'ූ', 'ั', 'ັ', '༵', '༷', '༹', '࿆', 'ႂ', 'ႍ', 'ႝ', 'ំ', '៝', 'ᢩ', 'ᤲ', 'ᨛ', 'ᩖ', '᩠', 'ᩢ', '᩿', '᬴', 'ᬼ', 'ᭂ', '᯦', 'ᯭ', '᳭', '᳴', '⃡', '⵿', '꙯', 'ꠂ', '꠆', 'ꠋ', 'ꣿ', '꦳', 'ꦼ', 'ꧥ', 'ꩃ', 'ꩌ', 'ꩼ', 'ꪰ', '꫁', '꫶', 'ꯥ', 'ꯨ', '꯭', 'ﬞ'}, ranges: []rune{'̀', 'ͯ', '҃', '҇', '֑', 'ֽ', 'ׁ', 'ׂ', 'ׄ', 'ׅ', 'ؐ', 'ؚ', 'ً', 'ٟ', 'ۖ', 'ۜ', '۟', 'ۤ', 'ۧ', 'ۨ', '۪', 'ۭ', 'ܰ', '݊', 'ަ', 'ް', '߫', '߳', 'ࠖ', '࠙', 'ࠛ', 'ࠣ', 'ࠥ', 'ࠧ', 'ࠩ', '࠭', '࡙', '࡛', '࣓', '࣡', 'ࣣ', 'ं', 'ु', 'ै', '॑', 'ॗ', 'ॢ', 'ॣ', 'ু', 'ৄ', 'ৢ', 'ৣ', 'ਁ', 'ਂ', 'ੁ', 'ੂ', 'ੇ', 'ੈ', 'ੋ', '੍', 'ੰ', 'ੱ', 'ઁ', 'ં', 'ુ', 'ૅ', 'ે', 'ૈ', 'ૢ', 'ૣ', 'ૺ', '૿', 'ୁ', 'ୄ', 'ୢ', 'ୣ', 'ా', 'ీ', 'ె', 'ై', 'ొ', '్', 'ౕ', 'ౖ', 'ౢ', 'ౣ', 'ೌ', '್', 'ೢ', 'ೣ', 'ഀ', 'ഁ', '഻', '഼', 'ു', 'ൄ', 'ൢ', 'ൣ', 'ි', 'ු', 'ิ', 'ฺ', '็', '๎', 'ິ', 'ູ', 'ົ', 'ຼ', '່', 'ໍ', '༘', '༙', 'ཱ', 'ཾ', 'ྀ', '྄', '྆', '྇', 'ྍ', 'ྗ', 'ྙ', 'ྼ', 'ိ', 'ူ', 'ဲ', '့', '္', '်', 'ွ', 'ှ', 'ၘ', 'ၙ', 'ၞ', 'ၠ', 'ၱ', 'ၴ', 'ႅ', 'ႆ', '፝', '፟', 'ᜒ', '᜔', 'ᜲ', '᜴', 'ᝒ', 'ᝓ', 'ᝲ', 'ᝳ', '឴', '឵', 'ិ', 'ួ', '៉', '៓', '᠋', '᠍', 'ᢅ', 'ᢆ', 'ᤠ', 'ᤢ', 'ᤧ', 'ᤨ', '᤹', '᤻', 'ᨗ', 'ᨘ', 'ᩘ', 'ᩞ', 'ᩥ', 'ᩬ', 'ᩳ', '᩼', '᪰', '᪽', 'ᬀ', 'ᬃ', 'ᬶ', 'ᬺ', '᭫', '᭳', 'ᮀ', 'ᮁ', 'ᮢ', 'ᮥ', 'ᮨ', 'ᮩ', '᮫', 'ᮭ', 'ᯨ', 'ᯩ', 'ᯯ', 'ᯱ', 'ᰬ', 'ᰳ', 'ᰶ', '᰷', '᳐', '᳒', '᳔', '᳠', '᳢', '᳨', '᳸', '᳹', '᷀', '᷹', '᷻', '᷿', '⃐', '⃜', '⃥', '⃰', '⳯', '⳱', 'ⷠ', 'ⷿ', '〪', '〭', '゙', '゚', 'ꙴ', '꙽', 'ꚞ', 'ꚟ', '꛰', '꛱', 'ꠥ', 'ꠦ', '꣄', 'ꣅ', '꣠', '꣱', 'ꤦ', '꤭', 'ꥇ', 'ꥑ', 'ꦀ', 'ꦂ', 'ꦶ', 'ꦹ', 'ꨩ', 'ꨮ', 'ꨱ', 'ꨲ', 'ꨵ', 'ꨶ', 'ꪲ', 'ꪴ', 'ꪷ', 'ꪸ', 'ꪾ', '꪿', 'ꫬ', 'ꫭ', '︀', '️', '︠', '︯'}, @@ -12824,9 +12853,9 @@ var g = &grammar{ }, { name: "Nd", - pos: position{line: 1796, col: 1, offset: 57434}, + pos: position{line: 1799, col: 1, offset: 57524}, expr: &charClassMatcher{ - pos: position{line: 1796, col: 6, offset: 57439}, + pos: position{line: 1799, col: 6, offset: 57529}, val: "[\\u0030-\\u0039\\u0660-\\u0669\\u06F0-\\u06F9\\u07C0-\\u07C9\\u0966-\\u096F\\u09E6-\\u09EF\\u0A66-\\u0A6F\\u0AE6-\\u0AEF\\u0B66-\\u0B6F\\u0BE6-\\u0BEF\\u0C66-\\u0C6F\\u0CE6-\\u0CEF\\u0D66-\\u0D6F\\u0DE6-\\u0DEF\\u0E50-\\u0E59\\u0ED0-\\u0ED9\\u0F20-\\u0F29\\u1040-\\u1049\\u1090-\\u1099\\u17E0-\\u17E9\\u1810-\\u1819\\u1946-\\u194F\\u19D0-\\u19D9\\u1A80-\\u1A89\\u1A90-\\u1A99\\u1B50-\\u1B59\\u1BB0-\\u1BB9\\u1C40-\\u1C49\\u1C50-\\u1C59\\uA620-\\uA629\\uA8D0-\\uA8D9\\uA900-\\uA909\\uA9D0-\\uA9D9\\uA9F0-\\uA9F9\\uAA50-\\uAA59\\uABF0-\\uABF9\\uFF10-\\uFF19]", ranges: []rune{'0', '9', '٠', '٩', '۰', '۹', '߀', '߉', '०', '९', '০', '৯', '੦', '੯', '૦', '૯', '୦', '୯', '௦', '௯', '౦', '౯', '೦', '೯', '൦', '൯', '෦', '෯', '๐', '๙', '໐', '໙', '༠', '༩', '၀', '၉', '႐', '႙', '០', '៩', '᠐', '᠙', '᥆', '᥏', '᧐', '᧙', '᪀', '᪉', '᪐', '᪙', '᭐', '᭙', '᮰', '᮹', '᱀', '᱉', '᱐', '᱙', '꘠', '꘩', '꣐', '꣙', '꤀', '꤉', '꧐', '꧙', '꧰', '꧹', '꩐', '꩙', '꯰', '꯹', '０', '９'}, ignoreCase: false, @@ -12837,9 +12866,9 @@ var g = &grammar{ }, { name: "Nl", - pos: position{line: 1799, col: 1, offset: 57942}, + pos: position{line: 1802, col: 1, offset: 58032}, expr: &charClassMatcher{ - pos: position{line: 1799, col: 6, offset: 57947}, + pos: position{line: 1802, col: 6, offset: 58037}, val: "[\\u16EE-\\u16F0\\u2160-\\u2182\\u2185-\\u2188\\u3007\\u3021-\\u3029\\u3038-\\u303A\\uA6E6-\\uA6EF]", chars: []rune{'〇'}, ranges: []rune{'ᛮ', 'ᛰ', 'Ⅰ', 'ↂ', 'ↅ', 'ↈ', '〡', '〩', '〸', '〺', 'ꛦ', 'ꛯ'}, @@ -12851,9 +12880,9 @@ var g = &grammar{ }, { name: "Pc", - pos: position{line: 1802, col: 1, offset: 58061}, + pos: position{line: 1805, col: 1, offset: 58151}, expr: &charClassMatcher{ - pos: position{line: 1802, col: 6, offset: 58066}, + pos: position{line: 1805, col: 6, offset: 58156}, val: "[\\u005F\\u203F-\\u2040\\u2054\\uFE33-\\uFE34\\uFE4D-\\uFE4F\\uFF3F]", chars: []rune{'_', '⁔', '＿'}, ranges: []rune{'‿', '⁀', '︳', '︴', '﹍', '﹏'}, @@ -12865,9 +12894,9 @@ var g = &grammar{ }, { name: "Zs", - pos: position{line: 1805, col: 1, offset: 58147}, + pos: position{line: 1808, col: 1, offset: 58237}, expr: &charClassMatcher{ - pos: position{line: 1805, col: 6, offset: 58152}, + pos: position{line: 1808, col: 6, offset: 58242}, val: "[\\u0020\\u00A0\\u1680\\u2000-\\u200A\\u202F\\u205F\\u3000]", chars: []rune{' ', '\u00a0', '\u1680', '\u202f', '\u205f', '\u3000'}, ranges: []rune{'\u2000', '\u200a'}, @@ -12879,9 +12908,9 @@ var g = &grammar{ }, { name: "SourceCharacter", - pos: position{line: 1807, col: 1, offset: 58205}, + pos: position{line: 1810, col: 1, offset: 58295}, expr: &anyMatcher{ - line: 1808, col: 5, offset: 58225, + line: 1811, col: 5, offset: 58315, }, leader: false, leftRecursive: false, @@ -12889,48 +12918,48 @@ var g = &grammar{ { name: "WhiteSpace", displayName: "\"whitespace\"", - pos: position{line: 1810, col: 1, offset: 58228}, + pos: position{line: 1813, col: 1, offset: 58318}, expr: &choiceExpr{ - pos: position{line: 1811, col: 5, offset: 58256}, + pos: position{line: 1814, col: 5, offset: 58346}, alternatives: []any{ &litMatcher{ - pos: position{line: 1811, col: 5, offset: 58256}, + pos: position{line: 1814, col: 5, offset: 58346}, val: "\t", ignoreCase: false, want: "\"\\t\"", }, &litMatcher{ - pos: position{line: 1812, col: 5, offset: 58265}, + pos: position{line: 1815, col: 5, offset: 58355}, val: "\v", ignoreCase: false, want: "\"\\v\"", }, &litMatcher{ - pos: position{line: 1813, col: 5, offset: 58274}, + pos: position{line: 1816, col: 5, offset: 58364}, val: "\f", ignoreCase: false, want: "\"\\f\"", }, &litMatcher{ - pos: position{line: 1814, col: 5, offset: 58283}, + pos: position{line: 1817, col: 5, offset: 58373}, val: " ", ignoreCase: false, want: "\" \"", }, &litMatcher{ - pos: position{line: 1815, col: 5, offset: 58291}, + pos: position{line: 1818, col: 5, offset: 58381}, val: "\u00a0", ignoreCase: false, want: "\"\\u00a0\"", }, &litMatcher{ - pos: position{line: 1816, col: 5, offset: 58304}, + pos: position{line: 1819, col: 5, offset: 58394}, val: "\ufeff", ignoreCase: false, want: "\"\\ufeff\"", }, &ruleRefExpr{ - pos: position{line: 1817, col: 5, offset: 58317}, + pos: position{line: 1820, col: 5, offset: 58407}, name: "Zs", }, }, @@ -12940,9 +12969,9 @@ var g = &grammar{ }, { name: "LineTerminator", - pos: position{line: 1819, col: 1, offset: 58321}, + pos: position{line: 1822, col: 1, offset: 58411}, expr: &charClassMatcher{ - pos: position{line: 1820, col: 5, offset: 58340}, + pos: position{line: 1823, col: 5, offset: 58430}, val: "[\\n\\r\\u2028\\u2029]", chars: []rune{'\n', '\r', '\u2028', '\u2029'}, ignoreCase: false, @@ -12954,9 +12983,9 @@ var g = &grammar{ { name: "Comment", displayName: "\"comment\"", - pos: position{line: 1826, col: 1, offset: 58670}, + pos: position{line: 1829, col: 1, offset: 58760}, expr: &ruleRefExpr{ - pos: position{line: 1829, col: 5, offset: 58741}, + pos: position{line: 1832, col: 5, offset: 58831}, name: "SingleLineComment", }, leader: false, @@ -12964,39 +12993,39 @@ var g = &grammar{ }, { name: "MultiLineComment", - pos: position{line: 1831, col: 1, offset: 58760}, + pos: position{line: 1834, col: 1, offset: 58850}, expr: &seqExpr{ - pos: position{line: 1832, col: 5, offset: 58781}, + pos: position{line: 1835, col: 5, offset: 58871}, exprs: []any{ &litMatcher{ - pos: position{line: 1832, col: 5, offset: 58781}, + pos: position{line: 1835, col: 5, offset: 58871}, val: "/*", ignoreCase: false, want: "\"/*\"", }, &zeroOrMoreExpr{ - pos: position{line: 1832, col: 10, offset: 58786}, + pos: position{line: 1835, col: 10, offset: 58876}, expr: &seqExpr{ - pos: position{line: 1832, col: 11, offset: 58787}, + pos: position{line: 1835, col: 11, offset: 58877}, exprs: []any{ ¬Expr{ - pos: position{line: 1832, col: 11, offset: 58787}, + pos: position{line: 1835, col: 11, offset: 58877}, expr: &litMatcher{ - pos: position{line: 1832, col: 12, offset: 58788}, + pos: position{line: 1835, col: 12, offset: 58878}, val: "*/", ignoreCase: false, want: "\"*/\"", }, }, &ruleRefExpr{ - pos: position{line: 1832, col: 17, offset: 58793}, + pos: position{line: 1835, col: 17, offset: 58883}, name: "SourceCharacter", }, }, }, }, &litMatcher{ - pos: position{line: 1832, col: 35, offset: 58811}, + pos: position{line: 1835, col: 35, offset: 58901}, val: "*/", ignoreCase: false, want: "\"*/\"", @@ -13008,33 +13037,33 @@ var g = &grammar{ }, { name: "SingleLineComment", - pos: position{line: 1834, col: 1, offset: 58817}, + pos: position{line: 1837, col: 1, offset: 58907}, expr: &choiceExpr{ - pos: position{line: 1835, col: 5, offset: 58839}, + pos: position{line: 1838, col: 5, offset: 58929}, alternatives: []any{ &seqExpr{ - pos: position{line: 1835, col: 5, offset: 58839}, + pos: position{line: 1838, col: 5, offset: 58929}, exprs: []any{ &litMatcher{ - pos: position{line: 1835, col: 5, offset: 58839}, + pos: position{line: 1838, col: 5, offset: 58929}, val: "//", ignoreCase: false, want: "\"//\"", }, &zeroOrMoreExpr{ - pos: position{line: 1835, col: 10, offset: 58844}, + pos: position{line: 1838, col: 10, offset: 58934}, expr: &seqExpr{ - pos: position{line: 1835, col: 11, offset: 58845}, + pos: position{line: 1838, col: 11, offset: 58935}, exprs: []any{ ¬Expr{ - pos: position{line: 1835, col: 11, offset: 58845}, + pos: position{line: 1838, col: 11, offset: 58935}, expr: &ruleRefExpr{ - pos: position{line: 1835, col: 12, offset: 58846}, + pos: position{line: 1838, col: 12, offset: 58936}, name: "LineTerminator", }, }, &ruleRefExpr{ - pos: position{line: 1835, col: 27, offset: 58861}, + pos: position{line: 1838, col: 27, offset: 58951}, name: "SourceCharacter", }, }, @@ -13043,28 +13072,28 @@ var g = &grammar{ }, }, &seqExpr{ - pos: position{line: 1836, col: 5, offset: 58883}, + pos: position{line: 1839, col: 5, offset: 58973}, exprs: []any{ &litMatcher{ - pos: position{line: 1836, col: 5, offset: 58883}, + pos: position{line: 1839, col: 5, offset: 58973}, val: "--", ignoreCase: false, want: "\"--\"", }, &zeroOrMoreExpr{ - pos: position{line: 1836, col: 10, offset: 58888}, + pos: position{line: 1839, col: 10, offset: 58978}, expr: &seqExpr{ - pos: position{line: 1836, col: 11, offset: 58889}, + pos: position{line: 1839, col: 11, offset: 58979}, exprs: []any{ ¬Expr{ - pos: position{line: 1836, col: 11, offset: 58889}, + pos: position{line: 1839, col: 11, offset: 58979}, expr: &ruleRefExpr{ - pos: position{line: 1836, col: 12, offset: 58890}, + pos: position{line: 1839, col: 12, offset: 58980}, name: "LineTerminator", }, }, &ruleRefExpr{ - pos: position{line: 1836, col: 27, offset: 58905}, + pos: position{line: 1839, col: 27, offset: 58995}, name: "SourceCharacter", }, }, @@ -13079,19 +13108,19 @@ var g = &grammar{ }, { name: "EOL", - pos: position{line: 1838, col: 1, offset: 58924}, + pos: position{line: 1841, col: 1, offset: 59014}, expr: &seqExpr{ - pos: position{line: 1838, col: 7, offset: 58930}, + pos: position{line: 1841, col: 7, offset: 59020}, exprs: []any{ &zeroOrMoreExpr{ - pos: position{line: 1838, col: 7, offset: 58930}, + pos: position{line: 1841, col: 7, offset: 59020}, expr: &ruleRefExpr{ - pos: position{line: 1838, col: 7, offset: 58930}, + pos: position{line: 1841, col: 7, offset: 59020}, name: "WhiteSpace", }, }, &ruleRefExpr{ - pos: position{line: 1838, col: 19, offset: 58942}, + pos: position{line: 1841, col: 19, offset: 59032}, name: "LineTerminator", }, }, @@ -13101,16 +13130,16 @@ var g = &grammar{ }, { name: "EOT", - pos: position{line: 1840, col: 1, offset: 58958}, + pos: position{line: 1843, col: 1, offset: 59048}, expr: &choiceExpr{ - pos: position{line: 1840, col: 7, offset: 58964}, + pos: position{line: 1843, col: 7, offset: 59054}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1840, col: 7, offset: 58964}, + pos: position{line: 1843, col: 7, offset: 59054}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1840, col: 11, offset: 58968}, + pos: position{line: 1843, col: 11, offset: 59058}, name: "EOF", }, }, @@ -13120,11 +13149,11 @@ var g = &grammar{ }, { name: "EOF", - pos: position{line: 1842, col: 1, offset: 58973}, + pos: position{line: 1845, col: 1, offset: 59063}, expr: ¬Expr{ - pos: position{line: 1842, col: 7, offset: 58979}, + pos: position{line: 1845, col: 7, offset: 59069}, expr: &anyMatcher{ - line: 1842, col: 8, offset: 58980, + line: 1845, col: 8, offset: 59070, }, }, leader: false, @@ -13132,11 +13161,11 @@ var g = &grammar{ }, { name: "EOKW", - pos: position{line: 1844, col: 1, offset: 58983}, + pos: position{line: 1847, col: 1, offset: 59073}, expr: ¬Expr{ - pos: position{line: 1844, col: 8, offset: 58990}, + pos: position{line: 1847, col: 8, offset: 59080}, expr: &ruleRefExpr{ - pos: position{line: 1844, col: 9, offset: 58991}, + pos: position{line: 1847, col: 9, offset: 59081}, name: "KeyWordChars", }, }, @@ -13145,15 +13174,15 @@ var g = &grammar{ }, { name: "SQLPipe", - pos: position{line: 1848, col: 1, offset: 59027}, + pos: position{line: 1851, col: 1, offset: 59117}, expr: &actionExpr{ - pos: position{line: 1849, col: 5, offset: 59040}, + pos: position{line: 1852, col: 5, offset: 59130}, run: (*parser).callonSQLPipe1, expr: &labeledExpr{ - pos: position{line: 1849, col: 5, offset: 59040}, + pos: position{line: 1852, col: 5, offset: 59130}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1849, col: 7, offset: 59042}, + pos: position{line: 1852, col: 7, offset: 59132}, name: "Seq", }, }, @@ -13163,27 +13192,27 @@ var g = &grammar{ }, { name: "SelectOp", - pos: position{line: 1857, col: 1, offset: 59188}, + pos: position{line: 1860, col: 1, offset: 59278}, expr: &actionExpr{ - pos: position{line: 1857, col: 12, offset: 59199}, + pos: position{line: 1860, col: 12, offset: 59289}, run: (*parser).callonSelectOp1, expr: &seqExpr{ - pos: position{line: 1857, col: 12, offset: 59199}, + pos: position{line: 1860, col: 12, offset: 59289}, exprs: []any{ ¬Expr{ - pos: position{line: 1857, col: 12, offset: 59199}, + pos: position{line: 1860, col: 12, offset: 59289}, expr: &litMatcher{ - pos: position{line: 1857, col: 13, offset: 59200}, + pos: position{line: 1860, col: 13, offset: 59290}, val: "(", ignoreCase: false, want: "\"(\"", }, }, &labeledExpr{ - pos: position{line: 1857, col: 17, offset: 59204}, + pos: position{line: 1860, col: 17, offset: 59294}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 1857, col: 20, offset: 59207}, + pos: position{line: 1860, col: 20, offset: 59297}, name: "SelectExpr", }, }, @@ -13195,65 +13224,65 @@ var g = &grammar{ }, { name: "SelectExpr", - pos: position{line: 1859, col: 1, offset: 59237}, + pos: position{line: 1862, col: 1, offset: 59327}, expr: &actionExpr{ - pos: position{line: 1860, col: 5, offset: 59253}, + pos: position{line: 1863, col: 5, offset: 59343}, run: (*parser).callonSelectExpr1, expr: &seqExpr{ - pos: position{line: 1860, col: 5, offset: 59253}, + pos: position{line: 1863, col: 5, offset: 59343}, exprs: []any{ &labeledExpr{ - pos: position{line: 1860, col: 5, offset: 59253}, + pos: position{line: 1863, col: 5, offset: 59343}, label: "with", expr: &ruleRefExpr{ - pos: position{line: 1860, col: 10, offset: 59258}, + pos: position{line: 1863, col: 10, offset: 59348}, name: "OptWithClause", }, }, &labeledExpr{ - pos: position{line: 1861, col: 5, offset: 59276}, + pos: position{line: 1864, col: 5, offset: 59366}, label: "body", expr: &choiceExpr{ - pos: position{line: 1862, col: 9, offset: 59291}, + pos: position{line: 1865, col: 9, offset: 59381}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1862, col: 9, offset: 59291}, + pos: position{line: 1865, col: 9, offset: 59381}, name: "SetOperation", }, &ruleRefExpr{ - pos: position{line: 1863, col: 9, offset: 59312}, + pos: position{line: 1866, col: 9, offset: 59402}, name: "Select", }, &actionExpr{ - pos: position{line: 1864, col: 9, offset: 59327}, + pos: position{line: 1867, col: 9, offset: 59417}, run: (*parser).callonSelectExpr9, expr: &seqExpr{ - pos: position{line: 1864, col: 9, offset: 59327}, + pos: position{line: 1867, col: 9, offset: 59417}, exprs: []any{ &litMatcher{ - pos: position{line: 1864, col: 9, offset: 59327}, + pos: position{line: 1867, col: 9, offset: 59417}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1864, col: 13, offset: 59331}, + pos: position{line: 1867, col: 13, offset: 59421}, name: "__", }, &labeledExpr{ - pos: position{line: 1864, col: 16, offset: 59334}, + pos: position{line: 1867, col: 16, offset: 59424}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1864, col: 18, offset: 59336}, + pos: position{line: 1867, col: 18, offset: 59426}, name: "SQLPipe", }, }, &ruleRefExpr{ - pos: position{line: 1864, col: 26, offset: 59344}, + pos: position{line: 1867, col: 26, offset: 59434}, name: "__", }, &litMatcher{ - pos: position{line: 1864, col: 28, offset: 59346}, + pos: position{line: 1867, col: 28, offset: 59436}, val: ")", ignoreCase: false, want: "\")\"", @@ -13265,97 +13294,97 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 1866, col: 5, offset: 59383}, + pos: position{line: 1869, col: 5, offset: 59473}, label: "orderby", expr: &ruleRefExpr{ - pos: position{line: 1866, col: 13, offset: 59391}, + pos: position{line: 1869, col: 13, offset: 59481}, name: "OptOrderByClause", }, }, &labeledExpr{ - pos: position{line: 1867, col: 5, offset: 59412}, + pos: position{line: 1870, col: 5, offset: 59502}, label: "limit", expr: &ruleRefExpr{ - pos: position{line: 1867, col: 11, offset: 59418}, + pos: position{line: 1870, col: 11, offset: 59508}, name: "OptLimitClause", }, }, }, }, }, - leader: true, + leader: false, leftRecursive: true, }, { name: "Select", - pos: position{line: 1887, col: 1, offset: 59804}, + pos: position{line: 1890, col: 1, offset: 59894}, expr: &actionExpr{ - pos: position{line: 1888, col: 5, offset: 59816}, + pos: position{line: 1891, col: 5, offset: 59906}, run: (*parser).callonSelect1, expr: &seqExpr{ - pos: position{line: 1888, col: 5, offset: 59816}, + pos: position{line: 1891, col: 5, offset: 59906}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1888, col: 5, offset: 59816}, + pos: position{line: 1891, col: 5, offset: 59906}, name: "SELECT", }, &labeledExpr{ - pos: position{line: 1889, col: 5, offset: 59828}, + pos: position{line: 1892, col: 5, offset: 59918}, label: "distinct", expr: &ruleRefExpr{ - pos: position{line: 1889, col: 14, offset: 59837}, + pos: position{line: 1892, col: 14, offset: 59927}, name: "OptDistinct", }, }, &labeledExpr{ - pos: position{line: 1890, col: 5, offset: 59853}, + pos: position{line: 1893, col: 5, offset: 59943}, label: "value", expr: &ruleRefExpr{ - pos: position{line: 1890, col: 11, offset: 59859}, + pos: position{line: 1893, col: 11, offset: 59949}, name: "OptSelectValue", }, }, &ruleRefExpr{ - pos: position{line: 1893, col: 5, offset: 59999}, + pos: position{line: 1896, col: 5, offset: 60089}, name: "_", }, &labeledExpr{ - pos: position{line: 1893, col: 7, offset: 60001}, + pos: position{line: 1896, col: 7, offset: 60091}, label: "selection", expr: &ruleRefExpr{ - pos: position{line: 1893, col: 17, offset: 60011}, + pos: position{line: 1896, col: 17, offset: 60101}, name: "Selection", }, }, &labeledExpr{ - pos: position{line: 1894, col: 5, offset: 60025}, + pos: position{line: 1897, col: 5, offset: 60115}, label: "from", expr: &ruleRefExpr{ - pos: position{line: 1894, col: 10, offset: 60030}, + pos: position{line: 1897, col: 10, offset: 60120}, name: "OptFromClause", }, }, &labeledExpr{ - pos: position{line: 1895, col: 5, offset: 60048}, + pos: position{line: 1898, col: 5, offset: 60138}, label: "where", expr: &ruleRefExpr{ - pos: position{line: 1895, col: 11, offset: 60054}, + pos: position{line: 1898, col: 11, offset: 60144}, name: "OptWhereClause", }, }, &labeledExpr{ - pos: position{line: 1896, col: 5, offset: 60073}, + pos: position{line: 1899, col: 5, offset: 60163}, label: "group", expr: &ruleRefExpr{ - pos: position{line: 1896, col: 11, offset: 60079}, + pos: position{line: 1899, col: 11, offset: 60169}, name: "OptGroupClause", }, }, &labeledExpr{ - pos: position{line: 1897, col: 5, offset: 60098}, + pos: position{line: 1900, col: 5, offset: 60188}, label: "having", expr: &ruleRefExpr{ - pos: position{line: 1897, col: 12, offset: 60105}, + pos: position{line: 1900, col: 12, offset: 60195}, name: "OptHavingClause", }, }, @@ -13367,49 +13396,49 @@ var g = &grammar{ }, { name: "OptDistinct", - pos: position{line: 1923, col: 1, offset: 60711}, + pos: position{line: 1926, col: 1, offset: 60801}, expr: &choiceExpr{ - pos: position{line: 1924, col: 5, offset: 60727}, + pos: position{line: 1927, col: 5, offset: 60817}, alternatives: []any{ &actionExpr{ - pos: position{line: 1924, col: 5, offset: 60727}, + pos: position{line: 1927, col: 5, offset: 60817}, run: (*parser).callonOptDistinct2, expr: &seqExpr{ - pos: position{line: 1924, col: 5, offset: 60727}, + pos: position{line: 1927, col: 5, offset: 60817}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1924, col: 5, offset: 60727}, + pos: position{line: 1927, col: 5, offset: 60817}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1924, col: 7, offset: 60729}, + pos: position{line: 1927, col: 7, offset: 60819}, name: "ALL", }, }, }, }, &actionExpr{ - pos: position{line: 1925, col: 5, offset: 60766}, + pos: position{line: 1928, col: 5, offset: 60856}, run: (*parser).callonOptDistinct6, expr: &seqExpr{ - pos: position{line: 1925, col: 5, offset: 60766}, + pos: position{line: 1928, col: 5, offset: 60856}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1925, col: 5, offset: 60766}, + pos: position{line: 1928, col: 5, offset: 60856}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1925, col: 7, offset: 60768}, + pos: position{line: 1928, col: 7, offset: 60858}, name: "DISTINCT", }, }, }, }, &actionExpr{ - pos: position{line: 1926, col: 5, offset: 60804}, + pos: position{line: 1929, col: 5, offset: 60894}, run: (*parser).callonOptDistinct10, expr: &litMatcher{ - pos: position{line: 1926, col: 5, offset: 60804}, + pos: position{line: 1929, col: 5, offset: 60894}, val: "", ignoreCase: false, want: "\"\"", @@ -13422,57 +13451,57 @@ var g = &grammar{ }, { name: "OptSelectValue", - pos: position{line: 1928, col: 1, offset: 60843}, + pos: position{line: 1931, col: 1, offset: 60933}, expr: &choiceExpr{ - pos: position{line: 1929, col: 5, offset: 60862}, + pos: position{line: 1932, col: 5, offset: 60952}, alternatives: []any{ &actionExpr{ - pos: position{line: 1929, col: 5, offset: 60862}, + pos: position{line: 1932, col: 5, offset: 60952}, run: (*parser).callonOptSelectValue2, expr: &seqExpr{ - pos: position{line: 1929, col: 5, offset: 60862}, + pos: position{line: 1932, col: 5, offset: 60952}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1929, col: 5, offset: 60862}, + pos: position{line: 1932, col: 5, offset: 60952}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1929, col: 7, offset: 60864}, + pos: position{line: 1932, col: 7, offset: 60954}, name: "AS", }, &ruleRefExpr{ - pos: position{line: 1929, col: 10, offset: 60867}, + pos: position{line: 1932, col: 10, offset: 60957}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1929, col: 12, offset: 60869}, + pos: position{line: 1932, col: 12, offset: 60959}, name: "VALUE", }, }, }, }, &actionExpr{ - pos: position{line: 1930, col: 5, offset: 60901}, + pos: position{line: 1933, col: 5, offset: 60991}, run: (*parser).callonOptSelectValue8, expr: &seqExpr{ - pos: position{line: 1930, col: 5, offset: 60901}, + pos: position{line: 1933, col: 5, offset: 60991}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1930, col: 5, offset: 60901}, + pos: position{line: 1933, col: 5, offset: 60991}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1930, col: 7, offset: 60903}, + pos: position{line: 1933, col: 7, offset: 60993}, name: "VALUE", }, }, }, }, &actionExpr{ - pos: position{line: 1931, col: 5, offset: 60974}, + pos: position{line: 1934, col: 5, offset: 61064}, run: (*parser).callonOptSelectValue12, expr: &litMatcher{ - pos: position{line: 1931, col: 5, offset: 60974}, + pos: position{line: 1934, col: 5, offset: 61064}, val: "", ignoreCase: false, want: "\"\"", @@ -13485,19 +13514,19 @@ var g = &grammar{ }, { name: "OptWithClause", - pos: position{line: 1933, col: 1, offset: 61017}, + pos: position{line: 1936, col: 1, offset: 61107}, expr: &choiceExpr{ - pos: position{line: 1934, col: 5, offset: 61036}, + pos: position{line: 1937, col: 5, offset: 61126}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1934, col: 5, offset: 61036}, + pos: position{line: 1937, col: 5, offset: 61126}, name: "WithClause", }, &actionExpr{ - pos: position{line: 1935, col: 5, offset: 61052}, + pos: position{line: 1938, col: 5, offset: 61142}, run: (*parser).callonOptWithClause3, expr: &litMatcher{ - pos: position{line: 1935, col: 5, offset: 61052}, + pos: position{line: 1938, col: 5, offset: 61142}, val: "", ignoreCase: false, want: "\"\"", @@ -13510,38 +13539,38 @@ var g = &grammar{ }, { name: "WithClause", - pos: position{line: 1937, col: 1, offset: 61085}, + pos: position{line: 1940, col: 1, offset: 61175}, expr: &actionExpr{ - pos: position{line: 1938, col: 5, offset: 61101}, + pos: position{line: 1941, col: 5, offset: 61191}, run: (*parser).callonWithClause1, expr: &seqExpr{ - pos: position{line: 1938, col: 5, offset: 61101}, + pos: position{line: 1941, col: 5, offset: 61191}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1938, col: 5, offset: 61101}, + pos: position{line: 1941, col: 5, offset: 61191}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1938, col: 7, offset: 61103}, + pos: position{line: 1941, col: 7, offset: 61193}, name: "WITH", }, &labeledExpr{ - pos: position{line: 1938, col: 12, offset: 61108}, + pos: position{line: 1941, col: 12, offset: 61198}, label: "r", expr: &ruleRefExpr{ - pos: position{line: 1938, col: 14, offset: 61110}, + pos: position{line: 1941, col: 14, offset: 61200}, name: "OptRecursive", }, }, &ruleRefExpr{ - pos: position{line: 1938, col: 27, offset: 61123}, + pos: position{line: 1941, col: 27, offset: 61213}, name: "_", }, &labeledExpr{ - pos: position{line: 1938, col: 29, offset: 61125}, + pos: position{line: 1941, col: 29, offset: 61215}, label: "ctes", expr: &ruleRefExpr{ - pos: position{line: 1938, col: 34, offset: 61130}, + pos: position{line: 1941, col: 34, offset: 61220}, name: "CteList", }, }, @@ -13553,32 +13582,32 @@ var g = &grammar{ }, { name: "OptRecursive", - pos: position{line: 1947, col: 1, offset: 61315}, + pos: position{line: 1950, col: 1, offset: 61405}, expr: &choiceExpr{ - pos: position{line: 1948, col: 5, offset: 61333}, + pos: position{line: 1951, col: 5, offset: 61423}, alternatives: []any{ &actionExpr{ - pos: position{line: 1948, col: 5, offset: 61333}, + pos: position{line: 1951, col: 5, offset: 61423}, run: (*parser).callonOptRecursive2, expr: &seqExpr{ - pos: position{line: 1948, col: 5, offset: 61333}, + pos: position{line: 1951, col: 5, offset: 61423}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1948, col: 5, offset: 61333}, + pos: position{line: 1951, col: 5, offset: 61423}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1948, col: 7, offset: 61335}, + pos: position{line: 1951, col: 7, offset: 61425}, name: "RECURSIVE", }, }, }, }, &actionExpr{ - pos: position{line: 1949, col: 5, offset: 61371}, + pos: position{line: 1952, col: 5, offset: 61461}, run: (*parser).callonOptRecursive6, expr: &litMatcher{ - pos: position{line: 1949, col: 5, offset: 61371}, + pos: position{line: 1952, col: 5, offset: 61461}, val: "", ignoreCase: false, want: "\"\"", @@ -13591,51 +13620,51 @@ var g = &grammar{ }, { name: "CteList", - pos: position{line: 1951, col: 1, offset: 61410}, + pos: position{line: 1954, col: 1, offset: 61500}, expr: &actionExpr{ - pos: position{line: 1951, col: 11, offset: 61420}, + pos: position{line: 1954, col: 11, offset: 61510}, run: (*parser).callonCteList1, expr: &seqExpr{ - pos: position{line: 1951, col: 11, offset: 61420}, + pos: position{line: 1954, col: 11, offset: 61510}, exprs: []any{ &labeledExpr{ - pos: position{line: 1951, col: 11, offset: 61420}, + pos: position{line: 1954, col: 11, offset: 61510}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1951, col: 17, offset: 61426}, + pos: position{line: 1954, col: 17, offset: 61516}, name: "Cte", }, }, &labeledExpr{ - pos: position{line: 1951, col: 21, offset: 61430}, + pos: position{line: 1954, col: 21, offset: 61520}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1951, col: 26, offset: 61435}, + pos: position{line: 1954, col: 26, offset: 61525}, expr: &actionExpr{ - pos: position{line: 1951, col: 28, offset: 61437}, + pos: position{line: 1954, col: 28, offset: 61527}, run: (*parser).callonCteList7, expr: &seqExpr{ - pos: position{line: 1951, col: 28, offset: 61437}, + pos: position{line: 1954, col: 28, offset: 61527}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1951, col: 28, offset: 61437}, + pos: position{line: 1954, col: 28, offset: 61527}, name: "__", }, &litMatcher{ - pos: position{line: 1951, col: 31, offset: 61440}, + pos: position{line: 1954, col: 31, offset: 61530}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1951, col: 35, offset: 61444}, + pos: position{line: 1954, col: 35, offset: 61534}, name: "__", }, &labeledExpr{ - pos: position{line: 1951, col: 38, offset: 61447}, + pos: position{line: 1954, col: 38, offset: 61537}, label: "cte", expr: &ruleRefExpr{ - pos: position{line: 1951, col: 42, offset: 61451}, + pos: position{line: 1954, col: 42, offset: 61541}, name: "Cte", }, }, @@ -13652,65 +13681,65 @@ var g = &grammar{ }, { name: "Cte", - pos: position{line: 1955, col: 1, offset: 61520}, + pos: position{line: 1958, col: 1, offset: 61610}, expr: &actionExpr{ - pos: position{line: 1956, col: 5, offset: 61528}, + pos: position{line: 1959, col: 5, offset: 61618}, run: (*parser).callonCte1, expr: &seqExpr{ - pos: position{line: 1956, col: 5, offset: 61528}, + pos: position{line: 1959, col: 5, offset: 61618}, exprs: []any{ &labeledExpr{ - pos: position{line: 1956, col: 5, offset: 61528}, + pos: position{line: 1959, col: 5, offset: 61618}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1956, col: 10, offset: 61533}, + pos: position{line: 1959, col: 10, offset: 61623}, name: "AliasName", }, }, &ruleRefExpr{ - pos: position{line: 1956, col: 20, offset: 61543}, + pos: position{line: 1959, col: 20, offset: 61633}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1956, col: 22, offset: 61545}, + pos: position{line: 1959, col: 22, offset: 61635}, name: "AS", }, &labeledExpr{ - pos: position{line: 1956, col: 25, offset: 61548}, + pos: position{line: 1959, col: 25, offset: 61638}, label: "m", expr: &ruleRefExpr{ - pos: position{line: 1956, col: 27, offset: 61550}, + pos: position{line: 1959, col: 27, offset: 61640}, name: "OptMaterialized", }, }, &ruleRefExpr{ - pos: position{line: 1956, col: 43, offset: 61566}, + pos: position{line: 1959, col: 43, offset: 61656}, name: "__", }, &litMatcher{ - pos: position{line: 1956, col: 46, offset: 61569}, + pos: position{line: 1959, col: 46, offset: 61659}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1956, col: 50, offset: 61573}, + pos: position{line: 1959, col: 50, offset: 61663}, name: "__", }, &labeledExpr{ - pos: position{line: 1956, col: 53, offset: 61576}, + pos: position{line: 1959, col: 53, offset: 61666}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1956, col: 55, offset: 61578}, + pos: position{line: 1959, col: 55, offset: 61668}, name: "SQLPipe", }, }, &ruleRefExpr{ - pos: position{line: 1956, col: 63, offset: 61586}, + pos: position{line: 1959, col: 63, offset: 61676}, name: "__", }, &litMatcher{ - pos: position{line: 1956, col: 66, offset: 61589}, + pos: position{line: 1959, col: 66, offset: 61679}, val: ")", ignoreCase: false, want: "\")\"", @@ -13723,9 +13752,9 @@ var g = &grammar{ }, { name: "AliasName", - pos: position{line: 1965, col: 1, offset: 61764}, + pos: position{line: 1968, col: 1, offset: 61854}, expr: &ruleRefExpr{ - pos: position{line: 1965, col: 13, offset: 61776}, + pos: position{line: 1968, col: 13, offset: 61866}, name: "Identifier", }, leader: false, @@ -13733,65 +13762,65 @@ var g = &grammar{ }, { name: "OptMaterialized", - pos: position{line: 1967, col: 1, offset: 61788}, + pos: position{line: 1970, col: 1, offset: 61878}, expr: &choiceExpr{ - pos: position{line: 1968, col: 5, offset: 61809}, + pos: position{line: 1971, col: 5, offset: 61899}, alternatives: []any{ &actionExpr{ - pos: position{line: 1968, col: 5, offset: 61809}, + pos: position{line: 1971, col: 5, offset: 61899}, run: (*parser).callonOptMaterialized2, expr: &seqExpr{ - pos: position{line: 1968, col: 5, offset: 61809}, + pos: position{line: 1971, col: 5, offset: 61899}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1968, col: 5, offset: 61809}, + pos: position{line: 1971, col: 5, offset: 61899}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1968, col: 7, offset: 61811}, + pos: position{line: 1971, col: 7, offset: 61901}, name: "MATERIALIZED", }, &ruleRefExpr{ - pos: position{line: 1968, col: 20, offset: 61824}, + pos: position{line: 1971, col: 20, offset: 61914}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 1969, col: 5, offset: 61863}, + pos: position{line: 1972, col: 5, offset: 61953}, run: (*parser).callonOptMaterialized7, expr: &seqExpr{ - pos: position{line: 1969, col: 5, offset: 61863}, + pos: position{line: 1972, col: 5, offset: 61953}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1969, col: 5, offset: 61863}, + pos: position{line: 1972, col: 5, offset: 61953}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1969, col: 7, offset: 61865}, + pos: position{line: 1972, col: 7, offset: 61955}, name: "NOT", }, &ruleRefExpr{ - pos: position{line: 1969, col: 11, offset: 61869}, + pos: position{line: 1972, col: 11, offset: 61959}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1969, col: 13, offset: 61871}, + pos: position{line: 1972, col: 13, offset: 61961}, name: "MATERIALIZED", }, &ruleRefExpr{ - pos: position{line: 1969, col: 26, offset: 61884}, + pos: position{line: 1972, col: 26, offset: 61974}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 1970, col: 5, offset: 61915}, + pos: position{line: 1973, col: 5, offset: 62005}, run: (*parser).callonOptMaterialized14, expr: &litMatcher{ - pos: position{line: 1970, col: 5, offset: 61915}, + pos: position{line: 1973, col: 5, offset: 62005}, val: "", ignoreCase: false, want: "\"\"", @@ -13804,25 +13833,25 @@ var g = &grammar{ }, { name: "OptAllClause", - pos: position{line: 1972, col: 1, offset: 61970}, + pos: position{line: 1975, col: 1, offset: 62060}, expr: &choiceExpr{ - pos: position{line: 1973, col: 5, offset: 61987}, + pos: position{line: 1976, col: 5, offset: 62077}, alternatives: []any{ &seqExpr{ - pos: position{line: 1973, col: 5, offset: 61987}, + pos: position{line: 1976, col: 5, offset: 62077}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1973, col: 5, offset: 61987}, + pos: position{line: 1976, col: 5, offset: 62077}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1973, col: 7, offset: 61989}, + pos: position{line: 1976, col: 7, offset: 62079}, name: "ALL", }, }, }, &litMatcher{ - pos: position{line: 1974, col: 5, offset: 61998}, + pos: position{line: 1977, col: 5, offset: 62088}, val: "", ignoreCase: false, want: "\"\"", @@ -13834,25 +13863,25 @@ var g = &grammar{ }, { name: "OptFromClause", - pos: position{line: 1976, col: 1, offset: 62002}, + pos: position{line: 1979, col: 1, offset: 62092}, expr: &choiceExpr{ - pos: position{line: 1977, col: 5, offset: 62020}, + pos: position{line: 1980, col: 5, offset: 62110}, alternatives: []any{ &actionExpr{ - pos: position{line: 1977, col: 5, offset: 62020}, + pos: position{line: 1980, col: 5, offset: 62110}, run: (*parser).callonOptFromClause2, expr: &seqExpr{ - pos: position{line: 1977, col: 5, offset: 62020}, + pos: position{line: 1980, col: 5, offset: 62110}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1977, col: 5, offset: 62020}, + pos: position{line: 1980, col: 5, offset: 62110}, name: "_", }, &labeledExpr{ - pos: position{line: 1977, col: 7, offset: 62022}, + pos: position{line: 1980, col: 7, offset: 62112}, label: "from", expr: &ruleRefExpr{ - pos: position{line: 1977, col: 12, offset: 62027}, + pos: position{line: 1980, col: 12, offset: 62117}, name: "FromOp", }, }, @@ -13860,10 +13889,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1980, col: 5, offset: 62069}, + pos: position{line: 1983, col: 5, offset: 62159}, run: (*parser).callonOptFromClause7, expr: &litMatcher{ - pos: position{line: 1980, col: 5, offset: 62069}, + pos: position{line: 1983, col: 5, offset: 62159}, val: "", ignoreCase: false, want: "\"\"", @@ -13876,27 +13905,27 @@ var g = &grammar{ }, { name: "OptWhereClause", - pos: position{line: 1982, col: 1, offset: 62110}, + pos: position{line: 1985, col: 1, offset: 62200}, expr: &choiceExpr{ - pos: position{line: 1983, col: 5, offset: 62129}, + pos: position{line: 1986, col: 5, offset: 62219}, alternatives: []any{ &actionExpr{ - pos: position{line: 1983, col: 5, offset: 62129}, + pos: position{line: 1986, col: 5, offset: 62219}, run: (*parser).callonOptWhereClause2, expr: &labeledExpr{ - pos: position{line: 1983, col: 5, offset: 62129}, + pos: position{line: 1986, col: 5, offset: 62219}, label: "where", expr: &ruleRefExpr{ - pos: position{line: 1983, col: 11, offset: 62135}, + pos: position{line: 1986, col: 11, offset: 62225}, name: "WhereClause", }, }, }, &actionExpr{ - pos: position{line: 1984, col: 5, offset: 62177}, + pos: position{line: 1987, col: 5, offset: 62267}, run: (*parser).callonOptWhereClause5, expr: &litMatcher{ - pos: position{line: 1984, col: 5, offset: 62177}, + pos: position{line: 1987, col: 5, offset: 62267}, val: "", ignoreCase: false, want: "\"\"", @@ -13909,25 +13938,25 @@ var g = &grammar{ }, { name: "OptGroupClause", - pos: position{line: 1986, col: 1, offset: 62222}, + pos: position{line: 1989, col: 1, offset: 62312}, expr: &choiceExpr{ - pos: position{line: 1987, col: 5, offset: 62241}, + pos: position{line: 1990, col: 5, offset: 62331}, alternatives: []any{ &actionExpr{ - pos: position{line: 1987, col: 5, offset: 62241}, + pos: position{line: 1990, col: 5, offset: 62331}, run: (*parser).callonOptGroupClause2, expr: &seqExpr{ - pos: position{line: 1987, col: 5, offset: 62241}, + pos: position{line: 1990, col: 5, offset: 62331}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1987, col: 5, offset: 62241}, + pos: position{line: 1990, col: 5, offset: 62331}, name: "_", }, &labeledExpr{ - pos: position{line: 1987, col: 7, offset: 62243}, + pos: position{line: 1990, col: 7, offset: 62333}, label: "group", expr: &ruleRefExpr{ - pos: position{line: 1987, col: 13, offset: 62249}, + pos: position{line: 1990, col: 13, offset: 62339}, name: "GroupClause", }, }, @@ -13935,10 +13964,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1988, col: 5, offset: 62287}, + pos: position{line: 1991, col: 5, offset: 62377}, run: (*parser).callonOptGroupClause7, expr: &litMatcher{ - pos: position{line: 1988, col: 5, offset: 62287}, + pos: position{line: 1991, col: 5, offset: 62377}, val: "", ignoreCase: false, want: "\"\"", @@ -13951,34 +13980,34 @@ var g = &grammar{ }, { name: "GroupClause", - pos: position{line: 1990, col: 1, offset: 62328}, + pos: position{line: 1993, col: 1, offset: 62418}, expr: &actionExpr{ - pos: position{line: 1991, col: 5, offset: 62344}, + pos: position{line: 1994, col: 5, offset: 62434}, run: (*parser).callonGroupClause1, expr: &seqExpr{ - pos: position{line: 1991, col: 5, offset: 62344}, + pos: position{line: 1994, col: 5, offset: 62434}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1991, col: 5, offset: 62344}, + pos: position{line: 1994, col: 5, offset: 62434}, name: "GROUP", }, &ruleRefExpr{ - pos: position{line: 1991, col: 11, offset: 62350}, + pos: position{line: 1994, col: 11, offset: 62440}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1991, col: 13, offset: 62352}, + pos: position{line: 1994, col: 13, offset: 62442}, name: "BY", }, &ruleRefExpr{ - pos: position{line: 1991, col: 16, offset: 62355}, + pos: position{line: 1994, col: 16, offset: 62445}, name: "_", }, &labeledExpr{ - pos: position{line: 1991, col: 18, offset: 62357}, + pos: position{line: 1994, col: 18, offset: 62447}, label: "list", expr: &ruleRefExpr{ - pos: position{line: 1991, col: 23, offset: 62362}, + pos: position{line: 1994, col: 23, offset: 62452}, name: "GroupByList", }, }, @@ -13990,51 +14019,51 @@ var g = &grammar{ }, { name: "GroupByList", - pos: position{line: 1993, col: 1, offset: 62396}, + pos: position{line: 1996, col: 1, offset: 62486}, expr: &actionExpr{ - pos: position{line: 1994, col: 5, offset: 62413}, + pos: position{line: 1997, col: 5, offset: 62503}, run: (*parser).callonGroupByList1, expr: &seqExpr{ - pos: position{line: 1994, col: 5, offset: 62413}, + pos: position{line: 1997, col: 5, offset: 62503}, exprs: []any{ &labeledExpr{ - pos: position{line: 1994, col: 5, offset: 62413}, + pos: position{line: 1997, col: 5, offset: 62503}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1994, col: 11, offset: 62419}, + pos: position{line: 1997, col: 11, offset: 62509}, name: "GroupByItem", }, }, &labeledExpr{ - pos: position{line: 1994, col: 23, offset: 62431}, + pos: position{line: 1997, col: 23, offset: 62521}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1994, col: 28, offset: 62436}, + pos: position{line: 1997, col: 28, offset: 62526}, expr: &actionExpr{ - pos: position{line: 1994, col: 30, offset: 62438}, + pos: position{line: 1997, col: 30, offset: 62528}, run: (*parser).callonGroupByList7, expr: &seqExpr{ - pos: position{line: 1994, col: 30, offset: 62438}, + pos: position{line: 1997, col: 30, offset: 62528}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1994, col: 30, offset: 62438}, + pos: position{line: 1997, col: 30, offset: 62528}, name: "__", }, &litMatcher{ - pos: position{line: 1994, col: 33, offset: 62441}, + pos: position{line: 1997, col: 33, offset: 62531}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1994, col: 37, offset: 62445}, + pos: position{line: 1997, col: 37, offset: 62535}, name: "__", }, &labeledExpr{ - pos: position{line: 1994, col: 40, offset: 62448}, + pos: position{line: 1997, col: 40, offset: 62538}, label: "g", expr: &ruleRefExpr{ - pos: position{line: 1994, col: 42, offset: 62450}, + pos: position{line: 1997, col: 42, offset: 62540}, name: "GroupByItem", }, }, @@ -14051,9 +14080,9 @@ var g = &grammar{ }, { name: "GroupByItem", - pos: position{line: 1998, col: 1, offset: 62531}, + pos: position{line: 2001, col: 1, offset: 62621}, expr: &ruleRefExpr{ - pos: position{line: 1998, col: 15, offset: 62545}, + pos: position{line: 2001, col: 15, offset: 62635}, name: "Expr", }, leader: false, @@ -14061,25 +14090,25 @@ var g = &grammar{ }, { name: "OptHavingClause", - pos: position{line: 2000, col: 1, offset: 62551}, + pos: position{line: 2003, col: 1, offset: 62641}, expr: &choiceExpr{ - pos: position{line: 2001, col: 5, offset: 62571}, + pos: position{line: 2004, col: 5, offset: 62661}, alternatives: []any{ &actionExpr{ - pos: position{line: 2001, col: 5, offset: 62571}, + pos: position{line: 2004, col: 5, offset: 62661}, run: (*parser).callonOptHavingClause2, expr: &seqExpr{ - pos: position{line: 2001, col: 5, offset: 62571}, + pos: position{line: 2004, col: 5, offset: 62661}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2001, col: 5, offset: 62571}, + pos: position{line: 2004, col: 5, offset: 62661}, name: "_", }, &labeledExpr{ - pos: position{line: 2001, col: 7, offset: 62573}, + pos: position{line: 2004, col: 7, offset: 62663}, label: "h", expr: &ruleRefExpr{ - pos: position{line: 2001, col: 9, offset: 62575}, + pos: position{line: 2004, col: 9, offset: 62665}, name: "HavingClause", }, }, @@ -14087,10 +14116,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2002, col: 5, offset: 62610}, + pos: position{line: 2005, col: 5, offset: 62700}, run: (*parser).callonOptHavingClause7, expr: &litMatcher{ - pos: position{line: 2002, col: 5, offset: 62610}, + pos: position{line: 2005, col: 5, offset: 62700}, val: "", ignoreCase: false, want: "\"\"", @@ -14103,26 +14132,26 @@ var g = &grammar{ }, { name: "HavingClause", - pos: position{line: 2004, col: 1, offset: 62634}, + pos: position{line: 2007, col: 1, offset: 62724}, expr: &actionExpr{ - pos: position{line: 2005, col: 5, offset: 62651}, + pos: position{line: 2008, col: 5, offset: 62741}, run: (*parser).callonHavingClause1, expr: &seqExpr{ - pos: position{line: 2005, col: 5, offset: 62651}, + pos: position{line: 2008, col: 5, offset: 62741}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2005, col: 5, offset: 62651}, + pos: position{line: 2008, col: 5, offset: 62741}, name: "HAVING", }, &ruleRefExpr{ - pos: position{line: 2005, col: 12, offset: 62658}, + pos: position{line: 2008, col: 12, offset: 62748}, name: "_", }, &labeledExpr{ - pos: position{line: 2005, col: 14, offset: 62660}, + pos: position{line: 2008, col: 14, offset: 62750}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2005, col: 16, offset: 62662}, + pos: position{line: 2008, col: 16, offset: 62752}, name: "Expr", }, }, @@ -14134,49 +14163,49 @@ var g = &grammar{ }, { name: "JoinOperation", - pos: position{line: 2007, col: 1, offset: 62686}, + pos: position{line: 2010, col: 1, offset: 62776}, expr: &choiceExpr{ - pos: position{line: 2008, col: 5, offset: 62704}, + pos: position{line: 2011, col: 5, offset: 62794}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 2008, col: 5, offset: 62704}, + pos: position{line: 2011, col: 5, offset: 62794}, name: "CrossJoin", }, &ruleRefExpr{ - pos: position{line: 2009, col: 5, offset: 62718}, + pos: position{line: 2012, col: 5, offset: 62808}, name: "ConditionJoin", }, }, }, - leader: false, + leader: true, leftRecursive: true, }, { name: "CrossJoin", - pos: position{line: 2011, col: 1, offset: 62733}, + pos: position{line: 2014, col: 1, offset: 62823}, expr: &actionExpr{ - pos: position{line: 2012, col: 5, offset: 62747}, + pos: position{line: 2015, col: 5, offset: 62837}, run: (*parser).callonCrossJoin1, expr: &seqExpr{ - pos: position{line: 2012, col: 5, offset: 62747}, + pos: position{line: 2015, col: 5, offset: 62837}, exprs: []any{ &labeledExpr{ - pos: position{line: 2012, col: 5, offset: 62747}, + pos: position{line: 2015, col: 5, offset: 62837}, label: "left", expr: &ruleRefExpr{ - pos: position{line: 2012, col: 10, offset: 62752}, + pos: position{line: 2015, col: 10, offset: 62842}, name: "FromElem", }, }, &ruleRefExpr{ - pos: position{line: 2012, col: 19, offset: 62761}, + pos: position{line: 2015, col: 19, offset: 62851}, name: "CrossJoinOp", }, &labeledExpr{ - pos: position{line: 2012, col: 31, offset: 62773}, + pos: position{line: 2015, col: 31, offset: 62863}, label: "right", expr: &ruleRefExpr{ - pos: position{line: 2012, col: 37, offset: 62779}, + pos: position{line: 2015, col: 37, offset: 62869}, name: "FromElem", }, }, @@ -14188,50 +14217,50 @@ var g = &grammar{ }, { name: "CrossJoinOp", - pos: position{line: 2021, col: 1, offset: 62981}, + pos: position{line: 2024, col: 1, offset: 63071}, expr: &choiceExpr{ - pos: position{line: 2022, col: 5, offset: 62998}, + pos: position{line: 2025, col: 5, offset: 63088}, alternatives: []any{ &seqExpr{ - pos: position{line: 2022, col: 5, offset: 62998}, + pos: position{line: 2025, col: 5, offset: 63088}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2022, col: 5, offset: 62998}, + pos: position{line: 2025, col: 5, offset: 63088}, name: "__", }, &litMatcher{ - pos: position{line: 2022, col: 8, offset: 63001}, + pos: position{line: 2025, col: 8, offset: 63091}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 2022, col: 12, offset: 63005}, + pos: position{line: 2025, col: 12, offset: 63095}, name: "__", }, }, }, &seqExpr{ - pos: position{line: 2023, col: 5, offset: 63013}, + pos: position{line: 2026, col: 5, offset: 63103}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2023, col: 5, offset: 63013}, + pos: position{line: 2026, col: 5, offset: 63103}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2023, col: 7, offset: 63015}, + pos: position{line: 2026, col: 7, offset: 63105}, name: "CROSS", }, &ruleRefExpr{ - pos: position{line: 2023, col: 13, offset: 63021}, + pos: position{line: 2026, col: 13, offset: 63111}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2023, col: 15, offset: 63023}, + pos: position{line: 2026, col: 15, offset: 63113}, name: "JOIN", }, &ruleRefExpr{ - pos: position{line: 2023, col: 20, offset: 63028}, + pos: position{line: 2026, col: 20, offset: 63118}, name: "_", }, }, @@ -14243,46 +14272,46 @@ var g = &grammar{ }, { name: "ConditionJoin", - pos: position{line: 2025, col: 1, offset: 63032}, + pos: position{line: 2028, col: 1, offset: 63122}, expr: &actionExpr{ - pos: position{line: 2026, col: 5, offset: 63050}, + pos: position{line: 2029, col: 5, offset: 63140}, run: (*parser).callonConditionJoin1, expr: &seqExpr{ - pos: position{line: 2026, col: 5, offset: 63050}, + pos: position{line: 2029, col: 5, offset: 63140}, exprs: []any{ &labeledExpr{ - pos: position{line: 2026, col: 5, offset: 63050}, + pos: position{line: 2029, col: 5, offset: 63140}, label: "left", expr: &ruleRefExpr{ - pos: position{line: 2026, col: 10, offset: 63055}, + pos: position{line: 2029, col: 10, offset: 63145}, name: "FromElem", }, }, &labeledExpr{ - pos: position{line: 2026, col: 19, offset: 63064}, + pos: position{line: 2029, col: 19, offset: 63154}, label: "style", expr: &ruleRefExpr{ - pos: position{line: 2026, col: 25, offset: 63070}, + pos: position{line: 2029, col: 25, offset: 63160}, name: "SQLJoinStyle", }, }, &ruleRefExpr{ - pos: position{line: 2026, col: 38, offset: 63083}, + pos: position{line: 2029, col: 38, offset: 63173}, name: "_", }, &labeledExpr{ - pos: position{line: 2026, col: 40, offset: 63085}, + pos: position{line: 2029, col: 40, offset: 63175}, label: "right", expr: &ruleRefExpr{ - pos: position{line: 2026, col: 46, offset: 63091}, + pos: position{line: 2029, col: 46, offset: 63181}, name: "FromElem", }, }, &labeledExpr{ - pos: position{line: 2026, col: 55, offset: 63100}, + pos: position{line: 2029, col: 55, offset: 63190}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2026, col: 57, offset: 63102}, + pos: position{line: 2029, col: 57, offset: 63192}, name: "JoinExpr", }, }, @@ -14294,161 +14323,161 @@ var g = &grammar{ }, { name: "SQLJoinStyle", - pos: position{line: 2037, col: 1, offset: 63371}, + pos: position{line: 2040, col: 1, offset: 63461}, expr: &choiceExpr{ - pos: position{line: 2038, col: 5, offset: 63389}, + pos: position{line: 2041, col: 5, offset: 63479}, alternatives: []any{ &actionExpr{ - pos: position{line: 2038, col: 5, offset: 63389}, + pos: position{line: 2041, col: 5, offset: 63479}, run: (*parser).callonSQLJoinStyle2, expr: &seqExpr{ - pos: position{line: 2038, col: 5, offset: 63389}, + pos: position{line: 2041, col: 5, offset: 63479}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 2038, col: 5, offset: 63389}, + pos: position{line: 2041, col: 5, offset: 63479}, expr: &seqExpr{ - pos: position{line: 2038, col: 6, offset: 63390}, + pos: position{line: 2041, col: 6, offset: 63480}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2038, col: 6, offset: 63390}, + pos: position{line: 2041, col: 6, offset: 63480}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2038, col: 8, offset: 63392}, + pos: position{line: 2041, col: 8, offset: 63482}, name: "INNER", }, }, }, }, &ruleRefExpr{ - pos: position{line: 2038, col: 16, offset: 63400}, + pos: position{line: 2041, col: 16, offset: 63490}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2038, col: 18, offset: 63402}, + pos: position{line: 2041, col: 18, offset: 63492}, name: "JOIN", }, }, }, }, &actionExpr{ - pos: position{line: 2039, col: 5, offset: 63447}, + pos: position{line: 2042, col: 5, offset: 63537}, run: (*parser).callonSQLJoinStyle10, expr: &seqExpr{ - pos: position{line: 2039, col: 5, offset: 63447}, + pos: position{line: 2042, col: 5, offset: 63537}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2039, col: 5, offset: 63447}, + pos: position{line: 2042, col: 5, offset: 63537}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2039, col: 7, offset: 63449}, + pos: position{line: 2042, col: 7, offset: 63539}, name: "FULL", }, &zeroOrOneExpr{ - pos: position{line: 2039, col: 12, offset: 63454}, + pos: position{line: 2042, col: 12, offset: 63544}, expr: &seqExpr{ - pos: position{line: 2039, col: 13, offset: 63455}, + pos: position{line: 2042, col: 13, offset: 63545}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2039, col: 13, offset: 63455}, + pos: position{line: 2042, col: 13, offset: 63545}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2039, col: 15, offset: 63457}, + pos: position{line: 2042, col: 15, offset: 63547}, name: "OUTER", }, }, }, }, &ruleRefExpr{ - pos: position{line: 2039, col: 23, offset: 63465}, + pos: position{line: 2042, col: 23, offset: 63555}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2039, col: 25, offset: 63467}, + pos: position{line: 2042, col: 25, offset: 63557}, name: "JOIN", }, }, }, }, &actionExpr{ - pos: position{line: 2040, col: 5, offset: 63501}, + pos: position{line: 2043, col: 5, offset: 63591}, run: (*parser).callonSQLJoinStyle20, expr: &seqExpr{ - pos: position{line: 2040, col: 5, offset: 63501}, + pos: position{line: 2043, col: 5, offset: 63591}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2040, col: 5, offset: 63501}, + pos: position{line: 2043, col: 5, offset: 63591}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2040, col: 7, offset: 63503}, + pos: position{line: 2043, col: 7, offset: 63593}, name: "LEFT", }, &zeroOrOneExpr{ - pos: position{line: 2040, col: 12, offset: 63508}, + pos: position{line: 2043, col: 12, offset: 63598}, expr: &seqExpr{ - pos: position{line: 2040, col: 13, offset: 63509}, + pos: position{line: 2043, col: 13, offset: 63599}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2040, col: 13, offset: 63509}, + pos: position{line: 2043, col: 13, offset: 63599}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2040, col: 15, offset: 63511}, + pos: position{line: 2043, col: 15, offset: 63601}, name: "OUTER", }, }, }, }, &ruleRefExpr{ - pos: position{line: 2040, col: 23, offset: 63519}, + pos: position{line: 2043, col: 23, offset: 63609}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2040, col: 25, offset: 63521}, + pos: position{line: 2043, col: 25, offset: 63611}, name: "JOIN", }, }, }, }, &actionExpr{ - pos: position{line: 2041, col: 5, offset: 63555}, + pos: position{line: 2044, col: 5, offset: 63645}, run: (*parser).callonSQLJoinStyle30, expr: &seqExpr{ - pos: position{line: 2041, col: 5, offset: 63555}, + pos: position{line: 2044, col: 5, offset: 63645}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2041, col: 5, offset: 63555}, + pos: position{line: 2044, col: 5, offset: 63645}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2041, col: 7, offset: 63557}, + pos: position{line: 2044, col: 7, offset: 63647}, name: "RIGHT", }, &zeroOrOneExpr{ - pos: position{line: 2041, col: 13, offset: 63563}, + pos: position{line: 2044, col: 13, offset: 63653}, expr: &seqExpr{ - pos: position{line: 2041, col: 14, offset: 63564}, + pos: position{line: 2044, col: 14, offset: 63654}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2041, col: 14, offset: 63564}, + pos: position{line: 2044, col: 14, offset: 63654}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2041, col: 16, offset: 63566}, + pos: position{line: 2044, col: 16, offset: 63656}, name: "OUTER", }, }, }, }, &ruleRefExpr{ - pos: position{line: 2041, col: 24, offset: 63574}, + pos: position{line: 2044, col: 24, offset: 63664}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2041, col: 26, offset: 63576}, + pos: position{line: 2044, col: 26, offset: 63666}, name: "JOIN", }, }, @@ -14461,33 +14490,33 @@ var g = &grammar{ }, { name: "JoinExpr", - pos: position{line: 2043, col: 1, offset: 63608}, + pos: position{line: 2046, col: 1, offset: 63698}, expr: &choiceExpr{ - pos: position{line: 2044, col: 5, offset: 63622}, + pos: position{line: 2047, col: 5, offset: 63712}, alternatives: []any{ &actionExpr{ - pos: position{line: 2044, col: 5, offset: 63622}, + pos: position{line: 2047, col: 5, offset: 63712}, run: (*parser).callonJoinExpr2, expr: &seqExpr{ - pos: position{line: 2044, col: 5, offset: 63622}, + pos: position{line: 2047, col: 5, offset: 63712}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2044, col: 5, offset: 63622}, + pos: position{line: 2047, col: 5, offset: 63712}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2044, col: 7, offset: 63624}, + pos: position{line: 2047, col: 7, offset: 63714}, name: "ON", }, &ruleRefExpr{ - pos: position{line: 2044, col: 10, offset: 63627}, + pos: position{line: 2047, col: 10, offset: 63717}, name: "_", }, &labeledExpr{ - pos: position{line: 2044, col: 12, offset: 63629}, + pos: position{line: 2047, col: 12, offset: 63719}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2044, col: 14, offset: 63631}, + pos: position{line: 2047, col: 14, offset: 63721}, name: "Expr", }, }, @@ -14495,47 +14524,47 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2050, col: 5, offset: 63753}, + pos: position{line: 2053, col: 5, offset: 63843}, run: (*parser).callonJoinExpr9, expr: &seqExpr{ - pos: position{line: 2050, col: 5, offset: 63753}, + pos: position{line: 2053, col: 5, offset: 63843}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2050, col: 5, offset: 63753}, + pos: position{line: 2053, col: 5, offset: 63843}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2050, col: 7, offset: 63755}, + pos: position{line: 2053, col: 7, offset: 63845}, name: "USING", }, &ruleRefExpr{ - pos: position{line: 2050, col: 13, offset: 63761}, + pos: position{line: 2053, col: 13, offset: 63851}, name: "__", }, &litMatcher{ - pos: position{line: 2050, col: 16, offset: 63764}, + pos: position{line: 2053, col: 16, offset: 63854}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 2050, col: 20, offset: 63768}, + pos: position{line: 2053, col: 20, offset: 63858}, name: "__", }, &labeledExpr{ - pos: position{line: 2050, col: 23, offset: 63771}, + pos: position{line: 2053, col: 23, offset: 63861}, label: "fields", expr: &ruleRefExpr{ - pos: position{line: 2050, col: 30, offset: 63778}, + pos: position{line: 2053, col: 30, offset: 63868}, name: "FieldExprs", }, }, &ruleRefExpr{ - pos: position{line: 2050, col: 41, offset: 63789}, + pos: position{line: 2053, col: 41, offset: 63879}, name: "__", }, &litMatcher{ - pos: position{line: 2050, col: 44, offset: 63792}, + pos: position{line: 2053, col: 44, offset: 63882}, val: ")", ignoreCase: false, want: "\")\"", @@ -14550,40 +14579,40 @@ var g = &grammar{ }, { name: "OptOrdinality", - pos: position{line: 2057, col: 1, offset: 63929}, + pos: position{line: 2060, col: 1, offset: 64019}, expr: &choiceExpr{ - pos: position{line: 2058, col: 5, offset: 63948}, + pos: position{line: 2061, col: 5, offset: 64038}, alternatives: []any{ &actionExpr{ - pos: position{line: 2058, col: 5, offset: 63948}, + pos: position{line: 2061, col: 5, offset: 64038}, run: (*parser).callonOptOrdinality2, expr: &seqExpr{ - pos: position{line: 2058, col: 5, offset: 63948}, + pos: position{line: 2061, col: 5, offset: 64038}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2058, col: 5, offset: 63948}, + pos: position{line: 2061, col: 5, offset: 64038}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2058, col: 7, offset: 63950}, + pos: position{line: 2061, col: 7, offset: 64040}, name: "WITH", }, &ruleRefExpr{ - pos: position{line: 2058, col: 12, offset: 63955}, + pos: position{line: 2061, col: 12, offset: 64045}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2058, col: 14, offset: 63957}, + pos: position{line: 2061, col: 14, offset: 64047}, name: "ORDINALITY", }, }, }, }, &actionExpr{ - pos: position{line: 2064, col: 5, offset: 64086}, + pos: position{line: 2067, col: 5, offset: 64176}, run: (*parser).callonOptOrdinality8, expr: &litMatcher{ - pos: position{line: 2064, col: 5, offset: 64086}, + pos: position{line: 2067, col: 5, offset: 64176}, val: "", ignoreCase: false, want: "\"\"", @@ -14596,25 +14625,25 @@ var g = &grammar{ }, { name: "OptAlias", - pos: position{line: 2066, col: 1, offset: 64135}, + pos: position{line: 2069, col: 1, offset: 64225}, expr: &choiceExpr{ - pos: position{line: 2067, col: 5, offset: 64148}, + pos: position{line: 2070, col: 5, offset: 64238}, alternatives: []any{ &actionExpr{ - pos: position{line: 2067, col: 5, offset: 64148}, + pos: position{line: 2070, col: 5, offset: 64238}, run: (*parser).callonOptAlias2, expr: &seqExpr{ - pos: position{line: 2067, col: 5, offset: 64148}, + pos: position{line: 2070, col: 5, offset: 64238}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2067, col: 5, offset: 64148}, + pos: position{line: 2070, col: 5, offset: 64238}, name: "_", }, &labeledExpr{ - pos: position{line: 2067, col: 7, offset: 64150}, + pos: position{line: 2070, col: 7, offset: 64240}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 2067, col: 9, offset: 64152}, + pos: position{line: 2070, col: 9, offset: 64242}, name: "AliasClause", }, }, @@ -14622,10 +14651,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2068, col: 5, offset: 64186}, + pos: position{line: 2071, col: 5, offset: 64276}, run: (*parser).callonOptAlias7, expr: &litMatcher{ - pos: position{line: 2068, col: 5, offset: 64186}, + pos: position{line: 2071, col: 5, offset: 64276}, val: "", ignoreCase: false, want: "\"\"", @@ -14638,50 +14667,50 @@ var g = &grammar{ }, { name: "AliasClause", - pos: position{line: 2070, col: 1, offset: 64223}, + pos: position{line: 2073, col: 1, offset: 64313}, expr: &actionExpr{ - pos: position{line: 2071, col: 5, offset: 64240}, + pos: position{line: 2074, col: 5, offset: 64330}, run: (*parser).callonAliasClause1, expr: &seqExpr{ - pos: position{line: 2071, col: 5, offset: 64240}, + pos: position{line: 2074, col: 5, offset: 64330}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 2071, col: 5, offset: 64240}, + pos: position{line: 2074, col: 5, offset: 64330}, expr: &seqExpr{ - pos: position{line: 2071, col: 6, offset: 64241}, + pos: position{line: 2074, col: 6, offset: 64331}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2071, col: 6, offset: 64241}, + pos: position{line: 2074, col: 6, offset: 64331}, name: "AS", }, &ruleRefExpr{ - pos: position{line: 2071, col: 9, offset: 64244}, + pos: position{line: 2074, col: 9, offset: 64334}, name: "_", }, }, }, }, ¬Expr{ - pos: position{line: 2071, col: 13, offset: 64248}, + pos: position{line: 2074, col: 13, offset: 64338}, expr: &choiceExpr{ - pos: position{line: 2071, col: 15, offset: 64250}, + pos: position{line: 2074, col: 15, offset: 64340}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 2071, col: 15, offset: 64250}, + pos: position{line: 2074, col: 15, offset: 64340}, name: "SQLGuard", }, &ruleRefExpr{ - pos: position{line: 2071, col: 26, offset: 64261}, + pos: position{line: 2074, col: 26, offset: 64351}, name: "DeprecatedFroms", }, }, }, }, &labeledExpr{ - pos: position{line: 2071, col: 43, offset: 64278}, + pos: position{line: 2074, col: 43, offset: 64368}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 2071, col: 48, offset: 64283}, + pos: position{line: 2074, col: 48, offset: 64373}, name: "IdentifierName", }, }, @@ -14693,51 +14722,51 @@ var g = &grammar{ }, { name: "Selection", - pos: position{line: 2075, col: 1, offset: 64416}, + pos: position{line: 2078, col: 1, offset: 64506}, expr: &actionExpr{ - pos: position{line: 2076, col: 5, offset: 64430}, + pos: position{line: 2079, col: 5, offset: 64520}, run: (*parser).callonSelection1, expr: &seqExpr{ - pos: position{line: 2076, col: 5, offset: 64430}, + pos: position{line: 2079, col: 5, offset: 64520}, exprs: []any{ &labeledExpr{ - pos: position{line: 2076, col: 5, offset: 64430}, + pos: position{line: 2079, col: 5, offset: 64520}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 2076, col: 11, offset: 64436}, + pos: position{line: 2079, col: 11, offset: 64526}, name: "SelectElem", }, }, &labeledExpr{ - pos: position{line: 2076, col: 22, offset: 64447}, + pos: position{line: 2079, col: 22, offset: 64537}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 2076, col: 27, offset: 64452}, + pos: position{line: 2079, col: 27, offset: 64542}, expr: &actionExpr{ - pos: position{line: 2076, col: 29, offset: 64454}, + pos: position{line: 2079, col: 29, offset: 64544}, run: (*parser).callonSelection7, expr: &seqExpr{ - pos: position{line: 2076, col: 29, offset: 64454}, + pos: position{line: 2079, col: 29, offset: 64544}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2076, col: 29, offset: 64454}, + pos: position{line: 2079, col: 29, offset: 64544}, name: "__", }, &litMatcher{ - pos: position{line: 2076, col: 32, offset: 64457}, + pos: position{line: 2079, col: 32, offset: 64547}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 2076, col: 36, offset: 64461}, + pos: position{line: 2079, col: 36, offset: 64551}, name: "__", }, &labeledExpr{ - pos: position{line: 2076, col: 39, offset: 64464}, + pos: position{line: 2079, col: 39, offset: 64554}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 2076, col: 41, offset: 64466}, + pos: position{line: 2079, col: 41, offset: 64556}, name: "SelectElem", }, }, @@ -14754,29 +14783,29 @@ var g = &grammar{ }, { name: "SelectElem", - pos: position{line: 2085, col: 1, offset: 64692}, + pos: position{line: 2088, col: 1, offset: 64782}, expr: &choiceExpr{ - pos: position{line: 2086, col: 5, offset: 64708}, + pos: position{line: 2089, col: 5, offset: 64798}, alternatives: []any{ &actionExpr{ - pos: position{line: 2086, col: 5, offset: 64708}, + pos: position{line: 2089, col: 5, offset: 64798}, run: (*parser).callonSelectElem2, expr: &seqExpr{ - pos: position{line: 2086, col: 5, offset: 64708}, + pos: position{line: 2089, col: 5, offset: 64798}, exprs: []any{ &labeledExpr{ - pos: position{line: 2086, col: 5, offset: 64708}, + pos: position{line: 2089, col: 5, offset: 64798}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2086, col: 7, offset: 64710}, + pos: position{line: 2089, col: 7, offset: 64800}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 2086, col: 12, offset: 64715}, + pos: position{line: 2089, col: 12, offset: 64805}, label: "as", expr: &ruleRefExpr{ - pos: position{line: 2086, col: 15, offset: 64718}, + pos: position{line: 2089, col: 15, offset: 64808}, name: "OptAsClause", }, }, @@ -14784,10 +14813,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2097, col: 5, offset: 64934}, + pos: position{line: 2100, col: 5, offset: 65024}, run: (*parser).callonSelectElem8, expr: &litMatcher{ - pos: position{line: 2097, col: 5, offset: 64934}, + pos: position{line: 2100, col: 5, offset: 65024}, val: "*", ignoreCase: false, want: "\"*\"", @@ -14800,33 +14829,33 @@ var g = &grammar{ }, { name: "OptAsClause", - pos: position{line: 2102, col: 1, offset: 65036}, + pos: position{line: 2105, col: 1, offset: 65126}, expr: &choiceExpr{ - pos: position{line: 2103, col: 5, offset: 65053}, + pos: position{line: 2106, col: 5, offset: 65143}, alternatives: []any{ &actionExpr{ - pos: position{line: 2103, col: 5, offset: 65053}, + pos: position{line: 2106, col: 5, offset: 65143}, run: (*parser).callonOptAsClause2, expr: &seqExpr{ - pos: position{line: 2103, col: 5, offset: 65053}, + pos: position{line: 2106, col: 5, offset: 65143}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2103, col: 5, offset: 65053}, + pos: position{line: 2106, col: 5, offset: 65143}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2103, col: 7, offset: 65055}, + pos: position{line: 2106, col: 7, offset: 65145}, name: "AS", }, &ruleRefExpr{ - pos: position{line: 2103, col: 10, offset: 65058}, + pos: position{line: 2106, col: 10, offset: 65148}, name: "_", }, &labeledExpr{ - pos: position{line: 2103, col: 12, offset: 65060}, + pos: position{line: 2106, col: 12, offset: 65150}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 2103, col: 15, offset: 65063}, + pos: position{line: 2106, col: 15, offset: 65153}, name: "Identifier", }, }, @@ -14834,10 +14863,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2104, col: 5, offset: 65097}, + pos: position{line: 2107, col: 5, offset: 65187}, run: (*parser).callonOptAsClause9, expr: &litMatcher{ - pos: position{line: 2104, col: 5, offset: 65097}, + pos: position{line: 2107, col: 5, offset: 65187}, val: "", ignoreCase: false, want: "\"\"", @@ -14850,41 +14879,41 @@ var g = &grammar{ }, { name: "OptOrderByClause", - pos: position{line: 2106, col: 1, offset: 65122}, + pos: position{line: 2109, col: 1, offset: 65212}, expr: &choiceExpr{ - pos: position{line: 2107, col: 5, offset: 65144}, + pos: position{line: 2110, col: 5, offset: 65234}, alternatives: []any{ &actionExpr{ - pos: position{line: 2107, col: 5, offset: 65144}, + pos: position{line: 2110, col: 5, offset: 65234}, run: (*parser).callonOptOrderByClause2, expr: &seqExpr{ - pos: position{line: 2107, col: 5, offset: 65144}, + pos: position{line: 2110, col: 5, offset: 65234}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2107, col: 5, offset: 65144}, + pos: position{line: 2110, col: 5, offset: 65234}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2107, col: 7, offset: 65146}, + pos: position{line: 2110, col: 7, offset: 65236}, name: "ORDER", }, &ruleRefExpr{ - pos: position{line: 2107, col: 13, offset: 65152}, + pos: position{line: 2110, col: 13, offset: 65242}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2107, col: 15, offset: 65154}, + pos: position{line: 2110, col: 15, offset: 65244}, name: "BY", }, &ruleRefExpr{ - pos: position{line: 2107, col: 18, offset: 65157}, + pos: position{line: 2110, col: 18, offset: 65247}, name: "_", }, &labeledExpr{ - pos: position{line: 2107, col: 20, offset: 65159}, + pos: position{line: 2110, col: 20, offset: 65249}, label: "list", expr: &ruleRefExpr{ - pos: position{line: 2107, col: 25, offset: 65164}, + pos: position{line: 2110, col: 25, offset: 65254}, name: "OrderByList", }, }, @@ -14892,10 +14921,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2114, col: 5, offset: 65323}, + pos: position{line: 2117, col: 5, offset: 65413}, run: (*parser).callonOptOrderByClause11, expr: &litMatcher{ - pos: position{line: 2114, col: 5, offset: 65323}, + pos: position{line: 2117, col: 5, offset: 65413}, val: "", ignoreCase: false, want: "\"\"", @@ -14908,51 +14937,51 @@ var g = &grammar{ }, { name: "OrderByList", - pos: position{line: 2116, col: 1, offset: 65356}, + pos: position{line: 2119, col: 1, offset: 65446}, expr: &actionExpr{ - pos: position{line: 2117, col: 5, offset: 65373}, + pos: position{line: 2120, col: 5, offset: 65463}, run: (*parser).callonOrderByList1, expr: &seqExpr{ - pos: position{line: 2117, col: 5, offset: 65373}, + pos: position{line: 2120, col: 5, offset: 65463}, exprs: []any{ &labeledExpr{ - pos: position{line: 2117, col: 5, offset: 65373}, + pos: position{line: 2120, col: 5, offset: 65463}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 2117, col: 11, offset: 65379}, + pos: position{line: 2120, col: 11, offset: 65469}, name: "OrderByItem", }, }, &labeledExpr{ - pos: position{line: 2117, col: 23, offset: 65391}, + pos: position{line: 2120, col: 23, offset: 65481}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 2117, col: 28, offset: 65396}, + pos: position{line: 2120, col: 28, offset: 65486}, expr: &actionExpr{ - pos: position{line: 2117, col: 30, offset: 65398}, + pos: position{line: 2120, col: 30, offset: 65488}, run: (*parser).callonOrderByList7, expr: &seqExpr{ - pos: position{line: 2117, col: 30, offset: 65398}, + pos: position{line: 2120, col: 30, offset: 65488}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2117, col: 30, offset: 65398}, + pos: position{line: 2120, col: 30, offset: 65488}, name: "__", }, &litMatcher{ - pos: position{line: 2117, col: 33, offset: 65401}, + pos: position{line: 2120, col: 33, offset: 65491}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 2117, col: 37, offset: 65405}, + pos: position{line: 2120, col: 37, offset: 65495}, name: "__", }, &labeledExpr{ - pos: position{line: 2117, col: 40, offset: 65408}, + pos: position{line: 2120, col: 40, offset: 65498}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 2117, col: 42, offset: 65410}, + pos: position{line: 2120, col: 42, offset: 65500}, name: "OrderByItem", }, }, @@ -14969,34 +14998,34 @@ var g = &grammar{ }, { name: "OrderByItem", - pos: position{line: 2121, col: 1, offset: 65511}, + pos: position{line: 2124, col: 1, offset: 65601}, expr: &actionExpr{ - pos: position{line: 2122, col: 5, offset: 65527}, + pos: position{line: 2125, col: 5, offset: 65617}, run: (*parser).callonOrderByItem1, expr: &seqExpr{ - pos: position{line: 2122, col: 5, offset: 65527}, + pos: position{line: 2125, col: 5, offset: 65617}, exprs: []any{ &labeledExpr{ - pos: position{line: 2122, col: 5, offset: 65527}, + pos: position{line: 2125, col: 5, offset: 65617}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2122, col: 7, offset: 65529}, + pos: position{line: 2125, col: 7, offset: 65619}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 2122, col: 12, offset: 65534}, + pos: position{line: 2125, col: 12, offset: 65624}, label: "order", expr: &ruleRefExpr{ - pos: position{line: 2122, col: 18, offset: 65540}, + pos: position{line: 2125, col: 18, offset: 65630}, name: "OptAscDesc", }, }, &labeledExpr{ - pos: position{line: 2122, col: 29, offset: 65551}, + pos: position{line: 2125, col: 29, offset: 65641}, label: "nulls", expr: &ruleRefExpr{ - pos: position{line: 2122, col: 35, offset: 65557}, + pos: position{line: 2125, col: 35, offset: 65647}, name: "OptNullsOrder", }, }, @@ -15008,49 +15037,49 @@ var g = &grammar{ }, { name: "OptAscDesc", - pos: position{line: 2133, col: 1, offset: 65807}, + pos: position{line: 2136, col: 1, offset: 65897}, expr: &choiceExpr{ - pos: position{line: 2134, col: 5, offset: 65822}, + pos: position{line: 2137, col: 5, offset: 65912}, alternatives: []any{ &actionExpr{ - pos: position{line: 2134, col: 5, offset: 65822}, + pos: position{line: 2137, col: 5, offset: 65912}, run: (*parser).callonOptAscDesc2, expr: &seqExpr{ - pos: position{line: 2134, col: 5, offset: 65822}, + pos: position{line: 2137, col: 5, offset: 65912}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2134, col: 5, offset: 65822}, + pos: position{line: 2137, col: 5, offset: 65912}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2134, col: 7, offset: 65824}, + pos: position{line: 2137, col: 7, offset: 65914}, name: "ASC", }, }, }, }, &actionExpr{ - pos: position{line: 2135, col: 5, offset: 65896}, + pos: position{line: 2138, col: 5, offset: 65986}, run: (*parser).callonOptAscDesc6, expr: &seqExpr{ - pos: position{line: 2135, col: 5, offset: 65896}, + pos: position{line: 2138, col: 5, offset: 65986}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2135, col: 5, offset: 65896}, + pos: position{line: 2138, col: 5, offset: 65986}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2135, col: 7, offset: 65898}, + pos: position{line: 2138, col: 7, offset: 65988}, name: "DESC", }, }, }, }, &actionExpr{ - pos: position{line: 2136, col: 5, offset: 65970}, + pos: position{line: 2139, col: 5, offset: 66060}, run: (*parser).callonOptAscDesc10, expr: &litMatcher{ - pos: position{line: 2136, col: 5, offset: 65970}, + pos: position{line: 2139, col: 5, offset: 66060}, val: "", ignoreCase: false, want: "\"\"", @@ -15063,65 +15092,65 @@ var g = &grammar{ }, { name: "OptNullsOrder", - pos: position{line: 2138, col: 1, offset: 66002}, + pos: position{line: 2141, col: 1, offset: 66092}, expr: &choiceExpr{ - pos: position{line: 2139, col: 5, offset: 66020}, + pos: position{line: 2142, col: 5, offset: 66110}, alternatives: []any{ &actionExpr{ - pos: position{line: 2139, col: 5, offset: 66020}, + pos: position{line: 2142, col: 5, offset: 66110}, run: (*parser).callonOptNullsOrder2, expr: &seqExpr{ - pos: position{line: 2139, col: 5, offset: 66020}, + pos: position{line: 2142, col: 5, offset: 66110}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2139, col: 5, offset: 66020}, + pos: position{line: 2142, col: 5, offset: 66110}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2139, col: 7, offset: 66022}, + pos: position{line: 2142, col: 7, offset: 66112}, name: "NULLS", }, &ruleRefExpr{ - pos: position{line: 2139, col: 13, offset: 66028}, + pos: position{line: 2142, col: 13, offset: 66118}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2139, col: 15, offset: 66030}, + pos: position{line: 2142, col: 15, offset: 66120}, name: "FIRST", }, }, }, }, &actionExpr{ - pos: position{line: 2140, col: 5, offset: 66106}, + pos: position{line: 2143, col: 5, offset: 66196}, run: (*parser).callonOptNullsOrder8, expr: &seqExpr{ - pos: position{line: 2140, col: 5, offset: 66106}, + pos: position{line: 2143, col: 5, offset: 66196}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2140, col: 5, offset: 66106}, + pos: position{line: 2143, col: 5, offset: 66196}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2140, col: 7, offset: 66108}, + pos: position{line: 2143, col: 7, offset: 66198}, name: "NULLS", }, &ruleRefExpr{ - pos: position{line: 2140, col: 13, offset: 66114}, + pos: position{line: 2143, col: 13, offset: 66204}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2140, col: 15, offset: 66116}, + pos: position{line: 2143, col: 15, offset: 66206}, name: "LAST", }, }, }, }, &actionExpr{ - pos: position{line: 2141, col: 5, offset: 66191}, + pos: position{line: 2144, col: 5, offset: 66281}, run: (*parser).callonOptNullsOrder14, expr: &litMatcher{ - pos: position{line: 2141, col: 5, offset: 66191}, + pos: position{line: 2144, col: 5, offset: 66281}, val: "", ignoreCase: false, want: "\"\"", @@ -15134,29 +15163,29 @@ var g = &grammar{ }, { name: "SelectLimit", - pos: position{line: 2143, col: 1, offset: 66236}, + pos: position{line: 2146, col: 1, offset: 66326}, expr: &choiceExpr{ - pos: position{line: 2144, col: 5, offset: 66252}, + pos: position{line: 2147, col: 5, offset: 66342}, alternatives: []any{ &actionExpr{ - pos: position{line: 2144, col: 5, offset: 66252}, + pos: position{line: 2147, col: 5, offset: 66342}, run: (*parser).callonSelectLimit2, expr: &seqExpr{ - pos: position{line: 2144, col: 5, offset: 66252}, + pos: position{line: 2147, col: 5, offset: 66342}, exprs: []any{ &labeledExpr{ - pos: position{line: 2144, col: 5, offset: 66252}, + pos: position{line: 2147, col: 5, offset: 66342}, label: "l", expr: &ruleRefExpr{ - pos: position{line: 2144, col: 7, offset: 66254}, + pos: position{line: 2147, col: 7, offset: 66344}, name: "LimitClause", }, }, &labeledExpr{ - pos: position{line: 2144, col: 19, offset: 66266}, + pos: position{line: 2147, col: 19, offset: 66356}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 2144, col: 21, offset: 66268}, + pos: position{line: 2147, col: 21, offset: 66358}, name: "OptOffsetClause", }, }, @@ -15164,24 +15193,24 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2151, col: 5, offset: 66414}, + pos: position{line: 2154, col: 5, offset: 66504}, run: (*parser).callonSelectLimit8, expr: &seqExpr{ - pos: position{line: 2151, col: 5, offset: 66414}, + pos: position{line: 2154, col: 5, offset: 66504}, exprs: []any{ &labeledExpr{ - pos: position{line: 2151, col: 5, offset: 66414}, + pos: position{line: 2154, col: 5, offset: 66504}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 2151, col: 7, offset: 66416}, + pos: position{line: 2154, col: 7, offset: 66506}, name: "OffsetClause", }, }, &labeledExpr{ - pos: position{line: 2151, col: 20, offset: 66429}, + pos: position{line: 2154, col: 20, offset: 66519}, label: "l", expr: &ruleRefExpr{ - pos: position{line: 2151, col: 22, offset: 66431}, + pos: position{line: 2154, col: 22, offset: 66521}, name: "OptLimitClause", }, }, @@ -15195,25 +15224,25 @@ var g = &grammar{ }, { name: "OptLimitClause", - pos: position{line: 2164, col: 1, offset: 66703}, + pos: position{line: 2167, col: 1, offset: 66793}, expr: &choiceExpr{ - pos: position{line: 2165, col: 5, offset: 66723}, + pos: position{line: 2168, col: 5, offset: 66813}, alternatives: []any{ &actionExpr{ - pos: position{line: 2165, col: 5, offset: 66723}, + pos: position{line: 2168, col: 5, offset: 66813}, run: (*parser).callonOptLimitClause2, expr: &seqExpr{ - pos: position{line: 2165, col: 5, offset: 66723}, + pos: position{line: 2168, col: 5, offset: 66813}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2165, col: 5, offset: 66723}, + pos: position{line: 2168, col: 5, offset: 66813}, name: "_", }, &labeledExpr{ - pos: position{line: 2165, col: 7, offset: 66725}, + pos: position{line: 2168, col: 7, offset: 66815}, label: "l", expr: &ruleRefExpr{ - pos: position{line: 2165, col: 9, offset: 66727}, + pos: position{line: 2168, col: 9, offset: 66817}, name: "LimitClause", }, }, @@ -15221,10 +15250,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2166, col: 5, offset: 66761}, + pos: position{line: 2169, col: 5, offset: 66851}, run: (*parser).callonOptLimitClause7, expr: &litMatcher{ - pos: position{line: 2166, col: 5, offset: 66761}, + pos: position{line: 2169, col: 5, offset: 66851}, val: "", ignoreCase: false, want: "\"\"", @@ -15237,50 +15266,50 @@ var g = &grammar{ }, { name: "LimitClause", - pos: position{line: 2168, col: 1, offset: 66798}, + pos: position{line: 2171, col: 1, offset: 66888}, expr: &choiceExpr{ - pos: position{line: 2169, col: 5, offset: 66815}, + pos: position{line: 2172, col: 5, offset: 66905}, alternatives: []any{ &actionExpr{ - pos: position{line: 2169, col: 5, offset: 66815}, + pos: position{line: 2172, col: 5, offset: 66905}, run: (*parser).callonLimitClause2, expr: &seqExpr{ - pos: position{line: 2169, col: 5, offset: 66815}, + pos: position{line: 2172, col: 5, offset: 66905}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2169, col: 5, offset: 66815}, + pos: position{line: 2172, col: 5, offset: 66905}, name: "LIMIT", }, &ruleRefExpr{ - pos: position{line: 2169, col: 11, offset: 66821}, + pos: position{line: 2172, col: 11, offset: 66911}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2169, col: 13, offset: 66823}, + pos: position{line: 2172, col: 13, offset: 66913}, name: "ALL", }, }, }, }, &actionExpr{ - pos: position{line: 2170, col: 5, offset: 66885}, + pos: position{line: 2173, col: 5, offset: 66975}, run: (*parser).callonLimitClause7, expr: &seqExpr{ - pos: position{line: 2170, col: 5, offset: 66885}, + pos: position{line: 2173, col: 5, offset: 66975}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2170, col: 5, offset: 66885}, + pos: position{line: 2173, col: 5, offset: 66975}, name: "LIMIT", }, &ruleRefExpr{ - pos: position{line: 2170, col: 11, offset: 66891}, + pos: position{line: 2173, col: 11, offset: 66981}, name: "_", }, &labeledExpr{ - pos: position{line: 2170, col: 13, offset: 66893}, + pos: position{line: 2173, col: 13, offset: 66983}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2170, col: 15, offset: 66895}, + pos: position{line: 2173, col: 15, offset: 66985}, name: "Expr", }, }, @@ -15294,25 +15323,25 @@ var g = &grammar{ }, { name: "OptOffsetClause", - pos: position{line: 2178, col: 1, offset: 67020}, + pos: position{line: 2181, col: 1, offset: 67110}, expr: &choiceExpr{ - pos: position{line: 2179, col: 5, offset: 67041}, + pos: position{line: 2182, col: 5, offset: 67131}, alternatives: []any{ &actionExpr{ - pos: position{line: 2179, col: 5, offset: 67041}, + pos: position{line: 2182, col: 5, offset: 67131}, run: (*parser).callonOptOffsetClause2, expr: &seqExpr{ - pos: position{line: 2179, col: 5, offset: 67041}, + pos: position{line: 2182, col: 5, offset: 67131}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2179, col: 5, offset: 67041}, + pos: position{line: 2182, col: 5, offset: 67131}, name: "_", }, &labeledExpr{ - pos: position{line: 2179, col: 7, offset: 67043}, + pos: position{line: 2182, col: 7, offset: 67133}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 2179, col: 9, offset: 67045}, + pos: position{line: 2182, col: 9, offset: 67135}, name: "OffsetClause", }, }, @@ -15320,10 +15349,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2180, col: 5, offset: 67081}, + pos: position{line: 2183, col: 5, offset: 67171}, run: (*parser).callonOptOffsetClause7, expr: &litMatcher{ - pos: position{line: 2180, col: 5, offset: 67081}, + pos: position{line: 2183, col: 5, offset: 67171}, val: "", ignoreCase: false, want: "\"\"", @@ -15336,26 +15365,26 @@ var g = &grammar{ }, { name: "OffsetClause", - pos: position{line: 2182, col: 1, offset: 67106}, + pos: position{line: 2185, col: 1, offset: 67196}, expr: &actionExpr{ - pos: position{line: 2183, col: 5, offset: 67124}, + pos: position{line: 2186, col: 5, offset: 67214}, run: (*parser).callonOffsetClause1, expr: &seqExpr{ - pos: position{line: 2183, col: 5, offset: 67124}, + pos: position{line: 2186, col: 5, offset: 67214}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2183, col: 5, offset: 67124}, + pos: position{line: 2186, col: 5, offset: 67214}, name: "OFFSET", }, &ruleRefExpr{ - pos: position{line: 2183, col: 12, offset: 67131}, + pos: position{line: 2186, col: 12, offset: 67221}, name: "_", }, &labeledExpr{ - pos: position{line: 2183, col: 14, offset: 67133}, + pos: position{line: 2186, col: 14, offset: 67223}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2183, col: 16, offset: 67135}, + pos: position{line: 2186, col: 16, offset: 67225}, name: "Expr", }, }, @@ -15367,108 +15396,108 @@ var g = &grammar{ }, { name: "SetOperation", - pos: position{line: 2185, col: 1, offset: 67160}, + pos: position{line: 2188, col: 1, offset: 67250}, expr: &actionExpr{ - pos: position{line: 2186, col: 5, offset: 67177}, + pos: position{line: 2189, col: 5, offset: 67267}, run: (*parser).callonSetOperation1, expr: &seqExpr{ - pos: position{line: 2186, col: 5, offset: 67177}, + pos: position{line: 2189, col: 5, offset: 67267}, exprs: []any{ &labeledExpr{ - pos: position{line: 2186, col: 5, offset: 67177}, + pos: position{line: 2189, col: 5, offset: 67267}, label: "left", expr: &ruleRefExpr{ - pos: position{line: 2186, col: 10, offset: 67182}, + pos: position{line: 2189, col: 10, offset: 67272}, name: "SelectExpr", }, }, &labeledExpr{ - pos: position{line: 2186, col: 21, offset: 67193}, + pos: position{line: 2189, col: 21, offset: 67283}, label: "distinct", expr: &ruleRefExpr{ - pos: position{line: 2186, col: 30, offset: 67202}, + pos: position{line: 2189, col: 30, offset: 67292}, name: "SetOp", }, }, &ruleRefExpr{ - pos: position{line: 2186, col: 36, offset: 67208}, + pos: position{line: 2189, col: 36, offset: 67298}, name: "_", }, &labeledExpr{ - pos: position{line: 2186, col: 38, offset: 67210}, + pos: position{line: 2189, col: 38, offset: 67300}, label: "right", expr: &ruleRefExpr{ - pos: position{line: 2186, col: 44, offset: 67216}, + pos: position{line: 2189, col: 44, offset: 67306}, name: "SelectExpr", }, }, }, }, }, - leader: false, + leader: true, leftRecursive: true, }, { name: "SetOp", - pos: position{line: 2196, col: 1, offset: 67437}, + pos: position{line: 2199, col: 1, offset: 67527}, expr: &choiceExpr{ - pos: position{line: 2197, col: 5, offset: 67448}, + pos: position{line: 2200, col: 5, offset: 67538}, alternatives: []any{ &actionExpr{ - pos: position{line: 2197, col: 5, offset: 67448}, + pos: position{line: 2200, col: 5, offset: 67538}, run: (*parser).callonSetOp2, expr: &seqExpr{ - pos: position{line: 2197, col: 5, offset: 67448}, + pos: position{line: 2200, col: 5, offset: 67538}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2197, col: 5, offset: 67448}, + pos: position{line: 2200, col: 5, offset: 67538}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2197, col: 7, offset: 67450}, + pos: position{line: 2200, col: 7, offset: 67540}, name: "UNION", }, &ruleRefExpr{ - pos: position{line: 2197, col: 13, offset: 67456}, + pos: position{line: 2200, col: 13, offset: 67546}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2197, col: 15, offset: 67458}, + pos: position{line: 2200, col: 15, offset: 67548}, name: "ALL", }, }, }, }, &actionExpr{ - pos: position{line: 2198, col: 5, offset: 67494}, + pos: position{line: 2201, col: 5, offset: 67584}, run: (*parser).callonSetOp8, expr: &seqExpr{ - pos: position{line: 2198, col: 5, offset: 67494}, + pos: position{line: 2201, col: 5, offset: 67584}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2198, col: 5, offset: 67494}, + pos: position{line: 2201, col: 5, offset: 67584}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2198, col: 7, offset: 67496}, + pos: position{line: 2201, col: 7, offset: 67586}, name: "UNION", }, &ruleRefExpr{ - pos: position{line: 2198, col: 13, offset: 67502}, + pos: position{line: 2201, col: 13, offset: 67592}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2198, col: 15, offset: 67504}, + pos: position{line: 2201, col: 15, offset: 67594}, name: "DISTINCT", }, }, }, }, &actionExpr{ - pos: position{line: 2199, col: 5, offset: 67539}, + pos: position{line: 2202, col: 5, offset: 67629}, run: (*parser).callonSetOp14, expr: &litMatcher{ - pos: position{line: 2199, col: 5, offset: 67539}, + pos: position{line: 2202, col: 5, offset: 67629}, val: "", ignoreCase: false, want: "\"\"", @@ -15481,80 +15510,80 @@ var g = &grammar{ }, { name: "SQLGuard", - pos: position{line: 2202, col: 1, offset: 67602}, + pos: position{line: 2205, col: 1, offset: 67692}, expr: &choiceExpr{ - pos: position{line: 2203, col: 5, offset: 67617}, + pos: position{line: 2206, col: 5, offset: 67707}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 2203, col: 5, offset: 67617}, + pos: position{line: 2206, col: 5, offset: 67707}, name: "FROM", }, &ruleRefExpr{ - pos: position{line: 2203, col: 12, offset: 67624}, + pos: position{line: 2206, col: 12, offset: 67714}, name: "GROUP", }, &ruleRefExpr{ - pos: position{line: 2203, col: 20, offset: 67632}, + pos: position{line: 2206, col: 20, offset: 67722}, name: "HAVING", }, &ruleRefExpr{ - pos: position{line: 2203, col: 29, offset: 67641}, + pos: position{line: 2206, col: 29, offset: 67731}, name: "SELECT", }, &ruleRefExpr{ - pos: position{line: 2203, col: 38, offset: 67650}, + pos: position{line: 2206, col: 38, offset: 67740}, name: "RECURSIVE", }, &ruleRefExpr{ - pos: position{line: 2204, col: 5, offset: 67664}, + pos: position{line: 2207, col: 5, offset: 67754}, name: "INNER", }, &ruleRefExpr{ - pos: position{line: 2204, col: 13, offset: 67672}, + pos: position{line: 2207, col: 13, offset: 67762}, name: "LEFT", }, &ruleRefExpr{ - pos: position{line: 2204, col: 20, offset: 67679}, + pos: position{line: 2207, col: 20, offset: 67769}, name: "RIGHT", }, &ruleRefExpr{ - pos: position{line: 2204, col: 28, offset: 67687}, + pos: position{line: 2207, col: 28, offset: 67777}, name: "OUTER", }, &ruleRefExpr{ - pos: position{line: 2204, col: 36, offset: 67695}, + pos: position{line: 2207, col: 36, offset: 67785}, name: "CROSS", }, &ruleRefExpr{ - pos: position{line: 2204, col: 44, offset: 67703}, + pos: position{line: 2207, col: 44, offset: 67793}, name: "JOIN", }, &ruleRefExpr{ - pos: position{line: 2205, col: 5, offset: 67712}, + pos: position{line: 2208, col: 5, offset: 67802}, name: "UNION", }, &ruleRefExpr{ - pos: position{line: 2206, col: 5, offset: 67722}, + pos: position{line: 2209, col: 5, offset: 67812}, name: "ORDER", }, &ruleRefExpr{ - pos: position{line: 2207, col: 5, offset: 67732}, + pos: position{line: 2210, col: 5, offset: 67822}, name: "LIMIT", }, &ruleRefExpr{ - pos: position{line: 2208, col: 5, offset: 67742}, + pos: position{line: 2211, col: 5, offset: 67832}, name: "WHERE", }, &ruleRefExpr{ - pos: position{line: 2209, col: 5, offset: 67753}, + pos: position{line: 2212, col: 5, offset: 67843}, name: "WITH", }, &ruleRefExpr{ - pos: position{line: 2210, col: 5, offset: 67762}, + pos: position{line: 2213, col: 5, offset: 67852}, name: "USING", }, &ruleRefExpr{ - pos: position{line: 2211, col: 5, offset: 67772}, + pos: position{line: 2214, col: 5, offset: 67862}, name: "ON", }, }, @@ -15564,20 +15593,20 @@ var g = &grammar{ }, { name: "AGGREGATE", - pos: position{line: 2213, col: 1, offset: 67776}, + pos: position{line: 2216, col: 1, offset: 67866}, expr: &seqExpr{ - pos: position{line: 2213, col: 14, offset: 67789}, + pos: position{line: 2216, col: 14, offset: 67879}, exprs: []any{ &litMatcher{ - pos: position{line: 2213, col: 14, offset: 67789}, + pos: position{line: 2216, col: 14, offset: 67879}, val: "aggregate", ignoreCase: true, want: "\"AGGREGATE\"i", }, ¬Expr{ - pos: position{line: 2213, col: 33, offset: 67808}, + pos: position{line: 2216, col: 33, offset: 67898}, expr: &ruleRefExpr{ - pos: position{line: 2213, col: 34, offset: 67809}, + pos: position{line: 2216, col: 34, offset: 67899}, name: "IdentifierRest", }, }, @@ -15588,20 +15617,20 @@ var g = &grammar{ }, { name: "ALL", - pos: position{line: 2214, col: 1, offset: 67824}, + pos: position{line: 2217, col: 1, offset: 67914}, expr: &seqExpr{ - pos: position{line: 2214, col: 14, offset: 67837}, + pos: position{line: 2217, col: 14, offset: 67927}, exprs: []any{ &litMatcher{ - pos: position{line: 2214, col: 14, offset: 67837}, + pos: position{line: 2217, col: 14, offset: 67927}, val: "all", ignoreCase: true, want: "\"ALL\"i", }, ¬Expr{ - pos: position{line: 2214, col: 33, offset: 67856}, + pos: position{line: 2217, col: 33, offset: 67946}, expr: &ruleRefExpr{ - pos: position{line: 2214, col: 34, offset: 67857}, + pos: position{line: 2217, col: 34, offset: 67947}, name: "IdentifierRest", }, }, @@ -15612,23 +15641,23 @@ var g = &grammar{ }, { name: "AND", - pos: position{line: 2215, col: 1, offset: 67872}, + pos: position{line: 2218, col: 1, offset: 67962}, expr: &actionExpr{ - pos: position{line: 2215, col: 14, offset: 67885}, + pos: position{line: 2218, col: 14, offset: 67975}, run: (*parser).callonAND1, expr: &seqExpr{ - pos: position{line: 2215, col: 14, offset: 67885}, + pos: position{line: 2218, col: 14, offset: 67975}, exprs: []any{ &litMatcher{ - pos: position{line: 2215, col: 14, offset: 67885}, + pos: position{line: 2218, col: 14, offset: 67975}, val: "and", ignoreCase: true, want: "\"AND\"i", }, ¬Expr{ - pos: position{line: 2215, col: 33, offset: 67904}, + pos: position{line: 2218, col: 33, offset: 67994}, expr: &ruleRefExpr{ - pos: position{line: 2215, col: 34, offset: 67905}, + pos: position{line: 2218, col: 34, offset: 67995}, name: "IdentifierRest", }, }, @@ -15640,20 +15669,20 @@ var g = &grammar{ }, { name: "ANTI", - pos: position{line: 2216, col: 1, offset: 67942}, + pos: position{line: 2219, col: 1, offset: 68032}, expr: &seqExpr{ - pos: position{line: 2216, col: 14, offset: 67955}, + pos: position{line: 2219, col: 14, offset: 68045}, exprs: []any{ &litMatcher{ - pos: position{line: 2216, col: 14, offset: 67955}, + pos: position{line: 2219, col: 14, offset: 68045}, val: "anti", ignoreCase: true, want: "\"ANTI\"i", }, ¬Expr{ - pos: position{line: 2216, col: 33, offset: 67974}, + pos: position{line: 2219, col: 33, offset: 68064}, expr: &ruleRefExpr{ - pos: position{line: 2216, col: 34, offset: 67975}, + pos: position{line: 2219, col: 34, offset: 68065}, name: "IdentifierRest", }, }, @@ -15664,20 +15693,20 @@ var g = &grammar{ }, { name: "AS", - pos: position{line: 2217, col: 1, offset: 67990}, + pos: position{line: 2220, col: 1, offset: 68080}, expr: &seqExpr{ - pos: position{line: 2217, col: 14, offset: 68003}, + pos: position{line: 2220, col: 14, offset: 68093}, exprs: []any{ &litMatcher{ - pos: position{line: 2217, col: 14, offset: 68003}, + pos: position{line: 2220, col: 14, offset: 68093}, val: "as", ignoreCase: true, want: "\"AS\"i", }, ¬Expr{ - pos: position{line: 2217, col: 33, offset: 68022}, + pos: position{line: 2220, col: 33, offset: 68112}, expr: &ruleRefExpr{ - pos: position{line: 2217, col: 34, offset: 68023}, + pos: position{line: 2220, col: 34, offset: 68113}, name: "IdentifierRest", }, }, @@ -15688,23 +15717,23 @@ var g = &grammar{ }, { name: "ASC", - pos: position{line: 2218, col: 1, offset: 68038}, + pos: position{line: 2221, col: 1, offset: 68128}, expr: &actionExpr{ - pos: position{line: 2218, col: 14, offset: 68051}, + pos: position{line: 2221, col: 14, offset: 68141}, run: (*parser).callonASC1, expr: &seqExpr{ - pos: position{line: 2218, col: 14, offset: 68051}, + pos: position{line: 2221, col: 14, offset: 68141}, exprs: []any{ &litMatcher{ - pos: position{line: 2218, col: 14, offset: 68051}, + pos: position{line: 2221, col: 14, offset: 68141}, val: "asc", ignoreCase: true, want: "\"ASC\"i", }, ¬Expr{ - pos: position{line: 2218, col: 33, offset: 68070}, + pos: position{line: 2221, col: 33, offset: 68160}, expr: &ruleRefExpr{ - pos: position{line: 2218, col: 34, offset: 68071}, + pos: position{line: 2221, col: 34, offset: 68161}, name: "IdentifierRest", }, }, @@ -15716,20 +15745,20 @@ var g = &grammar{ }, { name: "ASSERT", - pos: position{line: 2219, col: 1, offset: 68108}, + pos: position{line: 2222, col: 1, offset: 68198}, expr: &seqExpr{ - pos: position{line: 2219, col: 14, offset: 68121}, + pos: position{line: 2222, col: 14, offset: 68211}, exprs: []any{ &litMatcher{ - pos: position{line: 2219, col: 14, offset: 68121}, + pos: position{line: 2222, col: 14, offset: 68211}, val: "assert", ignoreCase: true, want: "\"ASSERT\"i", }, ¬Expr{ - pos: position{line: 2219, col: 33, offset: 68140}, + pos: position{line: 2222, col: 33, offset: 68230}, expr: &ruleRefExpr{ - pos: position{line: 2219, col: 34, offset: 68141}, + pos: position{line: 2222, col: 34, offset: 68231}, name: "IdentifierRest", }, }, @@ -15740,20 +15769,20 @@ var g = &grammar{ }, { name: "AT", - pos: position{line: 2220, col: 1, offset: 68156}, + pos: position{line: 2223, col: 1, offset: 68246}, expr: &seqExpr{ - pos: position{line: 2220, col: 14, offset: 68169}, + pos: position{line: 2223, col: 14, offset: 68259}, exprs: []any{ &litMatcher{ - pos: position{line: 2220, col: 14, offset: 68169}, + pos: position{line: 2223, col: 14, offset: 68259}, val: "at", ignoreCase: true, want: "\"AT\"i", }, ¬Expr{ - pos: position{line: 2220, col: 33, offset: 68188}, + pos: position{line: 2223, col: 33, offset: 68278}, expr: &ruleRefExpr{ - pos: position{line: 2220, col: 34, offset: 68189}, + pos: position{line: 2223, col: 34, offset: 68279}, name: "IdentifierRest", }, }, @@ -15764,20 +15793,20 @@ var g = &grammar{ }, { name: "AUTHOR", - pos: position{line: 2221, col: 1, offset: 68204}, + pos: position{line: 2224, col: 1, offset: 68294}, expr: &seqExpr{ - pos: position{line: 2221, col: 14, offset: 68217}, + pos: position{line: 2224, col: 14, offset: 68307}, exprs: []any{ &litMatcher{ - pos: position{line: 2221, col: 14, offset: 68217}, + pos: position{line: 2224, col: 14, offset: 68307}, val: "author", ignoreCase: true, want: "\"AUTHOR\"i", }, ¬Expr{ - pos: position{line: 2221, col: 33, offset: 68236}, + pos: position{line: 2224, col: 33, offset: 68326}, expr: &ruleRefExpr{ - pos: position{line: 2221, col: 34, offset: 68237}, + pos: position{line: 2224, col: 34, offset: 68327}, name: "IdentifierRest", }, }, @@ -15788,20 +15817,20 @@ var g = &grammar{ }, { name: "BETWEEN", - pos: position{line: 2222, col: 1, offset: 68252}, + pos: position{line: 2225, col: 1, offset: 68342}, expr: &seqExpr{ - pos: position{line: 2222, col: 14, offset: 68265}, + pos: position{line: 2225, col: 14, offset: 68355}, exprs: []any{ &litMatcher{ - pos: position{line: 2222, col: 14, offset: 68265}, + pos: position{line: 2225, col: 14, offset: 68355}, val: "between", ignoreCase: true, want: "\"BETWEEN\"i", }, ¬Expr{ - pos: position{line: 2222, col: 33, offset: 68284}, + pos: position{line: 2225, col: 33, offset: 68374}, expr: &ruleRefExpr{ - pos: position{line: 2222, col: 34, offset: 68285}, + pos: position{line: 2225, col: 34, offset: 68375}, name: "IdentifierRest", }, }, @@ -15812,20 +15841,20 @@ var g = &grammar{ }, { name: "BODY", - pos: position{line: 2223, col: 1, offset: 68300}, + pos: position{line: 2226, col: 1, offset: 68390}, expr: &seqExpr{ - pos: position{line: 2223, col: 14, offset: 68313}, + pos: position{line: 2226, col: 14, offset: 68403}, exprs: []any{ &litMatcher{ - pos: position{line: 2223, col: 14, offset: 68313}, + pos: position{line: 2226, col: 14, offset: 68403}, val: "body", ignoreCase: true, want: "\"BODY\"i", }, ¬Expr{ - pos: position{line: 2223, col: 33, offset: 68332}, + pos: position{line: 2226, col: 33, offset: 68422}, expr: &ruleRefExpr{ - pos: position{line: 2223, col: 34, offset: 68333}, + pos: position{line: 2226, col: 34, offset: 68423}, name: "IdentifierRest", }, }, @@ -15836,20 +15865,20 @@ var g = &grammar{ }, { name: "BY", - pos: position{line: 2224, col: 1, offset: 68348}, + pos: position{line: 2227, col: 1, offset: 68438}, expr: &seqExpr{ - pos: position{line: 2224, col: 14, offset: 68361}, + pos: position{line: 2227, col: 14, offset: 68451}, exprs: []any{ &litMatcher{ - pos: position{line: 2224, col: 14, offset: 68361}, + pos: position{line: 2227, col: 14, offset: 68451}, val: "by", ignoreCase: true, want: "\"BY\"i", }, ¬Expr{ - pos: position{line: 2224, col: 33, offset: 68380}, + pos: position{line: 2227, col: 33, offset: 68470}, expr: &ruleRefExpr{ - pos: position{line: 2224, col: 34, offset: 68381}, + pos: position{line: 2227, col: 34, offset: 68471}, name: "IdentifierRest", }, }, @@ -15860,20 +15889,20 @@ var g = &grammar{ }, { name: "CASE", - pos: position{line: 2225, col: 1, offset: 68396}, + pos: position{line: 2228, col: 1, offset: 68486}, expr: &seqExpr{ - pos: position{line: 2225, col: 14, offset: 68409}, + pos: position{line: 2228, col: 14, offset: 68499}, exprs: []any{ &litMatcher{ - pos: position{line: 2225, col: 14, offset: 68409}, + pos: position{line: 2228, col: 14, offset: 68499}, val: "case", ignoreCase: true, want: "\"CASE\"i", }, ¬Expr{ - pos: position{line: 2225, col: 33, offset: 68428}, + pos: position{line: 2228, col: 33, offset: 68518}, expr: &ruleRefExpr{ - pos: position{line: 2225, col: 34, offset: 68429}, + pos: position{line: 2228, col: 34, offset: 68519}, name: "IdentifierRest", }, }, @@ -15884,20 +15913,20 @@ var g = &grammar{ }, { name: "CONST", - pos: position{line: 2226, col: 1, offset: 68444}, + pos: position{line: 2229, col: 1, offset: 68534}, expr: &seqExpr{ - pos: position{line: 2226, col: 14, offset: 68457}, + pos: position{line: 2229, col: 14, offset: 68547}, exprs: []any{ &litMatcher{ - pos: position{line: 2226, col: 14, offset: 68457}, + pos: position{line: 2229, col: 14, offset: 68547}, val: "const", ignoreCase: true, want: "\"CONST\"i", }, ¬Expr{ - pos: position{line: 2226, col: 33, offset: 68476}, + pos: position{line: 2229, col: 33, offset: 68566}, expr: &ruleRefExpr{ - pos: position{line: 2226, col: 34, offset: 68477}, + pos: position{line: 2229, col: 34, offset: 68567}, name: "IdentifierRest", }, }, @@ -15908,20 +15937,20 @@ var g = &grammar{ }, { name: "CROSS", - pos: position{line: 2227, col: 1, offset: 68492}, + pos: position{line: 2230, col: 1, offset: 68582}, expr: &seqExpr{ - pos: position{line: 2227, col: 14, offset: 68505}, + pos: position{line: 2230, col: 14, offset: 68595}, exprs: []any{ &litMatcher{ - pos: position{line: 2227, col: 14, offset: 68505}, + pos: position{line: 2230, col: 14, offset: 68595}, val: "cross", ignoreCase: true, want: "\"CROSS\"i", }, ¬Expr{ - pos: position{line: 2227, col: 33, offset: 68524}, + pos: position{line: 2230, col: 33, offset: 68614}, expr: &ruleRefExpr{ - pos: position{line: 2227, col: 34, offset: 68525}, + pos: position{line: 2230, col: 34, offset: 68615}, name: "IdentifierRest", }, }, @@ -15932,20 +15961,20 @@ var g = &grammar{ }, { name: "CUT", - pos: position{line: 2228, col: 1, offset: 68540}, + pos: position{line: 2231, col: 1, offset: 68630}, expr: &seqExpr{ - pos: position{line: 2228, col: 14, offset: 68553}, + pos: position{line: 2231, col: 14, offset: 68643}, exprs: []any{ &litMatcher{ - pos: position{line: 2228, col: 14, offset: 68553}, + pos: position{line: 2231, col: 14, offset: 68643}, val: "cut", ignoreCase: true, want: "\"CUT\"i", }, ¬Expr{ - pos: position{line: 2228, col: 33, offset: 68572}, + pos: position{line: 2231, col: 33, offset: 68662}, expr: &ruleRefExpr{ - pos: position{line: 2228, col: 34, offset: 68573}, + pos: position{line: 2231, col: 34, offset: 68663}, name: "IdentifierRest", }, }, @@ -15956,20 +15985,20 @@ var g = &grammar{ }, { name: "DEBUG", - pos: position{line: 2229, col: 1, offset: 68588}, + pos: position{line: 2232, col: 1, offset: 68678}, expr: &seqExpr{ - pos: position{line: 2229, col: 14, offset: 68601}, + pos: position{line: 2232, col: 14, offset: 68691}, exprs: []any{ &litMatcher{ - pos: position{line: 2229, col: 14, offset: 68601}, + pos: position{line: 2232, col: 14, offset: 68691}, val: "debug", ignoreCase: true, want: "\"DEBUG\"i", }, ¬Expr{ - pos: position{line: 2229, col: 33, offset: 68620}, + pos: position{line: 2232, col: 33, offset: 68710}, expr: &ruleRefExpr{ - pos: position{line: 2229, col: 34, offset: 68621}, + pos: position{line: 2232, col: 34, offset: 68711}, name: "IdentifierRest", }, }, @@ -15980,20 +16009,20 @@ var g = &grammar{ }, { name: "DEFAULT", - pos: position{line: 2230, col: 1, offset: 68636}, + pos: position{line: 2233, col: 1, offset: 68726}, expr: &seqExpr{ - pos: position{line: 2230, col: 14, offset: 68649}, + pos: position{line: 2233, col: 14, offset: 68739}, exprs: []any{ &litMatcher{ - pos: position{line: 2230, col: 14, offset: 68649}, + pos: position{line: 2233, col: 14, offset: 68739}, val: "default", ignoreCase: true, want: "\"DEFAULT\"i", }, ¬Expr{ - pos: position{line: 2230, col: 33, offset: 68668}, + pos: position{line: 2233, col: 33, offset: 68758}, expr: &ruleRefExpr{ - pos: position{line: 2230, col: 34, offset: 68669}, + pos: position{line: 2233, col: 34, offset: 68759}, name: "IdentifierRest", }, }, @@ -16004,23 +16033,23 @@ var g = &grammar{ }, { name: "DESC", - pos: position{line: 2231, col: 1, offset: 68684}, + pos: position{line: 2234, col: 1, offset: 68774}, expr: &actionExpr{ - pos: position{line: 2231, col: 14, offset: 68697}, + pos: position{line: 2234, col: 14, offset: 68787}, run: (*parser).callonDESC1, expr: &seqExpr{ - pos: position{line: 2231, col: 14, offset: 68697}, + pos: position{line: 2234, col: 14, offset: 68787}, exprs: []any{ &litMatcher{ - pos: position{line: 2231, col: 14, offset: 68697}, + pos: position{line: 2234, col: 14, offset: 68787}, val: "desc", ignoreCase: true, want: "\"DESC\"i", }, ¬Expr{ - pos: position{line: 2231, col: 33, offset: 68716}, + pos: position{line: 2234, col: 33, offset: 68806}, expr: &ruleRefExpr{ - pos: position{line: 2231, col: 34, offset: 68717}, + pos: position{line: 2234, col: 34, offset: 68807}, name: "IdentifierRest", }, }, @@ -16032,20 +16061,20 @@ var g = &grammar{ }, { name: "DISTINCT", - pos: position{line: 2232, col: 1, offset: 68755}, + pos: position{line: 2235, col: 1, offset: 68845}, expr: &seqExpr{ - pos: position{line: 2232, col: 14, offset: 68768}, + pos: position{line: 2235, col: 14, offset: 68858}, exprs: []any{ &litMatcher{ - pos: position{line: 2232, col: 14, offset: 68768}, + pos: position{line: 2235, col: 14, offset: 68858}, val: "distinct", ignoreCase: true, want: "\"DISTINCT\"i", }, ¬Expr{ - pos: position{line: 2232, col: 33, offset: 68787}, + pos: position{line: 2235, col: 33, offset: 68877}, expr: &ruleRefExpr{ - pos: position{line: 2232, col: 34, offset: 68788}, + pos: position{line: 2235, col: 34, offset: 68878}, name: "IdentifierRest", }, }, @@ -16056,20 +16085,20 @@ var g = &grammar{ }, { name: "DROP", - pos: position{line: 2233, col: 1, offset: 68803}, + pos: position{line: 2236, col: 1, offset: 68893}, expr: &seqExpr{ - pos: position{line: 2233, col: 14, offset: 68816}, + pos: position{line: 2236, col: 14, offset: 68906}, exprs: []any{ &litMatcher{ - pos: position{line: 2233, col: 14, offset: 68816}, + pos: position{line: 2236, col: 14, offset: 68906}, val: "drop", ignoreCase: true, want: "\"DROP\"i", }, ¬Expr{ - pos: position{line: 2233, col: 33, offset: 68835}, + pos: position{line: 2236, col: 33, offset: 68925}, expr: &ruleRefExpr{ - pos: position{line: 2233, col: 34, offset: 68836}, + pos: position{line: 2236, col: 34, offset: 68926}, name: "IdentifierRest", }, }, @@ -16080,20 +16109,20 @@ var g = &grammar{ }, { name: "END", - pos: position{line: 2234, col: 1, offset: 68852}, + pos: position{line: 2237, col: 1, offset: 68942}, expr: &seqExpr{ - pos: position{line: 2234, col: 14, offset: 68865}, + pos: position{line: 2237, col: 14, offset: 68955}, exprs: []any{ &litMatcher{ - pos: position{line: 2234, col: 14, offset: 68865}, + pos: position{line: 2237, col: 14, offset: 68955}, val: "end", ignoreCase: true, want: "\"END\"i", }, ¬Expr{ - pos: position{line: 2234, col: 33, offset: 68884}, + pos: position{line: 2237, col: 33, offset: 68974}, expr: &ruleRefExpr{ - pos: position{line: 2234, col: 34, offset: 68885}, + pos: position{line: 2237, col: 34, offset: 68975}, name: "IdentifierRest", }, }, @@ -16104,20 +16133,20 @@ var g = &grammar{ }, { name: "ERROR", - pos: position{line: 2235, col: 1, offset: 68900}, + pos: position{line: 2238, col: 1, offset: 68990}, expr: &seqExpr{ - pos: position{line: 2235, col: 14, offset: 68913}, + pos: position{line: 2238, col: 14, offset: 69003}, exprs: []any{ &litMatcher{ - pos: position{line: 2235, col: 14, offset: 68913}, + pos: position{line: 2238, col: 14, offset: 69003}, val: "error", ignoreCase: true, want: "\"ERROR\"i", }, ¬Expr{ - pos: position{line: 2235, col: 33, offset: 68932}, + pos: position{line: 2238, col: 33, offset: 69022}, expr: &ruleRefExpr{ - pos: position{line: 2235, col: 34, offset: 68933}, + pos: position{line: 2238, col: 34, offset: 69023}, name: "IdentifierRest", }, }, @@ -16128,20 +16157,20 @@ var g = &grammar{ }, { name: "EXPLODE", - pos: position{line: 2236, col: 1, offset: 68948}, + pos: position{line: 2239, col: 1, offset: 69038}, expr: &seqExpr{ - pos: position{line: 2236, col: 14, offset: 68961}, + pos: position{line: 2239, col: 14, offset: 69051}, exprs: []any{ &litMatcher{ - pos: position{line: 2236, col: 14, offset: 68961}, + pos: position{line: 2239, col: 14, offset: 69051}, val: "explode", ignoreCase: true, want: "\"EXPLODE\"i", }, ¬Expr{ - pos: position{line: 2236, col: 33, offset: 68980}, + pos: position{line: 2239, col: 33, offset: 69070}, expr: &ruleRefExpr{ - pos: position{line: 2236, col: 34, offset: 68981}, + pos: position{line: 2239, col: 34, offset: 69071}, name: "IdentifierRest", }, }, @@ -16152,20 +16181,20 @@ var g = &grammar{ }, { name: "FALSE", - pos: position{line: 2237, col: 1, offset: 68996}, + pos: position{line: 2240, col: 1, offset: 69086}, expr: &seqExpr{ - pos: position{line: 2237, col: 14, offset: 69009}, + pos: position{line: 2240, col: 14, offset: 69099}, exprs: []any{ &litMatcher{ - pos: position{line: 2237, col: 14, offset: 69009}, + pos: position{line: 2240, col: 14, offset: 69099}, val: "false", ignoreCase: true, want: "\"FALSE\"i", }, ¬Expr{ - pos: position{line: 2237, col: 33, offset: 69028}, + pos: position{line: 2240, col: 33, offset: 69118}, expr: &ruleRefExpr{ - pos: position{line: 2237, col: 34, offset: 69029}, + pos: position{line: 2240, col: 34, offset: 69119}, name: "IdentifierRest", }, }, @@ -16176,20 +16205,20 @@ var g = &grammar{ }, { name: "FIRST", - pos: position{line: 2238, col: 1, offset: 69044}, + pos: position{line: 2241, col: 1, offset: 69134}, expr: &seqExpr{ - pos: position{line: 2238, col: 14, offset: 69057}, + pos: position{line: 2241, col: 14, offset: 69147}, exprs: []any{ &litMatcher{ - pos: position{line: 2238, col: 14, offset: 69057}, + pos: position{line: 2241, col: 14, offset: 69147}, val: "first", ignoreCase: true, want: "\"FIRST\"i", }, ¬Expr{ - pos: position{line: 2238, col: 33, offset: 69076}, + pos: position{line: 2241, col: 33, offset: 69166}, expr: &ruleRefExpr{ - pos: position{line: 2238, col: 34, offset: 69077}, + pos: position{line: 2241, col: 34, offset: 69167}, name: "IdentifierRest", }, }, @@ -16200,20 +16229,20 @@ var g = &grammar{ }, { name: "FORK", - pos: position{line: 2239, col: 1, offset: 69092}, + pos: position{line: 2242, col: 1, offset: 69182}, expr: &seqExpr{ - pos: position{line: 2239, col: 14, offset: 69105}, + pos: position{line: 2242, col: 14, offset: 69195}, exprs: []any{ &litMatcher{ - pos: position{line: 2239, col: 14, offset: 69105}, + pos: position{line: 2242, col: 14, offset: 69195}, val: "fork", ignoreCase: true, want: "\"FORK\"i", }, ¬Expr{ - pos: position{line: 2239, col: 33, offset: 69124}, + pos: position{line: 2242, col: 33, offset: 69214}, expr: &ruleRefExpr{ - pos: position{line: 2239, col: 34, offset: 69125}, + pos: position{line: 2242, col: 34, offset: 69215}, name: "IdentifierRest", }, }, @@ -16224,20 +16253,20 @@ var g = &grammar{ }, { name: "FORMAT", - pos: position{line: 2240, col: 1, offset: 69140}, + pos: position{line: 2243, col: 1, offset: 69230}, expr: &seqExpr{ - pos: position{line: 2240, col: 14, offset: 69153}, + pos: position{line: 2243, col: 14, offset: 69243}, exprs: []any{ &litMatcher{ - pos: position{line: 2240, col: 14, offset: 69153}, + pos: position{line: 2243, col: 14, offset: 69243}, val: "format", ignoreCase: true, want: "\"FORMAT\"i", }, ¬Expr{ - pos: position{line: 2240, col: 33, offset: 69172}, + pos: position{line: 2243, col: 33, offset: 69262}, expr: &ruleRefExpr{ - pos: position{line: 2240, col: 34, offset: 69173}, + pos: position{line: 2243, col: 34, offset: 69263}, name: "IdentifierRest", }, }, @@ -16248,20 +16277,20 @@ var g = &grammar{ }, { name: "FROM", - pos: position{line: 2241, col: 1, offset: 69188}, + pos: position{line: 2244, col: 1, offset: 69278}, expr: &seqExpr{ - pos: position{line: 2241, col: 14, offset: 69201}, + pos: position{line: 2244, col: 14, offset: 69291}, exprs: []any{ &litMatcher{ - pos: position{line: 2241, col: 14, offset: 69201}, + pos: position{line: 2244, col: 14, offset: 69291}, val: "from", ignoreCase: true, want: "\"FROM\"i", }, ¬Expr{ - pos: position{line: 2241, col: 33, offset: 69220}, + pos: position{line: 2244, col: 33, offset: 69310}, expr: &ruleRefExpr{ - pos: position{line: 2241, col: 34, offset: 69221}, + pos: position{line: 2244, col: 34, offset: 69311}, name: "IdentifierRest", }, }, @@ -16272,20 +16301,20 @@ var g = &grammar{ }, { name: "FULL", - pos: position{line: 2242, col: 1, offset: 69236}, + pos: position{line: 2245, col: 1, offset: 69326}, expr: &seqExpr{ - pos: position{line: 2242, col: 14, offset: 69249}, + pos: position{line: 2245, col: 14, offset: 69339}, exprs: []any{ &litMatcher{ - pos: position{line: 2242, col: 14, offset: 69249}, + pos: position{line: 2245, col: 14, offset: 69339}, val: "full", ignoreCase: true, want: "\"FULL\"i", }, ¬Expr{ - pos: position{line: 2242, col: 33, offset: 69268}, + pos: position{line: 2245, col: 33, offset: 69358}, expr: &ruleRefExpr{ - pos: position{line: 2242, col: 34, offset: 69269}, + pos: position{line: 2245, col: 34, offset: 69359}, name: "IdentifierRest", }, }, @@ -16296,20 +16325,20 @@ var g = &grammar{ }, { name: "FUNC", - pos: position{line: 2243, col: 1, offset: 69284}, + pos: position{line: 2246, col: 1, offset: 69374}, expr: &seqExpr{ - pos: position{line: 2243, col: 14, offset: 69297}, + pos: position{line: 2246, col: 14, offset: 69387}, exprs: []any{ &litMatcher{ - pos: position{line: 2243, col: 14, offset: 69297}, + pos: position{line: 2246, col: 14, offset: 69387}, val: "func", ignoreCase: true, want: "\"FUNC\"i", }, ¬Expr{ - pos: position{line: 2243, col: 33, offset: 69316}, + pos: position{line: 2246, col: 33, offset: 69406}, expr: &ruleRefExpr{ - pos: position{line: 2243, col: 34, offset: 69317}, + pos: position{line: 2246, col: 34, offset: 69407}, name: "IdentifierRest", }, }, @@ -16320,20 +16349,20 @@ var g = &grammar{ }, { name: "FUSE", - pos: position{line: 2244, col: 1, offset: 69332}, + pos: position{line: 2247, col: 1, offset: 69422}, expr: &seqExpr{ - pos: position{line: 2244, col: 14, offset: 69345}, + pos: position{line: 2247, col: 14, offset: 69435}, exprs: []any{ &litMatcher{ - pos: position{line: 2244, col: 14, offset: 69345}, + pos: position{line: 2247, col: 14, offset: 69435}, val: "fuse", ignoreCase: true, want: "\"FUSE\"i", }, ¬Expr{ - pos: position{line: 2244, col: 33, offset: 69364}, + pos: position{line: 2247, col: 33, offset: 69454}, expr: &ruleRefExpr{ - pos: position{line: 2244, col: 34, offset: 69365}, + pos: position{line: 2247, col: 34, offset: 69455}, name: "IdentifierRest", }, }, @@ -16344,20 +16373,20 @@ var g = &grammar{ }, { name: "GREP", - pos: position{line: 2245, col: 1, offset: 69380}, + pos: position{line: 2248, col: 1, offset: 69470}, expr: &seqExpr{ - pos: position{line: 2245, col: 14, offset: 69393}, + pos: position{line: 2248, col: 14, offset: 69483}, exprs: []any{ &litMatcher{ - pos: position{line: 2245, col: 14, offset: 69393}, + pos: position{line: 2248, col: 14, offset: 69483}, val: "grep", ignoreCase: true, want: "\"GREP\"i", }, ¬Expr{ - pos: position{line: 2245, col: 33, offset: 69412}, + pos: position{line: 2248, col: 33, offset: 69502}, expr: &ruleRefExpr{ - pos: position{line: 2245, col: 34, offset: 69413}, + pos: position{line: 2248, col: 34, offset: 69503}, name: "IdentifierRest", }, }, @@ -16368,20 +16397,20 @@ var g = &grammar{ }, { name: "GROUP", - pos: position{line: 2246, col: 1, offset: 69428}, + pos: position{line: 2249, col: 1, offset: 69518}, expr: &seqExpr{ - pos: position{line: 2246, col: 14, offset: 69441}, + pos: position{line: 2249, col: 14, offset: 69531}, exprs: []any{ &litMatcher{ - pos: position{line: 2246, col: 14, offset: 69441}, + pos: position{line: 2249, col: 14, offset: 69531}, val: "group", ignoreCase: true, want: "\"GROUP\"i", }, ¬Expr{ - pos: position{line: 2246, col: 33, offset: 69460}, + pos: position{line: 2249, col: 33, offset: 69550}, expr: &ruleRefExpr{ - pos: position{line: 2246, col: 34, offset: 69461}, + pos: position{line: 2249, col: 34, offset: 69551}, name: "IdentifierRest", }, }, @@ -16392,20 +16421,20 @@ var g = &grammar{ }, { name: "HAVING", - pos: position{line: 2247, col: 1, offset: 69476}, + pos: position{line: 2250, col: 1, offset: 69566}, expr: &seqExpr{ - pos: position{line: 2247, col: 14, offset: 69489}, + pos: position{line: 2250, col: 14, offset: 69579}, exprs: []any{ &litMatcher{ - pos: position{line: 2247, col: 14, offset: 69489}, + pos: position{line: 2250, col: 14, offset: 69579}, val: "having", ignoreCase: true, want: "\"HAVING\"i", }, ¬Expr{ - pos: position{line: 2247, col: 33, offset: 69508}, + pos: position{line: 2250, col: 33, offset: 69598}, expr: &ruleRefExpr{ - pos: position{line: 2247, col: 34, offset: 69509}, + pos: position{line: 2250, col: 34, offset: 69599}, name: "IdentifierRest", }, }, @@ -16416,20 +16445,20 @@ var g = &grammar{ }, { name: "HEAD", - pos: position{line: 2248, col: 1, offset: 69524}, + pos: position{line: 2251, col: 1, offset: 69614}, expr: &seqExpr{ - pos: position{line: 2248, col: 14, offset: 69537}, + pos: position{line: 2251, col: 14, offset: 69627}, exprs: []any{ &litMatcher{ - pos: position{line: 2248, col: 14, offset: 69537}, + pos: position{line: 2251, col: 14, offset: 69627}, val: "head", ignoreCase: true, want: "\"HEAD\"i", }, ¬Expr{ - pos: position{line: 2248, col: 33, offset: 69556}, + pos: position{line: 2251, col: 33, offset: 69646}, expr: &ruleRefExpr{ - pos: position{line: 2248, col: 34, offset: 69557}, + pos: position{line: 2251, col: 34, offset: 69647}, name: "IdentifierRest", }, }, @@ -16440,20 +16469,20 @@ var g = &grammar{ }, { name: "HEADERS", - pos: position{line: 2249, col: 1, offset: 69573}, + pos: position{line: 2252, col: 1, offset: 69663}, expr: &seqExpr{ - pos: position{line: 2249, col: 14, offset: 69586}, + pos: position{line: 2252, col: 14, offset: 69676}, exprs: []any{ &litMatcher{ - pos: position{line: 2249, col: 14, offset: 69586}, + pos: position{line: 2252, col: 14, offset: 69676}, val: "headers", ignoreCase: true, want: "\"HEADERS\"i", }, ¬Expr{ - pos: position{line: 2249, col: 33, offset: 69605}, + pos: position{line: 2252, col: 33, offset: 69695}, expr: &ruleRefExpr{ - pos: position{line: 2249, col: 34, offset: 69606}, + pos: position{line: 2252, col: 34, offset: 69696}, name: "IdentifierRest", }, }, @@ -16464,20 +16493,20 @@ var g = &grammar{ }, { name: "IN", - pos: position{line: 2250, col: 1, offset: 69621}, + pos: position{line: 2253, col: 1, offset: 69711}, expr: &seqExpr{ - pos: position{line: 2250, col: 14, offset: 69634}, + pos: position{line: 2253, col: 14, offset: 69724}, exprs: []any{ &litMatcher{ - pos: position{line: 2250, col: 14, offset: 69634}, + pos: position{line: 2253, col: 14, offset: 69724}, val: "in", ignoreCase: true, want: "\"IN\"i", }, ¬Expr{ - pos: position{line: 2250, col: 33, offset: 69653}, + pos: position{line: 2253, col: 33, offset: 69743}, expr: &ruleRefExpr{ - pos: position{line: 2250, col: 34, offset: 69654}, + pos: position{line: 2253, col: 34, offset: 69744}, name: "IdentifierRest", }, }, @@ -16488,20 +16517,20 @@ var g = &grammar{ }, { name: "INNER", - pos: position{line: 2251, col: 1, offset: 69669}, + pos: position{line: 2254, col: 1, offset: 69759}, expr: &seqExpr{ - pos: position{line: 2251, col: 14, offset: 69682}, + pos: position{line: 2254, col: 14, offset: 69772}, exprs: []any{ &litMatcher{ - pos: position{line: 2251, col: 14, offset: 69682}, + pos: position{line: 2254, col: 14, offset: 69772}, val: "inner", ignoreCase: true, want: "\"INNER\"i", }, ¬Expr{ - pos: position{line: 2251, col: 33, offset: 69701}, + pos: position{line: 2254, col: 33, offset: 69791}, expr: &ruleRefExpr{ - pos: position{line: 2251, col: 34, offset: 69702}, + pos: position{line: 2254, col: 34, offset: 69792}, name: "IdentifierRest", }, }, @@ -16512,20 +16541,20 @@ var g = &grammar{ }, { name: "JOIN", - pos: position{line: 2252, col: 1, offset: 69717}, + pos: position{line: 2255, col: 1, offset: 69807}, expr: &seqExpr{ - pos: position{line: 2252, col: 14, offset: 69730}, + pos: position{line: 2255, col: 14, offset: 69820}, exprs: []any{ &litMatcher{ - pos: position{line: 2252, col: 14, offset: 69730}, + pos: position{line: 2255, col: 14, offset: 69820}, val: "join", ignoreCase: true, want: "\"JOIN\"i", }, ¬Expr{ - pos: position{line: 2252, col: 33, offset: 69749}, + pos: position{line: 2255, col: 33, offset: 69839}, expr: &ruleRefExpr{ - pos: position{line: 2252, col: 34, offset: 69750}, + pos: position{line: 2255, col: 34, offset: 69840}, name: "IdentifierRest", }, }, @@ -16536,20 +16565,20 @@ var g = &grammar{ }, { name: "LAST", - pos: position{line: 2253, col: 1, offset: 69765}, + pos: position{line: 2256, col: 1, offset: 69855}, expr: &seqExpr{ - pos: position{line: 2253, col: 14, offset: 69778}, + pos: position{line: 2256, col: 14, offset: 69868}, exprs: []any{ &litMatcher{ - pos: position{line: 2253, col: 14, offset: 69778}, + pos: position{line: 2256, col: 14, offset: 69868}, val: "last", ignoreCase: true, want: "\"LAST\"i", }, ¬Expr{ - pos: position{line: 2253, col: 33, offset: 69797}, + pos: position{line: 2256, col: 33, offset: 69887}, expr: &ruleRefExpr{ - pos: position{line: 2253, col: 34, offset: 69798}, + pos: position{line: 2256, col: 34, offset: 69888}, name: "IdentifierRest", }, }, @@ -16560,20 +16589,20 @@ var g = &grammar{ }, { name: "LEFT", - pos: position{line: 2254, col: 1, offset: 69813}, + pos: position{line: 2257, col: 1, offset: 69903}, expr: &seqExpr{ - pos: position{line: 2254, col: 14, offset: 69826}, + pos: position{line: 2257, col: 14, offset: 69916}, exprs: []any{ &litMatcher{ - pos: position{line: 2254, col: 14, offset: 69826}, + pos: position{line: 2257, col: 14, offset: 69916}, val: "left", ignoreCase: true, want: "\"LEFT\"i", }, ¬Expr{ - pos: position{line: 2254, col: 33, offset: 69845}, + pos: position{line: 2257, col: 33, offset: 69935}, expr: &ruleRefExpr{ - pos: position{line: 2254, col: 34, offset: 69846}, + pos: position{line: 2257, col: 34, offset: 69936}, name: "IdentifierRest", }, }, @@ -16584,20 +16613,20 @@ var g = &grammar{ }, { name: "LIKE", - pos: position{line: 2255, col: 1, offset: 69861}, + pos: position{line: 2258, col: 1, offset: 69951}, expr: &seqExpr{ - pos: position{line: 2255, col: 14, offset: 69874}, + pos: position{line: 2258, col: 14, offset: 69964}, exprs: []any{ &litMatcher{ - pos: position{line: 2255, col: 14, offset: 69874}, + pos: position{line: 2258, col: 14, offset: 69964}, val: "like", ignoreCase: true, want: "\"LIKE\"i", }, ¬Expr{ - pos: position{line: 2255, col: 32, offset: 69892}, + pos: position{line: 2258, col: 32, offset: 69982}, expr: &ruleRefExpr{ - pos: position{line: 2255, col: 33, offset: 69893}, + pos: position{line: 2258, col: 33, offset: 69983}, name: "IdentifierRest", }, }, @@ -16608,20 +16637,20 @@ var g = &grammar{ }, { name: "LIMIT", - pos: position{line: 2256, col: 1, offset: 69908}, + pos: position{line: 2259, col: 1, offset: 69998}, expr: &seqExpr{ - pos: position{line: 2256, col: 14, offset: 69921}, + pos: position{line: 2259, col: 14, offset: 70011}, exprs: []any{ &litMatcher{ - pos: position{line: 2256, col: 14, offset: 69921}, + pos: position{line: 2259, col: 14, offset: 70011}, val: "limit", ignoreCase: true, want: "\"LIMIT\"i", }, ¬Expr{ - pos: position{line: 2256, col: 33, offset: 69940}, + pos: position{line: 2259, col: 33, offset: 70030}, expr: &ruleRefExpr{ - pos: position{line: 2256, col: 34, offset: 69941}, + pos: position{line: 2259, col: 34, offset: 70031}, name: "IdentifierRest", }, }, @@ -16632,20 +16661,20 @@ var g = &grammar{ }, { name: "LOAD", - pos: position{line: 2257, col: 1, offset: 69956}, + pos: position{line: 2260, col: 1, offset: 70046}, expr: &seqExpr{ - pos: position{line: 2257, col: 14, offset: 69969}, + pos: position{line: 2260, col: 14, offset: 70059}, exprs: []any{ &litMatcher{ - pos: position{line: 2257, col: 14, offset: 69969}, + pos: position{line: 2260, col: 14, offset: 70059}, val: "load", ignoreCase: true, want: "\"LOAD\"i", }, ¬Expr{ - pos: position{line: 2257, col: 33, offset: 69988}, + pos: position{line: 2260, col: 33, offset: 70078}, expr: &ruleRefExpr{ - pos: position{line: 2257, col: 34, offset: 69989}, + pos: position{line: 2260, col: 34, offset: 70079}, name: "IdentifierRest", }, }, @@ -16656,20 +16685,20 @@ var g = &grammar{ }, { name: "MATERIALIZED", - pos: position{line: 2258, col: 1, offset: 70004}, + pos: position{line: 2261, col: 1, offset: 70094}, expr: &seqExpr{ - pos: position{line: 2258, col: 16, offset: 70019}, + pos: position{line: 2261, col: 16, offset: 70109}, exprs: []any{ &litMatcher{ - pos: position{line: 2258, col: 16, offset: 70019}, + pos: position{line: 2261, col: 16, offset: 70109}, val: "materialized", ignoreCase: true, want: "\"MATERIALIZED\"i", }, ¬Expr{ - pos: position{line: 2258, col: 33, offset: 70036}, + pos: position{line: 2261, col: 33, offset: 70126}, expr: &ruleRefExpr{ - pos: position{line: 2258, col: 34, offset: 70037}, + pos: position{line: 2261, col: 34, offset: 70127}, name: "IdentifierRest", }, }, @@ -16680,20 +16709,20 @@ var g = &grammar{ }, { name: "MERGE", - pos: position{line: 2259, col: 1, offset: 70052}, + pos: position{line: 2262, col: 1, offset: 70142}, expr: &seqExpr{ - pos: position{line: 2259, col: 14, offset: 70065}, + pos: position{line: 2262, col: 14, offset: 70155}, exprs: []any{ &litMatcher{ - pos: position{line: 2259, col: 14, offset: 70065}, + pos: position{line: 2262, col: 14, offset: 70155}, val: "merge", ignoreCase: true, want: "\"MERGE\"i", }, ¬Expr{ - pos: position{line: 2259, col: 33, offset: 70084}, + pos: position{line: 2262, col: 33, offset: 70174}, expr: &ruleRefExpr{ - pos: position{line: 2259, col: 34, offset: 70085}, + pos: position{line: 2262, col: 34, offset: 70175}, name: "IdentifierRest", }, }, @@ -16704,20 +16733,20 @@ var g = &grammar{ }, { name: "MESSAGE", - pos: position{line: 2260, col: 1, offset: 70100}, + pos: position{line: 2263, col: 1, offset: 70190}, expr: &seqExpr{ - pos: position{line: 2260, col: 14, offset: 70113}, + pos: position{line: 2263, col: 14, offset: 70203}, exprs: []any{ &litMatcher{ - pos: position{line: 2260, col: 14, offset: 70113}, + pos: position{line: 2263, col: 14, offset: 70203}, val: "message", ignoreCase: true, want: "\"MESSAGE\"i", }, ¬Expr{ - pos: position{line: 2260, col: 33, offset: 70132}, + pos: position{line: 2263, col: 33, offset: 70222}, expr: &ruleRefExpr{ - pos: position{line: 2260, col: 34, offset: 70133}, + pos: position{line: 2263, col: 34, offset: 70223}, name: "IdentifierRest", }, }, @@ -16728,20 +16757,20 @@ var g = &grammar{ }, { name: "META", - pos: position{line: 2261, col: 1, offset: 70148}, + pos: position{line: 2264, col: 1, offset: 70238}, expr: &seqExpr{ - pos: position{line: 2261, col: 14, offset: 70161}, + pos: position{line: 2264, col: 14, offset: 70251}, exprs: []any{ &litMatcher{ - pos: position{line: 2261, col: 14, offset: 70161}, + pos: position{line: 2264, col: 14, offset: 70251}, val: "meta", ignoreCase: true, want: "\"META\"i", }, ¬Expr{ - pos: position{line: 2261, col: 33, offset: 70180}, + pos: position{line: 2264, col: 33, offset: 70270}, expr: &ruleRefExpr{ - pos: position{line: 2261, col: 34, offset: 70181}, + pos: position{line: 2264, col: 34, offset: 70271}, name: "IdentifierRest", }, }, @@ -16752,20 +16781,20 @@ var g = &grammar{ }, { name: "METHOD", - pos: position{line: 2262, col: 1, offset: 70196}, + pos: position{line: 2265, col: 1, offset: 70286}, expr: &seqExpr{ - pos: position{line: 2262, col: 14, offset: 70209}, + pos: position{line: 2265, col: 14, offset: 70299}, exprs: []any{ &litMatcher{ - pos: position{line: 2262, col: 14, offset: 70209}, + pos: position{line: 2265, col: 14, offset: 70299}, val: "method", ignoreCase: true, want: "\"METHOD\"i", }, ¬Expr{ - pos: position{line: 2262, col: 33, offset: 70228}, + pos: position{line: 2265, col: 33, offset: 70318}, expr: &ruleRefExpr{ - pos: position{line: 2262, col: 34, offset: 70229}, + pos: position{line: 2265, col: 34, offset: 70319}, name: "IdentifierRest", }, }, @@ -16776,20 +16805,20 @@ var g = &grammar{ }, { name: "NOT", - pos: position{line: 2263, col: 1, offset: 70244}, + pos: position{line: 2266, col: 1, offset: 70334}, expr: &seqExpr{ - pos: position{line: 2263, col: 14, offset: 70257}, + pos: position{line: 2266, col: 14, offset: 70347}, exprs: []any{ &litMatcher{ - pos: position{line: 2263, col: 14, offset: 70257}, + pos: position{line: 2266, col: 14, offset: 70347}, val: "not", ignoreCase: true, want: "\"NOT\"i", }, ¬Expr{ - pos: position{line: 2263, col: 33, offset: 70276}, + pos: position{line: 2266, col: 33, offset: 70366}, expr: &ruleRefExpr{ - pos: position{line: 2263, col: 34, offset: 70277}, + pos: position{line: 2266, col: 34, offset: 70367}, name: "IdentifierRest", }, }, @@ -16800,20 +16829,20 @@ var g = &grammar{ }, { name: "NULL", - pos: position{line: 2264, col: 1, offset: 70292}, + pos: position{line: 2267, col: 1, offset: 70382}, expr: &seqExpr{ - pos: position{line: 2264, col: 14, offset: 70305}, + pos: position{line: 2267, col: 14, offset: 70395}, exprs: []any{ &litMatcher{ - pos: position{line: 2264, col: 14, offset: 70305}, + pos: position{line: 2267, col: 14, offset: 70395}, val: "null", ignoreCase: true, want: "\"NULL\"i", }, ¬Expr{ - pos: position{line: 2264, col: 33, offset: 70324}, + pos: position{line: 2267, col: 33, offset: 70414}, expr: &ruleRefExpr{ - pos: position{line: 2264, col: 34, offset: 70325}, + pos: position{line: 2267, col: 34, offset: 70415}, name: "IdentifierRest", }, }, @@ -16824,20 +16853,20 @@ var g = &grammar{ }, { name: "NULLS", - pos: position{line: 2265, col: 1, offset: 70340}, + pos: position{line: 2268, col: 1, offset: 70430}, expr: &seqExpr{ - pos: position{line: 2265, col: 14, offset: 70353}, + pos: position{line: 2268, col: 14, offset: 70443}, exprs: []any{ &litMatcher{ - pos: position{line: 2265, col: 14, offset: 70353}, + pos: position{line: 2268, col: 14, offset: 70443}, val: "nulls", ignoreCase: true, want: "\"NULLS\"i", }, ¬Expr{ - pos: position{line: 2265, col: 33, offset: 70372}, + pos: position{line: 2268, col: 33, offset: 70462}, expr: &ruleRefExpr{ - pos: position{line: 2265, col: 34, offset: 70373}, + pos: position{line: 2268, col: 34, offset: 70463}, name: "IdentifierRest", }, }, @@ -16848,20 +16877,20 @@ var g = &grammar{ }, { name: "OFFSET", - pos: position{line: 2266, col: 1, offset: 70388}, + pos: position{line: 2269, col: 1, offset: 70478}, expr: &seqExpr{ - pos: position{line: 2266, col: 14, offset: 70401}, + pos: position{line: 2269, col: 14, offset: 70491}, exprs: []any{ &litMatcher{ - pos: position{line: 2266, col: 14, offset: 70401}, + pos: position{line: 2269, col: 14, offset: 70491}, val: "offset", ignoreCase: true, want: "\"OFFSET\"i", }, ¬Expr{ - pos: position{line: 2266, col: 33, offset: 70420}, + pos: position{line: 2269, col: 33, offset: 70510}, expr: &ruleRefExpr{ - pos: position{line: 2266, col: 34, offset: 70421}, + pos: position{line: 2269, col: 34, offset: 70511}, name: "IdentifierRest", }, }, @@ -16872,20 +16901,20 @@ var g = &grammar{ }, { name: "ON", - pos: position{line: 2267, col: 1, offset: 70436}, + pos: position{line: 2270, col: 1, offset: 70526}, expr: &seqExpr{ - pos: position{line: 2267, col: 14, offset: 70449}, + pos: position{line: 2270, col: 14, offset: 70539}, exprs: []any{ &litMatcher{ - pos: position{line: 2267, col: 14, offset: 70449}, + pos: position{line: 2270, col: 14, offset: 70539}, val: "on", ignoreCase: true, want: "\"ON\"i", }, ¬Expr{ - pos: position{line: 2267, col: 33, offset: 70468}, + pos: position{line: 2270, col: 33, offset: 70558}, expr: &ruleRefExpr{ - pos: position{line: 2267, col: 34, offset: 70469}, + pos: position{line: 2270, col: 34, offset: 70559}, name: "IdentifierRest", }, }, @@ -16896,20 +16925,20 @@ var g = &grammar{ }, { name: "OP", - pos: position{line: 2268, col: 1, offset: 70484}, + pos: position{line: 2271, col: 1, offset: 70574}, expr: &seqExpr{ - pos: position{line: 2268, col: 14, offset: 70497}, + pos: position{line: 2271, col: 14, offset: 70587}, exprs: []any{ &litMatcher{ - pos: position{line: 2268, col: 14, offset: 70497}, + pos: position{line: 2271, col: 14, offset: 70587}, val: "op", ignoreCase: true, want: "\"OP\"i", }, ¬Expr{ - pos: position{line: 2268, col: 33, offset: 70516}, + pos: position{line: 2271, col: 33, offset: 70606}, expr: &ruleRefExpr{ - pos: position{line: 2268, col: 34, offset: 70517}, + pos: position{line: 2271, col: 34, offset: 70607}, name: "IdentifierRest", }, }, @@ -16920,23 +16949,23 @@ var g = &grammar{ }, { name: "OR", - pos: position{line: 2269, col: 1, offset: 70532}, + pos: position{line: 2272, col: 1, offset: 70622}, expr: &actionExpr{ - pos: position{line: 2269, col: 14, offset: 70545}, + pos: position{line: 2272, col: 14, offset: 70635}, run: (*parser).callonOR1, expr: &seqExpr{ - pos: position{line: 2269, col: 14, offset: 70545}, + pos: position{line: 2272, col: 14, offset: 70635}, exprs: []any{ &litMatcher{ - pos: position{line: 2269, col: 14, offset: 70545}, + pos: position{line: 2272, col: 14, offset: 70635}, val: "or", ignoreCase: true, want: "\"OR\"i", }, ¬Expr{ - pos: position{line: 2269, col: 33, offset: 70564}, + pos: position{line: 2272, col: 33, offset: 70654}, expr: &ruleRefExpr{ - pos: position{line: 2269, col: 34, offset: 70565}, + pos: position{line: 2272, col: 34, offset: 70655}, name: "IdentifierRest", }, }, @@ -16948,20 +16977,20 @@ var g = &grammar{ }, { name: "ORDER", - pos: position{line: 2270, col: 1, offset: 70601}, + pos: position{line: 2273, col: 1, offset: 70691}, expr: &seqExpr{ - pos: position{line: 2270, col: 14, offset: 70614}, + pos: position{line: 2273, col: 14, offset: 70704}, exprs: []any{ &litMatcher{ - pos: position{line: 2270, col: 14, offset: 70614}, + pos: position{line: 2273, col: 14, offset: 70704}, val: "order", ignoreCase: true, want: "\"ORDER\"i", }, ¬Expr{ - pos: position{line: 2270, col: 33, offset: 70633}, + pos: position{line: 2273, col: 33, offset: 70723}, expr: &ruleRefExpr{ - pos: position{line: 2270, col: 34, offset: 70634}, + pos: position{line: 2273, col: 34, offset: 70724}, name: "IdentifierRest", }, }, @@ -16972,20 +17001,20 @@ var g = &grammar{ }, { name: "ORDINALITY", - pos: position{line: 2271, col: 1, offset: 70649}, + pos: position{line: 2274, col: 1, offset: 70739}, expr: &seqExpr{ - pos: position{line: 2271, col: 14, offset: 70662}, + pos: position{line: 2274, col: 14, offset: 70752}, exprs: []any{ &litMatcher{ - pos: position{line: 2271, col: 14, offset: 70662}, + pos: position{line: 2274, col: 14, offset: 70752}, val: "ordinality", ignoreCase: true, want: "\"ORDINALITY\"i", }, ¬Expr{ - pos: position{line: 2271, col: 33, offset: 70681}, + pos: position{line: 2274, col: 33, offset: 70771}, expr: &ruleRefExpr{ - pos: position{line: 2271, col: 34, offset: 70682}, + pos: position{line: 2274, col: 34, offset: 70772}, name: "IdentifierRest", }, }, @@ -16996,20 +17025,20 @@ var g = &grammar{ }, { name: "OUTER", - pos: position{line: 2272, col: 1, offset: 70697}, + pos: position{line: 2275, col: 1, offset: 70787}, expr: &seqExpr{ - pos: position{line: 2272, col: 14, offset: 70710}, + pos: position{line: 2275, col: 14, offset: 70800}, exprs: []any{ &litMatcher{ - pos: position{line: 2272, col: 14, offset: 70710}, + pos: position{line: 2275, col: 14, offset: 70800}, val: "outer", ignoreCase: true, want: "\"OUTER\"i", }, ¬Expr{ - pos: position{line: 2272, col: 33, offset: 70729}, + pos: position{line: 2275, col: 33, offset: 70819}, expr: &ruleRefExpr{ - pos: position{line: 2272, col: 34, offset: 70730}, + pos: position{line: 2275, col: 34, offset: 70820}, name: "IdentifierRest", }, }, @@ -17020,20 +17049,20 @@ var g = &grammar{ }, { name: "OUTPUT", - pos: position{line: 2273, col: 1, offset: 70745}, + pos: position{line: 2276, col: 1, offset: 70835}, expr: &seqExpr{ - pos: position{line: 2273, col: 14, offset: 70758}, + pos: position{line: 2276, col: 14, offset: 70848}, exprs: []any{ &litMatcher{ - pos: position{line: 2273, col: 14, offset: 70758}, + pos: position{line: 2276, col: 14, offset: 70848}, val: "output", ignoreCase: true, want: "\"OUTPUT\"i", }, ¬Expr{ - pos: position{line: 2273, col: 33, offset: 70777}, + pos: position{line: 2276, col: 33, offset: 70867}, expr: &ruleRefExpr{ - pos: position{line: 2273, col: 34, offset: 70778}, + pos: position{line: 2276, col: 34, offset: 70868}, name: "IdentifierRest", }, }, @@ -17044,20 +17073,20 @@ var g = &grammar{ }, { name: "OVER", - pos: position{line: 2274, col: 1, offset: 70793}, + pos: position{line: 2277, col: 1, offset: 70883}, expr: &seqExpr{ - pos: position{line: 2274, col: 14, offset: 70806}, + pos: position{line: 2277, col: 14, offset: 70896}, exprs: []any{ &litMatcher{ - pos: position{line: 2274, col: 14, offset: 70806}, + pos: position{line: 2277, col: 14, offset: 70896}, val: "over", ignoreCase: true, want: "\"OVER\"i", }, ¬Expr{ - pos: position{line: 2274, col: 33, offset: 70825}, + pos: position{line: 2277, col: 33, offset: 70915}, expr: &ruleRefExpr{ - pos: position{line: 2274, col: 34, offset: 70826}, + pos: position{line: 2277, col: 34, offset: 70916}, name: "IdentifierRest", }, }, @@ -17068,20 +17097,20 @@ var g = &grammar{ }, { name: "PASS", - pos: position{line: 2275, col: 1, offset: 70841}, + pos: position{line: 2278, col: 1, offset: 70931}, expr: &seqExpr{ - pos: position{line: 2275, col: 14, offset: 70854}, + pos: position{line: 2278, col: 14, offset: 70944}, exprs: []any{ &litMatcher{ - pos: position{line: 2275, col: 14, offset: 70854}, + pos: position{line: 2278, col: 14, offset: 70944}, val: "pass", ignoreCase: true, want: "\"PASS\"i", }, ¬Expr{ - pos: position{line: 2275, col: 33, offset: 70873}, + pos: position{line: 2278, col: 33, offset: 70963}, expr: &ruleRefExpr{ - pos: position{line: 2275, col: 34, offset: 70874}, + pos: position{line: 2278, col: 34, offset: 70964}, name: "IdentifierRest", }, }, @@ -17092,20 +17121,20 @@ var g = &grammar{ }, { name: "PUT", - pos: position{line: 2276, col: 1, offset: 70889}, + pos: position{line: 2279, col: 1, offset: 70979}, expr: &seqExpr{ - pos: position{line: 2276, col: 14, offset: 70902}, + pos: position{line: 2279, col: 14, offset: 70992}, exprs: []any{ &litMatcher{ - pos: position{line: 2276, col: 14, offset: 70902}, + pos: position{line: 2279, col: 14, offset: 70992}, val: "put", ignoreCase: true, want: "\"PUT\"i", }, ¬Expr{ - pos: position{line: 2276, col: 33, offset: 70921}, + pos: position{line: 2279, col: 33, offset: 71011}, expr: &ruleRefExpr{ - pos: position{line: 2276, col: 34, offset: 70922}, + pos: position{line: 2279, col: 34, offset: 71012}, name: "IdentifierRest", }, }, @@ -17116,20 +17145,20 @@ var g = &grammar{ }, { name: "RECURSIVE", - pos: position{line: 2277, col: 1, offset: 70937}, + pos: position{line: 2280, col: 1, offset: 71027}, expr: &seqExpr{ - pos: position{line: 2277, col: 14, offset: 70950}, + pos: position{line: 2280, col: 14, offset: 71040}, exprs: []any{ &litMatcher{ - pos: position{line: 2277, col: 14, offset: 70950}, + pos: position{line: 2280, col: 14, offset: 71040}, val: "RECURSIVE", ignoreCase: false, want: "\"RECURSIVE\"", }, ¬Expr{ - pos: position{line: 2277, col: 33, offset: 70969}, + pos: position{line: 2280, col: 33, offset: 71059}, expr: &ruleRefExpr{ - pos: position{line: 2277, col: 34, offset: 70970}, + pos: position{line: 2280, col: 34, offset: 71060}, name: "IdentifierRest", }, }, @@ -17140,20 +17169,20 @@ var g = &grammar{ }, { name: "REGEXP", - pos: position{line: 2278, col: 1, offset: 70985}, + pos: position{line: 2281, col: 1, offset: 71075}, expr: &seqExpr{ - pos: position{line: 2278, col: 14, offset: 70998}, + pos: position{line: 2281, col: 14, offset: 71088}, exprs: []any{ &litMatcher{ - pos: position{line: 2278, col: 14, offset: 70998}, + pos: position{line: 2281, col: 14, offset: 71088}, val: "regexp", ignoreCase: true, want: "\"REGEXP\"i", }, ¬Expr{ - pos: position{line: 2278, col: 33, offset: 71017}, + pos: position{line: 2281, col: 33, offset: 71107}, expr: &ruleRefExpr{ - pos: position{line: 2278, col: 34, offset: 71018}, + pos: position{line: 2281, col: 34, offset: 71108}, name: "IdentifierRest", }, }, @@ -17164,20 +17193,20 @@ var g = &grammar{ }, { name: "REGEXP_REPLACE", - pos: position{line: 2279, col: 1, offset: 71033}, + pos: position{line: 2282, col: 1, offset: 71123}, expr: &seqExpr{ - pos: position{line: 2279, col: 18, offset: 71050}, + pos: position{line: 2282, col: 18, offset: 71140}, exprs: []any{ &litMatcher{ - pos: position{line: 2279, col: 18, offset: 71050}, + pos: position{line: 2282, col: 18, offset: 71140}, val: "regexp_replace", ignoreCase: true, want: "\"REGEXP_REPLACE\"i", }, ¬Expr{ - pos: position{line: 2279, col: 36, offset: 71068}, + pos: position{line: 2282, col: 36, offset: 71158}, expr: &ruleRefExpr{ - pos: position{line: 2279, col: 37, offset: 71069}, + pos: position{line: 2282, col: 37, offset: 71159}, name: "IdentifierRest", }, }, @@ -17188,20 +17217,20 @@ var g = &grammar{ }, { name: "RENAME", - pos: position{line: 2280, col: 1, offset: 71084}, + pos: position{line: 2283, col: 1, offset: 71174}, expr: &seqExpr{ - pos: position{line: 2280, col: 14, offset: 71097}, + pos: position{line: 2283, col: 14, offset: 71187}, exprs: []any{ &litMatcher{ - pos: position{line: 2280, col: 14, offset: 71097}, + pos: position{line: 2283, col: 14, offset: 71187}, val: "rename", ignoreCase: true, want: "\"RENAME\"i", }, ¬Expr{ - pos: position{line: 2280, col: 33, offset: 71116}, + pos: position{line: 2283, col: 33, offset: 71206}, expr: &ruleRefExpr{ - pos: position{line: 2280, col: 34, offset: 71117}, + pos: position{line: 2283, col: 34, offset: 71207}, name: "IdentifierRest", }, }, @@ -17212,20 +17241,20 @@ var g = &grammar{ }, { name: "RIGHT", - pos: position{line: 2281, col: 1, offset: 71132}, + pos: position{line: 2284, col: 1, offset: 71222}, expr: &seqExpr{ - pos: position{line: 2281, col: 14, offset: 71145}, + pos: position{line: 2284, col: 14, offset: 71235}, exprs: []any{ &litMatcher{ - pos: position{line: 2281, col: 14, offset: 71145}, + pos: position{line: 2284, col: 14, offset: 71235}, val: "right", ignoreCase: true, want: "\"RIGHT\"i", }, ¬Expr{ - pos: position{line: 2281, col: 33, offset: 71164}, + pos: position{line: 2284, col: 33, offset: 71254}, expr: &ruleRefExpr{ - pos: position{line: 2281, col: 34, offset: 71165}, + pos: position{line: 2284, col: 34, offset: 71255}, name: "IdentifierRest", }, }, @@ -17236,20 +17265,20 @@ var g = &grammar{ }, { name: "SAMPLE", - pos: position{line: 2282, col: 1, offset: 71180}, + pos: position{line: 2285, col: 1, offset: 71270}, expr: &seqExpr{ - pos: position{line: 2282, col: 14, offset: 71193}, + pos: position{line: 2285, col: 14, offset: 71283}, exprs: []any{ &litMatcher{ - pos: position{line: 2282, col: 14, offset: 71193}, + pos: position{line: 2285, col: 14, offset: 71283}, val: "sample", ignoreCase: true, want: "\"SAMPLE\"i", }, ¬Expr{ - pos: position{line: 2282, col: 33, offset: 71212}, + pos: position{line: 2285, col: 33, offset: 71302}, expr: &ruleRefExpr{ - pos: position{line: 2282, col: 34, offset: 71213}, + pos: position{line: 2285, col: 34, offset: 71303}, name: "IdentifierRest", }, }, @@ -17260,20 +17289,20 @@ var g = &grammar{ }, { name: "SEARCH", - pos: position{line: 2283, col: 1, offset: 71228}, + pos: position{line: 2286, col: 1, offset: 71318}, expr: &seqExpr{ - pos: position{line: 2283, col: 14, offset: 71241}, + pos: position{line: 2286, col: 14, offset: 71331}, exprs: []any{ &litMatcher{ - pos: position{line: 2283, col: 14, offset: 71241}, + pos: position{line: 2286, col: 14, offset: 71331}, val: "search", ignoreCase: true, want: "\"SEARCH\"i", }, ¬Expr{ - pos: position{line: 2283, col: 33, offset: 71260}, + pos: position{line: 2286, col: 33, offset: 71350}, expr: &ruleRefExpr{ - pos: position{line: 2283, col: 34, offset: 71261}, + pos: position{line: 2286, col: 34, offset: 71351}, name: "IdentifierRest", }, }, @@ -17284,20 +17313,20 @@ var g = &grammar{ }, { name: "SELECT", - pos: position{line: 2284, col: 1, offset: 71276}, + pos: position{line: 2287, col: 1, offset: 71366}, expr: &seqExpr{ - pos: position{line: 2284, col: 14, offset: 71289}, + pos: position{line: 2287, col: 14, offset: 71379}, exprs: []any{ &litMatcher{ - pos: position{line: 2284, col: 14, offset: 71289}, + pos: position{line: 2287, col: 14, offset: 71379}, val: "select", ignoreCase: true, want: "\"SELECT\"i", }, ¬Expr{ - pos: position{line: 2284, col: 33, offset: 71308}, + pos: position{line: 2287, col: 33, offset: 71398}, expr: &ruleRefExpr{ - pos: position{line: 2284, col: 34, offset: 71309}, + pos: position{line: 2287, col: 34, offset: 71399}, name: "IdentifierRest", }, }, @@ -17308,20 +17337,20 @@ var g = &grammar{ }, { name: "SHAPE", - pos: position{line: 2285, col: 1, offset: 71324}, + pos: position{line: 2288, col: 1, offset: 71414}, expr: &seqExpr{ - pos: position{line: 2285, col: 14, offset: 71337}, + pos: position{line: 2288, col: 14, offset: 71427}, exprs: []any{ &litMatcher{ - pos: position{line: 2285, col: 14, offset: 71337}, + pos: position{line: 2288, col: 14, offset: 71427}, val: "shape", ignoreCase: true, want: "\"SHAPE\"i", }, ¬Expr{ - pos: position{line: 2285, col: 33, offset: 71356}, + pos: position{line: 2288, col: 33, offset: 71446}, expr: &ruleRefExpr{ - pos: position{line: 2285, col: 34, offset: 71357}, + pos: position{line: 2288, col: 34, offset: 71447}, name: "IdentifierRest", }, }, @@ -17332,20 +17361,20 @@ var g = &grammar{ }, { name: "SORT", - pos: position{line: 2286, col: 1, offset: 71372}, + pos: position{line: 2289, col: 1, offset: 71462}, expr: &seqExpr{ - pos: position{line: 2286, col: 14, offset: 71385}, + pos: position{line: 2289, col: 14, offset: 71475}, exprs: []any{ &litMatcher{ - pos: position{line: 2286, col: 14, offset: 71385}, + pos: position{line: 2289, col: 14, offset: 71475}, val: "sort", ignoreCase: true, want: "\"SORT\"i", }, ¬Expr{ - pos: position{line: 2286, col: 33, offset: 71404}, + pos: position{line: 2289, col: 33, offset: 71494}, expr: &ruleRefExpr{ - pos: position{line: 2286, col: 34, offset: 71405}, + pos: position{line: 2289, col: 34, offset: 71495}, name: "IdentifierRest", }, }, @@ -17356,20 +17385,20 @@ var g = &grammar{ }, { name: "SUMMARIZE", - pos: position{line: 2287, col: 1, offset: 71420}, + pos: position{line: 2290, col: 1, offset: 71510}, expr: &seqExpr{ - pos: position{line: 2287, col: 14, offset: 71433}, + pos: position{line: 2290, col: 14, offset: 71523}, exprs: []any{ &litMatcher{ - pos: position{line: 2287, col: 14, offset: 71433}, + pos: position{line: 2290, col: 14, offset: 71523}, val: "summarize", ignoreCase: true, want: "\"SUMMARIZE\"i", }, ¬Expr{ - pos: position{line: 2287, col: 33, offset: 71452}, + pos: position{line: 2290, col: 33, offset: 71542}, expr: &ruleRefExpr{ - pos: position{line: 2287, col: 34, offset: 71453}, + pos: position{line: 2290, col: 34, offset: 71543}, name: "IdentifierRest", }, }, @@ -17380,20 +17409,20 @@ var g = &grammar{ }, { name: "SWITCH", - pos: position{line: 2288, col: 1, offset: 71468}, + pos: position{line: 2291, col: 1, offset: 71558}, expr: &seqExpr{ - pos: position{line: 2288, col: 14, offset: 71481}, + pos: position{line: 2291, col: 14, offset: 71571}, exprs: []any{ &litMatcher{ - pos: position{line: 2288, col: 14, offset: 71481}, + pos: position{line: 2291, col: 14, offset: 71571}, val: "switch", ignoreCase: true, want: "\"SWITCH\"i", }, ¬Expr{ - pos: position{line: 2288, col: 33, offset: 71500}, + pos: position{line: 2291, col: 33, offset: 71590}, expr: &ruleRefExpr{ - pos: position{line: 2288, col: 34, offset: 71501}, + pos: position{line: 2291, col: 34, offset: 71591}, name: "IdentifierRest", }, }, @@ -17404,20 +17433,20 @@ var g = &grammar{ }, { name: "TAIL", - pos: position{line: 2289, col: 1, offset: 71516}, + pos: position{line: 2292, col: 1, offset: 71606}, expr: &seqExpr{ - pos: position{line: 2289, col: 14, offset: 71529}, + pos: position{line: 2292, col: 14, offset: 71619}, exprs: []any{ &litMatcher{ - pos: position{line: 2289, col: 14, offset: 71529}, + pos: position{line: 2292, col: 14, offset: 71619}, val: "tail", ignoreCase: true, want: "\"TAIL\"i", }, ¬Expr{ - pos: position{line: 2289, col: 33, offset: 71548}, + pos: position{line: 2292, col: 33, offset: 71638}, expr: &ruleRefExpr{ - pos: position{line: 2289, col: 34, offset: 71549}, + pos: position{line: 2292, col: 34, offset: 71639}, name: "IdentifierRest", }, }, @@ -17428,20 +17457,20 @@ var g = &grammar{ }, { name: "TAP", - pos: position{line: 2290, col: 1, offset: 71565}, + pos: position{line: 2293, col: 1, offset: 71655}, expr: &seqExpr{ - pos: position{line: 2290, col: 14, offset: 71578}, + pos: position{line: 2293, col: 14, offset: 71668}, exprs: []any{ &litMatcher{ - pos: position{line: 2290, col: 14, offset: 71578}, + pos: position{line: 2293, col: 14, offset: 71668}, val: "tap", ignoreCase: true, want: "\"TAP\"i", }, ¬Expr{ - pos: position{line: 2290, col: 33, offset: 71597}, + pos: position{line: 2293, col: 33, offset: 71687}, expr: &ruleRefExpr{ - pos: position{line: 2290, col: 34, offset: 71598}, + pos: position{line: 2293, col: 34, offset: 71688}, name: "IdentifierRest", }, }, @@ -17452,20 +17481,20 @@ var g = &grammar{ }, { name: "THEN", - pos: position{line: 2291, col: 1, offset: 71613}, + pos: position{line: 2294, col: 1, offset: 71703}, expr: &seqExpr{ - pos: position{line: 2291, col: 14, offset: 71626}, + pos: position{line: 2294, col: 14, offset: 71716}, exprs: []any{ &litMatcher{ - pos: position{line: 2291, col: 14, offset: 71626}, + pos: position{line: 2294, col: 14, offset: 71716}, val: "then", ignoreCase: true, want: "\"THEN\"i", }, ¬Expr{ - pos: position{line: 2291, col: 33, offset: 71645}, + pos: position{line: 2294, col: 33, offset: 71735}, expr: &ruleRefExpr{ - pos: position{line: 2291, col: 34, offset: 71646}, + pos: position{line: 2294, col: 34, offset: 71736}, name: "IdentifierRest", }, }, @@ -17476,20 +17505,20 @@ var g = &grammar{ }, { name: "TOP", - pos: position{line: 2292, col: 1, offset: 71661}, + pos: position{line: 2295, col: 1, offset: 71751}, expr: &seqExpr{ - pos: position{line: 2292, col: 14, offset: 71674}, + pos: position{line: 2295, col: 14, offset: 71764}, exprs: []any{ &litMatcher{ - pos: position{line: 2292, col: 14, offset: 71674}, + pos: position{line: 2295, col: 14, offset: 71764}, val: "top", ignoreCase: true, want: "\"TOP\"i", }, ¬Expr{ - pos: position{line: 2292, col: 33, offset: 71693}, + pos: position{line: 2295, col: 33, offset: 71783}, expr: &ruleRefExpr{ - pos: position{line: 2292, col: 34, offset: 71694}, + pos: position{line: 2295, col: 34, offset: 71784}, name: "IdentifierRest", }, }, @@ -17500,20 +17529,20 @@ var g = &grammar{ }, { name: "TRUE", - pos: position{line: 2293, col: 1, offset: 71709}, + pos: position{line: 2296, col: 1, offset: 71799}, expr: &seqExpr{ - pos: position{line: 2293, col: 14, offset: 71722}, + pos: position{line: 2296, col: 14, offset: 71812}, exprs: []any{ &litMatcher{ - pos: position{line: 2293, col: 14, offset: 71722}, + pos: position{line: 2296, col: 14, offset: 71812}, val: "true", ignoreCase: true, want: "\"TRUE\"i", }, ¬Expr{ - pos: position{line: 2293, col: 33, offset: 71741}, + pos: position{line: 2296, col: 33, offset: 71831}, expr: &ruleRefExpr{ - pos: position{line: 2293, col: 34, offset: 71742}, + pos: position{line: 2296, col: 34, offset: 71832}, name: "IdentifierRest", }, }, @@ -17524,20 +17553,20 @@ var g = &grammar{ }, { name: "TYPE", - pos: position{line: 2294, col: 1, offset: 71757}, + pos: position{line: 2297, col: 1, offset: 71847}, expr: &seqExpr{ - pos: position{line: 2294, col: 14, offset: 71770}, + pos: position{line: 2297, col: 14, offset: 71860}, exprs: []any{ &litMatcher{ - pos: position{line: 2294, col: 14, offset: 71770}, + pos: position{line: 2297, col: 14, offset: 71860}, val: "type", ignoreCase: true, want: "\"TYPE\"i", }, ¬Expr{ - pos: position{line: 2294, col: 33, offset: 71789}, + pos: position{line: 2297, col: 33, offset: 71879}, expr: &ruleRefExpr{ - pos: position{line: 2294, col: 34, offset: 71790}, + pos: position{line: 2297, col: 34, offset: 71880}, name: "IdentifierRest", }, }, @@ -17548,20 +17577,20 @@ var g = &grammar{ }, { name: "UNION", - pos: position{line: 2295, col: 1, offset: 71805}, + pos: position{line: 2298, col: 1, offset: 71895}, expr: &seqExpr{ - pos: position{line: 2295, col: 14, offset: 71818}, + pos: position{line: 2298, col: 14, offset: 71908}, exprs: []any{ &litMatcher{ - pos: position{line: 2295, col: 14, offset: 71818}, + pos: position{line: 2298, col: 14, offset: 71908}, val: "union", ignoreCase: true, want: "\"UNION\"i", }, ¬Expr{ - pos: position{line: 2295, col: 33, offset: 71837}, + pos: position{line: 2298, col: 33, offset: 71927}, expr: &ruleRefExpr{ - pos: position{line: 2295, col: 34, offset: 71838}, + pos: position{line: 2298, col: 34, offset: 71928}, name: "IdentifierRest", }, }, @@ -17572,20 +17601,20 @@ var g = &grammar{ }, { name: "UNIQ", - pos: position{line: 2296, col: 1, offset: 71853}, + pos: position{line: 2299, col: 1, offset: 71943}, expr: &seqExpr{ - pos: position{line: 2296, col: 14, offset: 71866}, + pos: position{line: 2299, col: 14, offset: 71956}, exprs: []any{ &litMatcher{ - pos: position{line: 2296, col: 14, offset: 71866}, + pos: position{line: 2299, col: 14, offset: 71956}, val: "uniq", ignoreCase: true, want: "\"UNIQ\"i", }, ¬Expr{ - pos: position{line: 2296, col: 33, offset: 71885}, + pos: position{line: 2299, col: 33, offset: 71975}, expr: &ruleRefExpr{ - pos: position{line: 2296, col: 34, offset: 71886}, + pos: position{line: 2299, col: 34, offset: 71976}, name: "IdentifierRest", }, }, @@ -17596,20 +17625,20 @@ var g = &grammar{ }, { name: "USING", - pos: position{line: 2297, col: 1, offset: 71902}, + pos: position{line: 2300, col: 1, offset: 71992}, expr: &seqExpr{ - pos: position{line: 2297, col: 14, offset: 71915}, + pos: position{line: 2300, col: 14, offset: 72005}, exprs: []any{ &litMatcher{ - pos: position{line: 2297, col: 14, offset: 71915}, + pos: position{line: 2300, col: 14, offset: 72005}, val: "using", ignoreCase: true, want: "\"USING\"i", }, ¬Expr{ - pos: position{line: 2297, col: 33, offset: 71934}, + pos: position{line: 2300, col: 33, offset: 72024}, expr: &ruleRefExpr{ - pos: position{line: 2297, col: 34, offset: 71935}, + pos: position{line: 2300, col: 34, offset: 72025}, name: "IdentifierRest", }, }, @@ -17620,20 +17649,20 @@ var g = &grammar{ }, { name: "VALUE", - pos: position{line: 2298, col: 1, offset: 71950}, + pos: position{line: 2301, col: 1, offset: 72040}, expr: &seqExpr{ - pos: position{line: 2298, col: 14, offset: 71963}, + pos: position{line: 2301, col: 14, offset: 72053}, exprs: []any{ &litMatcher{ - pos: position{line: 2298, col: 14, offset: 71963}, + pos: position{line: 2301, col: 14, offset: 72053}, val: "value", ignoreCase: true, want: "\"VALUE\"i", }, ¬Expr{ - pos: position{line: 2298, col: 33, offset: 71982}, + pos: position{line: 2301, col: 33, offset: 72072}, expr: &ruleRefExpr{ - pos: position{line: 2298, col: 34, offset: 71983}, + pos: position{line: 2301, col: 34, offset: 72073}, name: "IdentifierRest", }, }, @@ -17644,20 +17673,20 @@ var g = &grammar{ }, { name: "WHEN", - pos: position{line: 2299, col: 1, offset: 71998}, + pos: position{line: 2302, col: 1, offset: 72088}, expr: &seqExpr{ - pos: position{line: 2299, col: 14, offset: 72011}, + pos: position{line: 2302, col: 14, offset: 72101}, exprs: []any{ &litMatcher{ - pos: position{line: 2299, col: 14, offset: 72011}, + pos: position{line: 2302, col: 14, offset: 72101}, val: "when", ignoreCase: true, want: "\"WHEN\"i", }, ¬Expr{ - pos: position{line: 2299, col: 33, offset: 72030}, + pos: position{line: 2302, col: 33, offset: 72120}, expr: &ruleRefExpr{ - pos: position{line: 2299, col: 34, offset: 72031}, + pos: position{line: 2302, col: 34, offset: 72121}, name: "IdentifierRest", }, }, @@ -17668,20 +17697,20 @@ var g = &grammar{ }, { name: "WHERE", - pos: position{line: 2300, col: 1, offset: 72046}, + pos: position{line: 2303, col: 1, offset: 72136}, expr: &seqExpr{ - pos: position{line: 2300, col: 14, offset: 72059}, + pos: position{line: 2303, col: 14, offset: 72149}, exprs: []any{ &litMatcher{ - pos: position{line: 2300, col: 14, offset: 72059}, + pos: position{line: 2303, col: 14, offset: 72149}, val: "where", ignoreCase: true, want: "\"WHERE\"i", }, ¬Expr{ - pos: position{line: 2300, col: 33, offset: 72078}, + pos: position{line: 2303, col: 33, offset: 72168}, expr: &ruleRefExpr{ - pos: position{line: 2300, col: 34, offset: 72079}, + pos: position{line: 2303, col: 34, offset: 72169}, name: "IdentifierRest", }, }, @@ -17692,20 +17721,20 @@ var g = &grammar{ }, { name: "WITH", - pos: position{line: 2301, col: 1, offset: 72094}, + pos: position{line: 2304, col: 1, offset: 72184}, expr: &seqExpr{ - pos: position{line: 2301, col: 14, offset: 72107}, + pos: position{line: 2304, col: 14, offset: 72197}, exprs: []any{ &litMatcher{ - pos: position{line: 2301, col: 14, offset: 72107}, + pos: position{line: 2304, col: 14, offset: 72197}, val: "with", ignoreCase: true, want: "\"WITH\"i", }, ¬Expr{ - pos: position{line: 2301, col: 33, offset: 72126}, + pos: position{line: 2304, col: 33, offset: 72216}, expr: &ruleRefExpr{ - pos: position{line: 2301, col: 34, offset: 72127}, + pos: position{line: 2304, col: 34, offset: 72217}, name: "IdentifierRest", }, }, @@ -17716,20 +17745,20 @@ var g = &grammar{ }, { name: "YIELD", - pos: position{line: 2302, col: 1, offset: 72142}, + pos: position{line: 2305, col: 1, offset: 72232}, expr: &seqExpr{ - pos: position{line: 2302, col: 14, offset: 72155}, + pos: position{line: 2305, col: 14, offset: 72245}, exprs: []any{ &litMatcher{ - pos: position{line: 2302, col: 14, offset: 72155}, + pos: position{line: 2305, col: 14, offset: 72245}, val: "yield", ignoreCase: true, want: "\"YIELD\"i", }, ¬Expr{ - pos: position{line: 2302, col: 33, offset: 72174}, + pos: position{line: 2305, col: 33, offset: 72264}, expr: &ruleRefExpr{ - pos: position{line: 2302, col: 34, offset: 72175}, + pos: position{line: 2305, col: 34, offset: 72265}, name: "IdentifierRest", }, }, @@ -19926,20 +19955,30 @@ func (p *parser) callonConcatExpr1() (any, error) { return p.cur.onConcatExpr1(stack["first"], stack["rest"]) } -func (c *current) onUnaryMinusExpr2(e any) (any, error) { +func (c *current) onUnaryPlusOrMinus2(op, e any) (any, error) { return &ast.UnaryExpr{ Kind: "UnaryExpr", - Op: "-", + Op: op.(string), Operand: e.(ast.Expr), Loc: loc(c), }, nil } -func (p *parser) callonUnaryMinusExpr2() (any, error) { +func (p *parser) callonUnaryPlusOrMinus2() (any, error) { + stack := p.vstack[len(p.vstack)-1] + _ = stack + return p.cur.onUnaryPlusOrMinus2(stack["op"], stack["e"]) +} + +func (c *current) onPlusOrMinusOp1() (any, error) { + return string(c.text), nil +} + +func (p *parser) callonPlusOrMinusOp1() (any, error) { stack := p.vstack[len(p.vstack)-1] _ = stack - return p.cur.onUnaryMinusExpr2(stack["e"]) + return p.cur.onPlusOrMinusOp1() } func (c *current) onDerefExpr2(expr, from, to any) (any, error) { diff --git a/compiler/parser/parser.peg b/compiler/parser/parser.peg index 2fc9697929..71322596ac 100644 --- a/compiler/parser/parser.peg +++ b/compiler/parser/parser.peg @@ -1000,22 +1000,25 @@ MultiplicativeExpr MultiplicativeOperator = ("*" / "/" / "%") { return string(c.text), nil } ConcatExpr - = first:UnaryMinusExpr - rest:(__ "||" __ expr:UnaryMinusExpr { return []any{"||", expr}, nil })* { + = first:UnaryPlusOrMinus + rest:(__ "||" __ expr:UnaryPlusOrMinus { return []any{"||", expr}, nil })* { return makeBinaryExprChain(first, rest, c), nil } -UnaryMinusExpr - = !Literal "-" __ e:UnaryMinusExpr { +UnaryPlusOrMinus + = !Literal op:PlusOrMinusOp __ e:UnaryPlusOrMinus + { return &ast.UnaryExpr{ Kind: "UnaryExpr", - Op: "-", + Op: op.(string), Operand: e.(ast.Expr), Loc: loc(c), }, nil } / DerefExpr +PlusOrMinusOp = ("+" / "-") { return string(c.text), nil } + DerefExpr = expr:DerefExpr "[" __ from:AdditiveExpr __ ":" __ to:AdditiveExpr? __ "]" { e := &ast.SliceExpr{ diff --git a/compiler/semantic/expr.go b/compiler/semantic/expr.go index cb28e64fed..b441b66dda 100644 --- a/compiler/semantic/expr.go +++ b/compiler/semantic/expr.go @@ -74,10 +74,14 @@ func (a *analyzer) semExpr(e ast.Expr) dag.Expr { Expr: pathOf("this"), } case *ast.UnaryExpr: + operand := a.semExpr(e.Operand) + if e.Op == "+" { + return operand + } return &dag.UnaryExpr{ Kind: "UnaryExpr", Op: e.Op, - Operand: a.semExpr(e.Operand), + Operand: operand, } case *ast.BinaryExpr: return a.semBinary(e) diff --git a/compiler/ztests/sql/unary-plus.yaml b/compiler/ztests/sql/unary-plus.yaml new file mode 100644 index 0000000000..5f64e04a00 --- /dev/null +++ b/compiler/ztests/sql/unary-plus.yaml @@ -0,0 +1,11 @@ +zed: select value - + 34 + + - 26 + - 34 + - 34 + + COALESCE ( 93, COUNT ( ) + + 44 - 16, - AVG ( + 86 ) + 12 ) / 86 * + 55 * + 46; + +input: | + null + +# statically typed database get 2607.9302325581393 for this answer because their +# static analysis determines that coalesce is float64 (coerced from the avg() +# aggregate). # This is a fundamental difference between relational and +# polymorphic models and I think we just embrace this disparity. +output: | + 2402