From 3f56ba3e47d82352be3fee20124ad5e2c2d13210 Mon Sep 17 00:00:00 2001 From: Matthew Nibecker Date: Fri, 5 Apr 2024 14:39:20 -0700 Subject: [PATCH] ast: A TypeDecl Node This commit adds a separate AST decl type for type declarations as opposed to using const deleclartions for this case. This is part of a series of changes preparing the AST code base to support position information for AST nodes. --- compiler/ast/ast.go | 7 + compiler/ast/unpack.go | 1 + compiler/parser/parser.go | 6047 ++++++++++++++++++------------------ compiler/parser/parser.peg | 16 +- compiler/semantic/op.go | 21 + zfmt/ast.go | 3 + 6 files changed, 3066 insertions(+), 3029 deletions(-) diff --git a/compiler/ast/ast.go b/compiler/ast/ast.go index 5991eb7574..d9a9e4a45c 100644 --- a/compiler/ast/ast.go +++ b/compiler/ast/ast.go @@ -210,6 +210,12 @@ type ConstDecl struct { Expr Expr `json:"expr"` } +type TypeDecl struct { + Kind string `json:"kind" unpack:""` + Name string `json:"name"` + Type astzed.Type `json:"type"` +} + type FuncDecl struct { Kind string `json:"kind" unpack:""` Name string `json:"name"` @@ -227,6 +233,7 @@ type OpDecl struct { func (*ConstDecl) DeclAST() {} func (*FuncDecl) DeclAST() {} func (*OpDecl) DeclAST() {} +func (*TypeDecl) DeclAST() {} // ---------------------------------------------------------------------------- // Operators diff --git a/compiler/ast/unpack.go b/compiler/ast/unpack.go index 6778d7efa1..29ef85ed6b 100644 --- a/compiler/ast/unpack.go +++ b/compiler/ast/unpack.go @@ -74,6 +74,7 @@ var unpacker = unpack.New( Top{}, astzed.TypeArray{}, astzed.TypeDef{}, + TypeDecl{}, astzed.TypeEnum{}, astzed.TypeError{}, astzed.TypeMap{}, diff --git a/compiler/parser/parser.go b/compiler/parser/parser.go index 711d00895a..69bf7b525a 100644 --- a/compiler/parser/parser.go +++ b/compiler/parser/parser.go @@ -210,11 +210,15 @@ var g = &grammar{ pos: position{line: 23, col: 31, offset: 474}, name: "OpDecl", }, + &ruleRefExpr{ + pos: position{line: 23, col: 40, offset: 483}, + name: "TypeDecl", + }, }, }, }, &ruleRefExpr{ - pos: position{line: 23, col: 39, offset: 482}, + pos: position{line: 23, col: 50, offset: 493}, name: "_", }, }, @@ -223,114 +227,51 @@ var g = &grammar{ }, { name: "ConstDecl", - pos: position{line: 25, col: 1, offset: 503}, - expr: &choiceExpr{ - pos: position{line: 26, col: 5, offset: 517}, - alternatives: []any{ - &actionExpr{ - pos: position{line: 26, col: 5, offset: 517}, - run: (*parser).callonConstDecl2, - expr: &seqExpr{ - pos: position{line: 26, col: 5, offset: 517}, - exprs: []any{ - &litMatcher{ - pos: position{line: 26, col: 5, offset: 517}, - val: "const", - ignoreCase: false, - want: "\"const\"", - }, - &ruleRefExpr{ - pos: position{line: 26, col: 13, offset: 525}, - name: "_", - }, - &labeledExpr{ - pos: position{line: 26, col: 15, offset: 527}, - label: "id", - expr: &ruleRefExpr{ - pos: position{line: 26, col: 18, offset: 530}, - name: "IdentifierName", - }, - }, - &ruleRefExpr{ - pos: position{line: 26, col: 33, offset: 545}, - name: "__", - }, - &litMatcher{ - pos: position{line: 26, col: 36, offset: 548}, - val: "=", - ignoreCase: false, - want: "\"=\"", - }, - &ruleRefExpr{ - pos: position{line: 26, col: 40, offset: 552}, - name: "__", - }, - &labeledExpr{ - pos: position{line: 26, col: 43, offset: 555}, - label: "expr", - expr: &ruleRefExpr{ - pos: position{line: 26, col: 48, offset: 560}, - name: "Expr", - }, - }, + pos: position{line: 25, col: 1, offset: 514}, + expr: &actionExpr{ + pos: position{line: 26, col: 5, offset: 528}, + run: (*parser).callonConstDecl1, + expr: &seqExpr{ + pos: position{line: 26, col: 5, offset: 528}, + exprs: []any{ + &litMatcher{ + pos: position{line: 26, col: 5, offset: 528}, + val: "const", + ignoreCase: false, + want: "\"const\"", + }, + &ruleRefExpr{ + pos: position{line: 26, col: 13, offset: 536}, + name: "_", + }, + &labeledExpr{ + pos: position{line: 26, col: 15, offset: 538}, + label: "id", + expr: &ruleRefExpr{ + pos: position{line: 26, col: 18, offset: 541}, + name: "IdentifierName", }, }, - }, - &actionExpr{ - pos: position{line: 29, col: 5, offset: 665}, - run: (*parser).callonConstDecl13, - expr: &seqExpr{ - pos: position{line: 29, col: 5, offset: 665}, - exprs: []any{ - &litMatcher{ - pos: position{line: 29, col: 5, offset: 665}, - val: "type", - ignoreCase: false, - want: "\"type\"", - }, - &ruleRefExpr{ - pos: position{line: 29, col: 12, offset: 672}, - name: "_", - }, - &labeledExpr{ - pos: position{line: 29, col: 14, offset: 674}, - label: "id", - expr: &choiceExpr{ - pos: position{line: 29, col: 18, offset: 678}, - alternatives: []any{ - &ruleRefExpr{ - pos: position{line: 29, col: 18, offset: 678}, - name: "IdentifierName", - }, - &ruleRefExpr{ - pos: position{line: 29, col: 35, offset: 695}, - name: "QuotedString", - }, - }, - }, - }, - &ruleRefExpr{ - pos: position{line: 29, col: 49, offset: 709}, - name: "__", - }, - &litMatcher{ - pos: position{line: 29, col: 52, offset: 712}, - val: "=", - ignoreCase: false, - want: "\"=\"", - }, - &ruleRefExpr{ - pos: position{line: 29, col: 56, offset: 716}, - name: "__", - }, - &labeledExpr{ - pos: position{line: 29, col: 59, offset: 719}, - label: "typ", - expr: &ruleRefExpr{ - pos: position{line: 29, col: 63, offset: 723}, - name: "Type", - }, - }, + &ruleRefExpr{ + pos: position{line: 26, col: 33, offset: 556}, + name: "__", + }, + &litMatcher{ + pos: position{line: 26, col: 36, offset: 559}, + val: "=", + ignoreCase: false, + want: "\"=\"", + }, + &ruleRefExpr{ + pos: position{line: 26, col: 40, offset: 563}, + name: "__", + }, + &labeledExpr{ + pos: position{line: 26, col: 43, offset: 566}, + label: "expr", + expr: &ruleRefExpr{ + pos: position{line: 26, col: 48, offset: 571}, + name: "Expr", }, }, }, @@ -339,104 +280,104 @@ var g = &grammar{ }, { name: "FuncDecl", - pos: position{line: 40, col: 1, offset: 992}, + pos: position{line: 30, col: 1, offset: 673}, expr: &actionExpr{ - pos: position{line: 41, col: 5, offset: 1005}, + pos: position{line: 31, col: 5, offset: 686}, run: (*parser).callonFuncDecl1, expr: &seqExpr{ - pos: position{line: 41, col: 5, offset: 1005}, + pos: position{line: 31, col: 5, offset: 686}, exprs: []any{ &litMatcher{ - pos: position{line: 41, col: 5, offset: 1005}, + pos: position{line: 31, col: 5, offset: 686}, val: "func", ignoreCase: false, want: "\"func\"", }, &ruleRefExpr{ - pos: position{line: 41, col: 12, offset: 1012}, + pos: position{line: 31, col: 12, offset: 693}, name: "_", }, &labeledExpr{ - pos: position{line: 41, col: 14, offset: 1014}, + pos: position{line: 31, col: 14, offset: 695}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 41, col: 17, offset: 1017}, + pos: position{line: 31, col: 17, offset: 698}, name: "IdentifierName", }, }, &ruleRefExpr{ - pos: position{line: 41, col: 32, offset: 1032}, + pos: position{line: 31, col: 32, offset: 713}, name: "__", }, &litMatcher{ - pos: position{line: 41, col: 35, offset: 1035}, + pos: position{line: 31, col: 35, offset: 716}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 41, col: 39, offset: 1039}, + pos: position{line: 31, col: 39, offset: 720}, name: "__", }, &labeledExpr{ - pos: position{line: 41, col: 42, offset: 1042}, + pos: position{line: 31, col: 42, offset: 723}, label: "params", expr: &zeroOrOneExpr{ - pos: position{line: 41, col: 49, offset: 1049}, + pos: position{line: 31, col: 49, offset: 730}, expr: &ruleRefExpr{ - pos: position{line: 41, col: 49, offset: 1049}, + pos: position{line: 31, col: 49, offset: 730}, name: "IdentifierNames", }, }, }, &ruleRefExpr{ - pos: position{line: 41, col: 66, offset: 1066}, + pos: position{line: 31, col: 66, offset: 747}, name: "__", }, &litMatcher{ - pos: position{line: 41, col: 69, offset: 1069}, + pos: position{line: 31, col: 69, offset: 750}, val: ")", ignoreCase: false, want: "\")\"", }, &ruleRefExpr{ - pos: position{line: 41, col: 73, offset: 1073}, + pos: position{line: 31, col: 73, offset: 754}, name: "__", }, &litMatcher{ - pos: position{line: 41, col: 76, offset: 1076}, + pos: position{line: 31, col: 76, offset: 757}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 41, col: 80, offset: 1080}, + pos: position{line: 31, col: 80, offset: 761}, name: "__", }, &litMatcher{ - pos: position{line: 41, col: 83, offset: 1083}, + pos: position{line: 31, col: 83, offset: 764}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 41, col: 87, offset: 1087}, + pos: position{line: 31, col: 87, offset: 768}, name: "__", }, &labeledExpr{ - pos: position{line: 41, col: 90, offset: 1090}, + pos: position{line: 31, col: 90, offset: 771}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 41, col: 95, offset: 1095}, + pos: position{line: 31, col: 95, offset: 776}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 41, col: 100, offset: 1100}, + pos: position{line: 31, col: 100, offset: 781}, name: "__", }, &litMatcher{ - pos: position{line: 41, col: 103, offset: 1103}, + pos: position{line: 31, col: 103, offset: 784}, val: ")", ignoreCase: false, want: "\")\"", @@ -447,104 +388,104 @@ var g = &grammar{ }, { name: "OpDecl", - pos: position{line: 54, col: 1, offset: 1287}, + pos: position{line: 44, col: 1, offset: 968}, expr: &actionExpr{ - pos: position{line: 55, col: 5, offset: 1298}, + pos: position{line: 45, col: 5, offset: 979}, run: (*parser).callonOpDecl1, expr: &seqExpr{ - pos: position{line: 55, col: 5, offset: 1298}, + pos: position{line: 45, col: 5, offset: 979}, exprs: []any{ &litMatcher{ - pos: position{line: 55, col: 5, offset: 1298}, + pos: position{line: 45, col: 5, offset: 979}, val: "op", ignoreCase: false, want: "\"op\"", }, &ruleRefExpr{ - pos: position{line: 55, col: 10, offset: 1303}, + pos: position{line: 45, col: 10, offset: 984}, name: "_", }, &labeledExpr{ - pos: position{line: 55, col: 12, offset: 1305}, + pos: position{line: 45, col: 12, offset: 986}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 55, col: 17, offset: 1310}, + pos: position{line: 45, col: 17, offset: 991}, name: "IdentifierName", }, }, &ruleRefExpr{ - pos: position{line: 55, col: 32, offset: 1325}, + pos: position{line: 45, col: 32, offset: 1006}, name: "__", }, &litMatcher{ - pos: position{line: 55, col: 35, offset: 1328}, + pos: position{line: 45, col: 35, offset: 1009}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 55, col: 39, offset: 1332}, + pos: position{line: 45, col: 39, offset: 1013}, name: "__", }, &labeledExpr{ - pos: position{line: 55, col: 42, offset: 1335}, + pos: position{line: 45, col: 42, offset: 1016}, label: "params", expr: &zeroOrOneExpr{ - pos: position{line: 55, col: 49, offset: 1342}, + pos: position{line: 45, col: 49, offset: 1023}, expr: &ruleRefExpr{ - pos: position{line: 55, col: 49, offset: 1342}, + pos: position{line: 45, col: 49, offset: 1023}, name: "IdentifierNames", }, }, }, &ruleRefExpr{ - pos: position{line: 55, col: 66, offset: 1359}, + pos: position{line: 45, col: 66, offset: 1040}, name: "__", }, &litMatcher{ - pos: position{line: 55, col: 69, offset: 1362}, + pos: position{line: 45, col: 69, offset: 1043}, val: ")", ignoreCase: false, want: "\")\"", }, &ruleRefExpr{ - pos: position{line: 55, col: 73, offset: 1366}, + pos: position{line: 45, col: 73, offset: 1047}, name: "__", }, &litMatcher{ - pos: position{line: 55, col: 76, offset: 1369}, + pos: position{line: 45, col: 76, offset: 1050}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 55, col: 80, offset: 1373}, + pos: position{line: 45, col: 80, offset: 1054}, name: "__", }, &litMatcher{ - pos: position{line: 55, col: 83, offset: 1376}, + pos: position{line: 45, col: 83, offset: 1057}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 55, col: 87, offset: 1380}, + pos: position{line: 45, col: 87, offset: 1061}, name: "__", }, &labeledExpr{ - pos: position{line: 55, col: 90, offset: 1383}, + pos: position{line: 45, col: 90, offset: 1064}, label: "body", expr: &ruleRefExpr{ - pos: position{line: 55, col: 95, offset: 1388}, + pos: position{line: 45, col: 95, offset: 1069}, name: "OpDeclBody", }, }, &ruleRefExpr{ - pos: position{line: 55, col: 106, offset: 1399}, + pos: position{line: 45, col: 106, offset: 1080}, name: "__", }, &litMatcher{ - pos: position{line: 55, col: 109, offset: 1402}, + pos: position{line: 45, col: 109, offset: 1083}, val: ")", ignoreCase: false, want: "\")\"", @@ -555,30 +496,30 @@ var g = &grammar{ }, { name: "OpDeclBody", - pos: position{line: 68, col: 1, offset: 1586}, + pos: position{line: 58, col: 1, offset: 1267}, expr: &choiceExpr{ - pos: position{line: 69, col: 5, offset: 1601}, + pos: position{line: 59, col: 5, offset: 1282}, alternatives: []any{ &actionExpr{ - pos: position{line: 69, col: 5, offset: 1601}, + pos: position{line: 59, col: 5, offset: 1282}, run: (*parser).callonOpDeclBody2, expr: &labeledExpr{ - pos: position{line: 69, col: 5, offset: 1601}, + pos: position{line: 59, col: 5, offset: 1282}, label: "scope", expr: &ruleRefExpr{ - pos: position{line: 69, col: 11, offset: 1607}, + pos: position{line: 59, col: 11, offset: 1288}, name: "Scope", }, }, }, &actionExpr{ - pos: position{line: 70, col: 5, offset: 1654}, + pos: position{line: 60, col: 5, offset: 1335}, run: (*parser).callonOpDeclBody5, expr: &labeledExpr{ - pos: position{line: 70, col: 5, offset: 1654}, + pos: position{line: 60, col: 5, offset: 1335}, label: "seq", expr: &ruleRefExpr{ - pos: position{line: 70, col: 9, offset: 1658}, + pos: position{line: 60, col: 9, offset: 1339}, name: "Seq", }, }, @@ -586,51 +527,113 @@ var g = &grammar{ }, }, }, + { + name: "TypeDecl", + pos: position{line: 62, col: 1, offset: 1364}, + expr: &actionExpr{ + pos: position{line: 63, col: 5, offset: 1377}, + run: (*parser).callonTypeDecl1, + expr: &seqExpr{ + pos: position{line: 63, col: 5, offset: 1377}, + exprs: []any{ + &litMatcher{ + pos: position{line: 63, col: 5, offset: 1377}, + val: "type", + ignoreCase: false, + want: "\"type\"", + }, + &ruleRefExpr{ + pos: position{line: 63, col: 12, offset: 1384}, + name: "_", + }, + &labeledExpr{ + pos: position{line: 63, col: 14, offset: 1386}, + label: "id", + expr: &choiceExpr{ + pos: position{line: 63, col: 18, offset: 1390}, + alternatives: []any{ + &ruleRefExpr{ + pos: position{line: 63, col: 18, offset: 1390}, + name: "IdentifierName", + }, + &ruleRefExpr{ + pos: position{line: 63, col: 35, offset: 1407}, + name: "QuotedString", + }, + }, + }, + }, + &ruleRefExpr{ + pos: position{line: 63, col: 49, offset: 1421}, + name: "__", + }, + &litMatcher{ + pos: position{line: 63, col: 52, offset: 1424}, + val: "=", + ignoreCase: false, + want: "\"=\"", + }, + &ruleRefExpr{ + pos: position{line: 63, col: 56, offset: 1428}, + name: "__", + }, + &labeledExpr{ + pos: position{line: 63, col: 59, offset: 1431}, + label: "typ", + expr: &ruleRefExpr{ + pos: position{line: 63, col: 63, offset: 1435}, + name: "Type", + }, + }, + }, + }, + }, + }, { name: "Operation", - pos: position{line: 72, col: 1, offset: 1683}, + pos: position{line: 74, col: 1, offset: 1586}, expr: &choiceExpr{ - pos: position{line: 73, col: 5, offset: 1697}, + pos: position{line: 75, col: 5, offset: 1600}, alternatives: []any{ &actionExpr{ - pos: position{line: 73, col: 5, offset: 1697}, + pos: position{line: 75, col: 5, offset: 1600}, run: (*parser).callonOperation2, expr: &seqExpr{ - pos: position{line: 73, col: 5, offset: 1697}, + pos: position{line: 75, col: 5, offset: 1600}, exprs: []any{ &litMatcher{ - pos: position{line: 73, col: 5, offset: 1697}, + pos: position{line: 75, col: 5, offset: 1600}, val: "fork", ignoreCase: false, want: "\"fork\"", }, &ruleRefExpr{ - pos: position{line: 73, col: 12, offset: 1704}, + pos: position{line: 75, col: 12, offset: 1607}, name: "__", }, &litMatcher{ - pos: position{line: 73, col: 15, offset: 1707}, + pos: position{line: 75, col: 15, offset: 1610}, val: "(", ignoreCase: false, want: "\"(\"", }, &labeledExpr{ - pos: position{line: 73, col: 19, offset: 1711}, + pos: position{line: 75, col: 19, offset: 1614}, label: "paths", expr: &oneOrMoreExpr{ - pos: position{line: 73, col: 25, offset: 1717}, + pos: position{line: 75, col: 25, offset: 1620}, expr: &ruleRefExpr{ - pos: position{line: 73, col: 25, offset: 1717}, + pos: position{line: 75, col: 25, offset: 1620}, name: "Leg", }, }, }, &ruleRefExpr{ - pos: position{line: 73, col: 30, offset: 1722}, + pos: position{line: 75, col: 30, offset: 1625}, name: "__", }, &litMatcher{ - pos: position{line: 73, col: 33, offset: 1725}, + pos: position{line: 75, col: 33, offset: 1628}, val: ")", ignoreCase: false, want: "\")\"", @@ -639,56 +642,56 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 76, col: 5, offset: 1818}, + pos: position{line: 78, col: 5, offset: 1721}, run: (*parser).callonOperation12, expr: &seqExpr{ - pos: position{line: 76, col: 5, offset: 1818}, + pos: position{line: 78, col: 5, offset: 1721}, exprs: []any{ &litMatcher{ - pos: position{line: 76, col: 5, offset: 1818}, + pos: position{line: 78, col: 5, offset: 1721}, val: "switch", ignoreCase: false, want: "\"switch\"", }, &ruleRefExpr{ - pos: position{line: 76, col: 14, offset: 1827}, + pos: position{line: 78, col: 14, offset: 1730}, name: "_", }, &labeledExpr{ - pos: position{line: 76, col: 16, offset: 1829}, + pos: position{line: 78, col: 16, offset: 1732}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 76, col: 21, offset: 1834}, + pos: position{line: 78, col: 21, offset: 1737}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 76, col: 26, offset: 1839}, + pos: position{line: 78, col: 26, offset: 1742}, name: "_", }, &litMatcher{ - pos: position{line: 76, col: 28, offset: 1841}, + pos: position{line: 78, col: 28, offset: 1744}, val: "(", ignoreCase: false, want: "\"(\"", }, &labeledExpr{ - pos: position{line: 76, col: 32, offset: 1845}, + pos: position{line: 78, col: 32, offset: 1748}, label: "cases", expr: &oneOrMoreExpr{ - pos: position{line: 76, col: 38, offset: 1851}, + pos: position{line: 78, col: 38, offset: 1754}, expr: &ruleRefExpr{ - pos: position{line: 76, col: 38, offset: 1851}, + pos: position{line: 78, col: 38, offset: 1754}, name: "SwitchLeg", }, }, }, &ruleRefExpr{ - pos: position{line: 76, col: 49, offset: 1862}, + pos: position{line: 78, col: 49, offset: 1765}, name: "__", }, &litMatcher{ - pos: position{line: 76, col: 52, offset: 1865}, + pos: position{line: 78, col: 52, offset: 1768}, val: ")", ignoreCase: false, want: "\")\"", @@ -697,44 +700,44 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 79, col: 5, offset: 1970}, + pos: position{line: 81, col: 5, offset: 1873}, run: (*parser).callonOperation25, expr: &seqExpr{ - pos: position{line: 79, col: 5, offset: 1970}, + pos: position{line: 81, col: 5, offset: 1873}, exprs: []any{ &litMatcher{ - pos: position{line: 79, col: 5, offset: 1970}, + pos: position{line: 81, col: 5, offset: 1873}, val: "switch", ignoreCase: false, want: "\"switch\"", }, &ruleRefExpr{ - pos: position{line: 79, col: 14, offset: 1979}, + pos: position{line: 81, col: 14, offset: 1882}, name: "__", }, &litMatcher{ - pos: position{line: 79, col: 17, offset: 1982}, + pos: position{line: 81, col: 17, offset: 1885}, val: "(", ignoreCase: false, want: "\"(\"", }, &labeledExpr{ - pos: position{line: 79, col: 21, offset: 1986}, + pos: position{line: 81, col: 21, offset: 1889}, label: "cases", expr: &oneOrMoreExpr{ - pos: position{line: 79, col: 27, offset: 1992}, + pos: position{line: 81, col: 27, offset: 1895}, expr: &ruleRefExpr{ - pos: position{line: 79, col: 27, offset: 1992}, + pos: position{line: 81, col: 27, offset: 1895}, name: "SwitchLeg", }, }, }, &ruleRefExpr{ - pos: position{line: 79, col: 38, offset: 2003}, + pos: position{line: 81, col: 38, offset: 1906}, name: "__", }, &litMatcher{ - pos: position{line: 79, col: 41, offset: 2006}, + pos: position{line: 81, col: 41, offset: 1909}, val: ")", ignoreCase: false, want: "\")\"", @@ -743,44 +746,44 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 82, col: 5, offset: 2110}, + pos: position{line: 84, col: 5, offset: 2013}, run: (*parser).callonOperation35, expr: &seqExpr{ - pos: position{line: 82, col: 5, offset: 2110}, + pos: position{line: 84, col: 5, offset: 2013}, exprs: []any{ &litMatcher{ - pos: position{line: 82, col: 5, offset: 2110}, + pos: position{line: 84, col: 5, offset: 2013}, val: "from", ignoreCase: false, want: "\"from\"", }, &ruleRefExpr{ - pos: position{line: 82, col: 12, offset: 2117}, + pos: position{line: 84, col: 12, offset: 2020}, name: "__", }, &litMatcher{ - pos: position{line: 82, col: 15, offset: 2120}, + pos: position{line: 84, col: 15, offset: 2023}, val: "(", ignoreCase: false, want: "\"(\"", }, &labeledExpr{ - pos: position{line: 82, col: 19, offset: 2124}, + pos: position{line: 84, col: 19, offset: 2027}, label: "trunks", expr: &oneOrMoreExpr{ - pos: position{line: 82, col: 26, offset: 2131}, + pos: position{line: 84, col: 26, offset: 2034}, expr: &ruleRefExpr{ - pos: position{line: 82, col: 26, offset: 2131}, + pos: position{line: 84, col: 26, offset: 2034}, name: "FromLeg", }, }, }, &ruleRefExpr{ - pos: position{line: 82, col: 35, offset: 2140}, + pos: position{line: 84, col: 35, offset: 2043}, name: "__", }, &litMatcher{ - pos: position{line: 82, col: 38, offset: 2143}, + pos: position{line: 84, col: 38, offset: 2046}, val: ")", ignoreCase: false, want: "\")\"", @@ -789,35 +792,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 85, col: 5, offset: 2234}, + pos: position{line: 87, col: 5, offset: 2137}, run: (*parser).callonOperation45, expr: &seqExpr{ - pos: position{line: 85, col: 5, offset: 2234}, + pos: position{line: 87, col: 5, offset: 2137}, exprs: []any{ &litMatcher{ - pos: position{line: 85, col: 5, offset: 2234}, + pos: position{line: 87, col: 5, offset: 2137}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 85, col: 9, offset: 2238}, + pos: position{line: 87, col: 9, offset: 2141}, name: "__", }, &labeledExpr{ - pos: position{line: 85, col: 12, offset: 2241}, + pos: position{line: 87, col: 12, offset: 2144}, label: "scope", expr: &ruleRefExpr{ - pos: position{line: 85, col: 18, offset: 2247}, + pos: position{line: 87, col: 18, offset: 2150}, name: "Scope", }, }, &ruleRefExpr{ - pos: position{line: 85, col: 24, offset: 2253}, + pos: position{line: 87, col: 24, offset: 2156}, name: "__", }, &litMatcher{ - pos: position{line: 85, col: 27, offset: 2256}, + pos: position{line: 87, col: 27, offset: 2159}, val: ")", ignoreCase: false, want: "\")\"", @@ -826,31 +829,31 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 86, col: 5, offset: 2286}, + pos: position{line: 88, col: 5, offset: 2189}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 86, col: 8, offset: 2289}, + pos: position{line: 88, col: 8, offset: 2192}, name: "Operator", }, }, &actionExpr{ - pos: position{line: 87, col: 5, offset: 2302}, + pos: position{line: 89, col: 5, offset: 2205}, run: (*parser).callonOperation55, expr: &seqExpr{ - pos: position{line: 87, col: 5, offset: 2302}, + pos: position{line: 89, col: 5, offset: 2205}, exprs: []any{ &labeledExpr{ - pos: position{line: 87, col: 5, offset: 2302}, + pos: position{line: 89, col: 5, offset: 2205}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 87, col: 7, offset: 2304}, + pos: position{line: 89, col: 7, offset: 2207}, name: "OpAssignment", }, }, &andExpr{ - pos: position{line: 87, col: 20, offset: 2317}, + pos: position{line: 89, col: 20, offset: 2220}, expr: &ruleRefExpr{ - pos: position{line: 87, col: 21, offset: 2318}, + pos: position{line: 89, col: 21, offset: 2221}, name: "EndOfOp", }, }, @@ -858,39 +861,39 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 88, col: 5, offset: 2348}, + pos: position{line: 90, col: 5, offset: 2251}, run: (*parser).callonOperation61, expr: &seqExpr{ - pos: position{line: 88, col: 5, offset: 2348}, + pos: position{line: 90, col: 5, offset: 2251}, exprs: []any{ ¬Expr{ - pos: position{line: 88, col: 5, offset: 2348}, + pos: position{line: 90, col: 5, offset: 2251}, expr: &seqExpr{ - pos: position{line: 88, col: 7, offset: 2350}, + pos: position{line: 90, col: 7, offset: 2253}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 88, col: 7, offset: 2350}, + pos: position{line: 90, col: 7, offset: 2253}, name: "Function", }, &ruleRefExpr{ - pos: position{line: 88, col: 16, offset: 2359}, + pos: position{line: 90, col: 16, offset: 2262}, name: "EndOfOp", }, }, }, }, &labeledExpr{ - pos: position{line: 88, col: 25, offset: 2368}, + pos: position{line: 90, col: 25, offset: 2271}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 88, col: 27, offset: 2370}, + pos: position{line: 90, col: 27, offset: 2273}, name: "Aggregation", }, }, &andExpr{ - pos: position{line: 88, col: 39, offset: 2382}, + pos: position{line: 90, col: 39, offset: 2285}, expr: &ruleRefExpr{ - pos: position{line: 88, col: 40, offset: 2383}, + pos: position{line: 90, col: 40, offset: 2286}, name: "EndOfOp", }, }, @@ -898,26 +901,26 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 89, col: 5, offset: 2413}, + pos: position{line: 91, col: 5, offset: 2316}, run: (*parser).callonOperation71, expr: &seqExpr{ - pos: position{line: 89, col: 5, offset: 2413}, + pos: position{line: 91, col: 5, offset: 2316}, exprs: []any{ &litMatcher{ - pos: position{line: 89, col: 5, offset: 2413}, + pos: position{line: 91, col: 5, offset: 2316}, val: "search", ignoreCase: false, want: "\"search\"", }, &ruleRefExpr{ - pos: position{line: 89, col: 14, offset: 2422}, + pos: position{line: 91, col: 14, offset: 2325}, name: "_", }, &labeledExpr{ - pos: position{line: 89, col: 16, offset: 2424}, + pos: position{line: 91, col: 16, offset: 2327}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 89, col: 21, offset: 2429}, + pos: position{line: 91, col: 21, offset: 2332}, name: "SearchBoolean", }, }, @@ -925,37 +928,37 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 92, col: 5, offset: 2528}, + pos: position{line: 94, col: 5, offset: 2431}, run: (*parser).callonOperation77, expr: &labeledExpr{ - pos: position{line: 92, col: 5, offset: 2528}, + pos: position{line: 94, col: 5, offset: 2431}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 92, col: 10, offset: 2533}, + pos: position{line: 94, col: 10, offset: 2436}, name: "SearchBoolean", }, }, }, &actionExpr{ - pos: position{line: 95, col: 5, offset: 2632}, + pos: position{line: 97, col: 5, offset: 2535}, run: (*parser).callonOperation80, expr: &labeledExpr{ - pos: position{line: 95, col: 5, offset: 2632}, + pos: position{line: 97, col: 5, offset: 2535}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 95, col: 10, offset: 2637}, + pos: position{line: 97, col: 10, offset: 2540}, name: "Cast", }, }, }, &actionExpr{ - pos: position{line: 98, col: 5, offset: 2725}, + pos: position{line: 100, col: 5, offset: 2628}, run: (*parser).callonOperation83, expr: &labeledExpr{ - pos: position{line: 98, col: 5, offset: 2725}, + pos: position{line: 100, col: 5, offset: 2628}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 98, col: 10, offset: 2730}, + pos: position{line: 100, col: 10, offset: 2633}, name: "Expr", }, }, @@ -965,39 +968,39 @@ var g = &grammar{ }, { name: "EndOfOp", - pos: position{line: 102, col: 1, offset: 2817}, + pos: position{line: 104, col: 1, offset: 2720}, expr: &seqExpr{ - pos: position{line: 102, col: 11, offset: 2827}, + pos: position{line: 104, col: 11, offset: 2730}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 102, col: 11, offset: 2827}, + pos: position{line: 104, col: 11, offset: 2730}, name: "__", }, &choiceExpr{ - pos: position{line: 102, col: 15, offset: 2831}, + pos: position{line: 104, col: 15, offset: 2734}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 102, col: 15, offset: 2831}, + pos: position{line: 104, col: 15, offset: 2734}, name: "Pipe", }, &ruleRefExpr{ - pos: position{line: 102, col: 22, offset: 2838}, + pos: position{line: 104, col: 22, offset: 2741}, name: "SearchKeywordGuard", }, &litMatcher{ - pos: position{line: 102, col: 43, offset: 2859}, + pos: position{line: 104, col: 43, offset: 2762}, val: "=>", ignoreCase: false, want: "\"=>\"", }, &litMatcher{ - pos: position{line: 102, col: 50, offset: 2866}, + pos: position{line: 104, col: 50, offset: 2769}, val: ")", ignoreCase: false, want: "\")\"", }, &ruleRefExpr{ - pos: position{line: 102, col: 56, offset: 2872}, + pos: position{line: 104, col: 56, offset: 2775}, name: "EOF", }, }, @@ -1007,29 +1010,29 @@ var g = &grammar{ }, { name: "Pipe", - pos: position{line: 103, col: 1, offset: 2877}, + pos: position{line: 105, col: 1, offset: 2780}, expr: &seqExpr{ - pos: position{line: 103, col: 8, offset: 2884}, + pos: position{line: 105, col: 8, offset: 2787}, exprs: []any{ &litMatcher{ - pos: position{line: 103, col: 8, offset: 2884}, + pos: position{line: 105, col: 8, offset: 2787}, val: "|", ignoreCase: false, want: "\"|\"", }, ¬Expr{ - pos: position{line: 103, col: 12, offset: 2888}, + pos: position{line: 105, col: 12, offset: 2791}, expr: &choiceExpr{ - pos: position{line: 103, col: 14, offset: 2890}, + pos: position{line: 105, col: 14, offset: 2793}, alternatives: []any{ &litMatcher{ - pos: position{line: 103, col: 14, offset: 2890}, + pos: position{line: 105, col: 14, offset: 2793}, val: "{", ignoreCase: false, want: "\"{\"", }, &litMatcher{ - pos: position{line: 103, col: 20, offset: 2896}, + pos: position{line: 105, col: 20, offset: 2799}, val: "[", ignoreCase: false, want: "\"[\"", @@ -1042,32 +1045,32 @@ var g = &grammar{ }, { name: "Leg", - pos: position{line: 105, col: 1, offset: 2902}, + pos: position{line: 107, col: 1, offset: 2805}, expr: &actionExpr{ - pos: position{line: 105, col: 7, offset: 2908}, + pos: position{line: 107, col: 7, offset: 2811}, run: (*parser).callonLeg1, expr: &seqExpr{ - pos: position{line: 105, col: 7, offset: 2908}, + pos: position{line: 107, col: 7, offset: 2811}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 105, col: 7, offset: 2908}, + pos: position{line: 107, col: 7, offset: 2811}, name: "__", }, &litMatcher{ - pos: position{line: 105, col: 10, offset: 2911}, + pos: position{line: 107, col: 10, offset: 2814}, val: "=>", ignoreCase: false, want: "\"=>\"", }, &ruleRefExpr{ - pos: position{line: 105, col: 15, offset: 2916}, + pos: position{line: 107, col: 15, offset: 2819}, name: "__", }, &labeledExpr{ - pos: position{line: 105, col: 18, offset: 2919}, + pos: position{line: 107, col: 18, offset: 2822}, label: "seq", expr: &ruleRefExpr{ - pos: position{line: 105, col: 22, offset: 2923}, + pos: position{line: 107, col: 22, offset: 2826}, name: "Seq", }, }, @@ -1077,30 +1080,30 @@ var g = &grammar{ }, { name: "SwitchLeg", - pos: position{line: 107, col: 1, offset: 2948}, + pos: position{line: 109, col: 1, offset: 2851}, expr: &actionExpr{ - pos: position{line: 108, col: 5, offset: 2962}, + pos: position{line: 110, col: 5, offset: 2865}, run: (*parser).callonSwitchLeg1, expr: &seqExpr{ - pos: position{line: 108, col: 5, offset: 2962}, + pos: position{line: 110, col: 5, offset: 2865}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 108, col: 5, offset: 2962}, + pos: position{line: 110, col: 5, offset: 2865}, name: "__", }, &labeledExpr{ - pos: position{line: 108, col: 8, offset: 2965}, + pos: position{line: 110, col: 8, offset: 2868}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 108, col: 13, offset: 2970}, + pos: position{line: 110, col: 13, offset: 2873}, name: "Case", }, }, &labeledExpr{ - pos: position{line: 108, col: 18, offset: 2975}, + pos: position{line: 110, col: 18, offset: 2878}, label: "path", expr: &ruleRefExpr{ - pos: position{line: 108, col: 23, offset: 2980}, + pos: position{line: 110, col: 23, offset: 2883}, name: "Leg", }, }, @@ -1110,31 +1113,31 @@ var g = &grammar{ }, { name: "Case", - pos: position{line: 112, col: 1, offset: 3062}, + pos: position{line: 114, col: 1, offset: 2965}, expr: &choiceExpr{ - pos: position{line: 113, col: 5, offset: 3071}, + pos: position{line: 115, col: 5, offset: 2974}, alternatives: []any{ &actionExpr{ - pos: position{line: 113, col: 5, offset: 3071}, + pos: position{line: 115, col: 5, offset: 2974}, run: (*parser).callonCase2, expr: &seqExpr{ - pos: position{line: 113, col: 5, offset: 3071}, + pos: position{line: 115, col: 5, offset: 2974}, exprs: []any{ &litMatcher{ - pos: position{line: 113, col: 5, offset: 3071}, + pos: position{line: 115, col: 5, offset: 2974}, val: "case", ignoreCase: false, want: "\"case\"", }, &ruleRefExpr{ - pos: position{line: 113, col: 12, offset: 3078}, + pos: position{line: 115, col: 12, offset: 2981}, name: "_", }, &labeledExpr{ - pos: position{line: 113, col: 14, offset: 3080}, + pos: position{line: 115, col: 14, offset: 2983}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 113, col: 19, offset: 3085}, + pos: position{line: 115, col: 19, offset: 2988}, name: "Expr", }, }, @@ -1142,10 +1145,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 114, col: 5, offset: 3115}, + pos: position{line: 116, col: 5, offset: 3018}, run: (*parser).callonCase8, expr: &litMatcher{ - pos: position{line: 114, col: 5, offset: 3115}, + pos: position{line: 116, col: 5, offset: 3018}, val: "default", ignoreCase: false, want: "\"default\"", @@ -1156,49 +1159,49 @@ var g = &grammar{ }, { name: "FromLeg", - pos: position{line: 116, col: 1, offset: 3146}, + pos: position{line: 118, col: 1, offset: 3049}, expr: &actionExpr{ - pos: position{line: 117, col: 5, offset: 3158}, + pos: position{line: 119, col: 5, offset: 3061}, run: (*parser).callonFromLeg1, expr: &seqExpr{ - pos: position{line: 117, col: 5, offset: 3158}, + pos: position{line: 119, col: 5, offset: 3061}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 117, col: 5, offset: 3158}, + pos: position{line: 119, col: 5, offset: 3061}, name: "__", }, &labeledExpr{ - pos: position{line: 117, col: 8, offset: 3161}, + pos: position{line: 119, col: 8, offset: 3064}, label: "source", expr: &ruleRefExpr{ - pos: position{line: 117, col: 15, offset: 3168}, + pos: position{line: 119, col: 15, offset: 3071}, name: "FromSource", }, }, &labeledExpr{ - pos: position{line: 117, col: 26, offset: 3179}, + pos: position{line: 119, col: 26, offset: 3082}, label: "opt", expr: &zeroOrOneExpr{ - pos: position{line: 117, col: 30, offset: 3183}, + pos: position{line: 119, col: 30, offset: 3086}, expr: &seqExpr{ - pos: position{line: 117, col: 31, offset: 3184}, + pos: position{line: 119, col: 31, offset: 3087}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 117, col: 31, offset: 3184}, + pos: position{line: 119, col: 31, offset: 3087}, name: "__", }, &litMatcher{ - pos: position{line: 117, col: 34, offset: 3187}, + pos: position{line: 119, col: 34, offset: 3090}, val: "=>", ignoreCase: false, want: "\"=>\"", }, &ruleRefExpr{ - pos: position{line: 117, col: 39, offset: 3192}, + pos: position{line: 119, col: 39, offset: 3095}, name: "__", }, &ruleRefExpr{ - pos: position{line: 117, col: 42, offset: 3195}, + pos: position{line: 119, col: 42, offset: 3098}, name: "Seq", }, }, @@ -1211,24 +1214,24 @@ var g = &grammar{ }, { name: "FromSource", - pos: position{line: 125, col: 1, offset: 3386}, + pos: position{line: 127, col: 1, offset: 3289}, expr: &choiceExpr{ - pos: position{line: 126, col: 5, offset: 3401}, + pos: position{line: 128, col: 5, offset: 3304}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 126, col: 5, offset: 3401}, + pos: position{line: 128, col: 5, offset: 3304}, name: "File", }, &ruleRefExpr{ - pos: position{line: 127, col: 5, offset: 3410}, + pos: position{line: 129, col: 5, offset: 3313}, name: "Get", }, &ruleRefExpr{ - pos: position{line: 128, col: 5, offset: 3418}, + pos: position{line: 130, col: 5, offset: 3321}, name: "Pool", }, &ruleRefExpr{ - pos: position{line: 129, col: 5, offset: 3427}, + pos: position{line: 131, col: 5, offset: 3330}, name: "PassOp", }, }, @@ -1236,63 +1239,63 @@ var g = &grammar{ }, { name: "ExprGuard", - pos: position{line: 131, col: 1, offset: 3435}, + pos: position{line: 133, col: 1, offset: 3338}, expr: &seqExpr{ - pos: position{line: 131, col: 13, offset: 3447}, + pos: position{line: 133, col: 13, offset: 3350}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 131, col: 13, offset: 3447}, + pos: position{line: 133, col: 13, offset: 3350}, name: "__", }, &choiceExpr{ - pos: position{line: 131, col: 17, offset: 3451}, + pos: position{line: 133, col: 17, offset: 3354}, alternatives: []any{ &seqExpr{ - pos: position{line: 131, col: 18, offset: 3452}, + pos: position{line: 133, col: 18, offset: 3355}, exprs: []any{ ¬Expr{ - pos: position{line: 131, col: 18, offset: 3452}, + pos: position{line: 133, col: 18, offset: 3355}, expr: &litMatcher{ - pos: position{line: 131, col: 19, offset: 3453}, + pos: position{line: 133, col: 19, offset: 3356}, val: "=>", ignoreCase: false, want: "\"=>\"", }, }, &ruleRefExpr{ - pos: position{line: 131, col: 24, offset: 3458}, + pos: position{line: 133, col: 24, offset: 3361}, name: "Comparator", }, }, }, &ruleRefExpr{ - pos: position{line: 131, col: 38, offset: 3472}, + pos: position{line: 133, col: 38, offset: 3375}, name: "AdditiveOperator", }, &ruleRefExpr{ - pos: position{line: 131, col: 57, offset: 3491}, + pos: position{line: 133, col: 57, offset: 3394}, name: "MultiplicativeOperator", }, &litMatcher{ - pos: position{line: 131, col: 82, offset: 3516}, + pos: position{line: 133, col: 82, offset: 3419}, val: ":", ignoreCase: false, want: "\":\"", }, &litMatcher{ - pos: position{line: 131, col: 88, offset: 3522}, + pos: position{line: 133, col: 88, offset: 3425}, val: "(", ignoreCase: false, want: "\"(\"", }, &litMatcher{ - pos: position{line: 131, col: 94, offset: 3528}, + pos: position{line: 133, col: 94, offset: 3431}, val: "[", ignoreCase: false, want: "\"[\"", }, &litMatcher{ - pos: position{line: 131, col: 100, offset: 3534}, + pos: position{line: 133, col: 100, offset: 3437}, val: "~", ignoreCase: false, want: "\"~\"", @@ -1304,63 +1307,63 @@ var g = &grammar{ }, { name: "Comparator", - pos: position{line: 133, col: 1, offset: 3540}, + pos: position{line: 135, col: 1, offset: 3443}, expr: &actionExpr{ - pos: position{line: 133, col: 14, offset: 3553}, + pos: position{line: 135, col: 14, offset: 3456}, run: (*parser).callonComparator1, expr: &choiceExpr{ - pos: position{line: 133, col: 15, offset: 3554}, + pos: position{line: 135, col: 15, offset: 3457}, alternatives: []any{ &litMatcher{ - pos: position{line: 133, col: 15, offset: 3554}, + pos: position{line: 135, col: 15, offset: 3457}, val: "==", ignoreCase: false, want: "\"==\"", }, &litMatcher{ - pos: position{line: 133, col: 22, offset: 3561}, + pos: position{line: 135, col: 22, offset: 3464}, val: "!=", ignoreCase: false, want: "\"!=\"", }, &seqExpr{ - pos: position{line: 133, col: 30, offset: 3569}, + pos: position{line: 135, col: 30, offset: 3472}, exprs: []any{ &litMatcher{ - pos: position{line: 133, col: 30, offset: 3569}, + pos: position{line: 135, col: 30, offset: 3472}, val: "in", ignoreCase: false, want: "\"in\"", }, ¬Expr{ - pos: position{line: 133, col: 35, offset: 3574}, + pos: position{line: 135, col: 35, offset: 3477}, expr: &ruleRefExpr{ - pos: position{line: 133, col: 36, offset: 3575}, + pos: position{line: 135, col: 36, offset: 3478}, name: "IdentifierRest", }, }, }, }, &litMatcher{ - pos: position{line: 133, col: 54, offset: 3593}, + pos: position{line: 135, col: 54, offset: 3496}, val: "<=", ignoreCase: false, want: "\"<=\"", }, &litMatcher{ - pos: position{line: 133, col: 61, offset: 3600}, + pos: position{line: 135, col: 61, offset: 3503}, val: "<", ignoreCase: false, want: "\"<\"", }, &litMatcher{ - pos: position{line: 133, col: 67, offset: 3606}, + pos: position{line: 135, col: 67, offset: 3509}, val: ">=", ignoreCase: false, want: "\">=\"", }, &litMatcher{ - pos: position{line: 133, col: 74, offset: 3613}, + pos: position{line: 135, col: 74, offset: 3516}, val: ">", ignoreCase: false, want: "\">\"", @@ -1371,28 +1374,28 @@ var g = &grammar{ }, { name: "SearchBoolean", - pos: position{line: 135, col: 1, offset: 3650}, + pos: position{line: 137, col: 1, offset: 3553}, expr: &actionExpr{ - pos: position{line: 136, col: 5, offset: 3668}, + pos: position{line: 138, col: 5, offset: 3571}, run: (*parser).callonSearchBoolean1, expr: &seqExpr{ - pos: position{line: 136, col: 5, offset: 3668}, + pos: position{line: 138, col: 5, offset: 3571}, exprs: []any{ &labeledExpr{ - pos: position{line: 136, col: 5, offset: 3668}, + pos: position{line: 138, col: 5, offset: 3571}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 136, col: 11, offset: 3674}, + pos: position{line: 138, col: 11, offset: 3577}, name: "SearchAnd", }, }, &labeledExpr{ - pos: position{line: 136, col: 21, offset: 3684}, + pos: position{line: 138, col: 21, offset: 3587}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 136, col: 26, offset: 3689}, + pos: position{line: 138, col: 26, offset: 3592}, expr: &ruleRefExpr{ - pos: position{line: 136, col: 26, offset: 3689}, + pos: position{line: 138, col: 26, offset: 3592}, name: "SearchOrTerm", }, }, @@ -1403,30 +1406,30 @@ var g = &grammar{ }, { name: "SearchOrTerm", - pos: position{line: 140, col: 1, offset: 3763}, + pos: position{line: 142, col: 1, offset: 3666}, expr: &actionExpr{ - pos: position{line: 140, col: 16, offset: 3778}, + pos: position{line: 142, col: 16, offset: 3681}, run: (*parser).callonSearchOrTerm1, expr: &seqExpr{ - pos: position{line: 140, col: 16, offset: 3778}, + pos: position{line: 142, col: 16, offset: 3681}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 140, col: 16, offset: 3778}, + pos: position{line: 142, col: 16, offset: 3681}, name: "_", }, &ruleRefExpr{ - pos: position{line: 140, col: 18, offset: 3780}, + pos: position{line: 142, col: 18, offset: 3683}, name: "OrToken", }, &ruleRefExpr{ - pos: position{line: 140, col: 26, offset: 3788}, + pos: position{line: 142, col: 26, offset: 3691}, name: "_", }, &labeledExpr{ - pos: position{line: 140, col: 28, offset: 3790}, + pos: position{line: 142, col: 28, offset: 3693}, label: "t", expr: &ruleRefExpr{ - pos: position{line: 140, col: 30, offset: 3792}, + pos: position{line: 142, col: 30, offset: 3695}, name: "SearchAnd", }, }, @@ -1436,73 +1439,73 @@ var g = &grammar{ }, { name: "SearchAnd", - pos: position{line: 142, col: 1, offset: 3842}, + pos: position{line: 144, col: 1, offset: 3745}, expr: &actionExpr{ - pos: position{line: 143, col: 5, offset: 3856}, + pos: position{line: 145, col: 5, offset: 3759}, run: (*parser).callonSearchAnd1, expr: &seqExpr{ - pos: position{line: 143, col: 5, offset: 3856}, + pos: position{line: 145, col: 5, offset: 3759}, exprs: []any{ &labeledExpr{ - pos: position{line: 143, col: 5, offset: 3856}, + pos: position{line: 145, col: 5, offset: 3759}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 143, col: 11, offset: 3862}, + pos: position{line: 145, col: 11, offset: 3765}, name: "SearchFactor", }, }, &labeledExpr{ - pos: position{line: 144, col: 5, offset: 3879}, + pos: position{line: 146, col: 5, offset: 3782}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 144, col: 10, offset: 3884}, + pos: position{line: 146, col: 10, offset: 3787}, expr: &actionExpr{ - pos: position{line: 144, col: 11, offset: 3885}, + pos: position{line: 146, col: 11, offset: 3788}, run: (*parser).callonSearchAnd7, expr: &seqExpr{ - pos: position{line: 144, col: 11, offset: 3885}, + pos: position{line: 146, col: 11, offset: 3788}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 144, col: 11, offset: 3885}, + pos: position{line: 146, col: 11, offset: 3788}, expr: &seqExpr{ - pos: position{line: 144, col: 12, offset: 3886}, + pos: position{line: 146, col: 12, offset: 3789}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 144, col: 12, offset: 3886}, + pos: position{line: 146, col: 12, offset: 3789}, name: "_", }, &ruleRefExpr{ - pos: position{line: 144, col: 14, offset: 3888}, + pos: position{line: 146, col: 14, offset: 3791}, name: "AndToken", }, }, }, }, &ruleRefExpr{ - pos: position{line: 144, col: 25, offset: 3899}, + pos: position{line: 146, col: 25, offset: 3802}, name: "_", }, ¬Expr{ - pos: position{line: 144, col: 27, offset: 3901}, + pos: position{line: 146, col: 27, offset: 3804}, expr: &choiceExpr{ - pos: position{line: 144, col: 29, offset: 3903}, + pos: position{line: 146, col: 29, offset: 3806}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 144, col: 29, offset: 3903}, + pos: position{line: 146, col: 29, offset: 3806}, name: "OrToken", }, &ruleRefExpr{ - pos: position{line: 144, col: 39, offset: 3913}, + pos: position{line: 146, col: 39, offset: 3816}, name: "SearchKeywordGuard", }, }, }, }, &labeledExpr{ - pos: position{line: 144, col: 59, offset: 3933}, + pos: position{line: 146, col: 59, offset: 3836}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 144, col: 64, offset: 3938}, + pos: position{line: 146, col: 64, offset: 3841}, name: "SearchFactor", }, }, @@ -1517,42 +1520,42 @@ var g = &grammar{ }, { name: "SearchKeywordGuard", - pos: position{line: 148, col: 1, offset: 4056}, + pos: position{line: 150, col: 1, offset: 3959}, expr: &choiceExpr{ - pos: position{line: 149, col: 5, offset: 4079}, + pos: position{line: 151, col: 5, offset: 3982}, alternatives: []any{ &seqExpr{ - pos: position{line: 149, col: 5, offset: 4079}, + pos: position{line: 151, col: 5, offset: 3982}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 149, col: 5, offset: 4079}, + pos: position{line: 151, col: 5, offset: 3982}, name: "FromSource", }, &ruleRefExpr{ - pos: position{line: 149, col: 16, offset: 4090}, + pos: position{line: 151, col: 16, offset: 3993}, name: "__", }, &litMatcher{ - pos: position{line: 149, col: 19, offset: 4093}, + pos: position{line: 151, col: 19, offset: 3996}, val: "=>", ignoreCase: false, want: "\"=>\"", }, &ruleRefExpr{ - pos: position{line: 149, col: 24, offset: 4098}, + pos: position{line: 151, col: 24, offset: 4001}, name: "__", }, }, }, &seqExpr{ - pos: position{line: 150, col: 5, offset: 4105}, + pos: position{line: 152, col: 5, offset: 4008}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 150, col: 5, offset: 4105}, + pos: position{line: 152, col: 5, offset: 4008}, name: "Case", }, &ruleRefExpr{ - pos: position{line: 150, col: 10, offset: 4110}, + pos: position{line: 152, col: 10, offset: 4013}, name: "__", }, }, @@ -1562,43 +1565,43 @@ var g = &grammar{ }, { name: "SearchFactor", - pos: position{line: 152, col: 1, offset: 4114}, + pos: position{line: 154, col: 1, offset: 4017}, expr: &choiceExpr{ - pos: position{line: 153, col: 5, offset: 4131}, + pos: position{line: 155, col: 5, offset: 4034}, alternatives: []any{ &actionExpr{ - pos: position{line: 153, col: 5, offset: 4131}, + pos: position{line: 155, col: 5, offset: 4034}, run: (*parser).callonSearchFactor2, expr: &seqExpr{ - pos: position{line: 153, col: 5, offset: 4131}, + pos: position{line: 155, col: 5, offset: 4034}, exprs: []any{ &choiceExpr{ - pos: position{line: 153, col: 6, offset: 4132}, + pos: position{line: 155, col: 6, offset: 4035}, alternatives: []any{ &seqExpr{ - pos: position{line: 153, col: 6, offset: 4132}, + pos: position{line: 155, col: 6, offset: 4035}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 153, col: 6, offset: 4132}, + pos: position{line: 155, col: 6, offset: 4035}, name: "NotToken", }, &ruleRefExpr{ - pos: position{line: 153, col: 15, offset: 4141}, + pos: position{line: 155, col: 15, offset: 4044}, name: "_", }, }, }, &seqExpr{ - pos: position{line: 153, col: 19, offset: 4145}, + pos: position{line: 155, col: 19, offset: 4048}, exprs: []any{ &litMatcher{ - pos: position{line: 153, col: 19, offset: 4145}, + pos: position{line: 155, col: 19, offset: 4048}, val: "!", ignoreCase: false, want: "\"!\"", }, &ruleRefExpr{ - pos: position{line: 153, col: 23, offset: 4149}, + pos: position{line: 155, col: 23, offset: 4052}, name: "__", }, }, @@ -1606,10 +1609,10 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 153, col: 27, offset: 4153}, + pos: position{line: 155, col: 27, offset: 4056}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 153, col: 29, offset: 4155}, + pos: position{line: 155, col: 29, offset: 4058}, name: "SearchFactor", }, }, @@ -1617,35 +1620,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 156, col: 5, offset: 4267}, + pos: position{line: 158, col: 5, offset: 4170}, run: (*parser).callonSearchFactor13, expr: &seqExpr{ - pos: position{line: 156, col: 5, offset: 4267}, + pos: position{line: 158, col: 5, offset: 4170}, exprs: []any{ &litMatcher{ - pos: position{line: 156, col: 5, offset: 4267}, + pos: position{line: 158, col: 5, offset: 4170}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 156, col: 9, offset: 4271}, + pos: position{line: 158, col: 9, offset: 4174}, name: "__", }, &labeledExpr{ - pos: position{line: 156, col: 12, offset: 4274}, + pos: position{line: 158, col: 12, offset: 4177}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 156, col: 17, offset: 4279}, + pos: position{line: 158, col: 17, offset: 4182}, name: "SearchBoolean", }, }, &ruleRefExpr{ - pos: position{line: 156, col: 31, offset: 4293}, + pos: position{line: 158, col: 31, offset: 4196}, name: "__", }, &litMatcher{ - pos: position{line: 156, col: 34, offset: 4296}, + pos: position{line: 158, col: 34, offset: 4199}, val: ")", ignoreCase: false, want: "\")\"", @@ -1654,7 +1657,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 157, col: 5, offset: 4325}, + pos: position{line: 159, col: 5, offset: 4228}, name: "SearchExpr", }, }, @@ -1662,53 +1665,53 @@ var g = &grammar{ }, { name: "SearchExpr", - pos: position{line: 159, col: 1, offset: 4337}, + pos: position{line: 161, col: 1, offset: 4240}, expr: &choiceExpr{ - pos: position{line: 160, col: 5, offset: 4352}, + pos: position{line: 162, col: 5, offset: 4255}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 160, col: 5, offset: 4352}, + pos: position{line: 162, col: 5, offset: 4255}, name: "Regexp", }, &ruleRefExpr{ - pos: position{line: 161, col: 5, offset: 4363}, + pos: position{line: 163, col: 5, offset: 4266}, name: "Glob", }, &actionExpr{ - pos: position{line: 162, col: 5, offset: 4372}, + pos: position{line: 164, col: 5, offset: 4275}, run: (*parser).callonSearchExpr4, expr: &seqExpr{ - pos: position{line: 162, col: 5, offset: 4372}, + pos: position{line: 164, col: 5, offset: 4275}, exprs: []any{ &labeledExpr{ - pos: position{line: 162, col: 5, offset: 4372}, + pos: position{line: 164, col: 5, offset: 4275}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 162, col: 7, offset: 4374}, + pos: position{line: 164, col: 7, offset: 4277}, name: "SearchValue", }, }, &choiceExpr{ - pos: position{line: 162, col: 20, offset: 4387}, + pos: position{line: 164, col: 20, offset: 4290}, alternatives: []any{ ¬Expr{ - pos: position{line: 162, col: 20, offset: 4387}, + pos: position{line: 164, col: 20, offset: 4290}, expr: &ruleRefExpr{ - pos: position{line: 162, col: 21, offset: 4388}, + pos: position{line: 164, col: 21, offset: 4291}, name: "ExprGuard", }, }, &andExpr{ - pos: position{line: 162, col: 33, offset: 4400}, + pos: position{line: 164, col: 33, offset: 4303}, expr: &seqExpr{ - pos: position{line: 162, col: 35, offset: 4402}, + pos: position{line: 164, col: 35, offset: 4305}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 162, col: 35, offset: 4402}, + pos: position{line: 164, col: 35, offset: 4305}, name: "_", }, &ruleRefExpr{ - pos: position{line: 162, col: 37, offset: 4404}, + pos: position{line: 164, col: 37, offset: 4307}, name: "Glob", }, }, @@ -1720,21 +1723,21 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 165, col: 5, offset: 4516}, + pos: position{line: 167, col: 5, offset: 4419}, run: (*parser).callonSearchExpr15, expr: &seqExpr{ - pos: position{line: 165, col: 5, offset: 4516}, + pos: position{line: 167, col: 5, offset: 4419}, exprs: []any{ &litMatcher{ - pos: position{line: 165, col: 5, offset: 4516}, + pos: position{line: 167, col: 5, offset: 4419}, val: "*", ignoreCase: false, want: "\"*\"", }, ¬Expr{ - pos: position{line: 165, col: 9, offset: 4520}, + pos: position{line: 167, col: 9, offset: 4423}, expr: &ruleRefExpr{ - pos: position{line: 165, col: 10, offset: 4521}, + pos: position{line: 167, col: 10, offset: 4424}, name: "ExprGuard", }, }, @@ -1742,7 +1745,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 168, col: 5, offset: 4637}, + pos: position{line: 170, col: 5, offset: 4540}, name: "SearchPredicate", }, }, @@ -1750,45 +1753,45 @@ var g = &grammar{ }, { name: "SearchPredicate", - pos: position{line: 170, col: 1, offset: 4654}, + pos: position{line: 172, col: 1, offset: 4557}, expr: &choiceExpr{ - pos: position{line: 171, col: 5, offset: 4674}, + pos: position{line: 173, col: 5, offset: 4577}, alternatives: []any{ &actionExpr{ - pos: position{line: 171, col: 5, offset: 4674}, + pos: position{line: 173, col: 5, offset: 4577}, run: (*parser).callonSearchPredicate2, expr: &seqExpr{ - pos: position{line: 171, col: 5, offset: 4674}, + pos: position{line: 173, col: 5, offset: 4577}, exprs: []any{ &labeledExpr{ - pos: position{line: 171, col: 5, offset: 4674}, + pos: position{line: 173, col: 5, offset: 4577}, label: "lhs", expr: &ruleRefExpr{ - pos: position{line: 171, col: 9, offset: 4678}, + pos: position{line: 173, col: 9, offset: 4581}, name: "AdditiveExpr", }, }, &ruleRefExpr{ - pos: position{line: 171, col: 22, offset: 4691}, + pos: position{line: 173, col: 22, offset: 4594}, name: "__", }, &labeledExpr{ - pos: position{line: 171, col: 25, offset: 4694}, + pos: position{line: 173, col: 25, offset: 4597}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 171, col: 28, offset: 4697}, + pos: position{line: 173, col: 28, offset: 4600}, name: "Comparator", }, }, &ruleRefExpr{ - pos: position{line: 171, col: 39, offset: 4708}, + pos: position{line: 173, col: 39, offset: 4611}, name: "__", }, &labeledExpr{ - pos: position{line: 171, col: 42, offset: 4711}, + pos: position{line: 173, col: 42, offset: 4614}, label: "rhs", expr: &ruleRefExpr{ - pos: position{line: 171, col: 46, offset: 4715}, + pos: position{line: 173, col: 46, offset: 4618}, name: "AdditiveExpr", }, }, @@ -1796,26 +1799,26 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 174, col: 6, offset: 4838}, + pos: position{line: 176, col: 6, offset: 4741}, run: (*parser).callonSearchPredicate12, expr: &seqExpr{ - pos: position{line: 174, col: 6, offset: 4838}, + pos: position{line: 176, col: 6, offset: 4741}, exprs: []any{ &labeledExpr{ - pos: position{line: 174, col: 6, offset: 4838}, + pos: position{line: 176, col: 6, offset: 4741}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 174, col: 12, offset: 4844}, + pos: position{line: 176, col: 12, offset: 4747}, name: "Function", }, }, &labeledExpr{ - pos: position{line: 174, col: 21, offset: 4853}, + pos: position{line: 176, col: 21, offset: 4756}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 174, col: 26, offset: 4858}, + pos: position{line: 176, col: 26, offset: 4761}, expr: &ruleRefExpr{ - pos: position{line: 174, col: 27, offset: 4859}, + pos: position{line: 176, col: 27, offset: 4762}, name: "Deref", }, }, @@ -1828,32 +1831,32 @@ var g = &grammar{ }, { name: "SearchValue", - pos: position{line: 178, col: 1, offset: 4931}, + pos: position{line: 180, col: 1, offset: 4834}, expr: &choiceExpr{ - pos: position{line: 179, col: 5, offset: 4947}, + pos: position{line: 181, col: 5, offset: 4850}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 179, col: 5, offset: 4947}, + pos: position{line: 181, col: 5, offset: 4850}, name: "Literal", }, &actionExpr{ - pos: position{line: 180, col: 5, offset: 4959}, + pos: position{line: 182, col: 5, offset: 4862}, run: (*parser).callonSearchValue3, expr: &seqExpr{ - pos: position{line: 180, col: 5, offset: 4959}, + pos: position{line: 182, col: 5, offset: 4862}, exprs: []any{ ¬Expr{ - pos: position{line: 180, col: 5, offset: 4959}, + pos: position{line: 182, col: 5, offset: 4862}, expr: &ruleRefExpr{ - pos: position{line: 180, col: 6, offset: 4960}, + pos: position{line: 182, col: 6, offset: 4863}, name: "RegexpPattern", }, }, &labeledExpr{ - pos: position{line: 180, col: 20, offset: 4974}, + pos: position{line: 182, col: 20, offset: 4877}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 180, col: 22, offset: 4976}, + pos: position{line: 182, col: 22, offset: 4879}, name: "KeyWord", }, }, @@ -1865,15 +1868,15 @@ var g = &grammar{ }, { name: "Glob", - pos: position{line: 184, col: 1, offset: 5084}, + pos: position{line: 186, col: 1, offset: 4987}, expr: &actionExpr{ - pos: position{line: 185, col: 5, offset: 5093}, + pos: position{line: 187, col: 5, offset: 4996}, run: (*parser).callonGlob1, expr: &labeledExpr{ - pos: position{line: 185, col: 5, offset: 5093}, + pos: position{line: 187, col: 5, offset: 4996}, label: "pattern", expr: &ruleRefExpr{ - pos: position{line: 185, col: 13, offset: 5101}, + pos: position{line: 187, col: 13, offset: 5004}, name: "GlobPattern", }, }, @@ -1881,15 +1884,15 @@ var g = &grammar{ }, { name: "Regexp", - pos: position{line: 189, col: 1, offset: 5197}, + pos: position{line: 191, col: 1, offset: 5100}, expr: &actionExpr{ - pos: position{line: 190, col: 5, offset: 5208}, + pos: position{line: 192, col: 5, offset: 5111}, run: (*parser).callonRegexp1, expr: &labeledExpr{ - pos: position{line: 190, col: 5, offset: 5208}, + pos: position{line: 192, col: 5, offset: 5111}, label: "pattern", expr: &ruleRefExpr{ - pos: position{line: 190, col: 13, offset: 5216}, + pos: position{line: 192, col: 13, offset: 5119}, name: "RegexpPattern", }, }, @@ -1897,36 +1900,36 @@ var g = &grammar{ }, { name: "Aggregation", - pos: position{line: 196, col: 1, offset: 5342}, + pos: position{line: 198, col: 1, offset: 5245}, expr: &choiceExpr{ - pos: position{line: 197, col: 5, offset: 5358}, + pos: position{line: 199, col: 5, offset: 5261}, alternatives: []any{ &actionExpr{ - pos: position{line: 197, col: 5, offset: 5358}, + pos: position{line: 199, col: 5, offset: 5261}, run: (*parser).callonAggregation2, expr: &seqExpr{ - pos: position{line: 197, col: 5, offset: 5358}, + pos: position{line: 199, col: 5, offset: 5261}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 197, col: 5, offset: 5358}, + pos: position{line: 199, col: 5, offset: 5261}, expr: &ruleRefExpr{ - pos: position{line: 197, col: 5, offset: 5358}, + pos: position{line: 199, col: 5, offset: 5261}, name: "Summarize", }, }, &labeledExpr{ - pos: position{line: 197, col: 16, offset: 5369}, + pos: position{line: 199, col: 16, offset: 5272}, label: "keys", expr: &ruleRefExpr{ - pos: position{line: 197, col: 21, offset: 5374}, + pos: position{line: 199, col: 21, offset: 5277}, name: "GroupByKeys", }, }, &labeledExpr{ - pos: position{line: 197, col: 33, offset: 5386}, + pos: position{line: 199, col: 33, offset: 5289}, label: "limit", expr: &ruleRefExpr{ - pos: position{line: 197, col: 39, offset: 5392}, + pos: position{line: 199, col: 39, offset: 5295}, name: "LimitArg", }, }, @@ -1934,40 +1937,40 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 200, col: 5, offset: 5518}, + pos: position{line: 202, col: 5, offset: 5421}, run: (*parser).callonAggregation10, expr: &seqExpr{ - pos: position{line: 200, col: 5, offset: 5518}, + pos: position{line: 202, col: 5, offset: 5421}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 200, col: 5, offset: 5518}, + pos: position{line: 202, col: 5, offset: 5421}, expr: &ruleRefExpr{ - pos: position{line: 200, col: 5, offset: 5518}, + pos: position{line: 202, col: 5, offset: 5421}, name: "Summarize", }, }, &labeledExpr{ - pos: position{line: 200, col: 16, offset: 5529}, + pos: position{line: 202, col: 16, offset: 5432}, label: "aggs", expr: &ruleRefExpr{ - pos: position{line: 200, col: 21, offset: 5534}, + pos: position{line: 202, col: 21, offset: 5437}, name: "AggAssignments", }, }, &labeledExpr{ - pos: position{line: 200, col: 36, offset: 5549}, + pos: position{line: 202, col: 36, offset: 5452}, label: "keys", expr: &zeroOrOneExpr{ - pos: position{line: 200, col: 41, offset: 5554}, + pos: position{line: 202, col: 41, offset: 5457}, expr: &seqExpr{ - pos: position{line: 200, col: 42, offset: 5555}, + pos: position{line: 202, col: 42, offset: 5458}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 200, col: 42, offset: 5555}, + pos: position{line: 202, col: 42, offset: 5458}, name: "_", }, &ruleRefExpr{ - pos: position{line: 200, col: 44, offset: 5557}, + pos: position{line: 202, col: 44, offset: 5460}, name: "GroupByKeys", }, }, @@ -1975,10 +1978,10 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 200, col: 58, offset: 5571}, + pos: position{line: 202, col: 58, offset: 5474}, label: "limit", expr: &ruleRefExpr{ - pos: position{line: 200, col: 64, offset: 5577}, + pos: position{line: 202, col: 64, offset: 5480}, name: "LimitArg", }, }, @@ -1990,18 +1993,18 @@ var g = &grammar{ }, { name: "Summarize", - pos: position{line: 208, col: 1, offset: 5791}, + pos: position{line: 210, col: 1, offset: 5694}, expr: &seqExpr{ - pos: position{line: 208, col: 13, offset: 5803}, + pos: position{line: 210, col: 13, offset: 5706}, exprs: []any{ &litMatcher{ - pos: position{line: 208, col: 13, offset: 5803}, + pos: position{line: 210, col: 13, offset: 5706}, val: "summarize", ignoreCase: false, want: "\"summarize\"", }, &ruleRefExpr{ - pos: position{line: 208, col: 25, offset: 5815}, + pos: position{line: 210, col: 25, offset: 5718}, name: "_", }, }, @@ -2009,26 +2012,26 @@ var g = &grammar{ }, { name: "GroupByKeys", - pos: position{line: 210, col: 1, offset: 5818}, + pos: position{line: 212, col: 1, offset: 5721}, expr: &actionExpr{ - pos: position{line: 211, col: 5, offset: 5834}, + pos: position{line: 213, col: 5, offset: 5737}, run: (*parser).callonGroupByKeys1, expr: &seqExpr{ - pos: position{line: 211, col: 5, offset: 5834}, + pos: position{line: 213, col: 5, offset: 5737}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 211, col: 5, offset: 5834}, + pos: position{line: 213, col: 5, offset: 5737}, name: "ByToken", }, &ruleRefExpr{ - pos: position{line: 211, col: 13, offset: 5842}, + pos: position{line: 213, col: 13, offset: 5745}, name: "_", }, &labeledExpr{ - pos: position{line: 211, col: 15, offset: 5844}, + pos: position{line: 213, col: 15, offset: 5747}, label: "columns", expr: &ruleRefExpr{ - pos: position{line: 211, col: 23, offset: 5852}, + pos: position{line: 213, col: 23, offset: 5755}, name: "FlexAssignments", }, }, @@ -2038,45 +2041,45 @@ var g = &grammar{ }, { name: "LimitArg", - pos: position{line: 213, col: 1, offset: 5893}, + pos: position{line: 215, col: 1, offset: 5796}, expr: &choiceExpr{ - pos: position{line: 214, col: 5, offset: 5906}, + pos: position{line: 216, col: 5, offset: 5809}, alternatives: []any{ &actionExpr{ - pos: position{line: 214, col: 5, offset: 5906}, + pos: position{line: 216, col: 5, offset: 5809}, run: (*parser).callonLimitArg2, expr: &seqExpr{ - pos: position{line: 214, col: 5, offset: 5906}, + pos: position{line: 216, col: 5, offset: 5809}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 214, col: 5, offset: 5906}, + pos: position{line: 216, col: 5, offset: 5809}, name: "_", }, &litMatcher{ - pos: position{line: 214, col: 7, offset: 5908}, + pos: position{line: 216, col: 7, offset: 5811}, val: "with", ignoreCase: false, want: "\"with\"", }, &ruleRefExpr{ - pos: position{line: 214, col: 14, offset: 5915}, + pos: position{line: 216, col: 14, offset: 5818}, name: "_", }, &litMatcher{ - pos: position{line: 214, col: 16, offset: 5917}, + pos: position{line: 216, col: 16, offset: 5820}, val: "-limit", ignoreCase: false, want: "\"-limit\"", }, &ruleRefExpr{ - pos: position{line: 214, col: 25, offset: 5926}, + pos: position{line: 216, col: 25, offset: 5829}, name: "_", }, &labeledExpr{ - pos: position{line: 214, col: 27, offset: 5928}, + pos: position{line: 216, col: 27, offset: 5831}, label: "limit", expr: &ruleRefExpr{ - pos: position{line: 214, col: 33, offset: 5934}, + pos: position{line: 216, col: 33, offset: 5837}, name: "UInt", }, }, @@ -2084,10 +2087,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 215, col: 5, offset: 5965}, + pos: position{line: 217, col: 5, offset: 5868}, run: (*parser).callonLimitArg11, expr: &litMatcher{ - pos: position{line: 215, col: 5, offset: 5965}, + pos: position{line: 217, col: 5, offset: 5868}, val: "", ignoreCase: false, want: "\"\"", @@ -2098,22 +2101,22 @@ var g = &grammar{ }, { name: "FlexAssignment", - pos: position{line: 220, col: 1, offset: 6225}, + pos: position{line: 222, col: 1, offset: 6128}, expr: &choiceExpr{ - pos: position{line: 221, col: 5, offset: 6244}, + pos: position{line: 223, col: 5, offset: 6147}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 221, col: 5, offset: 6244}, + pos: position{line: 223, col: 5, offset: 6147}, name: "Assignment", }, &actionExpr{ - pos: position{line: 222, col: 5, offset: 6259}, + pos: position{line: 224, col: 5, offset: 6162}, run: (*parser).callonFlexAssignment3, expr: &labeledExpr{ - pos: position{line: 222, col: 5, offset: 6259}, + pos: position{line: 224, col: 5, offset: 6162}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 222, col: 10, offset: 6264}, + pos: position{line: 224, col: 10, offset: 6167}, name: "Expr", }, }, @@ -2123,51 +2126,51 @@ var g = &grammar{ }, { name: "FlexAssignments", - pos: position{line: 224, col: 1, offset: 6356}, + pos: position{line: 226, col: 1, offset: 6259}, expr: &actionExpr{ - pos: position{line: 225, col: 5, offset: 6376}, + pos: position{line: 227, col: 5, offset: 6279}, run: (*parser).callonFlexAssignments1, expr: &seqExpr{ - pos: position{line: 225, col: 5, offset: 6376}, + pos: position{line: 227, col: 5, offset: 6279}, exprs: []any{ &labeledExpr{ - pos: position{line: 225, col: 5, offset: 6376}, + pos: position{line: 227, col: 5, offset: 6279}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 225, col: 11, offset: 6382}, + pos: position{line: 227, col: 11, offset: 6285}, name: "FlexAssignment", }, }, &labeledExpr{ - pos: position{line: 225, col: 26, offset: 6397}, + pos: position{line: 227, col: 26, offset: 6300}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 225, col: 31, offset: 6402}, + pos: position{line: 227, col: 31, offset: 6305}, expr: &actionExpr{ - pos: position{line: 225, col: 32, offset: 6403}, + pos: position{line: 227, col: 32, offset: 6306}, run: (*parser).callonFlexAssignments7, expr: &seqExpr{ - pos: position{line: 225, col: 32, offset: 6403}, + pos: position{line: 227, col: 32, offset: 6306}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 225, col: 32, offset: 6403}, + pos: position{line: 227, col: 32, offset: 6306}, name: "__", }, &litMatcher{ - pos: position{line: 225, col: 35, offset: 6406}, + pos: position{line: 227, col: 35, offset: 6309}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 225, col: 39, offset: 6410}, + pos: position{line: 227, col: 39, offset: 6313}, name: "__", }, &labeledExpr{ - pos: position{line: 225, col: 42, offset: 6413}, + pos: position{line: 227, col: 42, offset: 6316}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 225, col: 47, offset: 6418}, + pos: position{line: 227, col: 47, offset: 6321}, name: "FlexAssignment", }, }, @@ -2182,43 +2185,43 @@ var g = &grammar{ }, { name: "AggAssignment", - pos: position{line: 229, col: 1, offset: 6540}, + pos: position{line: 231, col: 1, offset: 6443}, expr: &choiceExpr{ - pos: position{line: 230, col: 5, offset: 6558}, + pos: position{line: 232, col: 5, offset: 6461}, alternatives: []any{ &actionExpr{ - pos: position{line: 230, col: 5, offset: 6558}, + pos: position{line: 232, col: 5, offset: 6461}, run: (*parser).callonAggAssignment2, expr: &seqExpr{ - pos: position{line: 230, col: 5, offset: 6558}, + pos: position{line: 232, col: 5, offset: 6461}, exprs: []any{ &labeledExpr{ - pos: position{line: 230, col: 5, offset: 6558}, + pos: position{line: 232, col: 5, offset: 6461}, label: "lval", expr: &ruleRefExpr{ - pos: position{line: 230, col: 10, offset: 6563}, + pos: position{line: 232, col: 10, offset: 6466}, name: "Lval", }, }, &ruleRefExpr{ - pos: position{line: 230, col: 15, offset: 6568}, + pos: position{line: 232, col: 15, offset: 6471}, name: "__", }, &litMatcher{ - pos: position{line: 230, col: 18, offset: 6571}, + pos: position{line: 232, col: 18, offset: 6474}, val: ":=", ignoreCase: false, want: "\":=\"", }, &ruleRefExpr{ - pos: position{line: 230, col: 23, offset: 6576}, + pos: position{line: 232, col: 23, offset: 6479}, name: "__", }, &labeledExpr{ - pos: position{line: 230, col: 26, offset: 6579}, + pos: position{line: 232, col: 26, offset: 6482}, label: "agg", expr: &ruleRefExpr{ - pos: position{line: 230, col: 30, offset: 6583}, + pos: position{line: 232, col: 30, offset: 6486}, name: "Agg", }, }, @@ -2226,13 +2229,13 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 233, col: 5, offset: 6687}, + pos: position{line: 235, col: 5, offset: 6590}, run: (*parser).callonAggAssignment11, expr: &labeledExpr{ - pos: position{line: 233, col: 5, offset: 6687}, + pos: position{line: 235, col: 5, offset: 6590}, label: "agg", expr: &ruleRefExpr{ - pos: position{line: 233, col: 9, offset: 6691}, + pos: position{line: 235, col: 9, offset: 6594}, name: "Agg", }, }, @@ -2242,56 +2245,56 @@ var g = &grammar{ }, { name: "Agg", - pos: position{line: 237, col: 1, offset: 6791}, + pos: position{line: 239, col: 1, offset: 6694}, expr: &actionExpr{ - pos: position{line: 238, col: 5, offset: 6799}, + pos: position{line: 240, col: 5, offset: 6702}, run: (*parser).callonAgg1, expr: &seqExpr{ - pos: position{line: 238, col: 5, offset: 6799}, + pos: position{line: 240, col: 5, offset: 6702}, exprs: []any{ ¬Expr{ - pos: position{line: 238, col: 5, offset: 6799}, + pos: position{line: 240, col: 5, offset: 6702}, expr: &ruleRefExpr{ - pos: position{line: 238, col: 6, offset: 6800}, + pos: position{line: 240, col: 6, offset: 6703}, name: "FuncGuard", }, }, &labeledExpr{ - pos: position{line: 238, col: 16, offset: 6810}, + pos: position{line: 240, col: 16, offset: 6713}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 238, col: 19, offset: 6813}, + pos: position{line: 240, col: 19, offset: 6716}, name: "AggName", }, }, &ruleRefExpr{ - pos: position{line: 238, col: 27, offset: 6821}, + pos: position{line: 240, col: 27, offset: 6724}, name: "__", }, &litMatcher{ - pos: position{line: 238, col: 30, offset: 6824}, + pos: position{line: 240, col: 30, offset: 6727}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 238, col: 34, offset: 6828}, + pos: position{line: 240, col: 34, offset: 6731}, name: "__", }, &labeledExpr{ - pos: position{line: 238, col: 37, offset: 6831}, + pos: position{line: 240, col: 37, offset: 6734}, label: "expr", expr: &zeroOrOneExpr{ - pos: position{line: 238, col: 42, offset: 6836}, + pos: position{line: 240, col: 42, offset: 6739}, expr: &choiceExpr{ - pos: position{line: 238, col: 43, offset: 6837}, + pos: position{line: 240, col: 43, offset: 6740}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 238, col: 43, offset: 6837}, + pos: position{line: 240, col: 43, offset: 6740}, name: "OverExpr", }, &ruleRefExpr{ - pos: position{line: 238, col: 54, offset: 6848}, + pos: position{line: 240, col: 54, offset: 6751}, name: "Expr", }, }, @@ -2299,26 +2302,26 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 238, col: 61, offset: 6855}, + pos: position{line: 240, col: 61, offset: 6758}, name: "__", }, &litMatcher{ - pos: position{line: 238, col: 64, offset: 6858}, + pos: position{line: 240, col: 64, offset: 6761}, val: ")", ignoreCase: false, want: "\")\"", }, ¬Expr{ - pos: position{line: 238, col: 68, offset: 6862}, + pos: position{line: 240, col: 68, offset: 6765}, expr: &seqExpr{ - pos: position{line: 238, col: 70, offset: 6864}, + pos: position{line: 240, col: 70, offset: 6767}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 238, col: 70, offset: 6864}, + pos: position{line: 240, col: 70, offset: 6767}, name: "__", }, &litMatcher{ - pos: position{line: 238, col: 73, offset: 6867}, + pos: position{line: 240, col: 73, offset: 6770}, val: ".", ignoreCase: false, want: "\".\"", @@ -2327,12 +2330,12 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 238, col: 78, offset: 6872}, + pos: position{line: 240, col: 78, offset: 6775}, label: "where", expr: &zeroOrOneExpr{ - pos: position{line: 238, col: 84, offset: 6878}, + pos: position{line: 240, col: 84, offset: 6781}, expr: &ruleRefExpr{ - pos: position{line: 238, col: 84, offset: 6878}, + pos: position{line: 240, col: 84, offset: 6781}, name: "WhereClause", }, }, @@ -2343,20 +2346,20 @@ var g = &grammar{ }, { name: "AggName", - pos: position{line: 246, col: 1, offset: 7069}, + pos: position{line: 248, col: 1, offset: 6972}, expr: &choiceExpr{ - pos: position{line: 247, col: 5, offset: 7081}, + pos: position{line: 249, col: 5, offset: 6984}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 247, col: 5, offset: 7081}, + pos: position{line: 249, col: 5, offset: 6984}, name: "IdentifierName", }, &ruleRefExpr{ - pos: position{line: 248, col: 5, offset: 7100}, + pos: position{line: 250, col: 5, offset: 7003}, name: "AndToken", }, &ruleRefExpr{ - pos: position{line: 249, col: 5, offset: 7113}, + pos: position{line: 251, col: 5, offset: 7016}, name: "OrToken", }, }, @@ -2364,32 +2367,32 @@ var g = &grammar{ }, { name: "WhereClause", - pos: position{line: 251, col: 1, offset: 7122}, + pos: position{line: 253, col: 1, offset: 7025}, expr: &actionExpr{ - pos: position{line: 251, col: 15, offset: 7136}, + pos: position{line: 253, col: 15, offset: 7039}, run: (*parser).callonWhereClause1, expr: &seqExpr{ - pos: position{line: 251, col: 15, offset: 7136}, + pos: position{line: 253, col: 15, offset: 7039}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 251, col: 15, offset: 7136}, + pos: position{line: 253, col: 15, offset: 7039}, name: "_", }, &litMatcher{ - pos: position{line: 251, col: 17, offset: 7138}, + pos: position{line: 253, col: 17, offset: 7041}, val: "where", ignoreCase: false, want: "\"where\"", }, &ruleRefExpr{ - pos: position{line: 251, col: 25, offset: 7146}, + pos: position{line: 253, col: 25, offset: 7049}, name: "_", }, &labeledExpr{ - pos: position{line: 251, col: 27, offset: 7148}, + pos: position{line: 253, col: 27, offset: 7051}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 251, col: 32, offset: 7153}, + pos: position{line: 253, col: 32, offset: 7056}, name: "LogicalOrExpr", }, }, @@ -2399,45 +2402,45 @@ var g = &grammar{ }, { name: "AggAssignments", - pos: position{line: 253, col: 1, offset: 7189}, + pos: position{line: 255, col: 1, offset: 7092}, expr: &actionExpr{ - pos: position{line: 254, col: 5, offset: 7208}, + pos: position{line: 256, col: 5, offset: 7111}, run: (*parser).callonAggAssignments1, expr: &seqExpr{ - pos: position{line: 254, col: 5, offset: 7208}, + pos: position{line: 256, col: 5, offset: 7111}, exprs: []any{ &labeledExpr{ - pos: position{line: 254, col: 5, offset: 7208}, + pos: position{line: 256, col: 5, offset: 7111}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 254, col: 11, offset: 7214}, + pos: position{line: 256, col: 11, offset: 7117}, name: "AggAssignment", }, }, &labeledExpr{ - pos: position{line: 254, col: 25, offset: 7228}, + pos: position{line: 256, col: 25, offset: 7131}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 254, col: 30, offset: 7233}, + pos: position{line: 256, col: 30, offset: 7136}, expr: &seqExpr{ - pos: position{line: 254, col: 31, offset: 7234}, + pos: position{line: 256, col: 31, offset: 7137}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 254, col: 31, offset: 7234}, + pos: position{line: 256, col: 31, offset: 7137}, name: "__", }, &litMatcher{ - pos: position{line: 254, col: 34, offset: 7237}, + pos: position{line: 256, col: 34, offset: 7140}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 254, col: 38, offset: 7241}, + pos: position{line: 256, col: 38, offset: 7144}, name: "__", }, &ruleRefExpr{ - pos: position{line: 254, col: 41, offset: 7244}, + pos: position{line: 256, col: 41, offset: 7147}, name: "AggAssignment", }, }, @@ -2450,100 +2453,100 @@ var g = &grammar{ }, { name: "Operator", - pos: position{line: 264, col: 1, offset: 7468}, + pos: position{line: 266, col: 1, offset: 7371}, expr: &choiceExpr{ - pos: position{line: 265, col: 5, offset: 7481}, + pos: position{line: 267, col: 5, offset: 7384}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 265, col: 5, offset: 7481}, + pos: position{line: 267, col: 5, offset: 7384}, name: "AssertOp", }, &ruleRefExpr{ - pos: position{line: 266, col: 5, offset: 7494}, + pos: position{line: 268, col: 5, offset: 7397}, name: "SortOp", }, &ruleRefExpr{ - pos: position{line: 267, col: 5, offset: 7505}, + pos: position{line: 269, col: 5, offset: 7408}, name: "TopOp", }, &ruleRefExpr{ - pos: position{line: 268, col: 5, offset: 7515}, + pos: position{line: 270, col: 5, offset: 7418}, name: "CutOp", }, &ruleRefExpr{ - pos: position{line: 269, col: 5, offset: 7525}, + pos: position{line: 271, col: 5, offset: 7428}, name: "DropOp", }, &ruleRefExpr{ - pos: position{line: 270, col: 5, offset: 7536}, + pos: position{line: 272, col: 5, offset: 7439}, name: "HeadOp", }, &ruleRefExpr{ - pos: position{line: 271, col: 5, offset: 7547}, + pos: position{line: 273, col: 5, offset: 7450}, name: "TailOp", }, &ruleRefExpr{ - pos: position{line: 272, col: 5, offset: 7558}, + pos: position{line: 274, col: 5, offset: 7461}, name: "WhereOp", }, &ruleRefExpr{ - pos: position{line: 273, col: 5, offset: 7570}, + pos: position{line: 275, col: 5, offset: 7473}, name: "UniqOp", }, &ruleRefExpr{ - pos: position{line: 274, col: 5, offset: 7581}, + pos: position{line: 276, col: 5, offset: 7484}, name: "PutOp", }, &ruleRefExpr{ - pos: position{line: 275, col: 5, offset: 7591}, + pos: position{line: 277, col: 5, offset: 7494}, name: "RenameOp", }, &ruleRefExpr{ - pos: position{line: 276, col: 5, offset: 7604}, + pos: position{line: 278, col: 5, offset: 7507}, name: "FuseOp", }, &ruleRefExpr{ - pos: position{line: 277, col: 5, offset: 7615}, + pos: position{line: 279, col: 5, offset: 7518}, name: "ShapeOp", }, &ruleRefExpr{ - pos: position{line: 278, col: 5, offset: 7627}, + pos: position{line: 280, col: 5, offset: 7530}, name: "JoinOp", }, &ruleRefExpr{ - pos: position{line: 279, col: 5, offset: 7638}, + pos: position{line: 281, col: 5, offset: 7541}, name: "SampleOp", }, &ruleRefExpr{ - pos: position{line: 280, col: 5, offset: 7651}, + pos: position{line: 282, col: 5, offset: 7554}, name: "SQLOp", }, &ruleRefExpr{ - pos: position{line: 281, col: 5, offset: 7661}, + pos: position{line: 283, col: 5, offset: 7564}, name: "FromOp", }, &ruleRefExpr{ - pos: position{line: 282, col: 5, offset: 7672}, + pos: position{line: 284, col: 5, offset: 7575}, name: "PassOp", }, &ruleRefExpr{ - pos: position{line: 283, col: 5, offset: 7683}, + pos: position{line: 285, col: 5, offset: 7586}, name: "ExplodeOp", }, &ruleRefExpr{ - pos: position{line: 284, col: 5, offset: 7697}, + pos: position{line: 286, col: 5, offset: 7600}, name: "MergeOp", }, &ruleRefExpr{ - pos: position{line: 285, col: 5, offset: 7709}, + pos: position{line: 287, col: 5, offset: 7612}, name: "OverOp", }, &ruleRefExpr{ - pos: position{line: 286, col: 5, offset: 7720}, + pos: position{line: 288, col: 5, offset: 7623}, name: "YieldOp", }, &ruleRefExpr{ - pos: position{line: 287, col: 5, offset: 7732}, + pos: position{line: 289, col: 5, offset: 7635}, name: "LoadOp", }, }, @@ -2551,34 +2554,34 @@ var g = &grammar{ }, { name: "AssertOp", - pos: position{line: 289, col: 1, offset: 7740}, + pos: position{line: 291, col: 1, offset: 7643}, expr: &actionExpr{ - pos: position{line: 290, col: 5, offset: 7753}, + pos: position{line: 292, col: 5, offset: 7656}, run: (*parser).callonAssertOp1, expr: &seqExpr{ - pos: position{line: 290, col: 5, offset: 7753}, + pos: position{line: 292, col: 5, offset: 7656}, exprs: []any{ &litMatcher{ - pos: position{line: 290, col: 5, offset: 7753}, + pos: position{line: 292, col: 5, offset: 7656}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &ruleRefExpr{ - pos: position{line: 290, col: 14, offset: 7762}, + pos: position{line: 292, col: 14, offset: 7665}, name: "_", }, &labeledExpr{ - pos: position{line: 290, col: 16, offset: 7764}, + pos: position{line: 292, col: 16, offset: 7667}, label: "expr", expr: &actionExpr{ - pos: position{line: 290, col: 22, offset: 7770}, + pos: position{line: 292, col: 22, offset: 7673}, run: (*parser).callonAssertOp6, expr: &labeledExpr{ - pos: position{line: 290, col: 22, offset: 7770}, + pos: position{line: 292, col: 22, offset: 7673}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 290, col: 24, offset: 7772}, + pos: position{line: 292, col: 24, offset: 7675}, name: "Expr", }, }, @@ -2590,54 +2593,54 @@ var g = &grammar{ }, { name: "SortOp", - pos: position{line: 326, col: 1, offset: 9123}, + pos: position{line: 328, col: 1, offset: 9026}, expr: &actionExpr{ - pos: position{line: 327, col: 5, offset: 9134}, + pos: position{line: 329, col: 5, offset: 9037}, run: (*parser).callonSortOp1, expr: &seqExpr{ - pos: position{line: 327, col: 5, offset: 9134}, + pos: position{line: 329, col: 5, offset: 9037}, exprs: []any{ &litMatcher{ - pos: position{line: 327, col: 5, offset: 9134}, + pos: position{line: 329, col: 5, offset: 9037}, val: "sort", ignoreCase: false, want: "\"sort\"", }, &andExpr{ - pos: position{line: 327, col: 12, offset: 9141}, + pos: position{line: 329, col: 12, offset: 9044}, expr: &ruleRefExpr{ - pos: position{line: 327, col: 13, offset: 9142}, + pos: position{line: 329, col: 13, offset: 9045}, name: "EOKW", }, }, &labeledExpr{ - pos: position{line: 327, col: 18, offset: 9147}, + pos: position{line: 329, col: 18, offset: 9050}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 327, col: 23, offset: 9152}, + pos: position{line: 329, col: 23, offset: 9055}, name: "SortArgs", }, }, &labeledExpr{ - pos: position{line: 327, col: 32, offset: 9161}, + pos: position{line: 329, col: 32, offset: 9064}, label: "list", expr: &zeroOrOneExpr{ - pos: position{line: 327, col: 37, offset: 9166}, + pos: position{line: 329, col: 37, offset: 9069}, expr: &actionExpr{ - pos: position{line: 327, col: 38, offset: 9167}, + pos: position{line: 329, col: 38, offset: 9070}, run: (*parser).callonSortOp10, expr: &seqExpr{ - pos: position{line: 327, col: 38, offset: 9167}, + pos: position{line: 329, col: 38, offset: 9070}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 327, col: 38, offset: 9167}, + pos: position{line: 329, col: 38, offset: 9070}, name: "_", }, &labeledExpr{ - pos: position{line: 327, col: 40, offset: 9169}, + pos: position{line: 329, col: 40, offset: 9072}, label: "l", expr: &ruleRefExpr{ - pos: position{line: 327, col: 42, offset: 9171}, + pos: position{line: 329, col: 42, offset: 9074}, name: "Exprs", }, }, @@ -2652,30 +2655,30 @@ var g = &grammar{ }, { name: "SortArgs", - pos: position{line: 341, col: 1, offset: 9582}, + pos: position{line: 343, col: 1, offset: 9485}, expr: &actionExpr{ - pos: position{line: 341, col: 12, offset: 9593}, + pos: position{line: 343, col: 12, offset: 9496}, run: (*parser).callonSortArgs1, expr: &labeledExpr{ - pos: position{line: 341, col: 12, offset: 9593}, + pos: position{line: 343, col: 12, offset: 9496}, label: "args", expr: &zeroOrMoreExpr{ - pos: position{line: 341, col: 17, offset: 9598}, + pos: position{line: 343, col: 17, offset: 9501}, expr: &actionExpr{ - pos: position{line: 341, col: 18, offset: 9599}, + pos: position{line: 343, col: 18, offset: 9502}, run: (*parser).callonSortArgs4, expr: &seqExpr{ - pos: position{line: 341, col: 18, offset: 9599}, + pos: position{line: 343, col: 18, offset: 9502}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 341, col: 18, offset: 9599}, + pos: position{line: 343, col: 18, offset: 9502}, name: "_", }, &labeledExpr{ - pos: position{line: 341, col: 20, offset: 9601}, + pos: position{line: 343, col: 20, offset: 9504}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 341, col: 22, offset: 9603}, + pos: position{line: 343, col: 22, offset: 9506}, name: "SortArg", }, }, @@ -2688,53 +2691,53 @@ var g = &grammar{ }, { name: "SortArg", - pos: position{line: 343, col: 1, offset: 9660}, + pos: position{line: 345, col: 1, offset: 9563}, expr: &choiceExpr{ - pos: position{line: 344, col: 5, offset: 9672}, + pos: position{line: 346, col: 5, offset: 9575}, alternatives: []any{ &actionExpr{ - pos: position{line: 344, col: 5, offset: 9672}, + pos: position{line: 346, col: 5, offset: 9575}, run: (*parser).callonSortArg2, expr: &litMatcher{ - pos: position{line: 344, col: 5, offset: 9672}, + pos: position{line: 346, col: 5, offset: 9575}, val: "-r", ignoreCase: false, want: "\"-r\"", }, }, &actionExpr{ - pos: position{line: 345, col: 5, offset: 9747}, + pos: position{line: 347, col: 5, offset: 9650}, run: (*parser).callonSortArg4, expr: &seqExpr{ - pos: position{line: 345, col: 5, offset: 9747}, + pos: position{line: 347, col: 5, offset: 9650}, exprs: []any{ &litMatcher{ - pos: position{line: 345, col: 5, offset: 9747}, + pos: position{line: 347, col: 5, offset: 9650}, val: "-nulls", ignoreCase: false, want: "\"-nulls\"", }, &ruleRefExpr{ - pos: position{line: 345, col: 14, offset: 9756}, + pos: position{line: 347, col: 14, offset: 9659}, name: "_", }, &labeledExpr{ - pos: position{line: 345, col: 16, offset: 9758}, + pos: position{line: 347, col: 16, offset: 9661}, label: "where", expr: &actionExpr{ - pos: position{line: 345, col: 23, offset: 9765}, + pos: position{line: 347, col: 23, offset: 9668}, run: (*parser).callonSortArg9, expr: &choiceExpr{ - pos: position{line: 345, col: 24, offset: 9766}, + pos: position{line: 347, col: 24, offset: 9669}, alternatives: []any{ &litMatcher{ - pos: position{line: 345, col: 24, offset: 9766}, + pos: position{line: 347, col: 24, offset: 9669}, val: "first", ignoreCase: false, want: "\"first\"", }, &litMatcher{ - pos: position{line: 345, col: 34, offset: 9776}, + pos: position{line: 347, col: 34, offset: 9679}, val: "last", ignoreCase: false, want: "\"last\"", @@ -2751,46 +2754,46 @@ var g = &grammar{ }, { name: "TopOp", - pos: position{line: 347, col: 1, offset: 9889}, + pos: position{line: 349, col: 1, offset: 9792}, expr: &actionExpr{ - pos: position{line: 348, col: 5, offset: 9899}, + pos: position{line: 350, col: 5, offset: 9802}, run: (*parser).callonTopOp1, expr: &seqExpr{ - pos: position{line: 348, col: 5, offset: 9899}, + pos: position{line: 350, col: 5, offset: 9802}, exprs: []any{ &litMatcher{ - pos: position{line: 348, col: 5, offset: 9899}, + pos: position{line: 350, col: 5, offset: 9802}, val: "top", ignoreCase: false, want: "\"top\"", }, &andExpr{ - pos: position{line: 348, col: 11, offset: 9905}, + pos: position{line: 350, col: 11, offset: 9808}, expr: &ruleRefExpr{ - pos: position{line: 348, col: 12, offset: 9906}, + pos: position{line: 350, col: 12, offset: 9809}, name: "EOKW", }, }, &labeledExpr{ - pos: position{line: 348, col: 17, offset: 9911}, + pos: position{line: 350, col: 17, offset: 9814}, label: "limit", expr: &zeroOrOneExpr{ - pos: position{line: 348, col: 23, offset: 9917}, + pos: position{line: 350, col: 23, offset: 9820}, expr: &actionExpr{ - pos: position{line: 348, col: 24, offset: 9918}, + pos: position{line: 350, col: 24, offset: 9821}, run: (*parser).callonTopOp8, expr: &seqExpr{ - pos: position{line: 348, col: 24, offset: 9918}, + pos: position{line: 350, col: 24, offset: 9821}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 348, col: 24, offset: 9918}, + pos: position{line: 350, col: 24, offset: 9821}, name: "_", }, &labeledExpr{ - pos: position{line: 348, col: 26, offset: 9920}, + pos: position{line: 350, col: 26, offset: 9823}, label: "n", expr: &ruleRefExpr{ - pos: position{line: 348, col: 28, offset: 9922}, + pos: position{line: 350, col: 28, offset: 9825}, name: "UInt", }, }, @@ -2800,19 +2803,19 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 348, col: 53, offset: 9947}, + pos: position{line: 350, col: 53, offset: 9850}, label: "flush", expr: &zeroOrOneExpr{ - pos: position{line: 348, col: 59, offset: 9953}, + pos: position{line: 350, col: 59, offset: 9856}, expr: &seqExpr{ - pos: position{line: 348, col: 60, offset: 9954}, + pos: position{line: 350, col: 60, offset: 9857}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 348, col: 60, offset: 9954}, + pos: position{line: 350, col: 60, offset: 9857}, name: "_", }, &litMatcher{ - pos: position{line: 348, col: 62, offset: 9956}, + pos: position{line: 350, col: 62, offset: 9859}, val: "-flush", ignoreCase: false, want: "\"-flush\"", @@ -2822,25 +2825,25 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 348, col: 73, offset: 9967}, + pos: position{line: 350, col: 73, offset: 9870}, label: "fields", expr: &zeroOrOneExpr{ - pos: position{line: 348, col: 80, offset: 9974}, + pos: position{line: 350, col: 80, offset: 9877}, expr: &actionExpr{ - pos: position{line: 348, col: 81, offset: 9975}, + pos: position{line: 350, col: 81, offset: 9878}, run: (*parser).callonTopOp20, expr: &seqExpr{ - pos: position{line: 348, col: 81, offset: 9975}, + pos: position{line: 350, col: 81, offset: 9878}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 348, col: 81, offset: 9975}, + pos: position{line: 350, col: 81, offset: 9878}, name: "_", }, &labeledExpr{ - pos: position{line: 348, col: 83, offset: 9977}, + pos: position{line: 350, col: 83, offset: 9880}, label: "f", expr: &ruleRefExpr{ - pos: position{line: 348, col: 85, offset: 9979}, + pos: position{line: 350, col: 85, offset: 9882}, name: "FieldExprs", }, }, @@ -2855,28 +2858,28 @@ var g = &grammar{ }, { name: "CutOp", - pos: position{line: 362, col: 1, offset: 10314}, + pos: position{line: 364, col: 1, offset: 10217}, expr: &actionExpr{ - pos: position{line: 363, col: 5, offset: 10324}, + pos: position{line: 365, col: 5, offset: 10227}, run: (*parser).callonCutOp1, expr: &seqExpr{ - pos: position{line: 363, col: 5, offset: 10324}, + pos: position{line: 365, col: 5, offset: 10227}, exprs: []any{ &litMatcher{ - pos: position{line: 363, col: 5, offset: 10324}, + pos: position{line: 365, col: 5, offset: 10227}, val: "cut", ignoreCase: false, want: "\"cut\"", }, &ruleRefExpr{ - pos: position{line: 363, col: 11, offset: 10330}, + pos: position{line: 365, col: 11, offset: 10233}, name: "_", }, &labeledExpr{ - pos: position{line: 363, col: 13, offset: 10332}, + pos: position{line: 365, col: 13, offset: 10235}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 363, col: 18, offset: 10337}, + pos: position{line: 365, col: 18, offset: 10240}, name: "FlexAssignments", }, }, @@ -2886,28 +2889,28 @@ var g = &grammar{ }, { name: "DropOp", - pos: position{line: 367, col: 1, offset: 10432}, + pos: position{line: 369, col: 1, offset: 10335}, expr: &actionExpr{ - pos: position{line: 368, col: 5, offset: 10443}, + pos: position{line: 370, col: 5, offset: 10346}, run: (*parser).callonDropOp1, expr: &seqExpr{ - pos: position{line: 368, col: 5, offset: 10443}, + pos: position{line: 370, col: 5, offset: 10346}, exprs: []any{ &litMatcher{ - pos: position{line: 368, col: 5, offset: 10443}, + pos: position{line: 370, col: 5, offset: 10346}, val: "drop", ignoreCase: false, want: "\"drop\"", }, &ruleRefExpr{ - pos: position{line: 368, col: 12, offset: 10450}, + pos: position{line: 370, col: 12, offset: 10353}, name: "_", }, &labeledExpr{ - pos: position{line: 368, col: 14, offset: 10452}, + pos: position{line: 370, col: 14, offset: 10355}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 368, col: 19, offset: 10457}, + pos: position{line: 370, col: 19, offset: 10360}, name: "FieldExprs", }, }, @@ -2917,38 +2920,38 @@ var g = &grammar{ }, { name: "HeadOp", - pos: position{line: 372, col: 1, offset: 10548}, + pos: position{line: 374, col: 1, offset: 10451}, expr: &choiceExpr{ - pos: position{line: 373, col: 5, offset: 10559}, + pos: position{line: 375, col: 5, offset: 10462}, alternatives: []any{ &actionExpr{ - pos: position{line: 373, col: 5, offset: 10559}, + pos: position{line: 375, col: 5, offset: 10462}, run: (*parser).callonHeadOp2, expr: &seqExpr{ - pos: position{line: 373, col: 5, offset: 10559}, + pos: position{line: 375, col: 5, offset: 10462}, exprs: []any{ &litMatcher{ - pos: position{line: 373, col: 5, offset: 10559}, + pos: position{line: 375, col: 5, offset: 10462}, val: "head", ignoreCase: false, want: "\"head\"", }, &ruleRefExpr{ - pos: position{line: 373, col: 12, offset: 10566}, + pos: position{line: 375, col: 12, offset: 10469}, name: "_", }, ¬Expr{ - pos: position{line: 373, col: 14, offset: 10568}, + pos: position{line: 375, col: 14, offset: 10471}, expr: &ruleRefExpr{ - pos: position{line: 373, col: 15, offset: 10569}, + pos: position{line: 375, col: 15, offset: 10472}, name: "EndOfOp", }, }, &labeledExpr{ - pos: position{line: 373, col: 23, offset: 10577}, + pos: position{line: 375, col: 23, offset: 10480}, label: "count", expr: &ruleRefExpr{ - pos: position{line: 373, col: 29, offset: 10583}, + pos: position{line: 375, col: 29, offset: 10486}, name: "Expr", }, }, @@ -2956,10 +2959,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 374, col: 5, offset: 10663}, + pos: position{line: 376, col: 5, offset: 10566}, run: (*parser).callonHeadOp10, expr: &litMatcher{ - pos: position{line: 374, col: 5, offset: 10663}, + pos: position{line: 376, col: 5, offset: 10566}, val: "head", ignoreCase: false, want: "\"head\"", @@ -2970,38 +2973,38 @@ var g = &grammar{ }, { name: "TailOp", - pos: position{line: 376, col: 1, offset: 10810}, + pos: position{line: 378, col: 1, offset: 10713}, expr: &choiceExpr{ - pos: position{line: 377, col: 5, offset: 10821}, + pos: position{line: 379, col: 5, offset: 10724}, alternatives: []any{ &actionExpr{ - pos: position{line: 377, col: 5, offset: 10821}, + pos: position{line: 379, col: 5, offset: 10724}, run: (*parser).callonTailOp2, expr: &seqExpr{ - pos: position{line: 377, col: 5, offset: 10821}, + pos: position{line: 379, col: 5, offset: 10724}, exprs: []any{ &litMatcher{ - pos: position{line: 377, col: 5, offset: 10821}, + pos: position{line: 379, col: 5, offset: 10724}, val: "tail", ignoreCase: false, want: "\"tail\"", }, &ruleRefExpr{ - pos: position{line: 377, col: 12, offset: 10828}, + pos: position{line: 379, col: 12, offset: 10731}, name: "_", }, ¬Expr{ - pos: position{line: 377, col: 14, offset: 10830}, + pos: position{line: 379, col: 14, offset: 10733}, expr: &ruleRefExpr{ - pos: position{line: 377, col: 15, offset: 10831}, + pos: position{line: 379, col: 15, offset: 10734}, name: "EndOfOp", }, }, &labeledExpr{ - pos: position{line: 377, col: 23, offset: 10839}, + pos: position{line: 379, col: 23, offset: 10742}, label: "count", expr: &ruleRefExpr{ - pos: position{line: 377, col: 29, offset: 10845}, + pos: position{line: 379, col: 29, offset: 10748}, name: "Expr", }, }, @@ -3009,10 +3012,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 378, col: 5, offset: 10925}, + pos: position{line: 380, col: 5, offset: 10828}, run: (*parser).callonTailOp10, expr: &litMatcher{ - pos: position{line: 378, col: 5, offset: 10925}, + pos: position{line: 380, col: 5, offset: 10828}, val: "tail", ignoreCase: false, want: "\"tail\"", @@ -3023,28 +3026,28 @@ var g = &grammar{ }, { name: "WhereOp", - pos: position{line: 380, col: 1, offset: 11072}, + pos: position{line: 382, col: 1, offset: 10975}, expr: &actionExpr{ - pos: position{line: 381, col: 5, offset: 11084}, + pos: position{line: 383, col: 5, offset: 10987}, run: (*parser).callonWhereOp1, expr: &seqExpr{ - pos: position{line: 381, col: 5, offset: 11084}, + pos: position{line: 383, col: 5, offset: 10987}, exprs: []any{ &litMatcher{ - pos: position{line: 381, col: 5, offset: 11084}, + pos: position{line: 383, col: 5, offset: 10987}, val: "where", ignoreCase: false, want: "\"where\"", }, &ruleRefExpr{ - pos: position{line: 381, col: 13, offset: 11092}, + pos: position{line: 383, col: 13, offset: 10995}, name: "_", }, &labeledExpr{ - pos: position{line: 381, col: 15, offset: 11094}, + pos: position{line: 383, col: 15, offset: 10997}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 381, col: 20, offset: 11099}, + pos: position{line: 383, col: 20, offset: 11002}, name: "Expr", }, }, @@ -3054,28 +3057,28 @@ var g = &grammar{ }, { name: "UniqOp", - pos: position{line: 385, col: 1, offset: 11185}, + pos: position{line: 387, col: 1, offset: 11088}, expr: &choiceExpr{ - pos: position{line: 386, col: 5, offset: 11196}, + pos: position{line: 388, col: 5, offset: 11099}, alternatives: []any{ &actionExpr{ - pos: position{line: 386, col: 5, offset: 11196}, + pos: position{line: 388, col: 5, offset: 11099}, run: (*parser).callonUniqOp2, expr: &seqExpr{ - pos: position{line: 386, col: 5, offset: 11196}, + pos: position{line: 388, col: 5, offset: 11099}, exprs: []any{ &litMatcher{ - pos: position{line: 386, col: 5, offset: 11196}, + pos: position{line: 388, col: 5, offset: 11099}, val: "uniq", ignoreCase: false, want: "\"uniq\"", }, &ruleRefExpr{ - pos: position{line: 386, col: 12, offset: 11203}, + pos: position{line: 388, col: 12, offset: 11106}, name: "_", }, &litMatcher{ - pos: position{line: 386, col: 14, offset: 11205}, + pos: position{line: 388, col: 14, offset: 11108}, val: "-c", ignoreCase: false, want: "\"-c\"", @@ -3084,10 +3087,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 389, col: 5, offset: 11294}, + pos: position{line: 391, col: 5, offset: 11197}, run: (*parser).callonUniqOp7, expr: &litMatcher{ - pos: position{line: 389, col: 5, offset: 11294}, + pos: position{line: 391, col: 5, offset: 11197}, val: "uniq", ignoreCase: false, want: "\"uniq\"", @@ -3098,28 +3101,28 @@ var g = &grammar{ }, { name: "PutOp", - pos: position{line: 393, col: 1, offset: 11383}, + pos: position{line: 395, col: 1, offset: 11286}, expr: &actionExpr{ - pos: position{line: 394, col: 5, offset: 11393}, + pos: position{line: 396, col: 5, offset: 11296}, run: (*parser).callonPutOp1, expr: &seqExpr{ - pos: position{line: 394, col: 5, offset: 11393}, + pos: position{line: 396, col: 5, offset: 11296}, exprs: []any{ &litMatcher{ - pos: position{line: 394, col: 5, offset: 11393}, + pos: position{line: 396, col: 5, offset: 11296}, val: "put", ignoreCase: false, want: "\"put\"", }, &ruleRefExpr{ - pos: position{line: 394, col: 11, offset: 11399}, + pos: position{line: 396, col: 11, offset: 11302}, name: "_", }, &labeledExpr{ - pos: position{line: 394, col: 13, offset: 11401}, + pos: position{line: 396, col: 13, offset: 11304}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 394, col: 18, offset: 11406}, + pos: position{line: 396, col: 18, offset: 11309}, name: "Assignments", }, }, @@ -3129,61 +3132,61 @@ var g = &grammar{ }, { name: "RenameOp", - pos: position{line: 398, col: 1, offset: 11497}, + pos: position{line: 400, col: 1, offset: 11400}, expr: &actionExpr{ - pos: position{line: 399, col: 5, offset: 11510}, + pos: position{line: 401, col: 5, offset: 11413}, run: (*parser).callonRenameOp1, expr: &seqExpr{ - pos: position{line: 399, col: 5, offset: 11510}, + pos: position{line: 401, col: 5, offset: 11413}, exprs: []any{ &litMatcher{ - pos: position{line: 399, col: 5, offset: 11510}, + pos: position{line: 401, col: 5, offset: 11413}, val: "rename", ignoreCase: false, want: "\"rename\"", }, &ruleRefExpr{ - pos: position{line: 399, col: 14, offset: 11519}, + pos: position{line: 401, col: 14, offset: 11422}, name: "_", }, &labeledExpr{ - pos: position{line: 399, col: 16, offset: 11521}, + pos: position{line: 401, col: 16, offset: 11424}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 399, col: 22, offset: 11527}, + pos: position{line: 401, col: 22, offset: 11430}, name: "Assignment", }, }, &labeledExpr{ - pos: position{line: 399, col: 33, offset: 11538}, + pos: position{line: 401, col: 33, offset: 11441}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 399, col: 38, offset: 11543}, + pos: position{line: 401, col: 38, offset: 11446}, expr: &actionExpr{ - pos: position{line: 399, col: 39, offset: 11544}, + pos: position{line: 401, col: 39, offset: 11447}, run: (*parser).callonRenameOp9, expr: &seqExpr{ - pos: position{line: 399, col: 39, offset: 11544}, + pos: position{line: 401, col: 39, offset: 11447}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 399, col: 39, offset: 11544}, + pos: position{line: 401, col: 39, offset: 11447}, name: "__", }, &litMatcher{ - pos: position{line: 399, col: 42, offset: 11547}, + pos: position{line: 401, col: 42, offset: 11450}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 399, col: 46, offset: 11551}, + pos: position{line: 401, col: 46, offset: 11454}, name: "__", }, &labeledExpr{ - pos: position{line: 399, col: 49, offset: 11554}, + pos: position{line: 401, col: 49, offset: 11457}, label: "cl", expr: &ruleRefExpr{ - pos: position{line: 399, col: 52, offset: 11557}, + pos: position{line: 401, col: 52, offset: 11460}, name: "Assignment", }, }, @@ -3198,30 +3201,30 @@ var g = &grammar{ }, { name: "FuseOp", - pos: position{line: 407, col: 1, offset: 11964}, + pos: position{line: 409, col: 1, offset: 11867}, expr: &actionExpr{ - pos: position{line: 408, col: 5, offset: 11975}, + pos: position{line: 410, col: 5, offset: 11878}, run: (*parser).callonFuseOp1, expr: &seqExpr{ - pos: position{line: 408, col: 5, offset: 11975}, + pos: position{line: 410, col: 5, offset: 11878}, exprs: []any{ &litMatcher{ - pos: position{line: 408, col: 5, offset: 11975}, + pos: position{line: 410, col: 5, offset: 11878}, val: "fuse", ignoreCase: false, want: "\"fuse\"", }, ¬Expr{ - pos: position{line: 408, col: 12, offset: 11982}, + pos: position{line: 410, col: 12, offset: 11885}, expr: &seqExpr{ - pos: position{line: 408, col: 14, offset: 11984}, + pos: position{line: 410, col: 14, offset: 11887}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 408, col: 14, offset: 11984}, + pos: position{line: 410, col: 14, offset: 11887}, name: "__", }, &litMatcher{ - pos: position{line: 408, col: 17, offset: 11987}, + pos: position{line: 410, col: 17, offset: 11890}, val: "(", ignoreCase: false, want: "\"(\"", @@ -3230,9 +3233,9 @@ var g = &grammar{ }, }, &andExpr{ - pos: position{line: 408, col: 22, offset: 11992}, + pos: position{line: 410, col: 22, offset: 11895}, expr: &ruleRefExpr{ - pos: position{line: 408, col: 23, offset: 11993}, + pos: position{line: 410, col: 23, offset: 11896}, name: "EOKW", }, }, @@ -3242,30 +3245,30 @@ var g = &grammar{ }, { name: "ShapeOp", - pos: position{line: 412, col: 1, offset: 12064}, + pos: position{line: 414, col: 1, offset: 11967}, expr: &actionExpr{ - pos: position{line: 413, col: 5, offset: 12076}, + pos: position{line: 415, col: 5, offset: 11979}, run: (*parser).callonShapeOp1, expr: &seqExpr{ - pos: position{line: 413, col: 5, offset: 12076}, + pos: position{line: 415, col: 5, offset: 11979}, exprs: []any{ &litMatcher{ - pos: position{line: 413, col: 5, offset: 12076}, + pos: position{line: 415, col: 5, offset: 11979}, val: "shape", ignoreCase: false, want: "\"shape\"", }, ¬Expr{ - pos: position{line: 413, col: 13, offset: 12084}, + pos: position{line: 415, col: 13, offset: 11987}, expr: &seqExpr{ - pos: position{line: 413, col: 15, offset: 12086}, + pos: position{line: 415, col: 15, offset: 11989}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 413, col: 15, offset: 12086}, + pos: position{line: 415, col: 15, offset: 11989}, name: "__", }, &litMatcher{ - pos: position{line: 413, col: 18, offset: 12089}, + pos: position{line: 415, col: 18, offset: 11992}, val: "(", ignoreCase: false, want: "\"(\"", @@ -3274,9 +3277,9 @@ var g = &grammar{ }, }, &andExpr{ - pos: position{line: 413, col: 23, offset: 12094}, + pos: position{line: 415, col: 23, offset: 11997}, expr: &ruleRefExpr{ - pos: position{line: 413, col: 24, offset: 12095}, + pos: position{line: 415, col: 24, offset: 11998}, name: "EOKW", }, }, @@ -3286,75 +3289,75 @@ var g = &grammar{ }, { name: "JoinOp", - pos: position{line: 417, col: 1, offset: 12167}, + pos: position{line: 419, col: 1, offset: 12070}, expr: &actionExpr{ - pos: position{line: 418, col: 5, offset: 12178}, + pos: position{line: 420, col: 5, offset: 12081}, run: (*parser).callonJoinOp1, expr: &seqExpr{ - pos: position{line: 418, col: 5, offset: 12178}, + pos: position{line: 420, col: 5, offset: 12081}, exprs: []any{ &labeledExpr{ - pos: position{line: 418, col: 5, offset: 12178}, + pos: position{line: 420, col: 5, offset: 12081}, label: "style", expr: &ruleRefExpr{ - pos: position{line: 418, col: 11, offset: 12184}, + pos: position{line: 420, col: 11, offset: 12087}, name: "JoinStyle", }, }, &litMatcher{ - pos: position{line: 418, col: 21, offset: 12194}, + pos: position{line: 420, col: 21, offset: 12097}, val: "join", ignoreCase: false, want: "\"join\"", }, &labeledExpr{ - pos: position{line: 418, col: 28, offset: 12201}, + pos: position{line: 420, col: 28, offset: 12104}, label: "rightInput", expr: &ruleRefExpr{ - pos: position{line: 418, col: 39, offset: 12212}, + pos: position{line: 420, col: 39, offset: 12115}, name: "JoinRightInput", }, }, &ruleRefExpr{ - pos: position{line: 418, col: 54, offset: 12227}, + pos: position{line: 420, col: 54, offset: 12130}, name: "ON", }, &ruleRefExpr{ - pos: position{line: 418, col: 57, offset: 12230}, + pos: position{line: 420, col: 57, offset: 12133}, name: "_", }, &labeledExpr{ - pos: position{line: 418, col: 59, offset: 12232}, + pos: position{line: 420, col: 59, offset: 12135}, label: "key", expr: &ruleRefExpr{ - pos: position{line: 418, col: 63, offset: 12236}, + pos: position{line: 420, col: 63, offset: 12139}, name: "JoinKey", }, }, &labeledExpr{ - pos: position{line: 418, col: 71, offset: 12244}, + pos: position{line: 420, col: 71, offset: 12147}, label: "optKey", expr: &zeroOrOneExpr{ - pos: position{line: 418, col: 78, offset: 12251}, + pos: position{line: 420, col: 78, offset: 12154}, expr: &seqExpr{ - pos: position{line: 418, col: 79, offset: 12252}, + pos: position{line: 420, col: 79, offset: 12155}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 418, col: 79, offset: 12252}, + pos: position{line: 420, col: 79, offset: 12155}, name: "__", }, &litMatcher{ - pos: position{line: 418, col: 82, offset: 12255}, + pos: position{line: 420, col: 82, offset: 12158}, val: "=", ignoreCase: false, want: "\"=\"", }, &ruleRefExpr{ - pos: position{line: 418, col: 86, offset: 12259}, + pos: position{line: 420, col: 86, offset: 12162}, name: "__", }, &ruleRefExpr{ - pos: position{line: 418, col: 89, offset: 12262}, + pos: position{line: 420, col: 89, offset: 12165}, name: "JoinKey", }, }, @@ -3362,19 +3365,19 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 418, col: 99, offset: 12272}, + pos: position{line: 420, col: 99, offset: 12175}, label: "optArgs", expr: &zeroOrOneExpr{ - pos: position{line: 418, col: 107, offset: 12280}, + pos: position{line: 420, col: 107, offset: 12183}, expr: &seqExpr{ - pos: position{line: 418, col: 108, offset: 12281}, + pos: position{line: 420, col: 108, offset: 12184}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 418, col: 108, offset: 12281}, + pos: position{line: 420, col: 108, offset: 12184}, name: "_", }, &ruleRefExpr{ - pos: position{line: 418, col: 110, offset: 12283}, + pos: position{line: 420, col: 110, offset: 12186}, name: "FlexAssignments", }, }, @@ -3387,91 +3390,91 @@ var g = &grammar{ }, { name: "JoinStyle", - pos: position{line: 429, col: 1, offset: 12639}, + pos: position{line: 431, col: 1, offset: 12542}, expr: &choiceExpr{ - pos: position{line: 430, col: 5, offset: 12653}, + pos: position{line: 432, col: 5, offset: 12556}, alternatives: []any{ &actionExpr{ - pos: position{line: 430, col: 5, offset: 12653}, + pos: position{line: 432, col: 5, offset: 12556}, run: (*parser).callonJoinStyle2, expr: &seqExpr{ - pos: position{line: 430, col: 5, offset: 12653}, + pos: position{line: 432, col: 5, offset: 12556}, exprs: []any{ &litMatcher{ - pos: position{line: 430, col: 5, offset: 12653}, + pos: position{line: 432, col: 5, offset: 12556}, val: "anti", ignoreCase: false, want: "\"anti\"", }, &ruleRefExpr{ - pos: position{line: 430, col: 12, offset: 12660}, + pos: position{line: 432, col: 12, offset: 12563}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 431, col: 5, offset: 12690}, + pos: position{line: 433, col: 5, offset: 12593}, run: (*parser).callonJoinStyle6, expr: &seqExpr{ - pos: position{line: 431, col: 5, offset: 12690}, + pos: position{line: 433, col: 5, offset: 12593}, exprs: []any{ &litMatcher{ - pos: position{line: 431, col: 5, offset: 12690}, + pos: position{line: 433, col: 5, offset: 12593}, val: "inner", ignoreCase: false, want: "\"inner\"", }, &ruleRefExpr{ - pos: position{line: 431, col: 13, offset: 12698}, + pos: position{line: 433, col: 13, offset: 12601}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 432, col: 5, offset: 12728}, + pos: position{line: 434, col: 5, offset: 12631}, run: (*parser).callonJoinStyle10, expr: &seqExpr{ - pos: position{line: 432, col: 5, offset: 12728}, + pos: position{line: 434, col: 5, offset: 12631}, exprs: []any{ &litMatcher{ - pos: position{line: 432, col: 5, offset: 12728}, + pos: position{line: 434, col: 5, offset: 12631}, val: "left", ignoreCase: false, want: "\"left\"", }, &ruleRefExpr{ - pos: position{line: 432, col: 13, offset: 12736}, + pos: position{line: 434, col: 13, offset: 12639}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 433, col: 5, offset: 12765}, + pos: position{line: 435, col: 5, offset: 12668}, run: (*parser).callonJoinStyle14, expr: &seqExpr{ - pos: position{line: 433, col: 5, offset: 12765}, + pos: position{line: 435, col: 5, offset: 12668}, exprs: []any{ &litMatcher{ - pos: position{line: 433, col: 5, offset: 12765}, + pos: position{line: 435, col: 5, offset: 12668}, val: "right", ignoreCase: false, want: "\"right\"", }, &ruleRefExpr{ - pos: position{line: 433, col: 13, offset: 12773}, + pos: position{line: 435, col: 13, offset: 12676}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 434, col: 5, offset: 12803}, + pos: position{line: 436, col: 5, offset: 12706}, run: (*parser).callonJoinStyle18, expr: &litMatcher{ - pos: position{line: 434, col: 5, offset: 12803}, + pos: position{line: 436, col: 5, offset: 12706}, val: "", ignoreCase: false, want: "\"\"", @@ -3482,60 +3485,60 @@ var g = &grammar{ }, { name: "JoinRightInput", - pos: position{line: 436, col: 1, offset: 12838}, + pos: position{line: 438, col: 1, offset: 12741}, expr: &choiceExpr{ - pos: position{line: 437, col: 5, offset: 12857}, + pos: position{line: 439, col: 5, offset: 12760}, alternatives: []any{ &actionExpr{ - pos: position{line: 437, col: 5, offset: 12857}, + pos: position{line: 439, col: 5, offset: 12760}, run: (*parser).callonJoinRightInput2, expr: &seqExpr{ - pos: position{line: 437, col: 5, offset: 12857}, + pos: position{line: 439, col: 5, offset: 12760}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 437, col: 5, offset: 12857}, + pos: position{line: 439, col: 5, offset: 12760}, name: "__", }, &litMatcher{ - pos: position{line: 437, col: 8, offset: 12860}, + pos: position{line: 439, col: 8, offset: 12763}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 437, col: 12, offset: 12864}, + pos: position{line: 439, col: 12, offset: 12767}, name: "__", }, &labeledExpr{ - pos: position{line: 437, col: 15, offset: 12867}, + pos: position{line: 439, col: 15, offset: 12770}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 437, col: 17, offset: 12869}, + pos: position{line: 439, col: 17, offset: 12772}, name: "Seq", }, }, &ruleRefExpr{ - pos: position{line: 437, col: 21, offset: 12873}, + pos: position{line: 439, col: 21, offset: 12776}, name: "__", }, &litMatcher{ - pos: position{line: 437, col: 24, offset: 12876}, + pos: position{line: 439, col: 24, offset: 12779}, val: ")", ignoreCase: false, want: "\")\"", }, &ruleRefExpr{ - pos: position{line: 437, col: 28, offset: 12880}, + pos: position{line: 439, col: 28, offset: 12783}, name: "__", }, }, }, }, &actionExpr{ - pos: position{line: 438, col: 5, offset: 12905}, + pos: position{line: 440, col: 5, offset: 12808}, run: (*parser).callonJoinRightInput12, expr: &ruleRefExpr{ - pos: position{line: 438, col: 5, offset: 12905}, + pos: position{line: 440, col: 5, offset: 12808}, name: "_", }, }, @@ -3544,36 +3547,36 @@ var g = &grammar{ }, { name: "JoinKey", - pos: position{line: 440, col: 1, offset: 12928}, + pos: position{line: 442, col: 1, offset: 12831}, expr: &choiceExpr{ - pos: position{line: 441, col: 5, offset: 12940}, + pos: position{line: 443, col: 5, offset: 12843}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 441, col: 5, offset: 12940}, + pos: position{line: 443, col: 5, offset: 12843}, name: "Lval", }, &actionExpr{ - pos: position{line: 442, col: 5, offset: 12949}, + pos: position{line: 444, col: 5, offset: 12852}, run: (*parser).callonJoinKey3, expr: &seqExpr{ - pos: position{line: 442, col: 5, offset: 12949}, + pos: position{line: 444, col: 5, offset: 12852}, exprs: []any{ &litMatcher{ - pos: position{line: 442, col: 5, offset: 12949}, + pos: position{line: 444, col: 5, offset: 12852}, val: "(", ignoreCase: false, want: "\"(\"", }, &labeledExpr{ - pos: position{line: 442, col: 9, offset: 12953}, + pos: position{line: 444, col: 9, offset: 12856}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 442, col: 14, offset: 12958}, + pos: position{line: 444, col: 14, offset: 12861}, name: "Expr", }, }, &litMatcher{ - pos: position{line: 442, col: 19, offset: 12963}, + pos: position{line: 444, col: 19, offset: 12866}, val: ")", ignoreCase: false, want: "\")\"", @@ -3586,31 +3589,31 @@ var g = &grammar{ }, { name: "SampleOp", - pos: position{line: 444, col: 1, offset: 12989}, + pos: position{line: 446, col: 1, offset: 12892}, expr: &actionExpr{ - pos: position{line: 445, col: 5, offset: 13002}, + pos: position{line: 447, col: 5, offset: 12905}, run: (*parser).callonSampleOp1, expr: &seqExpr{ - pos: position{line: 445, col: 5, offset: 13002}, + pos: position{line: 447, col: 5, offset: 12905}, exprs: []any{ &litMatcher{ - pos: position{line: 445, col: 5, offset: 13002}, + pos: position{line: 447, col: 5, offset: 12905}, val: "sample", ignoreCase: false, want: "\"sample\"", }, &andExpr{ - pos: position{line: 445, col: 14, offset: 13011}, + pos: position{line: 447, col: 14, offset: 12914}, expr: &ruleRefExpr{ - pos: position{line: 445, col: 15, offset: 13012}, + pos: position{line: 447, col: 15, offset: 12915}, name: "EOKW", }, }, &labeledExpr{ - pos: position{line: 445, col: 20, offset: 13017}, + pos: position{line: 447, col: 20, offset: 12920}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 445, col: 22, offset: 13019}, + pos: position{line: 447, col: 22, offset: 12922}, name: "SampleExpr", }, }, @@ -3620,15 +3623,15 @@ var g = &grammar{ }, { name: "OpAssignment", - pos: position{line: 452, col: 1, offset: 13367}, + pos: position{line: 454, col: 1, offset: 13270}, expr: &actionExpr{ - pos: position{line: 453, col: 5, offset: 13384}, + pos: position{line: 455, col: 5, offset: 13287}, run: (*parser).callonOpAssignment1, expr: &labeledExpr{ - pos: position{line: 453, col: 5, offset: 13384}, + pos: position{line: 455, col: 5, offset: 13287}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 453, col: 7, offset: 13386}, + pos: position{line: 455, col: 7, offset: 13289}, name: "Assignments", }, }, @@ -3636,25 +3639,25 @@ var g = &grammar{ }, { name: "SampleExpr", - pos: position{line: 457, col: 1, offset: 13486}, + pos: position{line: 459, col: 1, offset: 13389}, expr: &choiceExpr{ - pos: position{line: 458, col: 5, offset: 13501}, + pos: position{line: 460, col: 5, offset: 13404}, alternatives: []any{ &actionExpr{ - pos: position{line: 458, col: 5, offset: 13501}, + pos: position{line: 460, col: 5, offset: 13404}, run: (*parser).callonSampleExpr2, expr: &seqExpr{ - pos: position{line: 458, col: 5, offset: 13501}, + pos: position{line: 460, col: 5, offset: 13404}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 458, col: 5, offset: 13501}, + pos: position{line: 460, col: 5, offset: 13404}, name: "_", }, &labeledExpr{ - pos: position{line: 458, col: 7, offset: 13503}, + pos: position{line: 460, col: 7, offset: 13406}, label: "lval", expr: &ruleRefExpr{ - pos: position{line: 458, col: 12, offset: 13508}, + pos: position{line: 460, col: 12, offset: 13411}, name: "Lval", }, }, @@ -3662,10 +3665,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 459, col: 5, offset: 13538}, + pos: position{line: 461, col: 5, offset: 13441}, run: (*parser).callonSampleExpr7, expr: &litMatcher{ - pos: position{line: 459, col: 5, offset: 13538}, + pos: position{line: 461, col: 5, offset: 13441}, val: "", ignoreCase: false, want: "\"\"", @@ -3676,71 +3679,71 @@ var g = &grammar{ }, { name: "LoadOp", - pos: position{line: 461, col: 1, offset: 13611}, + pos: position{line: 463, col: 1, offset: 13514}, expr: &actionExpr{ - pos: position{line: 462, col: 5, offset: 13622}, + pos: position{line: 464, col: 5, offset: 13525}, run: (*parser).callonLoadOp1, expr: &seqExpr{ - pos: position{line: 462, col: 5, offset: 13622}, + pos: position{line: 464, col: 5, offset: 13525}, exprs: []any{ &litMatcher{ - pos: position{line: 462, col: 5, offset: 13622}, + pos: position{line: 464, col: 5, offset: 13525}, val: "load", ignoreCase: false, want: "\"load\"", }, &ruleRefExpr{ - pos: position{line: 462, col: 12, offset: 13629}, + pos: position{line: 464, col: 12, offset: 13532}, name: "_", }, &labeledExpr{ - pos: position{line: 462, col: 14, offset: 13631}, + pos: position{line: 464, col: 14, offset: 13534}, label: "pool", expr: &ruleRefExpr{ - pos: position{line: 462, col: 19, offset: 13636}, + pos: position{line: 464, col: 19, offset: 13539}, name: "PoolNameString", }, }, &labeledExpr{ - pos: position{line: 462, col: 34, offset: 13651}, + pos: position{line: 464, col: 34, offset: 13554}, label: "branch", expr: &zeroOrOneExpr{ - pos: position{line: 462, col: 41, offset: 13658}, + pos: position{line: 464, col: 41, offset: 13561}, expr: &ruleRefExpr{ - pos: position{line: 462, col: 41, offset: 13658}, + pos: position{line: 464, col: 41, offset: 13561}, name: "PoolBranch", }, }, }, &labeledExpr{ - pos: position{line: 462, col: 53, offset: 13670}, + pos: position{line: 464, col: 53, offset: 13573}, label: "author", expr: &zeroOrOneExpr{ - pos: position{line: 462, col: 60, offset: 13677}, + pos: position{line: 464, col: 60, offset: 13580}, expr: &ruleRefExpr{ - pos: position{line: 462, col: 60, offset: 13677}, + pos: position{line: 464, col: 60, offset: 13580}, name: "AuthorArg", }, }, }, &labeledExpr{ - pos: position{line: 462, col: 71, offset: 13688}, + pos: position{line: 464, col: 71, offset: 13591}, label: "message", expr: &zeroOrOneExpr{ - pos: position{line: 462, col: 79, offset: 13696}, + pos: position{line: 464, col: 79, offset: 13599}, expr: &ruleRefExpr{ - pos: position{line: 462, col: 79, offset: 13696}, + pos: position{line: 464, col: 79, offset: 13599}, name: "MessageArg", }, }, }, &labeledExpr{ - pos: position{line: 462, col: 91, offset: 13708}, + pos: position{line: 464, col: 91, offset: 13611}, label: "meta", expr: &zeroOrOneExpr{ - pos: position{line: 462, col: 96, offset: 13713}, + pos: position{line: 464, col: 96, offset: 13616}, expr: &ruleRefExpr{ - pos: position{line: 462, col: 96, offset: 13713}, + pos: position{line: 464, col: 96, offset: 13616}, name: "MetaArg", }, }, @@ -3751,32 +3754,32 @@ var g = &grammar{ }, { name: "AuthorArg", - pos: position{line: 466, col: 1, offset: 13872}, + pos: position{line: 468, col: 1, offset: 13775}, expr: &actionExpr{ - pos: position{line: 467, col: 5, offset: 13886}, + pos: position{line: 469, col: 5, offset: 13789}, run: (*parser).callonAuthorArg1, expr: &seqExpr{ - pos: position{line: 467, col: 5, offset: 13886}, + pos: position{line: 469, col: 5, offset: 13789}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 467, col: 5, offset: 13886}, + pos: position{line: 469, col: 5, offset: 13789}, name: "_", }, &litMatcher{ - pos: position{line: 467, col: 7, offset: 13888}, + pos: position{line: 469, col: 7, offset: 13791}, val: "author", ignoreCase: false, want: "\"author\"", }, &ruleRefExpr{ - pos: position{line: 467, col: 16, offset: 13897}, + pos: position{line: 469, col: 16, offset: 13800}, name: "_", }, &labeledExpr{ - pos: position{line: 467, col: 18, offset: 13899}, + pos: position{line: 469, col: 18, offset: 13802}, label: "val", expr: &ruleRefExpr{ - pos: position{line: 467, col: 22, offset: 13903}, + pos: position{line: 469, col: 22, offset: 13806}, name: "QuotedString", }, }, @@ -3786,32 +3789,32 @@ var g = &grammar{ }, { name: "MessageArg", - pos: position{line: 469, col: 1, offset: 13937}, + pos: position{line: 471, col: 1, offset: 13840}, expr: &actionExpr{ - pos: position{line: 470, col: 5, offset: 13952}, + pos: position{line: 472, col: 5, offset: 13855}, run: (*parser).callonMessageArg1, expr: &seqExpr{ - pos: position{line: 470, col: 5, offset: 13952}, + pos: position{line: 472, col: 5, offset: 13855}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 470, col: 5, offset: 13952}, + pos: position{line: 472, col: 5, offset: 13855}, name: "_", }, &litMatcher{ - pos: position{line: 470, col: 7, offset: 13954}, + pos: position{line: 472, col: 7, offset: 13857}, val: "message", ignoreCase: false, want: "\"message\"", }, &ruleRefExpr{ - pos: position{line: 470, col: 17, offset: 13964}, + pos: position{line: 472, col: 17, offset: 13867}, name: "_", }, &labeledExpr{ - pos: position{line: 470, col: 19, offset: 13966}, + pos: position{line: 472, col: 19, offset: 13869}, label: "val", expr: &ruleRefExpr{ - pos: position{line: 470, col: 23, offset: 13970}, + pos: position{line: 472, col: 23, offset: 13873}, name: "QuotedString", }, }, @@ -3821,32 +3824,32 @@ var g = &grammar{ }, { name: "MetaArg", - pos: position{line: 472, col: 1, offset: 14004}, + pos: position{line: 474, col: 1, offset: 13907}, expr: &actionExpr{ - pos: position{line: 473, col: 5, offset: 14016}, + pos: position{line: 475, col: 5, offset: 13919}, run: (*parser).callonMetaArg1, expr: &seqExpr{ - pos: position{line: 473, col: 5, offset: 14016}, + pos: position{line: 475, col: 5, offset: 13919}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 473, col: 5, offset: 14016}, + pos: position{line: 475, col: 5, offset: 13919}, name: "_", }, &litMatcher{ - pos: position{line: 473, col: 7, offset: 14018}, + pos: position{line: 475, col: 7, offset: 13921}, val: "meta", ignoreCase: false, want: "\"meta\"", }, &ruleRefExpr{ - pos: position{line: 473, col: 14, offset: 14025}, + pos: position{line: 475, col: 14, offset: 13928}, name: "_", }, &labeledExpr{ - pos: position{line: 473, col: 16, offset: 14027}, + pos: position{line: 475, col: 16, offset: 13930}, label: "val", expr: &ruleRefExpr{ - pos: position{line: 473, col: 20, offset: 14031}, + pos: position{line: 475, col: 20, offset: 13934}, name: "QuotedString", }, }, @@ -3856,31 +3859,31 @@ var g = &grammar{ }, { name: "PoolBranch", - pos: position{line: 475, col: 1, offset: 14065}, + pos: position{line: 477, col: 1, offset: 13968}, expr: &actionExpr{ - pos: position{line: 476, col: 5, offset: 14080}, + pos: position{line: 478, col: 5, offset: 13983}, run: (*parser).callonPoolBranch1, expr: &seqExpr{ - pos: position{line: 476, col: 5, offset: 14080}, + pos: position{line: 478, col: 5, offset: 13983}, exprs: []any{ &litMatcher{ - pos: position{line: 476, col: 5, offset: 14080}, + pos: position{line: 478, col: 5, offset: 13983}, val: "@", ignoreCase: false, want: "\"@\"", }, &labeledExpr{ - pos: position{line: 476, col: 9, offset: 14084}, + pos: position{line: 478, col: 9, offset: 13987}, label: "branch", expr: &choiceExpr{ - pos: position{line: 476, col: 17, offset: 14092}, + pos: position{line: 478, col: 17, offset: 13995}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 476, col: 17, offset: 14092}, + pos: position{line: 478, col: 17, offset: 13995}, name: "PoolIdentifier", }, &ruleRefExpr{ - pos: position{line: 476, col: 34, offset: 14109}, + pos: position{line: 478, col: 34, offset: 14012}, name: "QuotedString", }, }, @@ -3892,15 +3895,15 @@ var g = &grammar{ }, { name: "FromOp", - pos: position{line: 478, col: 1, offset: 14147}, + pos: position{line: 480, col: 1, offset: 14050}, expr: &actionExpr{ - pos: position{line: 479, col: 5, offset: 14158}, + pos: position{line: 481, col: 5, offset: 14061}, run: (*parser).callonFromOp1, expr: &labeledExpr{ - pos: position{line: 479, col: 5, offset: 14158}, + pos: position{line: 481, col: 5, offset: 14061}, label: "source", expr: &ruleRefExpr{ - pos: position{line: 479, col: 12, offset: 14165}, + pos: position{line: 481, col: 12, offset: 14068}, name: "FromAny", }, }, @@ -3908,20 +3911,20 @@ var g = &grammar{ }, { name: "FromAny", - pos: position{line: 483, col: 1, offset: 14323}, + pos: position{line: 485, col: 1, offset: 14226}, expr: &choiceExpr{ - pos: position{line: 484, col: 5, offset: 14335}, + pos: position{line: 486, col: 5, offset: 14238}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 484, col: 5, offset: 14335}, + pos: position{line: 486, col: 5, offset: 14238}, name: "File", }, &ruleRefExpr{ - pos: position{line: 485, col: 5, offset: 14344}, + pos: position{line: 487, col: 5, offset: 14247}, name: "Get", }, &ruleRefExpr{ - pos: position{line: 486, col: 5, offset: 14352}, + pos: position{line: 488, col: 5, offset: 14255}, name: "From", }, }, @@ -3929,49 +3932,49 @@ var g = &grammar{ }, { name: "File", - pos: position{line: 488, col: 1, offset: 14358}, + pos: position{line: 490, col: 1, offset: 14261}, expr: &actionExpr{ - pos: position{line: 489, col: 5, offset: 14367}, + pos: position{line: 491, col: 5, offset: 14270}, run: (*parser).callonFile1, expr: &seqExpr{ - pos: position{line: 489, col: 5, offset: 14367}, + pos: position{line: 491, col: 5, offset: 14270}, exprs: []any{ &litMatcher{ - pos: position{line: 489, col: 5, offset: 14367}, + pos: position{line: 491, col: 5, offset: 14270}, val: "file", ignoreCase: false, want: "\"file\"", }, &ruleRefExpr{ - pos: position{line: 489, col: 12, offset: 14374}, + pos: position{line: 491, col: 12, offset: 14277}, name: "_", }, &labeledExpr{ - pos: position{line: 489, col: 14, offset: 14376}, + pos: position{line: 491, col: 14, offset: 14279}, label: "path", expr: &ruleRefExpr{ - pos: position{line: 489, col: 19, offset: 14381}, + pos: position{line: 491, col: 19, offset: 14284}, name: "Path", }, }, &labeledExpr{ - pos: position{line: 489, col: 24, offset: 14386}, + pos: position{line: 491, col: 24, offset: 14289}, label: "format", expr: &zeroOrOneExpr{ - pos: position{line: 489, col: 31, offset: 14393}, + pos: position{line: 491, col: 31, offset: 14296}, expr: &ruleRefExpr{ - pos: position{line: 489, col: 31, offset: 14393}, + pos: position{line: 491, col: 31, offset: 14296}, name: "FormatArg", }, }, }, &labeledExpr{ - pos: position{line: 489, col: 42, offset: 14404}, + pos: position{line: 491, col: 42, offset: 14307}, label: "sort_key", expr: &zeroOrOneExpr{ - pos: position{line: 489, col: 51, offset: 14413}, + pos: position{line: 491, col: 51, offset: 14316}, expr: &ruleRefExpr{ - pos: position{line: 489, col: 51, offset: 14413}, + pos: position{line: 491, col: 51, offset: 14316}, name: "SortKeyArg", }, }, @@ -3982,28 +3985,28 @@ var g = &grammar{ }, { name: "From", - pos: position{line: 493, col: 1, offset: 14545}, + pos: position{line: 495, col: 1, offset: 14448}, expr: &actionExpr{ - pos: position{line: 494, col: 5, offset: 14554}, + pos: position{line: 496, col: 5, offset: 14457}, run: (*parser).callonFrom1, expr: &seqExpr{ - pos: position{line: 494, col: 5, offset: 14554}, + pos: position{line: 496, col: 5, offset: 14457}, exprs: []any{ &litMatcher{ - pos: position{line: 494, col: 5, offset: 14554}, + pos: position{line: 496, col: 5, offset: 14457}, val: "from", ignoreCase: false, want: "\"from\"", }, &ruleRefExpr{ - pos: position{line: 494, col: 12, offset: 14561}, + pos: position{line: 496, col: 12, offset: 14464}, name: "_", }, &labeledExpr{ - pos: position{line: 494, col: 14, offset: 14563}, + pos: position{line: 496, col: 14, offset: 14466}, label: "body", expr: &ruleRefExpr{ - pos: position{line: 494, col: 19, offset: 14568}, + pos: position{line: 496, col: 19, offset: 14471}, name: "PoolBody", }, }, @@ -4013,28 +4016,28 @@ var g = &grammar{ }, { name: "Pool", - pos: position{line: 496, col: 1, offset: 14599}, + pos: position{line: 498, col: 1, offset: 14502}, expr: &actionExpr{ - pos: position{line: 497, col: 5, offset: 14608}, + pos: position{line: 499, col: 5, offset: 14511}, run: (*parser).callonPool1, expr: &seqExpr{ - pos: position{line: 497, col: 5, offset: 14608}, + pos: position{line: 499, col: 5, offset: 14511}, exprs: []any{ &litMatcher{ - pos: position{line: 497, col: 5, offset: 14608}, + pos: position{line: 499, col: 5, offset: 14511}, val: "pool", ignoreCase: false, want: "\"pool\"", }, &ruleRefExpr{ - pos: position{line: 497, col: 12, offset: 14615}, + pos: position{line: 499, col: 12, offset: 14518}, name: "_", }, &labeledExpr{ - pos: position{line: 497, col: 14, offset: 14617}, + pos: position{line: 499, col: 14, offset: 14520}, label: "body", expr: &ruleRefExpr{ - pos: position{line: 497, col: 19, offset: 14622}, + pos: position{line: 499, col: 19, offset: 14525}, name: "PoolBody", }, }, @@ -4044,28 +4047,28 @@ var g = &grammar{ }, { name: "PoolBody", - pos: position{line: 499, col: 1, offset: 14653}, + pos: position{line: 501, col: 1, offset: 14556}, expr: &actionExpr{ - pos: position{line: 500, col: 5, offset: 14666}, + pos: position{line: 502, col: 5, offset: 14569}, run: (*parser).callonPoolBody1, expr: &seqExpr{ - pos: position{line: 500, col: 5, offset: 14666}, + pos: position{line: 502, col: 5, offset: 14569}, exprs: []any{ &labeledExpr{ - pos: position{line: 500, col: 5, offset: 14666}, + pos: position{line: 502, col: 5, offset: 14569}, label: "spec", expr: &ruleRefExpr{ - pos: position{line: 500, col: 10, offset: 14671}, + pos: position{line: 502, col: 10, offset: 14574}, name: "PoolSpec", }, }, &labeledExpr{ - pos: position{line: 500, col: 19, offset: 14680}, + pos: position{line: 502, col: 19, offset: 14583}, label: "at", expr: &zeroOrOneExpr{ - pos: position{line: 500, col: 22, offset: 14683}, + pos: position{line: 502, col: 22, offset: 14586}, expr: &ruleRefExpr{ - pos: position{line: 500, col: 22, offset: 14683}, + pos: position{line: 502, col: 22, offset: 14586}, name: "PoolAt", }, }, @@ -4076,82 +4079,82 @@ var g = &grammar{ }, { name: "Get", - pos: position{line: 504, col: 1, offset: 14781}, + pos: position{line: 506, col: 1, offset: 14684}, expr: &actionExpr{ - pos: position{line: 505, col: 5, offset: 14789}, + pos: position{line: 507, col: 5, offset: 14692}, run: (*parser).callonGet1, expr: &seqExpr{ - pos: position{line: 505, col: 5, offset: 14789}, + pos: position{line: 507, col: 5, offset: 14692}, exprs: []any{ &litMatcher{ - pos: position{line: 505, col: 5, offset: 14789}, + pos: position{line: 507, col: 5, offset: 14692}, val: "get", ignoreCase: false, want: "\"get\"", }, &ruleRefExpr{ - pos: position{line: 505, col: 11, offset: 14795}, + pos: position{line: 507, col: 11, offset: 14698}, name: "_", }, &labeledExpr{ - pos: position{line: 505, col: 13, offset: 14797}, + pos: position{line: 507, col: 13, offset: 14700}, label: "url", expr: &ruleRefExpr{ - pos: position{line: 505, col: 17, offset: 14801}, + pos: position{line: 507, col: 17, offset: 14704}, name: "Path", }, }, &labeledExpr{ - pos: position{line: 505, col: 22, offset: 14806}, + pos: position{line: 507, col: 22, offset: 14709}, label: "format", expr: &zeroOrOneExpr{ - pos: position{line: 505, col: 29, offset: 14813}, + pos: position{line: 507, col: 29, offset: 14716}, expr: &ruleRefExpr{ - pos: position{line: 505, col: 29, offset: 14813}, + pos: position{line: 507, col: 29, offset: 14716}, name: "FormatArg", }, }, }, &labeledExpr{ - pos: position{line: 505, col: 40, offset: 14824}, + pos: position{line: 507, col: 40, offset: 14727}, label: "sort_key", expr: &zeroOrOneExpr{ - pos: position{line: 505, col: 49, offset: 14833}, + pos: position{line: 507, col: 49, offset: 14736}, expr: &ruleRefExpr{ - pos: position{line: 505, col: 49, offset: 14833}, + pos: position{line: 507, col: 49, offset: 14736}, name: "SortKeyArg", }, }, }, &labeledExpr{ - pos: position{line: 505, col: 61, offset: 14845}, + pos: position{line: 507, col: 61, offset: 14748}, label: "method", expr: &zeroOrOneExpr{ - pos: position{line: 505, col: 68, offset: 14852}, + pos: position{line: 507, col: 68, offset: 14755}, expr: &ruleRefExpr{ - pos: position{line: 505, col: 68, offset: 14852}, + pos: position{line: 507, col: 68, offset: 14755}, name: "MethodArg", }, }, }, &labeledExpr{ - pos: position{line: 505, col: 79, offset: 14863}, + pos: position{line: 507, col: 79, offset: 14766}, label: "headers", expr: &zeroOrOneExpr{ - pos: position{line: 505, col: 87, offset: 14871}, + pos: position{line: 507, col: 87, offset: 14774}, expr: &ruleRefExpr{ - pos: position{line: 505, col: 87, offset: 14871}, + pos: position{line: 507, col: 87, offset: 14774}, name: "HeadersArg", }, }, }, &labeledExpr{ - pos: position{line: 505, col: 99, offset: 14883}, + pos: position{line: 507, col: 99, offset: 14786}, label: "body", expr: &zeroOrOneExpr{ - pos: position{line: 505, col: 104, offset: 14888}, + pos: position{line: 507, col: 104, offset: 14791}, expr: &ruleRefExpr{ - pos: position{line: 505, col: 104, offset: 14888}, + pos: position{line: 507, col: 104, offset: 14791}, name: "BodyArg", }, }, @@ -4162,39 +4165,39 @@ var g = &grammar{ }, { name: "MethodArg", - pos: position{line: 524, col: 1, offset: 15178}, + pos: position{line: 526, col: 1, offset: 15081}, expr: &actionExpr{ - pos: position{line: 524, col: 13, offset: 15190}, + pos: position{line: 526, col: 13, offset: 15093}, run: (*parser).callonMethodArg1, expr: &seqExpr{ - pos: position{line: 524, col: 13, offset: 15190}, + pos: position{line: 526, col: 13, offset: 15093}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 524, col: 13, offset: 15190}, + pos: position{line: 526, col: 13, offset: 15093}, name: "_", }, &litMatcher{ - pos: position{line: 524, col: 15, offset: 15192}, + pos: position{line: 526, col: 15, offset: 15095}, val: "method", ignoreCase: false, want: "\"method\"", }, &ruleRefExpr{ - pos: position{line: 524, col: 24, offset: 15201}, + pos: position{line: 526, col: 24, offset: 15104}, name: "_", }, &labeledExpr{ - pos: position{line: 524, col: 26, offset: 15203}, + pos: position{line: 526, col: 26, offset: 15106}, label: "v", expr: &choiceExpr{ - pos: position{line: 524, col: 29, offset: 15206}, + pos: position{line: 526, col: 29, offset: 15109}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 524, col: 29, offset: 15206}, + pos: position{line: 526, col: 29, offset: 15109}, name: "IdentifierName", }, &ruleRefExpr{ - pos: position{line: 524, col: 46, offset: 15223}, + pos: position{line: 526, col: 46, offset: 15126}, name: "QuotedString", }, }, @@ -4206,32 +4209,32 @@ var g = &grammar{ }, { name: "HeadersArg", - pos: position{line: 526, col: 1, offset: 15256}, + pos: position{line: 528, col: 1, offset: 15159}, expr: &actionExpr{ - pos: position{line: 526, col: 14, offset: 15269}, + pos: position{line: 528, col: 14, offset: 15172}, run: (*parser).callonHeadersArg1, expr: &seqExpr{ - pos: position{line: 526, col: 14, offset: 15269}, + pos: position{line: 528, col: 14, offset: 15172}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 526, col: 14, offset: 15269}, + pos: position{line: 528, col: 14, offset: 15172}, name: "_", }, &litMatcher{ - pos: position{line: 526, col: 16, offset: 15271}, + pos: position{line: 528, col: 16, offset: 15174}, val: "headers", ignoreCase: false, want: "\"headers\"", }, &ruleRefExpr{ - pos: position{line: 526, col: 26, offset: 15281}, + pos: position{line: 528, col: 26, offset: 15184}, name: "_", }, &labeledExpr{ - pos: position{line: 526, col: 28, offset: 15283}, + pos: position{line: 528, col: 28, offset: 15186}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 526, col: 30, offset: 15285}, + pos: position{line: 528, col: 30, offset: 15188}, name: "Record", }, }, @@ -4241,39 +4244,39 @@ var g = &grammar{ }, { name: "BodyArg", - pos: position{line: 528, col: 1, offset: 15311}, + pos: position{line: 530, col: 1, offset: 15214}, expr: &actionExpr{ - pos: position{line: 528, col: 11, offset: 15321}, + pos: position{line: 530, col: 11, offset: 15224}, run: (*parser).callonBodyArg1, expr: &seqExpr{ - pos: position{line: 528, col: 11, offset: 15321}, + pos: position{line: 530, col: 11, offset: 15224}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 528, col: 11, offset: 15321}, + pos: position{line: 530, col: 11, offset: 15224}, name: "_", }, &litMatcher{ - pos: position{line: 528, col: 13, offset: 15323}, + pos: position{line: 530, col: 13, offset: 15226}, val: "body", ignoreCase: false, want: "\"body\"", }, &ruleRefExpr{ - pos: position{line: 528, col: 20, offset: 15330}, + pos: position{line: 530, col: 20, offset: 15233}, name: "_", }, &labeledExpr{ - pos: position{line: 528, col: 22, offset: 15332}, + pos: position{line: 530, col: 22, offset: 15235}, label: "v", expr: &choiceExpr{ - pos: position{line: 528, col: 25, offset: 15335}, + pos: position{line: 530, col: 25, offset: 15238}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 528, col: 25, offset: 15335}, + pos: position{line: 530, col: 25, offset: 15238}, name: "IdentifierName", }, &ruleRefExpr{ - pos: position{line: 528, col: 42, offset: 15352}, + pos: position{line: 530, col: 42, offset: 15255}, name: "QuotedString", }, }, @@ -4285,29 +4288,29 @@ var g = &grammar{ }, { name: "Path", - pos: position{line: 530, col: 1, offset: 15385}, + pos: position{line: 532, col: 1, offset: 15288}, expr: &choiceExpr{ - pos: position{line: 531, col: 5, offset: 15394}, + pos: position{line: 533, col: 5, offset: 15297}, alternatives: []any{ &actionExpr{ - pos: position{line: 531, col: 5, offset: 15394}, + pos: position{line: 533, col: 5, offset: 15297}, run: (*parser).callonPath2, expr: &labeledExpr{ - pos: position{line: 531, col: 5, offset: 15394}, + pos: position{line: 533, col: 5, offset: 15297}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 531, col: 7, offset: 15396}, + pos: position{line: 533, col: 7, offset: 15299}, name: "QuotedString", }, }, }, &actionExpr{ - pos: position{line: 532, col: 5, offset: 15487}, + pos: position{line: 534, col: 5, offset: 15390}, run: (*parser).callonPath5, expr: &oneOrMoreExpr{ - pos: position{line: 532, col: 5, offset: 15487}, + pos: position{line: 534, col: 5, offset: 15390}, expr: &charClassMatcher{ - pos: position{line: 532, col: 5, offset: 15487}, + pos: position{line: 534, col: 5, offset: 15390}, val: "[0-9a-zA-Z!@$%^&*_=<>,./?:[\\]{}~+-]", chars: []rune{'!', '@', '$', '%', '^', '&', '*', '_', '=', '<', '>', ',', '.', '/', '?', ':', '[', ']', '{', '}', '~', '+', '-'}, ranges: []rune{'0', '9', 'a', 'z', 'A', 'Z'}, @@ -4321,32 +4324,32 @@ var g = &grammar{ }, { name: "PoolAt", - pos: position{line: 535, col: 1, offset: 15639}, + pos: position{line: 537, col: 1, offset: 15542}, expr: &actionExpr{ - pos: position{line: 536, col: 5, offset: 15650}, + pos: position{line: 538, col: 5, offset: 15553}, run: (*parser).callonPoolAt1, expr: &seqExpr{ - pos: position{line: 536, col: 5, offset: 15650}, + pos: position{line: 538, col: 5, offset: 15553}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 536, col: 5, offset: 15650}, + pos: position{line: 538, col: 5, offset: 15553}, name: "_", }, &litMatcher{ - pos: position{line: 536, col: 7, offset: 15652}, + pos: position{line: 538, col: 7, offset: 15555}, val: "at", ignoreCase: false, want: "\"at\"", }, &ruleRefExpr{ - pos: position{line: 536, col: 12, offset: 15657}, + pos: position{line: 538, col: 12, offset: 15560}, name: "_", }, &labeledExpr{ - pos: position{line: 536, col: 14, offset: 15659}, + pos: position{line: 538, col: 14, offset: 15562}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 536, col: 17, offset: 15662}, + pos: position{line: 538, col: 17, offset: 15565}, name: "KSUID", }, }, @@ -4356,14 +4359,14 @@ var g = &grammar{ }, { name: "KSUID", - pos: position{line: 539, col: 1, offset: 15728}, + pos: position{line: 541, col: 1, offset: 15631}, expr: &actionExpr{ - pos: position{line: 539, col: 9, offset: 15736}, + pos: position{line: 541, col: 9, offset: 15639}, run: (*parser).callonKSUID1, expr: &oneOrMoreExpr{ - pos: position{line: 539, col: 9, offset: 15736}, + pos: position{line: 541, col: 9, offset: 15639}, expr: &charClassMatcher{ - pos: position{line: 539, col: 10, offset: 15737}, + pos: position{line: 541, col: 10, offset: 15640}, val: "[0-9a-zA-Z]", ranges: []rune{'0', '9', 'a', 'z', 'A', 'Z'}, ignoreCase: false, @@ -4374,51 +4377,51 @@ var g = &grammar{ }, { name: "PoolSpec", - pos: position{line: 541, col: 1, offset: 15783}, + pos: position{line: 543, col: 1, offset: 15686}, expr: &choiceExpr{ - pos: position{line: 542, col: 5, offset: 15796}, + pos: position{line: 544, col: 5, offset: 15699}, alternatives: []any{ &actionExpr{ - pos: position{line: 542, col: 5, offset: 15796}, + pos: position{line: 544, col: 5, offset: 15699}, run: (*parser).callonPoolSpec2, expr: &seqExpr{ - pos: position{line: 542, col: 5, offset: 15796}, + pos: position{line: 544, col: 5, offset: 15699}, exprs: []any{ &labeledExpr{ - pos: position{line: 542, col: 5, offset: 15796}, + pos: position{line: 544, col: 5, offset: 15699}, label: "pool", expr: &ruleRefExpr{ - pos: position{line: 542, col: 10, offset: 15801}, + pos: position{line: 544, col: 10, offset: 15704}, name: "PoolName", }, }, &labeledExpr{ - pos: position{line: 542, col: 19, offset: 15810}, + pos: position{line: 544, col: 19, offset: 15713}, label: "commit", expr: &zeroOrOneExpr{ - pos: position{line: 542, col: 26, offset: 15817}, + pos: position{line: 544, col: 26, offset: 15720}, expr: &ruleRefExpr{ - pos: position{line: 542, col: 26, offset: 15817}, + pos: position{line: 544, col: 26, offset: 15720}, name: "PoolCommit", }, }, }, &labeledExpr{ - pos: position{line: 542, col: 38, offset: 15829}, + pos: position{line: 544, col: 38, offset: 15732}, label: "meta", expr: &zeroOrOneExpr{ - pos: position{line: 542, col: 43, offset: 15834}, + pos: position{line: 544, col: 43, offset: 15737}, expr: &ruleRefExpr{ - pos: position{line: 542, col: 43, offset: 15834}, + pos: position{line: 544, col: 43, offset: 15737}, name: "PoolMeta", }, }, }, &labeledExpr{ - pos: position{line: 542, col: 53, offset: 15844}, + pos: position{line: 544, col: 53, offset: 15747}, label: "tap", expr: &ruleRefExpr{ - pos: position{line: 542, col: 57, offset: 15848}, + pos: position{line: 544, col: 57, offset: 15751}, name: "TapArg", }, }, @@ -4426,13 +4429,13 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 545, col: 5, offset: 15966}, + pos: position{line: 547, col: 5, offset: 15869}, run: (*parser).callonPoolSpec14, expr: &labeledExpr{ - pos: position{line: 545, col: 5, offset: 15966}, + pos: position{line: 547, col: 5, offset: 15869}, label: "meta", expr: &ruleRefExpr{ - pos: position{line: 545, col: 10, offset: 15971}, + pos: position{line: 547, col: 10, offset: 15874}, name: "PoolMeta", }, }, @@ -4442,24 +4445,24 @@ var g = &grammar{ }, { name: "PoolCommit", - pos: position{line: 549, col: 1, offset: 16072}, + pos: position{line: 551, col: 1, offset: 15975}, expr: &actionExpr{ - pos: position{line: 550, col: 5, offset: 16087}, + pos: position{line: 552, col: 5, offset: 15990}, run: (*parser).callonPoolCommit1, expr: &seqExpr{ - pos: position{line: 550, col: 5, offset: 16087}, + pos: position{line: 552, col: 5, offset: 15990}, exprs: []any{ &litMatcher{ - pos: position{line: 550, col: 5, offset: 16087}, + pos: position{line: 552, col: 5, offset: 15990}, val: "@", ignoreCase: false, want: "\"@\"", }, &labeledExpr{ - pos: position{line: 550, col: 9, offset: 16091}, + pos: position{line: 552, col: 9, offset: 15994}, label: "commit", expr: &ruleRefExpr{ - pos: position{line: 550, col: 16, offset: 16098}, + pos: position{line: 552, col: 16, offset: 16001}, name: "PoolNameString", }, }, @@ -4469,24 +4472,24 @@ var g = &grammar{ }, { name: "PoolMeta", - pos: position{line: 552, col: 1, offset: 16137}, + pos: position{line: 554, col: 1, offset: 16040}, expr: &actionExpr{ - pos: position{line: 553, col: 5, offset: 16150}, + pos: position{line: 555, col: 5, offset: 16053}, run: (*parser).callonPoolMeta1, expr: &seqExpr{ - pos: position{line: 553, col: 5, offset: 16150}, + pos: position{line: 555, col: 5, offset: 16053}, exprs: []any{ &litMatcher{ - pos: position{line: 553, col: 5, offset: 16150}, + pos: position{line: 555, col: 5, offset: 16053}, val: ":", ignoreCase: false, want: "\":\"", }, &labeledExpr{ - pos: position{line: 553, col: 9, offset: 16154}, + pos: position{line: 555, col: 9, offset: 16057}, label: "meta", expr: &ruleRefExpr{ - pos: position{line: 553, col: 14, offset: 16159}, + pos: position{line: 555, col: 14, offset: 16062}, name: "PoolIdentifier", }, }, @@ -4496,34 +4499,34 @@ var g = &grammar{ }, { name: "PoolName", - pos: position{line: 555, col: 1, offset: 16196}, + pos: position{line: 557, col: 1, offset: 16099}, expr: &choiceExpr{ - pos: position{line: 556, col: 5, offset: 16209}, + pos: position{line: 558, col: 5, offset: 16112}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 556, col: 5, offset: 16209}, + pos: position{line: 558, col: 5, offset: 16112}, name: "Regexp", }, &ruleRefExpr{ - pos: position{line: 557, col: 5, offset: 16220}, + pos: position{line: 559, col: 5, offset: 16123}, name: "Glob", }, &actionExpr{ - pos: position{line: 558, col: 5, offset: 16229}, + pos: position{line: 560, col: 5, offset: 16132}, run: (*parser).callonPoolName4, expr: &seqExpr{ - pos: position{line: 558, col: 5, offset: 16229}, + pos: position{line: 560, col: 5, offset: 16132}, exprs: []any{ &litMatcher{ - pos: position{line: 558, col: 5, offset: 16229}, + pos: position{line: 560, col: 5, offset: 16132}, val: "*", ignoreCase: false, want: "\"*\"", }, ¬Expr{ - pos: position{line: 558, col: 9, offset: 16233}, + pos: position{line: 560, col: 9, offset: 16136}, expr: &ruleRefExpr{ - pos: position{line: 558, col: 10, offset: 16234}, + pos: position{line: 560, col: 10, offset: 16137}, name: "ExprGuard", }, }, @@ -4531,25 +4534,25 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 559, col: 5, offset: 16319}, + pos: position{line: 561, col: 5, offset: 16222}, run: (*parser).callonPoolName9, expr: &labeledExpr{ - pos: position{line: 559, col: 5, offset: 16319}, + pos: position{line: 561, col: 5, offset: 16222}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 559, col: 10, offset: 16324}, + pos: position{line: 561, col: 10, offset: 16227}, name: "QuotedString", }, }, }, &actionExpr{ - pos: position{line: 560, col: 5, offset: 16418}, + pos: position{line: 562, col: 5, offset: 16321}, run: (*parser).callonPoolName12, expr: &labeledExpr{ - pos: position{line: 560, col: 5, offset: 16418}, + pos: position{line: 562, col: 5, offset: 16321}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 560, col: 10, offset: 16423}, + pos: position{line: 562, col: 10, offset: 16326}, name: "PoolNameString", }, }, @@ -4559,20 +4562,20 @@ var g = &grammar{ }, { name: "PoolNameString", - pos: position{line: 562, col: 1, offset: 16510}, + pos: position{line: 564, col: 1, offset: 16413}, expr: &choiceExpr{ - pos: position{line: 563, col: 5, offset: 16529}, + pos: position{line: 565, col: 5, offset: 16432}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 563, col: 5, offset: 16529}, + pos: position{line: 565, col: 5, offset: 16432}, name: "PoolIdentifier", }, &ruleRefExpr{ - pos: position{line: 564, col: 5, offset: 16548}, + pos: position{line: 566, col: 5, offset: 16451}, name: "KSUID", }, &ruleRefExpr{ - pos: position{line: 565, col: 5, offset: 16558}, + pos: position{line: 567, col: 5, offset: 16461}, name: "QuotedString", }, }, @@ -4580,22 +4583,22 @@ var g = &grammar{ }, { name: "PoolIdentifier", - pos: position{line: 567, col: 1, offset: 16572}, + pos: position{line: 569, col: 1, offset: 16475}, expr: &actionExpr{ - pos: position{line: 568, col: 5, offset: 16591}, + pos: position{line: 570, col: 5, offset: 16494}, run: (*parser).callonPoolIdentifier1, expr: &seqExpr{ - pos: position{line: 568, col: 5, offset: 16591}, + pos: position{line: 570, col: 5, offset: 16494}, exprs: []any{ &choiceExpr{ - pos: position{line: 568, col: 6, offset: 16592}, + pos: position{line: 570, col: 6, offset: 16495}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 568, col: 6, offset: 16592}, + pos: position{line: 570, col: 6, offset: 16495}, name: "IdentifierStart", }, &litMatcher{ - pos: position{line: 568, col: 24, offset: 16610}, + pos: position{line: 570, col: 24, offset: 16513}, val: ".", ignoreCase: false, want: "\".\"", @@ -4603,16 +4606,16 @@ var g = &grammar{ }, }, &zeroOrMoreExpr{ - pos: position{line: 568, col: 29, offset: 16615}, + pos: position{line: 570, col: 29, offset: 16518}, expr: &choiceExpr{ - pos: position{line: 568, col: 30, offset: 16616}, + pos: position{line: 570, col: 30, offset: 16519}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 568, col: 30, offset: 16616}, + pos: position{line: 570, col: 30, offset: 16519}, name: "IdentifierRest", }, &litMatcher{ - pos: position{line: 568, col: 47, offset: 16633}, + pos: position{line: 570, col: 47, offset: 16536}, val: ".", ignoreCase: false, want: "\".\"", @@ -4626,40 +4629,40 @@ var g = &grammar{ }, { name: "SortKeyArg", - pos: position{line: 570, col: 1, offset: 16671}, + pos: position{line: 572, col: 1, offset: 16574}, expr: &actionExpr{ - pos: position{line: 571, col: 5, offset: 16686}, + pos: position{line: 573, col: 5, offset: 16589}, run: (*parser).callonSortKeyArg1, expr: &seqExpr{ - pos: position{line: 571, col: 5, offset: 16686}, + pos: position{line: 573, col: 5, offset: 16589}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 571, col: 5, offset: 16686}, + pos: position{line: 573, col: 5, offset: 16589}, name: "_", }, &litMatcher{ - pos: position{line: 571, col: 7, offset: 16688}, + pos: position{line: 573, col: 7, offset: 16591}, val: "order", ignoreCase: false, want: "\"order\"", }, &ruleRefExpr{ - pos: position{line: 571, col: 15, offset: 16696}, + pos: position{line: 573, col: 15, offset: 16599}, name: "_", }, &labeledExpr{ - pos: position{line: 571, col: 17, offset: 16698}, + pos: position{line: 573, col: 17, offset: 16601}, label: "keys", expr: &ruleRefExpr{ - pos: position{line: 571, col: 22, offset: 16703}, + pos: position{line: 573, col: 22, offset: 16606}, name: "FieldExprs", }, }, &labeledExpr{ - pos: position{line: 571, col: 33, offset: 16714}, + pos: position{line: 573, col: 33, offset: 16617}, label: "order", expr: &ruleRefExpr{ - pos: position{line: 571, col: 39, offset: 16720}, + pos: position{line: 573, col: 39, offset: 16623}, name: "OrderSuffix", }, }, @@ -4669,22 +4672,22 @@ var g = &grammar{ }, { name: "TapArg", - pos: position{line: 575, col: 1, offset: 16831}, + pos: position{line: 577, col: 1, offset: 16734}, expr: &choiceExpr{ - pos: position{line: 576, col: 5, offset: 16842}, + pos: position{line: 578, col: 5, offset: 16745}, alternatives: []any{ &actionExpr{ - pos: position{line: 576, col: 5, offset: 16842}, + pos: position{line: 578, col: 5, offset: 16745}, run: (*parser).callonTapArg2, expr: &seqExpr{ - pos: position{line: 576, col: 5, offset: 16842}, + pos: position{line: 578, col: 5, offset: 16745}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 576, col: 5, offset: 16842}, + pos: position{line: 578, col: 5, offset: 16745}, name: "_", }, &litMatcher{ - pos: position{line: 576, col: 7, offset: 16844}, + pos: position{line: 578, col: 7, offset: 16747}, val: "tap", ignoreCase: false, want: "\"tap\"", @@ -4693,10 +4696,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 577, col: 5, offset: 16875}, + pos: position{line: 579, col: 5, offset: 16778}, run: (*parser).callonTapArg6, expr: &litMatcher{ - pos: position{line: 577, col: 5, offset: 16875}, + pos: position{line: 579, col: 5, offset: 16778}, val: "", ignoreCase: false, want: "\"\"", @@ -4707,32 +4710,32 @@ var g = &grammar{ }, { name: "FormatArg", - pos: position{line: 579, col: 1, offset: 16901}, + pos: position{line: 581, col: 1, offset: 16804}, expr: &actionExpr{ - pos: position{line: 580, col: 5, offset: 16915}, + pos: position{line: 582, col: 5, offset: 16818}, run: (*parser).callonFormatArg1, expr: &seqExpr{ - pos: position{line: 580, col: 5, offset: 16915}, + pos: position{line: 582, col: 5, offset: 16818}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 580, col: 5, offset: 16915}, + pos: position{line: 582, col: 5, offset: 16818}, name: "_", }, &litMatcher{ - pos: position{line: 580, col: 7, offset: 16917}, + pos: position{line: 582, col: 7, offset: 16820}, val: "format", ignoreCase: false, want: "\"format\"", }, &ruleRefExpr{ - pos: position{line: 580, col: 16, offset: 16926}, + pos: position{line: 582, col: 16, offset: 16829}, name: "_", }, &labeledExpr{ - pos: position{line: 580, col: 18, offset: 16928}, + pos: position{line: 582, col: 18, offset: 16831}, label: "val", expr: &ruleRefExpr{ - pos: position{line: 580, col: 22, offset: 16932}, + pos: position{line: 582, col: 22, offset: 16835}, name: "IdentifierName", }, }, @@ -4742,35 +4745,35 @@ var g = &grammar{ }, { name: "OrderSuffix", - pos: position{line: 582, col: 1, offset: 16968}, + pos: position{line: 584, col: 1, offset: 16871}, expr: &choiceExpr{ - pos: position{line: 583, col: 5, offset: 16984}, + pos: position{line: 585, col: 5, offset: 16887}, alternatives: []any{ &actionExpr{ - pos: position{line: 583, col: 5, offset: 16984}, + pos: position{line: 585, col: 5, offset: 16887}, run: (*parser).callonOrderSuffix2, expr: &litMatcher{ - pos: position{line: 583, col: 5, offset: 16984}, + pos: position{line: 585, col: 5, offset: 16887}, val: ":asc", ignoreCase: false, want: "\":asc\"", }, }, &actionExpr{ - pos: position{line: 584, col: 5, offset: 17018}, + pos: position{line: 586, col: 5, offset: 16921}, run: (*parser).callonOrderSuffix4, expr: &litMatcher{ - pos: position{line: 584, col: 5, offset: 17018}, + pos: position{line: 586, col: 5, offset: 16921}, val: ":desc", ignoreCase: false, want: "\":desc\"", }, }, &actionExpr{ - pos: position{line: 585, col: 5, offset: 17053}, + pos: position{line: 587, col: 5, offset: 16956}, run: (*parser).callonOrderSuffix6, expr: &litMatcher{ - pos: position{line: 585, col: 5, offset: 17053}, + pos: position{line: 587, col: 5, offset: 16956}, val: "", ignoreCase: false, want: "\"\"", @@ -4781,23 +4784,23 @@ var g = &grammar{ }, { name: "PassOp", - pos: position{line: 587, col: 1, offset: 17084}, + pos: position{line: 589, col: 1, offset: 16987}, expr: &actionExpr{ - pos: position{line: 588, col: 5, offset: 17095}, + pos: position{line: 590, col: 5, offset: 16998}, run: (*parser).callonPassOp1, expr: &seqExpr{ - pos: position{line: 588, col: 5, offset: 17095}, + pos: position{line: 590, col: 5, offset: 16998}, exprs: []any{ &litMatcher{ - pos: position{line: 588, col: 5, offset: 17095}, + pos: position{line: 590, col: 5, offset: 16998}, val: "pass", ignoreCase: false, want: "\"pass\"", }, &andExpr{ - pos: position{line: 588, col: 12, offset: 17102}, + pos: position{line: 590, col: 12, offset: 17005}, expr: &ruleRefExpr{ - pos: position{line: 588, col: 13, offset: 17103}, + pos: position{line: 590, col: 13, offset: 17006}, name: "EOKW", }, }, @@ -4807,46 +4810,46 @@ var g = &grammar{ }, { name: "ExplodeOp", - pos: position{line: 594, col: 1, offset: 17296}, + pos: position{line: 596, col: 1, offset: 17199}, expr: &actionExpr{ - pos: position{line: 595, col: 5, offset: 17310}, + pos: position{line: 597, col: 5, offset: 17213}, run: (*parser).callonExplodeOp1, expr: &seqExpr{ - pos: position{line: 595, col: 5, offset: 17310}, + pos: position{line: 597, col: 5, offset: 17213}, exprs: []any{ &litMatcher{ - pos: position{line: 595, col: 5, offset: 17310}, + pos: position{line: 597, col: 5, offset: 17213}, val: "explode", ignoreCase: false, want: "\"explode\"", }, &ruleRefExpr{ - pos: position{line: 595, col: 15, offset: 17320}, + pos: position{line: 597, col: 15, offset: 17223}, name: "_", }, &labeledExpr{ - pos: position{line: 595, col: 17, offset: 17322}, + pos: position{line: 597, col: 17, offset: 17225}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 595, col: 22, offset: 17327}, + pos: position{line: 597, col: 22, offset: 17230}, name: "Exprs", }, }, &labeledExpr{ - pos: position{line: 595, col: 28, offset: 17333}, + pos: position{line: 597, col: 28, offset: 17236}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 595, col: 32, offset: 17337}, + pos: position{line: 597, col: 32, offset: 17240}, name: "TypeArg", }, }, &labeledExpr{ - pos: position{line: 595, col: 40, offset: 17345}, + pos: position{line: 597, col: 40, offset: 17248}, label: "as", expr: &zeroOrOneExpr{ - pos: position{line: 595, col: 43, offset: 17348}, + pos: position{line: 597, col: 43, offset: 17251}, expr: &ruleRefExpr{ - pos: position{line: 595, col: 43, offset: 17348}, + pos: position{line: 597, col: 43, offset: 17251}, name: "AsArg", }, }, @@ -4857,28 +4860,28 @@ var g = &grammar{ }, { name: "MergeOp", - pos: position{line: 599, col: 1, offset: 17461}, + pos: position{line: 601, col: 1, offset: 17364}, expr: &actionExpr{ - pos: position{line: 600, col: 5, offset: 17473}, + pos: position{line: 602, col: 5, offset: 17376}, run: (*parser).callonMergeOp1, expr: &seqExpr{ - pos: position{line: 600, col: 5, offset: 17473}, + pos: position{line: 602, col: 5, offset: 17376}, exprs: []any{ &litMatcher{ - pos: position{line: 600, col: 5, offset: 17473}, + pos: position{line: 602, col: 5, offset: 17376}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &ruleRefExpr{ - pos: position{line: 600, col: 13, offset: 17481}, + pos: position{line: 602, col: 13, offset: 17384}, name: "_", }, &labeledExpr{ - pos: position{line: 600, col: 15, offset: 17483}, + pos: position{line: 602, col: 15, offset: 17386}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 600, col: 20, offset: 17488}, + pos: position{line: 602, col: 20, offset: 17391}, name: "Expr", }, }, @@ -4888,49 +4891,49 @@ var g = &grammar{ }, { name: "OverOp", - pos: position{line: 604, col: 1, offset: 17574}, + pos: position{line: 606, col: 1, offset: 17477}, expr: &actionExpr{ - pos: position{line: 605, col: 5, offset: 17585}, + pos: position{line: 607, col: 5, offset: 17488}, run: (*parser).callonOverOp1, expr: &seqExpr{ - pos: position{line: 605, col: 5, offset: 17585}, + pos: position{line: 607, col: 5, offset: 17488}, exprs: []any{ &litMatcher{ - pos: position{line: 605, col: 5, offset: 17585}, + pos: position{line: 607, col: 5, offset: 17488}, val: "over", ignoreCase: false, want: "\"over\"", }, &ruleRefExpr{ - pos: position{line: 605, col: 12, offset: 17592}, + pos: position{line: 607, col: 12, offset: 17495}, name: "_", }, &labeledExpr{ - pos: position{line: 605, col: 14, offset: 17594}, + pos: position{line: 607, col: 14, offset: 17497}, label: "exprs", expr: &ruleRefExpr{ - pos: position{line: 605, col: 20, offset: 17600}, + pos: position{line: 607, col: 20, offset: 17503}, name: "Exprs", }, }, &labeledExpr{ - pos: position{line: 605, col: 26, offset: 17606}, + pos: position{line: 607, col: 26, offset: 17509}, label: "locals", expr: &zeroOrOneExpr{ - pos: position{line: 605, col: 33, offset: 17613}, + pos: position{line: 607, col: 33, offset: 17516}, expr: &ruleRefExpr{ - pos: position{line: 605, col: 33, offset: 17613}, + pos: position{line: 607, col: 33, offset: 17516}, name: "Locals", }, }, }, &labeledExpr{ - pos: position{line: 605, col: 41, offset: 17621}, + pos: position{line: 607, col: 41, offset: 17524}, label: "body", expr: &zeroOrOneExpr{ - pos: position{line: 605, col: 46, offset: 17626}, + pos: position{line: 607, col: 46, offset: 17529}, expr: &ruleRefExpr{ - pos: position{line: 605, col: 46, offset: 17626}, + pos: position{line: 607, col: 46, offset: 17529}, name: "Lateral", }, }, @@ -4941,54 +4944,54 @@ var g = &grammar{ }, { name: "Lateral", - pos: position{line: 609, col: 1, offset: 17749}, + pos: position{line: 611, col: 1, offset: 17652}, expr: &choiceExpr{ - pos: position{line: 610, col: 5, offset: 17761}, + pos: position{line: 612, col: 5, offset: 17664}, alternatives: []any{ &actionExpr{ - pos: position{line: 610, col: 5, offset: 17761}, + pos: position{line: 612, col: 5, offset: 17664}, run: (*parser).callonLateral2, expr: &seqExpr{ - pos: position{line: 610, col: 5, offset: 17761}, + pos: position{line: 612, col: 5, offset: 17664}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 610, col: 5, offset: 17761}, + pos: position{line: 612, col: 5, offset: 17664}, name: "__", }, &litMatcher{ - pos: position{line: 610, col: 8, offset: 17764}, + pos: position{line: 612, col: 8, offset: 17667}, val: "=>", ignoreCase: false, want: "\"=>\"", }, &ruleRefExpr{ - pos: position{line: 610, col: 13, offset: 17769}, + pos: position{line: 612, col: 13, offset: 17672}, name: "__", }, &litMatcher{ - pos: position{line: 610, col: 16, offset: 17772}, + pos: position{line: 612, col: 16, offset: 17675}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 610, col: 20, offset: 17776}, + pos: position{line: 612, col: 20, offset: 17679}, name: "__", }, &labeledExpr{ - pos: position{line: 610, col: 23, offset: 17779}, + pos: position{line: 612, col: 23, offset: 17682}, label: "scope", expr: &ruleRefExpr{ - pos: position{line: 610, col: 29, offset: 17785}, + pos: position{line: 612, col: 29, offset: 17688}, name: "Scope", }, }, &ruleRefExpr{ - pos: position{line: 610, col: 35, offset: 17791}, + pos: position{line: 612, col: 35, offset: 17694}, name: "__", }, &litMatcher{ - pos: position{line: 610, col: 38, offset: 17794}, + pos: position{line: 612, col: 38, offset: 17697}, val: ")", ignoreCase: false, want: "\")\"", @@ -4997,49 +5000,49 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 611, col: 5, offset: 17839}, + pos: position{line: 613, col: 5, offset: 17742}, run: (*parser).callonLateral13, expr: &seqExpr{ - pos: position{line: 611, col: 5, offset: 17839}, + pos: position{line: 613, col: 5, offset: 17742}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 611, col: 5, offset: 17839}, + pos: position{line: 613, col: 5, offset: 17742}, name: "__", }, &litMatcher{ - pos: position{line: 611, col: 8, offset: 17842}, + pos: position{line: 613, col: 8, offset: 17745}, val: "=>", ignoreCase: false, want: "\"=>\"", }, &ruleRefExpr{ - pos: position{line: 611, col: 13, offset: 17847}, + pos: position{line: 613, col: 13, offset: 17750}, name: "__", }, &litMatcher{ - pos: position{line: 611, col: 16, offset: 17850}, + pos: position{line: 613, col: 16, offset: 17753}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 611, col: 20, offset: 17854}, + pos: position{line: 613, col: 20, offset: 17757}, name: "__", }, &labeledExpr{ - pos: position{line: 611, col: 23, offset: 17857}, + pos: position{line: 613, col: 23, offset: 17760}, label: "seq", expr: &ruleRefExpr{ - pos: position{line: 611, col: 27, offset: 17861}, + pos: position{line: 613, col: 27, offset: 17764}, name: "Seq", }, }, &ruleRefExpr{ - pos: position{line: 611, col: 31, offset: 17865}, + pos: position{line: 613, col: 31, offset: 17768}, name: "__", }, &litMatcher{ - pos: position{line: 611, col: 34, offset: 17868}, + pos: position{line: 613, col: 34, offset: 17771}, val: ")", ignoreCase: false, want: "\")\"", @@ -5052,65 +5055,65 @@ var g = &grammar{ }, { name: "Locals", - pos: position{line: 613, col: 1, offset: 17893}, + pos: position{line: 615, col: 1, offset: 17796}, expr: &actionExpr{ - pos: position{line: 614, col: 5, offset: 17904}, + pos: position{line: 616, col: 5, offset: 17807}, run: (*parser).callonLocals1, expr: &seqExpr{ - pos: position{line: 614, col: 5, offset: 17904}, + pos: position{line: 616, col: 5, offset: 17807}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 614, col: 5, offset: 17904}, + pos: position{line: 616, col: 5, offset: 17807}, name: "_", }, &litMatcher{ - pos: position{line: 614, col: 7, offset: 17906}, + pos: position{line: 616, col: 7, offset: 17809}, val: "with", ignoreCase: false, want: "\"with\"", }, &ruleRefExpr{ - pos: position{line: 614, col: 14, offset: 17913}, + pos: position{line: 616, col: 14, offset: 17816}, name: "_", }, &labeledExpr{ - pos: position{line: 614, col: 16, offset: 17915}, + pos: position{line: 616, col: 16, offset: 17818}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 614, col: 22, offset: 17921}, + pos: position{line: 616, col: 22, offset: 17824}, name: "LocalsAssignment", }, }, &labeledExpr{ - pos: position{line: 614, col: 39, offset: 17938}, + pos: position{line: 616, col: 39, offset: 17841}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 614, col: 44, offset: 17943}, + pos: position{line: 616, col: 44, offset: 17846}, expr: &actionExpr{ - pos: position{line: 614, col: 45, offset: 17944}, + pos: position{line: 616, col: 45, offset: 17847}, run: (*parser).callonLocals10, expr: &seqExpr{ - pos: position{line: 614, col: 45, offset: 17944}, + pos: position{line: 616, col: 45, offset: 17847}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 614, col: 45, offset: 17944}, + pos: position{line: 616, col: 45, offset: 17847}, name: "__", }, &litMatcher{ - pos: position{line: 614, col: 48, offset: 17947}, + pos: position{line: 616, col: 48, offset: 17850}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 614, col: 52, offset: 17951}, + pos: position{line: 616, col: 52, offset: 17854}, name: "__", }, &labeledExpr{ - pos: position{line: 614, col: 55, offset: 17954}, + pos: position{line: 616, col: 55, offset: 17857}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 614, col: 57, offset: 17956}, + pos: position{line: 616, col: 57, offset: 17859}, name: "LocalsAssignment", }, }, @@ -5125,45 +5128,45 @@ var g = &grammar{ }, { name: "LocalsAssignment", - pos: position{line: 618, col: 1, offset: 18077}, + pos: position{line: 620, col: 1, offset: 17980}, expr: &actionExpr{ - pos: position{line: 619, col: 5, offset: 18098}, + pos: position{line: 621, col: 5, offset: 18001}, run: (*parser).callonLocalsAssignment1, expr: &seqExpr{ - pos: position{line: 619, col: 5, offset: 18098}, + pos: position{line: 621, col: 5, offset: 18001}, exprs: []any{ &labeledExpr{ - pos: position{line: 619, col: 5, offset: 18098}, + pos: position{line: 621, col: 5, offset: 18001}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 619, col: 10, offset: 18103}, + pos: position{line: 621, col: 10, offset: 18006}, name: "IdentifierName", }, }, &labeledExpr{ - pos: position{line: 619, col: 25, offset: 18118}, + pos: position{line: 621, col: 25, offset: 18021}, label: "opt", expr: &zeroOrOneExpr{ - pos: position{line: 619, col: 29, offset: 18122}, + pos: position{line: 621, col: 29, offset: 18025}, expr: &seqExpr{ - pos: position{line: 619, col: 30, offset: 18123}, + pos: position{line: 621, col: 30, offset: 18026}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 619, col: 30, offset: 18123}, + pos: position{line: 621, col: 30, offset: 18026}, name: "__", }, &litMatcher{ - pos: position{line: 619, col: 33, offset: 18126}, + pos: position{line: 621, col: 33, offset: 18029}, val: "=", ignoreCase: false, want: "\"=\"", }, &ruleRefExpr{ - pos: position{line: 619, col: 37, offset: 18130}, + pos: position{line: 621, col: 37, offset: 18033}, name: "__", }, &ruleRefExpr{ - pos: position{line: 619, col: 40, offset: 18133}, + pos: position{line: 621, col: 40, offset: 18036}, name: "Expr", }, }, @@ -5176,28 +5179,28 @@ var g = &grammar{ }, { name: "YieldOp", - pos: position{line: 627, col: 1, offset: 18354}, + pos: position{line: 629, col: 1, offset: 18257}, expr: &actionExpr{ - pos: position{line: 628, col: 5, offset: 18366}, + pos: position{line: 630, col: 5, offset: 18269}, run: (*parser).callonYieldOp1, expr: &seqExpr{ - pos: position{line: 628, col: 5, offset: 18366}, + pos: position{line: 630, col: 5, offset: 18269}, exprs: []any{ &litMatcher{ - pos: position{line: 628, col: 5, offset: 18366}, + pos: position{line: 630, col: 5, offset: 18269}, val: "yield", ignoreCase: false, want: "\"yield\"", }, &ruleRefExpr{ - pos: position{line: 628, col: 13, offset: 18374}, + pos: position{line: 630, col: 13, offset: 18277}, name: "_", }, &labeledExpr{ - pos: position{line: 628, col: 15, offset: 18376}, + pos: position{line: 630, col: 15, offset: 18279}, label: "exprs", expr: &ruleRefExpr{ - pos: position{line: 628, col: 21, offset: 18382}, + pos: position{line: 630, col: 21, offset: 18285}, name: "Exprs", }, }, @@ -5207,30 +5210,30 @@ var g = &grammar{ }, { name: "TypeArg", - pos: position{line: 632, col: 1, offset: 18471}, + pos: position{line: 634, col: 1, offset: 18374}, expr: &actionExpr{ - pos: position{line: 633, col: 5, offset: 18483}, + pos: position{line: 635, col: 5, offset: 18386}, run: (*parser).callonTypeArg1, expr: &seqExpr{ - pos: position{line: 633, col: 5, offset: 18483}, + pos: position{line: 635, col: 5, offset: 18386}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 633, col: 5, offset: 18483}, + pos: position{line: 635, col: 5, offset: 18386}, name: "_", }, &ruleRefExpr{ - pos: position{line: 633, col: 7, offset: 18485}, + pos: position{line: 635, col: 7, offset: 18388}, name: "BY", }, &ruleRefExpr{ - pos: position{line: 633, col: 10, offset: 18488}, + pos: position{line: 635, col: 10, offset: 18391}, name: "_", }, &labeledExpr{ - pos: position{line: 633, col: 12, offset: 18490}, + pos: position{line: 635, col: 12, offset: 18393}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 633, col: 16, offset: 18494}, + pos: position{line: 635, col: 16, offset: 18397}, name: "Type", }, }, @@ -5240,30 +5243,30 @@ var g = &grammar{ }, { name: "AsArg", - pos: position{line: 635, col: 1, offset: 18520}, + pos: position{line: 637, col: 1, offset: 18423}, expr: &actionExpr{ - pos: position{line: 636, col: 5, offset: 18530}, + pos: position{line: 638, col: 5, offset: 18433}, run: (*parser).callonAsArg1, expr: &seqExpr{ - pos: position{line: 636, col: 5, offset: 18530}, + pos: position{line: 638, col: 5, offset: 18433}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 636, col: 5, offset: 18530}, + pos: position{line: 638, col: 5, offset: 18433}, name: "_", }, &ruleRefExpr{ - pos: position{line: 636, col: 7, offset: 18532}, + pos: position{line: 638, col: 7, offset: 18435}, name: "AS", }, &ruleRefExpr{ - pos: position{line: 636, col: 10, offset: 18535}, + pos: position{line: 638, col: 10, offset: 18438}, name: "_", }, &labeledExpr{ - pos: position{line: 636, col: 12, offset: 18537}, + pos: position{line: 638, col: 12, offset: 18440}, label: "lhs", expr: &ruleRefExpr{ - pos: position{line: 636, col: 16, offset: 18541}, + pos: position{line: 638, col: 16, offset: 18444}, name: "Lval", }, }, @@ -5273,59 +5276,59 @@ var g = &grammar{ }, { name: "Lval", - pos: position{line: 640, col: 1, offset: 18592}, + pos: position{line: 642, col: 1, offset: 18495}, expr: &ruleRefExpr{ - pos: position{line: 640, col: 8, offset: 18599}, + pos: position{line: 642, col: 8, offset: 18502}, name: "DerefExpr", }, }, { name: "Lvals", - pos: position{line: 642, col: 1, offset: 18610}, + pos: position{line: 644, col: 1, offset: 18513}, expr: &actionExpr{ - pos: position{line: 643, col: 5, offset: 18620}, + pos: position{line: 645, col: 5, offset: 18523}, run: (*parser).callonLvals1, expr: &seqExpr{ - pos: position{line: 643, col: 5, offset: 18620}, + pos: position{line: 645, col: 5, offset: 18523}, exprs: []any{ &labeledExpr{ - pos: position{line: 643, col: 5, offset: 18620}, + pos: position{line: 645, col: 5, offset: 18523}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 643, col: 11, offset: 18626}, + pos: position{line: 645, col: 11, offset: 18529}, name: "Lval", }, }, &labeledExpr{ - pos: position{line: 643, col: 16, offset: 18631}, + pos: position{line: 645, col: 16, offset: 18534}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 643, col: 21, offset: 18636}, + pos: position{line: 645, col: 21, offset: 18539}, expr: &actionExpr{ - pos: position{line: 643, col: 22, offset: 18637}, + pos: position{line: 645, col: 22, offset: 18540}, run: (*parser).callonLvals7, expr: &seqExpr{ - pos: position{line: 643, col: 22, offset: 18637}, + pos: position{line: 645, col: 22, offset: 18540}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 643, col: 22, offset: 18637}, + pos: position{line: 645, col: 22, offset: 18540}, name: "__", }, &litMatcher{ - pos: position{line: 643, col: 25, offset: 18640}, + pos: position{line: 645, col: 25, offset: 18543}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 643, col: 29, offset: 18644}, + pos: position{line: 645, col: 29, offset: 18547}, name: "__", }, &labeledExpr{ - pos: position{line: 643, col: 32, offset: 18647}, + pos: position{line: 645, col: 32, offset: 18550}, label: "lval", expr: &ruleRefExpr{ - pos: position{line: 643, col: 37, offset: 18652}, + pos: position{line: 645, col: 37, offset: 18555}, name: "Lval", }, }, @@ -5340,53 +5343,53 @@ var g = &grammar{ }, { name: "FieldExpr", - pos: position{line: 647, col: 1, offset: 18764}, + pos: position{line: 649, col: 1, offset: 18667}, expr: &ruleRefExpr{ - pos: position{line: 647, col: 13, offset: 18776}, + pos: position{line: 649, col: 13, offset: 18679}, name: "Lval", }, }, { name: "FieldExprs", - pos: position{line: 649, col: 1, offset: 18782}, + pos: position{line: 651, col: 1, offset: 18685}, expr: &actionExpr{ - pos: position{line: 650, col: 5, offset: 18797}, + pos: position{line: 652, col: 5, offset: 18700}, run: (*parser).callonFieldExprs1, expr: &seqExpr{ - pos: position{line: 650, col: 5, offset: 18797}, + pos: position{line: 652, col: 5, offset: 18700}, exprs: []any{ &labeledExpr{ - pos: position{line: 650, col: 5, offset: 18797}, + pos: position{line: 652, col: 5, offset: 18700}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 650, col: 11, offset: 18803}, + pos: position{line: 652, col: 11, offset: 18706}, name: "FieldExpr", }, }, &labeledExpr{ - pos: position{line: 650, col: 21, offset: 18813}, + pos: position{line: 652, col: 21, offset: 18716}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 650, col: 26, offset: 18818}, + pos: position{line: 652, col: 26, offset: 18721}, expr: &seqExpr{ - pos: position{line: 650, col: 27, offset: 18819}, + pos: position{line: 652, col: 27, offset: 18722}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 650, col: 27, offset: 18819}, + pos: position{line: 652, col: 27, offset: 18722}, name: "__", }, &litMatcher{ - pos: position{line: 650, col: 30, offset: 18822}, + pos: position{line: 652, col: 30, offset: 18725}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 650, col: 34, offset: 18826}, + pos: position{line: 652, col: 34, offset: 18729}, name: "__", }, &ruleRefExpr{ - pos: position{line: 650, col: 37, offset: 18829}, + pos: position{line: 652, col: 37, offset: 18732}, name: "FieldExpr", }, }, @@ -5399,51 +5402,51 @@ var g = &grammar{ }, { name: "Assignments", - pos: position{line: 660, col: 1, offset: 19028}, + pos: position{line: 662, col: 1, offset: 18931}, expr: &actionExpr{ - pos: position{line: 661, col: 5, offset: 19044}, + pos: position{line: 663, col: 5, offset: 18947}, run: (*parser).callonAssignments1, expr: &seqExpr{ - pos: position{line: 661, col: 5, offset: 19044}, + pos: position{line: 663, col: 5, offset: 18947}, exprs: []any{ &labeledExpr{ - pos: position{line: 661, col: 5, offset: 19044}, + pos: position{line: 663, col: 5, offset: 18947}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 661, col: 11, offset: 19050}, + pos: position{line: 663, col: 11, offset: 18953}, name: "Assignment", }, }, &labeledExpr{ - pos: position{line: 661, col: 22, offset: 19061}, + pos: position{line: 663, col: 22, offset: 18964}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 661, col: 27, offset: 19066}, + pos: position{line: 663, col: 27, offset: 18969}, expr: &actionExpr{ - pos: position{line: 661, col: 28, offset: 19067}, + pos: position{line: 663, col: 28, offset: 18970}, run: (*parser).callonAssignments7, expr: &seqExpr{ - pos: position{line: 661, col: 28, offset: 19067}, + pos: position{line: 663, col: 28, offset: 18970}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 661, col: 28, offset: 19067}, + pos: position{line: 663, col: 28, offset: 18970}, name: "__", }, &litMatcher{ - pos: position{line: 661, col: 31, offset: 19070}, + pos: position{line: 663, col: 31, offset: 18973}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 661, col: 35, offset: 19074}, + pos: position{line: 663, col: 35, offset: 18977}, name: "__", }, &labeledExpr{ - pos: position{line: 661, col: 38, offset: 19077}, + pos: position{line: 663, col: 38, offset: 18980}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 661, col: 40, offset: 19079}, + pos: position{line: 663, col: 40, offset: 18982}, name: "Assignment", }, }, @@ -5458,40 +5461,40 @@ var g = &grammar{ }, { name: "Assignment", - pos: position{line: 665, col: 1, offset: 19190}, + pos: position{line: 667, col: 1, offset: 19093}, expr: &actionExpr{ - pos: position{line: 666, col: 5, offset: 19205}, + pos: position{line: 668, col: 5, offset: 19108}, run: (*parser).callonAssignment1, expr: &seqExpr{ - pos: position{line: 666, col: 5, offset: 19205}, + pos: position{line: 668, col: 5, offset: 19108}, exprs: []any{ &labeledExpr{ - pos: position{line: 666, col: 5, offset: 19205}, + pos: position{line: 668, col: 5, offset: 19108}, label: "lhs", expr: &ruleRefExpr{ - pos: position{line: 666, col: 9, offset: 19209}, + pos: position{line: 668, col: 9, offset: 19112}, name: "Lval", }, }, &ruleRefExpr{ - pos: position{line: 666, col: 14, offset: 19214}, + pos: position{line: 668, col: 14, offset: 19117}, name: "__", }, &litMatcher{ - pos: position{line: 666, col: 17, offset: 19217}, + pos: position{line: 668, col: 17, offset: 19120}, val: ":=", ignoreCase: false, want: "\":=\"", }, &ruleRefExpr{ - pos: position{line: 666, col: 22, offset: 19222}, + pos: position{line: 668, col: 22, offset: 19125}, name: "__", }, &labeledExpr{ - pos: position{line: 666, col: 25, offset: 19225}, + pos: position{line: 668, col: 25, offset: 19128}, label: "rhs", expr: &ruleRefExpr{ - pos: position{line: 666, col: 29, offset: 19229}, + pos: position{line: 668, col: 29, offset: 19132}, name: "Expr", }, }, @@ -5501,71 +5504,71 @@ var g = &grammar{ }, { name: "Expr", - pos: position{line: 668, col: 1, offset: 19320}, + pos: position{line: 670, col: 1, offset: 19223}, expr: &ruleRefExpr{ - pos: position{line: 668, col: 8, offset: 19327}, + pos: position{line: 670, col: 8, offset: 19230}, name: "ConditionalExpr", }, }, { name: "ConditionalExpr", - pos: position{line: 670, col: 1, offset: 19344}, + pos: position{line: 672, col: 1, offset: 19247}, expr: &actionExpr{ - pos: position{line: 671, col: 5, offset: 19364}, + pos: position{line: 673, col: 5, offset: 19267}, run: (*parser).callonConditionalExpr1, expr: &seqExpr{ - pos: position{line: 671, col: 5, offset: 19364}, + pos: position{line: 673, col: 5, offset: 19267}, exprs: []any{ &labeledExpr{ - pos: position{line: 671, col: 5, offset: 19364}, + pos: position{line: 673, col: 5, offset: 19267}, label: "cond", expr: &ruleRefExpr{ - pos: position{line: 671, col: 10, offset: 19369}, + pos: position{line: 673, col: 10, offset: 19272}, name: "LogicalOrExpr", }, }, &labeledExpr{ - pos: position{line: 671, col: 24, offset: 19383}, + pos: position{line: 673, col: 24, offset: 19286}, label: "opt", expr: &zeroOrOneExpr{ - pos: position{line: 671, col: 28, offset: 19387}, + pos: position{line: 673, col: 28, offset: 19290}, expr: &seqExpr{ - pos: position{line: 671, col: 29, offset: 19388}, + pos: position{line: 673, col: 29, offset: 19291}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 671, col: 29, offset: 19388}, + pos: position{line: 673, col: 29, offset: 19291}, name: "__", }, &litMatcher{ - pos: position{line: 671, col: 32, offset: 19391}, + pos: position{line: 673, col: 32, offset: 19294}, val: "?", ignoreCase: false, want: "\"?\"", }, &ruleRefExpr{ - pos: position{line: 671, col: 36, offset: 19395}, + pos: position{line: 673, col: 36, offset: 19298}, name: "__", }, &ruleRefExpr{ - pos: position{line: 671, col: 39, offset: 19398}, + pos: position{line: 673, col: 39, offset: 19301}, name: "Expr", }, &ruleRefExpr{ - pos: position{line: 671, col: 44, offset: 19403}, + pos: position{line: 673, col: 44, offset: 19306}, name: "__", }, &litMatcher{ - pos: position{line: 671, col: 47, offset: 19406}, + pos: position{line: 673, col: 47, offset: 19309}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 671, col: 51, offset: 19410}, + pos: position{line: 673, col: 51, offset: 19313}, name: "__", }, &ruleRefExpr{ - pos: position{line: 671, col: 54, offset: 19413}, + pos: position{line: 673, col: 54, offset: 19316}, name: "Expr", }, }, @@ -5578,53 +5581,53 @@ var g = &grammar{ }, { name: "LogicalOrExpr", - pos: position{line: 680, col: 1, offset: 19674}, + pos: position{line: 682, col: 1, offset: 19577}, expr: &actionExpr{ - pos: position{line: 681, col: 5, offset: 19692}, + pos: position{line: 683, col: 5, offset: 19595}, run: (*parser).callonLogicalOrExpr1, expr: &seqExpr{ - pos: position{line: 681, col: 5, offset: 19692}, + pos: position{line: 683, col: 5, offset: 19595}, exprs: []any{ &labeledExpr{ - pos: position{line: 681, col: 5, offset: 19692}, + pos: position{line: 683, col: 5, offset: 19595}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 681, col: 11, offset: 19698}, + pos: position{line: 683, col: 11, offset: 19601}, name: "LogicalAndExpr", }, }, &labeledExpr{ - pos: position{line: 682, col: 5, offset: 19717}, + pos: position{line: 684, col: 5, offset: 19620}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 682, col: 10, offset: 19722}, + pos: position{line: 684, col: 10, offset: 19625}, expr: &actionExpr{ - pos: position{line: 682, col: 11, offset: 19723}, + pos: position{line: 684, col: 11, offset: 19626}, run: (*parser).callonLogicalOrExpr7, expr: &seqExpr{ - pos: position{line: 682, col: 11, offset: 19723}, + pos: position{line: 684, col: 11, offset: 19626}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 682, col: 11, offset: 19723}, + pos: position{line: 684, col: 11, offset: 19626}, name: "__", }, &labeledExpr{ - pos: position{line: 682, col: 14, offset: 19726}, + pos: position{line: 684, col: 14, offset: 19629}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 682, col: 17, offset: 19729}, + pos: position{line: 684, col: 17, offset: 19632}, name: "OrToken", }, }, &ruleRefExpr{ - pos: position{line: 682, col: 25, offset: 19737}, + pos: position{line: 684, col: 25, offset: 19640}, name: "__", }, &labeledExpr{ - pos: position{line: 682, col: 28, offset: 19740}, + pos: position{line: 684, col: 28, offset: 19643}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 682, col: 33, offset: 19745}, + pos: position{line: 684, col: 33, offset: 19648}, name: "LogicalAndExpr", }, }, @@ -5639,53 +5642,53 @@ var g = &grammar{ }, { name: "LogicalAndExpr", - pos: position{line: 686, col: 1, offset: 19864}, + pos: position{line: 688, col: 1, offset: 19767}, expr: &actionExpr{ - pos: position{line: 687, col: 5, offset: 19883}, + pos: position{line: 689, col: 5, offset: 19786}, run: (*parser).callonLogicalAndExpr1, expr: &seqExpr{ - pos: position{line: 687, col: 5, offset: 19883}, + pos: position{line: 689, col: 5, offset: 19786}, exprs: []any{ &labeledExpr{ - pos: position{line: 687, col: 5, offset: 19883}, + pos: position{line: 689, col: 5, offset: 19786}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 687, col: 11, offset: 19889}, + pos: position{line: 689, col: 11, offset: 19792}, name: "ComparisonExpr", }, }, &labeledExpr{ - pos: position{line: 688, col: 5, offset: 19908}, + pos: position{line: 690, col: 5, offset: 19811}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 688, col: 10, offset: 19913}, + pos: position{line: 690, col: 10, offset: 19816}, expr: &actionExpr{ - pos: position{line: 688, col: 11, offset: 19914}, + pos: position{line: 690, col: 11, offset: 19817}, run: (*parser).callonLogicalAndExpr7, expr: &seqExpr{ - pos: position{line: 688, col: 11, offset: 19914}, + pos: position{line: 690, col: 11, offset: 19817}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 688, col: 11, offset: 19914}, + pos: position{line: 690, col: 11, offset: 19817}, name: "__", }, &labeledExpr{ - pos: position{line: 688, col: 14, offset: 19917}, + pos: position{line: 690, col: 14, offset: 19820}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 688, col: 17, offset: 19920}, + pos: position{line: 690, col: 17, offset: 19823}, name: "AndToken", }, }, &ruleRefExpr{ - pos: position{line: 688, col: 26, offset: 19929}, + pos: position{line: 690, col: 26, offset: 19832}, name: "__", }, &labeledExpr{ - pos: position{line: 688, col: 29, offset: 19932}, + pos: position{line: 690, col: 29, offset: 19835}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 688, col: 34, offset: 19937}, + pos: position{line: 690, col: 34, offset: 19840}, name: "ComparisonExpr", }, }, @@ -5700,73 +5703,73 @@ var g = &grammar{ }, { name: "ComparisonExpr", - pos: position{line: 692, col: 1, offset: 20056}, + pos: position{line: 694, col: 1, offset: 19959}, expr: &actionExpr{ - pos: position{line: 693, col: 5, offset: 20075}, + pos: position{line: 695, col: 5, offset: 19978}, run: (*parser).callonComparisonExpr1, expr: &seqExpr{ - pos: position{line: 693, col: 5, offset: 20075}, + pos: position{line: 695, col: 5, offset: 19978}, exprs: []any{ &labeledExpr{ - pos: position{line: 693, col: 5, offset: 20075}, + pos: position{line: 695, col: 5, offset: 19978}, label: "lhs", expr: &ruleRefExpr{ - pos: position{line: 693, col: 9, offset: 20079}, + pos: position{line: 695, col: 9, offset: 19982}, name: "AdditiveExpr", }, }, &labeledExpr{ - pos: position{line: 693, col: 22, offset: 20092}, + pos: position{line: 695, col: 22, offset: 19995}, label: "opAndRHS", expr: &zeroOrOneExpr{ - pos: position{line: 693, col: 31, offset: 20101}, + pos: position{line: 695, col: 31, offset: 20004}, expr: &choiceExpr{ - pos: position{line: 693, col: 32, offset: 20102}, + pos: position{line: 695, col: 32, offset: 20005}, alternatives: []any{ &seqExpr{ - pos: position{line: 693, col: 32, offset: 20102}, + pos: position{line: 695, col: 32, offset: 20005}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 693, col: 32, offset: 20102}, + pos: position{line: 695, col: 32, offset: 20005}, name: "__", }, &ruleRefExpr{ - pos: position{line: 693, col: 35, offset: 20105}, + pos: position{line: 695, col: 35, offset: 20008}, name: "Comparator", }, &ruleRefExpr{ - pos: position{line: 693, col: 46, offset: 20116}, + pos: position{line: 695, col: 46, offset: 20019}, name: "__", }, &ruleRefExpr{ - pos: position{line: 693, col: 49, offset: 20119}, + pos: position{line: 695, col: 49, offset: 20022}, name: "AdditiveExpr", }, }, }, &seqExpr{ - pos: position{line: 693, col: 64, offset: 20134}, + pos: position{line: 695, col: 64, offset: 20037}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 693, col: 64, offset: 20134}, + pos: position{line: 695, col: 64, offset: 20037}, name: "__", }, &actionExpr{ - pos: position{line: 693, col: 68, offset: 20138}, + pos: position{line: 695, col: 68, offset: 20041}, run: (*parser).callonComparisonExpr15, expr: &litMatcher{ - pos: position{line: 693, col: 68, offset: 20138}, + pos: position{line: 695, col: 68, offset: 20041}, val: "~", ignoreCase: false, want: "\"~\"", }, }, &ruleRefExpr{ - pos: position{line: 693, col: 104, offset: 20174}, + pos: position{line: 695, col: 104, offset: 20077}, name: "__", }, &ruleRefExpr{ - pos: position{line: 693, col: 107, offset: 20177}, + pos: position{line: 695, col: 107, offset: 20080}, name: "Regexp", }, }, @@ -5781,53 +5784,53 @@ var g = &grammar{ }, { name: "AdditiveExpr", - pos: position{line: 702, col: 1, offset: 20438}, + pos: position{line: 704, col: 1, offset: 20341}, expr: &actionExpr{ - pos: position{line: 703, col: 5, offset: 20455}, + pos: position{line: 705, col: 5, offset: 20358}, run: (*parser).callonAdditiveExpr1, expr: &seqExpr{ - pos: position{line: 703, col: 5, offset: 20455}, + pos: position{line: 705, col: 5, offset: 20358}, exprs: []any{ &labeledExpr{ - pos: position{line: 703, col: 5, offset: 20455}, + pos: position{line: 705, col: 5, offset: 20358}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 703, col: 11, offset: 20461}, + pos: position{line: 705, col: 11, offset: 20364}, name: "MultiplicativeExpr", }, }, &labeledExpr{ - pos: position{line: 704, col: 5, offset: 20484}, + pos: position{line: 706, col: 5, offset: 20387}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 704, col: 10, offset: 20489}, + pos: position{line: 706, col: 10, offset: 20392}, expr: &actionExpr{ - pos: position{line: 704, col: 11, offset: 20490}, + pos: position{line: 706, col: 11, offset: 20393}, run: (*parser).callonAdditiveExpr7, expr: &seqExpr{ - pos: position{line: 704, col: 11, offset: 20490}, + pos: position{line: 706, col: 11, offset: 20393}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 704, col: 11, offset: 20490}, + pos: position{line: 706, col: 11, offset: 20393}, name: "__", }, &labeledExpr{ - pos: position{line: 704, col: 14, offset: 20493}, + pos: position{line: 706, col: 14, offset: 20396}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 704, col: 17, offset: 20496}, + pos: position{line: 706, col: 17, offset: 20399}, name: "AdditiveOperator", }, }, &ruleRefExpr{ - pos: position{line: 704, col: 34, offset: 20513}, + pos: position{line: 706, col: 34, offset: 20416}, name: "__", }, &labeledExpr{ - pos: position{line: 704, col: 37, offset: 20516}, + pos: position{line: 706, col: 37, offset: 20419}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 704, col: 42, offset: 20521}, + pos: position{line: 706, col: 42, offset: 20424}, name: "MultiplicativeExpr", }, }, @@ -5842,21 +5845,21 @@ var g = &grammar{ }, { name: "AdditiveOperator", - pos: position{line: 708, col: 1, offset: 20644}, + pos: position{line: 710, col: 1, offset: 20547}, expr: &actionExpr{ - pos: position{line: 708, col: 20, offset: 20663}, + pos: position{line: 710, col: 20, offset: 20566}, run: (*parser).callonAdditiveOperator1, expr: &choiceExpr{ - pos: position{line: 708, col: 21, offset: 20664}, + pos: position{line: 710, col: 21, offset: 20567}, alternatives: []any{ &litMatcher{ - pos: position{line: 708, col: 21, offset: 20664}, + pos: position{line: 710, col: 21, offset: 20567}, val: "+", ignoreCase: false, want: "\"+\"", }, &litMatcher{ - pos: position{line: 708, col: 27, offset: 20670}, + pos: position{line: 710, col: 27, offset: 20573}, val: "-", ignoreCase: false, want: "\"-\"", @@ -5867,53 +5870,53 @@ var g = &grammar{ }, { name: "MultiplicativeExpr", - pos: position{line: 710, col: 1, offset: 20707}, + pos: position{line: 712, col: 1, offset: 20610}, expr: &actionExpr{ - pos: position{line: 711, col: 5, offset: 20730}, + pos: position{line: 713, col: 5, offset: 20633}, run: (*parser).callonMultiplicativeExpr1, expr: &seqExpr{ - pos: position{line: 711, col: 5, offset: 20730}, + pos: position{line: 713, col: 5, offset: 20633}, exprs: []any{ &labeledExpr{ - pos: position{line: 711, col: 5, offset: 20730}, + pos: position{line: 713, col: 5, offset: 20633}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 711, col: 11, offset: 20736}, + pos: position{line: 713, col: 11, offset: 20639}, name: "NotExpr", }, }, &labeledExpr{ - pos: position{line: 712, col: 5, offset: 20748}, + pos: position{line: 714, col: 5, offset: 20651}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 712, col: 10, offset: 20753}, + pos: position{line: 714, col: 10, offset: 20656}, expr: &actionExpr{ - pos: position{line: 712, col: 11, offset: 20754}, + pos: position{line: 714, col: 11, offset: 20657}, run: (*parser).callonMultiplicativeExpr7, expr: &seqExpr{ - pos: position{line: 712, col: 11, offset: 20754}, + pos: position{line: 714, col: 11, offset: 20657}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 712, col: 11, offset: 20754}, + pos: position{line: 714, col: 11, offset: 20657}, name: "__", }, &labeledExpr{ - pos: position{line: 712, col: 14, offset: 20757}, + pos: position{line: 714, col: 14, offset: 20660}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 712, col: 17, offset: 20760}, + pos: position{line: 714, col: 17, offset: 20663}, name: "MultiplicativeOperator", }, }, &ruleRefExpr{ - pos: position{line: 712, col: 40, offset: 20783}, + pos: position{line: 714, col: 40, offset: 20686}, name: "__", }, &labeledExpr{ - pos: position{line: 712, col: 43, offset: 20786}, + pos: position{line: 714, col: 43, offset: 20689}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 712, col: 48, offset: 20791}, + pos: position{line: 714, col: 48, offset: 20694}, name: "NotExpr", }, }, @@ -5928,27 +5931,27 @@ var g = &grammar{ }, { name: "MultiplicativeOperator", - pos: position{line: 716, col: 1, offset: 20903}, + pos: position{line: 718, col: 1, offset: 20806}, expr: &actionExpr{ - pos: position{line: 716, col: 26, offset: 20928}, + pos: position{line: 718, col: 26, offset: 20831}, run: (*parser).callonMultiplicativeOperator1, expr: &choiceExpr{ - pos: position{line: 716, col: 27, offset: 20929}, + pos: position{line: 718, col: 27, offset: 20832}, alternatives: []any{ &litMatcher{ - pos: position{line: 716, col: 27, offset: 20929}, + pos: position{line: 718, col: 27, offset: 20832}, val: "*", ignoreCase: false, want: "\"*\"", }, &litMatcher{ - pos: position{line: 716, col: 33, offset: 20935}, + pos: position{line: 718, col: 33, offset: 20838}, val: "/", ignoreCase: false, want: "\"/\"", }, &litMatcher{ - pos: position{line: 716, col: 39, offset: 20941}, + pos: position{line: 718, col: 39, offset: 20844}, val: "%", ignoreCase: false, want: "\"%\"", @@ -5959,43 +5962,43 @@ var g = &grammar{ }, { name: "NotExpr", - pos: position{line: 718, col: 1, offset: 20978}, + pos: position{line: 720, col: 1, offset: 20881}, expr: &choiceExpr{ - pos: position{line: 719, col: 5, offset: 20990}, + pos: position{line: 721, col: 5, offset: 20893}, alternatives: []any{ &actionExpr{ - pos: position{line: 719, col: 5, offset: 20990}, + pos: position{line: 721, col: 5, offset: 20893}, run: (*parser).callonNotExpr2, expr: &seqExpr{ - pos: position{line: 719, col: 5, offset: 20990}, + pos: position{line: 721, col: 5, offset: 20893}, exprs: []any{ &choiceExpr{ - pos: position{line: 719, col: 6, offset: 20991}, + pos: position{line: 721, col: 6, offset: 20894}, alternatives: []any{ &seqExpr{ - pos: position{line: 719, col: 6, offset: 20991}, + pos: position{line: 721, col: 6, offset: 20894}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 719, col: 6, offset: 20991}, + pos: position{line: 721, col: 6, offset: 20894}, name: "NotToken", }, &ruleRefExpr{ - pos: position{line: 719, col: 15, offset: 21000}, + pos: position{line: 721, col: 15, offset: 20903}, name: "_", }, }, }, &seqExpr{ - pos: position{line: 719, col: 19, offset: 21004}, + pos: position{line: 721, col: 19, offset: 20907}, exprs: []any{ &litMatcher{ - pos: position{line: 719, col: 19, offset: 21004}, + pos: position{line: 721, col: 19, offset: 20907}, val: "!", ignoreCase: false, want: "\"!\"", }, &ruleRefExpr{ - pos: position{line: 719, col: 23, offset: 21008}, + pos: position{line: 721, col: 23, offset: 20911}, name: "__", }, }, @@ -6003,10 +6006,10 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 719, col: 27, offset: 21012}, + pos: position{line: 721, col: 27, offset: 20915}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 719, col: 29, offset: 21014}, + pos: position{line: 721, col: 29, offset: 20917}, name: "NotExpr", }, }, @@ -6014,7 +6017,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 722, col: 5, offset: 21123}, + pos: position{line: 724, col: 5, offset: 21026}, name: "NegationExpr", }, }, @@ -6022,38 +6025,38 @@ var g = &grammar{ }, { name: "NegationExpr", - pos: position{line: 724, col: 1, offset: 21137}, + pos: position{line: 726, col: 1, offset: 21040}, expr: &choiceExpr{ - pos: position{line: 725, col: 5, offset: 21154}, + pos: position{line: 727, col: 5, offset: 21057}, alternatives: []any{ &actionExpr{ - pos: position{line: 725, col: 5, offset: 21154}, + pos: position{line: 727, col: 5, offset: 21057}, run: (*parser).callonNegationExpr2, expr: &seqExpr{ - pos: position{line: 725, col: 5, offset: 21154}, + pos: position{line: 727, col: 5, offset: 21057}, exprs: []any{ ¬Expr{ - pos: position{line: 725, col: 5, offset: 21154}, + pos: position{line: 727, col: 5, offset: 21057}, expr: &ruleRefExpr{ - pos: position{line: 725, col: 6, offset: 21155}, + pos: position{line: 727, col: 6, offset: 21058}, name: "Literal", }, }, &litMatcher{ - pos: position{line: 725, col: 14, offset: 21163}, + pos: position{line: 727, col: 14, offset: 21066}, val: "-", ignoreCase: false, want: "\"-\"", }, &ruleRefExpr{ - pos: position{line: 725, col: 18, offset: 21167}, + pos: position{line: 727, col: 18, offset: 21070}, name: "__", }, &labeledExpr{ - pos: position{line: 725, col: 21, offset: 21170}, + pos: position{line: 727, col: 21, offset: 21073}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 725, col: 23, offset: 21172}, + pos: position{line: 727, col: 23, offset: 21075}, name: "FuncExpr", }, }, @@ -6061,7 +6064,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 728, col: 5, offset: 21282}, + pos: position{line: 730, col: 5, offset: 21185}, name: "FuncExpr", }, }, @@ -6069,31 +6072,31 @@ var g = &grammar{ }, { name: "FuncExpr", - pos: position{line: 730, col: 1, offset: 21292}, + pos: position{line: 732, col: 1, offset: 21195}, expr: &choiceExpr{ - pos: position{line: 731, col: 5, offset: 21305}, + pos: position{line: 733, col: 5, offset: 21208}, alternatives: []any{ &actionExpr{ - pos: position{line: 731, col: 5, offset: 21305}, + pos: position{line: 733, col: 5, offset: 21208}, run: (*parser).callonFuncExpr2, expr: &seqExpr{ - pos: position{line: 731, col: 5, offset: 21305}, + pos: position{line: 733, col: 5, offset: 21208}, exprs: []any{ &labeledExpr{ - pos: position{line: 731, col: 5, offset: 21305}, + pos: position{line: 733, col: 5, offset: 21208}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 731, col: 11, offset: 21311}, + pos: position{line: 733, col: 11, offset: 21214}, name: "Cast", }, }, &labeledExpr{ - pos: position{line: 731, col: 16, offset: 21316}, + pos: position{line: 733, col: 16, offset: 21219}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 731, col: 21, offset: 21321}, + pos: position{line: 733, col: 21, offset: 21224}, expr: &ruleRefExpr{ - pos: position{line: 731, col: 22, offset: 21322}, + pos: position{line: 733, col: 22, offset: 21225}, name: "Deref", }, }, @@ -6102,26 +6105,26 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 734, col: 5, offset: 21393}, + pos: position{line: 736, col: 5, offset: 21296}, run: (*parser).callonFuncExpr9, expr: &seqExpr{ - pos: position{line: 734, col: 5, offset: 21393}, + pos: position{line: 736, col: 5, offset: 21296}, exprs: []any{ &labeledExpr{ - pos: position{line: 734, col: 5, offset: 21393}, + pos: position{line: 736, col: 5, offset: 21296}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 734, col: 11, offset: 21399}, + pos: position{line: 736, col: 11, offset: 21302}, name: "Function", }, }, &labeledExpr{ - pos: position{line: 734, col: 20, offset: 21408}, + pos: position{line: 736, col: 20, offset: 21311}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 734, col: 25, offset: 21413}, + pos: position{line: 736, col: 25, offset: 21316}, expr: &ruleRefExpr{ - pos: position{line: 734, col: 26, offset: 21414}, + pos: position{line: 736, col: 26, offset: 21317}, name: "Deref", }, }, @@ -6130,7 +6133,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 737, col: 5, offset: 21485}, + pos: position{line: 739, col: 5, offset: 21388}, name: "DerefExpr", }, }, @@ -6138,20 +6141,20 @@ var g = &grammar{ }, { name: "FuncGuard", - pos: position{line: 739, col: 1, offset: 21496}, + pos: position{line: 741, col: 1, offset: 21399}, expr: &seqExpr{ - pos: position{line: 739, col: 13, offset: 21508}, + pos: position{line: 741, col: 13, offset: 21411}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 739, col: 13, offset: 21508}, + pos: position{line: 741, col: 13, offset: 21411}, name: "NotFuncs", }, &ruleRefExpr{ - pos: position{line: 739, col: 22, offset: 21517}, + pos: position{line: 741, col: 22, offset: 21420}, name: "__", }, &litMatcher{ - pos: position{line: 739, col: 25, offset: 21520}, + pos: position{line: 741, col: 25, offset: 21423}, val: "(", ignoreCase: false, want: "\"(\"", @@ -6161,18 +6164,18 @@ var g = &grammar{ }, { name: "NotFuncs", - pos: position{line: 741, col: 1, offset: 21525}, + pos: position{line: 743, col: 1, offset: 21428}, expr: &choiceExpr{ - pos: position{line: 742, col: 5, offset: 21538}, + pos: position{line: 744, col: 5, offset: 21441}, alternatives: []any{ &litMatcher{ - pos: position{line: 742, col: 5, offset: 21538}, + pos: position{line: 744, col: 5, offset: 21441}, val: "not", ignoreCase: false, want: "\"not\"", }, &litMatcher{ - pos: position{line: 743, col: 5, offset: 21548}, + pos: position{line: 745, col: 5, offset: 21451}, val: "select", ignoreCase: false, want: "\"select\"", @@ -6182,58 +6185,58 @@ var g = &grammar{ }, { name: "Cast", - pos: position{line: 745, col: 1, offset: 21558}, + pos: position{line: 747, col: 1, offset: 21461}, expr: &actionExpr{ - pos: position{line: 746, col: 5, offset: 21567}, + pos: position{line: 748, col: 5, offset: 21470}, run: (*parser).callonCast1, expr: &seqExpr{ - pos: position{line: 746, col: 5, offset: 21567}, + pos: position{line: 748, col: 5, offset: 21470}, exprs: []any{ &labeledExpr{ - pos: position{line: 746, col: 5, offset: 21567}, + pos: position{line: 748, col: 5, offset: 21470}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 746, col: 9, offset: 21571}, + pos: position{line: 748, col: 9, offset: 21474}, name: "TypeLiteral", }, }, &ruleRefExpr{ - pos: position{line: 746, col: 21, offset: 21583}, + pos: position{line: 748, col: 21, offset: 21486}, name: "__", }, &litMatcher{ - pos: position{line: 746, col: 24, offset: 21586}, + pos: position{line: 748, col: 24, offset: 21489}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 746, col: 28, offset: 21590}, + pos: position{line: 748, col: 28, offset: 21493}, name: "__", }, &labeledExpr{ - pos: position{line: 746, col: 31, offset: 21593}, + pos: position{line: 748, col: 31, offset: 21496}, label: "expr", expr: &choiceExpr{ - pos: position{line: 746, col: 37, offset: 21599}, + pos: position{line: 748, col: 37, offset: 21502}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 746, col: 37, offset: 21599}, + pos: position{line: 748, col: 37, offset: 21502}, name: "OverExpr", }, &ruleRefExpr{ - pos: position{line: 746, col: 48, offset: 21610}, + pos: position{line: 748, col: 48, offset: 21513}, name: "Expr", }, }, }, }, &ruleRefExpr{ - pos: position{line: 746, col: 54, offset: 21616}, + pos: position{line: 748, col: 54, offset: 21519}, name: "__", }, &litMatcher{ - pos: position{line: 746, col: 57, offset: 21619}, + pos: position{line: 748, col: 57, offset: 21522}, val: ")", ignoreCase: false, want: "\")\"", @@ -6244,87 +6247,87 @@ var g = &grammar{ }, { name: "Function", - pos: position{line: 750, col: 1, offset: 21716}, + pos: position{line: 752, col: 1, offset: 21619}, expr: &choiceExpr{ - pos: position{line: 751, col: 5, offset: 21729}, + pos: position{line: 753, col: 5, offset: 21632}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 751, col: 5, offset: 21729}, + pos: position{line: 753, col: 5, offset: 21632}, name: "Grep", }, &actionExpr{ - pos: position{line: 753, col: 5, offset: 21816}, + pos: position{line: 755, col: 5, offset: 21719}, run: (*parser).callonFunction3, expr: &seqExpr{ - pos: position{line: 753, col: 5, offset: 21816}, + pos: position{line: 755, col: 5, offset: 21719}, exprs: []any{ &litMatcher{ - pos: position{line: 753, col: 5, offset: 21816}, + pos: position{line: 755, col: 5, offset: 21719}, val: "regexp", ignoreCase: false, want: "\"regexp\"", }, &ruleRefExpr{ - pos: position{line: 753, col: 14, offset: 21825}, + pos: position{line: 755, col: 14, offset: 21728}, name: "__", }, &litMatcher{ - pos: position{line: 753, col: 17, offset: 21828}, + pos: position{line: 755, col: 17, offset: 21731}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 753, col: 21, offset: 21832}, + pos: position{line: 755, col: 21, offset: 21735}, name: "__", }, &labeledExpr{ - pos: position{line: 753, col: 24, offset: 21835}, + pos: position{line: 755, col: 24, offset: 21738}, label: "arg0Text", expr: &ruleRefExpr{ - pos: position{line: 753, col: 33, offset: 21844}, + pos: position{line: 755, col: 33, offset: 21747}, name: "RegexpPattern", }, }, &ruleRefExpr{ - pos: position{line: 753, col: 47, offset: 21858}, + pos: position{line: 755, col: 47, offset: 21761}, name: "__", }, &litMatcher{ - pos: position{line: 753, col: 50, offset: 21861}, + pos: position{line: 755, col: 50, offset: 21764}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 753, col: 54, offset: 21865}, + pos: position{line: 755, col: 54, offset: 21768}, name: "__", }, &labeledExpr{ - pos: position{line: 753, col: 57, offset: 21868}, + pos: position{line: 755, col: 57, offset: 21771}, label: "arg1", expr: &ruleRefExpr{ - pos: position{line: 753, col: 62, offset: 21873}, + pos: position{line: 755, col: 62, offset: 21776}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 753, col: 67, offset: 21878}, + pos: position{line: 755, col: 67, offset: 21781}, name: "__", }, &litMatcher{ - pos: position{line: 753, col: 70, offset: 21881}, + pos: position{line: 755, col: 70, offset: 21784}, val: ")", ignoreCase: false, want: "\")\"", }, &labeledExpr{ - pos: position{line: 753, col: 74, offset: 21885}, + pos: position{line: 755, col: 74, offset: 21788}, label: "where", expr: &zeroOrOneExpr{ - pos: position{line: 753, col: 80, offset: 21891}, + pos: position{line: 755, col: 80, offset: 21794}, expr: &ruleRefExpr{ - pos: position{line: 753, col: 80, offset: 21891}, + pos: position{line: 755, col: 80, offset: 21794}, name: "WhereClause", }, }, @@ -6333,100 +6336,100 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 757, col: 5, offset: 22139}, + pos: position{line: 759, col: 5, offset: 22042}, run: (*parser).callonFunction21, expr: &seqExpr{ - pos: position{line: 757, col: 5, offset: 22139}, + pos: position{line: 759, col: 5, offset: 22042}, exprs: []any{ &litMatcher{ - pos: position{line: 757, col: 5, offset: 22139}, + pos: position{line: 759, col: 5, offset: 22042}, val: "regexp_replace", ignoreCase: false, want: "\"regexp_replace\"", }, &ruleRefExpr{ - pos: position{line: 757, col: 22, offset: 22156}, + pos: position{line: 759, col: 22, offset: 22059}, name: "__", }, &litMatcher{ - pos: position{line: 757, col: 25, offset: 22159}, + pos: position{line: 759, col: 25, offset: 22062}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 757, col: 29, offset: 22163}, + pos: position{line: 759, col: 29, offset: 22066}, name: "__", }, &labeledExpr{ - pos: position{line: 757, col: 32, offset: 22166}, + pos: position{line: 759, col: 32, offset: 22069}, label: "arg0", expr: &ruleRefExpr{ - pos: position{line: 757, col: 37, offset: 22171}, + pos: position{line: 759, col: 37, offset: 22074}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 757, col: 42, offset: 22176}, + pos: position{line: 759, col: 42, offset: 22079}, name: "__", }, &litMatcher{ - pos: position{line: 757, col: 45, offset: 22179}, + pos: position{line: 759, col: 45, offset: 22082}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 757, col: 49, offset: 22183}, + pos: position{line: 759, col: 49, offset: 22086}, name: "__", }, &labeledExpr{ - pos: position{line: 757, col: 52, offset: 22186}, + pos: position{line: 759, col: 52, offset: 22089}, label: "arg1Text", expr: &ruleRefExpr{ - pos: position{line: 757, col: 61, offset: 22195}, + pos: position{line: 759, col: 61, offset: 22098}, name: "RegexpPattern", }, }, &ruleRefExpr{ - pos: position{line: 757, col: 75, offset: 22209}, + pos: position{line: 759, col: 75, offset: 22112}, name: "__", }, &litMatcher{ - pos: position{line: 757, col: 78, offset: 22212}, + pos: position{line: 759, col: 78, offset: 22115}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 757, col: 82, offset: 22216}, + pos: position{line: 759, col: 82, offset: 22119}, name: "__", }, &labeledExpr{ - pos: position{line: 757, col: 85, offset: 22219}, + pos: position{line: 759, col: 85, offset: 22122}, label: "arg2", expr: &ruleRefExpr{ - pos: position{line: 757, col: 90, offset: 22224}, + pos: position{line: 759, col: 90, offset: 22127}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 757, col: 95, offset: 22229}, + pos: position{line: 759, col: 95, offset: 22132}, name: "__", }, &litMatcher{ - pos: position{line: 757, col: 98, offset: 22232}, + pos: position{line: 759, col: 98, offset: 22135}, val: ")", ignoreCase: false, want: "\")\"", }, &labeledExpr{ - pos: position{line: 757, col: 102, offset: 22236}, + pos: position{line: 759, col: 102, offset: 22139}, label: "where", expr: &zeroOrOneExpr{ - pos: position{line: 757, col: 108, offset: 22242}, + pos: position{line: 759, col: 108, offset: 22145}, expr: &ruleRefExpr{ - pos: position{line: 757, col: 108, offset: 22242}, + pos: position{line: 759, col: 108, offset: 22145}, name: "WhereClause", }, }, @@ -6435,65 +6438,65 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 761, col: 5, offset: 22504}, + pos: position{line: 763, col: 5, offset: 22407}, run: (*parser).callonFunction44, expr: &seqExpr{ - pos: position{line: 761, col: 5, offset: 22504}, + pos: position{line: 763, col: 5, offset: 22407}, exprs: []any{ ¬Expr{ - pos: position{line: 761, col: 5, offset: 22504}, + pos: position{line: 763, col: 5, offset: 22407}, expr: &ruleRefExpr{ - pos: position{line: 761, col: 6, offset: 22505}, + pos: position{line: 763, col: 6, offset: 22408}, name: "FuncGuard", }, }, &labeledExpr{ - pos: position{line: 761, col: 16, offset: 22515}, + pos: position{line: 763, col: 16, offset: 22418}, label: "fn", expr: &ruleRefExpr{ - pos: position{line: 761, col: 19, offset: 22518}, + pos: position{line: 763, col: 19, offset: 22421}, name: "IdentifierName", }, }, &ruleRefExpr{ - pos: position{line: 761, col: 34, offset: 22533}, + pos: position{line: 763, col: 34, offset: 22436}, name: "__", }, &litMatcher{ - pos: position{line: 761, col: 37, offset: 22536}, + pos: position{line: 763, col: 37, offset: 22439}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 761, col: 41, offset: 22540}, + pos: position{line: 763, col: 41, offset: 22443}, name: "__", }, &labeledExpr{ - pos: position{line: 761, col: 44, offset: 22543}, + pos: position{line: 763, col: 44, offset: 22446}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 761, col: 49, offset: 22548}, + pos: position{line: 763, col: 49, offset: 22451}, name: "FunctionArgs", }, }, &ruleRefExpr{ - pos: position{line: 761, col: 62, offset: 22561}, + pos: position{line: 763, col: 62, offset: 22464}, name: "__", }, &litMatcher{ - pos: position{line: 761, col: 65, offset: 22564}, + pos: position{line: 763, col: 65, offset: 22467}, val: ")", ignoreCase: false, want: "\")\"", }, &labeledExpr{ - pos: position{line: 761, col: 69, offset: 22568}, + pos: position{line: 763, col: 69, offset: 22471}, label: "where", expr: &zeroOrOneExpr{ - pos: position{line: 761, col: 75, offset: 22574}, + pos: position{line: 763, col: 75, offset: 22477}, expr: &ruleRefExpr{ - pos: position{line: 761, col: 75, offset: 22574}, + pos: position{line: 763, col: 75, offset: 22477}, name: "WhereClause", }, }, @@ -6506,24 +6509,24 @@ var g = &grammar{ }, { name: "FunctionArgs", - pos: position{line: 765, col: 1, offset: 22695}, + pos: position{line: 767, col: 1, offset: 22598}, expr: &choiceExpr{ - pos: position{line: 766, col: 5, offset: 22712}, + pos: position{line: 768, col: 5, offset: 22615}, alternatives: []any{ &actionExpr{ - pos: position{line: 766, col: 5, offset: 22712}, + pos: position{line: 768, col: 5, offset: 22615}, run: (*parser).callonFunctionArgs2, expr: &labeledExpr{ - pos: position{line: 766, col: 5, offset: 22712}, + pos: position{line: 768, col: 5, offset: 22615}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 766, col: 7, offset: 22714}, + pos: position{line: 768, col: 7, offset: 22617}, name: "OverExpr", }, }, }, &ruleRefExpr{ - pos: position{line: 767, col: 5, offset: 22760}, + pos: position{line: 769, col: 5, offset: 22663}, name: "OptionalExprs", }, }, @@ -6531,91 +6534,91 @@ var g = &grammar{ }, { name: "Grep", - pos: position{line: 769, col: 1, offset: 22775}, + pos: position{line: 771, col: 1, offset: 22678}, expr: &actionExpr{ - pos: position{line: 770, col: 5, offset: 22784}, + pos: position{line: 772, col: 5, offset: 22687}, run: (*parser).callonGrep1, expr: &seqExpr{ - pos: position{line: 770, col: 5, offset: 22784}, + pos: position{line: 772, col: 5, offset: 22687}, exprs: []any{ &litMatcher{ - pos: position{line: 770, col: 5, offset: 22784}, + pos: position{line: 772, col: 5, offset: 22687}, val: "grep", ignoreCase: false, want: "\"grep\"", }, &ruleRefExpr{ - pos: position{line: 770, col: 12, offset: 22791}, + pos: position{line: 772, col: 12, offset: 22694}, name: "__", }, &litMatcher{ - pos: position{line: 770, col: 15, offset: 22794}, + pos: position{line: 772, col: 15, offset: 22697}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 770, col: 19, offset: 22798}, + pos: position{line: 772, col: 19, offset: 22701}, name: "__", }, &labeledExpr{ - pos: position{line: 770, col: 22, offset: 22801}, + pos: position{line: 772, col: 22, offset: 22704}, label: "pattern", expr: &choiceExpr{ - pos: position{line: 770, col: 31, offset: 22810}, + pos: position{line: 772, col: 31, offset: 22713}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 770, col: 31, offset: 22810}, + pos: position{line: 772, col: 31, offset: 22713}, name: "Regexp", }, &ruleRefExpr{ - pos: position{line: 770, col: 40, offset: 22819}, + pos: position{line: 772, col: 40, offset: 22722}, name: "Glob", }, &ruleRefExpr{ - pos: position{line: 770, col: 47, offset: 22826}, + pos: position{line: 772, col: 47, offset: 22729}, name: "Expr", }, }, }, }, &ruleRefExpr{ - pos: position{line: 770, col: 53, offset: 22832}, + pos: position{line: 772, col: 53, offset: 22735}, name: "__", }, &labeledExpr{ - pos: position{line: 770, col: 56, offset: 22835}, + pos: position{line: 772, col: 56, offset: 22738}, label: "opt", expr: &zeroOrOneExpr{ - pos: position{line: 770, col: 60, offset: 22839}, + pos: position{line: 772, col: 60, offset: 22742}, expr: &seqExpr{ - pos: position{line: 770, col: 61, offset: 22840}, + pos: position{line: 772, col: 61, offset: 22743}, exprs: []any{ &litMatcher{ - pos: position{line: 770, col: 61, offset: 22840}, + pos: position{line: 772, col: 61, offset: 22743}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 770, col: 65, offset: 22844}, + pos: position{line: 772, col: 65, offset: 22747}, name: "__", }, &choiceExpr{ - pos: position{line: 770, col: 69, offset: 22848}, + pos: position{line: 772, col: 69, offset: 22751}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 770, col: 69, offset: 22848}, + pos: position{line: 772, col: 69, offset: 22751}, name: "OverExpr", }, &ruleRefExpr{ - pos: position{line: 770, col: 80, offset: 22859}, + pos: position{line: 772, col: 80, offset: 22762}, name: "Expr", }, }, }, &ruleRefExpr{ - pos: position{line: 770, col: 86, offset: 22865}, + pos: position{line: 772, col: 86, offset: 22768}, name: "__", }, }, @@ -6623,7 +6626,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 770, col: 91, offset: 22870}, + pos: position{line: 772, col: 91, offset: 22773}, val: ")", ignoreCase: false, want: "\")\"", @@ -6634,19 +6637,19 @@ var g = &grammar{ }, { name: "OptionalExprs", - pos: position{line: 778, col: 1, offset: 23111}, + pos: position{line: 780, col: 1, offset: 23014}, expr: &choiceExpr{ - pos: position{line: 779, col: 5, offset: 23129}, + pos: position{line: 781, col: 5, offset: 23032}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 779, col: 5, offset: 23129}, + pos: position{line: 781, col: 5, offset: 23032}, name: "Exprs", }, &actionExpr{ - pos: position{line: 780, col: 5, offset: 23139}, + pos: position{line: 782, col: 5, offset: 23042}, run: (*parser).callonOptionalExprs3, expr: &ruleRefExpr{ - pos: position{line: 780, col: 5, offset: 23139}, + pos: position{line: 782, col: 5, offset: 23042}, name: "__", }, }, @@ -6655,51 +6658,51 @@ var g = &grammar{ }, { name: "Exprs", - pos: position{line: 782, col: 1, offset: 23175}, + pos: position{line: 784, col: 1, offset: 23078}, expr: &actionExpr{ - pos: position{line: 783, col: 5, offset: 23185}, + pos: position{line: 785, col: 5, offset: 23088}, run: (*parser).callonExprs1, expr: &seqExpr{ - pos: position{line: 783, col: 5, offset: 23185}, + pos: position{line: 785, col: 5, offset: 23088}, exprs: []any{ &labeledExpr{ - pos: position{line: 783, col: 5, offset: 23185}, + pos: position{line: 785, col: 5, offset: 23088}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 783, col: 11, offset: 23191}, + pos: position{line: 785, col: 11, offset: 23094}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 783, col: 16, offset: 23196}, + pos: position{line: 785, col: 16, offset: 23099}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 783, col: 21, offset: 23201}, + pos: position{line: 785, col: 21, offset: 23104}, expr: &actionExpr{ - pos: position{line: 783, col: 22, offset: 23202}, + pos: position{line: 785, col: 22, offset: 23105}, run: (*parser).callonExprs7, expr: &seqExpr{ - pos: position{line: 783, col: 22, offset: 23202}, + pos: position{line: 785, col: 22, offset: 23105}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 783, col: 22, offset: 23202}, + pos: position{line: 785, col: 22, offset: 23105}, name: "__", }, &litMatcher{ - pos: position{line: 783, col: 25, offset: 23205}, + pos: position{line: 785, col: 25, offset: 23108}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 783, col: 29, offset: 23209}, + pos: position{line: 785, col: 29, offset: 23112}, name: "__", }, &labeledExpr{ - pos: position{line: 783, col: 32, offset: 23212}, + pos: position{line: 785, col: 32, offset: 23115}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 783, col: 34, offset: 23214}, + pos: position{line: 785, col: 34, offset: 23117}, name: "Expr", }, }, @@ -6714,28 +6717,28 @@ var g = &grammar{ }, { name: "DerefExpr", - pos: position{line: 787, col: 1, offset: 23323}, + pos: position{line: 789, col: 1, offset: 23226}, expr: &actionExpr{ - pos: position{line: 788, col: 5, offset: 23337}, + pos: position{line: 790, col: 5, offset: 23240}, run: (*parser).callonDerefExpr1, expr: &seqExpr{ - pos: position{line: 788, col: 5, offset: 23337}, + pos: position{line: 790, col: 5, offset: 23240}, exprs: []any{ &labeledExpr{ - pos: position{line: 788, col: 5, offset: 23337}, + pos: position{line: 790, col: 5, offset: 23240}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 788, col: 11, offset: 23343}, + pos: position{line: 790, col: 11, offset: 23246}, name: "Primary", }, }, &labeledExpr{ - pos: position{line: 788, col: 19, offset: 23351}, + pos: position{line: 790, col: 19, offset: 23254}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 788, col: 24, offset: 23356}, + pos: position{line: 790, col: 24, offset: 23259}, expr: &ruleRefExpr{ - pos: position{line: 788, col: 25, offset: 23357}, + pos: position{line: 790, col: 25, offset: 23260}, name: "Deref", }, }, @@ -6746,57 +6749,57 @@ var g = &grammar{ }, { name: "Deref", - pos: position{line: 792, col: 1, offset: 23425}, + pos: position{line: 794, col: 1, offset: 23328}, expr: &choiceExpr{ - pos: position{line: 793, col: 5, offset: 23435}, + pos: position{line: 795, col: 5, offset: 23338}, alternatives: []any{ &actionExpr{ - pos: position{line: 793, col: 5, offset: 23435}, + pos: position{line: 795, col: 5, offset: 23338}, run: (*parser).callonDeref2, expr: &seqExpr{ - pos: position{line: 793, col: 5, offset: 23435}, + pos: position{line: 795, col: 5, offset: 23338}, exprs: []any{ &litMatcher{ - pos: position{line: 793, col: 5, offset: 23435}, + pos: position{line: 795, col: 5, offset: 23338}, val: "[", ignoreCase: false, want: "\"[\"", }, &labeledExpr{ - pos: position{line: 793, col: 9, offset: 23439}, + pos: position{line: 795, col: 9, offset: 23342}, label: "from", expr: &ruleRefExpr{ - pos: position{line: 793, col: 14, offset: 23444}, + pos: position{line: 795, col: 14, offset: 23347}, name: "AdditiveExpr", }, }, &ruleRefExpr{ - pos: position{line: 793, col: 27, offset: 23457}, + pos: position{line: 795, col: 27, offset: 23360}, name: "__", }, &litMatcher{ - pos: position{line: 793, col: 30, offset: 23460}, + pos: position{line: 795, col: 30, offset: 23363}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 793, col: 34, offset: 23464}, + pos: position{line: 795, col: 34, offset: 23367}, name: "__", }, &labeledExpr{ - pos: position{line: 793, col: 37, offset: 23467}, + pos: position{line: 795, col: 37, offset: 23370}, label: "to", expr: &zeroOrOneExpr{ - pos: position{line: 793, col: 40, offset: 23470}, + pos: position{line: 795, col: 40, offset: 23373}, expr: &ruleRefExpr{ - pos: position{line: 793, col: 40, offset: 23470}, + pos: position{line: 795, col: 40, offset: 23373}, name: "AdditiveExpr", }, }, }, &litMatcher{ - pos: position{line: 793, col: 54, offset: 23484}, + pos: position{line: 795, col: 54, offset: 23387}, val: "]", ignoreCase: false, want: "\"]\"", @@ -6805,41 +6808,41 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 799, col: 5, offset: 23658}, + pos: position{line: 801, col: 5, offset: 23561}, run: (*parser).callonDeref14, expr: &seqExpr{ - pos: position{line: 799, col: 5, offset: 23658}, + pos: position{line: 801, col: 5, offset: 23561}, exprs: []any{ &litMatcher{ - pos: position{line: 799, col: 5, offset: 23658}, + pos: position{line: 801, col: 5, offset: 23561}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 799, col: 9, offset: 23662}, + pos: position{line: 801, col: 9, offset: 23565}, name: "__", }, &litMatcher{ - pos: position{line: 799, col: 12, offset: 23665}, + pos: position{line: 801, col: 12, offset: 23568}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 799, col: 16, offset: 23669}, + pos: position{line: 801, col: 16, offset: 23572}, name: "__", }, &labeledExpr{ - pos: position{line: 799, col: 19, offset: 23672}, + pos: position{line: 801, col: 19, offset: 23575}, label: "to", expr: &ruleRefExpr{ - pos: position{line: 799, col: 22, offset: 23675}, + pos: position{line: 801, col: 22, offset: 23578}, name: "AdditiveExpr", }, }, &litMatcher{ - pos: position{line: 799, col: 35, offset: 23688}, + pos: position{line: 801, col: 35, offset: 23591}, val: "]", ignoreCase: false, want: "\"]\"", @@ -6848,27 +6851,27 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 805, col: 5, offset: 23861}, + pos: position{line: 807, col: 5, offset: 23764}, run: (*parser).callonDeref23, expr: &seqExpr{ - pos: position{line: 805, col: 5, offset: 23861}, + pos: position{line: 807, col: 5, offset: 23764}, exprs: []any{ &litMatcher{ - pos: position{line: 805, col: 5, offset: 23861}, + pos: position{line: 807, col: 5, offset: 23764}, val: "[", ignoreCase: false, want: "\"[\"", }, &labeledExpr{ - pos: position{line: 805, col: 9, offset: 23865}, + pos: position{line: 807, col: 9, offset: 23768}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 805, col: 14, offset: 23870}, + pos: position{line: 807, col: 14, offset: 23773}, name: "Expr", }, }, &litMatcher{ - pos: position{line: 805, col: 19, offset: 23875}, + pos: position{line: 807, col: 19, offset: 23778}, val: "]", ignoreCase: false, want: "\"]\"", @@ -6877,22 +6880,22 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 806, col: 5, offset: 23924}, + pos: position{line: 808, col: 5, offset: 23827}, run: (*parser).callonDeref29, expr: &seqExpr{ - pos: position{line: 806, col: 5, offset: 23924}, + pos: position{line: 808, col: 5, offset: 23827}, exprs: []any{ &litMatcher{ - pos: position{line: 806, col: 5, offset: 23924}, + pos: position{line: 808, col: 5, offset: 23827}, val: ".", ignoreCase: false, want: "\".\"", }, &labeledExpr{ - pos: position{line: 806, col: 9, offset: 23928}, + pos: position{line: 808, col: 9, offset: 23831}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 806, col: 12, offset: 23931}, + pos: position{line: 808, col: 12, offset: 23834}, name: "Identifier", }, }, @@ -6904,64 +6907,64 @@ var g = &grammar{ }, { name: "Primary", - pos: position{line: 808, col: 1, offset: 23982}, + pos: position{line: 810, col: 1, offset: 23885}, expr: &choiceExpr{ - pos: position{line: 809, col: 5, offset: 23994}, + pos: position{line: 811, col: 5, offset: 23897}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 809, col: 5, offset: 23994}, + pos: position{line: 811, col: 5, offset: 23897}, name: "Record", }, &ruleRefExpr{ - pos: position{line: 810, col: 5, offset: 24005}, + pos: position{line: 812, col: 5, offset: 23908}, name: "Array", }, &ruleRefExpr{ - pos: position{line: 811, col: 5, offset: 24015}, + pos: position{line: 813, col: 5, offset: 23918}, name: "Set", }, &ruleRefExpr{ - pos: position{line: 812, col: 5, offset: 24023}, + pos: position{line: 814, col: 5, offset: 23926}, name: "Map", }, &ruleRefExpr{ - pos: position{line: 813, col: 5, offset: 24031}, + pos: position{line: 815, col: 5, offset: 23934}, name: "Literal", }, &ruleRefExpr{ - pos: position{line: 814, col: 5, offset: 24043}, + pos: position{line: 816, col: 5, offset: 23946}, name: "Identifier", }, &actionExpr{ - pos: position{line: 815, col: 5, offset: 24058}, + pos: position{line: 817, col: 5, offset: 23961}, run: (*parser).callonPrimary8, expr: &seqExpr{ - pos: position{line: 815, col: 5, offset: 24058}, + pos: position{line: 817, col: 5, offset: 23961}, exprs: []any{ &litMatcher{ - pos: position{line: 815, col: 5, offset: 24058}, + pos: position{line: 817, col: 5, offset: 23961}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 815, col: 9, offset: 24062}, + pos: position{line: 817, col: 9, offset: 23965}, name: "__", }, &labeledExpr{ - pos: position{line: 815, col: 12, offset: 24065}, + pos: position{line: 817, col: 12, offset: 23968}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 815, col: 17, offset: 24070}, + pos: position{line: 817, col: 17, offset: 23973}, name: "OverExpr", }, }, &ruleRefExpr{ - pos: position{line: 815, col: 26, offset: 24079}, + pos: position{line: 817, col: 26, offset: 23982}, name: "__", }, &litMatcher{ - pos: position{line: 815, col: 29, offset: 24082}, + pos: position{line: 817, col: 29, offset: 23985}, val: ")", ignoreCase: false, want: "\")\"", @@ -6970,35 +6973,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 816, col: 5, offset: 24111}, + pos: position{line: 818, col: 5, offset: 24014}, run: (*parser).callonPrimary16, expr: &seqExpr{ - pos: position{line: 816, col: 5, offset: 24111}, + pos: position{line: 818, col: 5, offset: 24014}, exprs: []any{ &litMatcher{ - pos: position{line: 816, col: 5, offset: 24111}, + pos: position{line: 818, col: 5, offset: 24014}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 816, col: 9, offset: 24115}, + pos: position{line: 818, col: 9, offset: 24018}, name: "__", }, &labeledExpr{ - pos: position{line: 816, col: 12, offset: 24118}, + pos: position{line: 818, col: 12, offset: 24021}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 816, col: 17, offset: 24123}, + pos: position{line: 818, col: 17, offset: 24026}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 816, col: 22, offset: 24128}, + pos: position{line: 818, col: 22, offset: 24031}, name: "__", }, &litMatcher{ - pos: position{line: 816, col: 25, offset: 24131}, + pos: position{line: 818, col: 25, offset: 24034}, val: ")", ignoreCase: false, want: "\")\"", @@ -7011,61 +7014,61 @@ var g = &grammar{ }, { name: "OverExpr", - pos: position{line: 818, col: 1, offset: 24157}, + pos: position{line: 820, col: 1, offset: 24060}, expr: &actionExpr{ - pos: position{line: 819, col: 5, offset: 24170}, + pos: position{line: 821, col: 5, offset: 24073}, run: (*parser).callonOverExpr1, expr: &seqExpr{ - pos: position{line: 819, col: 5, offset: 24170}, + pos: position{line: 821, col: 5, offset: 24073}, exprs: []any{ &litMatcher{ - pos: position{line: 819, col: 5, offset: 24170}, + pos: position{line: 821, col: 5, offset: 24073}, val: "over", ignoreCase: false, want: "\"over\"", }, &ruleRefExpr{ - pos: position{line: 819, col: 12, offset: 24177}, + pos: position{line: 821, col: 12, offset: 24080}, name: "_", }, &labeledExpr{ - pos: position{line: 819, col: 14, offset: 24179}, + pos: position{line: 821, col: 14, offset: 24082}, label: "exprs", expr: &ruleRefExpr{ - pos: position{line: 819, col: 20, offset: 24185}, + pos: position{line: 821, col: 20, offset: 24088}, name: "Exprs", }, }, &labeledExpr{ - pos: position{line: 819, col: 26, offset: 24191}, + pos: position{line: 821, col: 26, offset: 24094}, label: "locals", expr: &zeroOrOneExpr{ - pos: position{line: 819, col: 33, offset: 24198}, + pos: position{line: 821, col: 33, offset: 24101}, expr: &ruleRefExpr{ - pos: position{line: 819, col: 33, offset: 24198}, + pos: position{line: 821, col: 33, offset: 24101}, name: "Locals", }, }, }, &ruleRefExpr{ - pos: position{line: 819, col: 41, offset: 24206}, + pos: position{line: 821, col: 41, offset: 24109}, name: "__", }, &litMatcher{ - pos: position{line: 819, col: 44, offset: 24209}, + pos: position{line: 821, col: 44, offset: 24112}, val: "|", ignoreCase: false, want: "\"|\"", }, &ruleRefExpr{ - pos: position{line: 819, col: 48, offset: 24213}, + pos: position{line: 821, col: 48, offset: 24116}, name: "__", }, &labeledExpr{ - pos: position{line: 819, col: 51, offset: 24216}, + pos: position{line: 821, col: 51, offset: 24119}, label: "body", expr: &ruleRefExpr{ - pos: position{line: 819, col: 56, offset: 24221}, + pos: position{line: 821, col: 56, offset: 24124}, name: "Seq", }, }, @@ -7075,37 +7078,37 @@ var g = &grammar{ }, { name: "Record", - pos: position{line: 823, col: 1, offset: 24343}, + pos: position{line: 825, col: 1, offset: 24246}, expr: &actionExpr{ - pos: position{line: 824, col: 5, offset: 24354}, + pos: position{line: 826, col: 5, offset: 24257}, run: (*parser).callonRecord1, expr: &seqExpr{ - pos: position{line: 824, col: 5, offset: 24354}, + pos: position{line: 826, col: 5, offset: 24257}, exprs: []any{ &litMatcher{ - pos: position{line: 824, col: 5, offset: 24354}, + pos: position{line: 826, col: 5, offset: 24257}, val: "{", ignoreCase: false, want: "\"{\"", }, &ruleRefExpr{ - pos: position{line: 824, col: 9, offset: 24358}, + pos: position{line: 826, col: 9, offset: 24261}, name: "__", }, &labeledExpr{ - pos: position{line: 824, col: 12, offset: 24361}, + pos: position{line: 826, col: 12, offset: 24264}, label: "elems", expr: &ruleRefExpr{ - pos: position{line: 824, col: 18, offset: 24367}, + pos: position{line: 826, col: 18, offset: 24270}, name: "RecordElems", }, }, &ruleRefExpr{ - pos: position{line: 824, col: 30, offset: 24379}, + pos: position{line: 826, col: 30, offset: 24282}, name: "__", }, &litMatcher{ - pos: position{line: 824, col: 33, offset: 24382}, + pos: position{line: 826, col: 33, offset: 24285}, val: "}", ignoreCase: false, want: "\"}\"", @@ -7116,31 +7119,31 @@ var g = &grammar{ }, { name: "RecordElems", - pos: position{line: 828, col: 1, offset: 24474}, + pos: position{line: 830, col: 1, offset: 24377}, expr: &choiceExpr{ - pos: position{line: 829, col: 5, offset: 24490}, + pos: position{line: 831, col: 5, offset: 24393}, alternatives: []any{ &actionExpr{ - pos: position{line: 829, col: 5, offset: 24490}, + pos: position{line: 831, col: 5, offset: 24393}, run: (*parser).callonRecordElems2, expr: &seqExpr{ - pos: position{line: 829, col: 5, offset: 24490}, + pos: position{line: 831, col: 5, offset: 24393}, exprs: []any{ &labeledExpr{ - pos: position{line: 829, col: 5, offset: 24490}, + pos: position{line: 831, col: 5, offset: 24393}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 829, col: 11, offset: 24496}, + pos: position{line: 831, col: 11, offset: 24399}, name: "RecordElem", }, }, &labeledExpr{ - pos: position{line: 829, col: 22, offset: 24507}, + pos: position{line: 831, col: 22, offset: 24410}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 829, col: 27, offset: 24512}, + pos: position{line: 831, col: 27, offset: 24415}, expr: &ruleRefExpr{ - pos: position{line: 829, col: 27, offset: 24512}, + pos: position{line: 831, col: 27, offset: 24415}, name: "RecordElemTail", }, }, @@ -7149,10 +7152,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 832, col: 5, offset: 24611}, + pos: position{line: 834, col: 5, offset: 24514}, run: (*parser).callonRecordElems9, expr: &ruleRefExpr{ - pos: position{line: 832, col: 5, offset: 24611}, + pos: position{line: 834, col: 5, offset: 24514}, name: "__", }, }, @@ -7161,32 +7164,32 @@ var g = &grammar{ }, { name: "RecordElemTail", - pos: position{line: 834, col: 1, offset: 24647}, + pos: position{line: 836, col: 1, offset: 24550}, expr: &actionExpr{ - pos: position{line: 834, col: 18, offset: 24664}, + pos: position{line: 836, col: 18, offset: 24567}, run: (*parser).callonRecordElemTail1, expr: &seqExpr{ - pos: position{line: 834, col: 18, offset: 24664}, + pos: position{line: 836, col: 18, offset: 24567}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 834, col: 18, offset: 24664}, + pos: position{line: 836, col: 18, offset: 24567}, name: "__", }, &litMatcher{ - pos: position{line: 834, col: 21, offset: 24667}, + pos: position{line: 836, col: 21, offset: 24570}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 834, col: 25, offset: 24671}, + pos: position{line: 836, col: 25, offset: 24574}, name: "__", }, &labeledExpr{ - pos: position{line: 834, col: 28, offset: 24674}, + pos: position{line: 836, col: 28, offset: 24577}, label: "elem", expr: &ruleRefExpr{ - pos: position{line: 834, col: 33, offset: 24679}, + pos: position{line: 836, col: 33, offset: 24582}, name: "RecordElem", }, }, @@ -7196,20 +7199,20 @@ var g = &grammar{ }, { name: "RecordElem", - pos: position{line: 836, col: 1, offset: 24712}, + pos: position{line: 838, col: 1, offset: 24615}, expr: &choiceExpr{ - pos: position{line: 837, col: 5, offset: 24727}, + pos: position{line: 839, col: 5, offset: 24630}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 837, col: 5, offset: 24727}, + pos: position{line: 839, col: 5, offset: 24630}, name: "Spread", }, &ruleRefExpr{ - pos: position{line: 838, col: 5, offset: 24738}, + pos: position{line: 840, col: 5, offset: 24641}, name: "Field", }, &ruleRefExpr{ - pos: position{line: 839, col: 5, offset: 24748}, + pos: position{line: 841, col: 5, offset: 24651}, name: "Identifier", }, }, @@ -7217,28 +7220,28 @@ var g = &grammar{ }, { name: "Spread", - pos: position{line: 841, col: 1, offset: 24760}, + pos: position{line: 843, col: 1, offset: 24663}, expr: &actionExpr{ - pos: position{line: 842, col: 5, offset: 24771}, + pos: position{line: 844, col: 5, offset: 24674}, run: (*parser).callonSpread1, expr: &seqExpr{ - pos: position{line: 842, col: 5, offset: 24771}, + pos: position{line: 844, col: 5, offset: 24674}, exprs: []any{ &litMatcher{ - pos: position{line: 842, col: 5, offset: 24771}, + pos: position{line: 844, col: 5, offset: 24674}, val: "...", ignoreCase: false, want: "\"...\"", }, &ruleRefExpr{ - pos: position{line: 842, col: 11, offset: 24777}, + pos: position{line: 844, col: 11, offset: 24680}, name: "__", }, &labeledExpr{ - pos: position{line: 842, col: 14, offset: 24780}, + pos: position{line: 844, col: 14, offset: 24683}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 842, col: 19, offset: 24785}, + pos: position{line: 844, col: 19, offset: 24688}, name: "Expr", }, }, @@ -7248,40 +7251,40 @@ var g = &grammar{ }, { name: "Field", - pos: position{line: 846, col: 1, offset: 24872}, + pos: position{line: 848, col: 1, offset: 24775}, expr: &actionExpr{ - pos: position{line: 847, col: 5, offset: 24882}, + pos: position{line: 849, col: 5, offset: 24785}, run: (*parser).callonField1, expr: &seqExpr{ - pos: position{line: 847, col: 5, offset: 24882}, + pos: position{line: 849, col: 5, offset: 24785}, exprs: []any{ &labeledExpr{ - pos: position{line: 847, col: 5, offset: 24882}, + pos: position{line: 849, col: 5, offset: 24785}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 847, col: 10, offset: 24887}, + pos: position{line: 849, col: 10, offset: 24790}, name: "FieldName", }, }, &ruleRefExpr{ - pos: position{line: 847, col: 20, offset: 24897}, + pos: position{line: 849, col: 20, offset: 24800}, name: "__", }, &litMatcher{ - pos: position{line: 847, col: 23, offset: 24900}, + pos: position{line: 849, col: 23, offset: 24803}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 847, col: 27, offset: 24904}, + pos: position{line: 849, col: 27, offset: 24807}, name: "__", }, &labeledExpr{ - pos: position{line: 847, col: 30, offset: 24907}, + pos: position{line: 849, col: 30, offset: 24810}, label: "value", expr: &ruleRefExpr{ - pos: position{line: 847, col: 36, offset: 24913}, + pos: position{line: 849, col: 36, offset: 24816}, name: "Expr", }, }, @@ -7291,37 +7294,37 @@ var g = &grammar{ }, { name: "Array", - pos: position{line: 851, col: 1, offset: 25015}, + pos: position{line: 853, col: 1, offset: 24918}, expr: &actionExpr{ - pos: position{line: 852, col: 5, offset: 25025}, + pos: position{line: 854, col: 5, offset: 24928}, run: (*parser).callonArray1, expr: &seqExpr{ - pos: position{line: 852, col: 5, offset: 25025}, + pos: position{line: 854, col: 5, offset: 24928}, exprs: []any{ &litMatcher{ - pos: position{line: 852, col: 5, offset: 25025}, + pos: position{line: 854, col: 5, offset: 24928}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 852, col: 9, offset: 25029}, + pos: position{line: 854, col: 9, offset: 24932}, name: "__", }, &labeledExpr{ - pos: position{line: 852, col: 12, offset: 25032}, + pos: position{line: 854, col: 12, offset: 24935}, label: "elems", expr: &ruleRefExpr{ - pos: position{line: 852, col: 18, offset: 25038}, + pos: position{line: 854, col: 18, offset: 24941}, name: "VectorElems", }, }, &ruleRefExpr{ - pos: position{line: 852, col: 30, offset: 25050}, + pos: position{line: 854, col: 30, offset: 24953}, name: "__", }, &litMatcher{ - pos: position{line: 852, col: 33, offset: 25053}, + pos: position{line: 854, col: 33, offset: 24956}, val: "]", ignoreCase: false, want: "\"]\"", @@ -7332,37 +7335,37 @@ var g = &grammar{ }, { name: "Set", - pos: position{line: 856, col: 1, offset: 25144}, + pos: position{line: 858, col: 1, offset: 25047}, expr: &actionExpr{ - pos: position{line: 857, col: 5, offset: 25152}, + pos: position{line: 859, col: 5, offset: 25055}, run: (*parser).callonSet1, expr: &seqExpr{ - pos: position{line: 857, col: 5, offset: 25152}, + pos: position{line: 859, col: 5, offset: 25055}, exprs: []any{ &litMatcher{ - pos: position{line: 857, col: 5, offset: 25152}, + pos: position{line: 859, col: 5, offset: 25055}, val: "|[", ignoreCase: false, want: "\"|[\"", }, &ruleRefExpr{ - pos: position{line: 857, col: 10, offset: 25157}, + pos: position{line: 859, col: 10, offset: 25060}, name: "__", }, &labeledExpr{ - pos: position{line: 857, col: 13, offset: 25160}, + pos: position{line: 859, col: 13, offset: 25063}, label: "elems", expr: &ruleRefExpr{ - pos: position{line: 857, col: 19, offset: 25166}, + pos: position{line: 859, col: 19, offset: 25069}, name: "VectorElems", }, }, &ruleRefExpr{ - pos: position{line: 857, col: 31, offset: 25178}, + pos: position{line: 859, col: 31, offset: 25081}, name: "__", }, &litMatcher{ - pos: position{line: 857, col: 34, offset: 25181}, + pos: position{line: 859, col: 34, offset: 25084}, val: "]|", ignoreCase: false, want: "\"]|\"", @@ -7373,54 +7376,54 @@ var g = &grammar{ }, { name: "VectorElems", - pos: position{line: 861, col: 1, offset: 25271}, + pos: position{line: 863, col: 1, offset: 25174}, expr: &choiceExpr{ - pos: position{line: 862, col: 5, offset: 25287}, + pos: position{line: 864, col: 5, offset: 25190}, alternatives: []any{ &actionExpr{ - pos: position{line: 862, col: 5, offset: 25287}, + pos: position{line: 864, col: 5, offset: 25190}, run: (*parser).callonVectorElems2, expr: &seqExpr{ - pos: position{line: 862, col: 5, offset: 25287}, + pos: position{line: 864, col: 5, offset: 25190}, exprs: []any{ &labeledExpr{ - pos: position{line: 862, col: 5, offset: 25287}, + pos: position{line: 864, col: 5, offset: 25190}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 862, col: 11, offset: 25293}, + pos: position{line: 864, col: 11, offset: 25196}, name: "VectorElem", }, }, &labeledExpr{ - pos: position{line: 862, col: 22, offset: 25304}, + pos: position{line: 864, col: 22, offset: 25207}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 862, col: 27, offset: 25309}, + pos: position{line: 864, col: 27, offset: 25212}, expr: &actionExpr{ - pos: position{line: 862, col: 28, offset: 25310}, + pos: position{line: 864, col: 28, offset: 25213}, run: (*parser).callonVectorElems8, expr: &seqExpr{ - pos: position{line: 862, col: 28, offset: 25310}, + pos: position{line: 864, col: 28, offset: 25213}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 862, col: 28, offset: 25310}, + pos: position{line: 864, col: 28, offset: 25213}, name: "__", }, &litMatcher{ - pos: position{line: 862, col: 31, offset: 25313}, + pos: position{line: 864, col: 31, offset: 25216}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 862, col: 35, offset: 25317}, + pos: position{line: 864, col: 35, offset: 25220}, name: "__", }, &labeledExpr{ - pos: position{line: 862, col: 38, offset: 25320}, + pos: position{line: 864, col: 38, offset: 25223}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 862, col: 40, offset: 25322}, + pos: position{line: 864, col: 40, offset: 25225}, name: "VectorElem", }, }, @@ -7433,10 +7436,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 865, col: 5, offset: 25440}, + pos: position{line: 867, col: 5, offset: 25343}, run: (*parser).callonVectorElems15, expr: &ruleRefExpr{ - pos: position{line: 865, col: 5, offset: 25440}, + pos: position{line: 867, col: 5, offset: 25343}, name: "__", }, }, @@ -7445,22 +7448,22 @@ var g = &grammar{ }, { name: "VectorElem", - pos: position{line: 867, col: 1, offset: 25476}, + pos: position{line: 869, col: 1, offset: 25379}, expr: &choiceExpr{ - pos: position{line: 868, col: 5, offset: 25491}, + pos: position{line: 870, col: 5, offset: 25394}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 868, col: 5, offset: 25491}, + pos: position{line: 870, col: 5, offset: 25394}, name: "Spread", }, &actionExpr{ - pos: position{line: 869, col: 5, offset: 25502}, + pos: position{line: 871, col: 5, offset: 25405}, run: (*parser).callonVectorElem3, expr: &labeledExpr{ - pos: position{line: 869, col: 5, offset: 25502}, + pos: position{line: 871, col: 5, offset: 25405}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 869, col: 7, offset: 25504}, + pos: position{line: 871, col: 7, offset: 25407}, name: "Expr", }, }, @@ -7470,37 +7473,37 @@ var g = &grammar{ }, { name: "Map", - pos: position{line: 871, col: 1, offset: 25583}, + pos: position{line: 873, col: 1, offset: 25486}, expr: &actionExpr{ - pos: position{line: 872, col: 5, offset: 25591}, + pos: position{line: 874, col: 5, offset: 25494}, run: (*parser).callonMap1, expr: &seqExpr{ - pos: position{line: 872, col: 5, offset: 25591}, + pos: position{line: 874, col: 5, offset: 25494}, exprs: []any{ &litMatcher{ - pos: position{line: 872, col: 5, offset: 25591}, + pos: position{line: 874, col: 5, offset: 25494}, val: "|{", ignoreCase: false, want: "\"|{\"", }, &ruleRefExpr{ - pos: position{line: 872, col: 10, offset: 25596}, + pos: position{line: 874, col: 10, offset: 25499}, name: "__", }, &labeledExpr{ - pos: position{line: 872, col: 13, offset: 25599}, + pos: position{line: 874, col: 13, offset: 25502}, label: "exprs", expr: &ruleRefExpr{ - pos: position{line: 872, col: 19, offset: 25605}, + pos: position{line: 874, col: 19, offset: 25508}, name: "Entries", }, }, &ruleRefExpr{ - pos: position{line: 872, col: 27, offset: 25613}, + pos: position{line: 874, col: 27, offset: 25516}, name: "__", }, &litMatcher{ - pos: position{line: 872, col: 30, offset: 25616}, + pos: position{line: 874, col: 30, offset: 25519}, val: "}|", ignoreCase: false, want: "\"}|\"", @@ -7511,31 +7514,31 @@ var g = &grammar{ }, { name: "Entries", - pos: position{line: 876, col: 1, offset: 25708}, + pos: position{line: 878, col: 1, offset: 25611}, expr: &choiceExpr{ - pos: position{line: 877, col: 5, offset: 25720}, + pos: position{line: 879, col: 5, offset: 25623}, alternatives: []any{ &actionExpr{ - pos: position{line: 877, col: 5, offset: 25720}, + pos: position{line: 879, col: 5, offset: 25623}, run: (*parser).callonEntries2, expr: &seqExpr{ - pos: position{line: 877, col: 5, offset: 25720}, + pos: position{line: 879, col: 5, offset: 25623}, exprs: []any{ &labeledExpr{ - pos: position{line: 877, col: 5, offset: 25720}, + pos: position{line: 879, col: 5, offset: 25623}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 877, col: 11, offset: 25726}, + pos: position{line: 879, col: 11, offset: 25629}, name: "Entry", }, }, &labeledExpr{ - pos: position{line: 877, col: 17, offset: 25732}, + pos: position{line: 879, col: 17, offset: 25635}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 877, col: 22, offset: 25737}, + pos: position{line: 879, col: 22, offset: 25640}, expr: &ruleRefExpr{ - pos: position{line: 877, col: 22, offset: 25737}, + pos: position{line: 879, col: 22, offset: 25640}, name: "EntryTail", }, }, @@ -7544,10 +7547,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 880, col: 5, offset: 25831}, + pos: position{line: 882, col: 5, offset: 25734}, run: (*parser).callonEntries9, expr: &ruleRefExpr{ - pos: position{line: 880, col: 5, offset: 25831}, + pos: position{line: 882, col: 5, offset: 25734}, name: "__", }, }, @@ -7556,32 +7559,32 @@ var g = &grammar{ }, { name: "EntryTail", - pos: position{line: 883, col: 1, offset: 25868}, + pos: position{line: 885, col: 1, offset: 25771}, expr: &actionExpr{ - pos: position{line: 883, col: 13, offset: 25880}, + pos: position{line: 885, col: 13, offset: 25783}, run: (*parser).callonEntryTail1, expr: &seqExpr{ - pos: position{line: 883, col: 13, offset: 25880}, + pos: position{line: 885, col: 13, offset: 25783}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 883, col: 13, offset: 25880}, + pos: position{line: 885, col: 13, offset: 25783}, name: "__", }, &litMatcher{ - pos: position{line: 883, col: 16, offset: 25883}, + pos: position{line: 885, col: 16, offset: 25786}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 883, col: 20, offset: 25887}, + pos: position{line: 885, col: 20, offset: 25790}, name: "__", }, &labeledExpr{ - pos: position{line: 883, col: 23, offset: 25890}, + pos: position{line: 885, col: 23, offset: 25793}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 883, col: 25, offset: 25892}, + pos: position{line: 885, col: 25, offset: 25795}, name: "Entry", }, }, @@ -7591,40 +7594,40 @@ var g = &grammar{ }, { name: "Entry", - pos: position{line: 885, col: 1, offset: 25917}, + pos: position{line: 887, col: 1, offset: 25820}, expr: &actionExpr{ - pos: position{line: 886, col: 5, offset: 25927}, + pos: position{line: 888, col: 5, offset: 25830}, run: (*parser).callonEntry1, expr: &seqExpr{ - pos: position{line: 886, col: 5, offset: 25927}, + pos: position{line: 888, col: 5, offset: 25830}, exprs: []any{ &labeledExpr{ - pos: position{line: 886, col: 5, offset: 25927}, + pos: position{line: 888, col: 5, offset: 25830}, label: "key", expr: &ruleRefExpr{ - pos: position{line: 886, col: 9, offset: 25931}, + pos: position{line: 888, col: 9, offset: 25834}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 886, col: 14, offset: 25936}, + pos: position{line: 888, col: 14, offset: 25839}, name: "__", }, &litMatcher{ - pos: position{line: 886, col: 17, offset: 25939}, + pos: position{line: 888, col: 17, offset: 25842}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 886, col: 21, offset: 25943}, + pos: position{line: 888, col: 21, offset: 25846}, name: "__", }, &labeledExpr{ - pos: position{line: 886, col: 24, offset: 25946}, + pos: position{line: 888, col: 24, offset: 25849}, label: "value", expr: &ruleRefExpr{ - pos: position{line: 886, col: 30, offset: 25952}, + pos: position{line: 888, col: 30, offset: 25855}, name: "Expr", }, }, @@ -7634,92 +7637,92 @@ var g = &grammar{ }, { name: "SQLOp", - pos: position{line: 892, col: 1, offset: 26059}, + pos: position{line: 894, col: 1, offset: 25962}, expr: &actionExpr{ - pos: position{line: 893, col: 5, offset: 26069}, + pos: position{line: 895, col: 5, offset: 25972}, run: (*parser).callonSQLOp1, expr: &seqExpr{ - pos: position{line: 893, col: 5, offset: 26069}, + pos: position{line: 895, col: 5, offset: 25972}, exprs: []any{ &labeledExpr{ - pos: position{line: 893, col: 5, offset: 26069}, + pos: position{line: 895, col: 5, offset: 25972}, label: "selection", expr: &ruleRefExpr{ - pos: position{line: 893, col: 15, offset: 26079}, + pos: position{line: 895, col: 15, offset: 25982}, name: "SQLSelect", }, }, &labeledExpr{ - pos: position{line: 894, col: 5, offset: 26093}, + pos: position{line: 896, col: 5, offset: 25996}, label: "from", expr: &zeroOrOneExpr{ - pos: position{line: 894, col: 10, offset: 26098}, + pos: position{line: 896, col: 10, offset: 26001}, expr: &ruleRefExpr{ - pos: position{line: 894, col: 10, offset: 26098}, + pos: position{line: 896, col: 10, offset: 26001}, name: "SQLFrom", }, }, }, &labeledExpr{ - pos: position{line: 895, col: 5, offset: 26111}, + pos: position{line: 897, col: 5, offset: 26014}, label: "joins", expr: &zeroOrOneExpr{ - pos: position{line: 895, col: 11, offset: 26117}, + pos: position{line: 897, col: 11, offset: 26020}, expr: &ruleRefExpr{ - pos: position{line: 895, col: 11, offset: 26117}, + pos: position{line: 897, col: 11, offset: 26020}, name: "SQLJoins", }, }, }, &labeledExpr{ - pos: position{line: 896, col: 5, offset: 26131}, + pos: position{line: 898, col: 5, offset: 26034}, label: "where", expr: &zeroOrOneExpr{ - pos: position{line: 896, col: 11, offset: 26137}, + pos: position{line: 898, col: 11, offset: 26040}, expr: &ruleRefExpr{ - pos: position{line: 896, col: 11, offset: 26137}, + pos: position{line: 898, col: 11, offset: 26040}, name: "SQLWhere", }, }, }, &labeledExpr{ - pos: position{line: 897, col: 5, offset: 26151}, + pos: position{line: 899, col: 5, offset: 26054}, label: "groupby", expr: &zeroOrOneExpr{ - pos: position{line: 897, col: 13, offset: 26159}, + pos: position{line: 899, col: 13, offset: 26062}, expr: &ruleRefExpr{ - pos: position{line: 897, col: 13, offset: 26159}, + pos: position{line: 899, col: 13, offset: 26062}, name: "SQLGroupBy", }, }, }, &labeledExpr{ - pos: position{line: 898, col: 5, offset: 26175}, + pos: position{line: 900, col: 5, offset: 26078}, label: "having", expr: &zeroOrOneExpr{ - pos: position{line: 898, col: 12, offset: 26182}, + pos: position{line: 900, col: 12, offset: 26085}, expr: &ruleRefExpr{ - pos: position{line: 898, col: 12, offset: 26182}, + pos: position{line: 900, col: 12, offset: 26085}, name: "SQLHaving", }, }, }, &labeledExpr{ - pos: position{line: 899, col: 5, offset: 26197}, + pos: position{line: 901, col: 5, offset: 26100}, label: "orderby", expr: &zeroOrOneExpr{ - pos: position{line: 899, col: 13, offset: 26205}, + pos: position{line: 901, col: 13, offset: 26108}, expr: &ruleRefExpr{ - pos: position{line: 899, col: 13, offset: 26205}, + pos: position{line: 901, col: 13, offset: 26108}, name: "SQLOrderBy", }, }, }, &labeledExpr{ - pos: position{line: 900, col: 5, offset: 26221}, + pos: position{line: 902, col: 5, offset: 26124}, label: "limit", expr: &ruleRefExpr{ - pos: position{line: 900, col: 11, offset: 26227}, + pos: position{line: 902, col: 11, offset: 26130}, name: "SQLLimit", }, }, @@ -7729,26 +7732,26 @@ var g = &grammar{ }, { name: "SQLSelect", - pos: position{line: 924, col: 1, offset: 26593}, + pos: position{line: 926, col: 1, offset: 26496}, expr: &choiceExpr{ - pos: position{line: 925, col: 5, offset: 26607}, + pos: position{line: 927, col: 5, offset: 26510}, alternatives: []any{ &actionExpr{ - pos: position{line: 925, col: 5, offset: 26607}, + pos: position{line: 927, col: 5, offset: 26510}, run: (*parser).callonSQLSelect2, expr: &seqExpr{ - pos: position{line: 925, col: 5, offset: 26607}, + pos: position{line: 927, col: 5, offset: 26510}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 925, col: 5, offset: 26607}, + pos: position{line: 927, col: 5, offset: 26510}, name: "SELECT", }, &ruleRefExpr{ - pos: position{line: 925, col: 12, offset: 26614}, + pos: position{line: 927, col: 12, offset: 26517}, name: "_", }, &litMatcher{ - pos: position{line: 925, col: 14, offset: 26616}, + pos: position{line: 927, col: 14, offset: 26519}, val: "*", ignoreCase: false, want: "\"*\"", @@ -7757,24 +7760,24 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 926, col: 5, offset: 26644}, + pos: position{line: 928, col: 5, offset: 26547}, run: (*parser).callonSQLSelect7, expr: &seqExpr{ - pos: position{line: 926, col: 5, offset: 26644}, + pos: position{line: 928, col: 5, offset: 26547}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 926, col: 5, offset: 26644}, + pos: position{line: 928, col: 5, offset: 26547}, name: "SELECT", }, &ruleRefExpr{ - pos: position{line: 926, col: 12, offset: 26651}, + pos: position{line: 928, col: 12, offset: 26554}, name: "_", }, &labeledExpr{ - pos: position{line: 926, col: 14, offset: 26653}, + pos: position{line: 928, col: 14, offset: 26556}, label: "assignments", expr: &ruleRefExpr{ - pos: position{line: 926, col: 26, offset: 26665}, + pos: position{line: 928, col: 26, offset: 26568}, name: "SQLAssignments", }, }, @@ -7786,43 +7789,43 @@ var g = &grammar{ }, { name: "SQLAssignment", - pos: position{line: 928, col: 1, offset: 26709}, + pos: position{line: 930, col: 1, offset: 26612}, expr: &actionExpr{ - pos: position{line: 929, col: 5, offset: 26727}, + pos: position{line: 931, col: 5, offset: 26630}, run: (*parser).callonSQLAssignment1, expr: &seqExpr{ - pos: position{line: 929, col: 5, offset: 26727}, + pos: position{line: 931, col: 5, offset: 26630}, exprs: []any{ &labeledExpr{ - pos: position{line: 929, col: 5, offset: 26727}, + pos: position{line: 931, col: 5, offset: 26630}, label: "rhs", expr: &ruleRefExpr{ - pos: position{line: 929, col: 9, offset: 26731}, + pos: position{line: 931, col: 9, offset: 26634}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 929, col: 14, offset: 26736}, + pos: position{line: 931, col: 14, offset: 26639}, label: "opt", expr: &zeroOrOneExpr{ - pos: position{line: 929, col: 18, offset: 26740}, + pos: position{line: 931, col: 18, offset: 26643}, expr: &seqExpr{ - pos: position{line: 929, col: 19, offset: 26741}, + pos: position{line: 931, col: 19, offset: 26644}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 929, col: 19, offset: 26741}, + pos: position{line: 931, col: 19, offset: 26644}, name: "_", }, &ruleRefExpr{ - pos: position{line: 929, col: 21, offset: 26743}, + pos: position{line: 931, col: 21, offset: 26646}, name: "AS", }, &ruleRefExpr{ - pos: position{line: 929, col: 24, offset: 26746}, + pos: position{line: 931, col: 24, offset: 26649}, name: "_", }, &ruleRefExpr{ - pos: position{line: 929, col: 26, offset: 26748}, + pos: position{line: 931, col: 26, offset: 26651}, name: "Lval", }, }, @@ -7835,51 +7838,51 @@ var g = &grammar{ }, { name: "SQLAssignments", - pos: position{line: 937, col: 1, offset: 26939}, + pos: position{line: 939, col: 1, offset: 26842}, expr: &actionExpr{ - pos: position{line: 938, col: 5, offset: 26958}, + pos: position{line: 940, col: 5, offset: 26861}, run: (*parser).callonSQLAssignments1, expr: &seqExpr{ - pos: position{line: 938, col: 5, offset: 26958}, + pos: position{line: 940, col: 5, offset: 26861}, exprs: []any{ &labeledExpr{ - pos: position{line: 938, col: 5, offset: 26958}, + pos: position{line: 940, col: 5, offset: 26861}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 938, col: 11, offset: 26964}, + pos: position{line: 940, col: 11, offset: 26867}, name: "SQLAssignment", }, }, &labeledExpr{ - pos: position{line: 938, col: 25, offset: 26978}, + pos: position{line: 940, col: 25, offset: 26881}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 938, col: 30, offset: 26983}, + pos: position{line: 940, col: 30, offset: 26886}, expr: &actionExpr{ - pos: position{line: 938, col: 31, offset: 26984}, + pos: position{line: 940, col: 31, offset: 26887}, run: (*parser).callonSQLAssignments7, expr: &seqExpr{ - pos: position{line: 938, col: 31, offset: 26984}, + pos: position{line: 940, col: 31, offset: 26887}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 938, col: 31, offset: 26984}, + pos: position{line: 940, col: 31, offset: 26887}, name: "__", }, &litMatcher{ - pos: position{line: 938, col: 34, offset: 26987}, + pos: position{line: 940, col: 34, offset: 26890}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 938, col: 38, offset: 26991}, + pos: position{line: 940, col: 38, offset: 26894}, name: "__", }, &labeledExpr{ - pos: position{line: 938, col: 41, offset: 26994}, + pos: position{line: 940, col: 41, offset: 26897}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 938, col: 46, offset: 26999}, + pos: position{line: 940, col: 46, offset: 26902}, name: "SQLAssignment", }, }, @@ -7894,43 +7897,43 @@ var g = &grammar{ }, { name: "SQLFrom", - pos: position{line: 942, col: 1, offset: 27120}, + pos: position{line: 944, col: 1, offset: 27023}, expr: &choiceExpr{ - pos: position{line: 943, col: 5, offset: 27132}, + pos: position{line: 945, col: 5, offset: 27035}, alternatives: []any{ &actionExpr{ - pos: position{line: 943, col: 5, offset: 27132}, + pos: position{line: 945, col: 5, offset: 27035}, run: (*parser).callonSQLFrom2, expr: &seqExpr{ - pos: position{line: 943, col: 5, offset: 27132}, + pos: position{line: 945, col: 5, offset: 27035}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 943, col: 5, offset: 27132}, + pos: position{line: 945, col: 5, offset: 27035}, name: "_", }, &ruleRefExpr{ - pos: position{line: 943, col: 7, offset: 27134}, + pos: position{line: 945, col: 7, offset: 27037}, name: "FROM", }, &ruleRefExpr{ - pos: position{line: 943, col: 12, offset: 27139}, + pos: position{line: 945, col: 12, offset: 27042}, name: "_", }, &labeledExpr{ - pos: position{line: 943, col: 14, offset: 27141}, + pos: position{line: 945, col: 14, offset: 27044}, label: "table", expr: &ruleRefExpr{ - pos: position{line: 943, col: 20, offset: 27147}, + pos: position{line: 945, col: 20, offset: 27050}, name: "SQLTable", }, }, &labeledExpr{ - pos: position{line: 943, col: 29, offset: 27156}, + pos: position{line: 945, col: 29, offset: 27059}, label: "alias", expr: &zeroOrOneExpr{ - pos: position{line: 943, col: 35, offset: 27162}, + pos: position{line: 945, col: 35, offset: 27065}, expr: &ruleRefExpr{ - pos: position{line: 943, col: 35, offset: 27162}, + pos: position{line: 945, col: 35, offset: 27065}, name: "SQLAlias", }, }, @@ -7939,25 +7942,25 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 946, col: 5, offset: 27257}, + pos: position{line: 948, col: 5, offset: 27160}, run: (*parser).callonSQLFrom12, expr: &seqExpr{ - pos: position{line: 946, col: 5, offset: 27257}, + pos: position{line: 948, col: 5, offset: 27160}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 946, col: 5, offset: 27257}, + pos: position{line: 948, col: 5, offset: 27160}, name: "_", }, &ruleRefExpr{ - pos: position{line: 946, col: 7, offset: 27259}, + pos: position{line: 948, col: 7, offset: 27162}, name: "FROM", }, &ruleRefExpr{ - pos: position{line: 946, col: 12, offset: 27264}, + pos: position{line: 948, col: 12, offset: 27167}, name: "_", }, &litMatcher{ - pos: position{line: 946, col: 14, offset: 27266}, + pos: position{line: 948, col: 14, offset: 27169}, val: "*", ignoreCase: false, want: "\"*\"", @@ -7970,33 +7973,33 @@ var g = &grammar{ }, { name: "SQLAlias", - pos: position{line: 948, col: 1, offset: 27291}, + pos: position{line: 950, col: 1, offset: 27194}, expr: &choiceExpr{ - pos: position{line: 949, col: 5, offset: 27304}, + pos: position{line: 951, col: 5, offset: 27207}, alternatives: []any{ &actionExpr{ - pos: position{line: 949, col: 5, offset: 27304}, + pos: position{line: 951, col: 5, offset: 27207}, run: (*parser).callonSQLAlias2, expr: &seqExpr{ - pos: position{line: 949, col: 5, offset: 27304}, + pos: position{line: 951, col: 5, offset: 27207}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 949, col: 5, offset: 27304}, + pos: position{line: 951, col: 5, offset: 27207}, name: "_", }, &ruleRefExpr{ - pos: position{line: 949, col: 7, offset: 27306}, + pos: position{line: 951, col: 7, offset: 27209}, name: "AS", }, &ruleRefExpr{ - pos: position{line: 949, col: 10, offset: 27309}, + pos: position{line: 951, col: 10, offset: 27212}, name: "_", }, &labeledExpr{ - pos: position{line: 949, col: 12, offset: 27311}, + pos: position{line: 951, col: 12, offset: 27214}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 949, col: 15, offset: 27314}, + pos: position{line: 951, col: 15, offset: 27217}, name: "Lval", }, }, @@ -8004,36 +8007,36 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 950, col: 5, offset: 27342}, + pos: position{line: 952, col: 5, offset: 27245}, run: (*parser).callonSQLAlias9, expr: &seqExpr{ - pos: position{line: 950, col: 5, offset: 27342}, + pos: position{line: 952, col: 5, offset: 27245}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 950, col: 5, offset: 27342}, + pos: position{line: 952, col: 5, offset: 27245}, name: "_", }, ¬Expr{ - pos: position{line: 950, col: 7, offset: 27344}, + pos: position{line: 952, col: 7, offset: 27247}, expr: &seqExpr{ - pos: position{line: 950, col: 9, offset: 27346}, + pos: position{line: 952, col: 9, offset: 27249}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 950, col: 9, offset: 27346}, + pos: position{line: 952, col: 9, offset: 27249}, name: "SQLTokenSentinels", }, &ruleRefExpr{ - pos: position{line: 950, col: 27, offset: 27364}, + pos: position{line: 952, col: 27, offset: 27267}, name: "_", }, }, }, }, &labeledExpr{ - pos: position{line: 950, col: 30, offset: 27367}, + pos: position{line: 952, col: 30, offset: 27270}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 950, col: 33, offset: 27370}, + pos: position{line: 952, col: 33, offset: 27273}, name: "Lval", }, }, @@ -8045,42 +8048,42 @@ var g = &grammar{ }, { name: "SQLTable", - pos: position{line: 952, col: 1, offset: 27395}, + pos: position{line: 954, col: 1, offset: 27298}, expr: &ruleRefExpr{ - pos: position{line: 953, col: 5, offset: 27408}, + pos: position{line: 955, col: 5, offset: 27311}, name: "Expr", }, }, { name: "SQLJoins", - pos: position{line: 955, col: 1, offset: 27414}, + pos: position{line: 957, col: 1, offset: 27317}, expr: &actionExpr{ - pos: position{line: 956, col: 5, offset: 27427}, + pos: position{line: 958, col: 5, offset: 27330}, run: (*parser).callonSQLJoins1, expr: &seqExpr{ - pos: position{line: 956, col: 5, offset: 27427}, + pos: position{line: 958, col: 5, offset: 27330}, exprs: []any{ &labeledExpr{ - pos: position{line: 956, col: 5, offset: 27427}, + pos: position{line: 958, col: 5, offset: 27330}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 956, col: 11, offset: 27433}, + pos: position{line: 958, col: 11, offset: 27336}, name: "SQLJoin", }, }, &labeledExpr{ - pos: position{line: 956, col: 19, offset: 27441}, + pos: position{line: 958, col: 19, offset: 27344}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 956, col: 24, offset: 27446}, + pos: position{line: 958, col: 24, offset: 27349}, expr: &actionExpr{ - pos: position{line: 956, col: 25, offset: 27447}, + pos: position{line: 958, col: 25, offset: 27350}, run: (*parser).callonSQLJoins7, expr: &labeledExpr{ - pos: position{line: 956, col: 25, offset: 27447}, + pos: position{line: 958, col: 25, offset: 27350}, label: "join", expr: &ruleRefExpr{ - pos: position{line: 956, col: 30, offset: 27452}, + pos: position{line: 958, col: 30, offset: 27355}, name: "SQLJoin", }, }, @@ -8093,91 +8096,91 @@ var g = &grammar{ }, { name: "SQLJoin", - pos: position{line: 960, col: 1, offset: 27567}, + pos: position{line: 962, col: 1, offset: 27470}, expr: &actionExpr{ - pos: position{line: 961, col: 5, offset: 27579}, + pos: position{line: 963, col: 5, offset: 27482}, run: (*parser).callonSQLJoin1, expr: &seqExpr{ - pos: position{line: 961, col: 5, offset: 27579}, + pos: position{line: 963, col: 5, offset: 27482}, exprs: []any{ &labeledExpr{ - pos: position{line: 961, col: 5, offset: 27579}, + pos: position{line: 963, col: 5, offset: 27482}, label: "style", expr: &ruleRefExpr{ - pos: position{line: 961, col: 11, offset: 27585}, + pos: position{line: 963, col: 11, offset: 27488}, name: "SQLJoinStyle", }, }, &ruleRefExpr{ - pos: position{line: 961, col: 24, offset: 27598}, + pos: position{line: 963, col: 24, offset: 27501}, name: "_", }, &ruleRefExpr{ - pos: position{line: 961, col: 26, offset: 27600}, + pos: position{line: 963, col: 26, offset: 27503}, name: "JOIN", }, &ruleRefExpr{ - pos: position{line: 961, col: 31, offset: 27605}, + pos: position{line: 963, col: 31, offset: 27508}, name: "_", }, &labeledExpr{ - pos: position{line: 961, col: 33, offset: 27607}, + pos: position{line: 963, col: 33, offset: 27510}, label: "table", expr: &ruleRefExpr{ - pos: position{line: 961, col: 39, offset: 27613}, + pos: position{line: 963, col: 39, offset: 27516}, name: "SQLTable", }, }, &labeledExpr{ - pos: position{line: 961, col: 48, offset: 27622}, + pos: position{line: 963, col: 48, offset: 27525}, label: "alias", expr: &zeroOrOneExpr{ - pos: position{line: 961, col: 54, offset: 27628}, + pos: position{line: 963, col: 54, offset: 27531}, expr: &ruleRefExpr{ - pos: position{line: 961, col: 54, offset: 27628}, + pos: position{line: 963, col: 54, offset: 27531}, name: "SQLAlias", }, }, }, &ruleRefExpr{ - pos: position{line: 961, col: 64, offset: 27638}, + pos: position{line: 963, col: 64, offset: 27541}, name: "_", }, &ruleRefExpr{ - pos: position{line: 961, col: 66, offset: 27640}, + pos: position{line: 963, col: 66, offset: 27543}, name: "ON", }, &ruleRefExpr{ - pos: position{line: 961, col: 69, offset: 27643}, + pos: position{line: 963, col: 69, offset: 27546}, name: "_", }, &labeledExpr{ - pos: position{line: 961, col: 71, offset: 27645}, + pos: position{line: 963, col: 71, offset: 27548}, label: "leftKey", expr: &ruleRefExpr{ - pos: position{line: 961, col: 79, offset: 27653}, + pos: position{line: 963, col: 79, offset: 27556}, name: "JoinKey", }, }, &ruleRefExpr{ - pos: position{line: 961, col: 87, offset: 27661}, + pos: position{line: 963, col: 87, offset: 27564}, name: "__", }, &litMatcher{ - pos: position{line: 961, col: 90, offset: 27664}, + pos: position{line: 963, col: 90, offset: 27567}, val: "=", ignoreCase: false, want: "\"=\"", }, &ruleRefExpr{ - pos: position{line: 961, col: 94, offset: 27668}, + pos: position{line: 963, col: 94, offset: 27571}, name: "__", }, &labeledExpr{ - pos: position{line: 961, col: 97, offset: 27671}, + pos: position{line: 963, col: 97, offset: 27574}, label: "rightKey", expr: &ruleRefExpr{ - pos: position{line: 961, col: 106, offset: 27680}, + pos: position{line: 963, col: 106, offset: 27583}, name: "JoinKey", }, }, @@ -8187,40 +8190,40 @@ var g = &grammar{ }, { name: "SQLJoinStyle", - pos: position{line: 976, col: 1, offset: 27911}, + pos: position{line: 978, col: 1, offset: 27814}, expr: &choiceExpr{ - pos: position{line: 977, col: 5, offset: 27928}, + pos: position{line: 979, col: 5, offset: 27831}, alternatives: []any{ &actionExpr{ - pos: position{line: 977, col: 5, offset: 27928}, + pos: position{line: 979, col: 5, offset: 27831}, run: (*parser).callonSQLJoinStyle2, expr: &seqExpr{ - pos: position{line: 977, col: 5, offset: 27928}, + pos: position{line: 979, col: 5, offset: 27831}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 977, col: 5, offset: 27928}, + pos: position{line: 979, col: 5, offset: 27831}, name: "_", }, &labeledExpr{ - pos: position{line: 977, col: 7, offset: 27930}, + pos: position{line: 979, col: 7, offset: 27833}, label: "style", expr: &choiceExpr{ - pos: position{line: 977, col: 14, offset: 27937}, + pos: position{line: 979, col: 14, offset: 27840}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 977, col: 14, offset: 27937}, + pos: position{line: 979, col: 14, offset: 27840}, name: "ANTI", }, &ruleRefExpr{ - pos: position{line: 977, col: 21, offset: 27944}, + pos: position{line: 979, col: 21, offset: 27847}, name: "INNER", }, &ruleRefExpr{ - pos: position{line: 977, col: 29, offset: 27952}, + pos: position{line: 979, col: 29, offset: 27855}, name: "LEFT", }, &ruleRefExpr{ - pos: position{line: 977, col: 36, offset: 27959}, + pos: position{line: 979, col: 36, offset: 27862}, name: "RIGHT", }, }, @@ -8230,10 +8233,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 978, col: 5, offset: 27992}, + pos: position{line: 980, col: 5, offset: 27895}, run: (*parser).callonSQLJoinStyle11, expr: &litMatcher{ - pos: position{line: 978, col: 5, offset: 27992}, + pos: position{line: 980, col: 5, offset: 27895}, val: "", ignoreCase: false, want: "\"\"", @@ -8244,30 +8247,30 @@ var g = &grammar{ }, { name: "SQLWhere", - pos: position{line: 980, col: 1, offset: 28020}, + pos: position{line: 982, col: 1, offset: 27923}, expr: &actionExpr{ - pos: position{line: 981, col: 5, offset: 28033}, + pos: position{line: 983, col: 5, offset: 27936}, run: (*parser).callonSQLWhere1, expr: &seqExpr{ - pos: position{line: 981, col: 5, offset: 28033}, + pos: position{line: 983, col: 5, offset: 27936}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 981, col: 5, offset: 28033}, + pos: position{line: 983, col: 5, offset: 27936}, name: "_", }, &ruleRefExpr{ - pos: position{line: 981, col: 7, offset: 28035}, + pos: position{line: 983, col: 7, offset: 27938}, name: "WHERE", }, &ruleRefExpr{ - pos: position{line: 981, col: 13, offset: 28041}, + pos: position{line: 983, col: 13, offset: 27944}, name: "_", }, &labeledExpr{ - pos: position{line: 981, col: 15, offset: 28043}, + pos: position{line: 983, col: 15, offset: 27946}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 981, col: 20, offset: 28048}, + pos: position{line: 983, col: 20, offset: 27951}, name: "LogicalOrExpr", }, }, @@ -8277,38 +8280,38 @@ var g = &grammar{ }, { name: "SQLGroupBy", - pos: position{line: 983, col: 1, offset: 28084}, + pos: position{line: 985, col: 1, offset: 27987}, expr: &actionExpr{ - pos: position{line: 984, col: 5, offset: 28099}, + pos: position{line: 986, col: 5, offset: 28002}, run: (*parser).callonSQLGroupBy1, expr: &seqExpr{ - pos: position{line: 984, col: 5, offset: 28099}, + pos: position{line: 986, col: 5, offset: 28002}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 984, col: 5, offset: 28099}, + pos: position{line: 986, col: 5, offset: 28002}, name: "_", }, &ruleRefExpr{ - pos: position{line: 984, col: 7, offset: 28101}, + pos: position{line: 986, col: 7, offset: 28004}, name: "GROUP", }, &ruleRefExpr{ - pos: position{line: 984, col: 13, offset: 28107}, + pos: position{line: 986, col: 13, offset: 28010}, name: "_", }, &ruleRefExpr{ - pos: position{line: 984, col: 15, offset: 28109}, + pos: position{line: 986, col: 15, offset: 28012}, name: "BY", }, &ruleRefExpr{ - pos: position{line: 984, col: 18, offset: 28112}, + pos: position{line: 986, col: 18, offset: 28015}, name: "_", }, &labeledExpr{ - pos: position{line: 984, col: 20, offset: 28114}, + pos: position{line: 986, col: 20, offset: 28017}, label: "columns", expr: &ruleRefExpr{ - pos: position{line: 984, col: 28, offset: 28122}, + pos: position{line: 986, col: 28, offset: 28025}, name: "FieldExprs", }, }, @@ -8318,30 +8321,30 @@ var g = &grammar{ }, { name: "SQLHaving", - pos: position{line: 986, col: 1, offset: 28158}, + pos: position{line: 988, col: 1, offset: 28061}, expr: &actionExpr{ - pos: position{line: 987, col: 5, offset: 28172}, + pos: position{line: 989, col: 5, offset: 28075}, run: (*parser).callonSQLHaving1, expr: &seqExpr{ - pos: position{line: 987, col: 5, offset: 28172}, + pos: position{line: 989, col: 5, offset: 28075}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 987, col: 5, offset: 28172}, + pos: position{line: 989, col: 5, offset: 28075}, name: "_", }, &ruleRefExpr{ - pos: position{line: 987, col: 7, offset: 28174}, + pos: position{line: 989, col: 7, offset: 28077}, name: "HAVING", }, &ruleRefExpr{ - pos: position{line: 987, col: 14, offset: 28181}, + pos: position{line: 989, col: 14, offset: 28084}, name: "_", }, &labeledExpr{ - pos: position{line: 987, col: 16, offset: 28183}, + pos: position{line: 989, col: 16, offset: 28086}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 987, col: 21, offset: 28188}, + pos: position{line: 989, col: 21, offset: 28091}, name: "LogicalOrExpr", }, }, @@ -8351,46 +8354,46 @@ var g = &grammar{ }, { name: "SQLOrderBy", - pos: position{line: 989, col: 1, offset: 28224}, + pos: position{line: 991, col: 1, offset: 28127}, expr: &actionExpr{ - pos: position{line: 990, col: 5, offset: 28239}, + pos: position{line: 992, col: 5, offset: 28142}, run: (*parser).callonSQLOrderBy1, expr: &seqExpr{ - pos: position{line: 990, col: 5, offset: 28239}, + pos: position{line: 992, col: 5, offset: 28142}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 990, col: 5, offset: 28239}, + pos: position{line: 992, col: 5, offset: 28142}, name: "_", }, &ruleRefExpr{ - pos: position{line: 990, col: 7, offset: 28241}, + pos: position{line: 992, col: 7, offset: 28144}, name: "ORDER", }, &ruleRefExpr{ - pos: position{line: 990, col: 13, offset: 28247}, + pos: position{line: 992, col: 13, offset: 28150}, name: "_", }, &ruleRefExpr{ - pos: position{line: 990, col: 15, offset: 28249}, + pos: position{line: 992, col: 15, offset: 28152}, name: "BY", }, &ruleRefExpr{ - pos: position{line: 990, col: 18, offset: 28252}, + pos: position{line: 992, col: 18, offset: 28155}, name: "_", }, &labeledExpr{ - pos: position{line: 990, col: 20, offset: 28254}, + pos: position{line: 992, col: 20, offset: 28157}, label: "keys", expr: &ruleRefExpr{ - pos: position{line: 990, col: 25, offset: 28259}, + pos: position{line: 992, col: 25, offset: 28162}, name: "Exprs", }, }, &labeledExpr{ - pos: position{line: 990, col: 31, offset: 28265}, + pos: position{line: 992, col: 31, offset: 28168}, label: "order", expr: &ruleRefExpr{ - pos: position{line: 990, col: 37, offset: 28271}, + pos: position{line: 992, col: 37, offset: 28174}, name: "SQLOrder", }, }, @@ -8400,32 +8403,32 @@ var g = &grammar{ }, { name: "SQLOrder", - pos: position{line: 994, col: 1, offset: 28382}, + pos: position{line: 996, col: 1, offset: 28285}, expr: &choiceExpr{ - pos: position{line: 995, col: 5, offset: 28395}, + pos: position{line: 997, col: 5, offset: 28298}, alternatives: []any{ &actionExpr{ - pos: position{line: 995, col: 5, offset: 28395}, + pos: position{line: 997, col: 5, offset: 28298}, run: (*parser).callonSQLOrder2, expr: &seqExpr{ - pos: position{line: 995, col: 5, offset: 28395}, + pos: position{line: 997, col: 5, offset: 28298}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 995, col: 5, offset: 28395}, + pos: position{line: 997, col: 5, offset: 28298}, name: "_", }, &labeledExpr{ - pos: position{line: 995, col: 7, offset: 28397}, + pos: position{line: 997, col: 7, offset: 28300}, label: "dir", expr: &choiceExpr{ - pos: position{line: 995, col: 12, offset: 28402}, + pos: position{line: 997, col: 12, offset: 28305}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 995, col: 12, offset: 28402}, + pos: position{line: 997, col: 12, offset: 28305}, name: "ASC", }, &ruleRefExpr{ - pos: position{line: 995, col: 18, offset: 28408}, + pos: position{line: 997, col: 18, offset: 28311}, name: "DESC", }, }, @@ -8435,10 +8438,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 996, col: 5, offset: 28438}, + pos: position{line: 998, col: 5, offset: 28341}, run: (*parser).callonSQLOrder9, expr: &litMatcher{ - pos: position{line: 996, col: 5, offset: 28438}, + pos: position{line: 998, col: 5, offset: 28341}, val: "", ignoreCase: false, want: "\"\"", @@ -8449,33 +8452,33 @@ var g = &grammar{ }, { name: "SQLLimit", - pos: position{line: 998, col: 1, offset: 28464}, + pos: position{line: 1000, col: 1, offset: 28367}, expr: &choiceExpr{ - pos: position{line: 999, col: 5, offset: 28477}, + pos: position{line: 1001, col: 5, offset: 28380}, alternatives: []any{ &actionExpr{ - pos: position{line: 999, col: 5, offset: 28477}, + pos: position{line: 1001, col: 5, offset: 28380}, run: (*parser).callonSQLLimit2, expr: &seqExpr{ - pos: position{line: 999, col: 5, offset: 28477}, + pos: position{line: 1001, col: 5, offset: 28380}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 999, col: 5, offset: 28477}, + pos: position{line: 1001, col: 5, offset: 28380}, name: "_", }, &ruleRefExpr{ - pos: position{line: 999, col: 7, offset: 28479}, + pos: position{line: 1001, col: 7, offset: 28382}, name: "LIMIT", }, &ruleRefExpr{ - pos: position{line: 999, col: 13, offset: 28485}, + pos: position{line: 1001, col: 13, offset: 28388}, name: "_", }, &labeledExpr{ - pos: position{line: 999, col: 15, offset: 28487}, + pos: position{line: 1001, col: 15, offset: 28390}, label: "count", expr: &ruleRefExpr{ - pos: position{line: 999, col: 21, offset: 28493}, + pos: position{line: 1001, col: 21, offset: 28396}, name: "UInt", }, }, @@ -8483,10 +8486,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1000, col: 5, offset: 28524}, + pos: position{line: 1002, col: 5, offset: 28427}, run: (*parser).callonSQLLimit9, expr: &litMatcher{ - pos: position{line: 1000, col: 5, offset: 28524}, + pos: position{line: 1002, col: 5, offset: 28427}, val: "", ignoreCase: false, want: "\"\"", @@ -8497,12 +8500,12 @@ var g = &grammar{ }, { name: "SELECT", - pos: position{line: 1002, col: 1, offset: 28546}, + pos: position{line: 1004, col: 1, offset: 28449}, expr: &actionExpr{ - pos: position{line: 1002, col: 10, offset: 28555}, + pos: position{line: 1004, col: 10, offset: 28458}, run: (*parser).callonSELECT1, expr: &litMatcher{ - pos: position{line: 1002, col: 10, offset: 28555}, + pos: position{line: 1004, col: 10, offset: 28458}, val: "select", ignoreCase: true, want: "\"select\"i", @@ -8511,12 +8514,12 @@ var g = &grammar{ }, { name: "AS", - pos: position{line: 1003, col: 1, offset: 28590}, + pos: position{line: 1005, col: 1, offset: 28493}, expr: &actionExpr{ - pos: position{line: 1003, col: 6, offset: 28595}, + pos: position{line: 1005, col: 6, offset: 28498}, run: (*parser).callonAS1, expr: &litMatcher{ - pos: position{line: 1003, col: 6, offset: 28595}, + pos: position{line: 1005, col: 6, offset: 28498}, val: "as", ignoreCase: true, want: "\"as\"i", @@ -8525,12 +8528,12 @@ var g = &grammar{ }, { name: "FROM", - pos: position{line: 1004, col: 1, offset: 28622}, + pos: position{line: 1006, col: 1, offset: 28525}, expr: &actionExpr{ - pos: position{line: 1004, col: 8, offset: 28629}, + pos: position{line: 1006, col: 8, offset: 28532}, run: (*parser).callonFROM1, expr: &litMatcher{ - pos: position{line: 1004, col: 8, offset: 28629}, + pos: position{line: 1006, col: 8, offset: 28532}, val: "from", ignoreCase: true, want: "\"from\"i", @@ -8539,12 +8542,12 @@ var g = &grammar{ }, { name: "JOIN", - pos: position{line: 1005, col: 1, offset: 28660}, + pos: position{line: 1007, col: 1, offset: 28563}, expr: &actionExpr{ - pos: position{line: 1005, col: 8, offset: 28667}, + pos: position{line: 1007, col: 8, offset: 28570}, run: (*parser).callonJOIN1, expr: &litMatcher{ - pos: position{line: 1005, col: 8, offset: 28667}, + pos: position{line: 1007, col: 8, offset: 28570}, val: "join", ignoreCase: true, want: "\"join\"i", @@ -8553,12 +8556,12 @@ var g = &grammar{ }, { name: "WHERE", - pos: position{line: 1006, col: 1, offset: 28698}, + pos: position{line: 1008, col: 1, offset: 28601}, expr: &actionExpr{ - pos: position{line: 1006, col: 9, offset: 28706}, + pos: position{line: 1008, col: 9, offset: 28609}, run: (*parser).callonWHERE1, expr: &litMatcher{ - pos: position{line: 1006, col: 9, offset: 28706}, + pos: position{line: 1008, col: 9, offset: 28609}, val: "where", ignoreCase: true, want: "\"where\"i", @@ -8567,12 +8570,12 @@ var g = &grammar{ }, { name: "GROUP", - pos: position{line: 1007, col: 1, offset: 28739}, + pos: position{line: 1009, col: 1, offset: 28642}, expr: &actionExpr{ - pos: position{line: 1007, col: 9, offset: 28747}, + pos: position{line: 1009, col: 9, offset: 28650}, run: (*parser).callonGROUP1, expr: &litMatcher{ - pos: position{line: 1007, col: 9, offset: 28747}, + pos: position{line: 1009, col: 9, offset: 28650}, val: "group", ignoreCase: true, want: "\"group\"i", @@ -8581,12 +8584,12 @@ var g = &grammar{ }, { name: "BY", - pos: position{line: 1008, col: 1, offset: 28780}, + pos: position{line: 1010, col: 1, offset: 28683}, expr: &actionExpr{ - pos: position{line: 1008, col: 6, offset: 28785}, + pos: position{line: 1010, col: 6, offset: 28688}, run: (*parser).callonBY1, expr: &litMatcher{ - pos: position{line: 1008, col: 6, offset: 28785}, + pos: position{line: 1010, col: 6, offset: 28688}, val: "by", ignoreCase: true, want: "\"by\"i", @@ -8595,12 +8598,12 @@ var g = &grammar{ }, { name: "HAVING", - pos: position{line: 1009, col: 1, offset: 28812}, + pos: position{line: 1011, col: 1, offset: 28715}, expr: &actionExpr{ - pos: position{line: 1009, col: 10, offset: 28821}, + pos: position{line: 1011, col: 10, offset: 28724}, run: (*parser).callonHAVING1, expr: &litMatcher{ - pos: position{line: 1009, col: 10, offset: 28821}, + pos: position{line: 1011, col: 10, offset: 28724}, val: "having", ignoreCase: true, want: "\"having\"i", @@ -8609,12 +8612,12 @@ var g = &grammar{ }, { name: "ORDER", - pos: position{line: 1010, col: 1, offset: 28856}, + pos: position{line: 1012, col: 1, offset: 28759}, expr: &actionExpr{ - pos: position{line: 1010, col: 9, offset: 28864}, + pos: position{line: 1012, col: 9, offset: 28767}, run: (*parser).callonORDER1, expr: &litMatcher{ - pos: position{line: 1010, col: 9, offset: 28864}, + pos: position{line: 1012, col: 9, offset: 28767}, val: "order", ignoreCase: true, want: "\"order\"i", @@ -8623,12 +8626,12 @@ var g = &grammar{ }, { name: "ON", - pos: position{line: 1011, col: 1, offset: 28897}, + pos: position{line: 1013, col: 1, offset: 28800}, expr: &actionExpr{ - pos: position{line: 1011, col: 6, offset: 28902}, + pos: position{line: 1013, col: 6, offset: 28805}, run: (*parser).callonON1, expr: &litMatcher{ - pos: position{line: 1011, col: 6, offset: 28902}, + pos: position{line: 1013, col: 6, offset: 28805}, val: "on", ignoreCase: true, want: "\"on\"i", @@ -8637,12 +8640,12 @@ var g = &grammar{ }, { name: "LIMIT", - pos: position{line: 1012, col: 1, offset: 28929}, + pos: position{line: 1014, col: 1, offset: 28832}, expr: &actionExpr{ - pos: position{line: 1012, col: 9, offset: 28937}, + pos: position{line: 1014, col: 9, offset: 28840}, run: (*parser).callonLIMIT1, expr: &litMatcher{ - pos: position{line: 1012, col: 9, offset: 28937}, + pos: position{line: 1014, col: 9, offset: 28840}, val: "limit", ignoreCase: true, want: "\"limit\"i", @@ -8651,12 +8654,12 @@ var g = &grammar{ }, { name: "ASC", - pos: position{line: 1013, col: 1, offset: 28970}, + pos: position{line: 1015, col: 1, offset: 28873}, expr: &actionExpr{ - pos: position{line: 1013, col: 7, offset: 28976}, + pos: position{line: 1015, col: 7, offset: 28879}, run: (*parser).callonASC1, expr: &litMatcher{ - pos: position{line: 1013, col: 7, offset: 28976}, + pos: position{line: 1015, col: 7, offset: 28879}, val: "asc", ignoreCase: true, want: "\"asc\"i", @@ -8665,12 +8668,12 @@ var g = &grammar{ }, { name: "DESC", - pos: position{line: 1014, col: 1, offset: 29005}, + pos: position{line: 1016, col: 1, offset: 28908}, expr: &actionExpr{ - pos: position{line: 1014, col: 8, offset: 29012}, + pos: position{line: 1016, col: 8, offset: 28915}, run: (*parser).callonDESC1, expr: &litMatcher{ - pos: position{line: 1014, col: 8, offset: 29012}, + pos: position{line: 1016, col: 8, offset: 28915}, val: "desc", ignoreCase: true, want: "\"desc\"i", @@ -8679,12 +8682,12 @@ var g = &grammar{ }, { name: "ANTI", - pos: position{line: 1015, col: 1, offset: 29043}, + pos: position{line: 1017, col: 1, offset: 28946}, expr: &actionExpr{ - pos: position{line: 1015, col: 8, offset: 29050}, + pos: position{line: 1017, col: 8, offset: 28953}, run: (*parser).callonANTI1, expr: &litMatcher{ - pos: position{line: 1015, col: 8, offset: 29050}, + pos: position{line: 1017, col: 8, offset: 28953}, val: "anti", ignoreCase: true, want: "\"anti\"i", @@ -8693,12 +8696,12 @@ var g = &grammar{ }, { name: "LEFT", - pos: position{line: 1016, col: 1, offset: 29081}, + pos: position{line: 1018, col: 1, offset: 28984}, expr: &actionExpr{ - pos: position{line: 1016, col: 8, offset: 29088}, + pos: position{line: 1018, col: 8, offset: 28991}, run: (*parser).callonLEFT1, expr: &litMatcher{ - pos: position{line: 1016, col: 8, offset: 29088}, + pos: position{line: 1018, col: 8, offset: 28991}, val: "left", ignoreCase: true, want: "\"left\"i", @@ -8707,12 +8710,12 @@ var g = &grammar{ }, { name: "RIGHT", - pos: position{line: 1017, col: 1, offset: 29119}, + pos: position{line: 1019, col: 1, offset: 29022}, expr: &actionExpr{ - pos: position{line: 1017, col: 9, offset: 29127}, + pos: position{line: 1019, col: 9, offset: 29030}, run: (*parser).callonRIGHT1, expr: &litMatcher{ - pos: position{line: 1017, col: 9, offset: 29127}, + pos: position{line: 1019, col: 9, offset: 29030}, val: "right", ignoreCase: true, want: "\"right\"i", @@ -8721,12 +8724,12 @@ var g = &grammar{ }, { name: "INNER", - pos: position{line: 1018, col: 1, offset: 29160}, + pos: position{line: 1020, col: 1, offset: 29063}, expr: &actionExpr{ - pos: position{line: 1018, col: 9, offset: 29168}, + pos: position{line: 1020, col: 9, offset: 29071}, run: (*parser).callonINNER1, expr: &litMatcher{ - pos: position{line: 1018, col: 9, offset: 29168}, + pos: position{line: 1020, col: 9, offset: 29071}, val: "inner", ignoreCase: true, want: "\"inner\"i", @@ -8735,48 +8738,48 @@ var g = &grammar{ }, { name: "SQLTokenSentinels", - pos: position{line: 1020, col: 1, offset: 29202}, + pos: position{line: 1022, col: 1, offset: 29105}, expr: &choiceExpr{ - pos: position{line: 1021, col: 5, offset: 29224}, + pos: position{line: 1023, col: 5, offset: 29127}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1021, col: 5, offset: 29224}, + pos: position{line: 1023, col: 5, offset: 29127}, name: "SELECT", }, &ruleRefExpr{ - pos: position{line: 1021, col: 14, offset: 29233}, + pos: position{line: 1023, col: 14, offset: 29136}, name: "AS", }, &ruleRefExpr{ - pos: position{line: 1021, col: 19, offset: 29238}, + pos: position{line: 1023, col: 19, offset: 29141}, name: "FROM", }, &ruleRefExpr{ - pos: position{line: 1021, col: 26, offset: 29245}, + pos: position{line: 1023, col: 26, offset: 29148}, name: "JOIN", }, &ruleRefExpr{ - pos: position{line: 1021, col: 33, offset: 29252}, + pos: position{line: 1023, col: 33, offset: 29155}, name: "WHERE", }, &ruleRefExpr{ - pos: position{line: 1021, col: 41, offset: 29260}, + pos: position{line: 1023, col: 41, offset: 29163}, name: "GROUP", }, &ruleRefExpr{ - pos: position{line: 1021, col: 49, offset: 29268}, + pos: position{line: 1023, col: 49, offset: 29171}, name: "HAVING", }, &ruleRefExpr{ - pos: position{line: 1021, col: 58, offset: 29277}, + pos: position{line: 1023, col: 58, offset: 29180}, name: "ORDER", }, &ruleRefExpr{ - pos: position{line: 1021, col: 66, offset: 29285}, + pos: position{line: 1023, col: 66, offset: 29188}, name: "LIMIT", }, &ruleRefExpr{ - pos: position{line: 1021, col: 74, offset: 29293}, + pos: position{line: 1023, col: 74, offset: 29196}, name: "ON", }, }, @@ -8784,52 +8787,52 @@ var g = &grammar{ }, { name: "Literal", - pos: position{line: 1025, col: 1, offset: 29319}, + pos: position{line: 1027, col: 1, offset: 29222}, expr: &choiceExpr{ - pos: position{line: 1026, col: 5, offset: 29331}, + pos: position{line: 1028, col: 5, offset: 29234}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1026, col: 5, offset: 29331}, + pos: position{line: 1028, col: 5, offset: 29234}, name: "TypeLiteral", }, &ruleRefExpr{ - pos: position{line: 1027, col: 5, offset: 29347}, + pos: position{line: 1029, col: 5, offset: 29250}, name: "TemplateLiteral", }, &ruleRefExpr{ - pos: position{line: 1028, col: 5, offset: 29367}, + pos: position{line: 1030, col: 5, offset: 29270}, name: "SubnetLiteral", }, &ruleRefExpr{ - pos: position{line: 1029, col: 5, offset: 29385}, + pos: position{line: 1031, col: 5, offset: 29288}, name: "AddressLiteral", }, &ruleRefExpr{ - pos: position{line: 1030, col: 5, offset: 29404}, + pos: position{line: 1032, col: 5, offset: 29307}, name: "BytesLiteral", }, &ruleRefExpr{ - pos: position{line: 1031, col: 5, offset: 29421}, + pos: position{line: 1033, col: 5, offset: 29324}, name: "Duration", }, &ruleRefExpr{ - pos: position{line: 1032, col: 5, offset: 29434}, + pos: position{line: 1034, col: 5, offset: 29337}, name: "Time", }, &ruleRefExpr{ - pos: position{line: 1033, col: 5, offset: 29443}, + pos: position{line: 1035, col: 5, offset: 29346}, name: "FloatLiteral", }, &ruleRefExpr{ - pos: position{line: 1034, col: 5, offset: 29460}, + pos: position{line: 1036, col: 5, offset: 29363}, name: "IntegerLiteral", }, &ruleRefExpr{ - pos: position{line: 1035, col: 5, offset: 29479}, + pos: position{line: 1037, col: 5, offset: 29382}, name: "BooleanLiteral", }, &ruleRefExpr{ - pos: position{line: 1036, col: 5, offset: 29498}, + pos: position{line: 1038, col: 5, offset: 29401}, name: "NullLiteral", }, }, @@ -8837,28 +8840,28 @@ var g = &grammar{ }, { name: "SubnetLiteral", - pos: position{line: 1038, col: 1, offset: 29511}, + pos: position{line: 1040, col: 1, offset: 29414}, expr: &choiceExpr{ - pos: position{line: 1039, col: 5, offset: 29529}, + pos: position{line: 1041, col: 5, offset: 29432}, alternatives: []any{ &actionExpr{ - pos: position{line: 1039, col: 5, offset: 29529}, + pos: position{line: 1041, col: 5, offset: 29432}, run: (*parser).callonSubnetLiteral2, expr: &seqExpr{ - pos: position{line: 1039, col: 5, offset: 29529}, + pos: position{line: 1041, col: 5, offset: 29432}, exprs: []any{ &labeledExpr{ - pos: position{line: 1039, col: 5, offset: 29529}, + pos: position{line: 1041, col: 5, offset: 29432}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1039, col: 7, offset: 29531}, + pos: position{line: 1041, col: 7, offset: 29434}, name: "IP6Net", }, }, ¬Expr{ - pos: position{line: 1039, col: 14, offset: 29538}, + pos: position{line: 1041, col: 14, offset: 29441}, expr: &ruleRefExpr{ - pos: position{line: 1039, col: 15, offset: 29539}, + pos: position{line: 1041, col: 15, offset: 29442}, name: "IdentifierRest", }, }, @@ -8866,13 +8869,13 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1042, col: 5, offset: 29654}, + pos: position{line: 1044, col: 5, offset: 29557}, run: (*parser).callonSubnetLiteral8, expr: &labeledExpr{ - pos: position{line: 1042, col: 5, offset: 29654}, + pos: position{line: 1044, col: 5, offset: 29557}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1042, col: 7, offset: 29656}, + pos: position{line: 1044, col: 7, offset: 29559}, name: "IP4Net", }, }, @@ -8882,28 +8885,28 @@ var g = &grammar{ }, { name: "AddressLiteral", - pos: position{line: 1046, col: 1, offset: 29760}, + pos: position{line: 1048, col: 1, offset: 29663}, expr: &choiceExpr{ - pos: position{line: 1047, col: 5, offset: 29779}, + pos: position{line: 1049, col: 5, offset: 29682}, alternatives: []any{ &actionExpr{ - pos: position{line: 1047, col: 5, offset: 29779}, + pos: position{line: 1049, col: 5, offset: 29682}, run: (*parser).callonAddressLiteral2, expr: &seqExpr{ - pos: position{line: 1047, col: 5, offset: 29779}, + pos: position{line: 1049, col: 5, offset: 29682}, exprs: []any{ &labeledExpr{ - pos: position{line: 1047, col: 5, offset: 29779}, + pos: position{line: 1049, col: 5, offset: 29682}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1047, col: 7, offset: 29781}, + pos: position{line: 1049, col: 7, offset: 29684}, name: "IP6", }, }, ¬Expr{ - pos: position{line: 1047, col: 11, offset: 29785}, + pos: position{line: 1049, col: 11, offset: 29688}, expr: &ruleRefExpr{ - pos: position{line: 1047, col: 12, offset: 29786}, + pos: position{line: 1049, col: 12, offset: 29689}, name: "IdentifierRest", }, }, @@ -8911,13 +8914,13 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1050, col: 5, offset: 29900}, + pos: position{line: 1052, col: 5, offset: 29803}, run: (*parser).callonAddressLiteral8, expr: &labeledExpr{ - pos: position{line: 1050, col: 5, offset: 29900}, + pos: position{line: 1052, col: 5, offset: 29803}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1050, col: 7, offset: 29902}, + pos: position{line: 1052, col: 7, offset: 29805}, name: "IP", }, }, @@ -8927,15 +8930,15 @@ var g = &grammar{ }, { name: "FloatLiteral", - pos: position{line: 1054, col: 1, offset: 30001}, + pos: position{line: 1056, col: 1, offset: 29904}, expr: &actionExpr{ - pos: position{line: 1055, col: 5, offset: 30018}, + pos: position{line: 1057, col: 5, offset: 29921}, run: (*parser).callonFloatLiteral1, expr: &labeledExpr{ - pos: position{line: 1055, col: 5, offset: 30018}, + pos: position{line: 1057, col: 5, offset: 29921}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1055, col: 7, offset: 30020}, + pos: position{line: 1057, col: 7, offset: 29923}, name: "FloatString", }, }, @@ -8943,15 +8946,15 @@ var g = &grammar{ }, { name: "IntegerLiteral", - pos: position{line: 1059, col: 1, offset: 30133}, + pos: position{line: 1061, col: 1, offset: 30036}, expr: &actionExpr{ - pos: position{line: 1060, col: 5, offset: 30152}, + pos: position{line: 1062, col: 5, offset: 30055}, run: (*parser).callonIntegerLiteral1, expr: &labeledExpr{ - pos: position{line: 1060, col: 5, offset: 30152}, + pos: position{line: 1062, col: 5, offset: 30055}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1060, col: 7, offset: 30154}, + pos: position{line: 1062, col: 7, offset: 30057}, name: "IntString", }, }, @@ -8959,23 +8962,23 @@ var g = &grammar{ }, { name: "BooleanLiteral", - pos: position{line: 1064, col: 1, offset: 30263}, + pos: position{line: 1066, col: 1, offset: 30166}, expr: &choiceExpr{ - pos: position{line: 1065, col: 5, offset: 30282}, + pos: position{line: 1067, col: 5, offset: 30185}, alternatives: []any{ &actionExpr{ - pos: position{line: 1065, col: 5, offset: 30282}, + pos: position{line: 1067, col: 5, offset: 30185}, run: (*parser).callonBooleanLiteral2, expr: &ruleRefExpr{ - pos: position{line: 1065, col: 5, offset: 30282}, + pos: position{line: 1067, col: 5, offset: 30185}, name: "TrueToken", }, }, &actionExpr{ - pos: position{line: 1066, col: 5, offset: 30389}, + pos: position{line: 1068, col: 5, offset: 30292}, run: (*parser).callonBooleanLiteral4, expr: &ruleRefExpr{ - pos: position{line: 1066, col: 5, offset: 30389}, + pos: position{line: 1068, col: 5, offset: 30292}, name: "FalseToken", }, }, @@ -8984,35 +8987,35 @@ var g = &grammar{ }, { name: "NullLiteral", - pos: position{line: 1068, col: 1, offset: 30494}, + pos: position{line: 1070, col: 1, offset: 30397}, expr: &actionExpr{ - pos: position{line: 1069, col: 5, offset: 30510}, + pos: position{line: 1071, col: 5, offset: 30413}, run: (*parser).callonNullLiteral1, expr: &ruleRefExpr{ - pos: position{line: 1069, col: 5, offset: 30510}, + pos: position{line: 1071, col: 5, offset: 30413}, name: "NullToken", }, }, }, { name: "BytesLiteral", - pos: position{line: 1071, col: 1, offset: 30609}, + pos: position{line: 1073, col: 1, offset: 30512}, expr: &actionExpr{ - pos: position{line: 1072, col: 5, offset: 30626}, + pos: position{line: 1074, col: 5, offset: 30529}, run: (*parser).callonBytesLiteral1, expr: &seqExpr{ - pos: position{line: 1072, col: 5, offset: 30626}, + pos: position{line: 1074, col: 5, offset: 30529}, exprs: []any{ &litMatcher{ - pos: position{line: 1072, col: 5, offset: 30626}, + pos: position{line: 1074, col: 5, offset: 30529}, val: "0x", ignoreCase: false, want: "\"0x\"", }, &zeroOrMoreExpr{ - pos: position{line: 1072, col: 10, offset: 30631}, + pos: position{line: 1074, col: 10, offset: 30534}, expr: &ruleRefExpr{ - pos: position{line: 1072, col: 10, offset: 30631}, + pos: position{line: 1074, col: 10, offset: 30534}, name: "HexDigit", }, }, @@ -9022,29 +9025,29 @@ var g = &grammar{ }, { name: "TypeLiteral", - pos: position{line: 1076, col: 1, offset: 30746}, + pos: position{line: 1078, col: 1, offset: 30649}, expr: &actionExpr{ - pos: position{line: 1077, col: 5, offset: 30762}, + pos: position{line: 1079, col: 5, offset: 30665}, run: (*parser).callonTypeLiteral1, expr: &seqExpr{ - pos: position{line: 1077, col: 5, offset: 30762}, + pos: position{line: 1079, col: 5, offset: 30665}, exprs: []any{ &litMatcher{ - pos: position{line: 1077, col: 5, offset: 30762}, + pos: position{line: 1079, col: 5, offset: 30665}, val: "<", ignoreCase: false, want: "\"<\"", }, &labeledExpr{ - pos: position{line: 1077, col: 9, offset: 30766}, + pos: position{line: 1079, col: 9, offset: 30669}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1077, col: 13, offset: 30770}, + pos: position{line: 1079, col: 13, offset: 30673}, name: "Type", }, }, &litMatcher{ - pos: position{line: 1077, col: 18, offset: 30775}, + pos: position{line: 1079, col: 18, offset: 30678}, val: ">", ignoreCase: false, want: "\">\"", @@ -9055,16 +9058,16 @@ var g = &grammar{ }, { name: "Type", - pos: position{line: 1081, col: 1, offset: 30864}, + pos: position{line: 1083, col: 1, offset: 30767}, expr: &choiceExpr{ - pos: position{line: 1082, col: 5, offset: 30873}, + pos: position{line: 1084, col: 5, offset: 30776}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1082, col: 5, offset: 30873}, + pos: position{line: 1084, col: 5, offset: 30776}, name: "AmbiguousType", }, &ruleRefExpr{ - pos: position{line: 1083, col: 5, offset: 30891}, + pos: position{line: 1085, col: 5, offset: 30794}, name: "ComplexType", }, }, @@ -9072,28 +9075,28 @@ var g = &grammar{ }, { name: "AmbiguousType", - pos: position{line: 1085, col: 1, offset: 30904}, + pos: position{line: 1087, col: 1, offset: 30807}, expr: &choiceExpr{ - pos: position{line: 1086, col: 5, offset: 30922}, + pos: position{line: 1088, col: 5, offset: 30825}, alternatives: []any{ &actionExpr{ - pos: position{line: 1086, col: 5, offset: 30922}, + pos: position{line: 1088, col: 5, offset: 30825}, run: (*parser).callonAmbiguousType2, expr: &seqExpr{ - pos: position{line: 1086, col: 5, offset: 30922}, + pos: position{line: 1088, col: 5, offset: 30825}, exprs: []any{ &labeledExpr{ - pos: position{line: 1086, col: 5, offset: 30922}, + pos: position{line: 1088, col: 5, offset: 30825}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1086, col: 10, offset: 30927}, + pos: position{line: 1088, col: 10, offset: 30830}, name: "PrimitiveType", }, }, ¬Expr{ - pos: position{line: 1086, col: 24, offset: 30941}, + pos: position{line: 1088, col: 24, offset: 30844}, expr: &ruleRefExpr{ - pos: position{line: 1086, col: 25, offset: 30942}, + pos: position{line: 1088, col: 25, offset: 30845}, name: "IdentifierRest", }, }, @@ -9101,45 +9104,45 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1087, col: 5, offset: 30982}, + pos: position{line: 1089, col: 5, offset: 30885}, run: (*parser).callonAmbiguousType8, expr: &seqExpr{ - pos: position{line: 1087, col: 5, offset: 30982}, + pos: position{line: 1089, col: 5, offset: 30885}, exprs: []any{ &litMatcher{ - pos: position{line: 1087, col: 5, offset: 30982}, + pos: position{line: 1089, col: 5, offset: 30885}, val: "error", ignoreCase: false, want: "\"error\"", }, &ruleRefExpr{ - pos: position{line: 1087, col: 13, offset: 30990}, + pos: position{line: 1089, col: 13, offset: 30893}, name: "__", }, &litMatcher{ - pos: position{line: 1087, col: 16, offset: 30993}, + pos: position{line: 1089, col: 16, offset: 30896}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1087, col: 20, offset: 30997}, + pos: position{line: 1089, col: 20, offset: 30900}, name: "__", }, &labeledExpr{ - pos: position{line: 1087, col: 23, offset: 31000}, + pos: position{line: 1089, col: 23, offset: 30903}, label: "t", expr: &ruleRefExpr{ - pos: position{line: 1087, col: 25, offset: 31002}, + pos: position{line: 1089, col: 25, offset: 30905}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1087, col: 30, offset: 31007}, + pos: position{line: 1089, col: 30, offset: 30910}, name: "__", }, &litMatcher{ - pos: position{line: 1087, col: 33, offset: 31010}, + pos: position{line: 1089, col: 33, offset: 30913}, val: ")", ignoreCase: false, want: "\")\"", @@ -9148,43 +9151,43 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1090, col: 5, offset: 31099}, + pos: position{line: 1092, col: 5, offset: 31002}, run: (*parser).callonAmbiguousType18, expr: &seqExpr{ - pos: position{line: 1090, col: 5, offset: 31099}, + pos: position{line: 1092, col: 5, offset: 31002}, exprs: []any{ &labeledExpr{ - pos: position{line: 1090, col: 5, offset: 31099}, + pos: position{line: 1092, col: 5, offset: 31002}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1090, col: 10, offset: 31104}, + pos: position{line: 1092, col: 10, offset: 31007}, name: "IdentifierName", }, }, &labeledExpr{ - pos: position{line: 1090, col: 25, offset: 31119}, + pos: position{line: 1092, col: 25, offset: 31022}, label: "opt", expr: &zeroOrOneExpr{ - pos: position{line: 1090, col: 29, offset: 31123}, + pos: position{line: 1092, col: 29, offset: 31026}, expr: &seqExpr{ - pos: position{line: 1090, col: 30, offset: 31124}, + pos: position{line: 1092, col: 30, offset: 31027}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1090, col: 30, offset: 31124}, + pos: position{line: 1092, col: 30, offset: 31027}, name: "__", }, &litMatcher{ - pos: position{line: 1090, col: 33, offset: 31127}, + pos: position{line: 1092, col: 33, offset: 31030}, val: "=", ignoreCase: false, want: "\"=\"", }, &ruleRefExpr{ - pos: position{line: 1090, col: 37, offset: 31131}, + pos: position{line: 1092, col: 37, offset: 31034}, name: "__", }, &ruleRefExpr{ - pos: position{line: 1090, col: 40, offset: 31134}, + pos: position{line: 1092, col: 40, offset: 31037}, name: "Type", }, }, @@ -9195,43 +9198,43 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1096, col: 5, offset: 31366}, + pos: position{line: 1098, col: 5, offset: 31269}, run: (*parser).callonAmbiguousType29, expr: &labeledExpr{ - pos: position{line: 1096, col: 5, offset: 31366}, + pos: position{line: 1098, col: 5, offset: 31269}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1096, col: 10, offset: 31371}, + pos: position{line: 1098, col: 10, offset: 31274}, name: "QuotedString", }, }, }, &actionExpr{ - pos: position{line: 1099, col: 5, offset: 31471}, + pos: position{line: 1101, col: 5, offset: 31374}, run: (*parser).callonAmbiguousType32, expr: &seqExpr{ - pos: position{line: 1099, col: 5, offset: 31471}, + pos: position{line: 1101, col: 5, offset: 31374}, exprs: []any{ &litMatcher{ - pos: position{line: 1099, col: 5, offset: 31471}, + pos: position{line: 1101, col: 5, offset: 31374}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1099, col: 9, offset: 31475}, + pos: position{line: 1101, col: 9, offset: 31378}, name: "__", }, &labeledExpr{ - pos: position{line: 1099, col: 12, offset: 31478}, + pos: position{line: 1101, col: 12, offset: 31381}, label: "u", expr: &ruleRefExpr{ - pos: position{line: 1099, col: 14, offset: 31480}, + pos: position{line: 1101, col: 14, offset: 31383}, name: "TypeUnion", }, }, &litMatcher{ - pos: position{line: 1099, col: 24, offset: 31490}, + pos: position{line: 1101, col: 24, offset: 31393}, val: ")", ignoreCase: false, want: "\")\"", @@ -9244,15 +9247,15 @@ var g = &grammar{ }, { name: "TypeUnion", - pos: position{line: 1101, col: 1, offset: 31513}, + pos: position{line: 1103, col: 1, offset: 31416}, expr: &actionExpr{ - pos: position{line: 1102, col: 5, offset: 31527}, + pos: position{line: 1104, col: 5, offset: 31430}, run: (*parser).callonTypeUnion1, expr: &labeledExpr{ - pos: position{line: 1102, col: 5, offset: 31527}, + pos: position{line: 1104, col: 5, offset: 31430}, label: "types", expr: &ruleRefExpr{ - pos: position{line: 1102, col: 11, offset: 31533}, + pos: position{line: 1104, col: 11, offset: 31436}, name: "TypeList", }, }, @@ -9260,28 +9263,28 @@ var g = &grammar{ }, { name: "TypeList", - pos: position{line: 1106, col: 1, offset: 31629}, + pos: position{line: 1108, col: 1, offset: 31532}, expr: &actionExpr{ - pos: position{line: 1107, col: 5, offset: 31642}, + pos: position{line: 1109, col: 5, offset: 31545}, run: (*parser).callonTypeList1, expr: &seqExpr{ - pos: position{line: 1107, col: 5, offset: 31642}, + pos: position{line: 1109, col: 5, offset: 31545}, exprs: []any{ &labeledExpr{ - pos: position{line: 1107, col: 5, offset: 31642}, + pos: position{line: 1109, col: 5, offset: 31545}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1107, col: 11, offset: 31648}, + pos: position{line: 1109, col: 11, offset: 31551}, name: "Type", }, }, &labeledExpr{ - pos: position{line: 1107, col: 16, offset: 31653}, + pos: position{line: 1109, col: 16, offset: 31556}, label: "rest", expr: &oneOrMoreExpr{ - pos: position{line: 1107, col: 21, offset: 31658}, + pos: position{line: 1109, col: 21, offset: 31561}, expr: &ruleRefExpr{ - pos: position{line: 1107, col: 21, offset: 31658}, + pos: position{line: 1109, col: 21, offset: 31561}, name: "TypeListTail", }, }, @@ -9292,32 +9295,32 @@ var g = &grammar{ }, { name: "TypeListTail", - pos: position{line: 1111, col: 1, offset: 31752}, + pos: position{line: 1113, col: 1, offset: 31655}, expr: &actionExpr{ - pos: position{line: 1111, col: 16, offset: 31767}, + pos: position{line: 1113, col: 16, offset: 31670}, run: (*parser).callonTypeListTail1, expr: &seqExpr{ - pos: position{line: 1111, col: 16, offset: 31767}, + pos: position{line: 1113, col: 16, offset: 31670}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1111, col: 16, offset: 31767}, + pos: position{line: 1113, col: 16, offset: 31670}, name: "__", }, &litMatcher{ - pos: position{line: 1111, col: 19, offset: 31770}, + pos: position{line: 1113, col: 19, offset: 31673}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1111, col: 23, offset: 31774}, + pos: position{line: 1113, col: 23, offset: 31677}, name: "__", }, &labeledExpr{ - pos: position{line: 1111, col: 26, offset: 31777}, + pos: position{line: 1113, col: 26, offset: 31680}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1111, col: 30, offset: 31781}, + pos: position{line: 1113, col: 30, offset: 31684}, name: "Type", }, }, @@ -9327,40 +9330,40 @@ var g = &grammar{ }, { name: "ComplexType", - pos: position{line: 1113, col: 1, offset: 31807}, + pos: position{line: 1115, col: 1, offset: 31710}, expr: &choiceExpr{ - pos: position{line: 1114, col: 5, offset: 31823}, + pos: position{line: 1116, col: 5, offset: 31726}, alternatives: []any{ &actionExpr{ - pos: position{line: 1114, col: 5, offset: 31823}, + pos: position{line: 1116, col: 5, offset: 31726}, run: (*parser).callonComplexType2, expr: &seqExpr{ - pos: position{line: 1114, col: 5, offset: 31823}, + pos: position{line: 1116, col: 5, offset: 31726}, exprs: []any{ &litMatcher{ - pos: position{line: 1114, col: 5, offset: 31823}, + pos: position{line: 1116, col: 5, offset: 31726}, val: "{", ignoreCase: false, want: "\"{\"", }, &ruleRefExpr{ - pos: position{line: 1114, col: 9, offset: 31827}, + pos: position{line: 1116, col: 9, offset: 31730}, name: "__", }, &labeledExpr{ - pos: position{line: 1114, col: 12, offset: 31830}, + pos: position{line: 1116, col: 12, offset: 31733}, label: "fields", expr: &ruleRefExpr{ - pos: position{line: 1114, col: 19, offset: 31837}, + pos: position{line: 1116, col: 19, offset: 31740}, name: "TypeFieldList", }, }, &ruleRefExpr{ - pos: position{line: 1114, col: 33, offset: 31851}, + pos: position{line: 1116, col: 33, offset: 31754}, name: "__", }, &litMatcher{ - pos: position{line: 1114, col: 36, offset: 31854}, + pos: position{line: 1116, col: 36, offset: 31757}, val: "}", ignoreCase: false, want: "\"}\"", @@ -9369,35 +9372,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1117, col: 5, offset: 31951}, + pos: position{line: 1119, col: 5, offset: 31854}, run: (*parser).callonComplexType10, expr: &seqExpr{ - pos: position{line: 1117, col: 5, offset: 31951}, + pos: position{line: 1119, col: 5, offset: 31854}, exprs: []any{ &litMatcher{ - pos: position{line: 1117, col: 5, offset: 31951}, + pos: position{line: 1119, col: 5, offset: 31854}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 1117, col: 9, offset: 31955}, + pos: position{line: 1119, col: 9, offset: 31858}, name: "__", }, &labeledExpr{ - pos: position{line: 1117, col: 12, offset: 31958}, + pos: position{line: 1119, col: 12, offset: 31861}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1117, col: 16, offset: 31962}, + pos: position{line: 1119, col: 16, offset: 31865}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1117, col: 21, offset: 31967}, + pos: position{line: 1119, col: 21, offset: 31870}, name: "__", }, &litMatcher{ - pos: position{line: 1117, col: 24, offset: 31970}, + pos: position{line: 1119, col: 24, offset: 31873}, val: "]", ignoreCase: false, want: "\"]\"", @@ -9406,35 +9409,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1120, col: 5, offset: 32061}, + pos: position{line: 1122, col: 5, offset: 31964}, run: (*parser).callonComplexType18, expr: &seqExpr{ - pos: position{line: 1120, col: 5, offset: 32061}, + pos: position{line: 1122, col: 5, offset: 31964}, exprs: []any{ &litMatcher{ - pos: position{line: 1120, col: 5, offset: 32061}, + pos: position{line: 1122, col: 5, offset: 31964}, val: "|[", ignoreCase: false, want: "\"|[\"", }, &ruleRefExpr{ - pos: position{line: 1120, col: 10, offset: 32066}, + pos: position{line: 1122, col: 10, offset: 31969}, name: "__", }, &labeledExpr{ - pos: position{line: 1120, col: 13, offset: 32069}, + pos: position{line: 1122, col: 13, offset: 31972}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1120, col: 17, offset: 32073}, + pos: position{line: 1122, col: 17, offset: 31976}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1120, col: 22, offset: 32078}, + pos: position{line: 1122, col: 22, offset: 31981}, name: "__", }, &litMatcher{ - pos: position{line: 1120, col: 25, offset: 32081}, + pos: position{line: 1122, col: 25, offset: 31984}, val: "]|", ignoreCase: false, want: "\"]|\"", @@ -9443,57 +9446,57 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1123, col: 5, offset: 32171}, + pos: position{line: 1125, col: 5, offset: 32074}, run: (*parser).callonComplexType26, expr: &seqExpr{ - pos: position{line: 1123, col: 5, offset: 32171}, + pos: position{line: 1125, col: 5, offset: 32074}, exprs: []any{ &litMatcher{ - pos: position{line: 1123, col: 5, offset: 32171}, + pos: position{line: 1125, col: 5, offset: 32074}, val: "|{", ignoreCase: false, want: "\"|{\"", }, &ruleRefExpr{ - pos: position{line: 1123, col: 10, offset: 32176}, + pos: position{line: 1125, col: 10, offset: 32079}, name: "__", }, &labeledExpr{ - pos: position{line: 1123, col: 13, offset: 32179}, + pos: position{line: 1125, col: 13, offset: 32082}, label: "keyType", expr: &ruleRefExpr{ - pos: position{line: 1123, col: 21, offset: 32187}, + pos: position{line: 1125, col: 21, offset: 32090}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1123, col: 26, offset: 32192}, + pos: position{line: 1125, col: 26, offset: 32095}, name: "__", }, &litMatcher{ - pos: position{line: 1123, col: 29, offset: 32195}, + pos: position{line: 1125, col: 29, offset: 32098}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1123, col: 33, offset: 32199}, + pos: position{line: 1125, col: 33, offset: 32102}, name: "__", }, &labeledExpr{ - pos: position{line: 1123, col: 36, offset: 32202}, + pos: position{line: 1125, col: 36, offset: 32105}, label: "valType", expr: &ruleRefExpr{ - pos: position{line: 1123, col: 44, offset: 32210}, + pos: position{line: 1125, col: 44, offset: 32113}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1123, col: 49, offset: 32215}, + pos: position{line: 1125, col: 49, offset: 32118}, name: "__", }, &litMatcher{ - pos: position{line: 1123, col: 52, offset: 32218}, + pos: position{line: 1125, col: 52, offset: 32121}, val: "}|", ignoreCase: false, want: "\"}|\"", @@ -9506,15 +9509,15 @@ var g = &grammar{ }, { name: "TemplateLiteral", - pos: position{line: 1127, col: 1, offset: 32334}, + pos: position{line: 1129, col: 1, offset: 32237}, expr: &actionExpr{ - pos: position{line: 1128, col: 5, offset: 32354}, + pos: position{line: 1130, col: 5, offset: 32257}, run: (*parser).callonTemplateLiteral1, expr: &labeledExpr{ - pos: position{line: 1128, col: 5, offset: 32354}, + pos: position{line: 1130, col: 5, offset: 32257}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1128, col: 7, offset: 32356}, + pos: position{line: 1130, col: 7, offset: 32259}, name: "TemplateLiteralParts", }, }, @@ -9522,35 +9525,35 @@ var g = &grammar{ }, { name: "TemplateLiteralParts", - pos: position{line: 1135, col: 1, offset: 32572}, + pos: position{line: 1137, col: 1, offset: 32475}, expr: &choiceExpr{ - pos: position{line: 1136, col: 5, offset: 32597}, + pos: position{line: 1138, col: 5, offset: 32500}, alternatives: []any{ &actionExpr{ - pos: position{line: 1136, col: 5, offset: 32597}, + pos: position{line: 1138, col: 5, offset: 32500}, run: (*parser).callonTemplateLiteralParts2, expr: &seqExpr{ - pos: position{line: 1136, col: 5, offset: 32597}, + pos: position{line: 1138, col: 5, offset: 32500}, exprs: []any{ &litMatcher{ - pos: position{line: 1136, col: 5, offset: 32597}, + pos: position{line: 1138, col: 5, offset: 32500}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, &labeledExpr{ - pos: position{line: 1136, col: 9, offset: 32601}, + pos: position{line: 1138, col: 9, offset: 32504}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1136, col: 11, offset: 32603}, + pos: position{line: 1138, col: 11, offset: 32506}, expr: &ruleRefExpr{ - pos: position{line: 1136, col: 11, offset: 32603}, + pos: position{line: 1138, col: 11, offset: 32506}, name: "TemplateDoubleQuotedPart", }, }, }, &litMatcher{ - pos: position{line: 1136, col: 37, offset: 32629}, + pos: position{line: 1138, col: 37, offset: 32532}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -9559,30 +9562,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1137, col: 5, offset: 32655}, + pos: position{line: 1139, col: 5, offset: 32558}, run: (*parser).callonTemplateLiteralParts9, expr: &seqExpr{ - pos: position{line: 1137, col: 5, offset: 32655}, + pos: position{line: 1139, col: 5, offset: 32558}, exprs: []any{ &litMatcher{ - pos: position{line: 1137, col: 5, offset: 32655}, + pos: position{line: 1139, col: 5, offset: 32558}, val: "'", ignoreCase: false, want: "\"'\"", }, &labeledExpr{ - pos: position{line: 1137, col: 9, offset: 32659}, + pos: position{line: 1139, col: 9, offset: 32562}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1137, col: 11, offset: 32661}, + pos: position{line: 1139, col: 11, offset: 32564}, expr: &ruleRefExpr{ - pos: position{line: 1137, col: 11, offset: 32661}, + pos: position{line: 1139, col: 11, offset: 32564}, name: "TemplateSingleQuotedPart", }, }, }, &litMatcher{ - pos: position{line: 1137, col: 37, offset: 32687}, + pos: position{line: 1139, col: 37, offset: 32590}, val: "'", ignoreCase: false, want: "\"'\"", @@ -9595,24 +9598,24 @@ var g = &grammar{ }, { name: "TemplateDoubleQuotedPart", - pos: position{line: 1139, col: 1, offset: 32710}, + pos: position{line: 1141, col: 1, offset: 32613}, expr: &choiceExpr{ - pos: position{line: 1140, col: 5, offset: 32739}, + pos: position{line: 1142, col: 5, offset: 32642}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1140, col: 5, offset: 32739}, + pos: position{line: 1142, col: 5, offset: 32642}, name: "TemplateExpr", }, &actionExpr{ - pos: position{line: 1141, col: 5, offset: 32756}, + pos: position{line: 1143, col: 5, offset: 32659}, run: (*parser).callonTemplateDoubleQuotedPart3, expr: &labeledExpr{ - pos: position{line: 1141, col: 5, offset: 32756}, + pos: position{line: 1143, col: 5, offset: 32659}, label: "v", expr: &oneOrMoreExpr{ - pos: position{line: 1141, col: 7, offset: 32758}, + pos: position{line: 1143, col: 7, offset: 32661}, expr: &ruleRefExpr{ - pos: position{line: 1141, col: 7, offset: 32758}, + pos: position{line: 1143, col: 7, offset: 32661}, name: "TemplateDoubleQuotedChar", }, }, @@ -9623,27 +9626,27 @@ var g = &grammar{ }, { name: "TemplateDoubleQuotedChar", - pos: position{line: 1145, col: 1, offset: 32895}, + pos: position{line: 1147, col: 1, offset: 32798}, expr: &choiceExpr{ - pos: position{line: 1146, col: 5, offset: 32924}, + pos: position{line: 1148, col: 5, offset: 32827}, alternatives: []any{ &actionExpr{ - pos: position{line: 1146, col: 5, offset: 32924}, + pos: position{line: 1148, col: 5, offset: 32827}, run: (*parser).callonTemplateDoubleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1146, col: 5, offset: 32924}, + pos: position{line: 1148, col: 5, offset: 32827}, exprs: []any{ &litMatcher{ - pos: position{line: 1146, col: 5, offset: 32924}, + pos: position{line: 1148, col: 5, offset: 32827}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1146, col: 10, offset: 32929}, + pos: position{line: 1148, col: 10, offset: 32832}, label: "v", expr: &litMatcher{ - pos: position{line: 1146, col: 12, offset: 32931}, + pos: position{line: 1148, col: 12, offset: 32834}, val: "${", ignoreCase: false, want: "\"${\"", @@ -9653,25 +9656,25 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1147, col: 5, offset: 32958}, + pos: position{line: 1149, col: 5, offset: 32861}, run: (*parser).callonTemplateDoubleQuotedChar7, expr: &seqExpr{ - pos: position{line: 1147, col: 5, offset: 32958}, + pos: position{line: 1149, col: 5, offset: 32861}, exprs: []any{ ¬Expr{ - pos: position{line: 1147, col: 5, offset: 32958}, + pos: position{line: 1149, col: 5, offset: 32861}, expr: &litMatcher{ - pos: position{line: 1147, col: 7, offset: 32960}, + pos: position{line: 1149, col: 7, offset: 32863}, val: "${", ignoreCase: false, want: "\"${\"", }, }, &labeledExpr{ - pos: position{line: 1147, col: 13, offset: 32966}, + pos: position{line: 1149, col: 13, offset: 32869}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1147, col: 15, offset: 32968}, + pos: position{line: 1149, col: 15, offset: 32871}, name: "DoubleQuotedChar", }, }, @@ -9683,24 +9686,24 @@ var g = &grammar{ }, { name: "TemplateSingleQuotedPart", - pos: position{line: 1149, col: 1, offset: 33004}, + pos: position{line: 1151, col: 1, offset: 32907}, expr: &choiceExpr{ - pos: position{line: 1150, col: 5, offset: 33033}, + pos: position{line: 1152, col: 5, offset: 32936}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1150, col: 5, offset: 33033}, + pos: position{line: 1152, col: 5, offset: 32936}, name: "TemplateExpr", }, &actionExpr{ - pos: position{line: 1151, col: 5, offset: 33050}, + pos: position{line: 1153, col: 5, offset: 32953}, run: (*parser).callonTemplateSingleQuotedPart3, expr: &labeledExpr{ - pos: position{line: 1151, col: 5, offset: 33050}, + pos: position{line: 1153, col: 5, offset: 32953}, label: "v", expr: &oneOrMoreExpr{ - pos: position{line: 1151, col: 7, offset: 33052}, + pos: position{line: 1153, col: 7, offset: 32955}, expr: &ruleRefExpr{ - pos: position{line: 1151, col: 7, offset: 33052}, + pos: position{line: 1153, col: 7, offset: 32955}, name: "TemplateSingleQuotedChar", }, }, @@ -9711,27 +9714,27 @@ var g = &grammar{ }, { name: "TemplateSingleQuotedChar", - pos: position{line: 1155, col: 1, offset: 33189}, + pos: position{line: 1157, col: 1, offset: 33092}, expr: &choiceExpr{ - pos: position{line: 1156, col: 5, offset: 33218}, + pos: position{line: 1158, col: 5, offset: 33121}, alternatives: []any{ &actionExpr{ - pos: position{line: 1156, col: 5, offset: 33218}, + pos: position{line: 1158, col: 5, offset: 33121}, run: (*parser).callonTemplateSingleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1156, col: 5, offset: 33218}, + pos: position{line: 1158, col: 5, offset: 33121}, exprs: []any{ &litMatcher{ - pos: position{line: 1156, col: 5, offset: 33218}, + pos: position{line: 1158, col: 5, offset: 33121}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1156, col: 10, offset: 33223}, + pos: position{line: 1158, col: 10, offset: 33126}, label: "v", expr: &litMatcher{ - pos: position{line: 1156, col: 12, offset: 33225}, + pos: position{line: 1158, col: 12, offset: 33128}, val: "${", ignoreCase: false, want: "\"${\"", @@ -9741,25 +9744,25 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1157, col: 5, offset: 33252}, + pos: position{line: 1159, col: 5, offset: 33155}, run: (*parser).callonTemplateSingleQuotedChar7, expr: &seqExpr{ - pos: position{line: 1157, col: 5, offset: 33252}, + pos: position{line: 1159, col: 5, offset: 33155}, exprs: []any{ ¬Expr{ - pos: position{line: 1157, col: 5, offset: 33252}, + pos: position{line: 1159, col: 5, offset: 33155}, expr: &litMatcher{ - pos: position{line: 1157, col: 7, offset: 33254}, + pos: position{line: 1159, col: 7, offset: 33157}, val: "${", ignoreCase: false, want: "\"${\"", }, }, &labeledExpr{ - pos: position{line: 1157, col: 13, offset: 33260}, + pos: position{line: 1159, col: 13, offset: 33163}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1157, col: 15, offset: 33262}, + pos: position{line: 1159, col: 15, offset: 33165}, name: "SingleQuotedChar", }, }, @@ -9771,37 +9774,37 @@ var g = &grammar{ }, { name: "TemplateExpr", - pos: position{line: 1159, col: 1, offset: 33298}, + pos: position{line: 1161, col: 1, offset: 33201}, expr: &actionExpr{ - pos: position{line: 1160, col: 5, offset: 33315}, + pos: position{line: 1162, col: 5, offset: 33218}, run: (*parser).callonTemplateExpr1, expr: &seqExpr{ - pos: position{line: 1160, col: 5, offset: 33315}, + pos: position{line: 1162, col: 5, offset: 33218}, exprs: []any{ &litMatcher{ - pos: position{line: 1160, col: 5, offset: 33315}, + pos: position{line: 1162, col: 5, offset: 33218}, val: "${", ignoreCase: false, want: "\"${\"", }, &ruleRefExpr{ - pos: position{line: 1160, col: 10, offset: 33320}, + pos: position{line: 1162, col: 10, offset: 33223}, name: "__", }, &labeledExpr{ - pos: position{line: 1160, col: 13, offset: 33323}, + pos: position{line: 1162, col: 13, offset: 33226}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1160, col: 15, offset: 33325}, + pos: position{line: 1162, col: 15, offset: 33228}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1160, col: 20, offset: 33330}, + pos: position{line: 1162, col: 20, offset: 33233}, name: "__", }, &litMatcher{ - pos: position{line: 1160, col: 23, offset: 33333}, + pos: position{line: 1162, col: 23, offset: 33236}, val: "}", ignoreCase: false, want: "\"}\"", @@ -9812,129 +9815,129 @@ var g = &grammar{ }, { name: "PrimitiveType", - pos: position{line: 1175, col: 1, offset: 33629}, + pos: position{line: 1177, col: 1, offset: 33532}, expr: &actionExpr{ - pos: position{line: 1176, col: 5, offset: 33647}, + pos: position{line: 1178, col: 5, offset: 33550}, run: (*parser).callonPrimitiveType1, expr: &choiceExpr{ - pos: position{line: 1176, col: 9, offset: 33651}, + pos: position{line: 1178, col: 9, offset: 33554}, alternatives: []any{ &litMatcher{ - pos: position{line: 1176, col: 9, offset: 33651}, + pos: position{line: 1178, col: 9, offset: 33554}, val: "uint8", ignoreCase: false, want: "\"uint8\"", }, &litMatcher{ - pos: position{line: 1176, col: 19, offset: 33661}, + pos: position{line: 1178, col: 19, offset: 33564}, val: "uint16", ignoreCase: false, want: "\"uint16\"", }, &litMatcher{ - pos: position{line: 1176, col: 30, offset: 33672}, + pos: position{line: 1178, col: 30, offset: 33575}, val: "uint32", ignoreCase: false, want: "\"uint32\"", }, &litMatcher{ - pos: position{line: 1176, col: 41, offset: 33683}, + pos: position{line: 1178, col: 41, offset: 33586}, val: "uint64", ignoreCase: false, want: "\"uint64\"", }, &litMatcher{ - pos: position{line: 1177, col: 9, offset: 33700}, + pos: position{line: 1179, col: 9, offset: 33603}, val: "int8", ignoreCase: false, want: "\"int8\"", }, &litMatcher{ - pos: position{line: 1177, col: 18, offset: 33709}, + pos: position{line: 1179, col: 18, offset: 33612}, val: "int16", ignoreCase: false, want: "\"int16\"", }, &litMatcher{ - pos: position{line: 1177, col: 28, offset: 33719}, + pos: position{line: 1179, col: 28, offset: 33622}, val: "int32", ignoreCase: false, want: "\"int32\"", }, &litMatcher{ - pos: position{line: 1177, col: 38, offset: 33729}, + pos: position{line: 1179, col: 38, offset: 33632}, val: "int64", ignoreCase: false, want: "\"int64\"", }, &litMatcher{ - pos: position{line: 1178, col: 9, offset: 33745}, + pos: position{line: 1180, col: 9, offset: 33648}, val: "float16", ignoreCase: false, want: "\"float16\"", }, &litMatcher{ - pos: position{line: 1178, col: 21, offset: 33757}, + pos: position{line: 1180, col: 21, offset: 33660}, val: "float32", ignoreCase: false, want: "\"float32\"", }, &litMatcher{ - pos: position{line: 1178, col: 33, offset: 33769}, + pos: position{line: 1180, col: 33, offset: 33672}, val: "float64", ignoreCase: false, want: "\"float64\"", }, &litMatcher{ - pos: position{line: 1179, col: 9, offset: 33787}, + pos: position{line: 1181, col: 9, offset: 33690}, val: "bool", ignoreCase: false, want: "\"bool\"", }, &litMatcher{ - pos: position{line: 1179, col: 18, offset: 33796}, + pos: position{line: 1181, col: 18, offset: 33699}, val: "string", ignoreCase: false, want: "\"string\"", }, &litMatcher{ - pos: position{line: 1180, col: 9, offset: 33813}, + pos: position{line: 1182, col: 9, offset: 33716}, val: "duration", ignoreCase: false, want: "\"duration\"", }, &litMatcher{ - pos: position{line: 1180, col: 22, offset: 33826}, + pos: position{line: 1182, col: 22, offset: 33729}, val: "time", ignoreCase: false, want: "\"time\"", }, &litMatcher{ - pos: position{line: 1181, col: 9, offset: 33841}, + pos: position{line: 1183, col: 9, offset: 33744}, val: "bytes", ignoreCase: false, want: "\"bytes\"", }, &litMatcher{ - pos: position{line: 1182, col: 9, offset: 33857}, + pos: position{line: 1184, col: 9, offset: 33760}, val: "ip", ignoreCase: false, want: "\"ip\"", }, &litMatcher{ - pos: position{line: 1182, col: 16, offset: 33864}, + pos: position{line: 1184, col: 16, offset: 33767}, val: "net", ignoreCase: false, want: "\"net\"", }, &litMatcher{ - pos: position{line: 1183, col: 9, offset: 33878}, + pos: position{line: 1185, col: 9, offset: 33781}, val: "type", ignoreCase: false, want: "\"type\"", }, &litMatcher{ - pos: position{line: 1183, col: 18, offset: 33887}, + pos: position{line: 1185, col: 18, offset: 33790}, val: "null", ignoreCase: false, want: "\"null\"", @@ -9945,31 +9948,31 @@ var g = &grammar{ }, { name: "TypeFieldList", - pos: position{line: 1187, col: 1, offset: 34002}, + pos: position{line: 1189, col: 1, offset: 33905}, expr: &choiceExpr{ - pos: position{line: 1188, col: 5, offset: 34020}, + pos: position{line: 1190, col: 5, offset: 33923}, alternatives: []any{ &actionExpr{ - pos: position{line: 1188, col: 5, offset: 34020}, + pos: position{line: 1190, col: 5, offset: 33923}, run: (*parser).callonTypeFieldList2, expr: &seqExpr{ - pos: position{line: 1188, col: 5, offset: 34020}, + pos: position{line: 1190, col: 5, offset: 33923}, exprs: []any{ &labeledExpr{ - pos: position{line: 1188, col: 5, offset: 34020}, + pos: position{line: 1190, col: 5, offset: 33923}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1188, col: 11, offset: 34026}, + pos: position{line: 1190, col: 11, offset: 33929}, name: "TypeField", }, }, &labeledExpr{ - pos: position{line: 1188, col: 21, offset: 34036}, + pos: position{line: 1190, col: 21, offset: 33939}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1188, col: 26, offset: 34041}, + pos: position{line: 1190, col: 26, offset: 33944}, expr: &ruleRefExpr{ - pos: position{line: 1188, col: 26, offset: 34041}, + pos: position{line: 1190, col: 26, offset: 33944}, name: "TypeFieldListTail", }, }, @@ -9978,10 +9981,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1191, col: 5, offset: 34143}, + pos: position{line: 1193, col: 5, offset: 34046}, run: (*parser).callonTypeFieldList9, expr: &litMatcher{ - pos: position{line: 1191, col: 5, offset: 34143}, + pos: position{line: 1193, col: 5, offset: 34046}, val: "", ignoreCase: false, want: "\"\"", @@ -9992,32 +9995,32 @@ var g = &grammar{ }, { name: "TypeFieldListTail", - pos: position{line: 1193, col: 1, offset: 34167}, + pos: position{line: 1195, col: 1, offset: 34070}, expr: &actionExpr{ - pos: position{line: 1193, col: 21, offset: 34187}, + pos: position{line: 1195, col: 21, offset: 34090}, run: (*parser).callonTypeFieldListTail1, expr: &seqExpr{ - pos: position{line: 1193, col: 21, offset: 34187}, + pos: position{line: 1195, col: 21, offset: 34090}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1193, col: 21, offset: 34187}, + pos: position{line: 1195, col: 21, offset: 34090}, name: "__", }, &litMatcher{ - pos: position{line: 1193, col: 24, offset: 34190}, + pos: position{line: 1195, col: 24, offset: 34093}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1193, col: 28, offset: 34194}, + pos: position{line: 1195, col: 28, offset: 34097}, name: "__", }, &labeledExpr{ - pos: position{line: 1193, col: 31, offset: 34197}, + pos: position{line: 1195, col: 31, offset: 34100}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1193, col: 35, offset: 34201}, + pos: position{line: 1195, col: 35, offset: 34104}, name: "TypeField", }, }, @@ -10027,40 +10030,40 @@ var g = &grammar{ }, { name: "TypeField", - pos: position{line: 1195, col: 1, offset: 34232}, + pos: position{line: 1197, col: 1, offset: 34135}, expr: &actionExpr{ - pos: position{line: 1196, col: 5, offset: 34246}, + pos: position{line: 1198, col: 5, offset: 34149}, run: (*parser).callonTypeField1, expr: &seqExpr{ - pos: position{line: 1196, col: 5, offset: 34246}, + pos: position{line: 1198, col: 5, offset: 34149}, exprs: []any{ &labeledExpr{ - pos: position{line: 1196, col: 5, offset: 34246}, + pos: position{line: 1198, col: 5, offset: 34149}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1196, col: 10, offset: 34251}, + pos: position{line: 1198, col: 10, offset: 34154}, name: "FieldName", }, }, &ruleRefExpr{ - pos: position{line: 1196, col: 20, offset: 34261}, + pos: position{line: 1198, col: 20, offset: 34164}, name: "__", }, &litMatcher{ - pos: position{line: 1196, col: 23, offset: 34264}, + pos: position{line: 1198, col: 23, offset: 34167}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1196, col: 27, offset: 34268}, + pos: position{line: 1198, col: 27, offset: 34171}, name: "__", }, &labeledExpr{ - pos: position{line: 1196, col: 30, offset: 34271}, + pos: position{line: 1198, col: 30, offset: 34174}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1196, col: 34, offset: 34275}, + pos: position{line: 1198, col: 34, offset: 34178}, name: "Type", }, }, @@ -10070,16 +10073,16 @@ var g = &grammar{ }, { name: "FieldName", - pos: position{line: 1200, col: 1, offset: 34357}, + pos: position{line: 1202, col: 1, offset: 34260}, expr: &choiceExpr{ - pos: position{line: 1201, col: 5, offset: 34371}, + pos: position{line: 1203, col: 5, offset: 34274}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1201, col: 5, offset: 34371}, + pos: position{line: 1203, col: 5, offset: 34274}, name: "IdentifierName", }, &ruleRefExpr{ - pos: position{line: 1202, col: 5, offset: 34390}, + pos: position{line: 1204, col: 5, offset: 34293}, name: "QuotedString", }, }, @@ -10087,24 +10090,24 @@ var g = &grammar{ }, { name: "AndToken", - pos: position{line: 1204, col: 1, offset: 34404}, + pos: position{line: 1206, col: 1, offset: 34307}, expr: &actionExpr{ - pos: position{line: 1204, col: 12, offset: 34415}, + pos: position{line: 1206, col: 12, offset: 34318}, run: (*parser).callonAndToken1, expr: &seqExpr{ - pos: position{line: 1204, col: 12, offset: 34415}, + pos: position{line: 1206, col: 12, offset: 34318}, exprs: []any{ &choiceExpr{ - pos: position{line: 1204, col: 13, offset: 34416}, + pos: position{line: 1206, col: 13, offset: 34319}, alternatives: []any{ &litMatcher{ - pos: position{line: 1204, col: 13, offset: 34416}, + pos: position{line: 1206, col: 13, offset: 34319}, val: "and", ignoreCase: false, want: "\"and\"", }, &litMatcher{ - pos: position{line: 1204, col: 21, offset: 34424}, + pos: position{line: 1206, col: 21, offset: 34327}, val: "AND", ignoreCase: false, want: "\"AND\"", @@ -10112,9 +10115,9 @@ var g = &grammar{ }, }, ¬Expr{ - pos: position{line: 1204, col: 28, offset: 34431}, + pos: position{line: 1206, col: 28, offset: 34334}, expr: &ruleRefExpr{ - pos: position{line: 1204, col: 29, offset: 34432}, + pos: position{line: 1206, col: 29, offset: 34335}, name: "IdentifierRest", }, }, @@ -10124,20 +10127,20 @@ var g = &grammar{ }, { name: "ByToken", - pos: position{line: 1205, col: 1, offset: 34469}, + pos: position{line: 1207, col: 1, offset: 34372}, expr: &seqExpr{ - pos: position{line: 1205, col: 11, offset: 34479}, + pos: position{line: 1207, col: 11, offset: 34382}, exprs: []any{ &litMatcher{ - pos: position{line: 1205, col: 11, offset: 34479}, + pos: position{line: 1207, col: 11, offset: 34382}, val: "by", ignoreCase: false, want: "\"by\"", }, ¬Expr{ - pos: position{line: 1205, col: 16, offset: 34484}, + pos: position{line: 1207, col: 16, offset: 34387}, expr: &ruleRefExpr{ - pos: position{line: 1205, col: 17, offset: 34485}, + pos: position{line: 1207, col: 17, offset: 34388}, name: "IdentifierRest", }, }, @@ -10146,20 +10149,20 @@ var g = &grammar{ }, { name: "FalseToken", - pos: position{line: 1206, col: 1, offset: 34500}, + pos: position{line: 1208, col: 1, offset: 34403}, expr: &seqExpr{ - pos: position{line: 1206, col: 14, offset: 34513}, + pos: position{line: 1208, col: 14, offset: 34416}, exprs: []any{ &litMatcher{ - pos: position{line: 1206, col: 14, offset: 34513}, + pos: position{line: 1208, col: 14, offset: 34416}, val: "false", ignoreCase: false, want: "\"false\"", }, ¬Expr{ - pos: position{line: 1206, col: 22, offset: 34521}, + pos: position{line: 1208, col: 22, offset: 34424}, expr: &ruleRefExpr{ - pos: position{line: 1206, col: 23, offset: 34522}, + pos: position{line: 1208, col: 23, offset: 34425}, name: "IdentifierRest", }, }, @@ -10168,20 +10171,20 @@ var g = &grammar{ }, { name: "InToken", - pos: position{line: 1207, col: 1, offset: 34537}, + pos: position{line: 1209, col: 1, offset: 34440}, expr: &seqExpr{ - pos: position{line: 1207, col: 11, offset: 34547}, + pos: position{line: 1209, col: 11, offset: 34450}, exprs: []any{ &litMatcher{ - pos: position{line: 1207, col: 11, offset: 34547}, + pos: position{line: 1209, col: 11, offset: 34450}, val: "in", ignoreCase: false, want: "\"in\"", }, ¬Expr{ - pos: position{line: 1207, col: 16, offset: 34552}, + pos: position{line: 1209, col: 16, offset: 34455}, expr: &ruleRefExpr{ - pos: position{line: 1207, col: 17, offset: 34553}, + pos: position{line: 1209, col: 17, offset: 34456}, name: "IdentifierRest", }, }, @@ -10190,24 +10193,24 @@ var g = &grammar{ }, { name: "NotToken", - pos: position{line: 1208, col: 1, offset: 34568}, + pos: position{line: 1210, col: 1, offset: 34471}, expr: &actionExpr{ - pos: position{line: 1208, col: 12, offset: 34579}, + pos: position{line: 1210, col: 12, offset: 34482}, run: (*parser).callonNotToken1, expr: &seqExpr{ - pos: position{line: 1208, col: 12, offset: 34579}, + pos: position{line: 1210, col: 12, offset: 34482}, exprs: []any{ &choiceExpr{ - pos: position{line: 1208, col: 13, offset: 34580}, + pos: position{line: 1210, col: 13, offset: 34483}, alternatives: []any{ &litMatcher{ - pos: position{line: 1208, col: 13, offset: 34580}, + pos: position{line: 1210, col: 13, offset: 34483}, val: "not", ignoreCase: false, want: "\"not\"", }, &litMatcher{ - pos: position{line: 1208, col: 21, offset: 34588}, + pos: position{line: 1210, col: 21, offset: 34491}, val: "NOT", ignoreCase: false, want: "\"NOT\"", @@ -10215,9 +10218,9 @@ var g = &grammar{ }, }, ¬Expr{ - pos: position{line: 1208, col: 28, offset: 34595}, + pos: position{line: 1210, col: 28, offset: 34498}, expr: &ruleRefExpr{ - pos: position{line: 1208, col: 29, offset: 34596}, + pos: position{line: 1210, col: 29, offset: 34499}, name: "IdentifierRest", }, }, @@ -10227,20 +10230,20 @@ var g = &grammar{ }, { name: "NullToken", - pos: position{line: 1209, col: 1, offset: 34633}, + pos: position{line: 1211, col: 1, offset: 34536}, expr: &seqExpr{ - pos: position{line: 1209, col: 13, offset: 34645}, + pos: position{line: 1211, col: 13, offset: 34548}, exprs: []any{ &litMatcher{ - pos: position{line: 1209, col: 13, offset: 34645}, + pos: position{line: 1211, col: 13, offset: 34548}, val: "null", ignoreCase: false, want: "\"null\"", }, ¬Expr{ - pos: position{line: 1209, col: 20, offset: 34652}, + pos: position{line: 1211, col: 20, offset: 34555}, expr: &ruleRefExpr{ - pos: position{line: 1209, col: 21, offset: 34653}, + pos: position{line: 1211, col: 21, offset: 34556}, name: "IdentifierRest", }, }, @@ -10249,24 +10252,24 @@ var g = &grammar{ }, { name: "OrToken", - pos: position{line: 1210, col: 1, offset: 34668}, + pos: position{line: 1212, col: 1, offset: 34571}, expr: &actionExpr{ - pos: position{line: 1210, col: 11, offset: 34678}, + pos: position{line: 1212, col: 11, offset: 34581}, run: (*parser).callonOrToken1, expr: &seqExpr{ - pos: position{line: 1210, col: 11, offset: 34678}, + pos: position{line: 1212, col: 11, offset: 34581}, exprs: []any{ &choiceExpr{ - pos: position{line: 1210, col: 12, offset: 34679}, + pos: position{line: 1212, col: 12, offset: 34582}, alternatives: []any{ &litMatcher{ - pos: position{line: 1210, col: 12, offset: 34679}, + pos: position{line: 1212, col: 12, offset: 34582}, val: "or", ignoreCase: false, want: "\"or\"", }, &litMatcher{ - pos: position{line: 1210, col: 19, offset: 34686}, + pos: position{line: 1212, col: 19, offset: 34589}, val: "OR", ignoreCase: false, want: "\"OR\"", @@ -10274,9 +10277,9 @@ var g = &grammar{ }, }, ¬Expr{ - pos: position{line: 1210, col: 25, offset: 34692}, + pos: position{line: 1212, col: 25, offset: 34595}, expr: &ruleRefExpr{ - pos: position{line: 1210, col: 26, offset: 34693}, + pos: position{line: 1212, col: 26, offset: 34596}, name: "IdentifierRest", }, }, @@ -10286,20 +10289,20 @@ var g = &grammar{ }, { name: "TrueToken", - pos: position{line: 1211, col: 1, offset: 34729}, + pos: position{line: 1213, col: 1, offset: 34632}, expr: &seqExpr{ - pos: position{line: 1211, col: 13, offset: 34741}, + pos: position{line: 1213, col: 13, offset: 34644}, exprs: []any{ &litMatcher{ - pos: position{line: 1211, col: 13, offset: 34741}, + pos: position{line: 1213, col: 13, offset: 34644}, val: "true", ignoreCase: false, want: "\"true\"", }, ¬Expr{ - pos: position{line: 1211, col: 20, offset: 34748}, + pos: position{line: 1213, col: 20, offset: 34651}, expr: &ruleRefExpr{ - pos: position{line: 1211, col: 21, offset: 34749}, + pos: position{line: 1213, col: 21, offset: 34652}, name: "IdentifierRest", }, }, @@ -10308,15 +10311,15 @@ var g = &grammar{ }, { name: "Identifier", - pos: position{line: 1213, col: 1, offset: 34765}, + pos: position{line: 1215, col: 1, offset: 34668}, expr: &actionExpr{ - pos: position{line: 1214, col: 5, offset: 34780}, + pos: position{line: 1216, col: 5, offset: 34683}, run: (*parser).callonIdentifier1, expr: &labeledExpr{ - pos: position{line: 1214, col: 5, offset: 34780}, + pos: position{line: 1216, col: 5, offset: 34683}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 1214, col: 8, offset: 34783}, + pos: position{line: 1216, col: 8, offset: 34686}, name: "IdentifierName", }, }, @@ -10324,29 +10327,29 @@ var g = &grammar{ }, { name: "IdentifierName", - pos: position{line: 1216, col: 1, offset: 34864}, + pos: position{line: 1218, col: 1, offset: 34767}, expr: &choiceExpr{ - pos: position{line: 1217, col: 5, offset: 34883}, + pos: position{line: 1219, col: 5, offset: 34786}, alternatives: []any{ &actionExpr{ - pos: position{line: 1217, col: 5, offset: 34883}, + pos: position{line: 1219, col: 5, offset: 34786}, run: (*parser).callonIdentifierName2, expr: &seqExpr{ - pos: position{line: 1217, col: 5, offset: 34883}, + pos: position{line: 1219, col: 5, offset: 34786}, exprs: []any{ ¬Expr{ - pos: position{line: 1217, col: 5, offset: 34883}, + pos: position{line: 1219, col: 5, offset: 34786}, expr: &seqExpr{ - pos: position{line: 1217, col: 7, offset: 34885}, + pos: position{line: 1219, col: 7, offset: 34788}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1217, col: 7, offset: 34885}, + pos: position{line: 1219, col: 7, offset: 34788}, name: "IDGuard", }, ¬Expr{ - pos: position{line: 1217, col: 15, offset: 34893}, + pos: position{line: 1219, col: 15, offset: 34796}, expr: &ruleRefExpr{ - pos: position{line: 1217, col: 16, offset: 34894}, + pos: position{line: 1219, col: 16, offset: 34797}, name: "IdentifierRest", }, }, @@ -10354,13 +10357,13 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1217, col: 32, offset: 34910}, + pos: position{line: 1219, col: 32, offset: 34813}, name: "IdentifierStart", }, &zeroOrMoreExpr{ - pos: position{line: 1217, col: 48, offset: 34926}, + pos: position{line: 1219, col: 48, offset: 34829}, expr: &ruleRefExpr{ - pos: position{line: 1217, col: 48, offset: 34926}, + pos: position{line: 1219, col: 48, offset: 34829}, name: "IdentifierRest", }, }, @@ -10368,32 +10371,32 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1218, col: 5, offset: 34977}, + pos: position{line: 1220, col: 5, offset: 34880}, run: (*parser).callonIdentifierName12, expr: &litMatcher{ - pos: position{line: 1218, col: 5, offset: 34977}, + pos: position{line: 1220, col: 5, offset: 34880}, val: "$", ignoreCase: false, want: "\"$\"", }, }, &actionExpr{ - pos: position{line: 1219, col: 5, offset: 35016}, + pos: position{line: 1221, col: 5, offset: 34919}, run: (*parser).callonIdentifierName14, expr: &seqExpr{ - pos: position{line: 1219, col: 5, offset: 35016}, + pos: position{line: 1221, col: 5, offset: 34919}, exprs: []any{ &litMatcher{ - pos: position{line: 1219, col: 5, offset: 35016}, + pos: position{line: 1221, col: 5, offset: 34919}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1219, col: 10, offset: 35021}, + pos: position{line: 1221, col: 10, offset: 34924}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 1219, col: 13, offset: 35024}, + pos: position{line: 1221, col: 13, offset: 34927}, name: "IDGuard", }, }, @@ -10401,40 +10404,40 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1221, col: 5, offset: 35115}, + pos: position{line: 1223, col: 5, offset: 35018}, run: (*parser).callonIdentifierName19, expr: &litMatcher{ - pos: position{line: 1221, col: 5, offset: 35115}, + pos: position{line: 1223, col: 5, offset: 35018}, val: "type", ignoreCase: false, want: "\"type\"", }, }, &actionExpr{ - pos: position{line: 1222, col: 5, offset: 35157}, + pos: position{line: 1224, col: 5, offset: 35060}, run: (*parser).callonIdentifierName21, expr: &seqExpr{ - pos: position{line: 1222, col: 5, offset: 35157}, + pos: position{line: 1224, col: 5, offset: 35060}, exprs: []any{ &labeledExpr{ - pos: position{line: 1222, col: 5, offset: 35157}, + pos: position{line: 1224, col: 5, offset: 35060}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 1222, col: 8, offset: 35160}, + pos: position{line: 1224, col: 8, offset: 35063}, name: "SQLTokenSentinels", }, }, &andExpr{ - pos: position{line: 1222, col: 26, offset: 35178}, + pos: position{line: 1224, col: 26, offset: 35081}, expr: &seqExpr{ - pos: position{line: 1222, col: 28, offset: 35180}, + pos: position{line: 1224, col: 28, offset: 35083}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1222, col: 28, offset: 35180}, + pos: position{line: 1224, col: 28, offset: 35083}, name: "__", }, &litMatcher{ - pos: position{line: 1222, col: 31, offset: 35183}, + pos: position{line: 1224, col: 31, offset: 35086}, val: "(", ignoreCase: false, want: "\"(\"", @@ -10450,51 +10453,51 @@ var g = &grammar{ }, { name: "IdentifierNames", - pos: position{line: 1224, col: 1, offset: 35208}, + pos: position{line: 1226, col: 1, offset: 35111}, expr: &actionExpr{ - pos: position{line: 1225, col: 5, offset: 35228}, + pos: position{line: 1227, col: 5, offset: 35131}, run: (*parser).callonIdentifierNames1, expr: &seqExpr{ - pos: position{line: 1225, col: 5, offset: 35228}, + pos: position{line: 1227, col: 5, offset: 35131}, exprs: []any{ &labeledExpr{ - pos: position{line: 1225, col: 5, offset: 35228}, + pos: position{line: 1227, col: 5, offset: 35131}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1225, col: 11, offset: 35234}, + pos: position{line: 1227, col: 11, offset: 35137}, name: "IdentifierName", }, }, &labeledExpr{ - pos: position{line: 1225, col: 26, offset: 35249}, + pos: position{line: 1227, col: 26, offset: 35152}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1225, col: 31, offset: 35254}, + pos: position{line: 1227, col: 31, offset: 35157}, expr: &actionExpr{ - pos: position{line: 1225, col: 32, offset: 35255}, + pos: position{line: 1227, col: 32, offset: 35158}, run: (*parser).callonIdentifierNames7, expr: &seqExpr{ - pos: position{line: 1225, col: 32, offset: 35255}, + pos: position{line: 1227, col: 32, offset: 35158}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1225, col: 32, offset: 35255}, + pos: position{line: 1227, col: 32, offset: 35158}, name: "__", }, &litMatcher{ - pos: position{line: 1225, col: 35, offset: 35258}, + pos: position{line: 1227, col: 35, offset: 35161}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1225, col: 39, offset: 35262}, + pos: position{line: 1227, col: 39, offset: 35165}, name: "__", }, &labeledExpr{ - pos: position{line: 1225, col: 42, offset: 35265}, + pos: position{line: 1227, col: 42, offset: 35168}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 1225, col: 45, offset: 35268}, + pos: position{line: 1227, col: 45, offset: 35171}, name: "IdentifierName", }, }, @@ -10509,22 +10512,22 @@ var g = &grammar{ }, { name: "IdentifierStart", - pos: position{line: 1229, col: 1, offset: 35384}, + pos: position{line: 1231, col: 1, offset: 35287}, expr: &choiceExpr{ - pos: position{line: 1230, col: 5, offset: 35404}, + pos: position{line: 1232, col: 5, offset: 35307}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1230, col: 5, offset: 35404}, + pos: position{line: 1232, col: 5, offset: 35307}, name: "UnicodeLetter", }, &litMatcher{ - pos: position{line: 1231, col: 5, offset: 35422}, + pos: position{line: 1233, col: 5, offset: 35325}, val: "$", ignoreCase: false, want: "\"$\"", }, &litMatcher{ - pos: position{line: 1232, col: 5, offset: 35430}, + pos: position{line: 1234, col: 5, offset: 35333}, val: "_", ignoreCase: false, want: "\"_\"", @@ -10534,24 +10537,24 @@ var g = &grammar{ }, { name: "IdentifierRest", - pos: position{line: 1234, col: 1, offset: 35435}, + pos: position{line: 1236, col: 1, offset: 35338}, expr: &choiceExpr{ - pos: position{line: 1235, col: 5, offset: 35454}, + pos: position{line: 1237, col: 5, offset: 35357}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1235, col: 5, offset: 35454}, + pos: position{line: 1237, col: 5, offset: 35357}, name: "IdentifierStart", }, &ruleRefExpr{ - pos: position{line: 1236, col: 5, offset: 35474}, + pos: position{line: 1238, col: 5, offset: 35377}, name: "UnicodeCombiningMark", }, &ruleRefExpr{ - pos: position{line: 1237, col: 5, offset: 35499}, + pos: position{line: 1239, col: 5, offset: 35402}, name: "UnicodeDigit", }, &ruleRefExpr{ - pos: position{line: 1238, col: 5, offset: 35516}, + pos: position{line: 1240, col: 5, offset: 35419}, name: "UnicodeConnectorPunctuation", }, }, @@ -10559,24 +10562,24 @@ var g = &grammar{ }, { name: "IDGuard", - pos: position{line: 1240, col: 1, offset: 35545}, + pos: position{line: 1242, col: 1, offset: 35448}, expr: &choiceExpr{ - pos: position{line: 1241, col: 5, offset: 35557}, + pos: position{line: 1243, col: 5, offset: 35460}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1241, col: 5, offset: 35557}, + pos: position{line: 1243, col: 5, offset: 35460}, name: "BooleanLiteral", }, &ruleRefExpr{ - pos: position{line: 1242, col: 5, offset: 35576}, + pos: position{line: 1244, col: 5, offset: 35479}, name: "NullLiteral", }, &ruleRefExpr{ - pos: position{line: 1243, col: 5, offset: 35592}, + pos: position{line: 1245, col: 5, offset: 35495}, name: "NaN", }, &ruleRefExpr{ - pos: position{line: 1244, col: 5, offset: 35600}, + pos: position{line: 1246, col: 5, offset: 35503}, name: "Infinity", }, }, @@ -10584,25 +10587,25 @@ var g = &grammar{ }, { name: "Time", - pos: position{line: 1246, col: 1, offset: 35610}, + pos: position{line: 1248, col: 1, offset: 35513}, expr: &actionExpr{ - pos: position{line: 1247, col: 5, offset: 35619}, + pos: position{line: 1249, col: 5, offset: 35522}, run: (*parser).callonTime1, expr: &seqExpr{ - pos: position{line: 1247, col: 5, offset: 35619}, + pos: position{line: 1249, col: 5, offset: 35522}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1247, col: 5, offset: 35619}, + pos: position{line: 1249, col: 5, offset: 35522}, name: "FullDate", }, &litMatcher{ - pos: position{line: 1247, col: 14, offset: 35628}, + pos: position{line: 1249, col: 14, offset: 35531}, val: "T", ignoreCase: false, want: "\"T\"", }, &ruleRefExpr{ - pos: position{line: 1247, col: 18, offset: 35632}, + pos: position{line: 1249, col: 18, offset: 35535}, name: "FullTime", }, }, @@ -10611,32 +10614,32 @@ var g = &grammar{ }, { name: "FullDate", - pos: position{line: 1251, col: 1, offset: 35752}, + pos: position{line: 1253, col: 1, offset: 35655}, expr: &seqExpr{ - pos: position{line: 1251, col: 12, offset: 35763}, + pos: position{line: 1253, col: 12, offset: 35666}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1251, col: 12, offset: 35763}, + pos: position{line: 1253, col: 12, offset: 35666}, name: "D4", }, &litMatcher{ - pos: position{line: 1251, col: 15, offset: 35766}, + pos: position{line: 1253, col: 15, offset: 35669}, val: "-", ignoreCase: false, want: "\"-\"", }, &ruleRefExpr{ - pos: position{line: 1251, col: 19, offset: 35770}, + pos: position{line: 1253, col: 19, offset: 35673}, name: "D2", }, &litMatcher{ - pos: position{line: 1251, col: 22, offset: 35773}, + pos: position{line: 1253, col: 22, offset: 35676}, val: "-", ignoreCase: false, want: "\"-\"", }, &ruleRefExpr{ - pos: position{line: 1251, col: 26, offset: 35777}, + pos: position{line: 1253, col: 26, offset: 35680}, name: "D2", }, }, @@ -10644,33 +10647,33 @@ var g = &grammar{ }, { name: "D4", - pos: position{line: 1253, col: 1, offset: 35781}, + pos: position{line: 1255, col: 1, offset: 35684}, expr: &seqExpr{ - pos: position{line: 1253, col: 6, offset: 35786}, + pos: position{line: 1255, col: 6, offset: 35689}, exprs: []any{ &charClassMatcher{ - pos: position{line: 1253, col: 6, offset: 35786}, + pos: position{line: 1255, col: 6, offset: 35689}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1253, col: 11, offset: 35791}, + pos: position{line: 1255, col: 11, offset: 35694}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1253, col: 16, offset: 35796}, + pos: position{line: 1255, col: 16, offset: 35699}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1253, col: 21, offset: 35801}, + pos: position{line: 1255, col: 21, offset: 35704}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10681,19 +10684,19 @@ var g = &grammar{ }, { name: "D2", - pos: position{line: 1254, col: 1, offset: 35807}, + pos: position{line: 1256, col: 1, offset: 35710}, expr: &seqExpr{ - pos: position{line: 1254, col: 6, offset: 35812}, + pos: position{line: 1256, col: 6, offset: 35715}, exprs: []any{ &charClassMatcher{ - pos: position{line: 1254, col: 6, offset: 35812}, + pos: position{line: 1256, col: 6, offset: 35715}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1254, col: 11, offset: 35817}, + pos: position{line: 1256, col: 11, offset: 35720}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10704,16 +10707,16 @@ var g = &grammar{ }, { name: "FullTime", - pos: position{line: 1256, col: 1, offset: 35824}, + pos: position{line: 1258, col: 1, offset: 35727}, expr: &seqExpr{ - pos: position{line: 1256, col: 12, offset: 35835}, + pos: position{line: 1258, col: 12, offset: 35738}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1256, col: 12, offset: 35835}, + pos: position{line: 1258, col: 12, offset: 35738}, name: "PartialTime", }, &ruleRefExpr{ - pos: position{line: 1256, col: 24, offset: 35847}, + pos: position{line: 1258, col: 24, offset: 35750}, name: "TimeOffset", }, }, @@ -10721,49 +10724,49 @@ var g = &grammar{ }, { name: "PartialTime", - pos: position{line: 1258, col: 1, offset: 35859}, + pos: position{line: 1260, col: 1, offset: 35762}, expr: &seqExpr{ - pos: position{line: 1258, col: 15, offset: 35873}, + pos: position{line: 1260, col: 15, offset: 35776}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1258, col: 15, offset: 35873}, + pos: position{line: 1260, col: 15, offset: 35776}, name: "D2", }, &litMatcher{ - pos: position{line: 1258, col: 18, offset: 35876}, + pos: position{line: 1260, col: 18, offset: 35779}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1258, col: 22, offset: 35880}, + pos: position{line: 1260, col: 22, offset: 35783}, name: "D2", }, &litMatcher{ - pos: position{line: 1258, col: 25, offset: 35883}, + pos: position{line: 1260, col: 25, offset: 35786}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1258, col: 29, offset: 35887}, + pos: position{line: 1260, col: 29, offset: 35790}, name: "D2", }, &zeroOrOneExpr{ - pos: position{line: 1258, col: 32, offset: 35890}, + pos: position{line: 1260, col: 32, offset: 35793}, expr: &seqExpr{ - pos: position{line: 1258, col: 33, offset: 35891}, + pos: position{line: 1260, col: 33, offset: 35794}, exprs: []any{ &litMatcher{ - pos: position{line: 1258, col: 33, offset: 35891}, + pos: position{line: 1260, col: 33, offset: 35794}, val: ".", ignoreCase: false, want: "\".\"", }, &oneOrMoreExpr{ - pos: position{line: 1258, col: 37, offset: 35895}, + pos: position{line: 1260, col: 37, offset: 35798}, expr: &charClassMatcher{ - pos: position{line: 1258, col: 37, offset: 35895}, + pos: position{line: 1260, col: 37, offset: 35798}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10778,30 +10781,30 @@ var g = &grammar{ }, { name: "TimeOffset", - pos: position{line: 1260, col: 1, offset: 35905}, + pos: position{line: 1262, col: 1, offset: 35808}, expr: &choiceExpr{ - pos: position{line: 1261, col: 5, offset: 35920}, + pos: position{line: 1263, col: 5, offset: 35823}, alternatives: []any{ &litMatcher{ - pos: position{line: 1261, col: 5, offset: 35920}, + pos: position{line: 1263, col: 5, offset: 35823}, val: "Z", ignoreCase: false, want: "\"Z\"", }, &seqExpr{ - pos: position{line: 1262, col: 5, offset: 35928}, + pos: position{line: 1264, col: 5, offset: 35831}, exprs: []any{ &choiceExpr{ - pos: position{line: 1262, col: 6, offset: 35929}, + pos: position{line: 1264, col: 6, offset: 35832}, alternatives: []any{ &litMatcher{ - pos: position{line: 1262, col: 6, offset: 35929}, + pos: position{line: 1264, col: 6, offset: 35832}, val: "+", ignoreCase: false, want: "\"+\"", }, &litMatcher{ - pos: position{line: 1262, col: 12, offset: 35935}, + pos: position{line: 1264, col: 12, offset: 35838}, val: "-", ignoreCase: false, want: "\"-\"", @@ -10809,34 +10812,34 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1262, col: 17, offset: 35940}, + pos: position{line: 1264, col: 17, offset: 35843}, name: "D2", }, &litMatcher{ - pos: position{line: 1262, col: 20, offset: 35943}, + pos: position{line: 1264, col: 20, offset: 35846}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1262, col: 24, offset: 35947}, + pos: position{line: 1264, col: 24, offset: 35850}, name: "D2", }, &zeroOrOneExpr{ - pos: position{line: 1262, col: 27, offset: 35950}, + pos: position{line: 1264, col: 27, offset: 35853}, expr: &seqExpr{ - pos: position{line: 1262, col: 28, offset: 35951}, + pos: position{line: 1264, col: 28, offset: 35854}, exprs: []any{ &litMatcher{ - pos: position{line: 1262, col: 28, offset: 35951}, + pos: position{line: 1264, col: 28, offset: 35854}, val: ".", ignoreCase: false, want: "\".\"", }, &oneOrMoreExpr{ - pos: position{line: 1262, col: 32, offset: 35955}, + pos: position{line: 1264, col: 32, offset: 35858}, expr: &charClassMatcher{ - pos: position{line: 1262, col: 32, offset: 35955}, + pos: position{line: 1264, col: 32, offset: 35858}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10853,33 +10856,33 @@ var g = &grammar{ }, { name: "Duration", - pos: position{line: 1264, col: 1, offset: 35965}, + pos: position{line: 1266, col: 1, offset: 35868}, expr: &actionExpr{ - pos: position{line: 1265, col: 5, offset: 35978}, + pos: position{line: 1267, col: 5, offset: 35881}, run: (*parser).callonDuration1, expr: &seqExpr{ - pos: position{line: 1265, col: 5, offset: 35978}, + pos: position{line: 1267, col: 5, offset: 35881}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1265, col: 5, offset: 35978}, + pos: position{line: 1267, col: 5, offset: 35881}, expr: &litMatcher{ - pos: position{line: 1265, col: 5, offset: 35978}, + pos: position{line: 1267, col: 5, offset: 35881}, val: "-", ignoreCase: false, want: "\"-\"", }, }, &oneOrMoreExpr{ - pos: position{line: 1265, col: 10, offset: 35983}, + pos: position{line: 1267, col: 10, offset: 35886}, expr: &seqExpr{ - pos: position{line: 1265, col: 11, offset: 35984}, + pos: position{line: 1267, col: 11, offset: 35887}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1265, col: 11, offset: 35984}, + pos: position{line: 1267, col: 11, offset: 35887}, name: "Decimal", }, &ruleRefExpr{ - pos: position{line: 1265, col: 19, offset: 35992}, + pos: position{line: 1267, col: 19, offset: 35895}, name: "TimeUnit", }, }, @@ -10891,27 +10894,27 @@ var g = &grammar{ }, { name: "Decimal", - pos: position{line: 1269, col: 1, offset: 36118}, + pos: position{line: 1271, col: 1, offset: 36021}, expr: &seqExpr{ - pos: position{line: 1269, col: 11, offset: 36128}, + pos: position{line: 1271, col: 11, offset: 36031}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1269, col: 11, offset: 36128}, + pos: position{line: 1271, col: 11, offset: 36031}, name: "UInt", }, &zeroOrOneExpr{ - pos: position{line: 1269, col: 16, offset: 36133}, + pos: position{line: 1271, col: 16, offset: 36036}, expr: &seqExpr{ - pos: position{line: 1269, col: 17, offset: 36134}, + pos: position{line: 1271, col: 17, offset: 36037}, exprs: []any{ &litMatcher{ - pos: position{line: 1269, col: 17, offset: 36134}, + pos: position{line: 1271, col: 17, offset: 36037}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1269, col: 21, offset: 36138}, + pos: position{line: 1271, col: 21, offset: 36041}, name: "UInt", }, }, @@ -10922,60 +10925,60 @@ var g = &grammar{ }, { name: "TimeUnit", - pos: position{line: 1271, col: 1, offset: 36146}, + pos: position{line: 1273, col: 1, offset: 36049}, expr: &choiceExpr{ - pos: position{line: 1272, col: 5, offset: 36159}, + pos: position{line: 1274, col: 5, offset: 36062}, alternatives: []any{ &litMatcher{ - pos: position{line: 1272, col: 5, offset: 36159}, + pos: position{line: 1274, col: 5, offset: 36062}, val: "ns", ignoreCase: false, want: "\"ns\"", }, &litMatcher{ - pos: position{line: 1273, col: 5, offset: 36168}, + pos: position{line: 1275, col: 5, offset: 36071}, val: "us", ignoreCase: false, want: "\"us\"", }, &litMatcher{ - pos: position{line: 1274, col: 5, offset: 36177}, + pos: position{line: 1276, col: 5, offset: 36080}, val: "ms", ignoreCase: false, want: "\"ms\"", }, &litMatcher{ - pos: position{line: 1275, col: 5, offset: 36186}, + pos: position{line: 1277, col: 5, offset: 36089}, val: "s", ignoreCase: false, want: "\"s\"", }, &litMatcher{ - pos: position{line: 1276, col: 5, offset: 36194}, + pos: position{line: 1278, col: 5, offset: 36097}, val: "m", ignoreCase: false, want: "\"m\"", }, &litMatcher{ - pos: position{line: 1277, col: 5, offset: 36202}, + pos: position{line: 1279, col: 5, offset: 36105}, val: "h", ignoreCase: false, want: "\"h\"", }, &litMatcher{ - pos: position{line: 1278, col: 5, offset: 36210}, + pos: position{line: 1280, col: 5, offset: 36113}, val: "d", ignoreCase: false, want: "\"d\"", }, &litMatcher{ - pos: position{line: 1279, col: 5, offset: 36218}, + pos: position{line: 1281, col: 5, offset: 36121}, val: "w", ignoreCase: false, want: "\"w\"", }, &litMatcher{ - pos: position{line: 1280, col: 5, offset: 36226}, + pos: position{line: 1282, col: 5, offset: 36129}, val: "y", ignoreCase: false, want: "\"y\"", @@ -10985,45 +10988,45 @@ var g = &grammar{ }, { name: "IP", - pos: position{line: 1282, col: 1, offset: 36231}, + pos: position{line: 1284, col: 1, offset: 36134}, expr: &actionExpr{ - pos: position{line: 1283, col: 5, offset: 36238}, + pos: position{line: 1285, col: 5, offset: 36141}, run: (*parser).callonIP1, expr: &seqExpr{ - pos: position{line: 1283, col: 5, offset: 36238}, + pos: position{line: 1285, col: 5, offset: 36141}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1283, col: 5, offset: 36238}, + pos: position{line: 1285, col: 5, offset: 36141}, name: "UInt", }, &litMatcher{ - pos: position{line: 1283, col: 10, offset: 36243}, + pos: position{line: 1285, col: 10, offset: 36146}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1283, col: 14, offset: 36247}, + pos: position{line: 1285, col: 14, offset: 36150}, name: "UInt", }, &litMatcher{ - pos: position{line: 1283, col: 19, offset: 36252}, + pos: position{line: 1285, col: 19, offset: 36155}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1283, col: 23, offset: 36256}, + pos: position{line: 1285, col: 23, offset: 36159}, name: "UInt", }, &litMatcher{ - pos: position{line: 1283, col: 28, offset: 36261}, + pos: position{line: 1285, col: 28, offset: 36164}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1283, col: 32, offset: 36265}, + pos: position{line: 1285, col: 32, offset: 36168}, name: "UInt", }, }, @@ -11032,43 +11035,43 @@ var g = &grammar{ }, { name: "IP6", - pos: position{line: 1285, col: 1, offset: 36302}, + pos: position{line: 1287, col: 1, offset: 36205}, expr: &actionExpr{ - pos: position{line: 1286, col: 5, offset: 36310}, + pos: position{line: 1288, col: 5, offset: 36213}, run: (*parser).callonIP61, expr: &seqExpr{ - pos: position{line: 1286, col: 5, offset: 36310}, + pos: position{line: 1288, col: 5, offset: 36213}, exprs: []any{ ¬Expr{ - pos: position{line: 1286, col: 5, offset: 36310}, + pos: position{line: 1288, col: 5, offset: 36213}, expr: &seqExpr{ - pos: position{line: 1286, col: 7, offset: 36312}, + pos: position{line: 1288, col: 7, offset: 36215}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1286, col: 7, offset: 36312}, + pos: position{line: 1288, col: 7, offset: 36215}, name: "Hex", }, &litMatcher{ - pos: position{line: 1286, col: 11, offset: 36316}, + pos: position{line: 1288, col: 11, offset: 36219}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1286, col: 15, offset: 36320}, + pos: position{line: 1288, col: 15, offset: 36223}, name: "Hex", }, ¬Expr{ - pos: position{line: 1286, col: 19, offset: 36324}, + pos: position{line: 1288, col: 19, offset: 36227}, expr: &choiceExpr{ - pos: position{line: 1286, col: 21, offset: 36326}, + pos: position{line: 1288, col: 21, offset: 36229}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1286, col: 21, offset: 36326}, + pos: position{line: 1288, col: 21, offset: 36229}, name: "HexDigit", }, &litMatcher{ - pos: position{line: 1286, col: 32, offset: 36337}, + pos: position{line: 1288, col: 32, offset: 36240}, val: ":", ignoreCase: false, want: "\":\"", @@ -11080,10 +11083,10 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 1286, col: 38, offset: 36343}, + pos: position{line: 1288, col: 38, offset: 36246}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1286, col: 40, offset: 36345}, + pos: position{line: 1288, col: 40, offset: 36248}, name: "IP6Variations", }, }, @@ -11093,32 +11096,32 @@ var g = &grammar{ }, { name: "IP6Variations", - pos: position{line: 1290, col: 1, offset: 36509}, + pos: position{line: 1292, col: 1, offset: 36412}, expr: &choiceExpr{ - pos: position{line: 1291, col: 5, offset: 36527}, + pos: position{line: 1293, col: 5, offset: 36430}, alternatives: []any{ &actionExpr{ - pos: position{line: 1291, col: 5, offset: 36527}, + pos: position{line: 1293, col: 5, offset: 36430}, run: (*parser).callonIP6Variations2, expr: &seqExpr{ - pos: position{line: 1291, col: 5, offset: 36527}, + pos: position{line: 1293, col: 5, offset: 36430}, exprs: []any{ &labeledExpr{ - pos: position{line: 1291, col: 5, offset: 36527}, + pos: position{line: 1293, col: 5, offset: 36430}, label: "a", expr: &oneOrMoreExpr{ - pos: position{line: 1291, col: 7, offset: 36529}, + pos: position{line: 1293, col: 7, offset: 36432}, expr: &ruleRefExpr{ - pos: position{line: 1291, col: 7, offset: 36529}, + pos: position{line: 1293, col: 7, offset: 36432}, name: "HexColon", }, }, }, &labeledExpr{ - pos: position{line: 1291, col: 17, offset: 36539}, + pos: position{line: 1293, col: 17, offset: 36442}, label: "b", expr: &ruleRefExpr{ - pos: position{line: 1291, col: 19, offset: 36541}, + pos: position{line: 1293, col: 19, offset: 36444}, name: "IP6Tail", }, }, @@ -11126,52 +11129,52 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1294, col: 5, offset: 36605}, + pos: position{line: 1296, col: 5, offset: 36508}, run: (*parser).callonIP6Variations9, expr: &seqExpr{ - pos: position{line: 1294, col: 5, offset: 36605}, + pos: position{line: 1296, col: 5, offset: 36508}, exprs: []any{ &labeledExpr{ - pos: position{line: 1294, col: 5, offset: 36605}, + pos: position{line: 1296, col: 5, offset: 36508}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1294, col: 7, offset: 36607}, + pos: position{line: 1296, col: 7, offset: 36510}, name: "Hex", }, }, &labeledExpr{ - pos: position{line: 1294, col: 11, offset: 36611}, + pos: position{line: 1296, col: 11, offset: 36514}, label: "b", expr: &zeroOrMoreExpr{ - pos: position{line: 1294, col: 13, offset: 36613}, + pos: position{line: 1296, col: 13, offset: 36516}, expr: &ruleRefExpr{ - pos: position{line: 1294, col: 13, offset: 36613}, + pos: position{line: 1296, col: 13, offset: 36516}, name: "ColonHex", }, }, }, &litMatcher{ - pos: position{line: 1294, col: 23, offset: 36623}, + pos: position{line: 1296, col: 23, offset: 36526}, val: "::", ignoreCase: false, want: "\"::\"", }, &labeledExpr{ - pos: position{line: 1294, col: 28, offset: 36628}, + pos: position{line: 1296, col: 28, offset: 36531}, label: "d", expr: &zeroOrMoreExpr{ - pos: position{line: 1294, col: 30, offset: 36630}, + pos: position{line: 1296, col: 30, offset: 36533}, expr: &ruleRefExpr{ - pos: position{line: 1294, col: 30, offset: 36630}, + pos: position{line: 1296, col: 30, offset: 36533}, name: "HexColon", }, }, }, &labeledExpr{ - pos: position{line: 1294, col: 40, offset: 36640}, + pos: position{line: 1296, col: 40, offset: 36543}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1294, col: 42, offset: 36642}, + pos: position{line: 1296, col: 42, offset: 36545}, name: "IP6Tail", }, }, @@ -11179,33 +11182,33 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1297, col: 5, offset: 36741}, + pos: position{line: 1299, col: 5, offset: 36644}, run: (*parser).callonIP6Variations22, expr: &seqExpr{ - pos: position{line: 1297, col: 5, offset: 36741}, + pos: position{line: 1299, col: 5, offset: 36644}, exprs: []any{ &litMatcher{ - pos: position{line: 1297, col: 5, offset: 36741}, + pos: position{line: 1299, col: 5, offset: 36644}, val: "::", ignoreCase: false, want: "\"::\"", }, &labeledExpr{ - pos: position{line: 1297, col: 10, offset: 36746}, + pos: position{line: 1299, col: 10, offset: 36649}, label: "a", expr: &zeroOrMoreExpr{ - pos: position{line: 1297, col: 12, offset: 36748}, + pos: position{line: 1299, col: 12, offset: 36651}, expr: &ruleRefExpr{ - pos: position{line: 1297, col: 12, offset: 36748}, + pos: position{line: 1299, col: 12, offset: 36651}, name: "HexColon", }, }, }, &labeledExpr{ - pos: position{line: 1297, col: 22, offset: 36758}, + pos: position{line: 1299, col: 22, offset: 36661}, label: "b", expr: &ruleRefExpr{ - pos: position{line: 1297, col: 24, offset: 36760}, + pos: position{line: 1299, col: 24, offset: 36663}, name: "IP6Tail", }, }, @@ -11213,32 +11216,32 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1300, col: 5, offset: 36831}, + pos: position{line: 1302, col: 5, offset: 36734}, run: (*parser).callonIP6Variations30, expr: &seqExpr{ - pos: position{line: 1300, col: 5, offset: 36831}, + pos: position{line: 1302, col: 5, offset: 36734}, exprs: []any{ &labeledExpr{ - pos: position{line: 1300, col: 5, offset: 36831}, + pos: position{line: 1302, col: 5, offset: 36734}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1300, col: 7, offset: 36833}, + pos: position{line: 1302, col: 7, offset: 36736}, name: "Hex", }, }, &labeledExpr{ - pos: position{line: 1300, col: 11, offset: 36837}, + pos: position{line: 1302, col: 11, offset: 36740}, label: "b", expr: &zeroOrMoreExpr{ - pos: position{line: 1300, col: 13, offset: 36839}, + pos: position{line: 1302, col: 13, offset: 36742}, expr: &ruleRefExpr{ - pos: position{line: 1300, col: 13, offset: 36839}, + pos: position{line: 1302, col: 13, offset: 36742}, name: "ColonHex", }, }, }, &litMatcher{ - pos: position{line: 1300, col: 23, offset: 36849}, + pos: position{line: 1302, col: 23, offset: 36752}, val: "::", ignoreCase: false, want: "\"::\"", @@ -11247,10 +11250,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1303, col: 5, offset: 36917}, + pos: position{line: 1305, col: 5, offset: 36820}, run: (*parser).callonIP6Variations38, expr: &litMatcher{ - pos: position{line: 1303, col: 5, offset: 36917}, + pos: position{line: 1305, col: 5, offset: 36820}, val: "::", ignoreCase: false, want: "\"::\"", @@ -11261,16 +11264,16 @@ var g = &grammar{ }, { name: "IP6Tail", - pos: position{line: 1307, col: 1, offset: 36954}, + pos: position{line: 1309, col: 1, offset: 36857}, expr: &choiceExpr{ - pos: position{line: 1308, col: 5, offset: 36966}, + pos: position{line: 1310, col: 5, offset: 36869}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1308, col: 5, offset: 36966}, + pos: position{line: 1310, col: 5, offset: 36869}, name: "IP", }, &ruleRefExpr{ - pos: position{line: 1309, col: 5, offset: 36973}, + pos: position{line: 1311, col: 5, offset: 36876}, name: "Hex", }, }, @@ -11278,24 +11281,24 @@ var g = &grammar{ }, { name: "ColonHex", - pos: position{line: 1311, col: 1, offset: 36978}, + pos: position{line: 1313, col: 1, offset: 36881}, expr: &actionExpr{ - pos: position{line: 1311, col: 12, offset: 36989}, + pos: position{line: 1313, col: 12, offset: 36892}, run: (*parser).callonColonHex1, expr: &seqExpr{ - pos: position{line: 1311, col: 12, offset: 36989}, + pos: position{line: 1313, col: 12, offset: 36892}, exprs: []any{ &litMatcher{ - pos: position{line: 1311, col: 12, offset: 36989}, + pos: position{line: 1313, col: 12, offset: 36892}, val: ":", ignoreCase: false, want: "\":\"", }, &labeledExpr{ - pos: position{line: 1311, col: 16, offset: 36993}, + pos: position{line: 1313, col: 16, offset: 36896}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1311, col: 18, offset: 36995}, + pos: position{line: 1313, col: 18, offset: 36898}, name: "Hex", }, }, @@ -11305,23 +11308,23 @@ var g = &grammar{ }, { name: "HexColon", - pos: position{line: 1313, col: 1, offset: 37033}, + pos: position{line: 1315, col: 1, offset: 36936}, expr: &actionExpr{ - pos: position{line: 1313, col: 12, offset: 37044}, + pos: position{line: 1315, col: 12, offset: 36947}, run: (*parser).callonHexColon1, expr: &seqExpr{ - pos: position{line: 1313, col: 12, offset: 37044}, + pos: position{line: 1315, col: 12, offset: 36947}, exprs: []any{ &labeledExpr{ - pos: position{line: 1313, col: 12, offset: 37044}, + pos: position{line: 1315, col: 12, offset: 36947}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1313, col: 14, offset: 37046}, + pos: position{line: 1315, col: 14, offset: 36949}, name: "Hex", }, }, &litMatcher{ - pos: position{line: 1313, col: 18, offset: 37050}, + pos: position{line: 1315, col: 18, offset: 36953}, val: ":", ignoreCase: false, want: "\":\"", @@ -11332,32 +11335,32 @@ var g = &grammar{ }, { name: "IP4Net", - pos: position{line: 1315, col: 1, offset: 37088}, + pos: position{line: 1317, col: 1, offset: 36991}, expr: &actionExpr{ - pos: position{line: 1316, col: 5, offset: 37099}, + pos: position{line: 1318, col: 5, offset: 37002}, run: (*parser).callonIP4Net1, expr: &seqExpr{ - pos: position{line: 1316, col: 5, offset: 37099}, + pos: position{line: 1318, col: 5, offset: 37002}, exprs: []any{ &labeledExpr{ - pos: position{line: 1316, col: 5, offset: 37099}, + pos: position{line: 1318, col: 5, offset: 37002}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1316, col: 7, offset: 37101}, + pos: position{line: 1318, col: 7, offset: 37004}, name: "IP", }, }, &litMatcher{ - pos: position{line: 1316, col: 10, offset: 37104}, + pos: position{line: 1318, col: 10, offset: 37007}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 1316, col: 14, offset: 37108}, + pos: position{line: 1318, col: 14, offset: 37011}, label: "m", expr: &ruleRefExpr{ - pos: position{line: 1316, col: 16, offset: 37110}, + pos: position{line: 1318, col: 16, offset: 37013}, name: "UIntString", }, }, @@ -11367,32 +11370,32 @@ var g = &grammar{ }, { name: "IP6Net", - pos: position{line: 1320, col: 1, offset: 37179}, + pos: position{line: 1322, col: 1, offset: 37082}, expr: &actionExpr{ - pos: position{line: 1321, col: 5, offset: 37190}, + pos: position{line: 1323, col: 5, offset: 37093}, run: (*parser).callonIP6Net1, expr: &seqExpr{ - pos: position{line: 1321, col: 5, offset: 37190}, + pos: position{line: 1323, col: 5, offset: 37093}, exprs: []any{ &labeledExpr{ - pos: position{line: 1321, col: 5, offset: 37190}, + pos: position{line: 1323, col: 5, offset: 37093}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1321, col: 7, offset: 37192}, + pos: position{line: 1323, col: 7, offset: 37095}, name: "IP6", }, }, &litMatcher{ - pos: position{line: 1321, col: 11, offset: 37196}, + pos: position{line: 1323, col: 11, offset: 37099}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 1321, col: 15, offset: 37200}, + pos: position{line: 1323, col: 15, offset: 37103}, label: "m", expr: &ruleRefExpr{ - pos: position{line: 1321, col: 17, offset: 37202}, + pos: position{line: 1323, col: 17, offset: 37105}, name: "UIntString", }, }, @@ -11402,15 +11405,15 @@ var g = &grammar{ }, { name: "UInt", - pos: position{line: 1325, col: 1, offset: 37271}, + pos: position{line: 1327, col: 1, offset: 37174}, expr: &actionExpr{ - pos: position{line: 1326, col: 4, offset: 37279}, + pos: position{line: 1328, col: 4, offset: 37182}, run: (*parser).callonUInt1, expr: &labeledExpr{ - pos: position{line: 1326, col: 4, offset: 37279}, + pos: position{line: 1328, col: 4, offset: 37182}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1326, col: 6, offset: 37281}, + pos: position{line: 1328, col: 6, offset: 37184}, name: "UIntString", }, }, @@ -11418,16 +11421,16 @@ var g = &grammar{ }, { name: "IntString", - pos: position{line: 1328, col: 1, offset: 37321}, + pos: position{line: 1330, col: 1, offset: 37224}, expr: &choiceExpr{ - pos: position{line: 1329, col: 5, offset: 37335}, + pos: position{line: 1331, col: 5, offset: 37238}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1329, col: 5, offset: 37335}, + pos: position{line: 1331, col: 5, offset: 37238}, name: "UIntString", }, &ruleRefExpr{ - pos: position{line: 1330, col: 5, offset: 37350}, + pos: position{line: 1332, col: 5, offset: 37253}, name: "MinusIntString", }, }, @@ -11435,14 +11438,14 @@ var g = &grammar{ }, { name: "UIntString", - pos: position{line: 1332, col: 1, offset: 37366}, + pos: position{line: 1334, col: 1, offset: 37269}, expr: &actionExpr{ - pos: position{line: 1332, col: 14, offset: 37379}, + pos: position{line: 1334, col: 14, offset: 37282}, run: (*parser).callonUIntString1, expr: &oneOrMoreExpr{ - pos: position{line: 1332, col: 14, offset: 37379}, + pos: position{line: 1334, col: 14, offset: 37282}, expr: &charClassMatcher{ - pos: position{line: 1332, col: 14, offset: 37379}, + pos: position{line: 1334, col: 14, offset: 37282}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11453,21 +11456,21 @@ var g = &grammar{ }, { name: "MinusIntString", - pos: position{line: 1334, col: 1, offset: 37418}, + pos: position{line: 1336, col: 1, offset: 37321}, expr: &actionExpr{ - pos: position{line: 1335, col: 5, offset: 37437}, + pos: position{line: 1337, col: 5, offset: 37340}, run: (*parser).callonMinusIntString1, expr: &seqExpr{ - pos: position{line: 1335, col: 5, offset: 37437}, + pos: position{line: 1337, col: 5, offset: 37340}, exprs: []any{ &litMatcher{ - pos: position{line: 1335, col: 5, offset: 37437}, + pos: position{line: 1337, col: 5, offset: 37340}, val: "-", ignoreCase: false, want: "\"-\"", }, &ruleRefExpr{ - pos: position{line: 1335, col: 9, offset: 37441}, + pos: position{line: 1337, col: 9, offset: 37344}, name: "UIntString", }, }, @@ -11476,29 +11479,29 @@ var g = &grammar{ }, { name: "FloatString", - pos: position{line: 1337, col: 1, offset: 37484}, + pos: position{line: 1339, col: 1, offset: 37387}, expr: &choiceExpr{ - pos: position{line: 1338, col: 5, offset: 37500}, + pos: position{line: 1340, col: 5, offset: 37403}, alternatives: []any{ &actionExpr{ - pos: position{line: 1338, col: 5, offset: 37500}, + pos: position{line: 1340, col: 5, offset: 37403}, run: (*parser).callonFloatString2, expr: &seqExpr{ - pos: position{line: 1338, col: 5, offset: 37500}, + pos: position{line: 1340, col: 5, offset: 37403}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1338, col: 5, offset: 37500}, + pos: position{line: 1340, col: 5, offset: 37403}, expr: &litMatcher{ - pos: position{line: 1338, col: 5, offset: 37500}, + pos: position{line: 1340, col: 5, offset: 37403}, val: "-", ignoreCase: false, want: "\"-\"", }, }, &oneOrMoreExpr{ - pos: position{line: 1338, col: 10, offset: 37505}, + pos: position{line: 1340, col: 10, offset: 37408}, expr: &charClassMatcher{ - pos: position{line: 1338, col: 10, offset: 37505}, + pos: position{line: 1340, col: 10, offset: 37408}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11506,15 +11509,15 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1338, col: 17, offset: 37512}, + pos: position{line: 1340, col: 17, offset: 37415}, val: ".", ignoreCase: false, want: "\".\"", }, &zeroOrMoreExpr{ - pos: position{line: 1338, col: 21, offset: 37516}, + pos: position{line: 1340, col: 21, offset: 37419}, expr: &charClassMatcher{ - pos: position{line: 1338, col: 21, offset: 37516}, + pos: position{line: 1340, col: 21, offset: 37419}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11522,9 +11525,9 @@ var g = &grammar{ }, }, &zeroOrOneExpr{ - pos: position{line: 1338, col: 28, offset: 37523}, + pos: position{line: 1340, col: 28, offset: 37426}, expr: &ruleRefExpr{ - pos: position{line: 1338, col: 28, offset: 37523}, + pos: position{line: 1340, col: 28, offset: 37426}, name: "ExponentPart", }, }, @@ -11532,30 +11535,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1341, col: 5, offset: 37582}, + pos: position{line: 1343, col: 5, offset: 37485}, run: (*parser).callonFloatString13, expr: &seqExpr{ - pos: position{line: 1341, col: 5, offset: 37582}, + pos: position{line: 1343, col: 5, offset: 37485}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1341, col: 5, offset: 37582}, + pos: position{line: 1343, col: 5, offset: 37485}, expr: &litMatcher{ - pos: position{line: 1341, col: 5, offset: 37582}, + pos: position{line: 1343, col: 5, offset: 37485}, val: "-", ignoreCase: false, want: "\"-\"", }, }, &litMatcher{ - pos: position{line: 1341, col: 10, offset: 37587}, + pos: position{line: 1343, col: 10, offset: 37490}, val: ".", ignoreCase: false, want: "\".\"", }, &oneOrMoreExpr{ - pos: position{line: 1341, col: 14, offset: 37591}, + pos: position{line: 1343, col: 14, offset: 37494}, expr: &charClassMatcher{ - pos: position{line: 1341, col: 14, offset: 37591}, + pos: position{line: 1343, col: 14, offset: 37494}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11563,9 +11566,9 @@ var g = &grammar{ }, }, &zeroOrOneExpr{ - pos: position{line: 1341, col: 21, offset: 37598}, + pos: position{line: 1343, col: 21, offset: 37501}, expr: &ruleRefExpr{ - pos: position{line: 1341, col: 21, offset: 37598}, + pos: position{line: 1343, col: 21, offset: 37501}, name: "ExponentPart", }, }, @@ -11573,17 +11576,17 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1344, col: 5, offset: 37657}, + pos: position{line: 1346, col: 5, offset: 37560}, run: (*parser).callonFloatString22, expr: &choiceExpr{ - pos: position{line: 1344, col: 6, offset: 37658}, + pos: position{line: 1346, col: 6, offset: 37561}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1344, col: 6, offset: 37658}, + pos: position{line: 1346, col: 6, offset: 37561}, name: "NaN", }, &ruleRefExpr{ - pos: position{line: 1344, col: 12, offset: 37664}, + pos: position{line: 1346, col: 12, offset: 37567}, name: "Infinity", }, }, @@ -11594,20 +11597,20 @@ var g = &grammar{ }, { name: "ExponentPart", - pos: position{line: 1347, col: 1, offset: 37707}, + pos: position{line: 1349, col: 1, offset: 37610}, expr: &seqExpr{ - pos: position{line: 1347, col: 16, offset: 37722}, + pos: position{line: 1349, col: 16, offset: 37625}, exprs: []any{ &litMatcher{ - pos: position{line: 1347, col: 16, offset: 37722}, + pos: position{line: 1349, col: 16, offset: 37625}, val: "e", ignoreCase: true, want: "\"e\"i", }, &zeroOrOneExpr{ - pos: position{line: 1347, col: 21, offset: 37727}, + pos: position{line: 1349, col: 21, offset: 37630}, expr: &charClassMatcher{ - pos: position{line: 1347, col: 21, offset: 37727}, + pos: position{line: 1349, col: 21, offset: 37630}, val: "[+-]", chars: []rune{'+', '-'}, ignoreCase: false, @@ -11615,7 +11618,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1347, col: 27, offset: 37733}, + pos: position{line: 1349, col: 27, offset: 37636}, name: "UIntString", }, }, @@ -11623,9 +11626,9 @@ var g = &grammar{ }, { name: "NaN", - pos: position{line: 1349, col: 1, offset: 37745}, + pos: position{line: 1351, col: 1, offset: 37648}, expr: &litMatcher{ - pos: position{line: 1349, col: 7, offset: 37751}, + pos: position{line: 1351, col: 7, offset: 37654}, val: "NaN", ignoreCase: false, want: "\"NaN\"", @@ -11633,23 +11636,23 @@ var g = &grammar{ }, { name: "Infinity", - pos: position{line: 1351, col: 1, offset: 37758}, + pos: position{line: 1353, col: 1, offset: 37661}, expr: &seqExpr{ - pos: position{line: 1351, col: 12, offset: 37769}, + pos: position{line: 1353, col: 12, offset: 37672}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1351, col: 12, offset: 37769}, + pos: position{line: 1353, col: 12, offset: 37672}, expr: &choiceExpr{ - pos: position{line: 1351, col: 13, offset: 37770}, + pos: position{line: 1353, col: 13, offset: 37673}, alternatives: []any{ &litMatcher{ - pos: position{line: 1351, col: 13, offset: 37770}, + pos: position{line: 1353, col: 13, offset: 37673}, val: "-", ignoreCase: false, want: "\"-\"", }, &litMatcher{ - pos: position{line: 1351, col: 19, offset: 37776}, + pos: position{line: 1353, col: 19, offset: 37679}, val: "+", ignoreCase: false, want: "\"+\"", @@ -11658,7 +11661,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1351, col: 25, offset: 37782}, + pos: position{line: 1353, col: 25, offset: 37685}, val: "Inf", ignoreCase: false, want: "\"Inf\"", @@ -11668,14 +11671,14 @@ var g = &grammar{ }, { name: "Hex", - pos: position{line: 1353, col: 1, offset: 37789}, + pos: position{line: 1355, col: 1, offset: 37692}, expr: &actionExpr{ - pos: position{line: 1353, col: 7, offset: 37795}, + pos: position{line: 1355, col: 7, offset: 37698}, run: (*parser).callonHex1, expr: &oneOrMoreExpr{ - pos: position{line: 1353, col: 7, offset: 37795}, + pos: position{line: 1355, col: 7, offset: 37698}, expr: &ruleRefExpr{ - pos: position{line: 1353, col: 7, offset: 37795}, + pos: position{line: 1355, col: 7, offset: 37698}, name: "HexDigit", }, }, @@ -11683,9 +11686,9 @@ var g = &grammar{ }, { name: "HexDigit", - pos: position{line: 1355, col: 1, offset: 37837}, + pos: position{line: 1357, col: 1, offset: 37740}, expr: &charClassMatcher{ - pos: position{line: 1355, col: 12, offset: 37848}, + pos: position{line: 1357, col: 12, offset: 37751}, val: "[0-9a-fA-F]", ranges: []rune{'0', '9', 'a', 'f', 'A', 'F'}, ignoreCase: false, @@ -11694,35 +11697,35 @@ var g = &grammar{ }, { name: "QuotedString", - pos: position{line: 1357, col: 1, offset: 37861}, + pos: position{line: 1359, col: 1, offset: 37764}, expr: &choiceExpr{ - pos: position{line: 1358, col: 5, offset: 37878}, + pos: position{line: 1360, col: 5, offset: 37781}, alternatives: []any{ &actionExpr{ - pos: position{line: 1358, col: 5, offset: 37878}, + pos: position{line: 1360, col: 5, offset: 37781}, run: (*parser).callonQuotedString2, expr: &seqExpr{ - pos: position{line: 1358, col: 5, offset: 37878}, + pos: position{line: 1360, col: 5, offset: 37781}, exprs: []any{ &litMatcher{ - pos: position{line: 1358, col: 5, offset: 37878}, + pos: position{line: 1360, col: 5, offset: 37781}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, &labeledExpr{ - pos: position{line: 1358, col: 9, offset: 37882}, + pos: position{line: 1360, col: 9, offset: 37785}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1358, col: 11, offset: 37884}, + pos: position{line: 1360, col: 11, offset: 37787}, expr: &ruleRefExpr{ - pos: position{line: 1358, col: 11, offset: 37884}, + pos: position{line: 1360, col: 11, offset: 37787}, name: "DoubleQuotedChar", }, }, }, &litMatcher{ - pos: position{line: 1358, col: 29, offset: 37902}, + pos: position{line: 1360, col: 29, offset: 37805}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -11731,30 +11734,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1359, col: 5, offset: 37939}, + pos: position{line: 1361, col: 5, offset: 37842}, run: (*parser).callonQuotedString9, expr: &seqExpr{ - pos: position{line: 1359, col: 5, offset: 37939}, + pos: position{line: 1361, col: 5, offset: 37842}, exprs: []any{ &litMatcher{ - pos: position{line: 1359, col: 5, offset: 37939}, + pos: position{line: 1361, col: 5, offset: 37842}, val: "'", ignoreCase: false, want: "\"'\"", }, &labeledExpr{ - pos: position{line: 1359, col: 9, offset: 37943}, + pos: position{line: 1361, col: 9, offset: 37846}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1359, col: 11, offset: 37945}, + pos: position{line: 1361, col: 11, offset: 37848}, expr: &ruleRefExpr{ - pos: position{line: 1359, col: 11, offset: 37945}, + pos: position{line: 1361, col: 11, offset: 37848}, name: "SingleQuotedChar", }, }, }, &litMatcher{ - pos: position{line: 1359, col: 29, offset: 37963}, + pos: position{line: 1361, col: 29, offset: 37866}, val: "'", ignoreCase: false, want: "\"'\"", @@ -11767,57 +11770,57 @@ var g = &grammar{ }, { name: "DoubleQuotedChar", - pos: position{line: 1361, col: 1, offset: 37997}, + pos: position{line: 1363, col: 1, offset: 37900}, expr: &choiceExpr{ - pos: position{line: 1362, col: 5, offset: 38018}, + pos: position{line: 1364, col: 5, offset: 37921}, alternatives: []any{ &actionExpr{ - pos: position{line: 1362, col: 5, offset: 38018}, + pos: position{line: 1364, col: 5, offset: 37921}, run: (*parser).callonDoubleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1362, col: 5, offset: 38018}, + pos: position{line: 1364, col: 5, offset: 37921}, exprs: []any{ ¬Expr{ - pos: position{line: 1362, col: 5, offset: 38018}, + pos: position{line: 1364, col: 5, offset: 37921}, expr: &choiceExpr{ - pos: position{line: 1362, col: 7, offset: 38020}, + pos: position{line: 1364, col: 7, offset: 37923}, alternatives: []any{ &litMatcher{ - pos: position{line: 1362, col: 7, offset: 38020}, + pos: position{line: 1364, col: 7, offset: 37923}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, &ruleRefExpr{ - pos: position{line: 1362, col: 13, offset: 38026}, + pos: position{line: 1364, col: 13, offset: 37929}, name: "EscapedChar", }, }, }, }, &anyMatcher{ - line: 1362, col: 26, offset: 38039, + line: 1364, col: 26, offset: 37942, }, }, }, }, &actionExpr{ - pos: position{line: 1363, col: 5, offset: 38076}, + pos: position{line: 1365, col: 5, offset: 37979}, run: (*parser).callonDoubleQuotedChar9, expr: &seqExpr{ - pos: position{line: 1363, col: 5, offset: 38076}, + pos: position{line: 1365, col: 5, offset: 37979}, exprs: []any{ &litMatcher{ - pos: position{line: 1363, col: 5, offset: 38076}, + pos: position{line: 1365, col: 5, offset: 37979}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1363, col: 10, offset: 38081}, + pos: position{line: 1365, col: 10, offset: 37984}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1363, col: 12, offset: 38083}, + pos: position{line: 1365, col: 12, offset: 37986}, name: "EscapeSequence", }, }, @@ -11829,28 +11832,28 @@ var g = &grammar{ }, { name: "KeyWord", - pos: position{line: 1365, col: 1, offset: 38117}, + pos: position{line: 1367, col: 1, offset: 38020}, expr: &actionExpr{ - pos: position{line: 1366, col: 5, offset: 38129}, + pos: position{line: 1368, col: 5, offset: 38032}, run: (*parser).callonKeyWord1, expr: &seqExpr{ - pos: position{line: 1366, col: 5, offset: 38129}, + pos: position{line: 1368, col: 5, offset: 38032}, exprs: []any{ &labeledExpr{ - pos: position{line: 1366, col: 5, offset: 38129}, + pos: position{line: 1368, col: 5, offset: 38032}, label: "head", expr: &ruleRefExpr{ - pos: position{line: 1366, col: 10, offset: 38134}, + pos: position{line: 1368, col: 10, offset: 38037}, name: "KeyWordStart", }, }, &labeledExpr{ - pos: position{line: 1366, col: 23, offset: 38147}, + pos: position{line: 1368, col: 23, offset: 38050}, label: "tail", expr: &zeroOrMoreExpr{ - pos: position{line: 1366, col: 28, offset: 38152}, + pos: position{line: 1368, col: 28, offset: 38055}, expr: &ruleRefExpr{ - pos: position{line: 1366, col: 28, offset: 38152}, + pos: position{line: 1368, col: 28, offset: 38055}, name: "KeyWordRest", }, }, @@ -11861,16 +11864,16 @@ var g = &grammar{ }, { name: "KeyWordStart", - pos: position{line: 1368, col: 1, offset: 38214}, + pos: position{line: 1370, col: 1, offset: 38117}, expr: &choiceExpr{ - pos: position{line: 1369, col: 5, offset: 38231}, + pos: position{line: 1371, col: 5, offset: 38134}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1369, col: 5, offset: 38231}, + pos: position{line: 1371, col: 5, offset: 38134}, name: "KeyWordChars", }, &ruleRefExpr{ - pos: position{line: 1370, col: 5, offset: 38248}, + pos: position{line: 1372, col: 5, offset: 38151}, name: "KeyWordEsc", }, }, @@ -11878,16 +11881,16 @@ var g = &grammar{ }, { name: "KeyWordRest", - pos: position{line: 1372, col: 1, offset: 38260}, + pos: position{line: 1374, col: 1, offset: 38163}, expr: &choiceExpr{ - pos: position{line: 1373, col: 5, offset: 38276}, + pos: position{line: 1375, col: 5, offset: 38179}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1373, col: 5, offset: 38276}, + pos: position{line: 1375, col: 5, offset: 38179}, name: "KeyWordStart", }, &charClassMatcher{ - pos: position{line: 1374, col: 5, offset: 38293}, + pos: position{line: 1376, col: 5, offset: 38196}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11898,19 +11901,19 @@ var g = &grammar{ }, { name: "KeyWordChars", - pos: position{line: 1376, col: 1, offset: 38300}, + pos: position{line: 1378, col: 1, offset: 38203}, expr: &actionExpr{ - pos: position{line: 1376, col: 16, offset: 38315}, + pos: position{line: 1378, col: 16, offset: 38218}, run: (*parser).callonKeyWordChars1, expr: &choiceExpr{ - pos: position{line: 1376, col: 17, offset: 38316}, + pos: position{line: 1378, col: 17, offset: 38219}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1376, col: 17, offset: 38316}, + pos: position{line: 1378, col: 17, offset: 38219}, name: "UnicodeLetter", }, &charClassMatcher{ - pos: position{line: 1376, col: 33, offset: 38332}, + pos: position{line: 1378, col: 33, offset: 38235}, val: "[_.:/%#@~]", chars: []rune{'_', '.', ':', '/', '%', '#', '@', '~'}, ignoreCase: false, @@ -11922,31 +11925,31 @@ var g = &grammar{ }, { name: "KeyWordEsc", - pos: position{line: 1378, col: 1, offset: 38376}, + pos: position{line: 1380, col: 1, offset: 38279}, expr: &actionExpr{ - pos: position{line: 1378, col: 14, offset: 38389}, + pos: position{line: 1380, col: 14, offset: 38292}, run: (*parser).callonKeyWordEsc1, expr: &seqExpr{ - pos: position{line: 1378, col: 14, offset: 38389}, + pos: position{line: 1380, col: 14, offset: 38292}, exprs: []any{ &litMatcher{ - pos: position{line: 1378, col: 14, offset: 38389}, + pos: position{line: 1380, col: 14, offset: 38292}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1378, col: 19, offset: 38394}, + pos: position{line: 1380, col: 19, offset: 38297}, label: "s", expr: &choiceExpr{ - pos: position{line: 1378, col: 22, offset: 38397}, + pos: position{line: 1380, col: 22, offset: 38300}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1378, col: 22, offset: 38397}, + pos: position{line: 1380, col: 22, offset: 38300}, name: "KeywordEscape", }, &ruleRefExpr{ - pos: position{line: 1378, col: 38, offset: 38413}, + pos: position{line: 1380, col: 38, offset: 38316}, name: "EscapeSequence", }, }, @@ -11958,42 +11961,42 @@ var g = &grammar{ }, { name: "GlobPattern", - pos: position{line: 1380, col: 1, offset: 38448}, + pos: position{line: 1382, col: 1, offset: 38351}, expr: &actionExpr{ - pos: position{line: 1381, col: 5, offset: 38464}, + pos: position{line: 1383, col: 5, offset: 38367}, run: (*parser).callonGlobPattern1, expr: &seqExpr{ - pos: position{line: 1381, col: 5, offset: 38464}, + pos: position{line: 1383, col: 5, offset: 38367}, exprs: []any{ &andExpr{ - pos: position{line: 1381, col: 5, offset: 38464}, + pos: position{line: 1383, col: 5, offset: 38367}, expr: &ruleRefExpr{ - pos: position{line: 1381, col: 6, offset: 38465}, + pos: position{line: 1383, col: 6, offset: 38368}, name: "GlobProperStart", }, }, &andExpr{ - pos: position{line: 1381, col: 22, offset: 38481}, + pos: position{line: 1383, col: 22, offset: 38384}, expr: &ruleRefExpr{ - pos: position{line: 1381, col: 23, offset: 38482}, + pos: position{line: 1383, col: 23, offset: 38385}, name: "GlobHasStar", }, }, &labeledExpr{ - pos: position{line: 1381, col: 35, offset: 38494}, + pos: position{line: 1383, col: 35, offset: 38397}, label: "head", expr: &ruleRefExpr{ - pos: position{line: 1381, col: 40, offset: 38499}, + pos: position{line: 1383, col: 40, offset: 38402}, name: "GlobStart", }, }, &labeledExpr{ - pos: position{line: 1381, col: 50, offset: 38509}, + pos: position{line: 1383, col: 50, offset: 38412}, label: "tail", expr: &zeroOrMoreExpr{ - pos: position{line: 1381, col: 55, offset: 38514}, + pos: position{line: 1383, col: 55, offset: 38417}, expr: &ruleRefExpr{ - pos: position{line: 1381, col: 55, offset: 38514}, + pos: position{line: 1383, col: 55, offset: 38417}, name: "GlobRest", }, }, @@ -12004,28 +12007,28 @@ var g = &grammar{ }, { name: "GlobProperStart", - pos: position{line: 1385, col: 1, offset: 38583}, + pos: position{line: 1387, col: 1, offset: 38486}, expr: &choiceExpr{ - pos: position{line: 1385, col: 19, offset: 38601}, + pos: position{line: 1387, col: 19, offset: 38504}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1385, col: 19, offset: 38601}, + pos: position{line: 1387, col: 19, offset: 38504}, name: "KeyWordStart", }, &seqExpr{ - pos: position{line: 1385, col: 34, offset: 38616}, + pos: position{line: 1387, col: 34, offset: 38519}, exprs: []any{ &oneOrMoreExpr{ - pos: position{line: 1385, col: 34, offset: 38616}, + pos: position{line: 1387, col: 34, offset: 38519}, expr: &litMatcher{ - pos: position{line: 1385, col: 34, offset: 38616}, + pos: position{line: 1387, col: 34, offset: 38519}, val: "*", ignoreCase: false, want: "\"*\"", }, }, &ruleRefExpr{ - pos: position{line: 1385, col: 39, offset: 38621}, + pos: position{line: 1387, col: 39, offset: 38524}, name: "KeyWordRest", }, }, @@ -12035,19 +12038,19 @@ var g = &grammar{ }, { name: "GlobHasStar", - pos: position{line: 1386, col: 1, offset: 38633}, + pos: position{line: 1388, col: 1, offset: 38536}, expr: &seqExpr{ - pos: position{line: 1386, col: 15, offset: 38647}, + pos: position{line: 1388, col: 15, offset: 38550}, exprs: []any{ &zeroOrMoreExpr{ - pos: position{line: 1386, col: 15, offset: 38647}, + pos: position{line: 1388, col: 15, offset: 38550}, expr: &ruleRefExpr{ - pos: position{line: 1386, col: 15, offset: 38647}, + pos: position{line: 1388, col: 15, offset: 38550}, name: "KeyWordRest", }, }, &litMatcher{ - pos: position{line: 1386, col: 28, offset: 38660}, + pos: position{line: 1388, col: 28, offset: 38563}, val: "*", ignoreCase: false, want: "\"*\"", @@ -12057,23 +12060,23 @@ var g = &grammar{ }, { name: "GlobStart", - pos: position{line: 1388, col: 1, offset: 38665}, + pos: position{line: 1390, col: 1, offset: 38568}, expr: &choiceExpr{ - pos: position{line: 1389, col: 5, offset: 38679}, + pos: position{line: 1391, col: 5, offset: 38582}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1389, col: 5, offset: 38679}, + pos: position{line: 1391, col: 5, offset: 38582}, name: "KeyWordChars", }, &ruleRefExpr{ - pos: position{line: 1390, col: 5, offset: 38696}, + pos: position{line: 1392, col: 5, offset: 38599}, name: "GlobEsc", }, &actionExpr{ - pos: position{line: 1391, col: 5, offset: 38708}, + pos: position{line: 1393, col: 5, offset: 38611}, run: (*parser).callonGlobStart4, expr: &litMatcher{ - pos: position{line: 1391, col: 5, offset: 38708}, + pos: position{line: 1393, col: 5, offset: 38611}, val: "*", ignoreCase: false, want: "\"*\"", @@ -12084,16 +12087,16 @@ var g = &grammar{ }, { name: "GlobRest", - pos: position{line: 1393, col: 1, offset: 38733}, + pos: position{line: 1395, col: 1, offset: 38636}, expr: &choiceExpr{ - pos: position{line: 1394, col: 5, offset: 38746}, + pos: position{line: 1396, col: 5, offset: 38649}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1394, col: 5, offset: 38746}, + pos: position{line: 1396, col: 5, offset: 38649}, name: "GlobStart", }, &charClassMatcher{ - pos: position{line: 1395, col: 5, offset: 38760}, + pos: position{line: 1397, col: 5, offset: 38663}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -12104,31 +12107,31 @@ var g = &grammar{ }, { name: "GlobEsc", - pos: position{line: 1397, col: 1, offset: 38767}, + pos: position{line: 1399, col: 1, offset: 38670}, expr: &actionExpr{ - pos: position{line: 1397, col: 11, offset: 38777}, + pos: position{line: 1399, col: 11, offset: 38680}, run: (*parser).callonGlobEsc1, expr: &seqExpr{ - pos: position{line: 1397, col: 11, offset: 38777}, + pos: position{line: 1399, col: 11, offset: 38680}, exprs: []any{ &litMatcher{ - pos: position{line: 1397, col: 11, offset: 38777}, + pos: position{line: 1399, col: 11, offset: 38680}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1397, col: 16, offset: 38782}, + pos: position{line: 1399, col: 16, offset: 38685}, label: "s", expr: &choiceExpr{ - pos: position{line: 1397, col: 19, offset: 38785}, + pos: position{line: 1399, col: 19, offset: 38688}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1397, col: 19, offset: 38785}, + pos: position{line: 1399, col: 19, offset: 38688}, name: "GlobEscape", }, &ruleRefExpr{ - pos: position{line: 1397, col: 32, offset: 38798}, + pos: position{line: 1399, col: 32, offset: 38701}, name: "EscapeSequence", }, }, @@ -12140,32 +12143,32 @@ var g = &grammar{ }, { name: "GlobEscape", - pos: position{line: 1399, col: 1, offset: 38833}, + pos: position{line: 1401, col: 1, offset: 38736}, expr: &choiceExpr{ - pos: position{line: 1400, col: 5, offset: 38848}, + pos: position{line: 1402, col: 5, offset: 38751}, alternatives: []any{ &actionExpr{ - pos: position{line: 1400, col: 5, offset: 38848}, + pos: position{line: 1402, col: 5, offset: 38751}, run: (*parser).callonGlobEscape2, expr: &litMatcher{ - pos: position{line: 1400, col: 5, offset: 38848}, + pos: position{line: 1402, col: 5, offset: 38751}, val: "=", ignoreCase: false, want: "\"=\"", }, }, &actionExpr{ - pos: position{line: 1401, col: 5, offset: 38876}, + pos: position{line: 1403, col: 5, offset: 38779}, run: (*parser).callonGlobEscape4, expr: &litMatcher{ - pos: position{line: 1401, col: 5, offset: 38876}, + pos: position{line: 1403, col: 5, offset: 38779}, val: "*", ignoreCase: false, want: "\"*\"", }, }, &charClassMatcher{ - pos: position{line: 1402, col: 5, offset: 38906}, + pos: position{line: 1404, col: 5, offset: 38809}, val: "[+-]", chars: []rune{'+', '-'}, ignoreCase: false, @@ -12176,57 +12179,57 @@ var g = &grammar{ }, { name: "SingleQuotedChar", - pos: position{line: 1404, col: 1, offset: 38912}, + pos: position{line: 1406, col: 1, offset: 38815}, expr: &choiceExpr{ - pos: position{line: 1405, col: 5, offset: 38933}, + pos: position{line: 1407, col: 5, offset: 38836}, alternatives: []any{ &actionExpr{ - pos: position{line: 1405, col: 5, offset: 38933}, + pos: position{line: 1407, col: 5, offset: 38836}, run: (*parser).callonSingleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1405, col: 5, offset: 38933}, + pos: position{line: 1407, col: 5, offset: 38836}, exprs: []any{ ¬Expr{ - pos: position{line: 1405, col: 5, offset: 38933}, + pos: position{line: 1407, col: 5, offset: 38836}, expr: &choiceExpr{ - pos: position{line: 1405, col: 7, offset: 38935}, + pos: position{line: 1407, col: 7, offset: 38838}, alternatives: []any{ &litMatcher{ - pos: position{line: 1405, col: 7, offset: 38935}, + pos: position{line: 1407, col: 7, offset: 38838}, val: "'", ignoreCase: false, want: "\"'\"", }, &ruleRefExpr{ - pos: position{line: 1405, col: 13, offset: 38941}, + pos: position{line: 1407, col: 13, offset: 38844}, name: "EscapedChar", }, }, }, }, &anyMatcher{ - line: 1405, col: 26, offset: 38954, + line: 1407, col: 26, offset: 38857, }, }, }, }, &actionExpr{ - pos: position{line: 1406, col: 5, offset: 38991}, + pos: position{line: 1408, col: 5, offset: 38894}, run: (*parser).callonSingleQuotedChar9, expr: &seqExpr{ - pos: position{line: 1406, col: 5, offset: 38991}, + pos: position{line: 1408, col: 5, offset: 38894}, exprs: []any{ &litMatcher{ - pos: position{line: 1406, col: 5, offset: 38991}, + pos: position{line: 1408, col: 5, offset: 38894}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1406, col: 10, offset: 38996}, + pos: position{line: 1408, col: 10, offset: 38899}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1406, col: 12, offset: 38998}, + pos: position{line: 1408, col: 12, offset: 38901}, name: "EscapeSequence", }, }, @@ -12238,16 +12241,16 @@ var g = &grammar{ }, { name: "EscapeSequence", - pos: position{line: 1408, col: 1, offset: 39032}, + pos: position{line: 1410, col: 1, offset: 38935}, expr: &choiceExpr{ - pos: position{line: 1409, col: 5, offset: 39051}, + pos: position{line: 1411, col: 5, offset: 38954}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1409, col: 5, offset: 39051}, + pos: position{line: 1411, col: 5, offset: 38954}, name: "SingleCharEscape", }, &ruleRefExpr{ - pos: position{line: 1410, col: 5, offset: 39072}, + pos: position{line: 1412, col: 5, offset: 38975}, name: "UnicodeEscape", }, }, @@ -12255,87 +12258,87 @@ var g = &grammar{ }, { name: "SingleCharEscape", - pos: position{line: 1412, col: 1, offset: 39087}, + pos: position{line: 1414, col: 1, offset: 38990}, expr: &choiceExpr{ - pos: position{line: 1413, col: 5, offset: 39108}, + pos: position{line: 1415, col: 5, offset: 39011}, alternatives: []any{ &litMatcher{ - pos: position{line: 1413, col: 5, offset: 39108}, + pos: position{line: 1415, col: 5, offset: 39011}, val: "'", ignoreCase: false, want: "\"'\"", }, &actionExpr{ - pos: position{line: 1414, col: 5, offset: 39116}, + pos: position{line: 1416, col: 5, offset: 39019}, run: (*parser).callonSingleCharEscape3, expr: &litMatcher{ - pos: position{line: 1414, col: 5, offset: 39116}, + pos: position{line: 1416, col: 5, offset: 39019}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, }, &litMatcher{ - pos: position{line: 1415, col: 5, offset: 39156}, + pos: position{line: 1417, col: 5, offset: 39059}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &actionExpr{ - pos: position{line: 1416, col: 5, offset: 39165}, + pos: position{line: 1418, col: 5, offset: 39068}, run: (*parser).callonSingleCharEscape6, expr: &litMatcher{ - pos: position{line: 1416, col: 5, offset: 39165}, + pos: position{line: 1418, col: 5, offset: 39068}, val: "b", ignoreCase: false, want: "\"b\"", }, }, &actionExpr{ - pos: position{line: 1417, col: 5, offset: 39194}, + pos: position{line: 1419, col: 5, offset: 39097}, run: (*parser).callonSingleCharEscape8, expr: &litMatcher{ - pos: position{line: 1417, col: 5, offset: 39194}, + pos: position{line: 1419, col: 5, offset: 39097}, val: "f", ignoreCase: false, want: "\"f\"", }, }, &actionExpr{ - pos: position{line: 1418, col: 5, offset: 39223}, + pos: position{line: 1420, col: 5, offset: 39126}, run: (*parser).callonSingleCharEscape10, expr: &litMatcher{ - pos: position{line: 1418, col: 5, offset: 39223}, + pos: position{line: 1420, col: 5, offset: 39126}, val: "n", ignoreCase: false, want: "\"n\"", }, }, &actionExpr{ - pos: position{line: 1419, col: 5, offset: 39252}, + pos: position{line: 1421, col: 5, offset: 39155}, run: (*parser).callonSingleCharEscape12, expr: &litMatcher{ - pos: position{line: 1419, col: 5, offset: 39252}, + pos: position{line: 1421, col: 5, offset: 39155}, val: "r", ignoreCase: false, want: "\"r\"", }, }, &actionExpr{ - pos: position{line: 1420, col: 5, offset: 39281}, + pos: position{line: 1422, col: 5, offset: 39184}, run: (*parser).callonSingleCharEscape14, expr: &litMatcher{ - pos: position{line: 1420, col: 5, offset: 39281}, + pos: position{line: 1422, col: 5, offset: 39184}, val: "t", ignoreCase: false, want: "\"t\"", }, }, &actionExpr{ - pos: position{line: 1421, col: 5, offset: 39310}, + pos: position{line: 1423, col: 5, offset: 39213}, run: (*parser).callonSingleCharEscape16, expr: &litMatcher{ - pos: position{line: 1421, col: 5, offset: 39310}, + pos: position{line: 1423, col: 5, offset: 39213}, val: "v", ignoreCase: false, want: "\"v\"", @@ -12346,32 +12349,32 @@ var g = &grammar{ }, { name: "KeywordEscape", - pos: position{line: 1423, col: 1, offset: 39336}, + pos: position{line: 1425, col: 1, offset: 39239}, expr: &choiceExpr{ - pos: position{line: 1424, col: 5, offset: 39354}, + pos: position{line: 1426, col: 5, offset: 39257}, alternatives: []any{ &actionExpr{ - pos: position{line: 1424, col: 5, offset: 39354}, + pos: position{line: 1426, col: 5, offset: 39257}, run: (*parser).callonKeywordEscape2, expr: &litMatcher{ - pos: position{line: 1424, col: 5, offset: 39354}, + pos: position{line: 1426, col: 5, offset: 39257}, val: "=", ignoreCase: false, want: "\"=\"", }, }, &actionExpr{ - pos: position{line: 1425, col: 5, offset: 39382}, + pos: position{line: 1427, col: 5, offset: 39285}, run: (*parser).callonKeywordEscape4, expr: &litMatcher{ - pos: position{line: 1425, col: 5, offset: 39382}, + pos: position{line: 1427, col: 5, offset: 39285}, val: "*", ignoreCase: false, want: "\"*\"", }, }, &charClassMatcher{ - pos: position{line: 1426, col: 5, offset: 39410}, + pos: position{line: 1428, col: 5, offset: 39313}, val: "[+-]", chars: []rune{'+', '-'}, ignoreCase: false, @@ -12382,42 +12385,42 @@ var g = &grammar{ }, { name: "UnicodeEscape", - pos: position{line: 1428, col: 1, offset: 39416}, + pos: position{line: 1430, col: 1, offset: 39319}, expr: &choiceExpr{ - pos: position{line: 1429, col: 5, offset: 39434}, + pos: position{line: 1431, col: 5, offset: 39337}, alternatives: []any{ &actionExpr{ - pos: position{line: 1429, col: 5, offset: 39434}, + pos: position{line: 1431, col: 5, offset: 39337}, run: (*parser).callonUnicodeEscape2, expr: &seqExpr{ - pos: position{line: 1429, col: 5, offset: 39434}, + pos: position{line: 1431, col: 5, offset: 39337}, exprs: []any{ &litMatcher{ - pos: position{line: 1429, col: 5, offset: 39434}, + pos: position{line: 1431, col: 5, offset: 39337}, val: "u", ignoreCase: false, want: "\"u\"", }, &labeledExpr{ - pos: position{line: 1429, col: 9, offset: 39438}, + pos: position{line: 1431, col: 9, offset: 39341}, label: "chars", expr: &seqExpr{ - pos: position{line: 1429, col: 16, offset: 39445}, + pos: position{line: 1431, col: 16, offset: 39348}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1429, col: 16, offset: 39445}, + pos: position{line: 1431, col: 16, offset: 39348}, name: "HexDigit", }, &ruleRefExpr{ - pos: position{line: 1429, col: 25, offset: 39454}, + pos: position{line: 1431, col: 25, offset: 39357}, name: "HexDigit", }, &ruleRefExpr{ - pos: position{line: 1429, col: 34, offset: 39463}, + pos: position{line: 1431, col: 34, offset: 39366}, name: "HexDigit", }, &ruleRefExpr{ - pos: position{line: 1429, col: 43, offset: 39472}, + pos: position{line: 1431, col: 43, offset: 39375}, name: "HexDigit", }, }, @@ -12427,65 +12430,65 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1432, col: 5, offset: 39535}, + pos: position{line: 1434, col: 5, offset: 39438}, run: (*parser).callonUnicodeEscape11, expr: &seqExpr{ - pos: position{line: 1432, col: 5, offset: 39535}, + pos: position{line: 1434, col: 5, offset: 39438}, exprs: []any{ &litMatcher{ - pos: position{line: 1432, col: 5, offset: 39535}, + pos: position{line: 1434, col: 5, offset: 39438}, val: "u", ignoreCase: false, want: "\"u\"", }, &litMatcher{ - pos: position{line: 1432, col: 9, offset: 39539}, + pos: position{line: 1434, col: 9, offset: 39442}, val: "{", ignoreCase: false, want: "\"{\"", }, &labeledExpr{ - pos: position{line: 1432, col: 13, offset: 39543}, + pos: position{line: 1434, col: 13, offset: 39446}, label: "chars", expr: &seqExpr{ - pos: position{line: 1432, col: 20, offset: 39550}, + pos: position{line: 1434, col: 20, offset: 39453}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1432, col: 20, offset: 39550}, + pos: position{line: 1434, col: 20, offset: 39453}, name: "HexDigit", }, &zeroOrOneExpr{ - pos: position{line: 1432, col: 29, offset: 39559}, + pos: position{line: 1434, col: 29, offset: 39462}, expr: &ruleRefExpr{ - pos: position{line: 1432, col: 29, offset: 39559}, + pos: position{line: 1434, col: 29, offset: 39462}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1432, col: 39, offset: 39569}, + pos: position{line: 1434, col: 39, offset: 39472}, expr: &ruleRefExpr{ - pos: position{line: 1432, col: 39, offset: 39569}, + pos: position{line: 1434, col: 39, offset: 39472}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1432, col: 49, offset: 39579}, + pos: position{line: 1434, col: 49, offset: 39482}, expr: &ruleRefExpr{ - pos: position{line: 1432, col: 49, offset: 39579}, + pos: position{line: 1434, col: 49, offset: 39482}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1432, col: 59, offset: 39589}, + pos: position{line: 1434, col: 59, offset: 39492}, expr: &ruleRefExpr{ - pos: position{line: 1432, col: 59, offset: 39589}, + pos: position{line: 1434, col: 59, offset: 39492}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1432, col: 69, offset: 39599}, + pos: position{line: 1434, col: 69, offset: 39502}, expr: &ruleRefExpr{ - pos: position{line: 1432, col: 69, offset: 39599}, + pos: position{line: 1434, col: 69, offset: 39502}, name: "HexDigit", }, }, @@ -12493,7 +12496,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1432, col: 80, offset: 39610}, + pos: position{line: 1434, col: 80, offset: 39513}, val: "}", ignoreCase: false, want: "\"}\"", @@ -12506,37 +12509,37 @@ var g = &grammar{ }, { name: "RegexpPattern", - pos: position{line: 1436, col: 1, offset: 39664}, + pos: position{line: 1438, col: 1, offset: 39567}, expr: &actionExpr{ - pos: position{line: 1437, col: 5, offset: 39682}, + pos: position{line: 1439, col: 5, offset: 39585}, run: (*parser).callonRegexpPattern1, expr: &seqExpr{ - pos: position{line: 1437, col: 5, offset: 39682}, + pos: position{line: 1439, col: 5, offset: 39585}, exprs: []any{ &litMatcher{ - pos: position{line: 1437, col: 5, offset: 39682}, + pos: position{line: 1439, col: 5, offset: 39585}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 1437, col: 9, offset: 39686}, + pos: position{line: 1439, col: 9, offset: 39589}, label: "body", expr: &ruleRefExpr{ - pos: position{line: 1437, col: 14, offset: 39691}, + pos: position{line: 1439, col: 14, offset: 39594}, name: "RegexpBody", }, }, &litMatcher{ - pos: position{line: 1437, col: 25, offset: 39702}, + pos: position{line: 1439, col: 25, offset: 39605}, val: "/", ignoreCase: false, want: "\"/\"", }, ¬Expr{ - pos: position{line: 1437, col: 29, offset: 39706}, + pos: position{line: 1439, col: 29, offset: 39609}, expr: &ruleRefExpr{ - pos: position{line: 1437, col: 30, offset: 39707}, + pos: position{line: 1439, col: 30, offset: 39610}, name: "KeyWordStart", }, }, @@ -12546,33 +12549,33 @@ var g = &grammar{ }, { name: "RegexpBody", - pos: position{line: 1439, col: 1, offset: 39742}, + pos: position{line: 1441, col: 1, offset: 39645}, expr: &actionExpr{ - pos: position{line: 1440, col: 5, offset: 39757}, + pos: position{line: 1442, col: 5, offset: 39660}, run: (*parser).callonRegexpBody1, expr: &oneOrMoreExpr{ - pos: position{line: 1440, col: 5, offset: 39757}, + pos: position{line: 1442, col: 5, offset: 39660}, expr: &choiceExpr{ - pos: position{line: 1440, col: 6, offset: 39758}, + pos: position{line: 1442, col: 6, offset: 39661}, alternatives: []any{ &charClassMatcher{ - pos: position{line: 1440, col: 6, offset: 39758}, + pos: position{line: 1442, col: 6, offset: 39661}, val: "[^/\\\\]", chars: []rune{'/', '\\'}, ignoreCase: false, inverted: true, }, &seqExpr{ - pos: position{line: 1440, col: 15, offset: 39767}, + pos: position{line: 1442, col: 15, offset: 39670}, exprs: []any{ &litMatcher{ - pos: position{line: 1440, col: 15, offset: 39767}, + pos: position{line: 1442, col: 15, offset: 39670}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &anyMatcher{ - line: 1440, col: 20, offset: 39772, + line: 1442, col: 20, offset: 39675, }, }, }, @@ -12583,9 +12586,9 @@ var g = &grammar{ }, { name: "EscapedChar", - pos: position{line: 1442, col: 1, offset: 39808}, + pos: position{line: 1444, col: 1, offset: 39711}, expr: &charClassMatcher{ - pos: position{line: 1443, col: 5, offset: 39824}, + pos: position{line: 1445, col: 5, offset: 39727}, val: "[\\x00-\\x1f\\\\]", chars: []rune{'\\'}, ranges: []rune{'\x00', '\x1f'}, @@ -12595,42 +12598,42 @@ var g = &grammar{ }, { name: "_", - pos: position{line: 1445, col: 1, offset: 39839}, + pos: position{line: 1447, col: 1, offset: 39742}, expr: &oneOrMoreExpr{ - pos: position{line: 1445, col: 5, offset: 39843}, + pos: position{line: 1447, col: 5, offset: 39746}, expr: &ruleRefExpr{ - pos: position{line: 1445, col: 5, offset: 39843}, + pos: position{line: 1447, col: 5, offset: 39746}, name: "AnySpace", }, }, }, { name: "__", - pos: position{line: 1447, col: 1, offset: 39854}, + pos: position{line: 1449, col: 1, offset: 39757}, expr: &zeroOrMoreExpr{ - pos: position{line: 1447, col: 6, offset: 39859}, + pos: position{line: 1449, col: 6, offset: 39762}, expr: &ruleRefExpr{ - pos: position{line: 1447, col: 6, offset: 39859}, + pos: position{line: 1449, col: 6, offset: 39762}, name: "AnySpace", }, }, }, { name: "AnySpace", - pos: position{line: 1449, col: 1, offset: 39870}, + pos: position{line: 1451, col: 1, offset: 39773}, expr: &choiceExpr{ - pos: position{line: 1450, col: 5, offset: 39883}, + pos: position{line: 1452, col: 5, offset: 39786}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1450, col: 5, offset: 39883}, + pos: position{line: 1452, col: 5, offset: 39786}, name: "WhiteSpace", }, &ruleRefExpr{ - pos: position{line: 1451, col: 5, offset: 39898}, + pos: position{line: 1453, col: 5, offset: 39801}, name: "LineTerminator", }, &ruleRefExpr{ - pos: position{line: 1452, col: 5, offset: 39917}, + pos: position{line: 1454, col: 5, offset: 39820}, name: "Comment", }, }, @@ -12638,32 +12641,32 @@ var g = &grammar{ }, { name: "UnicodeLetter", - pos: position{line: 1454, col: 1, offset: 39926}, + pos: position{line: 1456, col: 1, offset: 39829}, expr: &choiceExpr{ - pos: position{line: 1455, col: 5, offset: 39944}, + pos: position{line: 1457, col: 5, offset: 39847}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1455, col: 5, offset: 39944}, + pos: position{line: 1457, col: 5, offset: 39847}, name: "Lu", }, &ruleRefExpr{ - pos: position{line: 1456, col: 5, offset: 39951}, + pos: position{line: 1458, col: 5, offset: 39854}, name: "Ll", }, &ruleRefExpr{ - pos: position{line: 1457, col: 5, offset: 39958}, + pos: position{line: 1459, col: 5, offset: 39861}, name: "Lt", }, &ruleRefExpr{ - pos: position{line: 1458, col: 5, offset: 39965}, + pos: position{line: 1460, col: 5, offset: 39868}, name: "Lm", }, &ruleRefExpr{ - pos: position{line: 1459, col: 5, offset: 39972}, + pos: position{line: 1461, col: 5, offset: 39875}, name: "Lo", }, &ruleRefExpr{ - pos: position{line: 1460, col: 5, offset: 39979}, + pos: position{line: 1462, col: 5, offset: 39882}, name: "Nl", }, }, @@ -12671,16 +12674,16 @@ var g = &grammar{ }, { name: "UnicodeCombiningMark", - pos: position{line: 1462, col: 1, offset: 39983}, + pos: position{line: 1464, col: 1, offset: 39886}, expr: &choiceExpr{ - pos: position{line: 1463, col: 5, offset: 40008}, + pos: position{line: 1465, col: 5, offset: 39911}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1463, col: 5, offset: 40008}, + pos: position{line: 1465, col: 5, offset: 39911}, name: "Mn", }, &ruleRefExpr{ - pos: position{line: 1464, col: 5, offset: 40015}, + pos: position{line: 1466, col: 5, offset: 39918}, name: "Mc", }, }, @@ -12688,25 +12691,25 @@ var g = &grammar{ }, { name: "UnicodeDigit", - pos: position{line: 1466, col: 1, offset: 40019}, + pos: position{line: 1468, col: 1, offset: 39922}, expr: &ruleRefExpr{ - pos: position{line: 1467, col: 5, offset: 40036}, + pos: position{line: 1469, col: 5, offset: 39939}, name: "Nd", }, }, { name: "UnicodeConnectorPunctuation", - pos: position{line: 1469, col: 1, offset: 40040}, + pos: position{line: 1471, col: 1, offset: 39943}, expr: &ruleRefExpr{ - pos: position{line: 1470, col: 5, offset: 40072}, + pos: position{line: 1472, col: 5, offset: 39975}, name: "Pc", }, }, { name: "Ll", - pos: position{line: 1476, col: 1, offset: 40253}, + pos: position{line: 1478, col: 1, offset: 40156}, expr: &charClassMatcher{ - pos: position{line: 1476, col: 6, offset: 40258}, + pos: position{line: 1478, col: 6, offset: 40161}, 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', 'ﬓ', 'ﬗ', 'ａ', 'ｚ'}, @@ -12716,9 +12719,9 @@ var g = &grammar{ }, { name: "Lm", - pos: position{line: 1479, col: 1, offset: 44410}, + pos: position{line: 1481, col: 1, offset: 44313}, expr: &charClassMatcher{ - pos: position{line: 1479, col: 6, offset: 44415}, + pos: position{line: 1481, col: 6, offset: 44318}, 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{'ʰ', 'ˁ', 'ˆ', 'ˑ', 'ˠ', 'ˤ', 'ۥ', 'ۦ', 'ߴ', 'ߵ', 'ᱸ', 'ᱽ', 'ᴬ', 'ᵪ', 'ᶛ', 'ᶿ', 'ₐ', 'ₜ', 'ⱼ', 'ⱽ', '〱', '〵', 'ゝ', 'ゞ', 'ー', 'ヾ', 'ꓸ', 'ꓽ', 'ꚜ', 'ꚝ', 'ꜗ', 'ꜟ', 'ꟸ', 'ꟹ', 'ꫳ', 'ꫴ', 'ꭜ', 'ꭟ', 'ﾞ', 'ﾟ'}, @@ -12728,9 +12731,9 @@ var g = &grammar{ }, { name: "Lo", - pos: position{line: 1482, col: 1, offset: 44900}, + pos: position{line: 1484, col: 1, offset: 44803}, expr: &charClassMatcher{ - pos: position{line: 1482, col: 6, offset: 44905}, + pos: position{line: 1484, col: 6, offset: 44808}, 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{'ǀ', 'ǃ', 'א', 'ת', 'ׯ', 'ײ', 'ؠ', 'ؿ', 'ف', 'ي', 'ٮ', 'ٯ', 'ٱ', 'ۓ', 'ۮ', 'ۯ', 'ۺ', 'ۼ', 'ܒ', 'ܯ', 'ݍ', 'ޥ', 'ߊ', 'ߪ', 'ࠀ', 'ࠕ', 'ࡀ', 'ࡘ', 'ࡠ', 'ࡪ', 'ࢠ', 'ࢴ', 'ࢶ', 'ࢽ', 'ऄ', 'ह', 'क़', 'ॡ', 'ॲ', 'ঀ', 'অ', 'ঌ', 'এ', 'ঐ', 'ও', 'ন', 'প', 'র', 'শ', 'হ', 'ড়', 'ঢ়', 'য়', 'ৡ', 'ৰ', 'ৱ', 'ਅ', 'ਊ', 'ਏ', 'ਐ', 'ਓ', 'ਨ', 'ਪ', 'ਰ', 'ਲ', 'ਲ਼', 'ਵ', 'ਸ਼', 'ਸ', 'ਹ', 'ਖ਼', 'ੜ', 'ੲ', 'ੴ', 'અ', 'ઍ', 'એ', 'ઑ', 'ઓ', 'ન', 'પ', 'ર', 'લ', 'ળ', 'વ', 'હ', 'ૠ', 'ૡ', 'ଅ', 'ଌ', 'ଏ', 'ଐ', 'ଓ', 'ନ', 'ପ', 'ର', 'ଲ', 'ଳ', 'ଵ', 'ହ', 'ଡ଼', 'ଢ଼', 'ୟ', 'ୡ', 'அ', 'ஊ', 'எ', 'ஐ', 'ஒ', 'க', 'ங', 'ச', 'ஞ', 'ட', 'ண', 'த', 'ந', 'ப', 'ம', 'ஹ', 'అ', 'ఌ', 'ఎ', 'ఐ', 'ఒ', 'న', 'ప', 'హ', 'ౘ', 'ౚ', 'ౠ', 'ౡ', 'ಅ', 'ಌ', 'ಎ', 'ಐ', 'ಒ', 'ನ', 'ಪ', 'ಳ', 'ವ', 'ಹ', 'ೠ', 'ೡ', 'ೱ', 'ೲ', 'അ', 'ഌ', 'എ', 'ഐ', 'ഒ', 'ഺ', 'ൔ', 'ൖ', 'ൟ', 'ൡ', 'ൺ', 'ൿ', 'අ', 'ඖ', 'ක', 'න', 'ඳ', 'ර', 'ව', 'ෆ', 'ก', 'ะ', 'า', 'ำ', 'เ', 'ๅ', 'ກ', 'ຂ', 'ງ', 'ຈ', 'ດ', 'ທ', 'ນ', 'ຟ', 'ມ', 'ຣ', 'ສ', 'ຫ', 'ອ', 'ະ', 'າ', 'ຳ', 'ເ', 'ໄ', 'ໜ', 'ໟ', 'ཀ', 'ཇ', 'ཉ', 'ཬ', 'ྈ', 'ྌ', 'က', 'ဪ', 'ၐ', 'ၕ', 'ၚ', 'ၝ', 'ၥ', 'ၦ', 'ၮ', 'ၰ', 'ၵ', 'ႁ', 'ᄀ', 'ቈ', 'ቊ', 'ቍ', 'ቐ', 'ቖ', 'ቚ', 'ቝ', 'በ', 'ኈ', 'ኊ', 'ኍ', 'ነ', 'ኰ', 'ኲ', 'ኵ', 'ኸ', 'ኾ', 'ዂ', 'ዅ', 'ወ', 'ዖ', 'ዘ', 'ጐ', 'ጒ', 'ጕ', 'ጘ', 'ፚ', 'ᎀ', 'ᎏ', 'ᐁ', 'ᙬ', 'ᙯ', 'ᙿ', 'ᚁ', 'ᚚ', 'ᚠ', 'ᛪ', 'ᛱ', 'ᛸ', 'ᜀ', 'ᜌ', 'ᜎ', 'ᜑ', 'ᜠ', 'ᜱ', 'ᝀ', 'ᝑ', 'ᝠ', 'ᝬ', 'ᝮ', 'ᝰ', 'ក', 'ឳ', 'ᠠ', 'ᡂ', 'ᡄ', 'ᡸ', 'ᢀ', 'ᢄ', 'ᢇ', 'ᢨ', 'ᢰ', 'ᣵ', 'ᤀ', 'ᤞ', 'ᥐ', 'ᥭ', 'ᥰ', 'ᥴ', 'ᦀ', 'ᦫ', 'ᦰ', 'ᧉ', 'ᨀ', 'ᨖ', 'ᨠ', 'ᩔ', 'ᬅ', 'ᬳ', 'ᭅ', 'ᭋ', 'ᮃ', 'ᮠ', 'ᮮ', 'ᮯ', 'ᮺ', 'ᯥ', 'ᰀ', 'ᰣ', 'ᱍ', 'ᱏ', 'ᱚ', 'ᱷ', 'ᳩ', 'ᳬ', 'ᳮ', 'ᳱ', 'ᳵ', 'ᳶ', 'ℵ', 'ℸ', 'ⴰ', 'ⵧ', 'ⶀ', 'ⶖ', 'ⶠ', 'ⶦ', 'ⶨ', 'ⶮ', 'ⶰ', 'ⶶ', 'ⶸ', 'ⶾ', 'ⷀ', 'ⷆ', 'ⷈ', 'ⷎ', 'ⷐ', 'ⷖ', 'ⷘ', 'ⷞ', 'ぁ', 'ゖ', 'ァ', 'ヺ', 'ㄅ', 'ㄯ', 'ㄱ', 'ㆎ', 'ㆠ', 'ㆺ', 'ㇰ', 'ㇿ', '㐀', '䶵', '一', '鿯', 'ꀀ', 'ꀔ', 'ꀖ', 'ꒌ', 'ꓐ', 'ꓷ', 'ꔀ', 'ꘋ', 'ꘐ', 'ꘟ', 'ꘪ', 'ꘫ', 'ꚠ', 'ꛥ', 'ꟻ', 'ꠁ', 'ꠃ', 'ꠅ', 'ꠇ', 'ꠊ', 'ꠌ', 'ꠢ', 'ꡀ', 'ꡳ', 'ꢂ', 'ꢳ', 'ꣲ', 'ꣷ', 'ꣽ', 'ꣾ', 'ꤊ', 'ꤥ', 'ꤰ', 'ꥆ', 'ꥠ', 'ꥼ', 'ꦄ', 'ꦲ', 'ꧠ', 'ꧤ', 'ꧧ', 'ꧯ', 'ꧺ', 'ꧾ', 'ꨀ', 'ꨨ', 'ꩀ', 'ꩂ', 'ꩄ', 'ꩋ', 'ꩠ', 'ꩯ', 'ꩱ', 'ꩶ', 'ꩾ', 'ꪯ', 'ꪵ', 'ꪶ', 'ꪹ', 'ꪽ', 'ꫛ', 'ꫜ', 'ꫠ', 'ꫪ', 'ꬁ', 'ꬆ', 'ꬉ', 'ꬎ', 'ꬑ', 'ꬖ', 'ꬠ', 'ꬦ', 'ꬨ', 'ꬮ', 'ꯀ', 'ꯢ', '가', '힣', 'ힰ', 'ퟆ', 'ퟋ', 'ퟻ', '豈', '舘', '並', '龎', 'ײַ', 'ﬨ', 'שׁ', 'זּ', 'טּ', 'לּ', 'נּ', 'סּ', 'ףּ', 'פּ', 'צּ', 'ﮱ', 'ﯓ', 'ﴽ', 'ﵐ', 'ﶏ', 'ﶒ', 'ﷇ', 'ﷰ', 'ﷻ', 'ﹰ', 'ﹴ', 'ﹶ', 'ﻼ', 'ｦ', 'ｯ', 'ｱ', 'ﾝ', 'ﾠ', 'ﾾ', 'ￂ', 'ￇ', 'ￊ', 'ￏ', 'ￒ', 'ￗ', 'ￚ', 'ￜ'}, @@ -12740,9 +12743,9 @@ var g = &grammar{ }, { name: "Lt", - pos: position{line: 1485, col: 1, offset: 48352}, + pos: position{line: 1487, col: 1, offset: 48255}, expr: &charClassMatcher{ - pos: position{line: 1485, col: 6, offset: 48357}, + pos: position{line: 1487, col: 6, offset: 48260}, val: "[\\u01C5\\u01C8\\u01CB\\u01F2\\u1F88-\\u1F8F\\u1F98-\\u1F9F\\u1FA8-\\u1FAF\\u1FBC\\u1FCC\\u1FFC]", chars: []rune{'Dž', 'Lj', 'Nj', 'Dz', 'ᾼ', 'ῌ', 'ῼ'}, ranges: []rune{'ᾈ', 'ᾏ', 'ᾘ', 'ᾟ', 'ᾨ', 'ᾯ'}, @@ -12752,9 +12755,9 @@ var g = &grammar{ }, { name: "Lu", - pos: position{line: 1488, col: 1, offset: 48463}, + pos: position{line: 1490, col: 1, offset: 48366}, expr: &charClassMatcher{ - pos: position{line: 1488, col: 6, offset: 48468}, + pos: position{line: 1490, col: 6, offset: 48371}, 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', 'ℭ', 'ℰ', 'ℳ', 'ℾ', 'ℿ', 'Ⰰ', 'Ⱞ', 'Ɫ', 'Ɽ', 'Ɑ', 'Ɒ', 'Ȿ', 'Ⲁ', 'Ᵹ', 'Ꝿ', 'Ɦ', 'Ɪ', 'Ʞ', 'Ꞵ', 'Ａ', 'Ｚ'}, @@ -12764,9 +12767,9 @@ var g = &grammar{ }, { name: "Mc", - pos: position{line: 1491, col: 1, offset: 52469}, + pos: position{line: 1493, col: 1, offset: 52372}, expr: &charClassMatcher{ - pos: position{line: 1491, col: 6, offset: 52474}, + pos: position{line: 1493, col: 6, offset: 52377}, 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{'ा', 'ी', 'ॉ', 'ौ', 'ॎ', 'ॏ', 'ং', 'ঃ', 'া', 'ী', 'ে', 'ৈ', 'ো', 'ৌ', 'ਾ', 'ੀ', 'ા', 'ી', 'ો', 'ૌ', 'ଂ', 'ଃ', 'େ', 'ୈ', 'ୋ', 'ୌ', 'ா', 'ி', 'ு', 'ூ', 'ெ', 'ை', 'ொ', 'ௌ', 'ఁ', 'ః', 'ు', 'ౄ', 'ಂ', 'ಃ', 'ೀ', 'ೄ', 'ೇ', 'ೈ', 'ೊ', 'ೋ', 'ೕ', 'ೖ', 'ം', 'ഃ', 'ാ', 'ീ', 'െ', 'ൈ', 'ൊ', 'ൌ', 'ං', 'ඃ', 'ා', 'ෑ', 'ෘ', 'ෟ', 'ෲ', 'ෳ', '༾', '༿', 'ါ', 'ာ', 'ျ', 'ြ', 'ၖ', 'ၗ', 'ၢ', 'ၤ', 'ၧ', 'ၭ', 'ႃ', 'ႄ', 'ႇ', 'ႌ', 'ႚ', 'ႜ', 'ើ', 'ៅ', 'ះ', 'ៈ', 'ᤣ', 'ᤦ', 'ᤩ', 'ᤫ', 'ᤰ', 'ᤱ', 'ᤳ', 'ᤸ', 'ᨙ', 'ᨚ', 'ᩣ', 'ᩤ', 'ᩭ', 'ᩲ', 'ᬽ', 'ᭁ', 'ᭃ', '᭄', 'ᮦ', 'ᮧ', 'ᯪ', 'ᯬ', '᯲', '᯳', 'ᰤ', 'ᰫ', 'ᰴ', 'ᰵ', 'ᳲ', 'ᳳ', '〮', '〯', 'ꠣ', 'ꠤ', 'ꢀ', 'ꢁ', 'ꢴ', 'ꣃ', 'ꥒ', '꥓', 'ꦴ', 'ꦵ', 'ꦺ', 'ꦻ', 'ꦽ', '꧀', 'ꨯ', 'ꨰ', 'ꨳ', 'ꨴ', 'ꫮ', 'ꫯ', 'ꯣ', 'ꯤ', 'ꯦ', 'ꯧ', 'ꯩ', 'ꯪ'}, @@ -12776,9 +12779,9 @@ var g = &grammar{ }, { name: "Mn", - pos: position{line: 1494, col: 1, offset: 53662}, + pos: position{line: 1496, col: 1, offset: 53565}, expr: &charClassMatcher{ - pos: position{line: 1494, col: 6, offset: 53667}, + pos: position{line: 1496, col: 6, offset: 53570}, 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{'̀', 'ͯ', '҃', '҇', '֑', 'ֽ', 'ׁ', 'ׂ', 'ׄ', 'ׅ', 'ؐ', 'ؚ', 'ً', 'ٟ', 'ۖ', 'ۜ', '۟', 'ۤ', 'ۧ', 'ۨ', '۪', 'ۭ', 'ܰ', '݊', 'ަ', 'ް', '߫', '߳', 'ࠖ', '࠙', 'ࠛ', 'ࠣ', 'ࠥ', 'ࠧ', 'ࠩ', '࠭', '࡙', '࡛', '࣓', '࣡', 'ࣣ', 'ं', 'ु', 'ै', '॑', 'ॗ', 'ॢ', 'ॣ', 'ু', 'ৄ', 'ৢ', 'ৣ', 'ਁ', 'ਂ', 'ੁ', 'ੂ', 'ੇ', 'ੈ', 'ੋ', '੍', 'ੰ', 'ੱ', 'ઁ', 'ં', 'ુ', 'ૅ', 'ે', 'ૈ', 'ૢ', 'ૣ', 'ૺ', '૿', 'ୁ', 'ୄ', 'ୢ', 'ୣ', 'ా', 'ీ', 'ె', 'ై', 'ొ', '్', 'ౕ', 'ౖ', 'ౢ', 'ౣ', 'ೌ', '್', 'ೢ', 'ೣ', 'ഀ', 'ഁ', '഻', '഼', 'ു', 'ൄ', 'ൢ', 'ൣ', 'ි', 'ු', 'ิ', 'ฺ', '็', '๎', 'ິ', 'ູ', 'ົ', 'ຼ', '່', 'ໍ', '༘', '༙', 'ཱ', 'ཾ', 'ྀ', '྄', '྆', '྇', 'ྍ', 'ྗ', 'ྙ', 'ྼ', 'ိ', 'ူ', 'ဲ', '့', '္', '်', 'ွ', 'ှ', 'ၘ', 'ၙ', 'ၞ', 'ၠ', 'ၱ', 'ၴ', 'ႅ', 'ႆ', '፝', '፟', 'ᜒ', '᜔', 'ᜲ', '᜴', 'ᝒ', 'ᝓ', 'ᝲ', 'ᝳ', '឴', '឵', 'ិ', 'ួ', '៉', '៓', '᠋', '᠍', 'ᢅ', 'ᢆ', 'ᤠ', 'ᤢ', 'ᤧ', 'ᤨ', '᤹', '᤻', 'ᨗ', 'ᨘ', 'ᩘ', 'ᩞ', 'ᩥ', 'ᩬ', 'ᩳ', '᩼', '᪰', '᪽', 'ᬀ', 'ᬃ', 'ᬶ', 'ᬺ', '᭫', '᭳', 'ᮀ', 'ᮁ', 'ᮢ', 'ᮥ', 'ᮨ', 'ᮩ', '᮫', 'ᮭ', 'ᯨ', 'ᯩ', 'ᯯ', 'ᯱ', 'ᰬ', 'ᰳ', 'ᰶ', '᰷', '᳐', '᳒', '᳔', '᳠', '᳢', '᳨', '᳸', '᳹', '᷀', '᷹', '᷻', '᷿', '⃐', '⃜', '⃥', '⃰', '⳯', '⳱', 'ⷠ', 'ⷿ', '〪', '〭', '゙', '゚', 'ꙴ', '꙽', 'ꚞ', 'ꚟ', '꛰', '꛱', 'ꠥ', 'ꠦ', '꣄', 'ꣅ', '꣠', '꣱', 'ꤦ', '꤭', 'ꥇ', 'ꥑ', 'ꦀ', 'ꦂ', 'ꦶ', 'ꦹ', 'ꨩ', 'ꨮ', 'ꨱ', 'ꨲ', 'ꨵ', 'ꨶ', 'ꪲ', 'ꪴ', 'ꪷ', 'ꪸ', 'ꪾ', '꪿', 'ꫬ', 'ꫭ', '︀', '️', '︠', '︯'}, @@ -12788,9 +12791,9 @@ var g = &grammar{ }, { name: "Nd", - pos: position{line: 1497, col: 1, offset: 55847}, + pos: position{line: 1499, col: 1, offset: 55750}, expr: &charClassMatcher{ - pos: position{line: 1497, col: 6, offset: 55852}, + pos: position{line: 1499, col: 6, offset: 55755}, 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, @@ -12799,9 +12802,9 @@ var g = &grammar{ }, { name: "Nl", - pos: position{line: 1500, col: 1, offset: 56355}, + pos: position{line: 1502, col: 1, offset: 56258}, expr: &charClassMatcher{ - pos: position{line: 1500, col: 6, offset: 56360}, + pos: position{line: 1502, col: 6, offset: 56263}, val: "[\\u16EE-\\u16F0\\u2160-\\u2182\\u2185-\\u2188\\u3007\\u3021-\\u3029\\u3038-\\u303A\\uA6E6-\\uA6EF]", chars: []rune{'〇'}, ranges: []rune{'ᛮ', 'ᛰ', 'Ⅰ', 'ↂ', 'ↅ', 'ↈ', '〡', '〩', '〸', '〺', 'ꛦ', 'ꛯ'}, @@ -12811,9 +12814,9 @@ var g = &grammar{ }, { name: "Pc", - pos: position{line: 1503, col: 1, offset: 56474}, + pos: position{line: 1505, col: 1, offset: 56377}, expr: &charClassMatcher{ - pos: position{line: 1503, col: 6, offset: 56479}, + pos: position{line: 1505, col: 6, offset: 56382}, val: "[\\u005F\\u203F-\\u2040\\u2054\\uFE33-\\uFE34\\uFE4D-\\uFE4F\\uFF3F]", chars: []rune{'_', '⁔', '＿'}, ranges: []rune{'‿', '⁀', '︳', '︴', '﹍', '﹏'}, @@ -12823,9 +12826,9 @@ var g = &grammar{ }, { name: "Zs", - pos: position{line: 1506, col: 1, offset: 56560}, + pos: position{line: 1508, col: 1, offset: 56463}, expr: &charClassMatcher{ - pos: position{line: 1506, col: 6, offset: 56565}, + pos: position{line: 1508, col: 6, offset: 56468}, val: "[\\u0020\\u00A0\\u1680\\u2000-\\u200A\\u202F\\u205F\\u3000]", chars: []rune{' ', '\u00a0', '\u1680', '\u202f', '\u205f', '\u3000'}, ranges: []rune{'\u2000', '\u200a'}, @@ -12835,56 +12838,56 @@ var g = &grammar{ }, { name: "SourceCharacter", - pos: position{line: 1508, col: 1, offset: 56618}, + pos: position{line: 1510, col: 1, offset: 56521}, expr: &anyMatcher{ - line: 1509, col: 5, offset: 56638, + line: 1511, col: 5, offset: 56541, }, }, { name: "WhiteSpace", displayName: "\"whitespace\"", - pos: position{line: 1511, col: 1, offset: 56641}, + pos: position{line: 1513, col: 1, offset: 56544}, expr: &choiceExpr{ - pos: position{line: 1512, col: 5, offset: 56669}, + pos: position{line: 1514, col: 5, offset: 56572}, alternatives: []any{ &litMatcher{ - pos: position{line: 1512, col: 5, offset: 56669}, + pos: position{line: 1514, col: 5, offset: 56572}, val: "\t", ignoreCase: false, want: "\"\\t\"", }, &litMatcher{ - pos: position{line: 1513, col: 5, offset: 56678}, + pos: position{line: 1515, col: 5, offset: 56581}, val: "\v", ignoreCase: false, want: "\"\\v\"", }, &litMatcher{ - pos: position{line: 1514, col: 5, offset: 56687}, + pos: position{line: 1516, col: 5, offset: 56590}, val: "\f", ignoreCase: false, want: "\"\\f\"", }, &litMatcher{ - pos: position{line: 1515, col: 5, offset: 56696}, + pos: position{line: 1517, col: 5, offset: 56599}, val: " ", ignoreCase: false, want: "\" \"", }, &litMatcher{ - pos: position{line: 1516, col: 5, offset: 56704}, + pos: position{line: 1518, col: 5, offset: 56607}, val: "\u00a0", ignoreCase: false, want: "\"\\u00a0\"", }, &litMatcher{ - pos: position{line: 1517, col: 5, offset: 56717}, + pos: position{line: 1519, col: 5, offset: 56620}, val: "\ufeff", ignoreCase: false, want: "\"\\ufeff\"", }, &ruleRefExpr{ - pos: position{line: 1518, col: 5, offset: 56730}, + pos: position{line: 1520, col: 5, offset: 56633}, name: "Zs", }, }, @@ -12892,9 +12895,9 @@ var g = &grammar{ }, { name: "LineTerminator", - pos: position{line: 1520, col: 1, offset: 56734}, + pos: position{line: 1522, col: 1, offset: 56637}, expr: &charClassMatcher{ - pos: position{line: 1521, col: 5, offset: 56753}, + pos: position{line: 1523, col: 5, offset: 56656}, val: "[\\n\\r\\u2028\\u2029]", chars: []rune{'\n', '\r', '\u2028', '\u2029'}, ignoreCase: false, @@ -12904,47 +12907,47 @@ var g = &grammar{ { name: "Comment", displayName: "\"comment\"", - pos: position{line: 1527, col: 1, offset: 57083}, + pos: position{line: 1529, col: 1, offset: 56986}, expr: &ruleRefExpr{ - pos: position{line: 1530, col: 5, offset: 57154}, + pos: position{line: 1532, col: 5, offset: 57057}, name: "SingleLineComment", }, }, { name: "MultiLineComment", - pos: position{line: 1532, col: 1, offset: 57173}, + pos: position{line: 1534, col: 1, offset: 57076}, expr: &seqExpr{ - pos: position{line: 1533, col: 5, offset: 57194}, + pos: position{line: 1535, col: 5, offset: 57097}, exprs: []any{ &litMatcher{ - pos: position{line: 1533, col: 5, offset: 57194}, + pos: position{line: 1535, col: 5, offset: 57097}, val: "/*", ignoreCase: false, want: "\"/*\"", }, &zeroOrMoreExpr{ - pos: position{line: 1533, col: 10, offset: 57199}, + pos: position{line: 1535, col: 10, offset: 57102}, expr: &seqExpr{ - pos: position{line: 1533, col: 11, offset: 57200}, + pos: position{line: 1535, col: 11, offset: 57103}, exprs: []any{ ¬Expr{ - pos: position{line: 1533, col: 11, offset: 57200}, + pos: position{line: 1535, col: 11, offset: 57103}, expr: &litMatcher{ - pos: position{line: 1533, col: 12, offset: 57201}, + pos: position{line: 1535, col: 12, offset: 57104}, val: "*/", ignoreCase: false, want: "\"*/\"", }, }, &ruleRefExpr{ - pos: position{line: 1533, col: 17, offset: 57206}, + pos: position{line: 1535, col: 17, offset: 57109}, name: "SourceCharacter", }, }, }, }, &litMatcher{ - pos: position{line: 1533, col: 35, offset: 57224}, + pos: position{line: 1535, col: 35, offset: 57127}, val: "*/", ignoreCase: false, want: "\"*/\"", @@ -12954,30 +12957,30 @@ var g = &grammar{ }, { name: "SingleLineComment", - pos: position{line: 1535, col: 1, offset: 57230}, + pos: position{line: 1537, col: 1, offset: 57133}, expr: &seqExpr{ - pos: position{line: 1536, col: 5, offset: 57252}, + pos: position{line: 1538, col: 5, offset: 57155}, exprs: []any{ &litMatcher{ - pos: position{line: 1536, col: 5, offset: 57252}, + pos: position{line: 1538, col: 5, offset: 57155}, val: "//", ignoreCase: false, want: "\"//\"", }, &zeroOrMoreExpr{ - pos: position{line: 1536, col: 10, offset: 57257}, + pos: position{line: 1538, col: 10, offset: 57160}, expr: &seqExpr{ - pos: position{line: 1536, col: 11, offset: 57258}, + pos: position{line: 1538, col: 11, offset: 57161}, exprs: []any{ ¬Expr{ - pos: position{line: 1536, col: 11, offset: 57258}, + pos: position{line: 1538, col: 11, offset: 57161}, expr: &ruleRefExpr{ - pos: position{line: 1536, col: 12, offset: 57259}, + pos: position{line: 1538, col: 12, offset: 57162}, name: "LineTerminator", }, }, &ruleRefExpr{ - pos: position{line: 1536, col: 27, offset: 57274}, + pos: position{line: 1538, col: 27, offset: 57177}, name: "SourceCharacter", }, }, @@ -12988,19 +12991,19 @@ var g = &grammar{ }, { name: "EOL", - pos: position{line: 1538, col: 1, offset: 57293}, + pos: position{line: 1540, col: 1, offset: 57196}, expr: &seqExpr{ - pos: position{line: 1538, col: 7, offset: 57299}, + pos: position{line: 1540, col: 7, offset: 57202}, exprs: []any{ &zeroOrMoreExpr{ - pos: position{line: 1538, col: 7, offset: 57299}, + pos: position{line: 1540, col: 7, offset: 57202}, expr: &ruleRefExpr{ - pos: position{line: 1538, col: 7, offset: 57299}, + pos: position{line: 1540, col: 7, offset: 57202}, name: "WhiteSpace", }, }, &ruleRefExpr{ - pos: position{line: 1538, col: 19, offset: 57311}, + pos: position{line: 1540, col: 19, offset: 57214}, name: "LineTerminator", }, }, @@ -13008,16 +13011,16 @@ var g = &grammar{ }, { name: "EOT", - pos: position{line: 1540, col: 1, offset: 57327}, + pos: position{line: 1542, col: 1, offset: 57230}, expr: &choiceExpr{ - pos: position{line: 1540, col: 7, offset: 57333}, + pos: position{line: 1542, col: 7, offset: 57236}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1540, col: 7, offset: 57333}, + pos: position{line: 1542, col: 7, offset: 57236}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1540, col: 11, offset: 57337}, + pos: position{line: 1542, col: 11, offset: 57240}, name: "EOF", }, }, @@ -13025,21 +13028,21 @@ var g = &grammar{ }, { name: "EOF", - pos: position{line: 1542, col: 1, offset: 57342}, + pos: position{line: 1544, col: 1, offset: 57245}, expr: ¬Expr{ - pos: position{line: 1542, col: 7, offset: 57348}, + pos: position{line: 1544, col: 7, offset: 57251}, expr: &anyMatcher{ - line: 1542, col: 8, offset: 57349, + line: 1544, col: 8, offset: 57252, }, }, }, { name: "EOKW", - pos: position{line: 1544, col: 1, offset: 57352}, + pos: position{line: 1546, col: 1, offset: 57255}, expr: ¬Expr{ - pos: position{line: 1544, col: 8, offset: 57359}, + pos: position{line: 1546, col: 8, offset: 57262}, expr: &ruleRefExpr{ - pos: position{line: 1544, col: 9, offset: 57360}, + pos: position{line: 1546, col: 9, offset: 57263}, name: "KeyWordChars", }, }, @@ -13109,32 +13112,15 @@ func (p *parser) callonDecl1() (any, error) { return p.cur.onDecl1(stack["v"]) } -func (c *current) onConstDecl2(id, expr any) (any, error) { +func (c *current) onConstDecl1(id, expr any) (any, error) { return map[string]interface{}{"kind": "ConstDecl", "name": id, "expr": expr}, nil } -func (p *parser) callonConstDecl2() (any, error) { - stack := p.vstack[len(p.vstack)-1] - _ = stack - return p.cur.onConstDecl2(stack["id"], stack["expr"]) -} - -func (c *current) onConstDecl13(id, typ any) (any, error) { - return map[string]interface{}{ - - "kind": "ConstDecl", - - "name": id, - - "expr": map[string]interface{}{"kind": "TypeValue", "value": map[string]interface{}{"kind": "TypeDef", "name": id, "type": typ}}}, nil - -} - -func (p *parser) callonConstDecl13() (any, error) { +func (p *parser) callonConstDecl1() (any, error) { stack := p.vstack[len(p.vstack)-1] _ = stack - return p.cur.onConstDecl13(stack["id"], stack["typ"]) + return p.cur.onConstDecl1(stack["id"], stack["expr"]) } func (c *current) onFuncDecl1(id, params, expr any) (any, error) { @@ -13195,6 +13181,23 @@ func (p *parser) callonOpDeclBody5() (any, error) { return p.cur.onOpDeclBody5(stack["seq"]) } +func (c *current) onTypeDecl1(id, typ any) (any, error) { + return map[string]interface{}{ + + "kind": "TypeDecl", + + "name": id, + + "type": typ}, nil + +} + +func (p *parser) callonTypeDecl1() (any, error) { + stack := p.vstack[len(p.vstack)-1] + _ = stack + return p.cur.onTypeDecl1(stack["id"], stack["typ"]) +} + func (c *current) onOperation2(paths any) (any, error) { return map[string]interface{}{"kind": "Parallel", "paths": paths}, nil diff --git a/compiler/parser/parser.peg b/compiler/parser/parser.peg index b1a184fdc9..b0e3ee372c 100644 --- a/compiler/parser/parser.peg +++ b/compiler/parser/parser.peg @@ -37,18 +37,12 @@ Seq SeqTail = __ Pipe __ o:Operation { RETURN(o) } Decl - = v:(ConstDecl / FuncDecl / OpDecl) _ { RETURN(v) } + = v:(ConstDecl / FuncDecl / OpDecl / TypeDecl) _ { RETURN(v) } ConstDecl = "const" _ id:IdentifierName __ "=" __ expr:Expr { RETURN(MAP("kind": "ConstDecl", "name": id, "expr": expr)) } - / "type" _ id:(IdentifierName / QuotedString) __ "=" __ typ:Type { - RETURN(MAP( - "kind": "ConstDecl", - "name": id, - "expr": MAP("kind": "TypeValue", "value": MAP("kind": "TypeDef", "name": id, "type": typ)))) - } FuncDecl = "func" _ id:IdentifierName __ "(" __ params:IdentifierNames? __ ")" __ ":" __ "(" __ expr:Expr __ ")" { @@ -72,6 +66,14 @@ OpDeclBody = scope:Scope { RETURN(ARRAY(scope)) } / seq:Seq { RETURN(seq) } +TypeDecl + = "type" _ id:(IdentifierName / QuotedString) __ "=" __ typ:Type { + RETURN(MAP( + "kind": "TypeDecl", + "name": id, + "type": typ)) + } + Operation = "fork" __ "(" paths:Leg+ __ ")" { RETURN(MAP("kind": "Parallel", "paths": paths)) diff --git a/compiler/semantic/op.go b/compiler/semantic/op.go index 89ff42de08..fddebd0082 100644 --- a/compiler/semantic/op.go +++ b/compiler/semantic/op.go @@ -868,6 +868,12 @@ func (a *analyzer) semDecls(decls []ast.Decl) ([]dag.Def, []*dag.Func, error) { if err := a.semOpDecl(d); err != nil { return nil, nil, err } + case *ast.TypeDecl: + c, err := a.semTypeDecl(d) + if err != nil { + return nil, nil, err + } + consts = append(consts, c) default: return nil, nil, fmt.Errorf("invalid declaration type %T", d) } @@ -893,6 +899,21 @@ func (a *analyzer) semConstDecl(c *ast.ConstDecl) (dag.Def, error) { }, nil } +func (a *analyzer) semTypeDecl(d *ast.TypeDecl) (dag.Def, error) { + typ, err := a.semType(d.Type) + if err != nil { + return dag.Def{}, err + } + e := &dag.Literal{ + Kind: "Literal", + Value: fmt.Sprintf("<%s=%s>", zson.QuotedName(d.Name), typ), + } + if err := a.scope.DefineConst(a.zctx, d.Name, e); err != nil { + return dag.Def{}, err + } + return dag.Def{Name: d.Name, Expr: e}, nil +} + func (a *analyzer) semFuncDecls(decls []*ast.FuncDecl) ([]*dag.Func, error) { funcs := make([]*dag.Func, 0, len(decls)) for _, d := range decls { diff --git a/zfmt/ast.go b/zfmt/ast.go index a49af1c104..f0a41051aa 100644 --- a/zfmt/ast.go +++ b/zfmt/ast.go @@ -316,6 +316,9 @@ func (c *canon) decl(d ast.Decl) { case *ast.ConstDecl: c.write("const %s = ", d.Name) c.expr(d.Expr, "") + case *ast.TypeDecl: + c.write("type %s = ", d.Name) + c.typ(d.Type) case *ast.FuncDecl: c.write("func %s(", d.Name) for i := range d.Params {