From 5a0232a1148b53f428d2453f022e116d39cd0f91 Mon Sep 17 00:00:00 2001 From: Steve McCanne Date: Tue, 5 Nov 2024 11:12:25 -0800 Subject: [PATCH] Bring back the "|" symbol and eliminate search rakes (#5436) This commit brings back the "|" symbol for pipeline separator while retaining the "|>" as an option. The latter is needed to exit a SQL expression back into a pipe when a SQL expression is immediately followed by a shortcut that begins with an identifier (implied-yield expression or agg function). For any valid query without shortcuts, there is never an ambiguity between the bitwise OR "|" and pipe separator because keywords cannot be used as identifiers. The argument that such ambiguity is present made in the Google SQL pipes paper presumably assumes a one-token lookahead parser, which is not the case here. Toward this end, we changed our grammar to disallow keywords as identifier and added the backtick-string syntax to escape any string as identifier. Furthermore, we arranged for the expression grammar to include "|" for bitwise OR in SQL expression but omit it in any non-SQL pipe operator. This means any valid SQL queries will continue to be valid SuperSQL queries (inclusive of bitwise OR). Moreover, expressions in pipeline operators do not have any pipe-character ambiguity with shortcuts because bitwise-OR is omitted. We can add bitwise functionality as named functions in place of the archaic C-style syntax (which can work in both SQL and pipeline operators). Best practice will be to use these functions over the old bitwise syntax. We also removed search syntax as a shortcut and now require a "?" (or "search" keyword) to signal the keyword search operator. This means typos that happen to compile into unintended searches are no longer accepted by the grammar thereby eliminating the so-called search rake. * disable legacy bitwise-OR syntax in SQL expressions Ok as disccused, I'm pushing these changes to remove bitwise-OR from the SQL expression syntax, thus removing the ambiguity with the SQL shortcuts. If/when users want to run SuperSQL queries on legacy SQL with bitwise OR, we can put this grammar back in place but under a flag to enable it only as needed. In the meantime, wew ill introduce bitwise_or(), bitwise_and(), etc named functions in subsequent PR. --- cmd/super/ztests/ast.yaml | 4 +- cmd/super/ztests/diropt1.yaml | 2 +- cmd/super/ztests/diropt2.yaml | 2 +- cmd/super/ztests/stop-on-error-1.yaml | 2 +- cmd/super/ztests/stop-on-error-2.yaml | 2 +- cmd/super/ztests/stop-on-error-3.yaml | 2 +- compiler/parser/parser.go | 8244 +++++++++-------- compiler/parser/parser.peg | 61 +- compiler/parser/valid.zed | 26 +- compiler/parser/ztests/bytes.yaml | 2 +- compiler/parser/ztests/comments.yaml | 2 +- compiler/parser/ztests/esc-quote.yaml | 2 +- compiler/parser/ztests/from.yaml | 8 +- compiler/parser/ztests/glob-numeric.yaml | 2 +- compiler/parser/ztests/in-requires-space.yaml | 2 +- compiler/parser/ztests/ipv6.yaml | 2 +- .../parser/ztests/leading-quotation-mark.yaml | 2 +- compiler/parser/ztests/match-double.yaml | 2 +- compiler/parser/ztests/match-is.yaml | 3 +- compiler/parser/ztests/match-parentheses.yaml | 2 +- compiler/parser/ztests/over-expr.yaml | 10 +- compiler/parser/ztests/reserved-word-ids.yaml | 7 - compiler/parser/ztests/search.yaml | 2 +- compiler/parser/ztests/type-guard.yaml | 2 +- compiler/parser/ztests/unicode-keyword.yaml | 2 +- compiler/parser/ztests/where-search.yaml | 2 +- compiler/ztests/from-pass.yaml | 2 +- compiler/ztests/merge-error.yaml | 2 +- compiler/ztests/pushdown.yaml | 2 +- compiler/ztests/search-regexp-not-glob.yaml | 3 +- compiler/ztests/search-type-value.yaml | 3 +- compiler/ztests/sql/pipe-ambiguity.yaml | 30 + docs/language/operators/search.md | 6 +- docs/language/pipeline-model.md | 2 +- docs/language/search-expressions.md | 24 +- .../ztests/language-background-1.yaml | 2 +- .../ztests/language-background-2.yaml | 2 +- .../ztests/language-background-3.yaml | 2 +- .../ztests/language-background-4.yaml | 2 +- .../ztests/language-background-8.yaml | 2 +- .../language/ztests/language-operators-1.yaml | 2 +- docs/language/ztests/language-tldr-2.yaml | 2 +- docs/tutorials/schools.md | 40 +- docs/tutorials/zq.md | 8 +- lake/ztests/deterministic-merge.yaml | 4 +- lake/ztests/null-pool-key.yaml | 2 +- runtime/sam/expr/filter_test.go | 68 +- .../expr/ztests/filter-escaped-asterisk.yaml | 2 +- .../ztests/filter-escaped-equal-sign.yaml | 2 +- .../ztests/filter-unescaped-asterisk.yaml | 2 +- runtime/sam/expr/ztests/glob.yaml | 2 +- runtime/sam/expr/ztests/net-search.yaml | 2 +- runtime/sam/expr/ztests/regexp-escapes.yaml | 2 +- .../sam/expr/ztests/search-ip-primitive.yaml | 2 +- .../ztests/search-nested-field-regexp.yaml | 2 +- .../sam/expr/ztests/search-nested-field.yaml | 2 +- .../sam/expr/ztests/search-primitives.yaml | 2 +- .../expr/ztests/shape-cast-from-union.yaml | 2 +- .../op/exprswitch/ztests/switch-default.yaml | 2 +- runtime/sam/op/exprswitch/ztests/switch.yaml | 2 +- .../op/switcher/ztests/switch-default.yaml | 2 +- runtime/sam/op/switcher/ztests/switch.yaml | 2 +- runtime/sam/op/traverse/ztests/nested.yaml | 6 +- service/ztests/curl-query-split.yaml | 2 +- zfmt/ztests/over.yaml | 12 +- zfmt/ztests/parallel.yaml | 2 +- zfmt/ztests/type-value.yaml | 4 +- zio/anyio/ztests/bsup-gz.yaml | 2 +- zio/anyio/ztests/empty-input.yaml | 2 +- zio/anyio/ztests/json-array.yaml | 2 +- zio/anyio/ztests/jsup.yaml | 2 +- zio/anyio/ztests/ndjson-gz.yaml | 2 +- zio/anyio/ztests/ndjson-nonewline.yaml | 2 +- zio/anyio/ztests/ndjson.yaml | 2 +- zio/anyio/ztests/zeek-gz.yaml | 2 +- zio/anyio/ztests/zeek-nonewline.yaml | 2 +- zio/anyio/ztests/zeek.yaml | 2 +- zio/anyio/ztests/zjson.yaml | 2 +- zio/csvio/ztests/bool.yaml | 2 +- zio/csvio/ztests/bytes.yaml | 2 +- zio/csvio/ztests/different-types.yaml | 2 +- zio/csvio/ztests/duration.yaml | 2 +- zio/csvio/ztests/embedded-quotes.yaml | 2 +- zio/csvio/ztests/error.yaml | 2 +- zio/csvio/ztests/extraneous-quotes.yaml | 2 +- zio/csvio/ztests/float.yaml | 2 +- zio/csvio/ztests/int.yaml | 2 +- zio/csvio/ztests/ip.yaml | 2 +- zio/csvio/ztests/issue-2332.yaml | 2 +- zio/csvio/ztests/named.yaml | 2 +- zio/csvio/ztests/net.yaml | 2 +- zio/csvio/ztests/non-record-error.yaml | 2 +- zio/csvio/ztests/null.yaml | 2 +- zio/csvio/ztests/read-big.yaml | 2 +- zio/csvio/ztests/reader-delim.yaml | 2 +- zio/csvio/ztests/reader.yaml | 2 +- zio/csvio/ztests/record-flat.yaml | 2 +- zio/csvio/ztests/record-nested.yaml | 2 +- zio/csvio/ztests/string.yaml | 2 +- zio/csvio/ztests/time.yaml | 2 +- zio/csvio/ztests/type.yaml | 2 +- zio/csvio/ztests/uint.yaml | 2 +- zio/csvio/ztests/union.yaml | 2 +- zio/jsonio/ztests/duplicate-field.yaml | 2 +- zio/jsonio/ztests/empty-containers.yaml | 2 +- zio/jsonio/ztests/empty-objects.yaml | 2 +- .../ztests/first-token-is-empty-string.yaml | 2 +- zio/jsonio/ztests/format.yaml | 2 +- zio/jsonio/ztests/html-escaping-disabled.yaml | 2 +- zio/jsonio/ztests/hyphen.yaml | 2 +- zio/jsonio/ztests/json.yaml | 2 +- zio/jsonio/ztests/map-output.yaml | 2 +- zio/jsonio/ztests/nested-empties.yaml | 2 +- zio/jsonio/ztests/nested-nulls.yaml | 2 +- zio/jsonio/ztests/null-containers.yaml | 2 +- zio/jsonio/ztests/pretty.yaml | 2 +- zio/jsonio/ztests/reader.yaml | 2 +- zio/jsonio/ztests/time.yaml | 2 +- zio/jsonio/ztests/typedef.yaml | 2 +- zio/jsonio/ztests/types.yaml | 2 +- zio/jsonio/ztests/union-array.yaml | 2 +- zio/jsonio/ztests/union-output.yaml | 2 +- zio/lineio/ztests/reader.yaml | 2 +- zio/tableio/ztests/flatten.yaml | 2 +- zio/tableio/ztests/nested-record-named.yaml | 2 +- zio/tableio/ztests/non-record-error.yaml | 2 +- zio/textio/ztests/flatten.yaml | 2 +- zio/textio/ztests/nested-record-named.yaml | 2 +- zio/textio/ztests/vals.yaml | 2 +- zio/zeekio/ztests/close-date.yaml | 2 +- zio/zeekio/ztests/close-nodate.yaml | 2 +- zio/zeekio/ztests/duration.yaml | 2 +- zio/zeekio/ztests/empty-close.yaml | 2 +- zio/zeekio/ztests/empty.yaml | 2 +- zio/zeekio/ztests/flatten.yaml | 2 +- zio/zeekio/ztests/multizeek.yaml | 2 +- zio/zeekio/ztests/multizng.yaml | 2 +- zio/zeekio/ztests/nested-2.yaml | 2 +- ...ecord-name-is-prefix-of-another-field.yaml | 2 +- zio/zeekio/ztests/nested-record-named.yaml | 2 +- ...nested-record-with-nonadjacent-fields.yaml | 2 +- zio/zeekio/ztests/nested.yaml | 2 +- zio/zeekio/ztests/no-path.yaml | 2 +- zio/zeekio/ztests/path.yaml | 2 +- zio/zeekio/ztests/path2.yaml | 2 +- zio/zeekio/ztests/read-escaped-backslash.yaml | 2 +- zio/zeekio/ztests/string-set.yaml | 2 +- zio/zeekio/ztests/time.yaml | 2 +- zio/zeekio/ztests/trailing-whitespace.yaml | 2 +- zio/zeekio/ztests/types.yaml | 2 +- zio/zeekio/ztests/unset-in-array.yaml | 2 +- zio/zeekio/ztests/unset-in-record.yaml | 2 +- zio/zeekio/ztests/unset-time.yaml | 2 +- zio/zeekio/ztests/utf8.yaml | 2 +- zio/zeekio/ztests/zeek-format-test.yaml | 2 +- zio/zeekio/ztests/zeek-utf8-json.yaml | 2 +- zio/zeekio/ztests/zng-types.yaml | 2 +- zio/zjsonio/ztests/empty-records.yaml | 2 +- zio/zjsonio/ztests/union-array.yaml | 2 +- zio/zjsonio/ztests/union-nested.yaml | 2 +- zio/zjsonio/ztests/union-simple.yaml | 2 +- zio/zsonio/ztests/enum.yaml | 2 +- zio/zsonio/ztests/first-test.yaml | 2 +- zson/ztests/container-types.yaml | 2 +- zson/ztests/dup-fields.yaml | 2 +- zson/ztests/dynamic-typedef.yaml | 2 +- zson/ztests/empty-string-field.yaml | 2 +- zson/ztests/escaped-slash.yaml | 2 +- zson/ztests/float-cast.yaml | 2 +- zson/ztests/float.yaml | 2 +- zson/ztests/issue-2050.yaml | 2 +- zson/ztests/map.yaml | 2 +- zson/ztests/mixed-array.yaml | 2 +- zson/ztests/named-in-union.yaml | 2 +- zson/ztests/named-primitive.yaml | 2 +- zson/ztests/negative-duration.yaml | 2 +- zson/ztests/quoted-tv-field.yaml | 2 +- zson/ztests/set.yaml | 2 +- zson/ztests/type-name.yaml | 2 +- zson/ztests/type-value-empty-record.yaml | 2 +- zson/ztests/type-value.yaml | 2 +- ztests/field.yaml | 2 +- 182 files changed, 4500 insertions(+), 4395 deletions(-) delete mode 100644 compiler/parser/ztests/reserved-word-ids.yaml create mode 100644 compiler/ztests/sql/pipe-ambiguity.yaml diff --git a/cmd/super/ztests/ast.yaml b/cmd/super/ztests/ast.yaml index 017101b308..1626f6fb47 100644 --- a/cmd/super/ztests/ast.yaml +++ b/cmd/super/ztests/ast.yaml @@ -1,12 +1,12 @@ script: | - super -C -c a + super -C -c "?a" super -C -I query.zed super -C -I query.zed -c a inputs: - name: query.zed data: | - q + ? q outputs: - name: stdout diff --git a/cmd/super/ztests/diropt1.yaml b/cmd/super/ztests/diropt1.yaml index 29ce74760d..71b7d1e2d2 100644 --- a/cmd/super/ztests/diropt1.yaml +++ b/cmd/super/ztests/diropt1.yaml @@ -1,4 +1,4 @@ -script: super -f zeek -split out -c "*" - +script: super -f zeek -split out - inputs: - name: stdin diff --git a/cmd/super/ztests/diropt2.yaml b/cmd/super/ztests/diropt2.yaml index edef1d04c4..f757c22d94 100644 --- a/cmd/super/ztests/diropt2.yaml +++ b/cmd/super/ztests/diropt2.yaml @@ -1,5 +1,5 @@ script: | - super -z -split out -o foo -c "*" - + super -z -split out -o foo - inputs: - name: stdin diff --git a/cmd/super/ztests/stop-on-error-1.yaml b/cmd/super/ztests/stop-on-error-1.yaml index f8635b89a7..11c1a4fd99 100644 --- a/cmd/super/ztests/stop-on-error-1.yaml +++ b/cmd/super/ztests/stop-on-error-1.yaml @@ -1,5 +1,5 @@ script: | - ! super -c "*" good.jsup bad.jsup + ! super good.jsup bad.jsup inputs: - name: good.jsup diff --git a/cmd/super/ztests/stop-on-error-2.yaml b/cmd/super/ztests/stop-on-error-2.yaml index aef5f1dad3..8f160f3f0d 100644 --- a/cmd/super/ztests/stop-on-error-2.yaml +++ b/cmd/super/ztests/stop-on-error-2.yaml @@ -1,5 +1,5 @@ script: | - super -z -e=false -c "*" good.jsup bad.jsup + super -z -e=false good.jsup bad.jsup inputs: - name: good.jsup diff --git a/cmd/super/ztests/stop-on-error-3.yaml b/cmd/super/ztests/stop-on-error-3.yaml index 3bac1b3ef0..fda9c6c12f 100644 --- a/cmd/super/ztests/stop-on-error-3.yaml +++ b/cmd/super/ztests/stop-on-error-3.yaml @@ -1,6 +1,6 @@ # Second input has bad middle line (detection succeeds). script: | - ! super -z -e=false -c "*" good.jsup bad.jsup + ! super -z -e=false good.jsup bad.jsup inputs: - name: good.jsup diff --git a/compiler/parser/parser.go b/compiler/parser/parser.go index d57ccc3f58..646a818689 100644 --- a/compiler/parser/parser.go +++ b/compiler/parser/parser.go @@ -620,48 +620,44 @@ var g = &grammar{ }, { name: "LeanOp", - pos: position{line: 85, col: 1, offset: 2018}, + pos: position{line: 85, col: 1, offset: 2055}, expr: &choiceExpr{ - pos: position{line: 86, col: 5, offset: 2029}, + pos: position{line: 86, col: 5, offset: 2066}, alternatives: []any{ - &labeledExpr{ - pos: position{line: 86, col: 5, offset: 2029}, - label: "op", - expr: &ruleRefExpr{ - pos: position{line: 86, col: 8, offset: 2032}, - name: "Operator", - }, + &ruleRefExpr{ + pos: position{line: 86, col: 5, offset: 2066}, + name: "Operator", }, &actionExpr{ - pos: position{line: 87, col: 5, offset: 2045}, - run: (*parser).callonLeanOp4, + pos: position{line: 87, col: 5, offset: 2079}, + run: (*parser).callonLeanOp3, expr: &seqExpr{ - pos: position{line: 87, col: 5, offset: 2045}, + pos: position{line: 87, col: 5, offset: 2079}, exprs: []any{ &litMatcher{ - pos: position{line: 87, col: 5, offset: 2045}, + pos: position{line: 87, col: 5, offset: 2079}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 87, col: 9, offset: 2049}, + pos: position{line: 87, col: 9, offset: 2083}, name: "__", }, &labeledExpr{ - pos: position{line: 87, col: 12, offset: 2052}, + pos: position{line: 87, col: 12, offset: 2086}, label: "scope", expr: &ruleRefExpr{ - pos: position{line: 87, col: 18, offset: 2058}, + pos: position{line: 87, col: 18, offset: 2092}, name: "Scope", }, }, &ruleRefExpr{ - pos: position{line: 87, col: 24, offset: 2064}, + pos: position{line: 87, col: 24, offset: 2098}, name: "__", }, &litMatcher{ - pos: position{line: 87, col: 27, offset: 2067}, + pos: position{line: 87, col: 27, offset: 2101}, val: ")", ignoreCase: false, want: "\")\"", @@ -670,23 +666,23 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 88, col: 5, offset: 2097}, - run: (*parser).callonLeanOp12, + pos: position{line: 88, col: 5, offset: 2131}, + run: (*parser).callonLeanOp11, expr: &seqExpr{ - pos: position{line: 88, col: 5, offset: 2097}, + pos: position{line: 88, col: 5, offset: 2131}, exprs: []any{ &labeledExpr{ - pos: position{line: 88, col: 5, offset: 2097}, + pos: position{line: 88, col: 5, offset: 2131}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 88, col: 7, offset: 2099}, + pos: position{line: 88, col: 7, offset: 2133}, name: "OpAssignment", }, }, &andExpr{ - pos: position{line: 88, col: 20, offset: 2112}, + pos: position{line: 88, col: 20, offset: 2146}, expr: &ruleRefExpr{ - pos: position{line: 88, col: 21, offset: 2113}, + pos: position{line: 88, col: 21, offset: 2147}, name: "EndOfOp", }, }, @@ -694,39 +690,39 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 89, col: 5, offset: 2143}, - run: (*parser).callonLeanOp18, + pos: position{line: 89, col: 5, offset: 2177}, + run: (*parser).callonLeanOp17, expr: &seqExpr{ - pos: position{line: 89, col: 5, offset: 2143}, + pos: position{line: 89, col: 5, offset: 2177}, exprs: []any{ ¬Expr{ - pos: position{line: 89, col: 5, offset: 2143}, + pos: position{line: 89, col: 5, offset: 2177}, expr: &seqExpr{ - pos: position{line: 89, col: 7, offset: 2145}, + pos: position{line: 89, col: 7, offset: 2179}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 89, col: 7, offset: 2145}, + pos: position{line: 89, col: 7, offset: 2179}, name: "Function", }, &ruleRefExpr{ - pos: position{line: 89, col: 16, offset: 2154}, + pos: position{line: 89, col: 16, offset: 2188}, name: "EndOfOp", }, }, }, }, &labeledExpr{ - pos: position{line: 89, col: 25, offset: 2163}, + pos: position{line: 89, col: 25, offset: 2197}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 89, col: 27, offset: 2165}, + pos: position{line: 89, col: 27, offset: 2199}, name: "Aggregation", }, }, &andExpr{ - pos: position{line: 89, col: 39, offset: 2177}, + pos: position{line: 89, col: 39, offset: 2211}, expr: &ruleRefExpr{ - pos: position{line: 89, col: 40, offset: 2178}, + pos: position{line: 89, col: 40, offset: 2212}, name: "EndOfOp", }, }, @@ -734,41 +730,60 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 90, col: 5, offset: 2208}, - run: (*parser).callonLeanOp28, + pos: position{line: 90, col: 5, offset: 2242}, + run: (*parser).callonLeanOp27, expr: &seqExpr{ - pos: position{line: 90, col: 5, offset: 2208}, + pos: position{line: 90, col: 5, offset: 2242}, exprs: []any{ - &labeledExpr{ - pos: position{line: 90, col: 5, offset: 2208}, - label: "expr", - expr: &ruleRefExpr{ - pos: position{line: 90, col: 10, offset: 2213}, - name: "SearchBoolean", + ¬Expr{ + pos: position{line: 90, col: 5, offset: 2242}, + expr: &seqExpr{ + pos: position{line: 90, col: 7, offset: 2244}, + exprs: []any{ + &choiceExpr{ + pos: position{line: 90, col: 8, offset: 2245}, + alternatives: []any{ + &ruleRefExpr{ + pos: position{line: 90, col: 8, offset: 2245}, + name: "Identifier", + }, + &ruleRefExpr{ + pos: position{line: 90, col: 21, offset: 2258}, + name: "Literal", + }, + }, + }, + &ruleRefExpr{ + pos: position{line: 90, col: 30, offset: 2267}, + name: "__", + }, + &choiceExpr{ + pos: position{line: 90, col: 34, offset: 2271}, + alternatives: []any{ + &ruleRefExpr{ + pos: position{line: 90, col: 34, offset: 2271}, + name: "Pipe", + }, + &ruleRefExpr{ + pos: position{line: 90, col: 39, offset: 2276}, + name: "EOF", + }, + }, + }, + }, }, }, - &andExpr{ - pos: position{line: 90, col: 24, offset: 2227}, + &labeledExpr{ + pos: position{line: 90, col: 45, offset: 2282}, + label: "e", expr: &ruleRefExpr{ - pos: position{line: 90, col: 25, offset: 2228}, - name: "EndOfOp", + pos: position{line: 90, col: 47, offset: 2284}, + name: "Expr", }, }, }, }, }, - &actionExpr{ - pos: position{line: 93, col: 5, offset: 2325}, - run: (*parser).callonLeanOp34, - expr: &labeledExpr{ - pos: position{line: 93, col: 5, offset: 2325}, - label: "expr", - expr: &ruleRefExpr{ - pos: position{line: 93, col: 10, offset: 2330}, - name: "Expr", - }, - }, - }, }, }, leader: false, @@ -776,39 +791,45 @@ var g = &grammar{ }, { name: "EndOfOp", - pos: position{line: 97, col: 1, offset: 2421}, + pos: position{line: 94, col: 1, offset: 2372}, expr: &seqExpr{ - pos: position{line: 97, col: 11, offset: 2431}, + pos: position{line: 94, col: 11, offset: 2382}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 97, col: 11, offset: 2431}, + pos: position{line: 94, col: 11, offset: 2382}, name: "__", }, &choiceExpr{ - pos: position{line: 97, col: 15, offset: 2435}, + pos: position{line: 94, col: 15, offset: 2386}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 97, col: 15, offset: 2435}, + pos: position{line: 94, col: 15, offset: 2386}, name: "Pipe", }, &ruleRefExpr{ - pos: position{line: 97, col: 22, offset: 2442}, + pos: position{line: 94, col: 22, offset: 2393}, name: "SearchKeywordGuard", }, &litMatcher{ - pos: position{line: 97, col: 43, offset: 2463}, + pos: position{line: 94, col: 43, offset: 2414}, val: "=>", ignoreCase: false, want: "\"=>\"", }, &litMatcher{ - pos: position{line: 97, col: 50, offset: 2470}, + pos: position{line: 94, col: 50, offset: 2421}, val: ")", ignoreCase: false, want: "\")\"", }, + &litMatcher{ + pos: position{line: 94, col: 56, offset: 2427}, + val: ";", + ignoreCase: false, + want: "\";\"", + }, &ruleRefExpr{ - pos: position{line: 97, col: 56, offset: 2476}, + pos: position{line: 94, col: 62, offset: 2433}, name: "EOF", }, }, @@ -820,75 +841,86 @@ var g = &grammar{ }, { name: "Pipe", - pos: position{line: 98, col: 1, offset: 2481}, - expr: &litMatcher{ - pos: position{line: 98, col: 8, offset: 2488}, - val: "|>", - ignoreCase: false, - want: "\"|>\"", + pos: position{line: 95, col: 1, offset: 2438}, + expr: &choiceExpr{ + pos: position{line: 95, col: 8, offset: 2445}, + alternatives: []any{ + &litMatcher{ + pos: position{line: 95, col: 8, offset: 2445}, + val: "|>", + ignoreCase: false, + want: "\"|>\"", + }, + &litMatcher{ + pos: position{line: 95, col: 15, offset: 2452}, + val: "|", + ignoreCase: false, + want: "\"|\"", + }, + }, }, leader: false, leftRecursive: false, }, { name: "ExprGuard", - pos: position{line: 100, col: 1, offset: 2494}, + pos: position{line: 97, col: 1, offset: 2458}, expr: &seqExpr{ - pos: position{line: 100, col: 13, offset: 2506}, + pos: position{line: 97, col: 13, offset: 2470}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 100, col: 13, offset: 2506}, + pos: position{line: 97, col: 13, offset: 2470}, name: "__", }, &choiceExpr{ - pos: position{line: 100, col: 17, offset: 2510}, + pos: position{line: 97, col: 17, offset: 2474}, alternatives: []any{ &seqExpr{ - pos: position{line: 100, col: 18, offset: 2511}, + pos: position{line: 97, col: 18, offset: 2475}, exprs: []any{ ¬Expr{ - pos: position{line: 100, col: 18, offset: 2511}, + pos: position{line: 97, col: 18, offset: 2475}, expr: &litMatcher{ - pos: position{line: 100, col: 19, offset: 2512}, + pos: position{line: 97, col: 19, offset: 2476}, val: "=>", ignoreCase: false, want: "\"=>\"", }, }, &ruleRefExpr{ - pos: position{line: 100, col: 24, offset: 2517}, + pos: position{line: 97, col: 24, offset: 2481}, name: "Comparator", }, }, }, &ruleRefExpr{ - pos: position{line: 100, col: 38, offset: 2531}, + pos: position{line: 97, col: 38, offset: 2495}, name: "AdditiveOperator", }, &ruleRefExpr{ - pos: position{line: 100, col: 57, offset: 2550}, + pos: position{line: 97, col: 57, offset: 2514}, name: "MultiplicativeOperator", }, &litMatcher{ - pos: position{line: 100, col: 82, offset: 2575}, + pos: position{line: 97, col: 82, offset: 2539}, val: ":", ignoreCase: false, want: "\":\"", }, &litMatcher{ - pos: position{line: 100, col: 88, offset: 2581}, + pos: position{line: 97, col: 88, offset: 2545}, val: "(", ignoreCase: false, want: "\"(\"", }, &litMatcher{ - pos: position{line: 100, col: 94, offset: 2587}, + pos: position{line: 97, col: 94, offset: 2551}, val: "[", ignoreCase: false, want: "\"[\"", }, &litMatcher{ - pos: position{line: 100, col: 100, offset: 2593}, + pos: position{line: 97, col: 100, offset: 2557}, val: "~", ignoreCase: false, want: "\"~\"", @@ -902,65 +934,65 @@ var g = &grammar{ }, { name: "Comparator", - pos: position{line: 102, col: 1, offset: 2599}, + pos: position{line: 99, col: 1, offset: 2563}, expr: &actionExpr{ - pos: position{line: 102, col: 14, offset: 2612}, + pos: position{line: 99, col: 14, offset: 2576}, run: (*parser).callonComparator1, expr: &choiceExpr{ - pos: position{line: 102, col: 15, offset: 2613}, + pos: position{line: 99, col: 15, offset: 2577}, alternatives: []any{ &litMatcher{ - pos: position{line: 102, col: 15, offset: 2613}, + pos: position{line: 99, col: 15, offset: 2577}, val: "==", ignoreCase: false, want: "\"==\"", }, &litMatcher{ - pos: position{line: 102, col: 22, offset: 2620}, + pos: position{line: 99, col: 22, offset: 2584}, val: "=", ignoreCase: false, want: "\"=\"", }, &litMatcher{ - pos: position{line: 102, col: 28, offset: 2626}, + pos: position{line: 99, col: 28, offset: 2590}, val: "!=", ignoreCase: false, want: "\"!=\"", }, &litMatcher{ - pos: position{line: 102, col: 35, offset: 2633}, + pos: position{line: 99, col: 35, offset: 2597}, val: "<>", ignoreCase: false, want: "\"<>\"", }, &ruleRefExpr{ - pos: position{line: 102, col: 42, offset: 2640}, + pos: position{line: 99, col: 42, offset: 2604}, name: "IN", }, &ruleRefExpr{ - pos: position{line: 102, col: 47, offset: 2645}, + pos: position{line: 99, col: 47, offset: 2609}, name: "LIKE", }, &litMatcher{ - pos: position{line: 102, col: 54, offset: 2652}, + pos: position{line: 99, col: 54, offset: 2616}, val: "<=", ignoreCase: false, want: "\"<=\"", }, &litMatcher{ - pos: position{line: 102, col: 61, offset: 2659}, + pos: position{line: 99, col: 61, offset: 2623}, val: "<", ignoreCase: false, want: "\"<\"", }, &litMatcher{ - pos: position{line: 102, col: 67, offset: 2665}, + pos: position{line: 99, col: 67, offset: 2629}, val: ">=", ignoreCase: false, want: "\">=\"", }, &litMatcher{ - pos: position{line: 102, col: 74, offset: 2672}, + pos: position{line: 99, col: 74, offset: 2636}, val: ">", ignoreCase: false, want: "\">\"", @@ -973,28 +1005,28 @@ var g = &grammar{ }, { name: "SearchBoolean", - pos: position{line: 104, col: 1, offset: 2709}, + pos: position{line: 101, col: 1, offset: 2673}, expr: &actionExpr{ - pos: position{line: 105, col: 5, offset: 2727}, + pos: position{line: 102, col: 5, offset: 2691}, run: (*parser).callonSearchBoolean1, expr: &seqExpr{ - pos: position{line: 105, col: 5, offset: 2727}, + pos: position{line: 102, col: 5, offset: 2691}, exprs: []any{ &labeledExpr{ - pos: position{line: 105, col: 5, offset: 2727}, + pos: position{line: 102, col: 5, offset: 2691}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 105, col: 11, offset: 2733}, + pos: position{line: 102, col: 11, offset: 2697}, name: "SearchAnd", }, }, &labeledExpr{ - pos: position{line: 105, col: 21, offset: 2743}, + pos: position{line: 102, col: 21, offset: 2707}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 105, col: 26, offset: 2748}, + pos: position{line: 102, col: 26, offset: 2712}, expr: &ruleRefExpr{ - pos: position{line: 105, col: 26, offset: 2748}, + pos: position{line: 102, col: 26, offset: 2712}, name: "SearchOrTerm", }, }, @@ -1007,30 +1039,30 @@ var g = &grammar{ }, { name: "SearchOrTerm", - pos: position{line: 109, col: 1, offset: 2825}, + pos: position{line: 106, col: 1, offset: 2789}, expr: &actionExpr{ - pos: position{line: 109, col: 16, offset: 2840}, + pos: position{line: 106, col: 16, offset: 2804}, run: (*parser).callonSearchOrTerm1, expr: &seqExpr{ - pos: position{line: 109, col: 16, offset: 2840}, + pos: position{line: 106, col: 16, offset: 2804}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 109, col: 16, offset: 2840}, + pos: position{line: 106, col: 16, offset: 2804}, name: "_", }, &ruleRefExpr{ - pos: position{line: 109, col: 18, offset: 2842}, + pos: position{line: 106, col: 18, offset: 2806}, name: "OR", }, &ruleRefExpr{ - pos: position{line: 109, col: 21, offset: 2845}, + pos: position{line: 106, col: 21, offset: 2809}, name: "_", }, &labeledExpr{ - pos: position{line: 109, col: 23, offset: 2847}, + pos: position{line: 106, col: 23, offset: 2811}, label: "t", expr: &ruleRefExpr{ - pos: position{line: 109, col: 25, offset: 2849}, + pos: position{line: 106, col: 25, offset: 2813}, name: "SearchAnd", }, }, @@ -1042,73 +1074,73 @@ var g = &grammar{ }, { name: "SearchAnd", - pos: position{line: 111, col: 1, offset: 2891}, + pos: position{line: 108, col: 1, offset: 2855}, expr: &actionExpr{ - pos: position{line: 112, col: 5, offset: 2905}, + pos: position{line: 109, col: 5, offset: 2869}, run: (*parser).callonSearchAnd1, expr: &seqExpr{ - pos: position{line: 112, col: 5, offset: 2905}, + pos: position{line: 109, col: 5, offset: 2869}, exprs: []any{ &labeledExpr{ - pos: position{line: 112, col: 5, offset: 2905}, + pos: position{line: 109, col: 5, offset: 2869}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 112, col: 11, offset: 2911}, + pos: position{line: 109, col: 11, offset: 2875}, name: "SearchFactor", }, }, &labeledExpr{ - pos: position{line: 113, col: 5, offset: 2928}, + pos: position{line: 110, col: 5, offset: 2892}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 113, col: 10, offset: 2933}, + pos: position{line: 110, col: 10, offset: 2897}, expr: &actionExpr{ - pos: position{line: 113, col: 11, offset: 2934}, + pos: position{line: 110, col: 11, offset: 2898}, run: (*parser).callonSearchAnd7, expr: &seqExpr{ - pos: position{line: 113, col: 11, offset: 2934}, + pos: position{line: 110, col: 11, offset: 2898}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 113, col: 11, offset: 2934}, + pos: position{line: 110, col: 11, offset: 2898}, expr: &seqExpr{ - pos: position{line: 113, col: 12, offset: 2935}, + pos: position{line: 110, col: 12, offset: 2899}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 113, col: 12, offset: 2935}, + pos: position{line: 110, col: 12, offset: 2899}, name: "_", }, &ruleRefExpr{ - pos: position{line: 113, col: 14, offset: 2937}, + pos: position{line: 110, col: 14, offset: 2901}, name: "AND", }, }, }, }, &ruleRefExpr{ - pos: position{line: 113, col: 20, offset: 2943}, + pos: position{line: 110, col: 20, offset: 2907}, name: "_", }, ¬Expr{ - pos: position{line: 113, col: 22, offset: 2945}, + pos: position{line: 110, col: 22, offset: 2909}, expr: &choiceExpr{ - pos: position{line: 113, col: 24, offset: 2947}, + pos: position{line: 110, col: 24, offset: 2911}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 113, col: 24, offset: 2947}, + pos: position{line: 110, col: 24, offset: 2911}, name: "OR", }, &ruleRefExpr{ - pos: position{line: 113, col: 29, offset: 2952}, + pos: position{line: 110, col: 29, offset: 2916}, name: "SearchKeywordGuard", }, }, }, }, &labeledExpr{ - pos: position{line: 113, col: 49, offset: 2972}, + pos: position{line: 110, col: 49, offset: 2936}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 113, col: 54, offset: 2977}, + pos: position{line: 110, col: 54, offset: 2941}, name: "SearchFactor", }, }, @@ -1125,42 +1157,42 @@ var g = &grammar{ }, { name: "SearchKeywordGuard", - pos: position{line: 117, col: 1, offset: 3090}, + pos: position{line: 114, col: 1, offset: 3054}, expr: &choiceExpr{ - pos: position{line: 118, col: 5, offset: 3113}, + pos: position{line: 115, col: 5, offset: 3077}, alternatives: []any{ &seqExpr{ - pos: position{line: 118, col: 5, offset: 3113}, + pos: position{line: 115, col: 5, offset: 3077}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 118, col: 5, offset: 3113}, + pos: position{line: 115, col: 5, offset: 3077}, name: "FromSource", }, &ruleRefExpr{ - pos: position{line: 118, col: 16, offset: 3124}, + pos: position{line: 115, col: 16, offset: 3088}, name: "__", }, &litMatcher{ - pos: position{line: 118, col: 19, offset: 3127}, + pos: position{line: 115, col: 19, offset: 3091}, val: "=>", ignoreCase: false, want: "\"=>\"", }, &ruleRefExpr{ - pos: position{line: 118, col: 24, offset: 3132}, + pos: position{line: 115, col: 24, offset: 3096}, name: "__", }, }, }, &seqExpr{ - pos: position{line: 119, col: 5, offset: 3139}, + pos: position{line: 116, col: 5, offset: 3103}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 119, col: 5, offset: 3139}, + pos: position{line: 116, col: 5, offset: 3103}, name: "Case", }, &ruleRefExpr{ - pos: position{line: 119, col: 10, offset: 3144}, + pos: position{line: 116, col: 10, offset: 3108}, name: "__", }, }, @@ -1172,43 +1204,43 @@ var g = &grammar{ }, { name: "SearchFactor", - pos: position{line: 121, col: 1, offset: 3148}, + pos: position{line: 118, col: 1, offset: 3112}, expr: &choiceExpr{ - pos: position{line: 122, col: 5, offset: 3165}, + pos: position{line: 119, col: 5, offset: 3129}, alternatives: []any{ &actionExpr{ - pos: position{line: 122, col: 5, offset: 3165}, + pos: position{line: 119, col: 5, offset: 3129}, run: (*parser).callonSearchFactor2, expr: &seqExpr{ - pos: position{line: 122, col: 5, offset: 3165}, + pos: position{line: 119, col: 5, offset: 3129}, exprs: []any{ &choiceExpr{ - pos: position{line: 122, col: 6, offset: 3166}, + pos: position{line: 119, col: 6, offset: 3130}, alternatives: []any{ &seqExpr{ - pos: position{line: 122, col: 6, offset: 3166}, + pos: position{line: 119, col: 6, offset: 3130}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 122, col: 6, offset: 3166}, + pos: position{line: 119, col: 6, offset: 3130}, name: "NOT", }, &ruleRefExpr{ - pos: position{line: 122, col: 10, offset: 3170}, + pos: position{line: 119, col: 10, offset: 3134}, name: "_", }, }, }, &seqExpr{ - pos: position{line: 122, col: 14, offset: 3174}, + pos: position{line: 119, col: 14, offset: 3138}, exprs: []any{ &litMatcher{ - pos: position{line: 122, col: 14, offset: 3174}, + pos: position{line: 119, col: 14, offset: 3138}, val: "!", ignoreCase: false, want: "\"!\"", }, &ruleRefExpr{ - pos: position{line: 122, col: 18, offset: 3178}, + pos: position{line: 119, col: 18, offset: 3142}, name: "__", }, }, @@ -1216,10 +1248,10 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 122, col: 22, offset: 3182}, + pos: position{line: 119, col: 22, offset: 3146}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 122, col: 24, offset: 3184}, + pos: position{line: 119, col: 24, offset: 3148}, name: "SearchFactor", }, }, @@ -1227,35 +1259,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 130, col: 5, offset: 3355}, + pos: position{line: 127, col: 5, offset: 3319}, run: (*parser).callonSearchFactor13, expr: &seqExpr{ - pos: position{line: 130, col: 5, offset: 3355}, + pos: position{line: 127, col: 5, offset: 3319}, exprs: []any{ &litMatcher{ - pos: position{line: 130, col: 5, offset: 3355}, + pos: position{line: 127, col: 5, offset: 3319}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 130, col: 9, offset: 3359}, + pos: position{line: 127, col: 9, offset: 3323}, name: "__", }, &labeledExpr{ - pos: position{line: 130, col: 12, offset: 3362}, + pos: position{line: 127, col: 12, offset: 3326}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 130, col: 17, offset: 3367}, + pos: position{line: 127, col: 17, offset: 3331}, name: "SearchBoolean", }, }, &ruleRefExpr{ - pos: position{line: 130, col: 31, offset: 3381}, + pos: position{line: 127, col: 31, offset: 3345}, name: "__", }, &litMatcher{ - pos: position{line: 130, col: 34, offset: 3384}, + pos: position{line: 127, col: 34, offset: 3348}, val: ")", ignoreCase: false, want: "\")\"", @@ -1264,7 +1296,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 131, col: 5, offset: 3413}, + pos: position{line: 128, col: 5, offset: 3377}, name: "SearchExpr", }, }, @@ -1274,53 +1306,53 @@ var g = &grammar{ }, { name: "SearchExpr", - pos: position{line: 133, col: 1, offset: 3425}, + pos: position{line: 130, col: 1, offset: 3389}, expr: &choiceExpr{ - pos: position{line: 134, col: 5, offset: 3440}, + pos: position{line: 131, col: 5, offset: 3404}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 134, col: 5, offset: 3440}, + pos: position{line: 131, col: 5, offset: 3404}, name: "Regexp", }, &ruleRefExpr{ - pos: position{line: 135, col: 5, offset: 3451}, + pos: position{line: 132, col: 5, offset: 3415}, name: "Glob", }, &actionExpr{ - pos: position{line: 136, col: 5, offset: 3460}, + pos: position{line: 133, col: 5, offset: 3424}, run: (*parser).callonSearchExpr4, expr: &seqExpr{ - pos: position{line: 136, col: 5, offset: 3460}, + pos: position{line: 133, col: 5, offset: 3424}, exprs: []any{ &labeledExpr{ - pos: position{line: 136, col: 5, offset: 3460}, + pos: position{line: 133, col: 5, offset: 3424}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 136, col: 7, offset: 3462}, + pos: position{line: 133, col: 7, offset: 3426}, name: "SearchValue", }, }, &choiceExpr{ - pos: position{line: 136, col: 20, offset: 3475}, + pos: position{line: 133, col: 20, offset: 3439}, alternatives: []any{ ¬Expr{ - pos: position{line: 136, col: 20, offset: 3475}, + pos: position{line: 133, col: 20, offset: 3439}, expr: &ruleRefExpr{ - pos: position{line: 136, col: 21, offset: 3476}, + pos: position{line: 133, col: 21, offset: 3440}, name: "ExprGuard", }, }, &andExpr{ - pos: position{line: 136, col: 33, offset: 3488}, + pos: position{line: 133, col: 33, offset: 3452}, expr: &seqExpr{ - pos: position{line: 136, col: 35, offset: 3490}, + pos: position{line: 133, col: 35, offset: 3454}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 136, col: 35, offset: 3490}, + pos: position{line: 133, col: 35, offset: 3454}, name: "_", }, &ruleRefExpr{ - pos: position{line: 136, col: 37, offset: 3492}, + pos: position{line: 133, col: 37, offset: 3456}, name: "Glob", }, }, @@ -1332,21 +1364,21 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 144, col: 5, offset: 3649}, + pos: position{line: 141, col: 5, offset: 3613}, run: (*parser).callonSearchExpr15, expr: &seqExpr{ - pos: position{line: 144, col: 5, offset: 3649}, + pos: position{line: 141, col: 5, offset: 3613}, exprs: []any{ &litMatcher{ - pos: position{line: 144, col: 5, offset: 3649}, + pos: position{line: 141, col: 5, offset: 3613}, val: "*", ignoreCase: false, want: "\"*\"", }, ¬Expr{ - pos: position{line: 144, col: 9, offset: 3653}, + pos: position{line: 141, col: 9, offset: 3617}, expr: &ruleRefExpr{ - pos: position{line: 144, col: 10, offset: 3654}, + pos: position{line: 141, col: 10, offset: 3618}, name: "ExprGuard", }, }, @@ -1354,7 +1386,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 147, col: 5, offset: 3762}, + pos: position{line: 144, col: 5, offset: 3726}, name: "SearchPredicate", }, }, @@ -1364,45 +1396,45 @@ var g = &grammar{ }, { name: "SearchPredicate", - pos: position{line: 149, col: 1, offset: 3779}, + pos: position{line: 146, col: 1, offset: 3743}, expr: &choiceExpr{ - pos: position{line: 150, col: 5, offset: 3799}, + pos: position{line: 147, col: 5, offset: 3763}, alternatives: []any{ &actionExpr{ - pos: position{line: 150, col: 5, offset: 3799}, + pos: position{line: 147, col: 5, offset: 3763}, run: (*parser).callonSearchPredicate2, expr: &seqExpr{ - pos: position{line: 150, col: 5, offset: 3799}, + pos: position{line: 147, col: 5, offset: 3763}, exprs: []any{ &labeledExpr{ - pos: position{line: 150, col: 5, offset: 3799}, + pos: position{line: 147, col: 5, offset: 3763}, label: "lhs", expr: &ruleRefExpr{ - pos: position{line: 150, col: 9, offset: 3803}, + pos: position{line: 147, col: 9, offset: 3767}, name: "AdditiveExpr", }, }, &ruleRefExpr{ - pos: position{line: 150, col: 22, offset: 3816}, + pos: position{line: 147, col: 22, offset: 3780}, name: "__", }, &labeledExpr{ - pos: position{line: 150, col: 25, offset: 3819}, + pos: position{line: 147, col: 25, offset: 3783}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 150, col: 28, offset: 3822}, + pos: position{line: 147, col: 28, offset: 3786}, name: "Comparator", }, }, &ruleRefExpr{ - pos: position{line: 150, col: 39, offset: 3833}, + pos: position{line: 147, col: 39, offset: 3797}, name: "__", }, &labeledExpr{ - pos: position{line: 150, col: 42, offset: 3836}, + pos: position{line: 147, col: 42, offset: 3800}, label: "rhs", expr: &ruleRefExpr{ - pos: position{line: 150, col: 46, offset: 3840}, + pos: position{line: 147, col: 46, offset: 3804}, name: "AdditiveExpr", }, }, @@ -1410,13 +1442,13 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 159, col: 5, offset: 4040}, + pos: position{line: 156, col: 5, offset: 4004}, run: (*parser).callonSearchPredicate12, expr: &labeledExpr{ - pos: position{line: 159, col: 5, offset: 4040}, + pos: position{line: 156, col: 5, offset: 4004}, label: "f", expr: &ruleRefExpr{ - pos: position{line: 159, col: 7, offset: 4042}, + pos: position{line: 156, col: 7, offset: 4006}, name: "Function", }, }, @@ -1428,32 +1460,32 @@ var g = &grammar{ }, { name: "SearchValue", - pos: position{line: 161, col: 1, offset: 4070}, + pos: position{line: 158, col: 1, offset: 4034}, expr: &choiceExpr{ - pos: position{line: 162, col: 5, offset: 4086}, + pos: position{line: 159, col: 5, offset: 4050}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 162, col: 5, offset: 4086}, + pos: position{line: 159, col: 5, offset: 4050}, name: "Literal", }, &actionExpr{ - pos: position{line: 163, col: 5, offset: 4098}, + pos: position{line: 160, col: 5, offset: 4062}, run: (*parser).callonSearchValue3, expr: &seqExpr{ - pos: position{line: 163, col: 5, offset: 4098}, + pos: position{line: 160, col: 5, offset: 4062}, exprs: []any{ ¬Expr{ - pos: position{line: 163, col: 5, offset: 4098}, + pos: position{line: 160, col: 5, offset: 4062}, expr: &ruleRefExpr{ - pos: position{line: 163, col: 6, offset: 4099}, + pos: position{line: 160, col: 6, offset: 4063}, name: "RegexpPattern", }, }, &labeledExpr{ - pos: position{line: 163, col: 20, offset: 4113}, + pos: position{line: 160, col: 20, offset: 4077}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 163, col: 22, offset: 4115}, + pos: position{line: 160, col: 22, offset: 4079}, name: "KeyWord", }, }, @@ -1467,15 +1499,15 @@ var g = &grammar{ }, { name: "Glob", - pos: position{line: 167, col: 1, offset: 4188}, + pos: position{line: 164, col: 1, offset: 4152}, expr: &actionExpr{ - pos: position{line: 168, col: 5, offset: 4197}, + pos: position{line: 165, col: 5, offset: 4161}, run: (*parser).callonGlob1, expr: &labeledExpr{ - pos: position{line: 168, col: 5, offset: 4197}, + pos: position{line: 165, col: 5, offset: 4161}, label: "pattern", expr: &ruleRefExpr{ - pos: position{line: 168, col: 13, offset: 4205}, + pos: position{line: 165, col: 13, offset: 4169}, name: "GlobPattern", }, }, @@ -1485,15 +1517,15 @@ var g = &grammar{ }, { name: "Regexp", - pos: position{line: 172, col: 1, offset: 4308}, + pos: position{line: 169, col: 1, offset: 4272}, expr: &actionExpr{ - pos: position{line: 173, col: 5, offset: 4319}, + pos: position{line: 170, col: 5, offset: 4283}, run: (*parser).callonRegexp1, expr: &labeledExpr{ - pos: position{line: 173, col: 5, offset: 4319}, + pos: position{line: 170, col: 5, offset: 4283}, label: "pattern", expr: &ruleRefExpr{ - pos: position{line: 173, col: 13, offset: 4327}, + pos: position{line: 170, col: 13, offset: 4291}, name: "RegexpPattern", }, }, @@ -1503,33 +1535,33 @@ var g = &grammar{ }, { name: "Aggregation", - pos: position{line: 179, col: 1, offset: 4460}, + pos: position{line: 176, col: 1, offset: 4424}, expr: &choiceExpr{ - pos: position{line: 180, col: 5, offset: 4476}, + pos: position{line: 177, col: 5, offset: 4440}, alternatives: []any{ &actionExpr{ - pos: position{line: 180, col: 5, offset: 4476}, + pos: position{line: 177, col: 5, offset: 4440}, run: (*parser).callonAggregation2, expr: &seqExpr{ - pos: position{line: 180, col: 5, offset: 4476}, + pos: position{line: 177, col: 5, offset: 4440}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 180, col: 5, offset: 4476}, + pos: position{line: 177, col: 5, offset: 4440}, name: "Summarize", }, &labeledExpr{ - pos: position{line: 180, col: 15, offset: 4486}, + pos: position{line: 177, col: 15, offset: 4450}, label: "keys", expr: &ruleRefExpr{ - pos: position{line: 180, col: 20, offset: 4491}, + pos: position{line: 177, col: 20, offset: 4455}, name: "GroupByKeys", }, }, &labeledExpr{ - pos: position{line: 180, col: 32, offset: 4503}, + pos: position{line: 177, col: 32, offset: 4467}, label: "limit", expr: &ruleRefExpr{ - pos: position{line: 180, col: 38, offset: 4509}, + pos: position{line: 177, col: 38, offset: 4473}, name: "LimitArg", }, }, @@ -1537,37 +1569,37 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 188, col: 5, offset: 4693}, + pos: position{line: 185, col: 5, offset: 4657}, run: (*parser).callonAggregation9, expr: &seqExpr{ - pos: position{line: 188, col: 5, offset: 4693}, + pos: position{line: 185, col: 5, offset: 4657}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 188, col: 5, offset: 4693}, + pos: position{line: 185, col: 5, offset: 4657}, name: "Summarize", }, &labeledExpr{ - pos: position{line: 188, col: 15, offset: 4703}, + pos: position{line: 185, col: 15, offset: 4667}, label: "aggs", expr: &ruleRefExpr{ - pos: position{line: 188, col: 20, offset: 4708}, + pos: position{line: 185, col: 20, offset: 4672}, name: "AggAssignments", }, }, &labeledExpr{ - pos: position{line: 188, col: 35, offset: 4723}, + pos: position{line: 185, col: 35, offset: 4687}, label: "keys", expr: &zeroOrOneExpr{ - pos: position{line: 188, col: 40, offset: 4728}, + pos: position{line: 185, col: 40, offset: 4692}, expr: &seqExpr{ - pos: position{line: 188, col: 41, offset: 4729}, + pos: position{line: 185, col: 41, offset: 4693}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 188, col: 41, offset: 4729}, + pos: position{line: 185, col: 41, offset: 4693}, name: "_", }, &ruleRefExpr{ - pos: position{line: 188, col: 43, offset: 4731}, + pos: position{line: 185, col: 43, offset: 4695}, name: "GroupByKeys", }, }, @@ -1575,10 +1607,10 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 188, col: 57, offset: 4745}, + pos: position{line: 185, col: 57, offset: 4709}, label: "limit", expr: &ruleRefExpr{ - pos: position{line: 188, col: 63, offset: 4751}, + pos: position{line: 185, col: 63, offset: 4715}, name: "LimitArg", }, }, @@ -1592,34 +1624,34 @@ var g = &grammar{ }, { name: "Summarize", - pos: position{line: 201, col: 1, offset: 5034}, + pos: position{line: 198, col: 1, offset: 4998}, expr: &choiceExpr{ - pos: position{line: 201, col: 13, offset: 5046}, + pos: position{line: 198, col: 13, offset: 5010}, alternatives: []any{ &seqExpr{ - pos: position{line: 201, col: 13, offset: 5046}, + pos: position{line: 198, col: 13, offset: 5010}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 201, col: 13, offset: 5046}, + pos: position{line: 198, col: 13, offset: 5010}, name: "AGGREGATE", }, &ruleRefExpr{ - pos: position{line: 201, col: 23, offset: 5056}, + pos: position{line: 198, col: 23, offset: 5020}, name: "_", }, }, }, &zeroOrOneExpr{ - pos: position{line: 201, col: 27, offset: 5060}, + pos: position{line: 198, col: 27, offset: 5024}, expr: &seqExpr{ - pos: position{line: 201, col: 28, offset: 5061}, + pos: position{line: 198, col: 28, offset: 5025}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 201, col: 28, offset: 5061}, + pos: position{line: 198, col: 28, offset: 5025}, name: "SUMMARIZE", }, &ruleRefExpr{ - pos: position{line: 201, col: 38, offset: 5071}, + pos: position{line: 198, col: 38, offset: 5035}, name: "_", }, }, @@ -1632,42 +1664,42 @@ var g = &grammar{ }, { name: "GroupByKeys", - pos: position{line: 203, col: 1, offset: 5076}, + pos: position{line: 200, col: 1, offset: 5040}, expr: &actionExpr{ - pos: position{line: 204, col: 5, offset: 5092}, + pos: position{line: 201, col: 5, offset: 5056}, run: (*parser).callonGroupByKeys1, expr: &seqExpr{ - pos: position{line: 204, col: 5, offset: 5092}, + pos: position{line: 201, col: 5, offset: 5056}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 204, col: 5, offset: 5092}, + pos: position{line: 201, col: 5, offset: 5056}, expr: &seqExpr{ - pos: position{line: 204, col: 6, offset: 5093}, + pos: position{line: 201, col: 6, offset: 5057}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 204, col: 6, offset: 5093}, + pos: position{line: 201, col: 6, offset: 5057}, name: "GROUP", }, &ruleRefExpr{ - pos: position{line: 204, col: 12, offset: 5099}, + pos: position{line: 201, col: 12, offset: 5063}, name: "_", }, }, }, }, &ruleRefExpr{ - pos: position{line: 204, col: 16, offset: 5103}, + pos: position{line: 201, col: 16, offset: 5067}, name: "BY", }, &ruleRefExpr{ - pos: position{line: 204, col: 19, offset: 5106}, + pos: position{line: 201, col: 19, offset: 5070}, name: "_", }, &labeledExpr{ - pos: position{line: 204, col: 21, offset: 5108}, + pos: position{line: 201, col: 21, offset: 5072}, label: "columns", expr: &ruleRefExpr{ - pos: position{line: 204, col: 29, offset: 5116}, + pos: position{line: 201, col: 29, offset: 5080}, name: "FlexAssignments", }, }, @@ -1679,43 +1711,43 @@ var g = &grammar{ }, { name: "LimitArg", - pos: position{line: 206, col: 1, offset: 5157}, + pos: position{line: 203, col: 1, offset: 5121}, expr: &choiceExpr{ - pos: position{line: 207, col: 5, offset: 5170}, + pos: position{line: 204, col: 5, offset: 5134}, alternatives: []any{ &actionExpr{ - pos: position{line: 207, col: 5, offset: 5170}, + pos: position{line: 204, col: 5, offset: 5134}, run: (*parser).callonLimitArg2, expr: &seqExpr{ - pos: position{line: 207, col: 5, offset: 5170}, + pos: position{line: 204, col: 5, offset: 5134}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 207, col: 5, offset: 5170}, + pos: position{line: 204, col: 5, offset: 5134}, name: "_", }, &ruleRefExpr{ - pos: position{line: 207, col: 7, offset: 5172}, + pos: position{line: 204, col: 7, offset: 5136}, name: "WITH", }, &ruleRefExpr{ - pos: position{line: 207, col: 12, offset: 5177}, + pos: position{line: 204, col: 12, offset: 5141}, name: "_", }, &litMatcher{ - pos: position{line: 207, col: 14, offset: 5179}, + pos: position{line: 204, col: 14, offset: 5143}, val: "-limit", ignoreCase: false, want: "\"-limit\"", }, &ruleRefExpr{ - pos: position{line: 207, col: 23, offset: 5188}, + pos: position{line: 204, col: 23, offset: 5152}, name: "_", }, &labeledExpr{ - pos: position{line: 207, col: 25, offset: 5190}, + pos: position{line: 204, col: 25, offset: 5154}, label: "limit", expr: &ruleRefExpr{ - pos: position{line: 207, col: 31, offset: 5196}, + pos: position{line: 204, col: 31, offset: 5160}, name: "UInt", }, }, @@ -1723,10 +1755,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 208, col: 5, offset: 5227}, + pos: position{line: 205, col: 5, offset: 5191}, run: (*parser).callonLimitArg11, expr: &litMatcher{ - pos: position{line: 208, col: 5, offset: 5227}, + pos: position{line: 205, col: 5, offset: 5191}, val: "", ignoreCase: false, want: "\"\"", @@ -1739,22 +1771,22 @@ var g = &grammar{ }, { name: "FlexAssignment", - pos: position{line: 213, col: 1, offset: 5487}, + pos: position{line: 210, col: 1, offset: 5451}, expr: &choiceExpr{ - pos: position{line: 214, col: 5, offset: 5506}, + pos: position{line: 211, col: 5, offset: 5470}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 214, col: 5, offset: 5506}, + pos: position{line: 211, col: 5, offset: 5470}, name: "Assignment", }, &actionExpr{ - pos: position{line: 215, col: 5, offset: 5521}, + pos: position{line: 212, col: 5, offset: 5485}, run: (*parser).callonFlexAssignment3, expr: &labeledExpr{ - pos: position{line: 215, col: 5, offset: 5521}, + pos: position{line: 212, col: 5, offset: 5485}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 215, col: 10, offset: 5526}, + pos: position{line: 212, col: 10, offset: 5490}, name: "Expr", }, }, @@ -1766,51 +1798,51 @@ var g = &grammar{ }, { name: "FlexAssignments", - pos: position{line: 217, col: 1, offset: 5613}, + pos: position{line: 214, col: 1, offset: 5577}, expr: &actionExpr{ - pos: position{line: 218, col: 5, offset: 5633}, + pos: position{line: 215, col: 5, offset: 5597}, run: (*parser).callonFlexAssignments1, expr: &seqExpr{ - pos: position{line: 218, col: 5, offset: 5633}, + pos: position{line: 215, col: 5, offset: 5597}, exprs: []any{ &labeledExpr{ - pos: position{line: 218, col: 5, offset: 5633}, + pos: position{line: 215, col: 5, offset: 5597}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 218, col: 11, offset: 5639}, + pos: position{line: 215, col: 11, offset: 5603}, name: "FlexAssignment", }, }, &labeledExpr{ - pos: position{line: 218, col: 26, offset: 5654}, + pos: position{line: 215, col: 26, offset: 5618}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 218, col: 31, offset: 5659}, + pos: position{line: 215, col: 31, offset: 5623}, expr: &actionExpr{ - pos: position{line: 218, col: 32, offset: 5660}, + pos: position{line: 215, col: 32, offset: 5624}, run: (*parser).callonFlexAssignments7, expr: &seqExpr{ - pos: position{line: 218, col: 32, offset: 5660}, + pos: position{line: 215, col: 32, offset: 5624}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 218, col: 32, offset: 5660}, + pos: position{line: 215, col: 32, offset: 5624}, name: "__", }, &litMatcher{ - pos: position{line: 218, col: 35, offset: 5663}, + pos: position{line: 215, col: 35, offset: 5627}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 218, col: 39, offset: 5667}, + pos: position{line: 215, col: 39, offset: 5631}, name: "__", }, &labeledExpr{ - pos: position{line: 218, col: 42, offset: 5670}, + pos: position{line: 215, col: 42, offset: 5634}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 218, col: 47, offset: 5675}, + pos: position{line: 215, col: 47, offset: 5639}, name: "FlexAssignment", }, }, @@ -1827,43 +1859,43 @@ var g = &grammar{ }, { name: "AggAssignment", - pos: position{line: 222, col: 1, offset: 5761}, + pos: position{line: 219, col: 1, offset: 5725}, expr: &choiceExpr{ - pos: position{line: 223, col: 5, offset: 5779}, + pos: position{line: 220, col: 5, offset: 5743}, alternatives: []any{ &actionExpr{ - pos: position{line: 223, col: 5, offset: 5779}, + pos: position{line: 220, col: 5, offset: 5743}, run: (*parser).callonAggAssignment2, expr: &seqExpr{ - pos: position{line: 223, col: 5, offset: 5779}, + pos: position{line: 220, col: 5, offset: 5743}, exprs: []any{ &labeledExpr{ - pos: position{line: 223, col: 5, offset: 5779}, + pos: position{line: 220, col: 5, offset: 5743}, label: "lval", expr: &ruleRefExpr{ - pos: position{line: 223, col: 10, offset: 5784}, + pos: position{line: 220, col: 10, offset: 5748}, name: "Lval", }, }, &ruleRefExpr{ - pos: position{line: 223, col: 15, offset: 5789}, + pos: position{line: 220, col: 15, offset: 5753}, name: "__", }, &litMatcher{ - pos: position{line: 223, col: 18, offset: 5792}, + pos: position{line: 220, col: 18, offset: 5756}, val: ":=", ignoreCase: false, want: "\":=\"", }, &ruleRefExpr{ - pos: position{line: 223, col: 23, offset: 5797}, + pos: position{line: 220, col: 23, offset: 5761}, name: "__", }, &labeledExpr{ - pos: position{line: 223, col: 26, offset: 5800}, + pos: position{line: 220, col: 26, offset: 5764}, label: "agg", expr: &ruleRefExpr{ - pos: position{line: 223, col: 30, offset: 5804}, + pos: position{line: 220, col: 30, offset: 5768}, name: "Agg", }, }, @@ -1871,13 +1903,13 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 226, col: 5, offset: 5922}, + pos: position{line: 223, col: 5, offset: 5886}, run: (*parser).callonAggAssignment11, expr: &labeledExpr{ - pos: position{line: 226, col: 5, offset: 5922}, + pos: position{line: 223, col: 5, offset: 5886}, label: "agg", expr: &ruleRefExpr{ - pos: position{line: 226, col: 9, offset: 5926}, + pos: position{line: 223, col: 9, offset: 5890}, name: "Agg", }, }, @@ -1889,56 +1921,56 @@ var g = &grammar{ }, { name: "Agg", - pos: position{line: 230, col: 1, offset: 6021}, + pos: position{line: 227, col: 1, offset: 5985}, expr: &actionExpr{ - pos: position{line: 231, col: 5, offset: 6029}, + pos: position{line: 228, col: 5, offset: 5993}, run: (*parser).callonAgg1, expr: &seqExpr{ - pos: position{line: 231, col: 5, offset: 6029}, + pos: position{line: 228, col: 5, offset: 5993}, exprs: []any{ ¬Expr{ - pos: position{line: 231, col: 5, offset: 6029}, + pos: position{line: 228, col: 5, offset: 5993}, expr: &ruleRefExpr{ - pos: position{line: 231, col: 6, offset: 6030}, + pos: position{line: 228, col: 6, offset: 5994}, name: "FuncGuard", }, }, &labeledExpr{ - pos: position{line: 231, col: 16, offset: 6040}, + pos: position{line: 228, col: 16, offset: 6004}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 231, col: 19, offset: 6043}, + pos: position{line: 228, col: 19, offset: 6007}, name: "AggName", }, }, &ruleRefExpr{ - pos: position{line: 231, col: 27, offset: 6051}, + pos: position{line: 228, col: 27, offset: 6015}, name: "__", }, &litMatcher{ - pos: position{line: 231, col: 30, offset: 6054}, + pos: position{line: 228, col: 30, offset: 6018}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 231, col: 34, offset: 6058}, + pos: position{line: 228, col: 34, offset: 6022}, name: "__", }, &labeledExpr{ - pos: position{line: 231, col: 37, offset: 6061}, + pos: position{line: 228, col: 37, offset: 6025}, label: "expr", expr: &zeroOrOneExpr{ - pos: position{line: 231, col: 42, offset: 6066}, + pos: position{line: 228, col: 42, offset: 6030}, expr: &choiceExpr{ - pos: position{line: 231, col: 43, offset: 6067}, + pos: position{line: 228, col: 43, offset: 6031}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 231, col: 43, offset: 6067}, + pos: position{line: 228, col: 43, offset: 6031}, name: "OverExpr", }, &ruleRefExpr{ - pos: position{line: 231, col: 54, offset: 6078}, + pos: position{line: 228, col: 54, offset: 6042}, name: "Expr", }, }, @@ -1946,26 +1978,26 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 231, col: 61, offset: 6085}, + pos: position{line: 228, col: 61, offset: 6049}, name: "__", }, &litMatcher{ - pos: position{line: 231, col: 64, offset: 6088}, + pos: position{line: 228, col: 64, offset: 6052}, val: ")", ignoreCase: false, want: "\")\"", }, ¬Expr{ - pos: position{line: 231, col: 68, offset: 6092}, + pos: position{line: 228, col: 68, offset: 6056}, expr: &seqExpr{ - pos: position{line: 231, col: 70, offset: 6094}, + pos: position{line: 228, col: 70, offset: 6058}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 231, col: 70, offset: 6094}, + pos: position{line: 228, col: 70, offset: 6058}, name: "__", }, &litMatcher{ - pos: position{line: 231, col: 73, offset: 6097}, + pos: position{line: 228, col: 73, offset: 6061}, val: ".", ignoreCase: false, want: "\".\"", @@ -1974,12 +2006,12 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 231, col: 78, offset: 6102}, + pos: position{line: 228, col: 78, offset: 6066}, label: "where", expr: &zeroOrOneExpr{ - pos: position{line: 231, col: 84, offset: 6108}, + pos: position{line: 228, col: 84, offset: 6072}, expr: &ruleRefExpr{ - pos: position{line: 231, col: 84, offset: 6108}, + pos: position{line: 228, col: 84, offset: 6072}, name: "WhereClause", }, }, @@ -1992,20 +2024,20 @@ var g = &grammar{ }, { name: "AggName", - pos: position{line: 246, col: 1, offset: 6393}, + pos: position{line: 243, col: 1, offset: 6357}, expr: &choiceExpr{ - pos: position{line: 247, col: 5, offset: 6405}, + pos: position{line: 244, col: 5, offset: 6369}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 247, col: 5, offset: 6405}, + pos: position{line: 244, col: 5, offset: 6369}, name: "IdentifierName", }, &ruleRefExpr{ - pos: position{line: 248, col: 5, offset: 6424}, + pos: position{line: 245, col: 5, offset: 6388}, name: "AND", }, &ruleRefExpr{ - pos: position{line: 249, col: 5, offset: 6432}, + pos: position{line: 246, col: 5, offset: 6396}, name: "OR", }, }, @@ -2015,30 +2047,30 @@ var g = &grammar{ }, { name: "WhereClause", - pos: position{line: 251, col: 1, offset: 6436}, + pos: position{line: 248, col: 1, offset: 6400}, expr: &actionExpr{ - pos: position{line: 251, col: 15, offset: 6450}, + pos: position{line: 248, col: 15, offset: 6414}, run: (*parser).callonWhereClause1, expr: &seqExpr{ - pos: position{line: 251, col: 15, offset: 6450}, + pos: position{line: 248, col: 15, offset: 6414}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 251, col: 15, offset: 6450}, + pos: position{line: 248, col: 15, offset: 6414}, name: "_", }, &ruleRefExpr{ - pos: position{line: 251, col: 17, offset: 6452}, + pos: position{line: 248, col: 17, offset: 6416}, name: "WHERE", }, &ruleRefExpr{ - pos: position{line: 251, col: 23, offset: 6458}, + pos: position{line: 248, col: 23, offset: 6422}, name: "_", }, &labeledExpr{ - pos: position{line: 251, col: 25, offset: 6460}, + pos: position{line: 248, col: 25, offset: 6424}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 251, col: 30, offset: 6465}, + pos: position{line: 248, col: 30, offset: 6429}, name: "LogicalOrExpr", }, }, @@ -2050,45 +2082,45 @@ var g = &grammar{ }, { name: "AggAssignments", - pos: position{line: 253, col: 1, offset: 6501}, + pos: position{line: 250, col: 1, offset: 6465}, expr: &actionExpr{ - pos: position{line: 254, col: 5, offset: 6520}, + pos: position{line: 251, col: 5, offset: 6484}, run: (*parser).callonAggAssignments1, expr: &seqExpr{ - pos: position{line: 254, col: 5, offset: 6520}, + pos: position{line: 251, col: 5, offset: 6484}, exprs: []any{ &labeledExpr{ - pos: position{line: 254, col: 5, offset: 6520}, + pos: position{line: 251, col: 5, offset: 6484}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 254, col: 11, offset: 6526}, + pos: position{line: 251, col: 11, offset: 6490}, name: "AggAssignment", }, }, &labeledExpr{ - pos: position{line: 254, col: 25, offset: 6540}, + pos: position{line: 251, col: 25, offset: 6504}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 254, col: 30, offset: 6545}, + pos: position{line: 251, col: 30, offset: 6509}, expr: &seqExpr{ - pos: position{line: 254, col: 31, offset: 6546}, + pos: position{line: 251, col: 31, offset: 6510}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 254, col: 31, offset: 6546}, + pos: position{line: 251, col: 31, offset: 6510}, name: "__", }, &litMatcher{ - pos: position{line: 254, col: 34, offset: 6549}, + pos: position{line: 251, col: 34, offset: 6513}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 254, col: 38, offset: 6553}, + pos: position{line: 251, col: 38, offset: 6517}, name: "__", }, &ruleRefExpr{ - pos: position{line: 254, col: 41, offset: 6556}, + pos: position{line: 251, col: 41, offset: 6520}, name: "AggAssignment", }, }, @@ -2103,124 +2135,144 @@ var g = &grammar{ }, { name: "Operator", - pos: position{line: 264, col: 1, offset: 6753}, + pos: position{line: 261, col: 1, offset: 6717}, expr: &choiceExpr{ - pos: position{line: 265, col: 5, offset: 6766}, + pos: position{line: 262, col: 5, offset: 6730}, alternatives: []any{ - &ruleRefExpr{ - pos: position{line: 265, col: 5, offset: 6766}, - name: "SelectOp", + &actionExpr{ + pos: position{line: 262, col: 5, offset: 6730}, + run: (*parser).callonOperator2, + expr: &seqExpr{ + pos: position{line: 262, col: 5, offset: 6730}, + exprs: []any{ + &labeledExpr{ + pos: position{line: 262, col: 5, offset: 6730}, + label: "op", + expr: &ruleRefExpr{ + pos: position{line: 262, col: 8, offset: 6733}, + name: "SelectOp", + }, + }, + &andExpr{ + pos: position{line: 262, col: 17, offset: 6742}, + expr: &ruleRefExpr{ + pos: position{line: 262, col: 18, offset: 6743}, + name: "EndOfOp", + }, + }, + }, + }, }, &ruleRefExpr{ - pos: position{line: 266, col: 5, offset: 6779}, + pos: position{line: 263, col: 5, offset: 6774}, name: "ForkOp", }, &ruleRefExpr{ - pos: position{line: 267, col: 5, offset: 6790}, + pos: position{line: 264, col: 5, offset: 6785}, name: "SwitchOp", }, &ruleRefExpr{ - pos: position{line: 268, col: 5, offset: 6804}, + pos: position{line: 265, col: 5, offset: 6799}, name: "FromForkOp", }, &ruleRefExpr{ - pos: position{line: 269, col: 5, offset: 6819}, + pos: position{line: 266, col: 5, offset: 6814}, name: "SearchOp", }, &ruleRefExpr{ - pos: position{line: 270, col: 5, offset: 6832}, + pos: position{line: 267, col: 5, offset: 6827}, name: "AssertOp", }, &ruleRefExpr{ - pos: position{line: 271, col: 5, offset: 6845}, + pos: position{line: 268, col: 5, offset: 6840}, name: "SortOp", }, &ruleRefExpr{ - pos: position{line: 272, col: 5, offset: 6856}, + pos: position{line: 269, col: 5, offset: 6851}, name: "TopOp", }, &ruleRefExpr{ - pos: position{line: 273, col: 5, offset: 6866}, + pos: position{line: 270, col: 5, offset: 6861}, name: "CutOp", }, &ruleRefExpr{ - pos: position{line: 274, col: 5, offset: 6876}, + pos: position{line: 271, col: 5, offset: 6871}, name: "DropOp", }, &ruleRefExpr{ - pos: position{line: 275, col: 5, offset: 6887}, + pos: position{line: 272, col: 5, offset: 6882}, name: "HeadOp", }, &ruleRefExpr{ - pos: position{line: 276, col: 5, offset: 6898}, + pos: position{line: 273, col: 5, offset: 6893}, name: "TailOp", }, &ruleRefExpr{ - pos: position{line: 277, col: 5, offset: 6909}, + pos: position{line: 274, col: 5, offset: 6904}, name: "WhereOp", }, &ruleRefExpr{ - pos: position{line: 278, col: 5, offset: 6921}, + pos: position{line: 275, col: 5, offset: 6916}, name: "UniqOp", }, &ruleRefExpr{ - pos: position{line: 279, col: 5, offset: 6932}, + pos: position{line: 276, col: 5, offset: 6927}, name: "PutOp", }, &ruleRefExpr{ - pos: position{line: 280, col: 5, offset: 6942}, + pos: position{line: 277, col: 5, offset: 6937}, name: "RenameOp", }, &ruleRefExpr{ - pos: position{line: 281, col: 5, offset: 6955}, + pos: position{line: 278, col: 5, offset: 6950}, name: "FuseOp", }, &ruleRefExpr{ - pos: position{line: 282, col: 5, offset: 6966}, + pos: position{line: 279, col: 5, offset: 6961}, name: "ShapeOp", }, &ruleRefExpr{ - pos: position{line: 283, col: 5, offset: 6978}, + pos: position{line: 280, col: 5, offset: 6973}, name: "JoinOp", }, &ruleRefExpr{ - pos: position{line: 284, col: 5, offset: 6989}, + pos: position{line: 281, col: 5, offset: 6984}, name: "SampleOp", }, &ruleRefExpr{ - pos: position{line: 285, col: 5, offset: 7002}, + pos: position{line: 282, col: 5, offset: 6997}, name: "FromOp", }, &ruleRefExpr{ - pos: position{line: 286, col: 5, offset: 7013}, + pos: position{line: 283, col: 5, offset: 7008}, name: "PassOp", }, &ruleRefExpr{ - pos: position{line: 287, col: 5, offset: 7024}, + pos: position{line: 284, col: 5, offset: 7019}, name: "ExplodeOp", }, &ruleRefExpr{ - pos: position{line: 288, col: 5, offset: 7038}, + pos: position{line: 285, col: 5, offset: 7033}, name: "MergeOp", }, &ruleRefExpr{ - pos: position{line: 289, col: 5, offset: 7050}, + pos: position{line: 286, col: 5, offset: 7045}, name: "OverOp", }, &ruleRefExpr{ - pos: position{line: 290, col: 5, offset: 7061}, + pos: position{line: 287, col: 5, offset: 7056}, name: "YieldOp", }, &ruleRefExpr{ - pos: position{line: 291, col: 5, offset: 7073}, + pos: position{line: 288, col: 5, offset: 7068}, name: "LoadOp", }, &ruleRefExpr{ - pos: position{line: 292, col: 5, offset: 7084}, + pos: position{line: 289, col: 5, offset: 7079}, name: "OutputOp", }, &ruleRefExpr{ - pos: position{line: 293, col: 5, offset: 7097}, + pos: position{line: 290, col: 5, offset: 7092}, name: "DebugOp", }, }, @@ -2228,46 +2280,177 @@ var g = &grammar{ leader: false, leftRecursive: false, }, + { + name: "PipeKeyword", + pos: position{line: 292, col: 1, offset: 7101}, + expr: &choiceExpr{ + pos: position{line: 293, col: 5, offset: 7117}, + alternatives: []any{ + &ruleRefExpr{ + pos: position{line: 293, col: 5, offset: 7117}, + name: "SELECT", + }, + &ruleRefExpr{ + pos: position{line: 293, col: 14, offset: 7126}, + name: "FORK", + }, + &ruleRefExpr{ + pos: position{line: 293, col: 21, offset: 7133}, + name: "SWITCH", + }, + &ruleRefExpr{ + pos: position{line: 293, col: 30, offset: 7142}, + name: "FROM", + }, + &ruleRefExpr{ + pos: position{line: 293, col: 37, offset: 7149}, + name: "SEARCH", + }, + &ruleRefExpr{ + pos: position{line: 293, col: 46, offset: 7158}, + name: "ASSERT", + }, + &ruleRefExpr{ + pos: position{line: 293, col: 55, offset: 7167}, + name: "SORT", + }, + &ruleRefExpr{ + pos: position{line: 293, col: 62, offset: 7174}, + name: "TOP", + }, + &ruleRefExpr{ + pos: position{line: 293, col: 67, offset: 7179}, + name: "CUT", + }, + &ruleRefExpr{ + pos: position{line: 293, col: 73, offset: 7185}, + name: "DROP", + }, + &ruleRefExpr{ + pos: position{line: 294, col: 5, offset: 7194}, + name: "HEAD", + }, + &ruleRefExpr{ + pos: position{line: 294, col: 12, offset: 7201}, + name: "TAIL", + }, + &ruleRefExpr{ + pos: position{line: 294, col: 19, offset: 7208}, + name: "WHERE", + }, + &ruleRefExpr{ + pos: position{line: 294, col: 27, offset: 7216}, + name: "UNIQ", + }, + &ruleRefExpr{ + pos: position{line: 294, col: 34, offset: 7223}, + name: "PUT", + }, + &ruleRefExpr{ + pos: position{line: 294, col: 40, offset: 7229}, + name: "RENAME", + }, + &ruleRefExpr{ + pos: position{line: 294, col: 49, offset: 7238}, + name: "FUSE", + }, + &ruleRefExpr{ + pos: position{line: 294, col: 56, offset: 7245}, + name: "SHAPE", + }, + &ruleRefExpr{ + pos: position{line: 294, col: 64, offset: 7253}, + name: "JOIN", + }, + &ruleRefExpr{ + pos: position{line: 294, col: 71, offset: 7260}, + name: "SAMPLE", + }, + &ruleRefExpr{ + pos: position{line: 295, col: 5, offset: 7271}, + name: "FROM", + }, + &ruleRefExpr{ + pos: position{line: 295, col: 12, offset: 7278}, + name: "PASS", + }, + &ruleRefExpr{ + pos: position{line: 295, col: 19, offset: 7285}, + name: "EXPLODE", + }, + &ruleRefExpr{ + pos: position{line: 295, col: 29, offset: 7295}, + name: "MERGE", + }, + &ruleRefExpr{ + pos: position{line: 295, col: 37, offset: 7303}, + name: "OVER", + }, + &ruleRefExpr{ + pos: position{line: 295, col: 44, offset: 7310}, + name: "YIELD", + }, + &ruleRefExpr{ + pos: position{line: 295, col: 52, offset: 7318}, + name: "LOAD", + }, + &ruleRefExpr{ + pos: position{line: 295, col: 59, offset: 7325}, + name: "OUTPUT", + }, + &ruleRefExpr{ + pos: position{line: 295, col: 68, offset: 7334}, + name: "DEBUG", + }, + &ruleRefExpr{ + pos: position{line: 296, col: 5, offset: 7344}, + name: "SUMMARIZE", + }, + }, + }, + leader: false, + leftRecursive: false, + }, { name: "ForkOp", - pos: position{line: 295, col: 2, offset: 7107}, + pos: position{line: 298, col: 2, offset: 7356}, expr: &actionExpr{ - pos: position{line: 296, col: 4, offset: 7119}, + pos: position{line: 299, col: 4, offset: 7368}, run: (*parser).callonForkOp1, expr: &seqExpr{ - pos: position{line: 296, col: 4, offset: 7119}, + pos: position{line: 299, col: 4, offset: 7368}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 296, col: 4, offset: 7119}, + pos: position{line: 299, col: 4, offset: 7368}, name: "FORK", }, &ruleRefExpr{ - pos: position{line: 296, col: 9, offset: 7124}, + pos: position{line: 299, col: 9, offset: 7373}, name: "__", }, &litMatcher{ - pos: position{line: 296, col: 12, offset: 7127}, + pos: position{line: 299, col: 12, offset: 7376}, val: "(", ignoreCase: false, want: "\"(\"", }, &labeledExpr{ - pos: position{line: 296, col: 16, offset: 7131}, + pos: position{line: 299, col: 16, offset: 7380}, label: "paths", expr: &oneOrMoreExpr{ - pos: position{line: 296, col: 22, offset: 7137}, + pos: position{line: 299, col: 22, offset: 7386}, expr: &ruleRefExpr{ - pos: position{line: 296, col: 22, offset: 7137}, + pos: position{line: 299, col: 22, offset: 7386}, name: "Path", }, }, }, &ruleRefExpr{ - pos: position{line: 296, col: 28, offset: 7143}, + pos: position{line: 299, col: 28, offset: 7392}, name: "__", }, &litMatcher{ - pos: position{line: 296, col: 31, offset: 7146}, + pos: position{line: 299, col: 31, offset: 7395}, val: ")", ignoreCase: false, want: "\")\"", @@ -2280,32 +2463,32 @@ var g = &grammar{ }, { name: "Path", - pos: position{line: 308, col: 1, offset: 7395}, + pos: position{line: 311, col: 1, offset: 7644}, expr: &actionExpr{ - pos: position{line: 308, col: 8, offset: 7402}, + pos: position{line: 311, col: 8, offset: 7651}, run: (*parser).callonPath1, expr: &seqExpr{ - pos: position{line: 308, col: 8, offset: 7402}, + pos: position{line: 311, col: 8, offset: 7651}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 308, col: 8, offset: 7402}, + pos: position{line: 311, col: 8, offset: 7651}, name: "__", }, &litMatcher{ - pos: position{line: 308, col: 11, offset: 7405}, + pos: position{line: 311, col: 11, offset: 7654}, val: "=>", ignoreCase: false, want: "\"=>\"", }, &ruleRefExpr{ - pos: position{line: 308, col: 16, offset: 7410}, + pos: position{line: 311, col: 16, offset: 7659}, name: "__", }, &labeledExpr{ - pos: position{line: 308, col: 19, offset: 7413}, + pos: position{line: 311, col: 19, offset: 7662}, label: "seq", expr: &ruleRefExpr{ - pos: position{line: 308, col: 23, offset: 7417}, + pos: position{line: 311, col: 23, offset: 7666}, name: "Seq", }, }, @@ -2317,59 +2500,59 @@ var g = &grammar{ }, { name: "SwitchOp", - pos: position{line: 310, col: 1, offset: 7442}, + pos: position{line: 313, col: 1, offset: 7691}, expr: &choiceExpr{ - pos: position{line: 311, col: 5, offset: 7455}, + pos: position{line: 314, col: 5, offset: 7704}, alternatives: []any{ &actionExpr{ - pos: position{line: 311, col: 5, offset: 7455}, + pos: position{line: 314, col: 5, offset: 7704}, run: (*parser).callonSwitchOp2, expr: &seqExpr{ - pos: position{line: 311, col: 5, offset: 7455}, + pos: position{line: 314, col: 5, offset: 7704}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 311, col: 5, offset: 7455}, + pos: position{line: 314, col: 5, offset: 7704}, name: "SWITCH", }, &ruleRefExpr{ - pos: position{line: 311, col: 12, offset: 7462}, + pos: position{line: 314, col: 12, offset: 7711}, name: "_", }, &labeledExpr{ - pos: position{line: 311, col: 14, offset: 7464}, + pos: position{line: 314, col: 14, offset: 7713}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 311, col: 19, offset: 7469}, + pos: position{line: 314, col: 19, offset: 7718}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 311, col: 24, offset: 7474}, + pos: position{line: 314, col: 24, offset: 7723}, name: "_", }, &litMatcher{ - pos: position{line: 311, col: 26, offset: 7476}, + pos: position{line: 314, col: 26, offset: 7725}, val: "(", ignoreCase: false, want: "\"(\"", }, &labeledExpr{ - pos: position{line: 311, col: 30, offset: 7480}, + pos: position{line: 314, col: 30, offset: 7729}, label: "cases", expr: &oneOrMoreExpr{ - pos: position{line: 311, col: 36, offset: 7486}, + pos: position{line: 314, col: 36, offset: 7735}, expr: &ruleRefExpr{ - pos: position{line: 311, col: 36, offset: 7486}, + pos: position{line: 314, col: 36, offset: 7735}, name: "SwitchPath", }, }, }, &ruleRefExpr{ - pos: position{line: 311, col: 48, offset: 7498}, + pos: position{line: 314, col: 48, offset: 7747}, name: "__", }, &litMatcher{ - pos: position{line: 311, col: 51, offset: 7501}, + pos: position{line: 314, col: 51, offset: 7750}, val: ")", ignoreCase: false, want: "\")\"", @@ -2378,42 +2561,42 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 319, col: 5, offset: 7681}, + pos: position{line: 322, col: 5, offset: 7930}, run: (*parser).callonSwitchOp15, expr: &seqExpr{ - pos: position{line: 319, col: 5, offset: 7681}, + pos: position{line: 322, col: 5, offset: 7930}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 319, col: 5, offset: 7681}, + pos: position{line: 322, col: 5, offset: 7930}, name: "SWITCH", }, &ruleRefExpr{ - pos: position{line: 319, col: 12, offset: 7688}, + pos: position{line: 322, col: 12, offset: 7937}, name: "__", }, &litMatcher{ - pos: position{line: 319, col: 15, offset: 7691}, + pos: position{line: 322, col: 15, offset: 7940}, val: "(", ignoreCase: false, want: "\"(\"", }, &labeledExpr{ - pos: position{line: 319, col: 19, offset: 7695}, + pos: position{line: 322, col: 19, offset: 7944}, label: "cases", expr: &oneOrMoreExpr{ - pos: position{line: 319, col: 25, offset: 7701}, + pos: position{line: 322, col: 25, offset: 7950}, expr: &ruleRefExpr{ - pos: position{line: 319, col: 25, offset: 7701}, + pos: position{line: 322, col: 25, offset: 7950}, name: "SwitchPath", }, }, }, &ruleRefExpr{ - pos: position{line: 319, col: 37, offset: 7713}, + pos: position{line: 322, col: 37, offset: 7962}, name: "__", }, &litMatcher{ - pos: position{line: 319, col: 40, offset: 7716}, + pos: position{line: 322, col: 40, offset: 7965}, val: ")", ignoreCase: false, want: "\")\"", @@ -2428,30 +2611,30 @@ var g = &grammar{ }, { name: "SwitchPath", - pos: position{line: 327, col: 1, offset: 7860}, + pos: position{line: 330, col: 1, offset: 8109}, expr: &actionExpr{ - pos: position{line: 328, col: 5, offset: 7875}, + pos: position{line: 331, col: 5, offset: 8124}, run: (*parser).callonSwitchPath1, expr: &seqExpr{ - pos: position{line: 328, col: 5, offset: 7875}, + pos: position{line: 331, col: 5, offset: 8124}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 328, col: 5, offset: 7875}, + pos: position{line: 331, col: 5, offset: 8124}, name: "__", }, &labeledExpr{ - pos: position{line: 328, col: 8, offset: 7878}, + pos: position{line: 331, col: 8, offset: 8127}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 328, col: 13, offset: 7883}, + pos: position{line: 331, col: 13, offset: 8132}, name: "Case", }, }, &labeledExpr{ - pos: position{line: 328, col: 18, offset: 7888}, + pos: position{line: 331, col: 18, offset: 8137}, label: "path", expr: &ruleRefExpr{ - pos: position{line: 328, col: 23, offset: 7893}, + pos: position{line: 331, col: 23, offset: 8142}, name: "Path", }, }, @@ -2463,29 +2646,29 @@ var g = &grammar{ }, { name: "Case", - pos: position{line: 336, col: 1, offset: 8040}, + pos: position{line: 339, col: 1, offset: 8289}, expr: &choiceExpr{ - pos: position{line: 337, col: 5, offset: 8049}, + pos: position{line: 340, col: 5, offset: 8298}, alternatives: []any{ &actionExpr{ - pos: position{line: 337, col: 5, offset: 8049}, + pos: position{line: 340, col: 5, offset: 8298}, run: (*parser).callonCase2, expr: &seqExpr{ - pos: position{line: 337, col: 5, offset: 8049}, + pos: position{line: 340, col: 5, offset: 8298}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 337, col: 5, offset: 8049}, + pos: position{line: 340, col: 5, offset: 8298}, name: "CASE", }, &ruleRefExpr{ - pos: position{line: 337, col: 10, offset: 8054}, + pos: position{line: 340, col: 10, offset: 8303}, name: "_", }, &labeledExpr{ - pos: position{line: 337, col: 12, offset: 8056}, + pos: position{line: 340, col: 12, offset: 8305}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 337, col: 17, offset: 8061}, + pos: position{line: 340, col: 17, offset: 8310}, name: "Expr", }, }, @@ -2493,10 +2676,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 338, col: 5, offset: 8091}, + pos: position{line: 341, col: 5, offset: 8340}, run: (*parser).callonCase8, expr: &ruleRefExpr{ - pos: position{line: 338, col: 5, offset: 8091}, + pos: position{line: 341, col: 5, offset: 8340}, name: "DEFAULT", }, }, @@ -2507,44 +2690,44 @@ var g = &grammar{ }, { name: "FromForkOp", - pos: position{line: 340, col: 1, offset: 8120}, + pos: position{line: 343, col: 1, offset: 8369}, expr: &actionExpr{ - pos: position{line: 341, col: 5, offset: 8135}, + pos: position{line: 344, col: 5, offset: 8384}, run: (*parser).callonFromForkOp1, expr: &seqExpr{ - pos: position{line: 341, col: 5, offset: 8135}, + pos: position{line: 344, col: 5, offset: 8384}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 341, col: 5, offset: 8135}, + pos: position{line: 344, col: 5, offset: 8384}, name: "FROM", }, &ruleRefExpr{ - pos: position{line: 341, col: 10, offset: 8140}, + pos: position{line: 344, col: 10, offset: 8389}, name: "__", }, &litMatcher{ - pos: position{line: 341, col: 13, offset: 8143}, + pos: position{line: 344, col: 13, offset: 8392}, val: "(", ignoreCase: false, want: "\"(\"", }, &labeledExpr{ - pos: position{line: 341, col: 17, offset: 8147}, + pos: position{line: 344, col: 17, offset: 8396}, label: "trunks", expr: &oneOrMoreExpr{ - pos: position{line: 341, col: 24, offset: 8154}, + pos: position{line: 344, col: 24, offset: 8403}, expr: &ruleRefExpr{ - pos: position{line: 341, col: 24, offset: 8154}, + pos: position{line: 344, col: 24, offset: 8403}, name: "FromPath", }, }, }, &ruleRefExpr{ - pos: position{line: 341, col: 34, offset: 8164}, + pos: position{line: 344, col: 34, offset: 8413}, name: "__", }, &litMatcher{ - pos: position{line: 341, col: 37, offset: 8167}, + pos: position{line: 344, col: 37, offset: 8416}, val: ")", ignoreCase: false, want: "\")\"", @@ -2557,55 +2740,55 @@ var g = &grammar{ }, { name: "FromPath", - pos: position{line: 349, col: 1, offset: 8315}, + pos: position{line: 352, col: 1, offset: 8564}, expr: &actionExpr{ - pos: position{line: 350, col: 5, offset: 8328}, + pos: position{line: 353, col: 5, offset: 8577}, run: (*parser).callonFromPath1, expr: &seqExpr{ - pos: position{line: 350, col: 5, offset: 8328}, + pos: position{line: 353, col: 5, offset: 8577}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 350, col: 5, offset: 8328}, + pos: position{line: 353, col: 5, offset: 8577}, name: "__", }, &labeledExpr{ - pos: position{line: 350, col: 8, offset: 8331}, + pos: position{line: 353, col: 8, offset: 8580}, label: "source", expr: &ruleRefExpr{ - pos: position{line: 350, col: 15, offset: 8338}, + pos: position{line: 353, col: 15, offset: 8587}, name: "FromSource", }, }, &labeledExpr{ - pos: position{line: 350, col: 26, offset: 8349}, + pos: position{line: 353, col: 26, offset: 8598}, label: "seq", expr: &zeroOrOneExpr{ - pos: position{line: 350, col: 30, offset: 8353}, + pos: position{line: 353, col: 30, offset: 8602}, expr: &actionExpr{ - pos: position{line: 350, col: 31, offset: 8354}, + pos: position{line: 353, col: 31, offset: 8603}, run: (*parser).callonFromPath8, expr: &seqExpr{ - pos: position{line: 350, col: 31, offset: 8354}, + pos: position{line: 353, col: 31, offset: 8603}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 350, col: 31, offset: 8354}, + pos: position{line: 353, col: 31, offset: 8603}, name: "__", }, &litMatcher{ - pos: position{line: 350, col: 34, offset: 8357}, + pos: position{line: 353, col: 34, offset: 8606}, val: "=>", ignoreCase: false, want: "\"=>\"", }, &ruleRefExpr{ - pos: position{line: 350, col: 39, offset: 8362}, + pos: position{line: 353, col: 39, offset: 8611}, name: "__", }, &labeledExpr{ - pos: position{line: 350, col: 42, offset: 8365}, + pos: position{line: 353, col: 42, offset: 8614}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 350, col: 44, offset: 8367}, + pos: position{line: 353, col: 44, offset: 8616}, name: "Seq", }, }, @@ -2622,29 +2805,29 @@ var g = &grammar{ }, { name: "FromSource", - pos: position{line: 358, col: 1, offset: 8547}, + pos: position{line: 361, col: 1, offset: 8796}, expr: &choiceExpr{ - pos: position{line: 359, col: 5, offset: 8562}, + pos: position{line: 362, col: 5, offset: 8811}, alternatives: []any{ &actionExpr{ - pos: position{line: 359, col: 5, offset: 8562}, + pos: position{line: 362, col: 5, offset: 8811}, run: (*parser).callonFromSource2, expr: &seqExpr{ - pos: position{line: 359, col: 5, offset: 8562}, + pos: position{line: 362, col: 5, offset: 8811}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 359, col: 5, offset: 8562}, + pos: position{line: 362, col: 5, offset: 8811}, name: "FromKeyWord", }, &ruleRefExpr{ - pos: position{line: 359, col: 17, offset: 8574}, + pos: position{line: 362, col: 17, offset: 8823}, name: "_", }, &labeledExpr{ - pos: position{line: 359, col: 19, offset: 8576}, + pos: position{line: 362, col: 19, offset: 8825}, label: "elem", expr: &ruleRefExpr{ - pos: position{line: 359, col: 24, offset: 8581}, + pos: position{line: 362, col: 24, offset: 8830}, name: "FromElem", }, }, @@ -2652,7 +2835,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 366, col: 5, offset: 8752}, + pos: position{line: 369, col: 5, offset: 9001}, name: "PassOp", }, }, @@ -2662,26 +2845,51 @@ var g = &grammar{ }, { name: "SearchOp", - pos: position{line: 368, col: 1, offset: 8760}, + pos: position{line: 371, col: 1, offset: 9009}, expr: &actionExpr{ - pos: position{line: 369, col: 5, offset: 8773}, + pos: position{line: 372, col: 5, offset: 9022}, run: (*parser).callonSearchOp1, expr: &seqExpr{ - pos: position{line: 369, col: 5, offset: 8773}, + pos: position{line: 372, col: 5, offset: 9022}, exprs: []any{ - &ruleRefExpr{ - pos: position{line: 369, col: 5, offset: 8773}, - name: "SEARCH", - }, - &ruleRefExpr{ - pos: position{line: 369, col: 12, offset: 8780}, - name: "_", + &choiceExpr{ + pos: position{line: 372, col: 6, offset: 9023}, + alternatives: []any{ + &seqExpr{ + pos: position{line: 372, col: 6, offset: 9023}, + exprs: []any{ + &ruleRefExpr{ + pos: position{line: 372, col: 6, offset: 9023}, + name: "SEARCH", + }, + &ruleRefExpr{ + pos: position{line: 372, col: 13, offset: 9030}, + name: "_", + }, + }, + }, + &seqExpr{ + pos: position{line: 372, col: 17, offset: 9034}, + exprs: []any{ + &litMatcher{ + pos: position{line: 372, col: 17, offset: 9034}, + val: "?", + ignoreCase: false, + want: "\"?\"", + }, + &ruleRefExpr{ + pos: position{line: 372, col: 21, offset: 9038}, + name: "__", + }, + }, + }, + }, }, &labeledExpr{ - pos: position{line: 369, col: 14, offset: 8782}, + pos: position{line: 372, col: 25, offset: 9042}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 369, col: 19, offset: 8787}, + pos: position{line: 372, col: 30, offset: 9047}, name: "SearchBoolean", }, }, @@ -2693,32 +2901,32 @@ var g = &grammar{ }, { name: "AssertOp", - pos: position{line: 373, col: 1, offset: 8887}, + pos: position{line: 376, col: 1, offset: 9147}, expr: &actionExpr{ - pos: position{line: 374, col: 5, offset: 8900}, + pos: position{line: 377, col: 5, offset: 9160}, run: (*parser).callonAssertOp1, expr: &seqExpr{ - pos: position{line: 374, col: 5, offset: 8900}, + pos: position{line: 377, col: 5, offset: 9160}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 374, col: 5, offset: 8900}, + pos: position{line: 377, col: 5, offset: 9160}, name: "ASSERT", }, &ruleRefExpr{ - pos: position{line: 374, col: 12, offset: 8907}, + pos: position{line: 377, col: 12, offset: 9167}, name: "_", }, &labeledExpr{ - pos: position{line: 374, col: 14, offset: 8909}, + pos: position{line: 377, col: 14, offset: 9169}, label: "expr", expr: &actionExpr{ - pos: position{line: 374, col: 20, offset: 8915}, + pos: position{line: 377, col: 20, offset: 9175}, run: (*parser).callonAssertOp6, expr: &labeledExpr{ - pos: position{line: 374, col: 20, offset: 8915}, + pos: position{line: 377, col: 20, offset: 9175}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 374, col: 22, offset: 8917}, + pos: position{line: 377, col: 22, offset: 9177}, name: "Expr", }, }, @@ -2732,52 +2940,52 @@ var g = &grammar{ }, { name: "SortOp", - pos: position{line: 383, col: 1, offset: 9147}, + pos: position{line: 386, col: 1, offset: 9407}, expr: &actionExpr{ - pos: position{line: 384, col: 5, offset: 9158}, + pos: position{line: 387, col: 5, offset: 9418}, run: (*parser).callonSortOp1, expr: &seqExpr{ - pos: position{line: 384, col: 5, offset: 9158}, + pos: position{line: 387, col: 5, offset: 9418}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 384, col: 5, offset: 9158}, + pos: position{line: 387, col: 5, offset: 9418}, name: "SORT", }, &andExpr{ - pos: position{line: 384, col: 10, offset: 9163}, + pos: position{line: 387, col: 10, offset: 9423}, expr: &ruleRefExpr{ - pos: position{line: 384, col: 11, offset: 9164}, + pos: position{line: 387, col: 11, offset: 9424}, name: "EOKW", }, }, &labeledExpr{ - pos: position{line: 384, col: 16, offset: 9169}, + pos: position{line: 387, col: 16, offset: 9429}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 384, col: 21, offset: 9174}, + pos: position{line: 387, col: 21, offset: 9434}, name: "SortArgs", }, }, &labeledExpr{ - pos: position{line: 384, col: 30, offset: 9183}, + pos: position{line: 387, col: 30, offset: 9443}, label: "exprs", expr: &zeroOrOneExpr{ - pos: position{line: 384, col: 36, offset: 9189}, + pos: position{line: 387, col: 36, offset: 9449}, expr: &actionExpr{ - pos: position{line: 384, col: 37, offset: 9190}, + pos: position{line: 387, col: 37, offset: 9450}, run: (*parser).callonSortOp10, expr: &seqExpr{ - pos: position{line: 384, col: 37, offset: 9190}, + pos: position{line: 387, col: 37, offset: 9450}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 384, col: 37, offset: 9190}, + pos: position{line: 387, col: 37, offset: 9450}, name: "__", }, &labeledExpr{ - pos: position{line: 384, col: 40, offset: 9193}, + pos: position{line: 387, col: 40, offset: 9453}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 384, col: 42, offset: 9195}, + pos: position{line: 387, col: 42, offset: 9455}, name: "SortExprs", }, }, @@ -2794,30 +3002,30 @@ var g = &grammar{ }, { name: "SortArgs", - pos: position{line: 400, col: 1, offset: 9564}, + pos: position{line: 403, col: 1, offset: 9824}, expr: &actionExpr{ - pos: position{line: 400, col: 12, offset: 9575}, + pos: position{line: 403, col: 12, offset: 9835}, run: (*parser).callonSortArgs1, expr: &labeledExpr{ - pos: position{line: 400, col: 12, offset: 9575}, + pos: position{line: 403, col: 12, offset: 9835}, label: "args", expr: &zeroOrMoreExpr{ - pos: position{line: 400, col: 17, offset: 9580}, + pos: position{line: 403, col: 17, offset: 9840}, expr: &actionExpr{ - pos: position{line: 400, col: 18, offset: 9581}, + pos: position{line: 403, col: 18, offset: 9841}, run: (*parser).callonSortArgs4, expr: &seqExpr{ - pos: position{line: 400, col: 18, offset: 9581}, + pos: position{line: 403, col: 18, offset: 9841}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 400, col: 18, offset: 9581}, + pos: position{line: 403, col: 18, offset: 9841}, name: "_", }, &labeledExpr{ - pos: position{line: 400, col: 20, offset: 9583}, + pos: position{line: 403, col: 20, offset: 9843}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 400, col: 22, offset: 9585}, + pos: position{line: 403, col: 22, offset: 9845}, name: "SortArg", }, }, @@ -2832,53 +3040,53 @@ var g = &grammar{ }, { name: "SortArg", - pos: position{line: 402, col: 1, offset: 9642}, + pos: position{line: 405, col: 1, offset: 9902}, expr: &choiceExpr{ - pos: position{line: 403, col: 5, offset: 9654}, + pos: position{line: 406, col: 5, offset: 9914}, alternatives: []any{ &actionExpr{ - pos: position{line: 403, col: 5, offset: 9654}, + pos: position{line: 406, col: 5, offset: 9914}, run: (*parser).callonSortArg2, expr: &litMatcher{ - pos: position{line: 403, col: 5, offset: 9654}, + pos: position{line: 406, col: 5, offset: 9914}, val: "-r", ignoreCase: false, want: "\"-r\"", }, }, &actionExpr{ - pos: position{line: 404, col: 5, offset: 9721}, + pos: position{line: 407, col: 5, offset: 9981}, run: (*parser).callonSortArg4, expr: &seqExpr{ - pos: position{line: 404, col: 5, offset: 9721}, + pos: position{line: 407, col: 5, offset: 9981}, exprs: []any{ &litMatcher{ - pos: position{line: 404, col: 5, offset: 9721}, + pos: position{line: 407, col: 5, offset: 9981}, val: "-nulls", ignoreCase: false, want: "\"-nulls\"", }, &ruleRefExpr{ - pos: position{line: 404, col: 14, offset: 9730}, + pos: position{line: 407, col: 14, offset: 9990}, name: "_", }, &labeledExpr{ - pos: position{line: 404, col: 16, offset: 9732}, + pos: position{line: 407, col: 16, offset: 9992}, label: "where", expr: &actionExpr{ - pos: position{line: 404, col: 23, offset: 9739}, + pos: position{line: 407, col: 23, offset: 9999}, run: (*parser).callonSortArg9, expr: &choiceExpr{ - pos: position{line: 404, col: 24, offset: 9740}, + pos: position{line: 407, col: 24, offset: 10000}, alternatives: []any{ &litMatcher{ - pos: position{line: 404, col: 24, offset: 9740}, + pos: position{line: 407, col: 24, offset: 10000}, val: "first", ignoreCase: false, want: "\"first\"", }, &litMatcher{ - pos: position{line: 404, col: 34, offset: 9750}, + pos: position{line: 407, col: 34, offset: 10010}, val: "last", ignoreCase: false, want: "\"last\"", @@ -2897,44 +3105,44 @@ var g = &grammar{ }, { name: "TopOp", - pos: position{line: 408, col: 1, offset: 9869}, + pos: position{line: 411, col: 1, offset: 10129}, expr: &actionExpr{ - pos: position{line: 409, col: 5, offset: 9879}, + pos: position{line: 412, col: 5, offset: 10139}, run: (*parser).callonTopOp1, expr: &seqExpr{ - pos: position{line: 409, col: 5, offset: 9879}, + pos: position{line: 412, col: 5, offset: 10139}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 409, col: 5, offset: 9879}, + pos: position{line: 412, col: 5, offset: 10139}, name: "TOP", }, &andExpr{ - pos: position{line: 409, col: 9, offset: 9883}, + pos: position{line: 412, col: 9, offset: 10143}, expr: &ruleRefExpr{ - pos: position{line: 409, col: 10, offset: 9884}, + pos: position{line: 412, col: 10, offset: 10144}, name: "EOKW", }, }, &labeledExpr{ - pos: position{line: 409, col: 15, offset: 9889}, + pos: position{line: 412, col: 15, offset: 10149}, label: "limit", expr: &zeroOrOneExpr{ - pos: position{line: 409, col: 21, offset: 9895}, + pos: position{line: 412, col: 21, offset: 10155}, expr: &actionExpr{ - pos: position{line: 409, col: 22, offset: 9896}, + pos: position{line: 412, col: 22, offset: 10156}, run: (*parser).callonTopOp8, expr: &seqExpr{ - pos: position{line: 409, col: 22, offset: 9896}, + pos: position{line: 412, col: 22, offset: 10156}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 409, col: 22, offset: 9896}, + pos: position{line: 412, col: 22, offset: 10156}, name: "_", }, &labeledExpr{ - pos: position{line: 409, col: 24, offset: 9898}, + pos: position{line: 412, col: 24, offset: 10158}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 409, col: 26, offset: 9900}, + pos: position{line: 412, col: 26, offset: 10160}, name: "Expr", }, }, @@ -2944,19 +3152,19 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 409, col: 51, offset: 9925}, + pos: position{line: 412, col: 51, offset: 10185}, label: "flush", expr: &zeroOrOneExpr{ - pos: position{line: 409, col: 57, offset: 9931}, + pos: position{line: 412, col: 57, offset: 10191}, expr: &seqExpr{ - pos: position{line: 409, col: 58, offset: 9932}, + pos: position{line: 412, col: 58, offset: 10192}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 409, col: 58, offset: 9932}, + pos: position{line: 412, col: 58, offset: 10192}, name: "_", }, &litMatcher{ - pos: position{line: 409, col: 60, offset: 9934}, + pos: position{line: 412, col: 60, offset: 10194}, val: "-flush", ignoreCase: false, want: "\"-flush\"", @@ -2966,25 +3174,25 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 409, col: 71, offset: 9945}, + pos: position{line: 412, col: 71, offset: 10205}, label: "fields", expr: &zeroOrOneExpr{ - pos: position{line: 409, col: 78, offset: 9952}, + pos: position{line: 412, col: 78, offset: 10212}, expr: &actionExpr{ - pos: position{line: 409, col: 79, offset: 9953}, + pos: position{line: 412, col: 79, offset: 10213}, run: (*parser).callonTopOp20, expr: &seqExpr{ - pos: position{line: 409, col: 79, offset: 9953}, + pos: position{line: 412, col: 79, offset: 10213}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 409, col: 79, offset: 9953}, + pos: position{line: 412, col: 79, offset: 10213}, name: "_", }, &labeledExpr{ - pos: position{line: 409, col: 81, offset: 9955}, + pos: position{line: 412, col: 81, offset: 10215}, label: "f", expr: &ruleRefExpr{ - pos: position{line: 409, col: 83, offset: 9957}, + pos: position{line: 412, col: 83, offset: 10217}, name: "Lvals", }, }, @@ -3001,26 +3209,26 @@ var g = &grammar{ }, { name: "CutOp", - pos: position{line: 426, col: 1, offset: 10286}, + pos: position{line: 429, col: 1, offset: 10546}, expr: &actionExpr{ - pos: position{line: 427, col: 5, offset: 10296}, + pos: position{line: 430, col: 5, offset: 10556}, run: (*parser).callonCutOp1, expr: &seqExpr{ - pos: position{line: 427, col: 5, offset: 10296}, + pos: position{line: 430, col: 5, offset: 10556}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 427, col: 5, offset: 10296}, + pos: position{line: 430, col: 5, offset: 10556}, name: "CUT", }, &ruleRefExpr{ - pos: position{line: 427, col: 9, offset: 10300}, + pos: position{line: 430, col: 9, offset: 10560}, name: "_", }, &labeledExpr{ - pos: position{line: 427, col: 11, offset: 10302}, + pos: position{line: 430, col: 11, offset: 10562}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 427, col: 16, offset: 10307}, + pos: position{line: 430, col: 16, offset: 10567}, name: "FlexAssignments", }, }, @@ -3032,26 +3240,26 @@ var g = &grammar{ }, { name: "DropOp", - pos: position{line: 435, col: 1, offset: 10455}, + pos: position{line: 438, col: 1, offset: 10715}, expr: &actionExpr{ - pos: position{line: 436, col: 5, offset: 10466}, + pos: position{line: 439, col: 5, offset: 10726}, run: (*parser).callonDropOp1, expr: &seqExpr{ - pos: position{line: 436, col: 5, offset: 10466}, + pos: position{line: 439, col: 5, offset: 10726}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 436, col: 5, offset: 10466}, + pos: position{line: 439, col: 5, offset: 10726}, name: "DROP", }, &ruleRefExpr{ - pos: position{line: 436, col: 10, offset: 10471}, + pos: position{line: 439, col: 10, offset: 10731}, name: "_", }, &labeledExpr{ - pos: position{line: 436, col: 12, offset: 10473}, + pos: position{line: 439, col: 12, offset: 10733}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 436, col: 17, offset: 10478}, + pos: position{line: 439, col: 17, offset: 10738}, name: "Lvals", }, }, @@ -3063,36 +3271,36 @@ var g = &grammar{ }, { name: "HeadOp", - pos: position{line: 444, col: 1, offset: 10618}, + pos: position{line: 447, col: 1, offset: 10878}, expr: &choiceExpr{ - pos: position{line: 445, col: 5, offset: 10629}, + pos: position{line: 448, col: 5, offset: 10889}, alternatives: []any{ &actionExpr{ - pos: position{line: 445, col: 5, offset: 10629}, + pos: position{line: 448, col: 5, offset: 10889}, run: (*parser).callonHeadOp2, expr: &seqExpr{ - pos: position{line: 445, col: 5, offset: 10629}, + pos: position{line: 448, col: 5, offset: 10889}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 445, col: 5, offset: 10629}, + pos: position{line: 448, col: 5, offset: 10889}, name: "HEAD", }, &ruleRefExpr{ - pos: position{line: 445, col: 10, offset: 10634}, + pos: position{line: 448, col: 10, offset: 10894}, name: "_", }, ¬Expr{ - pos: position{line: 445, col: 12, offset: 10636}, + pos: position{line: 448, col: 12, offset: 10896}, expr: &ruleRefExpr{ - pos: position{line: 445, col: 13, offset: 10637}, + pos: position{line: 448, col: 13, offset: 10897}, name: "EndOfOp", }, }, &labeledExpr{ - pos: position{line: 445, col: 21, offset: 10645}, + pos: position{line: 448, col: 21, offset: 10905}, label: "count", expr: &ruleRefExpr{ - pos: position{line: 445, col: 27, offset: 10651}, + pos: position{line: 448, col: 27, offset: 10911}, name: "Expr", }, }, @@ -3100,26 +3308,26 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 452, col: 5, offset: 10781}, + pos: position{line: 455, col: 5, offset: 11041}, run: (*parser).callonHeadOp10, expr: &seqExpr{ - pos: position{line: 452, col: 5, offset: 10781}, + pos: position{line: 455, col: 5, offset: 11041}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 452, col: 5, offset: 10781}, + pos: position{line: 455, col: 5, offset: 11041}, name: "HEAD", }, ¬Expr{ - pos: position{line: 452, col: 10, offset: 10786}, + pos: position{line: 455, col: 10, offset: 11046}, expr: &seqExpr{ - pos: position{line: 452, col: 12, offset: 10788}, + pos: position{line: 455, col: 12, offset: 11048}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 452, col: 12, offset: 10788}, + pos: position{line: 455, col: 12, offset: 11048}, name: "__", }, &litMatcher{ - pos: position{line: 452, col: 15, offset: 10791}, + pos: position{line: 455, col: 15, offset: 11051}, val: "(", ignoreCase: false, want: "\"(\"", @@ -3128,9 +3336,9 @@ var g = &grammar{ }, }, &andExpr{ - pos: position{line: 452, col: 20, offset: 10796}, + pos: position{line: 455, col: 20, offset: 11056}, expr: &ruleRefExpr{ - pos: position{line: 452, col: 21, offset: 10797}, + pos: position{line: 455, col: 21, offset: 11057}, name: "EOKW", }, }, @@ -3144,36 +3352,36 @@ var g = &grammar{ }, { name: "TailOp", - pos: position{line: 459, col: 1, offset: 10891}, + pos: position{line: 462, col: 1, offset: 11151}, expr: &choiceExpr{ - pos: position{line: 460, col: 5, offset: 10902}, + pos: position{line: 463, col: 5, offset: 11162}, alternatives: []any{ &actionExpr{ - pos: position{line: 460, col: 5, offset: 10902}, + pos: position{line: 463, col: 5, offset: 11162}, run: (*parser).callonTailOp2, expr: &seqExpr{ - pos: position{line: 460, col: 5, offset: 10902}, + pos: position{line: 463, col: 5, offset: 11162}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 460, col: 5, offset: 10902}, + pos: position{line: 463, col: 5, offset: 11162}, name: "TAIL", }, &ruleRefExpr{ - pos: position{line: 460, col: 10, offset: 10907}, + pos: position{line: 463, col: 10, offset: 11167}, name: "_", }, ¬Expr{ - pos: position{line: 460, col: 12, offset: 10909}, + pos: position{line: 463, col: 12, offset: 11169}, expr: &ruleRefExpr{ - pos: position{line: 460, col: 13, offset: 10910}, + pos: position{line: 463, col: 13, offset: 11170}, name: "EndOfOp", }, }, &labeledExpr{ - pos: position{line: 460, col: 21, offset: 10918}, + pos: position{line: 463, col: 21, offset: 11178}, label: "count", expr: &ruleRefExpr{ - pos: position{line: 460, col: 27, offset: 10924}, + pos: position{line: 463, col: 27, offset: 11184}, name: "Expr", }, }, @@ -3181,26 +3389,26 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 467, col: 5, offset: 11054}, + pos: position{line: 470, col: 5, offset: 11314}, run: (*parser).callonTailOp10, expr: &seqExpr{ - pos: position{line: 467, col: 5, offset: 11054}, + pos: position{line: 470, col: 5, offset: 11314}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 467, col: 5, offset: 11054}, + pos: position{line: 470, col: 5, offset: 11314}, name: "TAIL", }, ¬Expr{ - pos: position{line: 467, col: 10, offset: 11059}, + pos: position{line: 470, col: 10, offset: 11319}, expr: &seqExpr{ - pos: position{line: 467, col: 12, offset: 11061}, + pos: position{line: 470, col: 12, offset: 11321}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 467, col: 12, offset: 11061}, + pos: position{line: 470, col: 12, offset: 11321}, name: "__", }, &litMatcher{ - pos: position{line: 467, col: 15, offset: 11064}, + pos: position{line: 470, col: 15, offset: 11324}, val: "(", ignoreCase: false, want: "\"(\"", @@ -3209,9 +3417,9 @@ var g = &grammar{ }, }, &andExpr{ - pos: position{line: 467, col: 20, offset: 11069}, + pos: position{line: 470, col: 20, offset: 11329}, expr: &ruleRefExpr{ - pos: position{line: 467, col: 21, offset: 11070}, + pos: position{line: 470, col: 21, offset: 11330}, name: "EOKW", }, }, @@ -3225,26 +3433,26 @@ var g = &grammar{ }, { name: "WhereOp", - pos: position{line: 474, col: 1, offset: 11164}, + pos: position{line: 477, col: 1, offset: 11424}, expr: &actionExpr{ - pos: position{line: 475, col: 5, offset: 11176}, + pos: position{line: 478, col: 5, offset: 11436}, run: (*parser).callonWhereOp1, expr: &seqExpr{ - pos: position{line: 475, col: 5, offset: 11176}, + pos: position{line: 478, col: 5, offset: 11436}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 475, col: 5, offset: 11176}, + pos: position{line: 478, col: 5, offset: 11436}, name: "WHERE", }, &ruleRefExpr{ - pos: position{line: 475, col: 11, offset: 11182}, + pos: position{line: 478, col: 11, offset: 11442}, name: "_", }, &labeledExpr{ - pos: position{line: 475, col: 13, offset: 11184}, + pos: position{line: 478, col: 13, offset: 11444}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 475, col: 18, offset: 11189}, + pos: position{line: 478, col: 18, offset: 11449}, name: "Expr", }, }, @@ -3256,26 +3464,26 @@ var g = &grammar{ }, { name: "UniqOp", - pos: position{line: 483, col: 1, offset: 11316}, + pos: position{line: 486, col: 1, offset: 11576}, expr: &choiceExpr{ - pos: position{line: 484, col: 5, offset: 11327}, + pos: position{line: 487, col: 5, offset: 11587}, alternatives: []any{ &actionExpr{ - pos: position{line: 484, col: 5, offset: 11327}, + pos: position{line: 487, col: 5, offset: 11587}, run: (*parser).callonUniqOp2, expr: &seqExpr{ - pos: position{line: 484, col: 5, offset: 11327}, + pos: position{line: 487, col: 5, offset: 11587}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 484, col: 5, offset: 11327}, + pos: position{line: 487, col: 5, offset: 11587}, name: "UNIQ", }, &ruleRefExpr{ - pos: position{line: 484, col: 10, offset: 11332}, + pos: position{line: 487, col: 10, offset: 11592}, name: "_", }, &litMatcher{ - pos: position{line: 484, col: 12, offset: 11334}, + pos: position{line: 487, col: 12, offset: 11594}, val: "-c", ignoreCase: false, want: "\"-c\"", @@ -3284,26 +3492,26 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 487, col: 5, offset: 11419}, + pos: position{line: 490, col: 5, offset: 11679}, run: (*parser).callonUniqOp7, expr: &seqExpr{ - pos: position{line: 487, col: 5, offset: 11419}, + pos: position{line: 490, col: 5, offset: 11679}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 487, col: 5, offset: 11419}, + pos: position{line: 490, col: 5, offset: 11679}, name: "UNIQ", }, ¬Expr{ - pos: position{line: 487, col: 10, offset: 11424}, + pos: position{line: 490, col: 10, offset: 11684}, expr: &seqExpr{ - pos: position{line: 487, col: 12, offset: 11426}, + pos: position{line: 490, col: 12, offset: 11686}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 487, col: 12, offset: 11426}, + pos: position{line: 490, col: 12, offset: 11686}, name: "__", }, &litMatcher{ - pos: position{line: 487, col: 15, offset: 11429}, + pos: position{line: 490, col: 15, offset: 11689}, val: "(", ignoreCase: false, want: "\"(\"", @@ -3312,9 +3520,9 @@ var g = &grammar{ }, }, &andExpr{ - pos: position{line: 487, col: 20, offset: 11434}, + pos: position{line: 490, col: 20, offset: 11694}, expr: &ruleRefExpr{ - pos: position{line: 487, col: 21, offset: 11435}, + pos: position{line: 490, col: 21, offset: 11695}, name: "EOKW", }, }, @@ -3328,26 +3536,26 @@ var g = &grammar{ }, { name: "PutOp", - pos: position{line: 491, col: 1, offset: 11504}, + pos: position{line: 494, col: 1, offset: 11764}, expr: &actionExpr{ - pos: position{line: 492, col: 5, offset: 11514}, + pos: position{line: 495, col: 5, offset: 11774}, run: (*parser).callonPutOp1, expr: &seqExpr{ - pos: position{line: 492, col: 5, offset: 11514}, + pos: position{line: 495, col: 5, offset: 11774}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 492, col: 5, offset: 11514}, + pos: position{line: 495, col: 5, offset: 11774}, name: "PUT", }, &ruleRefExpr{ - pos: position{line: 492, col: 9, offset: 11518}, + pos: position{line: 495, col: 9, offset: 11778}, name: "_", }, &labeledExpr{ - pos: position{line: 492, col: 11, offset: 11520}, + pos: position{line: 495, col: 11, offset: 11780}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 492, col: 16, offset: 11525}, + pos: position{line: 495, col: 16, offset: 11785}, name: "Assignments", }, }, @@ -3359,59 +3567,59 @@ var g = &grammar{ }, { name: "RenameOp", - pos: position{line: 500, col: 1, offset: 11675}, + pos: position{line: 503, col: 1, offset: 11935}, expr: &actionExpr{ - pos: position{line: 501, col: 5, offset: 11688}, + pos: position{line: 504, col: 5, offset: 11948}, run: (*parser).callonRenameOp1, expr: &seqExpr{ - pos: position{line: 501, col: 5, offset: 11688}, + pos: position{line: 504, col: 5, offset: 11948}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 501, col: 5, offset: 11688}, + pos: position{line: 504, col: 5, offset: 11948}, name: "RENAME", }, &ruleRefExpr{ - pos: position{line: 501, col: 12, offset: 11695}, + pos: position{line: 504, col: 12, offset: 11955}, name: "_", }, &labeledExpr{ - pos: position{line: 501, col: 14, offset: 11697}, + pos: position{line: 504, col: 14, offset: 11957}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 501, col: 20, offset: 11703}, + pos: position{line: 504, col: 20, offset: 11963}, name: "Assignment", }, }, &labeledExpr{ - pos: position{line: 501, col: 31, offset: 11714}, + pos: position{line: 504, col: 31, offset: 11974}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 501, col: 36, offset: 11719}, + pos: position{line: 504, col: 36, offset: 11979}, expr: &actionExpr{ - pos: position{line: 501, col: 37, offset: 11720}, + pos: position{line: 504, col: 37, offset: 11980}, run: (*parser).callonRenameOp9, expr: &seqExpr{ - pos: position{line: 501, col: 37, offset: 11720}, + pos: position{line: 504, col: 37, offset: 11980}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 501, col: 37, offset: 11720}, + pos: position{line: 504, col: 37, offset: 11980}, name: "__", }, &litMatcher{ - pos: position{line: 501, col: 40, offset: 11723}, + pos: position{line: 504, col: 40, offset: 11983}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 501, col: 44, offset: 11727}, + pos: position{line: 504, col: 44, offset: 11987}, name: "__", }, &labeledExpr{ - pos: position{line: 501, col: 47, offset: 11730}, + pos: position{line: 504, col: 47, offset: 11990}, label: "cl", expr: &ruleRefExpr{ - pos: position{line: 501, col: 50, offset: 11733}, + pos: position{line: 504, col: 50, offset: 11993}, name: "Assignment", }, }, @@ -3428,28 +3636,28 @@ var g = &grammar{ }, { name: "FuseOp", - pos: position{line: 514, col: 1, offset: 12198}, + pos: position{line: 517, col: 1, offset: 12458}, expr: &actionExpr{ - pos: position{line: 515, col: 5, offset: 12209}, + pos: position{line: 518, col: 5, offset: 12469}, run: (*parser).callonFuseOp1, expr: &seqExpr{ - pos: position{line: 515, col: 5, offset: 12209}, + pos: position{line: 518, col: 5, offset: 12469}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 515, col: 5, offset: 12209}, + pos: position{line: 518, col: 5, offset: 12469}, name: "FUSE", }, ¬Expr{ - pos: position{line: 515, col: 10, offset: 12214}, + pos: position{line: 518, col: 10, offset: 12474}, expr: &seqExpr{ - pos: position{line: 515, col: 12, offset: 12216}, + pos: position{line: 518, col: 12, offset: 12476}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 515, col: 12, offset: 12216}, + pos: position{line: 518, col: 12, offset: 12476}, name: "__", }, &litMatcher{ - pos: position{line: 515, col: 15, offset: 12219}, + pos: position{line: 518, col: 15, offset: 12479}, val: "(", ignoreCase: false, want: "\"(\"", @@ -3458,9 +3666,9 @@ var g = &grammar{ }, }, &andExpr{ - pos: position{line: 515, col: 20, offset: 12224}, + pos: position{line: 518, col: 20, offset: 12484}, expr: &ruleRefExpr{ - pos: position{line: 515, col: 21, offset: 12225}, + pos: position{line: 518, col: 21, offset: 12485}, name: "EOKW", }, }, @@ -3472,28 +3680,28 @@ var g = &grammar{ }, { name: "ShapeOp", - pos: position{line: 519, col: 1, offset: 12294}, + pos: position{line: 522, col: 1, offset: 12554}, expr: &actionExpr{ - pos: position{line: 520, col: 5, offset: 12306}, + pos: position{line: 523, col: 5, offset: 12566}, run: (*parser).callonShapeOp1, expr: &seqExpr{ - pos: position{line: 520, col: 5, offset: 12306}, + pos: position{line: 523, col: 5, offset: 12566}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 520, col: 5, offset: 12306}, + pos: position{line: 523, col: 5, offset: 12566}, name: "SHAPE", }, ¬Expr{ - pos: position{line: 520, col: 11, offset: 12312}, + pos: position{line: 523, col: 11, offset: 12572}, expr: &seqExpr{ - pos: position{line: 520, col: 13, offset: 12314}, + pos: position{line: 523, col: 13, offset: 12574}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 520, col: 13, offset: 12314}, + pos: position{line: 523, col: 13, offset: 12574}, name: "__", }, &litMatcher{ - pos: position{line: 520, col: 16, offset: 12317}, + pos: position{line: 523, col: 16, offset: 12577}, val: "(", ignoreCase: false, want: "\"(\"", @@ -3502,9 +3710,9 @@ var g = &grammar{ }, }, &andExpr{ - pos: position{line: 520, col: 21, offset: 12322}, + pos: position{line: 523, col: 21, offset: 12582}, expr: &ruleRefExpr{ - pos: position{line: 520, col: 22, offset: 12323}, + pos: position{line: 523, col: 22, offset: 12583}, name: "EOKW", }, }, @@ -3516,72 +3724,72 @@ var g = &grammar{ }, { name: "JoinOp", - pos: position{line: 524, col: 1, offset: 12394}, + pos: position{line: 527, col: 1, offset: 12654}, expr: &actionExpr{ - pos: position{line: 525, col: 5, offset: 12405}, + pos: position{line: 528, col: 5, offset: 12665}, run: (*parser).callonJoinOp1, expr: &seqExpr{ - pos: position{line: 525, col: 5, offset: 12405}, + pos: position{line: 528, col: 5, offset: 12665}, exprs: []any{ &labeledExpr{ - pos: position{line: 525, col: 5, offset: 12405}, + pos: position{line: 528, col: 5, offset: 12665}, label: "style", expr: &ruleRefExpr{ - pos: position{line: 525, col: 11, offset: 12411}, + pos: position{line: 528, col: 11, offset: 12671}, name: "JoinStyle", }, }, &ruleRefExpr{ - pos: position{line: 525, col: 21, offset: 12421}, + pos: position{line: 528, col: 21, offset: 12681}, name: "JOIN", }, &labeledExpr{ - pos: position{line: 525, col: 26, offset: 12426}, + pos: position{line: 528, col: 26, offset: 12686}, label: "rightInput", expr: &ruleRefExpr{ - pos: position{line: 525, col: 37, offset: 12437}, + pos: position{line: 528, col: 37, offset: 12697}, name: "JoinRightInput", }, }, &ruleRefExpr{ - pos: position{line: 525, col: 52, offset: 12452}, + pos: position{line: 528, col: 52, offset: 12712}, name: "ON", }, &ruleRefExpr{ - pos: position{line: 525, col: 55, offset: 12455}, + pos: position{line: 528, col: 55, offset: 12715}, name: "_", }, &labeledExpr{ - pos: position{line: 525, col: 57, offset: 12457}, + pos: position{line: 528, col: 57, offset: 12717}, label: "key", expr: &ruleRefExpr{ - pos: position{line: 525, col: 61, offset: 12461}, + pos: position{line: 528, col: 61, offset: 12721}, name: "JoinKey", }, }, &labeledExpr{ - pos: position{line: 525, col: 69, offset: 12469}, + pos: position{line: 528, col: 69, offset: 12729}, label: "optKey", expr: &zeroOrOneExpr{ - pos: position{line: 525, col: 76, offset: 12476}, + pos: position{line: 528, col: 76, offset: 12736}, expr: &seqExpr{ - pos: position{line: 525, col: 77, offset: 12477}, + pos: position{line: 528, col: 77, offset: 12737}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 525, col: 77, offset: 12477}, + pos: position{line: 528, col: 77, offset: 12737}, name: "__", }, &choiceExpr{ - pos: position{line: 525, col: 81, offset: 12481}, + pos: position{line: 528, col: 81, offset: 12741}, alternatives: []any{ &litMatcher{ - pos: position{line: 525, col: 81, offset: 12481}, + pos: position{line: 528, col: 81, offset: 12741}, val: "==", ignoreCase: false, want: "\"==\"", }, &litMatcher{ - pos: position{line: 525, col: 88, offset: 12488}, + pos: position{line: 528, col: 88, offset: 12748}, val: "=", ignoreCase: false, want: "\"=\"", @@ -3589,11 +3797,11 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 525, col: 93, offset: 12493}, + pos: position{line: 528, col: 93, offset: 12753}, name: "__", }, &ruleRefExpr{ - pos: position{line: 525, col: 96, offset: 12496}, + pos: position{line: 528, col: 96, offset: 12756}, name: "JoinKey", }, }, @@ -3601,19 +3809,19 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 525, col: 106, offset: 12506}, + pos: position{line: 528, col: 106, offset: 12766}, label: "optArgs", expr: &zeroOrOneExpr{ - pos: position{line: 525, col: 114, offset: 12514}, + pos: position{line: 528, col: 114, offset: 12774}, expr: &seqExpr{ - pos: position{line: 525, col: 115, offset: 12515}, + pos: position{line: 528, col: 115, offset: 12775}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 525, col: 115, offset: 12515}, + pos: position{line: 528, col: 115, offset: 12775}, name: "_", }, &ruleRefExpr{ - pos: position{line: 525, col: 117, offset: 12517}, + pos: position{line: 528, col: 117, offset: 12777}, name: "FlexAssignments", }, }, @@ -3628,83 +3836,83 @@ var g = &grammar{ }, { name: "JoinStyle", - pos: position{line: 544, col: 1, offset: 12967}, + pos: position{line: 547, col: 1, offset: 13227}, expr: &choiceExpr{ - pos: position{line: 545, col: 5, offset: 12981}, + pos: position{line: 548, col: 5, offset: 13241}, alternatives: []any{ &actionExpr{ - pos: position{line: 545, col: 5, offset: 12981}, + pos: position{line: 548, col: 5, offset: 13241}, run: (*parser).callonJoinStyle2, expr: &seqExpr{ - pos: position{line: 545, col: 5, offset: 12981}, + pos: position{line: 548, col: 5, offset: 13241}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 545, col: 5, offset: 12981}, + pos: position{line: 548, col: 5, offset: 13241}, name: "ANTI", }, &ruleRefExpr{ - pos: position{line: 545, col: 10, offset: 12986}, + pos: position{line: 548, col: 10, offset: 13246}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 546, col: 5, offset: 13016}, + pos: position{line: 549, col: 5, offset: 13276}, run: (*parser).callonJoinStyle6, expr: &seqExpr{ - pos: position{line: 546, col: 5, offset: 13016}, + pos: position{line: 549, col: 5, offset: 13276}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 546, col: 5, offset: 13016}, + pos: position{line: 549, col: 5, offset: 13276}, name: "INNER", }, &ruleRefExpr{ - pos: position{line: 546, col: 11, offset: 13022}, + pos: position{line: 549, col: 11, offset: 13282}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 547, col: 5, offset: 13052}, + pos: position{line: 550, col: 5, offset: 13312}, run: (*parser).callonJoinStyle10, expr: &seqExpr{ - pos: position{line: 547, col: 5, offset: 13052}, + pos: position{line: 550, col: 5, offset: 13312}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 547, col: 5, offset: 13052}, + pos: position{line: 550, col: 5, offset: 13312}, name: "LEFT", }, &ruleRefExpr{ - pos: position{line: 547, col: 11, offset: 13058}, + pos: position{line: 550, col: 11, offset: 13318}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 548, col: 5, offset: 13087}, + pos: position{line: 551, col: 5, offset: 13347}, run: (*parser).callonJoinStyle14, expr: &seqExpr{ - pos: position{line: 548, col: 5, offset: 13087}, + pos: position{line: 551, col: 5, offset: 13347}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 548, col: 5, offset: 13087}, + pos: position{line: 551, col: 5, offset: 13347}, name: "RIGHT", }, &ruleRefExpr{ - pos: position{line: 548, col: 11, offset: 13093}, + pos: position{line: 551, col: 11, offset: 13353}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 549, col: 5, offset: 13123}, + pos: position{line: 552, col: 5, offset: 13383}, run: (*parser).callonJoinStyle18, expr: &litMatcher{ - pos: position{line: 549, col: 5, offset: 13123}, + pos: position{line: 552, col: 5, offset: 13383}, val: "", ignoreCase: false, want: "\"\"", @@ -3717,60 +3925,60 @@ var g = &grammar{ }, { name: "JoinRightInput", - pos: position{line: 551, col: 1, offset: 13158}, + pos: position{line: 554, col: 1, offset: 13418}, expr: &choiceExpr{ - pos: position{line: 552, col: 5, offset: 13177}, + pos: position{line: 555, col: 5, offset: 13437}, alternatives: []any{ &actionExpr{ - pos: position{line: 552, col: 5, offset: 13177}, + pos: position{line: 555, col: 5, offset: 13437}, run: (*parser).callonJoinRightInput2, expr: &seqExpr{ - pos: position{line: 552, col: 5, offset: 13177}, + pos: position{line: 555, col: 5, offset: 13437}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 552, col: 5, offset: 13177}, + pos: position{line: 555, col: 5, offset: 13437}, name: "__", }, &litMatcher{ - pos: position{line: 552, col: 8, offset: 13180}, + pos: position{line: 555, col: 8, offset: 13440}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 552, col: 12, offset: 13184}, + pos: position{line: 555, col: 12, offset: 13444}, name: "__", }, &labeledExpr{ - pos: position{line: 552, col: 15, offset: 13187}, + pos: position{line: 555, col: 15, offset: 13447}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 552, col: 17, offset: 13189}, + pos: position{line: 555, col: 17, offset: 13449}, name: "Seq", }, }, &ruleRefExpr{ - pos: position{line: 552, col: 21, offset: 13193}, + pos: position{line: 555, col: 21, offset: 13453}, name: "__", }, &litMatcher{ - pos: position{line: 552, col: 24, offset: 13196}, + pos: position{line: 555, col: 24, offset: 13456}, val: ")", ignoreCase: false, want: "\")\"", }, &ruleRefExpr{ - pos: position{line: 552, col: 28, offset: 13200}, + pos: position{line: 555, col: 28, offset: 13460}, name: "__", }, }, }, }, &actionExpr{ - pos: position{line: 553, col: 5, offset: 13225}, + pos: position{line: 556, col: 5, offset: 13485}, run: (*parser).callonJoinRightInput12, expr: &ruleRefExpr{ - pos: position{line: 553, col: 5, offset: 13225}, + pos: position{line: 556, col: 5, offset: 13485}, name: "_", }, }, @@ -3781,36 +3989,36 @@ var g = &grammar{ }, { name: "JoinKey", - pos: position{line: 555, col: 1, offset: 13248}, + pos: position{line: 558, col: 1, offset: 13508}, expr: &choiceExpr{ - pos: position{line: 556, col: 5, offset: 13260}, + pos: position{line: 559, col: 5, offset: 13520}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 556, col: 5, offset: 13260}, + pos: position{line: 559, col: 5, offset: 13520}, name: "Lval", }, &actionExpr{ - pos: position{line: 557, col: 5, offset: 13269}, + pos: position{line: 560, col: 5, offset: 13529}, run: (*parser).callonJoinKey3, expr: &seqExpr{ - pos: position{line: 557, col: 5, offset: 13269}, + pos: position{line: 560, col: 5, offset: 13529}, exprs: []any{ &litMatcher{ - pos: position{line: 557, col: 5, offset: 13269}, + pos: position{line: 560, col: 5, offset: 13529}, val: "(", ignoreCase: false, want: "\"(\"", }, &labeledExpr{ - pos: position{line: 557, col: 9, offset: 13273}, + pos: position{line: 560, col: 9, offset: 13533}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 557, col: 14, offset: 13278}, + pos: position{line: 560, col: 14, offset: 13538}, name: "Expr", }, }, &litMatcher{ - pos: position{line: 557, col: 19, offset: 13283}, + pos: position{line: 560, col: 19, offset: 13543}, val: ")", ignoreCase: false, want: "\")\"", @@ -3825,44 +4033,44 @@ var g = &grammar{ }, { name: "SampleOp", - pos: position{line: 559, col: 1, offset: 13309}, + pos: position{line: 562, col: 1, offset: 13569}, expr: &actionExpr{ - pos: position{line: 560, col: 5, offset: 13322}, + pos: position{line: 563, col: 5, offset: 13582}, run: (*parser).callonSampleOp1, expr: &seqExpr{ - pos: position{line: 560, col: 5, offset: 13322}, + pos: position{line: 563, col: 5, offset: 13582}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 560, col: 5, offset: 13322}, + pos: position{line: 563, col: 5, offset: 13582}, name: "SAMPLE", }, &andExpr{ - pos: position{line: 560, col: 12, offset: 13329}, + pos: position{line: 563, col: 12, offset: 13589}, expr: &ruleRefExpr{ - pos: position{line: 560, col: 13, offset: 13330}, + pos: position{line: 563, col: 13, offset: 13590}, name: "EOKW", }, }, &labeledExpr{ - pos: position{line: 560, col: 18, offset: 13335}, + pos: position{line: 563, col: 18, offset: 13595}, label: "expr", expr: &zeroOrOneExpr{ - pos: position{line: 560, col: 23, offset: 13340}, + pos: position{line: 563, col: 23, offset: 13600}, expr: &actionExpr{ - pos: position{line: 560, col: 24, offset: 13341}, + pos: position{line: 563, col: 24, offset: 13601}, run: (*parser).callonSampleOp8, expr: &seqExpr{ - pos: position{line: 560, col: 24, offset: 13341}, + pos: position{line: 563, col: 24, offset: 13601}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 560, col: 24, offset: 13341}, + pos: position{line: 563, col: 24, offset: 13601}, name: "_", }, &labeledExpr{ - pos: position{line: 560, col: 26, offset: 13343}, + pos: position{line: 563, col: 26, offset: 13603}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 560, col: 28, offset: 13345}, + pos: position{line: 563, col: 28, offset: 13605}, name: "Lval", }, }, @@ -3879,15 +4087,15 @@ var g = &grammar{ }, { name: "OpAssignment", - pos: position{line: 573, col: 1, offset: 13783}, + pos: position{line: 576, col: 1, offset: 14043}, expr: &actionExpr{ - pos: position{line: 574, col: 5, offset: 13800}, + pos: position{line: 577, col: 5, offset: 14060}, run: (*parser).callonOpAssignment1, expr: &labeledExpr{ - pos: position{line: 574, col: 5, offset: 13800}, + pos: position{line: 577, col: 5, offset: 14060}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 574, col: 7, offset: 13802}, + pos: position{line: 577, col: 7, offset: 14062}, name: "Assignments", }, }, @@ -3897,69 +4105,69 @@ var g = &grammar{ }, { name: "LoadOp", - pos: position{line: 582, col: 1, offset: 13974}, + pos: position{line: 585, col: 1, offset: 14234}, expr: &actionExpr{ - pos: position{line: 583, col: 5, offset: 13985}, + pos: position{line: 586, col: 5, offset: 14245}, run: (*parser).callonLoadOp1, expr: &seqExpr{ - pos: position{line: 583, col: 5, offset: 13985}, + pos: position{line: 586, col: 5, offset: 14245}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 583, col: 5, offset: 13985}, + pos: position{line: 586, col: 5, offset: 14245}, name: "LOAD", }, &ruleRefExpr{ - pos: position{line: 583, col: 10, offset: 13990}, + pos: position{line: 586, col: 10, offset: 14250}, name: "_", }, &labeledExpr{ - pos: position{line: 583, col: 12, offset: 13992}, + pos: position{line: 586, col: 12, offset: 14252}, label: "pool", expr: &ruleRefExpr{ - pos: position{line: 583, col: 17, offset: 13997}, + pos: position{line: 586, col: 17, offset: 14257}, name: "Name", }, }, &labeledExpr{ - pos: position{line: 583, col: 22, offset: 14002}, + pos: position{line: 586, col: 22, offset: 14262}, label: "branch", expr: &zeroOrOneExpr{ - pos: position{line: 583, col: 29, offset: 14009}, + pos: position{line: 586, col: 29, offset: 14269}, expr: &ruleRefExpr{ - pos: position{line: 583, col: 29, offset: 14009}, + pos: position{line: 586, col: 29, offset: 14269}, name: "PoolBranch", }, }, }, &labeledExpr{ - pos: position{line: 583, col: 41, offset: 14021}, + pos: position{line: 586, col: 41, offset: 14281}, label: "author", expr: &zeroOrOneExpr{ - pos: position{line: 583, col: 48, offset: 14028}, + pos: position{line: 586, col: 48, offset: 14288}, expr: &ruleRefExpr{ - pos: position{line: 583, col: 48, offset: 14028}, + pos: position{line: 586, col: 48, offset: 14288}, name: "AuthorArg", }, }, }, &labeledExpr{ - pos: position{line: 583, col: 59, offset: 14039}, + pos: position{line: 586, col: 59, offset: 14299}, label: "message", expr: &zeroOrOneExpr{ - pos: position{line: 583, col: 67, offset: 14047}, + pos: position{line: 586, col: 67, offset: 14307}, expr: &ruleRefExpr{ - pos: position{line: 583, col: 67, offset: 14047}, + pos: position{line: 586, col: 67, offset: 14307}, name: "MessageArg", }, }, }, &labeledExpr{ - pos: position{line: 583, col: 79, offset: 14059}, + pos: position{line: 586, col: 79, offset: 14319}, label: "meta", expr: &zeroOrOneExpr{ - pos: position{line: 583, col: 84, offset: 14064}, + pos: position{line: 586, col: 84, offset: 14324}, expr: &ruleRefExpr{ - pos: position{line: 583, col: 84, offset: 14064}, + pos: position{line: 586, col: 84, offset: 14324}, name: "MetaArg", }, }, @@ -3972,30 +4180,30 @@ var g = &grammar{ }, { name: "AuthorArg", - pos: position{line: 595, col: 1, offset: 14346}, + pos: position{line: 598, col: 1, offset: 14606}, expr: &actionExpr{ - pos: position{line: 596, col: 5, offset: 14360}, + pos: position{line: 599, col: 5, offset: 14620}, run: (*parser).callonAuthorArg1, expr: &seqExpr{ - pos: position{line: 596, col: 5, offset: 14360}, + pos: position{line: 599, col: 5, offset: 14620}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 596, col: 5, offset: 14360}, + pos: position{line: 599, col: 5, offset: 14620}, name: "_", }, &ruleRefExpr{ - pos: position{line: 596, col: 7, offset: 14362}, + pos: position{line: 599, col: 7, offset: 14622}, name: "AUTHOR", }, &ruleRefExpr{ - pos: position{line: 596, col: 14, offset: 14369}, + pos: position{line: 599, col: 14, offset: 14629}, name: "_", }, &labeledExpr{ - pos: position{line: 596, col: 16, offset: 14371}, + pos: position{line: 599, col: 16, offset: 14631}, label: "n", expr: &ruleRefExpr{ - pos: position{line: 596, col: 18, offset: 14373}, + pos: position{line: 599, col: 18, offset: 14633}, name: "Name", }, }, @@ -4007,30 +4215,30 @@ var g = &grammar{ }, { name: "MessageArg", - pos: position{line: 598, col: 1, offset: 14397}, + pos: position{line: 601, col: 1, offset: 14657}, expr: &actionExpr{ - pos: position{line: 599, col: 5, offset: 14412}, + pos: position{line: 602, col: 5, offset: 14672}, run: (*parser).callonMessageArg1, expr: &seqExpr{ - pos: position{line: 599, col: 5, offset: 14412}, + pos: position{line: 602, col: 5, offset: 14672}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 599, col: 5, offset: 14412}, + pos: position{line: 602, col: 5, offset: 14672}, name: "_", }, &ruleRefExpr{ - pos: position{line: 599, col: 7, offset: 14414}, + pos: position{line: 602, col: 7, offset: 14674}, name: "MESSAGE", }, &ruleRefExpr{ - pos: position{line: 599, col: 15, offset: 14422}, + pos: position{line: 602, col: 15, offset: 14682}, name: "_", }, &labeledExpr{ - pos: position{line: 599, col: 17, offset: 14424}, + pos: position{line: 602, col: 17, offset: 14684}, label: "n", expr: &ruleRefExpr{ - pos: position{line: 599, col: 19, offset: 14426}, + pos: position{line: 602, col: 19, offset: 14686}, name: "Name", }, }, @@ -4042,30 +4250,30 @@ var g = &grammar{ }, { name: "MetaArg", - pos: position{line: 601, col: 1, offset: 14450}, + pos: position{line: 604, col: 1, offset: 14710}, expr: &actionExpr{ - pos: position{line: 602, col: 5, offset: 14462}, + pos: position{line: 605, col: 5, offset: 14722}, run: (*parser).callonMetaArg1, expr: &seqExpr{ - pos: position{line: 602, col: 5, offset: 14462}, + pos: position{line: 605, col: 5, offset: 14722}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 602, col: 5, offset: 14462}, + pos: position{line: 605, col: 5, offset: 14722}, name: "_", }, &ruleRefExpr{ - pos: position{line: 602, col: 7, offset: 14464}, + pos: position{line: 605, col: 7, offset: 14724}, name: "META", }, &ruleRefExpr{ - pos: position{line: 602, col: 12, offset: 14469}, + pos: position{line: 605, col: 12, offset: 14729}, name: "_", }, &labeledExpr{ - pos: position{line: 602, col: 14, offset: 14471}, + pos: position{line: 605, col: 14, offset: 14731}, label: "n", expr: &ruleRefExpr{ - pos: position{line: 602, col: 16, offset: 14473}, + pos: position{line: 605, col: 16, offset: 14733}, name: "Name", }, }, @@ -4077,24 +4285,24 @@ var g = &grammar{ }, { name: "PoolBranch", - pos: position{line: 604, col: 1, offset: 14497}, + pos: position{line: 607, col: 1, offset: 14757}, expr: &actionExpr{ - pos: position{line: 605, col: 5, offset: 14512}, + pos: position{line: 608, col: 5, offset: 14772}, run: (*parser).callonPoolBranch1, expr: &seqExpr{ - pos: position{line: 605, col: 5, offset: 14512}, + pos: position{line: 608, col: 5, offset: 14772}, exprs: []any{ &litMatcher{ - pos: position{line: 605, col: 5, offset: 14512}, + pos: position{line: 608, col: 5, offset: 14772}, val: "@", ignoreCase: false, want: "\"@\"", }, &labeledExpr{ - pos: position{line: 605, col: 9, offset: 14516}, + pos: position{line: 608, col: 9, offset: 14776}, label: "branch", expr: &ruleRefExpr{ - pos: position{line: 605, col: 16, offset: 14523}, + pos: position{line: 608, col: 16, offset: 14783}, name: "Name", }, }, @@ -4106,26 +4314,26 @@ var g = &grammar{ }, { name: "OutputOp", - pos: position{line: 607, col: 1, offset: 14552}, + pos: position{line: 610, col: 1, offset: 14812}, expr: &actionExpr{ - pos: position{line: 608, col: 5, offset: 14565}, + pos: position{line: 611, col: 5, offset: 14825}, run: (*parser).callonOutputOp1, expr: &seqExpr{ - pos: position{line: 608, col: 5, offset: 14565}, + pos: position{line: 611, col: 5, offset: 14825}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 608, col: 5, offset: 14565}, + pos: position{line: 611, col: 5, offset: 14825}, name: "OUTPUT", }, &ruleRefExpr{ - pos: position{line: 608, col: 12, offset: 14572}, + pos: position{line: 611, col: 12, offset: 14832}, name: "_", }, &labeledExpr{ - pos: position{line: 608, col: 14, offset: 14574}, + pos: position{line: 611, col: 14, offset: 14834}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 608, col: 19, offset: 14579}, + pos: position{line: 611, col: 19, offset: 14839}, name: "Identifier", }, }, @@ -4137,44 +4345,44 @@ var g = &grammar{ }, { name: "DebugOp", - pos: position{line: 616, col: 1, offset: 14713}, + pos: position{line: 619, col: 1, offset: 14973}, expr: &actionExpr{ - pos: position{line: 617, col: 5, offset: 14725}, + pos: position{line: 620, col: 5, offset: 14985}, run: (*parser).callonDebugOp1, expr: &seqExpr{ - pos: position{line: 617, col: 5, offset: 14725}, + pos: position{line: 620, col: 5, offset: 14985}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 617, col: 5, offset: 14725}, + pos: position{line: 620, col: 5, offset: 14985}, name: "DEBUG", }, &andExpr{ - pos: position{line: 617, col: 11, offset: 14731}, + pos: position{line: 620, col: 11, offset: 14991}, expr: &ruleRefExpr{ - pos: position{line: 617, col: 12, offset: 14732}, + pos: position{line: 620, col: 12, offset: 14992}, name: "EOKW", }, }, &labeledExpr{ - pos: position{line: 617, col: 17, offset: 14737}, + pos: position{line: 620, col: 17, offset: 14997}, label: "expr", expr: &zeroOrOneExpr{ - pos: position{line: 617, col: 22, offset: 14742}, + pos: position{line: 620, col: 22, offset: 15002}, expr: &actionExpr{ - pos: position{line: 617, col: 23, offset: 14743}, + pos: position{line: 620, col: 23, offset: 15003}, run: (*parser).callonDebugOp8, expr: &seqExpr{ - pos: position{line: 617, col: 23, offset: 14743}, + pos: position{line: 620, col: 23, offset: 15003}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 617, col: 23, offset: 14743}, + pos: position{line: 620, col: 23, offset: 15003}, name: "_", }, &labeledExpr{ - pos: position{line: 617, col: 25, offset: 14745}, + pos: position{line: 620, col: 25, offset: 15005}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 617, col: 27, offset: 14747}, + pos: position{line: 620, col: 27, offset: 15007}, name: "Expr", }, }, @@ -4191,26 +4399,26 @@ var g = &grammar{ }, { name: "FromOp", - pos: position{line: 628, col: 1, offset: 14940}, + pos: position{line: 631, col: 1, offset: 15200}, expr: &actionExpr{ - pos: position{line: 629, col: 5, offset: 14951}, + pos: position{line: 632, col: 5, offset: 15211}, run: (*parser).callonFromOp1, expr: &seqExpr{ - pos: position{line: 629, col: 5, offset: 14951}, + pos: position{line: 632, col: 5, offset: 15211}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 629, col: 5, offset: 14951}, + pos: position{line: 632, col: 5, offset: 15211}, name: "FromKeyWord", }, &ruleRefExpr{ - pos: position{line: 629, col: 17, offset: 14963}, + pos: position{line: 632, col: 17, offset: 15223}, name: "_", }, &labeledExpr{ - pos: position{line: 629, col: 19, offset: 14965}, + pos: position{line: 632, col: 19, offset: 15225}, label: "elems", expr: &ruleRefExpr{ - pos: position{line: 629, col: 25, offset: 14971}, + pos: position{line: 632, col: 25, offset: 15231}, name: "FromElems", }, }, @@ -4222,16 +4430,16 @@ var g = &grammar{ }, { name: "FromKeyWord", - pos: position{line: 637, col: 1, offset: 15114}, + pos: position{line: 640, col: 1, offset: 15374}, expr: &choiceExpr{ - pos: position{line: 638, col: 5, offset: 15130}, + pos: position{line: 641, col: 5, offset: 15390}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 638, col: 5, offset: 15130}, + pos: position{line: 641, col: 5, offset: 15390}, name: "FROM", }, &ruleRefExpr{ - pos: position{line: 639, col: 5, offset: 15139}, + pos: position{line: 642, col: 5, offset: 15399}, name: "DeprecatedFroms", }, }, @@ -4241,24 +4449,24 @@ var g = &grammar{ }, { name: "DeprecatedFroms", - pos: position{line: 641, col: 1, offset: 15156}, + pos: position{line: 644, col: 1, offset: 15416}, expr: &choiceExpr{ - pos: position{line: 641, col: 19, offset: 15174}, + pos: position{line: 644, col: 19, offset: 15434}, alternatives: []any{ &litMatcher{ - pos: position{line: 641, col: 19, offset: 15174}, + pos: position{line: 644, col: 19, offset: 15434}, val: "get", ignoreCase: false, want: "\"get\"", }, &litMatcher{ - pos: position{line: 641, col: 27, offset: 15182}, + pos: position{line: 644, col: 27, offset: 15442}, val: "file", ignoreCase: false, want: "\"file\"", }, &litMatcher{ - pos: position{line: 641, col: 36, offset: 15191}, + pos: position{line: 644, col: 36, offset: 15451}, val: "pool", ignoreCase: false, want: "\"pool\"", @@ -4270,51 +4478,51 @@ var g = &grammar{ }, { name: "FromElems", - pos: position{line: 643, col: 1, offset: 15199}, + pos: position{line: 646, col: 1, offset: 15459}, expr: &actionExpr{ - pos: position{line: 644, col: 5, offset: 15213}, + pos: position{line: 647, col: 5, offset: 15473}, run: (*parser).callonFromElems1, expr: &seqExpr{ - pos: position{line: 644, col: 5, offset: 15213}, + pos: position{line: 647, col: 5, offset: 15473}, exprs: []any{ &labeledExpr{ - pos: position{line: 644, col: 5, offset: 15213}, + pos: position{line: 647, col: 5, offset: 15473}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 644, col: 11, offset: 15219}, + pos: position{line: 647, col: 11, offset: 15479}, name: "FromElem", }, }, &labeledExpr{ - pos: position{line: 644, col: 20, offset: 15228}, + pos: position{line: 647, col: 20, offset: 15488}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 644, col: 25, offset: 15233}, + pos: position{line: 647, col: 25, offset: 15493}, expr: &actionExpr{ - pos: position{line: 644, col: 27, offset: 15235}, + pos: position{line: 647, col: 27, offset: 15495}, run: (*parser).callonFromElems7, expr: &seqExpr{ - pos: position{line: 644, col: 27, offset: 15235}, + pos: position{line: 647, col: 27, offset: 15495}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 644, col: 27, offset: 15235}, + pos: position{line: 647, col: 27, offset: 15495}, name: "__", }, &litMatcher{ - pos: position{line: 644, col: 30, offset: 15238}, + pos: position{line: 647, col: 30, offset: 15498}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 644, col: 34, offset: 15242}, + pos: position{line: 647, col: 34, offset: 15502}, name: "__", }, &labeledExpr{ - pos: position{line: 644, col: 37, offset: 15245}, + pos: position{line: 647, col: 37, offset: 15505}, label: "elem", expr: &ruleRefExpr{ - pos: position{line: 644, col: 42, offset: 15250}, + pos: position{line: 647, col: 42, offset: 15510}, name: "FromElem", }, }, @@ -4331,42 +4539,42 @@ var g = &grammar{ }, { name: "FromElem", - pos: position{line: 648, col: 1, offset: 15334}, + pos: position{line: 651, col: 1, offset: 15594}, expr: &actionExpr{ - pos: position{line: 649, col: 5, offset: 15347}, + pos: position{line: 652, col: 5, offset: 15607}, run: (*parser).callonFromElem1, expr: &seqExpr{ - pos: position{line: 649, col: 5, offset: 15347}, + pos: position{line: 652, col: 5, offset: 15607}, exprs: []any{ &labeledExpr{ - pos: position{line: 649, col: 5, offset: 15347}, + pos: position{line: 652, col: 5, offset: 15607}, label: "entity", expr: &ruleRefExpr{ - pos: position{line: 649, col: 12, offset: 15354}, + pos: position{line: 652, col: 12, offset: 15614}, name: "FromEntity", }, }, &labeledExpr{ - pos: position{line: 649, col: 23, offset: 15365}, + pos: position{line: 652, col: 23, offset: 15625}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 649, col: 28, offset: 15370}, + pos: position{line: 652, col: 28, offset: 15630}, name: "FromArgs", }, }, &labeledExpr{ - pos: position{line: 649, col: 37, offset: 15379}, + pos: position{line: 652, col: 37, offset: 15639}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 649, col: 39, offset: 15381}, + pos: position{line: 652, col: 39, offset: 15641}, name: "OptOrdinality", }, }, &labeledExpr{ - pos: position{line: 649, col: 53, offset: 15395}, + pos: position{line: 652, col: 53, offset: 15655}, label: "alias", expr: &ruleRefExpr{ - pos: position{line: 649, col: 59, offset: 15401}, + pos: position{line: 652, col: 59, offset: 15661}, name: "OptAlias", }, }, @@ -4378,46 +4586,46 @@ var g = &grammar{ }, { name: "FromEntity", - pos: position{line: 667, col: 1, offset: 15789}, + pos: position{line: 670, col: 1, offset: 16049}, expr: &choiceExpr{ - pos: position{line: 668, col: 5, offset: 15804}, + pos: position{line: 671, col: 5, offset: 16064}, alternatives: []any{ &actionExpr{ - pos: position{line: 668, col: 5, offset: 15804}, + pos: position{line: 671, col: 5, offset: 16064}, run: (*parser).callonFromEntity2, expr: &labeledExpr{ - pos: position{line: 668, col: 5, offset: 15804}, + pos: position{line: 671, col: 5, offset: 16064}, label: "url", expr: &ruleRefExpr{ - pos: position{line: 668, col: 9, offset: 15808}, + pos: position{line: 671, col: 9, offset: 16068}, name: "UnquotedURL", }, }, }, &ruleRefExpr{ - pos: position{line: 675, col: 5, offset: 15940}, + pos: position{line: 678, col: 5, offset: 16200}, name: "Regexp", }, &ruleRefExpr{ - pos: position{line: 676, col: 5, offset: 15951}, + pos: position{line: 679, col: 5, offset: 16211}, name: "Glob", }, &actionExpr{ - pos: position{line: 677, col: 5, offset: 15960}, + pos: position{line: 680, col: 5, offset: 16220}, run: (*parser).callonFromEntity7, expr: &seqExpr{ - pos: position{line: 677, col: 5, offset: 15960}, + pos: position{line: 680, col: 5, offset: 16220}, exprs: []any{ &litMatcher{ - pos: position{line: 677, col: 5, offset: 15960}, + pos: position{line: 680, col: 5, offset: 16220}, val: "*", ignoreCase: false, want: "\"*\"", }, ¬Expr{ - pos: position{line: 677, col: 9, offset: 15964}, + pos: position{line: 680, col: 9, offset: 16224}, expr: &ruleRefExpr{ - pos: position{line: 677, col: 10, offset: 15965}, + pos: position{line: 680, col: 10, offset: 16225}, name: "ExprGuard", }, }, @@ -4425,47 +4633,47 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 678, col: 5, offset: 16046}, + pos: position{line: 681, col: 5, offset: 16306}, run: (*parser).callonFromEntity12, expr: &labeledExpr{ - pos: position{line: 678, col: 5, offset: 16046}, + pos: position{line: 681, col: 5, offset: 16306}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 678, col: 7, offset: 16048}, + pos: position{line: 681, col: 7, offset: 16308}, name: "Array", }, }, }, &actionExpr{ - pos: position{line: 685, col: 5, offset: 16186}, + pos: position{line: 688, col: 5, offset: 16446}, run: (*parser).callonFromEntity15, expr: &labeledExpr{ - pos: position{line: 685, col: 5, offset: 16186}, + pos: position{line: 688, col: 5, offset: 16446}, label: "meta", expr: &ruleRefExpr{ - pos: position{line: 685, col: 10, offset: 16191}, + pos: position{line: 688, col: 10, offset: 16451}, name: "PoolMeta", }, }, }, &actionExpr{ - pos: position{line: 692, col: 5, offset: 16334}, + pos: position{line: 695, col: 5, offset: 16594}, run: (*parser).callonFromEntity18, expr: &seqExpr{ - pos: position{line: 692, col: 5, offset: 16334}, + pos: position{line: 695, col: 5, offset: 16594}, exprs: []any{ &labeledExpr{ - pos: position{line: 692, col: 5, offset: 16334}, + pos: position{line: 695, col: 5, offset: 16594}, label: "join", expr: &ruleRefExpr{ - pos: position{line: 692, col: 10, offset: 16339}, + pos: position{line: 695, col: 10, offset: 16599}, name: "JoinOperation", }, }, ¬Expr{ - pos: position{line: 692, col: 24, offset: 16353}, + pos: position{line: 695, col: 24, offset: 16613}, expr: &ruleRefExpr{ - pos: position{line: 692, col: 25, offset: 16354}, + pos: position{line: 695, col: 25, offset: 16614}, name: "AliasClause", }, }, @@ -4473,35 +4681,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 693, col: 5, offset: 16389}, + pos: position{line: 696, col: 5, offset: 16649}, run: (*parser).callonFromEntity24, expr: &seqExpr{ - pos: position{line: 693, col: 5, offset: 16389}, + pos: position{line: 696, col: 5, offset: 16649}, exprs: []any{ &litMatcher{ - pos: position{line: 693, col: 5, offset: 16389}, + pos: position{line: 696, col: 5, offset: 16649}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 693, col: 9, offset: 16393}, + pos: position{line: 696, col: 9, offset: 16653}, name: "__", }, &labeledExpr{ - pos: position{line: 693, col: 12, offset: 16396}, + pos: position{line: 696, col: 12, offset: 16656}, label: "join", expr: &ruleRefExpr{ - pos: position{line: 693, col: 17, offset: 16401}, + pos: position{line: 696, col: 17, offset: 16661}, name: "JoinOperation", }, }, &ruleRefExpr{ - pos: position{line: 693, col: 31, offset: 16415}, + pos: position{line: 696, col: 31, offset: 16675}, name: "__", }, &litMatcher{ - pos: position{line: 693, col: 34, offset: 16418}, + pos: position{line: 696, col: 34, offset: 16678}, val: ")", ignoreCase: false, want: "\")\"", @@ -4510,35 +4718,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 694, col: 5, offset: 16447}, + pos: position{line: 697, col: 5, offset: 16707}, run: (*parser).callonFromEntity32, expr: &seqExpr{ - pos: position{line: 694, col: 5, offset: 16447}, + pos: position{line: 697, col: 5, offset: 16707}, exprs: []any{ &litMatcher{ - pos: position{line: 694, col: 5, offset: 16447}, + pos: position{line: 697, col: 5, offset: 16707}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 694, col: 9, offset: 16451}, + pos: position{line: 697, col: 9, offset: 16711}, name: "__", }, &labeledExpr{ - pos: position{line: 694, col: 12, offset: 16454}, + pos: position{line: 697, col: 12, offset: 16714}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 694, col: 14, offset: 16456}, + pos: position{line: 697, col: 14, offset: 16716}, name: "SQLPipe", }, }, &ruleRefExpr{ - pos: position{line: 694, col: 22, offset: 16464}, + pos: position{line: 697, col: 22, offset: 16724}, name: "__", }, &litMatcher{ - pos: position{line: 694, col: 25, offset: 16467}, + pos: position{line: 697, col: 25, offset: 16727}, val: ")", ignoreCase: false, want: "\")\"", @@ -4547,13 +4755,13 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 697, col: 6, offset: 16504}, + pos: position{line: 700, col: 6, offset: 16764}, run: (*parser).callonFromEntity40, expr: &labeledExpr{ - pos: position{line: 697, col: 6, offset: 16504}, + pos: position{line: 700, col: 6, offset: 16764}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 697, col: 11, offset: 16509}, + pos: position{line: 700, col: 11, offset: 16769}, name: "Name", }, }, @@ -4565,40 +4773,40 @@ var g = &grammar{ }, { name: "FromArgs", - pos: position{line: 700, col: 1, offset: 16607}, + pos: position{line: 703, col: 1, offset: 16867}, expr: &choiceExpr{ - pos: position{line: 701, col: 5, offset: 16620}, + pos: position{line: 704, col: 5, offset: 16880}, alternatives: []any{ &actionExpr{ - pos: position{line: 701, col: 5, offset: 16620}, + pos: position{line: 704, col: 5, offset: 16880}, run: (*parser).callonFromArgs2, expr: &seqExpr{ - pos: position{line: 701, col: 5, offset: 16620}, + pos: position{line: 704, col: 5, offset: 16880}, exprs: []any{ &labeledExpr{ - pos: position{line: 701, col: 5, offset: 16620}, + pos: position{line: 704, col: 5, offset: 16880}, label: "commit", expr: &ruleRefExpr{ - pos: position{line: 701, col: 12, offset: 16627}, + pos: position{line: 704, col: 12, offset: 16887}, name: "PoolCommit", }, }, &labeledExpr{ - pos: position{line: 701, col: 23, offset: 16638}, + pos: position{line: 704, col: 23, offset: 16898}, label: "meta", expr: &zeroOrOneExpr{ - pos: position{line: 701, col: 28, offset: 16643}, + pos: position{line: 704, col: 28, offset: 16903}, expr: &ruleRefExpr{ - pos: position{line: 701, col: 28, offset: 16643}, + pos: position{line: 704, col: 28, offset: 16903}, name: "PoolMeta", }, }, }, &labeledExpr{ - pos: position{line: 701, col: 38, offset: 16653}, + pos: position{line: 704, col: 38, offset: 16913}, label: "tap", expr: &ruleRefExpr{ - pos: position{line: 701, col: 42, offset: 16657}, + pos: position{line: 704, col: 42, offset: 16917}, name: "TapArg", }, }, @@ -4606,24 +4814,24 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 710, col: 5, offset: 16861}, + pos: position{line: 713, col: 5, offset: 17121}, run: (*parser).callonFromArgs11, expr: &seqExpr{ - pos: position{line: 710, col: 5, offset: 16861}, + pos: position{line: 713, col: 5, offset: 17121}, exprs: []any{ &labeledExpr{ - pos: position{line: 710, col: 5, offset: 16861}, + pos: position{line: 713, col: 5, offset: 17121}, label: "meta", expr: &ruleRefExpr{ - pos: position{line: 710, col: 10, offset: 16866}, + pos: position{line: 713, col: 10, offset: 17126}, name: "PoolMeta", }, }, &labeledExpr{ - pos: position{line: 710, col: 19, offset: 16875}, + pos: position{line: 713, col: 19, offset: 17135}, label: "tap", expr: &ruleRefExpr{ - pos: position{line: 710, col: 23, offset: 16879}, + pos: position{line: 713, col: 23, offset: 17139}, name: "TapArg", }, }, @@ -4631,41 +4839,41 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 718, col: 5, offset: 17045}, + pos: position{line: 721, col: 5, offset: 17305}, run: (*parser).callonFromArgs17, expr: &seqExpr{ - pos: position{line: 718, col: 5, offset: 17045}, + pos: position{line: 721, col: 5, offset: 17305}, exprs: []any{ &labeledExpr{ - pos: position{line: 718, col: 5, offset: 17045}, + pos: position{line: 721, col: 5, offset: 17305}, label: "format", expr: &ruleRefExpr{ - pos: position{line: 718, col: 12, offset: 17052}, + pos: position{line: 721, col: 12, offset: 17312}, name: "FormatArg", }, }, ¬Expr{ - pos: position{line: 718, col: 22, offset: 17062}, + pos: position{line: 721, col: 22, offset: 17322}, expr: &seqExpr{ - pos: position{line: 718, col: 24, offset: 17064}, + pos: position{line: 721, col: 24, offset: 17324}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 718, col: 24, offset: 17064}, + pos: position{line: 721, col: 24, offset: 17324}, name: "_", }, &choiceExpr{ - pos: position{line: 718, col: 27, offset: 17067}, + pos: position{line: 721, col: 27, offset: 17327}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 718, col: 27, offset: 17067}, + pos: position{line: 721, col: 27, offset: 17327}, name: "METHOD", }, &ruleRefExpr{ - pos: position{line: 718, col: 36, offset: 17076}, + pos: position{line: 721, col: 36, offset: 17336}, name: "HEADERS", }, &ruleRefExpr{ - pos: position{line: 718, col: 46, offset: 17086}, + pos: position{line: 721, col: 46, offset: 17346}, name: "BODY", }, }, @@ -4677,51 +4885,51 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 725, col: 5, offset: 17231}, + pos: position{line: 728, col: 5, offset: 17491}, run: (*parser).callonFromArgs28, expr: &seqExpr{ - pos: position{line: 725, col: 5, offset: 17231}, + pos: position{line: 728, col: 5, offset: 17491}, exprs: []any{ &labeledExpr{ - pos: position{line: 725, col: 5, offset: 17231}, + pos: position{line: 728, col: 5, offset: 17491}, label: "format", expr: &zeroOrOneExpr{ - pos: position{line: 725, col: 12, offset: 17238}, + pos: position{line: 728, col: 12, offset: 17498}, expr: &ruleRefExpr{ - pos: position{line: 725, col: 12, offset: 17238}, + pos: position{line: 728, col: 12, offset: 17498}, name: "FormatArg", }, }, }, &labeledExpr{ - pos: position{line: 725, col: 23, offset: 17249}, + pos: position{line: 728, col: 23, offset: 17509}, label: "method", expr: &zeroOrOneExpr{ - pos: position{line: 725, col: 30, offset: 17256}, + pos: position{line: 728, col: 30, offset: 17516}, expr: &ruleRefExpr{ - pos: position{line: 725, col: 30, offset: 17256}, + pos: position{line: 728, col: 30, offset: 17516}, name: "MethodArg", }, }, }, &labeledExpr{ - pos: position{line: 725, col: 41, offset: 17267}, + pos: position{line: 728, col: 41, offset: 17527}, label: "headers", expr: &zeroOrOneExpr{ - pos: position{line: 725, col: 49, offset: 17275}, + pos: position{line: 728, col: 49, offset: 17535}, expr: &ruleRefExpr{ - pos: position{line: 725, col: 49, offset: 17275}, + pos: position{line: 728, col: 49, offset: 17535}, name: "HeadersArg", }, }, }, &labeledExpr{ - pos: position{line: 725, col: 61, offset: 17287}, + pos: position{line: 728, col: 61, offset: 17547}, label: "body", expr: &zeroOrOneExpr{ - pos: position{line: 725, col: 66, offset: 17292}, + pos: position{line: 728, col: 66, offset: 17552}, expr: &ruleRefExpr{ - pos: position{line: 725, col: 66, offset: 17292}, + pos: position{line: 728, col: 66, offset: 17552}, name: "BodyArg", }, }, @@ -4736,30 +4944,30 @@ var g = &grammar{ }, { name: "FormatArg", - pos: position{line: 742, col: 1, offset: 17708}, + pos: position{line: 745, col: 1, offset: 17968}, expr: &actionExpr{ - pos: position{line: 742, col: 13, offset: 17720}, + pos: position{line: 745, col: 13, offset: 17980}, run: (*parser).callonFormatArg1, expr: &seqExpr{ - pos: position{line: 742, col: 13, offset: 17720}, + pos: position{line: 745, col: 13, offset: 17980}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 742, col: 13, offset: 17720}, + pos: position{line: 745, col: 13, offset: 17980}, name: "_", }, &ruleRefExpr{ - pos: position{line: 742, col: 15, offset: 17722}, + pos: position{line: 745, col: 15, offset: 17982}, name: "FORMAT", }, &ruleRefExpr{ - pos: position{line: 742, col: 22, offset: 17729}, + pos: position{line: 745, col: 22, offset: 17989}, name: "_", }, &labeledExpr{ - pos: position{line: 742, col: 24, offset: 17731}, + pos: position{line: 745, col: 24, offset: 17991}, label: "n", expr: &ruleRefExpr{ - pos: position{line: 742, col: 26, offset: 17733}, + pos: position{line: 745, col: 26, offset: 17993}, name: "Name", }, }, @@ -4771,30 +4979,30 @@ var g = &grammar{ }, { name: "MethodArg", - pos: position{line: 744, col: 1, offset: 17757}, + pos: position{line: 747, col: 1, offset: 18017}, expr: &actionExpr{ - pos: position{line: 744, col: 13, offset: 17769}, + pos: position{line: 747, col: 13, offset: 18029}, run: (*parser).callonMethodArg1, expr: &seqExpr{ - pos: position{line: 744, col: 13, offset: 17769}, + pos: position{line: 747, col: 13, offset: 18029}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 744, col: 13, offset: 17769}, + pos: position{line: 747, col: 13, offset: 18029}, name: "_", }, &ruleRefExpr{ - pos: position{line: 744, col: 15, offset: 17771}, + pos: position{line: 747, col: 15, offset: 18031}, name: "METHOD", }, &ruleRefExpr{ - pos: position{line: 744, col: 22, offset: 17778}, + pos: position{line: 747, col: 22, offset: 18038}, name: "_", }, &labeledExpr{ - pos: position{line: 744, col: 24, offset: 17780}, + pos: position{line: 747, col: 24, offset: 18040}, label: "n", expr: &ruleRefExpr{ - pos: position{line: 744, col: 26, offset: 17782}, + pos: position{line: 747, col: 26, offset: 18042}, name: "Name", }, }, @@ -4806,30 +5014,30 @@ var g = &grammar{ }, { name: "HeadersArg", - pos: position{line: 746, col: 1, offset: 17806}, + pos: position{line: 749, col: 1, offset: 18066}, expr: &actionExpr{ - pos: position{line: 746, col: 14, offset: 17819}, + pos: position{line: 749, col: 14, offset: 18079}, run: (*parser).callonHeadersArg1, expr: &seqExpr{ - pos: position{line: 746, col: 14, offset: 17819}, + pos: position{line: 749, col: 14, offset: 18079}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 746, col: 14, offset: 17819}, + pos: position{line: 749, col: 14, offset: 18079}, name: "_", }, &ruleRefExpr{ - pos: position{line: 746, col: 16, offset: 17821}, + pos: position{line: 749, col: 16, offset: 18081}, name: "HEADERS", }, &ruleRefExpr{ - pos: position{line: 746, col: 24, offset: 17829}, + pos: position{line: 749, col: 24, offset: 18089}, name: "_", }, &labeledExpr{ - pos: position{line: 746, col: 26, offset: 17831}, + pos: position{line: 749, col: 26, offset: 18091}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 746, col: 28, offset: 17833}, + pos: position{line: 749, col: 28, offset: 18093}, name: "Record", }, }, @@ -4841,30 +5049,30 @@ var g = &grammar{ }, { name: "BodyArg", - pos: position{line: 748, col: 1, offset: 17859}, + pos: position{line: 751, col: 1, offset: 18119}, expr: &actionExpr{ - pos: position{line: 748, col: 11, offset: 17869}, + pos: position{line: 751, col: 11, offset: 18129}, run: (*parser).callonBodyArg1, expr: &seqExpr{ - pos: position{line: 748, col: 11, offset: 17869}, + pos: position{line: 751, col: 11, offset: 18129}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 748, col: 11, offset: 17869}, + pos: position{line: 751, col: 11, offset: 18129}, name: "_", }, &ruleRefExpr{ - pos: position{line: 748, col: 13, offset: 17871}, + pos: position{line: 751, col: 13, offset: 18131}, name: "BODY", }, &ruleRefExpr{ - pos: position{line: 748, col: 18, offset: 17876}, + pos: position{line: 751, col: 18, offset: 18136}, name: "_", }, &labeledExpr{ - pos: position{line: 748, col: 20, offset: 17878}, + pos: position{line: 751, col: 20, offset: 18138}, label: "n", expr: &ruleRefExpr{ - pos: position{line: 748, col: 22, offset: 17880}, + pos: position{line: 751, col: 22, offset: 18140}, name: "Name", }, }, @@ -4876,24 +5084,24 @@ var g = &grammar{ }, { name: "UnquotedURL", - pos: position{line: 750, col: 1, offset: 17904}, + pos: position{line: 753, col: 1, offset: 18164}, expr: &actionExpr{ - pos: position{line: 750, col: 15, offset: 17918}, + pos: position{line: 753, col: 15, offset: 18178}, run: (*parser).callonUnquotedURL1, expr: &seqExpr{ - pos: position{line: 750, col: 15, offset: 17918}, + pos: position{line: 753, col: 15, offset: 18178}, exprs: []any{ &choiceExpr{ - pos: position{line: 750, col: 16, offset: 17919}, + pos: position{line: 753, col: 16, offset: 18179}, alternatives: []any{ &litMatcher{ - pos: position{line: 750, col: 16, offset: 17919}, + pos: position{line: 753, col: 16, offset: 18179}, val: "http://", ignoreCase: false, want: "\"http://\"", }, &litMatcher{ - pos: position{line: 750, col: 28, offset: 17931}, + pos: position{line: 753, col: 28, offset: 18191}, val: "https://", ignoreCase: false, want: "\"https://\"", @@ -4901,9 +5109,9 @@ var g = &grammar{ }, }, &oneOrMoreExpr{ - pos: position{line: 750, col: 40, offset: 17943}, + pos: position{line: 753, col: 40, offset: 18203}, expr: &ruleRefExpr{ - pos: position{line: 750, col: 40, offset: 17943}, + pos: position{line: 753, col: 40, offset: 18203}, name: "URLChar", }, }, @@ -4915,9 +5123,9 @@ var g = &grammar{ }, { name: "URLChar", - pos: position{line: 752, col: 1, offset: 17984}, + pos: position{line: 755, col: 1, offset: 18244}, expr: &charClassMatcher{ - pos: position{line: 752, col: 11, offset: 17994}, + pos: position{line: 755, col: 11, offset: 18254}, val: "[0-9a-zA-Z!@$%&_=,./?:[\\]~+-]", chars: []rune{'!', '@', '$', '%', '&', '_', '=', ',', '.', '/', '?', ':', '[', ']', '~', '+', '-'}, ranges: []rune{'0', '9', 'a', 'z', 'A', 'Z'}, @@ -4929,30 +5137,30 @@ var g = &grammar{ }, { name: "PoolAt", - pos: position{line: 755, col: 1, offset: 18058}, + pos: position{line: 758, col: 1, offset: 18318}, expr: &actionExpr{ - pos: position{line: 756, col: 5, offset: 18069}, + pos: position{line: 759, col: 5, offset: 18329}, run: (*parser).callonPoolAt1, expr: &seqExpr{ - pos: position{line: 756, col: 5, offset: 18069}, + pos: position{line: 759, col: 5, offset: 18329}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 756, col: 5, offset: 18069}, + pos: position{line: 759, col: 5, offset: 18329}, name: "_", }, &ruleRefExpr{ - pos: position{line: 756, col: 7, offset: 18071}, + pos: position{line: 759, col: 7, offset: 18331}, name: "AT", }, &ruleRefExpr{ - pos: position{line: 756, col: 10, offset: 18074}, + pos: position{line: 759, col: 10, offset: 18334}, name: "_", }, &labeledExpr{ - pos: position{line: 756, col: 12, offset: 18076}, + pos: position{line: 759, col: 12, offset: 18336}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 756, col: 15, offset: 18079}, + pos: position{line: 759, col: 15, offset: 18339}, name: "KSUID", }, }, @@ -4964,14 +5172,14 @@ var g = &grammar{ }, { name: "KSUID", - pos: position{line: 759, col: 1, offset: 18145}, + pos: position{line: 762, col: 1, offset: 18405}, expr: &actionExpr{ - pos: position{line: 759, col: 9, offset: 18153}, + pos: position{line: 762, col: 9, offset: 18413}, run: (*parser).callonKSUID1, expr: &oneOrMoreExpr{ - pos: position{line: 759, col: 9, offset: 18153}, + pos: position{line: 762, col: 9, offset: 18413}, expr: &charClassMatcher{ - pos: position{line: 759, col: 10, offset: 18154}, + pos: position{line: 762, col: 10, offset: 18414}, val: "[0-9a-zA-Z]", ranges: []rune{'0', '9', 'a', 'z', 'A', 'Z'}, ignoreCase: false, @@ -4984,24 +5192,24 @@ var g = &grammar{ }, { name: "PoolCommit", - pos: position{line: 761, col: 1, offset: 18200}, + pos: position{line: 764, col: 1, offset: 18460}, expr: &actionExpr{ - pos: position{line: 762, col: 5, offset: 18215}, + pos: position{line: 765, col: 5, offset: 18475}, run: (*parser).callonPoolCommit1, expr: &seqExpr{ - pos: position{line: 762, col: 5, offset: 18215}, + pos: position{line: 765, col: 5, offset: 18475}, exprs: []any{ &litMatcher{ - pos: position{line: 762, col: 5, offset: 18215}, + pos: position{line: 765, col: 5, offset: 18475}, val: "@", ignoreCase: false, want: "\"@\"", }, &labeledExpr{ - pos: position{line: 762, col: 9, offset: 18219}, + pos: position{line: 765, col: 9, offset: 18479}, label: "n", expr: &ruleRefExpr{ - pos: position{line: 762, col: 11, offset: 18221}, + pos: position{line: 765, col: 11, offset: 18481}, name: "Name", }, }, @@ -5013,24 +5221,24 @@ var g = &grammar{ }, { name: "PoolMeta", - pos: position{line: 764, col: 1, offset: 18245}, + pos: position{line: 767, col: 1, offset: 18505}, expr: &actionExpr{ - pos: position{line: 765, col: 5, offset: 18258}, + pos: position{line: 768, col: 5, offset: 18518}, run: (*parser).callonPoolMeta1, expr: &seqExpr{ - pos: position{line: 765, col: 5, offset: 18258}, + pos: position{line: 768, col: 5, offset: 18518}, exprs: []any{ &litMatcher{ - pos: position{line: 765, col: 5, offset: 18258}, + pos: position{line: 768, col: 5, offset: 18518}, val: ":", ignoreCase: false, want: "\":\"", }, &labeledExpr{ - pos: position{line: 765, col: 9, offset: 18262}, + pos: position{line: 768, col: 9, offset: 18522}, label: "n", expr: &ruleRefExpr{ - pos: position{line: 765, col: 11, offset: 18264}, + pos: position{line: 768, col: 11, offset: 18524}, name: "Name", }, }, @@ -5042,51 +5250,51 @@ var g = &grammar{ }, { name: "SortExprs", - pos: position{line: 767, col: 1, offset: 18288}, + pos: position{line: 770, col: 1, offset: 18548}, expr: &actionExpr{ - pos: position{line: 768, col: 5, offset: 18302}, + pos: position{line: 771, col: 5, offset: 18562}, run: (*parser).callonSortExprs1, expr: &seqExpr{ - pos: position{line: 768, col: 5, offset: 18302}, + pos: position{line: 771, col: 5, offset: 18562}, exprs: []any{ &labeledExpr{ - pos: position{line: 768, col: 5, offset: 18302}, + pos: position{line: 771, col: 5, offset: 18562}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 768, col: 11, offset: 18308}, + pos: position{line: 771, col: 11, offset: 18568}, name: "SortExpr", }, }, &labeledExpr{ - pos: position{line: 768, col: 20, offset: 18317}, + pos: position{line: 771, col: 20, offset: 18577}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 768, col: 25, offset: 18322}, + pos: position{line: 771, col: 25, offset: 18582}, expr: &actionExpr{ - pos: position{line: 768, col: 26, offset: 18323}, + pos: position{line: 771, col: 26, offset: 18583}, run: (*parser).callonSortExprs7, expr: &seqExpr{ - pos: position{line: 768, col: 26, offset: 18323}, + pos: position{line: 771, col: 26, offset: 18583}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 768, col: 26, offset: 18323}, + pos: position{line: 771, col: 26, offset: 18583}, name: "__", }, &litMatcher{ - pos: position{line: 768, col: 29, offset: 18326}, + pos: position{line: 771, col: 29, offset: 18586}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 768, col: 33, offset: 18330}, + pos: position{line: 771, col: 33, offset: 18590}, name: "__", }, &labeledExpr{ - pos: position{line: 768, col: 36, offset: 18333}, + pos: position{line: 771, col: 36, offset: 18593}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 768, col: 38, offset: 18335}, + pos: position{line: 771, col: 38, offset: 18595}, name: "SortExpr", }, }, @@ -5103,41 +5311,41 @@ var g = &grammar{ }, { name: "SortExpr", - pos: position{line: 772, col: 1, offset: 18412}, + pos: position{line: 775, col: 1, offset: 18672}, expr: &actionExpr{ - pos: position{line: 773, col: 5, offset: 18425}, + pos: position{line: 776, col: 5, offset: 18685}, run: (*parser).callonSortExpr1, expr: &seqExpr{ - pos: position{line: 773, col: 5, offset: 18425}, + pos: position{line: 776, col: 5, offset: 18685}, exprs: []any{ &labeledExpr{ - pos: position{line: 773, col: 5, offset: 18425}, + pos: position{line: 776, col: 5, offset: 18685}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 773, col: 7, offset: 18427}, + pos: position{line: 776, col: 7, offset: 18687}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 773, col: 12, offset: 18432}, + pos: position{line: 776, col: 12, offset: 18692}, label: "order", expr: &zeroOrOneExpr{ - pos: position{line: 773, col: 18, offset: 18438}, + pos: position{line: 776, col: 18, offset: 18698}, expr: &actionExpr{ - pos: position{line: 773, col: 19, offset: 18439}, + pos: position{line: 776, col: 19, offset: 18699}, run: (*parser).callonSortExpr7, expr: &seqExpr{ - pos: position{line: 773, col: 19, offset: 18439}, + pos: position{line: 776, col: 19, offset: 18699}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 773, col: 19, offset: 18439}, + pos: position{line: 776, col: 19, offset: 18699}, name: "_", }, &labeledExpr{ - pos: position{line: 773, col: 21, offset: 18441}, + pos: position{line: 776, col: 21, offset: 18701}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 773, col: 23, offset: 18443}, + pos: position{line: 776, col: 23, offset: 18703}, name: "OrderSpec", }, }, @@ -5154,22 +5362,22 @@ var g = &grammar{ }, { name: "OrderSpec", - pos: position{line: 781, col: 1, offset: 18642}, + pos: position{line: 784, col: 1, offset: 18902}, expr: &actionExpr{ - pos: position{line: 782, col: 5, offset: 18656}, + pos: position{line: 785, col: 5, offset: 18916}, run: (*parser).callonOrderSpec1, expr: &labeledExpr{ - pos: position{line: 782, col: 5, offset: 18656}, + pos: position{line: 785, col: 5, offset: 18916}, label: "o", expr: &choiceExpr{ - pos: position{line: 782, col: 8, offset: 18659}, + pos: position{line: 785, col: 8, offset: 18919}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 782, col: 8, offset: 18659}, + pos: position{line: 785, col: 8, offset: 18919}, name: "ASC", }, &ruleRefExpr{ - pos: position{line: 782, col: 14, offset: 18665}, + pos: position{line: 785, col: 14, offset: 18925}, name: "DESC", }, }, @@ -5181,32 +5389,32 @@ var g = &grammar{ }, { name: "TapArg", - pos: position{line: 786, col: 1, offset: 18749}, + pos: position{line: 789, col: 1, offset: 19009}, expr: &choiceExpr{ - pos: position{line: 787, col: 5, offset: 18760}, + pos: position{line: 790, col: 5, offset: 19020}, alternatives: []any{ &actionExpr{ - pos: position{line: 787, col: 5, offset: 18760}, + pos: position{line: 790, col: 5, offset: 19020}, run: (*parser).callonTapArg2, expr: &seqExpr{ - pos: position{line: 787, col: 5, offset: 18760}, + pos: position{line: 790, col: 5, offset: 19020}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 787, col: 5, offset: 18760}, + pos: position{line: 790, col: 5, offset: 19020}, name: "_", }, &ruleRefExpr{ - pos: position{line: 787, col: 7, offset: 18762}, + pos: position{line: 790, col: 7, offset: 19022}, name: "TAP", }, }, }, }, &actionExpr{ - pos: position{line: 788, col: 5, offset: 18791}, + pos: position{line: 791, col: 5, offset: 19051}, run: (*parser).callonTapArg6, expr: &litMatcher{ - pos: position{line: 788, col: 5, offset: 18791}, + pos: position{line: 791, col: 5, offset: 19051}, val: "", ignoreCase: false, want: "\"\"", @@ -5219,28 +5427,28 @@ var g = &grammar{ }, { name: "PassOp", - pos: position{line: 790, col: 1, offset: 18817}, + pos: position{line: 793, col: 1, offset: 19077}, expr: &actionExpr{ - pos: position{line: 791, col: 5, offset: 18828}, + pos: position{line: 794, col: 5, offset: 19088}, run: (*parser).callonPassOp1, expr: &seqExpr{ - pos: position{line: 791, col: 5, offset: 18828}, + pos: position{line: 794, col: 5, offset: 19088}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 791, col: 5, offset: 18828}, + pos: position{line: 794, col: 5, offset: 19088}, name: "PASS", }, ¬Expr{ - pos: position{line: 791, col: 10, offset: 18833}, + pos: position{line: 794, col: 10, offset: 19093}, expr: &seqExpr{ - pos: position{line: 791, col: 12, offset: 18835}, + pos: position{line: 794, col: 12, offset: 19095}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 791, col: 12, offset: 18835}, + pos: position{line: 794, col: 12, offset: 19095}, name: "__", }, &litMatcher{ - pos: position{line: 791, col: 15, offset: 18838}, + pos: position{line: 794, col: 15, offset: 19098}, val: "(", ignoreCase: false, want: "\"(\"", @@ -5249,9 +5457,9 @@ var g = &grammar{ }, }, &andExpr{ - pos: position{line: 791, col: 20, offset: 18843}, + pos: position{line: 794, col: 20, offset: 19103}, expr: &ruleRefExpr{ - pos: position{line: 791, col: 21, offset: 18844}, + pos: position{line: 794, col: 21, offset: 19104}, name: "EOKW", }, }, @@ -5263,44 +5471,44 @@ var g = &grammar{ }, { name: "ExplodeOp", - pos: position{line: 797, col: 1, offset: 19035}, + pos: position{line: 800, col: 1, offset: 19295}, expr: &actionExpr{ - pos: position{line: 798, col: 5, offset: 19049}, + pos: position{line: 801, col: 5, offset: 19309}, run: (*parser).callonExplodeOp1, expr: &seqExpr{ - pos: position{line: 798, col: 5, offset: 19049}, + pos: position{line: 801, col: 5, offset: 19309}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 798, col: 5, offset: 19049}, + pos: position{line: 801, col: 5, offset: 19309}, name: "EXPLODE", }, &ruleRefExpr{ - pos: position{line: 798, col: 13, offset: 19057}, + pos: position{line: 801, col: 13, offset: 19317}, name: "_", }, &labeledExpr{ - pos: position{line: 798, col: 15, offset: 19059}, + pos: position{line: 801, col: 15, offset: 19319}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 798, col: 20, offset: 19064}, + pos: position{line: 801, col: 20, offset: 19324}, name: "Exprs", }, }, &labeledExpr{ - pos: position{line: 798, col: 26, offset: 19070}, + pos: position{line: 801, col: 26, offset: 19330}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 798, col: 30, offset: 19074}, + pos: position{line: 801, col: 30, offset: 19334}, name: "TypeArg", }, }, &labeledExpr{ - pos: position{line: 798, col: 38, offset: 19082}, + pos: position{line: 801, col: 38, offset: 19342}, label: "as", expr: &zeroOrOneExpr{ - pos: position{line: 798, col: 41, offset: 19085}, + pos: position{line: 801, col: 41, offset: 19345}, expr: &ruleRefExpr{ - pos: position{line: 798, col: 41, offset: 19085}, + pos: position{line: 801, col: 41, offset: 19345}, name: "AsArg", }, }, @@ -5313,26 +5521,26 @@ var g = &grammar{ }, { name: "MergeOp", - pos: position{line: 811, col: 1, offset: 19327}, + pos: position{line: 814, col: 1, offset: 19587}, expr: &actionExpr{ - pos: position{line: 812, col: 5, offset: 19339}, + pos: position{line: 815, col: 5, offset: 19599}, run: (*parser).callonMergeOp1, expr: &seqExpr{ - pos: position{line: 812, col: 5, offset: 19339}, + pos: position{line: 815, col: 5, offset: 19599}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 812, col: 5, offset: 19339}, + pos: position{line: 815, col: 5, offset: 19599}, name: "MERGE", }, &ruleRefExpr{ - pos: position{line: 812, col: 11, offset: 19345}, + pos: position{line: 815, col: 11, offset: 19605}, name: "_", }, &labeledExpr{ - pos: position{line: 812, col: 13, offset: 19347}, + pos: position{line: 815, col: 13, offset: 19607}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 812, col: 18, offset: 19352}, + pos: position{line: 815, col: 18, offset: 19612}, name: "Expr", }, }, @@ -5344,47 +5552,47 @@ var g = &grammar{ }, { name: "OverOp", - pos: position{line: 820, col: 1, offset: 19479}, + pos: position{line: 823, col: 1, offset: 19739}, expr: &actionExpr{ - pos: position{line: 821, col: 5, offset: 19490}, + pos: position{line: 824, col: 5, offset: 19750}, run: (*parser).callonOverOp1, expr: &seqExpr{ - pos: position{line: 821, col: 5, offset: 19490}, + pos: position{line: 824, col: 5, offset: 19750}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 821, col: 5, offset: 19490}, + pos: position{line: 824, col: 5, offset: 19750}, name: "OVER", }, &ruleRefExpr{ - pos: position{line: 821, col: 10, offset: 19495}, + pos: position{line: 824, col: 10, offset: 19755}, name: "_", }, &labeledExpr{ - pos: position{line: 821, col: 12, offset: 19497}, + pos: position{line: 824, col: 12, offset: 19757}, label: "exprs", expr: &ruleRefExpr{ - pos: position{line: 821, col: 18, offset: 19503}, + pos: position{line: 824, col: 18, offset: 19763}, name: "Exprs", }, }, &labeledExpr{ - pos: position{line: 821, col: 24, offset: 19509}, + pos: position{line: 824, col: 24, offset: 19769}, label: "locals", expr: &zeroOrOneExpr{ - pos: position{line: 821, col: 31, offset: 19516}, + pos: position{line: 824, col: 31, offset: 19776}, expr: &ruleRefExpr{ - pos: position{line: 821, col: 31, offset: 19516}, + pos: position{line: 824, col: 31, offset: 19776}, name: "Locals", }, }, }, &labeledExpr{ - pos: position{line: 821, col: 39, offset: 19524}, + pos: position{line: 824, col: 39, offset: 19784}, label: "body", expr: &zeroOrOneExpr{ - pos: position{line: 821, col: 44, offset: 19529}, + pos: position{line: 824, col: 44, offset: 19789}, expr: &ruleRefExpr{ - pos: position{line: 821, col: 44, offset: 19529}, + pos: position{line: 824, col: 44, offset: 19789}, name: "Lateral", }, }, @@ -5397,54 +5605,54 @@ var g = &grammar{ }, { name: "Lateral", - pos: position{line: 836, col: 1, offset: 19854}, + pos: position{line: 839, col: 1, offset: 20114}, expr: &choiceExpr{ - pos: position{line: 837, col: 5, offset: 19866}, + pos: position{line: 840, col: 5, offset: 20126}, alternatives: []any{ &actionExpr{ - pos: position{line: 837, col: 5, offset: 19866}, + pos: position{line: 840, col: 5, offset: 20126}, run: (*parser).callonLateral2, expr: &seqExpr{ - pos: position{line: 837, col: 5, offset: 19866}, + pos: position{line: 840, col: 5, offset: 20126}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 837, col: 5, offset: 19866}, + pos: position{line: 840, col: 5, offset: 20126}, name: "__", }, &litMatcher{ - pos: position{line: 837, col: 8, offset: 19869}, + pos: position{line: 840, col: 8, offset: 20129}, val: "=>", ignoreCase: false, want: "\"=>\"", }, &ruleRefExpr{ - pos: position{line: 837, col: 13, offset: 19874}, + pos: position{line: 840, col: 13, offset: 20134}, name: "__", }, &litMatcher{ - pos: position{line: 837, col: 16, offset: 19877}, + pos: position{line: 840, col: 16, offset: 20137}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 837, col: 20, offset: 19881}, + pos: position{line: 840, col: 20, offset: 20141}, name: "__", }, &labeledExpr{ - pos: position{line: 837, col: 23, offset: 19884}, + pos: position{line: 840, col: 23, offset: 20144}, label: "scope", expr: &ruleRefExpr{ - pos: position{line: 837, col: 29, offset: 19890}, + pos: position{line: 840, col: 29, offset: 20150}, name: "Scope", }, }, &ruleRefExpr{ - pos: position{line: 837, col: 35, offset: 19896}, + pos: position{line: 840, col: 35, offset: 20156}, name: "__", }, &litMatcher{ - pos: position{line: 837, col: 38, offset: 19899}, + pos: position{line: 840, col: 38, offset: 20159}, val: ")", ignoreCase: false, want: "\")\"", @@ -5453,49 +5661,49 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 840, col: 5, offset: 19980}, + pos: position{line: 843, col: 5, offset: 20240}, run: (*parser).callonLateral13, expr: &seqExpr{ - pos: position{line: 840, col: 5, offset: 19980}, + pos: position{line: 843, col: 5, offset: 20240}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 840, col: 5, offset: 19980}, + pos: position{line: 843, col: 5, offset: 20240}, name: "__", }, &litMatcher{ - pos: position{line: 840, col: 8, offset: 19983}, + pos: position{line: 843, col: 8, offset: 20243}, val: "=>", ignoreCase: false, want: "\"=>\"", }, &ruleRefExpr{ - pos: position{line: 840, col: 13, offset: 19988}, + pos: position{line: 843, col: 13, offset: 20248}, name: "__", }, &litMatcher{ - pos: position{line: 840, col: 16, offset: 19991}, + pos: position{line: 843, col: 16, offset: 20251}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 840, col: 20, offset: 19995}, + pos: position{line: 843, col: 20, offset: 20255}, name: "__", }, &labeledExpr{ - pos: position{line: 840, col: 23, offset: 19998}, + pos: position{line: 843, col: 23, offset: 20258}, label: "seq", expr: &ruleRefExpr{ - pos: position{line: 840, col: 27, offset: 20002}, + pos: position{line: 843, col: 27, offset: 20262}, name: "Seq", }, }, &ruleRefExpr{ - pos: position{line: 840, col: 31, offset: 20006}, + pos: position{line: 843, col: 31, offset: 20266}, name: "__", }, &litMatcher{ - pos: position{line: 840, col: 34, offset: 20009}, + pos: position{line: 843, col: 34, offset: 20269}, val: ")", ignoreCase: false, want: "\")\"", @@ -5510,63 +5718,63 @@ var g = &grammar{ }, { name: "Locals", - pos: position{line: 844, col: 1, offset: 20065}, + pos: position{line: 847, col: 1, offset: 20325}, expr: &actionExpr{ - pos: position{line: 845, col: 5, offset: 20076}, + pos: position{line: 848, col: 5, offset: 20336}, run: (*parser).callonLocals1, expr: &seqExpr{ - pos: position{line: 845, col: 5, offset: 20076}, + pos: position{line: 848, col: 5, offset: 20336}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 845, col: 5, offset: 20076}, + pos: position{line: 848, col: 5, offset: 20336}, name: "_", }, &ruleRefExpr{ - pos: position{line: 845, col: 7, offset: 20078}, + pos: position{line: 848, col: 7, offset: 20338}, name: "WITH", }, &ruleRefExpr{ - pos: position{line: 845, col: 12, offset: 20083}, + pos: position{line: 848, col: 12, offset: 20343}, name: "_", }, &labeledExpr{ - pos: position{line: 845, col: 14, offset: 20085}, + pos: position{line: 848, col: 14, offset: 20345}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 845, col: 20, offset: 20091}, + pos: position{line: 848, col: 20, offset: 20351}, name: "LocalsAssignment", }, }, &labeledExpr{ - pos: position{line: 845, col: 37, offset: 20108}, + pos: position{line: 848, col: 37, offset: 20368}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 845, col: 42, offset: 20113}, + pos: position{line: 848, col: 42, offset: 20373}, expr: &actionExpr{ - pos: position{line: 845, col: 43, offset: 20114}, + pos: position{line: 848, col: 43, offset: 20374}, run: (*parser).callonLocals10, expr: &seqExpr{ - pos: position{line: 845, col: 43, offset: 20114}, + pos: position{line: 848, col: 43, offset: 20374}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 845, col: 43, offset: 20114}, + pos: position{line: 848, col: 43, offset: 20374}, name: "__", }, &litMatcher{ - pos: position{line: 845, col: 46, offset: 20117}, + pos: position{line: 848, col: 46, offset: 20377}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 845, col: 50, offset: 20121}, + pos: position{line: 848, col: 50, offset: 20381}, name: "__", }, &labeledExpr{ - pos: position{line: 845, col: 53, offset: 20124}, + pos: position{line: 848, col: 53, offset: 20384}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 845, col: 55, offset: 20126}, + pos: position{line: 848, col: 55, offset: 20386}, name: "LocalsAssignment", }, }, @@ -5583,45 +5791,45 @@ var g = &grammar{ }, { name: "LocalsAssignment", - pos: position{line: 849, col: 1, offset: 20211}, + pos: position{line: 852, col: 1, offset: 20471}, expr: &actionExpr{ - pos: position{line: 850, col: 5, offset: 20232}, + pos: position{line: 853, col: 5, offset: 20492}, run: (*parser).callonLocalsAssignment1, expr: &seqExpr{ - pos: position{line: 850, col: 5, offset: 20232}, + pos: position{line: 853, col: 5, offset: 20492}, exprs: []any{ &labeledExpr{ - pos: position{line: 850, col: 5, offset: 20232}, + pos: position{line: 853, col: 5, offset: 20492}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 850, col: 10, offset: 20237}, + pos: position{line: 853, col: 10, offset: 20497}, name: "Identifier", }, }, &labeledExpr{ - pos: position{line: 850, col: 21, offset: 20248}, + pos: position{line: 853, col: 21, offset: 20508}, label: "opt", expr: &zeroOrOneExpr{ - pos: position{line: 850, col: 25, offset: 20252}, + pos: position{line: 853, col: 25, offset: 20512}, expr: &seqExpr{ - pos: position{line: 850, col: 26, offset: 20253}, + pos: position{line: 853, col: 26, offset: 20513}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 850, col: 26, offset: 20253}, + pos: position{line: 853, col: 26, offset: 20513}, name: "__", }, &litMatcher{ - pos: position{line: 850, col: 29, offset: 20256}, + pos: position{line: 853, col: 29, offset: 20516}, val: "=", ignoreCase: false, want: "\"=\"", }, &ruleRefExpr{ - pos: position{line: 850, col: 33, offset: 20260}, + pos: position{line: 853, col: 33, offset: 20520}, name: "__", }, &ruleRefExpr{ - pos: position{line: 850, col: 36, offset: 20263}, + pos: position{line: 853, col: 36, offset: 20523}, name: "Expr", }, }, @@ -5636,26 +5844,26 @@ var g = &grammar{ }, { name: "YieldOp", - pos: position{line: 862, col: 1, offset: 20487}, + pos: position{line: 865, col: 1, offset: 20747}, expr: &actionExpr{ - pos: position{line: 863, col: 5, offset: 20499}, + pos: position{line: 866, col: 5, offset: 20759}, run: (*parser).callonYieldOp1, expr: &seqExpr{ - pos: position{line: 863, col: 5, offset: 20499}, + pos: position{line: 866, col: 5, offset: 20759}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 863, col: 5, offset: 20499}, + pos: position{line: 866, col: 5, offset: 20759}, name: "YIELD", }, &ruleRefExpr{ - pos: position{line: 863, col: 11, offset: 20505}, + pos: position{line: 866, col: 11, offset: 20765}, name: "_", }, &labeledExpr{ - pos: position{line: 863, col: 13, offset: 20507}, + pos: position{line: 866, col: 13, offset: 20767}, label: "exprs", expr: &ruleRefExpr{ - pos: position{line: 863, col: 19, offset: 20513}, + pos: position{line: 866, col: 19, offset: 20773}, name: "Exprs", }, }, @@ -5667,30 +5875,30 @@ var g = &grammar{ }, { name: "TypeArg", - pos: position{line: 871, col: 1, offset: 20657}, + pos: position{line: 874, col: 1, offset: 20917}, expr: &actionExpr{ - pos: position{line: 872, col: 5, offset: 20669}, + pos: position{line: 875, col: 5, offset: 20929}, run: (*parser).callonTypeArg1, expr: &seqExpr{ - pos: position{line: 872, col: 5, offset: 20669}, + pos: position{line: 875, col: 5, offset: 20929}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 872, col: 5, offset: 20669}, + pos: position{line: 875, col: 5, offset: 20929}, name: "_", }, &ruleRefExpr{ - pos: position{line: 872, col: 7, offset: 20671}, + pos: position{line: 875, col: 7, offset: 20931}, name: "BY", }, &ruleRefExpr{ - pos: position{line: 872, col: 10, offset: 20674}, + pos: position{line: 875, col: 10, offset: 20934}, name: "_", }, &labeledExpr{ - pos: position{line: 872, col: 12, offset: 20676}, + pos: position{line: 875, col: 12, offset: 20936}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 872, col: 16, offset: 20680}, + pos: position{line: 875, col: 16, offset: 20940}, name: "Type", }, }, @@ -5702,30 +5910,30 @@ var g = &grammar{ }, { name: "AsArg", - pos: position{line: 874, col: 1, offset: 20706}, + pos: position{line: 877, col: 1, offset: 20966}, expr: &actionExpr{ - pos: position{line: 875, col: 5, offset: 20716}, + pos: position{line: 878, col: 5, offset: 20976}, run: (*parser).callonAsArg1, expr: &seqExpr{ - pos: position{line: 875, col: 5, offset: 20716}, + pos: position{line: 878, col: 5, offset: 20976}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 875, col: 5, offset: 20716}, + pos: position{line: 878, col: 5, offset: 20976}, name: "_", }, &ruleRefExpr{ - pos: position{line: 875, col: 7, offset: 20718}, + pos: position{line: 878, col: 7, offset: 20978}, name: "AS", }, &ruleRefExpr{ - pos: position{line: 875, col: 10, offset: 20721}, + pos: position{line: 878, col: 10, offset: 20981}, name: "_", }, &labeledExpr{ - pos: position{line: 875, col: 12, offset: 20723}, + pos: position{line: 878, col: 12, offset: 20983}, label: "lhs", expr: &ruleRefExpr{ - pos: position{line: 875, col: 16, offset: 20727}, + pos: position{line: 878, col: 16, offset: 20987}, name: "Lval", }, }, @@ -5737,9 +5945,9 @@ var g = &grammar{ }, { name: "Lval", - pos: position{line: 879, col: 1, offset: 20778}, + pos: position{line: 882, col: 1, offset: 21038}, expr: &ruleRefExpr{ - pos: position{line: 879, col: 8, offset: 20785}, + pos: position{line: 882, col: 8, offset: 21045}, name: "DerefExpr", }, leader: false, @@ -5747,51 +5955,51 @@ var g = &grammar{ }, { name: "Lvals", - pos: position{line: 881, col: 1, offset: 20796}, + pos: position{line: 884, col: 1, offset: 21056}, expr: &actionExpr{ - pos: position{line: 882, col: 5, offset: 20806}, + pos: position{line: 885, col: 5, offset: 21066}, run: (*parser).callonLvals1, expr: &seqExpr{ - pos: position{line: 882, col: 5, offset: 20806}, + pos: position{line: 885, col: 5, offset: 21066}, exprs: []any{ &labeledExpr{ - pos: position{line: 882, col: 5, offset: 20806}, + pos: position{line: 885, col: 5, offset: 21066}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 882, col: 11, offset: 20812}, + pos: position{line: 885, col: 11, offset: 21072}, name: "Lval", }, }, &labeledExpr{ - pos: position{line: 882, col: 16, offset: 20817}, + pos: position{line: 885, col: 16, offset: 21077}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 882, col: 21, offset: 20822}, + pos: position{line: 885, col: 21, offset: 21082}, expr: &actionExpr{ - pos: position{line: 882, col: 22, offset: 20823}, + pos: position{line: 885, col: 22, offset: 21083}, run: (*parser).callonLvals7, expr: &seqExpr{ - pos: position{line: 882, col: 22, offset: 20823}, + pos: position{line: 885, col: 22, offset: 21083}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 882, col: 22, offset: 20823}, + pos: position{line: 885, col: 22, offset: 21083}, name: "__", }, &litMatcher{ - pos: position{line: 882, col: 25, offset: 20826}, + pos: position{line: 885, col: 25, offset: 21086}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 882, col: 29, offset: 20830}, + pos: position{line: 885, col: 29, offset: 21090}, name: "__", }, &labeledExpr{ - pos: position{line: 882, col: 32, offset: 20833}, + pos: position{line: 885, col: 32, offset: 21093}, label: "lval", expr: &ruleRefExpr{ - pos: position{line: 882, col: 37, offset: 20838}, + pos: position{line: 885, col: 37, offset: 21098}, name: "Lval", }, }, @@ -5808,51 +6016,51 @@ var g = &grammar{ }, { name: "Assignments", - pos: position{line: 886, col: 1, offset: 20914}, + pos: position{line: 889, col: 1, offset: 21174}, expr: &actionExpr{ - pos: position{line: 887, col: 5, offset: 20930}, + pos: position{line: 890, col: 5, offset: 21190}, run: (*parser).callonAssignments1, expr: &seqExpr{ - pos: position{line: 887, col: 5, offset: 20930}, + pos: position{line: 890, col: 5, offset: 21190}, exprs: []any{ &labeledExpr{ - pos: position{line: 887, col: 5, offset: 20930}, + pos: position{line: 890, col: 5, offset: 21190}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 887, col: 11, offset: 20936}, + pos: position{line: 890, col: 11, offset: 21196}, name: "Assignment", }, }, &labeledExpr{ - pos: position{line: 887, col: 22, offset: 20947}, + pos: position{line: 890, col: 22, offset: 21207}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 887, col: 27, offset: 20952}, + pos: position{line: 890, col: 27, offset: 21212}, expr: &actionExpr{ - pos: position{line: 887, col: 28, offset: 20953}, + pos: position{line: 890, col: 28, offset: 21213}, run: (*parser).callonAssignments7, expr: &seqExpr{ - pos: position{line: 887, col: 28, offset: 20953}, + pos: position{line: 890, col: 28, offset: 21213}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 887, col: 28, offset: 20953}, + pos: position{line: 890, col: 28, offset: 21213}, name: "__", }, &litMatcher{ - pos: position{line: 887, col: 31, offset: 20956}, + pos: position{line: 890, col: 31, offset: 21216}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 887, col: 35, offset: 20960}, + pos: position{line: 890, col: 35, offset: 21220}, name: "__", }, &labeledExpr{ - pos: position{line: 887, col: 38, offset: 20963}, + pos: position{line: 890, col: 38, offset: 21223}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 887, col: 40, offset: 20965}, + pos: position{line: 890, col: 40, offset: 21225}, name: "Assignment", }, }, @@ -5869,40 +6077,40 @@ var g = &grammar{ }, { name: "Assignment", - pos: position{line: 891, col: 1, offset: 21040}, + pos: position{line: 894, col: 1, offset: 21300}, expr: &actionExpr{ - pos: position{line: 892, col: 5, offset: 21055}, + pos: position{line: 895, col: 5, offset: 21315}, run: (*parser).callonAssignment1, expr: &seqExpr{ - pos: position{line: 892, col: 5, offset: 21055}, + pos: position{line: 895, col: 5, offset: 21315}, exprs: []any{ &labeledExpr{ - pos: position{line: 892, col: 5, offset: 21055}, + pos: position{line: 895, col: 5, offset: 21315}, label: "lhs", expr: &ruleRefExpr{ - pos: position{line: 892, col: 9, offset: 21059}, + pos: position{line: 895, col: 9, offset: 21319}, name: "Lval", }, }, &ruleRefExpr{ - pos: position{line: 892, col: 14, offset: 21064}, + pos: position{line: 895, col: 14, offset: 21324}, name: "__", }, &litMatcher{ - pos: position{line: 892, col: 17, offset: 21067}, + pos: position{line: 895, col: 17, offset: 21327}, val: ":=", ignoreCase: false, want: "\":=\"", }, &ruleRefExpr{ - pos: position{line: 892, col: 22, offset: 21072}, + pos: position{line: 895, col: 22, offset: 21332}, name: "__", }, &labeledExpr{ - pos: position{line: 892, col: 25, offset: 21075}, + pos: position{line: 895, col: 25, offset: 21335}, label: "rhs", expr: &ruleRefExpr{ - pos: position{line: 892, col: 29, offset: 21079}, + pos: position{line: 895, col: 29, offset: 21339}, name: "Expr", }, }, @@ -5914,9 +6122,9 @@ var g = &grammar{ }, { name: "Expr", - pos: position{line: 901, col: 1, offset: 21250}, + pos: position{line: 904, col: 1, offset: 21510}, expr: &ruleRefExpr{ - pos: position{line: 901, col: 8, offset: 21257}, + pos: position{line: 904, col: 8, offset: 21517}, name: "ConditionalExpr", }, leader: false, @@ -5924,63 +6132,63 @@ var g = &grammar{ }, { name: "ConditionalExpr", - pos: position{line: 903, col: 1, offset: 21274}, + pos: position{line: 906, col: 1, offset: 21534}, expr: &actionExpr{ - pos: position{line: 904, col: 5, offset: 21294}, + pos: position{line: 907, col: 5, offset: 21554}, run: (*parser).callonConditionalExpr1, expr: &seqExpr{ - pos: position{line: 904, col: 5, offset: 21294}, + pos: position{line: 907, col: 5, offset: 21554}, exprs: []any{ &labeledExpr{ - pos: position{line: 904, col: 5, offset: 21294}, + pos: position{line: 907, col: 5, offset: 21554}, label: "cond", expr: &ruleRefExpr{ - pos: position{line: 904, col: 10, offset: 21299}, + pos: position{line: 907, col: 10, offset: 21559}, name: "LogicalOrExpr", }, }, &labeledExpr{ - pos: position{line: 904, col: 24, offset: 21313}, + pos: position{line: 907, col: 24, offset: 21573}, label: "opt", expr: &zeroOrOneExpr{ - pos: position{line: 904, col: 28, offset: 21317}, + pos: position{line: 907, col: 28, offset: 21577}, expr: &seqExpr{ - pos: position{line: 904, col: 29, offset: 21318}, + pos: position{line: 907, col: 29, offset: 21578}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 904, col: 29, offset: 21318}, + pos: position{line: 907, col: 29, offset: 21578}, name: "__", }, &litMatcher{ - pos: position{line: 904, col: 32, offset: 21321}, + pos: position{line: 907, col: 32, offset: 21581}, val: "?", ignoreCase: false, want: "\"?\"", }, &ruleRefExpr{ - pos: position{line: 904, col: 36, offset: 21325}, + pos: position{line: 907, col: 36, offset: 21585}, name: "__", }, &ruleRefExpr{ - pos: position{line: 904, col: 39, offset: 21328}, + pos: position{line: 907, col: 39, offset: 21588}, name: "Expr", }, &ruleRefExpr{ - pos: position{line: 904, col: 44, offset: 21333}, + pos: position{line: 907, col: 44, offset: 21593}, name: "__", }, &litMatcher{ - pos: position{line: 904, col: 47, offset: 21336}, + pos: position{line: 907, col: 47, offset: 21596}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 904, col: 51, offset: 21340}, + pos: position{line: 907, col: 51, offset: 21600}, name: "__", }, &ruleRefExpr{ - pos: position{line: 904, col: 54, offset: 21343}, + pos: position{line: 907, col: 54, offset: 21603}, name: "Expr", }, }, @@ -5995,53 +6203,53 @@ var g = &grammar{ }, { name: "LogicalOrExpr", - pos: position{line: 918, col: 1, offset: 21664}, + pos: position{line: 921, col: 1, offset: 21924}, expr: &actionExpr{ - pos: position{line: 919, col: 5, offset: 21682}, + pos: position{line: 922, col: 5, offset: 21942}, run: (*parser).callonLogicalOrExpr1, expr: &seqExpr{ - pos: position{line: 919, col: 5, offset: 21682}, + pos: position{line: 922, col: 5, offset: 21942}, exprs: []any{ &labeledExpr{ - pos: position{line: 919, col: 5, offset: 21682}, + pos: position{line: 922, col: 5, offset: 21942}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 919, col: 11, offset: 21688}, + pos: position{line: 922, col: 11, offset: 21948}, name: "LogicalAndExpr", }, }, &labeledExpr{ - pos: position{line: 920, col: 5, offset: 21707}, + pos: position{line: 923, col: 5, offset: 21967}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 920, col: 10, offset: 21712}, + pos: position{line: 923, col: 10, offset: 21972}, expr: &actionExpr{ - pos: position{line: 920, col: 11, offset: 21713}, + pos: position{line: 923, col: 11, offset: 21973}, run: (*parser).callonLogicalOrExpr7, expr: &seqExpr{ - pos: position{line: 920, col: 11, offset: 21713}, + pos: position{line: 923, col: 11, offset: 21973}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 920, col: 11, offset: 21713}, + pos: position{line: 923, col: 11, offset: 21973}, name: "__", }, &labeledExpr{ - pos: position{line: 920, col: 14, offset: 21716}, + pos: position{line: 923, col: 14, offset: 21976}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 920, col: 17, offset: 21719}, + pos: position{line: 923, col: 17, offset: 21979}, name: "OR", }, }, &ruleRefExpr{ - pos: position{line: 920, col: 20, offset: 21722}, + pos: position{line: 923, col: 20, offset: 21982}, name: "__", }, &labeledExpr{ - pos: position{line: 920, col: 23, offset: 21725}, + pos: position{line: 923, col: 23, offset: 21985}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 920, col: 28, offset: 21730}, + pos: position{line: 923, col: 28, offset: 21990}, name: "LogicalAndExpr", }, }, @@ -6058,53 +6266,53 @@ var g = &grammar{ }, { name: "LogicalAndExpr", - pos: position{line: 924, col: 1, offset: 21844}, + pos: position{line: 927, col: 1, offset: 22104}, expr: &actionExpr{ - pos: position{line: 925, col: 5, offset: 21863}, + pos: position{line: 928, col: 5, offset: 22123}, run: (*parser).callonLogicalAndExpr1, expr: &seqExpr{ - pos: position{line: 925, col: 5, offset: 21863}, + pos: position{line: 928, col: 5, offset: 22123}, exprs: []any{ &labeledExpr{ - pos: position{line: 925, col: 5, offset: 21863}, + pos: position{line: 928, col: 5, offset: 22123}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 925, col: 11, offset: 21869}, + pos: position{line: 928, col: 11, offset: 22129}, name: "NotExpr", }, }, &labeledExpr{ - pos: position{line: 926, col: 5, offset: 21881}, + pos: position{line: 929, col: 5, offset: 22141}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 926, col: 10, offset: 21886}, + pos: position{line: 929, col: 10, offset: 22146}, expr: &actionExpr{ - pos: position{line: 926, col: 11, offset: 21887}, + pos: position{line: 929, col: 11, offset: 22147}, run: (*parser).callonLogicalAndExpr7, expr: &seqExpr{ - pos: position{line: 926, col: 11, offset: 21887}, + pos: position{line: 929, col: 11, offset: 22147}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 926, col: 11, offset: 21887}, + pos: position{line: 929, col: 11, offset: 22147}, name: "__", }, &labeledExpr{ - pos: position{line: 926, col: 14, offset: 21890}, + pos: position{line: 929, col: 14, offset: 22150}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 926, col: 17, offset: 21893}, + pos: position{line: 929, col: 17, offset: 22153}, name: "AND", }, }, &ruleRefExpr{ - pos: position{line: 926, col: 21, offset: 21897}, + pos: position{line: 929, col: 21, offset: 22157}, name: "__", }, &labeledExpr{ - pos: position{line: 926, col: 24, offset: 21900}, + pos: position{line: 929, col: 24, offset: 22160}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 926, col: 29, offset: 21905}, + pos: position{line: 929, col: 29, offset: 22165}, name: "NotExpr", }, }, @@ -6121,43 +6329,43 @@ var g = &grammar{ }, { name: "NotExpr", - pos: position{line: 930, col: 1, offset: 22012}, + pos: position{line: 933, col: 1, offset: 22272}, expr: &choiceExpr{ - pos: position{line: 931, col: 5, offset: 22024}, + pos: position{line: 934, col: 5, offset: 22284}, alternatives: []any{ &actionExpr{ - pos: position{line: 931, col: 5, offset: 22024}, + pos: position{line: 934, col: 5, offset: 22284}, run: (*parser).callonNotExpr2, expr: &seqExpr{ - pos: position{line: 931, col: 5, offset: 22024}, + pos: position{line: 934, col: 5, offset: 22284}, exprs: []any{ &choiceExpr{ - pos: position{line: 931, col: 6, offset: 22025}, + pos: position{line: 934, col: 6, offset: 22285}, alternatives: []any{ &seqExpr{ - pos: position{line: 931, col: 6, offset: 22025}, + pos: position{line: 934, col: 6, offset: 22285}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 931, col: 6, offset: 22025}, + pos: position{line: 934, col: 6, offset: 22285}, name: "NOT", }, &ruleRefExpr{ - pos: position{line: 931, col: 10, offset: 22029}, + pos: position{line: 934, col: 10, offset: 22289}, name: "_", }, }, }, &seqExpr{ - pos: position{line: 931, col: 14, offset: 22033}, + pos: position{line: 934, col: 14, offset: 22293}, exprs: []any{ &litMatcher{ - pos: position{line: 931, col: 14, offset: 22033}, + pos: position{line: 934, col: 14, offset: 22293}, val: "!", ignoreCase: false, want: "\"!\"", }, &ruleRefExpr{ - pos: position{line: 931, col: 18, offset: 22037}, + pos: position{line: 934, col: 18, offset: 22297}, name: "__", }, }, @@ -6165,10 +6373,10 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 931, col: 22, offset: 22041}, + pos: position{line: 934, col: 22, offset: 22301}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 931, col: 24, offset: 22043}, + pos: position{line: 934, col: 24, offset: 22303}, name: "NotExpr", }, }, @@ -6176,7 +6384,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 939, col: 5, offset: 22209}, + pos: position{line: 942, col: 5, offset: 22469}, name: "BetweenExpr", }, }, @@ -6186,61 +6394,61 @@ var g = &grammar{ }, { name: "BetweenExpr", - pos: position{line: 941, col: 1, offset: 22224}, + pos: position{line: 944, col: 1, offset: 22484}, expr: &choiceExpr{ - pos: position{line: 942, col: 5, offset: 22240}, + pos: position{line: 945, col: 5, offset: 22500}, alternatives: []any{ &actionExpr{ - pos: position{line: 942, col: 5, offset: 22240}, + pos: position{line: 945, col: 5, offset: 22500}, run: (*parser).callonBetweenExpr2, expr: &seqExpr{ - pos: position{line: 942, col: 5, offset: 22240}, + pos: position{line: 945, col: 5, offset: 22500}, exprs: []any{ &labeledExpr{ - pos: position{line: 942, col: 5, offset: 22240}, + pos: position{line: 945, col: 5, offset: 22500}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 942, col: 10, offset: 22245}, + pos: position{line: 945, col: 10, offset: 22505}, name: "ComparisonExpr", }, }, &ruleRefExpr{ - pos: position{line: 942, col: 25, offset: 22260}, + pos: position{line: 945, col: 25, offset: 22520}, name: "_", }, &ruleRefExpr{ - pos: position{line: 942, col: 27, offset: 22262}, + pos: position{line: 945, col: 27, offset: 22522}, name: "BETWEEN", }, &ruleRefExpr{ - pos: position{line: 942, col: 35, offset: 22270}, + pos: position{line: 945, col: 35, offset: 22530}, name: "_", }, &labeledExpr{ - pos: position{line: 942, col: 37, offset: 22272}, + pos: position{line: 945, col: 37, offset: 22532}, label: "lower", expr: &ruleRefExpr{ - pos: position{line: 942, col: 43, offset: 22278}, + pos: position{line: 945, col: 43, offset: 22538}, name: "BetweenExpr", }, }, &ruleRefExpr{ - pos: position{line: 942, col: 55, offset: 22290}, + pos: position{line: 945, col: 55, offset: 22550}, name: "_", }, &ruleRefExpr{ - pos: position{line: 942, col: 57, offset: 22292}, + pos: position{line: 945, col: 57, offset: 22552}, name: "AND", }, &ruleRefExpr{ - pos: position{line: 942, col: 61, offset: 22296}, + pos: position{line: 945, col: 61, offset: 22556}, name: "_", }, &labeledExpr{ - pos: position{line: 942, col: 63, offset: 22298}, + pos: position{line: 945, col: 63, offset: 22558}, label: "upper", expr: &ruleRefExpr{ - pos: position{line: 942, col: 69, offset: 22304}, + pos: position{line: 945, col: 69, offset: 22564}, name: "BetweenExpr", }, }, @@ -6248,7 +6456,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 950, col: 5, offset: 22490}, + pos: position{line: 953, col: 5, offset: 22750}, name: "ComparisonExpr", }, }, @@ -6258,73 +6466,73 @@ var g = &grammar{ }, { name: "ComparisonExpr", - pos: position{line: 952, col: 1, offset: 22506}, + pos: position{line: 955, col: 1, offset: 22766}, expr: &actionExpr{ - pos: position{line: 953, col: 5, offset: 22525}, + pos: position{line: 956, col: 5, offset: 22785}, run: (*parser).callonComparisonExpr1, expr: &seqExpr{ - pos: position{line: 953, col: 5, offset: 22525}, + pos: position{line: 956, col: 5, offset: 22785}, exprs: []any{ &labeledExpr{ - pos: position{line: 953, col: 5, offset: 22525}, + pos: position{line: 956, col: 5, offset: 22785}, label: "lhs", expr: &ruleRefExpr{ - pos: position{line: 953, col: 9, offset: 22529}, - name: "BitOrExpr", + pos: position{line: 956, col: 9, offset: 22789}, + name: "AdditiveExpr", }, }, &labeledExpr{ - pos: position{line: 953, col: 19, offset: 22539}, + pos: position{line: 956, col: 22, offset: 22802}, label: "opAndRHS", expr: &zeroOrOneExpr{ - pos: position{line: 953, col: 28, offset: 22548}, + pos: position{line: 956, col: 31, offset: 22811}, expr: &choiceExpr{ - pos: position{line: 953, col: 29, offset: 22549}, + pos: position{line: 956, col: 32, offset: 22812}, alternatives: []any{ &seqExpr{ - pos: position{line: 953, col: 29, offset: 22549}, + pos: position{line: 956, col: 32, offset: 22812}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 953, col: 29, offset: 22549}, + pos: position{line: 956, col: 32, offset: 22812}, name: "__", }, &ruleRefExpr{ - pos: position{line: 953, col: 32, offset: 22552}, + pos: position{line: 956, col: 35, offset: 22815}, name: "Comparator", }, &ruleRefExpr{ - pos: position{line: 953, col: 43, offset: 22563}, + pos: position{line: 956, col: 46, offset: 22826}, name: "__", }, &ruleRefExpr{ - pos: position{line: 953, col: 46, offset: 22566}, - name: "BitOrExpr", + pos: position{line: 956, col: 49, offset: 22829}, + name: "AdditiveExpr", }, }, }, &seqExpr{ - pos: position{line: 953, col: 58, offset: 22578}, + pos: position{line: 956, col: 64, offset: 22844}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 953, col: 58, offset: 22578}, + pos: position{line: 956, col: 64, offset: 22844}, name: "__", }, &actionExpr{ - pos: position{line: 953, col: 62, offset: 22582}, + pos: position{line: 956, col: 68, offset: 22848}, run: (*parser).callonComparisonExpr15, expr: &litMatcher{ - pos: position{line: 953, col: 62, offset: 22582}, + pos: position{line: 956, col: 68, offset: 22848}, val: "~", ignoreCase: false, want: "\"~\"", }, }, &ruleRefExpr{ - pos: position{line: 953, col: 98, offset: 22618}, + pos: position{line: 956, col: 104, offset: 22884}, name: "__", }, &ruleRefExpr{ - pos: position{line: 953, col: 101, offset: 22621}, + pos: position{line: 956, col: 107, offset: 22887}, name: "Regexp", }, }, @@ -6339,267 +6547,55 @@ var g = &grammar{ leader: false, leftRecursive: false, }, - { - name: "BitOrExpr", - pos: position{line: 966, col: 1, offset: 22906}, - expr: &actionExpr{ - pos: position{line: 967, col: 5, offset: 22920}, - run: (*parser).callonBitOrExpr1, - expr: &seqExpr{ - pos: position{line: 967, col: 5, offset: 22920}, - exprs: []any{ - &labeledExpr{ - pos: position{line: 967, col: 5, offset: 22920}, - label: "first", - expr: &ruleRefExpr{ - pos: position{line: 967, col: 11, offset: 22926}, - name: "BitAndExpr", - }, - }, - &labeledExpr{ - pos: position{line: 968, col: 5, offset: 22941}, - label: "rest", - expr: &zeroOrMoreExpr{ - pos: position{line: 968, col: 10, offset: 22946}, - expr: &actionExpr{ - pos: position{line: 968, col: 11, offset: 22947}, - run: (*parser).callonBitOrExpr7, - expr: &seqExpr{ - pos: position{line: 968, col: 11, offset: 22947}, - exprs: []any{ - &ruleRefExpr{ - pos: position{line: 968, col: 11, offset: 22947}, - name: "__", - }, - &litMatcher{ - pos: position{line: 968, col: 14, offset: 22950}, - val: "|", - ignoreCase: false, - want: "\"|\"", - }, - &ruleRefExpr{ - pos: position{line: 968, col: 18, offset: 22954}, - name: "__", - }, - &labeledExpr{ - pos: position{line: 968, col: 21, offset: 22957}, - label: "expr", - expr: &ruleRefExpr{ - pos: position{line: 968, col: 26, offset: 22962}, - name: "BitAndExpr", - }, - }, - }, - }, - }, - }, - }, - }, - }, - }, - leader: false, - leftRecursive: false, - }, - { - name: "BitAndExpr", - pos: position{line: 972, col: 1, offset: 23073}, - expr: &actionExpr{ - pos: position{line: 973, col: 5, offset: 23088}, - run: (*parser).callonBitAndExpr1, - expr: &seqExpr{ - pos: position{line: 973, col: 5, offset: 23088}, - exprs: []any{ - &labeledExpr{ - pos: position{line: 973, col: 5, offset: 23088}, - label: "first", - expr: &ruleRefExpr{ - pos: position{line: 973, col: 11, offset: 23094}, - name: "BitShiftExpr", - }, - }, - &labeledExpr{ - pos: position{line: 974, col: 5, offset: 23111}, - label: "rest", - expr: &zeroOrMoreExpr{ - pos: position{line: 974, col: 10, offset: 23116}, - expr: &actionExpr{ - pos: position{line: 974, col: 11, offset: 23117}, - run: (*parser).callonBitAndExpr7, - expr: &seqExpr{ - pos: position{line: 974, col: 11, offset: 23117}, - exprs: []any{ - &ruleRefExpr{ - pos: position{line: 974, col: 11, offset: 23117}, - name: "__", - }, - &litMatcher{ - pos: position{line: 974, col: 14, offset: 23120}, - val: "&", - ignoreCase: false, - want: "\"&\"", - }, - &ruleRefExpr{ - pos: position{line: 974, col: 18, offset: 23124}, - name: "__", - }, - &labeledExpr{ - pos: position{line: 974, col: 21, offset: 23127}, - label: "expr", - expr: &ruleRefExpr{ - pos: position{line: 974, col: 26, offset: 23132}, - name: "BitShiftExpr", - }, - }, - }, - }, - }, - }, - }, - }, - }, - }, - leader: false, - leftRecursive: false, - }, - { - name: "BitShiftExpr", - pos: position{line: 978, col: 1, offset: 23245}, - expr: &actionExpr{ - pos: position{line: 979, col: 5, offset: 23262}, - run: (*parser).callonBitShiftExpr1, - expr: &seqExpr{ - pos: position{line: 979, col: 5, offset: 23262}, - exprs: []any{ - &labeledExpr{ - pos: position{line: 979, col: 5, offset: 23262}, - label: "first", - expr: &ruleRefExpr{ - pos: position{line: 979, col: 11, offset: 23268}, - name: "AdditiveExpr", - }, - }, - &labeledExpr{ - pos: position{line: 980, col: 5, offset: 23285}, - label: "rest", - expr: &zeroOrMoreExpr{ - pos: position{line: 980, col: 10, offset: 23290}, - expr: &actionExpr{ - pos: position{line: 980, col: 11, offset: 23291}, - run: (*parser).callonBitShiftExpr7, - expr: &seqExpr{ - pos: position{line: 980, col: 11, offset: 23291}, - exprs: []any{ - &ruleRefExpr{ - pos: position{line: 980, col: 11, offset: 23291}, - name: "__", - }, - &labeledExpr{ - pos: position{line: 980, col: 14, offset: 23294}, - label: "op", - expr: &ruleRefExpr{ - pos: position{line: 980, col: 17, offset: 23297}, - name: "BitShiftOperator", - }, - }, - &ruleRefExpr{ - pos: position{line: 980, col: 34, offset: 23314}, - name: "__", - }, - &labeledExpr{ - pos: position{line: 980, col: 37, offset: 23317}, - label: "expr", - expr: &ruleRefExpr{ - pos: position{line: 980, col: 42, offset: 23322}, - name: "AdditiveExpr", - }, - }, - }, - }, - }, - }, - }, - }, - }, - }, - leader: false, - leftRecursive: false, - }, - { - name: "BitShiftOperator", - pos: position{line: 984, col: 1, offset: 23438}, - expr: &actionExpr{ - pos: position{line: 984, col: 20, offset: 23457}, - run: (*parser).callonBitShiftOperator1, - expr: &choiceExpr{ - pos: position{line: 984, col: 21, offset: 23458}, - alternatives: []any{ - &litMatcher{ - pos: position{line: 984, col: 21, offset: 23458}, - val: "<<", - ignoreCase: false, - want: "\"<<\"", - }, - &litMatcher{ - pos: position{line: 984, col: 28, offset: 23465}, - val: ">>", - ignoreCase: false, - want: "\">>\"", - }, - }, - }, - }, - leader: false, - leftRecursive: false, - }, { name: "AdditiveExpr", - pos: position{line: 986, col: 1, offset: 23503}, + pos: position{line: 969, col: 1, offset: 23172}, expr: &actionExpr{ - pos: position{line: 987, col: 5, offset: 23520}, + pos: position{line: 970, col: 5, offset: 23189}, run: (*parser).callonAdditiveExpr1, expr: &seqExpr{ - pos: position{line: 987, col: 5, offset: 23520}, + pos: position{line: 970, col: 5, offset: 23189}, exprs: []any{ &labeledExpr{ - pos: position{line: 987, col: 5, offset: 23520}, + pos: position{line: 970, col: 5, offset: 23189}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 987, col: 11, offset: 23526}, + pos: position{line: 970, col: 11, offset: 23195}, name: "MultiplicativeExpr", }, }, &labeledExpr{ - pos: position{line: 988, col: 5, offset: 23549}, + pos: position{line: 971, col: 5, offset: 23218}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 988, col: 10, offset: 23554}, + pos: position{line: 971, col: 10, offset: 23223}, expr: &actionExpr{ - pos: position{line: 988, col: 11, offset: 23555}, + pos: position{line: 971, col: 11, offset: 23224}, run: (*parser).callonAdditiveExpr7, expr: &seqExpr{ - pos: position{line: 988, col: 11, offset: 23555}, + pos: position{line: 971, col: 11, offset: 23224}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 988, col: 11, offset: 23555}, + pos: position{line: 971, col: 11, offset: 23224}, name: "__", }, &labeledExpr{ - pos: position{line: 988, col: 14, offset: 23558}, + pos: position{line: 971, col: 14, offset: 23227}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 988, col: 17, offset: 23561}, + pos: position{line: 971, col: 17, offset: 23230}, name: "AdditiveOperator", }, }, &ruleRefExpr{ - pos: position{line: 988, col: 34, offset: 23578}, + pos: position{line: 971, col: 34, offset: 23247}, name: "__", }, &labeledExpr{ - pos: position{line: 988, col: 37, offset: 23581}, + pos: position{line: 971, col: 37, offset: 23250}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 988, col: 42, offset: 23586}, + pos: position{line: 971, col: 42, offset: 23255}, name: "MultiplicativeExpr", }, }, @@ -6616,21 +6612,21 @@ var g = &grammar{ }, { name: "AdditiveOperator", - pos: position{line: 992, col: 1, offset: 23704}, + pos: position{line: 975, col: 1, offset: 23373}, expr: &actionExpr{ - pos: position{line: 992, col: 20, offset: 23723}, + pos: position{line: 975, col: 20, offset: 23392}, run: (*parser).callonAdditiveOperator1, expr: &choiceExpr{ - pos: position{line: 992, col: 21, offset: 23724}, + pos: position{line: 975, col: 21, offset: 23393}, alternatives: []any{ &litMatcher{ - pos: position{line: 992, col: 21, offset: 23724}, + pos: position{line: 975, col: 21, offset: 23393}, val: "+", ignoreCase: false, want: "\"+\"", }, &litMatcher{ - pos: position{line: 992, col: 27, offset: 23730}, + pos: position{line: 975, col: 27, offset: 23399}, val: "-", ignoreCase: false, want: "\"-\"", @@ -6643,53 +6639,53 @@ var g = &grammar{ }, { name: "MultiplicativeExpr", - pos: position{line: 994, col: 1, offset: 23767}, + pos: position{line: 977, col: 1, offset: 23436}, expr: &actionExpr{ - pos: position{line: 995, col: 5, offset: 23790}, + pos: position{line: 978, col: 5, offset: 23459}, run: (*parser).callonMultiplicativeExpr1, expr: &seqExpr{ - pos: position{line: 995, col: 5, offset: 23790}, + pos: position{line: 978, col: 5, offset: 23459}, exprs: []any{ &labeledExpr{ - pos: position{line: 995, col: 5, offset: 23790}, + pos: position{line: 978, col: 5, offset: 23459}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 995, col: 11, offset: 23796}, + pos: position{line: 978, col: 11, offset: 23465}, name: "ConcatExpr", }, }, &labeledExpr{ - pos: position{line: 996, col: 5, offset: 23811}, + pos: position{line: 979, col: 5, offset: 23480}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 996, col: 10, offset: 23816}, + pos: position{line: 979, col: 10, offset: 23485}, expr: &actionExpr{ - pos: position{line: 996, col: 11, offset: 23817}, + pos: position{line: 979, col: 11, offset: 23486}, run: (*parser).callonMultiplicativeExpr7, expr: &seqExpr{ - pos: position{line: 996, col: 11, offset: 23817}, + pos: position{line: 979, col: 11, offset: 23486}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 996, col: 11, offset: 23817}, + pos: position{line: 979, col: 11, offset: 23486}, name: "__", }, &labeledExpr{ - pos: position{line: 996, col: 14, offset: 23820}, + pos: position{line: 979, col: 14, offset: 23489}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 996, col: 17, offset: 23823}, + pos: position{line: 979, col: 17, offset: 23492}, name: "MultiplicativeOperator", }, }, &ruleRefExpr{ - pos: position{line: 996, col: 40, offset: 23846}, + pos: position{line: 979, col: 40, offset: 23515}, name: "__", }, &labeledExpr{ - pos: position{line: 996, col: 43, offset: 23849}, + pos: position{line: 979, col: 43, offset: 23518}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 996, col: 48, offset: 23854}, + pos: position{line: 979, col: 48, offset: 23523}, name: "ConcatExpr", }, }, @@ -6706,27 +6702,27 @@ var g = &grammar{ }, { name: "MultiplicativeOperator", - pos: position{line: 1000, col: 1, offset: 23964}, + pos: position{line: 983, col: 1, offset: 23633}, expr: &actionExpr{ - pos: position{line: 1000, col: 26, offset: 23989}, + pos: position{line: 983, col: 26, offset: 23658}, run: (*parser).callonMultiplicativeOperator1, expr: &choiceExpr{ - pos: position{line: 1000, col: 27, offset: 23990}, + pos: position{line: 983, col: 27, offset: 23659}, alternatives: []any{ &litMatcher{ - pos: position{line: 1000, col: 27, offset: 23990}, + pos: position{line: 983, col: 27, offset: 23659}, val: "*", ignoreCase: false, want: "\"*\"", }, &litMatcher{ - pos: position{line: 1000, col: 33, offset: 23996}, + pos: position{line: 983, col: 33, offset: 23665}, val: "/", ignoreCase: false, want: "\"/\"", }, &litMatcher{ - pos: position{line: 1000, col: 39, offset: 24002}, + pos: position{line: 983, col: 39, offset: 23671}, val: "%", ignoreCase: false, want: "\"%\"", @@ -6739,51 +6735,51 @@ var g = &grammar{ }, { name: "ConcatExpr", - pos: position{line: 1002, col: 1, offset: 24039}, + pos: position{line: 985, col: 1, offset: 23708}, expr: &actionExpr{ - pos: position{line: 1003, col: 5, offset: 24055}, + pos: position{line: 986, col: 5, offset: 23724}, run: (*parser).callonConcatExpr1, expr: &seqExpr{ - pos: position{line: 1003, col: 5, offset: 24055}, + pos: position{line: 986, col: 5, offset: 23724}, exprs: []any{ &labeledExpr{ - pos: position{line: 1003, col: 5, offset: 24055}, + pos: position{line: 986, col: 5, offset: 23724}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1003, col: 11, offset: 24061}, + pos: position{line: 986, col: 11, offset: 23730}, name: "UnaryPlusOrMinus", }, }, &labeledExpr{ - pos: position{line: 1004, col: 5, offset: 24082}, + pos: position{line: 987, col: 5, offset: 23751}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1004, col: 10, offset: 24087}, + pos: position{line: 987, col: 10, offset: 23756}, expr: &actionExpr{ - pos: position{line: 1004, col: 11, offset: 24088}, + pos: position{line: 987, col: 11, offset: 23757}, run: (*parser).callonConcatExpr7, expr: &seqExpr{ - pos: position{line: 1004, col: 11, offset: 24088}, + pos: position{line: 987, col: 11, offset: 23757}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1004, col: 11, offset: 24088}, + pos: position{line: 987, col: 11, offset: 23757}, name: "__", }, &litMatcher{ - pos: position{line: 1004, col: 14, offset: 24091}, + pos: position{line: 987, col: 14, offset: 23760}, val: "||", ignoreCase: false, want: "\"||\"", }, &ruleRefExpr{ - pos: position{line: 1004, col: 19, offset: 24096}, + pos: position{line: 987, col: 19, offset: 23765}, name: "__", }, &labeledExpr{ - pos: position{line: 1004, col: 22, offset: 24099}, + pos: position{line: 987, col: 22, offset: 23768}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1004, col: 27, offset: 24104}, + pos: position{line: 987, col: 27, offset: 23773}, name: "UnaryPlusOrMinus", }, }, @@ -6800,40 +6796,40 @@ var g = &grammar{ }, { name: "UnaryPlusOrMinus", - pos: position{line: 1008, col: 1, offset: 24222}, + pos: position{line: 991, col: 1, offset: 23891}, expr: &choiceExpr{ - pos: position{line: 1009, col: 5, offset: 24243}, + pos: position{line: 992, col: 5, offset: 23912}, alternatives: []any{ &actionExpr{ - pos: position{line: 1009, col: 5, offset: 24243}, + pos: position{line: 992, col: 5, offset: 23912}, run: (*parser).callonUnaryPlusOrMinus2, expr: &seqExpr{ - pos: position{line: 1009, col: 5, offset: 24243}, + pos: position{line: 992, col: 5, offset: 23912}, exprs: []any{ ¬Expr{ - pos: position{line: 1009, col: 5, offset: 24243}, + pos: position{line: 992, col: 5, offset: 23912}, expr: &ruleRefExpr{ - pos: position{line: 1009, col: 6, offset: 24244}, + pos: position{line: 992, col: 6, offset: 23913}, name: "Literal", }, }, &labeledExpr{ - pos: position{line: 1009, col: 14, offset: 24252}, + pos: position{line: 992, col: 14, offset: 23921}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 1009, col: 17, offset: 24255}, + pos: position{line: 992, col: 17, offset: 23924}, name: "PlusOrMinusOp", }, }, &ruleRefExpr{ - pos: position{line: 1009, col: 31, offset: 24269}, + pos: position{line: 992, col: 31, offset: 23938}, name: "__", }, &labeledExpr{ - pos: position{line: 1009, col: 34, offset: 24272}, + pos: position{line: 992, col: 34, offset: 23941}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1009, col: 36, offset: 24274}, + pos: position{line: 992, col: 36, offset: 23943}, name: "UnaryPlusOrMinus", }, }, @@ -6841,7 +6837,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1018, col: 5, offset: 24458}, + pos: position{line: 1001, col: 5, offset: 24127}, name: "DerefExpr", }, }, @@ -6851,21 +6847,21 @@ var g = &grammar{ }, { name: "PlusOrMinusOp", - pos: position{line: 1020, col: 1, offset: 24469}, + pos: position{line: 1003, col: 1, offset: 24138}, expr: &actionExpr{ - pos: position{line: 1020, col: 17, offset: 24485}, + pos: position{line: 1003, col: 17, offset: 24154}, run: (*parser).callonPlusOrMinusOp1, expr: &choiceExpr{ - pos: position{line: 1020, col: 18, offset: 24486}, + pos: position{line: 1003, col: 18, offset: 24155}, alternatives: []any{ &litMatcher{ - pos: position{line: 1020, col: 18, offset: 24486}, + pos: position{line: 1003, col: 18, offset: 24155}, val: "+", ignoreCase: false, want: "\"+\"", }, &litMatcher{ - pos: position{line: 1020, col: 24, offset: 24492}, + pos: position{line: 1003, col: 24, offset: 24161}, val: "-", ignoreCase: false, want: "\"-\"", @@ -6878,73 +6874,73 @@ var g = &grammar{ }, { name: "DerefExpr", - pos: position{line: 1022, col: 1, offset: 24529}, + pos: position{line: 1005, col: 1, offset: 24198}, expr: &choiceExpr{ - pos: position{line: 1023, col: 5, offset: 24543}, + pos: position{line: 1006, col: 5, offset: 24212}, alternatives: []any{ &actionExpr{ - pos: position{line: 1023, col: 5, offset: 24543}, + pos: position{line: 1006, col: 5, offset: 24212}, run: (*parser).callonDerefExpr2, expr: &seqExpr{ - pos: position{line: 1023, col: 5, offset: 24543}, + pos: position{line: 1006, col: 5, offset: 24212}, exprs: []any{ &labeledExpr{ - pos: position{line: 1023, col: 5, offset: 24543}, + pos: position{line: 1006, col: 5, offset: 24212}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1023, col: 10, offset: 24548}, + pos: position{line: 1006, col: 10, offset: 24217}, name: "DerefExpr", }, }, &litMatcher{ - pos: position{line: 1023, col: 20, offset: 24558}, + pos: position{line: 1006, col: 20, offset: 24227}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 1023, col: 24, offset: 24562}, + pos: position{line: 1006, col: 24, offset: 24231}, name: "__", }, &labeledExpr{ - pos: position{line: 1023, col: 27, offset: 24565}, + pos: position{line: 1006, col: 27, offset: 24234}, label: "from", expr: &ruleRefExpr{ - pos: position{line: 1023, col: 32, offset: 24570}, + pos: position{line: 1006, col: 32, offset: 24239}, name: "AdditiveExpr", }, }, &ruleRefExpr{ - pos: position{line: 1023, col: 45, offset: 24583}, + pos: position{line: 1006, col: 45, offset: 24252}, name: "__", }, &litMatcher{ - pos: position{line: 1023, col: 48, offset: 24586}, + pos: position{line: 1006, col: 48, offset: 24255}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1023, col: 52, offset: 24590}, + pos: position{line: 1006, col: 52, offset: 24259}, name: "__", }, &labeledExpr{ - pos: position{line: 1023, col: 55, offset: 24593}, + pos: position{line: 1006, col: 55, offset: 24262}, label: "to", expr: &zeroOrOneExpr{ - pos: position{line: 1023, col: 58, offset: 24596}, + pos: position{line: 1006, col: 58, offset: 24265}, expr: &ruleRefExpr{ - pos: position{line: 1023, col: 58, offset: 24596}, + pos: position{line: 1006, col: 58, offset: 24265}, name: "AdditiveExpr", }, }, }, &ruleRefExpr{ - pos: position{line: 1023, col: 72, offset: 24610}, + pos: position{line: 1006, col: 72, offset: 24279}, name: "__", }, &litMatcher{ - pos: position{line: 1023, col: 75, offset: 24613}, + pos: position{line: 1006, col: 75, offset: 24282}, val: "]", ignoreCase: false, want: "\"]\"", @@ -6953,49 +6949,49 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1035, col: 5, offset: 24852}, + pos: position{line: 1018, col: 5, offset: 24521}, run: (*parser).callonDerefExpr18, expr: &seqExpr{ - pos: position{line: 1035, col: 5, offset: 24852}, + pos: position{line: 1018, col: 5, offset: 24521}, exprs: []any{ &labeledExpr{ - pos: position{line: 1035, col: 5, offset: 24852}, + pos: position{line: 1018, col: 5, offset: 24521}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1035, col: 10, offset: 24857}, + pos: position{line: 1018, col: 10, offset: 24526}, name: "DerefExpr", }, }, &litMatcher{ - pos: position{line: 1035, col: 20, offset: 24867}, + pos: position{line: 1018, col: 20, offset: 24536}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 1035, col: 24, offset: 24871}, + pos: position{line: 1018, col: 24, offset: 24540}, name: "__", }, &litMatcher{ - pos: position{line: 1035, col: 27, offset: 24874}, + pos: position{line: 1018, col: 27, offset: 24543}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1035, col: 31, offset: 24878}, + pos: position{line: 1018, col: 31, offset: 24547}, name: "__", }, &labeledExpr{ - pos: position{line: 1035, col: 34, offset: 24881}, + pos: position{line: 1018, col: 34, offset: 24550}, label: "to", expr: &ruleRefExpr{ - pos: position{line: 1035, col: 37, offset: 24884}, + pos: position{line: 1018, col: 37, offset: 24553}, name: "AdditiveExpr", }, }, &litMatcher{ - pos: position{line: 1035, col: 50, offset: 24897}, + pos: position{line: 1018, col: 50, offset: 24566}, val: "]", ignoreCase: false, want: "\"]\"", @@ -7004,35 +7000,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1043, col: 5, offset: 25061}, + pos: position{line: 1026, col: 5, offset: 24730}, run: (*parser).callonDerefExpr29, expr: &seqExpr{ - pos: position{line: 1043, col: 5, offset: 25061}, + pos: position{line: 1026, col: 5, offset: 24730}, exprs: []any{ &labeledExpr{ - pos: position{line: 1043, col: 5, offset: 25061}, + pos: position{line: 1026, col: 5, offset: 24730}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1043, col: 10, offset: 25066}, + pos: position{line: 1026, col: 10, offset: 24735}, name: "DerefExpr", }, }, &litMatcher{ - pos: position{line: 1043, col: 20, offset: 25076}, + pos: position{line: 1026, col: 20, offset: 24745}, val: "[", ignoreCase: false, want: "\"[\"", }, &labeledExpr{ - pos: position{line: 1043, col: 24, offset: 25080}, + pos: position{line: 1026, col: 24, offset: 24749}, label: "index", expr: &ruleRefExpr{ - pos: position{line: 1043, col: 30, offset: 25086}, + pos: position{line: 1026, col: 30, offset: 24755}, name: "Expr", }, }, &litMatcher{ - pos: position{line: 1043, col: 35, offset: 25091}, + pos: position{line: 1026, col: 35, offset: 24760}, val: "]", ignoreCase: false, want: "\"]\"", @@ -7041,30 +7037,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1051, col: 5, offset: 25261}, + pos: position{line: 1034, col: 5, offset: 24930}, run: (*parser).callonDerefExpr37, expr: &seqExpr{ - pos: position{line: 1051, col: 5, offset: 25261}, + pos: position{line: 1034, col: 5, offset: 24930}, exprs: []any{ &labeledExpr{ - pos: position{line: 1051, col: 5, offset: 25261}, + pos: position{line: 1034, col: 5, offset: 24930}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1051, col: 10, offset: 25266}, + pos: position{line: 1034, col: 10, offset: 24935}, name: "DerefExpr", }, }, &litMatcher{ - pos: position{line: 1051, col: 20, offset: 25276}, + pos: position{line: 1034, col: 20, offset: 24945}, val: ".", ignoreCase: false, want: "\".\"", }, &labeledExpr{ - pos: position{line: 1051, col: 24, offset: 25280}, + pos: position{line: 1034, col: 24, offset: 24949}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 1051, col: 27, offset: 25283}, + pos: position{line: 1034, col: 27, offset: 24952}, name: "Identifier", }, }, @@ -7072,11 +7068,11 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1060, col: 5, offset: 25473}, + pos: position{line: 1043, col: 5, offset: 25142}, name: "FuncExpr", }, &ruleRefExpr{ - pos: position{line: 1061, col: 5, offset: 25486}, + pos: position{line: 1044, col: 5, offset: 25155}, name: "Primary", }, }, @@ -7086,16 +7082,16 @@ var g = &grammar{ }, { name: "FuncExpr", - pos: position{line: 1063, col: 1, offset: 25495}, + pos: position{line: 1046, col: 1, offset: 25164}, expr: &choiceExpr{ - pos: position{line: 1064, col: 5, offset: 25508}, + pos: position{line: 1047, col: 5, offset: 25177}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1064, col: 5, offset: 25508}, + pos: position{line: 1047, col: 5, offset: 25177}, name: "Cast", }, &ruleRefExpr{ - pos: position{line: 1065, col: 5, offset: 25517}, + pos: position{line: 1048, col: 5, offset: 25186}, name: "Function", }, }, @@ -7105,20 +7101,20 @@ var g = &grammar{ }, { name: "FuncGuard", - pos: position{line: 1067, col: 1, offset: 25527}, + pos: position{line: 1050, col: 1, offset: 25196}, expr: &seqExpr{ - pos: position{line: 1067, col: 13, offset: 25539}, + pos: position{line: 1050, col: 13, offset: 25208}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1067, col: 13, offset: 25539}, + pos: position{line: 1050, col: 13, offset: 25208}, name: "NotFuncs", }, &ruleRefExpr{ - pos: position{line: 1067, col: 22, offset: 25548}, + pos: position{line: 1050, col: 22, offset: 25217}, name: "__", }, &litMatcher{ - pos: position{line: 1067, col: 25, offset: 25551}, + pos: position{line: 1050, col: 25, offset: 25220}, val: "(", ignoreCase: false, want: "\"(\"", @@ -7130,16 +7126,16 @@ var g = &grammar{ }, { name: "NotFuncs", - pos: position{line: 1069, col: 1, offset: 25556}, + pos: position{line: 1052, col: 1, offset: 25225}, expr: &choiceExpr{ - pos: position{line: 1070, col: 5, offset: 25569}, + pos: position{line: 1053, col: 5, offset: 25238}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1070, col: 5, offset: 25569}, + pos: position{line: 1053, col: 5, offset: 25238}, name: "NOT", }, &ruleRefExpr{ - pos: position{line: 1071, col: 5, offset: 25577}, + pos: position{line: 1054, col: 5, offset: 25246}, name: "SELECT", }, }, @@ -7149,58 +7145,58 @@ var g = &grammar{ }, { name: "Cast", - pos: position{line: 1073, col: 1, offset: 25585}, + pos: position{line: 1056, col: 1, offset: 25254}, expr: &actionExpr{ - pos: position{line: 1074, col: 5, offset: 25594}, + pos: position{line: 1057, col: 5, offset: 25263}, run: (*parser).callonCast1, expr: &seqExpr{ - pos: position{line: 1074, col: 5, offset: 25594}, + pos: position{line: 1057, col: 5, offset: 25263}, exprs: []any{ &labeledExpr{ - pos: position{line: 1074, col: 5, offset: 25594}, + pos: position{line: 1057, col: 5, offset: 25263}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1074, col: 9, offset: 25598}, + pos: position{line: 1057, col: 9, offset: 25267}, name: "TypeLiteral", }, }, &ruleRefExpr{ - pos: position{line: 1074, col: 21, offset: 25610}, + pos: position{line: 1057, col: 21, offset: 25279}, name: "__", }, &litMatcher{ - pos: position{line: 1074, col: 24, offset: 25613}, + pos: position{line: 1057, col: 24, offset: 25282}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1074, col: 28, offset: 25617}, + pos: position{line: 1057, col: 28, offset: 25286}, name: "__", }, &labeledExpr{ - pos: position{line: 1074, col: 31, offset: 25620}, + pos: position{line: 1057, col: 31, offset: 25289}, label: "expr", expr: &choiceExpr{ - pos: position{line: 1074, col: 37, offset: 25626}, + pos: position{line: 1057, col: 37, offset: 25295}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1074, col: 37, offset: 25626}, + pos: position{line: 1057, col: 37, offset: 25295}, name: "OverExpr", }, &ruleRefExpr{ - pos: position{line: 1074, col: 48, offset: 25637}, + pos: position{line: 1057, col: 48, offset: 25306}, name: "Expr", }, }, }, }, &ruleRefExpr{ - pos: position{line: 1074, col: 54, offset: 25643}, + pos: position{line: 1057, col: 54, offset: 25312}, name: "__", }, &litMatcher{ - pos: position{line: 1074, col: 57, offset: 25646}, + pos: position{line: 1057, col: 57, offset: 25315}, val: ")", ignoreCase: false, want: "\")\"", @@ -7213,85 +7209,85 @@ var g = &grammar{ }, { name: "Function", - pos: position{line: 1078, col: 1, offset: 25759}, + pos: position{line: 1061, col: 1, offset: 25428}, expr: &choiceExpr{ - pos: position{line: 1079, col: 5, offset: 25772}, + pos: position{line: 1062, col: 5, offset: 25441}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1079, col: 5, offset: 25772}, + pos: position{line: 1062, col: 5, offset: 25441}, name: "Grep", }, &actionExpr{ - pos: position{line: 1081, col: 5, offset: 25859}, + pos: position{line: 1064, col: 5, offset: 25528}, run: (*parser).callonFunction3, expr: &seqExpr{ - pos: position{line: 1081, col: 5, offset: 25859}, + pos: position{line: 1064, col: 5, offset: 25528}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1081, col: 5, offset: 25859}, + pos: position{line: 1064, col: 5, offset: 25528}, name: "REGEXP", }, &ruleRefExpr{ - pos: position{line: 1081, col: 12, offset: 25866}, + pos: position{line: 1064, col: 12, offset: 25535}, name: "__", }, &litMatcher{ - pos: position{line: 1081, col: 15, offset: 25869}, + pos: position{line: 1064, col: 15, offset: 25538}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1081, col: 19, offset: 25873}, + pos: position{line: 1064, col: 19, offset: 25542}, name: "__", }, &labeledExpr{ - pos: position{line: 1081, col: 22, offset: 25876}, + pos: position{line: 1064, col: 22, offset: 25545}, label: "arg0", expr: &ruleRefExpr{ - pos: position{line: 1081, col: 27, offset: 25881}, + pos: position{line: 1064, col: 27, offset: 25550}, name: "RegexpPrimitive", }, }, &ruleRefExpr{ - pos: position{line: 1081, col: 43, offset: 25897}, + pos: position{line: 1064, col: 43, offset: 25566}, name: "__", }, &litMatcher{ - pos: position{line: 1081, col: 46, offset: 25900}, + pos: position{line: 1064, col: 46, offset: 25569}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1081, col: 50, offset: 25904}, + pos: position{line: 1064, col: 50, offset: 25573}, name: "__", }, &labeledExpr{ - pos: position{line: 1081, col: 53, offset: 25907}, + pos: position{line: 1064, col: 53, offset: 25576}, label: "arg1", expr: &ruleRefExpr{ - pos: position{line: 1081, col: 58, offset: 25912}, + pos: position{line: 1064, col: 58, offset: 25581}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1081, col: 63, offset: 25917}, + pos: position{line: 1064, col: 63, offset: 25586}, name: "__", }, &litMatcher{ - pos: position{line: 1081, col: 66, offset: 25920}, + pos: position{line: 1064, col: 66, offset: 25589}, val: ")", ignoreCase: false, want: "\")\"", }, &labeledExpr{ - pos: position{line: 1081, col: 70, offset: 25924}, + pos: position{line: 1064, col: 70, offset: 25593}, label: "where", expr: &zeroOrOneExpr{ - pos: position{line: 1081, col: 76, offset: 25930}, + pos: position{line: 1064, col: 76, offset: 25599}, expr: &ruleRefExpr{ - pos: position{line: 1081, col: 76, offset: 25930}, + pos: position{line: 1064, col: 76, offset: 25599}, name: "WhereClause", }, }, @@ -7300,98 +7296,98 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1085, col: 5, offset: 26109}, + pos: position{line: 1068, col: 5, offset: 25778}, run: (*parser).callonFunction21, expr: &seqExpr{ - pos: position{line: 1085, col: 5, offset: 26109}, + pos: position{line: 1068, col: 5, offset: 25778}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1085, col: 5, offset: 26109}, + pos: position{line: 1068, col: 5, offset: 25778}, name: "REGEXP_REPLACE", }, &ruleRefExpr{ - pos: position{line: 1085, col: 20, offset: 26124}, + pos: position{line: 1068, col: 20, offset: 25793}, name: "__", }, &litMatcher{ - pos: position{line: 1085, col: 23, offset: 26127}, + pos: position{line: 1068, col: 23, offset: 25796}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1085, col: 27, offset: 26131}, + pos: position{line: 1068, col: 27, offset: 25800}, name: "__", }, &labeledExpr{ - pos: position{line: 1085, col: 30, offset: 26134}, + pos: position{line: 1068, col: 30, offset: 25803}, label: "arg0", expr: &ruleRefExpr{ - pos: position{line: 1085, col: 35, offset: 26139}, + pos: position{line: 1068, col: 35, offset: 25808}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1085, col: 40, offset: 26144}, + pos: position{line: 1068, col: 40, offset: 25813}, name: "__", }, &litMatcher{ - pos: position{line: 1085, col: 43, offset: 26147}, + pos: position{line: 1068, col: 43, offset: 25816}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1085, col: 47, offset: 26151}, + pos: position{line: 1068, col: 47, offset: 25820}, name: "__", }, &labeledExpr{ - pos: position{line: 1085, col: 50, offset: 26154}, + pos: position{line: 1068, col: 50, offset: 25823}, label: "arg1", expr: &ruleRefExpr{ - pos: position{line: 1085, col: 55, offset: 26159}, + pos: position{line: 1068, col: 55, offset: 25828}, name: "RegexpPrimitive", }, }, &ruleRefExpr{ - pos: position{line: 1085, col: 71, offset: 26175}, + pos: position{line: 1068, col: 71, offset: 25844}, name: "__", }, &litMatcher{ - pos: position{line: 1085, col: 74, offset: 26178}, + pos: position{line: 1068, col: 74, offset: 25847}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1085, col: 78, offset: 26182}, + pos: position{line: 1068, col: 78, offset: 25851}, name: "__", }, &labeledExpr{ - pos: position{line: 1085, col: 81, offset: 26185}, + pos: position{line: 1068, col: 81, offset: 25854}, label: "arg2", expr: &ruleRefExpr{ - pos: position{line: 1085, col: 86, offset: 26190}, + pos: position{line: 1068, col: 86, offset: 25859}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1085, col: 91, offset: 26195}, + pos: position{line: 1068, col: 91, offset: 25864}, name: "__", }, &litMatcher{ - pos: position{line: 1085, col: 94, offset: 26198}, + pos: position{line: 1068, col: 94, offset: 25867}, val: ")", ignoreCase: false, want: "\")\"", }, &labeledExpr{ - pos: position{line: 1085, col: 98, offset: 26202}, + pos: position{line: 1068, col: 98, offset: 25871}, label: "where", expr: &zeroOrOneExpr{ - pos: position{line: 1085, col: 104, offset: 26208}, + pos: position{line: 1068, col: 104, offset: 25877}, expr: &ruleRefExpr{ - pos: position{line: 1085, col: 104, offset: 26208}, + pos: position{line: 1068, col: 104, offset: 25877}, name: "WhereClause", }, }, @@ -7400,65 +7396,65 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1089, col: 5, offset: 26402}, + pos: position{line: 1072, col: 5, offset: 26071}, run: (*parser).callonFunction44, expr: &seqExpr{ - pos: position{line: 1089, col: 5, offset: 26402}, + pos: position{line: 1072, col: 5, offset: 26071}, exprs: []any{ ¬Expr{ - pos: position{line: 1089, col: 5, offset: 26402}, + pos: position{line: 1072, col: 5, offset: 26071}, expr: &ruleRefExpr{ - pos: position{line: 1089, col: 6, offset: 26403}, + pos: position{line: 1072, col: 6, offset: 26072}, name: "FuncGuard", }, }, &labeledExpr{ - pos: position{line: 1089, col: 16, offset: 26413}, + pos: position{line: 1072, col: 16, offset: 26082}, label: "fn", expr: &ruleRefExpr{ - pos: position{line: 1089, col: 19, offset: 26416}, + pos: position{line: 1072, col: 19, offset: 26085}, name: "Identifier", }, }, &ruleRefExpr{ - pos: position{line: 1089, col: 30, offset: 26427}, + pos: position{line: 1072, col: 30, offset: 26096}, name: "__", }, &litMatcher{ - pos: position{line: 1089, col: 33, offset: 26430}, + pos: position{line: 1072, col: 33, offset: 26099}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1089, col: 37, offset: 26434}, + pos: position{line: 1072, col: 37, offset: 26103}, name: "__", }, &labeledExpr{ - pos: position{line: 1089, col: 40, offset: 26437}, + pos: position{line: 1072, col: 40, offset: 26106}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 1089, col: 45, offset: 26442}, + pos: position{line: 1072, col: 45, offset: 26111}, name: "FunctionArgs", }, }, &ruleRefExpr{ - pos: position{line: 1089, col: 58, offset: 26455}, + pos: position{line: 1072, col: 58, offset: 26124}, name: "__", }, &litMatcher{ - pos: position{line: 1089, col: 61, offset: 26458}, + pos: position{line: 1072, col: 61, offset: 26127}, val: ")", ignoreCase: false, want: "\")\"", }, &labeledExpr{ - pos: position{line: 1089, col: 65, offset: 26462}, + pos: position{line: 1072, col: 65, offset: 26131}, label: "where", expr: &zeroOrOneExpr{ - pos: position{line: 1089, col: 71, offset: 26468}, + pos: position{line: 1072, col: 71, offset: 26137}, expr: &ruleRefExpr{ - pos: position{line: 1089, col: 71, offset: 26468}, + pos: position{line: 1072, col: 71, offset: 26137}, name: "WhereClause", }, }, @@ -7473,15 +7469,15 @@ var g = &grammar{ }, { name: "RegexpPrimitive", - pos: position{line: 1093, col: 1, offset: 26536}, + pos: position{line: 1076, col: 1, offset: 26205}, expr: &actionExpr{ - pos: position{line: 1094, col: 5, offset: 26556}, + pos: position{line: 1077, col: 5, offset: 26225}, run: (*parser).callonRegexpPrimitive1, expr: &labeledExpr{ - pos: position{line: 1094, col: 5, offset: 26556}, + pos: position{line: 1077, col: 5, offset: 26225}, label: "pat", expr: &ruleRefExpr{ - pos: position{line: 1094, col: 9, offset: 26560}, + pos: position{line: 1077, col: 9, offset: 26229}, name: "RegexpPattern", }, }, @@ -7491,24 +7487,24 @@ var g = &grammar{ }, { name: "FunctionArgs", - pos: position{line: 1096, col: 1, offset: 26631}, + pos: position{line: 1079, col: 1, offset: 26300}, expr: &choiceExpr{ - pos: position{line: 1097, col: 5, offset: 26648}, + pos: position{line: 1080, col: 5, offset: 26317}, alternatives: []any{ &actionExpr{ - pos: position{line: 1097, col: 5, offset: 26648}, + pos: position{line: 1080, col: 5, offset: 26317}, run: (*parser).callonFunctionArgs2, expr: &labeledExpr{ - pos: position{line: 1097, col: 5, offset: 26648}, + pos: position{line: 1080, col: 5, offset: 26317}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 1097, col: 7, offset: 26650}, + pos: position{line: 1080, col: 7, offset: 26319}, name: "OverExpr", }, }, }, &ruleRefExpr{ - pos: position{line: 1098, col: 5, offset: 26688}, + pos: position{line: 1081, col: 5, offset: 26357}, name: "OptionalExprs", }, }, @@ -7518,96 +7514,96 @@ var g = &grammar{ }, { name: "Grep", - pos: position{line: 1100, col: 1, offset: 26703}, + pos: position{line: 1083, col: 1, offset: 26372}, expr: &actionExpr{ - pos: position{line: 1101, col: 5, offset: 26712}, + pos: position{line: 1084, col: 5, offset: 26381}, run: (*parser).callonGrep1, expr: &seqExpr{ - pos: position{line: 1101, col: 5, offset: 26712}, + pos: position{line: 1084, col: 5, offset: 26381}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1101, col: 5, offset: 26712}, + pos: position{line: 1084, col: 5, offset: 26381}, name: "GREP", }, &ruleRefExpr{ - pos: position{line: 1101, col: 10, offset: 26717}, + pos: position{line: 1084, col: 10, offset: 26386}, name: "__", }, &litMatcher{ - pos: position{line: 1101, col: 13, offset: 26720}, + pos: position{line: 1084, col: 13, offset: 26389}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1101, col: 17, offset: 26724}, + pos: position{line: 1084, col: 17, offset: 26393}, name: "__", }, &labeledExpr{ - pos: position{line: 1101, col: 20, offset: 26727}, + pos: position{line: 1084, col: 20, offset: 26396}, label: "pattern", expr: &choiceExpr{ - pos: position{line: 1101, col: 29, offset: 26736}, + pos: position{line: 1084, col: 29, offset: 26405}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1101, col: 29, offset: 26736}, + pos: position{line: 1084, col: 29, offset: 26405}, name: "Regexp", }, &ruleRefExpr{ - pos: position{line: 1101, col: 38, offset: 26745}, + pos: position{line: 1084, col: 38, offset: 26414}, name: "Glob", }, &ruleRefExpr{ - pos: position{line: 1101, col: 45, offset: 26752}, + pos: position{line: 1084, col: 45, offset: 26421}, name: "Expr", }, }, }, }, &ruleRefExpr{ - pos: position{line: 1101, col: 51, offset: 26758}, + pos: position{line: 1084, col: 51, offset: 26427}, name: "__", }, &labeledExpr{ - pos: position{line: 1101, col: 54, offset: 26761}, + pos: position{line: 1084, col: 54, offset: 26430}, label: "opt", expr: &zeroOrOneExpr{ - pos: position{line: 1101, col: 58, offset: 26765}, + pos: position{line: 1084, col: 58, offset: 26434}, expr: &actionExpr{ - pos: position{line: 1101, col: 59, offset: 26766}, + pos: position{line: 1084, col: 59, offset: 26435}, run: (*parser).callonGrep15, expr: &seqExpr{ - pos: position{line: 1101, col: 59, offset: 26766}, + pos: position{line: 1084, col: 59, offset: 26435}, exprs: []any{ &litMatcher{ - pos: position{line: 1101, col: 59, offset: 26766}, + pos: position{line: 1084, col: 59, offset: 26435}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1101, col: 63, offset: 26770}, + pos: position{line: 1084, col: 63, offset: 26439}, name: "__", }, &labeledExpr{ - pos: position{line: 1101, col: 66, offset: 26773}, + pos: position{line: 1084, col: 66, offset: 26442}, label: "e", expr: &choiceExpr{ - pos: position{line: 1101, col: 69, offset: 26776}, + pos: position{line: 1084, col: 69, offset: 26445}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1101, col: 69, offset: 26776}, + pos: position{line: 1084, col: 69, offset: 26445}, name: "OverExpr", }, &ruleRefExpr{ - pos: position{line: 1101, col: 80, offset: 26787}, + pos: position{line: 1084, col: 80, offset: 26456}, name: "Expr", }, }, }, }, &ruleRefExpr{ - pos: position{line: 1101, col: 86, offset: 26793}, + pos: position{line: 1084, col: 86, offset: 26462}, name: "__", }, }, @@ -7616,7 +7612,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1101, col: 109, offset: 26816}, + pos: position{line: 1084, col: 109, offset: 26485}, val: ")", ignoreCase: false, want: "\")\"", @@ -7629,19 +7625,19 @@ var g = &grammar{ }, { name: "OptionalExprs", - pos: position{line: 1113, col: 1, offset: 27029}, + pos: position{line: 1096, col: 1, offset: 26698}, expr: &choiceExpr{ - pos: position{line: 1114, col: 5, offset: 27047}, + pos: position{line: 1097, col: 5, offset: 26716}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1114, col: 5, offset: 27047}, + pos: position{line: 1097, col: 5, offset: 26716}, name: "Exprs", }, &actionExpr{ - pos: position{line: 1115, col: 5, offset: 27057}, + pos: position{line: 1098, col: 5, offset: 26726}, run: (*parser).callonOptionalExprs3, expr: &ruleRefExpr{ - pos: position{line: 1115, col: 5, offset: 27057}, + pos: position{line: 1098, col: 5, offset: 26726}, name: "__", }, }, @@ -7652,51 +7648,51 @@ var g = &grammar{ }, { name: "Exprs", - pos: position{line: 1117, col: 1, offset: 27085}, + pos: position{line: 1100, col: 1, offset: 26754}, expr: &actionExpr{ - pos: position{line: 1118, col: 5, offset: 27095}, + pos: position{line: 1101, col: 5, offset: 26764}, run: (*parser).callonExprs1, expr: &seqExpr{ - pos: position{line: 1118, col: 5, offset: 27095}, + pos: position{line: 1101, col: 5, offset: 26764}, exprs: []any{ &labeledExpr{ - pos: position{line: 1118, col: 5, offset: 27095}, + pos: position{line: 1101, col: 5, offset: 26764}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1118, col: 11, offset: 27101}, + pos: position{line: 1101, col: 11, offset: 26770}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 1118, col: 16, offset: 27106}, + pos: position{line: 1101, col: 16, offset: 26775}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1118, col: 21, offset: 27111}, + pos: position{line: 1101, col: 21, offset: 26780}, expr: &actionExpr{ - pos: position{line: 1118, col: 22, offset: 27112}, + pos: position{line: 1101, col: 22, offset: 26781}, run: (*parser).callonExprs7, expr: &seqExpr{ - pos: position{line: 1118, col: 22, offset: 27112}, + pos: position{line: 1101, col: 22, offset: 26781}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1118, col: 22, offset: 27112}, + pos: position{line: 1101, col: 22, offset: 26781}, name: "__", }, &litMatcher{ - pos: position{line: 1118, col: 25, offset: 27115}, + pos: position{line: 1101, col: 25, offset: 26784}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1118, col: 29, offset: 27119}, + pos: position{line: 1101, col: 29, offset: 26788}, name: "__", }, &labeledExpr{ - pos: position{line: 1118, col: 32, offset: 27122}, + pos: position{line: 1101, col: 32, offset: 26791}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1118, col: 34, offset: 27124}, + pos: position{line: 1101, col: 34, offset: 26793}, name: "Expr", }, }, @@ -7713,72 +7709,92 @@ var g = &grammar{ }, { name: "Primary", - pos: position{line: 1122, col: 1, offset: 27197}, + pos: position{line: 1105, col: 1, offset: 26866}, expr: &choiceExpr{ - pos: position{line: 1123, col: 5, offset: 27209}, + pos: position{line: 1106, col: 5, offset: 26878}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1123, col: 5, offset: 27209}, + pos: position{line: 1106, col: 5, offset: 26878}, name: "CaseExpr", }, &ruleRefExpr{ - pos: position{line: 1124, col: 5, offset: 27222}, + pos: position{line: 1107, col: 5, offset: 26891}, name: "Record", }, &ruleRefExpr{ - pos: position{line: 1125, col: 5, offset: 27233}, + pos: position{line: 1108, col: 5, offset: 26902}, name: "Array", }, &ruleRefExpr{ - pos: position{line: 1126, col: 5, offset: 27243}, + pos: position{line: 1109, col: 5, offset: 26912}, name: "Set", }, &ruleRefExpr{ - pos: position{line: 1127, col: 5, offset: 27251}, + pos: position{line: 1110, col: 5, offset: 26920}, name: "Map", }, &ruleRefExpr{ - pos: position{line: 1128, col: 5, offset: 27259}, + pos: position{line: 1111, col: 5, offset: 26928}, name: "Literal", }, - &ruleRefExpr{ - pos: position{line: 1129, col: 5, offset: 27271}, - name: "Identifier", + &actionExpr{ + pos: position{line: 1112, col: 5, offset: 26940}, + run: (*parser).callonPrimary8, + expr: &seqExpr{ + pos: position{line: 1112, col: 5, offset: 26940}, + exprs: []any{ + ¬Expr{ + pos: position{line: 1112, col: 5, offset: 26940}, + expr: &ruleRefExpr{ + pos: position{line: 1112, col: 6, offset: 26941}, + name: "PipeKeyword", + }, + }, + &labeledExpr{ + pos: position{line: 1112, col: 18, offset: 26953}, + label: "id", + expr: &ruleRefExpr{ + pos: position{line: 1112, col: 21, offset: 26956}, + name: "Identifier", + }, + }, + }, + }, }, &ruleRefExpr{ - pos: position{line: 1130, col: 5, offset: 27286}, + pos: position{line: 1113, col: 5, offset: 26990}, name: "Tuple", }, &actionExpr{ - pos: position{line: 1131, col: 5, offset: 27296}, - run: (*parser).callonPrimary10, + pos: position{line: 1114, col: 5, offset: 27000}, + run: (*parser).callonPrimary15, expr: &seqExpr{ - pos: position{line: 1131, col: 5, offset: 27296}, + pos: position{line: 1114, col: 5, offset: 27000}, exprs: []any{ &litMatcher{ - pos: position{line: 1131, col: 5, offset: 27296}, + pos: position{line: 1114, col: 5, offset: 27000}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1131, col: 9, offset: 27300}, + pos: position{line: 1114, col: 9, offset: 27004}, name: "__", }, &labeledExpr{ - pos: position{line: 1131, col: 12, offset: 27303}, + pos: position{line: 1114, col: 12, offset: 27007}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1131, col: 17, offset: 27308}, + pos: position{line: 1114, col: 17, offset: 27012}, name: "OverExpr", }, }, &ruleRefExpr{ - pos: position{line: 1131, col: 26, offset: 27317}, + pos: position{line: 1114, col: 26, offset: 27021}, name: "__", }, &litMatcher{ - pos: position{line: 1131, col: 29, offset: 27320}, + pos: position{line: 1114, col: 29, offset: 27024}, val: ")", ignoreCase: false, want: "\")\"", @@ -7787,35 +7803,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1132, col: 5, offset: 27349}, - run: (*parser).callonPrimary18, + pos: position{line: 1115, col: 5, offset: 27053}, + run: (*parser).callonPrimary23, expr: &seqExpr{ - pos: position{line: 1132, col: 5, offset: 27349}, + pos: position{line: 1115, col: 5, offset: 27053}, exprs: []any{ &litMatcher{ - pos: position{line: 1132, col: 5, offset: 27349}, + pos: position{line: 1115, col: 5, offset: 27053}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1132, col: 9, offset: 27353}, + pos: position{line: 1115, col: 9, offset: 27057}, name: "__", }, &labeledExpr{ - pos: position{line: 1132, col: 12, offset: 27356}, + pos: position{line: 1115, col: 12, offset: 27060}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1132, col: 17, offset: 27361}, + pos: position{line: 1115, col: 17, offset: 27065}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1132, col: 22, offset: 27366}, + pos: position{line: 1115, col: 22, offset: 27070}, name: "__", }, &litMatcher{ - pos: position{line: 1132, col: 25, offset: 27369}, + pos: position{line: 1115, col: 25, offset: 27073}, val: ")", ignoreCase: false, want: "\")\"", @@ -7830,55 +7846,55 @@ var g = &grammar{ }, { name: "CaseExpr", - pos: position{line: 1134, col: 1, offset: 27395}, + pos: position{line: 1117, col: 1, offset: 27099}, expr: &choiceExpr{ - pos: position{line: 1135, col: 5, offset: 27408}, + pos: position{line: 1118, col: 5, offset: 27112}, alternatives: []any{ &actionExpr{ - pos: position{line: 1135, col: 5, offset: 27408}, + pos: position{line: 1118, col: 5, offset: 27112}, run: (*parser).callonCaseExpr2, expr: &seqExpr{ - pos: position{line: 1135, col: 5, offset: 27408}, + pos: position{line: 1118, col: 5, offset: 27112}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1135, col: 5, offset: 27408}, + pos: position{line: 1118, col: 5, offset: 27112}, name: "CASE", }, &labeledExpr{ - pos: position{line: 1135, col: 10, offset: 27413}, + pos: position{line: 1118, col: 10, offset: 27117}, label: "cases", expr: &oneOrMoreExpr{ - pos: position{line: 1135, col: 16, offset: 27419}, + pos: position{line: 1118, col: 16, offset: 27123}, expr: &ruleRefExpr{ - pos: position{line: 1135, col: 16, offset: 27419}, + pos: position{line: 1118, col: 16, offset: 27123}, name: "When", }, }, }, &labeledExpr{ - pos: position{line: 1135, col: 22, offset: 27425}, + pos: position{line: 1118, col: 22, offset: 27129}, label: "else_", expr: &zeroOrOneExpr{ - pos: position{line: 1135, col: 28, offset: 27431}, + pos: position{line: 1118, col: 28, offset: 27135}, expr: &seqExpr{ - pos: position{line: 1135, col: 29, offset: 27432}, + pos: position{line: 1118, col: 29, offset: 27136}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1135, col: 29, offset: 27432}, + pos: position{line: 1118, col: 29, offset: 27136}, name: "_", }, &litMatcher{ - pos: position{line: 1135, col: 31, offset: 27434}, + pos: position{line: 1118, col: 31, offset: 27138}, val: "else", ignoreCase: false, want: "\"else\"", }, &ruleRefExpr{ - pos: position{line: 1135, col: 38, offset: 27441}, + pos: position{line: 1118, col: 38, offset: 27145}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1135, col: 40, offset: 27443}, + pos: position{line: 1118, col: 40, offset: 27147}, name: "Expr", }, }, @@ -7886,24 +7902,24 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1135, col: 47, offset: 27450}, + pos: position{line: 1118, col: 47, offset: 27154}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1135, col: 49, offset: 27452}, + pos: position{line: 1118, col: 49, offset: 27156}, name: "END", }, &zeroOrOneExpr{ - pos: position{line: 1135, col: 53, offset: 27456}, + pos: position{line: 1118, col: 53, offset: 27160}, expr: &seqExpr{ - pos: position{line: 1135, col: 54, offset: 27457}, + pos: position{line: 1118, col: 54, offset: 27161}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1135, col: 54, offset: 27457}, + pos: position{line: 1118, col: 54, offset: 27161}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1135, col: 56, offset: 27459}, + pos: position{line: 1118, col: 56, offset: 27163}, name: "CASE", }, }, @@ -7913,62 +7929,62 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1159, col: 5, offset: 28108}, + pos: position{line: 1142, col: 5, offset: 27812}, run: (*parser).callonCaseExpr21, expr: &seqExpr{ - pos: position{line: 1159, col: 5, offset: 28108}, + pos: position{line: 1142, col: 5, offset: 27812}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1159, col: 5, offset: 28108}, + pos: position{line: 1142, col: 5, offset: 27812}, name: "CASE", }, &ruleRefExpr{ - pos: position{line: 1159, col: 10, offset: 28113}, + pos: position{line: 1142, col: 10, offset: 27817}, name: "_", }, &labeledExpr{ - pos: position{line: 1159, col: 12, offset: 28115}, + pos: position{line: 1142, col: 12, offset: 27819}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1159, col: 17, offset: 28120}, + pos: position{line: 1142, col: 17, offset: 27824}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 1159, col: 22, offset: 28125}, + pos: position{line: 1142, col: 22, offset: 27829}, label: "whens", expr: &oneOrMoreExpr{ - pos: position{line: 1159, col: 28, offset: 28131}, + pos: position{line: 1142, col: 28, offset: 27835}, expr: &ruleRefExpr{ - pos: position{line: 1159, col: 28, offset: 28131}, + pos: position{line: 1142, col: 28, offset: 27835}, name: "When", }, }, }, &labeledExpr{ - pos: position{line: 1159, col: 34, offset: 28137}, + pos: position{line: 1142, col: 34, offset: 27841}, label: "else_", expr: &zeroOrOneExpr{ - pos: position{line: 1159, col: 40, offset: 28143}, + pos: position{line: 1142, col: 40, offset: 27847}, expr: &seqExpr{ - pos: position{line: 1159, col: 41, offset: 28144}, + pos: position{line: 1142, col: 41, offset: 27848}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1159, col: 41, offset: 28144}, + pos: position{line: 1142, col: 41, offset: 27848}, name: "_", }, &litMatcher{ - pos: position{line: 1159, col: 43, offset: 28146}, + pos: position{line: 1142, col: 43, offset: 27850}, val: "else", ignoreCase: false, want: "\"else\"", }, &ruleRefExpr{ - pos: position{line: 1159, col: 50, offset: 28153}, + pos: position{line: 1142, col: 50, offset: 27857}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1159, col: 52, offset: 28155}, + pos: position{line: 1142, col: 52, offset: 27859}, name: "Expr", }, }, @@ -7976,24 +7992,24 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1159, col: 59, offset: 28162}, + pos: position{line: 1142, col: 59, offset: 27866}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1159, col: 61, offset: 28164}, + pos: position{line: 1142, col: 61, offset: 27868}, name: "END", }, &zeroOrOneExpr{ - pos: position{line: 1159, col: 65, offset: 28168}, + pos: position{line: 1142, col: 65, offset: 27872}, expr: &seqExpr{ - pos: position{line: 1159, col: 66, offset: 28169}, + pos: position{line: 1142, col: 66, offset: 27873}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1159, col: 66, offset: 28169}, + pos: position{line: 1142, col: 66, offset: 27873}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1159, col: 68, offset: 28171}, + pos: position{line: 1142, col: 68, offset: 27875}, name: "CASE", }, }, @@ -8009,50 +8025,50 @@ var g = &grammar{ }, { name: "When", - pos: position{line: 1172, col: 1, offset: 28477}, + pos: position{line: 1155, col: 1, offset: 28181}, expr: &actionExpr{ - pos: position{line: 1173, col: 5, offset: 28486}, + pos: position{line: 1156, col: 5, offset: 28190}, run: (*parser).callonWhen1, expr: &seqExpr{ - pos: position{line: 1173, col: 5, offset: 28486}, + pos: position{line: 1156, col: 5, offset: 28190}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1173, col: 5, offset: 28486}, + pos: position{line: 1156, col: 5, offset: 28190}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1173, col: 7, offset: 28488}, + pos: position{line: 1156, col: 7, offset: 28192}, name: "WHEN", }, &ruleRefExpr{ - pos: position{line: 1173, col: 12, offset: 28493}, + pos: position{line: 1156, col: 12, offset: 28197}, name: "_", }, &labeledExpr{ - pos: position{line: 1173, col: 14, offset: 28495}, + pos: position{line: 1156, col: 14, offset: 28199}, label: "cond", expr: &ruleRefExpr{ - pos: position{line: 1173, col: 19, offset: 28500}, + pos: position{line: 1156, col: 19, offset: 28204}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1173, col: 24, offset: 28505}, + pos: position{line: 1156, col: 24, offset: 28209}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1173, col: 26, offset: 28507}, + pos: position{line: 1156, col: 26, offset: 28211}, name: "THEN", }, &ruleRefExpr{ - pos: position{line: 1173, col: 31, offset: 28512}, + pos: position{line: 1156, col: 31, offset: 28216}, name: "_", }, &labeledExpr{ - pos: position{line: 1173, col: 33, offset: 28514}, + pos: position{line: 1156, col: 33, offset: 28218}, label: "then", expr: &ruleRefExpr{ - pos: position{line: 1173, col: 38, offset: 28519}, + pos: position{line: 1156, col: 38, offset: 28223}, name: "Expr", }, }, @@ -8064,57 +8080,57 @@ var g = &grammar{ }, { name: "OverExpr", - pos: position{line: 1182, col: 1, offset: 28678}, + pos: position{line: 1165, col: 1, offset: 28382}, expr: &actionExpr{ - pos: position{line: 1183, col: 5, offset: 28691}, + pos: position{line: 1166, col: 5, offset: 28395}, run: (*parser).callonOverExpr1, expr: &seqExpr{ - pos: position{line: 1183, col: 5, offset: 28691}, + pos: position{line: 1166, col: 5, offset: 28395}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1183, col: 5, offset: 28691}, + pos: position{line: 1166, col: 5, offset: 28395}, name: "OVER", }, &ruleRefExpr{ - pos: position{line: 1183, col: 10, offset: 28696}, + pos: position{line: 1166, col: 10, offset: 28400}, name: "_", }, &labeledExpr{ - pos: position{line: 1183, col: 12, offset: 28698}, + pos: position{line: 1166, col: 12, offset: 28402}, label: "exprs", expr: &ruleRefExpr{ - pos: position{line: 1183, col: 18, offset: 28704}, + pos: position{line: 1166, col: 18, offset: 28408}, name: "Exprs", }, }, &labeledExpr{ - pos: position{line: 1183, col: 24, offset: 28710}, + pos: position{line: 1166, col: 24, offset: 28414}, label: "locals", expr: &zeroOrOneExpr{ - pos: position{line: 1183, col: 31, offset: 28717}, + pos: position{line: 1166, col: 31, offset: 28421}, expr: &ruleRefExpr{ - pos: position{line: 1183, col: 31, offset: 28717}, + pos: position{line: 1166, col: 31, offset: 28421}, name: "Locals", }, }, }, &ruleRefExpr{ - pos: position{line: 1183, col: 39, offset: 28725}, + pos: position{line: 1166, col: 39, offset: 28429}, name: "__", }, &ruleRefExpr{ - pos: position{line: 1183, col: 42, offset: 28728}, + pos: position{line: 1166, col: 42, offset: 28432}, name: "Pipe", }, &ruleRefExpr{ - pos: position{line: 1183, col: 47, offset: 28733}, + pos: position{line: 1166, col: 47, offset: 28437}, name: "__", }, &labeledExpr{ - pos: position{line: 1183, col: 50, offset: 28736}, + pos: position{line: 1166, col: 50, offset: 28440}, label: "body", expr: &ruleRefExpr{ - pos: position{line: 1183, col: 55, offset: 28741}, + pos: position{line: 1166, col: 55, offset: 28445}, name: "Seq", }, }, @@ -8126,37 +8142,37 @@ var g = &grammar{ }, { name: "Record", - pos: position{line: 1193, col: 1, offset: 28972}, + pos: position{line: 1176, col: 1, offset: 28676}, expr: &actionExpr{ - pos: position{line: 1194, col: 5, offset: 28983}, + pos: position{line: 1177, col: 5, offset: 28687}, run: (*parser).callonRecord1, expr: &seqExpr{ - pos: position{line: 1194, col: 5, offset: 28983}, + pos: position{line: 1177, col: 5, offset: 28687}, exprs: []any{ &litMatcher{ - pos: position{line: 1194, col: 5, offset: 28983}, + pos: position{line: 1177, col: 5, offset: 28687}, val: "{", ignoreCase: false, want: "\"{\"", }, &ruleRefExpr{ - pos: position{line: 1194, col: 9, offset: 28987}, + pos: position{line: 1177, col: 9, offset: 28691}, name: "__", }, &labeledExpr{ - pos: position{line: 1194, col: 12, offset: 28990}, + pos: position{line: 1177, col: 12, offset: 28694}, label: "elems", expr: &ruleRefExpr{ - pos: position{line: 1194, col: 18, offset: 28996}, + pos: position{line: 1177, col: 18, offset: 28700}, name: "RecordElems", }, }, &ruleRefExpr{ - pos: position{line: 1194, col: 30, offset: 29008}, + pos: position{line: 1177, col: 30, offset: 28712}, name: "__", }, &litMatcher{ - pos: position{line: 1194, col: 33, offset: 29011}, + pos: position{line: 1177, col: 33, offset: 28715}, val: "}", ignoreCase: false, want: "\"}\"", @@ -8169,31 +8185,31 @@ var g = &grammar{ }, { name: "RecordElems", - pos: position{line: 1202, col: 1, offset: 29169}, + pos: position{line: 1185, col: 1, offset: 28873}, expr: &choiceExpr{ - pos: position{line: 1203, col: 5, offset: 29185}, + pos: position{line: 1186, col: 5, offset: 28889}, alternatives: []any{ &actionExpr{ - pos: position{line: 1203, col: 5, offset: 29185}, + pos: position{line: 1186, col: 5, offset: 28889}, run: (*parser).callonRecordElems2, expr: &seqExpr{ - pos: position{line: 1203, col: 5, offset: 29185}, + pos: position{line: 1186, col: 5, offset: 28889}, exprs: []any{ &labeledExpr{ - pos: position{line: 1203, col: 5, offset: 29185}, + pos: position{line: 1186, col: 5, offset: 28889}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1203, col: 11, offset: 29191}, + pos: position{line: 1186, col: 11, offset: 28895}, name: "RecordElem", }, }, &labeledExpr{ - pos: position{line: 1203, col: 22, offset: 29202}, + pos: position{line: 1186, col: 22, offset: 28906}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1203, col: 27, offset: 29207}, + pos: position{line: 1186, col: 27, offset: 28911}, expr: &ruleRefExpr{ - pos: position{line: 1203, col: 27, offset: 29207}, + pos: position{line: 1186, col: 27, offset: 28911}, name: "RecordElemTail", }, }, @@ -8202,10 +8218,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1206, col: 5, offset: 29270}, + pos: position{line: 1189, col: 5, offset: 28974}, run: (*parser).callonRecordElems9, expr: &ruleRefExpr{ - pos: position{line: 1206, col: 5, offset: 29270}, + pos: position{line: 1189, col: 5, offset: 28974}, name: "__", }, }, @@ -8216,32 +8232,32 @@ var g = &grammar{ }, { name: "RecordElemTail", - pos: position{line: 1208, col: 1, offset: 29294}, + pos: position{line: 1191, col: 1, offset: 28998}, expr: &actionExpr{ - pos: position{line: 1208, col: 18, offset: 29311}, + pos: position{line: 1191, col: 18, offset: 29015}, run: (*parser).callonRecordElemTail1, expr: &seqExpr{ - pos: position{line: 1208, col: 18, offset: 29311}, + pos: position{line: 1191, col: 18, offset: 29015}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1208, col: 18, offset: 29311}, + pos: position{line: 1191, col: 18, offset: 29015}, name: "__", }, &litMatcher{ - pos: position{line: 1208, col: 21, offset: 29314}, + pos: position{line: 1191, col: 21, offset: 29018}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1208, col: 25, offset: 29318}, + pos: position{line: 1191, col: 25, offset: 29022}, name: "__", }, &labeledExpr{ - pos: position{line: 1208, col: 28, offset: 29321}, + pos: position{line: 1191, col: 28, offset: 29025}, label: "elem", expr: &ruleRefExpr{ - pos: position{line: 1208, col: 33, offset: 29326}, + pos: position{line: 1191, col: 33, offset: 29030}, name: "RecordElem", }, }, @@ -8253,20 +8269,20 @@ var g = &grammar{ }, { name: "RecordElem", - pos: position{line: 1210, col: 1, offset: 29359}, + pos: position{line: 1193, col: 1, offset: 29063}, expr: &choiceExpr{ - pos: position{line: 1211, col: 5, offset: 29374}, + pos: position{line: 1194, col: 5, offset: 29078}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1211, col: 5, offset: 29374}, + pos: position{line: 1194, col: 5, offset: 29078}, name: "Spread", }, &ruleRefExpr{ - pos: position{line: 1212, col: 5, offset: 29385}, + pos: position{line: 1195, col: 5, offset: 29089}, name: "FieldExpr", }, &ruleRefExpr{ - pos: position{line: 1213, col: 5, offset: 29399}, + pos: position{line: 1196, col: 5, offset: 29103}, name: "Identifier", }, }, @@ -8276,28 +8292,28 @@ var g = &grammar{ }, { name: "Spread", - pos: position{line: 1215, col: 1, offset: 29411}, + pos: position{line: 1198, col: 1, offset: 29115}, expr: &actionExpr{ - pos: position{line: 1216, col: 5, offset: 29422}, + pos: position{line: 1199, col: 5, offset: 29126}, run: (*parser).callonSpread1, expr: &seqExpr{ - pos: position{line: 1216, col: 5, offset: 29422}, + pos: position{line: 1199, col: 5, offset: 29126}, exprs: []any{ &litMatcher{ - pos: position{line: 1216, col: 5, offset: 29422}, + pos: position{line: 1199, col: 5, offset: 29126}, val: "...", ignoreCase: false, want: "\"...\"", }, &ruleRefExpr{ - pos: position{line: 1216, col: 11, offset: 29428}, + pos: position{line: 1199, col: 11, offset: 29132}, name: "__", }, &labeledExpr{ - pos: position{line: 1216, col: 14, offset: 29431}, + pos: position{line: 1199, col: 14, offset: 29135}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1216, col: 19, offset: 29436}, + pos: position{line: 1199, col: 19, offset: 29140}, name: "Expr", }, }, @@ -8309,40 +8325,40 @@ var g = &grammar{ }, { name: "FieldExpr", - pos: position{line: 1220, col: 1, offset: 29532}, + pos: position{line: 1203, col: 1, offset: 29236}, expr: &actionExpr{ - pos: position{line: 1221, col: 5, offset: 29546}, + pos: position{line: 1204, col: 5, offset: 29250}, run: (*parser).callonFieldExpr1, expr: &seqExpr{ - pos: position{line: 1221, col: 5, offset: 29546}, + pos: position{line: 1204, col: 5, offset: 29250}, exprs: []any{ &labeledExpr{ - pos: position{line: 1221, col: 5, offset: 29546}, + pos: position{line: 1204, col: 5, offset: 29250}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1221, col: 10, offset: 29551}, + pos: position{line: 1204, col: 10, offset: 29255}, name: "Name", }, }, &ruleRefExpr{ - pos: position{line: 1221, col: 15, offset: 29556}, + pos: position{line: 1204, col: 15, offset: 29260}, name: "__", }, &litMatcher{ - pos: position{line: 1221, col: 18, offset: 29559}, + pos: position{line: 1204, col: 18, offset: 29263}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1221, col: 22, offset: 29563}, + pos: position{line: 1204, col: 22, offset: 29267}, name: "__", }, &labeledExpr{ - pos: position{line: 1221, col: 25, offset: 29566}, + pos: position{line: 1204, col: 25, offset: 29270}, label: "value", expr: &ruleRefExpr{ - pos: position{line: 1221, col: 31, offset: 29572}, + pos: position{line: 1204, col: 31, offset: 29276}, name: "Expr", }, }, @@ -8354,37 +8370,37 @@ var g = &grammar{ }, { name: "Array", - pos: position{line: 1230, col: 1, offset: 29741}, + pos: position{line: 1213, col: 1, offset: 29445}, expr: &actionExpr{ - pos: position{line: 1231, col: 5, offset: 29751}, + pos: position{line: 1214, col: 5, offset: 29455}, run: (*parser).callonArray1, expr: &seqExpr{ - pos: position{line: 1231, col: 5, offset: 29751}, + pos: position{line: 1214, col: 5, offset: 29455}, exprs: []any{ &litMatcher{ - pos: position{line: 1231, col: 5, offset: 29751}, + pos: position{line: 1214, col: 5, offset: 29455}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 1231, col: 9, offset: 29755}, + pos: position{line: 1214, col: 9, offset: 29459}, name: "__", }, &labeledExpr{ - pos: position{line: 1231, col: 12, offset: 29758}, + pos: position{line: 1214, col: 12, offset: 29462}, label: "elems", expr: &ruleRefExpr{ - pos: position{line: 1231, col: 18, offset: 29764}, + pos: position{line: 1214, col: 18, offset: 29468}, name: "VectorElems", }, }, &ruleRefExpr{ - pos: position{line: 1231, col: 30, offset: 29776}, + pos: position{line: 1214, col: 30, offset: 29480}, name: "__", }, &litMatcher{ - pos: position{line: 1231, col: 33, offset: 29779}, + pos: position{line: 1214, col: 33, offset: 29483}, val: "]", ignoreCase: false, want: "\"]\"", @@ -8397,37 +8413,37 @@ var g = &grammar{ }, { name: "Set", - pos: position{line: 1239, col: 1, offset: 29935}, + pos: position{line: 1222, col: 1, offset: 29639}, expr: &actionExpr{ - pos: position{line: 1240, col: 5, offset: 29943}, + pos: position{line: 1223, col: 5, offset: 29647}, run: (*parser).callonSet1, expr: &seqExpr{ - pos: position{line: 1240, col: 5, offset: 29943}, + pos: position{line: 1223, col: 5, offset: 29647}, exprs: []any{ &litMatcher{ - pos: position{line: 1240, col: 5, offset: 29943}, + pos: position{line: 1223, col: 5, offset: 29647}, val: "|[", ignoreCase: false, want: "\"|[\"", }, &ruleRefExpr{ - pos: position{line: 1240, col: 10, offset: 29948}, + pos: position{line: 1223, col: 10, offset: 29652}, name: "__", }, &labeledExpr{ - pos: position{line: 1240, col: 13, offset: 29951}, + pos: position{line: 1223, col: 13, offset: 29655}, label: "elems", expr: &ruleRefExpr{ - pos: position{line: 1240, col: 19, offset: 29957}, + pos: position{line: 1223, col: 19, offset: 29661}, name: "VectorElems", }, }, &ruleRefExpr{ - pos: position{line: 1240, col: 31, offset: 29969}, + pos: position{line: 1223, col: 31, offset: 29673}, name: "__", }, &litMatcher{ - pos: position{line: 1240, col: 34, offset: 29972}, + pos: position{line: 1223, col: 34, offset: 29676}, val: "]|", ignoreCase: false, want: "\"]|\"", @@ -8440,54 +8456,54 @@ var g = &grammar{ }, { name: "VectorElems", - pos: position{line: 1248, col: 1, offset: 30125}, + pos: position{line: 1231, col: 1, offset: 29829}, expr: &choiceExpr{ - pos: position{line: 1249, col: 5, offset: 30141}, + pos: position{line: 1232, col: 5, offset: 29845}, alternatives: []any{ &actionExpr{ - pos: position{line: 1249, col: 5, offset: 30141}, + pos: position{line: 1232, col: 5, offset: 29845}, run: (*parser).callonVectorElems2, expr: &seqExpr{ - pos: position{line: 1249, col: 5, offset: 30141}, + pos: position{line: 1232, col: 5, offset: 29845}, exprs: []any{ &labeledExpr{ - pos: position{line: 1249, col: 5, offset: 30141}, + pos: position{line: 1232, col: 5, offset: 29845}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1249, col: 11, offset: 30147}, + pos: position{line: 1232, col: 11, offset: 29851}, name: "VectorElem", }, }, &labeledExpr{ - pos: position{line: 1249, col: 22, offset: 30158}, + pos: position{line: 1232, col: 22, offset: 29862}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1249, col: 27, offset: 30163}, + pos: position{line: 1232, col: 27, offset: 29867}, expr: &actionExpr{ - pos: position{line: 1249, col: 28, offset: 30164}, + pos: position{line: 1232, col: 28, offset: 29868}, run: (*parser).callonVectorElems8, expr: &seqExpr{ - pos: position{line: 1249, col: 28, offset: 30164}, + pos: position{line: 1232, col: 28, offset: 29868}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1249, col: 28, offset: 30164}, + pos: position{line: 1232, col: 28, offset: 29868}, name: "__", }, &litMatcher{ - pos: position{line: 1249, col: 31, offset: 30167}, + pos: position{line: 1232, col: 31, offset: 29871}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1249, col: 35, offset: 30171}, + pos: position{line: 1232, col: 35, offset: 29875}, name: "__", }, &labeledExpr{ - pos: position{line: 1249, col: 38, offset: 30174}, + pos: position{line: 1232, col: 38, offset: 29878}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1249, col: 40, offset: 30176}, + pos: position{line: 1232, col: 40, offset: 29880}, name: "VectorElem", }, }, @@ -8500,10 +8516,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1252, col: 5, offset: 30258}, + pos: position{line: 1235, col: 5, offset: 29962}, run: (*parser).callonVectorElems15, expr: &ruleRefExpr{ - pos: position{line: 1252, col: 5, offset: 30258}, + pos: position{line: 1235, col: 5, offset: 29962}, name: "__", }, }, @@ -8514,22 +8530,22 @@ var g = &grammar{ }, { name: "VectorElem", - pos: position{line: 1254, col: 1, offset: 30282}, + pos: position{line: 1237, col: 1, offset: 29986}, expr: &choiceExpr{ - pos: position{line: 1255, col: 5, offset: 30297}, + pos: position{line: 1238, col: 5, offset: 30001}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1255, col: 5, offset: 30297}, + pos: position{line: 1238, col: 5, offset: 30001}, name: "Spread", }, &actionExpr{ - pos: position{line: 1256, col: 5, offset: 30308}, + pos: position{line: 1239, col: 5, offset: 30012}, run: (*parser).callonVectorElem3, expr: &labeledExpr{ - pos: position{line: 1256, col: 5, offset: 30308}, + pos: position{line: 1239, col: 5, offset: 30012}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1256, col: 7, offset: 30310}, + pos: position{line: 1239, col: 7, offset: 30014}, name: "Expr", }, }, @@ -8541,37 +8557,37 @@ var g = &grammar{ }, { name: "Map", - pos: position{line: 1258, col: 1, offset: 30401}, + pos: position{line: 1241, col: 1, offset: 30105}, expr: &actionExpr{ - pos: position{line: 1259, col: 5, offset: 30409}, + pos: position{line: 1242, col: 5, offset: 30113}, run: (*parser).callonMap1, expr: &seqExpr{ - pos: position{line: 1259, col: 5, offset: 30409}, + pos: position{line: 1242, col: 5, offset: 30113}, exprs: []any{ &litMatcher{ - pos: position{line: 1259, col: 5, offset: 30409}, + pos: position{line: 1242, col: 5, offset: 30113}, val: "|{", ignoreCase: false, want: "\"|{\"", }, &ruleRefExpr{ - pos: position{line: 1259, col: 10, offset: 30414}, + pos: position{line: 1242, col: 10, offset: 30118}, name: "__", }, &labeledExpr{ - pos: position{line: 1259, col: 13, offset: 30417}, + pos: position{line: 1242, col: 13, offset: 30121}, label: "exprs", expr: &ruleRefExpr{ - pos: position{line: 1259, col: 19, offset: 30423}, + pos: position{line: 1242, col: 19, offset: 30127}, name: "Entries", }, }, &ruleRefExpr{ - pos: position{line: 1259, col: 27, offset: 30431}, + pos: position{line: 1242, col: 27, offset: 30135}, name: "__", }, &litMatcher{ - pos: position{line: 1259, col: 30, offset: 30434}, + pos: position{line: 1242, col: 30, offset: 30138}, val: "}|", ignoreCase: false, want: "\"}|\"", @@ -8584,31 +8600,31 @@ var g = &grammar{ }, { name: "Entries", - pos: position{line: 1267, col: 1, offset: 30588}, + pos: position{line: 1250, col: 1, offset: 30292}, expr: &choiceExpr{ - pos: position{line: 1268, col: 5, offset: 30600}, + pos: position{line: 1251, col: 5, offset: 30304}, alternatives: []any{ &actionExpr{ - pos: position{line: 1268, col: 5, offset: 30600}, + pos: position{line: 1251, col: 5, offset: 30304}, run: (*parser).callonEntries2, expr: &seqExpr{ - pos: position{line: 1268, col: 5, offset: 30600}, + pos: position{line: 1251, col: 5, offset: 30304}, exprs: []any{ &labeledExpr{ - pos: position{line: 1268, col: 5, offset: 30600}, + pos: position{line: 1251, col: 5, offset: 30304}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1268, col: 11, offset: 30606}, + pos: position{line: 1251, col: 11, offset: 30310}, name: "Entry", }, }, &labeledExpr{ - pos: position{line: 1268, col: 17, offset: 30612}, + pos: position{line: 1251, col: 17, offset: 30316}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1268, col: 22, offset: 30617}, + pos: position{line: 1251, col: 22, offset: 30321}, expr: &ruleRefExpr{ - pos: position{line: 1268, col: 22, offset: 30617}, + pos: position{line: 1251, col: 22, offset: 30321}, name: "EntryTail", }, }, @@ -8617,10 +8633,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1271, col: 5, offset: 30675}, + pos: position{line: 1254, col: 5, offset: 30379}, run: (*parser).callonEntries9, expr: &ruleRefExpr{ - pos: position{line: 1271, col: 5, offset: 30675}, + pos: position{line: 1254, col: 5, offset: 30379}, name: "__", }, }, @@ -8631,32 +8647,32 @@ var g = &grammar{ }, { name: "EntryTail", - pos: position{line: 1274, col: 1, offset: 30700}, + pos: position{line: 1257, col: 1, offset: 30404}, expr: &actionExpr{ - pos: position{line: 1274, col: 13, offset: 30712}, + pos: position{line: 1257, col: 13, offset: 30416}, run: (*parser).callonEntryTail1, expr: &seqExpr{ - pos: position{line: 1274, col: 13, offset: 30712}, + pos: position{line: 1257, col: 13, offset: 30416}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1274, col: 13, offset: 30712}, + pos: position{line: 1257, col: 13, offset: 30416}, name: "__", }, &litMatcher{ - pos: position{line: 1274, col: 16, offset: 30715}, + pos: position{line: 1257, col: 16, offset: 30419}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1274, col: 20, offset: 30719}, + pos: position{line: 1257, col: 20, offset: 30423}, name: "__", }, &labeledExpr{ - pos: position{line: 1274, col: 23, offset: 30722}, + pos: position{line: 1257, col: 23, offset: 30426}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1274, col: 25, offset: 30724}, + pos: position{line: 1257, col: 25, offset: 30428}, name: "Entry", }, }, @@ -8668,40 +8684,40 @@ var g = &grammar{ }, { name: "Entry", - pos: position{line: 1276, col: 1, offset: 30749}, + pos: position{line: 1259, col: 1, offset: 30453}, expr: &actionExpr{ - pos: position{line: 1277, col: 5, offset: 30759}, + pos: position{line: 1260, col: 5, offset: 30463}, run: (*parser).callonEntry1, expr: &seqExpr{ - pos: position{line: 1277, col: 5, offset: 30759}, + pos: position{line: 1260, col: 5, offset: 30463}, exprs: []any{ &labeledExpr{ - pos: position{line: 1277, col: 5, offset: 30759}, + pos: position{line: 1260, col: 5, offset: 30463}, label: "key", expr: &ruleRefExpr{ - pos: position{line: 1277, col: 9, offset: 30763}, + pos: position{line: 1260, col: 9, offset: 30467}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1277, col: 14, offset: 30768}, + pos: position{line: 1260, col: 14, offset: 30472}, name: "__", }, &litMatcher{ - pos: position{line: 1277, col: 17, offset: 30771}, + pos: position{line: 1260, col: 17, offset: 30475}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1277, col: 21, offset: 30775}, + pos: position{line: 1260, col: 21, offset: 30479}, name: "__", }, &labeledExpr{ - pos: position{line: 1277, col: 24, offset: 30778}, + pos: position{line: 1260, col: 24, offset: 30482}, label: "value", expr: &ruleRefExpr{ - pos: position{line: 1277, col: 30, offset: 30784}, + pos: position{line: 1260, col: 30, offset: 30488}, name: "Expr", }, }, @@ -8713,61 +8729,61 @@ var g = &grammar{ }, { name: "Tuple", - pos: position{line: 1281, col: 1, offset: 30887}, + pos: position{line: 1264, col: 1, offset: 30591}, expr: &actionExpr{ - pos: position{line: 1282, col: 5, offset: 30897}, + pos: position{line: 1265, col: 5, offset: 30601}, run: (*parser).callonTuple1, expr: &seqExpr{ - pos: position{line: 1282, col: 5, offset: 30897}, + pos: position{line: 1265, col: 5, offset: 30601}, exprs: []any{ &litMatcher{ - pos: position{line: 1282, col: 5, offset: 30897}, + pos: position{line: 1265, col: 5, offset: 30601}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1282, col: 9, offset: 30901}, + pos: position{line: 1265, col: 9, offset: 30605}, name: "__", }, &labeledExpr{ - pos: position{line: 1282, col: 12, offset: 30904}, + pos: position{line: 1265, col: 12, offset: 30608}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1282, col: 18, offset: 30910}, + pos: position{line: 1265, col: 18, offset: 30614}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 1282, col: 23, offset: 30915}, + pos: position{line: 1265, col: 23, offset: 30619}, label: "rest", expr: &oneOrMoreExpr{ - pos: position{line: 1282, col: 28, offset: 30920}, + pos: position{line: 1265, col: 28, offset: 30624}, expr: &actionExpr{ - pos: position{line: 1282, col: 29, offset: 30921}, + pos: position{line: 1265, col: 29, offset: 30625}, run: (*parser).callonTuple9, expr: &seqExpr{ - pos: position{line: 1282, col: 29, offset: 30921}, + pos: position{line: 1265, col: 29, offset: 30625}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1282, col: 29, offset: 30921}, + pos: position{line: 1265, col: 29, offset: 30625}, name: "__", }, &litMatcher{ - pos: position{line: 1282, col: 32, offset: 30924}, + pos: position{line: 1265, col: 32, offset: 30628}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1282, col: 36, offset: 30928}, + pos: position{line: 1265, col: 36, offset: 30632}, name: "__", }, &labeledExpr{ - pos: position{line: 1282, col: 39, offset: 30931}, + pos: position{line: 1265, col: 39, offset: 30635}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1282, col: 41, offset: 30933}, + pos: position{line: 1265, col: 41, offset: 30637}, name: "Expr", }, }, @@ -8777,11 +8793,11 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1282, col: 66, offset: 30958}, + pos: position{line: 1265, col: 66, offset: 30662}, name: "__", }, &litMatcher{ - pos: position{line: 1282, col: 69, offset: 30961}, + pos: position{line: 1265, col: 69, offset: 30665}, val: ")", ignoreCase: false, want: "\")\"", @@ -8794,56 +8810,56 @@ var g = &grammar{ }, { name: "Literal", - pos: position{line: 1292, col: 1, offset: 31142}, + pos: position{line: 1275, col: 1, offset: 30846}, expr: &choiceExpr{ - pos: position{line: 1293, col: 5, offset: 31154}, + pos: position{line: 1276, col: 5, offset: 30858}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1293, col: 5, offset: 31154}, + pos: position{line: 1276, col: 5, offset: 30858}, name: "TypeLiteral", }, &ruleRefExpr{ - pos: position{line: 1294, col: 5, offset: 31170}, + pos: position{line: 1277, col: 5, offset: 30874}, name: "StringLiteral", }, &ruleRefExpr{ - pos: position{line: 1295, col: 5, offset: 31188}, + pos: position{line: 1278, col: 5, offset: 30892}, name: "FString", }, &ruleRefExpr{ - pos: position{line: 1296, col: 5, offset: 31200}, + pos: position{line: 1279, col: 5, offset: 30904}, name: "SubnetLiteral", }, &ruleRefExpr{ - pos: position{line: 1297, col: 5, offset: 31218}, + pos: position{line: 1280, col: 5, offset: 30922}, name: "AddressLiteral", }, &ruleRefExpr{ - pos: position{line: 1298, col: 5, offset: 31237}, + pos: position{line: 1281, col: 5, offset: 30941}, name: "BytesLiteral", }, &ruleRefExpr{ - pos: position{line: 1299, col: 5, offset: 31254}, + pos: position{line: 1282, col: 5, offset: 30958}, name: "Duration", }, &ruleRefExpr{ - pos: position{line: 1300, col: 5, offset: 31267}, + pos: position{line: 1283, col: 5, offset: 30971}, name: "Time", }, &ruleRefExpr{ - pos: position{line: 1301, col: 5, offset: 31276}, + pos: position{line: 1284, col: 5, offset: 30980}, name: "FloatLiteral", }, &ruleRefExpr{ - pos: position{line: 1302, col: 5, offset: 31293}, + pos: position{line: 1285, col: 5, offset: 30997}, name: "IntegerLiteral", }, &ruleRefExpr{ - pos: position{line: 1303, col: 5, offset: 31312}, + pos: position{line: 1286, col: 5, offset: 31016}, name: "BooleanLiteral", }, &ruleRefExpr{ - pos: position{line: 1304, col: 5, offset: 31331}, + pos: position{line: 1287, col: 5, offset: 31035}, name: "NullLiteral", }, }, @@ -8853,28 +8869,28 @@ var g = &grammar{ }, { name: "SubnetLiteral", - pos: position{line: 1306, col: 1, offset: 31344}, + pos: position{line: 1289, col: 1, offset: 31048}, expr: &choiceExpr{ - pos: position{line: 1307, col: 5, offset: 31362}, + pos: position{line: 1290, col: 5, offset: 31066}, alternatives: []any{ &actionExpr{ - pos: position{line: 1307, col: 5, offset: 31362}, + pos: position{line: 1290, col: 5, offset: 31066}, run: (*parser).callonSubnetLiteral2, expr: &seqExpr{ - pos: position{line: 1307, col: 5, offset: 31362}, + pos: position{line: 1290, col: 5, offset: 31066}, exprs: []any{ &labeledExpr{ - pos: position{line: 1307, col: 5, offset: 31362}, + pos: position{line: 1290, col: 5, offset: 31066}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1307, col: 7, offset: 31364}, + pos: position{line: 1290, col: 7, offset: 31068}, name: "IP6Net", }, }, ¬Expr{ - pos: position{line: 1307, col: 14, offset: 31371}, + pos: position{line: 1290, col: 14, offset: 31075}, expr: &ruleRefExpr{ - pos: position{line: 1307, col: 15, offset: 31372}, + pos: position{line: 1290, col: 15, offset: 31076}, name: "IdentifierRest", }, }, @@ -8882,13 +8898,13 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1310, col: 5, offset: 31452}, + pos: position{line: 1293, col: 5, offset: 31156}, run: (*parser).callonSubnetLiteral8, expr: &labeledExpr{ - pos: position{line: 1310, col: 5, offset: 31452}, + pos: position{line: 1293, col: 5, offset: 31156}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1310, col: 7, offset: 31454}, + pos: position{line: 1293, col: 7, offset: 31158}, name: "IP4Net", }, }, @@ -8900,28 +8916,28 @@ var g = &grammar{ }, { name: "AddressLiteral", - pos: position{line: 1314, col: 1, offset: 31523}, + pos: position{line: 1297, col: 1, offset: 31227}, expr: &choiceExpr{ - pos: position{line: 1315, col: 5, offset: 31542}, + pos: position{line: 1298, col: 5, offset: 31246}, alternatives: []any{ &actionExpr{ - pos: position{line: 1315, col: 5, offset: 31542}, + pos: position{line: 1298, col: 5, offset: 31246}, run: (*parser).callonAddressLiteral2, expr: &seqExpr{ - pos: position{line: 1315, col: 5, offset: 31542}, + pos: position{line: 1298, col: 5, offset: 31246}, exprs: []any{ &labeledExpr{ - pos: position{line: 1315, col: 5, offset: 31542}, + pos: position{line: 1298, col: 5, offset: 31246}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1315, col: 7, offset: 31544}, + pos: position{line: 1298, col: 7, offset: 31248}, name: "IP6", }, }, ¬Expr{ - pos: position{line: 1315, col: 11, offset: 31548}, + pos: position{line: 1298, col: 11, offset: 31252}, expr: &ruleRefExpr{ - pos: position{line: 1315, col: 12, offset: 31549}, + pos: position{line: 1298, col: 12, offset: 31253}, name: "IdentifierRest", }, }, @@ -8929,13 +8945,13 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1318, col: 5, offset: 31628}, + pos: position{line: 1301, col: 5, offset: 31332}, run: (*parser).callonAddressLiteral8, expr: &labeledExpr{ - pos: position{line: 1318, col: 5, offset: 31628}, + pos: position{line: 1301, col: 5, offset: 31332}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1318, col: 7, offset: 31630}, + pos: position{line: 1301, col: 7, offset: 31334}, name: "IP", }, }, @@ -8947,15 +8963,15 @@ var g = &grammar{ }, { name: "FloatLiteral", - pos: position{line: 1322, col: 1, offset: 31694}, + pos: position{line: 1305, col: 1, offset: 31398}, expr: &actionExpr{ - pos: position{line: 1323, col: 5, offset: 31711}, + pos: position{line: 1306, col: 5, offset: 31415}, run: (*parser).callonFloatLiteral1, expr: &labeledExpr{ - pos: position{line: 1323, col: 5, offset: 31711}, + pos: position{line: 1306, col: 5, offset: 31415}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1323, col: 7, offset: 31713}, + pos: position{line: 1306, col: 7, offset: 31417}, name: "FloatString", }, }, @@ -8965,15 +8981,15 @@ var g = &grammar{ }, { name: "IntegerLiteral", - pos: position{line: 1327, col: 1, offset: 31791}, + pos: position{line: 1310, col: 1, offset: 31495}, expr: &actionExpr{ - pos: position{line: 1328, col: 5, offset: 31810}, + pos: position{line: 1311, col: 5, offset: 31514}, run: (*parser).callonIntegerLiteral1, expr: &labeledExpr{ - pos: position{line: 1328, col: 5, offset: 31810}, + pos: position{line: 1311, col: 5, offset: 31514}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1328, col: 7, offset: 31812}, + pos: position{line: 1311, col: 7, offset: 31516}, name: "IntString", }, }, @@ -8983,23 +8999,23 @@ var g = &grammar{ }, { name: "BooleanLiteral", - pos: position{line: 1332, col: 1, offset: 31886}, + pos: position{line: 1315, col: 1, offset: 31590}, expr: &choiceExpr{ - pos: position{line: 1333, col: 5, offset: 31905}, + pos: position{line: 1316, col: 5, offset: 31609}, alternatives: []any{ &actionExpr{ - pos: position{line: 1333, col: 5, offset: 31905}, + pos: position{line: 1316, col: 5, offset: 31609}, run: (*parser).callonBooleanLiteral2, expr: &ruleRefExpr{ - pos: position{line: 1333, col: 5, offset: 31905}, + pos: position{line: 1316, col: 5, offset: 31609}, name: "TRUE", }, }, &actionExpr{ - pos: position{line: 1334, col: 5, offset: 31963}, + pos: position{line: 1317, col: 5, offset: 31667}, run: (*parser).callonBooleanLiteral4, expr: &ruleRefExpr{ - pos: position{line: 1334, col: 5, offset: 31963}, + pos: position{line: 1317, col: 5, offset: 31667}, name: "FALSE", }, }, @@ -9010,12 +9026,12 @@ var g = &grammar{ }, { name: "NullLiteral", - pos: position{line: 1336, col: 1, offset: 32019}, + pos: position{line: 1319, col: 1, offset: 31723}, expr: &actionExpr{ - pos: position{line: 1337, col: 5, offset: 32035}, + pos: position{line: 1320, col: 5, offset: 31739}, run: (*parser).callonNullLiteral1, expr: &ruleRefExpr{ - pos: position{line: 1337, col: 5, offset: 32035}, + pos: position{line: 1320, col: 5, offset: 31739}, name: "NULL", }, }, @@ -9024,23 +9040,23 @@ var g = &grammar{ }, { name: "BytesLiteral", - pos: position{line: 1339, col: 1, offset: 32085}, + pos: position{line: 1322, col: 1, offset: 31789}, expr: &actionExpr{ - pos: position{line: 1340, col: 5, offset: 32102}, + pos: position{line: 1323, col: 5, offset: 31806}, run: (*parser).callonBytesLiteral1, expr: &seqExpr{ - pos: position{line: 1340, col: 5, offset: 32102}, + pos: position{line: 1323, col: 5, offset: 31806}, exprs: []any{ &litMatcher{ - pos: position{line: 1340, col: 5, offset: 32102}, + pos: position{line: 1323, col: 5, offset: 31806}, val: "0x", ignoreCase: false, want: "\"0x\"", }, &zeroOrMoreExpr{ - pos: position{line: 1340, col: 10, offset: 32107}, + pos: position{line: 1323, col: 10, offset: 31811}, expr: &ruleRefExpr{ - pos: position{line: 1340, col: 10, offset: 32107}, + pos: position{line: 1323, col: 10, offset: 31811}, name: "HexDigit", }, }, @@ -9052,29 +9068,29 @@ var g = &grammar{ }, { name: "TypeLiteral", - pos: position{line: 1344, col: 1, offset: 32181}, + pos: position{line: 1327, col: 1, offset: 31885}, expr: &actionExpr{ - pos: position{line: 1345, col: 5, offset: 32197}, + pos: position{line: 1328, col: 5, offset: 31901}, run: (*parser).callonTypeLiteral1, expr: &seqExpr{ - pos: position{line: 1345, col: 5, offset: 32197}, + pos: position{line: 1328, col: 5, offset: 31901}, exprs: []any{ &litMatcher{ - pos: position{line: 1345, col: 5, offset: 32197}, + pos: position{line: 1328, col: 5, offset: 31901}, val: "<", ignoreCase: false, want: "\"<\"", }, &labeledExpr{ - pos: position{line: 1345, col: 9, offset: 32201}, + pos: position{line: 1328, col: 9, offset: 31905}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1345, col: 13, offset: 32205}, + pos: position{line: 1328, col: 13, offset: 31909}, name: "Type", }, }, &litMatcher{ - pos: position{line: 1345, col: 18, offset: 32210}, + pos: position{line: 1328, col: 18, offset: 31914}, val: ">", ignoreCase: false, want: "\">\"", @@ -9087,16 +9103,16 @@ var g = &grammar{ }, { name: "Type", - pos: position{line: 1353, col: 1, offset: 32343}, + pos: position{line: 1336, col: 1, offset: 32047}, expr: &choiceExpr{ - pos: position{line: 1354, col: 5, offset: 32352}, + pos: position{line: 1337, col: 5, offset: 32056}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1354, col: 5, offset: 32352}, + pos: position{line: 1337, col: 5, offset: 32056}, name: "AmbiguousType", }, &ruleRefExpr{ - pos: position{line: 1355, col: 5, offset: 32370}, + pos: position{line: 1338, col: 5, offset: 32074}, name: "ComplexType", }, }, @@ -9106,28 +9122,28 @@ var g = &grammar{ }, { name: "AmbiguousType", - pos: position{line: 1357, col: 1, offset: 32383}, + pos: position{line: 1340, col: 1, offset: 32087}, expr: &choiceExpr{ - pos: position{line: 1358, col: 5, offset: 32401}, + pos: position{line: 1341, col: 5, offset: 32105}, alternatives: []any{ &actionExpr{ - pos: position{line: 1358, col: 5, offset: 32401}, + pos: position{line: 1341, col: 5, offset: 32105}, run: (*parser).callonAmbiguousType2, expr: &seqExpr{ - pos: position{line: 1358, col: 5, offset: 32401}, + pos: position{line: 1341, col: 5, offset: 32105}, exprs: []any{ &labeledExpr{ - pos: position{line: 1358, col: 5, offset: 32401}, + pos: position{line: 1341, col: 5, offset: 32105}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1358, col: 10, offset: 32406}, + pos: position{line: 1341, col: 10, offset: 32110}, name: "PrimitiveType", }, }, ¬Expr{ - pos: position{line: 1358, col: 24, offset: 32420}, + pos: position{line: 1341, col: 24, offset: 32124}, expr: &ruleRefExpr{ - pos: position{line: 1358, col: 25, offset: 32421}, + pos: position{line: 1341, col: 25, offset: 32125}, name: "IdentifierRest", }, }, @@ -9135,43 +9151,43 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1359, col: 5, offset: 32461}, + pos: position{line: 1342, col: 5, offset: 32165}, run: (*parser).callonAmbiguousType8, expr: &seqExpr{ - pos: position{line: 1359, col: 5, offset: 32461}, + pos: position{line: 1342, col: 5, offset: 32165}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1359, col: 5, offset: 32461}, + pos: position{line: 1342, col: 5, offset: 32165}, name: "ERROR", }, &ruleRefExpr{ - pos: position{line: 1359, col: 11, offset: 32467}, + pos: position{line: 1342, col: 11, offset: 32171}, name: "__", }, &litMatcher{ - pos: position{line: 1359, col: 14, offset: 32470}, + pos: position{line: 1342, col: 14, offset: 32174}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1359, col: 18, offset: 32474}, + pos: position{line: 1342, col: 18, offset: 32178}, name: "__", }, &labeledExpr{ - pos: position{line: 1359, col: 21, offset: 32477}, + pos: position{line: 1342, col: 21, offset: 32181}, label: "t", expr: &ruleRefExpr{ - pos: position{line: 1359, col: 23, offset: 32479}, + pos: position{line: 1342, col: 23, offset: 32183}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1359, col: 28, offset: 32484}, + pos: position{line: 1342, col: 28, offset: 32188}, name: "__", }, &litMatcher{ - pos: position{line: 1359, col: 31, offset: 32487}, + pos: position{line: 1342, col: 31, offset: 32191}, val: ")", ignoreCase: false, want: "\")\"", @@ -9180,43 +9196,43 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1366, col: 5, offset: 32627}, + pos: position{line: 1349, col: 5, offset: 32331}, run: (*parser).callonAmbiguousType18, expr: &seqExpr{ - pos: position{line: 1366, col: 5, offset: 32627}, + pos: position{line: 1349, col: 5, offset: 32331}, exprs: []any{ &labeledExpr{ - pos: position{line: 1366, col: 5, offset: 32627}, + pos: position{line: 1349, col: 5, offset: 32331}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1366, col: 10, offset: 32632}, + pos: position{line: 1349, col: 10, offset: 32336}, name: "Name", }, }, &labeledExpr{ - pos: position{line: 1366, col: 15, offset: 32637}, + pos: position{line: 1349, col: 15, offset: 32341}, label: "opt", expr: &zeroOrOneExpr{ - pos: position{line: 1366, col: 19, offset: 32641}, + pos: position{line: 1349, col: 19, offset: 32345}, expr: &seqExpr{ - pos: position{line: 1366, col: 20, offset: 32642}, + pos: position{line: 1349, col: 20, offset: 32346}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1366, col: 20, offset: 32642}, + pos: position{line: 1349, col: 20, offset: 32346}, name: "__", }, &litMatcher{ - pos: position{line: 1366, col: 23, offset: 32645}, + pos: position{line: 1349, col: 23, offset: 32349}, val: "=", ignoreCase: false, want: "\"=\"", }, &ruleRefExpr{ - pos: position{line: 1366, col: 27, offset: 32649}, + pos: position{line: 1349, col: 27, offset: 32353}, name: "__", }, &ruleRefExpr{ - pos: position{line: 1366, col: 30, offset: 32652}, + pos: position{line: 1349, col: 30, offset: 32356}, name: "Type", }, }, @@ -9227,31 +9243,31 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1377, col: 5, offset: 32977}, + pos: position{line: 1360, col: 5, offset: 32681}, run: (*parser).callonAmbiguousType29, expr: &seqExpr{ - pos: position{line: 1377, col: 5, offset: 32977}, + pos: position{line: 1360, col: 5, offset: 32681}, exprs: []any{ &litMatcher{ - pos: position{line: 1377, col: 5, offset: 32977}, + pos: position{line: 1360, col: 5, offset: 32681}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1377, col: 9, offset: 32981}, + pos: position{line: 1360, col: 9, offset: 32685}, name: "__", }, &labeledExpr{ - pos: position{line: 1377, col: 12, offset: 32984}, + pos: position{line: 1360, col: 12, offset: 32688}, label: "types", expr: &ruleRefExpr{ - pos: position{line: 1377, col: 18, offset: 32990}, + pos: position{line: 1360, col: 18, offset: 32694}, name: "TypeList", }, }, &litMatcher{ - pos: position{line: 1377, col: 27, offset: 32999}, + pos: position{line: 1360, col: 27, offset: 32703}, val: ")", ignoreCase: false, want: "\")\"", @@ -9266,28 +9282,28 @@ var g = &grammar{ }, { name: "TypeList", - pos: position{line: 1385, col: 1, offset: 33143}, + pos: position{line: 1368, col: 1, offset: 32847}, expr: &actionExpr{ - pos: position{line: 1386, col: 5, offset: 33156}, + pos: position{line: 1369, col: 5, offset: 32860}, run: (*parser).callonTypeList1, expr: &seqExpr{ - pos: position{line: 1386, col: 5, offset: 33156}, + pos: position{line: 1369, col: 5, offset: 32860}, exprs: []any{ &labeledExpr{ - pos: position{line: 1386, col: 5, offset: 33156}, + pos: position{line: 1369, col: 5, offset: 32860}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1386, col: 11, offset: 33162}, + pos: position{line: 1369, col: 11, offset: 32866}, name: "Type", }, }, &labeledExpr{ - pos: position{line: 1386, col: 16, offset: 33167}, + pos: position{line: 1369, col: 16, offset: 32871}, label: "rest", expr: &oneOrMoreExpr{ - pos: position{line: 1386, col: 21, offset: 33172}, + pos: position{line: 1369, col: 21, offset: 32876}, expr: &ruleRefExpr{ - pos: position{line: 1386, col: 21, offset: 33172}, + pos: position{line: 1369, col: 21, offset: 32876}, name: "TypeListTail", }, }, @@ -9300,32 +9316,32 @@ var g = &grammar{ }, { name: "TypeListTail", - pos: position{line: 1390, col: 1, offset: 33230}, + pos: position{line: 1373, col: 1, offset: 32934}, expr: &actionExpr{ - pos: position{line: 1390, col: 16, offset: 33245}, + pos: position{line: 1373, col: 16, offset: 32949}, run: (*parser).callonTypeListTail1, expr: &seqExpr{ - pos: position{line: 1390, col: 16, offset: 33245}, + pos: position{line: 1373, col: 16, offset: 32949}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1390, col: 16, offset: 33245}, + pos: position{line: 1373, col: 16, offset: 32949}, name: "__", }, &litMatcher{ - pos: position{line: 1390, col: 19, offset: 33248}, + pos: position{line: 1373, col: 19, offset: 32952}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1390, col: 23, offset: 33252}, + pos: position{line: 1373, col: 23, offset: 32956}, name: "__", }, &labeledExpr{ - pos: position{line: 1390, col: 26, offset: 33255}, + pos: position{line: 1373, col: 26, offset: 32959}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1390, col: 30, offset: 33259}, + pos: position{line: 1373, col: 30, offset: 32963}, name: "Type", }, }, @@ -9337,40 +9353,40 @@ var g = &grammar{ }, { name: "ComplexType", - pos: position{line: 1392, col: 1, offset: 33285}, + pos: position{line: 1375, col: 1, offset: 32989}, expr: &choiceExpr{ - pos: position{line: 1393, col: 5, offset: 33301}, + pos: position{line: 1376, col: 5, offset: 33005}, alternatives: []any{ &actionExpr{ - pos: position{line: 1393, col: 5, offset: 33301}, + pos: position{line: 1376, col: 5, offset: 33005}, run: (*parser).callonComplexType2, expr: &seqExpr{ - pos: position{line: 1393, col: 5, offset: 33301}, + pos: position{line: 1376, col: 5, offset: 33005}, exprs: []any{ &litMatcher{ - pos: position{line: 1393, col: 5, offset: 33301}, + pos: position{line: 1376, col: 5, offset: 33005}, val: "{", ignoreCase: false, want: "\"{\"", }, &ruleRefExpr{ - pos: position{line: 1393, col: 9, offset: 33305}, + pos: position{line: 1376, col: 9, offset: 33009}, name: "__", }, &labeledExpr{ - pos: position{line: 1393, col: 12, offset: 33308}, + pos: position{line: 1376, col: 12, offset: 33012}, label: "fields", expr: &ruleRefExpr{ - pos: position{line: 1393, col: 19, offset: 33315}, + pos: position{line: 1376, col: 19, offset: 33019}, name: "TypeFieldList", }, }, &ruleRefExpr{ - pos: position{line: 1393, col: 33, offset: 33329}, + pos: position{line: 1376, col: 33, offset: 33033}, name: "__", }, &litMatcher{ - pos: position{line: 1393, col: 36, offset: 33332}, + pos: position{line: 1376, col: 36, offset: 33036}, val: "}", ignoreCase: false, want: "\"}\"", @@ -9379,35 +9395,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1400, col: 5, offset: 33494}, + pos: position{line: 1383, col: 5, offset: 33198}, run: (*parser).callonComplexType10, expr: &seqExpr{ - pos: position{line: 1400, col: 5, offset: 33494}, + pos: position{line: 1383, col: 5, offset: 33198}, exprs: []any{ &litMatcher{ - pos: position{line: 1400, col: 5, offset: 33494}, + pos: position{line: 1383, col: 5, offset: 33198}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 1400, col: 9, offset: 33498}, + pos: position{line: 1383, col: 9, offset: 33202}, name: "__", }, &labeledExpr{ - pos: position{line: 1400, col: 12, offset: 33501}, + pos: position{line: 1383, col: 12, offset: 33205}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1400, col: 16, offset: 33505}, + pos: position{line: 1383, col: 16, offset: 33209}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1400, col: 21, offset: 33510}, + pos: position{line: 1383, col: 21, offset: 33214}, name: "__", }, &litMatcher{ - pos: position{line: 1400, col: 24, offset: 33513}, + pos: position{line: 1383, col: 24, offset: 33217}, val: "]", ignoreCase: false, want: "\"]\"", @@ -9416,35 +9432,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1407, col: 5, offset: 33655}, + pos: position{line: 1390, col: 5, offset: 33359}, run: (*parser).callonComplexType18, expr: &seqExpr{ - pos: position{line: 1407, col: 5, offset: 33655}, + pos: position{line: 1390, col: 5, offset: 33359}, exprs: []any{ &litMatcher{ - pos: position{line: 1407, col: 5, offset: 33655}, + pos: position{line: 1390, col: 5, offset: 33359}, val: "|[", ignoreCase: false, want: "\"|[\"", }, &ruleRefExpr{ - pos: position{line: 1407, col: 10, offset: 33660}, + pos: position{line: 1390, col: 10, offset: 33364}, name: "__", }, &labeledExpr{ - pos: position{line: 1407, col: 13, offset: 33663}, + pos: position{line: 1390, col: 13, offset: 33367}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1407, col: 17, offset: 33667}, + pos: position{line: 1390, col: 17, offset: 33371}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1407, col: 22, offset: 33672}, + pos: position{line: 1390, col: 22, offset: 33376}, name: "__", }, &litMatcher{ - pos: position{line: 1407, col: 25, offset: 33675}, + pos: position{line: 1390, col: 25, offset: 33379}, val: "]|", ignoreCase: false, want: "\"]|\"", @@ -9453,57 +9469,57 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1414, col: 5, offset: 33814}, + pos: position{line: 1397, col: 5, offset: 33518}, run: (*parser).callonComplexType26, expr: &seqExpr{ - pos: position{line: 1414, col: 5, offset: 33814}, + pos: position{line: 1397, col: 5, offset: 33518}, exprs: []any{ &litMatcher{ - pos: position{line: 1414, col: 5, offset: 33814}, + pos: position{line: 1397, col: 5, offset: 33518}, val: "|{", ignoreCase: false, want: "\"|{\"", }, &ruleRefExpr{ - pos: position{line: 1414, col: 10, offset: 33819}, + pos: position{line: 1397, col: 10, offset: 33523}, name: "__", }, &labeledExpr{ - pos: position{line: 1414, col: 13, offset: 33822}, + pos: position{line: 1397, col: 13, offset: 33526}, label: "keyType", expr: &ruleRefExpr{ - pos: position{line: 1414, col: 21, offset: 33830}, + pos: position{line: 1397, col: 21, offset: 33534}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1414, col: 26, offset: 33835}, + pos: position{line: 1397, col: 26, offset: 33539}, name: "__", }, &litMatcher{ - pos: position{line: 1414, col: 29, offset: 33838}, + pos: position{line: 1397, col: 29, offset: 33542}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1414, col: 33, offset: 33842}, + pos: position{line: 1397, col: 33, offset: 33546}, name: "__", }, &labeledExpr{ - pos: position{line: 1414, col: 36, offset: 33845}, + pos: position{line: 1397, col: 36, offset: 33549}, label: "valType", expr: &ruleRefExpr{ - pos: position{line: 1414, col: 44, offset: 33853}, + pos: position{line: 1397, col: 44, offset: 33557}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1414, col: 49, offset: 33858}, + pos: position{line: 1397, col: 49, offset: 33562}, name: "__", }, &litMatcher{ - pos: position{line: 1414, col: 52, offset: 33861}, + pos: position{line: 1397, col: 52, offset: 33565}, val: "}|", ignoreCase: false, want: "\"}|\"", @@ -9518,35 +9534,35 @@ var g = &grammar{ }, { name: "StringLiteral", - pos: position{line: 1423, col: 1, offset: 34035}, + pos: position{line: 1406, col: 1, offset: 33739}, expr: &choiceExpr{ - pos: position{line: 1424, col: 5, offset: 34053}, + pos: position{line: 1407, col: 5, offset: 33757}, alternatives: []any{ &actionExpr{ - pos: position{line: 1424, col: 5, offset: 34053}, + pos: position{line: 1407, col: 5, offset: 33757}, run: (*parser).callonStringLiteral2, expr: &seqExpr{ - pos: position{line: 1424, col: 5, offset: 34053}, + pos: position{line: 1407, col: 5, offset: 33757}, exprs: []any{ &litMatcher{ - pos: position{line: 1424, col: 5, offset: 34053}, + pos: position{line: 1407, col: 5, offset: 33757}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, &labeledExpr{ - pos: position{line: 1424, col: 9, offset: 34057}, + pos: position{line: 1407, col: 9, offset: 33761}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1424, col: 11, offset: 34059}, + pos: position{line: 1407, col: 11, offset: 33763}, expr: &ruleRefExpr{ - pos: position{line: 1424, col: 11, offset: 34059}, + pos: position{line: 1407, col: 11, offset: 33763}, name: "DoubleQuotedChar", }, }, }, &litMatcher{ - pos: position{line: 1424, col: 29, offset: 34077}, + pos: position{line: 1407, col: 29, offset: 33781}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -9555,30 +9571,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1425, col: 5, offset: 34141}, + pos: position{line: 1408, col: 5, offset: 33845}, run: (*parser).callonStringLiteral9, expr: &seqExpr{ - pos: position{line: 1425, col: 5, offset: 34141}, + pos: position{line: 1408, col: 5, offset: 33845}, exprs: []any{ &litMatcher{ - pos: position{line: 1425, col: 5, offset: 34141}, + pos: position{line: 1408, col: 5, offset: 33845}, val: "'", ignoreCase: false, want: "\"'\"", }, &labeledExpr{ - pos: position{line: 1425, col: 9, offset: 34145}, + pos: position{line: 1408, col: 9, offset: 33849}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1425, col: 11, offset: 34147}, + pos: position{line: 1408, col: 11, offset: 33851}, expr: &ruleRefExpr{ - pos: position{line: 1425, col: 11, offset: 34147}, + pos: position{line: 1408, col: 11, offset: 33851}, name: "SingleQuotedChar", }, }, }, &litMatcher{ - pos: position{line: 1425, col: 29, offset: 34165}, + pos: position{line: 1408, col: 29, offset: 33869}, val: "'", ignoreCase: false, want: "\"'\"", @@ -9593,35 +9609,35 @@ var g = &grammar{ }, { name: "FString", - pos: position{line: 1427, col: 1, offset: 34226}, + pos: position{line: 1410, col: 1, offset: 33930}, expr: &choiceExpr{ - pos: position{line: 1428, col: 5, offset: 34238}, + pos: position{line: 1411, col: 5, offset: 33942}, alternatives: []any{ &actionExpr{ - pos: position{line: 1428, col: 5, offset: 34238}, + pos: position{line: 1411, col: 5, offset: 33942}, run: (*parser).callonFString2, expr: &seqExpr{ - pos: position{line: 1428, col: 5, offset: 34238}, + pos: position{line: 1411, col: 5, offset: 33942}, exprs: []any{ &litMatcher{ - pos: position{line: 1428, col: 5, offset: 34238}, + pos: position{line: 1411, col: 5, offset: 33942}, val: "f\"", ignoreCase: false, want: "\"f\\\"\"", }, &labeledExpr{ - pos: position{line: 1428, col: 11, offset: 34244}, + pos: position{line: 1411, col: 11, offset: 33948}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1428, col: 13, offset: 34246}, + pos: position{line: 1411, col: 13, offset: 33950}, expr: &ruleRefExpr{ - pos: position{line: 1428, col: 13, offset: 34246}, + pos: position{line: 1411, col: 13, offset: 33950}, name: "FStringDoubleQuotedElem", }, }, }, &litMatcher{ - pos: position{line: 1428, col: 38, offset: 34271}, + pos: position{line: 1411, col: 38, offset: 33975}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -9630,30 +9646,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1435, col: 5, offset: 34417}, + pos: position{line: 1418, col: 5, offset: 34121}, run: (*parser).callonFString9, expr: &seqExpr{ - pos: position{line: 1435, col: 5, offset: 34417}, + pos: position{line: 1418, col: 5, offset: 34121}, exprs: []any{ &litMatcher{ - pos: position{line: 1435, col: 5, offset: 34417}, + pos: position{line: 1418, col: 5, offset: 34121}, val: "f'", ignoreCase: false, want: "\"f'\"", }, &labeledExpr{ - pos: position{line: 1435, col: 10, offset: 34422}, + pos: position{line: 1418, col: 10, offset: 34126}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1435, col: 12, offset: 34424}, + pos: position{line: 1418, col: 12, offset: 34128}, expr: &ruleRefExpr{ - pos: position{line: 1435, col: 12, offset: 34424}, + pos: position{line: 1418, col: 12, offset: 34128}, name: "FStringSingleQuotedElem", }, }, }, &litMatcher{ - pos: position{line: 1435, col: 37, offset: 34449}, + pos: position{line: 1418, col: 37, offset: 34153}, val: "'", ignoreCase: false, want: "\"'\"", @@ -9668,24 +9684,24 @@ var g = &grammar{ }, { name: "FStringDoubleQuotedElem", - pos: position{line: 1443, col: 1, offset: 34592}, + pos: position{line: 1426, col: 1, offset: 34296}, expr: &choiceExpr{ - pos: position{line: 1444, col: 5, offset: 34620}, + pos: position{line: 1427, col: 5, offset: 34324}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1444, col: 5, offset: 34620}, + pos: position{line: 1427, col: 5, offset: 34324}, name: "FStringExpr", }, &actionExpr{ - pos: position{line: 1445, col: 5, offset: 34636}, + pos: position{line: 1428, col: 5, offset: 34340}, run: (*parser).callonFStringDoubleQuotedElem3, expr: &labeledExpr{ - pos: position{line: 1445, col: 5, offset: 34636}, + pos: position{line: 1428, col: 5, offset: 34340}, label: "v", expr: &oneOrMoreExpr{ - pos: position{line: 1445, col: 7, offset: 34638}, + pos: position{line: 1428, col: 7, offset: 34342}, expr: &ruleRefExpr{ - pos: position{line: 1445, col: 7, offset: 34638}, + pos: position{line: 1428, col: 7, offset: 34342}, name: "FStringDoubleQuotedChar", }, }, @@ -9698,27 +9714,27 @@ var g = &grammar{ }, { name: "FStringDoubleQuotedChar", - pos: position{line: 1449, col: 1, offset: 34761}, + pos: position{line: 1432, col: 1, offset: 34465}, expr: &choiceExpr{ - pos: position{line: 1450, col: 5, offset: 34789}, + pos: position{line: 1433, col: 5, offset: 34493}, alternatives: []any{ &actionExpr{ - pos: position{line: 1450, col: 5, offset: 34789}, + pos: position{line: 1433, col: 5, offset: 34493}, run: (*parser).callonFStringDoubleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1450, col: 5, offset: 34789}, + pos: position{line: 1433, col: 5, offset: 34493}, exprs: []any{ &litMatcher{ - pos: position{line: 1450, col: 5, offset: 34789}, + pos: position{line: 1433, col: 5, offset: 34493}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1450, col: 10, offset: 34794}, + pos: position{line: 1433, col: 10, offset: 34498}, label: "v", expr: &litMatcher{ - pos: position{line: 1450, col: 12, offset: 34796}, + pos: position{line: 1433, col: 12, offset: 34500}, val: "{", ignoreCase: false, want: "\"{\"", @@ -9728,25 +9744,25 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1451, col: 5, offset: 34822}, + pos: position{line: 1434, col: 5, offset: 34526}, run: (*parser).callonFStringDoubleQuotedChar7, expr: &seqExpr{ - pos: position{line: 1451, col: 5, offset: 34822}, + pos: position{line: 1434, col: 5, offset: 34526}, exprs: []any{ ¬Expr{ - pos: position{line: 1451, col: 5, offset: 34822}, + pos: position{line: 1434, col: 5, offset: 34526}, expr: &litMatcher{ - pos: position{line: 1451, col: 7, offset: 34824}, + pos: position{line: 1434, col: 7, offset: 34528}, val: "{", ignoreCase: false, want: "\"{\"", }, }, &labeledExpr{ - pos: position{line: 1451, col: 12, offset: 34829}, + pos: position{line: 1434, col: 12, offset: 34533}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1451, col: 14, offset: 34831}, + pos: position{line: 1434, col: 14, offset: 34535}, name: "DoubleQuotedChar", }, }, @@ -9760,24 +9776,24 @@ var g = &grammar{ }, { name: "FStringSingleQuotedElem", - pos: position{line: 1453, col: 1, offset: 34867}, + pos: position{line: 1436, col: 1, offset: 34571}, expr: &choiceExpr{ - pos: position{line: 1454, col: 5, offset: 34895}, + pos: position{line: 1437, col: 5, offset: 34599}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1454, col: 5, offset: 34895}, + pos: position{line: 1437, col: 5, offset: 34599}, name: "FStringExpr", }, &actionExpr{ - pos: position{line: 1455, col: 5, offset: 34911}, + pos: position{line: 1438, col: 5, offset: 34615}, run: (*parser).callonFStringSingleQuotedElem3, expr: &labeledExpr{ - pos: position{line: 1455, col: 5, offset: 34911}, + pos: position{line: 1438, col: 5, offset: 34615}, label: "v", expr: &oneOrMoreExpr{ - pos: position{line: 1455, col: 7, offset: 34913}, + pos: position{line: 1438, col: 7, offset: 34617}, expr: &ruleRefExpr{ - pos: position{line: 1455, col: 7, offset: 34913}, + pos: position{line: 1438, col: 7, offset: 34617}, name: "FStringSingleQuotedChar", }, }, @@ -9790,27 +9806,27 @@ var g = &grammar{ }, { name: "FStringSingleQuotedChar", - pos: position{line: 1459, col: 1, offset: 35036}, + pos: position{line: 1442, col: 1, offset: 34740}, expr: &choiceExpr{ - pos: position{line: 1460, col: 5, offset: 35064}, + pos: position{line: 1443, col: 5, offset: 34768}, alternatives: []any{ &actionExpr{ - pos: position{line: 1460, col: 5, offset: 35064}, + pos: position{line: 1443, col: 5, offset: 34768}, run: (*parser).callonFStringSingleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1460, col: 5, offset: 35064}, + pos: position{line: 1443, col: 5, offset: 34768}, exprs: []any{ &litMatcher{ - pos: position{line: 1460, col: 5, offset: 35064}, + pos: position{line: 1443, col: 5, offset: 34768}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1460, col: 10, offset: 35069}, + pos: position{line: 1443, col: 10, offset: 34773}, label: "v", expr: &litMatcher{ - pos: position{line: 1460, col: 12, offset: 35071}, + pos: position{line: 1443, col: 12, offset: 34775}, val: "{", ignoreCase: false, want: "\"{\"", @@ -9820,25 +9836,25 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1461, col: 5, offset: 35097}, + pos: position{line: 1444, col: 5, offset: 34801}, run: (*parser).callonFStringSingleQuotedChar7, expr: &seqExpr{ - pos: position{line: 1461, col: 5, offset: 35097}, + pos: position{line: 1444, col: 5, offset: 34801}, exprs: []any{ ¬Expr{ - pos: position{line: 1461, col: 5, offset: 35097}, + pos: position{line: 1444, col: 5, offset: 34801}, expr: &litMatcher{ - pos: position{line: 1461, col: 7, offset: 35099}, + pos: position{line: 1444, col: 7, offset: 34803}, val: "{", ignoreCase: false, want: "\"{\"", }, }, &labeledExpr{ - pos: position{line: 1461, col: 12, offset: 35104}, + pos: position{line: 1444, col: 12, offset: 34808}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1461, col: 14, offset: 35106}, + pos: position{line: 1444, col: 14, offset: 34810}, name: "SingleQuotedChar", }, }, @@ -9852,37 +9868,37 @@ var g = &grammar{ }, { name: "FStringExpr", - pos: position{line: 1463, col: 1, offset: 35142}, + pos: position{line: 1446, col: 1, offset: 34846}, expr: &actionExpr{ - pos: position{line: 1464, col: 5, offset: 35158}, + pos: position{line: 1447, col: 5, offset: 34862}, run: (*parser).callonFStringExpr1, expr: &seqExpr{ - pos: position{line: 1464, col: 5, offset: 35158}, + pos: position{line: 1447, col: 5, offset: 34862}, exprs: []any{ &litMatcher{ - pos: position{line: 1464, col: 5, offset: 35158}, + pos: position{line: 1447, col: 5, offset: 34862}, val: "{", ignoreCase: false, want: "\"{\"", }, &ruleRefExpr{ - pos: position{line: 1464, col: 9, offset: 35162}, + pos: position{line: 1447, col: 9, offset: 34866}, name: "__", }, &labeledExpr{ - pos: position{line: 1464, col: 12, offset: 35165}, + pos: position{line: 1447, col: 12, offset: 34869}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1464, col: 14, offset: 35167}, + pos: position{line: 1447, col: 14, offset: 34871}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1464, col: 19, offset: 35172}, + pos: position{line: 1447, col: 19, offset: 34876}, name: "__", }, &litMatcher{ - pos: position{line: 1464, col: 22, offset: 35175}, + pos: position{line: 1447, col: 22, offset: 34879}, val: "}", ignoreCase: false, want: "\"}\"", @@ -9895,129 +9911,129 @@ var g = &grammar{ }, { name: "PrimitiveType", - pos: position{line: 1472, col: 1, offset: 35310}, + pos: position{line: 1455, col: 1, offset: 35014}, expr: &actionExpr{ - pos: position{line: 1473, col: 5, offset: 35328}, + pos: position{line: 1456, col: 5, offset: 35032}, run: (*parser).callonPrimitiveType1, expr: &choiceExpr{ - pos: position{line: 1473, col: 9, offset: 35332}, + pos: position{line: 1456, col: 9, offset: 35036}, alternatives: []any{ &litMatcher{ - pos: position{line: 1473, col: 9, offset: 35332}, + pos: position{line: 1456, col: 9, offset: 35036}, val: "uint8", ignoreCase: false, want: "\"uint8\"", }, &litMatcher{ - pos: position{line: 1473, col: 19, offset: 35342}, + pos: position{line: 1456, col: 19, offset: 35046}, val: "uint16", ignoreCase: false, want: "\"uint16\"", }, &litMatcher{ - pos: position{line: 1473, col: 30, offset: 35353}, + pos: position{line: 1456, col: 30, offset: 35057}, val: "uint32", ignoreCase: false, want: "\"uint32\"", }, &litMatcher{ - pos: position{line: 1473, col: 41, offset: 35364}, + pos: position{line: 1456, col: 41, offset: 35068}, val: "uint64", ignoreCase: false, want: "\"uint64\"", }, &litMatcher{ - pos: position{line: 1474, col: 9, offset: 35381}, + pos: position{line: 1457, col: 9, offset: 35085}, val: "int8", ignoreCase: false, want: "\"int8\"", }, &litMatcher{ - pos: position{line: 1474, col: 18, offset: 35390}, + pos: position{line: 1457, col: 18, offset: 35094}, val: "int16", ignoreCase: false, want: "\"int16\"", }, &litMatcher{ - pos: position{line: 1474, col: 28, offset: 35400}, + pos: position{line: 1457, col: 28, offset: 35104}, val: "int32", ignoreCase: false, want: "\"int32\"", }, &litMatcher{ - pos: position{line: 1474, col: 38, offset: 35410}, + pos: position{line: 1457, col: 38, offset: 35114}, val: "int64", ignoreCase: false, want: "\"int64\"", }, &litMatcher{ - pos: position{line: 1475, col: 9, offset: 35426}, + pos: position{line: 1458, col: 9, offset: 35130}, val: "float16", ignoreCase: false, want: "\"float16\"", }, &litMatcher{ - pos: position{line: 1475, col: 21, offset: 35438}, + pos: position{line: 1458, col: 21, offset: 35142}, val: "float32", ignoreCase: false, want: "\"float32\"", }, &litMatcher{ - pos: position{line: 1475, col: 33, offset: 35450}, + pos: position{line: 1458, col: 33, offset: 35154}, val: "float64", ignoreCase: false, want: "\"float64\"", }, &litMatcher{ - pos: position{line: 1476, col: 9, offset: 35468}, + pos: position{line: 1459, col: 9, offset: 35172}, val: "bool", ignoreCase: false, want: "\"bool\"", }, &litMatcher{ - pos: position{line: 1476, col: 18, offset: 35477}, + pos: position{line: 1459, col: 18, offset: 35181}, val: "string", ignoreCase: false, want: "\"string\"", }, &litMatcher{ - pos: position{line: 1477, col: 9, offset: 35494}, + pos: position{line: 1460, col: 9, offset: 35198}, val: "duration", ignoreCase: false, want: "\"duration\"", }, &litMatcher{ - pos: position{line: 1477, col: 22, offset: 35507}, + pos: position{line: 1460, col: 22, offset: 35211}, val: "time", ignoreCase: false, want: "\"time\"", }, &litMatcher{ - pos: position{line: 1478, col: 9, offset: 35522}, + pos: position{line: 1461, col: 9, offset: 35226}, val: "bytes", ignoreCase: false, want: "\"bytes\"", }, &litMatcher{ - pos: position{line: 1479, col: 9, offset: 35538}, + pos: position{line: 1462, col: 9, offset: 35242}, val: "ip", ignoreCase: false, want: "\"ip\"", }, &litMatcher{ - pos: position{line: 1479, col: 16, offset: 35545}, + pos: position{line: 1462, col: 16, offset: 35249}, val: "net", ignoreCase: false, want: "\"net\"", }, &litMatcher{ - pos: position{line: 1480, col: 9, offset: 35559}, + pos: position{line: 1463, col: 9, offset: 35263}, val: "type", ignoreCase: false, want: "\"type\"", }, &litMatcher{ - pos: position{line: 1480, col: 18, offset: 35568}, + pos: position{line: 1463, col: 18, offset: 35272}, val: "null", ignoreCase: false, want: "\"null\"", @@ -10030,31 +10046,31 @@ var g = &grammar{ }, { name: "TypeFieldList", - pos: position{line: 1488, col: 1, offset: 35753}, + pos: position{line: 1471, col: 1, offset: 35457}, expr: &choiceExpr{ - pos: position{line: 1489, col: 5, offset: 35771}, + pos: position{line: 1472, col: 5, offset: 35475}, alternatives: []any{ &actionExpr{ - pos: position{line: 1489, col: 5, offset: 35771}, + pos: position{line: 1472, col: 5, offset: 35475}, run: (*parser).callonTypeFieldList2, expr: &seqExpr{ - pos: position{line: 1489, col: 5, offset: 35771}, + pos: position{line: 1472, col: 5, offset: 35475}, exprs: []any{ &labeledExpr{ - pos: position{line: 1489, col: 5, offset: 35771}, + pos: position{line: 1472, col: 5, offset: 35475}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1489, col: 11, offset: 35777}, + pos: position{line: 1472, col: 11, offset: 35481}, name: "TypeField", }, }, &labeledExpr{ - pos: position{line: 1489, col: 21, offset: 35787}, + pos: position{line: 1472, col: 21, offset: 35491}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1489, col: 26, offset: 35792}, + pos: position{line: 1472, col: 26, offset: 35496}, expr: &ruleRefExpr{ - pos: position{line: 1489, col: 26, offset: 35792}, + pos: position{line: 1472, col: 26, offset: 35496}, name: "TypeFieldListTail", }, }, @@ -10063,10 +10079,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1492, col: 5, offset: 35858}, + pos: position{line: 1475, col: 5, offset: 35562}, run: (*parser).callonTypeFieldList9, expr: &litMatcher{ - pos: position{line: 1492, col: 5, offset: 35858}, + pos: position{line: 1475, col: 5, offset: 35562}, val: "", ignoreCase: false, want: "\"\"", @@ -10079,32 +10095,32 @@ var g = &grammar{ }, { name: "TypeFieldListTail", - pos: position{line: 1494, col: 1, offset: 35882}, + pos: position{line: 1477, col: 1, offset: 35586}, expr: &actionExpr{ - pos: position{line: 1494, col: 21, offset: 35902}, + pos: position{line: 1477, col: 21, offset: 35606}, run: (*parser).callonTypeFieldListTail1, expr: &seqExpr{ - pos: position{line: 1494, col: 21, offset: 35902}, + pos: position{line: 1477, col: 21, offset: 35606}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1494, col: 21, offset: 35902}, + pos: position{line: 1477, col: 21, offset: 35606}, name: "__", }, &litMatcher{ - pos: position{line: 1494, col: 24, offset: 35905}, + pos: position{line: 1477, col: 24, offset: 35609}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1494, col: 28, offset: 35909}, + pos: position{line: 1477, col: 28, offset: 35613}, name: "__", }, &labeledExpr{ - pos: position{line: 1494, col: 31, offset: 35912}, + pos: position{line: 1477, col: 31, offset: 35616}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1494, col: 35, offset: 35916}, + pos: position{line: 1477, col: 35, offset: 35620}, name: "TypeField", }, }, @@ -10116,40 +10132,40 @@ var g = &grammar{ }, { name: "TypeField", - pos: position{line: 1496, col: 1, offset: 35947}, + pos: position{line: 1479, col: 1, offset: 35651}, expr: &actionExpr{ - pos: position{line: 1497, col: 5, offset: 35961}, + pos: position{line: 1480, col: 5, offset: 35665}, run: (*parser).callonTypeField1, expr: &seqExpr{ - pos: position{line: 1497, col: 5, offset: 35961}, + pos: position{line: 1480, col: 5, offset: 35665}, exprs: []any{ &labeledExpr{ - pos: position{line: 1497, col: 5, offset: 35961}, + pos: position{line: 1480, col: 5, offset: 35665}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1497, col: 10, offset: 35966}, + pos: position{line: 1480, col: 10, offset: 35670}, name: "Name", }, }, &ruleRefExpr{ - pos: position{line: 1497, col: 15, offset: 35971}, + pos: position{line: 1480, col: 15, offset: 35675}, name: "__", }, &litMatcher{ - pos: position{line: 1497, col: 18, offset: 35974}, + pos: position{line: 1480, col: 18, offset: 35678}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1497, col: 22, offset: 35978}, + pos: position{line: 1480, col: 22, offset: 35682}, name: "__", }, &labeledExpr{ - pos: position{line: 1497, col: 25, offset: 35981}, + pos: position{line: 1480, col: 25, offset: 35685}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1497, col: 29, offset: 35985}, + pos: position{line: 1480, col: 29, offset: 35689}, name: "Type", }, }, @@ -10161,54 +10177,54 @@ var g = &grammar{ }, { name: "Name", - pos: position{line: 1505, col: 1, offset: 36134}, + pos: position{line: 1488, col: 1, offset: 35838}, expr: &choiceExpr{ - pos: position{line: 1506, col: 5, offset: 36143}, + pos: position{line: 1489, col: 5, offset: 35847}, alternatives: []any{ &actionExpr{ - pos: position{line: 1506, col: 5, offset: 36143}, + pos: position{line: 1489, col: 5, offset: 35847}, run: (*parser).callonName2, expr: &labeledExpr{ - pos: position{line: 1506, col: 5, offset: 36143}, + pos: position{line: 1489, col: 5, offset: 35847}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1506, col: 7, offset: 36145}, + pos: position{line: 1489, col: 7, offset: 35849}, name: "DottedIDs", }, }, }, &actionExpr{ - pos: position{line: 1507, col: 5, offset: 36234}, + pos: position{line: 1490, col: 5, offset: 35938}, run: (*parser).callonName5, expr: &labeledExpr{ - pos: position{line: 1507, col: 5, offset: 36234}, + pos: position{line: 1490, col: 5, offset: 35938}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1507, col: 7, offset: 36236}, + pos: position{line: 1490, col: 7, offset: 35940}, name: "IdentifierName", }, }, }, &actionExpr{ - pos: position{line: 1508, col: 5, offset: 36325}, + pos: position{line: 1491, col: 5, offset: 36029}, run: (*parser).callonName8, expr: &labeledExpr{ - pos: position{line: 1508, col: 5, offset: 36325}, + pos: position{line: 1491, col: 5, offset: 36029}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1508, col: 7, offset: 36327}, + pos: position{line: 1491, col: 7, offset: 36031}, name: "QuotedString", }, }, }, &actionExpr{ - pos: position{line: 1509, col: 5, offset: 36416}, + pos: position{line: 1492, col: 5, offset: 36120}, run: (*parser).callonName11, expr: &labeledExpr{ - pos: position{line: 1509, col: 5, offset: 36416}, + pos: position{line: 1492, col: 5, offset: 36120}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1509, col: 7, offset: 36418}, + pos: position{line: 1492, col: 7, offset: 36122}, name: "KSUID", }, }, @@ -10220,22 +10236,22 @@ var g = &grammar{ }, { name: "DottedIDs", - pos: position{line: 1511, col: 1, offset: 36504}, + pos: position{line: 1494, col: 1, offset: 36208}, expr: &actionExpr{ - pos: position{line: 1512, col: 5, offset: 36518}, + pos: position{line: 1495, col: 5, offset: 36222}, run: (*parser).callonDottedIDs1, expr: &seqExpr{ - pos: position{line: 1512, col: 5, offset: 36518}, + pos: position{line: 1495, col: 5, offset: 36222}, exprs: []any{ &choiceExpr{ - pos: position{line: 1512, col: 6, offset: 36519}, + pos: position{line: 1495, col: 6, offset: 36223}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1512, col: 6, offset: 36519}, + pos: position{line: 1495, col: 6, offset: 36223}, name: "IdentifierStart", }, &litMatcher{ - pos: position{line: 1512, col: 24, offset: 36537}, + pos: position{line: 1495, col: 24, offset: 36241}, val: ".", ignoreCase: false, want: "\".\"", @@ -10243,16 +10259,16 @@ var g = &grammar{ }, }, &zeroOrMoreExpr{ - pos: position{line: 1512, col: 29, offset: 36542}, + pos: position{line: 1495, col: 29, offset: 36246}, expr: &choiceExpr{ - pos: position{line: 1512, col: 30, offset: 36543}, + pos: position{line: 1495, col: 30, offset: 36247}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1512, col: 30, offset: 36543}, + pos: position{line: 1495, col: 30, offset: 36247}, name: "IdentifierRest", }, &litMatcher{ - pos: position{line: 1512, col: 47, offset: 36560}, + pos: position{line: 1495, col: 47, offset: 36264}, val: ".", ignoreCase: false, want: "\".\"", @@ -10268,15 +10284,15 @@ var g = &grammar{ }, { name: "Identifier", - pos: position{line: 1514, col: 1, offset: 36598}, + pos: position{line: 1497, col: 1, offset: 36302}, expr: &actionExpr{ - pos: position{line: 1515, col: 5, offset: 36613}, + pos: position{line: 1498, col: 5, offset: 36317}, run: (*parser).callonIdentifier1, expr: &labeledExpr{ - pos: position{line: 1515, col: 5, offset: 36613}, + pos: position{line: 1498, col: 5, offset: 36317}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 1515, col: 8, offset: 36616}, + pos: position{line: 1498, col: 8, offset: 36320}, name: "IdentifierName", }, }, @@ -10286,51 +10302,51 @@ var g = &grammar{ }, { name: "Identifiers", - pos: position{line: 1523, col: 1, offset: 36749}, + pos: position{line: 1506, col: 1, offset: 36453}, expr: &actionExpr{ - pos: position{line: 1524, col: 5, offset: 36765}, + pos: position{line: 1507, col: 5, offset: 36469}, run: (*parser).callonIdentifiers1, expr: &seqExpr{ - pos: position{line: 1524, col: 5, offset: 36765}, + pos: position{line: 1507, col: 5, offset: 36469}, exprs: []any{ &labeledExpr{ - pos: position{line: 1524, col: 5, offset: 36765}, + pos: position{line: 1507, col: 5, offset: 36469}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1524, col: 11, offset: 36771}, + pos: position{line: 1507, col: 11, offset: 36475}, name: "Identifier", }, }, &labeledExpr{ - pos: position{line: 1524, col: 22, offset: 36782}, + pos: position{line: 1507, col: 22, offset: 36486}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1524, col: 27, offset: 36787}, + pos: position{line: 1507, col: 27, offset: 36491}, expr: &actionExpr{ - pos: position{line: 1524, col: 28, offset: 36788}, + pos: position{line: 1507, col: 28, offset: 36492}, run: (*parser).callonIdentifiers7, expr: &seqExpr{ - pos: position{line: 1524, col: 28, offset: 36788}, + pos: position{line: 1507, col: 28, offset: 36492}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1524, col: 28, offset: 36788}, + pos: position{line: 1507, col: 28, offset: 36492}, name: "__", }, &litMatcher{ - pos: position{line: 1524, col: 31, offset: 36791}, + pos: position{line: 1507, col: 31, offset: 36495}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1524, col: 35, offset: 36795}, + pos: position{line: 1507, col: 35, offset: 36499}, name: "__", }, &labeledExpr{ - pos: position{line: 1524, col: 38, offset: 36798}, + pos: position{line: 1507, col: 38, offset: 36502}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1524, col: 43, offset: 36803}, + pos: position{line: 1507, col: 43, offset: 36507}, name: "Identifier", }, }, @@ -10347,29 +10363,29 @@ var g = &grammar{ }, { name: "IdentifierName", - pos: position{line: 1528, col: 1, offset: 36881}, + pos: position{line: 1511, col: 1, offset: 36585}, expr: &choiceExpr{ - pos: position{line: 1529, col: 5, offset: 36900}, + pos: position{line: 1512, col: 5, offset: 36604}, alternatives: []any{ &actionExpr{ - pos: position{line: 1529, col: 5, offset: 36900}, + pos: position{line: 1512, col: 5, offset: 36604}, run: (*parser).callonIdentifierName2, expr: &seqExpr{ - pos: position{line: 1529, col: 5, offset: 36900}, + pos: position{line: 1512, col: 5, offset: 36604}, exprs: []any{ ¬Expr{ - pos: position{line: 1529, col: 5, offset: 36900}, + pos: position{line: 1512, col: 5, offset: 36604}, expr: &seqExpr{ - pos: position{line: 1529, col: 7, offset: 36902}, + pos: position{line: 1512, col: 7, offset: 36606}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1529, col: 7, offset: 36902}, + pos: position{line: 1512, col: 7, offset: 36606}, name: "IDGuard", }, ¬Expr{ - pos: position{line: 1529, col: 15, offset: 36910}, + pos: position{line: 1512, col: 15, offset: 36614}, expr: &ruleRefExpr{ - pos: position{line: 1529, col: 16, offset: 36911}, + pos: position{line: 1512, col: 16, offset: 36615}, name: "IdentifierRest", }, }, @@ -10377,13 +10393,13 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1529, col: 32, offset: 36927}, + pos: position{line: 1512, col: 32, offset: 36631}, name: "IdentifierStart", }, &zeroOrMoreExpr{ - pos: position{line: 1529, col: 48, offset: 36943}, + pos: position{line: 1512, col: 48, offset: 36647}, expr: &ruleRefExpr{ - pos: position{line: 1529, col: 48, offset: 36943}, + pos: position{line: 1512, col: 48, offset: 36647}, name: "IdentifierRest", }, }, @@ -10391,32 +10407,32 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1530, col: 5, offset: 36994}, + pos: position{line: 1513, col: 5, offset: 36698}, run: (*parser).callonIdentifierName12, expr: &litMatcher{ - pos: position{line: 1530, col: 5, offset: 36994}, + pos: position{line: 1513, col: 5, offset: 36698}, val: "$", ignoreCase: false, want: "\"$\"", }, }, &actionExpr{ - pos: position{line: 1531, col: 5, offset: 37033}, + pos: position{line: 1514, col: 5, offset: 36737}, run: (*parser).callonIdentifierName14, expr: &seqExpr{ - pos: position{line: 1531, col: 5, offset: 37033}, + pos: position{line: 1514, col: 5, offset: 36737}, exprs: []any{ &litMatcher{ - pos: position{line: 1531, col: 5, offset: 37033}, + pos: position{line: 1514, col: 5, offset: 36737}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1531, col: 10, offset: 37038}, + pos: position{line: 1514, col: 10, offset: 36742}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 1531, col: 13, offset: 37041}, + pos: position{line: 1514, col: 13, offset: 36745}, name: "IDGuard", }, }, @@ -10424,15 +10440,19 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1533, col: 5, offset: 37132}, + pos: position{line: 1516, col: 5, offset: 36836}, run: (*parser).callonIdentifierName19, expr: &litMatcher{ - pos: position{line: 1533, col: 5, offset: 37132}, + pos: position{line: 1516, col: 5, offset: 36836}, val: "type", ignoreCase: false, want: "\"type\"", }, }, + &ruleRefExpr{ + pos: position{line: 1517, col: 5, offset: 36878}, + name: "BacktickString", + }, }, }, leader: false, @@ -10440,22 +10460,22 @@ var g = &grammar{ }, { name: "IdentifierStart", - pos: position{line: 1535, col: 1, offset: 37171}, + pos: position{line: 1519, col: 1, offset: 36895}, expr: &choiceExpr{ - pos: position{line: 1536, col: 5, offset: 37191}, + pos: position{line: 1520, col: 5, offset: 36915}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1536, col: 5, offset: 37191}, + pos: position{line: 1520, col: 5, offset: 36915}, name: "UnicodeLetter", }, &litMatcher{ - pos: position{line: 1537, col: 5, offset: 37209}, + pos: position{line: 1521, col: 5, offset: 36933}, val: "$", ignoreCase: false, want: "\"$\"", }, &litMatcher{ - pos: position{line: 1538, col: 5, offset: 37217}, + pos: position{line: 1522, col: 5, offset: 36941}, val: "_", ignoreCase: false, want: "\"_\"", @@ -10467,24 +10487,24 @@ var g = &grammar{ }, { name: "IdentifierRest", - pos: position{line: 1540, col: 1, offset: 37222}, + pos: position{line: 1524, col: 1, offset: 36946}, expr: &choiceExpr{ - pos: position{line: 1541, col: 5, offset: 37241}, + pos: position{line: 1525, col: 5, offset: 36965}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1541, col: 5, offset: 37241}, + pos: position{line: 1525, col: 5, offset: 36965}, name: "IdentifierStart", }, &ruleRefExpr{ - pos: position{line: 1542, col: 5, offset: 37261}, + pos: position{line: 1526, col: 5, offset: 36985}, name: "UnicodeCombiningMark", }, &ruleRefExpr{ - pos: position{line: 1543, col: 5, offset: 37286}, + pos: position{line: 1527, col: 5, offset: 37010}, name: "UnicodeDigit", }, &ruleRefExpr{ - pos: position{line: 1544, col: 5, offset: 37303}, + pos: position{line: 1528, col: 5, offset: 37027}, name: "UnicodeConnectorPunctuation", }, }, @@ -10494,24 +10514,24 @@ var g = &grammar{ }, { name: "IDGuard", - pos: position{line: 1546, col: 1, offset: 37332}, + pos: position{line: 1530, col: 1, offset: 37056}, expr: &choiceExpr{ - pos: position{line: 1547, col: 5, offset: 37344}, + pos: position{line: 1531, col: 5, offset: 37068}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1547, col: 5, offset: 37344}, + pos: position{line: 1531, col: 5, offset: 37068}, name: "BooleanLiteral", }, &ruleRefExpr{ - pos: position{line: 1548, col: 5, offset: 37363}, + pos: position{line: 1532, col: 5, offset: 37087}, name: "NullLiteral", }, &ruleRefExpr{ - pos: position{line: 1549, col: 5, offset: 37379}, + pos: position{line: 1533, col: 5, offset: 37103}, name: "NaN", }, &ruleRefExpr{ - pos: position{line: 1550, col: 5, offset: 37387}, + pos: position{line: 1534, col: 5, offset: 37111}, name: "Infinity", }, }, @@ -10521,25 +10541,25 @@ var g = &grammar{ }, { name: "Time", - pos: position{line: 1552, col: 1, offset: 37397}, + pos: position{line: 1536, col: 1, offset: 37121}, expr: &actionExpr{ - pos: position{line: 1553, col: 5, offset: 37406}, + pos: position{line: 1537, col: 5, offset: 37130}, run: (*parser).callonTime1, expr: &seqExpr{ - pos: position{line: 1553, col: 5, offset: 37406}, + pos: position{line: 1537, col: 5, offset: 37130}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1553, col: 5, offset: 37406}, + pos: position{line: 1537, col: 5, offset: 37130}, name: "FullDate", }, &litMatcher{ - pos: position{line: 1553, col: 14, offset: 37415}, + pos: position{line: 1537, col: 14, offset: 37139}, val: "T", ignoreCase: false, want: "\"T\"", }, &ruleRefExpr{ - pos: position{line: 1553, col: 18, offset: 37419}, + pos: position{line: 1537, col: 18, offset: 37143}, name: "FullTime", }, }, @@ -10550,32 +10570,32 @@ var g = &grammar{ }, { name: "FullDate", - pos: position{line: 1557, col: 1, offset: 37495}, + pos: position{line: 1541, col: 1, offset: 37219}, expr: &seqExpr{ - pos: position{line: 1557, col: 12, offset: 37506}, + pos: position{line: 1541, col: 12, offset: 37230}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1557, col: 12, offset: 37506}, + pos: position{line: 1541, col: 12, offset: 37230}, name: "D4", }, &litMatcher{ - pos: position{line: 1557, col: 15, offset: 37509}, + pos: position{line: 1541, col: 15, offset: 37233}, val: "-", ignoreCase: false, want: "\"-\"", }, &ruleRefExpr{ - pos: position{line: 1557, col: 19, offset: 37513}, + pos: position{line: 1541, col: 19, offset: 37237}, name: "D2", }, &litMatcher{ - pos: position{line: 1557, col: 22, offset: 37516}, + pos: position{line: 1541, col: 22, offset: 37240}, val: "-", ignoreCase: false, want: "\"-\"", }, &ruleRefExpr{ - pos: position{line: 1557, col: 26, offset: 37520}, + pos: position{line: 1541, col: 26, offset: 37244}, name: "D2", }, }, @@ -10585,33 +10605,33 @@ var g = &grammar{ }, { name: "D4", - pos: position{line: 1559, col: 1, offset: 37524}, + pos: position{line: 1543, col: 1, offset: 37248}, expr: &seqExpr{ - pos: position{line: 1559, col: 6, offset: 37529}, + pos: position{line: 1543, col: 6, offset: 37253}, exprs: []any{ &charClassMatcher{ - pos: position{line: 1559, col: 6, offset: 37529}, + pos: position{line: 1543, col: 6, offset: 37253}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1559, col: 11, offset: 37534}, + pos: position{line: 1543, col: 11, offset: 37258}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1559, col: 16, offset: 37539}, + pos: position{line: 1543, col: 16, offset: 37263}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1559, col: 21, offset: 37544}, + pos: position{line: 1543, col: 21, offset: 37268}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10624,19 +10644,19 @@ var g = &grammar{ }, { name: "D2", - pos: position{line: 1560, col: 1, offset: 37550}, + pos: position{line: 1544, col: 1, offset: 37274}, expr: &seqExpr{ - pos: position{line: 1560, col: 6, offset: 37555}, + pos: position{line: 1544, col: 6, offset: 37279}, exprs: []any{ &charClassMatcher{ - pos: position{line: 1560, col: 6, offset: 37555}, + pos: position{line: 1544, col: 6, offset: 37279}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1560, col: 11, offset: 37560}, + pos: position{line: 1544, col: 11, offset: 37284}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10649,16 +10669,16 @@ var g = &grammar{ }, { name: "FullTime", - pos: position{line: 1562, col: 1, offset: 37567}, + pos: position{line: 1546, col: 1, offset: 37291}, expr: &seqExpr{ - pos: position{line: 1562, col: 12, offset: 37578}, + pos: position{line: 1546, col: 12, offset: 37302}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1562, col: 12, offset: 37578}, + pos: position{line: 1546, col: 12, offset: 37302}, name: "PartialTime", }, &ruleRefExpr{ - pos: position{line: 1562, col: 24, offset: 37590}, + pos: position{line: 1546, col: 24, offset: 37314}, name: "TimeOffset", }, }, @@ -10668,49 +10688,49 @@ var g = &grammar{ }, { name: "PartialTime", - pos: position{line: 1564, col: 1, offset: 37602}, + pos: position{line: 1548, col: 1, offset: 37326}, expr: &seqExpr{ - pos: position{line: 1564, col: 15, offset: 37616}, + pos: position{line: 1548, col: 15, offset: 37340}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1564, col: 15, offset: 37616}, + pos: position{line: 1548, col: 15, offset: 37340}, name: "D2", }, &litMatcher{ - pos: position{line: 1564, col: 18, offset: 37619}, + pos: position{line: 1548, col: 18, offset: 37343}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1564, col: 22, offset: 37623}, + pos: position{line: 1548, col: 22, offset: 37347}, name: "D2", }, &litMatcher{ - pos: position{line: 1564, col: 25, offset: 37626}, + pos: position{line: 1548, col: 25, offset: 37350}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1564, col: 29, offset: 37630}, + pos: position{line: 1548, col: 29, offset: 37354}, name: "D2", }, &zeroOrOneExpr{ - pos: position{line: 1564, col: 32, offset: 37633}, + pos: position{line: 1548, col: 32, offset: 37357}, expr: &seqExpr{ - pos: position{line: 1564, col: 33, offset: 37634}, + pos: position{line: 1548, col: 33, offset: 37358}, exprs: []any{ &litMatcher{ - pos: position{line: 1564, col: 33, offset: 37634}, + pos: position{line: 1548, col: 33, offset: 37358}, val: ".", ignoreCase: false, want: "\".\"", }, &oneOrMoreExpr{ - pos: position{line: 1564, col: 37, offset: 37638}, + pos: position{line: 1548, col: 37, offset: 37362}, expr: &charClassMatcher{ - pos: position{line: 1564, col: 37, offset: 37638}, + pos: position{line: 1548, col: 37, offset: 37362}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10727,30 +10747,30 @@ var g = &grammar{ }, { name: "TimeOffset", - pos: position{line: 1566, col: 1, offset: 37648}, + pos: position{line: 1550, col: 1, offset: 37372}, expr: &choiceExpr{ - pos: position{line: 1567, col: 5, offset: 37663}, + pos: position{line: 1551, col: 5, offset: 37387}, alternatives: []any{ &litMatcher{ - pos: position{line: 1567, col: 5, offset: 37663}, + pos: position{line: 1551, col: 5, offset: 37387}, val: "Z", ignoreCase: false, want: "\"Z\"", }, &seqExpr{ - pos: position{line: 1568, col: 5, offset: 37671}, + pos: position{line: 1552, col: 5, offset: 37395}, exprs: []any{ &choiceExpr{ - pos: position{line: 1568, col: 6, offset: 37672}, + pos: position{line: 1552, col: 6, offset: 37396}, alternatives: []any{ &litMatcher{ - pos: position{line: 1568, col: 6, offset: 37672}, + pos: position{line: 1552, col: 6, offset: 37396}, val: "+", ignoreCase: false, want: "\"+\"", }, &litMatcher{ - pos: position{line: 1568, col: 12, offset: 37678}, + pos: position{line: 1552, col: 12, offset: 37402}, val: "-", ignoreCase: false, want: "\"-\"", @@ -10758,34 +10778,34 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1568, col: 17, offset: 37683}, + pos: position{line: 1552, col: 17, offset: 37407}, name: "D2", }, &litMatcher{ - pos: position{line: 1568, col: 20, offset: 37686}, + pos: position{line: 1552, col: 20, offset: 37410}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1568, col: 24, offset: 37690}, + pos: position{line: 1552, col: 24, offset: 37414}, name: "D2", }, &zeroOrOneExpr{ - pos: position{line: 1568, col: 27, offset: 37693}, + pos: position{line: 1552, col: 27, offset: 37417}, expr: &seqExpr{ - pos: position{line: 1568, col: 28, offset: 37694}, + pos: position{line: 1552, col: 28, offset: 37418}, exprs: []any{ &litMatcher{ - pos: position{line: 1568, col: 28, offset: 37694}, + pos: position{line: 1552, col: 28, offset: 37418}, val: ".", ignoreCase: false, want: "\".\"", }, &oneOrMoreExpr{ - pos: position{line: 1568, col: 32, offset: 37698}, + pos: position{line: 1552, col: 32, offset: 37422}, expr: &charClassMatcher{ - pos: position{line: 1568, col: 32, offset: 37698}, + pos: position{line: 1552, col: 32, offset: 37422}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10804,33 +10824,33 @@ var g = &grammar{ }, { name: "Duration", - pos: position{line: 1570, col: 1, offset: 37708}, + pos: position{line: 1554, col: 1, offset: 37432}, expr: &actionExpr{ - pos: position{line: 1571, col: 5, offset: 37721}, + pos: position{line: 1555, col: 5, offset: 37445}, run: (*parser).callonDuration1, expr: &seqExpr{ - pos: position{line: 1571, col: 5, offset: 37721}, + pos: position{line: 1555, col: 5, offset: 37445}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1571, col: 5, offset: 37721}, + pos: position{line: 1555, col: 5, offset: 37445}, expr: &litMatcher{ - pos: position{line: 1571, col: 5, offset: 37721}, + pos: position{line: 1555, col: 5, offset: 37445}, val: "-", ignoreCase: false, want: "\"-\"", }, }, &oneOrMoreExpr{ - pos: position{line: 1571, col: 10, offset: 37726}, + pos: position{line: 1555, col: 10, offset: 37450}, expr: &seqExpr{ - pos: position{line: 1571, col: 11, offset: 37727}, + pos: position{line: 1555, col: 11, offset: 37451}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1571, col: 11, offset: 37727}, + pos: position{line: 1555, col: 11, offset: 37451}, name: "Decimal", }, &ruleRefExpr{ - pos: position{line: 1571, col: 19, offset: 37735}, + pos: position{line: 1555, col: 19, offset: 37459}, name: "TimeUnit", }, }, @@ -10844,27 +10864,27 @@ var g = &grammar{ }, { name: "Decimal", - pos: position{line: 1575, col: 1, offset: 37817}, + pos: position{line: 1559, col: 1, offset: 37541}, expr: &seqExpr{ - pos: position{line: 1575, col: 11, offset: 37827}, + pos: position{line: 1559, col: 11, offset: 37551}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1575, col: 11, offset: 37827}, + pos: position{line: 1559, col: 11, offset: 37551}, name: "UInt", }, &zeroOrOneExpr{ - pos: position{line: 1575, col: 16, offset: 37832}, + pos: position{line: 1559, col: 16, offset: 37556}, expr: &seqExpr{ - pos: position{line: 1575, col: 17, offset: 37833}, + pos: position{line: 1559, col: 17, offset: 37557}, exprs: []any{ &litMatcher{ - pos: position{line: 1575, col: 17, offset: 37833}, + pos: position{line: 1559, col: 17, offset: 37557}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1575, col: 21, offset: 37837}, + pos: position{line: 1559, col: 21, offset: 37561}, name: "UInt", }, }, @@ -10877,60 +10897,60 @@ var g = &grammar{ }, { name: "TimeUnit", - pos: position{line: 1577, col: 1, offset: 37845}, + pos: position{line: 1561, col: 1, offset: 37569}, expr: &choiceExpr{ - pos: position{line: 1578, col: 5, offset: 37858}, + pos: position{line: 1562, col: 5, offset: 37582}, alternatives: []any{ &litMatcher{ - pos: position{line: 1578, col: 5, offset: 37858}, + pos: position{line: 1562, col: 5, offset: 37582}, val: "ns", ignoreCase: false, want: "\"ns\"", }, &litMatcher{ - pos: position{line: 1579, col: 5, offset: 37867}, + pos: position{line: 1563, col: 5, offset: 37591}, val: "us", ignoreCase: false, want: "\"us\"", }, &litMatcher{ - pos: position{line: 1580, col: 5, offset: 37876}, + pos: position{line: 1564, col: 5, offset: 37600}, val: "ms", ignoreCase: false, want: "\"ms\"", }, &litMatcher{ - pos: position{line: 1581, col: 5, offset: 37885}, + pos: position{line: 1565, col: 5, offset: 37609}, val: "s", ignoreCase: false, want: "\"s\"", }, &litMatcher{ - pos: position{line: 1582, col: 5, offset: 37893}, + pos: position{line: 1566, col: 5, offset: 37617}, val: "m", ignoreCase: false, want: "\"m\"", }, &litMatcher{ - pos: position{line: 1583, col: 5, offset: 37901}, + pos: position{line: 1567, col: 5, offset: 37625}, val: "h", ignoreCase: false, want: "\"h\"", }, &litMatcher{ - pos: position{line: 1584, col: 5, offset: 37909}, + pos: position{line: 1568, col: 5, offset: 37633}, val: "d", ignoreCase: false, want: "\"d\"", }, &litMatcher{ - pos: position{line: 1585, col: 5, offset: 37917}, + pos: position{line: 1569, col: 5, offset: 37641}, val: "w", ignoreCase: false, want: "\"w\"", }, &litMatcher{ - pos: position{line: 1586, col: 5, offset: 37925}, + pos: position{line: 1570, col: 5, offset: 37649}, val: "y", ignoreCase: false, want: "\"y\"", @@ -10942,45 +10962,45 @@ var g = &grammar{ }, { name: "IP", - pos: position{line: 1588, col: 1, offset: 37930}, + pos: position{line: 1572, col: 1, offset: 37654}, expr: &actionExpr{ - pos: position{line: 1589, col: 5, offset: 37937}, + pos: position{line: 1573, col: 5, offset: 37661}, run: (*parser).callonIP1, expr: &seqExpr{ - pos: position{line: 1589, col: 5, offset: 37937}, + pos: position{line: 1573, col: 5, offset: 37661}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1589, col: 5, offset: 37937}, + pos: position{line: 1573, col: 5, offset: 37661}, name: "UInt", }, &litMatcher{ - pos: position{line: 1589, col: 10, offset: 37942}, + pos: position{line: 1573, col: 10, offset: 37666}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1589, col: 14, offset: 37946}, + pos: position{line: 1573, col: 14, offset: 37670}, name: "UInt", }, &litMatcher{ - pos: position{line: 1589, col: 19, offset: 37951}, + pos: position{line: 1573, col: 19, offset: 37675}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1589, col: 23, offset: 37955}, + pos: position{line: 1573, col: 23, offset: 37679}, name: "UInt", }, &litMatcher{ - pos: position{line: 1589, col: 28, offset: 37960}, + pos: position{line: 1573, col: 28, offset: 37684}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1589, col: 32, offset: 37964}, + pos: position{line: 1573, col: 32, offset: 37688}, name: "UInt", }, }, @@ -10991,43 +11011,43 @@ var g = &grammar{ }, { name: "IP6", - pos: position{line: 1591, col: 1, offset: 38001}, + pos: position{line: 1575, col: 1, offset: 37725}, expr: &actionExpr{ - pos: position{line: 1592, col: 5, offset: 38009}, + pos: position{line: 1576, col: 5, offset: 37733}, run: (*parser).callonIP61, expr: &seqExpr{ - pos: position{line: 1592, col: 5, offset: 38009}, + pos: position{line: 1576, col: 5, offset: 37733}, exprs: []any{ ¬Expr{ - pos: position{line: 1592, col: 5, offset: 38009}, + pos: position{line: 1576, col: 5, offset: 37733}, expr: &seqExpr{ - pos: position{line: 1592, col: 7, offset: 38011}, + pos: position{line: 1576, col: 7, offset: 37735}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1592, col: 7, offset: 38011}, + pos: position{line: 1576, col: 7, offset: 37735}, name: "Hex", }, &litMatcher{ - pos: position{line: 1592, col: 11, offset: 38015}, + pos: position{line: 1576, col: 11, offset: 37739}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1592, col: 15, offset: 38019}, + pos: position{line: 1576, col: 15, offset: 37743}, name: "Hex", }, ¬Expr{ - pos: position{line: 1592, col: 19, offset: 38023}, + pos: position{line: 1576, col: 19, offset: 37747}, expr: &choiceExpr{ - pos: position{line: 1592, col: 21, offset: 38025}, + pos: position{line: 1576, col: 21, offset: 37749}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1592, col: 21, offset: 38025}, + pos: position{line: 1576, col: 21, offset: 37749}, name: "HexDigit", }, &litMatcher{ - pos: position{line: 1592, col: 32, offset: 38036}, + pos: position{line: 1576, col: 32, offset: 37760}, val: ":", ignoreCase: false, want: "\":\"", @@ -11039,10 +11059,10 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 1592, col: 38, offset: 38042}, + pos: position{line: 1576, col: 38, offset: 37766}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1592, col: 40, offset: 38044}, + pos: position{line: 1576, col: 40, offset: 37768}, name: "IP6Variations", }, }, @@ -11054,32 +11074,32 @@ var g = &grammar{ }, { name: "IP6Variations", - pos: position{line: 1596, col: 1, offset: 38208}, + pos: position{line: 1580, col: 1, offset: 37932}, expr: &choiceExpr{ - pos: position{line: 1597, col: 5, offset: 38226}, + pos: position{line: 1581, col: 5, offset: 37950}, alternatives: []any{ &actionExpr{ - pos: position{line: 1597, col: 5, offset: 38226}, + pos: position{line: 1581, col: 5, offset: 37950}, run: (*parser).callonIP6Variations2, expr: &seqExpr{ - pos: position{line: 1597, col: 5, offset: 38226}, + pos: position{line: 1581, col: 5, offset: 37950}, exprs: []any{ &labeledExpr{ - pos: position{line: 1597, col: 5, offset: 38226}, + pos: position{line: 1581, col: 5, offset: 37950}, label: "a", expr: &oneOrMoreExpr{ - pos: position{line: 1597, col: 7, offset: 38228}, + pos: position{line: 1581, col: 7, offset: 37952}, expr: &ruleRefExpr{ - pos: position{line: 1597, col: 7, offset: 38228}, + pos: position{line: 1581, col: 7, offset: 37952}, name: "HexColon", }, }, }, &labeledExpr{ - pos: position{line: 1597, col: 17, offset: 38238}, + pos: position{line: 1581, col: 17, offset: 37962}, label: "b", expr: &ruleRefExpr{ - pos: position{line: 1597, col: 19, offset: 38240}, + pos: position{line: 1581, col: 19, offset: 37964}, name: "IP6Tail", }, }, @@ -11087,52 +11107,52 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1600, col: 5, offset: 38304}, + pos: position{line: 1584, col: 5, offset: 38028}, run: (*parser).callonIP6Variations9, expr: &seqExpr{ - pos: position{line: 1600, col: 5, offset: 38304}, + pos: position{line: 1584, col: 5, offset: 38028}, exprs: []any{ &labeledExpr{ - pos: position{line: 1600, col: 5, offset: 38304}, + pos: position{line: 1584, col: 5, offset: 38028}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1600, col: 7, offset: 38306}, + pos: position{line: 1584, col: 7, offset: 38030}, name: "Hex", }, }, &labeledExpr{ - pos: position{line: 1600, col: 11, offset: 38310}, + pos: position{line: 1584, col: 11, offset: 38034}, label: "b", expr: &zeroOrMoreExpr{ - pos: position{line: 1600, col: 13, offset: 38312}, + pos: position{line: 1584, col: 13, offset: 38036}, expr: &ruleRefExpr{ - pos: position{line: 1600, col: 13, offset: 38312}, + pos: position{line: 1584, col: 13, offset: 38036}, name: "ColonHex", }, }, }, &litMatcher{ - pos: position{line: 1600, col: 23, offset: 38322}, + pos: position{line: 1584, col: 23, offset: 38046}, val: "::", ignoreCase: false, want: "\"::\"", }, &labeledExpr{ - pos: position{line: 1600, col: 28, offset: 38327}, + pos: position{line: 1584, col: 28, offset: 38051}, label: "d", expr: &zeroOrMoreExpr{ - pos: position{line: 1600, col: 30, offset: 38329}, + pos: position{line: 1584, col: 30, offset: 38053}, expr: &ruleRefExpr{ - pos: position{line: 1600, col: 30, offset: 38329}, + pos: position{line: 1584, col: 30, offset: 38053}, name: "HexColon", }, }, }, &labeledExpr{ - pos: position{line: 1600, col: 40, offset: 38339}, + pos: position{line: 1584, col: 40, offset: 38063}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1600, col: 42, offset: 38341}, + pos: position{line: 1584, col: 42, offset: 38065}, name: "IP6Tail", }, }, @@ -11140,33 +11160,33 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1603, col: 5, offset: 38440}, + pos: position{line: 1587, col: 5, offset: 38164}, run: (*parser).callonIP6Variations22, expr: &seqExpr{ - pos: position{line: 1603, col: 5, offset: 38440}, + pos: position{line: 1587, col: 5, offset: 38164}, exprs: []any{ &litMatcher{ - pos: position{line: 1603, col: 5, offset: 38440}, + pos: position{line: 1587, col: 5, offset: 38164}, val: "::", ignoreCase: false, want: "\"::\"", }, &labeledExpr{ - pos: position{line: 1603, col: 10, offset: 38445}, + pos: position{line: 1587, col: 10, offset: 38169}, label: "a", expr: &zeroOrMoreExpr{ - pos: position{line: 1603, col: 12, offset: 38447}, + pos: position{line: 1587, col: 12, offset: 38171}, expr: &ruleRefExpr{ - pos: position{line: 1603, col: 12, offset: 38447}, + pos: position{line: 1587, col: 12, offset: 38171}, name: "HexColon", }, }, }, &labeledExpr{ - pos: position{line: 1603, col: 22, offset: 38457}, + pos: position{line: 1587, col: 22, offset: 38181}, label: "b", expr: &ruleRefExpr{ - pos: position{line: 1603, col: 24, offset: 38459}, + pos: position{line: 1587, col: 24, offset: 38183}, name: "IP6Tail", }, }, @@ -11174,32 +11194,32 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1606, col: 5, offset: 38530}, + pos: position{line: 1590, col: 5, offset: 38254}, run: (*parser).callonIP6Variations30, expr: &seqExpr{ - pos: position{line: 1606, col: 5, offset: 38530}, + pos: position{line: 1590, col: 5, offset: 38254}, exprs: []any{ &labeledExpr{ - pos: position{line: 1606, col: 5, offset: 38530}, + pos: position{line: 1590, col: 5, offset: 38254}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1606, col: 7, offset: 38532}, + pos: position{line: 1590, col: 7, offset: 38256}, name: "Hex", }, }, &labeledExpr{ - pos: position{line: 1606, col: 11, offset: 38536}, + pos: position{line: 1590, col: 11, offset: 38260}, label: "b", expr: &zeroOrMoreExpr{ - pos: position{line: 1606, col: 13, offset: 38538}, + pos: position{line: 1590, col: 13, offset: 38262}, expr: &ruleRefExpr{ - pos: position{line: 1606, col: 13, offset: 38538}, + pos: position{line: 1590, col: 13, offset: 38262}, name: "ColonHex", }, }, }, &litMatcher{ - pos: position{line: 1606, col: 23, offset: 38548}, + pos: position{line: 1590, col: 23, offset: 38272}, val: "::", ignoreCase: false, want: "\"::\"", @@ -11208,10 +11228,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1609, col: 5, offset: 38616}, + pos: position{line: 1593, col: 5, offset: 38340}, run: (*parser).callonIP6Variations38, expr: &litMatcher{ - pos: position{line: 1609, col: 5, offset: 38616}, + pos: position{line: 1593, col: 5, offset: 38340}, val: "::", ignoreCase: false, want: "\"::\"", @@ -11224,16 +11244,16 @@ var g = &grammar{ }, { name: "IP6Tail", - pos: position{line: 1613, col: 1, offset: 38653}, + pos: position{line: 1597, col: 1, offset: 38377}, expr: &choiceExpr{ - pos: position{line: 1614, col: 5, offset: 38665}, + pos: position{line: 1598, col: 5, offset: 38389}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1614, col: 5, offset: 38665}, + pos: position{line: 1598, col: 5, offset: 38389}, name: "IP", }, &ruleRefExpr{ - pos: position{line: 1615, col: 5, offset: 38672}, + pos: position{line: 1599, col: 5, offset: 38396}, name: "Hex", }, }, @@ -11243,24 +11263,24 @@ var g = &grammar{ }, { name: "ColonHex", - pos: position{line: 1617, col: 1, offset: 38677}, + pos: position{line: 1601, col: 1, offset: 38401}, expr: &actionExpr{ - pos: position{line: 1617, col: 12, offset: 38688}, + pos: position{line: 1601, col: 12, offset: 38412}, run: (*parser).callonColonHex1, expr: &seqExpr{ - pos: position{line: 1617, col: 12, offset: 38688}, + pos: position{line: 1601, col: 12, offset: 38412}, exprs: []any{ &litMatcher{ - pos: position{line: 1617, col: 12, offset: 38688}, + pos: position{line: 1601, col: 12, offset: 38412}, val: ":", ignoreCase: false, want: "\":\"", }, &labeledExpr{ - pos: position{line: 1617, col: 16, offset: 38692}, + pos: position{line: 1601, col: 16, offset: 38416}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1617, col: 18, offset: 38694}, + pos: position{line: 1601, col: 18, offset: 38418}, name: "Hex", }, }, @@ -11272,23 +11292,23 @@ var g = &grammar{ }, { name: "HexColon", - pos: position{line: 1619, col: 1, offset: 38732}, + pos: position{line: 1603, col: 1, offset: 38456}, expr: &actionExpr{ - pos: position{line: 1619, col: 12, offset: 38743}, + pos: position{line: 1603, col: 12, offset: 38467}, run: (*parser).callonHexColon1, expr: &seqExpr{ - pos: position{line: 1619, col: 12, offset: 38743}, + pos: position{line: 1603, col: 12, offset: 38467}, exprs: []any{ &labeledExpr{ - pos: position{line: 1619, col: 12, offset: 38743}, + pos: position{line: 1603, col: 12, offset: 38467}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1619, col: 14, offset: 38745}, + pos: position{line: 1603, col: 14, offset: 38469}, name: "Hex", }, }, &litMatcher{ - pos: position{line: 1619, col: 18, offset: 38749}, + pos: position{line: 1603, col: 18, offset: 38473}, val: ":", ignoreCase: false, want: "\":\"", @@ -11301,32 +11321,32 @@ var g = &grammar{ }, { name: "IP4Net", - pos: position{line: 1621, col: 1, offset: 38787}, + pos: position{line: 1605, col: 1, offset: 38511}, expr: &actionExpr{ - pos: position{line: 1622, col: 5, offset: 38798}, + pos: position{line: 1606, col: 5, offset: 38522}, run: (*parser).callonIP4Net1, expr: &seqExpr{ - pos: position{line: 1622, col: 5, offset: 38798}, + pos: position{line: 1606, col: 5, offset: 38522}, exprs: []any{ &labeledExpr{ - pos: position{line: 1622, col: 5, offset: 38798}, + pos: position{line: 1606, col: 5, offset: 38522}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1622, col: 7, offset: 38800}, + pos: position{line: 1606, col: 7, offset: 38524}, name: "IP", }, }, &litMatcher{ - pos: position{line: 1622, col: 10, offset: 38803}, + pos: position{line: 1606, col: 10, offset: 38527}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 1622, col: 14, offset: 38807}, + pos: position{line: 1606, col: 14, offset: 38531}, label: "m", expr: &ruleRefExpr{ - pos: position{line: 1622, col: 16, offset: 38809}, + pos: position{line: 1606, col: 16, offset: 38533}, name: "UIntString", }, }, @@ -11338,32 +11358,32 @@ var g = &grammar{ }, { name: "IP6Net", - pos: position{line: 1626, col: 1, offset: 38877}, + pos: position{line: 1610, col: 1, offset: 38601}, expr: &actionExpr{ - pos: position{line: 1627, col: 5, offset: 38888}, + pos: position{line: 1611, col: 5, offset: 38612}, run: (*parser).callonIP6Net1, expr: &seqExpr{ - pos: position{line: 1627, col: 5, offset: 38888}, + pos: position{line: 1611, col: 5, offset: 38612}, exprs: []any{ &labeledExpr{ - pos: position{line: 1627, col: 5, offset: 38888}, + pos: position{line: 1611, col: 5, offset: 38612}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1627, col: 7, offset: 38890}, + pos: position{line: 1611, col: 7, offset: 38614}, name: "IP6", }, }, &litMatcher{ - pos: position{line: 1627, col: 11, offset: 38894}, + pos: position{line: 1611, col: 11, offset: 38618}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 1627, col: 15, offset: 38898}, + pos: position{line: 1611, col: 15, offset: 38622}, label: "m", expr: &ruleRefExpr{ - pos: position{line: 1627, col: 17, offset: 38900}, + pos: position{line: 1611, col: 17, offset: 38624}, name: "UIntString", }, }, @@ -11375,15 +11395,15 @@ var g = &grammar{ }, { name: "UInt", - pos: position{line: 1631, col: 1, offset: 38968}, + pos: position{line: 1615, col: 1, offset: 38692}, expr: &actionExpr{ - pos: position{line: 1632, col: 4, offset: 38976}, + pos: position{line: 1616, col: 4, offset: 38700}, run: (*parser).callonUInt1, expr: &labeledExpr{ - pos: position{line: 1632, col: 4, offset: 38976}, + pos: position{line: 1616, col: 4, offset: 38700}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1632, col: 6, offset: 38978}, + pos: position{line: 1616, col: 6, offset: 38702}, name: "UIntString", }, }, @@ -11393,16 +11413,16 @@ var g = &grammar{ }, { name: "IntString", - pos: position{line: 1634, col: 1, offset: 39018}, + pos: position{line: 1618, col: 1, offset: 38742}, expr: &choiceExpr{ - pos: position{line: 1635, col: 5, offset: 39032}, + pos: position{line: 1619, col: 5, offset: 38756}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1635, col: 5, offset: 39032}, + pos: position{line: 1619, col: 5, offset: 38756}, name: "UIntString", }, &ruleRefExpr{ - pos: position{line: 1636, col: 5, offset: 39047}, + pos: position{line: 1620, col: 5, offset: 38771}, name: "MinusIntString", }, }, @@ -11412,14 +11432,14 @@ var g = &grammar{ }, { name: "UIntString", - pos: position{line: 1638, col: 1, offset: 39063}, + pos: position{line: 1622, col: 1, offset: 38787}, expr: &actionExpr{ - pos: position{line: 1638, col: 14, offset: 39076}, + pos: position{line: 1622, col: 14, offset: 38800}, run: (*parser).callonUIntString1, expr: &oneOrMoreExpr{ - pos: position{line: 1638, col: 14, offset: 39076}, + pos: position{line: 1622, col: 14, offset: 38800}, expr: &charClassMatcher{ - pos: position{line: 1638, col: 14, offset: 39076}, + pos: position{line: 1622, col: 14, offset: 38800}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11432,21 +11452,21 @@ var g = &grammar{ }, { name: "MinusIntString", - pos: position{line: 1640, col: 1, offset: 39115}, + pos: position{line: 1624, col: 1, offset: 38839}, expr: &actionExpr{ - pos: position{line: 1641, col: 5, offset: 39134}, + pos: position{line: 1625, col: 5, offset: 38858}, run: (*parser).callonMinusIntString1, expr: &seqExpr{ - pos: position{line: 1641, col: 5, offset: 39134}, + pos: position{line: 1625, col: 5, offset: 38858}, exprs: []any{ &litMatcher{ - pos: position{line: 1641, col: 5, offset: 39134}, + pos: position{line: 1625, col: 5, offset: 38858}, val: "-", ignoreCase: false, want: "\"-\"", }, &ruleRefExpr{ - pos: position{line: 1641, col: 9, offset: 39138}, + pos: position{line: 1625, col: 9, offset: 38862}, name: "UIntString", }, }, @@ -11457,29 +11477,29 @@ var g = &grammar{ }, { name: "FloatString", - pos: position{line: 1643, col: 1, offset: 39181}, + pos: position{line: 1627, col: 1, offset: 38905}, expr: &choiceExpr{ - pos: position{line: 1644, col: 5, offset: 39197}, + pos: position{line: 1628, col: 5, offset: 38921}, alternatives: []any{ &actionExpr{ - pos: position{line: 1644, col: 5, offset: 39197}, + pos: position{line: 1628, col: 5, offset: 38921}, run: (*parser).callonFloatString2, expr: &seqExpr{ - pos: position{line: 1644, col: 5, offset: 39197}, + pos: position{line: 1628, col: 5, offset: 38921}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1644, col: 5, offset: 39197}, + pos: position{line: 1628, col: 5, offset: 38921}, expr: &litMatcher{ - pos: position{line: 1644, col: 5, offset: 39197}, + pos: position{line: 1628, col: 5, offset: 38921}, val: "-", ignoreCase: false, want: "\"-\"", }, }, &oneOrMoreExpr{ - pos: position{line: 1644, col: 10, offset: 39202}, + pos: position{line: 1628, col: 10, offset: 38926}, expr: &charClassMatcher{ - pos: position{line: 1644, col: 10, offset: 39202}, + pos: position{line: 1628, col: 10, offset: 38926}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11487,15 +11507,15 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1644, col: 17, offset: 39209}, + pos: position{line: 1628, col: 17, offset: 38933}, val: ".", ignoreCase: false, want: "\".\"", }, &zeroOrMoreExpr{ - pos: position{line: 1644, col: 21, offset: 39213}, + pos: position{line: 1628, col: 21, offset: 38937}, expr: &charClassMatcher{ - pos: position{line: 1644, col: 21, offset: 39213}, + pos: position{line: 1628, col: 21, offset: 38937}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11503,9 +11523,9 @@ var g = &grammar{ }, }, &zeroOrOneExpr{ - pos: position{line: 1644, col: 28, offset: 39220}, + pos: position{line: 1628, col: 28, offset: 38944}, expr: &ruleRefExpr{ - pos: position{line: 1644, col: 28, offset: 39220}, + pos: position{line: 1628, col: 28, offset: 38944}, name: "ExponentPart", }, }, @@ -11513,30 +11533,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1645, col: 5, offset: 39269}, + pos: position{line: 1629, col: 5, offset: 38993}, run: (*parser).callonFloatString13, expr: &seqExpr{ - pos: position{line: 1645, col: 5, offset: 39269}, + pos: position{line: 1629, col: 5, offset: 38993}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1645, col: 5, offset: 39269}, + pos: position{line: 1629, col: 5, offset: 38993}, expr: &litMatcher{ - pos: position{line: 1645, col: 5, offset: 39269}, + pos: position{line: 1629, col: 5, offset: 38993}, val: "-", ignoreCase: false, want: "\"-\"", }, }, &litMatcher{ - pos: position{line: 1645, col: 10, offset: 39274}, + pos: position{line: 1629, col: 10, offset: 38998}, val: ".", ignoreCase: false, want: "\".\"", }, &oneOrMoreExpr{ - pos: position{line: 1645, col: 14, offset: 39278}, + pos: position{line: 1629, col: 14, offset: 39002}, expr: &charClassMatcher{ - pos: position{line: 1645, col: 14, offset: 39278}, + pos: position{line: 1629, col: 14, offset: 39002}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11544,9 +11564,9 @@ var g = &grammar{ }, }, &zeroOrOneExpr{ - pos: position{line: 1645, col: 21, offset: 39285}, + pos: position{line: 1629, col: 21, offset: 39009}, expr: &ruleRefExpr{ - pos: position{line: 1645, col: 21, offset: 39285}, + pos: position{line: 1629, col: 21, offset: 39009}, name: "ExponentPart", }, }, @@ -11554,17 +11574,17 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1646, col: 5, offset: 39334}, + pos: position{line: 1630, col: 5, offset: 39058}, run: (*parser).callonFloatString22, expr: &choiceExpr{ - pos: position{line: 1646, col: 6, offset: 39335}, + pos: position{line: 1630, col: 6, offset: 39059}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1646, col: 6, offset: 39335}, + pos: position{line: 1630, col: 6, offset: 39059}, name: "NaN", }, &ruleRefExpr{ - pos: position{line: 1646, col: 12, offset: 39341}, + pos: position{line: 1630, col: 12, offset: 39065}, name: "Infinity", }, }, @@ -11577,20 +11597,20 @@ var g = &grammar{ }, { name: "ExponentPart", - pos: position{line: 1649, col: 1, offset: 39384}, + pos: position{line: 1633, col: 1, offset: 39108}, expr: &seqExpr{ - pos: position{line: 1649, col: 16, offset: 39399}, + pos: position{line: 1633, col: 16, offset: 39123}, exprs: []any{ &litMatcher{ - pos: position{line: 1649, col: 16, offset: 39399}, + pos: position{line: 1633, col: 16, offset: 39123}, val: "e", ignoreCase: true, want: "\"e\"i", }, &zeroOrOneExpr{ - pos: position{line: 1649, col: 21, offset: 39404}, + pos: position{line: 1633, col: 21, offset: 39128}, expr: &charClassMatcher{ - pos: position{line: 1649, col: 21, offset: 39404}, + pos: position{line: 1633, col: 21, offset: 39128}, val: "[+-]", chars: []rune{'+', '-'}, ignoreCase: false, @@ -11598,7 +11618,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1649, col: 27, offset: 39410}, + pos: position{line: 1633, col: 27, offset: 39134}, name: "UIntString", }, }, @@ -11608,9 +11628,9 @@ var g = &grammar{ }, { name: "NaN", - pos: position{line: 1651, col: 1, offset: 39422}, + pos: position{line: 1635, col: 1, offset: 39146}, expr: &litMatcher{ - pos: position{line: 1651, col: 7, offset: 39428}, + pos: position{line: 1635, col: 7, offset: 39152}, val: "NaN", ignoreCase: false, want: "\"NaN\"", @@ -11620,23 +11640,23 @@ var g = &grammar{ }, { name: "Infinity", - pos: position{line: 1653, col: 1, offset: 39435}, + pos: position{line: 1637, col: 1, offset: 39159}, expr: &seqExpr{ - pos: position{line: 1653, col: 12, offset: 39446}, + pos: position{line: 1637, col: 12, offset: 39170}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1653, col: 12, offset: 39446}, + pos: position{line: 1637, col: 12, offset: 39170}, expr: &choiceExpr{ - pos: position{line: 1653, col: 13, offset: 39447}, + pos: position{line: 1637, col: 13, offset: 39171}, alternatives: []any{ &litMatcher{ - pos: position{line: 1653, col: 13, offset: 39447}, + pos: position{line: 1637, col: 13, offset: 39171}, val: "-", ignoreCase: false, want: "\"-\"", }, &litMatcher{ - pos: position{line: 1653, col: 19, offset: 39453}, + pos: position{line: 1637, col: 19, offset: 39177}, val: "+", ignoreCase: false, want: "\"+\"", @@ -11645,7 +11665,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1653, col: 25, offset: 39459}, + pos: position{line: 1637, col: 25, offset: 39183}, val: "Inf", ignoreCase: false, want: "\"Inf\"", @@ -11657,14 +11677,14 @@ var g = &grammar{ }, { name: "Hex", - pos: position{line: 1655, col: 1, offset: 39466}, + pos: position{line: 1639, col: 1, offset: 39190}, expr: &actionExpr{ - pos: position{line: 1655, col: 7, offset: 39472}, + pos: position{line: 1639, col: 7, offset: 39196}, run: (*parser).callonHex1, expr: &oneOrMoreExpr{ - pos: position{line: 1655, col: 7, offset: 39472}, + pos: position{line: 1639, col: 7, offset: 39196}, expr: &ruleRefExpr{ - pos: position{line: 1655, col: 7, offset: 39472}, + pos: position{line: 1639, col: 7, offset: 39196}, name: "HexDigit", }, }, @@ -11674,9 +11694,9 @@ var g = &grammar{ }, { name: "HexDigit", - pos: position{line: 1657, col: 1, offset: 39514}, + pos: position{line: 1641, col: 1, offset: 39238}, expr: &charClassMatcher{ - pos: position{line: 1657, col: 12, offset: 39525}, + pos: position{line: 1641, col: 12, offset: 39249}, val: "[0-9a-fA-F]", ranges: []rune{'0', '9', 'a', 'f', 'A', 'F'}, ignoreCase: false, @@ -11687,35 +11707,35 @@ var g = &grammar{ }, { name: "QuotedString", - pos: position{line: 1659, col: 1, offset: 39538}, + pos: position{line: 1643, col: 1, offset: 39262}, expr: &choiceExpr{ - pos: position{line: 1660, col: 5, offset: 39555}, + pos: position{line: 1644, col: 5, offset: 39279}, alternatives: []any{ &actionExpr{ - pos: position{line: 1660, col: 5, offset: 39555}, + pos: position{line: 1644, col: 5, offset: 39279}, run: (*parser).callonQuotedString2, expr: &seqExpr{ - pos: position{line: 1660, col: 5, offset: 39555}, + pos: position{line: 1644, col: 5, offset: 39279}, exprs: []any{ &litMatcher{ - pos: position{line: 1660, col: 5, offset: 39555}, + pos: position{line: 1644, col: 5, offset: 39279}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, &labeledExpr{ - pos: position{line: 1660, col: 9, offset: 39559}, + pos: position{line: 1644, col: 9, offset: 39283}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1660, col: 11, offset: 39561}, + pos: position{line: 1644, col: 11, offset: 39285}, expr: &ruleRefExpr{ - pos: position{line: 1660, col: 11, offset: 39561}, + pos: position{line: 1644, col: 11, offset: 39285}, name: "DoubleQuotedChar", }, }, }, &litMatcher{ - pos: position{line: 1660, col: 29, offset: 39579}, + pos: position{line: 1644, col: 29, offset: 39303}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -11724,30 +11744,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1661, col: 5, offset: 39616}, + pos: position{line: 1645, col: 5, offset: 39340}, run: (*parser).callonQuotedString9, expr: &seqExpr{ - pos: position{line: 1661, col: 5, offset: 39616}, + pos: position{line: 1645, col: 5, offset: 39340}, exprs: []any{ &litMatcher{ - pos: position{line: 1661, col: 5, offset: 39616}, + pos: position{line: 1645, col: 5, offset: 39340}, val: "'", ignoreCase: false, want: "\"'\"", }, &labeledExpr{ - pos: position{line: 1661, col: 9, offset: 39620}, + pos: position{line: 1645, col: 9, offset: 39344}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1661, col: 11, offset: 39622}, + pos: position{line: 1645, col: 11, offset: 39346}, expr: &ruleRefExpr{ - pos: position{line: 1661, col: 11, offset: 39622}, + pos: position{line: 1645, col: 11, offset: 39346}, name: "SingleQuotedChar", }, }, }, &litMatcher{ - pos: position{line: 1661, col: 29, offset: 39640}, + pos: position{line: 1645, col: 29, offset: 39364}, val: "'", ignoreCase: false, want: "\"'\"", @@ -11762,57 +11782,159 @@ var g = &grammar{ }, { name: "DoubleQuotedChar", - pos: position{line: 1663, col: 1, offset: 39674}, + pos: position{line: 1647, col: 1, offset: 39398}, expr: &choiceExpr{ - pos: position{line: 1664, col: 5, offset: 39695}, + pos: position{line: 1648, col: 5, offset: 39419}, alternatives: []any{ &actionExpr{ - pos: position{line: 1664, col: 5, offset: 39695}, + pos: position{line: 1648, col: 5, offset: 39419}, run: (*parser).callonDoubleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1664, col: 5, offset: 39695}, + pos: position{line: 1648, col: 5, offset: 39419}, exprs: []any{ ¬Expr{ - pos: position{line: 1664, col: 5, offset: 39695}, + pos: position{line: 1648, col: 5, offset: 39419}, expr: &choiceExpr{ - pos: position{line: 1664, col: 7, offset: 39697}, + pos: position{line: 1648, col: 7, offset: 39421}, alternatives: []any{ &litMatcher{ - pos: position{line: 1664, col: 7, offset: 39697}, + pos: position{line: 1648, col: 7, offset: 39421}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, &ruleRefExpr{ - pos: position{line: 1664, col: 13, offset: 39703}, + pos: position{line: 1648, col: 13, offset: 39427}, name: "EscapedChar", }, }, }, }, &anyMatcher{ - line: 1664, col: 26, offset: 39716, + line: 1648, col: 26, offset: 39440, }, }, }, }, &actionExpr{ - pos: position{line: 1665, col: 5, offset: 39753}, + pos: position{line: 1649, col: 5, offset: 39477}, run: (*parser).callonDoubleQuotedChar9, expr: &seqExpr{ - pos: position{line: 1665, col: 5, offset: 39753}, + pos: position{line: 1649, col: 5, offset: 39477}, exprs: []any{ &litMatcher{ - pos: position{line: 1665, col: 5, offset: 39753}, + pos: position{line: 1649, col: 5, offset: 39477}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1665, col: 10, offset: 39758}, + pos: position{line: 1649, col: 10, offset: 39482}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1665, col: 12, offset: 39760}, + pos: position{line: 1649, col: 12, offset: 39484}, + name: "EscapeSequence", + }, + }, + }, + }, + }, + }, + }, + leader: false, + leftRecursive: false, + }, + { + name: "BacktickString", + pos: position{line: 1651, col: 1, offset: 39518}, + expr: &actionExpr{ + pos: position{line: 1652, col: 5, offset: 39537}, + run: (*parser).callonBacktickString1, + expr: &seqExpr{ + pos: position{line: 1652, col: 5, offset: 39537}, + exprs: []any{ + &litMatcher{ + pos: position{line: 1652, col: 5, offset: 39537}, + val: "`", + ignoreCase: false, + want: "\"`\"", + }, + &labeledExpr{ + pos: position{line: 1652, col: 9, offset: 39541}, + label: "v", + expr: &zeroOrMoreExpr{ + pos: position{line: 1652, col: 11, offset: 39543}, + expr: &ruleRefExpr{ + pos: position{line: 1652, col: 11, offset: 39543}, + name: "BacktickChar", + }, + }, + }, + &litMatcher{ + pos: position{line: 1652, col: 25, offset: 39557}, + val: "`", + ignoreCase: false, + want: "\"`\"", + }, + }, + }, + }, + leader: false, + leftRecursive: false, + }, + { + name: "BacktickChar", + pos: position{line: 1654, col: 1, offset: 39591}, + expr: &choiceExpr{ + pos: position{line: 1655, col: 5, offset: 39608}, + alternatives: []any{ + &actionExpr{ + pos: position{line: 1655, col: 5, offset: 39608}, + run: (*parser).callonBacktickChar2, + expr: &seqExpr{ + pos: position{line: 1655, col: 5, offset: 39608}, + exprs: []any{ + ¬Expr{ + pos: position{line: 1655, col: 5, offset: 39608}, + expr: &choiceExpr{ + pos: position{line: 1655, col: 7, offset: 39610}, + alternatives: []any{ + &litMatcher{ + pos: position{line: 1655, col: 7, offset: 39610}, + val: "`", + ignoreCase: false, + want: "\"`\"", + }, + &ruleRefExpr{ + pos: position{line: 1655, col: 13, offset: 39616}, + name: "EscapedChar", + }, + }, + }, + }, + &anyMatcher{ + line: 1655, col: 26, offset: 39629, + }, + }, + }, + }, + &actionExpr{ + pos: position{line: 1656, col: 5, offset: 39666}, + run: (*parser).callonBacktickChar9, + expr: &seqExpr{ + pos: position{line: 1656, col: 5, offset: 39666}, + exprs: []any{ + &litMatcher{ + pos: position{line: 1656, col: 5, offset: 39666}, + val: "\\", + ignoreCase: false, + want: "\"\\\\\"", + }, + &labeledExpr{ + pos: position{line: 1656, col: 10, offset: 39671}, + label: "s", + expr: &ruleRefExpr{ + pos: position{line: 1656, col: 12, offset: 39673}, name: "EscapeSequence", }, }, @@ -11826,28 +11948,28 @@ var g = &grammar{ }, { name: "KeyWord", - pos: position{line: 1667, col: 1, offset: 39794}, + pos: position{line: 1658, col: 1, offset: 39707}, expr: &actionExpr{ - pos: position{line: 1668, col: 5, offset: 39806}, + pos: position{line: 1659, col: 5, offset: 39719}, run: (*parser).callonKeyWord1, expr: &seqExpr{ - pos: position{line: 1668, col: 5, offset: 39806}, + pos: position{line: 1659, col: 5, offset: 39719}, exprs: []any{ &labeledExpr{ - pos: position{line: 1668, col: 5, offset: 39806}, + pos: position{line: 1659, col: 5, offset: 39719}, label: "head", expr: &ruleRefExpr{ - pos: position{line: 1668, col: 10, offset: 39811}, + pos: position{line: 1659, col: 10, offset: 39724}, name: "KeyWordStart", }, }, &labeledExpr{ - pos: position{line: 1668, col: 23, offset: 39824}, + pos: position{line: 1659, col: 23, offset: 39737}, label: "tail", expr: &zeroOrMoreExpr{ - pos: position{line: 1668, col: 28, offset: 39829}, + pos: position{line: 1659, col: 28, offset: 39742}, expr: &ruleRefExpr{ - pos: position{line: 1668, col: 28, offset: 39829}, + pos: position{line: 1659, col: 28, offset: 39742}, name: "KeyWordRest", }, }, @@ -11860,16 +11982,16 @@ var g = &grammar{ }, { name: "KeyWordStart", - pos: position{line: 1670, col: 1, offset: 39891}, + pos: position{line: 1661, col: 1, offset: 39804}, expr: &choiceExpr{ - pos: position{line: 1671, col: 5, offset: 39908}, + pos: position{line: 1662, col: 5, offset: 39821}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1671, col: 5, offset: 39908}, + pos: position{line: 1662, col: 5, offset: 39821}, name: "KeyWordChars", }, &ruleRefExpr{ - pos: position{line: 1672, col: 5, offset: 39925}, + pos: position{line: 1663, col: 5, offset: 39838}, name: "KeyWordEsc", }, }, @@ -11879,16 +12001,16 @@ var g = &grammar{ }, { name: "KeyWordRest", - pos: position{line: 1674, col: 1, offset: 39937}, + pos: position{line: 1665, col: 1, offset: 39850}, expr: &choiceExpr{ - pos: position{line: 1675, col: 5, offset: 39953}, + pos: position{line: 1666, col: 5, offset: 39866}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1675, col: 5, offset: 39953}, + pos: position{line: 1666, col: 5, offset: 39866}, name: "KeyWordStart", }, &charClassMatcher{ - pos: position{line: 1676, col: 5, offset: 39970}, + pos: position{line: 1667, col: 5, offset: 39883}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11901,19 +12023,19 @@ var g = &grammar{ }, { name: "KeyWordChars", - pos: position{line: 1678, col: 1, offset: 39977}, + pos: position{line: 1669, col: 1, offset: 39890}, expr: &actionExpr{ - pos: position{line: 1678, col: 16, offset: 39992}, + pos: position{line: 1669, col: 16, offset: 39905}, run: (*parser).callonKeyWordChars1, expr: &choiceExpr{ - pos: position{line: 1678, col: 17, offset: 39993}, + pos: position{line: 1669, col: 17, offset: 39906}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1678, col: 17, offset: 39993}, + pos: position{line: 1669, col: 17, offset: 39906}, name: "UnicodeLetter", }, &charClassMatcher{ - pos: position{line: 1678, col: 33, offset: 40009}, + pos: position{line: 1669, col: 33, offset: 39922}, val: "[_.:/%#@~]", chars: []rune{'_', '.', ':', '/', '%', '#', '@', '~'}, ignoreCase: false, @@ -11927,31 +12049,31 @@ var g = &grammar{ }, { name: "KeyWordEsc", - pos: position{line: 1680, col: 1, offset: 40053}, + pos: position{line: 1671, col: 1, offset: 39966}, expr: &actionExpr{ - pos: position{line: 1680, col: 14, offset: 40066}, + pos: position{line: 1671, col: 14, offset: 39979}, run: (*parser).callonKeyWordEsc1, expr: &seqExpr{ - pos: position{line: 1680, col: 14, offset: 40066}, + pos: position{line: 1671, col: 14, offset: 39979}, exprs: []any{ &litMatcher{ - pos: position{line: 1680, col: 14, offset: 40066}, + pos: position{line: 1671, col: 14, offset: 39979}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1680, col: 19, offset: 40071}, + pos: position{line: 1671, col: 19, offset: 39984}, label: "s", expr: &choiceExpr{ - pos: position{line: 1680, col: 22, offset: 40074}, + pos: position{line: 1671, col: 22, offset: 39987}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1680, col: 22, offset: 40074}, + pos: position{line: 1671, col: 22, offset: 39987}, name: "KeywordEscape", }, &ruleRefExpr{ - pos: position{line: 1680, col: 38, offset: 40090}, + pos: position{line: 1671, col: 38, offset: 40003}, name: "EscapeSequence", }, }, @@ -11965,42 +12087,42 @@ var g = &grammar{ }, { name: "GlobPattern", - pos: position{line: 1682, col: 1, offset: 40125}, + pos: position{line: 1673, col: 1, offset: 40038}, expr: &actionExpr{ - pos: position{line: 1683, col: 5, offset: 40141}, + pos: position{line: 1674, col: 5, offset: 40054}, run: (*parser).callonGlobPattern1, expr: &seqExpr{ - pos: position{line: 1683, col: 5, offset: 40141}, + pos: position{line: 1674, col: 5, offset: 40054}, exprs: []any{ &andExpr{ - pos: position{line: 1683, col: 5, offset: 40141}, + pos: position{line: 1674, col: 5, offset: 40054}, expr: &ruleRefExpr{ - pos: position{line: 1683, col: 6, offset: 40142}, + pos: position{line: 1674, col: 6, offset: 40055}, name: "GlobProperStart", }, }, &andExpr{ - pos: position{line: 1683, col: 22, offset: 40158}, + pos: position{line: 1674, col: 22, offset: 40071}, expr: &ruleRefExpr{ - pos: position{line: 1683, col: 23, offset: 40159}, + pos: position{line: 1674, col: 23, offset: 40072}, name: "GlobHasStar", }, }, &labeledExpr{ - pos: position{line: 1683, col: 35, offset: 40171}, + pos: position{line: 1674, col: 35, offset: 40084}, label: "head", expr: &ruleRefExpr{ - pos: position{line: 1683, col: 40, offset: 40176}, + pos: position{line: 1674, col: 40, offset: 40089}, name: "GlobStart", }, }, &labeledExpr{ - pos: position{line: 1683, col: 50, offset: 40186}, + pos: position{line: 1674, col: 50, offset: 40099}, label: "tail", expr: &zeroOrMoreExpr{ - pos: position{line: 1683, col: 55, offset: 40191}, + pos: position{line: 1674, col: 55, offset: 40104}, expr: &ruleRefExpr{ - pos: position{line: 1683, col: 55, offset: 40191}, + pos: position{line: 1674, col: 55, offset: 40104}, name: "GlobRest", }, }, @@ -12013,28 +12135,28 @@ var g = &grammar{ }, { name: "GlobProperStart", - pos: position{line: 1687, col: 1, offset: 40260}, + pos: position{line: 1678, col: 1, offset: 40173}, expr: &choiceExpr{ - pos: position{line: 1687, col: 19, offset: 40278}, + pos: position{line: 1678, col: 19, offset: 40191}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1687, col: 19, offset: 40278}, + pos: position{line: 1678, col: 19, offset: 40191}, name: "KeyWordStart", }, &seqExpr{ - pos: position{line: 1687, col: 34, offset: 40293}, + pos: position{line: 1678, col: 34, offset: 40206}, exprs: []any{ &oneOrMoreExpr{ - pos: position{line: 1687, col: 34, offset: 40293}, + pos: position{line: 1678, col: 34, offset: 40206}, expr: &litMatcher{ - pos: position{line: 1687, col: 34, offset: 40293}, + pos: position{line: 1678, col: 34, offset: 40206}, val: "*", ignoreCase: false, want: "\"*\"", }, }, &ruleRefExpr{ - pos: position{line: 1687, col: 39, offset: 40298}, + pos: position{line: 1678, col: 39, offset: 40211}, name: "KeyWordRest", }, }, @@ -12046,19 +12168,19 @@ var g = &grammar{ }, { name: "GlobHasStar", - pos: position{line: 1688, col: 1, offset: 40310}, + pos: position{line: 1679, col: 1, offset: 40223}, expr: &seqExpr{ - pos: position{line: 1688, col: 15, offset: 40324}, + pos: position{line: 1679, col: 15, offset: 40237}, exprs: []any{ &zeroOrMoreExpr{ - pos: position{line: 1688, col: 15, offset: 40324}, + pos: position{line: 1679, col: 15, offset: 40237}, expr: &ruleRefExpr{ - pos: position{line: 1688, col: 15, offset: 40324}, + pos: position{line: 1679, col: 15, offset: 40237}, name: "KeyWordRest", }, }, &litMatcher{ - pos: position{line: 1688, col: 28, offset: 40337}, + pos: position{line: 1679, col: 28, offset: 40250}, val: "*", ignoreCase: false, want: "\"*\"", @@ -12070,23 +12192,23 @@ var g = &grammar{ }, { name: "GlobStart", - pos: position{line: 1690, col: 1, offset: 40342}, + pos: position{line: 1681, col: 1, offset: 40255}, expr: &choiceExpr{ - pos: position{line: 1691, col: 5, offset: 40356}, + pos: position{line: 1682, col: 5, offset: 40269}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1691, col: 5, offset: 40356}, + pos: position{line: 1682, col: 5, offset: 40269}, name: "KeyWordChars", }, &ruleRefExpr{ - pos: position{line: 1692, col: 5, offset: 40373}, + pos: position{line: 1683, col: 5, offset: 40286}, name: "GlobEsc", }, &actionExpr{ - pos: position{line: 1693, col: 5, offset: 40385}, + pos: position{line: 1684, col: 5, offset: 40298}, run: (*parser).callonGlobStart4, expr: &litMatcher{ - pos: position{line: 1693, col: 5, offset: 40385}, + pos: position{line: 1684, col: 5, offset: 40298}, val: "*", ignoreCase: false, want: "\"*\"", @@ -12099,16 +12221,16 @@ var g = &grammar{ }, { name: "GlobRest", - pos: position{line: 1695, col: 1, offset: 40410}, + pos: position{line: 1686, col: 1, offset: 40323}, expr: &choiceExpr{ - pos: position{line: 1696, col: 5, offset: 40423}, + pos: position{line: 1687, col: 5, offset: 40336}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1696, col: 5, offset: 40423}, + pos: position{line: 1687, col: 5, offset: 40336}, name: "GlobStart", }, &charClassMatcher{ - pos: position{line: 1697, col: 5, offset: 40437}, + pos: position{line: 1688, col: 5, offset: 40350}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -12121,31 +12243,31 @@ var g = &grammar{ }, { name: "GlobEsc", - pos: position{line: 1699, col: 1, offset: 40444}, + pos: position{line: 1690, col: 1, offset: 40357}, expr: &actionExpr{ - pos: position{line: 1699, col: 11, offset: 40454}, + pos: position{line: 1690, col: 11, offset: 40367}, run: (*parser).callonGlobEsc1, expr: &seqExpr{ - pos: position{line: 1699, col: 11, offset: 40454}, + pos: position{line: 1690, col: 11, offset: 40367}, exprs: []any{ &litMatcher{ - pos: position{line: 1699, col: 11, offset: 40454}, + pos: position{line: 1690, col: 11, offset: 40367}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1699, col: 16, offset: 40459}, + pos: position{line: 1690, col: 16, offset: 40372}, label: "s", expr: &choiceExpr{ - pos: position{line: 1699, col: 19, offset: 40462}, + pos: position{line: 1690, col: 19, offset: 40375}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1699, col: 19, offset: 40462}, + pos: position{line: 1690, col: 19, offset: 40375}, name: "GlobEscape", }, &ruleRefExpr{ - pos: position{line: 1699, col: 32, offset: 40475}, + pos: position{line: 1690, col: 32, offset: 40388}, name: "EscapeSequence", }, }, @@ -12159,32 +12281,32 @@ var g = &grammar{ }, { name: "GlobEscape", - pos: position{line: 1701, col: 1, offset: 40510}, + pos: position{line: 1692, col: 1, offset: 40423}, expr: &choiceExpr{ - pos: position{line: 1702, col: 5, offset: 40525}, + pos: position{line: 1693, col: 5, offset: 40438}, alternatives: []any{ &actionExpr{ - pos: position{line: 1702, col: 5, offset: 40525}, + pos: position{line: 1693, col: 5, offset: 40438}, run: (*parser).callonGlobEscape2, expr: &litMatcher{ - pos: position{line: 1702, col: 5, offset: 40525}, + pos: position{line: 1693, col: 5, offset: 40438}, val: "=", ignoreCase: false, want: "\"=\"", }, }, &actionExpr{ - pos: position{line: 1703, col: 5, offset: 40553}, + pos: position{line: 1694, col: 5, offset: 40466}, run: (*parser).callonGlobEscape4, expr: &litMatcher{ - pos: position{line: 1703, col: 5, offset: 40553}, + pos: position{line: 1694, col: 5, offset: 40466}, val: "*", ignoreCase: false, want: "\"*\"", }, }, &charClassMatcher{ - pos: position{line: 1704, col: 5, offset: 40583}, + pos: position{line: 1695, col: 5, offset: 40496}, val: "[+-]", chars: []rune{'+', '-'}, ignoreCase: false, @@ -12197,57 +12319,57 @@ var g = &grammar{ }, { name: "SingleQuotedChar", - pos: position{line: 1706, col: 1, offset: 40589}, + pos: position{line: 1697, col: 1, offset: 40502}, expr: &choiceExpr{ - pos: position{line: 1707, col: 5, offset: 40610}, + pos: position{line: 1698, col: 5, offset: 40523}, alternatives: []any{ &actionExpr{ - pos: position{line: 1707, col: 5, offset: 40610}, + pos: position{line: 1698, col: 5, offset: 40523}, run: (*parser).callonSingleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1707, col: 5, offset: 40610}, + pos: position{line: 1698, col: 5, offset: 40523}, exprs: []any{ ¬Expr{ - pos: position{line: 1707, col: 5, offset: 40610}, + pos: position{line: 1698, col: 5, offset: 40523}, expr: &choiceExpr{ - pos: position{line: 1707, col: 7, offset: 40612}, + pos: position{line: 1698, col: 7, offset: 40525}, alternatives: []any{ &litMatcher{ - pos: position{line: 1707, col: 7, offset: 40612}, + pos: position{line: 1698, col: 7, offset: 40525}, val: "'", ignoreCase: false, want: "\"'\"", }, &ruleRefExpr{ - pos: position{line: 1707, col: 13, offset: 40618}, + pos: position{line: 1698, col: 13, offset: 40531}, name: "EscapedChar", }, }, }, }, &anyMatcher{ - line: 1707, col: 26, offset: 40631, + line: 1698, col: 26, offset: 40544, }, }, }, }, &actionExpr{ - pos: position{line: 1708, col: 5, offset: 40668}, + pos: position{line: 1699, col: 5, offset: 40581}, run: (*parser).callonSingleQuotedChar9, expr: &seqExpr{ - pos: position{line: 1708, col: 5, offset: 40668}, + pos: position{line: 1699, col: 5, offset: 40581}, exprs: []any{ &litMatcher{ - pos: position{line: 1708, col: 5, offset: 40668}, + pos: position{line: 1699, col: 5, offset: 40581}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1708, col: 10, offset: 40673}, + pos: position{line: 1699, col: 10, offset: 40586}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1708, col: 12, offset: 40675}, + pos: position{line: 1699, col: 12, offset: 40588}, name: "EscapeSequence", }, }, @@ -12261,16 +12383,16 @@ var g = &grammar{ }, { name: "EscapeSequence", - pos: position{line: 1710, col: 1, offset: 40709}, + pos: position{line: 1701, col: 1, offset: 40622}, expr: &choiceExpr{ - pos: position{line: 1711, col: 5, offset: 40728}, + pos: position{line: 1702, col: 5, offset: 40641}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1711, col: 5, offset: 40728}, + pos: position{line: 1702, col: 5, offset: 40641}, name: "SingleCharEscape", }, &ruleRefExpr{ - pos: position{line: 1712, col: 5, offset: 40749}, + pos: position{line: 1703, col: 5, offset: 40662}, name: "UnicodeEscape", }, }, @@ -12280,87 +12402,87 @@ var g = &grammar{ }, { name: "SingleCharEscape", - pos: position{line: 1714, col: 1, offset: 40764}, + pos: position{line: 1705, col: 1, offset: 40677}, expr: &choiceExpr{ - pos: position{line: 1715, col: 5, offset: 40785}, + pos: position{line: 1706, col: 5, offset: 40698}, alternatives: []any{ &litMatcher{ - pos: position{line: 1715, col: 5, offset: 40785}, + pos: position{line: 1706, col: 5, offset: 40698}, val: "'", ignoreCase: false, want: "\"'\"", }, &actionExpr{ - pos: position{line: 1716, col: 5, offset: 40793}, + pos: position{line: 1707, col: 5, offset: 40706}, run: (*parser).callonSingleCharEscape3, expr: &litMatcher{ - pos: position{line: 1716, col: 5, offset: 40793}, + pos: position{line: 1707, col: 5, offset: 40706}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, }, &litMatcher{ - pos: position{line: 1717, col: 5, offset: 40833}, + pos: position{line: 1708, col: 5, offset: 40746}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &actionExpr{ - pos: position{line: 1718, col: 5, offset: 40842}, + pos: position{line: 1709, col: 5, offset: 40755}, run: (*parser).callonSingleCharEscape6, expr: &litMatcher{ - pos: position{line: 1718, col: 5, offset: 40842}, + pos: position{line: 1709, col: 5, offset: 40755}, val: "b", ignoreCase: false, want: "\"b\"", }, }, &actionExpr{ - pos: position{line: 1719, col: 5, offset: 40871}, + pos: position{line: 1710, col: 5, offset: 40784}, run: (*parser).callonSingleCharEscape8, expr: &litMatcher{ - pos: position{line: 1719, col: 5, offset: 40871}, + pos: position{line: 1710, col: 5, offset: 40784}, val: "f", ignoreCase: false, want: "\"f\"", }, }, &actionExpr{ - pos: position{line: 1720, col: 5, offset: 40900}, + pos: position{line: 1711, col: 5, offset: 40813}, run: (*parser).callonSingleCharEscape10, expr: &litMatcher{ - pos: position{line: 1720, col: 5, offset: 40900}, + pos: position{line: 1711, col: 5, offset: 40813}, val: "n", ignoreCase: false, want: "\"n\"", }, }, &actionExpr{ - pos: position{line: 1721, col: 5, offset: 40929}, + pos: position{line: 1712, col: 5, offset: 40842}, run: (*parser).callonSingleCharEscape12, expr: &litMatcher{ - pos: position{line: 1721, col: 5, offset: 40929}, + pos: position{line: 1712, col: 5, offset: 40842}, val: "r", ignoreCase: false, want: "\"r\"", }, }, &actionExpr{ - pos: position{line: 1722, col: 5, offset: 40958}, + pos: position{line: 1713, col: 5, offset: 40871}, run: (*parser).callonSingleCharEscape14, expr: &litMatcher{ - pos: position{line: 1722, col: 5, offset: 40958}, + pos: position{line: 1713, col: 5, offset: 40871}, val: "t", ignoreCase: false, want: "\"t\"", }, }, &actionExpr{ - pos: position{line: 1723, col: 5, offset: 40987}, + pos: position{line: 1714, col: 5, offset: 40900}, run: (*parser).callonSingleCharEscape16, expr: &litMatcher{ - pos: position{line: 1723, col: 5, offset: 40987}, + pos: position{line: 1714, col: 5, offset: 40900}, val: "v", ignoreCase: false, want: "\"v\"", @@ -12373,32 +12495,32 @@ var g = &grammar{ }, { name: "KeywordEscape", - pos: position{line: 1725, col: 1, offset: 41013}, + pos: position{line: 1716, col: 1, offset: 40926}, expr: &choiceExpr{ - pos: position{line: 1726, col: 5, offset: 41031}, + pos: position{line: 1717, col: 5, offset: 40944}, alternatives: []any{ &actionExpr{ - pos: position{line: 1726, col: 5, offset: 41031}, + pos: position{line: 1717, col: 5, offset: 40944}, run: (*parser).callonKeywordEscape2, expr: &litMatcher{ - pos: position{line: 1726, col: 5, offset: 41031}, + pos: position{line: 1717, col: 5, offset: 40944}, val: "=", ignoreCase: false, want: "\"=\"", }, }, &actionExpr{ - pos: position{line: 1727, col: 5, offset: 41059}, + pos: position{line: 1718, col: 5, offset: 40972}, run: (*parser).callonKeywordEscape4, expr: &litMatcher{ - pos: position{line: 1727, col: 5, offset: 41059}, + pos: position{line: 1718, col: 5, offset: 40972}, val: "*", ignoreCase: false, want: "\"*\"", }, }, &charClassMatcher{ - pos: position{line: 1728, col: 5, offset: 41087}, + pos: position{line: 1719, col: 5, offset: 41000}, val: "[+-]", chars: []rune{'+', '-'}, ignoreCase: false, @@ -12411,42 +12533,42 @@ var g = &grammar{ }, { name: "UnicodeEscape", - pos: position{line: 1730, col: 1, offset: 41093}, + pos: position{line: 1721, col: 1, offset: 41006}, expr: &choiceExpr{ - pos: position{line: 1731, col: 5, offset: 41111}, + pos: position{line: 1722, col: 5, offset: 41024}, alternatives: []any{ &actionExpr{ - pos: position{line: 1731, col: 5, offset: 41111}, + pos: position{line: 1722, col: 5, offset: 41024}, run: (*parser).callonUnicodeEscape2, expr: &seqExpr{ - pos: position{line: 1731, col: 5, offset: 41111}, + pos: position{line: 1722, col: 5, offset: 41024}, exprs: []any{ &litMatcher{ - pos: position{line: 1731, col: 5, offset: 41111}, + pos: position{line: 1722, col: 5, offset: 41024}, val: "u", ignoreCase: false, want: "\"u\"", }, &labeledExpr{ - pos: position{line: 1731, col: 9, offset: 41115}, + pos: position{line: 1722, col: 9, offset: 41028}, label: "chars", expr: &seqExpr{ - pos: position{line: 1731, col: 16, offset: 41122}, + pos: position{line: 1722, col: 16, offset: 41035}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1731, col: 16, offset: 41122}, + pos: position{line: 1722, col: 16, offset: 41035}, name: "HexDigit", }, &ruleRefExpr{ - pos: position{line: 1731, col: 25, offset: 41131}, + pos: position{line: 1722, col: 25, offset: 41044}, name: "HexDigit", }, &ruleRefExpr{ - pos: position{line: 1731, col: 34, offset: 41140}, + pos: position{line: 1722, col: 34, offset: 41053}, name: "HexDigit", }, &ruleRefExpr{ - pos: position{line: 1731, col: 43, offset: 41149}, + pos: position{line: 1722, col: 43, offset: 41062}, name: "HexDigit", }, }, @@ -12456,65 +12578,65 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1734, col: 5, offset: 41212}, + pos: position{line: 1725, col: 5, offset: 41125}, run: (*parser).callonUnicodeEscape11, expr: &seqExpr{ - pos: position{line: 1734, col: 5, offset: 41212}, + pos: position{line: 1725, col: 5, offset: 41125}, exprs: []any{ &litMatcher{ - pos: position{line: 1734, col: 5, offset: 41212}, + pos: position{line: 1725, col: 5, offset: 41125}, val: "u", ignoreCase: false, want: "\"u\"", }, &litMatcher{ - pos: position{line: 1734, col: 9, offset: 41216}, + pos: position{line: 1725, col: 9, offset: 41129}, val: "{", ignoreCase: false, want: "\"{\"", }, &labeledExpr{ - pos: position{line: 1734, col: 13, offset: 41220}, + pos: position{line: 1725, col: 13, offset: 41133}, label: "chars", expr: &seqExpr{ - pos: position{line: 1734, col: 20, offset: 41227}, + pos: position{line: 1725, col: 20, offset: 41140}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1734, col: 20, offset: 41227}, + pos: position{line: 1725, col: 20, offset: 41140}, name: "HexDigit", }, &zeroOrOneExpr{ - pos: position{line: 1734, col: 29, offset: 41236}, + pos: position{line: 1725, col: 29, offset: 41149}, expr: &ruleRefExpr{ - pos: position{line: 1734, col: 29, offset: 41236}, + pos: position{line: 1725, col: 29, offset: 41149}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1734, col: 39, offset: 41246}, + pos: position{line: 1725, col: 39, offset: 41159}, expr: &ruleRefExpr{ - pos: position{line: 1734, col: 39, offset: 41246}, + pos: position{line: 1725, col: 39, offset: 41159}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1734, col: 49, offset: 41256}, + pos: position{line: 1725, col: 49, offset: 41169}, expr: &ruleRefExpr{ - pos: position{line: 1734, col: 49, offset: 41256}, + pos: position{line: 1725, col: 49, offset: 41169}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1734, col: 59, offset: 41266}, + pos: position{line: 1725, col: 59, offset: 41179}, expr: &ruleRefExpr{ - pos: position{line: 1734, col: 59, offset: 41266}, + pos: position{line: 1725, col: 59, offset: 41179}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1734, col: 69, offset: 41276}, + pos: position{line: 1725, col: 69, offset: 41189}, expr: &ruleRefExpr{ - pos: position{line: 1734, col: 69, offset: 41276}, + pos: position{line: 1725, col: 69, offset: 41189}, name: "HexDigit", }, }, @@ -12522,7 +12644,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1734, col: 80, offset: 41287}, + pos: position{line: 1725, col: 80, offset: 41200}, val: "}", ignoreCase: false, want: "\"}\"", @@ -12537,37 +12659,37 @@ var g = &grammar{ }, { name: "RegexpPattern", - pos: position{line: 1738, col: 1, offset: 41341}, + pos: position{line: 1729, col: 1, offset: 41254}, expr: &actionExpr{ - pos: position{line: 1739, col: 5, offset: 41359}, + pos: position{line: 1730, col: 5, offset: 41272}, run: (*parser).callonRegexpPattern1, expr: &seqExpr{ - pos: position{line: 1739, col: 5, offset: 41359}, + pos: position{line: 1730, col: 5, offset: 41272}, exprs: []any{ &litMatcher{ - pos: position{line: 1739, col: 5, offset: 41359}, + pos: position{line: 1730, col: 5, offset: 41272}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 1739, col: 9, offset: 41363}, + pos: position{line: 1730, col: 9, offset: 41276}, label: "body", expr: &ruleRefExpr{ - pos: position{line: 1739, col: 14, offset: 41368}, + pos: position{line: 1730, col: 14, offset: 41281}, name: "RegexpBody", }, }, &litMatcher{ - pos: position{line: 1739, col: 25, offset: 41379}, + pos: position{line: 1730, col: 25, offset: 41292}, val: "/", ignoreCase: false, want: "\"/\"", }, ¬Expr{ - pos: position{line: 1739, col: 29, offset: 41383}, + pos: position{line: 1730, col: 29, offset: 41296}, expr: &ruleRefExpr{ - pos: position{line: 1739, col: 30, offset: 41384}, + pos: position{line: 1730, col: 30, offset: 41297}, name: "KeyWordStart", }, }, @@ -12579,33 +12701,33 @@ var g = &grammar{ }, { name: "RegexpBody", - pos: position{line: 1741, col: 1, offset: 41419}, + pos: position{line: 1732, col: 1, offset: 41332}, expr: &actionExpr{ - pos: position{line: 1742, col: 5, offset: 41434}, + pos: position{line: 1733, col: 5, offset: 41347}, run: (*parser).callonRegexpBody1, expr: &oneOrMoreExpr{ - pos: position{line: 1742, col: 5, offset: 41434}, + pos: position{line: 1733, col: 5, offset: 41347}, expr: &choiceExpr{ - pos: position{line: 1742, col: 6, offset: 41435}, + pos: position{line: 1733, col: 6, offset: 41348}, alternatives: []any{ &charClassMatcher{ - pos: position{line: 1742, col: 6, offset: 41435}, + pos: position{line: 1733, col: 6, offset: 41348}, val: "[^/\\\\]", chars: []rune{'/', '\\'}, ignoreCase: false, inverted: true, }, &seqExpr{ - pos: position{line: 1742, col: 15, offset: 41444}, + pos: position{line: 1733, col: 15, offset: 41357}, exprs: []any{ &litMatcher{ - pos: position{line: 1742, col: 15, offset: 41444}, + pos: position{line: 1733, col: 15, offset: 41357}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &anyMatcher{ - line: 1742, col: 20, offset: 41449, + line: 1733, col: 20, offset: 41362, }, }, }, @@ -12618,9 +12740,9 @@ var g = &grammar{ }, { name: "EscapedChar", - pos: position{line: 1744, col: 1, offset: 41485}, + pos: position{line: 1735, col: 1, offset: 41398}, expr: &charClassMatcher{ - pos: position{line: 1745, col: 5, offset: 41501}, + pos: position{line: 1736, col: 5, offset: 41414}, val: "[\\x00-\\x1f\\\\]", chars: []rune{'\\'}, ranges: []rune{'\x00', '\x1f'}, @@ -12632,11 +12754,11 @@ var g = &grammar{ }, { name: "_", - pos: position{line: 1747, col: 1, offset: 41516}, + pos: position{line: 1738, col: 1, offset: 41429}, expr: &oneOrMoreExpr{ - pos: position{line: 1747, col: 5, offset: 41520}, + pos: position{line: 1738, col: 5, offset: 41433}, expr: &ruleRefExpr{ - pos: position{line: 1747, col: 5, offset: 41520}, + pos: position{line: 1738, col: 5, offset: 41433}, name: "AnySpace", }, }, @@ -12645,11 +12767,11 @@ var g = &grammar{ }, { name: "__", - pos: position{line: 1749, col: 1, offset: 41531}, + pos: position{line: 1740, col: 1, offset: 41444}, expr: &zeroOrMoreExpr{ - pos: position{line: 1749, col: 6, offset: 41536}, + pos: position{line: 1740, col: 6, offset: 41449}, expr: &ruleRefExpr{ - pos: position{line: 1749, col: 6, offset: 41536}, + pos: position{line: 1740, col: 6, offset: 41449}, name: "AnySpace", }, }, @@ -12658,20 +12780,20 @@ var g = &grammar{ }, { name: "AnySpace", - pos: position{line: 1751, col: 1, offset: 41547}, + pos: position{line: 1742, col: 1, offset: 41460}, expr: &choiceExpr{ - pos: position{line: 1752, col: 5, offset: 41560}, + pos: position{line: 1743, col: 5, offset: 41473}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1752, col: 5, offset: 41560}, + pos: position{line: 1743, col: 5, offset: 41473}, name: "WhiteSpace", }, &ruleRefExpr{ - pos: position{line: 1753, col: 5, offset: 41575}, + pos: position{line: 1744, col: 5, offset: 41488}, name: "LineTerminator", }, &ruleRefExpr{ - pos: position{line: 1754, col: 5, offset: 41594}, + pos: position{line: 1745, col: 5, offset: 41507}, name: "Comment", }, }, @@ -12681,32 +12803,32 @@ var g = &grammar{ }, { name: "UnicodeLetter", - pos: position{line: 1756, col: 1, offset: 41603}, + pos: position{line: 1747, col: 1, offset: 41516}, expr: &choiceExpr{ - pos: position{line: 1757, col: 5, offset: 41621}, + pos: position{line: 1748, col: 5, offset: 41534}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1757, col: 5, offset: 41621}, + pos: position{line: 1748, col: 5, offset: 41534}, name: "Lu", }, &ruleRefExpr{ - pos: position{line: 1758, col: 5, offset: 41628}, + pos: position{line: 1749, col: 5, offset: 41541}, name: "Ll", }, &ruleRefExpr{ - pos: position{line: 1759, col: 5, offset: 41635}, + pos: position{line: 1750, col: 5, offset: 41548}, name: "Lt", }, &ruleRefExpr{ - pos: position{line: 1760, col: 5, offset: 41642}, + pos: position{line: 1751, col: 5, offset: 41555}, name: "Lm", }, &ruleRefExpr{ - pos: position{line: 1761, col: 5, offset: 41649}, + pos: position{line: 1752, col: 5, offset: 41562}, name: "Lo", }, &ruleRefExpr{ - pos: position{line: 1762, col: 5, offset: 41656}, + pos: position{line: 1753, col: 5, offset: 41569}, name: "Nl", }, }, @@ -12716,16 +12838,16 @@ var g = &grammar{ }, { name: "UnicodeCombiningMark", - pos: position{line: 1764, col: 1, offset: 41660}, + pos: position{line: 1755, col: 1, offset: 41573}, expr: &choiceExpr{ - pos: position{line: 1765, col: 5, offset: 41685}, + pos: position{line: 1756, col: 5, offset: 41598}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1765, col: 5, offset: 41685}, + pos: position{line: 1756, col: 5, offset: 41598}, name: "Mn", }, &ruleRefExpr{ - pos: position{line: 1766, col: 5, offset: 41692}, + pos: position{line: 1757, col: 5, offset: 41605}, name: "Mc", }, }, @@ -12735,9 +12857,9 @@ var g = &grammar{ }, { name: "UnicodeDigit", - pos: position{line: 1768, col: 1, offset: 41696}, + pos: position{line: 1759, col: 1, offset: 41609}, expr: &ruleRefExpr{ - pos: position{line: 1769, col: 5, offset: 41713}, + pos: position{line: 1760, col: 5, offset: 41626}, name: "Nd", }, leader: false, @@ -12745,9 +12867,9 @@ var g = &grammar{ }, { name: "UnicodeConnectorPunctuation", - pos: position{line: 1771, col: 1, offset: 41717}, + pos: position{line: 1762, col: 1, offset: 41630}, expr: &ruleRefExpr{ - pos: position{line: 1772, col: 5, offset: 41749}, + pos: position{line: 1763, col: 5, offset: 41662}, name: "Pc", }, leader: false, @@ -12755,9 +12877,9 @@ var g = &grammar{ }, { name: "Ll", - pos: position{line: 1778, col: 1, offset: 41930}, + pos: position{line: 1769, col: 1, offset: 41843}, expr: &charClassMatcher{ - pos: position{line: 1778, col: 6, offset: 41935}, + pos: position{line: 1769, col: 6, offset: 41848}, 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', 'ﬓ', 'ﬗ', 'ａ', 'ｚ'}, @@ -12769,9 +12891,9 @@ var g = &grammar{ }, { name: "Lm", - pos: position{line: 1781, col: 1, offset: 46087}, + pos: position{line: 1772, col: 1, offset: 46000}, expr: &charClassMatcher{ - pos: position{line: 1781, col: 6, offset: 46092}, + pos: position{line: 1772, col: 6, offset: 46005}, 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{'ʰ', 'ˁ', 'ˆ', 'ˑ', 'ˠ', 'ˤ', 'ۥ', 'ۦ', 'ߴ', 'ߵ', 'ᱸ', 'ᱽ', 'ᴬ', 'ᵪ', 'ᶛ', 'ᶿ', 'ₐ', 'ₜ', 'ⱼ', 'ⱽ', '〱', '〵', 'ゝ', 'ゞ', 'ー', 'ヾ', 'ꓸ', 'ꓽ', 'ꚜ', 'ꚝ', 'ꜗ', 'ꜟ', 'ꟸ', 'ꟹ', 'ꫳ', 'ꫴ', 'ꭜ', 'ꭟ', 'ﾞ', 'ﾟ'}, @@ -12783,9 +12905,9 @@ var g = &grammar{ }, { name: "Lo", - pos: position{line: 1784, col: 1, offset: 46577}, + pos: position{line: 1775, col: 1, offset: 46490}, expr: &charClassMatcher{ - pos: position{line: 1784, col: 6, offset: 46582}, + pos: position{line: 1775, col: 6, offset: 46495}, 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{'ǀ', 'ǃ', 'א', 'ת', 'ׯ', 'ײ', 'ؠ', 'ؿ', 'ف', 'ي', 'ٮ', 'ٯ', 'ٱ', 'ۓ', 'ۮ', 'ۯ', 'ۺ', 'ۼ', 'ܒ', 'ܯ', 'ݍ', 'ޥ', 'ߊ', 'ߪ', 'ࠀ', 'ࠕ', 'ࡀ', 'ࡘ', 'ࡠ', 'ࡪ', 'ࢠ', 'ࢴ', 'ࢶ', 'ࢽ', 'ऄ', 'ह', 'क़', 'ॡ', 'ॲ', 'ঀ', 'অ', 'ঌ', 'এ', 'ঐ', 'ও', 'ন', 'প', 'র', 'শ', 'হ', 'ড়', 'ঢ়', 'য়', 'ৡ', 'ৰ', 'ৱ', 'ਅ', 'ਊ', 'ਏ', 'ਐ', 'ਓ', 'ਨ', 'ਪ', 'ਰ', 'ਲ', 'ਲ਼', 'ਵ', 'ਸ਼', 'ਸ', 'ਹ', 'ਖ਼', 'ੜ', 'ੲ', 'ੴ', 'અ', 'ઍ', 'એ', 'ઑ', 'ઓ', 'ન', 'પ', 'ર', 'લ', 'ળ', 'વ', 'હ', 'ૠ', 'ૡ', 'ଅ', 'ଌ', 'ଏ', 'ଐ', 'ଓ', 'ନ', 'ପ', 'ର', 'ଲ', 'ଳ', 'ଵ', 'ହ', 'ଡ଼', 'ଢ଼', 'ୟ', 'ୡ', 'அ', 'ஊ', 'எ', 'ஐ', 'ஒ', 'க', 'ங', 'ச', 'ஞ', 'ட', 'ண', 'த', 'ந', 'ப', 'ம', 'ஹ', 'అ', 'ఌ', 'ఎ', 'ఐ', 'ఒ', 'న', 'ప', 'హ', 'ౘ', 'ౚ', 'ౠ', 'ౡ', 'ಅ', 'ಌ', 'ಎ', 'ಐ', 'ಒ', 'ನ', 'ಪ', 'ಳ', 'ವ', 'ಹ', 'ೠ', 'ೡ', 'ೱ', 'ೲ', 'അ', 'ഌ', 'എ', 'ഐ', 'ഒ', 'ഺ', 'ൔ', 'ൖ', 'ൟ', 'ൡ', 'ൺ', 'ൿ', 'අ', 'ඖ', 'ක', 'න', 'ඳ', 'ර', 'ව', 'ෆ', 'ก', 'ะ', 'า', 'ำ', 'เ', 'ๅ', 'ກ', 'ຂ', 'ງ', 'ຈ', 'ດ', 'ທ', 'ນ', 'ຟ', 'ມ', 'ຣ', 'ສ', 'ຫ', 'ອ', 'ະ', 'າ', 'ຳ', 'ເ', 'ໄ', 'ໜ', 'ໟ', 'ཀ', 'ཇ', 'ཉ', 'ཬ', 'ྈ', 'ྌ', 'က', 'ဪ', 'ၐ', 'ၕ', 'ၚ', 'ၝ', 'ၥ', 'ၦ', 'ၮ', 'ၰ', 'ၵ', 'ႁ', 'ᄀ', 'ቈ', 'ቊ', 'ቍ', 'ቐ', 'ቖ', 'ቚ', 'ቝ', 'በ', 'ኈ', 'ኊ', 'ኍ', 'ነ', 'ኰ', 'ኲ', 'ኵ', 'ኸ', 'ኾ', 'ዂ', 'ዅ', 'ወ', 'ዖ', 'ዘ', 'ጐ', 'ጒ', 'ጕ', 'ጘ', 'ፚ', 'ᎀ', 'ᎏ', 'ᐁ', 'ᙬ', 'ᙯ', 'ᙿ', 'ᚁ', 'ᚚ', 'ᚠ', 'ᛪ', 'ᛱ', 'ᛸ', 'ᜀ', 'ᜌ', 'ᜎ', 'ᜑ', 'ᜠ', 'ᜱ', 'ᝀ', 'ᝑ', 'ᝠ', 'ᝬ', 'ᝮ', 'ᝰ', 'ក', 'ឳ', 'ᠠ', 'ᡂ', 'ᡄ', 'ᡸ', 'ᢀ', 'ᢄ', 'ᢇ', 'ᢨ', 'ᢰ', 'ᣵ', 'ᤀ', 'ᤞ', 'ᥐ', 'ᥭ', 'ᥰ', 'ᥴ', 'ᦀ', 'ᦫ', 'ᦰ', 'ᧉ', 'ᨀ', 'ᨖ', 'ᨠ', 'ᩔ', 'ᬅ', 'ᬳ', 'ᭅ', 'ᭋ', 'ᮃ', 'ᮠ', 'ᮮ', 'ᮯ', 'ᮺ', 'ᯥ', 'ᰀ', 'ᰣ', 'ᱍ', 'ᱏ', 'ᱚ', 'ᱷ', 'ᳩ', 'ᳬ', 'ᳮ', 'ᳱ', 'ᳵ', 'ᳶ', 'ℵ', 'ℸ', 'ⴰ', 'ⵧ', 'ⶀ', 'ⶖ', 'ⶠ', 'ⶦ', 'ⶨ', 'ⶮ', 'ⶰ', 'ⶶ', 'ⶸ', 'ⶾ', 'ⷀ', 'ⷆ', 'ⷈ', 'ⷎ', 'ⷐ', 'ⷖ', 'ⷘ', 'ⷞ', 'ぁ', 'ゖ', 'ァ', 'ヺ', 'ㄅ', 'ㄯ', 'ㄱ', 'ㆎ', 'ㆠ', 'ㆺ', 'ㇰ', 'ㇿ', '㐀', '䶵', '一', '鿯', 'ꀀ', 'ꀔ', 'ꀖ', 'ꒌ', 'ꓐ', 'ꓷ', 'ꔀ', 'ꘋ', 'ꘐ', 'ꘟ', 'ꘪ', 'ꘫ', 'ꚠ', 'ꛥ', 'ꟻ', 'ꠁ', 'ꠃ', 'ꠅ', 'ꠇ', 'ꠊ', 'ꠌ', 'ꠢ', 'ꡀ', 'ꡳ', 'ꢂ', 'ꢳ', 'ꣲ', 'ꣷ', 'ꣽ', 'ꣾ', 'ꤊ', 'ꤥ', 'ꤰ', 'ꥆ', 'ꥠ', 'ꥼ', 'ꦄ', 'ꦲ', 'ꧠ', 'ꧤ', 'ꧧ', 'ꧯ', 'ꧺ', 'ꧾ', 'ꨀ', 'ꨨ', 'ꩀ', 'ꩂ', 'ꩄ', 'ꩋ', 'ꩠ', 'ꩯ', 'ꩱ', 'ꩶ', 'ꩾ', 'ꪯ', 'ꪵ', 'ꪶ', 'ꪹ', 'ꪽ', 'ꫛ', 'ꫜ', 'ꫠ', 'ꫪ', 'ꬁ', 'ꬆ', 'ꬉ', 'ꬎ', 'ꬑ', 'ꬖ', 'ꬠ', 'ꬦ', 'ꬨ', 'ꬮ', 'ꯀ', 'ꯢ', '가', '힣', 'ힰ', 'ퟆ', 'ퟋ', 'ퟻ', '豈', '舘', '並', '龎', 'ײַ', 'ﬨ', 'שׁ', 'זּ', 'טּ', 'לּ', 'נּ', 'סּ', 'ףּ', 'פּ', 'צּ', 'ﮱ', 'ﯓ', 'ﴽ', 'ﵐ', 'ﶏ', 'ﶒ', 'ﷇ', 'ﷰ', 'ﷻ', 'ﹰ', 'ﹴ', 'ﹶ', 'ﻼ', 'ｦ', 'ｯ', 'ｱ', 'ﾝ', 'ﾠ', 'ﾾ', 'ￂ', 'ￇ', 'ￊ', 'ￏ', 'ￒ', 'ￗ', 'ￚ', 'ￜ'}, @@ -12797,9 +12919,9 @@ var g = &grammar{ }, { name: "Lt", - pos: position{line: 1787, col: 1, offset: 50029}, + pos: position{line: 1778, col: 1, offset: 49942}, expr: &charClassMatcher{ - pos: position{line: 1787, col: 6, offset: 50034}, + pos: position{line: 1778, col: 6, offset: 49947}, val: "[\\u01C5\\u01C8\\u01CB\\u01F2\\u1F88-\\u1F8F\\u1F98-\\u1F9F\\u1FA8-\\u1FAF\\u1FBC\\u1FCC\\u1FFC]", chars: []rune{'Dž', 'Lj', 'Nj', 'Dz', 'ᾼ', 'ῌ', 'ῼ'}, ranges: []rune{'ᾈ', 'ᾏ', 'ᾘ', 'ᾟ', 'ᾨ', 'ᾯ'}, @@ -12811,9 +12933,9 @@ var g = &grammar{ }, { name: "Lu", - pos: position{line: 1790, col: 1, offset: 50140}, + pos: position{line: 1781, col: 1, offset: 50053}, expr: &charClassMatcher{ - pos: position{line: 1790, col: 6, offset: 50145}, + pos: position{line: 1781, col: 6, offset: 50058}, 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', 'ℭ', 'ℰ', 'ℳ', 'ℾ', 'ℿ', 'Ⰰ', 'Ⱞ', 'Ɫ', 'Ɽ', 'Ɑ', 'Ɒ', 'Ȿ', 'Ⲁ', 'Ᵹ', 'Ꝿ', 'Ɦ', 'Ɪ', 'Ʞ', 'Ꞵ', 'Ａ', 'Ｚ'}, @@ -12825,9 +12947,9 @@ var g = &grammar{ }, { name: "Mc", - pos: position{line: 1793, col: 1, offset: 54146}, + pos: position{line: 1784, col: 1, offset: 54059}, expr: &charClassMatcher{ - pos: position{line: 1793, col: 6, offset: 54151}, + pos: position{line: 1784, col: 6, offset: 54064}, 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{'ा', 'ी', 'ॉ', 'ौ', 'ॎ', 'ॏ', 'ং', 'ঃ', 'া', 'ী', 'ে', 'ৈ', 'ো', 'ৌ', 'ਾ', 'ੀ', 'ા', 'ી', 'ો', 'ૌ', 'ଂ', 'ଃ', 'େ', 'ୈ', 'ୋ', 'ୌ', 'ா', 'ி', 'ு', 'ூ', 'ெ', 'ை', 'ொ', 'ௌ', 'ఁ', 'ః', 'ు', 'ౄ', 'ಂ', 'ಃ', 'ೀ', 'ೄ', 'ೇ', 'ೈ', 'ೊ', 'ೋ', 'ೕ', 'ೖ', 'ം', 'ഃ', 'ാ', 'ീ', 'െ', 'ൈ', 'ൊ', 'ൌ', 'ං', 'ඃ', 'ා', 'ෑ', 'ෘ', 'ෟ', 'ෲ', 'ෳ', '༾', '༿', 'ါ', 'ာ', 'ျ', 'ြ', 'ၖ', 'ၗ', 'ၢ', 'ၤ', 'ၧ', 'ၭ', 'ႃ', 'ႄ', 'ႇ', 'ႌ', 'ႚ', 'ႜ', 'ើ', 'ៅ', 'ះ', 'ៈ', 'ᤣ', 'ᤦ', 'ᤩ', 'ᤫ', 'ᤰ', 'ᤱ', 'ᤳ', 'ᤸ', 'ᨙ', 'ᨚ', 'ᩣ', 'ᩤ', 'ᩭ', 'ᩲ', 'ᬽ', 'ᭁ', 'ᭃ', '᭄', 'ᮦ', 'ᮧ', 'ᯪ', 'ᯬ', '᯲', '᯳', 'ᰤ', 'ᰫ', 'ᰴ', 'ᰵ', 'ᳲ', 'ᳳ', '〮', '〯', 'ꠣ', 'ꠤ', 'ꢀ', 'ꢁ', 'ꢴ', 'ꣃ', 'ꥒ', '꥓', 'ꦴ', 'ꦵ', 'ꦺ', 'ꦻ', 'ꦽ', '꧀', 'ꨯ', 'ꨰ', 'ꨳ', 'ꨴ', 'ꫮ', 'ꫯ', 'ꯣ', 'ꯤ', 'ꯦ', 'ꯧ', 'ꯩ', 'ꯪ'}, @@ -12839,9 +12961,9 @@ var g = &grammar{ }, { name: "Mn", - pos: position{line: 1796, col: 1, offset: 55339}, + pos: position{line: 1787, col: 1, offset: 55252}, expr: &charClassMatcher{ - pos: position{line: 1796, col: 6, offset: 55344}, + pos: position{line: 1787, col: 6, offset: 55257}, 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{'̀', 'ͯ', '҃', '҇', '֑', 'ֽ', 'ׁ', 'ׂ', 'ׄ', 'ׅ', 'ؐ', 'ؚ', 'ً', 'ٟ', 'ۖ', 'ۜ', '۟', 'ۤ', 'ۧ', 'ۨ', '۪', 'ۭ', 'ܰ', '݊', 'ަ', 'ް', '߫', '߳', 'ࠖ', '࠙', 'ࠛ', 'ࠣ', 'ࠥ', 'ࠧ', 'ࠩ', '࠭', '࡙', '࡛', '࣓', '࣡', 'ࣣ', 'ं', 'ु', 'ै', '॑', 'ॗ', 'ॢ', 'ॣ', 'ু', 'ৄ', 'ৢ', 'ৣ', 'ਁ', 'ਂ', 'ੁ', 'ੂ', 'ੇ', 'ੈ', 'ੋ', '੍', 'ੰ', 'ੱ', 'ઁ', 'ં', 'ુ', 'ૅ', 'ે', 'ૈ', 'ૢ', 'ૣ', 'ૺ', '૿', 'ୁ', 'ୄ', 'ୢ', 'ୣ', 'ా', 'ీ', 'ె', 'ై', 'ొ', '్', 'ౕ', 'ౖ', 'ౢ', 'ౣ', 'ೌ', '್', 'ೢ', 'ೣ', 'ഀ', 'ഁ', '഻', '഼', 'ു', 'ൄ', 'ൢ', 'ൣ', 'ි', 'ු', 'ิ', 'ฺ', '็', '๎', 'ິ', 'ູ', 'ົ', 'ຼ', '່', 'ໍ', '༘', '༙', 'ཱ', 'ཾ', 'ྀ', '྄', '྆', '྇', 'ྍ', 'ྗ', 'ྙ', 'ྼ', 'ိ', 'ူ', 'ဲ', '့', '္', '်', 'ွ', 'ှ', 'ၘ', 'ၙ', 'ၞ', 'ၠ', 'ၱ', 'ၴ', 'ႅ', 'ႆ', '፝', '፟', 'ᜒ', '᜔', 'ᜲ', '᜴', 'ᝒ', 'ᝓ', 'ᝲ', 'ᝳ', '឴', '឵', 'ិ', 'ួ', '៉', '៓', '᠋', '᠍', 'ᢅ', 'ᢆ', 'ᤠ', 'ᤢ', 'ᤧ', 'ᤨ', '᤹', '᤻', 'ᨗ', 'ᨘ', 'ᩘ', 'ᩞ', 'ᩥ', 'ᩬ', 'ᩳ', '᩼', '᪰', '᪽', 'ᬀ', 'ᬃ', 'ᬶ', 'ᬺ', '᭫', '᭳', 'ᮀ', 'ᮁ', 'ᮢ', 'ᮥ', 'ᮨ', 'ᮩ', '᮫', 'ᮭ', 'ᯨ', 'ᯩ', 'ᯯ', 'ᯱ', 'ᰬ', 'ᰳ', 'ᰶ', '᰷', '᳐', '᳒', '᳔', '᳠', '᳢', '᳨', '᳸', '᳹', '᷀', '᷹', '᷻', '᷿', '⃐', '⃜', '⃥', '⃰', '⳯', '⳱', 'ⷠ', 'ⷿ', '〪', '〭', '゙', '゚', 'ꙴ', '꙽', 'ꚞ', 'ꚟ', '꛰', '꛱', 'ꠥ', 'ꠦ', '꣄', 'ꣅ', '꣠', '꣱', 'ꤦ', '꤭', 'ꥇ', 'ꥑ', 'ꦀ', 'ꦂ', 'ꦶ', 'ꦹ', 'ꨩ', 'ꨮ', 'ꨱ', 'ꨲ', 'ꨵ', 'ꨶ', 'ꪲ', 'ꪴ', 'ꪷ', 'ꪸ', 'ꪾ', '꪿', 'ꫬ', 'ꫭ', '︀', '️', '︠', '︯'}, @@ -12853,9 +12975,9 @@ var g = &grammar{ }, { name: "Nd", - pos: position{line: 1799, col: 1, offset: 57524}, + pos: position{line: 1790, col: 1, offset: 57437}, expr: &charClassMatcher{ - pos: position{line: 1799, col: 6, offset: 57529}, + pos: position{line: 1790, col: 6, offset: 57442}, 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, @@ -12866,9 +12988,9 @@ var g = &grammar{ }, { name: "Nl", - pos: position{line: 1802, col: 1, offset: 58032}, + pos: position{line: 1793, col: 1, offset: 57945}, expr: &charClassMatcher{ - pos: position{line: 1802, col: 6, offset: 58037}, + pos: position{line: 1793, col: 6, offset: 57950}, val: "[\\u16EE-\\u16F0\\u2160-\\u2182\\u2185-\\u2188\\u3007\\u3021-\\u3029\\u3038-\\u303A\\uA6E6-\\uA6EF]", chars: []rune{'〇'}, ranges: []rune{'ᛮ', 'ᛰ', 'Ⅰ', 'ↂ', 'ↅ', 'ↈ', '〡', '〩', '〸', '〺', 'ꛦ', 'ꛯ'}, @@ -12880,9 +13002,9 @@ var g = &grammar{ }, { name: "Pc", - pos: position{line: 1805, col: 1, offset: 58151}, + pos: position{line: 1796, col: 1, offset: 58064}, expr: &charClassMatcher{ - pos: position{line: 1805, col: 6, offset: 58156}, + pos: position{line: 1796, col: 6, offset: 58069}, val: "[\\u005F\\u203F-\\u2040\\u2054\\uFE33-\\uFE34\\uFE4D-\\uFE4F\\uFF3F]", chars: []rune{'_', '⁔', '＿'}, ranges: []rune{'‿', '⁀', '︳', '︴', '﹍', '﹏'}, @@ -12894,9 +13016,9 @@ var g = &grammar{ }, { name: "Zs", - pos: position{line: 1808, col: 1, offset: 58237}, + pos: position{line: 1799, col: 1, offset: 58150}, expr: &charClassMatcher{ - pos: position{line: 1808, col: 6, offset: 58242}, + pos: position{line: 1799, col: 6, offset: 58155}, val: "[\\u0020\\u00A0\\u1680\\u2000-\\u200A\\u202F\\u205F\\u3000]", chars: []rune{' ', '\u00a0', '\u1680', '\u202f', '\u205f', '\u3000'}, ranges: []rune{'\u2000', '\u200a'}, @@ -12908,9 +13030,9 @@ var g = &grammar{ }, { name: "SourceCharacter", - pos: position{line: 1810, col: 1, offset: 58295}, + pos: position{line: 1801, col: 1, offset: 58208}, expr: &anyMatcher{ - line: 1811, col: 5, offset: 58315, + line: 1802, col: 5, offset: 58228, }, leader: false, leftRecursive: false, @@ -12918,48 +13040,48 @@ var g = &grammar{ { name: "WhiteSpace", displayName: "\"whitespace\"", - pos: position{line: 1813, col: 1, offset: 58318}, + pos: position{line: 1804, col: 1, offset: 58231}, expr: &choiceExpr{ - pos: position{line: 1814, col: 5, offset: 58346}, + pos: position{line: 1805, col: 5, offset: 58259}, alternatives: []any{ &litMatcher{ - pos: position{line: 1814, col: 5, offset: 58346}, + pos: position{line: 1805, col: 5, offset: 58259}, val: "\t", ignoreCase: false, want: "\"\\t\"", }, &litMatcher{ - pos: position{line: 1815, col: 5, offset: 58355}, + pos: position{line: 1806, col: 5, offset: 58268}, val: "\v", ignoreCase: false, want: "\"\\v\"", }, &litMatcher{ - pos: position{line: 1816, col: 5, offset: 58364}, + pos: position{line: 1807, col: 5, offset: 58277}, val: "\f", ignoreCase: false, want: "\"\\f\"", }, &litMatcher{ - pos: position{line: 1817, col: 5, offset: 58373}, + pos: position{line: 1808, col: 5, offset: 58286}, val: " ", ignoreCase: false, want: "\" \"", }, &litMatcher{ - pos: position{line: 1818, col: 5, offset: 58381}, + pos: position{line: 1809, col: 5, offset: 58294}, val: "\u00a0", ignoreCase: false, want: "\"\\u00a0\"", }, &litMatcher{ - pos: position{line: 1819, col: 5, offset: 58394}, + pos: position{line: 1810, col: 5, offset: 58307}, val: "\ufeff", ignoreCase: false, want: "\"\\ufeff\"", }, &ruleRefExpr{ - pos: position{line: 1820, col: 5, offset: 58407}, + pos: position{line: 1811, col: 5, offset: 58320}, name: "Zs", }, }, @@ -12969,9 +13091,9 @@ var g = &grammar{ }, { name: "LineTerminator", - pos: position{line: 1822, col: 1, offset: 58411}, + pos: position{line: 1813, col: 1, offset: 58324}, expr: &charClassMatcher{ - pos: position{line: 1823, col: 5, offset: 58430}, + pos: position{line: 1814, col: 5, offset: 58343}, val: "[\\n\\r\\u2028\\u2029]", chars: []rune{'\n', '\r', '\u2028', '\u2029'}, ignoreCase: false, @@ -12983,9 +13105,9 @@ var g = &grammar{ { name: "Comment", displayName: "\"comment\"", - pos: position{line: 1829, col: 1, offset: 58760}, + pos: position{line: 1820, col: 1, offset: 58673}, expr: &ruleRefExpr{ - pos: position{line: 1832, col: 5, offset: 58831}, + pos: position{line: 1823, col: 5, offset: 58744}, name: "SingleLineComment", }, leader: false, @@ -12993,39 +13115,39 @@ var g = &grammar{ }, { name: "MultiLineComment", - pos: position{line: 1834, col: 1, offset: 58850}, + pos: position{line: 1825, col: 1, offset: 58763}, expr: &seqExpr{ - pos: position{line: 1835, col: 5, offset: 58871}, + pos: position{line: 1826, col: 5, offset: 58784}, exprs: []any{ &litMatcher{ - pos: position{line: 1835, col: 5, offset: 58871}, + pos: position{line: 1826, col: 5, offset: 58784}, val: "/*", ignoreCase: false, want: "\"/*\"", }, &zeroOrMoreExpr{ - pos: position{line: 1835, col: 10, offset: 58876}, + pos: position{line: 1826, col: 10, offset: 58789}, expr: &seqExpr{ - pos: position{line: 1835, col: 11, offset: 58877}, + pos: position{line: 1826, col: 11, offset: 58790}, exprs: []any{ ¬Expr{ - pos: position{line: 1835, col: 11, offset: 58877}, + pos: position{line: 1826, col: 11, offset: 58790}, expr: &litMatcher{ - pos: position{line: 1835, col: 12, offset: 58878}, + pos: position{line: 1826, col: 12, offset: 58791}, val: "*/", ignoreCase: false, want: "\"*/\"", }, }, &ruleRefExpr{ - pos: position{line: 1835, col: 17, offset: 58883}, + pos: position{line: 1826, col: 17, offset: 58796}, name: "SourceCharacter", }, }, }, }, &litMatcher{ - pos: position{line: 1835, col: 35, offset: 58901}, + pos: position{line: 1826, col: 35, offset: 58814}, val: "*/", ignoreCase: false, want: "\"*/\"", @@ -13037,33 +13159,33 @@ var g = &grammar{ }, { name: "SingleLineComment", - pos: position{line: 1837, col: 1, offset: 58907}, + pos: position{line: 1828, col: 1, offset: 58820}, expr: &choiceExpr{ - pos: position{line: 1838, col: 5, offset: 58929}, + pos: position{line: 1829, col: 5, offset: 58842}, alternatives: []any{ &seqExpr{ - pos: position{line: 1838, col: 5, offset: 58929}, + pos: position{line: 1829, col: 5, offset: 58842}, exprs: []any{ &litMatcher{ - pos: position{line: 1838, col: 5, offset: 58929}, + pos: position{line: 1829, col: 5, offset: 58842}, val: "//", ignoreCase: false, want: "\"//\"", }, &zeroOrMoreExpr{ - pos: position{line: 1838, col: 10, offset: 58934}, + pos: position{line: 1829, col: 10, offset: 58847}, expr: &seqExpr{ - pos: position{line: 1838, col: 11, offset: 58935}, + pos: position{line: 1829, col: 11, offset: 58848}, exprs: []any{ ¬Expr{ - pos: position{line: 1838, col: 11, offset: 58935}, + pos: position{line: 1829, col: 11, offset: 58848}, expr: &ruleRefExpr{ - pos: position{line: 1838, col: 12, offset: 58936}, + pos: position{line: 1829, col: 12, offset: 58849}, name: "LineTerminator", }, }, &ruleRefExpr{ - pos: position{line: 1838, col: 27, offset: 58951}, + pos: position{line: 1829, col: 27, offset: 58864}, name: "SourceCharacter", }, }, @@ -13072,28 +13194,28 @@ var g = &grammar{ }, }, &seqExpr{ - pos: position{line: 1839, col: 5, offset: 58973}, + pos: position{line: 1830, col: 5, offset: 58886}, exprs: []any{ &litMatcher{ - pos: position{line: 1839, col: 5, offset: 58973}, + pos: position{line: 1830, col: 5, offset: 58886}, val: "--", ignoreCase: false, want: "\"--\"", }, &zeroOrMoreExpr{ - pos: position{line: 1839, col: 10, offset: 58978}, + pos: position{line: 1830, col: 10, offset: 58891}, expr: &seqExpr{ - pos: position{line: 1839, col: 11, offset: 58979}, + pos: position{line: 1830, col: 11, offset: 58892}, exprs: []any{ ¬Expr{ - pos: position{line: 1839, col: 11, offset: 58979}, + pos: position{line: 1830, col: 11, offset: 58892}, expr: &ruleRefExpr{ - pos: position{line: 1839, col: 12, offset: 58980}, + pos: position{line: 1830, col: 12, offset: 58893}, name: "LineTerminator", }, }, &ruleRefExpr{ - pos: position{line: 1839, col: 27, offset: 58995}, + pos: position{line: 1830, col: 27, offset: 58908}, name: "SourceCharacter", }, }, @@ -13108,19 +13230,19 @@ var g = &grammar{ }, { name: "EOL", - pos: position{line: 1841, col: 1, offset: 59014}, + pos: position{line: 1832, col: 1, offset: 58927}, expr: &seqExpr{ - pos: position{line: 1841, col: 7, offset: 59020}, + pos: position{line: 1832, col: 7, offset: 58933}, exprs: []any{ &zeroOrMoreExpr{ - pos: position{line: 1841, col: 7, offset: 59020}, + pos: position{line: 1832, col: 7, offset: 58933}, expr: &ruleRefExpr{ - pos: position{line: 1841, col: 7, offset: 59020}, + pos: position{line: 1832, col: 7, offset: 58933}, name: "WhiteSpace", }, }, &ruleRefExpr{ - pos: position{line: 1841, col: 19, offset: 59032}, + pos: position{line: 1832, col: 19, offset: 58945}, name: "LineTerminator", }, }, @@ -13130,16 +13252,16 @@ var g = &grammar{ }, { name: "EOT", - pos: position{line: 1843, col: 1, offset: 59048}, + pos: position{line: 1834, col: 1, offset: 58961}, expr: &choiceExpr{ - pos: position{line: 1843, col: 7, offset: 59054}, + pos: position{line: 1834, col: 7, offset: 58967}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1843, col: 7, offset: 59054}, + pos: position{line: 1834, col: 7, offset: 58967}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1843, col: 11, offset: 59058}, + pos: position{line: 1834, col: 11, offset: 58971}, name: "EOF", }, }, @@ -13149,11 +13271,11 @@ var g = &grammar{ }, { name: "EOF", - pos: position{line: 1845, col: 1, offset: 59063}, + pos: position{line: 1836, col: 1, offset: 58976}, expr: ¬Expr{ - pos: position{line: 1845, col: 7, offset: 59069}, + pos: position{line: 1836, col: 7, offset: 58982}, expr: &anyMatcher{ - line: 1845, col: 8, offset: 59070, + line: 1836, col: 8, offset: 58983, }, }, leader: false, @@ -13161,11 +13283,11 @@ var g = &grammar{ }, { name: "EOKW", - pos: position{line: 1847, col: 1, offset: 59073}, + pos: position{line: 1838, col: 1, offset: 58986}, expr: ¬Expr{ - pos: position{line: 1847, col: 8, offset: 59080}, + pos: position{line: 1838, col: 8, offset: 58993}, expr: &ruleRefExpr{ - pos: position{line: 1847, col: 9, offset: 59081}, + pos: position{line: 1838, col: 9, offset: 58994}, name: "KeyWordChars", }, }, @@ -13174,15 +13296,15 @@ var g = &grammar{ }, { name: "SQLPipe", - pos: position{line: 1851, col: 1, offset: 59117}, + pos: position{line: 1842, col: 1, offset: 59030}, expr: &actionExpr{ - pos: position{line: 1852, col: 5, offset: 59130}, + pos: position{line: 1843, col: 5, offset: 59043}, run: (*parser).callonSQLPipe1, expr: &labeledExpr{ - pos: position{line: 1852, col: 5, offset: 59130}, + pos: position{line: 1843, col: 5, offset: 59043}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1852, col: 7, offset: 59132}, + pos: position{line: 1843, col: 7, offset: 59045}, name: "Seq", }, }, @@ -13192,27 +13314,27 @@ var g = &grammar{ }, { name: "SelectOp", - pos: position{line: 1860, col: 1, offset: 59278}, + pos: position{line: 1851, col: 1, offset: 59191}, expr: &actionExpr{ - pos: position{line: 1860, col: 12, offset: 59289}, + pos: position{line: 1851, col: 12, offset: 59202}, run: (*parser).callonSelectOp1, expr: &seqExpr{ - pos: position{line: 1860, col: 12, offset: 59289}, + pos: position{line: 1851, col: 12, offset: 59202}, exprs: []any{ ¬Expr{ - pos: position{line: 1860, col: 12, offset: 59289}, + pos: position{line: 1851, col: 12, offset: 59202}, expr: &litMatcher{ - pos: position{line: 1860, col: 13, offset: 59290}, + pos: position{line: 1851, col: 13, offset: 59203}, val: "(", ignoreCase: false, want: "\"(\"", }, }, &labeledExpr{ - pos: position{line: 1860, col: 17, offset: 59294}, + pos: position{line: 1851, col: 17, offset: 59207}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 1860, col: 20, offset: 59297}, + pos: position{line: 1851, col: 20, offset: 59210}, name: "SelectExpr", }, }, @@ -13224,65 +13346,65 @@ var g = &grammar{ }, { name: "SelectExpr", - pos: position{line: 1862, col: 1, offset: 59327}, + pos: position{line: 1853, col: 1, offset: 59240}, expr: &actionExpr{ - pos: position{line: 1863, col: 5, offset: 59343}, + pos: position{line: 1854, col: 5, offset: 59256}, run: (*parser).callonSelectExpr1, expr: &seqExpr{ - pos: position{line: 1863, col: 5, offset: 59343}, + pos: position{line: 1854, col: 5, offset: 59256}, exprs: []any{ &labeledExpr{ - pos: position{line: 1863, col: 5, offset: 59343}, + pos: position{line: 1854, col: 5, offset: 59256}, label: "with", expr: &ruleRefExpr{ - pos: position{line: 1863, col: 10, offset: 59348}, + pos: position{line: 1854, col: 10, offset: 59261}, name: "OptWithClause", }, }, &labeledExpr{ - pos: position{line: 1864, col: 5, offset: 59366}, + pos: position{line: 1855, col: 5, offset: 59279}, label: "body", expr: &choiceExpr{ - pos: position{line: 1865, col: 9, offset: 59381}, + pos: position{line: 1856, col: 9, offset: 59294}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1865, col: 9, offset: 59381}, + pos: position{line: 1856, col: 9, offset: 59294}, name: "SetOperation", }, &ruleRefExpr{ - pos: position{line: 1866, col: 9, offset: 59402}, + pos: position{line: 1857, col: 9, offset: 59315}, name: "Select", }, &actionExpr{ - pos: position{line: 1867, col: 9, offset: 59417}, + pos: position{line: 1858, col: 9, offset: 59330}, run: (*parser).callonSelectExpr9, expr: &seqExpr{ - pos: position{line: 1867, col: 9, offset: 59417}, + pos: position{line: 1858, col: 9, offset: 59330}, exprs: []any{ &litMatcher{ - pos: position{line: 1867, col: 9, offset: 59417}, + pos: position{line: 1858, col: 9, offset: 59330}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1867, col: 13, offset: 59421}, + pos: position{line: 1858, col: 13, offset: 59334}, name: "__", }, &labeledExpr{ - pos: position{line: 1867, col: 16, offset: 59424}, + pos: position{line: 1858, col: 16, offset: 59337}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1867, col: 18, offset: 59426}, + pos: position{line: 1858, col: 18, offset: 59339}, name: "SQLPipe", }, }, &ruleRefExpr{ - pos: position{line: 1867, col: 26, offset: 59434}, + pos: position{line: 1858, col: 26, offset: 59347}, name: "__", }, &litMatcher{ - pos: position{line: 1867, col: 28, offset: 59436}, + pos: position{line: 1858, col: 28, offset: 59349}, val: ")", ignoreCase: false, want: "\")\"", @@ -13294,97 +13416,97 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 1869, col: 5, offset: 59473}, + pos: position{line: 1860, col: 5, offset: 59386}, label: "orderby", expr: &ruleRefExpr{ - pos: position{line: 1869, col: 13, offset: 59481}, + pos: position{line: 1860, col: 13, offset: 59394}, name: "OptOrderByClause", }, }, &labeledExpr{ - pos: position{line: 1870, col: 5, offset: 59502}, + pos: position{line: 1861, col: 5, offset: 59415}, label: "limit", expr: &ruleRefExpr{ - pos: position{line: 1870, col: 11, offset: 59508}, + pos: position{line: 1861, col: 11, offset: 59421}, name: "OptLimitClause", }, }, }, }, }, - leader: false, + leader: true, leftRecursive: true, }, { name: "Select", - pos: position{line: 1890, col: 1, offset: 59894}, + pos: position{line: 1881, col: 1, offset: 59807}, expr: &actionExpr{ - pos: position{line: 1891, col: 5, offset: 59906}, + pos: position{line: 1882, col: 5, offset: 59819}, run: (*parser).callonSelect1, expr: &seqExpr{ - pos: position{line: 1891, col: 5, offset: 59906}, + pos: position{line: 1882, col: 5, offset: 59819}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1891, col: 5, offset: 59906}, + pos: position{line: 1882, col: 5, offset: 59819}, name: "SELECT", }, &labeledExpr{ - pos: position{line: 1892, col: 5, offset: 59918}, + pos: position{line: 1883, col: 5, offset: 59831}, label: "distinct", expr: &ruleRefExpr{ - pos: position{line: 1892, col: 14, offset: 59927}, + pos: position{line: 1883, col: 14, offset: 59840}, name: "OptDistinct", }, }, &labeledExpr{ - pos: position{line: 1893, col: 5, offset: 59943}, + pos: position{line: 1884, col: 5, offset: 59856}, label: "value", expr: &ruleRefExpr{ - pos: position{line: 1893, col: 11, offset: 59949}, + pos: position{line: 1884, col: 11, offset: 59862}, name: "OptSelectValue", }, }, &ruleRefExpr{ - pos: position{line: 1896, col: 5, offset: 60089}, + pos: position{line: 1887, col: 5, offset: 60002}, name: "_", }, &labeledExpr{ - pos: position{line: 1896, col: 7, offset: 60091}, + pos: position{line: 1887, col: 7, offset: 60004}, label: "selection", expr: &ruleRefExpr{ - pos: position{line: 1896, col: 17, offset: 60101}, + pos: position{line: 1887, col: 17, offset: 60014}, name: "Selection", }, }, &labeledExpr{ - pos: position{line: 1897, col: 5, offset: 60115}, + pos: position{line: 1888, col: 5, offset: 60028}, label: "from", expr: &ruleRefExpr{ - pos: position{line: 1897, col: 10, offset: 60120}, + pos: position{line: 1888, col: 10, offset: 60033}, name: "OptFromClause", }, }, &labeledExpr{ - pos: position{line: 1898, col: 5, offset: 60138}, + pos: position{line: 1889, col: 5, offset: 60051}, label: "where", expr: &ruleRefExpr{ - pos: position{line: 1898, col: 11, offset: 60144}, + pos: position{line: 1889, col: 11, offset: 60057}, name: "OptWhereClause", }, }, &labeledExpr{ - pos: position{line: 1899, col: 5, offset: 60163}, + pos: position{line: 1890, col: 5, offset: 60076}, label: "group", expr: &ruleRefExpr{ - pos: position{line: 1899, col: 11, offset: 60169}, + pos: position{line: 1890, col: 11, offset: 60082}, name: "OptGroupClause", }, }, &labeledExpr{ - pos: position{line: 1900, col: 5, offset: 60188}, + pos: position{line: 1891, col: 5, offset: 60101}, label: "having", expr: &ruleRefExpr{ - pos: position{line: 1900, col: 12, offset: 60195}, + pos: position{line: 1891, col: 12, offset: 60108}, name: "OptHavingClause", }, }, @@ -13396,49 +13518,49 @@ var g = &grammar{ }, { name: "OptDistinct", - pos: position{line: 1926, col: 1, offset: 60801}, + pos: position{line: 1917, col: 1, offset: 60714}, expr: &choiceExpr{ - pos: position{line: 1927, col: 5, offset: 60817}, + pos: position{line: 1918, col: 5, offset: 60730}, alternatives: []any{ &actionExpr{ - pos: position{line: 1927, col: 5, offset: 60817}, + pos: position{line: 1918, col: 5, offset: 60730}, run: (*parser).callonOptDistinct2, expr: &seqExpr{ - pos: position{line: 1927, col: 5, offset: 60817}, + pos: position{line: 1918, col: 5, offset: 60730}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1927, col: 5, offset: 60817}, + pos: position{line: 1918, col: 5, offset: 60730}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1927, col: 7, offset: 60819}, + pos: position{line: 1918, col: 7, offset: 60732}, name: "ALL", }, }, }, }, &actionExpr{ - pos: position{line: 1928, col: 5, offset: 60856}, + pos: position{line: 1919, col: 5, offset: 60769}, run: (*parser).callonOptDistinct6, expr: &seqExpr{ - pos: position{line: 1928, col: 5, offset: 60856}, + pos: position{line: 1919, col: 5, offset: 60769}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1928, col: 5, offset: 60856}, + pos: position{line: 1919, col: 5, offset: 60769}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1928, col: 7, offset: 60858}, + pos: position{line: 1919, col: 7, offset: 60771}, name: "DISTINCT", }, }, }, }, &actionExpr{ - pos: position{line: 1929, col: 5, offset: 60894}, + pos: position{line: 1920, col: 5, offset: 60807}, run: (*parser).callonOptDistinct10, expr: &litMatcher{ - pos: position{line: 1929, col: 5, offset: 60894}, + pos: position{line: 1920, col: 5, offset: 60807}, val: "", ignoreCase: false, want: "\"\"", @@ -13451,57 +13573,57 @@ var g = &grammar{ }, { name: "OptSelectValue", - pos: position{line: 1931, col: 1, offset: 60933}, + pos: position{line: 1922, col: 1, offset: 60846}, expr: &choiceExpr{ - pos: position{line: 1932, col: 5, offset: 60952}, + pos: position{line: 1923, col: 5, offset: 60865}, alternatives: []any{ &actionExpr{ - pos: position{line: 1932, col: 5, offset: 60952}, + pos: position{line: 1923, col: 5, offset: 60865}, run: (*parser).callonOptSelectValue2, expr: &seqExpr{ - pos: position{line: 1932, col: 5, offset: 60952}, + pos: position{line: 1923, col: 5, offset: 60865}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1932, col: 5, offset: 60952}, + pos: position{line: 1923, col: 5, offset: 60865}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1932, col: 7, offset: 60954}, + pos: position{line: 1923, col: 7, offset: 60867}, name: "AS", }, &ruleRefExpr{ - pos: position{line: 1932, col: 10, offset: 60957}, + pos: position{line: 1923, col: 10, offset: 60870}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1932, col: 12, offset: 60959}, + pos: position{line: 1923, col: 12, offset: 60872}, name: "VALUE", }, }, }, }, &actionExpr{ - pos: position{line: 1933, col: 5, offset: 60991}, + pos: position{line: 1924, col: 5, offset: 60904}, run: (*parser).callonOptSelectValue8, expr: &seqExpr{ - pos: position{line: 1933, col: 5, offset: 60991}, + pos: position{line: 1924, col: 5, offset: 60904}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1933, col: 5, offset: 60991}, + pos: position{line: 1924, col: 5, offset: 60904}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1933, col: 7, offset: 60993}, + pos: position{line: 1924, col: 7, offset: 60906}, name: "VALUE", }, }, }, }, &actionExpr{ - pos: position{line: 1934, col: 5, offset: 61064}, + pos: position{line: 1925, col: 5, offset: 60977}, run: (*parser).callonOptSelectValue12, expr: &litMatcher{ - pos: position{line: 1934, col: 5, offset: 61064}, + pos: position{line: 1925, col: 5, offset: 60977}, val: "", ignoreCase: false, want: "\"\"", @@ -13514,19 +13636,19 @@ var g = &grammar{ }, { name: "OptWithClause", - pos: position{line: 1936, col: 1, offset: 61107}, + pos: position{line: 1927, col: 1, offset: 61020}, expr: &choiceExpr{ - pos: position{line: 1937, col: 5, offset: 61126}, + pos: position{line: 1928, col: 5, offset: 61039}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1937, col: 5, offset: 61126}, + pos: position{line: 1928, col: 5, offset: 61039}, name: "WithClause", }, &actionExpr{ - pos: position{line: 1938, col: 5, offset: 61142}, + pos: position{line: 1929, col: 5, offset: 61055}, run: (*parser).callonOptWithClause3, expr: &litMatcher{ - pos: position{line: 1938, col: 5, offset: 61142}, + pos: position{line: 1929, col: 5, offset: 61055}, val: "", ignoreCase: false, want: "\"\"", @@ -13539,38 +13661,38 @@ var g = &grammar{ }, { name: "WithClause", - pos: position{line: 1940, col: 1, offset: 61175}, + pos: position{line: 1931, col: 1, offset: 61088}, expr: &actionExpr{ - pos: position{line: 1941, col: 5, offset: 61191}, + pos: position{line: 1932, col: 5, offset: 61104}, run: (*parser).callonWithClause1, expr: &seqExpr{ - pos: position{line: 1941, col: 5, offset: 61191}, + pos: position{line: 1932, col: 5, offset: 61104}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1941, col: 5, offset: 61191}, + pos: position{line: 1932, col: 5, offset: 61104}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1941, col: 7, offset: 61193}, + pos: position{line: 1932, col: 7, offset: 61106}, name: "WITH", }, &labeledExpr{ - pos: position{line: 1941, col: 12, offset: 61198}, + pos: position{line: 1932, col: 12, offset: 61111}, label: "r", expr: &ruleRefExpr{ - pos: position{line: 1941, col: 14, offset: 61200}, + pos: position{line: 1932, col: 14, offset: 61113}, name: "OptRecursive", }, }, &ruleRefExpr{ - pos: position{line: 1941, col: 27, offset: 61213}, + pos: position{line: 1932, col: 27, offset: 61126}, name: "_", }, &labeledExpr{ - pos: position{line: 1941, col: 29, offset: 61215}, + pos: position{line: 1932, col: 29, offset: 61128}, label: "ctes", expr: &ruleRefExpr{ - pos: position{line: 1941, col: 34, offset: 61220}, + pos: position{line: 1932, col: 34, offset: 61133}, name: "CteList", }, }, @@ -13582,32 +13704,32 @@ var g = &grammar{ }, { name: "OptRecursive", - pos: position{line: 1950, col: 1, offset: 61405}, + pos: position{line: 1941, col: 1, offset: 61318}, expr: &choiceExpr{ - pos: position{line: 1951, col: 5, offset: 61423}, + pos: position{line: 1942, col: 5, offset: 61336}, alternatives: []any{ &actionExpr{ - pos: position{line: 1951, col: 5, offset: 61423}, + pos: position{line: 1942, col: 5, offset: 61336}, run: (*parser).callonOptRecursive2, expr: &seqExpr{ - pos: position{line: 1951, col: 5, offset: 61423}, + pos: position{line: 1942, col: 5, offset: 61336}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1951, col: 5, offset: 61423}, + pos: position{line: 1942, col: 5, offset: 61336}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1951, col: 7, offset: 61425}, + pos: position{line: 1942, col: 7, offset: 61338}, name: "RECURSIVE", }, }, }, }, &actionExpr{ - pos: position{line: 1952, col: 5, offset: 61461}, + pos: position{line: 1943, col: 5, offset: 61374}, run: (*parser).callonOptRecursive6, expr: &litMatcher{ - pos: position{line: 1952, col: 5, offset: 61461}, + pos: position{line: 1943, col: 5, offset: 61374}, val: "", ignoreCase: false, want: "\"\"", @@ -13620,51 +13742,51 @@ var g = &grammar{ }, { name: "CteList", - pos: position{line: 1954, col: 1, offset: 61500}, + pos: position{line: 1945, col: 1, offset: 61413}, expr: &actionExpr{ - pos: position{line: 1954, col: 11, offset: 61510}, + pos: position{line: 1945, col: 11, offset: 61423}, run: (*parser).callonCteList1, expr: &seqExpr{ - pos: position{line: 1954, col: 11, offset: 61510}, + pos: position{line: 1945, col: 11, offset: 61423}, exprs: []any{ &labeledExpr{ - pos: position{line: 1954, col: 11, offset: 61510}, + pos: position{line: 1945, col: 11, offset: 61423}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1954, col: 17, offset: 61516}, + pos: position{line: 1945, col: 17, offset: 61429}, name: "Cte", }, }, &labeledExpr{ - pos: position{line: 1954, col: 21, offset: 61520}, + pos: position{line: 1945, col: 21, offset: 61433}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1954, col: 26, offset: 61525}, + pos: position{line: 1945, col: 26, offset: 61438}, expr: &actionExpr{ - pos: position{line: 1954, col: 28, offset: 61527}, + pos: position{line: 1945, col: 28, offset: 61440}, run: (*parser).callonCteList7, expr: &seqExpr{ - pos: position{line: 1954, col: 28, offset: 61527}, + pos: position{line: 1945, col: 28, offset: 61440}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1954, col: 28, offset: 61527}, + pos: position{line: 1945, col: 28, offset: 61440}, name: "__", }, &litMatcher{ - pos: position{line: 1954, col: 31, offset: 61530}, + pos: position{line: 1945, col: 31, offset: 61443}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1954, col: 35, offset: 61534}, + pos: position{line: 1945, col: 35, offset: 61447}, name: "__", }, &labeledExpr{ - pos: position{line: 1954, col: 38, offset: 61537}, + pos: position{line: 1945, col: 38, offset: 61450}, label: "cte", expr: &ruleRefExpr{ - pos: position{line: 1954, col: 42, offset: 61541}, + pos: position{line: 1945, col: 42, offset: 61454}, name: "Cte", }, }, @@ -13681,65 +13803,65 @@ var g = &grammar{ }, { name: "Cte", - pos: position{line: 1958, col: 1, offset: 61610}, + pos: position{line: 1949, col: 1, offset: 61523}, expr: &actionExpr{ - pos: position{line: 1959, col: 5, offset: 61618}, + pos: position{line: 1950, col: 5, offset: 61531}, run: (*parser).callonCte1, expr: &seqExpr{ - pos: position{line: 1959, col: 5, offset: 61618}, + pos: position{line: 1950, col: 5, offset: 61531}, exprs: []any{ &labeledExpr{ - pos: position{line: 1959, col: 5, offset: 61618}, + pos: position{line: 1950, col: 5, offset: 61531}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1959, col: 10, offset: 61623}, + pos: position{line: 1950, col: 10, offset: 61536}, name: "AliasName", }, }, &ruleRefExpr{ - pos: position{line: 1959, col: 20, offset: 61633}, + pos: position{line: 1950, col: 20, offset: 61546}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1959, col: 22, offset: 61635}, + pos: position{line: 1950, col: 22, offset: 61548}, name: "AS", }, &labeledExpr{ - pos: position{line: 1959, col: 25, offset: 61638}, + pos: position{line: 1950, col: 25, offset: 61551}, label: "m", expr: &ruleRefExpr{ - pos: position{line: 1959, col: 27, offset: 61640}, + pos: position{line: 1950, col: 27, offset: 61553}, name: "OptMaterialized", }, }, &ruleRefExpr{ - pos: position{line: 1959, col: 43, offset: 61656}, + pos: position{line: 1950, col: 43, offset: 61569}, name: "__", }, &litMatcher{ - pos: position{line: 1959, col: 46, offset: 61659}, + pos: position{line: 1950, col: 46, offset: 61572}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1959, col: 50, offset: 61663}, + pos: position{line: 1950, col: 50, offset: 61576}, name: "__", }, &labeledExpr{ - pos: position{line: 1959, col: 53, offset: 61666}, + pos: position{line: 1950, col: 53, offset: 61579}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1959, col: 55, offset: 61668}, + pos: position{line: 1950, col: 55, offset: 61581}, name: "SQLPipe", }, }, &ruleRefExpr{ - pos: position{line: 1959, col: 63, offset: 61676}, + pos: position{line: 1950, col: 63, offset: 61589}, name: "__", }, &litMatcher{ - pos: position{line: 1959, col: 66, offset: 61679}, + pos: position{line: 1950, col: 66, offset: 61592}, val: ")", ignoreCase: false, want: "\")\"", @@ -13752,9 +13874,9 @@ var g = &grammar{ }, { name: "AliasName", - pos: position{line: 1968, col: 1, offset: 61854}, + pos: position{line: 1959, col: 1, offset: 61767}, expr: &ruleRefExpr{ - pos: position{line: 1968, col: 13, offset: 61866}, + pos: position{line: 1959, col: 13, offset: 61779}, name: "Identifier", }, leader: false, @@ -13762,65 +13884,65 @@ var g = &grammar{ }, { name: "OptMaterialized", - pos: position{line: 1970, col: 1, offset: 61878}, + pos: position{line: 1961, col: 1, offset: 61791}, expr: &choiceExpr{ - pos: position{line: 1971, col: 5, offset: 61899}, + pos: position{line: 1962, col: 5, offset: 61812}, alternatives: []any{ &actionExpr{ - pos: position{line: 1971, col: 5, offset: 61899}, + pos: position{line: 1962, col: 5, offset: 61812}, run: (*parser).callonOptMaterialized2, expr: &seqExpr{ - pos: position{line: 1971, col: 5, offset: 61899}, + pos: position{line: 1962, col: 5, offset: 61812}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1971, col: 5, offset: 61899}, + pos: position{line: 1962, col: 5, offset: 61812}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1971, col: 7, offset: 61901}, + pos: position{line: 1962, col: 7, offset: 61814}, name: "MATERIALIZED", }, &ruleRefExpr{ - pos: position{line: 1971, col: 20, offset: 61914}, + pos: position{line: 1962, col: 20, offset: 61827}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 1972, col: 5, offset: 61953}, + pos: position{line: 1963, col: 5, offset: 61866}, run: (*parser).callonOptMaterialized7, expr: &seqExpr{ - pos: position{line: 1972, col: 5, offset: 61953}, + pos: position{line: 1963, col: 5, offset: 61866}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1972, col: 5, offset: 61953}, + pos: position{line: 1963, col: 5, offset: 61866}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1972, col: 7, offset: 61955}, + pos: position{line: 1963, col: 7, offset: 61868}, name: "NOT", }, &ruleRefExpr{ - pos: position{line: 1972, col: 11, offset: 61959}, + pos: position{line: 1963, col: 11, offset: 61872}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1972, col: 13, offset: 61961}, + pos: position{line: 1963, col: 13, offset: 61874}, name: "MATERIALIZED", }, &ruleRefExpr{ - pos: position{line: 1972, col: 26, offset: 61974}, + pos: position{line: 1963, col: 26, offset: 61887}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 1973, col: 5, offset: 62005}, + pos: position{line: 1964, col: 5, offset: 61918}, run: (*parser).callonOptMaterialized14, expr: &litMatcher{ - pos: position{line: 1973, col: 5, offset: 62005}, + pos: position{line: 1964, col: 5, offset: 61918}, val: "", ignoreCase: false, want: "\"\"", @@ -13833,25 +13955,25 @@ var g = &grammar{ }, { name: "OptAllClause", - pos: position{line: 1975, col: 1, offset: 62060}, + pos: position{line: 1966, col: 1, offset: 61973}, expr: &choiceExpr{ - pos: position{line: 1976, col: 5, offset: 62077}, + pos: position{line: 1967, col: 5, offset: 61990}, alternatives: []any{ &seqExpr{ - pos: position{line: 1976, col: 5, offset: 62077}, + pos: position{line: 1967, col: 5, offset: 61990}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1976, col: 5, offset: 62077}, + pos: position{line: 1967, col: 5, offset: 61990}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1976, col: 7, offset: 62079}, + pos: position{line: 1967, col: 7, offset: 61992}, name: "ALL", }, }, }, &litMatcher{ - pos: position{line: 1977, col: 5, offset: 62088}, + pos: position{line: 1968, col: 5, offset: 62001}, val: "", ignoreCase: false, want: "\"\"", @@ -13863,25 +13985,25 @@ var g = &grammar{ }, { name: "OptFromClause", - pos: position{line: 1979, col: 1, offset: 62092}, + pos: position{line: 1970, col: 1, offset: 62005}, expr: &choiceExpr{ - pos: position{line: 1980, col: 5, offset: 62110}, + pos: position{line: 1971, col: 5, offset: 62023}, alternatives: []any{ &actionExpr{ - pos: position{line: 1980, col: 5, offset: 62110}, + pos: position{line: 1971, col: 5, offset: 62023}, run: (*parser).callonOptFromClause2, expr: &seqExpr{ - pos: position{line: 1980, col: 5, offset: 62110}, + pos: position{line: 1971, col: 5, offset: 62023}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1980, col: 5, offset: 62110}, + pos: position{line: 1971, col: 5, offset: 62023}, name: "_", }, &labeledExpr{ - pos: position{line: 1980, col: 7, offset: 62112}, + pos: position{line: 1971, col: 7, offset: 62025}, label: "from", expr: &ruleRefExpr{ - pos: position{line: 1980, col: 12, offset: 62117}, + pos: position{line: 1971, col: 12, offset: 62030}, name: "FromOp", }, }, @@ -13889,10 +14011,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1983, col: 5, offset: 62159}, + pos: position{line: 1974, col: 5, offset: 62072}, run: (*parser).callonOptFromClause7, expr: &litMatcher{ - pos: position{line: 1983, col: 5, offset: 62159}, + pos: position{line: 1974, col: 5, offset: 62072}, val: "", ignoreCase: false, want: "\"\"", @@ -13905,27 +14027,27 @@ var g = &grammar{ }, { name: "OptWhereClause", - pos: position{line: 1985, col: 1, offset: 62200}, + pos: position{line: 1976, col: 1, offset: 62113}, expr: &choiceExpr{ - pos: position{line: 1986, col: 5, offset: 62219}, + pos: position{line: 1977, col: 5, offset: 62132}, alternatives: []any{ &actionExpr{ - pos: position{line: 1986, col: 5, offset: 62219}, + pos: position{line: 1977, col: 5, offset: 62132}, run: (*parser).callonOptWhereClause2, expr: &labeledExpr{ - pos: position{line: 1986, col: 5, offset: 62219}, + pos: position{line: 1977, col: 5, offset: 62132}, label: "where", expr: &ruleRefExpr{ - pos: position{line: 1986, col: 11, offset: 62225}, + pos: position{line: 1977, col: 11, offset: 62138}, name: "WhereClause", }, }, }, &actionExpr{ - pos: position{line: 1987, col: 5, offset: 62267}, + pos: position{line: 1978, col: 5, offset: 62180}, run: (*parser).callonOptWhereClause5, expr: &litMatcher{ - pos: position{line: 1987, col: 5, offset: 62267}, + pos: position{line: 1978, col: 5, offset: 62180}, val: "", ignoreCase: false, want: "\"\"", @@ -13938,25 +14060,25 @@ var g = &grammar{ }, { name: "OptGroupClause", - pos: position{line: 1989, col: 1, offset: 62312}, + pos: position{line: 1980, col: 1, offset: 62225}, expr: &choiceExpr{ - pos: position{line: 1990, col: 5, offset: 62331}, + pos: position{line: 1981, col: 5, offset: 62244}, alternatives: []any{ &actionExpr{ - pos: position{line: 1990, col: 5, offset: 62331}, + pos: position{line: 1981, col: 5, offset: 62244}, run: (*parser).callonOptGroupClause2, expr: &seqExpr{ - pos: position{line: 1990, col: 5, offset: 62331}, + pos: position{line: 1981, col: 5, offset: 62244}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1990, col: 5, offset: 62331}, + pos: position{line: 1981, col: 5, offset: 62244}, name: "_", }, &labeledExpr{ - pos: position{line: 1990, col: 7, offset: 62333}, + pos: position{line: 1981, col: 7, offset: 62246}, label: "group", expr: &ruleRefExpr{ - pos: position{line: 1990, col: 13, offset: 62339}, + pos: position{line: 1981, col: 13, offset: 62252}, name: "GroupClause", }, }, @@ -13964,10 +14086,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1991, col: 5, offset: 62377}, + pos: position{line: 1982, col: 5, offset: 62290}, run: (*parser).callonOptGroupClause7, expr: &litMatcher{ - pos: position{line: 1991, col: 5, offset: 62377}, + pos: position{line: 1982, col: 5, offset: 62290}, val: "", ignoreCase: false, want: "\"\"", @@ -13980,34 +14102,34 @@ var g = &grammar{ }, { name: "GroupClause", - pos: position{line: 1993, col: 1, offset: 62418}, + pos: position{line: 1984, col: 1, offset: 62331}, expr: &actionExpr{ - pos: position{line: 1994, col: 5, offset: 62434}, + pos: position{line: 1985, col: 5, offset: 62347}, run: (*parser).callonGroupClause1, expr: &seqExpr{ - pos: position{line: 1994, col: 5, offset: 62434}, + pos: position{line: 1985, col: 5, offset: 62347}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1994, col: 5, offset: 62434}, + pos: position{line: 1985, col: 5, offset: 62347}, name: "GROUP", }, &ruleRefExpr{ - pos: position{line: 1994, col: 11, offset: 62440}, + pos: position{line: 1985, col: 11, offset: 62353}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1994, col: 13, offset: 62442}, + pos: position{line: 1985, col: 13, offset: 62355}, name: "BY", }, &ruleRefExpr{ - pos: position{line: 1994, col: 16, offset: 62445}, + pos: position{line: 1985, col: 16, offset: 62358}, name: "_", }, &labeledExpr{ - pos: position{line: 1994, col: 18, offset: 62447}, + pos: position{line: 1985, col: 18, offset: 62360}, label: "list", expr: &ruleRefExpr{ - pos: position{line: 1994, col: 23, offset: 62452}, + pos: position{line: 1985, col: 23, offset: 62365}, name: "GroupByList", }, }, @@ -14019,51 +14141,51 @@ var g = &grammar{ }, { name: "GroupByList", - pos: position{line: 1996, col: 1, offset: 62486}, + pos: position{line: 1987, col: 1, offset: 62399}, expr: &actionExpr{ - pos: position{line: 1997, col: 5, offset: 62503}, + pos: position{line: 1988, col: 5, offset: 62416}, run: (*parser).callonGroupByList1, expr: &seqExpr{ - pos: position{line: 1997, col: 5, offset: 62503}, + pos: position{line: 1988, col: 5, offset: 62416}, exprs: []any{ &labeledExpr{ - pos: position{line: 1997, col: 5, offset: 62503}, + pos: position{line: 1988, col: 5, offset: 62416}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1997, col: 11, offset: 62509}, + pos: position{line: 1988, col: 11, offset: 62422}, name: "GroupByItem", }, }, &labeledExpr{ - pos: position{line: 1997, col: 23, offset: 62521}, + pos: position{line: 1988, col: 23, offset: 62434}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1997, col: 28, offset: 62526}, + pos: position{line: 1988, col: 28, offset: 62439}, expr: &actionExpr{ - pos: position{line: 1997, col: 30, offset: 62528}, + pos: position{line: 1988, col: 30, offset: 62441}, run: (*parser).callonGroupByList7, expr: &seqExpr{ - pos: position{line: 1997, col: 30, offset: 62528}, + pos: position{line: 1988, col: 30, offset: 62441}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1997, col: 30, offset: 62528}, + pos: position{line: 1988, col: 30, offset: 62441}, name: "__", }, &litMatcher{ - pos: position{line: 1997, col: 33, offset: 62531}, + pos: position{line: 1988, col: 33, offset: 62444}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1997, col: 37, offset: 62535}, + pos: position{line: 1988, col: 37, offset: 62448}, name: "__", }, &labeledExpr{ - pos: position{line: 1997, col: 40, offset: 62538}, + pos: position{line: 1988, col: 40, offset: 62451}, label: "g", expr: &ruleRefExpr{ - pos: position{line: 1997, col: 42, offset: 62540}, + pos: position{line: 1988, col: 42, offset: 62453}, name: "GroupByItem", }, }, @@ -14080,9 +14202,9 @@ var g = &grammar{ }, { name: "GroupByItem", - pos: position{line: 2001, col: 1, offset: 62621}, + pos: position{line: 1992, col: 1, offset: 62534}, expr: &ruleRefExpr{ - pos: position{line: 2001, col: 15, offset: 62635}, + pos: position{line: 1992, col: 15, offset: 62548}, name: "Expr", }, leader: false, @@ -14090,25 +14212,25 @@ var g = &grammar{ }, { name: "OptHavingClause", - pos: position{line: 2003, col: 1, offset: 62641}, + pos: position{line: 1994, col: 1, offset: 62554}, expr: &choiceExpr{ - pos: position{line: 2004, col: 5, offset: 62661}, + pos: position{line: 1995, col: 5, offset: 62574}, alternatives: []any{ &actionExpr{ - pos: position{line: 2004, col: 5, offset: 62661}, + pos: position{line: 1995, col: 5, offset: 62574}, run: (*parser).callonOptHavingClause2, expr: &seqExpr{ - pos: position{line: 2004, col: 5, offset: 62661}, + pos: position{line: 1995, col: 5, offset: 62574}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2004, col: 5, offset: 62661}, + pos: position{line: 1995, col: 5, offset: 62574}, name: "_", }, &labeledExpr{ - pos: position{line: 2004, col: 7, offset: 62663}, + pos: position{line: 1995, col: 7, offset: 62576}, label: "h", expr: &ruleRefExpr{ - pos: position{line: 2004, col: 9, offset: 62665}, + pos: position{line: 1995, col: 9, offset: 62578}, name: "HavingClause", }, }, @@ -14116,10 +14238,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2005, col: 5, offset: 62700}, + pos: position{line: 1996, col: 5, offset: 62613}, run: (*parser).callonOptHavingClause7, expr: &litMatcher{ - pos: position{line: 2005, col: 5, offset: 62700}, + pos: position{line: 1996, col: 5, offset: 62613}, val: "", ignoreCase: false, want: "\"\"", @@ -14132,26 +14254,26 @@ var g = &grammar{ }, { name: "HavingClause", - pos: position{line: 2007, col: 1, offset: 62724}, + pos: position{line: 1998, col: 1, offset: 62637}, expr: &actionExpr{ - pos: position{line: 2008, col: 5, offset: 62741}, + pos: position{line: 1999, col: 5, offset: 62654}, run: (*parser).callonHavingClause1, expr: &seqExpr{ - pos: position{line: 2008, col: 5, offset: 62741}, + pos: position{line: 1999, col: 5, offset: 62654}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2008, col: 5, offset: 62741}, + pos: position{line: 1999, col: 5, offset: 62654}, name: "HAVING", }, &ruleRefExpr{ - pos: position{line: 2008, col: 12, offset: 62748}, + pos: position{line: 1999, col: 12, offset: 62661}, name: "_", }, &labeledExpr{ - pos: position{line: 2008, col: 14, offset: 62750}, + pos: position{line: 1999, col: 14, offset: 62663}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2008, col: 16, offset: 62752}, + pos: position{line: 1999, col: 16, offset: 62665}, name: "Expr", }, }, @@ -14163,16 +14285,16 @@ var g = &grammar{ }, { name: "JoinOperation", - pos: position{line: 2010, col: 1, offset: 62776}, + pos: position{line: 2001, col: 1, offset: 62689}, expr: &choiceExpr{ - pos: position{line: 2011, col: 5, offset: 62794}, + pos: position{line: 2002, col: 5, offset: 62707}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 2011, col: 5, offset: 62794}, + pos: position{line: 2002, col: 5, offset: 62707}, name: "CrossJoin", }, &ruleRefExpr{ - pos: position{line: 2012, col: 5, offset: 62808}, + pos: position{line: 2003, col: 5, offset: 62721}, name: "ConditionJoin", }, }, @@ -14182,30 +14304,30 @@ var g = &grammar{ }, { name: "CrossJoin", - pos: position{line: 2014, col: 1, offset: 62823}, + pos: position{line: 2005, col: 1, offset: 62736}, expr: &actionExpr{ - pos: position{line: 2015, col: 5, offset: 62837}, + pos: position{line: 2006, col: 5, offset: 62750}, run: (*parser).callonCrossJoin1, expr: &seqExpr{ - pos: position{line: 2015, col: 5, offset: 62837}, + pos: position{line: 2006, col: 5, offset: 62750}, exprs: []any{ &labeledExpr{ - pos: position{line: 2015, col: 5, offset: 62837}, + pos: position{line: 2006, col: 5, offset: 62750}, label: "left", expr: &ruleRefExpr{ - pos: position{line: 2015, col: 10, offset: 62842}, + pos: position{line: 2006, col: 10, offset: 62755}, name: "FromElem", }, }, &ruleRefExpr{ - pos: position{line: 2015, col: 19, offset: 62851}, + pos: position{line: 2006, col: 19, offset: 62764}, name: "CrossJoinOp", }, &labeledExpr{ - pos: position{line: 2015, col: 31, offset: 62863}, + pos: position{line: 2006, col: 31, offset: 62776}, label: "right", expr: &ruleRefExpr{ - pos: position{line: 2015, col: 37, offset: 62869}, + pos: position{line: 2006, col: 37, offset: 62782}, name: "FromElem", }, }, @@ -14217,50 +14339,50 @@ var g = &grammar{ }, { name: "CrossJoinOp", - pos: position{line: 2024, col: 1, offset: 63071}, + pos: position{line: 2015, col: 1, offset: 62984}, expr: &choiceExpr{ - pos: position{line: 2025, col: 5, offset: 63088}, + pos: position{line: 2016, col: 5, offset: 63001}, alternatives: []any{ &seqExpr{ - pos: position{line: 2025, col: 5, offset: 63088}, + pos: position{line: 2016, col: 5, offset: 63001}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2025, col: 5, offset: 63088}, + pos: position{line: 2016, col: 5, offset: 63001}, name: "__", }, &litMatcher{ - pos: position{line: 2025, col: 8, offset: 63091}, + pos: position{line: 2016, col: 8, offset: 63004}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 2025, col: 12, offset: 63095}, + pos: position{line: 2016, col: 12, offset: 63008}, name: "__", }, }, }, &seqExpr{ - pos: position{line: 2026, col: 5, offset: 63103}, + pos: position{line: 2017, col: 5, offset: 63016}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2026, col: 5, offset: 63103}, + pos: position{line: 2017, col: 5, offset: 63016}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2026, col: 7, offset: 63105}, + pos: position{line: 2017, col: 7, offset: 63018}, name: "CROSS", }, &ruleRefExpr{ - pos: position{line: 2026, col: 13, offset: 63111}, + pos: position{line: 2017, col: 13, offset: 63024}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2026, col: 15, offset: 63113}, + pos: position{line: 2017, col: 15, offset: 63026}, name: "JOIN", }, &ruleRefExpr{ - pos: position{line: 2026, col: 20, offset: 63118}, + pos: position{line: 2017, col: 20, offset: 63031}, name: "_", }, }, @@ -14272,46 +14394,46 @@ var g = &grammar{ }, { name: "ConditionJoin", - pos: position{line: 2028, col: 1, offset: 63122}, + pos: position{line: 2019, col: 1, offset: 63035}, expr: &actionExpr{ - pos: position{line: 2029, col: 5, offset: 63140}, + pos: position{line: 2020, col: 5, offset: 63053}, run: (*parser).callonConditionJoin1, expr: &seqExpr{ - pos: position{line: 2029, col: 5, offset: 63140}, + pos: position{line: 2020, col: 5, offset: 63053}, exprs: []any{ &labeledExpr{ - pos: position{line: 2029, col: 5, offset: 63140}, + pos: position{line: 2020, col: 5, offset: 63053}, label: "left", expr: &ruleRefExpr{ - pos: position{line: 2029, col: 10, offset: 63145}, + pos: position{line: 2020, col: 10, offset: 63058}, name: "FromElem", }, }, &labeledExpr{ - pos: position{line: 2029, col: 19, offset: 63154}, + pos: position{line: 2020, col: 19, offset: 63067}, label: "style", expr: &ruleRefExpr{ - pos: position{line: 2029, col: 25, offset: 63160}, + pos: position{line: 2020, col: 25, offset: 63073}, name: "SQLJoinStyle", }, }, &ruleRefExpr{ - pos: position{line: 2029, col: 38, offset: 63173}, + pos: position{line: 2020, col: 38, offset: 63086}, name: "_", }, &labeledExpr{ - pos: position{line: 2029, col: 40, offset: 63175}, + pos: position{line: 2020, col: 40, offset: 63088}, label: "right", expr: &ruleRefExpr{ - pos: position{line: 2029, col: 46, offset: 63181}, + pos: position{line: 2020, col: 46, offset: 63094}, name: "FromElem", }, }, &labeledExpr{ - pos: position{line: 2029, col: 55, offset: 63190}, + pos: position{line: 2020, col: 55, offset: 63103}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2029, col: 57, offset: 63192}, + pos: position{line: 2020, col: 57, offset: 63105}, name: "JoinExpr", }, }, @@ -14323,161 +14445,161 @@ var g = &grammar{ }, { name: "SQLJoinStyle", - pos: position{line: 2040, col: 1, offset: 63461}, + pos: position{line: 2031, col: 1, offset: 63374}, expr: &choiceExpr{ - pos: position{line: 2041, col: 5, offset: 63479}, + pos: position{line: 2032, col: 5, offset: 63392}, alternatives: []any{ &actionExpr{ - pos: position{line: 2041, col: 5, offset: 63479}, + pos: position{line: 2032, col: 5, offset: 63392}, run: (*parser).callonSQLJoinStyle2, expr: &seqExpr{ - pos: position{line: 2041, col: 5, offset: 63479}, + pos: position{line: 2032, col: 5, offset: 63392}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 2041, col: 5, offset: 63479}, + pos: position{line: 2032, col: 5, offset: 63392}, expr: &seqExpr{ - pos: position{line: 2041, col: 6, offset: 63480}, + pos: position{line: 2032, col: 6, offset: 63393}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2041, col: 6, offset: 63480}, + pos: position{line: 2032, col: 6, offset: 63393}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2041, col: 8, offset: 63482}, + pos: position{line: 2032, col: 8, offset: 63395}, name: "INNER", }, }, }, }, &ruleRefExpr{ - pos: position{line: 2041, col: 16, offset: 63490}, + pos: position{line: 2032, col: 16, offset: 63403}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2041, col: 18, offset: 63492}, + pos: position{line: 2032, col: 18, offset: 63405}, name: "JOIN", }, }, }, }, &actionExpr{ - pos: position{line: 2042, col: 5, offset: 63537}, + pos: position{line: 2033, col: 5, offset: 63450}, run: (*parser).callonSQLJoinStyle10, expr: &seqExpr{ - pos: position{line: 2042, col: 5, offset: 63537}, + pos: position{line: 2033, col: 5, offset: 63450}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2042, col: 5, offset: 63537}, + pos: position{line: 2033, col: 5, offset: 63450}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2042, col: 7, offset: 63539}, + pos: position{line: 2033, col: 7, offset: 63452}, name: "FULL", }, &zeroOrOneExpr{ - pos: position{line: 2042, col: 12, offset: 63544}, + pos: position{line: 2033, col: 12, offset: 63457}, expr: &seqExpr{ - pos: position{line: 2042, col: 13, offset: 63545}, + pos: position{line: 2033, col: 13, offset: 63458}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2042, col: 13, offset: 63545}, + pos: position{line: 2033, col: 13, offset: 63458}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2042, col: 15, offset: 63547}, + pos: position{line: 2033, col: 15, offset: 63460}, name: "OUTER", }, }, }, }, &ruleRefExpr{ - pos: position{line: 2042, col: 23, offset: 63555}, + pos: position{line: 2033, col: 23, offset: 63468}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2042, col: 25, offset: 63557}, + pos: position{line: 2033, col: 25, offset: 63470}, name: "JOIN", }, }, }, }, &actionExpr{ - pos: position{line: 2043, col: 5, offset: 63591}, + pos: position{line: 2034, col: 5, offset: 63504}, run: (*parser).callonSQLJoinStyle20, expr: &seqExpr{ - pos: position{line: 2043, col: 5, offset: 63591}, + pos: position{line: 2034, col: 5, offset: 63504}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2043, col: 5, offset: 63591}, + pos: position{line: 2034, col: 5, offset: 63504}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2043, col: 7, offset: 63593}, + pos: position{line: 2034, col: 7, offset: 63506}, name: "LEFT", }, &zeroOrOneExpr{ - pos: position{line: 2043, col: 12, offset: 63598}, + pos: position{line: 2034, col: 12, offset: 63511}, expr: &seqExpr{ - pos: position{line: 2043, col: 13, offset: 63599}, + pos: position{line: 2034, col: 13, offset: 63512}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2043, col: 13, offset: 63599}, + pos: position{line: 2034, col: 13, offset: 63512}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2043, col: 15, offset: 63601}, + pos: position{line: 2034, col: 15, offset: 63514}, name: "OUTER", }, }, }, }, &ruleRefExpr{ - pos: position{line: 2043, col: 23, offset: 63609}, + pos: position{line: 2034, col: 23, offset: 63522}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2043, col: 25, offset: 63611}, + pos: position{line: 2034, col: 25, offset: 63524}, name: "JOIN", }, }, }, }, &actionExpr{ - pos: position{line: 2044, col: 5, offset: 63645}, + pos: position{line: 2035, col: 5, offset: 63558}, run: (*parser).callonSQLJoinStyle30, expr: &seqExpr{ - pos: position{line: 2044, col: 5, offset: 63645}, + pos: position{line: 2035, col: 5, offset: 63558}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2044, col: 5, offset: 63645}, + pos: position{line: 2035, col: 5, offset: 63558}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2044, col: 7, offset: 63647}, + pos: position{line: 2035, col: 7, offset: 63560}, name: "RIGHT", }, &zeroOrOneExpr{ - pos: position{line: 2044, col: 13, offset: 63653}, + pos: position{line: 2035, col: 13, offset: 63566}, expr: &seqExpr{ - pos: position{line: 2044, col: 14, offset: 63654}, + pos: position{line: 2035, col: 14, offset: 63567}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2044, col: 14, offset: 63654}, + pos: position{line: 2035, col: 14, offset: 63567}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2044, col: 16, offset: 63656}, + pos: position{line: 2035, col: 16, offset: 63569}, name: "OUTER", }, }, }, }, &ruleRefExpr{ - pos: position{line: 2044, col: 24, offset: 63664}, + pos: position{line: 2035, col: 24, offset: 63577}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2044, col: 26, offset: 63666}, + pos: position{line: 2035, col: 26, offset: 63579}, name: "JOIN", }, }, @@ -14490,33 +14612,33 @@ var g = &grammar{ }, { name: "JoinExpr", - pos: position{line: 2046, col: 1, offset: 63698}, + pos: position{line: 2037, col: 1, offset: 63611}, expr: &choiceExpr{ - pos: position{line: 2047, col: 5, offset: 63712}, + pos: position{line: 2038, col: 5, offset: 63625}, alternatives: []any{ &actionExpr{ - pos: position{line: 2047, col: 5, offset: 63712}, + pos: position{line: 2038, col: 5, offset: 63625}, run: (*parser).callonJoinExpr2, expr: &seqExpr{ - pos: position{line: 2047, col: 5, offset: 63712}, + pos: position{line: 2038, col: 5, offset: 63625}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2047, col: 5, offset: 63712}, + pos: position{line: 2038, col: 5, offset: 63625}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2047, col: 7, offset: 63714}, + pos: position{line: 2038, col: 7, offset: 63627}, name: "ON", }, &ruleRefExpr{ - pos: position{line: 2047, col: 10, offset: 63717}, + pos: position{line: 2038, col: 10, offset: 63630}, name: "_", }, &labeledExpr{ - pos: position{line: 2047, col: 12, offset: 63719}, + pos: position{line: 2038, col: 12, offset: 63632}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2047, col: 14, offset: 63721}, + pos: position{line: 2038, col: 14, offset: 63634}, name: "Expr", }, }, @@ -14524,47 +14646,47 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2053, col: 5, offset: 63843}, + pos: position{line: 2044, col: 5, offset: 63756}, run: (*parser).callonJoinExpr9, expr: &seqExpr{ - pos: position{line: 2053, col: 5, offset: 63843}, + pos: position{line: 2044, col: 5, offset: 63756}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2053, col: 5, offset: 63843}, + pos: position{line: 2044, col: 5, offset: 63756}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2053, col: 7, offset: 63845}, + pos: position{line: 2044, col: 7, offset: 63758}, name: "USING", }, &ruleRefExpr{ - pos: position{line: 2053, col: 13, offset: 63851}, + pos: position{line: 2044, col: 13, offset: 63764}, name: "__", }, &litMatcher{ - pos: position{line: 2053, col: 16, offset: 63854}, + pos: position{line: 2044, col: 16, offset: 63767}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 2053, col: 20, offset: 63858}, + pos: position{line: 2044, col: 20, offset: 63771}, name: "__", }, &labeledExpr{ - pos: position{line: 2053, col: 23, offset: 63861}, + pos: position{line: 2044, col: 23, offset: 63774}, label: "fields", expr: &ruleRefExpr{ - pos: position{line: 2053, col: 30, offset: 63868}, + pos: position{line: 2044, col: 30, offset: 63781}, name: "FieldExprs", }, }, &ruleRefExpr{ - pos: position{line: 2053, col: 41, offset: 63879}, + pos: position{line: 2044, col: 41, offset: 63792}, name: "__", }, &litMatcher{ - pos: position{line: 2053, col: 44, offset: 63882}, + pos: position{line: 2044, col: 44, offset: 63795}, val: ")", ignoreCase: false, want: "\")\"", @@ -14579,40 +14701,40 @@ var g = &grammar{ }, { name: "OptOrdinality", - pos: position{line: 2060, col: 1, offset: 64019}, + pos: position{line: 2051, col: 1, offset: 63932}, expr: &choiceExpr{ - pos: position{line: 2061, col: 5, offset: 64038}, + pos: position{line: 2052, col: 5, offset: 63951}, alternatives: []any{ &actionExpr{ - pos: position{line: 2061, col: 5, offset: 64038}, + pos: position{line: 2052, col: 5, offset: 63951}, run: (*parser).callonOptOrdinality2, expr: &seqExpr{ - pos: position{line: 2061, col: 5, offset: 64038}, + pos: position{line: 2052, col: 5, offset: 63951}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2061, col: 5, offset: 64038}, + pos: position{line: 2052, col: 5, offset: 63951}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2061, col: 7, offset: 64040}, + pos: position{line: 2052, col: 7, offset: 63953}, name: "WITH", }, &ruleRefExpr{ - pos: position{line: 2061, col: 12, offset: 64045}, + pos: position{line: 2052, col: 12, offset: 63958}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2061, col: 14, offset: 64047}, + pos: position{line: 2052, col: 14, offset: 63960}, name: "ORDINALITY", }, }, }, }, &actionExpr{ - pos: position{line: 2067, col: 5, offset: 64176}, + pos: position{line: 2058, col: 5, offset: 64089}, run: (*parser).callonOptOrdinality8, expr: &litMatcher{ - pos: position{line: 2067, col: 5, offset: 64176}, + pos: position{line: 2058, col: 5, offset: 64089}, val: "", ignoreCase: false, want: "\"\"", @@ -14625,25 +14747,25 @@ var g = &grammar{ }, { name: "OptAlias", - pos: position{line: 2069, col: 1, offset: 64225}, + pos: position{line: 2060, col: 1, offset: 64138}, expr: &choiceExpr{ - pos: position{line: 2070, col: 5, offset: 64238}, + pos: position{line: 2061, col: 5, offset: 64151}, alternatives: []any{ &actionExpr{ - pos: position{line: 2070, col: 5, offset: 64238}, + pos: position{line: 2061, col: 5, offset: 64151}, run: (*parser).callonOptAlias2, expr: &seqExpr{ - pos: position{line: 2070, col: 5, offset: 64238}, + pos: position{line: 2061, col: 5, offset: 64151}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2070, col: 5, offset: 64238}, + pos: position{line: 2061, col: 5, offset: 64151}, name: "_", }, &labeledExpr{ - pos: position{line: 2070, col: 7, offset: 64240}, + pos: position{line: 2061, col: 7, offset: 64153}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 2070, col: 9, offset: 64242}, + pos: position{line: 2061, col: 9, offset: 64155}, name: "AliasClause", }, }, @@ -14651,10 +14773,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2071, col: 5, offset: 64276}, + pos: position{line: 2062, col: 5, offset: 64189}, run: (*parser).callonOptAlias7, expr: &litMatcher{ - pos: position{line: 2071, col: 5, offset: 64276}, + pos: position{line: 2062, col: 5, offset: 64189}, val: "", ignoreCase: false, want: "\"\"", @@ -14667,50 +14789,50 @@ var g = &grammar{ }, { name: "AliasClause", - pos: position{line: 2073, col: 1, offset: 64313}, + pos: position{line: 2064, col: 1, offset: 64226}, expr: &actionExpr{ - pos: position{line: 2074, col: 5, offset: 64330}, + pos: position{line: 2065, col: 5, offset: 64243}, run: (*parser).callonAliasClause1, expr: &seqExpr{ - pos: position{line: 2074, col: 5, offset: 64330}, + pos: position{line: 2065, col: 5, offset: 64243}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 2074, col: 5, offset: 64330}, + pos: position{line: 2065, col: 5, offset: 64243}, expr: &seqExpr{ - pos: position{line: 2074, col: 6, offset: 64331}, + pos: position{line: 2065, col: 6, offset: 64244}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2074, col: 6, offset: 64331}, + pos: position{line: 2065, col: 6, offset: 64244}, name: "AS", }, &ruleRefExpr{ - pos: position{line: 2074, col: 9, offset: 64334}, + pos: position{line: 2065, col: 9, offset: 64247}, name: "_", }, }, }, }, ¬Expr{ - pos: position{line: 2074, col: 13, offset: 64338}, + pos: position{line: 2065, col: 13, offset: 64251}, expr: &choiceExpr{ - pos: position{line: 2074, col: 15, offset: 64340}, + pos: position{line: 2065, col: 15, offset: 64253}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 2074, col: 15, offset: 64340}, + pos: position{line: 2065, col: 15, offset: 64253}, name: "SQLGuard", }, &ruleRefExpr{ - pos: position{line: 2074, col: 26, offset: 64351}, + pos: position{line: 2065, col: 26, offset: 64264}, name: "DeprecatedFroms", }, }, }, }, &labeledExpr{ - pos: position{line: 2074, col: 43, offset: 64368}, + pos: position{line: 2065, col: 43, offset: 64281}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 2074, col: 48, offset: 64373}, + pos: position{line: 2065, col: 48, offset: 64286}, name: "IdentifierName", }, }, @@ -14722,51 +14844,51 @@ var g = &grammar{ }, { name: "Selection", - pos: position{line: 2078, col: 1, offset: 64506}, + pos: position{line: 2069, col: 1, offset: 64419}, expr: &actionExpr{ - pos: position{line: 2079, col: 5, offset: 64520}, + pos: position{line: 2070, col: 5, offset: 64433}, run: (*parser).callonSelection1, expr: &seqExpr{ - pos: position{line: 2079, col: 5, offset: 64520}, + pos: position{line: 2070, col: 5, offset: 64433}, exprs: []any{ &labeledExpr{ - pos: position{line: 2079, col: 5, offset: 64520}, + pos: position{line: 2070, col: 5, offset: 64433}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 2079, col: 11, offset: 64526}, + pos: position{line: 2070, col: 11, offset: 64439}, name: "SelectElem", }, }, &labeledExpr{ - pos: position{line: 2079, col: 22, offset: 64537}, + pos: position{line: 2070, col: 22, offset: 64450}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 2079, col: 27, offset: 64542}, + pos: position{line: 2070, col: 27, offset: 64455}, expr: &actionExpr{ - pos: position{line: 2079, col: 29, offset: 64544}, + pos: position{line: 2070, col: 29, offset: 64457}, run: (*parser).callonSelection7, expr: &seqExpr{ - pos: position{line: 2079, col: 29, offset: 64544}, + pos: position{line: 2070, col: 29, offset: 64457}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2079, col: 29, offset: 64544}, + pos: position{line: 2070, col: 29, offset: 64457}, name: "__", }, &litMatcher{ - pos: position{line: 2079, col: 32, offset: 64547}, + pos: position{line: 2070, col: 32, offset: 64460}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 2079, col: 36, offset: 64551}, + pos: position{line: 2070, col: 36, offset: 64464}, name: "__", }, &labeledExpr{ - pos: position{line: 2079, col: 39, offset: 64554}, + pos: position{line: 2070, col: 39, offset: 64467}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 2079, col: 41, offset: 64556}, + pos: position{line: 2070, col: 41, offset: 64469}, name: "SelectElem", }, }, @@ -14783,29 +14905,29 @@ var g = &grammar{ }, { name: "SelectElem", - pos: position{line: 2088, col: 1, offset: 64782}, + pos: position{line: 2079, col: 1, offset: 64695}, expr: &choiceExpr{ - pos: position{line: 2089, col: 5, offset: 64798}, + pos: position{line: 2080, col: 5, offset: 64711}, alternatives: []any{ &actionExpr{ - pos: position{line: 2089, col: 5, offset: 64798}, + pos: position{line: 2080, col: 5, offset: 64711}, run: (*parser).callonSelectElem2, expr: &seqExpr{ - pos: position{line: 2089, col: 5, offset: 64798}, + pos: position{line: 2080, col: 5, offset: 64711}, exprs: []any{ &labeledExpr{ - pos: position{line: 2089, col: 5, offset: 64798}, + pos: position{line: 2080, col: 5, offset: 64711}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2089, col: 7, offset: 64800}, + pos: position{line: 2080, col: 7, offset: 64713}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 2089, col: 12, offset: 64805}, + pos: position{line: 2080, col: 12, offset: 64718}, label: "as", expr: &ruleRefExpr{ - pos: position{line: 2089, col: 15, offset: 64808}, + pos: position{line: 2080, col: 15, offset: 64721}, name: "OptAsClause", }, }, @@ -14813,10 +14935,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2100, col: 5, offset: 65024}, + pos: position{line: 2091, col: 5, offset: 64937}, run: (*parser).callonSelectElem8, expr: &litMatcher{ - pos: position{line: 2100, col: 5, offset: 65024}, + pos: position{line: 2091, col: 5, offset: 64937}, val: "*", ignoreCase: false, want: "\"*\"", @@ -14829,33 +14951,33 @@ var g = &grammar{ }, { name: "OptAsClause", - pos: position{line: 2105, col: 1, offset: 65126}, + pos: position{line: 2096, col: 1, offset: 65039}, expr: &choiceExpr{ - pos: position{line: 2106, col: 5, offset: 65143}, + pos: position{line: 2097, col: 5, offset: 65056}, alternatives: []any{ &actionExpr{ - pos: position{line: 2106, col: 5, offset: 65143}, + pos: position{line: 2097, col: 5, offset: 65056}, run: (*parser).callonOptAsClause2, expr: &seqExpr{ - pos: position{line: 2106, col: 5, offset: 65143}, + pos: position{line: 2097, col: 5, offset: 65056}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2106, col: 5, offset: 65143}, + pos: position{line: 2097, col: 5, offset: 65056}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2106, col: 7, offset: 65145}, + pos: position{line: 2097, col: 7, offset: 65058}, name: "AS", }, &ruleRefExpr{ - pos: position{line: 2106, col: 10, offset: 65148}, + pos: position{line: 2097, col: 10, offset: 65061}, name: "_", }, &labeledExpr{ - pos: position{line: 2106, col: 12, offset: 65150}, + pos: position{line: 2097, col: 12, offset: 65063}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 2106, col: 15, offset: 65153}, + pos: position{line: 2097, col: 15, offset: 65066}, name: "Identifier", }, }, @@ -14863,10 +14985,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2107, col: 5, offset: 65187}, + pos: position{line: 2098, col: 5, offset: 65100}, run: (*parser).callonOptAsClause9, expr: &litMatcher{ - pos: position{line: 2107, col: 5, offset: 65187}, + pos: position{line: 2098, col: 5, offset: 65100}, val: "", ignoreCase: false, want: "\"\"", @@ -14879,41 +15001,41 @@ var g = &grammar{ }, { name: "OptOrderByClause", - pos: position{line: 2109, col: 1, offset: 65212}, + pos: position{line: 2100, col: 1, offset: 65125}, expr: &choiceExpr{ - pos: position{line: 2110, col: 5, offset: 65234}, + pos: position{line: 2101, col: 5, offset: 65147}, alternatives: []any{ &actionExpr{ - pos: position{line: 2110, col: 5, offset: 65234}, + pos: position{line: 2101, col: 5, offset: 65147}, run: (*parser).callonOptOrderByClause2, expr: &seqExpr{ - pos: position{line: 2110, col: 5, offset: 65234}, + pos: position{line: 2101, col: 5, offset: 65147}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2110, col: 5, offset: 65234}, + pos: position{line: 2101, col: 5, offset: 65147}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2110, col: 7, offset: 65236}, + pos: position{line: 2101, col: 7, offset: 65149}, name: "ORDER", }, &ruleRefExpr{ - pos: position{line: 2110, col: 13, offset: 65242}, + pos: position{line: 2101, col: 13, offset: 65155}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2110, col: 15, offset: 65244}, + pos: position{line: 2101, col: 15, offset: 65157}, name: "BY", }, &ruleRefExpr{ - pos: position{line: 2110, col: 18, offset: 65247}, + pos: position{line: 2101, col: 18, offset: 65160}, name: "_", }, &labeledExpr{ - pos: position{line: 2110, col: 20, offset: 65249}, + pos: position{line: 2101, col: 20, offset: 65162}, label: "list", expr: &ruleRefExpr{ - pos: position{line: 2110, col: 25, offset: 65254}, + pos: position{line: 2101, col: 25, offset: 65167}, name: "OrderByList", }, }, @@ -14921,10 +15043,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2117, col: 5, offset: 65413}, + pos: position{line: 2108, col: 5, offset: 65326}, run: (*parser).callonOptOrderByClause11, expr: &litMatcher{ - pos: position{line: 2117, col: 5, offset: 65413}, + pos: position{line: 2108, col: 5, offset: 65326}, val: "", ignoreCase: false, want: "\"\"", @@ -14937,51 +15059,51 @@ var g = &grammar{ }, { name: "OrderByList", - pos: position{line: 2119, col: 1, offset: 65446}, + pos: position{line: 2110, col: 1, offset: 65359}, expr: &actionExpr{ - pos: position{line: 2120, col: 5, offset: 65463}, + pos: position{line: 2111, col: 5, offset: 65376}, run: (*parser).callonOrderByList1, expr: &seqExpr{ - pos: position{line: 2120, col: 5, offset: 65463}, + pos: position{line: 2111, col: 5, offset: 65376}, exprs: []any{ &labeledExpr{ - pos: position{line: 2120, col: 5, offset: 65463}, + pos: position{line: 2111, col: 5, offset: 65376}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 2120, col: 11, offset: 65469}, + pos: position{line: 2111, col: 11, offset: 65382}, name: "OrderByItem", }, }, &labeledExpr{ - pos: position{line: 2120, col: 23, offset: 65481}, + pos: position{line: 2111, col: 23, offset: 65394}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 2120, col: 28, offset: 65486}, + pos: position{line: 2111, col: 28, offset: 65399}, expr: &actionExpr{ - pos: position{line: 2120, col: 30, offset: 65488}, + pos: position{line: 2111, col: 30, offset: 65401}, run: (*parser).callonOrderByList7, expr: &seqExpr{ - pos: position{line: 2120, col: 30, offset: 65488}, + pos: position{line: 2111, col: 30, offset: 65401}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2120, col: 30, offset: 65488}, + pos: position{line: 2111, col: 30, offset: 65401}, name: "__", }, &litMatcher{ - pos: position{line: 2120, col: 33, offset: 65491}, + pos: position{line: 2111, col: 33, offset: 65404}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 2120, col: 37, offset: 65495}, + pos: position{line: 2111, col: 37, offset: 65408}, name: "__", }, &labeledExpr{ - pos: position{line: 2120, col: 40, offset: 65498}, + pos: position{line: 2111, col: 40, offset: 65411}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 2120, col: 42, offset: 65500}, + pos: position{line: 2111, col: 42, offset: 65413}, name: "OrderByItem", }, }, @@ -14998,34 +15120,34 @@ var g = &grammar{ }, { name: "OrderByItem", - pos: position{line: 2124, col: 1, offset: 65601}, + pos: position{line: 2115, col: 1, offset: 65514}, expr: &actionExpr{ - pos: position{line: 2125, col: 5, offset: 65617}, + pos: position{line: 2116, col: 5, offset: 65530}, run: (*parser).callonOrderByItem1, expr: &seqExpr{ - pos: position{line: 2125, col: 5, offset: 65617}, + pos: position{line: 2116, col: 5, offset: 65530}, exprs: []any{ &labeledExpr{ - pos: position{line: 2125, col: 5, offset: 65617}, + pos: position{line: 2116, col: 5, offset: 65530}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2125, col: 7, offset: 65619}, + pos: position{line: 2116, col: 7, offset: 65532}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 2125, col: 12, offset: 65624}, + pos: position{line: 2116, col: 12, offset: 65537}, label: "order", expr: &ruleRefExpr{ - pos: position{line: 2125, col: 18, offset: 65630}, + pos: position{line: 2116, col: 18, offset: 65543}, name: "OptAscDesc", }, }, &labeledExpr{ - pos: position{line: 2125, col: 29, offset: 65641}, + pos: position{line: 2116, col: 29, offset: 65554}, label: "nulls", expr: &ruleRefExpr{ - pos: position{line: 2125, col: 35, offset: 65647}, + pos: position{line: 2116, col: 35, offset: 65560}, name: "OptNullsOrder", }, }, @@ -15037,49 +15159,49 @@ var g = &grammar{ }, { name: "OptAscDesc", - pos: position{line: 2136, col: 1, offset: 65897}, + pos: position{line: 2127, col: 1, offset: 65810}, expr: &choiceExpr{ - pos: position{line: 2137, col: 5, offset: 65912}, + pos: position{line: 2128, col: 5, offset: 65825}, alternatives: []any{ &actionExpr{ - pos: position{line: 2137, col: 5, offset: 65912}, + pos: position{line: 2128, col: 5, offset: 65825}, run: (*parser).callonOptAscDesc2, expr: &seqExpr{ - pos: position{line: 2137, col: 5, offset: 65912}, + pos: position{line: 2128, col: 5, offset: 65825}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2137, col: 5, offset: 65912}, + pos: position{line: 2128, col: 5, offset: 65825}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2137, col: 7, offset: 65914}, + pos: position{line: 2128, col: 7, offset: 65827}, name: "ASC", }, }, }, }, &actionExpr{ - pos: position{line: 2138, col: 5, offset: 65986}, + pos: position{line: 2129, col: 5, offset: 65899}, run: (*parser).callonOptAscDesc6, expr: &seqExpr{ - pos: position{line: 2138, col: 5, offset: 65986}, + pos: position{line: 2129, col: 5, offset: 65899}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2138, col: 5, offset: 65986}, + pos: position{line: 2129, col: 5, offset: 65899}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2138, col: 7, offset: 65988}, + pos: position{line: 2129, col: 7, offset: 65901}, name: "DESC", }, }, }, }, &actionExpr{ - pos: position{line: 2139, col: 5, offset: 66060}, + pos: position{line: 2130, col: 5, offset: 65973}, run: (*parser).callonOptAscDesc10, expr: &litMatcher{ - pos: position{line: 2139, col: 5, offset: 66060}, + pos: position{line: 2130, col: 5, offset: 65973}, val: "", ignoreCase: false, want: "\"\"", @@ -15092,65 +15214,65 @@ var g = &grammar{ }, { name: "OptNullsOrder", - pos: position{line: 2141, col: 1, offset: 66092}, + pos: position{line: 2132, col: 1, offset: 66005}, expr: &choiceExpr{ - pos: position{line: 2142, col: 5, offset: 66110}, + pos: position{line: 2133, col: 5, offset: 66023}, alternatives: []any{ &actionExpr{ - pos: position{line: 2142, col: 5, offset: 66110}, + pos: position{line: 2133, col: 5, offset: 66023}, run: (*parser).callonOptNullsOrder2, expr: &seqExpr{ - pos: position{line: 2142, col: 5, offset: 66110}, + pos: position{line: 2133, col: 5, offset: 66023}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2142, col: 5, offset: 66110}, + pos: position{line: 2133, col: 5, offset: 66023}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2142, col: 7, offset: 66112}, + pos: position{line: 2133, col: 7, offset: 66025}, name: "NULLS", }, &ruleRefExpr{ - pos: position{line: 2142, col: 13, offset: 66118}, + pos: position{line: 2133, col: 13, offset: 66031}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2142, col: 15, offset: 66120}, + pos: position{line: 2133, col: 15, offset: 66033}, name: "FIRST", }, }, }, }, &actionExpr{ - pos: position{line: 2143, col: 5, offset: 66196}, + pos: position{line: 2134, col: 5, offset: 66109}, run: (*parser).callonOptNullsOrder8, expr: &seqExpr{ - pos: position{line: 2143, col: 5, offset: 66196}, + pos: position{line: 2134, col: 5, offset: 66109}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2143, col: 5, offset: 66196}, + pos: position{line: 2134, col: 5, offset: 66109}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2143, col: 7, offset: 66198}, + pos: position{line: 2134, col: 7, offset: 66111}, name: "NULLS", }, &ruleRefExpr{ - pos: position{line: 2143, col: 13, offset: 66204}, + pos: position{line: 2134, col: 13, offset: 66117}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2143, col: 15, offset: 66206}, + pos: position{line: 2134, col: 15, offset: 66119}, name: "LAST", }, }, }, }, &actionExpr{ - pos: position{line: 2144, col: 5, offset: 66281}, + pos: position{line: 2135, col: 5, offset: 66194}, run: (*parser).callonOptNullsOrder14, expr: &litMatcher{ - pos: position{line: 2144, col: 5, offset: 66281}, + pos: position{line: 2135, col: 5, offset: 66194}, val: "", ignoreCase: false, want: "\"\"", @@ -15163,29 +15285,29 @@ var g = &grammar{ }, { name: "SelectLimit", - pos: position{line: 2146, col: 1, offset: 66326}, + pos: position{line: 2137, col: 1, offset: 66239}, expr: &choiceExpr{ - pos: position{line: 2147, col: 5, offset: 66342}, + pos: position{line: 2138, col: 5, offset: 66255}, alternatives: []any{ &actionExpr{ - pos: position{line: 2147, col: 5, offset: 66342}, + pos: position{line: 2138, col: 5, offset: 66255}, run: (*parser).callonSelectLimit2, expr: &seqExpr{ - pos: position{line: 2147, col: 5, offset: 66342}, + pos: position{line: 2138, col: 5, offset: 66255}, exprs: []any{ &labeledExpr{ - pos: position{line: 2147, col: 5, offset: 66342}, + pos: position{line: 2138, col: 5, offset: 66255}, label: "l", expr: &ruleRefExpr{ - pos: position{line: 2147, col: 7, offset: 66344}, + pos: position{line: 2138, col: 7, offset: 66257}, name: "LimitClause", }, }, &labeledExpr{ - pos: position{line: 2147, col: 19, offset: 66356}, + pos: position{line: 2138, col: 19, offset: 66269}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 2147, col: 21, offset: 66358}, + pos: position{line: 2138, col: 21, offset: 66271}, name: "OptOffsetClause", }, }, @@ -15193,24 +15315,24 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2154, col: 5, offset: 66504}, + pos: position{line: 2145, col: 5, offset: 66417}, run: (*parser).callonSelectLimit8, expr: &seqExpr{ - pos: position{line: 2154, col: 5, offset: 66504}, + pos: position{line: 2145, col: 5, offset: 66417}, exprs: []any{ &labeledExpr{ - pos: position{line: 2154, col: 5, offset: 66504}, + pos: position{line: 2145, col: 5, offset: 66417}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 2154, col: 7, offset: 66506}, + pos: position{line: 2145, col: 7, offset: 66419}, name: "OffsetClause", }, }, &labeledExpr{ - pos: position{line: 2154, col: 20, offset: 66519}, + pos: position{line: 2145, col: 20, offset: 66432}, label: "l", expr: &ruleRefExpr{ - pos: position{line: 2154, col: 22, offset: 66521}, + pos: position{line: 2145, col: 22, offset: 66434}, name: "OptLimitClause", }, }, @@ -15224,25 +15346,25 @@ var g = &grammar{ }, { name: "OptLimitClause", - pos: position{line: 2167, col: 1, offset: 66793}, + pos: position{line: 2158, col: 1, offset: 66706}, expr: &choiceExpr{ - pos: position{line: 2168, col: 5, offset: 66813}, + pos: position{line: 2159, col: 5, offset: 66726}, alternatives: []any{ &actionExpr{ - pos: position{line: 2168, col: 5, offset: 66813}, + pos: position{line: 2159, col: 5, offset: 66726}, run: (*parser).callonOptLimitClause2, expr: &seqExpr{ - pos: position{line: 2168, col: 5, offset: 66813}, + pos: position{line: 2159, col: 5, offset: 66726}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2168, col: 5, offset: 66813}, + pos: position{line: 2159, col: 5, offset: 66726}, name: "_", }, &labeledExpr{ - pos: position{line: 2168, col: 7, offset: 66815}, + pos: position{line: 2159, col: 7, offset: 66728}, label: "l", expr: &ruleRefExpr{ - pos: position{line: 2168, col: 9, offset: 66817}, + pos: position{line: 2159, col: 9, offset: 66730}, name: "LimitClause", }, }, @@ -15250,10 +15372,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2169, col: 5, offset: 66851}, + pos: position{line: 2160, col: 5, offset: 66764}, run: (*parser).callonOptLimitClause7, expr: &litMatcher{ - pos: position{line: 2169, col: 5, offset: 66851}, + pos: position{line: 2160, col: 5, offset: 66764}, val: "", ignoreCase: false, want: "\"\"", @@ -15266,50 +15388,50 @@ var g = &grammar{ }, { name: "LimitClause", - pos: position{line: 2171, col: 1, offset: 66888}, + pos: position{line: 2162, col: 1, offset: 66801}, expr: &choiceExpr{ - pos: position{line: 2172, col: 5, offset: 66905}, + pos: position{line: 2163, col: 5, offset: 66818}, alternatives: []any{ &actionExpr{ - pos: position{line: 2172, col: 5, offset: 66905}, + pos: position{line: 2163, col: 5, offset: 66818}, run: (*parser).callonLimitClause2, expr: &seqExpr{ - pos: position{line: 2172, col: 5, offset: 66905}, + pos: position{line: 2163, col: 5, offset: 66818}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2172, col: 5, offset: 66905}, + pos: position{line: 2163, col: 5, offset: 66818}, name: "LIMIT", }, &ruleRefExpr{ - pos: position{line: 2172, col: 11, offset: 66911}, + pos: position{line: 2163, col: 11, offset: 66824}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2172, col: 13, offset: 66913}, + pos: position{line: 2163, col: 13, offset: 66826}, name: "ALL", }, }, }, }, &actionExpr{ - pos: position{line: 2173, col: 5, offset: 66975}, + pos: position{line: 2164, col: 5, offset: 66888}, run: (*parser).callonLimitClause7, expr: &seqExpr{ - pos: position{line: 2173, col: 5, offset: 66975}, + pos: position{line: 2164, col: 5, offset: 66888}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2173, col: 5, offset: 66975}, + pos: position{line: 2164, col: 5, offset: 66888}, name: "LIMIT", }, &ruleRefExpr{ - pos: position{line: 2173, col: 11, offset: 66981}, + pos: position{line: 2164, col: 11, offset: 66894}, name: "_", }, &labeledExpr{ - pos: position{line: 2173, col: 13, offset: 66983}, + pos: position{line: 2164, col: 13, offset: 66896}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2173, col: 15, offset: 66985}, + pos: position{line: 2164, col: 15, offset: 66898}, name: "Expr", }, }, @@ -15323,25 +15445,25 @@ var g = &grammar{ }, { name: "OptOffsetClause", - pos: position{line: 2181, col: 1, offset: 67110}, + pos: position{line: 2172, col: 1, offset: 67023}, expr: &choiceExpr{ - pos: position{line: 2182, col: 5, offset: 67131}, + pos: position{line: 2173, col: 5, offset: 67044}, alternatives: []any{ &actionExpr{ - pos: position{line: 2182, col: 5, offset: 67131}, + pos: position{line: 2173, col: 5, offset: 67044}, run: (*parser).callonOptOffsetClause2, expr: &seqExpr{ - pos: position{line: 2182, col: 5, offset: 67131}, + pos: position{line: 2173, col: 5, offset: 67044}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2182, col: 5, offset: 67131}, + pos: position{line: 2173, col: 5, offset: 67044}, name: "_", }, &labeledExpr{ - pos: position{line: 2182, col: 7, offset: 67133}, + pos: position{line: 2173, col: 7, offset: 67046}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 2182, col: 9, offset: 67135}, + pos: position{line: 2173, col: 9, offset: 67048}, name: "OffsetClause", }, }, @@ -15349,10 +15471,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2183, col: 5, offset: 67171}, + pos: position{line: 2174, col: 5, offset: 67084}, run: (*parser).callonOptOffsetClause7, expr: &litMatcher{ - pos: position{line: 2183, col: 5, offset: 67171}, + pos: position{line: 2174, col: 5, offset: 67084}, val: "", ignoreCase: false, want: "\"\"", @@ -15365,26 +15487,26 @@ var g = &grammar{ }, { name: "OffsetClause", - pos: position{line: 2185, col: 1, offset: 67196}, + pos: position{line: 2176, col: 1, offset: 67109}, expr: &actionExpr{ - pos: position{line: 2186, col: 5, offset: 67214}, + pos: position{line: 2177, col: 5, offset: 67127}, run: (*parser).callonOffsetClause1, expr: &seqExpr{ - pos: position{line: 2186, col: 5, offset: 67214}, + pos: position{line: 2177, col: 5, offset: 67127}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2186, col: 5, offset: 67214}, + pos: position{line: 2177, col: 5, offset: 67127}, name: "OFFSET", }, &ruleRefExpr{ - pos: position{line: 2186, col: 12, offset: 67221}, + pos: position{line: 2177, col: 12, offset: 67134}, name: "_", }, &labeledExpr{ - pos: position{line: 2186, col: 14, offset: 67223}, + pos: position{line: 2177, col: 14, offset: 67136}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2186, col: 16, offset: 67225}, + pos: position{line: 2177, col: 16, offset: 67138}, name: "Expr", }, }, @@ -15396,108 +15518,108 @@ var g = &grammar{ }, { name: "SetOperation", - pos: position{line: 2188, col: 1, offset: 67250}, + pos: position{line: 2179, col: 1, offset: 67163}, expr: &actionExpr{ - pos: position{line: 2189, col: 5, offset: 67267}, + pos: position{line: 2180, col: 5, offset: 67180}, run: (*parser).callonSetOperation1, expr: &seqExpr{ - pos: position{line: 2189, col: 5, offset: 67267}, + pos: position{line: 2180, col: 5, offset: 67180}, exprs: []any{ &labeledExpr{ - pos: position{line: 2189, col: 5, offset: 67267}, + pos: position{line: 2180, col: 5, offset: 67180}, label: "left", expr: &ruleRefExpr{ - pos: position{line: 2189, col: 10, offset: 67272}, + pos: position{line: 2180, col: 10, offset: 67185}, name: "SelectExpr", }, }, &labeledExpr{ - pos: position{line: 2189, col: 21, offset: 67283}, + pos: position{line: 2180, col: 21, offset: 67196}, label: "distinct", expr: &ruleRefExpr{ - pos: position{line: 2189, col: 30, offset: 67292}, + pos: position{line: 2180, col: 30, offset: 67205}, name: "SetOp", }, }, &ruleRefExpr{ - pos: position{line: 2189, col: 36, offset: 67298}, + pos: position{line: 2180, col: 36, offset: 67211}, name: "_", }, &labeledExpr{ - pos: position{line: 2189, col: 38, offset: 67300}, + pos: position{line: 2180, col: 38, offset: 67213}, label: "right", expr: &ruleRefExpr{ - pos: position{line: 2189, col: 44, offset: 67306}, + pos: position{line: 2180, col: 44, offset: 67219}, name: "SelectExpr", }, }, }, }, }, - leader: true, + leader: false, leftRecursive: true, }, { name: "SetOp", - pos: position{line: 2199, col: 1, offset: 67527}, + pos: position{line: 2190, col: 1, offset: 67440}, expr: &choiceExpr{ - pos: position{line: 2200, col: 5, offset: 67538}, + pos: position{line: 2191, col: 5, offset: 67451}, alternatives: []any{ &actionExpr{ - pos: position{line: 2200, col: 5, offset: 67538}, + pos: position{line: 2191, col: 5, offset: 67451}, run: (*parser).callonSetOp2, expr: &seqExpr{ - pos: position{line: 2200, col: 5, offset: 67538}, + pos: position{line: 2191, col: 5, offset: 67451}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2200, col: 5, offset: 67538}, + pos: position{line: 2191, col: 5, offset: 67451}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2200, col: 7, offset: 67540}, + pos: position{line: 2191, col: 7, offset: 67453}, name: "UNION", }, &ruleRefExpr{ - pos: position{line: 2200, col: 13, offset: 67546}, + pos: position{line: 2191, col: 13, offset: 67459}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2200, col: 15, offset: 67548}, + pos: position{line: 2191, col: 15, offset: 67461}, name: "ALL", }, }, }, }, &actionExpr{ - pos: position{line: 2201, col: 5, offset: 67584}, + pos: position{line: 2192, col: 5, offset: 67497}, run: (*parser).callonSetOp8, expr: &seqExpr{ - pos: position{line: 2201, col: 5, offset: 67584}, + pos: position{line: 2192, col: 5, offset: 67497}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2201, col: 5, offset: 67584}, + pos: position{line: 2192, col: 5, offset: 67497}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2201, col: 7, offset: 67586}, + pos: position{line: 2192, col: 7, offset: 67499}, name: "UNION", }, &ruleRefExpr{ - pos: position{line: 2201, col: 13, offset: 67592}, + pos: position{line: 2192, col: 13, offset: 67505}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2201, col: 15, offset: 67594}, + pos: position{line: 2192, col: 15, offset: 67507}, name: "DISTINCT", }, }, }, }, &actionExpr{ - pos: position{line: 2202, col: 5, offset: 67629}, + pos: position{line: 2193, col: 5, offset: 67542}, run: (*parser).callonSetOp14, expr: &litMatcher{ - pos: position{line: 2202, col: 5, offset: 67629}, + pos: position{line: 2193, col: 5, offset: 67542}, val: "", ignoreCase: false, want: "\"\"", @@ -15510,80 +15632,80 @@ var g = &grammar{ }, { name: "SQLGuard", - pos: position{line: 2205, col: 1, offset: 67692}, + pos: position{line: 2196, col: 1, offset: 67605}, expr: &choiceExpr{ - pos: position{line: 2206, col: 5, offset: 67707}, + pos: position{line: 2197, col: 5, offset: 67620}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 2206, col: 5, offset: 67707}, + pos: position{line: 2197, col: 5, offset: 67620}, name: "FROM", }, &ruleRefExpr{ - pos: position{line: 2206, col: 12, offset: 67714}, + pos: position{line: 2197, col: 12, offset: 67627}, name: "GROUP", }, &ruleRefExpr{ - pos: position{line: 2206, col: 20, offset: 67722}, + pos: position{line: 2197, col: 20, offset: 67635}, name: "HAVING", }, &ruleRefExpr{ - pos: position{line: 2206, col: 29, offset: 67731}, + pos: position{line: 2197, col: 29, offset: 67644}, name: "SELECT", }, &ruleRefExpr{ - pos: position{line: 2206, col: 38, offset: 67740}, + pos: position{line: 2197, col: 38, offset: 67653}, name: "RECURSIVE", }, &ruleRefExpr{ - pos: position{line: 2207, col: 5, offset: 67754}, + pos: position{line: 2198, col: 5, offset: 67667}, name: "INNER", }, &ruleRefExpr{ - pos: position{line: 2207, col: 13, offset: 67762}, + pos: position{line: 2198, col: 13, offset: 67675}, name: "LEFT", }, &ruleRefExpr{ - pos: position{line: 2207, col: 20, offset: 67769}, + pos: position{line: 2198, col: 20, offset: 67682}, name: "RIGHT", }, &ruleRefExpr{ - pos: position{line: 2207, col: 28, offset: 67777}, + pos: position{line: 2198, col: 28, offset: 67690}, name: "OUTER", }, &ruleRefExpr{ - pos: position{line: 2207, col: 36, offset: 67785}, + pos: position{line: 2198, col: 36, offset: 67698}, name: "CROSS", }, &ruleRefExpr{ - pos: position{line: 2207, col: 44, offset: 67793}, + pos: position{line: 2198, col: 44, offset: 67706}, name: "JOIN", }, &ruleRefExpr{ - pos: position{line: 2208, col: 5, offset: 67802}, + pos: position{line: 2199, col: 5, offset: 67715}, name: "UNION", }, &ruleRefExpr{ - pos: position{line: 2209, col: 5, offset: 67812}, + pos: position{line: 2200, col: 5, offset: 67725}, name: "ORDER", }, &ruleRefExpr{ - pos: position{line: 2210, col: 5, offset: 67822}, + pos: position{line: 2201, col: 5, offset: 67735}, name: "LIMIT", }, &ruleRefExpr{ - pos: position{line: 2211, col: 5, offset: 67832}, + pos: position{line: 2202, col: 5, offset: 67745}, name: "WHERE", }, &ruleRefExpr{ - pos: position{line: 2212, col: 5, offset: 67843}, + pos: position{line: 2203, col: 5, offset: 67756}, name: "WITH", }, &ruleRefExpr{ - pos: position{line: 2213, col: 5, offset: 67852}, + pos: position{line: 2204, col: 5, offset: 67765}, name: "USING", }, &ruleRefExpr{ - pos: position{line: 2214, col: 5, offset: 67862}, + pos: position{line: 2205, col: 5, offset: 67775}, name: "ON", }, }, @@ -15593,20 +15715,20 @@ var g = &grammar{ }, { name: "AGGREGATE", - pos: position{line: 2216, col: 1, offset: 67866}, + pos: position{line: 2207, col: 1, offset: 67779}, expr: &seqExpr{ - pos: position{line: 2216, col: 14, offset: 67879}, + pos: position{line: 2207, col: 14, offset: 67792}, exprs: []any{ &litMatcher{ - pos: position{line: 2216, col: 14, offset: 67879}, + pos: position{line: 2207, col: 14, offset: 67792}, val: "aggregate", ignoreCase: true, want: "\"AGGREGATE\"i", }, ¬Expr{ - pos: position{line: 2216, col: 33, offset: 67898}, + pos: position{line: 2207, col: 33, offset: 67811}, expr: &ruleRefExpr{ - pos: position{line: 2216, col: 34, offset: 67899}, + pos: position{line: 2207, col: 34, offset: 67812}, name: "IdentifierRest", }, }, @@ -15617,20 +15739,20 @@ var g = &grammar{ }, { name: "ALL", - pos: position{line: 2217, col: 1, offset: 67914}, + pos: position{line: 2208, col: 1, offset: 67827}, expr: &seqExpr{ - pos: position{line: 2217, col: 14, offset: 67927}, + pos: position{line: 2208, col: 14, offset: 67840}, exprs: []any{ &litMatcher{ - pos: position{line: 2217, col: 14, offset: 67927}, + pos: position{line: 2208, col: 14, offset: 67840}, val: "all", ignoreCase: true, want: "\"ALL\"i", }, ¬Expr{ - pos: position{line: 2217, col: 33, offset: 67946}, + pos: position{line: 2208, col: 33, offset: 67859}, expr: &ruleRefExpr{ - pos: position{line: 2217, col: 34, offset: 67947}, + pos: position{line: 2208, col: 34, offset: 67860}, name: "IdentifierRest", }, }, @@ -15641,23 +15763,23 @@ var g = &grammar{ }, { name: "AND", - pos: position{line: 2218, col: 1, offset: 67962}, + pos: position{line: 2209, col: 1, offset: 67875}, expr: &actionExpr{ - pos: position{line: 2218, col: 14, offset: 67975}, + pos: position{line: 2209, col: 14, offset: 67888}, run: (*parser).callonAND1, expr: &seqExpr{ - pos: position{line: 2218, col: 14, offset: 67975}, + pos: position{line: 2209, col: 14, offset: 67888}, exprs: []any{ &litMatcher{ - pos: position{line: 2218, col: 14, offset: 67975}, + pos: position{line: 2209, col: 14, offset: 67888}, val: "and", ignoreCase: true, want: "\"AND\"i", }, ¬Expr{ - pos: position{line: 2218, col: 33, offset: 67994}, + pos: position{line: 2209, col: 33, offset: 67907}, expr: &ruleRefExpr{ - pos: position{line: 2218, col: 34, offset: 67995}, + pos: position{line: 2209, col: 34, offset: 67908}, name: "IdentifierRest", }, }, @@ -15669,20 +15791,20 @@ var g = &grammar{ }, { name: "ANTI", - pos: position{line: 2219, col: 1, offset: 68032}, + pos: position{line: 2210, col: 1, offset: 67945}, expr: &seqExpr{ - pos: position{line: 2219, col: 14, offset: 68045}, + pos: position{line: 2210, col: 14, offset: 67958}, exprs: []any{ &litMatcher{ - pos: position{line: 2219, col: 14, offset: 68045}, + pos: position{line: 2210, col: 14, offset: 67958}, val: "anti", ignoreCase: true, want: "\"ANTI\"i", }, ¬Expr{ - pos: position{line: 2219, col: 33, offset: 68064}, + pos: position{line: 2210, col: 33, offset: 67977}, expr: &ruleRefExpr{ - pos: position{line: 2219, col: 34, offset: 68065}, + pos: position{line: 2210, col: 34, offset: 67978}, name: "IdentifierRest", }, }, @@ -15693,20 +15815,20 @@ var g = &grammar{ }, { name: "AS", - pos: position{line: 2220, col: 1, offset: 68080}, + pos: position{line: 2211, col: 1, offset: 67993}, expr: &seqExpr{ - pos: position{line: 2220, col: 14, offset: 68093}, + pos: position{line: 2211, col: 14, offset: 68006}, exprs: []any{ &litMatcher{ - pos: position{line: 2220, col: 14, offset: 68093}, + pos: position{line: 2211, col: 14, offset: 68006}, val: "as", ignoreCase: true, want: "\"AS\"i", }, ¬Expr{ - pos: position{line: 2220, col: 33, offset: 68112}, + pos: position{line: 2211, col: 33, offset: 68025}, expr: &ruleRefExpr{ - pos: position{line: 2220, col: 34, offset: 68113}, + pos: position{line: 2211, col: 34, offset: 68026}, name: "IdentifierRest", }, }, @@ -15717,23 +15839,23 @@ var g = &grammar{ }, { name: "ASC", - pos: position{line: 2221, col: 1, offset: 68128}, + pos: position{line: 2212, col: 1, offset: 68041}, expr: &actionExpr{ - pos: position{line: 2221, col: 14, offset: 68141}, + pos: position{line: 2212, col: 14, offset: 68054}, run: (*parser).callonASC1, expr: &seqExpr{ - pos: position{line: 2221, col: 14, offset: 68141}, + pos: position{line: 2212, col: 14, offset: 68054}, exprs: []any{ &litMatcher{ - pos: position{line: 2221, col: 14, offset: 68141}, + pos: position{line: 2212, col: 14, offset: 68054}, val: "asc", ignoreCase: true, want: "\"ASC\"i", }, ¬Expr{ - pos: position{line: 2221, col: 33, offset: 68160}, + pos: position{line: 2212, col: 33, offset: 68073}, expr: &ruleRefExpr{ - pos: position{line: 2221, col: 34, offset: 68161}, + pos: position{line: 2212, col: 34, offset: 68074}, name: "IdentifierRest", }, }, @@ -15745,20 +15867,20 @@ var g = &grammar{ }, { name: "ASSERT", - pos: position{line: 2222, col: 1, offset: 68198}, + pos: position{line: 2213, col: 1, offset: 68111}, expr: &seqExpr{ - pos: position{line: 2222, col: 14, offset: 68211}, + pos: position{line: 2213, col: 14, offset: 68124}, exprs: []any{ &litMatcher{ - pos: position{line: 2222, col: 14, offset: 68211}, + pos: position{line: 2213, col: 14, offset: 68124}, val: "assert", ignoreCase: true, want: "\"ASSERT\"i", }, ¬Expr{ - pos: position{line: 2222, col: 33, offset: 68230}, + pos: position{line: 2213, col: 33, offset: 68143}, expr: &ruleRefExpr{ - pos: position{line: 2222, col: 34, offset: 68231}, + pos: position{line: 2213, col: 34, offset: 68144}, name: "IdentifierRest", }, }, @@ -15769,20 +15891,20 @@ var g = &grammar{ }, { name: "AT", - pos: position{line: 2223, col: 1, offset: 68246}, + pos: position{line: 2214, col: 1, offset: 68159}, expr: &seqExpr{ - pos: position{line: 2223, col: 14, offset: 68259}, + pos: position{line: 2214, col: 14, offset: 68172}, exprs: []any{ &litMatcher{ - pos: position{line: 2223, col: 14, offset: 68259}, + pos: position{line: 2214, col: 14, offset: 68172}, val: "at", ignoreCase: true, want: "\"AT\"i", }, ¬Expr{ - pos: position{line: 2223, col: 33, offset: 68278}, + pos: position{line: 2214, col: 33, offset: 68191}, expr: &ruleRefExpr{ - pos: position{line: 2223, col: 34, offset: 68279}, + pos: position{line: 2214, col: 34, offset: 68192}, name: "IdentifierRest", }, }, @@ -15793,20 +15915,20 @@ var g = &grammar{ }, { name: "AUTHOR", - pos: position{line: 2224, col: 1, offset: 68294}, + pos: position{line: 2215, col: 1, offset: 68207}, expr: &seqExpr{ - pos: position{line: 2224, col: 14, offset: 68307}, + pos: position{line: 2215, col: 14, offset: 68220}, exprs: []any{ &litMatcher{ - pos: position{line: 2224, col: 14, offset: 68307}, + pos: position{line: 2215, col: 14, offset: 68220}, val: "author", ignoreCase: true, want: "\"AUTHOR\"i", }, ¬Expr{ - pos: position{line: 2224, col: 33, offset: 68326}, + pos: position{line: 2215, col: 33, offset: 68239}, expr: &ruleRefExpr{ - pos: position{line: 2224, col: 34, offset: 68327}, + pos: position{line: 2215, col: 34, offset: 68240}, name: "IdentifierRest", }, }, @@ -15817,20 +15939,20 @@ var g = &grammar{ }, { name: "BETWEEN", - pos: position{line: 2225, col: 1, offset: 68342}, + pos: position{line: 2216, col: 1, offset: 68255}, expr: &seqExpr{ - pos: position{line: 2225, col: 14, offset: 68355}, + pos: position{line: 2216, col: 14, offset: 68268}, exprs: []any{ &litMatcher{ - pos: position{line: 2225, col: 14, offset: 68355}, + pos: position{line: 2216, col: 14, offset: 68268}, val: "between", ignoreCase: true, want: "\"BETWEEN\"i", }, ¬Expr{ - pos: position{line: 2225, col: 33, offset: 68374}, + pos: position{line: 2216, col: 33, offset: 68287}, expr: &ruleRefExpr{ - pos: position{line: 2225, col: 34, offset: 68375}, + pos: position{line: 2216, col: 34, offset: 68288}, name: "IdentifierRest", }, }, @@ -15841,20 +15963,20 @@ var g = &grammar{ }, { name: "BODY", - pos: position{line: 2226, col: 1, offset: 68390}, + pos: position{line: 2217, col: 1, offset: 68303}, expr: &seqExpr{ - pos: position{line: 2226, col: 14, offset: 68403}, + pos: position{line: 2217, col: 14, offset: 68316}, exprs: []any{ &litMatcher{ - pos: position{line: 2226, col: 14, offset: 68403}, + pos: position{line: 2217, col: 14, offset: 68316}, val: "body", ignoreCase: true, want: "\"BODY\"i", }, ¬Expr{ - pos: position{line: 2226, col: 33, offset: 68422}, + pos: position{line: 2217, col: 33, offset: 68335}, expr: &ruleRefExpr{ - pos: position{line: 2226, col: 34, offset: 68423}, + pos: position{line: 2217, col: 34, offset: 68336}, name: "IdentifierRest", }, }, @@ -15865,20 +15987,20 @@ var g = &grammar{ }, { name: "BY", - pos: position{line: 2227, col: 1, offset: 68438}, + pos: position{line: 2218, col: 1, offset: 68351}, expr: &seqExpr{ - pos: position{line: 2227, col: 14, offset: 68451}, + pos: position{line: 2218, col: 14, offset: 68364}, exprs: []any{ &litMatcher{ - pos: position{line: 2227, col: 14, offset: 68451}, + pos: position{line: 2218, col: 14, offset: 68364}, val: "by", ignoreCase: true, want: "\"BY\"i", }, ¬Expr{ - pos: position{line: 2227, col: 33, offset: 68470}, + pos: position{line: 2218, col: 33, offset: 68383}, expr: &ruleRefExpr{ - pos: position{line: 2227, col: 34, offset: 68471}, + pos: position{line: 2218, col: 34, offset: 68384}, name: "IdentifierRest", }, }, @@ -15889,20 +16011,20 @@ var g = &grammar{ }, { name: "CASE", - pos: position{line: 2228, col: 1, offset: 68486}, + pos: position{line: 2219, col: 1, offset: 68399}, expr: &seqExpr{ - pos: position{line: 2228, col: 14, offset: 68499}, + pos: position{line: 2219, col: 14, offset: 68412}, exprs: []any{ &litMatcher{ - pos: position{line: 2228, col: 14, offset: 68499}, + pos: position{line: 2219, col: 14, offset: 68412}, val: "case", ignoreCase: true, want: "\"CASE\"i", }, ¬Expr{ - pos: position{line: 2228, col: 33, offset: 68518}, + pos: position{line: 2219, col: 33, offset: 68431}, expr: &ruleRefExpr{ - pos: position{line: 2228, col: 34, offset: 68519}, + pos: position{line: 2219, col: 34, offset: 68432}, name: "IdentifierRest", }, }, @@ -15913,20 +16035,20 @@ var g = &grammar{ }, { name: "CONST", - pos: position{line: 2229, col: 1, offset: 68534}, + pos: position{line: 2220, col: 1, offset: 68447}, expr: &seqExpr{ - pos: position{line: 2229, col: 14, offset: 68547}, + pos: position{line: 2220, col: 14, offset: 68460}, exprs: []any{ &litMatcher{ - pos: position{line: 2229, col: 14, offset: 68547}, + pos: position{line: 2220, col: 14, offset: 68460}, val: "const", ignoreCase: true, want: "\"CONST\"i", }, ¬Expr{ - pos: position{line: 2229, col: 33, offset: 68566}, + pos: position{line: 2220, col: 33, offset: 68479}, expr: &ruleRefExpr{ - pos: position{line: 2229, col: 34, offset: 68567}, + pos: position{line: 2220, col: 34, offset: 68480}, name: "IdentifierRest", }, }, @@ -15937,20 +16059,20 @@ var g = &grammar{ }, { name: "CROSS", - pos: position{line: 2230, col: 1, offset: 68582}, + pos: position{line: 2221, col: 1, offset: 68495}, expr: &seqExpr{ - pos: position{line: 2230, col: 14, offset: 68595}, + pos: position{line: 2221, col: 14, offset: 68508}, exprs: []any{ &litMatcher{ - pos: position{line: 2230, col: 14, offset: 68595}, + pos: position{line: 2221, col: 14, offset: 68508}, val: "cross", ignoreCase: true, want: "\"CROSS\"i", }, ¬Expr{ - pos: position{line: 2230, col: 33, offset: 68614}, + pos: position{line: 2221, col: 33, offset: 68527}, expr: &ruleRefExpr{ - pos: position{line: 2230, col: 34, offset: 68615}, + pos: position{line: 2221, col: 34, offset: 68528}, name: "IdentifierRest", }, }, @@ -15961,20 +16083,20 @@ var g = &grammar{ }, { name: "CUT", - pos: position{line: 2231, col: 1, offset: 68630}, + pos: position{line: 2222, col: 1, offset: 68543}, expr: &seqExpr{ - pos: position{line: 2231, col: 14, offset: 68643}, + pos: position{line: 2222, col: 14, offset: 68556}, exprs: []any{ &litMatcher{ - pos: position{line: 2231, col: 14, offset: 68643}, + pos: position{line: 2222, col: 14, offset: 68556}, val: "cut", ignoreCase: true, want: "\"CUT\"i", }, ¬Expr{ - pos: position{line: 2231, col: 33, offset: 68662}, + pos: position{line: 2222, col: 33, offset: 68575}, expr: &ruleRefExpr{ - pos: position{line: 2231, col: 34, offset: 68663}, + pos: position{line: 2222, col: 34, offset: 68576}, name: "IdentifierRest", }, }, @@ -15985,20 +16107,20 @@ var g = &grammar{ }, { name: "DEBUG", - pos: position{line: 2232, col: 1, offset: 68678}, + pos: position{line: 2223, col: 1, offset: 68591}, expr: &seqExpr{ - pos: position{line: 2232, col: 14, offset: 68691}, + pos: position{line: 2223, col: 14, offset: 68604}, exprs: []any{ &litMatcher{ - pos: position{line: 2232, col: 14, offset: 68691}, + pos: position{line: 2223, col: 14, offset: 68604}, val: "debug", ignoreCase: true, want: "\"DEBUG\"i", }, ¬Expr{ - pos: position{line: 2232, col: 33, offset: 68710}, + pos: position{line: 2223, col: 33, offset: 68623}, expr: &ruleRefExpr{ - pos: position{line: 2232, col: 34, offset: 68711}, + pos: position{line: 2223, col: 34, offset: 68624}, name: "IdentifierRest", }, }, @@ -16009,20 +16131,20 @@ var g = &grammar{ }, { name: "DEFAULT", - pos: position{line: 2233, col: 1, offset: 68726}, + pos: position{line: 2224, col: 1, offset: 68639}, expr: &seqExpr{ - pos: position{line: 2233, col: 14, offset: 68739}, + pos: position{line: 2224, col: 14, offset: 68652}, exprs: []any{ &litMatcher{ - pos: position{line: 2233, col: 14, offset: 68739}, + pos: position{line: 2224, col: 14, offset: 68652}, val: "default", ignoreCase: true, want: "\"DEFAULT\"i", }, ¬Expr{ - pos: position{line: 2233, col: 33, offset: 68758}, + pos: position{line: 2224, col: 33, offset: 68671}, expr: &ruleRefExpr{ - pos: position{line: 2233, col: 34, offset: 68759}, + pos: position{line: 2224, col: 34, offset: 68672}, name: "IdentifierRest", }, }, @@ -16033,23 +16155,23 @@ var g = &grammar{ }, { name: "DESC", - pos: position{line: 2234, col: 1, offset: 68774}, + pos: position{line: 2225, col: 1, offset: 68687}, expr: &actionExpr{ - pos: position{line: 2234, col: 14, offset: 68787}, + pos: position{line: 2225, col: 14, offset: 68700}, run: (*parser).callonDESC1, expr: &seqExpr{ - pos: position{line: 2234, col: 14, offset: 68787}, + pos: position{line: 2225, col: 14, offset: 68700}, exprs: []any{ &litMatcher{ - pos: position{line: 2234, col: 14, offset: 68787}, + pos: position{line: 2225, col: 14, offset: 68700}, val: "desc", ignoreCase: true, want: "\"DESC\"i", }, ¬Expr{ - pos: position{line: 2234, col: 33, offset: 68806}, + pos: position{line: 2225, col: 33, offset: 68719}, expr: &ruleRefExpr{ - pos: position{line: 2234, col: 34, offset: 68807}, + pos: position{line: 2225, col: 34, offset: 68720}, name: "IdentifierRest", }, }, @@ -16061,20 +16183,20 @@ var g = &grammar{ }, { name: "DISTINCT", - pos: position{line: 2235, col: 1, offset: 68845}, + pos: position{line: 2226, col: 1, offset: 68758}, expr: &seqExpr{ - pos: position{line: 2235, col: 14, offset: 68858}, + pos: position{line: 2226, col: 14, offset: 68771}, exprs: []any{ &litMatcher{ - pos: position{line: 2235, col: 14, offset: 68858}, + pos: position{line: 2226, col: 14, offset: 68771}, val: "distinct", ignoreCase: true, want: "\"DISTINCT\"i", }, ¬Expr{ - pos: position{line: 2235, col: 33, offset: 68877}, + pos: position{line: 2226, col: 33, offset: 68790}, expr: &ruleRefExpr{ - pos: position{line: 2235, col: 34, offset: 68878}, + pos: position{line: 2226, col: 34, offset: 68791}, name: "IdentifierRest", }, }, @@ -16085,20 +16207,20 @@ var g = &grammar{ }, { name: "DROP", - pos: position{line: 2236, col: 1, offset: 68893}, + pos: position{line: 2227, col: 1, offset: 68806}, expr: &seqExpr{ - pos: position{line: 2236, col: 14, offset: 68906}, + pos: position{line: 2227, col: 14, offset: 68819}, exprs: []any{ &litMatcher{ - pos: position{line: 2236, col: 14, offset: 68906}, + pos: position{line: 2227, col: 14, offset: 68819}, val: "drop", ignoreCase: true, want: "\"DROP\"i", }, ¬Expr{ - pos: position{line: 2236, col: 33, offset: 68925}, + pos: position{line: 2227, col: 33, offset: 68838}, expr: &ruleRefExpr{ - pos: position{line: 2236, col: 34, offset: 68926}, + pos: position{line: 2227, col: 34, offset: 68839}, name: "IdentifierRest", }, }, @@ -16109,20 +16231,20 @@ var g = &grammar{ }, { name: "END", - pos: position{line: 2237, col: 1, offset: 68942}, + pos: position{line: 2228, col: 1, offset: 68855}, expr: &seqExpr{ - pos: position{line: 2237, col: 14, offset: 68955}, + pos: position{line: 2228, col: 14, offset: 68868}, exprs: []any{ &litMatcher{ - pos: position{line: 2237, col: 14, offset: 68955}, + pos: position{line: 2228, col: 14, offset: 68868}, val: "end", ignoreCase: true, want: "\"END\"i", }, ¬Expr{ - pos: position{line: 2237, col: 33, offset: 68974}, + pos: position{line: 2228, col: 33, offset: 68887}, expr: &ruleRefExpr{ - pos: position{line: 2237, col: 34, offset: 68975}, + pos: position{line: 2228, col: 34, offset: 68888}, name: "IdentifierRest", }, }, @@ -16133,20 +16255,20 @@ var g = &grammar{ }, { name: "ERROR", - pos: position{line: 2238, col: 1, offset: 68990}, + pos: position{line: 2229, col: 1, offset: 68903}, expr: &seqExpr{ - pos: position{line: 2238, col: 14, offset: 69003}, + pos: position{line: 2229, col: 14, offset: 68916}, exprs: []any{ &litMatcher{ - pos: position{line: 2238, col: 14, offset: 69003}, + pos: position{line: 2229, col: 14, offset: 68916}, val: "error", ignoreCase: true, want: "\"ERROR\"i", }, ¬Expr{ - pos: position{line: 2238, col: 33, offset: 69022}, + pos: position{line: 2229, col: 33, offset: 68935}, expr: &ruleRefExpr{ - pos: position{line: 2238, col: 34, offset: 69023}, + pos: position{line: 2229, col: 34, offset: 68936}, name: "IdentifierRest", }, }, @@ -16157,20 +16279,20 @@ var g = &grammar{ }, { name: "EXPLODE", - pos: position{line: 2239, col: 1, offset: 69038}, + pos: position{line: 2230, col: 1, offset: 68951}, expr: &seqExpr{ - pos: position{line: 2239, col: 14, offset: 69051}, + pos: position{line: 2230, col: 14, offset: 68964}, exprs: []any{ &litMatcher{ - pos: position{line: 2239, col: 14, offset: 69051}, + pos: position{line: 2230, col: 14, offset: 68964}, val: "explode", ignoreCase: true, want: "\"EXPLODE\"i", }, ¬Expr{ - pos: position{line: 2239, col: 33, offset: 69070}, + pos: position{line: 2230, col: 33, offset: 68983}, expr: &ruleRefExpr{ - pos: position{line: 2239, col: 34, offset: 69071}, + pos: position{line: 2230, col: 34, offset: 68984}, name: "IdentifierRest", }, }, @@ -16181,20 +16303,20 @@ var g = &grammar{ }, { name: "FALSE", - pos: position{line: 2240, col: 1, offset: 69086}, + pos: position{line: 2231, col: 1, offset: 68999}, expr: &seqExpr{ - pos: position{line: 2240, col: 14, offset: 69099}, + pos: position{line: 2231, col: 14, offset: 69012}, exprs: []any{ &litMatcher{ - pos: position{line: 2240, col: 14, offset: 69099}, + pos: position{line: 2231, col: 14, offset: 69012}, val: "false", ignoreCase: true, want: "\"FALSE\"i", }, ¬Expr{ - pos: position{line: 2240, col: 33, offset: 69118}, + pos: position{line: 2231, col: 33, offset: 69031}, expr: &ruleRefExpr{ - pos: position{line: 2240, col: 34, offset: 69119}, + pos: position{line: 2231, col: 34, offset: 69032}, name: "IdentifierRest", }, }, @@ -16205,20 +16327,20 @@ var g = &grammar{ }, { name: "FIRST", - pos: position{line: 2241, col: 1, offset: 69134}, + pos: position{line: 2232, col: 1, offset: 69047}, expr: &seqExpr{ - pos: position{line: 2241, col: 14, offset: 69147}, + pos: position{line: 2232, col: 14, offset: 69060}, exprs: []any{ &litMatcher{ - pos: position{line: 2241, col: 14, offset: 69147}, + pos: position{line: 2232, col: 14, offset: 69060}, val: "first", ignoreCase: true, want: "\"FIRST\"i", }, ¬Expr{ - pos: position{line: 2241, col: 33, offset: 69166}, + pos: position{line: 2232, col: 33, offset: 69079}, expr: &ruleRefExpr{ - pos: position{line: 2241, col: 34, offset: 69167}, + pos: position{line: 2232, col: 34, offset: 69080}, name: "IdentifierRest", }, }, @@ -16229,20 +16351,20 @@ var g = &grammar{ }, { name: "FORK", - pos: position{line: 2242, col: 1, offset: 69182}, + pos: position{line: 2233, col: 1, offset: 69095}, expr: &seqExpr{ - pos: position{line: 2242, col: 14, offset: 69195}, + pos: position{line: 2233, col: 14, offset: 69108}, exprs: []any{ &litMatcher{ - pos: position{line: 2242, col: 14, offset: 69195}, + pos: position{line: 2233, col: 14, offset: 69108}, val: "fork", ignoreCase: true, want: "\"FORK\"i", }, ¬Expr{ - pos: position{line: 2242, col: 33, offset: 69214}, + pos: position{line: 2233, col: 33, offset: 69127}, expr: &ruleRefExpr{ - pos: position{line: 2242, col: 34, offset: 69215}, + pos: position{line: 2233, col: 34, offset: 69128}, name: "IdentifierRest", }, }, @@ -16253,20 +16375,20 @@ var g = &grammar{ }, { name: "FORMAT", - pos: position{line: 2243, col: 1, offset: 69230}, + pos: position{line: 2234, col: 1, offset: 69143}, expr: &seqExpr{ - pos: position{line: 2243, col: 14, offset: 69243}, + pos: position{line: 2234, col: 14, offset: 69156}, exprs: []any{ &litMatcher{ - pos: position{line: 2243, col: 14, offset: 69243}, + pos: position{line: 2234, col: 14, offset: 69156}, val: "format", ignoreCase: true, want: "\"FORMAT\"i", }, ¬Expr{ - pos: position{line: 2243, col: 33, offset: 69262}, + pos: position{line: 2234, col: 33, offset: 69175}, expr: &ruleRefExpr{ - pos: position{line: 2243, col: 34, offset: 69263}, + pos: position{line: 2234, col: 34, offset: 69176}, name: "IdentifierRest", }, }, @@ -16277,20 +16399,20 @@ var g = &grammar{ }, { name: "FROM", - pos: position{line: 2244, col: 1, offset: 69278}, + pos: position{line: 2235, col: 1, offset: 69191}, expr: &seqExpr{ - pos: position{line: 2244, col: 14, offset: 69291}, + pos: position{line: 2235, col: 14, offset: 69204}, exprs: []any{ &litMatcher{ - pos: position{line: 2244, col: 14, offset: 69291}, + pos: position{line: 2235, col: 14, offset: 69204}, val: "from", ignoreCase: true, want: "\"FROM\"i", }, ¬Expr{ - pos: position{line: 2244, col: 33, offset: 69310}, + pos: position{line: 2235, col: 33, offset: 69223}, expr: &ruleRefExpr{ - pos: position{line: 2244, col: 34, offset: 69311}, + pos: position{line: 2235, col: 34, offset: 69224}, name: "IdentifierRest", }, }, @@ -16301,20 +16423,20 @@ var g = &grammar{ }, { name: "FULL", - pos: position{line: 2245, col: 1, offset: 69326}, + pos: position{line: 2236, col: 1, offset: 69239}, expr: &seqExpr{ - pos: position{line: 2245, col: 14, offset: 69339}, + pos: position{line: 2236, col: 14, offset: 69252}, exprs: []any{ &litMatcher{ - pos: position{line: 2245, col: 14, offset: 69339}, + pos: position{line: 2236, col: 14, offset: 69252}, val: "full", ignoreCase: true, want: "\"FULL\"i", }, ¬Expr{ - pos: position{line: 2245, col: 33, offset: 69358}, + pos: position{line: 2236, col: 33, offset: 69271}, expr: &ruleRefExpr{ - pos: position{line: 2245, col: 34, offset: 69359}, + pos: position{line: 2236, col: 34, offset: 69272}, name: "IdentifierRest", }, }, @@ -16325,20 +16447,20 @@ var g = &grammar{ }, { name: "FUNC", - pos: position{line: 2246, col: 1, offset: 69374}, + pos: position{line: 2237, col: 1, offset: 69287}, expr: &seqExpr{ - pos: position{line: 2246, col: 14, offset: 69387}, + pos: position{line: 2237, col: 14, offset: 69300}, exprs: []any{ &litMatcher{ - pos: position{line: 2246, col: 14, offset: 69387}, + pos: position{line: 2237, col: 14, offset: 69300}, val: "func", ignoreCase: true, want: "\"FUNC\"i", }, ¬Expr{ - pos: position{line: 2246, col: 33, offset: 69406}, + pos: position{line: 2237, col: 33, offset: 69319}, expr: &ruleRefExpr{ - pos: position{line: 2246, col: 34, offset: 69407}, + pos: position{line: 2237, col: 34, offset: 69320}, name: "IdentifierRest", }, }, @@ -16349,20 +16471,20 @@ var g = &grammar{ }, { name: "FUSE", - pos: position{line: 2247, col: 1, offset: 69422}, + pos: position{line: 2238, col: 1, offset: 69335}, expr: &seqExpr{ - pos: position{line: 2247, col: 14, offset: 69435}, + pos: position{line: 2238, col: 14, offset: 69348}, exprs: []any{ &litMatcher{ - pos: position{line: 2247, col: 14, offset: 69435}, + pos: position{line: 2238, col: 14, offset: 69348}, val: "fuse", ignoreCase: true, want: "\"FUSE\"i", }, ¬Expr{ - pos: position{line: 2247, col: 33, offset: 69454}, + pos: position{line: 2238, col: 33, offset: 69367}, expr: &ruleRefExpr{ - pos: position{line: 2247, col: 34, offset: 69455}, + pos: position{line: 2238, col: 34, offset: 69368}, name: "IdentifierRest", }, }, @@ -16373,20 +16495,20 @@ var g = &grammar{ }, { name: "GREP", - pos: position{line: 2248, col: 1, offset: 69470}, + pos: position{line: 2239, col: 1, offset: 69383}, expr: &seqExpr{ - pos: position{line: 2248, col: 14, offset: 69483}, + pos: position{line: 2239, col: 14, offset: 69396}, exprs: []any{ &litMatcher{ - pos: position{line: 2248, col: 14, offset: 69483}, + pos: position{line: 2239, col: 14, offset: 69396}, val: "grep", ignoreCase: true, want: "\"GREP\"i", }, ¬Expr{ - pos: position{line: 2248, col: 33, offset: 69502}, + pos: position{line: 2239, col: 33, offset: 69415}, expr: &ruleRefExpr{ - pos: position{line: 2248, col: 34, offset: 69503}, + pos: position{line: 2239, col: 34, offset: 69416}, name: "IdentifierRest", }, }, @@ -16397,20 +16519,20 @@ var g = &grammar{ }, { name: "GROUP", - pos: position{line: 2249, col: 1, offset: 69518}, + pos: position{line: 2240, col: 1, offset: 69431}, expr: &seqExpr{ - pos: position{line: 2249, col: 14, offset: 69531}, + pos: position{line: 2240, col: 14, offset: 69444}, exprs: []any{ &litMatcher{ - pos: position{line: 2249, col: 14, offset: 69531}, + pos: position{line: 2240, col: 14, offset: 69444}, val: "group", ignoreCase: true, want: "\"GROUP\"i", }, ¬Expr{ - pos: position{line: 2249, col: 33, offset: 69550}, + pos: position{line: 2240, col: 33, offset: 69463}, expr: &ruleRefExpr{ - pos: position{line: 2249, col: 34, offset: 69551}, + pos: position{line: 2240, col: 34, offset: 69464}, name: "IdentifierRest", }, }, @@ -16421,20 +16543,20 @@ var g = &grammar{ }, { name: "HAVING", - pos: position{line: 2250, col: 1, offset: 69566}, + pos: position{line: 2241, col: 1, offset: 69479}, expr: &seqExpr{ - pos: position{line: 2250, col: 14, offset: 69579}, + pos: position{line: 2241, col: 14, offset: 69492}, exprs: []any{ &litMatcher{ - pos: position{line: 2250, col: 14, offset: 69579}, + pos: position{line: 2241, col: 14, offset: 69492}, val: "having", ignoreCase: true, want: "\"HAVING\"i", }, ¬Expr{ - pos: position{line: 2250, col: 33, offset: 69598}, + pos: position{line: 2241, col: 33, offset: 69511}, expr: &ruleRefExpr{ - pos: position{line: 2250, col: 34, offset: 69599}, + pos: position{line: 2241, col: 34, offset: 69512}, name: "IdentifierRest", }, }, @@ -16445,20 +16567,20 @@ var g = &grammar{ }, { name: "HEAD", - pos: position{line: 2251, col: 1, offset: 69614}, + pos: position{line: 2242, col: 1, offset: 69527}, expr: &seqExpr{ - pos: position{line: 2251, col: 14, offset: 69627}, + pos: position{line: 2242, col: 14, offset: 69540}, exprs: []any{ &litMatcher{ - pos: position{line: 2251, col: 14, offset: 69627}, + pos: position{line: 2242, col: 14, offset: 69540}, val: "head", ignoreCase: true, want: "\"HEAD\"i", }, ¬Expr{ - pos: position{line: 2251, col: 33, offset: 69646}, + pos: position{line: 2242, col: 33, offset: 69559}, expr: &ruleRefExpr{ - pos: position{line: 2251, col: 34, offset: 69647}, + pos: position{line: 2242, col: 34, offset: 69560}, name: "IdentifierRest", }, }, @@ -16469,20 +16591,20 @@ var g = &grammar{ }, { name: "HEADERS", - pos: position{line: 2252, col: 1, offset: 69663}, + pos: position{line: 2243, col: 1, offset: 69576}, expr: &seqExpr{ - pos: position{line: 2252, col: 14, offset: 69676}, + pos: position{line: 2243, col: 14, offset: 69589}, exprs: []any{ &litMatcher{ - pos: position{line: 2252, col: 14, offset: 69676}, + pos: position{line: 2243, col: 14, offset: 69589}, val: "headers", ignoreCase: true, want: "\"HEADERS\"i", }, ¬Expr{ - pos: position{line: 2252, col: 33, offset: 69695}, + pos: position{line: 2243, col: 33, offset: 69608}, expr: &ruleRefExpr{ - pos: position{line: 2252, col: 34, offset: 69696}, + pos: position{line: 2243, col: 34, offset: 69609}, name: "IdentifierRest", }, }, @@ -16493,20 +16615,20 @@ var g = &grammar{ }, { name: "IN", - pos: position{line: 2253, col: 1, offset: 69711}, + pos: position{line: 2244, col: 1, offset: 69624}, expr: &seqExpr{ - pos: position{line: 2253, col: 14, offset: 69724}, + pos: position{line: 2244, col: 14, offset: 69637}, exprs: []any{ &litMatcher{ - pos: position{line: 2253, col: 14, offset: 69724}, + pos: position{line: 2244, col: 14, offset: 69637}, val: "in", ignoreCase: true, want: "\"IN\"i", }, ¬Expr{ - pos: position{line: 2253, col: 33, offset: 69743}, + pos: position{line: 2244, col: 33, offset: 69656}, expr: &ruleRefExpr{ - pos: position{line: 2253, col: 34, offset: 69744}, + pos: position{line: 2244, col: 34, offset: 69657}, name: "IdentifierRest", }, }, @@ -16517,20 +16639,20 @@ var g = &grammar{ }, { name: "INNER", - pos: position{line: 2254, col: 1, offset: 69759}, + pos: position{line: 2245, col: 1, offset: 69672}, expr: &seqExpr{ - pos: position{line: 2254, col: 14, offset: 69772}, + pos: position{line: 2245, col: 14, offset: 69685}, exprs: []any{ &litMatcher{ - pos: position{line: 2254, col: 14, offset: 69772}, + pos: position{line: 2245, col: 14, offset: 69685}, val: "inner", ignoreCase: true, want: "\"INNER\"i", }, ¬Expr{ - pos: position{line: 2254, col: 33, offset: 69791}, + pos: position{line: 2245, col: 33, offset: 69704}, expr: &ruleRefExpr{ - pos: position{line: 2254, col: 34, offset: 69792}, + pos: position{line: 2245, col: 34, offset: 69705}, name: "IdentifierRest", }, }, @@ -16541,20 +16663,20 @@ var g = &grammar{ }, { name: "JOIN", - pos: position{line: 2255, col: 1, offset: 69807}, + pos: position{line: 2246, col: 1, offset: 69720}, expr: &seqExpr{ - pos: position{line: 2255, col: 14, offset: 69820}, + pos: position{line: 2246, col: 14, offset: 69733}, exprs: []any{ &litMatcher{ - pos: position{line: 2255, col: 14, offset: 69820}, + pos: position{line: 2246, col: 14, offset: 69733}, val: "join", ignoreCase: true, want: "\"JOIN\"i", }, ¬Expr{ - pos: position{line: 2255, col: 33, offset: 69839}, + pos: position{line: 2246, col: 33, offset: 69752}, expr: &ruleRefExpr{ - pos: position{line: 2255, col: 34, offset: 69840}, + pos: position{line: 2246, col: 34, offset: 69753}, name: "IdentifierRest", }, }, @@ -16565,20 +16687,20 @@ var g = &grammar{ }, { name: "LAST", - pos: position{line: 2256, col: 1, offset: 69855}, + pos: position{line: 2247, col: 1, offset: 69768}, expr: &seqExpr{ - pos: position{line: 2256, col: 14, offset: 69868}, + pos: position{line: 2247, col: 14, offset: 69781}, exprs: []any{ &litMatcher{ - pos: position{line: 2256, col: 14, offset: 69868}, + pos: position{line: 2247, col: 14, offset: 69781}, val: "last", ignoreCase: true, want: "\"LAST\"i", }, ¬Expr{ - pos: position{line: 2256, col: 33, offset: 69887}, + pos: position{line: 2247, col: 33, offset: 69800}, expr: &ruleRefExpr{ - pos: position{line: 2256, col: 34, offset: 69888}, + pos: position{line: 2247, col: 34, offset: 69801}, name: "IdentifierRest", }, }, @@ -16589,20 +16711,20 @@ var g = &grammar{ }, { name: "LEFT", - pos: position{line: 2257, col: 1, offset: 69903}, + pos: position{line: 2248, col: 1, offset: 69816}, expr: &seqExpr{ - pos: position{line: 2257, col: 14, offset: 69916}, + pos: position{line: 2248, col: 14, offset: 69829}, exprs: []any{ &litMatcher{ - pos: position{line: 2257, col: 14, offset: 69916}, + pos: position{line: 2248, col: 14, offset: 69829}, val: "left", ignoreCase: true, want: "\"LEFT\"i", }, ¬Expr{ - pos: position{line: 2257, col: 33, offset: 69935}, + pos: position{line: 2248, col: 33, offset: 69848}, expr: &ruleRefExpr{ - pos: position{line: 2257, col: 34, offset: 69936}, + pos: position{line: 2248, col: 34, offset: 69849}, name: "IdentifierRest", }, }, @@ -16613,20 +16735,20 @@ var g = &grammar{ }, { name: "LIKE", - pos: position{line: 2258, col: 1, offset: 69951}, + pos: position{line: 2249, col: 1, offset: 69864}, expr: &seqExpr{ - pos: position{line: 2258, col: 14, offset: 69964}, + pos: position{line: 2249, col: 14, offset: 69877}, exprs: []any{ &litMatcher{ - pos: position{line: 2258, col: 14, offset: 69964}, + pos: position{line: 2249, col: 14, offset: 69877}, val: "like", ignoreCase: true, want: "\"LIKE\"i", }, ¬Expr{ - pos: position{line: 2258, col: 32, offset: 69982}, + pos: position{line: 2249, col: 32, offset: 69895}, expr: &ruleRefExpr{ - pos: position{line: 2258, col: 33, offset: 69983}, + pos: position{line: 2249, col: 33, offset: 69896}, name: "IdentifierRest", }, }, @@ -16637,20 +16759,20 @@ var g = &grammar{ }, { name: "LIMIT", - pos: position{line: 2259, col: 1, offset: 69998}, + pos: position{line: 2250, col: 1, offset: 69911}, expr: &seqExpr{ - pos: position{line: 2259, col: 14, offset: 70011}, + pos: position{line: 2250, col: 14, offset: 69924}, exprs: []any{ &litMatcher{ - pos: position{line: 2259, col: 14, offset: 70011}, + pos: position{line: 2250, col: 14, offset: 69924}, val: "limit", ignoreCase: true, want: "\"LIMIT\"i", }, ¬Expr{ - pos: position{line: 2259, col: 33, offset: 70030}, + pos: position{line: 2250, col: 33, offset: 69943}, expr: &ruleRefExpr{ - pos: position{line: 2259, col: 34, offset: 70031}, + pos: position{line: 2250, col: 34, offset: 69944}, name: "IdentifierRest", }, }, @@ -16661,20 +16783,20 @@ var g = &grammar{ }, { name: "LOAD", - pos: position{line: 2260, col: 1, offset: 70046}, + pos: position{line: 2251, col: 1, offset: 69959}, expr: &seqExpr{ - pos: position{line: 2260, col: 14, offset: 70059}, + pos: position{line: 2251, col: 14, offset: 69972}, exprs: []any{ &litMatcher{ - pos: position{line: 2260, col: 14, offset: 70059}, + pos: position{line: 2251, col: 14, offset: 69972}, val: "load", ignoreCase: true, want: "\"LOAD\"i", }, ¬Expr{ - pos: position{line: 2260, col: 33, offset: 70078}, + pos: position{line: 2251, col: 33, offset: 69991}, expr: &ruleRefExpr{ - pos: position{line: 2260, col: 34, offset: 70079}, + pos: position{line: 2251, col: 34, offset: 69992}, name: "IdentifierRest", }, }, @@ -16685,20 +16807,20 @@ var g = &grammar{ }, { name: "MATERIALIZED", - pos: position{line: 2261, col: 1, offset: 70094}, + pos: position{line: 2252, col: 1, offset: 70007}, expr: &seqExpr{ - pos: position{line: 2261, col: 16, offset: 70109}, + pos: position{line: 2252, col: 16, offset: 70022}, exprs: []any{ &litMatcher{ - pos: position{line: 2261, col: 16, offset: 70109}, + pos: position{line: 2252, col: 16, offset: 70022}, val: "materialized", ignoreCase: true, want: "\"MATERIALIZED\"i", }, ¬Expr{ - pos: position{line: 2261, col: 33, offset: 70126}, + pos: position{line: 2252, col: 33, offset: 70039}, expr: &ruleRefExpr{ - pos: position{line: 2261, col: 34, offset: 70127}, + pos: position{line: 2252, col: 34, offset: 70040}, name: "IdentifierRest", }, }, @@ -16709,20 +16831,20 @@ var g = &grammar{ }, { name: "MERGE", - pos: position{line: 2262, col: 1, offset: 70142}, + pos: position{line: 2253, col: 1, offset: 70055}, expr: &seqExpr{ - pos: position{line: 2262, col: 14, offset: 70155}, + pos: position{line: 2253, col: 14, offset: 70068}, exprs: []any{ &litMatcher{ - pos: position{line: 2262, col: 14, offset: 70155}, + pos: position{line: 2253, col: 14, offset: 70068}, val: "merge", ignoreCase: true, want: "\"MERGE\"i", }, ¬Expr{ - pos: position{line: 2262, col: 33, offset: 70174}, + pos: position{line: 2253, col: 33, offset: 70087}, expr: &ruleRefExpr{ - pos: position{line: 2262, col: 34, offset: 70175}, + pos: position{line: 2253, col: 34, offset: 70088}, name: "IdentifierRest", }, }, @@ -16733,20 +16855,20 @@ var g = &grammar{ }, { name: "MESSAGE", - pos: position{line: 2263, col: 1, offset: 70190}, + pos: position{line: 2254, col: 1, offset: 70103}, expr: &seqExpr{ - pos: position{line: 2263, col: 14, offset: 70203}, + pos: position{line: 2254, col: 14, offset: 70116}, exprs: []any{ &litMatcher{ - pos: position{line: 2263, col: 14, offset: 70203}, + pos: position{line: 2254, col: 14, offset: 70116}, val: "message", ignoreCase: true, want: "\"MESSAGE\"i", }, ¬Expr{ - pos: position{line: 2263, col: 33, offset: 70222}, + pos: position{line: 2254, col: 33, offset: 70135}, expr: &ruleRefExpr{ - pos: position{line: 2263, col: 34, offset: 70223}, + pos: position{line: 2254, col: 34, offset: 70136}, name: "IdentifierRest", }, }, @@ -16757,20 +16879,20 @@ var g = &grammar{ }, { name: "META", - pos: position{line: 2264, col: 1, offset: 70238}, + pos: position{line: 2255, col: 1, offset: 70151}, expr: &seqExpr{ - pos: position{line: 2264, col: 14, offset: 70251}, + pos: position{line: 2255, col: 14, offset: 70164}, exprs: []any{ &litMatcher{ - pos: position{line: 2264, col: 14, offset: 70251}, + pos: position{line: 2255, col: 14, offset: 70164}, val: "meta", ignoreCase: true, want: "\"META\"i", }, ¬Expr{ - pos: position{line: 2264, col: 33, offset: 70270}, + pos: position{line: 2255, col: 33, offset: 70183}, expr: &ruleRefExpr{ - pos: position{line: 2264, col: 34, offset: 70271}, + pos: position{line: 2255, col: 34, offset: 70184}, name: "IdentifierRest", }, }, @@ -16781,20 +16903,20 @@ var g = &grammar{ }, { name: "METHOD", - pos: position{line: 2265, col: 1, offset: 70286}, + pos: position{line: 2256, col: 1, offset: 70199}, expr: &seqExpr{ - pos: position{line: 2265, col: 14, offset: 70299}, + pos: position{line: 2256, col: 14, offset: 70212}, exprs: []any{ &litMatcher{ - pos: position{line: 2265, col: 14, offset: 70299}, + pos: position{line: 2256, col: 14, offset: 70212}, val: "method", ignoreCase: true, want: "\"METHOD\"i", }, ¬Expr{ - pos: position{line: 2265, col: 33, offset: 70318}, + pos: position{line: 2256, col: 33, offset: 70231}, expr: &ruleRefExpr{ - pos: position{line: 2265, col: 34, offset: 70319}, + pos: position{line: 2256, col: 34, offset: 70232}, name: "IdentifierRest", }, }, @@ -16805,20 +16927,20 @@ var g = &grammar{ }, { name: "NOT", - pos: position{line: 2266, col: 1, offset: 70334}, + pos: position{line: 2257, col: 1, offset: 70247}, expr: &seqExpr{ - pos: position{line: 2266, col: 14, offset: 70347}, + pos: position{line: 2257, col: 14, offset: 70260}, exprs: []any{ &litMatcher{ - pos: position{line: 2266, col: 14, offset: 70347}, + pos: position{line: 2257, col: 14, offset: 70260}, val: "not", ignoreCase: true, want: "\"NOT\"i", }, ¬Expr{ - pos: position{line: 2266, col: 33, offset: 70366}, + pos: position{line: 2257, col: 33, offset: 70279}, expr: &ruleRefExpr{ - pos: position{line: 2266, col: 34, offset: 70367}, + pos: position{line: 2257, col: 34, offset: 70280}, name: "IdentifierRest", }, }, @@ -16829,20 +16951,20 @@ var g = &grammar{ }, { name: "NULL", - pos: position{line: 2267, col: 1, offset: 70382}, + pos: position{line: 2258, col: 1, offset: 70295}, expr: &seqExpr{ - pos: position{line: 2267, col: 14, offset: 70395}, + pos: position{line: 2258, col: 14, offset: 70308}, exprs: []any{ &litMatcher{ - pos: position{line: 2267, col: 14, offset: 70395}, + pos: position{line: 2258, col: 14, offset: 70308}, val: "null", ignoreCase: true, want: "\"NULL\"i", }, ¬Expr{ - pos: position{line: 2267, col: 33, offset: 70414}, + pos: position{line: 2258, col: 33, offset: 70327}, expr: &ruleRefExpr{ - pos: position{line: 2267, col: 34, offset: 70415}, + pos: position{line: 2258, col: 34, offset: 70328}, name: "IdentifierRest", }, }, @@ -16853,20 +16975,20 @@ var g = &grammar{ }, { name: "NULLS", - pos: position{line: 2268, col: 1, offset: 70430}, + pos: position{line: 2259, col: 1, offset: 70343}, expr: &seqExpr{ - pos: position{line: 2268, col: 14, offset: 70443}, + pos: position{line: 2259, col: 14, offset: 70356}, exprs: []any{ &litMatcher{ - pos: position{line: 2268, col: 14, offset: 70443}, + pos: position{line: 2259, col: 14, offset: 70356}, val: "nulls", ignoreCase: true, want: "\"NULLS\"i", }, ¬Expr{ - pos: position{line: 2268, col: 33, offset: 70462}, + pos: position{line: 2259, col: 33, offset: 70375}, expr: &ruleRefExpr{ - pos: position{line: 2268, col: 34, offset: 70463}, + pos: position{line: 2259, col: 34, offset: 70376}, name: "IdentifierRest", }, }, @@ -16877,20 +16999,20 @@ var g = &grammar{ }, { name: "OFFSET", - pos: position{line: 2269, col: 1, offset: 70478}, + pos: position{line: 2260, col: 1, offset: 70391}, expr: &seqExpr{ - pos: position{line: 2269, col: 14, offset: 70491}, + pos: position{line: 2260, col: 14, offset: 70404}, exprs: []any{ &litMatcher{ - pos: position{line: 2269, col: 14, offset: 70491}, + pos: position{line: 2260, col: 14, offset: 70404}, val: "offset", ignoreCase: true, want: "\"OFFSET\"i", }, ¬Expr{ - pos: position{line: 2269, col: 33, offset: 70510}, + pos: position{line: 2260, col: 33, offset: 70423}, expr: &ruleRefExpr{ - pos: position{line: 2269, col: 34, offset: 70511}, + pos: position{line: 2260, col: 34, offset: 70424}, name: "IdentifierRest", }, }, @@ -16901,20 +17023,20 @@ var g = &grammar{ }, { name: "ON", - pos: position{line: 2270, col: 1, offset: 70526}, + pos: position{line: 2261, col: 1, offset: 70439}, expr: &seqExpr{ - pos: position{line: 2270, col: 14, offset: 70539}, + pos: position{line: 2261, col: 14, offset: 70452}, exprs: []any{ &litMatcher{ - pos: position{line: 2270, col: 14, offset: 70539}, + pos: position{line: 2261, col: 14, offset: 70452}, val: "on", ignoreCase: true, want: "\"ON\"i", }, ¬Expr{ - pos: position{line: 2270, col: 33, offset: 70558}, + pos: position{line: 2261, col: 33, offset: 70471}, expr: &ruleRefExpr{ - pos: position{line: 2270, col: 34, offset: 70559}, + pos: position{line: 2261, col: 34, offset: 70472}, name: "IdentifierRest", }, }, @@ -16925,20 +17047,20 @@ var g = &grammar{ }, { name: "OP", - pos: position{line: 2271, col: 1, offset: 70574}, + pos: position{line: 2262, col: 1, offset: 70487}, expr: &seqExpr{ - pos: position{line: 2271, col: 14, offset: 70587}, + pos: position{line: 2262, col: 14, offset: 70500}, exprs: []any{ &litMatcher{ - pos: position{line: 2271, col: 14, offset: 70587}, + pos: position{line: 2262, col: 14, offset: 70500}, val: "op", ignoreCase: true, want: "\"OP\"i", }, ¬Expr{ - pos: position{line: 2271, col: 33, offset: 70606}, + pos: position{line: 2262, col: 33, offset: 70519}, expr: &ruleRefExpr{ - pos: position{line: 2271, col: 34, offset: 70607}, + pos: position{line: 2262, col: 34, offset: 70520}, name: "IdentifierRest", }, }, @@ -16949,23 +17071,23 @@ var g = &grammar{ }, { name: "OR", - pos: position{line: 2272, col: 1, offset: 70622}, + pos: position{line: 2263, col: 1, offset: 70535}, expr: &actionExpr{ - pos: position{line: 2272, col: 14, offset: 70635}, + pos: position{line: 2263, col: 14, offset: 70548}, run: (*parser).callonOR1, expr: &seqExpr{ - pos: position{line: 2272, col: 14, offset: 70635}, + pos: position{line: 2263, col: 14, offset: 70548}, exprs: []any{ &litMatcher{ - pos: position{line: 2272, col: 14, offset: 70635}, + pos: position{line: 2263, col: 14, offset: 70548}, val: "or", ignoreCase: true, want: "\"OR\"i", }, ¬Expr{ - pos: position{line: 2272, col: 33, offset: 70654}, + pos: position{line: 2263, col: 33, offset: 70567}, expr: &ruleRefExpr{ - pos: position{line: 2272, col: 34, offset: 70655}, + pos: position{line: 2263, col: 34, offset: 70568}, name: "IdentifierRest", }, }, @@ -16977,20 +17099,20 @@ var g = &grammar{ }, { name: "ORDER", - pos: position{line: 2273, col: 1, offset: 70691}, + pos: position{line: 2264, col: 1, offset: 70604}, expr: &seqExpr{ - pos: position{line: 2273, col: 14, offset: 70704}, + pos: position{line: 2264, col: 14, offset: 70617}, exprs: []any{ &litMatcher{ - pos: position{line: 2273, col: 14, offset: 70704}, + pos: position{line: 2264, col: 14, offset: 70617}, val: "order", ignoreCase: true, want: "\"ORDER\"i", }, ¬Expr{ - pos: position{line: 2273, col: 33, offset: 70723}, + pos: position{line: 2264, col: 33, offset: 70636}, expr: &ruleRefExpr{ - pos: position{line: 2273, col: 34, offset: 70724}, + pos: position{line: 2264, col: 34, offset: 70637}, name: "IdentifierRest", }, }, @@ -17001,20 +17123,20 @@ var g = &grammar{ }, { name: "ORDINALITY", - pos: position{line: 2274, col: 1, offset: 70739}, + pos: position{line: 2265, col: 1, offset: 70652}, expr: &seqExpr{ - pos: position{line: 2274, col: 14, offset: 70752}, + pos: position{line: 2265, col: 14, offset: 70665}, exprs: []any{ &litMatcher{ - pos: position{line: 2274, col: 14, offset: 70752}, + pos: position{line: 2265, col: 14, offset: 70665}, val: "ordinality", ignoreCase: true, want: "\"ORDINALITY\"i", }, ¬Expr{ - pos: position{line: 2274, col: 33, offset: 70771}, + pos: position{line: 2265, col: 33, offset: 70684}, expr: &ruleRefExpr{ - pos: position{line: 2274, col: 34, offset: 70772}, + pos: position{line: 2265, col: 34, offset: 70685}, name: "IdentifierRest", }, }, @@ -17025,20 +17147,20 @@ var g = &grammar{ }, { name: "OUTER", - pos: position{line: 2275, col: 1, offset: 70787}, + pos: position{line: 2266, col: 1, offset: 70700}, expr: &seqExpr{ - pos: position{line: 2275, col: 14, offset: 70800}, + pos: position{line: 2266, col: 14, offset: 70713}, exprs: []any{ &litMatcher{ - pos: position{line: 2275, col: 14, offset: 70800}, + pos: position{line: 2266, col: 14, offset: 70713}, val: "outer", ignoreCase: true, want: "\"OUTER\"i", }, ¬Expr{ - pos: position{line: 2275, col: 33, offset: 70819}, + pos: position{line: 2266, col: 33, offset: 70732}, expr: &ruleRefExpr{ - pos: position{line: 2275, col: 34, offset: 70820}, + pos: position{line: 2266, col: 34, offset: 70733}, name: "IdentifierRest", }, }, @@ -17049,20 +17171,20 @@ var g = &grammar{ }, { name: "OUTPUT", - pos: position{line: 2276, col: 1, offset: 70835}, + pos: position{line: 2267, col: 1, offset: 70748}, expr: &seqExpr{ - pos: position{line: 2276, col: 14, offset: 70848}, + pos: position{line: 2267, col: 14, offset: 70761}, exprs: []any{ &litMatcher{ - pos: position{line: 2276, col: 14, offset: 70848}, + pos: position{line: 2267, col: 14, offset: 70761}, val: "output", ignoreCase: true, want: "\"OUTPUT\"i", }, ¬Expr{ - pos: position{line: 2276, col: 33, offset: 70867}, + pos: position{line: 2267, col: 33, offset: 70780}, expr: &ruleRefExpr{ - pos: position{line: 2276, col: 34, offset: 70868}, + pos: position{line: 2267, col: 34, offset: 70781}, name: "IdentifierRest", }, }, @@ -17073,20 +17195,20 @@ var g = &grammar{ }, { name: "OVER", - pos: position{line: 2277, col: 1, offset: 70883}, + pos: position{line: 2268, col: 1, offset: 70796}, expr: &seqExpr{ - pos: position{line: 2277, col: 14, offset: 70896}, + pos: position{line: 2268, col: 14, offset: 70809}, exprs: []any{ &litMatcher{ - pos: position{line: 2277, col: 14, offset: 70896}, + pos: position{line: 2268, col: 14, offset: 70809}, val: "over", ignoreCase: true, want: "\"OVER\"i", }, ¬Expr{ - pos: position{line: 2277, col: 33, offset: 70915}, + pos: position{line: 2268, col: 33, offset: 70828}, expr: &ruleRefExpr{ - pos: position{line: 2277, col: 34, offset: 70916}, + pos: position{line: 2268, col: 34, offset: 70829}, name: "IdentifierRest", }, }, @@ -17097,20 +17219,20 @@ var g = &grammar{ }, { name: "PASS", - pos: position{line: 2278, col: 1, offset: 70931}, + pos: position{line: 2269, col: 1, offset: 70844}, expr: &seqExpr{ - pos: position{line: 2278, col: 14, offset: 70944}, + pos: position{line: 2269, col: 14, offset: 70857}, exprs: []any{ &litMatcher{ - pos: position{line: 2278, col: 14, offset: 70944}, + pos: position{line: 2269, col: 14, offset: 70857}, val: "pass", ignoreCase: true, want: "\"PASS\"i", }, ¬Expr{ - pos: position{line: 2278, col: 33, offset: 70963}, + pos: position{line: 2269, col: 33, offset: 70876}, expr: &ruleRefExpr{ - pos: position{line: 2278, col: 34, offset: 70964}, + pos: position{line: 2269, col: 34, offset: 70877}, name: "IdentifierRest", }, }, @@ -17121,20 +17243,20 @@ var g = &grammar{ }, { name: "PUT", - pos: position{line: 2279, col: 1, offset: 70979}, + pos: position{line: 2270, col: 1, offset: 70892}, expr: &seqExpr{ - pos: position{line: 2279, col: 14, offset: 70992}, + pos: position{line: 2270, col: 14, offset: 70905}, exprs: []any{ &litMatcher{ - pos: position{line: 2279, col: 14, offset: 70992}, + pos: position{line: 2270, col: 14, offset: 70905}, val: "put", ignoreCase: true, want: "\"PUT\"i", }, ¬Expr{ - pos: position{line: 2279, col: 33, offset: 71011}, + pos: position{line: 2270, col: 33, offset: 70924}, expr: &ruleRefExpr{ - pos: position{line: 2279, col: 34, offset: 71012}, + pos: position{line: 2270, col: 34, offset: 70925}, name: "IdentifierRest", }, }, @@ -17145,20 +17267,20 @@ var g = &grammar{ }, { name: "RECURSIVE", - pos: position{line: 2280, col: 1, offset: 71027}, + pos: position{line: 2271, col: 1, offset: 70940}, expr: &seqExpr{ - pos: position{line: 2280, col: 14, offset: 71040}, + pos: position{line: 2271, col: 14, offset: 70953}, exprs: []any{ &litMatcher{ - pos: position{line: 2280, col: 14, offset: 71040}, + pos: position{line: 2271, col: 14, offset: 70953}, val: "RECURSIVE", ignoreCase: false, want: "\"RECURSIVE\"", }, ¬Expr{ - pos: position{line: 2280, col: 33, offset: 71059}, + pos: position{line: 2271, col: 33, offset: 70972}, expr: &ruleRefExpr{ - pos: position{line: 2280, col: 34, offset: 71060}, + pos: position{line: 2271, col: 34, offset: 70973}, name: "IdentifierRest", }, }, @@ -17169,20 +17291,20 @@ var g = &grammar{ }, { name: "REGEXP", - pos: position{line: 2281, col: 1, offset: 71075}, + pos: position{line: 2272, col: 1, offset: 70988}, expr: &seqExpr{ - pos: position{line: 2281, col: 14, offset: 71088}, + pos: position{line: 2272, col: 14, offset: 71001}, exprs: []any{ &litMatcher{ - pos: position{line: 2281, col: 14, offset: 71088}, + pos: position{line: 2272, col: 14, offset: 71001}, val: "regexp", ignoreCase: true, want: "\"REGEXP\"i", }, ¬Expr{ - pos: position{line: 2281, col: 33, offset: 71107}, + pos: position{line: 2272, col: 33, offset: 71020}, expr: &ruleRefExpr{ - pos: position{line: 2281, col: 34, offset: 71108}, + pos: position{line: 2272, col: 34, offset: 71021}, name: "IdentifierRest", }, }, @@ -17193,20 +17315,20 @@ var g = &grammar{ }, { name: "REGEXP_REPLACE", - pos: position{line: 2282, col: 1, offset: 71123}, + pos: position{line: 2273, col: 1, offset: 71036}, expr: &seqExpr{ - pos: position{line: 2282, col: 18, offset: 71140}, + pos: position{line: 2273, col: 18, offset: 71053}, exprs: []any{ &litMatcher{ - pos: position{line: 2282, col: 18, offset: 71140}, + pos: position{line: 2273, col: 18, offset: 71053}, val: "regexp_replace", ignoreCase: true, want: "\"REGEXP_REPLACE\"i", }, ¬Expr{ - pos: position{line: 2282, col: 36, offset: 71158}, + pos: position{line: 2273, col: 36, offset: 71071}, expr: &ruleRefExpr{ - pos: position{line: 2282, col: 37, offset: 71159}, + pos: position{line: 2273, col: 37, offset: 71072}, name: "IdentifierRest", }, }, @@ -17217,20 +17339,20 @@ var g = &grammar{ }, { name: "RENAME", - pos: position{line: 2283, col: 1, offset: 71174}, + pos: position{line: 2274, col: 1, offset: 71087}, expr: &seqExpr{ - pos: position{line: 2283, col: 14, offset: 71187}, + pos: position{line: 2274, col: 14, offset: 71100}, exprs: []any{ &litMatcher{ - pos: position{line: 2283, col: 14, offset: 71187}, + pos: position{line: 2274, col: 14, offset: 71100}, val: "rename", ignoreCase: true, want: "\"RENAME\"i", }, ¬Expr{ - pos: position{line: 2283, col: 33, offset: 71206}, + pos: position{line: 2274, col: 33, offset: 71119}, expr: &ruleRefExpr{ - pos: position{line: 2283, col: 34, offset: 71207}, + pos: position{line: 2274, col: 34, offset: 71120}, name: "IdentifierRest", }, }, @@ -17241,20 +17363,20 @@ var g = &grammar{ }, { name: "RIGHT", - pos: position{line: 2284, col: 1, offset: 71222}, + pos: position{line: 2275, col: 1, offset: 71135}, expr: &seqExpr{ - pos: position{line: 2284, col: 14, offset: 71235}, + pos: position{line: 2275, col: 14, offset: 71148}, exprs: []any{ &litMatcher{ - pos: position{line: 2284, col: 14, offset: 71235}, + pos: position{line: 2275, col: 14, offset: 71148}, val: "right", ignoreCase: true, want: "\"RIGHT\"i", }, ¬Expr{ - pos: position{line: 2284, col: 33, offset: 71254}, + pos: position{line: 2275, col: 33, offset: 71167}, expr: &ruleRefExpr{ - pos: position{line: 2284, col: 34, offset: 71255}, + pos: position{line: 2275, col: 34, offset: 71168}, name: "IdentifierRest", }, }, @@ -17265,20 +17387,20 @@ var g = &grammar{ }, { name: "SAMPLE", - pos: position{line: 2285, col: 1, offset: 71270}, + pos: position{line: 2276, col: 1, offset: 71183}, expr: &seqExpr{ - pos: position{line: 2285, col: 14, offset: 71283}, + pos: position{line: 2276, col: 14, offset: 71196}, exprs: []any{ &litMatcher{ - pos: position{line: 2285, col: 14, offset: 71283}, + pos: position{line: 2276, col: 14, offset: 71196}, val: "sample", ignoreCase: true, want: "\"SAMPLE\"i", }, ¬Expr{ - pos: position{line: 2285, col: 33, offset: 71302}, + pos: position{line: 2276, col: 33, offset: 71215}, expr: &ruleRefExpr{ - pos: position{line: 2285, col: 34, offset: 71303}, + pos: position{line: 2276, col: 34, offset: 71216}, name: "IdentifierRest", }, }, @@ -17289,20 +17411,20 @@ var g = &grammar{ }, { name: "SEARCH", - pos: position{line: 2286, col: 1, offset: 71318}, + pos: position{line: 2277, col: 1, offset: 71231}, expr: &seqExpr{ - pos: position{line: 2286, col: 14, offset: 71331}, + pos: position{line: 2277, col: 14, offset: 71244}, exprs: []any{ &litMatcher{ - pos: position{line: 2286, col: 14, offset: 71331}, + pos: position{line: 2277, col: 14, offset: 71244}, val: "search", ignoreCase: true, want: "\"SEARCH\"i", }, ¬Expr{ - pos: position{line: 2286, col: 33, offset: 71350}, + pos: position{line: 2277, col: 33, offset: 71263}, expr: &ruleRefExpr{ - pos: position{line: 2286, col: 34, offset: 71351}, + pos: position{line: 2277, col: 34, offset: 71264}, name: "IdentifierRest", }, }, @@ -17313,20 +17435,20 @@ var g = &grammar{ }, { name: "SELECT", - pos: position{line: 2287, col: 1, offset: 71366}, + pos: position{line: 2278, col: 1, offset: 71279}, expr: &seqExpr{ - pos: position{line: 2287, col: 14, offset: 71379}, + pos: position{line: 2278, col: 14, offset: 71292}, exprs: []any{ &litMatcher{ - pos: position{line: 2287, col: 14, offset: 71379}, + pos: position{line: 2278, col: 14, offset: 71292}, val: "select", ignoreCase: true, want: "\"SELECT\"i", }, ¬Expr{ - pos: position{line: 2287, col: 33, offset: 71398}, + pos: position{line: 2278, col: 33, offset: 71311}, expr: &ruleRefExpr{ - pos: position{line: 2287, col: 34, offset: 71399}, + pos: position{line: 2278, col: 34, offset: 71312}, name: "IdentifierRest", }, }, @@ -17337,20 +17459,20 @@ var g = &grammar{ }, { name: "SHAPE", - pos: position{line: 2288, col: 1, offset: 71414}, + pos: position{line: 2279, col: 1, offset: 71327}, expr: &seqExpr{ - pos: position{line: 2288, col: 14, offset: 71427}, + pos: position{line: 2279, col: 14, offset: 71340}, exprs: []any{ &litMatcher{ - pos: position{line: 2288, col: 14, offset: 71427}, + pos: position{line: 2279, col: 14, offset: 71340}, val: "shape", ignoreCase: true, want: "\"SHAPE\"i", }, ¬Expr{ - pos: position{line: 2288, col: 33, offset: 71446}, + pos: position{line: 2279, col: 33, offset: 71359}, expr: &ruleRefExpr{ - pos: position{line: 2288, col: 34, offset: 71447}, + pos: position{line: 2279, col: 34, offset: 71360}, name: "IdentifierRest", }, }, @@ -17361,20 +17483,20 @@ var g = &grammar{ }, { name: "SORT", - pos: position{line: 2289, col: 1, offset: 71462}, + pos: position{line: 2280, col: 1, offset: 71375}, expr: &seqExpr{ - pos: position{line: 2289, col: 14, offset: 71475}, + pos: position{line: 2280, col: 14, offset: 71388}, exprs: []any{ &litMatcher{ - pos: position{line: 2289, col: 14, offset: 71475}, + pos: position{line: 2280, col: 14, offset: 71388}, val: "sort", ignoreCase: true, want: "\"SORT\"i", }, ¬Expr{ - pos: position{line: 2289, col: 33, offset: 71494}, + pos: position{line: 2280, col: 33, offset: 71407}, expr: &ruleRefExpr{ - pos: position{line: 2289, col: 34, offset: 71495}, + pos: position{line: 2280, col: 34, offset: 71408}, name: "IdentifierRest", }, }, @@ -17385,20 +17507,20 @@ var g = &grammar{ }, { name: "SUMMARIZE", - pos: position{line: 2290, col: 1, offset: 71510}, + pos: position{line: 2281, col: 1, offset: 71423}, expr: &seqExpr{ - pos: position{line: 2290, col: 14, offset: 71523}, + pos: position{line: 2281, col: 14, offset: 71436}, exprs: []any{ &litMatcher{ - pos: position{line: 2290, col: 14, offset: 71523}, + pos: position{line: 2281, col: 14, offset: 71436}, val: "summarize", ignoreCase: true, want: "\"SUMMARIZE\"i", }, ¬Expr{ - pos: position{line: 2290, col: 33, offset: 71542}, + pos: position{line: 2281, col: 33, offset: 71455}, expr: &ruleRefExpr{ - pos: position{line: 2290, col: 34, offset: 71543}, + pos: position{line: 2281, col: 34, offset: 71456}, name: "IdentifierRest", }, }, @@ -17409,20 +17531,20 @@ var g = &grammar{ }, { name: "SWITCH", - pos: position{line: 2291, col: 1, offset: 71558}, + pos: position{line: 2282, col: 1, offset: 71471}, expr: &seqExpr{ - pos: position{line: 2291, col: 14, offset: 71571}, + pos: position{line: 2282, col: 14, offset: 71484}, exprs: []any{ &litMatcher{ - pos: position{line: 2291, col: 14, offset: 71571}, + pos: position{line: 2282, col: 14, offset: 71484}, val: "switch", ignoreCase: true, want: "\"SWITCH\"i", }, ¬Expr{ - pos: position{line: 2291, col: 33, offset: 71590}, + pos: position{line: 2282, col: 33, offset: 71503}, expr: &ruleRefExpr{ - pos: position{line: 2291, col: 34, offset: 71591}, + pos: position{line: 2282, col: 34, offset: 71504}, name: "IdentifierRest", }, }, @@ -17433,20 +17555,20 @@ var g = &grammar{ }, { name: "TAIL", - pos: position{line: 2292, col: 1, offset: 71606}, + pos: position{line: 2283, col: 1, offset: 71519}, expr: &seqExpr{ - pos: position{line: 2292, col: 14, offset: 71619}, + pos: position{line: 2283, col: 14, offset: 71532}, exprs: []any{ &litMatcher{ - pos: position{line: 2292, col: 14, offset: 71619}, + pos: position{line: 2283, col: 14, offset: 71532}, val: "tail", ignoreCase: true, want: "\"TAIL\"i", }, ¬Expr{ - pos: position{line: 2292, col: 33, offset: 71638}, + pos: position{line: 2283, col: 33, offset: 71551}, expr: &ruleRefExpr{ - pos: position{line: 2292, col: 34, offset: 71639}, + pos: position{line: 2283, col: 34, offset: 71552}, name: "IdentifierRest", }, }, @@ -17457,20 +17579,20 @@ var g = &grammar{ }, { name: "TAP", - pos: position{line: 2293, col: 1, offset: 71655}, + pos: position{line: 2284, col: 1, offset: 71568}, expr: &seqExpr{ - pos: position{line: 2293, col: 14, offset: 71668}, + pos: position{line: 2284, col: 14, offset: 71581}, exprs: []any{ &litMatcher{ - pos: position{line: 2293, col: 14, offset: 71668}, + pos: position{line: 2284, col: 14, offset: 71581}, val: "tap", ignoreCase: true, want: "\"TAP\"i", }, ¬Expr{ - pos: position{line: 2293, col: 33, offset: 71687}, + pos: position{line: 2284, col: 33, offset: 71600}, expr: &ruleRefExpr{ - pos: position{line: 2293, col: 34, offset: 71688}, + pos: position{line: 2284, col: 34, offset: 71601}, name: "IdentifierRest", }, }, @@ -17481,20 +17603,20 @@ var g = &grammar{ }, { name: "THEN", - pos: position{line: 2294, col: 1, offset: 71703}, + pos: position{line: 2285, col: 1, offset: 71616}, expr: &seqExpr{ - pos: position{line: 2294, col: 14, offset: 71716}, + pos: position{line: 2285, col: 14, offset: 71629}, exprs: []any{ &litMatcher{ - pos: position{line: 2294, col: 14, offset: 71716}, + pos: position{line: 2285, col: 14, offset: 71629}, val: "then", ignoreCase: true, want: "\"THEN\"i", }, ¬Expr{ - pos: position{line: 2294, col: 33, offset: 71735}, + pos: position{line: 2285, col: 33, offset: 71648}, expr: &ruleRefExpr{ - pos: position{line: 2294, col: 34, offset: 71736}, + pos: position{line: 2285, col: 34, offset: 71649}, name: "IdentifierRest", }, }, @@ -17505,20 +17627,20 @@ var g = &grammar{ }, { name: "TOP", - pos: position{line: 2295, col: 1, offset: 71751}, + pos: position{line: 2286, col: 1, offset: 71664}, expr: &seqExpr{ - pos: position{line: 2295, col: 14, offset: 71764}, + pos: position{line: 2286, col: 14, offset: 71677}, exprs: []any{ &litMatcher{ - pos: position{line: 2295, col: 14, offset: 71764}, + pos: position{line: 2286, col: 14, offset: 71677}, val: "top", ignoreCase: true, want: "\"TOP\"i", }, ¬Expr{ - pos: position{line: 2295, col: 33, offset: 71783}, + pos: position{line: 2286, col: 33, offset: 71696}, expr: &ruleRefExpr{ - pos: position{line: 2295, col: 34, offset: 71784}, + pos: position{line: 2286, col: 34, offset: 71697}, name: "IdentifierRest", }, }, @@ -17529,20 +17651,20 @@ var g = &grammar{ }, { name: "TRUE", - pos: position{line: 2296, col: 1, offset: 71799}, + pos: position{line: 2287, col: 1, offset: 71712}, expr: &seqExpr{ - pos: position{line: 2296, col: 14, offset: 71812}, + pos: position{line: 2287, col: 14, offset: 71725}, exprs: []any{ &litMatcher{ - pos: position{line: 2296, col: 14, offset: 71812}, + pos: position{line: 2287, col: 14, offset: 71725}, val: "true", ignoreCase: true, want: "\"TRUE\"i", }, ¬Expr{ - pos: position{line: 2296, col: 33, offset: 71831}, + pos: position{line: 2287, col: 33, offset: 71744}, expr: &ruleRefExpr{ - pos: position{line: 2296, col: 34, offset: 71832}, + pos: position{line: 2287, col: 34, offset: 71745}, name: "IdentifierRest", }, }, @@ -17553,20 +17675,20 @@ var g = &grammar{ }, { name: "TYPE", - pos: position{line: 2297, col: 1, offset: 71847}, + pos: position{line: 2288, col: 1, offset: 71760}, expr: &seqExpr{ - pos: position{line: 2297, col: 14, offset: 71860}, + pos: position{line: 2288, col: 14, offset: 71773}, exprs: []any{ &litMatcher{ - pos: position{line: 2297, col: 14, offset: 71860}, + pos: position{line: 2288, col: 14, offset: 71773}, val: "type", ignoreCase: true, want: "\"TYPE\"i", }, ¬Expr{ - pos: position{line: 2297, col: 33, offset: 71879}, + pos: position{line: 2288, col: 33, offset: 71792}, expr: &ruleRefExpr{ - pos: position{line: 2297, col: 34, offset: 71880}, + pos: position{line: 2288, col: 34, offset: 71793}, name: "IdentifierRest", }, }, @@ -17577,20 +17699,20 @@ var g = &grammar{ }, { name: "UNION", - pos: position{line: 2298, col: 1, offset: 71895}, + pos: position{line: 2289, col: 1, offset: 71808}, expr: &seqExpr{ - pos: position{line: 2298, col: 14, offset: 71908}, + pos: position{line: 2289, col: 14, offset: 71821}, exprs: []any{ &litMatcher{ - pos: position{line: 2298, col: 14, offset: 71908}, + pos: position{line: 2289, col: 14, offset: 71821}, val: "union", ignoreCase: true, want: "\"UNION\"i", }, ¬Expr{ - pos: position{line: 2298, col: 33, offset: 71927}, + pos: position{line: 2289, col: 33, offset: 71840}, expr: &ruleRefExpr{ - pos: position{line: 2298, col: 34, offset: 71928}, + pos: position{line: 2289, col: 34, offset: 71841}, name: "IdentifierRest", }, }, @@ -17601,20 +17723,20 @@ var g = &grammar{ }, { name: "UNIQ", - pos: position{line: 2299, col: 1, offset: 71943}, + pos: position{line: 2290, col: 1, offset: 71856}, expr: &seqExpr{ - pos: position{line: 2299, col: 14, offset: 71956}, + pos: position{line: 2290, col: 14, offset: 71869}, exprs: []any{ &litMatcher{ - pos: position{line: 2299, col: 14, offset: 71956}, + pos: position{line: 2290, col: 14, offset: 71869}, val: "uniq", ignoreCase: true, want: "\"UNIQ\"i", }, ¬Expr{ - pos: position{line: 2299, col: 33, offset: 71975}, + pos: position{line: 2290, col: 33, offset: 71888}, expr: &ruleRefExpr{ - pos: position{line: 2299, col: 34, offset: 71976}, + pos: position{line: 2290, col: 34, offset: 71889}, name: "IdentifierRest", }, }, @@ -17625,20 +17747,20 @@ var g = &grammar{ }, { name: "USING", - pos: position{line: 2300, col: 1, offset: 71992}, + pos: position{line: 2291, col: 1, offset: 71905}, expr: &seqExpr{ - pos: position{line: 2300, col: 14, offset: 72005}, + pos: position{line: 2291, col: 14, offset: 71918}, exprs: []any{ &litMatcher{ - pos: position{line: 2300, col: 14, offset: 72005}, + pos: position{line: 2291, col: 14, offset: 71918}, val: "using", ignoreCase: true, want: "\"USING\"i", }, ¬Expr{ - pos: position{line: 2300, col: 33, offset: 72024}, + pos: position{line: 2291, col: 33, offset: 71937}, expr: &ruleRefExpr{ - pos: position{line: 2300, col: 34, offset: 72025}, + pos: position{line: 2291, col: 34, offset: 71938}, name: "IdentifierRest", }, }, @@ -17649,20 +17771,20 @@ var g = &grammar{ }, { name: "VALUE", - pos: position{line: 2301, col: 1, offset: 72040}, + pos: position{line: 2292, col: 1, offset: 71953}, expr: &seqExpr{ - pos: position{line: 2301, col: 14, offset: 72053}, + pos: position{line: 2292, col: 14, offset: 71966}, exprs: []any{ &litMatcher{ - pos: position{line: 2301, col: 14, offset: 72053}, + pos: position{line: 2292, col: 14, offset: 71966}, val: "value", ignoreCase: true, want: "\"VALUE\"i", }, ¬Expr{ - pos: position{line: 2301, col: 33, offset: 72072}, + pos: position{line: 2292, col: 33, offset: 71985}, expr: &ruleRefExpr{ - pos: position{line: 2301, col: 34, offset: 72073}, + pos: position{line: 2292, col: 34, offset: 71986}, name: "IdentifierRest", }, }, @@ -17673,20 +17795,20 @@ var g = &grammar{ }, { name: "WHEN", - pos: position{line: 2302, col: 1, offset: 72088}, + pos: position{line: 2293, col: 1, offset: 72001}, expr: &seqExpr{ - pos: position{line: 2302, col: 14, offset: 72101}, + pos: position{line: 2293, col: 14, offset: 72014}, exprs: []any{ &litMatcher{ - pos: position{line: 2302, col: 14, offset: 72101}, + pos: position{line: 2293, col: 14, offset: 72014}, val: "when", ignoreCase: true, want: "\"WHEN\"i", }, ¬Expr{ - pos: position{line: 2302, col: 33, offset: 72120}, + pos: position{line: 2293, col: 33, offset: 72033}, expr: &ruleRefExpr{ - pos: position{line: 2302, col: 34, offset: 72121}, + pos: position{line: 2293, col: 34, offset: 72034}, name: "IdentifierRest", }, }, @@ -17697,20 +17819,20 @@ var g = &grammar{ }, { name: "WHERE", - pos: position{line: 2303, col: 1, offset: 72136}, + pos: position{line: 2294, col: 1, offset: 72049}, expr: &seqExpr{ - pos: position{line: 2303, col: 14, offset: 72149}, + pos: position{line: 2294, col: 14, offset: 72062}, exprs: []any{ &litMatcher{ - pos: position{line: 2303, col: 14, offset: 72149}, + pos: position{line: 2294, col: 14, offset: 72062}, val: "where", ignoreCase: true, want: "\"WHERE\"i", }, ¬Expr{ - pos: position{line: 2303, col: 33, offset: 72168}, + pos: position{line: 2294, col: 33, offset: 72081}, expr: &ruleRefExpr{ - pos: position{line: 2303, col: 34, offset: 72169}, + pos: position{line: 2294, col: 34, offset: 72082}, name: "IdentifierRest", }, }, @@ -17721,20 +17843,20 @@ var g = &grammar{ }, { name: "WITH", - pos: position{line: 2304, col: 1, offset: 72184}, + pos: position{line: 2295, col: 1, offset: 72097}, expr: &seqExpr{ - pos: position{line: 2304, col: 14, offset: 72197}, + pos: position{line: 2295, col: 14, offset: 72110}, exprs: []any{ &litMatcher{ - pos: position{line: 2304, col: 14, offset: 72197}, + pos: position{line: 2295, col: 14, offset: 72110}, val: "with", ignoreCase: true, want: "\"WITH\"i", }, ¬Expr{ - pos: position{line: 2304, col: 33, offset: 72216}, + pos: position{line: 2295, col: 33, offset: 72129}, expr: &ruleRefExpr{ - pos: position{line: 2304, col: 34, offset: 72217}, + pos: position{line: 2295, col: 34, offset: 72130}, name: "IdentifierRest", }, }, @@ -17745,20 +17867,20 @@ var g = &grammar{ }, { name: "YIELD", - pos: position{line: 2305, col: 1, offset: 72232}, + pos: position{line: 2296, col: 1, offset: 72145}, expr: &seqExpr{ - pos: position{line: 2305, col: 14, offset: 72245}, + pos: position{line: 2296, col: 14, offset: 72158}, exprs: []any{ &litMatcher{ - pos: position{line: 2305, col: 14, offset: 72245}, + pos: position{line: 2296, col: 14, offset: 72158}, val: "yield", ignoreCase: true, want: "\"YIELD\"i", }, ¬Expr{ - pos: position{line: 2305, col: 33, offset: 72264}, + pos: position{line: 2296, col: 33, offset: 72177}, expr: &ruleRefExpr{ - pos: position{line: 2305, col: 34, offset: 72265}, + pos: position{line: 2296, col: 34, offset: 72178}, name: "IdentifierRest", }, }, @@ -17923,56 +18045,45 @@ func (p *parser) callonTypeDecl1() (any, error) { return p.cur.onTypeDecl1(stack["name"], stack["typ"]) } -func (c *current) onLeanOp4(scope any) (any, error) { +func (c *current) onLeanOp3(scope any) (any, error) { return scope, nil } -func (p *parser) callonLeanOp4() (any, error) { +func (p *parser) callonLeanOp3() (any, error) { stack := p.vstack[len(p.vstack)-1] _ = stack - return p.cur.onLeanOp4(stack["scope"]) + return p.cur.onLeanOp3(stack["scope"]) } -func (c *current) onLeanOp12(a any) (any, error) { +func (c *current) onLeanOp11(a any) (any, error) { return a, nil } -func (p *parser) callonLeanOp12() (any, error) { +func (p *parser) callonLeanOp11() (any, error) { stack := p.vstack[len(p.vstack)-1] _ = stack - return p.cur.onLeanOp12(stack["a"]) + return p.cur.onLeanOp11(stack["a"]) } -func (c *current) onLeanOp18(a any) (any, error) { +func (c *current) onLeanOp17(a any) (any, error) { return a, nil } -func (p *parser) callonLeanOp18() (any, error) { - stack := p.vstack[len(p.vstack)-1] - _ = stack - return p.cur.onLeanOp18(stack["a"]) -} - -func (c *current) onLeanOp28(expr any) (any, error) { - return &ast.OpExpr{Kind: "OpExpr", Expr: expr.(ast.Expr), Loc: loc(c)}, nil - -} - -func (p *parser) callonLeanOp28() (any, error) { +func (p *parser) callonLeanOp17() (any, error) { stack := p.vstack[len(p.vstack)-1] _ = stack - return p.cur.onLeanOp28(stack["expr"]) + return p.cur.onLeanOp17(stack["a"]) } -func (c *current) onLeanOp34(expr any) (any, error) { - return &ast.OpExpr{Kind: "OpExpr", Expr: expr.(ast.Expr), Loc: loc(c)}, nil +func (c *current) onLeanOp27(e any) (any, error) { + return &ast.OpExpr{Kind: "OpExpr", Expr: e.(ast.Expr), Loc: loc(c)}, nil } -func (p *parser) callonLeanOp34() (any, error) { +func (p *parser) callonLeanOp27() (any, error) { stack := p.vstack[len(p.vstack)-1] _ = stack - return p.cur.onLeanOp34(stack["expr"]) + return p.cur.onLeanOp27(stack["e"]) } func (c *current) onComparator1() (any, error) { @@ -18306,6 +18417,16 @@ func (p *parser) callonAggAssignments1() (any, error) { return p.cur.onAggAssignments1(stack["first"], stack["rest"]) } +func (c *current) onOperator2(op any) (any, error) { + return op, nil +} + +func (p *parser) callonOperator2() (any, error) { + stack := p.vstack[len(p.vstack)-1] + _ = stack + return p.cur.onOperator2(stack["op"]) +} + func (c *current) onForkOp1(paths any) (any, error) { var seqs []ast.Seq for _, p := range paths.([]any) { @@ -19799,79 +19920,6 @@ func (p *parser) callonComparisonExpr1() (any, error) { return p.cur.onComparisonExpr1(stack["lhs"], stack["opAndRHS"]) } -func (c *current) onBitOrExpr7(expr any) (any, error) { - return []any{"|", expr}, nil -} - -func (p *parser) callonBitOrExpr7() (any, error) { - stack := p.vstack[len(p.vstack)-1] - _ = stack - return p.cur.onBitOrExpr7(stack["expr"]) -} - -func (c *current) onBitOrExpr1(first, rest any) (any, error) { - return makeBinaryExprChain(first, rest, c), nil - -} - -func (p *parser) callonBitOrExpr1() (any, error) { - stack := p.vstack[len(p.vstack)-1] - _ = stack - return p.cur.onBitOrExpr1(stack["first"], stack["rest"]) -} - -func (c *current) onBitAndExpr7(expr any) (any, error) { - return []any{"&", expr}, nil -} - -func (p *parser) callonBitAndExpr7() (any, error) { - stack := p.vstack[len(p.vstack)-1] - _ = stack - return p.cur.onBitAndExpr7(stack["expr"]) -} - -func (c *current) onBitAndExpr1(first, rest any) (any, error) { - return makeBinaryExprChain(first, rest, c), nil - -} - -func (p *parser) callonBitAndExpr1() (any, error) { - stack := p.vstack[len(p.vstack)-1] - _ = stack - return p.cur.onBitAndExpr1(stack["first"], stack["rest"]) -} - -func (c *current) onBitShiftExpr7(op, expr any) (any, error) { - return []any{op, expr}, nil -} - -func (p *parser) callonBitShiftExpr7() (any, error) { - stack := p.vstack[len(p.vstack)-1] - _ = stack - return p.cur.onBitShiftExpr7(stack["op"], stack["expr"]) -} - -func (c *current) onBitShiftExpr1(first, rest any) (any, error) { - return makeBinaryExprChain(first, rest, c), nil - -} - -func (p *parser) callonBitShiftExpr1() (any, error) { - stack := p.vstack[len(p.vstack)-1] - _ = stack - return p.cur.onBitShiftExpr1(stack["first"], stack["rest"]) -} - -func (c *current) onBitShiftOperator1() (any, error) { - return string(c.text), nil -} - -func (p *parser) callonBitShiftOperator1() (any, error) { - stack := p.vstack[len(p.vstack)-1] - _ = stack - return p.cur.onBitShiftOperator1() -} - func (c *current) onAdditiveExpr7(op, expr any) (any, error) { return []any{op, expr}, nil } @@ -20176,24 +20224,34 @@ func (p *parser) callonExprs1() (any, error) { return p.cur.onExprs1(stack["first"], stack["rest"]) } -func (c *current) onPrimary10(expr any) (any, error) { +func (c *current) onPrimary8(id any) (any, error) { + return id, nil +} + +func (p *parser) callonPrimary8() (any, error) { + stack := p.vstack[len(p.vstack)-1] + _ = stack + return p.cur.onPrimary8(stack["id"]) +} + +func (c *current) onPrimary15(expr any) (any, error) { return expr, nil } -func (p *parser) callonPrimary10() (any, error) { +func (p *parser) callonPrimary15() (any, error) { stack := p.vstack[len(p.vstack)-1] _ = stack - return p.cur.onPrimary10(stack["expr"]) + return p.cur.onPrimary15(stack["expr"]) } -func (c *current) onPrimary18(expr any) (any, error) { +func (c *current) onPrimary23(expr any) (any, error) { return expr, nil } -func (p *parser) callonPrimary18() (any, error) { +func (p *parser) callonPrimary23() (any, error) { stack := p.vstack[len(p.vstack)-1] _ = stack - return p.cur.onPrimary18(stack["expr"]) + return p.cur.onPrimary23(stack["expr"]) } func (c *current) onCaseExpr2(cases, else_ any) (any, error) { @@ -21333,6 +21391,36 @@ func (p *parser) callonDoubleQuotedChar9() (any, error) { return p.cur.onDoubleQuotedChar9(stack["s"]) } +func (c *current) onBacktickString1(v any) (any, error) { + return joinChars(v), nil +} + +func (p *parser) callonBacktickString1() (any, error) { + stack := p.vstack[len(p.vstack)-1] + _ = stack + return p.cur.onBacktickString1(stack["v"]) +} + +func (c *current) onBacktickChar2() (any, error) { + return string(c.text), nil +} + +func (p *parser) callonBacktickChar2() (any, error) { + stack := p.vstack[len(p.vstack)-1] + _ = stack + return p.cur.onBacktickChar2() +} + +func (c *current) onBacktickChar9(s any) (any, error) { + return s, nil +} + +func (p *parser) callonBacktickChar9() (any, error) { + stack := p.vstack[len(p.vstack)-1] + _ = stack + return p.cur.onBacktickChar9(stack["s"]) +} + func (c *current) onKeyWord1(head, tail any) (any, error) { return head.(string) + joinChars(tail), nil } diff --git a/compiler/parser/parser.peg b/compiler/parser/parser.peg index 71322596ac..27843c85fa 100644 --- a/compiler/parser/parser.peg +++ b/compiler/parser/parser.peg @@ -78,24 +78,21 @@ TypeDecl }, nil } -// A LeanOp is a SuperPipe operator along with various forms of +// A LeanOp is a pipeline operator along with various forms of // "lean-forward" shortcuts: a scope with other LeanOps, a shortcut assignment -// for "put", a short-cut "summarize", a plain keyword-style search, or an implied -// yield. +// for "put", a short-cut "summarize", or an expression that is either +// implied yield (non-boolean) or implied where (boolean). LeanOp - = op:Operator + = Operator / "(" __ scope:Scope __ ")" { return scope, nil } / a:OpAssignment &EndOfOp { return a, nil } / !(Function EndOfOp) a:Aggregation &EndOfOp { return a, nil } - / expr:SearchBoolean &EndOfOp { - return &ast.OpExpr{Kind:"OpExpr",Expr:expr.(ast.Expr),Loc:loc(c)}, nil - } - / expr:Expr { - return &ast.OpExpr{Kind:"OpExpr",Expr:expr.(ast.Expr),Loc:loc(c)}, nil + / !((Identifier / Literal) __ (Pipe/EOF)) e:Expr { + return &ast.OpExpr{Kind:"OpExpr",Expr:e.(ast.Expr),Loc:loc(c)}, nil } -EndOfOp = __ (Pipe / SearchKeywordGuard / "=>" / ")" / EOF) -Pipe = "|>" +EndOfOp = __ (Pipe / SearchKeywordGuard / "=>" / ")" / ";" / EOF) +Pipe = "|>" / "|" ExprGuard = __ ((!"=>" Comparator) / AdditiveOperator / MultiplicativeOperator / ":" / "(" / "[" / "~") @@ -262,7 +259,7 @@ AggAssignments /// === Operators === Operator - = SelectOp + = op:SelectOp &EndOfOp { return op, nil } / ForkOp / SwitchOp / FromForkOp @@ -292,6 +289,12 @@ Operator / OutputOp / DebugOp +PipeKeyword + = SELECT / FORK / SWITCH / FROM / SEARCH / ASSERT / SORT / TOP/ CUT / DROP + / HEAD / TAIL / WHERE / UNIQ / PUT / RENAME / FUSE / SHAPE / JOIN / SAMPLE + / FROM / PASS / EXPLODE / MERGE / OVER / YIELD / LOAD / OUTPUT / DEBUG + / SUMMARIZE + ForkOp = FORK __ "(" paths:Path+ __ ")" { var seqs []ast.Seq @@ -366,7 +369,7 @@ FromSource / PassOp SearchOp - = SEARCH _ expr:SearchBoolean { + = (SEARCH _ / "?" __) expr:SearchBoolean { return &ast.Search{Kind:"Search",Expr:expr.(ast.Expr),Loc:loc(c)}, nil } @@ -950,7 +953,7 @@ BetweenExpr / ComparisonExpr ComparisonExpr - = lhs:BitOrExpr opAndRHS:(__ Comparator __ BitOrExpr / __ ("~" { return string(c.text), nil }) __ Regexp)? { + = lhs:AdditiveExpr opAndRHS:(__ Comparator __ AdditiveExpr / __ ("~" { return string(c.text), nil }) __ Regexp)? { if opAndRHS == nil { return lhs, nil } @@ -963,26 +966,6 @@ ComparisonExpr }, nil } -BitOrExpr - = first:BitAndExpr - rest:(__ "|" __ expr:BitAndExpr { return []any{"|", expr}, nil })* { - return makeBinaryExprChain(first, rest, c), nil - } - -BitAndExpr - = first:BitShiftExpr - rest:(__ "&" __ expr:BitShiftExpr { return []any{"&", expr}, nil })* { - return makeBinaryExprChain(first, rest, c), nil - } - -BitShiftExpr - = first:AdditiveExpr - rest:(__ op:BitShiftOperator __ expr:AdditiveExpr { return []any{op, expr}, nil })* { - return makeBinaryExprChain(first, rest, c), nil - } - -BitShiftOperator = ("<<" / ">>") { return string(c.text), nil } - AdditiveExpr = first:MultiplicativeExpr rest:(__ op:AdditiveOperator __ expr:MultiplicativeExpr { return []any{op, expr}, nil })* { @@ -1126,7 +1109,7 @@ Primary / Set / Map / Literal - / Identifier + / !PipeKeyword id:Identifier { return id, nil } / Tuple / "(" __ expr:OverExpr __ ")" { return expr, nil } / "(" __ expr:Expr __ ")" { return expr, nil } @@ -1531,6 +1514,7 @@ IdentifierName / "\\" id:IDGuard { return id, nil } // "type" is a search guard but should not be an id guard / "type" { return string(c.text), nil } + / BacktickString IdentifierStart = UnicodeLetter @@ -1664,6 +1648,13 @@ DoubleQuotedChar = !('"' / EscapedChar) . { return string(c.text), nil } / "\\" s:EscapeSequence { return s, nil } +BacktickString + = '`' v:BacktickChar* '`' { return joinChars(v), nil } + +BacktickChar + = !('`' / EscapedChar) . { return string(c.text), nil } + / "\\" s:EscapeSequence { return s, nil } + KeyWord = head:KeyWordStart tail:KeyWordRest* { return head.(string) + joinChars(tail), nil } diff --git a/compiler/parser/valid.zed b/compiler/parser/valid.zed index a673637e5a..a144640c92 100644 --- a/compiler/parser/valid.zed +++ b/compiler/parser/valid.zed @@ -1,11 +1,11 @@ -foo -foo |> count() +?foo +?foo |> count() count() with -limit 10 count() by _path with -limit 10 count() by _path,every(1h) with -limit 10 -filter x==1 +where x==1 _path=='conn' -_path=='conn' id.resp_p==80 +_path=='conn' and id.resp_p==80 count(), sum(foo) fork (=>count() by _path =>count() by addr) switch (case grep("foo") => count() by _path case field==1 => count() by addr) @@ -18,21 +18,21 @@ sort -r a, b, c count() |> sort top 1 top 1 -flush -foo\tbar -foo\\x11bar -foo\\x11\bar -* -*abc* +? foo\tbar +? foo\\x11bar +? foo\\x11\bar +? * +? *abc* field==null count() by _path,ts:=every(3600s) s=="harefoot-raucous" s=='/a/b' search _path=='http' and windows f(1) and g(2) or h(3) -NaN -+Inf --Inf -Inf +? NaN +? +Inf +? -Inf +? Inf nullkeys() truevals() falsevals() diff --git a/compiler/parser/ztests/bytes.yaml b/compiler/parser/ztests/bytes.yaml index 54530656a8..5383f9ee09 100644 --- a/compiler/parser/ztests/bytes.yaml +++ b/compiler/parser/ztests/bytes.yaml @@ -1,4 +1,4 @@ -zed: '0x or 0x0e00924c694c98b6c11ef56f025f3255904f4e45' +zed: '? 0x or 0x0e00924c694c98b6c11ef56f025f3255904f4e45' input: &input | {a:0x} diff --git a/compiler/parser/ztests/comments.yaml b/compiler/parser/ztests/comments.yaml index 9124c16aee..0543953b73 100644 --- a/compiler/parser/ztests/comments.yaml +++ b/compiler/parser/ztests/comments.yaml @@ -4,7 +4,7 @@ script: | inputs: - name: count.zed data: | - 2 |> c := count() //, + ?2 |> c := count() //, , sum(v) // moon - name: in.jsup data: | diff --git a/compiler/parser/ztests/esc-quote.yaml b/compiler/parser/ztests/esc-quote.yaml index ca2bf44a78..925e27c558 100644 --- a/compiler/parser/ztests/esc-quote.yaml +++ b/compiler/parser/ztests/esc-quote.yaml @@ -1,4 +1,4 @@ -zed: '"foo\"bar"' +zed: '? "foo\"bar"' input: | {s:"foo\"bar"} diff --git a/compiler/parser/ztests/from.yaml b/compiler/parser/ztests/from.yaml index 6404d66e46..a1e4900b8e 100644 --- a/compiler/parser/ztests/from.yaml +++ b/compiler/parser/ztests/from.yaml @@ -1,13 +1,13 @@ script: | - super compile -C 'from ( pool a => x pool b)' + super compile -C 'from ( pool a => ?x pool b)' echo === No spaces around parentheses. super compile -C 'from(file a)' super compile -C 'from(get http://a)' super compile -C 'from(pool a)' echo === No space before vertical bar. - super compile -C 'file a|> b' - super compile -C 'get http://a|> b' - super compile -C 'from a|> b' + super compile -C 'file a|> ?b' + super compile -C 'get http://a|> ?b' + super compile -C 'from a|> ?b' outputs: - name: stdout diff --git a/compiler/parser/ztests/glob-numeric.yaml b/compiler/parser/ztests/glob-numeric.yaml index 0474d9de2c..4188c3094c 100644 --- a/compiler/parser/ztests/glob-numeric.yaml +++ b/compiler/parser/ztests/glob-numeric.yaml @@ -1,4 +1,4 @@ -zed: '*1' +zed: '? *1' input: | "1" diff --git a/compiler/parser/ztests/in-requires-space.yaml b/compiler/parser/ztests/in-requires-space.yaml index 0841a245de..705e09e0b0 100644 --- a/compiler/parser/ztests/in-requires-space.yaml +++ b/compiler/parser/ztests/in-requires-space.yaml @@ -1,6 +1,6 @@ # This was previously getting parsed as an 'in' comparator. Test that we are no # longer doing this -zed: 'x==1 inaction' +zed: '? x==1 inaction' input: | {x:1,text:"inaction"} diff --git a/compiler/parser/ztests/ipv6.yaml b/compiler/parser/ztests/ipv6.yaml index 707c17be7f..4d42f11a88 100644 --- a/compiler/parser/ztests/ipv6.yaml +++ b/compiler/parser/ztests/ipv6.yaml @@ -1,4 +1,4 @@ -zed: 'fe80::58d2:2d09:e8cb:a8ad OR ::58d2:2d09:e8cb:a8ad OR 2d09:e8cb:a8ad:: OR ::' +zed: '? fe80::58d2:2d09:e8cb:a8ad OR ::58d2:2d09:e8cb:a8ad OR 2d09:e8cb:a8ad:: OR ::' input: &input | {a:fe80::58d2:2d09:e8cb:a8ad} diff --git a/compiler/parser/ztests/leading-quotation-mark.yaml b/compiler/parser/ztests/leading-quotation-mark.yaml index a4e4acd14f..a3bed3a13b 100644 --- a/compiler/parser/ztests/leading-quotation-mark.yaml +++ b/compiler/parser/ztests/leading-quotation-mark.yaml @@ -1,4 +1,4 @@ -zed: '\"foo' +zed: '? \"foo' input: | {s:"foo"} diff --git a/compiler/parser/ztests/match-double.yaml b/compiler/parser/ztests/match-double.yaml index 1c94617635..bcb948932e 100644 --- a/compiler/parser/ztests/match-double.yaml +++ b/compiler/parser/ztests/match-double.yaml @@ -1,4 +1,4 @@ -zed: grep("a") grep("b") +zed: '? grep("a") grep("b")' input: | {s1:"a",s2:"b"} diff --git a/compiler/parser/ztests/match-is.yaml b/compiler/parser/ztests/match-is.yaml index bdc6defbb1..7c4908dc7c 100644 --- a/compiler/parser/ztests/match-is.yaml +++ b/compiler/parser/ztests/match-is.yaml @@ -1,4 +1,5 @@ -zed: a is(s2,'string') +zed: | + ? a is(s2,'string') input: | {s1:"a",s2:"b"} diff --git a/compiler/parser/ztests/match-parentheses.yaml b/compiler/parser/ztests/match-parentheses.yaml index 2a05a4ea51..16234e5765 100644 --- a/compiler/parser/ztests/match-parentheses.yaml +++ b/compiler/parser/ztests/match-parentheses.yaml @@ -1,4 +1,4 @@ -zed: (10.0.0.0/8 or 172.16.0.0/12 or 192.168.0.0/16) +zed: '? (10.0.0.0/8 or 172.16.0.0/12 or 192.168.0.0/16)' input: | {a:1.1.1.1,b:172.16.0.1} diff --git a/compiler/parser/ztests/over-expr.yaml b/compiler/parser/ztests/over-expr.yaml index 82c36e777d..4545c7c3b9 100644 --- a/compiler/parser/ztests/over-expr.yaml +++ b/compiler/parser/ztests/over-expr.yaml @@ -1,14 +1,14 @@ script: | echo === aggregation and locals - super compile -C 'collect(over a with b=c |> d)' + super compile -C 'collect(over a with b=c |> ?d)' echo === cast - super compile -C 'uint8(over a |> b)' + super compile -C 'uint8(over a |> ?b)' echo === expression - super compile -C 'yield (over a |> b)' + super compile -C 'yield (over a |> ?b)' echo === function - super compile -C 'quiet(over a |> b)' + super compile -C 'quiet(over a |> ?b)' echo === grep - super compile -C 'grep(/regexp/, over a |> b)' + super compile -C 'grep(/regexp/, over a |> ?b)' outputs: - name: stdout diff --git a/compiler/parser/ztests/reserved-word-ids.yaml b/compiler/parser/ztests/reserved-word-ids.yaml deleted file mode 100644 index 03ca59993a..0000000000 --- a/compiler/parser/ztests/reserved-word-ids.yaml +++ /dev/null @@ -1,7 +0,0 @@ -zed: 'layout.order == "p1" |> put from:="hi"' - -input: | - {layout:{order:"p1"}} - -output: | - {layout:{order:"p1"},from:"hi"} diff --git a/compiler/parser/ztests/search.yaml b/compiler/parser/ztests/search.yaml index 1f365a228c..8e11e525b1 100644 --- a/compiler/parser/ztests/search.yaml +++ b/compiler/parser/ztests/search.yaml @@ -1,4 +1,4 @@ -zed: bar +zed: '?bar' input: | {s1:"foo",s2:"bar"} diff --git a/compiler/parser/ztests/type-guard.yaml b/compiler/parser/ztests/type-guard.yaml index 8a47a5c26c..361eb18e37 100644 --- a/compiler/parser/ztests/type-guard.yaml +++ b/compiler/parser/ztests/type-guard.yaml @@ -9,7 +9,7 @@ inputs: data: | type netx=uint16 type foo={bar:netx} - * + pass outputs: - name: stdout diff --git a/compiler/parser/ztests/unicode-keyword.yaml b/compiler/parser/ztests/unicode-keyword.yaml index 877e023d90..89db1868d5 100644 --- a/compiler/parser/ztests/unicode-keyword.yaml +++ b/compiler/parser/ztests/unicode-keyword.yaml @@ -1,4 +1,4 @@ -zed: bjørndal +zed: '? bjørndal' input: '"bjørndal"' diff --git a/compiler/parser/ztests/where-search.yaml b/compiler/parser/ztests/where-search.yaml index 2a01b3b0b9..471560cffa 100644 --- a/compiler/parser/ztests/where-search.yaml +++ b/compiler/parser/ztests/where-search.yaml @@ -1,7 +1,7 @@ script: | super -z -c 'count() where grep("foo")' in.jsup echo === - super -z -c "foo |> count()" in.jsup + super -z -c "?foo |> count()" in.jsup inputs: - name: in.jsup diff --git a/compiler/ztests/from-pass.yaml b/compiler/ztests/from-pass.yaml index 6c4ecb9f62..920e817a87 100644 --- a/compiler/ztests/from-pass.yaml +++ b/compiler/ztests/from-pass.yaml @@ -3,7 +3,7 @@ script: super -z -I join.zed left.jsup inputs: - name: join.zed data: | - * |> from ( + from ( pass file right.jsup ) |> inner join on x=y matched:=true diff --git a/compiler/ztests/merge-error.yaml b/compiler/ztests/merge-error.yaml index 82a0d69ddb..317f31dfd4 100644 --- a/compiler/ztests/merge-error.yaml +++ b/compiler/ztests/merge-error.yaml @@ -1,6 +1,6 @@ skip: issue 3681 -zed: foo |> merge x +zed: '? foo |> merge x' input: null diff --git a/compiler/ztests/pushdown.yaml b/compiler/ztests/pushdown.yaml index 387e04bfba..dae8a9ce2b 100644 --- a/compiler/ztests/pushdown.yaml +++ b/compiler/ztests/pushdown.yaml @@ -4,7 +4,7 @@ script: | super db create -q -orderby ts pool-ts super db compile -C -O "from 'pool-ts' |> x=='hello' or x==1.0" | sed -e 's/lister .*/lister/' -e 's/seqscan .*filter/seqscan filter/' echo === - super db compile -C -O "from 'pool-ts' |> x > 1 y <= 1.0" | sed -e 's/lister .*/lister/' -e 's/seqscan .*filter/seqscan filter/' + super db compile -C -O "from 'pool-ts' |> x > 1 and y <= 1.0" | sed -e 's/lister .*/lister/' -e 's/seqscan .*filter/seqscan filter/' echo === super db compile -C -O "from 'pool-ts' |> x=='hello' or x!=1.0" | sed -e 's/lister .*/lister/' -e 's/seqscan .*filter/seqscan filter/' echo === diff --git a/compiler/ztests/search-regexp-not-glob.yaml b/compiler/ztests/search-regexp-not-glob.yaml index 7e065f6fbc..d2e51d5e67 100644 --- a/compiler/ztests/search-regexp-not-glob.yaml +++ b/compiler/ztests/search-regexp-not-glob.yaml @@ -1,4 +1,5 @@ -zed: /.*/ +zed: | + ? /.*/ input: &input | "a" diff --git a/compiler/ztests/search-type-value.yaml b/compiler/ztests/search-type-value.yaml index d7db9d4108..6c5160e698 100644 --- a/compiler/ztests/search-type-value.yaml +++ b/compiler/ztests/search-type-value.yaml @@ -1,4 +1,5 @@ -zed: <{x:int64}> +zed: | + ? <{x:int64}> input: <{x:int64}> diff --git a/compiler/ztests/sql/pipe-ambiguity.yaml b/compiler/ztests/sql/pipe-ambiguity.yaml new file mode 100644 index 0000000000..d4d9710938 --- /dev/null +++ b/compiler/ztests/sql/pipe-ambiguity.yaml @@ -0,0 +1,30 @@ +script: | + ! super -z -c "select 1|3" >& err1 + super -z -c "select x | yield x+1" x.jsup + echo === + super -z -c "select x | x+1" x.jsup + echo === + super -z -c "select x |> x+1" x.jsup + +inputs: + - name: n1.jsup + data: | + null + - name: x.jsup + data: | + {x:2} + + +outputs: + - name: stdout + data: | + 3 + === + 3 + === + 3 + - name: err1 + data: | + parse error at line 1, column 11: + select 1|3 + === ^ === diff --git a/docs/language/operators/search.md b/docs/language/operators/search.md index 2d818ef2da..bc75526da1 100644 --- a/docs/language/operators/search.md +++ b/docs/language/operators/search.md @@ -41,7 +41,7 @@ echo '1 2 3' | super -z -c 'search this >= 2' - ``` _The "search" keyword may be dropped_ ```mdtest-command -echo '1 2 3' | super -z -c '2 or 3' - +echo '1 2 3' | super -z -c '? 2 or 3' - ``` => ```mdtest-output @@ -66,7 +66,7 @@ echo '1 2 3' | super -z -c 'search this >= 2 this <= 2' - ``` _Concatenation for keyword search_ ```mdtest-command -echo '"foo" "foo bar" "foo bar baz" "baz"' | super -z -c 'foo bar' - +echo '"foo" "foo bar" "foo bar baz" "baz"' | super -z -c '? foo bar' - ``` => ```mdtest-output @@ -75,7 +75,7 @@ echo '"foo" "foo bar" "foo bar baz" "baz"' | super -z -c 'foo bar' - ``` _Search expressions match fields names too_ ```mdtest-command -echo '{foo:1} {bar:2} {foo:3}' | super -z -c foo - +echo '{foo:1} {bar:2} {foo:3}' | super -z -c '? foo' - ``` => ```mdtest-output diff --git a/docs/language/pipeline-model.md b/docs/language/pipeline-model.md index 121ad3d316..533b11d17f 100644 --- a/docs/language/pipeline-model.md +++ b/docs/language/pipeline-model.md @@ -277,7 +277,7 @@ from the operator-less source text, in the order given, as follows: When in doubt, you can always check what the compiler is doing under the hood by running `zq` with the `-C` flag to print the parsed query in "canonical form", e.g., ```mdtest-command -super -C -c foo +super -C -c '? foo' super -C -c 'is()' super -C -c 'count()' super -C -c '{a:x+1,b:y-1}' diff --git a/docs/language/search-expressions.md b/docs/language/search-expressions.md index ad40078c70..f6a2c99abe 100644 --- a/docs/language/search-expressions.md +++ b/docs/language/search-expressions.md @@ -30,7 +30,7 @@ and is documented in the Regular expressions may be used freely in search expressions, e.g., ```mdtest-command -echo '"foo" {s:"bar"} {s:"baz"} {foo:1}' | super -z -c '/(foo|bar)/' - +echo '"foo" {s:"bar"} {s:"baz"} {foo:1}' | super -z -c '? /(foo|bar)/' - ``` produces ```mdtest-output @@ -73,7 +73,7 @@ These rules do not allow for a leading digit. For example, a prefix match is easily accomplished via `prefix*`, e.g., ```mdtest-command -echo '"foo" {s:"bar"} {s:"baz"} {foo:1}' | super -z -c 'b*' - +echo '"foo" {s:"bar"} {s:"baz"} {foo:1}' | super -z -c '? b*' - ``` produces ```mdtest-output @@ -82,7 +82,7 @@ produces ``` Likewise, a suffix match may be performed as follows: ```mdtest-command -echo '"foo" {s:"bar"} {s:"baz"} {foo:1}' | super -z -c '*z' - +echo '"foo" {s:"bar"} {s:"baz"} {foo:1}' | super -z -c '? *z' - ``` produces ```mdtest-output @@ -90,7 +90,7 @@ produces ``` and ```mdtest-command -echo '"foo" {s:"bar"} {s:"baz"} {a:1}' | super -z -c '*a*' - +echo '"foo" {s:"bar"} {s:"baz"} {a:1}' | super -z -c '? *a*' - ``` produces ```mdtest-output @@ -154,7 +154,7 @@ but shorter and easier to type in a search expression. For example, ``` -/(foo|bar.*baz.*\.com)/ +? /(foo|bar.*baz.*\.com)/ ``` Searches for any string that begins with `foo` or `bar` has the string `baz` in it and ends with `.com`. @@ -169,7 +169,7 @@ but shorter and easier to type in a search expression. For example, ``` -foo*baz*.com +? foo*baz*.com ``` Searches for any string that begins with `foo` has the string `baz` in it and ends with `.com`. @@ -209,7 +209,7 @@ where grep("foo", this) Note that the "search" keyword may be omitted. For example, the simplest SuperPipe query is perhaps a single keyword search, e.g., ``` -foo +? foo ``` As above, this query searches the implied input for values that contain the string "foo". @@ -262,7 +262,7 @@ search 123 and 10.0.0.1 ``` which can be abbreviated ``` -123 10.0.0.1 +? 123 10.0.0.1 ``` is equivalent to ``` @@ -284,11 +284,11 @@ may be used as a search term and mixed into a search expression. For example, ``` -is() has(bar) baz x==y+z timestamp > 2018-03-24T17:17:55Z +? is() has(bar) baz x==y+z timestamp > 2018-03-24T17:17:55Z ``` is a valid search expression but ``` -/foo.*/ x+1 +? /foo.*/ x+1 ``` is not. @@ -308,7 +308,7 @@ re-use and sharing. For example, ``` -not foo bar or baz +? not foo bar or baz ``` means ``` @@ -316,7 +316,7 @@ means ``` while ``` -foo (bar or baz) +? foo (bar or baz) ``` means ``` diff --git a/docs/language/ztests/language-background-1.yaml b/docs/language/ztests/language-background-1.yaml index 210e74b2b2..d7c2d1bf5d 100644 --- a/docs/language/ztests/language-background-1.yaml +++ b/docs/language/ztests/language-background-1.yaml @@ -10,7 +10,7 @@ # docs/language/README.md. zed: | - widget + ? widget input: | {"text": "this is a sentence with the word widget in it"} diff --git a/docs/language/ztests/language-background-2.yaml b/docs/language/ztests/language-background-2.yaml index c69d3f31b0..2509fa9b28 100644 --- a/docs/language/ztests/language-background-2.yaml +++ b/docs/language/ztests/language-background-2.yaml @@ -10,7 +10,7 @@ # docs/language/README.md. zed: | - widget |> price > 1000 + ? widget |> price > 1000 input: | {"text": "this is a sentence with the word widget in it", "price":999} diff --git a/docs/language/ztests/language-background-3.yaml b/docs/language/ztests/language-background-3.yaml index 744874dd4f..71f09c1c0f 100644 --- a/docs/language/ztests/language-background-3.yaml +++ b/docs/language/ztests/language-background-3.yaml @@ -10,7 +10,7 @@ # docs/language/README.md. zed: | - widget and price > 1000 + ? widget and price > 1000 input: | {"text": "this is a sentence with the word widget in it", "price":999} diff --git a/docs/language/ztests/language-background-4.yaml b/docs/language/ztests/language-background-4.yaml index f845257b09..c0eb4d5b3a 100644 --- a/docs/language/ztests/language-background-4.yaml +++ b/docs/language/ztests/language-background-4.yaml @@ -10,7 +10,7 @@ # docs/language/README.md. zed: | - widget price > 1000 + ? widget price > 1000 input: | {"text": "this is a sentence with the word widget in it", "price":999} diff --git a/docs/language/ztests/language-background-8.yaml b/docs/language/ztests/language-background-8.yaml index d4fa221b03..444ff2f2d9 100644 --- a/docs/language/ztests/language-background-8.yaml +++ b/docs/language/ztests/language-background-8.yaml @@ -10,7 +10,7 @@ # docs/language/README.md. zed: | - widget price > 1000 |> count() by color |> count >= 10 |> sort count + ? widget price > 1000 |> count() by color |> count >= 10 |> sort count input: | {"color":"brown","widget":"kiwi","flavor":"sweet","price":1001} diff --git a/docs/language/ztests/language-operators-1.yaml b/docs/language/ztests/language-operators-1.yaml index 3932de3965..ef42fc3131 100644 --- a/docs/language/ztests/language-operators-1.yaml +++ b/docs/language/ztests/language-operators-1.yaml @@ -7,7 +7,7 @@ # ============================================================================ script: | - super compile -C 'widget |> count() by color |> COLOR := upper(color)' + super compile -C '? widget |> count() by color |> COLOR := upper(color)' outputs: - name: stdout diff --git a/docs/language/ztests/language-tldr-2.yaml b/docs/language/ztests/language-tldr-2.yaml index 247dd03377..2563100fe8 100644 --- a/docs/language/ztests/language-tldr-2.yaml +++ b/docs/language/ztests/language-tldr-2.yaml @@ -10,7 +10,7 @@ # docs/language/README.md. zed: | - put bigname:=upper(name) |> not /^APPLE$/ + put bigname:=upper(name) |> ? not /^APPLE$/ input: | {"color":"brown","name":"kiwi","flavor":"sweet"} diff --git a/docs/tutorials/schools.md b/docs/tutorials/schools.md index 1002a1370e..5e4df9d170 100644 --- a/docs/tutorials/schools.md +++ b/docs/tutorials/schools.md @@ -108,7 +108,7 @@ they will usually do the right thing. With keyword search, you can just type a keyword that you want to look for, e.g., ```mdtest-command dir=testdata/edu -super -z -c Ygnacio schools.jsup +super -z -c '? Ygnacio' schools.jsup ``` which gives the one matching record: ```mdtest-output @@ -120,7 +120,7 @@ As with keyword search, you can simply concantenate keywords to require both of them to match (i.e., a "logical AND" of the two search predicates), e.g. we can whittle down the two records above by adding the keyword _Delano_ ```mdtest-command dir=testdata/edu -super -z -c 'Ygnacio Delano' schools.jsup +super -z -c '? Ygnacio Delano' schools.jsup ``` and we get just the one record that matches: ```mdtest-output @@ -163,7 +163,7 @@ used. For example, the following search finds records that contain school names that have some additional text between `ACE` and `Academy`: ```mdtest-command dir=testdata/edu -super -z -c 'ACE*Academy' schools.jsup +super -z -c '? ACE*Academy' schools.jsup ``` produces ```mdtest-output head @@ -185,7 +185,7 @@ regexp. For example, since there are many high schools in our sample data, to find only records containing strings that _begin_ with the word `High`: ```mdtest-command dir=testdata/edu -super -z -c '/^High /' schools.jsup +super -z -c '? /^High /' schools.jsup ``` produces ```mdtest-output head @@ -212,7 +212,7 @@ the number `596` matches records that contain numeric fields of this precise val (such as from the test scores) and also records that contain string fields (such as the ZIP code and phone number fields in the school data), e.g., ```mdtest-command dir=testdata/edu -super -z -c '596' testscores.jsup schools.jsup +super -z -c '? 596' testscores.jsup schools.jsup ``` finds these records ```mdtest-output head @@ -242,7 +242,7 @@ Defunct= However, wrapping in quotes to performa a string-literal search gives the desired result: ```mdtest-command dir=testdata/edu -super -z -c '"Defunct="' schools.jsup +super -z -c '? "Defunct="' schools.jsup ``` produces ```mdtest-output @@ -255,7 +255,7 @@ say we're looking for information on the Union Hill Elementary district. Entered without quotes, we end up matching far more records than we intended since each space character between words is treated as a [Boolean `and`](#541-and), e.g., ```mdtest-command dir=testdata/edu -super -z -c 'Union Hill Elementary' schools.jsup +super -z -c '? Union Hill Elementary' schools.jsup ``` produces ```mdtest-output head @@ -268,7 +268,7 @@ produces However, wrapping the entire search term in quotes allows us to search for the complete string, including the spaces, e.g., ```mdtest-command dir=testdata/edu -super -z -c '"Union Hill Elementary"' schools.jsup +super -z -c '? "Union Hill Elementary"' schools.jsup ``` produces ```mdtest-output @@ -484,7 +484,7 @@ Let's say we're earching for information about academies that are flagged as being in a `Pending` status. We can simply concatenate the predicate for "Pending" and the keyword search for `academy`, e.g., ```mdtest-command dir=testdata/edu -super -z -c 'StatusType=="Pending" academy' schools.jsup +super -z -c '? StatusType=="Pending" academy' schools.jsup ``` produces ```mdtest-output @@ -506,7 +506,7 @@ Let'a revisit two of our previous example searches that each only returned a couple records, searching now with `or` to see them all at once, e.g., ```mdtest-command dir=testdata/edu -super -z -c '"Defunct=" or ACE*Academy' schools.jsup +super -z -c '? "Defunct=" or ACE*Academy' schools.jsup ``` produces ```mdtest-output @@ -522,7 +522,7 @@ it in your search. For example, to find schools in the `Dixon Unified` district _other than_ elementary schools, we invert the logic of a search term: ```mdtest-command dir=testdata/edu -super -z -c 'not elementary District=="Dixon Unified"' schools.jsup +super -z -c '? not elementary District=="Dixon Unified"' schools.jsup ``` produces ```mdtest-output head @@ -550,7 +550,7 @@ left-to-right evaluation. For example, we've noticed there are some test score records that have `null` values for all three test scores: ```mdtest-command dir=testdata/edu -super -z -c 'AvgScrMath==null AvgScrRead==null AvgScrWrite==null' testscores.jsup +super -z -c '? AvgScrMath==null AvgScrRead==null AvgScrWrite==null' testscores.jsup ``` produces ```mdtest-output head @@ -561,7 +561,7 @@ produces We can easily filter these out by negating the search for these records, e.g., ```mdtest-command dir=testdata/edu super -z -c ' - not (AvgScrMath==null AvgScrRead==null AvgScrWrite==null) + not (AvgScrMath==null and AvgScrRead==null and AvgScrWrite==null) ' testscores.jsup ``` produces @@ -574,7 +574,7 @@ produces Parentheses can also be nested, e.g., ```mdtest-command dir=testdata/edu super -z -c ' - grep(*High*, sname) + ? grep(*High*, sname) and (not (AvgScrMath==null AvgScrRead==null AvgScrWrite==null) and dname=="San Francisco Unified") ' testscores.jsup @@ -631,7 +631,7 @@ school data that includes fields for both `School` and `Website`, values from our web address data that have the `Website` and `addr` fields, and the missing value from the test score data since it has none of these fields: ```mdtest-command dir=testdata/edu -super -z -c 'yosemiteuhsd |> cut School,Website,addr' *.jsup +super -z -c '? yosemiteuhsd |> cut School,Website,addr' *.jsup ``` produces ```mdtest-output @@ -679,7 +679,7 @@ Let's say you'd started with table-formatted output of all records in our data that reference the town of Geyserville, e.g., ```mdtest-command dir=testdata/edu -super -f table -c 'Geyserville' *.jsup +super -f table -c '? Geyserville' *.jsup ``` produces ```mdtest-output @@ -703,7 +703,7 @@ accurately conveys the heterogeneous nature of the data, but changing schemas mid-stream is not allowed in formats such as CSV or other downstream tooling such as SQL. Indeed, `zq` halts its output in this case, e.g., ```mdtest-command dir=testdata/edu fails -super -f csv -c 'Geyserville' *.jsup +super -f csv -c '? Geyserville' *.jsup ``` produces ```mdtest-output @@ -722,7 +722,7 @@ is assembled in a first pass through the data stream, which enables the presentation of the results under a single, wider header row with no further interruptions between the subsequent data rows, e.g., ```mdtest-command dir=testdata/edu -super -f csv -c 'Geyserville |> fuse' *.jsup +super -f csv -c '? Geyserville |> fuse' *.jsup ``` produces ```mdtest-output @@ -1035,7 +1035,7 @@ constructs an ordered list per city of their websites along with a parallel list of which school each website represents: ```mdtest-command dir=testdata/edu super -Z -c ' - County=="Fresno" Website!=null + ? County=="Fresno" Website!=null |> Websites:=collect(Website),Schools:=collect(School) by City |> sort City ' schools.jsup @@ -1223,7 +1223,7 @@ constructs a set per city of all the unique websites for the schools in that city: ```mdtest-command dir=testdata/edu super -Z -c ' - County=="Fresno" Website!=null + ? County=="Fresno" Website!=null |> Websites:=union(Website) by City |> sort City ' schools.jsup diff --git a/docs/tutorials/zq.md b/docs/tutorials/zq.md index 27db70abcd..d9c16fa028 100644 --- a/docs/tutorials/zq.md +++ b/docs/tutorials/zq.md @@ -104,7 +104,7 @@ is produced each time, so three copies of `2` are emitted. In `zq` however, `2` by itself is interpreted as a search and is [shorthand for](../language/pipeline-model.md#implied-operators) `search 2` so the command ```mdtest-command -echo '1 2 3' | super -z -c 2 - +echo '1 2 3' | super -z -c '? 2' - ``` produces this "search result": ```mdtest-output @@ -114,7 +114,7 @@ In fact, this search syntax generalizes, and if we search over a more complex input: ```mdtest-command echo '1 2 [1,2,3] [4,5,6] {r:{x:1,y:2}} {r:{x:3,y:4}} "hello" "Number 2"' | - super -z -c 2 - + super -z -c '? 2' - ``` we naturally find all the 2's whether as a value, inside a value, or inside a string: ```mdtest-output @@ -126,7 +126,7 @@ we naturally find all the 2's whether as a value, inside a value, or inside a st You can also do keyword-text search, e.g., ```mdtest-command echo '1 2 [1,2,3] [4,5,6] {r:{x:1,y:2}} {r:{x:3,y:4}} "hello" "Number 2"' | - super -z -c 'hello or Number' - + super -z -c '? hello or Number' - ``` produces ```mdtest-output @@ -448,7 +448,7 @@ But more powerfully, types can be used anywhere a value can be used and in particular, they can be group-by keys, e.g., ```mdtest-command echo '{x:1,y:2}{s:"foo"}{x:3,y:4}' | - super -f table -c "count() by shape:=typeof(this) |> sort count" - + super -f table -c "count() by \`shape\`:=typeof(this) |> sort count" - ``` produces ```mdtest-output diff --git a/lake/ztests/deterministic-merge.yaml b/lake/ztests/deterministic-merge.yaml index 821069ea12..f782ff8d6f 100644 --- a/lake/ztests/deterministic-merge.yaml +++ b/lake/ztests/deterministic-merge.yaml @@ -3,8 +3,8 @@ script: | super db init -q super db create -q -S 32B -orderby ts:asc logs super db load -q -use logs in.jsup - super db query -z "from logs |> *" > 1.jsup - super db query -z "from logs |> *" > 2.jsup + super db query -z "from logs" > 1.jsup + super db query -z "from logs" > 2.jsup inputs: - name: in.jsup diff --git a/lake/ztests/null-pool-key.yaml b/lake/ztests/null-pool-key.yaml index 0eecddc9d5..18cd1c440a 100644 --- a/lake/ztests/null-pool-key.yaml +++ b/lake/ztests/null-pool-key.yaml @@ -5,7 +5,7 @@ script: | echo // $o super db create -q -orderby k:$o $o super db load -q -use $o in.jsup - super db query -z "from $o |> k >= 1 k <= 3" + super db query -z "from $o |> k >= 1 and k <= 3" done inputs: diff --git a/runtime/sam/expr/filter_test.go b/runtime/sam/expr/filter_test.go index 09c1dcbef7..bab16b09e5 100644 --- a/runtime/sam/expr/filter_test.go +++ b/runtime/sam/expr/filter_test.go @@ -177,7 +177,7 @@ func TestFilters(t *testing.T) { {"nested.vec[0] == 1", true}, {"nested.vec[1] == 1", false}, {"1 in nested", true}, - {"1", true}, + {"?1", true}, }) // Test unicode string comparison. The following two records @@ -201,9 +201,9 @@ func TestFilters(t *testing.T) { {`a == '\u017F'`, true}, {`a == "S"`, false}, {`a == "s"`, false}, - {`\u017F`, true}, - {`S`, false}, // Should be true; see https://github.com/brimdata/super/issues/1207. - {`s`, false}, // Should be true; see https://github.com/brimdata/super/issues/1207. + {`?\u017F`, true}, + {`?S`, false}, // Should be true; see https://github.com/brimdata/super/issues/1207. + {`?s`, false}, // Should be true; see https://github.com/brimdata/super/issues/1207. }) // Test U+212A KELVIN SIGN. @@ -211,20 +211,20 @@ func TestFilters(t *testing.T) { {`a == '\u212A'`, true}, {`a == "K"`, true}, // True because Unicode NFC replaces U+212A with U+004B. {`a == "k"`, false}, - {`\u212A`, true}, - {`K`, true}, - {`k`, true}, + {`?\u212A`, true}, + {`?K`, true}, + {`?k`, true}, }) // Test searching both fields and containers, // also test case-insensitive search. runCases(t, `{s:"hello",srec:{svec:["world","worldz","1.1.1.1"]}}`, []testcase{ - {"hello", true}, - {"worldz", true}, - {"HELLO", true}, - {"WoRlDZ", true}, - {"1.1.1.1", true}, - {"wor*", true}, + {"?hello", true}, + {"?worldz", true}, + {"?HELLO", true}, + {"?WoRlDZ", true}, + {"?1.1.1.1", true}, + {"?wor*", true}, }) // Test searching a record inside an array, record, set, and union. @@ -239,22 +239,22 @@ func TestFilters(t *testing.T) { } { t.Run(c.name, func(t *testing.T) { runCases(t, c.record, []testcase{ - {"123", true}, - {`"123"`, false}, - {"12", false}, - {"456", true}, - {`"456"`, true}, - {"45", true}, - {"hello", true}, + {"?123", true}, + {`?"123"`, false}, + {"?12", false}, + {"?456", true}, + {`?"456"`, true}, + {"?45", true}, + {"?hello", true}, }) }) } // Test searching with subnet syntax runCases(t, "{addr:192.168.1.50}", []testcase{ - {"192.168.0.0/16", true}, - {"192.168.1.0/24", true}, - {"10.0.0.0/8", false}, + {"?192.168.0.0/16", true}, + {"?192.168.1.0/24", true}, + {"?10.0.0.0/8", false}, }) // Test time coercion @@ -271,7 +271,7 @@ func TestFilters(t *testing.T) { // The ASCII value of 'T' (0x54) is present inside the binary // encoding of 1.001. But naked string search should not match. runCases(t, "{f:1.001}", []testcase{ - {"T", false}, + {"?T", false}, }) // Test integer conditions. These are really testing 2 things: @@ -378,28 +378,28 @@ func TestFilters(t *testing.T) { // Test searching for a field name runCases(t, `{foo:"bleah",rec:{SUB:"meh"}}`, []testcase{ - {"foo", true}, - {"FOO", true}, - {"foo.", false}, - {"sub", true}, - {"sub.", false}, - {"rec.sub", true}, - {"c.s", true}, + {"?foo", true}, + {"?FOO", true}, + {"?foo.", false}, + {"?sub", true}, + {"?nsub.", false}, + {"?rec.sub", true}, + {"?c.s", true}, }) // Test searching for a field name of an null record runCases(t, "{rec:null ({str:string})}", []testcase{ - {"rec.str", true}, + {"?rec.str", true}, }) // Test searching an empty top-level record runCases(t, "{}", []testcase{ - {"empty", false}, + {"?empty", false}, }) // Test searching an empty nested record runCases(t, "{empty:{}}", []testcase{ - {"empty", true}, + {"?empty", true}, }) } diff --git a/runtime/sam/expr/ztests/filter-escaped-asterisk.yaml b/runtime/sam/expr/ztests/filter-escaped-asterisk.yaml index efb0cf06a9..3f1d9067fb 100644 --- a/runtime/sam/expr/ztests/filter-escaped-asterisk.yaml +++ b/runtime/sam/expr/ztests/filter-escaped-asterisk.yaml @@ -1,4 +1,4 @@ -zed: A\=\* +zed: '? A\=\*' input: | {s:"A=B"} diff --git a/runtime/sam/expr/ztests/filter-escaped-equal-sign.yaml b/runtime/sam/expr/ztests/filter-escaped-equal-sign.yaml index 070e82def3..91e8915c19 100644 --- a/runtime/sam/expr/ztests/filter-escaped-equal-sign.yaml +++ b/runtime/sam/expr/ztests/filter-escaped-equal-sign.yaml @@ -1,4 +1,4 @@ -zed: A\=B +zed: '? A\=B' input: | {s:"A=B"} diff --git a/runtime/sam/expr/ztests/filter-unescaped-asterisk.yaml b/runtime/sam/expr/ztests/filter-unescaped-asterisk.yaml index 0f1873b527..41f7c2fea4 100644 --- a/runtime/sam/expr/ztests/filter-unescaped-asterisk.yaml +++ b/runtime/sam/expr/ztests/filter-unescaped-asterisk.yaml @@ -1,4 +1,4 @@ -zed: A\=* +zed: '? A\=*' input: | {s:"A=B"} diff --git a/runtime/sam/expr/ztests/glob.yaml b/runtime/sam/expr/ztests/glob.yaml index 0f56cd3787..e5413fc2d1 100644 --- a/runtime/sam/expr/ztests/glob.yaml +++ b/runtime/sam/expr/ztests/glob.yaml @@ -1,4 +1,4 @@ -zed: foo* +zed: '? foo*' input: | {a:"hello",b:"there"} diff --git a/runtime/sam/expr/ztests/net-search.yaml b/runtime/sam/expr/ztests/net-search.yaml index 36b6f99127..5faf5547b5 100644 --- a/runtime/sam/expr/ztests/net-search.yaml +++ b/runtime/sam/expr/ztests/net-search.yaml @@ -1,4 +1,4 @@ -zed: 192.168.2.0/24 +zed: '? 192.168.2.0/24' input: | {a:192.168.1.1} diff --git a/runtime/sam/expr/ztests/regexp-escapes.yaml b/runtime/sam/expr/ztests/regexp-escapes.yaml index 2b3db8577f..352b9d2ad7 100644 --- a/runtime/sam/expr/ztests/regexp-escapes.yaml +++ b/runtime/sam/expr/ztests/regexp-escapes.yaml @@ -1,6 +1,6 @@ # Add \a and \v when they can be be represented in a ZSON string # (https://github.com/brimdata/super/issues/3041). -zed: '/\f\t\n\r\(\)\*\+\.\/\?\[\]\{\}/' +zed: '? /\f\t\n\r\(\)\*\+\.\/\?\[\]\{\}/' input: &input | {a:"\f\t\n\r()*+./?[]{}"} diff --git a/runtime/sam/expr/ztests/search-ip-primitive.yaml b/runtime/sam/expr/ztests/search-ip-primitive.yaml index dc7ec290fd..dcd814ed5e 100644 --- a/runtime/sam/expr/ztests/search-ip-primitive.yaml +++ b/runtime/sam/expr/ztests/search-ip-primitive.yaml @@ -1,4 +1,4 @@ -zed: 10.0.0.0/8 +zed: '? 10.0.0.0/8' input: | {a:10.1.2.3} diff --git a/runtime/sam/expr/ztests/search-nested-field-regexp.yaml b/runtime/sam/expr/ztests/search-nested-field-regexp.yaml index 6f7b05584e..d5ef2dcd4d 100644 --- a/runtime/sam/expr/ztests/search-nested-field-regexp.yaml +++ b/runtime/sam/expr/ztests/search-nested-field-regexp.yaml @@ -1,4 +1,4 @@ -zed: "*ar" +zed: '? *ar' input: | {a:[{bar:"foo"}]} diff --git a/runtime/sam/expr/ztests/search-nested-field.yaml b/runtime/sam/expr/ztests/search-nested-field.yaml index c4c1504d96..293288c0f6 100644 --- a/runtime/sam/expr/ztests/search-nested-field.yaml +++ b/runtime/sam/expr/ztests/search-nested-field.yaml @@ -1,4 +1,4 @@ -zed: b +zed: '?b' input: | {a:[{b:"foo"}]} diff --git a/runtime/sam/expr/ztests/search-primitives.yaml b/runtime/sam/expr/ztests/search-primitives.yaml index 7c4f822732..ead6d54e17 100644 --- a/runtime/sam/expr/ztests/search-primitives.yaml +++ b/runtime/sam/expr/ztests/search-primitives.yaml @@ -1,4 +1,4 @@ -zed: foo +zed: '?foo' input: | "foo" diff --git a/runtime/sam/expr/ztests/shape-cast-from-union.yaml b/runtime/sam/expr/ztests/shape-cast-from-union.yaml index 308001e5e9..fa8af58eb8 100644 --- a/runtime/sam/expr/ztests/shape-cast-from-union.yaml +++ b/runtime/sam/expr/ztests/shape-cast-from-union.yaml @@ -1,5 +1,5 @@ zed: | - yield cast(from, to) + yield cast(this["from"], to) input: | {from:null((int64,string)),to:} diff --git a/runtime/sam/op/exprswitch/ztests/switch-default.yaml b/runtime/sam/op/exprswitch/ztests/switch-default.yaml index e4c136a7bf..057797f8a0 100644 --- a/runtime/sam/op/exprswitch/ztests/switch-default.yaml +++ b/runtime/sam/op/exprswitch/ztests/switch-default.yaml @@ -2,7 +2,7 @@ zed: | switch a ( case 2 => put v:='two' case 1 => put v:='one' - case 3 => filter null + case 3 => ? null default => count:=count() |> put a:=-1 ) |> sort a diff --git a/runtime/sam/op/exprswitch/ztests/switch.yaml b/runtime/sam/op/exprswitch/ztests/switch.yaml index 0e0af9dab5..aeca101369 100644 --- a/runtime/sam/op/exprswitch/ztests/switch.yaml +++ b/runtime/sam/op/exprswitch/ztests/switch.yaml @@ -2,7 +2,7 @@ zed: | switch a ( case 2 => put v:='two' case 1 => put v:='one' - case 3 => filter null + case 3 => ? null ) |> sort a input: | diff --git a/runtime/sam/op/switcher/ztests/switch-default.yaml b/runtime/sam/op/switcher/ztests/switch-default.yaml index f6f0bfb690..4eb8ddb4e5 100644 --- a/runtime/sam/op/switcher/ztests/switch-default.yaml +++ b/runtime/sam/op/switcher/ztests/switch-default.yaml @@ -2,7 +2,7 @@ zed: | switch ( case a==2 => put v:='two' case a==1 => put v:='one' - case a==3 => filter null + case a==3 => ? null default => count:=count() |> put a:=-1 ) |> sort a diff --git a/runtime/sam/op/switcher/ztests/switch.yaml b/runtime/sam/op/switcher/ztests/switch.yaml index f543c74d0d..835448ca87 100644 --- a/runtime/sam/op/switcher/ztests/switch.yaml +++ b/runtime/sam/op/switcher/ztests/switch.yaml @@ -2,7 +2,7 @@ zed: | switch ( case a == 2 => put v:='two' case a == 1 => put v:='one' - case a == 3 => filter null + case a == 3 => ? null case true => count:=count() |> put a:=-1 ) |> sort a diff --git a/runtime/sam/op/traverse/ztests/nested.yaml b/runtime/sam/op/traverse/ztests/nested.yaml index 4a39ba67a0..6a71bc28a8 100644 --- a/runtime/sam/op/traverse/ztests/nested.yaml +++ b/runtime/sam/op/traverse/ztests/nested.yaml @@ -1,8 +1,8 @@ zed: | - over outer with TOP=top => ( - yield {msg:"OUTER", TOP:TOP, inner:inner, b:b} + over outer with TOP=this["top"] => ( + yield {msg:"OUTER", top:`TOP`, inner:inner, b:b} |> over inner with BOTTOM=b => ( - yield {top:TOP, bottom:BOTTOM, elem:this} + yield {top:`TOP`, bottom:BOTTOM, elem:this} ) ) diff --git a/service/ztests/curl-query-split.yaml b/service/ztests/curl-query-split.yaml index 27ae2eaafb..9c51d8dbcd 100644 --- a/service/ztests/curl-query-split.yaml +++ b/service/ztests/curl-query-split.yaml @@ -5,7 +5,7 @@ script: | super db create -q test super db load -q -use test - curl --stderr ignore -H "Accept: application/x-zjson" -d '{"query":"from test |> fork (=>output main =>output test)"}' $SUPER_DB_LAKE/query\?ctrl=true | - super -z -c "QueryChannelEnd |> sort value.channel" - + super -z -c "? QueryChannelEnd |> sort value.channel" - inputs: - name: service.sh diff --git a/zfmt/ztests/over.yaml b/zfmt/ztests/over.yaml index 830bbc8296..d4f77419e3 100644 --- a/zfmt/ztests/over.yaml +++ b/zfmt/ztests/over.yaml @@ -7,14 +7,14 @@ inputs: - name: test.zed data: | // Expressions - yield (over a |> b) - |> yield (over a with b=c |> d) - |> yield (over a, b with c=d, e=f |> g) + yield (over a |> ?b) + |> yield (over a with b=c |> ?d) + |> yield (over a, b with c=d, e=f |> ?g) // Operators |> over a - |> over a => ( b ) - |> over a with b=c => ( d ) - |> over a, b with c=d, e=f => ( g ) + |> over a => ( ?b ) + |> over a with b=c => ( ?d ) + |> over a, b with c=d, e=f => ( ?g ) outputs: - name: stdout diff --git a/zfmt/ztests/parallel.yaml b/zfmt/ztests/parallel.yaml index 2b61bccb7f..7311b1aede 100644 --- a/zfmt/ztests/parallel.yaml +++ b/zfmt/ztests/parallel.yaml @@ -1,5 +1,5 @@ script: | - super compile -dag -C 'file bar |> foo |> fork (=> count() by x:=this["@foo"] => sum(x) => put a:=b*c) |> cut cake |> sort -r x' + super compile -dag -C 'file bar |> ?foo |> fork (=> count() by x:=this["@foo"] => sum(x) => put a:=b*c) |> cut cake |> sort -r x' outputs: - name: stdout diff --git a/zfmt/ztests/type-value.yaml b/zfmt/ztests/type-value.yaml index 8a40c6e35c..569f826c1a 100644 --- a/zfmt/ztests/type-value.yaml +++ b/zfmt/ztests/type-value.yaml @@ -1,6 +1,6 @@ script: | - super compile -C "is() bar" - super compile -dag -C "is(<(uint16,ip)>) 80" + super compile -C "? is() bar" + super compile -dag -C "? is(<(uint16,ip)>) 80" outputs: - name: stdout diff --git a/zio/anyio/ztests/bsup-gz.yaml b/zio/anyio/ztests/bsup-gz.yaml index 2fd59e8a1a..dea09cb5ae 100644 --- a/zio/anyio/ztests/bsup-gz.yaml +++ b/zio/anyio/ztests/bsup-gz.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: !!binary | H4sIAGv26WEAAy1OwUrDQBTcpE3TprRYemi3h1YvgpdKCi1eaw2NogimWBRkSTdbsyXNLr diff --git a/zio/anyio/ztests/empty-input.yaml b/zio/anyio/ztests/empty-input.yaml index a102ab2f64..ccc46e973b 100644 --- a/zio/anyio/ztests/empty-input.yaml +++ b/zio/anyio/ztests/empty-input.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: '' diff --git a/zio/anyio/ztests/json-array.yaml b/zio/anyio/ztests/json-array.yaml index 8cd88b29c4..356fa6c0e5 100644 --- a/zio/anyio/ztests/json-array.yaml +++ b/zio/anyio/ztests/json-array.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | [{"a":1,"b":2},{"b":3,"a":4}] diff --git a/zio/anyio/ztests/jsup.yaml b/zio/anyio/ztests/jsup.yaml index 94f1d68b18..1c6b588d10 100644 --- a/zio/anyio/ztests/jsup.yaml +++ b/zio/anyio/ztests/jsup.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {_path:"conn"} diff --git a/zio/anyio/ztests/ndjson-gz.yaml b/zio/anyio/ztests/ndjson-gz.yaml index 761b5dfbc5..f504cddb3a 100644 --- a/zio/anyio/ztests/ndjson-gz.yaml +++ b/zio/anyio/ztests/ndjson-gz.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: !!binary | H4sICDmVe18AA291dC5uZGpzb24AbZFbSwMxEIXf/RnzXOJmL73sW61LV9EXtyAiEtJs6q diff --git a/zio/anyio/ztests/ndjson-nonewline.yaml b/zio/anyio/ztests/ndjson-nonewline.yaml index 5a62611df7..bc4af69d43 100644 --- a/zio/anyio/ztests/ndjson-nonewline.yaml +++ b/zio/anyio/ztests/ndjson-nonewline.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: '{"_path":"ssl","cert_chain_fuids":[],"cipher":"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256","client_cert_chain_fuids":[],"client_issuer":null,"client_subject":null,"curve":null,"established":true,"id":{"orig_h":"10.10.7.90","orig_p":51913,"resp_h":"54.230.87.24","resp_p":443},"issuer":null,"last_alert":null,"next_protocol":"http/1.1","resumed":true,"server_name":"choices.truste.com","subject":null,"ts":{"sec":1490385563,"ns":53424000},"uid":"CfEBop2hbfJYpjG5Hd","validation_status":null,"version":"TLSv12"}' diff --git a/zio/anyio/ztests/ndjson.yaml b/zio/anyio/ztests/ndjson.yaml index a91a9f8359..8f80d608df 100644 --- a/zio/anyio/ztests/ndjson.yaml +++ b/zio/anyio/ztests/ndjson.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {"_path":"ssl","cert_chain_fuids":[],"cipher":"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256","client_cert_chain_fuids":[],"client_issuer":null,"client_subject":null,"curve":null,"established":true,"id":{"orig_h":"10.10.7.90","orig_p":51913,"resp_h":"54.230.87.24","resp_p":443},"issuer":null,"last_alert":null,"next_protocol":"http/1.1","resumed":true,"server_name":"choices.truste.com","subject":null,"ts":{"sec":1490385563,"ns":53424000},"uid":"CfEBop2hbfJYpjG5Hd","validation_status":null,"version":"TLSv12"} diff --git a/zio/anyio/ztests/zeek-gz.yaml b/zio/anyio/ztests/zeek-gz.yaml index 3904ac3567..5b04f23716 100644 --- a/zio/anyio/ztests/zeek-gz.yaml +++ b/zio/anyio/ztests/zeek-gz.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: !!binary | H4sICCPt+V0AA3plZWsuaW4ubG9nAH2PXUsrMRCGr2d/xYG9UTjG/dT2stZiFb2xBRGVkG diff --git a/zio/anyio/ztests/zeek-nonewline.yaml b/zio/anyio/ztests/zeek-nonewline.yaml index 0948af311e..1f2221b028 100644 --- a/zio/anyio/ztests/zeek-nonewline.yaml +++ b/zio/anyio/ztests/zeek-nonewline.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: |- #separator \x09 diff --git a/zio/anyio/ztests/zeek.yaml b/zio/anyio/ztests/zeek.yaml index 5e22230f21..2f54fe3d52 100644 --- a/zio/anyio/ztests/zeek.yaml +++ b/zio/anyio/ztests/zeek.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | #separator \x09 diff --git a/zio/anyio/ztests/zjson.yaml b/zio/anyio/ztests/zjson.yaml index 320cd6937a..7230aa5a2b 100644 --- a/zio/anyio/ztests/zjson.yaml +++ b/zio/anyio/ztests/zjson.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {"type":{"kind":"record","id":33,"fields":[{"name":"_path","type":{"kind":"primitive","name":"string"}},{"name":"ts","type":{"kind":"primitive","name":"time"}},{"name":"uid","type":{"kind":"primitive","name":"string"}},{"name":"id","type":{"kind":"record","id":31,"fields":[{"name":"orig_h","type":{"kind":"primitive","name":"ip"}},{"name":"orig_p","type":{"kind":"named","id":30,"name":"port","type":{"kind":"primitive","name":"uint16"}}},{"name":"resp_h","type":{"kind":"primitive","name":"ip"}},{"name":"resp_p","type":{"kind":"ref","id":30}}]}},{"name":"version","type":{"kind":"primitive","name":"string"}},{"name":"cipher","type":{"kind":"primitive","name":"string"}},{"name":"curve","type":{"kind":"primitive","name":"string"}},{"name":"server_name","type":{"kind":"primitive","name":"string"}},{"name":"resumed","type":{"kind":"primitive","name":"bool"}},{"name":"last_alert","type":{"kind":"primitive","name":"string"}},{"name":"next_protocol","type":{"kind":"primitive","name":"string"}},{"name":"established","type":{"kind":"primitive","name":"bool"}},{"name":"cert_chain_fuids","type":{"kind":"array","id":32,"type":{"kind":"primitive","name":"string"}}},{"name":"client_cert_chain_fuids","type":{"kind":"ref","id":32}},{"name":"subject","type":{"kind":"primitive","name":"string"}},{"name":"issuer","type":{"kind":"primitive","name":"string"}},{"name":"client_subject","type":{"kind":"primitive","name":"string"}},{"name":"client_issuer","type":{"kind":"primitive","name":"string"}},{"name":"validation_status","type":{"kind":"primitive","name":"string"}}]},"value":["ssl","2017-03-24T19:59:23.053424Z","CfEBop2hbfJYpjG5Hd",["10.10.7.90","51913","54.230.87.24","443"],"TLSv12","TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",null,"choices.truste.com","true",null,"http/1.1","true",null,null,null,null,null,null,null]} diff --git a/zio/csvio/ztests/bool.yaml b/zio/csvio/ztests/bool.yaml index b40d5b6570..f4296f8595 100644 --- a/zio/csvio/ztests/bool.yaml +++ b/zio/csvio/ztests/bool.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {bool:null(bool)} diff --git a/zio/csvio/ztests/bytes.yaml b/zio/csvio/ztests/bytes.yaml index 2e7c2f55c3..85561a94fb 100644 --- a/zio/csvio/ztests/bytes.yaml +++ b/zio/csvio/ztests/bytes.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {bytes:null(bytes)} diff --git a/zio/csvio/ztests/different-types.yaml b/zio/csvio/ztests/different-types.yaml index da59907576..2cce690e91 100644 --- a/zio/csvio/ztests/different-types.yaml +++ b/zio/csvio/ztests/different-types.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {a:0} diff --git a/zio/csvio/ztests/duration.yaml b/zio/csvio/ztests/duration.yaml index 91cb174c49..846cb3ed90 100644 --- a/zio/csvio/ztests/duration.yaml +++ b/zio/csvio/ztests/duration.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {duration:null(duration)} diff --git a/zio/csvio/ztests/embedded-quotes.yaml b/zio/csvio/ztests/embedded-quotes.yaml index 0423fc24f9..77b1accf52 100644 --- a/zio/csvio/ztests/embedded-quotes.yaml +++ b/zio/csvio/ztests/embedded-quotes.yaml @@ -1,4 +1,4 @@ -script: super -i csv -Z -c '*' - +script: super -i csv -Z - inputs: - name: stdin diff --git a/zio/csvio/ztests/error.yaml b/zio/csvio/ztests/error.yaml index 89964caef1..74a6921a5b 100644 --- a/zio/csvio/ztests/error.yaml +++ b/zio/csvio/ztests/error.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {error:error(null(string))} diff --git a/zio/csvio/ztests/extraneous-quotes.yaml b/zio/csvio/ztests/extraneous-quotes.yaml index b524548eb9..d7670d0c33 100644 --- a/zio/csvio/ztests/extraneous-quotes.yaml +++ b/zio/csvio/ztests/extraneous-quotes.yaml @@ -1,4 +1,4 @@ -script: super -i csv -z -c '*' - +script: super -i csv -z - inputs: - name: stdin diff --git a/zio/csvio/ztests/float.yaml b/zio/csvio/ztests/float.yaml index a4963e2528..1e5825ad52 100644 --- a/zio/csvio/ztests/float.yaml +++ b/zio/csvio/ztests/float.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass # 1e-45 and 5e-324 are the smallest nonzero float32 and float64. # 3.4028235e+38 and 1.7976931348623157e+308 are the maximum float32 and diff --git a/zio/csvio/ztests/int.yaml b/zio/csvio/ztests/int.yaml index e8d4553d06..0d6ee8cfde 100644 --- a/zio/csvio/ztests/int.yaml +++ b/zio/csvio/ztests/int.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {int8:null(int8),int16:null(int16),int32:null(int32),int64:null(int64)} diff --git a/zio/csvio/ztests/ip.yaml b/zio/csvio/ztests/ip.yaml index f46cdf105b..1f2b6844d4 100644 --- a/zio/csvio/ztests/ip.yaml +++ b/zio/csvio/ztests/ip.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {ip:null(ip)} diff --git a/zio/csvio/ztests/issue-2332.yaml b/zio/csvio/ztests/issue-2332.yaml index c1065f01a6..1656e404a2 100644 --- a/zio/csvio/ztests/issue-2332.yaml +++ b/zio/csvio/ztests/issue-2332.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input-flags: -i csv diff --git a/zio/csvio/ztests/named.yaml b/zio/csvio/ztests/named.yaml index 416d91da8b..3607cb016b 100644 --- a/zio/csvio/ztests/named.yaml +++ b/zio/csvio/ztests/named.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {a:{b:1(=my_int64)}(=my_inner_record)}(=my_outer_record) diff --git a/zio/csvio/ztests/net.yaml b/zio/csvio/ztests/net.yaml index 0657503ecb..7d9705688a 100644 --- a/zio/csvio/ztests/net.yaml +++ b/zio/csvio/ztests/net.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {net:null(net)} diff --git a/zio/csvio/ztests/non-record-error.yaml b/zio/csvio/ztests/non-record-error.yaml index dcd2a3a2d8..2802b69db1 100644 --- a/zio/csvio/ztests/non-record-error.yaml +++ b/zio/csvio/ztests/non-record-error.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {a:1} diff --git a/zio/csvio/ztests/null.yaml b/zio/csvio/ztests/null.yaml index d4b1220f27..6e14012c03 100644 --- a/zio/csvio/ztests/null.yaml +++ b/zio/csvio/ztests/null.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {null:null} diff --git a/zio/csvio/ztests/read-big.yaml b/zio/csvio/ztests/read-big.yaml index 0f746bb376..46e701ab65 100644 --- a/zio/csvio/ztests/read-big.yaml +++ b/zio/csvio/ztests/read-big.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input-flags: -i csv diff --git a/zio/csvio/ztests/reader-delim.yaml b/zio/csvio/ztests/reader-delim.yaml index b4f4ad0c35..3637e48194 100644 --- a/zio/csvio/ztests/reader-delim.yaml +++ b/zio/csvio/ztests/reader-delim.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input-flags: -i csv -csv.delim ; diff --git a/zio/csvio/ztests/reader.yaml b/zio/csvio/ztests/reader.yaml index e1f93d3885..72930e2c73 100644 --- a/zio/csvio/ztests/reader.yaml +++ b/zio/csvio/ztests/reader.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input-flags: -i csv diff --git a/zio/csvio/ztests/record-flat.yaml b/zio/csvio/ztests/record-flat.yaml index 1cea0022e1..57135149dc 100644 --- a/zio/csvio/ztests/record-flat.yaml +++ b/zio/csvio/ztests/record-flat.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {a:"hello",b:"world"} diff --git a/zio/csvio/ztests/record-nested.yaml b/zio/csvio/ztests/record-nested.yaml index 7ee3094780..190ae63249 100644 --- a/zio/csvio/ztests/record-nested.yaml +++ b/zio/csvio/ztests/record-nested.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {a:"hello",b:{c:"world",d:"goodbye"}} diff --git a/zio/csvio/ztests/string.yaml b/zio/csvio/ztests/string.yaml index 6a07eefa9f..eeab191a3e 100644 --- a/zio/csvio/ztests/string.yaml +++ b/zio/csvio/ztests/string.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {string:null(string)} diff --git a/zio/csvio/ztests/time.yaml b/zio/csvio/ztests/time.yaml index 4fac59412b..3b772fa0aa 100644 --- a/zio/csvio/ztests/time.yaml +++ b/zio/csvio/ztests/time.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {time:null(time)} diff --git a/zio/csvio/ztests/type.yaml b/zio/csvio/ztests/type.yaml index d1a42e6d6c..a9cc97abec 100644 --- a/zio/csvio/ztests/type.yaml +++ b/zio/csvio/ztests/type.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {type:null(type)} diff --git a/zio/csvio/ztests/uint.yaml b/zio/csvio/ztests/uint.yaml index 74931152ff..c6e6c0865c 100644 --- a/zio/csvio/ztests/uint.yaml +++ b/zio/csvio/ztests/uint.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {uint8:null(uint8),uint16:null(uint16),uint32:null(uint32),uint64:null(uint64)} diff --git a/zio/csvio/ztests/union.yaml b/zio/csvio/ztests/union.yaml index f06a10d553..f75f23a2f5 100644 --- a/zio/csvio/ztests/union.yaml +++ b/zio/csvio/ztests/union.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {a:1((int64,string))} diff --git a/zio/jsonio/ztests/duplicate-field.yaml b/zio/jsonio/ztests/duplicate-field.yaml index b8360f600e..b0fc09fa13 100644 --- a/zio/jsonio/ztests/duplicate-field.yaml +++ b/zio/jsonio/ztests/duplicate-field.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input-flags: -i json diff --git a/zio/jsonio/ztests/empty-containers.yaml b/zio/jsonio/ztests/empty-containers.yaml index d6da0d6634..98e6dd57bc 100644 --- a/zio/jsonio/ztests/empty-containers.yaml +++ b/zio/jsonio/ztests/empty-containers.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {dns:["google.com"],uri:[]([string]),email:|[]|(|[string]|),ip:null([ip])} diff --git a/zio/jsonio/ztests/empty-objects.yaml b/zio/jsonio/ztests/empty-objects.yaml index 125fa304cb..d977be5233 100644 --- a/zio/jsonio/ztests/empty-objects.yaml +++ b/zio/jsonio/ztests/empty-objects.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input-flags: -i json diff --git a/zio/jsonio/ztests/first-token-is-empty-string.yaml b/zio/jsonio/ztests/first-token-is-empty-string.yaml index 67addefba7..5e456e6f7e 100644 --- a/zio/jsonio/ztests/first-token-is-empty-string.yaml +++ b/zio/jsonio/ztests/first-token-is-empty-string.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input-flags: -i json diff --git a/zio/jsonio/ztests/format.yaml b/zio/jsonio/ztests/format.yaml index e4d52ef441..919d1c87f5 100644 --- a/zio/jsonio/ztests/format.yaml +++ b/zio/jsonio/ztests/format.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | #separator \x09 diff --git a/zio/jsonio/ztests/html-escaping-disabled.yaml b/zio/jsonio/ztests/html-escaping-disabled.yaml index 570a2830dc..19f226537d 100644 --- a/zio/jsonio/ztests/html-escaping-disabled.yaml +++ b/zio/jsonio/ztests/html-escaping-disabled.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: &input | "<>&" diff --git a/zio/jsonio/ztests/hyphen.yaml b/zio/jsonio/ztests/hyphen.yaml index a4c433cf61..ee96b02191 100644 --- a/zio/jsonio/ztests/hyphen.yaml +++ b/zio/jsonio/ztests/hyphen.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input-flags: -i json diff --git a/zio/jsonio/ztests/json.yaml b/zio/jsonio/ztests/json.yaml index 13e1669ebd..64cfcc666d 100644 --- a/zio/jsonio/ztests/json.yaml +++ b/zio/jsonio/ztests/json.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input-flags: -i json diff --git a/zio/jsonio/ztests/map-output.yaml b/zio/jsonio/ztests/map-output.yaml index 8ccd3374ce..12dd845ac7 100644 --- a/zio/jsonio/ztests/map-output.yaml +++ b/zio/jsonio/ztests/map-output.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | |{}| diff --git a/zio/jsonio/ztests/nested-empties.yaml b/zio/jsonio/ztests/nested-empties.yaml index 55b1af62fb..f3f46fcf11 100644 --- a/zio/jsonio/ztests/nested-empties.yaml +++ b/zio/jsonio/ztests/nested-empties.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input-flags: -i json diff --git a/zio/jsonio/ztests/nested-nulls.yaml b/zio/jsonio/ztests/nested-nulls.yaml index 97e46826cf..9e343f3a46 100644 --- a/zio/jsonio/ztests/nested-nulls.yaml +++ b/zio/jsonio/ztests/nested-nulls.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {san:{dns:["google.com"],uri:null([string]),email:null(|[string]|),ip:null([ip])}} diff --git a/zio/jsonio/ztests/null-containers.yaml b/zio/jsonio/ztests/null-containers.yaml index a72d8ec48b..4c04a587fc 100644 --- a/zio/jsonio/ztests/null-containers.yaml +++ b/zio/jsonio/ztests/null-containers.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {dns:["google.com"],uri:null([string]),email:null(|[string]|),ip:null([ip])} diff --git a/zio/jsonio/ztests/pretty.yaml b/zio/jsonio/ztests/pretty.yaml index 7b9b436677..9f7f30c173 100644 --- a/zio/jsonio/ztests/pretty.yaml +++ b/zio/jsonio/ztests/pretty.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | { diff --git a/zio/jsonio/ztests/reader.yaml b/zio/jsonio/ztests/reader.yaml index a319147029..421438e2a5 100644 --- a/zio/jsonio/ztests/reader.yaml +++ b/zio/jsonio/ztests/reader.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input-flags: -i json diff --git a/zio/jsonio/ztests/time.yaml b/zio/jsonio/ztests/time.yaml index f404214c5a..54eb10f539 100644 --- a/zio/jsonio/ztests/time.yaml +++ b/zio/jsonio/ztests/time.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {_path:"conn",ts:2001-09-09T01:46:40Z,d:31y259d1h46m40s} diff --git a/zio/jsonio/ztests/typedef.yaml b/zio/jsonio/ztests/typedef.yaml index 50ac730c18..80bca81479 100644 --- a/zio/jsonio/ztests/typedef.yaml +++ b/zio/jsonio/ztests/typedef.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {a:1}(=custom) diff --git a/zio/jsonio/ztests/types.yaml b/zio/jsonio/ztests/types.yaml index 547cc405a1..6adabacd49 100644 --- a/zio/jsonio/ztests/types.yaml +++ b/zio/jsonio/ztests/types.yaml @@ -1,6 +1,6 @@ # This test covers serializing all the different ZNG types to JSON. -zed: '*' +zed: pass input: | {a:10.1.1.1,a2:fe80::eef4:bbff:fe51:89ec,b:true,c:517(uint64),f:3.14159,i:18(int32),interval:1m,p:443(uint16),s:"Hello, world!",t:2020-01-07T14:36:23.487Z,type:} diff --git a/zio/jsonio/ztests/union-array.yaml b/zio/jsonio/ztests/union-array.yaml index 294ac0bde4..420d7cfd6d 100644 --- a/zio/jsonio/ztests/union-array.yaml +++ b/zio/jsonio/ztests/union-array.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input-flags: -i json diff --git a/zio/jsonio/ztests/union-output.yaml b/zio/jsonio/ztests/union-output.yaml index c7a1f9dbae..64269d5a28 100644 --- a/zio/jsonio/ztests/union-output.yaml +++ b/zio/jsonio/ztests/union-output.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | 1((int64,string)) diff --git a/zio/lineio/ztests/reader.yaml b/zio/lineio/ztests/reader.yaml index db59a47a88..d73bafb6d2 100644 --- a/zio/lineio/ztests/reader.yaml +++ b/zio/lineio/ztests/reader.yaml @@ -1,4 +1,4 @@ -zed: "*" +zed: pass input-flags: -i line diff --git a/zio/tableio/ztests/flatten.yaml b/zio/tableio/ztests/flatten.yaml index 22e2d8d858..8b0958151e 100644 --- a/zio/tableio/ztests/flatten.yaml +++ b/zio/tableio/ztests/flatten.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {_path:"conn",ts:2015-03-05T14:25:14.419939Z,uid:"CogZFI3py5JsFZGik",id:null({orig_h:ip,orig_p:port=uint16,resp_h:ip,resp_p:port})} diff --git a/zio/tableio/ztests/nested-record-named.yaml b/zio/tableio/ztests/nested-record-named.yaml index 02fb6dbb60..85eb3e4d5f 100644 --- a/zio/tableio/ztests/nested-record-named.yaml +++ b/zio/tableio/ztests/nested-record-named.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {a:{b:1}(=record_named)} diff --git a/zio/tableio/ztests/non-record-error.yaml b/zio/tableio/ztests/non-record-error.yaml index 676c00aa00..fcbabeb989 100644 --- a/zio/tableio/ztests/non-record-error.yaml +++ b/zio/tableio/ztests/non-record-error.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {a:1} diff --git a/zio/textio/ztests/flatten.yaml b/zio/textio/ztests/flatten.yaml index c732dac9c2..88123f909f 100644 --- a/zio/textio/ztests/flatten.yaml +++ b/zio/textio/ztests/flatten.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {_path:"conn",ts:2015-03-05T14:25:14.419939Z,uid:"CogZFI3py5JsFZGik",id:null({orig_h:ip,orig_p:port=uint16,resp_h:ip,resp_p:port})} diff --git a/zio/textio/ztests/nested-record-named.yaml b/zio/textio/ztests/nested-record-named.yaml index 0e838b5e7b..a16f34ec73 100644 --- a/zio/textio/ztests/nested-record-named.yaml +++ b/zio/textio/ztests/nested-record-named.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {a:{b:1}(=record_named)} diff --git a/zio/textio/ztests/vals.yaml b/zio/textio/ztests/vals.yaml index 7fa2cd23b3..345a4a12bb 100644 --- a/zio/textio/ztests/vals.yaml +++ b/zio/textio/ztests/vals.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | 1 diff --git a/zio/zeekio/ztests/close-date.yaml b/zio/zeekio/ztests/close-date.yaml index 71edb4192f..1a26a5896f 100644 --- a/zio/zeekio/ztests/close-date.yaml +++ b/zio/zeekio/ztests/close-date.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | #separator \x09 diff --git a/zio/zeekio/ztests/close-nodate.yaml b/zio/zeekio/ztests/close-nodate.yaml index e67af104e4..724cf1a897 100644 --- a/zio/zeekio/ztests/close-nodate.yaml +++ b/zio/zeekio/ztests/close-nodate.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | #separator \x09 diff --git a/zio/zeekio/ztests/duration.yaml b/zio/zeekio/ztests/duration.yaml index f358f90df0..281154302b 100644 --- a/zio/zeekio/ztests/duration.yaml +++ b/zio/zeekio/ztests/duration.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {_path:"conn",ts:2001-09-09T01:46:40Z,d:31y259d1h46m40s} diff --git a/zio/zeekio/ztests/empty-close.yaml b/zio/zeekio/ztests/empty-close.yaml index 30db67a07a..99a5603265 100644 --- a/zio/zeekio/ztests/empty-close.yaml +++ b/zio/zeekio/ztests/empty-close.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | #separator \x09 diff --git a/zio/zeekio/ztests/empty.yaml b/zio/zeekio/ztests/empty.yaml index 66249d9177..16acdd0bc1 100644 --- a/zio/zeekio/ztests/empty.yaml +++ b/zio/zeekio/ztests/empty.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: |- #separator \x09 diff --git a/zio/zeekio/ztests/flatten.yaml b/zio/zeekio/ztests/flatten.yaml index 2e80a8cee5..cacbce162d 100644 --- a/zio/zeekio/ztests/flatten.yaml +++ b/zio/zeekio/ztests/flatten.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | #separator \x09 diff --git a/zio/zeekio/ztests/multizeek.yaml b/zio/zeekio/ztests/multizeek.yaml index 2fa77ddd4c..ef99c9c3d9 100644 --- a/zio/zeekio/ztests/multizeek.yaml +++ b/zio/zeekio/ztests/multizeek.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | #separator \x09 diff --git a/zio/zeekio/ztests/multizng.yaml b/zio/zeekio/ztests/multizng.yaml index 6adf32c0cd..84383a2aa6 100644 --- a/zio/zeekio/ztests/multizng.yaml +++ b/zio/zeekio/ztests/multizng.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {_path:"a",ts:1970-01-01T00:00:10Z,d:1.} diff --git a/zio/zeekio/ztests/nested-2.yaml b/zio/zeekio/ztests/nested-2.yaml index ee209addd7..2449e9a202 100644 --- a/zio/zeekio/ztests/nested-2.yaml +++ b/zio/zeekio/ztests/nested-2.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {_path:"smb_cmd",ts:2009-11-19T01:41:47.85978Z,uid:"Chjxid42dvvzIzdeG8",id:{orig_h:192.168.1.102,orig_p:1076(port=uint16),resp_h:192.168.1.1,resp_p:139(port)},referenced_file:{ts:2009-11-19T01:41:47.85978Z,uid:"Chjxid42dvvzIzdeG8",id:{orig_h:192.168.1.102,orig_p:1076(port),resp_h:192.168.1.1,resp_p:139(port)},fuid:"ZYjxid42dvvzIzdeG8"}} diff --git a/zio/zeekio/ztests/nested-record-name-is-prefix-of-another-field.yaml b/zio/zeekio/ztests/nested-record-name-is-prefix-of-another-field.yaml index 27873b0c01..efcee91a50 100644 --- a/zio/zeekio/ztests/nested-record-name-is-prefix-of-another-field.yaml +++ b/zio/zeekio/ztests/nested-record-name-is-prefix-of-another-field.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | #separator \x09 diff --git a/zio/zeekio/ztests/nested-record-named.yaml b/zio/zeekio/ztests/nested-record-named.yaml index b0faee2b20..a5da697be1 100644 --- a/zio/zeekio/ztests/nested-record-named.yaml +++ b/zio/zeekio/ztests/nested-record-named.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {a:{b:1}(=record_named)} diff --git a/zio/zeekio/ztests/nested-record-with-nonadjacent-fields.yaml b/zio/zeekio/ztests/nested-record-with-nonadjacent-fields.yaml index 02596056eb..332acca78f 100644 --- a/zio/zeekio/ztests/nested-record-with-nonadjacent-fields.yaml +++ b/zio/zeekio/ztests/nested-record-with-nonadjacent-fields.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | #separator \x09 diff --git a/zio/zeekio/ztests/nested.yaml b/zio/zeekio/ztests/nested.yaml index 6d4d997335..5747bf527e 100644 --- a/zio/zeekio/ztests/nested.yaml +++ b/zio/zeekio/ztests/nested.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | #separator \x09 diff --git a/zio/zeekio/ztests/no-path.yaml b/zio/zeekio/ztests/no-path.yaml index f489bd9731..532c3dea24 100644 --- a/zio/zeekio/ztests/no-path.yaml +++ b/zio/zeekio/ztests/no-path.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | #fields foo diff --git a/zio/zeekio/ztests/path.yaml b/zio/zeekio/ztests/path.yaml index 4a6d9d75a9..d4b7501ff4 100644 --- a/zio/zeekio/ztests/path.yaml +++ b/zio/zeekio/ztests/path.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | #separator \x09 diff --git a/zio/zeekio/ztests/path2.yaml b/zio/zeekio/ztests/path2.yaml index 296fd412f4..3f340eb6a1 100644 --- a/zio/zeekio/ztests/path2.yaml +++ b/zio/zeekio/ztests/path2.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | #separator \x09 diff --git a/zio/zeekio/ztests/read-escaped-backslash.yaml b/zio/zeekio/ztests/read-escaped-backslash.yaml index f919e2f528..2dfa2dc9c5 100644 --- a/zio/zeekio/ztests/read-escaped-backslash.yaml +++ b/zio/zeekio/ztests/read-escaped-backslash.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | #separator \x09 diff --git a/zio/zeekio/ztests/string-set.yaml b/zio/zeekio/ztests/string-set.yaml index bd1f4cbffa..6308bf9ebf 100644 --- a/zio/zeekio/ztests/string-set.yaml +++ b/zio/zeekio/ztests/string-set.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | #separator \x09 diff --git a/zio/zeekio/ztests/time.yaml b/zio/zeekio/ztests/time.yaml index 9994c30213..965aede3bc 100644 --- a/zio/zeekio/ztests/time.yaml +++ b/zio/zeekio/ztests/time.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {_path:"conn",ts:2015-03-05T14:25:14.419939Z,ts2:1970-01-01T00:00:01Z} diff --git a/zio/zeekio/ztests/trailing-whitespace.yaml b/zio/zeekio/ztests/trailing-whitespace.yaml index ceb660e921..8e5ddbfbc1 100644 --- a/zio/zeekio/ztests/trailing-whitespace.yaml +++ b/zio/zeekio/ztests/trailing-whitespace.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass # The last input line should end with a tab character. input: "#separator \\x09\n#set_separator\t,\n#empty_field\t(empty)\n#unset_field\t-\n#path\tunknown_mime_type_discovery\n#open\t2020-04-10-18-15-32\n#fields\tts\tfid\tbof\n#types\ttime\tstring\tstring\n1425634708.454143\tFTBt2P3wJBdHGKpZwc\t \n" diff --git a/zio/zeekio/ztests/types.yaml b/zio/zeekio/ztests/types.yaml index f47889d64a..7d4516372e 100644 --- a/zio/zeekio/ztests/types.yaml +++ b/zio/zeekio/ztests/types.yaml @@ -2,7 +2,7 @@ # the ZNG type system are handled correctly (i.e., that the Zeek types, # including those inside containers, are preserved on a pass through zq). -zed: '*' +zed: pass input: &input | #separator \x09 diff --git a/zio/zeekio/ztests/unset-in-array.yaml b/zio/zeekio/ztests/unset-in-array.yaml index b66a46cb67..8ea6de2c89 100644 --- a/zio/zeekio/ztests/unset-in-array.yaml +++ b/zio/zeekio/ztests/unset-in-array.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | #separator \x09 diff --git a/zio/zeekio/ztests/unset-in-record.yaml b/zio/zeekio/ztests/unset-in-record.yaml index a007935ebb..44eb8933da 100644 --- a/zio/zeekio/ztests/unset-in-record.yaml +++ b/zio/zeekio/ztests/unset-in-record.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | #separator \x09 diff --git a/zio/zeekio/ztests/unset-time.yaml b/zio/zeekio/ztests/unset-time.yaml index 5906e4dd98..38823393f0 100644 --- a/zio/zeekio/ztests/unset-time.yaml +++ b/zio/zeekio/ztests/unset-time.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | #separator \x09 diff --git a/zio/zeekio/ztests/utf8.yaml b/zio/zeekio/ztests/utf8.yaml index c16dc2f1ae..ce593d0f85 100644 --- a/zio/zeekio/ztests/utf8.yaml +++ b/zio/zeekio/ztests/utf8.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass # Note the \x syntax is not valid in a ZSON string so there is not a way # to get \x Zeek TSV escapes into th TSV output unless we add support diff --git a/zio/zeekio/ztests/zeek-format-test.yaml b/zio/zeekio/ztests/zeek-format-test.yaml index ea63197fc1..54c44d0579 100644 --- a/zio/zeekio/ztests/zeek-format-test.yaml +++ b/zio/zeekio/ztests/zeek-format-test.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {s:"foo"} diff --git a/zio/zeekio/ztests/zeek-utf8-json.yaml b/zio/zeekio/ztests/zeek-utf8-json.yaml index 108fa67a53..c7675a927d 100644 --- a/zio/zeekio/ztests/zeek-utf8-json.yaml +++ b/zio/zeekio/ztests/zeek-utf8-json.yaml @@ -1,4 +1,4 @@ -zed: "*" +zed: pass # These test inputs are from src/util.cc in the Zeek source code as of Jan 2022. # See https://github.com/zeek/zeek/blob/3d9d6e953be5ae8b72336031b6e6659222f52cea/src/util.cc#L2521 diff --git a/zio/zeekio/ztests/zng-types.yaml b/zio/zeekio/ztests/zng-types.yaml index bd0ad1565e..f30fd60f53 100644 --- a/zio/zeekio/ztests/zng-types.yaml +++ b/zio/zeekio/ztests/zng-types.yaml @@ -1,6 +1,6 @@ # Test that ZNG types are mapped into proper equivalent Zeek types. -zed: '*' +zed: pass input: | {b:0(uint8),i16:0(int16),u16:0(uint16),i32:0(int32),u32:0(uint32),i64:0,u64:0(uint64),a:10.1.2.3,n:10.0.0.0/8,d:16m40s} diff --git a/zio/zjsonio/ztests/empty-records.yaml b/zio/zjsonio/ztests/empty-records.yaml index 0e2cd20588..97af94254e 100644 --- a/zio/zjsonio/ztests/empty-records.yaml +++ b/zio/zjsonio/ztests/empty-records.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {ja3s:null(int32)} diff --git a/zio/zjsonio/ztests/union-array.yaml b/zio/zjsonio/ztests/union-array.yaml index b3c1ee94dd..89853401f6 100644 --- a/zio/zjsonio/ztests/union-array.yaml +++ b/zio/zjsonio/ztests/union-array.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {"type":{"kind":"record","id":32,"fields":[{"name":"a","type":{"kind":"array","id":31,"type":{"kind":"union","id":30,"types":[{"kind":"primitive","name":"int32"},{"kind":"primitive","name":"string"}]}}}]},"value":[[["1","asdfasdf"],null,["0","100"]]]} diff --git a/zio/zjsonio/ztests/union-nested.yaml b/zio/zjsonio/ztests/union-nested.yaml index 9cfe9b3e92..f1b98745ef 100644 --- a/zio/zjsonio/ztests/union-nested.yaml +++ b/zio/zjsonio/ztests/union-nested.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {"type":{"kind":"record","id":34,"fields":[{"name":"a","type":{"kind":"union","id":33,"types":[{"kind":"primitive","name":"string"},{"kind":"array","id":30,"type":{"kind":"primitive","name":"int32"}},{"kind":"array","id":31,"type":{"kind":"primitive","name":"string"}},{"kind":"union","id":32,"types":[{"kind":"primitive","name":"string"},{"kind":"primitive","name":"int32"}]}]}}]},"value":[["0","\"hello\""]]} diff --git a/zio/zjsonio/ztests/union-simple.yaml b/zio/zjsonio/ztests/union-simple.yaml index 7129e60615..96b1d0be67 100644 --- a/zio/zjsonio/ztests/union-simple.yaml +++ b/zio/zjsonio/ztests/union-simple.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {"type":{"kind":"record","id":31,"fields":[{"name":"a","type":{"kind":"union","id":30,"types":[{"kind":"primitive","name":"int32"},{"kind":"primitive","name":"string"}]}}]},"value":[["1","asdfasdf"]]} diff --git a/zio/zsonio/ztests/enum.yaml b/zio/zsonio/ztests/enum.yaml index 4f4afa6bfb..450cc2bf83 100644 --- a/zio/zsonio/ztests/enum.yaml +++ b/zio/zsonio/ztests/enum.yaml @@ -1,4 +1,4 @@ -zed: "*" +zed: pass output-flags: -f jsup -pretty=4 diff --git a/zio/zsonio/ztests/first-test.yaml b/zio/zsonio/ztests/first-test.yaml index a170c7e388..fee8dfc429 100644 --- a/zio/zsonio/ztests/first-test.yaml +++ b/zio/zsonio/ztests/first-test.yaml @@ -1,4 +1,4 @@ -zed: "*" +zed: pass output-flags: -f jsup -pretty=4 diff --git a/zson/ztests/container-types.yaml b/zson/ztests/container-types.yaml index 1ad89f08cd..9a54adf7f5 100644 --- a/zson/ztests/container-types.yaml +++ b/zson/ztests/container-types.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | null(|{string:int32}|) diff --git a/zson/ztests/dup-fields.yaml b/zson/ztests/dup-fields.yaml index 374273567c..b284dda96b 100644 --- a/zson/ztests/dup-fields.yaml +++ b/zson/ztests/dup-fields.yaml @@ -1,4 +1,4 @@ -zed: "*" +zed: pass input: | {foo:1,bar:3} diff --git a/zson/ztests/dynamic-typedef.yaml b/zson/ztests/dynamic-typedef.yaml index eb2b134fd6..9b1a9ce343 100644 --- a/zson/ztests/dynamic-typedef.yaml +++ b/zson/ztests/dynamic-typedef.yaml @@ -1,4 +1,4 @@ -zed: "*" +zed: pass input: &input | {x:1}(=foo) diff --git a/zson/ztests/empty-string-field.yaml b/zson/ztests/empty-string-field.yaml index ec0c53fc31..45752115ce 100644 --- a/zson/ztests/empty-string-field.yaml +++ b/zson/ztests/empty-string-field.yaml @@ -1,4 +1,4 @@ -zed: "*" +zed: pass input: &input | {"":1} diff --git a/zson/ztests/escaped-slash.yaml b/zson/ztests/escaped-slash.yaml index 83d5bac553..970113d4e5 100644 --- a/zson/ztests/escaped-slash.yaml +++ b/zson/ztests/escaped-slash.yaml @@ -1,4 +1,4 @@ -zed: "*" +zed: pass input: | "1:foo/bar" diff --git a/zson/ztests/float-cast.yaml b/zson/ztests/float-cast.yaml index 4ca9336424..9e9be61b97 100644 --- a/zson/ztests/float-cast.yaml +++ b/zson/ztests/float-cast.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | 16(float16) diff --git a/zson/ztests/float.yaml b/zson/ztests/float.yaml index 76301aa275..e7e71bb9bc 100644 --- a/zson/ztests/float.yaml +++ b/zson/ztests/float.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass # 1e-45 and 5e-324 are the smallest nonzero float32 and float64. # 3.4028235e+38 and 1.7976931348623157e+308 are the maximum float32 and diff --git a/zson/ztests/issue-2050.yaml b/zson/ztests/issue-2050.yaml index e76cc94922..d4b7c5b694 100644 --- a/zson/ztests/issue-2050.yaml +++ b/zson/ztests/issue-2050.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {a:[[](2=[null])(3=(2,int64)),1(3)](=4)}(=5) diff --git a/zson/ztests/map.yaml b/zson/ztests/map.yaml index 7d4b639742..a92cbecfc6 100644 --- a/zson/ztests/map.yaml +++ b/zson/ztests/map.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | |{}| diff --git a/zson/ztests/mixed-array.yaml b/zson/ztests/mixed-array.yaml index 3abb1716fa..b0863c5fe6 100644 --- a/zson/ztests/mixed-array.yaml +++ b/zson/ztests/mixed-array.yaml @@ -1,4 +1,4 @@ -zed: "*" +zed: pass input: | [1((int64,string)),"b"((int64,string)),2((int64,string))] diff --git a/zson/ztests/named-in-union.yaml b/zson/ztests/named-in-union.yaml index d4579d6322..944cfd9909 100644 --- a/zson/ztests/named-in-union.yaml +++ b/zson/ztests/named-in-union.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: &input | ""(=string_named)(union_named=(int64,string_named)) diff --git a/zson/ztests/named-primitive.yaml b/zson/ztests/named-primitive.yaml index 9c033d1ac7..891b2828bd 100644 --- a/zson/ztests/named-primitive.yaml +++ b/zson/ztests/named-primitive.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: &input | 0 (myuint8=uint8) diff --git a/zson/ztests/negative-duration.yaml b/zson/ztests/negative-duration.yaml index 25e8447993..fd99a67b7b 100644 --- a/zson/ztests/negative-duration.yaml +++ b/zson/ztests/negative-duration.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: &input | {duration:-292y171d23h47m16.854775807s} diff --git a/zson/ztests/quoted-tv-field.yaml b/zson/ztests/quoted-tv-field.yaml index f282aa6d1c..cc6159a4fd 100644 --- a/zson/ztests/quoted-tv-field.yaml +++ b/zson/ztests/quoted-tv-field.yaml @@ -1,4 +1,4 @@ -zed: "*" +zed: pass input: &input | {T:<{"":{}}>} diff --git a/zson/ztests/set.yaml b/zson/ztests/set.yaml index 1f974d362f..57ac74aa08 100644 --- a/zson/ztests/set.yaml +++ b/zson/ztests/set.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | |[1,1,1,5,1]| diff --git a/zson/ztests/type-name.yaml b/zson/ztests/type-name.yaml index 3d0fcad240..15726dc5ea 100644 --- a/zson/ztests/type-name.yaml +++ b/zson/ztests/type-name.yaml @@ -1,4 +1,4 @@ -zed: '*' +zed: pass input: | {s:"hello, world"}(="github.com/acme/foo.Bar") diff --git a/zson/ztests/type-value-empty-record.yaml b/zson/ztests/type-value-empty-record.yaml index 9aded65bc3..a4d5e691dc 100644 --- a/zson/ztests/type-value-empty-record.yaml +++ b/zson/ztests/type-value-empty-record.yaml @@ -1,4 +1,4 @@ -zed: "*" +zed: pass input: &input | <{}> diff --git a/zson/ztests/type-value.yaml b/zson/ztests/type-value.yaml index 3d84d55341..1af76898af 100644 --- a/zson/ztests/type-value.yaml +++ b/zson/ztests/type-value.yaml @@ -1,4 +1,4 @@ -zed: "*" +zed: pass input: &input | diff --git a/ztests/field.yaml b/ztests/field.yaml index b4e3205436..8d11a3bd47 100644 --- a/ztests/field.yaml +++ b/ztests/field.yaml @@ -1,4 +1,4 @@ -zed: "*" +zed: pass input: | {foo:0x68692c20776f726c64,".bar@":123(int32),x:"hello"}