From a81848bc3af6906236de2df3aa1630973e9a417f Mon Sep 17 00:00:00 2001 From: Philip Potter Date: Mon, 11 May 2020 14:37:38 +0100 Subject: [PATCH 1/2] add /v3 to module path --- README.md | 2 +- binary/cbor.go | 2 +- binary/semantic_hash.go | 2 +- cmd/main.go | 8 +- core/ast.go | 2 +- core/builtins.go | 2 +- core/builtins_test.go | 4 +- core/equivalence_test.go | 2 +- core/eval.go | 2 +- core/eval_test.go | 2 +- core/quote.go | 2 +- core/quote_test.go | 2 +- core/testing.go | 2 +- core/typecheck.go | 2 +- core/typecheck_test.go | 2 +- example_function_test.go | 2 +- example_nested_test.go | 2 +- example_tagged_test.go | 2 +- example_test.go | 2 +- go.mod | 2 +- imports/cache.go | 4 +- imports/imports.go | 10 +- imports/imports_test.go | 6 +- internal/gubbins.go | 2 +- parser/internal/dhall.go | 6442 ++++++++++++++--------------- parser/internal/dhall.peg | 2 +- parser/internal/multiline.go | 2 +- parser/internal/multiline_test.go | 2 +- parser/parser.go | 4 +- parser/parser_test.go | 6 +- property_test.go | 6 +- regression_test.go | 4 +- spec_test.go | 10 +- term/fetchable_test.go | 4 +- unmarshal.go | 8 +- unmarshal_test.go | 6 +- 36 files changed, 3283 insertions(+), 3283 deletions(-) diff --git a/README.md b/README.md index 577fe77..c88def1 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ import ( "fmt" "io/ioutil" - "github.com/philandstuff/dhall-golang" + "github.com/philandstuff/dhall-golang/v3" ) // Config can be a fairly arbitrary Go datatype. You would put your diff --git a/binary/cbor.go b/binary/cbor.go index 7e1f9e2..7701839 100644 --- a/binary/cbor.go +++ b/binary/cbor.go @@ -8,7 +8,7 @@ import ( "path" "github.com/fxamacker/cbor/v2" - . "github.com/philandstuff/dhall-golang/term" + . "github.com/philandstuff/dhall-golang/v3/term" ) var nameToBuiltin = map[string]Term{ diff --git a/binary/semantic_hash.go b/binary/semantic_hash.go index 8a0e3fe..be2d953 100644 --- a/binary/semantic_hash.go +++ b/binary/semantic_hash.go @@ -4,7 +4,7 @@ import ( "bytes" "crypto/sha256" - "github.com/philandstuff/dhall-golang/core" + "github.com/philandstuff/dhall-golang/v3/core" ) // SemanticHash returns the semantic hash of an evaluated expression. diff --git a/cmd/main.go b/cmd/main.go index 651891c..f083d20 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -6,10 +6,10 @@ import ( "log" "os" - "github.com/philandstuff/dhall-golang/binary" - "github.com/philandstuff/dhall-golang/core" - "github.com/philandstuff/dhall-golang/imports" - "github.com/philandstuff/dhall-golang/parser" + "github.com/philandstuff/dhall-golang/v3/binary" + "github.com/philandstuff/dhall-golang/v3/core" + "github.com/philandstuff/dhall-golang/v3/imports" + "github.com/philandstuff/dhall-golang/v3/parser" ) func main() { diff --git a/core/ast.go b/core/ast.go index cf9229c..2d567bb 100644 --- a/core/ast.go +++ b/core/ast.go @@ -4,7 +4,7 @@ import ( "fmt" "math" - "github.com/philandstuff/dhall-golang/term" + "github.com/philandstuff/dhall-golang/v3/term" ) // A Value is a Dhall value in beta-normal form. You can think of diff --git a/core/builtins.go b/core/builtins.go index f79a929..f333118 100644 --- a/core/builtins.go +++ b/core/builtins.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/philandstuff/dhall-golang/term" + "github.com/philandstuff/dhall-golang/v3/term" ) func (naturalBuild) Call(x Value) Value { diff --git a/core/builtins_test.go b/core/builtins_test.go index a30a247..6d031d8 100644 --- a/core/builtins_test.go +++ b/core/builtins_test.go @@ -3,8 +3,8 @@ package core_test import ( . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/gomega" - "github.com/philandstuff/dhall-golang/core" - "github.com/philandstuff/dhall-golang/parser" + "github.com/philandstuff/dhall-golang/v3/core" + "github.com/philandstuff/dhall-golang/v3/parser" ) var _ = DescribeTable("ArgType of builtins", func(src, typ string) { diff --git a/core/equivalence_test.go b/core/equivalence_test.go index 3d8c175..1167b7c 100644 --- a/core/equivalence_test.go +++ b/core/equivalence_test.go @@ -5,7 +5,7 @@ import ( . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/gomega" "github.com/onsi/gomega/types" - "github.com/philandstuff/dhall-golang/term" + "github.com/philandstuff/dhall-golang/v3/term" ) // Ensure that alphaMatcher is a valid GomegaMatcher diff --git a/core/eval.go b/core/eval.go index 0693c24..a71ab9b 100644 --- a/core/eval.go +++ b/core/eval.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/philandstuff/dhall-golang/term" + "github.com/philandstuff/dhall-golang/v3/term" ) type env map[string][]Value diff --git a/core/eval_test.go b/core/eval_test.go index 8b3e897..8044fa1 100644 --- a/core/eval_test.go +++ b/core/eval_test.go @@ -3,7 +3,7 @@ package core import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/philandstuff/dhall-golang/term" + "github.com/philandstuff/dhall-golang/v3/term" ) var _ = Describe("Eval", func() { diff --git a/core/quote.go b/core/quote.go index 58f4045..45eb1c6 100644 --- a/core/quote.go +++ b/core/quote.go @@ -3,7 +3,7 @@ package core import ( "fmt" - "github.com/philandstuff/dhall-golang/term" + "github.com/philandstuff/dhall-golang/v3/term" ) // Quote takes the Value v and turns it back into a Term. diff --git a/core/quote_test.go b/core/quote_test.go index e67764d..01d6af7 100644 --- a/core/quote_test.go +++ b/core/quote_test.go @@ -3,7 +3,7 @@ package core import ( . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/gomega" - "github.com/philandstuff/dhall-golang/term" + "github.com/philandstuff/dhall-golang/v3/term" ) var _ = DescribeTable("Quote", diff --git a/core/testing.go b/core/testing.go index c0c849d..a9aa58b 100644 --- a/core/testing.go +++ b/core/testing.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/philandstuff/dhall-golang/term" + "github.com/philandstuff/dhall-golang/v3/term" ) // GomegaMatcher is a copy of diff --git a/core/typecheck.go b/core/typecheck.go index c6452f9..539e408 100644 --- a/core/typecheck.go +++ b/core/typecheck.go @@ -3,7 +3,7 @@ package core import ( "fmt" - "github.com/philandstuff/dhall-golang/term" + "github.com/philandstuff/dhall-golang/v3/term" ) type context map[string][]Value diff --git a/core/typecheck_test.go b/core/typecheck_test.go index 630d2ea..f5e8021 100644 --- a/core/typecheck_test.go +++ b/core/typecheck_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/gomega" - "github.com/philandstuff/dhall-golang/term" + "github.com/philandstuff/dhall-golang/v3/term" ) var _ = DescribeTable("functionCheck", diff --git a/example_function_test.go b/example_function_test.go index de38c52..33b6bb9 100644 --- a/example_function_test.go +++ b/example_function_test.go @@ -3,7 +3,7 @@ package dhall_test import ( "fmt" - "github.com/philandstuff/dhall-golang" + "github.com/philandstuff/dhall-golang/v3" ) // Config is the struct we want to unmarshal from Dhall diff --git a/example_nested_test.go b/example_nested_test.go index de87e83..93dc322 100644 --- a/example_nested_test.go +++ b/example_nested_test.go @@ -3,7 +3,7 @@ package dhall_test import ( "fmt" - "github.com/philandstuff/dhall-golang" + "github.com/philandstuff/dhall-golang/v3" ) // NestedConfig is the struct we want to unmarshal from Dhall diff --git a/example_tagged_test.go b/example_tagged_test.go index f3431d3..555babe 100644 --- a/example_tagged_test.go +++ b/example_tagged_test.go @@ -3,7 +3,7 @@ package dhall_test import ( "fmt" - "github.com/philandstuff/dhall-golang" + "github.com/philandstuff/dhall-golang/v3" ) // TaggedMessage is the struct we want to unmarshal from Dhall diff --git a/example_test.go b/example_test.go index 3ce589c..f005a05 100644 --- a/example_test.go +++ b/example_test.go @@ -3,7 +3,7 @@ package dhall_test import ( "fmt" - "github.com/philandstuff/dhall-golang" + "github.com/philandstuff/dhall-golang/v3" ) // Message is the struct we want to unmarshal from Dhall diff --git a/go.mod b/go.mod index 6a2ceae..e4f57d8 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/philandstuff/dhall-golang +module github.com/philandstuff/dhall-golang/v3 require ( github.com/fxamacker/cbor/v2 v2.2.0 diff --git a/imports/cache.go b/imports/cache.go index 19a46ab..57be6f1 100644 --- a/imports/cache.go +++ b/imports/cache.go @@ -10,8 +10,8 @@ import ( "os" "path" - "github.com/philandstuff/dhall-golang/binary" - "github.com/philandstuff/dhall-golang/term" + "github.com/philandstuff/dhall-golang/v3/binary" + "github.com/philandstuff/dhall-golang/v3/term" ) // DhallCache is an interface for caching implementations. diff --git a/imports/imports.go b/imports/imports.go index abd5e10..ff3cce0 100644 --- a/imports/imports.go +++ b/imports/imports.go @@ -4,11 +4,11 @@ import ( "bytes" "fmt" - "github.com/philandstuff/dhall-golang/binary" - "github.com/philandstuff/dhall-golang/core" - "github.com/philandstuff/dhall-golang/parser" - "github.com/philandstuff/dhall-golang/term" - . "github.com/philandstuff/dhall-golang/term" + "github.com/philandstuff/dhall-golang/v3/binary" + "github.com/philandstuff/dhall-golang/v3/core" + "github.com/philandstuff/dhall-golang/v3/parser" + "github.com/philandstuff/dhall-golang/v3/term" + . "github.com/philandstuff/dhall-golang/v3/term" ) // Load takes a Term and resolves all imports diff --git a/imports/imports_test.go b/imports/imports_test.go index a18aaa9..d664a71 100644 --- a/imports/imports_test.go +++ b/imports/imports_test.go @@ -5,9 +5,9 @@ import ( "net/http" "os" - . "github.com/philandstuff/dhall-golang/imports" - . "github.com/philandstuff/dhall-golang/internal" - . "github.com/philandstuff/dhall-golang/term" + . "github.com/philandstuff/dhall-golang/v3/imports" + . "github.com/philandstuff/dhall-golang/v3/internal" + . "github.com/philandstuff/dhall-golang/v3/term" . "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo/extensions/table" diff --git a/internal/gubbins.go b/internal/gubbins.go index 4fa2a03..f7463ad 100644 --- a/internal/gubbins.go +++ b/internal/gubbins.go @@ -10,7 +10,7 @@ package internal import ( "net/url" - "github.com/philandstuff/dhall-golang/term" + "github.com/philandstuff/dhall-golang/v3/term" ) func NewImport(fetchable term.Fetchable, mode term.ImportMode) term.Import { diff --git a/parser/internal/dhall.go b/parser/internal/dhall.go index d3286de..e4c9aed 100644 --- a/parser/internal/dhall.go +++ b/parser/internal/dhall.go @@ -21,7 +21,7 @@ import ( "unicode" "unicode/utf8" - . "github.com/philandstuff/dhall-golang/term" + . "github.com/philandstuff/dhall-golang/v3/term" ) // Helper function for parsing all the operator parsing blocks @@ -78,25 +78,25 @@ var g = &grammar{ rules: []*rule{ { name: "DhallFile", - pos: position{line: 82, col: 1, offset: 1948}, + pos: position{line: 82, col: 1, offset: 1951}, expr: &actionExpr{ - pos: position{line: 82, col: 13, offset: 1962}, + pos: position{line: 82, col: 13, offset: 1965}, run: (*parser).callonDhallFile1, expr: &seqExpr{ - pos: position{line: 82, col: 13, offset: 1962}, + pos: position{line: 82, col: 13, offset: 1965}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 82, col: 13, offset: 1962}, + pos: position{line: 82, col: 13, offset: 1965}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 82, col: 15, offset: 1964}, + pos: position{line: 82, col: 15, offset: 1967}, name: "CompleteExpression", }, }, ¬Expr{ - pos: position{line: 84, col: 7, offset: 2014}, + pos: position{line: 84, col: 7, offset: 2017}, expr: &anyMatcher{ - line: 84, col: 8, offset: 2015, + line: 84, col: 8, offset: 2018, }, }, }, @@ -105,18 +105,18 @@ var g = &grammar{ }, { name: "BlockComment", - pos: position{line: 108, col: 1, offset: 2579}, + pos: position{line: 108, col: 1, offset: 2582}, expr: &seqExpr{ - pos: position{line: 108, col: 16, offset: 2596}, + pos: position{line: 108, col: 16, offset: 2599}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 108, col: 16, offset: 2596}, + pos: position{line: 108, col: 16, offset: 2599}, val: "{-", ignoreCase: false, want: "\"{-\"", }, &ruleRefExpr{ - pos: position{line: 108, col: 21, offset: 2601}, + pos: position{line: 108, col: 21, offset: 2604}, name: "BlockCommentContinue", }, }, @@ -124,37 +124,37 @@ var g = &grammar{ }, { name: "BlockCommentContinue", - pos: position{line: 116, col: 1, offset: 2696}, + pos: position{line: 116, col: 1, offset: 2699}, expr: &choiceExpr{ - pos: position{line: 117, col: 7, offset: 2727}, + pos: position{line: 117, col: 7, offset: 2730}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 117, col: 7, offset: 2727}, + pos: position{line: 117, col: 7, offset: 2730}, val: "-}", ignoreCase: false, want: "\"-}\"", }, &seqExpr{ - pos: position{line: 118, col: 7, offset: 2738}, + pos: position{line: 118, col: 7, offset: 2741}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 118, col: 7, offset: 2738}, + pos: position{line: 118, col: 7, offset: 2741}, name: "BlockComment", }, &ruleRefExpr{ - pos: position{line: 118, col: 20, offset: 2751}, + pos: position{line: 118, col: 20, offset: 2754}, name: "BlockCommentContinue", }, }, }, &seqExpr{ - pos: position{line: 119, col: 7, offset: 2778}, + pos: position{line: 119, col: 7, offset: 2781}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 111, col: 5, offset: 2648}, + pos: position{line: 111, col: 5, offset: 2651}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 111, col: 5, offset: 2648}, + pos: position{line: 111, col: 5, offset: 2651}, val: "[𐀀D\\t\\n -\\u007f\\u0080-\\ud7ff\\ue000-�𐀀-\\U0001fffd𠀀-\\U0002fffd\\U00030000-\\U0003fffd\\U00040000-\\U0004fffd\\U00050000-\\U0005fffd\\U00060000-\\U0006fffd\\U00070000-\\U0007fffd\\U00080000-\\U0008fffd\\U00090000-\\U0009fffd\\U000a0000-\\U000afffd\\U000b0000-\\U000bfffd\\U000c0000-\\U000cfffd\\U000d0000-\\U000dfffd\\U000e0000-\\U000efffd\\U000f0000-\\U000ffffd0-\\U00010fff]", chars: []rune{'𐀀', 'D', '\t', '\n'}, ranges: []rune{' ', '\u007f', '\u0080', '\ud7ff', '\ue000', '�', '𐀀', '\U0001fffd', '𠀀', '\U0002fffd', '\U00030000', '\U0003fffd', '\U00040000', '\U0004fffd', '\U00050000', '\U0005fffd', '\U00060000', '\U0006fffd', '\U00070000', '\U0007fffd', '\U00080000', '\U0008fffd', '\U00090000', '\U0009fffd', '\U000a0000', '\U000afffd', '\U000b0000', '\U000bfffd', '\U000c0000', '\U000cfffd', '\U000d0000', '\U000dfffd', '\U000e0000', '\U000efffd', '\U000f0000', '\U000ffffd', '0', '\U00010fff'}, @@ -162,10 +162,10 @@ var g = &grammar{ inverted: false, }, &actionExpr{ - pos: position{line: 86, col: 14, offset: 2033}, + pos: position{line: 86, col: 14, offset: 2036}, run: (*parser).callonBlockCommentContinue9, expr: &litMatcher{ - pos: position{line: 86, col: 14, offset: 2033}, + pos: position{line: 86, col: 14, offset: 2036}, val: "\r\n", ignoreCase: false, want: "\"\\r\\n\"", @@ -174,7 +174,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 119, col: 24, offset: 2795}, + pos: position{line: 119, col: 24, offset: 2798}, name: "BlockCommentContinue", }, }, @@ -184,49 +184,49 @@ var g = &grammar{ }, { name: "WhitespaceChunk", - pos: position{line: 125, col: 1, offset: 2962}, + pos: position{line: 125, col: 1, offset: 2965}, expr: &choiceExpr{ - pos: position{line: 125, col: 19, offset: 2982}, + pos: position{line: 125, col: 19, offset: 2985}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 125, col: 19, offset: 2982}, + pos: position{line: 125, col: 19, offset: 2985}, val: "[ \\t\\n]", chars: []rune{' ', '\t', '\n'}, ignoreCase: false, inverted: false, }, &actionExpr{ - pos: position{line: 86, col: 14, offset: 2033}, + pos: position{line: 86, col: 14, offset: 2036}, run: (*parser).callonWhitespaceChunk3, expr: &litMatcher{ - pos: position{line: 86, col: 14, offset: 2033}, + pos: position{line: 86, col: 14, offset: 2036}, val: "\r\n", ignoreCase: false, want: "\"\\r\\n\"", }, }, &actionExpr{ - pos: position{line: 123, col: 15, offset: 2880}, + pos: position{line: 123, col: 15, offset: 2883}, run: (*parser).callonWhitespaceChunk5, expr: &seqExpr{ - pos: position{line: 123, col: 15, offset: 2880}, + pos: position{line: 123, col: 15, offset: 2883}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 123, col: 15, offset: 2880}, + pos: position{line: 123, col: 15, offset: 2883}, val: "--", ignoreCase: false, want: "\"--\"", }, &labeledExpr{ - pos: position{line: 123, col: 20, offset: 2885}, + pos: position{line: 123, col: 20, offset: 2888}, label: "content", expr: &actionExpr{ - pos: position{line: 123, col: 29, offset: 2894}, + pos: position{line: 123, col: 29, offset: 2897}, run: (*parser).callonWhitespaceChunk9, expr: &zeroOrMoreExpr{ - pos: position{line: 123, col: 29, offset: 2894}, + pos: position{line: 123, col: 29, offset: 2897}, expr: &charClassMatcher{ - pos: position{line: 121, col: 10, offset: 2828}, + pos: position{line: 121, col: 10, offset: 2831}, val: "[𐀀D\\t -\\u007f\\u0080-\\ud7ff\\ue000-�𐀀-\\U0001fffd𠀀-\\U0002fffd\\U00030000-\\U0003fffd\\U00040000-\\U0004fffd\\U00050000-\\U0005fffd\\U00060000-\\U0006fffd\\U00070000-\\U0007fffd\\U00080000-\\U0008fffd\\U00090000-\\U0009fffd\\U000a0000-\\U000afffd\\U000b0000-\\U000bfffd\\U000c0000-\\U000cfffd\\U000d0000-\\U000dfffd\\U000e0000-\\U000efffd\\U000f0000-\\U000ffffd0-\\U00010fff]", chars: []rune{'𐀀', 'D', '\t'}, ranges: []rune{' ', '\u007f', '\u0080', '\ud7ff', '\ue000', '�', '𐀀', '\U0001fffd', '𠀀', '\U0002fffd', '\U00030000', '\U0003fffd', '\U00040000', '\U0004fffd', '\U00050000', '\U0005fffd', '\U00060000', '\U0006fffd', '\U00070000', '\U0007fffd', '\U00080000', '\U0008fffd', '\U00090000', '\U0009fffd', '\U000a0000', '\U000afffd', '\U000b0000', '\U000bfffd', '\U000c0000', '\U000cfffd', '\U000d0000', '\U000dfffd', '\U000e0000', '\U000efffd', '\U000f0000', '\U000ffffd', '0', '\U00010fff'}, @@ -237,19 +237,19 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 86, col: 7, offset: 2026}, + pos: position{line: 86, col: 7, offset: 2029}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 86, col: 7, offset: 2026}, + pos: position{line: 86, col: 7, offset: 2029}, val: "\n", ignoreCase: false, want: "\"\\n\"", }, &actionExpr{ - pos: position{line: 86, col: 14, offset: 2033}, + pos: position{line: 86, col: 14, offset: 2036}, run: (*parser).callonWhitespaceChunk14, expr: &litMatcher{ - pos: position{line: 86, col: 14, offset: 2033}, + pos: position{line: 86, col: 14, offset: 2036}, val: "\r\n", ignoreCase: false, want: "\"\\r\\n\"", @@ -261,7 +261,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 125, col: 52, offset: 3015}, + pos: position{line: 125, col: 52, offset: 3018}, name: "BlockComment", }, }, @@ -269,147 +269,147 @@ var g = &grammar{ }, { name: "_", - pos: position{line: 127, col: 1, offset: 3029}, + pos: position{line: 127, col: 1, offset: 3032}, expr: &zeroOrMoreExpr{ - pos: position{line: 127, col: 5, offset: 3035}, + pos: position{line: 127, col: 5, offset: 3038}, expr: &ruleRefExpr{ - pos: position{line: 127, col: 5, offset: 3035}, + pos: position{line: 127, col: 5, offset: 3038}, name: "WhitespaceChunk", }, }, }, { name: "_1", - pos: position{line: 129, col: 1, offset: 3053}, + pos: position{line: 129, col: 1, offset: 3056}, expr: &oneOrMoreExpr{ - pos: position{line: 129, col: 6, offset: 3060}, + pos: position{line: 129, col: 6, offset: 3063}, expr: &ruleRefExpr{ - pos: position{line: 129, col: 6, offset: 3060}, + pos: position{line: 129, col: 6, offset: 3063}, name: "WhitespaceChunk", }, }, }, { name: "DoubleQuoteChunk", - pos: position{line: 157, col: 1, offset: 3848}, + pos: position{line: 157, col: 1, offset: 3851}, expr: &choiceExpr{ - pos: position{line: 158, col: 6, offset: 3874}, + pos: position{line: 158, col: 6, offset: 3877}, alternatives: []interface{}{ &ruleRefExpr{ - pos: position{line: 158, col: 6, offset: 3874}, + pos: position{line: 158, col: 6, offset: 3877}, name: "Interpolation", }, &actionExpr{ - pos: position{line: 159, col: 6, offset: 3893}, + pos: position{line: 159, col: 6, offset: 3896}, run: (*parser).callonDoubleQuoteChunk3, expr: &seqExpr{ - pos: position{line: 159, col: 6, offset: 3893}, + pos: position{line: 159, col: 6, offset: 3896}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 159, col: 6, offset: 3893}, + pos: position{line: 159, col: 6, offset: 3896}, val: "\\", ignoreCase: false, want: "\"\\\\\"", }, &labeledExpr{ - pos: position{line: 159, col: 11, offset: 3898}, + pos: position{line: 159, col: 11, offset: 3901}, label: "e", expr: &choiceExpr{ - pos: position{line: 163, col: 8, offset: 3989}, + pos: position{line: 163, col: 8, offset: 3992}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 163, col: 8, offset: 3989}, + pos: position{line: 163, col: 8, offset: 3992}, val: "[\"$\\\\/]", chars: []rune{'"', '$', '\\', '/'}, ignoreCase: false, inverted: false, }, &actionExpr{ - pos: position{line: 167, col: 8, offset: 4034}, + pos: position{line: 167, col: 8, offset: 4037}, run: (*parser).callonDoubleQuoteChunk9, expr: &litMatcher{ - pos: position{line: 167, col: 8, offset: 4034}, + pos: position{line: 167, col: 8, offset: 4037}, val: "b", ignoreCase: false, want: "\"b\"", }, }, &actionExpr{ - pos: position{line: 168, col: 8, offset: 4074}, + pos: position{line: 168, col: 8, offset: 4077}, run: (*parser).callonDoubleQuoteChunk11, expr: &litMatcher{ - pos: position{line: 168, col: 8, offset: 4074}, + pos: position{line: 168, col: 8, offset: 4077}, val: "f", ignoreCase: false, want: "\"f\"", }, }, &actionExpr{ - pos: position{line: 169, col: 8, offset: 4114}, + pos: position{line: 169, col: 8, offset: 4117}, run: (*parser).callonDoubleQuoteChunk13, expr: &litMatcher{ - pos: position{line: 169, col: 8, offset: 4114}, + pos: position{line: 169, col: 8, offset: 4117}, val: "n", ignoreCase: false, want: "\"n\"", }, }, &actionExpr{ - pos: position{line: 170, col: 8, offset: 4154}, + pos: position{line: 170, col: 8, offset: 4157}, run: (*parser).callonDoubleQuoteChunk15, expr: &litMatcher{ - pos: position{line: 170, col: 8, offset: 4154}, + pos: position{line: 170, col: 8, offset: 4157}, val: "r", ignoreCase: false, want: "\"r\"", }, }, &actionExpr{ - pos: position{line: 171, col: 8, offset: 4194}, + pos: position{line: 171, col: 8, offset: 4197}, run: (*parser).callonDoubleQuoteChunk17, expr: &litMatcher{ - pos: position{line: 171, col: 8, offset: 4194}, + pos: position{line: 171, col: 8, offset: 4197}, val: "t", ignoreCase: false, want: "\"t\"", }, }, &actionExpr{ - pos: position{line: 172, col: 8, offset: 4234}, + pos: position{line: 172, col: 8, offset: 4237}, run: (*parser).callonDoubleQuoteChunk19, expr: &seqExpr{ - pos: position{line: 172, col: 8, offset: 4234}, + pos: position{line: 172, col: 8, offset: 4237}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 172, col: 8, offset: 4234}, + pos: position{line: 172, col: 8, offset: 4237}, val: "u", ignoreCase: false, want: "\"u\"", }, &labeledExpr{ - pos: position{line: 172, col: 12, offset: 4238}, + pos: position{line: 172, col: 12, offset: 4241}, label: "u", expr: &choiceExpr{ - pos: position{line: 175, col: 9, offset: 4299}, + pos: position{line: 175, col: 9, offset: 4302}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 175, col: 9, offset: 4299}, + pos: position{line: 175, col: 9, offset: 4302}, run: (*parser).callonDoubleQuoteChunk24, expr: &seqExpr{ - pos: position{line: 175, col: 9, offset: 4299}, + pos: position{line: 175, col: 9, offset: 4302}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -418,17 +418,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -437,17 +437,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -456,17 +456,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -478,31 +478,31 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 178, col: 9, offset: 4397}, + pos: position{line: 178, col: 9, offset: 4400}, run: (*parser).callonDoubleQuoteChunk38, expr: &seqExpr{ - pos: position{line: 178, col: 9, offset: 4397}, + pos: position{line: 178, col: 9, offset: 4400}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 178, col: 9, offset: 4397}, + pos: position{line: 178, col: 9, offset: 4400}, val: "{", ignoreCase: false, want: "\"{\"", }, &oneOrMoreExpr{ - pos: position{line: 178, col: 13, offset: 4401}, + pos: position{line: 178, col: 13, offset: 4404}, expr: &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -512,7 +512,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 178, col: 21, offset: 4409}, + pos: position{line: 178, col: 21, offset: 4412}, val: "}", ignoreCase: false, want: "\"}\"", @@ -533,7 +533,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 183, col: 6, offset: 4518}, + pos: position{line: 183, col: 6, offset: 4521}, val: "[𐀀D -!#-[]-\\u007f\\u0080-\\ud7ff\\ue000-�𐀀-\\U0001fffd𠀀-\\U0002fffd\\U00030000-\\U0003fffd\\U00040000-\\U0004fffd\\U00050000-\\U0005fffd\\U00060000-\\U0006fffd\\U00070000-\\U0007fffd\\U00080000-\\U0008fffd\\U00090000-\\U0009fffd\\U000a0000-\\U000afffd\\U000b0000-\\U000bfffd\\U000c0000-\\U000cfffd\\U000d0000-\\U000dfffd\\U000e0000-\\U000efffd\\U000f0000-\\U000ffffd0-\\U00010fff]", chars: []rune{'𐀀', 'D'}, ranges: []rune{' ', '!', '#', '[', ']', '\u007f', '\u0080', '\ud7ff', '\ue000', '�', '𐀀', '\U0001fffd', '𠀀', '\U0002fffd', '\U00030000', '\U0003fffd', '\U00040000', '\U0004fffd', '\U00050000', '\U0005fffd', '\U00060000', '\U0006fffd', '\U00070000', '\U0007fffd', '\U00080000', '\U0008fffd', '\U00090000', '\U0009fffd', '\U000a0000', '\U000afffd', '\U000b0000', '\U000bfffd', '\U000c0000', '\U000cfffd', '\U000d0000', '\U000dfffd', '\U000e0000', '\U000efffd', '\U000f0000', '\U000ffffd', '0', '\U00010fff'}, @@ -545,32 +545,32 @@ var g = &grammar{ }, { name: "DoubleQuoteLiteral", - pos: position{line: 188, col: 1, offset: 4584}, + pos: position{line: 188, col: 1, offset: 4587}, expr: &actionExpr{ - pos: position{line: 188, col: 22, offset: 4607}, + pos: position{line: 188, col: 22, offset: 4610}, run: (*parser).callonDoubleQuoteLiteral1, expr: &seqExpr{ - pos: position{line: 188, col: 22, offset: 4607}, + pos: position{line: 188, col: 22, offset: 4610}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 188, col: 22, offset: 4607}, + pos: position{line: 188, col: 22, offset: 4610}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, &labeledExpr{ - pos: position{line: 188, col: 26, offset: 4611}, + pos: position{line: 188, col: 26, offset: 4614}, label: "chunks", expr: &zeroOrMoreExpr{ - pos: position{line: 188, col: 33, offset: 4618}, + pos: position{line: 188, col: 33, offset: 4621}, expr: &ruleRefExpr{ - pos: position{line: 188, col: 33, offset: 4618}, + pos: position{line: 188, col: 33, offset: 4621}, name: "DoubleQuoteChunk", }, }, }, &litMatcher{ - pos: position{line: 188, col: 51, offset: 4636}, + pos: position{line: 188, col: 51, offset: 4639}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -581,75 +581,75 @@ var g = &grammar{ }, { name: "SingleQuoteContinue", - pos: position{line: 205, col: 1, offset: 5104}, + pos: position{line: 205, col: 1, offset: 5107}, expr: &choiceExpr{ - pos: position{line: 206, col: 7, offset: 5134}, + pos: position{line: 206, col: 7, offset: 5137}, alternatives: []interface{}{ &seqExpr{ - pos: position{line: 206, col: 7, offset: 5134}, + pos: position{line: 206, col: 7, offset: 5137}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 206, col: 7, offset: 5134}, + pos: position{line: 206, col: 7, offset: 5137}, name: "Interpolation", }, &ruleRefExpr{ - pos: position{line: 206, col: 21, offset: 5148}, + pos: position{line: 206, col: 21, offset: 5151}, name: "SingleQuoteContinue", }, }, }, &seqExpr{ - pos: position{line: 207, col: 7, offset: 5174}, + pos: position{line: 207, col: 7, offset: 5177}, exprs: []interface{}{ &actionExpr{ - pos: position{line: 212, col: 20, offset: 5333}, + pos: position{line: 212, col: 20, offset: 5336}, run: (*parser).callonSingleQuoteContinue6, expr: &litMatcher{ - pos: position{line: 212, col: 20, offset: 5333}, + pos: position{line: 212, col: 20, offset: 5336}, val: "'''", ignoreCase: false, want: "\"'''\"", }, }, &ruleRefExpr{ - pos: position{line: 207, col: 24, offset: 5191}, + pos: position{line: 207, col: 24, offset: 5194}, name: "SingleQuoteContinue", }, }, }, &seqExpr{ - pos: position{line: 208, col: 7, offset: 5217}, + pos: position{line: 208, col: 7, offset: 5220}, exprs: []interface{}{ &actionExpr{ - pos: position{line: 216, col: 24, offset: 5493}, + pos: position{line: 216, col: 24, offset: 5496}, run: (*parser).callonSingleQuoteContinue10, expr: &litMatcher{ - pos: position{line: 216, col: 24, offset: 5493}, + pos: position{line: 216, col: 24, offset: 5496}, val: "''${", ignoreCase: false, want: "\"''${\"", }, }, &ruleRefExpr{ - pos: position{line: 208, col: 28, offset: 5238}, + pos: position{line: 208, col: 28, offset: 5241}, name: "SingleQuoteContinue", }, }, }, &litMatcher{ - pos: position{line: 209, col: 7, offset: 5264}, + pos: position{line: 209, col: 7, offset: 5267}, val: "''", ignoreCase: false, want: "\"''\"", }, &seqExpr{ - pos: position{line: 210, col: 7, offset: 5275}, + pos: position{line: 210, col: 7, offset: 5278}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 219, col: 6, offset: 5560}, + pos: position{line: 219, col: 6, offset: 5563}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 219, col: 6, offset: 5560}, + pos: position{line: 219, col: 6, offset: 5563}, val: "[𐀀D\\t\\n -\\u007f\\u0080-\\ud7ff\\ue000-�𐀀-\\U0001fffd𠀀-\\U0002fffd\\U00030000-\\U0003fffd\\U00040000-\\U0004fffd\\U00050000-\\U0005fffd\\U00060000-\\U0006fffd\\U00070000-\\U0007fffd\\U00080000-\\U0008fffd\\U00090000-\\U0009fffd\\U000a0000-\\U000afffd\\U000b0000-\\U000bfffd\\U000c0000-\\U000cfffd\\U000d0000-\\U000dfffd\\U000e0000-\\U000efffd\\U000f0000-\\U000ffffd0-\\U00010fff]", chars: []rune{'𐀀', 'D', '\t', '\n'}, ranges: []rune{' ', '\u007f', '\u0080', '\ud7ff', '\ue000', '�', '𐀀', '\U0001fffd', '𠀀', '\U0002fffd', '\U00030000', '\U0003fffd', '\U00040000', '\U0004fffd', '\U00050000', '\U0005fffd', '\U00060000', '\U0006fffd', '\U00070000', '\U0007fffd', '\U00080000', '\U0008fffd', '\U00090000', '\U0009fffd', '\U000a0000', '\U000afffd', '\U000b0000', '\U000bfffd', '\U000c0000', '\U000cfffd', '\U000d0000', '\U000dfffd', '\U000e0000', '\U000efffd', '\U000f0000', '\U000ffffd', '0', '\U00010fff'}, @@ -657,10 +657,10 @@ var g = &grammar{ inverted: false, }, &actionExpr{ - pos: position{line: 86, col: 14, offset: 2033}, + pos: position{line: 86, col: 14, offset: 2036}, run: (*parser).callonSingleQuoteContinue17, expr: &litMatcher{ - pos: position{line: 86, col: 14, offset: 2033}, + pos: position{line: 86, col: 14, offset: 2036}, val: "\r\n", ignoreCase: false, want: "\"\\r\\n\"", @@ -669,7 +669,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 210, col: 23, offset: 5291}, + pos: position{line: 210, col: 23, offset: 5294}, name: "SingleQuoteContinue", }, }, @@ -679,33 +679,33 @@ var g = &grammar{ }, { name: "SingleQuoteLiteral", - pos: position{line: 224, col: 1, offset: 5611}, + pos: position{line: 224, col: 1, offset: 5614}, expr: &actionExpr{ - pos: position{line: 224, col: 22, offset: 5634}, + pos: position{line: 224, col: 22, offset: 5637}, run: (*parser).callonSingleQuoteLiteral1, expr: &seqExpr{ - pos: position{line: 224, col: 22, offset: 5634}, + pos: position{line: 224, col: 22, offset: 5637}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 224, col: 22, offset: 5634}, + pos: position{line: 224, col: 22, offset: 5637}, val: "''", ignoreCase: false, want: "\"''\"", }, &choiceExpr{ - pos: position{line: 86, col: 7, offset: 2026}, + pos: position{line: 86, col: 7, offset: 2029}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 86, col: 7, offset: 2026}, + pos: position{line: 86, col: 7, offset: 2029}, val: "\n", ignoreCase: false, want: "\"\\n\"", }, &actionExpr{ - pos: position{line: 86, col: 14, offset: 2033}, + pos: position{line: 86, col: 14, offset: 2036}, run: (*parser).callonSingleQuoteLiteral6, expr: &litMatcher{ - pos: position{line: 86, col: 14, offset: 2033}, + pos: position{line: 86, col: 14, offset: 2036}, val: "\r\n", ignoreCase: false, want: "\"\\r\\n\"", @@ -714,10 +714,10 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 224, col: 31, offset: 5643}, + pos: position{line: 224, col: 31, offset: 5646}, label: "content", expr: &ruleRefExpr{ - pos: position{line: 224, col: 39, offset: 5651}, + pos: position{line: 224, col: 39, offset: 5654}, name: "SingleQuoteContinue", }, }, @@ -727,29 +727,29 @@ var g = &grammar{ }, { name: "Interpolation", - pos: position{line: 242, col: 1, offset: 6201}, + pos: position{line: 242, col: 1, offset: 6204}, expr: &actionExpr{ - pos: position{line: 242, col: 17, offset: 6219}, + pos: position{line: 242, col: 17, offset: 6222}, run: (*parser).callonInterpolation1, expr: &seqExpr{ - pos: position{line: 242, col: 17, offset: 6219}, + pos: position{line: 242, col: 17, offset: 6222}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 242, col: 17, offset: 6219}, + pos: position{line: 242, col: 17, offset: 6222}, val: "${", ignoreCase: false, want: "\"${\"", }, &labeledExpr{ - pos: position{line: 242, col: 22, offset: 6224}, + pos: position{line: 242, col: 22, offset: 6227}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 242, col: 24, offset: 6226}, + pos: position{line: 242, col: 24, offset: 6229}, name: "CompleteExpression", }, }, &litMatcher{ - pos: position{line: 242, col: 43, offset: 6245}, + pos: position{line: 242, col: 43, offset: 6248}, val: "}", ignoreCase: false, want: "\"}\"", @@ -760,16 +760,16 @@ var g = &grammar{ }, { name: "TextLiteral", - pos: position{line: 244, col: 1, offset: 6268}, + pos: position{line: 244, col: 1, offset: 6271}, expr: &choiceExpr{ - pos: position{line: 244, col: 15, offset: 6284}, + pos: position{line: 244, col: 15, offset: 6287}, alternatives: []interface{}{ &ruleRefExpr{ - pos: position{line: 244, col: 15, offset: 6284}, + pos: position{line: 244, col: 15, offset: 6287}, name: "DoubleQuoteLiteral", }, &ruleRefExpr{ - pos: position{line: 244, col: 36, offset: 6305}, + pos: position{line: 244, col: 36, offset: 6308}, name: "SingleQuoteLiteral", }, }, @@ -777,369 +777,369 @@ var g = &grammar{ }, { name: "Identifier", - pos: position{line: 351, col: 1, offset: 9508}, + pos: position{line: 351, col: 1, offset: 9511}, expr: &choiceExpr{ - pos: position{line: 351, col: 14, offset: 9523}, + pos: position{line: 351, col: 14, offset: 9526}, alternatives: []interface{}{ &ruleRefExpr{ - pos: position{line: 351, col: 14, offset: 9523}, + pos: position{line: 351, col: 14, offset: 9526}, name: "Variable", }, &actionExpr{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, run: (*parser).callonIdentifier3, expr: &litMatcher{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, val: "Natural/fold", ignoreCase: false, want: "\"Natural/fold\"", }, }, &actionExpr{ - pos: position{line: 275, col: 5, offset: 6859}, + pos: position{line: 275, col: 5, offset: 6862}, run: (*parser).callonIdentifier5, expr: &litMatcher{ - pos: position{line: 275, col: 5, offset: 6859}, + pos: position{line: 275, col: 5, offset: 6862}, val: "Natural/build", ignoreCase: false, want: "\"Natural/build\"", }, }, &actionExpr{ - pos: position{line: 276, col: 5, offset: 6908}, + pos: position{line: 276, col: 5, offset: 6911}, run: (*parser).callonIdentifier7, expr: &litMatcher{ - pos: position{line: 276, col: 5, offset: 6908}, + pos: position{line: 276, col: 5, offset: 6911}, val: "Natural/isZero", ignoreCase: false, want: "\"Natural/isZero\"", }, }, &actionExpr{ - pos: position{line: 277, col: 5, offset: 6959}, + pos: position{line: 277, col: 5, offset: 6962}, run: (*parser).callonIdentifier9, expr: &litMatcher{ - pos: position{line: 277, col: 5, offset: 6959}, + pos: position{line: 277, col: 5, offset: 6962}, val: "Natural/even", ignoreCase: false, want: "\"Natural/even\"", }, }, &actionExpr{ - pos: position{line: 278, col: 5, offset: 7006}, + pos: position{line: 278, col: 5, offset: 7009}, run: (*parser).callonIdentifier11, expr: &litMatcher{ - pos: position{line: 278, col: 5, offset: 7006}, + pos: position{line: 278, col: 5, offset: 7009}, val: "Natural/odd", ignoreCase: false, want: "\"Natural/odd\"", }, }, &actionExpr{ - pos: position{line: 279, col: 5, offset: 7051}, + pos: position{line: 279, col: 5, offset: 7054}, run: (*parser).callonIdentifier13, expr: &litMatcher{ - pos: position{line: 279, col: 5, offset: 7051}, + pos: position{line: 279, col: 5, offset: 7054}, val: "Natural/toInteger", ignoreCase: false, want: "\"Natural/toInteger\"", }, }, &actionExpr{ - pos: position{line: 280, col: 5, offset: 7108}, + pos: position{line: 280, col: 5, offset: 7111}, run: (*parser).callonIdentifier15, expr: &litMatcher{ - pos: position{line: 280, col: 5, offset: 7108}, + pos: position{line: 280, col: 5, offset: 7111}, val: "Natural/show", ignoreCase: false, want: "\"Natural/show\"", }, }, &actionExpr{ - pos: position{line: 281, col: 5, offset: 7155}, + pos: position{line: 281, col: 5, offset: 7158}, run: (*parser).callonIdentifier17, expr: &litMatcher{ - pos: position{line: 281, col: 5, offset: 7155}, + pos: position{line: 281, col: 5, offset: 7158}, val: "Integer/toDouble", ignoreCase: false, want: "\"Integer/toDouble\"", }, }, &actionExpr{ - pos: position{line: 282, col: 5, offset: 7210}, + pos: position{line: 282, col: 5, offset: 7213}, run: (*parser).callonIdentifier19, expr: &litMatcher{ - pos: position{line: 282, col: 5, offset: 7210}, + pos: position{line: 282, col: 5, offset: 7213}, val: "Integer/show", ignoreCase: false, want: "\"Integer/show\"", }, }, &actionExpr{ - pos: position{line: 283, col: 5, offset: 7257}, + pos: position{line: 283, col: 5, offset: 7260}, run: (*parser).callonIdentifier21, expr: &litMatcher{ - pos: position{line: 283, col: 5, offset: 7257}, + pos: position{line: 283, col: 5, offset: 7260}, val: "Integer/negate", ignoreCase: false, want: "\"Integer/negate\"", }, }, &actionExpr{ - pos: position{line: 284, col: 5, offset: 7308}, + pos: position{line: 284, col: 5, offset: 7311}, run: (*parser).callonIdentifier23, expr: &litMatcher{ - pos: position{line: 284, col: 5, offset: 7308}, + pos: position{line: 284, col: 5, offset: 7311}, val: "Integer/clamp", ignoreCase: false, want: "\"Integer/clamp\"", }, }, &actionExpr{ - pos: position{line: 285, col: 5, offset: 7357}, + pos: position{line: 285, col: 5, offset: 7360}, run: (*parser).callonIdentifier25, expr: &litMatcher{ - pos: position{line: 285, col: 5, offset: 7357}, + pos: position{line: 285, col: 5, offset: 7360}, val: "Natural/subtract", ignoreCase: false, want: "\"Natural/subtract\"", }, }, &actionExpr{ - pos: position{line: 286, col: 5, offset: 7412}, + pos: position{line: 286, col: 5, offset: 7415}, run: (*parser).callonIdentifier27, expr: &litMatcher{ - pos: position{line: 286, col: 5, offset: 7412}, + pos: position{line: 286, col: 5, offset: 7415}, val: "Double/show", ignoreCase: false, want: "\"Double/show\"", }, }, &actionExpr{ - pos: position{line: 287, col: 5, offset: 7457}, + pos: position{line: 287, col: 5, offset: 7460}, run: (*parser).callonIdentifier29, expr: &litMatcher{ - pos: position{line: 287, col: 5, offset: 7457}, + pos: position{line: 287, col: 5, offset: 7460}, val: "List/build", ignoreCase: false, want: "\"List/build\"", }, }, &actionExpr{ - pos: position{line: 288, col: 5, offset: 7500}, + pos: position{line: 288, col: 5, offset: 7503}, run: (*parser).callonIdentifier31, expr: &litMatcher{ - pos: position{line: 288, col: 5, offset: 7500}, + pos: position{line: 288, col: 5, offset: 7503}, val: "List/fold", ignoreCase: false, want: "\"List/fold\"", }, }, &actionExpr{ - pos: position{line: 289, col: 5, offset: 7541}, + pos: position{line: 289, col: 5, offset: 7544}, run: (*parser).callonIdentifier33, expr: &litMatcher{ - pos: position{line: 289, col: 5, offset: 7541}, + pos: position{line: 289, col: 5, offset: 7544}, val: "List/length", ignoreCase: false, want: "\"List/length\"", }, }, &actionExpr{ - pos: position{line: 290, col: 5, offset: 7586}, + pos: position{line: 290, col: 5, offset: 7589}, run: (*parser).callonIdentifier35, expr: &litMatcher{ - pos: position{line: 290, col: 5, offset: 7586}, + pos: position{line: 290, col: 5, offset: 7589}, val: "List/head", ignoreCase: false, want: "\"List/head\"", }, }, &actionExpr{ - pos: position{line: 291, col: 5, offset: 7627}, + pos: position{line: 291, col: 5, offset: 7630}, run: (*parser).callonIdentifier37, expr: &litMatcher{ - pos: position{line: 291, col: 5, offset: 7627}, + pos: position{line: 291, col: 5, offset: 7630}, val: "List/last", ignoreCase: false, want: "\"List/last\"", }, }, &actionExpr{ - pos: position{line: 292, col: 5, offset: 7668}, + pos: position{line: 292, col: 5, offset: 7671}, run: (*parser).callonIdentifier39, expr: &litMatcher{ - pos: position{line: 292, col: 5, offset: 7668}, + pos: position{line: 292, col: 5, offset: 7671}, val: "List/indexed", ignoreCase: false, want: "\"List/indexed\"", }, }, &actionExpr{ - pos: position{line: 293, col: 5, offset: 7715}, + pos: position{line: 293, col: 5, offset: 7718}, run: (*parser).callonIdentifier41, expr: &litMatcher{ - pos: position{line: 293, col: 5, offset: 7715}, + pos: position{line: 293, col: 5, offset: 7718}, val: "List/reverse", ignoreCase: false, want: "\"List/reverse\"", }, }, &actionExpr{ - pos: position{line: 294, col: 5, offset: 7762}, + pos: position{line: 294, col: 5, offset: 7765}, run: (*parser).callonIdentifier43, expr: &litMatcher{ - pos: position{line: 294, col: 5, offset: 7762}, + pos: position{line: 294, col: 5, offset: 7765}, val: "Optional/fold", ignoreCase: false, want: "\"Optional/fold\"", }, }, &actionExpr{ - pos: position{line: 295, col: 5, offset: 7811}, + pos: position{line: 295, col: 5, offset: 7814}, run: (*parser).callonIdentifier45, expr: &litMatcher{ - pos: position{line: 295, col: 5, offset: 7811}, + pos: position{line: 295, col: 5, offset: 7814}, val: "Optional/build", ignoreCase: false, want: "\"Optional/build\"", }, }, &actionExpr{ - pos: position{line: 296, col: 5, offset: 7862}, + pos: position{line: 296, col: 5, offset: 7865}, run: (*parser).callonIdentifier47, expr: &litMatcher{ - pos: position{line: 296, col: 5, offset: 7862}, + pos: position{line: 296, col: 5, offset: 7865}, val: "Text/show", ignoreCase: false, want: "\"Text/show\"", }, }, &actionExpr{ - pos: position{line: 297, col: 5, offset: 7903}, + pos: position{line: 297, col: 5, offset: 7906}, run: (*parser).callonIdentifier49, expr: &litMatcher{ - pos: position{line: 297, col: 5, offset: 7903}, + pos: position{line: 297, col: 5, offset: 7906}, val: "Bool", ignoreCase: false, want: "\"Bool\"", }, }, &actionExpr{ - pos: position{line: 298, col: 5, offset: 7935}, + pos: position{line: 298, col: 5, offset: 7938}, run: (*parser).callonIdentifier51, expr: &litMatcher{ - pos: position{line: 298, col: 5, offset: 7935}, + pos: position{line: 298, col: 5, offset: 7938}, val: "True", ignoreCase: false, want: "\"True\"", }, }, &actionExpr{ - pos: position{line: 299, col: 5, offset: 7967}, + pos: position{line: 299, col: 5, offset: 7970}, run: (*parser).callonIdentifier53, expr: &litMatcher{ - pos: position{line: 299, col: 5, offset: 7967}, + pos: position{line: 299, col: 5, offset: 7970}, val: "False", ignoreCase: false, want: "\"False\"", }, }, &actionExpr{ - pos: position{line: 300, col: 5, offset: 8001}, + pos: position{line: 300, col: 5, offset: 8004}, run: (*parser).callonIdentifier55, expr: &litMatcher{ - pos: position{line: 300, col: 5, offset: 8001}, + pos: position{line: 300, col: 5, offset: 8004}, val: "Optional", ignoreCase: false, want: "\"Optional\"", }, }, &actionExpr{ - pos: position{line: 301, col: 5, offset: 8041}, + pos: position{line: 301, col: 5, offset: 8044}, run: (*parser).callonIdentifier57, expr: &litMatcher{ - pos: position{line: 301, col: 5, offset: 8041}, + pos: position{line: 301, col: 5, offset: 8044}, val: "None", ignoreCase: false, want: "\"None\"", }, }, &actionExpr{ - pos: position{line: 302, col: 5, offset: 8073}, + pos: position{line: 302, col: 5, offset: 8076}, run: (*parser).callonIdentifier59, expr: &litMatcher{ - pos: position{line: 302, col: 5, offset: 8073}, + pos: position{line: 302, col: 5, offset: 8076}, val: "Natural", ignoreCase: false, want: "\"Natural\"", }, }, &actionExpr{ - pos: position{line: 303, col: 5, offset: 8111}, + pos: position{line: 303, col: 5, offset: 8114}, run: (*parser).callonIdentifier61, expr: &litMatcher{ - pos: position{line: 303, col: 5, offset: 8111}, + pos: position{line: 303, col: 5, offset: 8114}, val: "Integer", ignoreCase: false, want: "\"Integer\"", }, }, &actionExpr{ - pos: position{line: 304, col: 5, offset: 8149}, + pos: position{line: 304, col: 5, offset: 8152}, run: (*parser).callonIdentifier63, expr: &litMatcher{ - pos: position{line: 304, col: 5, offset: 8149}, + pos: position{line: 304, col: 5, offset: 8152}, val: "Double", ignoreCase: false, want: "\"Double\"", }, }, &actionExpr{ - pos: position{line: 305, col: 5, offset: 8185}, + pos: position{line: 305, col: 5, offset: 8188}, run: (*parser).callonIdentifier65, expr: &litMatcher{ - pos: position{line: 305, col: 5, offset: 8185}, + pos: position{line: 305, col: 5, offset: 8188}, val: "Text", ignoreCase: false, want: "\"Text\"", }, }, &actionExpr{ - pos: position{line: 306, col: 5, offset: 8217}, + pos: position{line: 306, col: 5, offset: 8220}, run: (*parser).callonIdentifier67, expr: &litMatcher{ - pos: position{line: 306, col: 5, offset: 8217}, + pos: position{line: 306, col: 5, offset: 8220}, val: "List", ignoreCase: false, want: "\"List\"", }, }, &actionExpr{ - pos: position{line: 307, col: 5, offset: 8249}, + pos: position{line: 307, col: 5, offset: 8252}, run: (*parser).callonIdentifier69, expr: &litMatcher{ - pos: position{line: 307, col: 5, offset: 8249}, + pos: position{line: 307, col: 5, offset: 8252}, val: "Type", ignoreCase: false, want: "\"Type\"", }, }, &actionExpr{ - pos: position{line: 308, col: 5, offset: 8281}, + pos: position{line: 308, col: 5, offset: 8284}, run: (*parser).callonIdentifier71, expr: &litMatcher{ - pos: position{line: 308, col: 5, offset: 8281}, + pos: position{line: 308, col: 5, offset: 8284}, val: "Kind", ignoreCase: false, want: "\"Kind\"", }, }, &actionExpr{ - pos: position{line: 309, col: 5, offset: 8313}, + pos: position{line: 309, col: 5, offset: 8316}, run: (*parser).callonIdentifier73, expr: &litMatcher{ - pos: position{line: 309, col: 5, offset: 8313}, + pos: position{line: 309, col: 5, offset: 8316}, val: "Sort", ignoreCase: false, want: "\"Sort\"", @@ -1150,62 +1150,62 @@ var g = &grammar{ }, { name: "DeBruijn", - pos: position{line: 353, col: 1, offset: 9543}, + pos: position{line: 353, col: 1, offset: 9546}, expr: &actionExpr{ - pos: position{line: 353, col: 12, offset: 9556}, + pos: position{line: 353, col: 12, offset: 9559}, run: (*parser).callonDeBruijn1, expr: &seqExpr{ - pos: position{line: 353, col: 12, offset: 9556}, + pos: position{line: 353, col: 12, offset: 9559}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 353, col: 12, offset: 9556}, + pos: position{line: 353, col: 12, offset: 9559}, name: "_", }, &litMatcher{ - pos: position{line: 353, col: 14, offset: 9558}, + pos: position{line: 353, col: 14, offset: 9561}, val: "@", ignoreCase: false, want: "\"@\"", }, &ruleRefExpr{ - pos: position{line: 353, col: 18, offset: 9562}, + pos: position{line: 353, col: 18, offset: 9565}, name: "_", }, &labeledExpr{ - pos: position{line: 353, col: 20, offset: 9564}, + pos: position{line: 353, col: 20, offset: 9567}, label: "index", expr: &choiceExpr{ - pos: position{line: 339, col: 3, offset: 9067}, + pos: position{line: 339, col: 3, offset: 9070}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 339, col: 3, offset: 9067}, + pos: position{line: 339, col: 3, offset: 9070}, run: (*parser).callonDeBruijn8, expr: &choiceExpr{ - pos: position{line: 339, col: 4, offset: 9068}, + pos: position{line: 339, col: 4, offset: 9071}, alternatives: []interface{}{ &seqExpr{ - pos: position{line: 339, col: 4, offset: 9068}, + pos: position{line: 339, col: 4, offset: 9071}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 339, col: 4, offset: 9068}, + pos: position{line: 339, col: 4, offset: 9071}, val: "0x", ignoreCase: false, want: "\"0x\"", }, &oneOrMoreExpr{ - pos: position{line: 339, col: 9, offset: 9073}, + pos: position{line: 339, col: 9, offset: 9076}, expr: &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -1217,19 +1217,19 @@ var g = &grammar{ }, }, &seqExpr{ - pos: position{line: 339, col: 19, offset: 9083}, + pos: position{line: 339, col: 19, offset: 9086}, exprs: []interface{}{ &charClassMatcher{ - pos: position{line: 339, col: 19, offset: 9083}, + pos: position{line: 339, col: 19, offset: 9086}, val: "[1-9]", ranges: []rune{'1', '9'}, ignoreCase: false, inverted: false, }, &zeroOrMoreExpr{ - pos: position{line: 339, col: 25, offset: 9089}, + pos: position{line: 339, col: 25, offset: 9092}, expr: &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -1242,21 +1242,21 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 344, col: 5, offset: 9225}, + pos: position{line: 344, col: 5, offset: 9228}, run: (*parser).callonDeBruijn20, expr: &seqExpr{ - pos: position{line: 344, col: 5, offset: 9225}, + pos: position{line: 344, col: 5, offset: 9228}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 344, col: 5, offset: 9225}, + pos: position{line: 344, col: 5, offset: 9228}, val: "0", ignoreCase: false, want: "\"0\"", }, &oneOrMoreExpr{ - pos: position{line: 344, col: 9, offset: 9229}, + pos: position{line: 344, col: 9, offset: 9232}, expr: &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -1267,10 +1267,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 345, col: 5, offset: 9314}, + pos: position{line: 345, col: 5, offset: 9317}, run: (*parser).callonDeBruijn25, expr: &litMatcher{ - pos: position{line: 345, col: 5, offset: 9314}, + pos: position{line: 345, col: 5, offset: 9317}, val: "0", ignoreCase: false, want: "\"0\"", @@ -1285,388 +1285,388 @@ var g = &grammar{ }, { name: "Variable", - pos: position{line: 355, col: 1, offset: 9626}, + pos: position{line: 355, col: 1, offset: 9629}, expr: &actionExpr{ - pos: position{line: 355, col: 12, offset: 9639}, + pos: position{line: 355, col: 12, offset: 9642}, run: (*parser).callonVariable1, expr: &seqExpr{ - pos: position{line: 355, col: 12, offset: 9639}, + pos: position{line: 355, col: 12, offset: 9642}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 355, col: 12, offset: 9639}, + pos: position{line: 355, col: 12, offset: 9642}, label: "name", expr: &choiceExpr{ - pos: position{line: 149, col: 20, offset: 3633}, + pos: position{line: 149, col: 20, offset: 3636}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 149, col: 20, offset: 3633}, + pos: position{line: 149, col: 20, offset: 3636}, run: (*parser).callonVariable5, expr: &seqExpr{ - pos: position{line: 149, col: 20, offset: 3633}, + pos: position{line: 149, col: 20, offset: 3636}, exprs: []interface{}{ &andExpr{ - pos: position{line: 149, col: 20, offset: 3633}, + pos: position{line: 149, col: 20, offset: 3636}, expr: &seqExpr{ - pos: position{line: 149, col: 22, offset: 3635}, + pos: position{line: 149, col: 22, offset: 3638}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, run: (*parser).callonVariable10, expr: &litMatcher{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, val: "Natural/fold", ignoreCase: false, want: "\"Natural/fold\"", }, }, &actionExpr{ - pos: position{line: 275, col: 5, offset: 6859}, + pos: position{line: 275, col: 5, offset: 6862}, run: (*parser).callonVariable12, expr: &litMatcher{ - pos: position{line: 275, col: 5, offset: 6859}, + pos: position{line: 275, col: 5, offset: 6862}, val: "Natural/build", ignoreCase: false, want: "\"Natural/build\"", }, }, &actionExpr{ - pos: position{line: 276, col: 5, offset: 6908}, + pos: position{line: 276, col: 5, offset: 6911}, run: (*parser).callonVariable14, expr: &litMatcher{ - pos: position{line: 276, col: 5, offset: 6908}, + pos: position{line: 276, col: 5, offset: 6911}, val: "Natural/isZero", ignoreCase: false, want: "\"Natural/isZero\"", }, }, &actionExpr{ - pos: position{line: 277, col: 5, offset: 6959}, + pos: position{line: 277, col: 5, offset: 6962}, run: (*parser).callonVariable16, expr: &litMatcher{ - pos: position{line: 277, col: 5, offset: 6959}, + pos: position{line: 277, col: 5, offset: 6962}, val: "Natural/even", ignoreCase: false, want: "\"Natural/even\"", }, }, &actionExpr{ - pos: position{line: 278, col: 5, offset: 7006}, + pos: position{line: 278, col: 5, offset: 7009}, run: (*parser).callonVariable18, expr: &litMatcher{ - pos: position{line: 278, col: 5, offset: 7006}, + pos: position{line: 278, col: 5, offset: 7009}, val: "Natural/odd", ignoreCase: false, want: "\"Natural/odd\"", }, }, &actionExpr{ - pos: position{line: 279, col: 5, offset: 7051}, + pos: position{line: 279, col: 5, offset: 7054}, run: (*parser).callonVariable20, expr: &litMatcher{ - pos: position{line: 279, col: 5, offset: 7051}, + pos: position{line: 279, col: 5, offset: 7054}, val: "Natural/toInteger", ignoreCase: false, want: "\"Natural/toInteger\"", }, }, &actionExpr{ - pos: position{line: 280, col: 5, offset: 7108}, + pos: position{line: 280, col: 5, offset: 7111}, run: (*parser).callonVariable22, expr: &litMatcher{ - pos: position{line: 280, col: 5, offset: 7108}, + pos: position{line: 280, col: 5, offset: 7111}, val: "Natural/show", ignoreCase: false, want: "\"Natural/show\"", }, }, &actionExpr{ - pos: position{line: 281, col: 5, offset: 7155}, + pos: position{line: 281, col: 5, offset: 7158}, run: (*parser).callonVariable24, expr: &litMatcher{ - pos: position{line: 281, col: 5, offset: 7155}, + pos: position{line: 281, col: 5, offset: 7158}, val: "Integer/toDouble", ignoreCase: false, want: "\"Integer/toDouble\"", }, }, &actionExpr{ - pos: position{line: 282, col: 5, offset: 7210}, + pos: position{line: 282, col: 5, offset: 7213}, run: (*parser).callonVariable26, expr: &litMatcher{ - pos: position{line: 282, col: 5, offset: 7210}, + pos: position{line: 282, col: 5, offset: 7213}, val: "Integer/show", ignoreCase: false, want: "\"Integer/show\"", }, }, &actionExpr{ - pos: position{line: 283, col: 5, offset: 7257}, + pos: position{line: 283, col: 5, offset: 7260}, run: (*parser).callonVariable28, expr: &litMatcher{ - pos: position{line: 283, col: 5, offset: 7257}, + pos: position{line: 283, col: 5, offset: 7260}, val: "Integer/negate", ignoreCase: false, want: "\"Integer/negate\"", }, }, &actionExpr{ - pos: position{line: 284, col: 5, offset: 7308}, + pos: position{line: 284, col: 5, offset: 7311}, run: (*parser).callonVariable30, expr: &litMatcher{ - pos: position{line: 284, col: 5, offset: 7308}, + pos: position{line: 284, col: 5, offset: 7311}, val: "Integer/clamp", ignoreCase: false, want: "\"Integer/clamp\"", }, }, &actionExpr{ - pos: position{line: 285, col: 5, offset: 7357}, + pos: position{line: 285, col: 5, offset: 7360}, run: (*parser).callonVariable32, expr: &litMatcher{ - pos: position{line: 285, col: 5, offset: 7357}, + pos: position{line: 285, col: 5, offset: 7360}, val: "Natural/subtract", ignoreCase: false, want: "\"Natural/subtract\"", }, }, &actionExpr{ - pos: position{line: 286, col: 5, offset: 7412}, + pos: position{line: 286, col: 5, offset: 7415}, run: (*parser).callonVariable34, expr: &litMatcher{ - pos: position{line: 286, col: 5, offset: 7412}, + pos: position{line: 286, col: 5, offset: 7415}, val: "Double/show", ignoreCase: false, want: "\"Double/show\"", }, }, &actionExpr{ - pos: position{line: 287, col: 5, offset: 7457}, + pos: position{line: 287, col: 5, offset: 7460}, run: (*parser).callonVariable36, expr: &litMatcher{ - pos: position{line: 287, col: 5, offset: 7457}, + pos: position{line: 287, col: 5, offset: 7460}, val: "List/build", ignoreCase: false, want: "\"List/build\"", }, }, &actionExpr{ - pos: position{line: 288, col: 5, offset: 7500}, + pos: position{line: 288, col: 5, offset: 7503}, run: (*parser).callonVariable38, expr: &litMatcher{ - pos: position{line: 288, col: 5, offset: 7500}, + pos: position{line: 288, col: 5, offset: 7503}, val: "List/fold", ignoreCase: false, want: "\"List/fold\"", }, }, &actionExpr{ - pos: position{line: 289, col: 5, offset: 7541}, + pos: position{line: 289, col: 5, offset: 7544}, run: (*parser).callonVariable40, expr: &litMatcher{ - pos: position{line: 289, col: 5, offset: 7541}, + pos: position{line: 289, col: 5, offset: 7544}, val: "List/length", ignoreCase: false, want: "\"List/length\"", }, }, &actionExpr{ - pos: position{line: 290, col: 5, offset: 7586}, + pos: position{line: 290, col: 5, offset: 7589}, run: (*parser).callonVariable42, expr: &litMatcher{ - pos: position{line: 290, col: 5, offset: 7586}, + pos: position{line: 290, col: 5, offset: 7589}, val: "List/head", ignoreCase: false, want: "\"List/head\"", }, }, &actionExpr{ - pos: position{line: 291, col: 5, offset: 7627}, + pos: position{line: 291, col: 5, offset: 7630}, run: (*parser).callonVariable44, expr: &litMatcher{ - pos: position{line: 291, col: 5, offset: 7627}, + pos: position{line: 291, col: 5, offset: 7630}, val: "List/last", ignoreCase: false, want: "\"List/last\"", }, }, &actionExpr{ - pos: position{line: 292, col: 5, offset: 7668}, + pos: position{line: 292, col: 5, offset: 7671}, run: (*parser).callonVariable46, expr: &litMatcher{ - pos: position{line: 292, col: 5, offset: 7668}, + pos: position{line: 292, col: 5, offset: 7671}, val: "List/indexed", ignoreCase: false, want: "\"List/indexed\"", }, }, &actionExpr{ - pos: position{line: 293, col: 5, offset: 7715}, + pos: position{line: 293, col: 5, offset: 7718}, run: (*parser).callonVariable48, expr: &litMatcher{ - pos: position{line: 293, col: 5, offset: 7715}, + pos: position{line: 293, col: 5, offset: 7718}, val: "List/reverse", ignoreCase: false, want: "\"List/reverse\"", }, }, &actionExpr{ - pos: position{line: 294, col: 5, offset: 7762}, + pos: position{line: 294, col: 5, offset: 7765}, run: (*parser).callonVariable50, expr: &litMatcher{ - pos: position{line: 294, col: 5, offset: 7762}, + pos: position{line: 294, col: 5, offset: 7765}, val: "Optional/fold", ignoreCase: false, want: "\"Optional/fold\"", }, }, &actionExpr{ - pos: position{line: 295, col: 5, offset: 7811}, + pos: position{line: 295, col: 5, offset: 7814}, run: (*parser).callonVariable52, expr: &litMatcher{ - pos: position{line: 295, col: 5, offset: 7811}, + pos: position{line: 295, col: 5, offset: 7814}, val: "Optional/build", ignoreCase: false, want: "\"Optional/build\"", }, }, &actionExpr{ - pos: position{line: 296, col: 5, offset: 7862}, + pos: position{line: 296, col: 5, offset: 7865}, run: (*parser).callonVariable54, expr: &litMatcher{ - pos: position{line: 296, col: 5, offset: 7862}, + pos: position{line: 296, col: 5, offset: 7865}, val: "Text/show", ignoreCase: false, want: "\"Text/show\"", }, }, &actionExpr{ - pos: position{line: 297, col: 5, offset: 7903}, + pos: position{line: 297, col: 5, offset: 7906}, run: (*parser).callonVariable56, expr: &litMatcher{ - pos: position{line: 297, col: 5, offset: 7903}, + pos: position{line: 297, col: 5, offset: 7906}, val: "Bool", ignoreCase: false, want: "\"Bool\"", }, }, &actionExpr{ - pos: position{line: 298, col: 5, offset: 7935}, + pos: position{line: 298, col: 5, offset: 7938}, run: (*parser).callonVariable58, expr: &litMatcher{ - pos: position{line: 298, col: 5, offset: 7935}, + pos: position{line: 298, col: 5, offset: 7938}, val: "True", ignoreCase: false, want: "\"True\"", }, }, &actionExpr{ - pos: position{line: 299, col: 5, offset: 7967}, + pos: position{line: 299, col: 5, offset: 7970}, run: (*parser).callonVariable60, expr: &litMatcher{ - pos: position{line: 299, col: 5, offset: 7967}, + pos: position{line: 299, col: 5, offset: 7970}, val: "False", ignoreCase: false, want: "\"False\"", }, }, &actionExpr{ - pos: position{line: 300, col: 5, offset: 8001}, + pos: position{line: 300, col: 5, offset: 8004}, run: (*parser).callonVariable62, expr: &litMatcher{ - pos: position{line: 300, col: 5, offset: 8001}, + pos: position{line: 300, col: 5, offset: 8004}, val: "Optional", ignoreCase: false, want: "\"Optional\"", }, }, &actionExpr{ - pos: position{line: 301, col: 5, offset: 8041}, + pos: position{line: 301, col: 5, offset: 8044}, run: (*parser).callonVariable64, expr: &litMatcher{ - pos: position{line: 301, col: 5, offset: 8041}, + pos: position{line: 301, col: 5, offset: 8044}, val: "None", ignoreCase: false, want: "\"None\"", }, }, &actionExpr{ - pos: position{line: 302, col: 5, offset: 8073}, + pos: position{line: 302, col: 5, offset: 8076}, run: (*parser).callonVariable66, expr: &litMatcher{ - pos: position{line: 302, col: 5, offset: 8073}, + pos: position{line: 302, col: 5, offset: 8076}, val: "Natural", ignoreCase: false, want: "\"Natural\"", }, }, &actionExpr{ - pos: position{line: 303, col: 5, offset: 8111}, + pos: position{line: 303, col: 5, offset: 8114}, run: (*parser).callonVariable68, expr: &litMatcher{ - pos: position{line: 303, col: 5, offset: 8111}, + pos: position{line: 303, col: 5, offset: 8114}, val: "Integer", ignoreCase: false, want: "\"Integer\"", }, }, &actionExpr{ - pos: position{line: 304, col: 5, offset: 8149}, + pos: position{line: 304, col: 5, offset: 8152}, run: (*parser).callonVariable70, expr: &litMatcher{ - pos: position{line: 304, col: 5, offset: 8149}, + pos: position{line: 304, col: 5, offset: 8152}, val: "Double", ignoreCase: false, want: "\"Double\"", }, }, &actionExpr{ - pos: position{line: 305, col: 5, offset: 8185}, + pos: position{line: 305, col: 5, offset: 8188}, run: (*parser).callonVariable72, expr: &litMatcher{ - pos: position{line: 305, col: 5, offset: 8185}, + pos: position{line: 305, col: 5, offset: 8188}, val: "Text", ignoreCase: false, want: "\"Text\"", }, }, &actionExpr{ - pos: position{line: 306, col: 5, offset: 8217}, + pos: position{line: 306, col: 5, offset: 8220}, run: (*parser).callonVariable74, expr: &litMatcher{ - pos: position{line: 306, col: 5, offset: 8217}, + pos: position{line: 306, col: 5, offset: 8220}, val: "List", ignoreCase: false, want: "\"List\"", }, }, &actionExpr{ - pos: position{line: 307, col: 5, offset: 8249}, + pos: position{line: 307, col: 5, offset: 8252}, run: (*parser).callonVariable76, expr: &litMatcher{ - pos: position{line: 307, col: 5, offset: 8249}, + pos: position{line: 307, col: 5, offset: 8252}, val: "Type", ignoreCase: false, want: "\"Type\"", }, }, &actionExpr{ - pos: position{line: 308, col: 5, offset: 8281}, + pos: position{line: 308, col: 5, offset: 8284}, run: (*parser).callonVariable78, expr: &litMatcher{ - pos: position{line: 308, col: 5, offset: 8281}, + pos: position{line: 308, col: 5, offset: 8284}, val: "Kind", ignoreCase: false, want: "\"Kind\"", }, }, &actionExpr{ - pos: position{line: 309, col: 5, offset: 8313}, + pos: position{line: 309, col: 5, offset: 8316}, run: (*parser).callonVariable80, expr: &litMatcher{ - pos: position{line: 309, col: 5, offset: 8313}, + pos: position{line: 309, col: 5, offset: 8316}, val: "Sort", ignoreCase: false, want: "\"Sort\"", @@ -1675,7 +1675,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -1686,33 +1686,33 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 149, col: 51, offset: 3664}, + pos: position{line: 149, col: 51, offset: 3667}, label: "label", expr: &choiceExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, run: (*parser).callonVariable85, expr: &seqExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, val: "`", ignoreCase: false, want: "\"`\"", }, &labeledExpr{ - pos: position{line: 146, col: 13, offset: 3519}, + pos: position{line: 146, col: 13, offset: 3522}, label: "label", expr: &actionExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, run: (*parser).callonVariable89, expr: &oneOrMoreExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, expr: &charClassMatcher{ - pos: position{line: 143, col: 19, offset: 3419}, + pos: position{line: 143, col: 19, offset: 3422}, val: "[ -_a-~]", ranges: []rune{' ', '_', 'a', '~'}, ignoreCase: false, @@ -1722,7 +1722,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 146, col: 31, offset: 3537}, + pos: position{line: 146, col: 31, offset: 3540}, val: "`", ignoreCase: false, want: "\"`\"", @@ -1731,75 +1731,75 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, run: (*parser).callonVariable93, expr: &labeledExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, label: "label", expr: &choiceExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, run: (*parser).callonVariable96, expr: &seqExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonVariable105, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -1811,61 +1811,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -1873,9 +1873,9 @@ var g = &grammar{ }, }, &oneOrMoreExpr{ - pos: position{line: 137, col: 23, offset: 3220}, + pos: position{line: 137, col: 23, offset: 3223}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -1887,68 +1887,68 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, run: (*parser).callonVariable122, expr: &seqExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, exprs: []interface{}{ ¬Expr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, expr: &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonVariable132, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -1960,61 +1960,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -2023,7 +2023,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 135, col: 24, offset: 3147}, + pos: position{line: 135, col: 24, offset: 3150}, val: "[_A-Za-z]", chars: []rune{'_'}, ranges: []rune{'A', 'Z', 'a', 'z'}, @@ -2031,9 +2031,9 @@ var g = &grammar{ inverted: false, }, &zeroOrMoreExpr{ - pos: position{line: 138, col: 43, offset: 3314}, + pos: position{line: 138, col: 43, offset: 3317}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -2055,371 +2055,371 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 150, col: 19, offset: 3716}, + pos: position{line: 150, col: 19, offset: 3719}, run: (*parser).callonVariable150, expr: &seqExpr{ - pos: position{line: 150, col: 19, offset: 3716}, + pos: position{line: 150, col: 19, offset: 3719}, exprs: []interface{}{ ¬Expr{ - pos: position{line: 150, col: 19, offset: 3716}, + pos: position{line: 150, col: 19, offset: 3719}, expr: &choiceExpr{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, run: (*parser).callonVariable154, expr: &litMatcher{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, val: "Natural/fold", ignoreCase: false, want: "\"Natural/fold\"", }, }, &actionExpr{ - pos: position{line: 275, col: 5, offset: 6859}, + pos: position{line: 275, col: 5, offset: 6862}, run: (*parser).callonVariable156, expr: &litMatcher{ - pos: position{line: 275, col: 5, offset: 6859}, + pos: position{line: 275, col: 5, offset: 6862}, val: "Natural/build", ignoreCase: false, want: "\"Natural/build\"", }, }, &actionExpr{ - pos: position{line: 276, col: 5, offset: 6908}, + pos: position{line: 276, col: 5, offset: 6911}, run: (*parser).callonVariable158, expr: &litMatcher{ - pos: position{line: 276, col: 5, offset: 6908}, + pos: position{line: 276, col: 5, offset: 6911}, val: "Natural/isZero", ignoreCase: false, want: "\"Natural/isZero\"", }, }, &actionExpr{ - pos: position{line: 277, col: 5, offset: 6959}, + pos: position{line: 277, col: 5, offset: 6962}, run: (*parser).callonVariable160, expr: &litMatcher{ - pos: position{line: 277, col: 5, offset: 6959}, + pos: position{line: 277, col: 5, offset: 6962}, val: "Natural/even", ignoreCase: false, want: "\"Natural/even\"", }, }, &actionExpr{ - pos: position{line: 278, col: 5, offset: 7006}, + pos: position{line: 278, col: 5, offset: 7009}, run: (*parser).callonVariable162, expr: &litMatcher{ - pos: position{line: 278, col: 5, offset: 7006}, + pos: position{line: 278, col: 5, offset: 7009}, val: "Natural/odd", ignoreCase: false, want: "\"Natural/odd\"", }, }, &actionExpr{ - pos: position{line: 279, col: 5, offset: 7051}, + pos: position{line: 279, col: 5, offset: 7054}, run: (*parser).callonVariable164, expr: &litMatcher{ - pos: position{line: 279, col: 5, offset: 7051}, + pos: position{line: 279, col: 5, offset: 7054}, val: "Natural/toInteger", ignoreCase: false, want: "\"Natural/toInteger\"", }, }, &actionExpr{ - pos: position{line: 280, col: 5, offset: 7108}, + pos: position{line: 280, col: 5, offset: 7111}, run: (*parser).callonVariable166, expr: &litMatcher{ - pos: position{line: 280, col: 5, offset: 7108}, + pos: position{line: 280, col: 5, offset: 7111}, val: "Natural/show", ignoreCase: false, want: "\"Natural/show\"", }, }, &actionExpr{ - pos: position{line: 281, col: 5, offset: 7155}, + pos: position{line: 281, col: 5, offset: 7158}, run: (*parser).callonVariable168, expr: &litMatcher{ - pos: position{line: 281, col: 5, offset: 7155}, + pos: position{line: 281, col: 5, offset: 7158}, val: "Integer/toDouble", ignoreCase: false, want: "\"Integer/toDouble\"", }, }, &actionExpr{ - pos: position{line: 282, col: 5, offset: 7210}, + pos: position{line: 282, col: 5, offset: 7213}, run: (*parser).callonVariable170, expr: &litMatcher{ - pos: position{line: 282, col: 5, offset: 7210}, + pos: position{line: 282, col: 5, offset: 7213}, val: "Integer/show", ignoreCase: false, want: "\"Integer/show\"", }, }, &actionExpr{ - pos: position{line: 283, col: 5, offset: 7257}, + pos: position{line: 283, col: 5, offset: 7260}, run: (*parser).callonVariable172, expr: &litMatcher{ - pos: position{line: 283, col: 5, offset: 7257}, + pos: position{line: 283, col: 5, offset: 7260}, val: "Integer/negate", ignoreCase: false, want: "\"Integer/negate\"", }, }, &actionExpr{ - pos: position{line: 284, col: 5, offset: 7308}, + pos: position{line: 284, col: 5, offset: 7311}, run: (*parser).callonVariable174, expr: &litMatcher{ - pos: position{line: 284, col: 5, offset: 7308}, + pos: position{line: 284, col: 5, offset: 7311}, val: "Integer/clamp", ignoreCase: false, want: "\"Integer/clamp\"", }, }, &actionExpr{ - pos: position{line: 285, col: 5, offset: 7357}, + pos: position{line: 285, col: 5, offset: 7360}, run: (*parser).callonVariable176, expr: &litMatcher{ - pos: position{line: 285, col: 5, offset: 7357}, + pos: position{line: 285, col: 5, offset: 7360}, val: "Natural/subtract", ignoreCase: false, want: "\"Natural/subtract\"", }, }, &actionExpr{ - pos: position{line: 286, col: 5, offset: 7412}, + pos: position{line: 286, col: 5, offset: 7415}, run: (*parser).callonVariable178, expr: &litMatcher{ - pos: position{line: 286, col: 5, offset: 7412}, + pos: position{line: 286, col: 5, offset: 7415}, val: "Double/show", ignoreCase: false, want: "\"Double/show\"", }, }, &actionExpr{ - pos: position{line: 287, col: 5, offset: 7457}, + pos: position{line: 287, col: 5, offset: 7460}, run: (*parser).callonVariable180, expr: &litMatcher{ - pos: position{line: 287, col: 5, offset: 7457}, + pos: position{line: 287, col: 5, offset: 7460}, val: "List/build", ignoreCase: false, want: "\"List/build\"", }, }, &actionExpr{ - pos: position{line: 288, col: 5, offset: 7500}, + pos: position{line: 288, col: 5, offset: 7503}, run: (*parser).callonVariable182, expr: &litMatcher{ - pos: position{line: 288, col: 5, offset: 7500}, + pos: position{line: 288, col: 5, offset: 7503}, val: "List/fold", ignoreCase: false, want: "\"List/fold\"", }, }, &actionExpr{ - pos: position{line: 289, col: 5, offset: 7541}, + pos: position{line: 289, col: 5, offset: 7544}, run: (*parser).callonVariable184, expr: &litMatcher{ - pos: position{line: 289, col: 5, offset: 7541}, + pos: position{line: 289, col: 5, offset: 7544}, val: "List/length", ignoreCase: false, want: "\"List/length\"", }, }, &actionExpr{ - pos: position{line: 290, col: 5, offset: 7586}, + pos: position{line: 290, col: 5, offset: 7589}, run: (*parser).callonVariable186, expr: &litMatcher{ - pos: position{line: 290, col: 5, offset: 7586}, + pos: position{line: 290, col: 5, offset: 7589}, val: "List/head", ignoreCase: false, want: "\"List/head\"", }, }, &actionExpr{ - pos: position{line: 291, col: 5, offset: 7627}, + pos: position{line: 291, col: 5, offset: 7630}, run: (*parser).callonVariable188, expr: &litMatcher{ - pos: position{line: 291, col: 5, offset: 7627}, + pos: position{line: 291, col: 5, offset: 7630}, val: "List/last", ignoreCase: false, want: "\"List/last\"", }, }, &actionExpr{ - pos: position{line: 292, col: 5, offset: 7668}, + pos: position{line: 292, col: 5, offset: 7671}, run: (*parser).callonVariable190, expr: &litMatcher{ - pos: position{line: 292, col: 5, offset: 7668}, + pos: position{line: 292, col: 5, offset: 7671}, val: "List/indexed", ignoreCase: false, want: "\"List/indexed\"", }, }, &actionExpr{ - pos: position{line: 293, col: 5, offset: 7715}, + pos: position{line: 293, col: 5, offset: 7718}, run: (*parser).callonVariable192, expr: &litMatcher{ - pos: position{line: 293, col: 5, offset: 7715}, + pos: position{line: 293, col: 5, offset: 7718}, val: "List/reverse", ignoreCase: false, want: "\"List/reverse\"", }, }, &actionExpr{ - pos: position{line: 294, col: 5, offset: 7762}, + pos: position{line: 294, col: 5, offset: 7765}, run: (*parser).callonVariable194, expr: &litMatcher{ - pos: position{line: 294, col: 5, offset: 7762}, + pos: position{line: 294, col: 5, offset: 7765}, val: "Optional/fold", ignoreCase: false, want: "\"Optional/fold\"", }, }, &actionExpr{ - pos: position{line: 295, col: 5, offset: 7811}, + pos: position{line: 295, col: 5, offset: 7814}, run: (*parser).callonVariable196, expr: &litMatcher{ - pos: position{line: 295, col: 5, offset: 7811}, + pos: position{line: 295, col: 5, offset: 7814}, val: "Optional/build", ignoreCase: false, want: "\"Optional/build\"", }, }, &actionExpr{ - pos: position{line: 296, col: 5, offset: 7862}, + pos: position{line: 296, col: 5, offset: 7865}, run: (*parser).callonVariable198, expr: &litMatcher{ - pos: position{line: 296, col: 5, offset: 7862}, + pos: position{line: 296, col: 5, offset: 7865}, val: "Text/show", ignoreCase: false, want: "\"Text/show\"", }, }, &actionExpr{ - pos: position{line: 297, col: 5, offset: 7903}, + pos: position{line: 297, col: 5, offset: 7906}, run: (*parser).callonVariable200, expr: &litMatcher{ - pos: position{line: 297, col: 5, offset: 7903}, + pos: position{line: 297, col: 5, offset: 7906}, val: "Bool", ignoreCase: false, want: "\"Bool\"", }, }, &actionExpr{ - pos: position{line: 298, col: 5, offset: 7935}, + pos: position{line: 298, col: 5, offset: 7938}, run: (*parser).callonVariable202, expr: &litMatcher{ - pos: position{line: 298, col: 5, offset: 7935}, + pos: position{line: 298, col: 5, offset: 7938}, val: "True", ignoreCase: false, want: "\"True\"", }, }, &actionExpr{ - pos: position{line: 299, col: 5, offset: 7967}, + pos: position{line: 299, col: 5, offset: 7970}, run: (*parser).callonVariable204, expr: &litMatcher{ - pos: position{line: 299, col: 5, offset: 7967}, + pos: position{line: 299, col: 5, offset: 7970}, val: "False", ignoreCase: false, want: "\"False\"", }, }, &actionExpr{ - pos: position{line: 300, col: 5, offset: 8001}, + pos: position{line: 300, col: 5, offset: 8004}, run: (*parser).callonVariable206, expr: &litMatcher{ - pos: position{line: 300, col: 5, offset: 8001}, + pos: position{line: 300, col: 5, offset: 8004}, val: "Optional", ignoreCase: false, want: "\"Optional\"", }, }, &actionExpr{ - pos: position{line: 301, col: 5, offset: 8041}, + pos: position{line: 301, col: 5, offset: 8044}, run: (*parser).callonVariable208, expr: &litMatcher{ - pos: position{line: 301, col: 5, offset: 8041}, + pos: position{line: 301, col: 5, offset: 8044}, val: "None", ignoreCase: false, want: "\"None\"", }, }, &actionExpr{ - pos: position{line: 302, col: 5, offset: 8073}, + pos: position{line: 302, col: 5, offset: 8076}, run: (*parser).callonVariable210, expr: &litMatcher{ - pos: position{line: 302, col: 5, offset: 8073}, + pos: position{line: 302, col: 5, offset: 8076}, val: "Natural", ignoreCase: false, want: "\"Natural\"", }, }, &actionExpr{ - pos: position{line: 303, col: 5, offset: 8111}, + pos: position{line: 303, col: 5, offset: 8114}, run: (*parser).callonVariable212, expr: &litMatcher{ - pos: position{line: 303, col: 5, offset: 8111}, + pos: position{line: 303, col: 5, offset: 8114}, val: "Integer", ignoreCase: false, want: "\"Integer\"", }, }, &actionExpr{ - pos: position{line: 304, col: 5, offset: 8149}, + pos: position{line: 304, col: 5, offset: 8152}, run: (*parser).callonVariable214, expr: &litMatcher{ - pos: position{line: 304, col: 5, offset: 8149}, + pos: position{line: 304, col: 5, offset: 8152}, val: "Double", ignoreCase: false, want: "\"Double\"", }, }, &actionExpr{ - pos: position{line: 305, col: 5, offset: 8185}, + pos: position{line: 305, col: 5, offset: 8188}, run: (*parser).callonVariable216, expr: &litMatcher{ - pos: position{line: 305, col: 5, offset: 8185}, + pos: position{line: 305, col: 5, offset: 8188}, val: "Text", ignoreCase: false, want: "\"Text\"", }, }, &actionExpr{ - pos: position{line: 306, col: 5, offset: 8217}, + pos: position{line: 306, col: 5, offset: 8220}, run: (*parser).callonVariable218, expr: &litMatcher{ - pos: position{line: 306, col: 5, offset: 8217}, + pos: position{line: 306, col: 5, offset: 8220}, val: "List", ignoreCase: false, want: "\"List\"", }, }, &actionExpr{ - pos: position{line: 307, col: 5, offset: 8249}, + pos: position{line: 307, col: 5, offset: 8252}, run: (*parser).callonVariable220, expr: &litMatcher{ - pos: position{line: 307, col: 5, offset: 8249}, + pos: position{line: 307, col: 5, offset: 8252}, val: "Type", ignoreCase: false, want: "\"Type\"", }, }, &actionExpr{ - pos: position{line: 308, col: 5, offset: 8281}, + pos: position{line: 308, col: 5, offset: 8284}, run: (*parser).callonVariable222, expr: &litMatcher{ - pos: position{line: 308, col: 5, offset: 8281}, + pos: position{line: 308, col: 5, offset: 8284}, val: "Kind", ignoreCase: false, want: "\"Kind\"", }, }, &actionExpr{ - pos: position{line: 309, col: 5, offset: 8313}, + pos: position{line: 309, col: 5, offset: 8316}, run: (*parser).callonVariable224, expr: &litMatcher{ - pos: position{line: 309, col: 5, offset: 8313}, + pos: position{line: 309, col: 5, offset: 8316}, val: "Sort", ignoreCase: false, want: "\"Sort\"", @@ -2429,33 +2429,33 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 150, col: 28, offset: 3725}, + pos: position{line: 150, col: 28, offset: 3728}, label: "label", expr: &choiceExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, run: (*parser).callonVariable228, expr: &seqExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, val: "`", ignoreCase: false, want: "\"`\"", }, &labeledExpr{ - pos: position{line: 146, col: 13, offset: 3519}, + pos: position{line: 146, col: 13, offset: 3522}, label: "label", expr: &actionExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, run: (*parser).callonVariable232, expr: &oneOrMoreExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, expr: &charClassMatcher{ - pos: position{line: 143, col: 19, offset: 3419}, + pos: position{line: 143, col: 19, offset: 3422}, val: "[ -_a-~]", ranges: []rune{' ', '_', 'a', '~'}, ignoreCase: false, @@ -2465,7 +2465,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 146, col: 31, offset: 3537}, + pos: position{line: 146, col: 31, offset: 3540}, val: "`", ignoreCase: false, want: "\"`\"", @@ -2474,75 +2474,75 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, run: (*parser).callonVariable236, expr: &labeledExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, label: "label", expr: &choiceExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, run: (*parser).callonVariable239, expr: &seqExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonVariable248, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -2554,61 +2554,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -2616,9 +2616,9 @@ var g = &grammar{ }, }, &oneOrMoreExpr{ - pos: position{line: 137, col: 23, offset: 3220}, + pos: position{line: 137, col: 23, offset: 3223}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -2630,68 +2630,68 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, run: (*parser).callonVariable265, expr: &seqExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, exprs: []interface{}{ ¬Expr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, expr: &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonVariable275, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -2703,61 +2703,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -2766,7 +2766,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 135, col: 24, offset: 3147}, + pos: position{line: 135, col: 24, offset: 3150}, val: "[_A-Za-z]", chars: []rune{'_'}, ranges: []rune{'A', 'Z', 'a', 'z'}, @@ -2774,9 +2774,9 @@ var g = &grammar{ inverted: false, }, &zeroOrMoreExpr{ - pos: position{line: 138, col: 43, offset: 3314}, + pos: position{line: 138, col: 43, offset: 3317}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -2801,12 +2801,12 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 355, col: 34, offset: 9661}, + pos: position{line: 355, col: 34, offset: 9664}, label: "index", expr: &zeroOrOneExpr{ - pos: position{line: 355, col: 40, offset: 9667}, + pos: position{line: 355, col: 40, offset: 9670}, expr: &ruleRefExpr{ - pos: position{line: 355, col: 40, offset: 9667}, + pos: position{line: 355, col: 40, offset: 9670}, name: "DeBruijn", }, }, @@ -2817,55 +2817,55 @@ var g = &grammar{ }, { name: "Http", - pos: position{line: 439, col: 1, offset: 11867}, + pos: position{line: 439, col: 1, offset: 11870}, expr: &actionExpr{ - pos: position{line: 439, col: 8, offset: 11876}, + pos: position{line: 439, col: 8, offset: 11879}, run: (*parser).callonHttp1, expr: &seqExpr{ - pos: position{line: 439, col: 8, offset: 11876}, + pos: position{line: 439, col: 8, offset: 11879}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 439, col: 8, offset: 11876}, + pos: position{line: 439, col: 8, offset: 11879}, label: "u", expr: &actionExpr{ - pos: position{line: 405, col: 11, offset: 11058}, + pos: position{line: 405, col: 11, offset: 11061}, run: (*parser).callonHttp4, expr: &seqExpr{ - pos: position{line: 405, col: 11, offset: 11058}, + pos: position{line: 405, col: 11, offset: 11061}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 403, col: 10, offset: 11033}, + pos: position{line: 403, col: 10, offset: 11036}, val: "http", ignoreCase: false, want: "\"http\"", }, &zeroOrOneExpr{ - pos: position{line: 403, col: 17, offset: 11040}, + pos: position{line: 403, col: 17, offset: 11043}, expr: &litMatcher{ - pos: position{line: 403, col: 17, offset: 11040}, + pos: position{line: 403, col: 17, offset: 11043}, val: "s", ignoreCase: false, want: "\"s\"", }, }, &litMatcher{ - pos: position{line: 405, col: 18, offset: 11065}, + pos: position{line: 405, col: 18, offset: 11068}, val: "://", ignoreCase: false, want: "\"://\"", }, &zeroOrOneExpr{ - pos: position{line: 409, col: 13, offset: 11210}, + pos: position{line: 409, col: 13, offset: 11213}, expr: &seqExpr{ - pos: position{line: 409, col: 14, offset: 11211}, + pos: position{line: 409, col: 14, offset: 11214}, exprs: []interface{}{ &zeroOrMoreExpr{ - pos: position{line: 411, col: 12, offset: 11257}, + pos: position{line: 411, col: 12, offset: 11260}, expr: &choiceExpr{ - pos: position{line: 411, col: 14, offset: 11259}, + pos: position{line: 411, col: 14, offset: 11262}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 435, col: 14, offset: 11789}, + pos: position{line: 435, col: 14, offset: 11792}, val: "[._~-A-Za-z0-9]", chars: []rune{'.', '_', '~', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -2873,26 +2873,26 @@ var g = &grammar{ inverted: false, }, &seqExpr{ - pos: position{line: 433, col: 14, offset: 11755}, + pos: position{line: 433, col: 14, offset: 11758}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 433, col: 14, offset: 11755}, + pos: position{line: 433, col: 14, offset: 11758}, val: "%", ignoreCase: false, want: "\"%\"", }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -2901,17 +2901,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -2922,7 +2922,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 437, col: 13, offset: 11820}, + pos: position{line: 437, col: 13, offset: 11823}, val: "[!$&\\*+;=:]", chars: []rune{'!', '$', '&', '\'', '*', '+', ';', '=', ':'}, ignoreCase: false, @@ -2932,7 +2932,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 409, col: 23, offset: 11220}, + pos: position{line: 409, col: 23, offset: 11223}, val: "@", ignoreCase: false, want: "\"@\"", @@ -2941,37 +2941,37 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 413, col: 8, offset: 11314}, + pos: position{line: 413, col: 8, offset: 11317}, alternatives: []interface{}{ &seqExpr{ - pos: position{line: 417, col: 13, offset: 11366}, + pos: position{line: 417, col: 13, offset: 11369}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 417, col: 13, offset: 11366}, + pos: position{line: 417, col: 13, offset: 11369}, val: "[", ignoreCase: false, want: "\"[\"", }, &actionExpr{ - pos: position{line: 419, col: 15, offset: 11403}, + pos: position{line: 419, col: 15, offset: 11406}, run: (*parser).callonHttp28, expr: &seqExpr{ - pos: position{line: 419, col: 15, offset: 11403}, + pos: position{line: 419, col: 15, offset: 11406}, exprs: []interface{}{ &zeroOrMoreExpr{ - pos: position{line: 419, col: 15, offset: 11403}, + pos: position{line: 419, col: 15, offset: 11406}, expr: &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -2981,32 +2981,32 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 419, col: 25, offset: 11413}, + pos: position{line: 419, col: 25, offset: 11416}, val: ":", ignoreCase: false, want: "\":\"", }, &zeroOrMoreExpr{ - pos: position{line: 419, col: 29, offset: 11417}, + pos: position{line: 419, col: 29, offset: 11420}, expr: &choiceExpr{ - pos: position{line: 419, col: 30, offset: 11418}, + pos: position{line: 419, col: 30, offset: 11421}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, inverted: false, }, &charClassMatcher{ - pos: position{line: 419, col: 39, offset: 11427}, + pos: position{line: 419, col: 39, offset: 11430}, val: "[:.]", chars: []rune{':', '.'}, ignoreCase: false, @@ -3019,7 +3019,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 417, col: 29, offset: 11382}, + pos: position{line: 417, col: 29, offset: 11385}, val: "]", ignoreCase: false, want: "\"]\"", @@ -3027,12 +3027,12 @@ var g = &grammar{ }, }, &zeroOrMoreExpr{ - pos: position{line: 425, col: 11, offset: 11599}, + pos: position{line: 425, col: 11, offset: 11602}, expr: &choiceExpr{ - pos: position{line: 425, col: 12, offset: 11600}, + pos: position{line: 425, col: 12, offset: 11603}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 435, col: 14, offset: 11789}, + pos: position{line: 435, col: 14, offset: 11792}, val: "[._~-A-Za-z0-9]", chars: []rune{'.', '_', '~', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -3040,26 +3040,26 @@ var g = &grammar{ inverted: false, }, &seqExpr{ - pos: position{line: 433, col: 14, offset: 11755}, + pos: position{line: 433, col: 14, offset: 11758}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 433, col: 14, offset: 11755}, + pos: position{line: 433, col: 14, offset: 11758}, val: "%", ignoreCase: false, want: "\"%\"", }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -3068,17 +3068,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -3089,7 +3089,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 437, col: 13, offset: 11820}, + pos: position{line: 437, col: 13, offset: 11823}, val: "[!$&\\*+;=]", chars: []rune{'!', '$', '&', '\'', '*', '+', ';', '='}, ignoreCase: false, @@ -3101,20 +3101,20 @@ var g = &grammar{ }, }, &zeroOrOneExpr{ - pos: position{line: 409, col: 34, offset: 11231}, + pos: position{line: 409, col: 34, offset: 11234}, expr: &seqExpr{ - pos: position{line: 409, col: 35, offset: 11232}, + pos: position{line: 409, col: 35, offset: 11235}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 409, col: 35, offset: 11232}, + pos: position{line: 409, col: 35, offset: 11235}, val: ":", ignoreCase: false, want: "\":\"", }, &zeroOrMoreExpr{ - pos: position{line: 415, col: 8, offset: 11344}, + pos: position{line: 415, col: 8, offset: 11347}, expr: &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -3125,32 +3125,32 @@ var g = &grammar{ }, }, &zeroOrMoreExpr{ - pos: position{line: 407, col: 11, offset: 11164}, + pos: position{line: 407, col: 11, offset: 11167}, expr: &choiceExpr{ - pos: position{line: 407, col: 12, offset: 11165}, + pos: position{line: 407, col: 12, offset: 11168}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 384, col: 17, offset: 10261}, + pos: position{line: 384, col: 17, offset: 10264}, run: (*parser).callonHttp60, expr: &seqExpr{ - pos: position{line: 384, col: 17, offset: 10261}, + pos: position{line: 384, col: 17, offset: 10264}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 384, col: 17, offset: 10261}, + pos: position{line: 384, col: 17, offset: 10264}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 384, col: 21, offset: 10265}, + pos: position{line: 384, col: 21, offset: 10268}, label: "u", expr: &actionExpr{ - pos: position{line: 381, col: 25, offset: 10120}, + pos: position{line: 381, col: 25, offset: 10123}, run: (*parser).callonHttp64, expr: &oneOrMoreExpr{ - pos: position{line: 381, col: 25, offset: 10120}, + pos: position{line: 381, col: 25, offset: 10123}, expr: &charClassMatcher{ - pos: position{line: 365, col: 6, offset: 9865}, + pos: position{line: 365, col: 6, offset: 9868}, val: "[!=|~$-\\*-+--.0-;@-Z^-z]", chars: []rune{'!', '=', '|', '~'}, ranges: []rune{'$', '\'', '*', '+', '-', '.', '0', ';', '@', 'Z', '^', 'z'}, @@ -3164,27 +3164,27 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 385, col: 17, offset: 10323}, + pos: position{line: 385, col: 17, offset: 10326}, run: (*parser).callonHttp67, expr: &seqExpr{ - pos: position{line: 385, col: 17, offset: 10323}, + pos: position{line: 385, col: 17, offset: 10326}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 385, col: 17, offset: 10323}, + pos: position{line: 385, col: 17, offset: 10326}, val: "/\"", ignoreCase: false, want: "\"/\\\"\"", }, &labeledExpr{ - pos: position{line: 385, col: 25, offset: 10331}, + pos: position{line: 385, col: 25, offset: 10334}, label: "q", expr: &actionExpr{ - pos: position{line: 382, col: 23, offset: 10190}, + pos: position{line: 382, col: 23, offset: 10193}, run: (*parser).callonHttp71, expr: &oneOrMoreExpr{ - pos: position{line: 382, col: 23, offset: 10190}, + pos: position{line: 382, col: 23, offset: 10193}, expr: &charClassMatcher{ - pos: position{line: 376, col: 6, offset: 10028}, + pos: position{line: 376, col: 6, offset: 10031}, val: "[𐀀D -!#-.0-\\u007f\\u0080-\\ud7ff\\ue000-�𐀀-\\U0001fffd𠀀-\\U0002fffd\\U00030000-\\U0003fffd\\U00040000-\\U0004fffd\\U00050000-\\U0005fffd\\U00060000-\\U0006fffd\\U00070000-\\U0007fffd\\U00080000-\\U0008fffd\\U00090000-\\U0009fffd\\U000a0000-\\U000afffd\\U000b0000-\\U000bfffd\\U000c0000-\\U000cfffd\\U000d0000-\\U000dfffd\\U000e0000-\\U000efffd\\U000f0000-\\U000ffffd0-\\U00010fff]", chars: []rune{'𐀀', 'D'}, ranges: []rune{' ', '!', '#', '.', '0', '\u007f', '\u0080', '\ud7ff', '\ue000', '�', '𐀀', '\U0001fffd', '𠀀', '\U0002fffd', '\U00030000', '\U0003fffd', '\U00040000', '\U0004fffd', '\U00050000', '\U0005fffd', '\U00060000', '\U0006fffd', '\U00070000', '\U0007fffd', '\U00080000', '\U0008fffd', '\U00090000', '\U0009fffd', '\U000a0000', '\U000afffd', '\U000b0000', '\U000bfffd', '\U000c0000', '\U000cfffd', '\U000d0000', '\U000dfffd', '\U000e0000', '\U000efffd', '\U000f0000', '\U000ffffd', '0', '\U00010fff'}, @@ -3195,7 +3195,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 385, col: 47, offset: 10353}, + pos: position{line: 385, col: 47, offset: 10356}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -3204,21 +3204,21 @@ var g = &grammar{ }, }, &seqExpr{ - pos: position{line: 407, col: 28, offset: 11181}, + pos: position{line: 407, col: 28, offset: 11184}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 407, col: 28, offset: 11181}, + pos: position{line: 407, col: 28, offset: 11184}, val: "/", ignoreCase: false, want: "\"/\"", }, &zeroOrMoreExpr{ - pos: position{line: 427, col: 11, offset: 11651}, + pos: position{line: 427, col: 11, offset: 11654}, expr: &choiceExpr{ - pos: position{line: 429, col: 9, offset: 11669}, + pos: position{line: 429, col: 9, offset: 11672}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 435, col: 14, offset: 11789}, + pos: position{line: 435, col: 14, offset: 11792}, val: "[._~-A-Za-z0-9]", chars: []rune{'.', '_', '~', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -3226,26 +3226,26 @@ var g = &grammar{ inverted: false, }, &seqExpr{ - pos: position{line: 433, col: 14, offset: 11755}, + pos: position{line: 433, col: 14, offset: 11758}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 433, col: 14, offset: 11755}, + pos: position{line: 433, col: 14, offset: 11758}, val: "%", ignoreCase: false, want: "\"%\"", }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -3254,17 +3254,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -3275,7 +3275,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 437, col: 13, offset: 11820}, + pos: position{line: 437, col: 13, offset: 11823}, val: "[!$&\\*+;=:@]", chars: []rune{'!', '$', '&', '\'', '*', '+', ';', '=', ':', '@'}, ignoreCase: false, @@ -3290,23 +3290,23 @@ var g = &grammar{ }, }, &zeroOrOneExpr{ - pos: position{line: 405, col: 42, offset: 11089}, + pos: position{line: 405, col: 42, offset: 11092}, expr: &seqExpr{ - pos: position{line: 405, col: 44, offset: 11091}, + pos: position{line: 405, col: 44, offset: 11094}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 405, col: 44, offset: 11091}, + pos: position{line: 405, col: 44, offset: 11094}, val: "?", ignoreCase: false, want: "\"?\"", }, &zeroOrMoreExpr{ - pos: position{line: 431, col: 9, offset: 11723}, + pos: position{line: 431, col: 9, offset: 11726}, expr: &choiceExpr{ - pos: position{line: 431, col: 10, offset: 11724}, + pos: position{line: 431, col: 10, offset: 11727}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 435, col: 14, offset: 11789}, + pos: position{line: 435, col: 14, offset: 11792}, val: "[._~-A-Za-z0-9]", chars: []rune{'.', '_', '~', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -3314,26 +3314,26 @@ var g = &grammar{ inverted: false, }, &seqExpr{ - pos: position{line: 433, col: 14, offset: 11755}, + pos: position{line: 433, col: 14, offset: 11758}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 433, col: 14, offset: 11755}, + pos: position{line: 433, col: 14, offset: 11758}, val: "%", ignoreCase: false, want: "\"%\"", }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -3342,17 +3342,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -3363,7 +3363,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 437, col: 13, offset: 11820}, + pos: position{line: 437, col: 13, offset: 11823}, val: "[!$&\\*+;=:@/?]", chars: []rune{'!', '$', '&', '\'', '*', '+', ';', '=', ':', '@', '/', '?'}, ignoreCase: false, @@ -3380,29 +3380,29 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 439, col: 18, offset: 11886}, + pos: position{line: 439, col: 18, offset: 11889}, label: "usingClause", expr: &zeroOrOneExpr{ - pos: position{line: 439, col: 30, offset: 11898}, + pos: position{line: 439, col: 30, offset: 11901}, expr: &seqExpr{ - pos: position{line: 439, col: 32, offset: 11900}, + pos: position{line: 439, col: 32, offset: 11903}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 439, col: 32, offset: 11900}, + pos: position{line: 439, col: 32, offset: 11903}, name: "_", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &ruleRefExpr{ - pos: position{line: 439, col: 40, offset: 11908}, + pos: position{line: 439, col: 40, offset: 11911}, name: "_1", }, &ruleRefExpr{ - pos: position{line: 439, col: 43, offset: 11911}, + pos: position{line: 439, col: 43, offset: 11914}, name: "ImportExpression", }, }, @@ -3415,26 +3415,26 @@ var g = &grammar{ }, { name: "ImportType", - pos: position{line: 480, col: 1, offset: 13107}, + pos: position{line: 480, col: 1, offset: 13110}, expr: &choiceExpr{ - pos: position{line: 480, col: 14, offset: 13122}, + pos: position{line: 480, col: 14, offset: 13125}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonImportType2, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -3446,53 +3446,53 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 398, col: 14, offset: 10736}, + pos: position{line: 398, col: 14, offset: 10739}, run: (*parser).callonImportType7, expr: &seqExpr{ - pos: position{line: 398, col: 14, offset: 10736}, + pos: position{line: 398, col: 14, offset: 10739}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 398, col: 14, offset: 10736}, + pos: position{line: 398, col: 14, offset: 10739}, val: "..", ignoreCase: false, want: "\"..\"", }, &labeledExpr{ - pos: position{line: 398, col: 19, offset: 10741}, + pos: position{line: 398, col: 19, offset: 10744}, label: "p", expr: &actionExpr{ - pos: position{line: 387, col: 8, offset: 10385}, + pos: position{line: 387, col: 8, offset: 10388}, run: (*parser).callonImportType11, expr: &labeledExpr{ - pos: position{line: 387, col: 8, offset: 10385}, + pos: position{line: 387, col: 8, offset: 10388}, label: "cs", expr: &oneOrMoreExpr{ - pos: position{line: 387, col: 11, offset: 10388}, + pos: position{line: 387, col: 11, offset: 10391}, expr: &choiceExpr{ - pos: position{line: 384, col: 17, offset: 10261}, + pos: position{line: 384, col: 17, offset: 10264}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 384, col: 17, offset: 10261}, + pos: position{line: 384, col: 17, offset: 10264}, run: (*parser).callonImportType15, expr: &seqExpr{ - pos: position{line: 384, col: 17, offset: 10261}, + pos: position{line: 384, col: 17, offset: 10264}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 384, col: 17, offset: 10261}, + pos: position{line: 384, col: 17, offset: 10264}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 384, col: 21, offset: 10265}, + pos: position{line: 384, col: 21, offset: 10268}, label: "u", expr: &actionExpr{ - pos: position{line: 381, col: 25, offset: 10120}, + pos: position{line: 381, col: 25, offset: 10123}, run: (*parser).callonImportType19, expr: &oneOrMoreExpr{ - pos: position{line: 381, col: 25, offset: 10120}, + pos: position{line: 381, col: 25, offset: 10123}, expr: &charClassMatcher{ - pos: position{line: 365, col: 6, offset: 9865}, + pos: position{line: 365, col: 6, offset: 9868}, val: "[!=|~$-\\*-+--.0-;@-Z^-z]", chars: []rune{'!', '=', '|', '~'}, ranges: []rune{'$', '\'', '*', '+', '-', '.', '0', ';', '@', 'Z', '^', 'z'}, @@ -3506,27 +3506,27 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 385, col: 17, offset: 10323}, + pos: position{line: 385, col: 17, offset: 10326}, run: (*parser).callonImportType22, expr: &seqExpr{ - pos: position{line: 385, col: 17, offset: 10323}, + pos: position{line: 385, col: 17, offset: 10326}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 385, col: 17, offset: 10323}, + pos: position{line: 385, col: 17, offset: 10326}, val: "/\"", ignoreCase: false, want: "\"/\\\"\"", }, &labeledExpr{ - pos: position{line: 385, col: 25, offset: 10331}, + pos: position{line: 385, col: 25, offset: 10334}, label: "q", expr: &actionExpr{ - pos: position{line: 382, col: 23, offset: 10190}, + pos: position{line: 382, col: 23, offset: 10193}, run: (*parser).callonImportType26, expr: &oneOrMoreExpr{ - pos: position{line: 382, col: 23, offset: 10190}, + pos: position{line: 382, col: 23, offset: 10193}, expr: &charClassMatcher{ - pos: position{line: 376, col: 6, offset: 10028}, + pos: position{line: 376, col: 6, offset: 10031}, val: "[𐀀D -!#-.0-\\u007f\\u0080-\\ud7ff\\ue000-�𐀀-\\U0001fffd𠀀-\\U0002fffd\\U00030000-\\U0003fffd\\U00040000-\\U0004fffd\\U00050000-\\U0005fffd\\U00060000-\\U0006fffd\\U00070000-\\U0007fffd\\U00080000-\\U0008fffd\\U00090000-\\U0009fffd\\U000a0000-\\U000afffd\\U000b0000-\\U000bfffd\\U000c0000-\\U000cfffd\\U000d0000-\\U000dfffd\\U000e0000-\\U000efffd\\U000f0000-\\U000ffffd0-\\U00010fff]", chars: []rune{'𐀀', 'D'}, ranges: []rune{' ', '!', '#', '.', '0', '\u007f', '\u0080', '\ud7ff', '\ue000', '�', '𐀀', '\U0001fffd', '𠀀', '\U0002fffd', '\U00030000', '\U0003fffd', '\U00040000', '\U0004fffd', '\U00050000', '\U0005fffd', '\U00060000', '\U0006fffd', '\U00070000', '\U0007fffd', '\U00080000', '\U0008fffd', '\U00090000', '\U0009fffd', '\U000a0000', '\U000afffd', '\U000b0000', '\U000bfffd', '\U000c0000', '\U000cfffd', '\U000d0000', '\U000dfffd', '\U000e0000', '\U000efffd', '\U000f0000', '\U000ffffd', '0', '\U00010fff'}, @@ -3537,7 +3537,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 385, col: 47, offset: 10353}, + pos: position{line: 385, col: 47, offset: 10356}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -3555,53 +3555,53 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 399, col: 12, offset: 10816}, + pos: position{line: 399, col: 12, offset: 10819}, run: (*parser).callonImportType30, expr: &seqExpr{ - pos: position{line: 399, col: 12, offset: 10816}, + pos: position{line: 399, col: 12, offset: 10819}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 399, col: 12, offset: 10816}, + pos: position{line: 399, col: 12, offset: 10819}, val: ".", ignoreCase: false, want: "\".\"", }, &labeledExpr{ - pos: position{line: 399, col: 16, offset: 10820}, + pos: position{line: 399, col: 16, offset: 10823}, label: "p", expr: &actionExpr{ - pos: position{line: 387, col: 8, offset: 10385}, + pos: position{line: 387, col: 8, offset: 10388}, run: (*parser).callonImportType34, expr: &labeledExpr{ - pos: position{line: 387, col: 8, offset: 10385}, + pos: position{line: 387, col: 8, offset: 10388}, label: "cs", expr: &oneOrMoreExpr{ - pos: position{line: 387, col: 11, offset: 10388}, + pos: position{line: 387, col: 11, offset: 10391}, expr: &choiceExpr{ - pos: position{line: 384, col: 17, offset: 10261}, + pos: position{line: 384, col: 17, offset: 10264}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 384, col: 17, offset: 10261}, + pos: position{line: 384, col: 17, offset: 10264}, run: (*parser).callonImportType38, expr: &seqExpr{ - pos: position{line: 384, col: 17, offset: 10261}, + pos: position{line: 384, col: 17, offset: 10264}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 384, col: 17, offset: 10261}, + pos: position{line: 384, col: 17, offset: 10264}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 384, col: 21, offset: 10265}, + pos: position{line: 384, col: 21, offset: 10268}, label: "u", expr: &actionExpr{ - pos: position{line: 381, col: 25, offset: 10120}, + pos: position{line: 381, col: 25, offset: 10123}, run: (*parser).callonImportType42, expr: &oneOrMoreExpr{ - pos: position{line: 381, col: 25, offset: 10120}, + pos: position{line: 381, col: 25, offset: 10123}, expr: &charClassMatcher{ - pos: position{line: 365, col: 6, offset: 9865}, + pos: position{line: 365, col: 6, offset: 9868}, val: "[!=|~$-\\*-+--.0-;@-Z^-z]", chars: []rune{'!', '=', '|', '~'}, ranges: []rune{'$', '\'', '*', '+', '-', '.', '0', ';', '@', 'Z', '^', 'z'}, @@ -3615,27 +3615,27 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 385, col: 17, offset: 10323}, + pos: position{line: 385, col: 17, offset: 10326}, run: (*parser).callonImportType45, expr: &seqExpr{ - pos: position{line: 385, col: 17, offset: 10323}, + pos: position{line: 385, col: 17, offset: 10326}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 385, col: 17, offset: 10323}, + pos: position{line: 385, col: 17, offset: 10326}, val: "/\"", ignoreCase: false, want: "\"/\\\"\"", }, &labeledExpr{ - pos: position{line: 385, col: 25, offset: 10331}, + pos: position{line: 385, col: 25, offset: 10334}, label: "q", expr: &actionExpr{ - pos: position{line: 382, col: 23, offset: 10190}, + pos: position{line: 382, col: 23, offset: 10193}, run: (*parser).callonImportType49, expr: &oneOrMoreExpr{ - pos: position{line: 382, col: 23, offset: 10190}, + pos: position{line: 382, col: 23, offset: 10193}, expr: &charClassMatcher{ - pos: position{line: 376, col: 6, offset: 10028}, + pos: position{line: 376, col: 6, offset: 10031}, val: "[𐀀D -!#-.0-\\u007f\\u0080-\\ud7ff\\ue000-�𐀀-\\U0001fffd𠀀-\\U0002fffd\\U00030000-\\U0003fffd\\U00040000-\\U0004fffd\\U00050000-\\U0005fffd\\U00060000-\\U0006fffd\\U00070000-\\U0007fffd\\U00080000-\\U0008fffd\\U00090000-\\U0009fffd\\U000a0000-\\U000afffd\\U000b0000-\\U000bfffd\\U000c0000-\\U000cfffd\\U000d0000-\\U000dfffd\\U000e0000-\\U000efffd\\U000f0000-\\U000ffffd0-\\U00010fff]", chars: []rune{'𐀀', 'D'}, ranges: []rune{' ', '!', '#', '.', '0', '\u007f', '\u0080', '\ud7ff', '\ue000', '�', '𐀀', '\U0001fffd', '𠀀', '\U0002fffd', '\U00030000', '\U0003fffd', '\U00040000', '\U0004fffd', '\U00050000', '\U0005fffd', '\U00060000', '\U0006fffd', '\U00070000', '\U0007fffd', '\U00080000', '\U0008fffd', '\U00090000', '\U0009fffd', '\U000a0000', '\U000afffd', '\U000b0000', '\U000bfffd', '\U000c0000', '\U000cfffd', '\U000d0000', '\U000dfffd', '\U000e0000', '\U000efffd', '\U000f0000', '\U000ffffd', '0', '\U00010fff'}, @@ -3646,7 +3646,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 385, col: 47, offset: 10353}, + pos: position{line: 385, col: 47, offset: 10356}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -3664,53 +3664,53 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 400, col: 12, offset: 10878}, + pos: position{line: 400, col: 12, offset: 10881}, run: (*parser).callonImportType53, expr: &seqExpr{ - pos: position{line: 400, col: 12, offset: 10878}, + pos: position{line: 400, col: 12, offset: 10881}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 400, col: 12, offset: 10878}, + pos: position{line: 400, col: 12, offset: 10881}, val: "~", ignoreCase: false, want: "\"~\"", }, &labeledExpr{ - pos: position{line: 400, col: 16, offset: 10882}, + pos: position{line: 400, col: 16, offset: 10885}, label: "p", expr: &actionExpr{ - pos: position{line: 387, col: 8, offset: 10385}, + pos: position{line: 387, col: 8, offset: 10388}, run: (*parser).callonImportType57, expr: &labeledExpr{ - pos: position{line: 387, col: 8, offset: 10385}, + pos: position{line: 387, col: 8, offset: 10388}, label: "cs", expr: &oneOrMoreExpr{ - pos: position{line: 387, col: 11, offset: 10388}, + pos: position{line: 387, col: 11, offset: 10391}, expr: &choiceExpr{ - pos: position{line: 384, col: 17, offset: 10261}, + pos: position{line: 384, col: 17, offset: 10264}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 384, col: 17, offset: 10261}, + pos: position{line: 384, col: 17, offset: 10264}, run: (*parser).callonImportType61, expr: &seqExpr{ - pos: position{line: 384, col: 17, offset: 10261}, + pos: position{line: 384, col: 17, offset: 10264}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 384, col: 17, offset: 10261}, + pos: position{line: 384, col: 17, offset: 10264}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 384, col: 21, offset: 10265}, + pos: position{line: 384, col: 21, offset: 10268}, label: "u", expr: &actionExpr{ - pos: position{line: 381, col: 25, offset: 10120}, + pos: position{line: 381, col: 25, offset: 10123}, run: (*parser).callonImportType65, expr: &oneOrMoreExpr{ - pos: position{line: 381, col: 25, offset: 10120}, + pos: position{line: 381, col: 25, offset: 10123}, expr: &charClassMatcher{ - pos: position{line: 365, col: 6, offset: 9865}, + pos: position{line: 365, col: 6, offset: 9868}, val: "[!=|~$-\\*-+--.0-;@-Z^-z]", chars: []rune{'!', '=', '|', '~'}, ranges: []rune{'$', '\'', '*', '+', '-', '.', '0', ';', '@', 'Z', '^', 'z'}, @@ -3724,27 +3724,27 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 385, col: 17, offset: 10323}, + pos: position{line: 385, col: 17, offset: 10326}, run: (*parser).callonImportType68, expr: &seqExpr{ - pos: position{line: 385, col: 17, offset: 10323}, + pos: position{line: 385, col: 17, offset: 10326}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 385, col: 17, offset: 10323}, + pos: position{line: 385, col: 17, offset: 10326}, val: "/\"", ignoreCase: false, want: "\"/\\\"\"", }, &labeledExpr{ - pos: position{line: 385, col: 25, offset: 10331}, + pos: position{line: 385, col: 25, offset: 10334}, label: "q", expr: &actionExpr{ - pos: position{line: 382, col: 23, offset: 10190}, + pos: position{line: 382, col: 23, offset: 10193}, run: (*parser).callonImportType72, expr: &oneOrMoreExpr{ - pos: position{line: 382, col: 23, offset: 10190}, + pos: position{line: 382, col: 23, offset: 10193}, expr: &charClassMatcher{ - pos: position{line: 376, col: 6, offset: 10028}, + pos: position{line: 376, col: 6, offset: 10031}, val: "[𐀀D -!#-.0-\\u007f\\u0080-\\ud7ff\\ue000-�𐀀-\\U0001fffd𠀀-\\U0002fffd\\U00030000-\\U0003fffd\\U00040000-\\U0004fffd\\U00050000-\\U0005fffd\\U00060000-\\U0006fffd\\U00070000-\\U0007fffd\\U00080000-\\U0008fffd\\U00090000-\\U0009fffd\\U000a0000-\\U000afffd\\U000b0000-\\U000bfffd\\U000c0000-\\U000cfffd\\U000d0000-\\U000dfffd\\U000e0000-\\U000efffd\\U000f0000-\\U000ffffd0-\\U00010fff]", chars: []rune{'𐀀', 'D'}, ranges: []rune{' ', '!', '#', '.', '0', '\u007f', '\u0080', '\ud7ff', '\ue000', '�', '𐀀', '\U0001fffd', '𠀀', '\U0002fffd', '\U00030000', '\U0003fffd', '\U00040000', '\U0004fffd', '\U00050000', '\U0005fffd', '\U00060000', '\U0006fffd', '\U00070000', '\U0007fffd', '\U00080000', '\U0008fffd', '\U00090000', '\U0009fffd', '\U000a0000', '\U000afffd', '\U000b0000', '\U000bfffd', '\U000c0000', '\U000cfffd', '\U000d0000', '\U000dfffd', '\U000e0000', '\U000efffd', '\U000f0000', '\U000ffffd', '0', '\U00010fff'}, @@ -3755,7 +3755,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 385, col: 47, offset: 10353}, + pos: position{line: 385, col: 47, offset: 10356}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -3773,44 +3773,44 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 401, col: 16, offset: 10960}, + pos: position{line: 401, col: 16, offset: 10963}, run: (*parser).callonImportType76, expr: &labeledExpr{ - pos: position{line: 401, col: 16, offset: 10960}, + pos: position{line: 401, col: 16, offset: 10963}, label: "p", expr: &actionExpr{ - pos: position{line: 387, col: 8, offset: 10385}, + pos: position{line: 387, col: 8, offset: 10388}, run: (*parser).callonImportType78, expr: &labeledExpr{ - pos: position{line: 387, col: 8, offset: 10385}, + pos: position{line: 387, col: 8, offset: 10388}, label: "cs", expr: &oneOrMoreExpr{ - pos: position{line: 387, col: 11, offset: 10388}, + pos: position{line: 387, col: 11, offset: 10391}, expr: &choiceExpr{ - pos: position{line: 384, col: 17, offset: 10261}, + pos: position{line: 384, col: 17, offset: 10264}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 384, col: 17, offset: 10261}, + pos: position{line: 384, col: 17, offset: 10264}, run: (*parser).callonImportType82, expr: &seqExpr{ - pos: position{line: 384, col: 17, offset: 10261}, + pos: position{line: 384, col: 17, offset: 10264}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 384, col: 17, offset: 10261}, + pos: position{line: 384, col: 17, offset: 10264}, val: "/", ignoreCase: false, want: "\"/\"", }, &labeledExpr{ - pos: position{line: 384, col: 21, offset: 10265}, + pos: position{line: 384, col: 21, offset: 10268}, label: "u", expr: &actionExpr{ - pos: position{line: 381, col: 25, offset: 10120}, + pos: position{line: 381, col: 25, offset: 10123}, run: (*parser).callonImportType86, expr: &oneOrMoreExpr{ - pos: position{line: 381, col: 25, offset: 10120}, + pos: position{line: 381, col: 25, offset: 10123}, expr: &charClassMatcher{ - pos: position{line: 365, col: 6, offset: 9865}, + pos: position{line: 365, col: 6, offset: 9868}, val: "[!=|~$-\\*-+--.0-;@-Z^-z]", chars: []rune{'!', '=', '|', '~'}, ranges: []rune{'$', '\'', '*', '+', '-', '.', '0', ';', '@', 'Z', '^', 'z'}, @@ -3824,27 +3824,27 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 385, col: 17, offset: 10323}, + pos: position{line: 385, col: 17, offset: 10326}, run: (*parser).callonImportType89, expr: &seqExpr{ - pos: position{line: 385, col: 17, offset: 10323}, + pos: position{line: 385, col: 17, offset: 10326}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 385, col: 17, offset: 10323}, + pos: position{line: 385, col: 17, offset: 10326}, val: "/\"", ignoreCase: false, want: "\"/\\\"\"", }, &labeledExpr{ - pos: position{line: 385, col: 25, offset: 10331}, + pos: position{line: 385, col: 25, offset: 10334}, label: "q", expr: &actionExpr{ - pos: position{line: 382, col: 23, offset: 10190}, + pos: position{line: 382, col: 23, offset: 10193}, run: (*parser).callonImportType93, expr: &oneOrMoreExpr{ - pos: position{line: 382, col: 23, offset: 10190}, + pos: position{line: 382, col: 23, offset: 10193}, expr: &charClassMatcher{ - pos: position{line: 376, col: 6, offset: 10028}, + pos: position{line: 376, col: 6, offset: 10031}, val: "[𐀀D -!#-.0-\\u007f\\u0080-\\ud7ff\\ue000-�𐀀-\\U0001fffd𠀀-\\U0002fffd\\U00030000-\\U0003fffd\\U00040000-\\U0004fffd\\U00050000-\\U0005fffd\\U00060000-\\U0006fffd\\U00070000-\\U0007fffd\\U00080000-\\U0008fffd\\U00090000-\\U0009fffd\\U000a0000-\\U000afffd\\U000b0000-\\U000bfffd\\U000c0000-\\U000cfffd\\U000d0000-\\U000dfffd\\U000e0000-\\U000efffd\\U000f0000-\\U000ffffd0-\\U00010fff]", chars: []rune{'𐀀', 'D'}, ranges: []rune{' ', '!', '#', '.', '0', '\u007f', '\u0080', '\ud7ff', '\ue000', '�', '𐀀', '\U0001fffd', '𠀀', '\U0002fffd', '\U00030000', '\U0003fffd', '\U00040000', '\U0004fffd', '\U00050000', '\U0005fffd', '\U00060000', '\U0006fffd', '\U00070000', '\U0007fffd', '\U00080000', '\U0008fffd', '\U00090000', '\U0009fffd', '\U000a0000', '\U000afffd', '\U000b0000', '\U000bfffd', '\U000c0000', '\U000cfffd', '\U000d0000', '\U000dfffd', '\U000e0000', '\U000efffd', '\U000f0000', '\U000ffffd', '0', '\U00010fff'}, @@ -3855,7 +3855,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 385, col: 47, offset: 10353}, + pos: position{line: 385, col: 47, offset: 10356}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -3871,35 +3871,35 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 480, col: 32, offset: 13140}, + pos: position{line: 480, col: 32, offset: 13143}, name: "Http", }, &actionExpr{ - pos: position{line: 446, col: 7, offset: 12119}, + pos: position{line: 446, col: 7, offset: 12122}, run: (*parser).callonImportType98, expr: &seqExpr{ - pos: position{line: 446, col: 7, offset: 12119}, + pos: position{line: 446, col: 7, offset: 12122}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 446, col: 7, offset: 12119}, + pos: position{line: 446, col: 7, offset: 12122}, val: "env:", ignoreCase: false, want: "\"env:\"", }, &labeledExpr{ - pos: position{line: 446, col: 14, offset: 12126}, + pos: position{line: 446, col: 14, offset: 12129}, label: "v", expr: &choiceExpr{ - pos: position{line: 446, col: 17, offset: 12129}, + pos: position{line: 446, col: 17, offset: 12132}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 448, col: 27, offset: 12228}, + pos: position{line: 448, col: 27, offset: 12231}, run: (*parser).callonImportType103, expr: &seqExpr{ - pos: position{line: 448, col: 27, offset: 12228}, + pos: position{line: 448, col: 27, offset: 12231}, exprs: []interface{}{ &charClassMatcher{ - pos: position{line: 448, col: 27, offset: 12228}, + pos: position{line: 448, col: 27, offset: 12231}, val: "[_A-Za-z]", chars: []rune{'_'}, ranges: []rune{'A', 'Z', 'a', 'z'}, @@ -3907,9 +3907,9 @@ var g = &grammar{ inverted: false, }, &zeroOrMoreExpr{ - pos: position{line: 448, col: 36, offset: 12237}, + pos: position{line: 448, col: 36, offset: 12240}, expr: &charClassMatcher{ - pos: position{line: 448, col: 36, offset: 12237}, + pos: position{line: 448, col: 36, offset: 12240}, val: "[_A-Za-z0-9]", chars: []rune{'_'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -3921,123 +3921,123 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 452, col: 28, offset: 12322}, + pos: position{line: 452, col: 28, offset: 12325}, run: (*parser).callonImportType108, expr: &seqExpr{ - pos: position{line: 452, col: 28, offset: 12322}, + pos: position{line: 452, col: 28, offset: 12325}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 452, col: 28, offset: 12322}, + pos: position{line: 452, col: 28, offset: 12325}, val: "\"", ignoreCase: false, want: "\"\\\"\"", }, &labeledExpr{ - pos: position{line: 452, col: 32, offset: 12326}, + pos: position{line: 452, col: 32, offset: 12329}, label: "v", expr: &actionExpr{ - pos: position{line: 456, col: 35, offset: 12421}, + pos: position{line: 456, col: 35, offset: 12424}, run: (*parser).callonImportType112, expr: &labeledExpr{ - pos: position{line: 456, col: 35, offset: 12421}, + pos: position{line: 456, col: 35, offset: 12424}, label: "v", expr: &oneOrMoreExpr{ - pos: position{line: 456, col: 37, offset: 12423}, + pos: position{line: 456, col: 37, offset: 12426}, expr: &choiceExpr{ - pos: position{line: 466, col: 7, offset: 12680}, + pos: position{line: 466, col: 7, offset: 12683}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 466, col: 7, offset: 12680}, + pos: position{line: 466, col: 7, offset: 12683}, run: (*parser).callonImportType116, expr: &litMatcher{ - pos: position{line: 466, col: 7, offset: 12680}, + pos: position{line: 466, col: 7, offset: 12683}, val: "\\\"", ignoreCase: false, want: "\"\\\\\\\"\"", }, }, &actionExpr{ - pos: position{line: 467, col: 7, offset: 12720}, + pos: position{line: 467, col: 7, offset: 12723}, run: (*parser).callonImportType118, expr: &litMatcher{ - pos: position{line: 467, col: 7, offset: 12720}, + pos: position{line: 467, col: 7, offset: 12723}, val: "\\\\", ignoreCase: false, want: "\"\\\\\\\\\"", }, }, &actionExpr{ - pos: position{line: 468, col: 7, offset: 12760}, + pos: position{line: 468, col: 7, offset: 12763}, run: (*parser).callonImportType120, expr: &litMatcher{ - pos: position{line: 468, col: 7, offset: 12760}, + pos: position{line: 468, col: 7, offset: 12763}, val: "\\a", ignoreCase: false, want: "\"\\\\a\"", }, }, &actionExpr{ - pos: position{line: 469, col: 7, offset: 12800}, + pos: position{line: 469, col: 7, offset: 12803}, run: (*parser).callonImportType122, expr: &litMatcher{ - pos: position{line: 469, col: 7, offset: 12800}, + pos: position{line: 469, col: 7, offset: 12803}, val: "\\b", ignoreCase: false, want: "\"\\\\b\"", }, }, &actionExpr{ - pos: position{line: 470, col: 7, offset: 12840}, + pos: position{line: 470, col: 7, offset: 12843}, run: (*parser).callonImportType124, expr: &litMatcher{ - pos: position{line: 470, col: 7, offset: 12840}, + pos: position{line: 470, col: 7, offset: 12843}, val: "\\f", ignoreCase: false, want: "\"\\\\f\"", }, }, &actionExpr{ - pos: position{line: 471, col: 7, offset: 12880}, + pos: position{line: 471, col: 7, offset: 12883}, run: (*parser).callonImportType126, expr: &litMatcher{ - pos: position{line: 471, col: 7, offset: 12880}, + pos: position{line: 471, col: 7, offset: 12883}, val: "\\n", ignoreCase: false, want: "\"\\\\n\"", }, }, &actionExpr{ - pos: position{line: 472, col: 7, offset: 12920}, + pos: position{line: 472, col: 7, offset: 12923}, run: (*parser).callonImportType128, expr: &litMatcher{ - pos: position{line: 472, col: 7, offset: 12920}, + pos: position{line: 472, col: 7, offset: 12923}, val: "\\r", ignoreCase: false, want: "\"\\\\r\"", }, }, &actionExpr{ - pos: position{line: 473, col: 7, offset: 12960}, + pos: position{line: 473, col: 7, offset: 12963}, run: (*parser).callonImportType130, expr: &litMatcher{ - pos: position{line: 473, col: 7, offset: 12960}, + pos: position{line: 473, col: 7, offset: 12963}, val: "\\t", ignoreCase: false, want: "\"\\\\t\"", }, }, &actionExpr{ - pos: position{line: 474, col: 7, offset: 13000}, + pos: position{line: 474, col: 7, offset: 13003}, run: (*parser).callonImportType132, expr: &litMatcher{ - pos: position{line: 474, col: 7, offset: 13000}, + pos: position{line: 474, col: 7, offset: 13003}, val: "\\v", ignoreCase: false, want: "\"\\\\v\"", }, }, &charClassMatcher{ - pos: position{line: 475, col: 7, offset: 13040}, + pos: position{line: 475, col: 7, offset: 13043}, val: "[ -!#-<>-[]-~]", ranges: []rune{' ', '!', '#', '<', '>', '[', ']', '~'}, ignoreCase: false, @@ -4050,7 +4050,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 452, col: 66, offset: 12360}, + pos: position{line: 452, col: 66, offset: 12363}, val: "\"", ignoreCase: false, want: "\"\\\"\"", @@ -4069,66 +4069,66 @@ var g = &grammar{ }, { name: "ImportHashed", - pos: position{line: 498, col: 1, offset: 13992}, + pos: position{line: 498, col: 1, offset: 13995}, expr: &actionExpr{ - pos: position{line: 498, col: 16, offset: 14009}, + pos: position{line: 498, col: 16, offset: 14012}, run: (*parser).callonImportHashed1, expr: &seqExpr{ - pos: position{line: 498, col: 16, offset: 14009}, + pos: position{line: 498, col: 16, offset: 14012}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 498, col: 16, offset: 14009}, + pos: position{line: 498, col: 16, offset: 14012}, label: "i", expr: &ruleRefExpr{ - pos: position{line: 498, col: 18, offset: 14011}, + pos: position{line: 498, col: 18, offset: 14014}, name: "ImportType", }, }, &labeledExpr{ - pos: position{line: 498, col: 29, offset: 14022}, + pos: position{line: 498, col: 29, offset: 14025}, label: "h", expr: &zeroOrOneExpr{ - pos: position{line: 498, col: 31, offset: 14024}, + pos: position{line: 498, col: 31, offset: 14027}, expr: &seqExpr{ - pos: position{line: 498, col: 32, offset: 14025}, + pos: position{line: 498, col: 32, offset: 14028}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 498, col: 32, offset: 14025}, + pos: position{line: 498, col: 32, offset: 14028}, name: "_1", }, &actionExpr{ - pos: position{line: 496, col: 8, offset: 13908}, + pos: position{line: 496, col: 8, offset: 13911}, run: (*parser).callonImportHashed9, expr: &seqExpr{ - pos: position{line: 496, col: 8, offset: 13908}, + pos: position{line: 496, col: 8, offset: 13911}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 496, col: 8, offset: 13908}, + pos: position{line: 496, col: 8, offset: 13911}, val: "sha256:", ignoreCase: false, want: "\"sha256:\"", }, &labeledExpr{ - pos: position{line: 496, col: 18, offset: 13918}, + pos: position{line: 496, col: 18, offset: 13921}, label: "val", expr: &actionExpr{ - pos: position{line: 483, col: 13, offset: 13232}, + pos: position{line: 483, col: 13, offset: 13235}, run: (*parser).callonImportHashed13, expr: &seqExpr{ - pos: position{line: 483, col: 13, offset: 13232}, + pos: position{line: 483, col: 13, offset: 13235}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4137,17 +4137,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4156,17 +4156,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4175,17 +4175,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4194,17 +4194,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4213,17 +4213,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4232,17 +4232,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4251,17 +4251,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4270,17 +4270,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4289,17 +4289,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4308,17 +4308,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4327,17 +4327,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4346,17 +4346,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4365,17 +4365,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4384,17 +4384,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4403,17 +4403,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4422,17 +4422,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4441,17 +4441,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4460,17 +4460,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4479,17 +4479,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4498,17 +4498,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4517,17 +4517,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4536,17 +4536,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4555,17 +4555,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4574,17 +4574,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4593,17 +4593,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4612,17 +4612,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4631,17 +4631,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4650,17 +4650,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4669,17 +4669,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4688,17 +4688,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4707,17 +4707,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4726,17 +4726,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4745,17 +4745,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4764,17 +4764,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4783,17 +4783,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4802,17 +4802,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4821,17 +4821,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4840,17 +4840,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4859,17 +4859,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4878,17 +4878,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4897,17 +4897,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4916,17 +4916,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4935,17 +4935,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4954,17 +4954,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4973,17 +4973,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -4992,17 +4992,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -5011,17 +5011,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -5030,17 +5030,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -5049,17 +5049,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -5068,17 +5068,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -5087,17 +5087,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -5106,17 +5106,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -5125,17 +5125,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -5144,17 +5144,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -5163,17 +5163,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -5182,17 +5182,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -5201,17 +5201,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -5220,17 +5220,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -5239,17 +5239,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -5258,17 +5258,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -5277,17 +5277,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -5296,17 +5296,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -5315,17 +5315,17 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -5350,40 +5350,40 @@ var g = &grammar{ }, { name: "Import", - pos: position{line: 506, col: 1, offset: 14183}, + pos: position{line: 506, col: 1, offset: 14186}, expr: &choiceExpr{ - pos: position{line: 506, col: 10, offset: 14194}, + pos: position{line: 506, col: 10, offset: 14197}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 506, col: 10, offset: 14194}, + pos: position{line: 506, col: 10, offset: 14197}, run: (*parser).callonImport2, expr: &seqExpr{ - pos: position{line: 506, col: 10, offset: 14194}, + pos: position{line: 506, col: 10, offset: 14197}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 506, col: 10, offset: 14194}, + pos: position{line: 506, col: 10, offset: 14197}, label: "i", expr: &ruleRefExpr{ - pos: position{line: 506, col: 12, offset: 14196}, + pos: position{line: 506, col: 12, offset: 14199}, name: "ImportHashed", }, }, &ruleRefExpr{ - pos: position{line: 506, col: 25, offset: 14209}, + pos: position{line: 506, col: 25, offset: 14212}, name: "_", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &ruleRefExpr{ - pos: position{line: 506, col: 30, offset: 14214}, + pos: position{line: 506, col: 30, offset: 14217}, name: "_1", }, &litMatcher{ - pos: position{line: 311, col: 8, offset: 8351}, + pos: position{line: 311, col: 8, offset: 8354}, val: "Text", ignoreCase: false, want: "\"Text\"", @@ -5392,35 +5392,35 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 507, col: 10, offset: 14307}, + pos: position{line: 507, col: 10, offset: 14310}, run: (*parser).callonImport10, expr: &seqExpr{ - pos: position{line: 507, col: 10, offset: 14307}, + pos: position{line: 507, col: 10, offset: 14310}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 507, col: 10, offset: 14307}, + pos: position{line: 507, col: 10, offset: 14310}, label: "i", expr: &ruleRefExpr{ - pos: position{line: 507, col: 12, offset: 14309}, + pos: position{line: 507, col: 12, offset: 14312}, name: "ImportHashed", }, }, &ruleRefExpr{ - pos: position{line: 507, col: 25, offset: 14322}, + pos: position{line: 507, col: 25, offset: 14325}, name: "_", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &ruleRefExpr{ - pos: position{line: 507, col: 30, offset: 14327}, + pos: position{line: 507, col: 30, offset: 14330}, name: "_1", }, &litMatcher{ - pos: position{line: 312, col: 12, offset: 8371}, + pos: position{line: 312, col: 12, offset: 8374}, val: "Location", ignoreCase: false, want: "\"Location\"", @@ -5429,13 +5429,13 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 508, col: 10, offset: 14425}, + pos: position{line: 508, col: 10, offset: 14428}, run: (*parser).callonImport18, expr: &labeledExpr{ - pos: position{line: 508, col: 10, offset: 14425}, + pos: position{line: 508, col: 10, offset: 14428}, label: "i", expr: &ruleRefExpr{ - pos: position{line: 508, col: 12, offset: 14427}, + pos: position{line: 508, col: 12, offset: 14430}, name: "ImportHashed", }, }, @@ -5445,398 +5445,398 @@ var g = &grammar{ }, { name: "LetBinding", - pos: position{line: 511, col: 1, offset: 14515}, + pos: position{line: 511, col: 1, offset: 14518}, expr: &actionExpr{ - pos: position{line: 511, col: 14, offset: 14530}, + pos: position{line: 511, col: 14, offset: 14533}, run: (*parser).callonLetBinding1, expr: &seqExpr{ - pos: position{line: 511, col: 14, offset: 14530}, + pos: position{line: 511, col: 14, offset: 14533}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &ruleRefExpr{ - pos: position{line: 511, col: 18, offset: 14534}, + pos: position{line: 511, col: 18, offset: 14537}, name: "_1", }, &labeledExpr{ - pos: position{line: 511, col: 21, offset: 14537}, + pos: position{line: 511, col: 21, offset: 14540}, label: "label", expr: &choiceExpr{ - pos: position{line: 149, col: 20, offset: 3633}, + pos: position{line: 149, col: 20, offset: 3636}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 149, col: 20, offset: 3633}, + pos: position{line: 149, col: 20, offset: 3636}, run: (*parser).callonLetBinding7, expr: &seqExpr{ - pos: position{line: 149, col: 20, offset: 3633}, + pos: position{line: 149, col: 20, offset: 3636}, exprs: []interface{}{ &andExpr{ - pos: position{line: 149, col: 20, offset: 3633}, + pos: position{line: 149, col: 20, offset: 3636}, expr: &seqExpr{ - pos: position{line: 149, col: 22, offset: 3635}, + pos: position{line: 149, col: 22, offset: 3638}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, run: (*parser).callonLetBinding12, expr: &litMatcher{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, val: "Natural/fold", ignoreCase: false, want: "\"Natural/fold\"", }, }, &actionExpr{ - pos: position{line: 275, col: 5, offset: 6859}, + pos: position{line: 275, col: 5, offset: 6862}, run: (*parser).callonLetBinding14, expr: &litMatcher{ - pos: position{line: 275, col: 5, offset: 6859}, + pos: position{line: 275, col: 5, offset: 6862}, val: "Natural/build", ignoreCase: false, want: "\"Natural/build\"", }, }, &actionExpr{ - pos: position{line: 276, col: 5, offset: 6908}, + pos: position{line: 276, col: 5, offset: 6911}, run: (*parser).callonLetBinding16, expr: &litMatcher{ - pos: position{line: 276, col: 5, offset: 6908}, + pos: position{line: 276, col: 5, offset: 6911}, val: "Natural/isZero", ignoreCase: false, want: "\"Natural/isZero\"", }, }, &actionExpr{ - pos: position{line: 277, col: 5, offset: 6959}, + pos: position{line: 277, col: 5, offset: 6962}, run: (*parser).callonLetBinding18, expr: &litMatcher{ - pos: position{line: 277, col: 5, offset: 6959}, + pos: position{line: 277, col: 5, offset: 6962}, val: "Natural/even", ignoreCase: false, want: "\"Natural/even\"", }, }, &actionExpr{ - pos: position{line: 278, col: 5, offset: 7006}, + pos: position{line: 278, col: 5, offset: 7009}, run: (*parser).callonLetBinding20, expr: &litMatcher{ - pos: position{line: 278, col: 5, offset: 7006}, + pos: position{line: 278, col: 5, offset: 7009}, val: "Natural/odd", ignoreCase: false, want: "\"Natural/odd\"", }, }, &actionExpr{ - pos: position{line: 279, col: 5, offset: 7051}, + pos: position{line: 279, col: 5, offset: 7054}, run: (*parser).callonLetBinding22, expr: &litMatcher{ - pos: position{line: 279, col: 5, offset: 7051}, + pos: position{line: 279, col: 5, offset: 7054}, val: "Natural/toInteger", ignoreCase: false, want: "\"Natural/toInteger\"", }, }, &actionExpr{ - pos: position{line: 280, col: 5, offset: 7108}, + pos: position{line: 280, col: 5, offset: 7111}, run: (*parser).callonLetBinding24, expr: &litMatcher{ - pos: position{line: 280, col: 5, offset: 7108}, + pos: position{line: 280, col: 5, offset: 7111}, val: "Natural/show", ignoreCase: false, want: "\"Natural/show\"", }, }, &actionExpr{ - pos: position{line: 281, col: 5, offset: 7155}, + pos: position{line: 281, col: 5, offset: 7158}, run: (*parser).callonLetBinding26, expr: &litMatcher{ - pos: position{line: 281, col: 5, offset: 7155}, + pos: position{line: 281, col: 5, offset: 7158}, val: "Integer/toDouble", ignoreCase: false, want: "\"Integer/toDouble\"", }, }, &actionExpr{ - pos: position{line: 282, col: 5, offset: 7210}, + pos: position{line: 282, col: 5, offset: 7213}, run: (*parser).callonLetBinding28, expr: &litMatcher{ - pos: position{line: 282, col: 5, offset: 7210}, + pos: position{line: 282, col: 5, offset: 7213}, val: "Integer/show", ignoreCase: false, want: "\"Integer/show\"", }, }, &actionExpr{ - pos: position{line: 283, col: 5, offset: 7257}, + pos: position{line: 283, col: 5, offset: 7260}, run: (*parser).callonLetBinding30, expr: &litMatcher{ - pos: position{line: 283, col: 5, offset: 7257}, + pos: position{line: 283, col: 5, offset: 7260}, val: "Integer/negate", ignoreCase: false, want: "\"Integer/negate\"", }, }, &actionExpr{ - pos: position{line: 284, col: 5, offset: 7308}, + pos: position{line: 284, col: 5, offset: 7311}, run: (*parser).callonLetBinding32, expr: &litMatcher{ - pos: position{line: 284, col: 5, offset: 7308}, + pos: position{line: 284, col: 5, offset: 7311}, val: "Integer/clamp", ignoreCase: false, want: "\"Integer/clamp\"", }, }, &actionExpr{ - pos: position{line: 285, col: 5, offset: 7357}, + pos: position{line: 285, col: 5, offset: 7360}, run: (*parser).callonLetBinding34, expr: &litMatcher{ - pos: position{line: 285, col: 5, offset: 7357}, + pos: position{line: 285, col: 5, offset: 7360}, val: "Natural/subtract", ignoreCase: false, want: "\"Natural/subtract\"", }, }, &actionExpr{ - pos: position{line: 286, col: 5, offset: 7412}, + pos: position{line: 286, col: 5, offset: 7415}, run: (*parser).callonLetBinding36, expr: &litMatcher{ - pos: position{line: 286, col: 5, offset: 7412}, + pos: position{line: 286, col: 5, offset: 7415}, val: "Double/show", ignoreCase: false, want: "\"Double/show\"", }, }, &actionExpr{ - pos: position{line: 287, col: 5, offset: 7457}, + pos: position{line: 287, col: 5, offset: 7460}, run: (*parser).callonLetBinding38, expr: &litMatcher{ - pos: position{line: 287, col: 5, offset: 7457}, + pos: position{line: 287, col: 5, offset: 7460}, val: "List/build", ignoreCase: false, want: "\"List/build\"", }, }, &actionExpr{ - pos: position{line: 288, col: 5, offset: 7500}, + pos: position{line: 288, col: 5, offset: 7503}, run: (*parser).callonLetBinding40, expr: &litMatcher{ - pos: position{line: 288, col: 5, offset: 7500}, + pos: position{line: 288, col: 5, offset: 7503}, val: "List/fold", ignoreCase: false, want: "\"List/fold\"", }, }, &actionExpr{ - pos: position{line: 289, col: 5, offset: 7541}, + pos: position{line: 289, col: 5, offset: 7544}, run: (*parser).callonLetBinding42, expr: &litMatcher{ - pos: position{line: 289, col: 5, offset: 7541}, + pos: position{line: 289, col: 5, offset: 7544}, val: "List/length", ignoreCase: false, want: "\"List/length\"", }, }, &actionExpr{ - pos: position{line: 290, col: 5, offset: 7586}, + pos: position{line: 290, col: 5, offset: 7589}, run: (*parser).callonLetBinding44, expr: &litMatcher{ - pos: position{line: 290, col: 5, offset: 7586}, + pos: position{line: 290, col: 5, offset: 7589}, val: "List/head", ignoreCase: false, want: "\"List/head\"", }, }, &actionExpr{ - pos: position{line: 291, col: 5, offset: 7627}, + pos: position{line: 291, col: 5, offset: 7630}, run: (*parser).callonLetBinding46, expr: &litMatcher{ - pos: position{line: 291, col: 5, offset: 7627}, + pos: position{line: 291, col: 5, offset: 7630}, val: "List/last", ignoreCase: false, want: "\"List/last\"", }, }, &actionExpr{ - pos: position{line: 292, col: 5, offset: 7668}, + pos: position{line: 292, col: 5, offset: 7671}, run: (*parser).callonLetBinding48, expr: &litMatcher{ - pos: position{line: 292, col: 5, offset: 7668}, + pos: position{line: 292, col: 5, offset: 7671}, val: "List/indexed", ignoreCase: false, want: "\"List/indexed\"", }, }, &actionExpr{ - pos: position{line: 293, col: 5, offset: 7715}, + pos: position{line: 293, col: 5, offset: 7718}, run: (*parser).callonLetBinding50, expr: &litMatcher{ - pos: position{line: 293, col: 5, offset: 7715}, + pos: position{line: 293, col: 5, offset: 7718}, val: "List/reverse", ignoreCase: false, want: "\"List/reverse\"", }, }, &actionExpr{ - pos: position{line: 294, col: 5, offset: 7762}, + pos: position{line: 294, col: 5, offset: 7765}, run: (*parser).callonLetBinding52, expr: &litMatcher{ - pos: position{line: 294, col: 5, offset: 7762}, + pos: position{line: 294, col: 5, offset: 7765}, val: "Optional/fold", ignoreCase: false, want: "\"Optional/fold\"", }, }, &actionExpr{ - pos: position{line: 295, col: 5, offset: 7811}, + pos: position{line: 295, col: 5, offset: 7814}, run: (*parser).callonLetBinding54, expr: &litMatcher{ - pos: position{line: 295, col: 5, offset: 7811}, + pos: position{line: 295, col: 5, offset: 7814}, val: "Optional/build", ignoreCase: false, want: "\"Optional/build\"", }, }, &actionExpr{ - pos: position{line: 296, col: 5, offset: 7862}, + pos: position{line: 296, col: 5, offset: 7865}, run: (*parser).callonLetBinding56, expr: &litMatcher{ - pos: position{line: 296, col: 5, offset: 7862}, + pos: position{line: 296, col: 5, offset: 7865}, val: "Text/show", ignoreCase: false, want: "\"Text/show\"", }, }, &actionExpr{ - pos: position{line: 297, col: 5, offset: 7903}, + pos: position{line: 297, col: 5, offset: 7906}, run: (*parser).callonLetBinding58, expr: &litMatcher{ - pos: position{line: 297, col: 5, offset: 7903}, + pos: position{line: 297, col: 5, offset: 7906}, val: "Bool", ignoreCase: false, want: "\"Bool\"", }, }, &actionExpr{ - pos: position{line: 298, col: 5, offset: 7935}, + pos: position{line: 298, col: 5, offset: 7938}, run: (*parser).callonLetBinding60, expr: &litMatcher{ - pos: position{line: 298, col: 5, offset: 7935}, + pos: position{line: 298, col: 5, offset: 7938}, val: "True", ignoreCase: false, want: "\"True\"", }, }, &actionExpr{ - pos: position{line: 299, col: 5, offset: 7967}, + pos: position{line: 299, col: 5, offset: 7970}, run: (*parser).callonLetBinding62, expr: &litMatcher{ - pos: position{line: 299, col: 5, offset: 7967}, + pos: position{line: 299, col: 5, offset: 7970}, val: "False", ignoreCase: false, want: "\"False\"", }, }, &actionExpr{ - pos: position{line: 300, col: 5, offset: 8001}, + pos: position{line: 300, col: 5, offset: 8004}, run: (*parser).callonLetBinding64, expr: &litMatcher{ - pos: position{line: 300, col: 5, offset: 8001}, + pos: position{line: 300, col: 5, offset: 8004}, val: "Optional", ignoreCase: false, want: "\"Optional\"", }, }, &actionExpr{ - pos: position{line: 301, col: 5, offset: 8041}, + pos: position{line: 301, col: 5, offset: 8044}, run: (*parser).callonLetBinding66, expr: &litMatcher{ - pos: position{line: 301, col: 5, offset: 8041}, + pos: position{line: 301, col: 5, offset: 8044}, val: "None", ignoreCase: false, want: "\"None\"", }, }, &actionExpr{ - pos: position{line: 302, col: 5, offset: 8073}, + pos: position{line: 302, col: 5, offset: 8076}, run: (*parser).callonLetBinding68, expr: &litMatcher{ - pos: position{line: 302, col: 5, offset: 8073}, + pos: position{line: 302, col: 5, offset: 8076}, val: "Natural", ignoreCase: false, want: "\"Natural\"", }, }, &actionExpr{ - pos: position{line: 303, col: 5, offset: 8111}, + pos: position{line: 303, col: 5, offset: 8114}, run: (*parser).callonLetBinding70, expr: &litMatcher{ - pos: position{line: 303, col: 5, offset: 8111}, + pos: position{line: 303, col: 5, offset: 8114}, val: "Integer", ignoreCase: false, want: "\"Integer\"", }, }, &actionExpr{ - pos: position{line: 304, col: 5, offset: 8149}, + pos: position{line: 304, col: 5, offset: 8152}, run: (*parser).callonLetBinding72, expr: &litMatcher{ - pos: position{line: 304, col: 5, offset: 8149}, + pos: position{line: 304, col: 5, offset: 8152}, val: "Double", ignoreCase: false, want: "\"Double\"", }, }, &actionExpr{ - pos: position{line: 305, col: 5, offset: 8185}, + pos: position{line: 305, col: 5, offset: 8188}, run: (*parser).callonLetBinding74, expr: &litMatcher{ - pos: position{line: 305, col: 5, offset: 8185}, + pos: position{line: 305, col: 5, offset: 8188}, val: "Text", ignoreCase: false, want: "\"Text\"", }, }, &actionExpr{ - pos: position{line: 306, col: 5, offset: 8217}, + pos: position{line: 306, col: 5, offset: 8220}, run: (*parser).callonLetBinding76, expr: &litMatcher{ - pos: position{line: 306, col: 5, offset: 8217}, + pos: position{line: 306, col: 5, offset: 8220}, val: "List", ignoreCase: false, want: "\"List\"", }, }, &actionExpr{ - pos: position{line: 307, col: 5, offset: 8249}, + pos: position{line: 307, col: 5, offset: 8252}, run: (*parser).callonLetBinding78, expr: &litMatcher{ - pos: position{line: 307, col: 5, offset: 8249}, + pos: position{line: 307, col: 5, offset: 8252}, val: "Type", ignoreCase: false, want: "\"Type\"", }, }, &actionExpr{ - pos: position{line: 308, col: 5, offset: 8281}, + pos: position{line: 308, col: 5, offset: 8284}, run: (*parser).callonLetBinding80, expr: &litMatcher{ - pos: position{line: 308, col: 5, offset: 8281}, + pos: position{line: 308, col: 5, offset: 8284}, val: "Kind", ignoreCase: false, want: "\"Kind\"", }, }, &actionExpr{ - pos: position{line: 309, col: 5, offset: 8313}, + pos: position{line: 309, col: 5, offset: 8316}, run: (*parser).callonLetBinding82, expr: &litMatcher{ - pos: position{line: 309, col: 5, offset: 8313}, + pos: position{line: 309, col: 5, offset: 8316}, val: "Sort", ignoreCase: false, want: "\"Sort\"", @@ -5845,7 +5845,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -5856,33 +5856,33 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 149, col: 51, offset: 3664}, + pos: position{line: 149, col: 51, offset: 3667}, label: "label", expr: &choiceExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, run: (*parser).callonLetBinding87, expr: &seqExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, val: "`", ignoreCase: false, want: "\"`\"", }, &labeledExpr{ - pos: position{line: 146, col: 13, offset: 3519}, + pos: position{line: 146, col: 13, offset: 3522}, label: "label", expr: &actionExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, run: (*parser).callonLetBinding91, expr: &oneOrMoreExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, expr: &charClassMatcher{ - pos: position{line: 143, col: 19, offset: 3419}, + pos: position{line: 143, col: 19, offset: 3422}, val: "[ -_a-~]", ranges: []rune{' ', '_', 'a', '~'}, ignoreCase: false, @@ -5892,7 +5892,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 146, col: 31, offset: 3537}, + pos: position{line: 146, col: 31, offset: 3540}, val: "`", ignoreCase: false, want: "\"`\"", @@ -5901,75 +5901,75 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, run: (*parser).callonLetBinding95, expr: &labeledExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, label: "label", expr: &choiceExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, run: (*parser).callonLetBinding98, expr: &seqExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonLetBinding107, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -5981,61 +5981,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -6043,9 +6043,9 @@ var g = &grammar{ }, }, &oneOrMoreExpr{ - pos: position{line: 137, col: 23, offset: 3220}, + pos: position{line: 137, col: 23, offset: 3223}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -6057,68 +6057,68 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, run: (*parser).callonLetBinding124, expr: &seqExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, exprs: []interface{}{ ¬Expr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, expr: &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonLetBinding134, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -6130,61 +6130,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -6193,7 +6193,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 135, col: 24, offset: 3147}, + pos: position{line: 135, col: 24, offset: 3150}, val: "[_A-Za-z]", chars: []rune{'_'}, ranges: []rune{'A', 'Z', 'a', 'z'}, @@ -6201,9 +6201,9 @@ var g = &grammar{ inverted: false, }, &zeroOrMoreExpr{ - pos: position{line: 138, col: 43, offset: 3314}, + pos: position{line: 138, col: 43, offset: 3317}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -6225,371 +6225,371 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 150, col: 19, offset: 3716}, + pos: position{line: 150, col: 19, offset: 3719}, run: (*parser).callonLetBinding152, expr: &seqExpr{ - pos: position{line: 150, col: 19, offset: 3716}, + pos: position{line: 150, col: 19, offset: 3719}, exprs: []interface{}{ ¬Expr{ - pos: position{line: 150, col: 19, offset: 3716}, + pos: position{line: 150, col: 19, offset: 3719}, expr: &choiceExpr{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, run: (*parser).callonLetBinding156, expr: &litMatcher{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, val: "Natural/fold", ignoreCase: false, want: "\"Natural/fold\"", }, }, &actionExpr{ - pos: position{line: 275, col: 5, offset: 6859}, + pos: position{line: 275, col: 5, offset: 6862}, run: (*parser).callonLetBinding158, expr: &litMatcher{ - pos: position{line: 275, col: 5, offset: 6859}, + pos: position{line: 275, col: 5, offset: 6862}, val: "Natural/build", ignoreCase: false, want: "\"Natural/build\"", }, }, &actionExpr{ - pos: position{line: 276, col: 5, offset: 6908}, + pos: position{line: 276, col: 5, offset: 6911}, run: (*parser).callonLetBinding160, expr: &litMatcher{ - pos: position{line: 276, col: 5, offset: 6908}, + pos: position{line: 276, col: 5, offset: 6911}, val: "Natural/isZero", ignoreCase: false, want: "\"Natural/isZero\"", }, }, &actionExpr{ - pos: position{line: 277, col: 5, offset: 6959}, + pos: position{line: 277, col: 5, offset: 6962}, run: (*parser).callonLetBinding162, expr: &litMatcher{ - pos: position{line: 277, col: 5, offset: 6959}, + pos: position{line: 277, col: 5, offset: 6962}, val: "Natural/even", ignoreCase: false, want: "\"Natural/even\"", }, }, &actionExpr{ - pos: position{line: 278, col: 5, offset: 7006}, + pos: position{line: 278, col: 5, offset: 7009}, run: (*parser).callonLetBinding164, expr: &litMatcher{ - pos: position{line: 278, col: 5, offset: 7006}, + pos: position{line: 278, col: 5, offset: 7009}, val: "Natural/odd", ignoreCase: false, want: "\"Natural/odd\"", }, }, &actionExpr{ - pos: position{line: 279, col: 5, offset: 7051}, + pos: position{line: 279, col: 5, offset: 7054}, run: (*parser).callonLetBinding166, expr: &litMatcher{ - pos: position{line: 279, col: 5, offset: 7051}, + pos: position{line: 279, col: 5, offset: 7054}, val: "Natural/toInteger", ignoreCase: false, want: "\"Natural/toInteger\"", }, }, &actionExpr{ - pos: position{line: 280, col: 5, offset: 7108}, + pos: position{line: 280, col: 5, offset: 7111}, run: (*parser).callonLetBinding168, expr: &litMatcher{ - pos: position{line: 280, col: 5, offset: 7108}, + pos: position{line: 280, col: 5, offset: 7111}, val: "Natural/show", ignoreCase: false, want: "\"Natural/show\"", }, }, &actionExpr{ - pos: position{line: 281, col: 5, offset: 7155}, + pos: position{line: 281, col: 5, offset: 7158}, run: (*parser).callonLetBinding170, expr: &litMatcher{ - pos: position{line: 281, col: 5, offset: 7155}, + pos: position{line: 281, col: 5, offset: 7158}, val: "Integer/toDouble", ignoreCase: false, want: "\"Integer/toDouble\"", }, }, &actionExpr{ - pos: position{line: 282, col: 5, offset: 7210}, + pos: position{line: 282, col: 5, offset: 7213}, run: (*parser).callonLetBinding172, expr: &litMatcher{ - pos: position{line: 282, col: 5, offset: 7210}, + pos: position{line: 282, col: 5, offset: 7213}, val: "Integer/show", ignoreCase: false, want: "\"Integer/show\"", }, }, &actionExpr{ - pos: position{line: 283, col: 5, offset: 7257}, + pos: position{line: 283, col: 5, offset: 7260}, run: (*parser).callonLetBinding174, expr: &litMatcher{ - pos: position{line: 283, col: 5, offset: 7257}, + pos: position{line: 283, col: 5, offset: 7260}, val: "Integer/negate", ignoreCase: false, want: "\"Integer/negate\"", }, }, &actionExpr{ - pos: position{line: 284, col: 5, offset: 7308}, + pos: position{line: 284, col: 5, offset: 7311}, run: (*parser).callonLetBinding176, expr: &litMatcher{ - pos: position{line: 284, col: 5, offset: 7308}, + pos: position{line: 284, col: 5, offset: 7311}, val: "Integer/clamp", ignoreCase: false, want: "\"Integer/clamp\"", }, }, &actionExpr{ - pos: position{line: 285, col: 5, offset: 7357}, + pos: position{line: 285, col: 5, offset: 7360}, run: (*parser).callonLetBinding178, expr: &litMatcher{ - pos: position{line: 285, col: 5, offset: 7357}, + pos: position{line: 285, col: 5, offset: 7360}, val: "Natural/subtract", ignoreCase: false, want: "\"Natural/subtract\"", }, }, &actionExpr{ - pos: position{line: 286, col: 5, offset: 7412}, + pos: position{line: 286, col: 5, offset: 7415}, run: (*parser).callonLetBinding180, expr: &litMatcher{ - pos: position{line: 286, col: 5, offset: 7412}, + pos: position{line: 286, col: 5, offset: 7415}, val: "Double/show", ignoreCase: false, want: "\"Double/show\"", }, }, &actionExpr{ - pos: position{line: 287, col: 5, offset: 7457}, + pos: position{line: 287, col: 5, offset: 7460}, run: (*parser).callonLetBinding182, expr: &litMatcher{ - pos: position{line: 287, col: 5, offset: 7457}, + pos: position{line: 287, col: 5, offset: 7460}, val: "List/build", ignoreCase: false, want: "\"List/build\"", }, }, &actionExpr{ - pos: position{line: 288, col: 5, offset: 7500}, + pos: position{line: 288, col: 5, offset: 7503}, run: (*parser).callonLetBinding184, expr: &litMatcher{ - pos: position{line: 288, col: 5, offset: 7500}, + pos: position{line: 288, col: 5, offset: 7503}, val: "List/fold", ignoreCase: false, want: "\"List/fold\"", }, }, &actionExpr{ - pos: position{line: 289, col: 5, offset: 7541}, + pos: position{line: 289, col: 5, offset: 7544}, run: (*parser).callonLetBinding186, expr: &litMatcher{ - pos: position{line: 289, col: 5, offset: 7541}, + pos: position{line: 289, col: 5, offset: 7544}, val: "List/length", ignoreCase: false, want: "\"List/length\"", }, }, &actionExpr{ - pos: position{line: 290, col: 5, offset: 7586}, + pos: position{line: 290, col: 5, offset: 7589}, run: (*parser).callonLetBinding188, expr: &litMatcher{ - pos: position{line: 290, col: 5, offset: 7586}, + pos: position{line: 290, col: 5, offset: 7589}, val: "List/head", ignoreCase: false, want: "\"List/head\"", }, }, &actionExpr{ - pos: position{line: 291, col: 5, offset: 7627}, + pos: position{line: 291, col: 5, offset: 7630}, run: (*parser).callonLetBinding190, expr: &litMatcher{ - pos: position{line: 291, col: 5, offset: 7627}, + pos: position{line: 291, col: 5, offset: 7630}, val: "List/last", ignoreCase: false, want: "\"List/last\"", }, }, &actionExpr{ - pos: position{line: 292, col: 5, offset: 7668}, + pos: position{line: 292, col: 5, offset: 7671}, run: (*parser).callonLetBinding192, expr: &litMatcher{ - pos: position{line: 292, col: 5, offset: 7668}, + pos: position{line: 292, col: 5, offset: 7671}, val: "List/indexed", ignoreCase: false, want: "\"List/indexed\"", }, }, &actionExpr{ - pos: position{line: 293, col: 5, offset: 7715}, + pos: position{line: 293, col: 5, offset: 7718}, run: (*parser).callonLetBinding194, expr: &litMatcher{ - pos: position{line: 293, col: 5, offset: 7715}, + pos: position{line: 293, col: 5, offset: 7718}, val: "List/reverse", ignoreCase: false, want: "\"List/reverse\"", }, }, &actionExpr{ - pos: position{line: 294, col: 5, offset: 7762}, + pos: position{line: 294, col: 5, offset: 7765}, run: (*parser).callonLetBinding196, expr: &litMatcher{ - pos: position{line: 294, col: 5, offset: 7762}, + pos: position{line: 294, col: 5, offset: 7765}, val: "Optional/fold", ignoreCase: false, want: "\"Optional/fold\"", }, }, &actionExpr{ - pos: position{line: 295, col: 5, offset: 7811}, + pos: position{line: 295, col: 5, offset: 7814}, run: (*parser).callonLetBinding198, expr: &litMatcher{ - pos: position{line: 295, col: 5, offset: 7811}, + pos: position{line: 295, col: 5, offset: 7814}, val: "Optional/build", ignoreCase: false, want: "\"Optional/build\"", }, }, &actionExpr{ - pos: position{line: 296, col: 5, offset: 7862}, + pos: position{line: 296, col: 5, offset: 7865}, run: (*parser).callonLetBinding200, expr: &litMatcher{ - pos: position{line: 296, col: 5, offset: 7862}, + pos: position{line: 296, col: 5, offset: 7865}, val: "Text/show", ignoreCase: false, want: "\"Text/show\"", }, }, &actionExpr{ - pos: position{line: 297, col: 5, offset: 7903}, + pos: position{line: 297, col: 5, offset: 7906}, run: (*parser).callonLetBinding202, expr: &litMatcher{ - pos: position{line: 297, col: 5, offset: 7903}, + pos: position{line: 297, col: 5, offset: 7906}, val: "Bool", ignoreCase: false, want: "\"Bool\"", }, }, &actionExpr{ - pos: position{line: 298, col: 5, offset: 7935}, + pos: position{line: 298, col: 5, offset: 7938}, run: (*parser).callonLetBinding204, expr: &litMatcher{ - pos: position{line: 298, col: 5, offset: 7935}, + pos: position{line: 298, col: 5, offset: 7938}, val: "True", ignoreCase: false, want: "\"True\"", }, }, &actionExpr{ - pos: position{line: 299, col: 5, offset: 7967}, + pos: position{line: 299, col: 5, offset: 7970}, run: (*parser).callonLetBinding206, expr: &litMatcher{ - pos: position{line: 299, col: 5, offset: 7967}, + pos: position{line: 299, col: 5, offset: 7970}, val: "False", ignoreCase: false, want: "\"False\"", }, }, &actionExpr{ - pos: position{line: 300, col: 5, offset: 8001}, + pos: position{line: 300, col: 5, offset: 8004}, run: (*parser).callonLetBinding208, expr: &litMatcher{ - pos: position{line: 300, col: 5, offset: 8001}, + pos: position{line: 300, col: 5, offset: 8004}, val: "Optional", ignoreCase: false, want: "\"Optional\"", }, }, &actionExpr{ - pos: position{line: 301, col: 5, offset: 8041}, + pos: position{line: 301, col: 5, offset: 8044}, run: (*parser).callonLetBinding210, expr: &litMatcher{ - pos: position{line: 301, col: 5, offset: 8041}, + pos: position{line: 301, col: 5, offset: 8044}, val: "None", ignoreCase: false, want: "\"None\"", }, }, &actionExpr{ - pos: position{line: 302, col: 5, offset: 8073}, + pos: position{line: 302, col: 5, offset: 8076}, run: (*parser).callonLetBinding212, expr: &litMatcher{ - pos: position{line: 302, col: 5, offset: 8073}, + pos: position{line: 302, col: 5, offset: 8076}, val: "Natural", ignoreCase: false, want: "\"Natural\"", }, }, &actionExpr{ - pos: position{line: 303, col: 5, offset: 8111}, + pos: position{line: 303, col: 5, offset: 8114}, run: (*parser).callonLetBinding214, expr: &litMatcher{ - pos: position{line: 303, col: 5, offset: 8111}, + pos: position{line: 303, col: 5, offset: 8114}, val: "Integer", ignoreCase: false, want: "\"Integer\"", }, }, &actionExpr{ - pos: position{line: 304, col: 5, offset: 8149}, + pos: position{line: 304, col: 5, offset: 8152}, run: (*parser).callonLetBinding216, expr: &litMatcher{ - pos: position{line: 304, col: 5, offset: 8149}, + pos: position{line: 304, col: 5, offset: 8152}, val: "Double", ignoreCase: false, want: "\"Double\"", }, }, &actionExpr{ - pos: position{line: 305, col: 5, offset: 8185}, + pos: position{line: 305, col: 5, offset: 8188}, run: (*parser).callonLetBinding218, expr: &litMatcher{ - pos: position{line: 305, col: 5, offset: 8185}, + pos: position{line: 305, col: 5, offset: 8188}, val: "Text", ignoreCase: false, want: "\"Text\"", }, }, &actionExpr{ - pos: position{line: 306, col: 5, offset: 8217}, + pos: position{line: 306, col: 5, offset: 8220}, run: (*parser).callonLetBinding220, expr: &litMatcher{ - pos: position{line: 306, col: 5, offset: 8217}, + pos: position{line: 306, col: 5, offset: 8220}, val: "List", ignoreCase: false, want: "\"List\"", }, }, &actionExpr{ - pos: position{line: 307, col: 5, offset: 8249}, + pos: position{line: 307, col: 5, offset: 8252}, run: (*parser).callonLetBinding222, expr: &litMatcher{ - pos: position{line: 307, col: 5, offset: 8249}, + pos: position{line: 307, col: 5, offset: 8252}, val: "Type", ignoreCase: false, want: "\"Type\"", }, }, &actionExpr{ - pos: position{line: 308, col: 5, offset: 8281}, + pos: position{line: 308, col: 5, offset: 8284}, run: (*parser).callonLetBinding224, expr: &litMatcher{ - pos: position{line: 308, col: 5, offset: 8281}, + pos: position{line: 308, col: 5, offset: 8284}, val: "Kind", ignoreCase: false, want: "\"Kind\"", }, }, &actionExpr{ - pos: position{line: 309, col: 5, offset: 8313}, + pos: position{line: 309, col: 5, offset: 8316}, run: (*parser).callonLetBinding226, expr: &litMatcher{ - pos: position{line: 309, col: 5, offset: 8313}, + pos: position{line: 309, col: 5, offset: 8316}, val: "Sort", ignoreCase: false, want: "\"Sort\"", @@ -6599,33 +6599,33 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 150, col: 28, offset: 3725}, + pos: position{line: 150, col: 28, offset: 3728}, label: "label", expr: &choiceExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, run: (*parser).callonLetBinding230, expr: &seqExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, val: "`", ignoreCase: false, want: "\"`\"", }, &labeledExpr{ - pos: position{line: 146, col: 13, offset: 3519}, + pos: position{line: 146, col: 13, offset: 3522}, label: "label", expr: &actionExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, run: (*parser).callonLetBinding234, expr: &oneOrMoreExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, expr: &charClassMatcher{ - pos: position{line: 143, col: 19, offset: 3419}, + pos: position{line: 143, col: 19, offset: 3422}, val: "[ -_a-~]", ranges: []rune{' ', '_', 'a', '~'}, ignoreCase: false, @@ -6635,7 +6635,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 146, col: 31, offset: 3537}, + pos: position{line: 146, col: 31, offset: 3540}, val: "`", ignoreCase: false, want: "\"`\"", @@ -6644,75 +6644,75 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, run: (*parser).callonLetBinding238, expr: &labeledExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, label: "label", expr: &choiceExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, run: (*parser).callonLetBinding241, expr: &seqExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonLetBinding250, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -6724,61 +6724,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -6786,9 +6786,9 @@ var g = &grammar{ }, }, &oneOrMoreExpr{ - pos: position{line: 137, col: 23, offset: 3220}, + pos: position{line: 137, col: 23, offset: 3223}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -6800,68 +6800,68 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, run: (*parser).callonLetBinding267, expr: &seqExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, exprs: []interface{}{ ¬Expr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, expr: &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonLetBinding277, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -6873,61 +6873,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -6936,7 +6936,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 135, col: 24, offset: 3147}, + pos: position{line: 135, col: 24, offset: 3150}, val: "[_A-Za-z]", chars: []rune{'_'}, ranges: []rune{'A', 'Z', 'a', 'z'}, @@ -6944,9 +6944,9 @@ var g = &grammar{ inverted: false, }, &zeroOrMoreExpr{ - pos: position{line: 138, col: 43, offset: 3314}, + pos: position{line: 138, col: 43, offset: 3317}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -6971,23 +6971,23 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 511, col: 44, offset: 14560}, + pos: position{line: 511, col: 44, offset: 14563}, name: "_", }, &labeledExpr{ - pos: position{line: 511, col: 46, offset: 14562}, + pos: position{line: 511, col: 46, offset: 14565}, label: "a", expr: &zeroOrOneExpr{ - pos: position{line: 511, col: 48, offset: 14564}, + pos: position{line: 511, col: 48, offset: 14567}, expr: &seqExpr{ - pos: position{line: 511, col: 49, offset: 14565}, + pos: position{line: 511, col: 49, offset: 14568}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 511, col: 49, offset: 14565}, + pos: position{line: 511, col: 49, offset: 14568}, name: "Annotation", }, &ruleRefExpr{ - pos: position{line: 511, col: 60, offset: 14576}, + pos: position{line: 511, col: 60, offset: 14579}, name: "_", }, }, @@ -6995,25 +6995,25 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 512, col: 13, offset: 14592}, + pos: position{line: 512, col: 13, offset: 14595}, val: "=", ignoreCase: false, want: "\"=\"", }, &ruleRefExpr{ - pos: position{line: 512, col: 17, offset: 14596}, + pos: position{line: 512, col: 17, offset: 14599}, name: "_", }, &labeledExpr{ - pos: position{line: 512, col: 19, offset: 14598}, + pos: position{line: 512, col: 19, offset: 14601}, label: "v", expr: &ruleRefExpr{ - pos: position{line: 512, col: 21, offset: 14600}, + pos: position{line: 512, col: 21, offset: 14603}, name: "Expression", }, }, &ruleRefExpr{ - pos: position{line: 512, col: 32, offset: 14611}, + pos: position{line: 512, col: 32, offset: 14614}, name: "_", }, }, @@ -7022,412 +7022,412 @@ var g = &grammar{ }, { name: "Expression", - pos: position{line: 527, col: 1, offset: 14920}, + pos: position{line: 527, col: 1, offset: 14923}, expr: &choiceExpr{ - pos: position{line: 528, col: 7, offset: 14941}, + pos: position{line: 528, col: 7, offset: 14944}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 528, col: 7, offset: 14941}, + pos: position{line: 528, col: 7, offset: 14944}, run: (*parser).callonExpression2, expr: &seqExpr{ - pos: position{line: 528, col: 7, offset: 14941}, + pos: position{line: 528, col: 7, offset: 14944}, exprs: []interface{}{ &charClassMatcher{ - pos: position{line: 318, col: 10, offset: 8507}, + pos: position{line: 318, col: 10, offset: 8510}, val: "[\\\\λ]", chars: []rune{'\\', 'λ'}, ignoreCase: false, inverted: false, }, &ruleRefExpr{ - pos: position{line: 528, col: 14, offset: 14948}, + pos: position{line: 528, col: 14, offset: 14951}, name: "_", }, &litMatcher{ - pos: position{line: 528, col: 16, offset: 14950}, + pos: position{line: 528, col: 16, offset: 14953}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 528, col: 20, offset: 14954}, + pos: position{line: 528, col: 20, offset: 14957}, name: "_", }, &labeledExpr{ - pos: position{line: 528, col: 22, offset: 14956}, + pos: position{line: 528, col: 22, offset: 14959}, label: "label", expr: &choiceExpr{ - pos: position{line: 149, col: 20, offset: 3633}, + pos: position{line: 149, col: 20, offset: 3636}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 149, col: 20, offset: 3633}, + pos: position{line: 149, col: 20, offset: 3636}, run: (*parser).callonExpression10, expr: &seqExpr{ - pos: position{line: 149, col: 20, offset: 3633}, + pos: position{line: 149, col: 20, offset: 3636}, exprs: []interface{}{ &andExpr{ - pos: position{line: 149, col: 20, offset: 3633}, + pos: position{line: 149, col: 20, offset: 3636}, expr: &seqExpr{ - pos: position{line: 149, col: 22, offset: 3635}, + pos: position{line: 149, col: 22, offset: 3638}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, run: (*parser).callonExpression15, expr: &litMatcher{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, val: "Natural/fold", ignoreCase: false, want: "\"Natural/fold\"", }, }, &actionExpr{ - pos: position{line: 275, col: 5, offset: 6859}, + pos: position{line: 275, col: 5, offset: 6862}, run: (*parser).callonExpression17, expr: &litMatcher{ - pos: position{line: 275, col: 5, offset: 6859}, + pos: position{line: 275, col: 5, offset: 6862}, val: "Natural/build", ignoreCase: false, want: "\"Natural/build\"", }, }, &actionExpr{ - pos: position{line: 276, col: 5, offset: 6908}, + pos: position{line: 276, col: 5, offset: 6911}, run: (*parser).callonExpression19, expr: &litMatcher{ - pos: position{line: 276, col: 5, offset: 6908}, + pos: position{line: 276, col: 5, offset: 6911}, val: "Natural/isZero", ignoreCase: false, want: "\"Natural/isZero\"", }, }, &actionExpr{ - pos: position{line: 277, col: 5, offset: 6959}, + pos: position{line: 277, col: 5, offset: 6962}, run: (*parser).callonExpression21, expr: &litMatcher{ - pos: position{line: 277, col: 5, offset: 6959}, + pos: position{line: 277, col: 5, offset: 6962}, val: "Natural/even", ignoreCase: false, want: "\"Natural/even\"", }, }, &actionExpr{ - pos: position{line: 278, col: 5, offset: 7006}, + pos: position{line: 278, col: 5, offset: 7009}, run: (*parser).callonExpression23, expr: &litMatcher{ - pos: position{line: 278, col: 5, offset: 7006}, + pos: position{line: 278, col: 5, offset: 7009}, val: "Natural/odd", ignoreCase: false, want: "\"Natural/odd\"", }, }, &actionExpr{ - pos: position{line: 279, col: 5, offset: 7051}, + pos: position{line: 279, col: 5, offset: 7054}, run: (*parser).callonExpression25, expr: &litMatcher{ - pos: position{line: 279, col: 5, offset: 7051}, + pos: position{line: 279, col: 5, offset: 7054}, val: "Natural/toInteger", ignoreCase: false, want: "\"Natural/toInteger\"", }, }, &actionExpr{ - pos: position{line: 280, col: 5, offset: 7108}, + pos: position{line: 280, col: 5, offset: 7111}, run: (*parser).callonExpression27, expr: &litMatcher{ - pos: position{line: 280, col: 5, offset: 7108}, + pos: position{line: 280, col: 5, offset: 7111}, val: "Natural/show", ignoreCase: false, want: "\"Natural/show\"", }, }, &actionExpr{ - pos: position{line: 281, col: 5, offset: 7155}, + pos: position{line: 281, col: 5, offset: 7158}, run: (*parser).callonExpression29, expr: &litMatcher{ - pos: position{line: 281, col: 5, offset: 7155}, + pos: position{line: 281, col: 5, offset: 7158}, val: "Integer/toDouble", ignoreCase: false, want: "\"Integer/toDouble\"", }, }, &actionExpr{ - pos: position{line: 282, col: 5, offset: 7210}, + pos: position{line: 282, col: 5, offset: 7213}, run: (*parser).callonExpression31, expr: &litMatcher{ - pos: position{line: 282, col: 5, offset: 7210}, + pos: position{line: 282, col: 5, offset: 7213}, val: "Integer/show", ignoreCase: false, want: "\"Integer/show\"", }, }, &actionExpr{ - pos: position{line: 283, col: 5, offset: 7257}, + pos: position{line: 283, col: 5, offset: 7260}, run: (*parser).callonExpression33, expr: &litMatcher{ - pos: position{line: 283, col: 5, offset: 7257}, + pos: position{line: 283, col: 5, offset: 7260}, val: "Integer/negate", ignoreCase: false, want: "\"Integer/negate\"", }, }, &actionExpr{ - pos: position{line: 284, col: 5, offset: 7308}, + pos: position{line: 284, col: 5, offset: 7311}, run: (*parser).callonExpression35, expr: &litMatcher{ - pos: position{line: 284, col: 5, offset: 7308}, + pos: position{line: 284, col: 5, offset: 7311}, val: "Integer/clamp", ignoreCase: false, want: "\"Integer/clamp\"", }, }, &actionExpr{ - pos: position{line: 285, col: 5, offset: 7357}, + pos: position{line: 285, col: 5, offset: 7360}, run: (*parser).callonExpression37, expr: &litMatcher{ - pos: position{line: 285, col: 5, offset: 7357}, + pos: position{line: 285, col: 5, offset: 7360}, val: "Natural/subtract", ignoreCase: false, want: "\"Natural/subtract\"", }, }, &actionExpr{ - pos: position{line: 286, col: 5, offset: 7412}, + pos: position{line: 286, col: 5, offset: 7415}, run: (*parser).callonExpression39, expr: &litMatcher{ - pos: position{line: 286, col: 5, offset: 7412}, + pos: position{line: 286, col: 5, offset: 7415}, val: "Double/show", ignoreCase: false, want: "\"Double/show\"", }, }, &actionExpr{ - pos: position{line: 287, col: 5, offset: 7457}, + pos: position{line: 287, col: 5, offset: 7460}, run: (*parser).callonExpression41, expr: &litMatcher{ - pos: position{line: 287, col: 5, offset: 7457}, + pos: position{line: 287, col: 5, offset: 7460}, val: "List/build", ignoreCase: false, want: "\"List/build\"", }, }, &actionExpr{ - pos: position{line: 288, col: 5, offset: 7500}, + pos: position{line: 288, col: 5, offset: 7503}, run: (*parser).callonExpression43, expr: &litMatcher{ - pos: position{line: 288, col: 5, offset: 7500}, + pos: position{line: 288, col: 5, offset: 7503}, val: "List/fold", ignoreCase: false, want: "\"List/fold\"", }, }, &actionExpr{ - pos: position{line: 289, col: 5, offset: 7541}, + pos: position{line: 289, col: 5, offset: 7544}, run: (*parser).callonExpression45, expr: &litMatcher{ - pos: position{line: 289, col: 5, offset: 7541}, + pos: position{line: 289, col: 5, offset: 7544}, val: "List/length", ignoreCase: false, want: "\"List/length\"", }, }, &actionExpr{ - pos: position{line: 290, col: 5, offset: 7586}, + pos: position{line: 290, col: 5, offset: 7589}, run: (*parser).callonExpression47, expr: &litMatcher{ - pos: position{line: 290, col: 5, offset: 7586}, + pos: position{line: 290, col: 5, offset: 7589}, val: "List/head", ignoreCase: false, want: "\"List/head\"", }, }, &actionExpr{ - pos: position{line: 291, col: 5, offset: 7627}, + pos: position{line: 291, col: 5, offset: 7630}, run: (*parser).callonExpression49, expr: &litMatcher{ - pos: position{line: 291, col: 5, offset: 7627}, + pos: position{line: 291, col: 5, offset: 7630}, val: "List/last", ignoreCase: false, want: "\"List/last\"", }, }, &actionExpr{ - pos: position{line: 292, col: 5, offset: 7668}, + pos: position{line: 292, col: 5, offset: 7671}, run: (*parser).callonExpression51, expr: &litMatcher{ - pos: position{line: 292, col: 5, offset: 7668}, + pos: position{line: 292, col: 5, offset: 7671}, val: "List/indexed", ignoreCase: false, want: "\"List/indexed\"", }, }, &actionExpr{ - pos: position{line: 293, col: 5, offset: 7715}, + pos: position{line: 293, col: 5, offset: 7718}, run: (*parser).callonExpression53, expr: &litMatcher{ - pos: position{line: 293, col: 5, offset: 7715}, + pos: position{line: 293, col: 5, offset: 7718}, val: "List/reverse", ignoreCase: false, want: "\"List/reverse\"", }, }, &actionExpr{ - pos: position{line: 294, col: 5, offset: 7762}, + pos: position{line: 294, col: 5, offset: 7765}, run: (*parser).callonExpression55, expr: &litMatcher{ - pos: position{line: 294, col: 5, offset: 7762}, + pos: position{line: 294, col: 5, offset: 7765}, val: "Optional/fold", ignoreCase: false, want: "\"Optional/fold\"", }, }, &actionExpr{ - pos: position{line: 295, col: 5, offset: 7811}, + pos: position{line: 295, col: 5, offset: 7814}, run: (*parser).callonExpression57, expr: &litMatcher{ - pos: position{line: 295, col: 5, offset: 7811}, + pos: position{line: 295, col: 5, offset: 7814}, val: "Optional/build", ignoreCase: false, want: "\"Optional/build\"", }, }, &actionExpr{ - pos: position{line: 296, col: 5, offset: 7862}, + pos: position{line: 296, col: 5, offset: 7865}, run: (*parser).callonExpression59, expr: &litMatcher{ - pos: position{line: 296, col: 5, offset: 7862}, + pos: position{line: 296, col: 5, offset: 7865}, val: "Text/show", ignoreCase: false, want: "\"Text/show\"", }, }, &actionExpr{ - pos: position{line: 297, col: 5, offset: 7903}, + pos: position{line: 297, col: 5, offset: 7906}, run: (*parser).callonExpression61, expr: &litMatcher{ - pos: position{line: 297, col: 5, offset: 7903}, + pos: position{line: 297, col: 5, offset: 7906}, val: "Bool", ignoreCase: false, want: "\"Bool\"", }, }, &actionExpr{ - pos: position{line: 298, col: 5, offset: 7935}, + pos: position{line: 298, col: 5, offset: 7938}, run: (*parser).callonExpression63, expr: &litMatcher{ - pos: position{line: 298, col: 5, offset: 7935}, + pos: position{line: 298, col: 5, offset: 7938}, val: "True", ignoreCase: false, want: "\"True\"", }, }, &actionExpr{ - pos: position{line: 299, col: 5, offset: 7967}, + pos: position{line: 299, col: 5, offset: 7970}, run: (*parser).callonExpression65, expr: &litMatcher{ - pos: position{line: 299, col: 5, offset: 7967}, + pos: position{line: 299, col: 5, offset: 7970}, val: "False", ignoreCase: false, want: "\"False\"", }, }, &actionExpr{ - pos: position{line: 300, col: 5, offset: 8001}, + pos: position{line: 300, col: 5, offset: 8004}, run: (*parser).callonExpression67, expr: &litMatcher{ - pos: position{line: 300, col: 5, offset: 8001}, + pos: position{line: 300, col: 5, offset: 8004}, val: "Optional", ignoreCase: false, want: "\"Optional\"", }, }, &actionExpr{ - pos: position{line: 301, col: 5, offset: 8041}, + pos: position{line: 301, col: 5, offset: 8044}, run: (*parser).callonExpression69, expr: &litMatcher{ - pos: position{line: 301, col: 5, offset: 8041}, + pos: position{line: 301, col: 5, offset: 8044}, val: "None", ignoreCase: false, want: "\"None\"", }, }, &actionExpr{ - pos: position{line: 302, col: 5, offset: 8073}, + pos: position{line: 302, col: 5, offset: 8076}, run: (*parser).callonExpression71, expr: &litMatcher{ - pos: position{line: 302, col: 5, offset: 8073}, + pos: position{line: 302, col: 5, offset: 8076}, val: "Natural", ignoreCase: false, want: "\"Natural\"", }, }, &actionExpr{ - pos: position{line: 303, col: 5, offset: 8111}, + pos: position{line: 303, col: 5, offset: 8114}, run: (*parser).callonExpression73, expr: &litMatcher{ - pos: position{line: 303, col: 5, offset: 8111}, + pos: position{line: 303, col: 5, offset: 8114}, val: "Integer", ignoreCase: false, want: "\"Integer\"", }, }, &actionExpr{ - pos: position{line: 304, col: 5, offset: 8149}, + pos: position{line: 304, col: 5, offset: 8152}, run: (*parser).callonExpression75, expr: &litMatcher{ - pos: position{line: 304, col: 5, offset: 8149}, + pos: position{line: 304, col: 5, offset: 8152}, val: "Double", ignoreCase: false, want: "\"Double\"", }, }, &actionExpr{ - pos: position{line: 305, col: 5, offset: 8185}, + pos: position{line: 305, col: 5, offset: 8188}, run: (*parser).callonExpression77, expr: &litMatcher{ - pos: position{line: 305, col: 5, offset: 8185}, + pos: position{line: 305, col: 5, offset: 8188}, val: "Text", ignoreCase: false, want: "\"Text\"", }, }, &actionExpr{ - pos: position{line: 306, col: 5, offset: 8217}, + pos: position{line: 306, col: 5, offset: 8220}, run: (*parser).callonExpression79, expr: &litMatcher{ - pos: position{line: 306, col: 5, offset: 8217}, + pos: position{line: 306, col: 5, offset: 8220}, val: "List", ignoreCase: false, want: "\"List\"", }, }, &actionExpr{ - pos: position{line: 307, col: 5, offset: 8249}, + pos: position{line: 307, col: 5, offset: 8252}, run: (*parser).callonExpression81, expr: &litMatcher{ - pos: position{line: 307, col: 5, offset: 8249}, + pos: position{line: 307, col: 5, offset: 8252}, val: "Type", ignoreCase: false, want: "\"Type\"", }, }, &actionExpr{ - pos: position{line: 308, col: 5, offset: 8281}, + pos: position{line: 308, col: 5, offset: 8284}, run: (*parser).callonExpression83, expr: &litMatcher{ - pos: position{line: 308, col: 5, offset: 8281}, + pos: position{line: 308, col: 5, offset: 8284}, val: "Kind", ignoreCase: false, want: "\"Kind\"", }, }, &actionExpr{ - pos: position{line: 309, col: 5, offset: 8313}, + pos: position{line: 309, col: 5, offset: 8316}, run: (*parser).callonExpression85, expr: &litMatcher{ - pos: position{line: 309, col: 5, offset: 8313}, + pos: position{line: 309, col: 5, offset: 8316}, val: "Sort", ignoreCase: false, want: "\"Sort\"", @@ -7436,7 +7436,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -7447,33 +7447,33 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 149, col: 51, offset: 3664}, + pos: position{line: 149, col: 51, offset: 3667}, label: "label", expr: &choiceExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, run: (*parser).callonExpression90, expr: &seqExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, val: "`", ignoreCase: false, want: "\"`\"", }, &labeledExpr{ - pos: position{line: 146, col: 13, offset: 3519}, + pos: position{line: 146, col: 13, offset: 3522}, label: "label", expr: &actionExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, run: (*parser).callonExpression94, expr: &oneOrMoreExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, expr: &charClassMatcher{ - pos: position{line: 143, col: 19, offset: 3419}, + pos: position{line: 143, col: 19, offset: 3422}, val: "[ -_a-~]", ranges: []rune{' ', '_', 'a', '~'}, ignoreCase: false, @@ -7483,7 +7483,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 146, col: 31, offset: 3537}, + pos: position{line: 146, col: 31, offset: 3540}, val: "`", ignoreCase: false, want: "\"`\"", @@ -7492,75 +7492,75 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, run: (*parser).callonExpression98, expr: &labeledExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, label: "label", expr: &choiceExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, run: (*parser).callonExpression101, expr: &seqExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonExpression110, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -7572,61 +7572,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -7634,9 +7634,9 @@ var g = &grammar{ }, }, &oneOrMoreExpr{ - pos: position{line: 137, col: 23, offset: 3220}, + pos: position{line: 137, col: 23, offset: 3223}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -7648,68 +7648,68 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, run: (*parser).callonExpression127, expr: &seqExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, exprs: []interface{}{ ¬Expr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, expr: &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonExpression137, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -7721,61 +7721,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -7784,7 +7784,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 135, col: 24, offset: 3147}, + pos: position{line: 135, col: 24, offset: 3150}, val: "[_A-Za-z]", chars: []rune{'_'}, ranges: []rune{'A', 'Z', 'a', 'z'}, @@ -7792,9 +7792,9 @@ var g = &grammar{ inverted: false, }, &zeroOrMoreExpr{ - pos: position{line: 138, col: 43, offset: 3314}, + pos: position{line: 138, col: 43, offset: 3317}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -7816,371 +7816,371 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 150, col: 19, offset: 3716}, + pos: position{line: 150, col: 19, offset: 3719}, run: (*parser).callonExpression155, expr: &seqExpr{ - pos: position{line: 150, col: 19, offset: 3716}, + pos: position{line: 150, col: 19, offset: 3719}, exprs: []interface{}{ ¬Expr{ - pos: position{line: 150, col: 19, offset: 3716}, + pos: position{line: 150, col: 19, offset: 3719}, expr: &choiceExpr{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, run: (*parser).callonExpression159, expr: &litMatcher{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, val: "Natural/fold", ignoreCase: false, want: "\"Natural/fold\"", }, }, &actionExpr{ - pos: position{line: 275, col: 5, offset: 6859}, + pos: position{line: 275, col: 5, offset: 6862}, run: (*parser).callonExpression161, expr: &litMatcher{ - pos: position{line: 275, col: 5, offset: 6859}, + pos: position{line: 275, col: 5, offset: 6862}, val: "Natural/build", ignoreCase: false, want: "\"Natural/build\"", }, }, &actionExpr{ - pos: position{line: 276, col: 5, offset: 6908}, + pos: position{line: 276, col: 5, offset: 6911}, run: (*parser).callonExpression163, expr: &litMatcher{ - pos: position{line: 276, col: 5, offset: 6908}, + pos: position{line: 276, col: 5, offset: 6911}, val: "Natural/isZero", ignoreCase: false, want: "\"Natural/isZero\"", }, }, &actionExpr{ - pos: position{line: 277, col: 5, offset: 6959}, + pos: position{line: 277, col: 5, offset: 6962}, run: (*parser).callonExpression165, expr: &litMatcher{ - pos: position{line: 277, col: 5, offset: 6959}, + pos: position{line: 277, col: 5, offset: 6962}, val: "Natural/even", ignoreCase: false, want: "\"Natural/even\"", }, }, &actionExpr{ - pos: position{line: 278, col: 5, offset: 7006}, + pos: position{line: 278, col: 5, offset: 7009}, run: (*parser).callonExpression167, expr: &litMatcher{ - pos: position{line: 278, col: 5, offset: 7006}, + pos: position{line: 278, col: 5, offset: 7009}, val: "Natural/odd", ignoreCase: false, want: "\"Natural/odd\"", }, }, &actionExpr{ - pos: position{line: 279, col: 5, offset: 7051}, + pos: position{line: 279, col: 5, offset: 7054}, run: (*parser).callonExpression169, expr: &litMatcher{ - pos: position{line: 279, col: 5, offset: 7051}, + pos: position{line: 279, col: 5, offset: 7054}, val: "Natural/toInteger", ignoreCase: false, want: "\"Natural/toInteger\"", }, }, &actionExpr{ - pos: position{line: 280, col: 5, offset: 7108}, + pos: position{line: 280, col: 5, offset: 7111}, run: (*parser).callonExpression171, expr: &litMatcher{ - pos: position{line: 280, col: 5, offset: 7108}, + pos: position{line: 280, col: 5, offset: 7111}, val: "Natural/show", ignoreCase: false, want: "\"Natural/show\"", }, }, &actionExpr{ - pos: position{line: 281, col: 5, offset: 7155}, + pos: position{line: 281, col: 5, offset: 7158}, run: (*parser).callonExpression173, expr: &litMatcher{ - pos: position{line: 281, col: 5, offset: 7155}, + pos: position{line: 281, col: 5, offset: 7158}, val: "Integer/toDouble", ignoreCase: false, want: "\"Integer/toDouble\"", }, }, &actionExpr{ - pos: position{line: 282, col: 5, offset: 7210}, + pos: position{line: 282, col: 5, offset: 7213}, run: (*parser).callonExpression175, expr: &litMatcher{ - pos: position{line: 282, col: 5, offset: 7210}, + pos: position{line: 282, col: 5, offset: 7213}, val: "Integer/show", ignoreCase: false, want: "\"Integer/show\"", }, }, &actionExpr{ - pos: position{line: 283, col: 5, offset: 7257}, + pos: position{line: 283, col: 5, offset: 7260}, run: (*parser).callonExpression177, expr: &litMatcher{ - pos: position{line: 283, col: 5, offset: 7257}, + pos: position{line: 283, col: 5, offset: 7260}, val: "Integer/negate", ignoreCase: false, want: "\"Integer/negate\"", }, }, &actionExpr{ - pos: position{line: 284, col: 5, offset: 7308}, + pos: position{line: 284, col: 5, offset: 7311}, run: (*parser).callonExpression179, expr: &litMatcher{ - pos: position{line: 284, col: 5, offset: 7308}, + pos: position{line: 284, col: 5, offset: 7311}, val: "Integer/clamp", ignoreCase: false, want: "\"Integer/clamp\"", }, }, &actionExpr{ - pos: position{line: 285, col: 5, offset: 7357}, + pos: position{line: 285, col: 5, offset: 7360}, run: (*parser).callonExpression181, expr: &litMatcher{ - pos: position{line: 285, col: 5, offset: 7357}, + pos: position{line: 285, col: 5, offset: 7360}, val: "Natural/subtract", ignoreCase: false, want: "\"Natural/subtract\"", }, }, &actionExpr{ - pos: position{line: 286, col: 5, offset: 7412}, + pos: position{line: 286, col: 5, offset: 7415}, run: (*parser).callonExpression183, expr: &litMatcher{ - pos: position{line: 286, col: 5, offset: 7412}, + pos: position{line: 286, col: 5, offset: 7415}, val: "Double/show", ignoreCase: false, want: "\"Double/show\"", }, }, &actionExpr{ - pos: position{line: 287, col: 5, offset: 7457}, + pos: position{line: 287, col: 5, offset: 7460}, run: (*parser).callonExpression185, expr: &litMatcher{ - pos: position{line: 287, col: 5, offset: 7457}, + pos: position{line: 287, col: 5, offset: 7460}, val: "List/build", ignoreCase: false, want: "\"List/build\"", }, }, &actionExpr{ - pos: position{line: 288, col: 5, offset: 7500}, + pos: position{line: 288, col: 5, offset: 7503}, run: (*parser).callonExpression187, expr: &litMatcher{ - pos: position{line: 288, col: 5, offset: 7500}, + pos: position{line: 288, col: 5, offset: 7503}, val: "List/fold", ignoreCase: false, want: "\"List/fold\"", }, }, &actionExpr{ - pos: position{line: 289, col: 5, offset: 7541}, + pos: position{line: 289, col: 5, offset: 7544}, run: (*parser).callonExpression189, expr: &litMatcher{ - pos: position{line: 289, col: 5, offset: 7541}, + pos: position{line: 289, col: 5, offset: 7544}, val: "List/length", ignoreCase: false, want: "\"List/length\"", }, }, &actionExpr{ - pos: position{line: 290, col: 5, offset: 7586}, + pos: position{line: 290, col: 5, offset: 7589}, run: (*parser).callonExpression191, expr: &litMatcher{ - pos: position{line: 290, col: 5, offset: 7586}, + pos: position{line: 290, col: 5, offset: 7589}, val: "List/head", ignoreCase: false, want: "\"List/head\"", }, }, &actionExpr{ - pos: position{line: 291, col: 5, offset: 7627}, + pos: position{line: 291, col: 5, offset: 7630}, run: (*parser).callonExpression193, expr: &litMatcher{ - pos: position{line: 291, col: 5, offset: 7627}, + pos: position{line: 291, col: 5, offset: 7630}, val: "List/last", ignoreCase: false, want: "\"List/last\"", }, }, &actionExpr{ - pos: position{line: 292, col: 5, offset: 7668}, + pos: position{line: 292, col: 5, offset: 7671}, run: (*parser).callonExpression195, expr: &litMatcher{ - pos: position{line: 292, col: 5, offset: 7668}, + pos: position{line: 292, col: 5, offset: 7671}, val: "List/indexed", ignoreCase: false, want: "\"List/indexed\"", }, }, &actionExpr{ - pos: position{line: 293, col: 5, offset: 7715}, + pos: position{line: 293, col: 5, offset: 7718}, run: (*parser).callonExpression197, expr: &litMatcher{ - pos: position{line: 293, col: 5, offset: 7715}, + pos: position{line: 293, col: 5, offset: 7718}, val: "List/reverse", ignoreCase: false, want: "\"List/reverse\"", }, }, &actionExpr{ - pos: position{line: 294, col: 5, offset: 7762}, + pos: position{line: 294, col: 5, offset: 7765}, run: (*parser).callonExpression199, expr: &litMatcher{ - pos: position{line: 294, col: 5, offset: 7762}, + pos: position{line: 294, col: 5, offset: 7765}, val: "Optional/fold", ignoreCase: false, want: "\"Optional/fold\"", }, }, &actionExpr{ - pos: position{line: 295, col: 5, offset: 7811}, + pos: position{line: 295, col: 5, offset: 7814}, run: (*parser).callonExpression201, expr: &litMatcher{ - pos: position{line: 295, col: 5, offset: 7811}, + pos: position{line: 295, col: 5, offset: 7814}, val: "Optional/build", ignoreCase: false, want: "\"Optional/build\"", }, }, &actionExpr{ - pos: position{line: 296, col: 5, offset: 7862}, + pos: position{line: 296, col: 5, offset: 7865}, run: (*parser).callonExpression203, expr: &litMatcher{ - pos: position{line: 296, col: 5, offset: 7862}, + pos: position{line: 296, col: 5, offset: 7865}, val: "Text/show", ignoreCase: false, want: "\"Text/show\"", }, }, &actionExpr{ - pos: position{line: 297, col: 5, offset: 7903}, + pos: position{line: 297, col: 5, offset: 7906}, run: (*parser).callonExpression205, expr: &litMatcher{ - pos: position{line: 297, col: 5, offset: 7903}, + pos: position{line: 297, col: 5, offset: 7906}, val: "Bool", ignoreCase: false, want: "\"Bool\"", }, }, &actionExpr{ - pos: position{line: 298, col: 5, offset: 7935}, + pos: position{line: 298, col: 5, offset: 7938}, run: (*parser).callonExpression207, expr: &litMatcher{ - pos: position{line: 298, col: 5, offset: 7935}, + pos: position{line: 298, col: 5, offset: 7938}, val: "True", ignoreCase: false, want: "\"True\"", }, }, &actionExpr{ - pos: position{line: 299, col: 5, offset: 7967}, + pos: position{line: 299, col: 5, offset: 7970}, run: (*parser).callonExpression209, expr: &litMatcher{ - pos: position{line: 299, col: 5, offset: 7967}, + pos: position{line: 299, col: 5, offset: 7970}, val: "False", ignoreCase: false, want: "\"False\"", }, }, &actionExpr{ - pos: position{line: 300, col: 5, offset: 8001}, + pos: position{line: 300, col: 5, offset: 8004}, run: (*parser).callonExpression211, expr: &litMatcher{ - pos: position{line: 300, col: 5, offset: 8001}, + pos: position{line: 300, col: 5, offset: 8004}, val: "Optional", ignoreCase: false, want: "\"Optional\"", }, }, &actionExpr{ - pos: position{line: 301, col: 5, offset: 8041}, + pos: position{line: 301, col: 5, offset: 8044}, run: (*parser).callonExpression213, expr: &litMatcher{ - pos: position{line: 301, col: 5, offset: 8041}, + pos: position{line: 301, col: 5, offset: 8044}, val: "None", ignoreCase: false, want: "\"None\"", }, }, &actionExpr{ - pos: position{line: 302, col: 5, offset: 8073}, + pos: position{line: 302, col: 5, offset: 8076}, run: (*parser).callonExpression215, expr: &litMatcher{ - pos: position{line: 302, col: 5, offset: 8073}, + pos: position{line: 302, col: 5, offset: 8076}, val: "Natural", ignoreCase: false, want: "\"Natural\"", }, }, &actionExpr{ - pos: position{line: 303, col: 5, offset: 8111}, + pos: position{line: 303, col: 5, offset: 8114}, run: (*parser).callonExpression217, expr: &litMatcher{ - pos: position{line: 303, col: 5, offset: 8111}, + pos: position{line: 303, col: 5, offset: 8114}, val: "Integer", ignoreCase: false, want: "\"Integer\"", }, }, &actionExpr{ - pos: position{line: 304, col: 5, offset: 8149}, + pos: position{line: 304, col: 5, offset: 8152}, run: (*parser).callonExpression219, expr: &litMatcher{ - pos: position{line: 304, col: 5, offset: 8149}, + pos: position{line: 304, col: 5, offset: 8152}, val: "Double", ignoreCase: false, want: "\"Double\"", }, }, &actionExpr{ - pos: position{line: 305, col: 5, offset: 8185}, + pos: position{line: 305, col: 5, offset: 8188}, run: (*parser).callonExpression221, expr: &litMatcher{ - pos: position{line: 305, col: 5, offset: 8185}, + pos: position{line: 305, col: 5, offset: 8188}, val: "Text", ignoreCase: false, want: "\"Text\"", }, }, &actionExpr{ - pos: position{line: 306, col: 5, offset: 8217}, + pos: position{line: 306, col: 5, offset: 8220}, run: (*parser).callonExpression223, expr: &litMatcher{ - pos: position{line: 306, col: 5, offset: 8217}, + pos: position{line: 306, col: 5, offset: 8220}, val: "List", ignoreCase: false, want: "\"List\"", }, }, &actionExpr{ - pos: position{line: 307, col: 5, offset: 8249}, + pos: position{line: 307, col: 5, offset: 8252}, run: (*parser).callonExpression225, expr: &litMatcher{ - pos: position{line: 307, col: 5, offset: 8249}, + pos: position{line: 307, col: 5, offset: 8252}, val: "Type", ignoreCase: false, want: "\"Type\"", }, }, &actionExpr{ - pos: position{line: 308, col: 5, offset: 8281}, + pos: position{line: 308, col: 5, offset: 8284}, run: (*parser).callonExpression227, expr: &litMatcher{ - pos: position{line: 308, col: 5, offset: 8281}, + pos: position{line: 308, col: 5, offset: 8284}, val: "Kind", ignoreCase: false, want: "\"Kind\"", }, }, &actionExpr{ - pos: position{line: 309, col: 5, offset: 8313}, + pos: position{line: 309, col: 5, offset: 8316}, run: (*parser).callonExpression229, expr: &litMatcher{ - pos: position{line: 309, col: 5, offset: 8313}, + pos: position{line: 309, col: 5, offset: 8316}, val: "Sort", ignoreCase: false, want: "\"Sort\"", @@ -8190,33 +8190,33 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 150, col: 28, offset: 3725}, + pos: position{line: 150, col: 28, offset: 3728}, label: "label", expr: &choiceExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, run: (*parser).callonExpression233, expr: &seqExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, val: "`", ignoreCase: false, want: "\"`\"", }, &labeledExpr{ - pos: position{line: 146, col: 13, offset: 3519}, + pos: position{line: 146, col: 13, offset: 3522}, label: "label", expr: &actionExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, run: (*parser).callonExpression237, expr: &oneOrMoreExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, expr: &charClassMatcher{ - pos: position{line: 143, col: 19, offset: 3419}, + pos: position{line: 143, col: 19, offset: 3422}, val: "[ -_a-~]", ranges: []rune{' ', '_', 'a', '~'}, ignoreCase: false, @@ -8226,7 +8226,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 146, col: 31, offset: 3537}, + pos: position{line: 146, col: 31, offset: 3540}, val: "`", ignoreCase: false, want: "\"`\"", @@ -8235,75 +8235,75 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, run: (*parser).callonExpression241, expr: &labeledExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, label: "label", expr: &choiceExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, run: (*parser).callonExpression244, expr: &seqExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonExpression253, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -8315,61 +8315,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -8377,9 +8377,9 @@ var g = &grammar{ }, }, &oneOrMoreExpr{ - pos: position{line: 137, col: 23, offset: 3220}, + pos: position{line: 137, col: 23, offset: 3223}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -8391,68 +8391,68 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, run: (*parser).callonExpression270, expr: &seqExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, exprs: []interface{}{ ¬Expr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, expr: &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonExpression280, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -8464,61 +8464,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -8527,7 +8527,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 135, col: 24, offset: 3147}, + pos: position{line: 135, col: 24, offset: 3150}, val: "[_A-Za-z]", chars: []rune{'_'}, ranges: []rune{'A', 'Z', 'a', 'z'}, @@ -8535,9 +8535,9 @@ var g = &grammar{ inverted: false, }, &zeroOrMoreExpr{ - pos: position{line: 138, col: 43, offset: 3314}, + pos: position{line: 138, col: 43, offset: 3317}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -8562,52 +8562,52 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 528, col: 45, offset: 14979}, + pos: position{line: 528, col: 45, offset: 14982}, name: "_", }, &litMatcher{ - pos: position{line: 528, col: 47, offset: 14981}, + pos: position{line: 528, col: 47, offset: 14984}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 528, col: 51, offset: 14985}, + pos: position{line: 528, col: 51, offset: 14988}, name: "_1", }, &labeledExpr{ - pos: position{line: 528, col: 54, offset: 14988}, + pos: position{line: 528, col: 54, offset: 14991}, label: "t", expr: &ruleRefExpr{ - pos: position{line: 528, col: 56, offset: 14990}, + pos: position{line: 528, col: 56, offset: 14993}, name: "Expression", }, }, &ruleRefExpr{ - pos: position{line: 528, col: 67, offset: 15001}, + pos: position{line: 528, col: 67, offset: 15004}, name: "_", }, &litMatcher{ - pos: position{line: 528, col: 69, offset: 15003}, + pos: position{line: 528, col: 69, offset: 15006}, val: ")", ignoreCase: false, want: "\")\"", }, &ruleRefExpr{ - pos: position{line: 528, col: 73, offset: 15007}, + pos: position{line: 528, col: 73, offset: 15010}, name: "_", }, &choiceExpr{ - pos: position{line: 319, col: 9, offset: 8529}, + pos: position{line: 319, col: 9, offset: 8532}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 319, col: 9, offset: 8529}, + pos: position{line: 319, col: 9, offset: 8532}, val: "->", ignoreCase: false, want: "\"->\"", }, &litMatcher{ - pos: position{line: 319, col: 16, offset: 8536}, + pos: position{line: 319, col: 16, offset: 8539}, val: "→", ignoreCase: false, want: "\"→\"", @@ -8615,14 +8615,14 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 528, col: 81, offset: 15015}, + pos: position{line: 528, col: 81, offset: 15018}, name: "_", }, &labeledExpr{ - pos: position{line: 528, col: 83, offset: 15017}, + pos: position{line: 528, col: 83, offset: 15020}, label: "body", expr: &ruleRefExpr{ - pos: position{line: 528, col: 88, offset: 15022}, + pos: position{line: 528, col: 88, offset: 15025}, name: "Expression", }, }, @@ -8630,70 +8630,70 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 531, col: 7, offset: 15134}, + pos: position{line: 531, col: 7, offset: 15137}, run: (*parser).callonExpression312, expr: &seqExpr{ - pos: position{line: 531, col: 7, offset: 15134}, + pos: position{line: 531, col: 7, offset: 15137}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &ruleRefExpr{ - pos: position{line: 531, col: 10, offset: 15137}, + pos: position{line: 531, col: 10, offset: 15140}, name: "_1", }, &labeledExpr{ - pos: position{line: 531, col: 13, offset: 15140}, + pos: position{line: 531, col: 13, offset: 15143}, label: "cond", expr: &ruleRefExpr{ - pos: position{line: 531, col: 18, offset: 15145}, + pos: position{line: 531, col: 18, offset: 15148}, name: "Expression", }, }, &ruleRefExpr{ - pos: position{line: 531, col: 29, offset: 15156}, + pos: position{line: 531, col: 29, offset: 15159}, name: "_", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &ruleRefExpr{ - pos: position{line: 531, col: 36, offset: 15163}, + pos: position{line: 531, col: 36, offset: 15166}, name: "_1", }, &labeledExpr{ - pos: position{line: 531, col: 39, offset: 15166}, + pos: position{line: 531, col: 39, offset: 15169}, label: "t", expr: &ruleRefExpr{ - pos: position{line: 531, col: 41, offset: 15168}, + pos: position{line: 531, col: 41, offset: 15171}, name: "Expression", }, }, &ruleRefExpr{ - pos: position{line: 531, col: 52, offset: 15179}, + pos: position{line: 531, col: 52, offset: 15182}, name: "_", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &ruleRefExpr{ - pos: position{line: 531, col: 59, offset: 15186}, + pos: position{line: 531, col: 59, offset: 15189}, name: "_1", }, &labeledExpr{ - pos: position{line: 531, col: 62, offset: 15189}, + pos: position{line: 531, col: 62, offset: 15192}, label: "f", expr: &ruleRefExpr{ - pos: position{line: 531, col: 64, offset: 15191}, + pos: position{line: 531, col: 64, offset: 15194}, name: "Expression", }, }, @@ -8701,37 +8701,37 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 534, col: 7, offset: 15273}, + pos: position{line: 534, col: 7, offset: 15276}, run: (*parser).callonExpression328, expr: &seqExpr{ - pos: position{line: 534, col: 7, offset: 15273}, + pos: position{line: 534, col: 7, offset: 15276}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 534, col: 7, offset: 15273}, + pos: position{line: 534, col: 7, offset: 15276}, label: "bindings", expr: &oneOrMoreExpr{ - pos: position{line: 534, col: 16, offset: 15282}, + pos: position{line: 534, col: 16, offset: 15285}, expr: &ruleRefExpr{ - pos: position{line: 534, col: 16, offset: 15282}, + pos: position{line: 534, col: 16, offset: 15285}, name: "LetBinding", }, }, }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &ruleRefExpr{ - pos: position{line: 534, col: 31, offset: 15297}, + pos: position{line: 534, col: 31, offset: 15300}, name: "_1", }, &labeledExpr{ - pos: position{line: 534, col: 34, offset: 15300}, + pos: position{line: 534, col: 34, offset: 15303}, label: "b", expr: &ruleRefExpr{ - pos: position{line: 534, col: 36, offset: 15302}, + pos: position{line: 534, col: 36, offset: 15305}, name: "Expression", }, }, @@ -8739,22 +8739,22 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 541, col: 7, offset: 15541}, + pos: position{line: 541, col: 7, offset: 15544}, run: (*parser).callonExpression337, expr: &seqExpr{ - pos: position{line: 541, col: 7, offset: 15541}, + pos: position{line: 541, col: 7, offset: 15544}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", @@ -8762,394 +8762,394 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 541, col: 14, offset: 15548}, + pos: position{line: 541, col: 14, offset: 15551}, name: "_", }, &litMatcher{ - pos: position{line: 541, col: 16, offset: 15550}, + pos: position{line: 541, col: 16, offset: 15553}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 541, col: 20, offset: 15554}, + pos: position{line: 541, col: 20, offset: 15557}, name: "_", }, &labeledExpr{ - pos: position{line: 541, col: 22, offset: 15556}, + pos: position{line: 541, col: 22, offset: 15559}, label: "label", expr: &choiceExpr{ - pos: position{line: 149, col: 20, offset: 3633}, + pos: position{line: 149, col: 20, offset: 3636}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 149, col: 20, offset: 3633}, + pos: position{line: 149, col: 20, offset: 3636}, run: (*parser).callonExpression347, expr: &seqExpr{ - pos: position{line: 149, col: 20, offset: 3633}, + pos: position{line: 149, col: 20, offset: 3636}, exprs: []interface{}{ &andExpr{ - pos: position{line: 149, col: 20, offset: 3633}, + pos: position{line: 149, col: 20, offset: 3636}, expr: &seqExpr{ - pos: position{line: 149, col: 22, offset: 3635}, + pos: position{line: 149, col: 22, offset: 3638}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, run: (*parser).callonExpression352, expr: &litMatcher{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, val: "Natural/fold", ignoreCase: false, want: "\"Natural/fold\"", }, }, &actionExpr{ - pos: position{line: 275, col: 5, offset: 6859}, + pos: position{line: 275, col: 5, offset: 6862}, run: (*parser).callonExpression354, expr: &litMatcher{ - pos: position{line: 275, col: 5, offset: 6859}, + pos: position{line: 275, col: 5, offset: 6862}, val: "Natural/build", ignoreCase: false, want: "\"Natural/build\"", }, }, &actionExpr{ - pos: position{line: 276, col: 5, offset: 6908}, + pos: position{line: 276, col: 5, offset: 6911}, run: (*parser).callonExpression356, expr: &litMatcher{ - pos: position{line: 276, col: 5, offset: 6908}, + pos: position{line: 276, col: 5, offset: 6911}, val: "Natural/isZero", ignoreCase: false, want: "\"Natural/isZero\"", }, }, &actionExpr{ - pos: position{line: 277, col: 5, offset: 6959}, + pos: position{line: 277, col: 5, offset: 6962}, run: (*parser).callonExpression358, expr: &litMatcher{ - pos: position{line: 277, col: 5, offset: 6959}, + pos: position{line: 277, col: 5, offset: 6962}, val: "Natural/even", ignoreCase: false, want: "\"Natural/even\"", }, }, &actionExpr{ - pos: position{line: 278, col: 5, offset: 7006}, + pos: position{line: 278, col: 5, offset: 7009}, run: (*parser).callonExpression360, expr: &litMatcher{ - pos: position{line: 278, col: 5, offset: 7006}, + pos: position{line: 278, col: 5, offset: 7009}, val: "Natural/odd", ignoreCase: false, want: "\"Natural/odd\"", }, }, &actionExpr{ - pos: position{line: 279, col: 5, offset: 7051}, + pos: position{line: 279, col: 5, offset: 7054}, run: (*parser).callonExpression362, expr: &litMatcher{ - pos: position{line: 279, col: 5, offset: 7051}, + pos: position{line: 279, col: 5, offset: 7054}, val: "Natural/toInteger", ignoreCase: false, want: "\"Natural/toInteger\"", }, }, &actionExpr{ - pos: position{line: 280, col: 5, offset: 7108}, + pos: position{line: 280, col: 5, offset: 7111}, run: (*parser).callonExpression364, expr: &litMatcher{ - pos: position{line: 280, col: 5, offset: 7108}, + pos: position{line: 280, col: 5, offset: 7111}, val: "Natural/show", ignoreCase: false, want: "\"Natural/show\"", }, }, &actionExpr{ - pos: position{line: 281, col: 5, offset: 7155}, + pos: position{line: 281, col: 5, offset: 7158}, run: (*parser).callonExpression366, expr: &litMatcher{ - pos: position{line: 281, col: 5, offset: 7155}, + pos: position{line: 281, col: 5, offset: 7158}, val: "Integer/toDouble", ignoreCase: false, want: "\"Integer/toDouble\"", }, }, &actionExpr{ - pos: position{line: 282, col: 5, offset: 7210}, + pos: position{line: 282, col: 5, offset: 7213}, run: (*parser).callonExpression368, expr: &litMatcher{ - pos: position{line: 282, col: 5, offset: 7210}, + pos: position{line: 282, col: 5, offset: 7213}, val: "Integer/show", ignoreCase: false, want: "\"Integer/show\"", }, }, &actionExpr{ - pos: position{line: 283, col: 5, offset: 7257}, + pos: position{line: 283, col: 5, offset: 7260}, run: (*parser).callonExpression370, expr: &litMatcher{ - pos: position{line: 283, col: 5, offset: 7257}, + pos: position{line: 283, col: 5, offset: 7260}, val: "Integer/negate", ignoreCase: false, want: "\"Integer/negate\"", }, }, &actionExpr{ - pos: position{line: 284, col: 5, offset: 7308}, + pos: position{line: 284, col: 5, offset: 7311}, run: (*parser).callonExpression372, expr: &litMatcher{ - pos: position{line: 284, col: 5, offset: 7308}, + pos: position{line: 284, col: 5, offset: 7311}, val: "Integer/clamp", ignoreCase: false, want: "\"Integer/clamp\"", }, }, &actionExpr{ - pos: position{line: 285, col: 5, offset: 7357}, + pos: position{line: 285, col: 5, offset: 7360}, run: (*parser).callonExpression374, expr: &litMatcher{ - pos: position{line: 285, col: 5, offset: 7357}, + pos: position{line: 285, col: 5, offset: 7360}, val: "Natural/subtract", ignoreCase: false, want: "\"Natural/subtract\"", }, }, &actionExpr{ - pos: position{line: 286, col: 5, offset: 7412}, + pos: position{line: 286, col: 5, offset: 7415}, run: (*parser).callonExpression376, expr: &litMatcher{ - pos: position{line: 286, col: 5, offset: 7412}, + pos: position{line: 286, col: 5, offset: 7415}, val: "Double/show", ignoreCase: false, want: "\"Double/show\"", }, }, &actionExpr{ - pos: position{line: 287, col: 5, offset: 7457}, + pos: position{line: 287, col: 5, offset: 7460}, run: (*parser).callonExpression378, expr: &litMatcher{ - pos: position{line: 287, col: 5, offset: 7457}, + pos: position{line: 287, col: 5, offset: 7460}, val: "List/build", ignoreCase: false, want: "\"List/build\"", }, }, &actionExpr{ - pos: position{line: 288, col: 5, offset: 7500}, + pos: position{line: 288, col: 5, offset: 7503}, run: (*parser).callonExpression380, expr: &litMatcher{ - pos: position{line: 288, col: 5, offset: 7500}, + pos: position{line: 288, col: 5, offset: 7503}, val: "List/fold", ignoreCase: false, want: "\"List/fold\"", }, }, &actionExpr{ - pos: position{line: 289, col: 5, offset: 7541}, + pos: position{line: 289, col: 5, offset: 7544}, run: (*parser).callonExpression382, expr: &litMatcher{ - pos: position{line: 289, col: 5, offset: 7541}, + pos: position{line: 289, col: 5, offset: 7544}, val: "List/length", ignoreCase: false, want: "\"List/length\"", }, }, &actionExpr{ - pos: position{line: 290, col: 5, offset: 7586}, + pos: position{line: 290, col: 5, offset: 7589}, run: (*parser).callonExpression384, expr: &litMatcher{ - pos: position{line: 290, col: 5, offset: 7586}, + pos: position{line: 290, col: 5, offset: 7589}, val: "List/head", ignoreCase: false, want: "\"List/head\"", }, }, &actionExpr{ - pos: position{line: 291, col: 5, offset: 7627}, + pos: position{line: 291, col: 5, offset: 7630}, run: (*parser).callonExpression386, expr: &litMatcher{ - pos: position{line: 291, col: 5, offset: 7627}, + pos: position{line: 291, col: 5, offset: 7630}, val: "List/last", ignoreCase: false, want: "\"List/last\"", }, }, &actionExpr{ - pos: position{line: 292, col: 5, offset: 7668}, + pos: position{line: 292, col: 5, offset: 7671}, run: (*parser).callonExpression388, expr: &litMatcher{ - pos: position{line: 292, col: 5, offset: 7668}, + pos: position{line: 292, col: 5, offset: 7671}, val: "List/indexed", ignoreCase: false, want: "\"List/indexed\"", }, }, &actionExpr{ - pos: position{line: 293, col: 5, offset: 7715}, + pos: position{line: 293, col: 5, offset: 7718}, run: (*parser).callonExpression390, expr: &litMatcher{ - pos: position{line: 293, col: 5, offset: 7715}, + pos: position{line: 293, col: 5, offset: 7718}, val: "List/reverse", ignoreCase: false, want: "\"List/reverse\"", }, }, &actionExpr{ - pos: position{line: 294, col: 5, offset: 7762}, + pos: position{line: 294, col: 5, offset: 7765}, run: (*parser).callonExpression392, expr: &litMatcher{ - pos: position{line: 294, col: 5, offset: 7762}, + pos: position{line: 294, col: 5, offset: 7765}, val: "Optional/fold", ignoreCase: false, want: "\"Optional/fold\"", }, }, &actionExpr{ - pos: position{line: 295, col: 5, offset: 7811}, + pos: position{line: 295, col: 5, offset: 7814}, run: (*parser).callonExpression394, expr: &litMatcher{ - pos: position{line: 295, col: 5, offset: 7811}, + pos: position{line: 295, col: 5, offset: 7814}, val: "Optional/build", ignoreCase: false, want: "\"Optional/build\"", }, }, &actionExpr{ - pos: position{line: 296, col: 5, offset: 7862}, + pos: position{line: 296, col: 5, offset: 7865}, run: (*parser).callonExpression396, expr: &litMatcher{ - pos: position{line: 296, col: 5, offset: 7862}, + pos: position{line: 296, col: 5, offset: 7865}, val: "Text/show", ignoreCase: false, want: "\"Text/show\"", }, }, &actionExpr{ - pos: position{line: 297, col: 5, offset: 7903}, + pos: position{line: 297, col: 5, offset: 7906}, run: (*parser).callonExpression398, expr: &litMatcher{ - pos: position{line: 297, col: 5, offset: 7903}, + pos: position{line: 297, col: 5, offset: 7906}, val: "Bool", ignoreCase: false, want: "\"Bool\"", }, }, &actionExpr{ - pos: position{line: 298, col: 5, offset: 7935}, + pos: position{line: 298, col: 5, offset: 7938}, run: (*parser).callonExpression400, expr: &litMatcher{ - pos: position{line: 298, col: 5, offset: 7935}, + pos: position{line: 298, col: 5, offset: 7938}, val: "True", ignoreCase: false, want: "\"True\"", }, }, &actionExpr{ - pos: position{line: 299, col: 5, offset: 7967}, + pos: position{line: 299, col: 5, offset: 7970}, run: (*parser).callonExpression402, expr: &litMatcher{ - pos: position{line: 299, col: 5, offset: 7967}, + pos: position{line: 299, col: 5, offset: 7970}, val: "False", ignoreCase: false, want: "\"False\"", }, }, &actionExpr{ - pos: position{line: 300, col: 5, offset: 8001}, + pos: position{line: 300, col: 5, offset: 8004}, run: (*parser).callonExpression404, expr: &litMatcher{ - pos: position{line: 300, col: 5, offset: 8001}, + pos: position{line: 300, col: 5, offset: 8004}, val: "Optional", ignoreCase: false, want: "\"Optional\"", }, }, &actionExpr{ - pos: position{line: 301, col: 5, offset: 8041}, + pos: position{line: 301, col: 5, offset: 8044}, run: (*parser).callonExpression406, expr: &litMatcher{ - pos: position{line: 301, col: 5, offset: 8041}, + pos: position{line: 301, col: 5, offset: 8044}, val: "None", ignoreCase: false, want: "\"None\"", }, }, &actionExpr{ - pos: position{line: 302, col: 5, offset: 8073}, + pos: position{line: 302, col: 5, offset: 8076}, run: (*parser).callonExpression408, expr: &litMatcher{ - pos: position{line: 302, col: 5, offset: 8073}, + pos: position{line: 302, col: 5, offset: 8076}, val: "Natural", ignoreCase: false, want: "\"Natural\"", }, }, &actionExpr{ - pos: position{line: 303, col: 5, offset: 8111}, + pos: position{line: 303, col: 5, offset: 8114}, run: (*parser).callonExpression410, expr: &litMatcher{ - pos: position{line: 303, col: 5, offset: 8111}, + pos: position{line: 303, col: 5, offset: 8114}, val: "Integer", ignoreCase: false, want: "\"Integer\"", }, }, &actionExpr{ - pos: position{line: 304, col: 5, offset: 8149}, + pos: position{line: 304, col: 5, offset: 8152}, run: (*parser).callonExpression412, expr: &litMatcher{ - pos: position{line: 304, col: 5, offset: 8149}, + pos: position{line: 304, col: 5, offset: 8152}, val: "Double", ignoreCase: false, want: "\"Double\"", }, }, &actionExpr{ - pos: position{line: 305, col: 5, offset: 8185}, + pos: position{line: 305, col: 5, offset: 8188}, run: (*parser).callonExpression414, expr: &litMatcher{ - pos: position{line: 305, col: 5, offset: 8185}, + pos: position{line: 305, col: 5, offset: 8188}, val: "Text", ignoreCase: false, want: "\"Text\"", }, }, &actionExpr{ - pos: position{line: 306, col: 5, offset: 8217}, + pos: position{line: 306, col: 5, offset: 8220}, run: (*parser).callonExpression416, expr: &litMatcher{ - pos: position{line: 306, col: 5, offset: 8217}, + pos: position{line: 306, col: 5, offset: 8220}, val: "List", ignoreCase: false, want: "\"List\"", }, }, &actionExpr{ - pos: position{line: 307, col: 5, offset: 8249}, + pos: position{line: 307, col: 5, offset: 8252}, run: (*parser).callonExpression418, expr: &litMatcher{ - pos: position{line: 307, col: 5, offset: 8249}, + pos: position{line: 307, col: 5, offset: 8252}, val: "Type", ignoreCase: false, want: "\"Type\"", }, }, &actionExpr{ - pos: position{line: 308, col: 5, offset: 8281}, + pos: position{line: 308, col: 5, offset: 8284}, run: (*parser).callonExpression420, expr: &litMatcher{ - pos: position{line: 308, col: 5, offset: 8281}, + pos: position{line: 308, col: 5, offset: 8284}, val: "Kind", ignoreCase: false, want: "\"Kind\"", }, }, &actionExpr{ - pos: position{line: 309, col: 5, offset: 8313}, + pos: position{line: 309, col: 5, offset: 8316}, run: (*parser).callonExpression422, expr: &litMatcher{ - pos: position{line: 309, col: 5, offset: 8313}, + pos: position{line: 309, col: 5, offset: 8316}, val: "Sort", ignoreCase: false, want: "\"Sort\"", @@ -9158,7 +9158,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -9169,33 +9169,33 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 149, col: 51, offset: 3664}, + pos: position{line: 149, col: 51, offset: 3667}, label: "label", expr: &choiceExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, run: (*parser).callonExpression427, expr: &seqExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, val: "`", ignoreCase: false, want: "\"`\"", }, &labeledExpr{ - pos: position{line: 146, col: 13, offset: 3519}, + pos: position{line: 146, col: 13, offset: 3522}, label: "label", expr: &actionExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, run: (*parser).callonExpression431, expr: &oneOrMoreExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, expr: &charClassMatcher{ - pos: position{line: 143, col: 19, offset: 3419}, + pos: position{line: 143, col: 19, offset: 3422}, val: "[ -_a-~]", ranges: []rune{' ', '_', 'a', '~'}, ignoreCase: false, @@ -9205,7 +9205,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 146, col: 31, offset: 3537}, + pos: position{line: 146, col: 31, offset: 3540}, val: "`", ignoreCase: false, want: "\"`\"", @@ -9214,75 +9214,75 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, run: (*parser).callonExpression435, expr: &labeledExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, label: "label", expr: &choiceExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, run: (*parser).callonExpression438, expr: &seqExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonExpression447, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -9294,61 +9294,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -9356,9 +9356,9 @@ var g = &grammar{ }, }, &oneOrMoreExpr{ - pos: position{line: 137, col: 23, offset: 3220}, + pos: position{line: 137, col: 23, offset: 3223}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -9370,68 +9370,68 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, run: (*parser).callonExpression464, expr: &seqExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, exprs: []interface{}{ ¬Expr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, expr: &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonExpression474, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -9443,61 +9443,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -9506,7 +9506,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 135, col: 24, offset: 3147}, + pos: position{line: 135, col: 24, offset: 3150}, val: "[_A-Za-z]", chars: []rune{'_'}, ranges: []rune{'A', 'Z', 'a', 'z'}, @@ -9514,9 +9514,9 @@ var g = &grammar{ inverted: false, }, &zeroOrMoreExpr{ - pos: position{line: 138, col: 43, offset: 3314}, + pos: position{line: 138, col: 43, offset: 3317}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -9538,371 +9538,371 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 150, col: 19, offset: 3716}, + pos: position{line: 150, col: 19, offset: 3719}, run: (*parser).callonExpression492, expr: &seqExpr{ - pos: position{line: 150, col: 19, offset: 3716}, + pos: position{line: 150, col: 19, offset: 3719}, exprs: []interface{}{ ¬Expr{ - pos: position{line: 150, col: 19, offset: 3716}, + pos: position{line: 150, col: 19, offset: 3719}, expr: &choiceExpr{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, run: (*parser).callonExpression496, expr: &litMatcher{ - pos: position{line: 274, col: 5, offset: 6812}, + pos: position{line: 274, col: 5, offset: 6815}, val: "Natural/fold", ignoreCase: false, want: "\"Natural/fold\"", }, }, &actionExpr{ - pos: position{line: 275, col: 5, offset: 6859}, + pos: position{line: 275, col: 5, offset: 6862}, run: (*parser).callonExpression498, expr: &litMatcher{ - pos: position{line: 275, col: 5, offset: 6859}, + pos: position{line: 275, col: 5, offset: 6862}, val: "Natural/build", ignoreCase: false, want: "\"Natural/build\"", }, }, &actionExpr{ - pos: position{line: 276, col: 5, offset: 6908}, + pos: position{line: 276, col: 5, offset: 6911}, run: (*parser).callonExpression500, expr: &litMatcher{ - pos: position{line: 276, col: 5, offset: 6908}, + pos: position{line: 276, col: 5, offset: 6911}, val: "Natural/isZero", ignoreCase: false, want: "\"Natural/isZero\"", }, }, &actionExpr{ - pos: position{line: 277, col: 5, offset: 6959}, + pos: position{line: 277, col: 5, offset: 6962}, run: (*parser).callonExpression502, expr: &litMatcher{ - pos: position{line: 277, col: 5, offset: 6959}, + pos: position{line: 277, col: 5, offset: 6962}, val: "Natural/even", ignoreCase: false, want: "\"Natural/even\"", }, }, &actionExpr{ - pos: position{line: 278, col: 5, offset: 7006}, + pos: position{line: 278, col: 5, offset: 7009}, run: (*parser).callonExpression504, expr: &litMatcher{ - pos: position{line: 278, col: 5, offset: 7006}, + pos: position{line: 278, col: 5, offset: 7009}, val: "Natural/odd", ignoreCase: false, want: "\"Natural/odd\"", }, }, &actionExpr{ - pos: position{line: 279, col: 5, offset: 7051}, + pos: position{line: 279, col: 5, offset: 7054}, run: (*parser).callonExpression506, expr: &litMatcher{ - pos: position{line: 279, col: 5, offset: 7051}, + pos: position{line: 279, col: 5, offset: 7054}, val: "Natural/toInteger", ignoreCase: false, want: "\"Natural/toInteger\"", }, }, &actionExpr{ - pos: position{line: 280, col: 5, offset: 7108}, + pos: position{line: 280, col: 5, offset: 7111}, run: (*parser).callonExpression508, expr: &litMatcher{ - pos: position{line: 280, col: 5, offset: 7108}, + pos: position{line: 280, col: 5, offset: 7111}, val: "Natural/show", ignoreCase: false, want: "\"Natural/show\"", }, }, &actionExpr{ - pos: position{line: 281, col: 5, offset: 7155}, + pos: position{line: 281, col: 5, offset: 7158}, run: (*parser).callonExpression510, expr: &litMatcher{ - pos: position{line: 281, col: 5, offset: 7155}, + pos: position{line: 281, col: 5, offset: 7158}, val: "Integer/toDouble", ignoreCase: false, want: "\"Integer/toDouble\"", }, }, &actionExpr{ - pos: position{line: 282, col: 5, offset: 7210}, + pos: position{line: 282, col: 5, offset: 7213}, run: (*parser).callonExpression512, expr: &litMatcher{ - pos: position{line: 282, col: 5, offset: 7210}, + pos: position{line: 282, col: 5, offset: 7213}, val: "Integer/show", ignoreCase: false, want: "\"Integer/show\"", }, }, &actionExpr{ - pos: position{line: 283, col: 5, offset: 7257}, + pos: position{line: 283, col: 5, offset: 7260}, run: (*parser).callonExpression514, expr: &litMatcher{ - pos: position{line: 283, col: 5, offset: 7257}, + pos: position{line: 283, col: 5, offset: 7260}, val: "Integer/negate", ignoreCase: false, want: "\"Integer/negate\"", }, }, &actionExpr{ - pos: position{line: 284, col: 5, offset: 7308}, + pos: position{line: 284, col: 5, offset: 7311}, run: (*parser).callonExpression516, expr: &litMatcher{ - pos: position{line: 284, col: 5, offset: 7308}, + pos: position{line: 284, col: 5, offset: 7311}, val: "Integer/clamp", ignoreCase: false, want: "\"Integer/clamp\"", }, }, &actionExpr{ - pos: position{line: 285, col: 5, offset: 7357}, + pos: position{line: 285, col: 5, offset: 7360}, run: (*parser).callonExpression518, expr: &litMatcher{ - pos: position{line: 285, col: 5, offset: 7357}, + pos: position{line: 285, col: 5, offset: 7360}, val: "Natural/subtract", ignoreCase: false, want: "\"Natural/subtract\"", }, }, &actionExpr{ - pos: position{line: 286, col: 5, offset: 7412}, + pos: position{line: 286, col: 5, offset: 7415}, run: (*parser).callonExpression520, expr: &litMatcher{ - pos: position{line: 286, col: 5, offset: 7412}, + pos: position{line: 286, col: 5, offset: 7415}, val: "Double/show", ignoreCase: false, want: "\"Double/show\"", }, }, &actionExpr{ - pos: position{line: 287, col: 5, offset: 7457}, + pos: position{line: 287, col: 5, offset: 7460}, run: (*parser).callonExpression522, expr: &litMatcher{ - pos: position{line: 287, col: 5, offset: 7457}, + pos: position{line: 287, col: 5, offset: 7460}, val: "List/build", ignoreCase: false, want: "\"List/build\"", }, }, &actionExpr{ - pos: position{line: 288, col: 5, offset: 7500}, + pos: position{line: 288, col: 5, offset: 7503}, run: (*parser).callonExpression524, expr: &litMatcher{ - pos: position{line: 288, col: 5, offset: 7500}, + pos: position{line: 288, col: 5, offset: 7503}, val: "List/fold", ignoreCase: false, want: "\"List/fold\"", }, }, &actionExpr{ - pos: position{line: 289, col: 5, offset: 7541}, + pos: position{line: 289, col: 5, offset: 7544}, run: (*parser).callonExpression526, expr: &litMatcher{ - pos: position{line: 289, col: 5, offset: 7541}, + pos: position{line: 289, col: 5, offset: 7544}, val: "List/length", ignoreCase: false, want: "\"List/length\"", }, }, &actionExpr{ - pos: position{line: 290, col: 5, offset: 7586}, + pos: position{line: 290, col: 5, offset: 7589}, run: (*parser).callonExpression528, expr: &litMatcher{ - pos: position{line: 290, col: 5, offset: 7586}, + pos: position{line: 290, col: 5, offset: 7589}, val: "List/head", ignoreCase: false, want: "\"List/head\"", }, }, &actionExpr{ - pos: position{line: 291, col: 5, offset: 7627}, + pos: position{line: 291, col: 5, offset: 7630}, run: (*parser).callonExpression530, expr: &litMatcher{ - pos: position{line: 291, col: 5, offset: 7627}, + pos: position{line: 291, col: 5, offset: 7630}, val: "List/last", ignoreCase: false, want: "\"List/last\"", }, }, &actionExpr{ - pos: position{line: 292, col: 5, offset: 7668}, + pos: position{line: 292, col: 5, offset: 7671}, run: (*parser).callonExpression532, expr: &litMatcher{ - pos: position{line: 292, col: 5, offset: 7668}, + pos: position{line: 292, col: 5, offset: 7671}, val: "List/indexed", ignoreCase: false, want: "\"List/indexed\"", }, }, &actionExpr{ - pos: position{line: 293, col: 5, offset: 7715}, + pos: position{line: 293, col: 5, offset: 7718}, run: (*parser).callonExpression534, expr: &litMatcher{ - pos: position{line: 293, col: 5, offset: 7715}, + pos: position{line: 293, col: 5, offset: 7718}, val: "List/reverse", ignoreCase: false, want: "\"List/reverse\"", }, }, &actionExpr{ - pos: position{line: 294, col: 5, offset: 7762}, + pos: position{line: 294, col: 5, offset: 7765}, run: (*parser).callonExpression536, expr: &litMatcher{ - pos: position{line: 294, col: 5, offset: 7762}, + pos: position{line: 294, col: 5, offset: 7765}, val: "Optional/fold", ignoreCase: false, want: "\"Optional/fold\"", }, }, &actionExpr{ - pos: position{line: 295, col: 5, offset: 7811}, + pos: position{line: 295, col: 5, offset: 7814}, run: (*parser).callonExpression538, expr: &litMatcher{ - pos: position{line: 295, col: 5, offset: 7811}, + pos: position{line: 295, col: 5, offset: 7814}, val: "Optional/build", ignoreCase: false, want: "\"Optional/build\"", }, }, &actionExpr{ - pos: position{line: 296, col: 5, offset: 7862}, + pos: position{line: 296, col: 5, offset: 7865}, run: (*parser).callonExpression540, expr: &litMatcher{ - pos: position{line: 296, col: 5, offset: 7862}, + pos: position{line: 296, col: 5, offset: 7865}, val: "Text/show", ignoreCase: false, want: "\"Text/show\"", }, }, &actionExpr{ - pos: position{line: 297, col: 5, offset: 7903}, + pos: position{line: 297, col: 5, offset: 7906}, run: (*parser).callonExpression542, expr: &litMatcher{ - pos: position{line: 297, col: 5, offset: 7903}, + pos: position{line: 297, col: 5, offset: 7906}, val: "Bool", ignoreCase: false, want: "\"Bool\"", }, }, &actionExpr{ - pos: position{line: 298, col: 5, offset: 7935}, + pos: position{line: 298, col: 5, offset: 7938}, run: (*parser).callonExpression544, expr: &litMatcher{ - pos: position{line: 298, col: 5, offset: 7935}, + pos: position{line: 298, col: 5, offset: 7938}, val: "True", ignoreCase: false, want: "\"True\"", }, }, &actionExpr{ - pos: position{line: 299, col: 5, offset: 7967}, + pos: position{line: 299, col: 5, offset: 7970}, run: (*parser).callonExpression546, expr: &litMatcher{ - pos: position{line: 299, col: 5, offset: 7967}, + pos: position{line: 299, col: 5, offset: 7970}, val: "False", ignoreCase: false, want: "\"False\"", }, }, &actionExpr{ - pos: position{line: 300, col: 5, offset: 8001}, + pos: position{line: 300, col: 5, offset: 8004}, run: (*parser).callonExpression548, expr: &litMatcher{ - pos: position{line: 300, col: 5, offset: 8001}, + pos: position{line: 300, col: 5, offset: 8004}, val: "Optional", ignoreCase: false, want: "\"Optional\"", }, }, &actionExpr{ - pos: position{line: 301, col: 5, offset: 8041}, + pos: position{line: 301, col: 5, offset: 8044}, run: (*parser).callonExpression550, expr: &litMatcher{ - pos: position{line: 301, col: 5, offset: 8041}, + pos: position{line: 301, col: 5, offset: 8044}, val: "None", ignoreCase: false, want: "\"None\"", }, }, &actionExpr{ - pos: position{line: 302, col: 5, offset: 8073}, + pos: position{line: 302, col: 5, offset: 8076}, run: (*parser).callonExpression552, expr: &litMatcher{ - pos: position{line: 302, col: 5, offset: 8073}, + pos: position{line: 302, col: 5, offset: 8076}, val: "Natural", ignoreCase: false, want: "\"Natural\"", }, }, &actionExpr{ - pos: position{line: 303, col: 5, offset: 8111}, + pos: position{line: 303, col: 5, offset: 8114}, run: (*parser).callonExpression554, expr: &litMatcher{ - pos: position{line: 303, col: 5, offset: 8111}, + pos: position{line: 303, col: 5, offset: 8114}, val: "Integer", ignoreCase: false, want: "\"Integer\"", }, }, &actionExpr{ - pos: position{line: 304, col: 5, offset: 8149}, + pos: position{line: 304, col: 5, offset: 8152}, run: (*parser).callonExpression556, expr: &litMatcher{ - pos: position{line: 304, col: 5, offset: 8149}, + pos: position{line: 304, col: 5, offset: 8152}, val: "Double", ignoreCase: false, want: "\"Double\"", }, }, &actionExpr{ - pos: position{line: 305, col: 5, offset: 8185}, + pos: position{line: 305, col: 5, offset: 8188}, run: (*parser).callonExpression558, expr: &litMatcher{ - pos: position{line: 305, col: 5, offset: 8185}, + pos: position{line: 305, col: 5, offset: 8188}, val: "Text", ignoreCase: false, want: "\"Text\"", }, }, &actionExpr{ - pos: position{line: 306, col: 5, offset: 8217}, + pos: position{line: 306, col: 5, offset: 8220}, run: (*parser).callonExpression560, expr: &litMatcher{ - pos: position{line: 306, col: 5, offset: 8217}, + pos: position{line: 306, col: 5, offset: 8220}, val: "List", ignoreCase: false, want: "\"List\"", }, }, &actionExpr{ - pos: position{line: 307, col: 5, offset: 8249}, + pos: position{line: 307, col: 5, offset: 8252}, run: (*parser).callonExpression562, expr: &litMatcher{ - pos: position{line: 307, col: 5, offset: 8249}, + pos: position{line: 307, col: 5, offset: 8252}, val: "Type", ignoreCase: false, want: "\"Type\"", }, }, &actionExpr{ - pos: position{line: 308, col: 5, offset: 8281}, + pos: position{line: 308, col: 5, offset: 8284}, run: (*parser).callonExpression564, expr: &litMatcher{ - pos: position{line: 308, col: 5, offset: 8281}, + pos: position{line: 308, col: 5, offset: 8284}, val: "Kind", ignoreCase: false, want: "\"Kind\"", }, }, &actionExpr{ - pos: position{line: 309, col: 5, offset: 8313}, + pos: position{line: 309, col: 5, offset: 8316}, run: (*parser).callonExpression566, expr: &litMatcher{ - pos: position{line: 309, col: 5, offset: 8313}, + pos: position{line: 309, col: 5, offset: 8316}, val: "Sort", ignoreCase: false, want: "\"Sort\"", @@ -9912,33 +9912,33 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 150, col: 28, offset: 3725}, + pos: position{line: 150, col: 28, offset: 3728}, label: "label", expr: &choiceExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, run: (*parser).callonExpression570, expr: &seqExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, val: "`", ignoreCase: false, want: "\"`\"", }, &labeledExpr{ - pos: position{line: 146, col: 13, offset: 3519}, + pos: position{line: 146, col: 13, offset: 3522}, label: "label", expr: &actionExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, run: (*parser).callonExpression574, expr: &oneOrMoreExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, expr: &charClassMatcher{ - pos: position{line: 143, col: 19, offset: 3419}, + pos: position{line: 143, col: 19, offset: 3422}, val: "[ -_a-~]", ranges: []rune{' ', '_', 'a', '~'}, ignoreCase: false, @@ -9948,7 +9948,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 146, col: 31, offset: 3537}, + pos: position{line: 146, col: 31, offset: 3540}, val: "`", ignoreCase: false, want: "\"`\"", @@ -9957,75 +9957,75 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, run: (*parser).callonExpression578, expr: &labeledExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, label: "label", expr: &choiceExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, run: (*parser).callonExpression581, expr: &seqExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonExpression590, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -10037,61 +10037,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -10099,9 +10099,9 @@ var g = &grammar{ }, }, &oneOrMoreExpr{ - pos: position{line: 137, col: 23, offset: 3220}, + pos: position{line: 137, col: 23, offset: 3223}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -10113,68 +10113,68 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, run: (*parser).callonExpression607, expr: &seqExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, exprs: []interface{}{ ¬Expr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, expr: &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonExpression617, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -10186,61 +10186,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -10249,7 +10249,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 135, col: 24, offset: 3147}, + pos: position{line: 135, col: 24, offset: 3150}, val: "[_A-Za-z]", chars: []rune{'_'}, ranges: []rune{'A', 'Z', 'a', 'z'}, @@ -10257,9 +10257,9 @@ var g = &grammar{ inverted: false, }, &zeroOrMoreExpr{ - pos: position{line: 138, col: 43, offset: 3314}, + pos: position{line: 138, col: 43, offset: 3317}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -10284,52 +10284,52 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 541, col: 45, offset: 15579}, + pos: position{line: 541, col: 45, offset: 15582}, name: "_", }, &litMatcher{ - pos: position{line: 541, col: 47, offset: 15581}, + pos: position{line: 541, col: 47, offset: 15584}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 541, col: 51, offset: 15585}, + pos: position{line: 541, col: 51, offset: 15588}, name: "_1", }, &labeledExpr{ - pos: position{line: 541, col: 54, offset: 15588}, + pos: position{line: 541, col: 54, offset: 15591}, label: "t", expr: &ruleRefExpr{ - pos: position{line: 541, col: 56, offset: 15590}, + pos: position{line: 541, col: 56, offset: 15593}, name: "Expression", }, }, &ruleRefExpr{ - pos: position{line: 541, col: 67, offset: 15601}, + pos: position{line: 541, col: 67, offset: 15604}, name: "_", }, &litMatcher{ - pos: position{line: 541, col: 69, offset: 15603}, + pos: position{line: 541, col: 69, offset: 15606}, val: ")", ignoreCase: false, want: "\")\"", }, &ruleRefExpr{ - pos: position{line: 541, col: 73, offset: 15607}, + pos: position{line: 541, col: 73, offset: 15610}, name: "_", }, &choiceExpr{ - pos: position{line: 319, col: 9, offset: 8529}, + pos: position{line: 319, col: 9, offset: 8532}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 319, col: 9, offset: 8529}, + pos: position{line: 319, col: 9, offset: 8532}, val: "->", ignoreCase: false, want: "\"->\"", }, &litMatcher{ - pos: position{line: 319, col: 16, offset: 8536}, + pos: position{line: 319, col: 16, offset: 8539}, val: "→", ignoreCase: false, want: "\"→\"", @@ -10337,14 +10337,14 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 541, col: 81, offset: 15615}, + pos: position{line: 541, col: 81, offset: 15618}, name: "_", }, &labeledExpr{ - pos: position{line: 541, col: 83, offset: 15617}, + pos: position{line: 541, col: 83, offset: 15620}, label: "body", expr: &ruleRefExpr{ - pos: position{line: 541, col: 88, offset: 15622}, + pos: position{line: 541, col: 88, offset: 15625}, name: "Expression", }, }, @@ -10352,34 +10352,34 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 544, col: 7, offset: 15730}, + pos: position{line: 544, col: 7, offset: 15733}, run: (*parser).callonExpression649, expr: &seqExpr{ - pos: position{line: 544, col: 7, offset: 15730}, + pos: position{line: 544, col: 7, offset: 15733}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 544, col: 7, offset: 15730}, + pos: position{line: 544, col: 7, offset: 15733}, label: "o", expr: &ruleRefExpr{ - pos: position{line: 544, col: 9, offset: 15732}, + pos: position{line: 544, col: 9, offset: 15735}, name: "OperatorExpression", }, }, &ruleRefExpr{ - pos: position{line: 544, col: 28, offset: 15751}, + pos: position{line: 544, col: 28, offset: 15754}, name: "_", }, &choiceExpr{ - pos: position{line: 319, col: 9, offset: 8529}, + pos: position{line: 319, col: 9, offset: 8532}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 319, col: 9, offset: 8529}, + pos: position{line: 319, col: 9, offset: 8532}, val: "->", ignoreCase: false, want: "\"->\"", }, &litMatcher{ - pos: position{line: 319, col: 16, offset: 8536}, + pos: position{line: 319, col: 16, offset: 8539}, val: "→", ignoreCase: false, want: "\"→\"", @@ -10387,14 +10387,14 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 544, col: 36, offset: 15759}, + pos: position{line: 544, col: 36, offset: 15762}, name: "_", }, &labeledExpr{ - pos: position{line: 544, col: 38, offset: 15761}, + pos: position{line: 544, col: 38, offset: 15764}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 544, col: 40, offset: 15763}, + pos: position{line: 544, col: 40, offset: 15766}, name: "Expression", }, }, @@ -10402,64 +10402,64 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 545, col: 7, offset: 15825}, + pos: position{line: 545, col: 7, offset: 15828}, name: "WithExpression", }, &actionExpr{ - pos: position{line: 546, col: 7, offset: 15846}, + pos: position{line: 546, col: 7, offset: 15849}, run: (*parser).callonExpression661, expr: &seqExpr{ - pos: position{line: 546, col: 7, offset: 15846}, + pos: position{line: 546, col: 7, offset: 15849}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &ruleRefExpr{ - pos: position{line: 546, col: 13, offset: 15852}, + pos: position{line: 546, col: 13, offset: 15855}, name: "_1", }, &labeledExpr{ - pos: position{line: 546, col: 16, offset: 15855}, + pos: position{line: 546, col: 16, offset: 15858}, label: "h", expr: &ruleRefExpr{ - pos: position{line: 546, col: 18, offset: 15857}, + pos: position{line: 546, col: 18, offset: 15860}, name: "ImportExpression", }, }, &ruleRefExpr{ - pos: position{line: 546, col: 35, offset: 15874}, + pos: position{line: 546, col: 35, offset: 15877}, name: "_1", }, &labeledExpr{ - pos: position{line: 546, col: 38, offset: 15877}, + pos: position{line: 546, col: 38, offset: 15880}, label: "u", expr: &ruleRefExpr{ - pos: position{line: 546, col: 40, offset: 15879}, + pos: position{line: 546, col: 40, offset: 15882}, name: "ImportExpression", }, }, &ruleRefExpr{ - pos: position{line: 546, col: 57, offset: 15896}, + pos: position{line: 546, col: 57, offset: 15899}, name: "_", }, &litMatcher{ - pos: position{line: 546, col: 59, offset: 15898}, + pos: position{line: 546, col: 59, offset: 15901}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 546, col: 63, offset: 15902}, + pos: position{line: 546, col: 63, offset: 15905}, name: "_1", }, &labeledExpr{ - pos: position{line: 546, col: 66, offset: 15905}, + pos: position{line: 546, col: 66, offset: 15908}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 546, col: 68, offset: 15907}, + pos: position{line: 546, col: 68, offset: 15910}, name: "ApplicationExpression", }, }, @@ -10467,52 +10467,52 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 549, col: 7, offset: 16028}, + pos: position{line: 549, col: 7, offset: 16031}, name: "EmptyList", }, &actionExpr{ - pos: position{line: 550, col: 7, offset: 16044}, + pos: position{line: 550, col: 7, offset: 16047}, run: (*parser).callonExpression676, expr: &seqExpr{ - pos: position{line: 550, col: 7, offset: 16044}, + pos: position{line: 550, col: 7, offset: 16047}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &ruleRefExpr{ - pos: position{line: 550, col: 13, offset: 16050}, + pos: position{line: 550, col: 13, offset: 16053}, name: "_1", }, &labeledExpr{ - pos: position{line: 550, col: 16, offset: 16053}, + pos: position{line: 550, col: 16, offset: 16056}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 550, col: 18, offset: 16055}, + pos: position{line: 550, col: 18, offset: 16058}, name: "ImportExpression", }, }, &ruleRefExpr{ - pos: position{line: 550, col: 35, offset: 16072}, + pos: position{line: 550, col: 35, offset: 16075}, name: "_", }, &litMatcher{ - pos: position{line: 550, col: 37, offset: 16074}, + pos: position{line: 550, col: 37, offset: 16077}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 550, col: 41, offset: 16078}, + pos: position{line: 550, col: 41, offset: 16081}, name: "_1", }, &labeledExpr{ - pos: position{line: 550, col: 44, offset: 16081}, + pos: position{line: 550, col: 44, offset: 16084}, label: "t", expr: &ruleRefExpr{ - pos: position{line: 550, col: 46, offset: 16083}, + pos: position{line: 550, col: 46, offset: 16086}, name: "ApplicationExpression", }, }, @@ -10520,36 +10520,36 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 551, col: 7, offset: 16153}, + pos: position{line: 551, col: 7, offset: 16156}, run: (*parser).callonExpression687, expr: &seqExpr{ - pos: position{line: 551, col: 7, offset: 16153}, + pos: position{line: 551, col: 7, offset: 16156}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &ruleRefExpr{ - pos: position{line: 551, col: 14, offset: 16160}, + pos: position{line: 551, col: 14, offset: 16163}, name: "_", }, &litMatcher{ - pos: position{line: 551, col: 16, offset: 16162}, + pos: position{line: 551, col: 16, offset: 16165}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 551, col: 20, offset: 16166}, + pos: position{line: 551, col: 20, offset: 16169}, name: "_1", }, &labeledExpr{ - pos: position{line: 551, col: 23, offset: 16169}, + pos: position{line: 551, col: 23, offset: 16172}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 551, col: 25, offset: 16171}, + pos: position{line: 551, col: 25, offset: 16174}, name: "Expression", }, }, @@ -10557,7 +10557,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 552, col: 7, offset: 16233}, + pos: position{line: 552, col: 7, offset: 16236}, name: "AnnotatedExpression", }, }, @@ -10565,28 +10565,28 @@ var g = &grammar{ }, { name: "Annotation", - pos: position{line: 554, col: 1, offset: 16254}, + pos: position{line: 554, col: 1, offset: 16257}, expr: &actionExpr{ - pos: position{line: 554, col: 14, offset: 16269}, + pos: position{line: 554, col: 14, offset: 16272}, run: (*parser).callonAnnotation1, expr: &seqExpr{ - pos: position{line: 554, col: 14, offset: 16269}, + pos: position{line: 554, col: 14, offset: 16272}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 554, col: 14, offset: 16269}, + pos: position{line: 554, col: 14, offset: 16272}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 554, col: 18, offset: 16273}, + pos: position{line: 554, col: 18, offset: 16276}, name: "_1", }, &labeledExpr{ - pos: position{line: 554, col: 21, offset: 16276}, + pos: position{line: 554, col: 21, offset: 16279}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 554, col: 23, offset: 16278}, + pos: position{line: 554, col: 23, offset: 16281}, name: "Expression", }, }, @@ -10596,35 +10596,35 @@ var g = &grammar{ }, { name: "AnnotatedExpression", - pos: position{line: 556, col: 1, offset: 16308}, + pos: position{line: 556, col: 1, offset: 16311}, expr: &actionExpr{ - pos: position{line: 557, col: 1, offset: 16332}, + pos: position{line: 557, col: 1, offset: 16335}, run: (*parser).callonAnnotatedExpression1, expr: &seqExpr{ - pos: position{line: 557, col: 1, offset: 16332}, + pos: position{line: 557, col: 1, offset: 16335}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 557, col: 1, offset: 16332}, + pos: position{line: 557, col: 1, offset: 16335}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 557, col: 3, offset: 16334}, + pos: position{line: 557, col: 3, offset: 16337}, name: "OperatorExpression", }, }, &labeledExpr{ - pos: position{line: 557, col: 22, offset: 16353}, + pos: position{line: 557, col: 22, offset: 16356}, label: "a", expr: &zeroOrOneExpr{ - pos: position{line: 557, col: 24, offset: 16355}, + pos: position{line: 557, col: 24, offset: 16358}, expr: &seqExpr{ - pos: position{line: 557, col: 25, offset: 16356}, + pos: position{line: 557, col: 25, offset: 16359}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 557, col: 25, offset: 16356}, + pos: position{line: 557, col: 25, offset: 16359}, name: "_", }, &ruleRefExpr{ - pos: position{line: 557, col: 27, offset: 16358}, + pos: position{line: 557, col: 27, offset: 16361}, name: "Annotation", }, }, @@ -10637,66 +10637,66 @@ var g = &grammar{ }, { name: "EmptyList", - pos: position{line: 562, col: 1, offset: 16483}, + pos: position{line: 562, col: 1, offset: 16486}, expr: &actionExpr{ - pos: position{line: 562, col: 13, offset: 16497}, + pos: position{line: 562, col: 13, offset: 16500}, run: (*parser).callonEmptyList1, expr: &seqExpr{ - pos: position{line: 562, col: 13, offset: 16497}, + pos: position{line: 562, col: 13, offset: 16500}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 562, col: 13, offset: 16497}, + pos: position{line: 562, col: 13, offset: 16500}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 562, col: 17, offset: 16501}, + pos: position{line: 562, col: 17, offset: 16504}, name: "_", }, &zeroOrOneExpr{ - pos: position{line: 562, col: 19, offset: 16503}, + pos: position{line: 562, col: 19, offset: 16506}, expr: &seqExpr{ - pos: position{line: 562, col: 20, offset: 16504}, + pos: position{line: 562, col: 20, offset: 16507}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 562, col: 20, offset: 16504}, + pos: position{line: 562, col: 20, offset: 16507}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 562, col: 24, offset: 16508}, + pos: position{line: 562, col: 24, offset: 16511}, name: "_", }, }, }, }, &litMatcher{ - pos: position{line: 562, col: 28, offset: 16512}, + pos: position{line: 562, col: 28, offset: 16515}, val: "]", ignoreCase: false, want: "\"]\"", }, &ruleRefExpr{ - pos: position{line: 562, col: 32, offset: 16516}, + pos: position{line: 562, col: 32, offset: 16519}, name: "_", }, &litMatcher{ - pos: position{line: 562, col: 34, offset: 16518}, + pos: position{line: 562, col: 34, offset: 16521}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 562, col: 38, offset: 16522}, + pos: position{line: 562, col: 38, offset: 16525}, name: "_1", }, &labeledExpr{ - pos: position{line: 562, col: 41, offset: 16525}, + pos: position{line: 562, col: 41, offset: 16528}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 562, col: 43, offset: 16527}, + pos: position{line: 562, col: 43, offset: 16530}, name: "ApplicationExpression", }, }, @@ -10706,45 +10706,45 @@ var g = &grammar{ }, { name: "WithExpression", - pos: position{line: 566, col: 1, offset: 16595}, + pos: position{line: 566, col: 1, offset: 16598}, expr: &actionExpr{ - pos: position{line: 567, col: 3, offset: 16616}, + pos: position{line: 567, col: 3, offset: 16619}, run: (*parser).callonWithExpression1, expr: &seqExpr{ - pos: position{line: 567, col: 3, offset: 16616}, + pos: position{line: 567, col: 3, offset: 16619}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 567, col: 3, offset: 16616}, + pos: position{line: 567, col: 3, offset: 16619}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 567, col: 9, offset: 16622}, + pos: position{line: 567, col: 9, offset: 16625}, name: "ImportExpression", }, }, &labeledExpr{ - pos: position{line: 567, col: 26, offset: 16639}, + pos: position{line: 567, col: 26, offset: 16642}, label: "rest", expr: &oneOrMoreExpr{ - pos: position{line: 567, col: 31, offset: 16644}, + pos: position{line: 567, col: 31, offset: 16647}, expr: &seqExpr{ - pos: position{line: 567, col: 32, offset: 16645}, + pos: position{line: 567, col: 32, offset: 16648}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 567, col: 32, offset: 16645}, + pos: position{line: 567, col: 32, offset: 16648}, name: "_1", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", }, &ruleRefExpr{ - pos: position{line: 567, col: 40, offset: 16653}, + pos: position{line: 567, col: 40, offset: 16656}, name: "_1", }, &ruleRefExpr{ - pos: position{line: 567, col: 43, offset: 16656}, + pos: position{line: 567, col: 43, offset: 16659}, name: "WithClause", }, }, @@ -10757,30 +10757,30 @@ var g = &grammar{ }, { name: "WithClause", - pos: position{line: 580, col: 1, offset: 16994}, + pos: position{line: 580, col: 1, offset: 16997}, expr: &seqExpr{ - pos: position{line: 580, col: 14, offset: 17009}, + pos: position{line: 580, col: 14, offset: 17012}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 580, col: 14, offset: 17009}, + pos: position{line: 580, col: 14, offset: 17012}, name: "FieldPath", }, &ruleRefExpr{ - pos: position{line: 580, col: 24, offset: 17019}, + pos: position{line: 580, col: 24, offset: 17022}, name: "_", }, &litMatcher{ - pos: position{line: 580, col: 26, offset: 17021}, + pos: position{line: 580, col: 26, offset: 17024}, val: "=", ignoreCase: false, want: "\"=\"", }, &ruleRefExpr{ - pos: position{line: 580, col: 30, offset: 17025}, + pos: position{line: 580, col: 30, offset: 17028}, name: "_", }, &ruleRefExpr{ - pos: position{line: 580, col: 32, offset: 17027}, + pos: position{line: 580, col: 32, offset: 17030}, name: "OperatorExpression", }, }, @@ -10788,41 +10788,41 @@ var g = &grammar{ }, { name: "FieldPath", - pos: position{line: 582, col: 1, offset: 17047}, + pos: position{line: 582, col: 1, offset: 17050}, expr: &actionExpr{ - pos: position{line: 582, col: 13, offset: 17061}, + pos: position{line: 582, col: 13, offset: 17064}, run: (*parser).callonFieldPath1, expr: &seqExpr{ - pos: position{line: 582, col: 13, offset: 17061}, + pos: position{line: 582, col: 13, offset: 17064}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 582, col: 13, offset: 17061}, + pos: position{line: 582, col: 13, offset: 17064}, label: "first", expr: &choiceExpr{ - pos: position{line: 154, col: 18, offset: 3799}, + pos: position{line: 154, col: 18, offset: 3802}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, run: (*parser).callonFieldPath5, expr: &seqExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, val: "`", ignoreCase: false, want: "\"`\"", }, &labeledExpr{ - pos: position{line: 146, col: 13, offset: 3519}, + pos: position{line: 146, col: 13, offset: 3522}, label: "label", expr: &actionExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, run: (*parser).callonFieldPath9, expr: &oneOrMoreExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, expr: &charClassMatcher{ - pos: position{line: 143, col: 19, offset: 3419}, + pos: position{line: 143, col: 19, offset: 3422}, val: "[ -_a-~]", ranges: []rune{' ', '_', 'a', '~'}, ignoreCase: false, @@ -10832,7 +10832,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 146, col: 31, offset: 3537}, + pos: position{line: 146, col: 31, offset: 3540}, val: "`", ignoreCase: false, want: "\"`\"", @@ -10841,75 +10841,75 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, run: (*parser).callonFieldPath13, expr: &labeledExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, label: "label", expr: &choiceExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, run: (*parser).callonFieldPath16, expr: &seqExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonFieldPath25, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -10921,61 +10921,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -10983,9 +10983,9 @@ var g = &grammar{ }, }, &oneOrMoreExpr{ - pos: position{line: 137, col: 23, offset: 3220}, + pos: position{line: 137, col: 23, offset: 3223}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -10997,68 +10997,68 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, run: (*parser).callonFieldPath42, expr: &seqExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, exprs: []interface{}{ ¬Expr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, expr: &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonFieldPath52, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -11070,61 +11070,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -11133,7 +11133,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 135, col: 24, offset: 3147}, + pos: position{line: 135, col: 24, offset: 3150}, val: "[_A-Za-z]", chars: []rune{'_'}, ranges: []rune{'A', 'Z', 'a', 'z'}, @@ -11141,9 +11141,9 @@ var g = &grammar{ inverted: false, }, &zeroOrMoreExpr{ - pos: position{line: 138, col: 43, offset: 3314}, + pos: position{line: 138, col: 43, offset: 3317}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -11159,10 +11159,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 154, col: 29, offset: 3810}, + pos: position{line: 154, col: 29, offset: 3813}, run: (*parser).callonFieldPath70, expr: &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", @@ -11172,52 +11172,52 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 582, col: 34, offset: 17082}, + pos: position{line: 582, col: 34, offset: 17085}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 582, col: 39, offset: 17087}, + pos: position{line: 582, col: 39, offset: 17090}, expr: &seqExpr{ - pos: position{line: 582, col: 40, offset: 17088}, + pos: position{line: 582, col: 40, offset: 17091}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 582, col: 40, offset: 17088}, + pos: position{line: 582, col: 40, offset: 17091}, name: "_", }, &litMatcher{ - pos: position{line: 582, col: 42, offset: 17090}, + pos: position{line: 582, col: 42, offset: 17093}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 582, col: 46, offset: 17094}, + pos: position{line: 582, col: 46, offset: 17097}, name: "_", }, &choiceExpr{ - pos: position{line: 154, col: 18, offset: 3799}, + pos: position{line: 154, col: 18, offset: 3802}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, run: (*parser).callonFieldPath79, expr: &seqExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, val: "`", ignoreCase: false, want: "\"`\"", }, &labeledExpr{ - pos: position{line: 146, col: 13, offset: 3519}, + pos: position{line: 146, col: 13, offset: 3522}, label: "label", expr: &actionExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, run: (*parser).callonFieldPath83, expr: &oneOrMoreExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, expr: &charClassMatcher{ - pos: position{line: 143, col: 19, offset: 3419}, + pos: position{line: 143, col: 19, offset: 3422}, val: "[ -_a-~]", ranges: []rune{' ', '_', 'a', '~'}, ignoreCase: false, @@ -11227,7 +11227,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 146, col: 31, offset: 3537}, + pos: position{line: 146, col: 31, offset: 3540}, val: "`", ignoreCase: false, want: "\"`\"", @@ -11236,75 +11236,75 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, run: (*parser).callonFieldPath87, expr: &labeledExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, label: "label", expr: &choiceExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, run: (*parser).callonFieldPath90, expr: &seqExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonFieldPath99, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -11316,61 +11316,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -11378,9 +11378,9 @@ var g = &grammar{ }, }, &oneOrMoreExpr{ - pos: position{line: 137, col: 23, offset: 3220}, + pos: position{line: 137, col: 23, offset: 3223}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -11392,68 +11392,68 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, run: (*parser).callonFieldPath116, expr: &seqExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, exprs: []interface{}{ ¬Expr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, expr: &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonFieldPath126, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -11465,61 +11465,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -11528,7 +11528,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 135, col: 24, offset: 3147}, + pos: position{line: 135, col: 24, offset: 3150}, val: "[_A-Za-z]", chars: []rune{'_'}, ranges: []rune{'A', 'Z', 'a', 'z'}, @@ -11536,9 +11536,9 @@ var g = &grammar{ inverted: false, }, &zeroOrMoreExpr{ - pos: position{line: 138, col: 43, offset: 3314}, + pos: position{line: 138, col: 43, offset: 3317}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -11554,10 +11554,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 154, col: 29, offset: 3810}, + pos: position{line: 154, col: 29, offset: 3813}, run: (*parser).callonFieldPath144, expr: &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", @@ -11575,52 +11575,52 @@ var g = &grammar{ }, { name: "OperatorExpression", - pos: position{line: 592, col: 1, offset: 17334}, + pos: position{line: 592, col: 1, offset: 17337}, expr: &ruleRefExpr{ - pos: position{line: 592, col: 22, offset: 17357}, + pos: position{line: 592, col: 22, offset: 17360}, name: "EquivalentExpression", }, }, { name: "EquivalentExpression", - pos: position{line: 594, col: 1, offset: 17379}, + pos: position{line: 594, col: 1, offset: 17382}, expr: &actionExpr{ - pos: position{line: 594, col: 26, offset: 17406}, + pos: position{line: 594, col: 26, offset: 17409}, run: (*parser).callonEquivalentExpression1, expr: &seqExpr{ - pos: position{line: 594, col: 26, offset: 17406}, + pos: position{line: 594, col: 26, offset: 17409}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 594, col: 26, offset: 17406}, + pos: position{line: 594, col: 26, offset: 17409}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 594, col: 32, offset: 17412}, + pos: position{line: 594, col: 32, offset: 17415}, name: "ImportAltExpression", }, }, &labeledExpr{ - pos: position{line: 594, col: 55, offset: 17435}, + pos: position{line: 594, col: 55, offset: 17438}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 594, col: 60, offset: 17440}, + pos: position{line: 594, col: 60, offset: 17443}, expr: &seqExpr{ - pos: position{line: 594, col: 61, offset: 17441}, + pos: position{line: 594, col: 61, offset: 17444}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 594, col: 61, offset: 17441}, + pos: position{line: 594, col: 61, offset: 17444}, name: "_", }, &choiceExpr{ - pos: position{line: 316, col: 14, offset: 8458}, + pos: position{line: 316, col: 14, offset: 8461}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 316, col: 14, offset: 8458}, + pos: position{line: 316, col: 14, offset: 8461}, val: "===", ignoreCase: false, want: "\"===\"", }, &litMatcher{ - pos: position{line: 316, col: 22, offset: 8466}, + pos: position{line: 316, col: 22, offset: 8469}, val: "≡", ignoreCase: false, want: "\"≡\"", @@ -11628,14 +11628,14 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 594, col: 74, offset: 17454}, + pos: position{line: 594, col: 74, offset: 17457}, name: "_", }, &labeledExpr{ - pos: position{line: 594, col: 76, offset: 17456}, + pos: position{line: 594, col: 76, offset: 17459}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 594, col: 78, offset: 17458}, + pos: position{line: 594, col: 78, offset: 17461}, name: "ImportAltExpression", }, }, @@ -11649,45 +11649,45 @@ var g = &grammar{ }, { name: "ImportAltExpression", - pos: position{line: 596, col: 1, offset: 17532}, + pos: position{line: 596, col: 1, offset: 17535}, expr: &actionExpr{ - pos: position{line: 596, col: 26, offset: 17559}, + pos: position{line: 596, col: 26, offset: 17562}, run: (*parser).callonImportAltExpression1, expr: &seqExpr{ - pos: position{line: 596, col: 26, offset: 17559}, + pos: position{line: 596, col: 26, offset: 17562}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 596, col: 26, offset: 17559}, + pos: position{line: 596, col: 26, offset: 17562}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 596, col: 32, offset: 17565}, + pos: position{line: 596, col: 32, offset: 17568}, name: "OrExpression", }, }, &labeledExpr{ - pos: position{line: 596, col: 55, offset: 17588}, + pos: position{line: 596, col: 55, offset: 17591}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 596, col: 60, offset: 17593}, + pos: position{line: 596, col: 60, offset: 17596}, expr: &seqExpr{ - pos: position{line: 596, col: 61, offset: 17594}, + pos: position{line: 596, col: 61, offset: 17597}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 596, col: 61, offset: 17594}, + pos: position{line: 596, col: 61, offset: 17597}, name: "_", }, &litMatcher{ - pos: position{line: 596, col: 63, offset: 17596}, + pos: position{line: 596, col: 63, offset: 17599}, val: "?", ignoreCase: false, want: "\"?\"", }, &ruleRefExpr{ - pos: position{line: 596, col: 67, offset: 17600}, + pos: position{line: 596, col: 67, offset: 17603}, name: "_1", }, &ruleRefExpr{ - pos: position{line: 596, col: 70, offset: 17603}, + pos: position{line: 596, col: 70, offset: 17606}, name: "OrExpression", }, }, @@ -11700,45 +11700,45 @@ var g = &grammar{ }, { name: "OrExpression", - pos: position{line: 598, col: 1, offset: 17674}, + pos: position{line: 598, col: 1, offset: 17677}, expr: &actionExpr{ - pos: position{line: 598, col: 26, offset: 17701}, + pos: position{line: 598, col: 26, offset: 17704}, run: (*parser).callonOrExpression1, expr: &seqExpr{ - pos: position{line: 598, col: 26, offset: 17701}, + pos: position{line: 598, col: 26, offset: 17704}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 598, col: 26, offset: 17701}, + pos: position{line: 598, col: 26, offset: 17704}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 598, col: 32, offset: 17707}, + pos: position{line: 598, col: 32, offset: 17710}, name: "PlusExpression", }, }, &labeledExpr{ - pos: position{line: 598, col: 55, offset: 17730}, + pos: position{line: 598, col: 55, offset: 17733}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 598, col: 60, offset: 17735}, + pos: position{line: 598, col: 60, offset: 17738}, expr: &seqExpr{ - pos: position{line: 598, col: 61, offset: 17736}, + pos: position{line: 598, col: 61, offset: 17739}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 598, col: 61, offset: 17736}, + pos: position{line: 598, col: 61, offset: 17739}, name: "_", }, &litMatcher{ - pos: position{line: 598, col: 63, offset: 17738}, + pos: position{line: 598, col: 63, offset: 17741}, val: "||", ignoreCase: false, want: "\"||\"", }, &ruleRefExpr{ - pos: position{line: 598, col: 68, offset: 17743}, + pos: position{line: 598, col: 68, offset: 17746}, name: "_", }, &ruleRefExpr{ - pos: position{line: 598, col: 70, offset: 17745}, + pos: position{line: 598, col: 70, offset: 17748}, name: "PlusExpression", }, }, @@ -11751,48 +11751,48 @@ var g = &grammar{ }, { name: "PlusExpression", - pos: position{line: 600, col: 1, offset: 17811}, + pos: position{line: 600, col: 1, offset: 17814}, expr: &actionExpr{ - pos: position{line: 600, col: 26, offset: 17838}, + pos: position{line: 600, col: 26, offset: 17841}, run: (*parser).callonPlusExpression1, expr: &seqExpr{ - pos: position{line: 600, col: 26, offset: 17838}, + pos: position{line: 600, col: 26, offset: 17841}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 600, col: 26, offset: 17838}, + pos: position{line: 600, col: 26, offset: 17841}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 600, col: 32, offset: 17844}, + pos: position{line: 600, col: 32, offset: 17847}, name: "TextAppendExpression", }, }, &labeledExpr{ - pos: position{line: 600, col: 55, offset: 17867}, + pos: position{line: 600, col: 55, offset: 17870}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 600, col: 60, offset: 17872}, + pos: position{line: 600, col: 60, offset: 17875}, expr: &seqExpr{ - pos: position{line: 600, col: 61, offset: 17873}, + pos: position{line: 600, col: 61, offset: 17876}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 600, col: 61, offset: 17873}, + pos: position{line: 600, col: 61, offset: 17876}, name: "_", }, &litMatcher{ - pos: position{line: 600, col: 63, offset: 17875}, + pos: position{line: 600, col: 63, offset: 17878}, val: "+", ignoreCase: false, want: "\"+\"", }, &ruleRefExpr{ - pos: position{line: 600, col: 67, offset: 17879}, + pos: position{line: 600, col: 67, offset: 17882}, name: "_1", }, &labeledExpr{ - pos: position{line: 600, col: 70, offset: 17882}, + pos: position{line: 600, col: 70, offset: 17885}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 600, col: 72, offset: 17884}, + pos: position{line: 600, col: 72, offset: 17887}, name: "TextAppendExpression", }, }, @@ -11806,48 +11806,48 @@ var g = &grammar{ }, { name: "TextAppendExpression", - pos: position{line: 602, col: 1, offset: 17958}, + pos: position{line: 602, col: 1, offset: 17961}, expr: &actionExpr{ - pos: position{line: 602, col: 26, offset: 17985}, + pos: position{line: 602, col: 26, offset: 17988}, run: (*parser).callonTextAppendExpression1, expr: &seqExpr{ - pos: position{line: 602, col: 26, offset: 17985}, + pos: position{line: 602, col: 26, offset: 17988}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 602, col: 26, offset: 17985}, + pos: position{line: 602, col: 26, offset: 17988}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 602, col: 32, offset: 17991}, + pos: position{line: 602, col: 32, offset: 17994}, name: "ListAppendExpression", }, }, &labeledExpr{ - pos: position{line: 602, col: 55, offset: 18014}, + pos: position{line: 602, col: 55, offset: 18017}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 602, col: 60, offset: 18019}, + pos: position{line: 602, col: 60, offset: 18022}, expr: &seqExpr{ - pos: position{line: 602, col: 61, offset: 18020}, + pos: position{line: 602, col: 61, offset: 18023}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 602, col: 61, offset: 18020}, + pos: position{line: 602, col: 61, offset: 18023}, name: "_", }, &litMatcher{ - pos: position{line: 602, col: 63, offset: 18022}, + pos: position{line: 602, col: 63, offset: 18025}, val: "++", ignoreCase: false, want: "\"++\"", }, &ruleRefExpr{ - pos: position{line: 602, col: 68, offset: 18027}, + pos: position{line: 602, col: 68, offset: 18030}, name: "_", }, &labeledExpr{ - pos: position{line: 602, col: 70, offset: 18029}, + pos: position{line: 602, col: 70, offset: 18032}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 602, col: 72, offset: 18031}, + pos: position{line: 602, col: 72, offset: 18034}, name: "ListAppendExpression", }, }, @@ -11861,48 +11861,48 @@ var g = &grammar{ }, { name: "ListAppendExpression", - pos: position{line: 604, col: 1, offset: 18111}, + pos: position{line: 604, col: 1, offset: 18114}, expr: &actionExpr{ - pos: position{line: 604, col: 26, offset: 18138}, + pos: position{line: 604, col: 26, offset: 18141}, run: (*parser).callonListAppendExpression1, expr: &seqExpr{ - pos: position{line: 604, col: 26, offset: 18138}, + pos: position{line: 604, col: 26, offset: 18141}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 604, col: 26, offset: 18138}, + pos: position{line: 604, col: 26, offset: 18141}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 604, col: 32, offset: 18144}, + pos: position{line: 604, col: 32, offset: 18147}, name: "AndExpression", }, }, &labeledExpr{ - pos: position{line: 604, col: 55, offset: 18167}, + pos: position{line: 604, col: 55, offset: 18170}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 604, col: 60, offset: 18172}, + pos: position{line: 604, col: 60, offset: 18175}, expr: &seqExpr{ - pos: position{line: 604, col: 61, offset: 18173}, + pos: position{line: 604, col: 61, offset: 18176}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 604, col: 61, offset: 18173}, + pos: position{line: 604, col: 61, offset: 18176}, name: "_", }, &litMatcher{ - pos: position{line: 604, col: 63, offset: 18175}, + pos: position{line: 604, col: 63, offset: 18178}, val: "#", ignoreCase: false, want: "\"#\"", }, &ruleRefExpr{ - pos: position{line: 604, col: 67, offset: 18179}, + pos: position{line: 604, col: 67, offset: 18182}, name: "_", }, &labeledExpr{ - pos: position{line: 604, col: 69, offset: 18181}, + pos: position{line: 604, col: 69, offset: 18184}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 604, col: 71, offset: 18183}, + pos: position{line: 604, col: 71, offset: 18186}, name: "AndExpression", }, }, @@ -11916,48 +11916,48 @@ var g = &grammar{ }, { name: "AndExpression", - pos: position{line: 606, col: 1, offset: 18256}, + pos: position{line: 606, col: 1, offset: 18259}, expr: &actionExpr{ - pos: position{line: 606, col: 26, offset: 18283}, + pos: position{line: 606, col: 26, offset: 18286}, run: (*parser).callonAndExpression1, expr: &seqExpr{ - pos: position{line: 606, col: 26, offset: 18283}, + pos: position{line: 606, col: 26, offset: 18286}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 606, col: 26, offset: 18283}, + pos: position{line: 606, col: 26, offset: 18286}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 606, col: 32, offset: 18289}, + pos: position{line: 606, col: 32, offset: 18292}, name: "CombineExpression", }, }, &labeledExpr{ - pos: position{line: 606, col: 55, offset: 18312}, + pos: position{line: 606, col: 55, offset: 18315}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 606, col: 60, offset: 18317}, + pos: position{line: 606, col: 60, offset: 18320}, expr: &seqExpr{ - pos: position{line: 606, col: 61, offset: 18318}, + pos: position{line: 606, col: 61, offset: 18321}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 606, col: 61, offset: 18318}, + pos: position{line: 606, col: 61, offset: 18321}, name: "_", }, &litMatcher{ - pos: position{line: 606, col: 63, offset: 18320}, + pos: position{line: 606, col: 63, offset: 18323}, val: "&&", ignoreCase: false, want: "\"&&\"", }, &ruleRefExpr{ - pos: position{line: 606, col: 68, offset: 18325}, + pos: position{line: 606, col: 68, offset: 18328}, name: "_", }, &labeledExpr{ - pos: position{line: 606, col: 70, offset: 18327}, + pos: position{line: 606, col: 70, offset: 18330}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 606, col: 72, offset: 18329}, + pos: position{line: 606, col: 72, offset: 18332}, name: "CombineExpression", }, }, @@ -11971,44 +11971,44 @@ var g = &grammar{ }, { name: "CombineExpression", - pos: position{line: 608, col: 1, offset: 18399}, + pos: position{line: 608, col: 1, offset: 18402}, expr: &actionExpr{ - pos: position{line: 608, col: 26, offset: 18426}, + pos: position{line: 608, col: 26, offset: 18429}, run: (*parser).callonCombineExpression1, expr: &seqExpr{ - pos: position{line: 608, col: 26, offset: 18426}, + pos: position{line: 608, col: 26, offset: 18429}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 608, col: 26, offset: 18426}, + pos: position{line: 608, col: 26, offset: 18429}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 608, col: 32, offset: 18432}, + pos: position{line: 608, col: 32, offset: 18435}, name: "PreferExpression", }, }, &labeledExpr{ - pos: position{line: 608, col: 55, offset: 18455}, + pos: position{line: 608, col: 55, offset: 18458}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 608, col: 60, offset: 18460}, + pos: position{line: 608, col: 60, offset: 18463}, expr: &seqExpr{ - pos: position{line: 608, col: 61, offset: 18461}, + pos: position{line: 608, col: 61, offset: 18464}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 608, col: 61, offset: 18461}, + pos: position{line: 608, col: 61, offset: 18464}, name: "_", }, &choiceExpr{ - pos: position{line: 314, col: 11, offset: 8395}, + pos: position{line: 314, col: 11, offset: 8398}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 314, col: 11, offset: 8395}, + pos: position{line: 314, col: 11, offset: 8398}, val: "/\\", ignoreCase: false, want: "\"/\\\\\"", }, &litMatcher{ - pos: position{line: 314, col: 19, offset: 8403}, + pos: position{line: 314, col: 19, offset: 8406}, val: "∧", ignoreCase: false, want: "\"∧\"", @@ -12016,14 +12016,14 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 608, col: 71, offset: 18471}, + pos: position{line: 608, col: 71, offset: 18474}, name: "_", }, &labeledExpr{ - pos: position{line: 608, col: 73, offset: 18473}, + pos: position{line: 608, col: 73, offset: 18476}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 608, col: 75, offset: 18475}, + pos: position{line: 608, col: 75, offset: 18478}, name: "PreferExpression", }, }, @@ -12037,44 +12037,44 @@ var g = &grammar{ }, { name: "PreferExpression", - pos: position{line: 610, col: 1, offset: 18552}, + pos: position{line: 610, col: 1, offset: 18555}, expr: &actionExpr{ - pos: position{line: 610, col: 26, offset: 18579}, + pos: position{line: 610, col: 26, offset: 18582}, run: (*parser).callonPreferExpression1, expr: &seqExpr{ - pos: position{line: 610, col: 26, offset: 18579}, + pos: position{line: 610, col: 26, offset: 18582}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 610, col: 26, offset: 18579}, + pos: position{line: 610, col: 26, offset: 18582}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 610, col: 32, offset: 18585}, + pos: position{line: 610, col: 32, offset: 18588}, name: "CombineTypesExpression", }, }, &labeledExpr{ - pos: position{line: 610, col: 55, offset: 18608}, + pos: position{line: 610, col: 55, offset: 18611}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 610, col: 60, offset: 18613}, + pos: position{line: 610, col: 60, offset: 18616}, expr: &seqExpr{ - pos: position{line: 610, col: 61, offset: 18614}, + pos: position{line: 610, col: 61, offset: 18617}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 610, col: 61, offset: 18614}, + pos: position{line: 610, col: 61, offset: 18617}, name: "_", }, &choiceExpr{ - pos: position{line: 317, col: 10, offset: 8483}, + pos: position{line: 317, col: 10, offset: 8486}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 317, col: 10, offset: 8483}, + pos: position{line: 317, col: 10, offset: 8486}, val: "//", ignoreCase: false, want: "\"//\"", }, &litMatcher{ - pos: position{line: 317, col: 17, offset: 8490}, + pos: position{line: 317, col: 17, offset: 8493}, val: "⫽", ignoreCase: false, want: "\"⫽\"", @@ -12082,14 +12082,14 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 610, col: 70, offset: 18623}, + pos: position{line: 610, col: 70, offset: 18626}, name: "_", }, &labeledExpr{ - pos: position{line: 610, col: 72, offset: 18625}, + pos: position{line: 610, col: 72, offset: 18628}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 610, col: 74, offset: 18627}, + pos: position{line: 610, col: 74, offset: 18630}, name: "CombineTypesExpression", }, }, @@ -12103,44 +12103,44 @@ var g = &grammar{ }, { name: "CombineTypesExpression", - pos: position{line: 612, col: 1, offset: 18721}, + pos: position{line: 612, col: 1, offset: 18724}, expr: &actionExpr{ - pos: position{line: 612, col: 26, offset: 18748}, + pos: position{line: 612, col: 26, offset: 18751}, run: (*parser).callonCombineTypesExpression1, expr: &seqExpr{ - pos: position{line: 612, col: 26, offset: 18748}, + pos: position{line: 612, col: 26, offset: 18751}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 612, col: 26, offset: 18748}, + pos: position{line: 612, col: 26, offset: 18751}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 612, col: 32, offset: 18754}, + pos: position{line: 612, col: 32, offset: 18757}, name: "TimesExpression", }, }, &labeledExpr{ - pos: position{line: 612, col: 55, offset: 18777}, + pos: position{line: 612, col: 55, offset: 18780}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 612, col: 60, offset: 18782}, + pos: position{line: 612, col: 60, offset: 18785}, expr: &seqExpr{ - pos: position{line: 612, col: 61, offset: 18783}, + pos: position{line: 612, col: 61, offset: 18786}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 612, col: 61, offset: 18783}, + pos: position{line: 612, col: 61, offset: 18786}, name: "_", }, &choiceExpr{ - pos: position{line: 315, col: 16, offset: 8426}, + pos: position{line: 315, col: 16, offset: 8429}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 315, col: 16, offset: 8426}, + pos: position{line: 315, col: 16, offset: 8429}, val: "//\\\\", ignoreCase: false, want: "\"//\\\\\\\\\"", }, &litMatcher{ - pos: position{line: 315, col: 27, offset: 8437}, + pos: position{line: 315, col: 27, offset: 8440}, val: "⩓", ignoreCase: false, want: "\"⩓\"", @@ -12148,14 +12148,14 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 612, col: 76, offset: 18798}, + pos: position{line: 612, col: 76, offset: 18801}, name: "_", }, &labeledExpr{ - pos: position{line: 612, col: 78, offset: 18800}, + pos: position{line: 612, col: 78, offset: 18803}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 612, col: 80, offset: 18802}, + pos: position{line: 612, col: 80, offset: 18805}, name: "TimesExpression", }, }, @@ -12169,48 +12169,48 @@ var g = &grammar{ }, { name: "TimesExpression", - pos: position{line: 614, col: 1, offset: 18882}, + pos: position{line: 614, col: 1, offset: 18885}, expr: &actionExpr{ - pos: position{line: 614, col: 26, offset: 18909}, + pos: position{line: 614, col: 26, offset: 18912}, run: (*parser).callonTimesExpression1, expr: &seqExpr{ - pos: position{line: 614, col: 26, offset: 18909}, + pos: position{line: 614, col: 26, offset: 18912}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 614, col: 26, offset: 18909}, + pos: position{line: 614, col: 26, offset: 18912}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 614, col: 32, offset: 18915}, + pos: position{line: 614, col: 32, offset: 18918}, name: "EqualExpression", }, }, &labeledExpr{ - pos: position{line: 614, col: 55, offset: 18938}, + pos: position{line: 614, col: 55, offset: 18941}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 614, col: 60, offset: 18943}, + pos: position{line: 614, col: 60, offset: 18946}, expr: &seqExpr{ - pos: position{line: 614, col: 61, offset: 18944}, + pos: position{line: 614, col: 61, offset: 18947}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 614, col: 61, offset: 18944}, + pos: position{line: 614, col: 61, offset: 18947}, name: "_", }, &litMatcher{ - pos: position{line: 614, col: 63, offset: 18946}, + pos: position{line: 614, col: 63, offset: 18949}, val: "*", ignoreCase: false, want: "\"*\"", }, &ruleRefExpr{ - pos: position{line: 614, col: 67, offset: 18950}, + pos: position{line: 614, col: 67, offset: 18953}, name: "_", }, &labeledExpr{ - pos: position{line: 614, col: 69, offset: 18952}, + pos: position{line: 614, col: 69, offset: 18955}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 614, col: 71, offset: 18954}, + pos: position{line: 614, col: 71, offset: 18957}, name: "EqualExpression", }, }, @@ -12224,48 +12224,48 @@ var g = &grammar{ }, { name: "EqualExpression", - pos: position{line: 616, col: 1, offset: 19024}, + pos: position{line: 616, col: 1, offset: 19027}, expr: &actionExpr{ - pos: position{line: 616, col: 26, offset: 19051}, + pos: position{line: 616, col: 26, offset: 19054}, run: (*parser).callonEqualExpression1, expr: &seqExpr{ - pos: position{line: 616, col: 26, offset: 19051}, + pos: position{line: 616, col: 26, offset: 19054}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 616, col: 26, offset: 19051}, + pos: position{line: 616, col: 26, offset: 19054}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 616, col: 32, offset: 19057}, + pos: position{line: 616, col: 32, offset: 19060}, name: "NotEqualExpression", }, }, &labeledExpr{ - pos: position{line: 616, col: 55, offset: 19080}, + pos: position{line: 616, col: 55, offset: 19083}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 616, col: 60, offset: 19085}, + pos: position{line: 616, col: 60, offset: 19088}, expr: &seqExpr{ - pos: position{line: 616, col: 61, offset: 19086}, + pos: position{line: 616, col: 61, offset: 19089}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 616, col: 61, offset: 19086}, + pos: position{line: 616, col: 61, offset: 19089}, name: "_", }, &litMatcher{ - pos: position{line: 616, col: 63, offset: 19088}, + pos: position{line: 616, col: 63, offset: 19091}, val: "==", ignoreCase: false, want: "\"==\"", }, &ruleRefExpr{ - pos: position{line: 616, col: 68, offset: 19093}, + pos: position{line: 616, col: 68, offset: 19096}, name: "_", }, &labeledExpr{ - pos: position{line: 616, col: 70, offset: 19095}, + pos: position{line: 616, col: 70, offset: 19098}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 616, col: 72, offset: 19097}, + pos: position{line: 616, col: 72, offset: 19100}, name: "NotEqualExpression", }, }, @@ -12279,48 +12279,48 @@ var g = &grammar{ }, { name: "NotEqualExpression", - pos: position{line: 618, col: 1, offset: 19167}, + pos: position{line: 618, col: 1, offset: 19170}, expr: &actionExpr{ - pos: position{line: 618, col: 26, offset: 19194}, + pos: position{line: 618, col: 26, offset: 19197}, run: (*parser).callonNotEqualExpression1, expr: &seqExpr{ - pos: position{line: 618, col: 26, offset: 19194}, + pos: position{line: 618, col: 26, offset: 19197}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 618, col: 26, offset: 19194}, + pos: position{line: 618, col: 26, offset: 19197}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 618, col: 32, offset: 19200}, + pos: position{line: 618, col: 32, offset: 19203}, name: "ApplicationExpression", }, }, &labeledExpr{ - pos: position{line: 618, col: 55, offset: 19223}, + pos: position{line: 618, col: 55, offset: 19226}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 618, col: 60, offset: 19228}, + pos: position{line: 618, col: 60, offset: 19231}, expr: &seqExpr{ - pos: position{line: 618, col: 61, offset: 19229}, + pos: position{line: 618, col: 61, offset: 19232}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 618, col: 61, offset: 19229}, + pos: position{line: 618, col: 61, offset: 19232}, name: "_", }, &litMatcher{ - pos: position{line: 618, col: 63, offset: 19231}, + pos: position{line: 618, col: 63, offset: 19234}, val: "!=", ignoreCase: false, want: "\"!=\"", }, &ruleRefExpr{ - pos: position{line: 618, col: 68, offset: 19236}, + pos: position{line: 618, col: 68, offset: 19239}, name: "_", }, &labeledExpr{ - pos: position{line: 618, col: 70, offset: 19238}, + pos: position{line: 618, col: 70, offset: 19241}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 618, col: 72, offset: 19240}, + pos: position{line: 618, col: 72, offset: 19243}, name: "ApplicationExpression", }, }, @@ -12334,35 +12334,35 @@ var g = &grammar{ }, { name: "ApplicationExpression", - pos: position{line: 621, col: 1, offset: 19314}, + pos: position{line: 621, col: 1, offset: 19317}, expr: &actionExpr{ - pos: position{line: 621, col: 25, offset: 19340}, + pos: position{line: 621, col: 25, offset: 19343}, run: (*parser).callonApplicationExpression1, expr: &seqExpr{ - pos: position{line: 621, col: 25, offset: 19340}, + pos: position{line: 621, col: 25, offset: 19343}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 621, col: 25, offset: 19340}, + pos: position{line: 621, col: 25, offset: 19343}, label: "f", expr: &ruleRefExpr{ - pos: position{line: 621, col: 27, offset: 19342}, + pos: position{line: 621, col: 27, offset: 19345}, name: "FirstApplicationExpression", }, }, &labeledExpr{ - pos: position{line: 621, col: 55, offset: 19370}, + pos: position{line: 621, col: 55, offset: 19373}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 621, col: 60, offset: 19375}, + pos: position{line: 621, col: 60, offset: 19378}, expr: &seqExpr{ - pos: position{line: 621, col: 61, offset: 19376}, + pos: position{line: 621, col: 61, offset: 19379}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 621, col: 61, offset: 19376}, + pos: position{line: 621, col: 61, offset: 19379}, name: "_1", }, &ruleRefExpr{ - pos: position{line: 621, col: 64, offset: 19379}, + pos: position{line: 621, col: 64, offset: 19382}, name: "ImportExpression", }, }, @@ -12375,43 +12375,43 @@ var g = &grammar{ }, { name: "FirstApplicationExpression", - pos: position{line: 630, col: 1, offset: 19622}, + pos: position{line: 630, col: 1, offset: 19625}, expr: &choiceExpr{ - pos: position{line: 631, col: 8, offset: 19660}, + pos: position{line: 631, col: 8, offset: 19663}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 631, col: 8, offset: 19660}, + pos: position{line: 631, col: 8, offset: 19663}, run: (*parser).callonFirstApplicationExpression2, expr: &seqExpr{ - pos: position{line: 631, col: 8, offset: 19660}, + pos: position{line: 631, col: 8, offset: 19663}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &ruleRefExpr{ - pos: position{line: 631, col: 14, offset: 19666}, + pos: position{line: 631, col: 14, offset: 19669}, name: "_1", }, &labeledExpr{ - pos: position{line: 631, col: 17, offset: 19669}, + pos: position{line: 631, col: 17, offset: 19672}, label: "h", expr: &ruleRefExpr{ - pos: position{line: 631, col: 19, offset: 19671}, + pos: position{line: 631, col: 19, offset: 19674}, name: "ImportExpression", }, }, &ruleRefExpr{ - pos: position{line: 631, col: 36, offset: 19688}, + pos: position{line: 631, col: 36, offset: 19691}, name: "_1", }, &labeledExpr{ - pos: position{line: 631, col: 39, offset: 19691}, + pos: position{line: 631, col: 39, offset: 19694}, label: "u", expr: &ruleRefExpr{ - pos: position{line: 631, col: 41, offset: 19693}, + pos: position{line: 631, col: 41, offset: 19696}, name: "ImportExpression", }, }, @@ -12419,26 +12419,26 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 634, col: 8, offset: 19796}, + pos: position{line: 634, col: 8, offset: 19799}, run: (*parser).callonFirstApplicationExpression11, expr: &seqExpr{ - pos: position{line: 634, col: 8, offset: 19796}, + pos: position{line: 634, col: 8, offset: 19799}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &ruleRefExpr{ - pos: position{line: 634, col: 13, offset: 19801}, + pos: position{line: 634, col: 13, offset: 19804}, name: "_1", }, &labeledExpr{ - pos: position{line: 634, col: 16, offset: 19804}, + pos: position{line: 634, col: 16, offset: 19807}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 634, col: 18, offset: 19806}, + pos: position{line: 634, col: 18, offset: 19809}, name: "ImportExpression", }, }, @@ -12446,26 +12446,26 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 635, col: 8, offset: 19861}, + pos: position{line: 635, col: 8, offset: 19864}, run: (*parser).callonFirstApplicationExpression17, expr: &seqExpr{ - pos: position{line: 635, col: 8, offset: 19861}, + pos: position{line: 635, col: 8, offset: 19864}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &ruleRefExpr{ - pos: position{line: 635, col: 14, offset: 19867}, + pos: position{line: 635, col: 14, offset: 19870}, name: "_1", }, &labeledExpr{ - pos: position{line: 635, col: 17, offset: 19870}, + pos: position{line: 635, col: 17, offset: 19873}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 635, col: 19, offset: 19872}, + pos: position{line: 635, col: 19, offset: 19875}, name: "ImportExpression", }, }, @@ -12473,7 +12473,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 636, col: 8, offset: 19936}, + pos: position{line: 636, col: 8, offset: 19939}, name: "ImportExpression", }, }, @@ -12481,16 +12481,16 @@ var g = &grammar{ }, { name: "ImportExpression", - pos: position{line: 638, col: 1, offset: 19954}, + pos: position{line: 638, col: 1, offset: 19957}, expr: &choiceExpr{ - pos: position{line: 638, col: 20, offset: 19975}, + pos: position{line: 638, col: 20, offset: 19978}, alternatives: []interface{}{ &ruleRefExpr{ - pos: position{line: 638, col: 20, offset: 19975}, + pos: position{line: 638, col: 20, offset: 19978}, name: "Import", }, &ruleRefExpr{ - pos: position{line: 638, col: 29, offset: 19984}, + pos: position{line: 638, col: 29, offset: 19987}, name: "CompletionExpression", }, }, @@ -12498,45 +12498,45 @@ var g = &grammar{ }, { name: "CompletionExpression", - pos: position{line: 640, col: 1, offset: 20006}, + pos: position{line: 640, col: 1, offset: 20009}, expr: &actionExpr{ - pos: position{line: 640, col: 24, offset: 20031}, + pos: position{line: 640, col: 24, offset: 20034}, run: (*parser).callonCompletionExpression1, expr: &seqExpr{ - pos: position{line: 640, col: 24, offset: 20031}, + pos: position{line: 640, col: 24, offset: 20034}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 640, col: 24, offset: 20031}, + pos: position{line: 640, col: 24, offset: 20034}, label: "a", expr: &ruleRefExpr{ - pos: position{line: 640, col: 26, offset: 20033}, + pos: position{line: 640, col: 26, offset: 20036}, name: "SelectorExpression", }, }, &labeledExpr{ - pos: position{line: 640, col: 45, offset: 20052}, + pos: position{line: 640, col: 45, offset: 20055}, label: "b", expr: &zeroOrOneExpr{ - pos: position{line: 640, col: 47, offset: 20054}, + pos: position{line: 640, col: 47, offset: 20057}, expr: &seqExpr{ - pos: position{line: 640, col: 48, offset: 20055}, + pos: position{line: 640, col: 48, offset: 20058}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 640, col: 48, offset: 20055}, + pos: position{line: 640, col: 48, offset: 20058}, name: "_", }, &litMatcher{ - pos: position{line: 320, col: 12, offset: 8555}, + pos: position{line: 320, col: 12, offset: 8558}, val: "::", ignoreCase: false, want: "\"::\"", }, &ruleRefExpr{ - pos: position{line: 640, col: 59, offset: 20066}, + pos: position{line: 640, col: 59, offset: 20069}, name: "_", }, &ruleRefExpr{ - pos: position{line: 640, col: 61, offset: 20068}, + pos: position{line: 640, col: 61, offset: 20071}, name: "SelectorExpression", }, }, @@ -12549,45 +12549,45 @@ var g = &grammar{ }, { name: "SelectorExpression", - pos: position{line: 647, col: 1, offset: 20219}, + pos: position{line: 647, col: 1, offset: 20222}, expr: &actionExpr{ - pos: position{line: 647, col: 22, offset: 20242}, + pos: position{line: 647, col: 22, offset: 20245}, run: (*parser).callonSelectorExpression1, expr: &seqExpr{ - pos: position{line: 647, col: 22, offset: 20242}, + pos: position{line: 647, col: 22, offset: 20245}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 647, col: 22, offset: 20242}, + pos: position{line: 647, col: 22, offset: 20245}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 647, col: 24, offset: 20244}, + pos: position{line: 647, col: 24, offset: 20247}, name: "PrimitiveExpression", }, }, &labeledExpr{ - pos: position{line: 647, col: 44, offset: 20264}, + pos: position{line: 647, col: 44, offset: 20267}, label: "ls", expr: &zeroOrMoreExpr{ - pos: position{line: 647, col: 47, offset: 20267}, + pos: position{line: 647, col: 47, offset: 20270}, expr: &seqExpr{ - pos: position{line: 647, col: 48, offset: 20268}, + pos: position{line: 647, col: 48, offset: 20271}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 647, col: 48, offset: 20268}, + pos: position{line: 647, col: 48, offset: 20271}, name: "_", }, &litMatcher{ - pos: position{line: 647, col: 50, offset: 20270}, + pos: position{line: 647, col: 50, offset: 20273}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 647, col: 54, offset: 20274}, + pos: position{line: 647, col: 54, offset: 20277}, name: "_", }, &ruleRefExpr{ - pos: position{line: 647, col: 56, offset: 20276}, + pos: position{line: 647, col: 56, offset: 20279}, name: "Selector", }, }, @@ -12600,32 +12600,32 @@ var g = &grammar{ }, { name: "Selector", - pos: position{line: 666, col: 1, offset: 20829}, + pos: position{line: 666, col: 1, offset: 20832}, expr: &choiceExpr{ - pos: position{line: 666, col: 12, offset: 20842}, + pos: position{line: 666, col: 12, offset: 20845}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, run: (*parser).callonSelector2, expr: &seqExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, val: "`", ignoreCase: false, want: "\"`\"", }, &labeledExpr{ - pos: position{line: 146, col: 13, offset: 3519}, + pos: position{line: 146, col: 13, offset: 3522}, label: "label", expr: &actionExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, run: (*parser).callonSelector6, expr: &oneOrMoreExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, expr: &charClassMatcher{ - pos: position{line: 143, col: 19, offset: 3419}, + pos: position{line: 143, col: 19, offset: 3422}, val: "[ -_a-~]", ranges: []rune{' ', '_', 'a', '~'}, ignoreCase: false, @@ -12635,7 +12635,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 146, col: 31, offset: 3537}, + pos: position{line: 146, col: 31, offset: 3540}, val: "`", ignoreCase: false, want: "\"`\"", @@ -12644,75 +12644,75 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, run: (*parser).callonSelector10, expr: &labeledExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, label: "label", expr: &choiceExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, run: (*parser).callonSelector13, expr: &seqExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonSelector22, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -12724,61 +12724,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -12786,9 +12786,9 @@ var g = &grammar{ }, }, &oneOrMoreExpr{ - pos: position{line: 137, col: 23, offset: 3220}, + pos: position{line: 137, col: 23, offset: 3223}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -12800,68 +12800,68 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, run: (*parser).callonSelector39, expr: &seqExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, exprs: []interface{}{ ¬Expr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, expr: &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonSelector49, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -12873,61 +12873,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -12936,7 +12936,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 135, col: 24, offset: 3147}, + pos: position{line: 135, col: 24, offset: 3150}, val: "[_A-Za-z]", chars: []rune{'_'}, ranges: []rune{'A', 'Z', 'a', 'z'}, @@ -12944,9 +12944,9 @@ var g = &grammar{ inverted: false, }, &zeroOrMoreExpr{ - pos: position{line: 138, col: 43, offset: 3314}, + pos: position{line: 138, col: 43, offset: 3317}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -12962,11 +12962,11 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 666, col: 23, offset: 20853}, + pos: position{line: 666, col: 23, offset: 20856}, name: "Labels", }, &ruleRefExpr{ - pos: position{line: 666, col: 32, offset: 20862}, + pos: position{line: 666, col: 32, offset: 20865}, name: "TypeSelector", }, }, @@ -12974,56 +12974,56 @@ var g = &grammar{ }, { name: "Labels", - pos: position{line: 668, col: 1, offset: 20876}, + pos: position{line: 668, col: 1, offset: 20879}, expr: &actionExpr{ - pos: position{line: 668, col: 10, offset: 20887}, + pos: position{line: 668, col: 10, offset: 20890}, run: (*parser).callonLabels1, expr: &seqExpr{ - pos: position{line: 668, col: 10, offset: 20887}, + pos: position{line: 668, col: 10, offset: 20890}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 668, col: 10, offset: 20887}, + pos: position{line: 668, col: 10, offset: 20890}, val: "{", ignoreCase: false, want: "\"{\"", }, &ruleRefExpr{ - pos: position{line: 668, col: 14, offset: 20891}, + pos: position{line: 668, col: 14, offset: 20894}, name: "_", }, &labeledExpr{ - pos: position{line: 668, col: 16, offset: 20893}, + pos: position{line: 668, col: 16, offset: 20896}, label: "optclauses", expr: &zeroOrOneExpr{ - pos: position{line: 668, col: 27, offset: 20904}, + pos: position{line: 668, col: 27, offset: 20907}, expr: &seqExpr{ - pos: position{line: 668, col: 29, offset: 20906}, + pos: position{line: 668, col: 29, offset: 20909}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 154, col: 18, offset: 3799}, + pos: position{line: 154, col: 18, offset: 3802}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, run: (*parser).callonLabels9, expr: &seqExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, val: "`", ignoreCase: false, want: "\"`\"", }, &labeledExpr{ - pos: position{line: 146, col: 13, offset: 3519}, + pos: position{line: 146, col: 13, offset: 3522}, label: "label", expr: &actionExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, run: (*parser).callonLabels13, expr: &oneOrMoreExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, expr: &charClassMatcher{ - pos: position{line: 143, col: 19, offset: 3419}, + pos: position{line: 143, col: 19, offset: 3422}, val: "[ -_a-~]", ranges: []rune{' ', '_', 'a', '~'}, ignoreCase: false, @@ -13033,7 +13033,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 146, col: 31, offset: 3537}, + pos: position{line: 146, col: 31, offset: 3540}, val: "`", ignoreCase: false, want: "\"`\"", @@ -13042,75 +13042,75 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, run: (*parser).callonLabels17, expr: &labeledExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, label: "label", expr: &choiceExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, run: (*parser).callonLabels20, expr: &seqExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonLabels29, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -13122,61 +13122,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -13184,9 +13184,9 @@ var g = &grammar{ }, }, &oneOrMoreExpr{ - pos: position{line: 137, col: 23, offset: 3220}, + pos: position{line: 137, col: 23, offset: 3223}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -13198,68 +13198,68 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, run: (*parser).callonLabels46, expr: &seqExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, exprs: []interface{}{ ¬Expr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, expr: &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonLabels56, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -13271,61 +13271,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -13334,7 +13334,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 135, col: 24, offset: 3147}, + pos: position{line: 135, col: 24, offset: 3150}, val: "[_A-Za-z]", chars: []rune{'_'}, ranges: []rune{'A', 'Z', 'a', 'z'}, @@ -13342,9 +13342,9 @@ var g = &grammar{ inverted: false, }, &zeroOrMoreExpr{ - pos: position{line: 138, col: 43, offset: 3314}, + pos: position{line: 138, col: 43, offset: 3317}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -13360,10 +13360,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 154, col: 29, offset: 3810}, + pos: position{line: 154, col: 29, offset: 3813}, run: (*parser).callonLabels74, expr: &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", @@ -13372,49 +13372,49 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 668, col: 44, offset: 20921}, + pos: position{line: 668, col: 44, offset: 20924}, name: "_", }, &zeroOrMoreExpr{ - pos: position{line: 668, col: 46, offset: 20923}, + pos: position{line: 668, col: 46, offset: 20926}, expr: &seqExpr{ - pos: position{line: 668, col: 47, offset: 20924}, + pos: position{line: 668, col: 47, offset: 20927}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 668, col: 47, offset: 20924}, + pos: position{line: 668, col: 47, offset: 20927}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 668, col: 51, offset: 20928}, + pos: position{line: 668, col: 51, offset: 20931}, name: "_", }, &choiceExpr{ - pos: position{line: 154, col: 18, offset: 3799}, + pos: position{line: 154, col: 18, offset: 3802}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, run: (*parser).callonLabels82, expr: &seqExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, val: "`", ignoreCase: false, want: "\"`\"", }, &labeledExpr{ - pos: position{line: 146, col: 13, offset: 3519}, + pos: position{line: 146, col: 13, offset: 3522}, label: "label", expr: &actionExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, run: (*parser).callonLabels86, expr: &oneOrMoreExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, expr: &charClassMatcher{ - pos: position{line: 143, col: 19, offset: 3419}, + pos: position{line: 143, col: 19, offset: 3422}, val: "[ -_a-~]", ranges: []rune{' ', '_', 'a', '~'}, ignoreCase: false, @@ -13424,7 +13424,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 146, col: 31, offset: 3537}, + pos: position{line: 146, col: 31, offset: 3540}, val: "`", ignoreCase: false, want: "\"`\"", @@ -13433,75 +13433,75 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, run: (*parser).callonLabels90, expr: &labeledExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, label: "label", expr: &choiceExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, run: (*parser).callonLabels93, expr: &seqExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonLabels102, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -13513,61 +13513,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -13575,9 +13575,9 @@ var g = &grammar{ }, }, &oneOrMoreExpr{ - pos: position{line: 137, col: 23, offset: 3220}, + pos: position{line: 137, col: 23, offset: 3223}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -13589,68 +13589,68 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, run: (*parser).callonLabels119, expr: &seqExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, exprs: []interface{}{ ¬Expr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, expr: &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonLabels129, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -13662,61 +13662,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -13725,7 +13725,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 135, col: 24, offset: 3147}, + pos: position{line: 135, col: 24, offset: 3150}, val: "[_A-Za-z]", chars: []rune{'_'}, ranges: []rune{'A', 'Z', 'a', 'z'}, @@ -13733,9 +13733,9 @@ var g = &grammar{ inverted: false, }, &zeroOrMoreExpr{ - pos: position{line: 138, col: 43, offset: 3314}, + pos: position{line: 138, col: 43, offset: 3317}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -13751,10 +13751,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 154, col: 29, offset: 3810}, + pos: position{line: 154, col: 29, offset: 3813}, run: (*parser).callonLabels147, expr: &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", @@ -13763,7 +13763,7 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 668, col: 68, offset: 20945}, + pos: position{line: 668, col: 68, offset: 20948}, name: "_", }, }, @@ -13774,7 +13774,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 668, col: 76, offset: 20953}, + pos: position{line: 668, col: 76, offset: 20956}, val: "}", ignoreCase: false, want: "\"}\"", @@ -13785,37 +13785,37 @@ var g = &grammar{ }, { name: "TypeSelector", - pos: position{line: 678, col: 1, offset: 21249}, + pos: position{line: 678, col: 1, offset: 21252}, expr: &actionExpr{ - pos: position{line: 678, col: 16, offset: 21266}, + pos: position{line: 678, col: 16, offset: 21269}, run: (*parser).callonTypeSelector1, expr: &seqExpr{ - pos: position{line: 678, col: 16, offset: 21266}, + pos: position{line: 678, col: 16, offset: 21269}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 678, col: 16, offset: 21266}, + pos: position{line: 678, col: 16, offset: 21269}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 678, col: 20, offset: 21270}, + pos: position{line: 678, col: 20, offset: 21273}, name: "_", }, &labeledExpr{ - pos: position{line: 678, col: 22, offset: 21272}, + pos: position{line: 678, col: 22, offset: 21275}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 678, col: 24, offset: 21274}, + pos: position{line: 678, col: 24, offset: 21277}, name: "Expression", }, }, &ruleRefExpr{ - pos: position{line: 678, col: 35, offset: 21285}, + pos: position{line: 678, col: 35, offset: 21288}, name: "_", }, &litMatcher{ - pos: position{line: 678, col: 37, offset: 21287}, + pos: position{line: 678, col: 37, offset: 21290}, val: ")", ignoreCase: false, want: "\")\"", @@ -13826,23 +13826,23 @@ var g = &grammar{ }, { name: "PrimitiveExpression", - pos: position{line: 680, col: 1, offset: 21310}, + pos: position{line: 680, col: 1, offset: 21313}, expr: &choiceExpr{ - pos: position{line: 681, col: 7, offset: 21340}, + pos: position{line: 681, col: 7, offset: 21343}, alternatives: []interface{}{ &labeledExpr{ - pos: position{line: 332, col: 17, offset: 8830}, + pos: position{line: 332, col: 17, offset: 8833}, label: "d", expr: &actionExpr{ - pos: position{line: 324, col: 24, offset: 8618}, + pos: position{line: 324, col: 24, offset: 8621}, run: (*parser).callonPrimitiveExpression3, expr: &seqExpr{ - pos: position{line: 324, col: 24, offset: 8618}, + pos: position{line: 324, col: 24, offset: 8621}, exprs: []interface{}{ &zeroOrOneExpr{ - pos: position{line: 324, col: 24, offset: 8618}, + pos: position{line: 324, col: 24, offset: 8621}, expr: &charClassMatcher{ - pos: position{line: 324, col: 24, offset: 8618}, + pos: position{line: 324, col: 24, offset: 8621}, val: "[+-]", chars: []rune{'+', '-'}, ignoreCase: false, @@ -13850,9 +13850,9 @@ var g = &grammar{ }, }, &oneOrMoreExpr{ - pos: position{line: 324, col: 30, offset: 8624}, + pos: position{line: 324, col: 30, offset: 8627}, expr: &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -13860,21 +13860,21 @@ var g = &grammar{ }, }, &choiceExpr{ - pos: position{line: 324, col: 39, offset: 8633}, + pos: position{line: 324, col: 39, offset: 8636}, alternatives: []interface{}{ &seqExpr{ - pos: position{line: 324, col: 39, offset: 8633}, + pos: position{line: 324, col: 39, offset: 8636}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 324, col: 39, offset: 8633}, + pos: position{line: 324, col: 39, offset: 8636}, val: ".", ignoreCase: false, want: "\".\"", }, &oneOrMoreExpr{ - pos: position{line: 324, col: 43, offset: 8637}, + pos: position{line: 324, col: 43, offset: 8640}, expr: &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -13882,20 +13882,20 @@ var g = &grammar{ }, }, &zeroOrOneExpr{ - pos: position{line: 324, col: 50, offset: 8644}, + pos: position{line: 324, col: 50, offset: 8647}, expr: &seqExpr{ - pos: position{line: 322, col: 12, offset: 8574}, + pos: position{line: 322, col: 12, offset: 8577}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 322, col: 12, offset: 8574}, + pos: position{line: 322, col: 12, offset: 8577}, val: "e", ignoreCase: true, want: "\"e\"i", }, &zeroOrOneExpr{ - pos: position{line: 322, col: 17, offset: 8579}, + pos: position{line: 322, col: 17, offset: 8582}, expr: &charClassMatcher{ - pos: position{line: 322, col: 17, offset: 8579}, + pos: position{line: 322, col: 17, offset: 8582}, val: "[+-]", chars: []rune{'+', '-'}, ignoreCase: false, @@ -13903,9 +13903,9 @@ var g = &grammar{ }, }, &oneOrMoreExpr{ - pos: position{line: 322, col: 23, offset: 8585}, + pos: position{line: 322, col: 23, offset: 8588}, expr: &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -13918,18 +13918,18 @@ var g = &grammar{ }, }, &seqExpr{ - pos: position{line: 322, col: 12, offset: 8574}, + pos: position{line: 322, col: 12, offset: 8577}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 322, col: 12, offset: 8574}, + pos: position{line: 322, col: 12, offset: 8577}, val: "e", ignoreCase: true, want: "\"e\"i", }, &zeroOrOneExpr{ - pos: position{line: 322, col: 17, offset: 8579}, + pos: position{line: 322, col: 17, offset: 8582}, expr: &charClassMatcher{ - pos: position{line: 322, col: 17, offset: 8579}, + pos: position{line: 322, col: 17, offset: 8582}, val: "[+-]", chars: []rune{'+', '-'}, ignoreCase: false, @@ -13937,9 +13937,9 @@ var g = &grammar{ }, }, &oneOrMoreExpr{ - pos: position{line: 322, col: 23, offset: 8585}, + pos: position{line: 322, col: 23, offset: 8588}, expr: &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -13955,64 +13955,64 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 333, col: 5, offset: 8857}, + pos: position{line: 333, col: 5, offset: 8860}, run: (*parser).callonPrimitiveExpression27, expr: &litMatcher{ - pos: position{line: 333, col: 5, offset: 8857}, + pos: position{line: 333, col: 5, offset: 8860}, val: "-Infinity", ignoreCase: false, want: "\"-Infinity\"", }, }, &actionExpr{ - pos: position{line: 334, col: 5, offset: 8914}, + pos: position{line: 334, col: 5, offset: 8917}, run: (*parser).callonPrimitiveExpression29, expr: &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, }, &actionExpr{ - pos: position{line: 335, col: 5, offset: 8966}, + pos: position{line: 335, col: 5, offset: 8969}, run: (*parser).callonPrimitiveExpression31, expr: &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, }, &actionExpr{ - pos: position{line: 339, col: 3, offset: 9067}, + pos: position{line: 339, col: 3, offset: 9070}, run: (*parser).callonPrimitiveExpression33, expr: &choiceExpr{ - pos: position{line: 339, col: 4, offset: 9068}, + pos: position{line: 339, col: 4, offset: 9071}, alternatives: []interface{}{ &seqExpr{ - pos: position{line: 339, col: 4, offset: 9068}, + pos: position{line: 339, col: 4, offset: 9071}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 339, col: 4, offset: 9068}, + pos: position{line: 339, col: 4, offset: 9071}, val: "0x", ignoreCase: false, want: "\"0x\"", }, &oneOrMoreExpr{ - pos: position{line: 339, col: 9, offset: 9073}, + pos: position{line: 339, col: 9, offset: 9076}, expr: &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -14024,19 +14024,19 @@ var g = &grammar{ }, }, &seqExpr{ - pos: position{line: 339, col: 19, offset: 9083}, + pos: position{line: 339, col: 19, offset: 9086}, exprs: []interface{}{ &charClassMatcher{ - pos: position{line: 339, col: 19, offset: 9083}, + pos: position{line: 339, col: 19, offset: 9086}, val: "[1-9]", ranges: []rune{'1', '9'}, ignoreCase: false, inverted: false, }, &zeroOrMoreExpr{ - pos: position{line: 339, col: 25, offset: 9089}, + pos: position{line: 339, col: 25, offset: 9092}, expr: &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -14049,21 +14049,21 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 344, col: 5, offset: 9225}, + pos: position{line: 344, col: 5, offset: 9228}, run: (*parser).callonPrimitiveExpression45, expr: &seqExpr{ - pos: position{line: 344, col: 5, offset: 9225}, + pos: position{line: 344, col: 5, offset: 9228}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 344, col: 5, offset: 9225}, + pos: position{line: 344, col: 5, offset: 9228}, val: "0", ignoreCase: false, want: "\"0\"", }, &oneOrMoreExpr{ - pos: position{line: 344, col: 9, offset: 9229}, + pos: position{line: 344, col: 9, offset: 9232}, expr: &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -14074,62 +14074,62 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 345, col: 5, offset: 9314}, + pos: position{line: 345, col: 5, offset: 9317}, run: (*parser).callonPrimitiveExpression50, expr: &litMatcher{ - pos: position{line: 345, col: 5, offset: 9314}, + pos: position{line: 345, col: 5, offset: 9317}, val: "0", ignoreCase: false, want: "\"0\"", }, }, &actionExpr{ - pos: position{line: 348, col: 5, offset: 9372}, + pos: position{line: 348, col: 5, offset: 9375}, run: (*parser).callonPrimitiveExpression52, expr: &seqExpr{ - pos: position{line: 348, col: 5, offset: 9372}, + pos: position{line: 348, col: 5, offset: 9375}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 348, col: 5, offset: 9372}, + pos: position{line: 348, col: 5, offset: 9375}, val: "+", ignoreCase: false, want: "\"+\"", }, &labeledExpr{ - pos: position{line: 348, col: 9, offset: 9376}, + pos: position{line: 348, col: 9, offset: 9379}, label: "n", expr: &choiceExpr{ - pos: position{line: 339, col: 3, offset: 9067}, + pos: position{line: 339, col: 3, offset: 9070}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 339, col: 3, offset: 9067}, + pos: position{line: 339, col: 3, offset: 9070}, run: (*parser).callonPrimitiveExpression57, expr: &choiceExpr{ - pos: position{line: 339, col: 4, offset: 9068}, + pos: position{line: 339, col: 4, offset: 9071}, alternatives: []interface{}{ &seqExpr{ - pos: position{line: 339, col: 4, offset: 9068}, + pos: position{line: 339, col: 4, offset: 9071}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 339, col: 4, offset: 9068}, + pos: position{line: 339, col: 4, offset: 9071}, val: "0x", ignoreCase: false, want: "\"0x\"", }, &oneOrMoreExpr{ - pos: position{line: 339, col: 9, offset: 9073}, + pos: position{line: 339, col: 9, offset: 9076}, expr: &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -14141,19 +14141,19 @@ var g = &grammar{ }, }, &seqExpr{ - pos: position{line: 339, col: 19, offset: 9083}, + pos: position{line: 339, col: 19, offset: 9086}, exprs: []interface{}{ &charClassMatcher{ - pos: position{line: 339, col: 19, offset: 9083}, + pos: position{line: 339, col: 19, offset: 9086}, val: "[1-9]", ranges: []rune{'1', '9'}, ignoreCase: false, inverted: false, }, &zeroOrMoreExpr{ - pos: position{line: 339, col: 25, offset: 9089}, + pos: position{line: 339, col: 25, offset: 9092}, expr: &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -14166,21 +14166,21 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 344, col: 5, offset: 9225}, + pos: position{line: 344, col: 5, offset: 9228}, run: (*parser).callonPrimitiveExpression69, expr: &seqExpr{ - pos: position{line: 344, col: 5, offset: 9225}, + pos: position{line: 344, col: 5, offset: 9228}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 344, col: 5, offset: 9225}, + pos: position{line: 344, col: 5, offset: 9228}, val: "0", ignoreCase: false, want: "\"0\"", }, &oneOrMoreExpr{ - pos: position{line: 344, col: 9, offset: 9229}, + pos: position{line: 344, col: 9, offset: 9232}, expr: &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -14191,10 +14191,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 345, col: 5, offset: 9314}, + pos: position{line: 345, col: 5, offset: 9317}, run: (*parser).callonPrimitiveExpression74, expr: &litMatcher{ - pos: position{line: 345, col: 5, offset: 9314}, + pos: position{line: 345, col: 5, offset: 9317}, val: "0", ignoreCase: false, want: "\"0\"", @@ -14207,52 +14207,52 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 349, col: 5, offset: 9440}, + pos: position{line: 349, col: 5, offset: 9443}, run: (*parser).callonPrimitiveExpression76, expr: &seqExpr{ - pos: position{line: 349, col: 5, offset: 9440}, + pos: position{line: 349, col: 5, offset: 9443}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 349, col: 5, offset: 9440}, + pos: position{line: 349, col: 5, offset: 9443}, val: "-", ignoreCase: false, want: "\"-\"", }, &labeledExpr{ - pos: position{line: 349, col: 9, offset: 9444}, + pos: position{line: 349, col: 9, offset: 9447}, label: "n", expr: &choiceExpr{ - pos: position{line: 339, col: 3, offset: 9067}, + pos: position{line: 339, col: 3, offset: 9070}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 339, col: 3, offset: 9067}, + pos: position{line: 339, col: 3, offset: 9070}, run: (*parser).callonPrimitiveExpression81, expr: &choiceExpr{ - pos: position{line: 339, col: 4, offset: 9068}, + pos: position{line: 339, col: 4, offset: 9071}, alternatives: []interface{}{ &seqExpr{ - pos: position{line: 339, col: 4, offset: 9068}, + pos: position{line: 339, col: 4, offset: 9071}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 339, col: 4, offset: 9068}, + pos: position{line: 339, col: 4, offset: 9071}, val: "0x", ignoreCase: false, want: "\"0x\"", }, &oneOrMoreExpr{ - pos: position{line: 339, col: 9, offset: 9073}, + pos: position{line: 339, col: 9, offset: 9076}, expr: &choiceExpr{ - pos: position{line: 133, col: 10, offset: 3106}, + pos: position{line: 133, col: 10, offset: 3109}, alternatives: []interface{}{ &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, inverted: false, }, &charClassMatcher{ - pos: position{line: 133, col: 18, offset: 3114}, + pos: position{line: 133, col: 18, offset: 3117}, val: "[a-f]i", ranges: []rune{'a', 'f'}, ignoreCase: true, @@ -14264,19 +14264,19 @@ var g = &grammar{ }, }, &seqExpr{ - pos: position{line: 339, col: 19, offset: 9083}, + pos: position{line: 339, col: 19, offset: 9086}, exprs: []interface{}{ &charClassMatcher{ - pos: position{line: 339, col: 19, offset: 9083}, + pos: position{line: 339, col: 19, offset: 9086}, val: "[1-9]", ranges: []rune{'1', '9'}, ignoreCase: false, inverted: false, }, &zeroOrMoreExpr{ - pos: position{line: 339, col: 25, offset: 9089}, + pos: position{line: 339, col: 25, offset: 9092}, expr: &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -14289,21 +14289,21 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 344, col: 5, offset: 9225}, + pos: position{line: 344, col: 5, offset: 9228}, run: (*parser).callonPrimitiveExpression93, expr: &seqExpr{ - pos: position{line: 344, col: 5, offset: 9225}, + pos: position{line: 344, col: 5, offset: 9228}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 344, col: 5, offset: 9225}, + pos: position{line: 344, col: 5, offset: 9228}, val: "0", ignoreCase: false, want: "\"0\"", }, &oneOrMoreExpr{ - pos: position{line: 344, col: 9, offset: 9229}, + pos: position{line: 344, col: 9, offset: 9232}, expr: &charClassMatcher{ - pos: position{line: 131, col: 9, offset: 3088}, + pos: position{line: 131, col: 9, offset: 3091}, val: "[0-9]", ranges: []rune{'0', '9'}, ignoreCase: false, @@ -14314,10 +14314,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 345, col: 5, offset: 9314}, + pos: position{line: 345, col: 5, offset: 9317}, run: (*parser).callonPrimitiveExpression98, expr: &litMatcher{ - pos: position{line: 345, col: 5, offset: 9314}, + pos: position{line: 345, col: 5, offset: 9317}, val: "0", ignoreCase: false, want: "\"0\"", @@ -14330,57 +14330,57 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 684, col: 7, offset: 21402}, + pos: position{line: 684, col: 7, offset: 21405}, name: "TextLiteral", }, &actionExpr{ - pos: position{line: 685, col: 7, offset: 21420}, + pos: position{line: 685, col: 7, offset: 21423}, run: (*parser).callonPrimitiveExpression101, expr: &seqExpr{ - pos: position{line: 685, col: 7, offset: 21420}, + pos: position{line: 685, col: 7, offset: 21423}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 685, col: 7, offset: 21420}, + pos: position{line: 685, col: 7, offset: 21423}, val: "{", ignoreCase: false, want: "\"{\"", }, &ruleRefExpr{ - pos: position{line: 685, col: 11, offset: 21424}, + pos: position{line: 685, col: 11, offset: 21427}, name: "_", }, &zeroOrOneExpr{ - pos: position{line: 685, col: 13, offset: 21426}, + pos: position{line: 685, col: 13, offset: 21429}, expr: &seqExpr{ - pos: position{line: 685, col: 14, offset: 21427}, + pos: position{line: 685, col: 14, offset: 21430}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 685, col: 14, offset: 21427}, + pos: position{line: 685, col: 14, offset: 21430}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 685, col: 18, offset: 21431}, + pos: position{line: 685, col: 18, offset: 21434}, name: "_", }, }, }, }, &labeledExpr{ - pos: position{line: 685, col: 22, offset: 21435}, + pos: position{line: 685, col: 22, offset: 21438}, label: "r", expr: &ruleRefExpr{ - pos: position{line: 685, col: 24, offset: 21437}, + pos: position{line: 685, col: 24, offset: 21440}, name: "RecordTypeOrLiteral", }, }, &ruleRefExpr{ - pos: position{line: 685, col: 44, offset: 21457}, + pos: position{line: 685, col: 44, offset: 21460}, name: "_", }, &litMatcher{ - pos: position{line: 685, col: 46, offset: 21459}, + pos: position{line: 685, col: 46, offset: 21462}, val: "}", ignoreCase: false, want: "\"}\"", @@ -14389,53 +14389,53 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 686, col: 7, offset: 21487}, + pos: position{line: 686, col: 7, offset: 21490}, run: (*parser).callonPrimitiveExpression113, expr: &seqExpr{ - pos: position{line: 686, col: 7, offset: 21487}, + pos: position{line: 686, col: 7, offset: 21490}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 686, col: 7, offset: 21487}, + pos: position{line: 686, col: 7, offset: 21490}, val: "<", ignoreCase: false, want: "\"<\"", }, &ruleRefExpr{ - pos: position{line: 686, col: 11, offset: 21491}, + pos: position{line: 686, col: 11, offset: 21494}, name: "_", }, &zeroOrOneExpr{ - pos: position{line: 686, col: 13, offset: 21493}, + pos: position{line: 686, col: 13, offset: 21496}, expr: &seqExpr{ - pos: position{line: 686, col: 14, offset: 21494}, + pos: position{line: 686, col: 14, offset: 21497}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 686, col: 14, offset: 21494}, + pos: position{line: 686, col: 14, offset: 21497}, val: "|", ignoreCase: false, want: "\"|\"", }, &ruleRefExpr{ - pos: position{line: 686, col: 18, offset: 21498}, + pos: position{line: 686, col: 18, offset: 21501}, name: "_", }, }, }, }, &labeledExpr{ - pos: position{line: 686, col: 22, offset: 21502}, + pos: position{line: 686, col: 22, offset: 21505}, label: "u", expr: &ruleRefExpr{ - pos: position{line: 686, col: 24, offset: 21504}, + pos: position{line: 686, col: 24, offset: 21507}, name: "UnionType", }, }, &ruleRefExpr{ - pos: position{line: 686, col: 34, offset: 21514}, + pos: position{line: 686, col: 34, offset: 21517}, name: "_", }, &litMatcher{ - pos: position{line: 686, col: 36, offset: 21516}, + pos: position{line: 686, col: 36, offset: 21519}, val: ">", ignoreCase: false, want: "\">\"", @@ -14444,61 +14444,61 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 687, col: 7, offset: 21544}, + pos: position{line: 687, col: 7, offset: 21547}, name: "NonEmptyListLiteral", }, &ruleRefExpr{ - pos: position{line: 688, col: 7, offset: 21570}, + pos: position{line: 688, col: 7, offset: 21573}, name: "Identifier", }, &actionExpr{ - pos: position{line: 689, col: 7, offset: 21587}, + pos: position{line: 689, col: 7, offset: 21590}, run: (*parser).callonPrimitiveExpression127, expr: &seqExpr{ - pos: position{line: 689, col: 7, offset: 21587}, + pos: position{line: 689, col: 7, offset: 21590}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 689, col: 7, offset: 21587}, + pos: position{line: 689, col: 7, offset: 21590}, val: "(", ignoreCase: false, want: "\"(\"", }, &ruleRefExpr{ - pos: position{line: 689, col: 11, offset: 21591}, + pos: position{line: 689, col: 11, offset: 21594}, name: "_", }, &zeroOrOneExpr{ - pos: position{line: 689, col: 13, offset: 21593}, + pos: position{line: 689, col: 13, offset: 21596}, expr: &seqExpr{ - pos: position{line: 689, col: 14, offset: 21594}, + pos: position{line: 689, col: 14, offset: 21597}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 689, col: 14, offset: 21594}, + pos: position{line: 689, col: 14, offset: 21597}, val: "|", ignoreCase: false, want: "\"|\"", }, &ruleRefExpr{ - pos: position{line: 689, col: 18, offset: 21598}, + pos: position{line: 689, col: 18, offset: 21601}, name: "_", }, }, }, }, &labeledExpr{ - pos: position{line: 689, col: 22, offset: 21602}, + pos: position{line: 689, col: 22, offset: 21605}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 689, col: 24, offset: 21604}, + pos: position{line: 689, col: 24, offset: 21607}, name: "Expression", }, }, &ruleRefExpr{ - pos: position{line: 689, col: 35, offset: 21615}, + pos: position{line: 689, col: 35, offset: 21618}, name: "_", }, &litMatcher{ - pos: position{line: 689, col: 37, offset: 21617}, + pos: position{line: 689, col: 37, offset: 21620}, val: ")", ignoreCase: false, want: "\")\"", @@ -14511,33 +14511,33 @@ var g = &grammar{ }, { name: "RecordTypeOrLiteral", - pos: position{line: 691, col: 1, offset: 21640}, + pos: position{line: 691, col: 1, offset: 21643}, expr: &choiceExpr{ - pos: position{line: 692, col: 7, offset: 21670}, + pos: position{line: 692, col: 7, offset: 21673}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 692, col: 7, offset: 21670}, + pos: position{line: 692, col: 7, offset: 21673}, run: (*parser).callonRecordTypeOrLiteral2, expr: &litMatcher{ - pos: position{line: 692, col: 7, offset: 21670}, + pos: position{line: 692, col: 7, offset: 21673}, val: "=", ignoreCase: false, want: "\"=\"", }, }, &ruleRefExpr{ - pos: position{line: 693, col: 7, offset: 21708}, + pos: position{line: 693, col: 7, offset: 21711}, name: "NonEmptyRecordType", }, &ruleRefExpr{ - pos: position{line: 694, col: 7, offset: 21733}, + pos: position{line: 694, col: 7, offset: 21736}, name: "NonEmptyRecordLiteral", }, &actionExpr{ - pos: position{line: 695, col: 7, offset: 21761}, + pos: position{line: 695, col: 7, offset: 21764}, run: (*parser).callonRecordTypeOrLiteral6, expr: &litMatcher{ - pos: position{line: 695, col: 7, offset: 21761}, + pos: position{line: 695, col: 7, offset: 21764}, val: "", ignoreCase: false, want: "\"\"", @@ -14548,32 +14548,32 @@ var g = &grammar{ }, { name: "MoreRecordType", - pos: position{line: 697, col: 1, offset: 21794}, + pos: position{line: 697, col: 1, offset: 21797}, expr: &actionExpr{ - pos: position{line: 697, col: 18, offset: 21813}, + pos: position{line: 697, col: 18, offset: 21816}, run: (*parser).callonMoreRecordType1, expr: &seqExpr{ - pos: position{line: 697, col: 18, offset: 21813}, + pos: position{line: 697, col: 18, offset: 21816}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 697, col: 18, offset: 21813}, + pos: position{line: 697, col: 18, offset: 21816}, name: "_", }, &litMatcher{ - pos: position{line: 697, col: 20, offset: 21815}, + pos: position{line: 697, col: 20, offset: 21818}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 697, col: 24, offset: 21819}, + pos: position{line: 697, col: 24, offset: 21822}, name: "_", }, &labeledExpr{ - pos: position{line: 697, col: 26, offset: 21821}, + pos: position{line: 697, col: 26, offset: 21824}, label: "f", expr: &ruleRefExpr{ - pos: position{line: 697, col: 28, offset: 21823}, + pos: position{line: 697, col: 28, offset: 21826}, name: "RecordTypeEntry", }, }, @@ -14583,28 +14583,28 @@ var g = &grammar{ }, { name: "NonEmptyRecordType", - pos: position{line: 698, col: 1, offset: 21855}, + pos: position{line: 698, col: 1, offset: 21858}, expr: &actionExpr{ - pos: position{line: 699, col: 7, offset: 21884}, + pos: position{line: 699, col: 7, offset: 21887}, run: (*parser).callonNonEmptyRecordType1, expr: &seqExpr{ - pos: position{line: 699, col: 7, offset: 21884}, + pos: position{line: 699, col: 7, offset: 21887}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 699, col: 7, offset: 21884}, + pos: position{line: 699, col: 7, offset: 21887}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 699, col: 13, offset: 21890}, + pos: position{line: 699, col: 13, offset: 21893}, name: "RecordTypeEntry", }, }, &labeledExpr{ - pos: position{line: 699, col: 29, offset: 21906}, + pos: position{line: 699, col: 29, offset: 21909}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 699, col: 34, offset: 21911}, + pos: position{line: 699, col: 34, offset: 21914}, expr: &ruleRefExpr{ - pos: position{line: 699, col: 34, offset: 21911}, + pos: position{line: 699, col: 34, offset: 21914}, name: "MoreRecordType", }, }, @@ -14615,41 +14615,41 @@ var g = &grammar{ }, { name: "RecordTypeEntry", - pos: position{line: 713, col: 1, offset: 22351}, + pos: position{line: 713, col: 1, offset: 22354}, expr: &actionExpr{ - pos: position{line: 713, col: 19, offset: 22371}, + pos: position{line: 713, col: 19, offset: 22374}, run: (*parser).callonRecordTypeEntry1, expr: &seqExpr{ - pos: position{line: 713, col: 19, offset: 22371}, + pos: position{line: 713, col: 19, offset: 22374}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 713, col: 19, offset: 22371}, + pos: position{line: 713, col: 19, offset: 22374}, label: "name", expr: &choiceExpr{ - pos: position{line: 154, col: 18, offset: 3799}, + pos: position{line: 154, col: 18, offset: 3802}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, run: (*parser).callonRecordTypeEntry5, expr: &seqExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, val: "`", ignoreCase: false, want: "\"`\"", }, &labeledExpr{ - pos: position{line: 146, col: 13, offset: 3519}, + pos: position{line: 146, col: 13, offset: 3522}, label: "label", expr: &actionExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, run: (*parser).callonRecordTypeEntry9, expr: &oneOrMoreExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, expr: &charClassMatcher{ - pos: position{line: 143, col: 19, offset: 3419}, + pos: position{line: 143, col: 19, offset: 3422}, val: "[ -_a-~]", ranges: []rune{' ', '_', 'a', '~'}, ignoreCase: false, @@ -14659,7 +14659,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 146, col: 31, offset: 3537}, + pos: position{line: 146, col: 31, offset: 3540}, val: "`", ignoreCase: false, want: "\"`\"", @@ -14668,75 +14668,75 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, run: (*parser).callonRecordTypeEntry13, expr: &labeledExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, label: "label", expr: &choiceExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, run: (*parser).callonRecordTypeEntry16, expr: &seqExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonRecordTypeEntry25, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -14748,61 +14748,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -14810,9 +14810,9 @@ var g = &grammar{ }, }, &oneOrMoreExpr{ - pos: position{line: 137, col: 23, offset: 3220}, + pos: position{line: 137, col: 23, offset: 3223}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -14824,68 +14824,68 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, run: (*parser).callonRecordTypeEntry42, expr: &seqExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, exprs: []interface{}{ ¬Expr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, expr: &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonRecordTypeEntry52, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -14897,61 +14897,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -14960,7 +14960,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 135, col: 24, offset: 3147}, + pos: position{line: 135, col: 24, offset: 3150}, val: "[_A-Za-z]", chars: []rune{'_'}, ranges: []rune{'A', 'Z', 'a', 'z'}, @@ -14968,9 +14968,9 @@ var g = &grammar{ inverted: false, }, &zeroOrMoreExpr{ - pos: position{line: 138, col: 43, offset: 3314}, + pos: position{line: 138, col: 43, offset: 3317}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -14986,10 +14986,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 154, col: 29, offset: 3810}, + pos: position{line: 154, col: 29, offset: 3813}, run: (*parser).callonRecordTypeEntry70, expr: &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", @@ -14999,24 +14999,24 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 713, col: 39, offset: 22391}, + pos: position{line: 713, col: 39, offset: 22394}, name: "_", }, &litMatcher{ - pos: position{line: 713, col: 41, offset: 22393}, + pos: position{line: 713, col: 41, offset: 22396}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 713, col: 45, offset: 22397}, + pos: position{line: 713, col: 45, offset: 22400}, name: "_1", }, &labeledExpr{ - pos: position{line: 713, col: 48, offset: 22400}, + pos: position{line: 713, col: 48, offset: 22403}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 713, col: 53, offset: 22405}, + pos: position{line: 713, col: 53, offset: 22408}, name: "Expression", }, }, @@ -15026,32 +15026,32 @@ var g = &grammar{ }, { name: "MoreRecordLiteral", - pos: position{line: 717, col: 1, offset: 22476}, + pos: position{line: 717, col: 1, offset: 22479}, expr: &actionExpr{ - pos: position{line: 717, col: 21, offset: 22498}, + pos: position{line: 717, col: 21, offset: 22501}, run: (*parser).callonMoreRecordLiteral1, expr: &seqExpr{ - pos: position{line: 717, col: 21, offset: 22498}, + pos: position{line: 717, col: 21, offset: 22501}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 717, col: 21, offset: 22498}, + pos: position{line: 717, col: 21, offset: 22501}, name: "_", }, &litMatcher{ - pos: position{line: 717, col: 23, offset: 22500}, + pos: position{line: 717, col: 23, offset: 22503}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 717, col: 27, offset: 22504}, + pos: position{line: 717, col: 27, offset: 22507}, name: "_", }, &labeledExpr{ - pos: position{line: 717, col: 29, offset: 22506}, + pos: position{line: 717, col: 29, offset: 22509}, label: "f", expr: &ruleRefExpr{ - pos: position{line: 717, col: 31, offset: 22508}, + pos: position{line: 717, col: 31, offset: 22511}, name: "RecordLiteralEntry", }, }, @@ -15061,28 +15061,28 @@ var g = &grammar{ }, { name: "NonEmptyRecordLiteral", - pos: position{line: 718, col: 1, offset: 22543}, + pos: position{line: 718, col: 1, offset: 22546}, expr: &actionExpr{ - pos: position{line: 719, col: 7, offset: 22575}, + pos: position{line: 719, col: 7, offset: 22578}, run: (*parser).callonNonEmptyRecordLiteral1, expr: &seqExpr{ - pos: position{line: 719, col: 7, offset: 22575}, + pos: position{line: 719, col: 7, offset: 22578}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 719, col: 7, offset: 22575}, + pos: position{line: 719, col: 7, offset: 22578}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 719, col: 13, offset: 22581}, + pos: position{line: 719, col: 13, offset: 22584}, name: "RecordLiteralEntry", }, }, &labeledExpr{ - pos: position{line: 719, col: 32, offset: 22600}, + pos: position{line: 719, col: 32, offset: 22603}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 719, col: 37, offset: 22605}, + pos: position{line: 719, col: 37, offset: 22608}, expr: &ruleRefExpr{ - pos: position{line: 719, col: 37, offset: 22605}, + pos: position{line: 719, col: 37, offset: 22608}, name: "MoreRecordLiteral", }, }, @@ -15093,41 +15093,41 @@ var g = &grammar{ }, { name: "RecordLiteralEntry", - pos: position{line: 738, col: 1, offset: 23182}, + pos: position{line: 738, col: 1, offset: 23185}, expr: &actionExpr{ - pos: position{line: 738, col: 22, offset: 23205}, + pos: position{line: 738, col: 22, offset: 23208}, run: (*parser).callonRecordLiteralEntry1, expr: &seqExpr{ - pos: position{line: 738, col: 22, offset: 23205}, + pos: position{line: 738, col: 22, offset: 23208}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 738, col: 22, offset: 23205}, + pos: position{line: 738, col: 22, offset: 23208}, label: "name", expr: &choiceExpr{ - pos: position{line: 154, col: 18, offset: 3799}, + pos: position{line: 154, col: 18, offset: 3802}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, run: (*parser).callonRecordLiteralEntry5, expr: &seqExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, val: "`", ignoreCase: false, want: "\"`\"", }, &labeledExpr{ - pos: position{line: 146, col: 13, offset: 3519}, + pos: position{line: 146, col: 13, offset: 3522}, label: "label", expr: &actionExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, run: (*parser).callonRecordLiteralEntry9, expr: &oneOrMoreExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, expr: &charClassMatcher{ - pos: position{line: 143, col: 19, offset: 3419}, + pos: position{line: 143, col: 19, offset: 3422}, val: "[ -_a-~]", ranges: []rune{' ', '_', 'a', '~'}, ignoreCase: false, @@ -15137,7 +15137,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 146, col: 31, offset: 3537}, + pos: position{line: 146, col: 31, offset: 3540}, val: "`", ignoreCase: false, want: "\"`\"", @@ -15146,75 +15146,75 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, run: (*parser).callonRecordLiteralEntry13, expr: &labeledExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, label: "label", expr: &choiceExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, run: (*parser).callonRecordLiteralEntry16, expr: &seqExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonRecordLiteralEntry25, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -15226,61 +15226,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -15288,9 +15288,9 @@ var g = &grammar{ }, }, &oneOrMoreExpr{ - pos: position{line: 137, col: 23, offset: 3220}, + pos: position{line: 137, col: 23, offset: 3223}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -15302,68 +15302,68 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, run: (*parser).callonRecordLiteralEntry42, expr: &seqExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, exprs: []interface{}{ ¬Expr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, expr: &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonRecordLiteralEntry52, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -15375,61 +15375,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -15438,7 +15438,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 135, col: 24, offset: 3147}, + pos: position{line: 135, col: 24, offset: 3150}, val: "[_A-Za-z]", chars: []rune{'_'}, ranges: []rune{'A', 'Z', 'a', 'z'}, @@ -15446,9 +15446,9 @@ var g = &grammar{ inverted: false, }, &zeroOrMoreExpr{ - pos: position{line: 138, col: 43, offset: 3314}, + pos: position{line: 138, col: 43, offset: 3317}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -15464,10 +15464,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 154, col: 29, offset: 3810}, + pos: position{line: 154, col: 29, offset: 3813}, run: (*parser).callonRecordLiteralEntry70, expr: &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", @@ -15477,17 +15477,17 @@ var g = &grammar{ }, }, &labeledExpr{ - pos: position{line: 738, col: 42, offset: 23225}, + pos: position{line: 738, col: 42, offset: 23228}, label: "val", expr: &choiceExpr{ - pos: position{line: 738, col: 47, offset: 23230}, + pos: position{line: 738, col: 47, offset: 23233}, alternatives: []interface{}{ &ruleRefExpr{ - pos: position{line: 738, col: 47, offset: 23230}, + pos: position{line: 738, col: 47, offset: 23233}, name: "RecordLiteralNormalEntry", }, &litMatcher{ - pos: position{line: 755, col: 28, offset: 23819}, + pos: position{line: 755, col: 28, offset: 23822}, val: "", ignoreCase: false, want: "\"\"", @@ -15501,60 +15501,60 @@ var g = &grammar{ }, { name: "RecordLiteralNormalEntry", - pos: position{line: 746, col: 1, offset: 23477}, + pos: position{line: 746, col: 1, offset: 23480}, expr: &actionExpr{ - pos: position{line: 746, col: 28, offset: 23506}, + pos: position{line: 746, col: 28, offset: 23509}, run: (*parser).callonRecordLiteralNormalEntry1, expr: &seqExpr{ - pos: position{line: 746, col: 28, offset: 23506}, + pos: position{line: 746, col: 28, offset: 23509}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 746, col: 28, offset: 23506}, + pos: position{line: 746, col: 28, offset: 23509}, label: "children", expr: &zeroOrMoreExpr{ - pos: position{line: 746, col: 37, offset: 23515}, + pos: position{line: 746, col: 37, offset: 23518}, expr: &seqExpr{ - pos: position{line: 746, col: 38, offset: 23516}, + pos: position{line: 746, col: 38, offset: 23519}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 746, col: 38, offset: 23516}, + pos: position{line: 746, col: 38, offset: 23519}, name: "_", }, &litMatcher{ - pos: position{line: 746, col: 40, offset: 23518}, + pos: position{line: 746, col: 40, offset: 23521}, val: ".", ignoreCase: false, want: "\".\"", }, &ruleRefExpr{ - pos: position{line: 746, col: 44, offset: 23522}, + pos: position{line: 746, col: 44, offset: 23525}, name: "_", }, &choiceExpr{ - pos: position{line: 154, col: 18, offset: 3799}, + pos: position{line: 154, col: 18, offset: 3802}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, run: (*parser).callonRecordLiteralNormalEntry10, expr: &seqExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, val: "`", ignoreCase: false, want: "\"`\"", }, &labeledExpr{ - pos: position{line: 146, col: 13, offset: 3519}, + pos: position{line: 146, col: 13, offset: 3522}, label: "label", expr: &actionExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, run: (*parser).callonRecordLiteralNormalEntry14, expr: &oneOrMoreExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, expr: &charClassMatcher{ - pos: position{line: 143, col: 19, offset: 3419}, + pos: position{line: 143, col: 19, offset: 3422}, val: "[ -_a-~]", ranges: []rune{' ', '_', 'a', '~'}, ignoreCase: false, @@ -15564,7 +15564,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 146, col: 31, offset: 3537}, + pos: position{line: 146, col: 31, offset: 3540}, val: "`", ignoreCase: false, want: "\"`\"", @@ -15573,75 +15573,75 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, run: (*parser).callonRecordLiteralNormalEntry18, expr: &labeledExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, label: "label", expr: &choiceExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, run: (*parser).callonRecordLiteralNormalEntry21, expr: &seqExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonRecordLiteralNormalEntry30, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -15653,61 +15653,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -15715,9 +15715,9 @@ var g = &grammar{ }, }, &oneOrMoreExpr{ - pos: position{line: 137, col: 23, offset: 3220}, + pos: position{line: 137, col: 23, offset: 3223}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -15729,68 +15729,68 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, run: (*parser).callonRecordLiteralNormalEntry47, expr: &seqExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, exprs: []interface{}{ ¬Expr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, expr: &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonRecordLiteralNormalEntry57, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -15802,61 +15802,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -15865,7 +15865,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 135, col: 24, offset: 3147}, + pos: position{line: 135, col: 24, offset: 3150}, val: "[_A-Za-z]", chars: []rune{'_'}, ranges: []rune{'A', 'Z', 'a', 'z'}, @@ -15873,9 +15873,9 @@ var g = &grammar{ inverted: false, }, &zeroOrMoreExpr{ - pos: position{line: 138, col: 43, offset: 3314}, + pos: position{line: 138, col: 43, offset: 3317}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -15891,10 +15891,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 154, col: 29, offset: 3810}, + pos: position{line: 154, col: 29, offset: 3813}, run: (*parser).callonRecordLiteralNormalEntry75, expr: &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", @@ -15907,24 +15907,24 @@ var g = &grammar{ }, }, &ruleRefExpr{ - pos: position{line: 746, col: 63, offset: 23541}, + pos: position{line: 746, col: 63, offset: 23544}, name: "_", }, &litMatcher{ - pos: position{line: 746, col: 65, offset: 23543}, + pos: position{line: 746, col: 65, offset: 23546}, val: "=", ignoreCase: false, want: "\"=\"", }, &ruleRefExpr{ - pos: position{line: 746, col: 69, offset: 23547}, + pos: position{line: 746, col: 69, offset: 23550}, name: "_", }, &labeledExpr{ - pos: position{line: 746, col: 71, offset: 23549}, + pos: position{line: 746, col: 71, offset: 23552}, label: "expr", expr: &ruleRefExpr{ - pos: position{line: 746, col: 76, offset: 23554}, + pos: position{line: 746, col: 76, offset: 23557}, name: "Expression", }, }, @@ -15934,19 +15934,19 @@ var g = &grammar{ }, { name: "UnionType", - pos: position{line: 757, col: 1, offset: 23823}, + pos: position{line: 757, col: 1, offset: 23826}, expr: &choiceExpr{ - pos: position{line: 757, col: 13, offset: 23837}, + pos: position{line: 757, col: 13, offset: 23840}, alternatives: []interface{}{ &ruleRefExpr{ - pos: position{line: 757, col: 13, offset: 23837}, + pos: position{line: 757, col: 13, offset: 23840}, name: "NonEmptyUnionType", }, &actionExpr{ - pos: position{line: 759, col: 18, offset: 23892}, + pos: position{line: 759, col: 18, offset: 23895}, run: (*parser).callonUnionType3, expr: &litMatcher{ - pos: position{line: 759, col: 18, offset: 23892}, + pos: position{line: 759, col: 18, offset: 23895}, val: "", ignoreCase: false, want: "\"\"", @@ -15957,45 +15957,45 @@ var g = &grammar{ }, { name: "NonEmptyUnionType", - pos: position{line: 761, col: 1, offset: 23924}, + pos: position{line: 761, col: 1, offset: 23927}, expr: &actionExpr{ - pos: position{line: 761, col: 21, offset: 23946}, + pos: position{line: 761, col: 21, offset: 23949}, run: (*parser).callonNonEmptyUnionType1, expr: &seqExpr{ - pos: position{line: 761, col: 21, offset: 23946}, + pos: position{line: 761, col: 21, offset: 23949}, exprs: []interface{}{ &labeledExpr{ - pos: position{line: 761, col: 21, offset: 23946}, + pos: position{line: 761, col: 21, offset: 23949}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 761, col: 27, offset: 23952}, + pos: position{line: 761, col: 27, offset: 23955}, name: "UnionTypeEntry", }, }, &labeledExpr{ - pos: position{line: 761, col: 42, offset: 23967}, + pos: position{line: 761, col: 42, offset: 23970}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 761, col: 47, offset: 23972}, + pos: position{line: 761, col: 47, offset: 23975}, expr: &seqExpr{ - pos: position{line: 761, col: 48, offset: 23973}, + pos: position{line: 761, col: 48, offset: 23976}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 761, col: 48, offset: 23973}, + pos: position{line: 761, col: 48, offset: 23976}, name: "_", }, &litMatcher{ - pos: position{line: 761, col: 50, offset: 23975}, + pos: position{line: 761, col: 50, offset: 23978}, val: "|", ignoreCase: false, want: "\"|\"", }, &ruleRefExpr{ - pos: position{line: 761, col: 54, offset: 23979}, + pos: position{line: 761, col: 54, offset: 23982}, name: "_", }, &ruleRefExpr{ - pos: position{line: 761, col: 56, offset: 23981}, + pos: position{line: 761, col: 56, offset: 23984}, name: "UnionTypeEntry", }, }, @@ -16008,35 +16008,35 @@ var g = &grammar{ }, { name: "UnionTypeEntry", - pos: position{line: 786, col: 1, offset: 24824}, + pos: position{line: 786, col: 1, offset: 24827}, expr: &seqExpr{ - pos: position{line: 786, col: 18, offset: 24843}, + pos: position{line: 786, col: 18, offset: 24846}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 154, col: 18, offset: 3799}, + pos: position{line: 154, col: 18, offset: 3802}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, run: (*parser).callonUnionTypeEntry3, expr: &seqExpr{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 146, col: 9, offset: 3515}, + pos: position{line: 146, col: 9, offset: 3518}, val: "`", ignoreCase: false, want: "\"`\"", }, &labeledExpr{ - pos: position{line: 146, col: 13, offset: 3519}, + pos: position{line: 146, col: 13, offset: 3522}, label: "label", expr: &actionExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, run: (*parser).callonUnionTypeEntry7, expr: &oneOrMoreExpr{ - pos: position{line: 144, col: 15, offset: 3456}, + pos: position{line: 144, col: 15, offset: 3459}, expr: &charClassMatcher{ - pos: position{line: 143, col: 19, offset: 3419}, + pos: position{line: 143, col: 19, offset: 3422}, val: "[ -_a-~]", ranges: []rune{' ', '_', 'a', '~'}, ignoreCase: false, @@ -16046,7 +16046,7 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 146, col: 31, offset: 3537}, + pos: position{line: 146, col: 31, offset: 3540}, val: "`", ignoreCase: false, want: "\"`\"", @@ -16055,75 +16055,75 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, run: (*parser).callonUnionTypeEntry11, expr: &labeledExpr{ - pos: position{line: 147, col: 9, offset: 3571}, + pos: position{line: 147, col: 9, offset: 3574}, label: "label", expr: &choiceExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, alternatives: []interface{}{ &actionExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, run: (*parser).callonUnionTypeEntry14, expr: &seqExpr{ - pos: position{line: 137, col: 15, offset: 3212}, + pos: position{line: 137, col: 15, offset: 3215}, exprs: []interface{}{ &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonUnionTypeEntry23, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -16135,61 +16135,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -16197,9 +16197,9 @@ var g = &grammar{ }, }, &oneOrMoreExpr{ - pos: position{line: 137, col: 23, offset: 3220}, + pos: position{line: 137, col: 23, offset: 3223}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -16211,68 +16211,68 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, run: (*parser).callonUnionTypeEntry40, expr: &seqExpr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, exprs: []interface{}{ ¬Expr{ - pos: position{line: 138, col: 13, offset: 3284}, + pos: position{line: 138, col: 13, offset: 3287}, expr: &choiceExpr{ - pos: position{line: 264, col: 5, offset: 6665}, + pos: position{line: 264, col: 5, offset: 6668}, alternatives: []interface{}{ &litMatcher{ - pos: position{line: 246, col: 6, offset: 6332}, + pos: position{line: 246, col: 6, offset: 6335}, val: "if", ignoreCase: false, want: "\"if\"", }, &litMatcher{ - pos: position{line: 247, col: 8, offset: 6346}, + pos: position{line: 247, col: 8, offset: 6349}, val: "then", ignoreCase: false, want: "\"then\"", }, &litMatcher{ - pos: position{line: 248, col: 8, offset: 6362}, + pos: position{line: 248, col: 8, offset: 6365}, val: "else", ignoreCase: false, want: "\"else\"", }, &litMatcher{ - pos: position{line: 249, col: 7, offset: 6377}, + pos: position{line: 249, col: 7, offset: 6380}, val: "let", ignoreCase: false, want: "\"let\"", }, &litMatcher{ - pos: position{line: 250, col: 6, offset: 6390}, + pos: position{line: 250, col: 6, offset: 6393}, val: "in", ignoreCase: false, want: "\"in\"", }, &litMatcher{ - pos: position{line: 252, col: 9, offset: 6417}, + pos: position{line: 252, col: 9, offset: 6420}, val: "using", ignoreCase: false, want: "\"using\"", }, &actionExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, run: (*parser).callonUnionTypeEntry50, expr: &seqExpr{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 254, col: 11, offset: 6455}, + pos: position{line: 254, col: 11, offset: 6458}, val: "missing", ignoreCase: false, want: "\"missing\"", }, ¬Expr{ - pos: position{line: 254, col: 21, offset: 6465}, + pos: position{line: 254, col: 21, offset: 6468}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -16284,61 +16284,61 @@ var g = &grammar{ }, }, &litMatcher{ - pos: position{line: 259, col: 10, offset: 6595}, + pos: position{line: 259, col: 10, offset: 6598}, val: "assert", ignoreCase: false, want: "\"assert\"", }, &litMatcher{ - pos: position{line: 251, col: 6, offset: 6402}, + pos: position{line: 251, col: 6, offset: 6405}, val: "as", ignoreCase: false, want: "\"as\"", }, &litMatcher{ - pos: position{line: 255, col: 12, offset: 6525}, + pos: position{line: 255, col: 12, offset: 6528}, val: "Infinity", ignoreCase: false, want: "\"Infinity\"", }, &litMatcher{ - pos: position{line: 256, col: 7, offset: 6544}, + pos: position{line: 256, col: 7, offset: 6547}, val: "NaN", ignoreCase: false, want: "\"NaN\"", }, &litMatcher{ - pos: position{line: 253, col: 9, offset: 6435}, + pos: position{line: 253, col: 9, offset: 6438}, val: "merge", ignoreCase: false, want: "\"merge\"", }, &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", }, &litMatcher{ - pos: position{line: 258, col: 9, offset: 6576}, + pos: position{line: 258, col: 9, offset: 6579}, val: "toMap", ignoreCase: false, want: "\"toMap\"", }, &litMatcher{ - pos: position{line: 260, col: 10, offset: 6615}, + pos: position{line: 260, col: 10, offset: 6618}, val: "forall", ignoreCase: false, want: "\"forall\"", }, &litMatcher{ - pos: position{line: 260, col: 21, offset: 6626}, + pos: position{line: 260, col: 21, offset: 6629}, val: "∀", ignoreCase: false, want: "\"∀\"", }, &litMatcher{ - pos: position{line: 261, col: 8, offset: 6641}, + pos: position{line: 261, col: 8, offset: 6644}, val: "with", ignoreCase: false, want: "\"with\"", @@ -16347,7 +16347,7 @@ var g = &grammar{ }, }, &charClassMatcher{ - pos: position{line: 135, col: 24, offset: 3147}, + pos: position{line: 135, col: 24, offset: 3150}, val: "[_A-Za-z]", chars: []rune{'_'}, ranges: []rune{'A', 'Z', 'a', 'z'}, @@ -16355,9 +16355,9 @@ var g = &grammar{ inverted: false, }, &zeroOrMoreExpr{ - pos: position{line: 138, col: 43, offset: 3314}, + pos: position{line: 138, col: 43, offset: 3317}, expr: &charClassMatcher{ - pos: position{line: 136, col: 23, offset: 3181}, + pos: position{line: 136, col: 23, offset: 3184}, val: "[_/-A-Za-z0-9]", chars: []rune{'_', '/', '-'}, ranges: []rune{'A', 'Z', 'a', 'z', '0', '9'}, @@ -16373,10 +16373,10 @@ var g = &grammar{ }, }, &actionExpr{ - pos: position{line: 154, col: 29, offset: 3810}, + pos: position{line: 154, col: 29, offset: 3813}, run: (*parser).callonUnionTypeEntry68, expr: &litMatcher{ - pos: position{line: 257, col: 8, offset: 6559}, + pos: position{line: 257, col: 8, offset: 6562}, val: "Some", ignoreCase: false, want: "\"Some\"", @@ -16385,26 +16385,26 @@ var g = &grammar{ }, }, &zeroOrOneExpr{ - pos: position{line: 786, col: 33, offset: 24858}, + pos: position{line: 786, col: 33, offset: 24861}, expr: &seqExpr{ - pos: position{line: 786, col: 34, offset: 24859}, + pos: position{line: 786, col: 34, offset: 24862}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 786, col: 34, offset: 24859}, + pos: position{line: 786, col: 34, offset: 24862}, name: "_", }, &litMatcher{ - pos: position{line: 786, col: 36, offset: 24861}, + pos: position{line: 786, col: 36, offset: 24864}, val: ":", ignoreCase: false, want: "\":\"", }, &ruleRefExpr{ - pos: position{line: 786, col: 40, offset: 24865}, + pos: position{line: 786, col: 40, offset: 24868}, name: "_1", }, &ruleRefExpr{ - pos: position{line: 786, col: 43, offset: 24868}, + pos: position{line: 786, col: 43, offset: 24871}, name: "Expression", }, }, @@ -16415,33 +16415,33 @@ var g = &grammar{ }, { name: "MoreList", - pos: position{line: 788, col: 1, offset: 24882}, + pos: position{line: 788, col: 1, offset: 24885}, expr: &actionExpr{ - pos: position{line: 788, col: 12, offset: 24895}, + pos: position{line: 788, col: 12, offset: 24898}, run: (*parser).callonMoreList1, expr: &seqExpr{ - pos: position{line: 788, col: 12, offset: 24895}, + pos: position{line: 788, col: 12, offset: 24898}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 788, col: 12, offset: 24895}, + pos: position{line: 788, col: 12, offset: 24898}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 788, col: 16, offset: 24899}, + pos: position{line: 788, col: 16, offset: 24902}, name: "_", }, &labeledExpr{ - pos: position{line: 788, col: 18, offset: 24901}, + pos: position{line: 788, col: 18, offset: 24904}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 788, col: 20, offset: 24903}, + pos: position{line: 788, col: 20, offset: 24906}, name: "Expression", }, }, &ruleRefExpr{ - pos: position{line: 788, col: 31, offset: 24914}, + pos: position{line: 788, col: 31, offset: 24917}, name: "_", }, }, @@ -16450,66 +16450,66 @@ var g = &grammar{ }, { name: "NonEmptyListLiteral", - pos: position{line: 790, col: 1, offset: 24933}, + pos: position{line: 790, col: 1, offset: 24936}, expr: &actionExpr{ - pos: position{line: 791, col: 7, offset: 24963}, + pos: position{line: 791, col: 7, offset: 24966}, run: (*parser).callonNonEmptyListLiteral1, expr: &seqExpr{ - pos: position{line: 791, col: 7, offset: 24963}, + pos: position{line: 791, col: 7, offset: 24966}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 791, col: 7, offset: 24963}, + pos: position{line: 791, col: 7, offset: 24966}, val: "[", ignoreCase: false, want: "\"[\"", }, &ruleRefExpr{ - pos: position{line: 791, col: 11, offset: 24967}, + pos: position{line: 791, col: 11, offset: 24970}, name: "_", }, &zeroOrOneExpr{ - pos: position{line: 791, col: 13, offset: 24969}, + pos: position{line: 791, col: 13, offset: 24972}, expr: &seqExpr{ - pos: position{line: 791, col: 14, offset: 24970}, + pos: position{line: 791, col: 14, offset: 24973}, exprs: []interface{}{ &litMatcher{ - pos: position{line: 791, col: 14, offset: 24970}, + pos: position{line: 791, col: 14, offset: 24973}, val: ",", ignoreCase: false, want: "\",\"", }, &ruleRefExpr{ - pos: position{line: 791, col: 18, offset: 24974}, + pos: position{line: 791, col: 18, offset: 24977}, name: "_", }, }, }, }, &labeledExpr{ - pos: position{line: 791, col: 22, offset: 24978}, + pos: position{line: 791, col: 22, offset: 24981}, label: "first", expr: &ruleRefExpr{ - pos: position{line: 791, col: 28, offset: 24984}, + pos: position{line: 791, col: 28, offset: 24987}, name: "Expression", }, }, &ruleRefExpr{ - pos: position{line: 791, col: 39, offset: 24995}, + pos: position{line: 791, col: 39, offset: 24998}, name: "_", }, &labeledExpr{ - pos: position{line: 791, col: 41, offset: 24997}, + pos: position{line: 791, col: 41, offset: 25000}, label: "rest", expr: &zeroOrMoreExpr{ - pos: position{line: 791, col: 46, offset: 25002}, + pos: position{line: 791, col: 46, offset: 25005}, expr: &ruleRefExpr{ - pos: position{line: 791, col: 46, offset: 25002}, + pos: position{line: 791, col: 46, offset: 25005}, name: "MoreList", }, }, }, &litMatcher{ - pos: position{line: 791, col: 56, offset: 25012}, + pos: position{line: 791, col: 56, offset: 25015}, val: "]", ignoreCase: false, want: "\"]\"", @@ -16520,27 +16520,27 @@ var g = &grammar{ }, { name: "CompleteExpression", - pos: position{line: 801, col: 1, offset: 25279}, + pos: position{line: 801, col: 1, offset: 25282}, expr: &actionExpr{ - pos: position{line: 801, col: 22, offset: 25302}, + pos: position{line: 801, col: 22, offset: 25305}, run: (*parser).callonCompleteExpression1, expr: &seqExpr{ - pos: position{line: 801, col: 22, offset: 25302}, + pos: position{line: 801, col: 22, offset: 25305}, exprs: []interface{}{ &ruleRefExpr{ - pos: position{line: 801, col: 22, offset: 25302}, + pos: position{line: 801, col: 22, offset: 25305}, name: "_", }, &labeledExpr{ - pos: position{line: 801, col: 24, offset: 25304}, + pos: position{line: 801, col: 24, offset: 25307}, label: "e", expr: &ruleRefExpr{ - pos: position{line: 801, col: 26, offset: 25306}, + pos: position{line: 801, col: 26, offset: 25309}, name: "Expression", }, }, &ruleRefExpr{ - pos: position{line: 801, col: 37, offset: 25317}, + pos: position{line: 801, col: 37, offset: 25320}, name: "_", }, }, diff --git a/parser/internal/dhall.peg b/parser/internal/dhall.peg index 3ebefad..175f274 100644 --- a/parser/internal/dhall.peg +++ b/parser/internal/dhall.peg @@ -29,7 +29,7 @@ import ( "unicode" "unicode/utf8" ) -import . "github.com/philandstuff/dhall-golang/term" +import . "github.com/philandstuff/dhall-golang/v3/term" // Helper function for parsing all the operator parsing blocks // see OrExpression for an example of how this is used diff --git a/parser/internal/multiline.go b/parser/internal/multiline.go index a312519..42baa03 100644 --- a/parser/internal/multiline.go +++ b/parser/internal/multiline.go @@ -3,7 +3,7 @@ package internal import ( "strings" - "github.com/philandstuff/dhall-golang/term" + "github.com/philandstuff/dhall-golang/v3/term" ) // removeLeadingCommonIndent removes the common leading indent from a diff --git a/parser/internal/multiline_test.go b/parser/internal/multiline_test.go index a4f0a46..821355a 100644 --- a/parser/internal/multiline_test.go +++ b/parser/internal/multiline_test.go @@ -1,7 +1,7 @@ package internal import ( - . "github.com/philandstuff/dhall-golang/term" + . "github.com/philandstuff/dhall-golang/v3/term" . "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo/extensions/table" diff --git a/parser/parser.go b/parser/parser.go index 164b47a..35e5a9f 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/philandstuff/dhall-golang/parser/internal" - "github.com/philandstuff/dhall-golang/term" + "github.com/philandstuff/dhall-golang/v3/parser/internal" + "github.com/philandstuff/dhall-golang/v3/term" ) //go:generate pigeon -optimize-grammar -optimize-parser -o internal/dhall.go internal/dhall.peg diff --git a/parser/parser_test.go b/parser/parser_test.go index b1e9865..421e7d8 100644 --- a/parser/parser_test.go +++ b/parser/parser_test.go @@ -3,9 +3,9 @@ package parser_test import ( "math" - . "github.com/philandstuff/dhall-golang/internal" - "github.com/philandstuff/dhall-golang/parser" - . "github.com/philandstuff/dhall-golang/term" + . "github.com/philandstuff/dhall-golang/v3/internal" + "github.com/philandstuff/dhall-golang/v3/parser" + . "github.com/philandstuff/dhall-golang/v3/term" . "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo/extensions/table" diff --git a/property_test.go b/property_test.go index 743d313..2d7693d 100644 --- a/property_test.go +++ b/property_test.go @@ -10,9 +10,9 @@ import ( "github.com/leanovate/gopter/gen" "github.com/leanovate/gopter/prop" - "github.com/philandstuff/dhall-golang/core" - "github.com/philandstuff/dhall-golang/parser" - "github.com/philandstuff/dhall-golang/term" + "github.com/philandstuff/dhall-golang/v3/core" + "github.com/philandstuff/dhall-golang/v3/parser" + "github.com/philandstuff/dhall-golang/v3/term" ) var ( diff --git a/regression_test.go b/regression_test.go index b393909..1192771 100644 --- a/regression_test.go +++ b/regression_test.go @@ -4,8 +4,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/gomega" - . "github.com/philandstuff/dhall-golang/core" - "github.com/philandstuff/dhall-golang/parser" + . "github.com/philandstuff/dhall-golang/v3/core" + "github.com/philandstuff/dhall-golang/v3/parser" ) func parseAndTypecheckTest(source string, expectedTypeSource string) { diff --git a/spec_test.go b/spec_test.go index 1fc309c..b1c9e61 100644 --- a/spec_test.go +++ b/spec_test.go @@ -12,11 +12,11 @@ import ( "strings" "testing" - "github.com/philandstuff/dhall-golang/binary" - "github.com/philandstuff/dhall-golang/core" - "github.com/philandstuff/dhall-golang/imports" - "github.com/philandstuff/dhall-golang/parser" - "github.com/philandstuff/dhall-golang/term" + "github.com/philandstuff/dhall-golang/v3/binary" + "github.com/philandstuff/dhall-golang/v3/core" + "github.com/philandstuff/dhall-golang/v3/imports" + "github.com/philandstuff/dhall-golang/v3/parser" + "github.com/philandstuff/dhall-golang/v3/term" "github.com/pkg/errors" ) diff --git a/term/fetchable_test.go b/term/fetchable_test.go index 96fbbe4..2a18f4b 100644 --- a/term/fetchable_test.go +++ b/term/fetchable_test.go @@ -6,8 +6,8 @@ import ( "net/url" "os" - "github.com/philandstuff/dhall-golang/internal" - . "github.com/philandstuff/dhall-golang/term" + "github.com/philandstuff/dhall-golang/v3/internal" + . "github.com/philandstuff/dhall-golang/v3/term" . "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo/extensions/table" diff --git a/unmarshal.go b/unmarshal.go index fc5c955..abc3cec 100644 --- a/unmarshal.go +++ b/unmarshal.go @@ -5,10 +5,10 @@ import ( "fmt" "reflect" - "github.com/philandstuff/dhall-golang/core" - "github.com/philandstuff/dhall-golang/imports" - "github.com/philandstuff/dhall-golang/parser" - "github.com/philandstuff/dhall-golang/term" + "github.com/philandstuff/dhall-golang/v3/core" + "github.com/philandstuff/dhall-golang/v3/imports" + "github.com/philandstuff/dhall-golang/v3/parser" + "github.com/philandstuff/dhall-golang/v3/term" ) func isMapEntryType(recordType map[string]core.Value) bool { diff --git a/unmarshal_test.go b/unmarshal_test.go index 5d4d0bf..9d93cf3 100644 --- a/unmarshal_test.go +++ b/unmarshal_test.go @@ -3,9 +3,9 @@ package dhall_test import ( "reflect" - . "github.com/philandstuff/dhall-golang" - "github.com/philandstuff/dhall-golang/core" - "github.com/philandstuff/dhall-golang/term" + . "github.com/philandstuff/dhall-golang/v3" + "github.com/philandstuff/dhall-golang/v3/core" + "github.com/philandstuff/dhall-golang/v3/term" . "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo/extensions/table" From efa9511b0abaf4da4fe60a550571e81c98c633c1 Mon Sep 17 00:00:00 2001 From: Philip Potter Date: Mon, 11 May 2020 14:43:31 +0100 Subject: [PATCH 2/2] Write release notes for v3.0.0 --- CHANGELOG.md | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9abc38c..14eadd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,33 @@ # Changelog ## [Unreleased] -[Unreleased]: https://github.com/philandstuff/dhall-golang/compare/v2.0.0...HEAD +[Unreleased]: https://github.com/philandstuff/dhall-golang/compare/v3.0.0...HEAD + +## [3.0.0] - 2020-05-11 +[3.0.0]: https://github.com/philandstuff/dhall-golang/compare/v2.0.0...v3.0.0 + +This brings dhall-golang up to version 16.0.0 of the Dhall standard. +As the standard had breaking changes, this release is a major version +bump. + +### Breaking changes + + * Language changes: + * [Adjust precedence of `===` and `with`](https://github.com/dhall-lang/dhall-lang/pull/954) + * [Update encoding of floating point values to RFC7049bis](https://github.com/dhall-lang/dhall-lang/pull/958) + +### New features + + * Language features: + * [Allow unions with mixed kinds](https://github.com/dhall-lang/dhall-lang/pull/957) + +### Bug fixes + + * We now save fully-alpha-normalized expressions to the cache (#31) + * We now check the hash of expressions fetched from the cache (#32) ## [2.0.0] - 2020-04-17 -[1.0.0]: https://github.com/philandstuff/dhall-golang/compare/v1.0.0...v2.0.0 +[2.0.0]: https://github.com/philandstuff/dhall-golang/compare/v1.0.0...v2.0.0 This brings dhall-golang up to version 15.0.0 of the Dhall standard. As the standard had breaking changes, this release is a major version