From ceeb51502837fc45b3c31d9fa323cadacbbf0d91 Mon Sep 17 00:00:00 2001 From: Steven McCanne Date: Sat, 2 Nov 2024 22:19:26 -0700 Subject: [PATCH] change pipe symbol --- cmd/super/db/manage/ztests/compact-size.yaml | 2 +- cmd/super/db/manage/ztests/compact.yaml | 2 +- cmd/super/db/manage/ztests/config.yaml | 2 +- cmd/super/db/manage/ztests/overlap.yaml | 2 +- cmd/super/db/manage/ztests/pool-flag.yaml | 2 +- cmd/super/db/manage/ztests/vectors.yaml | 4 +- cmd/super/db/ztests/query-stats.yaml | 2 +- cmd/super/internal/lakemanage/scan.go | 4 +- cmd/super/ztests/call-user-op-with-src.yaml | 2 +- cmd/super/ztests/single-arg-error.yaml | 8 +- compiler/job.go | 2 +- compiler/parser/parser.go | 7338 ++++++++--------- compiler/parser/parser.peg | 2 +- compiler/parser/valid.zed | 12 +- compiler/parser/ztests/comments.yaml | 2 +- compiler/parser/ztests/from.yaml | 14 +- compiler/parser/ztests/over-expr.yaml | 20 +- compiler/parser/ztests/reserved-word-ids.yaml | 2 +- compiler/parser/ztests/sample-expr.yaml | 2 +- compiler/parser/ztests/sample.yaml | 2 +- compiler/parser/ztests/sql-comments.yaml | 4 +- compiler/parser/ztests/where-expr.yaml | 2 +- compiler/parser/ztests/where-search.yaml | 2 +- compiler/ztests/anycase-funcs.yaml | 2 +- compiler/ztests/const-from.yaml | 2 +- compiler/ztests/const-source.yaml | 6 +- compiler/ztests/const-switch.yaml | 2 +- compiler/ztests/equal-compare.yaml | 2 +- compiler/ztests/fork-from.yaml | 2 +- compiler/ztests/from-fork.yaml | 2 +- compiler/ztests/from-pass.yaml | 4 +- compiler/ztests/head.yaml | 8 +- compiler/ztests/join-desc.yaml | 6 +- compiler/ztests/join-subquery.yaml | 12 +- compiler/ztests/load.yaml | 2 +- compiler/ztests/merge-error.yaml | 2 +- compiler/ztests/merge-filters.yaml | 22 +- compiler/ztests/nested-const.yaml | 2 +- compiler/ztests/par-count.yaml | 30 +- compiler/ztests/par-groupby-func.yaml | 14 +- compiler/ztests/par-join.yaml | 20 +- compiler/ztests/par-layout-dataflow.yaml | 28 +- compiler/ztests/par-pushdown.yaml | 2 +- compiler/ztests/par-put-ts-rename-count.yaml | 12 +- compiler/ztests/par-put-ts-rename-sort.yaml | 8 +- compiler/ztests/par-put-ts-rename.yaml | 8 +- compiler/ztests/par-ts.yaml | 168 +- compiler/ztests/pushdown.yaml | 48 +- compiler/ztests/remove-passops.yaml | 4 +- compiler/ztests/scoped-this.yaml | 2 +- compiler/ztests/sem-groupby-input-dir.yaml | 10 +- compiler/ztests/sql/distinct.yaml | 4 +- compiler/ztests/sql/groupby.yaml | 4 +- compiler/ztests/sql/like.yaml | 2 +- compiler/ztests/sql/precedence.yaml | 2 +- compiler/ztests/tail.yaml | 8 +- compiler/ztests/udf-implied-where.yaml | 4 +- docs/README.md | 2 +- docs/commands/zed.md | 8 +- docs/commands/zq.md | 8 +- docs/formats/README.md | 2 +- docs/integrations/fluentd.md | 8 +- docs/integrations/zeek/shaping-zeek-json.md | 22 +- docs/lake/api.md | 4 +- docs/language/aggregates/and.md | 2 +- docs/language/aggregates/any.md | 2 +- docs/language/aggregates/avg.md | 2 +- docs/language/aggregates/collect.md | 2 +- docs/language/aggregates/collect_map.md | 2 +- docs/language/aggregates/count.md | 4 +- docs/language/aggregates/dcount.md | 2 +- docs/language/aggregates/fuse.md | 2 +- docs/language/aggregates/max.md | 2 +- docs/language/aggregates/min.md | 2 +- docs/language/aggregates/or.md | 2 +- docs/language/aggregates/sum.md | 2 +- docs/language/aggregates/union.md | 4 +- docs/language/data-types.md | 6 +- docs/language/expressions.md | 2 +- docs/language/functions/cast.md | 2 +- docs/language/functions/error.md | 2 +- docs/language/functions/every.md | 8 +- docs/language/functions/fields.md | 2 +- docs/language/functions/has_error.md | 2 +- docs/language/functions/unflatten.md | 4 +- docs/language/lateral-subqueries.md | 16 +- docs/language/operators/combine.md | 4 +- docs/language/operators/cut.md | 2 +- docs/language/operators/fork.md | 2 +- docs/language/operators/from.md | 52 +- docs/language/operators/load.md | 12 +- docs/language/operators/merge.md | 4 +- docs/language/operators/over.md | 6 +- docs/language/operators/pass.md | 2 +- docs/language/operators/rename.md | 2 +- docs/language/operators/sample.md | 6 +- docs/language/operators/summarize.md | 12 +- docs/language/operators/switch.md | 4 +- docs/language/operators/top.md | 2 +- docs/language/operators/uniq.md | 2 +- docs/language/operators/yield.md | 2 +- docs/language/overview.md | 8 +- docs/language/pipeline-model.md | 4 +- docs/language/shaping.md | 10 +- docs/language/statements.md | 8 +- .../ztests/language-background-2.yaml | 2 +- .../ztests/language-background-5.yaml | 2 +- .../ztests/language-background-6.yaml | 2 +- .../ztests/language-background-8.yaml | 2 +- .../ztests/language-background-9.yaml | 6 +- ...nguage-directed-acyclic-flow-graphs-1.yaml | 16 +- ...nguage-directed-acyclic-flow-graphs-2.yaml | 12 +- ...nguage-directed-acyclic-flow-graphs-3.yaml | 20 +- .../language/ztests/language-operators-1.yaml | 6 +- docs/language/ztests/language-tldr-1.yaml | 2 +- docs/language/ztests/language-tldr-2.yaml | 2 +- docs/libraries/python.md | 2 +- docs/tutorials/join.md | 34 +- docs/tutorials/schools.md | 84 +- docs/tutorials/zed.md | 6 +- docs/tutorials/zq.md | 98 +- lake/api/api.go | 8 +- lake/ztests/appmeta.yaml | 2 +- lake/ztests/compact-vectors.yaml | 2 +- lake/ztests/compact.yaml | 2 +- lake/ztests/cross-pool-join.yaml | 4 +- lake/ztests/debug.yaml | 2 +- lake/ztests/delete-where-invalid.yaml | 2 +- lake/ztests/delete-where-missing.yaml | 4 +- lake/ztests/delete-where.yaml | 4 +- lake/ztests/delete.yaml | 2 +- lake/ztests/deterministic-merge.yaml | 4 +- lake/ztests/from-pattern.yaml | 8 +- lake/ztests/group-by-func.yaml | 2 +- lake/ztests/group-by-ts.yaml | 10 +- lake/ztests/issue-2784.yaml | 2 +- lake/ztests/ls.yaml | 2 +- lake/ztests/match-missing-pool-key.yaml | 2 +- lake/ztests/merge-by-addr.yaml | 2 +- lake/ztests/meta-optimized-filter.yaml | 4 +- lake/ztests/meta.yaml | 6 +- lake/ztests/null-pool-key.yaml | 2 +- lake/ztests/overlap.yaml | 2 +- lake/ztests/quiet-cut.yaml | 2 +- lake/ztests/revert-revert.yaml | 6 +- lake/ztests/revert.yaml | 6 +- lake/ztests/s3/stat.yaml | 2 +- lake/ztests/s3/zq.yaml | 2 +- lake/ztests/seek-index-boundaries.yaml | 50 +- lake/ztests/seek-index-null.yaml | 2 +- lake/ztests/seek-index-overlap.yaml | 4 +- lake/ztests/seek-index-simple.yaml | 16 +- lake/ztests/seek-index-ts.yaml | 30 +- lake/ztests/time-travel.yaml | 10 +- lake/ztests/vector.yaml | 6 +- lake/ztests/zq.yaml | 2 +- .../sam/expr/agg/ztests/logical-partials.yaml | 2 +- runtime/sam/expr/function/ztests/nameof.yaml | 2 +- runtime/sam/expr/ztests/is-typedef.yaml | 2 +- .../expr/ztests/record-spread-over-with.yaml | 2 +- .../sam/expr/ztests/record-spread-over.yaml | 2 +- runtime/sam/expr/ztests/rename.yaml | 2 +- .../sam/expr/ztests/shape-zson-typedef.yaml | 2 +- runtime/sam/expr/ztests/type-map.yaml | 6 +- .../op/exprswitch/ztests/switch-default.yaml | 4 +- .../sam/op/exprswitch/ztests/switch-done.yaml | 2 +- .../sam/op/exprswitch/ztests/switch-over.yaml | 4 +- runtime/sam/op/exprswitch/ztests/switch.yaml | 2 +- runtime/sam/op/groupby/ztests/groupby.yaml | 20 +- .../ztests/null-keys-at-start-assign.yaml | 2 +- .../op/groupby/ztests/null-keys-at-start.yaml | 2 +- runtime/sam/op/groupby/ztests/null-keys.yaml | 2 +- runtime/sam/op/groupby/ztests/reducers.yaml | 2 +- runtime/sam/op/groupby/ztests/where.yaml | 2 +- runtime/sam/op/join/ztests/auto-sort.yaml | 12 +- runtime/sam/op/join/ztests/cut-like.yaml | 2 +- .../sam/op/join/ztests/first-key-is-null.yaml | 2 +- .../sam/op/join/ztests/first-key-is-zero.yaml | 2 +- runtime/sam/op/join/ztests/kinds.yaml | 8 +- runtime/sam/op/join/ztests/subquery.yaml | 2 +- runtime/sam/op/merge/ztests/expr.yaml | 2 +- runtime/sam/op/merge/ztests/fork-merge.yaml | 2 +- runtime/sam/op/meta/ztests/nulls-max.yaml | 4 +- runtime/sam/op/meta/ztests/partitions.yaml | 2 +- runtime/sam/op/meta/ztests/pruner.yaml | 12 +- runtime/sam/op/meta/ztests/type-context.yaml | 4 +- runtime/sam/op/sort/ztests/over-with.yaml | 2 +- .../op/switcher/ztests/switch-chained.yaml | 4 +- .../op/switcher/ztests/switch-default.yaml | 4 +- .../sam/op/switcher/ztests/switch-error.yaml | 2 +- .../sam/op/switcher/ztests/switch-over.yaml | 4 +- runtime/sam/op/switcher/ztests/switch.yaml | 4 +- runtime/sam/op/tail/ztests/over-with.yaml | 2 +- runtime/sam/op/traverse/ztests/bare.yaml | 2 +- runtime/sam/op/traverse/ztests/filter.yaml | 2 +- runtime/sam/op/traverse/ztests/head.yaml | 2 +- .../op/traverse/ztests/nested-done-head.yaml | 10 +- .../op/traverse/ztests/nested-done-tail.yaml | 10 +- .../ztests/nested-over-tail-head.yaml | 2 +- .../op/traverse/ztests/nested-where-head.yaml | 2 +- runtime/sam/op/traverse/ztests/nested.yaml | 2 +- .../op/traverse/ztests/over-expr-inside.yaml | 2 +- .../op/traverse/ztests/over-expr-missing.yaml | 2 +- .../op/traverse/ztests/over-expr-nested.yaml | 2 +- .../op/traverse/ztests/over-expr-null.yaml | 2 +- .../traverse/ztests/over-expr-outer-vars.yaml | 2 +- runtime/sam/op/traverse/ztests/over-expr.yaml | 2 +- .../sam/op/traverse/ztests/over-record.yaml | 2 +- runtime/sam/op/ztests/debug.yaml | 2 +- runtime/sam/op/ztests/put-dynamic-field.yaml | 10 +- .../sam/op/ztests/stateful-expr-reset.yaml | 14 +- runtime/sam/op/ztests/user-from.yaml | 2 +- runtime/sam/op/ztests/user-join.yaml | 2 +- runtime/sam/op/ztests/user-nested.yaml | 4 +- runtime/sam/op/ztests/user-with-scope.yaml | 6 +- runtime/ztests/issue-4013.yaml | 6 +- runtime/ztests/op/fork-head-tail.yaml | 2 +- runtime/ztests/op/fork-multi-head.yaml | 2 +- runtime/ztests/op/over-fork-sort-outer.yaml | 2 +- runtime/ztests/op/over-fork-sort.yaml | 2 +- runtime/ztests/op/over-tail-head.yaml | 2 +- runtime/ztests/op/rename-share.yaml | 2 +- .../op/summarize/array-out-of-bounds.yaml | 2 +- runtime/ztests/op/summarize/by-only.yaml | 2 +- .../ztests/op/summarize/count-by-this.yaml | 2 +- runtime/ztests/op/summarize/count-typeof.yaml | 2 +- .../op/summarize/different-key-types.yaml | 2 +- .../ztests/op/summarize/groupby-missing.yaml | 2 +- .../op/summarize/key-in-record-assign.yaml | 2 +- .../ztests/op/summarize/key-in-record.yaml | 2 +- .../ztests/op/summarize/missing-fields.yaml | 2 +- .../op/summarize/mixed-output-types.yaml | 2 +- .../op/summarize/multiple-fields-assign.yaml | 2 +- .../ztests/op/summarize/multiple-fields.yaml | 2 +- runtime/ztests/op/summarize/named-types.yaml | 2 +- .../ztests/op/summarize/nested-agg-name.yaml | 2 +- runtime/ztests/op/summarize/not-present.yaml | 2 +- runtime/ztests/op/summarize/null-inputs.yaml | 2 +- .../ztests/op/summarize/null-keys-assign.yaml | 2 +- runtime/ztests/op/summarize/quiet-key.yaml | 2 +- service/handlers_test.go | 4 +- service/ztests/compact-vectors.yaml | 2 +- service/ztests/compact.yaml | 2 +- service/ztests/curl-add-gzip.yaml | 2 +- service/ztests/curl-cors.yaml | 4 +- service/ztests/curl-pool-rename.yaml | 2 +- service/ztests/curl-query-json-array.yaml | 2 +- service/ztests/curl-query-split.yaml | 4 +- service/ztests/debug.yaml | 2 +- service/ztests/delete-where-invalid.yaml | 2 +- service/ztests/delete-where.yaml | 6 +- service/ztests/delete.yaml | 2 +- service/ztests/drop.yaml | 2 +- service/ztests/from-pattern.yaml | 8 +- service/ztests/issue-2784.yaml | 2 +- service/ztests/ls-pools.yaml | 4 +- service/ztests/merge.yaml | 4 +- service/ztests/query-describe.yaml | 18 +- service/ztests/query-json.yaml | 2 +- service/ztests/query-stats.yaml | 2 +- service/ztests/revert.yaml | 6 +- service/ztests/s3/s3root.yaml | 2 +- service/ztests/seek-index-null.yaml | 2 +- service/ztests/seek-index-overlap.yaml | 4 +- service/ztests/seek-index.yaml | 30 +- service/ztests/vector.yaml | 6 +- testdata/edu/README.md | 8 +- vng/ztests/dict.yaml | 2 +- vng/ztests/no-dict.yaml | 2 +- zbuf/scopes.md | 4 +- zfmt/ast.go | 2 +- zfmt/dag.go | 2 +- zfmt/ztests/debug.yaml | 12 +- zfmt/ztests/decls.yaml | 16 +- zfmt/ztests/from.yaml | 12 +- zfmt/ztests/join.yaml | 6 +- zfmt/ztests/output.yaml | 8 +- zfmt/ztests/over.yaml | 54 +- zfmt/ztests/parallel.yaml | 14 +- zfmt/ztests/precedence-dag.yaml | 12 +- zfmt/ztests/switch.yaml | 12 +- zfmt/ztests/type-value.yaml | 4 +- zfmt/ztests/yield-shortcut.yaml | 20 +- zio/zeekio/ztests/shared-context-bug-2.yaml | 2 +- zio/zeekio/ztests/shared-context-bug.yaml | 2 +- zio/zngio/ztests/multiple.yaml | 2 +- zio/zsonio/ztests/tv.yaml | 2 +- zson/ztests/union-cast.yaml | 2 +- ztests/bytes.yaml | 2 +- 289 files changed, 4621 insertions(+), 4657 deletions(-) diff --git a/cmd/super/db/manage/ztests/compact-size.yaml b/cmd/super/db/manage/ztests/compact-size.yaml index b72e2a0053..a20d08bec8 100644 --- a/cmd/super/db/manage/ztests/compact-size.yaml +++ b/cmd/super/db/manage/ztests/compact-size.yaml @@ -9,7 +9,7 @@ script: | seq 100 150 | super -c '{ts:this,x:1}' - | super db load -q - seq 200 250 | super -c '{ts:this,x:1}' - | super db load -q - super db manage -q - super db query -z 'from test@main:objects | drop id' + super db query -z 'from test@main:objects |> drop id' outputs: - name: stdout diff --git a/cmd/super/db/manage/ztests/compact.yaml b/cmd/super/db/manage/ztests/compact.yaml index 3d59b7096d..0a78a31c48 100644 --- a/cmd/super/db/manage/ztests/compact.yaml +++ b/cmd/super/db/manage/ztests/compact.yaml @@ -7,7 +7,7 @@ script: | seq 200 | super -c '{ts:this}' - | super db load -q - done super db manage -q - super db query -z 'from test@main:objects | drop id' + super db query -z 'from test@main:objects |> drop id' outputs: - name: stdout diff --git a/cmd/super/db/manage/ztests/config.yaml b/cmd/super/db/manage/ztests/config.yaml index 27cb51ba59..0ed487d916 100644 --- a/cmd/super/db/manage/ztests/config.yaml +++ b/cmd/super/db/manage/ztests/config.yaml @@ -6,7 +6,7 @@ script: | super db create -q test3 super db branch -use test2 -q live super db manage -config=inherit.yaml -log.path=inherit.log - super -Z -c 'msg == "updating pool" | cut name, branch | sort name' inherit.log > inherit.jsup + super -Z -c 'msg == "updating pool" |> cut name, branch |> sort name' inherit.log > inherit.jsup inputs: - name: inherit.yaml diff --git a/cmd/super/db/manage/ztests/overlap.yaml b/cmd/super/db/manage/ztests/overlap.yaml index a3b432609f..e80cd7d7f0 100644 --- a/cmd/super/db/manage/ztests/overlap.yaml +++ b/cmd/super/db/manage/ztests/overlap.yaml @@ -9,7 +9,7 @@ script: | seq 100 | super -c '{ts:this,x:1}' - | super db load -q - done super db manage -q - super db query -z 'from test@main:objects | drop id' + super db query -z 'from test@main:objects |> drop id' outputs: - name: stdout diff --git a/cmd/super/db/manage/ztests/pool-flag.yaml b/cmd/super/db/manage/ztests/pool-flag.yaml index 0ba62bb181..f63fe1a90e 100644 --- a/cmd/super/db/manage/ztests/pool-flag.yaml +++ b/cmd/super/db/manage/ztests/pool-flag.yaml @@ -6,7 +6,7 @@ script: | super db create -q test3 super db create -q test4 super db manage -pool test2 -pool test4 -log.path=manage.log - super -z -c 'msg == "updating pool" | yield name' manage.log + super -z -c 'msg == "updating pool" |> yield name' manage.log outputs: - name: stdout diff --git a/cmd/super/db/manage/ztests/vectors.yaml b/cmd/super/db/manage/ztests/vectors.yaml index 305921d6a5..392ae81c90 100644 --- a/cmd/super/db/manage/ztests/vectors.yaml +++ b/cmd/super/db/manage/ztests/vectors.yaml @@ -7,12 +7,12 @@ script: | seq 1 10 | super -c '{ts:this}' - | super db load -q - seq 1 10 | super -c '{ts:this}' - | super db load -q - super db manage -log.level=warn -q -vectors - super db query -z 'from test1@main:vectors | drop id' + super db query -z 'from test1@main:vectors |> drop id' echo '// Test create vector on single object.' super db create -use -q test2 seq 1 10 | super -c '{ts:this}' - | super db load -q - super db manage -log.level=warn -q -vectors - super db query -z 'from test2@main:vectors | drop id' + super db query -z 'from test2@main:vectors |> drop id' outputs: - name: stdout diff --git a/cmd/super/db/ztests/query-stats.yaml b/cmd/super/db/ztests/query-stats.yaml index 949e152a88..d09621f56e 100644 --- a/cmd/super/db/ztests/query-stats.yaml +++ b/cmd/super/db/ztests/query-stats.yaml @@ -3,7 +3,7 @@ script: | super db init -q super db create -q test super db load -q -use test babble.jsup - super db query -s -z "from test | count()" + super db query -s -z "from test |> count()" inputs: - name: babble.jsup diff --git a/cmd/super/internal/lakemanage/scan.go b/cmd/super/internal/lakemanage/scan.go index 14cfd1f745..ba1a1552a0 100644 --- a/cmd/super/internal/lakemanage/scan.go +++ b/cmd/super/internal/lakemanage/scan.go @@ -62,8 +62,8 @@ func scan(ctx context.Context, it *objectIterator, pool *pools.Config, runCh cha const iteratorQuery = ` from %q@%q:objects -| left join (from %q@%q:vectors) on id=id vector:=true -| sort min +|> left join (from %q@%q:vectors) on id=id vector:=true +|> sort min ` type objectIterator struct { diff --git a/cmd/super/ztests/call-user-op-with-src.yaml b/cmd/super/ztests/call-user-op-with-src.yaml index 94b64c0134..2050e0d904 100644 --- a/cmd/super/ztests/call-user-op-with-src.yaml +++ b/cmd/super/ztests/call-user-op-with-src.yaml @@ -5,7 +5,7 @@ inputs: - name: countfile.zed data: | op countfile(): ( - file test.jsup | count() + file test.jsup |> count() ) - name: test.jsup data: '{} {} {} {}' diff --git a/cmd/super/ztests/single-arg-error.yaml b/cmd/super/ztests/single-arg-error.yaml index e09f7bcb16..17f2396229 100644 --- a/cmd/super/ztests/single-arg-error.yaml +++ b/cmd/super/ztests/single-arg-error.yaml @@ -1,9 +1,9 @@ script: | - ! super -c 'file sample.jsup | count(' + ! super -c 'file sample.jsup |> count(' outputs: - name: stderr data: | - parse error at line 1, column 26: - file sample.jsup | count( - === ^ === + parse error at line 1, column 27: + file sample.jsup |> count( + === ^ === diff --git a/compiler/job.go b/compiler/job.go index 3e7b06c41f..4c22c5466a 100644 --- a/compiler/job.go +++ b/compiler/job.go @@ -169,7 +169,7 @@ func VectorFilterCompile(rctx *runtime.Context, query string, src *data.Source, if err != nil { return nil, err } - ast, err := parser.ParseQuery(fmt.Sprintf("%s | %s", spec, query)) + ast, err := parser.ParseQuery(fmt.Sprintf("%s |> %s", spec, query)) if err != nil { return nil, err } diff --git a/compiler/parser/parser.go b/compiler/parser/parser.go index aae0acb997..5cda9114b2 100644 --- a/compiler/parser/parser.go +++ b/compiler/parser/parser.go @@ -809,110 +809,74 @@ var g = &grammar{ { name: "Pipe", pos: position{line: 98, col: 1, offset: 2472}, - expr: &choiceExpr{ - pos: position{line: 98, col: 8, offset: 2479}, - alternatives: []any{ - &litMatcher{ - pos: position{line: 98, col: 8, offset: 2479}, - val: "|>", - ignoreCase: false, - want: "\"|>\"", - }, - &seqExpr{ - pos: position{line: 98, col: 15, offset: 2486}, - exprs: []any{ - &litMatcher{ - pos: position{line: 98, col: 15, offset: 2486}, - val: "|", - ignoreCase: false, - want: "\"|\"", - }, - ¬Expr{ - pos: position{line: 98, col: 19, offset: 2490}, - expr: &choiceExpr{ - pos: position{line: 98, col: 21, offset: 2492}, - alternatives: []any{ - &litMatcher{ - pos: position{line: 98, col: 21, offset: 2492}, - val: "{", - ignoreCase: false, - want: "\"{\"", - }, - &litMatcher{ - pos: position{line: 98, col: 27, offset: 2498}, - val: "[", - ignoreCase: false, - want: "\"[\"", - }, - }, - }, - }, - }, - }, - }, + expr: &litMatcher{ + pos: position{line: 98, col: 8, offset: 2479}, + val: "|>", + ignoreCase: false, + want: "\"|>\"", }, leader: false, leftRecursive: false, }, { name: "ExprGuard", - pos: position{line: 100, col: 1, offset: 2504}, + pos: position{line: 100, col: 1, offset: 2485}, expr: &seqExpr{ - pos: position{line: 100, col: 13, offset: 2516}, + pos: position{line: 100, col: 13, offset: 2497}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 100, col: 13, offset: 2516}, + pos: position{line: 100, col: 13, offset: 2497}, name: "__", }, &choiceExpr{ - pos: position{line: 100, col: 17, offset: 2520}, + pos: position{line: 100, col: 17, offset: 2501}, alternatives: []any{ &seqExpr{ - pos: position{line: 100, col: 18, offset: 2521}, + pos: position{line: 100, col: 18, offset: 2502}, exprs: []any{ ¬Expr{ - pos: position{line: 100, col: 18, offset: 2521}, + pos: position{line: 100, col: 18, offset: 2502}, expr: &litMatcher{ - pos: position{line: 100, col: 19, offset: 2522}, + pos: position{line: 100, col: 19, offset: 2503}, val: "=>", ignoreCase: false, want: "\"=>\"", }, }, &ruleRefExpr{ - pos: position{line: 100, col: 24, offset: 2527}, + pos: position{line: 100, col: 24, offset: 2508}, name: "Comparator", }, }, }, &ruleRefExpr{ - pos: position{line: 100, col: 38, offset: 2541}, + pos: position{line: 100, col: 38, offset: 2522}, name: "AdditiveOperator", }, &ruleRefExpr{ - pos: position{line: 100, col: 57, offset: 2560}, + pos: position{line: 100, col: 57, offset: 2541}, name: "MultiplicativeOperator", }, &litMatcher{ - pos: position{line: 100, col: 82, offset: 2585}, + pos: position{line: 100, col: 82, offset: 2566}, val: ":", ignoreCase: false, want: "\":\"", }, &litMatcher{ - pos: position{line: 100, col: 88, offset: 2591}, + pos: position{line: 100, col: 88, offset: 2572}, val: "(", ignoreCase: false, want: "\"(\"", }, &litMatcher{ - pos: position{line: 100, col: 94, offset: 2597}, + pos: position{line: 100, col: 94, offset: 2578}, val: "[", ignoreCase: false, want: "\"[\"", }, &litMatcher{ - pos: position{line: 100, col: 100, offset: 2603}, + pos: position{line: 100, col: 100, offset: 2584}, val: "~", ignoreCase: false, want: "\"~\"", @@ -926,59 +890,59 @@ var g = &grammar{ }, { name: "Comparator", - pos: position{line: 102, col: 1, offset: 2609}, + pos: position{line: 102, col: 1, offset: 2590}, expr: &actionExpr{ - pos: position{line: 102, col: 14, offset: 2622}, + pos: position{line: 102, col: 14, offset: 2603}, run: (*parser).callonComparator1, expr: &choiceExpr{ - pos: position{line: 102, col: 15, offset: 2623}, + pos: position{line: 102, col: 15, offset: 2604}, alternatives: []any{ &litMatcher{ - pos: position{line: 102, col: 15, offset: 2623}, + pos: position{line: 102, col: 15, offset: 2604}, val: "==", ignoreCase: false, want: "\"==\"", }, &litMatcher{ - pos: position{line: 102, col: 22, offset: 2630}, + pos: position{line: 102, col: 22, offset: 2611}, val: "=", ignoreCase: false, want: "\"=\"", }, &litMatcher{ - pos: position{line: 102, col: 28, offset: 2636}, + pos: position{line: 102, col: 28, offset: 2617}, val: "!=", ignoreCase: false, want: "\"!=\"", }, &ruleRefExpr{ - pos: position{line: 102, col: 35, offset: 2643}, + pos: position{line: 102, col: 35, offset: 2624}, name: "IN", }, &ruleRefExpr{ - pos: position{line: 102, col: 40, offset: 2648}, + pos: position{line: 102, col: 40, offset: 2629}, name: "LIKE", }, &litMatcher{ - pos: position{line: 102, col: 47, offset: 2655}, + pos: position{line: 102, col: 47, offset: 2636}, val: "<=", ignoreCase: false, want: "\"<=\"", }, &litMatcher{ - pos: position{line: 102, col: 54, offset: 2662}, + pos: position{line: 102, col: 54, offset: 2643}, val: "<", ignoreCase: false, want: "\"<\"", }, &litMatcher{ - pos: position{line: 102, col: 60, offset: 2668}, + pos: position{line: 102, col: 60, offset: 2649}, val: ">=", ignoreCase: false, want: "\">=\"", }, &litMatcher{ - pos: position{line: 102, col: 67, offset: 2675}, + pos: position{line: 102, col: 67, offset: 2656}, val: ">", ignoreCase: false, want: "\">\"", @@ -991,28 +955,28 @@ var g = &grammar{ }, { name: "SearchBoolean", - pos: position{line: 104, col: 1, offset: 2712}, + pos: position{line: 104, col: 1, offset: 2693}, expr: &actionExpr{ - pos: position{line: 105, col: 5, offset: 2730}, + pos: position{line: 105, col: 5, offset: 2711}, run: (*parser).callonSearchBoolean1, expr: &seqExpr{ - pos: position{line: 105, col: 5, offset: 2730}, + pos: position{line: 105, col: 5, offset: 2711}, exprs: []any{ &labeledExpr{ - pos: position{line: 105, col: 5, offset: 2730}, + pos: position{line: 105, col: 5, offset: 2711}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 105, col: 11, offset: 2736}, + pos: position{line: 105, col: 11, offset: 2717}, name: "SearchAnd", }, }, &labeledExpr{ - pos: position{line: 105, col: 21, offset: 2746}, + pos: position{line: 105, col: 21, offset: 2727}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 105, col: 26, offset: 2751}, + pos: position{line: 105, col: 26, offset: 2732}, expr: &ruleRefExpr{ - pos: position{line: 105, col: 26, offset: 2751}, + pos: position{line: 105, col: 26, offset: 2732}, name: "SearchOrTerm", }, }, @@ -1025,30 +989,30 @@ var g = &grammar{ }, { name: "SearchOrTerm", - pos: position{line: 109, col: 1, offset: 2828}, + pos: position{line: 109, col: 1, offset: 2809}, expr: &actionExpr{ - pos: position{line: 109, col: 16, offset: 2843}, + pos: position{line: 109, col: 16, offset: 2824}, run: (*parser).callonSearchOrTerm1, expr: &seqExpr{ - pos: position{line: 109, col: 16, offset: 2843}, + pos: position{line: 109, col: 16, offset: 2824}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 109, col: 16, offset: 2843}, + pos: position{line: 109, col: 16, offset: 2824}, name: "_", }, &ruleRefExpr{ - pos: position{line: 109, col: 18, offset: 2845}, + pos: position{line: 109, col: 18, offset: 2826}, name: "OR", }, &ruleRefExpr{ - pos: position{line: 109, col: 21, offset: 2848}, + pos: position{line: 109, col: 21, offset: 2829}, name: "_", }, &labeledExpr{ - pos: position{line: 109, col: 23, offset: 2850}, + pos: position{line: 109, col: 23, offset: 2831}, label: "t", expr: &ruleRefExpr{ - pos: position{line: 109, col: 25, offset: 2852}, + pos: position{line: 109, col: 25, offset: 2833}, name: "SearchAnd", }, }, @@ -1060,73 +1024,73 @@ var g = &grammar{ }, { name: "SearchAnd", - pos: position{line: 111, col: 1, offset: 2894}, + pos: position{line: 111, col: 1, offset: 2875}, expr: &actionExpr{ - pos: position{line: 112, col: 5, offset: 2908}, + pos: position{line: 112, col: 5, offset: 2889}, run: (*parser).callonSearchAnd1, expr: &seqExpr{ - pos: position{line: 112, col: 5, offset: 2908}, + pos: position{line: 112, col: 5, offset: 2889}, exprs: []any{ &labeledExpr{ - pos: position{line: 112, col: 5, offset: 2908}, + pos: position{line: 112, col: 5, offset: 2889}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 112, col: 11, offset: 2914}, + pos: position{line: 112, col: 11, offset: 2895}, name: "SearchFactor", }, }, &labeledExpr{ - pos: position{line: 113, col: 5, offset: 2931}, + pos: position{line: 113, col: 5, offset: 2912}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 113, col: 10, offset: 2936}, + pos: position{line: 113, col: 10, offset: 2917}, expr: &actionExpr{ - pos: position{line: 113, col: 11, offset: 2937}, + pos: position{line: 113, col: 11, offset: 2918}, run: (*parser).callonSearchAnd7, expr: &seqExpr{ - pos: position{line: 113, col: 11, offset: 2937}, + pos: position{line: 113, col: 11, offset: 2918}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 113, col: 11, offset: 2937}, + pos: position{line: 113, col: 11, offset: 2918}, expr: &seqExpr{ - pos: position{line: 113, col: 12, offset: 2938}, + pos: position{line: 113, col: 12, offset: 2919}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 113, col: 12, offset: 2938}, + pos: position{line: 113, col: 12, offset: 2919}, name: "_", }, &ruleRefExpr{ - pos: position{line: 113, col: 14, offset: 2940}, + pos: position{line: 113, col: 14, offset: 2921}, name: "AND", }, }, }, }, &ruleRefExpr{ - pos: position{line: 113, col: 20, offset: 2946}, + pos: position{line: 113, col: 20, offset: 2927}, name: "_", }, ¬Expr{ - pos: position{line: 113, col: 22, offset: 2948}, + pos: position{line: 113, col: 22, offset: 2929}, expr: &choiceExpr{ - pos: position{line: 113, col: 24, offset: 2950}, + pos: position{line: 113, col: 24, offset: 2931}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 113, col: 24, offset: 2950}, + pos: position{line: 113, col: 24, offset: 2931}, name: "OR", }, &ruleRefExpr{ - pos: position{line: 113, col: 29, offset: 2955}, + pos: position{line: 113, col: 29, offset: 2936}, name: "SearchKeywordGuard", }, }, }, }, &labeledExpr{ - pos: position{line: 113, col: 49, offset: 2975}, + pos: position{line: 113, col: 49, offset: 2956}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 113, col: 54, offset: 2980}, + pos: position{line: 113, col: 54, offset: 2961}, name: "SearchFactor", }, }, @@ -1143,42 +1107,42 @@ var g = &grammar{ }, { name: "SearchKeywordGuard", - pos: position{line: 117, col: 1, offset: 3093}, + pos: position{line: 117, col: 1, offset: 3074}, expr: &choiceExpr{ - pos: position{line: 118, col: 5, offset: 3116}, + pos: position{line: 118, col: 5, offset: 3097}, alternatives: []any{ &seqExpr{ - pos: position{line: 118, col: 5, offset: 3116}, + pos: position{line: 118, col: 5, offset: 3097}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 118, col: 5, offset: 3116}, + pos: position{line: 118, col: 5, offset: 3097}, name: "FromSource", }, &ruleRefExpr{ - pos: position{line: 118, col: 16, offset: 3127}, + pos: position{line: 118, col: 16, offset: 3108}, name: "__", }, &litMatcher{ - pos: position{line: 118, col: 19, offset: 3130}, + pos: position{line: 118, col: 19, offset: 3111}, val: "=>", ignoreCase: false, want: "\"=>\"", }, &ruleRefExpr{ - pos: position{line: 118, col: 24, offset: 3135}, + pos: position{line: 118, col: 24, offset: 3116}, name: "__", }, }, }, &seqExpr{ - pos: position{line: 119, col: 5, offset: 3142}, + pos: position{line: 119, col: 5, offset: 3123}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 119, col: 5, offset: 3142}, + pos: position{line: 119, col: 5, offset: 3123}, name: "Case", }, &ruleRefExpr{ - pos: position{line: 119, col: 10, offset: 3147}, + pos: position{line: 119, col: 10, offset: 3128}, name: "__", }, }, @@ -1190,43 +1154,43 @@ var g = &grammar{ }, { name: "SearchFactor", - pos: position{line: 121, col: 1, offset: 3151}, + pos: position{line: 121, col: 1, offset: 3132}, expr: &choiceExpr{ - pos: position{line: 122, col: 5, offset: 3168}, + pos: position{line: 122, col: 5, offset: 3149}, alternatives: []any{ &actionExpr{ - pos: position{line: 122, col: 5, offset: 3168}, + pos: position{line: 122, col: 5, offset: 3149}, run: (*parser).callonSearchFactor2, expr: &seqExpr{ - pos: position{line: 122, col: 5, offset: 3168}, + pos: position{line: 122, col: 5, offset: 3149}, exprs: []any{ &choiceExpr{ - pos: position{line: 122, col: 6, offset: 3169}, + pos: position{line: 122, col: 6, offset: 3150}, alternatives: []any{ &seqExpr{ - pos: position{line: 122, col: 6, offset: 3169}, + pos: position{line: 122, col: 6, offset: 3150}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 122, col: 6, offset: 3169}, + pos: position{line: 122, col: 6, offset: 3150}, name: "NOT", }, &ruleRefExpr{ - pos: position{line: 122, col: 10, offset: 3173}, + pos: position{line: 122, col: 10, offset: 3154}, name: "_", }, }, }, &seqExpr{ - pos: position{line: 122, col: 14, offset: 3177}, + pos: position{line: 122, col: 14, offset: 3158}, exprs: []any{ &litMatcher{ - pos: position{line: 122, col: 14, offset: 3177}, + pos: position{line: 122, col: 14, offset: 3158}, val: "!", ignoreCase: false, want: "\"!\"", }, &ruleRefExpr{ - pos: position{line: 122, col: 18, offset: 3181}, + pos: position{line: 122, col: 18, offset: 3162}, name: "__", }, }, @@ -1234,10 +1198,10 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 122, col: 22, offset: 3185}, + pos: position{line: 122, col: 22, offset: 3166}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 122, col: 24, offset: 3187}, + pos: position{line: 122, col: 24, offset: 3168}, name: "SearchFactor", }, }, @@ -1245,35 +1209,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 130, col: 5, offset: 3358}, + pos: position{line: 130, col: 5, offset: 3339}, run: (*parser).callonSearchFactor13, expr: &seqExpr{ - pos: position{line: 130, col: 5, offset: 3358}, + pos: position{line: 130, col: 5, offset: 3339}, exprs: []any{ &litMatcher{ - pos: position{line: 130, col: 5, offset: 3358}, + pos: position{line: 130, col: 5, offset: 3339}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 130, col: 9, offset: 3362}, + pos: position{line: 130, col: 9, offset: 3343}, name: "__", }, &labeledExpr{ - pos: position{line: 130, col: 12, offset: 3365}, + pos: position{line: 130, col: 12, offset: 3346}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 130, col: 17, offset: 3370}, + pos: position{line: 130, col: 17, offset: 3351}, name: "SearchBoolean", }, }, &ruleRefExpr{ - pos: position{line: 130, col: 31, offset: 3384}, + pos: position{line: 130, col: 31, offset: 3365}, name: "__", }, &litMatcher{ - pos: position{line: 130, col: 34, offset: 3387}, + pos: position{line: 130, col: 34, offset: 3368}, val: ")", ignoreCase: false, want: "\")\"", @@ -1282,7 +1246,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 131, col: 5, offset: 3416}, + pos: position{line: 131, col: 5, offset: 3397}, name: "SearchExpr", }, }, @@ -1292,53 +1256,53 @@ var g = &grammar{ }, { name: "SearchExpr", - pos: position{line: 133, col: 1, offset: 3428}, + pos: position{line: 133, col: 1, offset: 3409}, expr: &choiceExpr{ - pos: position{line: 134, col: 5, offset: 3443}, + pos: position{line: 134, col: 5, offset: 3424}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 134, col: 5, offset: 3443}, + pos: position{line: 134, col: 5, offset: 3424}, name: "Regexp", }, &ruleRefExpr{ - pos: position{line: 135, col: 5, offset: 3454}, + pos: position{line: 135, col: 5, offset: 3435}, name: "Glob", }, &actionExpr{ - pos: position{line: 136, col: 5, offset: 3463}, + pos: position{line: 136, col: 5, offset: 3444}, run: (*parser).callonSearchExpr4, expr: &seqExpr{ - pos: position{line: 136, col: 5, offset: 3463}, + pos: position{line: 136, col: 5, offset: 3444}, exprs: []any{ &labeledExpr{ - pos: position{line: 136, col: 5, offset: 3463}, + pos: position{line: 136, col: 5, offset: 3444}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 136, col: 7, offset: 3465}, + pos: position{line: 136, col: 7, offset: 3446}, name: "SearchValue", }, }, &choiceExpr{ - pos: position{line: 136, col: 20, offset: 3478}, + pos: position{line: 136, col: 20, offset: 3459}, alternatives: []any{ ¬Expr{ - pos: position{line: 136, col: 20, offset: 3478}, + pos: position{line: 136, col: 20, offset: 3459}, expr: &ruleRefExpr{ - pos: position{line: 136, col: 21, offset: 3479}, + pos: position{line: 136, col: 21, offset: 3460}, name: "ExprGuard", }, }, &andExpr{ - pos: position{line: 136, col: 33, offset: 3491}, + pos: position{line: 136, col: 33, offset: 3472}, expr: &seqExpr{ - pos: position{line: 136, col: 35, offset: 3493}, + pos: position{line: 136, col: 35, offset: 3474}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 136, col: 35, offset: 3493}, + pos: position{line: 136, col: 35, offset: 3474}, name: "_", }, &ruleRefExpr{ - pos: position{line: 136, col: 37, offset: 3495}, + pos: position{line: 136, col: 37, offset: 3476}, name: "Glob", }, }, @@ -1350,21 +1314,21 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 144, col: 5, offset: 3652}, + pos: position{line: 144, col: 5, offset: 3633}, run: (*parser).callonSearchExpr15, expr: &seqExpr{ - pos: position{line: 144, col: 5, offset: 3652}, + pos: position{line: 144, col: 5, offset: 3633}, exprs: []any{ &litMatcher{ - pos: position{line: 144, col: 5, offset: 3652}, + pos: position{line: 144, col: 5, offset: 3633}, val: "*", ignoreCase: false, want: "\"*\"", }, ¬Expr{ - pos: position{line: 144, col: 9, offset: 3656}, + pos: position{line: 144, col: 9, offset: 3637}, expr: &ruleRefExpr{ - pos: position{line: 144, col: 10, offset: 3657}, + pos: position{line: 144, col: 10, offset: 3638}, name: "ExprGuard", }, }, @@ -1372,7 +1336,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 147, col: 5, offset: 3765}, + pos: position{line: 147, col: 5, offset: 3746}, name: "SearchPredicate", }, }, @@ -1382,45 +1346,45 @@ var g = &grammar{ }, { name: "SearchPredicate", - pos: position{line: 149, col: 1, offset: 3782}, + pos: position{line: 149, col: 1, offset: 3763}, expr: &choiceExpr{ - pos: position{line: 150, col: 5, offset: 3802}, + pos: position{line: 150, col: 5, offset: 3783}, alternatives: []any{ &actionExpr{ - pos: position{line: 150, col: 5, offset: 3802}, + pos: position{line: 150, col: 5, offset: 3783}, run: (*parser).callonSearchPredicate2, expr: &seqExpr{ - pos: position{line: 150, col: 5, offset: 3802}, + pos: position{line: 150, col: 5, offset: 3783}, exprs: []any{ &labeledExpr{ - pos: position{line: 150, col: 5, offset: 3802}, + pos: position{line: 150, col: 5, offset: 3783}, label: "lhs", expr: &ruleRefExpr{ - pos: position{line: 150, col: 9, offset: 3806}, + pos: position{line: 150, col: 9, offset: 3787}, name: "AdditiveExpr", }, }, &ruleRefExpr{ - pos: position{line: 150, col: 22, offset: 3819}, + pos: position{line: 150, col: 22, offset: 3800}, name: "__", }, &labeledExpr{ - pos: position{line: 150, col: 25, offset: 3822}, + pos: position{line: 150, col: 25, offset: 3803}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 150, col: 28, offset: 3825}, + pos: position{line: 150, col: 28, offset: 3806}, name: "Comparator", }, }, &ruleRefExpr{ - pos: position{line: 150, col: 39, offset: 3836}, + pos: position{line: 150, col: 39, offset: 3817}, name: "__", }, &labeledExpr{ - pos: position{line: 150, col: 42, offset: 3839}, + pos: position{line: 150, col: 42, offset: 3820}, label: "rhs", expr: &ruleRefExpr{ - pos: position{line: 150, col: 46, offset: 3843}, + pos: position{line: 150, col: 46, offset: 3824}, name: "AdditiveExpr", }, }, @@ -1428,13 +1392,13 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 159, col: 5, offset: 4043}, + pos: position{line: 159, col: 5, offset: 4024}, run: (*parser).callonSearchPredicate12, expr: &labeledExpr{ - pos: position{line: 159, col: 5, offset: 4043}, + pos: position{line: 159, col: 5, offset: 4024}, label: "f", expr: &ruleRefExpr{ - pos: position{line: 159, col: 7, offset: 4045}, + pos: position{line: 159, col: 7, offset: 4026}, name: "Function", }, }, @@ -1446,32 +1410,32 @@ var g = &grammar{ }, { name: "SearchValue", - pos: position{line: 161, col: 1, offset: 4073}, + pos: position{line: 161, col: 1, offset: 4054}, expr: &choiceExpr{ - pos: position{line: 162, col: 5, offset: 4089}, + pos: position{line: 162, col: 5, offset: 4070}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 162, col: 5, offset: 4089}, + pos: position{line: 162, col: 5, offset: 4070}, name: "Literal", }, &actionExpr{ - pos: position{line: 163, col: 5, offset: 4101}, + pos: position{line: 163, col: 5, offset: 4082}, run: (*parser).callonSearchValue3, expr: &seqExpr{ - pos: position{line: 163, col: 5, offset: 4101}, + pos: position{line: 163, col: 5, offset: 4082}, exprs: []any{ ¬Expr{ - pos: position{line: 163, col: 5, offset: 4101}, + pos: position{line: 163, col: 5, offset: 4082}, expr: &ruleRefExpr{ - pos: position{line: 163, col: 6, offset: 4102}, + pos: position{line: 163, col: 6, offset: 4083}, name: "RegexpPattern", }, }, &labeledExpr{ - pos: position{line: 163, col: 20, offset: 4116}, + pos: position{line: 163, col: 20, offset: 4097}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 163, col: 22, offset: 4118}, + pos: position{line: 163, col: 22, offset: 4099}, name: "KeyWord", }, }, @@ -1485,15 +1449,15 @@ var g = &grammar{ }, { name: "Glob", - pos: position{line: 167, col: 1, offset: 4191}, + pos: position{line: 167, col: 1, offset: 4172}, expr: &actionExpr{ - pos: position{line: 168, col: 5, offset: 4200}, + pos: position{line: 168, col: 5, offset: 4181}, run: (*parser).callonGlob1, expr: &labeledExpr{ - pos: position{line: 168, col: 5, offset: 4200}, + pos: position{line: 168, col: 5, offset: 4181}, label: "pattern", expr: &ruleRefExpr{ - pos: position{line: 168, col: 13, offset: 4208}, + pos: position{line: 168, col: 13, offset: 4189}, name: "GlobPattern", }, }, @@ -1503,15 +1467,15 @@ var g = &grammar{ }, { name: "Regexp", - pos: position{line: 172, col: 1, offset: 4311}, + pos: position{line: 172, col: 1, offset: 4292}, expr: &actionExpr{ - pos: position{line: 173, col: 5, offset: 4322}, + pos: position{line: 173, col: 5, offset: 4303}, run: (*parser).callonRegexp1, expr: &labeledExpr{ - pos: position{line: 173, col: 5, offset: 4322}, + pos: position{line: 173, col: 5, offset: 4303}, label: "pattern", expr: &ruleRefExpr{ - pos: position{line: 173, col: 13, offset: 4330}, + pos: position{line: 173, col: 13, offset: 4311}, name: "RegexpPattern", }, }, @@ -1521,33 +1485,33 @@ var g = &grammar{ }, { name: "Aggregation", - pos: position{line: 179, col: 1, offset: 4463}, + pos: position{line: 179, col: 1, offset: 4444}, expr: &choiceExpr{ - pos: position{line: 180, col: 5, offset: 4479}, + pos: position{line: 180, col: 5, offset: 4460}, alternatives: []any{ &actionExpr{ - pos: position{line: 180, col: 5, offset: 4479}, + pos: position{line: 180, col: 5, offset: 4460}, run: (*parser).callonAggregation2, expr: &seqExpr{ - pos: position{line: 180, col: 5, offset: 4479}, + pos: position{line: 180, col: 5, offset: 4460}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 180, col: 5, offset: 4479}, + pos: position{line: 180, col: 5, offset: 4460}, name: "Summarize", }, &labeledExpr{ - pos: position{line: 180, col: 15, offset: 4489}, + pos: position{line: 180, col: 15, offset: 4470}, label: "keys", expr: &ruleRefExpr{ - pos: position{line: 180, col: 20, offset: 4494}, + pos: position{line: 180, col: 20, offset: 4475}, name: "GroupByKeys", }, }, &labeledExpr{ - pos: position{line: 180, col: 32, offset: 4506}, + pos: position{line: 180, col: 32, offset: 4487}, label: "limit", expr: &ruleRefExpr{ - pos: position{line: 180, col: 38, offset: 4512}, + pos: position{line: 180, col: 38, offset: 4493}, name: "LimitArg", }, }, @@ -1555,37 +1519,37 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 188, col: 5, offset: 4696}, + pos: position{line: 188, col: 5, offset: 4677}, run: (*parser).callonAggregation9, expr: &seqExpr{ - pos: position{line: 188, col: 5, offset: 4696}, + pos: position{line: 188, col: 5, offset: 4677}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 188, col: 5, offset: 4696}, + pos: position{line: 188, col: 5, offset: 4677}, name: "Summarize", }, &labeledExpr{ - pos: position{line: 188, col: 15, offset: 4706}, + pos: position{line: 188, col: 15, offset: 4687}, label: "aggs", expr: &ruleRefExpr{ - pos: position{line: 188, col: 20, offset: 4711}, + pos: position{line: 188, col: 20, offset: 4692}, name: "AggAssignments", }, }, &labeledExpr{ - pos: position{line: 188, col: 35, offset: 4726}, + pos: position{line: 188, col: 35, offset: 4707}, label: "keys", expr: &zeroOrOneExpr{ - pos: position{line: 188, col: 40, offset: 4731}, + pos: position{line: 188, col: 40, offset: 4712}, expr: &seqExpr{ - pos: position{line: 188, col: 41, offset: 4732}, + pos: position{line: 188, col: 41, offset: 4713}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 188, col: 41, offset: 4732}, + pos: position{line: 188, col: 41, offset: 4713}, name: "_", }, &ruleRefExpr{ - pos: position{line: 188, col: 43, offset: 4734}, + pos: position{line: 188, col: 43, offset: 4715}, name: "GroupByKeys", }, }, @@ -1593,10 +1557,10 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 188, col: 57, offset: 4748}, + pos: position{line: 188, col: 57, offset: 4729}, label: "limit", expr: &ruleRefExpr{ - pos: position{line: 188, col: 63, offset: 4754}, + pos: position{line: 188, col: 63, offset: 4735}, name: "LimitArg", }, }, @@ -1610,34 +1574,34 @@ var g = &grammar{ }, { name: "Summarize", - pos: position{line: 201, col: 1, offset: 5037}, + pos: position{line: 201, col: 1, offset: 5018}, expr: &choiceExpr{ - pos: position{line: 201, col: 13, offset: 5049}, + pos: position{line: 201, col: 13, offset: 5030}, alternatives: []any{ &seqExpr{ - pos: position{line: 201, col: 13, offset: 5049}, + pos: position{line: 201, col: 13, offset: 5030}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 201, col: 13, offset: 5049}, + pos: position{line: 201, col: 13, offset: 5030}, name: "AGGREGATE", }, &ruleRefExpr{ - pos: position{line: 201, col: 23, offset: 5059}, + pos: position{line: 201, col: 23, offset: 5040}, name: "_", }, }, }, &zeroOrOneExpr{ - pos: position{line: 201, col: 27, offset: 5063}, + pos: position{line: 201, col: 27, offset: 5044}, expr: &seqExpr{ - pos: position{line: 201, col: 28, offset: 5064}, + pos: position{line: 201, col: 28, offset: 5045}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 201, col: 28, offset: 5064}, + pos: position{line: 201, col: 28, offset: 5045}, name: "SUMMARIZE", }, &ruleRefExpr{ - pos: position{line: 201, col: 38, offset: 5074}, + pos: position{line: 201, col: 38, offset: 5055}, name: "_", }, }, @@ -1650,42 +1614,42 @@ var g = &grammar{ }, { name: "GroupByKeys", - pos: position{line: 203, col: 1, offset: 5079}, + pos: position{line: 203, col: 1, offset: 5060}, expr: &actionExpr{ - pos: position{line: 204, col: 5, offset: 5095}, + pos: position{line: 204, col: 5, offset: 5076}, run: (*parser).callonGroupByKeys1, expr: &seqExpr{ - pos: position{line: 204, col: 5, offset: 5095}, + pos: position{line: 204, col: 5, offset: 5076}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 204, col: 5, offset: 5095}, + pos: position{line: 204, col: 5, offset: 5076}, expr: &seqExpr{ - pos: position{line: 204, col: 6, offset: 5096}, + pos: position{line: 204, col: 6, offset: 5077}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 204, col: 6, offset: 5096}, + pos: position{line: 204, col: 6, offset: 5077}, name: "GROUP", }, &ruleRefExpr{ - pos: position{line: 204, col: 12, offset: 5102}, + pos: position{line: 204, col: 12, offset: 5083}, name: "_", }, }, }, }, &ruleRefExpr{ - pos: position{line: 204, col: 16, offset: 5106}, + pos: position{line: 204, col: 16, offset: 5087}, name: "BY", }, &ruleRefExpr{ - pos: position{line: 204, col: 19, offset: 5109}, + pos: position{line: 204, col: 19, offset: 5090}, name: "_", }, &labeledExpr{ - pos: position{line: 204, col: 21, offset: 5111}, + pos: position{line: 204, col: 21, offset: 5092}, label: "columns", expr: &ruleRefExpr{ - pos: position{line: 204, col: 29, offset: 5119}, + pos: position{line: 204, col: 29, offset: 5100}, name: "FlexAssignments", }, }, @@ -1697,43 +1661,43 @@ var g = &grammar{ }, { name: "LimitArg", - pos: position{line: 206, col: 1, offset: 5160}, + pos: position{line: 206, col: 1, offset: 5141}, expr: &choiceExpr{ - pos: position{line: 207, col: 5, offset: 5173}, + pos: position{line: 207, col: 5, offset: 5154}, alternatives: []any{ &actionExpr{ - pos: position{line: 207, col: 5, offset: 5173}, + pos: position{line: 207, col: 5, offset: 5154}, run: (*parser).callonLimitArg2, expr: &seqExpr{ - pos: position{line: 207, col: 5, offset: 5173}, + pos: position{line: 207, col: 5, offset: 5154}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 207, col: 5, offset: 5173}, + pos: position{line: 207, col: 5, offset: 5154}, name: "_", }, &ruleRefExpr{ - pos: position{line: 207, col: 7, offset: 5175}, + pos: position{line: 207, col: 7, offset: 5156}, name: "WITH", }, &ruleRefExpr{ - pos: position{line: 207, col: 12, offset: 5180}, + pos: position{line: 207, col: 12, offset: 5161}, name: "_", }, &litMatcher{ - pos: position{line: 207, col: 14, offset: 5182}, + pos: position{line: 207, col: 14, offset: 5163}, val: "-limit", ignoreCase: false, want: "\"-limit\"", }, &ruleRefExpr{ - pos: position{line: 207, col: 23, offset: 5191}, + pos: position{line: 207, col: 23, offset: 5172}, name: "_", }, &labeledExpr{ - pos: position{line: 207, col: 25, offset: 5193}, + pos: position{line: 207, col: 25, offset: 5174}, label: "limit", expr: &ruleRefExpr{ - pos: position{line: 207, col: 31, offset: 5199}, + pos: position{line: 207, col: 31, offset: 5180}, name: "UInt", }, }, @@ -1741,10 +1705,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 208, col: 5, offset: 5230}, + pos: position{line: 208, col: 5, offset: 5211}, run: (*parser).callonLimitArg11, expr: &litMatcher{ - pos: position{line: 208, col: 5, offset: 5230}, + pos: position{line: 208, col: 5, offset: 5211}, val: "", ignoreCase: false, want: "\"\"", @@ -1757,22 +1721,22 @@ var g = &grammar{ }, { name: "FlexAssignment", - pos: position{line: 213, col: 1, offset: 5490}, + pos: position{line: 213, col: 1, offset: 5471}, expr: &choiceExpr{ - pos: position{line: 214, col: 5, offset: 5509}, + pos: position{line: 214, col: 5, offset: 5490}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 214, col: 5, offset: 5509}, + pos: position{line: 214, col: 5, offset: 5490}, name: "Assignment", }, &actionExpr{ - pos: position{line: 215, col: 5, offset: 5524}, + pos: position{line: 215, col: 5, offset: 5505}, run: (*parser).callonFlexAssignment3, expr: &labeledExpr{ - pos: position{line: 215, col: 5, offset: 5524}, + pos: position{line: 215, col: 5, offset: 5505}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 215, col: 10, offset: 5529}, + pos: position{line: 215, col: 10, offset: 5510}, name: "Expr", }, }, @@ -1784,51 +1748,51 @@ var g = &grammar{ }, { name: "FlexAssignments", - pos: position{line: 217, col: 1, offset: 5616}, + pos: position{line: 217, col: 1, offset: 5597}, expr: &actionExpr{ - pos: position{line: 218, col: 5, offset: 5636}, + pos: position{line: 218, col: 5, offset: 5617}, run: (*parser).callonFlexAssignments1, expr: &seqExpr{ - pos: position{line: 218, col: 5, offset: 5636}, + pos: position{line: 218, col: 5, offset: 5617}, exprs: []any{ &labeledExpr{ - pos: position{line: 218, col: 5, offset: 5636}, + pos: position{line: 218, col: 5, offset: 5617}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 218, col: 11, offset: 5642}, + pos: position{line: 218, col: 11, offset: 5623}, name: "FlexAssignment", }, }, &labeledExpr{ - pos: position{line: 218, col: 26, offset: 5657}, + pos: position{line: 218, col: 26, offset: 5638}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 218, col: 31, offset: 5662}, + pos: position{line: 218, col: 31, offset: 5643}, expr: &actionExpr{ - pos: position{line: 218, col: 32, offset: 5663}, + pos: position{line: 218, col: 32, offset: 5644}, run: (*parser).callonFlexAssignments7, expr: &seqExpr{ - pos: position{line: 218, col: 32, offset: 5663}, + pos: position{line: 218, col: 32, offset: 5644}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 218, col: 32, offset: 5663}, + pos: position{line: 218, col: 32, offset: 5644}, name: "__", }, &litMatcher{ - pos: position{line: 218, col: 35, offset: 5666}, + pos: position{line: 218, col: 35, offset: 5647}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 218, col: 39, offset: 5670}, + pos: position{line: 218, col: 39, offset: 5651}, name: "__", }, &labeledExpr{ - pos: position{line: 218, col: 42, offset: 5673}, + pos: position{line: 218, col: 42, offset: 5654}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 218, col: 47, offset: 5678}, + pos: position{line: 218, col: 47, offset: 5659}, name: "FlexAssignment", }, }, @@ -1845,43 +1809,43 @@ var g = &grammar{ }, { name: "AggAssignment", - pos: position{line: 222, col: 1, offset: 5764}, + pos: position{line: 222, col: 1, offset: 5745}, expr: &choiceExpr{ - pos: position{line: 223, col: 5, offset: 5782}, + pos: position{line: 223, col: 5, offset: 5763}, alternatives: []any{ &actionExpr{ - pos: position{line: 223, col: 5, offset: 5782}, + pos: position{line: 223, col: 5, offset: 5763}, run: (*parser).callonAggAssignment2, expr: &seqExpr{ - pos: position{line: 223, col: 5, offset: 5782}, + pos: position{line: 223, col: 5, offset: 5763}, exprs: []any{ &labeledExpr{ - pos: position{line: 223, col: 5, offset: 5782}, + pos: position{line: 223, col: 5, offset: 5763}, label: "lval", expr: &ruleRefExpr{ - pos: position{line: 223, col: 10, offset: 5787}, + pos: position{line: 223, col: 10, offset: 5768}, name: "Lval", }, }, &ruleRefExpr{ - pos: position{line: 223, col: 15, offset: 5792}, + pos: position{line: 223, col: 15, offset: 5773}, name: "__", }, &litMatcher{ - pos: position{line: 223, col: 18, offset: 5795}, + pos: position{line: 223, col: 18, offset: 5776}, val: ":=", ignoreCase: false, want: "\":=\"", }, &ruleRefExpr{ - pos: position{line: 223, col: 23, offset: 5800}, + pos: position{line: 223, col: 23, offset: 5781}, name: "__", }, &labeledExpr{ - pos: position{line: 223, col: 26, offset: 5803}, + pos: position{line: 223, col: 26, offset: 5784}, label: "agg", expr: &ruleRefExpr{ - pos: position{line: 223, col: 30, offset: 5807}, + pos: position{line: 223, col: 30, offset: 5788}, name: "Agg", }, }, @@ -1889,13 +1853,13 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 226, col: 5, offset: 5925}, + pos: position{line: 226, col: 5, offset: 5906}, run: (*parser).callonAggAssignment11, expr: &labeledExpr{ - pos: position{line: 226, col: 5, offset: 5925}, + pos: position{line: 226, col: 5, offset: 5906}, label: "agg", expr: &ruleRefExpr{ - pos: position{line: 226, col: 9, offset: 5929}, + pos: position{line: 226, col: 9, offset: 5910}, name: "Agg", }, }, @@ -1907,56 +1871,56 @@ var g = &grammar{ }, { name: "Agg", - pos: position{line: 230, col: 1, offset: 6024}, + pos: position{line: 230, col: 1, offset: 6005}, expr: &actionExpr{ - pos: position{line: 231, col: 5, offset: 6032}, + pos: position{line: 231, col: 5, offset: 6013}, run: (*parser).callonAgg1, expr: &seqExpr{ - pos: position{line: 231, col: 5, offset: 6032}, + pos: position{line: 231, col: 5, offset: 6013}, exprs: []any{ ¬Expr{ - pos: position{line: 231, col: 5, offset: 6032}, + pos: position{line: 231, col: 5, offset: 6013}, expr: &ruleRefExpr{ - pos: position{line: 231, col: 6, offset: 6033}, + pos: position{line: 231, col: 6, offset: 6014}, name: "FuncGuard", }, }, &labeledExpr{ - pos: position{line: 231, col: 16, offset: 6043}, + pos: position{line: 231, col: 16, offset: 6024}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 231, col: 19, offset: 6046}, + pos: position{line: 231, col: 19, offset: 6027}, name: "AggName", }, }, &ruleRefExpr{ - pos: position{line: 231, col: 27, offset: 6054}, + pos: position{line: 231, col: 27, offset: 6035}, name: "__", }, &litMatcher{ - pos: position{line: 231, col: 30, offset: 6057}, + pos: position{line: 231, col: 30, offset: 6038}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 231, col: 34, offset: 6061}, + pos: position{line: 231, col: 34, offset: 6042}, name: "__", }, &labeledExpr{ - pos: position{line: 231, col: 37, offset: 6064}, + pos: position{line: 231, col: 37, offset: 6045}, label: "expr", expr: &zeroOrOneExpr{ - pos: position{line: 231, col: 42, offset: 6069}, + pos: position{line: 231, col: 42, offset: 6050}, expr: &choiceExpr{ - pos: position{line: 231, col: 43, offset: 6070}, + pos: position{line: 231, col: 43, offset: 6051}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 231, col: 43, offset: 6070}, + pos: position{line: 231, col: 43, offset: 6051}, name: "OverExpr", }, &ruleRefExpr{ - pos: position{line: 231, col: 54, offset: 6081}, + pos: position{line: 231, col: 54, offset: 6062}, name: "Expr", }, }, @@ -1964,26 +1928,26 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 231, col: 61, offset: 6088}, + pos: position{line: 231, col: 61, offset: 6069}, name: "__", }, &litMatcher{ - pos: position{line: 231, col: 64, offset: 6091}, + pos: position{line: 231, col: 64, offset: 6072}, val: ")", ignoreCase: false, want: "\")\"", }, ¬Expr{ - pos: position{line: 231, col: 68, offset: 6095}, + pos: position{line: 231, col: 68, offset: 6076}, expr: &seqExpr{ - pos: position{line: 231, col: 70, offset: 6097}, + pos: position{line: 231, col: 70, offset: 6078}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 231, col: 70, offset: 6097}, + pos: position{line: 231, col: 70, offset: 6078}, name: "__", }, &litMatcher{ - pos: position{line: 231, col: 73, offset: 6100}, + pos: position{line: 231, col: 73, offset: 6081}, val: ".", ignoreCase: false, want: "\".\"", @@ -1992,12 +1956,12 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 231, col: 78, offset: 6105}, + pos: position{line: 231, col: 78, offset: 6086}, label: "where", expr: &zeroOrOneExpr{ - pos: position{line: 231, col: 84, offset: 6111}, + pos: position{line: 231, col: 84, offset: 6092}, expr: &ruleRefExpr{ - pos: position{line: 231, col: 84, offset: 6111}, + pos: position{line: 231, col: 84, offset: 6092}, name: "WhereClause", }, }, @@ -2010,20 +1974,20 @@ var g = &grammar{ }, { name: "AggName", - pos: position{line: 246, col: 1, offset: 6396}, + pos: position{line: 246, col: 1, offset: 6377}, expr: &choiceExpr{ - pos: position{line: 247, col: 5, offset: 6408}, + pos: position{line: 247, col: 5, offset: 6389}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 247, col: 5, offset: 6408}, + pos: position{line: 247, col: 5, offset: 6389}, name: "IdentifierName", }, &ruleRefExpr{ - pos: position{line: 248, col: 5, offset: 6427}, + pos: position{line: 248, col: 5, offset: 6408}, name: "AND", }, &ruleRefExpr{ - pos: position{line: 249, col: 5, offset: 6435}, + pos: position{line: 249, col: 5, offset: 6416}, name: "OR", }, }, @@ -2033,30 +1997,30 @@ var g = &grammar{ }, { name: "WhereClause", - pos: position{line: 251, col: 1, offset: 6439}, + pos: position{line: 251, col: 1, offset: 6420}, expr: &actionExpr{ - pos: position{line: 251, col: 15, offset: 6453}, + pos: position{line: 251, col: 15, offset: 6434}, run: (*parser).callonWhereClause1, expr: &seqExpr{ - pos: position{line: 251, col: 15, offset: 6453}, + pos: position{line: 251, col: 15, offset: 6434}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 251, col: 15, offset: 6453}, + pos: position{line: 251, col: 15, offset: 6434}, name: "_", }, &ruleRefExpr{ - pos: position{line: 251, col: 17, offset: 6455}, + pos: position{line: 251, col: 17, offset: 6436}, name: "WHERE", }, &ruleRefExpr{ - pos: position{line: 251, col: 23, offset: 6461}, + pos: position{line: 251, col: 23, offset: 6442}, name: "_", }, &labeledExpr{ - pos: position{line: 251, col: 25, offset: 6463}, + pos: position{line: 251, col: 25, offset: 6444}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 251, col: 30, offset: 6468}, + pos: position{line: 251, col: 30, offset: 6449}, name: "LogicalOrExpr", }, }, @@ -2068,45 +2032,45 @@ var g = &grammar{ }, { name: "AggAssignments", - pos: position{line: 253, col: 1, offset: 6504}, + pos: position{line: 253, col: 1, offset: 6485}, expr: &actionExpr{ - pos: position{line: 254, col: 5, offset: 6523}, + pos: position{line: 254, col: 5, offset: 6504}, run: (*parser).callonAggAssignments1, expr: &seqExpr{ - pos: position{line: 254, col: 5, offset: 6523}, + pos: position{line: 254, col: 5, offset: 6504}, exprs: []any{ &labeledExpr{ - pos: position{line: 254, col: 5, offset: 6523}, + pos: position{line: 254, col: 5, offset: 6504}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 254, col: 11, offset: 6529}, + pos: position{line: 254, col: 11, offset: 6510}, name: "AggAssignment", }, }, &labeledExpr{ - pos: position{line: 254, col: 25, offset: 6543}, + pos: position{line: 254, col: 25, offset: 6524}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 254, col: 30, offset: 6548}, + pos: position{line: 254, col: 30, offset: 6529}, expr: &seqExpr{ - pos: position{line: 254, col: 31, offset: 6549}, + pos: position{line: 254, col: 31, offset: 6530}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 254, col: 31, offset: 6549}, + pos: position{line: 254, col: 31, offset: 6530}, name: "__", }, &litMatcher{ - pos: position{line: 254, col: 34, offset: 6552}, + pos: position{line: 254, col: 34, offset: 6533}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 254, col: 38, offset: 6556}, + pos: position{line: 254, col: 38, offset: 6537}, name: "__", }, &ruleRefExpr{ - pos: position{line: 254, col: 41, offset: 6559}, + pos: position{line: 254, col: 41, offset: 6540}, name: "AggAssignment", }, }, @@ -2121,124 +2085,124 @@ var g = &grammar{ }, { name: "Operator", - pos: position{line: 264, col: 1, offset: 6756}, + pos: position{line: 264, col: 1, offset: 6737}, expr: &choiceExpr{ - pos: position{line: 265, col: 5, offset: 6769}, + pos: position{line: 265, col: 5, offset: 6750}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 265, col: 5, offset: 6769}, + pos: position{line: 265, col: 5, offset: 6750}, name: "SelectOp", }, &ruleRefExpr{ - pos: position{line: 266, col: 5, offset: 6782}, + pos: position{line: 266, col: 5, offset: 6763}, name: "ForkOp", }, &ruleRefExpr{ - pos: position{line: 267, col: 5, offset: 6793}, + pos: position{line: 267, col: 5, offset: 6774}, name: "SwitchOp", }, &ruleRefExpr{ - pos: position{line: 268, col: 5, offset: 6807}, + pos: position{line: 268, col: 5, offset: 6788}, name: "FromForkOp", }, &ruleRefExpr{ - pos: position{line: 269, col: 5, offset: 6822}, + pos: position{line: 269, col: 5, offset: 6803}, name: "SearchOp", }, &ruleRefExpr{ - pos: position{line: 270, col: 5, offset: 6835}, + pos: position{line: 270, col: 5, offset: 6816}, name: "AssertOp", }, &ruleRefExpr{ - pos: position{line: 271, col: 5, offset: 6848}, + pos: position{line: 271, col: 5, offset: 6829}, name: "SortOp", }, &ruleRefExpr{ - pos: position{line: 272, col: 5, offset: 6859}, + pos: position{line: 272, col: 5, offset: 6840}, name: "TopOp", }, &ruleRefExpr{ - pos: position{line: 273, col: 5, offset: 6869}, + pos: position{line: 273, col: 5, offset: 6850}, name: "CutOp", }, &ruleRefExpr{ - pos: position{line: 274, col: 5, offset: 6879}, + pos: position{line: 274, col: 5, offset: 6860}, name: "DropOp", }, &ruleRefExpr{ - pos: position{line: 275, col: 5, offset: 6890}, + pos: position{line: 275, col: 5, offset: 6871}, name: "HeadOp", }, &ruleRefExpr{ - pos: position{line: 276, col: 5, offset: 6901}, + pos: position{line: 276, col: 5, offset: 6882}, name: "TailOp", }, &ruleRefExpr{ - pos: position{line: 277, col: 5, offset: 6912}, + pos: position{line: 277, col: 5, offset: 6893}, name: "WhereOp", }, &ruleRefExpr{ - pos: position{line: 278, col: 5, offset: 6924}, + pos: position{line: 278, col: 5, offset: 6905}, name: "UniqOp", }, &ruleRefExpr{ - pos: position{line: 279, col: 5, offset: 6935}, + pos: position{line: 279, col: 5, offset: 6916}, name: "PutOp", }, &ruleRefExpr{ - pos: position{line: 280, col: 5, offset: 6945}, + pos: position{line: 280, col: 5, offset: 6926}, name: "RenameOp", }, &ruleRefExpr{ - pos: position{line: 281, col: 5, offset: 6958}, + pos: position{line: 281, col: 5, offset: 6939}, name: "FuseOp", }, &ruleRefExpr{ - pos: position{line: 282, col: 5, offset: 6969}, + pos: position{line: 282, col: 5, offset: 6950}, name: "ShapeOp", }, &ruleRefExpr{ - pos: position{line: 283, col: 5, offset: 6981}, + pos: position{line: 283, col: 5, offset: 6962}, name: "JoinOp", }, &ruleRefExpr{ - pos: position{line: 284, col: 5, offset: 6992}, + pos: position{line: 284, col: 5, offset: 6973}, name: "SampleOp", }, &ruleRefExpr{ - pos: position{line: 285, col: 5, offset: 7005}, + pos: position{line: 285, col: 5, offset: 6986}, name: "FromOp", }, &ruleRefExpr{ - pos: position{line: 286, col: 5, offset: 7016}, + pos: position{line: 286, col: 5, offset: 6997}, name: "PassOp", }, &ruleRefExpr{ - pos: position{line: 287, col: 5, offset: 7027}, + pos: position{line: 287, col: 5, offset: 7008}, name: "ExplodeOp", }, &ruleRefExpr{ - pos: position{line: 288, col: 5, offset: 7041}, + pos: position{line: 288, col: 5, offset: 7022}, name: "MergeOp", }, &ruleRefExpr{ - pos: position{line: 289, col: 5, offset: 7053}, + pos: position{line: 289, col: 5, offset: 7034}, name: "OverOp", }, &ruleRefExpr{ - pos: position{line: 290, col: 5, offset: 7064}, + pos: position{line: 290, col: 5, offset: 7045}, name: "YieldOp", }, &ruleRefExpr{ - pos: position{line: 291, col: 5, offset: 7076}, + pos: position{line: 291, col: 5, offset: 7057}, name: "LoadOp", }, &ruleRefExpr{ - pos: position{line: 292, col: 5, offset: 7087}, + pos: position{line: 292, col: 5, offset: 7068}, name: "OutputOp", }, &ruleRefExpr{ - pos: position{line: 293, col: 5, offset: 7100}, + pos: position{line: 293, col: 5, offset: 7081}, name: "DebugOp", }, }, @@ -2248,44 +2212,44 @@ var g = &grammar{ }, { name: "ForkOp", - pos: position{line: 295, col: 2, offset: 7110}, + pos: position{line: 295, col: 2, offset: 7091}, expr: &actionExpr{ - pos: position{line: 296, col: 4, offset: 7122}, + pos: position{line: 296, col: 4, offset: 7103}, run: (*parser).callonForkOp1, expr: &seqExpr{ - pos: position{line: 296, col: 4, offset: 7122}, + pos: position{line: 296, col: 4, offset: 7103}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 296, col: 4, offset: 7122}, + pos: position{line: 296, col: 4, offset: 7103}, name: "FORK", }, &ruleRefExpr{ - pos: position{line: 296, col: 9, offset: 7127}, + pos: position{line: 296, col: 9, offset: 7108}, name: "__", }, &litMatcher{ - pos: position{line: 296, col: 12, offset: 7130}, + pos: position{line: 296, col: 12, offset: 7111}, val: "(", ignoreCase: false, want: "\"(\"", }, &labeledExpr{ - pos: position{line: 296, col: 16, offset: 7134}, + pos: position{line: 296, col: 16, offset: 7115}, label: "paths", expr: &oneOrMoreExpr{ - pos: position{line: 296, col: 22, offset: 7140}, + pos: position{line: 296, col: 22, offset: 7121}, expr: &ruleRefExpr{ - pos: position{line: 296, col: 22, offset: 7140}, + pos: position{line: 296, col: 22, offset: 7121}, name: "Path", }, }, }, &ruleRefExpr{ - pos: position{line: 296, col: 28, offset: 7146}, + pos: position{line: 296, col: 28, offset: 7127}, name: "__", }, &litMatcher{ - pos: position{line: 296, col: 31, offset: 7149}, + pos: position{line: 296, col: 31, offset: 7130}, val: ")", ignoreCase: false, want: "\")\"", @@ -2298,32 +2262,32 @@ var g = &grammar{ }, { name: "Path", - pos: position{line: 308, col: 1, offset: 7398}, + pos: position{line: 308, col: 1, offset: 7379}, expr: &actionExpr{ - pos: position{line: 308, col: 8, offset: 7405}, + pos: position{line: 308, col: 8, offset: 7386}, run: (*parser).callonPath1, expr: &seqExpr{ - pos: position{line: 308, col: 8, offset: 7405}, + pos: position{line: 308, col: 8, offset: 7386}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 308, col: 8, offset: 7405}, + pos: position{line: 308, col: 8, offset: 7386}, name: "__", }, &litMatcher{ - pos: position{line: 308, col: 11, offset: 7408}, + pos: position{line: 308, col: 11, offset: 7389}, val: "=>", ignoreCase: false, want: "\"=>\"", }, &ruleRefExpr{ - pos: position{line: 308, col: 16, offset: 7413}, + pos: position{line: 308, col: 16, offset: 7394}, name: "__", }, &labeledExpr{ - pos: position{line: 308, col: 19, offset: 7416}, + pos: position{line: 308, col: 19, offset: 7397}, label: "seq", expr: &ruleRefExpr{ - pos: position{line: 308, col: 23, offset: 7420}, + pos: position{line: 308, col: 23, offset: 7401}, name: "Seq", }, }, @@ -2335,59 +2299,59 @@ var g = &grammar{ }, { name: "SwitchOp", - pos: position{line: 310, col: 1, offset: 7445}, + pos: position{line: 310, col: 1, offset: 7426}, expr: &choiceExpr{ - pos: position{line: 311, col: 5, offset: 7458}, + pos: position{line: 311, col: 5, offset: 7439}, alternatives: []any{ &actionExpr{ - pos: position{line: 311, col: 5, offset: 7458}, + pos: position{line: 311, col: 5, offset: 7439}, run: (*parser).callonSwitchOp2, expr: &seqExpr{ - pos: position{line: 311, col: 5, offset: 7458}, + pos: position{line: 311, col: 5, offset: 7439}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 311, col: 5, offset: 7458}, + pos: position{line: 311, col: 5, offset: 7439}, name: "SWITCH", }, &ruleRefExpr{ - pos: position{line: 311, col: 12, offset: 7465}, + pos: position{line: 311, col: 12, offset: 7446}, name: "_", }, &labeledExpr{ - pos: position{line: 311, col: 14, offset: 7467}, + pos: position{line: 311, col: 14, offset: 7448}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 311, col: 19, offset: 7472}, + pos: position{line: 311, col: 19, offset: 7453}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 311, col: 24, offset: 7477}, + pos: position{line: 311, col: 24, offset: 7458}, name: "_", }, &litMatcher{ - pos: position{line: 311, col: 26, offset: 7479}, + pos: position{line: 311, col: 26, offset: 7460}, val: "(", ignoreCase: false, want: "\"(\"", }, &labeledExpr{ - pos: position{line: 311, col: 30, offset: 7483}, + pos: position{line: 311, col: 30, offset: 7464}, label: "cases", expr: &oneOrMoreExpr{ - pos: position{line: 311, col: 36, offset: 7489}, + pos: position{line: 311, col: 36, offset: 7470}, expr: &ruleRefExpr{ - pos: position{line: 311, col: 36, offset: 7489}, + pos: position{line: 311, col: 36, offset: 7470}, name: "SwitchPath", }, }, }, &ruleRefExpr{ - pos: position{line: 311, col: 48, offset: 7501}, + pos: position{line: 311, col: 48, offset: 7482}, name: "__", }, &litMatcher{ - pos: position{line: 311, col: 51, offset: 7504}, + pos: position{line: 311, col: 51, offset: 7485}, val: ")", ignoreCase: false, want: "\")\"", @@ -2396,42 +2360,42 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 319, col: 5, offset: 7684}, + pos: position{line: 319, col: 5, offset: 7665}, run: (*parser).callonSwitchOp15, expr: &seqExpr{ - pos: position{line: 319, col: 5, offset: 7684}, + pos: position{line: 319, col: 5, offset: 7665}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 319, col: 5, offset: 7684}, + pos: position{line: 319, col: 5, offset: 7665}, name: "SWITCH", }, &ruleRefExpr{ - pos: position{line: 319, col: 12, offset: 7691}, + pos: position{line: 319, col: 12, offset: 7672}, name: "__", }, &litMatcher{ - pos: position{line: 319, col: 15, offset: 7694}, + pos: position{line: 319, col: 15, offset: 7675}, val: "(", ignoreCase: false, want: "\"(\"", }, &labeledExpr{ - pos: position{line: 319, col: 19, offset: 7698}, + pos: position{line: 319, col: 19, offset: 7679}, label: "cases", expr: &oneOrMoreExpr{ - pos: position{line: 319, col: 25, offset: 7704}, + pos: position{line: 319, col: 25, offset: 7685}, expr: &ruleRefExpr{ - pos: position{line: 319, col: 25, offset: 7704}, + pos: position{line: 319, col: 25, offset: 7685}, name: "SwitchPath", }, }, }, &ruleRefExpr{ - pos: position{line: 319, col: 37, offset: 7716}, + pos: position{line: 319, col: 37, offset: 7697}, name: "__", }, &litMatcher{ - pos: position{line: 319, col: 40, offset: 7719}, + pos: position{line: 319, col: 40, offset: 7700}, val: ")", ignoreCase: false, want: "\")\"", @@ -2446,30 +2410,30 @@ var g = &grammar{ }, { name: "SwitchPath", - pos: position{line: 327, col: 1, offset: 7863}, + pos: position{line: 327, col: 1, offset: 7844}, expr: &actionExpr{ - pos: position{line: 328, col: 5, offset: 7878}, + pos: position{line: 328, col: 5, offset: 7859}, run: (*parser).callonSwitchPath1, expr: &seqExpr{ - pos: position{line: 328, col: 5, offset: 7878}, + pos: position{line: 328, col: 5, offset: 7859}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 328, col: 5, offset: 7878}, + pos: position{line: 328, col: 5, offset: 7859}, name: "__", }, &labeledExpr{ - pos: position{line: 328, col: 8, offset: 7881}, + pos: position{line: 328, col: 8, offset: 7862}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 328, col: 13, offset: 7886}, + pos: position{line: 328, col: 13, offset: 7867}, name: "Case", }, }, &labeledExpr{ - pos: position{line: 328, col: 18, offset: 7891}, + pos: position{line: 328, col: 18, offset: 7872}, label: "path", expr: &ruleRefExpr{ - pos: position{line: 328, col: 23, offset: 7896}, + pos: position{line: 328, col: 23, offset: 7877}, name: "Path", }, }, @@ -2481,29 +2445,29 @@ var g = &grammar{ }, { name: "Case", - pos: position{line: 336, col: 1, offset: 8043}, + pos: position{line: 336, col: 1, offset: 8024}, expr: &choiceExpr{ - pos: position{line: 337, col: 5, offset: 8052}, + pos: position{line: 337, col: 5, offset: 8033}, alternatives: []any{ &actionExpr{ - pos: position{line: 337, col: 5, offset: 8052}, + pos: position{line: 337, col: 5, offset: 8033}, run: (*parser).callonCase2, expr: &seqExpr{ - pos: position{line: 337, col: 5, offset: 8052}, + pos: position{line: 337, col: 5, offset: 8033}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 337, col: 5, offset: 8052}, + pos: position{line: 337, col: 5, offset: 8033}, name: "CASE", }, &ruleRefExpr{ - pos: position{line: 337, col: 10, offset: 8057}, + pos: position{line: 337, col: 10, offset: 8038}, name: "_", }, &labeledExpr{ - pos: position{line: 337, col: 12, offset: 8059}, + pos: position{line: 337, col: 12, offset: 8040}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 337, col: 17, offset: 8064}, + pos: position{line: 337, col: 17, offset: 8045}, name: "Expr", }, }, @@ -2511,10 +2475,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 338, col: 5, offset: 8094}, + pos: position{line: 338, col: 5, offset: 8075}, run: (*parser).callonCase8, expr: &ruleRefExpr{ - pos: position{line: 338, col: 5, offset: 8094}, + pos: position{line: 338, col: 5, offset: 8075}, name: "DEFAULT", }, }, @@ -2525,44 +2489,44 @@ var g = &grammar{ }, { name: "FromForkOp", - pos: position{line: 340, col: 1, offset: 8123}, + pos: position{line: 340, col: 1, offset: 8104}, expr: &actionExpr{ - pos: position{line: 341, col: 5, offset: 8138}, + pos: position{line: 341, col: 5, offset: 8119}, run: (*parser).callonFromForkOp1, expr: &seqExpr{ - pos: position{line: 341, col: 5, offset: 8138}, + pos: position{line: 341, col: 5, offset: 8119}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 341, col: 5, offset: 8138}, + pos: position{line: 341, col: 5, offset: 8119}, name: "FROM", }, &ruleRefExpr{ - pos: position{line: 341, col: 10, offset: 8143}, + pos: position{line: 341, col: 10, offset: 8124}, name: "__", }, &litMatcher{ - pos: position{line: 341, col: 13, offset: 8146}, + pos: position{line: 341, col: 13, offset: 8127}, val: "(", ignoreCase: false, want: "\"(\"", }, &labeledExpr{ - pos: position{line: 341, col: 17, offset: 8150}, + pos: position{line: 341, col: 17, offset: 8131}, label: "trunks", expr: &oneOrMoreExpr{ - pos: position{line: 341, col: 24, offset: 8157}, + pos: position{line: 341, col: 24, offset: 8138}, expr: &ruleRefExpr{ - pos: position{line: 341, col: 24, offset: 8157}, + pos: position{line: 341, col: 24, offset: 8138}, name: "FromPath", }, }, }, &ruleRefExpr{ - pos: position{line: 341, col: 34, offset: 8167}, + pos: position{line: 341, col: 34, offset: 8148}, name: "__", }, &litMatcher{ - pos: position{line: 341, col: 37, offset: 8170}, + pos: position{line: 341, col: 37, offset: 8151}, val: ")", ignoreCase: false, want: "\")\"", @@ -2575,55 +2539,55 @@ var g = &grammar{ }, { name: "FromPath", - pos: position{line: 349, col: 1, offset: 8318}, + pos: position{line: 349, col: 1, offset: 8299}, expr: &actionExpr{ - pos: position{line: 350, col: 5, offset: 8331}, + pos: position{line: 350, col: 5, offset: 8312}, run: (*parser).callonFromPath1, expr: &seqExpr{ - pos: position{line: 350, col: 5, offset: 8331}, + pos: position{line: 350, col: 5, offset: 8312}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 350, col: 5, offset: 8331}, + pos: position{line: 350, col: 5, offset: 8312}, name: "__", }, &labeledExpr{ - pos: position{line: 350, col: 8, offset: 8334}, + pos: position{line: 350, col: 8, offset: 8315}, label: "source", expr: &ruleRefExpr{ - pos: position{line: 350, col: 15, offset: 8341}, + pos: position{line: 350, col: 15, offset: 8322}, name: "FromSource", }, }, &labeledExpr{ - pos: position{line: 350, col: 26, offset: 8352}, + pos: position{line: 350, col: 26, offset: 8333}, label: "seq", expr: &zeroOrOneExpr{ - pos: position{line: 350, col: 30, offset: 8356}, + pos: position{line: 350, col: 30, offset: 8337}, expr: &actionExpr{ - pos: position{line: 350, col: 31, offset: 8357}, + pos: position{line: 350, col: 31, offset: 8338}, run: (*parser).callonFromPath8, expr: &seqExpr{ - pos: position{line: 350, col: 31, offset: 8357}, + pos: position{line: 350, col: 31, offset: 8338}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 350, col: 31, offset: 8357}, + pos: position{line: 350, col: 31, offset: 8338}, name: "__", }, &litMatcher{ - pos: position{line: 350, col: 34, offset: 8360}, + pos: position{line: 350, col: 34, offset: 8341}, val: "=>", ignoreCase: false, want: "\"=>\"", }, &ruleRefExpr{ - pos: position{line: 350, col: 39, offset: 8365}, + pos: position{line: 350, col: 39, offset: 8346}, name: "__", }, &labeledExpr{ - pos: position{line: 350, col: 42, offset: 8368}, + pos: position{line: 350, col: 42, offset: 8349}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 350, col: 44, offset: 8370}, + pos: position{line: 350, col: 44, offset: 8351}, name: "Seq", }, }, @@ -2640,29 +2604,29 @@ var g = &grammar{ }, { name: "FromSource", - pos: position{line: 358, col: 1, offset: 8550}, + pos: position{line: 358, col: 1, offset: 8531}, expr: &choiceExpr{ - pos: position{line: 359, col: 5, offset: 8565}, + pos: position{line: 359, col: 5, offset: 8546}, alternatives: []any{ &actionExpr{ - pos: position{line: 359, col: 5, offset: 8565}, + pos: position{line: 359, col: 5, offset: 8546}, run: (*parser).callonFromSource2, expr: &seqExpr{ - pos: position{line: 359, col: 5, offset: 8565}, + pos: position{line: 359, col: 5, offset: 8546}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 359, col: 5, offset: 8565}, + pos: position{line: 359, col: 5, offset: 8546}, name: "FromKeyWord", }, &ruleRefExpr{ - pos: position{line: 359, col: 17, offset: 8577}, + pos: position{line: 359, col: 17, offset: 8558}, name: "_", }, &labeledExpr{ - pos: position{line: 359, col: 19, offset: 8579}, + pos: position{line: 359, col: 19, offset: 8560}, label: "elem", expr: &ruleRefExpr{ - pos: position{line: 359, col: 24, offset: 8584}, + pos: position{line: 359, col: 24, offset: 8565}, name: "FromElem", }, }, @@ -2670,7 +2634,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 366, col: 5, offset: 8755}, + pos: position{line: 366, col: 5, offset: 8736}, name: "PassOp", }, }, @@ -2680,26 +2644,26 @@ var g = &grammar{ }, { name: "SearchOp", - pos: position{line: 368, col: 1, offset: 8763}, + pos: position{line: 368, col: 1, offset: 8744}, expr: &actionExpr{ - pos: position{line: 369, col: 5, offset: 8776}, + pos: position{line: 369, col: 5, offset: 8757}, run: (*parser).callonSearchOp1, expr: &seqExpr{ - pos: position{line: 369, col: 5, offset: 8776}, + pos: position{line: 369, col: 5, offset: 8757}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 369, col: 5, offset: 8776}, + pos: position{line: 369, col: 5, offset: 8757}, name: "SEARCH", }, &ruleRefExpr{ - pos: position{line: 369, col: 12, offset: 8783}, + pos: position{line: 369, col: 12, offset: 8764}, name: "_", }, &labeledExpr{ - pos: position{line: 369, col: 14, offset: 8785}, + pos: position{line: 369, col: 14, offset: 8766}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 369, col: 19, offset: 8790}, + pos: position{line: 369, col: 19, offset: 8771}, name: "SearchBoolean", }, }, @@ -2711,32 +2675,32 @@ var g = &grammar{ }, { name: "AssertOp", - pos: position{line: 373, col: 1, offset: 8890}, + pos: position{line: 373, col: 1, offset: 8871}, expr: &actionExpr{ - pos: position{line: 374, col: 5, offset: 8903}, + pos: position{line: 374, col: 5, offset: 8884}, run: (*parser).callonAssertOp1, expr: &seqExpr{ - pos: position{line: 374, col: 5, offset: 8903}, + pos: position{line: 374, col: 5, offset: 8884}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 374, col: 5, offset: 8903}, + pos: position{line: 374, col: 5, offset: 8884}, name: "ASSERT", }, &ruleRefExpr{ - pos: position{line: 374, col: 12, offset: 8910}, + pos: position{line: 374, col: 12, offset: 8891}, name: "_", }, &labeledExpr{ - pos: position{line: 374, col: 14, offset: 8912}, + pos: position{line: 374, col: 14, offset: 8893}, label: "expr", expr: &actionExpr{ - pos: position{line: 374, col: 20, offset: 8918}, + pos: position{line: 374, col: 20, offset: 8899}, run: (*parser).callonAssertOp6, expr: &labeledExpr{ - pos: position{line: 374, col: 20, offset: 8918}, + pos: position{line: 374, col: 20, offset: 8899}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 374, col: 22, offset: 8920}, + pos: position{line: 374, col: 22, offset: 8901}, name: "Expr", }, }, @@ -2750,52 +2714,52 @@ var g = &grammar{ }, { name: "SortOp", - pos: position{line: 383, col: 1, offset: 9150}, + pos: position{line: 383, col: 1, offset: 9131}, expr: &actionExpr{ - pos: position{line: 384, col: 5, offset: 9161}, + pos: position{line: 384, col: 5, offset: 9142}, run: (*parser).callonSortOp1, expr: &seqExpr{ - pos: position{line: 384, col: 5, offset: 9161}, + pos: position{line: 384, col: 5, offset: 9142}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 384, col: 5, offset: 9161}, + pos: position{line: 384, col: 5, offset: 9142}, name: "SORT", }, &andExpr{ - pos: position{line: 384, col: 10, offset: 9166}, + pos: position{line: 384, col: 10, offset: 9147}, expr: &ruleRefExpr{ - pos: position{line: 384, col: 11, offset: 9167}, + pos: position{line: 384, col: 11, offset: 9148}, name: "EOKW", }, }, &labeledExpr{ - pos: position{line: 384, col: 16, offset: 9172}, + pos: position{line: 384, col: 16, offset: 9153}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 384, col: 21, offset: 9177}, + pos: position{line: 384, col: 21, offset: 9158}, name: "SortArgs", }, }, &labeledExpr{ - pos: position{line: 384, col: 30, offset: 9186}, + pos: position{line: 384, col: 30, offset: 9167}, label: "exprs", expr: &zeroOrOneExpr{ - pos: position{line: 384, col: 36, offset: 9192}, + pos: position{line: 384, col: 36, offset: 9173}, expr: &actionExpr{ - pos: position{line: 384, col: 37, offset: 9193}, + pos: position{line: 384, col: 37, offset: 9174}, run: (*parser).callonSortOp10, expr: &seqExpr{ - pos: position{line: 384, col: 37, offset: 9193}, + pos: position{line: 384, col: 37, offset: 9174}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 384, col: 37, offset: 9193}, + pos: position{line: 384, col: 37, offset: 9174}, name: "__", }, &labeledExpr{ - pos: position{line: 384, col: 40, offset: 9196}, + pos: position{line: 384, col: 40, offset: 9177}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 384, col: 42, offset: 9198}, + pos: position{line: 384, col: 42, offset: 9179}, name: "SortExprs", }, }, @@ -2812,30 +2776,30 @@ var g = &grammar{ }, { name: "SortArgs", - pos: position{line: 400, col: 1, offset: 9567}, + pos: position{line: 400, col: 1, offset: 9548}, expr: &actionExpr{ - pos: position{line: 400, col: 12, offset: 9578}, + pos: position{line: 400, col: 12, offset: 9559}, run: (*parser).callonSortArgs1, expr: &labeledExpr{ - pos: position{line: 400, col: 12, offset: 9578}, + pos: position{line: 400, col: 12, offset: 9559}, label: "args", expr: &zeroOrMoreExpr{ - pos: position{line: 400, col: 17, offset: 9583}, + pos: position{line: 400, col: 17, offset: 9564}, expr: &actionExpr{ - pos: position{line: 400, col: 18, offset: 9584}, + pos: position{line: 400, col: 18, offset: 9565}, run: (*parser).callonSortArgs4, expr: &seqExpr{ - pos: position{line: 400, col: 18, offset: 9584}, + pos: position{line: 400, col: 18, offset: 9565}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 400, col: 18, offset: 9584}, + pos: position{line: 400, col: 18, offset: 9565}, name: "_", }, &labeledExpr{ - pos: position{line: 400, col: 20, offset: 9586}, + pos: position{line: 400, col: 20, offset: 9567}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 400, col: 22, offset: 9588}, + pos: position{line: 400, col: 22, offset: 9569}, name: "SortArg", }, }, @@ -2850,53 +2814,53 @@ var g = &grammar{ }, { name: "SortArg", - pos: position{line: 402, col: 1, offset: 9645}, + pos: position{line: 402, col: 1, offset: 9626}, expr: &choiceExpr{ - pos: position{line: 403, col: 5, offset: 9657}, + pos: position{line: 403, col: 5, offset: 9638}, alternatives: []any{ &actionExpr{ - pos: position{line: 403, col: 5, offset: 9657}, + pos: position{line: 403, col: 5, offset: 9638}, run: (*parser).callonSortArg2, expr: &litMatcher{ - pos: position{line: 403, col: 5, offset: 9657}, + pos: position{line: 403, col: 5, offset: 9638}, val: "-r", ignoreCase: false, want: "\"-r\"", }, }, &actionExpr{ - pos: position{line: 404, col: 5, offset: 9724}, + pos: position{line: 404, col: 5, offset: 9705}, run: (*parser).callonSortArg4, expr: &seqExpr{ - pos: position{line: 404, col: 5, offset: 9724}, + pos: position{line: 404, col: 5, offset: 9705}, exprs: []any{ &litMatcher{ - pos: position{line: 404, col: 5, offset: 9724}, + pos: position{line: 404, col: 5, offset: 9705}, val: "-nulls", ignoreCase: false, want: "\"-nulls\"", }, &ruleRefExpr{ - pos: position{line: 404, col: 14, offset: 9733}, + pos: position{line: 404, col: 14, offset: 9714}, name: "_", }, &labeledExpr{ - pos: position{line: 404, col: 16, offset: 9735}, + pos: position{line: 404, col: 16, offset: 9716}, label: "where", expr: &actionExpr{ - pos: position{line: 404, col: 23, offset: 9742}, + pos: position{line: 404, col: 23, offset: 9723}, run: (*parser).callonSortArg9, expr: &choiceExpr{ - pos: position{line: 404, col: 24, offset: 9743}, + pos: position{line: 404, col: 24, offset: 9724}, alternatives: []any{ &litMatcher{ - pos: position{line: 404, col: 24, offset: 9743}, + pos: position{line: 404, col: 24, offset: 9724}, val: "first", ignoreCase: false, want: "\"first\"", }, &litMatcher{ - pos: position{line: 404, col: 34, offset: 9753}, + pos: position{line: 404, col: 34, offset: 9734}, val: "last", ignoreCase: false, want: "\"last\"", @@ -2915,44 +2879,44 @@ var g = &grammar{ }, { name: "TopOp", - pos: position{line: 408, col: 1, offset: 9872}, + pos: position{line: 408, col: 1, offset: 9853}, expr: &actionExpr{ - pos: position{line: 409, col: 5, offset: 9882}, + pos: position{line: 409, col: 5, offset: 9863}, run: (*parser).callonTopOp1, expr: &seqExpr{ - pos: position{line: 409, col: 5, offset: 9882}, + pos: position{line: 409, col: 5, offset: 9863}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 409, col: 5, offset: 9882}, + pos: position{line: 409, col: 5, offset: 9863}, name: "TOP", }, &andExpr{ - pos: position{line: 409, col: 9, offset: 9886}, + pos: position{line: 409, col: 9, offset: 9867}, expr: &ruleRefExpr{ - pos: position{line: 409, col: 10, offset: 9887}, + pos: position{line: 409, col: 10, offset: 9868}, name: "EOKW", }, }, &labeledExpr{ - pos: position{line: 409, col: 15, offset: 9892}, + pos: position{line: 409, col: 15, offset: 9873}, label: "limit", expr: &zeroOrOneExpr{ - pos: position{line: 409, col: 21, offset: 9898}, + pos: position{line: 409, col: 21, offset: 9879}, expr: &actionExpr{ - pos: position{line: 409, col: 22, offset: 9899}, + pos: position{line: 409, col: 22, offset: 9880}, run: (*parser).callonTopOp8, expr: &seqExpr{ - pos: position{line: 409, col: 22, offset: 9899}, + pos: position{line: 409, col: 22, offset: 9880}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 409, col: 22, offset: 9899}, + pos: position{line: 409, col: 22, offset: 9880}, name: "_", }, &labeledExpr{ - pos: position{line: 409, col: 24, offset: 9901}, + pos: position{line: 409, col: 24, offset: 9882}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 409, col: 26, offset: 9903}, + pos: position{line: 409, col: 26, offset: 9884}, name: "Expr", }, }, @@ -2962,19 +2926,19 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 409, col: 51, offset: 9928}, + pos: position{line: 409, col: 51, offset: 9909}, label: "flush", expr: &zeroOrOneExpr{ - pos: position{line: 409, col: 57, offset: 9934}, + pos: position{line: 409, col: 57, offset: 9915}, expr: &seqExpr{ - pos: position{line: 409, col: 58, offset: 9935}, + pos: position{line: 409, col: 58, offset: 9916}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 409, col: 58, offset: 9935}, + pos: position{line: 409, col: 58, offset: 9916}, name: "_", }, &litMatcher{ - pos: position{line: 409, col: 60, offset: 9937}, + pos: position{line: 409, col: 60, offset: 9918}, val: "-flush", ignoreCase: false, want: "\"-flush\"", @@ -2984,25 +2948,25 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 409, col: 71, offset: 9948}, + pos: position{line: 409, col: 71, offset: 9929}, label: "fields", expr: &zeroOrOneExpr{ - pos: position{line: 409, col: 78, offset: 9955}, + pos: position{line: 409, col: 78, offset: 9936}, expr: &actionExpr{ - pos: position{line: 409, col: 79, offset: 9956}, + pos: position{line: 409, col: 79, offset: 9937}, run: (*parser).callonTopOp20, expr: &seqExpr{ - pos: position{line: 409, col: 79, offset: 9956}, + pos: position{line: 409, col: 79, offset: 9937}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 409, col: 79, offset: 9956}, + pos: position{line: 409, col: 79, offset: 9937}, name: "_", }, &labeledExpr{ - pos: position{line: 409, col: 81, offset: 9958}, + pos: position{line: 409, col: 81, offset: 9939}, label: "f", expr: &ruleRefExpr{ - pos: position{line: 409, col: 83, offset: 9960}, + pos: position{line: 409, col: 83, offset: 9941}, name: "Lvals", }, }, @@ -3019,26 +2983,26 @@ var g = &grammar{ }, { name: "CutOp", - pos: position{line: 426, col: 1, offset: 10289}, + pos: position{line: 426, col: 1, offset: 10270}, expr: &actionExpr{ - pos: position{line: 427, col: 5, offset: 10299}, + pos: position{line: 427, col: 5, offset: 10280}, run: (*parser).callonCutOp1, expr: &seqExpr{ - pos: position{line: 427, col: 5, offset: 10299}, + pos: position{line: 427, col: 5, offset: 10280}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 427, col: 5, offset: 10299}, + pos: position{line: 427, col: 5, offset: 10280}, name: "CUT", }, &ruleRefExpr{ - pos: position{line: 427, col: 9, offset: 10303}, + pos: position{line: 427, col: 9, offset: 10284}, name: "_", }, &labeledExpr{ - pos: position{line: 427, col: 11, offset: 10305}, + pos: position{line: 427, col: 11, offset: 10286}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 427, col: 16, offset: 10310}, + pos: position{line: 427, col: 16, offset: 10291}, name: "FlexAssignments", }, }, @@ -3050,26 +3014,26 @@ var g = &grammar{ }, { name: "DropOp", - pos: position{line: 435, col: 1, offset: 10458}, + pos: position{line: 435, col: 1, offset: 10439}, expr: &actionExpr{ - pos: position{line: 436, col: 5, offset: 10469}, + pos: position{line: 436, col: 5, offset: 10450}, run: (*parser).callonDropOp1, expr: &seqExpr{ - pos: position{line: 436, col: 5, offset: 10469}, + pos: position{line: 436, col: 5, offset: 10450}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 436, col: 5, offset: 10469}, + pos: position{line: 436, col: 5, offset: 10450}, name: "DROP", }, &ruleRefExpr{ - pos: position{line: 436, col: 10, offset: 10474}, + pos: position{line: 436, col: 10, offset: 10455}, name: "_", }, &labeledExpr{ - pos: position{line: 436, col: 12, offset: 10476}, + pos: position{line: 436, col: 12, offset: 10457}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 436, col: 17, offset: 10481}, + pos: position{line: 436, col: 17, offset: 10462}, name: "Lvals", }, }, @@ -3081,36 +3045,36 @@ var g = &grammar{ }, { name: "HeadOp", - pos: position{line: 444, col: 1, offset: 10621}, + pos: position{line: 444, col: 1, offset: 10602}, expr: &choiceExpr{ - pos: position{line: 445, col: 5, offset: 10632}, + pos: position{line: 445, col: 5, offset: 10613}, alternatives: []any{ &actionExpr{ - pos: position{line: 445, col: 5, offset: 10632}, + pos: position{line: 445, col: 5, offset: 10613}, run: (*parser).callonHeadOp2, expr: &seqExpr{ - pos: position{line: 445, col: 5, offset: 10632}, + pos: position{line: 445, col: 5, offset: 10613}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 445, col: 5, offset: 10632}, + pos: position{line: 445, col: 5, offset: 10613}, name: "HEAD", }, &ruleRefExpr{ - pos: position{line: 445, col: 10, offset: 10637}, + pos: position{line: 445, col: 10, offset: 10618}, name: "_", }, ¬Expr{ - pos: position{line: 445, col: 12, offset: 10639}, + pos: position{line: 445, col: 12, offset: 10620}, expr: &ruleRefExpr{ - pos: position{line: 445, col: 13, offset: 10640}, + pos: position{line: 445, col: 13, offset: 10621}, name: "EndOfOp", }, }, &labeledExpr{ - pos: position{line: 445, col: 21, offset: 10648}, + pos: position{line: 445, col: 21, offset: 10629}, label: "count", expr: &ruleRefExpr{ - pos: position{line: 445, col: 27, offset: 10654}, + pos: position{line: 445, col: 27, offset: 10635}, name: "Expr", }, }, @@ -3118,26 +3082,26 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 452, col: 5, offset: 10784}, + pos: position{line: 452, col: 5, offset: 10765}, run: (*parser).callonHeadOp10, expr: &seqExpr{ - pos: position{line: 452, col: 5, offset: 10784}, + pos: position{line: 452, col: 5, offset: 10765}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 452, col: 5, offset: 10784}, + pos: position{line: 452, col: 5, offset: 10765}, name: "HEAD", }, ¬Expr{ - pos: position{line: 452, col: 10, offset: 10789}, + pos: position{line: 452, col: 10, offset: 10770}, expr: &seqExpr{ - pos: position{line: 452, col: 12, offset: 10791}, + pos: position{line: 452, col: 12, offset: 10772}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 452, col: 12, offset: 10791}, + pos: position{line: 452, col: 12, offset: 10772}, name: "__", }, &litMatcher{ - pos: position{line: 452, col: 15, offset: 10794}, + pos: position{line: 452, col: 15, offset: 10775}, val: "(", ignoreCase: false, want: "\"(\"", @@ -3146,9 +3110,9 @@ var g = &grammar{ }, }, &andExpr{ - pos: position{line: 452, col: 20, offset: 10799}, + pos: position{line: 452, col: 20, offset: 10780}, expr: &ruleRefExpr{ - pos: position{line: 452, col: 21, offset: 10800}, + pos: position{line: 452, col: 21, offset: 10781}, name: "EOKW", }, }, @@ -3162,36 +3126,36 @@ var g = &grammar{ }, { name: "TailOp", - pos: position{line: 459, col: 1, offset: 10894}, + pos: position{line: 459, col: 1, offset: 10875}, expr: &choiceExpr{ - pos: position{line: 460, col: 5, offset: 10905}, + pos: position{line: 460, col: 5, offset: 10886}, alternatives: []any{ &actionExpr{ - pos: position{line: 460, col: 5, offset: 10905}, + pos: position{line: 460, col: 5, offset: 10886}, run: (*parser).callonTailOp2, expr: &seqExpr{ - pos: position{line: 460, col: 5, offset: 10905}, + pos: position{line: 460, col: 5, offset: 10886}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 460, col: 5, offset: 10905}, + pos: position{line: 460, col: 5, offset: 10886}, name: "TAIL", }, &ruleRefExpr{ - pos: position{line: 460, col: 10, offset: 10910}, + pos: position{line: 460, col: 10, offset: 10891}, name: "_", }, ¬Expr{ - pos: position{line: 460, col: 12, offset: 10912}, + pos: position{line: 460, col: 12, offset: 10893}, expr: &ruleRefExpr{ - pos: position{line: 460, col: 13, offset: 10913}, + pos: position{line: 460, col: 13, offset: 10894}, name: "EndOfOp", }, }, &labeledExpr{ - pos: position{line: 460, col: 21, offset: 10921}, + pos: position{line: 460, col: 21, offset: 10902}, label: "count", expr: &ruleRefExpr{ - pos: position{line: 460, col: 27, offset: 10927}, + pos: position{line: 460, col: 27, offset: 10908}, name: "Expr", }, }, @@ -3199,26 +3163,26 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 467, col: 5, offset: 11057}, + pos: position{line: 467, col: 5, offset: 11038}, run: (*parser).callonTailOp10, expr: &seqExpr{ - pos: position{line: 467, col: 5, offset: 11057}, + pos: position{line: 467, col: 5, offset: 11038}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 467, col: 5, offset: 11057}, + pos: position{line: 467, col: 5, offset: 11038}, name: "TAIL", }, ¬Expr{ - pos: position{line: 467, col: 10, offset: 11062}, + pos: position{line: 467, col: 10, offset: 11043}, expr: &seqExpr{ - pos: position{line: 467, col: 12, offset: 11064}, + pos: position{line: 467, col: 12, offset: 11045}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 467, col: 12, offset: 11064}, + pos: position{line: 467, col: 12, offset: 11045}, name: "__", }, &litMatcher{ - pos: position{line: 467, col: 15, offset: 11067}, + pos: position{line: 467, col: 15, offset: 11048}, val: "(", ignoreCase: false, want: "\"(\"", @@ -3227,9 +3191,9 @@ var g = &grammar{ }, }, &andExpr{ - pos: position{line: 467, col: 20, offset: 11072}, + pos: position{line: 467, col: 20, offset: 11053}, expr: &ruleRefExpr{ - pos: position{line: 467, col: 21, offset: 11073}, + pos: position{line: 467, col: 21, offset: 11054}, name: "EOKW", }, }, @@ -3243,26 +3207,26 @@ var g = &grammar{ }, { name: "WhereOp", - pos: position{line: 474, col: 1, offset: 11167}, + pos: position{line: 474, col: 1, offset: 11148}, expr: &actionExpr{ - pos: position{line: 475, col: 5, offset: 11179}, + pos: position{line: 475, col: 5, offset: 11160}, run: (*parser).callonWhereOp1, expr: &seqExpr{ - pos: position{line: 475, col: 5, offset: 11179}, + pos: position{line: 475, col: 5, offset: 11160}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 475, col: 5, offset: 11179}, + pos: position{line: 475, col: 5, offset: 11160}, name: "WHERE", }, &ruleRefExpr{ - pos: position{line: 475, col: 11, offset: 11185}, + pos: position{line: 475, col: 11, offset: 11166}, name: "_", }, &labeledExpr{ - pos: position{line: 475, col: 13, offset: 11187}, + pos: position{line: 475, col: 13, offset: 11168}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 475, col: 18, offset: 11192}, + pos: position{line: 475, col: 18, offset: 11173}, name: "Expr", }, }, @@ -3274,26 +3238,26 @@ var g = &grammar{ }, { name: "UniqOp", - pos: position{line: 483, col: 1, offset: 11319}, + pos: position{line: 483, col: 1, offset: 11300}, expr: &choiceExpr{ - pos: position{line: 484, col: 5, offset: 11330}, + pos: position{line: 484, col: 5, offset: 11311}, alternatives: []any{ &actionExpr{ - pos: position{line: 484, col: 5, offset: 11330}, + pos: position{line: 484, col: 5, offset: 11311}, run: (*parser).callonUniqOp2, expr: &seqExpr{ - pos: position{line: 484, col: 5, offset: 11330}, + pos: position{line: 484, col: 5, offset: 11311}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 484, col: 5, offset: 11330}, + pos: position{line: 484, col: 5, offset: 11311}, name: "UNIQ", }, &ruleRefExpr{ - pos: position{line: 484, col: 10, offset: 11335}, + pos: position{line: 484, col: 10, offset: 11316}, name: "_", }, &litMatcher{ - pos: position{line: 484, col: 12, offset: 11337}, + pos: position{line: 484, col: 12, offset: 11318}, val: "-c", ignoreCase: false, want: "\"-c\"", @@ -3302,26 +3266,26 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 487, col: 5, offset: 11422}, + pos: position{line: 487, col: 5, offset: 11403}, run: (*parser).callonUniqOp7, expr: &seqExpr{ - pos: position{line: 487, col: 5, offset: 11422}, + pos: position{line: 487, col: 5, offset: 11403}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 487, col: 5, offset: 11422}, + pos: position{line: 487, col: 5, offset: 11403}, name: "UNIQ", }, ¬Expr{ - pos: position{line: 487, col: 10, offset: 11427}, + pos: position{line: 487, col: 10, offset: 11408}, expr: &seqExpr{ - pos: position{line: 487, col: 12, offset: 11429}, + pos: position{line: 487, col: 12, offset: 11410}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 487, col: 12, offset: 11429}, + pos: position{line: 487, col: 12, offset: 11410}, name: "__", }, &litMatcher{ - pos: position{line: 487, col: 15, offset: 11432}, + pos: position{line: 487, col: 15, offset: 11413}, val: "(", ignoreCase: false, want: "\"(\"", @@ -3330,9 +3294,9 @@ var g = &grammar{ }, }, &andExpr{ - pos: position{line: 487, col: 20, offset: 11437}, + pos: position{line: 487, col: 20, offset: 11418}, expr: &ruleRefExpr{ - pos: position{line: 487, col: 21, offset: 11438}, + pos: position{line: 487, col: 21, offset: 11419}, name: "EOKW", }, }, @@ -3346,26 +3310,26 @@ var g = &grammar{ }, { name: "PutOp", - pos: position{line: 491, col: 1, offset: 11507}, + pos: position{line: 491, col: 1, offset: 11488}, expr: &actionExpr{ - pos: position{line: 492, col: 5, offset: 11517}, + pos: position{line: 492, col: 5, offset: 11498}, run: (*parser).callonPutOp1, expr: &seqExpr{ - pos: position{line: 492, col: 5, offset: 11517}, + pos: position{line: 492, col: 5, offset: 11498}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 492, col: 5, offset: 11517}, + pos: position{line: 492, col: 5, offset: 11498}, name: "PUT", }, &ruleRefExpr{ - pos: position{line: 492, col: 9, offset: 11521}, + pos: position{line: 492, col: 9, offset: 11502}, name: "_", }, &labeledExpr{ - pos: position{line: 492, col: 11, offset: 11523}, + pos: position{line: 492, col: 11, offset: 11504}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 492, col: 16, offset: 11528}, + pos: position{line: 492, col: 16, offset: 11509}, name: "Assignments", }, }, @@ -3377,59 +3341,59 @@ var g = &grammar{ }, { name: "RenameOp", - pos: position{line: 500, col: 1, offset: 11678}, + pos: position{line: 500, col: 1, offset: 11659}, expr: &actionExpr{ - pos: position{line: 501, col: 5, offset: 11691}, + pos: position{line: 501, col: 5, offset: 11672}, run: (*parser).callonRenameOp1, expr: &seqExpr{ - pos: position{line: 501, col: 5, offset: 11691}, + pos: position{line: 501, col: 5, offset: 11672}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 501, col: 5, offset: 11691}, + pos: position{line: 501, col: 5, offset: 11672}, name: "RENAME", }, &ruleRefExpr{ - pos: position{line: 501, col: 12, offset: 11698}, + pos: position{line: 501, col: 12, offset: 11679}, name: "_", }, &labeledExpr{ - pos: position{line: 501, col: 14, offset: 11700}, + pos: position{line: 501, col: 14, offset: 11681}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 501, col: 20, offset: 11706}, + pos: position{line: 501, col: 20, offset: 11687}, name: "Assignment", }, }, &labeledExpr{ - pos: position{line: 501, col: 31, offset: 11717}, + pos: position{line: 501, col: 31, offset: 11698}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 501, col: 36, offset: 11722}, + pos: position{line: 501, col: 36, offset: 11703}, expr: &actionExpr{ - pos: position{line: 501, col: 37, offset: 11723}, + pos: position{line: 501, col: 37, offset: 11704}, run: (*parser).callonRenameOp9, expr: &seqExpr{ - pos: position{line: 501, col: 37, offset: 11723}, + pos: position{line: 501, col: 37, offset: 11704}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 501, col: 37, offset: 11723}, + pos: position{line: 501, col: 37, offset: 11704}, name: "__", }, &litMatcher{ - pos: position{line: 501, col: 40, offset: 11726}, + pos: position{line: 501, col: 40, offset: 11707}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 501, col: 44, offset: 11730}, + pos: position{line: 501, col: 44, offset: 11711}, name: "__", }, &labeledExpr{ - pos: position{line: 501, col: 47, offset: 11733}, + pos: position{line: 501, col: 47, offset: 11714}, label: "cl", expr: &ruleRefExpr{ - pos: position{line: 501, col: 50, offset: 11736}, + pos: position{line: 501, col: 50, offset: 11717}, name: "Assignment", }, }, @@ -3446,28 +3410,28 @@ var g = &grammar{ }, { name: "FuseOp", - pos: position{line: 514, col: 1, offset: 12201}, + pos: position{line: 514, col: 1, offset: 12182}, expr: &actionExpr{ - pos: position{line: 515, col: 5, offset: 12212}, + pos: position{line: 515, col: 5, offset: 12193}, run: (*parser).callonFuseOp1, expr: &seqExpr{ - pos: position{line: 515, col: 5, offset: 12212}, + pos: position{line: 515, col: 5, offset: 12193}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 515, col: 5, offset: 12212}, + pos: position{line: 515, col: 5, offset: 12193}, name: "FUSE", }, ¬Expr{ - pos: position{line: 515, col: 10, offset: 12217}, + pos: position{line: 515, col: 10, offset: 12198}, expr: &seqExpr{ - pos: position{line: 515, col: 12, offset: 12219}, + pos: position{line: 515, col: 12, offset: 12200}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 515, col: 12, offset: 12219}, + pos: position{line: 515, col: 12, offset: 12200}, name: "__", }, &litMatcher{ - pos: position{line: 515, col: 15, offset: 12222}, + pos: position{line: 515, col: 15, offset: 12203}, val: "(", ignoreCase: false, want: "\"(\"", @@ -3476,9 +3440,9 @@ var g = &grammar{ }, }, &andExpr{ - pos: position{line: 515, col: 20, offset: 12227}, + pos: position{line: 515, col: 20, offset: 12208}, expr: &ruleRefExpr{ - pos: position{line: 515, col: 21, offset: 12228}, + pos: position{line: 515, col: 21, offset: 12209}, name: "EOKW", }, }, @@ -3490,28 +3454,28 @@ var g = &grammar{ }, { name: "ShapeOp", - pos: position{line: 519, col: 1, offset: 12297}, + pos: position{line: 519, col: 1, offset: 12278}, expr: &actionExpr{ - pos: position{line: 520, col: 5, offset: 12309}, + pos: position{line: 520, col: 5, offset: 12290}, run: (*parser).callonShapeOp1, expr: &seqExpr{ - pos: position{line: 520, col: 5, offset: 12309}, + pos: position{line: 520, col: 5, offset: 12290}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 520, col: 5, offset: 12309}, + pos: position{line: 520, col: 5, offset: 12290}, name: "SHAPE", }, ¬Expr{ - pos: position{line: 520, col: 11, offset: 12315}, + pos: position{line: 520, col: 11, offset: 12296}, expr: &seqExpr{ - pos: position{line: 520, col: 13, offset: 12317}, + pos: position{line: 520, col: 13, offset: 12298}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 520, col: 13, offset: 12317}, + pos: position{line: 520, col: 13, offset: 12298}, name: "__", }, &litMatcher{ - pos: position{line: 520, col: 16, offset: 12320}, + pos: position{line: 520, col: 16, offset: 12301}, val: "(", ignoreCase: false, want: "\"(\"", @@ -3520,9 +3484,9 @@ var g = &grammar{ }, }, &andExpr{ - pos: position{line: 520, col: 21, offset: 12325}, + pos: position{line: 520, col: 21, offset: 12306}, expr: &ruleRefExpr{ - pos: position{line: 520, col: 22, offset: 12326}, + pos: position{line: 520, col: 22, offset: 12307}, name: "EOKW", }, }, @@ -3534,72 +3498,72 @@ var g = &grammar{ }, { name: "JoinOp", - pos: position{line: 524, col: 1, offset: 12397}, + pos: position{line: 524, col: 1, offset: 12378}, expr: &actionExpr{ - pos: position{line: 525, col: 5, offset: 12408}, + pos: position{line: 525, col: 5, offset: 12389}, run: (*parser).callonJoinOp1, expr: &seqExpr{ - pos: position{line: 525, col: 5, offset: 12408}, + pos: position{line: 525, col: 5, offset: 12389}, exprs: []any{ &labeledExpr{ - pos: position{line: 525, col: 5, offset: 12408}, + pos: position{line: 525, col: 5, offset: 12389}, label: "style", expr: &ruleRefExpr{ - pos: position{line: 525, col: 11, offset: 12414}, + pos: position{line: 525, col: 11, offset: 12395}, name: "JoinStyle", }, }, &ruleRefExpr{ - pos: position{line: 525, col: 21, offset: 12424}, + pos: position{line: 525, col: 21, offset: 12405}, name: "JOIN", }, &labeledExpr{ - pos: position{line: 525, col: 26, offset: 12429}, + pos: position{line: 525, col: 26, offset: 12410}, label: "rightInput", expr: &ruleRefExpr{ - pos: position{line: 525, col: 37, offset: 12440}, + pos: position{line: 525, col: 37, offset: 12421}, name: "JoinRightInput", }, }, &ruleRefExpr{ - pos: position{line: 525, col: 52, offset: 12455}, + pos: position{line: 525, col: 52, offset: 12436}, name: "ON", }, &ruleRefExpr{ - pos: position{line: 525, col: 55, offset: 12458}, + pos: position{line: 525, col: 55, offset: 12439}, name: "_", }, &labeledExpr{ - pos: position{line: 525, col: 57, offset: 12460}, + pos: position{line: 525, col: 57, offset: 12441}, label: "key", expr: &ruleRefExpr{ - pos: position{line: 525, col: 61, offset: 12464}, + pos: position{line: 525, col: 61, offset: 12445}, name: "JoinKey", }, }, &labeledExpr{ - pos: position{line: 525, col: 69, offset: 12472}, + pos: position{line: 525, col: 69, offset: 12453}, label: "optKey", expr: &zeroOrOneExpr{ - pos: position{line: 525, col: 76, offset: 12479}, + pos: position{line: 525, col: 76, offset: 12460}, expr: &seqExpr{ - pos: position{line: 525, col: 77, offset: 12480}, + pos: position{line: 525, col: 77, offset: 12461}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 525, col: 77, offset: 12480}, + pos: position{line: 525, col: 77, offset: 12461}, name: "__", }, &choiceExpr{ - pos: position{line: 525, col: 81, offset: 12484}, + pos: position{line: 525, col: 81, offset: 12465}, alternatives: []any{ &litMatcher{ - pos: position{line: 525, col: 81, offset: 12484}, + pos: position{line: 525, col: 81, offset: 12465}, val: "==", ignoreCase: false, want: "\"==\"", }, &litMatcher{ - pos: position{line: 525, col: 88, offset: 12491}, + pos: position{line: 525, col: 88, offset: 12472}, val: "=", ignoreCase: false, want: "\"=\"", @@ -3607,11 +3571,11 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 525, col: 93, offset: 12496}, + pos: position{line: 525, col: 93, offset: 12477}, name: "__", }, &ruleRefExpr{ - pos: position{line: 525, col: 96, offset: 12499}, + pos: position{line: 525, col: 96, offset: 12480}, name: "JoinKey", }, }, @@ -3619,19 +3583,19 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 525, col: 106, offset: 12509}, + pos: position{line: 525, col: 106, offset: 12490}, label: "optArgs", expr: &zeroOrOneExpr{ - pos: position{line: 525, col: 114, offset: 12517}, + pos: position{line: 525, col: 114, offset: 12498}, expr: &seqExpr{ - pos: position{line: 525, col: 115, offset: 12518}, + pos: position{line: 525, col: 115, offset: 12499}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 525, col: 115, offset: 12518}, + pos: position{line: 525, col: 115, offset: 12499}, name: "_", }, &ruleRefExpr{ - pos: position{line: 525, col: 117, offset: 12520}, + pos: position{line: 525, col: 117, offset: 12501}, name: "FlexAssignments", }, }, @@ -3646,83 +3610,83 @@ var g = &grammar{ }, { name: "JoinStyle", - pos: position{line: 544, col: 1, offset: 12970}, + pos: position{line: 544, col: 1, offset: 12951}, expr: &choiceExpr{ - pos: position{line: 545, col: 5, offset: 12984}, + pos: position{line: 545, col: 5, offset: 12965}, alternatives: []any{ &actionExpr{ - pos: position{line: 545, col: 5, offset: 12984}, + pos: position{line: 545, col: 5, offset: 12965}, run: (*parser).callonJoinStyle2, expr: &seqExpr{ - pos: position{line: 545, col: 5, offset: 12984}, + pos: position{line: 545, col: 5, offset: 12965}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 545, col: 5, offset: 12984}, + pos: position{line: 545, col: 5, offset: 12965}, name: "ANTI", }, &ruleRefExpr{ - pos: position{line: 545, col: 10, offset: 12989}, + pos: position{line: 545, col: 10, offset: 12970}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 546, col: 5, offset: 13019}, + pos: position{line: 546, col: 5, offset: 13000}, run: (*parser).callonJoinStyle6, expr: &seqExpr{ - pos: position{line: 546, col: 5, offset: 13019}, + pos: position{line: 546, col: 5, offset: 13000}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 546, col: 5, offset: 13019}, + pos: position{line: 546, col: 5, offset: 13000}, name: "INNER", }, &ruleRefExpr{ - pos: position{line: 546, col: 11, offset: 13025}, + pos: position{line: 546, col: 11, offset: 13006}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 547, col: 5, offset: 13055}, + pos: position{line: 547, col: 5, offset: 13036}, run: (*parser).callonJoinStyle10, expr: &seqExpr{ - pos: position{line: 547, col: 5, offset: 13055}, + pos: position{line: 547, col: 5, offset: 13036}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 547, col: 5, offset: 13055}, + pos: position{line: 547, col: 5, offset: 13036}, name: "LEFT", }, &ruleRefExpr{ - pos: position{line: 547, col: 11, offset: 13061}, + pos: position{line: 547, col: 11, offset: 13042}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 548, col: 5, offset: 13090}, + pos: position{line: 548, col: 5, offset: 13071}, run: (*parser).callonJoinStyle14, expr: &seqExpr{ - pos: position{line: 548, col: 5, offset: 13090}, + pos: position{line: 548, col: 5, offset: 13071}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 548, col: 5, offset: 13090}, + pos: position{line: 548, col: 5, offset: 13071}, name: "RIGHT", }, &ruleRefExpr{ - pos: position{line: 548, col: 11, offset: 13096}, + pos: position{line: 548, col: 11, offset: 13077}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 549, col: 5, offset: 13126}, + pos: position{line: 549, col: 5, offset: 13107}, run: (*parser).callonJoinStyle18, expr: &litMatcher{ - pos: position{line: 549, col: 5, offset: 13126}, + pos: position{line: 549, col: 5, offset: 13107}, val: "", ignoreCase: false, want: "\"\"", @@ -3735,60 +3699,60 @@ var g = &grammar{ }, { name: "JoinRightInput", - pos: position{line: 551, col: 1, offset: 13161}, + pos: position{line: 551, col: 1, offset: 13142}, expr: &choiceExpr{ - pos: position{line: 552, col: 5, offset: 13180}, + pos: position{line: 552, col: 5, offset: 13161}, alternatives: []any{ &actionExpr{ - pos: position{line: 552, col: 5, offset: 13180}, + pos: position{line: 552, col: 5, offset: 13161}, run: (*parser).callonJoinRightInput2, expr: &seqExpr{ - pos: position{line: 552, col: 5, offset: 13180}, + pos: position{line: 552, col: 5, offset: 13161}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 552, col: 5, offset: 13180}, + pos: position{line: 552, col: 5, offset: 13161}, name: "__", }, &litMatcher{ - pos: position{line: 552, col: 8, offset: 13183}, + pos: position{line: 552, col: 8, offset: 13164}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 552, col: 12, offset: 13187}, + pos: position{line: 552, col: 12, offset: 13168}, name: "__", }, &labeledExpr{ - pos: position{line: 552, col: 15, offset: 13190}, + pos: position{line: 552, col: 15, offset: 13171}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 552, col: 17, offset: 13192}, + pos: position{line: 552, col: 17, offset: 13173}, name: "Seq", }, }, &ruleRefExpr{ - pos: position{line: 552, col: 21, offset: 13196}, + pos: position{line: 552, col: 21, offset: 13177}, name: "__", }, &litMatcher{ - pos: position{line: 552, col: 24, offset: 13199}, + pos: position{line: 552, col: 24, offset: 13180}, val: ")", ignoreCase: false, want: "\")\"", }, &ruleRefExpr{ - pos: position{line: 552, col: 28, offset: 13203}, + pos: position{line: 552, col: 28, offset: 13184}, name: "__", }, }, }, }, &actionExpr{ - pos: position{line: 553, col: 5, offset: 13228}, + pos: position{line: 553, col: 5, offset: 13209}, run: (*parser).callonJoinRightInput12, expr: &ruleRefExpr{ - pos: position{line: 553, col: 5, offset: 13228}, + pos: position{line: 553, col: 5, offset: 13209}, name: "_", }, }, @@ -3799,36 +3763,36 @@ var g = &grammar{ }, { name: "JoinKey", - pos: position{line: 555, col: 1, offset: 13251}, + pos: position{line: 555, col: 1, offset: 13232}, expr: &choiceExpr{ - pos: position{line: 556, col: 5, offset: 13263}, + pos: position{line: 556, col: 5, offset: 13244}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 556, col: 5, offset: 13263}, + pos: position{line: 556, col: 5, offset: 13244}, name: "Lval", }, &actionExpr{ - pos: position{line: 557, col: 5, offset: 13272}, + pos: position{line: 557, col: 5, offset: 13253}, run: (*parser).callonJoinKey3, expr: &seqExpr{ - pos: position{line: 557, col: 5, offset: 13272}, + pos: position{line: 557, col: 5, offset: 13253}, exprs: []any{ &litMatcher{ - pos: position{line: 557, col: 5, offset: 13272}, + pos: position{line: 557, col: 5, offset: 13253}, val: "(", ignoreCase: false, want: "\"(\"", }, &labeledExpr{ - pos: position{line: 557, col: 9, offset: 13276}, + pos: position{line: 557, col: 9, offset: 13257}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 557, col: 14, offset: 13281}, + pos: position{line: 557, col: 14, offset: 13262}, name: "Expr", }, }, &litMatcher{ - pos: position{line: 557, col: 19, offset: 13286}, + pos: position{line: 557, col: 19, offset: 13267}, val: ")", ignoreCase: false, want: "\")\"", @@ -3843,44 +3807,44 @@ var g = &grammar{ }, { name: "SampleOp", - pos: position{line: 559, col: 1, offset: 13312}, + pos: position{line: 559, col: 1, offset: 13293}, expr: &actionExpr{ - pos: position{line: 560, col: 5, offset: 13325}, + pos: position{line: 560, col: 5, offset: 13306}, run: (*parser).callonSampleOp1, expr: &seqExpr{ - pos: position{line: 560, col: 5, offset: 13325}, + pos: position{line: 560, col: 5, offset: 13306}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 560, col: 5, offset: 13325}, + pos: position{line: 560, col: 5, offset: 13306}, name: "SAMPLE", }, &andExpr{ - pos: position{line: 560, col: 12, offset: 13332}, + pos: position{line: 560, col: 12, offset: 13313}, expr: &ruleRefExpr{ - pos: position{line: 560, col: 13, offset: 13333}, + pos: position{line: 560, col: 13, offset: 13314}, name: "EOKW", }, }, &labeledExpr{ - pos: position{line: 560, col: 18, offset: 13338}, + pos: position{line: 560, col: 18, offset: 13319}, label: "expr", expr: &zeroOrOneExpr{ - pos: position{line: 560, col: 23, offset: 13343}, + pos: position{line: 560, col: 23, offset: 13324}, expr: &actionExpr{ - pos: position{line: 560, col: 24, offset: 13344}, + pos: position{line: 560, col: 24, offset: 13325}, run: (*parser).callonSampleOp8, expr: &seqExpr{ - pos: position{line: 560, col: 24, offset: 13344}, + pos: position{line: 560, col: 24, offset: 13325}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 560, col: 24, offset: 13344}, + pos: position{line: 560, col: 24, offset: 13325}, name: "_", }, &labeledExpr{ - pos: position{line: 560, col: 26, offset: 13346}, + pos: position{line: 560, col: 26, offset: 13327}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 560, col: 28, offset: 13348}, + pos: position{line: 560, col: 28, offset: 13329}, name: "Lval", }, }, @@ -3897,15 +3861,15 @@ var g = &grammar{ }, { name: "OpAssignment", - pos: position{line: 573, col: 1, offset: 13786}, + pos: position{line: 573, col: 1, offset: 13767}, expr: &actionExpr{ - pos: position{line: 574, col: 5, offset: 13803}, + pos: position{line: 574, col: 5, offset: 13784}, run: (*parser).callonOpAssignment1, expr: &labeledExpr{ - pos: position{line: 574, col: 5, offset: 13803}, + pos: position{line: 574, col: 5, offset: 13784}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 574, col: 7, offset: 13805}, + pos: position{line: 574, col: 7, offset: 13786}, name: "Assignments", }, }, @@ -3915,69 +3879,69 @@ var g = &grammar{ }, { name: "LoadOp", - pos: position{line: 582, col: 1, offset: 13977}, + pos: position{line: 582, col: 1, offset: 13958}, expr: &actionExpr{ - pos: position{line: 583, col: 5, offset: 13988}, + pos: position{line: 583, col: 5, offset: 13969}, run: (*parser).callonLoadOp1, expr: &seqExpr{ - pos: position{line: 583, col: 5, offset: 13988}, + pos: position{line: 583, col: 5, offset: 13969}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 583, col: 5, offset: 13988}, + pos: position{line: 583, col: 5, offset: 13969}, name: "LOAD", }, &ruleRefExpr{ - pos: position{line: 583, col: 10, offset: 13993}, + pos: position{line: 583, col: 10, offset: 13974}, name: "_", }, &labeledExpr{ - pos: position{line: 583, col: 12, offset: 13995}, + pos: position{line: 583, col: 12, offset: 13976}, label: "pool", expr: &ruleRefExpr{ - pos: position{line: 583, col: 17, offset: 14000}, + pos: position{line: 583, col: 17, offset: 13981}, name: "Name", }, }, &labeledExpr{ - pos: position{line: 583, col: 22, offset: 14005}, + pos: position{line: 583, col: 22, offset: 13986}, label: "branch", expr: &zeroOrOneExpr{ - pos: position{line: 583, col: 29, offset: 14012}, + pos: position{line: 583, col: 29, offset: 13993}, expr: &ruleRefExpr{ - pos: position{line: 583, col: 29, offset: 14012}, + pos: position{line: 583, col: 29, offset: 13993}, name: "PoolBranch", }, }, }, &labeledExpr{ - pos: position{line: 583, col: 41, offset: 14024}, + pos: position{line: 583, col: 41, offset: 14005}, label: "author", expr: &zeroOrOneExpr{ - pos: position{line: 583, col: 48, offset: 14031}, + pos: position{line: 583, col: 48, offset: 14012}, expr: &ruleRefExpr{ - pos: position{line: 583, col: 48, offset: 14031}, + pos: position{line: 583, col: 48, offset: 14012}, name: "AuthorArg", }, }, }, &labeledExpr{ - pos: position{line: 583, col: 59, offset: 14042}, + pos: position{line: 583, col: 59, offset: 14023}, label: "message", expr: &zeroOrOneExpr{ - pos: position{line: 583, col: 67, offset: 14050}, + pos: position{line: 583, col: 67, offset: 14031}, expr: &ruleRefExpr{ - pos: position{line: 583, col: 67, offset: 14050}, + pos: position{line: 583, col: 67, offset: 14031}, name: "MessageArg", }, }, }, &labeledExpr{ - pos: position{line: 583, col: 79, offset: 14062}, + pos: position{line: 583, col: 79, offset: 14043}, label: "meta", expr: &zeroOrOneExpr{ - pos: position{line: 583, col: 84, offset: 14067}, + pos: position{line: 583, col: 84, offset: 14048}, expr: &ruleRefExpr{ - pos: position{line: 583, col: 84, offset: 14067}, + pos: position{line: 583, col: 84, offset: 14048}, name: "MetaArg", }, }, @@ -3990,30 +3954,30 @@ var g = &grammar{ }, { name: "AuthorArg", - pos: position{line: 595, col: 1, offset: 14349}, + pos: position{line: 595, col: 1, offset: 14330}, expr: &actionExpr{ - pos: position{line: 596, col: 5, offset: 14363}, + pos: position{line: 596, col: 5, offset: 14344}, run: (*parser).callonAuthorArg1, expr: &seqExpr{ - pos: position{line: 596, col: 5, offset: 14363}, + pos: position{line: 596, col: 5, offset: 14344}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 596, col: 5, offset: 14363}, + pos: position{line: 596, col: 5, offset: 14344}, name: "_", }, &ruleRefExpr{ - pos: position{line: 596, col: 7, offset: 14365}, + pos: position{line: 596, col: 7, offset: 14346}, name: "AUTHOR", }, &ruleRefExpr{ - pos: position{line: 596, col: 14, offset: 14372}, + pos: position{line: 596, col: 14, offset: 14353}, name: "_", }, &labeledExpr{ - pos: position{line: 596, col: 16, offset: 14374}, + pos: position{line: 596, col: 16, offset: 14355}, label: "n", expr: &ruleRefExpr{ - pos: position{line: 596, col: 18, offset: 14376}, + pos: position{line: 596, col: 18, offset: 14357}, name: "Name", }, }, @@ -4025,30 +3989,30 @@ var g = &grammar{ }, { name: "MessageArg", - pos: position{line: 598, col: 1, offset: 14400}, + pos: position{line: 598, col: 1, offset: 14381}, expr: &actionExpr{ - pos: position{line: 599, col: 5, offset: 14415}, + pos: position{line: 599, col: 5, offset: 14396}, run: (*parser).callonMessageArg1, expr: &seqExpr{ - pos: position{line: 599, col: 5, offset: 14415}, + pos: position{line: 599, col: 5, offset: 14396}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 599, col: 5, offset: 14415}, + pos: position{line: 599, col: 5, offset: 14396}, name: "_", }, &ruleRefExpr{ - pos: position{line: 599, col: 7, offset: 14417}, + pos: position{line: 599, col: 7, offset: 14398}, name: "MESSAGE", }, &ruleRefExpr{ - pos: position{line: 599, col: 15, offset: 14425}, + pos: position{line: 599, col: 15, offset: 14406}, name: "_", }, &labeledExpr{ - pos: position{line: 599, col: 17, offset: 14427}, + pos: position{line: 599, col: 17, offset: 14408}, label: "n", expr: &ruleRefExpr{ - pos: position{line: 599, col: 19, offset: 14429}, + pos: position{line: 599, col: 19, offset: 14410}, name: "Name", }, }, @@ -4060,30 +4024,30 @@ var g = &grammar{ }, { name: "MetaArg", - pos: position{line: 601, col: 1, offset: 14453}, + pos: position{line: 601, col: 1, offset: 14434}, expr: &actionExpr{ - pos: position{line: 602, col: 5, offset: 14465}, + pos: position{line: 602, col: 5, offset: 14446}, run: (*parser).callonMetaArg1, expr: &seqExpr{ - pos: position{line: 602, col: 5, offset: 14465}, + pos: position{line: 602, col: 5, offset: 14446}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 602, col: 5, offset: 14465}, + pos: position{line: 602, col: 5, offset: 14446}, name: "_", }, &ruleRefExpr{ - pos: position{line: 602, col: 7, offset: 14467}, + pos: position{line: 602, col: 7, offset: 14448}, name: "META", }, &ruleRefExpr{ - pos: position{line: 602, col: 12, offset: 14472}, + pos: position{line: 602, col: 12, offset: 14453}, name: "_", }, &labeledExpr{ - pos: position{line: 602, col: 14, offset: 14474}, + pos: position{line: 602, col: 14, offset: 14455}, label: "n", expr: &ruleRefExpr{ - pos: position{line: 602, col: 16, offset: 14476}, + pos: position{line: 602, col: 16, offset: 14457}, name: "Name", }, }, @@ -4095,24 +4059,24 @@ var g = &grammar{ }, { name: "PoolBranch", - pos: position{line: 604, col: 1, offset: 14500}, + pos: position{line: 604, col: 1, offset: 14481}, expr: &actionExpr{ - pos: position{line: 605, col: 5, offset: 14515}, + pos: position{line: 605, col: 5, offset: 14496}, run: (*parser).callonPoolBranch1, expr: &seqExpr{ - pos: position{line: 605, col: 5, offset: 14515}, + pos: position{line: 605, col: 5, offset: 14496}, exprs: []any{ &litMatcher{ - pos: position{line: 605, col: 5, offset: 14515}, + pos: position{line: 605, col: 5, offset: 14496}, val: "@", ignoreCase: false, want: "\"@\"", }, &labeledExpr{ - pos: position{line: 605, col: 9, offset: 14519}, + pos: position{line: 605, col: 9, offset: 14500}, label: "branch", expr: &ruleRefExpr{ - pos: position{line: 605, col: 16, offset: 14526}, + pos: position{line: 605, col: 16, offset: 14507}, name: "Name", }, }, @@ -4124,26 +4088,26 @@ var g = &grammar{ }, { name: "OutputOp", - pos: position{line: 607, col: 1, offset: 14555}, + pos: position{line: 607, col: 1, offset: 14536}, expr: &actionExpr{ - pos: position{line: 608, col: 5, offset: 14568}, + pos: position{line: 608, col: 5, offset: 14549}, run: (*parser).callonOutputOp1, expr: &seqExpr{ - pos: position{line: 608, col: 5, offset: 14568}, + pos: position{line: 608, col: 5, offset: 14549}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 608, col: 5, offset: 14568}, + pos: position{line: 608, col: 5, offset: 14549}, name: "OUTPUT", }, &ruleRefExpr{ - pos: position{line: 608, col: 12, offset: 14575}, + pos: position{line: 608, col: 12, offset: 14556}, name: "_", }, &labeledExpr{ - pos: position{line: 608, col: 14, offset: 14577}, + pos: position{line: 608, col: 14, offset: 14558}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 608, col: 19, offset: 14582}, + pos: position{line: 608, col: 19, offset: 14563}, name: "Identifier", }, }, @@ -4155,44 +4119,44 @@ var g = &grammar{ }, { name: "DebugOp", - pos: position{line: 616, col: 1, offset: 14716}, + pos: position{line: 616, col: 1, offset: 14697}, expr: &actionExpr{ - pos: position{line: 617, col: 5, offset: 14728}, + pos: position{line: 617, col: 5, offset: 14709}, run: (*parser).callonDebugOp1, expr: &seqExpr{ - pos: position{line: 617, col: 5, offset: 14728}, + pos: position{line: 617, col: 5, offset: 14709}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 617, col: 5, offset: 14728}, + pos: position{line: 617, col: 5, offset: 14709}, name: "DEBUG", }, &andExpr{ - pos: position{line: 617, col: 11, offset: 14734}, + pos: position{line: 617, col: 11, offset: 14715}, expr: &ruleRefExpr{ - pos: position{line: 617, col: 12, offset: 14735}, + pos: position{line: 617, col: 12, offset: 14716}, name: "EOKW", }, }, &labeledExpr{ - pos: position{line: 617, col: 17, offset: 14740}, + pos: position{line: 617, col: 17, offset: 14721}, label: "expr", expr: &zeroOrOneExpr{ - pos: position{line: 617, col: 22, offset: 14745}, + pos: position{line: 617, col: 22, offset: 14726}, expr: &actionExpr{ - pos: position{line: 617, col: 23, offset: 14746}, + pos: position{line: 617, col: 23, offset: 14727}, run: (*parser).callonDebugOp8, expr: &seqExpr{ - pos: position{line: 617, col: 23, offset: 14746}, + pos: position{line: 617, col: 23, offset: 14727}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 617, col: 23, offset: 14746}, + pos: position{line: 617, col: 23, offset: 14727}, name: "_", }, &labeledExpr{ - pos: position{line: 617, col: 25, offset: 14748}, + pos: position{line: 617, col: 25, offset: 14729}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 617, col: 27, offset: 14750}, + pos: position{line: 617, col: 27, offset: 14731}, name: "Expr", }, }, @@ -4209,26 +4173,26 @@ var g = &grammar{ }, { name: "FromOp", - pos: position{line: 628, col: 1, offset: 14943}, + pos: position{line: 628, col: 1, offset: 14924}, expr: &actionExpr{ - pos: position{line: 629, col: 5, offset: 14954}, + pos: position{line: 629, col: 5, offset: 14935}, run: (*parser).callonFromOp1, expr: &seqExpr{ - pos: position{line: 629, col: 5, offset: 14954}, + pos: position{line: 629, col: 5, offset: 14935}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 629, col: 5, offset: 14954}, + pos: position{line: 629, col: 5, offset: 14935}, name: "FromKeyWord", }, &ruleRefExpr{ - pos: position{line: 629, col: 17, offset: 14966}, + pos: position{line: 629, col: 17, offset: 14947}, name: "_", }, &labeledExpr{ - pos: position{line: 629, col: 19, offset: 14968}, + pos: position{line: 629, col: 19, offset: 14949}, label: "elems", expr: &ruleRefExpr{ - pos: position{line: 629, col: 25, offset: 14974}, + pos: position{line: 629, col: 25, offset: 14955}, name: "FromElems", }, }, @@ -4240,16 +4204,16 @@ var g = &grammar{ }, { name: "FromKeyWord", - pos: position{line: 637, col: 1, offset: 15117}, + pos: position{line: 637, col: 1, offset: 15098}, expr: &choiceExpr{ - pos: position{line: 638, col: 5, offset: 15133}, + pos: position{line: 638, col: 5, offset: 15114}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 638, col: 5, offset: 15133}, + pos: position{line: 638, col: 5, offset: 15114}, name: "FROM", }, &ruleRefExpr{ - pos: position{line: 639, col: 5, offset: 15142}, + pos: position{line: 639, col: 5, offset: 15123}, name: "DeprecatedFroms", }, }, @@ -4259,24 +4223,24 @@ var g = &grammar{ }, { name: "DeprecatedFroms", - pos: position{line: 641, col: 1, offset: 15159}, + pos: position{line: 641, col: 1, offset: 15140}, expr: &choiceExpr{ - pos: position{line: 641, col: 19, offset: 15177}, + pos: position{line: 641, col: 19, offset: 15158}, alternatives: []any{ &litMatcher{ - pos: position{line: 641, col: 19, offset: 15177}, + pos: position{line: 641, col: 19, offset: 15158}, val: "get", ignoreCase: false, want: "\"get\"", }, &litMatcher{ - pos: position{line: 641, col: 27, offset: 15185}, + pos: position{line: 641, col: 27, offset: 15166}, val: "file", ignoreCase: false, want: "\"file\"", }, &litMatcher{ - pos: position{line: 641, col: 36, offset: 15194}, + pos: position{line: 641, col: 36, offset: 15175}, val: "pool", ignoreCase: false, want: "\"pool\"", @@ -4288,51 +4252,51 @@ var g = &grammar{ }, { name: "FromElems", - pos: position{line: 643, col: 1, offset: 15202}, + pos: position{line: 643, col: 1, offset: 15183}, expr: &actionExpr{ - pos: position{line: 644, col: 5, offset: 15216}, + pos: position{line: 644, col: 5, offset: 15197}, run: (*parser).callonFromElems1, expr: &seqExpr{ - pos: position{line: 644, col: 5, offset: 15216}, + pos: position{line: 644, col: 5, offset: 15197}, exprs: []any{ &labeledExpr{ - pos: position{line: 644, col: 5, offset: 15216}, + pos: position{line: 644, col: 5, offset: 15197}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 644, col: 11, offset: 15222}, + pos: position{line: 644, col: 11, offset: 15203}, name: "FromElem", }, }, &labeledExpr{ - pos: position{line: 644, col: 20, offset: 15231}, + pos: position{line: 644, col: 20, offset: 15212}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 644, col: 25, offset: 15236}, + pos: position{line: 644, col: 25, offset: 15217}, expr: &actionExpr{ - pos: position{line: 644, col: 27, offset: 15238}, + pos: position{line: 644, col: 27, offset: 15219}, run: (*parser).callonFromElems7, expr: &seqExpr{ - pos: position{line: 644, col: 27, offset: 15238}, + pos: position{line: 644, col: 27, offset: 15219}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 644, col: 27, offset: 15238}, + pos: position{line: 644, col: 27, offset: 15219}, name: "__", }, &litMatcher{ - pos: position{line: 644, col: 30, offset: 15241}, + pos: position{line: 644, col: 30, offset: 15222}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 644, col: 34, offset: 15245}, + pos: position{line: 644, col: 34, offset: 15226}, name: "__", }, &labeledExpr{ - pos: position{line: 644, col: 37, offset: 15248}, + pos: position{line: 644, col: 37, offset: 15229}, label: "elem", expr: &ruleRefExpr{ - pos: position{line: 644, col: 42, offset: 15253}, + pos: position{line: 644, col: 42, offset: 15234}, name: "FromElem", }, }, @@ -4349,42 +4313,42 @@ var g = &grammar{ }, { name: "FromElem", - pos: position{line: 648, col: 1, offset: 15337}, + pos: position{line: 648, col: 1, offset: 15318}, expr: &actionExpr{ - pos: position{line: 649, col: 5, offset: 15350}, + pos: position{line: 649, col: 5, offset: 15331}, run: (*parser).callonFromElem1, expr: &seqExpr{ - pos: position{line: 649, col: 5, offset: 15350}, + pos: position{line: 649, col: 5, offset: 15331}, exprs: []any{ &labeledExpr{ - pos: position{line: 649, col: 5, offset: 15350}, + pos: position{line: 649, col: 5, offset: 15331}, label: "entity", expr: &ruleRefExpr{ - pos: position{line: 649, col: 12, offset: 15357}, + pos: position{line: 649, col: 12, offset: 15338}, name: "FromEntity", }, }, &labeledExpr{ - pos: position{line: 649, col: 23, offset: 15368}, + pos: position{line: 649, col: 23, offset: 15349}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 649, col: 28, offset: 15373}, + pos: position{line: 649, col: 28, offset: 15354}, name: "FromArgs", }, }, &labeledExpr{ - pos: position{line: 649, col: 37, offset: 15382}, + pos: position{line: 649, col: 37, offset: 15363}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 649, col: 39, offset: 15384}, + pos: position{line: 649, col: 39, offset: 15365}, name: "OptOrdinality", }, }, &labeledExpr{ - pos: position{line: 649, col: 53, offset: 15398}, + pos: position{line: 649, col: 53, offset: 15379}, label: "alias", expr: &ruleRefExpr{ - pos: position{line: 649, col: 59, offset: 15404}, + pos: position{line: 649, col: 59, offset: 15385}, name: "OptAlias", }, }, @@ -4396,46 +4360,46 @@ var g = &grammar{ }, { name: "FromEntity", - pos: position{line: 667, col: 1, offset: 15792}, + pos: position{line: 667, col: 1, offset: 15773}, expr: &choiceExpr{ - pos: position{line: 668, col: 5, offset: 15807}, + pos: position{line: 668, col: 5, offset: 15788}, alternatives: []any{ &actionExpr{ - pos: position{line: 668, col: 5, offset: 15807}, + pos: position{line: 668, col: 5, offset: 15788}, run: (*parser).callonFromEntity2, expr: &labeledExpr{ - pos: position{line: 668, col: 5, offset: 15807}, + pos: position{line: 668, col: 5, offset: 15788}, label: "url", expr: &ruleRefExpr{ - pos: position{line: 668, col: 9, offset: 15811}, + pos: position{line: 668, col: 9, offset: 15792}, name: "UnquotedURL", }, }, }, &ruleRefExpr{ - pos: position{line: 675, col: 5, offset: 15943}, + pos: position{line: 675, col: 5, offset: 15924}, name: "Regexp", }, &ruleRefExpr{ - pos: position{line: 676, col: 5, offset: 15954}, + pos: position{line: 676, col: 5, offset: 15935}, name: "Glob", }, &actionExpr{ - pos: position{line: 677, col: 5, offset: 15963}, + pos: position{line: 677, col: 5, offset: 15944}, run: (*parser).callonFromEntity7, expr: &seqExpr{ - pos: position{line: 677, col: 5, offset: 15963}, + pos: position{line: 677, col: 5, offset: 15944}, exprs: []any{ &litMatcher{ - pos: position{line: 677, col: 5, offset: 15963}, + pos: position{line: 677, col: 5, offset: 15944}, val: "*", ignoreCase: false, want: "\"*\"", }, ¬Expr{ - pos: position{line: 677, col: 9, offset: 15967}, + pos: position{line: 677, col: 9, offset: 15948}, expr: &ruleRefExpr{ - pos: position{line: 677, col: 10, offset: 15968}, + pos: position{line: 677, col: 10, offset: 15949}, name: "ExprGuard", }, }, @@ -4443,47 +4407,47 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 678, col: 5, offset: 16049}, + pos: position{line: 678, col: 5, offset: 16030}, run: (*parser).callonFromEntity12, expr: &labeledExpr{ - pos: position{line: 678, col: 5, offset: 16049}, + pos: position{line: 678, col: 5, offset: 16030}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 678, col: 7, offset: 16051}, + pos: position{line: 678, col: 7, offset: 16032}, name: "Array", }, }, }, &actionExpr{ - pos: position{line: 685, col: 5, offset: 16189}, + pos: position{line: 685, col: 5, offset: 16170}, run: (*parser).callonFromEntity15, expr: &labeledExpr{ - pos: position{line: 685, col: 5, offset: 16189}, + pos: position{line: 685, col: 5, offset: 16170}, label: "meta", expr: &ruleRefExpr{ - pos: position{line: 685, col: 10, offset: 16194}, + pos: position{line: 685, col: 10, offset: 16175}, name: "PoolMeta", }, }, }, &actionExpr{ - pos: position{line: 692, col: 5, offset: 16337}, + pos: position{line: 692, col: 5, offset: 16318}, run: (*parser).callonFromEntity18, expr: &seqExpr{ - pos: position{line: 692, col: 5, offset: 16337}, + pos: position{line: 692, col: 5, offset: 16318}, exprs: []any{ &labeledExpr{ - pos: position{line: 692, col: 5, offset: 16337}, + pos: position{line: 692, col: 5, offset: 16318}, label: "join", expr: &ruleRefExpr{ - pos: position{line: 692, col: 10, offset: 16342}, + pos: position{line: 692, col: 10, offset: 16323}, name: "JoinOperation", }, }, ¬Expr{ - pos: position{line: 692, col: 24, offset: 16356}, + pos: position{line: 692, col: 24, offset: 16337}, expr: &ruleRefExpr{ - pos: position{line: 692, col: 25, offset: 16357}, + pos: position{line: 692, col: 25, offset: 16338}, name: "AliasClause", }, }, @@ -4491,35 +4455,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 693, col: 5, offset: 16392}, + pos: position{line: 693, col: 5, offset: 16373}, run: (*parser).callonFromEntity24, expr: &seqExpr{ - pos: position{line: 693, col: 5, offset: 16392}, + pos: position{line: 693, col: 5, offset: 16373}, exprs: []any{ &litMatcher{ - pos: position{line: 693, col: 5, offset: 16392}, + pos: position{line: 693, col: 5, offset: 16373}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 693, col: 9, offset: 16396}, + pos: position{line: 693, col: 9, offset: 16377}, name: "__", }, &labeledExpr{ - pos: position{line: 693, col: 12, offset: 16399}, + pos: position{line: 693, col: 12, offset: 16380}, label: "join", expr: &ruleRefExpr{ - pos: position{line: 693, col: 17, offset: 16404}, + pos: position{line: 693, col: 17, offset: 16385}, name: "JoinOperation", }, }, &ruleRefExpr{ - pos: position{line: 693, col: 31, offset: 16418}, + pos: position{line: 693, col: 31, offset: 16399}, name: "__", }, &litMatcher{ - pos: position{line: 693, col: 34, offset: 16421}, + pos: position{line: 693, col: 34, offset: 16402}, val: ")", ignoreCase: false, want: "\")\"", @@ -4528,35 +4492,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 694, col: 5, offset: 16450}, + pos: position{line: 694, col: 5, offset: 16431}, run: (*parser).callonFromEntity32, expr: &seqExpr{ - pos: position{line: 694, col: 5, offset: 16450}, + pos: position{line: 694, col: 5, offset: 16431}, exprs: []any{ &litMatcher{ - pos: position{line: 694, col: 5, offset: 16450}, + pos: position{line: 694, col: 5, offset: 16431}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 694, col: 9, offset: 16454}, + pos: position{line: 694, col: 9, offset: 16435}, name: "__", }, &labeledExpr{ - pos: position{line: 694, col: 12, offset: 16457}, + pos: position{line: 694, col: 12, offset: 16438}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 694, col: 14, offset: 16459}, + pos: position{line: 694, col: 14, offset: 16440}, name: "SQLPipe", }, }, &ruleRefExpr{ - pos: position{line: 694, col: 22, offset: 16467}, + pos: position{line: 694, col: 22, offset: 16448}, name: "__", }, &litMatcher{ - pos: position{line: 694, col: 25, offset: 16470}, + pos: position{line: 694, col: 25, offset: 16451}, val: ")", ignoreCase: false, want: "\")\"", @@ -4565,13 +4529,13 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 697, col: 6, offset: 16507}, + pos: position{line: 697, col: 6, offset: 16488}, run: (*parser).callonFromEntity40, expr: &labeledExpr{ - pos: position{line: 697, col: 6, offset: 16507}, + pos: position{line: 697, col: 6, offset: 16488}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 697, col: 11, offset: 16512}, + pos: position{line: 697, col: 11, offset: 16493}, name: "Name", }, }, @@ -4583,40 +4547,40 @@ var g = &grammar{ }, { name: "FromArgs", - pos: position{line: 700, col: 1, offset: 16610}, + pos: position{line: 700, col: 1, offset: 16591}, expr: &choiceExpr{ - pos: position{line: 701, col: 5, offset: 16623}, + pos: position{line: 701, col: 5, offset: 16604}, alternatives: []any{ &actionExpr{ - pos: position{line: 701, col: 5, offset: 16623}, + pos: position{line: 701, col: 5, offset: 16604}, run: (*parser).callonFromArgs2, expr: &seqExpr{ - pos: position{line: 701, col: 5, offset: 16623}, + pos: position{line: 701, col: 5, offset: 16604}, exprs: []any{ &labeledExpr{ - pos: position{line: 701, col: 5, offset: 16623}, + pos: position{line: 701, col: 5, offset: 16604}, label: "commit", expr: &ruleRefExpr{ - pos: position{line: 701, col: 12, offset: 16630}, + pos: position{line: 701, col: 12, offset: 16611}, name: "PoolCommit", }, }, &labeledExpr{ - pos: position{line: 701, col: 23, offset: 16641}, + pos: position{line: 701, col: 23, offset: 16622}, label: "meta", expr: &zeroOrOneExpr{ - pos: position{line: 701, col: 28, offset: 16646}, + pos: position{line: 701, col: 28, offset: 16627}, expr: &ruleRefExpr{ - pos: position{line: 701, col: 28, offset: 16646}, + pos: position{line: 701, col: 28, offset: 16627}, name: "PoolMeta", }, }, }, &labeledExpr{ - pos: position{line: 701, col: 38, offset: 16656}, + pos: position{line: 701, col: 38, offset: 16637}, label: "tap", expr: &ruleRefExpr{ - pos: position{line: 701, col: 42, offset: 16660}, + pos: position{line: 701, col: 42, offset: 16641}, name: "TapArg", }, }, @@ -4624,24 +4588,24 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 710, col: 5, offset: 16864}, + pos: position{line: 710, col: 5, offset: 16845}, run: (*parser).callonFromArgs11, expr: &seqExpr{ - pos: position{line: 710, col: 5, offset: 16864}, + pos: position{line: 710, col: 5, offset: 16845}, exprs: []any{ &labeledExpr{ - pos: position{line: 710, col: 5, offset: 16864}, + pos: position{line: 710, col: 5, offset: 16845}, label: "meta", expr: &ruleRefExpr{ - pos: position{line: 710, col: 10, offset: 16869}, + pos: position{line: 710, col: 10, offset: 16850}, name: "PoolMeta", }, }, &labeledExpr{ - pos: position{line: 710, col: 19, offset: 16878}, + pos: position{line: 710, col: 19, offset: 16859}, label: "tap", expr: &ruleRefExpr{ - pos: position{line: 710, col: 23, offset: 16882}, + pos: position{line: 710, col: 23, offset: 16863}, name: "TapArg", }, }, @@ -4649,41 +4613,41 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 718, col: 5, offset: 17048}, + pos: position{line: 718, col: 5, offset: 17029}, run: (*parser).callonFromArgs17, expr: &seqExpr{ - pos: position{line: 718, col: 5, offset: 17048}, + pos: position{line: 718, col: 5, offset: 17029}, exprs: []any{ &labeledExpr{ - pos: position{line: 718, col: 5, offset: 17048}, + pos: position{line: 718, col: 5, offset: 17029}, label: "format", expr: &ruleRefExpr{ - pos: position{line: 718, col: 12, offset: 17055}, + pos: position{line: 718, col: 12, offset: 17036}, name: "FormatArg", }, }, ¬Expr{ - pos: position{line: 718, col: 22, offset: 17065}, + pos: position{line: 718, col: 22, offset: 17046}, expr: &seqExpr{ - pos: position{line: 718, col: 24, offset: 17067}, + pos: position{line: 718, col: 24, offset: 17048}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 718, col: 24, offset: 17067}, + pos: position{line: 718, col: 24, offset: 17048}, name: "_", }, &choiceExpr{ - pos: position{line: 718, col: 27, offset: 17070}, + pos: position{line: 718, col: 27, offset: 17051}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 718, col: 27, offset: 17070}, + pos: position{line: 718, col: 27, offset: 17051}, name: "METHOD", }, &ruleRefExpr{ - pos: position{line: 718, col: 36, offset: 17079}, + pos: position{line: 718, col: 36, offset: 17060}, name: "HEADERS", }, &ruleRefExpr{ - pos: position{line: 718, col: 46, offset: 17089}, + pos: position{line: 718, col: 46, offset: 17070}, name: "BODY", }, }, @@ -4695,51 +4659,51 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 725, col: 5, offset: 17234}, + pos: position{line: 725, col: 5, offset: 17215}, run: (*parser).callonFromArgs28, expr: &seqExpr{ - pos: position{line: 725, col: 5, offset: 17234}, + pos: position{line: 725, col: 5, offset: 17215}, exprs: []any{ &labeledExpr{ - pos: position{line: 725, col: 5, offset: 17234}, + pos: position{line: 725, col: 5, offset: 17215}, label: "format", expr: &zeroOrOneExpr{ - pos: position{line: 725, col: 12, offset: 17241}, + pos: position{line: 725, col: 12, offset: 17222}, expr: &ruleRefExpr{ - pos: position{line: 725, col: 12, offset: 17241}, + pos: position{line: 725, col: 12, offset: 17222}, name: "FormatArg", }, }, }, &labeledExpr{ - pos: position{line: 725, col: 23, offset: 17252}, + pos: position{line: 725, col: 23, offset: 17233}, label: "method", expr: &zeroOrOneExpr{ - pos: position{line: 725, col: 30, offset: 17259}, + pos: position{line: 725, col: 30, offset: 17240}, expr: &ruleRefExpr{ - pos: position{line: 725, col: 30, offset: 17259}, + pos: position{line: 725, col: 30, offset: 17240}, name: "MethodArg", }, }, }, &labeledExpr{ - pos: position{line: 725, col: 41, offset: 17270}, + pos: position{line: 725, col: 41, offset: 17251}, label: "headers", expr: &zeroOrOneExpr{ - pos: position{line: 725, col: 49, offset: 17278}, + pos: position{line: 725, col: 49, offset: 17259}, expr: &ruleRefExpr{ - pos: position{line: 725, col: 49, offset: 17278}, + pos: position{line: 725, col: 49, offset: 17259}, name: "HeadersArg", }, }, }, &labeledExpr{ - pos: position{line: 725, col: 61, offset: 17290}, + pos: position{line: 725, col: 61, offset: 17271}, label: "body", expr: &zeroOrOneExpr{ - pos: position{line: 725, col: 66, offset: 17295}, + pos: position{line: 725, col: 66, offset: 17276}, expr: &ruleRefExpr{ - pos: position{line: 725, col: 66, offset: 17295}, + pos: position{line: 725, col: 66, offset: 17276}, name: "BodyArg", }, }, @@ -4754,30 +4718,30 @@ var g = &grammar{ }, { name: "FormatArg", - pos: position{line: 742, col: 1, offset: 17711}, + pos: position{line: 742, col: 1, offset: 17692}, expr: &actionExpr{ - pos: position{line: 742, col: 13, offset: 17723}, + pos: position{line: 742, col: 13, offset: 17704}, run: (*parser).callonFormatArg1, expr: &seqExpr{ - pos: position{line: 742, col: 13, offset: 17723}, + pos: position{line: 742, col: 13, offset: 17704}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 742, col: 13, offset: 17723}, + pos: position{line: 742, col: 13, offset: 17704}, name: "_", }, &ruleRefExpr{ - pos: position{line: 742, col: 15, offset: 17725}, + pos: position{line: 742, col: 15, offset: 17706}, name: "FORMAT", }, &ruleRefExpr{ - pos: position{line: 742, col: 22, offset: 17732}, + pos: position{line: 742, col: 22, offset: 17713}, name: "_", }, &labeledExpr{ - pos: position{line: 742, col: 24, offset: 17734}, + pos: position{line: 742, col: 24, offset: 17715}, label: "n", expr: &ruleRefExpr{ - pos: position{line: 742, col: 26, offset: 17736}, + pos: position{line: 742, col: 26, offset: 17717}, name: "Name", }, }, @@ -4789,30 +4753,30 @@ var g = &grammar{ }, { name: "MethodArg", - pos: position{line: 744, col: 1, offset: 17760}, + pos: position{line: 744, col: 1, offset: 17741}, expr: &actionExpr{ - pos: position{line: 744, col: 13, offset: 17772}, + pos: position{line: 744, col: 13, offset: 17753}, run: (*parser).callonMethodArg1, expr: &seqExpr{ - pos: position{line: 744, col: 13, offset: 17772}, + pos: position{line: 744, col: 13, offset: 17753}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 744, col: 13, offset: 17772}, + pos: position{line: 744, col: 13, offset: 17753}, name: "_", }, &ruleRefExpr{ - pos: position{line: 744, col: 15, offset: 17774}, + pos: position{line: 744, col: 15, offset: 17755}, name: "METHOD", }, &ruleRefExpr{ - pos: position{line: 744, col: 22, offset: 17781}, + pos: position{line: 744, col: 22, offset: 17762}, name: "_", }, &labeledExpr{ - pos: position{line: 744, col: 24, offset: 17783}, + pos: position{line: 744, col: 24, offset: 17764}, label: "n", expr: &ruleRefExpr{ - pos: position{line: 744, col: 26, offset: 17785}, + pos: position{line: 744, col: 26, offset: 17766}, name: "Name", }, }, @@ -4824,30 +4788,30 @@ var g = &grammar{ }, { name: "HeadersArg", - pos: position{line: 746, col: 1, offset: 17809}, + pos: position{line: 746, col: 1, offset: 17790}, expr: &actionExpr{ - pos: position{line: 746, col: 14, offset: 17822}, + pos: position{line: 746, col: 14, offset: 17803}, run: (*parser).callonHeadersArg1, expr: &seqExpr{ - pos: position{line: 746, col: 14, offset: 17822}, + pos: position{line: 746, col: 14, offset: 17803}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 746, col: 14, offset: 17822}, + pos: position{line: 746, col: 14, offset: 17803}, name: "_", }, &ruleRefExpr{ - pos: position{line: 746, col: 16, offset: 17824}, + pos: position{line: 746, col: 16, offset: 17805}, name: "HEADERS", }, &ruleRefExpr{ - pos: position{line: 746, col: 24, offset: 17832}, + pos: position{line: 746, col: 24, offset: 17813}, name: "_", }, &labeledExpr{ - pos: position{line: 746, col: 26, offset: 17834}, + pos: position{line: 746, col: 26, offset: 17815}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 746, col: 28, offset: 17836}, + pos: position{line: 746, col: 28, offset: 17817}, name: "Record", }, }, @@ -4859,30 +4823,30 @@ var g = &grammar{ }, { name: "BodyArg", - pos: position{line: 748, col: 1, offset: 17862}, + pos: position{line: 748, col: 1, offset: 17843}, expr: &actionExpr{ - pos: position{line: 748, col: 11, offset: 17872}, + pos: position{line: 748, col: 11, offset: 17853}, run: (*parser).callonBodyArg1, expr: &seqExpr{ - pos: position{line: 748, col: 11, offset: 17872}, + pos: position{line: 748, col: 11, offset: 17853}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 748, col: 11, offset: 17872}, + pos: position{line: 748, col: 11, offset: 17853}, name: "_", }, &ruleRefExpr{ - pos: position{line: 748, col: 13, offset: 17874}, + pos: position{line: 748, col: 13, offset: 17855}, name: "BODY", }, &ruleRefExpr{ - pos: position{line: 748, col: 18, offset: 17879}, + pos: position{line: 748, col: 18, offset: 17860}, name: "_", }, &labeledExpr{ - pos: position{line: 748, col: 20, offset: 17881}, + pos: position{line: 748, col: 20, offset: 17862}, label: "n", expr: &ruleRefExpr{ - pos: position{line: 748, col: 22, offset: 17883}, + pos: position{line: 748, col: 22, offset: 17864}, name: "Name", }, }, @@ -4894,24 +4858,24 @@ var g = &grammar{ }, { name: "UnquotedURL", - pos: position{line: 750, col: 1, offset: 17907}, + pos: position{line: 750, col: 1, offset: 17888}, expr: &actionExpr{ - pos: position{line: 750, col: 15, offset: 17921}, + pos: position{line: 750, col: 15, offset: 17902}, run: (*parser).callonUnquotedURL1, expr: &seqExpr{ - pos: position{line: 750, col: 15, offset: 17921}, + pos: position{line: 750, col: 15, offset: 17902}, exprs: []any{ &choiceExpr{ - pos: position{line: 750, col: 16, offset: 17922}, + pos: position{line: 750, col: 16, offset: 17903}, alternatives: []any{ &litMatcher{ - pos: position{line: 750, col: 16, offset: 17922}, + pos: position{line: 750, col: 16, offset: 17903}, val: "http://", ignoreCase: false, want: "\"http://\"", }, &litMatcher{ - pos: position{line: 750, col: 28, offset: 17934}, + pos: position{line: 750, col: 28, offset: 17915}, val: "https://", ignoreCase: false, want: "\"https://\"", @@ -4919,9 +4883,9 @@ var g = &grammar{ }, }, &oneOrMoreExpr{ - pos: position{line: 750, col: 40, offset: 17946}, + pos: position{line: 750, col: 40, offset: 17927}, expr: &ruleRefExpr{ - pos: position{line: 750, col: 40, offset: 17946}, + pos: position{line: 750, col: 40, offset: 17927}, name: "URLChar", }, }, @@ -4933,9 +4897,9 @@ var g = &grammar{ }, { name: "URLChar", - pos: position{line: 752, col: 1, offset: 17987}, + pos: position{line: 752, col: 1, offset: 17968}, expr: &charClassMatcher{ - pos: position{line: 752, col: 11, offset: 17997}, + pos: position{line: 752, col: 11, offset: 17978}, val: "[0-9a-zA-Z!@$%&_=,./?:[\\]~+-]", chars: []rune{'!', '@', '$', '%', '&', '_', '=', ',', '.', '/', '?', ':', '[', ']', '~', '+', '-'}, ranges: []rune{'0', '9', 'a', 'z', 'A', 'Z'}, @@ -4947,30 +4911,30 @@ var g = &grammar{ }, { name: "PoolAt", - pos: position{line: 755, col: 1, offset: 18061}, + pos: position{line: 755, col: 1, offset: 18042}, expr: &actionExpr{ - pos: position{line: 756, col: 5, offset: 18072}, + pos: position{line: 756, col: 5, offset: 18053}, run: (*parser).callonPoolAt1, expr: &seqExpr{ - pos: position{line: 756, col: 5, offset: 18072}, + pos: position{line: 756, col: 5, offset: 18053}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 756, col: 5, offset: 18072}, + pos: position{line: 756, col: 5, offset: 18053}, name: "_", }, &ruleRefExpr{ - pos: position{line: 756, col: 7, offset: 18074}, + pos: position{line: 756, col: 7, offset: 18055}, name: "AT", }, &ruleRefExpr{ - pos: position{line: 756, col: 10, offset: 18077}, + pos: position{line: 756, col: 10, offset: 18058}, name: "_", }, &labeledExpr{ - pos: position{line: 756, col: 12, offset: 18079}, + pos: position{line: 756, col: 12, offset: 18060}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 756, col: 15, offset: 18082}, + pos: position{line: 756, col: 15, offset: 18063}, name: "KSUID", }, }, @@ -4982,14 +4946,14 @@ var g = &grammar{ }, { name: "KSUID", - pos: position{line: 759, col: 1, offset: 18148}, + pos: position{line: 759, col: 1, offset: 18129}, expr: &actionExpr{ - pos: position{line: 759, col: 9, offset: 18156}, + pos: position{line: 759, col: 9, offset: 18137}, run: (*parser).callonKSUID1, expr: &oneOrMoreExpr{ - pos: position{line: 759, col: 9, offset: 18156}, + pos: position{line: 759, col: 9, offset: 18137}, expr: &charClassMatcher{ - pos: position{line: 759, col: 10, offset: 18157}, + pos: position{line: 759, col: 10, offset: 18138}, val: "[0-9a-zA-Z]", ranges: []rune{'0', '9', 'a', 'z', 'A', 'Z'}, ignoreCase: false, @@ -5002,24 +4966,24 @@ var g = &grammar{ }, { name: "PoolCommit", - pos: position{line: 761, col: 1, offset: 18203}, + pos: position{line: 761, col: 1, offset: 18184}, expr: &actionExpr{ - pos: position{line: 762, col: 5, offset: 18218}, + pos: position{line: 762, col: 5, offset: 18199}, run: (*parser).callonPoolCommit1, expr: &seqExpr{ - pos: position{line: 762, col: 5, offset: 18218}, + pos: position{line: 762, col: 5, offset: 18199}, exprs: []any{ &litMatcher{ - pos: position{line: 762, col: 5, offset: 18218}, + pos: position{line: 762, col: 5, offset: 18199}, val: "@", ignoreCase: false, want: "\"@\"", }, &labeledExpr{ - pos: position{line: 762, col: 9, offset: 18222}, + pos: position{line: 762, col: 9, offset: 18203}, label: "n", expr: &ruleRefExpr{ - pos: position{line: 762, col: 11, offset: 18224}, + pos: position{line: 762, col: 11, offset: 18205}, name: "Name", }, }, @@ -5031,24 +4995,24 @@ var g = &grammar{ }, { name: "PoolMeta", - pos: position{line: 764, col: 1, offset: 18248}, + pos: position{line: 764, col: 1, offset: 18229}, expr: &actionExpr{ - pos: position{line: 765, col: 5, offset: 18261}, + pos: position{line: 765, col: 5, offset: 18242}, run: (*parser).callonPoolMeta1, expr: &seqExpr{ - pos: position{line: 765, col: 5, offset: 18261}, + pos: position{line: 765, col: 5, offset: 18242}, exprs: []any{ &litMatcher{ - pos: position{line: 765, col: 5, offset: 18261}, + pos: position{line: 765, col: 5, offset: 18242}, val: ":", ignoreCase: false, want: "\":\"", }, &labeledExpr{ - pos: position{line: 765, col: 9, offset: 18265}, + pos: position{line: 765, col: 9, offset: 18246}, label: "n", expr: &ruleRefExpr{ - pos: position{line: 765, col: 11, offset: 18267}, + pos: position{line: 765, col: 11, offset: 18248}, name: "Name", }, }, @@ -5060,51 +5024,51 @@ var g = &grammar{ }, { name: "SortExprs", - pos: position{line: 767, col: 1, offset: 18291}, + pos: position{line: 767, col: 1, offset: 18272}, expr: &actionExpr{ - pos: position{line: 768, col: 5, offset: 18305}, + pos: position{line: 768, col: 5, offset: 18286}, run: (*parser).callonSortExprs1, expr: &seqExpr{ - pos: position{line: 768, col: 5, offset: 18305}, + pos: position{line: 768, col: 5, offset: 18286}, exprs: []any{ &labeledExpr{ - pos: position{line: 768, col: 5, offset: 18305}, + pos: position{line: 768, col: 5, offset: 18286}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 768, col: 11, offset: 18311}, + pos: position{line: 768, col: 11, offset: 18292}, name: "SortExpr", }, }, &labeledExpr{ - pos: position{line: 768, col: 20, offset: 18320}, + pos: position{line: 768, col: 20, offset: 18301}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 768, col: 25, offset: 18325}, + pos: position{line: 768, col: 25, offset: 18306}, expr: &actionExpr{ - pos: position{line: 768, col: 26, offset: 18326}, + pos: position{line: 768, col: 26, offset: 18307}, run: (*parser).callonSortExprs7, expr: &seqExpr{ - pos: position{line: 768, col: 26, offset: 18326}, + pos: position{line: 768, col: 26, offset: 18307}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 768, col: 26, offset: 18326}, + pos: position{line: 768, col: 26, offset: 18307}, name: "__", }, &litMatcher{ - pos: position{line: 768, col: 29, offset: 18329}, + pos: position{line: 768, col: 29, offset: 18310}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 768, col: 33, offset: 18333}, + pos: position{line: 768, col: 33, offset: 18314}, name: "__", }, &labeledExpr{ - pos: position{line: 768, col: 36, offset: 18336}, + pos: position{line: 768, col: 36, offset: 18317}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 768, col: 38, offset: 18338}, + pos: position{line: 768, col: 38, offset: 18319}, name: "SortExpr", }, }, @@ -5121,41 +5085,41 @@ var g = &grammar{ }, { name: "SortExpr", - pos: position{line: 772, col: 1, offset: 18415}, + pos: position{line: 772, col: 1, offset: 18396}, expr: &actionExpr{ - pos: position{line: 773, col: 5, offset: 18428}, + pos: position{line: 773, col: 5, offset: 18409}, run: (*parser).callonSortExpr1, expr: &seqExpr{ - pos: position{line: 773, col: 5, offset: 18428}, + pos: position{line: 773, col: 5, offset: 18409}, exprs: []any{ &labeledExpr{ - pos: position{line: 773, col: 5, offset: 18428}, + pos: position{line: 773, col: 5, offset: 18409}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 773, col: 7, offset: 18430}, + pos: position{line: 773, col: 7, offset: 18411}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 773, col: 12, offset: 18435}, + pos: position{line: 773, col: 12, offset: 18416}, label: "order", expr: &zeroOrOneExpr{ - pos: position{line: 773, col: 18, offset: 18441}, + pos: position{line: 773, col: 18, offset: 18422}, expr: &actionExpr{ - pos: position{line: 773, col: 19, offset: 18442}, + pos: position{line: 773, col: 19, offset: 18423}, run: (*parser).callonSortExpr7, expr: &seqExpr{ - pos: position{line: 773, col: 19, offset: 18442}, + pos: position{line: 773, col: 19, offset: 18423}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 773, col: 19, offset: 18442}, + pos: position{line: 773, col: 19, offset: 18423}, name: "_", }, &labeledExpr{ - pos: position{line: 773, col: 21, offset: 18444}, + pos: position{line: 773, col: 21, offset: 18425}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 773, col: 23, offset: 18446}, + pos: position{line: 773, col: 23, offset: 18427}, name: "OrderSpec", }, }, @@ -5172,22 +5136,22 @@ var g = &grammar{ }, { name: "OrderSpec", - pos: position{line: 781, col: 1, offset: 18645}, + pos: position{line: 781, col: 1, offset: 18626}, expr: &actionExpr{ - pos: position{line: 782, col: 5, offset: 18659}, + pos: position{line: 782, col: 5, offset: 18640}, run: (*parser).callonOrderSpec1, expr: &labeledExpr{ - pos: position{line: 782, col: 5, offset: 18659}, + pos: position{line: 782, col: 5, offset: 18640}, label: "o", expr: &choiceExpr{ - pos: position{line: 782, col: 8, offset: 18662}, + pos: position{line: 782, col: 8, offset: 18643}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 782, col: 8, offset: 18662}, + pos: position{line: 782, col: 8, offset: 18643}, name: "ASC", }, &ruleRefExpr{ - pos: position{line: 782, col: 14, offset: 18668}, + pos: position{line: 782, col: 14, offset: 18649}, name: "DESC", }, }, @@ -5199,32 +5163,32 @@ var g = &grammar{ }, { name: "TapArg", - pos: position{line: 786, col: 1, offset: 18752}, + pos: position{line: 786, col: 1, offset: 18733}, expr: &choiceExpr{ - pos: position{line: 787, col: 5, offset: 18763}, + pos: position{line: 787, col: 5, offset: 18744}, alternatives: []any{ &actionExpr{ - pos: position{line: 787, col: 5, offset: 18763}, + pos: position{line: 787, col: 5, offset: 18744}, run: (*parser).callonTapArg2, expr: &seqExpr{ - pos: position{line: 787, col: 5, offset: 18763}, + pos: position{line: 787, col: 5, offset: 18744}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 787, col: 5, offset: 18763}, + pos: position{line: 787, col: 5, offset: 18744}, name: "_", }, &ruleRefExpr{ - pos: position{line: 787, col: 7, offset: 18765}, + pos: position{line: 787, col: 7, offset: 18746}, name: "TAP", }, }, }, }, &actionExpr{ - pos: position{line: 788, col: 5, offset: 18794}, + pos: position{line: 788, col: 5, offset: 18775}, run: (*parser).callonTapArg6, expr: &litMatcher{ - pos: position{line: 788, col: 5, offset: 18794}, + pos: position{line: 788, col: 5, offset: 18775}, val: "", ignoreCase: false, want: "\"\"", @@ -5237,28 +5201,28 @@ var g = &grammar{ }, { name: "PassOp", - pos: position{line: 790, col: 1, offset: 18820}, + pos: position{line: 790, col: 1, offset: 18801}, expr: &actionExpr{ - pos: position{line: 791, col: 5, offset: 18831}, + pos: position{line: 791, col: 5, offset: 18812}, run: (*parser).callonPassOp1, expr: &seqExpr{ - pos: position{line: 791, col: 5, offset: 18831}, + pos: position{line: 791, col: 5, offset: 18812}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 791, col: 5, offset: 18831}, + pos: position{line: 791, col: 5, offset: 18812}, name: "PASS", }, ¬Expr{ - pos: position{line: 791, col: 10, offset: 18836}, + pos: position{line: 791, col: 10, offset: 18817}, expr: &seqExpr{ - pos: position{line: 791, col: 12, offset: 18838}, + pos: position{line: 791, col: 12, offset: 18819}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 791, col: 12, offset: 18838}, + pos: position{line: 791, col: 12, offset: 18819}, name: "__", }, &litMatcher{ - pos: position{line: 791, col: 15, offset: 18841}, + pos: position{line: 791, col: 15, offset: 18822}, val: "(", ignoreCase: false, want: "\"(\"", @@ -5267,9 +5231,9 @@ var g = &grammar{ }, }, &andExpr{ - pos: position{line: 791, col: 20, offset: 18846}, + pos: position{line: 791, col: 20, offset: 18827}, expr: &ruleRefExpr{ - pos: position{line: 791, col: 21, offset: 18847}, + pos: position{line: 791, col: 21, offset: 18828}, name: "EOKW", }, }, @@ -5281,44 +5245,44 @@ var g = &grammar{ }, { name: "ExplodeOp", - pos: position{line: 797, col: 1, offset: 19038}, + pos: position{line: 797, col: 1, offset: 19019}, expr: &actionExpr{ - pos: position{line: 798, col: 5, offset: 19052}, + pos: position{line: 798, col: 5, offset: 19033}, run: (*parser).callonExplodeOp1, expr: &seqExpr{ - pos: position{line: 798, col: 5, offset: 19052}, + pos: position{line: 798, col: 5, offset: 19033}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 798, col: 5, offset: 19052}, + pos: position{line: 798, col: 5, offset: 19033}, name: "EXPLODE", }, &ruleRefExpr{ - pos: position{line: 798, col: 13, offset: 19060}, + pos: position{line: 798, col: 13, offset: 19041}, name: "_", }, &labeledExpr{ - pos: position{line: 798, col: 15, offset: 19062}, + pos: position{line: 798, col: 15, offset: 19043}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 798, col: 20, offset: 19067}, + pos: position{line: 798, col: 20, offset: 19048}, name: "Exprs", }, }, &labeledExpr{ - pos: position{line: 798, col: 26, offset: 19073}, + pos: position{line: 798, col: 26, offset: 19054}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 798, col: 30, offset: 19077}, + pos: position{line: 798, col: 30, offset: 19058}, name: "TypeArg", }, }, &labeledExpr{ - pos: position{line: 798, col: 38, offset: 19085}, + pos: position{line: 798, col: 38, offset: 19066}, label: "as", expr: &zeroOrOneExpr{ - pos: position{line: 798, col: 41, offset: 19088}, + pos: position{line: 798, col: 41, offset: 19069}, expr: &ruleRefExpr{ - pos: position{line: 798, col: 41, offset: 19088}, + pos: position{line: 798, col: 41, offset: 19069}, name: "AsArg", }, }, @@ -5331,26 +5295,26 @@ var g = &grammar{ }, { name: "MergeOp", - pos: position{line: 811, col: 1, offset: 19330}, + pos: position{line: 811, col: 1, offset: 19311}, expr: &actionExpr{ - pos: position{line: 812, col: 5, offset: 19342}, + pos: position{line: 812, col: 5, offset: 19323}, run: (*parser).callonMergeOp1, expr: &seqExpr{ - pos: position{line: 812, col: 5, offset: 19342}, + pos: position{line: 812, col: 5, offset: 19323}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 812, col: 5, offset: 19342}, + pos: position{line: 812, col: 5, offset: 19323}, name: "MERGE", }, &ruleRefExpr{ - pos: position{line: 812, col: 11, offset: 19348}, + pos: position{line: 812, col: 11, offset: 19329}, name: "_", }, &labeledExpr{ - pos: position{line: 812, col: 13, offset: 19350}, + pos: position{line: 812, col: 13, offset: 19331}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 812, col: 18, offset: 19355}, + pos: position{line: 812, col: 18, offset: 19336}, name: "Expr", }, }, @@ -5362,47 +5326,47 @@ var g = &grammar{ }, { name: "OverOp", - pos: position{line: 820, col: 1, offset: 19482}, + pos: position{line: 820, col: 1, offset: 19463}, expr: &actionExpr{ - pos: position{line: 821, col: 5, offset: 19493}, + pos: position{line: 821, col: 5, offset: 19474}, run: (*parser).callonOverOp1, expr: &seqExpr{ - pos: position{line: 821, col: 5, offset: 19493}, + pos: position{line: 821, col: 5, offset: 19474}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 821, col: 5, offset: 19493}, + pos: position{line: 821, col: 5, offset: 19474}, name: "OVER", }, &ruleRefExpr{ - pos: position{line: 821, col: 10, offset: 19498}, + pos: position{line: 821, col: 10, offset: 19479}, name: "_", }, &labeledExpr{ - pos: position{line: 821, col: 12, offset: 19500}, + pos: position{line: 821, col: 12, offset: 19481}, label: "exprs", expr: &ruleRefExpr{ - pos: position{line: 821, col: 18, offset: 19506}, + pos: position{line: 821, col: 18, offset: 19487}, name: "Exprs", }, }, &labeledExpr{ - pos: position{line: 821, col: 24, offset: 19512}, + pos: position{line: 821, col: 24, offset: 19493}, label: "locals", expr: &zeroOrOneExpr{ - pos: position{line: 821, col: 31, offset: 19519}, + pos: position{line: 821, col: 31, offset: 19500}, expr: &ruleRefExpr{ - pos: position{line: 821, col: 31, offset: 19519}, + pos: position{line: 821, col: 31, offset: 19500}, name: "Locals", }, }, }, &labeledExpr{ - pos: position{line: 821, col: 39, offset: 19527}, + pos: position{line: 821, col: 39, offset: 19508}, label: "body", expr: &zeroOrOneExpr{ - pos: position{line: 821, col: 44, offset: 19532}, + pos: position{line: 821, col: 44, offset: 19513}, expr: &ruleRefExpr{ - pos: position{line: 821, col: 44, offset: 19532}, + pos: position{line: 821, col: 44, offset: 19513}, name: "Lateral", }, }, @@ -5415,54 +5379,54 @@ var g = &grammar{ }, { name: "Lateral", - pos: position{line: 836, col: 1, offset: 19857}, + pos: position{line: 836, col: 1, offset: 19838}, expr: &choiceExpr{ - pos: position{line: 837, col: 5, offset: 19869}, + pos: position{line: 837, col: 5, offset: 19850}, alternatives: []any{ &actionExpr{ - pos: position{line: 837, col: 5, offset: 19869}, + pos: position{line: 837, col: 5, offset: 19850}, run: (*parser).callonLateral2, expr: &seqExpr{ - pos: position{line: 837, col: 5, offset: 19869}, + pos: position{line: 837, col: 5, offset: 19850}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 837, col: 5, offset: 19869}, + pos: position{line: 837, col: 5, offset: 19850}, name: "__", }, &litMatcher{ - pos: position{line: 837, col: 8, offset: 19872}, + pos: position{line: 837, col: 8, offset: 19853}, val: "=>", ignoreCase: false, want: "\"=>\"", }, &ruleRefExpr{ - pos: position{line: 837, col: 13, offset: 19877}, + pos: position{line: 837, col: 13, offset: 19858}, name: "__", }, &litMatcher{ - pos: position{line: 837, col: 16, offset: 19880}, + pos: position{line: 837, col: 16, offset: 19861}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 837, col: 20, offset: 19884}, + pos: position{line: 837, col: 20, offset: 19865}, name: "__", }, &labeledExpr{ - pos: position{line: 837, col: 23, offset: 19887}, + pos: position{line: 837, col: 23, offset: 19868}, label: "scope", expr: &ruleRefExpr{ - pos: position{line: 837, col: 29, offset: 19893}, + pos: position{line: 837, col: 29, offset: 19874}, name: "Scope", }, }, &ruleRefExpr{ - pos: position{line: 837, col: 35, offset: 19899}, + pos: position{line: 837, col: 35, offset: 19880}, name: "__", }, &litMatcher{ - pos: position{line: 837, col: 38, offset: 19902}, + pos: position{line: 837, col: 38, offset: 19883}, val: ")", ignoreCase: false, want: "\")\"", @@ -5471,49 +5435,49 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 840, col: 5, offset: 19983}, + pos: position{line: 840, col: 5, offset: 19964}, run: (*parser).callonLateral13, expr: &seqExpr{ - pos: position{line: 840, col: 5, offset: 19983}, + pos: position{line: 840, col: 5, offset: 19964}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 840, col: 5, offset: 19983}, + pos: position{line: 840, col: 5, offset: 19964}, name: "__", }, &litMatcher{ - pos: position{line: 840, col: 8, offset: 19986}, + pos: position{line: 840, col: 8, offset: 19967}, val: "=>", ignoreCase: false, want: "\"=>\"", }, &ruleRefExpr{ - pos: position{line: 840, col: 13, offset: 19991}, + pos: position{line: 840, col: 13, offset: 19972}, name: "__", }, &litMatcher{ - pos: position{line: 840, col: 16, offset: 19994}, + pos: position{line: 840, col: 16, offset: 19975}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 840, col: 20, offset: 19998}, + pos: position{line: 840, col: 20, offset: 19979}, name: "__", }, &labeledExpr{ - pos: position{line: 840, col: 23, offset: 20001}, + pos: position{line: 840, col: 23, offset: 19982}, label: "seq", expr: &ruleRefExpr{ - pos: position{line: 840, col: 27, offset: 20005}, + pos: position{line: 840, col: 27, offset: 19986}, name: "Seq", }, }, &ruleRefExpr{ - pos: position{line: 840, col: 31, offset: 20009}, + pos: position{line: 840, col: 31, offset: 19990}, name: "__", }, &litMatcher{ - pos: position{line: 840, col: 34, offset: 20012}, + pos: position{line: 840, col: 34, offset: 19993}, val: ")", ignoreCase: false, want: "\")\"", @@ -5528,63 +5492,63 @@ var g = &grammar{ }, { name: "Locals", - pos: position{line: 844, col: 1, offset: 20068}, + pos: position{line: 844, col: 1, offset: 20049}, expr: &actionExpr{ - pos: position{line: 845, col: 5, offset: 20079}, + pos: position{line: 845, col: 5, offset: 20060}, run: (*parser).callonLocals1, expr: &seqExpr{ - pos: position{line: 845, col: 5, offset: 20079}, + pos: position{line: 845, col: 5, offset: 20060}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 845, col: 5, offset: 20079}, + pos: position{line: 845, col: 5, offset: 20060}, name: "_", }, &ruleRefExpr{ - pos: position{line: 845, col: 7, offset: 20081}, + pos: position{line: 845, col: 7, offset: 20062}, name: "WITH", }, &ruleRefExpr{ - pos: position{line: 845, col: 12, offset: 20086}, + pos: position{line: 845, col: 12, offset: 20067}, name: "_", }, &labeledExpr{ - pos: position{line: 845, col: 14, offset: 20088}, + pos: position{line: 845, col: 14, offset: 20069}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 845, col: 20, offset: 20094}, + pos: position{line: 845, col: 20, offset: 20075}, name: "LocalsAssignment", }, }, &labeledExpr{ - pos: position{line: 845, col: 37, offset: 20111}, + pos: position{line: 845, col: 37, offset: 20092}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 845, col: 42, offset: 20116}, + pos: position{line: 845, col: 42, offset: 20097}, expr: &actionExpr{ - pos: position{line: 845, col: 43, offset: 20117}, + pos: position{line: 845, col: 43, offset: 20098}, run: (*parser).callonLocals10, expr: &seqExpr{ - pos: position{line: 845, col: 43, offset: 20117}, + pos: position{line: 845, col: 43, offset: 20098}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 845, col: 43, offset: 20117}, + pos: position{line: 845, col: 43, offset: 20098}, name: "__", }, &litMatcher{ - pos: position{line: 845, col: 46, offset: 20120}, + pos: position{line: 845, col: 46, offset: 20101}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 845, col: 50, offset: 20124}, + pos: position{line: 845, col: 50, offset: 20105}, name: "__", }, &labeledExpr{ - pos: position{line: 845, col: 53, offset: 20127}, + pos: position{line: 845, col: 53, offset: 20108}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 845, col: 55, offset: 20129}, + pos: position{line: 845, col: 55, offset: 20110}, name: "LocalsAssignment", }, }, @@ -5601,45 +5565,45 @@ var g = &grammar{ }, { name: "LocalsAssignment", - pos: position{line: 849, col: 1, offset: 20214}, + pos: position{line: 849, col: 1, offset: 20195}, expr: &actionExpr{ - pos: position{line: 850, col: 5, offset: 20235}, + pos: position{line: 850, col: 5, offset: 20216}, run: (*parser).callonLocalsAssignment1, expr: &seqExpr{ - pos: position{line: 850, col: 5, offset: 20235}, + pos: position{line: 850, col: 5, offset: 20216}, exprs: []any{ &labeledExpr{ - pos: position{line: 850, col: 5, offset: 20235}, + pos: position{line: 850, col: 5, offset: 20216}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 850, col: 10, offset: 20240}, + pos: position{line: 850, col: 10, offset: 20221}, name: "Identifier", }, }, &labeledExpr{ - pos: position{line: 850, col: 21, offset: 20251}, + pos: position{line: 850, col: 21, offset: 20232}, label: "opt", expr: &zeroOrOneExpr{ - pos: position{line: 850, col: 25, offset: 20255}, + pos: position{line: 850, col: 25, offset: 20236}, expr: &seqExpr{ - pos: position{line: 850, col: 26, offset: 20256}, + pos: position{line: 850, col: 26, offset: 20237}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 850, col: 26, offset: 20256}, + pos: position{line: 850, col: 26, offset: 20237}, name: "__", }, &litMatcher{ - pos: position{line: 850, col: 29, offset: 20259}, + pos: position{line: 850, col: 29, offset: 20240}, val: "=", ignoreCase: false, want: "\"=\"", }, &ruleRefExpr{ - pos: position{line: 850, col: 33, offset: 20263}, + pos: position{line: 850, col: 33, offset: 20244}, name: "__", }, &ruleRefExpr{ - pos: position{line: 850, col: 36, offset: 20266}, + pos: position{line: 850, col: 36, offset: 20247}, name: "Expr", }, }, @@ -5654,26 +5618,26 @@ var g = &grammar{ }, { name: "YieldOp", - pos: position{line: 862, col: 1, offset: 20490}, + pos: position{line: 862, col: 1, offset: 20471}, expr: &actionExpr{ - pos: position{line: 863, col: 5, offset: 20502}, + pos: position{line: 863, col: 5, offset: 20483}, run: (*parser).callonYieldOp1, expr: &seqExpr{ - pos: position{line: 863, col: 5, offset: 20502}, + pos: position{line: 863, col: 5, offset: 20483}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 863, col: 5, offset: 20502}, + pos: position{line: 863, col: 5, offset: 20483}, name: "YIELD", }, &ruleRefExpr{ - pos: position{line: 863, col: 11, offset: 20508}, + pos: position{line: 863, col: 11, offset: 20489}, name: "_", }, &labeledExpr{ - pos: position{line: 863, col: 13, offset: 20510}, + pos: position{line: 863, col: 13, offset: 20491}, label: "exprs", expr: &ruleRefExpr{ - pos: position{line: 863, col: 19, offset: 20516}, + pos: position{line: 863, col: 19, offset: 20497}, name: "Exprs", }, }, @@ -5685,30 +5649,30 @@ var g = &grammar{ }, { name: "TypeArg", - pos: position{line: 871, col: 1, offset: 20660}, + pos: position{line: 871, col: 1, offset: 20641}, expr: &actionExpr{ - pos: position{line: 872, col: 5, offset: 20672}, + pos: position{line: 872, col: 5, offset: 20653}, run: (*parser).callonTypeArg1, expr: &seqExpr{ - pos: position{line: 872, col: 5, offset: 20672}, + pos: position{line: 872, col: 5, offset: 20653}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 872, col: 5, offset: 20672}, + pos: position{line: 872, col: 5, offset: 20653}, name: "_", }, &ruleRefExpr{ - pos: position{line: 872, col: 7, offset: 20674}, + pos: position{line: 872, col: 7, offset: 20655}, name: "BY", }, &ruleRefExpr{ - pos: position{line: 872, col: 10, offset: 20677}, + pos: position{line: 872, col: 10, offset: 20658}, name: "_", }, &labeledExpr{ - pos: position{line: 872, col: 12, offset: 20679}, + pos: position{line: 872, col: 12, offset: 20660}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 872, col: 16, offset: 20683}, + pos: position{line: 872, col: 16, offset: 20664}, name: "Type", }, }, @@ -5720,30 +5684,30 @@ var g = &grammar{ }, { name: "AsArg", - pos: position{line: 874, col: 1, offset: 20709}, + pos: position{line: 874, col: 1, offset: 20690}, expr: &actionExpr{ - pos: position{line: 875, col: 5, offset: 20719}, + pos: position{line: 875, col: 5, offset: 20700}, run: (*parser).callonAsArg1, expr: &seqExpr{ - pos: position{line: 875, col: 5, offset: 20719}, + pos: position{line: 875, col: 5, offset: 20700}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 875, col: 5, offset: 20719}, + pos: position{line: 875, col: 5, offset: 20700}, name: "_", }, &ruleRefExpr{ - pos: position{line: 875, col: 7, offset: 20721}, + pos: position{line: 875, col: 7, offset: 20702}, name: "AS", }, &ruleRefExpr{ - pos: position{line: 875, col: 10, offset: 20724}, + pos: position{line: 875, col: 10, offset: 20705}, name: "_", }, &labeledExpr{ - pos: position{line: 875, col: 12, offset: 20726}, + pos: position{line: 875, col: 12, offset: 20707}, label: "lhs", expr: &ruleRefExpr{ - pos: position{line: 875, col: 16, offset: 20730}, + pos: position{line: 875, col: 16, offset: 20711}, name: "Lval", }, }, @@ -5755,9 +5719,9 @@ var g = &grammar{ }, { name: "Lval", - pos: position{line: 879, col: 1, offset: 20781}, + pos: position{line: 879, col: 1, offset: 20762}, expr: &ruleRefExpr{ - pos: position{line: 879, col: 8, offset: 20788}, + pos: position{line: 879, col: 8, offset: 20769}, name: "DerefExpr", }, leader: false, @@ -5765,51 +5729,51 @@ var g = &grammar{ }, { name: "Lvals", - pos: position{line: 881, col: 1, offset: 20799}, + pos: position{line: 881, col: 1, offset: 20780}, expr: &actionExpr{ - pos: position{line: 882, col: 5, offset: 20809}, + pos: position{line: 882, col: 5, offset: 20790}, run: (*parser).callonLvals1, expr: &seqExpr{ - pos: position{line: 882, col: 5, offset: 20809}, + pos: position{line: 882, col: 5, offset: 20790}, exprs: []any{ &labeledExpr{ - pos: position{line: 882, col: 5, offset: 20809}, + pos: position{line: 882, col: 5, offset: 20790}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 882, col: 11, offset: 20815}, + pos: position{line: 882, col: 11, offset: 20796}, name: "Lval", }, }, &labeledExpr{ - pos: position{line: 882, col: 16, offset: 20820}, + pos: position{line: 882, col: 16, offset: 20801}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 882, col: 21, offset: 20825}, + pos: position{line: 882, col: 21, offset: 20806}, expr: &actionExpr{ - pos: position{line: 882, col: 22, offset: 20826}, + pos: position{line: 882, col: 22, offset: 20807}, run: (*parser).callonLvals7, expr: &seqExpr{ - pos: position{line: 882, col: 22, offset: 20826}, + pos: position{line: 882, col: 22, offset: 20807}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 882, col: 22, offset: 20826}, + pos: position{line: 882, col: 22, offset: 20807}, name: "__", }, &litMatcher{ - pos: position{line: 882, col: 25, offset: 20829}, + pos: position{line: 882, col: 25, offset: 20810}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 882, col: 29, offset: 20833}, + pos: position{line: 882, col: 29, offset: 20814}, name: "__", }, &labeledExpr{ - pos: position{line: 882, col: 32, offset: 20836}, + pos: position{line: 882, col: 32, offset: 20817}, label: "lval", expr: &ruleRefExpr{ - pos: position{line: 882, col: 37, offset: 20841}, + pos: position{line: 882, col: 37, offset: 20822}, name: "Lval", }, }, @@ -5826,51 +5790,51 @@ var g = &grammar{ }, { name: "Assignments", - pos: position{line: 886, col: 1, offset: 20917}, + pos: position{line: 886, col: 1, offset: 20898}, expr: &actionExpr{ - pos: position{line: 887, col: 5, offset: 20933}, + pos: position{line: 887, col: 5, offset: 20914}, run: (*parser).callonAssignments1, expr: &seqExpr{ - pos: position{line: 887, col: 5, offset: 20933}, + pos: position{line: 887, col: 5, offset: 20914}, exprs: []any{ &labeledExpr{ - pos: position{line: 887, col: 5, offset: 20933}, + pos: position{line: 887, col: 5, offset: 20914}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 887, col: 11, offset: 20939}, + pos: position{line: 887, col: 11, offset: 20920}, name: "Assignment", }, }, &labeledExpr{ - pos: position{line: 887, col: 22, offset: 20950}, + pos: position{line: 887, col: 22, offset: 20931}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 887, col: 27, offset: 20955}, + pos: position{line: 887, col: 27, offset: 20936}, expr: &actionExpr{ - pos: position{line: 887, col: 28, offset: 20956}, + pos: position{line: 887, col: 28, offset: 20937}, run: (*parser).callonAssignments7, expr: &seqExpr{ - pos: position{line: 887, col: 28, offset: 20956}, + pos: position{line: 887, col: 28, offset: 20937}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 887, col: 28, offset: 20956}, + pos: position{line: 887, col: 28, offset: 20937}, name: "__", }, &litMatcher{ - pos: position{line: 887, col: 31, offset: 20959}, + pos: position{line: 887, col: 31, offset: 20940}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 887, col: 35, offset: 20963}, + pos: position{line: 887, col: 35, offset: 20944}, name: "__", }, &labeledExpr{ - pos: position{line: 887, col: 38, offset: 20966}, + pos: position{line: 887, col: 38, offset: 20947}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 887, col: 40, offset: 20968}, + pos: position{line: 887, col: 40, offset: 20949}, name: "Assignment", }, }, @@ -5887,40 +5851,40 @@ var g = &grammar{ }, { name: "Assignment", - pos: position{line: 891, col: 1, offset: 21043}, + pos: position{line: 891, col: 1, offset: 21024}, expr: &actionExpr{ - pos: position{line: 892, col: 5, offset: 21058}, + pos: position{line: 892, col: 5, offset: 21039}, run: (*parser).callonAssignment1, expr: &seqExpr{ - pos: position{line: 892, col: 5, offset: 21058}, + pos: position{line: 892, col: 5, offset: 21039}, exprs: []any{ &labeledExpr{ - pos: position{line: 892, col: 5, offset: 21058}, + pos: position{line: 892, col: 5, offset: 21039}, label: "lhs", expr: &ruleRefExpr{ - pos: position{line: 892, col: 9, offset: 21062}, + pos: position{line: 892, col: 9, offset: 21043}, name: "Lval", }, }, &ruleRefExpr{ - pos: position{line: 892, col: 14, offset: 21067}, + pos: position{line: 892, col: 14, offset: 21048}, name: "__", }, &litMatcher{ - pos: position{line: 892, col: 17, offset: 21070}, + pos: position{line: 892, col: 17, offset: 21051}, val: ":=", ignoreCase: false, want: "\":=\"", }, &ruleRefExpr{ - pos: position{line: 892, col: 22, offset: 21075}, + pos: position{line: 892, col: 22, offset: 21056}, name: "__", }, &labeledExpr{ - pos: position{line: 892, col: 25, offset: 21078}, + pos: position{line: 892, col: 25, offset: 21059}, label: "rhs", expr: &ruleRefExpr{ - pos: position{line: 892, col: 29, offset: 21082}, + pos: position{line: 892, col: 29, offset: 21063}, name: "Expr", }, }, @@ -5932,9 +5896,9 @@ var g = &grammar{ }, { name: "Expr", - pos: position{line: 901, col: 1, offset: 21253}, + pos: position{line: 901, col: 1, offset: 21234}, expr: &ruleRefExpr{ - pos: position{line: 901, col: 8, offset: 21260}, + pos: position{line: 901, col: 8, offset: 21241}, name: "ConditionalExpr", }, leader: false, @@ -5942,63 +5906,63 @@ var g = &grammar{ }, { name: "ConditionalExpr", - pos: position{line: 903, col: 1, offset: 21277}, + pos: position{line: 903, col: 1, offset: 21258}, expr: &actionExpr{ - pos: position{line: 904, col: 5, offset: 21297}, + pos: position{line: 904, col: 5, offset: 21278}, run: (*parser).callonConditionalExpr1, expr: &seqExpr{ - pos: position{line: 904, col: 5, offset: 21297}, + pos: position{line: 904, col: 5, offset: 21278}, exprs: []any{ &labeledExpr{ - pos: position{line: 904, col: 5, offset: 21297}, + pos: position{line: 904, col: 5, offset: 21278}, label: "cond", expr: &ruleRefExpr{ - pos: position{line: 904, col: 10, offset: 21302}, + pos: position{line: 904, col: 10, offset: 21283}, name: "LogicalOrExpr", }, }, &labeledExpr{ - pos: position{line: 904, col: 24, offset: 21316}, + pos: position{line: 904, col: 24, offset: 21297}, label: "opt", expr: &zeroOrOneExpr{ - pos: position{line: 904, col: 28, offset: 21320}, + pos: position{line: 904, col: 28, offset: 21301}, expr: &seqExpr{ - pos: position{line: 904, col: 29, offset: 21321}, + pos: position{line: 904, col: 29, offset: 21302}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 904, col: 29, offset: 21321}, + pos: position{line: 904, col: 29, offset: 21302}, name: "__", }, &litMatcher{ - pos: position{line: 904, col: 32, offset: 21324}, + pos: position{line: 904, col: 32, offset: 21305}, val: "?", ignoreCase: false, want: "\"?\"", }, &ruleRefExpr{ - pos: position{line: 904, col: 36, offset: 21328}, + pos: position{line: 904, col: 36, offset: 21309}, name: "__", }, &ruleRefExpr{ - pos: position{line: 904, col: 39, offset: 21331}, + pos: position{line: 904, col: 39, offset: 21312}, name: "Expr", }, &ruleRefExpr{ - pos: position{line: 904, col: 44, offset: 21336}, + pos: position{line: 904, col: 44, offset: 21317}, name: "__", }, &litMatcher{ - pos: position{line: 904, col: 47, offset: 21339}, + pos: position{line: 904, col: 47, offset: 21320}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 904, col: 51, offset: 21343}, + pos: position{line: 904, col: 51, offset: 21324}, name: "__", }, &ruleRefExpr{ - pos: position{line: 904, col: 54, offset: 21346}, + pos: position{line: 904, col: 54, offset: 21327}, name: "Expr", }, }, @@ -6013,53 +5977,53 @@ var g = &grammar{ }, { name: "LogicalOrExpr", - pos: position{line: 918, col: 1, offset: 21667}, + pos: position{line: 918, col: 1, offset: 21648}, expr: &actionExpr{ - pos: position{line: 919, col: 5, offset: 21685}, + pos: position{line: 919, col: 5, offset: 21666}, run: (*parser).callonLogicalOrExpr1, expr: &seqExpr{ - pos: position{line: 919, col: 5, offset: 21685}, + pos: position{line: 919, col: 5, offset: 21666}, exprs: []any{ &labeledExpr{ - pos: position{line: 919, col: 5, offset: 21685}, + pos: position{line: 919, col: 5, offset: 21666}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 919, col: 11, offset: 21691}, + pos: position{line: 919, col: 11, offset: 21672}, name: "LogicalAndExpr", }, }, &labeledExpr{ - pos: position{line: 920, col: 5, offset: 21710}, + pos: position{line: 920, col: 5, offset: 21691}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 920, col: 10, offset: 21715}, + pos: position{line: 920, col: 10, offset: 21696}, expr: &actionExpr{ - pos: position{line: 920, col: 11, offset: 21716}, + pos: position{line: 920, col: 11, offset: 21697}, run: (*parser).callonLogicalOrExpr7, expr: &seqExpr{ - pos: position{line: 920, col: 11, offset: 21716}, + pos: position{line: 920, col: 11, offset: 21697}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 920, col: 11, offset: 21716}, + pos: position{line: 920, col: 11, offset: 21697}, name: "__", }, &labeledExpr{ - pos: position{line: 920, col: 14, offset: 21719}, + pos: position{line: 920, col: 14, offset: 21700}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 920, col: 17, offset: 21722}, + pos: position{line: 920, col: 17, offset: 21703}, name: "OR", }, }, &ruleRefExpr{ - pos: position{line: 920, col: 20, offset: 21725}, + pos: position{line: 920, col: 20, offset: 21706}, name: "__", }, &labeledExpr{ - pos: position{line: 920, col: 23, offset: 21728}, + pos: position{line: 920, col: 23, offset: 21709}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 920, col: 28, offset: 21733}, + pos: position{line: 920, col: 28, offset: 21714}, name: "LogicalAndExpr", }, }, @@ -6076,53 +6040,53 @@ var g = &grammar{ }, { name: "LogicalAndExpr", - pos: position{line: 924, col: 1, offset: 21847}, + pos: position{line: 924, col: 1, offset: 21828}, expr: &actionExpr{ - pos: position{line: 925, col: 5, offset: 21866}, + pos: position{line: 925, col: 5, offset: 21847}, run: (*parser).callonLogicalAndExpr1, expr: &seqExpr{ - pos: position{line: 925, col: 5, offset: 21866}, + pos: position{line: 925, col: 5, offset: 21847}, exprs: []any{ &labeledExpr{ - pos: position{line: 925, col: 5, offset: 21866}, + pos: position{line: 925, col: 5, offset: 21847}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 925, col: 11, offset: 21872}, + pos: position{line: 925, col: 11, offset: 21853}, name: "NotExpr", }, }, &labeledExpr{ - pos: position{line: 926, col: 5, offset: 21884}, + pos: position{line: 926, col: 5, offset: 21865}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 926, col: 10, offset: 21889}, + pos: position{line: 926, col: 10, offset: 21870}, expr: &actionExpr{ - pos: position{line: 926, col: 11, offset: 21890}, + pos: position{line: 926, col: 11, offset: 21871}, run: (*parser).callonLogicalAndExpr7, expr: &seqExpr{ - pos: position{line: 926, col: 11, offset: 21890}, + pos: position{line: 926, col: 11, offset: 21871}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 926, col: 11, offset: 21890}, + pos: position{line: 926, col: 11, offset: 21871}, name: "__", }, &labeledExpr{ - pos: position{line: 926, col: 14, offset: 21893}, + pos: position{line: 926, col: 14, offset: 21874}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 926, col: 17, offset: 21896}, + pos: position{line: 926, col: 17, offset: 21877}, name: "AND", }, }, &ruleRefExpr{ - pos: position{line: 926, col: 21, offset: 21900}, + pos: position{line: 926, col: 21, offset: 21881}, name: "__", }, &labeledExpr{ - pos: position{line: 926, col: 24, offset: 21903}, + pos: position{line: 926, col: 24, offset: 21884}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 926, col: 29, offset: 21908}, + pos: position{line: 926, col: 29, offset: 21889}, name: "NotExpr", }, }, @@ -6139,43 +6103,43 @@ var g = &grammar{ }, { name: "NotExpr", - pos: position{line: 930, col: 1, offset: 22015}, + pos: position{line: 930, col: 1, offset: 21996}, expr: &choiceExpr{ - pos: position{line: 931, col: 5, offset: 22027}, + pos: position{line: 931, col: 5, offset: 22008}, alternatives: []any{ &actionExpr{ - pos: position{line: 931, col: 5, offset: 22027}, + pos: position{line: 931, col: 5, offset: 22008}, run: (*parser).callonNotExpr2, expr: &seqExpr{ - pos: position{line: 931, col: 5, offset: 22027}, + pos: position{line: 931, col: 5, offset: 22008}, exprs: []any{ &choiceExpr{ - pos: position{line: 931, col: 6, offset: 22028}, + pos: position{line: 931, col: 6, offset: 22009}, alternatives: []any{ &seqExpr{ - pos: position{line: 931, col: 6, offset: 22028}, + pos: position{line: 931, col: 6, offset: 22009}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 931, col: 6, offset: 22028}, + pos: position{line: 931, col: 6, offset: 22009}, name: "NOT", }, &ruleRefExpr{ - pos: position{line: 931, col: 10, offset: 22032}, + pos: position{line: 931, col: 10, offset: 22013}, name: "_", }, }, }, &seqExpr{ - pos: position{line: 931, col: 14, offset: 22036}, + pos: position{line: 931, col: 14, offset: 22017}, exprs: []any{ &litMatcher{ - pos: position{line: 931, col: 14, offset: 22036}, + pos: position{line: 931, col: 14, offset: 22017}, val: "!", ignoreCase: false, want: "\"!\"", }, &ruleRefExpr{ - pos: position{line: 931, col: 18, offset: 22040}, + pos: position{line: 931, col: 18, offset: 22021}, name: "__", }, }, @@ -6183,10 +6147,10 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 931, col: 22, offset: 22044}, + pos: position{line: 931, col: 22, offset: 22025}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 931, col: 24, offset: 22046}, + pos: position{line: 931, col: 24, offset: 22027}, name: "NotExpr", }, }, @@ -6194,7 +6158,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 939, col: 5, offset: 22212}, + pos: position{line: 939, col: 5, offset: 22193}, name: "BetweenExpr", }, }, @@ -6204,61 +6168,61 @@ var g = &grammar{ }, { name: "BetweenExpr", - pos: position{line: 941, col: 1, offset: 22227}, + pos: position{line: 941, col: 1, offset: 22208}, expr: &choiceExpr{ - pos: position{line: 942, col: 5, offset: 22243}, + pos: position{line: 942, col: 5, offset: 22224}, alternatives: []any{ &actionExpr{ - pos: position{line: 942, col: 5, offset: 22243}, + pos: position{line: 942, col: 5, offset: 22224}, run: (*parser).callonBetweenExpr2, expr: &seqExpr{ - pos: position{line: 942, col: 5, offset: 22243}, + pos: position{line: 942, col: 5, offset: 22224}, exprs: []any{ &labeledExpr{ - pos: position{line: 942, col: 5, offset: 22243}, + pos: position{line: 942, col: 5, offset: 22224}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 942, col: 10, offset: 22248}, + pos: position{line: 942, col: 10, offset: 22229}, name: "ComparisonExpr", }, }, &ruleRefExpr{ - pos: position{line: 942, col: 25, offset: 22263}, + pos: position{line: 942, col: 25, offset: 22244}, name: "_", }, &ruleRefExpr{ - pos: position{line: 942, col: 27, offset: 22265}, + pos: position{line: 942, col: 27, offset: 22246}, name: "BETWEEN", }, &ruleRefExpr{ - pos: position{line: 942, col: 35, offset: 22273}, + pos: position{line: 942, col: 35, offset: 22254}, name: "_", }, &labeledExpr{ - pos: position{line: 942, col: 37, offset: 22275}, + pos: position{line: 942, col: 37, offset: 22256}, label: "lower", expr: &ruleRefExpr{ - pos: position{line: 942, col: 43, offset: 22281}, + pos: position{line: 942, col: 43, offset: 22262}, name: "BetweenExpr", }, }, &ruleRefExpr{ - pos: position{line: 942, col: 55, offset: 22293}, + pos: position{line: 942, col: 55, offset: 22274}, name: "_", }, &ruleRefExpr{ - pos: position{line: 942, col: 57, offset: 22295}, + pos: position{line: 942, col: 57, offset: 22276}, name: "AND", }, &ruleRefExpr{ - pos: position{line: 942, col: 61, offset: 22299}, + pos: position{line: 942, col: 61, offset: 22280}, name: "_", }, &labeledExpr{ - pos: position{line: 942, col: 63, offset: 22301}, + pos: position{line: 942, col: 63, offset: 22282}, label: "upper", expr: &ruleRefExpr{ - pos: position{line: 942, col: 69, offset: 22307}, + pos: position{line: 942, col: 69, offset: 22288}, name: "BetweenExpr", }, }, @@ -6266,7 +6230,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 950, col: 5, offset: 22493}, + pos: position{line: 950, col: 5, offset: 22474}, name: "ComparisonExpr", }, }, @@ -6276,73 +6240,73 @@ var g = &grammar{ }, { name: "ComparisonExpr", - pos: position{line: 952, col: 1, offset: 22509}, + pos: position{line: 952, col: 1, offset: 22490}, expr: &actionExpr{ - pos: position{line: 953, col: 5, offset: 22528}, + pos: position{line: 953, col: 5, offset: 22509}, run: (*parser).callonComparisonExpr1, expr: &seqExpr{ - pos: position{line: 953, col: 5, offset: 22528}, + pos: position{line: 953, col: 5, offset: 22509}, exprs: []any{ &labeledExpr{ - pos: position{line: 953, col: 5, offset: 22528}, + pos: position{line: 953, col: 5, offset: 22509}, label: "lhs", expr: &ruleRefExpr{ - pos: position{line: 953, col: 9, offset: 22532}, + pos: position{line: 953, col: 9, offset: 22513}, name: "AdditiveExpr", }, }, &labeledExpr{ - pos: position{line: 953, col: 22, offset: 22545}, + pos: position{line: 953, col: 22, offset: 22526}, label: "opAndRHS", expr: &zeroOrOneExpr{ - pos: position{line: 953, col: 31, offset: 22554}, + pos: position{line: 953, col: 31, offset: 22535}, expr: &choiceExpr{ - pos: position{line: 953, col: 32, offset: 22555}, + pos: position{line: 953, col: 32, offset: 22536}, alternatives: []any{ &seqExpr{ - pos: position{line: 953, col: 32, offset: 22555}, + pos: position{line: 953, col: 32, offset: 22536}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 953, col: 32, offset: 22555}, + pos: position{line: 953, col: 32, offset: 22536}, name: "__", }, &ruleRefExpr{ - pos: position{line: 953, col: 35, offset: 22558}, + pos: position{line: 953, col: 35, offset: 22539}, name: "Comparator", }, &ruleRefExpr{ - pos: position{line: 953, col: 46, offset: 22569}, + pos: position{line: 953, col: 46, offset: 22550}, name: "__", }, &ruleRefExpr{ - pos: position{line: 953, col: 49, offset: 22572}, + pos: position{line: 953, col: 49, offset: 22553}, name: "AdditiveExpr", }, }, }, &seqExpr{ - pos: position{line: 953, col: 64, offset: 22587}, + pos: position{line: 953, col: 64, offset: 22568}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 953, col: 64, offset: 22587}, + pos: position{line: 953, col: 64, offset: 22568}, name: "__", }, &actionExpr{ - pos: position{line: 953, col: 68, offset: 22591}, + pos: position{line: 953, col: 68, offset: 22572}, run: (*parser).callonComparisonExpr15, expr: &litMatcher{ - pos: position{line: 953, col: 68, offset: 22591}, + pos: position{line: 953, col: 68, offset: 22572}, val: "~", ignoreCase: false, want: "\"~\"", }, }, &ruleRefExpr{ - pos: position{line: 953, col: 104, offset: 22627}, + pos: position{line: 953, col: 104, offset: 22608}, name: "__", }, &ruleRefExpr{ - pos: position{line: 953, col: 107, offset: 22630}, + pos: position{line: 953, col: 107, offset: 22611}, name: "Regexp", }, }, @@ -6359,53 +6323,53 @@ var g = &grammar{ }, { name: "AdditiveExpr", - pos: position{line: 966, col: 1, offset: 22915}, + pos: position{line: 966, col: 1, offset: 22896}, expr: &actionExpr{ - pos: position{line: 967, col: 5, offset: 22932}, + pos: position{line: 967, col: 5, offset: 22913}, run: (*parser).callonAdditiveExpr1, expr: &seqExpr{ - pos: position{line: 967, col: 5, offset: 22932}, + pos: position{line: 967, col: 5, offset: 22913}, exprs: []any{ &labeledExpr{ - pos: position{line: 967, col: 5, offset: 22932}, + pos: position{line: 967, col: 5, offset: 22913}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 967, col: 11, offset: 22938}, + pos: position{line: 967, col: 11, offset: 22919}, name: "MultiplicativeExpr", }, }, &labeledExpr{ - pos: position{line: 968, col: 5, offset: 22961}, + pos: position{line: 968, col: 5, offset: 22942}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 968, col: 10, offset: 22966}, + pos: position{line: 968, col: 10, offset: 22947}, expr: &actionExpr{ - pos: position{line: 968, col: 11, offset: 22967}, + pos: position{line: 968, col: 11, offset: 22948}, run: (*parser).callonAdditiveExpr7, expr: &seqExpr{ - pos: position{line: 968, col: 11, offset: 22967}, + pos: position{line: 968, col: 11, offset: 22948}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 968, col: 11, offset: 22967}, + pos: position{line: 968, col: 11, offset: 22948}, name: "__", }, &labeledExpr{ - pos: position{line: 968, col: 14, offset: 22970}, + pos: position{line: 968, col: 14, offset: 22951}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 968, col: 17, offset: 22973}, + pos: position{line: 968, col: 17, offset: 22954}, name: "AdditiveOperator", }, }, &ruleRefExpr{ - pos: position{line: 968, col: 34, offset: 22990}, + pos: position{line: 968, col: 34, offset: 22971}, name: "__", }, &labeledExpr{ - pos: position{line: 968, col: 37, offset: 22993}, + pos: position{line: 968, col: 37, offset: 22974}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 968, col: 42, offset: 22998}, + pos: position{line: 968, col: 42, offset: 22979}, name: "MultiplicativeExpr", }, }, @@ -6422,21 +6386,21 @@ var g = &grammar{ }, { name: "AdditiveOperator", - pos: position{line: 972, col: 1, offset: 23116}, + pos: position{line: 972, col: 1, offset: 23097}, expr: &actionExpr{ - pos: position{line: 972, col: 20, offset: 23135}, + pos: position{line: 972, col: 20, offset: 23116}, run: (*parser).callonAdditiveOperator1, expr: &choiceExpr{ - pos: position{line: 972, col: 21, offset: 23136}, + pos: position{line: 972, col: 21, offset: 23117}, alternatives: []any{ &litMatcher{ - pos: position{line: 972, col: 21, offset: 23136}, + pos: position{line: 972, col: 21, offset: 23117}, val: "+", ignoreCase: false, want: "\"+\"", }, &litMatcher{ - pos: position{line: 972, col: 27, offset: 23142}, + pos: position{line: 972, col: 27, offset: 23123}, val: "-", ignoreCase: false, want: "\"-\"", @@ -6449,53 +6413,53 @@ var g = &grammar{ }, { name: "MultiplicativeExpr", - pos: position{line: 974, col: 1, offset: 23179}, + pos: position{line: 974, col: 1, offset: 23160}, expr: &actionExpr{ - pos: position{line: 975, col: 5, offset: 23202}, + pos: position{line: 975, col: 5, offset: 23183}, run: (*parser).callonMultiplicativeExpr1, expr: &seqExpr{ - pos: position{line: 975, col: 5, offset: 23202}, + pos: position{line: 975, col: 5, offset: 23183}, exprs: []any{ &labeledExpr{ - pos: position{line: 975, col: 5, offset: 23202}, + pos: position{line: 975, col: 5, offset: 23183}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 975, col: 11, offset: 23208}, + pos: position{line: 975, col: 11, offset: 23189}, name: "ConcatExpr", }, }, &labeledExpr{ - pos: position{line: 976, col: 5, offset: 23223}, + pos: position{line: 976, col: 5, offset: 23204}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 976, col: 10, offset: 23228}, + pos: position{line: 976, col: 10, offset: 23209}, expr: &actionExpr{ - pos: position{line: 976, col: 11, offset: 23229}, + pos: position{line: 976, col: 11, offset: 23210}, run: (*parser).callonMultiplicativeExpr7, expr: &seqExpr{ - pos: position{line: 976, col: 11, offset: 23229}, + pos: position{line: 976, col: 11, offset: 23210}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 976, col: 11, offset: 23229}, + pos: position{line: 976, col: 11, offset: 23210}, name: "__", }, &labeledExpr{ - pos: position{line: 976, col: 14, offset: 23232}, + pos: position{line: 976, col: 14, offset: 23213}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 976, col: 17, offset: 23235}, + pos: position{line: 976, col: 17, offset: 23216}, name: "MultiplicativeOperator", }, }, &ruleRefExpr{ - pos: position{line: 976, col: 40, offset: 23258}, + pos: position{line: 976, col: 40, offset: 23239}, name: "__", }, &labeledExpr{ - pos: position{line: 976, col: 43, offset: 23261}, + pos: position{line: 976, col: 43, offset: 23242}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 976, col: 48, offset: 23266}, + pos: position{line: 976, col: 48, offset: 23247}, name: "ConcatExpr", }, }, @@ -6512,27 +6476,27 @@ var g = &grammar{ }, { name: "MultiplicativeOperator", - pos: position{line: 980, col: 1, offset: 23376}, + pos: position{line: 980, col: 1, offset: 23357}, expr: &actionExpr{ - pos: position{line: 980, col: 26, offset: 23401}, + pos: position{line: 980, col: 26, offset: 23382}, run: (*parser).callonMultiplicativeOperator1, expr: &choiceExpr{ - pos: position{line: 980, col: 27, offset: 23402}, + pos: position{line: 980, col: 27, offset: 23383}, alternatives: []any{ &litMatcher{ - pos: position{line: 980, col: 27, offset: 23402}, + pos: position{line: 980, col: 27, offset: 23383}, val: "*", ignoreCase: false, want: "\"*\"", }, &litMatcher{ - pos: position{line: 980, col: 33, offset: 23408}, + pos: position{line: 980, col: 33, offset: 23389}, val: "/", ignoreCase: false, want: "\"/\"", }, &litMatcher{ - pos: position{line: 980, col: 39, offset: 23414}, + pos: position{line: 980, col: 39, offset: 23395}, val: "%", ignoreCase: false, want: "\"%\"", @@ -6545,51 +6509,51 @@ var g = &grammar{ }, { name: "ConcatExpr", - pos: position{line: 982, col: 1, offset: 23451}, + pos: position{line: 982, col: 1, offset: 23432}, expr: &actionExpr{ - pos: position{line: 983, col: 5, offset: 23467}, + pos: position{line: 983, col: 5, offset: 23448}, run: (*parser).callonConcatExpr1, expr: &seqExpr{ - pos: position{line: 983, col: 5, offset: 23467}, + pos: position{line: 983, col: 5, offset: 23448}, exprs: []any{ &labeledExpr{ - pos: position{line: 983, col: 5, offset: 23467}, + pos: position{line: 983, col: 5, offset: 23448}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 983, col: 11, offset: 23473}, + pos: position{line: 983, col: 11, offset: 23454}, name: "UnaryMinusExpr", }, }, &labeledExpr{ - pos: position{line: 984, col: 5, offset: 23492}, + pos: position{line: 984, col: 5, offset: 23473}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 984, col: 10, offset: 23497}, + pos: position{line: 984, col: 10, offset: 23478}, expr: &actionExpr{ - pos: position{line: 984, col: 11, offset: 23498}, + pos: position{line: 984, col: 11, offset: 23479}, run: (*parser).callonConcatExpr7, expr: &seqExpr{ - pos: position{line: 984, col: 11, offset: 23498}, + pos: position{line: 984, col: 11, offset: 23479}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 984, col: 11, offset: 23498}, + pos: position{line: 984, col: 11, offset: 23479}, name: "__", }, &litMatcher{ - pos: position{line: 984, col: 14, offset: 23501}, + pos: position{line: 984, col: 14, offset: 23482}, val: "||", ignoreCase: false, want: "\"||\"", }, &ruleRefExpr{ - pos: position{line: 984, col: 19, offset: 23506}, + pos: position{line: 984, col: 19, offset: 23487}, name: "__", }, &labeledExpr{ - pos: position{line: 984, col: 22, offset: 23509}, + pos: position{line: 984, col: 22, offset: 23490}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 984, col: 27, offset: 23514}, + pos: position{line: 984, col: 27, offset: 23495}, name: "UnaryMinusExpr", }, }, @@ -6606,38 +6570,38 @@ var g = &grammar{ }, { name: "UnaryMinusExpr", - pos: position{line: 988, col: 1, offset: 23630}, + pos: position{line: 988, col: 1, offset: 23611}, expr: &choiceExpr{ - pos: position{line: 989, col: 5, offset: 23649}, + pos: position{line: 989, col: 5, offset: 23630}, alternatives: []any{ &actionExpr{ - pos: position{line: 989, col: 5, offset: 23649}, + pos: position{line: 989, col: 5, offset: 23630}, run: (*parser).callonUnaryMinusExpr2, expr: &seqExpr{ - pos: position{line: 989, col: 5, offset: 23649}, + pos: position{line: 989, col: 5, offset: 23630}, exprs: []any{ ¬Expr{ - pos: position{line: 989, col: 5, offset: 23649}, + pos: position{line: 989, col: 5, offset: 23630}, expr: &ruleRefExpr{ - pos: position{line: 989, col: 6, offset: 23650}, + pos: position{line: 989, col: 6, offset: 23631}, name: "Literal", }, }, &litMatcher{ - pos: position{line: 989, col: 14, offset: 23658}, + pos: position{line: 989, col: 14, offset: 23639}, val: "-", ignoreCase: false, want: "\"-\"", }, &ruleRefExpr{ - pos: position{line: 989, col: 18, offset: 23662}, + pos: position{line: 989, col: 18, offset: 23643}, name: "__", }, &labeledExpr{ - pos: position{line: 989, col: 21, offset: 23665}, + pos: position{line: 989, col: 21, offset: 23646}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 989, col: 23, offset: 23667}, + pos: position{line: 989, col: 23, offset: 23648}, name: "UnaryMinusExpr", }, }, @@ -6645,7 +6609,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 997, col: 5, offset: 23840}, + pos: position{line: 997, col: 5, offset: 23821}, name: "DerefExpr", }, }, @@ -6655,73 +6619,73 @@ var g = &grammar{ }, { name: "DerefExpr", - pos: position{line: 999, col: 1, offset: 23851}, + pos: position{line: 999, col: 1, offset: 23832}, expr: &choiceExpr{ - pos: position{line: 1000, col: 5, offset: 23865}, + pos: position{line: 1000, col: 5, offset: 23846}, alternatives: []any{ &actionExpr{ - pos: position{line: 1000, col: 5, offset: 23865}, + pos: position{line: 1000, col: 5, offset: 23846}, run: (*parser).callonDerefExpr2, expr: &seqExpr{ - pos: position{line: 1000, col: 5, offset: 23865}, + pos: position{line: 1000, col: 5, offset: 23846}, exprs: []any{ &labeledExpr{ - pos: position{line: 1000, col: 5, offset: 23865}, + pos: position{line: 1000, col: 5, offset: 23846}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1000, col: 10, offset: 23870}, + pos: position{line: 1000, col: 10, offset: 23851}, name: "DerefExpr", }, }, &litMatcher{ - pos: position{line: 1000, col: 20, offset: 23880}, + pos: position{line: 1000, col: 20, offset: 23861}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 1000, col: 24, offset: 23884}, + pos: position{line: 1000, col: 24, offset: 23865}, name: "__", }, &labeledExpr{ - pos: position{line: 1000, col: 27, offset: 23887}, + pos: position{line: 1000, col: 27, offset: 23868}, label: "from", expr: &ruleRefExpr{ - pos: position{line: 1000, col: 32, offset: 23892}, + pos: position{line: 1000, col: 32, offset: 23873}, name: "AdditiveExpr", }, }, &ruleRefExpr{ - pos: position{line: 1000, col: 45, offset: 23905}, + pos: position{line: 1000, col: 45, offset: 23886}, name: "__", }, &litMatcher{ - pos: position{line: 1000, col: 48, offset: 23908}, + pos: position{line: 1000, col: 48, offset: 23889}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1000, col: 52, offset: 23912}, + pos: position{line: 1000, col: 52, offset: 23893}, name: "__", }, &labeledExpr{ - pos: position{line: 1000, col: 55, offset: 23915}, + pos: position{line: 1000, col: 55, offset: 23896}, label: "to", expr: &zeroOrOneExpr{ - pos: position{line: 1000, col: 58, offset: 23918}, + pos: position{line: 1000, col: 58, offset: 23899}, expr: &ruleRefExpr{ - pos: position{line: 1000, col: 58, offset: 23918}, + pos: position{line: 1000, col: 58, offset: 23899}, name: "AdditiveExpr", }, }, }, &ruleRefExpr{ - pos: position{line: 1000, col: 72, offset: 23932}, + pos: position{line: 1000, col: 72, offset: 23913}, name: "__", }, &litMatcher{ - pos: position{line: 1000, col: 75, offset: 23935}, + pos: position{line: 1000, col: 75, offset: 23916}, val: "]", ignoreCase: false, want: "\"]\"", @@ -6730,49 +6694,49 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1012, col: 5, offset: 24174}, + pos: position{line: 1012, col: 5, offset: 24155}, run: (*parser).callonDerefExpr18, expr: &seqExpr{ - pos: position{line: 1012, col: 5, offset: 24174}, + pos: position{line: 1012, col: 5, offset: 24155}, exprs: []any{ &labeledExpr{ - pos: position{line: 1012, col: 5, offset: 24174}, + pos: position{line: 1012, col: 5, offset: 24155}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1012, col: 10, offset: 24179}, + pos: position{line: 1012, col: 10, offset: 24160}, name: "DerefExpr", }, }, &litMatcher{ - pos: position{line: 1012, col: 20, offset: 24189}, + pos: position{line: 1012, col: 20, offset: 24170}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 1012, col: 24, offset: 24193}, + pos: position{line: 1012, col: 24, offset: 24174}, name: "__", }, &litMatcher{ - pos: position{line: 1012, col: 27, offset: 24196}, + pos: position{line: 1012, col: 27, offset: 24177}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1012, col: 31, offset: 24200}, + pos: position{line: 1012, col: 31, offset: 24181}, name: "__", }, &labeledExpr{ - pos: position{line: 1012, col: 34, offset: 24203}, + pos: position{line: 1012, col: 34, offset: 24184}, label: "to", expr: &ruleRefExpr{ - pos: position{line: 1012, col: 37, offset: 24206}, + pos: position{line: 1012, col: 37, offset: 24187}, name: "AdditiveExpr", }, }, &litMatcher{ - pos: position{line: 1012, col: 50, offset: 24219}, + pos: position{line: 1012, col: 50, offset: 24200}, val: "]", ignoreCase: false, want: "\"]\"", @@ -6781,35 +6745,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1020, col: 5, offset: 24383}, + pos: position{line: 1020, col: 5, offset: 24364}, run: (*parser).callonDerefExpr29, expr: &seqExpr{ - pos: position{line: 1020, col: 5, offset: 24383}, + pos: position{line: 1020, col: 5, offset: 24364}, exprs: []any{ &labeledExpr{ - pos: position{line: 1020, col: 5, offset: 24383}, + pos: position{line: 1020, col: 5, offset: 24364}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1020, col: 10, offset: 24388}, + pos: position{line: 1020, col: 10, offset: 24369}, name: "DerefExpr", }, }, &litMatcher{ - pos: position{line: 1020, col: 20, offset: 24398}, + pos: position{line: 1020, col: 20, offset: 24379}, val: "[", ignoreCase: false, want: "\"[\"", }, &labeledExpr{ - pos: position{line: 1020, col: 24, offset: 24402}, + pos: position{line: 1020, col: 24, offset: 24383}, label: "index", expr: &ruleRefExpr{ - pos: position{line: 1020, col: 30, offset: 24408}, + pos: position{line: 1020, col: 30, offset: 24389}, name: "Expr", }, }, &litMatcher{ - pos: position{line: 1020, col: 35, offset: 24413}, + pos: position{line: 1020, col: 35, offset: 24394}, val: "]", ignoreCase: false, want: "\"]\"", @@ -6818,30 +6782,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1028, col: 5, offset: 24583}, + pos: position{line: 1028, col: 5, offset: 24564}, run: (*parser).callonDerefExpr37, expr: &seqExpr{ - pos: position{line: 1028, col: 5, offset: 24583}, + pos: position{line: 1028, col: 5, offset: 24564}, exprs: []any{ &labeledExpr{ - pos: position{line: 1028, col: 5, offset: 24583}, + pos: position{line: 1028, col: 5, offset: 24564}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1028, col: 10, offset: 24588}, + pos: position{line: 1028, col: 10, offset: 24569}, name: "DerefExpr", }, }, &litMatcher{ - pos: position{line: 1028, col: 20, offset: 24598}, + pos: position{line: 1028, col: 20, offset: 24579}, val: ".", ignoreCase: false, want: "\".\"", }, &labeledExpr{ - pos: position{line: 1028, col: 24, offset: 24602}, + pos: position{line: 1028, col: 24, offset: 24583}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 1028, col: 27, offset: 24605}, + pos: position{line: 1028, col: 27, offset: 24586}, name: "Identifier", }, }, @@ -6849,11 +6813,11 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1037, col: 5, offset: 24795}, + pos: position{line: 1037, col: 5, offset: 24776}, name: "FuncExpr", }, &ruleRefExpr{ - pos: position{line: 1038, col: 5, offset: 24808}, + pos: position{line: 1038, col: 5, offset: 24789}, name: "Primary", }, }, @@ -6863,16 +6827,16 @@ var g = &grammar{ }, { name: "FuncExpr", - pos: position{line: 1040, col: 1, offset: 24817}, + pos: position{line: 1040, col: 1, offset: 24798}, expr: &choiceExpr{ - pos: position{line: 1041, col: 5, offset: 24830}, + pos: position{line: 1041, col: 5, offset: 24811}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1041, col: 5, offset: 24830}, + pos: position{line: 1041, col: 5, offset: 24811}, name: "Cast", }, &ruleRefExpr{ - pos: position{line: 1042, col: 5, offset: 24839}, + pos: position{line: 1042, col: 5, offset: 24820}, name: "Function", }, }, @@ -6882,20 +6846,20 @@ var g = &grammar{ }, { name: "FuncGuard", - pos: position{line: 1044, col: 1, offset: 24849}, + pos: position{line: 1044, col: 1, offset: 24830}, expr: &seqExpr{ - pos: position{line: 1044, col: 13, offset: 24861}, + pos: position{line: 1044, col: 13, offset: 24842}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1044, col: 13, offset: 24861}, + pos: position{line: 1044, col: 13, offset: 24842}, name: "NotFuncs", }, &ruleRefExpr{ - pos: position{line: 1044, col: 22, offset: 24870}, + pos: position{line: 1044, col: 22, offset: 24851}, name: "__", }, &litMatcher{ - pos: position{line: 1044, col: 25, offset: 24873}, + pos: position{line: 1044, col: 25, offset: 24854}, val: "(", ignoreCase: false, want: "\"(\"", @@ -6907,16 +6871,16 @@ var g = &grammar{ }, { name: "NotFuncs", - pos: position{line: 1046, col: 1, offset: 24878}, + pos: position{line: 1046, col: 1, offset: 24859}, expr: &choiceExpr{ - pos: position{line: 1047, col: 5, offset: 24891}, + pos: position{line: 1047, col: 5, offset: 24872}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1047, col: 5, offset: 24891}, + pos: position{line: 1047, col: 5, offset: 24872}, name: "NOT", }, &ruleRefExpr{ - pos: position{line: 1048, col: 5, offset: 24899}, + pos: position{line: 1048, col: 5, offset: 24880}, name: "SELECT", }, }, @@ -6926,58 +6890,58 @@ var g = &grammar{ }, { name: "Cast", - pos: position{line: 1050, col: 1, offset: 24907}, + pos: position{line: 1050, col: 1, offset: 24888}, expr: &actionExpr{ - pos: position{line: 1051, col: 5, offset: 24916}, + pos: position{line: 1051, col: 5, offset: 24897}, run: (*parser).callonCast1, expr: &seqExpr{ - pos: position{line: 1051, col: 5, offset: 24916}, + pos: position{line: 1051, col: 5, offset: 24897}, exprs: []any{ &labeledExpr{ - pos: position{line: 1051, col: 5, offset: 24916}, + pos: position{line: 1051, col: 5, offset: 24897}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1051, col: 9, offset: 24920}, + pos: position{line: 1051, col: 9, offset: 24901}, name: "TypeLiteral", }, }, &ruleRefExpr{ - pos: position{line: 1051, col: 21, offset: 24932}, + pos: position{line: 1051, col: 21, offset: 24913}, name: "__", }, &litMatcher{ - pos: position{line: 1051, col: 24, offset: 24935}, + pos: position{line: 1051, col: 24, offset: 24916}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1051, col: 28, offset: 24939}, + pos: position{line: 1051, col: 28, offset: 24920}, name: "__", }, &labeledExpr{ - pos: position{line: 1051, col: 31, offset: 24942}, + pos: position{line: 1051, col: 31, offset: 24923}, label: "expr", expr: &choiceExpr{ - pos: position{line: 1051, col: 37, offset: 24948}, + pos: position{line: 1051, col: 37, offset: 24929}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1051, col: 37, offset: 24948}, + pos: position{line: 1051, col: 37, offset: 24929}, name: "OverExpr", }, &ruleRefExpr{ - pos: position{line: 1051, col: 48, offset: 24959}, + pos: position{line: 1051, col: 48, offset: 24940}, name: "Expr", }, }, }, }, &ruleRefExpr{ - pos: position{line: 1051, col: 54, offset: 24965}, + pos: position{line: 1051, col: 54, offset: 24946}, name: "__", }, &litMatcher{ - pos: position{line: 1051, col: 57, offset: 24968}, + pos: position{line: 1051, col: 57, offset: 24949}, val: ")", ignoreCase: false, want: "\")\"", @@ -6990,85 +6954,85 @@ var g = &grammar{ }, { name: "Function", - pos: position{line: 1055, col: 1, offset: 25081}, + pos: position{line: 1055, col: 1, offset: 25062}, expr: &choiceExpr{ - pos: position{line: 1056, col: 5, offset: 25094}, + pos: position{line: 1056, col: 5, offset: 25075}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1056, col: 5, offset: 25094}, + pos: position{line: 1056, col: 5, offset: 25075}, name: "Grep", }, &actionExpr{ - pos: position{line: 1058, col: 5, offset: 25181}, + pos: position{line: 1058, col: 5, offset: 25162}, run: (*parser).callonFunction3, expr: &seqExpr{ - pos: position{line: 1058, col: 5, offset: 25181}, + pos: position{line: 1058, col: 5, offset: 25162}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1058, col: 5, offset: 25181}, + pos: position{line: 1058, col: 5, offset: 25162}, name: "REGEXP", }, &ruleRefExpr{ - pos: position{line: 1058, col: 12, offset: 25188}, + pos: position{line: 1058, col: 12, offset: 25169}, name: "__", }, &litMatcher{ - pos: position{line: 1058, col: 15, offset: 25191}, + pos: position{line: 1058, col: 15, offset: 25172}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1058, col: 19, offset: 25195}, + pos: position{line: 1058, col: 19, offset: 25176}, name: "__", }, &labeledExpr{ - pos: position{line: 1058, col: 22, offset: 25198}, + pos: position{line: 1058, col: 22, offset: 25179}, label: "arg0", expr: &ruleRefExpr{ - pos: position{line: 1058, col: 27, offset: 25203}, + pos: position{line: 1058, col: 27, offset: 25184}, name: "RegexpPrimitive", }, }, &ruleRefExpr{ - pos: position{line: 1058, col: 43, offset: 25219}, + pos: position{line: 1058, col: 43, offset: 25200}, name: "__", }, &litMatcher{ - pos: position{line: 1058, col: 46, offset: 25222}, + pos: position{line: 1058, col: 46, offset: 25203}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1058, col: 50, offset: 25226}, + pos: position{line: 1058, col: 50, offset: 25207}, name: "__", }, &labeledExpr{ - pos: position{line: 1058, col: 53, offset: 25229}, + pos: position{line: 1058, col: 53, offset: 25210}, label: "arg1", expr: &ruleRefExpr{ - pos: position{line: 1058, col: 58, offset: 25234}, + pos: position{line: 1058, col: 58, offset: 25215}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1058, col: 63, offset: 25239}, + pos: position{line: 1058, col: 63, offset: 25220}, name: "__", }, &litMatcher{ - pos: position{line: 1058, col: 66, offset: 25242}, + pos: position{line: 1058, col: 66, offset: 25223}, val: ")", ignoreCase: false, want: "\")\"", }, &labeledExpr{ - pos: position{line: 1058, col: 70, offset: 25246}, + pos: position{line: 1058, col: 70, offset: 25227}, label: "where", expr: &zeroOrOneExpr{ - pos: position{line: 1058, col: 76, offset: 25252}, + pos: position{line: 1058, col: 76, offset: 25233}, expr: &ruleRefExpr{ - pos: position{line: 1058, col: 76, offset: 25252}, + pos: position{line: 1058, col: 76, offset: 25233}, name: "WhereClause", }, }, @@ -7077,98 +7041,98 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1062, col: 5, offset: 25431}, + pos: position{line: 1062, col: 5, offset: 25412}, run: (*parser).callonFunction21, expr: &seqExpr{ - pos: position{line: 1062, col: 5, offset: 25431}, + pos: position{line: 1062, col: 5, offset: 25412}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1062, col: 5, offset: 25431}, + pos: position{line: 1062, col: 5, offset: 25412}, name: "REGEXP_REPLACE", }, &ruleRefExpr{ - pos: position{line: 1062, col: 20, offset: 25446}, + pos: position{line: 1062, col: 20, offset: 25427}, name: "__", }, &litMatcher{ - pos: position{line: 1062, col: 23, offset: 25449}, + pos: position{line: 1062, col: 23, offset: 25430}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1062, col: 27, offset: 25453}, + pos: position{line: 1062, col: 27, offset: 25434}, name: "__", }, &labeledExpr{ - pos: position{line: 1062, col: 30, offset: 25456}, + pos: position{line: 1062, col: 30, offset: 25437}, label: "arg0", expr: &ruleRefExpr{ - pos: position{line: 1062, col: 35, offset: 25461}, + pos: position{line: 1062, col: 35, offset: 25442}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1062, col: 40, offset: 25466}, + pos: position{line: 1062, col: 40, offset: 25447}, name: "__", }, &litMatcher{ - pos: position{line: 1062, col: 43, offset: 25469}, + pos: position{line: 1062, col: 43, offset: 25450}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1062, col: 47, offset: 25473}, + pos: position{line: 1062, col: 47, offset: 25454}, name: "__", }, &labeledExpr{ - pos: position{line: 1062, col: 50, offset: 25476}, + pos: position{line: 1062, col: 50, offset: 25457}, label: "arg1", expr: &ruleRefExpr{ - pos: position{line: 1062, col: 55, offset: 25481}, + pos: position{line: 1062, col: 55, offset: 25462}, name: "RegexpPrimitive", }, }, &ruleRefExpr{ - pos: position{line: 1062, col: 71, offset: 25497}, + pos: position{line: 1062, col: 71, offset: 25478}, name: "__", }, &litMatcher{ - pos: position{line: 1062, col: 74, offset: 25500}, + pos: position{line: 1062, col: 74, offset: 25481}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1062, col: 78, offset: 25504}, + pos: position{line: 1062, col: 78, offset: 25485}, name: "__", }, &labeledExpr{ - pos: position{line: 1062, col: 81, offset: 25507}, + pos: position{line: 1062, col: 81, offset: 25488}, label: "arg2", expr: &ruleRefExpr{ - pos: position{line: 1062, col: 86, offset: 25512}, + pos: position{line: 1062, col: 86, offset: 25493}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1062, col: 91, offset: 25517}, + pos: position{line: 1062, col: 91, offset: 25498}, name: "__", }, &litMatcher{ - pos: position{line: 1062, col: 94, offset: 25520}, + pos: position{line: 1062, col: 94, offset: 25501}, val: ")", ignoreCase: false, want: "\")\"", }, &labeledExpr{ - pos: position{line: 1062, col: 98, offset: 25524}, + pos: position{line: 1062, col: 98, offset: 25505}, label: "where", expr: &zeroOrOneExpr{ - pos: position{line: 1062, col: 104, offset: 25530}, + pos: position{line: 1062, col: 104, offset: 25511}, expr: &ruleRefExpr{ - pos: position{line: 1062, col: 104, offset: 25530}, + pos: position{line: 1062, col: 104, offset: 25511}, name: "WhereClause", }, }, @@ -7177,65 +7141,65 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1066, col: 5, offset: 25724}, + pos: position{line: 1066, col: 5, offset: 25705}, run: (*parser).callonFunction44, expr: &seqExpr{ - pos: position{line: 1066, col: 5, offset: 25724}, + pos: position{line: 1066, col: 5, offset: 25705}, exprs: []any{ ¬Expr{ - pos: position{line: 1066, col: 5, offset: 25724}, + pos: position{line: 1066, col: 5, offset: 25705}, expr: &ruleRefExpr{ - pos: position{line: 1066, col: 6, offset: 25725}, + pos: position{line: 1066, col: 6, offset: 25706}, name: "FuncGuard", }, }, &labeledExpr{ - pos: position{line: 1066, col: 16, offset: 25735}, + pos: position{line: 1066, col: 16, offset: 25716}, label: "fn", expr: &ruleRefExpr{ - pos: position{line: 1066, col: 19, offset: 25738}, + pos: position{line: 1066, col: 19, offset: 25719}, name: "Identifier", }, }, &ruleRefExpr{ - pos: position{line: 1066, col: 30, offset: 25749}, + pos: position{line: 1066, col: 30, offset: 25730}, name: "__", }, &litMatcher{ - pos: position{line: 1066, col: 33, offset: 25752}, + pos: position{line: 1066, col: 33, offset: 25733}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1066, col: 37, offset: 25756}, + pos: position{line: 1066, col: 37, offset: 25737}, name: "__", }, &labeledExpr{ - pos: position{line: 1066, col: 40, offset: 25759}, + pos: position{line: 1066, col: 40, offset: 25740}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 1066, col: 45, offset: 25764}, + pos: position{line: 1066, col: 45, offset: 25745}, name: "FunctionArgs", }, }, &ruleRefExpr{ - pos: position{line: 1066, col: 58, offset: 25777}, + pos: position{line: 1066, col: 58, offset: 25758}, name: "__", }, &litMatcher{ - pos: position{line: 1066, col: 61, offset: 25780}, + pos: position{line: 1066, col: 61, offset: 25761}, val: ")", ignoreCase: false, want: "\")\"", }, &labeledExpr{ - pos: position{line: 1066, col: 65, offset: 25784}, + pos: position{line: 1066, col: 65, offset: 25765}, label: "where", expr: &zeroOrOneExpr{ - pos: position{line: 1066, col: 71, offset: 25790}, + pos: position{line: 1066, col: 71, offset: 25771}, expr: &ruleRefExpr{ - pos: position{line: 1066, col: 71, offset: 25790}, + pos: position{line: 1066, col: 71, offset: 25771}, name: "WhereClause", }, }, @@ -7250,15 +7214,15 @@ var g = &grammar{ }, { name: "RegexpPrimitive", - pos: position{line: 1070, col: 1, offset: 25858}, + pos: position{line: 1070, col: 1, offset: 25839}, expr: &actionExpr{ - pos: position{line: 1071, col: 5, offset: 25878}, + pos: position{line: 1071, col: 5, offset: 25859}, run: (*parser).callonRegexpPrimitive1, expr: &labeledExpr{ - pos: position{line: 1071, col: 5, offset: 25878}, + pos: position{line: 1071, col: 5, offset: 25859}, label: "pat", expr: &ruleRefExpr{ - pos: position{line: 1071, col: 9, offset: 25882}, + pos: position{line: 1071, col: 9, offset: 25863}, name: "RegexpPattern", }, }, @@ -7268,24 +7232,24 @@ var g = &grammar{ }, { name: "FunctionArgs", - pos: position{line: 1073, col: 1, offset: 25953}, + pos: position{line: 1073, col: 1, offset: 25934}, expr: &choiceExpr{ - pos: position{line: 1074, col: 5, offset: 25970}, + pos: position{line: 1074, col: 5, offset: 25951}, alternatives: []any{ &actionExpr{ - pos: position{line: 1074, col: 5, offset: 25970}, + pos: position{line: 1074, col: 5, offset: 25951}, run: (*parser).callonFunctionArgs2, expr: &labeledExpr{ - pos: position{line: 1074, col: 5, offset: 25970}, + pos: position{line: 1074, col: 5, offset: 25951}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 1074, col: 7, offset: 25972}, + pos: position{line: 1074, col: 7, offset: 25953}, name: "OverExpr", }, }, }, &ruleRefExpr{ - pos: position{line: 1075, col: 5, offset: 26010}, + pos: position{line: 1075, col: 5, offset: 25991}, name: "OptionalExprs", }, }, @@ -7295,96 +7259,96 @@ var g = &grammar{ }, { name: "Grep", - pos: position{line: 1077, col: 1, offset: 26025}, + pos: position{line: 1077, col: 1, offset: 26006}, expr: &actionExpr{ - pos: position{line: 1078, col: 5, offset: 26034}, + pos: position{line: 1078, col: 5, offset: 26015}, run: (*parser).callonGrep1, expr: &seqExpr{ - pos: position{line: 1078, col: 5, offset: 26034}, + pos: position{line: 1078, col: 5, offset: 26015}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1078, col: 5, offset: 26034}, + pos: position{line: 1078, col: 5, offset: 26015}, name: "GREP", }, &ruleRefExpr{ - pos: position{line: 1078, col: 10, offset: 26039}, + pos: position{line: 1078, col: 10, offset: 26020}, name: "__", }, &litMatcher{ - pos: position{line: 1078, col: 13, offset: 26042}, + pos: position{line: 1078, col: 13, offset: 26023}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1078, col: 17, offset: 26046}, + pos: position{line: 1078, col: 17, offset: 26027}, name: "__", }, &labeledExpr{ - pos: position{line: 1078, col: 20, offset: 26049}, + pos: position{line: 1078, col: 20, offset: 26030}, label: "pattern", expr: &choiceExpr{ - pos: position{line: 1078, col: 29, offset: 26058}, + pos: position{line: 1078, col: 29, offset: 26039}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1078, col: 29, offset: 26058}, + pos: position{line: 1078, col: 29, offset: 26039}, name: "Regexp", }, &ruleRefExpr{ - pos: position{line: 1078, col: 38, offset: 26067}, + pos: position{line: 1078, col: 38, offset: 26048}, name: "Glob", }, &ruleRefExpr{ - pos: position{line: 1078, col: 45, offset: 26074}, + pos: position{line: 1078, col: 45, offset: 26055}, name: "Expr", }, }, }, }, &ruleRefExpr{ - pos: position{line: 1078, col: 51, offset: 26080}, + pos: position{line: 1078, col: 51, offset: 26061}, name: "__", }, &labeledExpr{ - pos: position{line: 1078, col: 54, offset: 26083}, + pos: position{line: 1078, col: 54, offset: 26064}, label: "opt", expr: &zeroOrOneExpr{ - pos: position{line: 1078, col: 58, offset: 26087}, + pos: position{line: 1078, col: 58, offset: 26068}, expr: &actionExpr{ - pos: position{line: 1078, col: 59, offset: 26088}, + pos: position{line: 1078, col: 59, offset: 26069}, run: (*parser).callonGrep15, expr: &seqExpr{ - pos: position{line: 1078, col: 59, offset: 26088}, + pos: position{line: 1078, col: 59, offset: 26069}, exprs: []any{ &litMatcher{ - pos: position{line: 1078, col: 59, offset: 26088}, + pos: position{line: 1078, col: 59, offset: 26069}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1078, col: 63, offset: 26092}, + pos: position{line: 1078, col: 63, offset: 26073}, name: "__", }, &labeledExpr{ - pos: position{line: 1078, col: 66, offset: 26095}, + pos: position{line: 1078, col: 66, offset: 26076}, label: "e", expr: &choiceExpr{ - pos: position{line: 1078, col: 69, offset: 26098}, + pos: position{line: 1078, col: 69, offset: 26079}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1078, col: 69, offset: 26098}, + pos: position{line: 1078, col: 69, offset: 26079}, name: "OverExpr", }, &ruleRefExpr{ - pos: position{line: 1078, col: 80, offset: 26109}, + pos: position{line: 1078, col: 80, offset: 26090}, name: "Expr", }, }, }, }, &ruleRefExpr{ - pos: position{line: 1078, col: 86, offset: 26115}, + pos: position{line: 1078, col: 86, offset: 26096}, name: "__", }, }, @@ -7393,7 +7357,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1078, col: 109, offset: 26138}, + pos: position{line: 1078, col: 109, offset: 26119}, val: ")", ignoreCase: false, want: "\")\"", @@ -7406,19 +7370,19 @@ var g = &grammar{ }, { name: "OptionalExprs", - pos: position{line: 1090, col: 1, offset: 26351}, + pos: position{line: 1090, col: 1, offset: 26332}, expr: &choiceExpr{ - pos: position{line: 1091, col: 5, offset: 26369}, + pos: position{line: 1091, col: 5, offset: 26350}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1091, col: 5, offset: 26369}, + pos: position{line: 1091, col: 5, offset: 26350}, name: "Exprs", }, &actionExpr{ - pos: position{line: 1092, col: 5, offset: 26379}, + pos: position{line: 1092, col: 5, offset: 26360}, run: (*parser).callonOptionalExprs3, expr: &ruleRefExpr{ - pos: position{line: 1092, col: 5, offset: 26379}, + pos: position{line: 1092, col: 5, offset: 26360}, name: "__", }, }, @@ -7429,51 +7393,51 @@ var g = &grammar{ }, { name: "Exprs", - pos: position{line: 1094, col: 1, offset: 26407}, + pos: position{line: 1094, col: 1, offset: 26388}, expr: &actionExpr{ - pos: position{line: 1095, col: 5, offset: 26417}, + pos: position{line: 1095, col: 5, offset: 26398}, run: (*parser).callonExprs1, expr: &seqExpr{ - pos: position{line: 1095, col: 5, offset: 26417}, + pos: position{line: 1095, col: 5, offset: 26398}, exprs: []any{ &labeledExpr{ - pos: position{line: 1095, col: 5, offset: 26417}, + pos: position{line: 1095, col: 5, offset: 26398}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1095, col: 11, offset: 26423}, + pos: position{line: 1095, col: 11, offset: 26404}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 1095, col: 16, offset: 26428}, + pos: position{line: 1095, col: 16, offset: 26409}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1095, col: 21, offset: 26433}, + pos: position{line: 1095, col: 21, offset: 26414}, expr: &actionExpr{ - pos: position{line: 1095, col: 22, offset: 26434}, + pos: position{line: 1095, col: 22, offset: 26415}, run: (*parser).callonExprs7, expr: &seqExpr{ - pos: position{line: 1095, col: 22, offset: 26434}, + pos: position{line: 1095, col: 22, offset: 26415}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1095, col: 22, offset: 26434}, + pos: position{line: 1095, col: 22, offset: 26415}, name: "__", }, &litMatcher{ - pos: position{line: 1095, col: 25, offset: 26437}, + pos: position{line: 1095, col: 25, offset: 26418}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1095, col: 29, offset: 26441}, + pos: position{line: 1095, col: 29, offset: 26422}, name: "__", }, &labeledExpr{ - pos: position{line: 1095, col: 32, offset: 26444}, + pos: position{line: 1095, col: 32, offset: 26425}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1095, col: 34, offset: 26446}, + pos: position{line: 1095, col: 34, offset: 26427}, name: "Expr", }, }, @@ -7490,68 +7454,68 @@ var g = &grammar{ }, { name: "Primary", - pos: position{line: 1099, col: 1, offset: 26519}, + pos: position{line: 1099, col: 1, offset: 26500}, expr: &choiceExpr{ - pos: position{line: 1100, col: 5, offset: 26531}, + pos: position{line: 1100, col: 5, offset: 26512}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1100, col: 5, offset: 26531}, + pos: position{line: 1100, col: 5, offset: 26512}, name: "CaseExpr", }, &ruleRefExpr{ - pos: position{line: 1101, col: 5, offset: 26544}, + pos: position{line: 1101, col: 5, offset: 26525}, name: "Record", }, &ruleRefExpr{ - pos: position{line: 1102, col: 5, offset: 26555}, + pos: position{line: 1102, col: 5, offset: 26536}, name: "Array", }, &ruleRefExpr{ - pos: position{line: 1103, col: 5, offset: 26565}, + pos: position{line: 1103, col: 5, offset: 26546}, name: "Set", }, &ruleRefExpr{ - pos: position{line: 1104, col: 5, offset: 26573}, + pos: position{line: 1104, col: 5, offset: 26554}, name: "Map", }, &ruleRefExpr{ - pos: position{line: 1105, col: 5, offset: 26581}, + pos: position{line: 1105, col: 5, offset: 26562}, name: "Literal", }, &ruleRefExpr{ - pos: position{line: 1106, col: 5, offset: 26593}, + pos: position{line: 1106, col: 5, offset: 26574}, name: "Identifier", }, &actionExpr{ - pos: position{line: 1107, col: 5, offset: 26608}, + pos: position{line: 1107, col: 5, offset: 26589}, run: (*parser).callonPrimary9, expr: &seqExpr{ - pos: position{line: 1107, col: 5, offset: 26608}, + pos: position{line: 1107, col: 5, offset: 26589}, exprs: []any{ &litMatcher{ - pos: position{line: 1107, col: 5, offset: 26608}, + pos: position{line: 1107, col: 5, offset: 26589}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1107, col: 9, offset: 26612}, + pos: position{line: 1107, col: 9, offset: 26593}, name: "__", }, &labeledExpr{ - pos: position{line: 1107, col: 12, offset: 26615}, + pos: position{line: 1107, col: 12, offset: 26596}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1107, col: 17, offset: 26620}, + pos: position{line: 1107, col: 17, offset: 26601}, name: "OverExpr", }, }, &ruleRefExpr{ - pos: position{line: 1107, col: 26, offset: 26629}, + pos: position{line: 1107, col: 26, offset: 26610}, name: "__", }, &litMatcher{ - pos: position{line: 1107, col: 29, offset: 26632}, + pos: position{line: 1107, col: 29, offset: 26613}, val: ")", ignoreCase: false, want: "\")\"", @@ -7560,35 +7524,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1108, col: 5, offset: 26661}, + pos: position{line: 1108, col: 5, offset: 26642}, run: (*parser).callonPrimary17, expr: &seqExpr{ - pos: position{line: 1108, col: 5, offset: 26661}, + pos: position{line: 1108, col: 5, offset: 26642}, exprs: []any{ &litMatcher{ - pos: position{line: 1108, col: 5, offset: 26661}, + pos: position{line: 1108, col: 5, offset: 26642}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1108, col: 9, offset: 26665}, + pos: position{line: 1108, col: 9, offset: 26646}, name: "__", }, &labeledExpr{ - pos: position{line: 1108, col: 12, offset: 26668}, + pos: position{line: 1108, col: 12, offset: 26649}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1108, col: 17, offset: 26673}, + pos: position{line: 1108, col: 17, offset: 26654}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1108, col: 22, offset: 26678}, + pos: position{line: 1108, col: 22, offset: 26659}, name: "__", }, &litMatcher{ - pos: position{line: 1108, col: 25, offset: 26681}, + pos: position{line: 1108, col: 25, offset: 26662}, val: ")", ignoreCase: false, want: "\")\"", @@ -7603,55 +7567,55 @@ var g = &grammar{ }, { name: "CaseExpr", - pos: position{line: 1110, col: 1, offset: 26707}, + pos: position{line: 1110, col: 1, offset: 26688}, expr: &choiceExpr{ - pos: position{line: 1111, col: 5, offset: 26720}, + pos: position{line: 1111, col: 5, offset: 26701}, alternatives: []any{ &actionExpr{ - pos: position{line: 1111, col: 5, offset: 26720}, + pos: position{line: 1111, col: 5, offset: 26701}, run: (*parser).callonCaseExpr2, expr: &seqExpr{ - pos: position{line: 1111, col: 5, offset: 26720}, + pos: position{line: 1111, col: 5, offset: 26701}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1111, col: 5, offset: 26720}, + pos: position{line: 1111, col: 5, offset: 26701}, name: "CASE", }, &labeledExpr{ - pos: position{line: 1111, col: 10, offset: 26725}, + pos: position{line: 1111, col: 10, offset: 26706}, label: "cases", expr: &oneOrMoreExpr{ - pos: position{line: 1111, col: 16, offset: 26731}, + pos: position{line: 1111, col: 16, offset: 26712}, expr: &ruleRefExpr{ - pos: position{line: 1111, col: 16, offset: 26731}, + pos: position{line: 1111, col: 16, offset: 26712}, name: "When", }, }, }, &labeledExpr{ - pos: position{line: 1111, col: 22, offset: 26737}, + pos: position{line: 1111, col: 22, offset: 26718}, label: "else_", expr: &zeroOrOneExpr{ - pos: position{line: 1111, col: 28, offset: 26743}, + pos: position{line: 1111, col: 28, offset: 26724}, expr: &seqExpr{ - pos: position{line: 1111, col: 29, offset: 26744}, + pos: position{line: 1111, col: 29, offset: 26725}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1111, col: 29, offset: 26744}, + pos: position{line: 1111, col: 29, offset: 26725}, name: "_", }, &litMatcher{ - pos: position{line: 1111, col: 31, offset: 26746}, + pos: position{line: 1111, col: 31, offset: 26727}, val: "else", ignoreCase: false, want: "\"else\"", }, &ruleRefExpr{ - pos: position{line: 1111, col: 38, offset: 26753}, + pos: position{line: 1111, col: 38, offset: 26734}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1111, col: 40, offset: 26755}, + pos: position{line: 1111, col: 40, offset: 26736}, name: "Expr", }, }, @@ -7659,24 +7623,24 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1111, col: 47, offset: 26762}, + pos: position{line: 1111, col: 47, offset: 26743}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1111, col: 49, offset: 26764}, + pos: position{line: 1111, col: 49, offset: 26745}, name: "END", }, &zeroOrOneExpr{ - pos: position{line: 1111, col: 53, offset: 26768}, + pos: position{line: 1111, col: 53, offset: 26749}, expr: &seqExpr{ - pos: position{line: 1111, col: 54, offset: 26769}, + pos: position{line: 1111, col: 54, offset: 26750}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1111, col: 54, offset: 26769}, + pos: position{line: 1111, col: 54, offset: 26750}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1111, col: 56, offset: 26771}, + pos: position{line: 1111, col: 56, offset: 26752}, name: "CASE", }, }, @@ -7686,62 +7650,62 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1135, col: 5, offset: 27420}, + pos: position{line: 1135, col: 5, offset: 27401}, run: (*parser).callonCaseExpr21, expr: &seqExpr{ - pos: position{line: 1135, col: 5, offset: 27420}, + pos: position{line: 1135, col: 5, offset: 27401}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1135, col: 5, offset: 27420}, + pos: position{line: 1135, col: 5, offset: 27401}, name: "CASE", }, &ruleRefExpr{ - pos: position{line: 1135, col: 10, offset: 27425}, + pos: position{line: 1135, col: 10, offset: 27406}, name: "_", }, &labeledExpr{ - pos: position{line: 1135, col: 12, offset: 27427}, + pos: position{line: 1135, col: 12, offset: 27408}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1135, col: 17, offset: 27432}, + pos: position{line: 1135, col: 17, offset: 27413}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 1135, col: 22, offset: 27437}, + pos: position{line: 1135, col: 22, offset: 27418}, label: "whens", expr: &oneOrMoreExpr{ - pos: position{line: 1135, col: 28, offset: 27443}, + pos: position{line: 1135, col: 28, offset: 27424}, expr: &ruleRefExpr{ - pos: position{line: 1135, col: 28, offset: 27443}, + pos: position{line: 1135, col: 28, offset: 27424}, name: "When", }, }, }, &labeledExpr{ - pos: position{line: 1135, col: 34, offset: 27449}, + pos: position{line: 1135, col: 34, offset: 27430}, label: "else_", expr: &zeroOrOneExpr{ - pos: position{line: 1135, col: 40, offset: 27455}, + pos: position{line: 1135, col: 40, offset: 27436}, expr: &seqExpr{ - pos: position{line: 1135, col: 41, offset: 27456}, + pos: position{line: 1135, col: 41, offset: 27437}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1135, col: 41, offset: 27456}, + pos: position{line: 1135, col: 41, offset: 27437}, name: "_", }, &litMatcher{ - pos: position{line: 1135, col: 43, offset: 27458}, + pos: position{line: 1135, col: 43, offset: 27439}, val: "else", ignoreCase: false, want: "\"else\"", }, &ruleRefExpr{ - pos: position{line: 1135, col: 50, offset: 27465}, + pos: position{line: 1135, col: 50, offset: 27446}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1135, col: 52, offset: 27467}, + pos: position{line: 1135, col: 52, offset: 27448}, name: "Expr", }, }, @@ -7749,24 +7713,24 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1135, col: 59, offset: 27474}, + pos: position{line: 1135, col: 59, offset: 27455}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1135, col: 61, offset: 27476}, + pos: position{line: 1135, col: 61, offset: 27457}, name: "END", }, &zeroOrOneExpr{ - pos: position{line: 1135, col: 65, offset: 27480}, + pos: position{line: 1135, col: 65, offset: 27461}, expr: &seqExpr{ - pos: position{line: 1135, col: 66, offset: 27481}, + pos: position{line: 1135, col: 66, offset: 27462}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1135, col: 66, offset: 27481}, + pos: position{line: 1135, col: 66, offset: 27462}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1135, col: 68, offset: 27483}, + pos: position{line: 1135, col: 68, offset: 27464}, name: "CASE", }, }, @@ -7782,50 +7746,50 @@ var g = &grammar{ }, { name: "When", - pos: position{line: 1148, col: 1, offset: 27789}, + pos: position{line: 1148, col: 1, offset: 27770}, expr: &actionExpr{ - pos: position{line: 1149, col: 5, offset: 27798}, + pos: position{line: 1149, col: 5, offset: 27779}, run: (*parser).callonWhen1, expr: &seqExpr{ - pos: position{line: 1149, col: 5, offset: 27798}, + pos: position{line: 1149, col: 5, offset: 27779}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1149, col: 5, offset: 27798}, + pos: position{line: 1149, col: 5, offset: 27779}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1149, col: 7, offset: 27800}, + pos: position{line: 1149, col: 7, offset: 27781}, name: "WHEN", }, &ruleRefExpr{ - pos: position{line: 1149, col: 12, offset: 27805}, + pos: position{line: 1149, col: 12, offset: 27786}, name: "_", }, &labeledExpr{ - pos: position{line: 1149, col: 14, offset: 27807}, + pos: position{line: 1149, col: 14, offset: 27788}, label: "cond", expr: &ruleRefExpr{ - pos: position{line: 1149, col: 19, offset: 27812}, + pos: position{line: 1149, col: 19, offset: 27793}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1149, col: 24, offset: 27817}, + pos: position{line: 1149, col: 24, offset: 27798}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1149, col: 26, offset: 27819}, + pos: position{line: 1149, col: 26, offset: 27800}, name: "THEN", }, &ruleRefExpr{ - pos: position{line: 1149, col: 31, offset: 27824}, + pos: position{line: 1149, col: 31, offset: 27805}, name: "_", }, &labeledExpr{ - pos: position{line: 1149, col: 33, offset: 27826}, + pos: position{line: 1149, col: 33, offset: 27807}, label: "then", expr: &ruleRefExpr{ - pos: position{line: 1149, col: 38, offset: 27831}, + pos: position{line: 1149, col: 38, offset: 27812}, name: "Expr", }, }, @@ -7837,57 +7801,57 @@ var g = &grammar{ }, { name: "OverExpr", - pos: position{line: 1158, col: 1, offset: 27990}, + pos: position{line: 1158, col: 1, offset: 27971}, expr: &actionExpr{ - pos: position{line: 1159, col: 5, offset: 28003}, + pos: position{line: 1159, col: 5, offset: 27984}, run: (*parser).callonOverExpr1, expr: &seqExpr{ - pos: position{line: 1159, col: 5, offset: 28003}, + pos: position{line: 1159, col: 5, offset: 27984}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1159, col: 5, offset: 28003}, + pos: position{line: 1159, col: 5, offset: 27984}, name: "OVER", }, &ruleRefExpr{ - pos: position{line: 1159, col: 10, offset: 28008}, + pos: position{line: 1159, col: 10, offset: 27989}, name: "_", }, &labeledExpr{ - pos: position{line: 1159, col: 12, offset: 28010}, + pos: position{line: 1159, col: 12, offset: 27991}, label: "exprs", expr: &ruleRefExpr{ - pos: position{line: 1159, col: 18, offset: 28016}, + pos: position{line: 1159, col: 18, offset: 27997}, name: "Exprs", }, }, &labeledExpr{ - pos: position{line: 1159, col: 24, offset: 28022}, + pos: position{line: 1159, col: 24, offset: 28003}, label: "locals", expr: &zeroOrOneExpr{ - pos: position{line: 1159, col: 31, offset: 28029}, + pos: position{line: 1159, col: 31, offset: 28010}, expr: &ruleRefExpr{ - pos: position{line: 1159, col: 31, offset: 28029}, + pos: position{line: 1159, col: 31, offset: 28010}, name: "Locals", }, }, }, &ruleRefExpr{ - pos: position{line: 1159, col: 39, offset: 28037}, + pos: position{line: 1159, col: 39, offset: 28018}, name: "__", }, &ruleRefExpr{ - pos: position{line: 1159, col: 42, offset: 28040}, + pos: position{line: 1159, col: 42, offset: 28021}, name: "Pipe", }, &ruleRefExpr{ - pos: position{line: 1159, col: 47, offset: 28045}, + pos: position{line: 1159, col: 47, offset: 28026}, name: "__", }, &labeledExpr{ - pos: position{line: 1159, col: 50, offset: 28048}, + pos: position{line: 1159, col: 50, offset: 28029}, label: "body", expr: &ruleRefExpr{ - pos: position{line: 1159, col: 55, offset: 28053}, + pos: position{line: 1159, col: 55, offset: 28034}, name: "Seq", }, }, @@ -7899,37 +7863,37 @@ var g = &grammar{ }, { name: "Record", - pos: position{line: 1169, col: 1, offset: 28284}, + pos: position{line: 1169, col: 1, offset: 28265}, expr: &actionExpr{ - pos: position{line: 1170, col: 5, offset: 28295}, + pos: position{line: 1170, col: 5, offset: 28276}, run: (*parser).callonRecord1, expr: &seqExpr{ - pos: position{line: 1170, col: 5, offset: 28295}, + pos: position{line: 1170, col: 5, offset: 28276}, exprs: []any{ &litMatcher{ - pos: position{line: 1170, col: 5, offset: 28295}, + pos: position{line: 1170, col: 5, offset: 28276}, val: "{", ignoreCase: false, want: "\"{\"", }, &ruleRefExpr{ - pos: position{line: 1170, col: 9, offset: 28299}, + pos: position{line: 1170, col: 9, offset: 28280}, name: "__", }, &labeledExpr{ - pos: position{line: 1170, col: 12, offset: 28302}, + pos: position{line: 1170, col: 12, offset: 28283}, label: "elems", expr: &ruleRefExpr{ - pos: position{line: 1170, col: 18, offset: 28308}, + pos: position{line: 1170, col: 18, offset: 28289}, name: "RecordElems", }, }, &ruleRefExpr{ - pos: position{line: 1170, col: 30, offset: 28320}, + pos: position{line: 1170, col: 30, offset: 28301}, name: "__", }, &litMatcher{ - pos: position{line: 1170, col: 33, offset: 28323}, + pos: position{line: 1170, col: 33, offset: 28304}, val: "}", ignoreCase: false, want: "\"}\"", @@ -7942,31 +7906,31 @@ var g = &grammar{ }, { name: "RecordElems", - pos: position{line: 1178, col: 1, offset: 28481}, + pos: position{line: 1178, col: 1, offset: 28462}, expr: &choiceExpr{ - pos: position{line: 1179, col: 5, offset: 28497}, + pos: position{line: 1179, col: 5, offset: 28478}, alternatives: []any{ &actionExpr{ - pos: position{line: 1179, col: 5, offset: 28497}, + pos: position{line: 1179, col: 5, offset: 28478}, run: (*parser).callonRecordElems2, expr: &seqExpr{ - pos: position{line: 1179, col: 5, offset: 28497}, + pos: position{line: 1179, col: 5, offset: 28478}, exprs: []any{ &labeledExpr{ - pos: position{line: 1179, col: 5, offset: 28497}, + pos: position{line: 1179, col: 5, offset: 28478}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1179, col: 11, offset: 28503}, + pos: position{line: 1179, col: 11, offset: 28484}, name: "RecordElem", }, }, &labeledExpr{ - pos: position{line: 1179, col: 22, offset: 28514}, + pos: position{line: 1179, col: 22, offset: 28495}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1179, col: 27, offset: 28519}, + pos: position{line: 1179, col: 27, offset: 28500}, expr: &ruleRefExpr{ - pos: position{line: 1179, col: 27, offset: 28519}, + pos: position{line: 1179, col: 27, offset: 28500}, name: "RecordElemTail", }, }, @@ -7975,10 +7939,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1182, col: 5, offset: 28582}, + pos: position{line: 1182, col: 5, offset: 28563}, run: (*parser).callonRecordElems9, expr: &ruleRefExpr{ - pos: position{line: 1182, col: 5, offset: 28582}, + pos: position{line: 1182, col: 5, offset: 28563}, name: "__", }, }, @@ -7989,32 +7953,32 @@ var g = &grammar{ }, { name: "RecordElemTail", - pos: position{line: 1184, col: 1, offset: 28606}, + pos: position{line: 1184, col: 1, offset: 28587}, expr: &actionExpr{ - pos: position{line: 1184, col: 18, offset: 28623}, + pos: position{line: 1184, col: 18, offset: 28604}, run: (*parser).callonRecordElemTail1, expr: &seqExpr{ - pos: position{line: 1184, col: 18, offset: 28623}, + pos: position{line: 1184, col: 18, offset: 28604}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1184, col: 18, offset: 28623}, + pos: position{line: 1184, col: 18, offset: 28604}, name: "__", }, &litMatcher{ - pos: position{line: 1184, col: 21, offset: 28626}, + pos: position{line: 1184, col: 21, offset: 28607}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1184, col: 25, offset: 28630}, + pos: position{line: 1184, col: 25, offset: 28611}, name: "__", }, &labeledExpr{ - pos: position{line: 1184, col: 28, offset: 28633}, + pos: position{line: 1184, col: 28, offset: 28614}, label: "elem", expr: &ruleRefExpr{ - pos: position{line: 1184, col: 33, offset: 28638}, + pos: position{line: 1184, col: 33, offset: 28619}, name: "RecordElem", }, }, @@ -8026,20 +7990,20 @@ var g = &grammar{ }, { name: "RecordElem", - pos: position{line: 1186, col: 1, offset: 28671}, + pos: position{line: 1186, col: 1, offset: 28652}, expr: &choiceExpr{ - pos: position{line: 1187, col: 5, offset: 28686}, + pos: position{line: 1187, col: 5, offset: 28667}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1187, col: 5, offset: 28686}, + pos: position{line: 1187, col: 5, offset: 28667}, name: "Spread", }, &ruleRefExpr{ - pos: position{line: 1188, col: 5, offset: 28697}, + pos: position{line: 1188, col: 5, offset: 28678}, name: "FieldExpr", }, &ruleRefExpr{ - pos: position{line: 1189, col: 5, offset: 28711}, + pos: position{line: 1189, col: 5, offset: 28692}, name: "Identifier", }, }, @@ -8049,28 +8013,28 @@ var g = &grammar{ }, { name: "Spread", - pos: position{line: 1191, col: 1, offset: 28723}, + pos: position{line: 1191, col: 1, offset: 28704}, expr: &actionExpr{ - pos: position{line: 1192, col: 5, offset: 28734}, + pos: position{line: 1192, col: 5, offset: 28715}, run: (*parser).callonSpread1, expr: &seqExpr{ - pos: position{line: 1192, col: 5, offset: 28734}, + pos: position{line: 1192, col: 5, offset: 28715}, exprs: []any{ &litMatcher{ - pos: position{line: 1192, col: 5, offset: 28734}, + pos: position{line: 1192, col: 5, offset: 28715}, val: "...", ignoreCase: false, want: "\"...\"", }, &ruleRefExpr{ - pos: position{line: 1192, col: 11, offset: 28740}, + pos: position{line: 1192, col: 11, offset: 28721}, name: "__", }, &labeledExpr{ - pos: position{line: 1192, col: 14, offset: 28743}, + pos: position{line: 1192, col: 14, offset: 28724}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1192, col: 19, offset: 28748}, + pos: position{line: 1192, col: 19, offset: 28729}, name: "Expr", }, }, @@ -8082,40 +8046,40 @@ var g = &grammar{ }, { name: "FieldExpr", - pos: position{line: 1196, col: 1, offset: 28844}, + pos: position{line: 1196, col: 1, offset: 28825}, expr: &actionExpr{ - pos: position{line: 1197, col: 5, offset: 28858}, + pos: position{line: 1197, col: 5, offset: 28839}, run: (*parser).callonFieldExpr1, expr: &seqExpr{ - pos: position{line: 1197, col: 5, offset: 28858}, + pos: position{line: 1197, col: 5, offset: 28839}, exprs: []any{ &labeledExpr{ - pos: position{line: 1197, col: 5, offset: 28858}, + pos: position{line: 1197, col: 5, offset: 28839}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1197, col: 10, offset: 28863}, + pos: position{line: 1197, col: 10, offset: 28844}, name: "Name", }, }, &ruleRefExpr{ - pos: position{line: 1197, col: 15, offset: 28868}, + pos: position{line: 1197, col: 15, offset: 28849}, name: "__", }, &litMatcher{ - pos: position{line: 1197, col: 18, offset: 28871}, + pos: position{line: 1197, col: 18, offset: 28852}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1197, col: 22, offset: 28875}, + pos: position{line: 1197, col: 22, offset: 28856}, name: "__", }, &labeledExpr{ - pos: position{line: 1197, col: 25, offset: 28878}, + pos: position{line: 1197, col: 25, offset: 28859}, label: "value", expr: &ruleRefExpr{ - pos: position{line: 1197, col: 31, offset: 28884}, + pos: position{line: 1197, col: 31, offset: 28865}, name: "Expr", }, }, @@ -8127,37 +8091,37 @@ var g = &grammar{ }, { name: "Array", - pos: position{line: 1206, col: 1, offset: 29053}, + pos: position{line: 1206, col: 1, offset: 29034}, expr: &actionExpr{ - pos: position{line: 1207, col: 5, offset: 29063}, + pos: position{line: 1207, col: 5, offset: 29044}, run: (*parser).callonArray1, expr: &seqExpr{ - pos: position{line: 1207, col: 5, offset: 29063}, + pos: position{line: 1207, col: 5, offset: 29044}, exprs: []any{ &litMatcher{ - pos: position{line: 1207, col: 5, offset: 29063}, + pos: position{line: 1207, col: 5, offset: 29044}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 1207, col: 9, offset: 29067}, + pos: position{line: 1207, col: 9, offset: 29048}, name: "__", }, &labeledExpr{ - pos: position{line: 1207, col: 12, offset: 29070}, + pos: position{line: 1207, col: 12, offset: 29051}, label: "elems", expr: &ruleRefExpr{ - pos: position{line: 1207, col: 18, offset: 29076}, + pos: position{line: 1207, col: 18, offset: 29057}, name: "VectorElems", }, }, &ruleRefExpr{ - pos: position{line: 1207, col: 30, offset: 29088}, + pos: position{line: 1207, col: 30, offset: 29069}, name: "__", }, &litMatcher{ - pos: position{line: 1207, col: 33, offset: 29091}, + pos: position{line: 1207, col: 33, offset: 29072}, val: "]", ignoreCase: false, want: "\"]\"", @@ -8170,37 +8134,37 @@ var g = &grammar{ }, { name: "Set", - pos: position{line: 1215, col: 1, offset: 29247}, + pos: position{line: 1215, col: 1, offset: 29228}, expr: &actionExpr{ - pos: position{line: 1216, col: 5, offset: 29255}, + pos: position{line: 1216, col: 5, offset: 29236}, run: (*parser).callonSet1, expr: &seqExpr{ - pos: position{line: 1216, col: 5, offset: 29255}, + pos: position{line: 1216, col: 5, offset: 29236}, exprs: []any{ &litMatcher{ - pos: position{line: 1216, col: 5, offset: 29255}, + pos: position{line: 1216, col: 5, offset: 29236}, val: "|[", ignoreCase: false, want: "\"|[\"", }, &ruleRefExpr{ - pos: position{line: 1216, col: 10, offset: 29260}, + pos: position{line: 1216, col: 10, offset: 29241}, name: "__", }, &labeledExpr{ - pos: position{line: 1216, col: 13, offset: 29263}, + pos: position{line: 1216, col: 13, offset: 29244}, label: "elems", expr: &ruleRefExpr{ - pos: position{line: 1216, col: 19, offset: 29269}, + pos: position{line: 1216, col: 19, offset: 29250}, name: "VectorElems", }, }, &ruleRefExpr{ - pos: position{line: 1216, col: 31, offset: 29281}, + pos: position{line: 1216, col: 31, offset: 29262}, name: "__", }, &litMatcher{ - pos: position{line: 1216, col: 34, offset: 29284}, + pos: position{line: 1216, col: 34, offset: 29265}, val: "]|", ignoreCase: false, want: "\"]|\"", @@ -8213,54 +8177,54 @@ var g = &grammar{ }, { name: "VectorElems", - pos: position{line: 1224, col: 1, offset: 29437}, + pos: position{line: 1224, col: 1, offset: 29418}, expr: &choiceExpr{ - pos: position{line: 1225, col: 5, offset: 29453}, + pos: position{line: 1225, col: 5, offset: 29434}, alternatives: []any{ &actionExpr{ - pos: position{line: 1225, col: 5, offset: 29453}, + pos: position{line: 1225, col: 5, offset: 29434}, run: (*parser).callonVectorElems2, expr: &seqExpr{ - pos: position{line: 1225, col: 5, offset: 29453}, + pos: position{line: 1225, col: 5, offset: 29434}, exprs: []any{ &labeledExpr{ - pos: position{line: 1225, col: 5, offset: 29453}, + pos: position{line: 1225, col: 5, offset: 29434}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1225, col: 11, offset: 29459}, + pos: position{line: 1225, col: 11, offset: 29440}, name: "VectorElem", }, }, &labeledExpr{ - pos: position{line: 1225, col: 22, offset: 29470}, + pos: position{line: 1225, col: 22, offset: 29451}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1225, col: 27, offset: 29475}, + pos: position{line: 1225, col: 27, offset: 29456}, expr: &actionExpr{ - pos: position{line: 1225, col: 28, offset: 29476}, + pos: position{line: 1225, col: 28, offset: 29457}, run: (*parser).callonVectorElems8, expr: &seqExpr{ - pos: position{line: 1225, col: 28, offset: 29476}, + pos: position{line: 1225, col: 28, offset: 29457}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1225, col: 28, offset: 29476}, + pos: position{line: 1225, col: 28, offset: 29457}, name: "__", }, &litMatcher{ - pos: position{line: 1225, col: 31, offset: 29479}, + pos: position{line: 1225, col: 31, offset: 29460}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1225, col: 35, offset: 29483}, + pos: position{line: 1225, col: 35, offset: 29464}, name: "__", }, &labeledExpr{ - pos: position{line: 1225, col: 38, offset: 29486}, + pos: position{line: 1225, col: 38, offset: 29467}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1225, col: 40, offset: 29488}, + pos: position{line: 1225, col: 40, offset: 29469}, name: "VectorElem", }, }, @@ -8273,10 +8237,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1228, col: 5, offset: 29570}, + pos: position{line: 1228, col: 5, offset: 29551}, run: (*parser).callonVectorElems15, expr: &ruleRefExpr{ - pos: position{line: 1228, col: 5, offset: 29570}, + pos: position{line: 1228, col: 5, offset: 29551}, name: "__", }, }, @@ -8287,22 +8251,22 @@ var g = &grammar{ }, { name: "VectorElem", - pos: position{line: 1230, col: 1, offset: 29594}, + pos: position{line: 1230, col: 1, offset: 29575}, expr: &choiceExpr{ - pos: position{line: 1231, col: 5, offset: 29609}, + pos: position{line: 1231, col: 5, offset: 29590}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1231, col: 5, offset: 29609}, + pos: position{line: 1231, col: 5, offset: 29590}, name: "Spread", }, &actionExpr{ - pos: position{line: 1232, col: 5, offset: 29620}, + pos: position{line: 1232, col: 5, offset: 29601}, run: (*parser).callonVectorElem3, expr: &labeledExpr{ - pos: position{line: 1232, col: 5, offset: 29620}, + pos: position{line: 1232, col: 5, offset: 29601}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1232, col: 7, offset: 29622}, + pos: position{line: 1232, col: 7, offset: 29603}, name: "Expr", }, }, @@ -8314,37 +8278,37 @@ var g = &grammar{ }, { name: "Map", - pos: position{line: 1234, col: 1, offset: 29713}, + pos: position{line: 1234, col: 1, offset: 29694}, expr: &actionExpr{ - pos: position{line: 1235, col: 5, offset: 29721}, + pos: position{line: 1235, col: 5, offset: 29702}, run: (*parser).callonMap1, expr: &seqExpr{ - pos: position{line: 1235, col: 5, offset: 29721}, + pos: position{line: 1235, col: 5, offset: 29702}, exprs: []any{ &litMatcher{ - pos: position{line: 1235, col: 5, offset: 29721}, + pos: position{line: 1235, col: 5, offset: 29702}, val: "|{", ignoreCase: false, want: "\"|{\"", }, &ruleRefExpr{ - pos: position{line: 1235, col: 10, offset: 29726}, + pos: position{line: 1235, col: 10, offset: 29707}, name: "__", }, &labeledExpr{ - pos: position{line: 1235, col: 13, offset: 29729}, + pos: position{line: 1235, col: 13, offset: 29710}, label: "exprs", expr: &ruleRefExpr{ - pos: position{line: 1235, col: 19, offset: 29735}, + pos: position{line: 1235, col: 19, offset: 29716}, name: "Entries", }, }, &ruleRefExpr{ - pos: position{line: 1235, col: 27, offset: 29743}, + pos: position{line: 1235, col: 27, offset: 29724}, name: "__", }, &litMatcher{ - pos: position{line: 1235, col: 30, offset: 29746}, + pos: position{line: 1235, col: 30, offset: 29727}, val: "}|", ignoreCase: false, want: "\"}|\"", @@ -8357,31 +8321,31 @@ var g = &grammar{ }, { name: "Entries", - pos: position{line: 1243, col: 1, offset: 29900}, + pos: position{line: 1243, col: 1, offset: 29881}, expr: &choiceExpr{ - pos: position{line: 1244, col: 5, offset: 29912}, + pos: position{line: 1244, col: 5, offset: 29893}, alternatives: []any{ &actionExpr{ - pos: position{line: 1244, col: 5, offset: 29912}, + pos: position{line: 1244, col: 5, offset: 29893}, run: (*parser).callonEntries2, expr: &seqExpr{ - pos: position{line: 1244, col: 5, offset: 29912}, + pos: position{line: 1244, col: 5, offset: 29893}, exprs: []any{ &labeledExpr{ - pos: position{line: 1244, col: 5, offset: 29912}, + pos: position{line: 1244, col: 5, offset: 29893}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1244, col: 11, offset: 29918}, + pos: position{line: 1244, col: 11, offset: 29899}, name: "Entry", }, }, &labeledExpr{ - pos: position{line: 1244, col: 17, offset: 29924}, + pos: position{line: 1244, col: 17, offset: 29905}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1244, col: 22, offset: 29929}, + pos: position{line: 1244, col: 22, offset: 29910}, expr: &ruleRefExpr{ - pos: position{line: 1244, col: 22, offset: 29929}, + pos: position{line: 1244, col: 22, offset: 29910}, name: "EntryTail", }, }, @@ -8390,10 +8354,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1247, col: 5, offset: 29987}, + pos: position{line: 1247, col: 5, offset: 29968}, run: (*parser).callonEntries9, expr: &ruleRefExpr{ - pos: position{line: 1247, col: 5, offset: 29987}, + pos: position{line: 1247, col: 5, offset: 29968}, name: "__", }, }, @@ -8404,32 +8368,32 @@ var g = &grammar{ }, { name: "EntryTail", - pos: position{line: 1250, col: 1, offset: 30012}, + pos: position{line: 1250, col: 1, offset: 29993}, expr: &actionExpr{ - pos: position{line: 1250, col: 13, offset: 30024}, + pos: position{line: 1250, col: 13, offset: 30005}, run: (*parser).callonEntryTail1, expr: &seqExpr{ - pos: position{line: 1250, col: 13, offset: 30024}, + pos: position{line: 1250, col: 13, offset: 30005}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1250, col: 13, offset: 30024}, + pos: position{line: 1250, col: 13, offset: 30005}, name: "__", }, &litMatcher{ - pos: position{line: 1250, col: 16, offset: 30027}, + pos: position{line: 1250, col: 16, offset: 30008}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1250, col: 20, offset: 30031}, + pos: position{line: 1250, col: 20, offset: 30012}, name: "__", }, &labeledExpr{ - pos: position{line: 1250, col: 23, offset: 30034}, + pos: position{line: 1250, col: 23, offset: 30015}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1250, col: 25, offset: 30036}, + pos: position{line: 1250, col: 25, offset: 30017}, name: "Entry", }, }, @@ -8441,40 +8405,40 @@ var g = &grammar{ }, { name: "Entry", - pos: position{line: 1252, col: 1, offset: 30061}, + pos: position{line: 1252, col: 1, offset: 30042}, expr: &actionExpr{ - pos: position{line: 1253, col: 5, offset: 30071}, + pos: position{line: 1253, col: 5, offset: 30052}, run: (*parser).callonEntry1, expr: &seqExpr{ - pos: position{line: 1253, col: 5, offset: 30071}, + pos: position{line: 1253, col: 5, offset: 30052}, exprs: []any{ &labeledExpr{ - pos: position{line: 1253, col: 5, offset: 30071}, + pos: position{line: 1253, col: 5, offset: 30052}, label: "key", expr: &ruleRefExpr{ - pos: position{line: 1253, col: 9, offset: 30075}, + pos: position{line: 1253, col: 9, offset: 30056}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1253, col: 14, offset: 30080}, + pos: position{line: 1253, col: 14, offset: 30061}, name: "__", }, &litMatcher{ - pos: position{line: 1253, col: 17, offset: 30083}, + pos: position{line: 1253, col: 17, offset: 30064}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1253, col: 21, offset: 30087}, + pos: position{line: 1253, col: 21, offset: 30068}, name: "__", }, &labeledExpr{ - pos: position{line: 1253, col: 24, offset: 30090}, + pos: position{line: 1253, col: 24, offset: 30071}, label: "value", expr: &ruleRefExpr{ - pos: position{line: 1253, col: 30, offset: 30096}, + pos: position{line: 1253, col: 30, offset: 30077}, name: "Expr", }, }, @@ -8486,56 +8450,56 @@ var g = &grammar{ }, { name: "Literal", - pos: position{line: 1259, col: 1, offset: 30221}, + pos: position{line: 1259, col: 1, offset: 30202}, expr: &choiceExpr{ - pos: position{line: 1260, col: 5, offset: 30233}, + pos: position{line: 1260, col: 5, offset: 30214}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1260, col: 5, offset: 30233}, + pos: position{line: 1260, col: 5, offset: 30214}, name: "TypeLiteral", }, &ruleRefExpr{ - pos: position{line: 1261, col: 5, offset: 30249}, + pos: position{line: 1261, col: 5, offset: 30230}, name: "StringLiteral", }, &ruleRefExpr{ - pos: position{line: 1262, col: 5, offset: 30267}, + pos: position{line: 1262, col: 5, offset: 30248}, name: "FString", }, &ruleRefExpr{ - pos: position{line: 1263, col: 5, offset: 30279}, + pos: position{line: 1263, col: 5, offset: 30260}, name: "SubnetLiteral", }, &ruleRefExpr{ - pos: position{line: 1264, col: 5, offset: 30297}, + pos: position{line: 1264, col: 5, offset: 30278}, name: "AddressLiteral", }, &ruleRefExpr{ - pos: position{line: 1265, col: 5, offset: 30316}, + pos: position{line: 1265, col: 5, offset: 30297}, name: "BytesLiteral", }, &ruleRefExpr{ - pos: position{line: 1266, col: 5, offset: 30333}, + pos: position{line: 1266, col: 5, offset: 30314}, name: "Duration", }, &ruleRefExpr{ - pos: position{line: 1267, col: 5, offset: 30346}, + pos: position{line: 1267, col: 5, offset: 30327}, name: "Time", }, &ruleRefExpr{ - pos: position{line: 1268, col: 5, offset: 30355}, + pos: position{line: 1268, col: 5, offset: 30336}, name: "FloatLiteral", }, &ruleRefExpr{ - pos: position{line: 1269, col: 5, offset: 30372}, + pos: position{line: 1269, col: 5, offset: 30353}, name: "IntegerLiteral", }, &ruleRefExpr{ - pos: position{line: 1270, col: 5, offset: 30391}, + pos: position{line: 1270, col: 5, offset: 30372}, name: "BooleanLiteral", }, &ruleRefExpr{ - pos: position{line: 1271, col: 5, offset: 30410}, + pos: position{line: 1271, col: 5, offset: 30391}, name: "NullLiteral", }, }, @@ -8545,28 +8509,28 @@ var g = &grammar{ }, { name: "SubnetLiteral", - pos: position{line: 1273, col: 1, offset: 30423}, + pos: position{line: 1273, col: 1, offset: 30404}, expr: &choiceExpr{ - pos: position{line: 1274, col: 5, offset: 30441}, + pos: position{line: 1274, col: 5, offset: 30422}, alternatives: []any{ &actionExpr{ - pos: position{line: 1274, col: 5, offset: 30441}, + pos: position{line: 1274, col: 5, offset: 30422}, run: (*parser).callonSubnetLiteral2, expr: &seqExpr{ - pos: position{line: 1274, col: 5, offset: 30441}, + pos: position{line: 1274, col: 5, offset: 30422}, exprs: []any{ &labeledExpr{ - pos: position{line: 1274, col: 5, offset: 30441}, + pos: position{line: 1274, col: 5, offset: 30422}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1274, col: 7, offset: 30443}, + pos: position{line: 1274, col: 7, offset: 30424}, name: "IP6Net", }, }, ¬Expr{ - pos: position{line: 1274, col: 14, offset: 30450}, + pos: position{line: 1274, col: 14, offset: 30431}, expr: &ruleRefExpr{ - pos: position{line: 1274, col: 15, offset: 30451}, + pos: position{line: 1274, col: 15, offset: 30432}, name: "IdentifierRest", }, }, @@ -8574,13 +8538,13 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1277, col: 5, offset: 30531}, + pos: position{line: 1277, col: 5, offset: 30512}, run: (*parser).callonSubnetLiteral8, expr: &labeledExpr{ - pos: position{line: 1277, col: 5, offset: 30531}, + pos: position{line: 1277, col: 5, offset: 30512}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1277, col: 7, offset: 30533}, + pos: position{line: 1277, col: 7, offset: 30514}, name: "IP4Net", }, }, @@ -8592,28 +8556,28 @@ var g = &grammar{ }, { name: "AddressLiteral", - pos: position{line: 1281, col: 1, offset: 30602}, + pos: position{line: 1281, col: 1, offset: 30583}, expr: &choiceExpr{ - pos: position{line: 1282, col: 5, offset: 30621}, + pos: position{line: 1282, col: 5, offset: 30602}, alternatives: []any{ &actionExpr{ - pos: position{line: 1282, col: 5, offset: 30621}, + pos: position{line: 1282, col: 5, offset: 30602}, run: (*parser).callonAddressLiteral2, expr: &seqExpr{ - pos: position{line: 1282, col: 5, offset: 30621}, + pos: position{line: 1282, col: 5, offset: 30602}, exprs: []any{ &labeledExpr{ - pos: position{line: 1282, col: 5, offset: 30621}, + pos: position{line: 1282, col: 5, offset: 30602}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1282, col: 7, offset: 30623}, + pos: position{line: 1282, col: 7, offset: 30604}, name: "IP6", }, }, ¬Expr{ - pos: position{line: 1282, col: 11, offset: 30627}, + pos: position{line: 1282, col: 11, offset: 30608}, expr: &ruleRefExpr{ - pos: position{line: 1282, col: 12, offset: 30628}, + pos: position{line: 1282, col: 12, offset: 30609}, name: "IdentifierRest", }, }, @@ -8621,13 +8585,13 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1285, col: 5, offset: 30707}, + pos: position{line: 1285, col: 5, offset: 30688}, run: (*parser).callonAddressLiteral8, expr: &labeledExpr{ - pos: position{line: 1285, col: 5, offset: 30707}, + pos: position{line: 1285, col: 5, offset: 30688}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1285, col: 7, offset: 30709}, + pos: position{line: 1285, col: 7, offset: 30690}, name: "IP", }, }, @@ -8639,15 +8603,15 @@ var g = &grammar{ }, { name: "FloatLiteral", - pos: position{line: 1289, col: 1, offset: 30773}, + pos: position{line: 1289, col: 1, offset: 30754}, expr: &actionExpr{ - pos: position{line: 1290, col: 5, offset: 30790}, + pos: position{line: 1290, col: 5, offset: 30771}, run: (*parser).callonFloatLiteral1, expr: &labeledExpr{ - pos: position{line: 1290, col: 5, offset: 30790}, + pos: position{line: 1290, col: 5, offset: 30771}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1290, col: 7, offset: 30792}, + pos: position{line: 1290, col: 7, offset: 30773}, name: "FloatString", }, }, @@ -8657,15 +8621,15 @@ var g = &grammar{ }, { name: "IntegerLiteral", - pos: position{line: 1294, col: 1, offset: 30870}, + pos: position{line: 1294, col: 1, offset: 30851}, expr: &actionExpr{ - pos: position{line: 1295, col: 5, offset: 30889}, + pos: position{line: 1295, col: 5, offset: 30870}, run: (*parser).callonIntegerLiteral1, expr: &labeledExpr{ - pos: position{line: 1295, col: 5, offset: 30889}, + pos: position{line: 1295, col: 5, offset: 30870}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1295, col: 7, offset: 30891}, + pos: position{line: 1295, col: 7, offset: 30872}, name: "IntString", }, }, @@ -8675,23 +8639,23 @@ var g = &grammar{ }, { name: "BooleanLiteral", - pos: position{line: 1299, col: 1, offset: 30965}, + pos: position{line: 1299, col: 1, offset: 30946}, expr: &choiceExpr{ - pos: position{line: 1300, col: 5, offset: 30984}, + pos: position{line: 1300, col: 5, offset: 30965}, alternatives: []any{ &actionExpr{ - pos: position{line: 1300, col: 5, offset: 30984}, + pos: position{line: 1300, col: 5, offset: 30965}, run: (*parser).callonBooleanLiteral2, expr: &ruleRefExpr{ - pos: position{line: 1300, col: 5, offset: 30984}, + pos: position{line: 1300, col: 5, offset: 30965}, name: "TRUE", }, }, &actionExpr{ - pos: position{line: 1301, col: 5, offset: 31042}, + pos: position{line: 1301, col: 5, offset: 31023}, run: (*parser).callonBooleanLiteral4, expr: &ruleRefExpr{ - pos: position{line: 1301, col: 5, offset: 31042}, + pos: position{line: 1301, col: 5, offset: 31023}, name: "FALSE", }, }, @@ -8702,12 +8666,12 @@ var g = &grammar{ }, { name: "NullLiteral", - pos: position{line: 1303, col: 1, offset: 31098}, + pos: position{line: 1303, col: 1, offset: 31079}, expr: &actionExpr{ - pos: position{line: 1304, col: 5, offset: 31114}, + pos: position{line: 1304, col: 5, offset: 31095}, run: (*parser).callonNullLiteral1, expr: &ruleRefExpr{ - pos: position{line: 1304, col: 5, offset: 31114}, + pos: position{line: 1304, col: 5, offset: 31095}, name: "NULL", }, }, @@ -8716,23 +8680,23 @@ var g = &grammar{ }, { name: "BytesLiteral", - pos: position{line: 1306, col: 1, offset: 31164}, + pos: position{line: 1306, col: 1, offset: 31145}, expr: &actionExpr{ - pos: position{line: 1307, col: 5, offset: 31181}, + pos: position{line: 1307, col: 5, offset: 31162}, run: (*parser).callonBytesLiteral1, expr: &seqExpr{ - pos: position{line: 1307, col: 5, offset: 31181}, + pos: position{line: 1307, col: 5, offset: 31162}, exprs: []any{ &litMatcher{ - pos: position{line: 1307, col: 5, offset: 31181}, + pos: position{line: 1307, col: 5, offset: 31162}, val: "0x", ignoreCase: false, want: "\"0x\"", }, &zeroOrMoreExpr{ - pos: position{line: 1307, col: 10, offset: 31186}, + pos: position{line: 1307, col: 10, offset: 31167}, expr: &ruleRefExpr{ - pos: position{line: 1307, col: 10, offset: 31186}, + pos: position{line: 1307, col: 10, offset: 31167}, name: "HexDigit", }, }, @@ -8744,29 +8708,29 @@ var g = &grammar{ }, { name: "TypeLiteral", - pos: position{line: 1311, col: 1, offset: 31260}, + pos: position{line: 1311, col: 1, offset: 31241}, expr: &actionExpr{ - pos: position{line: 1312, col: 5, offset: 31276}, + pos: position{line: 1312, col: 5, offset: 31257}, run: (*parser).callonTypeLiteral1, expr: &seqExpr{ - pos: position{line: 1312, col: 5, offset: 31276}, + pos: position{line: 1312, col: 5, offset: 31257}, exprs: []any{ &litMatcher{ - pos: position{line: 1312, col: 5, offset: 31276}, + pos: position{line: 1312, col: 5, offset: 31257}, val: "<", ignoreCase: false, want: "\"<\"", }, &labeledExpr{ - pos: position{line: 1312, col: 9, offset: 31280}, + pos: position{line: 1312, col: 9, offset: 31261}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1312, col: 13, offset: 31284}, + pos: position{line: 1312, col: 13, offset: 31265}, name: "Type", }, }, &litMatcher{ - pos: position{line: 1312, col: 18, offset: 31289}, + pos: position{line: 1312, col: 18, offset: 31270}, val: ">", ignoreCase: false, want: "\">\"", @@ -8779,16 +8743,16 @@ var g = &grammar{ }, { name: "Type", - pos: position{line: 1320, col: 1, offset: 31422}, + pos: position{line: 1320, col: 1, offset: 31403}, expr: &choiceExpr{ - pos: position{line: 1321, col: 5, offset: 31431}, + pos: position{line: 1321, col: 5, offset: 31412}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1321, col: 5, offset: 31431}, + pos: position{line: 1321, col: 5, offset: 31412}, name: "AmbiguousType", }, &ruleRefExpr{ - pos: position{line: 1322, col: 5, offset: 31449}, + pos: position{line: 1322, col: 5, offset: 31430}, name: "ComplexType", }, }, @@ -8798,28 +8762,28 @@ var g = &grammar{ }, { name: "AmbiguousType", - pos: position{line: 1324, col: 1, offset: 31462}, + pos: position{line: 1324, col: 1, offset: 31443}, expr: &choiceExpr{ - pos: position{line: 1325, col: 5, offset: 31480}, + pos: position{line: 1325, col: 5, offset: 31461}, alternatives: []any{ &actionExpr{ - pos: position{line: 1325, col: 5, offset: 31480}, + pos: position{line: 1325, col: 5, offset: 31461}, run: (*parser).callonAmbiguousType2, expr: &seqExpr{ - pos: position{line: 1325, col: 5, offset: 31480}, + pos: position{line: 1325, col: 5, offset: 31461}, exprs: []any{ &labeledExpr{ - pos: position{line: 1325, col: 5, offset: 31480}, + pos: position{line: 1325, col: 5, offset: 31461}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1325, col: 10, offset: 31485}, + pos: position{line: 1325, col: 10, offset: 31466}, name: "PrimitiveType", }, }, ¬Expr{ - pos: position{line: 1325, col: 24, offset: 31499}, + pos: position{line: 1325, col: 24, offset: 31480}, expr: &ruleRefExpr{ - pos: position{line: 1325, col: 25, offset: 31500}, + pos: position{line: 1325, col: 25, offset: 31481}, name: "IdentifierRest", }, }, @@ -8827,43 +8791,43 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1326, col: 5, offset: 31540}, + pos: position{line: 1326, col: 5, offset: 31521}, run: (*parser).callonAmbiguousType8, expr: &seqExpr{ - pos: position{line: 1326, col: 5, offset: 31540}, + pos: position{line: 1326, col: 5, offset: 31521}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1326, col: 5, offset: 31540}, + pos: position{line: 1326, col: 5, offset: 31521}, name: "ERROR", }, &ruleRefExpr{ - pos: position{line: 1326, col: 11, offset: 31546}, + pos: position{line: 1326, col: 11, offset: 31527}, name: "__", }, &litMatcher{ - pos: position{line: 1326, col: 14, offset: 31549}, + pos: position{line: 1326, col: 14, offset: 31530}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1326, col: 18, offset: 31553}, + pos: position{line: 1326, col: 18, offset: 31534}, name: "__", }, &labeledExpr{ - pos: position{line: 1326, col: 21, offset: 31556}, + pos: position{line: 1326, col: 21, offset: 31537}, label: "t", expr: &ruleRefExpr{ - pos: position{line: 1326, col: 23, offset: 31558}, + pos: position{line: 1326, col: 23, offset: 31539}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1326, col: 28, offset: 31563}, + pos: position{line: 1326, col: 28, offset: 31544}, name: "__", }, &litMatcher{ - pos: position{line: 1326, col: 31, offset: 31566}, + pos: position{line: 1326, col: 31, offset: 31547}, val: ")", ignoreCase: false, want: "\")\"", @@ -8872,43 +8836,43 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1333, col: 5, offset: 31706}, + pos: position{line: 1333, col: 5, offset: 31687}, run: (*parser).callonAmbiguousType18, expr: &seqExpr{ - pos: position{line: 1333, col: 5, offset: 31706}, + pos: position{line: 1333, col: 5, offset: 31687}, exprs: []any{ &labeledExpr{ - pos: position{line: 1333, col: 5, offset: 31706}, + pos: position{line: 1333, col: 5, offset: 31687}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1333, col: 10, offset: 31711}, + pos: position{line: 1333, col: 10, offset: 31692}, name: "Name", }, }, &labeledExpr{ - pos: position{line: 1333, col: 15, offset: 31716}, + pos: position{line: 1333, col: 15, offset: 31697}, label: "opt", expr: &zeroOrOneExpr{ - pos: position{line: 1333, col: 19, offset: 31720}, + pos: position{line: 1333, col: 19, offset: 31701}, expr: &seqExpr{ - pos: position{line: 1333, col: 20, offset: 31721}, + pos: position{line: 1333, col: 20, offset: 31702}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1333, col: 20, offset: 31721}, + pos: position{line: 1333, col: 20, offset: 31702}, name: "__", }, &litMatcher{ - pos: position{line: 1333, col: 23, offset: 31724}, + pos: position{line: 1333, col: 23, offset: 31705}, val: "=", ignoreCase: false, want: "\"=\"", }, &ruleRefExpr{ - pos: position{line: 1333, col: 27, offset: 31728}, + pos: position{line: 1333, col: 27, offset: 31709}, name: "__", }, &ruleRefExpr{ - pos: position{line: 1333, col: 30, offset: 31731}, + pos: position{line: 1333, col: 30, offset: 31712}, name: "Type", }, }, @@ -8919,31 +8883,31 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1344, col: 5, offset: 32056}, + pos: position{line: 1344, col: 5, offset: 32037}, run: (*parser).callonAmbiguousType29, expr: &seqExpr{ - pos: position{line: 1344, col: 5, offset: 32056}, + pos: position{line: 1344, col: 5, offset: 32037}, exprs: []any{ &litMatcher{ - pos: position{line: 1344, col: 5, offset: 32056}, + pos: position{line: 1344, col: 5, offset: 32037}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1344, col: 9, offset: 32060}, + pos: position{line: 1344, col: 9, offset: 32041}, name: "__", }, &labeledExpr{ - pos: position{line: 1344, col: 12, offset: 32063}, + pos: position{line: 1344, col: 12, offset: 32044}, label: "types", expr: &ruleRefExpr{ - pos: position{line: 1344, col: 18, offset: 32069}, + pos: position{line: 1344, col: 18, offset: 32050}, name: "TypeList", }, }, &litMatcher{ - pos: position{line: 1344, col: 27, offset: 32078}, + pos: position{line: 1344, col: 27, offset: 32059}, val: ")", ignoreCase: false, want: "\")\"", @@ -8958,28 +8922,28 @@ var g = &grammar{ }, { name: "TypeList", - pos: position{line: 1352, col: 1, offset: 32222}, + pos: position{line: 1352, col: 1, offset: 32203}, expr: &actionExpr{ - pos: position{line: 1353, col: 5, offset: 32235}, + pos: position{line: 1353, col: 5, offset: 32216}, run: (*parser).callonTypeList1, expr: &seqExpr{ - pos: position{line: 1353, col: 5, offset: 32235}, + pos: position{line: 1353, col: 5, offset: 32216}, exprs: []any{ &labeledExpr{ - pos: position{line: 1353, col: 5, offset: 32235}, + pos: position{line: 1353, col: 5, offset: 32216}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1353, col: 11, offset: 32241}, + pos: position{line: 1353, col: 11, offset: 32222}, name: "Type", }, }, &labeledExpr{ - pos: position{line: 1353, col: 16, offset: 32246}, + pos: position{line: 1353, col: 16, offset: 32227}, label: "rest", expr: &oneOrMoreExpr{ - pos: position{line: 1353, col: 21, offset: 32251}, + pos: position{line: 1353, col: 21, offset: 32232}, expr: &ruleRefExpr{ - pos: position{line: 1353, col: 21, offset: 32251}, + pos: position{line: 1353, col: 21, offset: 32232}, name: "TypeListTail", }, }, @@ -8992,32 +8956,32 @@ var g = &grammar{ }, { name: "TypeListTail", - pos: position{line: 1357, col: 1, offset: 32309}, + pos: position{line: 1357, col: 1, offset: 32290}, expr: &actionExpr{ - pos: position{line: 1357, col: 16, offset: 32324}, + pos: position{line: 1357, col: 16, offset: 32305}, run: (*parser).callonTypeListTail1, expr: &seqExpr{ - pos: position{line: 1357, col: 16, offset: 32324}, + pos: position{line: 1357, col: 16, offset: 32305}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1357, col: 16, offset: 32324}, + pos: position{line: 1357, col: 16, offset: 32305}, name: "__", }, &litMatcher{ - pos: position{line: 1357, col: 19, offset: 32327}, + pos: position{line: 1357, col: 19, offset: 32308}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1357, col: 23, offset: 32331}, + pos: position{line: 1357, col: 23, offset: 32312}, name: "__", }, &labeledExpr{ - pos: position{line: 1357, col: 26, offset: 32334}, + pos: position{line: 1357, col: 26, offset: 32315}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1357, col: 30, offset: 32338}, + pos: position{line: 1357, col: 30, offset: 32319}, name: "Type", }, }, @@ -9029,40 +8993,40 @@ var g = &grammar{ }, { name: "ComplexType", - pos: position{line: 1359, col: 1, offset: 32364}, + pos: position{line: 1359, col: 1, offset: 32345}, expr: &choiceExpr{ - pos: position{line: 1360, col: 5, offset: 32380}, + pos: position{line: 1360, col: 5, offset: 32361}, alternatives: []any{ &actionExpr{ - pos: position{line: 1360, col: 5, offset: 32380}, + pos: position{line: 1360, col: 5, offset: 32361}, run: (*parser).callonComplexType2, expr: &seqExpr{ - pos: position{line: 1360, col: 5, offset: 32380}, + pos: position{line: 1360, col: 5, offset: 32361}, exprs: []any{ &litMatcher{ - pos: position{line: 1360, col: 5, offset: 32380}, + pos: position{line: 1360, col: 5, offset: 32361}, val: "{", ignoreCase: false, want: "\"{\"", }, &ruleRefExpr{ - pos: position{line: 1360, col: 9, offset: 32384}, + pos: position{line: 1360, col: 9, offset: 32365}, name: "__", }, &labeledExpr{ - pos: position{line: 1360, col: 12, offset: 32387}, + pos: position{line: 1360, col: 12, offset: 32368}, label: "fields", expr: &ruleRefExpr{ - pos: position{line: 1360, col: 19, offset: 32394}, + pos: position{line: 1360, col: 19, offset: 32375}, name: "TypeFieldList", }, }, &ruleRefExpr{ - pos: position{line: 1360, col: 33, offset: 32408}, + pos: position{line: 1360, col: 33, offset: 32389}, name: "__", }, &litMatcher{ - pos: position{line: 1360, col: 36, offset: 32411}, + pos: position{line: 1360, col: 36, offset: 32392}, val: "}", ignoreCase: false, want: "\"}\"", @@ -9071,35 +9035,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1367, col: 5, offset: 32573}, + pos: position{line: 1367, col: 5, offset: 32554}, run: (*parser).callonComplexType10, expr: &seqExpr{ - pos: position{line: 1367, col: 5, offset: 32573}, + pos: position{line: 1367, col: 5, offset: 32554}, exprs: []any{ &litMatcher{ - pos: position{line: 1367, col: 5, offset: 32573}, + pos: position{line: 1367, col: 5, offset: 32554}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 1367, col: 9, offset: 32577}, + pos: position{line: 1367, col: 9, offset: 32558}, name: "__", }, &labeledExpr{ - pos: position{line: 1367, col: 12, offset: 32580}, + pos: position{line: 1367, col: 12, offset: 32561}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1367, col: 16, offset: 32584}, + pos: position{line: 1367, col: 16, offset: 32565}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1367, col: 21, offset: 32589}, + pos: position{line: 1367, col: 21, offset: 32570}, name: "__", }, &litMatcher{ - pos: position{line: 1367, col: 24, offset: 32592}, + pos: position{line: 1367, col: 24, offset: 32573}, val: "]", ignoreCase: false, want: "\"]\"", @@ -9108,35 +9072,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1374, col: 5, offset: 32734}, + pos: position{line: 1374, col: 5, offset: 32715}, run: (*parser).callonComplexType18, expr: &seqExpr{ - pos: position{line: 1374, col: 5, offset: 32734}, + pos: position{line: 1374, col: 5, offset: 32715}, exprs: []any{ &litMatcher{ - pos: position{line: 1374, col: 5, offset: 32734}, + pos: position{line: 1374, col: 5, offset: 32715}, val: "|[", ignoreCase: false, want: "\"|[\"", }, &ruleRefExpr{ - pos: position{line: 1374, col: 10, offset: 32739}, + pos: position{line: 1374, col: 10, offset: 32720}, name: "__", }, &labeledExpr{ - pos: position{line: 1374, col: 13, offset: 32742}, + pos: position{line: 1374, col: 13, offset: 32723}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1374, col: 17, offset: 32746}, + pos: position{line: 1374, col: 17, offset: 32727}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1374, col: 22, offset: 32751}, + pos: position{line: 1374, col: 22, offset: 32732}, name: "__", }, &litMatcher{ - pos: position{line: 1374, col: 25, offset: 32754}, + pos: position{line: 1374, col: 25, offset: 32735}, val: "]|", ignoreCase: false, want: "\"]|\"", @@ -9145,57 +9109,57 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1381, col: 5, offset: 32893}, + pos: position{line: 1381, col: 5, offset: 32874}, run: (*parser).callonComplexType26, expr: &seqExpr{ - pos: position{line: 1381, col: 5, offset: 32893}, + pos: position{line: 1381, col: 5, offset: 32874}, exprs: []any{ &litMatcher{ - pos: position{line: 1381, col: 5, offset: 32893}, + pos: position{line: 1381, col: 5, offset: 32874}, val: "|{", ignoreCase: false, want: "\"|{\"", }, &ruleRefExpr{ - pos: position{line: 1381, col: 10, offset: 32898}, + pos: position{line: 1381, col: 10, offset: 32879}, name: "__", }, &labeledExpr{ - pos: position{line: 1381, col: 13, offset: 32901}, + pos: position{line: 1381, col: 13, offset: 32882}, label: "keyType", expr: &ruleRefExpr{ - pos: position{line: 1381, col: 21, offset: 32909}, + pos: position{line: 1381, col: 21, offset: 32890}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1381, col: 26, offset: 32914}, + pos: position{line: 1381, col: 26, offset: 32895}, name: "__", }, &litMatcher{ - pos: position{line: 1381, col: 29, offset: 32917}, + pos: position{line: 1381, col: 29, offset: 32898}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1381, col: 33, offset: 32921}, + pos: position{line: 1381, col: 33, offset: 32902}, name: "__", }, &labeledExpr{ - pos: position{line: 1381, col: 36, offset: 32924}, + pos: position{line: 1381, col: 36, offset: 32905}, label: "valType", expr: &ruleRefExpr{ - pos: position{line: 1381, col: 44, offset: 32932}, + pos: position{line: 1381, col: 44, offset: 32913}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1381, col: 49, offset: 32937}, + pos: position{line: 1381, col: 49, offset: 32918}, name: "__", }, &litMatcher{ - pos: position{line: 1381, col: 52, offset: 32940}, + pos: position{line: 1381, col: 52, offset: 32921}, val: "}|", ignoreCase: false, want: "\"}|\"", @@ -9210,35 +9174,35 @@ var g = &grammar{ }, { name: "StringLiteral", - pos: position{line: 1390, col: 1, offset: 33114}, + pos: position{line: 1390, col: 1, offset: 33095}, expr: &choiceExpr{ - pos: position{line: 1391, col: 5, offset: 33132}, + pos: position{line: 1391, col: 5, offset: 33113}, alternatives: []any{ &actionExpr{ - pos: position{line: 1391, col: 5, offset: 33132}, + pos: position{line: 1391, col: 5, offset: 33113}, run: (*parser).callonStringLiteral2, expr: &seqExpr{ - pos: position{line: 1391, col: 5, offset: 33132}, + pos: position{line: 1391, col: 5, offset: 33113}, exprs: []any{ &litMatcher{ - pos: position{line: 1391, col: 5, offset: 33132}, + pos: position{line: 1391, col: 5, offset: 33113}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, &labeledExpr{ - pos: position{line: 1391, col: 9, offset: 33136}, + pos: position{line: 1391, col: 9, offset: 33117}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1391, col: 11, offset: 33138}, + pos: position{line: 1391, col: 11, offset: 33119}, expr: &ruleRefExpr{ - pos: position{line: 1391, col: 11, offset: 33138}, + pos: position{line: 1391, col: 11, offset: 33119}, name: "DoubleQuotedChar", }, }, }, &litMatcher{ - pos: position{line: 1391, col: 29, offset: 33156}, + pos: position{line: 1391, col: 29, offset: 33137}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -9247,30 +9211,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1392, col: 5, offset: 33220}, + pos: position{line: 1392, col: 5, offset: 33201}, run: (*parser).callonStringLiteral9, expr: &seqExpr{ - pos: position{line: 1392, col: 5, offset: 33220}, + pos: position{line: 1392, col: 5, offset: 33201}, exprs: []any{ &litMatcher{ - pos: position{line: 1392, col: 5, offset: 33220}, + pos: position{line: 1392, col: 5, offset: 33201}, val: "'", ignoreCase: false, want: "\"'\"", }, &labeledExpr{ - pos: position{line: 1392, col: 9, offset: 33224}, + pos: position{line: 1392, col: 9, offset: 33205}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1392, col: 11, offset: 33226}, + pos: position{line: 1392, col: 11, offset: 33207}, expr: &ruleRefExpr{ - pos: position{line: 1392, col: 11, offset: 33226}, + pos: position{line: 1392, col: 11, offset: 33207}, name: "SingleQuotedChar", }, }, }, &litMatcher{ - pos: position{line: 1392, col: 29, offset: 33244}, + pos: position{line: 1392, col: 29, offset: 33225}, val: "'", ignoreCase: false, want: "\"'\"", @@ -9285,35 +9249,35 @@ var g = &grammar{ }, { name: "FString", - pos: position{line: 1394, col: 1, offset: 33305}, + pos: position{line: 1394, col: 1, offset: 33286}, expr: &choiceExpr{ - pos: position{line: 1395, col: 5, offset: 33317}, + pos: position{line: 1395, col: 5, offset: 33298}, alternatives: []any{ &actionExpr{ - pos: position{line: 1395, col: 5, offset: 33317}, + pos: position{line: 1395, col: 5, offset: 33298}, run: (*parser).callonFString2, expr: &seqExpr{ - pos: position{line: 1395, col: 5, offset: 33317}, + pos: position{line: 1395, col: 5, offset: 33298}, exprs: []any{ &litMatcher{ - pos: position{line: 1395, col: 5, offset: 33317}, + pos: position{line: 1395, col: 5, offset: 33298}, val: "f\"", ignoreCase: false, want: "\"f\\\"\"", }, &labeledExpr{ - pos: position{line: 1395, col: 11, offset: 33323}, + pos: position{line: 1395, col: 11, offset: 33304}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1395, col: 13, offset: 33325}, + pos: position{line: 1395, col: 13, offset: 33306}, expr: &ruleRefExpr{ - pos: position{line: 1395, col: 13, offset: 33325}, + pos: position{line: 1395, col: 13, offset: 33306}, name: "FStringDoubleQuotedElem", }, }, }, &litMatcher{ - pos: position{line: 1395, col: 38, offset: 33350}, + pos: position{line: 1395, col: 38, offset: 33331}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -9322,30 +9286,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1402, col: 5, offset: 33496}, + pos: position{line: 1402, col: 5, offset: 33477}, run: (*parser).callonFString9, expr: &seqExpr{ - pos: position{line: 1402, col: 5, offset: 33496}, + pos: position{line: 1402, col: 5, offset: 33477}, exprs: []any{ &litMatcher{ - pos: position{line: 1402, col: 5, offset: 33496}, + pos: position{line: 1402, col: 5, offset: 33477}, val: "f'", ignoreCase: false, want: "\"f'\"", }, &labeledExpr{ - pos: position{line: 1402, col: 10, offset: 33501}, + pos: position{line: 1402, col: 10, offset: 33482}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1402, col: 12, offset: 33503}, + pos: position{line: 1402, col: 12, offset: 33484}, expr: &ruleRefExpr{ - pos: position{line: 1402, col: 12, offset: 33503}, + pos: position{line: 1402, col: 12, offset: 33484}, name: "FStringSingleQuotedElem", }, }, }, &litMatcher{ - pos: position{line: 1402, col: 37, offset: 33528}, + pos: position{line: 1402, col: 37, offset: 33509}, val: "'", ignoreCase: false, want: "\"'\"", @@ -9360,24 +9324,24 @@ var g = &grammar{ }, { name: "FStringDoubleQuotedElem", - pos: position{line: 1410, col: 1, offset: 33671}, + pos: position{line: 1410, col: 1, offset: 33652}, expr: &choiceExpr{ - pos: position{line: 1411, col: 5, offset: 33699}, + pos: position{line: 1411, col: 5, offset: 33680}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1411, col: 5, offset: 33699}, + pos: position{line: 1411, col: 5, offset: 33680}, name: "FStringExpr", }, &actionExpr{ - pos: position{line: 1412, col: 5, offset: 33715}, + pos: position{line: 1412, col: 5, offset: 33696}, run: (*parser).callonFStringDoubleQuotedElem3, expr: &labeledExpr{ - pos: position{line: 1412, col: 5, offset: 33715}, + pos: position{line: 1412, col: 5, offset: 33696}, label: "v", expr: &oneOrMoreExpr{ - pos: position{line: 1412, col: 7, offset: 33717}, + pos: position{line: 1412, col: 7, offset: 33698}, expr: &ruleRefExpr{ - pos: position{line: 1412, col: 7, offset: 33717}, + pos: position{line: 1412, col: 7, offset: 33698}, name: "FStringDoubleQuotedChar", }, }, @@ -9390,27 +9354,27 @@ var g = &grammar{ }, { name: "FStringDoubleQuotedChar", - pos: position{line: 1416, col: 1, offset: 33840}, + pos: position{line: 1416, col: 1, offset: 33821}, expr: &choiceExpr{ - pos: position{line: 1417, col: 5, offset: 33868}, + pos: position{line: 1417, col: 5, offset: 33849}, alternatives: []any{ &actionExpr{ - pos: position{line: 1417, col: 5, offset: 33868}, + pos: position{line: 1417, col: 5, offset: 33849}, run: (*parser).callonFStringDoubleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1417, col: 5, offset: 33868}, + pos: position{line: 1417, col: 5, offset: 33849}, exprs: []any{ &litMatcher{ - pos: position{line: 1417, col: 5, offset: 33868}, + pos: position{line: 1417, col: 5, offset: 33849}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1417, col: 10, offset: 33873}, + pos: position{line: 1417, col: 10, offset: 33854}, label: "v", expr: &litMatcher{ - pos: position{line: 1417, col: 12, offset: 33875}, + pos: position{line: 1417, col: 12, offset: 33856}, val: "{", ignoreCase: false, want: "\"{\"", @@ -9420,25 +9384,25 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1418, col: 5, offset: 33901}, + pos: position{line: 1418, col: 5, offset: 33882}, run: (*parser).callonFStringDoubleQuotedChar7, expr: &seqExpr{ - pos: position{line: 1418, col: 5, offset: 33901}, + pos: position{line: 1418, col: 5, offset: 33882}, exprs: []any{ ¬Expr{ - pos: position{line: 1418, col: 5, offset: 33901}, + pos: position{line: 1418, col: 5, offset: 33882}, expr: &litMatcher{ - pos: position{line: 1418, col: 7, offset: 33903}, + pos: position{line: 1418, col: 7, offset: 33884}, val: "{", ignoreCase: false, want: "\"{\"", }, }, &labeledExpr{ - pos: position{line: 1418, col: 12, offset: 33908}, + pos: position{line: 1418, col: 12, offset: 33889}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1418, col: 14, offset: 33910}, + pos: position{line: 1418, col: 14, offset: 33891}, name: "DoubleQuotedChar", }, }, @@ -9452,24 +9416,24 @@ var g = &grammar{ }, { name: "FStringSingleQuotedElem", - pos: position{line: 1420, col: 1, offset: 33946}, + pos: position{line: 1420, col: 1, offset: 33927}, expr: &choiceExpr{ - pos: position{line: 1421, col: 5, offset: 33974}, + pos: position{line: 1421, col: 5, offset: 33955}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1421, col: 5, offset: 33974}, + pos: position{line: 1421, col: 5, offset: 33955}, name: "FStringExpr", }, &actionExpr{ - pos: position{line: 1422, col: 5, offset: 33990}, + pos: position{line: 1422, col: 5, offset: 33971}, run: (*parser).callonFStringSingleQuotedElem3, expr: &labeledExpr{ - pos: position{line: 1422, col: 5, offset: 33990}, + pos: position{line: 1422, col: 5, offset: 33971}, label: "v", expr: &oneOrMoreExpr{ - pos: position{line: 1422, col: 7, offset: 33992}, + pos: position{line: 1422, col: 7, offset: 33973}, expr: &ruleRefExpr{ - pos: position{line: 1422, col: 7, offset: 33992}, + pos: position{line: 1422, col: 7, offset: 33973}, name: "FStringSingleQuotedChar", }, }, @@ -9482,27 +9446,27 @@ var g = &grammar{ }, { name: "FStringSingleQuotedChar", - pos: position{line: 1426, col: 1, offset: 34115}, + pos: position{line: 1426, col: 1, offset: 34096}, expr: &choiceExpr{ - pos: position{line: 1427, col: 5, offset: 34143}, + pos: position{line: 1427, col: 5, offset: 34124}, alternatives: []any{ &actionExpr{ - pos: position{line: 1427, col: 5, offset: 34143}, + pos: position{line: 1427, col: 5, offset: 34124}, run: (*parser).callonFStringSingleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1427, col: 5, offset: 34143}, + pos: position{line: 1427, col: 5, offset: 34124}, exprs: []any{ &litMatcher{ - pos: position{line: 1427, col: 5, offset: 34143}, + pos: position{line: 1427, col: 5, offset: 34124}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1427, col: 10, offset: 34148}, + pos: position{line: 1427, col: 10, offset: 34129}, label: "v", expr: &litMatcher{ - pos: position{line: 1427, col: 12, offset: 34150}, + pos: position{line: 1427, col: 12, offset: 34131}, val: "{", ignoreCase: false, want: "\"{\"", @@ -9512,25 +9476,25 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1428, col: 5, offset: 34176}, + pos: position{line: 1428, col: 5, offset: 34157}, run: (*parser).callonFStringSingleQuotedChar7, expr: &seqExpr{ - pos: position{line: 1428, col: 5, offset: 34176}, + pos: position{line: 1428, col: 5, offset: 34157}, exprs: []any{ ¬Expr{ - pos: position{line: 1428, col: 5, offset: 34176}, + pos: position{line: 1428, col: 5, offset: 34157}, expr: &litMatcher{ - pos: position{line: 1428, col: 7, offset: 34178}, + pos: position{line: 1428, col: 7, offset: 34159}, val: "{", ignoreCase: false, want: "\"{\"", }, }, &labeledExpr{ - pos: position{line: 1428, col: 12, offset: 34183}, + pos: position{line: 1428, col: 12, offset: 34164}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1428, col: 14, offset: 34185}, + pos: position{line: 1428, col: 14, offset: 34166}, name: "SingleQuotedChar", }, }, @@ -9544,37 +9508,37 @@ var g = &grammar{ }, { name: "FStringExpr", - pos: position{line: 1430, col: 1, offset: 34221}, + pos: position{line: 1430, col: 1, offset: 34202}, expr: &actionExpr{ - pos: position{line: 1431, col: 5, offset: 34237}, + pos: position{line: 1431, col: 5, offset: 34218}, run: (*parser).callonFStringExpr1, expr: &seqExpr{ - pos: position{line: 1431, col: 5, offset: 34237}, + pos: position{line: 1431, col: 5, offset: 34218}, exprs: []any{ &litMatcher{ - pos: position{line: 1431, col: 5, offset: 34237}, + pos: position{line: 1431, col: 5, offset: 34218}, val: "{", ignoreCase: false, want: "\"{\"", }, &ruleRefExpr{ - pos: position{line: 1431, col: 9, offset: 34241}, + pos: position{line: 1431, col: 9, offset: 34222}, name: "__", }, &labeledExpr{ - pos: position{line: 1431, col: 12, offset: 34244}, + pos: position{line: 1431, col: 12, offset: 34225}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1431, col: 14, offset: 34246}, + pos: position{line: 1431, col: 14, offset: 34227}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1431, col: 19, offset: 34251}, + pos: position{line: 1431, col: 19, offset: 34232}, name: "__", }, &litMatcher{ - pos: position{line: 1431, col: 22, offset: 34254}, + pos: position{line: 1431, col: 22, offset: 34235}, val: "}", ignoreCase: false, want: "\"}\"", @@ -9587,129 +9551,129 @@ var g = &grammar{ }, { name: "PrimitiveType", - pos: position{line: 1439, col: 1, offset: 34389}, + pos: position{line: 1439, col: 1, offset: 34370}, expr: &actionExpr{ - pos: position{line: 1440, col: 5, offset: 34407}, + pos: position{line: 1440, col: 5, offset: 34388}, run: (*parser).callonPrimitiveType1, expr: &choiceExpr{ - pos: position{line: 1440, col: 9, offset: 34411}, + pos: position{line: 1440, col: 9, offset: 34392}, alternatives: []any{ &litMatcher{ - pos: position{line: 1440, col: 9, offset: 34411}, + pos: position{line: 1440, col: 9, offset: 34392}, val: "uint8", ignoreCase: false, want: "\"uint8\"", }, &litMatcher{ - pos: position{line: 1440, col: 19, offset: 34421}, + pos: position{line: 1440, col: 19, offset: 34402}, val: "uint16", ignoreCase: false, want: "\"uint16\"", }, &litMatcher{ - pos: position{line: 1440, col: 30, offset: 34432}, + pos: position{line: 1440, col: 30, offset: 34413}, val: "uint32", ignoreCase: false, want: "\"uint32\"", }, &litMatcher{ - pos: position{line: 1440, col: 41, offset: 34443}, + pos: position{line: 1440, col: 41, offset: 34424}, val: "uint64", ignoreCase: false, want: "\"uint64\"", }, &litMatcher{ - pos: position{line: 1441, col: 9, offset: 34460}, + pos: position{line: 1441, col: 9, offset: 34441}, val: "int8", ignoreCase: false, want: "\"int8\"", }, &litMatcher{ - pos: position{line: 1441, col: 18, offset: 34469}, + pos: position{line: 1441, col: 18, offset: 34450}, val: "int16", ignoreCase: false, want: "\"int16\"", }, &litMatcher{ - pos: position{line: 1441, col: 28, offset: 34479}, + pos: position{line: 1441, col: 28, offset: 34460}, val: "int32", ignoreCase: false, want: "\"int32\"", }, &litMatcher{ - pos: position{line: 1441, col: 38, offset: 34489}, + pos: position{line: 1441, col: 38, offset: 34470}, val: "int64", ignoreCase: false, want: "\"int64\"", }, &litMatcher{ - pos: position{line: 1442, col: 9, offset: 34505}, + pos: position{line: 1442, col: 9, offset: 34486}, val: "float16", ignoreCase: false, want: "\"float16\"", }, &litMatcher{ - pos: position{line: 1442, col: 21, offset: 34517}, + pos: position{line: 1442, col: 21, offset: 34498}, val: "float32", ignoreCase: false, want: "\"float32\"", }, &litMatcher{ - pos: position{line: 1442, col: 33, offset: 34529}, + pos: position{line: 1442, col: 33, offset: 34510}, val: "float64", ignoreCase: false, want: "\"float64\"", }, &litMatcher{ - pos: position{line: 1443, col: 9, offset: 34547}, + pos: position{line: 1443, col: 9, offset: 34528}, val: "bool", ignoreCase: false, want: "\"bool\"", }, &litMatcher{ - pos: position{line: 1443, col: 18, offset: 34556}, + pos: position{line: 1443, col: 18, offset: 34537}, val: "string", ignoreCase: false, want: "\"string\"", }, &litMatcher{ - pos: position{line: 1444, col: 9, offset: 34573}, + pos: position{line: 1444, col: 9, offset: 34554}, val: "duration", ignoreCase: false, want: "\"duration\"", }, &litMatcher{ - pos: position{line: 1444, col: 22, offset: 34586}, + pos: position{line: 1444, col: 22, offset: 34567}, val: "time", ignoreCase: false, want: "\"time\"", }, &litMatcher{ - pos: position{line: 1445, col: 9, offset: 34601}, + pos: position{line: 1445, col: 9, offset: 34582}, val: "bytes", ignoreCase: false, want: "\"bytes\"", }, &litMatcher{ - pos: position{line: 1446, col: 9, offset: 34617}, + pos: position{line: 1446, col: 9, offset: 34598}, val: "ip", ignoreCase: false, want: "\"ip\"", }, &litMatcher{ - pos: position{line: 1446, col: 16, offset: 34624}, + pos: position{line: 1446, col: 16, offset: 34605}, val: "net", ignoreCase: false, want: "\"net\"", }, &litMatcher{ - pos: position{line: 1447, col: 9, offset: 34638}, + pos: position{line: 1447, col: 9, offset: 34619}, val: "type", ignoreCase: false, want: "\"type\"", }, &litMatcher{ - pos: position{line: 1447, col: 18, offset: 34647}, + pos: position{line: 1447, col: 18, offset: 34628}, val: "null", ignoreCase: false, want: "\"null\"", @@ -9722,31 +9686,31 @@ var g = &grammar{ }, { name: "TypeFieldList", - pos: position{line: 1455, col: 1, offset: 34832}, + pos: position{line: 1455, col: 1, offset: 34813}, expr: &choiceExpr{ - pos: position{line: 1456, col: 5, offset: 34850}, + pos: position{line: 1456, col: 5, offset: 34831}, alternatives: []any{ &actionExpr{ - pos: position{line: 1456, col: 5, offset: 34850}, + pos: position{line: 1456, col: 5, offset: 34831}, run: (*parser).callonTypeFieldList2, expr: &seqExpr{ - pos: position{line: 1456, col: 5, offset: 34850}, + pos: position{line: 1456, col: 5, offset: 34831}, exprs: []any{ &labeledExpr{ - pos: position{line: 1456, col: 5, offset: 34850}, + pos: position{line: 1456, col: 5, offset: 34831}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1456, col: 11, offset: 34856}, + pos: position{line: 1456, col: 11, offset: 34837}, name: "TypeField", }, }, &labeledExpr{ - pos: position{line: 1456, col: 21, offset: 34866}, + pos: position{line: 1456, col: 21, offset: 34847}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1456, col: 26, offset: 34871}, + pos: position{line: 1456, col: 26, offset: 34852}, expr: &ruleRefExpr{ - pos: position{line: 1456, col: 26, offset: 34871}, + pos: position{line: 1456, col: 26, offset: 34852}, name: "TypeFieldListTail", }, }, @@ -9755,10 +9719,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1459, col: 5, offset: 34937}, + pos: position{line: 1459, col: 5, offset: 34918}, run: (*parser).callonTypeFieldList9, expr: &litMatcher{ - pos: position{line: 1459, col: 5, offset: 34937}, + pos: position{line: 1459, col: 5, offset: 34918}, val: "", ignoreCase: false, want: "\"\"", @@ -9771,32 +9735,32 @@ var g = &grammar{ }, { name: "TypeFieldListTail", - pos: position{line: 1461, col: 1, offset: 34961}, + pos: position{line: 1461, col: 1, offset: 34942}, expr: &actionExpr{ - pos: position{line: 1461, col: 21, offset: 34981}, + pos: position{line: 1461, col: 21, offset: 34962}, run: (*parser).callonTypeFieldListTail1, expr: &seqExpr{ - pos: position{line: 1461, col: 21, offset: 34981}, + pos: position{line: 1461, col: 21, offset: 34962}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1461, col: 21, offset: 34981}, + pos: position{line: 1461, col: 21, offset: 34962}, name: "__", }, &litMatcher{ - pos: position{line: 1461, col: 24, offset: 34984}, + pos: position{line: 1461, col: 24, offset: 34965}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1461, col: 28, offset: 34988}, + pos: position{line: 1461, col: 28, offset: 34969}, name: "__", }, &labeledExpr{ - pos: position{line: 1461, col: 31, offset: 34991}, + pos: position{line: 1461, col: 31, offset: 34972}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1461, col: 35, offset: 34995}, + pos: position{line: 1461, col: 35, offset: 34976}, name: "TypeField", }, }, @@ -9808,40 +9772,40 @@ var g = &grammar{ }, { name: "TypeField", - pos: position{line: 1463, col: 1, offset: 35026}, + pos: position{line: 1463, col: 1, offset: 35007}, expr: &actionExpr{ - pos: position{line: 1464, col: 5, offset: 35040}, + pos: position{line: 1464, col: 5, offset: 35021}, run: (*parser).callonTypeField1, expr: &seqExpr{ - pos: position{line: 1464, col: 5, offset: 35040}, + pos: position{line: 1464, col: 5, offset: 35021}, exprs: []any{ &labeledExpr{ - pos: position{line: 1464, col: 5, offset: 35040}, + pos: position{line: 1464, col: 5, offset: 35021}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1464, col: 10, offset: 35045}, + pos: position{line: 1464, col: 10, offset: 35026}, name: "Name", }, }, &ruleRefExpr{ - pos: position{line: 1464, col: 15, offset: 35050}, + pos: position{line: 1464, col: 15, offset: 35031}, name: "__", }, &litMatcher{ - pos: position{line: 1464, col: 18, offset: 35053}, + pos: position{line: 1464, col: 18, offset: 35034}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1464, col: 22, offset: 35057}, + pos: position{line: 1464, col: 22, offset: 35038}, name: "__", }, &labeledExpr{ - pos: position{line: 1464, col: 25, offset: 35060}, + pos: position{line: 1464, col: 25, offset: 35041}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1464, col: 29, offset: 35064}, + pos: position{line: 1464, col: 29, offset: 35045}, name: "Type", }, }, @@ -9853,54 +9817,54 @@ var g = &grammar{ }, { name: "Name", - pos: position{line: 1472, col: 1, offset: 35213}, + pos: position{line: 1472, col: 1, offset: 35194}, expr: &choiceExpr{ - pos: position{line: 1473, col: 5, offset: 35222}, + pos: position{line: 1473, col: 5, offset: 35203}, alternatives: []any{ &actionExpr{ - pos: position{line: 1473, col: 5, offset: 35222}, + pos: position{line: 1473, col: 5, offset: 35203}, run: (*parser).callonName2, expr: &labeledExpr{ - pos: position{line: 1473, col: 5, offset: 35222}, + pos: position{line: 1473, col: 5, offset: 35203}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1473, col: 7, offset: 35224}, + pos: position{line: 1473, col: 7, offset: 35205}, name: "DottedIDs", }, }, }, &actionExpr{ - pos: position{line: 1474, col: 5, offset: 35313}, + pos: position{line: 1474, col: 5, offset: 35294}, run: (*parser).callonName5, expr: &labeledExpr{ - pos: position{line: 1474, col: 5, offset: 35313}, + pos: position{line: 1474, col: 5, offset: 35294}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1474, col: 7, offset: 35315}, + pos: position{line: 1474, col: 7, offset: 35296}, name: "IdentifierName", }, }, }, &actionExpr{ - pos: position{line: 1475, col: 5, offset: 35404}, + pos: position{line: 1475, col: 5, offset: 35385}, run: (*parser).callonName8, expr: &labeledExpr{ - pos: position{line: 1475, col: 5, offset: 35404}, + pos: position{line: 1475, col: 5, offset: 35385}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1475, col: 7, offset: 35406}, + pos: position{line: 1475, col: 7, offset: 35387}, name: "QuotedString", }, }, }, &actionExpr{ - pos: position{line: 1476, col: 5, offset: 35495}, + pos: position{line: 1476, col: 5, offset: 35476}, run: (*parser).callonName11, expr: &labeledExpr{ - pos: position{line: 1476, col: 5, offset: 35495}, + pos: position{line: 1476, col: 5, offset: 35476}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1476, col: 7, offset: 35497}, + pos: position{line: 1476, col: 7, offset: 35478}, name: "KSUID", }, }, @@ -9912,22 +9876,22 @@ var g = &grammar{ }, { name: "DottedIDs", - pos: position{line: 1478, col: 1, offset: 35583}, + pos: position{line: 1478, col: 1, offset: 35564}, expr: &actionExpr{ - pos: position{line: 1479, col: 5, offset: 35597}, + pos: position{line: 1479, col: 5, offset: 35578}, run: (*parser).callonDottedIDs1, expr: &seqExpr{ - pos: position{line: 1479, col: 5, offset: 35597}, + pos: position{line: 1479, col: 5, offset: 35578}, exprs: []any{ &choiceExpr{ - pos: position{line: 1479, col: 6, offset: 35598}, + pos: position{line: 1479, col: 6, offset: 35579}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1479, col: 6, offset: 35598}, + pos: position{line: 1479, col: 6, offset: 35579}, name: "IdentifierStart", }, &litMatcher{ - pos: position{line: 1479, col: 24, offset: 35616}, + pos: position{line: 1479, col: 24, offset: 35597}, val: ".", ignoreCase: false, want: "\".\"", @@ -9935,16 +9899,16 @@ var g = &grammar{ }, }, &zeroOrMoreExpr{ - pos: position{line: 1479, col: 29, offset: 35621}, + pos: position{line: 1479, col: 29, offset: 35602}, expr: &choiceExpr{ - pos: position{line: 1479, col: 30, offset: 35622}, + pos: position{line: 1479, col: 30, offset: 35603}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1479, col: 30, offset: 35622}, + pos: position{line: 1479, col: 30, offset: 35603}, name: "IdentifierRest", }, &litMatcher{ - pos: position{line: 1479, col: 47, offset: 35639}, + pos: position{line: 1479, col: 47, offset: 35620}, val: ".", ignoreCase: false, want: "\".\"", @@ -9960,15 +9924,15 @@ var g = &grammar{ }, { name: "Identifier", - pos: position{line: 1481, col: 1, offset: 35677}, + pos: position{line: 1481, col: 1, offset: 35658}, expr: &actionExpr{ - pos: position{line: 1482, col: 5, offset: 35692}, + pos: position{line: 1482, col: 5, offset: 35673}, run: (*parser).callonIdentifier1, expr: &labeledExpr{ - pos: position{line: 1482, col: 5, offset: 35692}, + pos: position{line: 1482, col: 5, offset: 35673}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 1482, col: 8, offset: 35695}, + pos: position{line: 1482, col: 8, offset: 35676}, name: "IdentifierName", }, }, @@ -9978,51 +9942,51 @@ var g = &grammar{ }, { name: "Identifiers", - pos: position{line: 1490, col: 1, offset: 35828}, + pos: position{line: 1490, col: 1, offset: 35809}, expr: &actionExpr{ - pos: position{line: 1491, col: 5, offset: 35844}, + pos: position{line: 1491, col: 5, offset: 35825}, run: (*parser).callonIdentifiers1, expr: &seqExpr{ - pos: position{line: 1491, col: 5, offset: 35844}, + pos: position{line: 1491, col: 5, offset: 35825}, exprs: []any{ &labeledExpr{ - pos: position{line: 1491, col: 5, offset: 35844}, + pos: position{line: 1491, col: 5, offset: 35825}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1491, col: 11, offset: 35850}, + pos: position{line: 1491, col: 11, offset: 35831}, name: "Identifier", }, }, &labeledExpr{ - pos: position{line: 1491, col: 22, offset: 35861}, + pos: position{line: 1491, col: 22, offset: 35842}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1491, col: 27, offset: 35866}, + pos: position{line: 1491, col: 27, offset: 35847}, expr: &actionExpr{ - pos: position{line: 1491, col: 28, offset: 35867}, + pos: position{line: 1491, col: 28, offset: 35848}, run: (*parser).callonIdentifiers7, expr: &seqExpr{ - pos: position{line: 1491, col: 28, offset: 35867}, + pos: position{line: 1491, col: 28, offset: 35848}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1491, col: 28, offset: 35867}, + pos: position{line: 1491, col: 28, offset: 35848}, name: "__", }, &litMatcher{ - pos: position{line: 1491, col: 31, offset: 35870}, + pos: position{line: 1491, col: 31, offset: 35851}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1491, col: 35, offset: 35874}, + pos: position{line: 1491, col: 35, offset: 35855}, name: "__", }, &labeledExpr{ - pos: position{line: 1491, col: 38, offset: 35877}, + pos: position{line: 1491, col: 38, offset: 35858}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1491, col: 43, offset: 35882}, + pos: position{line: 1491, col: 43, offset: 35863}, name: "Identifier", }, }, @@ -10039,29 +10003,29 @@ var g = &grammar{ }, { name: "IdentifierName", - pos: position{line: 1495, col: 1, offset: 35960}, + pos: position{line: 1495, col: 1, offset: 35941}, expr: &choiceExpr{ - pos: position{line: 1496, col: 5, offset: 35979}, + pos: position{line: 1496, col: 5, offset: 35960}, alternatives: []any{ &actionExpr{ - pos: position{line: 1496, col: 5, offset: 35979}, + pos: position{line: 1496, col: 5, offset: 35960}, run: (*parser).callonIdentifierName2, expr: &seqExpr{ - pos: position{line: 1496, col: 5, offset: 35979}, + pos: position{line: 1496, col: 5, offset: 35960}, exprs: []any{ ¬Expr{ - pos: position{line: 1496, col: 5, offset: 35979}, + pos: position{line: 1496, col: 5, offset: 35960}, expr: &seqExpr{ - pos: position{line: 1496, col: 7, offset: 35981}, + pos: position{line: 1496, col: 7, offset: 35962}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1496, col: 7, offset: 35981}, + pos: position{line: 1496, col: 7, offset: 35962}, name: "IDGuard", }, ¬Expr{ - pos: position{line: 1496, col: 15, offset: 35989}, + pos: position{line: 1496, col: 15, offset: 35970}, expr: &ruleRefExpr{ - pos: position{line: 1496, col: 16, offset: 35990}, + pos: position{line: 1496, col: 16, offset: 35971}, name: "IdentifierRest", }, }, @@ -10069,13 +10033,13 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1496, col: 32, offset: 36006}, + pos: position{line: 1496, col: 32, offset: 35987}, name: "IdentifierStart", }, &zeroOrMoreExpr{ - pos: position{line: 1496, col: 48, offset: 36022}, + pos: position{line: 1496, col: 48, offset: 36003}, expr: &ruleRefExpr{ - pos: position{line: 1496, col: 48, offset: 36022}, + pos: position{line: 1496, col: 48, offset: 36003}, name: "IdentifierRest", }, }, @@ -10083,32 +10047,32 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1497, col: 5, offset: 36073}, + pos: position{line: 1497, col: 5, offset: 36054}, run: (*parser).callonIdentifierName12, expr: &litMatcher{ - pos: position{line: 1497, col: 5, offset: 36073}, + pos: position{line: 1497, col: 5, offset: 36054}, val: "$", ignoreCase: false, want: "\"$\"", }, }, &actionExpr{ - pos: position{line: 1498, col: 5, offset: 36112}, + pos: position{line: 1498, col: 5, offset: 36093}, run: (*parser).callonIdentifierName14, expr: &seqExpr{ - pos: position{line: 1498, col: 5, offset: 36112}, + pos: position{line: 1498, col: 5, offset: 36093}, exprs: []any{ &litMatcher{ - pos: position{line: 1498, col: 5, offset: 36112}, + pos: position{line: 1498, col: 5, offset: 36093}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1498, col: 10, offset: 36117}, + pos: position{line: 1498, col: 10, offset: 36098}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 1498, col: 13, offset: 36120}, + pos: position{line: 1498, col: 13, offset: 36101}, name: "IDGuard", }, }, @@ -10116,10 +10080,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1500, col: 5, offset: 36211}, + pos: position{line: 1500, col: 5, offset: 36192}, run: (*parser).callonIdentifierName19, expr: &litMatcher{ - pos: position{line: 1500, col: 5, offset: 36211}, + pos: position{line: 1500, col: 5, offset: 36192}, val: "type", ignoreCase: false, want: "\"type\"", @@ -10132,22 +10096,22 @@ var g = &grammar{ }, { name: "IdentifierStart", - pos: position{line: 1502, col: 1, offset: 36250}, + pos: position{line: 1502, col: 1, offset: 36231}, expr: &choiceExpr{ - pos: position{line: 1503, col: 5, offset: 36270}, + pos: position{line: 1503, col: 5, offset: 36251}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1503, col: 5, offset: 36270}, + pos: position{line: 1503, col: 5, offset: 36251}, name: "UnicodeLetter", }, &litMatcher{ - pos: position{line: 1504, col: 5, offset: 36288}, + pos: position{line: 1504, col: 5, offset: 36269}, val: "$", ignoreCase: false, want: "\"$\"", }, &litMatcher{ - pos: position{line: 1505, col: 5, offset: 36296}, + pos: position{line: 1505, col: 5, offset: 36277}, val: "_", ignoreCase: false, want: "\"_\"", @@ -10159,24 +10123,24 @@ var g = &grammar{ }, { name: "IdentifierRest", - pos: position{line: 1507, col: 1, offset: 36301}, + pos: position{line: 1507, col: 1, offset: 36282}, expr: &choiceExpr{ - pos: position{line: 1508, col: 5, offset: 36320}, + pos: position{line: 1508, col: 5, offset: 36301}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1508, col: 5, offset: 36320}, + pos: position{line: 1508, col: 5, offset: 36301}, name: "IdentifierStart", }, &ruleRefExpr{ - pos: position{line: 1509, col: 5, offset: 36340}, + pos: position{line: 1509, col: 5, offset: 36321}, name: "UnicodeCombiningMark", }, &ruleRefExpr{ - pos: position{line: 1510, col: 5, offset: 36365}, + pos: position{line: 1510, col: 5, offset: 36346}, name: "UnicodeDigit", }, &ruleRefExpr{ - pos: position{line: 1511, col: 5, offset: 36382}, + pos: position{line: 1511, col: 5, offset: 36363}, name: "UnicodeConnectorPunctuation", }, }, @@ -10186,24 +10150,24 @@ var g = &grammar{ }, { name: "IDGuard", - pos: position{line: 1513, col: 1, offset: 36411}, + pos: position{line: 1513, col: 1, offset: 36392}, expr: &choiceExpr{ - pos: position{line: 1514, col: 5, offset: 36423}, + pos: position{line: 1514, col: 5, offset: 36404}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1514, col: 5, offset: 36423}, + pos: position{line: 1514, col: 5, offset: 36404}, name: "BooleanLiteral", }, &ruleRefExpr{ - pos: position{line: 1515, col: 5, offset: 36442}, + pos: position{line: 1515, col: 5, offset: 36423}, name: "NullLiteral", }, &ruleRefExpr{ - pos: position{line: 1516, col: 5, offset: 36458}, + pos: position{line: 1516, col: 5, offset: 36439}, name: "NaN", }, &ruleRefExpr{ - pos: position{line: 1517, col: 5, offset: 36466}, + pos: position{line: 1517, col: 5, offset: 36447}, name: "Infinity", }, }, @@ -10213,25 +10177,25 @@ var g = &grammar{ }, { name: "Time", - pos: position{line: 1519, col: 1, offset: 36476}, + pos: position{line: 1519, col: 1, offset: 36457}, expr: &actionExpr{ - pos: position{line: 1520, col: 5, offset: 36485}, + pos: position{line: 1520, col: 5, offset: 36466}, run: (*parser).callonTime1, expr: &seqExpr{ - pos: position{line: 1520, col: 5, offset: 36485}, + pos: position{line: 1520, col: 5, offset: 36466}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1520, col: 5, offset: 36485}, + pos: position{line: 1520, col: 5, offset: 36466}, name: "FullDate", }, &litMatcher{ - pos: position{line: 1520, col: 14, offset: 36494}, + pos: position{line: 1520, col: 14, offset: 36475}, val: "T", ignoreCase: false, want: "\"T\"", }, &ruleRefExpr{ - pos: position{line: 1520, col: 18, offset: 36498}, + pos: position{line: 1520, col: 18, offset: 36479}, name: "FullTime", }, }, @@ -10242,32 +10206,32 @@ var g = &grammar{ }, { name: "FullDate", - pos: position{line: 1524, col: 1, offset: 36574}, + pos: position{line: 1524, col: 1, offset: 36555}, expr: &seqExpr{ - pos: position{line: 1524, col: 12, offset: 36585}, + pos: position{line: 1524, col: 12, offset: 36566}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1524, col: 12, offset: 36585}, + pos: position{line: 1524, col: 12, offset: 36566}, name: "D4", }, &litMatcher{ - pos: position{line: 1524, col: 15, offset: 36588}, + pos: position{line: 1524, col: 15, offset: 36569}, val: "-", ignoreCase: false, want: "\"-\"", }, &ruleRefExpr{ - pos: position{line: 1524, col: 19, offset: 36592}, + pos: position{line: 1524, col: 19, offset: 36573}, name: "D2", }, &litMatcher{ - pos: position{line: 1524, col: 22, offset: 36595}, + pos: position{line: 1524, col: 22, offset: 36576}, val: "-", ignoreCase: false, want: "\"-\"", }, &ruleRefExpr{ - pos: position{line: 1524, col: 26, offset: 36599}, + pos: position{line: 1524, col: 26, offset: 36580}, name: "D2", }, }, @@ -10277,33 +10241,33 @@ var g = &grammar{ }, { name: "D4", - pos: position{line: 1526, col: 1, offset: 36603}, + pos: position{line: 1526, col: 1, offset: 36584}, expr: &seqExpr{ - pos: position{line: 1526, col: 6, offset: 36608}, + pos: position{line: 1526, col: 6, offset: 36589}, exprs: []any{ &charClassMatcher{ - pos: position{line: 1526, col: 6, offset: 36608}, + pos: position{line: 1526, col: 6, offset: 36589}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1526, col: 11, offset: 36613}, + pos: position{line: 1526, col: 11, offset: 36594}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1526, col: 16, offset: 36618}, + pos: position{line: 1526, col: 16, offset: 36599}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1526, col: 21, offset: 36623}, + pos: position{line: 1526, col: 21, offset: 36604}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10316,19 +10280,19 @@ var g = &grammar{ }, { name: "D2", - pos: position{line: 1527, col: 1, offset: 36629}, + pos: position{line: 1527, col: 1, offset: 36610}, expr: &seqExpr{ - pos: position{line: 1527, col: 6, offset: 36634}, + pos: position{line: 1527, col: 6, offset: 36615}, exprs: []any{ &charClassMatcher{ - pos: position{line: 1527, col: 6, offset: 36634}, + pos: position{line: 1527, col: 6, offset: 36615}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1527, col: 11, offset: 36639}, + pos: position{line: 1527, col: 11, offset: 36620}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10341,16 +10305,16 @@ var g = &grammar{ }, { name: "FullTime", - pos: position{line: 1529, col: 1, offset: 36646}, + pos: position{line: 1529, col: 1, offset: 36627}, expr: &seqExpr{ - pos: position{line: 1529, col: 12, offset: 36657}, + pos: position{line: 1529, col: 12, offset: 36638}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1529, col: 12, offset: 36657}, + pos: position{line: 1529, col: 12, offset: 36638}, name: "PartialTime", }, &ruleRefExpr{ - pos: position{line: 1529, col: 24, offset: 36669}, + pos: position{line: 1529, col: 24, offset: 36650}, name: "TimeOffset", }, }, @@ -10360,49 +10324,49 @@ var g = &grammar{ }, { name: "PartialTime", - pos: position{line: 1531, col: 1, offset: 36681}, + pos: position{line: 1531, col: 1, offset: 36662}, expr: &seqExpr{ - pos: position{line: 1531, col: 15, offset: 36695}, + pos: position{line: 1531, col: 15, offset: 36676}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1531, col: 15, offset: 36695}, + pos: position{line: 1531, col: 15, offset: 36676}, name: "D2", }, &litMatcher{ - pos: position{line: 1531, col: 18, offset: 36698}, + pos: position{line: 1531, col: 18, offset: 36679}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1531, col: 22, offset: 36702}, + pos: position{line: 1531, col: 22, offset: 36683}, name: "D2", }, &litMatcher{ - pos: position{line: 1531, col: 25, offset: 36705}, + pos: position{line: 1531, col: 25, offset: 36686}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1531, col: 29, offset: 36709}, + pos: position{line: 1531, col: 29, offset: 36690}, name: "D2", }, &zeroOrOneExpr{ - pos: position{line: 1531, col: 32, offset: 36712}, + pos: position{line: 1531, col: 32, offset: 36693}, expr: &seqExpr{ - pos: position{line: 1531, col: 33, offset: 36713}, + pos: position{line: 1531, col: 33, offset: 36694}, exprs: []any{ &litMatcher{ - pos: position{line: 1531, col: 33, offset: 36713}, + pos: position{line: 1531, col: 33, offset: 36694}, val: ".", ignoreCase: false, want: "\".\"", }, &oneOrMoreExpr{ - pos: position{line: 1531, col: 37, offset: 36717}, + pos: position{line: 1531, col: 37, offset: 36698}, expr: &charClassMatcher{ - pos: position{line: 1531, col: 37, offset: 36717}, + pos: position{line: 1531, col: 37, offset: 36698}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10419,30 +10383,30 @@ var g = &grammar{ }, { name: "TimeOffset", - pos: position{line: 1533, col: 1, offset: 36727}, + pos: position{line: 1533, col: 1, offset: 36708}, expr: &choiceExpr{ - pos: position{line: 1534, col: 5, offset: 36742}, + pos: position{line: 1534, col: 5, offset: 36723}, alternatives: []any{ &litMatcher{ - pos: position{line: 1534, col: 5, offset: 36742}, + pos: position{line: 1534, col: 5, offset: 36723}, val: "Z", ignoreCase: false, want: "\"Z\"", }, &seqExpr{ - pos: position{line: 1535, col: 5, offset: 36750}, + pos: position{line: 1535, col: 5, offset: 36731}, exprs: []any{ &choiceExpr{ - pos: position{line: 1535, col: 6, offset: 36751}, + pos: position{line: 1535, col: 6, offset: 36732}, alternatives: []any{ &litMatcher{ - pos: position{line: 1535, col: 6, offset: 36751}, + pos: position{line: 1535, col: 6, offset: 36732}, val: "+", ignoreCase: false, want: "\"+\"", }, &litMatcher{ - pos: position{line: 1535, col: 12, offset: 36757}, + pos: position{line: 1535, col: 12, offset: 36738}, val: "-", ignoreCase: false, want: "\"-\"", @@ -10450,34 +10414,34 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1535, col: 17, offset: 36762}, + pos: position{line: 1535, col: 17, offset: 36743}, name: "D2", }, &litMatcher{ - pos: position{line: 1535, col: 20, offset: 36765}, + pos: position{line: 1535, col: 20, offset: 36746}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1535, col: 24, offset: 36769}, + pos: position{line: 1535, col: 24, offset: 36750}, name: "D2", }, &zeroOrOneExpr{ - pos: position{line: 1535, col: 27, offset: 36772}, + pos: position{line: 1535, col: 27, offset: 36753}, expr: &seqExpr{ - pos: position{line: 1535, col: 28, offset: 36773}, + pos: position{line: 1535, col: 28, offset: 36754}, exprs: []any{ &litMatcher{ - pos: position{line: 1535, col: 28, offset: 36773}, + pos: position{line: 1535, col: 28, offset: 36754}, val: ".", ignoreCase: false, want: "\".\"", }, &oneOrMoreExpr{ - pos: position{line: 1535, col: 32, offset: 36777}, + pos: position{line: 1535, col: 32, offset: 36758}, expr: &charClassMatcher{ - pos: position{line: 1535, col: 32, offset: 36777}, + pos: position{line: 1535, col: 32, offset: 36758}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10496,33 +10460,33 @@ var g = &grammar{ }, { name: "Duration", - pos: position{line: 1537, col: 1, offset: 36787}, + pos: position{line: 1537, col: 1, offset: 36768}, expr: &actionExpr{ - pos: position{line: 1538, col: 5, offset: 36800}, + pos: position{line: 1538, col: 5, offset: 36781}, run: (*parser).callonDuration1, expr: &seqExpr{ - pos: position{line: 1538, col: 5, offset: 36800}, + pos: position{line: 1538, col: 5, offset: 36781}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1538, col: 5, offset: 36800}, + pos: position{line: 1538, col: 5, offset: 36781}, expr: &litMatcher{ - pos: position{line: 1538, col: 5, offset: 36800}, + pos: position{line: 1538, col: 5, offset: 36781}, val: "-", ignoreCase: false, want: "\"-\"", }, }, &oneOrMoreExpr{ - pos: position{line: 1538, col: 10, offset: 36805}, + pos: position{line: 1538, col: 10, offset: 36786}, expr: &seqExpr{ - pos: position{line: 1538, col: 11, offset: 36806}, + pos: position{line: 1538, col: 11, offset: 36787}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1538, col: 11, offset: 36806}, + pos: position{line: 1538, col: 11, offset: 36787}, name: "Decimal", }, &ruleRefExpr{ - pos: position{line: 1538, col: 19, offset: 36814}, + pos: position{line: 1538, col: 19, offset: 36795}, name: "TimeUnit", }, }, @@ -10536,27 +10500,27 @@ var g = &grammar{ }, { name: "Decimal", - pos: position{line: 1542, col: 1, offset: 36896}, + pos: position{line: 1542, col: 1, offset: 36877}, expr: &seqExpr{ - pos: position{line: 1542, col: 11, offset: 36906}, + pos: position{line: 1542, col: 11, offset: 36887}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1542, col: 11, offset: 36906}, + pos: position{line: 1542, col: 11, offset: 36887}, name: "UInt", }, &zeroOrOneExpr{ - pos: position{line: 1542, col: 16, offset: 36911}, + pos: position{line: 1542, col: 16, offset: 36892}, expr: &seqExpr{ - pos: position{line: 1542, col: 17, offset: 36912}, + pos: position{line: 1542, col: 17, offset: 36893}, exprs: []any{ &litMatcher{ - pos: position{line: 1542, col: 17, offset: 36912}, + pos: position{line: 1542, col: 17, offset: 36893}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1542, col: 21, offset: 36916}, + pos: position{line: 1542, col: 21, offset: 36897}, name: "UInt", }, }, @@ -10569,60 +10533,60 @@ var g = &grammar{ }, { name: "TimeUnit", - pos: position{line: 1544, col: 1, offset: 36924}, + pos: position{line: 1544, col: 1, offset: 36905}, expr: &choiceExpr{ - pos: position{line: 1545, col: 5, offset: 36937}, + pos: position{line: 1545, col: 5, offset: 36918}, alternatives: []any{ &litMatcher{ - pos: position{line: 1545, col: 5, offset: 36937}, + pos: position{line: 1545, col: 5, offset: 36918}, val: "ns", ignoreCase: false, want: "\"ns\"", }, &litMatcher{ - pos: position{line: 1546, col: 5, offset: 36946}, + pos: position{line: 1546, col: 5, offset: 36927}, val: "us", ignoreCase: false, want: "\"us\"", }, &litMatcher{ - pos: position{line: 1547, col: 5, offset: 36955}, + pos: position{line: 1547, col: 5, offset: 36936}, val: "ms", ignoreCase: false, want: "\"ms\"", }, &litMatcher{ - pos: position{line: 1548, col: 5, offset: 36964}, + pos: position{line: 1548, col: 5, offset: 36945}, val: "s", ignoreCase: false, want: "\"s\"", }, &litMatcher{ - pos: position{line: 1549, col: 5, offset: 36972}, + pos: position{line: 1549, col: 5, offset: 36953}, val: "m", ignoreCase: false, want: "\"m\"", }, &litMatcher{ - pos: position{line: 1550, col: 5, offset: 36980}, + pos: position{line: 1550, col: 5, offset: 36961}, val: "h", ignoreCase: false, want: "\"h\"", }, &litMatcher{ - pos: position{line: 1551, col: 5, offset: 36988}, + pos: position{line: 1551, col: 5, offset: 36969}, val: "d", ignoreCase: false, want: "\"d\"", }, &litMatcher{ - pos: position{line: 1552, col: 5, offset: 36996}, + pos: position{line: 1552, col: 5, offset: 36977}, val: "w", ignoreCase: false, want: "\"w\"", }, &litMatcher{ - pos: position{line: 1553, col: 5, offset: 37004}, + pos: position{line: 1553, col: 5, offset: 36985}, val: "y", ignoreCase: false, want: "\"y\"", @@ -10634,45 +10598,45 @@ var g = &grammar{ }, { name: "IP", - pos: position{line: 1555, col: 1, offset: 37009}, + pos: position{line: 1555, col: 1, offset: 36990}, expr: &actionExpr{ - pos: position{line: 1556, col: 5, offset: 37016}, + pos: position{line: 1556, col: 5, offset: 36997}, run: (*parser).callonIP1, expr: &seqExpr{ - pos: position{line: 1556, col: 5, offset: 37016}, + pos: position{line: 1556, col: 5, offset: 36997}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1556, col: 5, offset: 37016}, + pos: position{line: 1556, col: 5, offset: 36997}, name: "UInt", }, &litMatcher{ - pos: position{line: 1556, col: 10, offset: 37021}, + pos: position{line: 1556, col: 10, offset: 37002}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1556, col: 14, offset: 37025}, + pos: position{line: 1556, col: 14, offset: 37006}, name: "UInt", }, &litMatcher{ - pos: position{line: 1556, col: 19, offset: 37030}, + pos: position{line: 1556, col: 19, offset: 37011}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1556, col: 23, offset: 37034}, + pos: position{line: 1556, col: 23, offset: 37015}, name: "UInt", }, &litMatcher{ - pos: position{line: 1556, col: 28, offset: 37039}, + pos: position{line: 1556, col: 28, offset: 37020}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1556, col: 32, offset: 37043}, + pos: position{line: 1556, col: 32, offset: 37024}, name: "UInt", }, }, @@ -10683,43 +10647,43 @@ var g = &grammar{ }, { name: "IP6", - pos: position{line: 1558, col: 1, offset: 37080}, + pos: position{line: 1558, col: 1, offset: 37061}, expr: &actionExpr{ - pos: position{line: 1559, col: 5, offset: 37088}, + pos: position{line: 1559, col: 5, offset: 37069}, run: (*parser).callonIP61, expr: &seqExpr{ - pos: position{line: 1559, col: 5, offset: 37088}, + pos: position{line: 1559, col: 5, offset: 37069}, exprs: []any{ ¬Expr{ - pos: position{line: 1559, col: 5, offset: 37088}, + pos: position{line: 1559, col: 5, offset: 37069}, expr: &seqExpr{ - pos: position{line: 1559, col: 7, offset: 37090}, + pos: position{line: 1559, col: 7, offset: 37071}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1559, col: 7, offset: 37090}, + pos: position{line: 1559, col: 7, offset: 37071}, name: "Hex", }, &litMatcher{ - pos: position{line: 1559, col: 11, offset: 37094}, + pos: position{line: 1559, col: 11, offset: 37075}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1559, col: 15, offset: 37098}, + pos: position{line: 1559, col: 15, offset: 37079}, name: "Hex", }, ¬Expr{ - pos: position{line: 1559, col: 19, offset: 37102}, + pos: position{line: 1559, col: 19, offset: 37083}, expr: &choiceExpr{ - pos: position{line: 1559, col: 21, offset: 37104}, + pos: position{line: 1559, col: 21, offset: 37085}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1559, col: 21, offset: 37104}, + pos: position{line: 1559, col: 21, offset: 37085}, name: "HexDigit", }, &litMatcher{ - pos: position{line: 1559, col: 32, offset: 37115}, + pos: position{line: 1559, col: 32, offset: 37096}, val: ":", ignoreCase: false, want: "\":\"", @@ -10731,10 +10695,10 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 1559, col: 38, offset: 37121}, + pos: position{line: 1559, col: 38, offset: 37102}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1559, col: 40, offset: 37123}, + pos: position{line: 1559, col: 40, offset: 37104}, name: "IP6Variations", }, }, @@ -10746,32 +10710,32 @@ var g = &grammar{ }, { name: "IP6Variations", - pos: position{line: 1563, col: 1, offset: 37287}, + pos: position{line: 1563, col: 1, offset: 37268}, expr: &choiceExpr{ - pos: position{line: 1564, col: 5, offset: 37305}, + pos: position{line: 1564, col: 5, offset: 37286}, alternatives: []any{ &actionExpr{ - pos: position{line: 1564, col: 5, offset: 37305}, + pos: position{line: 1564, col: 5, offset: 37286}, run: (*parser).callonIP6Variations2, expr: &seqExpr{ - pos: position{line: 1564, col: 5, offset: 37305}, + pos: position{line: 1564, col: 5, offset: 37286}, exprs: []any{ &labeledExpr{ - pos: position{line: 1564, col: 5, offset: 37305}, + pos: position{line: 1564, col: 5, offset: 37286}, label: "a", expr: &oneOrMoreExpr{ - pos: position{line: 1564, col: 7, offset: 37307}, + pos: position{line: 1564, col: 7, offset: 37288}, expr: &ruleRefExpr{ - pos: position{line: 1564, col: 7, offset: 37307}, + pos: position{line: 1564, col: 7, offset: 37288}, name: "HexColon", }, }, }, &labeledExpr{ - pos: position{line: 1564, col: 17, offset: 37317}, + pos: position{line: 1564, col: 17, offset: 37298}, label: "b", expr: &ruleRefExpr{ - pos: position{line: 1564, col: 19, offset: 37319}, + pos: position{line: 1564, col: 19, offset: 37300}, name: "IP6Tail", }, }, @@ -10779,52 +10743,52 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1567, col: 5, offset: 37383}, + pos: position{line: 1567, col: 5, offset: 37364}, run: (*parser).callonIP6Variations9, expr: &seqExpr{ - pos: position{line: 1567, col: 5, offset: 37383}, + pos: position{line: 1567, col: 5, offset: 37364}, exprs: []any{ &labeledExpr{ - pos: position{line: 1567, col: 5, offset: 37383}, + pos: position{line: 1567, col: 5, offset: 37364}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1567, col: 7, offset: 37385}, + pos: position{line: 1567, col: 7, offset: 37366}, name: "Hex", }, }, &labeledExpr{ - pos: position{line: 1567, col: 11, offset: 37389}, + pos: position{line: 1567, col: 11, offset: 37370}, label: "b", expr: &zeroOrMoreExpr{ - pos: position{line: 1567, col: 13, offset: 37391}, + pos: position{line: 1567, col: 13, offset: 37372}, expr: &ruleRefExpr{ - pos: position{line: 1567, col: 13, offset: 37391}, + pos: position{line: 1567, col: 13, offset: 37372}, name: "ColonHex", }, }, }, &litMatcher{ - pos: position{line: 1567, col: 23, offset: 37401}, + pos: position{line: 1567, col: 23, offset: 37382}, val: "::", ignoreCase: false, want: "\"::\"", }, &labeledExpr{ - pos: position{line: 1567, col: 28, offset: 37406}, + pos: position{line: 1567, col: 28, offset: 37387}, label: "d", expr: &zeroOrMoreExpr{ - pos: position{line: 1567, col: 30, offset: 37408}, + pos: position{line: 1567, col: 30, offset: 37389}, expr: &ruleRefExpr{ - pos: position{line: 1567, col: 30, offset: 37408}, + pos: position{line: 1567, col: 30, offset: 37389}, name: "HexColon", }, }, }, &labeledExpr{ - pos: position{line: 1567, col: 40, offset: 37418}, + pos: position{line: 1567, col: 40, offset: 37399}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1567, col: 42, offset: 37420}, + pos: position{line: 1567, col: 42, offset: 37401}, name: "IP6Tail", }, }, @@ -10832,33 +10796,33 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1570, col: 5, offset: 37519}, + pos: position{line: 1570, col: 5, offset: 37500}, run: (*parser).callonIP6Variations22, expr: &seqExpr{ - pos: position{line: 1570, col: 5, offset: 37519}, + pos: position{line: 1570, col: 5, offset: 37500}, exprs: []any{ &litMatcher{ - pos: position{line: 1570, col: 5, offset: 37519}, + pos: position{line: 1570, col: 5, offset: 37500}, val: "::", ignoreCase: false, want: "\"::\"", }, &labeledExpr{ - pos: position{line: 1570, col: 10, offset: 37524}, + pos: position{line: 1570, col: 10, offset: 37505}, label: "a", expr: &zeroOrMoreExpr{ - pos: position{line: 1570, col: 12, offset: 37526}, + pos: position{line: 1570, col: 12, offset: 37507}, expr: &ruleRefExpr{ - pos: position{line: 1570, col: 12, offset: 37526}, + pos: position{line: 1570, col: 12, offset: 37507}, name: "HexColon", }, }, }, &labeledExpr{ - pos: position{line: 1570, col: 22, offset: 37536}, + pos: position{line: 1570, col: 22, offset: 37517}, label: "b", expr: &ruleRefExpr{ - pos: position{line: 1570, col: 24, offset: 37538}, + pos: position{line: 1570, col: 24, offset: 37519}, name: "IP6Tail", }, }, @@ -10866,32 +10830,32 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1573, col: 5, offset: 37609}, + pos: position{line: 1573, col: 5, offset: 37590}, run: (*parser).callonIP6Variations30, expr: &seqExpr{ - pos: position{line: 1573, col: 5, offset: 37609}, + pos: position{line: 1573, col: 5, offset: 37590}, exprs: []any{ &labeledExpr{ - pos: position{line: 1573, col: 5, offset: 37609}, + pos: position{line: 1573, col: 5, offset: 37590}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1573, col: 7, offset: 37611}, + pos: position{line: 1573, col: 7, offset: 37592}, name: "Hex", }, }, &labeledExpr{ - pos: position{line: 1573, col: 11, offset: 37615}, + pos: position{line: 1573, col: 11, offset: 37596}, label: "b", expr: &zeroOrMoreExpr{ - pos: position{line: 1573, col: 13, offset: 37617}, + pos: position{line: 1573, col: 13, offset: 37598}, expr: &ruleRefExpr{ - pos: position{line: 1573, col: 13, offset: 37617}, + pos: position{line: 1573, col: 13, offset: 37598}, name: "ColonHex", }, }, }, &litMatcher{ - pos: position{line: 1573, col: 23, offset: 37627}, + pos: position{line: 1573, col: 23, offset: 37608}, val: "::", ignoreCase: false, want: "\"::\"", @@ -10900,10 +10864,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1576, col: 5, offset: 37695}, + pos: position{line: 1576, col: 5, offset: 37676}, run: (*parser).callonIP6Variations38, expr: &litMatcher{ - pos: position{line: 1576, col: 5, offset: 37695}, + pos: position{line: 1576, col: 5, offset: 37676}, val: "::", ignoreCase: false, want: "\"::\"", @@ -10916,16 +10880,16 @@ var g = &grammar{ }, { name: "IP6Tail", - pos: position{line: 1580, col: 1, offset: 37732}, + pos: position{line: 1580, col: 1, offset: 37713}, expr: &choiceExpr{ - pos: position{line: 1581, col: 5, offset: 37744}, + pos: position{line: 1581, col: 5, offset: 37725}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1581, col: 5, offset: 37744}, + pos: position{line: 1581, col: 5, offset: 37725}, name: "IP", }, &ruleRefExpr{ - pos: position{line: 1582, col: 5, offset: 37751}, + pos: position{line: 1582, col: 5, offset: 37732}, name: "Hex", }, }, @@ -10935,24 +10899,24 @@ var g = &grammar{ }, { name: "ColonHex", - pos: position{line: 1584, col: 1, offset: 37756}, + pos: position{line: 1584, col: 1, offset: 37737}, expr: &actionExpr{ - pos: position{line: 1584, col: 12, offset: 37767}, + pos: position{line: 1584, col: 12, offset: 37748}, run: (*parser).callonColonHex1, expr: &seqExpr{ - pos: position{line: 1584, col: 12, offset: 37767}, + pos: position{line: 1584, col: 12, offset: 37748}, exprs: []any{ &litMatcher{ - pos: position{line: 1584, col: 12, offset: 37767}, + pos: position{line: 1584, col: 12, offset: 37748}, val: ":", ignoreCase: false, want: "\":\"", }, &labeledExpr{ - pos: position{line: 1584, col: 16, offset: 37771}, + pos: position{line: 1584, col: 16, offset: 37752}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1584, col: 18, offset: 37773}, + pos: position{line: 1584, col: 18, offset: 37754}, name: "Hex", }, }, @@ -10964,23 +10928,23 @@ var g = &grammar{ }, { name: "HexColon", - pos: position{line: 1586, col: 1, offset: 37811}, + pos: position{line: 1586, col: 1, offset: 37792}, expr: &actionExpr{ - pos: position{line: 1586, col: 12, offset: 37822}, + pos: position{line: 1586, col: 12, offset: 37803}, run: (*parser).callonHexColon1, expr: &seqExpr{ - pos: position{line: 1586, col: 12, offset: 37822}, + pos: position{line: 1586, col: 12, offset: 37803}, exprs: []any{ &labeledExpr{ - pos: position{line: 1586, col: 12, offset: 37822}, + pos: position{line: 1586, col: 12, offset: 37803}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1586, col: 14, offset: 37824}, + pos: position{line: 1586, col: 14, offset: 37805}, name: "Hex", }, }, &litMatcher{ - pos: position{line: 1586, col: 18, offset: 37828}, + pos: position{line: 1586, col: 18, offset: 37809}, val: ":", ignoreCase: false, want: "\":\"", @@ -10993,32 +10957,32 @@ var g = &grammar{ }, { name: "IP4Net", - pos: position{line: 1588, col: 1, offset: 37866}, + pos: position{line: 1588, col: 1, offset: 37847}, expr: &actionExpr{ - pos: position{line: 1589, col: 5, offset: 37877}, + pos: position{line: 1589, col: 5, offset: 37858}, run: (*parser).callonIP4Net1, expr: &seqExpr{ - pos: position{line: 1589, col: 5, offset: 37877}, + pos: position{line: 1589, col: 5, offset: 37858}, exprs: []any{ &labeledExpr{ - pos: position{line: 1589, col: 5, offset: 37877}, + pos: position{line: 1589, col: 5, offset: 37858}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1589, col: 7, offset: 37879}, + pos: position{line: 1589, col: 7, offset: 37860}, name: "IP", }, }, &litMatcher{ - pos: position{line: 1589, col: 10, offset: 37882}, + pos: position{line: 1589, col: 10, offset: 37863}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 1589, col: 14, offset: 37886}, + pos: position{line: 1589, col: 14, offset: 37867}, label: "m", expr: &ruleRefExpr{ - pos: position{line: 1589, col: 16, offset: 37888}, + pos: position{line: 1589, col: 16, offset: 37869}, name: "UIntString", }, }, @@ -11030,32 +10994,32 @@ var g = &grammar{ }, { name: "IP6Net", - pos: position{line: 1593, col: 1, offset: 37956}, + pos: position{line: 1593, col: 1, offset: 37937}, expr: &actionExpr{ - pos: position{line: 1594, col: 5, offset: 37967}, + pos: position{line: 1594, col: 5, offset: 37948}, run: (*parser).callonIP6Net1, expr: &seqExpr{ - pos: position{line: 1594, col: 5, offset: 37967}, + pos: position{line: 1594, col: 5, offset: 37948}, exprs: []any{ &labeledExpr{ - pos: position{line: 1594, col: 5, offset: 37967}, + pos: position{line: 1594, col: 5, offset: 37948}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1594, col: 7, offset: 37969}, + pos: position{line: 1594, col: 7, offset: 37950}, name: "IP6", }, }, &litMatcher{ - pos: position{line: 1594, col: 11, offset: 37973}, + pos: position{line: 1594, col: 11, offset: 37954}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 1594, col: 15, offset: 37977}, + pos: position{line: 1594, col: 15, offset: 37958}, label: "m", expr: &ruleRefExpr{ - pos: position{line: 1594, col: 17, offset: 37979}, + pos: position{line: 1594, col: 17, offset: 37960}, name: "UIntString", }, }, @@ -11067,15 +11031,15 @@ var g = &grammar{ }, { name: "UInt", - pos: position{line: 1598, col: 1, offset: 38047}, + pos: position{line: 1598, col: 1, offset: 38028}, expr: &actionExpr{ - pos: position{line: 1599, col: 4, offset: 38055}, + pos: position{line: 1599, col: 4, offset: 38036}, run: (*parser).callonUInt1, expr: &labeledExpr{ - pos: position{line: 1599, col: 4, offset: 38055}, + pos: position{line: 1599, col: 4, offset: 38036}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1599, col: 6, offset: 38057}, + pos: position{line: 1599, col: 6, offset: 38038}, name: "UIntString", }, }, @@ -11085,16 +11049,16 @@ var g = &grammar{ }, { name: "IntString", - pos: position{line: 1601, col: 1, offset: 38097}, + pos: position{line: 1601, col: 1, offset: 38078}, expr: &choiceExpr{ - pos: position{line: 1602, col: 5, offset: 38111}, + pos: position{line: 1602, col: 5, offset: 38092}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1602, col: 5, offset: 38111}, + pos: position{line: 1602, col: 5, offset: 38092}, name: "UIntString", }, &ruleRefExpr{ - pos: position{line: 1603, col: 5, offset: 38126}, + pos: position{line: 1603, col: 5, offset: 38107}, name: "MinusIntString", }, }, @@ -11104,14 +11068,14 @@ var g = &grammar{ }, { name: "UIntString", - pos: position{line: 1605, col: 1, offset: 38142}, + pos: position{line: 1605, col: 1, offset: 38123}, expr: &actionExpr{ - pos: position{line: 1605, col: 14, offset: 38155}, + pos: position{line: 1605, col: 14, offset: 38136}, run: (*parser).callonUIntString1, expr: &oneOrMoreExpr{ - pos: position{line: 1605, col: 14, offset: 38155}, + pos: position{line: 1605, col: 14, offset: 38136}, expr: &charClassMatcher{ - pos: position{line: 1605, col: 14, offset: 38155}, + pos: position{line: 1605, col: 14, offset: 38136}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11124,21 +11088,21 @@ var g = &grammar{ }, { name: "MinusIntString", - pos: position{line: 1607, col: 1, offset: 38194}, + pos: position{line: 1607, col: 1, offset: 38175}, expr: &actionExpr{ - pos: position{line: 1608, col: 5, offset: 38213}, + pos: position{line: 1608, col: 5, offset: 38194}, run: (*parser).callonMinusIntString1, expr: &seqExpr{ - pos: position{line: 1608, col: 5, offset: 38213}, + pos: position{line: 1608, col: 5, offset: 38194}, exprs: []any{ &litMatcher{ - pos: position{line: 1608, col: 5, offset: 38213}, + pos: position{line: 1608, col: 5, offset: 38194}, val: "-", ignoreCase: false, want: "\"-\"", }, &ruleRefExpr{ - pos: position{line: 1608, col: 9, offset: 38217}, + pos: position{line: 1608, col: 9, offset: 38198}, name: "UIntString", }, }, @@ -11149,29 +11113,29 @@ var g = &grammar{ }, { name: "FloatString", - pos: position{line: 1610, col: 1, offset: 38260}, + pos: position{line: 1610, col: 1, offset: 38241}, expr: &choiceExpr{ - pos: position{line: 1611, col: 5, offset: 38276}, + pos: position{line: 1611, col: 5, offset: 38257}, alternatives: []any{ &actionExpr{ - pos: position{line: 1611, col: 5, offset: 38276}, + pos: position{line: 1611, col: 5, offset: 38257}, run: (*parser).callonFloatString2, expr: &seqExpr{ - pos: position{line: 1611, col: 5, offset: 38276}, + pos: position{line: 1611, col: 5, offset: 38257}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1611, col: 5, offset: 38276}, + pos: position{line: 1611, col: 5, offset: 38257}, expr: &litMatcher{ - pos: position{line: 1611, col: 5, offset: 38276}, + pos: position{line: 1611, col: 5, offset: 38257}, val: "-", ignoreCase: false, want: "\"-\"", }, }, &oneOrMoreExpr{ - pos: position{line: 1611, col: 10, offset: 38281}, + pos: position{line: 1611, col: 10, offset: 38262}, expr: &charClassMatcher{ - pos: position{line: 1611, col: 10, offset: 38281}, + pos: position{line: 1611, col: 10, offset: 38262}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11179,15 +11143,15 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1611, col: 17, offset: 38288}, + pos: position{line: 1611, col: 17, offset: 38269}, val: ".", ignoreCase: false, want: "\".\"", }, &zeroOrMoreExpr{ - pos: position{line: 1611, col: 21, offset: 38292}, + pos: position{line: 1611, col: 21, offset: 38273}, expr: &charClassMatcher{ - pos: position{line: 1611, col: 21, offset: 38292}, + pos: position{line: 1611, col: 21, offset: 38273}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11195,9 +11159,9 @@ var g = &grammar{ }, }, &zeroOrOneExpr{ - pos: position{line: 1611, col: 28, offset: 38299}, + pos: position{line: 1611, col: 28, offset: 38280}, expr: &ruleRefExpr{ - pos: position{line: 1611, col: 28, offset: 38299}, + pos: position{line: 1611, col: 28, offset: 38280}, name: "ExponentPart", }, }, @@ -11205,30 +11169,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1612, col: 5, offset: 38348}, + pos: position{line: 1612, col: 5, offset: 38329}, run: (*parser).callonFloatString13, expr: &seqExpr{ - pos: position{line: 1612, col: 5, offset: 38348}, + pos: position{line: 1612, col: 5, offset: 38329}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1612, col: 5, offset: 38348}, + pos: position{line: 1612, col: 5, offset: 38329}, expr: &litMatcher{ - pos: position{line: 1612, col: 5, offset: 38348}, + pos: position{line: 1612, col: 5, offset: 38329}, val: "-", ignoreCase: false, want: "\"-\"", }, }, &litMatcher{ - pos: position{line: 1612, col: 10, offset: 38353}, + pos: position{line: 1612, col: 10, offset: 38334}, val: ".", ignoreCase: false, want: "\".\"", }, &oneOrMoreExpr{ - pos: position{line: 1612, col: 14, offset: 38357}, + pos: position{line: 1612, col: 14, offset: 38338}, expr: &charClassMatcher{ - pos: position{line: 1612, col: 14, offset: 38357}, + pos: position{line: 1612, col: 14, offset: 38338}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11236,9 +11200,9 @@ var g = &grammar{ }, }, &zeroOrOneExpr{ - pos: position{line: 1612, col: 21, offset: 38364}, + pos: position{line: 1612, col: 21, offset: 38345}, expr: &ruleRefExpr{ - pos: position{line: 1612, col: 21, offset: 38364}, + pos: position{line: 1612, col: 21, offset: 38345}, name: "ExponentPart", }, }, @@ -11246,17 +11210,17 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1613, col: 5, offset: 38413}, + pos: position{line: 1613, col: 5, offset: 38394}, run: (*parser).callonFloatString22, expr: &choiceExpr{ - pos: position{line: 1613, col: 6, offset: 38414}, + pos: position{line: 1613, col: 6, offset: 38395}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1613, col: 6, offset: 38414}, + pos: position{line: 1613, col: 6, offset: 38395}, name: "NaN", }, &ruleRefExpr{ - pos: position{line: 1613, col: 12, offset: 38420}, + pos: position{line: 1613, col: 12, offset: 38401}, name: "Infinity", }, }, @@ -11269,20 +11233,20 @@ var g = &grammar{ }, { name: "ExponentPart", - pos: position{line: 1616, col: 1, offset: 38463}, + pos: position{line: 1616, col: 1, offset: 38444}, expr: &seqExpr{ - pos: position{line: 1616, col: 16, offset: 38478}, + pos: position{line: 1616, col: 16, offset: 38459}, exprs: []any{ &litMatcher{ - pos: position{line: 1616, col: 16, offset: 38478}, + pos: position{line: 1616, col: 16, offset: 38459}, val: "e", ignoreCase: true, want: "\"e\"i", }, &zeroOrOneExpr{ - pos: position{line: 1616, col: 21, offset: 38483}, + pos: position{line: 1616, col: 21, offset: 38464}, expr: &charClassMatcher{ - pos: position{line: 1616, col: 21, offset: 38483}, + pos: position{line: 1616, col: 21, offset: 38464}, val: "[+-]", chars: []rune{'+', '-'}, ignoreCase: false, @@ -11290,7 +11254,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1616, col: 27, offset: 38489}, + pos: position{line: 1616, col: 27, offset: 38470}, name: "UIntString", }, }, @@ -11300,9 +11264,9 @@ var g = &grammar{ }, { name: "NaN", - pos: position{line: 1618, col: 1, offset: 38501}, + pos: position{line: 1618, col: 1, offset: 38482}, expr: &litMatcher{ - pos: position{line: 1618, col: 7, offset: 38507}, + pos: position{line: 1618, col: 7, offset: 38488}, val: "NaN", ignoreCase: false, want: "\"NaN\"", @@ -11312,23 +11276,23 @@ var g = &grammar{ }, { name: "Infinity", - pos: position{line: 1620, col: 1, offset: 38514}, + pos: position{line: 1620, col: 1, offset: 38495}, expr: &seqExpr{ - pos: position{line: 1620, col: 12, offset: 38525}, + pos: position{line: 1620, col: 12, offset: 38506}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1620, col: 12, offset: 38525}, + pos: position{line: 1620, col: 12, offset: 38506}, expr: &choiceExpr{ - pos: position{line: 1620, col: 13, offset: 38526}, + pos: position{line: 1620, col: 13, offset: 38507}, alternatives: []any{ &litMatcher{ - pos: position{line: 1620, col: 13, offset: 38526}, + pos: position{line: 1620, col: 13, offset: 38507}, val: "-", ignoreCase: false, want: "\"-\"", }, &litMatcher{ - pos: position{line: 1620, col: 19, offset: 38532}, + pos: position{line: 1620, col: 19, offset: 38513}, val: "+", ignoreCase: false, want: "\"+\"", @@ -11337,7 +11301,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1620, col: 25, offset: 38538}, + pos: position{line: 1620, col: 25, offset: 38519}, val: "Inf", ignoreCase: false, want: "\"Inf\"", @@ -11349,14 +11313,14 @@ var g = &grammar{ }, { name: "Hex", - pos: position{line: 1622, col: 1, offset: 38545}, + pos: position{line: 1622, col: 1, offset: 38526}, expr: &actionExpr{ - pos: position{line: 1622, col: 7, offset: 38551}, + pos: position{line: 1622, col: 7, offset: 38532}, run: (*parser).callonHex1, expr: &oneOrMoreExpr{ - pos: position{line: 1622, col: 7, offset: 38551}, + pos: position{line: 1622, col: 7, offset: 38532}, expr: &ruleRefExpr{ - pos: position{line: 1622, col: 7, offset: 38551}, + pos: position{line: 1622, col: 7, offset: 38532}, name: "HexDigit", }, }, @@ -11366,9 +11330,9 @@ var g = &grammar{ }, { name: "HexDigit", - pos: position{line: 1624, col: 1, offset: 38593}, + pos: position{line: 1624, col: 1, offset: 38574}, expr: &charClassMatcher{ - pos: position{line: 1624, col: 12, offset: 38604}, + pos: position{line: 1624, col: 12, offset: 38585}, val: "[0-9a-fA-F]", ranges: []rune{'0', '9', 'a', 'f', 'A', 'F'}, ignoreCase: false, @@ -11379,35 +11343,35 @@ var g = &grammar{ }, { name: "QuotedString", - pos: position{line: 1626, col: 1, offset: 38617}, + pos: position{line: 1626, col: 1, offset: 38598}, expr: &choiceExpr{ - pos: position{line: 1627, col: 5, offset: 38634}, + pos: position{line: 1627, col: 5, offset: 38615}, alternatives: []any{ &actionExpr{ - pos: position{line: 1627, col: 5, offset: 38634}, + pos: position{line: 1627, col: 5, offset: 38615}, run: (*parser).callonQuotedString2, expr: &seqExpr{ - pos: position{line: 1627, col: 5, offset: 38634}, + pos: position{line: 1627, col: 5, offset: 38615}, exprs: []any{ &litMatcher{ - pos: position{line: 1627, col: 5, offset: 38634}, + pos: position{line: 1627, col: 5, offset: 38615}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, &labeledExpr{ - pos: position{line: 1627, col: 9, offset: 38638}, + pos: position{line: 1627, col: 9, offset: 38619}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1627, col: 11, offset: 38640}, + pos: position{line: 1627, col: 11, offset: 38621}, expr: &ruleRefExpr{ - pos: position{line: 1627, col: 11, offset: 38640}, + pos: position{line: 1627, col: 11, offset: 38621}, name: "DoubleQuotedChar", }, }, }, &litMatcher{ - pos: position{line: 1627, col: 29, offset: 38658}, + pos: position{line: 1627, col: 29, offset: 38639}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -11416,30 +11380,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1628, col: 5, offset: 38695}, + pos: position{line: 1628, col: 5, offset: 38676}, run: (*parser).callonQuotedString9, expr: &seqExpr{ - pos: position{line: 1628, col: 5, offset: 38695}, + pos: position{line: 1628, col: 5, offset: 38676}, exprs: []any{ &litMatcher{ - pos: position{line: 1628, col: 5, offset: 38695}, + pos: position{line: 1628, col: 5, offset: 38676}, val: "'", ignoreCase: false, want: "\"'\"", }, &labeledExpr{ - pos: position{line: 1628, col: 9, offset: 38699}, + pos: position{line: 1628, col: 9, offset: 38680}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1628, col: 11, offset: 38701}, + pos: position{line: 1628, col: 11, offset: 38682}, expr: &ruleRefExpr{ - pos: position{line: 1628, col: 11, offset: 38701}, + pos: position{line: 1628, col: 11, offset: 38682}, name: "SingleQuotedChar", }, }, }, &litMatcher{ - pos: position{line: 1628, col: 29, offset: 38719}, + pos: position{line: 1628, col: 29, offset: 38700}, val: "'", ignoreCase: false, want: "\"'\"", @@ -11454,57 +11418,57 @@ var g = &grammar{ }, { name: "DoubleQuotedChar", - pos: position{line: 1630, col: 1, offset: 38753}, + pos: position{line: 1630, col: 1, offset: 38734}, expr: &choiceExpr{ - pos: position{line: 1631, col: 5, offset: 38774}, + pos: position{line: 1631, col: 5, offset: 38755}, alternatives: []any{ &actionExpr{ - pos: position{line: 1631, col: 5, offset: 38774}, + pos: position{line: 1631, col: 5, offset: 38755}, run: (*parser).callonDoubleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1631, col: 5, offset: 38774}, + pos: position{line: 1631, col: 5, offset: 38755}, exprs: []any{ ¬Expr{ - pos: position{line: 1631, col: 5, offset: 38774}, + pos: position{line: 1631, col: 5, offset: 38755}, expr: &choiceExpr{ - pos: position{line: 1631, col: 7, offset: 38776}, + pos: position{line: 1631, col: 7, offset: 38757}, alternatives: []any{ &litMatcher{ - pos: position{line: 1631, col: 7, offset: 38776}, + pos: position{line: 1631, col: 7, offset: 38757}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, &ruleRefExpr{ - pos: position{line: 1631, col: 13, offset: 38782}, + pos: position{line: 1631, col: 13, offset: 38763}, name: "EscapedChar", }, }, }, }, &anyMatcher{ - line: 1631, col: 26, offset: 38795, + line: 1631, col: 26, offset: 38776, }, }, }, }, &actionExpr{ - pos: position{line: 1632, col: 5, offset: 38832}, + pos: position{line: 1632, col: 5, offset: 38813}, run: (*parser).callonDoubleQuotedChar9, expr: &seqExpr{ - pos: position{line: 1632, col: 5, offset: 38832}, + pos: position{line: 1632, col: 5, offset: 38813}, exprs: []any{ &litMatcher{ - pos: position{line: 1632, col: 5, offset: 38832}, + pos: position{line: 1632, col: 5, offset: 38813}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1632, col: 10, offset: 38837}, + pos: position{line: 1632, col: 10, offset: 38818}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1632, col: 12, offset: 38839}, + pos: position{line: 1632, col: 12, offset: 38820}, name: "EscapeSequence", }, }, @@ -11518,28 +11482,28 @@ var g = &grammar{ }, { name: "KeyWord", - pos: position{line: 1634, col: 1, offset: 38873}, + pos: position{line: 1634, col: 1, offset: 38854}, expr: &actionExpr{ - pos: position{line: 1635, col: 5, offset: 38885}, + pos: position{line: 1635, col: 5, offset: 38866}, run: (*parser).callonKeyWord1, expr: &seqExpr{ - pos: position{line: 1635, col: 5, offset: 38885}, + pos: position{line: 1635, col: 5, offset: 38866}, exprs: []any{ &labeledExpr{ - pos: position{line: 1635, col: 5, offset: 38885}, + pos: position{line: 1635, col: 5, offset: 38866}, label: "head", expr: &ruleRefExpr{ - pos: position{line: 1635, col: 10, offset: 38890}, + pos: position{line: 1635, col: 10, offset: 38871}, name: "KeyWordStart", }, }, &labeledExpr{ - pos: position{line: 1635, col: 23, offset: 38903}, + pos: position{line: 1635, col: 23, offset: 38884}, label: "tail", expr: &zeroOrMoreExpr{ - pos: position{line: 1635, col: 28, offset: 38908}, + pos: position{line: 1635, col: 28, offset: 38889}, expr: &ruleRefExpr{ - pos: position{line: 1635, col: 28, offset: 38908}, + pos: position{line: 1635, col: 28, offset: 38889}, name: "KeyWordRest", }, }, @@ -11552,16 +11516,16 @@ var g = &grammar{ }, { name: "KeyWordStart", - pos: position{line: 1637, col: 1, offset: 38970}, + pos: position{line: 1637, col: 1, offset: 38951}, expr: &choiceExpr{ - pos: position{line: 1638, col: 5, offset: 38987}, + pos: position{line: 1638, col: 5, offset: 38968}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1638, col: 5, offset: 38987}, + pos: position{line: 1638, col: 5, offset: 38968}, name: "KeyWordChars", }, &ruleRefExpr{ - pos: position{line: 1639, col: 5, offset: 39004}, + pos: position{line: 1639, col: 5, offset: 38985}, name: "KeyWordEsc", }, }, @@ -11571,16 +11535,16 @@ var g = &grammar{ }, { name: "KeyWordRest", - pos: position{line: 1641, col: 1, offset: 39016}, + pos: position{line: 1641, col: 1, offset: 38997}, expr: &choiceExpr{ - pos: position{line: 1642, col: 5, offset: 39032}, + pos: position{line: 1642, col: 5, offset: 39013}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1642, col: 5, offset: 39032}, + pos: position{line: 1642, col: 5, offset: 39013}, name: "KeyWordStart", }, &charClassMatcher{ - pos: position{line: 1643, col: 5, offset: 39049}, + pos: position{line: 1643, col: 5, offset: 39030}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11593,19 +11557,19 @@ var g = &grammar{ }, { name: "KeyWordChars", - pos: position{line: 1645, col: 1, offset: 39056}, + pos: position{line: 1645, col: 1, offset: 39037}, expr: &actionExpr{ - pos: position{line: 1645, col: 16, offset: 39071}, + pos: position{line: 1645, col: 16, offset: 39052}, run: (*parser).callonKeyWordChars1, expr: &choiceExpr{ - pos: position{line: 1645, col: 17, offset: 39072}, + pos: position{line: 1645, col: 17, offset: 39053}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1645, col: 17, offset: 39072}, + pos: position{line: 1645, col: 17, offset: 39053}, name: "UnicodeLetter", }, &charClassMatcher{ - pos: position{line: 1645, col: 33, offset: 39088}, + pos: position{line: 1645, col: 33, offset: 39069}, val: "[_.:/%#@~]", chars: []rune{'_', '.', ':', '/', '%', '#', '@', '~'}, ignoreCase: false, @@ -11619,31 +11583,31 @@ var g = &grammar{ }, { name: "KeyWordEsc", - pos: position{line: 1647, col: 1, offset: 39132}, + pos: position{line: 1647, col: 1, offset: 39113}, expr: &actionExpr{ - pos: position{line: 1647, col: 14, offset: 39145}, + pos: position{line: 1647, col: 14, offset: 39126}, run: (*parser).callonKeyWordEsc1, expr: &seqExpr{ - pos: position{line: 1647, col: 14, offset: 39145}, + pos: position{line: 1647, col: 14, offset: 39126}, exprs: []any{ &litMatcher{ - pos: position{line: 1647, col: 14, offset: 39145}, + pos: position{line: 1647, col: 14, offset: 39126}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1647, col: 19, offset: 39150}, + pos: position{line: 1647, col: 19, offset: 39131}, label: "s", expr: &choiceExpr{ - pos: position{line: 1647, col: 22, offset: 39153}, + pos: position{line: 1647, col: 22, offset: 39134}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1647, col: 22, offset: 39153}, + pos: position{line: 1647, col: 22, offset: 39134}, name: "KeywordEscape", }, &ruleRefExpr{ - pos: position{line: 1647, col: 38, offset: 39169}, + pos: position{line: 1647, col: 38, offset: 39150}, name: "EscapeSequence", }, }, @@ -11657,42 +11621,42 @@ var g = &grammar{ }, { name: "GlobPattern", - pos: position{line: 1649, col: 1, offset: 39204}, + pos: position{line: 1649, col: 1, offset: 39185}, expr: &actionExpr{ - pos: position{line: 1650, col: 5, offset: 39220}, + pos: position{line: 1650, col: 5, offset: 39201}, run: (*parser).callonGlobPattern1, expr: &seqExpr{ - pos: position{line: 1650, col: 5, offset: 39220}, + pos: position{line: 1650, col: 5, offset: 39201}, exprs: []any{ &andExpr{ - pos: position{line: 1650, col: 5, offset: 39220}, + pos: position{line: 1650, col: 5, offset: 39201}, expr: &ruleRefExpr{ - pos: position{line: 1650, col: 6, offset: 39221}, + pos: position{line: 1650, col: 6, offset: 39202}, name: "GlobProperStart", }, }, &andExpr{ - pos: position{line: 1650, col: 22, offset: 39237}, + pos: position{line: 1650, col: 22, offset: 39218}, expr: &ruleRefExpr{ - pos: position{line: 1650, col: 23, offset: 39238}, + pos: position{line: 1650, col: 23, offset: 39219}, name: "GlobHasStar", }, }, &labeledExpr{ - pos: position{line: 1650, col: 35, offset: 39250}, + pos: position{line: 1650, col: 35, offset: 39231}, label: "head", expr: &ruleRefExpr{ - pos: position{line: 1650, col: 40, offset: 39255}, + pos: position{line: 1650, col: 40, offset: 39236}, name: "GlobStart", }, }, &labeledExpr{ - pos: position{line: 1650, col: 50, offset: 39265}, + pos: position{line: 1650, col: 50, offset: 39246}, label: "tail", expr: &zeroOrMoreExpr{ - pos: position{line: 1650, col: 55, offset: 39270}, + pos: position{line: 1650, col: 55, offset: 39251}, expr: &ruleRefExpr{ - pos: position{line: 1650, col: 55, offset: 39270}, + pos: position{line: 1650, col: 55, offset: 39251}, name: "GlobRest", }, }, @@ -11705,28 +11669,28 @@ var g = &grammar{ }, { name: "GlobProperStart", - pos: position{line: 1654, col: 1, offset: 39339}, + pos: position{line: 1654, col: 1, offset: 39320}, expr: &choiceExpr{ - pos: position{line: 1654, col: 19, offset: 39357}, + pos: position{line: 1654, col: 19, offset: 39338}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1654, col: 19, offset: 39357}, + pos: position{line: 1654, col: 19, offset: 39338}, name: "KeyWordStart", }, &seqExpr{ - pos: position{line: 1654, col: 34, offset: 39372}, + pos: position{line: 1654, col: 34, offset: 39353}, exprs: []any{ &oneOrMoreExpr{ - pos: position{line: 1654, col: 34, offset: 39372}, + pos: position{line: 1654, col: 34, offset: 39353}, expr: &litMatcher{ - pos: position{line: 1654, col: 34, offset: 39372}, + pos: position{line: 1654, col: 34, offset: 39353}, val: "*", ignoreCase: false, want: "\"*\"", }, }, &ruleRefExpr{ - pos: position{line: 1654, col: 39, offset: 39377}, + pos: position{line: 1654, col: 39, offset: 39358}, name: "KeyWordRest", }, }, @@ -11738,19 +11702,19 @@ var g = &grammar{ }, { name: "GlobHasStar", - pos: position{line: 1655, col: 1, offset: 39389}, + pos: position{line: 1655, col: 1, offset: 39370}, expr: &seqExpr{ - pos: position{line: 1655, col: 15, offset: 39403}, + pos: position{line: 1655, col: 15, offset: 39384}, exprs: []any{ &zeroOrMoreExpr{ - pos: position{line: 1655, col: 15, offset: 39403}, + pos: position{line: 1655, col: 15, offset: 39384}, expr: &ruleRefExpr{ - pos: position{line: 1655, col: 15, offset: 39403}, + pos: position{line: 1655, col: 15, offset: 39384}, name: "KeyWordRest", }, }, &litMatcher{ - pos: position{line: 1655, col: 28, offset: 39416}, + pos: position{line: 1655, col: 28, offset: 39397}, val: "*", ignoreCase: false, want: "\"*\"", @@ -11762,23 +11726,23 @@ var g = &grammar{ }, { name: "GlobStart", - pos: position{line: 1657, col: 1, offset: 39421}, + pos: position{line: 1657, col: 1, offset: 39402}, expr: &choiceExpr{ - pos: position{line: 1658, col: 5, offset: 39435}, + pos: position{line: 1658, col: 5, offset: 39416}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1658, col: 5, offset: 39435}, + pos: position{line: 1658, col: 5, offset: 39416}, name: "KeyWordChars", }, &ruleRefExpr{ - pos: position{line: 1659, col: 5, offset: 39452}, + pos: position{line: 1659, col: 5, offset: 39433}, name: "GlobEsc", }, &actionExpr{ - pos: position{line: 1660, col: 5, offset: 39464}, + pos: position{line: 1660, col: 5, offset: 39445}, run: (*parser).callonGlobStart4, expr: &litMatcher{ - pos: position{line: 1660, col: 5, offset: 39464}, + pos: position{line: 1660, col: 5, offset: 39445}, val: "*", ignoreCase: false, want: "\"*\"", @@ -11791,16 +11755,16 @@ var g = &grammar{ }, { name: "GlobRest", - pos: position{line: 1662, col: 1, offset: 39489}, + pos: position{line: 1662, col: 1, offset: 39470}, expr: &choiceExpr{ - pos: position{line: 1663, col: 5, offset: 39502}, + pos: position{line: 1663, col: 5, offset: 39483}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1663, col: 5, offset: 39502}, + pos: position{line: 1663, col: 5, offset: 39483}, name: "GlobStart", }, &charClassMatcher{ - pos: position{line: 1664, col: 5, offset: 39516}, + pos: position{line: 1664, col: 5, offset: 39497}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11813,31 +11777,31 @@ var g = &grammar{ }, { name: "GlobEsc", - pos: position{line: 1666, col: 1, offset: 39523}, + pos: position{line: 1666, col: 1, offset: 39504}, expr: &actionExpr{ - pos: position{line: 1666, col: 11, offset: 39533}, + pos: position{line: 1666, col: 11, offset: 39514}, run: (*parser).callonGlobEsc1, expr: &seqExpr{ - pos: position{line: 1666, col: 11, offset: 39533}, + pos: position{line: 1666, col: 11, offset: 39514}, exprs: []any{ &litMatcher{ - pos: position{line: 1666, col: 11, offset: 39533}, + pos: position{line: 1666, col: 11, offset: 39514}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1666, col: 16, offset: 39538}, + pos: position{line: 1666, col: 16, offset: 39519}, label: "s", expr: &choiceExpr{ - pos: position{line: 1666, col: 19, offset: 39541}, + pos: position{line: 1666, col: 19, offset: 39522}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1666, col: 19, offset: 39541}, + pos: position{line: 1666, col: 19, offset: 39522}, name: "GlobEscape", }, &ruleRefExpr{ - pos: position{line: 1666, col: 32, offset: 39554}, + pos: position{line: 1666, col: 32, offset: 39535}, name: "EscapeSequence", }, }, @@ -11851,32 +11815,32 @@ var g = &grammar{ }, { name: "GlobEscape", - pos: position{line: 1668, col: 1, offset: 39589}, + pos: position{line: 1668, col: 1, offset: 39570}, expr: &choiceExpr{ - pos: position{line: 1669, col: 5, offset: 39604}, + pos: position{line: 1669, col: 5, offset: 39585}, alternatives: []any{ &actionExpr{ - pos: position{line: 1669, col: 5, offset: 39604}, + pos: position{line: 1669, col: 5, offset: 39585}, run: (*parser).callonGlobEscape2, expr: &litMatcher{ - pos: position{line: 1669, col: 5, offset: 39604}, + pos: position{line: 1669, col: 5, offset: 39585}, val: "=", ignoreCase: false, want: "\"=\"", }, }, &actionExpr{ - pos: position{line: 1670, col: 5, offset: 39632}, + pos: position{line: 1670, col: 5, offset: 39613}, run: (*parser).callonGlobEscape4, expr: &litMatcher{ - pos: position{line: 1670, col: 5, offset: 39632}, + pos: position{line: 1670, col: 5, offset: 39613}, val: "*", ignoreCase: false, want: "\"*\"", }, }, &charClassMatcher{ - pos: position{line: 1671, col: 5, offset: 39662}, + pos: position{line: 1671, col: 5, offset: 39643}, val: "[+-]", chars: []rune{'+', '-'}, ignoreCase: false, @@ -11889,57 +11853,57 @@ var g = &grammar{ }, { name: "SingleQuotedChar", - pos: position{line: 1673, col: 1, offset: 39668}, + pos: position{line: 1673, col: 1, offset: 39649}, expr: &choiceExpr{ - pos: position{line: 1674, col: 5, offset: 39689}, + pos: position{line: 1674, col: 5, offset: 39670}, alternatives: []any{ &actionExpr{ - pos: position{line: 1674, col: 5, offset: 39689}, + pos: position{line: 1674, col: 5, offset: 39670}, run: (*parser).callonSingleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1674, col: 5, offset: 39689}, + pos: position{line: 1674, col: 5, offset: 39670}, exprs: []any{ ¬Expr{ - pos: position{line: 1674, col: 5, offset: 39689}, + pos: position{line: 1674, col: 5, offset: 39670}, expr: &choiceExpr{ - pos: position{line: 1674, col: 7, offset: 39691}, + pos: position{line: 1674, col: 7, offset: 39672}, alternatives: []any{ &litMatcher{ - pos: position{line: 1674, col: 7, offset: 39691}, + pos: position{line: 1674, col: 7, offset: 39672}, val: "'", ignoreCase: false, want: "\"'\"", }, &ruleRefExpr{ - pos: position{line: 1674, col: 13, offset: 39697}, + pos: position{line: 1674, col: 13, offset: 39678}, name: "EscapedChar", }, }, }, }, &anyMatcher{ - line: 1674, col: 26, offset: 39710, + line: 1674, col: 26, offset: 39691, }, }, }, }, &actionExpr{ - pos: position{line: 1675, col: 5, offset: 39747}, + pos: position{line: 1675, col: 5, offset: 39728}, run: (*parser).callonSingleQuotedChar9, expr: &seqExpr{ - pos: position{line: 1675, col: 5, offset: 39747}, + pos: position{line: 1675, col: 5, offset: 39728}, exprs: []any{ &litMatcher{ - pos: position{line: 1675, col: 5, offset: 39747}, + pos: position{line: 1675, col: 5, offset: 39728}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1675, col: 10, offset: 39752}, + pos: position{line: 1675, col: 10, offset: 39733}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1675, col: 12, offset: 39754}, + pos: position{line: 1675, col: 12, offset: 39735}, name: "EscapeSequence", }, }, @@ -11953,16 +11917,16 @@ var g = &grammar{ }, { name: "EscapeSequence", - pos: position{line: 1677, col: 1, offset: 39788}, + pos: position{line: 1677, col: 1, offset: 39769}, expr: &choiceExpr{ - pos: position{line: 1678, col: 5, offset: 39807}, + pos: position{line: 1678, col: 5, offset: 39788}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1678, col: 5, offset: 39807}, + pos: position{line: 1678, col: 5, offset: 39788}, name: "SingleCharEscape", }, &ruleRefExpr{ - pos: position{line: 1679, col: 5, offset: 39828}, + pos: position{line: 1679, col: 5, offset: 39809}, name: "UnicodeEscape", }, }, @@ -11972,87 +11936,87 @@ var g = &grammar{ }, { name: "SingleCharEscape", - pos: position{line: 1681, col: 1, offset: 39843}, + pos: position{line: 1681, col: 1, offset: 39824}, expr: &choiceExpr{ - pos: position{line: 1682, col: 5, offset: 39864}, + pos: position{line: 1682, col: 5, offset: 39845}, alternatives: []any{ &litMatcher{ - pos: position{line: 1682, col: 5, offset: 39864}, + pos: position{line: 1682, col: 5, offset: 39845}, val: "'", ignoreCase: false, want: "\"'\"", }, &actionExpr{ - pos: position{line: 1683, col: 5, offset: 39872}, + pos: position{line: 1683, col: 5, offset: 39853}, run: (*parser).callonSingleCharEscape3, expr: &litMatcher{ - pos: position{line: 1683, col: 5, offset: 39872}, + pos: position{line: 1683, col: 5, offset: 39853}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, }, &litMatcher{ - pos: position{line: 1684, col: 5, offset: 39912}, + pos: position{line: 1684, col: 5, offset: 39893}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &actionExpr{ - pos: position{line: 1685, col: 5, offset: 39921}, + pos: position{line: 1685, col: 5, offset: 39902}, run: (*parser).callonSingleCharEscape6, expr: &litMatcher{ - pos: position{line: 1685, col: 5, offset: 39921}, + pos: position{line: 1685, col: 5, offset: 39902}, val: "b", ignoreCase: false, want: "\"b\"", }, }, &actionExpr{ - pos: position{line: 1686, col: 5, offset: 39950}, + pos: position{line: 1686, col: 5, offset: 39931}, run: (*parser).callonSingleCharEscape8, expr: &litMatcher{ - pos: position{line: 1686, col: 5, offset: 39950}, + pos: position{line: 1686, col: 5, offset: 39931}, val: "f", ignoreCase: false, want: "\"f\"", }, }, &actionExpr{ - pos: position{line: 1687, col: 5, offset: 39979}, + pos: position{line: 1687, col: 5, offset: 39960}, run: (*parser).callonSingleCharEscape10, expr: &litMatcher{ - pos: position{line: 1687, col: 5, offset: 39979}, + pos: position{line: 1687, col: 5, offset: 39960}, val: "n", ignoreCase: false, want: "\"n\"", }, }, &actionExpr{ - pos: position{line: 1688, col: 5, offset: 40008}, + pos: position{line: 1688, col: 5, offset: 39989}, run: (*parser).callonSingleCharEscape12, expr: &litMatcher{ - pos: position{line: 1688, col: 5, offset: 40008}, + pos: position{line: 1688, col: 5, offset: 39989}, val: "r", ignoreCase: false, want: "\"r\"", }, }, &actionExpr{ - pos: position{line: 1689, col: 5, offset: 40037}, + pos: position{line: 1689, col: 5, offset: 40018}, run: (*parser).callonSingleCharEscape14, expr: &litMatcher{ - pos: position{line: 1689, col: 5, offset: 40037}, + pos: position{line: 1689, col: 5, offset: 40018}, val: "t", ignoreCase: false, want: "\"t\"", }, }, &actionExpr{ - pos: position{line: 1690, col: 5, offset: 40066}, + pos: position{line: 1690, col: 5, offset: 40047}, run: (*parser).callonSingleCharEscape16, expr: &litMatcher{ - pos: position{line: 1690, col: 5, offset: 40066}, + pos: position{line: 1690, col: 5, offset: 40047}, val: "v", ignoreCase: false, want: "\"v\"", @@ -12065,32 +12029,32 @@ var g = &grammar{ }, { name: "KeywordEscape", - pos: position{line: 1692, col: 1, offset: 40092}, + pos: position{line: 1692, col: 1, offset: 40073}, expr: &choiceExpr{ - pos: position{line: 1693, col: 5, offset: 40110}, + pos: position{line: 1693, col: 5, offset: 40091}, alternatives: []any{ &actionExpr{ - pos: position{line: 1693, col: 5, offset: 40110}, + pos: position{line: 1693, col: 5, offset: 40091}, run: (*parser).callonKeywordEscape2, expr: &litMatcher{ - pos: position{line: 1693, col: 5, offset: 40110}, + pos: position{line: 1693, col: 5, offset: 40091}, val: "=", ignoreCase: false, want: "\"=\"", }, }, &actionExpr{ - pos: position{line: 1694, col: 5, offset: 40138}, + pos: position{line: 1694, col: 5, offset: 40119}, run: (*parser).callonKeywordEscape4, expr: &litMatcher{ - pos: position{line: 1694, col: 5, offset: 40138}, + pos: position{line: 1694, col: 5, offset: 40119}, val: "*", ignoreCase: false, want: "\"*\"", }, }, &charClassMatcher{ - pos: position{line: 1695, col: 5, offset: 40166}, + pos: position{line: 1695, col: 5, offset: 40147}, val: "[+-]", chars: []rune{'+', '-'}, ignoreCase: false, @@ -12103,42 +12067,42 @@ var g = &grammar{ }, { name: "UnicodeEscape", - pos: position{line: 1697, col: 1, offset: 40172}, + pos: position{line: 1697, col: 1, offset: 40153}, expr: &choiceExpr{ - pos: position{line: 1698, col: 5, offset: 40190}, + pos: position{line: 1698, col: 5, offset: 40171}, alternatives: []any{ &actionExpr{ - pos: position{line: 1698, col: 5, offset: 40190}, + pos: position{line: 1698, col: 5, offset: 40171}, run: (*parser).callonUnicodeEscape2, expr: &seqExpr{ - pos: position{line: 1698, col: 5, offset: 40190}, + pos: position{line: 1698, col: 5, offset: 40171}, exprs: []any{ &litMatcher{ - pos: position{line: 1698, col: 5, offset: 40190}, + pos: position{line: 1698, col: 5, offset: 40171}, val: "u", ignoreCase: false, want: "\"u\"", }, &labeledExpr{ - pos: position{line: 1698, col: 9, offset: 40194}, + pos: position{line: 1698, col: 9, offset: 40175}, label: "chars", expr: &seqExpr{ - pos: position{line: 1698, col: 16, offset: 40201}, + pos: position{line: 1698, col: 16, offset: 40182}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1698, col: 16, offset: 40201}, + pos: position{line: 1698, col: 16, offset: 40182}, name: "HexDigit", }, &ruleRefExpr{ - pos: position{line: 1698, col: 25, offset: 40210}, + pos: position{line: 1698, col: 25, offset: 40191}, name: "HexDigit", }, &ruleRefExpr{ - pos: position{line: 1698, col: 34, offset: 40219}, + pos: position{line: 1698, col: 34, offset: 40200}, name: "HexDigit", }, &ruleRefExpr{ - pos: position{line: 1698, col: 43, offset: 40228}, + pos: position{line: 1698, col: 43, offset: 40209}, name: "HexDigit", }, }, @@ -12148,65 +12112,65 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1701, col: 5, offset: 40291}, + pos: position{line: 1701, col: 5, offset: 40272}, run: (*parser).callonUnicodeEscape11, expr: &seqExpr{ - pos: position{line: 1701, col: 5, offset: 40291}, + pos: position{line: 1701, col: 5, offset: 40272}, exprs: []any{ &litMatcher{ - pos: position{line: 1701, col: 5, offset: 40291}, + pos: position{line: 1701, col: 5, offset: 40272}, val: "u", ignoreCase: false, want: "\"u\"", }, &litMatcher{ - pos: position{line: 1701, col: 9, offset: 40295}, + pos: position{line: 1701, col: 9, offset: 40276}, val: "{", ignoreCase: false, want: "\"{\"", }, &labeledExpr{ - pos: position{line: 1701, col: 13, offset: 40299}, + pos: position{line: 1701, col: 13, offset: 40280}, label: "chars", expr: &seqExpr{ - pos: position{line: 1701, col: 20, offset: 40306}, + pos: position{line: 1701, col: 20, offset: 40287}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1701, col: 20, offset: 40306}, + pos: position{line: 1701, col: 20, offset: 40287}, name: "HexDigit", }, &zeroOrOneExpr{ - pos: position{line: 1701, col: 29, offset: 40315}, + pos: position{line: 1701, col: 29, offset: 40296}, expr: &ruleRefExpr{ - pos: position{line: 1701, col: 29, offset: 40315}, + pos: position{line: 1701, col: 29, offset: 40296}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1701, col: 39, offset: 40325}, + pos: position{line: 1701, col: 39, offset: 40306}, expr: &ruleRefExpr{ - pos: position{line: 1701, col: 39, offset: 40325}, + pos: position{line: 1701, col: 39, offset: 40306}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1701, col: 49, offset: 40335}, + pos: position{line: 1701, col: 49, offset: 40316}, expr: &ruleRefExpr{ - pos: position{line: 1701, col: 49, offset: 40335}, + pos: position{line: 1701, col: 49, offset: 40316}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1701, col: 59, offset: 40345}, + pos: position{line: 1701, col: 59, offset: 40326}, expr: &ruleRefExpr{ - pos: position{line: 1701, col: 59, offset: 40345}, + pos: position{line: 1701, col: 59, offset: 40326}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1701, col: 69, offset: 40355}, + pos: position{line: 1701, col: 69, offset: 40336}, expr: &ruleRefExpr{ - pos: position{line: 1701, col: 69, offset: 40355}, + pos: position{line: 1701, col: 69, offset: 40336}, name: "HexDigit", }, }, @@ -12214,7 +12178,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1701, col: 80, offset: 40366}, + pos: position{line: 1701, col: 80, offset: 40347}, val: "}", ignoreCase: false, want: "\"}\"", @@ -12229,37 +12193,37 @@ var g = &grammar{ }, { name: "RegexpPattern", - pos: position{line: 1705, col: 1, offset: 40420}, + pos: position{line: 1705, col: 1, offset: 40401}, expr: &actionExpr{ - pos: position{line: 1706, col: 5, offset: 40438}, + pos: position{line: 1706, col: 5, offset: 40419}, run: (*parser).callonRegexpPattern1, expr: &seqExpr{ - pos: position{line: 1706, col: 5, offset: 40438}, + pos: position{line: 1706, col: 5, offset: 40419}, exprs: []any{ &litMatcher{ - pos: position{line: 1706, col: 5, offset: 40438}, + pos: position{line: 1706, col: 5, offset: 40419}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 1706, col: 9, offset: 40442}, + pos: position{line: 1706, col: 9, offset: 40423}, label: "body", expr: &ruleRefExpr{ - pos: position{line: 1706, col: 14, offset: 40447}, + pos: position{line: 1706, col: 14, offset: 40428}, name: "RegexpBody", }, }, &litMatcher{ - pos: position{line: 1706, col: 25, offset: 40458}, + pos: position{line: 1706, col: 25, offset: 40439}, val: "/", ignoreCase: false, want: "\"/\"", }, ¬Expr{ - pos: position{line: 1706, col: 29, offset: 40462}, + pos: position{line: 1706, col: 29, offset: 40443}, expr: &ruleRefExpr{ - pos: position{line: 1706, col: 30, offset: 40463}, + pos: position{line: 1706, col: 30, offset: 40444}, name: "KeyWordStart", }, }, @@ -12271,33 +12235,33 @@ var g = &grammar{ }, { name: "RegexpBody", - pos: position{line: 1708, col: 1, offset: 40498}, + pos: position{line: 1708, col: 1, offset: 40479}, expr: &actionExpr{ - pos: position{line: 1709, col: 5, offset: 40513}, + pos: position{line: 1709, col: 5, offset: 40494}, run: (*parser).callonRegexpBody1, expr: &oneOrMoreExpr{ - pos: position{line: 1709, col: 5, offset: 40513}, + pos: position{line: 1709, col: 5, offset: 40494}, expr: &choiceExpr{ - pos: position{line: 1709, col: 6, offset: 40514}, + pos: position{line: 1709, col: 6, offset: 40495}, alternatives: []any{ &charClassMatcher{ - pos: position{line: 1709, col: 6, offset: 40514}, + pos: position{line: 1709, col: 6, offset: 40495}, val: "[^/\\\\]", chars: []rune{'/', '\\'}, ignoreCase: false, inverted: true, }, &seqExpr{ - pos: position{line: 1709, col: 15, offset: 40523}, + pos: position{line: 1709, col: 15, offset: 40504}, exprs: []any{ &litMatcher{ - pos: position{line: 1709, col: 15, offset: 40523}, + pos: position{line: 1709, col: 15, offset: 40504}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &anyMatcher{ - line: 1709, col: 20, offset: 40528, + line: 1709, col: 20, offset: 40509, }, }, }, @@ -12310,9 +12274,9 @@ var g = &grammar{ }, { name: "EscapedChar", - pos: position{line: 1711, col: 1, offset: 40564}, + pos: position{line: 1711, col: 1, offset: 40545}, expr: &charClassMatcher{ - pos: position{line: 1712, col: 5, offset: 40580}, + pos: position{line: 1712, col: 5, offset: 40561}, val: "[\\x00-\\x1f\\\\]", chars: []rune{'\\'}, ranges: []rune{'\x00', '\x1f'}, @@ -12324,11 +12288,11 @@ var g = &grammar{ }, { name: "_", - pos: position{line: 1714, col: 1, offset: 40595}, + pos: position{line: 1714, col: 1, offset: 40576}, expr: &oneOrMoreExpr{ - pos: position{line: 1714, col: 5, offset: 40599}, + pos: position{line: 1714, col: 5, offset: 40580}, expr: &ruleRefExpr{ - pos: position{line: 1714, col: 5, offset: 40599}, + pos: position{line: 1714, col: 5, offset: 40580}, name: "AnySpace", }, }, @@ -12337,11 +12301,11 @@ var g = &grammar{ }, { name: "__", - pos: position{line: 1716, col: 1, offset: 40610}, + pos: position{line: 1716, col: 1, offset: 40591}, expr: &zeroOrMoreExpr{ - pos: position{line: 1716, col: 6, offset: 40615}, + pos: position{line: 1716, col: 6, offset: 40596}, expr: &ruleRefExpr{ - pos: position{line: 1716, col: 6, offset: 40615}, + pos: position{line: 1716, col: 6, offset: 40596}, name: "AnySpace", }, }, @@ -12350,20 +12314,20 @@ var g = &grammar{ }, { name: "AnySpace", - pos: position{line: 1718, col: 1, offset: 40626}, + pos: position{line: 1718, col: 1, offset: 40607}, expr: &choiceExpr{ - pos: position{line: 1719, col: 5, offset: 40639}, + pos: position{line: 1719, col: 5, offset: 40620}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1719, col: 5, offset: 40639}, + pos: position{line: 1719, col: 5, offset: 40620}, name: "WhiteSpace", }, &ruleRefExpr{ - pos: position{line: 1720, col: 5, offset: 40654}, + pos: position{line: 1720, col: 5, offset: 40635}, name: "LineTerminator", }, &ruleRefExpr{ - pos: position{line: 1721, col: 5, offset: 40673}, + pos: position{line: 1721, col: 5, offset: 40654}, name: "Comment", }, }, @@ -12373,32 +12337,32 @@ var g = &grammar{ }, { name: "UnicodeLetter", - pos: position{line: 1723, col: 1, offset: 40682}, + pos: position{line: 1723, col: 1, offset: 40663}, expr: &choiceExpr{ - pos: position{line: 1724, col: 5, offset: 40700}, + pos: position{line: 1724, col: 5, offset: 40681}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1724, col: 5, offset: 40700}, + pos: position{line: 1724, col: 5, offset: 40681}, name: "Lu", }, &ruleRefExpr{ - pos: position{line: 1725, col: 5, offset: 40707}, + pos: position{line: 1725, col: 5, offset: 40688}, name: "Ll", }, &ruleRefExpr{ - pos: position{line: 1726, col: 5, offset: 40714}, + pos: position{line: 1726, col: 5, offset: 40695}, name: "Lt", }, &ruleRefExpr{ - pos: position{line: 1727, col: 5, offset: 40721}, + pos: position{line: 1727, col: 5, offset: 40702}, name: "Lm", }, &ruleRefExpr{ - pos: position{line: 1728, col: 5, offset: 40728}, + pos: position{line: 1728, col: 5, offset: 40709}, name: "Lo", }, &ruleRefExpr{ - pos: position{line: 1729, col: 5, offset: 40735}, + pos: position{line: 1729, col: 5, offset: 40716}, name: "Nl", }, }, @@ -12408,16 +12372,16 @@ var g = &grammar{ }, { name: "UnicodeCombiningMark", - pos: position{line: 1731, col: 1, offset: 40739}, + pos: position{line: 1731, col: 1, offset: 40720}, expr: &choiceExpr{ - pos: position{line: 1732, col: 5, offset: 40764}, + pos: position{line: 1732, col: 5, offset: 40745}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1732, col: 5, offset: 40764}, + pos: position{line: 1732, col: 5, offset: 40745}, name: "Mn", }, &ruleRefExpr{ - pos: position{line: 1733, col: 5, offset: 40771}, + pos: position{line: 1733, col: 5, offset: 40752}, name: "Mc", }, }, @@ -12427,9 +12391,9 @@ var g = &grammar{ }, { name: "UnicodeDigit", - pos: position{line: 1735, col: 1, offset: 40775}, + pos: position{line: 1735, col: 1, offset: 40756}, expr: &ruleRefExpr{ - pos: position{line: 1736, col: 5, offset: 40792}, + pos: position{line: 1736, col: 5, offset: 40773}, name: "Nd", }, leader: false, @@ -12437,9 +12401,9 @@ var g = &grammar{ }, { name: "UnicodeConnectorPunctuation", - pos: position{line: 1738, col: 1, offset: 40796}, + pos: position{line: 1738, col: 1, offset: 40777}, expr: &ruleRefExpr{ - pos: position{line: 1739, col: 5, offset: 40828}, + pos: position{line: 1739, col: 5, offset: 40809}, name: "Pc", }, leader: false, @@ -12447,9 +12411,9 @@ var g = &grammar{ }, { name: "Ll", - pos: position{line: 1745, col: 1, offset: 41009}, + pos: position{line: 1745, col: 1, offset: 40990}, expr: &charClassMatcher{ - pos: position{line: 1745, col: 6, offset: 41014}, + pos: position{line: 1745, col: 6, offset: 40995}, 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', 'ﬓ', 'ﬗ', 'ａ', 'ｚ'}, @@ -12461,9 +12425,9 @@ var g = &grammar{ }, { name: "Lm", - pos: position{line: 1748, col: 1, offset: 45166}, + pos: position{line: 1748, col: 1, offset: 45147}, expr: &charClassMatcher{ - pos: position{line: 1748, col: 6, offset: 45171}, + pos: position{line: 1748, col: 6, offset: 45152}, 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{'ʰ', 'ˁ', 'ˆ', 'ˑ', 'ˠ', 'ˤ', 'ۥ', 'ۦ', 'ߴ', 'ߵ', 'ᱸ', 'ᱽ', 'ᴬ', 'ᵪ', 'ᶛ', 'ᶿ', 'ₐ', 'ₜ', 'ⱼ', 'ⱽ', '〱', '〵', 'ゝ', 'ゞ', 'ー', 'ヾ', 'ꓸ', 'ꓽ', 'ꚜ', 'ꚝ', 'ꜗ', 'ꜟ', 'ꟸ', 'ꟹ', 'ꫳ', 'ꫴ', 'ꭜ', 'ꭟ', 'ﾞ', 'ﾟ'}, @@ -12475,9 +12439,9 @@ var g = &grammar{ }, { name: "Lo", - pos: position{line: 1751, col: 1, offset: 45656}, + pos: position{line: 1751, col: 1, offset: 45637}, expr: &charClassMatcher{ - pos: position{line: 1751, col: 6, offset: 45661}, + pos: position{line: 1751, col: 6, offset: 45642}, 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{'ǀ', 'ǃ', 'א', 'ת', 'ׯ', 'ײ', 'ؠ', 'ؿ', 'ف', 'ي', 'ٮ', 'ٯ', 'ٱ', 'ۓ', 'ۮ', 'ۯ', 'ۺ', 'ۼ', 'ܒ', 'ܯ', 'ݍ', 'ޥ', 'ߊ', 'ߪ', 'ࠀ', 'ࠕ', 'ࡀ', 'ࡘ', 'ࡠ', 'ࡪ', 'ࢠ', 'ࢴ', 'ࢶ', 'ࢽ', 'ऄ', 'ह', 'क़', 'ॡ', 'ॲ', 'ঀ', 'অ', 'ঌ', 'এ', 'ঐ', 'ও', 'ন', 'প', 'র', 'শ', 'হ', 'ড়', 'ঢ়', 'য়', 'ৡ', 'ৰ', 'ৱ', 'ਅ', 'ਊ', 'ਏ', 'ਐ', 'ਓ', 'ਨ', 'ਪ', 'ਰ', 'ਲ', 'ਲ਼', 'ਵ', 'ਸ਼', 'ਸ', 'ਹ', 'ਖ਼', 'ੜ', 'ੲ', 'ੴ', 'અ', 'ઍ', 'એ', 'ઑ', 'ઓ', 'ન', 'પ', 'ર', 'લ', 'ળ', 'વ', 'હ', 'ૠ', 'ૡ', 'ଅ', 'ଌ', 'ଏ', 'ଐ', 'ଓ', 'ନ', 'ପ', 'ର', 'ଲ', 'ଳ', 'ଵ', 'ହ', 'ଡ଼', 'ଢ଼', 'ୟ', 'ୡ', 'அ', 'ஊ', 'எ', 'ஐ', 'ஒ', 'க', 'ங', 'ச', 'ஞ', 'ட', 'ண', 'த', 'ந', 'ப', 'ம', 'ஹ', 'అ', 'ఌ', 'ఎ', 'ఐ', 'ఒ', 'న', 'ప', 'హ', 'ౘ', 'ౚ', 'ౠ', 'ౡ', 'ಅ', 'ಌ', 'ಎ', 'ಐ', 'ಒ', 'ನ', 'ಪ', 'ಳ', 'ವ', 'ಹ', 'ೠ', 'ೡ', 'ೱ', 'ೲ', 'അ', 'ഌ', 'എ', 'ഐ', 'ഒ', 'ഺ', 'ൔ', 'ൖ', 'ൟ', 'ൡ', 'ൺ', 'ൿ', 'අ', 'ඖ', 'ක', 'න', 'ඳ', 'ර', 'ව', 'ෆ', 'ก', 'ะ', 'า', 'ำ', 'เ', 'ๅ', 'ກ', 'ຂ', 'ງ', 'ຈ', 'ດ', 'ທ', 'ນ', 'ຟ', 'ມ', 'ຣ', 'ສ', 'ຫ', 'ອ', 'ະ', 'າ', 'ຳ', 'ເ', 'ໄ', 'ໜ', 'ໟ', 'ཀ', 'ཇ', 'ཉ', 'ཬ', 'ྈ', 'ྌ', 'က', 'ဪ', 'ၐ', 'ၕ', 'ၚ', 'ၝ', 'ၥ', 'ၦ', 'ၮ', 'ၰ', 'ၵ', 'ႁ', 'ᄀ', 'ቈ', 'ቊ', 'ቍ', 'ቐ', 'ቖ', 'ቚ', 'ቝ', 'በ', 'ኈ', 'ኊ', 'ኍ', 'ነ', 'ኰ', 'ኲ', 'ኵ', 'ኸ', 'ኾ', 'ዂ', 'ዅ', 'ወ', 'ዖ', 'ዘ', 'ጐ', 'ጒ', 'ጕ', 'ጘ', 'ፚ', 'ᎀ', 'ᎏ', 'ᐁ', 'ᙬ', 'ᙯ', 'ᙿ', 'ᚁ', 'ᚚ', 'ᚠ', 'ᛪ', 'ᛱ', 'ᛸ', 'ᜀ', 'ᜌ', 'ᜎ', 'ᜑ', 'ᜠ', 'ᜱ', 'ᝀ', 'ᝑ', 'ᝠ', 'ᝬ', 'ᝮ', 'ᝰ', 'ក', 'ឳ', 'ᠠ', 'ᡂ', 'ᡄ', 'ᡸ', 'ᢀ', 'ᢄ', 'ᢇ', 'ᢨ', 'ᢰ', 'ᣵ', 'ᤀ', 'ᤞ', 'ᥐ', 'ᥭ', 'ᥰ', 'ᥴ', 'ᦀ', 'ᦫ', 'ᦰ', 'ᧉ', 'ᨀ', 'ᨖ', 'ᨠ', 'ᩔ', 'ᬅ', 'ᬳ', 'ᭅ', 'ᭋ', 'ᮃ', 'ᮠ', 'ᮮ', 'ᮯ', 'ᮺ', 'ᯥ', 'ᰀ', 'ᰣ', 'ᱍ', 'ᱏ', 'ᱚ', 'ᱷ', 'ᳩ', 'ᳬ', 'ᳮ', 'ᳱ', 'ᳵ', 'ᳶ', 'ℵ', 'ℸ', 'ⴰ', 'ⵧ', 'ⶀ', 'ⶖ', 'ⶠ', 'ⶦ', 'ⶨ', 'ⶮ', 'ⶰ', 'ⶶ', 'ⶸ', 'ⶾ', 'ⷀ', 'ⷆ', 'ⷈ', 'ⷎ', 'ⷐ', 'ⷖ', 'ⷘ', 'ⷞ', 'ぁ', 'ゖ', 'ァ', 'ヺ', 'ㄅ', 'ㄯ', 'ㄱ', 'ㆎ', 'ㆠ', 'ㆺ', 'ㇰ', 'ㇿ', '㐀', '䶵', '一', '鿯', 'ꀀ', 'ꀔ', 'ꀖ', 'ꒌ', 'ꓐ', 'ꓷ', 'ꔀ', 'ꘋ', 'ꘐ', 'ꘟ', 'ꘪ', 'ꘫ', 'ꚠ', 'ꛥ', 'ꟻ', 'ꠁ', 'ꠃ', 'ꠅ', 'ꠇ', 'ꠊ', 'ꠌ', 'ꠢ', 'ꡀ', 'ꡳ', 'ꢂ', 'ꢳ', 'ꣲ', 'ꣷ', 'ꣽ', 'ꣾ', 'ꤊ', 'ꤥ', 'ꤰ', 'ꥆ', 'ꥠ', 'ꥼ', 'ꦄ', 'ꦲ', 'ꧠ', 'ꧤ', 'ꧧ', 'ꧯ', 'ꧺ', 'ꧾ', 'ꨀ', 'ꨨ', 'ꩀ', 'ꩂ', 'ꩄ', 'ꩋ', 'ꩠ', 'ꩯ', 'ꩱ', 'ꩶ', 'ꩾ', 'ꪯ', 'ꪵ', 'ꪶ', 'ꪹ', 'ꪽ', 'ꫛ', 'ꫜ', 'ꫠ', 'ꫪ', 'ꬁ', 'ꬆ', 'ꬉ', 'ꬎ', 'ꬑ', 'ꬖ', 'ꬠ', 'ꬦ', 'ꬨ', 'ꬮ', 'ꯀ', 'ꯢ', '가', '힣', 'ힰ', 'ퟆ', 'ퟋ', 'ퟻ', '豈', '舘', '並', '龎', 'ײַ', 'ﬨ', 'שׁ', 'זּ', 'טּ', 'לּ', 'נּ', 'סּ', 'ףּ', 'פּ', 'צּ', 'ﮱ', 'ﯓ', 'ﴽ', 'ﵐ', 'ﶏ', 'ﶒ', 'ﷇ', 'ﷰ', 'ﷻ', 'ﹰ', 'ﹴ', 'ﹶ', 'ﻼ', 'ｦ', 'ｯ', 'ｱ', 'ﾝ', 'ﾠ', 'ﾾ', 'ￂ', 'ￇ', 'ￊ', 'ￏ', 'ￒ', 'ￗ', 'ￚ', 'ￜ'}, @@ -12489,9 +12453,9 @@ var g = &grammar{ }, { name: "Lt", - pos: position{line: 1754, col: 1, offset: 49108}, + pos: position{line: 1754, col: 1, offset: 49089}, expr: &charClassMatcher{ - pos: position{line: 1754, col: 6, offset: 49113}, + pos: position{line: 1754, col: 6, offset: 49094}, val: "[\\u01C5\\u01C8\\u01CB\\u01F2\\u1F88-\\u1F8F\\u1F98-\\u1F9F\\u1FA8-\\u1FAF\\u1FBC\\u1FCC\\u1FFC]", chars: []rune{'Dž', 'Lj', 'Nj', 'Dz', 'ᾼ', 'ῌ', 'ῼ'}, ranges: []rune{'ᾈ', 'ᾏ', 'ᾘ', 'ᾟ', 'ᾨ', 'ᾯ'}, @@ -12503,9 +12467,9 @@ var g = &grammar{ }, { name: "Lu", - pos: position{line: 1757, col: 1, offset: 49219}, + pos: position{line: 1757, col: 1, offset: 49200}, expr: &charClassMatcher{ - pos: position{line: 1757, col: 6, offset: 49224}, + pos: position{line: 1757, col: 6, offset: 49205}, 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', 'ℭ', 'ℰ', 'ℳ', 'ℾ', 'ℿ', 'Ⰰ', 'Ⱞ', 'Ɫ', 'Ɽ', 'Ɑ', 'Ɒ', 'Ȿ', 'Ⲁ', 'Ᵹ', 'Ꝿ', 'Ɦ', 'Ɪ', 'Ʞ', 'Ꞵ', 'Ａ', 'Ｚ'}, @@ -12517,9 +12481,9 @@ var g = &grammar{ }, { name: "Mc", - pos: position{line: 1760, col: 1, offset: 53225}, + pos: position{line: 1760, col: 1, offset: 53206}, expr: &charClassMatcher{ - pos: position{line: 1760, col: 6, offset: 53230}, + pos: position{line: 1760, col: 6, offset: 53211}, 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{'ा', 'ी', 'ॉ', 'ौ', 'ॎ', 'ॏ', 'ং', 'ঃ', 'া', 'ী', 'ে', 'ৈ', 'ো', 'ৌ', 'ਾ', 'ੀ', 'ા', 'ી', 'ો', 'ૌ', 'ଂ', 'ଃ', 'େ', 'ୈ', 'ୋ', 'ୌ', 'ா', 'ி', 'ு', 'ூ', 'ெ', 'ை', 'ொ', 'ௌ', 'ఁ', 'ః', 'ు', 'ౄ', 'ಂ', 'ಃ', 'ೀ', 'ೄ', 'ೇ', 'ೈ', 'ೊ', 'ೋ', 'ೕ', 'ೖ', 'ം', 'ഃ', 'ാ', 'ീ', 'െ', 'ൈ', 'ൊ', 'ൌ', 'ං', 'ඃ', 'ා', 'ෑ', 'ෘ', 'ෟ', 'ෲ', 'ෳ', '༾', '༿', 'ါ', 'ာ', 'ျ', 'ြ', 'ၖ', 'ၗ', 'ၢ', 'ၤ', 'ၧ', 'ၭ', 'ႃ', 'ႄ', 'ႇ', 'ႌ', 'ႚ', 'ႜ', 'ើ', 'ៅ', 'ះ', 'ៈ', 'ᤣ', 'ᤦ', 'ᤩ', 'ᤫ', 'ᤰ', 'ᤱ', 'ᤳ', 'ᤸ', 'ᨙ', 'ᨚ', 'ᩣ', 'ᩤ', 'ᩭ', 'ᩲ', 'ᬽ', 'ᭁ', 'ᭃ', '᭄', 'ᮦ', 'ᮧ', 'ᯪ', 'ᯬ', '᯲', '᯳', 'ᰤ', 'ᰫ', 'ᰴ', 'ᰵ', 'ᳲ', 'ᳳ', '〮', '〯', 'ꠣ', 'ꠤ', 'ꢀ', 'ꢁ', 'ꢴ', 'ꣃ', 'ꥒ', '꥓', 'ꦴ', 'ꦵ', 'ꦺ', 'ꦻ', 'ꦽ', '꧀', 'ꨯ', 'ꨰ', 'ꨳ', 'ꨴ', 'ꫮ', 'ꫯ', 'ꯣ', 'ꯤ', 'ꯦ', 'ꯧ', 'ꯩ', 'ꯪ'}, @@ -12531,9 +12495,9 @@ var g = &grammar{ }, { name: "Mn", - pos: position{line: 1763, col: 1, offset: 54418}, + pos: position{line: 1763, col: 1, offset: 54399}, expr: &charClassMatcher{ - pos: position{line: 1763, col: 6, offset: 54423}, + pos: position{line: 1763, col: 6, offset: 54404}, 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{'̀', 'ͯ', '҃', '҇', '֑', 'ֽ', 'ׁ', 'ׂ', 'ׄ', 'ׅ', 'ؐ', 'ؚ', 'ً', 'ٟ', 'ۖ', 'ۜ', '۟', 'ۤ', 'ۧ', 'ۨ', '۪', 'ۭ', 'ܰ', '݊', 'ަ', 'ް', '߫', '߳', 'ࠖ', '࠙', 'ࠛ', 'ࠣ', 'ࠥ', 'ࠧ', 'ࠩ', '࠭', '࡙', '࡛', '࣓', '࣡', 'ࣣ', 'ं', 'ु', 'ै', '॑', 'ॗ', 'ॢ', 'ॣ', 'ু', 'ৄ', 'ৢ', 'ৣ', 'ਁ', 'ਂ', 'ੁ', 'ੂ', 'ੇ', 'ੈ', 'ੋ', '੍', 'ੰ', 'ੱ', 'ઁ', 'ં', 'ુ', 'ૅ', 'ે', 'ૈ', 'ૢ', 'ૣ', 'ૺ', '૿', 'ୁ', 'ୄ', 'ୢ', 'ୣ', 'ా', 'ీ', 'ె', 'ై', 'ొ', '్', 'ౕ', 'ౖ', 'ౢ', 'ౣ', 'ೌ', '್', 'ೢ', 'ೣ', 'ഀ', 'ഁ', '഻', '഼', 'ു', 'ൄ', 'ൢ', 'ൣ', 'ි', 'ු', 'ิ', 'ฺ', '็', '๎', 'ິ', 'ູ', 'ົ', 'ຼ', '່', 'ໍ', '༘', '༙', 'ཱ', 'ཾ', 'ྀ', '྄', '྆', '྇', 'ྍ', 'ྗ', 'ྙ', 'ྼ', 'ိ', 'ူ', 'ဲ', '့', '္', '်', 'ွ', 'ှ', 'ၘ', 'ၙ', 'ၞ', 'ၠ', 'ၱ', 'ၴ', 'ႅ', 'ႆ', '፝', '፟', 'ᜒ', '᜔', 'ᜲ', '᜴', 'ᝒ', 'ᝓ', 'ᝲ', 'ᝳ', '឴', '឵', 'ិ', 'ួ', '៉', '៓', '᠋', '᠍', 'ᢅ', 'ᢆ', 'ᤠ', 'ᤢ', 'ᤧ', 'ᤨ', '᤹', '᤻', 'ᨗ', 'ᨘ', 'ᩘ', 'ᩞ', 'ᩥ', 'ᩬ', 'ᩳ', '᩼', '᪰', '᪽', 'ᬀ', 'ᬃ', 'ᬶ', 'ᬺ', '᭫', '᭳', 'ᮀ', 'ᮁ', 'ᮢ', 'ᮥ', 'ᮨ', 'ᮩ', '᮫', 'ᮭ', 'ᯨ', 'ᯩ', 'ᯯ', 'ᯱ', 'ᰬ', 'ᰳ', 'ᰶ', '᰷', '᳐', '᳒', '᳔', '᳠', '᳢', '᳨', '᳸', '᳹', '᷀', '᷹', '᷻', '᷿', '⃐', '⃜', '⃥', '⃰', '⳯', '⳱', 'ⷠ', 'ⷿ', '〪', '〭', '゙', '゚', 'ꙴ', '꙽', 'ꚞ', 'ꚟ', '꛰', '꛱', 'ꠥ', 'ꠦ', '꣄', 'ꣅ', '꣠', '꣱', 'ꤦ', '꤭', 'ꥇ', 'ꥑ', 'ꦀ', 'ꦂ', 'ꦶ', 'ꦹ', 'ꨩ', 'ꨮ', 'ꨱ', 'ꨲ', 'ꨵ', 'ꨶ', 'ꪲ', 'ꪴ', 'ꪷ', 'ꪸ', 'ꪾ', '꪿', 'ꫬ', 'ꫭ', '︀', '️', '︠', '︯'}, @@ -12545,9 +12509,9 @@ var g = &grammar{ }, { name: "Nd", - pos: position{line: 1766, col: 1, offset: 56603}, + pos: position{line: 1766, col: 1, offset: 56584}, expr: &charClassMatcher{ - pos: position{line: 1766, col: 6, offset: 56608}, + pos: position{line: 1766, col: 6, offset: 56589}, 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, @@ -12558,9 +12522,9 @@ var g = &grammar{ }, { name: "Nl", - pos: position{line: 1769, col: 1, offset: 57111}, + pos: position{line: 1769, col: 1, offset: 57092}, expr: &charClassMatcher{ - pos: position{line: 1769, col: 6, offset: 57116}, + pos: position{line: 1769, col: 6, offset: 57097}, val: "[\\u16EE-\\u16F0\\u2160-\\u2182\\u2185-\\u2188\\u3007\\u3021-\\u3029\\u3038-\\u303A\\uA6E6-\\uA6EF]", chars: []rune{'〇'}, ranges: []rune{'ᛮ', 'ᛰ', 'Ⅰ', 'ↂ', 'ↅ', 'ↈ', '〡', '〩', '〸', '〺', 'ꛦ', 'ꛯ'}, @@ -12572,9 +12536,9 @@ var g = &grammar{ }, { name: "Pc", - pos: position{line: 1772, col: 1, offset: 57230}, + pos: position{line: 1772, col: 1, offset: 57211}, expr: &charClassMatcher{ - pos: position{line: 1772, col: 6, offset: 57235}, + pos: position{line: 1772, col: 6, offset: 57216}, val: "[\\u005F\\u203F-\\u2040\\u2054\\uFE33-\\uFE34\\uFE4D-\\uFE4F\\uFF3F]", chars: []rune{'_', '⁔', '＿'}, ranges: []rune{'‿', '⁀', '︳', '︴', '﹍', '﹏'}, @@ -12586,9 +12550,9 @@ var g = &grammar{ }, { name: "Zs", - pos: position{line: 1775, col: 1, offset: 57316}, + pos: position{line: 1775, col: 1, offset: 57297}, expr: &charClassMatcher{ - pos: position{line: 1775, col: 6, offset: 57321}, + pos: position{line: 1775, col: 6, offset: 57302}, val: "[\\u0020\\u00A0\\u1680\\u2000-\\u200A\\u202F\\u205F\\u3000]", chars: []rune{' ', '\u00a0', '\u1680', '\u202f', '\u205f', '\u3000'}, ranges: []rune{'\u2000', '\u200a'}, @@ -12600,9 +12564,9 @@ var g = &grammar{ }, { name: "SourceCharacter", - pos: position{line: 1777, col: 1, offset: 57374}, + pos: position{line: 1777, col: 1, offset: 57355}, expr: &anyMatcher{ - line: 1778, col: 5, offset: 57394, + line: 1778, col: 5, offset: 57375, }, leader: false, leftRecursive: false, @@ -12610,48 +12574,48 @@ var g = &grammar{ { name: "WhiteSpace", displayName: "\"whitespace\"", - pos: position{line: 1780, col: 1, offset: 57397}, + pos: position{line: 1780, col: 1, offset: 57378}, expr: &choiceExpr{ - pos: position{line: 1781, col: 5, offset: 57425}, + pos: position{line: 1781, col: 5, offset: 57406}, alternatives: []any{ &litMatcher{ - pos: position{line: 1781, col: 5, offset: 57425}, + pos: position{line: 1781, col: 5, offset: 57406}, val: "\t", ignoreCase: false, want: "\"\\t\"", }, &litMatcher{ - pos: position{line: 1782, col: 5, offset: 57434}, + pos: position{line: 1782, col: 5, offset: 57415}, val: "\v", ignoreCase: false, want: "\"\\v\"", }, &litMatcher{ - pos: position{line: 1783, col: 5, offset: 57443}, + pos: position{line: 1783, col: 5, offset: 57424}, val: "\f", ignoreCase: false, want: "\"\\f\"", }, &litMatcher{ - pos: position{line: 1784, col: 5, offset: 57452}, + pos: position{line: 1784, col: 5, offset: 57433}, val: " ", ignoreCase: false, want: "\" \"", }, &litMatcher{ - pos: position{line: 1785, col: 5, offset: 57460}, + pos: position{line: 1785, col: 5, offset: 57441}, val: "\u00a0", ignoreCase: false, want: "\"\\u00a0\"", }, &litMatcher{ - pos: position{line: 1786, col: 5, offset: 57473}, + pos: position{line: 1786, col: 5, offset: 57454}, val: "\ufeff", ignoreCase: false, want: "\"\\ufeff\"", }, &ruleRefExpr{ - pos: position{line: 1787, col: 5, offset: 57486}, + pos: position{line: 1787, col: 5, offset: 57467}, name: "Zs", }, }, @@ -12661,9 +12625,9 @@ var g = &grammar{ }, { name: "LineTerminator", - pos: position{line: 1789, col: 1, offset: 57490}, + pos: position{line: 1789, col: 1, offset: 57471}, expr: &charClassMatcher{ - pos: position{line: 1790, col: 5, offset: 57509}, + pos: position{line: 1790, col: 5, offset: 57490}, val: "[\\n\\r\\u2028\\u2029]", chars: []rune{'\n', '\r', '\u2028', '\u2029'}, ignoreCase: false, @@ -12675,9 +12639,9 @@ var g = &grammar{ { name: "Comment", displayName: "\"comment\"", - pos: position{line: 1796, col: 1, offset: 57839}, + pos: position{line: 1796, col: 1, offset: 57820}, expr: &ruleRefExpr{ - pos: position{line: 1799, col: 5, offset: 57910}, + pos: position{line: 1799, col: 5, offset: 57891}, name: "SingleLineComment", }, leader: false, @@ -12685,39 +12649,39 @@ var g = &grammar{ }, { name: "MultiLineComment", - pos: position{line: 1801, col: 1, offset: 57929}, + pos: position{line: 1801, col: 1, offset: 57910}, expr: &seqExpr{ - pos: position{line: 1802, col: 5, offset: 57950}, + pos: position{line: 1802, col: 5, offset: 57931}, exprs: []any{ &litMatcher{ - pos: position{line: 1802, col: 5, offset: 57950}, + pos: position{line: 1802, col: 5, offset: 57931}, val: "/*", ignoreCase: false, want: "\"/*\"", }, &zeroOrMoreExpr{ - pos: position{line: 1802, col: 10, offset: 57955}, + pos: position{line: 1802, col: 10, offset: 57936}, expr: &seqExpr{ - pos: position{line: 1802, col: 11, offset: 57956}, + pos: position{line: 1802, col: 11, offset: 57937}, exprs: []any{ ¬Expr{ - pos: position{line: 1802, col: 11, offset: 57956}, + pos: position{line: 1802, col: 11, offset: 57937}, expr: &litMatcher{ - pos: position{line: 1802, col: 12, offset: 57957}, + pos: position{line: 1802, col: 12, offset: 57938}, val: "*/", ignoreCase: false, want: "\"*/\"", }, }, &ruleRefExpr{ - pos: position{line: 1802, col: 17, offset: 57962}, + pos: position{line: 1802, col: 17, offset: 57943}, name: "SourceCharacter", }, }, }, }, &litMatcher{ - pos: position{line: 1802, col: 35, offset: 57980}, + pos: position{line: 1802, col: 35, offset: 57961}, val: "*/", ignoreCase: false, want: "\"*/\"", @@ -12729,33 +12693,33 @@ var g = &grammar{ }, { name: "SingleLineComment", - pos: position{line: 1804, col: 1, offset: 57986}, + pos: position{line: 1804, col: 1, offset: 57967}, expr: &choiceExpr{ - pos: position{line: 1805, col: 5, offset: 58008}, + pos: position{line: 1805, col: 5, offset: 57989}, alternatives: []any{ &seqExpr{ - pos: position{line: 1805, col: 5, offset: 58008}, + pos: position{line: 1805, col: 5, offset: 57989}, exprs: []any{ &litMatcher{ - pos: position{line: 1805, col: 5, offset: 58008}, + pos: position{line: 1805, col: 5, offset: 57989}, val: "//", ignoreCase: false, want: "\"//\"", }, &zeroOrMoreExpr{ - pos: position{line: 1805, col: 10, offset: 58013}, + pos: position{line: 1805, col: 10, offset: 57994}, expr: &seqExpr{ - pos: position{line: 1805, col: 11, offset: 58014}, + pos: position{line: 1805, col: 11, offset: 57995}, exprs: []any{ ¬Expr{ - pos: position{line: 1805, col: 11, offset: 58014}, + pos: position{line: 1805, col: 11, offset: 57995}, expr: &ruleRefExpr{ - pos: position{line: 1805, col: 12, offset: 58015}, + pos: position{line: 1805, col: 12, offset: 57996}, name: "LineTerminator", }, }, &ruleRefExpr{ - pos: position{line: 1805, col: 27, offset: 58030}, + pos: position{line: 1805, col: 27, offset: 58011}, name: "SourceCharacter", }, }, @@ -12764,28 +12728,28 @@ var g = &grammar{ }, }, &seqExpr{ - pos: position{line: 1806, col: 5, offset: 58052}, + pos: position{line: 1806, col: 5, offset: 58033}, exprs: []any{ &litMatcher{ - pos: position{line: 1806, col: 5, offset: 58052}, + pos: position{line: 1806, col: 5, offset: 58033}, val: "--", ignoreCase: false, want: "\"--\"", }, &zeroOrMoreExpr{ - pos: position{line: 1806, col: 10, offset: 58057}, + pos: position{line: 1806, col: 10, offset: 58038}, expr: &seqExpr{ - pos: position{line: 1806, col: 11, offset: 58058}, + pos: position{line: 1806, col: 11, offset: 58039}, exprs: []any{ ¬Expr{ - pos: position{line: 1806, col: 11, offset: 58058}, + pos: position{line: 1806, col: 11, offset: 58039}, expr: &ruleRefExpr{ - pos: position{line: 1806, col: 12, offset: 58059}, + pos: position{line: 1806, col: 12, offset: 58040}, name: "LineTerminator", }, }, &ruleRefExpr{ - pos: position{line: 1806, col: 27, offset: 58074}, + pos: position{line: 1806, col: 27, offset: 58055}, name: "SourceCharacter", }, }, @@ -12800,19 +12764,19 @@ var g = &grammar{ }, { name: "EOL", - pos: position{line: 1808, col: 1, offset: 58093}, + pos: position{line: 1808, col: 1, offset: 58074}, expr: &seqExpr{ - pos: position{line: 1808, col: 7, offset: 58099}, + pos: position{line: 1808, col: 7, offset: 58080}, exprs: []any{ &zeroOrMoreExpr{ - pos: position{line: 1808, col: 7, offset: 58099}, + pos: position{line: 1808, col: 7, offset: 58080}, expr: &ruleRefExpr{ - pos: position{line: 1808, col: 7, offset: 58099}, + pos: position{line: 1808, col: 7, offset: 58080}, name: "WhiteSpace", }, }, &ruleRefExpr{ - pos: position{line: 1808, col: 19, offset: 58111}, + pos: position{line: 1808, col: 19, offset: 58092}, name: "LineTerminator", }, }, @@ -12822,16 +12786,16 @@ var g = &grammar{ }, { name: "EOT", - pos: position{line: 1810, col: 1, offset: 58127}, + pos: position{line: 1810, col: 1, offset: 58108}, expr: &choiceExpr{ - pos: position{line: 1810, col: 7, offset: 58133}, + pos: position{line: 1810, col: 7, offset: 58114}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1810, col: 7, offset: 58133}, + pos: position{line: 1810, col: 7, offset: 58114}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1810, col: 11, offset: 58137}, + pos: position{line: 1810, col: 11, offset: 58118}, name: "EOF", }, }, @@ -12841,11 +12805,11 @@ var g = &grammar{ }, { name: "EOF", - pos: position{line: 1812, col: 1, offset: 58142}, + pos: position{line: 1812, col: 1, offset: 58123}, expr: ¬Expr{ - pos: position{line: 1812, col: 7, offset: 58148}, + pos: position{line: 1812, col: 7, offset: 58129}, expr: &anyMatcher{ - line: 1812, col: 8, offset: 58149, + line: 1812, col: 8, offset: 58130, }, }, leader: false, @@ -12853,11 +12817,11 @@ var g = &grammar{ }, { name: "EOKW", - pos: position{line: 1814, col: 1, offset: 58152}, + pos: position{line: 1814, col: 1, offset: 58133}, expr: ¬Expr{ - pos: position{line: 1814, col: 8, offset: 58159}, + pos: position{line: 1814, col: 8, offset: 58140}, expr: &ruleRefExpr{ - pos: position{line: 1814, col: 9, offset: 58160}, + pos: position{line: 1814, col: 9, offset: 58141}, name: "KeyWordChars", }, }, @@ -12866,15 +12830,15 @@ var g = &grammar{ }, { name: "SQLPipe", - pos: position{line: 1818, col: 1, offset: 58196}, + pos: position{line: 1818, col: 1, offset: 58177}, expr: &actionExpr{ - pos: position{line: 1819, col: 5, offset: 58209}, + pos: position{line: 1819, col: 5, offset: 58190}, run: (*parser).callonSQLPipe1, expr: &labeledExpr{ - pos: position{line: 1819, col: 5, offset: 58209}, + pos: position{line: 1819, col: 5, offset: 58190}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1819, col: 7, offset: 58211}, + pos: position{line: 1819, col: 7, offset: 58192}, name: "Seq", }, }, @@ -12884,27 +12848,27 @@ var g = &grammar{ }, { name: "SelectOp", - pos: position{line: 1827, col: 1, offset: 58357}, + pos: position{line: 1827, col: 1, offset: 58338}, expr: &actionExpr{ - pos: position{line: 1827, col: 12, offset: 58368}, + pos: position{line: 1827, col: 12, offset: 58349}, run: (*parser).callonSelectOp1, expr: &seqExpr{ - pos: position{line: 1827, col: 12, offset: 58368}, + pos: position{line: 1827, col: 12, offset: 58349}, exprs: []any{ ¬Expr{ - pos: position{line: 1827, col: 12, offset: 58368}, + pos: position{line: 1827, col: 12, offset: 58349}, expr: &litMatcher{ - pos: position{line: 1827, col: 13, offset: 58369}, + pos: position{line: 1827, col: 13, offset: 58350}, val: "(", ignoreCase: false, want: "\"(\"", }, }, &labeledExpr{ - pos: position{line: 1827, col: 17, offset: 58373}, + pos: position{line: 1827, col: 17, offset: 58354}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 1827, col: 20, offset: 58376}, + pos: position{line: 1827, col: 20, offset: 58357}, name: "SelectExpr", }, }, @@ -12916,65 +12880,65 @@ var g = &grammar{ }, { name: "SelectExpr", - pos: position{line: 1829, col: 1, offset: 58406}, + pos: position{line: 1829, col: 1, offset: 58387}, expr: &actionExpr{ - pos: position{line: 1830, col: 5, offset: 58422}, + pos: position{line: 1830, col: 5, offset: 58403}, run: (*parser).callonSelectExpr1, expr: &seqExpr{ - pos: position{line: 1830, col: 5, offset: 58422}, + pos: position{line: 1830, col: 5, offset: 58403}, exprs: []any{ &labeledExpr{ - pos: position{line: 1830, col: 5, offset: 58422}, + pos: position{line: 1830, col: 5, offset: 58403}, label: "with", expr: &ruleRefExpr{ - pos: position{line: 1830, col: 10, offset: 58427}, + pos: position{line: 1830, col: 10, offset: 58408}, name: "OptWithClause", }, }, &labeledExpr{ - pos: position{line: 1831, col: 5, offset: 58445}, + pos: position{line: 1831, col: 5, offset: 58426}, label: "body", expr: &choiceExpr{ - pos: position{line: 1832, col: 9, offset: 58460}, + pos: position{line: 1832, col: 9, offset: 58441}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1832, col: 9, offset: 58460}, + pos: position{line: 1832, col: 9, offset: 58441}, name: "SetOperation", }, &ruleRefExpr{ - pos: position{line: 1833, col: 9, offset: 58481}, + pos: position{line: 1833, col: 9, offset: 58462}, name: "Select", }, &actionExpr{ - pos: position{line: 1834, col: 9, offset: 58496}, + pos: position{line: 1834, col: 9, offset: 58477}, run: (*parser).callonSelectExpr9, expr: &seqExpr{ - pos: position{line: 1834, col: 9, offset: 58496}, + pos: position{line: 1834, col: 9, offset: 58477}, exprs: []any{ &litMatcher{ - pos: position{line: 1834, col: 9, offset: 58496}, + pos: position{line: 1834, col: 9, offset: 58477}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1834, col: 13, offset: 58500}, + pos: position{line: 1834, col: 13, offset: 58481}, name: "__", }, &labeledExpr{ - pos: position{line: 1834, col: 16, offset: 58503}, + pos: position{line: 1834, col: 16, offset: 58484}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1834, col: 18, offset: 58505}, + pos: position{line: 1834, col: 18, offset: 58486}, name: "SQLPipe", }, }, &ruleRefExpr{ - pos: position{line: 1834, col: 26, offset: 58513}, + pos: position{line: 1834, col: 26, offset: 58494}, name: "__", }, &litMatcher{ - pos: position{line: 1834, col: 28, offset: 58515}, + pos: position{line: 1834, col: 28, offset: 58496}, val: ")", ignoreCase: false, want: "\")\"", @@ -12986,18 +12950,18 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 1836, col: 5, offset: 58552}, + pos: position{line: 1836, col: 5, offset: 58533}, label: "orderby", expr: &ruleRefExpr{ - pos: position{line: 1836, col: 13, offset: 58560}, + pos: position{line: 1836, col: 13, offset: 58541}, name: "OptOrderByClause", }, }, &labeledExpr{ - pos: position{line: 1837, col: 5, offset: 58581}, + pos: position{line: 1837, col: 5, offset: 58562}, label: "limit", expr: &ruleRefExpr{ - pos: position{line: 1837, col: 11, offset: 58587}, + pos: position{line: 1837, col: 11, offset: 58568}, name: "OptLimitClause", }, }, @@ -13009,74 +12973,74 @@ var g = &grammar{ }, { name: "Select", - pos: position{line: 1857, col: 1, offset: 58973}, + pos: position{line: 1857, col: 1, offset: 58954}, expr: &actionExpr{ - pos: position{line: 1858, col: 5, offset: 58985}, + pos: position{line: 1858, col: 5, offset: 58966}, run: (*parser).callonSelect1, expr: &seqExpr{ - pos: position{line: 1858, col: 5, offset: 58985}, + pos: position{line: 1858, col: 5, offset: 58966}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1858, col: 5, offset: 58985}, + pos: position{line: 1858, col: 5, offset: 58966}, name: "SELECT", }, &labeledExpr{ - pos: position{line: 1859, col: 5, offset: 58997}, + pos: position{line: 1859, col: 5, offset: 58978}, label: "distinct", expr: &ruleRefExpr{ - pos: position{line: 1859, col: 14, offset: 59006}, + pos: position{line: 1859, col: 14, offset: 58987}, name: "OptDistinct", }, }, &labeledExpr{ - pos: position{line: 1860, col: 5, offset: 59022}, + pos: position{line: 1860, col: 5, offset: 59003}, label: "value", expr: &ruleRefExpr{ - pos: position{line: 1860, col: 11, offset: 59028}, + pos: position{line: 1860, col: 11, offset: 59009}, name: "OptSelectValue", }, }, &ruleRefExpr{ - pos: position{line: 1863, col: 5, offset: 59168}, + pos: position{line: 1863, col: 5, offset: 59149}, name: "_", }, &labeledExpr{ - pos: position{line: 1863, col: 7, offset: 59170}, + pos: position{line: 1863, col: 7, offset: 59151}, label: "selection", expr: &ruleRefExpr{ - pos: position{line: 1863, col: 17, offset: 59180}, + pos: position{line: 1863, col: 17, offset: 59161}, name: "Selection", }, }, &labeledExpr{ - pos: position{line: 1864, col: 5, offset: 59194}, + pos: position{line: 1864, col: 5, offset: 59175}, label: "from", expr: &ruleRefExpr{ - pos: position{line: 1864, col: 10, offset: 59199}, + pos: position{line: 1864, col: 10, offset: 59180}, name: "OptFromClause", }, }, &labeledExpr{ - pos: position{line: 1865, col: 5, offset: 59217}, + pos: position{line: 1865, col: 5, offset: 59198}, label: "where", expr: &ruleRefExpr{ - pos: position{line: 1865, col: 11, offset: 59223}, + pos: position{line: 1865, col: 11, offset: 59204}, name: "OptWhereClause", }, }, &labeledExpr{ - pos: position{line: 1866, col: 5, offset: 59242}, + pos: position{line: 1866, col: 5, offset: 59223}, label: "group", expr: &ruleRefExpr{ - pos: position{line: 1866, col: 11, offset: 59248}, + pos: position{line: 1866, col: 11, offset: 59229}, name: "OptGroupClause", }, }, &labeledExpr{ - pos: position{line: 1867, col: 5, offset: 59267}, + pos: position{line: 1867, col: 5, offset: 59248}, label: "having", expr: &ruleRefExpr{ - pos: position{line: 1867, col: 12, offset: 59274}, + pos: position{line: 1867, col: 12, offset: 59255}, name: "OptHavingClause", }, }, @@ -13088,49 +13052,49 @@ var g = &grammar{ }, { name: "OptDistinct", - pos: position{line: 1893, col: 1, offset: 59880}, + pos: position{line: 1893, col: 1, offset: 59861}, expr: &choiceExpr{ - pos: position{line: 1894, col: 5, offset: 59896}, + pos: position{line: 1894, col: 5, offset: 59877}, alternatives: []any{ &actionExpr{ - pos: position{line: 1894, col: 5, offset: 59896}, + pos: position{line: 1894, col: 5, offset: 59877}, run: (*parser).callonOptDistinct2, expr: &seqExpr{ - pos: position{line: 1894, col: 5, offset: 59896}, + pos: position{line: 1894, col: 5, offset: 59877}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1894, col: 5, offset: 59896}, + pos: position{line: 1894, col: 5, offset: 59877}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1894, col: 7, offset: 59898}, + pos: position{line: 1894, col: 7, offset: 59879}, name: "ALL", }, }, }, }, &actionExpr{ - pos: position{line: 1895, col: 5, offset: 59935}, + pos: position{line: 1895, col: 5, offset: 59916}, run: (*parser).callonOptDistinct6, expr: &seqExpr{ - pos: position{line: 1895, col: 5, offset: 59935}, + pos: position{line: 1895, col: 5, offset: 59916}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1895, col: 5, offset: 59935}, + pos: position{line: 1895, col: 5, offset: 59916}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1895, col: 7, offset: 59937}, + pos: position{line: 1895, col: 7, offset: 59918}, name: "DISTINCT", }, }, }, }, &actionExpr{ - pos: position{line: 1896, col: 5, offset: 59973}, + pos: position{line: 1896, col: 5, offset: 59954}, run: (*parser).callonOptDistinct10, expr: &litMatcher{ - pos: position{line: 1896, col: 5, offset: 59973}, + pos: position{line: 1896, col: 5, offset: 59954}, val: "", ignoreCase: false, want: "\"\"", @@ -13143,57 +13107,57 @@ var g = &grammar{ }, { name: "OptSelectValue", - pos: position{line: 1898, col: 1, offset: 60012}, + pos: position{line: 1898, col: 1, offset: 59993}, expr: &choiceExpr{ - pos: position{line: 1899, col: 5, offset: 60031}, + pos: position{line: 1899, col: 5, offset: 60012}, alternatives: []any{ &actionExpr{ - pos: position{line: 1899, col: 5, offset: 60031}, + pos: position{line: 1899, col: 5, offset: 60012}, run: (*parser).callonOptSelectValue2, expr: &seqExpr{ - pos: position{line: 1899, col: 5, offset: 60031}, + pos: position{line: 1899, col: 5, offset: 60012}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1899, col: 5, offset: 60031}, + pos: position{line: 1899, col: 5, offset: 60012}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1899, col: 7, offset: 60033}, + pos: position{line: 1899, col: 7, offset: 60014}, name: "AS", }, &ruleRefExpr{ - pos: position{line: 1899, col: 10, offset: 60036}, + pos: position{line: 1899, col: 10, offset: 60017}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1899, col: 12, offset: 60038}, + pos: position{line: 1899, col: 12, offset: 60019}, name: "VALUE", }, }, }, }, &actionExpr{ - pos: position{line: 1900, col: 5, offset: 60070}, + pos: position{line: 1900, col: 5, offset: 60051}, run: (*parser).callonOptSelectValue8, expr: &seqExpr{ - pos: position{line: 1900, col: 5, offset: 60070}, + pos: position{line: 1900, col: 5, offset: 60051}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1900, col: 5, offset: 60070}, + pos: position{line: 1900, col: 5, offset: 60051}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1900, col: 7, offset: 60072}, + pos: position{line: 1900, col: 7, offset: 60053}, name: "VALUE", }, }, }, }, &actionExpr{ - pos: position{line: 1901, col: 5, offset: 60143}, + pos: position{line: 1901, col: 5, offset: 60124}, run: (*parser).callonOptSelectValue12, expr: &litMatcher{ - pos: position{line: 1901, col: 5, offset: 60143}, + pos: position{line: 1901, col: 5, offset: 60124}, val: "", ignoreCase: false, want: "\"\"", @@ -13206,19 +13170,19 @@ var g = &grammar{ }, { name: "OptWithClause", - pos: position{line: 1903, col: 1, offset: 60186}, + pos: position{line: 1903, col: 1, offset: 60167}, expr: &choiceExpr{ - pos: position{line: 1904, col: 5, offset: 60205}, + pos: position{line: 1904, col: 5, offset: 60186}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1904, col: 5, offset: 60205}, + pos: position{line: 1904, col: 5, offset: 60186}, name: "WithClause", }, &actionExpr{ - pos: position{line: 1905, col: 5, offset: 60221}, + pos: position{line: 1905, col: 5, offset: 60202}, run: (*parser).callonOptWithClause3, expr: &litMatcher{ - pos: position{line: 1905, col: 5, offset: 60221}, + pos: position{line: 1905, col: 5, offset: 60202}, val: "", ignoreCase: false, want: "\"\"", @@ -13231,38 +13195,38 @@ var g = &grammar{ }, { name: "WithClause", - pos: position{line: 1907, col: 1, offset: 60254}, + pos: position{line: 1907, col: 1, offset: 60235}, expr: &actionExpr{ - pos: position{line: 1908, col: 5, offset: 60270}, + pos: position{line: 1908, col: 5, offset: 60251}, run: (*parser).callonWithClause1, expr: &seqExpr{ - pos: position{line: 1908, col: 5, offset: 60270}, + pos: position{line: 1908, col: 5, offset: 60251}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1908, col: 5, offset: 60270}, + pos: position{line: 1908, col: 5, offset: 60251}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1908, col: 7, offset: 60272}, + pos: position{line: 1908, col: 7, offset: 60253}, name: "WITH", }, &labeledExpr{ - pos: position{line: 1908, col: 12, offset: 60277}, + pos: position{line: 1908, col: 12, offset: 60258}, label: "r", expr: &ruleRefExpr{ - pos: position{line: 1908, col: 14, offset: 60279}, + pos: position{line: 1908, col: 14, offset: 60260}, name: "OptRecursive", }, }, &ruleRefExpr{ - pos: position{line: 1908, col: 27, offset: 60292}, + pos: position{line: 1908, col: 27, offset: 60273}, name: "_", }, &labeledExpr{ - pos: position{line: 1908, col: 29, offset: 60294}, + pos: position{line: 1908, col: 29, offset: 60275}, label: "ctes", expr: &ruleRefExpr{ - pos: position{line: 1908, col: 34, offset: 60299}, + pos: position{line: 1908, col: 34, offset: 60280}, name: "CteList", }, }, @@ -13274,32 +13238,32 @@ var g = &grammar{ }, { name: "OptRecursive", - pos: position{line: 1917, col: 1, offset: 60484}, + pos: position{line: 1917, col: 1, offset: 60465}, expr: &choiceExpr{ - pos: position{line: 1918, col: 5, offset: 60502}, + pos: position{line: 1918, col: 5, offset: 60483}, alternatives: []any{ &actionExpr{ - pos: position{line: 1918, col: 5, offset: 60502}, + pos: position{line: 1918, col: 5, offset: 60483}, run: (*parser).callonOptRecursive2, expr: &seqExpr{ - pos: position{line: 1918, col: 5, offset: 60502}, + pos: position{line: 1918, col: 5, offset: 60483}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1918, col: 5, offset: 60502}, + pos: position{line: 1918, col: 5, offset: 60483}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1918, col: 7, offset: 60504}, + pos: position{line: 1918, col: 7, offset: 60485}, name: "RECURSIVE", }, }, }, }, &actionExpr{ - pos: position{line: 1919, col: 5, offset: 60540}, + pos: position{line: 1919, col: 5, offset: 60521}, run: (*parser).callonOptRecursive6, expr: &litMatcher{ - pos: position{line: 1919, col: 5, offset: 60540}, + pos: position{line: 1919, col: 5, offset: 60521}, val: "", ignoreCase: false, want: "\"\"", @@ -13312,51 +13276,51 @@ var g = &grammar{ }, { name: "CteList", - pos: position{line: 1921, col: 1, offset: 60579}, + pos: position{line: 1921, col: 1, offset: 60560}, expr: &actionExpr{ - pos: position{line: 1921, col: 11, offset: 60589}, + pos: position{line: 1921, col: 11, offset: 60570}, run: (*parser).callonCteList1, expr: &seqExpr{ - pos: position{line: 1921, col: 11, offset: 60589}, + pos: position{line: 1921, col: 11, offset: 60570}, exprs: []any{ &labeledExpr{ - pos: position{line: 1921, col: 11, offset: 60589}, + pos: position{line: 1921, col: 11, offset: 60570}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1921, col: 17, offset: 60595}, + pos: position{line: 1921, col: 17, offset: 60576}, name: "Cte", }, }, &labeledExpr{ - pos: position{line: 1921, col: 21, offset: 60599}, + pos: position{line: 1921, col: 21, offset: 60580}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1921, col: 26, offset: 60604}, + pos: position{line: 1921, col: 26, offset: 60585}, expr: &actionExpr{ - pos: position{line: 1921, col: 28, offset: 60606}, + pos: position{line: 1921, col: 28, offset: 60587}, run: (*parser).callonCteList7, expr: &seqExpr{ - pos: position{line: 1921, col: 28, offset: 60606}, + pos: position{line: 1921, col: 28, offset: 60587}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1921, col: 28, offset: 60606}, + pos: position{line: 1921, col: 28, offset: 60587}, name: "__", }, &litMatcher{ - pos: position{line: 1921, col: 31, offset: 60609}, + pos: position{line: 1921, col: 31, offset: 60590}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1921, col: 35, offset: 60613}, + pos: position{line: 1921, col: 35, offset: 60594}, name: "__", }, &labeledExpr{ - pos: position{line: 1921, col: 38, offset: 60616}, + pos: position{line: 1921, col: 38, offset: 60597}, label: "cte", expr: &ruleRefExpr{ - pos: position{line: 1921, col: 42, offset: 60620}, + pos: position{line: 1921, col: 42, offset: 60601}, name: "Cte", }, }, @@ -13373,65 +13337,65 @@ var g = &grammar{ }, { name: "Cte", - pos: position{line: 1925, col: 1, offset: 60689}, + pos: position{line: 1925, col: 1, offset: 60670}, expr: &actionExpr{ - pos: position{line: 1926, col: 5, offset: 60697}, + pos: position{line: 1926, col: 5, offset: 60678}, run: (*parser).callonCte1, expr: &seqExpr{ - pos: position{line: 1926, col: 5, offset: 60697}, + pos: position{line: 1926, col: 5, offset: 60678}, exprs: []any{ &labeledExpr{ - pos: position{line: 1926, col: 5, offset: 60697}, + pos: position{line: 1926, col: 5, offset: 60678}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1926, col: 10, offset: 60702}, + pos: position{line: 1926, col: 10, offset: 60683}, name: "AliasName", }, }, &ruleRefExpr{ - pos: position{line: 1926, col: 20, offset: 60712}, + pos: position{line: 1926, col: 20, offset: 60693}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1926, col: 22, offset: 60714}, + pos: position{line: 1926, col: 22, offset: 60695}, name: "AS", }, &labeledExpr{ - pos: position{line: 1926, col: 25, offset: 60717}, + pos: position{line: 1926, col: 25, offset: 60698}, label: "m", expr: &ruleRefExpr{ - pos: position{line: 1926, col: 27, offset: 60719}, + pos: position{line: 1926, col: 27, offset: 60700}, name: "OptMaterialized", }, }, &ruleRefExpr{ - pos: position{line: 1926, col: 43, offset: 60735}, + pos: position{line: 1926, col: 43, offset: 60716}, name: "__", }, &litMatcher{ - pos: position{line: 1926, col: 46, offset: 60738}, + pos: position{line: 1926, col: 46, offset: 60719}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1926, col: 50, offset: 60742}, + pos: position{line: 1926, col: 50, offset: 60723}, name: "__", }, &labeledExpr{ - pos: position{line: 1926, col: 53, offset: 60745}, + pos: position{line: 1926, col: 53, offset: 60726}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1926, col: 55, offset: 60747}, + pos: position{line: 1926, col: 55, offset: 60728}, name: "SQLPipe", }, }, &ruleRefExpr{ - pos: position{line: 1926, col: 63, offset: 60755}, + pos: position{line: 1926, col: 63, offset: 60736}, name: "__", }, &litMatcher{ - pos: position{line: 1926, col: 66, offset: 60758}, + pos: position{line: 1926, col: 66, offset: 60739}, val: ")", ignoreCase: false, want: "\")\"", @@ -13444,9 +13408,9 @@ var g = &grammar{ }, { name: "AliasName", - pos: position{line: 1935, col: 1, offset: 60933}, + pos: position{line: 1935, col: 1, offset: 60914}, expr: &ruleRefExpr{ - pos: position{line: 1935, col: 13, offset: 60945}, + pos: position{line: 1935, col: 13, offset: 60926}, name: "Identifier", }, leader: false, @@ -13454,65 +13418,65 @@ var g = &grammar{ }, { name: "OptMaterialized", - pos: position{line: 1937, col: 1, offset: 60957}, + pos: position{line: 1937, col: 1, offset: 60938}, expr: &choiceExpr{ - pos: position{line: 1938, col: 5, offset: 60978}, + pos: position{line: 1938, col: 5, offset: 60959}, alternatives: []any{ &actionExpr{ - pos: position{line: 1938, col: 5, offset: 60978}, + pos: position{line: 1938, col: 5, offset: 60959}, run: (*parser).callonOptMaterialized2, expr: &seqExpr{ - pos: position{line: 1938, col: 5, offset: 60978}, + pos: position{line: 1938, col: 5, offset: 60959}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1938, col: 5, offset: 60978}, + pos: position{line: 1938, col: 5, offset: 60959}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1938, col: 7, offset: 60980}, + pos: position{line: 1938, col: 7, offset: 60961}, name: "MATERIALIZED", }, &ruleRefExpr{ - pos: position{line: 1938, col: 20, offset: 60993}, + pos: position{line: 1938, col: 20, offset: 60974}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 1939, col: 5, offset: 61032}, + pos: position{line: 1939, col: 5, offset: 61013}, run: (*parser).callonOptMaterialized7, expr: &seqExpr{ - pos: position{line: 1939, col: 5, offset: 61032}, + pos: position{line: 1939, col: 5, offset: 61013}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1939, col: 5, offset: 61032}, + pos: position{line: 1939, col: 5, offset: 61013}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1939, col: 7, offset: 61034}, + pos: position{line: 1939, col: 7, offset: 61015}, name: "NOT", }, &ruleRefExpr{ - pos: position{line: 1939, col: 11, offset: 61038}, + pos: position{line: 1939, col: 11, offset: 61019}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1939, col: 13, offset: 61040}, + pos: position{line: 1939, col: 13, offset: 61021}, name: "MATERIALIZED", }, &ruleRefExpr{ - pos: position{line: 1939, col: 26, offset: 61053}, + pos: position{line: 1939, col: 26, offset: 61034}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 1940, col: 5, offset: 61084}, + pos: position{line: 1940, col: 5, offset: 61065}, run: (*parser).callonOptMaterialized14, expr: &litMatcher{ - pos: position{line: 1940, col: 5, offset: 61084}, + pos: position{line: 1940, col: 5, offset: 61065}, val: "", ignoreCase: false, want: "\"\"", @@ -13525,25 +13489,25 @@ var g = &grammar{ }, { name: "OptAllClause", - pos: position{line: 1942, col: 1, offset: 61139}, + pos: position{line: 1942, col: 1, offset: 61120}, expr: &choiceExpr{ - pos: position{line: 1943, col: 5, offset: 61156}, + pos: position{line: 1943, col: 5, offset: 61137}, alternatives: []any{ &seqExpr{ - pos: position{line: 1943, col: 5, offset: 61156}, + pos: position{line: 1943, col: 5, offset: 61137}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1943, col: 5, offset: 61156}, + pos: position{line: 1943, col: 5, offset: 61137}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1943, col: 7, offset: 61158}, + pos: position{line: 1943, col: 7, offset: 61139}, name: "ALL", }, }, }, &litMatcher{ - pos: position{line: 1944, col: 5, offset: 61167}, + pos: position{line: 1944, col: 5, offset: 61148}, val: "", ignoreCase: false, want: "\"\"", @@ -13555,25 +13519,25 @@ var g = &grammar{ }, { name: "OptFromClause", - pos: position{line: 1946, col: 1, offset: 61171}, + pos: position{line: 1946, col: 1, offset: 61152}, expr: &choiceExpr{ - pos: position{line: 1947, col: 5, offset: 61189}, + pos: position{line: 1947, col: 5, offset: 61170}, alternatives: []any{ &actionExpr{ - pos: position{line: 1947, col: 5, offset: 61189}, + pos: position{line: 1947, col: 5, offset: 61170}, run: (*parser).callonOptFromClause2, expr: &seqExpr{ - pos: position{line: 1947, col: 5, offset: 61189}, + pos: position{line: 1947, col: 5, offset: 61170}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1947, col: 5, offset: 61189}, + pos: position{line: 1947, col: 5, offset: 61170}, name: "_", }, &labeledExpr{ - pos: position{line: 1947, col: 7, offset: 61191}, + pos: position{line: 1947, col: 7, offset: 61172}, label: "from", expr: &ruleRefExpr{ - pos: position{line: 1947, col: 12, offset: 61196}, + pos: position{line: 1947, col: 12, offset: 61177}, name: "FromOp", }, }, @@ -13581,10 +13545,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1950, col: 5, offset: 61238}, + pos: position{line: 1950, col: 5, offset: 61219}, run: (*parser).callonOptFromClause7, expr: &litMatcher{ - pos: position{line: 1950, col: 5, offset: 61238}, + pos: position{line: 1950, col: 5, offset: 61219}, val: "", ignoreCase: false, want: "\"\"", @@ -13597,27 +13561,27 @@ var g = &grammar{ }, { name: "OptWhereClause", - pos: position{line: 1952, col: 1, offset: 61279}, + pos: position{line: 1952, col: 1, offset: 61260}, expr: &choiceExpr{ - pos: position{line: 1953, col: 5, offset: 61298}, + pos: position{line: 1953, col: 5, offset: 61279}, alternatives: []any{ &actionExpr{ - pos: position{line: 1953, col: 5, offset: 61298}, + pos: position{line: 1953, col: 5, offset: 61279}, run: (*parser).callonOptWhereClause2, expr: &labeledExpr{ - pos: position{line: 1953, col: 5, offset: 61298}, + pos: position{line: 1953, col: 5, offset: 61279}, label: "where", expr: &ruleRefExpr{ - pos: position{line: 1953, col: 11, offset: 61304}, + pos: position{line: 1953, col: 11, offset: 61285}, name: "WhereClause", }, }, }, &actionExpr{ - pos: position{line: 1954, col: 5, offset: 61346}, + pos: position{line: 1954, col: 5, offset: 61327}, run: (*parser).callonOptWhereClause5, expr: &litMatcher{ - pos: position{line: 1954, col: 5, offset: 61346}, + pos: position{line: 1954, col: 5, offset: 61327}, val: "", ignoreCase: false, want: "\"\"", @@ -13630,25 +13594,25 @@ var g = &grammar{ }, { name: "OptGroupClause", - pos: position{line: 1956, col: 1, offset: 61391}, + pos: position{line: 1956, col: 1, offset: 61372}, expr: &choiceExpr{ - pos: position{line: 1957, col: 5, offset: 61410}, + pos: position{line: 1957, col: 5, offset: 61391}, alternatives: []any{ &actionExpr{ - pos: position{line: 1957, col: 5, offset: 61410}, + pos: position{line: 1957, col: 5, offset: 61391}, run: (*parser).callonOptGroupClause2, expr: &seqExpr{ - pos: position{line: 1957, col: 5, offset: 61410}, + pos: position{line: 1957, col: 5, offset: 61391}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1957, col: 5, offset: 61410}, + pos: position{line: 1957, col: 5, offset: 61391}, name: "_", }, &labeledExpr{ - pos: position{line: 1957, col: 7, offset: 61412}, + pos: position{line: 1957, col: 7, offset: 61393}, label: "group", expr: &ruleRefExpr{ - pos: position{line: 1957, col: 13, offset: 61418}, + pos: position{line: 1957, col: 13, offset: 61399}, name: "GroupClause", }, }, @@ -13656,10 +13620,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1958, col: 5, offset: 61456}, + pos: position{line: 1958, col: 5, offset: 61437}, run: (*parser).callonOptGroupClause7, expr: &litMatcher{ - pos: position{line: 1958, col: 5, offset: 61456}, + pos: position{line: 1958, col: 5, offset: 61437}, val: "", ignoreCase: false, want: "\"\"", @@ -13672,34 +13636,34 @@ var g = &grammar{ }, { name: "GroupClause", - pos: position{line: 1960, col: 1, offset: 61497}, + pos: position{line: 1960, col: 1, offset: 61478}, expr: &actionExpr{ - pos: position{line: 1961, col: 5, offset: 61513}, + pos: position{line: 1961, col: 5, offset: 61494}, run: (*parser).callonGroupClause1, expr: &seqExpr{ - pos: position{line: 1961, col: 5, offset: 61513}, + pos: position{line: 1961, col: 5, offset: 61494}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1961, col: 5, offset: 61513}, + pos: position{line: 1961, col: 5, offset: 61494}, name: "GROUP", }, &ruleRefExpr{ - pos: position{line: 1961, col: 11, offset: 61519}, + pos: position{line: 1961, col: 11, offset: 61500}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1961, col: 13, offset: 61521}, + pos: position{line: 1961, col: 13, offset: 61502}, name: "BY", }, &ruleRefExpr{ - pos: position{line: 1961, col: 16, offset: 61524}, + pos: position{line: 1961, col: 16, offset: 61505}, name: "_", }, &labeledExpr{ - pos: position{line: 1961, col: 18, offset: 61526}, + pos: position{line: 1961, col: 18, offset: 61507}, label: "list", expr: &ruleRefExpr{ - pos: position{line: 1961, col: 23, offset: 61531}, + pos: position{line: 1961, col: 23, offset: 61512}, name: "GroupByList", }, }, @@ -13711,51 +13675,51 @@ var g = &grammar{ }, { name: "GroupByList", - pos: position{line: 1963, col: 1, offset: 61565}, + pos: position{line: 1963, col: 1, offset: 61546}, expr: &actionExpr{ - pos: position{line: 1964, col: 5, offset: 61582}, + pos: position{line: 1964, col: 5, offset: 61563}, run: (*parser).callonGroupByList1, expr: &seqExpr{ - pos: position{line: 1964, col: 5, offset: 61582}, + pos: position{line: 1964, col: 5, offset: 61563}, exprs: []any{ &labeledExpr{ - pos: position{line: 1964, col: 5, offset: 61582}, + pos: position{line: 1964, col: 5, offset: 61563}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1964, col: 11, offset: 61588}, + pos: position{line: 1964, col: 11, offset: 61569}, name: "GroupByItem", }, }, &labeledExpr{ - pos: position{line: 1964, col: 23, offset: 61600}, + pos: position{line: 1964, col: 23, offset: 61581}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1964, col: 28, offset: 61605}, + pos: position{line: 1964, col: 28, offset: 61586}, expr: &actionExpr{ - pos: position{line: 1964, col: 30, offset: 61607}, + pos: position{line: 1964, col: 30, offset: 61588}, run: (*parser).callonGroupByList7, expr: &seqExpr{ - pos: position{line: 1964, col: 30, offset: 61607}, + pos: position{line: 1964, col: 30, offset: 61588}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1964, col: 30, offset: 61607}, + pos: position{line: 1964, col: 30, offset: 61588}, name: "__", }, &litMatcher{ - pos: position{line: 1964, col: 33, offset: 61610}, + pos: position{line: 1964, col: 33, offset: 61591}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1964, col: 37, offset: 61614}, + pos: position{line: 1964, col: 37, offset: 61595}, name: "__", }, &labeledExpr{ - pos: position{line: 1964, col: 40, offset: 61617}, + pos: position{line: 1964, col: 40, offset: 61598}, label: "g", expr: &ruleRefExpr{ - pos: position{line: 1964, col: 42, offset: 61619}, + pos: position{line: 1964, col: 42, offset: 61600}, name: "GroupByItem", }, }, @@ -13772,9 +13736,9 @@ var g = &grammar{ }, { name: "GroupByItem", - pos: position{line: 1968, col: 1, offset: 61700}, + pos: position{line: 1968, col: 1, offset: 61681}, expr: &ruleRefExpr{ - pos: position{line: 1968, col: 15, offset: 61714}, + pos: position{line: 1968, col: 15, offset: 61695}, name: "Expr", }, leader: false, @@ -13782,25 +13746,25 @@ var g = &grammar{ }, { name: "OptHavingClause", - pos: position{line: 1970, col: 1, offset: 61720}, + pos: position{line: 1970, col: 1, offset: 61701}, expr: &choiceExpr{ - pos: position{line: 1971, col: 5, offset: 61740}, + pos: position{line: 1971, col: 5, offset: 61721}, alternatives: []any{ &actionExpr{ - pos: position{line: 1971, col: 5, offset: 61740}, + pos: position{line: 1971, col: 5, offset: 61721}, run: (*parser).callonOptHavingClause2, expr: &seqExpr{ - pos: position{line: 1971, col: 5, offset: 61740}, + pos: position{line: 1971, col: 5, offset: 61721}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1971, col: 5, offset: 61740}, + pos: position{line: 1971, col: 5, offset: 61721}, name: "_", }, &labeledExpr{ - pos: position{line: 1971, col: 7, offset: 61742}, + pos: position{line: 1971, col: 7, offset: 61723}, label: "h", expr: &ruleRefExpr{ - pos: position{line: 1971, col: 9, offset: 61744}, + pos: position{line: 1971, col: 9, offset: 61725}, name: "HavingClause", }, }, @@ -13808,10 +13772,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1972, col: 5, offset: 61779}, + pos: position{line: 1972, col: 5, offset: 61760}, run: (*parser).callonOptHavingClause7, expr: &litMatcher{ - pos: position{line: 1972, col: 5, offset: 61779}, + pos: position{line: 1972, col: 5, offset: 61760}, val: "", ignoreCase: false, want: "\"\"", @@ -13824,26 +13788,26 @@ var g = &grammar{ }, { name: "HavingClause", - pos: position{line: 1974, col: 1, offset: 61803}, + pos: position{line: 1974, col: 1, offset: 61784}, expr: &actionExpr{ - pos: position{line: 1975, col: 5, offset: 61820}, + pos: position{line: 1975, col: 5, offset: 61801}, run: (*parser).callonHavingClause1, expr: &seqExpr{ - pos: position{line: 1975, col: 5, offset: 61820}, + pos: position{line: 1975, col: 5, offset: 61801}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1975, col: 5, offset: 61820}, + pos: position{line: 1975, col: 5, offset: 61801}, name: "HAVING", }, &ruleRefExpr{ - pos: position{line: 1975, col: 12, offset: 61827}, + pos: position{line: 1975, col: 12, offset: 61808}, name: "_", }, &labeledExpr{ - pos: position{line: 1975, col: 14, offset: 61829}, + pos: position{line: 1975, col: 14, offset: 61810}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1975, col: 16, offset: 61831}, + pos: position{line: 1975, col: 16, offset: 61812}, name: "Expr", }, }, @@ -13855,16 +13819,16 @@ var g = &grammar{ }, { name: "JoinOperation", - pos: position{line: 1977, col: 1, offset: 61855}, + pos: position{line: 1977, col: 1, offset: 61836}, expr: &choiceExpr{ - pos: position{line: 1978, col: 5, offset: 61873}, + pos: position{line: 1978, col: 5, offset: 61854}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1978, col: 5, offset: 61873}, + pos: position{line: 1978, col: 5, offset: 61854}, name: "CrossJoin", }, &ruleRefExpr{ - pos: position{line: 1979, col: 5, offset: 61887}, + pos: position{line: 1979, col: 5, offset: 61868}, name: "ConditionJoin", }, }, @@ -13874,30 +13838,30 @@ var g = &grammar{ }, { name: "CrossJoin", - pos: position{line: 1981, col: 1, offset: 61902}, + pos: position{line: 1981, col: 1, offset: 61883}, expr: &actionExpr{ - pos: position{line: 1982, col: 5, offset: 61916}, + pos: position{line: 1982, col: 5, offset: 61897}, run: (*parser).callonCrossJoin1, expr: &seqExpr{ - pos: position{line: 1982, col: 5, offset: 61916}, + pos: position{line: 1982, col: 5, offset: 61897}, exprs: []any{ &labeledExpr{ - pos: position{line: 1982, col: 5, offset: 61916}, + pos: position{line: 1982, col: 5, offset: 61897}, label: "left", expr: &ruleRefExpr{ - pos: position{line: 1982, col: 10, offset: 61921}, + pos: position{line: 1982, col: 10, offset: 61902}, name: "FromElem", }, }, &ruleRefExpr{ - pos: position{line: 1982, col: 19, offset: 61930}, + pos: position{line: 1982, col: 19, offset: 61911}, name: "CrossJoinOp", }, &labeledExpr{ - pos: position{line: 1982, col: 31, offset: 61942}, + pos: position{line: 1982, col: 31, offset: 61923}, label: "right", expr: &ruleRefExpr{ - pos: position{line: 1982, col: 37, offset: 61948}, + pos: position{line: 1982, col: 37, offset: 61929}, name: "FromElem", }, }, @@ -13909,50 +13873,50 @@ var g = &grammar{ }, { name: "CrossJoinOp", - pos: position{line: 1991, col: 1, offset: 62150}, + pos: position{line: 1991, col: 1, offset: 62131}, expr: &choiceExpr{ - pos: position{line: 1992, col: 5, offset: 62167}, + pos: position{line: 1992, col: 5, offset: 62148}, alternatives: []any{ &seqExpr{ - pos: position{line: 1992, col: 5, offset: 62167}, + pos: position{line: 1992, col: 5, offset: 62148}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1992, col: 5, offset: 62167}, + pos: position{line: 1992, col: 5, offset: 62148}, name: "__", }, &litMatcher{ - pos: position{line: 1992, col: 8, offset: 62170}, + pos: position{line: 1992, col: 8, offset: 62151}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1992, col: 12, offset: 62174}, + pos: position{line: 1992, col: 12, offset: 62155}, name: "__", }, }, }, &seqExpr{ - pos: position{line: 1993, col: 5, offset: 62182}, + pos: position{line: 1993, col: 5, offset: 62163}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1993, col: 5, offset: 62182}, + pos: position{line: 1993, col: 5, offset: 62163}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1993, col: 7, offset: 62184}, + pos: position{line: 1993, col: 7, offset: 62165}, name: "CROSS", }, &ruleRefExpr{ - pos: position{line: 1993, col: 13, offset: 62190}, + pos: position{line: 1993, col: 13, offset: 62171}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1993, col: 15, offset: 62192}, + pos: position{line: 1993, col: 15, offset: 62173}, name: "JOIN", }, &ruleRefExpr{ - pos: position{line: 1993, col: 20, offset: 62197}, + pos: position{line: 1993, col: 20, offset: 62178}, name: "_", }, }, @@ -13964,46 +13928,46 @@ var g = &grammar{ }, { name: "ConditionJoin", - pos: position{line: 1995, col: 1, offset: 62201}, + pos: position{line: 1995, col: 1, offset: 62182}, expr: &actionExpr{ - pos: position{line: 1996, col: 5, offset: 62219}, + pos: position{line: 1996, col: 5, offset: 62200}, run: (*parser).callonConditionJoin1, expr: &seqExpr{ - pos: position{line: 1996, col: 5, offset: 62219}, + pos: position{line: 1996, col: 5, offset: 62200}, exprs: []any{ &labeledExpr{ - pos: position{line: 1996, col: 5, offset: 62219}, + pos: position{line: 1996, col: 5, offset: 62200}, label: "left", expr: &ruleRefExpr{ - pos: position{line: 1996, col: 10, offset: 62224}, + pos: position{line: 1996, col: 10, offset: 62205}, name: "FromElem", }, }, &labeledExpr{ - pos: position{line: 1996, col: 19, offset: 62233}, + pos: position{line: 1996, col: 19, offset: 62214}, label: "style", expr: &ruleRefExpr{ - pos: position{line: 1996, col: 25, offset: 62239}, + pos: position{line: 1996, col: 25, offset: 62220}, name: "SQLJoinStyle", }, }, &ruleRefExpr{ - pos: position{line: 1996, col: 38, offset: 62252}, + pos: position{line: 1996, col: 38, offset: 62233}, name: "_", }, &labeledExpr{ - pos: position{line: 1996, col: 40, offset: 62254}, + pos: position{line: 1996, col: 40, offset: 62235}, label: "right", expr: &ruleRefExpr{ - pos: position{line: 1996, col: 46, offset: 62260}, + pos: position{line: 1996, col: 46, offset: 62241}, name: "FromElem", }, }, &labeledExpr{ - pos: position{line: 1996, col: 55, offset: 62269}, + pos: position{line: 1996, col: 55, offset: 62250}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1996, col: 57, offset: 62271}, + pos: position{line: 1996, col: 57, offset: 62252}, name: "JoinExpr", }, }, @@ -14015,161 +13979,161 @@ var g = &grammar{ }, { name: "SQLJoinStyle", - pos: position{line: 2007, col: 1, offset: 62540}, + pos: position{line: 2007, col: 1, offset: 62521}, expr: &choiceExpr{ - pos: position{line: 2008, col: 5, offset: 62558}, + pos: position{line: 2008, col: 5, offset: 62539}, alternatives: []any{ &actionExpr{ - pos: position{line: 2008, col: 5, offset: 62558}, + pos: position{line: 2008, col: 5, offset: 62539}, run: (*parser).callonSQLJoinStyle2, expr: &seqExpr{ - pos: position{line: 2008, col: 5, offset: 62558}, + pos: position{line: 2008, col: 5, offset: 62539}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 2008, col: 5, offset: 62558}, + pos: position{line: 2008, col: 5, offset: 62539}, expr: &seqExpr{ - pos: position{line: 2008, col: 6, offset: 62559}, + pos: position{line: 2008, col: 6, offset: 62540}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2008, col: 6, offset: 62559}, + pos: position{line: 2008, col: 6, offset: 62540}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2008, col: 8, offset: 62561}, + pos: position{line: 2008, col: 8, offset: 62542}, name: "INNER", }, }, }, }, &ruleRefExpr{ - pos: position{line: 2008, col: 16, offset: 62569}, + pos: position{line: 2008, col: 16, offset: 62550}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2008, col: 18, offset: 62571}, + pos: position{line: 2008, col: 18, offset: 62552}, name: "JOIN", }, }, }, }, &actionExpr{ - pos: position{line: 2009, col: 5, offset: 62616}, + pos: position{line: 2009, col: 5, offset: 62597}, run: (*parser).callonSQLJoinStyle10, expr: &seqExpr{ - pos: position{line: 2009, col: 5, offset: 62616}, + pos: position{line: 2009, col: 5, offset: 62597}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2009, col: 5, offset: 62616}, + pos: position{line: 2009, col: 5, offset: 62597}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2009, col: 7, offset: 62618}, + pos: position{line: 2009, col: 7, offset: 62599}, name: "FULL", }, &zeroOrOneExpr{ - pos: position{line: 2009, col: 12, offset: 62623}, + pos: position{line: 2009, col: 12, offset: 62604}, expr: &seqExpr{ - pos: position{line: 2009, col: 13, offset: 62624}, + pos: position{line: 2009, col: 13, offset: 62605}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2009, col: 13, offset: 62624}, + pos: position{line: 2009, col: 13, offset: 62605}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2009, col: 15, offset: 62626}, + pos: position{line: 2009, col: 15, offset: 62607}, name: "OUTER", }, }, }, }, &ruleRefExpr{ - pos: position{line: 2009, col: 23, offset: 62634}, + pos: position{line: 2009, col: 23, offset: 62615}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2009, col: 25, offset: 62636}, + pos: position{line: 2009, col: 25, offset: 62617}, name: "JOIN", }, }, }, }, &actionExpr{ - pos: position{line: 2010, col: 5, offset: 62670}, + pos: position{line: 2010, col: 5, offset: 62651}, run: (*parser).callonSQLJoinStyle20, expr: &seqExpr{ - pos: position{line: 2010, col: 5, offset: 62670}, + pos: position{line: 2010, col: 5, offset: 62651}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2010, col: 5, offset: 62670}, + pos: position{line: 2010, col: 5, offset: 62651}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2010, col: 7, offset: 62672}, + pos: position{line: 2010, col: 7, offset: 62653}, name: "LEFT", }, &zeroOrOneExpr{ - pos: position{line: 2010, col: 12, offset: 62677}, + pos: position{line: 2010, col: 12, offset: 62658}, expr: &seqExpr{ - pos: position{line: 2010, col: 13, offset: 62678}, + pos: position{line: 2010, col: 13, offset: 62659}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2010, col: 13, offset: 62678}, + pos: position{line: 2010, col: 13, offset: 62659}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2010, col: 15, offset: 62680}, + pos: position{line: 2010, col: 15, offset: 62661}, name: "OUTER", }, }, }, }, &ruleRefExpr{ - pos: position{line: 2010, col: 23, offset: 62688}, + pos: position{line: 2010, col: 23, offset: 62669}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2010, col: 25, offset: 62690}, + pos: position{line: 2010, col: 25, offset: 62671}, name: "JOIN", }, }, }, }, &actionExpr{ - pos: position{line: 2011, col: 5, offset: 62724}, + pos: position{line: 2011, col: 5, offset: 62705}, run: (*parser).callonSQLJoinStyle30, expr: &seqExpr{ - pos: position{line: 2011, col: 5, offset: 62724}, + pos: position{line: 2011, col: 5, offset: 62705}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2011, col: 5, offset: 62724}, + pos: position{line: 2011, col: 5, offset: 62705}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2011, col: 7, offset: 62726}, + pos: position{line: 2011, col: 7, offset: 62707}, name: "RIGHT", }, &zeroOrOneExpr{ - pos: position{line: 2011, col: 13, offset: 62732}, + pos: position{line: 2011, col: 13, offset: 62713}, expr: &seqExpr{ - pos: position{line: 2011, col: 14, offset: 62733}, + pos: position{line: 2011, col: 14, offset: 62714}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2011, col: 14, offset: 62733}, + pos: position{line: 2011, col: 14, offset: 62714}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2011, col: 16, offset: 62735}, + pos: position{line: 2011, col: 16, offset: 62716}, name: "OUTER", }, }, }, }, &ruleRefExpr{ - pos: position{line: 2011, col: 24, offset: 62743}, + pos: position{line: 2011, col: 24, offset: 62724}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2011, col: 26, offset: 62745}, + pos: position{line: 2011, col: 26, offset: 62726}, name: "JOIN", }, }, @@ -14182,33 +14146,33 @@ var g = &grammar{ }, { name: "JoinExpr", - pos: position{line: 2013, col: 1, offset: 62777}, + pos: position{line: 2013, col: 1, offset: 62758}, expr: &choiceExpr{ - pos: position{line: 2014, col: 5, offset: 62791}, + pos: position{line: 2014, col: 5, offset: 62772}, alternatives: []any{ &actionExpr{ - pos: position{line: 2014, col: 5, offset: 62791}, + pos: position{line: 2014, col: 5, offset: 62772}, run: (*parser).callonJoinExpr2, expr: &seqExpr{ - pos: position{line: 2014, col: 5, offset: 62791}, + pos: position{line: 2014, col: 5, offset: 62772}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2014, col: 5, offset: 62791}, + pos: position{line: 2014, col: 5, offset: 62772}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2014, col: 7, offset: 62793}, + pos: position{line: 2014, col: 7, offset: 62774}, name: "ON", }, &ruleRefExpr{ - pos: position{line: 2014, col: 10, offset: 62796}, + pos: position{line: 2014, col: 10, offset: 62777}, name: "_", }, &labeledExpr{ - pos: position{line: 2014, col: 12, offset: 62798}, + pos: position{line: 2014, col: 12, offset: 62779}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2014, col: 14, offset: 62800}, + pos: position{line: 2014, col: 14, offset: 62781}, name: "Expr", }, }, @@ -14216,47 +14180,47 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2020, col: 5, offset: 62922}, + pos: position{line: 2020, col: 5, offset: 62903}, run: (*parser).callonJoinExpr9, expr: &seqExpr{ - pos: position{line: 2020, col: 5, offset: 62922}, + pos: position{line: 2020, col: 5, offset: 62903}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2020, col: 5, offset: 62922}, + pos: position{line: 2020, col: 5, offset: 62903}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2020, col: 7, offset: 62924}, + pos: position{line: 2020, col: 7, offset: 62905}, name: "USING", }, &ruleRefExpr{ - pos: position{line: 2020, col: 13, offset: 62930}, + pos: position{line: 2020, col: 13, offset: 62911}, name: "__", }, &litMatcher{ - pos: position{line: 2020, col: 16, offset: 62933}, + pos: position{line: 2020, col: 16, offset: 62914}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 2020, col: 20, offset: 62937}, + pos: position{line: 2020, col: 20, offset: 62918}, name: "__", }, &labeledExpr{ - pos: position{line: 2020, col: 23, offset: 62940}, + pos: position{line: 2020, col: 23, offset: 62921}, label: "fields", expr: &ruleRefExpr{ - pos: position{line: 2020, col: 30, offset: 62947}, + pos: position{line: 2020, col: 30, offset: 62928}, name: "FieldExprs", }, }, &ruleRefExpr{ - pos: position{line: 2020, col: 41, offset: 62958}, + pos: position{line: 2020, col: 41, offset: 62939}, name: "__", }, &litMatcher{ - pos: position{line: 2020, col: 44, offset: 62961}, + pos: position{line: 2020, col: 44, offset: 62942}, val: ")", ignoreCase: false, want: "\")\"", @@ -14271,40 +14235,40 @@ var g = &grammar{ }, { name: "OptOrdinality", - pos: position{line: 2027, col: 1, offset: 63098}, + pos: position{line: 2027, col: 1, offset: 63079}, expr: &choiceExpr{ - pos: position{line: 2028, col: 5, offset: 63117}, + pos: position{line: 2028, col: 5, offset: 63098}, alternatives: []any{ &actionExpr{ - pos: position{line: 2028, col: 5, offset: 63117}, + pos: position{line: 2028, col: 5, offset: 63098}, run: (*parser).callonOptOrdinality2, expr: &seqExpr{ - pos: position{line: 2028, col: 5, offset: 63117}, + pos: position{line: 2028, col: 5, offset: 63098}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2028, col: 5, offset: 63117}, + pos: position{line: 2028, col: 5, offset: 63098}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2028, col: 7, offset: 63119}, + pos: position{line: 2028, col: 7, offset: 63100}, name: "WITH", }, &ruleRefExpr{ - pos: position{line: 2028, col: 12, offset: 63124}, + pos: position{line: 2028, col: 12, offset: 63105}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2028, col: 14, offset: 63126}, + pos: position{line: 2028, col: 14, offset: 63107}, name: "ORDINALITY", }, }, }, }, &actionExpr{ - pos: position{line: 2034, col: 5, offset: 63255}, + pos: position{line: 2034, col: 5, offset: 63236}, run: (*parser).callonOptOrdinality8, expr: &litMatcher{ - pos: position{line: 2034, col: 5, offset: 63255}, + pos: position{line: 2034, col: 5, offset: 63236}, val: "", ignoreCase: false, want: "\"\"", @@ -14317,25 +14281,25 @@ var g = &grammar{ }, { name: "OptAlias", - pos: position{line: 2036, col: 1, offset: 63304}, + pos: position{line: 2036, col: 1, offset: 63285}, expr: &choiceExpr{ - pos: position{line: 2037, col: 5, offset: 63317}, + pos: position{line: 2037, col: 5, offset: 63298}, alternatives: []any{ &actionExpr{ - pos: position{line: 2037, col: 5, offset: 63317}, + pos: position{line: 2037, col: 5, offset: 63298}, run: (*parser).callonOptAlias2, expr: &seqExpr{ - pos: position{line: 2037, col: 5, offset: 63317}, + pos: position{line: 2037, col: 5, offset: 63298}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2037, col: 5, offset: 63317}, + pos: position{line: 2037, col: 5, offset: 63298}, name: "_", }, &labeledExpr{ - pos: position{line: 2037, col: 7, offset: 63319}, + pos: position{line: 2037, col: 7, offset: 63300}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 2037, col: 9, offset: 63321}, + pos: position{line: 2037, col: 9, offset: 63302}, name: "AliasClause", }, }, @@ -14343,10 +14307,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2038, col: 5, offset: 63355}, + pos: position{line: 2038, col: 5, offset: 63336}, run: (*parser).callonOptAlias7, expr: &litMatcher{ - pos: position{line: 2038, col: 5, offset: 63355}, + pos: position{line: 2038, col: 5, offset: 63336}, val: "", ignoreCase: false, want: "\"\"", @@ -14359,50 +14323,50 @@ var g = &grammar{ }, { name: "AliasClause", - pos: position{line: 2040, col: 1, offset: 63392}, + pos: position{line: 2040, col: 1, offset: 63373}, expr: &actionExpr{ - pos: position{line: 2041, col: 5, offset: 63409}, + pos: position{line: 2041, col: 5, offset: 63390}, run: (*parser).callonAliasClause1, expr: &seqExpr{ - pos: position{line: 2041, col: 5, offset: 63409}, + pos: position{line: 2041, col: 5, offset: 63390}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 2041, col: 5, offset: 63409}, + pos: position{line: 2041, col: 5, offset: 63390}, expr: &seqExpr{ - pos: position{line: 2041, col: 6, offset: 63410}, + pos: position{line: 2041, col: 6, offset: 63391}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2041, col: 6, offset: 63410}, + pos: position{line: 2041, col: 6, offset: 63391}, name: "AS", }, &ruleRefExpr{ - pos: position{line: 2041, col: 9, offset: 63413}, + pos: position{line: 2041, col: 9, offset: 63394}, name: "_", }, }, }, }, ¬Expr{ - pos: position{line: 2041, col: 13, offset: 63417}, + pos: position{line: 2041, col: 13, offset: 63398}, expr: &choiceExpr{ - pos: position{line: 2041, col: 15, offset: 63419}, + pos: position{line: 2041, col: 15, offset: 63400}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 2041, col: 15, offset: 63419}, + pos: position{line: 2041, col: 15, offset: 63400}, name: "SQLGuard", }, &ruleRefExpr{ - pos: position{line: 2041, col: 26, offset: 63430}, + pos: position{line: 2041, col: 26, offset: 63411}, name: "DeprecatedFroms", }, }, }, }, &labeledExpr{ - pos: position{line: 2041, col: 43, offset: 63447}, + pos: position{line: 2041, col: 43, offset: 63428}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 2041, col: 48, offset: 63452}, + pos: position{line: 2041, col: 48, offset: 63433}, name: "IdentifierName", }, }, @@ -14414,51 +14378,51 @@ var g = &grammar{ }, { name: "Selection", - pos: position{line: 2045, col: 1, offset: 63585}, + pos: position{line: 2045, col: 1, offset: 63566}, expr: &actionExpr{ - pos: position{line: 2046, col: 5, offset: 63599}, + pos: position{line: 2046, col: 5, offset: 63580}, run: (*parser).callonSelection1, expr: &seqExpr{ - pos: position{line: 2046, col: 5, offset: 63599}, + pos: position{line: 2046, col: 5, offset: 63580}, exprs: []any{ &labeledExpr{ - pos: position{line: 2046, col: 5, offset: 63599}, + pos: position{line: 2046, col: 5, offset: 63580}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 2046, col: 11, offset: 63605}, + pos: position{line: 2046, col: 11, offset: 63586}, name: "SelectElem", }, }, &labeledExpr{ - pos: position{line: 2046, col: 22, offset: 63616}, + pos: position{line: 2046, col: 22, offset: 63597}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 2046, col: 27, offset: 63621}, + pos: position{line: 2046, col: 27, offset: 63602}, expr: &actionExpr{ - pos: position{line: 2046, col: 29, offset: 63623}, + pos: position{line: 2046, col: 29, offset: 63604}, run: (*parser).callonSelection7, expr: &seqExpr{ - pos: position{line: 2046, col: 29, offset: 63623}, + pos: position{line: 2046, col: 29, offset: 63604}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2046, col: 29, offset: 63623}, + pos: position{line: 2046, col: 29, offset: 63604}, name: "__", }, &litMatcher{ - pos: position{line: 2046, col: 32, offset: 63626}, + pos: position{line: 2046, col: 32, offset: 63607}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 2046, col: 36, offset: 63630}, + pos: position{line: 2046, col: 36, offset: 63611}, name: "__", }, &labeledExpr{ - pos: position{line: 2046, col: 39, offset: 63633}, + pos: position{line: 2046, col: 39, offset: 63614}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 2046, col: 41, offset: 63635}, + pos: position{line: 2046, col: 41, offset: 63616}, name: "SelectElem", }, }, @@ -14475,29 +14439,29 @@ var g = &grammar{ }, { name: "SelectElem", - pos: position{line: 2055, col: 1, offset: 63861}, + pos: position{line: 2055, col: 1, offset: 63842}, expr: &choiceExpr{ - pos: position{line: 2056, col: 5, offset: 63877}, + pos: position{line: 2056, col: 5, offset: 63858}, alternatives: []any{ &actionExpr{ - pos: position{line: 2056, col: 5, offset: 63877}, + pos: position{line: 2056, col: 5, offset: 63858}, run: (*parser).callonSelectElem2, expr: &seqExpr{ - pos: position{line: 2056, col: 5, offset: 63877}, + pos: position{line: 2056, col: 5, offset: 63858}, exprs: []any{ &labeledExpr{ - pos: position{line: 2056, col: 5, offset: 63877}, + pos: position{line: 2056, col: 5, offset: 63858}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2056, col: 7, offset: 63879}, + pos: position{line: 2056, col: 7, offset: 63860}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 2056, col: 12, offset: 63884}, + pos: position{line: 2056, col: 12, offset: 63865}, label: "as", expr: &ruleRefExpr{ - pos: position{line: 2056, col: 15, offset: 63887}, + pos: position{line: 2056, col: 15, offset: 63868}, name: "OptAsClause", }, }, @@ -14505,10 +14469,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2067, col: 5, offset: 64103}, + pos: position{line: 2067, col: 5, offset: 64084}, run: (*parser).callonSelectElem8, expr: &litMatcher{ - pos: position{line: 2067, col: 5, offset: 64103}, + pos: position{line: 2067, col: 5, offset: 64084}, val: "*", ignoreCase: false, want: "\"*\"", @@ -14521,33 +14485,33 @@ var g = &grammar{ }, { name: "OptAsClause", - pos: position{line: 2072, col: 1, offset: 64205}, + pos: position{line: 2072, col: 1, offset: 64186}, expr: &choiceExpr{ - pos: position{line: 2073, col: 5, offset: 64222}, + pos: position{line: 2073, col: 5, offset: 64203}, alternatives: []any{ &actionExpr{ - pos: position{line: 2073, col: 5, offset: 64222}, + pos: position{line: 2073, col: 5, offset: 64203}, run: (*parser).callonOptAsClause2, expr: &seqExpr{ - pos: position{line: 2073, col: 5, offset: 64222}, + pos: position{line: 2073, col: 5, offset: 64203}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2073, col: 5, offset: 64222}, + pos: position{line: 2073, col: 5, offset: 64203}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2073, col: 7, offset: 64224}, + pos: position{line: 2073, col: 7, offset: 64205}, name: "AS", }, &ruleRefExpr{ - pos: position{line: 2073, col: 10, offset: 64227}, + pos: position{line: 2073, col: 10, offset: 64208}, name: "_", }, &labeledExpr{ - pos: position{line: 2073, col: 12, offset: 64229}, + pos: position{line: 2073, col: 12, offset: 64210}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 2073, col: 15, offset: 64232}, + pos: position{line: 2073, col: 15, offset: 64213}, name: "Identifier", }, }, @@ -14555,10 +14519,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2074, col: 5, offset: 64266}, + pos: position{line: 2074, col: 5, offset: 64247}, run: (*parser).callonOptAsClause9, expr: &litMatcher{ - pos: position{line: 2074, col: 5, offset: 64266}, + pos: position{line: 2074, col: 5, offset: 64247}, val: "", ignoreCase: false, want: "\"\"", @@ -14571,41 +14535,41 @@ var g = &grammar{ }, { name: "OptOrderByClause", - pos: position{line: 2076, col: 1, offset: 64291}, + pos: position{line: 2076, col: 1, offset: 64272}, expr: &choiceExpr{ - pos: position{line: 2077, col: 5, offset: 64313}, + pos: position{line: 2077, col: 5, offset: 64294}, alternatives: []any{ &actionExpr{ - pos: position{line: 2077, col: 5, offset: 64313}, + pos: position{line: 2077, col: 5, offset: 64294}, run: (*parser).callonOptOrderByClause2, expr: &seqExpr{ - pos: position{line: 2077, col: 5, offset: 64313}, + pos: position{line: 2077, col: 5, offset: 64294}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2077, col: 5, offset: 64313}, + pos: position{line: 2077, col: 5, offset: 64294}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2077, col: 7, offset: 64315}, + pos: position{line: 2077, col: 7, offset: 64296}, name: "ORDER", }, &ruleRefExpr{ - pos: position{line: 2077, col: 13, offset: 64321}, + pos: position{line: 2077, col: 13, offset: 64302}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2077, col: 15, offset: 64323}, + pos: position{line: 2077, col: 15, offset: 64304}, name: "BY", }, &ruleRefExpr{ - pos: position{line: 2077, col: 18, offset: 64326}, + pos: position{line: 2077, col: 18, offset: 64307}, name: "_", }, &labeledExpr{ - pos: position{line: 2077, col: 20, offset: 64328}, + pos: position{line: 2077, col: 20, offset: 64309}, label: "list", expr: &ruleRefExpr{ - pos: position{line: 2077, col: 25, offset: 64333}, + pos: position{line: 2077, col: 25, offset: 64314}, name: "OrderByList", }, }, @@ -14613,10 +14577,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2084, col: 5, offset: 64492}, + pos: position{line: 2084, col: 5, offset: 64473}, run: (*parser).callonOptOrderByClause11, expr: &litMatcher{ - pos: position{line: 2084, col: 5, offset: 64492}, + pos: position{line: 2084, col: 5, offset: 64473}, val: "", ignoreCase: false, want: "\"\"", @@ -14629,51 +14593,51 @@ var g = &grammar{ }, { name: "OrderByList", - pos: position{line: 2086, col: 1, offset: 64525}, + pos: position{line: 2086, col: 1, offset: 64506}, expr: &actionExpr{ - pos: position{line: 2087, col: 5, offset: 64542}, + pos: position{line: 2087, col: 5, offset: 64523}, run: (*parser).callonOrderByList1, expr: &seqExpr{ - pos: position{line: 2087, col: 5, offset: 64542}, + pos: position{line: 2087, col: 5, offset: 64523}, exprs: []any{ &labeledExpr{ - pos: position{line: 2087, col: 5, offset: 64542}, + pos: position{line: 2087, col: 5, offset: 64523}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 2087, col: 11, offset: 64548}, + pos: position{line: 2087, col: 11, offset: 64529}, name: "OrderByItem", }, }, &labeledExpr{ - pos: position{line: 2087, col: 23, offset: 64560}, + pos: position{line: 2087, col: 23, offset: 64541}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 2087, col: 28, offset: 64565}, + pos: position{line: 2087, col: 28, offset: 64546}, expr: &actionExpr{ - pos: position{line: 2087, col: 30, offset: 64567}, + pos: position{line: 2087, col: 30, offset: 64548}, run: (*parser).callonOrderByList7, expr: &seqExpr{ - pos: position{line: 2087, col: 30, offset: 64567}, + pos: position{line: 2087, col: 30, offset: 64548}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2087, col: 30, offset: 64567}, + pos: position{line: 2087, col: 30, offset: 64548}, name: "__", }, &litMatcher{ - pos: position{line: 2087, col: 33, offset: 64570}, + pos: position{line: 2087, col: 33, offset: 64551}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 2087, col: 37, offset: 64574}, + pos: position{line: 2087, col: 37, offset: 64555}, name: "__", }, &labeledExpr{ - pos: position{line: 2087, col: 40, offset: 64577}, + pos: position{line: 2087, col: 40, offset: 64558}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 2087, col: 42, offset: 64579}, + pos: position{line: 2087, col: 42, offset: 64560}, name: "OrderByItem", }, }, @@ -14690,34 +14654,34 @@ var g = &grammar{ }, { name: "OrderByItem", - pos: position{line: 2091, col: 1, offset: 64680}, + pos: position{line: 2091, col: 1, offset: 64661}, expr: &actionExpr{ - pos: position{line: 2092, col: 5, offset: 64696}, + pos: position{line: 2092, col: 5, offset: 64677}, run: (*parser).callonOrderByItem1, expr: &seqExpr{ - pos: position{line: 2092, col: 5, offset: 64696}, + pos: position{line: 2092, col: 5, offset: 64677}, exprs: []any{ &labeledExpr{ - pos: position{line: 2092, col: 5, offset: 64696}, + pos: position{line: 2092, col: 5, offset: 64677}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2092, col: 7, offset: 64698}, + pos: position{line: 2092, col: 7, offset: 64679}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 2092, col: 12, offset: 64703}, + pos: position{line: 2092, col: 12, offset: 64684}, label: "order", expr: &ruleRefExpr{ - pos: position{line: 2092, col: 18, offset: 64709}, + pos: position{line: 2092, col: 18, offset: 64690}, name: "OptAscDesc", }, }, &labeledExpr{ - pos: position{line: 2092, col: 29, offset: 64720}, + pos: position{line: 2092, col: 29, offset: 64701}, label: "nulls", expr: &ruleRefExpr{ - pos: position{line: 2092, col: 35, offset: 64726}, + pos: position{line: 2092, col: 35, offset: 64707}, name: "OptNullsOrder", }, }, @@ -14729,49 +14693,49 @@ var g = &grammar{ }, { name: "OptAscDesc", - pos: position{line: 2103, col: 1, offset: 64976}, + pos: position{line: 2103, col: 1, offset: 64957}, expr: &choiceExpr{ - pos: position{line: 2104, col: 5, offset: 64991}, + pos: position{line: 2104, col: 5, offset: 64972}, alternatives: []any{ &actionExpr{ - pos: position{line: 2104, col: 5, offset: 64991}, + pos: position{line: 2104, col: 5, offset: 64972}, run: (*parser).callonOptAscDesc2, expr: &seqExpr{ - pos: position{line: 2104, col: 5, offset: 64991}, + pos: position{line: 2104, col: 5, offset: 64972}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2104, col: 5, offset: 64991}, + pos: position{line: 2104, col: 5, offset: 64972}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2104, col: 7, offset: 64993}, + pos: position{line: 2104, col: 7, offset: 64974}, name: "ASC", }, }, }, }, &actionExpr{ - pos: position{line: 2105, col: 5, offset: 65065}, + pos: position{line: 2105, col: 5, offset: 65046}, run: (*parser).callonOptAscDesc6, expr: &seqExpr{ - pos: position{line: 2105, col: 5, offset: 65065}, + pos: position{line: 2105, col: 5, offset: 65046}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2105, col: 5, offset: 65065}, + pos: position{line: 2105, col: 5, offset: 65046}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2105, col: 7, offset: 65067}, + pos: position{line: 2105, col: 7, offset: 65048}, name: "DESC", }, }, }, }, &actionExpr{ - pos: position{line: 2106, col: 5, offset: 65139}, + pos: position{line: 2106, col: 5, offset: 65120}, run: (*parser).callonOptAscDesc10, expr: &litMatcher{ - pos: position{line: 2106, col: 5, offset: 65139}, + pos: position{line: 2106, col: 5, offset: 65120}, val: "", ignoreCase: false, want: "\"\"", @@ -14784,65 +14748,65 @@ var g = &grammar{ }, { name: "OptNullsOrder", - pos: position{line: 2108, col: 1, offset: 65171}, + pos: position{line: 2108, col: 1, offset: 65152}, expr: &choiceExpr{ - pos: position{line: 2109, col: 5, offset: 65189}, + pos: position{line: 2109, col: 5, offset: 65170}, alternatives: []any{ &actionExpr{ - pos: position{line: 2109, col: 5, offset: 65189}, + pos: position{line: 2109, col: 5, offset: 65170}, run: (*parser).callonOptNullsOrder2, expr: &seqExpr{ - pos: position{line: 2109, col: 5, offset: 65189}, + pos: position{line: 2109, col: 5, offset: 65170}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2109, col: 5, offset: 65189}, + pos: position{line: 2109, col: 5, offset: 65170}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2109, col: 7, offset: 65191}, + pos: position{line: 2109, col: 7, offset: 65172}, name: "NULLS", }, &ruleRefExpr{ - pos: position{line: 2109, col: 13, offset: 65197}, + pos: position{line: 2109, col: 13, offset: 65178}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2109, col: 15, offset: 65199}, + pos: position{line: 2109, col: 15, offset: 65180}, name: "FIRST", }, }, }, }, &actionExpr{ - pos: position{line: 2110, col: 5, offset: 65275}, + pos: position{line: 2110, col: 5, offset: 65256}, run: (*parser).callonOptNullsOrder8, expr: &seqExpr{ - pos: position{line: 2110, col: 5, offset: 65275}, + pos: position{line: 2110, col: 5, offset: 65256}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2110, col: 5, offset: 65275}, + pos: position{line: 2110, col: 5, offset: 65256}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2110, col: 7, offset: 65277}, + pos: position{line: 2110, col: 7, offset: 65258}, name: "NULLS", }, &ruleRefExpr{ - pos: position{line: 2110, col: 13, offset: 65283}, + pos: position{line: 2110, col: 13, offset: 65264}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2110, col: 15, offset: 65285}, + pos: position{line: 2110, col: 15, offset: 65266}, name: "LAST", }, }, }, }, &actionExpr{ - pos: position{line: 2111, col: 5, offset: 65360}, + pos: position{line: 2111, col: 5, offset: 65341}, run: (*parser).callonOptNullsOrder14, expr: &litMatcher{ - pos: position{line: 2111, col: 5, offset: 65360}, + pos: position{line: 2111, col: 5, offset: 65341}, val: "", ignoreCase: false, want: "\"\"", @@ -14855,29 +14819,29 @@ var g = &grammar{ }, { name: "SelectLimit", - pos: position{line: 2113, col: 1, offset: 65405}, + pos: position{line: 2113, col: 1, offset: 65386}, expr: &choiceExpr{ - pos: position{line: 2114, col: 5, offset: 65421}, + pos: position{line: 2114, col: 5, offset: 65402}, alternatives: []any{ &actionExpr{ - pos: position{line: 2114, col: 5, offset: 65421}, + pos: position{line: 2114, col: 5, offset: 65402}, run: (*parser).callonSelectLimit2, expr: &seqExpr{ - pos: position{line: 2114, col: 5, offset: 65421}, + pos: position{line: 2114, col: 5, offset: 65402}, exprs: []any{ &labeledExpr{ - pos: position{line: 2114, col: 5, offset: 65421}, + pos: position{line: 2114, col: 5, offset: 65402}, label: "l", expr: &ruleRefExpr{ - pos: position{line: 2114, col: 7, offset: 65423}, + pos: position{line: 2114, col: 7, offset: 65404}, name: "LimitClause", }, }, &labeledExpr{ - pos: position{line: 2114, col: 19, offset: 65435}, + pos: position{line: 2114, col: 19, offset: 65416}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 2114, col: 21, offset: 65437}, + pos: position{line: 2114, col: 21, offset: 65418}, name: "OptOffsetClause", }, }, @@ -14885,24 +14849,24 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2121, col: 5, offset: 65583}, + pos: position{line: 2121, col: 5, offset: 65564}, run: (*parser).callonSelectLimit8, expr: &seqExpr{ - pos: position{line: 2121, col: 5, offset: 65583}, + pos: position{line: 2121, col: 5, offset: 65564}, exprs: []any{ &labeledExpr{ - pos: position{line: 2121, col: 5, offset: 65583}, + pos: position{line: 2121, col: 5, offset: 65564}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 2121, col: 7, offset: 65585}, + pos: position{line: 2121, col: 7, offset: 65566}, name: "OffsetClause", }, }, &labeledExpr{ - pos: position{line: 2121, col: 20, offset: 65598}, + pos: position{line: 2121, col: 20, offset: 65579}, label: "l", expr: &ruleRefExpr{ - pos: position{line: 2121, col: 22, offset: 65600}, + pos: position{line: 2121, col: 22, offset: 65581}, name: "OptLimitClause", }, }, @@ -14916,25 +14880,25 @@ var g = &grammar{ }, { name: "OptLimitClause", - pos: position{line: 2134, col: 1, offset: 65872}, + pos: position{line: 2134, col: 1, offset: 65853}, expr: &choiceExpr{ - pos: position{line: 2135, col: 5, offset: 65892}, + pos: position{line: 2135, col: 5, offset: 65873}, alternatives: []any{ &actionExpr{ - pos: position{line: 2135, col: 5, offset: 65892}, + pos: position{line: 2135, col: 5, offset: 65873}, run: (*parser).callonOptLimitClause2, expr: &seqExpr{ - pos: position{line: 2135, col: 5, offset: 65892}, + pos: position{line: 2135, col: 5, offset: 65873}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2135, col: 5, offset: 65892}, + pos: position{line: 2135, col: 5, offset: 65873}, name: "_", }, &labeledExpr{ - pos: position{line: 2135, col: 7, offset: 65894}, + pos: position{line: 2135, col: 7, offset: 65875}, label: "l", expr: &ruleRefExpr{ - pos: position{line: 2135, col: 9, offset: 65896}, + pos: position{line: 2135, col: 9, offset: 65877}, name: "LimitClause", }, }, @@ -14942,10 +14906,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2136, col: 5, offset: 65930}, + pos: position{line: 2136, col: 5, offset: 65911}, run: (*parser).callonOptLimitClause7, expr: &litMatcher{ - pos: position{line: 2136, col: 5, offset: 65930}, + pos: position{line: 2136, col: 5, offset: 65911}, val: "", ignoreCase: false, want: "\"\"", @@ -14958,50 +14922,50 @@ var g = &grammar{ }, { name: "LimitClause", - pos: position{line: 2138, col: 1, offset: 65967}, + pos: position{line: 2138, col: 1, offset: 65948}, expr: &choiceExpr{ - pos: position{line: 2139, col: 5, offset: 65984}, + pos: position{line: 2139, col: 5, offset: 65965}, alternatives: []any{ &actionExpr{ - pos: position{line: 2139, col: 5, offset: 65984}, + pos: position{line: 2139, col: 5, offset: 65965}, run: (*parser).callonLimitClause2, expr: &seqExpr{ - pos: position{line: 2139, col: 5, offset: 65984}, + pos: position{line: 2139, col: 5, offset: 65965}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2139, col: 5, offset: 65984}, + pos: position{line: 2139, col: 5, offset: 65965}, name: "LIMIT", }, &ruleRefExpr{ - pos: position{line: 2139, col: 11, offset: 65990}, + pos: position{line: 2139, col: 11, offset: 65971}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2139, col: 13, offset: 65992}, + pos: position{line: 2139, col: 13, offset: 65973}, name: "ALL", }, }, }, }, &actionExpr{ - pos: position{line: 2140, col: 5, offset: 66054}, + pos: position{line: 2140, col: 5, offset: 66035}, run: (*parser).callonLimitClause7, expr: &seqExpr{ - pos: position{line: 2140, col: 5, offset: 66054}, + pos: position{line: 2140, col: 5, offset: 66035}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2140, col: 5, offset: 66054}, + pos: position{line: 2140, col: 5, offset: 66035}, name: "LIMIT", }, &ruleRefExpr{ - pos: position{line: 2140, col: 11, offset: 66060}, + pos: position{line: 2140, col: 11, offset: 66041}, name: "_", }, &labeledExpr{ - pos: position{line: 2140, col: 13, offset: 66062}, + pos: position{line: 2140, col: 13, offset: 66043}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2140, col: 15, offset: 66064}, + pos: position{line: 2140, col: 15, offset: 66045}, name: "Expr", }, }, @@ -15015,25 +14979,25 @@ var g = &grammar{ }, { name: "OptOffsetClause", - pos: position{line: 2148, col: 1, offset: 66189}, + pos: position{line: 2148, col: 1, offset: 66170}, expr: &choiceExpr{ - pos: position{line: 2149, col: 5, offset: 66210}, + pos: position{line: 2149, col: 5, offset: 66191}, alternatives: []any{ &actionExpr{ - pos: position{line: 2149, col: 5, offset: 66210}, + pos: position{line: 2149, col: 5, offset: 66191}, run: (*parser).callonOptOffsetClause2, expr: &seqExpr{ - pos: position{line: 2149, col: 5, offset: 66210}, + pos: position{line: 2149, col: 5, offset: 66191}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2149, col: 5, offset: 66210}, + pos: position{line: 2149, col: 5, offset: 66191}, name: "_", }, &labeledExpr{ - pos: position{line: 2149, col: 7, offset: 66212}, + pos: position{line: 2149, col: 7, offset: 66193}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 2149, col: 9, offset: 66214}, + pos: position{line: 2149, col: 9, offset: 66195}, name: "OffsetClause", }, }, @@ -15041,10 +15005,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 2150, col: 5, offset: 66250}, + pos: position{line: 2150, col: 5, offset: 66231}, run: (*parser).callonOptOffsetClause7, expr: &litMatcher{ - pos: position{line: 2150, col: 5, offset: 66250}, + pos: position{line: 2150, col: 5, offset: 66231}, val: "", ignoreCase: false, want: "\"\"", @@ -15057,26 +15021,26 @@ var g = &grammar{ }, { name: "OffsetClause", - pos: position{line: 2152, col: 1, offset: 66275}, + pos: position{line: 2152, col: 1, offset: 66256}, expr: &actionExpr{ - pos: position{line: 2153, col: 5, offset: 66293}, + pos: position{line: 2153, col: 5, offset: 66274}, run: (*parser).callonOffsetClause1, expr: &seqExpr{ - pos: position{line: 2153, col: 5, offset: 66293}, + pos: position{line: 2153, col: 5, offset: 66274}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2153, col: 5, offset: 66293}, + pos: position{line: 2153, col: 5, offset: 66274}, name: "OFFSET", }, &ruleRefExpr{ - pos: position{line: 2153, col: 12, offset: 66300}, + pos: position{line: 2153, col: 12, offset: 66281}, name: "_", }, &labeledExpr{ - pos: position{line: 2153, col: 14, offset: 66302}, + pos: position{line: 2153, col: 14, offset: 66283}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 2153, col: 16, offset: 66304}, + pos: position{line: 2153, col: 16, offset: 66285}, name: "Expr", }, }, @@ -15088,38 +15052,38 @@ var g = &grammar{ }, { name: "SetOperation", - pos: position{line: 2155, col: 1, offset: 66329}, + pos: position{line: 2155, col: 1, offset: 66310}, expr: &actionExpr{ - pos: position{line: 2156, col: 5, offset: 66346}, + pos: position{line: 2156, col: 5, offset: 66327}, run: (*parser).callonSetOperation1, expr: &seqExpr{ - pos: position{line: 2156, col: 5, offset: 66346}, + pos: position{line: 2156, col: 5, offset: 66327}, exprs: []any{ &labeledExpr{ - pos: position{line: 2156, col: 5, offset: 66346}, + pos: position{line: 2156, col: 5, offset: 66327}, label: "left", expr: &ruleRefExpr{ - pos: position{line: 2156, col: 10, offset: 66351}, + pos: position{line: 2156, col: 10, offset: 66332}, name: "SelectExpr", }, }, &labeledExpr{ - pos: position{line: 2156, col: 21, offset: 66362}, + pos: position{line: 2156, col: 21, offset: 66343}, label: "distinct", expr: &ruleRefExpr{ - pos: position{line: 2156, col: 30, offset: 66371}, + pos: position{line: 2156, col: 30, offset: 66352}, name: "SetOp", }, }, &ruleRefExpr{ - pos: position{line: 2156, col: 36, offset: 66377}, + pos: position{line: 2156, col: 36, offset: 66358}, name: "_", }, &labeledExpr{ - pos: position{line: 2156, col: 38, offset: 66379}, + pos: position{line: 2156, col: 38, offset: 66360}, label: "right", expr: &ruleRefExpr{ - pos: position{line: 2156, col: 44, offset: 66385}, + pos: position{line: 2156, col: 44, offset: 66366}, name: "SelectExpr", }, }, @@ -15131,65 +15095,65 @@ var g = &grammar{ }, { name: "SetOp", - pos: position{line: 2166, col: 1, offset: 66606}, + pos: position{line: 2166, col: 1, offset: 66587}, expr: &choiceExpr{ - pos: position{line: 2167, col: 5, offset: 66617}, + pos: position{line: 2167, col: 5, offset: 66598}, alternatives: []any{ &actionExpr{ - pos: position{line: 2167, col: 5, offset: 66617}, + pos: position{line: 2167, col: 5, offset: 66598}, run: (*parser).callonSetOp2, expr: &seqExpr{ - pos: position{line: 2167, col: 5, offset: 66617}, + pos: position{line: 2167, col: 5, offset: 66598}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2167, col: 5, offset: 66617}, + pos: position{line: 2167, col: 5, offset: 66598}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2167, col: 7, offset: 66619}, + pos: position{line: 2167, col: 7, offset: 66600}, name: "UNION", }, &ruleRefExpr{ - pos: position{line: 2167, col: 13, offset: 66625}, + pos: position{line: 2167, col: 13, offset: 66606}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2167, col: 15, offset: 66627}, + pos: position{line: 2167, col: 15, offset: 66608}, name: "ALL", }, }, }, }, &actionExpr{ - pos: position{line: 2168, col: 5, offset: 66663}, + pos: position{line: 2168, col: 5, offset: 66644}, run: (*parser).callonSetOp8, expr: &seqExpr{ - pos: position{line: 2168, col: 5, offset: 66663}, + pos: position{line: 2168, col: 5, offset: 66644}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 2168, col: 5, offset: 66663}, + pos: position{line: 2168, col: 5, offset: 66644}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2168, col: 7, offset: 66665}, + pos: position{line: 2168, col: 7, offset: 66646}, name: "UNION", }, &ruleRefExpr{ - pos: position{line: 2168, col: 13, offset: 66671}, + pos: position{line: 2168, col: 13, offset: 66652}, name: "_", }, &ruleRefExpr{ - pos: position{line: 2168, col: 15, offset: 66673}, + pos: position{line: 2168, col: 15, offset: 66654}, name: "DISTINCT", }, }, }, }, &actionExpr{ - pos: position{line: 2169, col: 5, offset: 66708}, + pos: position{line: 2169, col: 5, offset: 66689}, run: (*parser).callonSetOp14, expr: &litMatcher{ - pos: position{line: 2169, col: 5, offset: 66708}, + pos: position{line: 2169, col: 5, offset: 66689}, val: "", ignoreCase: false, want: "\"\"", @@ -15202,80 +15166,80 @@ var g = &grammar{ }, { name: "SQLGuard", - pos: position{line: 2172, col: 1, offset: 66771}, + pos: position{line: 2172, col: 1, offset: 66752}, expr: &choiceExpr{ - pos: position{line: 2173, col: 5, offset: 66786}, + pos: position{line: 2173, col: 5, offset: 66767}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 2173, col: 5, offset: 66786}, + pos: position{line: 2173, col: 5, offset: 66767}, name: "FROM", }, &ruleRefExpr{ - pos: position{line: 2173, col: 12, offset: 66793}, + pos: position{line: 2173, col: 12, offset: 66774}, name: "GROUP", }, &ruleRefExpr{ - pos: position{line: 2173, col: 20, offset: 66801}, + pos: position{line: 2173, col: 20, offset: 66782}, name: "HAVING", }, &ruleRefExpr{ - pos: position{line: 2173, col: 29, offset: 66810}, + pos: position{line: 2173, col: 29, offset: 66791}, name: "SELECT", }, &ruleRefExpr{ - pos: position{line: 2173, col: 38, offset: 66819}, + pos: position{line: 2173, col: 38, offset: 66800}, name: "RECURSIVE", }, &ruleRefExpr{ - pos: position{line: 2174, col: 5, offset: 66833}, + pos: position{line: 2174, col: 5, offset: 66814}, name: "INNER", }, &ruleRefExpr{ - pos: position{line: 2174, col: 13, offset: 66841}, + pos: position{line: 2174, col: 13, offset: 66822}, name: "LEFT", }, &ruleRefExpr{ - pos: position{line: 2174, col: 20, offset: 66848}, + pos: position{line: 2174, col: 20, offset: 66829}, name: "RIGHT", }, &ruleRefExpr{ - pos: position{line: 2174, col: 28, offset: 66856}, + pos: position{line: 2174, col: 28, offset: 66837}, name: "OUTER", }, &ruleRefExpr{ - pos: position{line: 2174, col: 36, offset: 66864}, + pos: position{line: 2174, col: 36, offset: 66845}, name: "CROSS", }, &ruleRefExpr{ - pos: position{line: 2174, col: 44, offset: 66872}, + pos: position{line: 2174, col: 44, offset: 66853}, name: "JOIN", }, &ruleRefExpr{ - pos: position{line: 2175, col: 5, offset: 66881}, + pos: position{line: 2175, col: 5, offset: 66862}, name: "UNION", }, &ruleRefExpr{ - pos: position{line: 2176, col: 5, offset: 66891}, + pos: position{line: 2176, col: 5, offset: 66872}, name: "ORDER", }, &ruleRefExpr{ - pos: position{line: 2177, col: 5, offset: 66901}, + pos: position{line: 2177, col: 5, offset: 66882}, name: "LIMIT", }, &ruleRefExpr{ - pos: position{line: 2178, col: 5, offset: 66911}, + pos: position{line: 2178, col: 5, offset: 66892}, name: "WHERE", }, &ruleRefExpr{ - pos: position{line: 2179, col: 5, offset: 66922}, + pos: position{line: 2179, col: 5, offset: 66903}, name: "WITH", }, &ruleRefExpr{ - pos: position{line: 2180, col: 5, offset: 66931}, + pos: position{line: 2180, col: 5, offset: 66912}, name: "USING", }, &ruleRefExpr{ - pos: position{line: 2181, col: 5, offset: 66941}, + pos: position{line: 2181, col: 5, offset: 66922}, name: "ON", }, }, @@ -15285,20 +15249,20 @@ var g = &grammar{ }, { name: "AGGREGATE", - pos: position{line: 2183, col: 1, offset: 66945}, + pos: position{line: 2183, col: 1, offset: 66926}, expr: &seqExpr{ - pos: position{line: 2183, col: 14, offset: 66958}, + pos: position{line: 2183, col: 14, offset: 66939}, exprs: []any{ &litMatcher{ - pos: position{line: 2183, col: 14, offset: 66958}, + pos: position{line: 2183, col: 14, offset: 66939}, val: "aggregate", ignoreCase: true, want: "\"AGGREGATE\"i", }, ¬Expr{ - pos: position{line: 2183, col: 33, offset: 66977}, + pos: position{line: 2183, col: 33, offset: 66958}, expr: &ruleRefExpr{ - pos: position{line: 2183, col: 34, offset: 66978}, + pos: position{line: 2183, col: 34, offset: 66959}, name: "IdentifierRest", }, }, @@ -15309,20 +15273,20 @@ var g = &grammar{ }, { name: "ALL", - pos: position{line: 2184, col: 1, offset: 66993}, + pos: position{line: 2184, col: 1, offset: 66974}, expr: &seqExpr{ - pos: position{line: 2184, col: 14, offset: 67006}, + pos: position{line: 2184, col: 14, offset: 66987}, exprs: []any{ &litMatcher{ - pos: position{line: 2184, col: 14, offset: 67006}, + pos: position{line: 2184, col: 14, offset: 66987}, val: "all", ignoreCase: true, want: "\"ALL\"i", }, ¬Expr{ - pos: position{line: 2184, col: 33, offset: 67025}, + pos: position{line: 2184, col: 33, offset: 67006}, expr: &ruleRefExpr{ - pos: position{line: 2184, col: 34, offset: 67026}, + pos: position{line: 2184, col: 34, offset: 67007}, name: "IdentifierRest", }, }, @@ -15333,23 +15297,23 @@ var g = &grammar{ }, { name: "AND", - pos: position{line: 2185, col: 1, offset: 67041}, + pos: position{line: 2185, col: 1, offset: 67022}, expr: &actionExpr{ - pos: position{line: 2185, col: 14, offset: 67054}, + pos: position{line: 2185, col: 14, offset: 67035}, run: (*parser).callonAND1, expr: &seqExpr{ - pos: position{line: 2185, col: 14, offset: 67054}, + pos: position{line: 2185, col: 14, offset: 67035}, exprs: []any{ &litMatcher{ - pos: position{line: 2185, col: 14, offset: 67054}, + pos: position{line: 2185, col: 14, offset: 67035}, val: "and", ignoreCase: true, want: "\"AND\"i", }, ¬Expr{ - pos: position{line: 2185, col: 33, offset: 67073}, + pos: position{line: 2185, col: 33, offset: 67054}, expr: &ruleRefExpr{ - pos: position{line: 2185, col: 34, offset: 67074}, + pos: position{line: 2185, col: 34, offset: 67055}, name: "IdentifierRest", }, }, @@ -15361,20 +15325,20 @@ var g = &grammar{ }, { name: "ANTI", - pos: position{line: 2186, col: 1, offset: 67111}, + pos: position{line: 2186, col: 1, offset: 67092}, expr: &seqExpr{ - pos: position{line: 2186, col: 14, offset: 67124}, + pos: position{line: 2186, col: 14, offset: 67105}, exprs: []any{ &litMatcher{ - pos: position{line: 2186, col: 14, offset: 67124}, + pos: position{line: 2186, col: 14, offset: 67105}, val: "anti", ignoreCase: true, want: "\"ANTI\"i", }, ¬Expr{ - pos: position{line: 2186, col: 33, offset: 67143}, + pos: position{line: 2186, col: 33, offset: 67124}, expr: &ruleRefExpr{ - pos: position{line: 2186, col: 34, offset: 67144}, + pos: position{line: 2186, col: 34, offset: 67125}, name: "IdentifierRest", }, }, @@ -15385,20 +15349,20 @@ var g = &grammar{ }, { name: "AS", - pos: position{line: 2187, col: 1, offset: 67159}, + pos: position{line: 2187, col: 1, offset: 67140}, expr: &seqExpr{ - pos: position{line: 2187, col: 14, offset: 67172}, + pos: position{line: 2187, col: 14, offset: 67153}, exprs: []any{ &litMatcher{ - pos: position{line: 2187, col: 14, offset: 67172}, + pos: position{line: 2187, col: 14, offset: 67153}, val: "as", ignoreCase: true, want: "\"AS\"i", }, ¬Expr{ - pos: position{line: 2187, col: 33, offset: 67191}, + pos: position{line: 2187, col: 33, offset: 67172}, expr: &ruleRefExpr{ - pos: position{line: 2187, col: 34, offset: 67192}, + pos: position{line: 2187, col: 34, offset: 67173}, name: "IdentifierRest", }, }, @@ -15409,23 +15373,23 @@ var g = &grammar{ }, { name: "ASC", - pos: position{line: 2188, col: 1, offset: 67207}, + pos: position{line: 2188, col: 1, offset: 67188}, expr: &actionExpr{ - pos: position{line: 2188, col: 14, offset: 67220}, + pos: position{line: 2188, col: 14, offset: 67201}, run: (*parser).callonASC1, expr: &seqExpr{ - pos: position{line: 2188, col: 14, offset: 67220}, + pos: position{line: 2188, col: 14, offset: 67201}, exprs: []any{ &litMatcher{ - pos: position{line: 2188, col: 14, offset: 67220}, + pos: position{line: 2188, col: 14, offset: 67201}, val: "asc", ignoreCase: true, want: "\"ASC\"i", }, ¬Expr{ - pos: position{line: 2188, col: 33, offset: 67239}, + pos: position{line: 2188, col: 33, offset: 67220}, expr: &ruleRefExpr{ - pos: position{line: 2188, col: 34, offset: 67240}, + pos: position{line: 2188, col: 34, offset: 67221}, name: "IdentifierRest", }, }, @@ -15437,20 +15401,20 @@ var g = &grammar{ }, { name: "ASSERT", - pos: position{line: 2189, col: 1, offset: 67277}, + pos: position{line: 2189, col: 1, offset: 67258}, expr: &seqExpr{ - pos: position{line: 2189, col: 14, offset: 67290}, + pos: position{line: 2189, col: 14, offset: 67271}, exprs: []any{ &litMatcher{ - pos: position{line: 2189, col: 14, offset: 67290}, + pos: position{line: 2189, col: 14, offset: 67271}, val: "assert", ignoreCase: true, want: "\"ASSERT\"i", }, ¬Expr{ - pos: position{line: 2189, col: 33, offset: 67309}, + pos: position{line: 2189, col: 33, offset: 67290}, expr: &ruleRefExpr{ - pos: position{line: 2189, col: 34, offset: 67310}, + pos: position{line: 2189, col: 34, offset: 67291}, name: "IdentifierRest", }, }, @@ -15461,20 +15425,20 @@ var g = &grammar{ }, { name: "AT", - pos: position{line: 2190, col: 1, offset: 67325}, + pos: position{line: 2190, col: 1, offset: 67306}, expr: &seqExpr{ - pos: position{line: 2190, col: 14, offset: 67338}, + pos: position{line: 2190, col: 14, offset: 67319}, exprs: []any{ &litMatcher{ - pos: position{line: 2190, col: 14, offset: 67338}, + pos: position{line: 2190, col: 14, offset: 67319}, val: "at", ignoreCase: true, want: "\"AT\"i", }, ¬Expr{ - pos: position{line: 2190, col: 33, offset: 67357}, + pos: position{line: 2190, col: 33, offset: 67338}, expr: &ruleRefExpr{ - pos: position{line: 2190, col: 34, offset: 67358}, + pos: position{line: 2190, col: 34, offset: 67339}, name: "IdentifierRest", }, }, @@ -15485,20 +15449,20 @@ var g = &grammar{ }, { name: "AUTHOR", - pos: position{line: 2191, col: 1, offset: 67373}, + pos: position{line: 2191, col: 1, offset: 67354}, expr: &seqExpr{ - pos: position{line: 2191, col: 14, offset: 67386}, + pos: position{line: 2191, col: 14, offset: 67367}, exprs: []any{ &litMatcher{ - pos: position{line: 2191, col: 14, offset: 67386}, + pos: position{line: 2191, col: 14, offset: 67367}, val: "author", ignoreCase: true, want: "\"AUTHOR\"i", }, ¬Expr{ - pos: position{line: 2191, col: 33, offset: 67405}, + pos: position{line: 2191, col: 33, offset: 67386}, expr: &ruleRefExpr{ - pos: position{line: 2191, col: 34, offset: 67406}, + pos: position{line: 2191, col: 34, offset: 67387}, name: "IdentifierRest", }, }, @@ -15509,20 +15473,20 @@ var g = &grammar{ }, { name: "BETWEEN", - pos: position{line: 2192, col: 1, offset: 67421}, + pos: position{line: 2192, col: 1, offset: 67402}, expr: &seqExpr{ - pos: position{line: 2192, col: 14, offset: 67434}, + pos: position{line: 2192, col: 14, offset: 67415}, exprs: []any{ &litMatcher{ - pos: position{line: 2192, col: 14, offset: 67434}, + pos: position{line: 2192, col: 14, offset: 67415}, val: "between", ignoreCase: true, want: "\"BETWEEN\"i", }, ¬Expr{ - pos: position{line: 2192, col: 33, offset: 67453}, + pos: position{line: 2192, col: 33, offset: 67434}, expr: &ruleRefExpr{ - pos: position{line: 2192, col: 34, offset: 67454}, + pos: position{line: 2192, col: 34, offset: 67435}, name: "IdentifierRest", }, }, @@ -15533,20 +15497,20 @@ var g = &grammar{ }, { name: "BODY", - pos: position{line: 2193, col: 1, offset: 67469}, + pos: position{line: 2193, col: 1, offset: 67450}, expr: &seqExpr{ - pos: position{line: 2193, col: 14, offset: 67482}, + pos: position{line: 2193, col: 14, offset: 67463}, exprs: []any{ &litMatcher{ - pos: position{line: 2193, col: 14, offset: 67482}, + pos: position{line: 2193, col: 14, offset: 67463}, val: "body", ignoreCase: true, want: "\"BODY\"i", }, ¬Expr{ - pos: position{line: 2193, col: 33, offset: 67501}, + pos: position{line: 2193, col: 33, offset: 67482}, expr: &ruleRefExpr{ - pos: position{line: 2193, col: 34, offset: 67502}, + pos: position{line: 2193, col: 34, offset: 67483}, name: "IdentifierRest", }, }, @@ -15557,20 +15521,20 @@ var g = &grammar{ }, { name: "BY", - pos: position{line: 2194, col: 1, offset: 67517}, + pos: position{line: 2194, col: 1, offset: 67498}, expr: &seqExpr{ - pos: position{line: 2194, col: 14, offset: 67530}, + pos: position{line: 2194, col: 14, offset: 67511}, exprs: []any{ &litMatcher{ - pos: position{line: 2194, col: 14, offset: 67530}, + pos: position{line: 2194, col: 14, offset: 67511}, val: "by", ignoreCase: true, want: "\"BY\"i", }, ¬Expr{ - pos: position{line: 2194, col: 33, offset: 67549}, + pos: position{line: 2194, col: 33, offset: 67530}, expr: &ruleRefExpr{ - pos: position{line: 2194, col: 34, offset: 67550}, + pos: position{line: 2194, col: 34, offset: 67531}, name: "IdentifierRest", }, }, @@ -15581,20 +15545,20 @@ var g = &grammar{ }, { name: "CASE", - pos: position{line: 2195, col: 1, offset: 67565}, + pos: position{line: 2195, col: 1, offset: 67546}, expr: &seqExpr{ - pos: position{line: 2195, col: 14, offset: 67578}, + pos: position{line: 2195, col: 14, offset: 67559}, exprs: []any{ &litMatcher{ - pos: position{line: 2195, col: 14, offset: 67578}, + pos: position{line: 2195, col: 14, offset: 67559}, val: "case", ignoreCase: true, want: "\"CASE\"i", }, ¬Expr{ - pos: position{line: 2195, col: 33, offset: 67597}, + pos: position{line: 2195, col: 33, offset: 67578}, expr: &ruleRefExpr{ - pos: position{line: 2195, col: 34, offset: 67598}, + pos: position{line: 2195, col: 34, offset: 67579}, name: "IdentifierRest", }, }, @@ -15605,20 +15569,20 @@ var g = &grammar{ }, { name: "CONST", - pos: position{line: 2196, col: 1, offset: 67613}, + pos: position{line: 2196, col: 1, offset: 67594}, expr: &seqExpr{ - pos: position{line: 2196, col: 14, offset: 67626}, + pos: position{line: 2196, col: 14, offset: 67607}, exprs: []any{ &litMatcher{ - pos: position{line: 2196, col: 14, offset: 67626}, + pos: position{line: 2196, col: 14, offset: 67607}, val: "const", ignoreCase: true, want: "\"CONST\"i", }, ¬Expr{ - pos: position{line: 2196, col: 33, offset: 67645}, + pos: position{line: 2196, col: 33, offset: 67626}, expr: &ruleRefExpr{ - pos: position{line: 2196, col: 34, offset: 67646}, + pos: position{line: 2196, col: 34, offset: 67627}, name: "IdentifierRest", }, }, @@ -15629,20 +15593,20 @@ var g = &grammar{ }, { name: "CROSS", - pos: position{line: 2197, col: 1, offset: 67661}, + pos: position{line: 2197, col: 1, offset: 67642}, expr: &seqExpr{ - pos: position{line: 2197, col: 14, offset: 67674}, + pos: position{line: 2197, col: 14, offset: 67655}, exprs: []any{ &litMatcher{ - pos: position{line: 2197, col: 14, offset: 67674}, + pos: position{line: 2197, col: 14, offset: 67655}, val: "cross", ignoreCase: true, want: "\"CROSS\"i", }, ¬Expr{ - pos: position{line: 2197, col: 33, offset: 67693}, + pos: position{line: 2197, col: 33, offset: 67674}, expr: &ruleRefExpr{ - pos: position{line: 2197, col: 34, offset: 67694}, + pos: position{line: 2197, col: 34, offset: 67675}, name: "IdentifierRest", }, }, @@ -15653,20 +15617,20 @@ var g = &grammar{ }, { name: "CUT", - pos: position{line: 2198, col: 1, offset: 67709}, + pos: position{line: 2198, col: 1, offset: 67690}, expr: &seqExpr{ - pos: position{line: 2198, col: 14, offset: 67722}, + pos: position{line: 2198, col: 14, offset: 67703}, exprs: []any{ &litMatcher{ - pos: position{line: 2198, col: 14, offset: 67722}, + pos: position{line: 2198, col: 14, offset: 67703}, val: "cut", ignoreCase: true, want: "\"CUT\"i", }, ¬Expr{ - pos: position{line: 2198, col: 33, offset: 67741}, + pos: position{line: 2198, col: 33, offset: 67722}, expr: &ruleRefExpr{ - pos: position{line: 2198, col: 34, offset: 67742}, + pos: position{line: 2198, col: 34, offset: 67723}, name: "IdentifierRest", }, }, @@ -15677,20 +15641,20 @@ var g = &grammar{ }, { name: "DEBUG", - pos: position{line: 2199, col: 1, offset: 67757}, + pos: position{line: 2199, col: 1, offset: 67738}, expr: &seqExpr{ - pos: position{line: 2199, col: 14, offset: 67770}, + pos: position{line: 2199, col: 14, offset: 67751}, exprs: []any{ &litMatcher{ - pos: position{line: 2199, col: 14, offset: 67770}, + pos: position{line: 2199, col: 14, offset: 67751}, val: "debug", ignoreCase: true, want: "\"DEBUG\"i", }, ¬Expr{ - pos: position{line: 2199, col: 33, offset: 67789}, + pos: position{line: 2199, col: 33, offset: 67770}, expr: &ruleRefExpr{ - pos: position{line: 2199, col: 34, offset: 67790}, + pos: position{line: 2199, col: 34, offset: 67771}, name: "IdentifierRest", }, }, @@ -15701,20 +15665,20 @@ var g = &grammar{ }, { name: "DEFAULT", - pos: position{line: 2200, col: 1, offset: 67805}, + pos: position{line: 2200, col: 1, offset: 67786}, expr: &seqExpr{ - pos: position{line: 2200, col: 14, offset: 67818}, + pos: position{line: 2200, col: 14, offset: 67799}, exprs: []any{ &litMatcher{ - pos: position{line: 2200, col: 14, offset: 67818}, + pos: position{line: 2200, col: 14, offset: 67799}, val: "default", ignoreCase: true, want: "\"DEFAULT\"i", }, ¬Expr{ - pos: position{line: 2200, col: 33, offset: 67837}, + pos: position{line: 2200, col: 33, offset: 67818}, expr: &ruleRefExpr{ - pos: position{line: 2200, col: 34, offset: 67838}, + pos: position{line: 2200, col: 34, offset: 67819}, name: "IdentifierRest", }, }, @@ -15725,23 +15689,23 @@ var g = &grammar{ }, { name: "DESC", - pos: position{line: 2201, col: 1, offset: 67853}, + pos: position{line: 2201, col: 1, offset: 67834}, expr: &actionExpr{ - pos: position{line: 2201, col: 14, offset: 67866}, + pos: position{line: 2201, col: 14, offset: 67847}, run: (*parser).callonDESC1, expr: &seqExpr{ - pos: position{line: 2201, col: 14, offset: 67866}, + pos: position{line: 2201, col: 14, offset: 67847}, exprs: []any{ &litMatcher{ - pos: position{line: 2201, col: 14, offset: 67866}, + pos: position{line: 2201, col: 14, offset: 67847}, val: "desc", ignoreCase: true, want: "\"DESC\"i", }, ¬Expr{ - pos: position{line: 2201, col: 33, offset: 67885}, + pos: position{line: 2201, col: 33, offset: 67866}, expr: &ruleRefExpr{ - pos: position{line: 2201, col: 34, offset: 67886}, + pos: position{line: 2201, col: 34, offset: 67867}, name: "IdentifierRest", }, }, @@ -15753,20 +15717,20 @@ var g = &grammar{ }, { name: "DISTINCT", - pos: position{line: 2202, col: 1, offset: 67924}, + pos: position{line: 2202, col: 1, offset: 67905}, expr: &seqExpr{ - pos: position{line: 2202, col: 14, offset: 67937}, + pos: position{line: 2202, col: 14, offset: 67918}, exprs: []any{ &litMatcher{ - pos: position{line: 2202, col: 14, offset: 67937}, + pos: position{line: 2202, col: 14, offset: 67918}, val: "distinct", ignoreCase: true, want: "\"DISTINCT\"i", }, ¬Expr{ - pos: position{line: 2202, col: 33, offset: 67956}, + pos: position{line: 2202, col: 33, offset: 67937}, expr: &ruleRefExpr{ - pos: position{line: 2202, col: 34, offset: 67957}, + pos: position{line: 2202, col: 34, offset: 67938}, name: "IdentifierRest", }, }, @@ -15777,20 +15741,20 @@ var g = &grammar{ }, { name: "DROP", - pos: position{line: 2203, col: 1, offset: 67972}, + pos: position{line: 2203, col: 1, offset: 67953}, expr: &seqExpr{ - pos: position{line: 2203, col: 14, offset: 67985}, + pos: position{line: 2203, col: 14, offset: 67966}, exprs: []any{ &litMatcher{ - pos: position{line: 2203, col: 14, offset: 67985}, + pos: position{line: 2203, col: 14, offset: 67966}, val: "drop", ignoreCase: true, want: "\"DROP\"i", }, ¬Expr{ - pos: position{line: 2203, col: 33, offset: 68004}, + pos: position{line: 2203, col: 33, offset: 67985}, expr: &ruleRefExpr{ - pos: position{line: 2203, col: 34, offset: 68005}, + pos: position{line: 2203, col: 34, offset: 67986}, name: "IdentifierRest", }, }, @@ -15801,20 +15765,20 @@ var g = &grammar{ }, { name: "END", - pos: position{line: 2204, col: 1, offset: 68021}, + pos: position{line: 2204, col: 1, offset: 68002}, expr: &seqExpr{ - pos: position{line: 2204, col: 14, offset: 68034}, + pos: position{line: 2204, col: 14, offset: 68015}, exprs: []any{ &litMatcher{ - pos: position{line: 2204, col: 14, offset: 68034}, + pos: position{line: 2204, col: 14, offset: 68015}, val: "end", ignoreCase: true, want: "\"END\"i", }, ¬Expr{ - pos: position{line: 2204, col: 33, offset: 68053}, + pos: position{line: 2204, col: 33, offset: 68034}, expr: &ruleRefExpr{ - pos: position{line: 2204, col: 34, offset: 68054}, + pos: position{line: 2204, col: 34, offset: 68035}, name: "IdentifierRest", }, }, @@ -15825,20 +15789,20 @@ var g = &grammar{ }, { name: "ERROR", - pos: position{line: 2205, col: 1, offset: 68069}, + pos: position{line: 2205, col: 1, offset: 68050}, expr: &seqExpr{ - pos: position{line: 2205, col: 14, offset: 68082}, + pos: position{line: 2205, col: 14, offset: 68063}, exprs: []any{ &litMatcher{ - pos: position{line: 2205, col: 14, offset: 68082}, + pos: position{line: 2205, col: 14, offset: 68063}, val: "error", ignoreCase: true, want: "\"ERROR\"i", }, ¬Expr{ - pos: position{line: 2205, col: 33, offset: 68101}, + pos: position{line: 2205, col: 33, offset: 68082}, expr: &ruleRefExpr{ - pos: position{line: 2205, col: 34, offset: 68102}, + pos: position{line: 2205, col: 34, offset: 68083}, name: "IdentifierRest", }, }, @@ -15849,20 +15813,20 @@ var g = &grammar{ }, { name: "EXPLODE", - pos: position{line: 2206, col: 1, offset: 68117}, + pos: position{line: 2206, col: 1, offset: 68098}, expr: &seqExpr{ - pos: position{line: 2206, col: 14, offset: 68130}, + pos: position{line: 2206, col: 14, offset: 68111}, exprs: []any{ &litMatcher{ - pos: position{line: 2206, col: 14, offset: 68130}, + pos: position{line: 2206, col: 14, offset: 68111}, val: "explode", ignoreCase: true, want: "\"EXPLODE\"i", }, ¬Expr{ - pos: position{line: 2206, col: 33, offset: 68149}, + pos: position{line: 2206, col: 33, offset: 68130}, expr: &ruleRefExpr{ - pos: position{line: 2206, col: 34, offset: 68150}, + pos: position{line: 2206, col: 34, offset: 68131}, name: "IdentifierRest", }, }, @@ -15873,20 +15837,20 @@ var g = &grammar{ }, { name: "FALSE", - pos: position{line: 2207, col: 1, offset: 68165}, + pos: position{line: 2207, col: 1, offset: 68146}, expr: &seqExpr{ - pos: position{line: 2207, col: 14, offset: 68178}, + pos: position{line: 2207, col: 14, offset: 68159}, exprs: []any{ &litMatcher{ - pos: position{line: 2207, col: 14, offset: 68178}, + pos: position{line: 2207, col: 14, offset: 68159}, val: "false", ignoreCase: true, want: "\"FALSE\"i", }, ¬Expr{ - pos: position{line: 2207, col: 33, offset: 68197}, + pos: position{line: 2207, col: 33, offset: 68178}, expr: &ruleRefExpr{ - pos: position{line: 2207, col: 34, offset: 68198}, + pos: position{line: 2207, col: 34, offset: 68179}, name: "IdentifierRest", }, }, @@ -15897,20 +15861,20 @@ var g = &grammar{ }, { name: "FIRST", - pos: position{line: 2208, col: 1, offset: 68213}, + pos: position{line: 2208, col: 1, offset: 68194}, expr: &seqExpr{ - pos: position{line: 2208, col: 14, offset: 68226}, + pos: position{line: 2208, col: 14, offset: 68207}, exprs: []any{ &litMatcher{ - pos: position{line: 2208, col: 14, offset: 68226}, + pos: position{line: 2208, col: 14, offset: 68207}, val: "first", ignoreCase: true, want: "\"FIRST\"i", }, ¬Expr{ - pos: position{line: 2208, col: 33, offset: 68245}, + pos: position{line: 2208, col: 33, offset: 68226}, expr: &ruleRefExpr{ - pos: position{line: 2208, col: 34, offset: 68246}, + pos: position{line: 2208, col: 34, offset: 68227}, name: "IdentifierRest", }, }, @@ -15921,20 +15885,20 @@ var g = &grammar{ }, { name: "FORK", - pos: position{line: 2209, col: 1, offset: 68261}, + pos: position{line: 2209, col: 1, offset: 68242}, expr: &seqExpr{ - pos: position{line: 2209, col: 14, offset: 68274}, + pos: position{line: 2209, col: 14, offset: 68255}, exprs: []any{ &litMatcher{ - pos: position{line: 2209, col: 14, offset: 68274}, + pos: position{line: 2209, col: 14, offset: 68255}, val: "fork", ignoreCase: true, want: "\"FORK\"i", }, ¬Expr{ - pos: position{line: 2209, col: 33, offset: 68293}, + pos: position{line: 2209, col: 33, offset: 68274}, expr: &ruleRefExpr{ - pos: position{line: 2209, col: 34, offset: 68294}, + pos: position{line: 2209, col: 34, offset: 68275}, name: "IdentifierRest", }, }, @@ -15945,20 +15909,20 @@ var g = &grammar{ }, { name: "FORMAT", - pos: position{line: 2210, col: 1, offset: 68309}, + pos: position{line: 2210, col: 1, offset: 68290}, expr: &seqExpr{ - pos: position{line: 2210, col: 14, offset: 68322}, + pos: position{line: 2210, col: 14, offset: 68303}, exprs: []any{ &litMatcher{ - pos: position{line: 2210, col: 14, offset: 68322}, + pos: position{line: 2210, col: 14, offset: 68303}, val: "format", ignoreCase: true, want: "\"FORMAT\"i", }, ¬Expr{ - pos: position{line: 2210, col: 33, offset: 68341}, + pos: position{line: 2210, col: 33, offset: 68322}, expr: &ruleRefExpr{ - pos: position{line: 2210, col: 34, offset: 68342}, + pos: position{line: 2210, col: 34, offset: 68323}, name: "IdentifierRest", }, }, @@ -15969,20 +15933,20 @@ var g = &grammar{ }, { name: "FROM", - pos: position{line: 2211, col: 1, offset: 68357}, + pos: position{line: 2211, col: 1, offset: 68338}, expr: &seqExpr{ - pos: position{line: 2211, col: 14, offset: 68370}, + pos: position{line: 2211, col: 14, offset: 68351}, exprs: []any{ &litMatcher{ - pos: position{line: 2211, col: 14, offset: 68370}, + pos: position{line: 2211, col: 14, offset: 68351}, val: "from", ignoreCase: true, want: "\"FROM\"i", }, ¬Expr{ - pos: position{line: 2211, col: 33, offset: 68389}, + pos: position{line: 2211, col: 33, offset: 68370}, expr: &ruleRefExpr{ - pos: position{line: 2211, col: 34, offset: 68390}, + pos: position{line: 2211, col: 34, offset: 68371}, name: "IdentifierRest", }, }, @@ -15993,20 +15957,20 @@ var g = &grammar{ }, { name: "FULL", - pos: position{line: 2212, col: 1, offset: 68405}, + pos: position{line: 2212, col: 1, offset: 68386}, expr: &seqExpr{ - pos: position{line: 2212, col: 14, offset: 68418}, + pos: position{line: 2212, col: 14, offset: 68399}, exprs: []any{ &litMatcher{ - pos: position{line: 2212, col: 14, offset: 68418}, + pos: position{line: 2212, col: 14, offset: 68399}, val: "full", ignoreCase: true, want: "\"FULL\"i", }, ¬Expr{ - pos: position{line: 2212, col: 33, offset: 68437}, + pos: position{line: 2212, col: 33, offset: 68418}, expr: &ruleRefExpr{ - pos: position{line: 2212, col: 34, offset: 68438}, + pos: position{line: 2212, col: 34, offset: 68419}, name: "IdentifierRest", }, }, @@ -16017,20 +15981,20 @@ var g = &grammar{ }, { name: "FUNC", - pos: position{line: 2213, col: 1, offset: 68453}, + pos: position{line: 2213, col: 1, offset: 68434}, expr: &seqExpr{ - pos: position{line: 2213, col: 14, offset: 68466}, + pos: position{line: 2213, col: 14, offset: 68447}, exprs: []any{ &litMatcher{ - pos: position{line: 2213, col: 14, offset: 68466}, + pos: position{line: 2213, col: 14, offset: 68447}, val: "func", ignoreCase: true, want: "\"FUNC\"i", }, ¬Expr{ - pos: position{line: 2213, col: 33, offset: 68485}, + pos: position{line: 2213, col: 33, offset: 68466}, expr: &ruleRefExpr{ - pos: position{line: 2213, col: 34, offset: 68486}, + pos: position{line: 2213, col: 34, offset: 68467}, name: "IdentifierRest", }, }, @@ -16041,20 +16005,20 @@ var g = &grammar{ }, { name: "FUSE", - pos: position{line: 2214, col: 1, offset: 68501}, + pos: position{line: 2214, col: 1, offset: 68482}, expr: &seqExpr{ - pos: position{line: 2214, col: 14, offset: 68514}, + pos: position{line: 2214, col: 14, offset: 68495}, exprs: []any{ &litMatcher{ - pos: position{line: 2214, col: 14, offset: 68514}, + pos: position{line: 2214, col: 14, offset: 68495}, val: "fuse", ignoreCase: true, want: "\"FUSE\"i", }, ¬Expr{ - pos: position{line: 2214, col: 33, offset: 68533}, + pos: position{line: 2214, col: 33, offset: 68514}, expr: &ruleRefExpr{ - pos: position{line: 2214, col: 34, offset: 68534}, + pos: position{line: 2214, col: 34, offset: 68515}, name: "IdentifierRest", }, }, @@ -16065,20 +16029,20 @@ var g = &grammar{ }, { name: "GREP", - pos: position{line: 2215, col: 1, offset: 68549}, + pos: position{line: 2215, col: 1, offset: 68530}, expr: &seqExpr{ - pos: position{line: 2215, col: 14, offset: 68562}, + pos: position{line: 2215, col: 14, offset: 68543}, exprs: []any{ &litMatcher{ - pos: position{line: 2215, col: 14, offset: 68562}, + pos: position{line: 2215, col: 14, offset: 68543}, val: "grep", ignoreCase: true, want: "\"GREP\"i", }, ¬Expr{ - pos: position{line: 2215, col: 33, offset: 68581}, + pos: position{line: 2215, col: 33, offset: 68562}, expr: &ruleRefExpr{ - pos: position{line: 2215, col: 34, offset: 68582}, + pos: position{line: 2215, col: 34, offset: 68563}, name: "IdentifierRest", }, }, @@ -16089,20 +16053,20 @@ var g = &grammar{ }, { name: "GROUP", - pos: position{line: 2216, col: 1, offset: 68597}, + pos: position{line: 2216, col: 1, offset: 68578}, expr: &seqExpr{ - pos: position{line: 2216, col: 14, offset: 68610}, + pos: position{line: 2216, col: 14, offset: 68591}, exprs: []any{ &litMatcher{ - pos: position{line: 2216, col: 14, offset: 68610}, + pos: position{line: 2216, col: 14, offset: 68591}, val: "group", ignoreCase: true, want: "\"GROUP\"i", }, ¬Expr{ - pos: position{line: 2216, col: 33, offset: 68629}, + pos: position{line: 2216, col: 33, offset: 68610}, expr: &ruleRefExpr{ - pos: position{line: 2216, col: 34, offset: 68630}, + pos: position{line: 2216, col: 34, offset: 68611}, name: "IdentifierRest", }, }, @@ -16113,20 +16077,20 @@ var g = &grammar{ }, { name: "HAVING", - pos: position{line: 2217, col: 1, offset: 68645}, + pos: position{line: 2217, col: 1, offset: 68626}, expr: &seqExpr{ - pos: position{line: 2217, col: 14, offset: 68658}, + pos: position{line: 2217, col: 14, offset: 68639}, exprs: []any{ &litMatcher{ - pos: position{line: 2217, col: 14, offset: 68658}, + pos: position{line: 2217, col: 14, offset: 68639}, val: "having", ignoreCase: true, want: "\"HAVING\"i", }, ¬Expr{ - pos: position{line: 2217, col: 33, offset: 68677}, + pos: position{line: 2217, col: 33, offset: 68658}, expr: &ruleRefExpr{ - pos: position{line: 2217, col: 34, offset: 68678}, + pos: position{line: 2217, col: 34, offset: 68659}, name: "IdentifierRest", }, }, @@ -16137,20 +16101,20 @@ var g = &grammar{ }, { name: "HEAD", - pos: position{line: 2218, col: 1, offset: 68693}, + pos: position{line: 2218, col: 1, offset: 68674}, expr: &seqExpr{ - pos: position{line: 2218, col: 14, offset: 68706}, + pos: position{line: 2218, col: 14, offset: 68687}, exprs: []any{ &litMatcher{ - pos: position{line: 2218, col: 14, offset: 68706}, + pos: position{line: 2218, col: 14, offset: 68687}, val: "head", ignoreCase: true, want: "\"HEAD\"i", }, ¬Expr{ - pos: position{line: 2218, col: 33, offset: 68725}, + pos: position{line: 2218, col: 33, offset: 68706}, expr: &ruleRefExpr{ - pos: position{line: 2218, col: 34, offset: 68726}, + pos: position{line: 2218, col: 34, offset: 68707}, name: "IdentifierRest", }, }, @@ -16161,20 +16125,20 @@ var g = &grammar{ }, { name: "HEADERS", - pos: position{line: 2219, col: 1, offset: 68742}, + pos: position{line: 2219, col: 1, offset: 68723}, expr: &seqExpr{ - pos: position{line: 2219, col: 14, offset: 68755}, + pos: position{line: 2219, col: 14, offset: 68736}, exprs: []any{ &litMatcher{ - pos: position{line: 2219, col: 14, offset: 68755}, + pos: position{line: 2219, col: 14, offset: 68736}, val: "headers", ignoreCase: true, want: "\"HEADERS\"i", }, ¬Expr{ - pos: position{line: 2219, col: 33, offset: 68774}, + pos: position{line: 2219, col: 33, offset: 68755}, expr: &ruleRefExpr{ - pos: position{line: 2219, col: 34, offset: 68775}, + pos: position{line: 2219, col: 34, offset: 68756}, name: "IdentifierRest", }, }, @@ -16185,20 +16149,20 @@ var g = &grammar{ }, { name: "IN", - pos: position{line: 2220, col: 1, offset: 68790}, + pos: position{line: 2220, col: 1, offset: 68771}, expr: &seqExpr{ - pos: position{line: 2220, col: 14, offset: 68803}, + pos: position{line: 2220, col: 14, offset: 68784}, exprs: []any{ &litMatcher{ - pos: position{line: 2220, col: 14, offset: 68803}, + pos: position{line: 2220, col: 14, offset: 68784}, val: "in", ignoreCase: true, want: "\"IN\"i", }, ¬Expr{ - pos: position{line: 2220, col: 33, offset: 68822}, + pos: position{line: 2220, col: 33, offset: 68803}, expr: &ruleRefExpr{ - pos: position{line: 2220, col: 34, offset: 68823}, + pos: position{line: 2220, col: 34, offset: 68804}, name: "IdentifierRest", }, }, @@ -16209,20 +16173,20 @@ var g = &grammar{ }, { name: "INNER", - pos: position{line: 2221, col: 1, offset: 68838}, + pos: position{line: 2221, col: 1, offset: 68819}, expr: &seqExpr{ - pos: position{line: 2221, col: 14, offset: 68851}, + pos: position{line: 2221, col: 14, offset: 68832}, exprs: []any{ &litMatcher{ - pos: position{line: 2221, col: 14, offset: 68851}, + pos: position{line: 2221, col: 14, offset: 68832}, val: "inner", ignoreCase: true, want: "\"INNER\"i", }, ¬Expr{ - pos: position{line: 2221, col: 33, offset: 68870}, + pos: position{line: 2221, col: 33, offset: 68851}, expr: &ruleRefExpr{ - pos: position{line: 2221, col: 34, offset: 68871}, + pos: position{line: 2221, col: 34, offset: 68852}, name: "IdentifierRest", }, }, @@ -16233,20 +16197,20 @@ var g = &grammar{ }, { name: "JOIN", - pos: position{line: 2222, col: 1, offset: 68886}, + pos: position{line: 2222, col: 1, offset: 68867}, expr: &seqExpr{ - pos: position{line: 2222, col: 14, offset: 68899}, + pos: position{line: 2222, col: 14, offset: 68880}, exprs: []any{ &litMatcher{ - pos: position{line: 2222, col: 14, offset: 68899}, + pos: position{line: 2222, col: 14, offset: 68880}, val: "join", ignoreCase: true, want: "\"JOIN\"i", }, ¬Expr{ - pos: position{line: 2222, col: 33, offset: 68918}, + pos: position{line: 2222, col: 33, offset: 68899}, expr: &ruleRefExpr{ - pos: position{line: 2222, col: 34, offset: 68919}, + pos: position{line: 2222, col: 34, offset: 68900}, name: "IdentifierRest", }, }, @@ -16257,20 +16221,20 @@ var g = &grammar{ }, { name: "LAST", - pos: position{line: 2223, col: 1, offset: 68934}, + pos: position{line: 2223, col: 1, offset: 68915}, expr: &seqExpr{ - pos: position{line: 2223, col: 14, offset: 68947}, + pos: position{line: 2223, col: 14, offset: 68928}, exprs: []any{ &litMatcher{ - pos: position{line: 2223, col: 14, offset: 68947}, + pos: position{line: 2223, col: 14, offset: 68928}, val: "last", ignoreCase: true, want: "\"LAST\"i", }, ¬Expr{ - pos: position{line: 2223, col: 33, offset: 68966}, + pos: position{line: 2223, col: 33, offset: 68947}, expr: &ruleRefExpr{ - pos: position{line: 2223, col: 34, offset: 68967}, + pos: position{line: 2223, col: 34, offset: 68948}, name: "IdentifierRest", }, }, @@ -16281,20 +16245,20 @@ var g = &grammar{ }, { name: "LEFT", - pos: position{line: 2224, col: 1, offset: 68982}, + pos: position{line: 2224, col: 1, offset: 68963}, expr: &seqExpr{ - pos: position{line: 2224, col: 14, offset: 68995}, + pos: position{line: 2224, col: 14, offset: 68976}, exprs: []any{ &litMatcher{ - pos: position{line: 2224, col: 14, offset: 68995}, + pos: position{line: 2224, col: 14, offset: 68976}, val: "left", ignoreCase: true, want: "\"LEFT\"i", }, ¬Expr{ - pos: position{line: 2224, col: 33, offset: 69014}, + pos: position{line: 2224, col: 33, offset: 68995}, expr: &ruleRefExpr{ - pos: position{line: 2224, col: 34, offset: 69015}, + pos: position{line: 2224, col: 34, offset: 68996}, name: "IdentifierRest", }, }, @@ -16305,20 +16269,20 @@ var g = &grammar{ }, { name: "LIKE", - pos: position{line: 2225, col: 1, offset: 69030}, + pos: position{line: 2225, col: 1, offset: 69011}, expr: &seqExpr{ - pos: position{line: 2225, col: 14, offset: 69043}, + pos: position{line: 2225, col: 14, offset: 69024}, exprs: []any{ &litMatcher{ - pos: position{line: 2225, col: 14, offset: 69043}, + pos: position{line: 2225, col: 14, offset: 69024}, val: "like", ignoreCase: true, want: "\"LIKE\"i", }, ¬Expr{ - pos: position{line: 2225, col: 32, offset: 69061}, + pos: position{line: 2225, col: 32, offset: 69042}, expr: &ruleRefExpr{ - pos: position{line: 2225, col: 33, offset: 69062}, + pos: position{line: 2225, col: 33, offset: 69043}, name: "IdentifierRest", }, }, @@ -16329,20 +16293,20 @@ var g = &grammar{ }, { name: "LIMIT", - pos: position{line: 2226, col: 1, offset: 69077}, + pos: position{line: 2226, col: 1, offset: 69058}, expr: &seqExpr{ - pos: position{line: 2226, col: 14, offset: 69090}, + pos: position{line: 2226, col: 14, offset: 69071}, exprs: []any{ &litMatcher{ - pos: position{line: 2226, col: 14, offset: 69090}, + pos: position{line: 2226, col: 14, offset: 69071}, val: "limit", ignoreCase: true, want: "\"LIMIT\"i", }, ¬Expr{ - pos: position{line: 2226, col: 33, offset: 69109}, + pos: position{line: 2226, col: 33, offset: 69090}, expr: &ruleRefExpr{ - pos: position{line: 2226, col: 34, offset: 69110}, + pos: position{line: 2226, col: 34, offset: 69091}, name: "IdentifierRest", }, }, @@ -16353,20 +16317,20 @@ var g = &grammar{ }, { name: "LOAD", - pos: position{line: 2227, col: 1, offset: 69125}, + pos: position{line: 2227, col: 1, offset: 69106}, expr: &seqExpr{ - pos: position{line: 2227, col: 14, offset: 69138}, + pos: position{line: 2227, col: 14, offset: 69119}, exprs: []any{ &litMatcher{ - pos: position{line: 2227, col: 14, offset: 69138}, + pos: position{line: 2227, col: 14, offset: 69119}, val: "load", ignoreCase: true, want: "\"LOAD\"i", }, ¬Expr{ - pos: position{line: 2227, col: 33, offset: 69157}, + pos: position{line: 2227, col: 33, offset: 69138}, expr: &ruleRefExpr{ - pos: position{line: 2227, col: 34, offset: 69158}, + pos: position{line: 2227, col: 34, offset: 69139}, name: "IdentifierRest", }, }, @@ -16377,20 +16341,20 @@ var g = &grammar{ }, { name: "MATERIALIZED", - pos: position{line: 2228, col: 1, offset: 69173}, + pos: position{line: 2228, col: 1, offset: 69154}, expr: &seqExpr{ - pos: position{line: 2228, col: 16, offset: 69188}, + pos: position{line: 2228, col: 16, offset: 69169}, exprs: []any{ &litMatcher{ - pos: position{line: 2228, col: 16, offset: 69188}, + pos: position{line: 2228, col: 16, offset: 69169}, val: "materialized", ignoreCase: true, want: "\"MATERIALIZED\"i", }, ¬Expr{ - pos: position{line: 2228, col: 33, offset: 69205}, + pos: position{line: 2228, col: 33, offset: 69186}, expr: &ruleRefExpr{ - pos: position{line: 2228, col: 34, offset: 69206}, + pos: position{line: 2228, col: 34, offset: 69187}, name: "IdentifierRest", }, }, @@ -16401,20 +16365,20 @@ var g = &grammar{ }, { name: "MERGE", - pos: position{line: 2229, col: 1, offset: 69221}, + pos: position{line: 2229, col: 1, offset: 69202}, expr: &seqExpr{ - pos: position{line: 2229, col: 14, offset: 69234}, + pos: position{line: 2229, col: 14, offset: 69215}, exprs: []any{ &litMatcher{ - pos: position{line: 2229, col: 14, offset: 69234}, + pos: position{line: 2229, col: 14, offset: 69215}, val: "merge", ignoreCase: true, want: "\"MERGE\"i", }, ¬Expr{ - pos: position{line: 2229, col: 33, offset: 69253}, + pos: position{line: 2229, col: 33, offset: 69234}, expr: &ruleRefExpr{ - pos: position{line: 2229, col: 34, offset: 69254}, + pos: position{line: 2229, col: 34, offset: 69235}, name: "IdentifierRest", }, }, @@ -16425,20 +16389,20 @@ var g = &grammar{ }, { name: "MESSAGE", - pos: position{line: 2230, col: 1, offset: 69269}, + pos: position{line: 2230, col: 1, offset: 69250}, expr: &seqExpr{ - pos: position{line: 2230, col: 14, offset: 69282}, + pos: position{line: 2230, col: 14, offset: 69263}, exprs: []any{ &litMatcher{ - pos: position{line: 2230, col: 14, offset: 69282}, + pos: position{line: 2230, col: 14, offset: 69263}, val: "message", ignoreCase: true, want: "\"MESSAGE\"i", }, ¬Expr{ - pos: position{line: 2230, col: 33, offset: 69301}, + pos: position{line: 2230, col: 33, offset: 69282}, expr: &ruleRefExpr{ - pos: position{line: 2230, col: 34, offset: 69302}, + pos: position{line: 2230, col: 34, offset: 69283}, name: "IdentifierRest", }, }, @@ -16449,20 +16413,20 @@ var g = &grammar{ }, { name: "META", - pos: position{line: 2231, col: 1, offset: 69317}, + pos: position{line: 2231, col: 1, offset: 69298}, expr: &seqExpr{ - pos: position{line: 2231, col: 14, offset: 69330}, + pos: position{line: 2231, col: 14, offset: 69311}, exprs: []any{ &litMatcher{ - pos: position{line: 2231, col: 14, offset: 69330}, + pos: position{line: 2231, col: 14, offset: 69311}, val: "meta", ignoreCase: true, want: "\"META\"i", }, ¬Expr{ - pos: position{line: 2231, col: 33, offset: 69349}, + pos: position{line: 2231, col: 33, offset: 69330}, expr: &ruleRefExpr{ - pos: position{line: 2231, col: 34, offset: 69350}, + pos: position{line: 2231, col: 34, offset: 69331}, name: "IdentifierRest", }, }, @@ -16473,20 +16437,20 @@ var g = &grammar{ }, { name: "METHOD", - pos: position{line: 2232, col: 1, offset: 69365}, + pos: position{line: 2232, col: 1, offset: 69346}, expr: &seqExpr{ - pos: position{line: 2232, col: 14, offset: 69378}, + pos: position{line: 2232, col: 14, offset: 69359}, exprs: []any{ &litMatcher{ - pos: position{line: 2232, col: 14, offset: 69378}, + pos: position{line: 2232, col: 14, offset: 69359}, val: "method", ignoreCase: true, want: "\"METHOD\"i", }, ¬Expr{ - pos: position{line: 2232, col: 33, offset: 69397}, + pos: position{line: 2232, col: 33, offset: 69378}, expr: &ruleRefExpr{ - pos: position{line: 2232, col: 34, offset: 69398}, + pos: position{line: 2232, col: 34, offset: 69379}, name: "IdentifierRest", }, }, @@ -16497,20 +16461,20 @@ var g = &grammar{ }, { name: "NOT", - pos: position{line: 2233, col: 1, offset: 69413}, + pos: position{line: 2233, col: 1, offset: 69394}, expr: &seqExpr{ - pos: position{line: 2233, col: 14, offset: 69426}, + pos: position{line: 2233, col: 14, offset: 69407}, exprs: []any{ &litMatcher{ - pos: position{line: 2233, col: 14, offset: 69426}, + pos: position{line: 2233, col: 14, offset: 69407}, val: "not", ignoreCase: true, want: "\"NOT\"i", }, ¬Expr{ - pos: position{line: 2233, col: 33, offset: 69445}, + pos: position{line: 2233, col: 33, offset: 69426}, expr: &ruleRefExpr{ - pos: position{line: 2233, col: 34, offset: 69446}, + pos: position{line: 2233, col: 34, offset: 69427}, name: "IdentifierRest", }, }, @@ -16521,20 +16485,20 @@ var g = &grammar{ }, { name: "NULL", - pos: position{line: 2234, col: 1, offset: 69461}, + pos: position{line: 2234, col: 1, offset: 69442}, expr: &seqExpr{ - pos: position{line: 2234, col: 14, offset: 69474}, + pos: position{line: 2234, col: 14, offset: 69455}, exprs: []any{ &litMatcher{ - pos: position{line: 2234, col: 14, offset: 69474}, + pos: position{line: 2234, col: 14, offset: 69455}, val: "null", ignoreCase: true, want: "\"NULL\"i", }, ¬Expr{ - pos: position{line: 2234, col: 33, offset: 69493}, + pos: position{line: 2234, col: 33, offset: 69474}, expr: &ruleRefExpr{ - pos: position{line: 2234, col: 34, offset: 69494}, + pos: position{line: 2234, col: 34, offset: 69475}, name: "IdentifierRest", }, }, @@ -16545,20 +16509,20 @@ var g = &grammar{ }, { name: "NULLS", - pos: position{line: 2235, col: 1, offset: 69509}, + pos: position{line: 2235, col: 1, offset: 69490}, expr: &seqExpr{ - pos: position{line: 2235, col: 14, offset: 69522}, + pos: position{line: 2235, col: 14, offset: 69503}, exprs: []any{ &litMatcher{ - pos: position{line: 2235, col: 14, offset: 69522}, + pos: position{line: 2235, col: 14, offset: 69503}, val: "nulls", ignoreCase: true, want: "\"NULLS\"i", }, ¬Expr{ - pos: position{line: 2235, col: 33, offset: 69541}, + pos: position{line: 2235, col: 33, offset: 69522}, expr: &ruleRefExpr{ - pos: position{line: 2235, col: 34, offset: 69542}, + pos: position{line: 2235, col: 34, offset: 69523}, name: "IdentifierRest", }, }, @@ -16569,20 +16533,20 @@ var g = &grammar{ }, { name: "OFFSET", - pos: position{line: 2236, col: 1, offset: 69557}, + pos: position{line: 2236, col: 1, offset: 69538}, expr: &seqExpr{ - pos: position{line: 2236, col: 14, offset: 69570}, + pos: position{line: 2236, col: 14, offset: 69551}, exprs: []any{ &litMatcher{ - pos: position{line: 2236, col: 14, offset: 69570}, + pos: position{line: 2236, col: 14, offset: 69551}, val: "offset", ignoreCase: true, want: "\"OFFSET\"i", }, ¬Expr{ - pos: position{line: 2236, col: 33, offset: 69589}, + pos: position{line: 2236, col: 33, offset: 69570}, expr: &ruleRefExpr{ - pos: position{line: 2236, col: 34, offset: 69590}, + pos: position{line: 2236, col: 34, offset: 69571}, name: "IdentifierRest", }, }, @@ -16593,20 +16557,20 @@ var g = &grammar{ }, { name: "ON", - pos: position{line: 2237, col: 1, offset: 69605}, + pos: position{line: 2237, col: 1, offset: 69586}, expr: &seqExpr{ - pos: position{line: 2237, col: 14, offset: 69618}, + pos: position{line: 2237, col: 14, offset: 69599}, exprs: []any{ &litMatcher{ - pos: position{line: 2237, col: 14, offset: 69618}, + pos: position{line: 2237, col: 14, offset: 69599}, val: "on", ignoreCase: true, want: "\"ON\"i", }, ¬Expr{ - pos: position{line: 2237, col: 33, offset: 69637}, + pos: position{line: 2237, col: 33, offset: 69618}, expr: &ruleRefExpr{ - pos: position{line: 2237, col: 34, offset: 69638}, + pos: position{line: 2237, col: 34, offset: 69619}, name: "IdentifierRest", }, }, @@ -16617,20 +16581,20 @@ var g = &grammar{ }, { name: "OP", - pos: position{line: 2238, col: 1, offset: 69653}, + pos: position{line: 2238, col: 1, offset: 69634}, expr: &seqExpr{ - pos: position{line: 2238, col: 14, offset: 69666}, + pos: position{line: 2238, col: 14, offset: 69647}, exprs: []any{ &litMatcher{ - pos: position{line: 2238, col: 14, offset: 69666}, + pos: position{line: 2238, col: 14, offset: 69647}, val: "op", ignoreCase: true, want: "\"OP\"i", }, ¬Expr{ - pos: position{line: 2238, col: 33, offset: 69685}, + pos: position{line: 2238, col: 33, offset: 69666}, expr: &ruleRefExpr{ - pos: position{line: 2238, col: 34, offset: 69686}, + pos: position{line: 2238, col: 34, offset: 69667}, name: "IdentifierRest", }, }, @@ -16641,23 +16605,23 @@ var g = &grammar{ }, { name: "OR", - pos: position{line: 2239, col: 1, offset: 69701}, + pos: position{line: 2239, col: 1, offset: 69682}, expr: &actionExpr{ - pos: position{line: 2239, col: 14, offset: 69714}, + pos: position{line: 2239, col: 14, offset: 69695}, run: (*parser).callonOR1, expr: &seqExpr{ - pos: position{line: 2239, col: 14, offset: 69714}, + pos: position{line: 2239, col: 14, offset: 69695}, exprs: []any{ &litMatcher{ - pos: position{line: 2239, col: 14, offset: 69714}, + pos: position{line: 2239, col: 14, offset: 69695}, val: "or", ignoreCase: true, want: "\"OR\"i", }, ¬Expr{ - pos: position{line: 2239, col: 33, offset: 69733}, + pos: position{line: 2239, col: 33, offset: 69714}, expr: &ruleRefExpr{ - pos: position{line: 2239, col: 34, offset: 69734}, + pos: position{line: 2239, col: 34, offset: 69715}, name: "IdentifierRest", }, }, @@ -16669,20 +16633,20 @@ var g = &grammar{ }, { name: "ORDER", - pos: position{line: 2240, col: 1, offset: 69770}, + pos: position{line: 2240, col: 1, offset: 69751}, expr: &seqExpr{ - pos: position{line: 2240, col: 14, offset: 69783}, + pos: position{line: 2240, col: 14, offset: 69764}, exprs: []any{ &litMatcher{ - pos: position{line: 2240, col: 14, offset: 69783}, + pos: position{line: 2240, col: 14, offset: 69764}, val: "order", ignoreCase: true, want: "\"ORDER\"i", }, ¬Expr{ - pos: position{line: 2240, col: 33, offset: 69802}, + pos: position{line: 2240, col: 33, offset: 69783}, expr: &ruleRefExpr{ - pos: position{line: 2240, col: 34, offset: 69803}, + pos: position{line: 2240, col: 34, offset: 69784}, name: "IdentifierRest", }, }, @@ -16693,20 +16657,20 @@ var g = &grammar{ }, { name: "ORDINALITY", - pos: position{line: 2241, col: 1, offset: 69818}, + pos: position{line: 2241, col: 1, offset: 69799}, expr: &seqExpr{ - pos: position{line: 2241, col: 14, offset: 69831}, + pos: position{line: 2241, col: 14, offset: 69812}, exprs: []any{ &litMatcher{ - pos: position{line: 2241, col: 14, offset: 69831}, + pos: position{line: 2241, col: 14, offset: 69812}, val: "ordinality", ignoreCase: true, want: "\"ORDINALITY\"i", }, ¬Expr{ - pos: position{line: 2241, col: 33, offset: 69850}, + pos: position{line: 2241, col: 33, offset: 69831}, expr: &ruleRefExpr{ - pos: position{line: 2241, col: 34, offset: 69851}, + pos: position{line: 2241, col: 34, offset: 69832}, name: "IdentifierRest", }, }, @@ -16717,20 +16681,20 @@ var g = &grammar{ }, { name: "OUTER", - pos: position{line: 2242, col: 1, offset: 69866}, + pos: position{line: 2242, col: 1, offset: 69847}, expr: &seqExpr{ - pos: position{line: 2242, col: 14, offset: 69879}, + pos: position{line: 2242, col: 14, offset: 69860}, exprs: []any{ &litMatcher{ - pos: position{line: 2242, col: 14, offset: 69879}, + pos: position{line: 2242, col: 14, offset: 69860}, val: "outer", ignoreCase: true, want: "\"OUTER\"i", }, ¬Expr{ - pos: position{line: 2242, col: 33, offset: 69898}, + pos: position{line: 2242, col: 33, offset: 69879}, expr: &ruleRefExpr{ - pos: position{line: 2242, col: 34, offset: 69899}, + pos: position{line: 2242, col: 34, offset: 69880}, name: "IdentifierRest", }, }, @@ -16741,20 +16705,20 @@ var g = &grammar{ }, { name: "OUTPUT", - pos: position{line: 2243, col: 1, offset: 69914}, + pos: position{line: 2243, col: 1, offset: 69895}, expr: &seqExpr{ - pos: position{line: 2243, col: 14, offset: 69927}, + pos: position{line: 2243, col: 14, offset: 69908}, exprs: []any{ &litMatcher{ - pos: position{line: 2243, col: 14, offset: 69927}, + pos: position{line: 2243, col: 14, offset: 69908}, val: "output", ignoreCase: true, want: "\"OUTPUT\"i", }, ¬Expr{ - pos: position{line: 2243, col: 33, offset: 69946}, + pos: position{line: 2243, col: 33, offset: 69927}, expr: &ruleRefExpr{ - pos: position{line: 2243, col: 34, offset: 69947}, + pos: position{line: 2243, col: 34, offset: 69928}, name: "IdentifierRest", }, }, @@ -16765,20 +16729,20 @@ var g = &grammar{ }, { name: "OVER", - pos: position{line: 2244, col: 1, offset: 69962}, + pos: position{line: 2244, col: 1, offset: 69943}, expr: &seqExpr{ - pos: position{line: 2244, col: 14, offset: 69975}, + pos: position{line: 2244, col: 14, offset: 69956}, exprs: []any{ &litMatcher{ - pos: position{line: 2244, col: 14, offset: 69975}, + pos: position{line: 2244, col: 14, offset: 69956}, val: "over", ignoreCase: true, want: "\"OVER\"i", }, ¬Expr{ - pos: position{line: 2244, col: 33, offset: 69994}, + pos: position{line: 2244, col: 33, offset: 69975}, expr: &ruleRefExpr{ - pos: position{line: 2244, col: 34, offset: 69995}, + pos: position{line: 2244, col: 34, offset: 69976}, name: "IdentifierRest", }, }, @@ -16789,20 +16753,20 @@ var g = &grammar{ }, { name: "PASS", - pos: position{line: 2245, col: 1, offset: 70010}, + pos: position{line: 2245, col: 1, offset: 69991}, expr: &seqExpr{ - pos: position{line: 2245, col: 14, offset: 70023}, + pos: position{line: 2245, col: 14, offset: 70004}, exprs: []any{ &litMatcher{ - pos: position{line: 2245, col: 14, offset: 70023}, + pos: position{line: 2245, col: 14, offset: 70004}, val: "pass", ignoreCase: true, want: "\"PASS\"i", }, ¬Expr{ - pos: position{line: 2245, col: 33, offset: 70042}, + pos: position{line: 2245, col: 33, offset: 70023}, expr: &ruleRefExpr{ - pos: position{line: 2245, col: 34, offset: 70043}, + pos: position{line: 2245, col: 34, offset: 70024}, name: "IdentifierRest", }, }, @@ -16813,20 +16777,20 @@ var g = &grammar{ }, { name: "PUT", - pos: position{line: 2246, col: 1, offset: 70058}, + pos: position{line: 2246, col: 1, offset: 70039}, expr: &seqExpr{ - pos: position{line: 2246, col: 14, offset: 70071}, + pos: position{line: 2246, col: 14, offset: 70052}, exprs: []any{ &litMatcher{ - pos: position{line: 2246, col: 14, offset: 70071}, + pos: position{line: 2246, col: 14, offset: 70052}, val: "put", ignoreCase: true, want: "\"PUT\"i", }, ¬Expr{ - pos: position{line: 2246, col: 33, offset: 70090}, + pos: position{line: 2246, col: 33, offset: 70071}, expr: &ruleRefExpr{ - pos: position{line: 2246, col: 34, offset: 70091}, + pos: position{line: 2246, col: 34, offset: 70072}, name: "IdentifierRest", }, }, @@ -16837,20 +16801,20 @@ var g = &grammar{ }, { name: "RECURSIVE", - pos: position{line: 2247, col: 1, offset: 70106}, + pos: position{line: 2247, col: 1, offset: 70087}, expr: &seqExpr{ - pos: position{line: 2247, col: 14, offset: 70119}, + pos: position{line: 2247, col: 14, offset: 70100}, exprs: []any{ &litMatcher{ - pos: position{line: 2247, col: 14, offset: 70119}, + pos: position{line: 2247, col: 14, offset: 70100}, val: "RECURSIVE", ignoreCase: false, want: "\"RECURSIVE\"", }, ¬Expr{ - pos: position{line: 2247, col: 33, offset: 70138}, + pos: position{line: 2247, col: 33, offset: 70119}, expr: &ruleRefExpr{ - pos: position{line: 2247, col: 34, offset: 70139}, + pos: position{line: 2247, col: 34, offset: 70120}, name: "IdentifierRest", }, }, @@ -16861,20 +16825,20 @@ var g = &grammar{ }, { name: "REGEXP", - pos: position{line: 2248, col: 1, offset: 70154}, + pos: position{line: 2248, col: 1, offset: 70135}, expr: &seqExpr{ - pos: position{line: 2248, col: 14, offset: 70167}, + pos: position{line: 2248, col: 14, offset: 70148}, exprs: []any{ &litMatcher{ - pos: position{line: 2248, col: 14, offset: 70167}, + pos: position{line: 2248, col: 14, offset: 70148}, val: "regexp", ignoreCase: true, want: "\"REGEXP\"i", }, ¬Expr{ - pos: position{line: 2248, col: 33, offset: 70186}, + pos: position{line: 2248, col: 33, offset: 70167}, expr: &ruleRefExpr{ - pos: position{line: 2248, col: 34, offset: 70187}, + pos: position{line: 2248, col: 34, offset: 70168}, name: "IdentifierRest", }, }, @@ -16885,20 +16849,20 @@ var g = &grammar{ }, { name: "REGEXP_REPLACE", - pos: position{line: 2249, col: 1, offset: 70202}, + pos: position{line: 2249, col: 1, offset: 70183}, expr: &seqExpr{ - pos: position{line: 2249, col: 18, offset: 70219}, + pos: position{line: 2249, col: 18, offset: 70200}, exprs: []any{ &litMatcher{ - pos: position{line: 2249, col: 18, offset: 70219}, + pos: position{line: 2249, col: 18, offset: 70200}, val: "regexp_replace", ignoreCase: true, want: "\"REGEXP_REPLACE\"i", }, ¬Expr{ - pos: position{line: 2249, col: 36, offset: 70237}, + pos: position{line: 2249, col: 36, offset: 70218}, expr: &ruleRefExpr{ - pos: position{line: 2249, col: 37, offset: 70238}, + pos: position{line: 2249, col: 37, offset: 70219}, name: "IdentifierRest", }, }, @@ -16909,20 +16873,20 @@ var g = &grammar{ }, { name: "RENAME", - pos: position{line: 2250, col: 1, offset: 70253}, + pos: position{line: 2250, col: 1, offset: 70234}, expr: &seqExpr{ - pos: position{line: 2250, col: 14, offset: 70266}, + pos: position{line: 2250, col: 14, offset: 70247}, exprs: []any{ &litMatcher{ - pos: position{line: 2250, col: 14, offset: 70266}, + pos: position{line: 2250, col: 14, offset: 70247}, val: "rename", ignoreCase: true, want: "\"RENAME\"i", }, ¬Expr{ - pos: position{line: 2250, col: 33, offset: 70285}, + pos: position{line: 2250, col: 33, offset: 70266}, expr: &ruleRefExpr{ - pos: position{line: 2250, col: 34, offset: 70286}, + pos: position{line: 2250, col: 34, offset: 70267}, name: "IdentifierRest", }, }, @@ -16933,20 +16897,20 @@ var g = &grammar{ }, { name: "RIGHT", - pos: position{line: 2251, col: 1, offset: 70301}, + pos: position{line: 2251, col: 1, offset: 70282}, expr: &seqExpr{ - pos: position{line: 2251, col: 14, offset: 70314}, + pos: position{line: 2251, col: 14, offset: 70295}, exprs: []any{ &litMatcher{ - pos: position{line: 2251, col: 14, offset: 70314}, + pos: position{line: 2251, col: 14, offset: 70295}, val: "right", ignoreCase: true, want: "\"RIGHT\"i", }, ¬Expr{ - pos: position{line: 2251, col: 33, offset: 70333}, + pos: position{line: 2251, col: 33, offset: 70314}, expr: &ruleRefExpr{ - pos: position{line: 2251, col: 34, offset: 70334}, + pos: position{line: 2251, col: 34, offset: 70315}, name: "IdentifierRest", }, }, @@ -16957,20 +16921,20 @@ var g = &grammar{ }, { name: "SAMPLE", - pos: position{line: 2252, col: 1, offset: 70349}, + pos: position{line: 2252, col: 1, offset: 70330}, expr: &seqExpr{ - pos: position{line: 2252, col: 14, offset: 70362}, + pos: position{line: 2252, col: 14, offset: 70343}, exprs: []any{ &litMatcher{ - pos: position{line: 2252, col: 14, offset: 70362}, + pos: position{line: 2252, col: 14, offset: 70343}, val: "sample", ignoreCase: true, want: "\"SAMPLE\"i", }, ¬Expr{ - pos: position{line: 2252, col: 33, offset: 70381}, + pos: position{line: 2252, col: 33, offset: 70362}, expr: &ruleRefExpr{ - pos: position{line: 2252, col: 34, offset: 70382}, + pos: position{line: 2252, col: 34, offset: 70363}, name: "IdentifierRest", }, }, @@ -16981,20 +16945,20 @@ var g = &grammar{ }, { name: "SEARCH", - pos: position{line: 2253, col: 1, offset: 70397}, + pos: position{line: 2253, col: 1, offset: 70378}, expr: &seqExpr{ - pos: position{line: 2253, col: 14, offset: 70410}, + pos: position{line: 2253, col: 14, offset: 70391}, exprs: []any{ &litMatcher{ - pos: position{line: 2253, col: 14, offset: 70410}, + pos: position{line: 2253, col: 14, offset: 70391}, val: "search", ignoreCase: true, want: "\"SEARCH\"i", }, ¬Expr{ - pos: position{line: 2253, col: 33, offset: 70429}, + pos: position{line: 2253, col: 33, offset: 70410}, expr: &ruleRefExpr{ - pos: position{line: 2253, col: 34, offset: 70430}, + pos: position{line: 2253, col: 34, offset: 70411}, name: "IdentifierRest", }, }, @@ -17005,20 +16969,20 @@ var g = &grammar{ }, { name: "SELECT", - pos: position{line: 2254, col: 1, offset: 70445}, + pos: position{line: 2254, col: 1, offset: 70426}, expr: &seqExpr{ - pos: position{line: 2254, col: 14, offset: 70458}, + pos: position{line: 2254, col: 14, offset: 70439}, exprs: []any{ &litMatcher{ - pos: position{line: 2254, col: 14, offset: 70458}, + pos: position{line: 2254, col: 14, offset: 70439}, val: "select", ignoreCase: true, want: "\"SELECT\"i", }, ¬Expr{ - pos: position{line: 2254, col: 33, offset: 70477}, + pos: position{line: 2254, col: 33, offset: 70458}, expr: &ruleRefExpr{ - pos: position{line: 2254, col: 34, offset: 70478}, + pos: position{line: 2254, col: 34, offset: 70459}, name: "IdentifierRest", }, }, @@ -17029,20 +16993,20 @@ var g = &grammar{ }, { name: "SHAPE", - pos: position{line: 2255, col: 1, offset: 70493}, + pos: position{line: 2255, col: 1, offset: 70474}, expr: &seqExpr{ - pos: position{line: 2255, col: 14, offset: 70506}, + pos: position{line: 2255, col: 14, offset: 70487}, exprs: []any{ &litMatcher{ - pos: position{line: 2255, col: 14, offset: 70506}, + pos: position{line: 2255, col: 14, offset: 70487}, val: "shape", ignoreCase: true, want: "\"SHAPE\"i", }, ¬Expr{ - pos: position{line: 2255, col: 33, offset: 70525}, + pos: position{line: 2255, col: 33, offset: 70506}, expr: &ruleRefExpr{ - pos: position{line: 2255, col: 34, offset: 70526}, + pos: position{line: 2255, col: 34, offset: 70507}, name: "IdentifierRest", }, }, @@ -17053,20 +17017,20 @@ var g = &grammar{ }, { name: "SORT", - pos: position{line: 2256, col: 1, offset: 70541}, + pos: position{line: 2256, col: 1, offset: 70522}, expr: &seqExpr{ - pos: position{line: 2256, col: 14, offset: 70554}, + pos: position{line: 2256, col: 14, offset: 70535}, exprs: []any{ &litMatcher{ - pos: position{line: 2256, col: 14, offset: 70554}, + pos: position{line: 2256, col: 14, offset: 70535}, val: "sort", ignoreCase: true, want: "\"SORT\"i", }, ¬Expr{ - pos: position{line: 2256, col: 33, offset: 70573}, + pos: position{line: 2256, col: 33, offset: 70554}, expr: &ruleRefExpr{ - pos: position{line: 2256, col: 34, offset: 70574}, + pos: position{line: 2256, col: 34, offset: 70555}, name: "IdentifierRest", }, }, @@ -17077,20 +17041,20 @@ var g = &grammar{ }, { name: "SUMMARIZE", - pos: position{line: 2257, col: 1, offset: 70589}, + pos: position{line: 2257, col: 1, offset: 70570}, expr: &seqExpr{ - pos: position{line: 2257, col: 14, offset: 70602}, + pos: position{line: 2257, col: 14, offset: 70583}, exprs: []any{ &litMatcher{ - pos: position{line: 2257, col: 14, offset: 70602}, + pos: position{line: 2257, col: 14, offset: 70583}, val: "summarize", ignoreCase: true, want: "\"SUMMARIZE\"i", }, ¬Expr{ - pos: position{line: 2257, col: 33, offset: 70621}, + pos: position{line: 2257, col: 33, offset: 70602}, expr: &ruleRefExpr{ - pos: position{line: 2257, col: 34, offset: 70622}, + pos: position{line: 2257, col: 34, offset: 70603}, name: "IdentifierRest", }, }, @@ -17101,20 +17065,20 @@ var g = &grammar{ }, { name: "SWITCH", - pos: position{line: 2258, col: 1, offset: 70637}, + pos: position{line: 2258, col: 1, offset: 70618}, expr: &seqExpr{ - pos: position{line: 2258, col: 14, offset: 70650}, + pos: position{line: 2258, col: 14, offset: 70631}, exprs: []any{ &litMatcher{ - pos: position{line: 2258, col: 14, offset: 70650}, + pos: position{line: 2258, col: 14, offset: 70631}, val: "switch", ignoreCase: true, want: "\"SWITCH\"i", }, ¬Expr{ - pos: position{line: 2258, col: 33, offset: 70669}, + pos: position{line: 2258, col: 33, offset: 70650}, expr: &ruleRefExpr{ - pos: position{line: 2258, col: 34, offset: 70670}, + pos: position{line: 2258, col: 34, offset: 70651}, name: "IdentifierRest", }, }, @@ -17125,20 +17089,20 @@ var g = &grammar{ }, { name: "TAIL", - pos: position{line: 2259, col: 1, offset: 70685}, + pos: position{line: 2259, col: 1, offset: 70666}, expr: &seqExpr{ - pos: position{line: 2259, col: 14, offset: 70698}, + pos: position{line: 2259, col: 14, offset: 70679}, exprs: []any{ &litMatcher{ - pos: position{line: 2259, col: 14, offset: 70698}, + pos: position{line: 2259, col: 14, offset: 70679}, val: "tail", ignoreCase: true, want: "\"TAIL\"i", }, ¬Expr{ - pos: position{line: 2259, col: 33, offset: 70717}, + pos: position{line: 2259, col: 33, offset: 70698}, expr: &ruleRefExpr{ - pos: position{line: 2259, col: 34, offset: 70718}, + pos: position{line: 2259, col: 34, offset: 70699}, name: "IdentifierRest", }, }, @@ -17149,20 +17113,20 @@ var g = &grammar{ }, { name: "TAP", - pos: position{line: 2260, col: 1, offset: 70734}, + pos: position{line: 2260, col: 1, offset: 70715}, expr: &seqExpr{ - pos: position{line: 2260, col: 14, offset: 70747}, + pos: position{line: 2260, col: 14, offset: 70728}, exprs: []any{ &litMatcher{ - pos: position{line: 2260, col: 14, offset: 70747}, + pos: position{line: 2260, col: 14, offset: 70728}, val: "tap", ignoreCase: true, want: "\"TAP\"i", }, ¬Expr{ - pos: position{line: 2260, col: 33, offset: 70766}, + pos: position{line: 2260, col: 33, offset: 70747}, expr: &ruleRefExpr{ - pos: position{line: 2260, col: 34, offset: 70767}, + pos: position{line: 2260, col: 34, offset: 70748}, name: "IdentifierRest", }, }, @@ -17173,20 +17137,20 @@ var g = &grammar{ }, { name: "THEN", - pos: position{line: 2261, col: 1, offset: 70782}, + pos: position{line: 2261, col: 1, offset: 70763}, expr: &seqExpr{ - pos: position{line: 2261, col: 14, offset: 70795}, + pos: position{line: 2261, col: 14, offset: 70776}, exprs: []any{ &litMatcher{ - pos: position{line: 2261, col: 14, offset: 70795}, + pos: position{line: 2261, col: 14, offset: 70776}, val: "then", ignoreCase: true, want: "\"THEN\"i", }, ¬Expr{ - pos: position{line: 2261, col: 33, offset: 70814}, + pos: position{line: 2261, col: 33, offset: 70795}, expr: &ruleRefExpr{ - pos: position{line: 2261, col: 34, offset: 70815}, + pos: position{line: 2261, col: 34, offset: 70796}, name: "IdentifierRest", }, }, @@ -17197,20 +17161,20 @@ var g = &grammar{ }, { name: "TOP", - pos: position{line: 2262, col: 1, offset: 70830}, + pos: position{line: 2262, col: 1, offset: 70811}, expr: &seqExpr{ - pos: position{line: 2262, col: 14, offset: 70843}, + pos: position{line: 2262, col: 14, offset: 70824}, exprs: []any{ &litMatcher{ - pos: position{line: 2262, col: 14, offset: 70843}, + pos: position{line: 2262, col: 14, offset: 70824}, val: "top", ignoreCase: true, want: "\"TOP\"i", }, ¬Expr{ - pos: position{line: 2262, col: 33, offset: 70862}, + pos: position{line: 2262, col: 33, offset: 70843}, expr: &ruleRefExpr{ - pos: position{line: 2262, col: 34, offset: 70863}, + pos: position{line: 2262, col: 34, offset: 70844}, name: "IdentifierRest", }, }, @@ -17221,20 +17185,20 @@ var g = &grammar{ }, { name: "TRUE", - pos: position{line: 2263, col: 1, offset: 70878}, + pos: position{line: 2263, col: 1, offset: 70859}, expr: &seqExpr{ - pos: position{line: 2263, col: 14, offset: 70891}, + pos: position{line: 2263, col: 14, offset: 70872}, exprs: []any{ &litMatcher{ - pos: position{line: 2263, col: 14, offset: 70891}, + pos: position{line: 2263, col: 14, offset: 70872}, val: "true", ignoreCase: true, want: "\"TRUE\"i", }, ¬Expr{ - pos: position{line: 2263, col: 33, offset: 70910}, + pos: position{line: 2263, col: 33, offset: 70891}, expr: &ruleRefExpr{ - pos: position{line: 2263, col: 34, offset: 70911}, + pos: position{line: 2263, col: 34, offset: 70892}, name: "IdentifierRest", }, }, @@ -17245,20 +17209,20 @@ var g = &grammar{ }, { name: "TYPE", - pos: position{line: 2264, col: 1, offset: 70926}, + pos: position{line: 2264, col: 1, offset: 70907}, expr: &seqExpr{ - pos: position{line: 2264, col: 14, offset: 70939}, + pos: position{line: 2264, col: 14, offset: 70920}, exprs: []any{ &litMatcher{ - pos: position{line: 2264, col: 14, offset: 70939}, + pos: position{line: 2264, col: 14, offset: 70920}, val: "type", ignoreCase: true, want: "\"TYPE\"i", }, ¬Expr{ - pos: position{line: 2264, col: 33, offset: 70958}, + pos: position{line: 2264, col: 33, offset: 70939}, expr: &ruleRefExpr{ - pos: position{line: 2264, col: 34, offset: 70959}, + pos: position{line: 2264, col: 34, offset: 70940}, name: "IdentifierRest", }, }, @@ -17269,20 +17233,20 @@ var g = &grammar{ }, { name: "UNION", - pos: position{line: 2265, col: 1, offset: 70974}, + pos: position{line: 2265, col: 1, offset: 70955}, expr: &seqExpr{ - pos: position{line: 2265, col: 14, offset: 70987}, + pos: position{line: 2265, col: 14, offset: 70968}, exprs: []any{ &litMatcher{ - pos: position{line: 2265, col: 14, offset: 70987}, + pos: position{line: 2265, col: 14, offset: 70968}, val: "union", ignoreCase: true, want: "\"UNION\"i", }, ¬Expr{ - pos: position{line: 2265, col: 33, offset: 71006}, + pos: position{line: 2265, col: 33, offset: 70987}, expr: &ruleRefExpr{ - pos: position{line: 2265, col: 34, offset: 71007}, + pos: position{line: 2265, col: 34, offset: 70988}, name: "IdentifierRest", }, }, @@ -17293,20 +17257,20 @@ var g = &grammar{ }, { name: "UNIQ", - pos: position{line: 2266, col: 1, offset: 71022}, + pos: position{line: 2266, col: 1, offset: 71003}, expr: &seqExpr{ - pos: position{line: 2266, col: 14, offset: 71035}, + pos: position{line: 2266, col: 14, offset: 71016}, exprs: []any{ &litMatcher{ - pos: position{line: 2266, col: 14, offset: 71035}, + pos: position{line: 2266, col: 14, offset: 71016}, val: "uniq", ignoreCase: true, want: "\"UNIQ\"i", }, ¬Expr{ - pos: position{line: 2266, col: 33, offset: 71054}, + pos: position{line: 2266, col: 33, offset: 71035}, expr: &ruleRefExpr{ - pos: position{line: 2266, col: 34, offset: 71055}, + pos: position{line: 2266, col: 34, offset: 71036}, name: "IdentifierRest", }, }, @@ -17317,20 +17281,20 @@ var g = &grammar{ }, { name: "USING", - pos: position{line: 2267, col: 1, offset: 71071}, + pos: position{line: 2267, col: 1, offset: 71052}, expr: &seqExpr{ - pos: position{line: 2267, col: 14, offset: 71084}, + pos: position{line: 2267, col: 14, offset: 71065}, exprs: []any{ &litMatcher{ - pos: position{line: 2267, col: 14, offset: 71084}, + pos: position{line: 2267, col: 14, offset: 71065}, val: "using", ignoreCase: true, want: "\"USING\"i", }, ¬Expr{ - pos: position{line: 2267, col: 33, offset: 71103}, + pos: position{line: 2267, col: 33, offset: 71084}, expr: &ruleRefExpr{ - pos: position{line: 2267, col: 34, offset: 71104}, + pos: position{line: 2267, col: 34, offset: 71085}, name: "IdentifierRest", }, }, @@ -17341,20 +17305,20 @@ var g = &grammar{ }, { name: "VALUE", - pos: position{line: 2268, col: 1, offset: 71119}, + pos: position{line: 2268, col: 1, offset: 71100}, expr: &seqExpr{ - pos: position{line: 2268, col: 14, offset: 71132}, + pos: position{line: 2268, col: 14, offset: 71113}, exprs: []any{ &litMatcher{ - pos: position{line: 2268, col: 14, offset: 71132}, + pos: position{line: 2268, col: 14, offset: 71113}, val: "value", ignoreCase: true, want: "\"VALUE\"i", }, ¬Expr{ - pos: position{line: 2268, col: 33, offset: 71151}, + pos: position{line: 2268, col: 33, offset: 71132}, expr: &ruleRefExpr{ - pos: position{line: 2268, col: 34, offset: 71152}, + pos: position{line: 2268, col: 34, offset: 71133}, name: "IdentifierRest", }, }, @@ -17365,20 +17329,20 @@ var g = &grammar{ }, { name: "WHEN", - pos: position{line: 2269, col: 1, offset: 71167}, + pos: position{line: 2269, col: 1, offset: 71148}, expr: &seqExpr{ - pos: position{line: 2269, col: 14, offset: 71180}, + pos: position{line: 2269, col: 14, offset: 71161}, exprs: []any{ &litMatcher{ - pos: position{line: 2269, col: 14, offset: 71180}, + pos: position{line: 2269, col: 14, offset: 71161}, val: "when", ignoreCase: true, want: "\"WHEN\"i", }, ¬Expr{ - pos: position{line: 2269, col: 33, offset: 71199}, + pos: position{line: 2269, col: 33, offset: 71180}, expr: &ruleRefExpr{ - pos: position{line: 2269, col: 34, offset: 71200}, + pos: position{line: 2269, col: 34, offset: 71181}, name: "IdentifierRest", }, }, @@ -17389,20 +17353,20 @@ var g = &grammar{ }, { name: "WHERE", - pos: position{line: 2270, col: 1, offset: 71215}, + pos: position{line: 2270, col: 1, offset: 71196}, expr: &seqExpr{ - pos: position{line: 2270, col: 14, offset: 71228}, + pos: position{line: 2270, col: 14, offset: 71209}, exprs: []any{ &litMatcher{ - pos: position{line: 2270, col: 14, offset: 71228}, + pos: position{line: 2270, col: 14, offset: 71209}, val: "where", ignoreCase: true, want: "\"WHERE\"i", }, ¬Expr{ - pos: position{line: 2270, col: 33, offset: 71247}, + pos: position{line: 2270, col: 33, offset: 71228}, expr: &ruleRefExpr{ - pos: position{line: 2270, col: 34, offset: 71248}, + pos: position{line: 2270, col: 34, offset: 71229}, name: "IdentifierRest", }, }, @@ -17413,20 +17377,20 @@ var g = &grammar{ }, { name: "WITH", - pos: position{line: 2271, col: 1, offset: 71263}, + pos: position{line: 2271, col: 1, offset: 71244}, expr: &seqExpr{ - pos: position{line: 2271, col: 14, offset: 71276}, + pos: position{line: 2271, col: 14, offset: 71257}, exprs: []any{ &litMatcher{ - pos: position{line: 2271, col: 14, offset: 71276}, + pos: position{line: 2271, col: 14, offset: 71257}, val: "with", ignoreCase: true, want: "\"WITH\"i", }, ¬Expr{ - pos: position{line: 2271, col: 33, offset: 71295}, + pos: position{line: 2271, col: 33, offset: 71276}, expr: &ruleRefExpr{ - pos: position{line: 2271, col: 34, offset: 71296}, + pos: position{line: 2271, col: 34, offset: 71277}, name: "IdentifierRest", }, }, @@ -17437,20 +17401,20 @@ var g = &grammar{ }, { name: "YIELD", - pos: position{line: 2272, col: 1, offset: 71311}, + pos: position{line: 2272, col: 1, offset: 71292}, expr: &seqExpr{ - pos: position{line: 2272, col: 14, offset: 71324}, + pos: position{line: 2272, col: 14, offset: 71305}, exprs: []any{ &litMatcher{ - pos: position{line: 2272, col: 14, offset: 71324}, + pos: position{line: 2272, col: 14, offset: 71305}, val: "yield", ignoreCase: true, want: "\"YIELD\"i", }, ¬Expr{ - pos: position{line: 2272, col: 33, offset: 71343}, + pos: position{line: 2272, col: 33, offset: 71324}, expr: &ruleRefExpr{ - pos: position{line: 2272, col: 34, offset: 71344}, + pos: position{line: 2272, col: 34, offset: 71325}, name: "IdentifierRest", }, }, diff --git a/compiler/parser/parser.peg b/compiler/parser/parser.peg index cd0483f537..eab59c869a 100644 --- a/compiler/parser/parser.peg +++ b/compiler/parser/parser.peg @@ -95,7 +95,7 @@ LeanOp } EndOfOp = __ (Pipe / SearchKeywordGuard / "=>" / ")" / EOF) -Pipe = "|>" / "|" !("{" / "[") +Pipe = "|>" ExprGuard = __ ((!"=>" Comparator) / AdditiveOperator / MultiplicativeOperator / ":" / "(" / "[" / "~") diff --git a/compiler/parser/valid.zed b/compiler/parser/valid.zed index eb540c1de5..a673637e5a 100644 --- a/compiler/parser/valid.zed +++ b/compiler/parser/valid.zed @@ -1,5 +1,5 @@ foo -foo | count() +foo |> count() count() with -limit 10 count() by _path with -limit 10 count() by _path,every(1h) with -limit 10 @@ -9,13 +9,13 @@ _path=='conn' 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) -count() by _path | count() by addr -fork (=>count() by _path =>sort) | fork (=>count() by addr) -switch (case grep("foo") => count() by _path case field==1 => sort) | switch (default => count() by addr) +count() by _path |> count() by addr +fork (=>count() by _path =>sort) |> fork (=>count() by addr) +switch (case grep("foo") => count() by _path case field==1 => sort) |> switch (default => count() by addr) sort -r sort -r a, b, c sort -r a, b, c -count() | sort +count() |> sort top 1 top 1 -flush foo\tbar @@ -37,4 +37,4 @@ nullkeys() truevals() falsevals() yield 2600:1901:101::/126, ::1/1, 2001:0db8:85a3:0000:0000:8a2e:0370:7334/55 -func head(): (1) func tail(): (1) func uniq(): (1) func pass(): (1) head() | tail() | uniq() | pass() +func head(): (1) func tail(): (1) func uniq(): (1) func pass(): (1) head() |> tail() |> uniq() |> pass() diff --git a/compiler/parser/ztests/comments.yaml b/compiler/parser/ztests/comments.yaml index 7de0b203e3..9124c16aee 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/from.yaml b/compiler/parser/ztests/from.yaml index a513c1456b..6404d66e46 100644 --- a/compiler/parser/ztests/from.yaml +++ b/compiler/parser/ztests/from.yaml @@ -5,9 +5,9 @@ script: | 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 @@ -15,7 +15,7 @@ outputs: fork ( => from a - | search x and pool and b + |> search x and pool and b ) === No spaces around parentheses. fork ( @@ -32,8 +32,8 @@ outputs: ) === No space before vertical bar. from a - | search b + |> search b from "http://a" - | search b + |> search b from a - | search b + |> search b diff --git a/compiler/parser/ztests/over-expr.yaml b/compiler/parser/ztests/over-expr.yaml index abc5ce3814..82c36e777d 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 @@ -17,25 +17,25 @@ outputs: summarize collect(( over a with b=c - | search d + |> search d )) === cast uint8(( over a - | search b + |> search b )) === expression yield ( over a - | search b + |> search b ) === function quiet(( over a - | search b + |> search b )) === grep where grep(/regexp/,( over a - | search b + |> search b )) diff --git a/compiler/parser/ztests/reserved-word-ids.yaml b/compiler/parser/ztests/reserved-word-ids.yaml index df2e16f1d4..03ca59993a 100644 --- a/compiler/parser/ztests/reserved-word-ids.yaml +++ b/compiler/parser/ztests/reserved-word-ids.yaml @@ -1,4 +1,4 @@ -zed: 'layout.order == "p1" | put from:="hi"' +zed: 'layout.order == "p1" |> put from:="hi"' input: | {layout:{order:"p1"}} diff --git a/compiler/parser/ztests/sample-expr.yaml b/compiler/parser/ztests/sample-expr.yaml index f9e42ba651..13d58e3646 100644 --- a/compiler/parser/ztests/sample-expr.yaml +++ b/compiler/parser/ztests/sample-expr.yaml @@ -1,4 +1,4 @@ -zed: sample s2 | sort +zed: sample s2 |> sort input: | {s1:"a",s2:"b"} diff --git a/compiler/parser/ztests/sample.yaml b/compiler/parser/ztests/sample.yaml index fdc724d3ea..78d4f28965 100644 --- a/compiler/parser/ztests/sample.yaml +++ b/compiler/parser/ztests/sample.yaml @@ -1,4 +1,4 @@ -zed: sample | sort this +zed: sample |> sort this input: | {s1:"a",s2:"b"} diff --git a/compiler/parser/ztests/sql-comments.yaml b/compiler/parser/ztests/sql-comments.yaml index 9938efd40d..5364d351cd 100644 --- a/compiler/parser/ztests/sql-comments.yaml +++ b/compiler/parser/ztests/sql-comments.yaml @@ -5,8 +5,8 @@ inputs: - name: yield.spq data: | yield 1 - | yield this, 2, 3 -- , 4 - -- | yield 5 + |> yield this, 2, 3 -- , 4 + -- |> yield 5 outputs: - name: stdout diff --git a/compiler/parser/ztests/where-expr.yaml b/compiler/parser/ztests/where-expr.yaml index 77a5de8acd..43a896bf7a 100644 --- a/compiler/parser/ztests/where-expr.yaml +++ b/compiler/parser/ztests/where-expr.yaml @@ -1,5 +1,5 @@ script: | - super -z -c "_path == 'conn' | count()" in.jsup + super -z -c "_path == 'conn' |> count()" in.jsup echo === super -z -c "count() where _path == 'conn'" in.jsup diff --git a/compiler/parser/ztests/where-search.yaml b/compiler/parser/ztests/where-search.yaml index e1f8381c8a..2a01b3b0b9 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/anycase-funcs.yaml b/compiler/ztests/anycase-funcs.yaml index b9f363b4f1..4712b2f678 100644 --- a/compiler/ztests/anycase-funcs.yaml +++ b/compiler/ztests/anycase-funcs.yaml @@ -1,5 +1,5 @@ script: | - super -z -c 'c:=COUNT(),d:=Count(),Collect(LoweR(s)) by key | sort key' in.jsup + super -z -c 'c:=COUNT(),d:=Count(),Collect(LoweR(s)) by key |> sort key' in.jsup echo === super -z -c 'yield LOWER(s),Collect(LoweR(s))' in.jsup echo === diff --git a/compiler/ztests/const-from.yaml b/compiler/ztests/const-from.yaml index a702938fd5..c9aa8fabd0 100644 --- a/compiler/ztests/const-from.yaml +++ b/compiler/ztests/const-from.yaml @@ -7,7 +7,7 @@ inputs: from ( file a.jsup => put x:=A+1 file b.jsup => put x:=A - ) | sort x + ) |> sort x - name: a.jsup data: | diff --git a/compiler/ztests/const-source.yaml b/compiler/ztests/const-source.yaml index 0a53ea436d..327b8c12d7 100644 --- a/compiler/ztests/const-source.yaml +++ b/compiler/ztests/const-source.yaml @@ -18,21 +18,21 @@ outputs: const POOL = "test" pool XXX - | output main + |> output main ) === ( const FILE = "A.jsup" file A.jsup - | output main + |> output main ) === ( const URL = "http://brimdata.io" get http://brimdata.io - | output main + |> output main ) - name: stderr data: | diff --git a/compiler/ztests/const-switch.yaml b/compiler/ztests/const-switch.yaml index 2d0a97956d..1da22678a5 100644 --- a/compiler/ztests/const-switch.yaml +++ b/compiler/ztests/const-switch.yaml @@ -1,4 +1,4 @@ -zed: const THREE = 3 switch x ( case 1 => y:=3 case 2 => y:=2 case THREE => y:=1 ) | sort x +zed: const THREE = 3 switch x ( case 1 => y:=3 case 2 => y:=2 case THREE => y:=1 ) |> sort x input: | {x:1} diff --git a/compiler/ztests/equal-compare.yaml b/compiler/ztests/equal-compare.yaml index c7574919f4..22367c3ece 100644 --- a/compiler/ztests/equal-compare.yaml +++ b/compiler/ztests/equal-compare.yaml @@ -1,7 +1,7 @@ script: | super -z -c 'yield a=11' d.json echo === - super -z -c 'select distinct a,c from "d.json" where c=1 | sort this' + super -z -c 'select distinct a,c from "d.json" where c=1 |> sort this' inputs: - name: d.json diff --git a/compiler/ztests/fork-from.yaml b/compiler/ztests/fork-from.yaml index 51256ecc65..1836e7d88d 100644 --- a/compiler/ztests/fork-from.yaml +++ b/compiler/ztests/fork-from.yaml @@ -7,7 +7,7 @@ inputs: fork ( => from (file a.jsup => pass) => from (file b.jsup => pass) - ) | sort a + ) |> sort a - name: a.jsup data: | {a:1} diff --git a/compiler/ztests/from-fork.yaml b/compiler/ztests/from-fork.yaml index fa4cf0416c..562594e8f2 100644 --- a/compiler/ztests/from-fork.yaml +++ b/compiler/ztests/from-fork.yaml @@ -1,5 +1,5 @@ script: | - super -z -c 'from (file in.jsup file in.jsup ) | fork (=> count() => count())' + super -z -c 'from (file in.jsup file in.jsup ) |> fork (=> count() => count())' inputs: - name: in.jsup diff --git a/compiler/ztests/from-pass.yaml b/compiler/ztests/from-pass.yaml index 153ff2be4d..6c4ecb9f62 100644 --- a/compiler/ztests/from-pass.yaml +++ b/compiler/ztests/from-pass.yaml @@ -3,10 +3,10 @@ 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 + ) |> inner join on x=y matched:=true - name: left.jsup data: | {x:1,s:"one"} diff --git a/compiler/ztests/head.yaml b/compiler/ztests/head.yaml index 38f8f1d536..a3b7203396 100644 --- a/compiler/ztests/head.yaml +++ b/compiler/ztests/head.yaml @@ -10,15 +10,15 @@ outputs: - name: stdout data: | null - | head 1 - | output main + |> head 1 + |> output main === null - | ( + |> ( const x = 1 head 2 - | output main + |> output main ) - name: stderr data: | diff --git a/compiler/ztests/join-desc.yaml b/compiler/ztests/join-desc.yaml index 932fab8d48..cf9ad552d4 100644 --- a/compiler/ztests/join-desc.yaml +++ b/compiler/ztests/join-desc.yaml @@ -25,12 +25,12 @@ inputs: {"name":"figs","color":"brown","flavor":"plain"} - name: file.zed data: | - file fruits.jsup | sort -r flavor - | join (file people.jsup | sort -r likes) on flavor=likes eater:=name + file fruits.jsup |> sort -r flavor + |> join (file people.jsup |> sort -r likes) on flavor=likes eater:=name - name: pool.zed data: | from fruits - | join (from people) on flavor=likes eater:=name + |> join (from people) on flavor=likes eater:=name outputs: - name: stdout diff --git a/compiler/ztests/join-subquery.yaml b/compiler/ztests/join-subquery.yaml index e87c848467..d34769d38f 100644 --- a/compiler/ztests/join-subquery.yaml +++ b/compiler/ztests/join-subquery.yaml @@ -1,22 +1,22 @@ script: | - super compile -C 'file a | join (file b) on c' + super compile -C 'file a |> join (file b) on c' echo === - super compile -C -dag 'file a | join (file b) on c' + super compile -C -dag 'file a |> join (file b) on c' outputs: - name: stdout data: | from a - | join ( + |> join ( from b ) on c === file a - | fork ( + |> fork ( => pass => file b ) - | join on c=c - | output main + |> join on c=c + |> output main diff --git a/compiler/ztests/load.yaml b/compiler/ztests/load.yaml index e11296a329..b363db6b7f 100644 --- a/compiler/ztests/load.yaml +++ b/compiler/ztests/load.yaml @@ -4,7 +4,7 @@ script: | super db create -q samples super db load -q -use samples schools.jsup super db create -q Orange - super db query -z 'from samples | County=="Orange" | load Orange@main author "Diane"' | sed -E 's/[0-9a-zA-Z]{42}/xxx/' + super db query -z 'from samples |> County=="Orange" |> load Orange@main author "Diane"' | sed -E 's/[0-9a-zA-Z]{42}/xxx/' inputs: - name: schools.jsup diff --git a/compiler/ztests/merge-error.yaml b/compiler/ztests/merge-error.yaml index f99458fc82..82a0d69ddb 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/merge-filters.yaml b/compiler/ztests/merge-filters.yaml index 609bb3c533..cdb743f10d 100644 --- a/compiler/ztests/merge-filters.yaml +++ b/compiler/ztests/merge-filters.yaml @@ -1,17 +1,17 @@ script: | - super compile -C -O 'from foo | where a | where b' + super compile -C -O 'from foo |> where a |> where b' echo === - super compile -C -O 'from ( file a => where b | where c file d => where e | where f ) | where g' + super compile -C -O 'from ( file a => where b |> where c file d => where e |> where f ) |> where g' echo === - super compile -C -O 'over a => ( where b | where c )' + super compile -C -O 'over a => ( where b |> where c )' echo === - super compile -C -O 'fork ( => where a | where b => where c | where d )' + super compile -C -O 'fork ( => where a |> where b => where c |> where d )' outputs: - name: stdout data: | file foo filter (a and b) - | output main + |> output main === fork ( => @@ -19,20 +19,20 @@ outputs: => file d filter (e and f and g) ) - | output main + |> output main === null - | over a => ( + |> over a => ( where b and c ) - | output main + |> output main === null - | fork ( + |> fork ( => where a and b - | output main + |> output main => where c and d - | output main + |> output main ) diff --git a/compiler/ztests/nested-const.yaml b/compiler/ztests/nested-const.yaml index 597c59542a..b363133f6b 100644 --- a/compiler/ztests/nested-const.yaml +++ b/compiler/ztests/nested-const.yaml @@ -12,7 +12,7 @@ zed: | ) case 3 => yield {k:2,a:[103, a, b]} - ) | sort k + ) |> sort k input: | {a:1,b:1001} diff --git a/compiler/ztests/par-count.yaml b/compiler/ztests/par-count.yaml index a63e05b246..07b33a9e2e 100644 --- a/compiler/ztests/par-count.yaml +++ b/compiler/ztests/par-count.yaml @@ -2,42 +2,42 @@ script: | export SUPER_DB_LAKE=test super db init -q super db create -q -orderby ts test - super db compile -C -P 2 "from test | count() by y" | sed -e 's/pool .*/.../' + super db compile -C -P 2 "from test |> count() by y" | sed -e 's/pool .*/.../' echo === - super db compile -C -P 2 "from test | count()" | sed -e 's/pool .*/.../' + super db compile -C -P 2 "from test |> count()" | sed -e 's/pool .*/.../' outputs: - name: stdout data: | lister ... - | scatter ( + |> scatter ( => seqscan ... - | summarize partials-out + |> summarize partials-out count:=count() by y:=y => seqscan ... - | summarize partials-out + |> summarize partials-out count:=count() by y:=y ) - | combine - | summarize partials-in + |> combine + |> summarize partials-in count:=count() by y:=y - | output main + |> output main === lister ... - | scatter ( + |> scatter ( => seqscan ... - | summarize partials-out + |> summarize partials-out count:=count() => seqscan ... - | summarize partials-out + |> summarize partials-out count:=count() ) - | combine - | summarize partials-in + |> combine + |> summarize partials-in count:=count() - | yield count - | output main + |> yield count + |> output main diff --git a/compiler/ztests/par-groupby-func.yaml b/compiler/ztests/par-groupby-func.yaml index b50ed71937..b4c5c991ef 100644 --- a/compiler/ztests/par-groupby-func.yaml +++ b/compiler/ztests/par-groupby-func.yaml @@ -2,23 +2,23 @@ script: | export SUPER_DB_LAKE=test super db init -q super db create -q -orderby s:asc test - super db compile -P 2 -C "from test | union(s) by n:=len(s)" | sed -e 's/pool .*/.../' + super db compile -P 2 -C "from test |> union(s) by n:=len(s)" | sed -e 's/pool .*/.../' outputs: - name: stdout data: | lister ... - | scatter ( + |> scatter ( => seqscan ... - | summarize partials-out + |> summarize partials-out union:=union(s) by n:=len(s) => seqscan ... - | summarize partials-out + |> summarize partials-out union:=union(s) by n:=len(s) ) - | combine - | summarize partials-in + |> combine + |> summarize partials-in union:=union(s) by n:=n - | output main + |> output main diff --git a/compiler/ztests/par-join.yaml b/compiler/ztests/par-join.yaml index 47dbe27731..e171a0fee2 100644 --- a/compiler/ztests/par-join.yaml +++ b/compiler/ztests/par-join.yaml @@ -4,33 +4,33 @@ script: | super db create -q -orderby ts test # At the time of writing, the where operator is necessary because a pool scan # is parallelized only when followed by another operator. - super db compile -C -P 2 "from test | join (from test | where true) on a=b" | sed -e 's/pool .*/.../' + super db compile -C -P 2 "from test |> join (from test |> where true) on a=b" | sed -e 's/pool .*/.../' outputs: - name: stdout data: | lister ... - | slicer - | scatter ( + |> slicer + |> scatter ( => seqscan ... => seqscan ... ) - | merge ts:asc - | fork ( + |> merge ts:asc + |> fork ( => pass => lister ... - | slicer - | scatter ( + |> slicer + |> scatter ( => seqscan ... => seqscan ... ) - | merge ts:asc + |> merge ts:asc ) - | join on a=b - | output main + |> join on a=b + |> output main diff --git a/compiler/ztests/par-layout-dataflow.yaml b/compiler/ztests/par-layout-dataflow.yaml index dad53f22a8..3ed99e7f6e 100644 --- a/compiler/ztests/par-layout-dataflow.yaml +++ b/compiler/ztests/par-layout-dataflow.yaml @@ -3,35 +3,35 @@ script: | super db init -q super db create -q -orderby ts:asc ASC super db create -q -orderby ts:desc DESC - super db compile -C -P 2 "from ASC | cut x:=ts,ts:=1" | sed -e 's/pool .*/.../' + super db compile -C -P 2 "from ASC |> cut x:=ts,ts:=1" | sed -e 's/pool .*/.../' echo === - super db compile -C -P 2 "from DESC | cut x:=ts,ts:=1" | sed -e 's/pool .*/.../' + super db compile -C -P 2 "from DESC |> cut x:=ts,ts:=1" | sed -e 's/pool .*/.../' outputs: - name: stdout data: | lister ... - | slicer - | scatter ( + |> slicer + |> scatter ( => seqscan ... - | cut x:=ts,ts:=1 + |> cut x:=ts,ts:=1 => seqscan ... - | cut x:=ts,ts:=1 + |> cut x:=ts,ts:=1 ) - | merge x:asc - | output main + |> merge x:asc + |> output main === lister ... - | slicer - | scatter ( + |> slicer + |> scatter ( => seqscan ... - | cut x:=ts,ts:=1 + |> cut x:=ts,ts:=1 => seqscan ... - | cut x:=ts,ts:=1 + |> cut x:=ts,ts:=1 ) - | merge x:desc - | output main + |> merge x:desc + |> output main diff --git a/compiler/ztests/par-pushdown.yaml b/compiler/ztests/par-pushdown.yaml index 73f14e1d35..f565d76b73 100644 --- a/compiler/ztests/par-pushdown.yaml +++ b/compiler/ztests/par-pushdown.yaml @@ -2,7 +2,7 @@ script: | export SUPER_DB_LAKE=test super db init -q super db create -q -orderby ts test - super db compile -P 3 "from test | x==1" | super -z -c 'over this | kind=="Scatter" | over paths | yield this[0].filter.kind' - + super db compile -P 3 "from test |> x==1" | super -z -c 'over this |> kind=="Scatter" |> over paths |> yield this[0].filter.kind' - outputs: - name: stdout diff --git a/compiler/ztests/par-put-ts-rename-count.yaml b/compiler/ztests/par-put-ts-rename-count.yaml index 46d8d014ce..6e9ad75e5c 100644 --- a/compiler/ztests/par-put-ts-rename-count.yaml +++ b/compiler/ztests/par-put-ts-rename-count.yaml @@ -1,6 +1,6 @@ skip: we no longer parallelize now when we clobber the sort key. issue 2756 -script: super compile -C -P 2 "from 'pool-ts' | put ts:=foo | rename foo:=boo | count()" +script: super compile -C -P 2 "from 'pool-ts' |> put ts:=foo |> rename foo:=boo |> count()" outputs: - name: stdout @@ -8,14 +8,14 @@ outputs: from ( G2eDzBUfU6IEmUSGCa5kHyXMhoO => put ts:=foo - | rename foo:=boo - | summarize partials-out + |> rename foo:=boo + |> summarize partials-out count:=count(); G2eDzBUfU6IEmUSGCa5kHyXMhoO => put ts:=foo - | rename foo:=boo - | summarize partials-out + |> rename foo:=boo + |> summarize partials-out count:=count(); ) - | summarize partials-in + |> summarize partials-in count:=count() diff --git a/compiler/ztests/par-put-ts-rename-sort.yaml b/compiler/ztests/par-put-ts-rename-sort.yaml index 9869cf0f51..1216ca8ebc 100644 --- a/compiler/ztests/par-put-ts-rename-sort.yaml +++ b/compiler/ztests/par-put-ts-rename-sort.yaml @@ -1,6 +1,6 @@ skip: we no longer parallelize now when we clobber the sort key. issue 2756 -script: super compile -C -P 2 "from 'pool-ts' | put ts:=foo | rename foo:=boo | sort" +script: super compile -C -P 2 "from 'pool-ts' |> put ts:=foo |> rename foo:=boo |> sort" outputs: - name: stdout @@ -8,9 +8,9 @@ outputs: from ( G2eDzBUfU6IEmUSGCa5kHyXMhoO => put ts:=foo - | rename foo:=boo; + |> rename foo:=boo; G2eDzBUfU6IEmUSGCa5kHyXMhoO => put ts:=foo - | rename foo:=boo; + |> rename foo:=boo; ) - | sort + |> sort diff --git a/compiler/ztests/par-put-ts-rename.yaml b/compiler/ztests/par-put-ts-rename.yaml index 57dd0a0b70..1107262810 100644 --- a/compiler/ztests/par-put-ts-rename.yaml +++ b/compiler/ztests/par-put-ts-rename.yaml @@ -1,6 +1,6 @@ skip: we no longer parallelize now when we clobber the sort key. issue 2756 -script: super compile -C -P 2 "from 'pool-ts' | put ts:=foo | rename foo:=boo" +script: super compile -C -P 2 "from 'pool-ts' |> put ts:=foo |> rename foo:=boo" outputs: - name: stdout @@ -9,6 +9,6 @@ outputs: G2eDzBUfU6IEmUSGCa5kHyXMhoO; G2eDzBUfU6IEmUSGCa5kHyXMhoO; ) - | merge ts:asc - | put ts:=foo - | rename foo:=boo + |> merge ts:asc + |> put ts:=foo + |> rename foo:=boo diff --git a/compiler/ztests/par-ts.yaml b/compiler/ztests/par-ts.yaml index 4976f69337..516d710443 100644 --- a/compiler/ztests/par-ts.yaml +++ b/compiler/ztests/par-ts.yaml @@ -3,176 +3,176 @@ script: | super db init -q super db create -q -orderby ts test echo "" - super db compile -C -P 2 "from test | cut ts, y, z | put x := y | rename y := z" | sed -e 's/pool .*/.../' + super db compile -C -P 2 "from test |> cut ts, y, z |> put x := y |> rename y := z" | sed -e 's/pool .*/.../' echo "" - super db compile -C -P 2 "from test | cut ts, foo:=x | uniq" | sed -e 's/pool .*/.../' + super db compile -C -P 2 "from test |> cut ts, foo:=x |> uniq" | sed -e 's/pool .*/.../' echo "" - super db compile -C -P 2 "from test | drop x | uniq" | sed -e 's/pool .*/.../' + super db compile -C -P 2 "from test |> drop x |> uniq" | sed -e 's/pool .*/.../' echo "" - super db compile -C -P 2 "from test | count() by y, every(1h)" | sed -e 's/pool .*/.../' + super db compile -C -P 2 "from test |> count() by y, every(1h)" | sed -e 's/pool .*/.../' echo "" - super db compile -C -P 2 "from test | put x:=y | countdistinct(x) by y | uniq" | sed -e 's/pool .*/.../' + super db compile -C -P 2 "from test |> put x:=y |> countdistinct(x) by y |> uniq" | sed -e 's/pool .*/.../' echo "" - super db compile -C -P 2 "from test | put x:=foo | rename foo:=boo | uniq" | sed -e 's/pool .*/.../' + super db compile -C -P 2 "from test |> put x:=foo |> rename foo:=boo |> uniq" | sed -e 's/pool .*/.../' echo "" - super db compile -C -P 2 "from test | put a:=1 | tail" | sed -e 's/pool .*/.../' + super db compile -C -P 2 "from test |> put a:=1 |> tail" | sed -e 's/pool .*/.../' echo "" - super db compile -C -P 2 "from test | sort | uniq" | sed -e 's/pool .*/.../' + super db compile -C -P 2 "from test |> sort |> uniq" | sed -e 's/pool .*/.../' echo "" - super db compile -C -P 2 "from test | sort x | uniq" | sed -e 's/pool .*/.../' + super db compile -C -P 2 "from test |> sort x |> uniq" | sed -e 's/pool .*/.../' echo "" - super db compile -C -P 2 "from test | uniq" | sed -e 's/pool .*/.../' + super db compile -C -P 2 "from test |> uniq" | sed -e 's/pool .*/.../' outputs: - name: stdout data: | lister ... - | slicer - | scatter ( + |> slicer + |> scatter ( => seqscan ... - | cut ts:=ts,y:=y,z:=z - | put x:=y - | rename y:=z + |> cut ts:=ts,y:=y,z:=z + |> put x:=y + |> rename y:=z => seqscan ... - | cut ts:=ts,y:=y,z:=z - | put x:=y - | rename y:=z + |> cut ts:=ts,y:=y,z:=z + |> put x:=y + |> rename y:=z ) - | merge ts:asc - | output main + |> merge ts:asc + |> output main lister ... - | slicer - | scatter ( + |> slicer + |> scatter ( => seqscan ... - | cut ts:=ts,foo:=x + |> cut ts:=ts,foo:=x => seqscan ... - | cut ts:=ts,foo:=x + |> cut ts:=ts,foo:=x ) - | merge ts:asc - | uniq - | output main + |> merge ts:asc + |> uniq + |> output main lister ... - | slicer - | scatter ( + |> slicer + |> scatter ( => seqscan ... - | drop x + |> drop x => seqscan ... - | drop x + |> drop x ) - | merge ts:asc - | uniq - | output main + |> merge ts:asc + |> uniq + |> output main lister ... - | slicer - | scatter ( + |> slicer + |> scatter ( => seqscan ... - | summarize partials-out sort-dir 1 + |> summarize partials-out sort-dir 1 count:=count() by y:=y,ts:=every(1h) => seqscan ... - | summarize partials-out sort-dir 1 + |> summarize partials-out sort-dir 1 count:=count() by y:=y,ts:=every(1h) ) - | merge ts:asc - | summarize partials-in sort-dir 1 + |> merge ts:asc + |> summarize partials-in sort-dir 1 count:=count() by y:=y,ts:=ts - | output main + |> output main lister ... - | scatter ( + |> scatter ( => seqscan ... - | put x:=y - | summarize partials-out + |> put x:=y + |> summarize partials-out countdistinct:=countdistinct(x) by y:=y => seqscan ... - | put x:=y - | summarize partials-out + |> put x:=y + |> summarize partials-out countdistinct:=countdistinct(x) by y:=y ) - | combine - | summarize partials-in + |> combine + |> summarize partials-in countdistinct:=countdistinct(x) by y:=y - | uniq - | output main + |> uniq + |> output main lister ... - | slicer - | scatter ( + |> slicer + |> scatter ( => seqscan ... - | put x:=foo - | rename foo:=boo + |> put x:=foo + |> rename foo:=boo => seqscan ... - | put x:=foo - | rename foo:=boo + |> put x:=foo + |> rename foo:=boo ) - | merge ts:asc - | uniq - | output main + |> merge ts:asc + |> uniq + |> output main lister ... - | slicer - | scatter ( + |> slicer + |> scatter ( => seqscan ... - | put a:=1 - | tail 1 + |> put a:=1 + |> tail 1 => seqscan ... - | put a:=1 - | tail 1 + |> put a:=1 + |> tail 1 ) - | merge ts:asc - | tail 1 - | output main + |> merge ts:asc + |> tail 1 + |> output main lister ... - | scatter ( + |> scatter ( => seqscan ... => seqscan ... ) - | combine - | sort - | uniq - | output main + |> combine + |> sort + |> uniq + |> output main lister ... - | scatter ( + |> scatter ( => seqscan ... - | sort x asc + |> sort x asc => seqscan ... - | sort x asc + |> sort x asc ) - | merge x:asc - | uniq - | output main + |> merge x:asc + |> uniq + |> output main lister ... - | slicer - | scatter ( + |> slicer + |> scatter ( => seqscan ... => seqscan ... ) - | merge ts:asc - | uniq - | output main + |> merge ts:asc + |> uniq + |> output main diff --git a/compiler/ztests/pushdown.yaml b/compiler/ztests/pushdown.yaml index d820eabb89..387e04bfba 100644 --- a/compiler/ztests/pushdown.yaml +++ b/compiler/ztests/pushdown.yaml @@ -2,47 +2,47 @@ script: | export SUPER_DB_LAKE=test super db init -q 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/' + 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 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/' + 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=='hello' or !(y==2 or y==3)" | sed -e 's/lister .*/lister/' -e 's/seqscan .*filter/seqscan filter/' + super db compile -C -O "from 'pool-ts' |> x=='hello' or !(y==2 or y==3)" | sed -e 's/lister .*/lister/' -e 's/seqscan .*filter/seqscan filter/' echo === - super db compile -C -O "from 'pool-ts' | ts >= 0 and ts <= 2" | sed -e 's/lister .*pruner/lister pruner/' -e 's/seqscan .*pruner/seqscan pruner/' + super db compile -C -O "from 'pool-ts' |> ts >= 0 and ts <= 2" | sed -e 's/lister .*pruner/lister pruner/' -e 's/seqscan .*pruner/seqscan pruner/' echo === - super db compile -C -O "from 'pool-ts' | ts >= 0 and ts <= 2 and x=='hello'"| sed -e 's/lister .*pruner/lister pruner/' -e 's/seqscan .*pruner/seqscan pruner/' + super db compile -C -O "from 'pool-ts' |> ts >= 0 and ts <= 2 and x=='hello'"| sed -e 's/lister .*pruner/lister pruner/' -e 's/seqscan .*pruner/seqscan pruner/' outputs: - name: stdout data: | lister - | slicer - | seqscan filter (x=="hello" or x==1.) - | output main + |> slicer + |> seqscan filter (x=="hello" or x==1.) + |> output main === lister - | slicer - | seqscan filter (x>1 and y<=1.) - | output main + |> slicer + |> seqscan filter (x>1 and y<=1.) + |> output main === lister - | slicer - | seqscan filter (x=="hello" or x!=1.) - | output main + |> slicer + |> seqscan filter (x=="hello" or x!=1.) + |> output main === lister - | slicer - | seqscan filter (x=="hello" or !(y==2 or y==3)) - | output main + |> slicer + |> seqscan filter (x=="hello" or !(y==2 or y==3)) + |> output main === lister pruner (compare(0, max, true)>0 or compare(2, min, true)<0) - | slicer - | seqscan pruner (compare(0, max, true)>0 or compare(2, min, true)<0) filter (ts>=0 and ts<=2) - | output main + |> slicer + |> seqscan pruner (compare(0, max, true)>0 or compare(2, min, true)<0) filter (ts>=0 and ts<=2) + |> output main === lister pruner (compare(0, max, true)>0 or compare(2, min, true)<0) - | slicer - | seqscan pruner (compare(0, max, true)>0 or compare(2, min, true)<0) filter (ts>=0 and ts<=2 and x=="hello") - | output main + |> slicer + |> seqscan pruner (compare(0, max, true)>0 or compare(2, min, true)<0) filter (ts>=0 and ts<=2 and x=="hello") + |> output main diff --git a/compiler/ztests/remove-passops.yaml b/compiler/ztests/remove-passops.yaml index a1ffab814e..c5e53ef7b9 100644 --- a/compiler/ztests/remove-passops.yaml +++ b/compiler/ztests/remove-passops.yaml @@ -1,7 +1,7 @@ -script: super compile -O -C 'from foo | x>1 | pass | pass | x>2 | pass' +script: super compile -O -C 'from foo |> x>1 |> pass |> pass |> x>2 |> pass' outputs: - name: stdout data: | file foo filter (x>1 and x>2) - | output main + |> output main diff --git a/compiler/ztests/scoped-this.yaml b/compiler/ztests/scoped-this.yaml index cf80dec0f1..634b793633 100644 --- a/compiler/ztests/scoped-this.yaml +++ b/compiler/ztests/scoped-this.yaml @@ -1,7 +1,7 @@ zed: | over ids with name => ( ids:=collect(string(this)) - | yield {name,ids:join(ids,',')} + |> yield {name,ids:join(ids,',')} ) input: | diff --git a/compiler/ztests/sem-groupby-input-dir.yaml b/compiler/ztests/sem-groupby-input-dir.yaml index fd8c9ef648..80fe63bad6 100644 --- a/compiler/ztests/sem-groupby-input-dir.yaml +++ b/compiler/ztests/sem-groupby-input-dir.yaml @@ -2,14 +2,14 @@ script: | export SUPER_DB_LAKE=test super db init -q super db create -q -orderby ts pool-ts - super db compile -C -O "from 'pool-ts'| count() by every(1h)" | sed -e 's/pool .*/.../' + super db compile -C -O "from 'pool-ts' |> count() by every(1h)" | sed -e 's/pool .*/.../' outputs: - name: stdout data: | lister ... - | slicer - | seqscan ... - | summarize sort-dir 1 + |> slicer + |> seqscan ... + |> summarize sort-dir 1 count:=count() by ts:=every(1h) - | output main + |> output main diff --git a/compiler/ztests/sql/distinct.yaml b/compiler/ztests/sql/distinct.yaml index d79680e663..c1e10432eb 100644 --- a/compiler/ztests/sql/distinct.yaml +++ b/compiler/ztests/sql/distinct.yaml @@ -1,7 +1,7 @@ script: | - super -z -c 'select distinct value this from "d.json" | sort this' + super -z -c 'select distinct value this from "d.json" |> sort this' echo === - super -z -c 'select distinct a,c from "d.json" | sort this' + super -z -c 'select distinct a,c from "d.json" |> sort this' inputs: - name: d.json diff --git a/compiler/ztests/sql/groupby.yaml b/compiler/ztests/sql/groupby.yaml index 2a2c6d9540..671ed55569 100644 --- a/compiler/ztests/sql/groupby.yaml +++ b/compiler/ztests/sql/groupby.yaml @@ -1,7 +1,7 @@ script: | - super -z -c 'select val.radius,count() from shapes.json group by val.radius | sort this' + super -z -c 'select val.radius,count() from shapes.json group by val.radius |> sort this' echo === - super -z -c 'select type,sum(val.radius) from shapes.json group by type | sort this' + super -z -c 'select type,sum(val.radius) from shapes.json group by type |> sort this' inputs: - name: shapes.json diff --git a/compiler/ztests/sql/like.yaml b/compiler/ztests/sql/like.yaml index 7ff8221b77..fcd19cf950 100644 --- a/compiler/ztests/sql/like.yaml +++ b/compiler/ztests/sql/like.yaml @@ -1,7 +1,7 @@ script: | super -z -c "select a from s.json where a||b like '%os%'" echo === - super -z -c "from s.json | yield a LIKE 'f%'" + super -z -c "from s.json |> yield a LIKE 'f%'" inputs: - name: s.json diff --git a/compiler/ztests/sql/precedence.yaml b/compiler/ztests/sql/precedence.yaml index 24cea4d428..51d76cadb9 100644 --- a/compiler/ztests/sql/precedence.yaml +++ b/compiler/ztests/sql/precedence.yaml @@ -3,7 +3,7 @@ script: | echo === super -z -c "SELECT * FROM 'data.csv' WHERE NOT Country = 'Spain';" echo === - super -z -c "select 'a' || 'b' | count()" + super -z -c "select 'a' || 'b' |> count()" echo === super -z -c "SELECT - - 34 + - 26 + - 34 + - 34;" diff --git a/compiler/ztests/tail.yaml b/compiler/ztests/tail.yaml index 2d129e46ed..a587834c36 100644 --- a/compiler/ztests/tail.yaml +++ b/compiler/ztests/tail.yaml @@ -10,15 +10,15 @@ outputs: - name: stdout data: | null - | tail 1 - | output main + |> tail 1 + |> output main === null - | ( + |> ( const x = 1 tail 2 - | output main + |> output main ) - name: stderr data: | diff --git a/compiler/ztests/udf-implied-where.yaml b/compiler/ztests/udf-implied-where.yaml index 079ef66ff4..ccadb8c217 100644 --- a/compiler/ztests/udf-implied-where.yaml +++ b/compiler/ztests/udf-implied-where.yaml @@ -5,11 +5,11 @@ outputs: - name: stdout data: | null - | ( + |> ( func h(e): ( has(e) ) where h(foo) - | output main + |> output main ) diff --git a/docs/README.md b/docs/README.md index f3f034d404..36d684204f 100644 --- a/docs/README.md +++ b/docs/README.md @@ -80,7 +80,7 @@ Since super-structured data is self-describing, this approach makes stream compo very easy. Data from a SuperPipe query can trivially be piped to a local instance of `super` by feeding the resulting output stream to stdin of `super`, for example, ``` -super db query "from pool | ...remote query..." | super "...local query..." - +super db query "from pool |> ...remote query..." | super "...local query..." - ``` There is no need to configure the SuperDB entities with schema information like [protobuf configs](https://developers.google.com/protocol-buffers/docs/proto3) diff --git a/docs/commands/zed.md b/docs/commands/zed.md index 81287ae2b6..7d80b91391 100644 --- a/docs/commands/zed.md +++ b/docs/commands/zed.md @@ -294,7 +294,7 @@ commit history. In fact, Zed's [from operator](../language/operators/from.md) allows a commit object to be specified with the `@` suffix to a pool reference, e.g., ``` -zed query 'from logs@1tRxi7zjT7oKxCBwwZ0rbaiLRxb | ...' +zed query 'from logs@1tRxi7zjT7oKxCBwwZ0rbaiLRxb |> ...' ``` In this way, a query can time-travel through the commit history. As long as the underlying data has not been deleted, arbitrarily old snapshots of the Zed @@ -670,7 +670,7 @@ zed query 'from logs' We can narrow the span of the query by specifying a filter on the pool key: ``` -zed query 'from logs | ts >= 2018-03-24T17:36:30.090766Z and ts <= 2018-03-24T17:36:30.090758Z' +zed query 'from logs |> ts >= 2018-03-24T17:36:30.090766Z and ts <= 2018-03-24T17:36:30.090758Z' ``` Filters on pool keys are efficiently implemented as the data is laid out according to the pool key and seek indexes keyed by the pool key @@ -694,7 +694,7 @@ zed query -f bsup 'from logs' | zq -f table 'count() by field' - Of course, it's even more efficient to run the query inside of the pool traversal like this: ``` -zed query -f table 'from logs | count() by field' +zed query -f table 'from logs |> count() by field' ``` By default, the `query` command scans pool data in pool-key order though the Zed optimizer may, in general, reorder the scan to optimize searches, @@ -739,7 +739,7 @@ zed query -Z "from logs:branches" Since this is all just Zed, you can filter the results just like any query, e.g., to look for particular branch: ``` -zed query -Z "from logs:branches | branch.name=='main'" +zed query -Z "from logs:branches |> branch.name=='main'" ``` This meta-query produces a list of the data objects in the `live` branch diff --git a/docs/commands/zq.md b/docs/commands/zq.md index 414cb55930..1bc5def5fb 100644 --- a/docs/commands/zq.md +++ b/docs/commands/zq.md @@ -520,7 +520,7 @@ or trying to debug a halted program with a vague error message. For example, this query ```mdtest-command -echo '1 2 0 3' | super -z -c '10.0/this' - +echo '1 2 0 3' | super -z -c '10.0/this' - ``` produces ```mdtest-output @@ -531,7 +531,7 @@ error("divide by zero") ``` and ```mdtest-command -echo '1 2 0 3' | super -c '10.0/this' - | super -z -c 'is_error(this)' - +echo '1 2 0 3' | super -c '10.0/this' - | super -z -c 'is_error(this)' - ``` produces just ```mdtest-output @@ -585,7 +585,7 @@ produces _A simple [aggregation](../language/aggregates/README.md)_ ```mdtest-command echo '{key:"foo",val:1}{key:"bar",val:2}{key:"foo",val:3}' | - super -z -c 'sum(val) by key | sort key' - + super -z -c 'sum(val) by key |> sort key' - ``` produces ```mdtest-output @@ -644,7 +644,7 @@ values were not present in the buffer. For example, if the Zed query is ``` -"http error" and ipsrc==10.0.0.1 | count() +"http error" and ipsrc==10.0.0.1 |> count() ``` then the pre-search would look for the string "http error" and the Zed encoding of the IP address 10.0.0.1 and unless both those values are present, then the diff --git a/docs/formats/README.md b/docs/formats/README.md index aa95b2639f..98395229ee 100644 --- a/docs/formats/README.md +++ b/docs/formats/README.md @@ -242,7 +242,7 @@ that more directly leverage the nature of super-structured data. For example, the above two SuperSQL queries could be written as: ``` count() by shape:=typeof(this) - any(this) by typeof(this) | cut any + any(this) by typeof(this) |> cut any ``` ### 2.5 First-class Errors diff --git a/docs/integrations/fluentd.md b/docs/integrations/fluentd.md index 5326839546..494a5899e9 100644 --- a/docs/integrations/fluentd.md +++ b/docs/integrations/fluentd.md @@ -150,7 +150,7 @@ nslookup example.com To see the event was been stored in our pool, we executed the following query: ``` -zed query -Z 'from zeek | _path=="dns" query=="example.com"' +zed query -Z 'from zeek |> _path=="dns" query=="example.com"' ``` With the Fluentd configuration shown here, it took about a minute for the @@ -263,7 +263,7 @@ After a delay, we executed the following query to see the event in its shaped form: ``` -zed query -Z 'from "zeek-shaped" | _path=="dns" query=="example.org"' +zed query -Z 'from "zeek-shaped" |> _path=="dns" query=="example.org"' ``` Example output: @@ -312,7 +312,7 @@ functionality that leverages the richer data typing such as filtering `ip` values by CIDR block, e.g., ``` -zed query 'from "zeek-shaped" | _path=="conn" | cidr_match(172.31.0.0/16, id.resp_h) | count() by id' +zed query 'from "zeek-shaped" |> _path=="conn" | cidr_match(172.31.0.0/16, id.resp_h) | count() by id' ``` which in our test environment produced @@ -329,7 +329,7 @@ which in our test environment produced or this query that counts events into buckets by `time` span ``` -zed query 'from "zeek-shaped" | count() by bucket(ts,5m) | sort bucket' +zed query 'from "zeek-shaped" |> count() by bucket(ts,5m) | sort bucket' ``` which in our test environment produced diff --git a/docs/integrations/zeek/shaping-zeek-json.md b/docs/integrations/zeek/shaping-zeek-json.md index 4a0f9b9578..9ff9c13d0f 100644 --- a/docs/integrations/zeek/shaping-zeek-json.md +++ b/docs/integrations/zeek/shaping-zeek-json.md @@ -118,18 +118,18 @@ const zeek_log_types = |{ }| yield nest_dotted(this) -| switch has(_path) ( +|> switch has(_path) ( case true => switch (_path in zeek_log_types) ( case true => yield {_original: this, _shaped: shape(zeek_log_types[_path])} - | switch has_error(_shaped) ( + |> switch has_error(_shaped) ( case true => yield error({msg: "shaper error(s): see inner error value(s) for details", _original, _shaped}) case false => yield {_original, _shaped} - | switch _crop_records ( + |> switch _crop_records ( case true => put _cropped := crop(_shaped, zeek_log_types[_shaped._path]) - | switch (_cropped == _shaped) ( + |> switch (_cropped == _shaped) ( case true => yield _shaped case false => yield {_original, _shaped, _cropped} - | switch _error_if_cropped ( + |> switch _error_if_cropped ( case true => yield error({msg: "shaper error: one or more fields were cropped", _original, _shaped, _cropped}) case false => yield _cropped ) @@ -208,18 +208,18 @@ so far. ``` yield nest_dotted(this) -| switch has(_path) ( +|> switch has(_path) ( case true => switch (_path in zeek_log_types) ( case true => yield {_original: this, _shaped: shape(zeek_log_types[_path])} - | switch has_error(_shaped) ( + |> switch has_error(_shaped) ( case true => yield error({msg: "shaper error(s): see inner error value(s) for details", _original, _shaped}) case false => yield {_original, _shaped} - | switch _crop_records ( + |> switch _crop_records ( case true => put _cropped := crop(_shaped, zeek_log_types[_shaped._path]) - | switch (_cropped == _shaped) ( + |> switch (_cropped == _shaped) ( case true => yield _shaped case false => yield {_original, _shaped, _cropped} - | switch _error_if_cropped ( + |> switch _error_if_cropped ( case true => yield error({msg: "shaper error: one ore more fields were cropped", _original, _shaped, _cropped}) case false => yield _cropped ) @@ -335,7 +335,7 @@ For example, to see a Super JSON representation of just the errors that may have come from attempting to shape all the logs in the current directory: ``` -super -Z -I shaper.zed -c '| has_error(this)' *.log +super -Z -I shaper.zed -c '|> has_error(this)' *.log ``` ## Importing Shaped Data Into Zui diff --git a/docs/lake/api.md b/docs/lake/api.md index 1288b0fad2..a114f2e083 100644 --- a/docs/lake/api.md +++ b/docs/lake/api.md @@ -411,7 +411,7 @@ POST /query curl -X POST \ -H 'Accept: application/x-zson' \ -H 'Content-Type: application/json' \ - http://localhost:9867/query -d '{"query":"from inventory@main | count() by warehouse"}' + http://localhost:9867/query -d '{"query":"from inventory@main |> count() by warehouse"}' ``` **Example Response** @@ -427,7 +427,7 @@ curl -X POST \ curl -X POST \ -H 'Accept: application/x-zjson' \ -H 'Content-Type: application/json' \ - http://localhost:9867/query?ctrl=T -d '{"query":"from inventory@main | count() by warehouse"}' + http://localhost:9867/query?ctrl=T -d '{"query":"from inventory@main |> count() by warehouse"}' ``` **Example Response** diff --git a/docs/language/aggregates/and.md b/docs/language/aggregates/and.md index 184dfe84f4..1de11e15b6 100644 --- a/docs/language/aggregates/and.md +++ b/docs/language/aggregates/and.md @@ -49,7 +49,7 @@ false AND of values grouped by key: ```mdtest-command echo '{a:true,k:1} {a:true,k:1} {a:true,k:2} {a:false,k:2}' | - super -z -c 'and(a) by k | sort' - + super -z -c 'and(a) by k |> sort' - ``` => ```mdtest-output diff --git a/docs/language/aggregates/any.md b/docs/language/aggregates/any.md index 415f767ab0..5c866ac46c 100644 --- a/docs/language/aggregates/any.md +++ b/docs/language/aggregates/any.md @@ -47,7 +47,7 @@ echo '"foo" 1 2 3 ' | super -z -c 'any(this)' - Pick from groups bucketed by key: ```mdtest-command echo '{a:1,k:1} {a:2,k:1} {a:3,k:2} {a:4,k:2}' | - super -z -c 'any(a) by k | sort' - + super -z -c 'any(a) by k |> sort' - ``` => ```mdtest-output diff --git a/docs/language/aggregates/avg.md b/docs/language/aggregates/avg.md index 266e2c7835..368cccbd10 100644 --- a/docs/language/aggregates/avg.md +++ b/docs/language/aggregates/avg.md @@ -46,7 +46,7 @@ echo '1 2 3 4 "foo"' | super -z -c 'avg(this)' - Average of values bucketed by key: ```mdtest-command echo '{a:1,k:1} {a:2,k:1} {a:3,k:2} {a:4,k:2}' | - super -z -c 'avg(a) by k | sort' - + super -z -c 'avg(a) by k |> sort' - ``` => ```mdtest-output diff --git a/docs/language/aggregates/collect.md b/docs/language/aggregates/collect.md index ba2bfcd38d..74c4cd3e6d 100644 --- a/docs/language/aggregates/collect.md +++ b/docs/language/aggregates/collect.md @@ -48,7 +48,7 @@ echo '1 2 3 4 "foo"' | super -z -c 'collect(this)' - Create arrays of values bucketed by key: ```mdtest-command echo '{a:1,k:1} {a:2,k:1} {a:3,k:2} {a:4,k:2}' | - super -z -c 'collect(a) by k | sort' - + super -z -c 'collect(a) by k |> sort' - ``` => ```mdtest-output diff --git a/docs/language/aggregates/collect_map.md b/docs/language/aggregates/collect_map.md index d01c8c64e4..3032ac13b0 100644 --- a/docs/language/aggregates/collect_map.md +++ b/docs/language/aggregates/collect_map.md @@ -44,7 +44,7 @@ echo '{stock:"APPL",price:145.03,day:0} {stock:"GOOG",price:87.07,day:0} {stock:"APPL",price:150.13,day:1} {stock:"GOOG",price:89.15,day:1}' | - super -z -c 'collect_map(|{stock:price}|) by day | sort' - + super -z -c 'collect_map(|{stock:price}|) by day |> sort' - ``` => ```mdtest-output diff --git a/docs/language/aggregates/count.md b/docs/language/aggregates/count.md index 82a59aa350..22a25b27ee 100644 --- a/docs/language/aggregates/count.md +++ b/docs/language/aggregates/count.md @@ -46,7 +46,7 @@ echo '1 "foo" 10.0.0.1' | super -z -c 'yield count()' - Count of values in buckets grouped by key: ```mdtest-command -echo '{a:1,k:1} {a:2,k:1} {a:3,k:2}' | super -z -c 'count() by k | sort' - +echo '{a:1,k:1} {a:2,k:1} {a:3,k:2}' | super -z -c 'count() by k |> sort' - ``` => ```mdtest-output @@ -56,7 +56,7 @@ echo '{a:1,k:1} {a:2,k:1} {a:3,k:2}' | super -z -c 'count() by k | sort' - A simple count with no input values returns no output: ```mdtest-command -echo '1 "foo" 10.0.0.1' | super -z -c 'where grep("bar") | count()' - +echo '1 "foo" 10.0.0.1' | super -z -c 'where grep("bar") |> count()' - ``` => ```mdtest-output diff --git a/docs/language/aggregates/dcount.md b/docs/language/aggregates/dcount.md index 66d8d46a3b..52357046bd 100644 --- a/docs/language/aggregates/dcount.md +++ b/docs/language/aggregates/dcount.md @@ -57,7 +57,7 @@ seq 10000 | super -z -c 'dcount(this)' - Count of values in buckets grouped by key: ```mdtest-command -echo '{a:1,k:1} {a:2,k:1} {a:3,k:2}' | super -z -c 'dcount(a) by k | sort' - +echo '{a:1,k:1} {a:2,k:1} {a:3,k:2}' | super -z -c 'dcount(a) by k |> sort' - ``` => ```mdtest-output diff --git a/docs/language/aggregates/fuse.md b/docs/language/aggregates/fuse.md index 46470a8629..498c856bcf 100644 --- a/docs/language/aggregates/fuse.md +++ b/docs/language/aggregates/fuse.md @@ -29,7 +29,7 @@ echo '{a:1,b:2}{a:2,b:"foo"}' | super -z -c 'fuse(this)' - Fuse records with a group-by key: ```mdtest-command echo '{a:1,b:"bar"}{a:2.1,b:"foo"}{a:3,b:"bar"}' | - super -z -c 'fuse(this) by b | sort' - + super -z -c 'fuse(this) by b |> sort' - ``` => ```mdtest-output diff --git a/docs/language/aggregates/max.md b/docs/language/aggregates/max.md index a1ad0e2e6e..4b672e3ffe 100644 --- a/docs/language/aggregates/max.md +++ b/docs/language/aggregates/max.md @@ -46,7 +46,7 @@ echo '1 2 3 4 "foo"' | super -z -c 'max(this)' - Maximum value within buckets grouped by key: ```mdtest-command echo '{a:1,k:1} {a:2,k:1} {a:3,k:2} {a:4,k:2}' | - super -z -c 'max(a) by k | sort' - + super -z -c 'max(a) by k |> sort' - ``` => ```mdtest-output diff --git a/docs/language/aggregates/min.md b/docs/language/aggregates/min.md index f646317776..06a8786494 100644 --- a/docs/language/aggregates/min.md +++ b/docs/language/aggregates/min.md @@ -46,7 +46,7 @@ echo '1 2 3 4 "foo"' | super -z -c 'min(this)' - Minimum value within buckets grouped by key: ```mdtest-command echo '{a:1,k:1} {a:2,k:1} {a:3,k:2} {a:4,k:2}' | - super -z -c 'min(a) by k | sort' - + super -z -c 'min(a) by k |> sort' - ``` => ```mdtest-output diff --git a/docs/language/aggregates/or.md b/docs/language/aggregates/or.md index 92bcf0fd78..884cca4e41 100644 --- a/docs/language/aggregates/or.md +++ b/docs/language/aggregates/or.md @@ -49,7 +49,7 @@ true OR of values grouped by key: ```mdtest-command echo '{a:true,k:1} {a:false,k:1} {a:false,k:2} {a:false,k:2}' | - super -z -c 'or(a) by k | sort' - + super -z -c 'or(a) by k |> sort' - ``` => ```mdtest-output diff --git a/docs/language/aggregates/sum.md b/docs/language/aggregates/sum.md index ec39e2d5a7..00dfd41e0f 100644 --- a/docs/language/aggregates/sum.md +++ b/docs/language/aggregates/sum.md @@ -46,7 +46,7 @@ echo '1 2 3 4 "foo"' | super -z -c 'sum(this)' - Sum of values bucketed by key: ```mdtest-command echo '{a:1,k:1} {a:2,k:1} {a:3,k:2} {a:4,k:2}' | - super -z -c 'sum(a) by k | sort' - + super -z -c 'sum(a) by k |> sort' - ``` => ```mdtest-output diff --git a/docs/language/aggregates/union.md b/docs/language/aggregates/union.md index 18d5c91a41..4265fa1da9 100644 --- a/docs/language/aggregates/union.md +++ b/docs/language/aggregates/union.md @@ -39,7 +39,7 @@ echo '1 2 3 3' | super -z -c 'yield union(this)' - Mixed types create a union type for the set elements: ```mdtest-command -echo '1 2 3 "foo"' | super -z -c 'set:=union(this) | yield this,typeof(set)' - +echo '1 2 3 "foo"' | super -z -c 'set:=union(this) |> yield this,typeof(set)' - ``` => ```mdtest-output @@ -50,7 +50,7 @@ echo '1 2 3 "foo"' | super -z -c 'set:=union(this) | yield this,typeof(set)' - Create sets of values bucketed by key: ```mdtest-command echo '{a:1,k:1} {a:2,k:1} {a:3,k:2} {a:4,k:2}' | - super -z -c 'union(a) by k | sort' - + super -z -c 'union(a) by k |> sort' - ``` => ```mdtest-output diff --git a/docs/language/data-types.md b/docs/language/data-types.md index 5eb4a6bbca..44d4969562 100644 --- a/docs/language/data-types.md +++ b/docs/language/data-types.md @@ -54,12 +54,12 @@ serve as group-by keys or be used in ["data shaping"](shaping.md) logic. A common workflow for data introspection is to first perform a search of exploratory data and then count the shapes of each type of data as follows: ``` -search ... | count() by typeof(this) +search ... |> count() by typeof(this) ``` For example, ```mdtest-command echo '1 2 "foo" 10.0.0.1 ' | - super -z -c 'count() by typeof(this) | sort this' - + super -z -c 'count() by typeof(this) |> sort this' - ``` produces ```mdtest-output @@ -145,7 +145,7 @@ named type retaining the proper type binding while accommodating changes in a particular named type. For example, ```mdtest-command echo '1(=foo) 2(=bar) "hello"(=foo) 3(=foo)' | - super -z -c 'count() by typeof(this) | sort this' - + super -z -c 'count() by typeof(this) |> sort this' - ``` results in ```mdtest-output diff --git a/docs/language/expressions.md b/docs/language/expressions.md index 660cf45dcb..b2257b9eab 100644 --- a/docs/language/expressions.md +++ b/docs/language/expressions.md @@ -81,7 +81,7 @@ produces You can also use this operator with a static array: ```mdtest-command echo '{accounts:[{id:1},{id:2},{id:3}]}' | - super -z -c 'over accounts | where id in [1,2]' - + super -z -c 'over accounts |> where id in [1,2]' - ``` produces ```mdtest-output diff --git a/docs/language/functions/cast.md b/docs/language/functions/cast.md index e654ab410d..63819d1b66 100644 --- a/docs/language/functions/cast.md +++ b/docs/language/functions/cast.md @@ -88,7 +88,7 @@ echo '{x:1,y:2}{r:3}{x:4,y:5}' | case has(x) => cast(this, "point") default => cast(this, "radius") ) - | sort this' - + |> sort this' - ``` produces ```mdtest-output diff --git a/docs/language/functions/error.md b/docs/language/functions/error.md index cc17d6bbf0..b67c34ce8c 100644 --- a/docs/language/functions/error.md +++ b/docs/language/functions/error.md @@ -60,7 +60,7 @@ Comparison of a missing error results in a missing error even if they are the same missing errors so as to not allow field comparisons of two missing fields to succeed: ```mdtest-command -echo '{}' | super -z -c 'badfield:=x | yield badfield==error("missing")' - +echo '{}' | super -z -c 'badfield:=x |> yield badfield==error("missing")' - ``` => ```mdtest-output diff --git a/docs/language/functions/every.md b/docs/language/functions/every.md index 560546c019..cd5b0e053e 100644 --- a/docs/language/functions/every.md +++ b/docs/language/functions/every.md @@ -20,8 +20,8 @@ Operate on a sequence of times: ```mdtest-command echo '{ts:2021-02-01T12:00:01Z}' | super -z -c 'yield {ts,val:0},{ts:ts+1s},{ts:ts+2h2s} - | yield every(1h) - | sort' - + |> yield every(1h) + |> sort' - ``` -> ```mdtest-output @@ -33,8 +33,8 @@ Use as a group-by key: ```mdtest-command echo '{ts:2021-02-01T12:00:01Z}' | super -z -c 'yield {ts,val:1},{ts:ts+1s,val:2},{ts:ts+2h2s,val:5} - | sum(val) by every(1h) - | sort' - + |> sum(val) by every(1h) + |> sort' - ``` -> ```mdtest-output diff --git a/docs/language/functions/fields.md b/docs/language/functions/fields.md index c962f96306..ebce2916c6 100644 --- a/docs/language/functions/fields.md +++ b/docs/language/functions/fields.md @@ -30,7 +30,7 @@ echo '{a:1,b:2,c:{d:3,e:4}}' | super -z -c 'yield fields(this)' - Easily convert to dotted names if you prefer: ```mdtest-command echo '{a:1,b:2,c:{d:3,e:4}}' | - super -z -c 'over fields(this) | yield join(this,".")' - + super -z -c 'over fields(this) |> yield join(this,".")' - ``` => ```mdtest-output diff --git a/docs/language/functions/has_error.md b/docs/language/functions/has_error.md index e29c6e317d..d7af8be356 100644 --- a/docs/language/functions/has_error.md +++ b/docs/language/functions/has_error.md @@ -18,7 +18,7 @@ into value's leaves to determine if there is an error in the value. ```mdtest-command echo '{a:{b:"foo"}}' | super -z -c 'yield has_error(this)' - -echo '{a:{b:"foo"}}' | super -z -c 'a.x := a.y + 1 | yield has_error(this)' - +echo '{a:{b:"foo"}}' | super -z -c 'a.x := a.y + 1 |> yield has_error(this)' - ``` => ```mdtest-output diff --git a/docs/language/functions/unflatten.md b/docs/language/functions/unflatten.md index a62ace3b45..ffad06a3b1 100644 --- a/docs/language/functions/unflatten.md +++ b/docs/language/functions/unflatten.md @@ -30,9 +30,9 @@ Flatten to unflatten: echo '{a:1,rm:2}' | super -z -c 'over flatten(this) => ( key[0] != "rm" - | yield collect(this) + |> yield collect(this) ) - | yield unflatten(this) + |> yield unflatten(this) ' - ``` => diff --git a/docs/language/lateral-subqueries.md b/docs/language/lateral-subqueries.md index b7cc1491a4..615943662f 100644 --- a/docs/language/lateral-subqueries.md +++ b/docs/language/lateral-subqueries.md @@ -109,8 +109,8 @@ applied to each subsequence in the subquery, where `sort` reads all values of the subsequence, sorts them, emits them, then repeats the process for the next subsequence. For example, ```mdtest-command -echo '[3,2,1] [4,1,7] [1,2,3]' | - super -z -c 'over this => (sort this | collect(this))' - +echo '[3,2,1] [4,1,7] [1,2,3]' | + super -z -c 'over this => (sort this |> collect(this))' - ``` produces ```mdtest-output @@ -124,7 +124,7 @@ produces Lateral subqueries can also appear in expression context using the parenthesized form: ``` -( over [, ...] [with = [, ... [=]] | ) +( over [, ...] [with = [, ... [=]] |> ) ``` :::tip @@ -138,7 +138,7 @@ the results as inputs to the `` pipeline. Each time the lateral expression is evaluated, the lateral operators are run to completion, e.g., ```mdtest-command -echo '[3,2,1] [4,1,7] [1,2,3]' | super -z -c 'yield (over this | sum(this))' - +echo '[3,2,1] [4,1,7] [1,2,3]' | super -z -c 'yield (over this |> sum(this))' - ``` produces ```mdtest-output @@ -152,8 +152,8 @@ and use the spread operator to tighten up the output: ```mdtest-command echo '[3,2,1] [4,1,7] [1,2,3]' | super -z -c ' - {...(over this | sort this | sorted:=collect(this)), - ...(over this | sum:=sum(this))}' - + {...(over this |> sort this |> sorted:=collect(this)), + ...(over this |> sum:=sum(this))}' - ``` produces ```mdtest-output @@ -166,7 +166,7 @@ at the conclusion of the lateral pipeline, they are automatically wrapped in an array, e.g., ```mdtest-command echo '{x:1} {x:[2]} {x:[3,4]}' | - super -z -c 'yield {s:(over x | yield this+1)}' - + super -z -c 'yield {s:(over x |> yield this+1)}' - ``` produces ```mdtest-output @@ -179,7 +179,7 @@ always receives consistently packaged values by explicitly wrapping the result of the lateral scope, e.g., ```mdtest-command echo '{x:1} {x:[2]} {x:[3,4]}' | - super -z -c 'yield {s:(over x | yield this+1 | collect(this))}' - + super -z -c 'yield {s:(over x |> yield this+1 |> collect(this))}' - ``` produces ```mdtest-output diff --git a/docs/language/operators/combine.md b/docs/language/operators/combine.md index f142f9dc82..7219b65476 100644 --- a/docs/language/operators/combine.md +++ b/docs/language/operators/combine.md @@ -5,7 +5,7 @@ ### Synopsis ``` -( => ... => ...) | ... +( => ... => ...) |> ... ``` ### Description @@ -21,7 +21,7 @@ and its semantics of undefined merge order. _Copy input to two pipeline branches and combine with the implied operator_ ```mdtest-command -echo '1 2' | super -z -c 'fork (=>pass =>pass) | sort this' - +echo '1 2' | super -z -c 'fork (=>pass =>pass) |> sort this' - ``` => ```mdtest-output diff --git a/docs/language/operators/cut.md b/docs/language/operators/cut.md index e49537f1e1..fc58461308 100644 --- a/docs/language/operators/cut.md +++ b/docs/language/operators/cut.md @@ -23,7 +23,7 @@ Each right-hand side `` can be any Zed expression and is optional. When the right-hand side expressions are omitted, the _cut_ operation resembles the Unix shell command, e.g., ``` -... | cut a,c | ... +... |> cut a,c |> ... ``` If an expression results in `error("quiet")`, the corresponding field is omitted from the output. This allows you to wrap expressions in a `quiet()` function diff --git a/docs/language/operators/fork.md b/docs/language/operators/fork.md index e4c42d1870..8761cf8cf7 100644 --- a/docs/language/operators/fork.md +++ b/docs/language/operators/fork.md @@ -24,7 +24,7 @@ merged with an automatically inserted [combine operator](combine.md). _Copy input to two pipeline branches and merge_ ```mdtest-command -echo '1 2' | super -z -c 'fork (=>pass =>pass) | sort this' - +echo '1 2' | super -z -c 'fork (=>pass =>pass) |> sort this' - ``` => ```mdtest-output diff --git a/docs/language/operators/from.md b/docs/language/operators/from.md index 3f203ca53b..0e6b9c7bc5 100644 --- a/docs/language/operators/from.md +++ b/docs/language/operators/from.md @@ -47,28 +47,28 @@ In the fifth form, multiple sources are accessed in parallel and may be A pipeline can be split with the [`fork` operator](fork.md) as in ``` -from PoolOne | fork ( - => op1 | op2 | ... - => op1 | op2 | ... -) | merge ts | ... +from PoolOne |> fork ( + => op1 |> op2 | ... + => op1 |> op2 | ... +) |> merge ts | ... ``` Or multiple pools can be accessed and, for example, joined: ``` from ( - pool PoolOne => op1 | op2 | ... - pool PoolTwo => op1 | op2 | ... -) | join on key=key | ... + pool PoolOne => op1 |> op2 | ... + pool PoolTwo => op1 |> op2 | ... +) |> join on key=key | ... ``` Similarly, data can be routed to different pipeline branches with replication using the [`switch` operator](switch.md): ``` -from ... | switch color ( - case "red" => op1 | op2 | ... - case "blue" => op1 | op2 | ... - default => op1 | op2 | ... -) | ... +from ... |> switch color ( + case "red" => op1 |> op2 | ... + case "blue" => op1 |> op2 | ... + default => op1 |> op2 | ... +) |> ... ``` ### Input Data @@ -89,8 +89,8 @@ echo '{number:1,word:"one"} {number:2,word:"two"} {number:3,word:"three"}' | super db load -q -use numbers - super db query -f text ' from :branches - | yield pool.name + "@" + branch.name - | sort' + |> yield pool.name + "@" + branch.name + |> sort' ``` The lake then contains the two pools: @@ -112,7 +112,7 @@ The following file `hello.jsup` is also used. _Source structured data from a local file_ ```mdtest-command -super -z -c 'file hello.jsup | yield greeting' +super -z -c 'file hello.jsup |> yield greeting' ``` => ```mdtest-output @@ -131,7 +131,7 @@ super -z -c 'file hello.jsup format line' _Source structured data from a URI_ ``` super -z -c 'get https://raw.githubusercontent.com/brimdata/zui-insiders/main/package.json - | yield productName' + |> yield productName' ``` => ``` @@ -161,7 +161,7 @@ super db -lake example query -z 'from coinflips@trial' _Count the number of values in the `main` branch of all pools_ ```mdtest-command -super db -lake example query -f text 'from * | count()' +super db -lake example query -f text 'from * |> count()' ``` => ```mdtest-output @@ -170,9 +170,9 @@ super db -lake example query -f text 'from * | count()' _Join the data from multiple pools_ ```mdtest-command super db -lake example query -z ' - from coinflips | sort flip - | join ( - from numbers | sort number + from coinflips |> sort flip + |> join ( + from numbers |> sort number ) on flip=number word' ``` => @@ -184,16 +184,16 @@ super db -lake example query -z ' _Use `pass` to combine our join output with data from yet another source_ ```mdtest-command super db -lake example query -z ' - from coinflips | sort flip - | join ( - from numbers | sort number + from coinflips |> sort flip + |> join ( + from numbers |> sort number ) on flip=number word - | from ( + |> from ( pass pool coinflips@trial => c:=count() - | yield f"There were {int64(c)} flips" - ) | sort this' + |> yield f"There were {int64(c)} flips" + ) |> sort this' ``` => ```mdtest-output diff --git a/docs/language/operators/load.md b/docs/language/operators/load.md index e7e014ae67..85b274d01c 100644 --- a/docs/language/operators/load.md +++ b/docs/language/operators/load.md @@ -42,8 +42,8 @@ echo '{flip:1,result:"heads"} {flip:2,result:"tails"}' | super db -q create -orderby flip:asc bigflips super db query -f text ' from :branches - | yield pool.name + "@" + branch.name - | sort' + |> yield pool.name + "@" + branch.name + |> sort' ``` The lake then contains the two pools: @@ -60,8 +60,8 @@ _Modify some values, load them into the `main` branch of our empty `bigflips` po ```mdtest-command super db -lake example query ' from coinflips - | result:=upper(result) - | load bigflips + |> result:=upper(result) + |> load bigflips ' > /dev/null super db -lake example query -z 'from bigflips' @@ -76,8 +76,8 @@ _Add a filtered subset of records to our `onlytails` branch, while also adding m ```mdtest-command super db -lake example query ' from coinflips - | result=="tails" - | load coinflips@onlytails + |> result=="tails" + |> load coinflips@onlytails author "Steve" message "A subset" meta "\"Additional metadata\"" diff --git a/docs/language/operators/merge.md b/docs/language/operators/merge.md index 30c63c49f8..d85ab581cb 100644 --- a/docs/language/operators/merge.md +++ b/docs/language/operators/merge.md @@ -5,7 +5,7 @@ ### Synopsis ``` -( => ... => ...) | merge [, , ...] +( => ... => ...) |> merge [, , ...] ``` ### Description @@ -18,7 +18,7 @@ where the values from the upstream pipeline branches are forwarded based on thes _Copy input to two pipeline branches and merge_ ```mdtest-command -echo '1 2' | super -z -c 'fork (=>pass =>pass) | merge this' - +echo '1 2' | super -z -c 'fork (=>pass =>pass) |> merge this' - ``` => ```mdtest-output diff --git a/docs/language/operators/over.md b/docs/language/operators/over.md index b34a6100a4..237a66c79c 100644 --- a/docs/language/operators/over.md +++ b/docs/language/operators/over.md @@ -76,7 +76,7 @@ echo '{a:[1,2,3]}' | super -z -c 'over a' - _Filter the traversed values_ ```mdtest-command -echo '{a:[6,5,4]} {a:[3,2,1]}' | super -z -c 'over a | this % 2 == 0' - +echo '{a:[6,5,4]} {a:[3,2,1]}' | super -z -c 'over a |> this % 2 == 0' - ``` => ```mdtest-output @@ -87,7 +87,7 @@ echo '{a:[6,5,4]} {a:[3,2,1]}' | super -z -c 'over a | this % 2 == 0' - _Aggregate the traversed values_ ```mdtest-command -echo '{a:[1,2]} {a:[3,4,5]}' | super -z -c 'over a | sum(this)' - +echo '{a:[1,2]} {a:[3,4,5]}' | super -z -c 'over a |> sum(this)' - ``` => ```mdtest-output @@ -105,7 +105,7 @@ echo '{a:[1,2]} {a:[3,4,5]}' | super -z -c 'over a => ( sum(this) )' - _Access the outer values in a lateral query_ ```mdtest-command echo '{a:[1,2],s:"foo"} {a:[3,4,5],s:"bar"}' | - super -z -c 'over a with s => (sum(this) | yield {s,sum:this})' - + super -z -c 'over a with s => (sum(this) |> yield {s,sum:this})' - ``` => ```mdtest-output diff --git a/docs/language/operators/pass.md b/docs/language/operators/pass.md index cc314cf277..77860c874a 100644 --- a/docs/language/operators/pass.md +++ b/docs/language/operators/pass.md @@ -33,7 +33,7 @@ echo '"HeLlo, WoRlD!"' | super -z -c ' => pass => upper(this) => lower(this) -) | sort' - +) |> sort' - ``` => ```mdtest-output diff --git a/docs/language/operators/rename.md b/docs/language/operators/rename.md index 84ce407eeb..5995e7ff98 100644 --- a/docs/language/operators/rename.md +++ b/docs/language/operators/rename.md @@ -63,7 +63,7 @@ echo '{a:1,r:{b:2,c:3}}' | super -z -c 'yield {a,r:{c:r.c},w:r.b}' - ``` _Alternatively, mutations can be more generic and use drop_ ```mdtest-command -echo '{a:1,r:{b:2,c:3}}' | super -z -c 'yield {a,r,w:r.b} | drop r.b' - +echo '{a:1,r:{b:2,c:3}}' | super -z -c 'yield {a,r,w:r.b} |> drop r.b' - ``` => ```mdtest-output diff --git a/docs/language/operators/sample.md b/docs/language/operators/sample.md index 7769a83ac7..b7530a6d55 100644 --- a/docs/language/operators/sample.md +++ b/docs/language/operators/sample.md @@ -10,7 +10,7 @@ sample [] The `sample` operator is a syntactic shortcut for ``` -val:=any() by typeof() | yield val +val:=any() by typeof() |> yield val ``` If `` is not provided, `this` is used. @@ -23,7 +23,7 @@ through it all to slice and dice it. _A simple sample_ ```mdtest-command -echo '1 2 3 "foo" "bar" 10.0.0.1 10.0.0.2' | super -z -c 'sample | sort this' - +echo '1 2 3 "foo" "bar" 10.0.0.1 10.0.0.2' | super -z -c 'sample |> sort this' - ``` => ```mdtest-output @@ -35,7 +35,7 @@ echo '1 2 3 "foo" "bar" 10.0.0.1 10.0.0.2' | super -z -c 'sample | sort this' - _Sampling record shapes_ ```mdtest-command echo '{a:1}{a:2}{s:"foo"}{s:"bar"}{a:3,s:"baz"}' | - super -z -c 'sample | sort a' - + super -z -c 'sample |> sort a' - ``` => ```mdtest-output diff --git a/docs/language/operators/summarize.md b/docs/language/operators/summarize.md index 537643e230..45a7e59ac4 100644 --- a/docs/language/operators/summarize.md +++ b/docs/language/operators/summarize.md @@ -93,7 +93,7 @@ echo '1 2 3 4' | super -z -c 'sum(this)' - Create integer sets by key and sort the output to get a deterministic order: ```mdtest-command echo '{k:"foo",v:1}{k:"bar",v:2}{k:"foo",v:3}{k:"baz",v:4}' | - super -z -c 'set:=union(v) by key:=k | sort' - + super -z -c 'set:=union(v) by key:=k |> sort' - ``` => ```mdtest-output @@ -105,7 +105,7 @@ echo '{k:"foo",v:1}{k:"bar",v:2}{k:"foo",v:3}{k:"baz",v:4}' | Use a `where` clause: ```mdtest-command echo '{k:"foo",v:1}{k:"bar",v:2}{k:"foo",v:3}{k:"baz",v:4}' | - super -z -c 'set:=union(v) where v > 1 by key:=k | sort' - + super -z -c 'set:=union(v) where v > 1 by key:=k |> sort' - ``` => ```mdtest-output @@ -119,7 +119,7 @@ Use separate `where` clauses on each aggregate function: echo '{k:"foo",v:1}{k:"bar",v:2}{k:"foo",v:3}{k:"baz",v:4}' | super -z -c 'set:=union(v) where v > 1, array:=collect(v) where k=="foo" - by key:=k | sort' - + by key:=k |> sort' - ``` => ```mdtest-output @@ -132,7 +132,7 @@ Results are included for `by` groupings that generate null results when `where` clauses are used inside `summarize`: ```mdtest-command echo '{k:"foo",v:1}{k:"bar",v:2}{k:"foo",v:3}{k:"baz",v:4}' | - super -z -c 'sum(v) where k=="bar" by key:=k | sort' - + super -z -c 'sum(v) where k=="bar" by key:=k |> sort' - ``` => ```mdtest-output @@ -144,7 +144,7 @@ echo '{k:"foo",v:1}{k:"bar",v:2}{k:"foo",v:3}{k:"baz",v:4}' | To avoid null results for `by` groupings a just shown, filter before `summarize`: ```mdtest-command echo '{k:"foo",v:1}{k:"bar",v:2}{k:"foo",v:3}{k:"baz",v:4}' | - super -z -c 'k=="bar" | sum(v) by key:=k | sort' - + super -z -c 'k=="bar" |> sum(v) by key:=k |> sort' - ``` => ```mdtest-output @@ -154,7 +154,7 @@ echo '{k:"foo",v:1}{k:"bar",v:2}{k:"foo",v:3}{k:"baz",v:4}' | Output just the unique key values: ```mdtest-command echo '{k:"foo",v:1}{k:"bar",v:2}{k:"foo",v:3}{k:"baz",v:4}' | - super -z -c 'by k | sort' - + super -z -c 'by k |> sort' - ``` => ```mdtest-output diff --git a/docs/language/operators/switch.md b/docs/language/operators/switch.md index 3136827285..a70047d1ac 100644 --- a/docs/language/operators/switch.md +++ b/docs/language/operators/switch.md @@ -54,7 +54,7 @@ echo '1 2 3 4' | case this%2==0 => {even:this} case this%2==1 => {odd:this} ) - | sort odd,even + |> sort odd,even ' - ``` => @@ -72,7 +72,7 @@ echo '1 2 3 4' | case 1 => yield "1!" default => yield string(this) ) - | sort + |> sort ' - ``` => diff --git a/docs/language/operators/top.md b/docs/language/operators/top.md index d4a817ee1e..7dfc68872b 100644 --- a/docs/language/operators/top.md +++ b/docs/language/operators/top.md @@ -33,7 +33,7 @@ _Find the two names most frequently referenced in a sequence of records_ echo '{name:"joe", age:22} {name:"bob", age:37} {name:"liz", age:25} {name:"bob", age:18} {name:"liz", age:34} {name:"zoe", age:55} {name:"ray", age:44} {name:"sue", age:41} {name:"liz", age:60}' | - super -z -c 'count() by name | top 2 count' - + super -z -c 'count() by name |> top 2 count' - ``` => ```mdtest-output diff --git a/docs/language/operators/uniq.md b/docs/language/operators/uniq.md index 3e5c15dff9..0425cfbb7a 100644 --- a/docs/language/operators/uniq.md +++ b/docs/language/operators/uniq.md @@ -48,7 +48,7 @@ echo '1 2 2 3' | super -z -c 'uniq -c' - _Use sort to deduplicate non-adjacent values_ ```mdtest-command echo '"hello" "world" "goodbye" "world" "hello" "again"' | - super -z -c 'sort | uniq' - + super -z -c 'sort |> uniq' - ``` => ```mdtest-output diff --git a/docs/language/operators/yield.md b/docs/language/operators/yield.md index 1ff4465f34..f5aedca706 100644 --- a/docs/language/operators/yield.md +++ b/docs/language/operators/yield.md @@ -52,7 +52,7 @@ echo '1 2 3' | super -z -c 'yield this*2+1' - ``` _Yield is often used to transform records_ ```mdtest-command -echo '{a:1,b:2}{a:3,b:4}' | super -z -c 'yield [a,b],[b,a] | collect(this)' - +echo '{a:1,b:2}{a:3,b:4}' | super -z -c 'yield [a,b],[b,a] |> collect(this)' - ``` => ```mdtest-output diff --git a/docs/language/overview.md b/docs/language/overview.md index c1100053f2..19123829a8 100644 --- a/docs/language/overview.md +++ b/docs/language/overview.md @@ -14,7 +14,7 @@ of the traditional Unix shell. Like a Unix pipeline, a query is expressed as a data source followed by a number of commands: ``` -command | command | command | ... +command |> command | command | ... ``` However, in Zed, the entities that transform data are called "[operators](operators/README.md)" instead of "commands" and unlike Unix pipelines, @@ -26,10 +26,10 @@ Moreover, Zed sequences can be forked and joined: operator | operator | fork ( - => operator | ... - => operator | ... + => operator |> ... + => operator |> ... ) -| join | ... +| join |> ... ``` Here, Zed programs can include multiple data sources and splitting operations where multiple pipeline branches run in parallel and branches can be combined (in an diff --git a/docs/language/pipeline-model.md b/docs/language/pipeline-model.md index 96dcdcc362..121ad3d316 100644 --- a/docs/language/pipeline-model.md +++ b/docs/language/pipeline-model.md @@ -26,7 +26,7 @@ HTTP endpoint and process it with `super`, in this case, to extract the descript and license of a GitHub repository: ``` super -f text -c 'get https://api.github.com/repos/brimdata/super - | yield description,license.name' + |> yield description,license.name' ``` When a query is run on the command-line with `super`, the `from` source is typically omitted and implied instead by the command-line file arguments. @@ -88,7 +88,7 @@ switch this ( case 1 => yield {val:this,message:"one"} case 2 => yield {val:this,message:"two"} default => yield {val:this,message:"many"} -) | merge val +) |> merge val ``` Then, running `super` with `-I switch.spq` like so: ```mdtest-command diff --git a/docs/language/shaping.md b/docs/language/shaping.md index 457346366f..98e659da31 100644 --- a/docs/language/shaping.md +++ b/docs/language/shaping.md @@ -217,7 +217,7 @@ apply `crop` to the output of `shape`, e.g., ```mdtest-command super -Z -I connection.zed -c ' shape(this, ) - | crop(this, ) + |> crop(this, ) ' sample.json ``` drops the `uid` field after shaping: @@ -297,7 +297,7 @@ to debug the problem, e.g., ```mdtest-command super -Z -I connection.zed -c ' yield {original: this, shaped: shape(this, )} - | yield has_error(shaped) + |> yield has_error(shaped) ? error({ msg: "shaper error (see inner errors for details)", original, @@ -353,7 +353,7 @@ we can execute ```mdtest-command super -Z -I connection.zed -c ' yield {original: this, cropped: crop(this, )} - | yield original==cropped + |> yield original==cropped ? original : error({msg: "data was cropped", original, cropped}) ' sample.json @@ -479,7 +479,7 @@ will fuse records based on their number of fields using the [`len` function:](functions/len.md) ```mdtest-command echo '{x:1} {x:"foo",y:"foo"} {x:2,y:"bar"}' | - super -z -c 'fuse(this) by len(this) | sort len' - + super -z -c 'fuse(this) by len(this) |> sort len' - ``` which produces ```mdtest-output @@ -498,7 +498,7 @@ switch len(this) ( when we run ```mdtest-command echo '{x:1} {x:"foo",y:"foo"} {x:2,y:"bar"} {a:1,b:2,c:3}' | - super -z -I shape.zed -c '| sort this desc' - + super -z -I shape.zed -c '|> sort this desc' - ``` we get ```mdtest-output diff --git a/docs/language/statements.md b/docs/language/statements.md index f076b993ad..75beed3fdf 100644 --- a/docs/language/statements.md +++ b/docs/language/statements.md @@ -81,7 +81,7 @@ op ( [ [, ...]] ) : ( ) ``` where `` is the operator identifier, `` are the parameters for the -operator, and `` is the chain of operators (e.g., `operator | ...`) +operator, and `` is the chain of operators (e.g., `operator |> ...`) where the operator does its work. A user-defined operator can then be called with using the familiar call syntax @@ -172,7 +172,7 @@ the data source of a [`from` operator](operators/from.md). For example, we quote the pool name in our program `count-pool.spq` ```mdtest-input count-pool.spq op CountPool(pool_name): ( - from [pool_name] | count() + from [pool_name] |> count() ) CountPool("example") @@ -200,10 +200,10 @@ op add1(x): ( x := x + 1 ) op add2(x): ( - add1(x) | add1(x) + add1(x) |> add1(x) ) op add4(x): ( - add2(x) | add2(x) + add2(x) |> add2(x) ) add4(a.b) diff --git a/docs/language/ztests/language-background-2.yaml b/docs/language/ztests/language-background-2.yaml index 4287a8bf05..c69d3f31b0 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-5.yaml b/docs/language/ztests/language-background-5.yaml index 876c601de5..0a515a3131 100644 --- a/docs/language/ztests/language-background-5.yaml +++ b/docs/language/ztests/language-background-5.yaml @@ -11,7 +11,7 @@ # test output from the aggregation. zed: | - summarize count() by color | sort + summarize count() by color |> sort input: | {"color":"brown","name":"kiwi","flavor":"sweet"} diff --git a/docs/language/ztests/language-background-6.yaml b/docs/language/ztests/language-background-6.yaml index a3c19f47d9..9362b47a58 100644 --- a/docs/language/ztests/language-background-6.yaml +++ b/docs/language/ztests/language-background-6.yaml @@ -11,7 +11,7 @@ # test output from the aggregation. zed: | - count() by color | sort + count() by color |> sort input: | {"color":"brown","name":"kiwi","flavor":"sweet"} diff --git a/docs/language/ztests/language-background-8.yaml b/docs/language/ztests/language-background-8.yaml index 88b73ade37..d4fa221b03 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-background-9.yaml b/docs/language/ztests/language-background-9.yaml index 064f35c2af..a4b3acb64d 100644 --- a/docs/language/ztests/language-background-9.yaml +++ b/docs/language/ztests/language-background-9.yaml @@ -11,9 +11,9 @@ zed: | search widget and price > 1000 - | summarize count() by color - | where count >= 10 - | sort count + |> summarize count() by color + |> where count >= 10 + |> sort count input: | {"color":"brown","widget":"kiwi","flavor":"sweet","price":1001} diff --git a/docs/language/ztests/language-directed-acyclic-flow-graphs-1.yaml b/docs/language/ztests/language-directed-acyclic-flow-graphs-1.yaml index c090f24385..07c4925211 100644 --- a/docs/language/ztests/language-directed-acyclic-flow-graphs-1.yaml +++ b/docs/language/ztests/language-directed-acyclic-flow-graphs-1.yaml @@ -9,10 +9,10 @@ # The SuperPipe being tested below has been modified from the way it appears in # docs/language/README.md: # -# from PoolOne | fork ( -# => op1 | op2 | ... -# => op1 | op2 | ... -# ) | merge ts | ... +# from PoolOne |> fork ( +# => op1 |> op2 |> ... +# => op1 |> op2 |> ... +# ) |> merge ts |> ... # # Specifically, the "op1", "op2", and "..." have been filled in with real # operations, and the "merge" has been replaced with a "sort" for now since @@ -35,10 +35,10 @@ inputs: {ts:2018-03-24T17:23:29Z,name:"strawberry",color:"red"} - name: split.spq data: | - from PoolOne | fork ( - => allfruit:=collect(name),allcolor:=collect(color) by every(5m) | put numfruit:=len(allfruit) | put numcolor:=len(allcolor) - => put color:=upper(color) | put namelen:=len(name) | put tag:="mytag" - ) | sort ts | rename time:=ts + from PoolOne |> fork ( + => allfruit:=collect(name),allcolor:=collect(color) by every(5m) |> put numfruit:=len(allfruit) |> put numcolor:=len(allcolor) + => put color:=upper(color) |> put namelen:=len(name) |> put tag:="mytag" + ) |> sort ts |> rename time:=ts outputs: - name: stdout diff --git a/docs/language/ztests/language-directed-acyclic-flow-graphs-2.yaml b/docs/language/ztests/language-directed-acyclic-flow-graphs-2.yaml index 10fd70e625..8a3158c701 100644 --- a/docs/language/ztests/language-directed-acyclic-flow-graphs-2.yaml +++ b/docs/language/ztests/language-directed-acyclic-flow-graphs-2.yaml @@ -10,9 +10,9 @@ # docs/language/README.md: # # from ( -# pool PoolOne => op1 | op2 | ... -# pool PoolTwo => op1 | op2 | ... -# ) | join on key=key | ... +# pool PoolOne => op1 |> op2 |> ... +# pool PoolTwo => op1 |> op2 |> ... +# ) |> join on key=key |> ... # # Specifically, the "op1", "op2", and "..." have been filled in with real # operations, and a field assignment has been added to the join @@ -43,9 +43,9 @@ inputs: - name: join.spq data: | from ( - pool PoolOne => put color:=upper(color) | put namelen:=len(key) - pool PoolTwo => put price:=price+0.5 | put tag:="mytag" - ) | join on key=key priceinfo:=this | drop priceinfo.key + pool PoolOne => put color:=upper(color) |> put namelen:=len(key) + pool PoolTwo => put price:=price+0.5 |> put tag:="mytag" + ) |> join on key=key priceinfo:=this |> drop priceinfo.key outputs: - name: stdout diff --git a/docs/language/ztests/language-directed-acyclic-flow-graphs-3.yaml b/docs/language/ztests/language-directed-acyclic-flow-graphs-3.yaml index 4181bfe787..6b1e93b081 100644 --- a/docs/language/ztests/language-directed-acyclic-flow-graphs-3.yaml +++ b/docs/language/ztests/language-directed-acyclic-flow-graphs-3.yaml @@ -9,11 +9,11 @@ # The SuperPipe being tested below has been modified from the way it appears in # docs/language/README.md: # -# from ... | switch color ( -# case "red" => op1 | op2 | ... -# case "blue" => op1 | op2 | ... -# default => op1 | op2 | ... -# ) | ... +# from ... |> switch color ( +# case "red" => op1 |> op2 |> ... +# case "blue" => op1 |> op2 |> ... +# default => op1 |> op2 |> ... +# ) |> ... # # Specifically, the "op1", "op2", and "..." have been filled in with real # operations. @@ -33,11 +33,11 @@ inputs: {name:"blueberry",color:"blue",price:0.1} - name: switch.spq data: | - from fruit | switch color ( - case "red" => put price:=price+0.5 | put bigcolor:=upper(color) | put tag:="expensive" - case "blue" => put price:=price+0.1 | put colorlen:=len(color) | put tag:="cheaper" - default => put price:=price-0.1 | put promo:="discounted" | put tag:="promoted" - ) | sort name + from fruit |> switch color ( + case "red" => put price:=price+0.5 |> put bigcolor:=upper(color) |> put tag:="expensive" + case "blue" => put price:=price+0.1 |> put colorlen:=len(color) |> put tag:="cheaper" + default => put price:=price-0.1 |> put promo:="discounted" |> put tag:="promoted" + ) |> sort name outputs: - name: stdout diff --git a/docs/language/ztests/language-operators-1.yaml b/docs/language/ztests/language-operators-1.yaml index ef4b4bb11b..3932de3965 100644 --- a/docs/language/ztests/language-operators-1.yaml +++ b/docs/language/ztests/language-operators-1.yaml @@ -7,12 +7,12 @@ # ============================================================================ script: | - super compile -C 'widget | count() by color | COLOR := upper(color)' + super compile -C 'widget |> count() by color |> COLOR := upper(color)' outputs: - name: stdout data: | search widget - | summarize + |> summarize count() by color - | put COLOR:=upper(color) + |> put COLOR:=upper(color) diff --git a/docs/language/ztests/language-tldr-1.yaml b/docs/language/ztests/language-tldr-1.yaml index ceade7da0b..0bfd34fed1 100644 --- a/docs/language/ztests/language-tldr-1.yaml +++ b/docs/language/ztests/language-tldr-1.yaml @@ -11,7 +11,7 @@ # test output from the aggregation. zed: | - color=="brown" | put characters:=len(name) | count() by flavor,characters | sort + color=="brown" |> put characters:=len(name) |> count() by flavor,characters |> sort input: | {"color":"brown","name":"kiwi","flavor":"sweet"} diff --git a/docs/language/ztests/language-tldr-2.yaml b/docs/language/ztests/language-tldr-2.yaml index 187a0ba023..247dd03377 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/libraries/python.md b/docs/libraries/python.md index 377554d002..386fd8c9b1 100644 --- a/docs/libraries/python.md +++ b/docs/libraries/python.md @@ -26,7 +26,7 @@ pip3 install "git+https://github.com/brimdata/super#subdirectory=python/zed" Install the version compatible with a local `zed` like this: ```sh -pip3 install "git+https://github.com/brimdata/super@$(zed -version | cut -d ' ' -f 2)#subdirectory=python/zed" +pip3 install "git+https://github.com/brimdata/super@$(zed -version |> cut -d ' ' -f 2)#subdirectory=python/zed" ``` ## Example diff --git a/docs/tutorials/join.md b/docs/tutorials/join.md index d7831f4211..4e06e371c4 100644 --- a/docs/tutorials/join.md +++ b/docs/tutorials/join.md @@ -46,7 +46,7 @@ explicit `inner` is not strictly necessary, but including it clarifies our inten The SuperPipe query `inner-join.spq`: ```mdtest-input inner-join.spq file fruit.json -| inner join ( +|> inner join ( file people.json ) on flavor=likes eater:=name ``` @@ -81,7 +81,7 @@ original field name `age` is maintained in the results. The query `left-join.spq`: ```mdtest-input left-join.spq file fruit.json -| left join ( +|> left join ( file people.json ) on flavor=likes eater:=name,age ``` @@ -114,7 +114,7 @@ the `note` field from the right-hand input to appear in the joined results. The query `right-join.spq`: ```mdtest-input right-join.spq file fruit.json -| right join ( +|> right join ( file people.json ) on flavor=likes fruit:=name ``` @@ -145,7 +145,7 @@ results. The query `anti-join.spq`: ```mdtest-input anti-join.spq file fruit.json -| anti join ( +|> anti join ( file people.json ) on flavor=likes ``` @@ -173,7 +173,7 @@ The query `inner-join-pools.spq`: ```mdtest-input inner-join-pools.spq from fruit -| inner join ( +|> inner join ( from people ) on flavor=likes eater:=name ``` @@ -215,7 +215,7 @@ The query `inner-join-alternate.spq`: from ( file fruit.json file people.json -) | inner join on flavor=likes eater:=name +) |> inner join on flavor=likes eater:=name ``` Executing the query: @@ -249,7 +249,7 @@ The query `inner-join-streamed.spq`: switch ( case has(color) => pass case has(age) => pass -) | inner join on flavor=likes eater:=name +) |> inner join on flavor=likes eater:=name ``` Executing the query: @@ -292,9 +292,9 @@ they look like, but since it represents redundant data, in practice we'd typically [`drop`](../language/operators/drop.md) it after the `join` in our pipeline. ```mdtest-input multi-value-join.spq -file fruit.json | put fruitkey:={name,color} -| inner join ( - file inventory.json | put invkey:={name,color} +file fruit.json |> put fruitkey:={name,color} +|> inner join ( + file inventory.json |> put invkey:={name,color} ) on fruitkey=invkey quantity ``` @@ -330,10 +330,10 @@ against the price list. ```mdtest-input three-way-join.spq file fruit.json -| inner join ( +|> inner join ( file people.json ) on flavor=likes eater:=name -| inner join ( +|> inner join ( file prices.json ) on name=name price:=price ``` @@ -371,7 +371,7 @@ The query `embed-opposite.spq`: ```mdtest-input embed-opposite.spq file fruit.json -| inner join ( +|> inner join ( file people.json ) on flavor=likes eaterinfo:=this ``` @@ -401,12 +401,12 @@ to produce `merge-opposite.spq`. ```mdtest-input merge-opposite.spq file fruit.json -| inner join ( +|> inner join ( file people.json ) on flavor=likes eaterinfo:=this -| rename fruit:=name -| yield {...this,...eaterinfo} -| drop eaterinfo +|> rename fruit:=name +|> yield {...this,...eaterinfo} +|> drop eaterinfo ``` Executing the query: diff --git a/docs/tutorials/schools.md b/docs/tutorials/schools.md index 60e6fc705e..1002a1370e 100644 --- a/docs/tutorials/schools.md +++ b/docs/tutorials/schools.md @@ -31,7 +31,7 @@ with SuperPipe. The [sample operator](../language/operators/sample.md) is just `sample` will select one representative value from each "shape" of data present in the input, e.g., ```mdtest-command dir=testdata/edu -super -Z -c 'sample | sort this' schools.jsup testscores.jsup webaddrs.jsup +super -Z -c 'sample |> sort this' schools.jsup testscores.jsup webaddrs.jsup ``` displays ```mdtest-output @@ -75,10 +75,10 @@ You can also quickly see a list of the leaf-value data types with this query: ```mdtest-command dir=testdata/edu super -Z -c ' sample - | over this - | by typeof(value) - | yield typeof - | sort + |> over this + |> by typeof(value) + |> yield typeof + |> sort ' schools.jsup testscores.jsup webaddrs.jsup ``` which emits @@ -131,7 +131,7 @@ which lets you search specific fields instead of the entire input value, e.g., we can search for the string "bar" in the `City` field and list all the unique cities that match with a [group-by](#52-grouping): ```mdtest-command dir=testdata/edu -super -f text -c 'grep("bar", City) | by City | yield City | sort' schools.jsup +super -f text -c 'grep("bar", City) |> by City |> yield City |> sort' schools.jsup ``` produces ```mdtest-output @@ -350,7 +350,7 @@ to achieve the intent of your searches. For example, the dash suffix of the ZIP codes could be dropped, the string converted to an integer, then integer comparisons performed, i.e., ```mdtest-command dir=testdata/edu -super -z -c 'cut Zip | int64(Zip[0:5])==94607' schools.jsup +super -z -c 'cut Zip |> int64(Zip[0:5])==94607' schools.jsup ``` produces ```mdtest-output head @@ -410,8 +410,8 @@ these we'll find each set that contains a school named `Lincoln Elementary`, e.g ```mdtest-command dir=testdata/edu super -Z -c ' Schools:=union(School) by District - | "Lincoln Elementary" in Schools - | sort this + |> "Lincoln Elementary" in Schools + |> sort this ' schools.jsup ``` produces @@ -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 @@ -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 @@ -755,7 +755,7 @@ put N:=len(somelist), isbig:=N>10 ``` but it could be written instead as ``` -put N:=len(somelist) | put isbig:=N>10 +put N:=len(somelist) |> put isbig:=N>10 ``` For example, to add a field to our test score records representing the computed average of the math, @@ -763,7 +763,7 @@ reading, and writing scores for each school that reported them, we could say: ```mdtest-command dir=testdata/edu super -Z -c ' AvgScrMath!=null - | put AvgAll:=(AvgScrMath+AvgScrRead+AvgScrWrite)/3.0 + |> put AvgAll:=(AvgScrMath+AvgScrRead+AvgScrWrite)/3.0 ' testscores.jsup ``` which produces @@ -784,9 +784,9 @@ form using `-f table`, e.g., ```mdtest-command dir=testdata/edu super -f table -c ' AvgScrMath != null - | put combined_scores:=AvgScrMath+AvgScrRead+AvgScrWrite - | cut sname,combined_scores,AvgScrMath,AvgScrRead,AvgScrWrite - | head 5 + |> put combined_scores:=AvgScrMath+AvgScrRead+AvgScrWrite + |> cut sname,combined_scores,AvgScrMath,AvgScrRead,AvgScrWrite + |> head 5 ' testscores.jsup ``` produces @@ -802,7 +802,7 @@ As noted above the `put` keyword is entirely optional. Here we omit it and create a new field to hold the lowercase representation of the school `District` field: ```mdtest-command dir=testdata/edu -super -Z -c 'cut District | lower_district:=lower(District)' schools.jsup +super -Z -c 'cut District |> lower_district:=lower(District)' schools.jsup ``` produces ```mdtest-output head @@ -874,7 +874,7 @@ rename toplevel:=outer.inner This goal could instead be achieved by combining [`put`](#44-put) and [`drop`](#42-drop), e.g., ```mdtest-command -super -Z -c 'put toplevel:=outer.inner | drop outer.inner' nested.jsup +super -Z -c 'put toplevel:=outer.inner |> drop outer.inner' nested.jsup ``` produces ```mdtest-output @@ -976,7 +976,7 @@ not. The following query shows the cities in which all schools have a website. e ```mdtest-command dir=testdata/edu super -Z -c ' all_schools_have_website:=and(Website!=null) by City - | sort City + |> sort City ' schools.jsup ``` produces @@ -1036,8 +1036,8 @@ list of which school each website represents: ```mdtest-command dir=testdata/edu super -Z -c ' County=="Fresno" Website!=null - | Websites:=collect(Website),Schools:=collect(School) by City - | sort City + |> Websites:=collect(Website),Schools:=collect(School) by City + |> sort City ' schools.jsup ``` and produces @@ -1117,7 +1117,7 @@ and produces ``` To see the precise value, which may take longer to execute, this query ```mdtest-command dir=testdata/edu -super -z -c 'count() by School | count()' schools.jsup +super -z -c 'count() by School |> count()' schools.jsup ``` produces ```mdtest-output @@ -1164,7 +1164,7 @@ a listed website: ```mdtest-command dir=testdata/edu super -Z -c ' has_at_least_one_school_website:=or(Website!=null) by City - | sort City + |> sort City ' schools.jsup ``` and produces @@ -1224,8 +1224,8 @@ city: ```mdtest-command dir=testdata/edu super -Z -c ' County=="Fresno" Website!=null - | Websites:=union(Website) by City - | sort City + |> Websites:=union(Website) by City + |> sort City ' schools.jsup ``` and produces @@ -1269,7 +1269,7 @@ For example, to see the different categories of status for the schools in our example data, this query: ```mdtest-command dir=testdata/edu -super -z -c 'by StatusType | sort' schools.jsup +super -z -c 'by StatusType |> sort' schools.jsup ``` produces ```mdtest-output @@ -1279,10 +1279,10 @@ produces {StatusType:"Pending"} ``` If you work a lot at the UNIX/Linux shell, you might have sought to accomplish -the same via a familiar idiom: `sort | uniq`. This works in SuperPipe, but the `by` +the same via a familiar idiom: `sort |> uniq`. This works in SuperPipe, but the `by` shorthand is preferable, e.g., ```mdtest-command dir=testdata/edu -super -z -c 'cut StatusType | sort | uniq' schools.jsup +super -z -c 'cut StatusType |> sort |> uniq' schools.jsup ``` produces ```mdtest-output @@ -1298,7 +1298,7 @@ test scores and school count for each county/district pairing, this query: ```mdtest-command dir=testdata/edu super -f table -c ' avg(AvgScrRead),count() by cname,dname - | sort count desc + |> sort count desc ' testscores.jsup ``` produces @@ -1317,7 +1317,7 @@ appear in the form of a field assignment `field:=expr` To see a count of how many school names of a particular character length appear in our example data, this query: ```mdtest-command dir=testdata/edu -super -f table -c 'count() by Name_Length:=len(School) | sort -r' schools.jsup +super -f table -c 'count() by Name_Length:=len(School) |> sort -r' schools.jsup ``` produces ```mdtest-output head @@ -1339,7 +1339,7 @@ the misspelled field would appear as embedded missing errors, e.g., ```mdtest-command dir=testdata/edu super -Z -c ' avg(AvgScrRead),count() by cname,dnmae - | sort count desc + |> sort count desc ' testscores.jsup ``` produces @@ -1402,7 +1402,7 @@ field name as an explicit argument, the `sort` operator did what we wanted because it found a field of the `uint64` [data type](../language/data-types.md), e.g., ```mdtest-command dir=testdata/edu -super -z -c 'count() by County | sort -r' schools.jsup +super -z -c 'count() by County |> sort -r' schools.jsup ``` produces ```mdtest-output head @@ -1416,7 +1416,7 @@ records. Since we know some of the records don't include a website, we'll deliberately put the null values at the front of the list so we can see how many there are, e.g., ```mdtest-command dir=testdata/edu -super -z -c 'count() by Website | sort -nulls first Website' schools.jsup +super -z -c 'count() by Website |> sort -nulls first Website' schools.jsup ``` produces ```mdtest-output head @@ -1464,7 +1464,7 @@ and produces ``` To see the first five school records in Los Angeles county, this query ```mdtest-command dir=testdata/edu -super -z -c 'County=="Los Angeles" | head 5' schools.jsup +super -z -c 'County=="Los Angeles" |> head 5' schools.jsup ``` produces ```mdtest-output @@ -1503,7 +1503,7 @@ and produces ``` To see the last five school records in Los Angeles county, this query ```mdtest-command dir=testdata/edu -super -z -c 'County=="Los Angeles" | tail 5' schools.jsup +super -z -c 'County=="Los Angeles" |> tail 5' schools.jsup ``` produces ```mdtest-output @@ -1541,7 +1541,7 @@ produces To eliminate the adjacent lines that share the same field/value pairs, this query ```mdtest-command dir=testdata/edu -super -z -c 'cut District,County | uniq' schools.jsup +super -z -c 'cut District,County |> uniq' schools.jsup ``` produces ```mdtest-output head @@ -1567,7 +1567,7 @@ the average math score with the school name and the county name: ```mdtest-command dir=testdata/edu super -Z -c ' AvgScrMath!=null - | yield {school:sname,avg:AvgScrMath}, {county:cname,zvg:AvgScrMath} + |> yield {school:sname,avg:AvgScrMath}, {county:cname,zvg:AvgScrMath} ' testscores.jsup ``` which produces @@ -1594,9 +1594,9 @@ In earlier example, we used `put` to create a table using this query: ```mdtest-command dir=testdata/edu super -f table -c ' AvgScrMath != null - | put combined_scores:=AvgScrMath+AvgScrRead+AvgScrWrite - | cut sname,combined_scores,AvgScrMath,AvgScrRead,AvgScrWrite - | head 5 + |> put combined_scores:=AvgScrMath+AvgScrRead+AvgScrWrite + |> cut sname,combined_scores,AvgScrMath,AvgScrRead,AvgScrWrite + |> head 5 ' testscores.jsup ``` produces @@ -1614,14 +1614,14 @@ sometimes with a more intuitive structure, e.g., ```mdtest-command dir=testdata/edu super -f table -c ' AvgScrMath != null -| yield { +|> yield { sname, combined_scores:AvgScrMath+AvgScrRead+AvgScrWrite, AvgScrMath, AvgScrRead, AvgScrWrite } -| head 5' testscores.jsup +|> head 5' testscores.jsup ``` produces ```mdtest-output diff --git a/docs/tutorials/zed.md b/docs/tutorials/zed.md index ca6876397c..baeadc79e9 100644 --- a/docs/tutorials/zed.md +++ b/docs/tutorials/zed.md @@ -108,7 +108,7 @@ We can run an aggregation to see who has created the most PRs during the time ra of this first data set: ```bash -$ zed query 'count() by user:=user.login | sort count desc' +$ zed query 'count() by user:=user.login |> sort count desc' ``` => ``` @@ -164,7 +164,7 @@ Now let's run a bucketed aggregation to count approximate PRs per month (specifi bucketed in 12 equal spans of a year): ``` -$ zed query 'count() by ts:=bucket(created_at, 1y/12) | sort ts' +$ zed query 'count() by ts:=bucket(created_at, 1y/12) |> sort ts' ``` => ``` @@ -184,7 +184,7 @@ and see who created these PRs: ``` $ zed query 'from prs range 2020-04-19T16:00:00Z to 2020-05-20T02:00:00Z - | count() by user:=user.login | sort count desc' + |> count() by user:=user.login | sort count desc' ``` => ``` diff --git a/docs/tutorials/zq.md b/docs/tutorials/zq.md index 87da9d179d..27db70abcd 100644 --- a/docs/tutorials/zq.md +++ b/docs/tutorials/zq.md @@ -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 @@ -501,7 +501,7 @@ This is easy to do with the [any aggregate function](../language/aggregates/any. e.g, ```mdtest-command echo '{x:1,y:2}{s:"foo"}{x:3,y:4}' | - super -z -c 'val:=any(this) by typeof(this) | sort val | yield val' - + super -z -c 'val:=any(this) by typeof(this) |> sort val |> yield val' - ``` produces ```mdtest-output @@ -510,7 +510,7 @@ produces ``` We like this pattern so much there is a shortcut [sample operator](../language/operators/sample.md), e.g., ```mdtest-command -echo '{x:1,y:2}{s:"foo"}{x:3,y:4}' | super -z -c 'sample this | sort this' - +echo '{x:1,y:2}{s:"foo"}{x:3,y:4}' | super -z -c 'sample this |> sort this' - ``` emits the same result: ```mdtest-output @@ -561,7 +561,7 @@ Now you can see all the detail. This turns out to be so useful, especially with large amounts of messy input data, you will often find yourself fusing data then sampling it, e.g., ```mdtest-command -echo '{a:1,b:null}{a:null,b:[2,3,4]}' | super -Z -c 'fuse | sample' - +echo '{a:1,b:null}{a:null,b:[2,3,4]}' | super -Z -c 'fuse |> sample' - ``` produces a comprehensively-typed sample: ```mdtest-output @@ -572,7 +572,7 @@ produces a comprehensively-typed sample: ``` As you explore data in this fashion, you will often type various searches to slice and dice the data as you get a feel for it all while sending -your interactive search results to `fuse | sample`. +your interactive search results to `fuse |> sample`. To appreciate all this, let's have a look next at some real-world data... @@ -640,7 +640,7 @@ the items from the array and do something with them. So how about we use the [over operator](../language/operators/over.md) to traverse the array and count the array items by their "kind", ```mdtest-command dir=docs/tutorials -super -z -c 'over this | count() by kind(this)' prs.json +super -z -c 'over this |> count() by kind(this)' prs.json ``` produces ```mdtest-output @@ -651,7 +651,7 @@ Ok, they're all records. Good, this should be easy! The Zed records were all originally JSON objects. Maybe we can just use "sample" to have a deeper look... ``` -super -Z -c 'over this | sample' prs.json +super -Z -c 'over this |> sample' prs.json ``` > Here we are using `-Z`, which is like `-z`, but instead of formatting each > ZSON value on its own line, it pretty-prints the ZSON with vertical @@ -662,7 +662,7 @@ more than 700 lines of pretty-printed ZSON. Ok, maybe it's not so bad. Let's check how many shapes there are with `sample`... ```mdtest-command dir=docs/tutorials -super -z -c 'over this | sample | count()' prs.json +super -z -c 'over this |> sample |> count()' prs.json ``` produces ```mdtest-output @@ -674,7 +674,7 @@ They must each be really big. Let's check that out. We can use the [len function](../language/functions/len.md) on the records to see the size of each of the four records: ```mdtest-command dir=docs/tutorials -super -z -c 'over this | sample | len(this) | sort this' prs.json +super -z -c 'over this |> sample |> len(this) |> sort this' prs.json ``` and we get ```mdtest-output @@ -685,7 +685,7 @@ and we get Ok, this isn't so bad... two shapes each have 36 fields but one is length zero?! That outlier could only be the empty record. Let's check: ```mdtest-command dir=docs/tutorials -super -z -c 'over this | sample | len(this)==0' prs.json +super -z -c 'over this |> sample |> len(this)==0' prs.json ``` produces ```mdtest-output @@ -706,23 +706,23 @@ Who knows why they are there? No fun. Real-world data is messy. How about we fuse the 3 shapes together and have a look at the result: ``` -super -Z -c 'over this | fuse | sample' prs.json +super -Z -c 'over this |> fuse |> sample' prs.json ``` We won't display the result here as it's still pretty big. But you can give it a try. It's 379 lines. But let's break down what's taking up all this space. -We can take the output from `fuse | sample` and list the fields with +We can take the output from `fuse |> sample` and list the fields with and their "kind". Note that when we do an `over this` with records as input, we get a new record value for each field structured as a key/value pair: ```mdtest-command dir=docs/tutorials super -f table -c ' over this - | fuse - | sample - | over this - | {field:key[0],kind:kind(value)} + |> fuse + |> sample + |> over this + |> {field:key[0],kind:kind(value)} ' prs.json ``` produces @@ -769,15 +769,15 @@ With this list of top-level fields, we can easily explore the different pieces of their structure with sample. Let's have a look at a few of the record fields by giving these one-liners each a try and looking at the output: ``` -super -Z -c 'over this | sample head' prs.json -super -Z -c 'over this | sample base' prs.json -super -Z -c 'over this | sample _links' prs.json +super -Z -c 'over this |> sample head' prs.json +super -Z -c 'over this |> sample base' prs.json +super -Z -c 'over this |> sample _links' prs.json ``` While these fields have some useful information, we'll decide to drop them here and focus on other top-level fields. To do this, we can use the [drop operator](../language/operators/drop.md) to whittle down the data: ``` -super -Z -c 'over this | fuse | drop head,base,_link | sample' prs.json +super -Z -c 'over this |> fuse |> drop head,base,_link |> sample' prs.json ``` Ok, this looks more reasonable and is now only 120 lines of pretty-printed ZSON. @@ -785,7 +785,7 @@ One more annoying detail here about JSON: time values are stored as strings, in this case, in ISO format, e.g., we can pull this value out with this query: ```mdtest-command dir=docs/tutorials -super -z -c 'over this | head 1 | yield created_at' prs.json +super -z -c 'over this |> head 1 |> yield created_at' prs.json ``` which produces this string: ```mdtest-output @@ -794,7 +794,7 @@ which produces this string: Since Zed has a native `time` type and we might want to do native date comparisons on these time fields, we can easily translate the string to a time with a cast, e.g., ```mdtest-command dir=docs/tutorials -super -z -c 'over this | head 1 | yield time(created_at)' prs.json +super -z -c 'over this |> head 1 |> yield time(created_at)' prs.json ``` produces the native time value: ```mdtest-output @@ -802,7 +802,7 @@ produces the native time value: ``` To be sure, you can check any value's type with the `typeof` function, e.g., ```mdtest-command dir=docs/tutorials -super -z -c 'over this | head 1 | yield time(created_at) | typeof(this)' prs.json +super -z -c 'over this |> head 1 |> yield time(created_at) |> typeof(this)' prs.json ``` produces the native time value: ```mdtest-output @@ -819,12 +819,12 @@ First, let's get rid of the outer array and generate elements of an array as a sequence of Zed records that have been fused and let's filter out the empty records: ``` -super -c 'over this | len(this) != 0 | fuse' prs.json > prs1.bsup +super -c 'over this |> len(this) != 0 |> fuse' prs.json > prs1.bsup ``` We can check that worked with count: ``` super -z -c 'count()' prs1.bsup -super -z -c 'sample | count()' prs1.bsup +super -z -c 'sample |> count()' prs1.bsup ``` produces ``` @@ -844,8 +844,8 @@ to primitive types: ``` super -z -c ' over this - | kind(value)=="primitive" - | fields:=union(key[0]) by type:=typeof(value) + |> kind(value)=="primitive" + |> fields:=union(key[0]) by type:=typeof(value) ' prs2.bsup ``` which gives @@ -889,9 +889,9 @@ We can check the result with our type analysis: ```mdtest-command dir=docs/tutorials super -z -c ' over this - | kind(value)=="primitive" - | fields:=union(key[0]) by type:=typeof(value) - | sort type + |> kind(value)=="primitive" + |> fields:=union(key[0]) by type:=typeof(value) + |> sort type ' prs.bsup ``` which now gives: @@ -915,10 +915,10 @@ put all the transformations together in a single Zed pipeline, where the Zed source text might look like this: ``` over this // traverse the array of objects -| len(this) != 0 // skip empty objects -| fuse // fuse objects into records of a combined type -| drop head,base,_links // drop fields that we don't need -| closed_at:=time(closed_at), // transform string dates to type time +|> len(this) != 0 // skip empty objects +|> fuse // fuse objects into records of a combined type +|> drop head,base,_links // drop fields that we don't need +|> closed_at:=time(closed_at), // transform string dates to type time merged_at:=time(merged_at), created_at:=time(created_at), updated_at:=time(updated_at) @@ -965,7 +965,7 @@ chronologically. This command retrieves the last five PRs in the dataset: ```mdtest-command dir=docs/tutorials super -f table -c ' tail 5 - | {DATE:created_at,"NUMBER":f"PR #{number}",TITLE:title} + |> {DATE:created_at,"NUMBER":f"PR #{number}",TITLE:title} ' prs.bsup ``` and the output is: @@ -981,7 +981,7 @@ DATE NUMBER TITLE How about some aggregations? We can count the number of PRs and sort by the count highest first: ```mdtest-command dir=docs/tutorials -super -z -c "count() by user:=user.login | sort count desc" prs.bsup +super -z -c "count() by user:=user.login |> sort count desc" prs.bsup ``` produces ```mdtest-output @@ -995,7 +995,7 @@ How about getting a list of all of the reviewers? To do this, we need to traverse the records in the `requested_reviewers` array and collect up the login field from each record: ```mdtest-command dir=docs/tutorials -super -z -c 'over requested_reviewers | collect(login)' prs.bsup +super -z -c 'over requested_reviewers |> collect(login)' prs.bsup ``` Oops, this gives us an array of the reviewer logins with repetitions since [collect](../language/aggregates/collect.md) @@ -1010,7 +1010,7 @@ computes the set-wise union of its input and produces a Zed `set` type as its output. In this case, the output is a set of strings, written `|[string]|` in the Zed language. For example: ```mdtest-command dir=docs/tutorials -super -z -c 'over requested_reviewers | reviewers:=union(login)' prs.bsup +super -z -c 'over requested_reviewers |> reviewers:=union(login)' prs.bsup ``` produces ```mdtest-output @@ -1055,9 +1055,9 @@ bringing that value into the scope using a `with` clause appended to the super -z -c ' over requested_reviewers with user=user.login => ( reviewers:=union(login) - | {user,reviewers} + |> {user,reviewers} ) - | sort user,len(reviewers) + |> sort user,len(reviewers) ' prs.bsup ``` which gives us @@ -1078,10 +1078,10 @@ as the group-by key: super -Z -c ' over requested_reviewers with user=user.login => ( reviewers:=union(login) - | {user,reviewers} + |> {user,reviewers} ) - | groups:=union(reviewers) by user - | sort user,len(groups) + |> groups:=union(reviewers) by user + |> sort user,len(groups) ' prs.bsup ``` and we get @@ -1202,10 +1202,10 @@ with an aggregation: super -z -c ' over requested_reviewers with user=user.login => ( reviewers:=union(login) - | {user,reviewers} + |> {user,reviewers} ) - | avg_reviewers:=avg(len(reviewers)) by user - | sort avg_reviewers + |> avg_reviewers:=avg(len(reviewers)) by user + |> sort avg_reviewers ' prs.bsup ``` which produces @@ -1223,10 +1223,10 @@ Of course, if you'd like the query output in JSON, you can just say `-j` and super -j -c ' over requested_reviewers with user=user.login => ( reviewers:=union(login) - | {user,reviewers} + |> {user,reviewers} ) - | groups:=union(reviewers) by user - | sort user,len(groups) + |> groups:=union(reviewers) by user + |> sort user,len(groups) ' prs.bsup ``` produces diff --git a/lake/api/api.go b/lake/api/api.go index 4c8ed8509b..cc3847125e 100644 --- a/lake/api/api.go +++ b/lake/api/api.go @@ -53,7 +53,7 @@ func IsLakeService(u string) bool { func LookupPoolByName(ctx context.Context, api Interface, name string) (*pools.Config, error) { b := newBuffer(pools.Config{}) - zed := fmt.Sprintf("from :pools | name == '%s'", name) + zed := fmt.Sprintf("from :pools |> name == '%s'", name) q, err := api.Query(ctx, zed) if err != nil { return nil, err @@ -95,7 +95,7 @@ func GetPools(ctx context.Context, api Interface) ([]*pools.Config, error) { func LookupPoolByID(ctx context.Context, api Interface, id ksuid.KSUID) (*pools.Config, error) { b := newBuffer(pools.Config{}) - zed := fmt.Sprintf("from :pools | id == hex('%s')", idToHex(id)) + zed := fmt.Sprintf("from :pools |> id == hex('%s')", idToHex(id)) q, err := api.Query(ctx, zed) if err != nil { return nil, err @@ -120,7 +120,7 @@ func LookupPoolByID(ctx context.Context, api Interface, id ksuid.KSUID) (*pools. func LookupBranchByName(ctx context.Context, api Interface, poolName, branchName string) (*lake.BranchMeta, error) { b := newBuffer(lake.BranchMeta{}) - zed := fmt.Sprintf("from :branches | pool.name == '%s' branch.name == '%s'", poolName, branchName) + zed := fmt.Sprintf("from :branches |> pool.name == '%s' branch.name == '%s'", poolName, branchName) q, err := api.Query(ctx, zed) if err != nil { return nil, err @@ -145,7 +145,7 @@ func LookupBranchByName(ctx context.Context, api Interface, poolName, branchName func LookupBranchByID(ctx context.Context, api Interface, id ksuid.KSUID) (*lake.BranchMeta, error) { b := newBuffer(lake.BranchMeta{}) - zed := fmt.Sprintf("from :branches | branch.id == 'hex(%s)'", idToHex(id)) + zed := fmt.Sprintf("from :branches |> branch.id == 'hex(%s)'", idToHex(id)) q, err := api.Query(ctx, zed) if err != nil { return nil, err diff --git a/lake/ztests/appmeta.yaml b/lake/ztests/appmeta.yaml index 56c1d347e4..e3f049df8c 100644 --- a/lake/ztests/appmeta.yaml +++ b/lake/ztests/appmeta.yaml @@ -5,7 +5,7 @@ script: | super db load -q -use logs -meta '"original"' babble.jsup super db load -q -use logs -meta '"normalized-v1"' babble.jsup super db load -q -use logs -meta '"normalized-v2"' babble.jsup - super db query "from logs@main:log | grep(normalized*, meta)| sort date | cut meta" | super -z - + super db query "from logs@main:log |> grep(normalized*, meta) |> sort date |> cut meta" | super -z - inputs: - name: babble.jsup diff --git a/lake/ztests/compact-vectors.yaml b/lake/ztests/compact-vectors.yaml index 20c5678c5c..2b553361ca 100644 --- a/lake/ztests/compact-vectors.yaml +++ b/lake/ztests/compact-vectors.yaml @@ -4,7 +4,7 @@ script: | super db create -use -q test seq 10 | super -c '{ts:this-1,s:f"val{this-1}"}' - | super db load -q - seq 10 | super -c '{ts:this-1,s:f"val{this-1}"}' - | super db load -q - - ids=$(super db query -f text 'from test@main:objects | yield f"0x{hex(id)}"') + ids=$(super db query -f text 'from test@main:objects |> yield f"0x{hex(id)}"') super db compact -q -vectors $ids super db query -f lake 'from test@main:vectors' diff --git a/lake/ztests/compact.yaml b/lake/ztests/compact.yaml index 84e13f5b55..f07006c333 100644 --- a/lake/ztests/compact.yaml +++ b/lake/ztests/compact.yaml @@ -4,7 +4,7 @@ script: | super db create -use -q test seq 10 | super -c '{ts:this-1,s:f"val{this-1}"}' - | super db load -q - seq 10 | super -c '{ts:this-1,s:f"val{this-1}"}' - | super db load -q - - ids=$(super db query -f text 'from test@main:objects | yield f"0x{hex(id)}"') + ids=$(super db query -f text 'from test@main:objects |> yield f"0x{hex(id)}"') super db compact -q $ids super db query -f lake 'from test@main:objects' diff --git a/lake/ztests/cross-pool-join.yaml b/lake/ztests/cross-pool-join.yaml index d3e4cac8ac..83ba66cb38 100644 --- a/lake/ztests/cross-pool-join.yaml +++ b/lake/ztests/cross-pool-join.yaml @@ -27,8 +27,8 @@ inputs: pool fruit => cut f:=this pool person => cut p:=this ) - | join on f.flavor=p.likes p:=p - | summarize likes:=union(f.name) by name:=p.name | sort name + |> join on f.flavor=p.likes p:=p + |> summarize likes:=union(f.name) by name:=p.name |> sort name outputs: - name: stdout diff --git a/lake/ztests/debug.yaml b/lake/ztests/debug.yaml index cc0463e40f..1d94828e48 100644 --- a/lake/ztests/debug.yaml +++ b/lake/ztests/debug.yaml @@ -3,7 +3,7 @@ script: | super db init -q super db create -use -q test echo '{x: "foo"}' | super db load -q - - super db query -z 'from test | debug f"debug: {x}"' + super db query -z 'from test |> debug f"debug: {x}"' outputs: - name: stdout diff --git a/lake/ztests/delete-where-invalid.yaml b/lake/ztests/delete-where-invalid.yaml index 3c3fa10f60..cc02e61c23 100644 --- a/lake/ztests/delete-where-invalid.yaml +++ b/lake/ztests/delete-where-invalid.yaml @@ -2,7 +2,7 @@ script: | export SUPER_DB_LAKE=test super db init -q super db create -use -q test - ! super db delete -where 'me == "hi" | cut me' + ! super db delete -where 'me == "hi" |> cut me' ! super db delete -where 'cut that' outputs: diff --git a/lake/ztests/delete-where-missing.yaml b/lake/ztests/delete-where-missing.yaml index d4b89e3d1b..2541c6aef4 100644 --- a/lake/ztests/delete-where-missing.yaml +++ b/lake/ztests/delete-where-missing.yaml @@ -4,9 +4,9 @@ script: | super db create -use -q test super db load -q in.jsup ! super db delete -q -where 'uid==C3UeSqaSOFRReHD68' - super db query -z 'from test | count:=count()' + super db query -z 'from test |> count:=count()' super db delete -q -where 'uid=="C3UeSqaSOFRReHD68"' - super db query -z 'from test | count:=count()' + super db query -z 'from test |> count:=count()' inputs: - name: in.jsup diff --git a/lake/ztests/delete-where.yaml b/lake/ztests/delete-where.yaml index 4cb29157d1..37930ef72b 100644 --- a/lake/ztests/delete-where.yaml +++ b/lake/ztests/delete-where.yaml @@ -6,9 +6,9 @@ script: | super db create -use -q -S 1KB -orderby ts:$order test seq 1000 | super -c '{ts:this-1,s:f"val{this-1}"}' - | super db load -q - super db delete -q -where 'ts > 400 and ts <= 500' - super db query -z 'from test | count:=count()' + super db query -z 'from test |> count:=count()' super db delete -q -where 's == "val1" or s == "val999"' - super db query -z 'from test | count:=count()' + super db query -z 'from test |> count:=count()' super db drop -f -q test done diff --git a/lake/ztests/delete.yaml b/lake/ztests/delete.yaml index f0161fe04d..179353e31c 100644 --- a/lake/ztests/delete.yaml +++ b/lake/ztests/delete.yaml @@ -3,7 +3,7 @@ script: | super db init -q super db create -use -q -orderby x:desc test super db load -q 1.jsup - id=$(super db query -f text "from test@main:objects | cut id:=ksuid(id) | tail 1") + id=$(super db query -f text "from test@main:objects |> cut id:=ksuid(id) |> tail 1") super db load -q 2.jsup super db query -z "from test" echo === | tee /dev/stderr diff --git a/lake/ztests/deterministic-merge.yaml b/lake/ztests/deterministic-merge.yaml index 88f5bdb74f..821069ea12 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/from-pattern.yaml b/lake/ztests/from-pattern.yaml index 85bd3f0031..b47ff0ae66 100644 --- a/lake/ztests/from-pattern.yaml +++ b/lake/ztests/from-pattern.yaml @@ -5,13 +5,13 @@ script: | super db create -q $pool echo "\"$pool\"" | super db load -q -use $pool - done - super db query -z 'from * | sort this' + super db query -z 'from * |> sort this' echo === - super db query -z 'from /.*/ | sort this' + super db query -z 'from /.*/ |> sort this' echo === - super db query -z 'from match* | sort this' + super db query -z 'from match* |> sort this' echo === - super db query -z 'from /match/ | sort this' + super db query -z 'from /match/ |> sort this' outputs: - name: stdout diff --git a/lake/ztests/group-by-func.yaml b/lake/ztests/group-by-func.yaml index 9e1c9d9733..e946228651 100644 --- a/lake/ztests/group-by-func.yaml +++ b/lake/ztests/group-by-func.yaml @@ -4,7 +4,7 @@ script: | super db create -q -orderby s:asc data head -2 in.jsup | super db load -q -use data - tail -3 in.jsup | super db load -q -use data - - super db query -z 'from data | union(s) by len(s) | sort this' + super db query -z 'from data |> union(s) by len(s) |> sort this' inputs: - name: in.jsup diff --git a/lake/ztests/group-by-ts.yaml b/lake/ztests/group-by-ts.yaml index 4148182d61..4e7e78a302 100644 --- a/lake/ztests/group-by-ts.yaml +++ b/lake/ztests/group-by-ts.yaml @@ -7,15 +7,15 @@ script: | # causes parition to have several chunk files. super db load -q -use logs group-by-ts.jsup echo === - super db query -z 'from logs | head 1' + super db query -z 'from logs |> head 1' echo === - super db query -z 'from logs | tail 1' + super db query -z 'from logs |> tail 1' echo === - super db query -z 'from logs | avg:=avg(g)' + super db query -z 'from logs |> avg:=avg(g)' echo === - super db query -z 'from logs | count:=count() by g | sort g' + super db query -z 'from logs |> count:=count() by g |> sort g' echo === - super db query -z 'from logs | count:=count() by every(3600s), g | sort ts, g' + super db query -z 'from logs |> count:=count() by every(3600s), g |> sort ts, g' inputs: - name: group-by-ts.jsup diff --git a/lake/ztests/issue-2784.yaml b/lake/ztests/issue-2784.yaml index 6e2795bb3b..99683cf869 100644 --- a/lake/ztests/issue-2784.yaml +++ b/lake/ztests/issue-2784.yaml @@ -4,7 +4,7 @@ script: | super db create -q test super db load -q -use test a.jsup super db load -q -use test b.jsup - super db query -z "from test@main:objects | sort min | {min,max}" + super db query -z "from test@main:objects |> sort min |> {min,max}" inputs: - name: a.jsup diff --git a/lake/ztests/ls.yaml b/lake/ztests/ls.yaml index 4398098e4d..7d02fd4c91 100644 --- a/lake/ztests/ls.yaml +++ b/lake/ztests/ls.yaml @@ -5,7 +5,7 @@ script: | super db load -q -use logs babble.jsup super db ls -f bsup | super -Z -c "drop id,ts" - echo === - super db query -Z "from logs@main:objects | drop id" + super db query -Z "from logs@main:objects |> drop id" inputs: - name: babble.jsup diff --git a/lake/ztests/match-missing-pool-key.yaml b/lake/ztests/match-missing-pool-key.yaml index 7a04bdcf1c..b607f0b706 100644 --- a/lake/ztests/match-missing-pool-key.yaml +++ b/lake/ztests/match-missing-pool-key.yaml @@ -5,7 +5,7 @@ script: | super db init -q super db create -q -orderby k tmp super db load -q -use tmp in.jsup - super db query -z "from tmp | !has(k)" + super db query -z "from tmp |> !has(k)" inputs: - name: in.jsup diff --git a/lake/ztests/merge-by-addr.yaml b/lake/ztests/merge-by-addr.yaml index 9341ca3617..3be6d2170e 100644 --- a/lake/ztests/merge-by-addr.yaml +++ b/lake/ztests/merge-by-addr.yaml @@ -3,7 +3,7 @@ script: | super db init -q super db create -q -S 75B -orderby addr:asc logs super db load -q -use logs in.jsup - super db query -z 'from logs | cut addr' + super db query -z 'from logs |> cut addr' inputs: - name: in.jsup diff --git a/lake/ztests/meta-optimized-filter.yaml b/lake/ztests/meta-optimized-filter.yaml index 5635c58d76..3ac137687d 100644 --- a/lake/ztests/meta-optimized-filter.yaml +++ b/lake/ztests/meta-optimized-filter.yaml @@ -4,9 +4,9 @@ script: | super db create -use -q test seq 20 | super -c 'yield {ts: this}' - | super db load -q - seq 21 40 | super -c 'yield {ts: this}' - | super db load -q - - super db query -z 'from test:objects | max > 20 | cut min, max' + super db query -z 'from test:objects |> max > 20 |> cut min, max' echo === - super db query -z 'from test:partitions | max > 20 | cut min, max' + super db query -z 'from test:partitions |> max > 20 |> cut min, max' outputs: - name: stdout diff --git a/lake/ztests/meta.yaml b/lake/ztests/meta.yaml index 3e6a0f1166..2a8896d9d8 100644 --- a/lake/ztests/meta.yaml +++ b/lake/ztests/meta.yaml @@ -5,10 +5,10 @@ script: | super db create -q -orderby b:desc poolB super db load -q -use poolA a.jsup super db load -q -use poolB b.jsup - super db query -Z 'from :pools | drop id | sort name | drop ts' + super db query -Z 'from :pools |> drop id |> sort name |> drop ts' echo === - super db query -Z 'from poolA@main:objects | {nameof:nameof(this),...this} | drop id' - super db query -Z 'from poolA:log | cut nameof(this) | drop ts' + super db query -Z 'from poolA@main:objects |> {nameof:nameof(this),...this} |> drop id' + super db query -Z 'from poolA:log |> cut nameof(this) |> drop ts' inputs: - name: a.jsup diff --git a/lake/ztests/null-pool-key.yaml b/lake/ztests/null-pool-key.yaml index 61767e2f1c..0eecddc9d5 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 k <= 3" done inputs: diff --git a/lake/ztests/overlap.yaml b/lake/ztests/overlap.yaml index 93a9847d1d..bb00137b06 100644 --- a/lake/ztests/overlap.yaml +++ b/lake/ztests/overlap.yaml @@ -4,7 +4,7 @@ script: | super db create -use -q logs super db load -q babble-split1.jsup super db load -q babble-split2.jsup - super db query -Z "from logs@main:objects | sort -r size | drop id" + super db query -Z "from logs@main:objects |> sort -r size |> drop id" inputs: - name: babble.jsup diff --git a/lake/ztests/quiet-cut.yaml b/lake/ztests/quiet-cut.yaml index 6f3c587da1..5ab29682cf 100644 --- a/lake/ztests/quiet-cut.yaml +++ b/lake/ztests/quiet-cut.yaml @@ -3,7 +3,7 @@ script: | super db init -q super db create -q logs super db load -q -use logs in.jsup - super db query "from logs | cut notafield" + super db query "from logs |> cut notafield" inputs: - name: in.jsup diff --git a/lake/ztests/revert-revert.yaml b/lake/ztests/revert-revert.yaml index 4a4663e50f..7ad3d70793 100644 --- a/lake/ztests/revert-revert.yaml +++ b/lake/ztests/revert-revert.yaml @@ -4,13 +4,13 @@ script: | super db create -use -q test a=$(super db load a.jsup | head -1 | awk '{print $1}') b=$(super db load b.jsup | head -1 | awk '{print $1}') - super db query -z "from test | sort this" + super db query -z "from test |> sort this" r=$(super db revert $a | awk '{print $5}') echo === - super db query -z "from test | sort this" + super db query -z "from test |> sort this" super db revert -q $r echo === - super db query -z "from test | sort this" + super db query -z "from test |> sort this" inputs: - name: a.jsup diff --git a/lake/ztests/revert.yaml b/lake/ztests/revert.yaml index 0eda7088ae..de539b34e6 100644 --- a/lake/ztests/revert.yaml +++ b/lake/ztests/revert.yaml @@ -4,13 +4,13 @@ script: | super db create -use -q test a=$(super db load a.jsup | head -1 | awk '{print $1}') b=$(super db load b.jsup | head -1 | awk '{print $1}') - super db query -z "from test | sort this" + super db query -z "from test |> sort this" super db revert -q $a echo === - super db query -z "from test | sort this" + super db query -z "from test |> sort this" super db revert -q $b echo === - super db query -z "from test | sort this" + super db query -z "from test |> sort this" inputs: - name: a.jsup diff --git a/lake/ztests/s3/stat.yaml b/lake/ztests/s3/stat.yaml index d7ccce1eac..91b82fbcea 100644 --- a/lake/ztests/s3/stat.yaml +++ b/lake/ztests/s3/stat.yaml @@ -4,7 +4,7 @@ script: | super db init -q super db create -q logs super db load -q -use logs babble.jsup - super db query -Z "from logs@main:objects | drop id" + super db query -Z "from logs@main:objects |> drop id" inputs: - name: babble.jsup diff --git a/lake/ztests/s3/zq.yaml b/lake/ztests/s3/zq.yaml index 3d444a5acf..62de3d77e8 100644 --- a/lake/ztests/s3/zq.yaml +++ b/lake/ztests/s3/zq.yaml @@ -4,7 +4,7 @@ script: | super db init -q super db create -q logs super db load -q -use logs babble.jsup - super db query -z "from logs | count()" + super db query -z "from logs |> count()" inputs: - name: babble.jsup diff --git a/lake/ztests/seek-index-boundaries.yaml b/lake/ztests/seek-index-boundaries.yaml index ac21413213..0b839b0fbe 100644 --- a/lake/ztests/seek-index-boundaries.yaml +++ b/lake/ztests/seek-index-boundaries.yaml @@ -4,11 +4,11 @@ script: | for o in asc desc; do super db create -use -q -seekstride 1B -orderby ts:$o $o seq 20 | super -c 'yield {ts:this}' - | super db load -q - - source query.sh "from $o | ts == 5" - source query.sh "from $o | ts < 2" - source query.sh "from $o | ts <= 2" - source query.sh "from $o | ts > 19" - source query.sh "from $o | ts >= 19" + source query.sh "from $o |> ts == 5" + source query.sh "from $o |> ts < 2" + source query.sh "from $o |> ts <= 2" + source query.sh "from $o |> ts > 19" + source query.sh "from $o |> ts >= 19" done inputs: @@ -19,49 +19,49 @@ inputs: outputs: - name: stdout data: | - // from asc | ts == 5 + // from asc |> ts == 5 {ts:5} - // from asc | ts < 2 + // from asc |> ts < 2 {ts:1} - // from asc | ts <= 2 + // from asc |> ts <= 2 {ts:1} {ts:2} - // from asc | ts > 19 + // from asc |> ts > 19 {ts:20} - // from asc | ts >= 19 + // from asc |> ts >= 19 {ts:19} {ts:20} - // from desc | ts == 5 + // from desc |> ts == 5 {ts:5} - // from desc | ts < 2 + // from desc |> ts < 2 {ts:1} - // from desc | ts <= 2 + // from desc |> ts <= 2 {ts:2} {ts:1} - // from desc | ts > 19 + // from desc |> ts > 19 {ts:20} - // from desc | ts >= 19 + // from desc |> ts >= 19 {ts:20} {ts:19} - name: stderr data: | - // from asc | ts == 5 + // from asc |> ts == 5 {bytes_read:2,bytes_matched:2,records_read:1,records_matched:1} - // from asc | ts < 2 + // from asc |> ts < 2 {bytes_read:2,bytes_matched:2,records_read:1,records_matched:1} - // from asc | ts <= 2 + // from asc |> ts <= 2 {bytes_read:4,bytes_matched:4,records_read:2,records_matched:2} - // from asc | ts > 19 + // from asc |> ts > 19 {bytes_read:2,bytes_matched:2,records_read:1,records_matched:1} - // from asc | ts >= 19 + // from asc |> ts >= 19 {bytes_read:4,bytes_matched:4,records_read:2,records_matched:2} - // from desc | ts == 5 + // from desc |> ts == 5 {bytes_read:2,bytes_matched:2,records_read:1,records_matched:1} - // from desc | ts < 2 + // from desc |> ts < 2 {bytes_read:2,bytes_matched:2,records_read:1,records_matched:1} - // from desc | ts <= 2 + // from desc |> ts <= 2 {bytes_read:4,bytes_matched:4,records_read:2,records_matched:2} - // from desc | ts > 19 + // from desc |> ts > 19 {bytes_read:2,bytes_matched:2,records_read:1,records_matched:1} - // from desc | ts >= 19 + // from desc |> ts >= 19 {bytes_read:4,bytes_matched:4,records_read:2,records_matched:2} diff --git a/lake/ztests/seek-index-null.yaml b/lake/ztests/seek-index-null.yaml index 74190af99a..15e4d6bf88 100644 --- a/lake/ztests/seek-index-null.yaml +++ b/lake/ztests/seek-index-null.yaml @@ -5,7 +5,7 @@ script: | echo // $o | tee /dev/stderr super db create -q -seekstride 2KB -orderby ts:$o $o super db load -q -use $o babble.jsup null.jsup - super db query -z -s "from $o | ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z" + super db query -z -s "from $o |> ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z" done inputs: diff --git a/lake/ztests/seek-index-overlap.yaml b/lake/ztests/seek-index-overlap.yaml index 6c52c2b32f..e1fe479da9 100644 --- a/lake/ztests/seek-index-overlap.yaml +++ b/lake/ztests/seek-index-overlap.yaml @@ -6,12 +6,12 @@ script: | super db use -q asc super -c "tail 900" babble.jsup | super db load -q - super -c "head 250" babble.jsup | super db load -q - - super db query -z -s "from asc | count:=count()" + super db query -z -s "from asc |> count:=count()" echo === | tee /dev/stderr super db use -q desc super -c "tail 900" babble.jsup | super db load -q - super -c "head 250" babble.jsup | super db load -q - - super db query -z -s "from desc | count:=count()" + super db query -z -s "from desc |> count:=count()" inputs: - name: babble.jsup diff --git a/lake/ztests/seek-index-simple.yaml b/lake/ztests/seek-index-simple.yaml index 6774fff9e0..787722f5d4 100644 --- a/lake/ztests/seek-index-simple.yaml +++ b/lake/ztests/seek-index-simple.yaml @@ -5,14 +5,14 @@ script: | super db create -q -seekstride 1KB -orderby k:desc desc seq 1 15000 | super -c '{k:this,foo:123}' - | super db load -q -use asc - seq 1 15000 | super -c '{k:this,foo:123}' - | super db load -q -use desc - - super db query -s -z 'from asc | k >= 1000 and k <= 1002' - super db query -s -z 'from asc | k == 12321' - super db query -s -z 'from asc | k == 12322 or foo != 123' - super db query -s -z 'from asc | k == 12323 and foo == 123' - super db query -s -z 'from desc | k >= 1000 and k <= 1002' - super db query -s -z 'from desc | k == 12321' - super db query -s -z 'from desc | k == 12322 or foo != 123' - super db query -s -z 'from desc | k == 12323 and foo == 123' + super db query -s -z 'from asc |> k >= 1000 and k <= 1002' + super db query -s -z 'from asc |> k == 12321' + super db query -s -z 'from asc |> k == 12322 or foo != 123' + super db query -s -z 'from asc |> k == 12323 and foo == 123' + super db query -s -z 'from desc |> k >= 1000 and k <= 1002' + super db query -s -z 'from desc |> k == 12321' + super db query -s -z 'from desc |> k == 12322 or foo != 123' + super db query -s -z 'from desc |> k == 12323 and foo == 123' outputs: - name: stdout diff --git a/lake/ztests/seek-index-ts.yaml b/lake/ztests/seek-index-ts.yaml index f4b884de33..9b766e5a43 100644 --- a/lake/ztests/seek-index-ts.yaml +++ b/lake/ztests/seek-index-ts.yaml @@ -4,9 +4,9 @@ script: | for o in asc desc; do super db create -use -seekstride 2KB -orderby ts:$o -q $o super db load -q babble.jsup - source query.sh "from $o | ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z" - source query.sh "from $o | ts == 2020-04-21T23:59:26.06326664Z" - source query.sh "from $o | ts == 2020-04-21T23:59:26.06326664Z or foo == 'bar'" + source query.sh "from $o |> ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z" + source query.sh "from $o |> ts == 2020-04-21T23:59:26.06326664Z" + source query.sh "from $o |> ts == 2020-04-21T23:59:26.06326664Z or foo == 'bar'" done @@ -21,33 +21,33 @@ inputs: outputs: - name: stdout data: | - // from asc | ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z + // from asc |> ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z {ts:2020-04-21T23:59:26.06326664Z,s:"potbellied-Dedanim",v:230} {ts:2020-04-21T23:59:29.06985813Z,s:"areek-ashless",v:266} {ts:2020-04-21T23:59:38.0687693Z,s:"topcoating-rhexis",v:415} - // from asc | ts == 2020-04-21T23:59:26.06326664Z + // from asc |> ts == 2020-04-21T23:59:26.06326664Z {ts:2020-04-21T23:59:26.06326664Z,s:"potbellied-Dedanim",v:230} - // from asc | ts == 2020-04-21T23:59:26.06326664Z or foo == 'bar' + // from asc |> ts == 2020-04-21T23:59:26.06326664Z or foo == 'bar' {ts:2020-04-21T23:59:26.06326664Z,s:"potbellied-Dedanim",v:230} - // from desc | ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z + // from desc |> ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z {ts:2020-04-21T23:59:38.0687693Z,s:"topcoating-rhexis",v:415} {ts:2020-04-21T23:59:29.06985813Z,s:"areek-ashless",v:266} {ts:2020-04-21T23:59:26.06326664Z,s:"potbellied-Dedanim",v:230} - // from desc | ts == 2020-04-21T23:59:26.06326664Z + // from desc |> ts == 2020-04-21T23:59:26.06326664Z {ts:2020-04-21T23:59:26.06326664Z,s:"potbellied-Dedanim",v:230} - // from desc | ts == 2020-04-21T23:59:26.06326664Z or foo == 'bar' + // from desc |> ts == 2020-04-21T23:59:26.06326664Z or foo == 'bar' {ts:2020-04-21T23:59:26.06326664Z,s:"potbellied-Dedanim",v:230} - name: stderr data: | - // from asc | ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z + // from asc |> ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z {bytes_read:16403,bytes_matched:87,records_read:500,records_matched:3} - // from asc | ts == 2020-04-21T23:59:26.06326664Z + // from asc |> ts == 2020-04-21T23:59:26.06326664Z {bytes_read:8141,bytes_matched:31,records_read:250,records_matched:1} - // from asc | ts == 2020-04-21T23:59:26.06326664Z or foo == 'bar' + // from asc |> ts == 2020-04-21T23:59:26.06326664Z or foo == 'bar' {bytes_read:32889,bytes_matched:31,records_read:1000,records_matched:1} - // from desc | ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z + // from desc |> ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z {bytes_read:16403,bytes_matched:87,records_read:500,records_matched:3} - // from desc | ts == 2020-04-21T23:59:26.06326664Z + // from desc |> ts == 2020-04-21T23:59:26.06326664Z {bytes_read:8141,bytes_matched:31,records_read:250,records_matched:1} - // from desc | ts == 2020-04-21T23:59:26.06326664Z or foo == 'bar' + // from desc |> ts == 2020-04-21T23:59:26.06326664Z or foo == 'bar' {bytes_read:32889,bytes_matched:31,records_read:1000,records_matched:1} diff --git a/lake/ztests/time-travel.yaml b/lake/ztests/time-travel.yaml index 60a7fe42ea..8c678be090 100644 --- a/lake/ztests/time-travel.yaml +++ b/lake/ztests/time-travel.yaml @@ -4,16 +4,16 @@ script: | super db create -use -q POOL a=$(super db load a.jsup | head -1 | awk '{print $1}') b=$(super db load b.jsup | head -1 | awk '{print $1}') - super db query -z "from POOL | sort this" + super db query -z "from POOL |> sort this" echo === AT a - super db query -z "from POOL@$a | sort this" + super db query -z "from POOL@$a |> sort this" echo === AT b - super db query -z "from POOL@$b | sort this" + super db query -z "from POOL@$b |> sort this" super db revert -q $a echo === with A deleted - super db query -z "from POOL | sort this" + super db query -z "from POOL |> sort this" echo === at B before A deleted - super db query -z "from POOL@$b | sort this" + super db query -z "from POOL@$b |> sort this" inputs: - name: a.jsup diff --git a/lake/ztests/vector.yaml b/lake/ztests/vector.yaml index 39746a065f..94085cc9ba 100644 --- a/lake/ztests/vector.yaml +++ b/lake/ztests/vector.yaml @@ -3,12 +3,12 @@ script: | super db init -q super db create -use -q POOL super db load -q in.jsup - id=$(super db query -f text 'from POOL@main:objects | yield ksuid(id)') + id=$(super db query -f text 'from POOL@main:objects |> yield ksuid(id)') super db vector add -q $id - super db query -Z 'from POOL@main:vectors | drop id' + super db query -Z 'from POOL@main:vectors |> drop id' echo === super db vector delete -q $id - super db query -Z 'from POOL@main:vectors | drop id' + super db query -Z 'from POOL@main:vectors |> drop id' echo === inputs: diff --git a/lake/ztests/zq.yaml b/lake/ztests/zq.yaml index e2477c3091..9d484b24a7 100644 --- a/lake/ztests/zq.yaml +++ b/lake/ztests/zq.yaml @@ -3,7 +3,7 @@ script: | super db init -q super db create -q logs super db load -q -use logs babble.jsup - super db query "from logs | count()" | super -z - + super db query "from logs |> count()" | super -z - inputs: - name: babble.jsup diff --git a/runtime/sam/expr/agg/ztests/logical-partials.yaml b/runtime/sam/expr/agg/ztests/logical-partials.yaml index 13bf5dc055..fb31881d1a 100644 --- a/runtime/sam/expr/agg/ztests/logical-partials.yaml +++ b/runtime/sam/expr/agg/ztests/logical-partials.yaml @@ -1,4 +1,4 @@ -zed: 't1:=or(x>2),t2:=or(x>4),t3:=and(x>0),t4:=and(x>2),t5:=and(x>2) where x>2 by key with -limit 1 | sort this' +zed: 't1:=or(x>2),t2:=or(x>4),t3:=and(x>0),t4:=and(x>2),t5:=and(x>2) where x>2 by key with -limit 1 |> sort this' input: | {key:"a",x:1(int32)} diff --git a/runtime/sam/expr/function/ztests/nameof.yaml b/runtime/sam/expr/function/ztests/nameof.yaml index b1e00052ea..cf58359d8d 100644 --- a/runtime/sam/expr/function/ztests/nameof.yaml +++ b/runtime/sam/expr/function/ztests/nameof.yaml @@ -1,4 +1,4 @@ -zed: count() by nameof(this) | sort this +zed: count() by nameof(this) |> sort this input: | {x:1} diff --git a/runtime/sam/expr/ztests/is-typedef.yaml b/runtime/sam/expr/ztests/is-typedef.yaml index 4abf1003f8..e33a027869 100644 --- a/runtime/sam/expr/ztests/is-typedef.yaml +++ b/runtime/sam/expr/ztests/is-typedef.yaml @@ -1,7 +1,7 @@ zed: | type socket={addr:ip, port:uint16} const PI=3.14 - is(src,) | put pi:=PI + is(src,) |> put pi:=PI input: | { diff --git a/runtime/sam/expr/ztests/record-spread-over-with.yaml b/runtime/sam/expr/ztests/record-spread-over-with.yaml index 07b6d22885..310f1fb3ea 100644 --- a/runtime/sam/expr/ztests/record-spread-over-with.yaml +++ b/runtime/sam/expr/ztests/record-spread-over-with.yaml @@ -1,7 +1,7 @@ zed: | over tweet_ids with outer=this => ( ids:=collect(string(this)) - | yield {...outer,tweet_ids:join(ids,',')} + |> yield {...outer,tweet_ids:join(ids,',')} ) input: | diff --git a/runtime/sam/expr/ztests/record-spread-over.yaml b/runtime/sam/expr/ztests/record-spread-over.yaml index c9405bfd15..c65d12f993 100644 --- a/runtime/sam/expr/ztests/record-spread-over.yaml +++ b/runtime/sam/expr/ztests/record-spread-over.yaml @@ -1,7 +1,7 @@ zed: | over tweet_ids with that=this => ( ids:=collect(string(this)) - | yield {...that,tweet_ids:join(ids,',')} + |> yield {...that,tweet_ids:join(ids,',')} ) input: | diff --git a/runtime/sam/expr/ztests/rename.yaml b/runtime/sam/expr/ztests/rename.yaml index c055ab4fc9..18d4298059 100644 --- a/runtime/sam/expr/ztests/rename.yaml +++ b/runtime/sam/expr/ztests/rename.yaml @@ -1,4 +1,4 @@ -zed: 'rename s2:=s | count() by s2 | sort s2' +zed: 'rename s2:=s |> count() by s2 |> sort s2' # This test previously failed only for binary zng. # {s:"a"} diff --git a/runtime/sam/expr/ztests/shape-zson-typedef.yaml b/runtime/sam/expr/ztests/shape-zson-typedef.yaml index 2700021d4c..26568efa16 100644 --- a/runtime/sam/expr/ztests/shape-zson-typedef.yaml +++ b/runtime/sam/expr/ztests/shape-zson-typedef.yaml @@ -1,4 +1,4 @@ -zed: name=='steve' | yield shape(this,) +zed: name=='steve' |> yield shape(this,) input: | {name:"jim",likes:"plain",age:30}(=person) diff --git a/runtime/sam/expr/ztests/type-map.yaml b/runtime/sam/expr/ztests/type-map.yaml index 271f021d81..4fde5a347d 100644 --- a/runtime/sam/expr/ztests/type-map.yaml +++ b/runtime/sam/expr/ztests/type-map.yaml @@ -6,9 +6,9 @@ zed: | "dns": dns }| fork ( - => !missing(schemas[_path]) | cut schema:=schemas[_path] - => missing(schemas[_path]) | put _UNCLASSIFIED:=true - ) | sort this + => !missing(schemas[_path]) |> cut schema:=schemas[_path] + => missing(schemas[_path]) |> put _UNCLASSIFIED:=true + ) |> sort this input: | {_path:"conn",id:{src:"192.168.1.1",dst:"192.168.1.2"},etc:"foo"} diff --git a/runtime/sam/op/exprswitch/ztests/switch-default.yaml b/runtime/sam/op/exprswitch/ztests/switch-default.yaml index 52d4a578ee..e4c136a7bf 100644 --- a/runtime/sam/op/exprswitch/ztests/switch-default.yaml +++ b/runtime/sam/op/exprswitch/ztests/switch-default.yaml @@ -3,8 +3,8 @@ zed: | case 2 => put v:='two' case 1 => put v:='one' case 3 => filter null - default => count:=count() | put a:=-1 - ) | sort a + default => count:=count() |> put a:=-1 + ) |> sort a input: | {a:1,s:"a"} diff --git a/runtime/sam/op/exprswitch/ztests/switch-done.yaml b/runtime/sam/op/exprswitch/ztests/switch-done.yaml index 3ba312ea7f..410d65871d 100644 --- a/runtime/sam/op/exprswitch/ztests/switch-done.yaml +++ b/runtime/sam/op/exprswitch/ztests/switch-done.yaml @@ -3,7 +3,7 @@ zed: | case 1 => head 1 case 2 => tail 1 default => pass - ) | sort b + ) |> sort b input: | {a:1,b:1} diff --git a/runtime/sam/op/exprswitch/ztests/switch-over.yaml b/runtime/sam/op/exprswitch/ztests/switch-over.yaml index c000cf3986..f7464a92c2 100644 --- a/runtime/sam/op/exprswitch/ztests/switch-over.yaml +++ b/runtime/sam/op/exprswitch/ztests/switch-over.yaml @@ -1,8 +1,8 @@ zed: | switch len(a) ( case 3 => over a => (sum:=sum(this)) - default => over a | yield {b:this} - ) | sort this + default => over a |> yield {b:this} + ) |> sort this input: | {a:[1,2,3]} diff --git a/runtime/sam/op/exprswitch/ztests/switch.yaml b/runtime/sam/op/exprswitch/ztests/switch.yaml index 24b9bcd50f..0e0af9dab5 100644 --- a/runtime/sam/op/exprswitch/ztests/switch.yaml +++ b/runtime/sam/op/exprswitch/ztests/switch.yaml @@ -3,7 +3,7 @@ zed: | case 2 => put v:='two' case 1 => put v:='one' case 3 => filter null - ) | sort a + ) |> sort a input: | {a:1(int32),s:"a"} diff --git a/runtime/sam/op/groupby/ztests/groupby.yaml b/runtime/sam/op/groupby/ztests/groupby.yaml index 0e14d9c4f8..24bfaf81b0 100644 --- a/runtime/sam/op/groupby/ztests/groupby.yaml +++ b/runtime/sam/op/groupby/ztests/groupby.yaml @@ -1,24 +1,24 @@ script: | echo === forward-sorted === - super -z -c "count() by ts | sort this" in.jsup + super -z -c "count() by ts |> sort this" in.jsup echo === forward-sorted-with-null === - super -z -c "count() by ts | sort this" in-with-null.jsup + super -z -c "count() by ts |> sort this" in-with-null.jsup echo === forward-sorted-every === - super -z -c "count() by every(1s)| sort this" in.jsup + super -z -c "count() by every(1s) |> sort this" in.jsup echo === forward-sorted-every-null === - super -z -c "count() by every(1s) | sort this" in-with-null.jsup + super -z -c "count() by every(1s) |> sort this" in-with-null.jsup echo === forward-sorted-record-key === - super -z -c "count() by foo | sort this" in-record-key.jsup + super -z -c "count() by foo |> sort this" in-record-key.jsup echo === forward-sorted-nested-key === - super -z -c "count() by foo.a | sort this" in-record-key.jsup + super -z -c "count() by foo.a |> sort this" in-record-key.jsup echo === forward-sorted-record-key-null === - super -z -c "count() by foo | sort this" in-record-key-null.jsup + super -z -c "count() by foo |> sort this" in-record-key-null.jsup echo === forward-sorted-nested-key-null === - super -z -c "count() by foo | sort this" in-record-key-null.jsup + super -z -c "count() by foo |> sort this" in-record-key-null.jsup echo === reverse-sorted === - super -z -c "count() by ts | sort this" in-rev.jsup + super -z -c "count() by ts |> sort this" in-rev.jsup echo === reverse-sorted-null === - super -z -c "count() by every(1s) | sort this" in-rev.jsup + super -z -c "count() by every(1s) |> sort this" in-rev.jsup inputs: - name: in.jsup diff --git a/runtime/sam/op/groupby/ztests/null-keys-at-start-assign.yaml b/runtime/sam/op/groupby/ztests/null-keys-at-start-assign.yaml index 43995757d6..2e5043d667 100644 --- a/runtime/sam/op/groupby/ztests/null-keys-at-start-assign.yaml +++ b/runtime/sam/op/groupby/ztests/null-keys-at-start-assign.yaml @@ -1,4 +1,4 @@ -zed: count() by newkey:=key1 | sort newkey +zed: count() by newkey:=key1 |> sort newkey input: | {key1:null(string),key2:null(string),n:3(int32)} diff --git a/runtime/sam/op/groupby/ztests/null-keys-at-start.yaml b/runtime/sam/op/groupby/ztests/null-keys-at-start.yaml index 208f3073ad..d804566c37 100644 --- a/runtime/sam/op/groupby/ztests/null-keys-at-start.yaml +++ b/runtime/sam/op/groupby/ztests/null-keys-at-start.yaml @@ -1,4 +1,4 @@ -zed: count() by key1 | sort key1 +zed: count() by key1 |> sort key1 input: | {key1:null(string),key2:null(string),n:3(int32)} diff --git a/runtime/sam/op/groupby/ztests/null-keys.yaml b/runtime/sam/op/groupby/ztests/null-keys.yaml index 32dc7f487c..29460f9fcc 100644 --- a/runtime/sam/op/groupby/ztests/null-keys.yaml +++ b/runtime/sam/op/groupby/ztests/null-keys.yaml @@ -1,4 +1,4 @@ -zed: count() by key1 | sort key1 +zed: count() by key1 |> sort key1 input: | {key1:"a",key2:"x",n:1(int32)} diff --git a/runtime/sam/op/groupby/ztests/reducers.yaml b/runtime/sam/op/groupby/ztests/reducers.yaml index 760f2235d9..5cd351b342 100644 --- a/runtime/sam/op/groupby/ztests/reducers.yaml +++ b/runtime/sam/op/groupby/ztests/reducers.yaml @@ -1,4 +1,4 @@ -zed: any(n), sum(n), avg(n), min(n), max(n) by key1 | sort key1 +zed: any(n), sum(n), avg(n), min(n), max(n) by key1 |> sort key1 input: | {key1:"a",key2:"x",n:1(int32)} diff --git a/runtime/sam/op/groupby/ztests/where.yaml b/runtime/sam/op/groupby/ztests/where.yaml index 0d8407c084..33c0b77a12 100644 --- a/runtime/sam/op/groupby/ztests/where.yaml +++ b/runtime/sam/op/groupby/ztests/where.yaml @@ -1,4 +1,4 @@ -zed: "sum(x) where s=='a', s2:=sum(x) by key:=animal | sort this" +zed: "sum(x) where s=='a', s2:=sum(x) by key:=animal |> sort this" input: | {animal:"cat",s:"a",x:1(int32)} diff --git a/runtime/sam/op/join/ztests/auto-sort.yaml b/runtime/sam/op/join/ztests/auto-sort.yaml index a3e5f75ed3..0acd4e2767 100644 --- a/runtime/sam/op/join/ztests/auto-sort.yaml +++ b/runtime/sam/op/join/ztests/auto-sort.yaml @@ -1,15 +1,15 @@ script: | - super -z -c 'file a.jsup | join (file b.jsup) on a=b' + super -z -c 'file a.jsup |> join (file b.jsup) on a=b' echo '// ===' - super -z -c 'file a.jsup | join (file b.jsup | sort -r b) on a=b' + super -z -c 'file a.jsup |> join (file b.jsup |> sort -r b) on a=b' echo '// ===' - super -z -c 'file a.jsup | join (file b.jsup | sort b) on a=b' + super -z -c 'file a.jsup |> join (file b.jsup |> sort b) on a=b' echo '// ===' - super -z -c 'file a.jsup | sort a | join (file b.jsup | sort -r b) on a=b' + super -z -c 'file a.jsup |> sort a |> join (file b.jsup |> sort -r b) on a=b' echo '// ===' - super -z -c 'file a.jsup | sort -r a | join (file b.jsup) on a=b' + super -z -c 'file a.jsup |> sort -r a |> join (file b.jsup) on a=b' echo '// ===' - super -z -c 'file a.jsup | sort -r a | join (file b.jsup | sort b) on a=b' + super -z -c 'file a.jsup |> sort -r a |> join (file b.jsup |> sort b) on a=b' inputs: - name: a.jsup diff --git a/runtime/sam/op/join/ztests/cut-like.yaml b/runtime/sam/op/join/ztests/cut-like.yaml index 66235595b9..52b43d1d5b 100644 --- a/runtime/sam/op/join/ztests/cut-like.yaml +++ b/runtime/sam/op/join/ztests/cut-like.yaml @@ -6,7 +6,7 @@ inputs: from ( file people.json file fruit.json - ) | left join on likes=flavor fruit:=name,note:=quiet(note) + ) |> left join on likes=flavor fruit:=name,note:=quiet(note) - name: people.json data: | {"name":"morgan","age":61,"likes":"tart"} diff --git a/runtime/sam/op/join/ztests/first-key-is-null.yaml b/runtime/sam/op/join/ztests/first-key-is-null.yaml index 1d48651cca..808e976e2c 100644 --- a/runtime/sam/op/join/ztests/first-key-is-null.yaml +++ b/runtime/sam/op/join/ztests/first-key-is-null.yaml @@ -2,7 +2,7 @@ zed: | fork ( => pass => pass - ) | join on a=a + ) |> join on a=a input: &input | {a:null(int64)} diff --git a/runtime/sam/op/join/ztests/first-key-is-zero.yaml b/runtime/sam/op/join/ztests/first-key-is-zero.yaml index 865b5b2052..56c3248881 100644 --- a/runtime/sam/op/join/ztests/first-key-is-zero.yaml +++ b/runtime/sam/op/join/ztests/first-key-is-zero.yaml @@ -2,7 +2,7 @@ zed: | fork ( => pass => pass - ) | join on a=a + ) |> join on a=a input: &input | {a:0} diff --git a/runtime/sam/op/join/ztests/kinds.yaml b/runtime/sam/op/join/ztests/kinds.yaml index ba5a83d79c..9516ac407e 100644 --- a/runtime/sam/op/join/ztests/kinds.yaml +++ b/runtime/sam/op/join/ztests/kinds.yaml @@ -1,12 +1,12 @@ script: | echo === ANTI === - super -z -c 'anti join (file B.jsup) on a=b | sort a' A.jsup + super -z -c 'anti join (file B.jsup) on a=b |> sort a' A.jsup echo === LEFT === - super -z -c 'left join (file B.jsup) on a=b hit:=sb | sort a' A.jsup + super -z -c 'left join (file B.jsup) on a=b hit:=sb |> sort a' A.jsup echo === INNER === - super -z -c 'inner join (file B.jsup) on a=b hit:=sb | sort a' A.jsup + super -z -c 'inner join (file B.jsup) on a=b hit:=sb |> sort a' A.jsup echo === RIGHT === - super -z -c 'right join (file C.jsup) on b=c hit:=sb | sort c' B.jsup + super -z -c 'right join (file C.jsup) on b=c hit:=sb |> sort c' B.jsup inputs: - name: A.jsup diff --git a/runtime/sam/op/join/ztests/subquery.yaml b/runtime/sam/op/join/ztests/subquery.yaml index 3045efb63a..5356cdc492 100644 --- a/runtime/sam/op/join/ztests/subquery.yaml +++ b/runtime/sam/op/join/ztests/subquery.yaml @@ -1,5 +1,5 @@ script: | - super -z -c 'file a.jsup | inner join (file b.jsup) on a=b' + super -z -c 'file a.jsup |> inner join (file b.jsup) on a=b' inputs: - name: a.jsup diff --git a/runtime/sam/op/merge/ztests/expr.yaml b/runtime/sam/op/merge/ztests/expr.yaml index 9c1321a4ba..25f0cf535d 100644 --- a/runtime/sam/op/merge/ztests/expr.yaml +++ b/runtime/sam/op/merge/ztests/expr.yaml @@ -1,4 +1,4 @@ -zed: fork (=>pass =>pass) | merge this +zed: fork (=>pass =>pass) |> merge this input: 1 2 diff --git a/runtime/sam/op/merge/ztests/fork-merge.yaml b/runtime/sam/op/merge/ztests/fork-merge.yaml index c9cce489d2..1ca6cf0945 100644 --- a/runtime/sam/op/merge/ztests/fork-merge.yaml +++ b/runtime/sam/op/merge/ztests/fork-merge.yaml @@ -2,7 +2,7 @@ zed: | fork ( => x <= 2 => x > 2 - ) | merge x + ) |> merge x input: | {x:1} diff --git a/runtime/sam/op/meta/ztests/nulls-max.yaml b/runtime/sam/op/meta/ztests/nulls-max.yaml index 9a3806c29f..c5287eca40 100644 --- a/runtime/sam/op/meta/ztests/nulls-max.yaml +++ b/runtime/sam/op/meta/ztests/nulls-max.yaml @@ -9,9 +9,9 @@ script: | super db create -q -use -orderby ts:$o $o echo '{ts:150} {ts:null}' | super db load -q - echo '{ts:1}' | super db load -q - - super db query -z "from $o:objects | drop id, size" + super db query -z "from $o:objects |> drop id, size" echo "// ===" - super db query -z "from $o | head 1" + super db query -z "from $o |> head 1" done outputs: diff --git a/runtime/sam/op/meta/ztests/partitions.yaml b/runtime/sam/op/meta/ztests/partitions.yaml index f9f3e793f0..1a3e80fcff 100644 --- a/runtime/sam/op/meta/ztests/partitions.yaml +++ b/runtime/sam/op/meta/ztests/partitions.yaml @@ -15,7 +15,7 @@ script: | echo '{k:10}{k:13}' | super db load -q - super db query -z "from tmp" echo === - super db query -Z "from tmp:partitions | over objects => (collect({min,max}))" + super db query -Z "from tmp:partitions |> over objects => (collect({min,max}))" outputs: - name: stdout diff --git a/runtime/sam/op/meta/ztests/pruner.yaml b/runtime/sam/op/meta/ztests/pruner.yaml index eddcace023..35709f6f29 100644 --- a/runtime/sam/op/meta/ztests/pruner.yaml +++ b/runtime/sam/op/meta/ztests/pruner.yaml @@ -9,17 +9,17 @@ script: | seq 8 12 | super -c '{k:this}' - | super db load -q - seq 20 25 | super -c '{k:this}' - | super db load -q - seq 14 16 | super -c '{k:this}' - | super db load -q - - super db query "from tmp:objects tap | k > 18" | super -z -c "drop id" - + super db query "from tmp:objects tap |> k > 18" | super -z -c "drop id" - echo === - super db query "from tmp:objects tap | k <= 10" | super -z -c "drop id" - + super db query "from tmp:objects tap |> k <= 10" | super -z -c "drop id" - echo === - super db query "from tmp:objects tap | k >= 15 and k < 20" | super -z -c "drop id" - + super db query "from tmp:objects tap |> k >= 15 and k < 20" | super -z -c "drop id" - echo === - super db query "from tmp:objects tap | k <= 9 or k > 24" | super -z -c "drop id" - + super db query "from tmp:objects tap |> k <= 9 or k > 24" | super -z -c "drop id" - echo === - super db query 'from tmp:objects tap | a[k] == "foo" or k >= 20' | super -z -c "drop id" - + super db query 'from tmp:objects tap |> a[k] == "foo" or k >= 20' | super -z -c "drop id" - echo === - super db query 'from tmp:objects tap | a[k] == "foo" and k >= 20' | super -z -c "drop id" - + super db query 'from tmp:objects tap |> a[k] == "foo" and k >= 20' | super -z -c "drop id" - outputs: - name: stdout diff --git a/runtime/sam/op/meta/ztests/type-context.yaml b/runtime/sam/op/meta/ztests/type-context.yaml index 5ca6f93699..5ead143151 100644 --- a/runtime/sam/op/meta/ztests/type-context.yaml +++ b/runtime/sam/op/meta/ztests/type-context.yaml @@ -6,9 +6,9 @@ script: | super db create -q tmp echo '1 2' | super db load -q -use tmp - echo '3' | super db load -q -use tmp - - super db query -z 'from tmp | yield typeof(<"data.Object">)' + super db query -z 'from tmp |> yield typeof(<"data.Object">)' echo === - super db query -z 'from tmp@main:objects | yield typeof(<"data.Object">)' + super db query -z 'from tmp@main:objects |> yield typeof(<"data.Object">)' outputs: - name: stdout diff --git a/runtime/sam/op/sort/ztests/over-with.yaml b/runtime/sam/op/sort/ztests/over-with.yaml index 880da2df45..f6802a0b38 100644 --- a/runtime/sam/op/sort/ztests/over-with.yaml +++ b/runtime/sam/op/sort/ztests/over-with.yaml @@ -1,5 +1,5 @@ zed: | - over this with foo="bar" => (sort this | yield {num: this, foo}) + over this with foo="bar" => (sort this |> yield {num: this, foo}) input: "[4,2,6,1]" diff --git a/runtime/sam/op/switcher/ztests/switch-chained.yaml b/runtime/sam/op/switcher/ztests/switch-chained.yaml index c1a9cd98b3..6e9c2ed883 100644 --- a/runtime/sam/op/switcher/ztests/switch-chained.yaml +++ b/runtime/sam/op/switcher/ztests/switch-chained.yaml @@ -3,11 +3,11 @@ zed: | case 0 => pass case 1 => yield 2 ) - | switch this ( + |> switch this ( case 0 => pass case 2 => yield 3 ) - | switch ( + |> switch ( case this==0 => pass case this==3 => yield 4 ) diff --git a/runtime/sam/op/switcher/ztests/switch-default.yaml b/runtime/sam/op/switcher/ztests/switch-default.yaml index 46981b1997..f6f0bfb690 100644 --- a/runtime/sam/op/switcher/ztests/switch-default.yaml +++ b/runtime/sam/op/switcher/ztests/switch-default.yaml @@ -3,8 +3,8 @@ zed: | case a==2 => put v:='two' case a==1 => put v:='one' case a==3 => filter null - default => count:=count() | put a:=-1 - ) | sort a + default => count:=count() |> put a:=-1 + ) |> sort a input: | {a:1,s:"a"} diff --git a/runtime/sam/op/switcher/ztests/switch-error.yaml b/runtime/sam/op/switcher/ztests/switch-error.yaml index 6378adda33..0dabdedf34 100644 --- a/runtime/sam/op/switcher/ztests/switch-error.yaml +++ b/runtime/sam/op/switcher/ztests/switch-error.yaml @@ -2,7 +2,7 @@ zed: | switch ( case a == 1 => put v:='one' case a / 0 => put v:='xxx' - ) | sort this + ) |> sort this input: | {a:1,s:"a"} diff --git a/runtime/sam/op/switcher/ztests/switch-over.yaml b/runtime/sam/op/switcher/ztests/switch-over.yaml index 88e2d701ea..08db1ee0f5 100644 --- a/runtime/sam/op/switcher/ztests/switch-over.yaml +++ b/runtime/sam/op/switcher/ztests/switch-over.yaml @@ -1,8 +1,8 @@ zed: | switch ( case len(a)==3 => over a => (sum:=sum(this)) - default => over a | yield {b:this} - ) | sort this + default => over a |> yield {b:this} + ) |> sort this input: | {a:[1,2,3]} diff --git a/runtime/sam/op/switcher/ztests/switch.yaml b/runtime/sam/op/switcher/ztests/switch.yaml index c546c1721c..f543c74d0d 100644 --- a/runtime/sam/op/switcher/ztests/switch.yaml +++ b/runtime/sam/op/switcher/ztests/switch.yaml @@ -3,8 +3,8 @@ zed: | case a == 2 => put v:='two' case a == 1 => put v:='one' case a == 3 => filter null - case true => count:=count() | put a:=-1 - ) | sort a + case true => count:=count() |> put a:=-1 + ) |> sort a input: | {a:1(int32),s:"a"} diff --git a/runtime/sam/op/tail/ztests/over-with.yaml b/runtime/sam/op/tail/ztests/over-with.yaml index 466c5f9da9..8b9abdda1e 100644 --- a/runtime/sam/op/tail/ztests/over-with.yaml +++ b/runtime/sam/op/tail/ztests/over-with.yaml @@ -1,5 +1,5 @@ zed: | - over this with foo="bar" => (tail 1 | yield {num: this, foo}) + over this with foo="bar" => (tail 1 |> yield {num: this, foo}) input: '[1,2,3,4,5]' diff --git a/runtime/sam/op/traverse/ztests/bare.yaml b/runtime/sam/op/traverse/ztests/bare.yaml index 05e3baf8fb..941c242ec8 100644 --- a/runtime/sam/op/traverse/ztests/bare.yaml +++ b/runtime/sam/op/traverse/ztests/bare.yaml @@ -1,4 +1,4 @@ -zed: over a | sum(this) +zed: over a |> sum(this) input: | {a:[6,5,4]} diff --git a/runtime/sam/op/traverse/ztests/filter.yaml b/runtime/sam/op/traverse/ztests/filter.yaml index 29dbcbab37..701d22fea7 100644 --- a/runtime/sam/op/traverse/ztests/filter.yaml +++ b/runtime/sam/op/traverse/ztests/filter.yaml @@ -1,4 +1,4 @@ -zed: over a | this % 2 == 0 +zed: over a |> this % 2 == 0 input: | {a:[7,6,5,4]} diff --git a/runtime/sam/op/traverse/ztests/head.yaml b/runtime/sam/op/traverse/ztests/head.yaml index 3a92f03069..dc5fd3cfe1 100644 --- a/runtime/sam/op/traverse/ztests/head.yaml +++ b/runtime/sam/op/traverse/ztests/head.yaml @@ -1,4 +1,4 @@ -zed: over a | head 2 +zed: over a |> head 2 input: | {a:[7,6,1]} diff --git a/runtime/sam/op/traverse/ztests/nested-done-head.yaml b/runtime/sam/op/traverse/ztests/nested-done-head.yaml index e3f3739b94..7eba5fb9e9 100644 --- a/runtime/sam/op/traverse/ztests/nested-done-head.yaml +++ b/runtime/sam/op/traverse/ztests/nested-done-head.yaml @@ -2,14 +2,14 @@ zed: | over this => ( over this => ( fork ( - => head 1 | a:=collect(this) - => head 2 | a:=collect(this) + => head 1 |> a:=collect(this) + => head 2 |> a:=collect(this) => summarize a:=collect(this) ) - | sort this - | head 1 + |> sort this + |> head 1 ) - | sort this + |> sort this ) input: | diff --git a/runtime/sam/op/traverse/ztests/nested-done-tail.yaml b/runtime/sam/op/traverse/ztests/nested-done-tail.yaml index 661a53b3c0..9881ea05d8 100644 --- a/runtime/sam/op/traverse/ztests/nested-done-tail.yaml +++ b/runtime/sam/op/traverse/ztests/nested-done-tail.yaml @@ -2,14 +2,14 @@ zed: | over this => ( over this => ( fork ( - => tail 1 | a:=collect(this) - => tail 2 | a:=collect(this) + => tail 1 |> a:=collect(this) + => tail 2 |> a:=collect(this) => summarize a:=collect(this) ) - | sort this - | tail 2 + |> sort this + |> tail 2 ) - | sort this + |> sort this ) input: | diff --git a/runtime/sam/op/traverse/ztests/nested-over-tail-head.yaml b/runtime/sam/op/traverse/ztests/nested-over-tail-head.yaml index e312cd1c4b..a1c6c55df3 100644 --- a/runtime/sam/op/traverse/ztests/nested-over-tail-head.yaml +++ b/runtime/sam/op/traverse/ztests/nested-over-tail-head.yaml @@ -1,7 +1,7 @@ zed: | over this => ( over this => ( - tail 2 | head 1 + tail 2 |> head 1 ) ) diff --git a/runtime/sam/op/traverse/ztests/nested-where-head.yaml b/runtime/sam/op/traverse/ztests/nested-where-head.yaml index 97ebf9948f..b9747633ff 100644 --- a/runtime/sam/op/traverse/ztests/nested-where-head.yaml +++ b/runtime/sam/op/traverse/ztests/nested-where-head.yaml @@ -1,7 +1,7 @@ zed: | over this => ( over this => ( - where this > 2 | head 1 + where this > 2 |> head 1 ) ) diff --git a/runtime/sam/op/traverse/ztests/nested.yaml b/runtime/sam/op/traverse/ztests/nested.yaml index 01db235dd9..4a39ba67a0 100644 --- a/runtime/sam/op/traverse/ztests/nested.yaml +++ b/runtime/sam/op/traverse/ztests/nested.yaml @@ -1,7 +1,7 @@ zed: | over outer with TOP=top => ( yield {msg:"OUTER", TOP:TOP, inner:inner, b:b} - | over inner with BOTTOM=b => ( + |> over inner with BOTTOM=b => ( yield {top:TOP, bottom:BOTTOM, elem:this} ) ) diff --git a/runtime/sam/op/traverse/ztests/over-expr-inside.yaml b/runtime/sam/op/traverse/ztests/over-expr-inside.yaml index e24e39a540..e42bf21f6c 100644 --- a/runtime/sam/op/traverse/ztests/over-expr-inside.yaml +++ b/runtime/sam/op/traverse/ztests/over-expr-inside.yaml @@ -1,4 +1,4 @@ -zed: over a => ( {y,s:(over x | sum(this))} ) +zed: over a => ( {y,s:(over x |> sum(this))} ) input: | {a:[{x:[1,2],y:2},{x:[3,2],y:4}]} diff --git a/runtime/sam/op/traverse/ztests/over-expr-missing.yaml b/runtime/sam/op/traverse/ztests/over-expr-missing.yaml index 4d7d6ac68e..14ed4b82c4 100644 --- a/runtime/sam/op/traverse/ztests/over-expr-missing.yaml +++ b/runtime/sam/op/traverse/ztests/over-expr-missing.yaml @@ -1,4 +1,4 @@ -zed: yield (over a | sum(this)) +zed: yield (over a |> sum(this)) input: | {a:[1,2]} diff --git a/runtime/sam/op/traverse/ztests/over-expr-nested.yaml b/runtime/sam/op/traverse/ztests/over-expr-nested.yaml index 40f7b5934c..c5df5db5d9 100644 --- a/runtime/sam/op/traverse/ztests/over-expr-nested.yaml +++ b/runtime/sam/op/traverse/ztests/over-expr-nested.yaml @@ -1,4 +1,4 @@ -zed: yield (over a | over this | collect(string(this))) +zed: yield (over a |> over this |> collect(string(this))) input: | {a:[1,2]} diff --git a/runtime/sam/op/traverse/ztests/over-expr-null.yaml b/runtime/sam/op/traverse/ztests/over-expr-null.yaml index e570d80609..0b47916d67 100644 --- a/runtime/sam/op/traverse/ztests/over-expr-null.yaml +++ b/runtime/sam/op/traverse/ztests/over-expr-null.yaml @@ -1,4 +1,4 @@ -zed: yield (over a | sum(this)) +zed: yield (over a |> sum(this)) input: | {a:[1,2]} diff --git a/runtime/sam/op/traverse/ztests/over-expr-outer-vars.yaml b/runtime/sam/op/traverse/ztests/over-expr-outer-vars.yaml index 85641e2888..2b4dbb2334 100644 --- a/runtime/sam/op/traverse/ztests/over-expr-outer-vars.yaml +++ b/runtime/sam/op/traverse/ztests/over-expr-outer-vars.yaml @@ -1,6 +1,6 @@ zed: | func sumvals(vals): ( - (over vals | sum(this)) + (over vals |> sum(this)) ) sum := sumvals(v) diff --git a/runtime/sam/op/traverse/ztests/over-expr.yaml b/runtime/sam/op/traverse/ztests/over-expr.yaml index f3ddd27c79..4e8db16ee9 100644 --- a/runtime/sam/op/traverse/ztests/over-expr.yaml +++ b/runtime/sam/op/traverse/ztests/over-expr.yaml @@ -1,4 +1,4 @@ -zed: yield (over a | sum(this)) +zed: yield (over a |> sum(this)) input: | {a:[1,2]} diff --git a/runtime/sam/op/traverse/ztests/over-record.yaml b/runtime/sam/op/traverse/ztests/over-record.yaml index 961272f99a..e931aef1fa 100644 --- a/runtime/sam/op/traverse/ztests/over-record.yaml +++ b/runtime/sam/op/traverse/ztests/over-record.yaml @@ -1,7 +1,7 @@ zed: | over this with d=date => ( key[0] != 'date' - | yield {date: d, sym: key[0], price: value} + |> yield {date: d, sym: key[0], price: value} ) input: | diff --git a/runtime/sam/op/ztests/debug.yaml b/runtime/sam/op/ztests/debug.yaml index 35b8465b1a..0d673d5718 100644 --- a/runtime/sam/op/ztests/debug.yaml +++ b/runtime/sam/op/ztests/debug.yaml @@ -1,5 +1,5 @@ script: | - echo '"foo" "bar"' | super -z -c 'debug f"debug: {this}" | yield f"{this}2" | head 1' - + echo '"foo" "bar"' | super -z -c 'debug f"debug: {this}" |> yield f"{this}2" |> head 1' - outputs: - name: stderr diff --git a/runtime/sam/op/ztests/put-dynamic-field.yaml b/runtime/sam/op/ztests/put-dynamic-field.yaml index 28085915bf..ef9f7f456c 100644 --- a/runtime/sam/op/ztests/put-dynamic-field.yaml +++ b/runtime/sam/op/ztests/put-dynamic-field.yaml @@ -1,13 +1,13 @@ script: | - echo '{a:"hi",b:"hello"}' | super -z -c 'this[a][b] := "world" | drop a, b' - + echo '{a:"hi",b:"hello"}' | super -z -c 'this[a][b] := "world" |> drop a, b' - echo "// ===" - echo '{a:{b:"hello"}}' | super -z -c 'this[a.b]:="world" | drop a' - + echo '{a:{b:"hello"}}' | super -z -c 'this[a.b]:="world" |> drop a' - echo "// ===" - echo '{a:"hello"}' | super -z -c 'this[this["a"]] := "world" | drop a' - + echo '{a:"hello"}' | super -z -c 'this[this["a"]] := "world" |> drop a' - echo "// ===" - echo '{a:{},b:"hello"}' | super -z -c 'a[b] := "world" | drop b' - + echo '{a:{},b:"hello"}' | super -z -c 'a[b] := "world" |> drop b' - echo "// ===" - echo '{a:"foo"}' | super -z -c 'this[a]["bar"] := "baz" | cut foo' - + echo '{a:"foo"}' | super -z -c 'this[a]["bar"] := "baz" |> cut foo' - echo "// ===" # runtime error cases echo '{a:"hello",b:"hello"}' | super -z -c 'this[a] := "world1", this[b] := "world2"' - diff --git a/runtime/sam/op/ztests/stateful-expr-reset.yaml b/runtime/sam/op/ztests/stateful-expr-reset.yaml index 8289b5b10a..9f2471204b 100644 --- a/runtime/sam/op/ztests/stateful-expr-reset.yaml +++ b/runtime/sam/op/ztests/stateful-expr-reset.yaml @@ -1,28 +1,28 @@ script: | echo // yield - super -z -c 'yield null, null | over this => ( yield count() )' + super -z -c 'yield null, null |> over this => ( yield count() )' echo // filter - super -z -c 'yield [1,2,3,4], [5,6,7] | over this => ( where count() % 3 == 0 )' + super -z -c 'yield [1,2,3,4], [5,6,7] |> over this => ( where count() % 3 == 0 )' echo // switch - super -z -c 'yield [1], [1] | over this => ( + super -z -c 'yield [1], [1] |> over this => ( switch sum(this) ( case 1 => yield "sum is 1" ) )' echo // exprswitch - super -z -c 'yield [1], [1] | over this => ( + super -z -c 'yield [1], [1] |> over this => ( switch ( case sum(this) == 1 => yield "sum is 1" ) )' echo // over - super -z -c 'yield null, null | over this => ( over count() )' + super -z -c 'yield null, null |> over this => ( over count() )' echo // over with - super -z -c 'yield [1], [1] | over this => ( + super -z -c 'yield [1], [1] |> over this => ( over this with count = count() => ( yield count ) )' echo // summarize - super -z -c 'yield [1], [1] | over this => ( sum(this) by c := count() )' + super -z -c 'yield [1], [1] |> over this => ( sum(this) by c := count() )' outputs: - name: stdout diff --git a/runtime/sam/op/ztests/user-from.yaml b/runtime/sam/op/ztests/user-from.yaml index 85ffcb7a19..b9d76c3de3 100644 --- a/runtime/sam/op/ztests/user-from.yaml +++ b/runtime/sam/op/ztests/user-from.yaml @@ -6,7 +6,7 @@ inputs: data: | const FILE = "A.jsup" op test(path): ( - file [path] | sort a + file [path] |> sort a ) test(FILE) - name: A.jsup diff --git a/runtime/sam/op/ztests/user-join.yaml b/runtime/sam/op/ztests/user-join.yaml index 4c71bc690f..95913b6b78 100644 --- a/runtime/sam/op/ztests/user-join.yaml +++ b/runtime/sam/op/ztests/user-join.yaml @@ -12,7 +12,7 @@ inputs: data: | op test(lpool, rpool, lkey, rkey, ldest, rsrc): ( from [lpool] - | inner join ( from [rpool] ) on lkey = rkey ldest := rsrc + |> inner join ( from [rpool] ) on lkey = rkey ldest := rsrc ) test("fruit", "people", flavor, likes, eater, name) - name: fruit.jsup diff --git a/runtime/sam/op/ztests/user-nested.yaml b/runtime/sam/op/ztests/user-nested.yaml index 6879f7cfa1..2cb10d10f1 100644 --- a/runtime/sam/op/ztests/user-nested.yaml +++ b/runtime/sam/op/ztests/user-nested.yaml @@ -3,10 +3,10 @@ zed: | x := x+1 ) op add2(x): ( - add1(x) | add1(x) + add1(x) |> add1(x) ) op add4(x): ( - add2(x) | add2(x) + add2(x) |> add2(x) ) add4(y) diff --git a/runtime/sam/op/ztests/user-with-scope.yaml b/runtime/sam/op/ztests/user-with-scope.yaml index ec56840c50..80ec8982b2 100644 --- a/runtime/sam/op/ztests/user-with-scope.yaml +++ b/runtime/sam/op/ztests/user-with-scope.yaml @@ -1,10 +1,10 @@ zed: | op keys(r): ( func k(e): (e.key) - op flatten_array(a): (over this | over this | collect(this)) + op flatten_array(a): (over this |> over this |> collect(this)) flatten(this) - | map(this, k) - | flatten_array(this) + |> map(this, k) + |> flatten_array(this) ) keys(this) diff --git a/runtime/ztests/issue-4013.yaml b/runtime/ztests/issue-4013.yaml index 5b5c1ade90..65176adf3a 100644 --- a/runtime/ztests/issue-4013.yaml +++ b/runtime/ztests/issue-4013.yaml @@ -1,11 +1,11 @@ -# Make sure "fork (=> ... => ...) | yield this | head" with one leg that pulls +# Make sure "fork (=> ... => ...) |> yield this |> head" with one leg that pulls # until EOS and one that does not works for an input containing multiple # batches. ("yield this" prevents the optimizer from lifting "head" into the # legs.) script: | - seq 1000 | super -z -c 'fork (=> count() => pass) | yield this | head' - + seq 1000 | super -z -c 'fork (=> count() => pass) |> yield this |> head' - echo === - seq 1000 | super -z -c 'fork (=> pass => count()) | yield this | head' - + seq 1000 | super -z -c 'fork (=> pass => count()) |> yield this |> head' - outputs: - name: stdout diff --git a/runtime/ztests/op/fork-head-tail.yaml b/runtime/ztests/op/fork-head-tail.yaml index 7d5da768e5..cdefdff9ef 100644 --- a/runtime/ztests/op/fork-head-tail.yaml +++ b/runtime/ztests/op/fork-head-tail.yaml @@ -1,4 +1,4 @@ -zed: fork (=> head 1 => tail 1) | sort +zed: fork (=> head 1 => tail 1) |> sort vector: true diff --git a/runtime/ztests/op/fork-multi-head.yaml b/runtime/ztests/op/fork-multi-head.yaml index 81fcd96d6f..dd5f180b4e 100644 --- a/runtime/ztests/op/fork-multi-head.yaml +++ b/runtime/ztests/op/fork-multi-head.yaml @@ -3,7 +3,7 @@ zed: | => head 1 => head 2 ) - | head 1 + |> head 1 vector: true diff --git a/runtime/ztests/op/over-fork-sort-outer.yaml b/runtime/ztests/op/over-fork-sort-outer.yaml index b8ac4e9193..74f5e8cd11 100644 --- a/runtime/ztests/op/over-fork-sort-outer.yaml +++ b/runtime/ztests/op/over-fork-sort-outer.yaml @@ -5,7 +5,7 @@ zed: | => yield this+10 ) ) - | sort this + |> sort this vector: true diff --git a/runtime/ztests/op/over-fork-sort.yaml b/runtime/ztests/op/over-fork-sort.yaml index 213f3779e5..a4a26e5f59 100644 --- a/runtime/ztests/op/over-fork-sort.yaml +++ b/runtime/ztests/op/over-fork-sort.yaml @@ -4,7 +4,7 @@ zed: | => head 1 => yield this+10 ) - | sort this + |> sort this ) vector: true diff --git a/runtime/ztests/op/over-tail-head.yaml b/runtime/ztests/op/over-tail-head.yaml index 4502fc14aa..ee75ee00f9 100644 --- a/runtime/ztests/op/over-tail-head.yaml +++ b/runtime/ztests/op/over-tail-head.yaml @@ -1,6 +1,6 @@ zed: | over this => ( - tail 2 | head 1 + tail 2 |> head 1 ) vector: true diff --git a/runtime/ztests/op/rename-share.yaml b/runtime/ztests/op/rename-share.yaml index 11c61a1009..13b150021c 100644 --- a/runtime/ztests/op/rename-share.yaml +++ b/runtime/ztests/op/rename-share.yaml @@ -1,5 +1,5 @@ # tests that a rename isn't visible to other procs operating on same records. -zed: fork (=> rename id2:=id => cut id.orig_h) | sort id +zed: fork (=> rename id2:=id => cut id.orig_h) |> sort id vector: true diff --git a/runtime/ztests/op/summarize/array-out-of-bounds.yaml b/runtime/ztests/op/summarize/array-out-of-bounds.yaml index c79c1f8941..bce280fb29 100644 --- a/runtime/ztests/op/summarize/array-out-of-bounds.yaml +++ b/runtime/ztests/op/summarize/array-out-of-bounds.yaml @@ -1,4 +1,4 @@ -zed: count() by arr | sort +zed: count() by arr |> sort vector: true diff --git a/runtime/ztests/op/summarize/by-only.yaml b/runtime/ztests/op/summarize/by-only.yaml index acd2dc64ac..5955335efb 100644 --- a/runtime/ztests/op/summarize/by-only.yaml +++ b/runtime/ztests/op/summarize/by-only.yaml @@ -1,4 +1,4 @@ -zed: by s | sort s +zed: by s |> sort s vector: true diff --git a/runtime/ztests/op/summarize/count-by-this.yaml b/runtime/ztests/op/summarize/count-by-this.yaml index 6c6e296b45..eae94d7116 100644 --- a/runtime/ztests/op/summarize/count-by-this.yaml +++ b/runtime/ztests/op/summarize/count-by-this.yaml @@ -1,4 +1,4 @@ -zed: count() by val:=this | sort this +zed: count() by val:=this |> sort this vector: true diff --git a/runtime/ztests/op/summarize/count-typeof.yaml b/runtime/ztests/op/summarize/count-typeof.yaml index eebe840333..963092fd33 100644 --- a/runtime/ztests/op/summarize/count-typeof.yaml +++ b/runtime/ztests/op/summarize/count-typeof.yaml @@ -1,4 +1,4 @@ -zed: count() by typeof(this) | sort count +zed: count() by typeof(this) |> sort count vector: true diff --git a/runtime/ztests/op/summarize/different-key-types.yaml b/runtime/ztests/op/summarize/different-key-types.yaml index 67aec96cf8..167ec0d2cc 100644 --- a/runtime/ztests/op/summarize/different-key-types.yaml +++ b/runtime/ztests/op/summarize/different-key-types.yaml @@ -1,4 +1,4 @@ -zed: count() by key1 | sort key1 +zed: count() by key1 |> sort key1 vector: true diff --git a/runtime/ztests/op/summarize/groupby-missing.yaml b/runtime/ztests/op/summarize/groupby-missing.yaml index 6aceafa01c..3f3ce7658a 100644 --- a/runtime/ztests/op/summarize/groupby-missing.yaml +++ b/runtime/ztests/op/summarize/groupby-missing.yaml @@ -1,5 +1,5 @@ zed: | - by a:=a[0], b:=b.c | sort this + by a:=a[0], b:=b.c |> sort this vector: true diff --git a/runtime/ztests/op/summarize/key-in-record-assign.yaml b/runtime/ztests/op/summarize/key-in-record-assign.yaml index 1b48d47d58..8f33df751c 100644 --- a/runtime/ztests/op/summarize/key-in-record-assign.yaml +++ b/runtime/ztests/op/summarize/key-in-record-assign.yaml @@ -1,4 +1,4 @@ -zed: count() by newkey:=rec.i | sort newkey +zed: count() by newkey:=rec.i |> sort newkey vector: true diff --git a/runtime/ztests/op/summarize/key-in-record.yaml b/runtime/ztests/op/summarize/key-in-record.yaml index a30d7ec6b4..be9fa82713 100644 --- a/runtime/ztests/op/summarize/key-in-record.yaml +++ b/runtime/ztests/op/summarize/key-in-record.yaml @@ -1,4 +1,4 @@ -zed: count() by rec.i | sort rec.i +zed: count() by rec.i |> sort rec.i vector: true diff --git a/runtime/ztests/op/summarize/missing-fields.yaml b/runtime/ztests/op/summarize/missing-fields.yaml index 30cde05a5f..f2680902f7 100644 --- a/runtime/ztests/op/summarize/missing-fields.yaml +++ b/runtime/ztests/op/summarize/missing-fields.yaml @@ -1,4 +1,4 @@ -zed: count() by key1 | sort key1 +zed: count() by key1 |> sort key1 vector: true diff --git a/runtime/ztests/op/summarize/mixed-output-types.yaml b/runtime/ztests/op/summarize/mixed-output-types.yaml index ba871c77a3..2bd1bcba8a 100644 --- a/runtime/ztests/op/summarize/mixed-output-types.yaml +++ b/runtime/ztests/op/summarize/mixed-output-types.yaml @@ -1,4 +1,4 @@ -zed: by x:=network_of(addr) | sort this +zed: by x:=network_of(addr) |> sort this vector: true diff --git a/runtime/ztests/op/summarize/multiple-fields-assign.yaml b/runtime/ztests/op/summarize/multiple-fields-assign.yaml index b4f79cff8f..4d14e0661d 100644 --- a/runtime/ztests/op/summarize/multiple-fields-assign.yaml +++ b/runtime/ztests/op/summarize/multiple-fields-assign.yaml @@ -1,4 +1,4 @@ -zed: count() by key1,newkey:=key2 | sort key1, newkey +zed: count() by key1,newkey:=key2 |> sort key1, newkey vector: true diff --git a/runtime/ztests/op/summarize/multiple-fields.yaml b/runtime/ztests/op/summarize/multiple-fields.yaml index 9435f0d2e3..d0dac9f304 100644 --- a/runtime/ztests/op/summarize/multiple-fields.yaml +++ b/runtime/ztests/op/summarize/multiple-fields.yaml @@ -1,4 +1,4 @@ -zed: count() by key1,key2 | sort key1, key2 +zed: count() by key1,key2 |> sort key1, key2 vector: true diff --git a/runtime/ztests/op/summarize/named-types.yaml b/runtime/ztests/op/summarize/named-types.yaml index bf9b920a50..d6e2cdf8e9 100644 --- a/runtime/ztests/op/summarize/named-types.yaml +++ b/runtime/ztests/op/summarize/named-types.yaml @@ -1,4 +1,4 @@ -zed: count() by host | sort host +zed: count() by host |> sort host vector: true diff --git a/runtime/ztests/op/summarize/nested-agg-name.yaml b/runtime/ztests/op/summarize/nested-agg-name.yaml index 3a3a084b3f..873dcb2324 100644 --- a/runtime/ztests/op/summarize/nested-agg-name.yaml +++ b/runtime/ztests/op/summarize/nested-agg-name.yaml @@ -1,4 +1,4 @@ -zed: "result.count:=count() by result.animal:=animal | sort this" +zed: "result.count:=count() by result.animal:=animal |> sort this" vector: true diff --git a/runtime/ztests/op/summarize/not-present.yaml b/runtime/ztests/op/summarize/not-present.yaml index cf04f5e083..feebccb1b4 100644 --- a/runtime/ztests/op/summarize/not-present.yaml +++ b/runtime/ztests/op/summarize/not-present.yaml @@ -1,4 +1,4 @@ -zed: max(val) by key | sort +zed: max(val) by key |> sort vector: true diff --git a/runtime/ztests/op/summarize/null-inputs.yaml b/runtime/ztests/op/summarize/null-inputs.yaml index 919d9aea61..cb426d3da7 100644 --- a/runtime/ztests/op/summarize/null-inputs.yaml +++ b/runtime/ztests/op/summarize/null-inputs.yaml @@ -1,4 +1,4 @@ -zed: sum(val) by key | sort +zed: sum(val) by key |> sort vector: true diff --git a/runtime/ztests/op/summarize/null-keys-assign.yaml b/runtime/ztests/op/summarize/null-keys-assign.yaml index 09873e7739..b1e4958955 100644 --- a/runtime/ztests/op/summarize/null-keys-assign.yaml +++ b/runtime/ztests/op/summarize/null-keys-assign.yaml @@ -1,4 +1,4 @@ -zed: count() by newkey:=key1 | sort newkey +zed: count() by newkey:=key1 |> sort newkey vector: true diff --git a/runtime/ztests/op/summarize/quiet-key.yaml b/runtime/ztests/op/summarize/quiet-key.yaml index 66004b6203..8c2dc77b04 100644 --- a/runtime/ztests/op/summarize/quiet-key.yaml +++ b/runtime/ztests/op/summarize/quiet-key.yaml @@ -2,7 +2,7 @@ skip: "awaiting vam quiet() support" vector: true -zed: count() by id.orig_h:=quiet(id.orig_h) | sort id +zed: count() by id.orig_h:=quiet(id.orig_h) |> sort id input: | {_path:"weird",id:{orig_h:10.47.1.152,orig_p:49562(port=uint16),resp_h:23.217.103.245,resp_p:80(port)}} diff --git a/service/handlers_test.go b/service/handlers_test.go index 653827a460..4a68f3d96b 100644 --- a/service/handlers_test.go +++ b/service/handlers_test.go @@ -30,7 +30,7 @@ func TestQuery(t *testing.T) { _, conn := newCore(t) poolID := conn.TestPoolPost(api.PoolPostRequest{Name: "test"}) conn.TestLoad(poolID, "main", strings.NewReader(src)) - assert.Equal(t, expected, conn.TestQuery("from test | _path == 'b'")) + assert.Equal(t, expected, conn.TestQuery("from test |> _path == 'b'")) } func TestQueryEmptyPool(t *testing.T) { @@ -52,7 +52,7 @@ func TestQueryGroupByReverse(t *testing.T) { _, conn := newCore(t) poolID := conn.TestPoolPost(api.PoolPostRequest{Name: "test"}) conn.TestLoad(poolID, "main", strings.NewReader(src)) - require.Equal(t, counts, "\n"+conn.TestQuery("from test | count() by every(1s)")) + require.Equal(t, counts, "\n"+conn.TestQuery("from test |> count() by every(1s)")) } func TestPoolStats(t *testing.T) { diff --git a/service/ztests/compact-vectors.yaml b/service/ztests/compact-vectors.yaml index 840eff4756..9fc133de3f 100644 --- a/service/ztests/compact-vectors.yaml +++ b/service/ztests/compact-vectors.yaml @@ -3,7 +3,7 @@ script: | super db create -use -q test seq 10 | super -c '{ts:this-1,s:f"val{this-1}"}' - | super db load -q - seq 10 | super -c '{ts:this-1,s:f"val{this-1}"}' - | super db load -q - - ids=$(super db query -f text 'from test@main:objects | yield f"0x{hex(id)}"') + ids=$(super db query -f text 'from test@main:objects |> yield f"0x{hex(id)}"') super db compact -q -vectors $ids super db query -f lake 'from test@main:vectors' diff --git a/service/ztests/compact.yaml b/service/ztests/compact.yaml index b4707e6f04..8f13108585 100644 --- a/service/ztests/compact.yaml +++ b/service/ztests/compact.yaml @@ -3,7 +3,7 @@ script: | super db create -use -q test seq 10 | super -c '{ts:this-1,s:f"val{this-1}"}' - | super db load -q - seq 10 | super -c '{ts:this-1,s:f"val{this-1}"}' - | super db load -q - - ids=$(super db query -f text 'from test@main:objects | yield f"0x{hex(id)}"') + ids=$(super db query -f text 'from test@main:objects |> yield f"0x{hex(id)}"') super db compact -q $ids super db query -f lake 'from test@main:objects' diff --git a/service/ztests/curl-add-gzip.yaml b/service/ztests/curl-add-gzip.yaml index 1fe8d50a91..3b697d9801 100644 --- a/service/ztests/curl-add-gzip.yaml +++ b/service/ztests/curl-add-gzip.yaml @@ -6,7 +6,7 @@ script: | inputs: - name: stdin - # Generated with `bash -c 'gzip -c <<<{x:1} | base64'`. + # Generated with `bash -c 'gzip -c <<<{x:1} |> base64'`. data: !!binary | H4sIAMaiGmEAA6uusDKs5QIAaI7+2QYAAAA= - name: service.sh diff --git a/service/ztests/curl-cors.yaml b/service/ztests/curl-cors.yaml index 72ce669a09..a819cc8f9b 100644 --- a/service/ztests/curl-cors.yaml +++ b/service/ztests/curl-cors.yaml @@ -19,14 +19,14 @@ script: | -X POST \ -H "Origin: http://wildcard.b" \ -H "Accept: application/json" \ - -d '{"query":"from :pools | *"}' \ + -d '{"query":"from :pools |> *"}' \ $SUPER_DB_LAKE/query | grep Access-Control-Allow | tr -d '\015' echo === POST: not allowed === ! curl -sD - \ -X POST \ -H "Origin: http://wildcard.not-b" \ -H "Accept: application/json" \ - -d '{"query":"from :pools | *"}' \ + -d '{"query":"from :pools |> *"}' \ $SUPER_DB_LAKE/query | grep Access-Control-Allow inputs: diff --git a/service/ztests/curl-pool-rename.yaml b/service/ztests/curl-pool-rename.yaml index ffa530aa05..5b8c2d2780 100644 --- a/service/ztests/curl-pool-rename.yaml +++ b/service/ztests/curl-pool-rename.yaml @@ -11,7 +11,7 @@ script: | curl -X POST \ -H "Accept: application/json" \ -d '{"query":"from :pools"}' \ - $SUPER_DB_LAKE/query | super -Z -c "yield this[0] | id:=0,ts:=0" - + $SUPER_DB_LAKE/query | super -Z -c "yield this[0] |> id:=0,ts:=0" - inputs: - name: service.sh diff --git a/service/ztests/curl-query-json-array.yaml b/service/ztests/curl-query-json-array.yaml index 85793501b4..221ab47f6f 100644 --- a/service/ztests/curl-query-json-array.yaml +++ b/service/ztests/curl-query-json-array.yaml @@ -1,7 +1,7 @@ script: | source service.sh super db create -q test - curl -H "Accept: application/json" -d '{"query":"from :pools | cut name"}' $SUPER_DB_LAKE/query + curl -H "Accept: application/json" -d '{"query":"from :pools |> cut name"}' $SUPER_DB_LAKE/query inputs: - name: service.sh diff --git a/service/ztests/curl-query-split.yaml b/service/ztests/curl-query-split.yaml index 58d262e3b3..27ae2eaafb 100644 --- a/service/ztests/curl-query-split.yaml +++ b/service/ztests/curl-query-split.yaml @@ -4,8 +4,8 @@ script: | source service.sh 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" - + 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" - inputs: - name: service.sh diff --git a/service/ztests/debug.yaml b/service/ztests/debug.yaml index 3019f05c0b..f6a9607cd5 100644 --- a/service/ztests/debug.yaml +++ b/service/ztests/debug.yaml @@ -2,7 +2,7 @@ script: | source service.sh super db create -use -q test echo '{x: "foo"}' | super db load -q - - super db query -z 'from test | debug f"debug: {x}"' + super db query -z 'from test |> debug f"debug: {x}"' inputs: - name: service.sh diff --git a/service/ztests/delete-where-invalid.yaml b/service/ztests/delete-where-invalid.yaml index 99f1bad567..5fe6bf3cf1 100644 --- a/service/ztests/delete-where-invalid.yaml +++ b/service/ztests/delete-where-invalid.yaml @@ -1,7 +1,7 @@ script: | source service.sh super db create -use -q test - ! super db delete -where 'me == "hi" | cut me' + ! super db delete -where 'me == "hi" |> cut me' ! super db delete -where 'cut that' inputs: diff --git a/service/ztests/delete-where.yaml b/service/ztests/delete-where.yaml index 0facc1ca83..8adca279b0 100644 --- a/service/ztests/delete-where.yaml +++ b/service/ztests/delete-where.yaml @@ -5,11 +5,11 @@ script: | super db create -use -q -S 1KB -orderby ts:$order test seq 1000 | super -c '{ts:this-1,s:f"val{this-1}"}' - | super db load -q - super db delete -q -where 'ts > 400 and ts <= 500' - super db query -z 'from test | count()' + super db query -z 'from test |> count()' super db delete -q -where 's == "val1" or s == "val999"' - super db query -z 'from test | count()' + super db query -z 'from test |> count()' ! super db delete -q -where 's == "val1" or s == "val999"' - super db query -z 'from test | count()' + super db query -z 'from test |> count()' super db drop -f -q test done diff --git a/service/ztests/delete.yaml b/service/ztests/delete.yaml index c8a79c1e60..0c3125023e 100644 --- a/service/ztests/delete.yaml +++ b/service/ztests/delete.yaml @@ -2,7 +2,7 @@ script: | source service.sh super db create -use -q -orderby x:desc test super db load -q 1.jsup - id=$(super db query -f text "from test@main:objects | cut id:=ksuid(id) | tail 1") + id=$(super db query -f text "from test@main:objects |> cut id:=ksuid(id) |> tail 1") super db load -q 2.jsup super db query -z "from test" echo === | tee /dev/stderr diff --git a/service/ztests/drop.yaml b/service/ztests/drop.yaml index 6f6c8902db..a8613468df 100644 --- a/service/ztests/drop.yaml +++ b/service/ztests/drop.yaml @@ -5,7 +5,7 @@ script: | super db create -q p3 super db drop -f p3 echo === | tee /dev/stderr - super db ls -f bsup | super -z -c "cut name | sort name" - + super db ls -f bsup | super -z -c "cut name |> sort name" - echo === | tee /dev/stderr ! super db drop p3 ! super db drop -lake http://127.0.0.1:1 p3 diff --git a/service/ztests/from-pattern.yaml b/service/ztests/from-pattern.yaml index eb7eb04f13..abe700a953 100644 --- a/service/ztests/from-pattern.yaml +++ b/service/ztests/from-pattern.yaml @@ -4,13 +4,13 @@ script: | super db create -q $pool echo "\"$pool\"" | super db load -q -use $pool - done - super db query -z 'from * | sort this' + super db query -z 'from * |> sort this' echo === - super db query -z 'from /.*/ | sort this' + super db query -z 'from /.*/ |> sort this' echo === - super db query -z 'from match* | sort this' + super db query -z 'from match* |> sort this' echo === - super db query -z 'from /match/ | sort this' + super db query -z 'from /match/ |> sort this' inputs: - name: service.sh diff --git a/service/ztests/issue-2784.yaml b/service/ztests/issue-2784.yaml index 6622aeb8cf..4bc87c01d6 100644 --- a/service/ztests/issue-2784.yaml +++ b/service/ztests/issue-2784.yaml @@ -3,7 +3,7 @@ script: | super db create -q test super db load -q -use test a.jsup super db load -q -use test b.jsup - super db query -z "from test@main:objects | sort min | {min,max}" + super db query -z "from test@main:objects |> sort min |> {min,max}" inputs: - name: service.sh diff --git a/service/ztests/ls-pools.yaml b/service/ztests/ls-pools.yaml index c835f70b34..980b2d7830 100644 --- a/service/ztests/ls-pools.yaml +++ b/service/ztests/ls-pools.yaml @@ -9,9 +9,9 @@ script: | echo === # Verify that output flags are honored. - super db ls -f jsup | super -i jsup -f jsup -c "cut name | sort name" - + super db ls -f jsup | super -i jsup -f jsup -c "cut name |> sort name" - echo === - super db ls -f bsup | super -i bsup -f table -c "cut name | sort name" - + super db ls -f bsup | super -i bsup -f table -c "cut name |> sort name" - echo === inputs: diff --git a/service/ztests/merge.yaml b/service/ztests/merge.yaml index 9a6a91132c..4a7d0e8e7f 100644 --- a/service/ztests/merge.yaml +++ b/service/ztests/merge.yaml @@ -4,10 +4,10 @@ script: | super db load -q -use POOL a.jsup super db branch -q -use POOL child super db load -q -use POOL@child b.jsup - super db query -z "from POOL | sort this" + super db query -z "from POOL |> sort this" echo === super db merge -q -use POOL@child main - super db query -z "from POOL | sort this" + super db query -z "from POOL |> sort this" inputs: - name: a.jsup diff --git a/service/ztests/query-describe.yaml b/service/ztests/query-describe.yaml index 6a64c9369a..51ee5a7d2e 100644 --- a/service/ztests/query-describe.yaml +++ b/service/ztests/query-describe.yaml @@ -6,7 +6,7 @@ script: | echo // === $file === query="$(cat $file | jq -Rsa .)" curl -H "Accept: application/json" -d "{\"query\":$query,\"head\":{\"pool\":\"test1\"}}" $SUPER_DB_LAKE/query/describe | - super -J -c 'sources := (over sources | id := "XXX")' - + super -J -c 'sources := (over sources |> id := "XXX")' - done @@ -17,29 +17,29 @@ inputs: fork ( => from test1 => from test2 - ) | put foo := "bar" + ) |> put foo := "bar" - name: agg.spq data: | - from test1 | count() by key1:=v1, key2 + from test1 |> count() by key1:=v1, key2 - name: agg-no-keys.spq data: | - from test1 | sum(this) + from test1 |> sum(this) - name: two-channels.spq data: | fork ( - => from test1 | sum(y) by key1 | output main - => from test2 | put x := "foo" | output secondary + => from test1 |> sum(y) by key1 |> output main + => from test2 |> put x := "foo" |> output secondary ) - name: agg-sort.spq data: | - from test1 | sum(this) by foo | sort x + from test1 |> sum(this) by foo |> sort x - name: scope.spq data: | type port = uint16 - from test1 | fork (=> output main => yield "bar" | output secondary) + from test1 |> fork (=> output main => yield "bar" |> output secondary) - name: auto-combined-channels.spq data: | - from test1 | fork (=> pass => pass) + from test1 |> fork (=> pass => pass) outputs: - name: stdout diff --git a/service/ztests/query-json.yaml b/service/ztests/query-json.yaml index a59edd5882..edef22a66c 100644 --- a/service/ztests/query-json.yaml +++ b/service/ztests/query-json.yaml @@ -2,7 +2,7 @@ script: | source service.sh super db create -q test super db load -q -use test - - super db query -j "from test | cut a,b" + super db query -j "from test |> cut a,b" inputs: - name: service.sh diff --git a/service/ztests/query-stats.yaml b/service/ztests/query-stats.yaml index 5e3a4e60dc..f1fab6d786 100644 --- a/service/ztests/query-stats.yaml +++ b/service/ztests/query-stats.yaml @@ -2,7 +2,7 @@ script: | source service.sh super db create -q test super db load -q -use test babble.jsup - super db query -s -z "from test | count()" + super db query -s -z "from test |> count()" inputs: - name: service.sh diff --git a/service/ztests/revert.yaml b/service/ztests/revert.yaml index 5ea492d71e..316218ae65 100644 --- a/service/ztests/revert.yaml +++ b/service/ztests/revert.yaml @@ -3,13 +3,13 @@ script: | super db create -q test a=$(super db load -use test a.jsup | head -1 | awk '{print $1}') b=$(super db load -use test b.jsup | head -1 | awk '{print $1}') - super db query -z "from test | sort this" + super db query -z "from test |> sort this" super db revert -q -use test $a echo === - super db query -z "from test | sort this" + super db query -z "from test |> sort this" super db revert -q -use test $b echo === - super db query -z "from test | sort this" + super db query -z "from test |> sort this" inputs: - name: a.jsup diff --git a/service/ztests/s3/s3root.yaml b/service/ztests/s3/s3root.yaml index 46a54235b7..a44ac6cb88 100644 --- a/service/ztests/s3/s3root.yaml +++ b/service/ztests/s3/s3root.yaml @@ -6,7 +6,7 @@ script: | super db use -q test super db post babble.jsup >/dev/null echo === - super db info | egrep -v 'id' + super db info |> egrep -v 'id' echo === super db get -z 's=="harefoot-raucous"' diff --git a/service/ztests/seek-index-null.yaml b/service/ztests/seek-index-null.yaml index 1d7cf04d02..017ec6065e 100644 --- a/service/ztests/seek-index-null.yaml +++ b/service/ztests/seek-index-null.yaml @@ -4,7 +4,7 @@ script: | echo // $o | tee /dev/stderr super db create -q -seekstride=2KB -orderby ts:$o $o super db load -q -use $o babble.jsup null.jsup - super db query -z -s "from $o | ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z" + super db query -z -s "from $o |> ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z" done inputs: diff --git a/service/ztests/seek-index-overlap.yaml b/service/ztests/seek-index-overlap.yaml index 15f139d8e5..380fb19178 100644 --- a/service/ztests/seek-index-overlap.yaml +++ b/service/ztests/seek-index-overlap.yaml @@ -5,12 +5,12 @@ script: | super db use -q asc super -c "tail 900" babble.jsup | super db load -q - super -c "head 250" babble.jsup | super db load -q - - super db query -z -s "from asc | count()" + super db query -z -s "from asc |> count()" echo === | tee /dev/stderr super db use -q desc super -c "tail 900" babble.jsup | super db load -q - super -c "head 250" babble.jsup | super db load -q - - super db query -z -s "from desc | count()" + super db query -z -s "from desc |> count()" inputs: - name: service.sh diff --git a/service/ztests/seek-index.yaml b/service/ztests/seek-index.yaml index 322d16354c..6006c14d52 100644 --- a/service/ztests/seek-index.yaml +++ b/service/ztests/seek-index.yaml @@ -4,9 +4,9 @@ script: | echo // $o | tee /dev/stderr super db create -use -seekstride 2KB -orderby ts:$o -q $o super db load -q babble.jsup - source query.sh "from $o | ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z" - source query.sh "from $o | ts == 2020-04-21T23:59:26.06326664Z" - source query.sh "from $o | ts == 2020-04-21T23:59:26.06326664Z or foo == 'bar'" + source query.sh "from $o |> ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z" + source query.sh "from $o |> ts == 2020-04-21T23:59:26.06326664Z" + source query.sh "from $o |> ts == 2020-04-21T23:59:26.06326664Z or foo == 'bar'" done inputs: @@ -22,36 +22,36 @@ outputs: - name: stdout data: | // asc - // from asc | ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z + // from asc |> ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z {ts:2020-04-21T23:59:26.06326664Z,s:"potbellied-Dedanim",v:230} {ts:2020-04-21T23:59:29.06985813Z,s:"areek-ashless",v:266} {ts:2020-04-21T23:59:38.0687693Z,s:"topcoating-rhexis",v:415} - // from asc | ts == 2020-04-21T23:59:26.06326664Z + // from asc |> ts == 2020-04-21T23:59:26.06326664Z {ts:2020-04-21T23:59:26.06326664Z,s:"potbellied-Dedanim",v:230} - // from asc | ts == 2020-04-21T23:59:26.06326664Z or foo == 'bar' + // from asc |> ts == 2020-04-21T23:59:26.06326664Z or foo == 'bar' {ts:2020-04-21T23:59:26.06326664Z,s:"potbellied-Dedanim",v:230} // desc - // from desc | ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z + // from desc |> ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z {ts:2020-04-21T23:59:38.0687693Z,s:"topcoating-rhexis",v:415} {ts:2020-04-21T23:59:29.06985813Z,s:"areek-ashless",v:266} {ts:2020-04-21T23:59:26.06326664Z,s:"potbellied-Dedanim",v:230} - // from desc | ts == 2020-04-21T23:59:26.06326664Z + // from desc |> ts == 2020-04-21T23:59:26.06326664Z {ts:2020-04-21T23:59:26.06326664Z,s:"potbellied-Dedanim",v:230} - // from desc | ts == 2020-04-21T23:59:26.06326664Z or foo == 'bar' + // from desc |> ts == 2020-04-21T23:59:26.06326664Z or foo == 'bar' {ts:2020-04-21T23:59:26.06326664Z,s:"potbellied-Dedanim",v:230} - name: stderr data: | // asc - // from asc | ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z + // from asc |> ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z {bytes_read:16403,bytes_matched:87,records_read:500,records_matched:3} - // from asc | ts == 2020-04-21T23:59:26.06326664Z + // from asc |> ts == 2020-04-21T23:59:26.06326664Z {bytes_read:8141,bytes_matched:31,records_read:250,records_matched:1} - // from asc | ts == 2020-04-21T23:59:26.06326664Z or foo == 'bar' + // from asc |> ts == 2020-04-21T23:59:26.06326664Z or foo == 'bar' {bytes_read:32889,bytes_matched:31,records_read:1000,records_matched:1} // desc - // from desc | ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z + // from desc |> ts >= 2020-04-21T23:59:26.063Z and ts <= 2020-04-21T23:59:38.069Z {bytes_read:16403,bytes_matched:87,records_read:500,records_matched:3} - // from desc | ts == 2020-04-21T23:59:26.06326664Z + // from desc |> ts == 2020-04-21T23:59:26.06326664Z {bytes_read:8141,bytes_matched:31,records_read:250,records_matched:1} - // from desc | ts == 2020-04-21T23:59:26.06326664Z or foo == 'bar' + // from desc |> ts == 2020-04-21T23:59:26.06326664Z or foo == 'bar' {bytes_read:32889,bytes_matched:31,records_read:1000,records_matched:1} diff --git a/service/ztests/vector.yaml b/service/ztests/vector.yaml index d292ee496f..2e834682b8 100644 --- a/service/ztests/vector.yaml +++ b/service/ztests/vector.yaml @@ -2,12 +2,12 @@ script: | source service.sh super db create -use -q POOL super db load -q in.jsup - id=$(super db query -f text 'from POOL@main:objects | yield ksuid(id)') + id=$(super db query -f text 'from POOL@main:objects |> yield ksuid(id)') super db vector add -q $id - super db query -Z 'from POOL@main:vectors | drop id' + super db query -Z 'from POOL@main:vectors |> drop id' echo === super db vector delete -q $id - super db query -Z 'from POOL@main:vectors | drop id' + super db query -Z 'from POOL@main:vectors |> drop id' echo === inputs: diff --git a/testdata/edu/README.md b/testdata/edu/README.md index ca5e3b584e..006699081d 100644 --- a/testdata/edu/README.md +++ b/testdata/edu/README.md @@ -37,7 +37,7 @@ sqlite3 -json cdeschools.sqlite "select * from schools;" | super -z -c ' StatusType:string, Website:string }; - this := crop(shape(school), school) | sort School + this := crop(shape(school), school) |> sort School ' - > schools.jsup sqlite3 -json cdeschools.sqlite "select * from satscores;" | super -z -c ' @@ -49,7 +49,7 @@ sqlite3 -json cdeschools.sqlite "select * from satscores;" | super -z -c ' dname: string, sname: string }; - this := crop(shape(testscore), testscore) | sort sname + this := crop(shape(testscore), testscore) |> sort sname ' - > testscores.jsup ``` @@ -58,8 +58,8 @@ augmented with [`webaddrs.jsup`](webaddrs.jsup), which captures an IP address at which each school website was once hosted. ```sh -for host in $(zq -f text 'Website != null | by Website' schools.jsup | sed -e 's|http://||' -e 's|/.*||' | sort -u); do - addr=$(dig +short $host | egrep '\d{1,3}(.\d{1,3}){3}' | tail -1) +for host in $(zq -f text 'Website != null |> by Website' schools.jsup | sed -e 's|http://||' -e 's|/.*||' | sort -u); do + addr=$(dig +short $host |> egrep '\d{1,3}(.\d{1,3}){3}' | tail -1) [ "$addr" ] && echo "{Website:\"$host\",addr:$addr}" done > webaddrs.jsup diff --git a/vng/ztests/dict.yaml b/vng/ztests/dict.yaml index 859e758bfe..cfc8b28333 100644 --- a/vng/ztests/dict.yaml +++ b/vng/ztests/dict.yaml @@ -1,6 +1,6 @@ script: | super -f csup -o out.csup - - super dev csup out.csup | super -Z -c "over Fields | yield Values.Dict" - + super dev csup out.csup | super -Z -c "over Fields |> yield Values.Dict" - inputs: - name: stdin diff --git a/vng/ztests/no-dict.yaml b/vng/ztests/no-dict.yaml index c79308baf2..4aba1da1bb 100644 --- a/vng/ztests/no-dict.yaml +++ b/vng/ztests/no-dict.yaml @@ -1,6 +1,6 @@ script: | seq 1000 | super -f csup -o out.csup -c "{x:this}" - - super dev csup out.csup | super -Z -c "over Fields | yield Values.Dict" - + super dev csup out.csup | super -Z -c "over Fields |> yield Values.Dict" - outputs: - name: stdout diff --git a/zbuf/scopes.md b/zbuf/scopes.md index 2463c15469..6eaa6aca5a 100644 --- a/zbuf/scopes.md +++ b/zbuf/scopes.md @@ -36,7 +36,7 @@ And it's all recursive... with bar := => ( // scope-1 (this comes from scope-0, bar comes from expr) yield {a:complexFunc(bar,this),b:this.b} - | baz := over(a) ( + |> baz := over(a) ( // scope-2 (this comes from scope-a, bar comes from scope-1, baz comes from batch) yield {x:baz,y:bar.a,z:this.x} // yields into baz, is this confusing? ) @@ -61,7 +61,7 @@ Or perhaps over should be separated from with: with foo:=this ( // scope-1 (foo comes from scope-0 this, this comes from batch from over) over(bar) - | yield {a:this.a,b:foo.b} // -> lexical scope: yields into this (is this less confusing?) + |> yield {a:this.a,b:foo.b} // -> lexical scope: yields into this (is this less confusing?) ) ``` And we could have shorthand for the above: diff --git a/zfmt/ast.go b/zfmt/ast.go index 42224ef6b2..0da00745ac 100644 --- a/zfmt/ast.go +++ b/zfmt/ast.go @@ -314,7 +314,7 @@ func (c *canon) next() { if c.head { c.head = false } else { - c.write("| ") + c.write("|> ") } } diff --git a/zfmt/dag.go b/zfmt/dag.go index 7d3d32c611..bc55a63c77 100644 --- a/zfmt/dag.go +++ b/zfmt/dag.go @@ -268,7 +268,7 @@ func (c *canonDAG) next() { if c.head { c.head = false } else { - c.write("| ") + c.write("|> ") } } diff --git a/zfmt/ztests/debug.yaml b/zfmt/ztests/debug.yaml index a53db1698d..3169a0de79 100644 --- a/zfmt/ztests/debug.yaml +++ b/zfmt/ztests/debug.yaml @@ -1,18 +1,18 @@ script: | - super compile -C 'debug f"debug: {this}" | head 1' - super compile -dag -C 'debug f"debug: {this}" | head 1' + super compile -C 'debug f"debug: {this}" |> head 1' + super compile -dag -C 'debug f"debug: {this}" |> head 1' outputs: - name: stdout data: | debug f"debug: {this}" - | head 1 + |> head 1 null - | mirror ( + |> mirror ( => yield "debug: "+cast(this, ) - | output debug + |> output debug => head 1 - | output main + |> output main ) diff --git a/zfmt/ztests/decls.yaml b/zfmt/ztests/decls.yaml index 5e6248ac36..31f7e8c22d 100644 --- a/zfmt/ztests/decls.yaml +++ b/zfmt/ztests/decls.yaml @@ -14,12 +14,12 @@ inputs: op nop(foo): ( pass ) op joinTest(left_file, right_file, left_key, right_key, left_dest, right_source): ( from [left_file] - | inner join ( + |> inner join ( from [right_file] ) on left_key = right_key left_dest := right_source ) joinTest("fruit.json", "people.json", flavor, likes, eater, name) - | stamp("bob") + |> stamp("bob") outputs: - name: stdout @@ -40,12 +40,12 @@ outputs: ) op joinTest(left_file, right_file, left_key, right_key, left_dest, right_source): ( from [left_file] - | join ( + |> join ( from [right_file] ) on left_key=right_key left_dest:=right_source ) joinTest("fruit.json", "people.json", flavor, likes, eater, name) - | stamp("bob") + |> stamp("bob") === ( const foo = "bar" @@ -58,13 +58,13 @@ outputs: ) file fruit.json - | fork ( + |> fork ( => pass => file people.json ) - | join on flavor=likes eater:=name - | yield {...this,assignee:"bob",ts:now()} - | output main + |> join on flavor=likes eater:=name + |> yield {...this,assignee:"bob",ts:now()} + |> output main ) diff --git a/zfmt/ztests/from.yaml b/zfmt/ztests/from.yaml index bbaab26b77..0b8358b5f7 100644 --- a/zfmt/ztests/from.yaml +++ b/zfmt/ztests/from.yaml @@ -59,23 +59,23 @@ outputs: fork ( => from path - | head + |> head => from "http://host/path" - | head + |> head => from name - | head + |> head ) === fork ( => from path format f - | head + |> head => from "http://host/path" format g - | head + |> head => from name - | head + |> head ) diff --git a/zfmt/ztests/join.yaml b/zfmt/ztests/join.yaml index 771b74ccd2..40b386022a 100644 --- a/zfmt/ztests/join.yaml +++ b/zfmt/ztests/join.yaml @@ -11,11 +11,11 @@ outputs: ) on x=x p:=a === null - | fork ( + |> fork ( => pass => file test.jsup ) - | join on x=x p:=a - | output main + |> join on x=x p:=a + |> output main diff --git a/zfmt/ztests/output.yaml b/zfmt/ztests/output.yaml index d97c29dc9b..70e12c13de 100644 --- a/zfmt/ztests/output.yaml +++ b/zfmt/ztests/output.yaml @@ -7,19 +7,19 @@ outputs: - name: stdout data: | null - | fork ( + |> fork ( => output foo => pass - | output main + |> output main ) // === null - | switch x ( + |> switch x ( case "foo" => output foo case "bar" => pass - | output main + |> output main ) diff --git a/zfmt/ztests/over.yaml b/zfmt/ztests/over.yaml index 00b9db16e3..830bbc8296 100644 --- a/zfmt/ztests/over.yaml +++ b/zfmt/ztests/over.yaml @@ -7,62 +7,62 @@ 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 + |> over a => ( b ) + |> over a with b=c => ( d ) + |> over a, b with c=d, e=f => ( g ) outputs: - name: stdout data: | yield ( over a - | search b + |> search b ) - | yield ( + |> yield ( over a with b=c - | search d + |> search d ) - | yield ( + |> yield ( over a, b with c=d, e=f - | search g + |> search g ) - | over a - | over a => ( + |> over a + |> over a => ( search b ) - | over a with b=c => ( + |> over a with b=c => ( search d ) - | over a, b with c=d, e=f => ( + |> over a, b with c=d, e=f => ( search g ) === null - | yield ( + |> yield ( over a - | where search("b") + |> where search("b") ) - | yield ( + |> yield ( over ab=c - | where search("d") + |> where search("d") ) - | yield ( + |> yield ( over a, bc=d, e=f - | where search("g") + |> where search("g") ) - | over a - | over a => ( + |> over a + |> over a => ( where search("b") ) - | over a with b=c => ( + |> over a with b=c => ( where search("d") ) - | over a, b with c=d, e=f => ( + |> over a, b with c=d, e=f => ( where search("g") ) - | output main + |> output main diff --git a/zfmt/ztests/parallel.yaml b/zfmt/ztests/parallel.yaml index a26b200711..2b61bccb7f 100644 --- a/zfmt/ztests/parallel.yaml +++ b/zfmt/ztests/parallel.yaml @@ -1,22 +1,22 @@ 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 data: | file bar - | where search("foo") - | fork ( + |> where search("foo") + |> fork ( => summarize count:=count() by x:=.["@foo"] => summarize sum:=sum(x) - | yield sum + |> yield sum => put a:=b*c ) - | cut cake:=cake - | sort -r x asc - | output main + |> cut cake:=cake + |> sort -r x asc + |> output main diff --git a/zfmt/ztests/precedence-dag.yaml b/zfmt/ztests/precedence-dag.yaml index 807d7e6e0d..c923774469 100644 --- a/zfmt/ztests/precedence-dag.yaml +++ b/zfmt/ztests/precedence-dag.yaml @@ -17,11 +17,11 @@ outputs: - name: stdout data: | null - | yield (10+2)/8 - | output main + |> yield (10+2)/8 + |> output main null - | where (y==2 or x==4) and z==5 - | output main + |> where (y==2 or x==4) and z==5 + |> output main null - | where !(ts<=2) - | output main + |> where !(ts<=2) + |> output main diff --git a/zfmt/ztests/switch.yaml b/zfmt/ztests/switch.yaml index 00f2510b29..b70ab09df5 100644 --- a/zfmt/ztests/switch.yaml +++ b/zfmt/ztests/switch.yaml @@ -18,13 +18,13 @@ outputs: ) === null - | switch ( + |> switch ( case search("a") => head 1 - | output main + |> output main case search("c") => tail 1 - | output main + |> output main ) === switch ( @@ -35,11 +35,11 @@ outputs: ) === null - | switch ( + |> switch ( case search("a") => head 1 - | output main + |> output main case true => tail 1 - | output main + |> output main ) diff --git a/zfmt/ztests/type-value.yaml b/zfmt/ztests/type-value.yaml index 86921bd3c7..8a40c6e35c 100644 --- a/zfmt/ztests/type-value.yaml +++ b/zfmt/ztests/type-value.yaml @@ -7,5 +7,5 @@ outputs: data: | search is() and bar null - | where is(<(uint16,ip)>) and search(80) - | output main + |> where is(<(uint16,ip)>) and search(80) + |> output main diff --git a/zfmt/ztests/yield-shortcut.yaml b/zfmt/ztests/yield-shortcut.yaml index d6c9e21a85..ddb40dc123 100644 --- a/zfmt/ztests/yield-shortcut.yaml +++ b/zfmt/ztests/yield-shortcut.yaml @@ -21,17 +21,17 @@ outputs: yield <(int64,string)>(1) === null - | yield {x:1,...y} - | output main + |> yield {x:1,...y} + |> output main null - | yield [1,2,3] - | output main + |> yield [1,2,3] + |> output main null - | yield |["foo","bar"]| - | output main + |> yield |["foo","bar"]| + |> output main null - | yield |{"foo":1,"bar":2}| - | output main + |> yield |{"foo":1,"bar":2}| + |> output main null - | yield cast(1, <(int64,string)>) - | output main + |> yield cast(1, <(int64,string)>) + |> output main diff --git a/zio/zeekio/ztests/shared-context-bug-2.yaml b/zio/zeekio/ztests/shared-context-bug-2.yaml index 7cc0b3cf1f..6d6ee443ba 100644 --- a/zio/zeekio/ztests/shared-context-bug-2.yaml +++ b/zio/zeekio/ztests/shared-context-bug-2.yaml @@ -1,4 +1,4 @@ -zed: cut id | put id2:=id | cut id.orig_h +zed: cut id |> put id2:=id |> cut id.orig_h input: | #separator \x09 diff --git a/zio/zeekio/ztests/shared-context-bug.yaml b/zio/zeekio/ztests/shared-context-bug.yaml index c713cba188..901699c6a6 100644 --- a/zio/zeekio/ztests/shared-context-bug.yaml +++ b/zio/zeekio/ztests/shared-context-bug.yaml @@ -1,4 +1,4 @@ -zed: cut id | put id2:=id.orig_h | drop id.orig_h +zed: cut id |> put id2:=id.orig_h |> drop id.orig_h input: | #separator \x09 diff --git a/zio/zngio/ztests/multiple.yaml b/zio/zngio/ztests/multiple.yaml index fbf6169b7b..a35ae3198a 100644 --- a/zio/zngio/ztests/multiple.yaml +++ b/zio/zngio/ztests/multiple.yaml @@ -1,7 +1,7 @@ zed: 'count()' # This is the concatenation of two identical ZNG streams generated with -# `bash -c '(super - | super -z -<<<{a:1}; super - | super -z -<<<{a:1}) | base64'`. +# `bash -c '(super - | super -z -<<<{a:1}; super - | super -z -<<<{a:1}) |> base64'`. input: !!binary | BQAAAQFhCRQAHgMCAv8FAAABAWEJFAAeAwIC/w== diff --git a/zio/zsonio/ztests/tv.yaml b/zio/zsonio/ztests/tv.yaml index fb4f3e1ada..ca867a523d 100644 --- a/zio/zsonio/ztests/tv.yaml +++ b/zio/zsonio/ztests/tv.yaml @@ -1,4 +1,4 @@ -zed: "put t:=typeof(s) | put tt:=typeof(t)" +zed: "put t:=typeof(s) |> put tt:=typeof(t)" output-flags: -f jsup -pretty=4 diff --git a/zson/ztests/union-cast.yaml b/zson/ztests/union-cast.yaml index c7b912ed39..28d7a1b88e 100644 --- a/zson/ztests/union-cast.yaml +++ b/zson/ztests/union-cast.yaml @@ -1,5 +1,5 @@ script: | - super -z -c "by typeof(this) | sort this" in.jsup + super -z -c "by typeof(this) |> sort this" in.jsup inputs: - name: in.jsup diff --git a/ztests/bytes.yaml b/ztests/bytes.yaml index 43f666421b..e6d2c1e0ce 100644 --- a/ztests/bytes.yaml +++ b/ztests/bytes.yaml @@ -1,4 +1,4 @@ -zed: c:=string(b),d:=base64(b) | e:=string(base64(d)) +zed: c:=string(b),d:=base64(b) |> e:=string(base64(d)) input: | {b:0x68692c20776f726c64}