From 0d91eaed7f5e7fa969f8ece9f33b90013f6cd043 Mon Sep 17 00:00:00 2001 From: Steve McCanne Date: Thu, 31 Oct 2024 17:10:36 -0700 Subject: [PATCH] add LIKE and concat (||) operators for SQL compat (#5412) --- compiler/parser/parser.go | 4752 +++++++++++++++++---------------- compiler/parser/parser.peg | 3 +- compiler/semantic/expr.go | 19 +- compiler/ztests/sql/like.yaml | 18 + go.mod | 1 + go.sum | 2 + 6 files changed, 2434 insertions(+), 2361 deletions(-) create mode 100644 compiler/ztests/sql/like.yaml diff --git a/compiler/parser/parser.go b/compiler/parser/parser.go index a98705b55d..4ffd36acca 100644 --- a/compiler/parser/parser.go +++ b/compiler/parser/parser.go @@ -4401,7 +4401,7 @@ var g = &grammar{ }, }, }, - leader: false, + leader: true, leftRecursive: true, }, { @@ -6314,6 +6314,16 @@ var g = &grammar{ ignoreCase: false, want: "\"-\"", }, + &litMatcher{ + pos: position{line: 950, col: 33, offset: 22681}, + val: "||", + ignoreCase: false, + want: "\"||\"", + }, + &ruleRefExpr{ + pos: position{line: 950, col: 40, offset: 22688}, + name: "LIKE", + }, }, }, }, @@ -6322,53 +6332,53 @@ var g = &grammar{ }, { name: "MultiplicativeExpr", - pos: position{line: 952, col: 1, offset: 22712}, + pos: position{line: 952, col: 1, offset: 22726}, expr: &actionExpr{ - pos: position{line: 953, col: 5, offset: 22735}, + pos: position{line: 953, col: 5, offset: 22749}, run: (*parser).callonMultiplicativeExpr1, expr: &seqExpr{ - pos: position{line: 953, col: 5, offset: 22735}, + pos: position{line: 953, col: 5, offset: 22749}, exprs: []any{ &labeledExpr{ - pos: position{line: 953, col: 5, offset: 22735}, + pos: position{line: 953, col: 5, offset: 22749}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 953, col: 11, offset: 22741}, + pos: position{line: 953, col: 11, offset: 22755}, name: "NotExpr", }, }, &labeledExpr{ - pos: position{line: 954, col: 5, offset: 22753}, + pos: position{line: 954, col: 5, offset: 22767}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 954, col: 10, offset: 22758}, + pos: position{line: 954, col: 10, offset: 22772}, expr: &actionExpr{ - pos: position{line: 954, col: 11, offset: 22759}, + pos: position{line: 954, col: 11, offset: 22773}, run: (*parser).callonMultiplicativeExpr7, expr: &seqExpr{ - pos: position{line: 954, col: 11, offset: 22759}, + pos: position{line: 954, col: 11, offset: 22773}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 954, col: 11, offset: 22759}, + pos: position{line: 954, col: 11, offset: 22773}, name: "__", }, &labeledExpr{ - pos: position{line: 954, col: 14, offset: 22762}, + pos: position{line: 954, col: 14, offset: 22776}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 954, col: 17, offset: 22765}, + pos: position{line: 954, col: 17, offset: 22779}, name: "MultiplicativeOperator", }, }, &ruleRefExpr{ - pos: position{line: 954, col: 40, offset: 22788}, + pos: position{line: 954, col: 40, offset: 22802}, name: "__", }, &labeledExpr{ - pos: position{line: 954, col: 43, offset: 22791}, + pos: position{line: 954, col: 43, offset: 22805}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 954, col: 48, offset: 22796}, + pos: position{line: 954, col: 48, offset: 22810}, name: "NotExpr", }, }, @@ -6385,27 +6395,27 @@ var g = &grammar{ }, { name: "MultiplicativeOperator", - pos: position{line: 958, col: 1, offset: 22903}, + pos: position{line: 958, col: 1, offset: 22917}, expr: &actionExpr{ - pos: position{line: 958, col: 26, offset: 22928}, + pos: position{line: 958, col: 26, offset: 22942}, run: (*parser).callonMultiplicativeOperator1, expr: &choiceExpr{ - pos: position{line: 958, col: 27, offset: 22929}, + pos: position{line: 958, col: 27, offset: 22943}, alternatives: []any{ &litMatcher{ - pos: position{line: 958, col: 27, offset: 22929}, + pos: position{line: 958, col: 27, offset: 22943}, val: "*", ignoreCase: false, want: "\"*\"", }, &litMatcher{ - pos: position{line: 958, col: 33, offset: 22935}, + pos: position{line: 958, col: 33, offset: 22949}, val: "/", ignoreCase: false, want: "\"/\"", }, &litMatcher{ - pos: position{line: 958, col: 39, offset: 22941}, + pos: position{line: 958, col: 39, offset: 22955}, val: "%", ignoreCase: false, want: "\"%\"", @@ -6418,43 +6428,43 @@ var g = &grammar{ }, { name: "NotExpr", - pos: position{line: 960, col: 1, offset: 22978}, + pos: position{line: 960, col: 1, offset: 22992}, expr: &choiceExpr{ - pos: position{line: 961, col: 5, offset: 22990}, + pos: position{line: 961, col: 5, offset: 23004}, alternatives: []any{ &actionExpr{ - pos: position{line: 961, col: 5, offset: 22990}, + pos: position{line: 961, col: 5, offset: 23004}, run: (*parser).callonNotExpr2, expr: &seqExpr{ - pos: position{line: 961, col: 5, offset: 22990}, + pos: position{line: 961, col: 5, offset: 23004}, exprs: []any{ &choiceExpr{ - pos: position{line: 961, col: 6, offset: 22991}, + pos: position{line: 961, col: 6, offset: 23005}, alternatives: []any{ &seqExpr{ - pos: position{line: 961, col: 6, offset: 22991}, + pos: position{line: 961, col: 6, offset: 23005}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 961, col: 6, offset: 22991}, + pos: position{line: 961, col: 6, offset: 23005}, name: "NOT", }, &ruleRefExpr{ - pos: position{line: 961, col: 10, offset: 22995}, + pos: position{line: 961, col: 10, offset: 23009}, name: "_", }, }, }, &seqExpr{ - pos: position{line: 961, col: 14, offset: 22999}, + pos: position{line: 961, col: 14, offset: 23013}, exprs: []any{ &litMatcher{ - pos: position{line: 961, col: 14, offset: 22999}, + pos: position{line: 961, col: 14, offset: 23013}, val: "!", ignoreCase: false, want: "\"!\"", }, &ruleRefExpr{ - pos: position{line: 961, col: 18, offset: 23003}, + pos: position{line: 961, col: 18, offset: 23017}, name: "__", }, }, @@ -6462,10 +6472,10 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 961, col: 22, offset: 23007}, + pos: position{line: 961, col: 22, offset: 23021}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 961, col: 24, offset: 23009}, + pos: position{line: 961, col: 24, offset: 23023}, name: "NotExpr", }, }, @@ -6473,7 +6483,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 969, col: 5, offset: 23175}, + pos: position{line: 969, col: 5, offset: 23189}, name: "NegationExpr", }, }, @@ -6483,38 +6493,38 @@ var g = &grammar{ }, { name: "NegationExpr", - pos: position{line: 971, col: 1, offset: 23189}, + pos: position{line: 971, col: 1, offset: 23203}, expr: &choiceExpr{ - pos: position{line: 972, col: 5, offset: 23206}, + pos: position{line: 972, col: 5, offset: 23220}, alternatives: []any{ &actionExpr{ - pos: position{line: 972, col: 5, offset: 23206}, + pos: position{line: 972, col: 5, offset: 23220}, run: (*parser).callonNegationExpr2, expr: &seqExpr{ - pos: position{line: 972, col: 5, offset: 23206}, + pos: position{line: 972, col: 5, offset: 23220}, exprs: []any{ ¬Expr{ - pos: position{line: 972, col: 5, offset: 23206}, + pos: position{line: 972, col: 5, offset: 23220}, expr: &ruleRefExpr{ - pos: position{line: 972, col: 6, offset: 23207}, + pos: position{line: 972, col: 6, offset: 23221}, name: "Literal", }, }, &litMatcher{ - pos: position{line: 972, col: 14, offset: 23215}, + pos: position{line: 972, col: 14, offset: 23229}, val: "-", ignoreCase: false, want: "\"-\"", }, &ruleRefExpr{ - pos: position{line: 972, col: 18, offset: 23219}, + pos: position{line: 972, col: 18, offset: 23233}, name: "__", }, &labeledExpr{ - pos: position{line: 972, col: 21, offset: 23222}, + pos: position{line: 972, col: 21, offset: 23236}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 972, col: 23, offset: 23224}, + pos: position{line: 972, col: 23, offset: 23238}, name: "DerefExpr", }, }, @@ -6522,7 +6532,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 980, col: 5, offset: 23392}, + pos: position{line: 980, col: 5, offset: 23406}, name: "DerefExpr", }, }, @@ -6532,73 +6542,73 @@ var g = &grammar{ }, { name: "DerefExpr", - pos: position{line: 982, col: 1, offset: 23403}, + pos: position{line: 982, col: 1, offset: 23417}, expr: &choiceExpr{ - pos: position{line: 983, col: 5, offset: 23417}, + pos: position{line: 983, col: 5, offset: 23431}, alternatives: []any{ &actionExpr{ - pos: position{line: 983, col: 5, offset: 23417}, + pos: position{line: 983, col: 5, offset: 23431}, run: (*parser).callonDerefExpr2, expr: &seqExpr{ - pos: position{line: 983, col: 5, offset: 23417}, + pos: position{line: 983, col: 5, offset: 23431}, exprs: []any{ &labeledExpr{ - pos: position{line: 983, col: 5, offset: 23417}, + pos: position{line: 983, col: 5, offset: 23431}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 983, col: 10, offset: 23422}, + pos: position{line: 983, col: 10, offset: 23436}, name: "DerefExpr", }, }, &litMatcher{ - pos: position{line: 983, col: 20, offset: 23432}, + pos: position{line: 983, col: 20, offset: 23446}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 983, col: 24, offset: 23436}, + pos: position{line: 983, col: 24, offset: 23450}, name: "__", }, &labeledExpr{ - pos: position{line: 983, col: 27, offset: 23439}, + pos: position{line: 983, col: 27, offset: 23453}, label: "from", expr: &ruleRefExpr{ - pos: position{line: 983, col: 32, offset: 23444}, + pos: position{line: 983, col: 32, offset: 23458}, name: "AdditiveExpr", }, }, &ruleRefExpr{ - pos: position{line: 983, col: 45, offset: 23457}, + pos: position{line: 983, col: 45, offset: 23471}, name: "__", }, &litMatcher{ - pos: position{line: 983, col: 48, offset: 23460}, + pos: position{line: 983, col: 48, offset: 23474}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 983, col: 52, offset: 23464}, + pos: position{line: 983, col: 52, offset: 23478}, name: "__", }, &labeledExpr{ - pos: position{line: 983, col: 55, offset: 23467}, + pos: position{line: 983, col: 55, offset: 23481}, label: "to", expr: &zeroOrOneExpr{ - pos: position{line: 983, col: 58, offset: 23470}, + pos: position{line: 983, col: 58, offset: 23484}, expr: &ruleRefExpr{ - pos: position{line: 983, col: 58, offset: 23470}, + pos: position{line: 983, col: 58, offset: 23484}, name: "AdditiveExpr", }, }, }, &ruleRefExpr{ - pos: position{line: 983, col: 72, offset: 23484}, + pos: position{line: 983, col: 72, offset: 23498}, name: "__", }, &litMatcher{ - pos: position{line: 983, col: 75, offset: 23487}, + pos: position{line: 983, col: 75, offset: 23501}, val: "]", ignoreCase: false, want: "\"]\"", @@ -6607,49 +6617,49 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 995, col: 5, offset: 23726}, + pos: position{line: 995, col: 5, offset: 23740}, run: (*parser).callonDerefExpr18, expr: &seqExpr{ - pos: position{line: 995, col: 5, offset: 23726}, + pos: position{line: 995, col: 5, offset: 23740}, exprs: []any{ &labeledExpr{ - pos: position{line: 995, col: 5, offset: 23726}, + pos: position{line: 995, col: 5, offset: 23740}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 995, col: 10, offset: 23731}, + pos: position{line: 995, col: 10, offset: 23745}, name: "DerefExpr", }, }, &litMatcher{ - pos: position{line: 995, col: 20, offset: 23741}, + pos: position{line: 995, col: 20, offset: 23755}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 995, col: 24, offset: 23745}, + pos: position{line: 995, col: 24, offset: 23759}, name: "__", }, &litMatcher{ - pos: position{line: 995, col: 27, offset: 23748}, + pos: position{line: 995, col: 27, offset: 23762}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 995, col: 31, offset: 23752}, + pos: position{line: 995, col: 31, offset: 23766}, name: "__", }, &labeledExpr{ - pos: position{line: 995, col: 34, offset: 23755}, + pos: position{line: 995, col: 34, offset: 23769}, label: "to", expr: &ruleRefExpr{ - pos: position{line: 995, col: 37, offset: 23758}, + pos: position{line: 995, col: 37, offset: 23772}, name: "AdditiveExpr", }, }, &litMatcher{ - pos: position{line: 995, col: 50, offset: 23771}, + pos: position{line: 995, col: 50, offset: 23785}, val: "]", ignoreCase: false, want: "\"]\"", @@ -6658,35 +6668,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1003, col: 5, offset: 23935}, + pos: position{line: 1003, col: 5, offset: 23949}, run: (*parser).callonDerefExpr29, expr: &seqExpr{ - pos: position{line: 1003, col: 5, offset: 23935}, + pos: position{line: 1003, col: 5, offset: 23949}, exprs: []any{ &labeledExpr{ - pos: position{line: 1003, col: 5, offset: 23935}, + pos: position{line: 1003, col: 5, offset: 23949}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1003, col: 10, offset: 23940}, + pos: position{line: 1003, col: 10, offset: 23954}, name: "DerefExpr", }, }, &litMatcher{ - pos: position{line: 1003, col: 20, offset: 23950}, + pos: position{line: 1003, col: 20, offset: 23964}, val: "[", ignoreCase: false, want: "\"[\"", }, &labeledExpr{ - pos: position{line: 1003, col: 24, offset: 23954}, + pos: position{line: 1003, col: 24, offset: 23968}, label: "index", expr: &ruleRefExpr{ - pos: position{line: 1003, col: 30, offset: 23960}, + pos: position{line: 1003, col: 30, offset: 23974}, name: "Expr", }, }, &litMatcher{ - pos: position{line: 1003, col: 35, offset: 23965}, + pos: position{line: 1003, col: 35, offset: 23979}, val: "]", ignoreCase: false, want: "\"]\"", @@ -6695,30 +6705,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1011, col: 5, offset: 24135}, + pos: position{line: 1011, col: 5, offset: 24149}, run: (*parser).callonDerefExpr37, expr: &seqExpr{ - pos: position{line: 1011, col: 5, offset: 24135}, + pos: position{line: 1011, col: 5, offset: 24149}, exprs: []any{ &labeledExpr{ - pos: position{line: 1011, col: 5, offset: 24135}, + pos: position{line: 1011, col: 5, offset: 24149}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1011, col: 10, offset: 24140}, + pos: position{line: 1011, col: 10, offset: 24154}, name: "DerefExpr", }, }, &litMatcher{ - pos: position{line: 1011, col: 20, offset: 24150}, + pos: position{line: 1011, col: 20, offset: 24164}, val: ".", ignoreCase: false, want: "\".\"", }, &labeledExpr{ - pos: position{line: 1011, col: 24, offset: 24154}, + pos: position{line: 1011, col: 24, offset: 24168}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 1011, col: 27, offset: 24157}, + pos: position{line: 1011, col: 27, offset: 24171}, name: "Identifier", }, }, @@ -6726,15 +6736,15 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1020, col: 5, offset: 24347}, + pos: position{line: 1020, col: 5, offset: 24361}, name: "FuncExpr", }, &ruleRefExpr{ - pos: position{line: 1021, col: 5, offset: 24360}, + pos: position{line: 1021, col: 5, offset: 24374}, name: "CaseExpr", }, &ruleRefExpr{ - pos: position{line: 1022, col: 5, offset: 24373}, + pos: position{line: 1022, col: 5, offset: 24387}, name: "Primary", }, }, @@ -6744,16 +6754,16 @@ var g = &grammar{ }, { name: "FuncExpr", - pos: position{line: 1024, col: 1, offset: 24382}, + pos: position{line: 1024, col: 1, offset: 24396}, expr: &choiceExpr{ - pos: position{line: 1025, col: 5, offset: 24395}, + pos: position{line: 1025, col: 5, offset: 24409}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1025, col: 5, offset: 24395}, + pos: position{line: 1025, col: 5, offset: 24409}, name: "Cast", }, &ruleRefExpr{ - pos: position{line: 1026, col: 5, offset: 24404}, + pos: position{line: 1026, col: 5, offset: 24418}, name: "Function", }, }, @@ -6763,20 +6773,20 @@ var g = &grammar{ }, { name: "FuncGuard", - pos: position{line: 1028, col: 1, offset: 24414}, + pos: position{line: 1028, col: 1, offset: 24428}, expr: &seqExpr{ - pos: position{line: 1028, col: 13, offset: 24426}, + pos: position{line: 1028, col: 13, offset: 24440}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1028, col: 13, offset: 24426}, + pos: position{line: 1028, col: 13, offset: 24440}, name: "NotFuncs", }, &ruleRefExpr{ - pos: position{line: 1028, col: 22, offset: 24435}, + pos: position{line: 1028, col: 22, offset: 24449}, name: "__", }, &litMatcher{ - pos: position{line: 1028, col: 25, offset: 24438}, + pos: position{line: 1028, col: 25, offset: 24452}, val: "(", ignoreCase: false, want: "\"(\"", @@ -6788,16 +6798,16 @@ var g = &grammar{ }, { name: "NotFuncs", - pos: position{line: 1030, col: 1, offset: 24443}, + pos: position{line: 1030, col: 1, offset: 24457}, expr: &choiceExpr{ - pos: position{line: 1031, col: 5, offset: 24456}, + pos: position{line: 1031, col: 5, offset: 24470}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1031, col: 5, offset: 24456}, + pos: position{line: 1031, col: 5, offset: 24470}, name: "NOT", }, &ruleRefExpr{ - pos: position{line: 1032, col: 5, offset: 24464}, + pos: position{line: 1032, col: 5, offset: 24478}, name: "SELECT", }, }, @@ -6807,58 +6817,58 @@ var g = &grammar{ }, { name: "Cast", - pos: position{line: 1034, col: 1, offset: 24472}, + pos: position{line: 1034, col: 1, offset: 24486}, expr: &actionExpr{ - pos: position{line: 1035, col: 5, offset: 24481}, + pos: position{line: 1035, col: 5, offset: 24495}, run: (*parser).callonCast1, expr: &seqExpr{ - pos: position{line: 1035, col: 5, offset: 24481}, + pos: position{line: 1035, col: 5, offset: 24495}, exprs: []any{ &labeledExpr{ - pos: position{line: 1035, col: 5, offset: 24481}, + pos: position{line: 1035, col: 5, offset: 24495}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1035, col: 9, offset: 24485}, + pos: position{line: 1035, col: 9, offset: 24499}, name: "TypeLiteral", }, }, &ruleRefExpr{ - pos: position{line: 1035, col: 21, offset: 24497}, + pos: position{line: 1035, col: 21, offset: 24511}, name: "__", }, &litMatcher{ - pos: position{line: 1035, col: 24, offset: 24500}, + pos: position{line: 1035, col: 24, offset: 24514}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1035, col: 28, offset: 24504}, + pos: position{line: 1035, col: 28, offset: 24518}, name: "__", }, &labeledExpr{ - pos: position{line: 1035, col: 31, offset: 24507}, + pos: position{line: 1035, col: 31, offset: 24521}, label: "expr", expr: &choiceExpr{ - pos: position{line: 1035, col: 37, offset: 24513}, + pos: position{line: 1035, col: 37, offset: 24527}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1035, col: 37, offset: 24513}, + pos: position{line: 1035, col: 37, offset: 24527}, name: "OverExpr", }, &ruleRefExpr{ - pos: position{line: 1035, col: 48, offset: 24524}, + pos: position{line: 1035, col: 48, offset: 24538}, name: "Expr", }, }, }, }, &ruleRefExpr{ - pos: position{line: 1035, col: 54, offset: 24530}, + pos: position{line: 1035, col: 54, offset: 24544}, name: "__", }, &litMatcher{ - pos: position{line: 1035, col: 57, offset: 24533}, + pos: position{line: 1035, col: 57, offset: 24547}, val: ")", ignoreCase: false, want: "\")\"", @@ -6871,85 +6881,85 @@ var g = &grammar{ }, { name: "Function", - pos: position{line: 1039, col: 1, offset: 24646}, + pos: position{line: 1039, col: 1, offset: 24660}, expr: &choiceExpr{ - pos: position{line: 1040, col: 5, offset: 24659}, + pos: position{line: 1040, col: 5, offset: 24673}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1040, col: 5, offset: 24659}, + pos: position{line: 1040, col: 5, offset: 24673}, name: "Grep", }, &actionExpr{ - pos: position{line: 1042, col: 5, offset: 24746}, + pos: position{line: 1042, col: 5, offset: 24760}, run: (*parser).callonFunction3, expr: &seqExpr{ - pos: position{line: 1042, col: 5, offset: 24746}, + pos: position{line: 1042, col: 5, offset: 24760}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1042, col: 5, offset: 24746}, + pos: position{line: 1042, col: 5, offset: 24760}, name: "REGEXP", }, &ruleRefExpr{ - pos: position{line: 1042, col: 12, offset: 24753}, + pos: position{line: 1042, col: 12, offset: 24767}, name: "__", }, &litMatcher{ - pos: position{line: 1042, col: 15, offset: 24756}, + pos: position{line: 1042, col: 15, offset: 24770}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1042, col: 19, offset: 24760}, + pos: position{line: 1042, col: 19, offset: 24774}, name: "__", }, &labeledExpr{ - pos: position{line: 1042, col: 22, offset: 24763}, + pos: position{line: 1042, col: 22, offset: 24777}, label: "arg0", expr: &ruleRefExpr{ - pos: position{line: 1042, col: 27, offset: 24768}, + pos: position{line: 1042, col: 27, offset: 24782}, name: "RegexpPrimitive", }, }, &ruleRefExpr{ - pos: position{line: 1042, col: 43, offset: 24784}, + pos: position{line: 1042, col: 43, offset: 24798}, name: "__", }, &litMatcher{ - pos: position{line: 1042, col: 46, offset: 24787}, + pos: position{line: 1042, col: 46, offset: 24801}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1042, col: 50, offset: 24791}, + pos: position{line: 1042, col: 50, offset: 24805}, name: "__", }, &labeledExpr{ - pos: position{line: 1042, col: 53, offset: 24794}, + pos: position{line: 1042, col: 53, offset: 24808}, label: "arg1", expr: &ruleRefExpr{ - pos: position{line: 1042, col: 58, offset: 24799}, + pos: position{line: 1042, col: 58, offset: 24813}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1042, col: 63, offset: 24804}, + pos: position{line: 1042, col: 63, offset: 24818}, name: "__", }, &litMatcher{ - pos: position{line: 1042, col: 66, offset: 24807}, + pos: position{line: 1042, col: 66, offset: 24821}, val: ")", ignoreCase: false, want: "\")\"", }, &labeledExpr{ - pos: position{line: 1042, col: 70, offset: 24811}, + pos: position{line: 1042, col: 70, offset: 24825}, label: "where", expr: &zeroOrOneExpr{ - pos: position{line: 1042, col: 76, offset: 24817}, + pos: position{line: 1042, col: 76, offset: 24831}, expr: &ruleRefExpr{ - pos: position{line: 1042, col: 76, offset: 24817}, + pos: position{line: 1042, col: 76, offset: 24831}, name: "WhereClause", }, }, @@ -6958,98 +6968,98 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1046, col: 5, offset: 24996}, + pos: position{line: 1046, col: 5, offset: 25010}, run: (*parser).callonFunction21, expr: &seqExpr{ - pos: position{line: 1046, col: 5, offset: 24996}, + pos: position{line: 1046, col: 5, offset: 25010}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1046, col: 5, offset: 24996}, + pos: position{line: 1046, col: 5, offset: 25010}, name: "REGEXP_REPLACE", }, &ruleRefExpr{ - pos: position{line: 1046, col: 20, offset: 25011}, + pos: position{line: 1046, col: 20, offset: 25025}, name: "__", }, &litMatcher{ - pos: position{line: 1046, col: 23, offset: 25014}, + pos: position{line: 1046, col: 23, offset: 25028}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1046, col: 27, offset: 25018}, + pos: position{line: 1046, col: 27, offset: 25032}, name: "__", }, &labeledExpr{ - pos: position{line: 1046, col: 30, offset: 25021}, + pos: position{line: 1046, col: 30, offset: 25035}, label: "arg0", expr: &ruleRefExpr{ - pos: position{line: 1046, col: 35, offset: 25026}, + pos: position{line: 1046, col: 35, offset: 25040}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1046, col: 40, offset: 25031}, + pos: position{line: 1046, col: 40, offset: 25045}, name: "__", }, &litMatcher{ - pos: position{line: 1046, col: 43, offset: 25034}, + pos: position{line: 1046, col: 43, offset: 25048}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1046, col: 47, offset: 25038}, + pos: position{line: 1046, col: 47, offset: 25052}, name: "__", }, &labeledExpr{ - pos: position{line: 1046, col: 50, offset: 25041}, + pos: position{line: 1046, col: 50, offset: 25055}, label: "arg1", expr: &ruleRefExpr{ - pos: position{line: 1046, col: 55, offset: 25046}, + pos: position{line: 1046, col: 55, offset: 25060}, name: "RegexpPrimitive", }, }, &ruleRefExpr{ - pos: position{line: 1046, col: 71, offset: 25062}, + pos: position{line: 1046, col: 71, offset: 25076}, name: "__", }, &litMatcher{ - pos: position{line: 1046, col: 74, offset: 25065}, + pos: position{line: 1046, col: 74, offset: 25079}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1046, col: 78, offset: 25069}, + pos: position{line: 1046, col: 78, offset: 25083}, name: "__", }, &labeledExpr{ - pos: position{line: 1046, col: 81, offset: 25072}, + pos: position{line: 1046, col: 81, offset: 25086}, label: "arg2", expr: &ruleRefExpr{ - pos: position{line: 1046, col: 86, offset: 25077}, + pos: position{line: 1046, col: 86, offset: 25091}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1046, col: 91, offset: 25082}, + pos: position{line: 1046, col: 91, offset: 25096}, name: "__", }, &litMatcher{ - pos: position{line: 1046, col: 94, offset: 25085}, + pos: position{line: 1046, col: 94, offset: 25099}, val: ")", ignoreCase: false, want: "\")\"", }, &labeledExpr{ - pos: position{line: 1046, col: 98, offset: 25089}, + pos: position{line: 1046, col: 98, offset: 25103}, label: "where", expr: &zeroOrOneExpr{ - pos: position{line: 1046, col: 104, offset: 25095}, + pos: position{line: 1046, col: 104, offset: 25109}, expr: &ruleRefExpr{ - pos: position{line: 1046, col: 104, offset: 25095}, + pos: position{line: 1046, col: 104, offset: 25109}, name: "WhereClause", }, }, @@ -7058,65 +7068,65 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1050, col: 5, offset: 25289}, + pos: position{line: 1050, col: 5, offset: 25303}, run: (*parser).callonFunction44, expr: &seqExpr{ - pos: position{line: 1050, col: 5, offset: 25289}, + pos: position{line: 1050, col: 5, offset: 25303}, exprs: []any{ ¬Expr{ - pos: position{line: 1050, col: 5, offset: 25289}, + pos: position{line: 1050, col: 5, offset: 25303}, expr: &ruleRefExpr{ - pos: position{line: 1050, col: 6, offset: 25290}, + pos: position{line: 1050, col: 6, offset: 25304}, name: "FuncGuard", }, }, &labeledExpr{ - pos: position{line: 1050, col: 16, offset: 25300}, + pos: position{line: 1050, col: 16, offset: 25314}, label: "fn", expr: &ruleRefExpr{ - pos: position{line: 1050, col: 19, offset: 25303}, + pos: position{line: 1050, col: 19, offset: 25317}, name: "Identifier", }, }, &ruleRefExpr{ - pos: position{line: 1050, col: 30, offset: 25314}, + pos: position{line: 1050, col: 30, offset: 25328}, name: "__", }, &litMatcher{ - pos: position{line: 1050, col: 33, offset: 25317}, + pos: position{line: 1050, col: 33, offset: 25331}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1050, col: 37, offset: 25321}, + pos: position{line: 1050, col: 37, offset: 25335}, name: "__", }, &labeledExpr{ - pos: position{line: 1050, col: 40, offset: 25324}, + pos: position{line: 1050, col: 40, offset: 25338}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 1050, col: 45, offset: 25329}, + pos: position{line: 1050, col: 45, offset: 25343}, name: "FunctionArgs", }, }, &ruleRefExpr{ - pos: position{line: 1050, col: 58, offset: 25342}, + pos: position{line: 1050, col: 58, offset: 25356}, name: "__", }, &litMatcher{ - pos: position{line: 1050, col: 61, offset: 25345}, + pos: position{line: 1050, col: 61, offset: 25359}, val: ")", ignoreCase: false, want: "\")\"", }, &labeledExpr{ - pos: position{line: 1050, col: 65, offset: 25349}, + pos: position{line: 1050, col: 65, offset: 25363}, label: "where", expr: &zeroOrOneExpr{ - pos: position{line: 1050, col: 71, offset: 25355}, + pos: position{line: 1050, col: 71, offset: 25369}, expr: &ruleRefExpr{ - pos: position{line: 1050, col: 71, offset: 25355}, + pos: position{line: 1050, col: 71, offset: 25369}, name: "WhereClause", }, }, @@ -7131,55 +7141,55 @@ var g = &grammar{ }, { name: "CaseExpr", - pos: position{line: 1054, col: 1, offset: 25423}, + pos: position{line: 1054, col: 1, offset: 25437}, expr: &choiceExpr{ - pos: position{line: 1055, col: 5, offset: 25436}, + pos: position{line: 1055, col: 5, offset: 25450}, alternatives: []any{ &actionExpr{ - pos: position{line: 1055, col: 5, offset: 25436}, + pos: position{line: 1055, col: 5, offset: 25450}, run: (*parser).callonCaseExpr2, expr: &seqExpr{ - pos: position{line: 1055, col: 5, offset: 25436}, + pos: position{line: 1055, col: 5, offset: 25450}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1055, col: 5, offset: 25436}, + pos: position{line: 1055, col: 5, offset: 25450}, name: "CASE", }, &labeledExpr{ - pos: position{line: 1055, col: 10, offset: 25441}, + pos: position{line: 1055, col: 10, offset: 25455}, label: "cases", expr: &oneOrMoreExpr{ - pos: position{line: 1055, col: 16, offset: 25447}, + pos: position{line: 1055, col: 16, offset: 25461}, expr: &ruleRefExpr{ - pos: position{line: 1055, col: 16, offset: 25447}, + pos: position{line: 1055, col: 16, offset: 25461}, name: "When", }, }, }, &labeledExpr{ - pos: position{line: 1055, col: 22, offset: 25453}, + pos: position{line: 1055, col: 22, offset: 25467}, label: "else_", expr: &zeroOrOneExpr{ - pos: position{line: 1055, col: 28, offset: 25459}, + pos: position{line: 1055, col: 28, offset: 25473}, expr: &seqExpr{ - pos: position{line: 1055, col: 29, offset: 25460}, + pos: position{line: 1055, col: 29, offset: 25474}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1055, col: 29, offset: 25460}, + pos: position{line: 1055, col: 29, offset: 25474}, name: "_", }, &litMatcher{ - pos: position{line: 1055, col: 31, offset: 25462}, + pos: position{line: 1055, col: 31, offset: 25476}, val: "else", ignoreCase: false, want: "\"else\"", }, &ruleRefExpr{ - pos: position{line: 1055, col: 38, offset: 25469}, + pos: position{line: 1055, col: 38, offset: 25483}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1055, col: 40, offset: 25471}, + pos: position{line: 1055, col: 40, offset: 25485}, name: "Expr", }, }, @@ -7187,26 +7197,26 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1055, col: 47, offset: 25478}, + pos: position{line: 1055, col: 47, offset: 25492}, name: "_", }, &litMatcher{ - pos: position{line: 1055, col: 49, offset: 25480}, + pos: position{line: 1055, col: 49, offset: 25494}, val: "end", ignoreCase: true, want: "\"end\"i", }, &zeroOrOneExpr{ - pos: position{line: 1055, col: 56, offset: 25487}, + pos: position{line: 1055, col: 56, offset: 25501}, expr: &seqExpr{ - pos: position{line: 1055, col: 57, offset: 25488}, + pos: position{line: 1055, col: 57, offset: 25502}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1055, col: 57, offset: 25488}, + pos: position{line: 1055, col: 57, offset: 25502}, name: "_", }, &litMatcher{ - pos: position{line: 1055, col: 59, offset: 25490}, + pos: position{line: 1055, col: 59, offset: 25504}, val: "case", ignoreCase: true, want: "\"case\"i", @@ -7218,62 +7228,62 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1079, col: 5, offset: 26142}, + pos: position{line: 1079, col: 5, offset: 26156}, run: (*parser).callonCaseExpr21, expr: &seqExpr{ - pos: position{line: 1079, col: 5, offset: 26142}, + pos: position{line: 1079, col: 5, offset: 26156}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1079, col: 5, offset: 26142}, + pos: position{line: 1079, col: 5, offset: 26156}, name: "CASE", }, &ruleRefExpr{ - pos: position{line: 1079, col: 10, offset: 26147}, + pos: position{line: 1079, col: 10, offset: 26161}, name: "_", }, &labeledExpr{ - pos: position{line: 1079, col: 12, offset: 26149}, + pos: position{line: 1079, col: 12, offset: 26163}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1079, col: 17, offset: 26154}, + pos: position{line: 1079, col: 17, offset: 26168}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 1079, col: 22, offset: 26159}, + pos: position{line: 1079, col: 22, offset: 26173}, label: "whens", expr: &oneOrMoreExpr{ - pos: position{line: 1079, col: 28, offset: 26165}, + pos: position{line: 1079, col: 28, offset: 26179}, expr: &ruleRefExpr{ - pos: position{line: 1079, col: 28, offset: 26165}, + pos: position{line: 1079, col: 28, offset: 26179}, name: "When", }, }, }, &labeledExpr{ - pos: position{line: 1079, col: 34, offset: 26171}, + pos: position{line: 1079, col: 34, offset: 26185}, label: "else_", expr: &zeroOrOneExpr{ - pos: position{line: 1079, col: 40, offset: 26177}, + pos: position{line: 1079, col: 40, offset: 26191}, expr: &seqExpr{ - pos: position{line: 1079, col: 41, offset: 26178}, + pos: position{line: 1079, col: 41, offset: 26192}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1079, col: 41, offset: 26178}, + pos: position{line: 1079, col: 41, offset: 26192}, name: "_", }, &litMatcher{ - pos: position{line: 1079, col: 43, offset: 26180}, + pos: position{line: 1079, col: 43, offset: 26194}, val: "else", ignoreCase: false, want: "\"else\"", }, &ruleRefExpr{ - pos: position{line: 1079, col: 50, offset: 26187}, + pos: position{line: 1079, col: 50, offset: 26201}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1079, col: 52, offset: 26189}, + pos: position{line: 1079, col: 52, offset: 26203}, name: "Expr", }, }, @@ -7281,26 +7291,26 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1079, col: 59, offset: 26196}, + pos: position{line: 1079, col: 59, offset: 26210}, name: "_", }, &litMatcher{ - pos: position{line: 1079, col: 61, offset: 26198}, + pos: position{line: 1079, col: 61, offset: 26212}, val: "end", ignoreCase: true, want: "\"end\"i", }, &zeroOrOneExpr{ - pos: position{line: 1079, col: 68, offset: 26205}, + pos: position{line: 1079, col: 68, offset: 26219}, expr: &seqExpr{ - pos: position{line: 1079, col: 69, offset: 26206}, + pos: position{line: 1079, col: 69, offset: 26220}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1079, col: 69, offset: 26206}, + pos: position{line: 1079, col: 69, offset: 26220}, name: "_", }, &litMatcher{ - pos: position{line: 1079, col: 71, offset: 26208}, + pos: position{line: 1079, col: 71, offset: 26222}, val: "case", ignoreCase: true, want: "\"case\"i", @@ -7318,50 +7328,50 @@ var g = &grammar{ }, { name: "When", - pos: position{line: 1092, col: 1, offset: 26516}, + pos: position{line: 1092, col: 1, offset: 26530}, expr: &actionExpr{ - pos: position{line: 1093, col: 5, offset: 26525}, + pos: position{line: 1093, col: 5, offset: 26539}, run: (*parser).callonWhen1, expr: &seqExpr{ - pos: position{line: 1093, col: 5, offset: 26525}, + pos: position{line: 1093, col: 5, offset: 26539}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1093, col: 5, offset: 26525}, + pos: position{line: 1093, col: 5, offset: 26539}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1093, col: 7, offset: 26527}, + pos: position{line: 1093, col: 7, offset: 26541}, name: "WHEN", }, &ruleRefExpr{ - pos: position{line: 1093, col: 12, offset: 26532}, + pos: position{line: 1093, col: 12, offset: 26546}, name: "_", }, &labeledExpr{ - pos: position{line: 1093, col: 14, offset: 26534}, + pos: position{line: 1093, col: 14, offset: 26548}, label: "cond", expr: &ruleRefExpr{ - pos: position{line: 1093, col: 19, offset: 26539}, + pos: position{line: 1093, col: 19, offset: 26553}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1093, col: 24, offset: 26544}, + pos: position{line: 1093, col: 24, offset: 26558}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1093, col: 26, offset: 26546}, + pos: position{line: 1093, col: 26, offset: 26560}, name: "THEN", }, &ruleRefExpr{ - pos: position{line: 1093, col: 31, offset: 26551}, + pos: position{line: 1093, col: 31, offset: 26565}, name: "_", }, &labeledExpr{ - pos: position{line: 1093, col: 33, offset: 26553}, + pos: position{line: 1093, col: 33, offset: 26567}, label: "then", expr: &ruleRefExpr{ - pos: position{line: 1093, col: 38, offset: 26558}, + pos: position{line: 1093, col: 38, offset: 26572}, name: "Expr", }, }, @@ -7373,15 +7383,15 @@ var g = &grammar{ }, { name: "RegexpPrimitive", - pos: position{line: 1102, col: 1, offset: 26713}, + pos: position{line: 1102, col: 1, offset: 26727}, expr: &actionExpr{ - pos: position{line: 1103, col: 5, offset: 26733}, + pos: position{line: 1103, col: 5, offset: 26747}, run: (*parser).callonRegexpPrimitive1, expr: &labeledExpr{ - pos: position{line: 1103, col: 5, offset: 26733}, + pos: position{line: 1103, col: 5, offset: 26747}, label: "pat", expr: &ruleRefExpr{ - pos: position{line: 1103, col: 9, offset: 26737}, + pos: position{line: 1103, col: 9, offset: 26751}, name: "RegexpPattern", }, }, @@ -7391,24 +7401,24 @@ var g = &grammar{ }, { name: "FunctionArgs", - pos: position{line: 1105, col: 1, offset: 26808}, + pos: position{line: 1105, col: 1, offset: 26822}, expr: &choiceExpr{ - pos: position{line: 1106, col: 5, offset: 26825}, + pos: position{line: 1106, col: 5, offset: 26839}, alternatives: []any{ &actionExpr{ - pos: position{line: 1106, col: 5, offset: 26825}, + pos: position{line: 1106, col: 5, offset: 26839}, run: (*parser).callonFunctionArgs2, expr: &labeledExpr{ - pos: position{line: 1106, col: 5, offset: 26825}, + pos: position{line: 1106, col: 5, offset: 26839}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 1106, col: 7, offset: 26827}, + pos: position{line: 1106, col: 7, offset: 26841}, name: "OverExpr", }, }, }, &ruleRefExpr{ - pos: position{line: 1107, col: 5, offset: 26865}, + pos: position{line: 1107, col: 5, offset: 26879}, name: "OptionalExprs", }, }, @@ -7418,96 +7428,96 @@ var g = &grammar{ }, { name: "Grep", - pos: position{line: 1109, col: 1, offset: 26880}, + pos: position{line: 1109, col: 1, offset: 26894}, expr: &actionExpr{ - pos: position{line: 1110, col: 5, offset: 26889}, + pos: position{line: 1110, col: 5, offset: 26903}, run: (*parser).callonGrep1, expr: &seqExpr{ - pos: position{line: 1110, col: 5, offset: 26889}, + pos: position{line: 1110, col: 5, offset: 26903}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1110, col: 5, offset: 26889}, + pos: position{line: 1110, col: 5, offset: 26903}, name: "GREP", }, &ruleRefExpr{ - pos: position{line: 1110, col: 10, offset: 26894}, + pos: position{line: 1110, col: 10, offset: 26908}, name: "__", }, &litMatcher{ - pos: position{line: 1110, col: 13, offset: 26897}, + pos: position{line: 1110, col: 13, offset: 26911}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1110, col: 17, offset: 26901}, + pos: position{line: 1110, col: 17, offset: 26915}, name: "__", }, &labeledExpr{ - pos: position{line: 1110, col: 20, offset: 26904}, + pos: position{line: 1110, col: 20, offset: 26918}, label: "pattern", expr: &choiceExpr{ - pos: position{line: 1110, col: 29, offset: 26913}, + pos: position{line: 1110, col: 29, offset: 26927}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1110, col: 29, offset: 26913}, + pos: position{line: 1110, col: 29, offset: 26927}, name: "Regexp", }, &ruleRefExpr{ - pos: position{line: 1110, col: 38, offset: 26922}, + pos: position{line: 1110, col: 38, offset: 26936}, name: "Glob", }, &ruleRefExpr{ - pos: position{line: 1110, col: 45, offset: 26929}, + pos: position{line: 1110, col: 45, offset: 26943}, name: "Expr", }, }, }, }, &ruleRefExpr{ - pos: position{line: 1110, col: 51, offset: 26935}, + pos: position{line: 1110, col: 51, offset: 26949}, name: "__", }, &labeledExpr{ - pos: position{line: 1110, col: 54, offset: 26938}, + pos: position{line: 1110, col: 54, offset: 26952}, label: "opt", expr: &zeroOrOneExpr{ - pos: position{line: 1110, col: 58, offset: 26942}, + pos: position{line: 1110, col: 58, offset: 26956}, expr: &actionExpr{ - pos: position{line: 1110, col: 59, offset: 26943}, + pos: position{line: 1110, col: 59, offset: 26957}, run: (*parser).callonGrep15, expr: &seqExpr{ - pos: position{line: 1110, col: 59, offset: 26943}, + pos: position{line: 1110, col: 59, offset: 26957}, exprs: []any{ &litMatcher{ - pos: position{line: 1110, col: 59, offset: 26943}, + pos: position{line: 1110, col: 59, offset: 26957}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1110, col: 63, offset: 26947}, + pos: position{line: 1110, col: 63, offset: 26961}, name: "__", }, &labeledExpr{ - pos: position{line: 1110, col: 66, offset: 26950}, + pos: position{line: 1110, col: 66, offset: 26964}, label: "e", expr: &choiceExpr{ - pos: position{line: 1110, col: 69, offset: 26953}, + pos: position{line: 1110, col: 69, offset: 26967}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1110, col: 69, offset: 26953}, + pos: position{line: 1110, col: 69, offset: 26967}, name: "OverExpr", }, &ruleRefExpr{ - pos: position{line: 1110, col: 80, offset: 26964}, + pos: position{line: 1110, col: 80, offset: 26978}, name: "Expr", }, }, }, }, &ruleRefExpr{ - pos: position{line: 1110, col: 86, offset: 26970}, + pos: position{line: 1110, col: 86, offset: 26984}, name: "__", }, }, @@ -7516,7 +7526,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1110, col: 109, offset: 26993}, + pos: position{line: 1110, col: 109, offset: 27007}, val: ")", ignoreCase: false, want: "\")\"", @@ -7529,19 +7539,19 @@ var g = &grammar{ }, { name: "OptionalExprs", - pos: position{line: 1122, col: 1, offset: 27206}, + pos: position{line: 1122, col: 1, offset: 27220}, expr: &choiceExpr{ - pos: position{line: 1123, col: 5, offset: 27224}, + pos: position{line: 1123, col: 5, offset: 27238}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1123, col: 5, offset: 27224}, + pos: position{line: 1123, col: 5, offset: 27238}, name: "Exprs", }, &actionExpr{ - pos: position{line: 1124, col: 5, offset: 27234}, + pos: position{line: 1124, col: 5, offset: 27248}, run: (*parser).callonOptionalExprs3, expr: &ruleRefExpr{ - pos: position{line: 1124, col: 5, offset: 27234}, + pos: position{line: 1124, col: 5, offset: 27248}, name: "__", }, }, @@ -7552,51 +7562,51 @@ var g = &grammar{ }, { name: "Exprs", - pos: position{line: 1126, col: 1, offset: 27262}, + pos: position{line: 1126, col: 1, offset: 27276}, expr: &actionExpr{ - pos: position{line: 1127, col: 5, offset: 27272}, + pos: position{line: 1127, col: 5, offset: 27286}, run: (*parser).callonExprs1, expr: &seqExpr{ - pos: position{line: 1127, col: 5, offset: 27272}, + pos: position{line: 1127, col: 5, offset: 27286}, exprs: []any{ &labeledExpr{ - pos: position{line: 1127, col: 5, offset: 27272}, + pos: position{line: 1127, col: 5, offset: 27286}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1127, col: 11, offset: 27278}, + pos: position{line: 1127, col: 11, offset: 27292}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 1127, col: 16, offset: 27283}, + pos: position{line: 1127, col: 16, offset: 27297}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1127, col: 21, offset: 27288}, + pos: position{line: 1127, col: 21, offset: 27302}, expr: &actionExpr{ - pos: position{line: 1127, col: 22, offset: 27289}, + pos: position{line: 1127, col: 22, offset: 27303}, run: (*parser).callonExprs7, expr: &seqExpr{ - pos: position{line: 1127, col: 22, offset: 27289}, + pos: position{line: 1127, col: 22, offset: 27303}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1127, col: 22, offset: 27289}, + pos: position{line: 1127, col: 22, offset: 27303}, name: "__", }, &litMatcher{ - pos: position{line: 1127, col: 25, offset: 27292}, + pos: position{line: 1127, col: 25, offset: 27306}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1127, col: 29, offset: 27296}, + pos: position{line: 1127, col: 29, offset: 27310}, name: "__", }, &labeledExpr{ - pos: position{line: 1127, col: 32, offset: 27299}, + pos: position{line: 1127, col: 32, offset: 27313}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1127, col: 34, offset: 27301}, + pos: position{line: 1127, col: 34, offset: 27315}, name: "Expr", }, }, @@ -7613,64 +7623,64 @@ var g = &grammar{ }, { name: "Primary", - pos: position{line: 1131, col: 1, offset: 27374}, + pos: position{line: 1131, col: 1, offset: 27388}, expr: &choiceExpr{ - pos: position{line: 1132, col: 5, offset: 27386}, + pos: position{line: 1132, col: 5, offset: 27400}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1132, col: 5, offset: 27386}, + pos: position{line: 1132, col: 5, offset: 27400}, name: "Record", }, &ruleRefExpr{ - pos: position{line: 1133, col: 5, offset: 27397}, + pos: position{line: 1133, col: 5, offset: 27411}, name: "Array", }, &ruleRefExpr{ - pos: position{line: 1134, col: 5, offset: 27407}, + pos: position{line: 1134, col: 5, offset: 27421}, name: "Set", }, &ruleRefExpr{ - pos: position{line: 1135, col: 5, offset: 27415}, + pos: position{line: 1135, col: 5, offset: 27429}, name: "Map", }, &ruleRefExpr{ - pos: position{line: 1136, col: 5, offset: 27423}, + pos: position{line: 1136, col: 5, offset: 27437}, name: "Literal", }, &ruleRefExpr{ - pos: position{line: 1137, col: 5, offset: 27435}, + pos: position{line: 1137, col: 5, offset: 27449}, name: "Identifier", }, &actionExpr{ - pos: position{line: 1138, col: 5, offset: 27450}, + pos: position{line: 1138, col: 5, offset: 27464}, run: (*parser).callonPrimary8, expr: &seqExpr{ - pos: position{line: 1138, col: 5, offset: 27450}, + pos: position{line: 1138, col: 5, offset: 27464}, exprs: []any{ &litMatcher{ - pos: position{line: 1138, col: 5, offset: 27450}, + pos: position{line: 1138, col: 5, offset: 27464}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1138, col: 9, offset: 27454}, + pos: position{line: 1138, col: 9, offset: 27468}, name: "__", }, &labeledExpr{ - pos: position{line: 1138, col: 12, offset: 27457}, + pos: position{line: 1138, col: 12, offset: 27471}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1138, col: 17, offset: 27462}, + pos: position{line: 1138, col: 17, offset: 27476}, name: "OverExpr", }, }, &ruleRefExpr{ - pos: position{line: 1138, col: 26, offset: 27471}, + pos: position{line: 1138, col: 26, offset: 27485}, name: "__", }, &litMatcher{ - pos: position{line: 1138, col: 29, offset: 27474}, + pos: position{line: 1138, col: 29, offset: 27488}, val: ")", ignoreCase: false, want: "\")\"", @@ -7679,35 +7689,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1139, col: 5, offset: 27503}, + pos: position{line: 1139, col: 5, offset: 27517}, run: (*parser).callonPrimary16, expr: &seqExpr{ - pos: position{line: 1139, col: 5, offset: 27503}, + pos: position{line: 1139, col: 5, offset: 27517}, exprs: []any{ &litMatcher{ - pos: position{line: 1139, col: 5, offset: 27503}, + pos: position{line: 1139, col: 5, offset: 27517}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1139, col: 9, offset: 27507}, + pos: position{line: 1139, col: 9, offset: 27521}, name: "__", }, &labeledExpr{ - pos: position{line: 1139, col: 12, offset: 27510}, + pos: position{line: 1139, col: 12, offset: 27524}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1139, col: 17, offset: 27515}, + pos: position{line: 1139, col: 17, offset: 27529}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1139, col: 22, offset: 27520}, + pos: position{line: 1139, col: 22, offset: 27534}, name: "__", }, &litMatcher{ - pos: position{line: 1139, col: 25, offset: 27523}, + pos: position{line: 1139, col: 25, offset: 27537}, val: ")", ignoreCase: false, want: "\")\"", @@ -7722,57 +7732,57 @@ var g = &grammar{ }, { name: "OverExpr", - pos: position{line: 1141, col: 1, offset: 27549}, + pos: position{line: 1141, col: 1, offset: 27563}, expr: &actionExpr{ - pos: position{line: 1142, col: 5, offset: 27562}, + pos: position{line: 1142, col: 5, offset: 27576}, run: (*parser).callonOverExpr1, expr: &seqExpr{ - pos: position{line: 1142, col: 5, offset: 27562}, + pos: position{line: 1142, col: 5, offset: 27576}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1142, col: 5, offset: 27562}, + pos: position{line: 1142, col: 5, offset: 27576}, name: "OVER", }, &ruleRefExpr{ - pos: position{line: 1142, col: 10, offset: 27567}, + pos: position{line: 1142, col: 10, offset: 27581}, name: "_", }, &labeledExpr{ - pos: position{line: 1142, col: 12, offset: 27569}, + pos: position{line: 1142, col: 12, offset: 27583}, label: "exprs", expr: &ruleRefExpr{ - pos: position{line: 1142, col: 18, offset: 27575}, + pos: position{line: 1142, col: 18, offset: 27589}, name: "Exprs", }, }, &labeledExpr{ - pos: position{line: 1142, col: 24, offset: 27581}, + pos: position{line: 1142, col: 24, offset: 27595}, label: "locals", expr: &zeroOrOneExpr{ - pos: position{line: 1142, col: 31, offset: 27588}, + pos: position{line: 1142, col: 31, offset: 27602}, expr: &ruleRefExpr{ - pos: position{line: 1142, col: 31, offset: 27588}, + pos: position{line: 1142, col: 31, offset: 27602}, name: "Locals", }, }, }, &ruleRefExpr{ - pos: position{line: 1142, col: 39, offset: 27596}, + pos: position{line: 1142, col: 39, offset: 27610}, name: "__", }, &ruleRefExpr{ - pos: position{line: 1142, col: 42, offset: 27599}, + pos: position{line: 1142, col: 42, offset: 27613}, name: "Pipe", }, &ruleRefExpr{ - pos: position{line: 1142, col: 47, offset: 27604}, + pos: position{line: 1142, col: 47, offset: 27618}, name: "__", }, &labeledExpr{ - pos: position{line: 1142, col: 50, offset: 27607}, + pos: position{line: 1142, col: 50, offset: 27621}, label: "body", expr: &ruleRefExpr{ - pos: position{line: 1142, col: 55, offset: 27612}, + pos: position{line: 1142, col: 55, offset: 27626}, name: "Seq", }, }, @@ -7784,37 +7794,37 @@ var g = &grammar{ }, { name: "Record", - pos: position{line: 1152, col: 1, offset: 27843}, + pos: position{line: 1152, col: 1, offset: 27857}, expr: &actionExpr{ - pos: position{line: 1153, col: 5, offset: 27854}, + pos: position{line: 1153, col: 5, offset: 27868}, run: (*parser).callonRecord1, expr: &seqExpr{ - pos: position{line: 1153, col: 5, offset: 27854}, + pos: position{line: 1153, col: 5, offset: 27868}, exprs: []any{ &litMatcher{ - pos: position{line: 1153, col: 5, offset: 27854}, + pos: position{line: 1153, col: 5, offset: 27868}, val: "{", ignoreCase: false, want: "\"{\"", }, &ruleRefExpr{ - pos: position{line: 1153, col: 9, offset: 27858}, + pos: position{line: 1153, col: 9, offset: 27872}, name: "__", }, &labeledExpr{ - pos: position{line: 1153, col: 12, offset: 27861}, + pos: position{line: 1153, col: 12, offset: 27875}, label: "elems", expr: &ruleRefExpr{ - pos: position{line: 1153, col: 18, offset: 27867}, + pos: position{line: 1153, col: 18, offset: 27881}, name: "RecordElems", }, }, &ruleRefExpr{ - pos: position{line: 1153, col: 30, offset: 27879}, + pos: position{line: 1153, col: 30, offset: 27893}, name: "__", }, &litMatcher{ - pos: position{line: 1153, col: 33, offset: 27882}, + pos: position{line: 1153, col: 33, offset: 27896}, val: "}", ignoreCase: false, want: "\"}\"", @@ -7827,31 +7837,31 @@ var g = &grammar{ }, { name: "RecordElems", - pos: position{line: 1161, col: 1, offset: 28040}, + pos: position{line: 1161, col: 1, offset: 28054}, expr: &choiceExpr{ - pos: position{line: 1162, col: 5, offset: 28056}, + pos: position{line: 1162, col: 5, offset: 28070}, alternatives: []any{ &actionExpr{ - pos: position{line: 1162, col: 5, offset: 28056}, + pos: position{line: 1162, col: 5, offset: 28070}, run: (*parser).callonRecordElems2, expr: &seqExpr{ - pos: position{line: 1162, col: 5, offset: 28056}, + pos: position{line: 1162, col: 5, offset: 28070}, exprs: []any{ &labeledExpr{ - pos: position{line: 1162, col: 5, offset: 28056}, + pos: position{line: 1162, col: 5, offset: 28070}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1162, col: 11, offset: 28062}, + pos: position{line: 1162, col: 11, offset: 28076}, name: "RecordElem", }, }, &labeledExpr{ - pos: position{line: 1162, col: 22, offset: 28073}, + pos: position{line: 1162, col: 22, offset: 28087}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1162, col: 27, offset: 28078}, + pos: position{line: 1162, col: 27, offset: 28092}, expr: &ruleRefExpr{ - pos: position{line: 1162, col: 27, offset: 28078}, + pos: position{line: 1162, col: 27, offset: 28092}, name: "RecordElemTail", }, }, @@ -7860,10 +7870,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1165, col: 5, offset: 28141}, + pos: position{line: 1165, col: 5, offset: 28155}, run: (*parser).callonRecordElems9, expr: &ruleRefExpr{ - pos: position{line: 1165, col: 5, offset: 28141}, + pos: position{line: 1165, col: 5, offset: 28155}, name: "__", }, }, @@ -7874,32 +7884,32 @@ var g = &grammar{ }, { name: "RecordElemTail", - pos: position{line: 1167, col: 1, offset: 28165}, + pos: position{line: 1167, col: 1, offset: 28179}, expr: &actionExpr{ - pos: position{line: 1167, col: 18, offset: 28182}, + pos: position{line: 1167, col: 18, offset: 28196}, run: (*parser).callonRecordElemTail1, expr: &seqExpr{ - pos: position{line: 1167, col: 18, offset: 28182}, + pos: position{line: 1167, col: 18, offset: 28196}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1167, col: 18, offset: 28182}, + pos: position{line: 1167, col: 18, offset: 28196}, name: "__", }, &litMatcher{ - pos: position{line: 1167, col: 21, offset: 28185}, + pos: position{line: 1167, col: 21, offset: 28199}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1167, col: 25, offset: 28189}, + pos: position{line: 1167, col: 25, offset: 28203}, name: "__", }, &labeledExpr{ - pos: position{line: 1167, col: 28, offset: 28192}, + pos: position{line: 1167, col: 28, offset: 28206}, label: "elem", expr: &ruleRefExpr{ - pos: position{line: 1167, col: 33, offset: 28197}, + pos: position{line: 1167, col: 33, offset: 28211}, name: "RecordElem", }, }, @@ -7911,20 +7921,20 @@ var g = &grammar{ }, { name: "RecordElem", - pos: position{line: 1169, col: 1, offset: 28230}, + pos: position{line: 1169, col: 1, offset: 28244}, expr: &choiceExpr{ - pos: position{line: 1170, col: 5, offset: 28245}, + pos: position{line: 1170, col: 5, offset: 28259}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1170, col: 5, offset: 28245}, + pos: position{line: 1170, col: 5, offset: 28259}, name: "Spread", }, &ruleRefExpr{ - pos: position{line: 1171, col: 5, offset: 28256}, + pos: position{line: 1171, col: 5, offset: 28270}, name: "FieldExpr", }, &ruleRefExpr{ - pos: position{line: 1172, col: 5, offset: 28270}, + pos: position{line: 1172, col: 5, offset: 28284}, name: "Identifier", }, }, @@ -7934,28 +7944,28 @@ var g = &grammar{ }, { name: "Spread", - pos: position{line: 1174, col: 1, offset: 28282}, + pos: position{line: 1174, col: 1, offset: 28296}, expr: &actionExpr{ - pos: position{line: 1175, col: 5, offset: 28293}, + pos: position{line: 1175, col: 5, offset: 28307}, run: (*parser).callonSpread1, expr: &seqExpr{ - pos: position{line: 1175, col: 5, offset: 28293}, + pos: position{line: 1175, col: 5, offset: 28307}, exprs: []any{ &litMatcher{ - pos: position{line: 1175, col: 5, offset: 28293}, + pos: position{line: 1175, col: 5, offset: 28307}, val: "...", ignoreCase: false, want: "\"...\"", }, &ruleRefExpr{ - pos: position{line: 1175, col: 11, offset: 28299}, + pos: position{line: 1175, col: 11, offset: 28313}, name: "__", }, &labeledExpr{ - pos: position{line: 1175, col: 14, offset: 28302}, + pos: position{line: 1175, col: 14, offset: 28316}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1175, col: 19, offset: 28307}, + pos: position{line: 1175, col: 19, offset: 28321}, name: "Expr", }, }, @@ -7967,40 +7977,40 @@ var g = &grammar{ }, { name: "FieldExpr", - pos: position{line: 1179, col: 1, offset: 28403}, + pos: position{line: 1179, col: 1, offset: 28417}, expr: &actionExpr{ - pos: position{line: 1180, col: 5, offset: 28417}, + pos: position{line: 1180, col: 5, offset: 28431}, run: (*parser).callonFieldExpr1, expr: &seqExpr{ - pos: position{line: 1180, col: 5, offset: 28417}, + pos: position{line: 1180, col: 5, offset: 28431}, exprs: []any{ &labeledExpr{ - pos: position{line: 1180, col: 5, offset: 28417}, + pos: position{line: 1180, col: 5, offset: 28431}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1180, col: 10, offset: 28422}, + pos: position{line: 1180, col: 10, offset: 28436}, name: "Name", }, }, &ruleRefExpr{ - pos: position{line: 1180, col: 15, offset: 28427}, + pos: position{line: 1180, col: 15, offset: 28441}, name: "__", }, &litMatcher{ - pos: position{line: 1180, col: 18, offset: 28430}, + pos: position{line: 1180, col: 18, offset: 28444}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1180, col: 22, offset: 28434}, + pos: position{line: 1180, col: 22, offset: 28448}, name: "__", }, &labeledExpr{ - pos: position{line: 1180, col: 25, offset: 28437}, + pos: position{line: 1180, col: 25, offset: 28451}, label: "value", expr: &ruleRefExpr{ - pos: position{line: 1180, col: 31, offset: 28443}, + pos: position{line: 1180, col: 31, offset: 28457}, name: "Expr", }, }, @@ -8012,37 +8022,37 @@ var g = &grammar{ }, { name: "Array", - pos: position{line: 1189, col: 1, offset: 28612}, + pos: position{line: 1189, col: 1, offset: 28626}, expr: &actionExpr{ - pos: position{line: 1190, col: 5, offset: 28622}, + pos: position{line: 1190, col: 5, offset: 28636}, run: (*parser).callonArray1, expr: &seqExpr{ - pos: position{line: 1190, col: 5, offset: 28622}, + pos: position{line: 1190, col: 5, offset: 28636}, exprs: []any{ &litMatcher{ - pos: position{line: 1190, col: 5, offset: 28622}, + pos: position{line: 1190, col: 5, offset: 28636}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 1190, col: 9, offset: 28626}, + pos: position{line: 1190, col: 9, offset: 28640}, name: "__", }, &labeledExpr{ - pos: position{line: 1190, col: 12, offset: 28629}, + pos: position{line: 1190, col: 12, offset: 28643}, label: "elems", expr: &ruleRefExpr{ - pos: position{line: 1190, col: 18, offset: 28635}, + pos: position{line: 1190, col: 18, offset: 28649}, name: "VectorElems", }, }, &ruleRefExpr{ - pos: position{line: 1190, col: 30, offset: 28647}, + pos: position{line: 1190, col: 30, offset: 28661}, name: "__", }, &litMatcher{ - pos: position{line: 1190, col: 33, offset: 28650}, + pos: position{line: 1190, col: 33, offset: 28664}, val: "]", ignoreCase: false, want: "\"]\"", @@ -8055,37 +8065,37 @@ var g = &grammar{ }, { name: "Set", - pos: position{line: 1198, col: 1, offset: 28806}, + pos: position{line: 1198, col: 1, offset: 28820}, expr: &actionExpr{ - pos: position{line: 1199, col: 5, offset: 28814}, + pos: position{line: 1199, col: 5, offset: 28828}, run: (*parser).callonSet1, expr: &seqExpr{ - pos: position{line: 1199, col: 5, offset: 28814}, + pos: position{line: 1199, col: 5, offset: 28828}, exprs: []any{ &litMatcher{ - pos: position{line: 1199, col: 5, offset: 28814}, + pos: position{line: 1199, col: 5, offset: 28828}, val: "|[", ignoreCase: false, want: "\"|[\"", }, &ruleRefExpr{ - pos: position{line: 1199, col: 10, offset: 28819}, + pos: position{line: 1199, col: 10, offset: 28833}, name: "__", }, &labeledExpr{ - pos: position{line: 1199, col: 13, offset: 28822}, + pos: position{line: 1199, col: 13, offset: 28836}, label: "elems", expr: &ruleRefExpr{ - pos: position{line: 1199, col: 19, offset: 28828}, + pos: position{line: 1199, col: 19, offset: 28842}, name: "VectorElems", }, }, &ruleRefExpr{ - pos: position{line: 1199, col: 31, offset: 28840}, + pos: position{line: 1199, col: 31, offset: 28854}, name: "__", }, &litMatcher{ - pos: position{line: 1199, col: 34, offset: 28843}, + pos: position{line: 1199, col: 34, offset: 28857}, val: "]|", ignoreCase: false, want: "\"]|\"", @@ -8098,54 +8108,54 @@ var g = &grammar{ }, { name: "VectorElems", - pos: position{line: 1207, col: 1, offset: 28996}, + pos: position{line: 1207, col: 1, offset: 29010}, expr: &choiceExpr{ - pos: position{line: 1208, col: 5, offset: 29012}, + pos: position{line: 1208, col: 5, offset: 29026}, alternatives: []any{ &actionExpr{ - pos: position{line: 1208, col: 5, offset: 29012}, + pos: position{line: 1208, col: 5, offset: 29026}, run: (*parser).callonVectorElems2, expr: &seqExpr{ - pos: position{line: 1208, col: 5, offset: 29012}, + pos: position{line: 1208, col: 5, offset: 29026}, exprs: []any{ &labeledExpr{ - pos: position{line: 1208, col: 5, offset: 29012}, + pos: position{line: 1208, col: 5, offset: 29026}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1208, col: 11, offset: 29018}, + pos: position{line: 1208, col: 11, offset: 29032}, name: "VectorElem", }, }, &labeledExpr{ - pos: position{line: 1208, col: 22, offset: 29029}, + pos: position{line: 1208, col: 22, offset: 29043}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1208, col: 27, offset: 29034}, + pos: position{line: 1208, col: 27, offset: 29048}, expr: &actionExpr{ - pos: position{line: 1208, col: 28, offset: 29035}, + pos: position{line: 1208, col: 28, offset: 29049}, run: (*parser).callonVectorElems8, expr: &seqExpr{ - pos: position{line: 1208, col: 28, offset: 29035}, + pos: position{line: 1208, col: 28, offset: 29049}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1208, col: 28, offset: 29035}, + pos: position{line: 1208, col: 28, offset: 29049}, name: "__", }, &litMatcher{ - pos: position{line: 1208, col: 31, offset: 29038}, + pos: position{line: 1208, col: 31, offset: 29052}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1208, col: 35, offset: 29042}, + pos: position{line: 1208, col: 35, offset: 29056}, name: "__", }, &labeledExpr{ - pos: position{line: 1208, col: 38, offset: 29045}, + pos: position{line: 1208, col: 38, offset: 29059}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1208, col: 40, offset: 29047}, + pos: position{line: 1208, col: 40, offset: 29061}, name: "VectorElem", }, }, @@ -8158,10 +8168,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1211, col: 5, offset: 29129}, + pos: position{line: 1211, col: 5, offset: 29143}, run: (*parser).callonVectorElems15, expr: &ruleRefExpr{ - pos: position{line: 1211, col: 5, offset: 29129}, + pos: position{line: 1211, col: 5, offset: 29143}, name: "__", }, }, @@ -8172,22 +8182,22 @@ var g = &grammar{ }, { name: "VectorElem", - pos: position{line: 1213, col: 1, offset: 29153}, + pos: position{line: 1213, col: 1, offset: 29167}, expr: &choiceExpr{ - pos: position{line: 1214, col: 5, offset: 29168}, + pos: position{line: 1214, col: 5, offset: 29182}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1214, col: 5, offset: 29168}, + pos: position{line: 1214, col: 5, offset: 29182}, name: "Spread", }, &actionExpr{ - pos: position{line: 1215, col: 5, offset: 29179}, + pos: position{line: 1215, col: 5, offset: 29193}, run: (*parser).callonVectorElem3, expr: &labeledExpr{ - pos: position{line: 1215, col: 5, offset: 29179}, + pos: position{line: 1215, col: 5, offset: 29193}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1215, col: 7, offset: 29181}, + pos: position{line: 1215, col: 7, offset: 29195}, name: "Expr", }, }, @@ -8199,37 +8209,37 @@ var g = &grammar{ }, { name: "Map", - pos: position{line: 1217, col: 1, offset: 29272}, + pos: position{line: 1217, col: 1, offset: 29286}, expr: &actionExpr{ - pos: position{line: 1218, col: 5, offset: 29280}, + pos: position{line: 1218, col: 5, offset: 29294}, run: (*parser).callonMap1, expr: &seqExpr{ - pos: position{line: 1218, col: 5, offset: 29280}, + pos: position{line: 1218, col: 5, offset: 29294}, exprs: []any{ &litMatcher{ - pos: position{line: 1218, col: 5, offset: 29280}, + pos: position{line: 1218, col: 5, offset: 29294}, val: "|{", ignoreCase: false, want: "\"|{\"", }, &ruleRefExpr{ - pos: position{line: 1218, col: 10, offset: 29285}, + pos: position{line: 1218, col: 10, offset: 29299}, name: "__", }, &labeledExpr{ - pos: position{line: 1218, col: 13, offset: 29288}, + pos: position{line: 1218, col: 13, offset: 29302}, label: "exprs", expr: &ruleRefExpr{ - pos: position{line: 1218, col: 19, offset: 29294}, + pos: position{line: 1218, col: 19, offset: 29308}, name: "Entries", }, }, &ruleRefExpr{ - pos: position{line: 1218, col: 27, offset: 29302}, + pos: position{line: 1218, col: 27, offset: 29316}, name: "__", }, &litMatcher{ - pos: position{line: 1218, col: 30, offset: 29305}, + pos: position{line: 1218, col: 30, offset: 29319}, val: "}|", ignoreCase: false, want: "\"}|\"", @@ -8242,31 +8252,31 @@ var g = &grammar{ }, { name: "Entries", - pos: position{line: 1226, col: 1, offset: 29459}, + pos: position{line: 1226, col: 1, offset: 29473}, expr: &choiceExpr{ - pos: position{line: 1227, col: 5, offset: 29471}, + pos: position{line: 1227, col: 5, offset: 29485}, alternatives: []any{ &actionExpr{ - pos: position{line: 1227, col: 5, offset: 29471}, + pos: position{line: 1227, col: 5, offset: 29485}, run: (*parser).callonEntries2, expr: &seqExpr{ - pos: position{line: 1227, col: 5, offset: 29471}, + pos: position{line: 1227, col: 5, offset: 29485}, exprs: []any{ &labeledExpr{ - pos: position{line: 1227, col: 5, offset: 29471}, + pos: position{line: 1227, col: 5, offset: 29485}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1227, col: 11, offset: 29477}, + pos: position{line: 1227, col: 11, offset: 29491}, name: "Entry", }, }, &labeledExpr{ - pos: position{line: 1227, col: 17, offset: 29483}, + pos: position{line: 1227, col: 17, offset: 29497}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1227, col: 22, offset: 29488}, + pos: position{line: 1227, col: 22, offset: 29502}, expr: &ruleRefExpr{ - pos: position{line: 1227, col: 22, offset: 29488}, + pos: position{line: 1227, col: 22, offset: 29502}, name: "EntryTail", }, }, @@ -8275,10 +8285,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1230, col: 5, offset: 29546}, + pos: position{line: 1230, col: 5, offset: 29560}, run: (*parser).callonEntries9, expr: &ruleRefExpr{ - pos: position{line: 1230, col: 5, offset: 29546}, + pos: position{line: 1230, col: 5, offset: 29560}, name: "__", }, }, @@ -8289,32 +8299,32 @@ var g = &grammar{ }, { name: "EntryTail", - pos: position{line: 1233, col: 1, offset: 29571}, + pos: position{line: 1233, col: 1, offset: 29585}, expr: &actionExpr{ - pos: position{line: 1233, col: 13, offset: 29583}, + pos: position{line: 1233, col: 13, offset: 29597}, run: (*parser).callonEntryTail1, expr: &seqExpr{ - pos: position{line: 1233, col: 13, offset: 29583}, + pos: position{line: 1233, col: 13, offset: 29597}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1233, col: 13, offset: 29583}, + pos: position{line: 1233, col: 13, offset: 29597}, name: "__", }, &litMatcher{ - pos: position{line: 1233, col: 16, offset: 29586}, + pos: position{line: 1233, col: 16, offset: 29600}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1233, col: 20, offset: 29590}, + pos: position{line: 1233, col: 20, offset: 29604}, name: "__", }, &labeledExpr{ - pos: position{line: 1233, col: 23, offset: 29593}, + pos: position{line: 1233, col: 23, offset: 29607}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1233, col: 25, offset: 29595}, + pos: position{line: 1233, col: 25, offset: 29609}, name: "Entry", }, }, @@ -8326,40 +8336,40 @@ var g = &grammar{ }, { name: "Entry", - pos: position{line: 1235, col: 1, offset: 29620}, + pos: position{line: 1235, col: 1, offset: 29634}, expr: &actionExpr{ - pos: position{line: 1236, col: 5, offset: 29630}, + pos: position{line: 1236, col: 5, offset: 29644}, run: (*parser).callonEntry1, expr: &seqExpr{ - pos: position{line: 1236, col: 5, offset: 29630}, + pos: position{line: 1236, col: 5, offset: 29644}, exprs: []any{ &labeledExpr{ - pos: position{line: 1236, col: 5, offset: 29630}, + pos: position{line: 1236, col: 5, offset: 29644}, label: "key", expr: &ruleRefExpr{ - pos: position{line: 1236, col: 9, offset: 29634}, + pos: position{line: 1236, col: 9, offset: 29648}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1236, col: 14, offset: 29639}, + pos: position{line: 1236, col: 14, offset: 29653}, name: "__", }, &litMatcher{ - pos: position{line: 1236, col: 17, offset: 29642}, + pos: position{line: 1236, col: 17, offset: 29656}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1236, col: 21, offset: 29646}, + pos: position{line: 1236, col: 21, offset: 29660}, name: "__", }, &labeledExpr{ - pos: position{line: 1236, col: 24, offset: 29649}, + pos: position{line: 1236, col: 24, offset: 29663}, label: "value", expr: &ruleRefExpr{ - pos: position{line: 1236, col: 30, offset: 29655}, + pos: position{line: 1236, col: 30, offset: 29669}, name: "Expr", }, }, @@ -8371,56 +8381,56 @@ var g = &grammar{ }, { name: "Literal", - pos: position{line: 1242, col: 1, offset: 29780}, + pos: position{line: 1242, col: 1, offset: 29794}, expr: &choiceExpr{ - pos: position{line: 1243, col: 5, offset: 29792}, + pos: position{line: 1243, col: 5, offset: 29806}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1243, col: 5, offset: 29792}, + pos: position{line: 1243, col: 5, offset: 29806}, name: "TypeLiteral", }, &ruleRefExpr{ - pos: position{line: 1244, col: 5, offset: 29808}, + pos: position{line: 1244, col: 5, offset: 29822}, name: "StringLiteral", }, &ruleRefExpr{ - pos: position{line: 1245, col: 5, offset: 29826}, + pos: position{line: 1245, col: 5, offset: 29840}, name: "FString", }, &ruleRefExpr{ - pos: position{line: 1246, col: 5, offset: 29838}, + pos: position{line: 1246, col: 5, offset: 29852}, name: "SubnetLiteral", }, &ruleRefExpr{ - pos: position{line: 1247, col: 5, offset: 29856}, + pos: position{line: 1247, col: 5, offset: 29870}, name: "AddressLiteral", }, &ruleRefExpr{ - pos: position{line: 1248, col: 5, offset: 29875}, + pos: position{line: 1248, col: 5, offset: 29889}, name: "BytesLiteral", }, &ruleRefExpr{ - pos: position{line: 1249, col: 5, offset: 29892}, + pos: position{line: 1249, col: 5, offset: 29906}, name: "Duration", }, &ruleRefExpr{ - pos: position{line: 1250, col: 5, offset: 29905}, + pos: position{line: 1250, col: 5, offset: 29919}, name: "Time", }, &ruleRefExpr{ - pos: position{line: 1251, col: 5, offset: 29914}, + pos: position{line: 1251, col: 5, offset: 29928}, name: "FloatLiteral", }, &ruleRefExpr{ - pos: position{line: 1252, col: 5, offset: 29931}, + pos: position{line: 1252, col: 5, offset: 29945}, name: "IntegerLiteral", }, &ruleRefExpr{ - pos: position{line: 1253, col: 5, offset: 29950}, + pos: position{line: 1253, col: 5, offset: 29964}, name: "BooleanLiteral", }, &ruleRefExpr{ - pos: position{line: 1254, col: 5, offset: 29969}, + pos: position{line: 1254, col: 5, offset: 29983}, name: "NullLiteral", }, }, @@ -8430,28 +8440,28 @@ var g = &grammar{ }, { name: "SubnetLiteral", - pos: position{line: 1256, col: 1, offset: 29982}, + pos: position{line: 1256, col: 1, offset: 29996}, expr: &choiceExpr{ - pos: position{line: 1257, col: 5, offset: 30000}, + pos: position{line: 1257, col: 5, offset: 30014}, alternatives: []any{ &actionExpr{ - pos: position{line: 1257, col: 5, offset: 30000}, + pos: position{line: 1257, col: 5, offset: 30014}, run: (*parser).callonSubnetLiteral2, expr: &seqExpr{ - pos: position{line: 1257, col: 5, offset: 30000}, + pos: position{line: 1257, col: 5, offset: 30014}, exprs: []any{ &labeledExpr{ - pos: position{line: 1257, col: 5, offset: 30000}, + pos: position{line: 1257, col: 5, offset: 30014}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1257, col: 7, offset: 30002}, + pos: position{line: 1257, col: 7, offset: 30016}, name: "IP6Net", }, }, ¬Expr{ - pos: position{line: 1257, col: 14, offset: 30009}, + pos: position{line: 1257, col: 14, offset: 30023}, expr: &ruleRefExpr{ - pos: position{line: 1257, col: 15, offset: 30010}, + pos: position{line: 1257, col: 15, offset: 30024}, name: "IdentifierRest", }, }, @@ -8459,13 +8469,13 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1260, col: 5, offset: 30090}, + pos: position{line: 1260, col: 5, offset: 30104}, run: (*parser).callonSubnetLiteral8, expr: &labeledExpr{ - pos: position{line: 1260, col: 5, offset: 30090}, + pos: position{line: 1260, col: 5, offset: 30104}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1260, col: 7, offset: 30092}, + pos: position{line: 1260, col: 7, offset: 30106}, name: "IP4Net", }, }, @@ -8477,28 +8487,28 @@ var g = &grammar{ }, { name: "AddressLiteral", - pos: position{line: 1264, col: 1, offset: 30161}, + pos: position{line: 1264, col: 1, offset: 30175}, expr: &choiceExpr{ - pos: position{line: 1265, col: 5, offset: 30180}, + pos: position{line: 1265, col: 5, offset: 30194}, alternatives: []any{ &actionExpr{ - pos: position{line: 1265, col: 5, offset: 30180}, + pos: position{line: 1265, col: 5, offset: 30194}, run: (*parser).callonAddressLiteral2, expr: &seqExpr{ - pos: position{line: 1265, col: 5, offset: 30180}, + pos: position{line: 1265, col: 5, offset: 30194}, exprs: []any{ &labeledExpr{ - pos: position{line: 1265, col: 5, offset: 30180}, + pos: position{line: 1265, col: 5, offset: 30194}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1265, col: 7, offset: 30182}, + pos: position{line: 1265, col: 7, offset: 30196}, name: "IP6", }, }, ¬Expr{ - pos: position{line: 1265, col: 11, offset: 30186}, + pos: position{line: 1265, col: 11, offset: 30200}, expr: &ruleRefExpr{ - pos: position{line: 1265, col: 12, offset: 30187}, + pos: position{line: 1265, col: 12, offset: 30201}, name: "IdentifierRest", }, }, @@ -8506,13 +8516,13 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1268, col: 5, offset: 30266}, + pos: position{line: 1268, col: 5, offset: 30280}, run: (*parser).callonAddressLiteral8, expr: &labeledExpr{ - pos: position{line: 1268, col: 5, offset: 30266}, + pos: position{line: 1268, col: 5, offset: 30280}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1268, col: 7, offset: 30268}, + pos: position{line: 1268, col: 7, offset: 30282}, name: "IP", }, }, @@ -8524,15 +8534,15 @@ var g = &grammar{ }, { name: "FloatLiteral", - pos: position{line: 1272, col: 1, offset: 30332}, + pos: position{line: 1272, col: 1, offset: 30346}, expr: &actionExpr{ - pos: position{line: 1273, col: 5, offset: 30349}, + pos: position{line: 1273, col: 5, offset: 30363}, run: (*parser).callonFloatLiteral1, expr: &labeledExpr{ - pos: position{line: 1273, col: 5, offset: 30349}, + pos: position{line: 1273, col: 5, offset: 30363}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1273, col: 7, offset: 30351}, + pos: position{line: 1273, col: 7, offset: 30365}, name: "FloatString", }, }, @@ -8542,15 +8552,15 @@ var g = &grammar{ }, { name: "IntegerLiteral", - pos: position{line: 1277, col: 1, offset: 30429}, + pos: position{line: 1277, col: 1, offset: 30443}, expr: &actionExpr{ - pos: position{line: 1278, col: 5, offset: 30448}, + pos: position{line: 1278, col: 5, offset: 30462}, run: (*parser).callonIntegerLiteral1, expr: &labeledExpr{ - pos: position{line: 1278, col: 5, offset: 30448}, + pos: position{line: 1278, col: 5, offset: 30462}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1278, col: 7, offset: 30450}, + pos: position{line: 1278, col: 7, offset: 30464}, name: "IntString", }, }, @@ -8560,23 +8570,23 @@ var g = &grammar{ }, { name: "BooleanLiteral", - pos: position{line: 1282, col: 1, offset: 30524}, + pos: position{line: 1282, col: 1, offset: 30538}, expr: &choiceExpr{ - pos: position{line: 1283, col: 5, offset: 30543}, + pos: position{line: 1283, col: 5, offset: 30557}, alternatives: []any{ &actionExpr{ - pos: position{line: 1283, col: 5, offset: 30543}, + pos: position{line: 1283, col: 5, offset: 30557}, run: (*parser).callonBooleanLiteral2, expr: &ruleRefExpr{ - pos: position{line: 1283, col: 5, offset: 30543}, + pos: position{line: 1283, col: 5, offset: 30557}, name: "TRUE", }, }, &actionExpr{ - pos: position{line: 1284, col: 5, offset: 30601}, + pos: position{line: 1284, col: 5, offset: 30615}, run: (*parser).callonBooleanLiteral4, expr: &ruleRefExpr{ - pos: position{line: 1284, col: 5, offset: 30601}, + pos: position{line: 1284, col: 5, offset: 30615}, name: "FALSE", }, }, @@ -8587,12 +8597,12 @@ var g = &grammar{ }, { name: "NullLiteral", - pos: position{line: 1286, col: 1, offset: 30657}, + pos: position{line: 1286, col: 1, offset: 30671}, expr: &actionExpr{ - pos: position{line: 1287, col: 5, offset: 30673}, + pos: position{line: 1287, col: 5, offset: 30687}, run: (*parser).callonNullLiteral1, expr: &ruleRefExpr{ - pos: position{line: 1287, col: 5, offset: 30673}, + pos: position{line: 1287, col: 5, offset: 30687}, name: "NULL", }, }, @@ -8601,23 +8611,23 @@ var g = &grammar{ }, { name: "BytesLiteral", - pos: position{line: 1289, col: 1, offset: 30723}, + pos: position{line: 1289, col: 1, offset: 30737}, expr: &actionExpr{ - pos: position{line: 1290, col: 5, offset: 30740}, + pos: position{line: 1290, col: 5, offset: 30754}, run: (*parser).callonBytesLiteral1, expr: &seqExpr{ - pos: position{line: 1290, col: 5, offset: 30740}, + pos: position{line: 1290, col: 5, offset: 30754}, exprs: []any{ &litMatcher{ - pos: position{line: 1290, col: 5, offset: 30740}, + pos: position{line: 1290, col: 5, offset: 30754}, val: "0x", ignoreCase: false, want: "\"0x\"", }, &zeroOrMoreExpr{ - pos: position{line: 1290, col: 10, offset: 30745}, + pos: position{line: 1290, col: 10, offset: 30759}, expr: &ruleRefExpr{ - pos: position{line: 1290, col: 10, offset: 30745}, + pos: position{line: 1290, col: 10, offset: 30759}, name: "HexDigit", }, }, @@ -8629,29 +8639,29 @@ var g = &grammar{ }, { name: "TypeLiteral", - pos: position{line: 1294, col: 1, offset: 30819}, + pos: position{line: 1294, col: 1, offset: 30833}, expr: &actionExpr{ - pos: position{line: 1295, col: 5, offset: 30835}, + pos: position{line: 1295, col: 5, offset: 30849}, run: (*parser).callonTypeLiteral1, expr: &seqExpr{ - pos: position{line: 1295, col: 5, offset: 30835}, + pos: position{line: 1295, col: 5, offset: 30849}, exprs: []any{ &litMatcher{ - pos: position{line: 1295, col: 5, offset: 30835}, + pos: position{line: 1295, col: 5, offset: 30849}, val: "<", ignoreCase: false, want: "\"<\"", }, &labeledExpr{ - pos: position{line: 1295, col: 9, offset: 30839}, + pos: position{line: 1295, col: 9, offset: 30853}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1295, col: 13, offset: 30843}, + pos: position{line: 1295, col: 13, offset: 30857}, name: "Type", }, }, &litMatcher{ - pos: position{line: 1295, col: 18, offset: 30848}, + pos: position{line: 1295, col: 18, offset: 30862}, val: ">", ignoreCase: false, want: "\">\"", @@ -8664,16 +8674,16 @@ var g = &grammar{ }, { name: "Type", - pos: position{line: 1303, col: 1, offset: 30981}, + pos: position{line: 1303, col: 1, offset: 30995}, expr: &choiceExpr{ - pos: position{line: 1304, col: 5, offset: 30990}, + pos: position{line: 1304, col: 5, offset: 31004}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1304, col: 5, offset: 30990}, + pos: position{line: 1304, col: 5, offset: 31004}, name: "AmbiguousType", }, &ruleRefExpr{ - pos: position{line: 1305, col: 5, offset: 31008}, + pos: position{line: 1305, col: 5, offset: 31022}, name: "ComplexType", }, }, @@ -8683,28 +8693,28 @@ var g = &grammar{ }, { name: "AmbiguousType", - pos: position{line: 1307, col: 1, offset: 31021}, + pos: position{line: 1307, col: 1, offset: 31035}, expr: &choiceExpr{ - pos: position{line: 1308, col: 5, offset: 31039}, + pos: position{line: 1308, col: 5, offset: 31053}, alternatives: []any{ &actionExpr{ - pos: position{line: 1308, col: 5, offset: 31039}, + pos: position{line: 1308, col: 5, offset: 31053}, run: (*parser).callonAmbiguousType2, expr: &seqExpr{ - pos: position{line: 1308, col: 5, offset: 31039}, + pos: position{line: 1308, col: 5, offset: 31053}, exprs: []any{ &labeledExpr{ - pos: position{line: 1308, col: 5, offset: 31039}, + pos: position{line: 1308, col: 5, offset: 31053}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1308, col: 10, offset: 31044}, + pos: position{line: 1308, col: 10, offset: 31058}, name: "PrimitiveType", }, }, ¬Expr{ - pos: position{line: 1308, col: 24, offset: 31058}, + pos: position{line: 1308, col: 24, offset: 31072}, expr: &ruleRefExpr{ - pos: position{line: 1308, col: 25, offset: 31059}, + pos: position{line: 1308, col: 25, offset: 31073}, name: "IdentifierRest", }, }, @@ -8712,43 +8722,43 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1309, col: 5, offset: 31099}, + pos: position{line: 1309, col: 5, offset: 31113}, run: (*parser).callonAmbiguousType8, expr: &seqExpr{ - pos: position{line: 1309, col: 5, offset: 31099}, + pos: position{line: 1309, col: 5, offset: 31113}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1309, col: 5, offset: 31099}, + pos: position{line: 1309, col: 5, offset: 31113}, name: "ERROR", }, &ruleRefExpr{ - pos: position{line: 1309, col: 11, offset: 31105}, + pos: position{line: 1309, col: 11, offset: 31119}, name: "__", }, &litMatcher{ - pos: position{line: 1309, col: 14, offset: 31108}, + pos: position{line: 1309, col: 14, offset: 31122}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1309, col: 18, offset: 31112}, + pos: position{line: 1309, col: 18, offset: 31126}, name: "__", }, &labeledExpr{ - pos: position{line: 1309, col: 21, offset: 31115}, + pos: position{line: 1309, col: 21, offset: 31129}, label: "t", expr: &ruleRefExpr{ - pos: position{line: 1309, col: 23, offset: 31117}, + pos: position{line: 1309, col: 23, offset: 31131}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1309, col: 28, offset: 31122}, + pos: position{line: 1309, col: 28, offset: 31136}, name: "__", }, &litMatcher{ - pos: position{line: 1309, col: 31, offset: 31125}, + pos: position{line: 1309, col: 31, offset: 31139}, val: ")", ignoreCase: false, want: "\")\"", @@ -8757,43 +8767,43 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1316, col: 5, offset: 31265}, + pos: position{line: 1316, col: 5, offset: 31279}, run: (*parser).callonAmbiguousType18, expr: &seqExpr{ - pos: position{line: 1316, col: 5, offset: 31265}, + pos: position{line: 1316, col: 5, offset: 31279}, exprs: []any{ &labeledExpr{ - pos: position{line: 1316, col: 5, offset: 31265}, + pos: position{line: 1316, col: 5, offset: 31279}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1316, col: 10, offset: 31270}, + pos: position{line: 1316, col: 10, offset: 31284}, name: "Name", }, }, &labeledExpr{ - pos: position{line: 1316, col: 15, offset: 31275}, + pos: position{line: 1316, col: 15, offset: 31289}, label: "opt", expr: &zeroOrOneExpr{ - pos: position{line: 1316, col: 19, offset: 31279}, + pos: position{line: 1316, col: 19, offset: 31293}, expr: &seqExpr{ - pos: position{line: 1316, col: 20, offset: 31280}, + pos: position{line: 1316, col: 20, offset: 31294}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1316, col: 20, offset: 31280}, + pos: position{line: 1316, col: 20, offset: 31294}, name: "__", }, &litMatcher{ - pos: position{line: 1316, col: 23, offset: 31283}, + pos: position{line: 1316, col: 23, offset: 31297}, val: "=", ignoreCase: false, want: "\"=\"", }, &ruleRefExpr{ - pos: position{line: 1316, col: 27, offset: 31287}, + pos: position{line: 1316, col: 27, offset: 31301}, name: "__", }, &ruleRefExpr{ - pos: position{line: 1316, col: 30, offset: 31290}, + pos: position{line: 1316, col: 30, offset: 31304}, name: "Type", }, }, @@ -8804,31 +8814,31 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1327, col: 5, offset: 31615}, + pos: position{line: 1327, col: 5, offset: 31629}, run: (*parser).callonAmbiguousType29, expr: &seqExpr{ - pos: position{line: 1327, col: 5, offset: 31615}, + pos: position{line: 1327, col: 5, offset: 31629}, exprs: []any{ &litMatcher{ - pos: position{line: 1327, col: 5, offset: 31615}, + pos: position{line: 1327, col: 5, offset: 31629}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1327, col: 9, offset: 31619}, + pos: position{line: 1327, col: 9, offset: 31633}, name: "__", }, &labeledExpr{ - pos: position{line: 1327, col: 12, offset: 31622}, + pos: position{line: 1327, col: 12, offset: 31636}, label: "types", expr: &ruleRefExpr{ - pos: position{line: 1327, col: 18, offset: 31628}, + pos: position{line: 1327, col: 18, offset: 31642}, name: "TypeList", }, }, &litMatcher{ - pos: position{line: 1327, col: 27, offset: 31637}, + pos: position{line: 1327, col: 27, offset: 31651}, val: ")", ignoreCase: false, want: "\")\"", @@ -8843,28 +8853,28 @@ var g = &grammar{ }, { name: "TypeList", - pos: position{line: 1335, col: 1, offset: 31781}, + pos: position{line: 1335, col: 1, offset: 31795}, expr: &actionExpr{ - pos: position{line: 1336, col: 5, offset: 31794}, + pos: position{line: 1336, col: 5, offset: 31808}, run: (*parser).callonTypeList1, expr: &seqExpr{ - pos: position{line: 1336, col: 5, offset: 31794}, + pos: position{line: 1336, col: 5, offset: 31808}, exprs: []any{ &labeledExpr{ - pos: position{line: 1336, col: 5, offset: 31794}, + pos: position{line: 1336, col: 5, offset: 31808}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1336, col: 11, offset: 31800}, + pos: position{line: 1336, col: 11, offset: 31814}, name: "Type", }, }, &labeledExpr{ - pos: position{line: 1336, col: 16, offset: 31805}, + pos: position{line: 1336, col: 16, offset: 31819}, label: "rest", expr: &oneOrMoreExpr{ - pos: position{line: 1336, col: 21, offset: 31810}, + pos: position{line: 1336, col: 21, offset: 31824}, expr: &ruleRefExpr{ - pos: position{line: 1336, col: 21, offset: 31810}, + pos: position{line: 1336, col: 21, offset: 31824}, name: "TypeListTail", }, }, @@ -8877,32 +8887,32 @@ var g = &grammar{ }, { name: "TypeListTail", - pos: position{line: 1340, col: 1, offset: 31868}, + pos: position{line: 1340, col: 1, offset: 31882}, expr: &actionExpr{ - pos: position{line: 1340, col: 16, offset: 31883}, + pos: position{line: 1340, col: 16, offset: 31897}, run: (*parser).callonTypeListTail1, expr: &seqExpr{ - pos: position{line: 1340, col: 16, offset: 31883}, + pos: position{line: 1340, col: 16, offset: 31897}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1340, col: 16, offset: 31883}, + pos: position{line: 1340, col: 16, offset: 31897}, name: "__", }, &litMatcher{ - pos: position{line: 1340, col: 19, offset: 31886}, + pos: position{line: 1340, col: 19, offset: 31900}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1340, col: 23, offset: 31890}, + pos: position{line: 1340, col: 23, offset: 31904}, name: "__", }, &labeledExpr{ - pos: position{line: 1340, col: 26, offset: 31893}, + pos: position{line: 1340, col: 26, offset: 31907}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1340, col: 30, offset: 31897}, + pos: position{line: 1340, col: 30, offset: 31911}, name: "Type", }, }, @@ -8914,40 +8924,40 @@ var g = &grammar{ }, { name: "ComplexType", - pos: position{line: 1342, col: 1, offset: 31923}, + pos: position{line: 1342, col: 1, offset: 31937}, expr: &choiceExpr{ - pos: position{line: 1343, col: 5, offset: 31939}, + pos: position{line: 1343, col: 5, offset: 31953}, alternatives: []any{ &actionExpr{ - pos: position{line: 1343, col: 5, offset: 31939}, + pos: position{line: 1343, col: 5, offset: 31953}, run: (*parser).callonComplexType2, expr: &seqExpr{ - pos: position{line: 1343, col: 5, offset: 31939}, + pos: position{line: 1343, col: 5, offset: 31953}, exprs: []any{ &litMatcher{ - pos: position{line: 1343, col: 5, offset: 31939}, + pos: position{line: 1343, col: 5, offset: 31953}, val: "{", ignoreCase: false, want: "\"{\"", }, &ruleRefExpr{ - pos: position{line: 1343, col: 9, offset: 31943}, + pos: position{line: 1343, col: 9, offset: 31957}, name: "__", }, &labeledExpr{ - pos: position{line: 1343, col: 12, offset: 31946}, + pos: position{line: 1343, col: 12, offset: 31960}, label: "fields", expr: &ruleRefExpr{ - pos: position{line: 1343, col: 19, offset: 31953}, + pos: position{line: 1343, col: 19, offset: 31967}, name: "TypeFieldList", }, }, &ruleRefExpr{ - pos: position{line: 1343, col: 33, offset: 31967}, + pos: position{line: 1343, col: 33, offset: 31981}, name: "__", }, &litMatcher{ - pos: position{line: 1343, col: 36, offset: 31970}, + pos: position{line: 1343, col: 36, offset: 31984}, val: "}", ignoreCase: false, want: "\"}\"", @@ -8956,35 +8966,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1350, col: 5, offset: 32132}, + pos: position{line: 1350, col: 5, offset: 32146}, run: (*parser).callonComplexType10, expr: &seqExpr{ - pos: position{line: 1350, col: 5, offset: 32132}, + pos: position{line: 1350, col: 5, offset: 32146}, exprs: []any{ &litMatcher{ - pos: position{line: 1350, col: 5, offset: 32132}, + pos: position{line: 1350, col: 5, offset: 32146}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 1350, col: 9, offset: 32136}, + pos: position{line: 1350, col: 9, offset: 32150}, name: "__", }, &labeledExpr{ - pos: position{line: 1350, col: 12, offset: 32139}, + pos: position{line: 1350, col: 12, offset: 32153}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1350, col: 16, offset: 32143}, + pos: position{line: 1350, col: 16, offset: 32157}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1350, col: 21, offset: 32148}, + pos: position{line: 1350, col: 21, offset: 32162}, name: "__", }, &litMatcher{ - pos: position{line: 1350, col: 24, offset: 32151}, + pos: position{line: 1350, col: 24, offset: 32165}, val: "]", ignoreCase: false, want: "\"]\"", @@ -8993,35 +9003,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1357, col: 5, offset: 32293}, + pos: position{line: 1357, col: 5, offset: 32307}, run: (*parser).callonComplexType18, expr: &seqExpr{ - pos: position{line: 1357, col: 5, offset: 32293}, + pos: position{line: 1357, col: 5, offset: 32307}, exprs: []any{ &litMatcher{ - pos: position{line: 1357, col: 5, offset: 32293}, + pos: position{line: 1357, col: 5, offset: 32307}, val: "|[", ignoreCase: false, want: "\"|[\"", }, &ruleRefExpr{ - pos: position{line: 1357, col: 10, offset: 32298}, + pos: position{line: 1357, col: 10, offset: 32312}, name: "__", }, &labeledExpr{ - pos: position{line: 1357, col: 13, offset: 32301}, + pos: position{line: 1357, col: 13, offset: 32315}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1357, col: 17, offset: 32305}, + pos: position{line: 1357, col: 17, offset: 32319}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1357, col: 22, offset: 32310}, + pos: position{line: 1357, col: 22, offset: 32324}, name: "__", }, &litMatcher{ - pos: position{line: 1357, col: 25, offset: 32313}, + pos: position{line: 1357, col: 25, offset: 32327}, val: "]|", ignoreCase: false, want: "\"]|\"", @@ -9030,57 +9040,57 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1364, col: 5, offset: 32452}, + pos: position{line: 1364, col: 5, offset: 32466}, run: (*parser).callonComplexType26, expr: &seqExpr{ - pos: position{line: 1364, col: 5, offset: 32452}, + pos: position{line: 1364, col: 5, offset: 32466}, exprs: []any{ &litMatcher{ - pos: position{line: 1364, col: 5, offset: 32452}, + pos: position{line: 1364, col: 5, offset: 32466}, val: "|{", ignoreCase: false, want: "\"|{\"", }, &ruleRefExpr{ - pos: position{line: 1364, col: 10, offset: 32457}, + pos: position{line: 1364, col: 10, offset: 32471}, name: "__", }, &labeledExpr{ - pos: position{line: 1364, col: 13, offset: 32460}, + pos: position{line: 1364, col: 13, offset: 32474}, label: "keyType", expr: &ruleRefExpr{ - pos: position{line: 1364, col: 21, offset: 32468}, + pos: position{line: 1364, col: 21, offset: 32482}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1364, col: 26, offset: 32473}, + pos: position{line: 1364, col: 26, offset: 32487}, name: "__", }, &litMatcher{ - pos: position{line: 1364, col: 29, offset: 32476}, + pos: position{line: 1364, col: 29, offset: 32490}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1364, col: 33, offset: 32480}, + pos: position{line: 1364, col: 33, offset: 32494}, name: "__", }, &labeledExpr{ - pos: position{line: 1364, col: 36, offset: 32483}, + pos: position{line: 1364, col: 36, offset: 32497}, label: "valType", expr: &ruleRefExpr{ - pos: position{line: 1364, col: 44, offset: 32491}, + pos: position{line: 1364, col: 44, offset: 32505}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1364, col: 49, offset: 32496}, + pos: position{line: 1364, col: 49, offset: 32510}, name: "__", }, &litMatcher{ - pos: position{line: 1364, col: 52, offset: 32499}, + pos: position{line: 1364, col: 52, offset: 32513}, val: "}|", ignoreCase: false, want: "\"}|\"", @@ -9095,35 +9105,35 @@ var g = &grammar{ }, { name: "StringLiteral", - pos: position{line: 1373, col: 1, offset: 32673}, + pos: position{line: 1373, col: 1, offset: 32687}, expr: &choiceExpr{ - pos: position{line: 1374, col: 5, offset: 32691}, + pos: position{line: 1374, col: 5, offset: 32705}, alternatives: []any{ &actionExpr{ - pos: position{line: 1374, col: 5, offset: 32691}, + pos: position{line: 1374, col: 5, offset: 32705}, run: (*parser).callonStringLiteral2, expr: &seqExpr{ - pos: position{line: 1374, col: 5, offset: 32691}, + pos: position{line: 1374, col: 5, offset: 32705}, exprs: []any{ &litMatcher{ - pos: position{line: 1374, col: 5, offset: 32691}, + pos: position{line: 1374, col: 5, offset: 32705}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, &labeledExpr{ - pos: position{line: 1374, col: 9, offset: 32695}, + pos: position{line: 1374, col: 9, offset: 32709}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1374, col: 11, offset: 32697}, + pos: position{line: 1374, col: 11, offset: 32711}, expr: &ruleRefExpr{ - pos: position{line: 1374, col: 11, offset: 32697}, + pos: position{line: 1374, col: 11, offset: 32711}, name: "DoubleQuotedChar", }, }, }, &litMatcher{ - pos: position{line: 1374, col: 29, offset: 32715}, + pos: position{line: 1374, col: 29, offset: 32729}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -9132,30 +9142,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1375, col: 5, offset: 32779}, + pos: position{line: 1375, col: 5, offset: 32793}, run: (*parser).callonStringLiteral9, expr: &seqExpr{ - pos: position{line: 1375, col: 5, offset: 32779}, + pos: position{line: 1375, col: 5, offset: 32793}, exprs: []any{ &litMatcher{ - pos: position{line: 1375, col: 5, offset: 32779}, + pos: position{line: 1375, col: 5, offset: 32793}, val: "'", ignoreCase: false, want: "\"'\"", }, &labeledExpr{ - pos: position{line: 1375, col: 9, offset: 32783}, + pos: position{line: 1375, col: 9, offset: 32797}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1375, col: 11, offset: 32785}, + pos: position{line: 1375, col: 11, offset: 32799}, expr: &ruleRefExpr{ - pos: position{line: 1375, col: 11, offset: 32785}, + pos: position{line: 1375, col: 11, offset: 32799}, name: "SingleQuotedChar", }, }, }, &litMatcher{ - pos: position{line: 1375, col: 29, offset: 32803}, + pos: position{line: 1375, col: 29, offset: 32817}, val: "'", ignoreCase: false, want: "\"'\"", @@ -9170,35 +9180,35 @@ var g = &grammar{ }, { name: "FString", - pos: position{line: 1377, col: 1, offset: 32864}, + pos: position{line: 1377, col: 1, offset: 32878}, expr: &choiceExpr{ - pos: position{line: 1378, col: 5, offset: 32876}, + pos: position{line: 1378, col: 5, offset: 32890}, alternatives: []any{ &actionExpr{ - pos: position{line: 1378, col: 5, offset: 32876}, + pos: position{line: 1378, col: 5, offset: 32890}, run: (*parser).callonFString2, expr: &seqExpr{ - pos: position{line: 1378, col: 5, offset: 32876}, + pos: position{line: 1378, col: 5, offset: 32890}, exprs: []any{ &litMatcher{ - pos: position{line: 1378, col: 5, offset: 32876}, + pos: position{line: 1378, col: 5, offset: 32890}, val: "f\"", ignoreCase: false, want: "\"f\\\"\"", }, &labeledExpr{ - pos: position{line: 1378, col: 11, offset: 32882}, + pos: position{line: 1378, col: 11, offset: 32896}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1378, col: 13, offset: 32884}, + pos: position{line: 1378, col: 13, offset: 32898}, expr: &ruleRefExpr{ - pos: position{line: 1378, col: 13, offset: 32884}, + pos: position{line: 1378, col: 13, offset: 32898}, name: "FStringDoubleQuotedElem", }, }, }, &litMatcher{ - pos: position{line: 1378, col: 38, offset: 32909}, + pos: position{line: 1378, col: 38, offset: 32923}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -9207,30 +9217,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1385, col: 5, offset: 33055}, + pos: position{line: 1385, col: 5, offset: 33069}, run: (*parser).callonFString9, expr: &seqExpr{ - pos: position{line: 1385, col: 5, offset: 33055}, + pos: position{line: 1385, col: 5, offset: 33069}, exprs: []any{ &litMatcher{ - pos: position{line: 1385, col: 5, offset: 33055}, + pos: position{line: 1385, col: 5, offset: 33069}, val: "f'", ignoreCase: false, want: "\"f'\"", }, &labeledExpr{ - pos: position{line: 1385, col: 10, offset: 33060}, + pos: position{line: 1385, col: 10, offset: 33074}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1385, col: 12, offset: 33062}, + pos: position{line: 1385, col: 12, offset: 33076}, expr: &ruleRefExpr{ - pos: position{line: 1385, col: 12, offset: 33062}, + pos: position{line: 1385, col: 12, offset: 33076}, name: "FStringSingleQuotedElem", }, }, }, &litMatcher{ - pos: position{line: 1385, col: 37, offset: 33087}, + pos: position{line: 1385, col: 37, offset: 33101}, val: "'", ignoreCase: false, want: "\"'\"", @@ -9245,24 +9255,24 @@ var g = &grammar{ }, { name: "FStringDoubleQuotedElem", - pos: position{line: 1393, col: 1, offset: 33230}, + pos: position{line: 1393, col: 1, offset: 33244}, expr: &choiceExpr{ - pos: position{line: 1394, col: 5, offset: 33258}, + pos: position{line: 1394, col: 5, offset: 33272}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1394, col: 5, offset: 33258}, + pos: position{line: 1394, col: 5, offset: 33272}, name: "FStringExpr", }, &actionExpr{ - pos: position{line: 1395, col: 5, offset: 33274}, + pos: position{line: 1395, col: 5, offset: 33288}, run: (*parser).callonFStringDoubleQuotedElem3, expr: &labeledExpr{ - pos: position{line: 1395, col: 5, offset: 33274}, + pos: position{line: 1395, col: 5, offset: 33288}, label: "v", expr: &oneOrMoreExpr{ - pos: position{line: 1395, col: 7, offset: 33276}, + pos: position{line: 1395, col: 7, offset: 33290}, expr: &ruleRefExpr{ - pos: position{line: 1395, col: 7, offset: 33276}, + pos: position{line: 1395, col: 7, offset: 33290}, name: "FStringDoubleQuotedChar", }, }, @@ -9275,27 +9285,27 @@ var g = &grammar{ }, { name: "FStringDoubleQuotedChar", - pos: position{line: 1399, col: 1, offset: 33399}, + pos: position{line: 1399, col: 1, offset: 33413}, expr: &choiceExpr{ - pos: position{line: 1400, col: 5, offset: 33427}, + pos: position{line: 1400, col: 5, offset: 33441}, alternatives: []any{ &actionExpr{ - pos: position{line: 1400, col: 5, offset: 33427}, + pos: position{line: 1400, col: 5, offset: 33441}, run: (*parser).callonFStringDoubleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1400, col: 5, offset: 33427}, + pos: position{line: 1400, col: 5, offset: 33441}, exprs: []any{ &litMatcher{ - pos: position{line: 1400, col: 5, offset: 33427}, + pos: position{line: 1400, col: 5, offset: 33441}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1400, col: 10, offset: 33432}, + pos: position{line: 1400, col: 10, offset: 33446}, label: "v", expr: &litMatcher{ - pos: position{line: 1400, col: 12, offset: 33434}, + pos: position{line: 1400, col: 12, offset: 33448}, val: "{", ignoreCase: false, want: "\"{\"", @@ -9305,25 +9315,25 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1401, col: 5, offset: 33460}, + pos: position{line: 1401, col: 5, offset: 33474}, run: (*parser).callonFStringDoubleQuotedChar7, expr: &seqExpr{ - pos: position{line: 1401, col: 5, offset: 33460}, + pos: position{line: 1401, col: 5, offset: 33474}, exprs: []any{ ¬Expr{ - pos: position{line: 1401, col: 5, offset: 33460}, + pos: position{line: 1401, col: 5, offset: 33474}, expr: &litMatcher{ - pos: position{line: 1401, col: 7, offset: 33462}, + pos: position{line: 1401, col: 7, offset: 33476}, val: "{", ignoreCase: false, want: "\"{\"", }, }, &labeledExpr{ - pos: position{line: 1401, col: 12, offset: 33467}, + pos: position{line: 1401, col: 12, offset: 33481}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1401, col: 14, offset: 33469}, + pos: position{line: 1401, col: 14, offset: 33483}, name: "DoubleQuotedChar", }, }, @@ -9337,24 +9347,24 @@ var g = &grammar{ }, { name: "FStringSingleQuotedElem", - pos: position{line: 1403, col: 1, offset: 33505}, + pos: position{line: 1403, col: 1, offset: 33519}, expr: &choiceExpr{ - pos: position{line: 1404, col: 5, offset: 33533}, + pos: position{line: 1404, col: 5, offset: 33547}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1404, col: 5, offset: 33533}, + pos: position{line: 1404, col: 5, offset: 33547}, name: "FStringExpr", }, &actionExpr{ - pos: position{line: 1405, col: 5, offset: 33549}, + pos: position{line: 1405, col: 5, offset: 33563}, run: (*parser).callonFStringSingleQuotedElem3, expr: &labeledExpr{ - pos: position{line: 1405, col: 5, offset: 33549}, + pos: position{line: 1405, col: 5, offset: 33563}, label: "v", expr: &oneOrMoreExpr{ - pos: position{line: 1405, col: 7, offset: 33551}, + pos: position{line: 1405, col: 7, offset: 33565}, expr: &ruleRefExpr{ - pos: position{line: 1405, col: 7, offset: 33551}, + pos: position{line: 1405, col: 7, offset: 33565}, name: "FStringSingleQuotedChar", }, }, @@ -9367,27 +9377,27 @@ var g = &grammar{ }, { name: "FStringSingleQuotedChar", - pos: position{line: 1409, col: 1, offset: 33674}, + pos: position{line: 1409, col: 1, offset: 33688}, expr: &choiceExpr{ - pos: position{line: 1410, col: 5, offset: 33702}, + pos: position{line: 1410, col: 5, offset: 33716}, alternatives: []any{ &actionExpr{ - pos: position{line: 1410, col: 5, offset: 33702}, + pos: position{line: 1410, col: 5, offset: 33716}, run: (*parser).callonFStringSingleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1410, col: 5, offset: 33702}, + pos: position{line: 1410, col: 5, offset: 33716}, exprs: []any{ &litMatcher{ - pos: position{line: 1410, col: 5, offset: 33702}, + pos: position{line: 1410, col: 5, offset: 33716}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1410, col: 10, offset: 33707}, + pos: position{line: 1410, col: 10, offset: 33721}, label: "v", expr: &litMatcher{ - pos: position{line: 1410, col: 12, offset: 33709}, + pos: position{line: 1410, col: 12, offset: 33723}, val: "{", ignoreCase: false, want: "\"{\"", @@ -9397,25 +9407,25 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1411, col: 5, offset: 33735}, + pos: position{line: 1411, col: 5, offset: 33749}, run: (*parser).callonFStringSingleQuotedChar7, expr: &seqExpr{ - pos: position{line: 1411, col: 5, offset: 33735}, + pos: position{line: 1411, col: 5, offset: 33749}, exprs: []any{ ¬Expr{ - pos: position{line: 1411, col: 5, offset: 33735}, + pos: position{line: 1411, col: 5, offset: 33749}, expr: &litMatcher{ - pos: position{line: 1411, col: 7, offset: 33737}, + pos: position{line: 1411, col: 7, offset: 33751}, val: "{", ignoreCase: false, want: "\"{\"", }, }, &labeledExpr{ - pos: position{line: 1411, col: 12, offset: 33742}, + pos: position{line: 1411, col: 12, offset: 33756}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1411, col: 14, offset: 33744}, + pos: position{line: 1411, col: 14, offset: 33758}, name: "SingleQuotedChar", }, }, @@ -9429,37 +9439,37 @@ var g = &grammar{ }, { name: "FStringExpr", - pos: position{line: 1413, col: 1, offset: 33780}, + pos: position{line: 1413, col: 1, offset: 33794}, expr: &actionExpr{ - pos: position{line: 1414, col: 5, offset: 33796}, + pos: position{line: 1414, col: 5, offset: 33810}, run: (*parser).callonFStringExpr1, expr: &seqExpr{ - pos: position{line: 1414, col: 5, offset: 33796}, + pos: position{line: 1414, col: 5, offset: 33810}, exprs: []any{ &litMatcher{ - pos: position{line: 1414, col: 5, offset: 33796}, + pos: position{line: 1414, col: 5, offset: 33810}, val: "{", ignoreCase: false, want: "\"{\"", }, &ruleRefExpr{ - pos: position{line: 1414, col: 9, offset: 33800}, + pos: position{line: 1414, col: 9, offset: 33814}, name: "__", }, &labeledExpr{ - pos: position{line: 1414, col: 12, offset: 33803}, + pos: position{line: 1414, col: 12, offset: 33817}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1414, col: 14, offset: 33805}, + pos: position{line: 1414, col: 14, offset: 33819}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1414, col: 19, offset: 33810}, + pos: position{line: 1414, col: 19, offset: 33824}, name: "__", }, &litMatcher{ - pos: position{line: 1414, col: 22, offset: 33813}, + pos: position{line: 1414, col: 22, offset: 33827}, val: "}", ignoreCase: false, want: "\"}\"", @@ -9472,129 +9482,129 @@ var g = &grammar{ }, { name: "PrimitiveType", - pos: position{line: 1422, col: 1, offset: 33948}, + pos: position{line: 1422, col: 1, offset: 33962}, expr: &actionExpr{ - pos: position{line: 1423, col: 5, offset: 33966}, + pos: position{line: 1423, col: 5, offset: 33980}, run: (*parser).callonPrimitiveType1, expr: &choiceExpr{ - pos: position{line: 1423, col: 9, offset: 33970}, + pos: position{line: 1423, col: 9, offset: 33984}, alternatives: []any{ &litMatcher{ - pos: position{line: 1423, col: 9, offset: 33970}, + pos: position{line: 1423, col: 9, offset: 33984}, val: "uint8", ignoreCase: false, want: "\"uint8\"", }, &litMatcher{ - pos: position{line: 1423, col: 19, offset: 33980}, + pos: position{line: 1423, col: 19, offset: 33994}, val: "uint16", ignoreCase: false, want: "\"uint16\"", }, &litMatcher{ - pos: position{line: 1423, col: 30, offset: 33991}, + pos: position{line: 1423, col: 30, offset: 34005}, val: "uint32", ignoreCase: false, want: "\"uint32\"", }, &litMatcher{ - pos: position{line: 1423, col: 41, offset: 34002}, + pos: position{line: 1423, col: 41, offset: 34016}, val: "uint64", ignoreCase: false, want: "\"uint64\"", }, &litMatcher{ - pos: position{line: 1424, col: 9, offset: 34019}, + pos: position{line: 1424, col: 9, offset: 34033}, val: "int8", ignoreCase: false, want: "\"int8\"", }, &litMatcher{ - pos: position{line: 1424, col: 18, offset: 34028}, + pos: position{line: 1424, col: 18, offset: 34042}, val: "int16", ignoreCase: false, want: "\"int16\"", }, &litMatcher{ - pos: position{line: 1424, col: 28, offset: 34038}, + pos: position{line: 1424, col: 28, offset: 34052}, val: "int32", ignoreCase: false, want: "\"int32\"", }, &litMatcher{ - pos: position{line: 1424, col: 38, offset: 34048}, + pos: position{line: 1424, col: 38, offset: 34062}, val: "int64", ignoreCase: false, want: "\"int64\"", }, &litMatcher{ - pos: position{line: 1425, col: 9, offset: 34064}, + pos: position{line: 1425, col: 9, offset: 34078}, val: "float16", ignoreCase: false, want: "\"float16\"", }, &litMatcher{ - pos: position{line: 1425, col: 21, offset: 34076}, + pos: position{line: 1425, col: 21, offset: 34090}, val: "float32", ignoreCase: false, want: "\"float32\"", }, &litMatcher{ - pos: position{line: 1425, col: 33, offset: 34088}, + pos: position{line: 1425, col: 33, offset: 34102}, val: "float64", ignoreCase: false, want: "\"float64\"", }, &litMatcher{ - pos: position{line: 1426, col: 9, offset: 34106}, + pos: position{line: 1426, col: 9, offset: 34120}, val: "bool", ignoreCase: false, want: "\"bool\"", }, &litMatcher{ - pos: position{line: 1426, col: 18, offset: 34115}, + pos: position{line: 1426, col: 18, offset: 34129}, val: "string", ignoreCase: false, want: "\"string\"", }, &litMatcher{ - pos: position{line: 1427, col: 9, offset: 34132}, + pos: position{line: 1427, col: 9, offset: 34146}, val: "duration", ignoreCase: false, want: "\"duration\"", }, &litMatcher{ - pos: position{line: 1427, col: 22, offset: 34145}, + pos: position{line: 1427, col: 22, offset: 34159}, val: "time", ignoreCase: false, want: "\"time\"", }, &litMatcher{ - pos: position{line: 1428, col: 9, offset: 34160}, + pos: position{line: 1428, col: 9, offset: 34174}, val: "bytes", ignoreCase: false, want: "\"bytes\"", }, &litMatcher{ - pos: position{line: 1429, col: 9, offset: 34176}, + pos: position{line: 1429, col: 9, offset: 34190}, val: "ip", ignoreCase: false, want: "\"ip\"", }, &litMatcher{ - pos: position{line: 1429, col: 16, offset: 34183}, + pos: position{line: 1429, col: 16, offset: 34197}, val: "net", ignoreCase: false, want: "\"net\"", }, &litMatcher{ - pos: position{line: 1430, col: 9, offset: 34197}, + pos: position{line: 1430, col: 9, offset: 34211}, val: "type", ignoreCase: false, want: "\"type\"", }, &litMatcher{ - pos: position{line: 1430, col: 18, offset: 34206}, + pos: position{line: 1430, col: 18, offset: 34220}, val: "null", ignoreCase: false, want: "\"null\"", @@ -9607,31 +9617,31 @@ var g = &grammar{ }, { name: "TypeFieldList", - pos: position{line: 1438, col: 1, offset: 34391}, + pos: position{line: 1438, col: 1, offset: 34405}, expr: &choiceExpr{ - pos: position{line: 1439, col: 5, offset: 34409}, + pos: position{line: 1439, col: 5, offset: 34423}, alternatives: []any{ &actionExpr{ - pos: position{line: 1439, col: 5, offset: 34409}, + pos: position{line: 1439, col: 5, offset: 34423}, run: (*parser).callonTypeFieldList2, expr: &seqExpr{ - pos: position{line: 1439, col: 5, offset: 34409}, + pos: position{line: 1439, col: 5, offset: 34423}, exprs: []any{ &labeledExpr{ - pos: position{line: 1439, col: 5, offset: 34409}, + pos: position{line: 1439, col: 5, offset: 34423}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1439, col: 11, offset: 34415}, + pos: position{line: 1439, col: 11, offset: 34429}, name: "TypeField", }, }, &labeledExpr{ - pos: position{line: 1439, col: 21, offset: 34425}, + pos: position{line: 1439, col: 21, offset: 34439}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1439, col: 26, offset: 34430}, + pos: position{line: 1439, col: 26, offset: 34444}, expr: &ruleRefExpr{ - pos: position{line: 1439, col: 26, offset: 34430}, + pos: position{line: 1439, col: 26, offset: 34444}, name: "TypeFieldListTail", }, }, @@ -9640,10 +9650,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1442, col: 5, offset: 34496}, + pos: position{line: 1442, col: 5, offset: 34510}, run: (*parser).callonTypeFieldList9, expr: &litMatcher{ - pos: position{line: 1442, col: 5, offset: 34496}, + pos: position{line: 1442, col: 5, offset: 34510}, val: "", ignoreCase: false, want: "\"\"", @@ -9656,32 +9666,32 @@ var g = &grammar{ }, { name: "TypeFieldListTail", - pos: position{line: 1444, col: 1, offset: 34520}, + pos: position{line: 1444, col: 1, offset: 34534}, expr: &actionExpr{ - pos: position{line: 1444, col: 21, offset: 34540}, + pos: position{line: 1444, col: 21, offset: 34554}, run: (*parser).callonTypeFieldListTail1, expr: &seqExpr{ - pos: position{line: 1444, col: 21, offset: 34540}, + pos: position{line: 1444, col: 21, offset: 34554}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1444, col: 21, offset: 34540}, + pos: position{line: 1444, col: 21, offset: 34554}, name: "__", }, &litMatcher{ - pos: position{line: 1444, col: 24, offset: 34543}, + pos: position{line: 1444, col: 24, offset: 34557}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1444, col: 28, offset: 34547}, + pos: position{line: 1444, col: 28, offset: 34561}, name: "__", }, &labeledExpr{ - pos: position{line: 1444, col: 31, offset: 34550}, + pos: position{line: 1444, col: 31, offset: 34564}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1444, col: 35, offset: 34554}, + pos: position{line: 1444, col: 35, offset: 34568}, name: "TypeField", }, }, @@ -9693,40 +9703,40 @@ var g = &grammar{ }, { name: "TypeField", - pos: position{line: 1446, col: 1, offset: 34585}, + pos: position{line: 1446, col: 1, offset: 34599}, expr: &actionExpr{ - pos: position{line: 1447, col: 5, offset: 34599}, + pos: position{line: 1447, col: 5, offset: 34613}, run: (*parser).callonTypeField1, expr: &seqExpr{ - pos: position{line: 1447, col: 5, offset: 34599}, + pos: position{line: 1447, col: 5, offset: 34613}, exprs: []any{ &labeledExpr{ - pos: position{line: 1447, col: 5, offset: 34599}, + pos: position{line: 1447, col: 5, offset: 34613}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1447, col: 10, offset: 34604}, + pos: position{line: 1447, col: 10, offset: 34618}, name: "Name", }, }, &ruleRefExpr{ - pos: position{line: 1447, col: 15, offset: 34609}, + pos: position{line: 1447, col: 15, offset: 34623}, name: "__", }, &litMatcher{ - pos: position{line: 1447, col: 18, offset: 34612}, + pos: position{line: 1447, col: 18, offset: 34626}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1447, col: 22, offset: 34616}, + pos: position{line: 1447, col: 22, offset: 34630}, name: "__", }, &labeledExpr{ - pos: position{line: 1447, col: 25, offset: 34619}, + pos: position{line: 1447, col: 25, offset: 34633}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1447, col: 29, offset: 34623}, + pos: position{line: 1447, col: 29, offset: 34637}, name: "Type", }, }, @@ -9738,54 +9748,54 @@ var g = &grammar{ }, { name: "Name", - pos: position{line: 1455, col: 1, offset: 34772}, + pos: position{line: 1455, col: 1, offset: 34786}, expr: &choiceExpr{ - pos: position{line: 1456, col: 5, offset: 34781}, + pos: position{line: 1456, col: 5, offset: 34795}, alternatives: []any{ &actionExpr{ - pos: position{line: 1456, col: 5, offset: 34781}, + pos: position{line: 1456, col: 5, offset: 34795}, run: (*parser).callonName2, expr: &labeledExpr{ - pos: position{line: 1456, col: 5, offset: 34781}, + pos: position{line: 1456, col: 5, offset: 34795}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1456, col: 7, offset: 34783}, + pos: position{line: 1456, col: 7, offset: 34797}, name: "DottedIDs", }, }, }, &actionExpr{ - pos: position{line: 1457, col: 5, offset: 34872}, + pos: position{line: 1457, col: 5, offset: 34886}, run: (*parser).callonName5, expr: &labeledExpr{ - pos: position{line: 1457, col: 5, offset: 34872}, + pos: position{line: 1457, col: 5, offset: 34886}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1457, col: 7, offset: 34874}, + pos: position{line: 1457, col: 7, offset: 34888}, name: "IdentifierName", }, }, }, &actionExpr{ - pos: position{line: 1458, col: 5, offset: 34963}, + pos: position{line: 1458, col: 5, offset: 34977}, run: (*parser).callonName8, expr: &labeledExpr{ - pos: position{line: 1458, col: 5, offset: 34963}, + pos: position{line: 1458, col: 5, offset: 34977}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1458, col: 7, offset: 34965}, + pos: position{line: 1458, col: 7, offset: 34979}, name: "QuotedString", }, }, }, &actionExpr{ - pos: position{line: 1459, col: 5, offset: 35054}, + pos: position{line: 1459, col: 5, offset: 35068}, run: (*parser).callonName11, expr: &labeledExpr{ - pos: position{line: 1459, col: 5, offset: 35054}, + pos: position{line: 1459, col: 5, offset: 35068}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1459, col: 7, offset: 35056}, + pos: position{line: 1459, col: 7, offset: 35070}, name: "KSUID", }, }, @@ -9797,22 +9807,22 @@ var g = &grammar{ }, { name: "DottedIDs", - pos: position{line: 1461, col: 1, offset: 35142}, + pos: position{line: 1461, col: 1, offset: 35156}, expr: &actionExpr{ - pos: position{line: 1462, col: 5, offset: 35156}, + pos: position{line: 1462, col: 5, offset: 35170}, run: (*parser).callonDottedIDs1, expr: &seqExpr{ - pos: position{line: 1462, col: 5, offset: 35156}, + pos: position{line: 1462, col: 5, offset: 35170}, exprs: []any{ &choiceExpr{ - pos: position{line: 1462, col: 6, offset: 35157}, + pos: position{line: 1462, col: 6, offset: 35171}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1462, col: 6, offset: 35157}, + pos: position{line: 1462, col: 6, offset: 35171}, name: "IdentifierStart", }, &litMatcher{ - pos: position{line: 1462, col: 24, offset: 35175}, + pos: position{line: 1462, col: 24, offset: 35189}, val: ".", ignoreCase: false, want: "\".\"", @@ -9820,16 +9830,16 @@ var g = &grammar{ }, }, &zeroOrMoreExpr{ - pos: position{line: 1462, col: 29, offset: 35180}, + pos: position{line: 1462, col: 29, offset: 35194}, expr: &choiceExpr{ - pos: position{line: 1462, col: 30, offset: 35181}, + pos: position{line: 1462, col: 30, offset: 35195}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1462, col: 30, offset: 35181}, + pos: position{line: 1462, col: 30, offset: 35195}, name: "IdentifierRest", }, &litMatcher{ - pos: position{line: 1462, col: 47, offset: 35198}, + pos: position{line: 1462, col: 47, offset: 35212}, val: ".", ignoreCase: false, want: "\".\"", @@ -9845,15 +9855,15 @@ var g = &grammar{ }, { name: "Identifier", - pos: position{line: 1464, col: 1, offset: 35236}, + pos: position{line: 1464, col: 1, offset: 35250}, expr: &actionExpr{ - pos: position{line: 1465, col: 5, offset: 35251}, + pos: position{line: 1465, col: 5, offset: 35265}, run: (*parser).callonIdentifier1, expr: &labeledExpr{ - pos: position{line: 1465, col: 5, offset: 35251}, + pos: position{line: 1465, col: 5, offset: 35265}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 1465, col: 8, offset: 35254}, + pos: position{line: 1465, col: 8, offset: 35268}, name: "IdentifierName", }, }, @@ -9863,51 +9873,51 @@ var g = &grammar{ }, { name: "Identifiers", - pos: position{line: 1473, col: 1, offset: 35387}, + pos: position{line: 1473, col: 1, offset: 35401}, expr: &actionExpr{ - pos: position{line: 1474, col: 5, offset: 35403}, + pos: position{line: 1474, col: 5, offset: 35417}, run: (*parser).callonIdentifiers1, expr: &seqExpr{ - pos: position{line: 1474, col: 5, offset: 35403}, + pos: position{line: 1474, col: 5, offset: 35417}, exprs: []any{ &labeledExpr{ - pos: position{line: 1474, col: 5, offset: 35403}, + pos: position{line: 1474, col: 5, offset: 35417}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1474, col: 11, offset: 35409}, + pos: position{line: 1474, col: 11, offset: 35423}, name: "Identifier", }, }, &labeledExpr{ - pos: position{line: 1474, col: 22, offset: 35420}, + pos: position{line: 1474, col: 22, offset: 35434}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1474, col: 27, offset: 35425}, + pos: position{line: 1474, col: 27, offset: 35439}, expr: &actionExpr{ - pos: position{line: 1474, col: 28, offset: 35426}, + pos: position{line: 1474, col: 28, offset: 35440}, run: (*parser).callonIdentifiers7, expr: &seqExpr{ - pos: position{line: 1474, col: 28, offset: 35426}, + pos: position{line: 1474, col: 28, offset: 35440}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1474, col: 28, offset: 35426}, + pos: position{line: 1474, col: 28, offset: 35440}, name: "__", }, &litMatcher{ - pos: position{line: 1474, col: 31, offset: 35429}, + pos: position{line: 1474, col: 31, offset: 35443}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1474, col: 35, offset: 35433}, + pos: position{line: 1474, col: 35, offset: 35447}, name: "__", }, &labeledExpr{ - pos: position{line: 1474, col: 38, offset: 35436}, + pos: position{line: 1474, col: 38, offset: 35450}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1474, col: 43, offset: 35441}, + pos: position{line: 1474, col: 43, offset: 35455}, name: "Identifier", }, }, @@ -9924,29 +9934,29 @@ var g = &grammar{ }, { name: "IdentifierName", - pos: position{line: 1478, col: 1, offset: 35519}, + pos: position{line: 1478, col: 1, offset: 35533}, expr: &choiceExpr{ - pos: position{line: 1479, col: 5, offset: 35538}, + pos: position{line: 1479, col: 5, offset: 35552}, alternatives: []any{ &actionExpr{ - pos: position{line: 1479, col: 5, offset: 35538}, + pos: position{line: 1479, col: 5, offset: 35552}, run: (*parser).callonIdentifierName2, expr: &seqExpr{ - pos: position{line: 1479, col: 5, offset: 35538}, + pos: position{line: 1479, col: 5, offset: 35552}, exprs: []any{ ¬Expr{ - pos: position{line: 1479, col: 5, offset: 35538}, + pos: position{line: 1479, col: 5, offset: 35552}, expr: &seqExpr{ - pos: position{line: 1479, col: 7, offset: 35540}, + pos: position{line: 1479, col: 7, offset: 35554}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1479, col: 7, offset: 35540}, + pos: position{line: 1479, col: 7, offset: 35554}, name: "IDGuard", }, ¬Expr{ - pos: position{line: 1479, col: 15, offset: 35548}, + pos: position{line: 1479, col: 15, offset: 35562}, expr: &ruleRefExpr{ - pos: position{line: 1479, col: 16, offset: 35549}, + pos: position{line: 1479, col: 16, offset: 35563}, name: "IdentifierRest", }, }, @@ -9954,13 +9964,13 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1479, col: 32, offset: 35565}, + pos: position{line: 1479, col: 32, offset: 35579}, name: "IdentifierStart", }, &zeroOrMoreExpr{ - pos: position{line: 1479, col: 48, offset: 35581}, + pos: position{line: 1479, col: 48, offset: 35595}, expr: &ruleRefExpr{ - pos: position{line: 1479, col: 48, offset: 35581}, + pos: position{line: 1479, col: 48, offset: 35595}, name: "IdentifierRest", }, }, @@ -9968,32 +9978,32 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1480, col: 5, offset: 35632}, + pos: position{line: 1480, col: 5, offset: 35646}, run: (*parser).callonIdentifierName12, expr: &litMatcher{ - pos: position{line: 1480, col: 5, offset: 35632}, + pos: position{line: 1480, col: 5, offset: 35646}, val: "$", ignoreCase: false, want: "\"$\"", }, }, &actionExpr{ - pos: position{line: 1481, col: 5, offset: 35671}, + pos: position{line: 1481, col: 5, offset: 35685}, run: (*parser).callonIdentifierName14, expr: &seqExpr{ - pos: position{line: 1481, col: 5, offset: 35671}, + pos: position{line: 1481, col: 5, offset: 35685}, exprs: []any{ &litMatcher{ - pos: position{line: 1481, col: 5, offset: 35671}, + pos: position{line: 1481, col: 5, offset: 35685}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1481, col: 10, offset: 35676}, + pos: position{line: 1481, col: 10, offset: 35690}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 1481, col: 13, offset: 35679}, + pos: position{line: 1481, col: 13, offset: 35693}, name: "IDGuard", }, }, @@ -10001,10 +10011,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1483, col: 5, offset: 35770}, + pos: position{line: 1483, col: 5, offset: 35784}, run: (*parser).callonIdentifierName19, expr: &litMatcher{ - pos: position{line: 1483, col: 5, offset: 35770}, + pos: position{line: 1483, col: 5, offset: 35784}, val: "type", ignoreCase: false, want: "\"type\"", @@ -10017,22 +10027,22 @@ var g = &grammar{ }, { name: "IdentifierStart", - pos: position{line: 1485, col: 1, offset: 35809}, + pos: position{line: 1485, col: 1, offset: 35823}, expr: &choiceExpr{ - pos: position{line: 1486, col: 5, offset: 35829}, + pos: position{line: 1486, col: 5, offset: 35843}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1486, col: 5, offset: 35829}, + pos: position{line: 1486, col: 5, offset: 35843}, name: "UnicodeLetter", }, &litMatcher{ - pos: position{line: 1487, col: 5, offset: 35847}, + pos: position{line: 1487, col: 5, offset: 35861}, val: "$", ignoreCase: false, want: "\"$\"", }, &litMatcher{ - pos: position{line: 1488, col: 5, offset: 35855}, + pos: position{line: 1488, col: 5, offset: 35869}, val: "_", ignoreCase: false, want: "\"_\"", @@ -10044,24 +10054,24 @@ var g = &grammar{ }, { name: "IdentifierRest", - pos: position{line: 1490, col: 1, offset: 35860}, + pos: position{line: 1490, col: 1, offset: 35874}, expr: &choiceExpr{ - pos: position{line: 1491, col: 5, offset: 35879}, + pos: position{line: 1491, col: 5, offset: 35893}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1491, col: 5, offset: 35879}, + pos: position{line: 1491, col: 5, offset: 35893}, name: "IdentifierStart", }, &ruleRefExpr{ - pos: position{line: 1492, col: 5, offset: 35899}, + pos: position{line: 1492, col: 5, offset: 35913}, name: "UnicodeCombiningMark", }, &ruleRefExpr{ - pos: position{line: 1493, col: 5, offset: 35924}, + pos: position{line: 1493, col: 5, offset: 35938}, name: "UnicodeDigit", }, &ruleRefExpr{ - pos: position{line: 1494, col: 5, offset: 35941}, + pos: position{line: 1494, col: 5, offset: 35955}, name: "UnicodeConnectorPunctuation", }, }, @@ -10071,24 +10081,24 @@ var g = &grammar{ }, { name: "IDGuard", - pos: position{line: 1496, col: 1, offset: 35970}, + pos: position{line: 1496, col: 1, offset: 35984}, expr: &choiceExpr{ - pos: position{line: 1497, col: 5, offset: 35982}, + pos: position{line: 1497, col: 5, offset: 35996}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1497, col: 5, offset: 35982}, + pos: position{line: 1497, col: 5, offset: 35996}, name: "BooleanLiteral", }, &ruleRefExpr{ - pos: position{line: 1498, col: 5, offset: 36001}, + pos: position{line: 1498, col: 5, offset: 36015}, name: "NullLiteral", }, &ruleRefExpr{ - pos: position{line: 1499, col: 5, offset: 36017}, + pos: position{line: 1499, col: 5, offset: 36031}, name: "NaN", }, &ruleRefExpr{ - pos: position{line: 1500, col: 5, offset: 36025}, + pos: position{line: 1500, col: 5, offset: 36039}, name: "Infinity", }, }, @@ -10098,25 +10108,25 @@ var g = &grammar{ }, { name: "Time", - pos: position{line: 1502, col: 1, offset: 36035}, + pos: position{line: 1502, col: 1, offset: 36049}, expr: &actionExpr{ - pos: position{line: 1503, col: 5, offset: 36044}, + pos: position{line: 1503, col: 5, offset: 36058}, run: (*parser).callonTime1, expr: &seqExpr{ - pos: position{line: 1503, col: 5, offset: 36044}, + pos: position{line: 1503, col: 5, offset: 36058}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1503, col: 5, offset: 36044}, + pos: position{line: 1503, col: 5, offset: 36058}, name: "FullDate", }, &litMatcher{ - pos: position{line: 1503, col: 14, offset: 36053}, + pos: position{line: 1503, col: 14, offset: 36067}, val: "T", ignoreCase: false, want: "\"T\"", }, &ruleRefExpr{ - pos: position{line: 1503, col: 18, offset: 36057}, + pos: position{line: 1503, col: 18, offset: 36071}, name: "FullTime", }, }, @@ -10127,32 +10137,32 @@ var g = &grammar{ }, { name: "FullDate", - pos: position{line: 1507, col: 1, offset: 36133}, + pos: position{line: 1507, col: 1, offset: 36147}, expr: &seqExpr{ - pos: position{line: 1507, col: 12, offset: 36144}, + pos: position{line: 1507, col: 12, offset: 36158}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1507, col: 12, offset: 36144}, + pos: position{line: 1507, col: 12, offset: 36158}, name: "D4", }, &litMatcher{ - pos: position{line: 1507, col: 15, offset: 36147}, + pos: position{line: 1507, col: 15, offset: 36161}, val: "-", ignoreCase: false, want: "\"-\"", }, &ruleRefExpr{ - pos: position{line: 1507, col: 19, offset: 36151}, + pos: position{line: 1507, col: 19, offset: 36165}, name: "D2", }, &litMatcher{ - pos: position{line: 1507, col: 22, offset: 36154}, + pos: position{line: 1507, col: 22, offset: 36168}, val: "-", ignoreCase: false, want: "\"-\"", }, &ruleRefExpr{ - pos: position{line: 1507, col: 26, offset: 36158}, + pos: position{line: 1507, col: 26, offset: 36172}, name: "D2", }, }, @@ -10162,33 +10172,33 @@ var g = &grammar{ }, { name: "D4", - pos: position{line: 1509, col: 1, offset: 36162}, + pos: position{line: 1509, col: 1, offset: 36176}, expr: &seqExpr{ - pos: position{line: 1509, col: 6, offset: 36167}, + pos: position{line: 1509, col: 6, offset: 36181}, exprs: []any{ &charClassMatcher{ - pos: position{line: 1509, col: 6, offset: 36167}, + pos: position{line: 1509, col: 6, offset: 36181}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1509, col: 11, offset: 36172}, + pos: position{line: 1509, col: 11, offset: 36186}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1509, col: 16, offset: 36177}, + pos: position{line: 1509, col: 16, offset: 36191}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1509, col: 21, offset: 36182}, + pos: position{line: 1509, col: 21, offset: 36196}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10201,19 +10211,19 @@ var g = &grammar{ }, { name: "D2", - pos: position{line: 1510, col: 1, offset: 36188}, + pos: position{line: 1510, col: 1, offset: 36202}, expr: &seqExpr{ - pos: position{line: 1510, col: 6, offset: 36193}, + pos: position{line: 1510, col: 6, offset: 36207}, exprs: []any{ &charClassMatcher{ - pos: position{line: 1510, col: 6, offset: 36193}, + pos: position{line: 1510, col: 6, offset: 36207}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1510, col: 11, offset: 36198}, + pos: position{line: 1510, col: 11, offset: 36212}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10226,16 +10236,16 @@ var g = &grammar{ }, { name: "FullTime", - pos: position{line: 1512, col: 1, offset: 36205}, + pos: position{line: 1512, col: 1, offset: 36219}, expr: &seqExpr{ - pos: position{line: 1512, col: 12, offset: 36216}, + pos: position{line: 1512, col: 12, offset: 36230}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1512, col: 12, offset: 36216}, + pos: position{line: 1512, col: 12, offset: 36230}, name: "PartialTime", }, &ruleRefExpr{ - pos: position{line: 1512, col: 24, offset: 36228}, + pos: position{line: 1512, col: 24, offset: 36242}, name: "TimeOffset", }, }, @@ -10245,49 +10255,49 @@ var g = &grammar{ }, { name: "PartialTime", - pos: position{line: 1514, col: 1, offset: 36240}, + pos: position{line: 1514, col: 1, offset: 36254}, expr: &seqExpr{ - pos: position{line: 1514, col: 15, offset: 36254}, + pos: position{line: 1514, col: 15, offset: 36268}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1514, col: 15, offset: 36254}, + pos: position{line: 1514, col: 15, offset: 36268}, name: "D2", }, &litMatcher{ - pos: position{line: 1514, col: 18, offset: 36257}, + pos: position{line: 1514, col: 18, offset: 36271}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1514, col: 22, offset: 36261}, + pos: position{line: 1514, col: 22, offset: 36275}, name: "D2", }, &litMatcher{ - pos: position{line: 1514, col: 25, offset: 36264}, + pos: position{line: 1514, col: 25, offset: 36278}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1514, col: 29, offset: 36268}, + pos: position{line: 1514, col: 29, offset: 36282}, name: "D2", }, &zeroOrOneExpr{ - pos: position{line: 1514, col: 32, offset: 36271}, + pos: position{line: 1514, col: 32, offset: 36285}, expr: &seqExpr{ - pos: position{line: 1514, col: 33, offset: 36272}, + pos: position{line: 1514, col: 33, offset: 36286}, exprs: []any{ &litMatcher{ - pos: position{line: 1514, col: 33, offset: 36272}, + pos: position{line: 1514, col: 33, offset: 36286}, val: ".", ignoreCase: false, want: "\".\"", }, &oneOrMoreExpr{ - pos: position{line: 1514, col: 37, offset: 36276}, + pos: position{line: 1514, col: 37, offset: 36290}, expr: &charClassMatcher{ - pos: position{line: 1514, col: 37, offset: 36276}, + pos: position{line: 1514, col: 37, offset: 36290}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10304,30 +10314,30 @@ var g = &grammar{ }, { name: "TimeOffset", - pos: position{line: 1516, col: 1, offset: 36286}, + pos: position{line: 1516, col: 1, offset: 36300}, expr: &choiceExpr{ - pos: position{line: 1517, col: 5, offset: 36301}, + pos: position{line: 1517, col: 5, offset: 36315}, alternatives: []any{ &litMatcher{ - pos: position{line: 1517, col: 5, offset: 36301}, + pos: position{line: 1517, col: 5, offset: 36315}, val: "Z", ignoreCase: false, want: "\"Z\"", }, &seqExpr{ - pos: position{line: 1518, col: 5, offset: 36309}, + pos: position{line: 1518, col: 5, offset: 36323}, exprs: []any{ &choiceExpr{ - pos: position{line: 1518, col: 6, offset: 36310}, + pos: position{line: 1518, col: 6, offset: 36324}, alternatives: []any{ &litMatcher{ - pos: position{line: 1518, col: 6, offset: 36310}, + pos: position{line: 1518, col: 6, offset: 36324}, val: "+", ignoreCase: false, want: "\"+\"", }, &litMatcher{ - pos: position{line: 1518, col: 12, offset: 36316}, + pos: position{line: 1518, col: 12, offset: 36330}, val: "-", ignoreCase: false, want: "\"-\"", @@ -10335,34 +10345,34 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1518, col: 17, offset: 36321}, + pos: position{line: 1518, col: 17, offset: 36335}, name: "D2", }, &litMatcher{ - pos: position{line: 1518, col: 20, offset: 36324}, + pos: position{line: 1518, col: 20, offset: 36338}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1518, col: 24, offset: 36328}, + pos: position{line: 1518, col: 24, offset: 36342}, name: "D2", }, &zeroOrOneExpr{ - pos: position{line: 1518, col: 27, offset: 36331}, + pos: position{line: 1518, col: 27, offset: 36345}, expr: &seqExpr{ - pos: position{line: 1518, col: 28, offset: 36332}, + pos: position{line: 1518, col: 28, offset: 36346}, exprs: []any{ &litMatcher{ - pos: position{line: 1518, col: 28, offset: 36332}, + pos: position{line: 1518, col: 28, offset: 36346}, val: ".", ignoreCase: false, want: "\".\"", }, &oneOrMoreExpr{ - pos: position{line: 1518, col: 32, offset: 36336}, + pos: position{line: 1518, col: 32, offset: 36350}, expr: &charClassMatcher{ - pos: position{line: 1518, col: 32, offset: 36336}, + pos: position{line: 1518, col: 32, offset: 36350}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10381,33 +10391,33 @@ var g = &grammar{ }, { name: "Duration", - pos: position{line: 1520, col: 1, offset: 36346}, + pos: position{line: 1520, col: 1, offset: 36360}, expr: &actionExpr{ - pos: position{line: 1521, col: 5, offset: 36359}, + pos: position{line: 1521, col: 5, offset: 36373}, run: (*parser).callonDuration1, expr: &seqExpr{ - pos: position{line: 1521, col: 5, offset: 36359}, + pos: position{line: 1521, col: 5, offset: 36373}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1521, col: 5, offset: 36359}, + pos: position{line: 1521, col: 5, offset: 36373}, expr: &litMatcher{ - pos: position{line: 1521, col: 5, offset: 36359}, + pos: position{line: 1521, col: 5, offset: 36373}, val: "-", ignoreCase: false, want: "\"-\"", }, }, &oneOrMoreExpr{ - pos: position{line: 1521, col: 10, offset: 36364}, + pos: position{line: 1521, col: 10, offset: 36378}, expr: &seqExpr{ - pos: position{line: 1521, col: 11, offset: 36365}, + pos: position{line: 1521, col: 11, offset: 36379}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1521, col: 11, offset: 36365}, + pos: position{line: 1521, col: 11, offset: 36379}, name: "Decimal", }, &ruleRefExpr{ - pos: position{line: 1521, col: 19, offset: 36373}, + pos: position{line: 1521, col: 19, offset: 36387}, name: "TimeUnit", }, }, @@ -10421,27 +10431,27 @@ var g = &grammar{ }, { name: "Decimal", - pos: position{line: 1525, col: 1, offset: 36455}, + pos: position{line: 1525, col: 1, offset: 36469}, expr: &seqExpr{ - pos: position{line: 1525, col: 11, offset: 36465}, + pos: position{line: 1525, col: 11, offset: 36479}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1525, col: 11, offset: 36465}, + pos: position{line: 1525, col: 11, offset: 36479}, name: "UInt", }, &zeroOrOneExpr{ - pos: position{line: 1525, col: 16, offset: 36470}, + pos: position{line: 1525, col: 16, offset: 36484}, expr: &seqExpr{ - pos: position{line: 1525, col: 17, offset: 36471}, + pos: position{line: 1525, col: 17, offset: 36485}, exprs: []any{ &litMatcher{ - pos: position{line: 1525, col: 17, offset: 36471}, + pos: position{line: 1525, col: 17, offset: 36485}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1525, col: 21, offset: 36475}, + pos: position{line: 1525, col: 21, offset: 36489}, name: "UInt", }, }, @@ -10454,60 +10464,60 @@ var g = &grammar{ }, { name: "TimeUnit", - pos: position{line: 1527, col: 1, offset: 36483}, + pos: position{line: 1527, col: 1, offset: 36497}, expr: &choiceExpr{ - pos: position{line: 1528, col: 5, offset: 36496}, + pos: position{line: 1528, col: 5, offset: 36510}, alternatives: []any{ &litMatcher{ - pos: position{line: 1528, col: 5, offset: 36496}, + pos: position{line: 1528, col: 5, offset: 36510}, val: "ns", ignoreCase: false, want: "\"ns\"", }, &litMatcher{ - pos: position{line: 1529, col: 5, offset: 36505}, + pos: position{line: 1529, col: 5, offset: 36519}, val: "us", ignoreCase: false, want: "\"us\"", }, &litMatcher{ - pos: position{line: 1530, col: 5, offset: 36514}, + pos: position{line: 1530, col: 5, offset: 36528}, val: "ms", ignoreCase: false, want: "\"ms\"", }, &litMatcher{ - pos: position{line: 1531, col: 5, offset: 36523}, + pos: position{line: 1531, col: 5, offset: 36537}, val: "s", ignoreCase: false, want: "\"s\"", }, &litMatcher{ - pos: position{line: 1532, col: 5, offset: 36531}, + pos: position{line: 1532, col: 5, offset: 36545}, val: "m", ignoreCase: false, want: "\"m\"", }, &litMatcher{ - pos: position{line: 1533, col: 5, offset: 36539}, + pos: position{line: 1533, col: 5, offset: 36553}, val: "h", ignoreCase: false, want: "\"h\"", }, &litMatcher{ - pos: position{line: 1534, col: 5, offset: 36547}, + pos: position{line: 1534, col: 5, offset: 36561}, val: "d", ignoreCase: false, want: "\"d\"", }, &litMatcher{ - pos: position{line: 1535, col: 5, offset: 36555}, + pos: position{line: 1535, col: 5, offset: 36569}, val: "w", ignoreCase: false, want: "\"w\"", }, &litMatcher{ - pos: position{line: 1536, col: 5, offset: 36563}, + pos: position{line: 1536, col: 5, offset: 36577}, val: "y", ignoreCase: false, want: "\"y\"", @@ -10519,45 +10529,45 @@ var g = &grammar{ }, { name: "IP", - pos: position{line: 1538, col: 1, offset: 36568}, + pos: position{line: 1538, col: 1, offset: 36582}, expr: &actionExpr{ - pos: position{line: 1539, col: 5, offset: 36575}, + pos: position{line: 1539, col: 5, offset: 36589}, run: (*parser).callonIP1, expr: &seqExpr{ - pos: position{line: 1539, col: 5, offset: 36575}, + pos: position{line: 1539, col: 5, offset: 36589}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1539, col: 5, offset: 36575}, + pos: position{line: 1539, col: 5, offset: 36589}, name: "UInt", }, &litMatcher{ - pos: position{line: 1539, col: 10, offset: 36580}, + pos: position{line: 1539, col: 10, offset: 36594}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1539, col: 14, offset: 36584}, + pos: position{line: 1539, col: 14, offset: 36598}, name: "UInt", }, &litMatcher{ - pos: position{line: 1539, col: 19, offset: 36589}, + pos: position{line: 1539, col: 19, offset: 36603}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1539, col: 23, offset: 36593}, + pos: position{line: 1539, col: 23, offset: 36607}, name: "UInt", }, &litMatcher{ - pos: position{line: 1539, col: 28, offset: 36598}, + pos: position{line: 1539, col: 28, offset: 36612}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1539, col: 32, offset: 36602}, + pos: position{line: 1539, col: 32, offset: 36616}, name: "UInt", }, }, @@ -10568,43 +10578,43 @@ var g = &grammar{ }, { name: "IP6", - pos: position{line: 1541, col: 1, offset: 36639}, + pos: position{line: 1541, col: 1, offset: 36653}, expr: &actionExpr{ - pos: position{line: 1542, col: 5, offset: 36647}, + pos: position{line: 1542, col: 5, offset: 36661}, run: (*parser).callonIP61, expr: &seqExpr{ - pos: position{line: 1542, col: 5, offset: 36647}, + pos: position{line: 1542, col: 5, offset: 36661}, exprs: []any{ ¬Expr{ - pos: position{line: 1542, col: 5, offset: 36647}, + pos: position{line: 1542, col: 5, offset: 36661}, expr: &seqExpr{ - pos: position{line: 1542, col: 7, offset: 36649}, + pos: position{line: 1542, col: 7, offset: 36663}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1542, col: 7, offset: 36649}, + pos: position{line: 1542, col: 7, offset: 36663}, name: "Hex", }, &litMatcher{ - pos: position{line: 1542, col: 11, offset: 36653}, + pos: position{line: 1542, col: 11, offset: 36667}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1542, col: 15, offset: 36657}, + pos: position{line: 1542, col: 15, offset: 36671}, name: "Hex", }, ¬Expr{ - pos: position{line: 1542, col: 19, offset: 36661}, + pos: position{line: 1542, col: 19, offset: 36675}, expr: &choiceExpr{ - pos: position{line: 1542, col: 21, offset: 36663}, + pos: position{line: 1542, col: 21, offset: 36677}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1542, col: 21, offset: 36663}, + pos: position{line: 1542, col: 21, offset: 36677}, name: "HexDigit", }, &litMatcher{ - pos: position{line: 1542, col: 32, offset: 36674}, + pos: position{line: 1542, col: 32, offset: 36688}, val: ":", ignoreCase: false, want: "\":\"", @@ -10616,10 +10626,10 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 1542, col: 38, offset: 36680}, + pos: position{line: 1542, col: 38, offset: 36694}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1542, col: 40, offset: 36682}, + pos: position{line: 1542, col: 40, offset: 36696}, name: "IP6Variations", }, }, @@ -10631,32 +10641,32 @@ var g = &grammar{ }, { name: "IP6Variations", - pos: position{line: 1546, col: 1, offset: 36846}, + pos: position{line: 1546, col: 1, offset: 36860}, expr: &choiceExpr{ - pos: position{line: 1547, col: 5, offset: 36864}, + pos: position{line: 1547, col: 5, offset: 36878}, alternatives: []any{ &actionExpr{ - pos: position{line: 1547, col: 5, offset: 36864}, + pos: position{line: 1547, col: 5, offset: 36878}, run: (*parser).callonIP6Variations2, expr: &seqExpr{ - pos: position{line: 1547, col: 5, offset: 36864}, + pos: position{line: 1547, col: 5, offset: 36878}, exprs: []any{ &labeledExpr{ - pos: position{line: 1547, col: 5, offset: 36864}, + pos: position{line: 1547, col: 5, offset: 36878}, label: "a", expr: &oneOrMoreExpr{ - pos: position{line: 1547, col: 7, offset: 36866}, + pos: position{line: 1547, col: 7, offset: 36880}, expr: &ruleRefExpr{ - pos: position{line: 1547, col: 7, offset: 36866}, + pos: position{line: 1547, col: 7, offset: 36880}, name: "HexColon", }, }, }, &labeledExpr{ - pos: position{line: 1547, col: 17, offset: 36876}, + pos: position{line: 1547, col: 17, offset: 36890}, label: "b", expr: &ruleRefExpr{ - pos: position{line: 1547, col: 19, offset: 36878}, + pos: position{line: 1547, col: 19, offset: 36892}, name: "IP6Tail", }, }, @@ -10664,52 +10674,52 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1550, col: 5, offset: 36942}, + pos: position{line: 1550, col: 5, offset: 36956}, run: (*parser).callonIP6Variations9, expr: &seqExpr{ - pos: position{line: 1550, col: 5, offset: 36942}, + pos: position{line: 1550, col: 5, offset: 36956}, exprs: []any{ &labeledExpr{ - pos: position{line: 1550, col: 5, offset: 36942}, + pos: position{line: 1550, col: 5, offset: 36956}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1550, col: 7, offset: 36944}, + pos: position{line: 1550, col: 7, offset: 36958}, name: "Hex", }, }, &labeledExpr{ - pos: position{line: 1550, col: 11, offset: 36948}, + pos: position{line: 1550, col: 11, offset: 36962}, label: "b", expr: &zeroOrMoreExpr{ - pos: position{line: 1550, col: 13, offset: 36950}, + pos: position{line: 1550, col: 13, offset: 36964}, expr: &ruleRefExpr{ - pos: position{line: 1550, col: 13, offset: 36950}, + pos: position{line: 1550, col: 13, offset: 36964}, name: "ColonHex", }, }, }, &litMatcher{ - pos: position{line: 1550, col: 23, offset: 36960}, + pos: position{line: 1550, col: 23, offset: 36974}, val: "::", ignoreCase: false, want: "\"::\"", }, &labeledExpr{ - pos: position{line: 1550, col: 28, offset: 36965}, + pos: position{line: 1550, col: 28, offset: 36979}, label: "d", expr: &zeroOrMoreExpr{ - pos: position{line: 1550, col: 30, offset: 36967}, + pos: position{line: 1550, col: 30, offset: 36981}, expr: &ruleRefExpr{ - pos: position{line: 1550, col: 30, offset: 36967}, + pos: position{line: 1550, col: 30, offset: 36981}, name: "HexColon", }, }, }, &labeledExpr{ - pos: position{line: 1550, col: 40, offset: 36977}, + pos: position{line: 1550, col: 40, offset: 36991}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1550, col: 42, offset: 36979}, + pos: position{line: 1550, col: 42, offset: 36993}, name: "IP6Tail", }, }, @@ -10717,33 +10727,33 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1553, col: 5, offset: 37078}, + pos: position{line: 1553, col: 5, offset: 37092}, run: (*parser).callonIP6Variations22, expr: &seqExpr{ - pos: position{line: 1553, col: 5, offset: 37078}, + pos: position{line: 1553, col: 5, offset: 37092}, exprs: []any{ &litMatcher{ - pos: position{line: 1553, col: 5, offset: 37078}, + pos: position{line: 1553, col: 5, offset: 37092}, val: "::", ignoreCase: false, want: "\"::\"", }, &labeledExpr{ - pos: position{line: 1553, col: 10, offset: 37083}, + pos: position{line: 1553, col: 10, offset: 37097}, label: "a", expr: &zeroOrMoreExpr{ - pos: position{line: 1553, col: 12, offset: 37085}, + pos: position{line: 1553, col: 12, offset: 37099}, expr: &ruleRefExpr{ - pos: position{line: 1553, col: 12, offset: 37085}, + pos: position{line: 1553, col: 12, offset: 37099}, name: "HexColon", }, }, }, &labeledExpr{ - pos: position{line: 1553, col: 22, offset: 37095}, + pos: position{line: 1553, col: 22, offset: 37109}, label: "b", expr: &ruleRefExpr{ - pos: position{line: 1553, col: 24, offset: 37097}, + pos: position{line: 1553, col: 24, offset: 37111}, name: "IP6Tail", }, }, @@ -10751,32 +10761,32 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1556, col: 5, offset: 37168}, + pos: position{line: 1556, col: 5, offset: 37182}, run: (*parser).callonIP6Variations30, expr: &seqExpr{ - pos: position{line: 1556, col: 5, offset: 37168}, + pos: position{line: 1556, col: 5, offset: 37182}, exprs: []any{ &labeledExpr{ - pos: position{line: 1556, col: 5, offset: 37168}, + pos: position{line: 1556, col: 5, offset: 37182}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1556, col: 7, offset: 37170}, + pos: position{line: 1556, col: 7, offset: 37184}, name: "Hex", }, }, &labeledExpr{ - pos: position{line: 1556, col: 11, offset: 37174}, + pos: position{line: 1556, col: 11, offset: 37188}, label: "b", expr: &zeroOrMoreExpr{ - pos: position{line: 1556, col: 13, offset: 37176}, + pos: position{line: 1556, col: 13, offset: 37190}, expr: &ruleRefExpr{ - pos: position{line: 1556, col: 13, offset: 37176}, + pos: position{line: 1556, col: 13, offset: 37190}, name: "ColonHex", }, }, }, &litMatcher{ - pos: position{line: 1556, col: 23, offset: 37186}, + pos: position{line: 1556, col: 23, offset: 37200}, val: "::", ignoreCase: false, want: "\"::\"", @@ -10785,10 +10795,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1559, col: 5, offset: 37254}, + pos: position{line: 1559, col: 5, offset: 37268}, run: (*parser).callonIP6Variations38, expr: &litMatcher{ - pos: position{line: 1559, col: 5, offset: 37254}, + pos: position{line: 1559, col: 5, offset: 37268}, val: "::", ignoreCase: false, want: "\"::\"", @@ -10801,16 +10811,16 @@ var g = &grammar{ }, { name: "IP6Tail", - pos: position{line: 1563, col: 1, offset: 37291}, + pos: position{line: 1563, col: 1, offset: 37305}, expr: &choiceExpr{ - pos: position{line: 1564, col: 5, offset: 37303}, + pos: position{line: 1564, col: 5, offset: 37317}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1564, col: 5, offset: 37303}, + pos: position{line: 1564, col: 5, offset: 37317}, name: "IP", }, &ruleRefExpr{ - pos: position{line: 1565, col: 5, offset: 37310}, + pos: position{line: 1565, col: 5, offset: 37324}, name: "Hex", }, }, @@ -10820,24 +10830,24 @@ var g = &grammar{ }, { name: "ColonHex", - pos: position{line: 1567, col: 1, offset: 37315}, + pos: position{line: 1567, col: 1, offset: 37329}, expr: &actionExpr{ - pos: position{line: 1567, col: 12, offset: 37326}, + pos: position{line: 1567, col: 12, offset: 37340}, run: (*parser).callonColonHex1, expr: &seqExpr{ - pos: position{line: 1567, col: 12, offset: 37326}, + pos: position{line: 1567, col: 12, offset: 37340}, exprs: []any{ &litMatcher{ - pos: position{line: 1567, col: 12, offset: 37326}, + pos: position{line: 1567, col: 12, offset: 37340}, val: ":", ignoreCase: false, want: "\":\"", }, &labeledExpr{ - pos: position{line: 1567, col: 16, offset: 37330}, + pos: position{line: 1567, col: 16, offset: 37344}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1567, col: 18, offset: 37332}, + pos: position{line: 1567, col: 18, offset: 37346}, name: "Hex", }, }, @@ -10849,23 +10859,23 @@ var g = &grammar{ }, { name: "HexColon", - pos: position{line: 1569, col: 1, offset: 37370}, + pos: position{line: 1569, col: 1, offset: 37384}, expr: &actionExpr{ - pos: position{line: 1569, col: 12, offset: 37381}, + pos: position{line: 1569, col: 12, offset: 37395}, run: (*parser).callonHexColon1, expr: &seqExpr{ - pos: position{line: 1569, col: 12, offset: 37381}, + pos: position{line: 1569, col: 12, offset: 37395}, exprs: []any{ &labeledExpr{ - pos: position{line: 1569, col: 12, offset: 37381}, + pos: position{line: 1569, col: 12, offset: 37395}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1569, col: 14, offset: 37383}, + pos: position{line: 1569, col: 14, offset: 37397}, name: "Hex", }, }, &litMatcher{ - pos: position{line: 1569, col: 18, offset: 37387}, + pos: position{line: 1569, col: 18, offset: 37401}, val: ":", ignoreCase: false, want: "\":\"", @@ -10878,32 +10888,32 @@ var g = &grammar{ }, { name: "IP4Net", - pos: position{line: 1571, col: 1, offset: 37425}, + pos: position{line: 1571, col: 1, offset: 37439}, expr: &actionExpr{ - pos: position{line: 1572, col: 5, offset: 37436}, + pos: position{line: 1572, col: 5, offset: 37450}, run: (*parser).callonIP4Net1, expr: &seqExpr{ - pos: position{line: 1572, col: 5, offset: 37436}, + pos: position{line: 1572, col: 5, offset: 37450}, exprs: []any{ &labeledExpr{ - pos: position{line: 1572, col: 5, offset: 37436}, + pos: position{line: 1572, col: 5, offset: 37450}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1572, col: 7, offset: 37438}, + pos: position{line: 1572, col: 7, offset: 37452}, name: "IP", }, }, &litMatcher{ - pos: position{line: 1572, col: 10, offset: 37441}, + pos: position{line: 1572, col: 10, offset: 37455}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 1572, col: 14, offset: 37445}, + pos: position{line: 1572, col: 14, offset: 37459}, label: "m", expr: &ruleRefExpr{ - pos: position{line: 1572, col: 16, offset: 37447}, + pos: position{line: 1572, col: 16, offset: 37461}, name: "UIntString", }, }, @@ -10915,32 +10925,32 @@ var g = &grammar{ }, { name: "IP6Net", - pos: position{line: 1576, col: 1, offset: 37515}, + pos: position{line: 1576, col: 1, offset: 37529}, expr: &actionExpr{ - pos: position{line: 1577, col: 5, offset: 37526}, + pos: position{line: 1577, col: 5, offset: 37540}, run: (*parser).callonIP6Net1, expr: &seqExpr{ - pos: position{line: 1577, col: 5, offset: 37526}, + pos: position{line: 1577, col: 5, offset: 37540}, exprs: []any{ &labeledExpr{ - pos: position{line: 1577, col: 5, offset: 37526}, + pos: position{line: 1577, col: 5, offset: 37540}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1577, col: 7, offset: 37528}, + pos: position{line: 1577, col: 7, offset: 37542}, name: "IP6", }, }, &litMatcher{ - pos: position{line: 1577, col: 11, offset: 37532}, + pos: position{line: 1577, col: 11, offset: 37546}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 1577, col: 15, offset: 37536}, + pos: position{line: 1577, col: 15, offset: 37550}, label: "m", expr: &ruleRefExpr{ - pos: position{line: 1577, col: 17, offset: 37538}, + pos: position{line: 1577, col: 17, offset: 37552}, name: "UIntString", }, }, @@ -10952,15 +10962,15 @@ var g = &grammar{ }, { name: "UInt", - pos: position{line: 1581, col: 1, offset: 37606}, + pos: position{line: 1581, col: 1, offset: 37620}, expr: &actionExpr{ - pos: position{line: 1582, col: 4, offset: 37614}, + pos: position{line: 1582, col: 4, offset: 37628}, run: (*parser).callonUInt1, expr: &labeledExpr{ - pos: position{line: 1582, col: 4, offset: 37614}, + pos: position{line: 1582, col: 4, offset: 37628}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1582, col: 6, offset: 37616}, + pos: position{line: 1582, col: 6, offset: 37630}, name: "UIntString", }, }, @@ -10970,16 +10980,16 @@ var g = &grammar{ }, { name: "IntString", - pos: position{line: 1584, col: 1, offset: 37656}, + pos: position{line: 1584, col: 1, offset: 37670}, expr: &choiceExpr{ - pos: position{line: 1585, col: 5, offset: 37670}, + pos: position{line: 1585, col: 5, offset: 37684}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1585, col: 5, offset: 37670}, + pos: position{line: 1585, col: 5, offset: 37684}, name: "UIntString", }, &ruleRefExpr{ - pos: position{line: 1586, col: 5, offset: 37685}, + pos: position{line: 1586, col: 5, offset: 37699}, name: "MinusIntString", }, }, @@ -10989,14 +10999,14 @@ var g = &grammar{ }, { name: "UIntString", - pos: position{line: 1588, col: 1, offset: 37701}, + pos: position{line: 1588, col: 1, offset: 37715}, expr: &actionExpr{ - pos: position{line: 1588, col: 14, offset: 37714}, + pos: position{line: 1588, col: 14, offset: 37728}, run: (*parser).callonUIntString1, expr: &oneOrMoreExpr{ - pos: position{line: 1588, col: 14, offset: 37714}, + pos: position{line: 1588, col: 14, offset: 37728}, expr: &charClassMatcher{ - pos: position{line: 1588, col: 14, offset: 37714}, + pos: position{line: 1588, col: 14, offset: 37728}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11009,21 +11019,21 @@ var g = &grammar{ }, { name: "MinusIntString", - pos: position{line: 1590, col: 1, offset: 37753}, + pos: position{line: 1590, col: 1, offset: 37767}, expr: &actionExpr{ - pos: position{line: 1591, col: 5, offset: 37772}, + pos: position{line: 1591, col: 5, offset: 37786}, run: (*parser).callonMinusIntString1, expr: &seqExpr{ - pos: position{line: 1591, col: 5, offset: 37772}, + pos: position{line: 1591, col: 5, offset: 37786}, exprs: []any{ &litMatcher{ - pos: position{line: 1591, col: 5, offset: 37772}, + pos: position{line: 1591, col: 5, offset: 37786}, val: "-", ignoreCase: false, want: "\"-\"", }, &ruleRefExpr{ - pos: position{line: 1591, col: 9, offset: 37776}, + pos: position{line: 1591, col: 9, offset: 37790}, name: "UIntString", }, }, @@ -11034,29 +11044,29 @@ var g = &grammar{ }, { name: "FloatString", - pos: position{line: 1593, col: 1, offset: 37819}, + pos: position{line: 1593, col: 1, offset: 37833}, expr: &choiceExpr{ - pos: position{line: 1594, col: 5, offset: 37835}, + pos: position{line: 1594, col: 5, offset: 37849}, alternatives: []any{ &actionExpr{ - pos: position{line: 1594, col: 5, offset: 37835}, + pos: position{line: 1594, col: 5, offset: 37849}, run: (*parser).callonFloatString2, expr: &seqExpr{ - pos: position{line: 1594, col: 5, offset: 37835}, + pos: position{line: 1594, col: 5, offset: 37849}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1594, col: 5, offset: 37835}, + pos: position{line: 1594, col: 5, offset: 37849}, expr: &litMatcher{ - pos: position{line: 1594, col: 5, offset: 37835}, + pos: position{line: 1594, col: 5, offset: 37849}, val: "-", ignoreCase: false, want: "\"-\"", }, }, &oneOrMoreExpr{ - pos: position{line: 1594, col: 10, offset: 37840}, + pos: position{line: 1594, col: 10, offset: 37854}, expr: &charClassMatcher{ - pos: position{line: 1594, col: 10, offset: 37840}, + pos: position{line: 1594, col: 10, offset: 37854}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11064,15 +11074,15 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1594, col: 17, offset: 37847}, + pos: position{line: 1594, col: 17, offset: 37861}, val: ".", ignoreCase: false, want: "\".\"", }, &zeroOrMoreExpr{ - pos: position{line: 1594, col: 21, offset: 37851}, + pos: position{line: 1594, col: 21, offset: 37865}, expr: &charClassMatcher{ - pos: position{line: 1594, col: 21, offset: 37851}, + pos: position{line: 1594, col: 21, offset: 37865}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11080,9 +11090,9 @@ var g = &grammar{ }, }, &zeroOrOneExpr{ - pos: position{line: 1594, col: 28, offset: 37858}, + pos: position{line: 1594, col: 28, offset: 37872}, expr: &ruleRefExpr{ - pos: position{line: 1594, col: 28, offset: 37858}, + pos: position{line: 1594, col: 28, offset: 37872}, name: "ExponentPart", }, }, @@ -11090,30 +11100,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1595, col: 5, offset: 37907}, + pos: position{line: 1595, col: 5, offset: 37921}, run: (*parser).callonFloatString13, expr: &seqExpr{ - pos: position{line: 1595, col: 5, offset: 37907}, + pos: position{line: 1595, col: 5, offset: 37921}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1595, col: 5, offset: 37907}, + pos: position{line: 1595, col: 5, offset: 37921}, expr: &litMatcher{ - pos: position{line: 1595, col: 5, offset: 37907}, + pos: position{line: 1595, col: 5, offset: 37921}, val: "-", ignoreCase: false, want: "\"-\"", }, }, &litMatcher{ - pos: position{line: 1595, col: 10, offset: 37912}, + pos: position{line: 1595, col: 10, offset: 37926}, val: ".", ignoreCase: false, want: "\".\"", }, &oneOrMoreExpr{ - pos: position{line: 1595, col: 14, offset: 37916}, + pos: position{line: 1595, col: 14, offset: 37930}, expr: &charClassMatcher{ - pos: position{line: 1595, col: 14, offset: 37916}, + pos: position{line: 1595, col: 14, offset: 37930}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11121,9 +11131,9 @@ var g = &grammar{ }, }, &zeroOrOneExpr{ - pos: position{line: 1595, col: 21, offset: 37923}, + pos: position{line: 1595, col: 21, offset: 37937}, expr: &ruleRefExpr{ - pos: position{line: 1595, col: 21, offset: 37923}, + pos: position{line: 1595, col: 21, offset: 37937}, name: "ExponentPart", }, }, @@ -11131,17 +11141,17 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1596, col: 5, offset: 37972}, + pos: position{line: 1596, col: 5, offset: 37986}, run: (*parser).callonFloatString22, expr: &choiceExpr{ - pos: position{line: 1596, col: 6, offset: 37973}, + pos: position{line: 1596, col: 6, offset: 37987}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1596, col: 6, offset: 37973}, + pos: position{line: 1596, col: 6, offset: 37987}, name: "NaN", }, &ruleRefExpr{ - pos: position{line: 1596, col: 12, offset: 37979}, + pos: position{line: 1596, col: 12, offset: 37993}, name: "Infinity", }, }, @@ -11154,20 +11164,20 @@ var g = &grammar{ }, { name: "ExponentPart", - pos: position{line: 1599, col: 1, offset: 38022}, + pos: position{line: 1599, col: 1, offset: 38036}, expr: &seqExpr{ - pos: position{line: 1599, col: 16, offset: 38037}, + pos: position{line: 1599, col: 16, offset: 38051}, exprs: []any{ &litMatcher{ - pos: position{line: 1599, col: 16, offset: 38037}, + pos: position{line: 1599, col: 16, offset: 38051}, val: "e", ignoreCase: true, want: "\"e\"i", }, &zeroOrOneExpr{ - pos: position{line: 1599, col: 21, offset: 38042}, + pos: position{line: 1599, col: 21, offset: 38056}, expr: &charClassMatcher{ - pos: position{line: 1599, col: 21, offset: 38042}, + pos: position{line: 1599, col: 21, offset: 38056}, val: "[+-]", chars: []rune{'+', '-'}, ignoreCase: false, @@ -11175,7 +11185,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1599, col: 27, offset: 38048}, + pos: position{line: 1599, col: 27, offset: 38062}, name: "UIntString", }, }, @@ -11185,9 +11195,9 @@ var g = &grammar{ }, { name: "NaN", - pos: position{line: 1601, col: 1, offset: 38060}, + pos: position{line: 1601, col: 1, offset: 38074}, expr: &litMatcher{ - pos: position{line: 1601, col: 7, offset: 38066}, + pos: position{line: 1601, col: 7, offset: 38080}, val: "NaN", ignoreCase: false, want: "\"NaN\"", @@ -11197,23 +11207,23 @@ var g = &grammar{ }, { name: "Infinity", - pos: position{line: 1603, col: 1, offset: 38073}, + pos: position{line: 1603, col: 1, offset: 38087}, expr: &seqExpr{ - pos: position{line: 1603, col: 12, offset: 38084}, + pos: position{line: 1603, col: 12, offset: 38098}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1603, col: 12, offset: 38084}, + pos: position{line: 1603, col: 12, offset: 38098}, expr: &choiceExpr{ - pos: position{line: 1603, col: 13, offset: 38085}, + pos: position{line: 1603, col: 13, offset: 38099}, alternatives: []any{ &litMatcher{ - pos: position{line: 1603, col: 13, offset: 38085}, + pos: position{line: 1603, col: 13, offset: 38099}, val: "-", ignoreCase: false, want: "\"-\"", }, &litMatcher{ - pos: position{line: 1603, col: 19, offset: 38091}, + pos: position{line: 1603, col: 19, offset: 38105}, val: "+", ignoreCase: false, want: "\"+\"", @@ -11222,7 +11232,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1603, col: 25, offset: 38097}, + pos: position{line: 1603, col: 25, offset: 38111}, val: "Inf", ignoreCase: false, want: "\"Inf\"", @@ -11234,14 +11244,14 @@ var g = &grammar{ }, { name: "Hex", - pos: position{line: 1605, col: 1, offset: 38104}, + pos: position{line: 1605, col: 1, offset: 38118}, expr: &actionExpr{ - pos: position{line: 1605, col: 7, offset: 38110}, + pos: position{line: 1605, col: 7, offset: 38124}, run: (*parser).callonHex1, expr: &oneOrMoreExpr{ - pos: position{line: 1605, col: 7, offset: 38110}, + pos: position{line: 1605, col: 7, offset: 38124}, expr: &ruleRefExpr{ - pos: position{line: 1605, col: 7, offset: 38110}, + pos: position{line: 1605, col: 7, offset: 38124}, name: "HexDigit", }, }, @@ -11251,9 +11261,9 @@ var g = &grammar{ }, { name: "HexDigit", - pos: position{line: 1607, col: 1, offset: 38152}, + pos: position{line: 1607, col: 1, offset: 38166}, expr: &charClassMatcher{ - pos: position{line: 1607, col: 12, offset: 38163}, + pos: position{line: 1607, col: 12, offset: 38177}, val: "[0-9a-fA-F]", ranges: []rune{'0', '9', 'a', 'f', 'A', 'F'}, ignoreCase: false, @@ -11264,35 +11274,35 @@ var g = &grammar{ }, { name: "QuotedString", - pos: position{line: 1609, col: 1, offset: 38176}, + pos: position{line: 1609, col: 1, offset: 38190}, expr: &choiceExpr{ - pos: position{line: 1610, col: 5, offset: 38193}, + pos: position{line: 1610, col: 5, offset: 38207}, alternatives: []any{ &actionExpr{ - pos: position{line: 1610, col: 5, offset: 38193}, + pos: position{line: 1610, col: 5, offset: 38207}, run: (*parser).callonQuotedString2, expr: &seqExpr{ - pos: position{line: 1610, col: 5, offset: 38193}, + pos: position{line: 1610, col: 5, offset: 38207}, exprs: []any{ &litMatcher{ - pos: position{line: 1610, col: 5, offset: 38193}, + pos: position{line: 1610, col: 5, offset: 38207}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, &labeledExpr{ - pos: position{line: 1610, col: 9, offset: 38197}, + pos: position{line: 1610, col: 9, offset: 38211}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1610, col: 11, offset: 38199}, + pos: position{line: 1610, col: 11, offset: 38213}, expr: &ruleRefExpr{ - pos: position{line: 1610, col: 11, offset: 38199}, + pos: position{line: 1610, col: 11, offset: 38213}, name: "DoubleQuotedChar", }, }, }, &litMatcher{ - pos: position{line: 1610, col: 29, offset: 38217}, + pos: position{line: 1610, col: 29, offset: 38231}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -11301,30 +11311,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1611, col: 5, offset: 38254}, + pos: position{line: 1611, col: 5, offset: 38268}, run: (*parser).callonQuotedString9, expr: &seqExpr{ - pos: position{line: 1611, col: 5, offset: 38254}, + pos: position{line: 1611, col: 5, offset: 38268}, exprs: []any{ &litMatcher{ - pos: position{line: 1611, col: 5, offset: 38254}, + pos: position{line: 1611, col: 5, offset: 38268}, val: "'", ignoreCase: false, want: "\"'\"", }, &labeledExpr{ - pos: position{line: 1611, col: 9, offset: 38258}, + pos: position{line: 1611, col: 9, offset: 38272}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1611, col: 11, offset: 38260}, + pos: position{line: 1611, col: 11, offset: 38274}, expr: &ruleRefExpr{ - pos: position{line: 1611, col: 11, offset: 38260}, + pos: position{line: 1611, col: 11, offset: 38274}, name: "SingleQuotedChar", }, }, }, &litMatcher{ - pos: position{line: 1611, col: 29, offset: 38278}, + pos: position{line: 1611, col: 29, offset: 38292}, val: "'", ignoreCase: false, want: "\"'\"", @@ -11339,57 +11349,57 @@ var g = &grammar{ }, { name: "DoubleQuotedChar", - pos: position{line: 1613, col: 1, offset: 38312}, + pos: position{line: 1613, col: 1, offset: 38326}, expr: &choiceExpr{ - pos: position{line: 1614, col: 5, offset: 38333}, + pos: position{line: 1614, col: 5, offset: 38347}, alternatives: []any{ &actionExpr{ - pos: position{line: 1614, col: 5, offset: 38333}, + pos: position{line: 1614, col: 5, offset: 38347}, run: (*parser).callonDoubleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1614, col: 5, offset: 38333}, + pos: position{line: 1614, col: 5, offset: 38347}, exprs: []any{ ¬Expr{ - pos: position{line: 1614, col: 5, offset: 38333}, + pos: position{line: 1614, col: 5, offset: 38347}, expr: &choiceExpr{ - pos: position{line: 1614, col: 7, offset: 38335}, + pos: position{line: 1614, col: 7, offset: 38349}, alternatives: []any{ &litMatcher{ - pos: position{line: 1614, col: 7, offset: 38335}, + pos: position{line: 1614, col: 7, offset: 38349}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, &ruleRefExpr{ - pos: position{line: 1614, col: 13, offset: 38341}, + pos: position{line: 1614, col: 13, offset: 38355}, name: "EscapedChar", }, }, }, }, &anyMatcher{ - line: 1614, col: 26, offset: 38354, + line: 1614, col: 26, offset: 38368, }, }, }, }, &actionExpr{ - pos: position{line: 1615, col: 5, offset: 38391}, + pos: position{line: 1615, col: 5, offset: 38405}, run: (*parser).callonDoubleQuotedChar9, expr: &seqExpr{ - pos: position{line: 1615, col: 5, offset: 38391}, + pos: position{line: 1615, col: 5, offset: 38405}, exprs: []any{ &litMatcher{ - pos: position{line: 1615, col: 5, offset: 38391}, + pos: position{line: 1615, col: 5, offset: 38405}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1615, col: 10, offset: 38396}, + pos: position{line: 1615, col: 10, offset: 38410}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1615, col: 12, offset: 38398}, + pos: position{line: 1615, col: 12, offset: 38412}, name: "EscapeSequence", }, }, @@ -11403,28 +11413,28 @@ var g = &grammar{ }, { name: "KeyWord", - pos: position{line: 1617, col: 1, offset: 38432}, + pos: position{line: 1617, col: 1, offset: 38446}, expr: &actionExpr{ - pos: position{line: 1618, col: 5, offset: 38444}, + pos: position{line: 1618, col: 5, offset: 38458}, run: (*parser).callonKeyWord1, expr: &seqExpr{ - pos: position{line: 1618, col: 5, offset: 38444}, + pos: position{line: 1618, col: 5, offset: 38458}, exprs: []any{ &labeledExpr{ - pos: position{line: 1618, col: 5, offset: 38444}, + pos: position{line: 1618, col: 5, offset: 38458}, label: "head", expr: &ruleRefExpr{ - pos: position{line: 1618, col: 10, offset: 38449}, + pos: position{line: 1618, col: 10, offset: 38463}, name: "KeyWordStart", }, }, &labeledExpr{ - pos: position{line: 1618, col: 23, offset: 38462}, + pos: position{line: 1618, col: 23, offset: 38476}, label: "tail", expr: &zeroOrMoreExpr{ - pos: position{line: 1618, col: 28, offset: 38467}, + pos: position{line: 1618, col: 28, offset: 38481}, expr: &ruleRefExpr{ - pos: position{line: 1618, col: 28, offset: 38467}, + pos: position{line: 1618, col: 28, offset: 38481}, name: "KeyWordRest", }, }, @@ -11437,16 +11447,16 @@ var g = &grammar{ }, { name: "KeyWordStart", - pos: position{line: 1620, col: 1, offset: 38529}, + pos: position{line: 1620, col: 1, offset: 38543}, expr: &choiceExpr{ - pos: position{line: 1621, col: 5, offset: 38546}, + pos: position{line: 1621, col: 5, offset: 38560}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1621, col: 5, offset: 38546}, + pos: position{line: 1621, col: 5, offset: 38560}, name: "KeyWordChars", }, &ruleRefExpr{ - pos: position{line: 1622, col: 5, offset: 38563}, + pos: position{line: 1622, col: 5, offset: 38577}, name: "KeyWordEsc", }, }, @@ -11456,16 +11466,16 @@ var g = &grammar{ }, { name: "KeyWordRest", - pos: position{line: 1624, col: 1, offset: 38575}, + pos: position{line: 1624, col: 1, offset: 38589}, expr: &choiceExpr{ - pos: position{line: 1625, col: 5, offset: 38591}, + pos: position{line: 1625, col: 5, offset: 38605}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1625, col: 5, offset: 38591}, + pos: position{line: 1625, col: 5, offset: 38605}, name: "KeyWordStart", }, &charClassMatcher{ - pos: position{line: 1626, col: 5, offset: 38608}, + pos: position{line: 1626, col: 5, offset: 38622}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11478,19 +11488,19 @@ var g = &grammar{ }, { name: "KeyWordChars", - pos: position{line: 1628, col: 1, offset: 38615}, + pos: position{line: 1628, col: 1, offset: 38629}, expr: &actionExpr{ - pos: position{line: 1628, col: 16, offset: 38630}, + pos: position{line: 1628, col: 16, offset: 38644}, run: (*parser).callonKeyWordChars1, expr: &choiceExpr{ - pos: position{line: 1628, col: 17, offset: 38631}, + pos: position{line: 1628, col: 17, offset: 38645}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1628, col: 17, offset: 38631}, + pos: position{line: 1628, col: 17, offset: 38645}, name: "UnicodeLetter", }, &charClassMatcher{ - pos: position{line: 1628, col: 33, offset: 38647}, + pos: position{line: 1628, col: 33, offset: 38661}, val: "[_.:/%#@~]", chars: []rune{'_', '.', ':', '/', '%', '#', '@', '~'}, ignoreCase: false, @@ -11504,31 +11514,31 @@ var g = &grammar{ }, { name: "KeyWordEsc", - pos: position{line: 1630, col: 1, offset: 38691}, + pos: position{line: 1630, col: 1, offset: 38705}, expr: &actionExpr{ - pos: position{line: 1630, col: 14, offset: 38704}, + pos: position{line: 1630, col: 14, offset: 38718}, run: (*parser).callonKeyWordEsc1, expr: &seqExpr{ - pos: position{line: 1630, col: 14, offset: 38704}, + pos: position{line: 1630, col: 14, offset: 38718}, exprs: []any{ &litMatcher{ - pos: position{line: 1630, col: 14, offset: 38704}, + pos: position{line: 1630, col: 14, offset: 38718}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1630, col: 19, offset: 38709}, + pos: position{line: 1630, col: 19, offset: 38723}, label: "s", expr: &choiceExpr{ - pos: position{line: 1630, col: 22, offset: 38712}, + pos: position{line: 1630, col: 22, offset: 38726}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1630, col: 22, offset: 38712}, + pos: position{line: 1630, col: 22, offset: 38726}, name: "KeywordEscape", }, &ruleRefExpr{ - pos: position{line: 1630, col: 38, offset: 38728}, + pos: position{line: 1630, col: 38, offset: 38742}, name: "EscapeSequence", }, }, @@ -11542,42 +11552,42 @@ var g = &grammar{ }, { name: "GlobPattern", - pos: position{line: 1632, col: 1, offset: 38763}, + pos: position{line: 1632, col: 1, offset: 38777}, expr: &actionExpr{ - pos: position{line: 1633, col: 5, offset: 38779}, + pos: position{line: 1633, col: 5, offset: 38793}, run: (*parser).callonGlobPattern1, expr: &seqExpr{ - pos: position{line: 1633, col: 5, offset: 38779}, + pos: position{line: 1633, col: 5, offset: 38793}, exprs: []any{ &andExpr{ - pos: position{line: 1633, col: 5, offset: 38779}, + pos: position{line: 1633, col: 5, offset: 38793}, expr: &ruleRefExpr{ - pos: position{line: 1633, col: 6, offset: 38780}, + pos: position{line: 1633, col: 6, offset: 38794}, name: "GlobProperStart", }, }, &andExpr{ - pos: position{line: 1633, col: 22, offset: 38796}, + pos: position{line: 1633, col: 22, offset: 38810}, expr: &ruleRefExpr{ - pos: position{line: 1633, col: 23, offset: 38797}, + pos: position{line: 1633, col: 23, offset: 38811}, name: "GlobHasStar", }, }, &labeledExpr{ - pos: position{line: 1633, col: 35, offset: 38809}, + pos: position{line: 1633, col: 35, offset: 38823}, label: "head", expr: &ruleRefExpr{ - pos: position{line: 1633, col: 40, offset: 38814}, + pos: position{line: 1633, col: 40, offset: 38828}, name: "GlobStart", }, }, &labeledExpr{ - pos: position{line: 1633, col: 50, offset: 38824}, + pos: position{line: 1633, col: 50, offset: 38838}, label: "tail", expr: &zeroOrMoreExpr{ - pos: position{line: 1633, col: 55, offset: 38829}, + pos: position{line: 1633, col: 55, offset: 38843}, expr: &ruleRefExpr{ - pos: position{line: 1633, col: 55, offset: 38829}, + pos: position{line: 1633, col: 55, offset: 38843}, name: "GlobRest", }, }, @@ -11590,28 +11600,28 @@ var g = &grammar{ }, { name: "GlobProperStart", - pos: position{line: 1637, col: 1, offset: 38898}, + pos: position{line: 1637, col: 1, offset: 38912}, expr: &choiceExpr{ - pos: position{line: 1637, col: 19, offset: 38916}, + pos: position{line: 1637, col: 19, offset: 38930}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1637, col: 19, offset: 38916}, + pos: position{line: 1637, col: 19, offset: 38930}, name: "KeyWordStart", }, &seqExpr{ - pos: position{line: 1637, col: 34, offset: 38931}, + pos: position{line: 1637, col: 34, offset: 38945}, exprs: []any{ &oneOrMoreExpr{ - pos: position{line: 1637, col: 34, offset: 38931}, + pos: position{line: 1637, col: 34, offset: 38945}, expr: &litMatcher{ - pos: position{line: 1637, col: 34, offset: 38931}, + pos: position{line: 1637, col: 34, offset: 38945}, val: "*", ignoreCase: false, want: "\"*\"", }, }, &ruleRefExpr{ - pos: position{line: 1637, col: 39, offset: 38936}, + pos: position{line: 1637, col: 39, offset: 38950}, name: "KeyWordRest", }, }, @@ -11623,19 +11633,19 @@ var g = &grammar{ }, { name: "GlobHasStar", - pos: position{line: 1638, col: 1, offset: 38948}, + pos: position{line: 1638, col: 1, offset: 38962}, expr: &seqExpr{ - pos: position{line: 1638, col: 15, offset: 38962}, + pos: position{line: 1638, col: 15, offset: 38976}, exprs: []any{ &zeroOrMoreExpr{ - pos: position{line: 1638, col: 15, offset: 38962}, + pos: position{line: 1638, col: 15, offset: 38976}, expr: &ruleRefExpr{ - pos: position{line: 1638, col: 15, offset: 38962}, + pos: position{line: 1638, col: 15, offset: 38976}, name: "KeyWordRest", }, }, &litMatcher{ - pos: position{line: 1638, col: 28, offset: 38975}, + pos: position{line: 1638, col: 28, offset: 38989}, val: "*", ignoreCase: false, want: "\"*\"", @@ -11647,23 +11657,23 @@ var g = &grammar{ }, { name: "GlobStart", - pos: position{line: 1640, col: 1, offset: 38980}, + pos: position{line: 1640, col: 1, offset: 38994}, expr: &choiceExpr{ - pos: position{line: 1641, col: 5, offset: 38994}, + pos: position{line: 1641, col: 5, offset: 39008}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1641, col: 5, offset: 38994}, + pos: position{line: 1641, col: 5, offset: 39008}, name: "KeyWordChars", }, &ruleRefExpr{ - pos: position{line: 1642, col: 5, offset: 39011}, + pos: position{line: 1642, col: 5, offset: 39025}, name: "GlobEsc", }, &actionExpr{ - pos: position{line: 1643, col: 5, offset: 39023}, + pos: position{line: 1643, col: 5, offset: 39037}, run: (*parser).callonGlobStart4, expr: &litMatcher{ - pos: position{line: 1643, col: 5, offset: 39023}, + pos: position{line: 1643, col: 5, offset: 39037}, val: "*", ignoreCase: false, want: "\"*\"", @@ -11676,16 +11686,16 @@ var g = &grammar{ }, { name: "GlobRest", - pos: position{line: 1645, col: 1, offset: 39048}, + pos: position{line: 1645, col: 1, offset: 39062}, expr: &choiceExpr{ - pos: position{line: 1646, col: 5, offset: 39061}, + pos: position{line: 1646, col: 5, offset: 39075}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1646, col: 5, offset: 39061}, + pos: position{line: 1646, col: 5, offset: 39075}, name: "GlobStart", }, &charClassMatcher{ - pos: position{line: 1647, col: 5, offset: 39075}, + pos: position{line: 1647, col: 5, offset: 39089}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11698,31 +11708,31 @@ var g = &grammar{ }, { name: "GlobEsc", - pos: position{line: 1649, col: 1, offset: 39082}, + pos: position{line: 1649, col: 1, offset: 39096}, expr: &actionExpr{ - pos: position{line: 1649, col: 11, offset: 39092}, + pos: position{line: 1649, col: 11, offset: 39106}, run: (*parser).callonGlobEsc1, expr: &seqExpr{ - pos: position{line: 1649, col: 11, offset: 39092}, + pos: position{line: 1649, col: 11, offset: 39106}, exprs: []any{ &litMatcher{ - pos: position{line: 1649, col: 11, offset: 39092}, + pos: position{line: 1649, col: 11, offset: 39106}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1649, col: 16, offset: 39097}, + pos: position{line: 1649, col: 16, offset: 39111}, label: "s", expr: &choiceExpr{ - pos: position{line: 1649, col: 19, offset: 39100}, + pos: position{line: 1649, col: 19, offset: 39114}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1649, col: 19, offset: 39100}, + pos: position{line: 1649, col: 19, offset: 39114}, name: "GlobEscape", }, &ruleRefExpr{ - pos: position{line: 1649, col: 32, offset: 39113}, + pos: position{line: 1649, col: 32, offset: 39127}, name: "EscapeSequence", }, }, @@ -11736,32 +11746,32 @@ var g = &grammar{ }, { name: "GlobEscape", - pos: position{line: 1651, col: 1, offset: 39148}, + pos: position{line: 1651, col: 1, offset: 39162}, expr: &choiceExpr{ - pos: position{line: 1652, col: 5, offset: 39163}, + pos: position{line: 1652, col: 5, offset: 39177}, alternatives: []any{ &actionExpr{ - pos: position{line: 1652, col: 5, offset: 39163}, + pos: position{line: 1652, col: 5, offset: 39177}, run: (*parser).callonGlobEscape2, expr: &litMatcher{ - pos: position{line: 1652, col: 5, offset: 39163}, + pos: position{line: 1652, col: 5, offset: 39177}, val: "=", ignoreCase: false, want: "\"=\"", }, }, &actionExpr{ - pos: position{line: 1653, col: 5, offset: 39191}, + pos: position{line: 1653, col: 5, offset: 39205}, run: (*parser).callonGlobEscape4, expr: &litMatcher{ - pos: position{line: 1653, col: 5, offset: 39191}, + pos: position{line: 1653, col: 5, offset: 39205}, val: "*", ignoreCase: false, want: "\"*\"", }, }, &charClassMatcher{ - pos: position{line: 1654, col: 5, offset: 39221}, + pos: position{line: 1654, col: 5, offset: 39235}, val: "[+-]", chars: []rune{'+', '-'}, ignoreCase: false, @@ -11774,57 +11784,57 @@ var g = &grammar{ }, { name: "SingleQuotedChar", - pos: position{line: 1656, col: 1, offset: 39227}, + pos: position{line: 1656, col: 1, offset: 39241}, expr: &choiceExpr{ - pos: position{line: 1657, col: 5, offset: 39248}, + pos: position{line: 1657, col: 5, offset: 39262}, alternatives: []any{ &actionExpr{ - pos: position{line: 1657, col: 5, offset: 39248}, + pos: position{line: 1657, col: 5, offset: 39262}, run: (*parser).callonSingleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1657, col: 5, offset: 39248}, + pos: position{line: 1657, col: 5, offset: 39262}, exprs: []any{ ¬Expr{ - pos: position{line: 1657, col: 5, offset: 39248}, + pos: position{line: 1657, col: 5, offset: 39262}, expr: &choiceExpr{ - pos: position{line: 1657, col: 7, offset: 39250}, + pos: position{line: 1657, col: 7, offset: 39264}, alternatives: []any{ &litMatcher{ - pos: position{line: 1657, col: 7, offset: 39250}, + pos: position{line: 1657, col: 7, offset: 39264}, val: "'", ignoreCase: false, want: "\"'\"", }, &ruleRefExpr{ - pos: position{line: 1657, col: 13, offset: 39256}, + pos: position{line: 1657, col: 13, offset: 39270}, name: "EscapedChar", }, }, }, }, &anyMatcher{ - line: 1657, col: 26, offset: 39269, + line: 1657, col: 26, offset: 39283, }, }, }, }, &actionExpr{ - pos: position{line: 1658, col: 5, offset: 39306}, + pos: position{line: 1658, col: 5, offset: 39320}, run: (*parser).callonSingleQuotedChar9, expr: &seqExpr{ - pos: position{line: 1658, col: 5, offset: 39306}, + pos: position{line: 1658, col: 5, offset: 39320}, exprs: []any{ &litMatcher{ - pos: position{line: 1658, col: 5, offset: 39306}, + pos: position{line: 1658, col: 5, offset: 39320}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1658, col: 10, offset: 39311}, + pos: position{line: 1658, col: 10, offset: 39325}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1658, col: 12, offset: 39313}, + pos: position{line: 1658, col: 12, offset: 39327}, name: "EscapeSequence", }, }, @@ -11838,16 +11848,16 @@ var g = &grammar{ }, { name: "EscapeSequence", - pos: position{line: 1660, col: 1, offset: 39347}, + pos: position{line: 1660, col: 1, offset: 39361}, expr: &choiceExpr{ - pos: position{line: 1661, col: 5, offset: 39366}, + pos: position{line: 1661, col: 5, offset: 39380}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1661, col: 5, offset: 39366}, + pos: position{line: 1661, col: 5, offset: 39380}, name: "SingleCharEscape", }, &ruleRefExpr{ - pos: position{line: 1662, col: 5, offset: 39387}, + pos: position{line: 1662, col: 5, offset: 39401}, name: "UnicodeEscape", }, }, @@ -11857,87 +11867,87 @@ var g = &grammar{ }, { name: "SingleCharEscape", - pos: position{line: 1664, col: 1, offset: 39402}, + pos: position{line: 1664, col: 1, offset: 39416}, expr: &choiceExpr{ - pos: position{line: 1665, col: 5, offset: 39423}, + pos: position{line: 1665, col: 5, offset: 39437}, alternatives: []any{ &litMatcher{ - pos: position{line: 1665, col: 5, offset: 39423}, + pos: position{line: 1665, col: 5, offset: 39437}, val: "'", ignoreCase: false, want: "\"'\"", }, &actionExpr{ - pos: position{line: 1666, col: 5, offset: 39431}, + pos: position{line: 1666, col: 5, offset: 39445}, run: (*parser).callonSingleCharEscape3, expr: &litMatcher{ - pos: position{line: 1666, col: 5, offset: 39431}, + pos: position{line: 1666, col: 5, offset: 39445}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, }, &litMatcher{ - pos: position{line: 1667, col: 5, offset: 39471}, + pos: position{line: 1667, col: 5, offset: 39485}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &actionExpr{ - pos: position{line: 1668, col: 5, offset: 39480}, + pos: position{line: 1668, col: 5, offset: 39494}, run: (*parser).callonSingleCharEscape6, expr: &litMatcher{ - pos: position{line: 1668, col: 5, offset: 39480}, + pos: position{line: 1668, col: 5, offset: 39494}, val: "b", ignoreCase: false, want: "\"b\"", }, }, &actionExpr{ - pos: position{line: 1669, col: 5, offset: 39509}, + pos: position{line: 1669, col: 5, offset: 39523}, run: (*parser).callonSingleCharEscape8, expr: &litMatcher{ - pos: position{line: 1669, col: 5, offset: 39509}, + pos: position{line: 1669, col: 5, offset: 39523}, val: "f", ignoreCase: false, want: "\"f\"", }, }, &actionExpr{ - pos: position{line: 1670, col: 5, offset: 39538}, + pos: position{line: 1670, col: 5, offset: 39552}, run: (*parser).callonSingleCharEscape10, expr: &litMatcher{ - pos: position{line: 1670, col: 5, offset: 39538}, + pos: position{line: 1670, col: 5, offset: 39552}, val: "n", ignoreCase: false, want: "\"n\"", }, }, &actionExpr{ - pos: position{line: 1671, col: 5, offset: 39567}, + pos: position{line: 1671, col: 5, offset: 39581}, run: (*parser).callonSingleCharEscape12, expr: &litMatcher{ - pos: position{line: 1671, col: 5, offset: 39567}, + pos: position{line: 1671, col: 5, offset: 39581}, val: "r", ignoreCase: false, want: "\"r\"", }, }, &actionExpr{ - pos: position{line: 1672, col: 5, offset: 39596}, + pos: position{line: 1672, col: 5, offset: 39610}, run: (*parser).callonSingleCharEscape14, expr: &litMatcher{ - pos: position{line: 1672, col: 5, offset: 39596}, + pos: position{line: 1672, col: 5, offset: 39610}, val: "t", ignoreCase: false, want: "\"t\"", }, }, &actionExpr{ - pos: position{line: 1673, col: 5, offset: 39625}, + pos: position{line: 1673, col: 5, offset: 39639}, run: (*parser).callonSingleCharEscape16, expr: &litMatcher{ - pos: position{line: 1673, col: 5, offset: 39625}, + pos: position{line: 1673, col: 5, offset: 39639}, val: "v", ignoreCase: false, want: "\"v\"", @@ -11950,32 +11960,32 @@ var g = &grammar{ }, { name: "KeywordEscape", - pos: position{line: 1675, col: 1, offset: 39651}, + pos: position{line: 1675, col: 1, offset: 39665}, expr: &choiceExpr{ - pos: position{line: 1676, col: 5, offset: 39669}, + pos: position{line: 1676, col: 5, offset: 39683}, alternatives: []any{ &actionExpr{ - pos: position{line: 1676, col: 5, offset: 39669}, + pos: position{line: 1676, col: 5, offset: 39683}, run: (*parser).callonKeywordEscape2, expr: &litMatcher{ - pos: position{line: 1676, col: 5, offset: 39669}, + pos: position{line: 1676, col: 5, offset: 39683}, val: "=", ignoreCase: false, want: "\"=\"", }, }, &actionExpr{ - pos: position{line: 1677, col: 5, offset: 39697}, + pos: position{line: 1677, col: 5, offset: 39711}, run: (*parser).callonKeywordEscape4, expr: &litMatcher{ - pos: position{line: 1677, col: 5, offset: 39697}, + pos: position{line: 1677, col: 5, offset: 39711}, val: "*", ignoreCase: false, want: "\"*\"", }, }, &charClassMatcher{ - pos: position{line: 1678, col: 5, offset: 39725}, + pos: position{line: 1678, col: 5, offset: 39739}, val: "[+-]", chars: []rune{'+', '-'}, ignoreCase: false, @@ -11988,42 +11998,42 @@ var g = &grammar{ }, { name: "UnicodeEscape", - pos: position{line: 1680, col: 1, offset: 39731}, + pos: position{line: 1680, col: 1, offset: 39745}, expr: &choiceExpr{ - pos: position{line: 1681, col: 5, offset: 39749}, + pos: position{line: 1681, col: 5, offset: 39763}, alternatives: []any{ &actionExpr{ - pos: position{line: 1681, col: 5, offset: 39749}, + pos: position{line: 1681, col: 5, offset: 39763}, run: (*parser).callonUnicodeEscape2, expr: &seqExpr{ - pos: position{line: 1681, col: 5, offset: 39749}, + pos: position{line: 1681, col: 5, offset: 39763}, exprs: []any{ &litMatcher{ - pos: position{line: 1681, col: 5, offset: 39749}, + pos: position{line: 1681, col: 5, offset: 39763}, val: "u", ignoreCase: false, want: "\"u\"", }, &labeledExpr{ - pos: position{line: 1681, col: 9, offset: 39753}, + pos: position{line: 1681, col: 9, offset: 39767}, label: "chars", expr: &seqExpr{ - pos: position{line: 1681, col: 16, offset: 39760}, + pos: position{line: 1681, col: 16, offset: 39774}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1681, col: 16, offset: 39760}, + pos: position{line: 1681, col: 16, offset: 39774}, name: "HexDigit", }, &ruleRefExpr{ - pos: position{line: 1681, col: 25, offset: 39769}, + pos: position{line: 1681, col: 25, offset: 39783}, name: "HexDigit", }, &ruleRefExpr{ - pos: position{line: 1681, col: 34, offset: 39778}, + pos: position{line: 1681, col: 34, offset: 39792}, name: "HexDigit", }, &ruleRefExpr{ - pos: position{line: 1681, col: 43, offset: 39787}, + pos: position{line: 1681, col: 43, offset: 39801}, name: "HexDigit", }, }, @@ -12033,65 +12043,65 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1684, col: 5, offset: 39850}, + pos: position{line: 1684, col: 5, offset: 39864}, run: (*parser).callonUnicodeEscape11, expr: &seqExpr{ - pos: position{line: 1684, col: 5, offset: 39850}, + pos: position{line: 1684, col: 5, offset: 39864}, exprs: []any{ &litMatcher{ - pos: position{line: 1684, col: 5, offset: 39850}, + pos: position{line: 1684, col: 5, offset: 39864}, val: "u", ignoreCase: false, want: "\"u\"", }, &litMatcher{ - pos: position{line: 1684, col: 9, offset: 39854}, + pos: position{line: 1684, col: 9, offset: 39868}, val: "{", ignoreCase: false, want: "\"{\"", }, &labeledExpr{ - pos: position{line: 1684, col: 13, offset: 39858}, + pos: position{line: 1684, col: 13, offset: 39872}, label: "chars", expr: &seqExpr{ - pos: position{line: 1684, col: 20, offset: 39865}, + pos: position{line: 1684, col: 20, offset: 39879}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1684, col: 20, offset: 39865}, + pos: position{line: 1684, col: 20, offset: 39879}, name: "HexDigit", }, &zeroOrOneExpr{ - pos: position{line: 1684, col: 29, offset: 39874}, + pos: position{line: 1684, col: 29, offset: 39888}, expr: &ruleRefExpr{ - pos: position{line: 1684, col: 29, offset: 39874}, + pos: position{line: 1684, col: 29, offset: 39888}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1684, col: 39, offset: 39884}, + pos: position{line: 1684, col: 39, offset: 39898}, expr: &ruleRefExpr{ - pos: position{line: 1684, col: 39, offset: 39884}, + pos: position{line: 1684, col: 39, offset: 39898}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1684, col: 49, offset: 39894}, + pos: position{line: 1684, col: 49, offset: 39908}, expr: &ruleRefExpr{ - pos: position{line: 1684, col: 49, offset: 39894}, + pos: position{line: 1684, col: 49, offset: 39908}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1684, col: 59, offset: 39904}, + pos: position{line: 1684, col: 59, offset: 39918}, expr: &ruleRefExpr{ - pos: position{line: 1684, col: 59, offset: 39904}, + pos: position{line: 1684, col: 59, offset: 39918}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1684, col: 69, offset: 39914}, + pos: position{line: 1684, col: 69, offset: 39928}, expr: &ruleRefExpr{ - pos: position{line: 1684, col: 69, offset: 39914}, + pos: position{line: 1684, col: 69, offset: 39928}, name: "HexDigit", }, }, @@ -12099,7 +12109,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1684, col: 80, offset: 39925}, + pos: position{line: 1684, col: 80, offset: 39939}, val: "}", ignoreCase: false, want: "\"}\"", @@ -12114,37 +12124,37 @@ var g = &grammar{ }, { name: "RegexpPattern", - pos: position{line: 1688, col: 1, offset: 39979}, + pos: position{line: 1688, col: 1, offset: 39993}, expr: &actionExpr{ - pos: position{line: 1689, col: 5, offset: 39997}, + pos: position{line: 1689, col: 5, offset: 40011}, run: (*parser).callonRegexpPattern1, expr: &seqExpr{ - pos: position{line: 1689, col: 5, offset: 39997}, + pos: position{line: 1689, col: 5, offset: 40011}, exprs: []any{ &litMatcher{ - pos: position{line: 1689, col: 5, offset: 39997}, + pos: position{line: 1689, col: 5, offset: 40011}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 1689, col: 9, offset: 40001}, + pos: position{line: 1689, col: 9, offset: 40015}, label: "body", expr: &ruleRefExpr{ - pos: position{line: 1689, col: 14, offset: 40006}, + pos: position{line: 1689, col: 14, offset: 40020}, name: "RegexpBody", }, }, &litMatcher{ - pos: position{line: 1689, col: 25, offset: 40017}, + pos: position{line: 1689, col: 25, offset: 40031}, val: "/", ignoreCase: false, want: "\"/\"", }, ¬Expr{ - pos: position{line: 1689, col: 29, offset: 40021}, + pos: position{line: 1689, col: 29, offset: 40035}, expr: &ruleRefExpr{ - pos: position{line: 1689, col: 30, offset: 40022}, + pos: position{line: 1689, col: 30, offset: 40036}, name: "KeyWordStart", }, }, @@ -12156,33 +12166,33 @@ var g = &grammar{ }, { name: "RegexpBody", - pos: position{line: 1691, col: 1, offset: 40057}, + pos: position{line: 1691, col: 1, offset: 40071}, expr: &actionExpr{ - pos: position{line: 1692, col: 5, offset: 40072}, + pos: position{line: 1692, col: 5, offset: 40086}, run: (*parser).callonRegexpBody1, expr: &oneOrMoreExpr{ - pos: position{line: 1692, col: 5, offset: 40072}, + pos: position{line: 1692, col: 5, offset: 40086}, expr: &choiceExpr{ - pos: position{line: 1692, col: 6, offset: 40073}, + pos: position{line: 1692, col: 6, offset: 40087}, alternatives: []any{ &charClassMatcher{ - pos: position{line: 1692, col: 6, offset: 40073}, + pos: position{line: 1692, col: 6, offset: 40087}, val: "[^/\\\\]", chars: []rune{'/', '\\'}, ignoreCase: false, inverted: true, }, &seqExpr{ - pos: position{line: 1692, col: 15, offset: 40082}, + pos: position{line: 1692, col: 15, offset: 40096}, exprs: []any{ &litMatcher{ - pos: position{line: 1692, col: 15, offset: 40082}, + pos: position{line: 1692, col: 15, offset: 40096}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &anyMatcher{ - line: 1692, col: 20, offset: 40087, + line: 1692, col: 20, offset: 40101, }, }, }, @@ -12195,9 +12205,9 @@ var g = &grammar{ }, { name: "EscapedChar", - pos: position{line: 1694, col: 1, offset: 40123}, + pos: position{line: 1694, col: 1, offset: 40137}, expr: &charClassMatcher{ - pos: position{line: 1695, col: 5, offset: 40139}, + pos: position{line: 1695, col: 5, offset: 40153}, val: "[\\x00-\\x1f\\\\]", chars: []rune{'\\'}, ranges: []rune{'\x00', '\x1f'}, @@ -12209,11 +12219,11 @@ var g = &grammar{ }, { name: "_", - pos: position{line: 1697, col: 1, offset: 40154}, + pos: position{line: 1697, col: 1, offset: 40168}, expr: &oneOrMoreExpr{ - pos: position{line: 1697, col: 5, offset: 40158}, + pos: position{line: 1697, col: 5, offset: 40172}, expr: &ruleRefExpr{ - pos: position{line: 1697, col: 5, offset: 40158}, + pos: position{line: 1697, col: 5, offset: 40172}, name: "AnySpace", }, }, @@ -12222,11 +12232,11 @@ var g = &grammar{ }, { name: "__", - pos: position{line: 1699, col: 1, offset: 40169}, + pos: position{line: 1699, col: 1, offset: 40183}, expr: &zeroOrMoreExpr{ - pos: position{line: 1699, col: 6, offset: 40174}, + pos: position{line: 1699, col: 6, offset: 40188}, expr: &ruleRefExpr{ - pos: position{line: 1699, col: 6, offset: 40174}, + pos: position{line: 1699, col: 6, offset: 40188}, name: "AnySpace", }, }, @@ -12235,20 +12245,20 @@ var g = &grammar{ }, { name: "AnySpace", - pos: position{line: 1701, col: 1, offset: 40185}, + pos: position{line: 1701, col: 1, offset: 40199}, expr: &choiceExpr{ - pos: position{line: 1702, col: 5, offset: 40198}, + pos: position{line: 1702, col: 5, offset: 40212}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1702, col: 5, offset: 40198}, + pos: position{line: 1702, col: 5, offset: 40212}, name: "WhiteSpace", }, &ruleRefExpr{ - pos: position{line: 1703, col: 5, offset: 40213}, + pos: position{line: 1703, col: 5, offset: 40227}, name: "LineTerminator", }, &ruleRefExpr{ - pos: position{line: 1704, col: 5, offset: 40232}, + pos: position{line: 1704, col: 5, offset: 40246}, name: "Comment", }, }, @@ -12258,32 +12268,32 @@ var g = &grammar{ }, { name: "UnicodeLetter", - pos: position{line: 1706, col: 1, offset: 40241}, + pos: position{line: 1706, col: 1, offset: 40255}, expr: &choiceExpr{ - pos: position{line: 1707, col: 5, offset: 40259}, + pos: position{line: 1707, col: 5, offset: 40273}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1707, col: 5, offset: 40259}, + pos: position{line: 1707, col: 5, offset: 40273}, name: "Lu", }, &ruleRefExpr{ - pos: position{line: 1708, col: 5, offset: 40266}, + pos: position{line: 1708, col: 5, offset: 40280}, name: "Ll", }, &ruleRefExpr{ - pos: position{line: 1709, col: 5, offset: 40273}, + pos: position{line: 1709, col: 5, offset: 40287}, name: "Lt", }, &ruleRefExpr{ - pos: position{line: 1710, col: 5, offset: 40280}, + pos: position{line: 1710, col: 5, offset: 40294}, name: "Lm", }, &ruleRefExpr{ - pos: position{line: 1711, col: 5, offset: 40287}, + pos: position{line: 1711, col: 5, offset: 40301}, name: "Lo", }, &ruleRefExpr{ - pos: position{line: 1712, col: 5, offset: 40294}, + pos: position{line: 1712, col: 5, offset: 40308}, name: "Nl", }, }, @@ -12293,16 +12303,16 @@ var g = &grammar{ }, { name: "UnicodeCombiningMark", - pos: position{line: 1714, col: 1, offset: 40298}, + pos: position{line: 1714, col: 1, offset: 40312}, expr: &choiceExpr{ - pos: position{line: 1715, col: 5, offset: 40323}, + pos: position{line: 1715, col: 5, offset: 40337}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1715, col: 5, offset: 40323}, + pos: position{line: 1715, col: 5, offset: 40337}, name: "Mn", }, &ruleRefExpr{ - pos: position{line: 1716, col: 5, offset: 40330}, + pos: position{line: 1716, col: 5, offset: 40344}, name: "Mc", }, }, @@ -12312,9 +12322,9 @@ var g = &grammar{ }, { name: "UnicodeDigit", - pos: position{line: 1718, col: 1, offset: 40334}, + pos: position{line: 1718, col: 1, offset: 40348}, expr: &ruleRefExpr{ - pos: position{line: 1719, col: 5, offset: 40351}, + pos: position{line: 1719, col: 5, offset: 40365}, name: "Nd", }, leader: false, @@ -12322,9 +12332,9 @@ var g = &grammar{ }, { name: "UnicodeConnectorPunctuation", - pos: position{line: 1721, col: 1, offset: 40355}, + pos: position{line: 1721, col: 1, offset: 40369}, expr: &ruleRefExpr{ - pos: position{line: 1722, col: 5, offset: 40387}, + pos: position{line: 1722, col: 5, offset: 40401}, name: "Pc", }, leader: false, @@ -12332,9 +12342,9 @@ var g = &grammar{ }, { name: "Ll", - pos: position{line: 1728, col: 1, offset: 40568}, + pos: position{line: 1728, col: 1, offset: 40582}, expr: &charClassMatcher{ - pos: position{line: 1728, col: 6, offset: 40573}, + pos: position{line: 1728, col: 6, offset: 40587}, 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', 'ﬓ', 'ﬗ', 'ａ', 'ｚ'}, @@ -12346,9 +12356,9 @@ var g = &grammar{ }, { name: "Lm", - pos: position{line: 1731, col: 1, offset: 44725}, + pos: position{line: 1731, col: 1, offset: 44739}, expr: &charClassMatcher{ - pos: position{line: 1731, col: 6, offset: 44730}, + pos: position{line: 1731, col: 6, offset: 44744}, 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{'ʰ', 'ˁ', 'ˆ', 'ˑ', 'ˠ', 'ˤ', 'ۥ', 'ۦ', 'ߴ', 'ߵ', 'ᱸ', 'ᱽ', 'ᴬ', 'ᵪ', 'ᶛ', 'ᶿ', 'ₐ', 'ₜ', 'ⱼ', 'ⱽ', '〱', '〵', 'ゝ', 'ゞ', 'ー', 'ヾ', 'ꓸ', 'ꓽ', 'ꚜ', 'ꚝ', 'ꜗ', 'ꜟ', 'ꟸ', 'ꟹ', 'ꫳ', 'ꫴ', 'ꭜ', 'ꭟ', 'ﾞ', 'ﾟ'}, @@ -12360,9 +12370,9 @@ var g = &grammar{ }, { name: "Lo", - pos: position{line: 1734, col: 1, offset: 45215}, + pos: position{line: 1734, col: 1, offset: 45229}, expr: &charClassMatcher{ - pos: position{line: 1734, col: 6, offset: 45220}, + pos: position{line: 1734, col: 6, offset: 45234}, 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{'ǀ', 'ǃ', 'א', 'ת', 'ׯ', 'ײ', 'ؠ', 'ؿ', 'ف', 'ي', 'ٮ', 'ٯ', 'ٱ', 'ۓ', 'ۮ', 'ۯ', 'ۺ', 'ۼ', 'ܒ', 'ܯ', 'ݍ', 'ޥ', 'ߊ', 'ߪ', 'ࠀ', 'ࠕ', 'ࡀ', 'ࡘ', 'ࡠ', 'ࡪ', 'ࢠ', 'ࢴ', 'ࢶ', 'ࢽ', 'ऄ', 'ह', 'क़', 'ॡ', 'ॲ', 'ঀ', 'অ', 'ঌ', 'এ', 'ঐ', 'ও', 'ন', 'প', 'র', 'শ', 'হ', 'ড়', 'ঢ়', 'য়', 'ৡ', 'ৰ', 'ৱ', 'ਅ', 'ਊ', 'ਏ', 'ਐ', 'ਓ', 'ਨ', 'ਪ', 'ਰ', 'ਲ', 'ਲ਼', 'ਵ', 'ਸ਼', 'ਸ', 'ਹ', 'ਖ਼', 'ੜ', 'ੲ', 'ੴ', 'અ', 'ઍ', 'એ', 'ઑ', 'ઓ', 'ન', 'પ', 'ર', 'લ', 'ળ', 'વ', 'હ', 'ૠ', 'ૡ', 'ଅ', 'ଌ', 'ଏ', 'ଐ', 'ଓ', 'ନ', 'ପ', 'ର', 'ଲ', 'ଳ', 'ଵ', 'ହ', 'ଡ଼', 'ଢ଼', 'ୟ', 'ୡ', 'அ', 'ஊ', 'எ', 'ஐ', 'ஒ', 'க', 'ங', 'ச', 'ஞ', 'ட', 'ண', 'த', 'ந', 'ப', 'ம', 'ஹ', 'అ', 'ఌ', 'ఎ', 'ఐ', 'ఒ', 'న', 'ప', 'హ', 'ౘ', 'ౚ', 'ౠ', 'ౡ', 'ಅ', 'ಌ', 'ಎ', 'ಐ', 'ಒ', 'ನ', 'ಪ', 'ಳ', 'ವ', 'ಹ', 'ೠ', 'ೡ', 'ೱ', 'ೲ', 'അ', 'ഌ', 'എ', 'ഐ', 'ഒ', 'ഺ', 'ൔ', 'ൖ', 'ൟ', 'ൡ', 'ൺ', 'ൿ', 'අ', 'ඖ', 'ක', 'න', 'ඳ', 'ර', 'ව', 'ෆ', 'ก', 'ะ', 'า', 'ำ', 'เ', 'ๅ', 'ກ', 'ຂ', 'ງ', 'ຈ', 'ດ', 'ທ', 'ນ', 'ຟ', 'ມ', 'ຣ', 'ສ', 'ຫ', 'ອ', 'ະ', 'າ', 'ຳ', 'ເ', 'ໄ', 'ໜ', 'ໟ', 'ཀ', 'ཇ', 'ཉ', 'ཬ', 'ྈ', 'ྌ', 'က', 'ဪ', 'ၐ', 'ၕ', 'ၚ', 'ၝ', 'ၥ', 'ၦ', 'ၮ', 'ၰ', 'ၵ', 'ႁ', 'ᄀ', 'ቈ', 'ቊ', 'ቍ', 'ቐ', 'ቖ', 'ቚ', 'ቝ', 'በ', 'ኈ', 'ኊ', 'ኍ', 'ነ', 'ኰ', 'ኲ', 'ኵ', 'ኸ', 'ኾ', 'ዂ', 'ዅ', 'ወ', 'ዖ', 'ዘ', 'ጐ', 'ጒ', 'ጕ', 'ጘ', 'ፚ', 'ᎀ', 'ᎏ', 'ᐁ', 'ᙬ', 'ᙯ', 'ᙿ', 'ᚁ', 'ᚚ', 'ᚠ', 'ᛪ', 'ᛱ', 'ᛸ', 'ᜀ', 'ᜌ', 'ᜎ', 'ᜑ', 'ᜠ', 'ᜱ', 'ᝀ', 'ᝑ', 'ᝠ', 'ᝬ', 'ᝮ', 'ᝰ', 'ក', 'ឳ', 'ᠠ', 'ᡂ', 'ᡄ', 'ᡸ', 'ᢀ', 'ᢄ', 'ᢇ', 'ᢨ', 'ᢰ', 'ᣵ', 'ᤀ', 'ᤞ', 'ᥐ', 'ᥭ', 'ᥰ', 'ᥴ', 'ᦀ', 'ᦫ', 'ᦰ', 'ᧉ', 'ᨀ', 'ᨖ', 'ᨠ', 'ᩔ', 'ᬅ', 'ᬳ', 'ᭅ', 'ᭋ', 'ᮃ', 'ᮠ', 'ᮮ', 'ᮯ', 'ᮺ', 'ᯥ', 'ᰀ', 'ᰣ', 'ᱍ', 'ᱏ', 'ᱚ', 'ᱷ', 'ᳩ', 'ᳬ', 'ᳮ', 'ᳱ', 'ᳵ', 'ᳶ', 'ℵ', 'ℸ', 'ⴰ', 'ⵧ', 'ⶀ', 'ⶖ', 'ⶠ', 'ⶦ', 'ⶨ', 'ⶮ', 'ⶰ', 'ⶶ', 'ⶸ', 'ⶾ', 'ⷀ', 'ⷆ', 'ⷈ', 'ⷎ', 'ⷐ', 'ⷖ', 'ⷘ', 'ⷞ', 'ぁ', 'ゖ', 'ァ', 'ヺ', 'ㄅ', 'ㄯ', 'ㄱ', 'ㆎ', 'ㆠ', 'ㆺ', 'ㇰ', 'ㇿ', '㐀', '䶵', '一', '鿯', 'ꀀ', 'ꀔ', 'ꀖ', 'ꒌ', 'ꓐ', 'ꓷ', 'ꔀ', 'ꘋ', 'ꘐ', 'ꘟ', 'ꘪ', 'ꘫ', 'ꚠ', 'ꛥ', 'ꟻ', 'ꠁ', 'ꠃ', 'ꠅ', 'ꠇ', 'ꠊ', 'ꠌ', 'ꠢ', 'ꡀ', 'ꡳ', 'ꢂ', 'ꢳ', 'ꣲ', 'ꣷ', 'ꣽ', 'ꣾ', 'ꤊ', 'ꤥ', 'ꤰ', 'ꥆ', 'ꥠ', 'ꥼ', 'ꦄ', 'ꦲ', 'ꧠ', 'ꧤ', 'ꧧ', 'ꧯ', 'ꧺ', 'ꧾ', 'ꨀ', 'ꨨ', 'ꩀ', 'ꩂ', 'ꩄ', 'ꩋ', 'ꩠ', 'ꩯ', 'ꩱ', 'ꩶ', 'ꩾ', 'ꪯ', 'ꪵ', 'ꪶ', 'ꪹ', 'ꪽ', 'ꫛ', 'ꫜ', 'ꫠ', 'ꫪ', 'ꬁ', 'ꬆ', 'ꬉ', 'ꬎ', 'ꬑ', 'ꬖ', 'ꬠ', 'ꬦ', 'ꬨ', 'ꬮ', 'ꯀ', 'ꯢ', '가', '힣', 'ힰ', 'ퟆ', 'ퟋ', 'ퟻ', '豈', '舘', '並', '龎', 'ײַ', 'ﬨ', 'שׁ', 'זּ', 'טּ', 'לּ', 'נּ', 'סּ', 'ףּ', 'פּ', 'צּ', 'ﮱ', 'ﯓ', 'ﴽ', 'ﵐ', 'ﶏ', 'ﶒ', 'ﷇ', 'ﷰ', 'ﷻ', 'ﹰ', 'ﹴ', 'ﹶ', 'ﻼ', 'ｦ', 'ｯ', 'ｱ', 'ﾝ', 'ﾠ', 'ﾾ', 'ￂ', 'ￇ', 'ￊ', 'ￏ', 'ￒ', 'ￗ', 'ￚ', 'ￜ'}, @@ -12374,9 +12384,9 @@ var g = &grammar{ }, { name: "Lt", - pos: position{line: 1737, col: 1, offset: 48667}, + pos: position{line: 1737, col: 1, offset: 48681}, expr: &charClassMatcher{ - pos: position{line: 1737, col: 6, offset: 48672}, + pos: position{line: 1737, col: 6, offset: 48686}, val: "[\\u01C5\\u01C8\\u01CB\\u01F2\\u1F88-\\u1F8F\\u1F98-\\u1F9F\\u1FA8-\\u1FAF\\u1FBC\\u1FCC\\u1FFC]", chars: []rune{'Dž', 'Lj', 'Nj', 'Dz', 'ᾼ', 'ῌ', 'ῼ'}, ranges: []rune{'ᾈ', 'ᾏ', 'ᾘ', 'ᾟ', 'ᾨ', 'ᾯ'}, @@ -12388,9 +12398,9 @@ var g = &grammar{ }, { name: "Lu", - pos: position{line: 1740, col: 1, offset: 48778}, + pos: position{line: 1740, col: 1, offset: 48792}, expr: &charClassMatcher{ - pos: position{line: 1740, col: 6, offset: 48783}, + pos: position{line: 1740, col: 6, offset: 48797}, 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', 'ℭ', 'ℰ', 'ℳ', 'ℾ', 'ℿ', 'Ⰰ', 'Ⱞ', 'Ɫ', 'Ɽ', 'Ɑ', 'Ɒ', 'Ȿ', 'Ⲁ', 'Ᵹ', 'Ꝿ', 'Ɦ', 'Ɪ', 'Ʞ', 'Ꞵ', 'Ａ', 'Ｚ'}, @@ -12402,9 +12412,9 @@ var g = &grammar{ }, { name: "Mc", - pos: position{line: 1743, col: 1, offset: 52784}, + pos: position{line: 1743, col: 1, offset: 52798}, expr: &charClassMatcher{ - pos: position{line: 1743, col: 6, offset: 52789}, + pos: position{line: 1743, col: 6, offset: 52803}, 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{'ा', 'ी', 'ॉ', 'ौ', 'ॎ', 'ॏ', 'ং', 'ঃ', 'া', 'ী', 'ে', 'ৈ', 'ো', 'ৌ', 'ਾ', 'ੀ', 'ા', 'ી', 'ો', 'ૌ', 'ଂ', 'ଃ', 'େ', 'ୈ', 'ୋ', 'ୌ', 'ா', 'ி', 'ு', 'ூ', 'ெ', 'ை', 'ொ', 'ௌ', 'ఁ', 'ః', 'ు', 'ౄ', 'ಂ', 'ಃ', 'ೀ', 'ೄ', 'ೇ', 'ೈ', 'ೊ', 'ೋ', 'ೕ', 'ೖ', 'ം', 'ഃ', 'ാ', 'ീ', 'െ', 'ൈ', 'ൊ', 'ൌ', 'ං', 'ඃ', 'ා', 'ෑ', 'ෘ', 'ෟ', 'ෲ', 'ෳ', '༾', '༿', 'ါ', 'ာ', 'ျ', 'ြ', 'ၖ', 'ၗ', 'ၢ', 'ၤ', 'ၧ', 'ၭ', 'ႃ', 'ႄ', 'ႇ', 'ႌ', 'ႚ', 'ႜ', 'ើ', 'ៅ', 'ះ', 'ៈ', 'ᤣ', 'ᤦ', 'ᤩ', 'ᤫ', 'ᤰ', 'ᤱ', 'ᤳ', 'ᤸ', 'ᨙ', 'ᨚ', 'ᩣ', 'ᩤ', 'ᩭ', 'ᩲ', 'ᬽ', 'ᭁ', 'ᭃ', '᭄', 'ᮦ', 'ᮧ', 'ᯪ', 'ᯬ', '᯲', '᯳', 'ᰤ', 'ᰫ', 'ᰴ', 'ᰵ', 'ᳲ', 'ᳳ', '〮', '〯', 'ꠣ', 'ꠤ', 'ꢀ', 'ꢁ', 'ꢴ', 'ꣃ', 'ꥒ', '꥓', 'ꦴ', 'ꦵ', 'ꦺ', 'ꦻ', 'ꦽ', '꧀', 'ꨯ', 'ꨰ', 'ꨳ', 'ꨴ', 'ꫮ', 'ꫯ', 'ꯣ', 'ꯤ', 'ꯦ', 'ꯧ', 'ꯩ', 'ꯪ'}, @@ -12416,9 +12426,9 @@ var g = &grammar{ }, { name: "Mn", - pos: position{line: 1746, col: 1, offset: 53977}, + pos: position{line: 1746, col: 1, offset: 53991}, expr: &charClassMatcher{ - pos: position{line: 1746, col: 6, offset: 53982}, + pos: position{line: 1746, col: 6, offset: 53996}, 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{'̀', 'ͯ', '҃', '҇', '֑', 'ֽ', 'ׁ', 'ׂ', 'ׄ', 'ׅ', 'ؐ', 'ؚ', 'ً', 'ٟ', 'ۖ', 'ۜ', '۟', 'ۤ', 'ۧ', 'ۨ', '۪', 'ۭ', 'ܰ', '݊', 'ަ', 'ް', '߫', '߳', 'ࠖ', '࠙', 'ࠛ', 'ࠣ', 'ࠥ', 'ࠧ', 'ࠩ', '࠭', '࡙', '࡛', '࣓', '࣡', 'ࣣ', 'ं', 'ु', 'ै', '॑', 'ॗ', 'ॢ', 'ॣ', 'ু', 'ৄ', 'ৢ', 'ৣ', 'ਁ', 'ਂ', 'ੁ', 'ੂ', 'ੇ', 'ੈ', 'ੋ', '੍', 'ੰ', 'ੱ', 'ઁ', 'ં', 'ુ', 'ૅ', 'ે', 'ૈ', 'ૢ', 'ૣ', 'ૺ', '૿', 'ୁ', 'ୄ', 'ୢ', 'ୣ', 'ా', 'ీ', 'ె', 'ై', 'ొ', '్', 'ౕ', 'ౖ', 'ౢ', 'ౣ', 'ೌ', '್', 'ೢ', 'ೣ', 'ഀ', 'ഁ', '഻', '഼', 'ു', 'ൄ', 'ൢ', 'ൣ', 'ි', 'ු', 'ิ', 'ฺ', '็', '๎', 'ິ', 'ູ', 'ົ', 'ຼ', '່', 'ໍ', '༘', '༙', 'ཱ', 'ཾ', 'ྀ', '྄', '྆', '྇', 'ྍ', 'ྗ', 'ྙ', 'ྼ', 'ိ', 'ူ', 'ဲ', '့', '္', '်', 'ွ', 'ှ', 'ၘ', 'ၙ', 'ၞ', 'ၠ', 'ၱ', 'ၴ', 'ႅ', 'ႆ', '፝', '፟', 'ᜒ', '᜔', 'ᜲ', '᜴', 'ᝒ', 'ᝓ', 'ᝲ', 'ᝳ', '឴', '឵', 'ិ', 'ួ', '៉', '៓', '᠋', '᠍', 'ᢅ', 'ᢆ', 'ᤠ', 'ᤢ', 'ᤧ', 'ᤨ', '᤹', '᤻', 'ᨗ', 'ᨘ', 'ᩘ', 'ᩞ', 'ᩥ', 'ᩬ', 'ᩳ', '᩼', '᪰', '᪽', 'ᬀ', 'ᬃ', 'ᬶ', 'ᬺ', '᭫', '᭳', 'ᮀ', 'ᮁ', 'ᮢ', 'ᮥ', 'ᮨ', 'ᮩ', '᮫', 'ᮭ', 'ᯨ', 'ᯩ', 'ᯯ', 'ᯱ', 'ᰬ', 'ᰳ', 'ᰶ', '᰷', '᳐', '᳒', '᳔', '᳠', '᳢', '᳨', '᳸', '᳹', '᷀', '᷹', '᷻', '᷿', '⃐', '⃜', '⃥', '⃰', '⳯', '⳱', 'ⷠ', 'ⷿ', '〪', '〭', '゙', '゚', 'ꙴ', '꙽', 'ꚞ', 'ꚟ', '꛰', '꛱', 'ꠥ', 'ꠦ', '꣄', 'ꣅ', '꣠', '꣱', 'ꤦ', '꤭', 'ꥇ', 'ꥑ', 'ꦀ', 'ꦂ', 'ꦶ', 'ꦹ', 'ꨩ', 'ꨮ', 'ꨱ', 'ꨲ', 'ꨵ', 'ꨶ', 'ꪲ', 'ꪴ', 'ꪷ', 'ꪸ', 'ꪾ', '꪿', 'ꫬ', 'ꫭ', '︀', '️', '︠', '︯'}, @@ -12430,9 +12440,9 @@ var g = &grammar{ }, { name: "Nd", - pos: position{line: 1749, col: 1, offset: 56162}, + pos: position{line: 1749, col: 1, offset: 56176}, expr: &charClassMatcher{ - pos: position{line: 1749, col: 6, offset: 56167}, + pos: position{line: 1749, col: 6, offset: 56181}, 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, @@ -12443,9 +12453,9 @@ var g = &grammar{ }, { name: "Nl", - pos: position{line: 1752, col: 1, offset: 56670}, + pos: position{line: 1752, col: 1, offset: 56684}, expr: &charClassMatcher{ - pos: position{line: 1752, col: 6, offset: 56675}, + pos: position{line: 1752, col: 6, offset: 56689}, val: "[\\u16EE-\\u16F0\\u2160-\\u2182\\u2185-\\u2188\\u3007\\u3021-\\u3029\\u3038-\\u303A\\uA6E6-\\uA6EF]", chars: []rune{'〇'}, ranges: []rune{'ᛮ', 'ᛰ', 'Ⅰ', 'ↂ', 'ↅ', 'ↈ', '〡', '〩', '〸', '〺', 'ꛦ', 'ꛯ'}, @@ -12457,9 +12467,9 @@ var g = &grammar{ }, { name: "Pc", - pos: position{line: 1755, col: 1, offset: 56789}, + pos: position{line: 1755, col: 1, offset: 56803}, expr: &charClassMatcher{ - pos: position{line: 1755, col: 6, offset: 56794}, + pos: position{line: 1755, col: 6, offset: 56808}, val: "[\\u005F\\u203F-\\u2040\\u2054\\uFE33-\\uFE34\\uFE4D-\\uFE4F\\uFF3F]", chars: []rune{'_', '⁔', '＿'}, ranges: []rune{'‿', '⁀', '︳', '︴', '﹍', '﹏'}, @@ -12471,9 +12481,9 @@ var g = &grammar{ }, { name: "Zs", - pos: position{line: 1758, col: 1, offset: 56875}, + pos: position{line: 1758, col: 1, offset: 56889}, expr: &charClassMatcher{ - pos: position{line: 1758, col: 6, offset: 56880}, + pos: position{line: 1758, col: 6, offset: 56894}, val: "[\\u0020\\u00A0\\u1680\\u2000-\\u200A\\u202F\\u205F\\u3000]", chars: []rune{' ', '\u00a0', '\u1680', '\u202f', '\u205f', '\u3000'}, ranges: []rune{'\u2000', '\u200a'}, @@ -12485,9 +12495,9 @@ var g = &grammar{ }, { name: "SourceCharacter", - pos: position{line: 1760, col: 1, offset: 56933}, + pos: position{line: 1760, col: 1, offset: 56947}, expr: &anyMatcher{ - line: 1761, col: 5, offset: 56953, + line: 1761, col: 5, offset: 56967, }, leader: false, leftRecursive: false, @@ -12495,48 +12505,48 @@ var g = &grammar{ { name: "WhiteSpace", displayName: "\"whitespace\"", - pos: position{line: 1763, col: 1, offset: 56956}, + pos: position{line: 1763, col: 1, offset: 56970}, expr: &choiceExpr{ - pos: position{line: 1764, col: 5, offset: 56984}, + pos: position{line: 1764, col: 5, offset: 56998}, alternatives: []any{ &litMatcher{ - pos: position{line: 1764, col: 5, offset: 56984}, + pos: position{line: 1764, col: 5, offset: 56998}, val: "\t", ignoreCase: false, want: "\"\\t\"", }, &litMatcher{ - pos: position{line: 1765, col: 5, offset: 56993}, + pos: position{line: 1765, col: 5, offset: 57007}, val: "\v", ignoreCase: false, want: "\"\\v\"", }, &litMatcher{ - pos: position{line: 1766, col: 5, offset: 57002}, + pos: position{line: 1766, col: 5, offset: 57016}, val: "\f", ignoreCase: false, want: "\"\\f\"", }, &litMatcher{ - pos: position{line: 1767, col: 5, offset: 57011}, + pos: position{line: 1767, col: 5, offset: 57025}, val: " ", ignoreCase: false, want: "\" \"", }, &litMatcher{ - pos: position{line: 1768, col: 5, offset: 57019}, + pos: position{line: 1768, col: 5, offset: 57033}, val: "\u00a0", ignoreCase: false, want: "\"\\u00a0\"", }, &litMatcher{ - pos: position{line: 1769, col: 5, offset: 57032}, + pos: position{line: 1769, col: 5, offset: 57046}, val: "\ufeff", ignoreCase: false, want: "\"\\ufeff\"", }, &ruleRefExpr{ - pos: position{line: 1770, col: 5, offset: 57045}, + pos: position{line: 1770, col: 5, offset: 57059}, name: "Zs", }, }, @@ -12546,9 +12556,9 @@ var g = &grammar{ }, { name: "LineTerminator", - pos: position{line: 1772, col: 1, offset: 57049}, + pos: position{line: 1772, col: 1, offset: 57063}, expr: &charClassMatcher{ - pos: position{line: 1773, col: 5, offset: 57068}, + pos: position{line: 1773, col: 5, offset: 57082}, val: "[\\n\\r\\u2028\\u2029]", chars: []rune{'\n', '\r', '\u2028', '\u2029'}, ignoreCase: false, @@ -12560,9 +12570,9 @@ var g = &grammar{ { name: "Comment", displayName: "\"comment\"", - pos: position{line: 1779, col: 1, offset: 57398}, + pos: position{line: 1779, col: 1, offset: 57412}, expr: &ruleRefExpr{ - pos: position{line: 1782, col: 5, offset: 57469}, + pos: position{line: 1782, col: 5, offset: 57483}, name: "SingleLineComment", }, leader: false, @@ -12570,39 +12580,39 @@ var g = &grammar{ }, { name: "MultiLineComment", - pos: position{line: 1784, col: 1, offset: 57488}, + pos: position{line: 1784, col: 1, offset: 57502}, expr: &seqExpr{ - pos: position{line: 1785, col: 5, offset: 57509}, + pos: position{line: 1785, col: 5, offset: 57523}, exprs: []any{ &litMatcher{ - pos: position{line: 1785, col: 5, offset: 57509}, + pos: position{line: 1785, col: 5, offset: 57523}, val: "/*", ignoreCase: false, want: "\"/*\"", }, &zeroOrMoreExpr{ - pos: position{line: 1785, col: 10, offset: 57514}, + pos: position{line: 1785, col: 10, offset: 57528}, expr: &seqExpr{ - pos: position{line: 1785, col: 11, offset: 57515}, + pos: position{line: 1785, col: 11, offset: 57529}, exprs: []any{ ¬Expr{ - pos: position{line: 1785, col: 11, offset: 57515}, + pos: position{line: 1785, col: 11, offset: 57529}, expr: &litMatcher{ - pos: position{line: 1785, col: 12, offset: 57516}, + pos: position{line: 1785, col: 12, offset: 57530}, val: "*/", ignoreCase: false, want: "\"*/\"", }, }, &ruleRefExpr{ - pos: position{line: 1785, col: 17, offset: 57521}, + pos: position{line: 1785, col: 17, offset: 57535}, name: "SourceCharacter", }, }, }, }, &litMatcher{ - pos: position{line: 1785, col: 35, offset: 57539}, + pos: position{line: 1785, col: 35, offset: 57553}, val: "*/", ignoreCase: false, want: "\"*/\"", @@ -12614,33 +12624,33 @@ var g = &grammar{ }, { name: "SingleLineComment", - pos: position{line: 1787, col: 1, offset: 57545}, + pos: position{line: 1787, col: 1, offset: 57559}, expr: &choiceExpr{ - pos: position{line: 1788, col: 5, offset: 57567}, + pos: position{line: 1788, col: 5, offset: 57581}, alternatives: []any{ &seqExpr{ - pos: position{line: 1788, col: 5, offset: 57567}, + pos: position{line: 1788, col: 5, offset: 57581}, exprs: []any{ &litMatcher{ - pos: position{line: 1788, col: 5, offset: 57567}, + pos: position{line: 1788, col: 5, offset: 57581}, val: "//", ignoreCase: false, want: "\"//\"", }, &zeroOrMoreExpr{ - pos: position{line: 1788, col: 10, offset: 57572}, + pos: position{line: 1788, col: 10, offset: 57586}, expr: &seqExpr{ - pos: position{line: 1788, col: 11, offset: 57573}, + pos: position{line: 1788, col: 11, offset: 57587}, exprs: []any{ ¬Expr{ - pos: position{line: 1788, col: 11, offset: 57573}, + pos: position{line: 1788, col: 11, offset: 57587}, expr: &ruleRefExpr{ - pos: position{line: 1788, col: 12, offset: 57574}, + pos: position{line: 1788, col: 12, offset: 57588}, name: "LineTerminator", }, }, &ruleRefExpr{ - pos: position{line: 1788, col: 27, offset: 57589}, + pos: position{line: 1788, col: 27, offset: 57603}, name: "SourceCharacter", }, }, @@ -12649,28 +12659,28 @@ var g = &grammar{ }, }, &seqExpr{ - pos: position{line: 1789, col: 5, offset: 57611}, + pos: position{line: 1789, col: 5, offset: 57625}, exprs: []any{ &litMatcher{ - pos: position{line: 1789, col: 5, offset: 57611}, + pos: position{line: 1789, col: 5, offset: 57625}, val: "--", ignoreCase: false, want: "\"--\"", }, &zeroOrMoreExpr{ - pos: position{line: 1789, col: 10, offset: 57616}, + pos: position{line: 1789, col: 10, offset: 57630}, expr: &seqExpr{ - pos: position{line: 1789, col: 11, offset: 57617}, + pos: position{line: 1789, col: 11, offset: 57631}, exprs: []any{ ¬Expr{ - pos: position{line: 1789, col: 11, offset: 57617}, + pos: position{line: 1789, col: 11, offset: 57631}, expr: &ruleRefExpr{ - pos: position{line: 1789, col: 12, offset: 57618}, + pos: position{line: 1789, col: 12, offset: 57632}, name: "LineTerminator", }, }, &ruleRefExpr{ - pos: position{line: 1789, col: 27, offset: 57633}, + pos: position{line: 1789, col: 27, offset: 57647}, name: "SourceCharacter", }, }, @@ -12685,19 +12695,19 @@ var g = &grammar{ }, { name: "EOL", - pos: position{line: 1791, col: 1, offset: 57652}, + pos: position{line: 1791, col: 1, offset: 57666}, expr: &seqExpr{ - pos: position{line: 1791, col: 7, offset: 57658}, + pos: position{line: 1791, col: 7, offset: 57672}, exprs: []any{ &zeroOrMoreExpr{ - pos: position{line: 1791, col: 7, offset: 57658}, + pos: position{line: 1791, col: 7, offset: 57672}, expr: &ruleRefExpr{ - pos: position{line: 1791, col: 7, offset: 57658}, + pos: position{line: 1791, col: 7, offset: 57672}, name: "WhiteSpace", }, }, &ruleRefExpr{ - pos: position{line: 1791, col: 19, offset: 57670}, + pos: position{line: 1791, col: 19, offset: 57684}, name: "LineTerminator", }, }, @@ -12707,16 +12717,16 @@ var g = &grammar{ }, { name: "EOT", - pos: position{line: 1793, col: 1, offset: 57686}, + pos: position{line: 1793, col: 1, offset: 57700}, expr: &choiceExpr{ - pos: position{line: 1793, col: 7, offset: 57692}, + pos: position{line: 1793, col: 7, offset: 57706}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1793, col: 7, offset: 57692}, + pos: position{line: 1793, col: 7, offset: 57706}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1793, col: 11, offset: 57696}, + pos: position{line: 1793, col: 11, offset: 57710}, name: "EOF", }, }, @@ -12726,11 +12736,11 @@ var g = &grammar{ }, { name: "EOF", - pos: position{line: 1795, col: 1, offset: 57701}, + pos: position{line: 1795, col: 1, offset: 57715}, expr: ¬Expr{ - pos: position{line: 1795, col: 7, offset: 57707}, + pos: position{line: 1795, col: 7, offset: 57721}, expr: &anyMatcher{ - line: 1795, col: 8, offset: 57708, + line: 1795, col: 8, offset: 57722, }, }, leader: false, @@ -12738,11 +12748,11 @@ var g = &grammar{ }, { name: "EOKW", - pos: position{line: 1797, col: 1, offset: 57711}, + pos: position{line: 1797, col: 1, offset: 57725}, expr: ¬Expr{ - pos: position{line: 1797, col: 8, offset: 57718}, + pos: position{line: 1797, col: 8, offset: 57732}, expr: &ruleRefExpr{ - pos: position{line: 1797, col: 9, offset: 57719}, + pos: position{line: 1797, col: 9, offset: 57733}, name: "KeyWordChars", }, }, @@ -12751,15 +12761,15 @@ var g = &grammar{ }, { name: "SQLPipe", - pos: position{line: 1801, col: 1, offset: 57755}, + pos: position{line: 1801, col: 1, offset: 57769}, expr: &actionExpr{ - pos: position{line: 1802, col: 5, offset: 57768}, + pos: position{line: 1802, col: 5, offset: 57782}, run: (*parser).callonSQLPipe1, expr: &labeledExpr{ - pos: position{line: 1802, col: 5, offset: 57768}, + pos: position{line: 1802, col: 5, offset: 57782}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1802, col: 7, offset: 57770}, + pos: position{line: 1802, col: 7, offset: 57784}, name: "Seq", }, }, @@ -12769,27 +12779,27 @@ var g = &grammar{ }, { name: "SelectOp", - pos: position{line: 1810, col: 1, offset: 57916}, + pos: position{line: 1810, col: 1, offset: 57930}, expr: &actionExpr{ - pos: position{line: 1810, col: 12, offset: 57927}, + pos: position{line: 1810, col: 12, offset: 57941}, run: (*parser).callonSelectOp1, expr: &seqExpr{ - pos: position{line: 1810, col: 12, offset: 57927}, + pos: position{line: 1810, col: 12, offset: 57941}, exprs: []any{ ¬Expr{ - pos: position{line: 1810, col: 12, offset: 57927}, + pos: position{line: 1810, col: 12, offset: 57941}, expr: &litMatcher{ - pos: position{line: 1810, col: 13, offset: 57928}, + pos: position{line: 1810, col: 13, offset: 57942}, val: "(", ignoreCase: false, want: "\"(\"", }, }, &labeledExpr{ - pos: position{line: 1810, col: 17, offset: 57932}, + pos: position{line: 1810, col: 17, offset: 57946}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 1810, col: 20, offset: 57935}, + pos: position{line: 1810, col: 20, offset: 57949}, name: "SelectExpr", }, }, @@ -12801,65 +12811,65 @@ var g = &grammar{ }, { name: "SelectExpr", - pos: position{line: 1812, col: 1, offset: 57965}, + pos: position{line: 1812, col: 1, offset: 57979}, expr: &actionExpr{ - pos: position{line: 1813, col: 5, offset: 57981}, + pos: position{line: 1813, col: 5, offset: 57995}, run: (*parser).callonSelectExpr1, expr: &seqExpr{ - pos: position{line: 1813, col: 5, offset: 57981}, + pos: position{line: 1813, col: 5, offset: 57995}, exprs: []any{ &labeledExpr{ - pos: position{line: 1813, col: 5, offset: 57981}, + pos: position{line: 1813, col: 5, offset: 57995}, label: "with", expr: &ruleRefExpr{ - pos: position{line: 1813, col: 10, offset: 57986}, + pos: position{line: 1813, col: 10, offset: 58000}, name: "OptWithClause", }, }, &labeledExpr{ - pos: position{line: 1814, col: 5, offset: 58004}, + pos: position{line: 1814, col: 5, offset: 58018}, label: "body", expr: &choiceExpr{ - pos: position{line: 1815, col: 9, offset: 58019}, + pos: position{line: 1815, col: 9, offset: 58033}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1815, col: 9, offset: 58019}, + pos: position{line: 1815, col: 9, offset: 58033}, name: "SetOperation", }, &ruleRefExpr{ - pos: position{line: 1816, col: 9, offset: 58040}, + pos: position{line: 1816, col: 9, offset: 58054}, name: "Select", }, &actionExpr{ - pos: position{line: 1817, col: 9, offset: 58055}, + pos: position{line: 1817, col: 9, offset: 58069}, run: (*parser).callonSelectExpr9, expr: &seqExpr{ - pos: position{line: 1817, col: 9, offset: 58055}, + pos: position{line: 1817, col: 9, offset: 58069}, exprs: []any{ &litMatcher{ - pos: position{line: 1817, col: 9, offset: 58055}, + pos: position{line: 1817, col: 9, offset: 58069}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1817, col: 13, offset: 58059}, + pos: position{line: 1817, col: 13, offset: 58073}, name: "__", }, &labeledExpr{ - pos: position{line: 1817, col: 16, offset: 58062}, + pos: position{line: 1817, col: 16, offset: 58076}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1817, col: 18, offset: 58064}, + pos: position{line: 1817, col: 18, offset: 58078}, name: "SQLPipe", }, }, &ruleRefExpr{ - pos: position{line: 1817, col: 26, offset: 58072}, + pos: position{line: 1817, col: 26, offset: 58086}, name: "__", }, &litMatcher{ - pos: position{line: 1817, col: 28, offset: 58074}, + pos: position{line: 1817, col: 28, offset: 58088}, val: ")", ignoreCase: false, want: "\")\"", @@ -12871,18 +12881,18 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 1819, col: 5, offset: 58111}, + pos: position{line: 1819, col: 5, offset: 58125}, label: "orderby", expr: &ruleRefExpr{ - pos: position{line: 1819, col: 13, offset: 58119}, + pos: position{line: 1819, col: 13, offset: 58133}, name: "OptOrderByClause", }, }, &labeledExpr{ - pos: position{line: 1820, col: 5, offset: 58140}, + pos: position{line: 1820, col: 5, offset: 58154}, label: "limit", expr: &ruleRefExpr{ - pos: position{line: 1820, col: 11, offset: 58146}, + pos: position{line: 1820, col: 11, offset: 58160}, name: "OptLimitClause", }, }, @@ -12894,74 +12904,74 @@ var g = &grammar{ }, { name: "Select", - pos: position{line: 1840, col: 1, offset: 58532}, + pos: position{line: 1840, col: 1, offset: 58546}, expr: &actionExpr{ - pos: position{line: 1841, col: 5, offset: 58544}, + pos: position{line: 1841, col: 5, offset: 58558}, run: (*parser).callonSelect1, expr: &seqExpr{ - pos: position{line: 1841, col: 5, offset: 58544}, + pos: position{line: 1841, col: 5, offset: 58558}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1841, col: 5, offset: 58544}, + pos: position{line: 1841, col: 5, offset: 58558}, name: "SELECT", }, &labeledExpr{ - pos: position{line: 1842, col: 5, offset: 58556}, + pos: position{line: 1842, col: 5, offset: 58570}, label: "distinct", expr: &ruleRefExpr{ - pos: position{line: 1842, col: 14, offset: 58565}, + pos: position{line: 1842, col: 14, offset: 58579}, name: "OptDistinct", }, }, &labeledExpr{ - pos: position{line: 1843, col: 5, offset: 58581}, + pos: position{line: 1843, col: 5, offset: 58595}, label: "value", expr: &ruleRefExpr{ - pos: position{line: 1843, col: 11, offset: 58587}, + pos: position{line: 1843, col: 11, offset: 58601}, name: "OptSelectValue", }, }, &ruleRefExpr{ - pos: position{line: 1846, col: 5, offset: 58727}, + pos: position{line: 1846, col: 5, offset: 58741}, name: "_", }, &labeledExpr{ - pos: position{line: 1846, col: 7, offset: 58729}, + pos: position{line: 1846, col: 7, offset: 58743}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 1846, col: 12, offset: 58734}, + pos: position{line: 1846, col: 12, offset: 58748}, name: "SelectList", }, }, &labeledExpr{ - pos: position{line: 1847, col: 5, offset: 58749}, + pos: position{line: 1847, col: 5, offset: 58763}, label: "from", expr: &ruleRefExpr{ - pos: position{line: 1847, col: 10, offset: 58754}, + pos: position{line: 1847, col: 10, offset: 58768}, name: "OptFromClause", }, }, &labeledExpr{ - pos: position{line: 1848, col: 5, offset: 58772}, + pos: position{line: 1848, col: 5, offset: 58786}, label: "where", expr: &ruleRefExpr{ - pos: position{line: 1848, col: 11, offset: 58778}, + pos: position{line: 1848, col: 11, offset: 58792}, name: "OptWhereClause", }, }, &labeledExpr{ - pos: position{line: 1849, col: 5, offset: 58797}, + pos: position{line: 1849, col: 5, offset: 58811}, label: "group", expr: &ruleRefExpr{ - pos: position{line: 1849, col: 11, offset: 58803}, + pos: position{line: 1849, col: 11, offset: 58817}, name: "OptGroupClause", }, }, &labeledExpr{ - pos: position{line: 1850, col: 5, offset: 58822}, + pos: position{line: 1850, col: 5, offset: 58836}, label: "having", expr: &ruleRefExpr{ - pos: position{line: 1850, col: 12, offset: 58829}, + pos: position{line: 1850, col: 12, offset: 58843}, name: "OptHavingClause", }, }, @@ -12973,49 +12983,49 @@ var g = &grammar{ }, { name: "OptDistinct", - pos: position{line: 1876, col: 1, offset: 59434}, + pos: position{line: 1876, col: 1, offset: 59448}, expr: &choiceExpr{ - pos: position{line: 1877, col: 5, offset: 59450}, + pos: position{line: 1877, col: 5, offset: 59464}, alternatives: []any{ &actionExpr{ - pos: position{line: 1877, col: 5, offset: 59450}, + pos: position{line: 1877, col: 5, offset: 59464}, run: (*parser).callonOptDistinct2, expr: &seqExpr{ - pos: position{line: 1877, col: 5, offset: 59450}, + pos: position{line: 1877, col: 5, offset: 59464}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1877, col: 5, offset: 59450}, + pos: position{line: 1877, col: 5, offset: 59464}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1877, col: 7, offset: 59452}, + pos: position{line: 1877, col: 7, offset: 59466}, name: "ALL", }, }, }, }, &actionExpr{ - pos: position{line: 1878, col: 5, offset: 59489}, + pos: position{line: 1878, col: 5, offset: 59503}, run: (*parser).callonOptDistinct6, expr: &seqExpr{ - pos: position{line: 1878, col: 5, offset: 59489}, + pos: position{line: 1878, col: 5, offset: 59503}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1878, col: 5, offset: 59489}, + pos: position{line: 1878, col: 5, offset: 59503}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1878, col: 7, offset: 59491}, + pos: position{line: 1878, col: 7, offset: 59505}, name: "DISTINCT", }, }, }, }, &actionExpr{ - pos: position{line: 1879, col: 5, offset: 59527}, + pos: position{line: 1879, col: 5, offset: 59541}, run: (*parser).callonOptDistinct10, expr: &litMatcher{ - pos: position{line: 1879, col: 5, offset: 59527}, + pos: position{line: 1879, col: 5, offset: 59541}, val: "", ignoreCase: false, want: "\"\"", @@ -13028,57 +13038,57 @@ var g = &grammar{ }, { name: "OptSelectValue", - pos: position{line: 1881, col: 1, offset: 59566}, + pos: position{line: 1881, col: 1, offset: 59580}, expr: &choiceExpr{ - pos: position{line: 1882, col: 5, offset: 59585}, + pos: position{line: 1882, col: 5, offset: 59599}, alternatives: []any{ &actionExpr{ - pos: position{line: 1882, col: 5, offset: 59585}, + pos: position{line: 1882, col: 5, offset: 59599}, run: (*parser).callonOptSelectValue2, expr: &seqExpr{ - pos: position{line: 1882, col: 5, offset: 59585}, + pos: position{line: 1882, col: 5, offset: 59599}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1882, col: 5, offset: 59585}, + pos: position{line: 1882, col: 5, offset: 59599}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1882, col: 7, offset: 59587}, + pos: position{line: 1882, col: 7, offset: 59601}, name: "AS", }, &ruleRefExpr{ - pos: position{line: 1882, col: 10, offset: 59590}, + pos: position{line: 1882, col: 10, offset: 59604}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1882, col: 12, offset: 59592}, + pos: position{line: 1882, col: 12, offset: 59606}, name: "VALUE", }, }, }, }, &actionExpr{ - pos: position{line: 1883, col: 5, offset: 59624}, + pos: position{line: 1883, col: 5, offset: 59638}, run: (*parser).callonOptSelectValue8, expr: &seqExpr{ - pos: position{line: 1883, col: 5, offset: 59624}, + pos: position{line: 1883, col: 5, offset: 59638}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1883, col: 5, offset: 59624}, + pos: position{line: 1883, col: 5, offset: 59638}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1883, col: 7, offset: 59626}, + pos: position{line: 1883, col: 7, offset: 59640}, name: "VALUE", }, }, }, }, &actionExpr{ - pos: position{line: 1884, col: 5, offset: 59697}, + pos: position{line: 1884, col: 5, offset: 59711}, run: (*parser).callonOptSelectValue12, expr: &litMatcher{ - pos: position{line: 1884, col: 5, offset: 59697}, + pos: position{line: 1884, col: 5, offset: 59711}, val: "", ignoreCase: false, want: "\"\"", @@ -13091,19 +13101,19 @@ var g = &grammar{ }, { name: "OptWithClause", - pos: position{line: 1886, col: 1, offset: 59740}, + pos: position{line: 1886, col: 1, offset: 59754}, expr: &choiceExpr{ - pos: position{line: 1887, col: 5, offset: 59759}, + pos: position{line: 1887, col: 5, offset: 59773}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1887, col: 5, offset: 59759}, + pos: position{line: 1887, col: 5, offset: 59773}, name: "WithClause", }, &actionExpr{ - pos: position{line: 1888, col: 5, offset: 59775}, + pos: position{line: 1888, col: 5, offset: 59789}, run: (*parser).callonOptWithClause3, expr: &litMatcher{ - pos: position{line: 1888, col: 5, offset: 59775}, + pos: position{line: 1888, col: 5, offset: 59789}, val: "", ignoreCase: false, want: "\"\"", @@ -13116,38 +13126,38 @@ var g = &grammar{ }, { name: "WithClause", - pos: position{line: 1890, col: 1, offset: 59808}, + pos: position{line: 1890, col: 1, offset: 59822}, expr: &actionExpr{ - pos: position{line: 1891, col: 5, offset: 59824}, + pos: position{line: 1891, col: 5, offset: 59838}, run: (*parser).callonWithClause1, expr: &seqExpr{ - pos: position{line: 1891, col: 5, offset: 59824}, + pos: position{line: 1891, col: 5, offset: 59838}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1891, col: 5, offset: 59824}, + pos: position{line: 1891, col: 5, offset: 59838}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1891, col: 7, offset: 59826}, + pos: position{line: 1891, col: 7, offset: 59840}, name: "WITH", }, &labeledExpr{ - pos: position{line: 1891, col: 12, offset: 59831}, + pos: position{line: 1891, col: 12, offset: 59845}, label: "r", expr: &ruleRefExpr{ - pos: position{line: 1891, col: 14, offset: 59833}, + pos: position{line: 1891, col: 14, offset: 59847}, name: "OptRecursive", }, }, &ruleRefExpr{ - pos: position{line: 1891, col: 27, offset: 59846}, + pos: position{line: 1891, col: 27, offset: 59860}, name: "_", }, &labeledExpr{ - pos: position{line: 1891, col: 29, offset: 59848}, + pos: position{line: 1891, col: 29, offset: 59862}, label: "ctes", expr: &ruleRefExpr{ - pos: position{line: 1891, col: 34, offset: 59853}, + pos: position{line: 1891, col: 34, offset: 59867}, name: "CteList", }, }, @@ -13159,32 +13169,32 @@ var g = &grammar{ }, { name: "OptRecursive", - pos: position{line: 1900, col: 1, offset: 60038}, + pos: position{line: 1900, col: 1, offset: 60052}, expr: &choiceExpr{ - pos: position{line: 1901, col: 5, offset: 60056}, + pos: position{line: 1901, col: 5, offset: 60070}, alternatives: []any{ &actionExpr{ - pos: position{line: 1901, col: 5, offset: 60056}, + pos: position{line: 1901, col: 5, offset: 60070}, run: (*parser).callonOptRecursive2, expr: &seqExpr{ - pos: position{line: 1901, col: 5, offset: 60056}, + pos: position{line: 1901, col: 5, offset: 60070}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1901, col: 5, offset: 60056}, + pos: position{line: 1901, col: 5, offset: 60070}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1901, col: 7, offset: 60058}, + pos: position{line: 1901, col: 7, offset: 60072}, name: "RECURSIVE", }, }, }, }, &actionExpr{ - pos: position{line: 1902, col: 5, offset: 60094}, + pos: position{line: 1902, col: 5, offset: 60108}, run: (*parser).callonOptRecursive6, expr: &litMatcher{ - pos: position{line: 1902, col: 5, offset: 60094}, + pos: position{line: 1902, col: 5, offset: 60108}, val: "", ignoreCase: false, want: "\"\"", @@ -13197,51 +13207,51 @@ var g = &grammar{ }, { name: "CteList", - pos: position{line: 1904, col: 1, offset: 60133}, + pos: position{line: 1904, col: 1, offset: 60147}, expr: &actionExpr{ - pos: position{line: 1904, col: 11, offset: 60143}, + pos: position{line: 1904, col: 11, offset: 60157}, run: (*parser).callonCteList1, expr: &seqExpr{ - pos: position{line: 1904, col: 11, offset: 60143}, + pos: position{line: 1904, col: 11, offset: 60157}, exprs: []any{ &labeledExpr{ - pos: position{line: 1904, col: 11, offset: 60143}, + pos: position{line: 1904, col: 11, offset: 60157}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1904, col: 17, offset: 60149}, + pos: position{line: 1904, col: 17, offset: 60163}, name: "Cte", }, }, &labeledExpr{ - pos: position{line: 1904, col: 21, offset: 60153}, + pos: position{line: 1904, col: 21, offset: 60167}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1904, col: 26, offset: 60158}, + pos: position{line: 1904, col: 26, offset: 60172}, expr: &actionExpr{ - pos: position{line: 1904, col: 28, offset: 60160}, + pos: position{line: 1904, col: 28, offset: 60174}, run: (*parser).callonCteList7, expr: &seqExpr{ - pos: position{line: 1904, col: 28, offset: 60160}, + pos: position{line: 1904, col: 28, offset: 60174}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1904, col: 28, offset: 60160}, + pos: position{line: 1904, col: 28, offset: 60174}, name: "__", }, &litMatcher{ - pos: position{line: 1904, col: 31, offset: 60163}, + pos: position{line: 1904, col: 31, offset: 60177}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1904, col: 35, offset: 60167}, + pos: position{line: 1904, col: 35, offset: 60181}, name: "__", }, &labeledExpr{ - pos: position{line: 1904, col: 38, offset: 60170}, + pos: position{line: 1904, col: 38, offset: 60184}, label: "cte", expr: &ruleRefExpr{ - pos: position{line: 1904, col: 42, offset: 60174}, + pos: position{line: 1904, col: 42, offset: 60188}, name: "Cte", }, }, @@ -13258,65 +13268,65 @@ var g = &grammar{ }, { name: "Cte", - pos: position{line: 1908, col: 1, offset: 60243}, + pos: position{line: 1908, col: 1, offset: 60257}, expr: &actionExpr{ - pos: position{line: 1909, col: 5, offset: 60251}, + pos: position{line: 1909, col: 5, offset: 60265}, run: (*parser).callonCte1, expr: &seqExpr{ - pos: position{line: 1909, col: 5, offset: 60251}, + pos: position{line: 1909, col: 5, offset: 60265}, exprs: []any{ &labeledExpr{ - pos: position{line: 1909, col: 5, offset: 60251}, + pos: position{line: 1909, col: 5, offset: 60265}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1909, col: 10, offset: 60256}, + pos: position{line: 1909, col: 10, offset: 60270}, name: "AliasName", }, }, &ruleRefExpr{ - pos: position{line: 1909, col: 20, offset: 60266}, + pos: position{line: 1909, col: 20, offset: 60280}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1909, col: 22, offset: 60268}, + pos: position{line: 1909, col: 22, offset: 60282}, name: "AS", }, &labeledExpr{ - pos: position{line: 1909, col: 25, offset: 60271}, + pos: position{line: 1909, col: 25, offset: 60285}, label: "m", expr: &ruleRefExpr{ - pos: position{line: 1909, col: 27, offset: 60273}, + pos: position{line: 1909, col: 27, offset: 60287}, name: "OptMaterialized", }, }, &ruleRefExpr{ - pos: position{line: 1909, col: 43, offset: 60289}, + pos: position{line: 1909, col: 43, offset: 60303}, name: "__", }, &litMatcher{ - pos: position{line: 1909, col: 46, offset: 60292}, + pos: position{line: 1909, col: 46, offset: 60306}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1909, col: 50, offset: 60296}, + pos: position{line: 1909, col: 50, offset: 60310}, name: "__", }, &labeledExpr{ - pos: position{line: 1909, col: 53, offset: 60299}, + pos: position{line: 1909, col: 53, offset: 60313}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1909, col: 55, offset: 60301}, + pos: position{line: 1909, col: 55, offset: 60315}, name: "SQLPipe", }, }, &ruleRefExpr{ - pos: position{line: 1909, col: 63, offset: 60309}, + pos: position{line: 1909, col: 63, offset: 60323}, name: "__", }, &litMatcher{ - pos: position{line: 1909, col: 66, offset: 60312}, + pos: position{line: 1909, col: 66, offset: 60326}, val: ")", ignoreCase: false, want: "\")\"", @@ -13329,9 +13339,9 @@ var g = &grammar{ }, { name: "AliasName", - pos: position{line: 1918, col: 1, offset: 60487}, + pos: position{line: 1918, col: 1, offset: 60501}, expr: &ruleRefExpr{ - pos: position{line: 1918, col: 13, offset: 60499}, + pos: position{line: 1918, col: 13, offset: 60513}, name: "Identifier", }, leader: false, @@ -13339,65 +13349,65 @@ var g = &grammar{ }, { name: "OptMaterialized", - pos: position{line: 1920, col: 1, offset: 60511}, + pos: position{line: 1920, col: 1, offset: 60525}, expr: &choiceExpr{ - pos: position{line: 1921, col: 5, offset: 60532}, + pos: position{line: 1921, col: 5, offset: 60546}, alternatives: []any{ &actionExpr{ - pos: position{line: 1921, col: 5, offset: 60532}, + pos: position{line: 1921, col: 5, offset: 60546}, run: (*parser).callonOptMaterialized2, expr: &seqExpr{ - pos: position{line: 1921, col: 5, offset: 60532}, + pos: position{line: 1921, col: 5, offset: 60546}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1921, col: 5, offset: 60532}, + pos: position{line: 1921, col: 5, offset: 60546}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1921, col: 7, offset: 60534}, + pos: position{line: 1921, col: 7, offset: 60548}, name: "MATERIALIZED", }, &ruleRefExpr{ - pos: position{line: 1921, col: 20, offset: 60547}, + pos: position{line: 1921, col: 20, offset: 60561}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 1922, col: 5, offset: 60586}, + pos: position{line: 1922, col: 5, offset: 60600}, run: (*parser).callonOptMaterialized7, expr: &seqExpr{ - pos: position{line: 1922, col: 5, offset: 60586}, + pos: position{line: 1922, col: 5, offset: 60600}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1922, col: 5, offset: 60586}, + pos: position{line: 1922, col: 5, offset: 60600}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1922, col: 7, offset: 60588}, + pos: position{line: 1922, col: 7, offset: 60602}, name: "NOT", }, &ruleRefExpr{ - pos: position{line: 1922, col: 11, offset: 60592}, + pos: position{line: 1922, col: 11, offset: 60606}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1922, col: 13, offset: 60594}, + pos: position{line: 1922, col: 13, offset: 60608}, name: "MATERIALIZED", }, &ruleRefExpr{ - pos: position{line: 1922, col: 26, offset: 60607}, + pos: position{line: 1922, col: 26, offset: 60621}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 1923, col: 5, offset: 60638}, + pos: position{line: 1923, col: 5, offset: 60652}, run: (*parser).callonOptMaterialized14, expr: &litMatcher{ - pos: position{line: 1923, col: 5, offset: 60638}, + pos: position{line: 1923, col: 5, offset: 60652}, val: "", ignoreCase: false, want: "\"\"", @@ -13410,25 +13420,25 @@ var g = &grammar{ }, { name: "OptAllClause", - pos: position{line: 1925, col: 1, offset: 60693}, + pos: position{line: 1925, col: 1, offset: 60707}, expr: &choiceExpr{ - pos: position{line: 1926, col: 5, offset: 60710}, + pos: position{line: 1926, col: 5, offset: 60724}, alternatives: []any{ &seqExpr{ - pos: position{line: 1926, col: 5, offset: 60710}, + pos: position{line: 1926, col: 5, offset: 60724}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1926, col: 5, offset: 60710}, + pos: position{line: 1926, col: 5, offset: 60724}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1926, col: 7, offset: 60712}, + pos: position{line: 1926, col: 7, offset: 60726}, name: "ALL", }, }, }, &litMatcher{ - pos: position{line: 1927, col: 5, offset: 60721}, + pos: position{line: 1927, col: 5, offset: 60735}, val: "", ignoreCase: false, want: "\"\"", @@ -13440,25 +13450,25 @@ var g = &grammar{ }, { name: "OptFromClause", - pos: position{line: 1929, col: 1, offset: 60725}, + pos: position{line: 1929, col: 1, offset: 60739}, expr: &choiceExpr{ - pos: position{line: 1930, col: 5, offset: 60743}, + pos: position{line: 1930, col: 5, offset: 60757}, alternatives: []any{ &actionExpr{ - pos: position{line: 1930, col: 5, offset: 60743}, + pos: position{line: 1930, col: 5, offset: 60757}, run: (*parser).callonOptFromClause2, expr: &seqExpr{ - pos: position{line: 1930, col: 5, offset: 60743}, + pos: position{line: 1930, col: 5, offset: 60757}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1930, col: 5, offset: 60743}, + pos: position{line: 1930, col: 5, offset: 60757}, name: "_", }, &labeledExpr{ - pos: position{line: 1930, col: 7, offset: 60745}, + pos: position{line: 1930, col: 7, offset: 60759}, label: "from", expr: &ruleRefExpr{ - pos: position{line: 1930, col: 12, offset: 60750}, + pos: position{line: 1930, col: 12, offset: 60764}, name: "FromOp", }, }, @@ -13466,10 +13476,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1933, col: 5, offset: 60792}, + pos: position{line: 1933, col: 5, offset: 60806}, run: (*parser).callonOptFromClause7, expr: &litMatcher{ - pos: position{line: 1933, col: 5, offset: 60792}, + pos: position{line: 1933, col: 5, offset: 60806}, val: "", ignoreCase: false, want: "\"\"", @@ -13482,27 +13492,27 @@ var g = &grammar{ }, { name: "OptWhereClause", - pos: position{line: 1935, col: 1, offset: 60833}, + pos: position{line: 1935, col: 1, offset: 60847}, expr: &choiceExpr{ - pos: position{line: 1936, col: 5, offset: 60852}, + pos: position{line: 1936, col: 5, offset: 60866}, alternatives: []any{ &actionExpr{ - pos: position{line: 1936, col: 5, offset: 60852}, + pos: position{line: 1936, col: 5, offset: 60866}, run: (*parser).callonOptWhereClause2, expr: &labeledExpr{ - pos: position{line: 1936, col: 5, offset: 60852}, + pos: position{line: 1936, col: 5, offset: 60866}, label: "where", expr: &ruleRefExpr{ - pos: position{line: 1936, col: 11, offset: 60858}, + pos: position{line: 1936, col: 11, offset: 60872}, name: "WhereClause", }, }, }, &actionExpr{ - pos: position{line: 1937, col: 5, offset: 60900}, + pos: position{line: 1937, col: 5, offset: 60914}, run: (*parser).callonOptWhereClause5, expr: &litMatcher{ - pos: position{line: 1937, col: 5, offset: 60900}, + pos: position{line: 1937, col: 5, offset: 60914}, val: "", ignoreCase: false, want: "\"\"", @@ -13515,25 +13525,25 @@ var g = &grammar{ }, { name: "OptGroupClause", - pos: position{line: 1939, col: 1, offset: 60945}, + pos: position{line: 1939, col: 1, offset: 60959}, expr: &choiceExpr{ - pos: position{line: 1940, col: 5, offset: 60964}, + pos: position{line: 1940, col: 5, offset: 60978}, alternatives: []any{ &actionExpr{ - pos: position{line: 1940, col: 5, offset: 60964}, + pos: position{line: 1940, col: 5, offset: 60978}, run: (*parser).callonOptGroupClause2, expr: &seqExpr{ - pos: position{line: 1940, col: 5, offset: 60964}, + pos: position{line: 1940, col: 5, offset: 60978}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1940, col: 5, offset: 60964}, + pos: position{line: 1940, col: 5, offset: 60978}, name: "_", }, &labeledExpr{ - pos: position{line: 1940, col: 7, offset: 60966}, + pos: position{line: 1940, col: 7, offset: 60980}, label: "group", expr: &ruleRefExpr{ - pos: position{line: 1940, col: 13, offset: 60972}, + pos: position{line: 1940, col: 13, offset: 60986}, name: "GroupClause", }, }, @@ -13541,10 +13551,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1941, col: 5, offset: 61010}, + pos: position{line: 1941, col: 5, offset: 61024}, run: (*parser).callonOptGroupClause7, expr: &litMatcher{ - pos: position{line: 1941, col: 5, offset: 61010}, + pos: position{line: 1941, col: 5, offset: 61024}, val: "", ignoreCase: false, want: "\"\"", @@ -13557,34 +13567,34 @@ var g = &grammar{ }, { name: "GroupClause", - pos: position{line: 1943, col: 1, offset: 61051}, + pos: position{line: 1943, col: 1, offset: 61065}, expr: &actionExpr{ - pos: position{line: 1944, col: 5, offset: 61067}, + pos: position{line: 1944, col: 5, offset: 61081}, run: (*parser).callonGroupClause1, expr: &seqExpr{ - pos: position{line: 1944, col: 5, offset: 61067}, + pos: position{line: 1944, col: 5, offset: 61081}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1944, col: 5, offset: 61067}, + pos: position{line: 1944, col: 5, offset: 61081}, name: "GROUP", }, &ruleRefExpr{ - pos: position{line: 1944, col: 11, offset: 61073}, + pos: position{line: 1944, col: 11, offset: 61087}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1944, col: 13, offset: 61075}, + pos: position{line: 1944, col: 13, offset: 61089}, name: "BY", }, &ruleRefExpr{ - pos: position{line: 1944, col: 16, offset: 61078}, + pos: position{line: 1944, col: 16, offset: 61092}, name: "_", }, &labeledExpr{ - pos: position{line: 1944, col: 18, offset: 61080}, + pos: position{line: 1944, col: 18, offset: 61094}, label: "list", expr: &ruleRefExpr{ - pos: position{line: 1944, col: 23, offset: 61085}, + pos: position{line: 1944, col: 23, offset: 61099}, name: "GroupByList", }, }, @@ -13596,51 +13606,51 @@ var g = &grammar{ }, { name: "GroupByList", - pos: position{line: 1946, col: 1, offset: 61119}, + pos: position{line: 1946, col: 1, offset: 61133}, expr: &actionExpr{ - pos: position{line: 1947, col: 5, offset: 61136}, + pos: position{line: 1947, col: 5, offset: 61150}, run: (*parser).callonGroupByList1, expr: &seqExpr{ - pos: position{line: 1947, col: 5, offset: 61136}, + pos: position{line: 1947, col: 5, offset: 61150}, exprs: []any{ &labeledExpr{ - pos: position{line: 1947, col: 5, offset: 61136}, + pos: position{line: 1947, col: 5, offset: 61150}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1947, col: 11, offset: 61142}, + pos: position{line: 1947, col: 11, offset: 61156}, name: "GroupByItem", }, }, &labeledExpr{ - pos: position{line: 1947, col: 23, offset: 61154}, + pos: position{line: 1947, col: 23, offset: 61168}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1947, col: 28, offset: 61159}, + pos: position{line: 1947, col: 28, offset: 61173}, expr: &actionExpr{ - pos: position{line: 1947, col: 30, offset: 61161}, + pos: position{line: 1947, col: 30, offset: 61175}, run: (*parser).callonGroupByList7, expr: &seqExpr{ - pos: position{line: 1947, col: 30, offset: 61161}, + pos: position{line: 1947, col: 30, offset: 61175}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1947, col: 30, offset: 61161}, + pos: position{line: 1947, col: 30, offset: 61175}, name: "__", }, &litMatcher{ - pos: position{line: 1947, col: 33, offset: 61164}, + pos: position{line: 1947, col: 33, offset: 61178}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1947, col: 37, offset: 61168}, + pos: position{line: 1947, col: 37, offset: 61182}, name: "__", }, &labeledExpr{ - pos: position{line: 1947, col: 40, offset: 61171}, + pos: position{line: 1947, col: 40, offset: 61185}, label: "g", expr: &ruleRefExpr{ - pos: position{line: 1947, col: 42, offset: 61173}, + pos: position{line: 1947, col: 42, offset: 61187}, name: "GroupByItem", }, }, @@ -13657,9 +13667,9 @@ var g = &grammar{ }, { name: "GroupByItem", - pos: position{line: 1951, col: 1, offset: 61254}, + pos: position{line: 1951, col: 1, offset: 61268}, expr: &ruleRefExpr{ - pos: position{line: 1951, col: 15, offset: 61268}, + pos: position{line: 1951, col: 15, offset: 61282}, name: "Expr", }, leader: false, @@ -13667,25 +13677,25 @@ var g = &grammar{ }, { name: "OptHavingClause", - pos: position{line: 1953, col: 1, offset: 61274}, + pos: position{line: 1953, col: 1, offset: 61288}, expr: &choiceExpr{ - pos: position{line: 1954, col: 5, offset: 61294}, + pos: position{line: 1954, col: 5, offset: 61308}, alternatives: []any{ &actionExpr{ - pos: position{line: 1954, col: 5, offset: 61294}, + pos: position{line: 1954, col: 5, offset: 61308}, run: (*parser).callonOptHavingClause2, expr: &seqExpr{ - pos: position{line: 1954, col: 5, offset: 61294}, + pos: position{line: 1954, col: 5, offset: 61308}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1954, col: 5, offset: 61294}, + pos: position{line: 1954, col: 5, offset: 61308}, name: "_", }, &labeledExpr{ - pos: position{line: 1954, col: 7, offset: 61296}, + pos: position{line: 1954, col: 7, offset: 61310}, label: "h", expr: &ruleRefExpr{ - pos: position{line: 1954, col: 9, offset: 61298}, + pos: position{line: 1954, col: 9, offset: 61312}, name: "HavingClause", }, }, @@ -13693,10 +13703,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1955, col: 5, offset: 61333}, + pos: position{line: 1955, col: 5, offset: 61347}, run: (*parser).callonOptHavingClause7, expr: &litMatcher{ - pos: position{line: 1955, col: 5, offset: 61333}, + pos: position{line: 1955, col: 5, offset: 61347}, val: "", ignoreCase: false, want: "\"\"", @@ -13709,26 +13719,26 @@ var g = &grammar{ }, { name: "HavingClause", - pos: position{line: 1957, col: 1, offset: 61357}, + pos: position{line: 1957, col: 1, offset: 61371}, expr: &actionExpr{ - pos: position{line: 1958, col: 5, offset: 61374}, + pos: position{line: 1958, col: 5, offset: 61388}, run: (*parser).callonHavingClause1, expr: &seqExpr{ - pos: position{line: 1958, col: 5, offset: 61374}, + pos: position{line: 1958, col: 5, offset: 61388}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1958, col: 5, offset: 61374}, + pos: position{line: 1958, col: 5, offset: 61388}, name: "HAVING", }, &ruleRefExpr{ - pos: position{line: 1958, col: 12, offset: 61381}, + pos: position{line: 1958, col: 12, offset: 61395}, name: "_", }, &labeledExpr{ - pos: position{line: 1958, col: 14, offset: 61383}, + pos: position{line: 1958, col: 14, offset: 61397}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1958, col: 16, offset: 61385}, + pos: position{line: 1958, col: 16, offset: 61399}, name: "Expr", }, }, @@ -13740,49 +13750,49 @@ var g = &grammar{ }, { name: "JoinOperation", - pos: position{line: 1960, col: 1, offset: 61409}, + pos: position{line: 1960, col: 1, offset: 61423}, expr: &choiceExpr{ - pos: position{line: 1961, col: 5, offset: 61427}, + pos: position{line: 1961, col: 5, offset: 61441}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1961, col: 5, offset: 61427}, + pos: position{line: 1961, col: 5, offset: 61441}, name: "CrossJoin", }, &ruleRefExpr{ - pos: position{line: 1962, col: 5, offset: 61441}, + pos: position{line: 1962, col: 5, offset: 61455}, name: "ConditionJoin", }, }, }, - leader: true, + leader: false, leftRecursive: true, }, { name: "CrossJoin", - pos: position{line: 1964, col: 1, offset: 61456}, + pos: position{line: 1964, col: 1, offset: 61470}, expr: &actionExpr{ - pos: position{line: 1965, col: 5, offset: 61470}, + pos: position{line: 1965, col: 5, offset: 61484}, run: (*parser).callonCrossJoin1, expr: &seqExpr{ - pos: position{line: 1965, col: 5, offset: 61470}, + pos: position{line: 1965, col: 5, offset: 61484}, exprs: []any{ &labeledExpr{ - pos: position{line: 1965, col: 5, offset: 61470}, + pos: position{line: 1965, col: 5, offset: 61484}, label: "left", expr: &ruleRefExpr{ - pos: position{line: 1965, col: 10, offset: 61475}, + pos: position{line: 1965, col: 10, offset: 61489}, name: "FromElem", }, }, &ruleRefExpr{ - pos: position{line: 1965, col: 19, offset: 61484}, + pos: position{line: 1965, col: 19, offset: 61498}, name: "CrossJoinOp", }, &labeledExpr{ - pos: position{line: 1965, col: 31, offset: 61496}, + pos: position{line: 1965, col: 31, offset: 61510}, label: "right", expr: &ruleRefExpr{ - pos: position{line: 1965, col: 37, offset: 61502}, + pos: position{line: 1965, col: 37, offset: 61516}, name: "FromElem", }, }, @@ -13794,50 +13804,50 @@ var g = &grammar{ }, { name: "CrossJoinOp", - pos: position{line: 1974, col: 1, offset: 61704}, + pos: position{line: 1974, col: 1, offset: 61718}, expr: &choiceExpr{ - pos: position{line: 1975, col: 5, offset: 61721}, + pos: position{line: 1975, col: 5, offset: 61735}, alternatives: []any{ &seqExpr{ - pos: position{line: 1975, col: 5, offset: 61721}, + pos: position{line: 1975, col: 5, offset: 61735}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1975, col: 5, offset: 61721}, + pos: position{line: 1975, col: 5, offset: 61735}, name: "__", }, &litMatcher{ - pos: position{line: 1975, col: 8, offset: 61724}, + pos: position{line: 1975, col: 8, offset: 61738}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1975, col: 12, offset: 61728}, + pos: position{line: 1975, col: 12, offset: 61742}, name: "__", }, }, }, &seqExpr{ - pos: position{line: 1976, col: 5, offset: 61736}, + pos: position{line: 1976, col: 5, offset: 61750}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1976, col: 5, offset: 61736}, + pos: position{line: 1976, col: 5, offset: 61750}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1976, col: 7, offset: 61738}, + pos: position{line: 1976, col: 7, offset: 61752}, name: "CROSS", }, &ruleRefExpr{ - pos: position{line: 1976, col: 13, offset: 61744}, + pos: position{line: 1976, col: 13, offset: 61758}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1976, col: 15, offset: 61746}, + pos: position{line: 1976, col: 15, offset: 61760}, name: "JOIN", }, &ruleRefExpr{ - pos: position{line: 1976, col: 20, offset: 61751}, + pos: position{line: 1976, col: 20, offset: 61765}, name: "_", }, }, @@ -13849,46 +13859,46 @@ var g = &grammar{ }, { name: "ConditionJoin", - pos: position{line: 1978, col: 1, offset: 61755}, + pos: position{line: 1978, col: 1, offset: 61769}, expr: &actionExpr{ - pos: position{line: 1979, col: 5, offset: 61773}, + pos: position{line: 1979, col: 5, offset: 61787}, run: (*parser).callonConditionJoin1, expr: &seqExpr{ - pos: position{line: 1979, col: 5, offset: 61773}, + pos: position{line: 1979, col: 5, offset: 61787}, exprs: []any{ &labeledExpr{ - pos: position{line: 1979, col: 5, offset: 61773}, + pos: position{line: 1979, col: 5, offset: 61787}, label: "left", expr: &ruleRefExpr{ - pos: position{line: 1979, col: 10, offset: 61778}, + pos: position{line: 1979, col: 10, offset: 61792}, name: "FromElem", }, }, &labeledExpr{ - pos: position{line: 1979, col: 19, offset: 61787}, + pos: position{line: 1979, col: 19, offset: 61801}, label: "style", expr: &ruleRefExpr{ - pos: position{line: 1979, col: 25, offset: 61793}, + pos: position{line: 1979, col: 25, offset: 61807}, name: "SQLJoinStyle", }, }, &ruleRefExpr{ - pos: position{line: 1979, col: 38, offset: 61806}, + pos: position{line: 1979, col: 38, offset: 61820}, name: "_", }, &labeledExpr{ - pos: position{line: 1979, col: 40, offset: 61808}, + pos: position{line: 1979, col: 40, offset: 61822}, label: "right", expr: &ruleRefExpr{ - pos: position{line: 1979, col: 46, offset: 61814}, + pos: position{line: 1979, col: 46, offset: 61828}, name: "FromElem", }, }, &labeledExpr{ - pos: position{line: 1979, col: 55, offset: 61823}, + pos: position{line: 1979, col: 55, offset: 61837}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1979, col: 57, offset: 61825}, + pos: position{line: 1979, col: 57, offset: 61839}, name: "JoinExpr", }, }, @@ -13900,161 +13910,161 @@ var g = &grammar{ }, { name: "SQLJoinStyle", - pos: position{line: 1990, col: 1, offset: 62094}, + pos: position{line: 1990, col: 1, offset: 62108}, expr: &choiceExpr{ - pos: position{line: 1991, col: 5, offset: 62112}, + pos: position{line: 1991, col: 5, offset: 62126}, alternatives: []any{ &actionExpr{ - pos: position{line: 1991, col: 5, offset: 62112}, + pos: position{line: 1991, col: 5, offset: 62126}, run: (*parser).callonSQLJoinStyle2, expr: &seqExpr{ - pos: position{line: 1991, col: 5, offset: 62112}, + pos: position{line: 1991, col: 5, offset: 62126}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1991, col: 5, offset: 62112}, + pos: position{line: 1991, col: 5, offset: 62126}, expr: &seqExpr{ - pos: position{line: 1991, col: 6, offset: 62113}, + pos: position{line: 1991, col: 6, offset: 62127}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1991, col: 6, offset: 62113}, + pos: position{line: 1991, col: 6, offset: 62127}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1991, col: 8, offset: 62115}, + pos: position{line: 1991, col: 8, offset: 62129}, name: "INNER", }, }, }, }, &ruleRefExpr{ - pos: position{line: 1991, col: 16, offset: 62123}, + pos: position{line: 1991, col: 16, offset: 62137}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1991, col: 18, offset: 62125}, + pos: position{line: 1991, col: 18, offset: 62139}, name: "JOIN", }, }, }, }, &actionExpr{ - pos: position{line: 1992, col: 5, offset: 62170}, + pos: position{line: 1992, col: 5, offset: 62184}, run: (*parser).callonSQLJoinStyle10, expr: &seqExpr{ - pos: position{line: 1992, col: 5, offset: 62170}, + pos: position{line: 1992, col: 5, offset: 62184}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1992, col: 5, offset: 62170}, + pos: position{line: 1992, col: 5, offset: 62184}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1992, col: 7, offset: 62172}, + pos: position{line: 1992, col: 7, offset: 62186}, name: "FULL", }, &zeroOrOneExpr{ - pos: position{line: 1992, col: 12, offset: 62177}, + pos: position{line: 1992, col: 12, offset: 62191}, expr: &seqExpr{ - pos: position{line: 1992, col: 13, offset: 62178}, + pos: position{line: 1992, col: 13, offset: 62192}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1992, col: 13, offset: 62178}, + pos: position{line: 1992, col: 13, offset: 62192}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1992, col: 15, offset: 62180}, + pos: position{line: 1992, col: 15, offset: 62194}, name: "OUTER", }, }, }, }, &ruleRefExpr{ - pos: position{line: 1992, col: 23, offset: 62188}, + pos: position{line: 1992, col: 23, offset: 62202}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1992, col: 25, offset: 62190}, + pos: position{line: 1992, col: 25, offset: 62204}, name: "JOIN", }, }, }, }, &actionExpr{ - pos: position{line: 1993, col: 5, offset: 62224}, + pos: position{line: 1993, col: 5, offset: 62238}, run: (*parser).callonSQLJoinStyle20, expr: &seqExpr{ - pos: position{line: 1993, col: 5, offset: 62224}, + pos: position{line: 1993, col: 5, offset: 62238}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1993, col: 5, offset: 62224}, + pos: position{line: 1993, col: 5, offset: 62238}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1993, col: 7, offset: 62226}, + pos: position{line: 1993, col: 7, offset: 62240}, name: "LEFT", }, &zeroOrOneExpr{ - pos: position{line: 1993, col: 12, offset: 62231}, + pos: position{line: 1993, col: 12, offset: 62245}, expr: &seqExpr{ - pos: position{line: 1993, col: 13, offset: 62232}, + pos: position{line: 1993, col: 13, offset: 62246}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1993, col: 13, offset: 62232}, + pos: position{line: 1993, col: 13, offset: 62246}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1993, col: 15, offset: 62234}, + pos: position{line: 1993, col: 15, offset: 62248}, name: "OUTER", }, }, }, }, &ruleRefExpr{ - pos: position{line: 1993, col: 23, offset: 62242}, + pos: position{line: 1993, col: 23, offset: 62256}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1993, col: 25, offset: 62244}, + pos: position{line: 1993, col: 25, offset: 62258}, name: "JOIN", }, }, }, }, &actionExpr{ - pos: position{line: 1994, col: 5, offset: 62278}, + pos: position{line: 1994, col: 5, offset: 62292}, run: (*parser).callonSQLJoinStyle30, expr: &seqExpr{ - pos: position{line: 1994, col: 5, offset: 62278}, + pos: position{line: 1994, col: 5, offset: 62292}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1994, col: 5, offset: 62278}, + pos: position{line: 1994, col: 5, offset: 62292}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1994, col: 7, offset: 62280}, + pos: position{line: 1994, col: 7, offset: 62294}, name: "RIGHT", }, &zeroOrOneExpr{ - pos: position{line: 1994, col: 13, offset: 62286}, + pos: position{line: 1994, col: 13, offset: 62300}, expr: &seqExpr{ - pos: position{line: 1994, col: 14, offset: 62287}, + pos: position{line: 1994, col: 14, offset: 62301}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1994, col: 14, offset: 62287}, + pos: position{line: 1994, col: 14, offset: 62301}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1994, col: 16, offset: 62289}, + pos: position{line: 1994, col: 16, offset: 62303}, name: "OUTER", }, }, }, }, &ruleRefExpr{ - pos: position{line: 1994, col: 24, offset: 62297}, + pos: position{line: 1994, col: 24, offset: 62311}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1994, col: 26, offset: 62299}, + pos: position{line: 1994, col: 26, offset: 62313}, name: "JOIN", }, }, @@ -14067,33 +14077,33 @@ var g = &grammar{ }, { name: "JoinExpr", - pos: position{line: 1996, col: 1, offset: 62331}, + pos: position{line: 1996, col: 1, offset: 62345}, expr: &choiceExpr{ - pos: position{line: 1997, col: 5, offset: 62345}, + pos: position{line: 1997, col: 5, offset: 62359}, alternatives: []any{ &actionExpr{ - pos: position{line: 1997, col: 5, offset: 62345}, + pos: position{line: 1997, col: 5, offset: 62359}, run: (*parser).callonJoinExpr2, expr: &seqExpr{ - pos: position{line: 1997, col: 5, offset: 62345}, + pos: position{line: 1997, col: 5, offset: 62359}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1997, col: 5, offset: 62345}, + pos: position{line: 1997, col: 5, offset: 62359}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1997, col: 7, offset: 62347}, + pos: position{line: 1997, col: 7, offset: 62361}, name: "ON", }, &ruleRefExpr{ - pos: position{line: 1997, col: 10, offset: 62350}, + pos: position{line: 1997, col: 10, offset: 62364}, name: "_", }, &labeledExpr{ - pos: position{line: 1997, col: 12, offset: 62352}, + pos: position{line: 1997, col: 12, offset: 62366}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1997, col: 14, offset: 62354}, + pos: position{line: 1997, col: 14, offset: 62368}, name: "Expr", }, }, @@ -14101,47 +14111,47 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2003, col: 5, offset: 62476}, + pos: position{line: 2003, col: 5, offset: 62490}, run: (*parser).callonJoinExpr9, expr: &seqExpr{ - pos: position{line: 2003, col: 5, offset: 62476}, + pos: position{line: 2003, col: 5, offset: 62490}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2003, col: 5, offset: 62476}, + pos: position{line: 2003, col: 5, offset: 62490}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2003, col: 7, offset: 62478}, + pos: position{line: 2003, col: 7, offset: 62492}, name: "USING", }, &ruleRefExpr{ - pos: position{line: 2003, col: 13, offset: 62484}, + pos: position{line: 2003, col: 13, offset: 62498}, name: "__", }, &litMatcher{ - pos: position{line: 2003, col: 16, offset: 62487}, + pos: position{line: 2003, col: 16, offset: 62501}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 2003, col: 20, offset: 62491}, + pos: position{line: 2003, col: 20, offset: 62505}, name: "__", }, &labeledExpr{ - pos: position{line: 2003, col: 23, offset: 62494}, + pos: position{line: 2003, col: 23, offset: 62508}, label: "fields", expr: &ruleRefExpr{ - pos: position{line: 2003, col: 30, offset: 62501}, + pos: position{line: 2003, col: 30, offset: 62515}, name: "FieldExprs", }, }, &ruleRefExpr{ - pos: position{line: 2003, col: 41, offset: 62512}, + pos: position{line: 2003, col: 41, offset: 62526}, name: "__", }, &litMatcher{ - pos: position{line: 2003, col: 44, offset: 62515}, + pos: position{line: 2003, col: 44, offset: 62529}, val: ")", ignoreCase: false, want: "\")\"", @@ -14156,40 +14166,40 @@ var g = &grammar{ }, { name: "OptOrdinality", - pos: position{line: 2010, col: 1, offset: 62652}, + pos: position{line: 2010, col: 1, offset: 62666}, expr: &choiceExpr{ - pos: position{line: 2011, col: 5, offset: 62671}, + pos: position{line: 2011, col: 5, offset: 62685}, alternatives: []any{ &actionExpr{ - pos: position{line: 2011, col: 5, offset: 62671}, + pos: position{line: 2011, col: 5, offset: 62685}, run: (*parser).callonOptOrdinality2, expr: &seqExpr{ - pos: position{line: 2011, col: 5, offset: 62671}, + pos: position{line: 2011, col: 5, offset: 62685}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2011, col: 5, offset: 62671}, + pos: position{line: 2011, col: 5, offset: 62685}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2011, col: 7, offset: 62673}, + pos: position{line: 2011, col: 7, offset: 62687}, name: "WITH", }, &ruleRefExpr{ - pos: position{line: 2011, col: 12, offset: 62678}, + pos: position{line: 2011, col: 12, offset: 62692}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2011, col: 14, offset: 62680}, + pos: position{line: 2011, col: 14, offset: 62694}, name: "ORDINALITY", }, }, }, }, &actionExpr{ - pos: position{line: 2017, col: 5, offset: 62809}, + pos: position{line: 2017, col: 5, offset: 62823}, run: (*parser).callonOptOrdinality8, expr: &litMatcher{ - pos: position{line: 2017, col: 5, offset: 62809}, + pos: position{line: 2017, col: 5, offset: 62823}, val: "", ignoreCase: false, want: "\"\"", @@ -14202,25 +14212,25 @@ var g = &grammar{ }, { name: "OptAlias", - pos: position{line: 2019, col: 1, offset: 62858}, + pos: position{line: 2019, col: 1, offset: 62872}, expr: &choiceExpr{ - pos: position{line: 2020, col: 5, offset: 62871}, + pos: position{line: 2020, col: 5, offset: 62885}, alternatives: []any{ &actionExpr{ - pos: position{line: 2020, col: 5, offset: 62871}, + pos: position{line: 2020, col: 5, offset: 62885}, run: (*parser).callonOptAlias2, expr: &seqExpr{ - pos: position{line: 2020, col: 5, offset: 62871}, + pos: position{line: 2020, col: 5, offset: 62885}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2020, col: 5, offset: 62871}, + pos: position{line: 2020, col: 5, offset: 62885}, name: "_", }, &labeledExpr{ - pos: position{line: 2020, col: 7, offset: 62873}, + pos: position{line: 2020, col: 7, offset: 62887}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 2020, col: 9, offset: 62875}, + pos: position{line: 2020, col: 9, offset: 62889}, name: "AliasClause", }, }, @@ -14228,10 +14238,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2021, col: 5, offset: 62909}, + pos: position{line: 2021, col: 5, offset: 62923}, run: (*parser).callonOptAlias7, expr: &litMatcher{ - pos: position{line: 2021, col: 5, offset: 62909}, + pos: position{line: 2021, col: 5, offset: 62923}, val: "", ignoreCase: false, want: "\"\"", @@ -14244,50 +14254,50 @@ var g = &grammar{ }, { name: "AliasClause", - pos: position{line: 2023, col: 1, offset: 62946}, + pos: position{line: 2023, col: 1, offset: 62960}, expr: &actionExpr{ - pos: position{line: 2024, col: 5, offset: 62963}, + pos: position{line: 2024, col: 5, offset: 62977}, run: (*parser).callonAliasClause1, expr: &seqExpr{ - pos: position{line: 2024, col: 5, offset: 62963}, + pos: position{line: 2024, col: 5, offset: 62977}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 2024, col: 5, offset: 62963}, + pos: position{line: 2024, col: 5, offset: 62977}, expr: &seqExpr{ - pos: position{line: 2024, col: 6, offset: 62964}, + pos: position{line: 2024, col: 6, offset: 62978}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2024, col: 6, offset: 62964}, + pos: position{line: 2024, col: 6, offset: 62978}, name: "AS", }, &ruleRefExpr{ - pos: position{line: 2024, col: 9, offset: 62967}, + pos: position{line: 2024, col: 9, offset: 62981}, name: "_", }, }, }, }, ¬Expr{ - pos: position{line: 2024, col: 13, offset: 62971}, + pos: position{line: 2024, col: 13, offset: 62985}, expr: &choiceExpr{ - pos: position{line: 2024, col: 15, offset: 62973}, + pos: position{line: 2024, col: 15, offset: 62987}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 2024, col: 15, offset: 62973}, + pos: position{line: 2024, col: 15, offset: 62987}, name: "SQLGuard", }, &ruleRefExpr{ - pos: position{line: 2024, col: 26, offset: 62984}, + pos: position{line: 2024, col: 26, offset: 62998}, name: "DeprecatedFroms", }, }, }, }, &labeledExpr{ - pos: position{line: 2024, col: 43, offset: 63001}, + pos: position{line: 2024, col: 43, offset: 63015}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 2024, col: 48, offset: 63006}, + pos: position{line: 2024, col: 48, offset: 63020}, name: "IdentifierName", }, }, @@ -14299,51 +14309,51 @@ var g = &grammar{ }, { name: "SelectList", - pos: position{line: 2028, col: 1, offset: 63139}, + pos: position{line: 2028, col: 1, offset: 63153}, expr: &actionExpr{ - pos: position{line: 2029, col: 5, offset: 63154}, + pos: position{line: 2029, col: 5, offset: 63168}, run: (*parser).callonSelectList1, expr: &seqExpr{ - pos: position{line: 2029, col: 5, offset: 63154}, + pos: position{line: 2029, col: 5, offset: 63168}, exprs: []any{ &labeledExpr{ - pos: position{line: 2029, col: 5, offset: 63154}, + pos: position{line: 2029, col: 5, offset: 63168}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 2029, col: 11, offset: 63160}, + pos: position{line: 2029, col: 11, offset: 63174}, name: "SelectElem", }, }, &labeledExpr{ - pos: position{line: 2029, col: 22, offset: 63171}, + pos: position{line: 2029, col: 22, offset: 63185}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 2029, col: 27, offset: 63176}, + pos: position{line: 2029, col: 27, offset: 63190}, expr: &actionExpr{ - pos: position{line: 2029, col: 29, offset: 63178}, + pos: position{line: 2029, col: 29, offset: 63192}, run: (*parser).callonSelectList7, expr: &seqExpr{ - pos: position{line: 2029, col: 29, offset: 63178}, + pos: position{line: 2029, col: 29, offset: 63192}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2029, col: 29, offset: 63178}, + pos: position{line: 2029, col: 29, offset: 63192}, name: "__", }, &litMatcher{ - pos: position{line: 2029, col: 32, offset: 63181}, + pos: position{line: 2029, col: 32, offset: 63195}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 2029, col: 36, offset: 63185}, + pos: position{line: 2029, col: 36, offset: 63199}, name: "__", }, &labeledExpr{ - pos: position{line: 2029, col: 39, offset: 63188}, + pos: position{line: 2029, col: 39, offset: 63202}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 2029, col: 41, offset: 63190}, + pos: position{line: 2029, col: 41, offset: 63204}, name: "SelectElem", }, }, @@ -14360,26 +14370,26 @@ var g = &grammar{ }, { name: "SelectElem", - pos: position{line: 2034, col: 1, offset: 63309}, + pos: position{line: 2034, col: 1, offset: 63323}, expr: &actionExpr{ - pos: position{line: 2035, col: 5, offset: 63325}, + pos: position{line: 2035, col: 5, offset: 63339}, run: (*parser).callonSelectElem1, expr: &seqExpr{ - pos: position{line: 2035, col: 5, offset: 63325}, + pos: position{line: 2035, col: 5, offset: 63339}, exprs: []any{ &labeledExpr{ - pos: position{line: 2035, col: 5, offset: 63325}, + pos: position{line: 2035, col: 5, offset: 63339}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2035, col: 7, offset: 63327}, + pos: position{line: 2035, col: 7, offset: 63341}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 2035, col: 12, offset: 63332}, + pos: position{line: 2035, col: 12, offset: 63346}, label: "as", expr: &ruleRefExpr{ - pos: position{line: 2035, col: 15, offset: 63335}, + pos: position{line: 2035, col: 15, offset: 63349}, name: "OptAsClause", }, }, @@ -14391,33 +14401,33 @@ var g = &grammar{ }, { name: "OptAsClause", - pos: position{line: 2047, col: 1, offset: 63556}, + pos: position{line: 2047, col: 1, offset: 63570}, expr: &choiceExpr{ - pos: position{line: 2048, col: 5, offset: 63573}, + pos: position{line: 2048, col: 5, offset: 63587}, alternatives: []any{ &actionExpr{ - pos: position{line: 2048, col: 5, offset: 63573}, + pos: position{line: 2048, col: 5, offset: 63587}, run: (*parser).callonOptAsClause2, expr: &seqExpr{ - pos: position{line: 2048, col: 5, offset: 63573}, + pos: position{line: 2048, col: 5, offset: 63587}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2048, col: 5, offset: 63573}, + pos: position{line: 2048, col: 5, offset: 63587}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2048, col: 7, offset: 63575}, + pos: position{line: 2048, col: 7, offset: 63589}, name: "AS", }, &ruleRefExpr{ - pos: position{line: 2048, col: 10, offset: 63578}, + pos: position{line: 2048, col: 10, offset: 63592}, name: "_", }, &labeledExpr{ - pos: position{line: 2048, col: 12, offset: 63580}, + pos: position{line: 2048, col: 12, offset: 63594}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 2048, col: 15, offset: 63583}, + pos: position{line: 2048, col: 15, offset: 63597}, name: "Identifier", }, }, @@ -14425,10 +14435,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2049, col: 5, offset: 63617}, + pos: position{line: 2049, col: 5, offset: 63631}, run: (*parser).callonOptAsClause9, expr: &litMatcher{ - pos: position{line: 2049, col: 5, offset: 63617}, + pos: position{line: 2049, col: 5, offset: 63631}, val: "", ignoreCase: false, want: "\"\"", @@ -14441,41 +14451,41 @@ var g = &grammar{ }, { name: "OptOrderByClause", - pos: position{line: 2051, col: 1, offset: 63642}, + pos: position{line: 2051, col: 1, offset: 63656}, expr: &choiceExpr{ - pos: position{line: 2052, col: 5, offset: 63664}, + pos: position{line: 2052, col: 5, offset: 63678}, alternatives: []any{ &actionExpr{ - pos: position{line: 2052, col: 5, offset: 63664}, + pos: position{line: 2052, col: 5, offset: 63678}, run: (*parser).callonOptOrderByClause2, expr: &seqExpr{ - pos: position{line: 2052, col: 5, offset: 63664}, + pos: position{line: 2052, col: 5, offset: 63678}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2052, col: 5, offset: 63664}, + pos: position{line: 2052, col: 5, offset: 63678}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2052, col: 7, offset: 63666}, + pos: position{line: 2052, col: 7, offset: 63680}, name: "ORDER", }, &ruleRefExpr{ - pos: position{line: 2052, col: 13, offset: 63672}, + pos: position{line: 2052, col: 13, offset: 63686}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2052, col: 15, offset: 63674}, + pos: position{line: 2052, col: 15, offset: 63688}, name: "BY", }, &ruleRefExpr{ - pos: position{line: 2052, col: 18, offset: 63677}, + pos: position{line: 2052, col: 18, offset: 63691}, name: "_", }, &labeledExpr{ - pos: position{line: 2052, col: 20, offset: 63679}, + pos: position{line: 2052, col: 20, offset: 63693}, label: "list", expr: &ruleRefExpr{ - pos: position{line: 2052, col: 25, offset: 63684}, + pos: position{line: 2052, col: 25, offset: 63698}, name: "OrderByList", }, }, @@ -14483,10 +14493,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2059, col: 5, offset: 63843}, + pos: position{line: 2059, col: 5, offset: 63857}, run: (*parser).callonOptOrderByClause11, expr: &litMatcher{ - pos: position{line: 2059, col: 5, offset: 63843}, + pos: position{line: 2059, col: 5, offset: 63857}, val: "", ignoreCase: false, want: "\"\"", @@ -14499,51 +14509,51 @@ var g = &grammar{ }, { name: "OrderByList", - pos: position{line: 2061, col: 1, offset: 63876}, + pos: position{line: 2061, col: 1, offset: 63890}, expr: &actionExpr{ - pos: position{line: 2062, col: 5, offset: 63893}, + pos: position{line: 2062, col: 5, offset: 63907}, run: (*parser).callonOrderByList1, expr: &seqExpr{ - pos: position{line: 2062, col: 5, offset: 63893}, + pos: position{line: 2062, col: 5, offset: 63907}, exprs: []any{ &labeledExpr{ - pos: position{line: 2062, col: 5, offset: 63893}, + pos: position{line: 2062, col: 5, offset: 63907}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 2062, col: 11, offset: 63899}, + pos: position{line: 2062, col: 11, offset: 63913}, name: "OrderByItem", }, }, &labeledExpr{ - pos: position{line: 2062, col: 23, offset: 63911}, + pos: position{line: 2062, col: 23, offset: 63925}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 2062, col: 28, offset: 63916}, + pos: position{line: 2062, col: 28, offset: 63930}, expr: &actionExpr{ - pos: position{line: 2062, col: 30, offset: 63918}, + pos: position{line: 2062, col: 30, offset: 63932}, run: (*parser).callonOrderByList7, expr: &seqExpr{ - pos: position{line: 2062, col: 30, offset: 63918}, + pos: position{line: 2062, col: 30, offset: 63932}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2062, col: 30, offset: 63918}, + pos: position{line: 2062, col: 30, offset: 63932}, name: "__", }, &litMatcher{ - pos: position{line: 2062, col: 33, offset: 63921}, + pos: position{line: 2062, col: 33, offset: 63935}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 2062, col: 37, offset: 63925}, + pos: position{line: 2062, col: 37, offset: 63939}, name: "__", }, &labeledExpr{ - pos: position{line: 2062, col: 40, offset: 63928}, + pos: position{line: 2062, col: 40, offset: 63942}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 2062, col: 42, offset: 63930}, + pos: position{line: 2062, col: 42, offset: 63944}, name: "OrderByItem", }, }, @@ -14560,34 +14570,34 @@ var g = &grammar{ }, { name: "OrderByItem", - pos: position{line: 2066, col: 1, offset: 64031}, + pos: position{line: 2066, col: 1, offset: 64045}, expr: &actionExpr{ - pos: position{line: 2067, col: 5, offset: 64047}, + pos: position{line: 2067, col: 5, offset: 64061}, run: (*parser).callonOrderByItem1, expr: &seqExpr{ - pos: position{line: 2067, col: 5, offset: 64047}, + pos: position{line: 2067, col: 5, offset: 64061}, exprs: []any{ &labeledExpr{ - pos: position{line: 2067, col: 5, offset: 64047}, + pos: position{line: 2067, col: 5, offset: 64061}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2067, col: 7, offset: 64049}, + pos: position{line: 2067, col: 7, offset: 64063}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 2067, col: 12, offset: 64054}, + pos: position{line: 2067, col: 12, offset: 64068}, label: "order", expr: &ruleRefExpr{ - pos: position{line: 2067, col: 18, offset: 64060}, + pos: position{line: 2067, col: 18, offset: 64074}, name: "OptAscDesc", }, }, &labeledExpr{ - pos: position{line: 2067, col: 29, offset: 64071}, + pos: position{line: 2067, col: 29, offset: 64085}, label: "nulls", expr: &ruleRefExpr{ - pos: position{line: 2067, col: 35, offset: 64077}, + pos: position{line: 2067, col: 35, offset: 64091}, name: "OptNullsOrder", }, }, @@ -14599,49 +14609,49 @@ var g = &grammar{ }, { name: "OptAscDesc", - pos: position{line: 2078, col: 1, offset: 64327}, + pos: position{line: 2078, col: 1, offset: 64341}, expr: &choiceExpr{ - pos: position{line: 2079, col: 5, offset: 64342}, + pos: position{line: 2079, col: 5, offset: 64356}, alternatives: []any{ &actionExpr{ - pos: position{line: 2079, col: 5, offset: 64342}, + pos: position{line: 2079, col: 5, offset: 64356}, run: (*parser).callonOptAscDesc2, expr: &seqExpr{ - pos: position{line: 2079, col: 5, offset: 64342}, + pos: position{line: 2079, col: 5, offset: 64356}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2079, col: 5, offset: 64342}, + pos: position{line: 2079, col: 5, offset: 64356}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2079, col: 7, offset: 64344}, + pos: position{line: 2079, col: 7, offset: 64358}, name: "ASC", }, }, }, }, &actionExpr{ - pos: position{line: 2080, col: 5, offset: 64416}, + pos: position{line: 2080, col: 5, offset: 64430}, run: (*parser).callonOptAscDesc6, expr: &seqExpr{ - pos: position{line: 2080, col: 5, offset: 64416}, + pos: position{line: 2080, col: 5, offset: 64430}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2080, col: 5, offset: 64416}, + pos: position{line: 2080, col: 5, offset: 64430}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2080, col: 7, offset: 64418}, + pos: position{line: 2080, col: 7, offset: 64432}, name: "DESC", }, }, }, }, &actionExpr{ - pos: position{line: 2081, col: 5, offset: 64490}, + pos: position{line: 2081, col: 5, offset: 64504}, run: (*parser).callonOptAscDesc10, expr: &litMatcher{ - pos: position{line: 2081, col: 5, offset: 64490}, + pos: position{line: 2081, col: 5, offset: 64504}, val: "", ignoreCase: false, want: "\"\"", @@ -14654,65 +14664,65 @@ var g = &grammar{ }, { name: "OptNullsOrder", - pos: position{line: 2083, col: 1, offset: 64522}, + pos: position{line: 2083, col: 1, offset: 64536}, expr: &choiceExpr{ - pos: position{line: 2084, col: 5, offset: 64540}, + pos: position{line: 2084, col: 5, offset: 64554}, alternatives: []any{ &actionExpr{ - pos: position{line: 2084, col: 5, offset: 64540}, + pos: position{line: 2084, col: 5, offset: 64554}, run: (*parser).callonOptNullsOrder2, expr: &seqExpr{ - pos: position{line: 2084, col: 5, offset: 64540}, + pos: position{line: 2084, col: 5, offset: 64554}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2084, col: 5, offset: 64540}, + pos: position{line: 2084, col: 5, offset: 64554}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2084, col: 7, offset: 64542}, + pos: position{line: 2084, col: 7, offset: 64556}, name: "NULLS", }, &ruleRefExpr{ - pos: position{line: 2084, col: 13, offset: 64548}, + pos: position{line: 2084, col: 13, offset: 64562}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2084, col: 15, offset: 64550}, + pos: position{line: 2084, col: 15, offset: 64564}, name: "FIRST", }, }, }, }, &actionExpr{ - pos: position{line: 2085, col: 5, offset: 64626}, + pos: position{line: 2085, col: 5, offset: 64640}, run: (*parser).callonOptNullsOrder8, expr: &seqExpr{ - pos: position{line: 2085, col: 5, offset: 64626}, + pos: position{line: 2085, col: 5, offset: 64640}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2085, col: 5, offset: 64626}, + pos: position{line: 2085, col: 5, offset: 64640}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2085, col: 7, offset: 64628}, + pos: position{line: 2085, col: 7, offset: 64642}, name: "NULLS", }, &ruleRefExpr{ - pos: position{line: 2085, col: 13, offset: 64634}, + pos: position{line: 2085, col: 13, offset: 64648}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2085, col: 15, offset: 64636}, + pos: position{line: 2085, col: 15, offset: 64650}, name: "LAST", }, }, }, }, &actionExpr{ - pos: position{line: 2086, col: 5, offset: 64711}, + pos: position{line: 2086, col: 5, offset: 64725}, run: (*parser).callonOptNullsOrder14, expr: &litMatcher{ - pos: position{line: 2086, col: 5, offset: 64711}, + pos: position{line: 2086, col: 5, offset: 64725}, val: "", ignoreCase: false, want: "\"\"", @@ -14725,29 +14735,29 @@ var g = &grammar{ }, { name: "SelectLimit", - pos: position{line: 2088, col: 1, offset: 64756}, + pos: position{line: 2088, col: 1, offset: 64770}, expr: &choiceExpr{ - pos: position{line: 2089, col: 5, offset: 64772}, + pos: position{line: 2089, col: 5, offset: 64786}, alternatives: []any{ &actionExpr{ - pos: position{line: 2089, col: 5, offset: 64772}, + pos: position{line: 2089, col: 5, offset: 64786}, run: (*parser).callonSelectLimit2, expr: &seqExpr{ - pos: position{line: 2089, col: 5, offset: 64772}, + pos: position{line: 2089, col: 5, offset: 64786}, exprs: []any{ &labeledExpr{ - pos: position{line: 2089, col: 5, offset: 64772}, + pos: position{line: 2089, col: 5, offset: 64786}, label: "l", expr: &ruleRefExpr{ - pos: position{line: 2089, col: 7, offset: 64774}, + pos: position{line: 2089, col: 7, offset: 64788}, name: "LimitClause", }, }, &labeledExpr{ - pos: position{line: 2089, col: 19, offset: 64786}, + pos: position{line: 2089, col: 19, offset: 64800}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 2089, col: 21, offset: 64788}, + pos: position{line: 2089, col: 21, offset: 64802}, name: "OptOffsetClause", }, }, @@ -14755,24 +14765,24 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2096, col: 5, offset: 64934}, + pos: position{line: 2096, col: 5, offset: 64948}, run: (*parser).callonSelectLimit8, expr: &seqExpr{ - pos: position{line: 2096, col: 5, offset: 64934}, + pos: position{line: 2096, col: 5, offset: 64948}, exprs: []any{ &labeledExpr{ - pos: position{line: 2096, col: 5, offset: 64934}, + pos: position{line: 2096, col: 5, offset: 64948}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 2096, col: 7, offset: 64936}, + pos: position{line: 2096, col: 7, offset: 64950}, name: "OffsetClause", }, }, &labeledExpr{ - pos: position{line: 2096, col: 20, offset: 64949}, + pos: position{line: 2096, col: 20, offset: 64963}, label: "l", expr: &ruleRefExpr{ - pos: position{line: 2096, col: 22, offset: 64951}, + pos: position{line: 2096, col: 22, offset: 64965}, name: "OptLimitClause", }, }, @@ -14786,25 +14796,25 @@ var g = &grammar{ }, { name: "OptLimitClause", - pos: position{line: 2109, col: 1, offset: 65223}, + pos: position{line: 2109, col: 1, offset: 65237}, expr: &choiceExpr{ - pos: position{line: 2110, col: 5, offset: 65243}, + pos: position{line: 2110, col: 5, offset: 65257}, alternatives: []any{ &actionExpr{ - pos: position{line: 2110, col: 5, offset: 65243}, + pos: position{line: 2110, col: 5, offset: 65257}, run: (*parser).callonOptLimitClause2, expr: &seqExpr{ - pos: position{line: 2110, col: 5, offset: 65243}, + pos: position{line: 2110, col: 5, offset: 65257}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2110, col: 5, offset: 65243}, + pos: position{line: 2110, col: 5, offset: 65257}, name: "_", }, &labeledExpr{ - pos: position{line: 2110, col: 7, offset: 65245}, + pos: position{line: 2110, col: 7, offset: 65259}, label: "l", expr: &ruleRefExpr{ - pos: position{line: 2110, col: 9, offset: 65247}, + pos: position{line: 2110, col: 9, offset: 65261}, name: "LimitClause", }, }, @@ -14812,10 +14822,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2111, col: 5, offset: 65281}, + pos: position{line: 2111, col: 5, offset: 65295}, run: (*parser).callonOptLimitClause7, expr: &litMatcher{ - pos: position{line: 2111, col: 5, offset: 65281}, + pos: position{line: 2111, col: 5, offset: 65295}, val: "", ignoreCase: false, want: "\"\"", @@ -14828,50 +14838,50 @@ var g = &grammar{ }, { name: "LimitClause", - pos: position{line: 2113, col: 1, offset: 65318}, + pos: position{line: 2113, col: 1, offset: 65332}, expr: &choiceExpr{ - pos: position{line: 2114, col: 5, offset: 65335}, + pos: position{line: 2114, col: 5, offset: 65349}, alternatives: []any{ &actionExpr{ - pos: position{line: 2114, col: 5, offset: 65335}, + pos: position{line: 2114, col: 5, offset: 65349}, run: (*parser).callonLimitClause2, expr: &seqExpr{ - pos: position{line: 2114, col: 5, offset: 65335}, + pos: position{line: 2114, col: 5, offset: 65349}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2114, col: 5, offset: 65335}, + pos: position{line: 2114, col: 5, offset: 65349}, name: "LIMIT", }, &ruleRefExpr{ - pos: position{line: 2114, col: 11, offset: 65341}, + pos: position{line: 2114, col: 11, offset: 65355}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2114, col: 13, offset: 65343}, + pos: position{line: 2114, col: 13, offset: 65357}, name: "ALL", }, }, }, }, &actionExpr{ - pos: position{line: 2115, col: 5, offset: 65405}, + pos: position{line: 2115, col: 5, offset: 65419}, run: (*parser).callonLimitClause7, expr: &seqExpr{ - pos: position{line: 2115, col: 5, offset: 65405}, + pos: position{line: 2115, col: 5, offset: 65419}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2115, col: 5, offset: 65405}, + pos: position{line: 2115, col: 5, offset: 65419}, name: "LIMIT", }, &ruleRefExpr{ - pos: position{line: 2115, col: 11, offset: 65411}, + pos: position{line: 2115, col: 11, offset: 65425}, name: "_", }, &labeledExpr{ - pos: position{line: 2115, col: 13, offset: 65413}, + pos: position{line: 2115, col: 13, offset: 65427}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2115, col: 15, offset: 65415}, + pos: position{line: 2115, col: 15, offset: 65429}, name: "Expr", }, }, @@ -14885,25 +14895,25 @@ var g = &grammar{ }, { name: "OptOffsetClause", - pos: position{line: 2123, col: 1, offset: 65540}, + pos: position{line: 2123, col: 1, offset: 65554}, expr: &choiceExpr{ - pos: position{line: 2124, col: 5, offset: 65561}, + pos: position{line: 2124, col: 5, offset: 65575}, alternatives: []any{ &actionExpr{ - pos: position{line: 2124, col: 5, offset: 65561}, + pos: position{line: 2124, col: 5, offset: 65575}, run: (*parser).callonOptOffsetClause2, expr: &seqExpr{ - pos: position{line: 2124, col: 5, offset: 65561}, + pos: position{line: 2124, col: 5, offset: 65575}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2124, col: 5, offset: 65561}, + pos: position{line: 2124, col: 5, offset: 65575}, name: "_", }, &labeledExpr{ - pos: position{line: 2124, col: 7, offset: 65563}, + pos: position{line: 2124, col: 7, offset: 65577}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 2124, col: 9, offset: 65565}, + pos: position{line: 2124, col: 9, offset: 65579}, name: "OffsetClause", }, }, @@ -14911,10 +14921,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2125, col: 5, offset: 65601}, + pos: position{line: 2125, col: 5, offset: 65615}, run: (*parser).callonOptOffsetClause7, expr: &litMatcher{ - pos: position{line: 2125, col: 5, offset: 65601}, + pos: position{line: 2125, col: 5, offset: 65615}, val: "", ignoreCase: false, want: "\"\"", @@ -14927,26 +14937,26 @@ var g = &grammar{ }, { name: "OffsetClause", - pos: position{line: 2127, col: 1, offset: 65626}, + pos: position{line: 2127, col: 1, offset: 65640}, expr: &actionExpr{ - pos: position{line: 2128, col: 5, offset: 65644}, + pos: position{line: 2128, col: 5, offset: 65658}, run: (*parser).callonOffsetClause1, expr: &seqExpr{ - pos: position{line: 2128, col: 5, offset: 65644}, + pos: position{line: 2128, col: 5, offset: 65658}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2128, col: 5, offset: 65644}, + pos: position{line: 2128, col: 5, offset: 65658}, name: "OFFSET", }, &ruleRefExpr{ - pos: position{line: 2128, col: 12, offset: 65651}, + pos: position{line: 2128, col: 12, offset: 65665}, name: "_", }, &labeledExpr{ - pos: position{line: 2128, col: 14, offset: 65653}, + pos: position{line: 2128, col: 14, offset: 65667}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2128, col: 16, offset: 65655}, + pos: position{line: 2128, col: 16, offset: 65669}, name: "Expr", }, }, @@ -14958,38 +14968,38 @@ var g = &grammar{ }, { name: "SetOperation", - pos: position{line: 2130, col: 1, offset: 65680}, + pos: position{line: 2130, col: 1, offset: 65694}, expr: &actionExpr{ - pos: position{line: 2131, col: 5, offset: 65697}, + pos: position{line: 2131, col: 5, offset: 65711}, run: (*parser).callonSetOperation1, expr: &seqExpr{ - pos: position{line: 2131, col: 5, offset: 65697}, + pos: position{line: 2131, col: 5, offset: 65711}, exprs: []any{ &labeledExpr{ - pos: position{line: 2131, col: 5, offset: 65697}, + pos: position{line: 2131, col: 5, offset: 65711}, label: "left", expr: &ruleRefExpr{ - pos: position{line: 2131, col: 10, offset: 65702}, + pos: position{line: 2131, col: 10, offset: 65716}, name: "SelectExpr", }, }, &labeledExpr{ - pos: position{line: 2131, col: 21, offset: 65713}, + pos: position{line: 2131, col: 21, offset: 65727}, label: "distinct", expr: &ruleRefExpr{ - pos: position{line: 2131, col: 30, offset: 65722}, + pos: position{line: 2131, col: 30, offset: 65736}, name: "SetOp", }, }, &ruleRefExpr{ - pos: position{line: 2131, col: 36, offset: 65728}, + pos: position{line: 2131, col: 36, offset: 65742}, name: "_", }, &labeledExpr{ - pos: position{line: 2131, col: 38, offset: 65730}, + pos: position{line: 2131, col: 38, offset: 65744}, label: "right", expr: &ruleRefExpr{ - pos: position{line: 2131, col: 44, offset: 65736}, + pos: position{line: 2131, col: 44, offset: 65750}, name: "SelectExpr", }, }, @@ -15001,65 +15011,65 @@ var g = &grammar{ }, { name: "SetOp", - pos: position{line: 2141, col: 1, offset: 65957}, + pos: position{line: 2141, col: 1, offset: 65971}, expr: &choiceExpr{ - pos: position{line: 2142, col: 5, offset: 65968}, + pos: position{line: 2142, col: 5, offset: 65982}, alternatives: []any{ &actionExpr{ - pos: position{line: 2142, col: 5, offset: 65968}, + pos: position{line: 2142, col: 5, offset: 65982}, run: (*parser).callonSetOp2, expr: &seqExpr{ - pos: position{line: 2142, col: 5, offset: 65968}, + pos: position{line: 2142, col: 5, offset: 65982}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2142, col: 5, offset: 65968}, + pos: position{line: 2142, col: 5, offset: 65982}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2142, col: 7, offset: 65970}, + pos: position{line: 2142, col: 7, offset: 65984}, name: "UNION", }, &ruleRefExpr{ - pos: position{line: 2142, col: 13, offset: 65976}, + pos: position{line: 2142, col: 13, offset: 65990}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2142, col: 15, offset: 65978}, + pos: position{line: 2142, col: 15, offset: 65992}, name: "ALL", }, }, }, }, &actionExpr{ - pos: position{line: 2143, col: 5, offset: 66014}, + pos: position{line: 2143, col: 5, offset: 66028}, run: (*parser).callonSetOp8, expr: &seqExpr{ - pos: position{line: 2143, col: 5, offset: 66014}, + pos: position{line: 2143, col: 5, offset: 66028}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2143, col: 5, offset: 66014}, + pos: position{line: 2143, col: 5, offset: 66028}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2143, col: 7, offset: 66016}, + pos: position{line: 2143, col: 7, offset: 66030}, name: "UNION", }, &ruleRefExpr{ - pos: position{line: 2143, col: 13, offset: 66022}, + pos: position{line: 2143, col: 13, offset: 66036}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2143, col: 15, offset: 66024}, + pos: position{line: 2143, col: 15, offset: 66038}, name: "DISTINCT", }, }, }, }, &actionExpr{ - pos: position{line: 2144, col: 5, offset: 66059}, + pos: position{line: 2144, col: 5, offset: 66073}, run: (*parser).callonSetOp14, expr: &litMatcher{ - pos: position{line: 2144, col: 5, offset: 66059}, + pos: position{line: 2144, col: 5, offset: 66073}, val: "", ignoreCase: false, want: "\"\"", @@ -15072,80 +15082,80 @@ var g = &grammar{ }, { name: "SQLGuard", - pos: position{line: 2147, col: 1, offset: 66122}, + pos: position{line: 2147, col: 1, offset: 66136}, expr: &choiceExpr{ - pos: position{line: 2148, col: 5, offset: 66137}, + pos: position{line: 2148, col: 5, offset: 66151}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 2148, col: 5, offset: 66137}, + pos: position{line: 2148, col: 5, offset: 66151}, name: "FROM", }, &ruleRefExpr{ - pos: position{line: 2148, col: 12, offset: 66144}, + pos: position{line: 2148, col: 12, offset: 66158}, name: "GROUP", }, &ruleRefExpr{ - pos: position{line: 2148, col: 20, offset: 66152}, + pos: position{line: 2148, col: 20, offset: 66166}, name: "HAVING", }, &ruleRefExpr{ - pos: position{line: 2148, col: 29, offset: 66161}, + pos: position{line: 2148, col: 29, offset: 66175}, name: "SELECT", }, &ruleRefExpr{ - pos: position{line: 2148, col: 38, offset: 66170}, + pos: position{line: 2148, col: 38, offset: 66184}, name: "RECURSIVE", }, &ruleRefExpr{ - pos: position{line: 2149, col: 5, offset: 66184}, + pos: position{line: 2149, col: 5, offset: 66198}, name: "INNER", }, &ruleRefExpr{ - pos: position{line: 2149, col: 13, offset: 66192}, + pos: position{line: 2149, col: 13, offset: 66206}, name: "LEFT", }, &ruleRefExpr{ - pos: position{line: 2149, col: 20, offset: 66199}, + pos: position{line: 2149, col: 20, offset: 66213}, name: "RIGHT", }, &ruleRefExpr{ - pos: position{line: 2149, col: 28, offset: 66207}, + pos: position{line: 2149, col: 28, offset: 66221}, name: "OUTER", }, &ruleRefExpr{ - pos: position{line: 2149, col: 36, offset: 66215}, + pos: position{line: 2149, col: 36, offset: 66229}, name: "CROSS", }, &ruleRefExpr{ - pos: position{line: 2149, col: 44, offset: 66223}, + pos: position{line: 2149, col: 44, offset: 66237}, name: "JOIN", }, &ruleRefExpr{ - pos: position{line: 2150, col: 5, offset: 66232}, + pos: position{line: 2150, col: 5, offset: 66246}, name: "UNION", }, &ruleRefExpr{ - pos: position{line: 2151, col: 5, offset: 66242}, + pos: position{line: 2151, col: 5, offset: 66256}, name: "ORDER", }, &ruleRefExpr{ - pos: position{line: 2152, col: 5, offset: 66252}, + pos: position{line: 2152, col: 5, offset: 66266}, name: "LIMIT", }, &ruleRefExpr{ - pos: position{line: 2153, col: 5, offset: 66262}, + pos: position{line: 2153, col: 5, offset: 66276}, name: "WHERE", }, &ruleRefExpr{ - pos: position{line: 2154, col: 5, offset: 66273}, + pos: position{line: 2154, col: 5, offset: 66287}, name: "WITH", }, &ruleRefExpr{ - pos: position{line: 2155, col: 5, offset: 66282}, + pos: position{line: 2155, col: 5, offset: 66296}, name: "USING", }, &ruleRefExpr{ - pos: position{line: 2156, col: 5, offset: 66292}, + pos: position{line: 2156, col: 5, offset: 66306}, name: "ON", }, }, @@ -15155,20 +15165,20 @@ var g = &grammar{ }, { name: "AGGREGATE", - pos: position{line: 2158, col: 1, offset: 66296}, + pos: position{line: 2158, col: 1, offset: 66310}, expr: &seqExpr{ - pos: position{line: 2158, col: 14, offset: 66309}, + pos: position{line: 2158, col: 14, offset: 66323}, exprs: []any{ &litMatcher{ - pos: position{line: 2158, col: 14, offset: 66309}, + pos: position{line: 2158, col: 14, offset: 66323}, val: "aggregate", ignoreCase: true, want: "\"AGGREGATE\"i", }, ¬Expr{ - pos: position{line: 2158, col: 33, offset: 66328}, + pos: position{line: 2158, col: 33, offset: 66342}, expr: &ruleRefExpr{ - pos: position{line: 2158, col: 34, offset: 66329}, + pos: position{line: 2158, col: 34, offset: 66343}, name: "IdentifierRest", }, }, @@ -15179,20 +15189,20 @@ var g = &grammar{ }, { name: "ALL", - pos: position{line: 2159, col: 1, offset: 66344}, + pos: position{line: 2159, col: 1, offset: 66358}, expr: &seqExpr{ - pos: position{line: 2159, col: 14, offset: 66357}, + pos: position{line: 2159, col: 14, offset: 66371}, exprs: []any{ &litMatcher{ - pos: position{line: 2159, col: 14, offset: 66357}, + pos: position{line: 2159, col: 14, offset: 66371}, val: "all", ignoreCase: true, want: "\"ALL\"i", }, ¬Expr{ - pos: position{line: 2159, col: 33, offset: 66376}, + pos: position{line: 2159, col: 33, offset: 66390}, expr: &ruleRefExpr{ - pos: position{line: 2159, col: 34, offset: 66377}, + pos: position{line: 2159, col: 34, offset: 66391}, name: "IdentifierRest", }, }, @@ -15203,23 +15213,23 @@ var g = &grammar{ }, { name: "AND", - pos: position{line: 2160, col: 1, offset: 66392}, + pos: position{line: 2160, col: 1, offset: 66406}, expr: &actionExpr{ - pos: position{line: 2160, col: 14, offset: 66405}, + pos: position{line: 2160, col: 14, offset: 66419}, run: (*parser).callonAND1, expr: &seqExpr{ - pos: position{line: 2160, col: 14, offset: 66405}, + pos: position{line: 2160, col: 14, offset: 66419}, exprs: []any{ &litMatcher{ - pos: position{line: 2160, col: 14, offset: 66405}, + pos: position{line: 2160, col: 14, offset: 66419}, val: "and", ignoreCase: true, want: "\"AND\"i", }, ¬Expr{ - pos: position{line: 2160, col: 33, offset: 66424}, + pos: position{line: 2160, col: 33, offset: 66438}, expr: &ruleRefExpr{ - pos: position{line: 2160, col: 34, offset: 66425}, + pos: position{line: 2160, col: 34, offset: 66439}, name: "IdentifierRest", }, }, @@ -15231,20 +15241,20 @@ var g = &grammar{ }, { name: "ANTI", - pos: position{line: 2161, col: 1, offset: 66462}, + pos: position{line: 2161, col: 1, offset: 66476}, expr: &seqExpr{ - pos: position{line: 2161, col: 14, offset: 66475}, + pos: position{line: 2161, col: 14, offset: 66489}, exprs: []any{ &litMatcher{ - pos: position{line: 2161, col: 14, offset: 66475}, + pos: position{line: 2161, col: 14, offset: 66489}, val: "anti", ignoreCase: true, want: "\"ANTI\"i", }, ¬Expr{ - pos: position{line: 2161, col: 33, offset: 66494}, + pos: position{line: 2161, col: 33, offset: 66508}, expr: &ruleRefExpr{ - pos: position{line: 2161, col: 34, offset: 66495}, + pos: position{line: 2161, col: 34, offset: 66509}, name: "IdentifierRest", }, }, @@ -15255,20 +15265,20 @@ var g = &grammar{ }, { name: "AS", - pos: position{line: 2162, col: 1, offset: 66510}, + pos: position{line: 2162, col: 1, offset: 66524}, expr: &seqExpr{ - pos: position{line: 2162, col: 14, offset: 66523}, + pos: position{line: 2162, col: 14, offset: 66537}, exprs: []any{ &litMatcher{ - pos: position{line: 2162, col: 14, offset: 66523}, + pos: position{line: 2162, col: 14, offset: 66537}, val: "as", ignoreCase: true, want: "\"AS\"i", }, ¬Expr{ - pos: position{line: 2162, col: 33, offset: 66542}, + pos: position{line: 2162, col: 33, offset: 66556}, expr: &ruleRefExpr{ - pos: position{line: 2162, col: 34, offset: 66543}, + pos: position{line: 2162, col: 34, offset: 66557}, name: "IdentifierRest", }, }, @@ -15279,23 +15289,23 @@ var g = &grammar{ }, { name: "ASC", - pos: position{line: 2163, col: 1, offset: 66558}, + pos: position{line: 2163, col: 1, offset: 66572}, expr: &actionExpr{ - pos: position{line: 2163, col: 14, offset: 66571}, + pos: position{line: 2163, col: 14, offset: 66585}, run: (*parser).callonASC1, expr: &seqExpr{ - pos: position{line: 2163, col: 14, offset: 66571}, + pos: position{line: 2163, col: 14, offset: 66585}, exprs: []any{ &litMatcher{ - pos: position{line: 2163, col: 14, offset: 66571}, + pos: position{line: 2163, col: 14, offset: 66585}, val: "asc", ignoreCase: true, want: "\"ASC\"i", }, ¬Expr{ - pos: position{line: 2163, col: 33, offset: 66590}, + pos: position{line: 2163, col: 33, offset: 66604}, expr: &ruleRefExpr{ - pos: position{line: 2163, col: 34, offset: 66591}, + pos: position{line: 2163, col: 34, offset: 66605}, name: "IdentifierRest", }, }, @@ -15307,20 +15317,20 @@ var g = &grammar{ }, { name: "ASSERT", - pos: position{line: 2164, col: 1, offset: 66628}, + pos: position{line: 2164, col: 1, offset: 66642}, expr: &seqExpr{ - pos: position{line: 2164, col: 14, offset: 66641}, + pos: position{line: 2164, col: 14, offset: 66655}, exprs: []any{ &litMatcher{ - pos: position{line: 2164, col: 14, offset: 66641}, + pos: position{line: 2164, col: 14, offset: 66655}, val: "assert", ignoreCase: true, want: "\"ASSERT\"i", }, ¬Expr{ - pos: position{line: 2164, col: 33, offset: 66660}, + pos: position{line: 2164, col: 33, offset: 66674}, expr: &ruleRefExpr{ - pos: position{line: 2164, col: 34, offset: 66661}, + pos: position{line: 2164, col: 34, offset: 66675}, name: "IdentifierRest", }, }, @@ -15331,20 +15341,20 @@ var g = &grammar{ }, { name: "AT", - pos: position{line: 2165, col: 1, offset: 66676}, + pos: position{line: 2165, col: 1, offset: 66690}, expr: &seqExpr{ - pos: position{line: 2165, col: 14, offset: 66689}, + pos: position{line: 2165, col: 14, offset: 66703}, exprs: []any{ &litMatcher{ - pos: position{line: 2165, col: 14, offset: 66689}, + pos: position{line: 2165, col: 14, offset: 66703}, val: "at", ignoreCase: true, want: "\"AT\"i", }, ¬Expr{ - pos: position{line: 2165, col: 33, offset: 66708}, + pos: position{line: 2165, col: 33, offset: 66722}, expr: &ruleRefExpr{ - pos: position{line: 2165, col: 34, offset: 66709}, + pos: position{line: 2165, col: 34, offset: 66723}, name: "IdentifierRest", }, }, @@ -15355,20 +15365,20 @@ var g = &grammar{ }, { name: "AUTHOR", - pos: position{line: 2166, col: 1, offset: 66724}, + pos: position{line: 2166, col: 1, offset: 66738}, expr: &seqExpr{ - pos: position{line: 2166, col: 14, offset: 66737}, + pos: position{line: 2166, col: 14, offset: 66751}, exprs: []any{ &litMatcher{ - pos: position{line: 2166, col: 14, offset: 66737}, + pos: position{line: 2166, col: 14, offset: 66751}, val: "author", ignoreCase: true, want: "\"AUTHOR\"i", }, ¬Expr{ - pos: position{line: 2166, col: 33, offset: 66756}, + pos: position{line: 2166, col: 33, offset: 66770}, expr: &ruleRefExpr{ - pos: position{line: 2166, col: 34, offset: 66757}, + pos: position{line: 2166, col: 34, offset: 66771}, name: "IdentifierRest", }, }, @@ -15379,20 +15389,20 @@ var g = &grammar{ }, { name: "BODY", - pos: position{line: 2167, col: 1, offset: 66772}, + pos: position{line: 2167, col: 1, offset: 66786}, expr: &seqExpr{ - pos: position{line: 2167, col: 14, offset: 66785}, + pos: position{line: 2167, col: 14, offset: 66799}, exprs: []any{ &litMatcher{ - pos: position{line: 2167, col: 14, offset: 66785}, + pos: position{line: 2167, col: 14, offset: 66799}, val: "body", ignoreCase: true, want: "\"BODY\"i", }, ¬Expr{ - pos: position{line: 2167, col: 33, offset: 66804}, + pos: position{line: 2167, col: 33, offset: 66818}, expr: &ruleRefExpr{ - pos: position{line: 2167, col: 34, offset: 66805}, + pos: position{line: 2167, col: 34, offset: 66819}, name: "IdentifierRest", }, }, @@ -15403,20 +15413,20 @@ var g = &grammar{ }, { name: "BY", - pos: position{line: 2168, col: 1, offset: 66820}, + pos: position{line: 2168, col: 1, offset: 66834}, expr: &seqExpr{ - pos: position{line: 2168, col: 14, offset: 66833}, + pos: position{line: 2168, col: 14, offset: 66847}, exprs: []any{ &litMatcher{ - pos: position{line: 2168, col: 14, offset: 66833}, + pos: position{line: 2168, col: 14, offset: 66847}, val: "by", ignoreCase: true, want: "\"BY\"i", }, ¬Expr{ - pos: position{line: 2168, col: 33, offset: 66852}, + pos: position{line: 2168, col: 33, offset: 66866}, expr: &ruleRefExpr{ - pos: position{line: 2168, col: 34, offset: 66853}, + pos: position{line: 2168, col: 34, offset: 66867}, name: "IdentifierRest", }, }, @@ -15427,20 +15437,20 @@ var g = &grammar{ }, { name: "CASE", - pos: position{line: 2169, col: 1, offset: 66868}, + pos: position{line: 2169, col: 1, offset: 66882}, expr: &seqExpr{ - pos: position{line: 2169, col: 14, offset: 66881}, + pos: position{line: 2169, col: 14, offset: 66895}, exprs: []any{ &litMatcher{ - pos: position{line: 2169, col: 14, offset: 66881}, + pos: position{line: 2169, col: 14, offset: 66895}, val: "case", ignoreCase: true, want: "\"CASE\"i", }, ¬Expr{ - pos: position{line: 2169, col: 33, offset: 66900}, + pos: position{line: 2169, col: 33, offset: 66914}, expr: &ruleRefExpr{ - pos: position{line: 2169, col: 34, offset: 66901}, + pos: position{line: 2169, col: 34, offset: 66915}, name: "IdentifierRest", }, }, @@ -15451,20 +15461,20 @@ var g = &grammar{ }, { name: "CONST", - pos: position{line: 2170, col: 1, offset: 66916}, + pos: position{line: 2170, col: 1, offset: 66930}, expr: &seqExpr{ - pos: position{line: 2170, col: 14, offset: 66929}, + pos: position{line: 2170, col: 14, offset: 66943}, exprs: []any{ &litMatcher{ - pos: position{line: 2170, col: 14, offset: 66929}, + pos: position{line: 2170, col: 14, offset: 66943}, val: "const", ignoreCase: true, want: "\"CONST\"i", }, ¬Expr{ - pos: position{line: 2170, col: 33, offset: 66948}, + pos: position{line: 2170, col: 33, offset: 66962}, expr: &ruleRefExpr{ - pos: position{line: 2170, col: 34, offset: 66949}, + pos: position{line: 2170, col: 34, offset: 66963}, name: "IdentifierRest", }, }, @@ -15475,20 +15485,20 @@ var g = &grammar{ }, { name: "CROSS", - pos: position{line: 2171, col: 1, offset: 66964}, + pos: position{line: 2171, col: 1, offset: 66978}, expr: &seqExpr{ - pos: position{line: 2171, col: 14, offset: 66977}, + pos: position{line: 2171, col: 14, offset: 66991}, exprs: []any{ &litMatcher{ - pos: position{line: 2171, col: 14, offset: 66977}, + pos: position{line: 2171, col: 14, offset: 66991}, val: "cross", ignoreCase: true, want: "\"CROSS\"i", }, ¬Expr{ - pos: position{line: 2171, col: 33, offset: 66996}, + pos: position{line: 2171, col: 33, offset: 67010}, expr: &ruleRefExpr{ - pos: position{line: 2171, col: 34, offset: 66997}, + pos: position{line: 2171, col: 34, offset: 67011}, name: "IdentifierRest", }, }, @@ -15499,20 +15509,20 @@ var g = &grammar{ }, { name: "CUT", - pos: position{line: 2172, col: 1, offset: 67012}, + pos: position{line: 2172, col: 1, offset: 67026}, expr: &seqExpr{ - pos: position{line: 2172, col: 14, offset: 67025}, + pos: position{line: 2172, col: 14, offset: 67039}, exprs: []any{ &litMatcher{ - pos: position{line: 2172, col: 14, offset: 67025}, + pos: position{line: 2172, col: 14, offset: 67039}, val: "cut", ignoreCase: true, want: "\"CUT\"i", }, ¬Expr{ - pos: position{line: 2172, col: 33, offset: 67044}, + pos: position{line: 2172, col: 33, offset: 67058}, expr: &ruleRefExpr{ - pos: position{line: 2172, col: 34, offset: 67045}, + pos: position{line: 2172, col: 34, offset: 67059}, name: "IdentifierRest", }, }, @@ -15523,20 +15533,20 @@ var g = &grammar{ }, { name: "DEBUG", - pos: position{line: 2173, col: 1, offset: 67060}, + pos: position{line: 2173, col: 1, offset: 67074}, expr: &seqExpr{ - pos: position{line: 2173, col: 14, offset: 67073}, + pos: position{line: 2173, col: 14, offset: 67087}, exprs: []any{ &litMatcher{ - pos: position{line: 2173, col: 14, offset: 67073}, + pos: position{line: 2173, col: 14, offset: 67087}, val: "debug", ignoreCase: true, want: "\"DEBUG\"i", }, ¬Expr{ - pos: position{line: 2173, col: 33, offset: 67092}, + pos: position{line: 2173, col: 33, offset: 67106}, expr: &ruleRefExpr{ - pos: position{line: 2173, col: 34, offset: 67093}, + pos: position{line: 2173, col: 34, offset: 67107}, name: "IdentifierRest", }, }, @@ -15547,20 +15557,20 @@ var g = &grammar{ }, { name: "DEFAULT", - pos: position{line: 2174, col: 1, offset: 67108}, + pos: position{line: 2174, col: 1, offset: 67122}, expr: &seqExpr{ - pos: position{line: 2174, col: 14, offset: 67121}, + pos: position{line: 2174, col: 14, offset: 67135}, exprs: []any{ &litMatcher{ - pos: position{line: 2174, col: 14, offset: 67121}, + pos: position{line: 2174, col: 14, offset: 67135}, val: "default", ignoreCase: true, want: "\"DEFAULT\"i", }, ¬Expr{ - pos: position{line: 2174, col: 33, offset: 67140}, + pos: position{line: 2174, col: 33, offset: 67154}, expr: &ruleRefExpr{ - pos: position{line: 2174, col: 34, offset: 67141}, + pos: position{line: 2174, col: 34, offset: 67155}, name: "IdentifierRest", }, }, @@ -15571,23 +15581,23 @@ var g = &grammar{ }, { name: "DESC", - pos: position{line: 2175, col: 1, offset: 67156}, + pos: position{line: 2175, col: 1, offset: 67170}, expr: &actionExpr{ - pos: position{line: 2175, col: 14, offset: 67169}, + pos: position{line: 2175, col: 14, offset: 67183}, run: (*parser).callonDESC1, expr: &seqExpr{ - pos: position{line: 2175, col: 14, offset: 67169}, + pos: position{line: 2175, col: 14, offset: 67183}, exprs: []any{ &litMatcher{ - pos: position{line: 2175, col: 14, offset: 67169}, + pos: position{line: 2175, col: 14, offset: 67183}, val: "desc", ignoreCase: true, want: "\"DESC\"i", }, ¬Expr{ - pos: position{line: 2175, col: 33, offset: 67188}, + pos: position{line: 2175, col: 33, offset: 67202}, expr: &ruleRefExpr{ - pos: position{line: 2175, col: 34, offset: 67189}, + pos: position{line: 2175, col: 34, offset: 67203}, name: "IdentifierRest", }, }, @@ -15599,20 +15609,20 @@ var g = &grammar{ }, { name: "DISTINCT", - pos: position{line: 2176, col: 1, offset: 67227}, + pos: position{line: 2176, col: 1, offset: 67241}, expr: &seqExpr{ - pos: position{line: 2176, col: 14, offset: 67240}, + pos: position{line: 2176, col: 14, offset: 67254}, exprs: []any{ &litMatcher{ - pos: position{line: 2176, col: 14, offset: 67240}, + pos: position{line: 2176, col: 14, offset: 67254}, val: "distinct", ignoreCase: true, want: "\"DISTINCT\"i", }, ¬Expr{ - pos: position{line: 2176, col: 33, offset: 67259}, + pos: position{line: 2176, col: 33, offset: 67273}, expr: &ruleRefExpr{ - pos: position{line: 2176, col: 34, offset: 67260}, + pos: position{line: 2176, col: 34, offset: 67274}, name: "IdentifierRest", }, }, @@ -15623,20 +15633,20 @@ var g = &grammar{ }, { name: "DROP", - pos: position{line: 2177, col: 1, offset: 67275}, + pos: position{line: 2177, col: 1, offset: 67289}, expr: &seqExpr{ - pos: position{line: 2177, col: 14, offset: 67288}, + pos: position{line: 2177, col: 14, offset: 67302}, exprs: []any{ &litMatcher{ - pos: position{line: 2177, col: 14, offset: 67288}, + pos: position{line: 2177, col: 14, offset: 67302}, val: "drop", ignoreCase: true, want: "\"DROP\"i", }, ¬Expr{ - pos: position{line: 2177, col: 33, offset: 67307}, + pos: position{line: 2177, col: 33, offset: 67321}, expr: &ruleRefExpr{ - pos: position{line: 2177, col: 34, offset: 67308}, + pos: position{line: 2177, col: 34, offset: 67322}, name: "IdentifierRest", }, }, @@ -15647,20 +15657,20 @@ var g = &grammar{ }, { name: "ERROR", - pos: position{line: 2178, col: 1, offset: 67324}, + pos: position{line: 2178, col: 1, offset: 67338}, expr: &seqExpr{ - pos: position{line: 2178, col: 14, offset: 67337}, + pos: position{line: 2178, col: 14, offset: 67351}, exprs: []any{ &litMatcher{ - pos: position{line: 2178, col: 14, offset: 67337}, + pos: position{line: 2178, col: 14, offset: 67351}, val: "error", ignoreCase: true, want: "\"ERROR\"i", }, ¬Expr{ - pos: position{line: 2178, col: 33, offset: 67356}, + pos: position{line: 2178, col: 33, offset: 67370}, expr: &ruleRefExpr{ - pos: position{line: 2178, col: 34, offset: 67357}, + pos: position{line: 2178, col: 34, offset: 67371}, name: "IdentifierRest", }, }, @@ -15671,20 +15681,20 @@ var g = &grammar{ }, { name: "EXPLODE", - pos: position{line: 2179, col: 1, offset: 67372}, + pos: position{line: 2179, col: 1, offset: 67386}, expr: &seqExpr{ - pos: position{line: 2179, col: 14, offset: 67385}, + pos: position{line: 2179, col: 14, offset: 67399}, exprs: []any{ &litMatcher{ - pos: position{line: 2179, col: 14, offset: 67385}, + pos: position{line: 2179, col: 14, offset: 67399}, val: "explode", ignoreCase: true, want: "\"EXPLODE\"i", }, ¬Expr{ - pos: position{line: 2179, col: 33, offset: 67404}, + pos: position{line: 2179, col: 33, offset: 67418}, expr: &ruleRefExpr{ - pos: position{line: 2179, col: 34, offset: 67405}, + pos: position{line: 2179, col: 34, offset: 67419}, name: "IdentifierRest", }, }, @@ -15695,20 +15705,20 @@ var g = &grammar{ }, { name: "FALSE", - pos: position{line: 2180, col: 1, offset: 67420}, + pos: position{line: 2180, col: 1, offset: 67434}, expr: &seqExpr{ - pos: position{line: 2180, col: 14, offset: 67433}, + pos: position{line: 2180, col: 14, offset: 67447}, exprs: []any{ &litMatcher{ - pos: position{line: 2180, col: 14, offset: 67433}, + pos: position{line: 2180, col: 14, offset: 67447}, val: "false", ignoreCase: true, want: "\"FALSE\"i", }, ¬Expr{ - pos: position{line: 2180, col: 33, offset: 67452}, + pos: position{line: 2180, col: 33, offset: 67466}, expr: &ruleRefExpr{ - pos: position{line: 2180, col: 34, offset: 67453}, + pos: position{line: 2180, col: 34, offset: 67467}, name: "IdentifierRest", }, }, @@ -15719,20 +15729,20 @@ var g = &grammar{ }, { name: "FIRST", - pos: position{line: 2181, col: 1, offset: 67468}, + pos: position{line: 2181, col: 1, offset: 67482}, expr: &seqExpr{ - pos: position{line: 2181, col: 14, offset: 67481}, + pos: position{line: 2181, col: 14, offset: 67495}, exprs: []any{ &litMatcher{ - pos: position{line: 2181, col: 14, offset: 67481}, + pos: position{line: 2181, col: 14, offset: 67495}, val: "first", ignoreCase: true, want: "\"FIRST\"i", }, ¬Expr{ - pos: position{line: 2181, col: 33, offset: 67500}, + pos: position{line: 2181, col: 33, offset: 67514}, expr: &ruleRefExpr{ - pos: position{line: 2181, col: 34, offset: 67501}, + pos: position{line: 2181, col: 34, offset: 67515}, name: "IdentifierRest", }, }, @@ -15743,20 +15753,20 @@ var g = &grammar{ }, { name: "FORK", - pos: position{line: 2182, col: 1, offset: 67516}, + pos: position{line: 2182, col: 1, offset: 67530}, expr: &seqExpr{ - pos: position{line: 2182, col: 14, offset: 67529}, + pos: position{line: 2182, col: 14, offset: 67543}, exprs: []any{ &litMatcher{ - pos: position{line: 2182, col: 14, offset: 67529}, + pos: position{line: 2182, col: 14, offset: 67543}, val: "fork", ignoreCase: true, want: "\"FORK\"i", }, ¬Expr{ - pos: position{line: 2182, col: 33, offset: 67548}, + pos: position{line: 2182, col: 33, offset: 67562}, expr: &ruleRefExpr{ - pos: position{line: 2182, col: 34, offset: 67549}, + pos: position{line: 2182, col: 34, offset: 67563}, name: "IdentifierRest", }, }, @@ -15767,20 +15777,20 @@ var g = &grammar{ }, { name: "FORMAT", - pos: position{line: 2183, col: 1, offset: 67564}, + pos: position{line: 2183, col: 1, offset: 67578}, expr: &seqExpr{ - pos: position{line: 2183, col: 14, offset: 67577}, + pos: position{line: 2183, col: 14, offset: 67591}, exprs: []any{ &litMatcher{ - pos: position{line: 2183, col: 14, offset: 67577}, + pos: position{line: 2183, col: 14, offset: 67591}, val: "format", ignoreCase: true, want: "\"FORMAT\"i", }, ¬Expr{ - pos: position{line: 2183, col: 33, offset: 67596}, + pos: position{line: 2183, col: 33, offset: 67610}, expr: &ruleRefExpr{ - pos: position{line: 2183, col: 34, offset: 67597}, + pos: position{line: 2183, col: 34, offset: 67611}, name: "IdentifierRest", }, }, @@ -15791,20 +15801,20 @@ var g = &grammar{ }, { name: "FROM", - pos: position{line: 2184, col: 1, offset: 67612}, + pos: position{line: 2184, col: 1, offset: 67626}, expr: &seqExpr{ - pos: position{line: 2184, col: 14, offset: 67625}, + pos: position{line: 2184, col: 14, offset: 67639}, exprs: []any{ &litMatcher{ - pos: position{line: 2184, col: 14, offset: 67625}, + pos: position{line: 2184, col: 14, offset: 67639}, val: "from", ignoreCase: true, want: "\"FROM\"i", }, ¬Expr{ - pos: position{line: 2184, col: 33, offset: 67644}, + pos: position{line: 2184, col: 33, offset: 67658}, expr: &ruleRefExpr{ - pos: position{line: 2184, col: 34, offset: 67645}, + pos: position{line: 2184, col: 34, offset: 67659}, name: "IdentifierRest", }, }, @@ -15815,20 +15825,20 @@ var g = &grammar{ }, { name: "FULL", - pos: position{line: 2185, col: 1, offset: 67660}, + pos: position{line: 2185, col: 1, offset: 67674}, expr: &seqExpr{ - pos: position{line: 2185, col: 14, offset: 67673}, + pos: position{line: 2185, col: 14, offset: 67687}, exprs: []any{ &litMatcher{ - pos: position{line: 2185, col: 14, offset: 67673}, + pos: position{line: 2185, col: 14, offset: 67687}, val: "full", ignoreCase: true, want: "\"FULL\"i", }, ¬Expr{ - pos: position{line: 2185, col: 33, offset: 67692}, + pos: position{line: 2185, col: 33, offset: 67706}, expr: &ruleRefExpr{ - pos: position{line: 2185, col: 34, offset: 67693}, + pos: position{line: 2185, col: 34, offset: 67707}, name: "IdentifierRest", }, }, @@ -15839,20 +15849,20 @@ var g = &grammar{ }, { name: "FUNC", - pos: position{line: 2186, col: 1, offset: 67708}, + pos: position{line: 2186, col: 1, offset: 67722}, expr: &seqExpr{ - pos: position{line: 2186, col: 14, offset: 67721}, + pos: position{line: 2186, col: 14, offset: 67735}, exprs: []any{ &litMatcher{ - pos: position{line: 2186, col: 14, offset: 67721}, + pos: position{line: 2186, col: 14, offset: 67735}, val: "func", ignoreCase: true, want: "\"FUNC\"i", }, ¬Expr{ - pos: position{line: 2186, col: 33, offset: 67740}, + pos: position{line: 2186, col: 33, offset: 67754}, expr: &ruleRefExpr{ - pos: position{line: 2186, col: 34, offset: 67741}, + pos: position{line: 2186, col: 34, offset: 67755}, name: "IdentifierRest", }, }, @@ -15863,20 +15873,20 @@ var g = &grammar{ }, { name: "FUSE", - pos: position{line: 2187, col: 1, offset: 67756}, + pos: position{line: 2187, col: 1, offset: 67770}, expr: &seqExpr{ - pos: position{line: 2187, col: 14, offset: 67769}, + pos: position{line: 2187, col: 14, offset: 67783}, exprs: []any{ &litMatcher{ - pos: position{line: 2187, col: 14, offset: 67769}, + pos: position{line: 2187, col: 14, offset: 67783}, val: "fuse", ignoreCase: true, want: "\"FUSE\"i", }, ¬Expr{ - pos: position{line: 2187, col: 33, offset: 67788}, + pos: position{line: 2187, col: 33, offset: 67802}, expr: &ruleRefExpr{ - pos: position{line: 2187, col: 34, offset: 67789}, + pos: position{line: 2187, col: 34, offset: 67803}, name: "IdentifierRest", }, }, @@ -15887,20 +15897,20 @@ var g = &grammar{ }, { name: "GREP", - pos: position{line: 2188, col: 1, offset: 67804}, + pos: position{line: 2188, col: 1, offset: 67818}, expr: &seqExpr{ - pos: position{line: 2188, col: 14, offset: 67817}, + pos: position{line: 2188, col: 14, offset: 67831}, exprs: []any{ &litMatcher{ - pos: position{line: 2188, col: 14, offset: 67817}, + pos: position{line: 2188, col: 14, offset: 67831}, val: "grep", ignoreCase: true, want: "\"GREP\"i", }, ¬Expr{ - pos: position{line: 2188, col: 33, offset: 67836}, + pos: position{line: 2188, col: 33, offset: 67850}, expr: &ruleRefExpr{ - pos: position{line: 2188, col: 34, offset: 67837}, + pos: position{line: 2188, col: 34, offset: 67851}, name: "IdentifierRest", }, }, @@ -15911,20 +15921,20 @@ var g = &grammar{ }, { name: "GROUP", - pos: position{line: 2189, col: 1, offset: 67852}, + pos: position{line: 2189, col: 1, offset: 67866}, expr: &seqExpr{ - pos: position{line: 2189, col: 14, offset: 67865}, + pos: position{line: 2189, col: 14, offset: 67879}, exprs: []any{ &litMatcher{ - pos: position{line: 2189, col: 14, offset: 67865}, + pos: position{line: 2189, col: 14, offset: 67879}, val: "group", ignoreCase: true, want: "\"GROUP\"i", }, ¬Expr{ - pos: position{line: 2189, col: 33, offset: 67884}, + pos: position{line: 2189, col: 33, offset: 67898}, expr: &ruleRefExpr{ - pos: position{line: 2189, col: 34, offset: 67885}, + pos: position{line: 2189, col: 34, offset: 67899}, name: "IdentifierRest", }, }, @@ -15935,20 +15945,20 @@ var g = &grammar{ }, { name: "HAVING", - pos: position{line: 2190, col: 1, offset: 67900}, + pos: position{line: 2190, col: 1, offset: 67914}, expr: &seqExpr{ - pos: position{line: 2190, col: 14, offset: 67913}, + pos: position{line: 2190, col: 14, offset: 67927}, exprs: []any{ &litMatcher{ - pos: position{line: 2190, col: 14, offset: 67913}, + pos: position{line: 2190, col: 14, offset: 67927}, val: "having", ignoreCase: true, want: "\"HAVING\"i", }, ¬Expr{ - pos: position{line: 2190, col: 33, offset: 67932}, + pos: position{line: 2190, col: 33, offset: 67946}, expr: &ruleRefExpr{ - pos: position{line: 2190, col: 34, offset: 67933}, + pos: position{line: 2190, col: 34, offset: 67947}, name: "IdentifierRest", }, }, @@ -15959,20 +15969,20 @@ var g = &grammar{ }, { name: "HEAD", - pos: position{line: 2191, col: 1, offset: 67948}, + pos: position{line: 2191, col: 1, offset: 67962}, expr: &seqExpr{ - pos: position{line: 2191, col: 14, offset: 67961}, + pos: position{line: 2191, col: 14, offset: 67975}, exprs: []any{ &litMatcher{ - pos: position{line: 2191, col: 14, offset: 67961}, + pos: position{line: 2191, col: 14, offset: 67975}, val: "head", ignoreCase: true, want: "\"HEAD\"i", }, ¬Expr{ - pos: position{line: 2191, col: 33, offset: 67980}, + pos: position{line: 2191, col: 33, offset: 67994}, expr: &ruleRefExpr{ - pos: position{line: 2191, col: 34, offset: 67981}, + pos: position{line: 2191, col: 34, offset: 67995}, name: "IdentifierRest", }, }, @@ -15983,20 +15993,20 @@ var g = &grammar{ }, { name: "HEADERS", - pos: position{line: 2192, col: 1, offset: 67997}, + pos: position{line: 2192, col: 1, offset: 68011}, expr: &seqExpr{ - pos: position{line: 2192, col: 14, offset: 68010}, + pos: position{line: 2192, col: 14, offset: 68024}, exprs: []any{ &litMatcher{ - pos: position{line: 2192, col: 14, offset: 68010}, + pos: position{line: 2192, col: 14, offset: 68024}, val: "headers", ignoreCase: true, want: "\"HEADERS\"i", }, ¬Expr{ - pos: position{line: 2192, col: 33, offset: 68029}, + pos: position{line: 2192, col: 33, offset: 68043}, expr: &ruleRefExpr{ - pos: position{line: 2192, col: 34, offset: 68030}, + pos: position{line: 2192, col: 34, offset: 68044}, name: "IdentifierRest", }, }, @@ -16007,20 +16017,20 @@ var g = &grammar{ }, { name: "IN", - pos: position{line: 2193, col: 1, offset: 68045}, + pos: position{line: 2193, col: 1, offset: 68059}, expr: &seqExpr{ - pos: position{line: 2193, col: 14, offset: 68058}, + pos: position{line: 2193, col: 14, offset: 68072}, exprs: []any{ &litMatcher{ - pos: position{line: 2193, col: 14, offset: 68058}, + pos: position{line: 2193, col: 14, offset: 68072}, val: "in", ignoreCase: true, want: "\"IN\"i", }, ¬Expr{ - pos: position{line: 2193, col: 33, offset: 68077}, + pos: position{line: 2193, col: 33, offset: 68091}, expr: &ruleRefExpr{ - pos: position{line: 2193, col: 34, offset: 68078}, + pos: position{line: 2193, col: 34, offset: 68092}, name: "IdentifierRest", }, }, @@ -16031,20 +16041,20 @@ var g = &grammar{ }, { name: "INNER", - pos: position{line: 2194, col: 1, offset: 68093}, + pos: position{line: 2194, col: 1, offset: 68107}, expr: &seqExpr{ - pos: position{line: 2194, col: 14, offset: 68106}, + pos: position{line: 2194, col: 14, offset: 68120}, exprs: []any{ &litMatcher{ - pos: position{line: 2194, col: 14, offset: 68106}, + pos: position{line: 2194, col: 14, offset: 68120}, val: "inner", ignoreCase: true, want: "\"INNER\"i", }, ¬Expr{ - pos: position{line: 2194, col: 33, offset: 68125}, + pos: position{line: 2194, col: 33, offset: 68139}, expr: &ruleRefExpr{ - pos: position{line: 2194, col: 34, offset: 68126}, + pos: position{line: 2194, col: 34, offset: 68140}, name: "IdentifierRest", }, }, @@ -16055,20 +16065,20 @@ var g = &grammar{ }, { name: "JOIN", - pos: position{line: 2195, col: 1, offset: 68141}, + pos: position{line: 2195, col: 1, offset: 68155}, expr: &seqExpr{ - pos: position{line: 2195, col: 14, offset: 68154}, + pos: position{line: 2195, col: 14, offset: 68168}, exprs: []any{ &litMatcher{ - pos: position{line: 2195, col: 14, offset: 68154}, + pos: position{line: 2195, col: 14, offset: 68168}, val: "join", ignoreCase: true, want: "\"JOIN\"i", }, ¬Expr{ - pos: position{line: 2195, col: 33, offset: 68173}, + pos: position{line: 2195, col: 33, offset: 68187}, expr: &ruleRefExpr{ - pos: position{line: 2195, col: 34, offset: 68174}, + pos: position{line: 2195, col: 34, offset: 68188}, name: "IdentifierRest", }, }, @@ -16079,20 +16089,20 @@ var g = &grammar{ }, { name: "LAST", - pos: position{line: 2196, col: 1, offset: 68189}, + pos: position{line: 2196, col: 1, offset: 68203}, expr: &seqExpr{ - pos: position{line: 2196, col: 14, offset: 68202}, + pos: position{line: 2196, col: 14, offset: 68216}, exprs: []any{ &litMatcher{ - pos: position{line: 2196, col: 14, offset: 68202}, + pos: position{line: 2196, col: 14, offset: 68216}, val: "last", ignoreCase: true, want: "\"LAST\"i", }, ¬Expr{ - pos: position{line: 2196, col: 33, offset: 68221}, + pos: position{line: 2196, col: 33, offset: 68235}, expr: &ruleRefExpr{ - pos: position{line: 2196, col: 34, offset: 68222}, + pos: position{line: 2196, col: 34, offset: 68236}, name: "IdentifierRest", }, }, @@ -16103,20 +16113,44 @@ var g = &grammar{ }, { name: "LEFT", - pos: position{line: 2197, col: 1, offset: 68237}, + pos: position{line: 2197, col: 1, offset: 68251}, expr: &seqExpr{ - pos: position{line: 2197, col: 14, offset: 68250}, + pos: position{line: 2197, col: 14, offset: 68264}, exprs: []any{ &litMatcher{ - pos: position{line: 2197, col: 14, offset: 68250}, + pos: position{line: 2197, col: 14, offset: 68264}, val: "left", ignoreCase: true, want: "\"LEFT\"i", }, ¬Expr{ - pos: position{line: 2197, col: 33, offset: 68269}, + pos: position{line: 2197, col: 33, offset: 68283}, + expr: &ruleRefExpr{ + pos: position{line: 2197, col: 34, offset: 68284}, + name: "IdentifierRest", + }, + }, + }, + }, + leader: false, + leftRecursive: false, + }, + { + name: "LIKE", + pos: position{line: 2198, col: 1, offset: 68299}, + expr: &seqExpr{ + pos: position{line: 2198, col: 14, offset: 68312}, + exprs: []any{ + &litMatcher{ + pos: position{line: 2198, col: 14, offset: 68312}, + val: "like", + ignoreCase: true, + want: "\"LIKE\"i", + }, + ¬Expr{ + pos: position{line: 2198, col: 32, offset: 68330}, expr: &ruleRefExpr{ - pos: position{line: 2197, col: 34, offset: 68270}, + pos: position{line: 2198, col: 33, offset: 68331}, name: "IdentifierRest", }, }, @@ -16127,20 +16161,20 @@ var g = &grammar{ }, { name: "LIMIT", - pos: position{line: 2198, col: 1, offset: 68285}, + pos: position{line: 2199, col: 1, offset: 68346}, expr: &seqExpr{ - pos: position{line: 2198, col: 14, offset: 68298}, + pos: position{line: 2199, col: 14, offset: 68359}, exprs: []any{ &litMatcher{ - pos: position{line: 2198, col: 14, offset: 68298}, + pos: position{line: 2199, col: 14, offset: 68359}, val: "limit", ignoreCase: true, want: "\"LIMIT\"i", }, ¬Expr{ - pos: position{line: 2198, col: 33, offset: 68317}, + pos: position{line: 2199, col: 33, offset: 68378}, expr: &ruleRefExpr{ - pos: position{line: 2198, col: 34, offset: 68318}, + pos: position{line: 2199, col: 34, offset: 68379}, name: "IdentifierRest", }, }, @@ -16151,20 +16185,20 @@ var g = &grammar{ }, { name: "LOAD", - pos: position{line: 2199, col: 1, offset: 68333}, + pos: position{line: 2200, col: 1, offset: 68394}, expr: &seqExpr{ - pos: position{line: 2199, col: 14, offset: 68346}, + pos: position{line: 2200, col: 14, offset: 68407}, exprs: []any{ &litMatcher{ - pos: position{line: 2199, col: 14, offset: 68346}, + pos: position{line: 2200, col: 14, offset: 68407}, val: "load", ignoreCase: true, want: "\"LOAD\"i", }, ¬Expr{ - pos: position{line: 2199, col: 33, offset: 68365}, + pos: position{line: 2200, col: 33, offset: 68426}, expr: &ruleRefExpr{ - pos: position{line: 2199, col: 34, offset: 68366}, + pos: position{line: 2200, col: 34, offset: 68427}, name: "IdentifierRest", }, }, @@ -16175,20 +16209,20 @@ var g = &grammar{ }, { name: "MATERIALIZED", - pos: position{line: 2200, col: 1, offset: 68381}, + pos: position{line: 2201, col: 1, offset: 68442}, expr: &seqExpr{ - pos: position{line: 2200, col: 16, offset: 68396}, + pos: position{line: 2201, col: 16, offset: 68457}, exprs: []any{ &litMatcher{ - pos: position{line: 2200, col: 16, offset: 68396}, + pos: position{line: 2201, col: 16, offset: 68457}, val: "materialized", ignoreCase: true, want: "\"MATERIALIZED\"i", }, ¬Expr{ - pos: position{line: 2200, col: 33, offset: 68413}, + pos: position{line: 2201, col: 33, offset: 68474}, expr: &ruleRefExpr{ - pos: position{line: 2200, col: 34, offset: 68414}, + pos: position{line: 2201, col: 34, offset: 68475}, name: "IdentifierRest", }, }, @@ -16199,20 +16233,20 @@ var g = &grammar{ }, { name: "MERGE", - pos: position{line: 2201, col: 1, offset: 68429}, + pos: position{line: 2202, col: 1, offset: 68490}, expr: &seqExpr{ - pos: position{line: 2201, col: 14, offset: 68442}, + pos: position{line: 2202, col: 14, offset: 68503}, exprs: []any{ &litMatcher{ - pos: position{line: 2201, col: 14, offset: 68442}, + pos: position{line: 2202, col: 14, offset: 68503}, val: "merge", ignoreCase: true, want: "\"MERGE\"i", }, ¬Expr{ - pos: position{line: 2201, col: 33, offset: 68461}, + pos: position{line: 2202, col: 33, offset: 68522}, expr: &ruleRefExpr{ - pos: position{line: 2201, col: 34, offset: 68462}, + pos: position{line: 2202, col: 34, offset: 68523}, name: "IdentifierRest", }, }, @@ -16223,20 +16257,20 @@ var g = &grammar{ }, { name: "MESSAGE", - pos: position{line: 2202, col: 1, offset: 68477}, + pos: position{line: 2203, col: 1, offset: 68538}, expr: &seqExpr{ - pos: position{line: 2202, col: 14, offset: 68490}, + pos: position{line: 2203, col: 14, offset: 68551}, exprs: []any{ &litMatcher{ - pos: position{line: 2202, col: 14, offset: 68490}, + pos: position{line: 2203, col: 14, offset: 68551}, val: "message", ignoreCase: true, want: "\"MESSAGE\"i", }, ¬Expr{ - pos: position{line: 2202, col: 33, offset: 68509}, + pos: position{line: 2203, col: 33, offset: 68570}, expr: &ruleRefExpr{ - pos: position{line: 2202, col: 34, offset: 68510}, + pos: position{line: 2203, col: 34, offset: 68571}, name: "IdentifierRest", }, }, @@ -16247,20 +16281,20 @@ var g = &grammar{ }, { name: "META", - pos: position{line: 2203, col: 1, offset: 68525}, + pos: position{line: 2204, col: 1, offset: 68586}, expr: &seqExpr{ - pos: position{line: 2203, col: 14, offset: 68538}, + pos: position{line: 2204, col: 14, offset: 68599}, exprs: []any{ &litMatcher{ - pos: position{line: 2203, col: 14, offset: 68538}, + pos: position{line: 2204, col: 14, offset: 68599}, val: "meta", ignoreCase: true, want: "\"META\"i", }, ¬Expr{ - pos: position{line: 2203, col: 33, offset: 68557}, + pos: position{line: 2204, col: 33, offset: 68618}, expr: &ruleRefExpr{ - pos: position{line: 2203, col: 34, offset: 68558}, + pos: position{line: 2204, col: 34, offset: 68619}, name: "IdentifierRest", }, }, @@ -16271,20 +16305,20 @@ var g = &grammar{ }, { name: "METHOD", - pos: position{line: 2204, col: 1, offset: 68573}, + pos: position{line: 2205, col: 1, offset: 68634}, expr: &seqExpr{ - pos: position{line: 2204, col: 14, offset: 68586}, + pos: position{line: 2205, col: 14, offset: 68647}, exprs: []any{ &litMatcher{ - pos: position{line: 2204, col: 14, offset: 68586}, + pos: position{line: 2205, col: 14, offset: 68647}, val: "method", ignoreCase: true, want: "\"METHOD\"i", }, ¬Expr{ - pos: position{line: 2204, col: 33, offset: 68605}, + pos: position{line: 2205, col: 33, offset: 68666}, expr: &ruleRefExpr{ - pos: position{line: 2204, col: 34, offset: 68606}, + pos: position{line: 2205, col: 34, offset: 68667}, name: "IdentifierRest", }, }, @@ -16295,20 +16329,20 @@ var g = &grammar{ }, { name: "NOT", - pos: position{line: 2205, col: 1, offset: 68621}, + pos: position{line: 2206, col: 1, offset: 68682}, expr: &seqExpr{ - pos: position{line: 2205, col: 14, offset: 68634}, + pos: position{line: 2206, col: 14, offset: 68695}, exprs: []any{ &litMatcher{ - pos: position{line: 2205, col: 14, offset: 68634}, + pos: position{line: 2206, col: 14, offset: 68695}, val: "not", ignoreCase: true, want: "\"NOT\"i", }, ¬Expr{ - pos: position{line: 2205, col: 33, offset: 68653}, + pos: position{line: 2206, col: 33, offset: 68714}, expr: &ruleRefExpr{ - pos: position{line: 2205, col: 34, offset: 68654}, + pos: position{line: 2206, col: 34, offset: 68715}, name: "IdentifierRest", }, }, @@ -16319,20 +16353,20 @@ var g = &grammar{ }, { name: "NULL", - pos: position{line: 2206, col: 1, offset: 68669}, + pos: position{line: 2207, col: 1, offset: 68730}, expr: &seqExpr{ - pos: position{line: 2206, col: 14, offset: 68682}, + pos: position{line: 2207, col: 14, offset: 68743}, exprs: []any{ &litMatcher{ - pos: position{line: 2206, col: 14, offset: 68682}, + pos: position{line: 2207, col: 14, offset: 68743}, val: "null", ignoreCase: true, want: "\"NULL\"i", }, ¬Expr{ - pos: position{line: 2206, col: 33, offset: 68701}, + pos: position{line: 2207, col: 33, offset: 68762}, expr: &ruleRefExpr{ - pos: position{line: 2206, col: 34, offset: 68702}, + pos: position{line: 2207, col: 34, offset: 68763}, name: "IdentifierRest", }, }, @@ -16343,20 +16377,20 @@ var g = &grammar{ }, { name: "NULLS", - pos: position{line: 2207, col: 1, offset: 68717}, + pos: position{line: 2208, col: 1, offset: 68778}, expr: &seqExpr{ - pos: position{line: 2207, col: 14, offset: 68730}, + pos: position{line: 2208, col: 14, offset: 68791}, exprs: []any{ &litMatcher{ - pos: position{line: 2207, col: 14, offset: 68730}, + pos: position{line: 2208, col: 14, offset: 68791}, val: "nulls", ignoreCase: true, want: "\"NULLS\"i", }, ¬Expr{ - pos: position{line: 2207, col: 33, offset: 68749}, + pos: position{line: 2208, col: 33, offset: 68810}, expr: &ruleRefExpr{ - pos: position{line: 2207, col: 34, offset: 68750}, + pos: position{line: 2208, col: 34, offset: 68811}, name: "IdentifierRest", }, }, @@ -16367,20 +16401,20 @@ var g = &grammar{ }, { name: "OFFSET", - pos: position{line: 2208, col: 1, offset: 68765}, + pos: position{line: 2209, col: 1, offset: 68826}, expr: &seqExpr{ - pos: position{line: 2208, col: 14, offset: 68778}, + pos: position{line: 2209, col: 14, offset: 68839}, exprs: []any{ &litMatcher{ - pos: position{line: 2208, col: 14, offset: 68778}, + pos: position{line: 2209, col: 14, offset: 68839}, val: "offset", ignoreCase: true, want: "\"OFFSET\"i", }, ¬Expr{ - pos: position{line: 2208, col: 33, offset: 68797}, + pos: position{line: 2209, col: 33, offset: 68858}, expr: &ruleRefExpr{ - pos: position{line: 2208, col: 34, offset: 68798}, + pos: position{line: 2209, col: 34, offset: 68859}, name: "IdentifierRest", }, }, @@ -16391,20 +16425,20 @@ var g = &grammar{ }, { name: "ON", - pos: position{line: 2209, col: 1, offset: 68813}, + pos: position{line: 2210, col: 1, offset: 68874}, expr: &seqExpr{ - pos: position{line: 2209, col: 14, offset: 68826}, + pos: position{line: 2210, col: 14, offset: 68887}, exprs: []any{ &litMatcher{ - pos: position{line: 2209, col: 14, offset: 68826}, + pos: position{line: 2210, col: 14, offset: 68887}, val: "on", ignoreCase: true, want: "\"ON\"i", }, ¬Expr{ - pos: position{line: 2209, col: 33, offset: 68845}, + pos: position{line: 2210, col: 33, offset: 68906}, expr: &ruleRefExpr{ - pos: position{line: 2209, col: 34, offset: 68846}, + pos: position{line: 2210, col: 34, offset: 68907}, name: "IdentifierRest", }, }, @@ -16415,20 +16449,20 @@ var g = &grammar{ }, { name: "OP", - pos: position{line: 2210, col: 1, offset: 68861}, + pos: position{line: 2211, col: 1, offset: 68922}, expr: &seqExpr{ - pos: position{line: 2210, col: 14, offset: 68874}, + pos: position{line: 2211, col: 14, offset: 68935}, exprs: []any{ &litMatcher{ - pos: position{line: 2210, col: 14, offset: 68874}, + pos: position{line: 2211, col: 14, offset: 68935}, val: "op", ignoreCase: true, want: "\"OP\"i", }, ¬Expr{ - pos: position{line: 2210, col: 33, offset: 68893}, + pos: position{line: 2211, col: 33, offset: 68954}, expr: &ruleRefExpr{ - pos: position{line: 2210, col: 34, offset: 68894}, + pos: position{line: 2211, col: 34, offset: 68955}, name: "IdentifierRest", }, }, @@ -16439,23 +16473,23 @@ var g = &grammar{ }, { name: "OR", - pos: position{line: 2211, col: 1, offset: 68909}, + pos: position{line: 2212, col: 1, offset: 68970}, expr: &actionExpr{ - pos: position{line: 2211, col: 14, offset: 68922}, + pos: position{line: 2212, col: 14, offset: 68983}, run: (*parser).callonOR1, expr: &seqExpr{ - pos: position{line: 2211, col: 14, offset: 68922}, + pos: position{line: 2212, col: 14, offset: 68983}, exprs: []any{ &litMatcher{ - pos: position{line: 2211, col: 14, offset: 68922}, + pos: position{line: 2212, col: 14, offset: 68983}, val: "or", ignoreCase: true, want: "\"OR\"i", }, ¬Expr{ - pos: position{line: 2211, col: 33, offset: 68941}, + pos: position{line: 2212, col: 33, offset: 69002}, expr: &ruleRefExpr{ - pos: position{line: 2211, col: 34, offset: 68942}, + pos: position{line: 2212, col: 34, offset: 69003}, name: "IdentifierRest", }, }, @@ -16467,20 +16501,20 @@ var g = &grammar{ }, { name: "ORDER", - pos: position{line: 2212, col: 1, offset: 68978}, + pos: position{line: 2213, col: 1, offset: 69039}, expr: &seqExpr{ - pos: position{line: 2212, col: 14, offset: 68991}, + pos: position{line: 2213, col: 14, offset: 69052}, exprs: []any{ &litMatcher{ - pos: position{line: 2212, col: 14, offset: 68991}, + pos: position{line: 2213, col: 14, offset: 69052}, val: "order", ignoreCase: true, want: "\"ORDER\"i", }, ¬Expr{ - pos: position{line: 2212, col: 33, offset: 69010}, + pos: position{line: 2213, col: 33, offset: 69071}, expr: &ruleRefExpr{ - pos: position{line: 2212, col: 34, offset: 69011}, + pos: position{line: 2213, col: 34, offset: 69072}, name: "IdentifierRest", }, }, @@ -16491,20 +16525,20 @@ var g = &grammar{ }, { name: "ORDINALITY", - pos: position{line: 2213, col: 1, offset: 69026}, + pos: position{line: 2214, col: 1, offset: 69087}, expr: &seqExpr{ - pos: position{line: 2213, col: 14, offset: 69039}, + pos: position{line: 2214, col: 14, offset: 69100}, exprs: []any{ &litMatcher{ - pos: position{line: 2213, col: 14, offset: 69039}, + pos: position{line: 2214, col: 14, offset: 69100}, val: "ordinality", ignoreCase: true, want: "\"ORDINALITY\"i", }, ¬Expr{ - pos: position{line: 2213, col: 33, offset: 69058}, + pos: position{line: 2214, col: 33, offset: 69119}, expr: &ruleRefExpr{ - pos: position{line: 2213, col: 34, offset: 69059}, + pos: position{line: 2214, col: 34, offset: 69120}, name: "IdentifierRest", }, }, @@ -16515,20 +16549,20 @@ var g = &grammar{ }, { name: "OUTER", - pos: position{line: 2214, col: 1, offset: 69074}, + pos: position{line: 2215, col: 1, offset: 69135}, expr: &seqExpr{ - pos: position{line: 2214, col: 14, offset: 69087}, + pos: position{line: 2215, col: 14, offset: 69148}, exprs: []any{ &litMatcher{ - pos: position{line: 2214, col: 14, offset: 69087}, + pos: position{line: 2215, col: 14, offset: 69148}, val: "outer", ignoreCase: true, want: "\"OUTER\"i", }, ¬Expr{ - pos: position{line: 2214, col: 33, offset: 69106}, + pos: position{line: 2215, col: 33, offset: 69167}, expr: &ruleRefExpr{ - pos: position{line: 2214, col: 34, offset: 69107}, + pos: position{line: 2215, col: 34, offset: 69168}, name: "IdentifierRest", }, }, @@ -16539,20 +16573,20 @@ var g = &grammar{ }, { name: "OUTPUT", - pos: position{line: 2215, col: 1, offset: 69122}, + pos: position{line: 2216, col: 1, offset: 69183}, expr: &seqExpr{ - pos: position{line: 2215, col: 14, offset: 69135}, + pos: position{line: 2216, col: 14, offset: 69196}, exprs: []any{ &litMatcher{ - pos: position{line: 2215, col: 14, offset: 69135}, + pos: position{line: 2216, col: 14, offset: 69196}, val: "output", ignoreCase: true, want: "\"OUTPUT\"i", }, ¬Expr{ - pos: position{line: 2215, col: 33, offset: 69154}, + pos: position{line: 2216, col: 33, offset: 69215}, expr: &ruleRefExpr{ - pos: position{line: 2215, col: 34, offset: 69155}, + pos: position{line: 2216, col: 34, offset: 69216}, name: "IdentifierRest", }, }, @@ -16563,20 +16597,20 @@ var g = &grammar{ }, { name: "OVER", - pos: position{line: 2216, col: 1, offset: 69170}, + pos: position{line: 2217, col: 1, offset: 69231}, expr: &seqExpr{ - pos: position{line: 2216, col: 14, offset: 69183}, + pos: position{line: 2217, col: 14, offset: 69244}, exprs: []any{ &litMatcher{ - pos: position{line: 2216, col: 14, offset: 69183}, + pos: position{line: 2217, col: 14, offset: 69244}, val: "over", ignoreCase: true, want: "\"OVER\"i", }, ¬Expr{ - pos: position{line: 2216, col: 33, offset: 69202}, + pos: position{line: 2217, col: 33, offset: 69263}, expr: &ruleRefExpr{ - pos: position{line: 2216, col: 34, offset: 69203}, + pos: position{line: 2217, col: 34, offset: 69264}, name: "IdentifierRest", }, }, @@ -16587,20 +16621,20 @@ var g = &grammar{ }, { name: "PASS", - pos: position{line: 2217, col: 1, offset: 69218}, + pos: position{line: 2218, col: 1, offset: 69279}, expr: &seqExpr{ - pos: position{line: 2217, col: 14, offset: 69231}, + pos: position{line: 2218, col: 14, offset: 69292}, exprs: []any{ &litMatcher{ - pos: position{line: 2217, col: 14, offset: 69231}, + pos: position{line: 2218, col: 14, offset: 69292}, val: "pass", ignoreCase: true, want: "\"PASS\"i", }, ¬Expr{ - pos: position{line: 2217, col: 33, offset: 69250}, + pos: position{line: 2218, col: 33, offset: 69311}, expr: &ruleRefExpr{ - pos: position{line: 2217, col: 34, offset: 69251}, + pos: position{line: 2218, col: 34, offset: 69312}, name: "IdentifierRest", }, }, @@ -16611,20 +16645,20 @@ var g = &grammar{ }, { name: "PUT", - pos: position{line: 2218, col: 1, offset: 69266}, + pos: position{line: 2219, col: 1, offset: 69327}, expr: &seqExpr{ - pos: position{line: 2218, col: 14, offset: 69279}, + pos: position{line: 2219, col: 14, offset: 69340}, exprs: []any{ &litMatcher{ - pos: position{line: 2218, col: 14, offset: 69279}, + pos: position{line: 2219, col: 14, offset: 69340}, val: "put", ignoreCase: true, want: "\"PUT\"i", }, ¬Expr{ - pos: position{line: 2218, col: 33, offset: 69298}, + pos: position{line: 2219, col: 33, offset: 69359}, expr: &ruleRefExpr{ - pos: position{line: 2218, col: 34, offset: 69299}, + pos: position{line: 2219, col: 34, offset: 69360}, name: "IdentifierRest", }, }, @@ -16635,20 +16669,20 @@ var g = &grammar{ }, { name: "RECURSIVE", - pos: position{line: 2219, col: 1, offset: 69314}, + pos: position{line: 2220, col: 1, offset: 69375}, expr: &seqExpr{ - pos: position{line: 2219, col: 14, offset: 69327}, + pos: position{line: 2220, col: 14, offset: 69388}, exprs: []any{ &litMatcher{ - pos: position{line: 2219, col: 14, offset: 69327}, + pos: position{line: 2220, col: 14, offset: 69388}, val: "RECURSIVE", ignoreCase: false, want: "\"RECURSIVE\"", }, ¬Expr{ - pos: position{line: 2219, col: 33, offset: 69346}, + pos: position{line: 2220, col: 33, offset: 69407}, expr: &ruleRefExpr{ - pos: position{line: 2219, col: 34, offset: 69347}, + pos: position{line: 2220, col: 34, offset: 69408}, name: "IdentifierRest", }, }, @@ -16659,20 +16693,20 @@ var g = &grammar{ }, { name: "REGEXP", - pos: position{line: 2220, col: 1, offset: 69362}, + pos: position{line: 2221, col: 1, offset: 69423}, expr: &seqExpr{ - pos: position{line: 2220, col: 14, offset: 69375}, + pos: position{line: 2221, col: 14, offset: 69436}, exprs: []any{ &litMatcher{ - pos: position{line: 2220, col: 14, offset: 69375}, + pos: position{line: 2221, col: 14, offset: 69436}, val: "regexp", ignoreCase: true, want: "\"REGEXP\"i", }, ¬Expr{ - pos: position{line: 2220, col: 33, offset: 69394}, + pos: position{line: 2221, col: 33, offset: 69455}, expr: &ruleRefExpr{ - pos: position{line: 2220, col: 34, offset: 69395}, + pos: position{line: 2221, col: 34, offset: 69456}, name: "IdentifierRest", }, }, @@ -16683,20 +16717,20 @@ var g = &grammar{ }, { name: "REGEXP_REPLACE", - pos: position{line: 2221, col: 1, offset: 69410}, + pos: position{line: 2222, col: 1, offset: 69471}, expr: &seqExpr{ - pos: position{line: 2221, col: 18, offset: 69427}, + pos: position{line: 2222, col: 18, offset: 69488}, exprs: []any{ &litMatcher{ - pos: position{line: 2221, col: 18, offset: 69427}, + pos: position{line: 2222, col: 18, offset: 69488}, val: "regexp_replace", ignoreCase: true, want: "\"REGEXP_REPLACE\"i", }, ¬Expr{ - pos: position{line: 2221, col: 36, offset: 69445}, + pos: position{line: 2222, col: 36, offset: 69506}, expr: &ruleRefExpr{ - pos: position{line: 2221, col: 37, offset: 69446}, + pos: position{line: 2222, col: 37, offset: 69507}, name: "IdentifierRest", }, }, @@ -16707,20 +16741,20 @@ var g = &grammar{ }, { name: "RENAME", - pos: position{line: 2222, col: 1, offset: 69461}, + pos: position{line: 2223, col: 1, offset: 69522}, expr: &seqExpr{ - pos: position{line: 2222, col: 14, offset: 69474}, + pos: position{line: 2223, col: 14, offset: 69535}, exprs: []any{ &litMatcher{ - pos: position{line: 2222, col: 14, offset: 69474}, + pos: position{line: 2223, col: 14, offset: 69535}, val: "rename", ignoreCase: true, want: "\"RENAME\"i", }, ¬Expr{ - pos: position{line: 2222, col: 33, offset: 69493}, + pos: position{line: 2223, col: 33, offset: 69554}, expr: &ruleRefExpr{ - pos: position{line: 2222, col: 34, offset: 69494}, + pos: position{line: 2223, col: 34, offset: 69555}, name: "IdentifierRest", }, }, @@ -16731,20 +16765,20 @@ var g = &grammar{ }, { name: "RIGHT", - pos: position{line: 2223, col: 1, offset: 69509}, + pos: position{line: 2224, col: 1, offset: 69570}, expr: &seqExpr{ - pos: position{line: 2223, col: 14, offset: 69522}, + pos: position{line: 2224, col: 14, offset: 69583}, exprs: []any{ &litMatcher{ - pos: position{line: 2223, col: 14, offset: 69522}, + pos: position{line: 2224, col: 14, offset: 69583}, val: "right", ignoreCase: true, want: "\"RIGHT\"i", }, ¬Expr{ - pos: position{line: 2223, col: 33, offset: 69541}, + pos: position{line: 2224, col: 33, offset: 69602}, expr: &ruleRefExpr{ - pos: position{line: 2223, col: 34, offset: 69542}, + pos: position{line: 2224, col: 34, offset: 69603}, name: "IdentifierRest", }, }, @@ -16755,20 +16789,20 @@ var g = &grammar{ }, { name: "SAMPLE", - pos: position{line: 2224, col: 1, offset: 69557}, + pos: position{line: 2225, col: 1, offset: 69618}, expr: &seqExpr{ - pos: position{line: 2224, col: 14, offset: 69570}, + pos: position{line: 2225, col: 14, offset: 69631}, exprs: []any{ &litMatcher{ - pos: position{line: 2224, col: 14, offset: 69570}, + pos: position{line: 2225, col: 14, offset: 69631}, val: "sample", ignoreCase: true, want: "\"SAMPLE\"i", }, ¬Expr{ - pos: position{line: 2224, col: 33, offset: 69589}, + pos: position{line: 2225, col: 33, offset: 69650}, expr: &ruleRefExpr{ - pos: position{line: 2224, col: 34, offset: 69590}, + pos: position{line: 2225, col: 34, offset: 69651}, name: "IdentifierRest", }, }, @@ -16779,20 +16813,20 @@ var g = &grammar{ }, { name: "SEARCH", - pos: position{line: 2225, col: 1, offset: 69605}, + pos: position{line: 2226, col: 1, offset: 69666}, expr: &seqExpr{ - pos: position{line: 2225, col: 14, offset: 69618}, + pos: position{line: 2226, col: 14, offset: 69679}, exprs: []any{ &litMatcher{ - pos: position{line: 2225, col: 14, offset: 69618}, + pos: position{line: 2226, col: 14, offset: 69679}, val: "search", ignoreCase: true, want: "\"SEARCH\"i", }, ¬Expr{ - pos: position{line: 2225, col: 33, offset: 69637}, + pos: position{line: 2226, col: 33, offset: 69698}, expr: &ruleRefExpr{ - pos: position{line: 2225, col: 34, offset: 69638}, + pos: position{line: 2226, col: 34, offset: 69699}, name: "IdentifierRest", }, }, @@ -16803,20 +16837,20 @@ var g = &grammar{ }, { name: "SELECT", - pos: position{line: 2226, col: 1, offset: 69653}, + pos: position{line: 2227, col: 1, offset: 69714}, expr: &seqExpr{ - pos: position{line: 2226, col: 14, offset: 69666}, + pos: position{line: 2227, col: 14, offset: 69727}, exprs: []any{ &litMatcher{ - pos: position{line: 2226, col: 14, offset: 69666}, + pos: position{line: 2227, col: 14, offset: 69727}, val: "select", ignoreCase: true, want: "\"SELECT\"i", }, ¬Expr{ - pos: position{line: 2226, col: 33, offset: 69685}, + pos: position{line: 2227, col: 33, offset: 69746}, expr: &ruleRefExpr{ - pos: position{line: 2226, col: 34, offset: 69686}, + pos: position{line: 2227, col: 34, offset: 69747}, name: "IdentifierRest", }, }, @@ -16827,20 +16861,20 @@ var g = &grammar{ }, { name: "SHAPE", - pos: position{line: 2227, col: 1, offset: 69701}, + pos: position{line: 2228, col: 1, offset: 69762}, expr: &seqExpr{ - pos: position{line: 2227, col: 14, offset: 69714}, + pos: position{line: 2228, col: 14, offset: 69775}, exprs: []any{ &litMatcher{ - pos: position{line: 2227, col: 14, offset: 69714}, + pos: position{line: 2228, col: 14, offset: 69775}, val: "shape", ignoreCase: true, want: "\"SHAPE\"i", }, ¬Expr{ - pos: position{line: 2227, col: 33, offset: 69733}, + pos: position{line: 2228, col: 33, offset: 69794}, expr: &ruleRefExpr{ - pos: position{line: 2227, col: 34, offset: 69734}, + pos: position{line: 2228, col: 34, offset: 69795}, name: "IdentifierRest", }, }, @@ -16851,20 +16885,20 @@ var g = &grammar{ }, { name: "SORT", - pos: position{line: 2228, col: 1, offset: 69749}, + pos: position{line: 2229, col: 1, offset: 69810}, expr: &seqExpr{ - pos: position{line: 2228, col: 14, offset: 69762}, + pos: position{line: 2229, col: 14, offset: 69823}, exprs: []any{ &litMatcher{ - pos: position{line: 2228, col: 14, offset: 69762}, + pos: position{line: 2229, col: 14, offset: 69823}, val: "sort", ignoreCase: true, want: "\"SORT\"i", }, ¬Expr{ - pos: position{line: 2228, col: 33, offset: 69781}, + pos: position{line: 2229, col: 33, offset: 69842}, expr: &ruleRefExpr{ - pos: position{line: 2228, col: 34, offset: 69782}, + pos: position{line: 2229, col: 34, offset: 69843}, name: "IdentifierRest", }, }, @@ -16875,20 +16909,20 @@ var g = &grammar{ }, { name: "SUMMARIZE", - pos: position{line: 2229, col: 1, offset: 69797}, + pos: position{line: 2230, col: 1, offset: 69858}, expr: &seqExpr{ - pos: position{line: 2229, col: 14, offset: 69810}, + pos: position{line: 2230, col: 14, offset: 69871}, exprs: []any{ &litMatcher{ - pos: position{line: 2229, col: 14, offset: 69810}, + pos: position{line: 2230, col: 14, offset: 69871}, val: "summarize", ignoreCase: true, want: "\"SUMMARIZE\"i", }, ¬Expr{ - pos: position{line: 2229, col: 33, offset: 69829}, + pos: position{line: 2230, col: 33, offset: 69890}, expr: &ruleRefExpr{ - pos: position{line: 2229, col: 34, offset: 69830}, + pos: position{line: 2230, col: 34, offset: 69891}, name: "IdentifierRest", }, }, @@ -16899,20 +16933,20 @@ var g = &grammar{ }, { name: "SWITCH", - pos: position{line: 2230, col: 1, offset: 69845}, + pos: position{line: 2231, col: 1, offset: 69906}, expr: &seqExpr{ - pos: position{line: 2230, col: 14, offset: 69858}, + pos: position{line: 2231, col: 14, offset: 69919}, exprs: []any{ &litMatcher{ - pos: position{line: 2230, col: 14, offset: 69858}, + pos: position{line: 2231, col: 14, offset: 69919}, val: "switch", ignoreCase: true, want: "\"SWITCH\"i", }, ¬Expr{ - pos: position{line: 2230, col: 33, offset: 69877}, + pos: position{line: 2231, col: 33, offset: 69938}, expr: &ruleRefExpr{ - pos: position{line: 2230, col: 34, offset: 69878}, + pos: position{line: 2231, col: 34, offset: 69939}, name: "IdentifierRest", }, }, @@ -16923,20 +16957,20 @@ var g = &grammar{ }, { name: "TAIL", - pos: position{line: 2231, col: 1, offset: 69893}, + pos: position{line: 2232, col: 1, offset: 69954}, expr: &seqExpr{ - pos: position{line: 2231, col: 14, offset: 69906}, + pos: position{line: 2232, col: 14, offset: 69967}, exprs: []any{ &litMatcher{ - pos: position{line: 2231, col: 14, offset: 69906}, + pos: position{line: 2232, col: 14, offset: 69967}, val: "tail", ignoreCase: true, want: "\"TAIL\"i", }, ¬Expr{ - pos: position{line: 2231, col: 33, offset: 69925}, + pos: position{line: 2232, col: 33, offset: 69986}, expr: &ruleRefExpr{ - pos: position{line: 2231, col: 34, offset: 69926}, + pos: position{line: 2232, col: 34, offset: 69987}, name: "IdentifierRest", }, }, @@ -16947,20 +16981,20 @@ var g = &grammar{ }, { name: "TAP", - pos: position{line: 2232, col: 1, offset: 69942}, + pos: position{line: 2233, col: 1, offset: 70003}, expr: &seqExpr{ - pos: position{line: 2232, col: 14, offset: 69955}, + pos: position{line: 2233, col: 14, offset: 70016}, exprs: []any{ &litMatcher{ - pos: position{line: 2232, col: 14, offset: 69955}, + pos: position{line: 2233, col: 14, offset: 70016}, val: "tap", ignoreCase: true, want: "\"TAP\"i", }, ¬Expr{ - pos: position{line: 2232, col: 33, offset: 69974}, + pos: position{line: 2233, col: 33, offset: 70035}, expr: &ruleRefExpr{ - pos: position{line: 2232, col: 34, offset: 69975}, + pos: position{line: 2233, col: 34, offset: 70036}, name: "IdentifierRest", }, }, @@ -16971,20 +17005,20 @@ var g = &grammar{ }, { name: "THEN", - pos: position{line: 2233, col: 1, offset: 69990}, + pos: position{line: 2234, col: 1, offset: 70051}, expr: &seqExpr{ - pos: position{line: 2233, col: 14, offset: 70003}, + pos: position{line: 2234, col: 14, offset: 70064}, exprs: []any{ &litMatcher{ - pos: position{line: 2233, col: 14, offset: 70003}, + pos: position{line: 2234, col: 14, offset: 70064}, val: "then", ignoreCase: true, want: "\"THEN\"i", }, ¬Expr{ - pos: position{line: 2233, col: 33, offset: 70022}, + pos: position{line: 2234, col: 33, offset: 70083}, expr: &ruleRefExpr{ - pos: position{line: 2233, col: 34, offset: 70023}, + pos: position{line: 2234, col: 34, offset: 70084}, name: "IdentifierRest", }, }, @@ -16995,20 +17029,20 @@ var g = &grammar{ }, { name: "TOP", - pos: position{line: 2234, col: 1, offset: 70038}, + pos: position{line: 2235, col: 1, offset: 70099}, expr: &seqExpr{ - pos: position{line: 2234, col: 14, offset: 70051}, + pos: position{line: 2235, col: 14, offset: 70112}, exprs: []any{ &litMatcher{ - pos: position{line: 2234, col: 14, offset: 70051}, + pos: position{line: 2235, col: 14, offset: 70112}, val: "top", ignoreCase: true, want: "\"TOP\"i", }, ¬Expr{ - pos: position{line: 2234, col: 33, offset: 70070}, + pos: position{line: 2235, col: 33, offset: 70131}, expr: &ruleRefExpr{ - pos: position{line: 2234, col: 34, offset: 70071}, + pos: position{line: 2235, col: 34, offset: 70132}, name: "IdentifierRest", }, }, @@ -17019,20 +17053,20 @@ var g = &grammar{ }, { name: "TRUE", - pos: position{line: 2235, col: 1, offset: 70086}, + pos: position{line: 2236, col: 1, offset: 70147}, expr: &seqExpr{ - pos: position{line: 2235, col: 14, offset: 70099}, + pos: position{line: 2236, col: 14, offset: 70160}, exprs: []any{ &litMatcher{ - pos: position{line: 2235, col: 14, offset: 70099}, + pos: position{line: 2236, col: 14, offset: 70160}, val: "true", ignoreCase: true, want: "\"TRUE\"i", }, ¬Expr{ - pos: position{line: 2235, col: 33, offset: 70118}, + pos: position{line: 2236, col: 33, offset: 70179}, expr: &ruleRefExpr{ - pos: position{line: 2235, col: 34, offset: 70119}, + pos: position{line: 2236, col: 34, offset: 70180}, name: "IdentifierRest", }, }, @@ -17043,20 +17077,20 @@ var g = &grammar{ }, { name: "TYPE", - pos: position{line: 2236, col: 1, offset: 70134}, + pos: position{line: 2237, col: 1, offset: 70195}, expr: &seqExpr{ - pos: position{line: 2236, col: 14, offset: 70147}, + pos: position{line: 2237, col: 14, offset: 70208}, exprs: []any{ &litMatcher{ - pos: position{line: 2236, col: 14, offset: 70147}, + pos: position{line: 2237, col: 14, offset: 70208}, val: "type", ignoreCase: true, want: "\"TYPE\"i", }, ¬Expr{ - pos: position{line: 2236, col: 33, offset: 70166}, + pos: position{line: 2237, col: 33, offset: 70227}, expr: &ruleRefExpr{ - pos: position{line: 2236, col: 34, offset: 70167}, + pos: position{line: 2237, col: 34, offset: 70228}, name: "IdentifierRest", }, }, @@ -17067,20 +17101,20 @@ var g = &grammar{ }, { name: "UNION", - pos: position{line: 2237, col: 1, offset: 70182}, + pos: position{line: 2238, col: 1, offset: 70243}, expr: &seqExpr{ - pos: position{line: 2237, col: 14, offset: 70195}, + pos: position{line: 2238, col: 14, offset: 70256}, exprs: []any{ &litMatcher{ - pos: position{line: 2237, col: 14, offset: 70195}, + pos: position{line: 2238, col: 14, offset: 70256}, val: "union", ignoreCase: true, want: "\"UNION\"i", }, ¬Expr{ - pos: position{line: 2237, col: 33, offset: 70214}, + pos: position{line: 2238, col: 33, offset: 70275}, expr: &ruleRefExpr{ - pos: position{line: 2237, col: 34, offset: 70215}, + pos: position{line: 2238, col: 34, offset: 70276}, name: "IdentifierRest", }, }, @@ -17091,20 +17125,20 @@ var g = &grammar{ }, { name: "UNIQ", - pos: position{line: 2238, col: 1, offset: 70230}, + pos: position{line: 2239, col: 1, offset: 70291}, expr: &seqExpr{ - pos: position{line: 2238, col: 14, offset: 70243}, + pos: position{line: 2239, col: 14, offset: 70304}, exprs: []any{ &litMatcher{ - pos: position{line: 2238, col: 14, offset: 70243}, + pos: position{line: 2239, col: 14, offset: 70304}, val: "uniq", ignoreCase: true, want: "\"UNIQ\"i", }, ¬Expr{ - pos: position{line: 2238, col: 33, offset: 70262}, + pos: position{line: 2239, col: 33, offset: 70323}, expr: &ruleRefExpr{ - pos: position{line: 2238, col: 34, offset: 70263}, + pos: position{line: 2239, col: 34, offset: 70324}, name: "IdentifierRest", }, }, @@ -17115,20 +17149,20 @@ var g = &grammar{ }, { name: "USING", - pos: position{line: 2239, col: 1, offset: 70279}, + pos: position{line: 2240, col: 1, offset: 70340}, expr: &seqExpr{ - pos: position{line: 2239, col: 14, offset: 70292}, + pos: position{line: 2240, col: 14, offset: 70353}, exprs: []any{ &litMatcher{ - pos: position{line: 2239, col: 14, offset: 70292}, + pos: position{line: 2240, col: 14, offset: 70353}, val: "using", ignoreCase: true, want: "\"USING\"i", }, ¬Expr{ - pos: position{line: 2239, col: 33, offset: 70311}, + pos: position{line: 2240, col: 33, offset: 70372}, expr: &ruleRefExpr{ - pos: position{line: 2239, col: 34, offset: 70312}, + pos: position{line: 2240, col: 34, offset: 70373}, name: "IdentifierRest", }, }, @@ -17139,20 +17173,20 @@ var g = &grammar{ }, { name: "VALUE", - pos: position{line: 2240, col: 1, offset: 70327}, + pos: position{line: 2241, col: 1, offset: 70388}, expr: &seqExpr{ - pos: position{line: 2240, col: 14, offset: 70340}, + pos: position{line: 2241, col: 14, offset: 70401}, exprs: []any{ &litMatcher{ - pos: position{line: 2240, col: 14, offset: 70340}, + pos: position{line: 2241, col: 14, offset: 70401}, val: "value", ignoreCase: true, want: "\"VALUE\"i", }, ¬Expr{ - pos: position{line: 2240, col: 33, offset: 70359}, + pos: position{line: 2241, col: 33, offset: 70420}, expr: &ruleRefExpr{ - pos: position{line: 2240, col: 34, offset: 70360}, + pos: position{line: 2241, col: 34, offset: 70421}, name: "IdentifierRest", }, }, @@ -17163,20 +17197,20 @@ var g = &grammar{ }, { name: "WHEN", - pos: position{line: 2241, col: 1, offset: 70375}, + pos: position{line: 2242, col: 1, offset: 70436}, expr: &seqExpr{ - pos: position{line: 2241, col: 14, offset: 70388}, + pos: position{line: 2242, col: 14, offset: 70449}, exprs: []any{ &litMatcher{ - pos: position{line: 2241, col: 14, offset: 70388}, + pos: position{line: 2242, col: 14, offset: 70449}, val: "when", ignoreCase: true, want: "\"WHEN\"i", }, ¬Expr{ - pos: position{line: 2241, col: 33, offset: 70407}, + pos: position{line: 2242, col: 33, offset: 70468}, expr: &ruleRefExpr{ - pos: position{line: 2241, col: 34, offset: 70408}, + pos: position{line: 2242, col: 34, offset: 70469}, name: "IdentifierRest", }, }, @@ -17187,20 +17221,20 @@ var g = &grammar{ }, { name: "WHERE", - pos: position{line: 2242, col: 1, offset: 70423}, + pos: position{line: 2243, col: 1, offset: 70484}, expr: &seqExpr{ - pos: position{line: 2242, col: 14, offset: 70436}, + pos: position{line: 2243, col: 14, offset: 70497}, exprs: []any{ &litMatcher{ - pos: position{line: 2242, col: 14, offset: 70436}, + pos: position{line: 2243, col: 14, offset: 70497}, val: "where", ignoreCase: true, want: "\"WHERE\"i", }, ¬Expr{ - pos: position{line: 2242, col: 33, offset: 70455}, + pos: position{line: 2243, col: 33, offset: 70516}, expr: &ruleRefExpr{ - pos: position{line: 2242, col: 34, offset: 70456}, + pos: position{line: 2243, col: 34, offset: 70517}, name: "IdentifierRest", }, }, @@ -17211,20 +17245,20 @@ var g = &grammar{ }, { name: "WITH", - pos: position{line: 2243, col: 1, offset: 70471}, + pos: position{line: 2244, col: 1, offset: 70532}, expr: &seqExpr{ - pos: position{line: 2243, col: 14, offset: 70484}, + pos: position{line: 2244, col: 14, offset: 70545}, exprs: []any{ &litMatcher{ - pos: position{line: 2243, col: 14, offset: 70484}, + pos: position{line: 2244, col: 14, offset: 70545}, val: "with", ignoreCase: true, want: "\"WITH\"i", }, ¬Expr{ - pos: position{line: 2243, col: 33, offset: 70503}, + pos: position{line: 2244, col: 33, offset: 70564}, expr: &ruleRefExpr{ - pos: position{line: 2243, col: 34, offset: 70504}, + pos: position{line: 2244, col: 34, offset: 70565}, name: "IdentifierRest", }, }, @@ -17235,20 +17269,20 @@ var g = &grammar{ }, { name: "YIELD", - pos: position{line: 2244, col: 1, offset: 70519}, + pos: position{line: 2245, col: 1, offset: 70580}, expr: &seqExpr{ - pos: position{line: 2244, col: 14, offset: 70532}, + pos: position{line: 2245, col: 14, offset: 70593}, exprs: []any{ &litMatcher{ - pos: position{line: 2244, col: 14, offset: 70532}, + pos: position{line: 2245, col: 14, offset: 70593}, val: "yield", ignoreCase: true, want: "\"YIELD\"i", }, ¬Expr{ - pos: position{line: 2244, col: 33, offset: 70551}, + pos: position{line: 2245, col: 33, offset: 70612}, expr: &ruleRefExpr{ - pos: position{line: 2244, col: 34, offset: 70552}, + pos: position{line: 2245, col: 34, offset: 70613}, name: "IdentifierRest", }, }, diff --git a/compiler/parser/parser.peg b/compiler/parser/parser.peg index beb7326172..fb75c6f8d4 100644 --- a/compiler/parser/parser.peg +++ b/compiler/parser/parser.peg @@ -947,7 +947,7 @@ AdditiveExpr return makeBinaryExprChain(first, rest, c), nil } -AdditiveOperator = ("+" / "-") { return string(c.text), nil } +AdditiveOperator = ("+" / "-" / "||" / LIKE) { return string(c.text), nil } MultiplicativeExpr = first:NotExpr @@ -2195,6 +2195,7 @@ INNER = "INNER"i !IdentifierRest JOIN = "JOIN"i !IdentifierRest LAST = "LAST"i !IdentifierRest LEFT = "LEFT"i !IdentifierRest +LIKE = "LIKE"i !IdentifierRest LIMIT = "LIMIT"i !IdentifierRest LOAD = "LOAD"i !IdentifierRest MATERIALIZED = "MATERIALIZED"i !IdentifierRest diff --git a/compiler/semantic/expr.go b/compiler/semantic/expr.go index 3383670f71..7e8a789752 100644 --- a/compiler/semantic/expr.go +++ b/compiler/semantic/expr.go @@ -14,6 +14,7 @@ import ( "github.com/brimdata/super/runtime/sam/expr/agg" "github.com/brimdata/super/runtime/sam/expr/function" "github.com/brimdata/super/zson" + "github.com/shellyln/go-sql-like-expr/likeexpr" ) func (a *analyzer) semExpr(e ast.Expr) dag.Expr { @@ -334,7 +335,7 @@ func (a *analyzer) semBinary(e *ast.BinaryExpr) dag.Expr { if e := a.semRegexp(e); e != nil { return e } - op := e.Op + op := strings.ToLower(e.Op) if op == "." { lhs := a.semExpr(e.LHS) id, ok := e.RHS.(*ast.ID) @@ -354,9 +355,25 @@ func (a *analyzer) semBinary(e *ast.BinaryExpr) dag.Expr { } lhs := a.semExpr(e.LHS) rhs := a.semExpr(e.RHS) + if op == "like" { + s, ok := isStringConst(a.zctx, rhs) + if !ok { + a.error(e.RHS, errors.New("non-constant pattern for LIKE not supported")) + return badExpr() + } + pattern := likeexpr.ToRegexp(s, '\\', false) + return &dag.RegexpSearch{ + Kind: "RegexpSearch", + Pattern: pattern, + Expr: lhs, + } + } if op == "=" { op = "==" } + if op == "||" { + op = "+" + } return &dag.BinaryExpr{ Kind: "BinaryExpr", Op: op, diff --git a/compiler/ztests/sql/like.yaml b/compiler/ztests/sql/like.yaml new file mode 100644 index 0000000000..7ff8221b77 --- /dev/null +++ b/compiler/ztests/sql/like.yaml @@ -0,0 +1,18 @@ +script: | + super -z -c "select a from s.json where a||b like '%os%'" + echo === + super -z -c "from s.json | yield a LIKE 'f%'" + +inputs: + - name: s.json + data: | + {"a":"foo","b":"see"} + {"a":"bar","b":"go"} + +outputs: + - name: stdout + data: | + {a:"foo"} + === + true + false diff --git a/go.mod b/go.mod index ca8de7c0da..699ed1934e 100644 --- a/go.mod +++ b/go.mod @@ -27,6 +27,7 @@ require ( github.com/prometheus/client_model v0.3.0 github.com/rs/cors v1.8.0 github.com/segmentio/ksuid v1.0.2 + github.com/shellyln/go-sql-like-expr v0.0.1 github.com/stretchr/testify v1.9.0 github.com/x448/float16 v0.8.4 github.com/yuin/goldmark v1.4.13 diff --git a/go.sum b/go.sum index a1cc52e19f..a718856bf9 100644 --- a/go.sum +++ b/go.sum @@ -306,6 +306,8 @@ github.com/rs/cors v1.8.0/go.mod h1:EBwu+T5AvHOcXwvZIkQFjUN6s8Czyqw12GL/Y0tUyRM= github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4/go.mod h1:C1a7PQSMz9NShzorzCiG2fk9+xuCgLkPeCvMHYR2OWg= github.com/segmentio/ksuid v1.0.2 h1:9yBfKyw4ECGTdALaF09Snw3sLJmYIX6AbPJrAy6MrDc= github.com/segmentio/ksuid v1.0.2/go.mod h1:BXuJDr2byAiHuQaQtSKoXh1J0YmUDurywOXgB2w+OSU= +github.com/shellyln/go-sql-like-expr v0.0.1 h1:JSAB4bls8scANYO0+FXRln96GOeIziYy93FqgtmZaNQ= +github.com/shellyln/go-sql-like-expr v0.0.1/go.mod h1:vyIf1Z9UNYnw7x4+rX3u1lEnkMWs4uppxZT8pZ0M/5s= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=