diff --git a/api/queryio/client.go b/api/queryio/client.go index 75b63c1bdf..2004b8b627 100644 --- a/api/queryio/client.go +++ b/api/queryio/client.go @@ -1,6 +1,7 @@ package queryio import ( + "context" "errors" "fmt" "io" @@ -12,58 +13,79 @@ import ( "github.com/brimdata/zed/zson" ) -type Query struct { - reader *zngio.Reader - closer io.Closer +type scanner struct { + channel string + scanner zbuf.Scanner + closer io.Closer + progress zbuf.Progress } -// NewQuery returns a Query that reads a ZNG-encoded query response -// from rc and decodes it. Closing the Query also closes rc. -func NewQuery(rc io.ReadCloser) *Query { - return &Query{ - reader: zngio.NewReader(zed.NewContext(), rc), - closer: rc, +func NewScanner(ctx context.Context, rc io.ReadCloser) (zbuf.Scanner, error) { + s, err := zngio.NewReader(zed.NewContext(), rc).NewScanner(ctx, nil) + if err != nil { + return nil, err } + return &scanner{ + scanner: s, + closer: rc, + }, nil } -func (q *Query) Close() error { - err := q.reader.Close() - q.closer.Close() - return err +func (s *scanner) Progress() zbuf.Progress { + return s.progress } -func (q *Query) Read() (*zed.Value, error) { - val, ctrl, err := q.reader.ReadPayload() - if ctrl != nil { - if ctrl.Format != zngio.ControlFormatZSON { - return nil, fmt.Errorf("unsupported app encoding: %v", ctrl.Format) +func (s *scanner) Pull(done bool) (zbuf.Batch, error) { +again: + batch, err := s.scanner.Pull(done) + if err == nil { + if batch != nil { + return zbuf.Label(s.channel, batch), nil } - arena := zed.NewArena() - defer arena.Unref() - value, err := zson.ParseValue(zed.NewContext(), arena, string(ctrl.Bytes)) - if err != nil { - return nil, fmt.Errorf("unable to parse Zed control message: %w (%s)", err, string(ctrl.Bytes)) - } - var v interface{} - if err := unmarshaler.Unmarshal(value, &v); err != nil { - return nil, fmt.Errorf("unable to unmarshal Zed control message: %w (%s)", err, string(ctrl.Bytes)) - } - return nil, controlToError(v) + return nil, s.closer.Close() } - return val, err -} - -func controlToError(ctrl interface{}) error { - switch ctrl := ctrl.(type) { + zctrl, ok := err.(*zbuf.Control) + if !ok { + return nil, err + } + v, err := marshalControl(zctrl) + if err != nil { + return nil, err + } + switch ctrl := v.(type) { case *api.QueryChannelSet: - return &zbuf.Control{Message: zbuf.SetChannel(ctrl.Channel)} + s.channel = ctrl.Channel + goto again case *api.QueryChannelEnd: - return &zbuf.Control{Message: zbuf.EndChannel(ctrl.Channel)} + eoc := zbuf.EndOfChannel(ctrl.Channel) + return &eoc, nil case *api.QueryStats: - return &zbuf.Control{Message: ctrl.Progress} + s.progress.Add(ctrl.Progress) + goto again case *api.QueryError: - return errors.New(ctrl.Error) + return nil, errors.New(ctrl.Error) default: - return fmt.Errorf("unsupported control message: %T", ctrl) + return nil, fmt.Errorf("unsupported control message: %T", ctrl) + } +} + +func marshalControl(zctrl *zbuf.Control) (any, error) { + ctrl, ok := zctrl.Message.(*zngio.Control) + if !ok { + return nil, fmt.Errorf("unknown control type: %T", zctrl.Message) + } + if ctrl.Format != zngio.ControlFormatZSON { + return nil, fmt.Errorf("unsupported app encoding: %v", ctrl.Format) + } + arena := zed.NewArena() + defer arena.Unref() + value, err := zson.ParseValue(zed.NewContext(), arena, string(ctrl.Bytes)) + if err != nil { + return nil, fmt.Errorf("unable to parse Zed control message: %w (%s)", err, ctrl.Bytes) + } + var v interface{} + if err := unmarshaler.Unmarshal(value, &v); err != nil { + return nil, fmt.Errorf("unable to unmarshal Zed control message: %w (%s)", err, ctrl.Bytes) } + return v, nil } diff --git a/cli/zq/command.go b/cli/zq/command.go index ab22100229..48be47d307 100644 --- a/cli/zq/command.go +++ b/cli/zq/command.go @@ -3,6 +3,7 @@ package zq import ( "flag" "fmt" + "os" "github.com/brimdata/zed" "github.com/brimdata/zed/cli" @@ -17,6 +18,7 @@ import ( "github.com/brimdata/zed/zbuf" "github.com/brimdata/zed/zfmt" "github.com/brimdata/zed/zio" + "github.com/brimdata/zed/zio/zsonio" ) var Cmd = &charm.Spec{ @@ -159,7 +161,11 @@ func (c *Command) Run(args []string) error { return err } defer query.Pull(true) - err = zbuf.CopyPuller(writer, query) + out := map[string]zio.WriteCloser{ + "main": writer, + "debug": zsonio.NewWriter(zio.NopCloser(os.Stderr), zsonio.WriterOpts{}), + } + err = zbuf.CopyMux(out, query) if closeErr := writer.Close(); err == nil { err = closeErr } diff --git a/cmd/zed/branch/command.go b/cmd/zed/branch/command.go index 55741172d5..8e82277453 100644 --- a/cmd/zed/branch/command.go +++ b/cmd/zed/branch/command.go @@ -13,7 +13,7 @@ import ( "github.com/brimdata/zed/lakeparse" "github.com/brimdata/zed/pkg/charm" "github.com/brimdata/zed/pkg/storage" - "github.com/brimdata/zed/zio" + "github.com/brimdata/zed/zbuf" ) var Cmd = &charm.Spec{ @@ -132,8 +132,8 @@ func (c *Command) list(ctx context.Context, lake api.Interface) error { w.Close() return err } - defer q.Close() - err = zio.Copy(w, q) + defer q.Pull(true) + err = zbuf.CopyPuller(w, q) if closeErr := w.Close(); err == nil { err = closeErr } diff --git a/cmd/zed/internal/lakemanage/scan.go b/cmd/zed/internal/lakemanage/scan.go index 5a4bca56e1..93d59e6702 100644 --- a/cmd/zed/internal/lakemanage/scan.go +++ b/cmd/zed/internal/lakemanage/scan.go @@ -12,6 +12,7 @@ import ( "github.com/brimdata/zed/order" "github.com/brimdata/zed/runtime/sam/expr" "github.com/brimdata/zed/runtime/sam/expr/extent" + "github.com/brimdata/zed/zbuf" "github.com/brimdata/zed/zio" "github.com/brimdata/zed/zson" "github.com/segmentio/ksuid" @@ -66,20 +67,22 @@ from %q@%q:objects ` type objectIterator struct { - reader zio.ReadCloser + reader zio.Reader + puller zbuf.Puller unmarshaler *zson.UnmarshalZNGContext arena *zed.Arena } func newObjectIterator(ctx context.Context, lake api.Interface, head *lakeparse.Commitish) (*objectIterator, error) { query := fmt.Sprintf(iteratorQuery, head.Pool, head.Branch, head.Pool, head.Branch) - r, err := lake.Query(ctx, nil, query) + q, err := lake.Query(ctx, nil, query) if err != nil { return nil, err } arena := zed.NewArena() return &objectIterator{ - reader: r, + reader: zbuf.PullerReader(q), + puller: q, unmarshaler: zson.NewZNGUnmarshaler().SetContext(zed.NewContext(), arena), arena: arena, }, nil @@ -104,7 +107,8 @@ func (r *objectIterator) next() (*object, error) { } func (r *objectIterator) close() error { - return r.reader.Close() + _, err := r.puller.Pull(true) + return err } type object struct { diff --git a/cmd/zed/log/command.go b/cmd/zed/log/command.go index d4390e990e..fd9f42bc23 100644 --- a/cmd/zed/log/command.go +++ b/cmd/zed/log/command.go @@ -10,7 +10,7 @@ import ( "github.com/brimdata/zed/compiler/parser" "github.com/brimdata/zed/pkg/charm" "github.com/brimdata/zed/pkg/storage" - "github.com/brimdata/zed/zio" + "github.com/brimdata/zed/zbuf" ) var Cmd = &charm.Spec{ @@ -76,8 +76,8 @@ func (c *Command) Run(args []string) error { } return err } - defer q.Close() - err = zio.Copy(w, q) + defer q.Pull(true) + err = zbuf.CopyPuller(w, q) if closeErr := w.Close(); err == nil { err = closeErr } diff --git a/cmd/zed/ls/command.go b/cmd/zed/ls/command.go index 9cb7971dbc..769f469e21 100644 --- a/cmd/zed/ls/command.go +++ b/cmd/zed/ls/command.go @@ -10,7 +10,7 @@ import ( "github.com/brimdata/zed/cmd/zed/root" "github.com/brimdata/zed/pkg/charm" "github.com/brimdata/zed/pkg/storage" - "github.com/brimdata/zed/zio" + "github.com/brimdata/zed/zbuf" "github.com/segmentio/ksuid" ) @@ -89,8 +89,8 @@ func (c *Command) Run(args []string) error { w.Close() return err } - defer q.Close() - err = zio.Copy(w, q) + defer q.Pull(true) + err = zbuf.CopyPuller(w, q) if closeErr := w.Close(); err == nil { err = closeErr } diff --git a/cmd/zed/query/command.go b/cmd/zed/query/command.go index c81139d440..0a79c070f7 100644 --- a/cmd/zed/query/command.go +++ b/cmd/zed/query/command.go @@ -2,6 +2,7 @@ package query import ( "flag" + "os" "github.com/brimdata/zed/cli/outputflags" "github.com/brimdata/zed/cli/poolflags" @@ -12,6 +13,7 @@ import ( "github.com/brimdata/zed/pkg/storage" "github.com/brimdata/zed/zbuf" "github.com/brimdata/zed/zio" + "github.com/brimdata/zed/zio/zsonio" ) var Cmd = &charm.Spec{ @@ -63,13 +65,17 @@ func (c *Command) Run(args []string) error { return err } head, _ := c.poolFlags.HEAD() - query, err := lake.QueryWithControl(ctx, head, src, c.queryFlags.Includes...) + query, err := lake.Query(ctx, head, src, c.queryFlags.Includes...) if err != nil { w.Close() return err } - defer query.Close() - err = zio.Copy(w, zbuf.NoControl(query)) + defer query.Pull(true) + out := map[string]zio.WriteCloser{ + "main": w, + "debug": zsonio.NewWriter(zio.NopCloser(os.Stderr), zsonio.WriterOpts{}), + } + err = zbuf.CopyMux(out, query) if closeErr := w.Close(); err == nil { err = closeErr } diff --git a/compiler/ast/ast.go b/compiler/ast/ast.go index 32baa9e5f7..86bc8efe88 100644 --- a/compiler/ast/ast.go +++ b/compiler/ast/ast.go @@ -627,6 +627,11 @@ type ( KeywordPos int `json:"keyword_pos"` Name *ID `json:"name"` } + Debug struct { + Kind string `json:"kind" unpack:""` + KeywordPos int `json:"keyword_pos"` + Expr Expr `json:"expr"` + } ) // Source structure @@ -781,6 +786,7 @@ func (*Sample) OpAST() {} func (*Load) OpAST() {} func (*Assert) OpAST() {} func (*Output) OpAST() {} +func (*Debug) OpAST() {} func (x *Scope) Pos() int { if x.Decls != nil { @@ -817,6 +823,7 @@ func (x *Sample) Pos() int { return x.KeywordPos } func (x *Load) Pos() int { return x.KeywordPos } func (x *Assert) Pos() int { return x.KeywordPos } func (x *Output) Pos() int { return x.KeywordPos } +func (x *Debug) Pos() int { return x.KeywordPos } func (x *Scope) End() int { return x.Body.End() } func (x *Parallel) End() int { return x.Rparen } @@ -926,6 +933,12 @@ func (x *Sample) End() int { func (x *Load) End() int { return x.EndPos } func (x *Assert) End() int { return x.Expr.End() } func (x *Output) End() int { return x.Name.End() } +func (x *Debug) End() int { + if x.Expr != nil { + return x.Expr.End() + } + return x.KeywordPos + 6 +} // An Agg is an AST node that represents a aggregate function. The Name // field indicates the aggregation method while the Expr field indicates diff --git a/compiler/ast/dag/op.go b/compiler/ast/dag/op.go index 19db7fc70b..280e9bd3ba 100644 --- a/compiler/ast/dag/op.go +++ b/compiler/ast/dag/op.go @@ -86,6 +86,11 @@ type ( Expr Expr `json:"expr"` Order order.Which `json:"order"` } + Mirror struct { + Kind string `json:"kind" unpack:""` + Main Seq `json:"main"` + Mirror Seq `json:"mirror"` + } Over struct { Kind string `json:"kind" unpack:""` Defs []Def `json:"defs"` @@ -314,6 +319,7 @@ func (*Over) OpNode() {} func (*Vectorize) OpNode() {} func (*Yield) OpNode() {} func (*Merge) OpNode() {} +func (*Mirror) OpNode() {} func (*Combine) OpNode() {} func (*Scope) OpNode() {} func (*Load) OpNode() {} diff --git a/compiler/ast/dag/unpack.go b/compiler/ast/dag/unpack.go index 1279c5a09d..197b305b51 100644 --- a/compiler/ast/dag/unpack.go +++ b/compiler/ast/dag/unpack.go @@ -41,6 +41,7 @@ var unpacker = unpack.New( MapCall{}, MapExpr{}, Merge{}, + Mirror{}, Output{}, Over{}, OverExpr{}, diff --git a/compiler/ast/unpack.go b/compiler/ast/unpack.go index 02b7c4ac80..86420dee0e 100644 --- a/compiler/ast/unpack.go +++ b/compiler/ast/unpack.go @@ -22,6 +22,7 @@ var unpacker = unpack.New( Conditional{}, ConstDecl{}, Cut{}, + Debug{}, astzed.DefValue{}, Drop{}, Explode{}, diff --git a/compiler/describe/analyze.go b/compiler/describe/analyze.go index dce54c50ab..fa191a1308 100644 --- a/compiler/describe/analyze.go +++ b/compiler/describe/analyze.go @@ -182,6 +182,9 @@ func describeOpAggs(op dag.Op, parents []field.List) []field.List { aggs = append(aggs, describeAggs(p, []field.List{nil})...) } return aggs + case *dag.Mirror: + aggs := describeAggs(op.Main, []field.List{nil}) + return append(aggs, describeAggs(op.Mirror, []field.List{nil})...) case *dag.Summarize: // The field list for aggregation with no keys is an empty slice and // not nil. diff --git a/compiler/kernel/op.go b/compiler/kernel/op.go index 1a54092e69..494170eeeb 100644 --- a/compiler/kernel/op.go +++ b/compiler/kernel/op.go @@ -30,6 +30,7 @@ import ( "github.com/brimdata/zed/runtime/sam/op/load" "github.com/brimdata/zed/runtime/sam/op/merge" "github.com/brimdata/zed/runtime/sam/op/meta" + "github.com/brimdata/zed/runtime/sam/op/mirror" "github.com/brimdata/zed/runtime/sam/op/pass" "github.com/brimdata/zed/runtime/sam/op/shape" "github.com/brimdata/zed/runtime/sam/op/sort" @@ -533,6 +534,23 @@ func (b *Builder) compileScatter(par *dag.Scatter, parents []zbuf.Puller) ([]zbu return ops, nil } +func (b *Builder) compileMirror(m *dag.Mirror, parents []zbuf.Puller) ([]zbuf.Puller, error) { + parent := parents[0] + if len(parents) > 1 { + parent = combine.New(b.rctx, parents) + } + o := mirror.New(b.rctx, parent) + main, err := b.compileSeq(m.Main, []zbuf.Puller{o}) + if err != nil { + return nil, err + } + mirrored, err := b.compileSeq(m.Mirror, []zbuf.Puller{o.Mirrored()}) + if err != nil { + return nil, err + } + return append(main, mirrored...), nil +} + func (b *Builder) compileExprSwitch(swtch *dag.Switch, parents []zbuf.Puller) ([]zbuf.Puller, error) { parent := parents[0] if len(parents) > 1 { @@ -600,6 +618,8 @@ func (b *Builder) compile(o dag.Op, parents []zbuf.Puller) ([]zbuf.Puller, error return b.compileFork(o, parents) case *dag.Scatter: return b.compileScatter(o, parents) + case *dag.Mirror: + return b.compileMirror(o, parents) case *dag.Scope: return b.compileScope(o, parents) case *dag.Switch: diff --git a/compiler/optimizer/optimizer.go b/compiler/optimizer/optimizer.go index 4ca8a917c0..d2c75eb8b7 100644 --- a/compiler/optimizer/optimizer.go +++ b/compiler/optimizer/optimizer.go @@ -87,6 +87,9 @@ func walk(seq dag.Seq, over bool, post func(dag.Seq) dag.Seq) dag.Seq { for k := range op.Paths { op.Paths[k] = walk(op.Paths[k], over, post) } + case *dag.Mirror: + op.Main = walk(op.Main, over, post) + op.Mirror = walk(op.Mirror, over, post) case *dag.Scope: op.Body = walk(op.Body, over, post) } @@ -113,6 +116,14 @@ func walkEntries(seq dag.Seq, post func(dag.Seq) (dag.Seq, error)) (dag.Seq, err } op.Paths[k] = seq } + case *dag.Mirror: + var err error + if op.Main, err = walkEntries(op.Main, post); err != nil { + return nil, err + } + if op.Mirror, err = walkEntries(op.Mirror, post); err != nil { + return nil, err + } case *dag.Scope: seq, err := walkEntries(op.Body, post) if err != nil { @@ -367,6 +378,16 @@ func (o *Optimizer) propagateSortKeyOp(op dag.Op, parents []order.SortKey) ([]or keys = append(keys, out...) } return keys, nil + case *dag.Mirror: + var keys []order.SortKey + for _, seq := range []dag.Seq{op.Main, op.Mirror} { + out, err := o.propagateSortKey(seq, []order.SortKey{parent}) + if err != nil { + return nil, err + } + keys = append(keys, out...) + } + return keys, nil case *dag.Merge: sortKey := order.NewSortKey(op.Order, nil) if this, ok := op.Expr.(*dag.This); ok { diff --git a/compiler/optimizer/parallelize.go b/compiler/optimizer/parallelize.go index f3fd2387c5..039e67d255 100644 --- a/compiler/optimizer/parallelize.go +++ b/compiler/optimizer/parallelize.go @@ -250,7 +250,7 @@ func (o *Optimizer) concurrentPath(ops []dag.Op, sortKey order.SortKey) (int, or // upstream sort is the same as the Load destination sort we // request a merge and set the Load operator to do a sorted write. return k, order.Nil, false, false, nil - case *dag.Fork, *dag.Scatter, *dag.Head, *dag.Tail, *dag.Uniq, *dag.Fuse, *dag.Join, *dag.Output: + case *dag.Fork, *dag.Scatter, *dag.Mirror, *dag.Head, *dag.Tail, *dag.Uniq, *dag.Fuse, *dag.Join, *dag.Output: return k, sortKey, true, true, nil default: next, err := o.analyzeSortKey(op, sortKey) diff --git a/compiler/parser/parser.go b/compiler/parser/parser.go index 81d612276b..039ccb3cbf 100644 --- a/compiler/parser/parser.go +++ b/compiler/parser/parser.go @@ -2636,6 +2636,10 @@ var g = &grammar{ pos: position{line: 361, col: 5, offset: 8973}, name: "OutputOp", }, + &ruleRefExpr{ + pos: position{line: 362, col: 5, offset: 8986}, + name: "DebugOp", + }, }, }, leader: false, @@ -2643,34 +2647,34 @@ var g = &grammar{ }, { name: "AssertOp", - pos: position{line: 363, col: 1, offset: 8983}, + pos: position{line: 364, col: 1, offset: 8995}, expr: &actionExpr{ - pos: position{line: 364, col: 5, offset: 8996}, + pos: position{line: 365, col: 5, offset: 9008}, run: (*parser).callonAssertOp1, expr: &seqExpr{ - pos: position{line: 364, col: 5, offset: 8996}, + pos: position{line: 365, col: 5, offset: 9008}, exprs: []any{ &litMatcher{ - pos: position{line: 364, col: 5, offset: 8996}, + pos: position{line: 365, col: 5, offset: 9008}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &ruleRefExpr{ - pos: position{line: 364, col: 14, offset: 9005}, + pos: position{line: 365, col: 14, offset: 9017}, name: "_", }, &labeledExpr{ - pos: position{line: 364, col: 16, offset: 9007}, + pos: position{line: 365, col: 16, offset: 9019}, label: "expr", expr: &actionExpr{ - pos: position{line: 364, col: 22, offset: 9013}, + pos: position{line: 365, col: 22, offset: 9025}, run: (*parser).callonAssertOp6, expr: &labeledExpr{ - pos: position{line: 364, col: 22, offset: 9013}, + pos: position{line: 365, col: 22, offset: 9025}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 364, col: 24, offset: 9015}, + pos: position{line: 365, col: 24, offset: 9027}, name: "Expr", }, }, @@ -2684,54 +2688,54 @@ var g = &grammar{ }, { name: "SortOp", - pos: position{line: 373, col: 1, offset: 9258}, + pos: position{line: 374, col: 1, offset: 9270}, expr: &actionExpr{ - pos: position{line: 374, col: 5, offset: 9269}, + pos: position{line: 375, col: 5, offset: 9281}, run: (*parser).callonSortOp1, expr: &seqExpr{ - pos: position{line: 374, col: 5, offset: 9269}, + pos: position{line: 375, col: 5, offset: 9281}, exprs: []any{ &litMatcher{ - pos: position{line: 374, col: 5, offset: 9269}, + pos: position{line: 375, col: 5, offset: 9281}, val: "sort", ignoreCase: false, want: "\"sort\"", }, &andExpr{ - pos: position{line: 374, col: 12, offset: 9276}, + pos: position{line: 375, col: 12, offset: 9288}, expr: &ruleRefExpr{ - pos: position{line: 374, col: 13, offset: 9277}, + pos: position{line: 375, col: 13, offset: 9289}, name: "EOKW", }, }, &labeledExpr{ - pos: position{line: 374, col: 18, offset: 9282}, + pos: position{line: 375, col: 18, offset: 9294}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 374, col: 23, offset: 9287}, + pos: position{line: 375, col: 23, offset: 9299}, name: "SortArgs", }, }, &labeledExpr{ - pos: position{line: 374, col: 32, offset: 9296}, + pos: position{line: 375, col: 32, offset: 9308}, label: "list", expr: &zeroOrOneExpr{ - pos: position{line: 374, col: 37, offset: 9301}, + pos: position{line: 375, col: 37, offset: 9313}, expr: &actionExpr{ - pos: position{line: 374, col: 38, offset: 9302}, + pos: position{line: 375, col: 38, offset: 9314}, run: (*parser).callonSortOp10, expr: &seqExpr{ - pos: position{line: 374, col: 38, offset: 9302}, + pos: position{line: 375, col: 38, offset: 9314}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 374, col: 38, offset: 9302}, + pos: position{line: 375, col: 38, offset: 9314}, name: "_", }, &labeledExpr{ - pos: position{line: 374, col: 40, offset: 9304}, + pos: position{line: 375, col: 40, offset: 9316}, label: "l", expr: &ruleRefExpr{ - pos: position{line: 374, col: 42, offset: 9306}, + pos: position{line: 375, col: 42, offset: 9318}, name: "Exprs", }, }, @@ -2748,30 +2752,30 @@ var g = &grammar{ }, { name: "SortArgs", - pos: position{line: 394, col: 1, offset: 9769}, + pos: position{line: 395, col: 1, offset: 9781}, expr: &actionExpr{ - pos: position{line: 394, col: 12, offset: 9780}, + pos: position{line: 395, col: 12, offset: 9792}, run: (*parser).callonSortArgs1, expr: &labeledExpr{ - pos: position{line: 394, col: 12, offset: 9780}, + pos: position{line: 395, col: 12, offset: 9792}, label: "args", expr: &zeroOrMoreExpr{ - pos: position{line: 394, col: 17, offset: 9785}, + pos: position{line: 395, col: 17, offset: 9797}, expr: &actionExpr{ - pos: position{line: 394, col: 18, offset: 9786}, + pos: position{line: 395, col: 18, offset: 9798}, run: (*parser).callonSortArgs4, expr: &seqExpr{ - pos: position{line: 394, col: 18, offset: 9786}, + pos: position{line: 395, col: 18, offset: 9798}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 394, col: 18, offset: 9786}, + pos: position{line: 395, col: 18, offset: 9798}, name: "_", }, &labeledExpr{ - pos: position{line: 394, col: 20, offset: 9788}, + pos: position{line: 395, col: 20, offset: 9800}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 394, col: 22, offset: 9790}, + pos: position{line: 395, col: 22, offset: 9802}, name: "SortArg", }, }, @@ -2786,53 +2790,53 @@ var g = &grammar{ }, { name: "SortArg", - pos: position{line: 396, col: 1, offset: 9847}, + pos: position{line: 397, col: 1, offset: 9859}, expr: &choiceExpr{ - pos: position{line: 397, col: 5, offset: 9859}, + pos: position{line: 398, col: 5, offset: 9871}, alternatives: []any{ &actionExpr{ - pos: position{line: 397, col: 5, offset: 9859}, + pos: position{line: 398, col: 5, offset: 9871}, run: (*parser).callonSortArg2, expr: &litMatcher{ - pos: position{line: 397, col: 5, offset: 9859}, + pos: position{line: 398, col: 5, offset: 9871}, val: "-r", ignoreCase: false, want: "\"-r\"", }, }, &actionExpr{ - pos: position{line: 398, col: 5, offset: 9926}, + pos: position{line: 399, col: 5, offset: 9938}, run: (*parser).callonSortArg4, expr: &seqExpr{ - pos: position{line: 398, col: 5, offset: 9926}, + pos: position{line: 399, col: 5, offset: 9938}, exprs: []any{ &litMatcher{ - pos: position{line: 398, col: 5, offset: 9926}, + pos: position{line: 399, col: 5, offset: 9938}, val: "-nulls", ignoreCase: false, want: "\"-nulls\"", }, &ruleRefExpr{ - pos: position{line: 398, col: 14, offset: 9935}, + pos: position{line: 399, col: 14, offset: 9947}, name: "_", }, &labeledExpr{ - pos: position{line: 398, col: 16, offset: 9937}, + pos: position{line: 399, col: 16, offset: 9949}, label: "where", expr: &actionExpr{ - pos: position{line: 398, col: 23, offset: 9944}, + pos: position{line: 399, col: 23, offset: 9956}, run: (*parser).callonSortArg9, expr: &choiceExpr{ - pos: position{line: 398, col: 24, offset: 9945}, + pos: position{line: 399, col: 24, offset: 9957}, alternatives: []any{ &litMatcher{ - pos: position{line: 398, col: 24, offset: 9945}, + pos: position{line: 399, col: 24, offset: 9957}, val: "first", ignoreCase: false, want: "\"first\"", }, &litMatcher{ - pos: position{line: 398, col: 34, offset: 9955}, + pos: position{line: 399, col: 34, offset: 9967}, val: "last", ignoreCase: false, want: "\"last\"", @@ -2851,46 +2855,46 @@ var g = &grammar{ }, { name: "TopOp", - pos: position{line: 402, col: 1, offset: 10074}, + pos: position{line: 403, col: 1, offset: 10086}, expr: &actionExpr{ - pos: position{line: 403, col: 5, offset: 10084}, + pos: position{line: 404, col: 5, offset: 10096}, run: (*parser).callonTopOp1, expr: &seqExpr{ - pos: position{line: 403, col: 5, offset: 10084}, + pos: position{line: 404, col: 5, offset: 10096}, exprs: []any{ &litMatcher{ - pos: position{line: 403, col: 5, offset: 10084}, + pos: position{line: 404, col: 5, offset: 10096}, val: "top", ignoreCase: false, want: "\"top\"", }, &andExpr{ - pos: position{line: 403, col: 11, offset: 10090}, + pos: position{line: 404, col: 11, offset: 10102}, expr: &ruleRefExpr{ - pos: position{line: 403, col: 12, offset: 10091}, + pos: position{line: 404, col: 12, offset: 10103}, name: "EOKW", }, }, &labeledExpr{ - pos: position{line: 403, col: 17, offset: 10096}, + pos: position{line: 404, col: 17, offset: 10108}, label: "limit", expr: &zeroOrOneExpr{ - pos: position{line: 403, col: 23, offset: 10102}, + pos: position{line: 404, col: 23, offset: 10114}, expr: &actionExpr{ - pos: position{line: 403, col: 24, offset: 10103}, + pos: position{line: 404, col: 24, offset: 10115}, run: (*parser).callonTopOp8, expr: &seqExpr{ - pos: position{line: 403, col: 24, offset: 10103}, + pos: position{line: 404, col: 24, offset: 10115}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 403, col: 24, offset: 10103}, + pos: position{line: 404, col: 24, offset: 10115}, name: "_", }, &labeledExpr{ - pos: position{line: 403, col: 26, offset: 10105}, + pos: position{line: 404, col: 26, offset: 10117}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 403, col: 28, offset: 10107}, + pos: position{line: 404, col: 28, offset: 10119}, name: "Expr", }, }, @@ -2900,19 +2904,19 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 403, col: 53, offset: 10132}, + pos: position{line: 404, col: 53, offset: 10144}, label: "flush", expr: &zeroOrOneExpr{ - pos: position{line: 403, col: 59, offset: 10138}, + pos: position{line: 404, col: 59, offset: 10150}, expr: &seqExpr{ - pos: position{line: 403, col: 60, offset: 10139}, + pos: position{line: 404, col: 60, offset: 10151}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 403, col: 60, offset: 10139}, + pos: position{line: 404, col: 60, offset: 10151}, name: "_", }, &litMatcher{ - pos: position{line: 403, col: 62, offset: 10141}, + pos: position{line: 404, col: 62, offset: 10153}, val: "-flush", ignoreCase: false, want: "\"-flush\"", @@ -2922,25 +2926,25 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 403, col: 73, offset: 10152}, + pos: position{line: 404, col: 73, offset: 10164}, label: "fields", expr: &zeroOrOneExpr{ - pos: position{line: 403, col: 80, offset: 10159}, + pos: position{line: 404, col: 80, offset: 10171}, expr: &actionExpr{ - pos: position{line: 403, col: 81, offset: 10160}, + pos: position{line: 404, col: 81, offset: 10172}, run: (*parser).callonTopOp20, expr: &seqExpr{ - pos: position{line: 403, col: 81, offset: 10160}, + pos: position{line: 404, col: 81, offset: 10172}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 403, col: 81, offset: 10160}, + pos: position{line: 404, col: 81, offset: 10172}, name: "_", }, &labeledExpr{ - pos: position{line: 403, col: 83, offset: 10162}, + pos: position{line: 404, col: 83, offset: 10174}, label: "f", expr: &ruleRefExpr{ - pos: position{line: 403, col: 85, offset: 10164}, + pos: position{line: 404, col: 85, offset: 10176}, name: "FieldExprs", }, }, @@ -2957,28 +2961,28 @@ var g = &grammar{ }, { name: "CutOp", - pos: position{line: 420, col: 1, offset: 10511}, + pos: position{line: 421, col: 1, offset: 10523}, expr: &actionExpr{ - pos: position{line: 421, col: 5, offset: 10521}, + pos: position{line: 422, col: 5, offset: 10533}, run: (*parser).callonCutOp1, expr: &seqExpr{ - pos: position{line: 421, col: 5, offset: 10521}, + pos: position{line: 422, col: 5, offset: 10533}, exprs: []any{ &litMatcher{ - pos: position{line: 421, col: 5, offset: 10521}, + pos: position{line: 422, col: 5, offset: 10533}, val: "cut", ignoreCase: false, want: "\"cut\"", }, &ruleRefExpr{ - pos: position{line: 421, col: 11, offset: 10527}, + pos: position{line: 422, col: 11, offset: 10539}, name: "_", }, &labeledExpr{ - pos: position{line: 421, col: 13, offset: 10529}, + pos: position{line: 422, col: 13, offset: 10541}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 421, col: 18, offset: 10534}, + pos: position{line: 422, col: 18, offset: 10546}, name: "FlexAssignments", }, }, @@ -2990,28 +2994,28 @@ var g = &grammar{ }, { name: "DropOp", - pos: position{line: 429, col: 1, offset: 10695}, + pos: position{line: 430, col: 1, offset: 10707}, expr: &actionExpr{ - pos: position{line: 430, col: 5, offset: 10706}, + pos: position{line: 431, col: 5, offset: 10718}, run: (*parser).callonDropOp1, expr: &seqExpr{ - pos: position{line: 430, col: 5, offset: 10706}, + pos: position{line: 431, col: 5, offset: 10718}, exprs: []any{ &litMatcher{ - pos: position{line: 430, col: 5, offset: 10706}, + pos: position{line: 431, col: 5, offset: 10718}, val: "drop", ignoreCase: false, want: "\"drop\"", }, &ruleRefExpr{ - pos: position{line: 430, col: 12, offset: 10713}, + pos: position{line: 431, col: 12, offset: 10725}, name: "_", }, &labeledExpr{ - pos: position{line: 430, col: 14, offset: 10715}, + pos: position{line: 431, col: 14, offset: 10727}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 430, col: 19, offset: 10720}, + pos: position{line: 431, col: 19, offset: 10732}, name: "FieldExprs", }, }, @@ -3023,38 +3027,38 @@ var g = &grammar{ }, { name: "HeadOp", - pos: position{line: 438, col: 1, offset: 10878}, + pos: position{line: 439, col: 1, offset: 10890}, expr: &choiceExpr{ - pos: position{line: 439, col: 5, offset: 10889}, + pos: position{line: 440, col: 5, offset: 10901}, alternatives: []any{ &actionExpr{ - pos: position{line: 439, col: 5, offset: 10889}, + pos: position{line: 440, col: 5, offset: 10901}, run: (*parser).callonHeadOp2, expr: &seqExpr{ - pos: position{line: 439, col: 5, offset: 10889}, + pos: position{line: 440, col: 5, offset: 10901}, exprs: []any{ &litMatcher{ - pos: position{line: 439, col: 5, offset: 10889}, + pos: position{line: 440, col: 5, offset: 10901}, val: "head", ignoreCase: false, want: "\"head\"", }, &ruleRefExpr{ - pos: position{line: 439, col: 12, offset: 10896}, + pos: position{line: 440, col: 12, offset: 10908}, name: "_", }, ¬Expr{ - pos: position{line: 439, col: 14, offset: 10898}, + pos: position{line: 440, col: 14, offset: 10910}, expr: &ruleRefExpr{ - pos: position{line: 439, col: 15, offset: 10899}, + pos: position{line: 440, col: 15, offset: 10911}, name: "EndOfOp", }, }, &labeledExpr{ - pos: position{line: 439, col: 23, offset: 10907}, + pos: position{line: 440, col: 23, offset: 10919}, label: "count", expr: &ruleRefExpr{ - pos: position{line: 439, col: 29, offset: 10913}, + pos: position{line: 440, col: 29, offset: 10925}, name: "Expr", }, }, @@ -3062,28 +3066,28 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 446, col: 5, offset: 11056}, + pos: position{line: 447, col: 5, offset: 11068}, run: (*parser).callonHeadOp10, expr: &seqExpr{ - pos: position{line: 446, col: 5, offset: 11056}, + pos: position{line: 447, col: 5, offset: 11068}, exprs: []any{ &litMatcher{ - pos: position{line: 446, col: 5, offset: 11056}, + pos: position{line: 447, col: 5, offset: 11068}, val: "head", ignoreCase: false, want: "\"head\"", }, ¬Expr{ - pos: position{line: 446, col: 12, offset: 11063}, + pos: position{line: 447, col: 12, offset: 11075}, expr: &seqExpr{ - pos: position{line: 446, col: 14, offset: 11065}, + pos: position{line: 447, col: 14, offset: 11077}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 446, col: 14, offset: 11065}, + pos: position{line: 447, col: 14, offset: 11077}, name: "__", }, &litMatcher{ - pos: position{line: 446, col: 17, offset: 11068}, + pos: position{line: 447, col: 17, offset: 11080}, val: "(", ignoreCase: false, want: "\"(\"", @@ -3092,9 +3096,9 @@ var g = &grammar{ }, }, &andExpr{ - pos: position{line: 446, col: 22, offset: 11073}, + pos: position{line: 447, col: 22, offset: 11085}, expr: &ruleRefExpr{ - pos: position{line: 446, col: 23, offset: 11074}, + pos: position{line: 447, col: 23, offset: 11086}, name: "EOKW", }, }, @@ -3108,38 +3112,38 @@ var g = &grammar{ }, { name: "TailOp", - pos: position{line: 453, col: 1, offset: 11181}, + pos: position{line: 454, col: 1, offset: 11193}, expr: &choiceExpr{ - pos: position{line: 454, col: 5, offset: 11192}, + pos: position{line: 455, col: 5, offset: 11204}, alternatives: []any{ &actionExpr{ - pos: position{line: 454, col: 5, offset: 11192}, + pos: position{line: 455, col: 5, offset: 11204}, run: (*parser).callonTailOp2, expr: &seqExpr{ - pos: position{line: 454, col: 5, offset: 11192}, + pos: position{line: 455, col: 5, offset: 11204}, exprs: []any{ &litMatcher{ - pos: position{line: 454, col: 5, offset: 11192}, + pos: position{line: 455, col: 5, offset: 11204}, val: "tail", ignoreCase: false, want: "\"tail\"", }, &ruleRefExpr{ - pos: position{line: 454, col: 12, offset: 11199}, + pos: position{line: 455, col: 12, offset: 11211}, name: "_", }, ¬Expr{ - pos: position{line: 454, col: 14, offset: 11201}, + pos: position{line: 455, col: 14, offset: 11213}, expr: &ruleRefExpr{ - pos: position{line: 454, col: 15, offset: 11202}, + pos: position{line: 455, col: 15, offset: 11214}, name: "EndOfOp", }, }, &labeledExpr{ - pos: position{line: 454, col: 23, offset: 11210}, + pos: position{line: 455, col: 23, offset: 11222}, label: "count", expr: &ruleRefExpr{ - pos: position{line: 454, col: 29, offset: 11216}, + pos: position{line: 455, col: 29, offset: 11228}, name: "Expr", }, }, @@ -3147,28 +3151,28 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 461, col: 5, offset: 11359}, + pos: position{line: 462, col: 5, offset: 11371}, run: (*parser).callonTailOp10, expr: &seqExpr{ - pos: position{line: 461, col: 5, offset: 11359}, + pos: position{line: 462, col: 5, offset: 11371}, exprs: []any{ &litMatcher{ - pos: position{line: 461, col: 5, offset: 11359}, + pos: position{line: 462, col: 5, offset: 11371}, val: "tail", ignoreCase: false, want: "\"tail\"", }, ¬Expr{ - pos: position{line: 461, col: 12, offset: 11366}, + pos: position{line: 462, col: 12, offset: 11378}, expr: &seqExpr{ - pos: position{line: 461, col: 14, offset: 11368}, + pos: position{line: 462, col: 14, offset: 11380}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 461, col: 14, offset: 11368}, + pos: position{line: 462, col: 14, offset: 11380}, name: "__", }, &litMatcher{ - pos: position{line: 461, col: 17, offset: 11371}, + pos: position{line: 462, col: 17, offset: 11383}, val: "(", ignoreCase: false, want: "\"(\"", @@ -3177,9 +3181,9 @@ var g = &grammar{ }, }, &andExpr{ - pos: position{line: 461, col: 22, offset: 11376}, + pos: position{line: 462, col: 22, offset: 11388}, expr: &ruleRefExpr{ - pos: position{line: 461, col: 23, offset: 11377}, + pos: position{line: 462, col: 23, offset: 11389}, name: "EOKW", }, }, @@ -3193,28 +3197,28 @@ var g = &grammar{ }, { name: "WhereOp", - pos: position{line: 468, col: 1, offset: 11484}, + pos: position{line: 469, col: 1, offset: 11496}, expr: &actionExpr{ - pos: position{line: 469, col: 5, offset: 11496}, + pos: position{line: 470, col: 5, offset: 11508}, run: (*parser).callonWhereOp1, expr: &seqExpr{ - pos: position{line: 469, col: 5, offset: 11496}, + pos: position{line: 470, col: 5, offset: 11508}, exprs: []any{ &litMatcher{ - pos: position{line: 469, col: 5, offset: 11496}, + pos: position{line: 470, col: 5, offset: 11508}, val: "where", ignoreCase: false, want: "\"where\"", }, &ruleRefExpr{ - pos: position{line: 469, col: 13, offset: 11504}, + pos: position{line: 470, col: 13, offset: 11516}, name: "_", }, &labeledExpr{ - pos: position{line: 469, col: 15, offset: 11506}, + pos: position{line: 470, col: 15, offset: 11518}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 469, col: 20, offset: 11511}, + pos: position{line: 470, col: 20, offset: 11523}, name: "Expr", }, }, @@ -3226,28 +3230,28 @@ var g = &grammar{ }, { name: "UniqOp", - pos: position{line: 477, col: 1, offset: 11651}, + pos: position{line: 478, col: 1, offset: 11663}, expr: &choiceExpr{ - pos: position{line: 478, col: 5, offset: 11662}, + pos: position{line: 479, col: 5, offset: 11674}, alternatives: []any{ &actionExpr{ - pos: position{line: 478, col: 5, offset: 11662}, + pos: position{line: 479, col: 5, offset: 11674}, run: (*parser).callonUniqOp2, expr: &seqExpr{ - pos: position{line: 478, col: 5, offset: 11662}, + pos: position{line: 479, col: 5, offset: 11674}, exprs: []any{ &litMatcher{ - pos: position{line: 478, col: 5, offset: 11662}, + pos: position{line: 479, col: 5, offset: 11674}, val: "uniq", ignoreCase: false, want: "\"uniq\"", }, &ruleRefExpr{ - pos: position{line: 478, col: 12, offset: 11669}, + pos: position{line: 479, col: 12, offset: 11681}, name: "_", }, &litMatcher{ - pos: position{line: 478, col: 14, offset: 11671}, + pos: position{line: 479, col: 14, offset: 11683}, val: "-c", ignoreCase: false, want: "\"-c\"", @@ -3256,28 +3260,28 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 481, col: 5, offset: 11769}, + pos: position{line: 482, col: 5, offset: 11781}, run: (*parser).callonUniqOp7, expr: &seqExpr{ - pos: position{line: 481, col: 5, offset: 11769}, + pos: position{line: 482, col: 5, offset: 11781}, exprs: []any{ &litMatcher{ - pos: position{line: 481, col: 5, offset: 11769}, + pos: position{line: 482, col: 5, offset: 11781}, val: "uniq", ignoreCase: false, want: "\"uniq\"", }, ¬Expr{ - pos: position{line: 481, col: 12, offset: 11776}, + pos: position{line: 482, col: 12, offset: 11788}, expr: &seqExpr{ - pos: position{line: 481, col: 14, offset: 11778}, + pos: position{line: 482, col: 14, offset: 11790}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 481, col: 14, offset: 11778}, + pos: position{line: 482, col: 14, offset: 11790}, name: "__", }, &litMatcher{ - pos: position{line: 481, col: 17, offset: 11781}, + pos: position{line: 482, col: 17, offset: 11793}, val: "(", ignoreCase: false, want: "\"(\"", @@ -3286,9 +3290,9 @@ var g = &grammar{ }, }, &andExpr{ - pos: position{line: 481, col: 22, offset: 11786}, + pos: position{line: 482, col: 22, offset: 11798}, expr: &ruleRefExpr{ - pos: position{line: 481, col: 23, offset: 11787}, + pos: position{line: 482, col: 23, offset: 11799}, name: "EOKW", }, }, @@ -3302,28 +3306,28 @@ var g = &grammar{ }, { name: "PutOp", - pos: position{line: 485, col: 1, offset: 11869}, + pos: position{line: 486, col: 1, offset: 11881}, expr: &actionExpr{ - pos: position{line: 486, col: 5, offset: 11879}, + pos: position{line: 487, col: 5, offset: 11891}, run: (*parser).callonPutOp1, expr: &seqExpr{ - pos: position{line: 486, col: 5, offset: 11879}, + pos: position{line: 487, col: 5, offset: 11891}, exprs: []any{ &litMatcher{ - pos: position{line: 486, col: 5, offset: 11879}, + pos: position{line: 487, col: 5, offset: 11891}, val: "put", ignoreCase: false, want: "\"put\"", }, &ruleRefExpr{ - pos: position{line: 486, col: 11, offset: 11885}, + pos: position{line: 487, col: 11, offset: 11897}, name: "_", }, &labeledExpr{ - pos: position{line: 486, col: 13, offset: 11887}, + pos: position{line: 487, col: 13, offset: 11899}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 486, col: 18, offset: 11892}, + pos: position{line: 487, col: 18, offset: 11904}, name: "Assignments", }, }, @@ -3335,61 +3339,61 @@ var g = &grammar{ }, { name: "RenameOp", - pos: position{line: 494, col: 1, offset: 12055}, + pos: position{line: 495, col: 1, offset: 12067}, expr: &actionExpr{ - pos: position{line: 495, col: 5, offset: 12068}, + pos: position{line: 496, col: 5, offset: 12080}, run: (*parser).callonRenameOp1, expr: &seqExpr{ - pos: position{line: 495, col: 5, offset: 12068}, + pos: position{line: 496, col: 5, offset: 12080}, exprs: []any{ &litMatcher{ - pos: position{line: 495, col: 5, offset: 12068}, + pos: position{line: 496, col: 5, offset: 12080}, val: "rename", ignoreCase: false, want: "\"rename\"", }, &ruleRefExpr{ - pos: position{line: 495, col: 14, offset: 12077}, + pos: position{line: 496, col: 14, offset: 12089}, name: "_", }, &labeledExpr{ - pos: position{line: 495, col: 16, offset: 12079}, + pos: position{line: 496, col: 16, offset: 12091}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 495, col: 22, offset: 12085}, + pos: position{line: 496, col: 22, offset: 12097}, name: "Assignment", }, }, &labeledExpr{ - pos: position{line: 495, col: 33, offset: 12096}, + pos: position{line: 496, col: 33, offset: 12108}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 495, col: 38, offset: 12101}, + pos: position{line: 496, col: 38, offset: 12113}, expr: &actionExpr{ - pos: position{line: 495, col: 39, offset: 12102}, + pos: position{line: 496, col: 39, offset: 12114}, run: (*parser).callonRenameOp9, expr: &seqExpr{ - pos: position{line: 495, col: 39, offset: 12102}, + pos: position{line: 496, col: 39, offset: 12114}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 495, col: 39, offset: 12102}, + pos: position{line: 496, col: 39, offset: 12114}, name: "__", }, &litMatcher{ - pos: position{line: 495, col: 42, offset: 12105}, + pos: position{line: 496, col: 42, offset: 12117}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 495, col: 46, offset: 12109}, + pos: position{line: 496, col: 46, offset: 12121}, name: "__", }, &labeledExpr{ - pos: position{line: 495, col: 49, offset: 12112}, + pos: position{line: 496, col: 49, offset: 12124}, label: "cl", expr: &ruleRefExpr{ - pos: position{line: 495, col: 52, offset: 12115}, + pos: position{line: 496, col: 52, offset: 12127}, name: "Assignment", }, }, @@ -3406,30 +3410,30 @@ var g = &grammar{ }, { name: "FuseOp", - pos: position{line: 508, col: 1, offset: 12591}, + pos: position{line: 509, col: 1, offset: 12603}, expr: &actionExpr{ - pos: position{line: 509, col: 5, offset: 12602}, + pos: position{line: 510, col: 5, offset: 12614}, run: (*parser).callonFuseOp1, expr: &seqExpr{ - pos: position{line: 509, col: 5, offset: 12602}, + pos: position{line: 510, col: 5, offset: 12614}, exprs: []any{ &litMatcher{ - pos: position{line: 509, col: 5, offset: 12602}, + pos: position{line: 510, col: 5, offset: 12614}, val: "fuse", ignoreCase: false, want: "\"fuse\"", }, ¬Expr{ - pos: position{line: 509, col: 12, offset: 12609}, + pos: position{line: 510, col: 12, offset: 12621}, expr: &seqExpr{ - pos: position{line: 509, col: 14, offset: 12611}, + pos: position{line: 510, col: 14, offset: 12623}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 509, col: 14, offset: 12611}, + pos: position{line: 510, col: 14, offset: 12623}, name: "__", }, &litMatcher{ - pos: position{line: 509, col: 17, offset: 12614}, + pos: position{line: 510, col: 17, offset: 12626}, val: "(", ignoreCase: false, want: "\"(\"", @@ -3438,9 +3442,9 @@ var g = &grammar{ }, }, &andExpr{ - pos: position{line: 509, col: 22, offset: 12619}, + pos: position{line: 510, col: 22, offset: 12631}, expr: &ruleRefExpr{ - pos: position{line: 509, col: 23, offset: 12620}, + pos: position{line: 510, col: 23, offset: 12632}, name: "EOKW", }, }, @@ -3452,30 +3456,30 @@ var g = &grammar{ }, { name: "ShapeOp", - pos: position{line: 513, col: 1, offset: 12702}, + pos: position{line: 514, col: 1, offset: 12714}, expr: &actionExpr{ - pos: position{line: 514, col: 5, offset: 12714}, + pos: position{line: 515, col: 5, offset: 12726}, run: (*parser).callonShapeOp1, expr: &seqExpr{ - pos: position{line: 514, col: 5, offset: 12714}, + pos: position{line: 515, col: 5, offset: 12726}, exprs: []any{ &litMatcher{ - pos: position{line: 514, col: 5, offset: 12714}, + pos: position{line: 515, col: 5, offset: 12726}, val: "shape", ignoreCase: false, want: "\"shape\"", }, ¬Expr{ - pos: position{line: 514, col: 13, offset: 12722}, + pos: position{line: 515, col: 13, offset: 12734}, expr: &seqExpr{ - pos: position{line: 514, col: 15, offset: 12724}, + pos: position{line: 515, col: 15, offset: 12736}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 514, col: 15, offset: 12724}, + pos: position{line: 515, col: 15, offset: 12736}, name: "__", }, &litMatcher{ - pos: position{line: 514, col: 18, offset: 12727}, + pos: position{line: 515, col: 18, offset: 12739}, val: "(", ignoreCase: false, want: "\"(\"", @@ -3484,9 +3488,9 @@ var g = &grammar{ }, }, &andExpr{ - pos: position{line: 514, col: 23, offset: 12732}, + pos: position{line: 515, col: 23, offset: 12744}, expr: &ruleRefExpr{ - pos: position{line: 514, col: 24, offset: 12733}, + pos: position{line: 515, col: 24, offset: 12745}, name: "EOKW", }, }, @@ -3498,77 +3502,77 @@ var g = &grammar{ }, { name: "JoinOp", - pos: position{line: 518, col: 1, offset: 12817}, + pos: position{line: 519, col: 1, offset: 12829}, expr: &actionExpr{ - pos: position{line: 519, col: 5, offset: 12828}, + pos: position{line: 520, col: 5, offset: 12840}, run: (*parser).callonJoinOp1, expr: &seqExpr{ - pos: position{line: 519, col: 5, offset: 12828}, + pos: position{line: 520, col: 5, offset: 12840}, exprs: []any{ &labeledExpr{ - pos: position{line: 519, col: 5, offset: 12828}, + pos: position{line: 520, col: 5, offset: 12840}, label: "style", expr: &ruleRefExpr{ - pos: position{line: 519, col: 11, offset: 12834}, + pos: position{line: 520, col: 11, offset: 12846}, name: "JoinStyle", }, }, &litMatcher{ - pos: position{line: 519, col: 21, offset: 12844}, + pos: position{line: 520, col: 21, offset: 12856}, val: "join", ignoreCase: false, want: "\"join\"", }, &labeledExpr{ - pos: position{line: 519, col: 28, offset: 12851}, + pos: position{line: 520, col: 28, offset: 12863}, label: "rightInput", expr: &ruleRefExpr{ - pos: position{line: 519, col: 39, offset: 12862}, + pos: position{line: 520, col: 39, offset: 12874}, name: "JoinRightInput", }, }, &litMatcher{ - pos: position{line: 519, col: 54, offset: 12877}, + pos: position{line: 520, col: 54, offset: 12889}, val: "on", ignoreCase: false, want: "\"on\"", }, &ruleRefExpr{ - pos: position{line: 519, col: 59, offset: 12882}, + pos: position{line: 520, col: 59, offset: 12894}, name: "_", }, &labeledExpr{ - pos: position{line: 519, col: 61, offset: 12884}, + pos: position{line: 520, col: 61, offset: 12896}, label: "key", expr: &ruleRefExpr{ - pos: position{line: 519, col: 65, offset: 12888}, + pos: position{line: 520, col: 65, offset: 12900}, name: "JoinKey", }, }, &labeledExpr{ - pos: position{line: 519, col: 73, offset: 12896}, + pos: position{line: 520, col: 73, offset: 12908}, label: "optKey", expr: &zeroOrOneExpr{ - pos: position{line: 519, col: 80, offset: 12903}, + pos: position{line: 520, col: 80, offset: 12915}, expr: &seqExpr{ - pos: position{line: 519, col: 81, offset: 12904}, + pos: position{line: 520, col: 81, offset: 12916}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 519, col: 81, offset: 12904}, + pos: position{line: 520, col: 81, offset: 12916}, name: "__", }, &litMatcher{ - pos: position{line: 519, col: 84, offset: 12907}, + pos: position{line: 520, col: 84, offset: 12919}, val: "=", ignoreCase: false, want: "\"=\"", }, &ruleRefExpr{ - pos: position{line: 519, col: 88, offset: 12911}, + pos: position{line: 520, col: 88, offset: 12923}, name: "__", }, &ruleRefExpr{ - pos: position{line: 519, col: 91, offset: 12914}, + pos: position{line: 520, col: 91, offset: 12926}, name: "JoinKey", }, }, @@ -3576,19 +3580,19 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 519, col: 101, offset: 12924}, + pos: position{line: 520, col: 101, offset: 12936}, label: "optArgs", expr: &zeroOrOneExpr{ - pos: position{line: 519, col: 109, offset: 12932}, + pos: position{line: 520, col: 109, offset: 12944}, expr: &seqExpr{ - pos: position{line: 519, col: 110, offset: 12933}, + pos: position{line: 520, col: 110, offset: 12945}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 519, col: 110, offset: 12933}, + pos: position{line: 520, col: 110, offset: 12945}, name: "_", }, &ruleRefExpr{ - pos: position{line: 519, col: 112, offset: 12935}, + pos: position{line: 520, col: 112, offset: 12947}, name: "FlexAssignments", }, }, @@ -3603,91 +3607,91 @@ var g = &grammar{ }, { name: "JoinStyle", - pos: position{line: 538, col: 1, offset: 13398}, + pos: position{line: 539, col: 1, offset: 13410}, expr: &choiceExpr{ - pos: position{line: 539, col: 5, offset: 13412}, + pos: position{line: 540, col: 5, offset: 13424}, alternatives: []any{ &actionExpr{ - pos: position{line: 539, col: 5, offset: 13412}, + pos: position{line: 540, col: 5, offset: 13424}, run: (*parser).callonJoinStyle2, expr: &seqExpr{ - pos: position{line: 539, col: 5, offset: 13412}, + pos: position{line: 540, col: 5, offset: 13424}, exprs: []any{ &litMatcher{ - pos: position{line: 539, col: 5, offset: 13412}, + pos: position{line: 540, col: 5, offset: 13424}, val: "anti", ignoreCase: false, want: "\"anti\"", }, &ruleRefExpr{ - pos: position{line: 539, col: 12, offset: 13419}, + pos: position{line: 540, col: 12, offset: 13431}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 540, col: 5, offset: 13449}, + pos: position{line: 541, col: 5, offset: 13461}, run: (*parser).callonJoinStyle6, expr: &seqExpr{ - pos: position{line: 540, col: 5, offset: 13449}, + pos: position{line: 541, col: 5, offset: 13461}, exprs: []any{ &litMatcher{ - pos: position{line: 540, col: 5, offset: 13449}, + pos: position{line: 541, col: 5, offset: 13461}, val: "inner", ignoreCase: false, want: "\"inner\"", }, &ruleRefExpr{ - pos: position{line: 540, col: 13, offset: 13457}, + pos: position{line: 541, col: 13, offset: 13469}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 541, col: 5, offset: 13487}, + pos: position{line: 542, col: 5, offset: 13499}, run: (*parser).callonJoinStyle10, expr: &seqExpr{ - pos: position{line: 541, col: 5, offset: 13487}, + pos: position{line: 542, col: 5, offset: 13499}, exprs: []any{ &litMatcher{ - pos: position{line: 541, col: 5, offset: 13487}, + pos: position{line: 542, col: 5, offset: 13499}, val: "left", ignoreCase: false, want: "\"left\"", }, &ruleRefExpr{ - pos: position{line: 541, col: 13, offset: 13495}, + pos: position{line: 542, col: 13, offset: 13507}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 542, col: 5, offset: 13524}, + pos: position{line: 543, col: 5, offset: 13536}, run: (*parser).callonJoinStyle14, expr: &seqExpr{ - pos: position{line: 542, col: 5, offset: 13524}, + pos: position{line: 543, col: 5, offset: 13536}, exprs: []any{ &litMatcher{ - pos: position{line: 542, col: 5, offset: 13524}, + pos: position{line: 543, col: 5, offset: 13536}, val: "right", ignoreCase: false, want: "\"right\"", }, &ruleRefExpr{ - pos: position{line: 542, col: 13, offset: 13532}, + pos: position{line: 543, col: 13, offset: 13544}, name: "_", }, }, }, }, &actionExpr{ - pos: position{line: 543, col: 5, offset: 13562}, + pos: position{line: 544, col: 5, offset: 13574}, run: (*parser).callonJoinStyle18, expr: &litMatcher{ - pos: position{line: 543, col: 5, offset: 13562}, + pos: position{line: 544, col: 5, offset: 13574}, val: "", ignoreCase: false, want: "\"\"", @@ -3700,60 +3704,60 @@ var g = &grammar{ }, { name: "JoinRightInput", - pos: position{line: 545, col: 1, offset: 13597}, + pos: position{line: 546, col: 1, offset: 13609}, expr: &choiceExpr{ - pos: position{line: 546, col: 5, offset: 13616}, + pos: position{line: 547, col: 5, offset: 13628}, alternatives: []any{ &actionExpr{ - pos: position{line: 546, col: 5, offset: 13616}, + pos: position{line: 547, col: 5, offset: 13628}, run: (*parser).callonJoinRightInput2, expr: &seqExpr{ - pos: position{line: 546, col: 5, offset: 13616}, + pos: position{line: 547, col: 5, offset: 13628}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 546, col: 5, offset: 13616}, + pos: position{line: 547, col: 5, offset: 13628}, name: "__", }, &litMatcher{ - pos: position{line: 546, col: 8, offset: 13619}, + pos: position{line: 547, col: 8, offset: 13631}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 546, col: 12, offset: 13623}, + pos: position{line: 547, col: 12, offset: 13635}, name: "__", }, &labeledExpr{ - pos: position{line: 546, col: 15, offset: 13626}, + pos: position{line: 547, col: 15, offset: 13638}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 546, col: 17, offset: 13628}, + pos: position{line: 547, col: 17, offset: 13640}, name: "Seq", }, }, &ruleRefExpr{ - pos: position{line: 546, col: 21, offset: 13632}, + pos: position{line: 547, col: 21, offset: 13644}, name: "__", }, &litMatcher{ - pos: position{line: 546, col: 24, offset: 13635}, + pos: position{line: 547, col: 24, offset: 13647}, val: ")", ignoreCase: false, want: "\")\"", }, &ruleRefExpr{ - pos: position{line: 546, col: 28, offset: 13639}, + pos: position{line: 547, col: 28, offset: 13651}, name: "__", }, }, }, }, &actionExpr{ - pos: position{line: 547, col: 5, offset: 13664}, + pos: position{line: 548, col: 5, offset: 13676}, run: (*parser).callonJoinRightInput12, expr: &ruleRefExpr{ - pos: position{line: 547, col: 5, offset: 13664}, + pos: position{line: 548, col: 5, offset: 13676}, name: "_", }, }, @@ -3764,36 +3768,36 @@ var g = &grammar{ }, { name: "JoinKey", - pos: position{line: 549, col: 1, offset: 13687}, + pos: position{line: 550, col: 1, offset: 13699}, expr: &choiceExpr{ - pos: position{line: 550, col: 5, offset: 13699}, + pos: position{line: 551, col: 5, offset: 13711}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 550, col: 5, offset: 13699}, + pos: position{line: 551, col: 5, offset: 13711}, name: "Lval", }, &actionExpr{ - pos: position{line: 551, col: 5, offset: 13708}, + pos: position{line: 552, col: 5, offset: 13720}, run: (*parser).callonJoinKey3, expr: &seqExpr{ - pos: position{line: 551, col: 5, offset: 13708}, + pos: position{line: 552, col: 5, offset: 13720}, exprs: []any{ &litMatcher{ - pos: position{line: 551, col: 5, offset: 13708}, + pos: position{line: 552, col: 5, offset: 13720}, val: "(", ignoreCase: false, want: "\"(\"", }, &labeledExpr{ - pos: position{line: 551, col: 9, offset: 13712}, + pos: position{line: 552, col: 9, offset: 13724}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 551, col: 14, offset: 13717}, + pos: position{line: 552, col: 14, offset: 13729}, name: "Expr", }, }, &litMatcher{ - pos: position{line: 551, col: 19, offset: 13722}, + pos: position{line: 552, col: 19, offset: 13734}, val: ")", ignoreCase: false, want: "\")\"", @@ -3808,46 +3812,46 @@ var g = &grammar{ }, { name: "SampleOp", - pos: position{line: 553, col: 1, offset: 13748}, + pos: position{line: 554, col: 1, offset: 13760}, expr: &actionExpr{ - pos: position{line: 554, col: 5, offset: 13761}, + pos: position{line: 555, col: 5, offset: 13773}, run: (*parser).callonSampleOp1, expr: &seqExpr{ - pos: position{line: 554, col: 5, offset: 13761}, + pos: position{line: 555, col: 5, offset: 13773}, exprs: []any{ &litMatcher{ - pos: position{line: 554, col: 5, offset: 13761}, + pos: position{line: 555, col: 5, offset: 13773}, val: "sample", ignoreCase: false, want: "\"sample\"", }, &andExpr{ - pos: position{line: 554, col: 14, offset: 13770}, + pos: position{line: 555, col: 14, offset: 13782}, expr: &ruleRefExpr{ - pos: position{line: 554, col: 15, offset: 13771}, + pos: position{line: 555, col: 15, offset: 13783}, name: "EOKW", }, }, &labeledExpr{ - pos: position{line: 554, col: 20, offset: 13776}, + pos: position{line: 555, col: 20, offset: 13788}, label: "expr", expr: &zeroOrOneExpr{ - pos: position{line: 554, col: 25, offset: 13781}, + pos: position{line: 555, col: 25, offset: 13793}, expr: &actionExpr{ - pos: position{line: 554, col: 26, offset: 13782}, + pos: position{line: 555, col: 26, offset: 13794}, run: (*parser).callonSampleOp8, expr: &seqExpr{ - pos: position{line: 554, col: 26, offset: 13782}, + pos: position{line: 555, col: 26, offset: 13794}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 554, col: 26, offset: 13782}, + pos: position{line: 555, col: 26, offset: 13794}, name: "_", }, &labeledExpr{ - pos: position{line: 554, col: 28, offset: 13784}, + pos: position{line: 555, col: 28, offset: 13796}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 554, col: 30, offset: 13786}, + pos: position{line: 555, col: 30, offset: 13798}, name: "Lval", }, }, @@ -3864,15 +3868,15 @@ var g = &grammar{ }, { name: "OpAssignment", - pos: position{line: 567, col: 1, offset: 14237}, + pos: position{line: 568, col: 1, offset: 14249}, expr: &actionExpr{ - pos: position{line: 568, col: 5, offset: 14254}, + pos: position{line: 569, col: 5, offset: 14266}, run: (*parser).callonOpAssignment1, expr: &labeledExpr{ - pos: position{line: 568, col: 5, offset: 14254}, + pos: position{line: 569, col: 5, offset: 14266}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 568, col: 7, offset: 14256}, + pos: position{line: 569, col: 7, offset: 14268}, name: "Assignments", }, }, @@ -3882,71 +3886,71 @@ var g = &grammar{ }, { name: "LoadOp", - pos: position{line: 575, col: 1, offset: 14405}, + pos: position{line: 576, col: 1, offset: 14417}, expr: &actionExpr{ - pos: position{line: 576, col: 5, offset: 14416}, + pos: position{line: 577, col: 5, offset: 14428}, run: (*parser).callonLoadOp1, expr: &seqExpr{ - pos: position{line: 576, col: 5, offset: 14416}, + pos: position{line: 577, col: 5, offset: 14428}, exprs: []any{ &litMatcher{ - pos: position{line: 576, col: 5, offset: 14416}, + pos: position{line: 577, col: 5, offset: 14428}, val: "load", ignoreCase: false, want: "\"load\"", }, &ruleRefExpr{ - pos: position{line: 576, col: 12, offset: 14423}, + pos: position{line: 577, col: 12, offset: 14435}, name: "_", }, &labeledExpr{ - pos: position{line: 576, col: 14, offset: 14425}, + pos: position{line: 577, col: 14, offset: 14437}, label: "pool", expr: &ruleRefExpr{ - pos: position{line: 576, col: 19, offset: 14430}, + pos: position{line: 577, col: 19, offset: 14442}, name: "PoolNameString", }, }, &labeledExpr{ - pos: position{line: 576, col: 34, offset: 14445}, + pos: position{line: 577, col: 34, offset: 14457}, label: "branch", expr: &zeroOrOneExpr{ - pos: position{line: 576, col: 41, offset: 14452}, + pos: position{line: 577, col: 41, offset: 14464}, expr: &ruleRefExpr{ - pos: position{line: 576, col: 41, offset: 14452}, + pos: position{line: 577, col: 41, offset: 14464}, name: "PoolBranch", }, }, }, &labeledExpr{ - pos: position{line: 576, col: 53, offset: 14464}, + pos: position{line: 577, col: 53, offset: 14476}, label: "author", expr: &zeroOrOneExpr{ - pos: position{line: 576, col: 60, offset: 14471}, + pos: position{line: 577, col: 60, offset: 14483}, expr: &ruleRefExpr{ - pos: position{line: 576, col: 60, offset: 14471}, + pos: position{line: 577, col: 60, offset: 14483}, name: "AuthorArg", }, }, }, &labeledExpr{ - pos: position{line: 576, col: 71, offset: 14482}, + pos: position{line: 577, col: 71, offset: 14494}, label: "message", expr: &zeroOrOneExpr{ - pos: position{line: 576, col: 79, offset: 14490}, + pos: position{line: 577, col: 79, offset: 14502}, expr: &ruleRefExpr{ - pos: position{line: 576, col: 79, offset: 14490}, + pos: position{line: 577, col: 79, offset: 14502}, name: "MessageArg", }, }, }, &labeledExpr{ - pos: position{line: 576, col: 91, offset: 14502}, + pos: position{line: 577, col: 91, offset: 14514}, label: "meta", expr: &zeroOrOneExpr{ - pos: position{line: 576, col: 96, offset: 14507}, + pos: position{line: 577, col: 96, offset: 14519}, expr: &ruleRefExpr{ - pos: position{line: 576, col: 96, offset: 14507}, + pos: position{line: 577, col: 96, offset: 14519}, name: "MetaArg", }, }, @@ -3959,32 +3963,32 @@ var g = &grammar{ }, { name: "AuthorArg", - pos: position{line: 589, col: 1, offset: 14854}, + pos: position{line: 590, col: 1, offset: 14866}, expr: &actionExpr{ - pos: position{line: 590, col: 5, offset: 14868}, + pos: position{line: 591, col: 5, offset: 14880}, run: (*parser).callonAuthorArg1, expr: &seqExpr{ - pos: position{line: 590, col: 5, offset: 14868}, + pos: position{line: 591, col: 5, offset: 14880}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 590, col: 5, offset: 14868}, + pos: position{line: 591, col: 5, offset: 14880}, name: "_", }, &litMatcher{ - pos: position{line: 590, col: 7, offset: 14870}, + pos: position{line: 591, col: 7, offset: 14882}, val: "author", ignoreCase: false, want: "\"author\"", }, &ruleRefExpr{ - pos: position{line: 590, col: 16, offset: 14879}, + pos: position{line: 591, col: 16, offset: 14891}, name: "_", }, &labeledExpr{ - pos: position{line: 590, col: 18, offset: 14881}, + pos: position{line: 591, col: 18, offset: 14893}, label: "val", expr: &ruleRefExpr{ - pos: position{line: 590, col: 22, offset: 14885}, + pos: position{line: 591, col: 22, offset: 14897}, name: "QuotedString", }, }, @@ -3996,32 +4000,32 @@ var g = &grammar{ }, { name: "MessageArg", - pos: position{line: 592, col: 1, offset: 14919}, + pos: position{line: 593, col: 1, offset: 14931}, expr: &actionExpr{ - pos: position{line: 593, col: 5, offset: 14934}, + pos: position{line: 594, col: 5, offset: 14946}, run: (*parser).callonMessageArg1, expr: &seqExpr{ - pos: position{line: 593, col: 5, offset: 14934}, + pos: position{line: 594, col: 5, offset: 14946}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 593, col: 5, offset: 14934}, + pos: position{line: 594, col: 5, offset: 14946}, name: "_", }, &litMatcher{ - pos: position{line: 593, col: 7, offset: 14936}, + pos: position{line: 594, col: 7, offset: 14948}, val: "message", ignoreCase: false, want: "\"message\"", }, &ruleRefExpr{ - pos: position{line: 593, col: 17, offset: 14946}, + pos: position{line: 594, col: 17, offset: 14958}, name: "_", }, &labeledExpr{ - pos: position{line: 593, col: 19, offset: 14948}, + pos: position{line: 594, col: 19, offset: 14960}, label: "val", expr: &ruleRefExpr{ - pos: position{line: 593, col: 23, offset: 14952}, + pos: position{line: 594, col: 23, offset: 14964}, name: "QuotedString", }, }, @@ -4033,32 +4037,32 @@ var g = &grammar{ }, { name: "MetaArg", - pos: position{line: 595, col: 1, offset: 14986}, + pos: position{line: 596, col: 1, offset: 14998}, expr: &actionExpr{ - pos: position{line: 596, col: 5, offset: 14998}, + pos: position{line: 597, col: 5, offset: 15010}, run: (*parser).callonMetaArg1, expr: &seqExpr{ - pos: position{line: 596, col: 5, offset: 14998}, + pos: position{line: 597, col: 5, offset: 15010}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 596, col: 5, offset: 14998}, + pos: position{line: 597, col: 5, offset: 15010}, name: "_", }, &litMatcher{ - pos: position{line: 596, col: 7, offset: 15000}, + pos: position{line: 597, col: 7, offset: 15012}, val: "meta", ignoreCase: false, want: "\"meta\"", }, &ruleRefExpr{ - pos: position{line: 596, col: 14, offset: 15007}, + pos: position{line: 597, col: 14, offset: 15019}, name: "_", }, &labeledExpr{ - pos: position{line: 596, col: 16, offset: 15009}, + pos: position{line: 597, col: 16, offset: 15021}, label: "val", expr: &ruleRefExpr{ - pos: position{line: 596, col: 20, offset: 15013}, + pos: position{line: 597, col: 20, offset: 15025}, name: "QuotedString", }, }, @@ -4070,31 +4074,31 @@ var g = &grammar{ }, { name: "PoolBranch", - pos: position{line: 598, col: 1, offset: 15047}, + pos: position{line: 599, col: 1, offset: 15059}, expr: &actionExpr{ - pos: position{line: 599, col: 5, offset: 15062}, + pos: position{line: 600, col: 5, offset: 15074}, run: (*parser).callonPoolBranch1, expr: &seqExpr{ - pos: position{line: 599, col: 5, offset: 15062}, + pos: position{line: 600, col: 5, offset: 15074}, exprs: []any{ &litMatcher{ - pos: position{line: 599, col: 5, offset: 15062}, + pos: position{line: 600, col: 5, offset: 15074}, val: "@", ignoreCase: false, want: "\"@\"", }, &labeledExpr{ - pos: position{line: 599, col: 9, offset: 15066}, + pos: position{line: 600, col: 9, offset: 15078}, label: "branch", expr: &choiceExpr{ - pos: position{line: 599, col: 17, offset: 15074}, + pos: position{line: 600, col: 17, offset: 15086}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 599, col: 17, offset: 15074}, + pos: position{line: 600, col: 17, offset: 15086}, name: "PoolIdentifier", }, &ruleRefExpr{ - pos: position{line: 599, col: 34, offset: 15091}, + pos: position{line: 600, col: 34, offset: 15103}, name: "QuotedString", }, }, @@ -4108,28 +4112,28 @@ var g = &grammar{ }, { name: "OutputOp", - pos: position{line: 601, col: 1, offset: 15129}, + pos: position{line: 602, col: 1, offset: 15141}, expr: &actionExpr{ - pos: position{line: 602, col: 5, offset: 15142}, + pos: position{line: 603, col: 5, offset: 15154}, run: (*parser).callonOutputOp1, expr: &seqExpr{ - pos: position{line: 602, col: 5, offset: 15142}, + pos: position{line: 603, col: 5, offset: 15154}, exprs: []any{ &litMatcher{ - pos: position{line: 602, col: 5, offset: 15142}, + pos: position{line: 603, col: 5, offset: 15154}, val: "output", ignoreCase: false, want: "\"output\"", }, &ruleRefExpr{ - pos: position{line: 602, col: 14, offset: 15151}, + pos: position{line: 603, col: 14, offset: 15163}, name: "_", }, &labeledExpr{ - pos: position{line: 602, col: 16, offset: 15153}, + pos: position{line: 603, col: 16, offset: 15165}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 602, col: 21, offset: 15158}, + pos: position{line: 603, col: 21, offset: 15170}, name: "Identifier", }, }, @@ -4139,22 +4143,78 @@ var g = &grammar{ leader: false, leftRecursive: false, }, + { + name: "DebugOp", + pos: position{line: 611, col: 1, offset: 15317}, + expr: &actionExpr{ + pos: position{line: 612, col: 5, offset: 15329}, + run: (*parser).callonDebugOp1, + expr: &seqExpr{ + pos: position{line: 612, col: 5, offset: 15329}, + exprs: []any{ + &litMatcher{ + pos: position{line: 612, col: 5, offset: 15329}, + val: "debug", + ignoreCase: false, + want: "\"debug\"", + }, + &andExpr{ + pos: position{line: 612, col: 13, offset: 15337}, + expr: &ruleRefExpr{ + pos: position{line: 612, col: 14, offset: 15338}, + name: "EOKW", + }, + }, + &labeledExpr{ + pos: position{line: 612, col: 19, offset: 15343}, + label: "expr", + expr: &zeroOrOneExpr{ + pos: position{line: 612, col: 24, offset: 15348}, + expr: &actionExpr{ + pos: position{line: 612, col: 25, offset: 15349}, + run: (*parser).callonDebugOp8, + expr: &seqExpr{ + pos: position{line: 612, col: 25, offset: 15349}, + exprs: []any{ + &ruleRefExpr{ + pos: position{line: 612, col: 25, offset: 15349}, + name: "_", + }, + &labeledExpr{ + pos: position{line: 612, col: 27, offset: 15351}, + label: "e", + expr: &ruleRefExpr{ + pos: position{line: 612, col: 29, offset: 15353}, + name: "Expr", + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + leader: false, + leftRecursive: false, + }, { name: "FromOp", - pos: position{line: 610, col: 1, offset: 15305}, + pos: position{line: 623, col: 1, offset: 15559}, expr: &choiceExpr{ - pos: position{line: 611, col: 5, offset: 15316}, + pos: position{line: 624, col: 5, offset: 15570}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 611, col: 5, offset: 15316}, + pos: position{line: 624, col: 5, offset: 15570}, name: "File", }, &ruleRefExpr{ - pos: position{line: 612, col: 5, offset: 15325}, + pos: position{line: 625, col: 5, offset: 15579}, name: "Get", }, &ruleRefExpr{ - pos: position{line: 613, col: 5, offset: 15333}, + pos: position{line: 626, col: 5, offset: 15587}, name: "From", }, }, @@ -4164,49 +4224,49 @@ var g = &grammar{ }, { name: "File", - pos: position{line: 615, col: 1, offset: 15339}, + pos: position{line: 628, col: 1, offset: 15593}, expr: &actionExpr{ - pos: position{line: 616, col: 5, offset: 15348}, + pos: position{line: 629, col: 5, offset: 15602}, run: (*parser).callonFile1, expr: &seqExpr{ - pos: position{line: 616, col: 5, offset: 15348}, + pos: position{line: 629, col: 5, offset: 15602}, exprs: []any{ &litMatcher{ - pos: position{line: 616, col: 5, offset: 15348}, + pos: position{line: 629, col: 5, offset: 15602}, val: "file", ignoreCase: false, want: "\"file\"", }, &ruleRefExpr{ - pos: position{line: 616, col: 12, offset: 15355}, + pos: position{line: 629, col: 12, offset: 15609}, name: "_", }, &labeledExpr{ - pos: position{line: 616, col: 14, offset: 15357}, + pos: position{line: 629, col: 14, offset: 15611}, label: "path", expr: &ruleRefExpr{ - pos: position{line: 616, col: 19, offset: 15362}, + pos: position{line: 629, col: 19, offset: 15616}, name: "Path", }, }, &labeledExpr{ - pos: position{line: 616, col: 24, offset: 15367}, + pos: position{line: 629, col: 24, offset: 15621}, label: "format", expr: &zeroOrOneExpr{ - pos: position{line: 616, col: 31, offset: 15374}, + pos: position{line: 629, col: 31, offset: 15628}, expr: &ruleRefExpr{ - pos: position{line: 616, col: 31, offset: 15374}, + pos: position{line: 629, col: 31, offset: 15628}, name: "FormatArg", }, }, }, &labeledExpr{ - pos: position{line: 616, col: 42, offset: 15385}, + pos: position{line: 629, col: 42, offset: 15639}, label: "sortkey", expr: &zeroOrOneExpr{ - pos: position{line: 616, col: 50, offset: 15393}, + pos: position{line: 629, col: 50, offset: 15647}, expr: &ruleRefExpr{ - pos: position{line: 616, col: 50, offset: 15393}, + pos: position{line: 629, col: 50, offset: 15647}, name: "SortKeyArg", }, }, @@ -4219,28 +4279,28 @@ var g = &grammar{ }, { name: "From", - pos: position{line: 630, col: 1, offset: 15713}, + pos: position{line: 643, col: 1, offset: 15967}, expr: &actionExpr{ - pos: position{line: 631, col: 5, offset: 15722}, + pos: position{line: 644, col: 5, offset: 15976}, run: (*parser).callonFrom1, expr: &seqExpr{ - pos: position{line: 631, col: 5, offset: 15722}, + pos: position{line: 644, col: 5, offset: 15976}, exprs: []any{ &litMatcher{ - pos: position{line: 631, col: 5, offset: 15722}, + pos: position{line: 644, col: 5, offset: 15976}, val: "from", ignoreCase: false, want: "\"from\"", }, &ruleRefExpr{ - pos: position{line: 631, col: 12, offset: 15729}, + pos: position{line: 644, col: 12, offset: 15983}, name: "_", }, &labeledExpr{ - pos: position{line: 631, col: 14, offset: 15731}, + pos: position{line: 644, col: 14, offset: 15985}, label: "spec", expr: &ruleRefExpr{ - pos: position{line: 631, col: 19, offset: 15736}, + pos: position{line: 644, col: 19, offset: 15990}, name: "PoolSpec", }, }, @@ -4252,28 +4312,28 @@ var g = &grammar{ }, { name: "Pool", - pos: position{line: 640, col: 1, offset: 15924}, + pos: position{line: 653, col: 1, offset: 16178}, expr: &actionExpr{ - pos: position{line: 641, col: 5, offset: 15933}, + pos: position{line: 654, col: 5, offset: 16187}, run: (*parser).callonPool1, expr: &seqExpr{ - pos: position{line: 641, col: 5, offset: 15933}, + pos: position{line: 654, col: 5, offset: 16187}, exprs: []any{ &litMatcher{ - pos: position{line: 641, col: 5, offset: 15933}, + pos: position{line: 654, col: 5, offset: 16187}, val: "pool", ignoreCase: false, want: "\"pool\"", }, &ruleRefExpr{ - pos: position{line: 641, col: 12, offset: 15940}, + pos: position{line: 654, col: 12, offset: 16194}, name: "_", }, &labeledExpr{ - pos: position{line: 641, col: 14, offset: 15942}, + pos: position{line: 654, col: 14, offset: 16196}, label: "spec", expr: &ruleRefExpr{ - pos: position{line: 641, col: 19, offset: 15947}, + pos: position{line: 654, col: 19, offset: 16201}, name: "PoolSpec", }, }, @@ -4285,82 +4345,82 @@ var g = &grammar{ }, { name: "Get", - pos: position{line: 650, col: 1, offset: 16135}, + pos: position{line: 663, col: 1, offset: 16389}, expr: &actionExpr{ - pos: position{line: 651, col: 5, offset: 16143}, + pos: position{line: 664, col: 5, offset: 16397}, run: (*parser).callonGet1, expr: &seqExpr{ - pos: position{line: 651, col: 5, offset: 16143}, + pos: position{line: 664, col: 5, offset: 16397}, exprs: []any{ &litMatcher{ - pos: position{line: 651, col: 5, offset: 16143}, + pos: position{line: 664, col: 5, offset: 16397}, val: "get", ignoreCase: false, want: "\"get\"", }, &ruleRefExpr{ - pos: position{line: 651, col: 11, offset: 16149}, + pos: position{line: 664, col: 11, offset: 16403}, name: "_", }, &labeledExpr{ - pos: position{line: 651, col: 13, offset: 16151}, + pos: position{line: 664, col: 13, offset: 16405}, label: "url", expr: &ruleRefExpr{ - pos: position{line: 651, col: 17, offset: 16155}, + pos: position{line: 664, col: 17, offset: 16409}, name: "Path", }, }, &labeledExpr{ - pos: position{line: 651, col: 22, offset: 16160}, + pos: position{line: 664, col: 22, offset: 16414}, label: "format", expr: &zeroOrOneExpr{ - pos: position{line: 651, col: 29, offset: 16167}, + pos: position{line: 664, col: 29, offset: 16421}, expr: &ruleRefExpr{ - pos: position{line: 651, col: 29, offset: 16167}, + pos: position{line: 664, col: 29, offset: 16421}, name: "FormatArg", }, }, }, &labeledExpr{ - pos: position{line: 651, col: 40, offset: 16178}, + pos: position{line: 664, col: 40, offset: 16432}, label: "sortkey", expr: &zeroOrOneExpr{ - pos: position{line: 651, col: 48, offset: 16186}, + pos: position{line: 664, col: 48, offset: 16440}, expr: &ruleRefExpr{ - pos: position{line: 651, col: 48, offset: 16186}, + pos: position{line: 664, col: 48, offset: 16440}, name: "SortKeyArg", }, }, }, &labeledExpr{ - pos: position{line: 651, col: 60, offset: 16198}, + pos: position{line: 664, col: 60, offset: 16452}, label: "method", expr: &zeroOrOneExpr{ - pos: position{line: 651, col: 67, offset: 16205}, + pos: position{line: 664, col: 67, offset: 16459}, expr: &ruleRefExpr{ - pos: position{line: 651, col: 67, offset: 16205}, + pos: position{line: 664, col: 67, offset: 16459}, name: "MethodArg", }, }, }, &labeledExpr{ - pos: position{line: 651, col: 78, offset: 16216}, + pos: position{line: 664, col: 78, offset: 16470}, label: "headers", expr: &zeroOrOneExpr{ - pos: position{line: 651, col: 86, offset: 16224}, + pos: position{line: 664, col: 86, offset: 16478}, expr: &ruleRefExpr{ - pos: position{line: 651, col: 86, offset: 16224}, + pos: position{line: 664, col: 86, offset: 16478}, name: "HeadersArg", }, }, }, &labeledExpr{ - pos: position{line: 651, col: 98, offset: 16236}, + pos: position{line: 664, col: 98, offset: 16490}, label: "body", expr: &zeroOrOneExpr{ - pos: position{line: 651, col: 103, offset: 16241}, + pos: position{line: 664, col: 103, offset: 16495}, expr: &ruleRefExpr{ - pos: position{line: 651, col: 103, offset: 16241}, + pos: position{line: 664, col: 103, offset: 16495}, name: "BodyArg", }, }, @@ -4373,39 +4433,39 @@ var g = &grammar{ }, { name: "MethodArg", - pos: position{line: 670, col: 1, offset: 16712}, + pos: position{line: 683, col: 1, offset: 16966}, expr: &actionExpr{ - pos: position{line: 670, col: 13, offset: 16724}, + pos: position{line: 683, col: 13, offset: 16978}, run: (*parser).callonMethodArg1, expr: &seqExpr{ - pos: position{line: 670, col: 13, offset: 16724}, + pos: position{line: 683, col: 13, offset: 16978}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 670, col: 13, offset: 16724}, + pos: position{line: 683, col: 13, offset: 16978}, name: "_", }, &litMatcher{ - pos: position{line: 670, col: 15, offset: 16726}, + pos: position{line: 683, col: 15, offset: 16980}, val: "method", ignoreCase: false, want: "\"method\"", }, &ruleRefExpr{ - pos: position{line: 670, col: 24, offset: 16735}, + pos: position{line: 683, col: 24, offset: 16989}, name: "_", }, &labeledExpr{ - pos: position{line: 670, col: 26, offset: 16737}, + pos: position{line: 683, col: 26, offset: 16991}, label: "v", expr: &choiceExpr{ - pos: position{line: 670, col: 29, offset: 16740}, + pos: position{line: 683, col: 29, offset: 16994}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 670, col: 29, offset: 16740}, + pos: position{line: 683, col: 29, offset: 16994}, name: "IdentifierName", }, &ruleRefExpr{ - pos: position{line: 670, col: 46, offset: 16757}, + pos: position{line: 683, col: 46, offset: 17011}, name: "QuotedString", }, }, @@ -4419,32 +4479,32 @@ var g = &grammar{ }, { name: "HeadersArg", - pos: position{line: 672, col: 1, offset: 16790}, + pos: position{line: 685, col: 1, offset: 17044}, expr: &actionExpr{ - pos: position{line: 672, col: 14, offset: 16803}, + pos: position{line: 685, col: 14, offset: 17057}, run: (*parser).callonHeadersArg1, expr: &seqExpr{ - pos: position{line: 672, col: 14, offset: 16803}, + pos: position{line: 685, col: 14, offset: 17057}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 672, col: 14, offset: 16803}, + pos: position{line: 685, col: 14, offset: 17057}, name: "_", }, &litMatcher{ - pos: position{line: 672, col: 16, offset: 16805}, + pos: position{line: 685, col: 16, offset: 17059}, val: "headers", ignoreCase: false, want: "\"headers\"", }, &ruleRefExpr{ - pos: position{line: 672, col: 26, offset: 16815}, + pos: position{line: 685, col: 26, offset: 17069}, name: "_", }, &labeledExpr{ - pos: position{line: 672, col: 28, offset: 16817}, + pos: position{line: 685, col: 28, offset: 17071}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 672, col: 30, offset: 16819}, + pos: position{line: 685, col: 30, offset: 17073}, name: "Record", }, }, @@ -4456,39 +4516,39 @@ var g = &grammar{ }, { name: "BodyArg", - pos: position{line: 674, col: 1, offset: 16845}, + pos: position{line: 687, col: 1, offset: 17099}, expr: &actionExpr{ - pos: position{line: 674, col: 11, offset: 16855}, + pos: position{line: 687, col: 11, offset: 17109}, run: (*parser).callonBodyArg1, expr: &seqExpr{ - pos: position{line: 674, col: 11, offset: 16855}, + pos: position{line: 687, col: 11, offset: 17109}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 674, col: 11, offset: 16855}, + pos: position{line: 687, col: 11, offset: 17109}, name: "_", }, &litMatcher{ - pos: position{line: 674, col: 13, offset: 16857}, + pos: position{line: 687, col: 13, offset: 17111}, val: "body", ignoreCase: false, want: "\"body\"", }, &ruleRefExpr{ - pos: position{line: 674, col: 20, offset: 16864}, + pos: position{line: 687, col: 20, offset: 17118}, name: "_", }, &labeledExpr{ - pos: position{line: 674, col: 22, offset: 16866}, + pos: position{line: 687, col: 22, offset: 17120}, label: "v", expr: &choiceExpr{ - pos: position{line: 674, col: 25, offset: 16869}, + pos: position{line: 687, col: 25, offset: 17123}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 674, col: 25, offset: 16869}, + pos: position{line: 687, col: 25, offset: 17123}, name: "IdentifierName", }, &ruleRefExpr{ - pos: position{line: 674, col: 42, offset: 16886}, + pos: position{line: 687, col: 42, offset: 17140}, name: "QuotedString", }, }, @@ -4502,21 +4562,21 @@ var g = &grammar{ }, { name: "Path", - pos: position{line: 676, col: 1, offset: 16919}, + pos: position{line: 689, col: 1, offset: 17173}, expr: &choiceExpr{ - pos: position{line: 677, col: 5, offset: 16928}, + pos: position{line: 690, col: 5, offset: 17182}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 677, col: 5, offset: 16928}, + pos: position{line: 690, col: 5, offset: 17182}, name: "QuotedStringNode", }, &actionExpr{ - pos: position{line: 678, col: 5, offset: 16949}, + pos: position{line: 691, col: 5, offset: 17203}, run: (*parser).callonPath3, expr: &oneOrMoreExpr{ - pos: position{line: 678, col: 5, offset: 16949}, + pos: position{line: 691, col: 5, offset: 17203}, expr: &charClassMatcher{ - pos: position{line: 678, col: 5, offset: 16949}, + pos: position{line: 691, col: 5, offset: 17203}, val: "[0-9a-zA-Z!@$%^&*_=<>,./?:[\\]{}~+-]", chars: []rune{'!', '@', '$', '%', '^', '&', '*', '_', '=', '<', '>', ',', '.', '/', '?', ':', '[', ']', '{', '}', '~', '+', '-'}, ranges: []rune{'0', '9', 'a', 'z', 'A', 'Z'}, @@ -4532,32 +4592,32 @@ var g = &grammar{ }, { name: "PoolAt", - pos: position{line: 683, col: 1, offset: 17119}, + pos: position{line: 696, col: 1, offset: 17373}, expr: &actionExpr{ - pos: position{line: 684, col: 5, offset: 17130}, + pos: position{line: 697, col: 5, offset: 17384}, run: (*parser).callonPoolAt1, expr: &seqExpr{ - pos: position{line: 684, col: 5, offset: 17130}, + pos: position{line: 697, col: 5, offset: 17384}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 684, col: 5, offset: 17130}, + pos: position{line: 697, col: 5, offset: 17384}, name: "_", }, &litMatcher{ - pos: position{line: 684, col: 7, offset: 17132}, + pos: position{line: 697, col: 7, offset: 17386}, val: "at", ignoreCase: false, want: "\"at\"", }, &ruleRefExpr{ - pos: position{line: 684, col: 12, offset: 17137}, + pos: position{line: 697, col: 12, offset: 17391}, name: "_", }, &labeledExpr{ - pos: position{line: 684, col: 14, offset: 17139}, + pos: position{line: 697, col: 14, offset: 17393}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 684, col: 17, offset: 17142}, + pos: position{line: 697, col: 17, offset: 17396}, name: "KSUID", }, }, @@ -4569,14 +4629,14 @@ var g = &grammar{ }, { name: "KSUID", - pos: position{line: 687, col: 1, offset: 17208}, + pos: position{line: 700, col: 1, offset: 17462}, expr: &actionExpr{ - pos: position{line: 687, col: 9, offset: 17216}, + pos: position{line: 700, col: 9, offset: 17470}, run: (*parser).callonKSUID1, expr: &oneOrMoreExpr{ - pos: position{line: 687, col: 9, offset: 17216}, + pos: position{line: 700, col: 9, offset: 17470}, expr: &charClassMatcher{ - pos: position{line: 687, col: 10, offset: 17217}, + pos: position{line: 700, col: 10, offset: 17471}, val: "[0-9a-zA-Z]", ranges: []rune{'0', '9', 'a', 'z', 'A', 'Z'}, ignoreCase: false, @@ -4589,51 +4649,51 @@ var g = &grammar{ }, { name: "PoolSpec", - pos: position{line: 689, col: 1, offset: 17263}, + pos: position{line: 702, col: 1, offset: 17517}, expr: &choiceExpr{ - pos: position{line: 690, col: 5, offset: 17276}, + pos: position{line: 703, col: 5, offset: 17530}, alternatives: []any{ &actionExpr{ - pos: position{line: 690, col: 5, offset: 17276}, + pos: position{line: 703, col: 5, offset: 17530}, run: (*parser).callonPoolSpec2, expr: &seqExpr{ - pos: position{line: 690, col: 5, offset: 17276}, + pos: position{line: 703, col: 5, offset: 17530}, exprs: []any{ &labeledExpr{ - pos: position{line: 690, col: 5, offset: 17276}, + pos: position{line: 703, col: 5, offset: 17530}, label: "pool", expr: &ruleRefExpr{ - pos: position{line: 690, col: 10, offset: 17281}, + pos: position{line: 703, col: 10, offset: 17535}, name: "PoolName", }, }, &labeledExpr{ - pos: position{line: 690, col: 19, offset: 17290}, + pos: position{line: 703, col: 19, offset: 17544}, label: "commit", expr: &zeroOrOneExpr{ - pos: position{line: 690, col: 26, offset: 17297}, + pos: position{line: 703, col: 26, offset: 17551}, expr: &ruleRefExpr{ - pos: position{line: 690, col: 26, offset: 17297}, + pos: position{line: 703, col: 26, offset: 17551}, name: "PoolCommit", }, }, }, &labeledExpr{ - pos: position{line: 690, col: 38, offset: 17309}, + pos: position{line: 703, col: 38, offset: 17563}, label: "meta", expr: &zeroOrOneExpr{ - pos: position{line: 690, col: 43, offset: 17314}, + pos: position{line: 703, col: 43, offset: 17568}, expr: &ruleRefExpr{ - pos: position{line: 690, col: 43, offset: 17314}, + pos: position{line: 703, col: 43, offset: 17568}, name: "PoolMeta", }, }, }, &labeledExpr{ - pos: position{line: 690, col: 53, offset: 17324}, + pos: position{line: 703, col: 53, offset: 17578}, label: "tap", expr: &ruleRefExpr{ - pos: position{line: 690, col: 57, offset: 17328}, + pos: position{line: 703, col: 57, offset: 17582}, name: "TapArg", }, }, @@ -4641,13 +4701,13 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 698, col: 5, offset: 17522}, + pos: position{line: 711, col: 5, offset: 17776}, run: (*parser).callonPoolSpec14, expr: &labeledExpr{ - pos: position{line: 698, col: 5, offset: 17522}, + pos: position{line: 711, col: 5, offset: 17776}, label: "meta", expr: &ruleRefExpr{ - pos: position{line: 698, col: 10, offset: 17527}, + pos: position{line: 711, col: 10, offset: 17781}, name: "PoolMeta", }, }, @@ -4659,24 +4719,24 @@ var g = &grammar{ }, { name: "PoolCommit", - pos: position{line: 702, col: 1, offset: 17597}, + pos: position{line: 715, col: 1, offset: 17851}, expr: &actionExpr{ - pos: position{line: 703, col: 5, offset: 17612}, + pos: position{line: 716, col: 5, offset: 17866}, run: (*parser).callonPoolCommit1, expr: &seqExpr{ - pos: position{line: 703, col: 5, offset: 17612}, + pos: position{line: 716, col: 5, offset: 17866}, exprs: []any{ &litMatcher{ - pos: position{line: 703, col: 5, offset: 17612}, + pos: position{line: 716, col: 5, offset: 17866}, val: "@", ignoreCase: false, want: "\"@\"", }, &labeledExpr{ - pos: position{line: 703, col: 9, offset: 17616}, + pos: position{line: 716, col: 9, offset: 17870}, label: "commit", expr: &ruleRefExpr{ - pos: position{line: 703, col: 16, offset: 17623}, + pos: position{line: 716, col: 16, offset: 17877}, name: "PoolNameString", }, }, @@ -4688,24 +4748,24 @@ var g = &grammar{ }, { name: "PoolMeta", - pos: position{line: 705, col: 1, offset: 17662}, + pos: position{line: 718, col: 1, offset: 17916}, expr: &actionExpr{ - pos: position{line: 706, col: 5, offset: 17675}, + pos: position{line: 719, col: 5, offset: 17929}, run: (*parser).callonPoolMeta1, expr: &seqExpr{ - pos: position{line: 706, col: 5, offset: 17675}, + pos: position{line: 719, col: 5, offset: 17929}, exprs: []any{ &litMatcher{ - pos: position{line: 706, col: 5, offset: 17675}, + pos: position{line: 719, col: 5, offset: 17929}, val: ":", ignoreCase: false, want: "\":\"", }, &labeledExpr{ - pos: position{line: 706, col: 9, offset: 17679}, + pos: position{line: 719, col: 9, offset: 17933}, label: "meta", expr: &ruleRefExpr{ - pos: position{line: 706, col: 14, offset: 17684}, + pos: position{line: 719, col: 14, offset: 17938}, name: "PoolIdentifier", }, }, @@ -4717,34 +4777,34 @@ var g = &grammar{ }, { name: "PoolName", - pos: position{line: 708, col: 1, offset: 17721}, + pos: position{line: 721, col: 1, offset: 17975}, expr: &choiceExpr{ - pos: position{line: 709, col: 5, offset: 17734}, + pos: position{line: 722, col: 5, offset: 17988}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 709, col: 5, offset: 17734}, + pos: position{line: 722, col: 5, offset: 17988}, name: "Regexp", }, &ruleRefExpr{ - pos: position{line: 710, col: 5, offset: 17745}, + pos: position{line: 723, col: 5, offset: 17999}, name: "Glob", }, &actionExpr{ - pos: position{line: 711, col: 5, offset: 17754}, + pos: position{line: 724, col: 5, offset: 18008}, run: (*parser).callonPoolName4, expr: &seqExpr{ - pos: position{line: 711, col: 5, offset: 17754}, + pos: position{line: 724, col: 5, offset: 18008}, exprs: []any{ &litMatcher{ - pos: position{line: 711, col: 5, offset: 17754}, + pos: position{line: 724, col: 5, offset: 18008}, val: "*", ignoreCase: false, want: "\"*\"", }, ¬Expr{ - pos: position{line: 711, col: 9, offset: 17758}, + pos: position{line: 724, col: 9, offset: 18012}, expr: &ruleRefExpr{ - pos: position{line: 711, col: 10, offset: 17759}, + pos: position{line: 724, col: 10, offset: 18013}, name: "ExprGuard", }, }, @@ -4752,17 +4812,17 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 712, col: 5, offset: 17853}, + pos: position{line: 725, col: 5, offset: 18107}, name: "QuotedStringNode", }, &actionExpr{ - pos: position{line: 713, col: 5, offset: 17874}, + pos: position{line: 726, col: 5, offset: 18128}, run: (*parser).callonPoolName10, expr: &labeledExpr{ - pos: position{line: 713, col: 5, offset: 17874}, + pos: position{line: 726, col: 5, offset: 18128}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 713, col: 10, offset: 17879}, + pos: position{line: 726, col: 10, offset: 18133}, name: "PoolNameString", }, }, @@ -4774,20 +4834,20 @@ var g = &grammar{ }, { name: "PoolNameString", - pos: position{line: 715, col: 1, offset: 17983}, + pos: position{line: 728, col: 1, offset: 18237}, expr: &choiceExpr{ - pos: position{line: 716, col: 5, offset: 18002}, + pos: position{line: 729, col: 5, offset: 18256}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 716, col: 5, offset: 18002}, + pos: position{line: 729, col: 5, offset: 18256}, name: "PoolIdentifier", }, &ruleRefExpr{ - pos: position{line: 717, col: 5, offset: 18021}, + pos: position{line: 730, col: 5, offset: 18275}, name: "KSUID", }, &ruleRefExpr{ - pos: position{line: 718, col: 5, offset: 18031}, + pos: position{line: 731, col: 5, offset: 18285}, name: "QuotedString", }, }, @@ -4797,22 +4857,22 @@ var g = &grammar{ }, { name: "PoolIdentifier", - pos: position{line: 720, col: 1, offset: 18045}, + pos: position{line: 733, col: 1, offset: 18299}, expr: &actionExpr{ - pos: position{line: 721, col: 5, offset: 18064}, + pos: position{line: 734, col: 5, offset: 18318}, run: (*parser).callonPoolIdentifier1, expr: &seqExpr{ - pos: position{line: 721, col: 5, offset: 18064}, + pos: position{line: 734, col: 5, offset: 18318}, exprs: []any{ &choiceExpr{ - pos: position{line: 721, col: 6, offset: 18065}, + pos: position{line: 734, col: 6, offset: 18319}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 721, col: 6, offset: 18065}, + pos: position{line: 734, col: 6, offset: 18319}, name: "IdentifierStart", }, &litMatcher{ - pos: position{line: 721, col: 24, offset: 18083}, + pos: position{line: 734, col: 24, offset: 18337}, val: ".", ignoreCase: false, want: "\".\"", @@ -4820,16 +4880,16 @@ var g = &grammar{ }, }, &zeroOrMoreExpr{ - pos: position{line: 721, col: 29, offset: 18088}, + pos: position{line: 734, col: 29, offset: 18342}, expr: &choiceExpr{ - pos: position{line: 721, col: 30, offset: 18089}, + pos: position{line: 734, col: 30, offset: 18343}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 721, col: 30, offset: 18089}, + pos: position{line: 734, col: 30, offset: 18343}, name: "IdentifierRest", }, &litMatcher{ - pos: position{line: 721, col: 47, offset: 18106}, + pos: position{line: 734, col: 47, offset: 18360}, val: ".", ignoreCase: false, want: "\".\"", @@ -4845,40 +4905,40 @@ var g = &grammar{ }, { name: "SortKeyArg", - pos: position{line: 723, col: 1, offset: 18144}, + pos: position{line: 736, col: 1, offset: 18398}, expr: &actionExpr{ - pos: position{line: 724, col: 5, offset: 18159}, + pos: position{line: 737, col: 5, offset: 18413}, run: (*parser).callonSortKeyArg1, expr: &seqExpr{ - pos: position{line: 724, col: 5, offset: 18159}, + pos: position{line: 737, col: 5, offset: 18413}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 724, col: 5, offset: 18159}, + pos: position{line: 737, col: 5, offset: 18413}, name: "_", }, &litMatcher{ - pos: position{line: 724, col: 7, offset: 18161}, + pos: position{line: 737, col: 7, offset: 18415}, val: "order", ignoreCase: false, want: "\"order\"", }, &ruleRefExpr{ - pos: position{line: 724, col: 15, offset: 18169}, + pos: position{line: 737, col: 15, offset: 18423}, name: "_", }, &labeledExpr{ - pos: position{line: 724, col: 17, offset: 18171}, + pos: position{line: 737, col: 17, offset: 18425}, label: "keys", expr: &ruleRefExpr{ - pos: position{line: 724, col: 22, offset: 18176}, + pos: position{line: 737, col: 22, offset: 18430}, name: "FieldExprs", }, }, &labeledExpr{ - pos: position{line: 724, col: 33, offset: 18187}, + pos: position{line: 737, col: 33, offset: 18441}, label: "order", expr: &ruleRefExpr{ - pos: position{line: 724, col: 39, offset: 18193}, + pos: position{line: 737, col: 39, offset: 18447}, name: "OrderSuffix", }, }, @@ -4890,22 +4950,22 @@ var g = &grammar{ }, { name: "TapArg", - pos: position{line: 732, col: 1, offset: 18349}, + pos: position{line: 745, col: 1, offset: 18603}, expr: &choiceExpr{ - pos: position{line: 733, col: 5, offset: 18360}, + pos: position{line: 746, col: 5, offset: 18614}, alternatives: []any{ &actionExpr{ - pos: position{line: 733, col: 5, offset: 18360}, + pos: position{line: 746, col: 5, offset: 18614}, run: (*parser).callonTapArg2, expr: &seqExpr{ - pos: position{line: 733, col: 5, offset: 18360}, + pos: position{line: 746, col: 5, offset: 18614}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 733, col: 5, offset: 18360}, + pos: position{line: 746, col: 5, offset: 18614}, name: "_", }, &litMatcher{ - pos: position{line: 733, col: 7, offset: 18362}, + pos: position{line: 746, col: 7, offset: 18616}, val: "tap", ignoreCase: false, want: "\"tap\"", @@ -4914,10 +4974,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 734, col: 5, offset: 18393}, + pos: position{line: 747, col: 5, offset: 18647}, run: (*parser).callonTapArg6, expr: &litMatcher{ - pos: position{line: 734, col: 5, offset: 18393}, + pos: position{line: 747, col: 5, offset: 18647}, val: "", ignoreCase: false, want: "\"\"", @@ -4930,32 +4990,32 @@ var g = &grammar{ }, { name: "FormatArg", - pos: position{line: 736, col: 1, offset: 18419}, + pos: position{line: 749, col: 1, offset: 18673}, expr: &actionExpr{ - pos: position{line: 737, col: 5, offset: 18433}, + pos: position{line: 750, col: 5, offset: 18687}, run: (*parser).callonFormatArg1, expr: &seqExpr{ - pos: position{line: 737, col: 5, offset: 18433}, + pos: position{line: 750, col: 5, offset: 18687}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 737, col: 5, offset: 18433}, + pos: position{line: 750, col: 5, offset: 18687}, name: "_", }, &litMatcher{ - pos: position{line: 737, col: 7, offset: 18435}, + pos: position{line: 750, col: 7, offset: 18689}, val: "format", ignoreCase: false, want: "\"format\"", }, &ruleRefExpr{ - pos: position{line: 737, col: 16, offset: 18444}, + pos: position{line: 750, col: 16, offset: 18698}, name: "_", }, &labeledExpr{ - pos: position{line: 737, col: 18, offset: 18446}, + pos: position{line: 750, col: 18, offset: 18700}, label: "val", expr: &ruleRefExpr{ - pos: position{line: 737, col: 22, offset: 18450}, + pos: position{line: 750, col: 22, offset: 18704}, name: "IdentifierName", }, }, @@ -4967,35 +5027,35 @@ var g = &grammar{ }, { name: "OrderSuffix", - pos: position{line: 739, col: 1, offset: 18486}, + pos: position{line: 752, col: 1, offset: 18740}, expr: &choiceExpr{ - pos: position{line: 740, col: 5, offset: 18502}, + pos: position{line: 753, col: 5, offset: 18756}, alternatives: []any{ &actionExpr{ - pos: position{line: 740, col: 5, offset: 18502}, + pos: position{line: 753, col: 5, offset: 18756}, run: (*parser).callonOrderSuffix2, expr: &litMatcher{ - pos: position{line: 740, col: 5, offset: 18502}, + pos: position{line: 753, col: 5, offset: 18756}, val: ":asc", ignoreCase: false, want: "\":asc\"", }, }, &actionExpr{ - pos: position{line: 741, col: 5, offset: 18536}, + pos: position{line: 754, col: 5, offset: 18790}, run: (*parser).callonOrderSuffix4, expr: &litMatcher{ - pos: position{line: 741, col: 5, offset: 18536}, + pos: position{line: 754, col: 5, offset: 18790}, val: ":desc", ignoreCase: false, want: "\":desc\"", }, }, &actionExpr{ - pos: position{line: 742, col: 5, offset: 18571}, + pos: position{line: 755, col: 5, offset: 18825}, run: (*parser).callonOrderSuffix6, expr: &litMatcher{ - pos: position{line: 742, col: 5, offset: 18571}, + pos: position{line: 755, col: 5, offset: 18825}, val: "", ignoreCase: false, want: "\"\"", @@ -5008,30 +5068,30 @@ var g = &grammar{ }, { name: "PassOp", - pos: position{line: 744, col: 1, offset: 18602}, + pos: position{line: 757, col: 1, offset: 18856}, expr: &actionExpr{ - pos: position{line: 745, col: 5, offset: 18613}, + pos: position{line: 758, col: 5, offset: 18867}, run: (*parser).callonPassOp1, expr: &seqExpr{ - pos: position{line: 745, col: 5, offset: 18613}, + pos: position{line: 758, col: 5, offset: 18867}, exprs: []any{ &litMatcher{ - pos: position{line: 745, col: 5, offset: 18613}, + pos: position{line: 758, col: 5, offset: 18867}, val: "pass", ignoreCase: false, want: "\"pass\"", }, ¬Expr{ - pos: position{line: 745, col: 12, offset: 18620}, + pos: position{line: 758, col: 12, offset: 18874}, expr: &seqExpr{ - pos: position{line: 745, col: 14, offset: 18622}, + pos: position{line: 758, col: 14, offset: 18876}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 745, col: 14, offset: 18622}, + pos: position{line: 758, col: 14, offset: 18876}, name: "__", }, &litMatcher{ - pos: position{line: 745, col: 17, offset: 18625}, + pos: position{line: 758, col: 17, offset: 18879}, val: "(", ignoreCase: false, want: "\"(\"", @@ -5040,9 +5100,9 @@ var g = &grammar{ }, }, &andExpr{ - pos: position{line: 745, col: 22, offset: 18630}, + pos: position{line: 758, col: 22, offset: 18884}, expr: &ruleRefExpr{ - pos: position{line: 745, col: 23, offset: 18631}, + pos: position{line: 758, col: 23, offset: 18885}, name: "EOKW", }, }, @@ -5054,46 +5114,46 @@ var g = &grammar{ }, { name: "ExplodeOp", - pos: position{line: 751, col: 1, offset: 18835}, + pos: position{line: 764, col: 1, offset: 19089}, expr: &actionExpr{ - pos: position{line: 752, col: 5, offset: 18849}, + pos: position{line: 765, col: 5, offset: 19103}, run: (*parser).callonExplodeOp1, expr: &seqExpr{ - pos: position{line: 752, col: 5, offset: 18849}, + pos: position{line: 765, col: 5, offset: 19103}, exprs: []any{ &litMatcher{ - pos: position{line: 752, col: 5, offset: 18849}, + pos: position{line: 765, col: 5, offset: 19103}, val: "explode", ignoreCase: false, want: "\"explode\"", }, &ruleRefExpr{ - pos: position{line: 752, col: 15, offset: 18859}, + pos: position{line: 765, col: 15, offset: 19113}, name: "_", }, &labeledExpr{ - pos: position{line: 752, col: 17, offset: 18861}, + pos: position{line: 765, col: 17, offset: 19115}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 752, col: 22, offset: 18866}, + pos: position{line: 765, col: 22, offset: 19120}, name: "Exprs", }, }, &labeledExpr{ - pos: position{line: 752, col: 28, offset: 18872}, + pos: position{line: 765, col: 28, offset: 19126}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 752, col: 32, offset: 18876}, + pos: position{line: 765, col: 32, offset: 19130}, name: "TypeArg", }, }, &labeledExpr{ - pos: position{line: 752, col: 40, offset: 18884}, + pos: position{line: 765, col: 40, offset: 19138}, label: "as", expr: &zeroOrOneExpr{ - pos: position{line: 752, col: 43, offset: 18887}, + pos: position{line: 765, col: 43, offset: 19141}, expr: &ruleRefExpr{ - pos: position{line: 752, col: 43, offset: 18887}, + pos: position{line: 765, col: 43, offset: 19141}, name: "AsArg", }, }, @@ -5106,28 +5166,28 @@ var g = &grammar{ }, { name: "MergeOp", - pos: position{line: 765, col: 1, offset: 19145}, + pos: position{line: 778, col: 1, offset: 19399}, expr: &actionExpr{ - pos: position{line: 766, col: 5, offset: 19157}, + pos: position{line: 779, col: 5, offset: 19411}, run: (*parser).callonMergeOp1, expr: &seqExpr{ - pos: position{line: 766, col: 5, offset: 19157}, + pos: position{line: 779, col: 5, offset: 19411}, exprs: []any{ &litMatcher{ - pos: position{line: 766, col: 5, offset: 19157}, + pos: position{line: 779, col: 5, offset: 19411}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &ruleRefExpr{ - pos: position{line: 766, col: 13, offset: 19165}, + pos: position{line: 779, col: 13, offset: 19419}, name: "_", }, &labeledExpr{ - pos: position{line: 766, col: 15, offset: 19167}, + pos: position{line: 779, col: 15, offset: 19421}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 766, col: 20, offset: 19172}, + pos: position{line: 779, col: 20, offset: 19426}, name: "Expr", }, }, @@ -5139,49 +5199,49 @@ var g = &grammar{ }, { name: "OverOp", - pos: position{line: 774, col: 1, offset: 19312}, + pos: position{line: 787, col: 1, offset: 19566}, expr: &actionExpr{ - pos: position{line: 775, col: 5, offset: 19323}, + pos: position{line: 788, col: 5, offset: 19577}, run: (*parser).callonOverOp1, expr: &seqExpr{ - pos: position{line: 775, col: 5, offset: 19323}, + pos: position{line: 788, col: 5, offset: 19577}, exprs: []any{ &litMatcher{ - pos: position{line: 775, col: 5, offset: 19323}, + pos: position{line: 788, col: 5, offset: 19577}, val: "over", ignoreCase: false, want: "\"over\"", }, &ruleRefExpr{ - pos: position{line: 775, col: 12, offset: 19330}, + pos: position{line: 788, col: 12, offset: 19584}, name: "_", }, &labeledExpr{ - pos: position{line: 775, col: 14, offset: 19332}, + pos: position{line: 788, col: 14, offset: 19586}, label: "exprs", expr: &ruleRefExpr{ - pos: position{line: 775, col: 20, offset: 19338}, + pos: position{line: 788, col: 20, offset: 19592}, name: "Exprs", }, }, &labeledExpr{ - pos: position{line: 775, col: 26, offset: 19344}, + pos: position{line: 788, col: 26, offset: 19598}, label: "locals", expr: &zeroOrOneExpr{ - pos: position{line: 775, col: 33, offset: 19351}, + pos: position{line: 788, col: 33, offset: 19605}, expr: &ruleRefExpr{ - pos: position{line: 775, col: 33, offset: 19351}, + pos: position{line: 788, col: 33, offset: 19605}, name: "Locals", }, }, }, &labeledExpr{ - pos: position{line: 775, col: 41, offset: 19359}, + pos: position{line: 788, col: 41, offset: 19613}, label: "body", expr: &zeroOrOneExpr{ - pos: position{line: 775, col: 46, offset: 19364}, + pos: position{line: 788, col: 46, offset: 19618}, expr: &ruleRefExpr{ - pos: position{line: 775, col: 46, offset: 19364}, + pos: position{line: 788, col: 46, offset: 19618}, name: "Lateral", }, }, @@ -5194,54 +5254,54 @@ var g = &grammar{ }, { name: "Lateral", - pos: position{line: 790, col: 1, offset: 19713}, + pos: position{line: 803, col: 1, offset: 19967}, expr: &choiceExpr{ - pos: position{line: 791, col: 5, offset: 19725}, + pos: position{line: 804, col: 5, offset: 19979}, alternatives: []any{ &actionExpr{ - pos: position{line: 791, col: 5, offset: 19725}, + pos: position{line: 804, col: 5, offset: 19979}, run: (*parser).callonLateral2, expr: &seqExpr{ - pos: position{line: 791, col: 5, offset: 19725}, + pos: position{line: 804, col: 5, offset: 19979}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 791, col: 5, offset: 19725}, + pos: position{line: 804, col: 5, offset: 19979}, name: "__", }, &litMatcher{ - pos: position{line: 791, col: 8, offset: 19728}, + pos: position{line: 804, col: 8, offset: 19982}, val: "=>", ignoreCase: false, want: "\"=>\"", }, &ruleRefExpr{ - pos: position{line: 791, col: 13, offset: 19733}, + pos: position{line: 804, col: 13, offset: 19987}, name: "__", }, &litMatcher{ - pos: position{line: 791, col: 16, offset: 19736}, + pos: position{line: 804, col: 16, offset: 19990}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 791, col: 20, offset: 19740}, + pos: position{line: 804, col: 20, offset: 19994}, name: "__", }, &labeledExpr{ - pos: position{line: 791, col: 23, offset: 19743}, + pos: position{line: 804, col: 23, offset: 19997}, label: "scope", expr: &ruleRefExpr{ - pos: position{line: 791, col: 29, offset: 19749}, + pos: position{line: 804, col: 29, offset: 20003}, name: "Scope", }, }, &ruleRefExpr{ - pos: position{line: 791, col: 35, offset: 19755}, + pos: position{line: 804, col: 35, offset: 20009}, name: "__", }, &litMatcher{ - pos: position{line: 791, col: 38, offset: 19758}, + pos: position{line: 804, col: 38, offset: 20012}, val: ")", ignoreCase: false, want: "\")\"", @@ -5250,49 +5310,49 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 794, col: 5, offset: 19842}, + pos: position{line: 807, col: 5, offset: 20096}, run: (*parser).callonLateral13, expr: &seqExpr{ - pos: position{line: 794, col: 5, offset: 19842}, + pos: position{line: 807, col: 5, offset: 20096}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 794, col: 5, offset: 19842}, + pos: position{line: 807, col: 5, offset: 20096}, name: "__", }, &litMatcher{ - pos: position{line: 794, col: 8, offset: 19845}, + pos: position{line: 807, col: 8, offset: 20099}, val: "=>", ignoreCase: false, want: "\"=>\"", }, &ruleRefExpr{ - pos: position{line: 794, col: 13, offset: 19850}, + pos: position{line: 807, col: 13, offset: 20104}, name: "__", }, &litMatcher{ - pos: position{line: 794, col: 16, offset: 19853}, + pos: position{line: 807, col: 16, offset: 20107}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 794, col: 20, offset: 19857}, + pos: position{line: 807, col: 20, offset: 20111}, name: "__", }, &labeledExpr{ - pos: position{line: 794, col: 23, offset: 19860}, + pos: position{line: 807, col: 23, offset: 20114}, label: "seq", expr: &ruleRefExpr{ - pos: position{line: 794, col: 27, offset: 19864}, + pos: position{line: 807, col: 27, offset: 20118}, name: "Seq", }, }, &ruleRefExpr{ - pos: position{line: 794, col: 31, offset: 19868}, + pos: position{line: 807, col: 31, offset: 20122}, name: "__", }, &litMatcher{ - pos: position{line: 794, col: 34, offset: 19871}, + pos: position{line: 807, col: 34, offset: 20125}, val: ")", ignoreCase: false, want: "\")\"", @@ -5307,65 +5367,65 @@ var g = &grammar{ }, { name: "Locals", - pos: position{line: 798, col: 1, offset: 19930}, + pos: position{line: 811, col: 1, offset: 20184}, expr: &actionExpr{ - pos: position{line: 799, col: 5, offset: 19941}, + pos: position{line: 812, col: 5, offset: 20195}, run: (*parser).callonLocals1, expr: &seqExpr{ - pos: position{line: 799, col: 5, offset: 19941}, + pos: position{line: 812, col: 5, offset: 20195}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 799, col: 5, offset: 19941}, + pos: position{line: 812, col: 5, offset: 20195}, name: "_", }, &litMatcher{ - pos: position{line: 799, col: 7, offset: 19943}, + pos: position{line: 812, col: 7, offset: 20197}, val: "with", ignoreCase: false, want: "\"with\"", }, &ruleRefExpr{ - pos: position{line: 799, col: 14, offset: 19950}, + pos: position{line: 812, col: 14, offset: 20204}, name: "_", }, &labeledExpr{ - pos: position{line: 799, col: 16, offset: 19952}, + pos: position{line: 812, col: 16, offset: 20206}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 799, col: 22, offset: 19958}, + pos: position{line: 812, col: 22, offset: 20212}, name: "LocalsAssignment", }, }, &labeledExpr{ - pos: position{line: 799, col: 39, offset: 19975}, + pos: position{line: 812, col: 39, offset: 20229}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 799, col: 44, offset: 19980}, + pos: position{line: 812, col: 44, offset: 20234}, expr: &actionExpr{ - pos: position{line: 799, col: 45, offset: 19981}, + pos: position{line: 812, col: 45, offset: 20235}, run: (*parser).callonLocals10, expr: &seqExpr{ - pos: position{line: 799, col: 45, offset: 19981}, + pos: position{line: 812, col: 45, offset: 20235}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 799, col: 45, offset: 19981}, + pos: position{line: 812, col: 45, offset: 20235}, name: "__", }, &litMatcher{ - pos: position{line: 799, col: 48, offset: 19984}, + pos: position{line: 812, col: 48, offset: 20238}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 799, col: 52, offset: 19988}, + pos: position{line: 812, col: 52, offset: 20242}, name: "__", }, &labeledExpr{ - pos: position{line: 799, col: 55, offset: 19991}, + pos: position{line: 812, col: 55, offset: 20245}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 799, col: 57, offset: 19993}, + pos: position{line: 812, col: 57, offset: 20247}, name: "LocalsAssignment", }, }, @@ -5382,45 +5442,45 @@ var g = &grammar{ }, { name: "LocalsAssignment", - pos: position{line: 803, col: 1, offset: 20078}, + pos: position{line: 816, col: 1, offset: 20332}, expr: &actionExpr{ - pos: position{line: 804, col: 5, offset: 20099}, + pos: position{line: 817, col: 5, offset: 20353}, run: (*parser).callonLocalsAssignment1, expr: &seqExpr{ - pos: position{line: 804, col: 5, offset: 20099}, + pos: position{line: 817, col: 5, offset: 20353}, exprs: []any{ &labeledExpr{ - pos: position{line: 804, col: 5, offset: 20099}, + pos: position{line: 817, col: 5, offset: 20353}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 804, col: 10, offset: 20104}, + pos: position{line: 817, col: 10, offset: 20358}, name: "Identifier", }, }, &labeledExpr{ - pos: position{line: 804, col: 21, offset: 20115}, + pos: position{line: 817, col: 21, offset: 20369}, label: "opt", expr: &zeroOrOneExpr{ - pos: position{line: 804, col: 25, offset: 20119}, + pos: position{line: 817, col: 25, offset: 20373}, expr: &seqExpr{ - pos: position{line: 804, col: 26, offset: 20120}, + pos: position{line: 817, col: 26, offset: 20374}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 804, col: 26, offset: 20120}, + pos: position{line: 817, col: 26, offset: 20374}, name: "__", }, &litMatcher{ - pos: position{line: 804, col: 29, offset: 20123}, + pos: position{line: 817, col: 29, offset: 20377}, val: "=", ignoreCase: false, want: "\"=\"", }, &ruleRefExpr{ - pos: position{line: 804, col: 33, offset: 20127}, + pos: position{line: 817, col: 33, offset: 20381}, name: "__", }, &ruleRefExpr{ - pos: position{line: 804, col: 36, offset: 20130}, + pos: position{line: 817, col: 36, offset: 20384}, name: "Expr", }, }, @@ -5435,28 +5495,28 @@ var g = &grammar{ }, { name: "YieldOp", - pos: position{line: 815, col: 1, offset: 20333}, + pos: position{line: 828, col: 1, offset: 20587}, expr: &actionExpr{ - pos: position{line: 816, col: 5, offset: 20345}, + pos: position{line: 829, col: 5, offset: 20599}, run: (*parser).callonYieldOp1, expr: &seqExpr{ - pos: position{line: 816, col: 5, offset: 20345}, + pos: position{line: 829, col: 5, offset: 20599}, exprs: []any{ &litMatcher{ - pos: position{line: 816, col: 5, offset: 20345}, + pos: position{line: 829, col: 5, offset: 20599}, val: "yield", ignoreCase: false, want: "\"yield\"", }, &ruleRefExpr{ - pos: position{line: 816, col: 13, offset: 20353}, + pos: position{line: 829, col: 13, offset: 20607}, name: "_", }, &labeledExpr{ - pos: position{line: 816, col: 15, offset: 20355}, + pos: position{line: 829, col: 15, offset: 20609}, label: "exprs", expr: &ruleRefExpr{ - pos: position{line: 816, col: 21, offset: 20361}, + pos: position{line: 829, col: 21, offset: 20615}, name: "Exprs", }, }, @@ -5468,32 +5528,32 @@ var g = &grammar{ }, { name: "TypeArg", - pos: position{line: 824, col: 1, offset: 20518}, + pos: position{line: 837, col: 1, offset: 20772}, expr: &actionExpr{ - pos: position{line: 825, col: 5, offset: 20530}, + pos: position{line: 838, col: 5, offset: 20784}, run: (*parser).callonTypeArg1, expr: &seqExpr{ - pos: position{line: 825, col: 5, offset: 20530}, + pos: position{line: 838, col: 5, offset: 20784}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 825, col: 5, offset: 20530}, + pos: position{line: 838, col: 5, offset: 20784}, name: "_", }, &litMatcher{ - pos: position{line: 825, col: 7, offset: 20532}, + pos: position{line: 838, col: 7, offset: 20786}, val: "by", ignoreCase: false, want: "\"by\"", }, &ruleRefExpr{ - pos: position{line: 825, col: 12, offset: 20537}, + pos: position{line: 838, col: 12, offset: 20791}, name: "_", }, &labeledExpr{ - pos: position{line: 825, col: 14, offset: 20539}, + pos: position{line: 838, col: 14, offset: 20793}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 825, col: 18, offset: 20543}, + pos: position{line: 838, col: 18, offset: 20797}, name: "Type", }, }, @@ -5505,32 +5565,32 @@ var g = &grammar{ }, { name: "AsArg", - pos: position{line: 827, col: 1, offset: 20569}, + pos: position{line: 840, col: 1, offset: 20823}, expr: &actionExpr{ - pos: position{line: 828, col: 5, offset: 20579}, + pos: position{line: 841, col: 5, offset: 20833}, run: (*parser).callonAsArg1, expr: &seqExpr{ - pos: position{line: 828, col: 5, offset: 20579}, + pos: position{line: 841, col: 5, offset: 20833}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 828, col: 5, offset: 20579}, + pos: position{line: 841, col: 5, offset: 20833}, name: "_", }, &litMatcher{ - pos: position{line: 828, col: 7, offset: 20581}, + pos: position{line: 841, col: 7, offset: 20835}, val: "as", ignoreCase: false, want: "\"as\"", }, &ruleRefExpr{ - pos: position{line: 828, col: 12, offset: 20586}, + pos: position{line: 841, col: 12, offset: 20840}, name: "_", }, &labeledExpr{ - pos: position{line: 828, col: 14, offset: 20588}, + pos: position{line: 841, col: 14, offset: 20842}, label: "lhs", expr: &ruleRefExpr{ - pos: position{line: 828, col: 18, offset: 20592}, + pos: position{line: 841, col: 18, offset: 20846}, name: "Lval", }, }, @@ -5542,9 +5602,9 @@ var g = &grammar{ }, { name: "Lval", - pos: position{line: 832, col: 1, offset: 20643}, + pos: position{line: 845, col: 1, offset: 20897}, expr: &ruleRefExpr{ - pos: position{line: 832, col: 8, offset: 20650}, + pos: position{line: 845, col: 8, offset: 20904}, name: "DerefExpr", }, leader: false, @@ -5552,51 +5612,51 @@ var g = &grammar{ }, { name: "Lvals", - pos: position{line: 834, col: 1, offset: 20661}, + pos: position{line: 847, col: 1, offset: 20915}, expr: &actionExpr{ - pos: position{line: 835, col: 5, offset: 20671}, + pos: position{line: 848, col: 5, offset: 20925}, run: (*parser).callonLvals1, expr: &seqExpr{ - pos: position{line: 835, col: 5, offset: 20671}, + pos: position{line: 848, col: 5, offset: 20925}, exprs: []any{ &labeledExpr{ - pos: position{line: 835, col: 5, offset: 20671}, + pos: position{line: 848, col: 5, offset: 20925}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 835, col: 11, offset: 20677}, + pos: position{line: 848, col: 11, offset: 20931}, name: "Lval", }, }, &labeledExpr{ - pos: position{line: 835, col: 16, offset: 20682}, + pos: position{line: 848, col: 16, offset: 20936}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 835, col: 21, offset: 20687}, + pos: position{line: 848, col: 21, offset: 20941}, expr: &actionExpr{ - pos: position{line: 835, col: 22, offset: 20688}, + pos: position{line: 848, col: 22, offset: 20942}, run: (*parser).callonLvals7, expr: &seqExpr{ - pos: position{line: 835, col: 22, offset: 20688}, + pos: position{line: 848, col: 22, offset: 20942}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 835, col: 22, offset: 20688}, + pos: position{line: 848, col: 22, offset: 20942}, name: "__", }, &litMatcher{ - pos: position{line: 835, col: 25, offset: 20691}, + pos: position{line: 848, col: 25, offset: 20945}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 835, col: 29, offset: 20695}, + pos: position{line: 848, col: 29, offset: 20949}, name: "__", }, &labeledExpr{ - pos: position{line: 835, col: 32, offset: 20698}, + pos: position{line: 848, col: 32, offset: 20952}, label: "lval", expr: &ruleRefExpr{ - pos: position{line: 835, col: 37, offset: 20703}, + pos: position{line: 848, col: 37, offset: 20957}, name: "Lval", }, }, @@ -5613,9 +5673,9 @@ var g = &grammar{ }, { name: "FieldExpr", - pos: position{line: 839, col: 1, offset: 20779}, + pos: position{line: 852, col: 1, offset: 21033}, expr: &ruleRefExpr{ - pos: position{line: 839, col: 13, offset: 20791}, + pos: position{line: 852, col: 13, offset: 21045}, name: "Lval", }, leader: false, @@ -5623,51 +5683,51 @@ var g = &grammar{ }, { name: "FieldExprs", - pos: position{line: 841, col: 1, offset: 20797}, + pos: position{line: 854, col: 1, offset: 21051}, expr: &actionExpr{ - pos: position{line: 842, col: 5, offset: 20812}, + pos: position{line: 855, col: 5, offset: 21066}, run: (*parser).callonFieldExprs1, expr: &seqExpr{ - pos: position{line: 842, col: 5, offset: 20812}, + pos: position{line: 855, col: 5, offset: 21066}, exprs: []any{ &labeledExpr{ - pos: position{line: 842, col: 5, offset: 20812}, + pos: position{line: 855, col: 5, offset: 21066}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 842, col: 11, offset: 20818}, + pos: position{line: 855, col: 11, offset: 21072}, name: "FieldExpr", }, }, &labeledExpr{ - pos: position{line: 842, col: 21, offset: 20828}, + pos: position{line: 855, col: 21, offset: 21082}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 842, col: 26, offset: 20833}, + pos: position{line: 855, col: 26, offset: 21087}, expr: &actionExpr{ - pos: position{line: 842, col: 27, offset: 20834}, + pos: position{line: 855, col: 27, offset: 21088}, run: (*parser).callonFieldExprs7, expr: &seqExpr{ - pos: position{line: 842, col: 27, offset: 20834}, + pos: position{line: 855, col: 27, offset: 21088}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 842, col: 27, offset: 20834}, + pos: position{line: 855, col: 27, offset: 21088}, name: "__", }, &litMatcher{ - pos: position{line: 842, col: 30, offset: 20837}, + pos: position{line: 855, col: 30, offset: 21091}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 842, col: 34, offset: 20841}, + pos: position{line: 855, col: 34, offset: 21095}, name: "__", }, &labeledExpr{ - pos: position{line: 842, col: 37, offset: 20844}, + pos: position{line: 855, col: 37, offset: 21098}, label: "f", expr: &ruleRefExpr{ - pos: position{line: 842, col: 39, offset: 20846}, + pos: position{line: 855, col: 39, offset: 21100}, name: "FieldExpr", }, }, @@ -5684,51 +5744,51 @@ var g = &grammar{ }, { name: "Assignments", - pos: position{line: 846, col: 1, offset: 20923}, + pos: position{line: 859, col: 1, offset: 21177}, expr: &actionExpr{ - pos: position{line: 847, col: 5, offset: 20939}, + pos: position{line: 860, col: 5, offset: 21193}, run: (*parser).callonAssignments1, expr: &seqExpr{ - pos: position{line: 847, col: 5, offset: 20939}, + pos: position{line: 860, col: 5, offset: 21193}, exprs: []any{ &labeledExpr{ - pos: position{line: 847, col: 5, offset: 20939}, + pos: position{line: 860, col: 5, offset: 21193}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 847, col: 11, offset: 20945}, + pos: position{line: 860, col: 11, offset: 21199}, name: "Assignment", }, }, &labeledExpr{ - pos: position{line: 847, col: 22, offset: 20956}, + pos: position{line: 860, col: 22, offset: 21210}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 847, col: 27, offset: 20961}, + pos: position{line: 860, col: 27, offset: 21215}, expr: &actionExpr{ - pos: position{line: 847, col: 28, offset: 20962}, + pos: position{line: 860, col: 28, offset: 21216}, run: (*parser).callonAssignments7, expr: &seqExpr{ - pos: position{line: 847, col: 28, offset: 20962}, + pos: position{line: 860, col: 28, offset: 21216}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 847, col: 28, offset: 20962}, + pos: position{line: 860, col: 28, offset: 21216}, name: "__", }, &litMatcher{ - pos: position{line: 847, col: 31, offset: 20965}, + pos: position{line: 860, col: 31, offset: 21219}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 847, col: 35, offset: 20969}, + pos: position{line: 860, col: 35, offset: 21223}, name: "__", }, &labeledExpr{ - pos: position{line: 847, col: 38, offset: 20972}, + pos: position{line: 860, col: 38, offset: 21226}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 847, col: 40, offset: 20974}, + pos: position{line: 860, col: 40, offset: 21228}, name: "Assignment", }, }, @@ -5745,40 +5805,40 @@ var g = &grammar{ }, { name: "Assignment", - pos: position{line: 851, col: 1, offset: 21049}, + pos: position{line: 864, col: 1, offset: 21303}, expr: &actionExpr{ - pos: position{line: 852, col: 5, offset: 21064}, + pos: position{line: 865, col: 5, offset: 21318}, run: (*parser).callonAssignment1, expr: &seqExpr{ - pos: position{line: 852, col: 5, offset: 21064}, + pos: position{line: 865, col: 5, offset: 21318}, exprs: []any{ &labeledExpr{ - pos: position{line: 852, col: 5, offset: 21064}, + pos: position{line: 865, col: 5, offset: 21318}, label: "lhs", expr: &ruleRefExpr{ - pos: position{line: 852, col: 9, offset: 21068}, + pos: position{line: 865, col: 9, offset: 21322}, name: "Lval", }, }, &ruleRefExpr{ - pos: position{line: 852, col: 14, offset: 21073}, + pos: position{line: 865, col: 14, offset: 21327}, name: "__", }, &litMatcher{ - pos: position{line: 852, col: 17, offset: 21076}, + pos: position{line: 865, col: 17, offset: 21330}, val: ":=", ignoreCase: false, want: "\":=\"", }, &ruleRefExpr{ - pos: position{line: 852, col: 22, offset: 21081}, + pos: position{line: 865, col: 22, offset: 21335}, name: "__", }, &labeledExpr{ - pos: position{line: 852, col: 25, offset: 21084}, + pos: position{line: 865, col: 25, offset: 21338}, label: "rhs", expr: &ruleRefExpr{ - pos: position{line: 852, col: 29, offset: 21088}, + pos: position{line: 865, col: 29, offset: 21342}, name: "Expr", }, }, @@ -5790,9 +5850,9 @@ var g = &grammar{ }, { name: "Expr", - pos: position{line: 860, col: 1, offset: 21236}, + pos: position{line: 873, col: 1, offset: 21490}, expr: &ruleRefExpr{ - pos: position{line: 860, col: 8, offset: 21243}, + pos: position{line: 873, col: 8, offset: 21497}, name: "ConditionalExpr", }, leader: false, @@ -5800,63 +5860,63 @@ var g = &grammar{ }, { name: "ConditionalExpr", - pos: position{line: 862, col: 1, offset: 21260}, + pos: position{line: 875, col: 1, offset: 21514}, expr: &actionExpr{ - pos: position{line: 863, col: 5, offset: 21280}, + pos: position{line: 876, col: 5, offset: 21534}, run: (*parser).callonConditionalExpr1, expr: &seqExpr{ - pos: position{line: 863, col: 5, offset: 21280}, + pos: position{line: 876, col: 5, offset: 21534}, exprs: []any{ &labeledExpr{ - pos: position{line: 863, col: 5, offset: 21280}, + pos: position{line: 876, col: 5, offset: 21534}, label: "cond", expr: &ruleRefExpr{ - pos: position{line: 863, col: 10, offset: 21285}, + pos: position{line: 876, col: 10, offset: 21539}, name: "LogicalOrExpr", }, }, &labeledExpr{ - pos: position{line: 863, col: 24, offset: 21299}, + pos: position{line: 876, col: 24, offset: 21553}, label: "opt", expr: &zeroOrOneExpr{ - pos: position{line: 863, col: 28, offset: 21303}, + pos: position{line: 876, col: 28, offset: 21557}, expr: &seqExpr{ - pos: position{line: 863, col: 29, offset: 21304}, + pos: position{line: 876, col: 29, offset: 21558}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 863, col: 29, offset: 21304}, + pos: position{line: 876, col: 29, offset: 21558}, name: "__", }, &litMatcher{ - pos: position{line: 863, col: 32, offset: 21307}, + pos: position{line: 876, col: 32, offset: 21561}, val: "?", ignoreCase: false, want: "\"?\"", }, &ruleRefExpr{ - pos: position{line: 863, col: 36, offset: 21311}, + pos: position{line: 876, col: 36, offset: 21565}, name: "__", }, &ruleRefExpr{ - pos: position{line: 863, col: 39, offset: 21314}, + pos: position{line: 876, col: 39, offset: 21568}, name: "Expr", }, &ruleRefExpr{ - pos: position{line: 863, col: 44, offset: 21319}, + pos: position{line: 876, col: 44, offset: 21573}, name: "__", }, &litMatcher{ - pos: position{line: 863, col: 47, offset: 21322}, + pos: position{line: 876, col: 47, offset: 21576}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 863, col: 51, offset: 21326}, + pos: position{line: 876, col: 51, offset: 21580}, name: "__", }, &ruleRefExpr{ - pos: position{line: 863, col: 54, offset: 21329}, + pos: position{line: 876, col: 54, offset: 21583}, name: "Expr", }, }, @@ -5871,53 +5931,53 @@ var g = &grammar{ }, { name: "LogicalOrExpr", - pos: position{line: 876, col: 1, offset: 21625}, + pos: position{line: 889, col: 1, offset: 21879}, expr: &actionExpr{ - pos: position{line: 877, col: 5, offset: 21643}, + pos: position{line: 890, col: 5, offset: 21897}, run: (*parser).callonLogicalOrExpr1, expr: &seqExpr{ - pos: position{line: 877, col: 5, offset: 21643}, + pos: position{line: 890, col: 5, offset: 21897}, exprs: []any{ &labeledExpr{ - pos: position{line: 877, col: 5, offset: 21643}, + pos: position{line: 890, col: 5, offset: 21897}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 877, col: 11, offset: 21649}, + pos: position{line: 890, col: 11, offset: 21903}, name: "LogicalAndExpr", }, }, &labeledExpr{ - pos: position{line: 878, col: 5, offset: 21668}, + pos: position{line: 891, col: 5, offset: 21922}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 878, col: 10, offset: 21673}, + pos: position{line: 891, col: 10, offset: 21927}, expr: &actionExpr{ - pos: position{line: 878, col: 11, offset: 21674}, + pos: position{line: 891, col: 11, offset: 21928}, run: (*parser).callonLogicalOrExpr7, expr: &seqExpr{ - pos: position{line: 878, col: 11, offset: 21674}, + pos: position{line: 891, col: 11, offset: 21928}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 878, col: 11, offset: 21674}, + pos: position{line: 891, col: 11, offset: 21928}, name: "__", }, &labeledExpr{ - pos: position{line: 878, col: 14, offset: 21677}, + pos: position{line: 891, col: 14, offset: 21931}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 878, col: 17, offset: 21680}, + pos: position{line: 891, col: 17, offset: 21934}, name: "OrToken", }, }, &ruleRefExpr{ - pos: position{line: 878, col: 25, offset: 21688}, + pos: position{line: 891, col: 25, offset: 21942}, name: "__", }, &labeledExpr{ - pos: position{line: 878, col: 28, offset: 21691}, + pos: position{line: 891, col: 28, offset: 21945}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 878, col: 33, offset: 21696}, + pos: position{line: 891, col: 33, offset: 21950}, name: "LogicalAndExpr", }, }, @@ -5934,53 +5994,53 @@ var g = &grammar{ }, { name: "LogicalAndExpr", - pos: position{line: 882, col: 1, offset: 21807}, + pos: position{line: 895, col: 1, offset: 22061}, expr: &actionExpr{ - pos: position{line: 883, col: 5, offset: 21826}, + pos: position{line: 896, col: 5, offset: 22080}, run: (*parser).callonLogicalAndExpr1, expr: &seqExpr{ - pos: position{line: 883, col: 5, offset: 21826}, + pos: position{line: 896, col: 5, offset: 22080}, exprs: []any{ &labeledExpr{ - pos: position{line: 883, col: 5, offset: 21826}, + pos: position{line: 896, col: 5, offset: 22080}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 883, col: 11, offset: 21832}, + pos: position{line: 896, col: 11, offset: 22086}, name: "ComparisonExpr", }, }, &labeledExpr{ - pos: position{line: 884, col: 5, offset: 21851}, + pos: position{line: 897, col: 5, offset: 22105}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 884, col: 10, offset: 21856}, + pos: position{line: 897, col: 10, offset: 22110}, expr: &actionExpr{ - pos: position{line: 884, col: 11, offset: 21857}, + pos: position{line: 897, col: 11, offset: 22111}, run: (*parser).callonLogicalAndExpr7, expr: &seqExpr{ - pos: position{line: 884, col: 11, offset: 21857}, + pos: position{line: 897, col: 11, offset: 22111}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 884, col: 11, offset: 21857}, + pos: position{line: 897, col: 11, offset: 22111}, name: "__", }, &labeledExpr{ - pos: position{line: 884, col: 14, offset: 21860}, + pos: position{line: 897, col: 14, offset: 22114}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 884, col: 17, offset: 21863}, + pos: position{line: 897, col: 17, offset: 22117}, name: "AndToken", }, }, &ruleRefExpr{ - pos: position{line: 884, col: 26, offset: 21872}, + pos: position{line: 897, col: 26, offset: 22126}, name: "__", }, &labeledExpr{ - pos: position{line: 884, col: 29, offset: 21875}, + pos: position{line: 897, col: 29, offset: 22129}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 884, col: 34, offset: 21880}, + pos: position{line: 897, col: 34, offset: 22134}, name: "ComparisonExpr", }, }, @@ -5997,73 +6057,73 @@ var g = &grammar{ }, { name: "ComparisonExpr", - pos: position{line: 888, col: 1, offset: 21991}, + pos: position{line: 901, col: 1, offset: 22245}, expr: &actionExpr{ - pos: position{line: 889, col: 5, offset: 22010}, + pos: position{line: 902, col: 5, offset: 22264}, run: (*parser).callonComparisonExpr1, expr: &seqExpr{ - pos: position{line: 889, col: 5, offset: 22010}, + pos: position{line: 902, col: 5, offset: 22264}, exprs: []any{ &labeledExpr{ - pos: position{line: 889, col: 5, offset: 22010}, + pos: position{line: 902, col: 5, offset: 22264}, label: "lhs", expr: &ruleRefExpr{ - pos: position{line: 889, col: 9, offset: 22014}, + pos: position{line: 902, col: 9, offset: 22268}, name: "AdditiveExpr", }, }, &labeledExpr{ - pos: position{line: 889, col: 22, offset: 22027}, + pos: position{line: 902, col: 22, offset: 22281}, label: "opAndRHS", expr: &zeroOrOneExpr{ - pos: position{line: 889, col: 31, offset: 22036}, + pos: position{line: 902, col: 31, offset: 22290}, expr: &choiceExpr{ - pos: position{line: 889, col: 32, offset: 22037}, + pos: position{line: 902, col: 32, offset: 22291}, alternatives: []any{ &seqExpr{ - pos: position{line: 889, col: 32, offset: 22037}, + pos: position{line: 902, col: 32, offset: 22291}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 889, col: 32, offset: 22037}, + pos: position{line: 902, col: 32, offset: 22291}, name: "__", }, &ruleRefExpr{ - pos: position{line: 889, col: 35, offset: 22040}, + pos: position{line: 902, col: 35, offset: 22294}, name: "Comparator", }, &ruleRefExpr{ - pos: position{line: 889, col: 46, offset: 22051}, + pos: position{line: 902, col: 46, offset: 22305}, name: "__", }, &ruleRefExpr{ - pos: position{line: 889, col: 49, offset: 22054}, + pos: position{line: 902, col: 49, offset: 22308}, name: "AdditiveExpr", }, }, }, &seqExpr{ - pos: position{line: 889, col: 64, offset: 22069}, + pos: position{line: 902, col: 64, offset: 22323}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 889, col: 64, offset: 22069}, + pos: position{line: 902, col: 64, offset: 22323}, name: "__", }, &actionExpr{ - pos: position{line: 889, col: 68, offset: 22073}, + pos: position{line: 902, col: 68, offset: 22327}, run: (*parser).callonComparisonExpr15, expr: &litMatcher{ - pos: position{line: 889, col: 68, offset: 22073}, + pos: position{line: 902, col: 68, offset: 22327}, val: "~", ignoreCase: false, want: "\"~\"", }, }, &ruleRefExpr{ - pos: position{line: 889, col: 104, offset: 22109}, + pos: position{line: 902, col: 104, offset: 22363}, name: "__", }, &ruleRefExpr{ - pos: position{line: 889, col: 107, offset: 22112}, + pos: position{line: 902, col: 107, offset: 22366}, name: "Regexp", }, }, @@ -6080,53 +6140,53 @@ var g = &grammar{ }, { name: "AdditiveExpr", - pos: position{line: 901, col: 1, offset: 22376}, + pos: position{line: 914, col: 1, offset: 22630}, expr: &actionExpr{ - pos: position{line: 902, col: 5, offset: 22393}, + pos: position{line: 915, col: 5, offset: 22647}, run: (*parser).callonAdditiveExpr1, expr: &seqExpr{ - pos: position{line: 902, col: 5, offset: 22393}, + pos: position{line: 915, col: 5, offset: 22647}, exprs: []any{ &labeledExpr{ - pos: position{line: 902, col: 5, offset: 22393}, + pos: position{line: 915, col: 5, offset: 22647}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 902, col: 11, offset: 22399}, + pos: position{line: 915, col: 11, offset: 22653}, name: "MultiplicativeExpr", }, }, &labeledExpr{ - pos: position{line: 903, col: 5, offset: 22422}, + pos: position{line: 916, col: 5, offset: 22676}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 903, col: 10, offset: 22427}, + pos: position{line: 916, col: 10, offset: 22681}, expr: &actionExpr{ - pos: position{line: 903, col: 11, offset: 22428}, + pos: position{line: 916, col: 11, offset: 22682}, run: (*parser).callonAdditiveExpr7, expr: &seqExpr{ - pos: position{line: 903, col: 11, offset: 22428}, + pos: position{line: 916, col: 11, offset: 22682}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 903, col: 11, offset: 22428}, + pos: position{line: 916, col: 11, offset: 22682}, name: "__", }, &labeledExpr{ - pos: position{line: 903, col: 14, offset: 22431}, + pos: position{line: 916, col: 14, offset: 22685}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 903, col: 17, offset: 22434}, + pos: position{line: 916, col: 17, offset: 22688}, name: "AdditiveOperator", }, }, &ruleRefExpr{ - pos: position{line: 903, col: 34, offset: 22451}, + pos: position{line: 916, col: 34, offset: 22705}, name: "__", }, &labeledExpr{ - pos: position{line: 903, col: 37, offset: 22454}, + pos: position{line: 916, col: 37, offset: 22708}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 903, col: 42, offset: 22459}, + pos: position{line: 916, col: 42, offset: 22713}, name: "MultiplicativeExpr", }, }, @@ -6143,21 +6203,21 @@ var g = &grammar{ }, { name: "AdditiveOperator", - pos: position{line: 907, col: 1, offset: 22574}, + pos: position{line: 920, col: 1, offset: 22828}, expr: &actionExpr{ - pos: position{line: 907, col: 20, offset: 22593}, + pos: position{line: 920, col: 20, offset: 22847}, run: (*parser).callonAdditiveOperator1, expr: &choiceExpr{ - pos: position{line: 907, col: 21, offset: 22594}, + pos: position{line: 920, col: 21, offset: 22848}, alternatives: []any{ &litMatcher{ - pos: position{line: 907, col: 21, offset: 22594}, + pos: position{line: 920, col: 21, offset: 22848}, val: "+", ignoreCase: false, want: "\"+\"", }, &litMatcher{ - pos: position{line: 907, col: 27, offset: 22600}, + pos: position{line: 920, col: 27, offset: 22854}, val: "-", ignoreCase: false, want: "\"-\"", @@ -6170,53 +6230,53 @@ var g = &grammar{ }, { name: "MultiplicativeExpr", - pos: position{line: 909, col: 1, offset: 22637}, + pos: position{line: 922, col: 1, offset: 22891}, expr: &actionExpr{ - pos: position{line: 910, col: 5, offset: 22660}, + pos: position{line: 923, col: 5, offset: 22914}, run: (*parser).callonMultiplicativeExpr1, expr: &seqExpr{ - pos: position{line: 910, col: 5, offset: 22660}, + pos: position{line: 923, col: 5, offset: 22914}, exprs: []any{ &labeledExpr{ - pos: position{line: 910, col: 5, offset: 22660}, + pos: position{line: 923, col: 5, offset: 22914}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 910, col: 11, offset: 22666}, + pos: position{line: 923, col: 11, offset: 22920}, name: "NotExpr", }, }, &labeledExpr{ - pos: position{line: 911, col: 5, offset: 22678}, + pos: position{line: 924, col: 5, offset: 22932}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 911, col: 10, offset: 22683}, + pos: position{line: 924, col: 10, offset: 22937}, expr: &actionExpr{ - pos: position{line: 911, col: 11, offset: 22684}, + pos: position{line: 924, col: 11, offset: 22938}, run: (*parser).callonMultiplicativeExpr7, expr: &seqExpr{ - pos: position{line: 911, col: 11, offset: 22684}, + pos: position{line: 924, col: 11, offset: 22938}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 911, col: 11, offset: 22684}, + pos: position{line: 924, col: 11, offset: 22938}, name: "__", }, &labeledExpr{ - pos: position{line: 911, col: 14, offset: 22687}, + pos: position{line: 924, col: 14, offset: 22941}, label: "op", expr: &ruleRefExpr{ - pos: position{line: 911, col: 17, offset: 22690}, + pos: position{line: 924, col: 17, offset: 22944}, name: "MultiplicativeOperator", }, }, &ruleRefExpr{ - pos: position{line: 911, col: 40, offset: 22713}, + pos: position{line: 924, col: 40, offset: 22967}, name: "__", }, &labeledExpr{ - pos: position{line: 911, col: 43, offset: 22716}, + pos: position{line: 924, col: 43, offset: 22970}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 911, col: 48, offset: 22721}, + pos: position{line: 924, col: 48, offset: 22975}, name: "NotExpr", }, }, @@ -6233,27 +6293,27 @@ var g = &grammar{ }, { name: "MultiplicativeOperator", - pos: position{line: 915, col: 1, offset: 22825}, + pos: position{line: 928, col: 1, offset: 23079}, expr: &actionExpr{ - pos: position{line: 915, col: 26, offset: 22850}, + pos: position{line: 928, col: 26, offset: 23104}, run: (*parser).callonMultiplicativeOperator1, expr: &choiceExpr{ - pos: position{line: 915, col: 27, offset: 22851}, + pos: position{line: 928, col: 27, offset: 23105}, alternatives: []any{ &litMatcher{ - pos: position{line: 915, col: 27, offset: 22851}, + pos: position{line: 928, col: 27, offset: 23105}, val: "*", ignoreCase: false, want: "\"*\"", }, &litMatcher{ - pos: position{line: 915, col: 33, offset: 22857}, + pos: position{line: 928, col: 33, offset: 23111}, val: "/", ignoreCase: false, want: "\"/\"", }, &litMatcher{ - pos: position{line: 915, col: 39, offset: 22863}, + pos: position{line: 928, col: 39, offset: 23117}, val: "%", ignoreCase: false, want: "\"%\"", @@ -6266,43 +6326,43 @@ var g = &grammar{ }, { name: "NotExpr", - pos: position{line: 917, col: 1, offset: 22900}, + pos: position{line: 930, col: 1, offset: 23154}, expr: &choiceExpr{ - pos: position{line: 918, col: 5, offset: 22912}, + pos: position{line: 931, col: 5, offset: 23166}, alternatives: []any{ &actionExpr{ - pos: position{line: 918, col: 5, offset: 22912}, + pos: position{line: 931, col: 5, offset: 23166}, run: (*parser).callonNotExpr2, expr: &seqExpr{ - pos: position{line: 918, col: 5, offset: 22912}, + pos: position{line: 931, col: 5, offset: 23166}, exprs: []any{ &choiceExpr{ - pos: position{line: 918, col: 6, offset: 22913}, + pos: position{line: 931, col: 6, offset: 23167}, alternatives: []any{ &seqExpr{ - pos: position{line: 918, col: 6, offset: 22913}, + pos: position{line: 931, col: 6, offset: 23167}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 918, col: 6, offset: 22913}, + pos: position{line: 931, col: 6, offset: 23167}, name: "NotToken", }, &ruleRefExpr{ - pos: position{line: 918, col: 15, offset: 22922}, + pos: position{line: 931, col: 15, offset: 23176}, name: "_", }, }, }, &seqExpr{ - pos: position{line: 918, col: 19, offset: 22926}, + pos: position{line: 931, col: 19, offset: 23180}, exprs: []any{ &litMatcher{ - pos: position{line: 918, col: 19, offset: 22926}, + pos: position{line: 931, col: 19, offset: 23180}, val: "!", ignoreCase: false, want: "\"!\"", }, &ruleRefExpr{ - pos: position{line: 918, col: 23, offset: 22930}, + pos: position{line: 931, col: 23, offset: 23184}, name: "__", }, }, @@ -6310,10 +6370,10 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 918, col: 27, offset: 22934}, + pos: position{line: 931, col: 27, offset: 23188}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 918, col: 29, offset: 22936}, + pos: position{line: 931, col: 29, offset: 23190}, name: "NotExpr", }, }, @@ -6321,7 +6381,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 926, col: 5, offset: 23110}, + pos: position{line: 939, col: 5, offset: 23364}, name: "NegationExpr", }, }, @@ -6331,38 +6391,38 @@ var g = &grammar{ }, { name: "NegationExpr", - pos: position{line: 928, col: 1, offset: 23124}, + pos: position{line: 941, col: 1, offset: 23378}, expr: &choiceExpr{ - pos: position{line: 929, col: 5, offset: 23141}, + pos: position{line: 942, col: 5, offset: 23395}, alternatives: []any{ &actionExpr{ - pos: position{line: 929, col: 5, offset: 23141}, + pos: position{line: 942, col: 5, offset: 23395}, run: (*parser).callonNegationExpr2, expr: &seqExpr{ - pos: position{line: 929, col: 5, offset: 23141}, + pos: position{line: 942, col: 5, offset: 23395}, exprs: []any{ ¬Expr{ - pos: position{line: 929, col: 5, offset: 23141}, + pos: position{line: 942, col: 5, offset: 23395}, expr: &ruleRefExpr{ - pos: position{line: 929, col: 6, offset: 23142}, + pos: position{line: 942, col: 6, offset: 23396}, name: "Literal", }, }, &litMatcher{ - pos: position{line: 929, col: 14, offset: 23150}, + pos: position{line: 942, col: 14, offset: 23404}, val: "-", ignoreCase: false, want: "\"-\"", }, &ruleRefExpr{ - pos: position{line: 929, col: 18, offset: 23154}, + pos: position{line: 942, col: 18, offset: 23408}, name: "__", }, &labeledExpr{ - pos: position{line: 929, col: 21, offset: 23157}, + pos: position{line: 942, col: 21, offset: 23411}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 929, col: 23, offset: 23159}, + pos: position{line: 942, col: 23, offset: 23413}, name: "DerefExpr", }, }, @@ -6370,7 +6430,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 937, col: 5, offset: 23335}, + pos: position{line: 950, col: 5, offset: 23589}, name: "DerefExpr", }, }, @@ -6380,65 +6440,65 @@ var g = &grammar{ }, { name: "DerefExpr", - pos: position{line: 939, col: 1, offset: 23346}, + pos: position{line: 952, col: 1, offset: 23600}, expr: &choiceExpr{ - pos: position{line: 940, col: 5, offset: 23360}, + pos: position{line: 953, col: 5, offset: 23614}, alternatives: []any{ &actionExpr{ - pos: position{line: 940, col: 5, offset: 23360}, + pos: position{line: 953, col: 5, offset: 23614}, run: (*parser).callonDerefExpr2, expr: &seqExpr{ - pos: position{line: 940, col: 5, offset: 23360}, + pos: position{line: 953, col: 5, offset: 23614}, exprs: []any{ &labeledExpr{ - pos: position{line: 940, col: 5, offset: 23360}, + pos: position{line: 953, col: 5, offset: 23614}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 940, col: 10, offset: 23365}, + pos: position{line: 953, col: 10, offset: 23619}, name: "DerefExpr", }, }, &litMatcher{ - pos: position{line: 940, col: 20, offset: 23375}, + pos: position{line: 953, col: 20, offset: 23629}, val: "[", ignoreCase: false, want: "\"[\"", }, &labeledExpr{ - pos: position{line: 940, col: 24, offset: 23379}, + pos: position{line: 953, col: 24, offset: 23633}, label: "from", expr: &ruleRefExpr{ - pos: position{line: 940, col: 29, offset: 23384}, + pos: position{line: 953, col: 29, offset: 23638}, name: "AdditiveExpr", }, }, &ruleRefExpr{ - pos: position{line: 940, col: 42, offset: 23397}, + pos: position{line: 953, col: 42, offset: 23651}, name: "__", }, &litMatcher{ - pos: position{line: 940, col: 45, offset: 23400}, + pos: position{line: 953, col: 45, offset: 23654}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 940, col: 49, offset: 23404}, + pos: position{line: 953, col: 49, offset: 23658}, name: "__", }, &labeledExpr{ - pos: position{line: 940, col: 52, offset: 23407}, + pos: position{line: 953, col: 52, offset: 23661}, label: "to", expr: &zeroOrOneExpr{ - pos: position{line: 940, col: 55, offset: 23410}, + pos: position{line: 953, col: 55, offset: 23664}, expr: &ruleRefExpr{ - pos: position{line: 940, col: 55, offset: 23410}, + pos: position{line: 953, col: 55, offset: 23664}, name: "AdditiveExpr", }, }, }, &litMatcher{ - pos: position{line: 940, col: 69, offset: 23424}, + pos: position{line: 953, col: 69, offset: 23678}, val: "]", ignoreCase: false, want: "\"]\"", @@ -6447,49 +6507,49 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 952, col: 5, offset: 23675}, + pos: position{line: 965, col: 5, offset: 23929}, run: (*parser).callonDerefExpr16, expr: &seqExpr{ - pos: position{line: 952, col: 5, offset: 23675}, + pos: position{line: 965, col: 5, offset: 23929}, exprs: []any{ &labeledExpr{ - pos: position{line: 952, col: 5, offset: 23675}, + pos: position{line: 965, col: 5, offset: 23929}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 952, col: 10, offset: 23680}, + pos: position{line: 965, col: 10, offset: 23934}, name: "DerefExpr", }, }, &litMatcher{ - pos: position{line: 952, col: 20, offset: 23690}, + pos: position{line: 965, col: 20, offset: 23944}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 952, col: 24, offset: 23694}, + pos: position{line: 965, col: 24, offset: 23948}, name: "__", }, &litMatcher{ - pos: position{line: 952, col: 27, offset: 23697}, + pos: position{line: 965, col: 27, offset: 23951}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 952, col: 31, offset: 23701}, + pos: position{line: 965, col: 31, offset: 23955}, name: "__", }, &labeledExpr{ - pos: position{line: 952, col: 34, offset: 23704}, + pos: position{line: 965, col: 34, offset: 23958}, label: "to", expr: &ruleRefExpr{ - pos: position{line: 952, col: 37, offset: 23707}, + pos: position{line: 965, col: 37, offset: 23961}, name: "AdditiveExpr", }, }, &litMatcher{ - pos: position{line: 952, col: 50, offset: 23720}, + pos: position{line: 965, col: 50, offset: 23974}, val: "]", ignoreCase: false, want: "\"]\"", @@ -6498,35 +6558,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 960, col: 5, offset: 23896}, + pos: position{line: 973, col: 5, offset: 24150}, run: (*parser).callonDerefExpr27, expr: &seqExpr{ - pos: position{line: 960, col: 5, offset: 23896}, + pos: position{line: 973, col: 5, offset: 24150}, exprs: []any{ &labeledExpr{ - pos: position{line: 960, col: 5, offset: 23896}, + pos: position{line: 973, col: 5, offset: 24150}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 960, col: 10, offset: 23901}, + pos: position{line: 973, col: 10, offset: 24155}, name: "DerefExpr", }, }, &litMatcher{ - pos: position{line: 960, col: 20, offset: 23911}, + pos: position{line: 973, col: 20, offset: 24165}, val: "[", ignoreCase: false, want: "\"[\"", }, &labeledExpr{ - pos: position{line: 960, col: 24, offset: 23915}, + pos: position{line: 973, col: 24, offset: 24169}, label: "index", expr: &ruleRefExpr{ - pos: position{line: 960, col: 30, offset: 23921}, + pos: position{line: 973, col: 30, offset: 24175}, name: "Expr", }, }, &litMatcher{ - pos: position{line: 960, col: 35, offset: 23926}, + pos: position{line: 973, col: 35, offset: 24180}, val: "]", ignoreCase: false, want: "\"]\"", @@ -6535,30 +6595,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 968, col: 5, offset: 24108}, + pos: position{line: 981, col: 5, offset: 24362}, run: (*parser).callonDerefExpr35, expr: &seqExpr{ - pos: position{line: 968, col: 5, offset: 24108}, + pos: position{line: 981, col: 5, offset: 24362}, exprs: []any{ &labeledExpr{ - pos: position{line: 968, col: 5, offset: 24108}, + pos: position{line: 981, col: 5, offset: 24362}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 968, col: 10, offset: 24113}, + pos: position{line: 981, col: 10, offset: 24367}, name: "DerefExpr", }, }, &litMatcher{ - pos: position{line: 968, col: 20, offset: 24123}, + pos: position{line: 981, col: 20, offset: 24377}, val: ".", ignoreCase: false, want: "\".\"", }, &labeledExpr{ - pos: position{line: 968, col: 24, offset: 24127}, + pos: position{line: 981, col: 24, offset: 24381}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 968, col: 27, offset: 24130}, + pos: position{line: 981, col: 27, offset: 24384}, name: "Identifier", }, }, @@ -6566,25 +6626,25 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 976, col: 5, offset: 24299}, + pos: position{line: 989, col: 5, offset: 24553}, run: (*parser).callonDerefExpr42, expr: &labeledExpr{ - pos: position{line: 976, col: 5, offset: 24299}, + pos: position{line: 989, col: 5, offset: 24553}, label: "fn", expr: &ruleRefExpr{ - pos: position{line: 976, col: 8, offset: 24302}, + pos: position{line: 989, col: 8, offset: 24556}, name: "FuncExpr", }, }, }, &actionExpr{ - pos: position{line: 979, col: 5, offset: 24344}, + pos: position{line: 992, col: 5, offset: 24598}, run: (*parser).callonDerefExpr45, expr: &labeledExpr{ - pos: position{line: 979, col: 5, offset: 24344}, + pos: position{line: 992, col: 5, offset: 24598}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 979, col: 10, offset: 24349}, + pos: position{line: 992, col: 10, offset: 24603}, name: "Primary", }, }, @@ -6596,30 +6656,30 @@ var g = &grammar{ }, { name: "FuncExpr", - pos: position{line: 984, col: 1, offset: 24390}, + pos: position{line: 997, col: 1, offset: 24644}, expr: &choiceExpr{ - pos: position{line: 985, col: 5, offset: 24403}, + pos: position{line: 998, col: 5, offset: 24657}, alternatives: []any{ &actionExpr{ - pos: position{line: 985, col: 5, offset: 24403}, + pos: position{line: 998, col: 5, offset: 24657}, run: (*parser).callonFuncExpr2, expr: &labeledExpr{ - pos: position{line: 985, col: 5, offset: 24403}, + pos: position{line: 998, col: 5, offset: 24657}, label: "cast", expr: &ruleRefExpr{ - pos: position{line: 985, col: 10, offset: 24408}, + pos: position{line: 998, col: 10, offset: 24662}, name: "Cast", }, }, }, &actionExpr{ - pos: position{line: 988, col: 5, offset: 24448}, + pos: position{line: 1001, col: 5, offset: 24702}, run: (*parser).callonFuncExpr5, expr: &labeledExpr{ - pos: position{line: 988, col: 5, offset: 24448}, + pos: position{line: 1001, col: 5, offset: 24702}, label: "fn", expr: &ruleRefExpr{ - pos: position{line: 988, col: 8, offset: 24451}, + pos: position{line: 1001, col: 8, offset: 24705}, name: "Function", }, }, @@ -6631,20 +6691,20 @@ var g = &grammar{ }, { name: "FuncGuard", - pos: position{line: 992, col: 1, offset: 24490}, + pos: position{line: 1005, col: 1, offset: 24744}, expr: &seqExpr{ - pos: position{line: 992, col: 13, offset: 24502}, + pos: position{line: 1005, col: 13, offset: 24756}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 992, col: 13, offset: 24502}, + pos: position{line: 1005, col: 13, offset: 24756}, name: "NotFuncs", }, &ruleRefExpr{ - pos: position{line: 992, col: 22, offset: 24511}, + pos: position{line: 1005, col: 22, offset: 24765}, name: "__", }, &litMatcher{ - pos: position{line: 992, col: 25, offset: 24514}, + pos: position{line: 1005, col: 25, offset: 24768}, val: "(", ignoreCase: false, want: "\"(\"", @@ -6656,18 +6716,18 @@ var g = &grammar{ }, { name: "NotFuncs", - pos: position{line: 994, col: 1, offset: 24519}, + pos: position{line: 1007, col: 1, offset: 24773}, expr: &choiceExpr{ - pos: position{line: 995, col: 5, offset: 24532}, + pos: position{line: 1008, col: 5, offset: 24786}, alternatives: []any{ &litMatcher{ - pos: position{line: 995, col: 5, offset: 24532}, + pos: position{line: 1008, col: 5, offset: 24786}, val: "not", ignoreCase: false, want: "\"not\"", }, &litMatcher{ - pos: position{line: 996, col: 5, offset: 24542}, + pos: position{line: 1009, col: 5, offset: 24796}, val: "select", ignoreCase: false, want: "\"select\"", @@ -6679,58 +6739,58 @@ var g = &grammar{ }, { name: "Cast", - pos: position{line: 998, col: 1, offset: 24552}, + pos: position{line: 1011, col: 1, offset: 24806}, expr: &actionExpr{ - pos: position{line: 999, col: 5, offset: 24561}, + pos: position{line: 1012, col: 5, offset: 24815}, run: (*parser).callonCast1, expr: &seqExpr{ - pos: position{line: 999, col: 5, offset: 24561}, + pos: position{line: 1012, col: 5, offset: 24815}, exprs: []any{ &labeledExpr{ - pos: position{line: 999, col: 5, offset: 24561}, + pos: position{line: 1012, col: 5, offset: 24815}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 999, col: 9, offset: 24565}, + pos: position{line: 1012, col: 9, offset: 24819}, name: "TypeLiteral", }, }, &ruleRefExpr{ - pos: position{line: 999, col: 21, offset: 24577}, + pos: position{line: 1012, col: 21, offset: 24831}, name: "__", }, &litMatcher{ - pos: position{line: 999, col: 24, offset: 24580}, + pos: position{line: 1012, col: 24, offset: 24834}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 999, col: 28, offset: 24584}, + pos: position{line: 1012, col: 28, offset: 24838}, name: "__", }, &labeledExpr{ - pos: position{line: 999, col: 31, offset: 24587}, + pos: position{line: 1012, col: 31, offset: 24841}, label: "expr", expr: &choiceExpr{ - pos: position{line: 999, col: 37, offset: 24593}, + pos: position{line: 1012, col: 37, offset: 24847}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 999, col: 37, offset: 24593}, + pos: position{line: 1012, col: 37, offset: 24847}, name: "OverExpr", }, &ruleRefExpr{ - pos: position{line: 999, col: 48, offset: 24604}, + pos: position{line: 1012, col: 48, offset: 24858}, name: "Expr", }, }, }, }, &ruleRefExpr{ - pos: position{line: 999, col: 54, offset: 24610}, + pos: position{line: 1012, col: 54, offset: 24864}, name: "__", }, &litMatcher{ - pos: position{line: 999, col: 57, offset: 24613}, + pos: position{line: 1012, col: 57, offset: 24867}, val: ")", ignoreCase: false, want: "\")\"", @@ -6743,87 +6803,87 @@ var g = &grammar{ }, { name: "Function", - pos: position{line: 1003, col: 1, offset: 24738}, + pos: position{line: 1016, col: 1, offset: 24992}, expr: &choiceExpr{ - pos: position{line: 1004, col: 5, offset: 24751}, + pos: position{line: 1017, col: 5, offset: 25005}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1004, col: 5, offset: 24751}, + pos: position{line: 1017, col: 5, offset: 25005}, name: "Grep", }, &actionExpr{ - pos: position{line: 1006, col: 5, offset: 24838}, + pos: position{line: 1019, col: 5, offset: 25092}, run: (*parser).callonFunction3, expr: &seqExpr{ - pos: position{line: 1006, col: 5, offset: 24838}, + pos: position{line: 1019, col: 5, offset: 25092}, exprs: []any{ &litMatcher{ - pos: position{line: 1006, col: 5, offset: 24838}, + pos: position{line: 1019, col: 5, offset: 25092}, val: "regexp", ignoreCase: false, want: "\"regexp\"", }, &ruleRefExpr{ - pos: position{line: 1006, col: 14, offset: 24847}, + pos: position{line: 1019, col: 14, offset: 25101}, name: "__", }, &litMatcher{ - pos: position{line: 1006, col: 17, offset: 24850}, + pos: position{line: 1019, col: 17, offset: 25104}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1006, col: 21, offset: 24854}, + pos: position{line: 1019, col: 21, offset: 25108}, name: "__", }, &labeledExpr{ - pos: position{line: 1006, col: 24, offset: 24857}, + pos: position{line: 1019, col: 24, offset: 25111}, label: "arg0", expr: &ruleRefExpr{ - pos: position{line: 1006, col: 29, offset: 24862}, + pos: position{line: 1019, col: 29, offset: 25116}, name: "RegexpPrimitive", }, }, &ruleRefExpr{ - pos: position{line: 1006, col: 45, offset: 24878}, + pos: position{line: 1019, col: 45, offset: 25132}, name: "__", }, &litMatcher{ - pos: position{line: 1006, col: 48, offset: 24881}, + pos: position{line: 1019, col: 48, offset: 25135}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1006, col: 52, offset: 24885}, + pos: position{line: 1019, col: 52, offset: 25139}, name: "__", }, &labeledExpr{ - pos: position{line: 1006, col: 55, offset: 24888}, + pos: position{line: 1019, col: 55, offset: 25142}, label: "arg1", expr: &ruleRefExpr{ - pos: position{line: 1006, col: 60, offset: 24893}, + pos: position{line: 1019, col: 60, offset: 25147}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1006, col: 65, offset: 24898}, + pos: position{line: 1019, col: 65, offset: 25152}, name: "__", }, &litMatcher{ - pos: position{line: 1006, col: 68, offset: 24901}, + pos: position{line: 1019, col: 68, offset: 25155}, val: ")", ignoreCase: false, want: "\")\"", }, &labeledExpr{ - pos: position{line: 1006, col: 72, offset: 24905}, + pos: position{line: 1019, col: 72, offset: 25159}, label: "where", expr: &zeroOrOneExpr{ - pos: position{line: 1006, col: 78, offset: 24911}, + pos: position{line: 1019, col: 78, offset: 25165}, expr: &ruleRefExpr{ - pos: position{line: 1006, col: 78, offset: 24911}, + pos: position{line: 1019, col: 78, offset: 25165}, name: "WhereClause", }, }, @@ -6832,100 +6892,100 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1010, col: 5, offset: 25066}, + pos: position{line: 1023, col: 5, offset: 25320}, run: (*parser).callonFunction21, expr: &seqExpr{ - pos: position{line: 1010, col: 5, offset: 25066}, + pos: position{line: 1023, col: 5, offset: 25320}, exprs: []any{ &litMatcher{ - pos: position{line: 1010, col: 5, offset: 25066}, + pos: position{line: 1023, col: 5, offset: 25320}, val: "regexp_replace", ignoreCase: false, want: "\"regexp_replace\"", }, &ruleRefExpr{ - pos: position{line: 1010, col: 22, offset: 25083}, + pos: position{line: 1023, col: 22, offset: 25337}, name: "__", }, &litMatcher{ - pos: position{line: 1010, col: 25, offset: 25086}, + pos: position{line: 1023, col: 25, offset: 25340}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1010, col: 29, offset: 25090}, + pos: position{line: 1023, col: 29, offset: 25344}, name: "__", }, &labeledExpr{ - pos: position{line: 1010, col: 32, offset: 25093}, + pos: position{line: 1023, col: 32, offset: 25347}, label: "arg0", expr: &ruleRefExpr{ - pos: position{line: 1010, col: 37, offset: 25098}, + pos: position{line: 1023, col: 37, offset: 25352}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1010, col: 42, offset: 25103}, + pos: position{line: 1023, col: 42, offset: 25357}, name: "__", }, &litMatcher{ - pos: position{line: 1010, col: 45, offset: 25106}, + pos: position{line: 1023, col: 45, offset: 25360}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1010, col: 49, offset: 25110}, + pos: position{line: 1023, col: 49, offset: 25364}, name: "__", }, &labeledExpr{ - pos: position{line: 1010, col: 52, offset: 25113}, + pos: position{line: 1023, col: 52, offset: 25367}, label: "arg1", expr: &ruleRefExpr{ - pos: position{line: 1010, col: 57, offset: 25118}, + pos: position{line: 1023, col: 57, offset: 25372}, name: "RegexpPrimitive", }, }, &ruleRefExpr{ - pos: position{line: 1010, col: 73, offset: 25134}, + pos: position{line: 1023, col: 73, offset: 25388}, name: "__", }, &litMatcher{ - pos: position{line: 1010, col: 76, offset: 25137}, + pos: position{line: 1023, col: 76, offset: 25391}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1010, col: 80, offset: 25141}, + pos: position{line: 1023, col: 80, offset: 25395}, name: "__", }, &labeledExpr{ - pos: position{line: 1010, col: 83, offset: 25144}, + pos: position{line: 1023, col: 83, offset: 25398}, label: "arg2", expr: &ruleRefExpr{ - pos: position{line: 1010, col: 88, offset: 25149}, + pos: position{line: 1023, col: 88, offset: 25403}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1010, col: 93, offset: 25154}, + pos: position{line: 1023, col: 93, offset: 25408}, name: "__", }, &litMatcher{ - pos: position{line: 1010, col: 96, offset: 25157}, + pos: position{line: 1023, col: 96, offset: 25411}, val: ")", ignoreCase: false, want: "\")\"", }, &labeledExpr{ - pos: position{line: 1010, col: 100, offset: 25161}, + pos: position{line: 1023, col: 100, offset: 25415}, label: "where", expr: &zeroOrOneExpr{ - pos: position{line: 1010, col: 106, offset: 25167}, + pos: position{line: 1023, col: 106, offset: 25421}, expr: &ruleRefExpr{ - pos: position{line: 1010, col: 106, offset: 25167}, + pos: position{line: 1023, col: 106, offset: 25421}, name: "WhereClause", }, }, @@ -6934,65 +6994,65 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1014, col: 5, offset: 25336}, + pos: position{line: 1027, col: 5, offset: 25590}, run: (*parser).callonFunction44, expr: &seqExpr{ - pos: position{line: 1014, col: 5, offset: 25336}, + pos: position{line: 1027, col: 5, offset: 25590}, exprs: []any{ ¬Expr{ - pos: position{line: 1014, col: 5, offset: 25336}, + pos: position{line: 1027, col: 5, offset: 25590}, expr: &ruleRefExpr{ - pos: position{line: 1014, col: 6, offset: 25337}, + pos: position{line: 1027, col: 6, offset: 25591}, name: "FuncGuard", }, }, &labeledExpr{ - pos: position{line: 1014, col: 16, offset: 25347}, + pos: position{line: 1027, col: 16, offset: 25601}, label: "fn", expr: &ruleRefExpr{ - pos: position{line: 1014, col: 19, offset: 25350}, + pos: position{line: 1027, col: 19, offset: 25604}, name: "Identifier", }, }, &ruleRefExpr{ - pos: position{line: 1014, col: 30, offset: 25361}, + pos: position{line: 1027, col: 30, offset: 25615}, name: "__", }, &litMatcher{ - pos: position{line: 1014, col: 33, offset: 25364}, + pos: position{line: 1027, col: 33, offset: 25618}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1014, col: 37, offset: 25368}, + pos: position{line: 1027, col: 37, offset: 25622}, name: "__", }, &labeledExpr{ - pos: position{line: 1014, col: 40, offset: 25371}, + pos: position{line: 1027, col: 40, offset: 25625}, label: "args", expr: &ruleRefExpr{ - pos: position{line: 1014, col: 45, offset: 25376}, + pos: position{line: 1027, col: 45, offset: 25630}, name: "FunctionArgs", }, }, &ruleRefExpr{ - pos: position{line: 1014, col: 58, offset: 25389}, + pos: position{line: 1027, col: 58, offset: 25643}, name: "__", }, &litMatcher{ - pos: position{line: 1014, col: 61, offset: 25392}, + pos: position{line: 1027, col: 61, offset: 25646}, val: ")", ignoreCase: false, want: "\")\"", }, &labeledExpr{ - pos: position{line: 1014, col: 65, offset: 25396}, + pos: position{line: 1027, col: 65, offset: 25650}, label: "where", expr: &zeroOrOneExpr{ - pos: position{line: 1014, col: 71, offset: 25402}, + pos: position{line: 1027, col: 71, offset: 25656}, expr: &ruleRefExpr{ - pos: position{line: 1014, col: 71, offset: 25402}, + pos: position{line: 1027, col: 71, offset: 25656}, name: "WhereClause", }, }, @@ -7007,15 +7067,15 @@ var g = &grammar{ }, { name: "RegexpPrimitive", - pos: position{line: 1018, col: 1, offset: 25470}, + pos: position{line: 1031, col: 1, offset: 25724}, expr: &actionExpr{ - pos: position{line: 1019, col: 5, offset: 25490}, + pos: position{line: 1032, col: 5, offset: 25744}, run: (*parser).callonRegexpPrimitive1, expr: &labeledExpr{ - pos: position{line: 1019, col: 5, offset: 25490}, + pos: position{line: 1032, col: 5, offset: 25744}, label: "pat", expr: &ruleRefExpr{ - pos: position{line: 1019, col: 9, offset: 25494}, + pos: position{line: 1032, col: 9, offset: 25748}, name: "RegexpPattern", }, }, @@ -7025,24 +7085,24 @@ var g = &grammar{ }, { name: "FunctionArgs", - pos: position{line: 1021, col: 1, offset: 25565}, + pos: position{line: 1034, col: 1, offset: 25819}, expr: &choiceExpr{ - pos: position{line: 1022, col: 5, offset: 25582}, + pos: position{line: 1035, col: 5, offset: 25836}, alternatives: []any{ &actionExpr{ - pos: position{line: 1022, col: 5, offset: 25582}, + pos: position{line: 1035, col: 5, offset: 25836}, run: (*parser).callonFunctionArgs2, expr: &labeledExpr{ - pos: position{line: 1022, col: 5, offset: 25582}, + pos: position{line: 1035, col: 5, offset: 25836}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 1022, col: 7, offset: 25584}, + pos: position{line: 1035, col: 7, offset: 25838}, name: "OverExpr", }, }, }, &ruleRefExpr{ - pos: position{line: 1023, col: 5, offset: 25622}, + pos: position{line: 1036, col: 5, offset: 25876}, name: "OptionalExprs", }, }, @@ -7052,98 +7112,98 @@ var g = &grammar{ }, { name: "Grep", - pos: position{line: 1025, col: 1, offset: 25637}, + pos: position{line: 1038, col: 1, offset: 25891}, expr: &actionExpr{ - pos: position{line: 1026, col: 5, offset: 25646}, + pos: position{line: 1039, col: 5, offset: 25900}, run: (*parser).callonGrep1, expr: &seqExpr{ - pos: position{line: 1026, col: 5, offset: 25646}, + pos: position{line: 1039, col: 5, offset: 25900}, exprs: []any{ &litMatcher{ - pos: position{line: 1026, col: 5, offset: 25646}, + pos: position{line: 1039, col: 5, offset: 25900}, val: "grep", ignoreCase: false, want: "\"grep\"", }, &ruleRefExpr{ - pos: position{line: 1026, col: 12, offset: 25653}, + pos: position{line: 1039, col: 12, offset: 25907}, name: "__", }, &litMatcher{ - pos: position{line: 1026, col: 15, offset: 25656}, + pos: position{line: 1039, col: 15, offset: 25910}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1026, col: 19, offset: 25660}, + pos: position{line: 1039, col: 19, offset: 25914}, name: "__", }, &labeledExpr{ - pos: position{line: 1026, col: 22, offset: 25663}, + pos: position{line: 1039, col: 22, offset: 25917}, label: "pattern", expr: &choiceExpr{ - pos: position{line: 1026, col: 31, offset: 25672}, + pos: position{line: 1039, col: 31, offset: 25926}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1026, col: 31, offset: 25672}, + pos: position{line: 1039, col: 31, offset: 25926}, name: "Regexp", }, &ruleRefExpr{ - pos: position{line: 1026, col: 40, offset: 25681}, + pos: position{line: 1039, col: 40, offset: 25935}, name: "Glob", }, &ruleRefExpr{ - pos: position{line: 1026, col: 47, offset: 25688}, + pos: position{line: 1039, col: 47, offset: 25942}, name: "Expr", }, }, }, }, &ruleRefExpr{ - pos: position{line: 1026, col: 53, offset: 25694}, + pos: position{line: 1039, col: 53, offset: 25948}, name: "__", }, &labeledExpr{ - pos: position{line: 1026, col: 56, offset: 25697}, + pos: position{line: 1039, col: 56, offset: 25951}, label: "opt", expr: &zeroOrOneExpr{ - pos: position{line: 1026, col: 60, offset: 25701}, + pos: position{line: 1039, col: 60, offset: 25955}, expr: &actionExpr{ - pos: position{line: 1026, col: 61, offset: 25702}, + pos: position{line: 1039, col: 61, offset: 25956}, run: (*parser).callonGrep15, expr: &seqExpr{ - pos: position{line: 1026, col: 61, offset: 25702}, + pos: position{line: 1039, col: 61, offset: 25956}, exprs: []any{ &litMatcher{ - pos: position{line: 1026, col: 61, offset: 25702}, + pos: position{line: 1039, col: 61, offset: 25956}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1026, col: 65, offset: 25706}, + pos: position{line: 1039, col: 65, offset: 25960}, name: "__", }, &labeledExpr{ - pos: position{line: 1026, col: 68, offset: 25709}, + pos: position{line: 1039, col: 68, offset: 25963}, label: "e", expr: &choiceExpr{ - pos: position{line: 1026, col: 71, offset: 25712}, + pos: position{line: 1039, col: 71, offset: 25966}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1026, col: 71, offset: 25712}, + pos: position{line: 1039, col: 71, offset: 25966}, name: "OverExpr", }, &ruleRefExpr{ - pos: position{line: 1026, col: 82, offset: 25723}, + pos: position{line: 1039, col: 82, offset: 25977}, name: "Expr", }, }, }, }, &ruleRefExpr{ - pos: position{line: 1026, col: 88, offset: 25729}, + pos: position{line: 1039, col: 88, offset: 25983}, name: "__", }, }, @@ -7152,7 +7212,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1026, col: 111, offset: 25752}, + pos: position{line: 1039, col: 111, offset: 26006}, val: ")", ignoreCase: false, want: "\")\"", @@ -7165,19 +7225,19 @@ var g = &grammar{ }, { name: "OptionalExprs", - pos: position{line: 1039, col: 1, offset: 26013}, + pos: position{line: 1052, col: 1, offset: 26267}, expr: &choiceExpr{ - pos: position{line: 1040, col: 5, offset: 26031}, + pos: position{line: 1053, col: 5, offset: 26285}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1040, col: 5, offset: 26031}, + pos: position{line: 1053, col: 5, offset: 26285}, name: "Exprs", }, &actionExpr{ - pos: position{line: 1041, col: 5, offset: 26041}, + pos: position{line: 1054, col: 5, offset: 26295}, run: (*parser).callonOptionalExprs3, expr: &ruleRefExpr{ - pos: position{line: 1041, col: 5, offset: 26041}, + pos: position{line: 1054, col: 5, offset: 26295}, name: "__", }, }, @@ -7188,51 +7248,51 @@ var g = &grammar{ }, { name: "Exprs", - pos: position{line: 1043, col: 1, offset: 26069}, + pos: position{line: 1056, col: 1, offset: 26323}, expr: &actionExpr{ - pos: position{line: 1044, col: 5, offset: 26079}, + pos: position{line: 1057, col: 5, offset: 26333}, run: (*parser).callonExprs1, expr: &seqExpr{ - pos: position{line: 1044, col: 5, offset: 26079}, + pos: position{line: 1057, col: 5, offset: 26333}, exprs: []any{ &labeledExpr{ - pos: position{line: 1044, col: 5, offset: 26079}, + pos: position{line: 1057, col: 5, offset: 26333}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1044, col: 11, offset: 26085}, + pos: position{line: 1057, col: 11, offset: 26339}, name: "Expr", }, }, &labeledExpr{ - pos: position{line: 1044, col: 16, offset: 26090}, + pos: position{line: 1057, col: 16, offset: 26344}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1044, col: 21, offset: 26095}, + pos: position{line: 1057, col: 21, offset: 26349}, expr: &actionExpr{ - pos: position{line: 1044, col: 22, offset: 26096}, + pos: position{line: 1057, col: 22, offset: 26350}, run: (*parser).callonExprs7, expr: &seqExpr{ - pos: position{line: 1044, col: 22, offset: 26096}, + pos: position{line: 1057, col: 22, offset: 26350}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1044, col: 22, offset: 26096}, + pos: position{line: 1057, col: 22, offset: 26350}, name: "__", }, &litMatcher{ - pos: position{line: 1044, col: 25, offset: 26099}, + pos: position{line: 1057, col: 25, offset: 26353}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1044, col: 29, offset: 26103}, + pos: position{line: 1057, col: 29, offset: 26357}, name: "__", }, &labeledExpr{ - pos: position{line: 1044, col: 32, offset: 26106}, + pos: position{line: 1057, col: 32, offset: 26360}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1044, col: 34, offset: 26108}, + pos: position{line: 1057, col: 34, offset: 26362}, name: "Expr", }, }, @@ -7249,64 +7309,64 @@ var g = &grammar{ }, { name: "Primary", - pos: position{line: 1048, col: 1, offset: 26181}, + pos: position{line: 1061, col: 1, offset: 26435}, expr: &choiceExpr{ - pos: position{line: 1049, col: 5, offset: 26193}, + pos: position{line: 1062, col: 5, offset: 26447}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1049, col: 5, offset: 26193}, + pos: position{line: 1062, col: 5, offset: 26447}, name: "Record", }, &ruleRefExpr{ - pos: position{line: 1050, col: 5, offset: 26204}, + pos: position{line: 1063, col: 5, offset: 26458}, name: "Array", }, &ruleRefExpr{ - pos: position{line: 1051, col: 5, offset: 26214}, + pos: position{line: 1064, col: 5, offset: 26468}, name: "Set", }, &ruleRefExpr{ - pos: position{line: 1052, col: 5, offset: 26222}, + pos: position{line: 1065, col: 5, offset: 26476}, name: "Map", }, &ruleRefExpr{ - pos: position{line: 1053, col: 5, offset: 26230}, + pos: position{line: 1066, col: 5, offset: 26484}, name: "Literal", }, &ruleRefExpr{ - pos: position{line: 1054, col: 5, offset: 26242}, + pos: position{line: 1067, col: 5, offset: 26496}, name: "Identifier", }, &actionExpr{ - pos: position{line: 1055, col: 5, offset: 26257}, + pos: position{line: 1068, col: 5, offset: 26511}, run: (*parser).callonPrimary8, expr: &seqExpr{ - pos: position{line: 1055, col: 5, offset: 26257}, + pos: position{line: 1068, col: 5, offset: 26511}, exprs: []any{ &litMatcher{ - pos: position{line: 1055, col: 5, offset: 26257}, + pos: position{line: 1068, col: 5, offset: 26511}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1055, col: 9, offset: 26261}, + pos: position{line: 1068, col: 9, offset: 26515}, name: "__", }, &labeledExpr{ - pos: position{line: 1055, col: 12, offset: 26264}, + pos: position{line: 1068, col: 12, offset: 26518}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1055, col: 17, offset: 26269}, + pos: position{line: 1068, col: 17, offset: 26523}, name: "OverExpr", }, }, &ruleRefExpr{ - pos: position{line: 1055, col: 26, offset: 26278}, + pos: position{line: 1068, col: 26, offset: 26532}, name: "__", }, &litMatcher{ - pos: position{line: 1055, col: 29, offset: 26281}, + pos: position{line: 1068, col: 29, offset: 26535}, val: ")", ignoreCase: false, want: "\")\"", @@ -7315,35 +7375,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1056, col: 5, offset: 26310}, + pos: position{line: 1069, col: 5, offset: 26564}, run: (*parser).callonPrimary16, expr: &seqExpr{ - pos: position{line: 1056, col: 5, offset: 26310}, + pos: position{line: 1069, col: 5, offset: 26564}, exprs: []any{ &litMatcher{ - pos: position{line: 1056, col: 5, offset: 26310}, + pos: position{line: 1069, col: 5, offset: 26564}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1056, col: 9, offset: 26314}, + pos: position{line: 1069, col: 9, offset: 26568}, name: "__", }, &labeledExpr{ - pos: position{line: 1056, col: 12, offset: 26317}, + pos: position{line: 1069, col: 12, offset: 26571}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1056, col: 17, offset: 26322}, + pos: position{line: 1069, col: 17, offset: 26576}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1056, col: 22, offset: 26327}, + pos: position{line: 1069, col: 22, offset: 26581}, name: "__", }, &litMatcher{ - pos: position{line: 1056, col: 25, offset: 26330}, + pos: position{line: 1069, col: 25, offset: 26584}, val: ")", ignoreCase: false, want: "\")\"", @@ -7358,61 +7418,61 @@ var g = &grammar{ }, { name: "OverExpr", - pos: position{line: 1058, col: 1, offset: 26356}, + pos: position{line: 1071, col: 1, offset: 26610}, expr: &actionExpr{ - pos: position{line: 1059, col: 5, offset: 26369}, + pos: position{line: 1072, col: 5, offset: 26623}, run: (*parser).callonOverExpr1, expr: &seqExpr{ - pos: position{line: 1059, col: 5, offset: 26369}, + pos: position{line: 1072, col: 5, offset: 26623}, exprs: []any{ &litMatcher{ - pos: position{line: 1059, col: 5, offset: 26369}, + pos: position{line: 1072, col: 5, offset: 26623}, val: "over", ignoreCase: false, want: "\"over\"", }, &ruleRefExpr{ - pos: position{line: 1059, col: 12, offset: 26376}, + pos: position{line: 1072, col: 12, offset: 26630}, name: "_", }, &labeledExpr{ - pos: position{line: 1059, col: 14, offset: 26378}, + pos: position{line: 1072, col: 14, offset: 26632}, label: "exprs", expr: &ruleRefExpr{ - pos: position{line: 1059, col: 20, offset: 26384}, + pos: position{line: 1072, col: 20, offset: 26638}, name: "Exprs", }, }, &labeledExpr{ - pos: position{line: 1059, col: 26, offset: 26390}, + pos: position{line: 1072, col: 26, offset: 26644}, label: "locals", expr: &zeroOrOneExpr{ - pos: position{line: 1059, col: 33, offset: 26397}, + pos: position{line: 1072, col: 33, offset: 26651}, expr: &ruleRefExpr{ - pos: position{line: 1059, col: 33, offset: 26397}, + pos: position{line: 1072, col: 33, offset: 26651}, name: "Locals", }, }, }, &ruleRefExpr{ - pos: position{line: 1059, col: 41, offset: 26405}, + pos: position{line: 1072, col: 41, offset: 26659}, name: "__", }, &litMatcher{ - pos: position{line: 1059, col: 44, offset: 26408}, + pos: position{line: 1072, col: 44, offset: 26662}, val: "|", ignoreCase: false, want: "\"|\"", }, &ruleRefExpr{ - pos: position{line: 1059, col: 48, offset: 26412}, + pos: position{line: 1072, col: 48, offset: 26666}, name: "__", }, &labeledExpr{ - pos: position{line: 1059, col: 51, offset: 26415}, + pos: position{line: 1072, col: 51, offset: 26669}, label: "body", expr: &ruleRefExpr{ - pos: position{line: 1059, col: 56, offset: 26420}, + pos: position{line: 1072, col: 56, offset: 26674}, name: "Seq", }, }, @@ -7424,37 +7484,37 @@ var g = &grammar{ }, { name: "Record", - pos: position{line: 1069, col: 1, offset: 26664}, + pos: position{line: 1082, col: 1, offset: 26918}, expr: &actionExpr{ - pos: position{line: 1070, col: 5, offset: 26675}, + pos: position{line: 1083, col: 5, offset: 26929}, run: (*parser).callonRecord1, expr: &seqExpr{ - pos: position{line: 1070, col: 5, offset: 26675}, + pos: position{line: 1083, col: 5, offset: 26929}, exprs: []any{ &litMatcher{ - pos: position{line: 1070, col: 5, offset: 26675}, + pos: position{line: 1083, col: 5, offset: 26929}, val: "{", ignoreCase: false, want: "\"{\"", }, &ruleRefExpr{ - pos: position{line: 1070, col: 9, offset: 26679}, + pos: position{line: 1083, col: 9, offset: 26933}, name: "__", }, &labeledExpr{ - pos: position{line: 1070, col: 12, offset: 26682}, + pos: position{line: 1083, col: 12, offset: 26936}, label: "elems", expr: &ruleRefExpr{ - pos: position{line: 1070, col: 18, offset: 26688}, + pos: position{line: 1083, col: 18, offset: 26942}, name: "RecordElems", }, }, &ruleRefExpr{ - pos: position{line: 1070, col: 30, offset: 26700}, + pos: position{line: 1083, col: 30, offset: 26954}, name: "__", }, &litMatcher{ - pos: position{line: 1070, col: 33, offset: 26703}, + pos: position{line: 1083, col: 33, offset: 26957}, val: "}", ignoreCase: false, want: "\"}\"", @@ -7467,31 +7527,31 @@ var g = &grammar{ }, { name: "RecordElems", - pos: position{line: 1079, col: 1, offset: 26905}, + pos: position{line: 1092, col: 1, offset: 27159}, expr: &choiceExpr{ - pos: position{line: 1080, col: 5, offset: 26921}, + pos: position{line: 1093, col: 5, offset: 27175}, alternatives: []any{ &actionExpr{ - pos: position{line: 1080, col: 5, offset: 26921}, + pos: position{line: 1093, col: 5, offset: 27175}, run: (*parser).callonRecordElems2, expr: &seqExpr{ - pos: position{line: 1080, col: 5, offset: 26921}, + pos: position{line: 1093, col: 5, offset: 27175}, exprs: []any{ &labeledExpr{ - pos: position{line: 1080, col: 5, offset: 26921}, + pos: position{line: 1093, col: 5, offset: 27175}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1080, col: 11, offset: 26927}, + pos: position{line: 1093, col: 11, offset: 27181}, name: "RecordElem", }, }, &labeledExpr{ - pos: position{line: 1080, col: 22, offset: 26938}, + pos: position{line: 1093, col: 22, offset: 27192}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1080, col: 27, offset: 26943}, + pos: position{line: 1093, col: 27, offset: 27197}, expr: &ruleRefExpr{ - pos: position{line: 1080, col: 27, offset: 26943}, + pos: position{line: 1093, col: 27, offset: 27197}, name: "RecordElemTail", }, }, @@ -7500,10 +7560,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1083, col: 5, offset: 27006}, + pos: position{line: 1096, col: 5, offset: 27260}, run: (*parser).callonRecordElems9, expr: &ruleRefExpr{ - pos: position{line: 1083, col: 5, offset: 27006}, + pos: position{line: 1096, col: 5, offset: 27260}, name: "__", }, }, @@ -7514,32 +7574,32 @@ var g = &grammar{ }, { name: "RecordElemTail", - pos: position{line: 1085, col: 1, offset: 27030}, + pos: position{line: 1098, col: 1, offset: 27284}, expr: &actionExpr{ - pos: position{line: 1085, col: 18, offset: 27047}, + pos: position{line: 1098, col: 18, offset: 27301}, run: (*parser).callonRecordElemTail1, expr: &seqExpr{ - pos: position{line: 1085, col: 18, offset: 27047}, + pos: position{line: 1098, col: 18, offset: 27301}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1085, col: 18, offset: 27047}, + pos: position{line: 1098, col: 18, offset: 27301}, name: "__", }, &litMatcher{ - pos: position{line: 1085, col: 21, offset: 27050}, + pos: position{line: 1098, col: 21, offset: 27304}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1085, col: 25, offset: 27054}, + pos: position{line: 1098, col: 25, offset: 27308}, name: "__", }, &labeledExpr{ - pos: position{line: 1085, col: 28, offset: 27057}, + pos: position{line: 1098, col: 28, offset: 27311}, label: "elem", expr: &ruleRefExpr{ - pos: position{line: 1085, col: 33, offset: 27062}, + pos: position{line: 1098, col: 33, offset: 27316}, name: "RecordElem", }, }, @@ -7551,20 +7611,20 @@ var g = &grammar{ }, { name: "RecordElem", - pos: position{line: 1087, col: 1, offset: 27095}, + pos: position{line: 1100, col: 1, offset: 27349}, expr: &choiceExpr{ - pos: position{line: 1088, col: 5, offset: 27110}, + pos: position{line: 1101, col: 5, offset: 27364}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1088, col: 5, offset: 27110}, + pos: position{line: 1101, col: 5, offset: 27364}, name: "Spread", }, &ruleRefExpr{ - pos: position{line: 1089, col: 5, offset: 27121}, + pos: position{line: 1102, col: 5, offset: 27375}, name: "Field", }, &ruleRefExpr{ - pos: position{line: 1090, col: 5, offset: 27131}, + pos: position{line: 1103, col: 5, offset: 27385}, name: "Identifier", }, }, @@ -7574,28 +7634,28 @@ var g = &grammar{ }, { name: "Spread", - pos: position{line: 1092, col: 1, offset: 27143}, + pos: position{line: 1105, col: 1, offset: 27397}, expr: &actionExpr{ - pos: position{line: 1093, col: 5, offset: 27154}, + pos: position{line: 1106, col: 5, offset: 27408}, run: (*parser).callonSpread1, expr: &seqExpr{ - pos: position{line: 1093, col: 5, offset: 27154}, + pos: position{line: 1106, col: 5, offset: 27408}, exprs: []any{ &litMatcher{ - pos: position{line: 1093, col: 5, offset: 27154}, + pos: position{line: 1106, col: 5, offset: 27408}, val: "...", ignoreCase: false, want: "\"...\"", }, &ruleRefExpr{ - pos: position{line: 1093, col: 11, offset: 27160}, + pos: position{line: 1106, col: 11, offset: 27414}, name: "__", }, &labeledExpr{ - pos: position{line: 1093, col: 14, offset: 27163}, + pos: position{line: 1106, col: 14, offset: 27417}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 1093, col: 19, offset: 27168}, + pos: position{line: 1106, col: 19, offset: 27422}, name: "Expr", }, }, @@ -7607,40 +7667,40 @@ var g = &grammar{ }, { name: "Field", - pos: position{line: 1097, col: 1, offset: 27275}, + pos: position{line: 1110, col: 1, offset: 27529}, expr: &actionExpr{ - pos: position{line: 1098, col: 5, offset: 27285}, + pos: position{line: 1111, col: 5, offset: 27539}, run: (*parser).callonField1, expr: &seqExpr{ - pos: position{line: 1098, col: 5, offset: 27285}, + pos: position{line: 1111, col: 5, offset: 27539}, exprs: []any{ &labeledExpr{ - pos: position{line: 1098, col: 5, offset: 27285}, + pos: position{line: 1111, col: 5, offset: 27539}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1098, col: 10, offset: 27290}, + pos: position{line: 1111, col: 10, offset: 27544}, name: "FieldName", }, }, &ruleRefExpr{ - pos: position{line: 1098, col: 20, offset: 27300}, + pos: position{line: 1111, col: 20, offset: 27554}, name: "__", }, &litMatcher{ - pos: position{line: 1098, col: 23, offset: 27303}, + pos: position{line: 1111, col: 23, offset: 27557}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1098, col: 27, offset: 27307}, + pos: position{line: 1111, col: 27, offset: 27561}, name: "__", }, &labeledExpr{ - pos: position{line: 1098, col: 30, offset: 27310}, + pos: position{line: 1111, col: 30, offset: 27564}, label: "value", expr: &ruleRefExpr{ - pos: position{line: 1098, col: 36, offset: 27316}, + pos: position{line: 1111, col: 36, offset: 27570}, name: "Expr", }, }, @@ -7652,37 +7712,37 @@ var g = &grammar{ }, { name: "Array", - pos: position{line: 1107, col: 1, offset: 27484}, + pos: position{line: 1120, col: 1, offset: 27738}, expr: &actionExpr{ - pos: position{line: 1108, col: 5, offset: 27494}, + pos: position{line: 1121, col: 5, offset: 27748}, run: (*parser).callonArray1, expr: &seqExpr{ - pos: position{line: 1108, col: 5, offset: 27494}, + pos: position{line: 1121, col: 5, offset: 27748}, exprs: []any{ &litMatcher{ - pos: position{line: 1108, col: 5, offset: 27494}, + pos: position{line: 1121, col: 5, offset: 27748}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 1108, col: 9, offset: 27498}, + pos: position{line: 1121, col: 9, offset: 27752}, name: "__", }, &labeledExpr{ - pos: position{line: 1108, col: 12, offset: 27501}, + pos: position{line: 1121, col: 12, offset: 27755}, label: "elems", expr: &ruleRefExpr{ - pos: position{line: 1108, col: 18, offset: 27507}, + pos: position{line: 1121, col: 18, offset: 27761}, name: "VectorElems", }, }, &ruleRefExpr{ - pos: position{line: 1108, col: 30, offset: 27519}, + pos: position{line: 1121, col: 30, offset: 27773}, name: "__", }, &litMatcher{ - pos: position{line: 1108, col: 33, offset: 27522}, + pos: position{line: 1121, col: 33, offset: 27776}, val: "]", ignoreCase: false, want: "\"]\"", @@ -7695,37 +7755,37 @@ var g = &grammar{ }, { name: "Set", - pos: position{line: 1117, col: 1, offset: 27722}, + pos: position{line: 1130, col: 1, offset: 27976}, expr: &actionExpr{ - pos: position{line: 1118, col: 5, offset: 27730}, + pos: position{line: 1131, col: 5, offset: 27984}, run: (*parser).callonSet1, expr: &seqExpr{ - pos: position{line: 1118, col: 5, offset: 27730}, + pos: position{line: 1131, col: 5, offset: 27984}, exprs: []any{ &litMatcher{ - pos: position{line: 1118, col: 5, offset: 27730}, + pos: position{line: 1131, col: 5, offset: 27984}, val: "|[", ignoreCase: false, want: "\"|[\"", }, &ruleRefExpr{ - pos: position{line: 1118, col: 10, offset: 27735}, + pos: position{line: 1131, col: 10, offset: 27989}, name: "__", }, &labeledExpr{ - pos: position{line: 1118, col: 13, offset: 27738}, + pos: position{line: 1131, col: 13, offset: 27992}, label: "elems", expr: &ruleRefExpr{ - pos: position{line: 1118, col: 19, offset: 27744}, + pos: position{line: 1131, col: 19, offset: 27998}, name: "VectorElems", }, }, &ruleRefExpr{ - pos: position{line: 1118, col: 31, offset: 27756}, + pos: position{line: 1131, col: 31, offset: 28010}, name: "__", }, &litMatcher{ - pos: position{line: 1118, col: 34, offset: 27759}, + pos: position{line: 1131, col: 34, offset: 28013}, val: "]|", ignoreCase: false, want: "\"]|\"", @@ -7738,54 +7798,54 @@ var g = &grammar{ }, { name: "VectorElems", - pos: position{line: 1127, col: 1, offset: 27954}, + pos: position{line: 1140, col: 1, offset: 28208}, expr: &choiceExpr{ - pos: position{line: 1128, col: 5, offset: 27970}, + pos: position{line: 1141, col: 5, offset: 28224}, alternatives: []any{ &actionExpr{ - pos: position{line: 1128, col: 5, offset: 27970}, + pos: position{line: 1141, col: 5, offset: 28224}, run: (*parser).callonVectorElems2, expr: &seqExpr{ - pos: position{line: 1128, col: 5, offset: 27970}, + pos: position{line: 1141, col: 5, offset: 28224}, exprs: []any{ &labeledExpr{ - pos: position{line: 1128, col: 5, offset: 27970}, + pos: position{line: 1141, col: 5, offset: 28224}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1128, col: 11, offset: 27976}, + pos: position{line: 1141, col: 11, offset: 28230}, name: "VectorElem", }, }, &labeledExpr{ - pos: position{line: 1128, col: 22, offset: 27987}, + pos: position{line: 1141, col: 22, offset: 28241}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1128, col: 27, offset: 27992}, + pos: position{line: 1141, col: 27, offset: 28246}, expr: &actionExpr{ - pos: position{line: 1128, col: 28, offset: 27993}, + pos: position{line: 1141, col: 28, offset: 28247}, run: (*parser).callonVectorElems8, expr: &seqExpr{ - pos: position{line: 1128, col: 28, offset: 27993}, + pos: position{line: 1141, col: 28, offset: 28247}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1128, col: 28, offset: 27993}, + pos: position{line: 1141, col: 28, offset: 28247}, name: "__", }, &litMatcher{ - pos: position{line: 1128, col: 31, offset: 27996}, + pos: position{line: 1141, col: 31, offset: 28250}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1128, col: 35, offset: 28000}, + pos: position{line: 1141, col: 35, offset: 28254}, name: "__", }, &labeledExpr{ - pos: position{line: 1128, col: 38, offset: 28003}, + pos: position{line: 1141, col: 38, offset: 28257}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1128, col: 40, offset: 28005}, + pos: position{line: 1141, col: 40, offset: 28259}, name: "VectorElem", }, }, @@ -7798,10 +7858,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1131, col: 5, offset: 28087}, + pos: position{line: 1144, col: 5, offset: 28341}, run: (*parser).callonVectorElems15, expr: &ruleRefExpr{ - pos: position{line: 1131, col: 5, offset: 28087}, + pos: position{line: 1144, col: 5, offset: 28341}, name: "__", }, }, @@ -7812,22 +7872,22 @@ var g = &grammar{ }, { name: "VectorElem", - pos: position{line: 1133, col: 1, offset: 28111}, + pos: position{line: 1146, col: 1, offset: 28365}, expr: &choiceExpr{ - pos: position{line: 1134, col: 5, offset: 28126}, + pos: position{line: 1147, col: 5, offset: 28380}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1134, col: 5, offset: 28126}, + pos: position{line: 1147, col: 5, offset: 28380}, name: "Spread", }, &actionExpr{ - pos: position{line: 1135, col: 5, offset: 28137}, + pos: position{line: 1148, col: 5, offset: 28391}, run: (*parser).callonVectorElem3, expr: &labeledExpr{ - pos: position{line: 1135, col: 5, offset: 28137}, + pos: position{line: 1148, col: 5, offset: 28391}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1135, col: 7, offset: 28139}, + pos: position{line: 1148, col: 7, offset: 28393}, name: "Expr", }, }, @@ -7839,37 +7899,37 @@ var g = &grammar{ }, { name: "Map", - pos: position{line: 1137, col: 1, offset: 28219}, + pos: position{line: 1150, col: 1, offset: 28473}, expr: &actionExpr{ - pos: position{line: 1138, col: 5, offset: 28227}, + pos: position{line: 1151, col: 5, offset: 28481}, run: (*parser).callonMap1, expr: &seqExpr{ - pos: position{line: 1138, col: 5, offset: 28227}, + pos: position{line: 1151, col: 5, offset: 28481}, exprs: []any{ &litMatcher{ - pos: position{line: 1138, col: 5, offset: 28227}, + pos: position{line: 1151, col: 5, offset: 28481}, val: "|{", ignoreCase: false, want: "\"|{\"", }, &ruleRefExpr{ - pos: position{line: 1138, col: 10, offset: 28232}, + pos: position{line: 1151, col: 10, offset: 28486}, name: "__", }, &labeledExpr{ - pos: position{line: 1138, col: 13, offset: 28235}, + pos: position{line: 1151, col: 13, offset: 28489}, label: "exprs", expr: &ruleRefExpr{ - pos: position{line: 1138, col: 19, offset: 28241}, + pos: position{line: 1151, col: 19, offset: 28495}, name: "Entries", }, }, &ruleRefExpr{ - pos: position{line: 1138, col: 27, offset: 28249}, + pos: position{line: 1151, col: 27, offset: 28503}, name: "__", }, &litMatcher{ - pos: position{line: 1138, col: 30, offset: 28252}, + pos: position{line: 1151, col: 30, offset: 28506}, val: "}|", ignoreCase: false, want: "\"}|\"", @@ -7882,31 +7942,31 @@ var g = &grammar{ }, { name: "Entries", - pos: position{line: 1147, col: 1, offset: 28448}, + pos: position{line: 1160, col: 1, offset: 28702}, expr: &choiceExpr{ - pos: position{line: 1148, col: 5, offset: 28460}, + pos: position{line: 1161, col: 5, offset: 28714}, alternatives: []any{ &actionExpr{ - pos: position{line: 1148, col: 5, offset: 28460}, + pos: position{line: 1161, col: 5, offset: 28714}, run: (*parser).callonEntries2, expr: &seqExpr{ - pos: position{line: 1148, col: 5, offset: 28460}, + pos: position{line: 1161, col: 5, offset: 28714}, exprs: []any{ &labeledExpr{ - pos: position{line: 1148, col: 5, offset: 28460}, + pos: position{line: 1161, col: 5, offset: 28714}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1148, col: 11, offset: 28466}, + pos: position{line: 1161, col: 11, offset: 28720}, name: "Entry", }, }, &labeledExpr{ - pos: position{line: 1148, col: 17, offset: 28472}, + pos: position{line: 1161, col: 17, offset: 28726}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1148, col: 22, offset: 28477}, + pos: position{line: 1161, col: 22, offset: 28731}, expr: &ruleRefExpr{ - pos: position{line: 1148, col: 22, offset: 28477}, + pos: position{line: 1161, col: 22, offset: 28731}, name: "EntryTail", }, }, @@ -7915,10 +7975,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1151, col: 5, offset: 28535}, + pos: position{line: 1164, col: 5, offset: 28789}, run: (*parser).callonEntries9, expr: &ruleRefExpr{ - pos: position{line: 1151, col: 5, offset: 28535}, + pos: position{line: 1164, col: 5, offset: 28789}, name: "__", }, }, @@ -7929,32 +7989,32 @@ var g = &grammar{ }, { name: "EntryTail", - pos: position{line: 1154, col: 1, offset: 28560}, + pos: position{line: 1167, col: 1, offset: 28814}, expr: &actionExpr{ - pos: position{line: 1154, col: 13, offset: 28572}, + pos: position{line: 1167, col: 13, offset: 28826}, run: (*parser).callonEntryTail1, expr: &seqExpr{ - pos: position{line: 1154, col: 13, offset: 28572}, + pos: position{line: 1167, col: 13, offset: 28826}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1154, col: 13, offset: 28572}, + pos: position{line: 1167, col: 13, offset: 28826}, name: "__", }, &litMatcher{ - pos: position{line: 1154, col: 16, offset: 28575}, + pos: position{line: 1167, col: 16, offset: 28829}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1154, col: 20, offset: 28579}, + pos: position{line: 1167, col: 20, offset: 28833}, name: "__", }, &labeledExpr{ - pos: position{line: 1154, col: 23, offset: 28582}, + pos: position{line: 1167, col: 23, offset: 28836}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1154, col: 25, offset: 28584}, + pos: position{line: 1167, col: 25, offset: 28838}, name: "Entry", }, }, @@ -7966,40 +8026,40 @@ var g = &grammar{ }, { name: "Entry", - pos: position{line: 1156, col: 1, offset: 28609}, + pos: position{line: 1169, col: 1, offset: 28863}, expr: &actionExpr{ - pos: position{line: 1157, col: 5, offset: 28619}, + pos: position{line: 1170, col: 5, offset: 28873}, run: (*parser).callonEntry1, expr: &seqExpr{ - pos: position{line: 1157, col: 5, offset: 28619}, + pos: position{line: 1170, col: 5, offset: 28873}, exprs: []any{ &labeledExpr{ - pos: position{line: 1157, col: 5, offset: 28619}, + pos: position{line: 1170, col: 5, offset: 28873}, label: "key", expr: &ruleRefExpr{ - pos: position{line: 1157, col: 9, offset: 28623}, + pos: position{line: 1170, col: 9, offset: 28877}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1157, col: 14, offset: 28628}, + pos: position{line: 1170, col: 14, offset: 28882}, name: "__", }, &litMatcher{ - pos: position{line: 1157, col: 17, offset: 28631}, + pos: position{line: 1170, col: 17, offset: 28885}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1157, col: 21, offset: 28635}, + pos: position{line: 1170, col: 21, offset: 28889}, name: "__", }, &labeledExpr{ - pos: position{line: 1157, col: 24, offset: 28638}, + pos: position{line: 1170, col: 24, offset: 28892}, label: "value", expr: &ruleRefExpr{ - pos: position{line: 1157, col: 30, offset: 28644}, + pos: position{line: 1170, col: 30, offset: 28898}, name: "Expr", }, }, @@ -8011,56 +8071,56 @@ var g = &grammar{ }, { name: "Literal", - pos: position{line: 1163, col: 1, offset: 28758}, + pos: position{line: 1176, col: 1, offset: 29012}, expr: &choiceExpr{ - pos: position{line: 1164, col: 5, offset: 28770}, + pos: position{line: 1177, col: 5, offset: 29024}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1164, col: 5, offset: 28770}, + pos: position{line: 1177, col: 5, offset: 29024}, name: "TypeLiteral", }, &ruleRefExpr{ - pos: position{line: 1165, col: 5, offset: 28786}, + pos: position{line: 1178, col: 5, offset: 29040}, name: "StringLiteral", }, &ruleRefExpr{ - pos: position{line: 1166, col: 5, offset: 28804}, + pos: position{line: 1179, col: 5, offset: 29058}, name: "FString", }, &ruleRefExpr{ - pos: position{line: 1167, col: 5, offset: 28816}, + pos: position{line: 1180, col: 5, offset: 29070}, name: "SubnetLiteral", }, &ruleRefExpr{ - pos: position{line: 1168, col: 5, offset: 28834}, + pos: position{line: 1181, col: 5, offset: 29088}, name: "AddressLiteral", }, &ruleRefExpr{ - pos: position{line: 1169, col: 5, offset: 28853}, + pos: position{line: 1182, col: 5, offset: 29107}, name: "BytesLiteral", }, &ruleRefExpr{ - pos: position{line: 1170, col: 5, offset: 28870}, + pos: position{line: 1183, col: 5, offset: 29124}, name: "Duration", }, &ruleRefExpr{ - pos: position{line: 1171, col: 5, offset: 28883}, + pos: position{line: 1184, col: 5, offset: 29137}, name: "Time", }, &ruleRefExpr{ - pos: position{line: 1172, col: 5, offset: 28892}, + pos: position{line: 1185, col: 5, offset: 29146}, name: "FloatLiteral", }, &ruleRefExpr{ - pos: position{line: 1173, col: 5, offset: 28909}, + pos: position{line: 1186, col: 5, offset: 29163}, name: "IntegerLiteral", }, &ruleRefExpr{ - pos: position{line: 1174, col: 5, offset: 28928}, + pos: position{line: 1187, col: 5, offset: 29182}, name: "BooleanLiteral", }, &ruleRefExpr{ - pos: position{line: 1175, col: 5, offset: 28947}, + pos: position{line: 1188, col: 5, offset: 29201}, name: "NullLiteral", }, }, @@ -8070,28 +8130,28 @@ var g = &grammar{ }, { name: "SubnetLiteral", - pos: position{line: 1177, col: 1, offset: 28960}, + pos: position{line: 1190, col: 1, offset: 29214}, expr: &choiceExpr{ - pos: position{line: 1178, col: 5, offset: 28978}, + pos: position{line: 1191, col: 5, offset: 29232}, alternatives: []any{ &actionExpr{ - pos: position{line: 1178, col: 5, offset: 28978}, + pos: position{line: 1191, col: 5, offset: 29232}, run: (*parser).callonSubnetLiteral2, expr: &seqExpr{ - pos: position{line: 1178, col: 5, offset: 28978}, + pos: position{line: 1191, col: 5, offset: 29232}, exprs: []any{ &labeledExpr{ - pos: position{line: 1178, col: 5, offset: 28978}, + pos: position{line: 1191, col: 5, offset: 29232}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1178, col: 7, offset: 28980}, + pos: position{line: 1191, col: 7, offset: 29234}, name: "IP6Net", }, }, ¬Expr{ - pos: position{line: 1178, col: 14, offset: 28987}, + pos: position{line: 1191, col: 14, offset: 29241}, expr: &ruleRefExpr{ - pos: position{line: 1178, col: 15, offset: 28988}, + pos: position{line: 1191, col: 15, offset: 29242}, name: "IdentifierRest", }, }, @@ -8099,13 +8159,13 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1181, col: 5, offset: 29068}, + pos: position{line: 1194, col: 5, offset: 29322}, run: (*parser).callonSubnetLiteral8, expr: &labeledExpr{ - pos: position{line: 1181, col: 5, offset: 29068}, + pos: position{line: 1194, col: 5, offset: 29322}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1181, col: 7, offset: 29070}, + pos: position{line: 1194, col: 7, offset: 29324}, name: "IP4Net", }, }, @@ -8117,28 +8177,28 @@ var g = &grammar{ }, { name: "AddressLiteral", - pos: position{line: 1185, col: 1, offset: 29139}, + pos: position{line: 1198, col: 1, offset: 29393}, expr: &choiceExpr{ - pos: position{line: 1186, col: 5, offset: 29158}, + pos: position{line: 1199, col: 5, offset: 29412}, alternatives: []any{ &actionExpr{ - pos: position{line: 1186, col: 5, offset: 29158}, + pos: position{line: 1199, col: 5, offset: 29412}, run: (*parser).callonAddressLiteral2, expr: &seqExpr{ - pos: position{line: 1186, col: 5, offset: 29158}, + pos: position{line: 1199, col: 5, offset: 29412}, exprs: []any{ &labeledExpr{ - pos: position{line: 1186, col: 5, offset: 29158}, + pos: position{line: 1199, col: 5, offset: 29412}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1186, col: 7, offset: 29160}, + pos: position{line: 1199, col: 7, offset: 29414}, name: "IP6", }, }, ¬Expr{ - pos: position{line: 1186, col: 11, offset: 29164}, + pos: position{line: 1199, col: 11, offset: 29418}, expr: &ruleRefExpr{ - pos: position{line: 1186, col: 12, offset: 29165}, + pos: position{line: 1199, col: 12, offset: 29419}, name: "IdentifierRest", }, }, @@ -8146,13 +8206,13 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1189, col: 5, offset: 29244}, + pos: position{line: 1202, col: 5, offset: 29498}, run: (*parser).callonAddressLiteral8, expr: &labeledExpr{ - pos: position{line: 1189, col: 5, offset: 29244}, + pos: position{line: 1202, col: 5, offset: 29498}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1189, col: 7, offset: 29246}, + pos: position{line: 1202, col: 7, offset: 29500}, name: "IP", }, }, @@ -8164,15 +8224,15 @@ var g = &grammar{ }, { name: "FloatLiteral", - pos: position{line: 1193, col: 1, offset: 29310}, + pos: position{line: 1206, col: 1, offset: 29564}, expr: &actionExpr{ - pos: position{line: 1194, col: 5, offset: 29327}, + pos: position{line: 1207, col: 5, offset: 29581}, run: (*parser).callonFloatLiteral1, expr: &labeledExpr{ - pos: position{line: 1194, col: 5, offset: 29327}, + pos: position{line: 1207, col: 5, offset: 29581}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1194, col: 7, offset: 29329}, + pos: position{line: 1207, col: 7, offset: 29583}, name: "FloatString", }, }, @@ -8182,15 +8242,15 @@ var g = &grammar{ }, { name: "IntegerLiteral", - pos: position{line: 1198, col: 1, offset: 29407}, + pos: position{line: 1211, col: 1, offset: 29661}, expr: &actionExpr{ - pos: position{line: 1199, col: 5, offset: 29426}, + pos: position{line: 1212, col: 5, offset: 29680}, run: (*parser).callonIntegerLiteral1, expr: &labeledExpr{ - pos: position{line: 1199, col: 5, offset: 29426}, + pos: position{line: 1212, col: 5, offset: 29680}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1199, col: 7, offset: 29428}, + pos: position{line: 1212, col: 7, offset: 29682}, name: "IntString", }, }, @@ -8200,23 +8260,23 @@ var g = &grammar{ }, { name: "BooleanLiteral", - pos: position{line: 1203, col: 1, offset: 29502}, + pos: position{line: 1216, col: 1, offset: 29756}, expr: &choiceExpr{ - pos: position{line: 1204, col: 5, offset: 29521}, + pos: position{line: 1217, col: 5, offset: 29775}, alternatives: []any{ &actionExpr{ - pos: position{line: 1204, col: 5, offset: 29521}, + pos: position{line: 1217, col: 5, offset: 29775}, run: (*parser).callonBooleanLiteral2, expr: &ruleRefExpr{ - pos: position{line: 1204, col: 5, offset: 29521}, + pos: position{line: 1217, col: 5, offset: 29775}, name: "TrueToken", }, }, &actionExpr{ - pos: position{line: 1205, col: 5, offset: 29584}, + pos: position{line: 1218, col: 5, offset: 29838}, run: (*parser).callonBooleanLiteral4, expr: &ruleRefExpr{ - pos: position{line: 1205, col: 5, offset: 29584}, + pos: position{line: 1218, col: 5, offset: 29838}, name: "FalseToken", }, }, @@ -8227,12 +8287,12 @@ var g = &grammar{ }, { name: "NullLiteral", - pos: position{line: 1207, col: 1, offset: 29645}, + pos: position{line: 1220, col: 1, offset: 29899}, expr: &actionExpr{ - pos: position{line: 1208, col: 5, offset: 29661}, + pos: position{line: 1221, col: 5, offset: 29915}, run: (*parser).callonNullLiteral1, expr: &ruleRefExpr{ - pos: position{line: 1208, col: 5, offset: 29661}, + pos: position{line: 1221, col: 5, offset: 29915}, name: "NullToken", }, }, @@ -8241,23 +8301,23 @@ var g = &grammar{ }, { name: "BytesLiteral", - pos: position{line: 1210, col: 1, offset: 29716}, + pos: position{line: 1223, col: 1, offset: 29970}, expr: &actionExpr{ - pos: position{line: 1211, col: 5, offset: 29733}, + pos: position{line: 1224, col: 5, offset: 29987}, run: (*parser).callonBytesLiteral1, expr: &seqExpr{ - pos: position{line: 1211, col: 5, offset: 29733}, + pos: position{line: 1224, col: 5, offset: 29987}, exprs: []any{ &litMatcher{ - pos: position{line: 1211, col: 5, offset: 29733}, + pos: position{line: 1224, col: 5, offset: 29987}, val: "0x", ignoreCase: false, want: "\"0x\"", }, &zeroOrMoreExpr{ - pos: position{line: 1211, col: 10, offset: 29738}, + pos: position{line: 1224, col: 10, offset: 29992}, expr: &ruleRefExpr{ - pos: position{line: 1211, col: 10, offset: 29738}, + pos: position{line: 1224, col: 10, offset: 29992}, name: "HexDigit", }, }, @@ -8269,29 +8329,29 @@ var g = &grammar{ }, { name: "TypeLiteral", - pos: position{line: 1215, col: 1, offset: 29812}, + pos: position{line: 1228, col: 1, offset: 30066}, expr: &actionExpr{ - pos: position{line: 1216, col: 5, offset: 29828}, + pos: position{line: 1229, col: 5, offset: 30082}, run: (*parser).callonTypeLiteral1, expr: &seqExpr{ - pos: position{line: 1216, col: 5, offset: 29828}, + pos: position{line: 1229, col: 5, offset: 30082}, exprs: []any{ &litMatcher{ - pos: position{line: 1216, col: 5, offset: 29828}, + pos: position{line: 1229, col: 5, offset: 30082}, val: "<", ignoreCase: false, want: "\"<\"", }, &labeledExpr{ - pos: position{line: 1216, col: 9, offset: 29832}, + pos: position{line: 1229, col: 9, offset: 30086}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1216, col: 13, offset: 29836}, + pos: position{line: 1229, col: 13, offset: 30090}, name: "Type", }, }, &litMatcher{ - pos: position{line: 1216, col: 18, offset: 29841}, + pos: position{line: 1229, col: 18, offset: 30095}, val: ">", ignoreCase: false, want: "\">\"", @@ -8304,16 +8364,16 @@ var g = &grammar{ }, { name: "Type", - pos: position{line: 1225, col: 1, offset: 30022}, + pos: position{line: 1238, col: 1, offset: 30276}, expr: &choiceExpr{ - pos: position{line: 1226, col: 5, offset: 30031}, + pos: position{line: 1239, col: 5, offset: 30285}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1226, col: 5, offset: 30031}, + pos: position{line: 1239, col: 5, offset: 30285}, name: "AmbiguousType", }, &ruleRefExpr{ - pos: position{line: 1227, col: 5, offset: 30049}, + pos: position{line: 1240, col: 5, offset: 30303}, name: "ComplexType", }, }, @@ -8323,28 +8383,28 @@ var g = &grammar{ }, { name: "AmbiguousType", - pos: position{line: 1229, col: 1, offset: 30062}, + pos: position{line: 1242, col: 1, offset: 30316}, expr: &choiceExpr{ - pos: position{line: 1230, col: 5, offset: 30080}, + pos: position{line: 1243, col: 5, offset: 30334}, alternatives: []any{ &actionExpr{ - pos: position{line: 1230, col: 5, offset: 30080}, + pos: position{line: 1243, col: 5, offset: 30334}, run: (*parser).callonAmbiguousType2, expr: &seqExpr{ - pos: position{line: 1230, col: 5, offset: 30080}, + pos: position{line: 1243, col: 5, offset: 30334}, exprs: []any{ &labeledExpr{ - pos: position{line: 1230, col: 5, offset: 30080}, + pos: position{line: 1243, col: 5, offset: 30334}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1230, col: 10, offset: 30085}, + pos: position{line: 1243, col: 10, offset: 30339}, name: "PrimitiveType", }, }, ¬Expr{ - pos: position{line: 1230, col: 24, offset: 30099}, + pos: position{line: 1243, col: 24, offset: 30353}, expr: &ruleRefExpr{ - pos: position{line: 1230, col: 25, offset: 30100}, + pos: position{line: 1243, col: 25, offset: 30354}, name: "IdentifierRest", }, }, @@ -8352,45 +8412,45 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1231, col: 5, offset: 30140}, + pos: position{line: 1244, col: 5, offset: 30394}, run: (*parser).callonAmbiguousType8, expr: &seqExpr{ - pos: position{line: 1231, col: 5, offset: 30140}, + pos: position{line: 1244, col: 5, offset: 30394}, exprs: []any{ &litMatcher{ - pos: position{line: 1231, col: 5, offset: 30140}, + pos: position{line: 1244, col: 5, offset: 30394}, val: "error", ignoreCase: false, want: "\"error\"", }, &ruleRefExpr{ - pos: position{line: 1231, col: 13, offset: 30148}, + pos: position{line: 1244, col: 13, offset: 30402}, name: "__", }, &litMatcher{ - pos: position{line: 1231, col: 16, offset: 30151}, + pos: position{line: 1244, col: 16, offset: 30405}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1231, col: 20, offset: 30155}, + pos: position{line: 1244, col: 20, offset: 30409}, name: "__", }, &labeledExpr{ - pos: position{line: 1231, col: 23, offset: 30158}, + pos: position{line: 1244, col: 23, offset: 30412}, label: "t", expr: &ruleRefExpr{ - pos: position{line: 1231, col: 25, offset: 30160}, + pos: position{line: 1244, col: 25, offset: 30414}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1231, col: 30, offset: 30165}, + pos: position{line: 1244, col: 30, offset: 30419}, name: "__", }, &litMatcher{ - pos: position{line: 1231, col: 33, offset: 30168}, + pos: position{line: 1244, col: 33, offset: 30422}, val: ")", ignoreCase: false, want: "\")\"", @@ -8399,52 +8459,52 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1239, col: 5, offset: 30362}, + pos: position{line: 1252, col: 5, offset: 30616}, run: (*parser).callonAmbiguousType18, expr: &seqExpr{ - pos: position{line: 1239, col: 5, offset: 30362}, + pos: position{line: 1252, col: 5, offset: 30616}, exprs: []any{ &labeledExpr{ - pos: position{line: 1239, col: 5, offset: 30362}, + pos: position{line: 1252, col: 5, offset: 30616}, label: "name", expr: &choiceExpr{ - pos: position{line: 1239, col: 11, offset: 30368}, + pos: position{line: 1252, col: 11, offset: 30622}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1239, col: 11, offset: 30368}, + pos: position{line: 1252, col: 11, offset: 30622}, name: "IdentifierName", }, &ruleRefExpr{ - pos: position{line: 1239, col: 28, offset: 30385}, + pos: position{line: 1252, col: 28, offset: 30639}, name: "QuotedString", }, }, }, }, &labeledExpr{ - pos: position{line: 1239, col: 42, offset: 30399}, + pos: position{line: 1252, col: 42, offset: 30653}, label: "opt", expr: &zeroOrOneExpr{ - pos: position{line: 1239, col: 46, offset: 30403}, + pos: position{line: 1252, col: 46, offset: 30657}, expr: &seqExpr{ - pos: position{line: 1239, col: 47, offset: 30404}, + pos: position{line: 1252, col: 47, offset: 30658}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1239, col: 47, offset: 30404}, + pos: position{line: 1252, col: 47, offset: 30658}, name: "__", }, &litMatcher{ - pos: position{line: 1239, col: 50, offset: 30407}, + pos: position{line: 1252, col: 50, offset: 30661}, val: "=", ignoreCase: false, want: "\"=\"", }, &ruleRefExpr{ - pos: position{line: 1239, col: 54, offset: 30411}, + pos: position{line: 1252, col: 54, offset: 30665}, name: "__", }, &ruleRefExpr{ - pos: position{line: 1239, col: 57, offset: 30414}, + pos: position{line: 1252, col: 57, offset: 30668}, name: "Type", }, }, @@ -8455,31 +8515,31 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1250, col: 5, offset: 30752}, + pos: position{line: 1263, col: 5, offset: 31006}, run: (*parser).callonAmbiguousType31, expr: &seqExpr{ - pos: position{line: 1250, col: 5, offset: 30752}, + pos: position{line: 1263, col: 5, offset: 31006}, exprs: []any{ &litMatcher{ - pos: position{line: 1250, col: 5, offset: 30752}, + pos: position{line: 1263, col: 5, offset: 31006}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 1250, col: 9, offset: 30756}, + pos: position{line: 1263, col: 9, offset: 31010}, name: "__", }, &labeledExpr{ - pos: position{line: 1250, col: 12, offset: 30759}, + pos: position{line: 1263, col: 12, offset: 31013}, label: "types", expr: &ruleRefExpr{ - pos: position{line: 1250, col: 18, offset: 30765}, + pos: position{line: 1263, col: 18, offset: 31019}, name: "TypeList", }, }, &litMatcher{ - pos: position{line: 1250, col: 27, offset: 30774}, + pos: position{line: 1263, col: 27, offset: 31028}, val: ")", ignoreCase: false, want: "\")\"", @@ -8494,28 +8554,28 @@ var g = &grammar{ }, { name: "TypeList", - pos: position{line: 1259, col: 1, offset: 30966}, + pos: position{line: 1272, col: 1, offset: 31220}, expr: &actionExpr{ - pos: position{line: 1260, col: 5, offset: 30979}, + pos: position{line: 1273, col: 5, offset: 31233}, run: (*parser).callonTypeList1, expr: &seqExpr{ - pos: position{line: 1260, col: 5, offset: 30979}, + pos: position{line: 1273, col: 5, offset: 31233}, exprs: []any{ &labeledExpr{ - pos: position{line: 1260, col: 5, offset: 30979}, + pos: position{line: 1273, col: 5, offset: 31233}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1260, col: 11, offset: 30985}, + pos: position{line: 1273, col: 11, offset: 31239}, name: "Type", }, }, &labeledExpr{ - pos: position{line: 1260, col: 16, offset: 30990}, + pos: position{line: 1273, col: 16, offset: 31244}, label: "rest", expr: &oneOrMoreExpr{ - pos: position{line: 1260, col: 21, offset: 30995}, + pos: position{line: 1273, col: 21, offset: 31249}, expr: &ruleRefExpr{ - pos: position{line: 1260, col: 21, offset: 30995}, + pos: position{line: 1273, col: 21, offset: 31249}, name: "TypeListTail", }, }, @@ -8528,32 +8588,32 @@ var g = &grammar{ }, { name: "TypeListTail", - pos: position{line: 1264, col: 1, offset: 31053}, + pos: position{line: 1277, col: 1, offset: 31307}, expr: &actionExpr{ - pos: position{line: 1264, col: 16, offset: 31068}, + pos: position{line: 1277, col: 16, offset: 31322}, run: (*parser).callonTypeListTail1, expr: &seqExpr{ - pos: position{line: 1264, col: 16, offset: 31068}, + pos: position{line: 1277, col: 16, offset: 31322}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1264, col: 16, offset: 31068}, + pos: position{line: 1277, col: 16, offset: 31322}, name: "__", }, &litMatcher{ - pos: position{line: 1264, col: 19, offset: 31071}, + pos: position{line: 1277, col: 19, offset: 31325}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1264, col: 23, offset: 31075}, + pos: position{line: 1277, col: 23, offset: 31329}, name: "__", }, &labeledExpr{ - pos: position{line: 1264, col: 26, offset: 31078}, + pos: position{line: 1277, col: 26, offset: 31332}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1264, col: 30, offset: 31082}, + pos: position{line: 1277, col: 30, offset: 31336}, name: "Type", }, }, @@ -8565,40 +8625,40 @@ var g = &grammar{ }, { name: "ComplexType", - pos: position{line: 1266, col: 1, offset: 31108}, + pos: position{line: 1279, col: 1, offset: 31362}, expr: &choiceExpr{ - pos: position{line: 1267, col: 5, offset: 31124}, + pos: position{line: 1280, col: 5, offset: 31378}, alternatives: []any{ &actionExpr{ - pos: position{line: 1267, col: 5, offset: 31124}, + pos: position{line: 1280, col: 5, offset: 31378}, run: (*parser).callonComplexType2, expr: &seqExpr{ - pos: position{line: 1267, col: 5, offset: 31124}, + pos: position{line: 1280, col: 5, offset: 31378}, exprs: []any{ &litMatcher{ - pos: position{line: 1267, col: 5, offset: 31124}, + pos: position{line: 1280, col: 5, offset: 31378}, val: "{", ignoreCase: false, want: "\"{\"", }, &ruleRefExpr{ - pos: position{line: 1267, col: 9, offset: 31128}, + pos: position{line: 1280, col: 9, offset: 31382}, name: "__", }, &labeledExpr{ - pos: position{line: 1267, col: 12, offset: 31131}, + pos: position{line: 1280, col: 12, offset: 31385}, label: "fields", expr: &ruleRefExpr{ - pos: position{line: 1267, col: 19, offset: 31138}, + pos: position{line: 1280, col: 19, offset: 31392}, name: "TypeFieldList", }, }, &ruleRefExpr{ - pos: position{line: 1267, col: 33, offset: 31152}, + pos: position{line: 1280, col: 33, offset: 31406}, name: "__", }, &litMatcher{ - pos: position{line: 1267, col: 36, offset: 31155}, + pos: position{line: 1280, col: 36, offset: 31409}, val: "}", ignoreCase: false, want: "\"}\"", @@ -8607,35 +8667,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1275, col: 5, offset: 31367}, + pos: position{line: 1288, col: 5, offset: 31621}, run: (*parser).callonComplexType10, expr: &seqExpr{ - pos: position{line: 1275, col: 5, offset: 31367}, + pos: position{line: 1288, col: 5, offset: 31621}, exprs: []any{ &litMatcher{ - pos: position{line: 1275, col: 5, offset: 31367}, + pos: position{line: 1288, col: 5, offset: 31621}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 1275, col: 9, offset: 31371}, + pos: position{line: 1288, col: 9, offset: 31625}, name: "__", }, &labeledExpr{ - pos: position{line: 1275, col: 12, offset: 31374}, + pos: position{line: 1288, col: 12, offset: 31628}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1275, col: 16, offset: 31378}, + pos: position{line: 1288, col: 16, offset: 31632}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1275, col: 21, offset: 31383}, + pos: position{line: 1288, col: 21, offset: 31637}, name: "__", }, &litMatcher{ - pos: position{line: 1275, col: 24, offset: 31386}, + pos: position{line: 1288, col: 24, offset: 31640}, val: "]", ignoreCase: false, want: "\"]\"", @@ -8644,35 +8704,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1283, col: 5, offset: 31578}, + pos: position{line: 1296, col: 5, offset: 31832}, run: (*parser).callonComplexType18, expr: &seqExpr{ - pos: position{line: 1283, col: 5, offset: 31578}, + pos: position{line: 1296, col: 5, offset: 31832}, exprs: []any{ &litMatcher{ - pos: position{line: 1283, col: 5, offset: 31578}, + pos: position{line: 1296, col: 5, offset: 31832}, val: "|[", ignoreCase: false, want: "\"|[\"", }, &ruleRefExpr{ - pos: position{line: 1283, col: 10, offset: 31583}, + pos: position{line: 1296, col: 10, offset: 31837}, name: "__", }, &labeledExpr{ - pos: position{line: 1283, col: 13, offset: 31586}, + pos: position{line: 1296, col: 13, offset: 31840}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1283, col: 17, offset: 31590}, + pos: position{line: 1296, col: 17, offset: 31844}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1283, col: 22, offset: 31595}, + pos: position{line: 1296, col: 22, offset: 31849}, name: "__", }, &litMatcher{ - pos: position{line: 1283, col: 25, offset: 31598}, + pos: position{line: 1296, col: 25, offset: 31852}, val: "]|", ignoreCase: false, want: "\"]|\"", @@ -8681,57 +8741,57 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1291, col: 5, offset: 31785}, + pos: position{line: 1304, col: 5, offset: 32039}, run: (*parser).callonComplexType26, expr: &seqExpr{ - pos: position{line: 1291, col: 5, offset: 31785}, + pos: position{line: 1304, col: 5, offset: 32039}, exprs: []any{ &litMatcher{ - pos: position{line: 1291, col: 5, offset: 31785}, + pos: position{line: 1304, col: 5, offset: 32039}, val: "|{", ignoreCase: false, want: "\"|{\"", }, &ruleRefExpr{ - pos: position{line: 1291, col: 10, offset: 31790}, + pos: position{line: 1304, col: 10, offset: 32044}, name: "__", }, &labeledExpr{ - pos: position{line: 1291, col: 13, offset: 31793}, + pos: position{line: 1304, col: 13, offset: 32047}, label: "keyType", expr: &ruleRefExpr{ - pos: position{line: 1291, col: 21, offset: 31801}, + pos: position{line: 1304, col: 21, offset: 32055}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1291, col: 26, offset: 31806}, + pos: position{line: 1304, col: 26, offset: 32060}, name: "__", }, &litMatcher{ - pos: position{line: 1291, col: 29, offset: 31809}, + pos: position{line: 1304, col: 29, offset: 32063}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1291, col: 33, offset: 31813}, + pos: position{line: 1304, col: 33, offset: 32067}, name: "__", }, &labeledExpr{ - pos: position{line: 1291, col: 36, offset: 31816}, + pos: position{line: 1304, col: 36, offset: 32070}, label: "valType", expr: &ruleRefExpr{ - pos: position{line: 1291, col: 44, offset: 31824}, + pos: position{line: 1304, col: 44, offset: 32078}, name: "Type", }, }, &ruleRefExpr{ - pos: position{line: 1291, col: 49, offset: 31829}, + pos: position{line: 1304, col: 49, offset: 32083}, name: "__", }, &litMatcher{ - pos: position{line: 1291, col: 52, offset: 31832}, + pos: position{line: 1304, col: 52, offset: 32086}, val: "}|", ignoreCase: false, want: "\"}|\"", @@ -8746,35 +8806,35 @@ var g = &grammar{ }, { name: "StringLiteral", - pos: position{line: 1301, col: 1, offset: 32055}, + pos: position{line: 1314, col: 1, offset: 32309}, expr: &choiceExpr{ - pos: position{line: 1302, col: 5, offset: 32073}, + pos: position{line: 1315, col: 5, offset: 32327}, alternatives: []any{ &actionExpr{ - pos: position{line: 1302, col: 5, offset: 32073}, + pos: position{line: 1315, col: 5, offset: 32327}, run: (*parser).callonStringLiteral2, expr: &seqExpr{ - pos: position{line: 1302, col: 5, offset: 32073}, + pos: position{line: 1315, col: 5, offset: 32327}, exprs: []any{ &litMatcher{ - pos: position{line: 1302, col: 5, offset: 32073}, + pos: position{line: 1315, col: 5, offset: 32327}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, &labeledExpr{ - pos: position{line: 1302, col: 9, offset: 32077}, + pos: position{line: 1315, col: 9, offset: 32331}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1302, col: 11, offset: 32079}, + pos: position{line: 1315, col: 11, offset: 32333}, expr: &ruleRefExpr{ - pos: position{line: 1302, col: 11, offset: 32079}, + pos: position{line: 1315, col: 11, offset: 32333}, name: "DoubleQuotedChar", }, }, }, &litMatcher{ - pos: position{line: 1302, col: 29, offset: 32097}, + pos: position{line: 1315, col: 29, offset: 32351}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -8783,30 +8843,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1303, col: 5, offset: 32161}, + pos: position{line: 1316, col: 5, offset: 32415}, run: (*parser).callonStringLiteral9, expr: &seqExpr{ - pos: position{line: 1303, col: 5, offset: 32161}, + pos: position{line: 1316, col: 5, offset: 32415}, exprs: []any{ &litMatcher{ - pos: position{line: 1303, col: 5, offset: 32161}, + pos: position{line: 1316, col: 5, offset: 32415}, val: "'", ignoreCase: false, want: "\"'\"", }, &labeledExpr{ - pos: position{line: 1303, col: 9, offset: 32165}, + pos: position{line: 1316, col: 9, offset: 32419}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1303, col: 11, offset: 32167}, + pos: position{line: 1316, col: 11, offset: 32421}, expr: &ruleRefExpr{ - pos: position{line: 1303, col: 11, offset: 32167}, + pos: position{line: 1316, col: 11, offset: 32421}, name: "SingleQuotedChar", }, }, }, &litMatcher{ - pos: position{line: 1303, col: 29, offset: 32185}, + pos: position{line: 1316, col: 29, offset: 32439}, val: "'", ignoreCase: false, want: "\"'\"", @@ -8821,35 +8881,35 @@ var g = &grammar{ }, { name: "FString", - pos: position{line: 1305, col: 1, offset: 32246}, + pos: position{line: 1318, col: 1, offset: 32500}, expr: &choiceExpr{ - pos: position{line: 1306, col: 5, offset: 32258}, + pos: position{line: 1319, col: 5, offset: 32512}, alternatives: []any{ &actionExpr{ - pos: position{line: 1306, col: 5, offset: 32258}, + pos: position{line: 1319, col: 5, offset: 32512}, run: (*parser).callonFString2, expr: &seqExpr{ - pos: position{line: 1306, col: 5, offset: 32258}, + pos: position{line: 1319, col: 5, offset: 32512}, exprs: []any{ &litMatcher{ - pos: position{line: 1306, col: 5, offset: 32258}, + pos: position{line: 1319, col: 5, offset: 32512}, val: "f\"", ignoreCase: false, want: "\"f\\\"\"", }, &labeledExpr{ - pos: position{line: 1306, col: 11, offset: 32264}, + pos: position{line: 1319, col: 11, offset: 32518}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1306, col: 13, offset: 32266}, + pos: position{line: 1319, col: 13, offset: 32520}, expr: &ruleRefExpr{ - pos: position{line: 1306, col: 13, offset: 32266}, + pos: position{line: 1319, col: 13, offset: 32520}, name: "FStringDoubleQuotedElem", }, }, }, &litMatcher{ - pos: position{line: 1306, col: 38, offset: 32291}, + pos: position{line: 1319, col: 38, offset: 32545}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -8858,30 +8918,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1313, col: 5, offset: 32448}, + pos: position{line: 1326, col: 5, offset: 32702}, run: (*parser).callonFString9, expr: &seqExpr{ - pos: position{line: 1313, col: 5, offset: 32448}, + pos: position{line: 1326, col: 5, offset: 32702}, exprs: []any{ &litMatcher{ - pos: position{line: 1313, col: 5, offset: 32448}, + pos: position{line: 1326, col: 5, offset: 32702}, val: "f'", ignoreCase: false, want: "\"f'\"", }, &labeledExpr{ - pos: position{line: 1313, col: 10, offset: 32453}, + pos: position{line: 1326, col: 10, offset: 32707}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1313, col: 12, offset: 32455}, + pos: position{line: 1326, col: 12, offset: 32709}, expr: &ruleRefExpr{ - pos: position{line: 1313, col: 12, offset: 32455}, + pos: position{line: 1326, col: 12, offset: 32709}, name: "FStringSingleQuotedElem", }, }, }, &litMatcher{ - pos: position{line: 1313, col: 37, offset: 32480}, + pos: position{line: 1326, col: 37, offset: 32734}, val: "'", ignoreCase: false, want: "\"'\"", @@ -8896,24 +8956,24 @@ var g = &grammar{ }, { name: "FStringDoubleQuotedElem", - pos: position{line: 1321, col: 1, offset: 32634}, + pos: position{line: 1334, col: 1, offset: 32888}, expr: &choiceExpr{ - pos: position{line: 1322, col: 5, offset: 32662}, + pos: position{line: 1335, col: 5, offset: 32916}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1322, col: 5, offset: 32662}, + pos: position{line: 1335, col: 5, offset: 32916}, name: "FStringExpr", }, &actionExpr{ - pos: position{line: 1323, col: 5, offset: 32678}, + pos: position{line: 1336, col: 5, offset: 32932}, run: (*parser).callonFStringDoubleQuotedElem3, expr: &labeledExpr{ - pos: position{line: 1323, col: 5, offset: 32678}, + pos: position{line: 1336, col: 5, offset: 32932}, label: "v", expr: &oneOrMoreExpr{ - pos: position{line: 1323, col: 7, offset: 32680}, + pos: position{line: 1336, col: 7, offset: 32934}, expr: &ruleRefExpr{ - pos: position{line: 1323, col: 7, offset: 32680}, + pos: position{line: 1336, col: 7, offset: 32934}, name: "FStringDoubleQuotedChar", }, }, @@ -8926,27 +8986,27 @@ var g = &grammar{ }, { name: "FStringDoubleQuotedChar", - pos: position{line: 1327, col: 1, offset: 32813}, + pos: position{line: 1340, col: 1, offset: 33067}, expr: &choiceExpr{ - pos: position{line: 1328, col: 5, offset: 32841}, + pos: position{line: 1341, col: 5, offset: 33095}, alternatives: []any{ &actionExpr{ - pos: position{line: 1328, col: 5, offset: 32841}, + pos: position{line: 1341, col: 5, offset: 33095}, run: (*parser).callonFStringDoubleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1328, col: 5, offset: 32841}, + pos: position{line: 1341, col: 5, offset: 33095}, exprs: []any{ &litMatcher{ - pos: position{line: 1328, col: 5, offset: 32841}, + pos: position{line: 1341, col: 5, offset: 33095}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1328, col: 10, offset: 32846}, + pos: position{line: 1341, col: 10, offset: 33100}, label: "v", expr: &litMatcher{ - pos: position{line: 1328, col: 12, offset: 32848}, + pos: position{line: 1341, col: 12, offset: 33102}, val: "{", ignoreCase: false, want: "\"{\"", @@ -8956,25 +9016,25 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1329, col: 5, offset: 32874}, + pos: position{line: 1342, col: 5, offset: 33128}, run: (*parser).callonFStringDoubleQuotedChar7, expr: &seqExpr{ - pos: position{line: 1329, col: 5, offset: 32874}, + pos: position{line: 1342, col: 5, offset: 33128}, exprs: []any{ ¬Expr{ - pos: position{line: 1329, col: 5, offset: 32874}, + pos: position{line: 1342, col: 5, offset: 33128}, expr: &litMatcher{ - pos: position{line: 1329, col: 7, offset: 32876}, + pos: position{line: 1342, col: 7, offset: 33130}, val: "{", ignoreCase: false, want: "\"{\"", }, }, &labeledExpr{ - pos: position{line: 1329, col: 12, offset: 32881}, + pos: position{line: 1342, col: 12, offset: 33135}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1329, col: 14, offset: 32883}, + pos: position{line: 1342, col: 14, offset: 33137}, name: "DoubleQuotedChar", }, }, @@ -8988,24 +9048,24 @@ var g = &grammar{ }, { name: "FStringSingleQuotedElem", - pos: position{line: 1331, col: 1, offset: 32919}, + pos: position{line: 1344, col: 1, offset: 33173}, expr: &choiceExpr{ - pos: position{line: 1332, col: 5, offset: 32947}, + pos: position{line: 1345, col: 5, offset: 33201}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1332, col: 5, offset: 32947}, + pos: position{line: 1345, col: 5, offset: 33201}, name: "FStringExpr", }, &actionExpr{ - pos: position{line: 1333, col: 5, offset: 32963}, + pos: position{line: 1346, col: 5, offset: 33217}, run: (*parser).callonFStringSingleQuotedElem3, expr: &labeledExpr{ - pos: position{line: 1333, col: 5, offset: 32963}, + pos: position{line: 1346, col: 5, offset: 33217}, label: "v", expr: &oneOrMoreExpr{ - pos: position{line: 1333, col: 7, offset: 32965}, + pos: position{line: 1346, col: 7, offset: 33219}, expr: &ruleRefExpr{ - pos: position{line: 1333, col: 7, offset: 32965}, + pos: position{line: 1346, col: 7, offset: 33219}, name: "FStringSingleQuotedChar", }, }, @@ -9018,27 +9078,27 @@ var g = &grammar{ }, { name: "FStringSingleQuotedChar", - pos: position{line: 1337, col: 1, offset: 33098}, + pos: position{line: 1350, col: 1, offset: 33352}, expr: &choiceExpr{ - pos: position{line: 1338, col: 5, offset: 33126}, + pos: position{line: 1351, col: 5, offset: 33380}, alternatives: []any{ &actionExpr{ - pos: position{line: 1338, col: 5, offset: 33126}, + pos: position{line: 1351, col: 5, offset: 33380}, run: (*parser).callonFStringSingleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1338, col: 5, offset: 33126}, + pos: position{line: 1351, col: 5, offset: 33380}, exprs: []any{ &litMatcher{ - pos: position{line: 1338, col: 5, offset: 33126}, + pos: position{line: 1351, col: 5, offset: 33380}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1338, col: 10, offset: 33131}, + pos: position{line: 1351, col: 10, offset: 33385}, label: "v", expr: &litMatcher{ - pos: position{line: 1338, col: 12, offset: 33133}, + pos: position{line: 1351, col: 12, offset: 33387}, val: "{", ignoreCase: false, want: "\"{\"", @@ -9048,25 +9108,25 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1339, col: 5, offset: 33159}, + pos: position{line: 1352, col: 5, offset: 33413}, run: (*parser).callonFStringSingleQuotedChar7, expr: &seqExpr{ - pos: position{line: 1339, col: 5, offset: 33159}, + pos: position{line: 1352, col: 5, offset: 33413}, exprs: []any{ ¬Expr{ - pos: position{line: 1339, col: 5, offset: 33159}, + pos: position{line: 1352, col: 5, offset: 33413}, expr: &litMatcher{ - pos: position{line: 1339, col: 7, offset: 33161}, + pos: position{line: 1352, col: 7, offset: 33415}, val: "{", ignoreCase: false, want: "\"{\"", }, }, &labeledExpr{ - pos: position{line: 1339, col: 12, offset: 33166}, + pos: position{line: 1352, col: 12, offset: 33420}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1339, col: 14, offset: 33168}, + pos: position{line: 1352, col: 14, offset: 33422}, name: "SingleQuotedChar", }, }, @@ -9080,37 +9140,37 @@ var g = &grammar{ }, { name: "FStringExpr", - pos: position{line: 1341, col: 1, offset: 33204}, + pos: position{line: 1354, col: 1, offset: 33458}, expr: &actionExpr{ - pos: position{line: 1342, col: 5, offset: 33220}, + pos: position{line: 1355, col: 5, offset: 33474}, run: (*parser).callonFStringExpr1, expr: &seqExpr{ - pos: position{line: 1342, col: 5, offset: 33220}, + pos: position{line: 1355, col: 5, offset: 33474}, exprs: []any{ &litMatcher{ - pos: position{line: 1342, col: 5, offset: 33220}, + pos: position{line: 1355, col: 5, offset: 33474}, val: "{", ignoreCase: false, want: "\"{\"", }, &ruleRefExpr{ - pos: position{line: 1342, col: 9, offset: 33224}, + pos: position{line: 1355, col: 9, offset: 33478}, name: "__", }, &labeledExpr{ - pos: position{line: 1342, col: 12, offset: 33227}, + pos: position{line: 1355, col: 12, offset: 33481}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1342, col: 14, offset: 33229}, + pos: position{line: 1355, col: 14, offset: 33483}, name: "Expr", }, }, &ruleRefExpr{ - pos: position{line: 1342, col: 19, offset: 33234}, + pos: position{line: 1355, col: 19, offset: 33488}, name: "__", }, &litMatcher{ - pos: position{line: 1342, col: 22, offset: 33237}, + pos: position{line: 1355, col: 22, offset: 33491}, val: "}", ignoreCase: false, want: "\"}\"", @@ -9123,129 +9183,129 @@ var g = &grammar{ }, { name: "PrimitiveType", - pos: position{line: 1351, col: 1, offset: 33415}, + pos: position{line: 1364, col: 1, offset: 33669}, expr: &actionExpr{ - pos: position{line: 1352, col: 5, offset: 33433}, + pos: position{line: 1365, col: 5, offset: 33687}, run: (*parser).callonPrimitiveType1, expr: &choiceExpr{ - pos: position{line: 1352, col: 9, offset: 33437}, + pos: position{line: 1365, col: 9, offset: 33691}, alternatives: []any{ &litMatcher{ - pos: position{line: 1352, col: 9, offset: 33437}, + pos: position{line: 1365, col: 9, offset: 33691}, val: "uint8", ignoreCase: false, want: "\"uint8\"", }, &litMatcher{ - pos: position{line: 1352, col: 19, offset: 33447}, + pos: position{line: 1365, col: 19, offset: 33701}, val: "uint16", ignoreCase: false, want: "\"uint16\"", }, &litMatcher{ - pos: position{line: 1352, col: 30, offset: 33458}, + pos: position{line: 1365, col: 30, offset: 33712}, val: "uint32", ignoreCase: false, want: "\"uint32\"", }, &litMatcher{ - pos: position{line: 1352, col: 41, offset: 33469}, + pos: position{line: 1365, col: 41, offset: 33723}, val: "uint64", ignoreCase: false, want: "\"uint64\"", }, &litMatcher{ - pos: position{line: 1353, col: 9, offset: 33486}, + pos: position{line: 1366, col: 9, offset: 33740}, val: "int8", ignoreCase: false, want: "\"int8\"", }, &litMatcher{ - pos: position{line: 1353, col: 18, offset: 33495}, + pos: position{line: 1366, col: 18, offset: 33749}, val: "int16", ignoreCase: false, want: "\"int16\"", }, &litMatcher{ - pos: position{line: 1353, col: 28, offset: 33505}, + pos: position{line: 1366, col: 28, offset: 33759}, val: "int32", ignoreCase: false, want: "\"int32\"", }, &litMatcher{ - pos: position{line: 1353, col: 38, offset: 33515}, + pos: position{line: 1366, col: 38, offset: 33769}, val: "int64", ignoreCase: false, want: "\"int64\"", }, &litMatcher{ - pos: position{line: 1354, col: 9, offset: 33531}, + pos: position{line: 1367, col: 9, offset: 33785}, val: "float16", ignoreCase: false, want: "\"float16\"", }, &litMatcher{ - pos: position{line: 1354, col: 21, offset: 33543}, + pos: position{line: 1367, col: 21, offset: 33797}, val: "float32", ignoreCase: false, want: "\"float32\"", }, &litMatcher{ - pos: position{line: 1354, col: 33, offset: 33555}, + pos: position{line: 1367, col: 33, offset: 33809}, val: "float64", ignoreCase: false, want: "\"float64\"", }, &litMatcher{ - pos: position{line: 1355, col: 9, offset: 33573}, + pos: position{line: 1368, col: 9, offset: 33827}, val: "bool", ignoreCase: false, want: "\"bool\"", }, &litMatcher{ - pos: position{line: 1355, col: 18, offset: 33582}, + pos: position{line: 1368, col: 18, offset: 33836}, val: "string", ignoreCase: false, want: "\"string\"", }, &litMatcher{ - pos: position{line: 1356, col: 9, offset: 33599}, + pos: position{line: 1369, col: 9, offset: 33853}, val: "duration", ignoreCase: false, want: "\"duration\"", }, &litMatcher{ - pos: position{line: 1356, col: 22, offset: 33612}, + pos: position{line: 1369, col: 22, offset: 33866}, val: "time", ignoreCase: false, want: "\"time\"", }, &litMatcher{ - pos: position{line: 1357, col: 9, offset: 33627}, + pos: position{line: 1370, col: 9, offset: 33881}, val: "bytes", ignoreCase: false, want: "\"bytes\"", }, &litMatcher{ - pos: position{line: 1358, col: 9, offset: 33643}, + pos: position{line: 1371, col: 9, offset: 33897}, val: "ip", ignoreCase: false, want: "\"ip\"", }, &litMatcher{ - pos: position{line: 1358, col: 16, offset: 33650}, + pos: position{line: 1371, col: 16, offset: 33904}, val: "net", ignoreCase: false, want: "\"net\"", }, &litMatcher{ - pos: position{line: 1359, col: 9, offset: 33664}, + pos: position{line: 1372, col: 9, offset: 33918}, val: "type", ignoreCase: false, want: "\"type\"", }, &litMatcher{ - pos: position{line: 1359, col: 18, offset: 33673}, + pos: position{line: 1372, col: 18, offset: 33927}, val: "null", ignoreCase: false, want: "\"null\"", @@ -9258,31 +9318,31 @@ var g = &grammar{ }, { name: "TypeFieldList", - pos: position{line: 1367, col: 1, offset: 33871}, + pos: position{line: 1380, col: 1, offset: 34125}, expr: &choiceExpr{ - pos: position{line: 1368, col: 5, offset: 33889}, + pos: position{line: 1381, col: 5, offset: 34143}, alternatives: []any{ &actionExpr{ - pos: position{line: 1368, col: 5, offset: 33889}, + pos: position{line: 1381, col: 5, offset: 34143}, run: (*parser).callonTypeFieldList2, expr: &seqExpr{ - pos: position{line: 1368, col: 5, offset: 33889}, + pos: position{line: 1381, col: 5, offset: 34143}, exprs: []any{ &labeledExpr{ - pos: position{line: 1368, col: 5, offset: 33889}, + pos: position{line: 1381, col: 5, offset: 34143}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1368, col: 11, offset: 33895}, + pos: position{line: 1381, col: 11, offset: 34149}, name: "TypeField", }, }, &labeledExpr{ - pos: position{line: 1368, col: 21, offset: 33905}, + pos: position{line: 1381, col: 21, offset: 34159}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1368, col: 26, offset: 33910}, + pos: position{line: 1381, col: 26, offset: 34164}, expr: &ruleRefExpr{ - pos: position{line: 1368, col: 26, offset: 33910}, + pos: position{line: 1381, col: 26, offset: 34164}, name: "TypeFieldListTail", }, }, @@ -9291,10 +9351,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1371, col: 5, offset: 33976}, + pos: position{line: 1384, col: 5, offset: 34230}, run: (*parser).callonTypeFieldList9, expr: &litMatcher{ - pos: position{line: 1371, col: 5, offset: 33976}, + pos: position{line: 1384, col: 5, offset: 34230}, val: "", ignoreCase: false, want: "\"\"", @@ -9307,32 +9367,32 @@ var g = &grammar{ }, { name: "TypeFieldListTail", - pos: position{line: 1373, col: 1, offset: 34000}, + pos: position{line: 1386, col: 1, offset: 34254}, expr: &actionExpr{ - pos: position{line: 1373, col: 21, offset: 34020}, + pos: position{line: 1386, col: 21, offset: 34274}, run: (*parser).callonTypeFieldListTail1, expr: &seqExpr{ - pos: position{line: 1373, col: 21, offset: 34020}, + pos: position{line: 1386, col: 21, offset: 34274}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1373, col: 21, offset: 34020}, + pos: position{line: 1386, col: 21, offset: 34274}, name: "__", }, &litMatcher{ - pos: position{line: 1373, col: 24, offset: 34023}, + pos: position{line: 1386, col: 24, offset: 34277}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1373, col: 28, offset: 34027}, + pos: position{line: 1386, col: 28, offset: 34281}, name: "__", }, &labeledExpr{ - pos: position{line: 1373, col: 31, offset: 34030}, + pos: position{line: 1386, col: 31, offset: 34284}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1373, col: 35, offset: 34034}, + pos: position{line: 1386, col: 35, offset: 34288}, name: "TypeField", }, }, @@ -9344,40 +9404,40 @@ var g = &grammar{ }, { name: "TypeField", - pos: position{line: 1375, col: 1, offset: 34065}, + pos: position{line: 1388, col: 1, offset: 34319}, expr: &actionExpr{ - pos: position{line: 1376, col: 5, offset: 34079}, + pos: position{line: 1389, col: 5, offset: 34333}, run: (*parser).callonTypeField1, expr: &seqExpr{ - pos: position{line: 1376, col: 5, offset: 34079}, + pos: position{line: 1389, col: 5, offset: 34333}, exprs: []any{ &labeledExpr{ - pos: position{line: 1376, col: 5, offset: 34079}, + pos: position{line: 1389, col: 5, offset: 34333}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1376, col: 10, offset: 34084}, + pos: position{line: 1389, col: 10, offset: 34338}, name: "FieldName", }, }, &ruleRefExpr{ - pos: position{line: 1376, col: 20, offset: 34094}, + pos: position{line: 1389, col: 20, offset: 34348}, name: "__", }, &litMatcher{ - pos: position{line: 1376, col: 23, offset: 34097}, + pos: position{line: 1389, col: 23, offset: 34351}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1376, col: 27, offset: 34101}, + pos: position{line: 1389, col: 27, offset: 34355}, name: "__", }, &labeledExpr{ - pos: position{line: 1376, col: 30, offset: 34104}, + pos: position{line: 1389, col: 30, offset: 34358}, label: "typ", expr: &ruleRefExpr{ - pos: position{line: 1376, col: 34, offset: 34108}, + pos: position{line: 1389, col: 34, offset: 34362}, name: "Type", }, }, @@ -9389,16 +9449,16 @@ var g = &grammar{ }, { name: "FieldName", - pos: position{line: 1383, col: 1, offset: 34232}, + pos: position{line: 1396, col: 1, offset: 34486}, expr: &choiceExpr{ - pos: position{line: 1384, col: 5, offset: 34246}, + pos: position{line: 1397, col: 5, offset: 34500}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1384, col: 5, offset: 34246}, + pos: position{line: 1397, col: 5, offset: 34500}, name: "IdentifierName", }, &ruleRefExpr{ - pos: position{line: 1385, col: 5, offset: 34265}, + pos: position{line: 1398, col: 5, offset: 34519}, name: "QuotedString", }, }, @@ -9408,24 +9468,24 @@ var g = &grammar{ }, { name: "AndToken", - pos: position{line: 1387, col: 1, offset: 34279}, + pos: position{line: 1400, col: 1, offset: 34533}, expr: &actionExpr{ - pos: position{line: 1387, col: 12, offset: 34290}, + pos: position{line: 1400, col: 12, offset: 34544}, run: (*parser).callonAndToken1, expr: &seqExpr{ - pos: position{line: 1387, col: 12, offset: 34290}, + pos: position{line: 1400, col: 12, offset: 34544}, exprs: []any{ &choiceExpr{ - pos: position{line: 1387, col: 13, offset: 34291}, + pos: position{line: 1400, col: 13, offset: 34545}, alternatives: []any{ &litMatcher{ - pos: position{line: 1387, col: 13, offset: 34291}, + pos: position{line: 1400, col: 13, offset: 34545}, val: "and", ignoreCase: false, want: "\"and\"", }, &litMatcher{ - pos: position{line: 1387, col: 21, offset: 34299}, + pos: position{line: 1400, col: 21, offset: 34553}, val: "AND", ignoreCase: false, want: "\"AND\"", @@ -9433,9 +9493,9 @@ var g = &grammar{ }, }, ¬Expr{ - pos: position{line: 1387, col: 28, offset: 34306}, + pos: position{line: 1400, col: 28, offset: 34560}, expr: &ruleRefExpr{ - pos: position{line: 1387, col: 29, offset: 34307}, + pos: position{line: 1400, col: 29, offset: 34561}, name: "IdentifierRest", }, }, @@ -9447,20 +9507,20 @@ var g = &grammar{ }, { name: "ByToken", - pos: position{line: 1388, col: 1, offset: 34344}, + pos: position{line: 1401, col: 1, offset: 34598}, expr: &seqExpr{ - pos: position{line: 1388, col: 11, offset: 34354}, + pos: position{line: 1401, col: 11, offset: 34608}, exprs: []any{ &litMatcher{ - pos: position{line: 1388, col: 11, offset: 34354}, + pos: position{line: 1401, col: 11, offset: 34608}, val: "by", ignoreCase: false, want: "\"by\"", }, ¬Expr{ - pos: position{line: 1388, col: 16, offset: 34359}, + pos: position{line: 1401, col: 16, offset: 34613}, expr: &ruleRefExpr{ - pos: position{line: 1388, col: 17, offset: 34360}, + pos: position{line: 1401, col: 17, offset: 34614}, name: "IdentifierRest", }, }, @@ -9471,20 +9531,20 @@ var g = &grammar{ }, { name: "FalseToken", - pos: position{line: 1389, col: 1, offset: 34375}, + pos: position{line: 1402, col: 1, offset: 34629}, expr: &seqExpr{ - pos: position{line: 1389, col: 14, offset: 34388}, + pos: position{line: 1402, col: 14, offset: 34642}, exprs: []any{ &litMatcher{ - pos: position{line: 1389, col: 14, offset: 34388}, + pos: position{line: 1402, col: 14, offset: 34642}, val: "false", ignoreCase: false, want: "\"false\"", }, ¬Expr{ - pos: position{line: 1389, col: 22, offset: 34396}, + pos: position{line: 1402, col: 22, offset: 34650}, expr: &ruleRefExpr{ - pos: position{line: 1389, col: 23, offset: 34397}, + pos: position{line: 1402, col: 23, offset: 34651}, name: "IdentifierRest", }, }, @@ -9495,20 +9555,20 @@ var g = &grammar{ }, { name: "InToken", - pos: position{line: 1390, col: 1, offset: 34412}, + pos: position{line: 1403, col: 1, offset: 34666}, expr: &seqExpr{ - pos: position{line: 1390, col: 11, offset: 34422}, + pos: position{line: 1403, col: 11, offset: 34676}, exprs: []any{ &litMatcher{ - pos: position{line: 1390, col: 11, offset: 34422}, + pos: position{line: 1403, col: 11, offset: 34676}, val: "in", ignoreCase: false, want: "\"in\"", }, ¬Expr{ - pos: position{line: 1390, col: 16, offset: 34427}, + pos: position{line: 1403, col: 16, offset: 34681}, expr: &ruleRefExpr{ - pos: position{line: 1390, col: 17, offset: 34428}, + pos: position{line: 1403, col: 17, offset: 34682}, name: "IdentifierRest", }, }, @@ -9519,24 +9579,24 @@ var g = &grammar{ }, { name: "NotToken", - pos: position{line: 1391, col: 1, offset: 34443}, + pos: position{line: 1404, col: 1, offset: 34697}, expr: &actionExpr{ - pos: position{line: 1391, col: 12, offset: 34454}, + pos: position{line: 1404, col: 12, offset: 34708}, run: (*parser).callonNotToken1, expr: &seqExpr{ - pos: position{line: 1391, col: 12, offset: 34454}, + pos: position{line: 1404, col: 12, offset: 34708}, exprs: []any{ &choiceExpr{ - pos: position{line: 1391, col: 13, offset: 34455}, + pos: position{line: 1404, col: 13, offset: 34709}, alternatives: []any{ &litMatcher{ - pos: position{line: 1391, col: 13, offset: 34455}, + pos: position{line: 1404, col: 13, offset: 34709}, val: "not", ignoreCase: false, want: "\"not\"", }, &litMatcher{ - pos: position{line: 1391, col: 21, offset: 34463}, + pos: position{line: 1404, col: 21, offset: 34717}, val: "NOT", ignoreCase: false, want: "\"NOT\"", @@ -9544,9 +9604,9 @@ var g = &grammar{ }, }, ¬Expr{ - pos: position{line: 1391, col: 28, offset: 34470}, + pos: position{line: 1404, col: 28, offset: 34724}, expr: &ruleRefExpr{ - pos: position{line: 1391, col: 29, offset: 34471}, + pos: position{line: 1404, col: 29, offset: 34725}, name: "IdentifierRest", }, }, @@ -9558,20 +9618,20 @@ var g = &grammar{ }, { name: "NullToken", - pos: position{line: 1392, col: 1, offset: 34508}, + pos: position{line: 1405, col: 1, offset: 34762}, expr: &seqExpr{ - pos: position{line: 1392, col: 13, offset: 34520}, + pos: position{line: 1405, col: 13, offset: 34774}, exprs: []any{ &litMatcher{ - pos: position{line: 1392, col: 13, offset: 34520}, + pos: position{line: 1405, col: 13, offset: 34774}, val: "null", ignoreCase: false, want: "\"null\"", }, ¬Expr{ - pos: position{line: 1392, col: 20, offset: 34527}, + pos: position{line: 1405, col: 20, offset: 34781}, expr: &ruleRefExpr{ - pos: position{line: 1392, col: 21, offset: 34528}, + pos: position{line: 1405, col: 21, offset: 34782}, name: "IdentifierRest", }, }, @@ -9582,24 +9642,24 @@ var g = &grammar{ }, { name: "OrToken", - pos: position{line: 1393, col: 1, offset: 34543}, + pos: position{line: 1406, col: 1, offset: 34797}, expr: &actionExpr{ - pos: position{line: 1393, col: 11, offset: 34553}, + pos: position{line: 1406, col: 11, offset: 34807}, run: (*parser).callonOrToken1, expr: &seqExpr{ - pos: position{line: 1393, col: 11, offset: 34553}, + pos: position{line: 1406, col: 11, offset: 34807}, exprs: []any{ &choiceExpr{ - pos: position{line: 1393, col: 12, offset: 34554}, + pos: position{line: 1406, col: 12, offset: 34808}, alternatives: []any{ &litMatcher{ - pos: position{line: 1393, col: 12, offset: 34554}, + pos: position{line: 1406, col: 12, offset: 34808}, val: "or", ignoreCase: false, want: "\"or\"", }, &litMatcher{ - pos: position{line: 1393, col: 19, offset: 34561}, + pos: position{line: 1406, col: 19, offset: 34815}, val: "OR", ignoreCase: false, want: "\"OR\"", @@ -9607,9 +9667,9 @@ var g = &grammar{ }, }, ¬Expr{ - pos: position{line: 1393, col: 25, offset: 34567}, + pos: position{line: 1406, col: 25, offset: 34821}, expr: &ruleRefExpr{ - pos: position{line: 1393, col: 26, offset: 34568}, + pos: position{line: 1406, col: 26, offset: 34822}, name: "IdentifierRest", }, }, @@ -9621,20 +9681,20 @@ var g = &grammar{ }, { name: "TrueToken", - pos: position{line: 1394, col: 1, offset: 34604}, + pos: position{line: 1407, col: 1, offset: 34858}, expr: &seqExpr{ - pos: position{line: 1394, col: 13, offset: 34616}, + pos: position{line: 1407, col: 13, offset: 34870}, exprs: []any{ &litMatcher{ - pos: position{line: 1394, col: 13, offset: 34616}, + pos: position{line: 1407, col: 13, offset: 34870}, val: "true", ignoreCase: false, want: "\"true\"", }, ¬Expr{ - pos: position{line: 1394, col: 20, offset: 34623}, + pos: position{line: 1407, col: 20, offset: 34877}, expr: &ruleRefExpr{ - pos: position{line: 1394, col: 21, offset: 34624}, + pos: position{line: 1407, col: 21, offset: 34878}, name: "IdentifierRest", }, }, @@ -9645,15 +9705,15 @@ var g = &grammar{ }, { name: "Identifier", - pos: position{line: 1396, col: 1, offset: 34640}, + pos: position{line: 1409, col: 1, offset: 34894}, expr: &actionExpr{ - pos: position{line: 1397, col: 5, offset: 34655}, + pos: position{line: 1410, col: 5, offset: 34909}, run: (*parser).callonIdentifier1, expr: &labeledExpr{ - pos: position{line: 1397, col: 5, offset: 34655}, + pos: position{line: 1410, col: 5, offset: 34909}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 1397, col: 8, offset: 34658}, + pos: position{line: 1410, col: 8, offset: 34912}, name: "IdentifierName", }, }, @@ -9663,51 +9723,51 @@ var g = &grammar{ }, { name: "Identifiers", - pos: position{line: 1405, col: 1, offset: 34801}, + pos: position{line: 1418, col: 1, offset: 35055}, expr: &actionExpr{ - pos: position{line: 1406, col: 5, offset: 34817}, + pos: position{line: 1419, col: 5, offset: 35071}, run: (*parser).callonIdentifiers1, expr: &seqExpr{ - pos: position{line: 1406, col: 5, offset: 34817}, + pos: position{line: 1419, col: 5, offset: 35071}, exprs: []any{ &labeledExpr{ - pos: position{line: 1406, col: 5, offset: 34817}, + pos: position{line: 1419, col: 5, offset: 35071}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 1406, col: 11, offset: 34823}, + pos: position{line: 1419, col: 11, offset: 35077}, name: "Identifier", }, }, &labeledExpr{ - pos: position{line: 1406, col: 22, offset: 34834}, + pos: position{line: 1419, col: 22, offset: 35088}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 1406, col: 27, offset: 34839}, + pos: position{line: 1419, col: 27, offset: 35093}, expr: &actionExpr{ - pos: position{line: 1406, col: 28, offset: 34840}, + pos: position{line: 1419, col: 28, offset: 35094}, run: (*parser).callonIdentifiers7, expr: &seqExpr{ - pos: position{line: 1406, col: 28, offset: 34840}, + pos: position{line: 1419, col: 28, offset: 35094}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1406, col: 28, offset: 34840}, + pos: position{line: 1419, col: 28, offset: 35094}, name: "__", }, &litMatcher{ - pos: position{line: 1406, col: 31, offset: 34843}, + pos: position{line: 1419, col: 31, offset: 35097}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 1406, col: 35, offset: 34847}, + pos: position{line: 1419, col: 35, offset: 35101}, name: "__", }, &labeledExpr{ - pos: position{line: 1406, col: 38, offset: 34850}, + pos: position{line: 1419, col: 38, offset: 35104}, label: "name", expr: &ruleRefExpr{ - pos: position{line: 1406, col: 43, offset: 34855}, + pos: position{line: 1419, col: 43, offset: 35109}, name: "Identifier", }, }, @@ -9724,29 +9784,29 @@ var g = &grammar{ }, { name: "IdentifierName", - pos: position{line: 1410, col: 1, offset: 34933}, + pos: position{line: 1423, col: 1, offset: 35187}, expr: &choiceExpr{ - pos: position{line: 1411, col: 5, offset: 34952}, + pos: position{line: 1424, col: 5, offset: 35206}, alternatives: []any{ &actionExpr{ - pos: position{line: 1411, col: 5, offset: 34952}, + pos: position{line: 1424, col: 5, offset: 35206}, run: (*parser).callonIdentifierName2, expr: &seqExpr{ - pos: position{line: 1411, col: 5, offset: 34952}, + pos: position{line: 1424, col: 5, offset: 35206}, exprs: []any{ ¬Expr{ - pos: position{line: 1411, col: 5, offset: 34952}, + pos: position{line: 1424, col: 5, offset: 35206}, expr: &seqExpr{ - pos: position{line: 1411, col: 7, offset: 34954}, + pos: position{line: 1424, col: 7, offset: 35208}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1411, col: 7, offset: 34954}, + pos: position{line: 1424, col: 7, offset: 35208}, name: "IDGuard", }, ¬Expr{ - pos: position{line: 1411, col: 15, offset: 34962}, + pos: position{line: 1424, col: 15, offset: 35216}, expr: &ruleRefExpr{ - pos: position{line: 1411, col: 16, offset: 34963}, + pos: position{line: 1424, col: 16, offset: 35217}, name: "IdentifierRest", }, }, @@ -9754,13 +9814,13 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1411, col: 32, offset: 34979}, + pos: position{line: 1424, col: 32, offset: 35233}, name: "IdentifierStart", }, &zeroOrMoreExpr{ - pos: position{line: 1411, col: 48, offset: 34995}, + pos: position{line: 1424, col: 48, offset: 35249}, expr: &ruleRefExpr{ - pos: position{line: 1411, col: 48, offset: 34995}, + pos: position{line: 1424, col: 48, offset: 35249}, name: "IdentifierRest", }, }, @@ -9768,32 +9828,32 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1412, col: 5, offset: 35046}, + pos: position{line: 1425, col: 5, offset: 35300}, run: (*parser).callonIdentifierName12, expr: &litMatcher{ - pos: position{line: 1412, col: 5, offset: 35046}, + pos: position{line: 1425, col: 5, offset: 35300}, val: "$", ignoreCase: false, want: "\"$\"", }, }, &actionExpr{ - pos: position{line: 1413, col: 5, offset: 35085}, + pos: position{line: 1426, col: 5, offset: 35339}, run: (*parser).callonIdentifierName14, expr: &seqExpr{ - pos: position{line: 1413, col: 5, offset: 35085}, + pos: position{line: 1426, col: 5, offset: 35339}, exprs: []any{ &litMatcher{ - pos: position{line: 1413, col: 5, offset: 35085}, + pos: position{line: 1426, col: 5, offset: 35339}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1413, col: 10, offset: 35090}, + pos: position{line: 1426, col: 10, offset: 35344}, label: "id", expr: &ruleRefExpr{ - pos: position{line: 1413, col: 13, offset: 35093}, + pos: position{line: 1426, col: 13, offset: 35347}, name: "IDGuard", }, }, @@ -9801,10 +9861,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1415, col: 5, offset: 35184}, + pos: position{line: 1428, col: 5, offset: 35438}, run: (*parser).callonIdentifierName19, expr: &litMatcher{ - pos: position{line: 1415, col: 5, offset: 35184}, + pos: position{line: 1428, col: 5, offset: 35438}, val: "type", ignoreCase: false, want: "\"type\"", @@ -9817,22 +9877,22 @@ var g = &grammar{ }, { name: "IdentifierStart", - pos: position{line: 1417, col: 1, offset: 35223}, + pos: position{line: 1430, col: 1, offset: 35477}, expr: &choiceExpr{ - pos: position{line: 1418, col: 5, offset: 35243}, + pos: position{line: 1431, col: 5, offset: 35497}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1418, col: 5, offset: 35243}, + pos: position{line: 1431, col: 5, offset: 35497}, name: "UnicodeLetter", }, &litMatcher{ - pos: position{line: 1419, col: 5, offset: 35261}, + pos: position{line: 1432, col: 5, offset: 35515}, val: "$", ignoreCase: false, want: "\"$\"", }, &litMatcher{ - pos: position{line: 1420, col: 5, offset: 35269}, + pos: position{line: 1433, col: 5, offset: 35523}, val: "_", ignoreCase: false, want: "\"_\"", @@ -9844,24 +9904,24 @@ var g = &grammar{ }, { name: "IdentifierRest", - pos: position{line: 1422, col: 1, offset: 35274}, + pos: position{line: 1435, col: 1, offset: 35528}, expr: &choiceExpr{ - pos: position{line: 1423, col: 5, offset: 35293}, + pos: position{line: 1436, col: 5, offset: 35547}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1423, col: 5, offset: 35293}, + pos: position{line: 1436, col: 5, offset: 35547}, name: "IdentifierStart", }, &ruleRefExpr{ - pos: position{line: 1424, col: 5, offset: 35313}, + pos: position{line: 1437, col: 5, offset: 35567}, name: "UnicodeCombiningMark", }, &ruleRefExpr{ - pos: position{line: 1425, col: 5, offset: 35338}, + pos: position{line: 1438, col: 5, offset: 35592}, name: "UnicodeDigit", }, &ruleRefExpr{ - pos: position{line: 1426, col: 5, offset: 35355}, + pos: position{line: 1439, col: 5, offset: 35609}, name: "UnicodeConnectorPunctuation", }, }, @@ -9871,24 +9931,24 @@ var g = &grammar{ }, { name: "IDGuard", - pos: position{line: 1428, col: 1, offset: 35384}, + pos: position{line: 1441, col: 1, offset: 35638}, expr: &choiceExpr{ - pos: position{line: 1429, col: 5, offset: 35396}, + pos: position{line: 1442, col: 5, offset: 35650}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1429, col: 5, offset: 35396}, + pos: position{line: 1442, col: 5, offset: 35650}, name: "BooleanLiteral", }, &ruleRefExpr{ - pos: position{line: 1430, col: 5, offset: 35415}, + pos: position{line: 1443, col: 5, offset: 35669}, name: "NullLiteral", }, &ruleRefExpr{ - pos: position{line: 1431, col: 5, offset: 35431}, + pos: position{line: 1444, col: 5, offset: 35685}, name: "NaN", }, &ruleRefExpr{ - pos: position{line: 1432, col: 5, offset: 35439}, + pos: position{line: 1445, col: 5, offset: 35693}, name: "Infinity", }, }, @@ -9898,25 +9958,25 @@ var g = &grammar{ }, { name: "Time", - pos: position{line: 1434, col: 1, offset: 35449}, + pos: position{line: 1447, col: 1, offset: 35703}, expr: &actionExpr{ - pos: position{line: 1435, col: 5, offset: 35458}, + pos: position{line: 1448, col: 5, offset: 35712}, run: (*parser).callonTime1, expr: &seqExpr{ - pos: position{line: 1435, col: 5, offset: 35458}, + pos: position{line: 1448, col: 5, offset: 35712}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1435, col: 5, offset: 35458}, + pos: position{line: 1448, col: 5, offset: 35712}, name: "FullDate", }, &litMatcher{ - pos: position{line: 1435, col: 14, offset: 35467}, + pos: position{line: 1448, col: 14, offset: 35721}, val: "T", ignoreCase: false, want: "\"T\"", }, &ruleRefExpr{ - pos: position{line: 1435, col: 18, offset: 35471}, + pos: position{line: 1448, col: 18, offset: 35725}, name: "FullTime", }, }, @@ -9927,32 +9987,32 @@ var g = &grammar{ }, { name: "FullDate", - pos: position{line: 1439, col: 1, offset: 35547}, + pos: position{line: 1452, col: 1, offset: 35801}, expr: &seqExpr{ - pos: position{line: 1439, col: 12, offset: 35558}, + pos: position{line: 1452, col: 12, offset: 35812}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1439, col: 12, offset: 35558}, + pos: position{line: 1452, col: 12, offset: 35812}, name: "D4", }, &litMatcher{ - pos: position{line: 1439, col: 15, offset: 35561}, + pos: position{line: 1452, col: 15, offset: 35815}, val: "-", ignoreCase: false, want: "\"-\"", }, &ruleRefExpr{ - pos: position{line: 1439, col: 19, offset: 35565}, + pos: position{line: 1452, col: 19, offset: 35819}, name: "D2", }, &litMatcher{ - pos: position{line: 1439, col: 22, offset: 35568}, + pos: position{line: 1452, col: 22, offset: 35822}, val: "-", ignoreCase: false, want: "\"-\"", }, &ruleRefExpr{ - pos: position{line: 1439, col: 26, offset: 35572}, + pos: position{line: 1452, col: 26, offset: 35826}, name: "D2", }, }, @@ -9962,33 +10022,33 @@ var g = &grammar{ }, { name: "D4", - pos: position{line: 1441, col: 1, offset: 35576}, + pos: position{line: 1454, col: 1, offset: 35830}, expr: &seqExpr{ - pos: position{line: 1441, col: 6, offset: 35581}, + pos: position{line: 1454, col: 6, offset: 35835}, exprs: []any{ &charClassMatcher{ - pos: position{line: 1441, col: 6, offset: 35581}, + pos: position{line: 1454, col: 6, offset: 35835}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1441, col: 11, offset: 35586}, + pos: position{line: 1454, col: 11, offset: 35840}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1441, col: 16, offset: 35591}, + pos: position{line: 1454, col: 16, offset: 35845}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1441, col: 21, offset: 35596}, + pos: position{line: 1454, col: 21, offset: 35850}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10001,19 +10061,19 @@ var g = &grammar{ }, { name: "D2", - pos: position{line: 1442, col: 1, offset: 35602}, + pos: position{line: 1455, col: 1, offset: 35856}, expr: &seqExpr{ - pos: position{line: 1442, col: 6, offset: 35607}, + pos: position{line: 1455, col: 6, offset: 35861}, exprs: []any{ &charClassMatcher{ - pos: position{line: 1442, col: 6, offset: 35607}, + pos: position{line: 1455, col: 6, offset: 35861}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 1442, col: 11, offset: 35612}, + pos: position{line: 1455, col: 11, offset: 35866}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10026,16 +10086,16 @@ var g = &grammar{ }, { name: "FullTime", - pos: position{line: 1444, col: 1, offset: 35619}, + pos: position{line: 1457, col: 1, offset: 35873}, expr: &seqExpr{ - pos: position{line: 1444, col: 12, offset: 35630}, + pos: position{line: 1457, col: 12, offset: 35884}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1444, col: 12, offset: 35630}, + pos: position{line: 1457, col: 12, offset: 35884}, name: "PartialTime", }, &ruleRefExpr{ - pos: position{line: 1444, col: 24, offset: 35642}, + pos: position{line: 1457, col: 24, offset: 35896}, name: "TimeOffset", }, }, @@ -10045,49 +10105,49 @@ var g = &grammar{ }, { name: "PartialTime", - pos: position{line: 1446, col: 1, offset: 35654}, + pos: position{line: 1459, col: 1, offset: 35908}, expr: &seqExpr{ - pos: position{line: 1446, col: 15, offset: 35668}, + pos: position{line: 1459, col: 15, offset: 35922}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1446, col: 15, offset: 35668}, + pos: position{line: 1459, col: 15, offset: 35922}, name: "D2", }, &litMatcher{ - pos: position{line: 1446, col: 18, offset: 35671}, + pos: position{line: 1459, col: 18, offset: 35925}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1446, col: 22, offset: 35675}, + pos: position{line: 1459, col: 22, offset: 35929}, name: "D2", }, &litMatcher{ - pos: position{line: 1446, col: 25, offset: 35678}, + pos: position{line: 1459, col: 25, offset: 35932}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1446, col: 29, offset: 35682}, + pos: position{line: 1459, col: 29, offset: 35936}, name: "D2", }, &zeroOrOneExpr{ - pos: position{line: 1446, col: 32, offset: 35685}, + pos: position{line: 1459, col: 32, offset: 35939}, expr: &seqExpr{ - pos: position{line: 1446, col: 33, offset: 35686}, + pos: position{line: 1459, col: 33, offset: 35940}, exprs: []any{ &litMatcher{ - pos: position{line: 1446, col: 33, offset: 35686}, + pos: position{line: 1459, col: 33, offset: 35940}, val: ".", ignoreCase: false, want: "\".\"", }, &oneOrMoreExpr{ - pos: position{line: 1446, col: 37, offset: 35690}, + pos: position{line: 1459, col: 37, offset: 35944}, expr: &charClassMatcher{ - pos: position{line: 1446, col: 37, offset: 35690}, + pos: position{line: 1459, col: 37, offset: 35944}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10104,30 +10164,30 @@ var g = &grammar{ }, { name: "TimeOffset", - pos: position{line: 1448, col: 1, offset: 35700}, + pos: position{line: 1461, col: 1, offset: 35954}, expr: &choiceExpr{ - pos: position{line: 1449, col: 5, offset: 35715}, + pos: position{line: 1462, col: 5, offset: 35969}, alternatives: []any{ &litMatcher{ - pos: position{line: 1449, col: 5, offset: 35715}, + pos: position{line: 1462, col: 5, offset: 35969}, val: "Z", ignoreCase: false, want: "\"Z\"", }, &seqExpr{ - pos: position{line: 1450, col: 5, offset: 35723}, + pos: position{line: 1463, col: 5, offset: 35977}, exprs: []any{ &choiceExpr{ - pos: position{line: 1450, col: 6, offset: 35724}, + pos: position{line: 1463, col: 6, offset: 35978}, alternatives: []any{ &litMatcher{ - pos: position{line: 1450, col: 6, offset: 35724}, + pos: position{line: 1463, col: 6, offset: 35978}, val: "+", ignoreCase: false, want: "\"+\"", }, &litMatcher{ - pos: position{line: 1450, col: 12, offset: 35730}, + pos: position{line: 1463, col: 12, offset: 35984}, val: "-", ignoreCase: false, want: "\"-\"", @@ -10135,34 +10195,34 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1450, col: 17, offset: 35735}, + pos: position{line: 1463, col: 17, offset: 35989}, name: "D2", }, &litMatcher{ - pos: position{line: 1450, col: 20, offset: 35738}, + pos: position{line: 1463, col: 20, offset: 35992}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1450, col: 24, offset: 35742}, + pos: position{line: 1463, col: 24, offset: 35996}, name: "D2", }, &zeroOrOneExpr{ - pos: position{line: 1450, col: 27, offset: 35745}, + pos: position{line: 1463, col: 27, offset: 35999}, expr: &seqExpr{ - pos: position{line: 1450, col: 28, offset: 35746}, + pos: position{line: 1463, col: 28, offset: 36000}, exprs: []any{ &litMatcher{ - pos: position{line: 1450, col: 28, offset: 35746}, + pos: position{line: 1463, col: 28, offset: 36000}, val: ".", ignoreCase: false, want: "\".\"", }, &oneOrMoreExpr{ - pos: position{line: 1450, col: 32, offset: 35750}, + pos: position{line: 1463, col: 32, offset: 36004}, expr: &charClassMatcher{ - pos: position{line: 1450, col: 32, offset: 35750}, + pos: position{line: 1463, col: 32, offset: 36004}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10181,33 +10241,33 @@ var g = &grammar{ }, { name: "Duration", - pos: position{line: 1452, col: 1, offset: 35760}, + pos: position{line: 1465, col: 1, offset: 36014}, expr: &actionExpr{ - pos: position{line: 1453, col: 5, offset: 35773}, + pos: position{line: 1466, col: 5, offset: 36027}, run: (*parser).callonDuration1, expr: &seqExpr{ - pos: position{line: 1453, col: 5, offset: 35773}, + pos: position{line: 1466, col: 5, offset: 36027}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1453, col: 5, offset: 35773}, + pos: position{line: 1466, col: 5, offset: 36027}, expr: &litMatcher{ - pos: position{line: 1453, col: 5, offset: 35773}, + pos: position{line: 1466, col: 5, offset: 36027}, val: "-", ignoreCase: false, want: "\"-\"", }, }, &oneOrMoreExpr{ - pos: position{line: 1453, col: 10, offset: 35778}, + pos: position{line: 1466, col: 10, offset: 36032}, expr: &seqExpr{ - pos: position{line: 1453, col: 11, offset: 35779}, + pos: position{line: 1466, col: 11, offset: 36033}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1453, col: 11, offset: 35779}, + pos: position{line: 1466, col: 11, offset: 36033}, name: "Decimal", }, &ruleRefExpr{ - pos: position{line: 1453, col: 19, offset: 35787}, + pos: position{line: 1466, col: 19, offset: 36041}, name: "TimeUnit", }, }, @@ -10221,27 +10281,27 @@ var g = &grammar{ }, { name: "Decimal", - pos: position{line: 1457, col: 1, offset: 35869}, + pos: position{line: 1470, col: 1, offset: 36123}, expr: &seqExpr{ - pos: position{line: 1457, col: 11, offset: 35879}, + pos: position{line: 1470, col: 11, offset: 36133}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1457, col: 11, offset: 35879}, + pos: position{line: 1470, col: 11, offset: 36133}, name: "UInt", }, &zeroOrOneExpr{ - pos: position{line: 1457, col: 16, offset: 35884}, + pos: position{line: 1470, col: 16, offset: 36138}, expr: &seqExpr{ - pos: position{line: 1457, col: 17, offset: 35885}, + pos: position{line: 1470, col: 17, offset: 36139}, exprs: []any{ &litMatcher{ - pos: position{line: 1457, col: 17, offset: 35885}, + pos: position{line: 1470, col: 17, offset: 36139}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1457, col: 21, offset: 35889}, + pos: position{line: 1470, col: 21, offset: 36143}, name: "UInt", }, }, @@ -10254,60 +10314,60 @@ var g = &grammar{ }, { name: "TimeUnit", - pos: position{line: 1459, col: 1, offset: 35897}, + pos: position{line: 1472, col: 1, offset: 36151}, expr: &choiceExpr{ - pos: position{line: 1460, col: 5, offset: 35910}, + pos: position{line: 1473, col: 5, offset: 36164}, alternatives: []any{ &litMatcher{ - pos: position{line: 1460, col: 5, offset: 35910}, + pos: position{line: 1473, col: 5, offset: 36164}, val: "ns", ignoreCase: false, want: "\"ns\"", }, &litMatcher{ - pos: position{line: 1461, col: 5, offset: 35919}, + pos: position{line: 1474, col: 5, offset: 36173}, val: "us", ignoreCase: false, want: "\"us\"", }, &litMatcher{ - pos: position{line: 1462, col: 5, offset: 35928}, + pos: position{line: 1475, col: 5, offset: 36182}, val: "ms", ignoreCase: false, want: "\"ms\"", }, &litMatcher{ - pos: position{line: 1463, col: 5, offset: 35937}, + pos: position{line: 1476, col: 5, offset: 36191}, val: "s", ignoreCase: false, want: "\"s\"", }, &litMatcher{ - pos: position{line: 1464, col: 5, offset: 35945}, + pos: position{line: 1477, col: 5, offset: 36199}, val: "m", ignoreCase: false, want: "\"m\"", }, &litMatcher{ - pos: position{line: 1465, col: 5, offset: 35953}, + pos: position{line: 1478, col: 5, offset: 36207}, val: "h", ignoreCase: false, want: "\"h\"", }, &litMatcher{ - pos: position{line: 1466, col: 5, offset: 35961}, + pos: position{line: 1479, col: 5, offset: 36215}, val: "d", ignoreCase: false, want: "\"d\"", }, &litMatcher{ - pos: position{line: 1467, col: 5, offset: 35969}, + pos: position{line: 1480, col: 5, offset: 36223}, val: "w", ignoreCase: false, want: "\"w\"", }, &litMatcher{ - pos: position{line: 1468, col: 5, offset: 35977}, + pos: position{line: 1481, col: 5, offset: 36231}, val: "y", ignoreCase: false, want: "\"y\"", @@ -10319,45 +10379,45 @@ var g = &grammar{ }, { name: "IP", - pos: position{line: 1470, col: 1, offset: 35982}, + pos: position{line: 1483, col: 1, offset: 36236}, expr: &actionExpr{ - pos: position{line: 1471, col: 5, offset: 35989}, + pos: position{line: 1484, col: 5, offset: 36243}, run: (*parser).callonIP1, expr: &seqExpr{ - pos: position{line: 1471, col: 5, offset: 35989}, + pos: position{line: 1484, col: 5, offset: 36243}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1471, col: 5, offset: 35989}, + pos: position{line: 1484, col: 5, offset: 36243}, name: "UInt", }, &litMatcher{ - pos: position{line: 1471, col: 10, offset: 35994}, + pos: position{line: 1484, col: 10, offset: 36248}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1471, col: 14, offset: 35998}, + pos: position{line: 1484, col: 14, offset: 36252}, name: "UInt", }, &litMatcher{ - pos: position{line: 1471, col: 19, offset: 36003}, + pos: position{line: 1484, col: 19, offset: 36257}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1471, col: 23, offset: 36007}, + pos: position{line: 1484, col: 23, offset: 36261}, name: "UInt", }, &litMatcher{ - pos: position{line: 1471, col: 28, offset: 36012}, + pos: position{line: 1484, col: 28, offset: 36266}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 1471, col: 32, offset: 36016}, + pos: position{line: 1484, col: 32, offset: 36270}, name: "UInt", }, }, @@ -10368,43 +10428,43 @@ var g = &grammar{ }, { name: "IP6", - pos: position{line: 1473, col: 1, offset: 36053}, + pos: position{line: 1486, col: 1, offset: 36307}, expr: &actionExpr{ - pos: position{line: 1474, col: 5, offset: 36061}, + pos: position{line: 1487, col: 5, offset: 36315}, run: (*parser).callonIP61, expr: &seqExpr{ - pos: position{line: 1474, col: 5, offset: 36061}, + pos: position{line: 1487, col: 5, offset: 36315}, exprs: []any{ ¬Expr{ - pos: position{line: 1474, col: 5, offset: 36061}, + pos: position{line: 1487, col: 5, offset: 36315}, expr: &seqExpr{ - pos: position{line: 1474, col: 7, offset: 36063}, + pos: position{line: 1487, col: 7, offset: 36317}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1474, col: 7, offset: 36063}, + pos: position{line: 1487, col: 7, offset: 36317}, name: "Hex", }, &litMatcher{ - pos: position{line: 1474, col: 11, offset: 36067}, + pos: position{line: 1487, col: 11, offset: 36321}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 1474, col: 15, offset: 36071}, + pos: position{line: 1487, col: 15, offset: 36325}, name: "Hex", }, ¬Expr{ - pos: position{line: 1474, col: 19, offset: 36075}, + pos: position{line: 1487, col: 19, offset: 36329}, expr: &choiceExpr{ - pos: position{line: 1474, col: 21, offset: 36077}, + pos: position{line: 1487, col: 21, offset: 36331}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1474, col: 21, offset: 36077}, + pos: position{line: 1487, col: 21, offset: 36331}, name: "HexDigit", }, &litMatcher{ - pos: position{line: 1474, col: 32, offset: 36088}, + pos: position{line: 1487, col: 32, offset: 36342}, val: ":", ignoreCase: false, want: "\":\"", @@ -10416,10 +10476,10 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 1474, col: 38, offset: 36094}, + pos: position{line: 1487, col: 38, offset: 36348}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1474, col: 40, offset: 36096}, + pos: position{line: 1487, col: 40, offset: 36350}, name: "IP6Variations", }, }, @@ -10431,32 +10491,32 @@ var g = &grammar{ }, { name: "IP6Variations", - pos: position{line: 1478, col: 1, offset: 36260}, + pos: position{line: 1491, col: 1, offset: 36514}, expr: &choiceExpr{ - pos: position{line: 1479, col: 5, offset: 36278}, + pos: position{line: 1492, col: 5, offset: 36532}, alternatives: []any{ &actionExpr{ - pos: position{line: 1479, col: 5, offset: 36278}, + pos: position{line: 1492, col: 5, offset: 36532}, run: (*parser).callonIP6Variations2, expr: &seqExpr{ - pos: position{line: 1479, col: 5, offset: 36278}, + pos: position{line: 1492, col: 5, offset: 36532}, exprs: []any{ &labeledExpr{ - pos: position{line: 1479, col: 5, offset: 36278}, + pos: position{line: 1492, col: 5, offset: 36532}, label: "a", expr: &oneOrMoreExpr{ - pos: position{line: 1479, col: 7, offset: 36280}, + pos: position{line: 1492, col: 7, offset: 36534}, expr: &ruleRefExpr{ - pos: position{line: 1479, col: 7, offset: 36280}, + pos: position{line: 1492, col: 7, offset: 36534}, name: "HexColon", }, }, }, &labeledExpr{ - pos: position{line: 1479, col: 17, offset: 36290}, + pos: position{line: 1492, col: 17, offset: 36544}, label: "b", expr: &ruleRefExpr{ - pos: position{line: 1479, col: 19, offset: 36292}, + pos: position{line: 1492, col: 19, offset: 36546}, name: "IP6Tail", }, }, @@ -10464,52 +10524,52 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1482, col: 5, offset: 36356}, + pos: position{line: 1495, col: 5, offset: 36610}, run: (*parser).callonIP6Variations9, expr: &seqExpr{ - pos: position{line: 1482, col: 5, offset: 36356}, + pos: position{line: 1495, col: 5, offset: 36610}, exprs: []any{ &labeledExpr{ - pos: position{line: 1482, col: 5, offset: 36356}, + pos: position{line: 1495, col: 5, offset: 36610}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1482, col: 7, offset: 36358}, + pos: position{line: 1495, col: 7, offset: 36612}, name: "Hex", }, }, &labeledExpr{ - pos: position{line: 1482, col: 11, offset: 36362}, + pos: position{line: 1495, col: 11, offset: 36616}, label: "b", expr: &zeroOrMoreExpr{ - pos: position{line: 1482, col: 13, offset: 36364}, + pos: position{line: 1495, col: 13, offset: 36618}, expr: &ruleRefExpr{ - pos: position{line: 1482, col: 13, offset: 36364}, + pos: position{line: 1495, col: 13, offset: 36618}, name: "ColonHex", }, }, }, &litMatcher{ - pos: position{line: 1482, col: 23, offset: 36374}, + pos: position{line: 1495, col: 23, offset: 36628}, val: "::", ignoreCase: false, want: "\"::\"", }, &labeledExpr{ - pos: position{line: 1482, col: 28, offset: 36379}, + pos: position{line: 1495, col: 28, offset: 36633}, label: "d", expr: &zeroOrMoreExpr{ - pos: position{line: 1482, col: 30, offset: 36381}, + pos: position{line: 1495, col: 30, offset: 36635}, expr: &ruleRefExpr{ - pos: position{line: 1482, col: 30, offset: 36381}, + pos: position{line: 1495, col: 30, offset: 36635}, name: "HexColon", }, }, }, &labeledExpr{ - pos: position{line: 1482, col: 40, offset: 36391}, + pos: position{line: 1495, col: 40, offset: 36645}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 1482, col: 42, offset: 36393}, + pos: position{line: 1495, col: 42, offset: 36647}, name: "IP6Tail", }, }, @@ -10517,33 +10577,33 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1485, col: 5, offset: 36492}, + pos: position{line: 1498, col: 5, offset: 36746}, run: (*parser).callonIP6Variations22, expr: &seqExpr{ - pos: position{line: 1485, col: 5, offset: 36492}, + pos: position{line: 1498, col: 5, offset: 36746}, exprs: []any{ &litMatcher{ - pos: position{line: 1485, col: 5, offset: 36492}, + pos: position{line: 1498, col: 5, offset: 36746}, val: "::", ignoreCase: false, want: "\"::\"", }, &labeledExpr{ - pos: position{line: 1485, col: 10, offset: 36497}, + pos: position{line: 1498, col: 10, offset: 36751}, label: "a", expr: &zeroOrMoreExpr{ - pos: position{line: 1485, col: 12, offset: 36499}, + pos: position{line: 1498, col: 12, offset: 36753}, expr: &ruleRefExpr{ - pos: position{line: 1485, col: 12, offset: 36499}, + pos: position{line: 1498, col: 12, offset: 36753}, name: "HexColon", }, }, }, &labeledExpr{ - pos: position{line: 1485, col: 22, offset: 36509}, + pos: position{line: 1498, col: 22, offset: 36763}, label: "b", expr: &ruleRefExpr{ - pos: position{line: 1485, col: 24, offset: 36511}, + pos: position{line: 1498, col: 24, offset: 36765}, name: "IP6Tail", }, }, @@ -10551,32 +10611,32 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1488, col: 5, offset: 36582}, + pos: position{line: 1501, col: 5, offset: 36836}, run: (*parser).callonIP6Variations30, expr: &seqExpr{ - pos: position{line: 1488, col: 5, offset: 36582}, + pos: position{line: 1501, col: 5, offset: 36836}, exprs: []any{ &labeledExpr{ - pos: position{line: 1488, col: 5, offset: 36582}, + pos: position{line: 1501, col: 5, offset: 36836}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1488, col: 7, offset: 36584}, + pos: position{line: 1501, col: 7, offset: 36838}, name: "Hex", }, }, &labeledExpr{ - pos: position{line: 1488, col: 11, offset: 36588}, + pos: position{line: 1501, col: 11, offset: 36842}, label: "b", expr: &zeroOrMoreExpr{ - pos: position{line: 1488, col: 13, offset: 36590}, + pos: position{line: 1501, col: 13, offset: 36844}, expr: &ruleRefExpr{ - pos: position{line: 1488, col: 13, offset: 36590}, + pos: position{line: 1501, col: 13, offset: 36844}, name: "ColonHex", }, }, }, &litMatcher{ - pos: position{line: 1488, col: 23, offset: 36600}, + pos: position{line: 1501, col: 23, offset: 36854}, val: "::", ignoreCase: false, want: "\"::\"", @@ -10585,10 +10645,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1491, col: 5, offset: 36668}, + pos: position{line: 1504, col: 5, offset: 36922}, run: (*parser).callonIP6Variations38, expr: &litMatcher{ - pos: position{line: 1491, col: 5, offset: 36668}, + pos: position{line: 1504, col: 5, offset: 36922}, val: "::", ignoreCase: false, want: "\"::\"", @@ -10601,16 +10661,16 @@ var g = &grammar{ }, { name: "IP6Tail", - pos: position{line: 1495, col: 1, offset: 36705}, + pos: position{line: 1508, col: 1, offset: 36959}, expr: &choiceExpr{ - pos: position{line: 1496, col: 5, offset: 36717}, + pos: position{line: 1509, col: 5, offset: 36971}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1496, col: 5, offset: 36717}, + pos: position{line: 1509, col: 5, offset: 36971}, name: "IP", }, &ruleRefExpr{ - pos: position{line: 1497, col: 5, offset: 36724}, + pos: position{line: 1510, col: 5, offset: 36978}, name: "Hex", }, }, @@ -10620,24 +10680,24 @@ var g = &grammar{ }, { name: "ColonHex", - pos: position{line: 1499, col: 1, offset: 36729}, + pos: position{line: 1512, col: 1, offset: 36983}, expr: &actionExpr{ - pos: position{line: 1499, col: 12, offset: 36740}, + pos: position{line: 1512, col: 12, offset: 36994}, run: (*parser).callonColonHex1, expr: &seqExpr{ - pos: position{line: 1499, col: 12, offset: 36740}, + pos: position{line: 1512, col: 12, offset: 36994}, exprs: []any{ &litMatcher{ - pos: position{line: 1499, col: 12, offset: 36740}, + pos: position{line: 1512, col: 12, offset: 36994}, val: ":", ignoreCase: false, want: "\":\"", }, &labeledExpr{ - pos: position{line: 1499, col: 16, offset: 36744}, + pos: position{line: 1512, col: 16, offset: 36998}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1499, col: 18, offset: 36746}, + pos: position{line: 1512, col: 18, offset: 37000}, name: "Hex", }, }, @@ -10649,23 +10709,23 @@ var g = &grammar{ }, { name: "HexColon", - pos: position{line: 1501, col: 1, offset: 36784}, + pos: position{line: 1514, col: 1, offset: 37038}, expr: &actionExpr{ - pos: position{line: 1501, col: 12, offset: 36795}, + pos: position{line: 1514, col: 12, offset: 37049}, run: (*parser).callonHexColon1, expr: &seqExpr{ - pos: position{line: 1501, col: 12, offset: 36795}, + pos: position{line: 1514, col: 12, offset: 37049}, exprs: []any{ &labeledExpr{ - pos: position{line: 1501, col: 12, offset: 36795}, + pos: position{line: 1514, col: 12, offset: 37049}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 1501, col: 14, offset: 36797}, + pos: position{line: 1514, col: 14, offset: 37051}, name: "Hex", }, }, &litMatcher{ - pos: position{line: 1501, col: 18, offset: 36801}, + pos: position{line: 1514, col: 18, offset: 37055}, val: ":", ignoreCase: false, want: "\":\"", @@ -10678,32 +10738,32 @@ var g = &grammar{ }, { name: "IP4Net", - pos: position{line: 1503, col: 1, offset: 36839}, + pos: position{line: 1516, col: 1, offset: 37093}, expr: &actionExpr{ - pos: position{line: 1504, col: 5, offset: 36850}, + pos: position{line: 1517, col: 5, offset: 37104}, run: (*parser).callonIP4Net1, expr: &seqExpr{ - pos: position{line: 1504, col: 5, offset: 36850}, + pos: position{line: 1517, col: 5, offset: 37104}, exprs: []any{ &labeledExpr{ - pos: position{line: 1504, col: 5, offset: 36850}, + pos: position{line: 1517, col: 5, offset: 37104}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1504, col: 7, offset: 36852}, + pos: position{line: 1517, col: 7, offset: 37106}, name: "IP", }, }, &litMatcher{ - pos: position{line: 1504, col: 10, offset: 36855}, + pos: position{line: 1517, col: 10, offset: 37109}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 1504, col: 14, offset: 36859}, + pos: position{line: 1517, col: 14, offset: 37113}, label: "m", expr: &ruleRefExpr{ - pos: position{line: 1504, col: 16, offset: 36861}, + pos: position{line: 1517, col: 16, offset: 37115}, name: "UIntString", }, }, @@ -10715,32 +10775,32 @@ var g = &grammar{ }, { name: "IP6Net", - pos: position{line: 1508, col: 1, offset: 36929}, + pos: position{line: 1521, col: 1, offset: 37183}, expr: &actionExpr{ - pos: position{line: 1509, col: 5, offset: 36940}, + pos: position{line: 1522, col: 5, offset: 37194}, run: (*parser).callonIP6Net1, expr: &seqExpr{ - pos: position{line: 1509, col: 5, offset: 36940}, + pos: position{line: 1522, col: 5, offset: 37194}, exprs: []any{ &labeledExpr{ - pos: position{line: 1509, col: 5, offset: 36940}, + pos: position{line: 1522, col: 5, offset: 37194}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 1509, col: 7, offset: 36942}, + pos: position{line: 1522, col: 7, offset: 37196}, name: "IP6", }, }, &litMatcher{ - pos: position{line: 1509, col: 11, offset: 36946}, + pos: position{line: 1522, col: 11, offset: 37200}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 1509, col: 15, offset: 36950}, + pos: position{line: 1522, col: 15, offset: 37204}, label: "m", expr: &ruleRefExpr{ - pos: position{line: 1509, col: 17, offset: 36952}, + pos: position{line: 1522, col: 17, offset: 37206}, name: "UIntString", }, }, @@ -10752,15 +10812,15 @@ var g = &grammar{ }, { name: "UInt", - pos: position{line: 1513, col: 1, offset: 37020}, + pos: position{line: 1526, col: 1, offset: 37274}, expr: &actionExpr{ - pos: position{line: 1514, col: 4, offset: 37028}, + pos: position{line: 1527, col: 4, offset: 37282}, run: (*parser).callonUInt1, expr: &labeledExpr{ - pos: position{line: 1514, col: 4, offset: 37028}, + pos: position{line: 1527, col: 4, offset: 37282}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1514, col: 6, offset: 37030}, + pos: position{line: 1527, col: 6, offset: 37284}, name: "UIntString", }, }, @@ -10770,16 +10830,16 @@ var g = &grammar{ }, { name: "IntString", - pos: position{line: 1516, col: 1, offset: 37070}, + pos: position{line: 1529, col: 1, offset: 37324}, expr: &choiceExpr{ - pos: position{line: 1517, col: 5, offset: 37084}, + pos: position{line: 1530, col: 5, offset: 37338}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1517, col: 5, offset: 37084}, + pos: position{line: 1530, col: 5, offset: 37338}, name: "UIntString", }, &ruleRefExpr{ - pos: position{line: 1518, col: 5, offset: 37099}, + pos: position{line: 1531, col: 5, offset: 37353}, name: "MinusIntString", }, }, @@ -10789,14 +10849,14 @@ var g = &grammar{ }, { name: "UIntString", - pos: position{line: 1520, col: 1, offset: 37115}, + pos: position{line: 1533, col: 1, offset: 37369}, expr: &actionExpr{ - pos: position{line: 1520, col: 14, offset: 37128}, + pos: position{line: 1533, col: 14, offset: 37382}, run: (*parser).callonUIntString1, expr: &oneOrMoreExpr{ - pos: position{line: 1520, col: 14, offset: 37128}, + pos: position{line: 1533, col: 14, offset: 37382}, expr: &charClassMatcher{ - pos: position{line: 1520, col: 14, offset: 37128}, + pos: position{line: 1533, col: 14, offset: 37382}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10809,21 +10869,21 @@ var g = &grammar{ }, { name: "MinusIntString", - pos: position{line: 1522, col: 1, offset: 37167}, + pos: position{line: 1535, col: 1, offset: 37421}, expr: &actionExpr{ - pos: position{line: 1523, col: 5, offset: 37186}, + pos: position{line: 1536, col: 5, offset: 37440}, run: (*parser).callonMinusIntString1, expr: &seqExpr{ - pos: position{line: 1523, col: 5, offset: 37186}, + pos: position{line: 1536, col: 5, offset: 37440}, exprs: []any{ &litMatcher{ - pos: position{line: 1523, col: 5, offset: 37186}, + pos: position{line: 1536, col: 5, offset: 37440}, val: "-", ignoreCase: false, want: "\"-\"", }, &ruleRefExpr{ - pos: position{line: 1523, col: 9, offset: 37190}, + pos: position{line: 1536, col: 9, offset: 37444}, name: "UIntString", }, }, @@ -10834,29 +10894,29 @@ var g = &grammar{ }, { name: "FloatString", - pos: position{line: 1525, col: 1, offset: 37233}, + pos: position{line: 1538, col: 1, offset: 37487}, expr: &choiceExpr{ - pos: position{line: 1526, col: 5, offset: 37249}, + pos: position{line: 1539, col: 5, offset: 37503}, alternatives: []any{ &actionExpr{ - pos: position{line: 1526, col: 5, offset: 37249}, + pos: position{line: 1539, col: 5, offset: 37503}, run: (*parser).callonFloatString2, expr: &seqExpr{ - pos: position{line: 1526, col: 5, offset: 37249}, + pos: position{line: 1539, col: 5, offset: 37503}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1526, col: 5, offset: 37249}, + pos: position{line: 1539, col: 5, offset: 37503}, expr: &litMatcher{ - pos: position{line: 1526, col: 5, offset: 37249}, + pos: position{line: 1539, col: 5, offset: 37503}, val: "-", ignoreCase: false, want: "\"-\"", }, }, &oneOrMoreExpr{ - pos: position{line: 1526, col: 10, offset: 37254}, + pos: position{line: 1539, col: 10, offset: 37508}, expr: &charClassMatcher{ - pos: position{line: 1526, col: 10, offset: 37254}, + pos: position{line: 1539, col: 10, offset: 37508}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10864,15 +10924,15 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1526, col: 17, offset: 37261}, + pos: position{line: 1539, col: 17, offset: 37515}, val: ".", ignoreCase: false, want: "\".\"", }, &zeroOrMoreExpr{ - pos: position{line: 1526, col: 21, offset: 37265}, + pos: position{line: 1539, col: 21, offset: 37519}, expr: &charClassMatcher{ - pos: position{line: 1526, col: 21, offset: 37265}, + pos: position{line: 1539, col: 21, offset: 37519}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10880,9 +10940,9 @@ var g = &grammar{ }, }, &zeroOrOneExpr{ - pos: position{line: 1526, col: 28, offset: 37272}, + pos: position{line: 1539, col: 28, offset: 37526}, expr: &ruleRefExpr{ - pos: position{line: 1526, col: 28, offset: 37272}, + pos: position{line: 1539, col: 28, offset: 37526}, name: "ExponentPart", }, }, @@ -10890,30 +10950,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1527, col: 5, offset: 37321}, + pos: position{line: 1540, col: 5, offset: 37575}, run: (*parser).callonFloatString13, expr: &seqExpr{ - pos: position{line: 1527, col: 5, offset: 37321}, + pos: position{line: 1540, col: 5, offset: 37575}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1527, col: 5, offset: 37321}, + pos: position{line: 1540, col: 5, offset: 37575}, expr: &litMatcher{ - pos: position{line: 1527, col: 5, offset: 37321}, + pos: position{line: 1540, col: 5, offset: 37575}, val: "-", ignoreCase: false, want: "\"-\"", }, }, &litMatcher{ - pos: position{line: 1527, col: 10, offset: 37326}, + pos: position{line: 1540, col: 10, offset: 37580}, val: ".", ignoreCase: false, want: "\".\"", }, &oneOrMoreExpr{ - pos: position{line: 1527, col: 14, offset: 37330}, + pos: position{line: 1540, col: 14, offset: 37584}, expr: &charClassMatcher{ - pos: position{line: 1527, col: 14, offset: 37330}, + pos: position{line: 1540, col: 14, offset: 37584}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -10921,9 +10981,9 @@ var g = &grammar{ }, }, &zeroOrOneExpr{ - pos: position{line: 1527, col: 21, offset: 37337}, + pos: position{line: 1540, col: 21, offset: 37591}, expr: &ruleRefExpr{ - pos: position{line: 1527, col: 21, offset: 37337}, + pos: position{line: 1540, col: 21, offset: 37591}, name: "ExponentPart", }, }, @@ -10931,17 +10991,17 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1528, col: 5, offset: 37386}, + pos: position{line: 1541, col: 5, offset: 37640}, run: (*parser).callonFloatString22, expr: &choiceExpr{ - pos: position{line: 1528, col: 6, offset: 37387}, + pos: position{line: 1541, col: 6, offset: 37641}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1528, col: 6, offset: 37387}, + pos: position{line: 1541, col: 6, offset: 37641}, name: "NaN", }, &ruleRefExpr{ - pos: position{line: 1528, col: 12, offset: 37393}, + pos: position{line: 1541, col: 12, offset: 37647}, name: "Infinity", }, }, @@ -10954,20 +11014,20 @@ var g = &grammar{ }, { name: "ExponentPart", - pos: position{line: 1531, col: 1, offset: 37436}, + pos: position{line: 1544, col: 1, offset: 37690}, expr: &seqExpr{ - pos: position{line: 1531, col: 16, offset: 37451}, + pos: position{line: 1544, col: 16, offset: 37705}, exprs: []any{ &litMatcher{ - pos: position{line: 1531, col: 16, offset: 37451}, + pos: position{line: 1544, col: 16, offset: 37705}, val: "e", ignoreCase: true, want: "\"e\"i", }, &zeroOrOneExpr{ - pos: position{line: 1531, col: 21, offset: 37456}, + pos: position{line: 1544, col: 21, offset: 37710}, expr: &charClassMatcher{ - pos: position{line: 1531, col: 21, offset: 37456}, + pos: position{line: 1544, col: 21, offset: 37710}, val: "[+-]", chars: []rune{'+', '-'}, ignoreCase: false, @@ -10975,7 +11035,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 1531, col: 27, offset: 37462}, + pos: position{line: 1544, col: 27, offset: 37716}, name: "UIntString", }, }, @@ -10985,9 +11045,9 @@ var g = &grammar{ }, { name: "NaN", - pos: position{line: 1533, col: 1, offset: 37474}, + pos: position{line: 1546, col: 1, offset: 37728}, expr: &litMatcher{ - pos: position{line: 1533, col: 7, offset: 37480}, + pos: position{line: 1546, col: 7, offset: 37734}, val: "NaN", ignoreCase: false, want: "\"NaN\"", @@ -10997,23 +11057,23 @@ var g = &grammar{ }, { name: "Infinity", - pos: position{line: 1535, col: 1, offset: 37487}, + pos: position{line: 1548, col: 1, offset: 37741}, expr: &seqExpr{ - pos: position{line: 1535, col: 12, offset: 37498}, + pos: position{line: 1548, col: 12, offset: 37752}, exprs: []any{ &zeroOrOneExpr{ - pos: position{line: 1535, col: 12, offset: 37498}, + pos: position{line: 1548, col: 12, offset: 37752}, expr: &choiceExpr{ - pos: position{line: 1535, col: 13, offset: 37499}, + pos: position{line: 1548, col: 13, offset: 37753}, alternatives: []any{ &litMatcher{ - pos: position{line: 1535, col: 13, offset: 37499}, + pos: position{line: 1548, col: 13, offset: 37753}, val: "-", ignoreCase: false, want: "\"-\"", }, &litMatcher{ - pos: position{line: 1535, col: 19, offset: 37505}, + pos: position{line: 1548, col: 19, offset: 37759}, val: "+", ignoreCase: false, want: "\"+\"", @@ -11022,7 +11082,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1535, col: 25, offset: 37511}, + pos: position{line: 1548, col: 25, offset: 37765}, val: "Inf", ignoreCase: false, want: "\"Inf\"", @@ -11034,14 +11094,14 @@ var g = &grammar{ }, { name: "Hex", - pos: position{line: 1537, col: 1, offset: 37518}, + pos: position{line: 1550, col: 1, offset: 37772}, expr: &actionExpr{ - pos: position{line: 1537, col: 7, offset: 37524}, + pos: position{line: 1550, col: 7, offset: 37778}, run: (*parser).callonHex1, expr: &oneOrMoreExpr{ - pos: position{line: 1537, col: 7, offset: 37524}, + pos: position{line: 1550, col: 7, offset: 37778}, expr: &ruleRefExpr{ - pos: position{line: 1537, col: 7, offset: 37524}, + pos: position{line: 1550, col: 7, offset: 37778}, name: "HexDigit", }, }, @@ -11051,9 +11111,9 @@ var g = &grammar{ }, { name: "HexDigit", - pos: position{line: 1539, col: 1, offset: 37566}, + pos: position{line: 1552, col: 1, offset: 37820}, expr: &charClassMatcher{ - pos: position{line: 1539, col: 12, offset: 37577}, + pos: position{line: 1552, col: 12, offset: 37831}, val: "[0-9a-fA-F]", ranges: []rune{'0', '9', 'a', 'f', 'A', 'F'}, ignoreCase: false, @@ -11064,35 +11124,35 @@ var g = &grammar{ }, { name: "QuotedString", - pos: position{line: 1541, col: 1, offset: 37590}, + pos: position{line: 1554, col: 1, offset: 37844}, expr: &choiceExpr{ - pos: position{line: 1542, col: 5, offset: 37607}, + pos: position{line: 1555, col: 5, offset: 37861}, alternatives: []any{ &actionExpr{ - pos: position{line: 1542, col: 5, offset: 37607}, + pos: position{line: 1555, col: 5, offset: 37861}, run: (*parser).callonQuotedString2, expr: &seqExpr{ - pos: position{line: 1542, col: 5, offset: 37607}, + pos: position{line: 1555, col: 5, offset: 37861}, exprs: []any{ &litMatcher{ - pos: position{line: 1542, col: 5, offset: 37607}, + pos: position{line: 1555, col: 5, offset: 37861}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, &labeledExpr{ - pos: position{line: 1542, col: 9, offset: 37611}, + pos: position{line: 1555, col: 9, offset: 37865}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1542, col: 11, offset: 37613}, + pos: position{line: 1555, col: 11, offset: 37867}, expr: &ruleRefExpr{ - pos: position{line: 1542, col: 11, offset: 37613}, + pos: position{line: 1555, col: 11, offset: 37867}, name: "DoubleQuotedChar", }, }, }, &litMatcher{ - pos: position{line: 1542, col: 29, offset: 37631}, + pos: position{line: 1555, col: 29, offset: 37885}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -11101,30 +11161,30 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1543, col: 5, offset: 37668}, + pos: position{line: 1556, col: 5, offset: 37922}, run: (*parser).callonQuotedString9, expr: &seqExpr{ - pos: position{line: 1543, col: 5, offset: 37668}, + pos: position{line: 1556, col: 5, offset: 37922}, exprs: []any{ &litMatcher{ - pos: position{line: 1543, col: 5, offset: 37668}, + pos: position{line: 1556, col: 5, offset: 37922}, val: "'", ignoreCase: false, want: "\"'\"", }, &labeledExpr{ - pos: position{line: 1543, col: 9, offset: 37672}, + pos: position{line: 1556, col: 9, offset: 37926}, label: "v", expr: &zeroOrMoreExpr{ - pos: position{line: 1543, col: 11, offset: 37674}, + pos: position{line: 1556, col: 11, offset: 37928}, expr: &ruleRefExpr{ - pos: position{line: 1543, col: 11, offset: 37674}, + pos: position{line: 1556, col: 11, offset: 37928}, name: "SingleQuotedChar", }, }, }, &litMatcher{ - pos: position{line: 1543, col: 29, offset: 37692}, + pos: position{line: 1556, col: 29, offset: 37946}, val: "'", ignoreCase: false, want: "\"'\"", @@ -11139,57 +11199,57 @@ var g = &grammar{ }, { name: "DoubleQuotedChar", - pos: position{line: 1545, col: 1, offset: 37726}, + pos: position{line: 1558, col: 1, offset: 37980}, expr: &choiceExpr{ - pos: position{line: 1546, col: 5, offset: 37747}, + pos: position{line: 1559, col: 5, offset: 38001}, alternatives: []any{ &actionExpr{ - pos: position{line: 1546, col: 5, offset: 37747}, + pos: position{line: 1559, col: 5, offset: 38001}, run: (*parser).callonDoubleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1546, col: 5, offset: 37747}, + pos: position{line: 1559, col: 5, offset: 38001}, exprs: []any{ ¬Expr{ - pos: position{line: 1546, col: 5, offset: 37747}, + pos: position{line: 1559, col: 5, offset: 38001}, expr: &choiceExpr{ - pos: position{line: 1546, col: 7, offset: 37749}, + pos: position{line: 1559, col: 7, offset: 38003}, alternatives: []any{ &litMatcher{ - pos: position{line: 1546, col: 7, offset: 37749}, + pos: position{line: 1559, col: 7, offset: 38003}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, &ruleRefExpr{ - pos: position{line: 1546, col: 13, offset: 37755}, + pos: position{line: 1559, col: 13, offset: 38009}, name: "EscapedChar", }, }, }, }, &anyMatcher{ - line: 1546, col: 26, offset: 37768, + line: 1559, col: 26, offset: 38022, }, }, }, }, &actionExpr{ - pos: position{line: 1547, col: 5, offset: 37805}, + pos: position{line: 1560, col: 5, offset: 38059}, run: (*parser).callonDoubleQuotedChar9, expr: &seqExpr{ - pos: position{line: 1547, col: 5, offset: 37805}, + pos: position{line: 1560, col: 5, offset: 38059}, exprs: []any{ &litMatcher{ - pos: position{line: 1547, col: 5, offset: 37805}, + pos: position{line: 1560, col: 5, offset: 38059}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1547, col: 10, offset: 37810}, + pos: position{line: 1560, col: 10, offset: 38064}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1547, col: 12, offset: 37812}, + pos: position{line: 1560, col: 12, offset: 38066}, name: "EscapeSequence", }, }, @@ -11203,28 +11263,28 @@ var g = &grammar{ }, { name: "KeyWord", - pos: position{line: 1549, col: 1, offset: 37846}, + pos: position{line: 1562, col: 1, offset: 38100}, expr: &actionExpr{ - pos: position{line: 1550, col: 5, offset: 37858}, + pos: position{line: 1563, col: 5, offset: 38112}, run: (*parser).callonKeyWord1, expr: &seqExpr{ - pos: position{line: 1550, col: 5, offset: 37858}, + pos: position{line: 1563, col: 5, offset: 38112}, exprs: []any{ &labeledExpr{ - pos: position{line: 1550, col: 5, offset: 37858}, + pos: position{line: 1563, col: 5, offset: 38112}, label: "head", expr: &ruleRefExpr{ - pos: position{line: 1550, col: 10, offset: 37863}, + pos: position{line: 1563, col: 10, offset: 38117}, name: "KeyWordStart", }, }, &labeledExpr{ - pos: position{line: 1550, col: 23, offset: 37876}, + pos: position{line: 1563, col: 23, offset: 38130}, label: "tail", expr: &zeroOrMoreExpr{ - pos: position{line: 1550, col: 28, offset: 37881}, + pos: position{line: 1563, col: 28, offset: 38135}, expr: &ruleRefExpr{ - pos: position{line: 1550, col: 28, offset: 37881}, + pos: position{line: 1563, col: 28, offset: 38135}, name: "KeyWordRest", }, }, @@ -11237,16 +11297,16 @@ var g = &grammar{ }, { name: "KeyWordStart", - pos: position{line: 1552, col: 1, offset: 37943}, + pos: position{line: 1565, col: 1, offset: 38197}, expr: &choiceExpr{ - pos: position{line: 1553, col: 5, offset: 37960}, + pos: position{line: 1566, col: 5, offset: 38214}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1553, col: 5, offset: 37960}, + pos: position{line: 1566, col: 5, offset: 38214}, name: "KeyWordChars", }, &ruleRefExpr{ - pos: position{line: 1554, col: 5, offset: 37977}, + pos: position{line: 1567, col: 5, offset: 38231}, name: "KeyWordEsc", }, }, @@ -11256,16 +11316,16 @@ var g = &grammar{ }, { name: "KeyWordRest", - pos: position{line: 1556, col: 1, offset: 37989}, + pos: position{line: 1569, col: 1, offset: 38243}, expr: &choiceExpr{ - pos: position{line: 1557, col: 5, offset: 38005}, + pos: position{line: 1570, col: 5, offset: 38259}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1557, col: 5, offset: 38005}, + pos: position{line: 1570, col: 5, offset: 38259}, name: "KeyWordStart", }, &charClassMatcher{ - pos: position{line: 1558, col: 5, offset: 38022}, + pos: position{line: 1571, col: 5, offset: 38276}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11278,19 +11338,19 @@ var g = &grammar{ }, { name: "KeyWordChars", - pos: position{line: 1560, col: 1, offset: 38029}, + pos: position{line: 1573, col: 1, offset: 38283}, expr: &actionExpr{ - pos: position{line: 1560, col: 16, offset: 38044}, + pos: position{line: 1573, col: 16, offset: 38298}, run: (*parser).callonKeyWordChars1, expr: &choiceExpr{ - pos: position{line: 1560, col: 17, offset: 38045}, + pos: position{line: 1573, col: 17, offset: 38299}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1560, col: 17, offset: 38045}, + pos: position{line: 1573, col: 17, offset: 38299}, name: "UnicodeLetter", }, &charClassMatcher{ - pos: position{line: 1560, col: 33, offset: 38061}, + pos: position{line: 1573, col: 33, offset: 38315}, val: "[_.:/%#@~]", chars: []rune{'_', '.', ':', '/', '%', '#', '@', '~'}, ignoreCase: false, @@ -11304,31 +11364,31 @@ var g = &grammar{ }, { name: "KeyWordEsc", - pos: position{line: 1562, col: 1, offset: 38105}, + pos: position{line: 1575, col: 1, offset: 38359}, expr: &actionExpr{ - pos: position{line: 1562, col: 14, offset: 38118}, + pos: position{line: 1575, col: 14, offset: 38372}, run: (*parser).callonKeyWordEsc1, expr: &seqExpr{ - pos: position{line: 1562, col: 14, offset: 38118}, + pos: position{line: 1575, col: 14, offset: 38372}, exprs: []any{ &litMatcher{ - pos: position{line: 1562, col: 14, offset: 38118}, + pos: position{line: 1575, col: 14, offset: 38372}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1562, col: 19, offset: 38123}, + pos: position{line: 1575, col: 19, offset: 38377}, label: "s", expr: &choiceExpr{ - pos: position{line: 1562, col: 22, offset: 38126}, + pos: position{line: 1575, col: 22, offset: 38380}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1562, col: 22, offset: 38126}, + pos: position{line: 1575, col: 22, offset: 38380}, name: "KeywordEscape", }, &ruleRefExpr{ - pos: position{line: 1562, col: 38, offset: 38142}, + pos: position{line: 1575, col: 38, offset: 38396}, name: "EscapeSequence", }, }, @@ -11342,42 +11402,42 @@ var g = &grammar{ }, { name: "GlobPattern", - pos: position{line: 1564, col: 1, offset: 38177}, + pos: position{line: 1577, col: 1, offset: 38431}, expr: &actionExpr{ - pos: position{line: 1565, col: 5, offset: 38193}, + pos: position{line: 1578, col: 5, offset: 38447}, run: (*parser).callonGlobPattern1, expr: &seqExpr{ - pos: position{line: 1565, col: 5, offset: 38193}, + pos: position{line: 1578, col: 5, offset: 38447}, exprs: []any{ &andExpr{ - pos: position{line: 1565, col: 5, offset: 38193}, + pos: position{line: 1578, col: 5, offset: 38447}, expr: &ruleRefExpr{ - pos: position{line: 1565, col: 6, offset: 38194}, + pos: position{line: 1578, col: 6, offset: 38448}, name: "GlobProperStart", }, }, &andExpr{ - pos: position{line: 1565, col: 22, offset: 38210}, + pos: position{line: 1578, col: 22, offset: 38464}, expr: &ruleRefExpr{ - pos: position{line: 1565, col: 23, offset: 38211}, + pos: position{line: 1578, col: 23, offset: 38465}, name: "GlobHasStar", }, }, &labeledExpr{ - pos: position{line: 1565, col: 35, offset: 38223}, + pos: position{line: 1578, col: 35, offset: 38477}, label: "head", expr: &ruleRefExpr{ - pos: position{line: 1565, col: 40, offset: 38228}, + pos: position{line: 1578, col: 40, offset: 38482}, name: "GlobStart", }, }, &labeledExpr{ - pos: position{line: 1565, col: 50, offset: 38238}, + pos: position{line: 1578, col: 50, offset: 38492}, label: "tail", expr: &zeroOrMoreExpr{ - pos: position{line: 1565, col: 55, offset: 38243}, + pos: position{line: 1578, col: 55, offset: 38497}, expr: &ruleRefExpr{ - pos: position{line: 1565, col: 55, offset: 38243}, + pos: position{line: 1578, col: 55, offset: 38497}, name: "GlobRest", }, }, @@ -11390,28 +11450,28 @@ var g = &grammar{ }, { name: "GlobProperStart", - pos: position{line: 1569, col: 1, offset: 38312}, + pos: position{line: 1582, col: 1, offset: 38566}, expr: &choiceExpr{ - pos: position{line: 1569, col: 19, offset: 38330}, + pos: position{line: 1582, col: 19, offset: 38584}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1569, col: 19, offset: 38330}, + pos: position{line: 1582, col: 19, offset: 38584}, name: "KeyWordStart", }, &seqExpr{ - pos: position{line: 1569, col: 34, offset: 38345}, + pos: position{line: 1582, col: 34, offset: 38599}, exprs: []any{ &oneOrMoreExpr{ - pos: position{line: 1569, col: 34, offset: 38345}, + pos: position{line: 1582, col: 34, offset: 38599}, expr: &litMatcher{ - pos: position{line: 1569, col: 34, offset: 38345}, + pos: position{line: 1582, col: 34, offset: 38599}, val: "*", ignoreCase: false, want: "\"*\"", }, }, &ruleRefExpr{ - pos: position{line: 1569, col: 39, offset: 38350}, + pos: position{line: 1582, col: 39, offset: 38604}, name: "KeyWordRest", }, }, @@ -11423,19 +11483,19 @@ var g = &grammar{ }, { name: "GlobHasStar", - pos: position{line: 1570, col: 1, offset: 38362}, + pos: position{line: 1583, col: 1, offset: 38616}, expr: &seqExpr{ - pos: position{line: 1570, col: 15, offset: 38376}, + pos: position{line: 1583, col: 15, offset: 38630}, exprs: []any{ &zeroOrMoreExpr{ - pos: position{line: 1570, col: 15, offset: 38376}, + pos: position{line: 1583, col: 15, offset: 38630}, expr: &ruleRefExpr{ - pos: position{line: 1570, col: 15, offset: 38376}, + pos: position{line: 1583, col: 15, offset: 38630}, name: "KeyWordRest", }, }, &litMatcher{ - pos: position{line: 1570, col: 28, offset: 38389}, + pos: position{line: 1583, col: 28, offset: 38643}, val: "*", ignoreCase: false, want: "\"*\"", @@ -11447,23 +11507,23 @@ var g = &grammar{ }, { name: "GlobStart", - pos: position{line: 1572, col: 1, offset: 38394}, + pos: position{line: 1585, col: 1, offset: 38648}, expr: &choiceExpr{ - pos: position{line: 1573, col: 5, offset: 38408}, + pos: position{line: 1586, col: 5, offset: 38662}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1573, col: 5, offset: 38408}, + pos: position{line: 1586, col: 5, offset: 38662}, name: "KeyWordChars", }, &ruleRefExpr{ - pos: position{line: 1574, col: 5, offset: 38425}, + pos: position{line: 1587, col: 5, offset: 38679}, name: "GlobEsc", }, &actionExpr{ - pos: position{line: 1575, col: 5, offset: 38437}, + pos: position{line: 1588, col: 5, offset: 38691}, run: (*parser).callonGlobStart4, expr: &litMatcher{ - pos: position{line: 1575, col: 5, offset: 38437}, + pos: position{line: 1588, col: 5, offset: 38691}, val: "*", ignoreCase: false, want: "\"*\"", @@ -11476,16 +11536,16 @@ var g = &grammar{ }, { name: "GlobRest", - pos: position{line: 1577, col: 1, offset: 38462}, + pos: position{line: 1590, col: 1, offset: 38716}, expr: &choiceExpr{ - pos: position{line: 1578, col: 5, offset: 38475}, + pos: position{line: 1591, col: 5, offset: 38729}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1578, col: 5, offset: 38475}, + pos: position{line: 1591, col: 5, offset: 38729}, name: "GlobStart", }, &charClassMatcher{ - pos: position{line: 1579, col: 5, offset: 38489}, + pos: position{line: 1592, col: 5, offset: 38743}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -11498,31 +11558,31 @@ var g = &grammar{ }, { name: "GlobEsc", - pos: position{line: 1581, col: 1, offset: 38496}, + pos: position{line: 1594, col: 1, offset: 38750}, expr: &actionExpr{ - pos: position{line: 1581, col: 11, offset: 38506}, + pos: position{line: 1594, col: 11, offset: 38760}, run: (*parser).callonGlobEsc1, expr: &seqExpr{ - pos: position{line: 1581, col: 11, offset: 38506}, + pos: position{line: 1594, col: 11, offset: 38760}, exprs: []any{ &litMatcher{ - pos: position{line: 1581, col: 11, offset: 38506}, + pos: position{line: 1594, col: 11, offset: 38760}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1581, col: 16, offset: 38511}, + pos: position{line: 1594, col: 16, offset: 38765}, label: "s", expr: &choiceExpr{ - pos: position{line: 1581, col: 19, offset: 38514}, + pos: position{line: 1594, col: 19, offset: 38768}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1581, col: 19, offset: 38514}, + pos: position{line: 1594, col: 19, offset: 38768}, name: "GlobEscape", }, &ruleRefExpr{ - pos: position{line: 1581, col: 32, offset: 38527}, + pos: position{line: 1594, col: 32, offset: 38781}, name: "EscapeSequence", }, }, @@ -11536,32 +11596,32 @@ var g = &grammar{ }, { name: "GlobEscape", - pos: position{line: 1583, col: 1, offset: 38562}, + pos: position{line: 1596, col: 1, offset: 38816}, expr: &choiceExpr{ - pos: position{line: 1584, col: 5, offset: 38577}, + pos: position{line: 1597, col: 5, offset: 38831}, alternatives: []any{ &actionExpr{ - pos: position{line: 1584, col: 5, offset: 38577}, + pos: position{line: 1597, col: 5, offset: 38831}, run: (*parser).callonGlobEscape2, expr: &litMatcher{ - pos: position{line: 1584, col: 5, offset: 38577}, + pos: position{line: 1597, col: 5, offset: 38831}, val: "=", ignoreCase: false, want: "\"=\"", }, }, &actionExpr{ - pos: position{line: 1585, col: 5, offset: 38605}, + pos: position{line: 1598, col: 5, offset: 38859}, run: (*parser).callonGlobEscape4, expr: &litMatcher{ - pos: position{line: 1585, col: 5, offset: 38605}, + pos: position{line: 1598, col: 5, offset: 38859}, val: "*", ignoreCase: false, want: "\"*\"", }, }, &charClassMatcher{ - pos: position{line: 1586, col: 5, offset: 38635}, + pos: position{line: 1599, col: 5, offset: 38889}, val: "[+-]", chars: []rune{'+', '-'}, ignoreCase: false, @@ -11574,57 +11634,57 @@ var g = &grammar{ }, { name: "SingleQuotedChar", - pos: position{line: 1588, col: 1, offset: 38641}, + pos: position{line: 1601, col: 1, offset: 38895}, expr: &choiceExpr{ - pos: position{line: 1589, col: 5, offset: 38662}, + pos: position{line: 1602, col: 5, offset: 38916}, alternatives: []any{ &actionExpr{ - pos: position{line: 1589, col: 5, offset: 38662}, + pos: position{line: 1602, col: 5, offset: 38916}, run: (*parser).callonSingleQuotedChar2, expr: &seqExpr{ - pos: position{line: 1589, col: 5, offset: 38662}, + pos: position{line: 1602, col: 5, offset: 38916}, exprs: []any{ ¬Expr{ - pos: position{line: 1589, col: 5, offset: 38662}, + pos: position{line: 1602, col: 5, offset: 38916}, expr: &choiceExpr{ - pos: position{line: 1589, col: 7, offset: 38664}, + pos: position{line: 1602, col: 7, offset: 38918}, alternatives: []any{ &litMatcher{ - pos: position{line: 1589, col: 7, offset: 38664}, + pos: position{line: 1602, col: 7, offset: 38918}, val: "'", ignoreCase: false, want: "\"'\"", }, &ruleRefExpr{ - pos: position{line: 1589, col: 13, offset: 38670}, + pos: position{line: 1602, col: 13, offset: 38924}, name: "EscapedChar", }, }, }, }, &anyMatcher{ - line: 1589, col: 26, offset: 38683, + line: 1602, col: 26, offset: 38937, }, }, }, }, &actionExpr{ - pos: position{line: 1590, col: 5, offset: 38720}, + pos: position{line: 1603, col: 5, offset: 38974}, run: (*parser).callonSingleQuotedChar9, expr: &seqExpr{ - pos: position{line: 1590, col: 5, offset: 38720}, + pos: position{line: 1603, col: 5, offset: 38974}, exprs: []any{ &litMatcher{ - pos: position{line: 1590, col: 5, offset: 38720}, + pos: position{line: 1603, col: 5, offset: 38974}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 1590, col: 10, offset: 38725}, + pos: position{line: 1603, col: 10, offset: 38979}, label: "s", expr: &ruleRefExpr{ - pos: position{line: 1590, col: 12, offset: 38727}, + pos: position{line: 1603, col: 12, offset: 38981}, name: "EscapeSequence", }, }, @@ -11638,16 +11698,16 @@ var g = &grammar{ }, { name: "EscapeSequence", - pos: position{line: 1592, col: 1, offset: 38761}, + pos: position{line: 1605, col: 1, offset: 39015}, expr: &choiceExpr{ - pos: position{line: 1593, col: 5, offset: 38780}, + pos: position{line: 1606, col: 5, offset: 39034}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1593, col: 5, offset: 38780}, + pos: position{line: 1606, col: 5, offset: 39034}, name: "SingleCharEscape", }, &ruleRefExpr{ - pos: position{line: 1594, col: 5, offset: 38801}, + pos: position{line: 1607, col: 5, offset: 39055}, name: "UnicodeEscape", }, }, @@ -11657,87 +11717,87 @@ var g = &grammar{ }, { name: "SingleCharEscape", - pos: position{line: 1596, col: 1, offset: 38816}, + pos: position{line: 1609, col: 1, offset: 39070}, expr: &choiceExpr{ - pos: position{line: 1597, col: 5, offset: 38837}, + pos: position{line: 1610, col: 5, offset: 39091}, alternatives: []any{ &litMatcher{ - pos: position{line: 1597, col: 5, offset: 38837}, + pos: position{line: 1610, col: 5, offset: 39091}, val: "'", ignoreCase: false, want: "\"'\"", }, &actionExpr{ - pos: position{line: 1598, col: 5, offset: 38845}, + pos: position{line: 1611, col: 5, offset: 39099}, run: (*parser).callonSingleCharEscape3, expr: &litMatcher{ - pos: position{line: 1598, col: 5, offset: 38845}, + pos: position{line: 1611, col: 5, offset: 39099}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, }, &litMatcher{ - pos: position{line: 1599, col: 5, offset: 38885}, + pos: position{line: 1612, col: 5, offset: 39139}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &actionExpr{ - pos: position{line: 1600, col: 5, offset: 38894}, + pos: position{line: 1613, col: 5, offset: 39148}, run: (*parser).callonSingleCharEscape6, expr: &litMatcher{ - pos: position{line: 1600, col: 5, offset: 38894}, + pos: position{line: 1613, col: 5, offset: 39148}, val: "b", ignoreCase: false, want: "\"b\"", }, }, &actionExpr{ - pos: position{line: 1601, col: 5, offset: 38923}, + pos: position{line: 1614, col: 5, offset: 39177}, run: (*parser).callonSingleCharEscape8, expr: &litMatcher{ - pos: position{line: 1601, col: 5, offset: 38923}, + pos: position{line: 1614, col: 5, offset: 39177}, val: "f", ignoreCase: false, want: "\"f\"", }, }, &actionExpr{ - pos: position{line: 1602, col: 5, offset: 38952}, + pos: position{line: 1615, col: 5, offset: 39206}, run: (*parser).callonSingleCharEscape10, expr: &litMatcher{ - pos: position{line: 1602, col: 5, offset: 38952}, + pos: position{line: 1615, col: 5, offset: 39206}, val: "n", ignoreCase: false, want: "\"n\"", }, }, &actionExpr{ - pos: position{line: 1603, col: 5, offset: 38981}, + pos: position{line: 1616, col: 5, offset: 39235}, run: (*parser).callonSingleCharEscape12, expr: &litMatcher{ - pos: position{line: 1603, col: 5, offset: 38981}, + pos: position{line: 1616, col: 5, offset: 39235}, val: "r", ignoreCase: false, want: "\"r\"", }, }, &actionExpr{ - pos: position{line: 1604, col: 5, offset: 39010}, + pos: position{line: 1617, col: 5, offset: 39264}, run: (*parser).callonSingleCharEscape14, expr: &litMatcher{ - pos: position{line: 1604, col: 5, offset: 39010}, + pos: position{line: 1617, col: 5, offset: 39264}, val: "t", ignoreCase: false, want: "\"t\"", }, }, &actionExpr{ - pos: position{line: 1605, col: 5, offset: 39039}, + pos: position{line: 1618, col: 5, offset: 39293}, run: (*parser).callonSingleCharEscape16, expr: &litMatcher{ - pos: position{line: 1605, col: 5, offset: 39039}, + pos: position{line: 1618, col: 5, offset: 39293}, val: "v", ignoreCase: false, want: "\"v\"", @@ -11750,32 +11810,32 @@ var g = &grammar{ }, { name: "KeywordEscape", - pos: position{line: 1607, col: 1, offset: 39065}, + pos: position{line: 1620, col: 1, offset: 39319}, expr: &choiceExpr{ - pos: position{line: 1608, col: 5, offset: 39083}, + pos: position{line: 1621, col: 5, offset: 39337}, alternatives: []any{ &actionExpr{ - pos: position{line: 1608, col: 5, offset: 39083}, + pos: position{line: 1621, col: 5, offset: 39337}, run: (*parser).callonKeywordEscape2, expr: &litMatcher{ - pos: position{line: 1608, col: 5, offset: 39083}, + pos: position{line: 1621, col: 5, offset: 39337}, val: "=", ignoreCase: false, want: "\"=\"", }, }, &actionExpr{ - pos: position{line: 1609, col: 5, offset: 39111}, + pos: position{line: 1622, col: 5, offset: 39365}, run: (*parser).callonKeywordEscape4, expr: &litMatcher{ - pos: position{line: 1609, col: 5, offset: 39111}, + pos: position{line: 1622, col: 5, offset: 39365}, val: "*", ignoreCase: false, want: "\"*\"", }, }, &charClassMatcher{ - pos: position{line: 1610, col: 5, offset: 39139}, + pos: position{line: 1623, col: 5, offset: 39393}, val: "[+-]", chars: []rune{'+', '-'}, ignoreCase: false, @@ -11788,42 +11848,42 @@ var g = &grammar{ }, { name: "UnicodeEscape", - pos: position{line: 1612, col: 1, offset: 39145}, + pos: position{line: 1625, col: 1, offset: 39399}, expr: &choiceExpr{ - pos: position{line: 1613, col: 5, offset: 39163}, + pos: position{line: 1626, col: 5, offset: 39417}, alternatives: []any{ &actionExpr{ - pos: position{line: 1613, col: 5, offset: 39163}, + pos: position{line: 1626, col: 5, offset: 39417}, run: (*parser).callonUnicodeEscape2, expr: &seqExpr{ - pos: position{line: 1613, col: 5, offset: 39163}, + pos: position{line: 1626, col: 5, offset: 39417}, exprs: []any{ &litMatcher{ - pos: position{line: 1613, col: 5, offset: 39163}, + pos: position{line: 1626, col: 5, offset: 39417}, val: "u", ignoreCase: false, want: "\"u\"", }, &labeledExpr{ - pos: position{line: 1613, col: 9, offset: 39167}, + pos: position{line: 1626, col: 9, offset: 39421}, label: "chars", expr: &seqExpr{ - pos: position{line: 1613, col: 16, offset: 39174}, + pos: position{line: 1626, col: 16, offset: 39428}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1613, col: 16, offset: 39174}, + pos: position{line: 1626, col: 16, offset: 39428}, name: "HexDigit", }, &ruleRefExpr{ - pos: position{line: 1613, col: 25, offset: 39183}, + pos: position{line: 1626, col: 25, offset: 39437}, name: "HexDigit", }, &ruleRefExpr{ - pos: position{line: 1613, col: 34, offset: 39192}, + pos: position{line: 1626, col: 34, offset: 39446}, name: "HexDigit", }, &ruleRefExpr{ - pos: position{line: 1613, col: 43, offset: 39201}, + pos: position{line: 1626, col: 43, offset: 39455}, name: "HexDigit", }, }, @@ -11833,65 +11893,65 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 1616, col: 5, offset: 39264}, + pos: position{line: 1629, col: 5, offset: 39518}, run: (*parser).callonUnicodeEscape11, expr: &seqExpr{ - pos: position{line: 1616, col: 5, offset: 39264}, + pos: position{line: 1629, col: 5, offset: 39518}, exprs: []any{ &litMatcher{ - pos: position{line: 1616, col: 5, offset: 39264}, + pos: position{line: 1629, col: 5, offset: 39518}, val: "u", ignoreCase: false, want: "\"u\"", }, &litMatcher{ - pos: position{line: 1616, col: 9, offset: 39268}, + pos: position{line: 1629, col: 9, offset: 39522}, val: "{", ignoreCase: false, want: "\"{\"", }, &labeledExpr{ - pos: position{line: 1616, col: 13, offset: 39272}, + pos: position{line: 1629, col: 13, offset: 39526}, label: "chars", expr: &seqExpr{ - pos: position{line: 1616, col: 20, offset: 39279}, + pos: position{line: 1629, col: 20, offset: 39533}, exprs: []any{ &ruleRefExpr{ - pos: position{line: 1616, col: 20, offset: 39279}, + pos: position{line: 1629, col: 20, offset: 39533}, name: "HexDigit", }, &zeroOrOneExpr{ - pos: position{line: 1616, col: 29, offset: 39288}, + pos: position{line: 1629, col: 29, offset: 39542}, expr: &ruleRefExpr{ - pos: position{line: 1616, col: 29, offset: 39288}, + pos: position{line: 1629, col: 29, offset: 39542}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1616, col: 39, offset: 39298}, + pos: position{line: 1629, col: 39, offset: 39552}, expr: &ruleRefExpr{ - pos: position{line: 1616, col: 39, offset: 39298}, + pos: position{line: 1629, col: 39, offset: 39552}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1616, col: 49, offset: 39308}, + pos: position{line: 1629, col: 49, offset: 39562}, expr: &ruleRefExpr{ - pos: position{line: 1616, col: 49, offset: 39308}, + pos: position{line: 1629, col: 49, offset: 39562}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1616, col: 59, offset: 39318}, + pos: position{line: 1629, col: 59, offset: 39572}, expr: &ruleRefExpr{ - pos: position{line: 1616, col: 59, offset: 39318}, + pos: position{line: 1629, col: 59, offset: 39572}, name: "HexDigit", }, }, &zeroOrOneExpr{ - pos: position{line: 1616, col: 69, offset: 39328}, + pos: position{line: 1629, col: 69, offset: 39582}, expr: &ruleRefExpr{ - pos: position{line: 1616, col: 69, offset: 39328}, + pos: position{line: 1629, col: 69, offset: 39582}, name: "HexDigit", }, }, @@ -11899,7 +11959,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 1616, col: 80, offset: 39339}, + pos: position{line: 1629, col: 80, offset: 39593}, val: "}", ignoreCase: false, want: "\"}\"", @@ -11914,37 +11974,37 @@ var g = &grammar{ }, { name: "RegexpPattern", - pos: position{line: 1620, col: 1, offset: 39393}, + pos: position{line: 1633, col: 1, offset: 39647}, expr: &actionExpr{ - pos: position{line: 1621, col: 5, offset: 39411}, + pos: position{line: 1634, col: 5, offset: 39665}, run: (*parser).callonRegexpPattern1, expr: &seqExpr{ - pos: position{line: 1621, col: 5, offset: 39411}, + pos: position{line: 1634, col: 5, offset: 39665}, exprs: []any{ &litMatcher{ - pos: position{line: 1621, col: 5, offset: 39411}, + pos: position{line: 1634, col: 5, offset: 39665}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 1621, col: 9, offset: 39415}, + pos: position{line: 1634, col: 9, offset: 39669}, label: "body", expr: &ruleRefExpr{ - pos: position{line: 1621, col: 14, offset: 39420}, + pos: position{line: 1634, col: 14, offset: 39674}, name: "RegexpBody", }, }, &litMatcher{ - pos: position{line: 1621, col: 25, offset: 39431}, + pos: position{line: 1634, col: 25, offset: 39685}, val: "/", ignoreCase: false, want: "\"/\"", }, ¬Expr{ - pos: position{line: 1621, col: 29, offset: 39435}, + pos: position{line: 1634, col: 29, offset: 39689}, expr: &ruleRefExpr{ - pos: position{line: 1621, col: 30, offset: 39436}, + pos: position{line: 1634, col: 30, offset: 39690}, name: "KeyWordStart", }, }, @@ -11956,33 +12016,33 @@ var g = &grammar{ }, { name: "RegexpBody", - pos: position{line: 1623, col: 1, offset: 39471}, + pos: position{line: 1636, col: 1, offset: 39725}, expr: &actionExpr{ - pos: position{line: 1624, col: 5, offset: 39486}, + pos: position{line: 1637, col: 5, offset: 39740}, run: (*parser).callonRegexpBody1, expr: &oneOrMoreExpr{ - pos: position{line: 1624, col: 5, offset: 39486}, + pos: position{line: 1637, col: 5, offset: 39740}, expr: &choiceExpr{ - pos: position{line: 1624, col: 6, offset: 39487}, + pos: position{line: 1637, col: 6, offset: 39741}, alternatives: []any{ &charClassMatcher{ - pos: position{line: 1624, col: 6, offset: 39487}, + pos: position{line: 1637, col: 6, offset: 39741}, val: "[^/\\\\]", chars: []rune{'/', '\\'}, ignoreCase: false, inverted: true, }, &seqExpr{ - pos: position{line: 1624, col: 15, offset: 39496}, + pos: position{line: 1637, col: 15, offset: 39750}, exprs: []any{ &litMatcher{ - pos: position{line: 1624, col: 15, offset: 39496}, + pos: position{line: 1637, col: 15, offset: 39750}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &anyMatcher{ - line: 1624, col: 20, offset: 39501, + line: 1637, col: 20, offset: 39755, }, }, }, @@ -11995,9 +12055,9 @@ var g = &grammar{ }, { name: "EscapedChar", - pos: position{line: 1626, col: 1, offset: 39537}, + pos: position{line: 1639, col: 1, offset: 39791}, expr: &charClassMatcher{ - pos: position{line: 1627, col: 5, offset: 39553}, + pos: position{line: 1640, col: 5, offset: 39807}, val: "[\\x00-\\x1f\\\\]", chars: []rune{'\\'}, ranges: []rune{'\x00', '\x1f'}, @@ -12009,11 +12069,11 @@ var g = &grammar{ }, { name: "_", - pos: position{line: 1629, col: 1, offset: 39568}, + pos: position{line: 1642, col: 1, offset: 39822}, expr: &oneOrMoreExpr{ - pos: position{line: 1629, col: 5, offset: 39572}, + pos: position{line: 1642, col: 5, offset: 39826}, expr: &ruleRefExpr{ - pos: position{line: 1629, col: 5, offset: 39572}, + pos: position{line: 1642, col: 5, offset: 39826}, name: "AnySpace", }, }, @@ -12022,11 +12082,11 @@ var g = &grammar{ }, { name: "__", - pos: position{line: 1631, col: 1, offset: 39583}, + pos: position{line: 1644, col: 1, offset: 39837}, expr: &zeroOrMoreExpr{ - pos: position{line: 1631, col: 6, offset: 39588}, + pos: position{line: 1644, col: 6, offset: 39842}, expr: &ruleRefExpr{ - pos: position{line: 1631, col: 6, offset: 39588}, + pos: position{line: 1644, col: 6, offset: 39842}, name: "AnySpace", }, }, @@ -12035,20 +12095,20 @@ var g = &grammar{ }, { name: "AnySpace", - pos: position{line: 1633, col: 1, offset: 39599}, + pos: position{line: 1646, col: 1, offset: 39853}, expr: &choiceExpr{ - pos: position{line: 1634, col: 5, offset: 39612}, + pos: position{line: 1647, col: 5, offset: 39866}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1634, col: 5, offset: 39612}, + pos: position{line: 1647, col: 5, offset: 39866}, name: "WhiteSpace", }, &ruleRefExpr{ - pos: position{line: 1635, col: 5, offset: 39627}, + pos: position{line: 1648, col: 5, offset: 39881}, name: "LineTerminator", }, &ruleRefExpr{ - pos: position{line: 1636, col: 5, offset: 39646}, + pos: position{line: 1649, col: 5, offset: 39900}, name: "Comment", }, }, @@ -12058,32 +12118,32 @@ var g = &grammar{ }, { name: "UnicodeLetter", - pos: position{line: 1638, col: 1, offset: 39655}, + pos: position{line: 1651, col: 1, offset: 39909}, expr: &choiceExpr{ - pos: position{line: 1639, col: 5, offset: 39673}, + pos: position{line: 1652, col: 5, offset: 39927}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1639, col: 5, offset: 39673}, + pos: position{line: 1652, col: 5, offset: 39927}, name: "Lu", }, &ruleRefExpr{ - pos: position{line: 1640, col: 5, offset: 39680}, + pos: position{line: 1653, col: 5, offset: 39934}, name: "Ll", }, &ruleRefExpr{ - pos: position{line: 1641, col: 5, offset: 39687}, + pos: position{line: 1654, col: 5, offset: 39941}, name: "Lt", }, &ruleRefExpr{ - pos: position{line: 1642, col: 5, offset: 39694}, + pos: position{line: 1655, col: 5, offset: 39948}, name: "Lm", }, &ruleRefExpr{ - pos: position{line: 1643, col: 5, offset: 39701}, + pos: position{line: 1656, col: 5, offset: 39955}, name: "Lo", }, &ruleRefExpr{ - pos: position{line: 1644, col: 5, offset: 39708}, + pos: position{line: 1657, col: 5, offset: 39962}, name: "Nl", }, }, @@ -12093,16 +12153,16 @@ var g = &grammar{ }, { name: "UnicodeCombiningMark", - pos: position{line: 1646, col: 1, offset: 39712}, + pos: position{line: 1659, col: 1, offset: 39966}, expr: &choiceExpr{ - pos: position{line: 1647, col: 5, offset: 39737}, + pos: position{line: 1660, col: 5, offset: 39991}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1647, col: 5, offset: 39737}, + pos: position{line: 1660, col: 5, offset: 39991}, name: "Mn", }, &ruleRefExpr{ - pos: position{line: 1648, col: 5, offset: 39744}, + pos: position{line: 1661, col: 5, offset: 39998}, name: "Mc", }, }, @@ -12112,9 +12172,9 @@ var g = &grammar{ }, { name: "UnicodeDigit", - pos: position{line: 1650, col: 1, offset: 39748}, + pos: position{line: 1663, col: 1, offset: 40002}, expr: &ruleRefExpr{ - pos: position{line: 1651, col: 5, offset: 39765}, + pos: position{line: 1664, col: 5, offset: 40019}, name: "Nd", }, leader: false, @@ -12122,9 +12182,9 @@ var g = &grammar{ }, { name: "UnicodeConnectorPunctuation", - pos: position{line: 1653, col: 1, offset: 39769}, + pos: position{line: 1666, col: 1, offset: 40023}, expr: &ruleRefExpr{ - pos: position{line: 1654, col: 5, offset: 39801}, + pos: position{line: 1667, col: 5, offset: 40055}, name: "Pc", }, leader: false, @@ -12132,9 +12192,9 @@ var g = &grammar{ }, { name: "Ll", - pos: position{line: 1660, col: 1, offset: 39982}, + pos: position{line: 1673, col: 1, offset: 40236}, expr: &charClassMatcher{ - pos: position{line: 1660, col: 6, offset: 39987}, + pos: position{line: 1673, col: 6, offset: 40241}, 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', 'ﬓ', 'ﬗ', 'ａ', 'ｚ'}, @@ -12146,9 +12206,9 @@ var g = &grammar{ }, { name: "Lm", - pos: position{line: 1663, col: 1, offset: 44139}, + pos: position{line: 1676, col: 1, offset: 44393}, expr: &charClassMatcher{ - pos: position{line: 1663, col: 6, offset: 44144}, + pos: position{line: 1676, col: 6, offset: 44398}, 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{'ʰ', 'ˁ', 'ˆ', 'ˑ', 'ˠ', 'ˤ', 'ۥ', 'ۦ', 'ߴ', 'ߵ', 'ᱸ', 'ᱽ', 'ᴬ', 'ᵪ', 'ᶛ', 'ᶿ', 'ₐ', 'ₜ', 'ⱼ', 'ⱽ', '〱', '〵', 'ゝ', 'ゞ', 'ー', 'ヾ', 'ꓸ', 'ꓽ', 'ꚜ', 'ꚝ', 'ꜗ', 'ꜟ', 'ꟸ', 'ꟹ', 'ꫳ', 'ꫴ', 'ꭜ', 'ꭟ', 'ﾞ', 'ﾟ'}, @@ -12160,9 +12220,9 @@ var g = &grammar{ }, { name: "Lo", - pos: position{line: 1666, col: 1, offset: 44629}, + pos: position{line: 1679, col: 1, offset: 44883}, expr: &charClassMatcher{ - pos: position{line: 1666, col: 6, offset: 44634}, + pos: position{line: 1679, col: 6, offset: 44888}, 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{'ǀ', 'ǃ', 'א', 'ת', 'ׯ', 'ײ', 'ؠ', 'ؿ', 'ف', 'ي', 'ٮ', 'ٯ', 'ٱ', 'ۓ', 'ۮ', 'ۯ', 'ۺ', 'ۼ', 'ܒ', 'ܯ', 'ݍ', 'ޥ', 'ߊ', 'ߪ', 'ࠀ', 'ࠕ', 'ࡀ', 'ࡘ', 'ࡠ', 'ࡪ', 'ࢠ', 'ࢴ', 'ࢶ', 'ࢽ', 'ऄ', 'ह', 'क़', 'ॡ', 'ॲ', 'ঀ', 'অ', 'ঌ', 'এ', 'ঐ', 'ও', 'ন', 'প', 'র', 'শ', 'হ', 'ড়', 'ঢ়', 'য়', 'ৡ', 'ৰ', 'ৱ', 'ਅ', 'ਊ', 'ਏ', 'ਐ', 'ਓ', 'ਨ', 'ਪ', 'ਰ', 'ਲ', 'ਲ਼', 'ਵ', 'ਸ਼', 'ਸ', 'ਹ', 'ਖ਼', 'ੜ', 'ੲ', 'ੴ', 'અ', 'ઍ', 'એ', 'ઑ', 'ઓ', 'ન', 'પ', 'ર', 'લ', 'ળ', 'વ', 'હ', 'ૠ', 'ૡ', 'ଅ', 'ଌ', 'ଏ', 'ଐ', 'ଓ', 'ନ', 'ପ', 'ର', 'ଲ', 'ଳ', 'ଵ', 'ହ', 'ଡ଼', 'ଢ଼', 'ୟ', 'ୡ', 'அ', 'ஊ', 'எ', 'ஐ', 'ஒ', 'க', 'ங', 'ச', 'ஞ', 'ட', 'ண', 'த', 'ந', 'ப', 'ம', 'ஹ', 'అ', 'ఌ', 'ఎ', 'ఐ', 'ఒ', 'న', 'ప', 'హ', 'ౘ', 'ౚ', 'ౠ', 'ౡ', 'ಅ', 'ಌ', 'ಎ', 'ಐ', 'ಒ', 'ನ', 'ಪ', 'ಳ', 'ವ', 'ಹ', 'ೠ', 'ೡ', 'ೱ', 'ೲ', 'അ', 'ഌ', 'എ', 'ഐ', 'ഒ', 'ഺ', 'ൔ', 'ൖ', 'ൟ', 'ൡ', 'ൺ', 'ൿ', 'අ', 'ඖ', 'ක', 'න', 'ඳ', 'ර', 'ව', 'ෆ', 'ก', 'ะ', 'า', 'ำ', 'เ', 'ๅ', 'ກ', 'ຂ', 'ງ', 'ຈ', 'ດ', 'ທ', 'ນ', 'ຟ', 'ມ', 'ຣ', 'ສ', 'ຫ', 'ອ', 'ະ', 'າ', 'ຳ', 'ເ', 'ໄ', 'ໜ', 'ໟ', 'ཀ', 'ཇ', 'ཉ', 'ཬ', 'ྈ', 'ྌ', 'က', 'ဪ', 'ၐ', 'ၕ', 'ၚ', 'ၝ', 'ၥ', 'ၦ', 'ၮ', 'ၰ', 'ၵ', 'ႁ', 'ᄀ', 'ቈ', 'ቊ', 'ቍ', 'ቐ', 'ቖ', 'ቚ', 'ቝ', 'በ', 'ኈ', 'ኊ', 'ኍ', 'ነ', 'ኰ', 'ኲ', 'ኵ', 'ኸ', 'ኾ', 'ዂ', 'ዅ', 'ወ', 'ዖ', 'ዘ', 'ጐ', 'ጒ', 'ጕ', 'ጘ', 'ፚ', 'ᎀ', 'ᎏ', 'ᐁ', 'ᙬ', 'ᙯ', 'ᙿ', 'ᚁ', 'ᚚ', 'ᚠ', 'ᛪ', 'ᛱ', 'ᛸ', 'ᜀ', 'ᜌ', 'ᜎ', 'ᜑ', 'ᜠ', 'ᜱ', 'ᝀ', 'ᝑ', 'ᝠ', 'ᝬ', 'ᝮ', 'ᝰ', 'ក', 'ឳ', 'ᠠ', 'ᡂ', 'ᡄ', 'ᡸ', 'ᢀ', 'ᢄ', 'ᢇ', 'ᢨ', 'ᢰ', 'ᣵ', 'ᤀ', 'ᤞ', 'ᥐ', 'ᥭ', 'ᥰ', 'ᥴ', 'ᦀ', 'ᦫ', 'ᦰ', 'ᧉ', 'ᨀ', 'ᨖ', 'ᨠ', 'ᩔ', 'ᬅ', 'ᬳ', 'ᭅ', 'ᭋ', 'ᮃ', 'ᮠ', 'ᮮ', 'ᮯ', 'ᮺ', 'ᯥ', 'ᰀ', 'ᰣ', 'ᱍ', 'ᱏ', 'ᱚ', 'ᱷ', 'ᳩ', 'ᳬ', 'ᳮ', 'ᳱ', 'ᳵ', 'ᳶ', 'ℵ', 'ℸ', 'ⴰ', 'ⵧ', 'ⶀ', 'ⶖ', 'ⶠ', 'ⶦ', 'ⶨ', 'ⶮ', 'ⶰ', 'ⶶ', 'ⶸ', 'ⶾ', 'ⷀ', 'ⷆ', 'ⷈ', 'ⷎ', 'ⷐ', 'ⷖ', 'ⷘ', 'ⷞ', 'ぁ', 'ゖ', 'ァ', 'ヺ', 'ㄅ', 'ㄯ', 'ㄱ', 'ㆎ', 'ㆠ', 'ㆺ', 'ㇰ', 'ㇿ', '㐀', '䶵', '一', '鿯', 'ꀀ', 'ꀔ', 'ꀖ', 'ꒌ', 'ꓐ', 'ꓷ', 'ꔀ', 'ꘋ', 'ꘐ', 'ꘟ', 'ꘪ', 'ꘫ', 'ꚠ', 'ꛥ', 'ꟻ', 'ꠁ', 'ꠃ', 'ꠅ', 'ꠇ', 'ꠊ', 'ꠌ', 'ꠢ', 'ꡀ', 'ꡳ', 'ꢂ', 'ꢳ', 'ꣲ', 'ꣷ', 'ꣽ', 'ꣾ', 'ꤊ', 'ꤥ', 'ꤰ', 'ꥆ', 'ꥠ', 'ꥼ', 'ꦄ', 'ꦲ', 'ꧠ', 'ꧤ', 'ꧧ', 'ꧯ', 'ꧺ', 'ꧾ', 'ꨀ', 'ꨨ', 'ꩀ', 'ꩂ', 'ꩄ', 'ꩋ', 'ꩠ', 'ꩯ', 'ꩱ', 'ꩶ', 'ꩾ', 'ꪯ', 'ꪵ', 'ꪶ', 'ꪹ', 'ꪽ', 'ꫛ', 'ꫜ', 'ꫠ', 'ꫪ', 'ꬁ', 'ꬆ', 'ꬉ', 'ꬎ', 'ꬑ', 'ꬖ', 'ꬠ', 'ꬦ', 'ꬨ', 'ꬮ', 'ꯀ', 'ꯢ', '가', '힣', 'ힰ', 'ퟆ', 'ퟋ', 'ퟻ', '豈', '舘', '並', '龎', 'ײַ', 'ﬨ', 'שׁ', 'זּ', 'טּ', 'לּ', 'נּ', 'סּ', 'ףּ', 'פּ', 'צּ', 'ﮱ', 'ﯓ', 'ﴽ', 'ﵐ', 'ﶏ', 'ﶒ', 'ﷇ', 'ﷰ', 'ﷻ', 'ﹰ', 'ﹴ', 'ﹶ', 'ﻼ', 'ｦ', 'ｯ', 'ｱ', 'ﾝ', 'ﾠ', 'ﾾ', 'ￂ', 'ￇ', 'ￊ', 'ￏ', 'ￒ', 'ￗ', 'ￚ', 'ￜ'}, @@ -12174,9 +12234,9 @@ var g = &grammar{ }, { name: "Lt", - pos: position{line: 1669, col: 1, offset: 48081}, + pos: position{line: 1682, col: 1, offset: 48335}, expr: &charClassMatcher{ - pos: position{line: 1669, col: 6, offset: 48086}, + pos: position{line: 1682, col: 6, offset: 48340}, val: "[\\u01C5\\u01C8\\u01CB\\u01F2\\u1F88-\\u1F8F\\u1F98-\\u1F9F\\u1FA8-\\u1FAF\\u1FBC\\u1FCC\\u1FFC]", chars: []rune{'Dž', 'Lj', 'Nj', 'Dz', 'ᾼ', 'ῌ', 'ῼ'}, ranges: []rune{'ᾈ', 'ᾏ', 'ᾘ', 'ᾟ', 'ᾨ', 'ᾯ'}, @@ -12188,9 +12248,9 @@ var g = &grammar{ }, { name: "Lu", - pos: position{line: 1672, col: 1, offset: 48192}, + pos: position{line: 1685, col: 1, offset: 48446}, expr: &charClassMatcher{ - pos: position{line: 1672, col: 6, offset: 48197}, + pos: position{line: 1685, col: 6, offset: 48451}, 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', 'ℭ', 'ℰ', 'ℳ', 'ℾ', 'ℿ', 'Ⰰ', 'Ⱞ', 'Ɫ', 'Ɽ', 'Ɑ', 'Ɒ', 'Ȿ', 'Ⲁ', 'Ᵹ', 'Ꝿ', 'Ɦ', 'Ɪ', 'Ʞ', 'Ꞵ', 'Ａ', 'Ｚ'}, @@ -12202,9 +12262,9 @@ var g = &grammar{ }, { name: "Mc", - pos: position{line: 1675, col: 1, offset: 52198}, + pos: position{line: 1688, col: 1, offset: 52452}, expr: &charClassMatcher{ - pos: position{line: 1675, col: 6, offset: 52203}, + pos: position{line: 1688, col: 6, offset: 52457}, 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{'ा', 'ी', 'ॉ', 'ौ', 'ॎ', 'ॏ', 'ং', 'ঃ', 'া', 'ী', 'ে', 'ৈ', 'ো', 'ৌ', 'ਾ', 'ੀ', 'ા', 'ી', 'ો', 'ૌ', 'ଂ', 'ଃ', 'େ', 'ୈ', 'ୋ', 'ୌ', 'ா', 'ி', 'ு', 'ூ', 'ெ', 'ை', 'ொ', 'ௌ', 'ఁ', 'ః', 'ు', 'ౄ', 'ಂ', 'ಃ', 'ೀ', 'ೄ', 'ೇ', 'ೈ', 'ೊ', 'ೋ', 'ೕ', 'ೖ', 'ം', 'ഃ', 'ാ', 'ീ', 'െ', 'ൈ', 'ൊ', 'ൌ', 'ං', 'ඃ', 'ා', 'ෑ', 'ෘ', 'ෟ', 'ෲ', 'ෳ', '༾', '༿', 'ါ', 'ာ', 'ျ', 'ြ', 'ၖ', 'ၗ', 'ၢ', 'ၤ', 'ၧ', 'ၭ', 'ႃ', 'ႄ', 'ႇ', 'ႌ', 'ႚ', 'ႜ', 'ើ', 'ៅ', 'ះ', 'ៈ', 'ᤣ', 'ᤦ', 'ᤩ', 'ᤫ', 'ᤰ', 'ᤱ', 'ᤳ', 'ᤸ', 'ᨙ', 'ᨚ', 'ᩣ', 'ᩤ', 'ᩭ', 'ᩲ', 'ᬽ', 'ᭁ', 'ᭃ', '᭄', 'ᮦ', 'ᮧ', 'ᯪ', 'ᯬ', '᯲', '᯳', 'ᰤ', 'ᰫ', 'ᰴ', 'ᰵ', 'ᳲ', 'ᳳ', '〮', '〯', 'ꠣ', 'ꠤ', 'ꢀ', 'ꢁ', 'ꢴ', 'ꣃ', 'ꥒ', '꥓', 'ꦴ', 'ꦵ', 'ꦺ', 'ꦻ', 'ꦽ', '꧀', 'ꨯ', 'ꨰ', 'ꨳ', 'ꨴ', 'ꫮ', 'ꫯ', 'ꯣ', 'ꯤ', 'ꯦ', 'ꯧ', 'ꯩ', 'ꯪ'}, @@ -12216,9 +12276,9 @@ var g = &grammar{ }, { name: "Mn", - pos: position{line: 1678, col: 1, offset: 53391}, + pos: position{line: 1691, col: 1, offset: 53645}, expr: &charClassMatcher{ - pos: position{line: 1678, col: 6, offset: 53396}, + pos: position{line: 1691, col: 6, offset: 53650}, 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{'̀', 'ͯ', '҃', '҇', '֑', 'ֽ', 'ׁ', 'ׂ', 'ׄ', 'ׅ', 'ؐ', 'ؚ', 'ً', 'ٟ', 'ۖ', 'ۜ', '۟', 'ۤ', 'ۧ', 'ۨ', '۪', 'ۭ', 'ܰ', '݊', 'ަ', 'ް', '߫', '߳', 'ࠖ', '࠙', 'ࠛ', 'ࠣ', 'ࠥ', 'ࠧ', 'ࠩ', '࠭', '࡙', '࡛', '࣓', '࣡', 'ࣣ', 'ं', 'ु', 'ै', '॑', 'ॗ', 'ॢ', 'ॣ', 'ু', 'ৄ', 'ৢ', 'ৣ', 'ਁ', 'ਂ', 'ੁ', 'ੂ', 'ੇ', 'ੈ', 'ੋ', '੍', 'ੰ', 'ੱ', 'ઁ', 'ં', 'ુ', 'ૅ', 'ે', 'ૈ', 'ૢ', 'ૣ', 'ૺ', '૿', 'ୁ', 'ୄ', 'ୢ', 'ୣ', 'ా', 'ీ', 'ె', 'ై', 'ొ', '్', 'ౕ', 'ౖ', 'ౢ', 'ౣ', 'ೌ', '್', 'ೢ', 'ೣ', 'ഀ', 'ഁ', '഻', '഼', 'ു', 'ൄ', 'ൢ', 'ൣ', 'ි', 'ු', 'ิ', 'ฺ', '็', '๎', 'ິ', 'ູ', 'ົ', 'ຼ', '່', 'ໍ', '༘', '༙', 'ཱ', 'ཾ', 'ྀ', '྄', '྆', '྇', 'ྍ', 'ྗ', 'ྙ', 'ྼ', 'ိ', 'ူ', 'ဲ', '့', '္', '်', 'ွ', 'ှ', 'ၘ', 'ၙ', 'ၞ', 'ၠ', 'ၱ', 'ၴ', 'ႅ', 'ႆ', '፝', '፟', 'ᜒ', '᜔', 'ᜲ', '᜴', 'ᝒ', 'ᝓ', 'ᝲ', 'ᝳ', '឴', '឵', 'ិ', 'ួ', '៉', '៓', '᠋', '᠍', 'ᢅ', 'ᢆ', 'ᤠ', 'ᤢ', 'ᤧ', 'ᤨ', '᤹', '᤻', 'ᨗ', 'ᨘ', 'ᩘ', 'ᩞ', 'ᩥ', 'ᩬ', 'ᩳ', '᩼', '᪰', '᪽', 'ᬀ', 'ᬃ', 'ᬶ', 'ᬺ', '᭫', '᭳', 'ᮀ', 'ᮁ', 'ᮢ', 'ᮥ', 'ᮨ', 'ᮩ', '᮫', 'ᮭ', 'ᯨ', 'ᯩ', 'ᯯ', 'ᯱ', 'ᰬ', 'ᰳ', 'ᰶ', '᰷', '᳐', '᳒', '᳔', '᳠', '᳢', '᳨', '᳸', '᳹', '᷀', '᷹', '᷻', '᷿', '⃐', '⃜', '⃥', '⃰', '⳯', '⳱', 'ⷠ', 'ⷿ', '〪', '〭', '゙', '゚', 'ꙴ', '꙽', 'ꚞ', 'ꚟ', '꛰', '꛱', 'ꠥ', 'ꠦ', '꣄', 'ꣅ', '꣠', '꣱', 'ꤦ', '꤭', 'ꥇ', 'ꥑ', 'ꦀ', 'ꦂ', 'ꦶ', 'ꦹ', 'ꨩ', 'ꨮ', 'ꨱ', 'ꨲ', 'ꨵ', 'ꨶ', 'ꪲ', 'ꪴ', 'ꪷ', 'ꪸ', 'ꪾ', '꪿', 'ꫬ', 'ꫭ', '︀', '️', '︠', '︯'}, @@ -12230,9 +12290,9 @@ var g = &grammar{ }, { name: "Nd", - pos: position{line: 1681, col: 1, offset: 55576}, + pos: position{line: 1694, col: 1, offset: 55830}, expr: &charClassMatcher{ - pos: position{line: 1681, col: 6, offset: 55581}, + pos: position{line: 1694, col: 6, offset: 55835}, 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, @@ -12243,9 +12303,9 @@ var g = &grammar{ }, { name: "Nl", - pos: position{line: 1684, col: 1, offset: 56084}, + pos: position{line: 1697, col: 1, offset: 56338}, expr: &charClassMatcher{ - pos: position{line: 1684, col: 6, offset: 56089}, + pos: position{line: 1697, col: 6, offset: 56343}, val: "[\\u16EE-\\u16F0\\u2160-\\u2182\\u2185-\\u2188\\u3007\\u3021-\\u3029\\u3038-\\u303A\\uA6E6-\\uA6EF]", chars: []rune{'〇'}, ranges: []rune{'ᛮ', 'ᛰ', 'Ⅰ', 'ↂ', 'ↅ', 'ↈ', '〡', '〩', '〸', '〺', 'ꛦ', 'ꛯ'}, @@ -12257,9 +12317,9 @@ var g = &grammar{ }, { name: "Pc", - pos: position{line: 1687, col: 1, offset: 56203}, + pos: position{line: 1700, col: 1, offset: 56457}, expr: &charClassMatcher{ - pos: position{line: 1687, col: 6, offset: 56208}, + pos: position{line: 1700, col: 6, offset: 56462}, val: "[\\u005F\\u203F-\\u2040\\u2054\\uFE33-\\uFE34\\uFE4D-\\uFE4F\\uFF3F]", chars: []rune{'_', '⁔', '＿'}, ranges: []rune{'‿', '⁀', '︳', '︴', '﹍', '﹏'}, @@ -12271,9 +12331,9 @@ var g = &grammar{ }, { name: "Zs", - pos: position{line: 1690, col: 1, offset: 56289}, + pos: position{line: 1703, col: 1, offset: 56543}, expr: &charClassMatcher{ - pos: position{line: 1690, col: 6, offset: 56294}, + pos: position{line: 1703, col: 6, offset: 56548}, val: "[\\u0020\\u00A0\\u1680\\u2000-\\u200A\\u202F\\u205F\\u3000]", chars: []rune{' ', '\u00a0', '\u1680', '\u202f', '\u205f', '\u3000'}, ranges: []rune{'\u2000', '\u200a'}, @@ -12285,9 +12345,9 @@ var g = &grammar{ }, { name: "SourceCharacter", - pos: position{line: 1692, col: 1, offset: 56347}, + pos: position{line: 1705, col: 1, offset: 56601}, expr: &anyMatcher{ - line: 1693, col: 5, offset: 56367, + line: 1706, col: 5, offset: 56621, }, leader: false, leftRecursive: false, @@ -12295,48 +12355,48 @@ var g = &grammar{ { name: "WhiteSpace", displayName: "\"whitespace\"", - pos: position{line: 1695, col: 1, offset: 56370}, + pos: position{line: 1708, col: 1, offset: 56624}, expr: &choiceExpr{ - pos: position{line: 1696, col: 5, offset: 56398}, + pos: position{line: 1709, col: 5, offset: 56652}, alternatives: []any{ &litMatcher{ - pos: position{line: 1696, col: 5, offset: 56398}, + pos: position{line: 1709, col: 5, offset: 56652}, val: "\t", ignoreCase: false, want: "\"\\t\"", }, &litMatcher{ - pos: position{line: 1697, col: 5, offset: 56407}, + pos: position{line: 1710, col: 5, offset: 56661}, val: "\v", ignoreCase: false, want: "\"\\v\"", }, &litMatcher{ - pos: position{line: 1698, col: 5, offset: 56416}, + pos: position{line: 1711, col: 5, offset: 56670}, val: "\f", ignoreCase: false, want: "\"\\f\"", }, &litMatcher{ - pos: position{line: 1699, col: 5, offset: 56425}, + pos: position{line: 1712, col: 5, offset: 56679}, val: " ", ignoreCase: false, want: "\" \"", }, &litMatcher{ - pos: position{line: 1700, col: 5, offset: 56433}, + pos: position{line: 1713, col: 5, offset: 56687}, val: "\u00a0", ignoreCase: false, want: "\"\\u00a0\"", }, &litMatcher{ - pos: position{line: 1701, col: 5, offset: 56446}, + pos: position{line: 1714, col: 5, offset: 56700}, val: "\ufeff", ignoreCase: false, want: "\"\\ufeff\"", }, &ruleRefExpr{ - pos: position{line: 1702, col: 5, offset: 56459}, + pos: position{line: 1715, col: 5, offset: 56713}, name: "Zs", }, }, @@ -12346,9 +12406,9 @@ var g = &grammar{ }, { name: "LineTerminator", - pos: position{line: 1704, col: 1, offset: 56463}, + pos: position{line: 1717, col: 1, offset: 56717}, expr: &charClassMatcher{ - pos: position{line: 1705, col: 5, offset: 56482}, + pos: position{line: 1718, col: 5, offset: 56736}, val: "[\\n\\r\\u2028\\u2029]", chars: []rune{'\n', '\r', '\u2028', '\u2029'}, ignoreCase: false, @@ -12360,9 +12420,9 @@ var g = &grammar{ { name: "Comment", displayName: "\"comment\"", - pos: position{line: 1711, col: 1, offset: 56812}, + pos: position{line: 1724, col: 1, offset: 57066}, expr: &ruleRefExpr{ - pos: position{line: 1714, col: 5, offset: 56883}, + pos: position{line: 1727, col: 5, offset: 57137}, name: "SingleLineComment", }, leader: false, @@ -12370,39 +12430,39 @@ var g = &grammar{ }, { name: "MultiLineComment", - pos: position{line: 1716, col: 1, offset: 56902}, + pos: position{line: 1729, col: 1, offset: 57156}, expr: &seqExpr{ - pos: position{line: 1717, col: 5, offset: 56923}, + pos: position{line: 1730, col: 5, offset: 57177}, exprs: []any{ &litMatcher{ - pos: position{line: 1717, col: 5, offset: 56923}, + pos: position{line: 1730, col: 5, offset: 57177}, val: "/*", ignoreCase: false, want: "\"/*\"", }, &zeroOrMoreExpr{ - pos: position{line: 1717, col: 10, offset: 56928}, + pos: position{line: 1730, col: 10, offset: 57182}, expr: &seqExpr{ - pos: position{line: 1717, col: 11, offset: 56929}, + pos: position{line: 1730, col: 11, offset: 57183}, exprs: []any{ ¬Expr{ - pos: position{line: 1717, col: 11, offset: 56929}, + pos: position{line: 1730, col: 11, offset: 57183}, expr: &litMatcher{ - pos: position{line: 1717, col: 12, offset: 56930}, + pos: position{line: 1730, col: 12, offset: 57184}, val: "*/", ignoreCase: false, want: "\"*/\"", }, }, &ruleRefExpr{ - pos: position{line: 1717, col: 17, offset: 56935}, + pos: position{line: 1730, col: 17, offset: 57189}, name: "SourceCharacter", }, }, }, }, &litMatcher{ - pos: position{line: 1717, col: 35, offset: 56953}, + pos: position{line: 1730, col: 35, offset: 57207}, val: "*/", ignoreCase: false, want: "\"*/\"", @@ -12414,30 +12474,30 @@ var g = &grammar{ }, { name: "SingleLineComment", - pos: position{line: 1719, col: 1, offset: 56959}, + pos: position{line: 1732, col: 1, offset: 57213}, expr: &seqExpr{ - pos: position{line: 1720, col: 5, offset: 56981}, + pos: position{line: 1733, col: 5, offset: 57235}, exprs: []any{ &litMatcher{ - pos: position{line: 1720, col: 5, offset: 56981}, + pos: position{line: 1733, col: 5, offset: 57235}, val: "//", ignoreCase: false, want: "\"//\"", }, &zeroOrMoreExpr{ - pos: position{line: 1720, col: 10, offset: 56986}, + pos: position{line: 1733, col: 10, offset: 57240}, expr: &seqExpr{ - pos: position{line: 1720, col: 11, offset: 56987}, + pos: position{line: 1733, col: 11, offset: 57241}, exprs: []any{ ¬Expr{ - pos: position{line: 1720, col: 11, offset: 56987}, + pos: position{line: 1733, col: 11, offset: 57241}, expr: &ruleRefExpr{ - pos: position{line: 1720, col: 12, offset: 56988}, + pos: position{line: 1733, col: 12, offset: 57242}, name: "LineTerminator", }, }, &ruleRefExpr{ - pos: position{line: 1720, col: 27, offset: 57003}, + pos: position{line: 1733, col: 27, offset: 57257}, name: "SourceCharacter", }, }, @@ -12450,19 +12510,19 @@ var g = &grammar{ }, { name: "EOL", - pos: position{line: 1722, col: 1, offset: 57022}, + pos: position{line: 1735, col: 1, offset: 57276}, expr: &seqExpr{ - pos: position{line: 1722, col: 7, offset: 57028}, + pos: position{line: 1735, col: 7, offset: 57282}, exprs: []any{ &zeroOrMoreExpr{ - pos: position{line: 1722, col: 7, offset: 57028}, + pos: position{line: 1735, col: 7, offset: 57282}, expr: &ruleRefExpr{ - pos: position{line: 1722, col: 7, offset: 57028}, + pos: position{line: 1735, col: 7, offset: 57282}, name: "WhiteSpace", }, }, &ruleRefExpr{ - pos: position{line: 1722, col: 19, offset: 57040}, + pos: position{line: 1735, col: 19, offset: 57294}, name: "LineTerminator", }, }, @@ -12472,16 +12532,16 @@ var g = &grammar{ }, { name: "EOT", - pos: position{line: 1724, col: 1, offset: 57056}, + pos: position{line: 1737, col: 1, offset: 57310}, expr: &choiceExpr{ - pos: position{line: 1724, col: 7, offset: 57062}, + pos: position{line: 1737, col: 7, offset: 57316}, alternatives: []any{ &ruleRefExpr{ - pos: position{line: 1724, col: 7, offset: 57062}, + pos: position{line: 1737, col: 7, offset: 57316}, name: "_", }, &ruleRefExpr{ - pos: position{line: 1724, col: 11, offset: 57066}, + pos: position{line: 1737, col: 11, offset: 57320}, name: "EOF", }, }, @@ -12491,11 +12551,11 @@ var g = &grammar{ }, { name: "EOF", - pos: position{line: 1726, col: 1, offset: 57071}, + pos: position{line: 1739, col: 1, offset: 57325}, expr: ¬Expr{ - pos: position{line: 1726, col: 7, offset: 57077}, + pos: position{line: 1739, col: 7, offset: 57331}, expr: &anyMatcher{ - line: 1726, col: 8, offset: 57078, + line: 1739, col: 8, offset: 57332, }, }, leader: false, @@ -12503,11 +12563,11 @@ var g = &grammar{ }, { name: "EOKW", - pos: position{line: 1728, col: 1, offset: 57081}, + pos: position{line: 1741, col: 1, offset: 57335}, expr: ¬Expr{ - pos: position{line: 1728, col: 8, offset: 57088}, + pos: position{line: 1741, col: 8, offset: 57342}, expr: &ruleRefExpr{ - pos: position{line: 1728, col: 9, offset: 57089}, + pos: position{line: 1741, col: 9, offset: 57343}, name: "KeyWordChars", }, }, @@ -13791,6 +13851,34 @@ func (p *parser) callonOutputOp1() (any, error) { return p.cur.onOutputOp1(stack["name"]) } +func (c *current) onDebugOp8(e any) (any, error) { + return e, nil +} + +func (p *parser) callonDebugOp8() (any, error) { + stack := p.vstack[len(p.vstack)-1] + _ = stack + return p.cur.onDebugOp8(stack["e"]) +} + +func (c *current) onDebugOp1(expr any) (any, error) { + d := &ast.Debug{ + Kind: "Debug", + KeywordPos: c.pos.offset, + } + if expr != nil { + d.Expr = expr.(ast.Expr) + } + return d, nil + +} + +func (p *parser) callonDebugOp1() (any, error) { + stack := p.vstack[len(p.vstack)-1] + _ = stack + return p.cur.onDebugOp1(stack["expr"]) +} + func (c *current) onFile1(path, format, sortkey any) (any, error) { f := &ast.File{ Kind: "File", diff --git a/compiler/parser/parser.peg b/compiler/parser/parser.peg index 82b732d0d5..be7b2fcdd2 100644 --- a/compiler/parser/parser.peg +++ b/compiler/parser/parser.peg @@ -359,6 +359,7 @@ Operator / YieldOp / LoadOp / OutputOp + / DebugOp AssertOp = "assert" _ expr:(e:Expr { return []any{e, string(c.text)}, nil }) { @@ -607,6 +608,18 @@ OutputOp }, nil } +DebugOp + = "debug" &EOKW expr:(_ e:Expr { return e, nil })? { + d := &ast.Debug{ + Kind: "Debug", + KeywordPos: c.pos.offset, + } + if expr != nil { + d.Expr = expr.(ast.Expr) + } + return d, nil + } + FromOp = File / Get diff --git a/compiler/semantic/analyzer.go b/compiler/semantic/analyzer.go index e5904a0d82..3435642127 100644 --- a/compiler/semantic/analyzer.go +++ b/compiler/semantic/analyzer.go @@ -184,10 +184,13 @@ func (a *analyzer) checkOutputs(isLeaf bool, seq dag.Seq) dag.Seq { for k := range o.Paths { o.Paths[k] = a.checkOutputs(isLast && isLeaf, o.Paths[k]) } + case *dag.Mirror: + o.Main = a.checkOutputs(isLast && isLeaf, o.Main) + o.Mirror = a.checkOutputs(isLast && isLeaf, o.Mirror) } } switch seq[lastN].(type) { - case *dag.Scope, *dag.Output, *dag.Scatter, *dag.Fork: + case *dag.Scope, *dag.Output, *dag.Scatter, *dag.Fork, *dag.Mirror: default: if isLeaf { return append(seq, &dag.Output{Kind: "Output", Name: "main"}) diff --git a/compiler/semantic/op.go b/compiler/semantic/op.go index 9738fd29f7..de644816a9 100644 --- a/compiler/semantic/op.go +++ b/compiler/semantic/op.go @@ -24,7 +24,10 @@ import ( func (a *analyzer) semSeq(seq ast.Seq) dag.Seq { var converted dag.Seq - for _, op := range seq { + for k, op := range seq { + if d, ok := op.(*ast.Debug); ok { + return a.semDebugOp(d, seq[k+1:], converted) + } converted = a.semOp(op, converted) } return converted @@ -387,6 +390,25 @@ func (a *analyzer) semScope(op *ast.Scope) *dag.Scope { } } +func (a *analyzer) semDebugOp(o *ast.Debug, mainAst ast.Seq, in dag.Seq) dag.Seq { + output := &dag.Output{Kind: "Output", Name: "debug"} + a.outputs[output] = o + e := a.semExprNullable(o.Expr) + if e == nil { + e = &dag.This{Kind: "This"} + } + y := &dag.Yield{Kind: "Yield", Exprs: []dag.Expr{e}} + main := a.semSeq(mainAst) + if len(main) == 0 { + main.Append(&dag.Pass{Kind: "Pass"}) + } + return append(in, &dag.Mirror{ + Kind: "Mirror", + Main: main, + Mirror: dag.Seq{y, output}, + }) +} + // semOp does a semantic analysis on a flowgraph to an // intermediate representation that can be compiled into the runtime // object. Currently, it only replaces the group-by duration with diff --git a/docs/language/operators/README.md b/docs/language/operators/README.md index 12658f33e1..332f4f1e5b 100644 --- a/docs/language/operators/README.md +++ b/docs/language/operators/README.md @@ -10,6 +10,7 @@ operators listed below, Zed also allows for the creation of * [assert](assert.md) - evaluate an assertion * [combine](combine.md) - combine parallel paths into a single output * [cut](cut.md) - extract subsets of record fields into new records +* [debug](debug.md) - write intermediate values to stderr * [drop](drop.md) - drop fields from record values * [file](from.md) - source data from a file * [fork](fork.md) - copy values to parallel paths diff --git a/docs/language/operators/debug.md b/docs/language/operators/debug.md new file mode 100644 index 0000000000..2e1a7b3d91 --- /dev/null +++ b/docs/language/operators/debug.md @@ -0,0 +1,27 @@ +### Operator + +  **debug** — write intermediate values to stderr + +### Synopsis + +``` +debug [ ] +``` +### Description + +The `debug` operator writes the value of `expr` to the debug channel. If no +`expr` is provided, `this` is written to the debug channel. If the query is +run on the command line via `zq` or `zed` all output written to the debug +channel is displayed on stderr. + +The `debug` operator is useful to view intermediate values when debugging a +complex Zed query. + +### Examples + +The following query uses expressions containing [f-strings](../expressions.md#formatted-string-literals) +to display `"debug: foo"` on stderr whereas `"foo_bar"` will display +on stdout. +``` +echo '"foo"' | zq -z 'debug f"debug: {this}" | yield f"{this}_bar"' - +``` diff --git a/docs/libraries/go.md b/docs/libraries/go.md index c5abbedf8d..bf57d722d8 100644 --- a/docs/libraries/go.md +++ b/docs/libraries/go.md @@ -118,6 +118,7 @@ import ( "github.com/brimdata/zed" "github.com/brimdata/zed/lake/api" "github.com/brimdata/zed/pkg/storage" + "github.com/brimdata/zed/zbuf" "github.com/brimdata/zed/zson" ) @@ -134,11 +135,12 @@ func main() { if err != nil { log.Fatalln(err) } - reader, err := lake.Query(ctx, nil, "from Demo") + q, err := lake.Query(ctx, nil, "from Demo") if err != nil { log.Fatalln(err) } - defer reader.Close() + defer q.Pull(true) + reader := zbuf.PullerReader(q) zctx := zed.NewContext() arena := zed.NewArena() for { diff --git a/lake/api/api.go b/lake/api/api.go index 2be1408f7c..109edc0560 100644 --- a/lake/api/api.go +++ b/lake/api/api.go @@ -22,8 +22,7 @@ import ( type Interface interface { Root() *lake.Root - Query(ctx context.Context, head *lakeparse.Commitish, src string, srcfiles ...string) (zio.ReadCloser, error) - QueryWithControl(ctx context.Context, head *lakeparse.Commitish, src string, srcfiles ...string) (zbuf.ProgressReadCloser, error) + Query(ctx context.Context, head *lakeparse.Commitish, src string, srcfiles ...string) (zbuf.Scanner, error) PoolID(ctx context.Context, poolName string) (ksuid.KSUID, error) CommitObject(ctx context.Context, poolID ksuid.KSUID, branchName string) (ksuid.KSUID, error) CreatePool(context.Context, string, order.SortKey, int, int64) (ksuid.KSUID, error) @@ -60,8 +59,8 @@ func LookupPoolByName(ctx context.Context, api Interface, name string) (*pools.C if err != nil { return nil, err } - defer q.Close() - if err := zio.Copy(b, zbuf.NoControl(q)); err != nil { + defer q.Pull(true) + if err := zbuf.CopyPuller(b, q); err != nil { return nil, err } switch len(b.results) { @@ -84,8 +83,8 @@ func GetPools(ctx context.Context, api Interface) ([]*pools.Config, error) { if err != nil { return nil, err } - defer q.Close() - if err := zio.Copy(b, zbuf.NoControl(q)); err != nil { + defer q.Pull(true) + if err := zbuf.CopyPuller(b, q); err != nil { return nil, err } var pls []*pools.Config @@ -102,8 +101,8 @@ func LookupPoolByID(ctx context.Context, api Interface, id ksuid.KSUID) (*pools. if err != nil { return nil, err } - defer q.Close() - if err := zio.Copy(b, zbuf.NoControl(q)); err != nil { + defer q.Pull(true) + if err := zbuf.CopyPuller(b, q); err != nil { return nil, err } switch len(b.results) { @@ -127,8 +126,8 @@ func LookupBranchByName(ctx context.Context, api Interface, poolName, branchName if err != nil { return nil, err } - defer q.Close() - if err := zio.Copy(b, zbuf.NoControl(q)); err != nil { + defer q.Pull(true) + if err := zbuf.CopyPuller(b, q); err != nil { return nil, err } switch len(b.results) { @@ -152,8 +151,8 @@ func LookupBranchByID(ctx context.Context, api Interface, id ksuid.KSUID) (*lake if err != nil { return nil, err } - defer q.Close() - if err := zio.Copy(b, zbuf.NoControl(q)); err != nil { + defer q.Pull(true) + if err := zbuf.CopyPuller(b, q); err != nil { return nil, err } switch len(b.results) { diff --git a/lake/api/local.go b/lake/api/local.go index 74d4a25df7..4d1bb5a4c4 100644 --- a/lake/api/local.go +++ b/lake/api/local.go @@ -105,15 +105,7 @@ func (l *local) Compact(ctx context.Context, poolID ksuid.KSUID, branchName stri return exec.Compact(ctx, l.root, pool, branchName, objects, writeVectors, commit.Author, commit.Body, commit.Meta) } -func (l *local) Query(ctx context.Context, head *lakeparse.Commitish, src string, srcfiles ...string) (zio.ReadCloser, error) { - q, err := l.QueryWithControl(ctx, head, src, srcfiles...) - if err != nil { - return nil, err - } - return zio.NewReadCloser(zbuf.NoControl(q), q), nil -} - -func (l *local) QueryWithControl(ctx context.Context, head *lakeparse.Commitish, src string, srcfiles ...string) (zbuf.ProgressReadCloser, error) { +func (l *local) Query(ctx context.Context, head *lakeparse.Commitish, src string, srcfiles ...string) (zbuf.Scanner, error) { flowgraph, sset, err := parser.ParseZed(srcfiles, src) if err != nil { return nil, err @@ -122,7 +114,7 @@ func (l *local) QueryWithControl(ctx context.Context, head *lakeparse.Commitish, if err != nil { return nil, err } - return runtime.AsProgressReadCloser(q), nil + return q, nil } func (l *local) PoolID(ctx context.Context, poolName string) (ksuid.KSUID, error) { diff --git a/lake/api/remote.go b/lake/api/remote.go index 2693854306..64c0c3c25c 100644 --- a/lake/api/remote.go +++ b/lake/api/remote.go @@ -115,21 +115,12 @@ func (r *remote) Revert(ctx context.Context, poolID ksuid.KSUID, branchName stri return res.Commit, err } -func (r *remote) Query(ctx context.Context, head *lakeparse.Commitish, src string, srcfiles ...string) (zio.ReadCloser, error) { - q, err := r.QueryWithControl(ctx, head, src, srcfiles...) - if err != nil { - return nil, err - } - return zio.NewReadCloser(zbuf.NoControl(q), q), nil -} - -func (r *remote) QueryWithControl(ctx context.Context, head *lakeparse.Commitish, src string, srcfiles ...string) (zbuf.ProgressReadCloser, error) { +func (r *remote) Query(ctx context.Context, head *lakeparse.Commitish, src string, srcfiles ...string) (zbuf.Scanner, error) { res, err := r.conn.Query(ctx, head, src, srcfiles...) if err != nil { return nil, err } - q := queryio.NewQuery(res.Body) - return zbuf.MeterReadCloser(q), nil + return queryio.NewScanner(ctx, res.Body) } func (r *remote) Delete(ctx context.Context, poolID ksuid.KSUID, branchName string, tags []ksuid.KSUID, commit api.CommitMessage) (ksuid.KSUID, error) { diff --git a/lake/ztests/debug.yaml b/lake/ztests/debug.yaml new file mode 100644 index 0000000000..27a8d13b24 --- /dev/null +++ b/lake/ztests/debug.yaml @@ -0,0 +1,13 @@ +script: | + zed init -q + zed create -use -q test + echo '{x: "foo"}' | zed load -q - + zed query -z 'debug f"debug: {x}"' + +outputs: + - name: stdout + data: | + {x:"foo"} + - name: stderr + data: | + "debug: foo" diff --git a/runtime/sam/op/mirror/mirror.go b/runtime/sam/op/mirror/mirror.go new file mode 100644 index 0000000000..96d2a1f03c --- /dev/null +++ b/runtime/sam/op/mirror/mirror.go @@ -0,0 +1,89 @@ +package mirror + +import ( + "github.com/brimdata/zed/runtime" + "github.com/brimdata/zed/runtime/sam/op" + "github.com/brimdata/zed/zbuf" +) + +type Op struct { + parent zbuf.Puller + rctx *runtime.Context + mirrored *mirrored +} + +func New(rctx *runtime.Context, parent zbuf.Puller) *Op { + m := &Op{ + parent: parent, + rctx: rctx, + } + s := &mirrored{ + op: m, + doneCh: make(chan struct{}), + resultCh: make(chan op.Result), + } + m.mirrored = s + return m +} + +func (o *Op) Pull(done bool) (zbuf.Batch, error) { + batch, err := o.parent.Pull(done) + if batch == nil || err != nil { + o.sendEOS(err) + return batch, err + } + if !o.mirrored.blocked { + batch.Ref() + select { + case o.mirrored.resultCh <- op.Result{Batch: batch}: + case <-o.mirrored.doneCh: + batch.Unref() + o.mirrored.blocked = true + case <-o.rctx.Done(): + return nil, o.rctx.Err() + } + } + return batch, err +} + +func (o *Op) sendEOS(err error) { + if !o.mirrored.blocked { + select { + case o.mirrored.resultCh <- op.Result{Err: err}: + o.mirrored.blocked = true + case <-o.mirrored.doneCh: + o.mirrored.blocked = true + case <-o.rctx.Done(): + } + } + o.mirrored.blocked = false +} + +func (o *Op) Mirrored() zbuf.Puller { + return o.mirrored +} + +type mirrored struct { + op *Op + resultCh chan op.Result + doneCh chan struct{} + // blocked is managed by Op exclusively. + blocked bool +} + +func (s *mirrored) Pull(done bool) (zbuf.Batch, error) { + if done { + select { + case s.doneCh <- struct{}{}: + return nil, nil + case <-s.op.rctx.Done(): + return nil, s.op.rctx.Err() + } + } + select { + case result := <-s.resultCh: + return result.Batch, result.Err + case <-s.op.rctx.Done(): + return nil, s.op.rctx.Err() + } +} diff --git a/runtime/sam/op/mux.go b/runtime/sam/op/mux.go index c97e037315..7841286108 100644 --- a/runtime/sam/op/mux.go +++ b/runtime/sam/op/mux.go @@ -4,25 +4,10 @@ import ( "context" "sync" - "github.com/brimdata/zed" "github.com/brimdata/zed/runtime" "github.com/brimdata/zed/zbuf" ) -type labeled struct { - zbuf.Batch - label string -} - -func Unwrap(batch zbuf.Batch) (zbuf.Batch, string) { - var label string - if inner, ok := batch.(*labeled); ok { - batch = inner - label = inner.label - } - return batch, label -} - // Mux implements the muxing of a set of parallel paths at the output of // a flowgraph. It also implements the double-EOS algorithm with proc.Latch // to detect the end of each parallel stream. Its output protocol is a single EOS @@ -105,9 +90,9 @@ func (m *Mux) Pull(bool) (zbuf.Batch, error) { return nil, err } if batch != nil { - batch = &labeled{batch, res.label} + batch = zbuf.Label(res.label, batch) } else { - eoc := EndOfChannel(res.label) + eoc := zbuf.EndOfChannel(res.label) batch = &eoc m.nparents-- } @@ -135,20 +120,8 @@ func (s *Single) Pull(bool) (zbuf.Batch, error) { batch, err := s.Puller.Pull(false) if batch == nil { s.eos = true - eoc := EndOfChannel(s.label) + eoc := zbuf.EndOfChannel(s.label) return &eoc, err } - return &labeled{batch, s.label}, err + return zbuf.Label(s.label, batch), err } - -// EndOfChannel is an empty batch that represents the termination of one -// of the output paths of a muxed flowgraph and thus will be ignored downstream -// unless explicitly detected. -type EndOfChannel string - -var _ zbuf.Batch = (*EndOfChannel)(nil) - -func (*EndOfChannel) Ref() {} -func (*EndOfChannel) Unref() {} -func (*EndOfChannel) Values() []zed.Value { return nil } -func (*EndOfChannel) Vars() []zed.Value { return nil } diff --git a/runtime/sam/op/ztests/debug.yaml b/runtime/sam/op/ztests/debug.yaml new file mode 100644 index 0000000000..c5ac17f2a8 --- /dev/null +++ b/runtime/sam/op/ztests/debug.yaml @@ -0,0 +1,11 @@ +script: | + echo '"foo" "bar"' | zq -z 'debug f"debug: {this}" | yield f"{this}2" | head 1' - + +outputs: + - name: stderr + data: | + "debug: foo" + "debug: bar" + - name: stdout + data: | + "foo2" diff --git a/service/handlers.go b/service/handlers.go index 2e7f720b55..9cd598765e 100644 --- a/service/handlers.go +++ b/service/handlers.go @@ -26,6 +26,7 @@ import ( "github.com/brimdata/zed/runtime/sam/op" "github.com/brimdata/zed/service/auth" "github.com/brimdata/zed/service/srverr" + "github.com/brimdata/zed/zbuf" "github.com/brimdata/zed/zio" "github.com/brimdata/zed/zio/anyio" "github.com/brimdata/zed/zio/csvio" @@ -124,7 +125,7 @@ func handleQuery(c *Core, w *ResponseWriter, r *Request) { } } if len(batch.Values()) == 0 { - if eoc, ok := batch.(*op.EndOfChannel); ok { + if eoc, ok := batch.(*zbuf.EndOfChannel); ok { if err := writer.WhiteChannelEnd(string(*eoc)); err != nil { w.Logger.Warn("Error writing channel end", zap.Error(err)) handleError(err) @@ -134,7 +135,7 @@ func handleQuery(c *Core, w *ResponseWriter, r *Request) { continue } var label string - batch, label = op.Unwrap(batch) + batch, label = zbuf.Unlabel(batch) if err := writer.WriteBatch(label, batch); err != nil { w.Logger.Warn("Error writing batch", zap.Error(err)) handleError(err) diff --git a/service/ztests/debug.yaml b/service/ztests/debug.yaml new file mode 100644 index 0000000000..184a72cb5d --- /dev/null +++ b/service/ztests/debug.yaml @@ -0,0 +1,16 @@ +script: | + source service.sh + zed create -use -q test + echo '{x: "foo"}' | zed load -q - + zed query -z 'debug f"debug: {x}"' + +inputs: + - name: service.sh + +outputs: + - name: stdout + data: | + {x:"foo"} + - name: stderr + data: | + "debug: foo" diff --git a/zbuf/mux.go b/zbuf/mux.go new file mode 100644 index 0000000000..8aa3da03dc --- /dev/null +++ b/zbuf/mux.go @@ -0,0 +1,58 @@ +package zbuf + +import ( + "github.com/brimdata/zed" + "github.com/brimdata/zed/zio" +) + +func Label(label string, batch Batch) Batch { + return &labeled{batch, label} +} + +func Unlabel(batch Batch) (Batch, string) { + var label string + if inner, ok := batch.(*labeled); ok { + batch = inner + label = inner.label + } + return batch, label +} + +type labeled struct { + Batch + label string +} + +// EndOfChannel is an empty batch that represents the termination of one +// of the output paths of a muxed flowgraph and thus will be ignored downstream +// unless explicitly detected. +type EndOfChannel string + +var _ Batch = (*EndOfChannel)(nil) + +func (*EndOfChannel) Ref() {} +func (*EndOfChannel) Unref() {} +func (*EndOfChannel) Values() []zed.Value { return nil } +func (*EndOfChannel) Vars() []zed.Value { return nil } + +func CopyMux(outputs map[string]zio.WriteCloser, parent Puller) error { + for { + batch, err := parent.Pull(false) + if batch == nil || err != nil { + return err + } + if _, ok := batch.(*EndOfChannel); ok { + continue + } + var label string + batch, label = Unlabel(batch) + if w, ok := outputs[label]; ok { + if err := WriteBatch(w, batch); err != nil { + return err + } + } + // XXX Should we send some kind of warning if a batch is ignored + // because it doesn't have an assigned output channel? + batch.Unref() + } +} diff --git a/zfmt/ast.go b/zfmt/ast.go index 5fe53f385a..04945d43f1 100644 --- a/zfmt/ast.go +++ b/zfmt/ast.go @@ -630,6 +630,13 @@ func (c *canon) op(p ast.Op) { case *ast.Output: c.next() c.write("output %s", p.Name.Name) + case *ast.Debug: + c.next() + c.write("debug") + if p.Expr != nil { + c.write(" ") + c.expr(p.Expr, "") + } default: c.open("unknown proc: %T", p) c.close() diff --git a/zfmt/dag.go b/zfmt/dag.go index 3c1ec990fc..25e1947457 100644 --- a/zfmt/dag.go +++ b/zfmt/dag.go @@ -302,6 +302,22 @@ func (c *canonDAG) op(p dag.Op) { c.ret() c.flush() c.write(")") + case *dag.Mirror: + c.next() + c.open("mirror (") + c.ret() + for _, seq := range []dag.Seq{p.Mirror, p.Main} { + c.ret() + c.write("=>") + c.open() + c.head = true + c.seq(seq) + c.close() + } + c.close() + c.ret() + c.flush() + c.write(")") case *dag.Switch: c.next() c.open("switch ") diff --git a/zfmt/ztests/debug.yaml b/zfmt/ztests/debug.yaml new file mode 100644 index 0000000000..77092cd5f8 --- /dev/null +++ b/zfmt/ztests/debug.yaml @@ -0,0 +1,18 @@ +script: | + zc -C 'debug f"debug: {this}" | head 1' + zc -s -C 'debug f"debug: {this}" | head 1' + +outputs: + - name: stdout + data: | + debug f"debug: {this}" + | head 1 + reader + | mirror ( + => + yield "debug: "+cast(this, ) + | output debug + => + head 1 + | output main + )