diff --git a/compiler/kernel/expr.go b/compiler/kernel/expr.go
index 80d5dae6d4..3ae2ee0bc8 100644
--- a/compiler/kernel/expr.go
+++ b/compiler/kernel/expr.go
@@ -282,55 +282,9 @@ func (b *Builder) compileAssignment(node *dag.Assignment) (expr.Assignment, erro
 	return expr.Assignment{LHS: lhs, RHS: rhs}, err
 }
 
-func shaperOps(name string) expr.ShaperTransform {
-	switch name {
-	case "cast":
-		return expr.Cast
-	case "crop":
-		return expr.Crop
-	case "fill":
-		return expr.Fill
-	case "fit":
-		return expr.Crop | expr.Fill
-	case "order":
-		return expr.Order
-	case "shape":
-		return expr.Cast | expr.Fill | expr.Order
-	default:
-		return 0
-	}
-
-}
-
-func isShaperFunc(name string) bool {
-	return shaperOps(name) != 0
-}
-
-func (b *Builder) compileShaper(node dag.Call) (expr.Evaluator, error) {
-	args := node.Args
-	if len(args) == 1 {
-		args = append([]dag.Expr{&dag.This{Kind: "This"}}, args...)
-	}
-	if len(args) < 2 {
-		return nil, function.ErrTooFewArgs
-	}
-	if len(args) > 2 {
-		return nil, function.ErrTooManyArgs
-	}
-	field, err := b.compileExpr(args[0])
-	if err != nil {
-		return nil, err
-	}
-	typExpr, err := b.compileExpr(args[1])
-	if err != nil {
-		return nil, err
-	}
-	return expr.NewShaper(b.zctx(), field, typExpr, shaperOps(node.Name))
-}
-
 func (b *Builder) compileCall(call dag.Call) (expr.Evaluator, error) {
-	if isShaperFunc(call.Name) {
-		return b.compileShaper(call)
+	if tf := expr.GetShaperTransforms(call.Name); tf != 0 {
+		return b.compileShaper(call, tf)
 	}
 	var path field.Path
 	// First check if call is to a user defined function, otherwise check for
@@ -355,6 +309,19 @@ func (b *Builder) compileCall(call dag.Call) (expr.Evaluator, error) {
 	return expr.NewCall(b.zctx(), fn, exprs), nil
 }
 
+func (b *Builder) compileShaper(node dag.Call, tf expr.ShaperTransform) (expr.Evaluator, error) {
+	args := node.Args
+	field, err := b.compileExpr(args[0])
+	if err != nil {
+		return nil, err
+	}
+	typExpr, err := b.compileExpr(args[1])
+	if err != nil {
+		return nil, err
+	}
+	return expr.NewShaper(b.zctx(), field, typExpr, tf)
+}
+
 func (b *Builder) compileExprs(in []dag.Expr) ([]expr.Evaluator, error) {
 	var exprs []expr.Evaluator
 	for _, e := range in {
diff --git a/compiler/parser/parser.es.js b/compiler/parser/parser.es.js
index 37d582a449..9143c69e70 100644
--- a/compiler/parser/parser.es.js
+++ b/compiler/parser/parser.es.js
@@ -8343,7 +8343,7 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
-    s1 = peg$parseCastType();
+    s1 = peg$parseTypeLiteral();
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
       if (s2 !== peg$FAILED) {
@@ -11591,23 +11591,6 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parseCastType() {
-    var s0, s1;
-
-    s0 = peg$parseTypeLiteral();
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parsePrimitiveType();
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$c410(s1);
-      }
-      s0 = s1;
-    }
-
-    return s0;
-  }
-
   function peg$parseType() {
     var s0;
 
diff --git a/compiler/parser/parser.go b/compiler/parser/parser.go
index b2223c93d7..d586ae5249 100644
--- a/compiler/parser/parser.go
+++ b/compiler/parser/parser.go
@@ -6003,45 +6003,45 @@ var g = &grammar{
 							label: "typ",
 							expr: &ruleRefExpr{
 								pos:  position{line: 744, col: 9, offset: 21465},
-								name: "CastType",
+								name: "TypeLiteral",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 744, col: 18, offset: 21474},
+							pos:  position{line: 744, col: 21, offset: 21477},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 744, col: 21, offset: 21477},
+							pos:        position{line: 744, col: 24, offset: 21480},
 							val:        "(",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 744, col: 25, offset: 21481},
+							pos:  position{line: 744, col: 28, offset: 21484},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 744, col: 28, offset: 21484},
+							pos:   position{line: 744, col: 31, offset: 21487},
 							label: "expr",
 							expr: &choiceExpr{
-								pos: position{line: 744, col: 34, offset: 21490},
+								pos: position{line: 744, col: 37, offset: 21493},
 								alternatives: []interface{}{
 									&ruleRefExpr{
-										pos:  position{line: 744, col: 34, offset: 21490},
+										pos:  position{line: 744, col: 37, offset: 21493},
 										name: "OverExpr",
 									},
 									&ruleRefExpr{
-										pos:  position{line: 744, col: 45, offset: 21501},
+										pos:  position{line: 744, col: 48, offset: 21504},
 										name: "Expr",
 									},
 								},
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 744, col: 51, offset: 21507},
+							pos:  position{line: 744, col: 54, offset: 21510},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 744, col: 54, offset: 21510},
+							pos:        position{line: 744, col: 57, offset: 21513},
 							val:        ")",
 							ignoreCase: false,
 						},
@@ -6051,83 +6051,83 @@ var g = &grammar{
 		},
 		{
 			name: "Function",
-			pos:  position{line: 748, col: 1, offset: 21607},
+			pos:  position{line: 748, col: 1, offset: 21610},
 			expr: &choiceExpr{
-				pos: position{line: 749, col: 5, offset: 21620},
+				pos: position{line: 749, col: 5, offset: 21623},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 749, col: 5, offset: 21620},
+						pos:  position{line: 749, col: 5, offset: 21623},
 						name: "Grep",
 					},
 					&actionExpr{
-						pos: position{line: 751, col: 5, offset: 21707},
+						pos: position{line: 751, col: 5, offset: 21710},
 						run: (*parser).callonFunction3,
 						expr: &seqExpr{
-							pos: position{line: 751, col: 5, offset: 21707},
+							pos: position{line: 751, col: 5, offset: 21710},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 751, col: 5, offset: 21707},
+									pos:        position{line: 751, col: 5, offset: 21710},
 									val:        "regexp",
 									ignoreCase: false,
 								},
 								&ruleRefExpr{
-									pos:  position{line: 751, col: 14, offset: 21716},
+									pos:  position{line: 751, col: 14, offset: 21719},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 751, col: 17, offset: 21719},
+									pos:        position{line: 751, col: 17, offset: 21722},
 									val:        "(",
 									ignoreCase: false,
 								},
 								&ruleRefExpr{
-									pos:  position{line: 751, col: 21, offset: 21723},
+									pos:  position{line: 751, col: 21, offset: 21726},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 751, col: 24, offset: 21726},
+									pos:   position{line: 751, col: 24, offset: 21729},
 									label: "arg0Text",
 									expr: &ruleRefExpr{
-										pos:  position{line: 751, col: 33, offset: 21735},
+										pos:  position{line: 751, col: 33, offset: 21738},
 										name: "RegexpPattern",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 751, col: 47, offset: 21749},
+									pos:  position{line: 751, col: 47, offset: 21752},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 751, col: 50, offset: 21752},
+									pos:        position{line: 751, col: 50, offset: 21755},
 									val:        ",",
 									ignoreCase: false,
 								},
 								&ruleRefExpr{
-									pos:  position{line: 751, col: 54, offset: 21756},
+									pos:  position{line: 751, col: 54, offset: 21759},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 751, col: 57, offset: 21759},
+									pos:   position{line: 751, col: 57, offset: 21762},
 									label: "arg1",
 									expr: &ruleRefExpr{
-										pos:  position{line: 751, col: 62, offset: 21764},
+										pos:  position{line: 751, col: 62, offset: 21767},
 										name: "Expr",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 751, col: 67, offset: 21769},
+									pos:  position{line: 751, col: 67, offset: 21772},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 751, col: 70, offset: 21772},
+									pos:        position{line: 751, col: 70, offset: 21775},
 									val:        ")",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 751, col: 74, offset: 21776},
+									pos:   position{line: 751, col: 74, offset: 21779},
 									label: "where",
 									expr: &zeroOrOneExpr{
-										pos: position{line: 751, col: 80, offset: 21782},
+										pos: position{line: 751, col: 80, offset: 21785},
 										expr: &ruleRefExpr{
-											pos:  position{line: 751, col: 80, offset: 21782},
+											pos:  position{line: 751, col: 80, offset: 21785},
 											name: "WhereClause",
 										},
 									},
@@ -6136,95 +6136,95 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 755, col: 5, offset: 22030},
+						pos: position{line: 755, col: 5, offset: 22033},
 						run: (*parser).callonFunction21,
 						expr: &seqExpr{
-							pos: position{line: 755, col: 5, offset: 22030},
+							pos: position{line: 755, col: 5, offset: 22033},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 755, col: 5, offset: 22030},
+									pos:        position{line: 755, col: 5, offset: 22033},
 									val:        "regexp_replace",
 									ignoreCase: false,
 								},
 								&ruleRefExpr{
-									pos:  position{line: 755, col: 22, offset: 22047},
+									pos:  position{line: 755, col: 22, offset: 22050},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 755, col: 25, offset: 22050},
+									pos:        position{line: 755, col: 25, offset: 22053},
 									val:        "(",
 									ignoreCase: false,
 								},
 								&ruleRefExpr{
-									pos:  position{line: 755, col: 29, offset: 22054},
+									pos:  position{line: 755, col: 29, offset: 22057},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 755, col: 32, offset: 22057},
+									pos:   position{line: 755, col: 32, offset: 22060},
 									label: "arg0",
 									expr: &ruleRefExpr{
-										pos:  position{line: 755, col: 37, offset: 22062},
+										pos:  position{line: 755, col: 37, offset: 22065},
 										name: "Expr",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 755, col: 42, offset: 22067},
+									pos:  position{line: 755, col: 42, offset: 22070},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 755, col: 45, offset: 22070},
+									pos:        position{line: 755, col: 45, offset: 22073},
 									val:        ",",
 									ignoreCase: false,
 								},
 								&ruleRefExpr{
-									pos:  position{line: 755, col: 49, offset: 22074},
+									pos:  position{line: 755, col: 49, offset: 22077},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 755, col: 52, offset: 22077},
+									pos:   position{line: 755, col: 52, offset: 22080},
 									label: "arg1Text",
 									expr: &ruleRefExpr{
-										pos:  position{line: 755, col: 61, offset: 22086},
+										pos:  position{line: 755, col: 61, offset: 22089},
 										name: "RegexpPattern",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 755, col: 75, offset: 22100},
+									pos:  position{line: 755, col: 75, offset: 22103},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 755, col: 78, offset: 22103},
+									pos:        position{line: 755, col: 78, offset: 22106},
 									val:        ",",
 									ignoreCase: false,
 								},
 								&ruleRefExpr{
-									pos:  position{line: 755, col: 82, offset: 22107},
+									pos:  position{line: 755, col: 82, offset: 22110},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 755, col: 85, offset: 22110},
+									pos:   position{line: 755, col: 85, offset: 22113},
 									label: "arg2",
 									expr: &ruleRefExpr{
-										pos:  position{line: 755, col: 90, offset: 22115},
+										pos:  position{line: 755, col: 90, offset: 22118},
 										name: "Expr",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 755, col: 95, offset: 22120},
+									pos:  position{line: 755, col: 95, offset: 22123},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 755, col: 98, offset: 22123},
+									pos:        position{line: 755, col: 98, offset: 22126},
 									val:        ")",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 755, col: 102, offset: 22127},
+									pos:   position{line: 755, col: 102, offset: 22130},
 									label: "where",
 									expr: &zeroOrOneExpr{
-										pos: position{line: 755, col: 108, offset: 22133},
+										pos: position{line: 755, col: 108, offset: 22136},
 										expr: &ruleRefExpr{
-											pos:  position{line: 755, col: 108, offset: 22133},
+											pos:  position{line: 755, col: 108, offset: 22136},
 											name: "WhereClause",
 										},
 									},
@@ -6233,63 +6233,63 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 759, col: 5, offset: 22395},
+						pos: position{line: 759, col: 5, offset: 22398},
 						run: (*parser).callonFunction44,
 						expr: &seqExpr{
-							pos: position{line: 759, col: 5, offset: 22395},
+							pos: position{line: 759, col: 5, offset: 22398},
 							exprs: []interface{}{
 								&notExpr{
-									pos: position{line: 759, col: 5, offset: 22395},
+									pos: position{line: 759, col: 5, offset: 22398},
 									expr: &ruleRefExpr{
-										pos:  position{line: 759, col: 6, offset: 22396},
+										pos:  position{line: 759, col: 6, offset: 22399},
 										name: "FuncGuard",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 759, col: 16, offset: 22406},
+									pos:   position{line: 759, col: 16, offset: 22409},
 									label: "fn",
 									expr: &ruleRefExpr{
-										pos:  position{line: 759, col: 19, offset: 22409},
+										pos:  position{line: 759, col: 19, offset: 22412},
 										name: "IdentifierName",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 759, col: 34, offset: 22424},
+									pos:  position{line: 759, col: 34, offset: 22427},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 759, col: 37, offset: 22427},
+									pos:        position{line: 759, col: 37, offset: 22430},
 									val:        "(",
 									ignoreCase: false,
 								},
 								&ruleRefExpr{
-									pos:  position{line: 759, col: 41, offset: 22431},
+									pos:  position{line: 759, col: 41, offset: 22434},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 759, col: 44, offset: 22434},
+									pos:   position{line: 759, col: 44, offset: 22437},
 									label: "args",
 									expr: &ruleRefExpr{
-										pos:  position{line: 759, col: 49, offset: 22439},
+										pos:  position{line: 759, col: 49, offset: 22442},
 										name: "FunctionArgs",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 759, col: 62, offset: 22452},
+									pos:  position{line: 759, col: 62, offset: 22455},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 759, col: 65, offset: 22455},
+									pos:        position{line: 759, col: 65, offset: 22458},
 									val:        ")",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 759, col: 69, offset: 22459},
+									pos:   position{line: 759, col: 69, offset: 22462},
 									label: "where",
 									expr: &zeroOrOneExpr{
-										pos: position{line: 759, col: 75, offset: 22465},
+										pos: position{line: 759, col: 75, offset: 22468},
 										expr: &ruleRefExpr{
-											pos:  position{line: 759, col: 75, offset: 22465},
+											pos:  position{line: 759, col: 75, offset: 22468},
 											name: "WhereClause",
 										},
 									},
@@ -6302,24 +6302,24 @@ var g = &grammar{
 		},
 		{
 			name: "FunctionArgs",
-			pos:  position{line: 763, col: 1, offset: 22586},
+			pos:  position{line: 763, col: 1, offset: 22589},
 			expr: &choiceExpr{
-				pos: position{line: 764, col: 5, offset: 22603},
+				pos: position{line: 764, col: 5, offset: 22606},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 764, col: 5, offset: 22603},
+						pos: position{line: 764, col: 5, offset: 22606},
 						run: (*parser).callonFunctionArgs2,
 						expr: &labeledExpr{
-							pos:   position{line: 764, col: 5, offset: 22603},
+							pos:   position{line: 764, col: 5, offset: 22606},
 							label: "o",
 							expr: &ruleRefExpr{
-								pos:  position{line: 764, col: 7, offset: 22605},
+								pos:  position{line: 764, col: 7, offset: 22608},
 								name: "OverExpr",
 							},
 						},
 					},
 					&ruleRefExpr{
-						pos:  position{line: 765, col: 5, offset: 22651},
+						pos:  position{line: 765, col: 5, offset: 22654},
 						name: "OptionalExprs",
 					},
 				},
@@ -6327,75 +6327,75 @@ var g = &grammar{
 		},
 		{
 			name: "Grep",
-			pos:  position{line: 767, col: 1, offset: 22666},
+			pos:  position{line: 767, col: 1, offset: 22669},
 			expr: &actionExpr{
-				pos: position{line: 768, col: 5, offset: 22675},
+				pos: position{line: 768, col: 5, offset: 22678},
 				run: (*parser).callonGrep1,
 				expr: &seqExpr{
-					pos: position{line: 768, col: 5, offset: 22675},
+					pos: position{line: 768, col: 5, offset: 22678},
 					exprs: []interface{}{
 						&litMatcher{
-							pos:        position{line: 768, col: 5, offset: 22675},
+							pos:        position{line: 768, col: 5, offset: 22678},
 							val:        "grep",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 768, col: 12, offset: 22682},
+							pos:  position{line: 768, col: 12, offset: 22685},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 768, col: 15, offset: 22685},
+							pos:        position{line: 768, col: 15, offset: 22688},
 							val:        "(",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 768, col: 19, offset: 22689},
+							pos:  position{line: 768, col: 19, offset: 22692},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 768, col: 22, offset: 22692},
+							pos:   position{line: 768, col: 22, offset: 22695},
 							label: "pattern",
 							expr: &ruleRefExpr{
-								pos:  position{line: 768, col: 30, offset: 22700},
+								pos:  position{line: 768, col: 30, offset: 22703},
 								name: "Pattern",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 768, col: 38, offset: 22708},
+							pos:  position{line: 768, col: 38, offset: 22711},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 768, col: 41, offset: 22711},
+							pos:   position{line: 768, col: 41, offset: 22714},
 							label: "opt",
 							expr: &zeroOrOneExpr{
-								pos: position{line: 768, col: 45, offset: 22715},
+								pos: position{line: 768, col: 45, offset: 22718},
 								expr: &seqExpr{
-									pos: position{line: 768, col: 46, offset: 22716},
+									pos: position{line: 768, col: 46, offset: 22719},
 									exprs: []interface{}{
 										&litMatcher{
-											pos:        position{line: 768, col: 46, offset: 22716},
+											pos:        position{line: 768, col: 46, offset: 22719},
 											val:        ",",
 											ignoreCase: false,
 										},
 										&ruleRefExpr{
-											pos:  position{line: 768, col: 50, offset: 22720},
+											pos:  position{line: 768, col: 50, offset: 22723},
 											name: "__",
 										},
 										&choiceExpr{
-											pos: position{line: 768, col: 54, offset: 22724},
+											pos: position{line: 768, col: 54, offset: 22727},
 											alternatives: []interface{}{
 												&ruleRefExpr{
-													pos:  position{line: 768, col: 54, offset: 22724},
+													pos:  position{line: 768, col: 54, offset: 22727},
 													name: "OverExpr",
 												},
 												&ruleRefExpr{
-													pos:  position{line: 768, col: 65, offset: 22735},
+													pos:  position{line: 768, col: 65, offset: 22738},
 													name: "Expr",
 												},
 											},
 										},
 										&ruleRefExpr{
-											pos:  position{line: 768, col: 71, offset: 22741},
+											pos:  position{line: 768, col: 71, offset: 22744},
 											name: "__",
 										},
 									},
@@ -6403,7 +6403,7 @@ var g = &grammar{
 							},
 						},
 						&litMatcher{
-							pos:        position{line: 768, col: 76, offset: 22746},
+							pos:        position{line: 768, col: 76, offset: 22749},
 							val:        ")",
 							ignoreCase: false,
 						},
@@ -6413,26 +6413,26 @@ var g = &grammar{
 		},
 		{
 			name: "Pattern",
-			pos:  position{line: 776, col: 1, offset: 22987},
+			pos:  position{line: 776, col: 1, offset: 22990},
 			expr: &choiceExpr{
-				pos: position{line: 777, col: 5, offset: 22999},
+				pos: position{line: 777, col: 5, offset: 23002},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 777, col: 5, offset: 22999},
+						pos:  position{line: 777, col: 5, offset: 23002},
 						name: "Regexp",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 778, col: 5, offset: 23010},
+						pos:  position{line: 778, col: 5, offset: 23013},
 						name: "Glob",
 					},
 					&actionExpr{
-						pos: position{line: 779, col: 5, offset: 23019},
+						pos: position{line: 779, col: 5, offset: 23022},
 						run: (*parser).callonPattern4,
 						expr: &labeledExpr{
-							pos:   position{line: 779, col: 5, offset: 23019},
+							pos:   position{line: 779, col: 5, offset: 23022},
 							label: "s",
 							expr: &ruleRefExpr{
-								pos:  position{line: 779, col: 7, offset: 23021},
+								pos:  position{line: 779, col: 7, offset: 23024},
 								name: "QuotedString",
 							},
 						},
@@ -6442,19 +6442,19 @@ var g = &grammar{
 		},
 		{
 			name: "OptionalExprs",
-			pos:  position{line: 783, col: 1, offset: 23113},
+			pos:  position{line: 783, col: 1, offset: 23116},
 			expr: &choiceExpr{
-				pos: position{line: 784, col: 5, offset: 23131},
+				pos: position{line: 784, col: 5, offset: 23134},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 784, col: 5, offset: 23131},
+						pos:  position{line: 784, col: 5, offset: 23134},
 						name: "Exprs",
 					},
 					&actionExpr{
-						pos: position{line: 785, col: 5, offset: 23141},
+						pos: position{line: 785, col: 5, offset: 23144},
 						run: (*parser).callonOptionalExprs3,
 						expr: &ruleRefExpr{
-							pos:  position{line: 785, col: 5, offset: 23141},
+							pos:  position{line: 785, col: 5, offset: 23144},
 							name: "__",
 						},
 					},
@@ -6463,50 +6463,50 @@ var g = &grammar{
 		},
 		{
 			name: "Exprs",
-			pos:  position{line: 787, col: 1, offset: 23177},
+			pos:  position{line: 787, col: 1, offset: 23180},
 			expr: &actionExpr{
-				pos: position{line: 788, col: 5, offset: 23187},
+				pos: position{line: 788, col: 5, offset: 23190},
 				run: (*parser).callonExprs1,
 				expr: &seqExpr{
-					pos: position{line: 788, col: 5, offset: 23187},
+					pos: position{line: 788, col: 5, offset: 23190},
 					exprs: []interface{}{
 						&labeledExpr{
-							pos:   position{line: 788, col: 5, offset: 23187},
+							pos:   position{line: 788, col: 5, offset: 23190},
 							label: "first",
 							expr: &ruleRefExpr{
-								pos:  position{line: 788, col: 11, offset: 23193},
+								pos:  position{line: 788, col: 11, offset: 23196},
 								name: "Expr",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 788, col: 16, offset: 23198},
+							pos:   position{line: 788, col: 16, offset: 23201},
 							label: "rest",
 							expr: &zeroOrMoreExpr{
-								pos: position{line: 788, col: 21, offset: 23203},
+								pos: position{line: 788, col: 21, offset: 23206},
 								expr: &actionExpr{
-									pos: position{line: 788, col: 22, offset: 23204},
+									pos: position{line: 788, col: 22, offset: 23207},
 									run: (*parser).callonExprs7,
 									expr: &seqExpr{
-										pos: position{line: 788, col: 22, offset: 23204},
+										pos: position{line: 788, col: 22, offset: 23207},
 										exprs: []interface{}{
 											&ruleRefExpr{
-												pos:  position{line: 788, col: 22, offset: 23204},
+												pos:  position{line: 788, col: 22, offset: 23207},
 												name: "__",
 											},
 											&litMatcher{
-												pos:        position{line: 788, col: 25, offset: 23207},
+												pos:        position{line: 788, col: 25, offset: 23210},
 												val:        ",",
 												ignoreCase: false,
 											},
 											&ruleRefExpr{
-												pos:  position{line: 788, col: 29, offset: 23211},
+												pos:  position{line: 788, col: 29, offset: 23214},
 												name: "__",
 											},
 											&labeledExpr{
-												pos:   position{line: 788, col: 32, offset: 23214},
+												pos:   position{line: 788, col: 32, offset: 23217},
 												label: "e",
 												expr: &ruleRefExpr{
-													pos:  position{line: 788, col: 34, offset: 23216},
+													pos:  position{line: 788, col: 34, offset: 23219},
 													name: "Expr",
 												},
 											},
@@ -6521,35 +6521,35 @@ var g = &grammar{
 		},
 		{
 			name: "DerefExpr",
-			pos:  position{line: 792, col: 1, offset: 23325},
+			pos:  position{line: 792, col: 1, offset: 23328},
 			expr: &actionExpr{
-				pos: position{line: 793, col: 5, offset: 23339},
+				pos: position{line: 793, col: 5, offset: 23342},
 				run: (*parser).callonDerefExpr1,
 				expr: &seqExpr{
-					pos: position{line: 793, col: 5, offset: 23339},
+					pos: position{line: 793, col: 5, offset: 23342},
 					exprs: []interface{}{
 						&notExpr{
-							pos: position{line: 793, col: 5, offset: 23339},
+							pos: position{line: 793, col: 5, offset: 23342},
 							expr: &ruleRefExpr{
-								pos:  position{line: 793, col: 6, offset: 23340},
+								pos:  position{line: 793, col: 6, offset: 23343},
 								name: "IP6",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 793, col: 10, offset: 23344},
+							pos:   position{line: 793, col: 10, offset: 23347},
 							label: "first",
 							expr: &ruleRefExpr{
-								pos:  position{line: 793, col: 16, offset: 23350},
+								pos:  position{line: 793, col: 16, offset: 23353},
 								name: "Identifier",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 793, col: 27, offset: 23361},
+							pos:   position{line: 793, col: 27, offset: 23364},
 							label: "rest",
 							expr: &zeroOrMoreExpr{
-								pos: position{line: 793, col: 32, offset: 23366},
+								pos: position{line: 793, col: 32, offset: 23369},
 								expr: &ruleRefExpr{
-									pos:  position{line: 793, col: 33, offset: 23367},
+									pos:  position{line: 793, col: 33, offset: 23370},
 									name: "Deref",
 								},
 							},
@@ -6560,55 +6560,55 @@ var g = &grammar{
 		},
 		{
 			name: "Deref",
-			pos:  position{line: 797, col: 1, offset: 23435},
+			pos:  position{line: 797, col: 1, offset: 23438},
 			expr: &choiceExpr{
-				pos: position{line: 798, col: 5, offset: 23445},
+				pos: position{line: 798, col: 5, offset: 23448},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 798, col: 5, offset: 23445},
+						pos: position{line: 798, col: 5, offset: 23448},
 						run: (*parser).callonDeref2,
 						expr: &seqExpr{
-							pos: position{line: 798, col: 5, offset: 23445},
+							pos: position{line: 798, col: 5, offset: 23448},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 798, col: 5, offset: 23445},
+									pos:        position{line: 798, col: 5, offset: 23448},
 									val:        "[",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 798, col: 9, offset: 23449},
+									pos:   position{line: 798, col: 9, offset: 23452},
 									label: "from",
 									expr: &ruleRefExpr{
-										pos:  position{line: 798, col: 14, offset: 23454},
+										pos:  position{line: 798, col: 14, offset: 23457},
 										name: "AdditiveExpr",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 798, col: 27, offset: 23467},
+									pos:  position{line: 798, col: 27, offset: 23470},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 798, col: 30, offset: 23470},
+									pos:        position{line: 798, col: 30, offset: 23473},
 									val:        ":",
 									ignoreCase: false,
 								},
 								&ruleRefExpr{
-									pos:  position{line: 798, col: 34, offset: 23474},
+									pos:  position{line: 798, col: 34, offset: 23477},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 798, col: 37, offset: 23477},
+									pos:   position{line: 798, col: 37, offset: 23480},
 									label: "to",
 									expr: &zeroOrOneExpr{
-										pos: position{line: 798, col: 40, offset: 23480},
+										pos: position{line: 798, col: 40, offset: 23483},
 										expr: &ruleRefExpr{
-											pos:  position{line: 798, col: 40, offset: 23480},
+											pos:  position{line: 798, col: 40, offset: 23483},
 											name: "AdditiveExpr",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 798, col: 54, offset: 23494},
+									pos:        position{line: 798, col: 54, offset: 23497},
 									val:        "]",
 									ignoreCase: false,
 								},
@@ -6616,39 +6616,39 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 804, col: 5, offset: 23668},
+						pos: position{line: 804, col: 5, offset: 23671},
 						run: (*parser).callonDeref14,
 						expr: &seqExpr{
-							pos: position{line: 804, col: 5, offset: 23668},
+							pos: position{line: 804, col: 5, offset: 23671},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 804, col: 5, offset: 23668},
+									pos:        position{line: 804, col: 5, offset: 23671},
 									val:        "[",
 									ignoreCase: false,
 								},
 								&ruleRefExpr{
-									pos:  position{line: 804, col: 9, offset: 23672},
+									pos:  position{line: 804, col: 9, offset: 23675},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 804, col: 12, offset: 23675},
+									pos:        position{line: 804, col: 12, offset: 23678},
 									val:        ":",
 									ignoreCase: false,
 								},
 								&ruleRefExpr{
-									pos:  position{line: 804, col: 16, offset: 23679},
+									pos:  position{line: 804, col: 16, offset: 23682},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 804, col: 19, offset: 23682},
+									pos:   position{line: 804, col: 19, offset: 23685},
 									label: "to",
 									expr: &ruleRefExpr{
-										pos:  position{line: 804, col: 22, offset: 23685},
+										pos:  position{line: 804, col: 22, offset: 23688},
 										name: "AdditiveExpr",
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 804, col: 35, offset: 23698},
+									pos:        position{line: 804, col: 35, offset: 23701},
 									val:        "]",
 									ignoreCase: false,
 								},
@@ -6656,26 +6656,26 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 810, col: 5, offset: 23871},
+						pos: position{line: 810, col: 5, offset: 23874},
 						run: (*parser).callonDeref23,
 						expr: &seqExpr{
-							pos: position{line: 810, col: 5, offset: 23871},
+							pos: position{line: 810, col: 5, offset: 23874},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 810, col: 5, offset: 23871},
+									pos:        position{line: 810, col: 5, offset: 23874},
 									val:        "[",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 810, col: 9, offset: 23875},
+									pos:   position{line: 810, col: 9, offset: 23878},
 									label: "expr",
 									expr: &ruleRefExpr{
-										pos:  position{line: 810, col: 14, offset: 23880},
+										pos:  position{line: 810, col: 14, offset: 23883},
 										name: "Expr",
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 810, col: 19, offset: 23885},
+									pos:        position{line: 810, col: 19, offset: 23888},
 									val:        "]",
 									ignoreCase: false,
 								},
@@ -6683,21 +6683,21 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 811, col: 5, offset: 23934},
+						pos: position{line: 811, col: 5, offset: 23937},
 						run: (*parser).callonDeref29,
 						expr: &seqExpr{
-							pos: position{line: 811, col: 5, offset: 23934},
+							pos: position{line: 811, col: 5, offset: 23937},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 811, col: 5, offset: 23934},
+									pos:        position{line: 811, col: 5, offset: 23937},
 									val:        ".",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 811, col: 9, offset: 23938},
+									pos:   position{line: 811, col: 9, offset: 23941},
 									label: "id",
 									expr: &ruleRefExpr{
-										pos:  position{line: 811, col: 12, offset: 23941},
+										pos:  position{line: 811, col: 12, offset: 23944},
 										name: "Identifier",
 									},
 								},
@@ -6709,59 +6709,59 @@ var g = &grammar{
 		},
 		{
 			name: "Primary",
-			pos:  position{line: 813, col: 1, offset: 23992},
+			pos:  position{line: 813, col: 1, offset: 23995},
 			expr: &choiceExpr{
-				pos: position{line: 814, col: 5, offset: 24004},
+				pos: position{line: 814, col: 5, offset: 24007},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 814, col: 5, offset: 24004},
+						pos:  position{line: 814, col: 5, offset: 24007},
 						name: "Record",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 815, col: 5, offset: 24015},
+						pos:  position{line: 815, col: 5, offset: 24018},
 						name: "Array",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 816, col: 5, offset: 24025},
+						pos:  position{line: 816, col: 5, offset: 24028},
 						name: "Set",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 817, col: 5, offset: 24033},
+						pos:  position{line: 817, col: 5, offset: 24036},
 						name: "Map",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 818, col: 5, offset: 24041},
+						pos:  position{line: 818, col: 5, offset: 24044},
 						name: "Literal",
 					},
 					&actionExpr{
-						pos: position{line: 819, col: 5, offset: 24053},
+						pos: position{line: 819, col: 5, offset: 24056},
 						run: (*parser).callonPrimary7,
 						expr: &seqExpr{
-							pos: position{line: 819, col: 5, offset: 24053},
+							pos: position{line: 819, col: 5, offset: 24056},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 819, col: 5, offset: 24053},
+									pos:        position{line: 819, col: 5, offset: 24056},
 									val:        "(",
 									ignoreCase: false,
 								},
 								&ruleRefExpr{
-									pos:  position{line: 819, col: 9, offset: 24057},
+									pos:  position{line: 819, col: 9, offset: 24060},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 819, col: 12, offset: 24060},
+									pos:   position{line: 819, col: 12, offset: 24063},
 									label: "expr",
 									expr: &ruleRefExpr{
-										pos:  position{line: 819, col: 17, offset: 24065},
+										pos:  position{line: 819, col: 17, offset: 24068},
 										name: "OverExpr",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 819, col: 26, offset: 24074},
+									pos:  position{line: 819, col: 26, offset: 24077},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 819, col: 29, offset: 24077},
+									pos:        position{line: 819, col: 29, offset: 24080},
 									val:        ")",
 									ignoreCase: false,
 								},
@@ -6769,34 +6769,34 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 820, col: 5, offset: 24106},
+						pos: position{line: 820, col: 5, offset: 24109},
 						run: (*parser).callonPrimary15,
 						expr: &seqExpr{
-							pos: position{line: 820, col: 5, offset: 24106},
+							pos: position{line: 820, col: 5, offset: 24109},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 820, col: 5, offset: 24106},
+									pos:        position{line: 820, col: 5, offset: 24109},
 									val:        "(",
 									ignoreCase: false,
 								},
 								&ruleRefExpr{
-									pos:  position{line: 820, col: 9, offset: 24110},
+									pos:  position{line: 820, col: 9, offset: 24113},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 820, col: 12, offset: 24113},
+									pos:   position{line: 820, col: 12, offset: 24116},
 									label: "expr",
 									expr: &ruleRefExpr{
-										pos:  position{line: 820, col: 17, offset: 24118},
+										pos:  position{line: 820, col: 17, offset: 24121},
 										name: "Expr",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 820, col: 22, offset: 24123},
+									pos:  position{line: 820, col: 22, offset: 24126},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 820, col: 25, offset: 24126},
+									pos:        position{line: 820, col: 25, offset: 24129},
 									val:        ")",
 									ignoreCase: false,
 								},
@@ -6808,59 +6808,59 @@ var g = &grammar{
 		},
 		{
 			name: "OverExpr",
-			pos:  position{line: 822, col: 1, offset: 24152},
+			pos:  position{line: 822, col: 1, offset: 24155},
 			expr: &actionExpr{
-				pos: position{line: 823, col: 5, offset: 24165},
+				pos: position{line: 823, col: 5, offset: 24168},
 				run: (*parser).callonOverExpr1,
 				expr: &seqExpr{
-					pos: position{line: 823, col: 5, offset: 24165},
+					pos: position{line: 823, col: 5, offset: 24168},
 					exprs: []interface{}{
 						&litMatcher{
-							pos:        position{line: 823, col: 5, offset: 24165},
+							pos:        position{line: 823, col: 5, offset: 24168},
 							val:        "over",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 823, col: 12, offset: 24172},
+							pos:  position{line: 823, col: 12, offset: 24175},
 							name: "_",
 						},
 						&labeledExpr{
-							pos:   position{line: 823, col: 14, offset: 24174},
+							pos:   position{line: 823, col: 14, offset: 24177},
 							label: "exprs",
 							expr: &ruleRefExpr{
-								pos:  position{line: 823, col: 20, offset: 24180},
+								pos:  position{line: 823, col: 20, offset: 24183},
 								name: "Exprs",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 823, col: 26, offset: 24186},
+							pos:   position{line: 823, col: 26, offset: 24189},
 							label: "locals",
 							expr: &zeroOrOneExpr{
-								pos: position{line: 823, col: 33, offset: 24193},
+								pos: position{line: 823, col: 33, offset: 24196},
 								expr: &ruleRefExpr{
-									pos:  position{line: 823, col: 33, offset: 24193},
+									pos:  position{line: 823, col: 33, offset: 24196},
 									name: "Locals",
 								},
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 823, col: 41, offset: 24201},
+							pos:  position{line: 823, col: 41, offset: 24204},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 823, col: 44, offset: 24204},
+							pos:        position{line: 823, col: 44, offset: 24207},
 							val:        "|",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 823, col: 48, offset: 24208},
+							pos:  position{line: 823, col: 48, offset: 24211},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 823, col: 51, offset: 24211},
+							pos:   position{line: 823, col: 51, offset: 24214},
 							label: "body",
 							expr: &ruleRefExpr{
-								pos:  position{line: 823, col: 56, offset: 24216},
+								pos:  position{line: 823, col: 56, offset: 24219},
 								name: "Seq",
 							},
 						},
@@ -6870,36 +6870,36 @@ var g = &grammar{
 		},
 		{
 			name: "Record",
-			pos:  position{line: 827, col: 1, offset: 24338},
+			pos:  position{line: 827, col: 1, offset: 24341},
 			expr: &actionExpr{
-				pos: position{line: 828, col: 5, offset: 24349},
+				pos: position{line: 828, col: 5, offset: 24352},
 				run: (*parser).callonRecord1,
 				expr: &seqExpr{
-					pos: position{line: 828, col: 5, offset: 24349},
+					pos: position{line: 828, col: 5, offset: 24352},
 					exprs: []interface{}{
 						&litMatcher{
-							pos:        position{line: 828, col: 5, offset: 24349},
+							pos:        position{line: 828, col: 5, offset: 24352},
 							val:        "{",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 828, col: 9, offset: 24353},
+							pos:  position{line: 828, col: 9, offset: 24356},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 828, col: 12, offset: 24356},
+							pos:   position{line: 828, col: 12, offset: 24359},
 							label: "elems",
 							expr: &ruleRefExpr{
-								pos:  position{line: 828, col: 18, offset: 24362},
+								pos:  position{line: 828, col: 18, offset: 24365},
 								name: "RecordElems",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 828, col: 30, offset: 24374},
+							pos:  position{line: 828, col: 30, offset: 24377},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 828, col: 33, offset: 24377},
+							pos:        position{line: 828, col: 33, offset: 24380},
 							val:        "}",
 							ignoreCase: false,
 						},
@@ -6909,31 +6909,31 @@ var g = &grammar{
 		},
 		{
 			name: "RecordElems",
-			pos:  position{line: 832, col: 1, offset: 24469},
+			pos:  position{line: 832, col: 1, offset: 24472},
 			expr: &choiceExpr{
-				pos: position{line: 833, col: 5, offset: 24485},
+				pos: position{line: 833, col: 5, offset: 24488},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 833, col: 5, offset: 24485},
+						pos: position{line: 833, col: 5, offset: 24488},
 						run: (*parser).callonRecordElems2,
 						expr: &seqExpr{
-							pos: position{line: 833, col: 5, offset: 24485},
+							pos: position{line: 833, col: 5, offset: 24488},
 							exprs: []interface{}{
 								&labeledExpr{
-									pos:   position{line: 833, col: 5, offset: 24485},
+									pos:   position{line: 833, col: 5, offset: 24488},
 									label: "first",
 									expr: &ruleRefExpr{
-										pos:  position{line: 833, col: 11, offset: 24491},
+										pos:  position{line: 833, col: 11, offset: 24494},
 										name: "RecordElem",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 833, col: 22, offset: 24502},
+									pos:   position{line: 833, col: 22, offset: 24505},
 									label: "rest",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 833, col: 27, offset: 24507},
+										pos: position{line: 833, col: 27, offset: 24510},
 										expr: &ruleRefExpr{
-											pos:  position{line: 833, col: 27, offset: 24507},
+											pos:  position{line: 833, col: 27, offset: 24510},
 											name: "RecordElemTail",
 										},
 									},
@@ -6942,10 +6942,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 836, col: 5, offset: 24606},
+						pos: position{line: 836, col: 5, offset: 24609},
 						run: (*parser).callonRecordElems9,
 						expr: &ruleRefExpr{
-							pos:  position{line: 836, col: 5, offset: 24606},
+							pos:  position{line: 836, col: 5, offset: 24609},
 							name: "__",
 						},
 					},
@@ -6954,31 +6954,31 @@ var g = &grammar{
 		},
 		{
 			name: "RecordElemTail",
-			pos:  position{line: 838, col: 1, offset: 24642},
+			pos:  position{line: 838, col: 1, offset: 24645},
 			expr: &actionExpr{
-				pos: position{line: 838, col: 18, offset: 24659},
+				pos: position{line: 838, col: 18, offset: 24662},
 				run: (*parser).callonRecordElemTail1,
 				expr: &seqExpr{
-					pos: position{line: 838, col: 18, offset: 24659},
+					pos: position{line: 838, col: 18, offset: 24662},
 					exprs: []interface{}{
 						&ruleRefExpr{
-							pos:  position{line: 838, col: 18, offset: 24659},
+							pos:  position{line: 838, col: 18, offset: 24662},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 838, col: 21, offset: 24662},
+							pos:        position{line: 838, col: 21, offset: 24665},
 							val:        ",",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 838, col: 25, offset: 24666},
+							pos:  position{line: 838, col: 25, offset: 24669},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 838, col: 28, offset: 24669},
+							pos:   position{line: 838, col: 28, offset: 24672},
 							label: "elem",
 							expr: &ruleRefExpr{
-								pos:  position{line: 838, col: 33, offset: 24674},
+								pos:  position{line: 838, col: 33, offset: 24677},
 								name: "RecordElem",
 							},
 						},
@@ -6988,20 +6988,20 @@ var g = &grammar{
 		},
 		{
 			name: "RecordElem",
-			pos:  position{line: 840, col: 1, offset: 24707},
+			pos:  position{line: 840, col: 1, offset: 24710},
 			expr: &choiceExpr{
-				pos: position{line: 841, col: 5, offset: 24722},
+				pos: position{line: 841, col: 5, offset: 24725},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 841, col: 5, offset: 24722},
+						pos:  position{line: 841, col: 5, offset: 24725},
 						name: "Spread",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 842, col: 5, offset: 24733},
+						pos:  position{line: 842, col: 5, offset: 24736},
 						name: "Field",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 843, col: 5, offset: 24743},
+						pos:  position{line: 843, col: 5, offset: 24746},
 						name: "Identifier",
 					},
 				},
@@ -7009,27 +7009,27 @@ var g = &grammar{
 		},
 		{
 			name: "Spread",
-			pos:  position{line: 845, col: 1, offset: 24755},
+			pos:  position{line: 845, col: 1, offset: 24758},
 			expr: &actionExpr{
-				pos: position{line: 846, col: 5, offset: 24766},
+				pos: position{line: 846, col: 5, offset: 24769},
 				run: (*parser).callonSpread1,
 				expr: &seqExpr{
-					pos: position{line: 846, col: 5, offset: 24766},
+					pos: position{line: 846, col: 5, offset: 24769},
 					exprs: []interface{}{
 						&litMatcher{
-							pos:        position{line: 846, col: 5, offset: 24766},
+							pos:        position{line: 846, col: 5, offset: 24769},
 							val:        "...",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 846, col: 11, offset: 24772},
+							pos:  position{line: 846, col: 11, offset: 24775},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 846, col: 14, offset: 24775},
+							pos:   position{line: 846, col: 14, offset: 24778},
 							label: "expr",
 							expr: &ruleRefExpr{
-								pos:  position{line: 846, col: 19, offset: 24780},
+								pos:  position{line: 846, col: 19, offset: 24783},
 								name: "Expr",
 							},
 						},
@@ -7039,39 +7039,39 @@ var g = &grammar{
 		},
 		{
 			name: "Field",
-			pos:  position{line: 850, col: 1, offset: 24867},
+			pos:  position{line: 850, col: 1, offset: 24870},
 			expr: &actionExpr{
-				pos: position{line: 851, col: 5, offset: 24877},
+				pos: position{line: 851, col: 5, offset: 24880},
 				run: (*parser).callonField1,
 				expr: &seqExpr{
-					pos: position{line: 851, col: 5, offset: 24877},
+					pos: position{line: 851, col: 5, offset: 24880},
 					exprs: []interface{}{
 						&labeledExpr{
-							pos:   position{line: 851, col: 5, offset: 24877},
+							pos:   position{line: 851, col: 5, offset: 24880},
 							label: "name",
 							expr: &ruleRefExpr{
-								pos:  position{line: 851, col: 10, offset: 24882},
+								pos:  position{line: 851, col: 10, offset: 24885},
 								name: "FieldName",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 851, col: 20, offset: 24892},
+							pos:  position{line: 851, col: 20, offset: 24895},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 851, col: 23, offset: 24895},
+							pos:        position{line: 851, col: 23, offset: 24898},
 							val:        ":",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 851, col: 27, offset: 24899},
+							pos:  position{line: 851, col: 27, offset: 24902},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 851, col: 30, offset: 24902},
+							pos:   position{line: 851, col: 30, offset: 24905},
 							label: "value",
 							expr: &ruleRefExpr{
-								pos:  position{line: 851, col: 36, offset: 24908},
+								pos:  position{line: 851, col: 36, offset: 24911},
 								name: "Expr",
 							},
 						},
@@ -7081,36 +7081,36 @@ var g = &grammar{
 		},
 		{
 			name: "Array",
-			pos:  position{line: 855, col: 1, offset: 25010},
+			pos:  position{line: 855, col: 1, offset: 25013},
 			expr: &actionExpr{
-				pos: position{line: 856, col: 5, offset: 25020},
+				pos: position{line: 856, col: 5, offset: 25023},
 				run: (*parser).callonArray1,
 				expr: &seqExpr{
-					pos: position{line: 856, col: 5, offset: 25020},
+					pos: position{line: 856, col: 5, offset: 25023},
 					exprs: []interface{}{
 						&litMatcher{
-							pos:        position{line: 856, col: 5, offset: 25020},
+							pos:        position{line: 856, col: 5, offset: 25023},
 							val:        "[",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 856, col: 9, offset: 25024},
+							pos:  position{line: 856, col: 9, offset: 25027},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 856, col: 12, offset: 25027},
+							pos:   position{line: 856, col: 12, offset: 25030},
 							label: "elems",
 							expr: &ruleRefExpr{
-								pos:  position{line: 856, col: 18, offset: 25033},
+								pos:  position{line: 856, col: 18, offset: 25036},
 								name: "VectorElems",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 856, col: 30, offset: 25045},
+							pos:  position{line: 856, col: 30, offset: 25048},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 856, col: 33, offset: 25048},
+							pos:        position{line: 856, col: 33, offset: 25051},
 							val:        "]",
 							ignoreCase: false,
 						},
@@ -7120,36 +7120,36 @@ var g = &grammar{
 		},
 		{
 			name: "Set",
-			pos:  position{line: 860, col: 1, offset: 25139},
+			pos:  position{line: 860, col: 1, offset: 25142},
 			expr: &actionExpr{
-				pos: position{line: 861, col: 5, offset: 25147},
+				pos: position{line: 861, col: 5, offset: 25150},
 				run: (*parser).callonSet1,
 				expr: &seqExpr{
-					pos: position{line: 861, col: 5, offset: 25147},
+					pos: position{line: 861, col: 5, offset: 25150},
 					exprs: []interface{}{
 						&litMatcher{
-							pos:        position{line: 861, col: 5, offset: 25147},
+							pos:        position{line: 861, col: 5, offset: 25150},
 							val:        "|[",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 861, col: 10, offset: 25152},
+							pos:  position{line: 861, col: 10, offset: 25155},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 861, col: 13, offset: 25155},
+							pos:   position{line: 861, col: 13, offset: 25158},
 							label: "elems",
 							expr: &ruleRefExpr{
-								pos:  position{line: 861, col: 19, offset: 25161},
+								pos:  position{line: 861, col: 19, offset: 25164},
 								name: "VectorElems",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 861, col: 31, offset: 25173},
+							pos:  position{line: 861, col: 31, offset: 25176},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 861, col: 34, offset: 25176},
+							pos:        position{line: 861, col: 34, offset: 25179},
 							val:        "]|",
 							ignoreCase: false,
 						},
@@ -7159,53 +7159,53 @@ var g = &grammar{
 		},
 		{
 			name: "VectorElems",
-			pos:  position{line: 865, col: 1, offset: 25266},
+			pos:  position{line: 865, col: 1, offset: 25269},
 			expr: &choiceExpr{
-				pos: position{line: 866, col: 5, offset: 25282},
+				pos: position{line: 866, col: 5, offset: 25285},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 866, col: 5, offset: 25282},
+						pos: position{line: 866, col: 5, offset: 25285},
 						run: (*parser).callonVectorElems2,
 						expr: &seqExpr{
-							pos: position{line: 866, col: 5, offset: 25282},
+							pos: position{line: 866, col: 5, offset: 25285},
 							exprs: []interface{}{
 								&labeledExpr{
-									pos:   position{line: 866, col: 5, offset: 25282},
+									pos:   position{line: 866, col: 5, offset: 25285},
 									label: "first",
 									expr: &ruleRefExpr{
-										pos:  position{line: 866, col: 11, offset: 25288},
+										pos:  position{line: 866, col: 11, offset: 25291},
 										name: "VectorElem",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 866, col: 22, offset: 25299},
+									pos:   position{line: 866, col: 22, offset: 25302},
 									label: "rest",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 866, col: 27, offset: 25304},
+										pos: position{line: 866, col: 27, offset: 25307},
 										expr: &actionExpr{
-											pos: position{line: 866, col: 28, offset: 25305},
+											pos: position{line: 866, col: 28, offset: 25308},
 											run: (*parser).callonVectorElems8,
 											expr: &seqExpr{
-												pos: position{line: 866, col: 28, offset: 25305},
+												pos: position{line: 866, col: 28, offset: 25308},
 												exprs: []interface{}{
 													&ruleRefExpr{
-														pos:  position{line: 866, col: 28, offset: 25305},
+														pos:  position{line: 866, col: 28, offset: 25308},
 														name: "__",
 													},
 													&litMatcher{
-														pos:        position{line: 866, col: 31, offset: 25308},
+														pos:        position{line: 866, col: 31, offset: 25311},
 														val:        ",",
 														ignoreCase: false,
 													},
 													&ruleRefExpr{
-														pos:  position{line: 866, col: 35, offset: 25312},
+														pos:  position{line: 866, col: 35, offset: 25315},
 														name: "__",
 													},
 													&labeledExpr{
-														pos:   position{line: 866, col: 38, offset: 25315},
+														pos:   position{line: 866, col: 38, offset: 25318},
 														label: "e",
 														expr: &ruleRefExpr{
-															pos:  position{line: 866, col: 40, offset: 25317},
+															pos:  position{line: 866, col: 40, offset: 25320},
 															name: "VectorElem",
 														},
 													},
@@ -7218,10 +7218,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 869, col: 5, offset: 25435},
+						pos: position{line: 869, col: 5, offset: 25438},
 						run: (*parser).callonVectorElems15,
 						expr: &ruleRefExpr{
-							pos:  position{line: 869, col: 5, offset: 25435},
+							pos:  position{line: 869, col: 5, offset: 25438},
 							name: "__",
 						},
 					},
@@ -7230,22 +7230,22 @@ var g = &grammar{
 		},
 		{
 			name: "VectorElem",
-			pos:  position{line: 871, col: 1, offset: 25471},
+			pos:  position{line: 871, col: 1, offset: 25474},
 			expr: &choiceExpr{
-				pos: position{line: 872, col: 5, offset: 25486},
+				pos: position{line: 872, col: 5, offset: 25489},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 872, col: 5, offset: 25486},
+						pos:  position{line: 872, col: 5, offset: 25489},
 						name: "Spread",
 					},
 					&actionExpr{
-						pos: position{line: 873, col: 5, offset: 25497},
+						pos: position{line: 873, col: 5, offset: 25500},
 						run: (*parser).callonVectorElem3,
 						expr: &labeledExpr{
-							pos:   position{line: 873, col: 5, offset: 25497},
+							pos:   position{line: 873, col: 5, offset: 25500},
 							label: "e",
 							expr: &ruleRefExpr{
-								pos:  position{line: 873, col: 7, offset: 25499},
+								pos:  position{line: 873, col: 7, offset: 25502},
 								name: "Expr",
 							},
 						},
@@ -7255,36 +7255,36 @@ var g = &grammar{
 		},
 		{
 			name: "Map",
-			pos:  position{line: 875, col: 1, offset: 25578},
+			pos:  position{line: 875, col: 1, offset: 25581},
 			expr: &actionExpr{
-				pos: position{line: 876, col: 5, offset: 25586},
+				pos: position{line: 876, col: 5, offset: 25589},
 				run: (*parser).callonMap1,
 				expr: &seqExpr{
-					pos: position{line: 876, col: 5, offset: 25586},
+					pos: position{line: 876, col: 5, offset: 25589},
 					exprs: []interface{}{
 						&litMatcher{
-							pos:        position{line: 876, col: 5, offset: 25586},
+							pos:        position{line: 876, col: 5, offset: 25589},
 							val:        "|{",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 876, col: 10, offset: 25591},
+							pos:  position{line: 876, col: 10, offset: 25594},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 876, col: 13, offset: 25594},
+							pos:   position{line: 876, col: 13, offset: 25597},
 							label: "exprs",
 							expr: &ruleRefExpr{
-								pos:  position{line: 876, col: 19, offset: 25600},
+								pos:  position{line: 876, col: 19, offset: 25603},
 								name: "Entries",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 876, col: 27, offset: 25608},
+							pos:  position{line: 876, col: 27, offset: 25611},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 876, col: 30, offset: 25611},
+							pos:        position{line: 876, col: 30, offset: 25614},
 							val:        "}|",
 							ignoreCase: false,
 						},
@@ -7294,31 +7294,31 @@ var g = &grammar{
 		},
 		{
 			name: "Entries",
-			pos:  position{line: 880, col: 1, offset: 25703},
+			pos:  position{line: 880, col: 1, offset: 25706},
 			expr: &choiceExpr{
-				pos: position{line: 881, col: 5, offset: 25715},
+				pos: position{line: 881, col: 5, offset: 25718},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 881, col: 5, offset: 25715},
+						pos: position{line: 881, col: 5, offset: 25718},
 						run: (*parser).callonEntries2,
 						expr: &seqExpr{
-							pos: position{line: 881, col: 5, offset: 25715},
+							pos: position{line: 881, col: 5, offset: 25718},
 							exprs: []interface{}{
 								&labeledExpr{
-									pos:   position{line: 881, col: 5, offset: 25715},
+									pos:   position{line: 881, col: 5, offset: 25718},
 									label: "first",
 									expr: &ruleRefExpr{
-										pos:  position{line: 881, col: 11, offset: 25721},
+										pos:  position{line: 881, col: 11, offset: 25724},
 										name: "Entry",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 881, col: 17, offset: 25727},
+									pos:   position{line: 881, col: 17, offset: 25730},
 									label: "rest",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 881, col: 22, offset: 25732},
+										pos: position{line: 881, col: 22, offset: 25735},
 										expr: &ruleRefExpr{
-											pos:  position{line: 881, col: 22, offset: 25732},
+											pos:  position{line: 881, col: 22, offset: 25735},
 											name: "EntryTail",
 										},
 									},
@@ -7327,10 +7327,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 884, col: 5, offset: 25826},
+						pos: position{line: 884, col: 5, offset: 25829},
 						run: (*parser).callonEntries9,
 						expr: &ruleRefExpr{
-							pos:  position{line: 884, col: 5, offset: 25826},
+							pos:  position{line: 884, col: 5, offset: 25829},
 							name: "__",
 						},
 					},
@@ -7339,31 +7339,31 @@ var g = &grammar{
 		},
 		{
 			name: "EntryTail",
-			pos:  position{line: 887, col: 1, offset: 25863},
+			pos:  position{line: 887, col: 1, offset: 25866},
 			expr: &actionExpr{
-				pos: position{line: 887, col: 13, offset: 25875},
+				pos: position{line: 887, col: 13, offset: 25878},
 				run: (*parser).callonEntryTail1,
 				expr: &seqExpr{
-					pos: position{line: 887, col: 13, offset: 25875},
+					pos: position{line: 887, col: 13, offset: 25878},
 					exprs: []interface{}{
 						&ruleRefExpr{
-							pos:  position{line: 887, col: 13, offset: 25875},
+							pos:  position{line: 887, col: 13, offset: 25878},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 887, col: 16, offset: 25878},
+							pos:        position{line: 887, col: 16, offset: 25881},
 							val:        ",",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 887, col: 20, offset: 25882},
+							pos:  position{line: 887, col: 20, offset: 25885},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 887, col: 23, offset: 25885},
+							pos:   position{line: 887, col: 23, offset: 25888},
 							label: "e",
 							expr: &ruleRefExpr{
-								pos:  position{line: 887, col: 25, offset: 25887},
+								pos:  position{line: 887, col: 25, offset: 25890},
 								name: "Entry",
 							},
 						},
@@ -7373,39 +7373,39 @@ var g = &grammar{
 		},
 		{
 			name: "Entry",
-			pos:  position{line: 889, col: 1, offset: 25912},
+			pos:  position{line: 889, col: 1, offset: 25915},
 			expr: &actionExpr{
-				pos: position{line: 890, col: 5, offset: 25922},
+				pos: position{line: 890, col: 5, offset: 25925},
 				run: (*parser).callonEntry1,
 				expr: &seqExpr{
-					pos: position{line: 890, col: 5, offset: 25922},
+					pos: position{line: 890, col: 5, offset: 25925},
 					exprs: []interface{}{
 						&labeledExpr{
-							pos:   position{line: 890, col: 5, offset: 25922},
+							pos:   position{line: 890, col: 5, offset: 25925},
 							label: "key",
 							expr: &ruleRefExpr{
-								pos:  position{line: 890, col: 9, offset: 25926},
+								pos:  position{line: 890, col: 9, offset: 25929},
 								name: "Expr",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 890, col: 14, offset: 25931},
+							pos:  position{line: 890, col: 14, offset: 25934},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 890, col: 17, offset: 25934},
+							pos:        position{line: 890, col: 17, offset: 25937},
 							val:        ":",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 890, col: 21, offset: 25938},
+							pos:  position{line: 890, col: 21, offset: 25941},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 890, col: 24, offset: 25941},
+							pos:   position{line: 890, col: 24, offset: 25944},
 							label: "value",
 							expr: &ruleRefExpr{
-								pos:  position{line: 890, col: 30, offset: 25947},
+								pos:  position{line: 890, col: 30, offset: 25950},
 								name: "Expr",
 							},
 						},
@@ -7415,92 +7415,92 @@ var g = &grammar{
 		},
 		{
 			name: "SQLOp",
-			pos:  position{line: 896, col: 1, offset: 26054},
+			pos:  position{line: 896, col: 1, offset: 26057},
 			expr: &actionExpr{
-				pos: position{line: 897, col: 5, offset: 26064},
+				pos: position{line: 897, col: 5, offset: 26067},
 				run: (*parser).callonSQLOp1,
 				expr: &seqExpr{
-					pos: position{line: 897, col: 5, offset: 26064},
+					pos: position{line: 897, col: 5, offset: 26067},
 					exprs: []interface{}{
 						&labeledExpr{
-							pos:   position{line: 897, col: 5, offset: 26064},
+							pos:   position{line: 897, col: 5, offset: 26067},
 							label: "selection",
 							expr: &ruleRefExpr{
-								pos:  position{line: 897, col: 15, offset: 26074},
+								pos:  position{line: 897, col: 15, offset: 26077},
 								name: "SQLSelect",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 898, col: 5, offset: 26088},
+							pos:   position{line: 898, col: 5, offset: 26091},
 							label: "from",
 							expr: &zeroOrOneExpr{
-								pos: position{line: 898, col: 10, offset: 26093},
+								pos: position{line: 898, col: 10, offset: 26096},
 								expr: &ruleRefExpr{
-									pos:  position{line: 898, col: 10, offset: 26093},
+									pos:  position{line: 898, col: 10, offset: 26096},
 									name: "SQLFrom",
 								},
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 899, col: 5, offset: 26106},
+							pos:   position{line: 899, col: 5, offset: 26109},
 							label: "joins",
 							expr: &zeroOrOneExpr{
-								pos: position{line: 899, col: 11, offset: 26112},
+								pos: position{line: 899, col: 11, offset: 26115},
 								expr: &ruleRefExpr{
-									pos:  position{line: 899, col: 11, offset: 26112},
+									pos:  position{line: 899, col: 11, offset: 26115},
 									name: "SQLJoins",
 								},
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 900, col: 5, offset: 26126},
+							pos:   position{line: 900, col: 5, offset: 26129},
 							label: "where",
 							expr: &zeroOrOneExpr{
-								pos: position{line: 900, col: 11, offset: 26132},
+								pos: position{line: 900, col: 11, offset: 26135},
 								expr: &ruleRefExpr{
-									pos:  position{line: 900, col: 11, offset: 26132},
+									pos:  position{line: 900, col: 11, offset: 26135},
 									name: "SQLWhere",
 								},
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 901, col: 5, offset: 26146},
+							pos:   position{line: 901, col: 5, offset: 26149},
 							label: "groupby",
 							expr: &zeroOrOneExpr{
-								pos: position{line: 901, col: 13, offset: 26154},
+								pos: position{line: 901, col: 13, offset: 26157},
 								expr: &ruleRefExpr{
-									pos:  position{line: 901, col: 13, offset: 26154},
+									pos:  position{line: 901, col: 13, offset: 26157},
 									name: "SQLGroupBy",
 								},
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 902, col: 5, offset: 26170},
+							pos:   position{line: 902, col: 5, offset: 26173},
 							label: "having",
 							expr: &zeroOrOneExpr{
-								pos: position{line: 902, col: 12, offset: 26177},
+								pos: position{line: 902, col: 12, offset: 26180},
 								expr: &ruleRefExpr{
-									pos:  position{line: 902, col: 12, offset: 26177},
+									pos:  position{line: 902, col: 12, offset: 26180},
 									name: "SQLHaving",
 								},
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 903, col: 5, offset: 26192},
+							pos:   position{line: 903, col: 5, offset: 26195},
 							label: "orderby",
 							expr: &zeroOrOneExpr{
-								pos: position{line: 903, col: 13, offset: 26200},
+								pos: position{line: 903, col: 13, offset: 26203},
 								expr: &ruleRefExpr{
-									pos:  position{line: 903, col: 13, offset: 26200},
+									pos:  position{line: 903, col: 13, offset: 26203},
 									name: "SQLOrderBy",
 								},
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 904, col: 5, offset: 26216},
+							pos:   position{line: 904, col: 5, offset: 26219},
 							label: "limit",
 							expr: &ruleRefExpr{
-								pos:  position{line: 904, col: 11, offset: 26222},
+								pos:  position{line: 904, col: 11, offset: 26225},
 								name: "SQLLimit",
 							},
 						},
@@ -7510,26 +7510,26 @@ var g = &grammar{
 		},
 		{
 			name: "SQLSelect",
-			pos:  position{line: 928, col: 1, offset: 26588},
+			pos:  position{line: 928, col: 1, offset: 26591},
 			expr: &choiceExpr{
-				pos: position{line: 929, col: 5, offset: 26602},
+				pos: position{line: 929, col: 5, offset: 26605},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 929, col: 5, offset: 26602},
+						pos: position{line: 929, col: 5, offset: 26605},
 						run: (*parser).callonSQLSelect2,
 						expr: &seqExpr{
-							pos: position{line: 929, col: 5, offset: 26602},
+							pos: position{line: 929, col: 5, offset: 26605},
 							exprs: []interface{}{
 								&ruleRefExpr{
-									pos:  position{line: 929, col: 5, offset: 26602},
+									pos:  position{line: 929, col: 5, offset: 26605},
 									name: "SELECT",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 929, col: 12, offset: 26609},
+									pos:  position{line: 929, col: 12, offset: 26612},
 									name: "_",
 								},
 								&litMatcher{
-									pos:        position{line: 929, col: 14, offset: 26611},
+									pos:        position{line: 929, col: 14, offset: 26614},
 									val:        "*",
 									ignoreCase: false,
 								},
@@ -7537,24 +7537,24 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 930, col: 5, offset: 26639},
+						pos: position{line: 930, col: 5, offset: 26642},
 						run: (*parser).callonSQLSelect7,
 						expr: &seqExpr{
-							pos: position{line: 930, col: 5, offset: 26639},
+							pos: position{line: 930, col: 5, offset: 26642},
 							exprs: []interface{}{
 								&ruleRefExpr{
-									pos:  position{line: 930, col: 5, offset: 26639},
+									pos:  position{line: 930, col: 5, offset: 26642},
 									name: "SELECT",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 930, col: 12, offset: 26646},
+									pos:  position{line: 930, col: 12, offset: 26649},
 									name: "_",
 								},
 								&labeledExpr{
-									pos:   position{line: 930, col: 14, offset: 26648},
+									pos:   position{line: 930, col: 14, offset: 26651},
 									label: "assignments",
 									expr: &ruleRefExpr{
-										pos:  position{line: 930, col: 26, offset: 26660},
+										pos:  position{line: 930, col: 26, offset: 26663},
 										name: "SQLAssignments",
 									},
 								},
@@ -7566,43 +7566,43 @@ var g = &grammar{
 		},
 		{
 			name: "SQLAssignment",
-			pos:  position{line: 932, col: 1, offset: 26704},
+			pos:  position{line: 932, col: 1, offset: 26707},
 			expr: &actionExpr{
-				pos: position{line: 933, col: 5, offset: 26722},
+				pos: position{line: 933, col: 5, offset: 26725},
 				run: (*parser).callonSQLAssignment1,
 				expr: &seqExpr{
-					pos: position{line: 933, col: 5, offset: 26722},
+					pos: position{line: 933, col: 5, offset: 26725},
 					exprs: []interface{}{
 						&labeledExpr{
-							pos:   position{line: 933, col: 5, offset: 26722},
+							pos:   position{line: 933, col: 5, offset: 26725},
 							label: "rhs",
 							expr: &ruleRefExpr{
-								pos:  position{line: 933, col: 9, offset: 26726},
+								pos:  position{line: 933, col: 9, offset: 26729},
 								name: "Expr",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 933, col: 14, offset: 26731},
+							pos:   position{line: 933, col: 14, offset: 26734},
 							label: "opt",
 							expr: &zeroOrOneExpr{
-								pos: position{line: 933, col: 18, offset: 26735},
+								pos: position{line: 933, col: 18, offset: 26738},
 								expr: &seqExpr{
-									pos: position{line: 933, col: 19, offset: 26736},
+									pos: position{line: 933, col: 19, offset: 26739},
 									exprs: []interface{}{
 										&ruleRefExpr{
-											pos:  position{line: 933, col: 19, offset: 26736},
+											pos:  position{line: 933, col: 19, offset: 26739},
 											name: "_",
 										},
 										&ruleRefExpr{
-											pos:  position{line: 933, col: 21, offset: 26738},
+											pos:  position{line: 933, col: 21, offset: 26741},
 											name: "AS",
 										},
 										&ruleRefExpr{
-											pos:  position{line: 933, col: 24, offset: 26741},
+											pos:  position{line: 933, col: 24, offset: 26744},
 											name: "_",
 										},
 										&ruleRefExpr{
-											pos:  position{line: 933, col: 26, offset: 26743},
+											pos:  position{line: 933, col: 26, offset: 26746},
 											name: "Lval",
 										},
 									},
@@ -7615,50 +7615,50 @@ var g = &grammar{
 		},
 		{
 			name: "SQLAssignments",
-			pos:  position{line: 941, col: 1, offset: 26934},
+			pos:  position{line: 941, col: 1, offset: 26937},
 			expr: &actionExpr{
-				pos: position{line: 942, col: 5, offset: 26953},
+				pos: position{line: 942, col: 5, offset: 26956},
 				run: (*parser).callonSQLAssignments1,
 				expr: &seqExpr{
-					pos: position{line: 942, col: 5, offset: 26953},
+					pos: position{line: 942, col: 5, offset: 26956},
 					exprs: []interface{}{
 						&labeledExpr{
-							pos:   position{line: 942, col: 5, offset: 26953},
+							pos:   position{line: 942, col: 5, offset: 26956},
 							label: "first",
 							expr: &ruleRefExpr{
-								pos:  position{line: 942, col: 11, offset: 26959},
+								pos:  position{line: 942, col: 11, offset: 26962},
 								name: "SQLAssignment",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 942, col: 25, offset: 26973},
+							pos:   position{line: 942, col: 25, offset: 26976},
 							label: "rest",
 							expr: &zeroOrMoreExpr{
-								pos: position{line: 942, col: 30, offset: 26978},
+								pos: position{line: 942, col: 30, offset: 26981},
 								expr: &actionExpr{
-									pos: position{line: 942, col: 31, offset: 26979},
+									pos: position{line: 942, col: 31, offset: 26982},
 									run: (*parser).callonSQLAssignments7,
 									expr: &seqExpr{
-										pos: position{line: 942, col: 31, offset: 26979},
+										pos: position{line: 942, col: 31, offset: 26982},
 										exprs: []interface{}{
 											&ruleRefExpr{
-												pos:  position{line: 942, col: 31, offset: 26979},
+												pos:  position{line: 942, col: 31, offset: 26982},
 												name: "__",
 											},
 											&litMatcher{
-												pos:        position{line: 942, col: 34, offset: 26982},
+												pos:        position{line: 942, col: 34, offset: 26985},
 												val:        ",",
 												ignoreCase: false,
 											},
 											&ruleRefExpr{
-												pos:  position{line: 942, col: 38, offset: 26986},
+												pos:  position{line: 942, col: 38, offset: 26989},
 												name: "__",
 											},
 											&labeledExpr{
-												pos:   position{line: 942, col: 41, offset: 26989},
+												pos:   position{line: 942, col: 41, offset: 26992},
 												label: "expr",
 												expr: &ruleRefExpr{
-													pos:  position{line: 942, col: 46, offset: 26994},
+													pos:  position{line: 942, col: 46, offset: 26997},
 													name: "SQLAssignment",
 												},
 											},
@@ -7673,43 +7673,43 @@ var g = &grammar{
 		},
 		{
 			name: "SQLFrom",
-			pos:  position{line: 946, col: 1, offset: 27115},
+			pos:  position{line: 946, col: 1, offset: 27118},
 			expr: &choiceExpr{
-				pos: position{line: 947, col: 5, offset: 27127},
+				pos: position{line: 947, col: 5, offset: 27130},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 947, col: 5, offset: 27127},
+						pos: position{line: 947, col: 5, offset: 27130},
 						run: (*parser).callonSQLFrom2,
 						expr: &seqExpr{
-							pos: position{line: 947, col: 5, offset: 27127},
+							pos: position{line: 947, col: 5, offset: 27130},
 							exprs: []interface{}{
 								&ruleRefExpr{
-									pos:  position{line: 947, col: 5, offset: 27127},
+									pos:  position{line: 947, col: 5, offset: 27130},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 947, col: 7, offset: 27129},
+									pos:  position{line: 947, col: 7, offset: 27132},
 									name: "FROM",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 947, col: 12, offset: 27134},
+									pos:  position{line: 947, col: 12, offset: 27137},
 									name: "_",
 								},
 								&labeledExpr{
-									pos:   position{line: 947, col: 14, offset: 27136},
+									pos:   position{line: 947, col: 14, offset: 27139},
 									label: "table",
 									expr: &ruleRefExpr{
-										pos:  position{line: 947, col: 20, offset: 27142},
+										pos:  position{line: 947, col: 20, offset: 27145},
 										name: "SQLTable",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 947, col: 29, offset: 27151},
+									pos:   position{line: 947, col: 29, offset: 27154},
 									label: "alias",
 									expr: &zeroOrOneExpr{
-										pos: position{line: 947, col: 35, offset: 27157},
+										pos: position{line: 947, col: 35, offset: 27160},
 										expr: &ruleRefExpr{
-											pos:  position{line: 947, col: 35, offset: 27157},
+											pos:  position{line: 947, col: 35, offset: 27160},
 											name: "SQLAlias",
 										},
 									},
@@ -7718,25 +7718,25 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 950, col: 5, offset: 27252},
+						pos: position{line: 950, col: 5, offset: 27255},
 						run: (*parser).callonSQLFrom12,
 						expr: &seqExpr{
-							pos: position{line: 950, col: 5, offset: 27252},
+							pos: position{line: 950, col: 5, offset: 27255},
 							exprs: []interface{}{
 								&ruleRefExpr{
-									pos:  position{line: 950, col: 5, offset: 27252},
+									pos:  position{line: 950, col: 5, offset: 27255},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 950, col: 7, offset: 27254},
+									pos:  position{line: 950, col: 7, offset: 27257},
 									name: "FROM",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 950, col: 12, offset: 27259},
+									pos:  position{line: 950, col: 12, offset: 27262},
 									name: "_",
 								},
 								&litMatcher{
-									pos:        position{line: 950, col: 14, offset: 27261},
+									pos:        position{line: 950, col: 14, offset: 27264},
 									val:        "*",
 									ignoreCase: false,
 								},
@@ -7748,33 +7748,33 @@ var g = &grammar{
 		},
 		{
 			name: "SQLAlias",
-			pos:  position{line: 952, col: 1, offset: 27286},
+			pos:  position{line: 952, col: 1, offset: 27289},
 			expr: &choiceExpr{
-				pos: position{line: 953, col: 5, offset: 27299},
+				pos: position{line: 953, col: 5, offset: 27302},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 953, col: 5, offset: 27299},
+						pos: position{line: 953, col: 5, offset: 27302},
 						run: (*parser).callonSQLAlias2,
 						expr: &seqExpr{
-							pos: position{line: 953, col: 5, offset: 27299},
+							pos: position{line: 953, col: 5, offset: 27302},
 							exprs: []interface{}{
 								&ruleRefExpr{
-									pos:  position{line: 953, col: 5, offset: 27299},
+									pos:  position{line: 953, col: 5, offset: 27302},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 953, col: 7, offset: 27301},
+									pos:  position{line: 953, col: 7, offset: 27304},
 									name: "AS",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 953, col: 10, offset: 27304},
+									pos:  position{line: 953, col: 10, offset: 27307},
 									name: "_",
 								},
 								&labeledExpr{
-									pos:   position{line: 953, col: 12, offset: 27306},
+									pos:   position{line: 953, col: 12, offset: 27309},
 									label: "id",
 									expr: &ruleRefExpr{
-										pos:  position{line: 953, col: 15, offset: 27309},
+										pos:  position{line: 953, col: 15, offset: 27312},
 										name: "Lval",
 									},
 								},
@@ -7782,36 +7782,36 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 954, col: 5, offset: 27337},
+						pos: position{line: 954, col: 5, offset: 27340},
 						run: (*parser).callonSQLAlias9,
 						expr: &seqExpr{
-							pos: position{line: 954, col: 5, offset: 27337},
+							pos: position{line: 954, col: 5, offset: 27340},
 							exprs: []interface{}{
 								&ruleRefExpr{
-									pos:  position{line: 954, col: 5, offset: 27337},
+									pos:  position{line: 954, col: 5, offset: 27340},
 									name: "_",
 								},
 								&notExpr{
-									pos: position{line: 954, col: 7, offset: 27339},
+									pos: position{line: 954, col: 7, offset: 27342},
 									expr: &seqExpr{
-										pos: position{line: 954, col: 9, offset: 27341},
+										pos: position{line: 954, col: 9, offset: 27344},
 										exprs: []interface{}{
 											&ruleRefExpr{
-												pos:  position{line: 954, col: 9, offset: 27341},
+												pos:  position{line: 954, col: 9, offset: 27344},
 												name: "SQLTokenSentinels",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 954, col: 27, offset: 27359},
+												pos:  position{line: 954, col: 27, offset: 27362},
 												name: "_",
 											},
 										},
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 954, col: 30, offset: 27362},
+									pos:   position{line: 954, col: 30, offset: 27365},
 									label: "id",
 									expr: &ruleRefExpr{
-										pos:  position{line: 954, col: 33, offset: 27365},
+										pos:  position{line: 954, col: 33, offset: 27368},
 										name: "Lval",
 									},
 								},
@@ -7823,42 +7823,42 @@ var g = &grammar{
 		},
 		{
 			name: "SQLTable",
-			pos:  position{line: 956, col: 1, offset: 27390},
+			pos:  position{line: 956, col: 1, offset: 27393},
 			expr: &ruleRefExpr{
-				pos:  position{line: 957, col: 5, offset: 27403},
+				pos:  position{line: 957, col: 5, offset: 27406},
 				name: "Expr",
 			},
 		},
 		{
 			name: "SQLJoins",
-			pos:  position{line: 959, col: 1, offset: 27409},
+			pos:  position{line: 959, col: 1, offset: 27412},
 			expr: &actionExpr{
-				pos: position{line: 960, col: 5, offset: 27422},
+				pos: position{line: 960, col: 5, offset: 27425},
 				run: (*parser).callonSQLJoins1,
 				expr: &seqExpr{
-					pos: position{line: 960, col: 5, offset: 27422},
+					pos: position{line: 960, col: 5, offset: 27425},
 					exprs: []interface{}{
 						&labeledExpr{
-							pos:   position{line: 960, col: 5, offset: 27422},
+							pos:   position{line: 960, col: 5, offset: 27425},
 							label: "first",
 							expr: &ruleRefExpr{
-								pos:  position{line: 960, col: 11, offset: 27428},
+								pos:  position{line: 960, col: 11, offset: 27431},
 								name: "SQLJoin",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 960, col: 19, offset: 27436},
+							pos:   position{line: 960, col: 19, offset: 27439},
 							label: "rest",
 							expr: &zeroOrMoreExpr{
-								pos: position{line: 960, col: 24, offset: 27441},
+								pos: position{line: 960, col: 24, offset: 27444},
 								expr: &actionExpr{
-									pos: position{line: 960, col: 25, offset: 27442},
+									pos: position{line: 960, col: 25, offset: 27445},
 									run: (*parser).callonSQLJoins7,
 									expr: &labeledExpr{
-										pos:   position{line: 960, col: 25, offset: 27442},
+										pos:   position{line: 960, col: 25, offset: 27445},
 										label: "join",
 										expr: &ruleRefExpr{
-											pos:  position{line: 960, col: 30, offset: 27447},
+											pos:  position{line: 960, col: 30, offset: 27450},
 											name: "SQLJoin",
 										},
 									},
@@ -7871,90 +7871,90 @@ var g = &grammar{
 		},
 		{
 			name: "SQLJoin",
-			pos:  position{line: 964, col: 1, offset: 27562},
+			pos:  position{line: 964, col: 1, offset: 27565},
 			expr: &actionExpr{
-				pos: position{line: 965, col: 5, offset: 27574},
+				pos: position{line: 965, col: 5, offset: 27577},
 				run: (*parser).callonSQLJoin1,
 				expr: &seqExpr{
-					pos: position{line: 965, col: 5, offset: 27574},
+					pos: position{line: 965, col: 5, offset: 27577},
 					exprs: []interface{}{
 						&labeledExpr{
-							pos:   position{line: 965, col: 5, offset: 27574},
+							pos:   position{line: 965, col: 5, offset: 27577},
 							label: "style",
 							expr: &ruleRefExpr{
-								pos:  position{line: 965, col: 11, offset: 27580},
+								pos:  position{line: 965, col: 11, offset: 27583},
 								name: "SQLJoinStyle",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 965, col: 24, offset: 27593},
+							pos:  position{line: 965, col: 24, offset: 27596},
 							name: "_",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 965, col: 26, offset: 27595},
+							pos:  position{line: 965, col: 26, offset: 27598},
 							name: "JOIN",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 965, col: 31, offset: 27600},
+							pos:  position{line: 965, col: 31, offset: 27603},
 							name: "_",
 						},
 						&labeledExpr{
-							pos:   position{line: 965, col: 33, offset: 27602},
+							pos:   position{line: 965, col: 33, offset: 27605},
 							label: "table",
 							expr: &ruleRefExpr{
-								pos:  position{line: 965, col: 39, offset: 27608},
+								pos:  position{line: 965, col: 39, offset: 27611},
 								name: "SQLTable",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 965, col: 48, offset: 27617},
+							pos:   position{line: 965, col: 48, offset: 27620},
 							label: "alias",
 							expr: &zeroOrOneExpr{
-								pos: position{line: 965, col: 54, offset: 27623},
+								pos: position{line: 965, col: 54, offset: 27626},
 								expr: &ruleRefExpr{
-									pos:  position{line: 965, col: 54, offset: 27623},
+									pos:  position{line: 965, col: 54, offset: 27626},
 									name: "SQLAlias",
 								},
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 965, col: 64, offset: 27633},
+							pos:  position{line: 965, col: 64, offset: 27636},
 							name: "_",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 965, col: 66, offset: 27635},
+							pos:  position{line: 965, col: 66, offset: 27638},
 							name: "ON",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 965, col: 69, offset: 27638},
+							pos:  position{line: 965, col: 69, offset: 27641},
 							name: "_",
 						},
 						&labeledExpr{
-							pos:   position{line: 965, col: 71, offset: 27640},
+							pos:   position{line: 965, col: 71, offset: 27643},
 							label: "leftKey",
 							expr: &ruleRefExpr{
-								pos:  position{line: 965, col: 79, offset: 27648},
+								pos:  position{line: 965, col: 79, offset: 27651},
 								name: "JoinKey",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 965, col: 87, offset: 27656},
+							pos:  position{line: 965, col: 87, offset: 27659},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 965, col: 90, offset: 27659},
+							pos:        position{line: 965, col: 90, offset: 27662},
 							val:        "=",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 965, col: 94, offset: 27663},
+							pos:  position{line: 965, col: 94, offset: 27666},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 965, col: 97, offset: 27666},
+							pos:   position{line: 965, col: 97, offset: 27669},
 							label: "rightKey",
 							expr: &ruleRefExpr{
-								pos:  position{line: 965, col: 106, offset: 27675},
+								pos:  position{line: 965, col: 106, offset: 27678},
 								name: "JoinKey",
 							},
 						},
@@ -7964,40 +7964,40 @@ var g = &grammar{
 		},
 		{
 			name: "SQLJoinStyle",
-			pos:  position{line: 980, col: 1, offset: 27906},
+			pos:  position{line: 980, col: 1, offset: 27909},
 			expr: &choiceExpr{
-				pos: position{line: 981, col: 5, offset: 27923},
+				pos: position{line: 981, col: 5, offset: 27926},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 981, col: 5, offset: 27923},
+						pos: position{line: 981, col: 5, offset: 27926},
 						run: (*parser).callonSQLJoinStyle2,
 						expr: &seqExpr{
-							pos: position{line: 981, col: 5, offset: 27923},
+							pos: position{line: 981, col: 5, offset: 27926},
 							exprs: []interface{}{
 								&ruleRefExpr{
-									pos:  position{line: 981, col: 5, offset: 27923},
+									pos:  position{line: 981, col: 5, offset: 27926},
 									name: "_",
 								},
 								&labeledExpr{
-									pos:   position{line: 981, col: 7, offset: 27925},
+									pos:   position{line: 981, col: 7, offset: 27928},
 									label: "style",
 									expr: &choiceExpr{
-										pos: position{line: 981, col: 14, offset: 27932},
+										pos: position{line: 981, col: 14, offset: 27935},
 										alternatives: []interface{}{
 											&ruleRefExpr{
-												pos:  position{line: 981, col: 14, offset: 27932},
+												pos:  position{line: 981, col: 14, offset: 27935},
 												name: "ANTI",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 981, col: 21, offset: 27939},
+												pos:  position{line: 981, col: 21, offset: 27942},
 												name: "INNER",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 981, col: 29, offset: 27947},
+												pos:  position{line: 981, col: 29, offset: 27950},
 												name: "LEFT",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 981, col: 36, offset: 27954},
+												pos:  position{line: 981, col: 36, offset: 27957},
 												name: "RIGHT",
 											},
 										},
@@ -8007,10 +8007,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 982, col: 5, offset: 27987},
+						pos: position{line: 982, col: 5, offset: 27990},
 						run: (*parser).callonSQLJoinStyle11,
 						expr: &litMatcher{
-							pos:        position{line: 982, col: 5, offset: 27987},
+							pos:        position{line: 982, col: 5, offset: 27990},
 							val:        "",
 							ignoreCase: false,
 						},
@@ -8020,30 +8020,30 @@ var g = &grammar{
 		},
 		{
 			name: "SQLWhere",
-			pos:  position{line: 984, col: 1, offset: 28015},
+			pos:  position{line: 984, col: 1, offset: 28018},
 			expr: &actionExpr{
-				pos: position{line: 985, col: 5, offset: 28028},
+				pos: position{line: 985, col: 5, offset: 28031},
 				run: (*parser).callonSQLWhere1,
 				expr: &seqExpr{
-					pos: position{line: 985, col: 5, offset: 28028},
+					pos: position{line: 985, col: 5, offset: 28031},
 					exprs: []interface{}{
 						&ruleRefExpr{
-							pos:  position{line: 985, col: 5, offset: 28028},
+							pos:  position{line: 985, col: 5, offset: 28031},
 							name: "_",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 985, col: 7, offset: 28030},
+							pos:  position{line: 985, col: 7, offset: 28033},
 							name: "WHERE",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 985, col: 13, offset: 28036},
+							pos:  position{line: 985, col: 13, offset: 28039},
 							name: "_",
 						},
 						&labeledExpr{
-							pos:   position{line: 985, col: 15, offset: 28038},
+							pos:   position{line: 985, col: 15, offset: 28041},
 							label: "expr",
 							expr: &ruleRefExpr{
-								pos:  position{line: 985, col: 20, offset: 28043},
+								pos:  position{line: 985, col: 20, offset: 28046},
 								name: "LogicalOrExpr",
 							},
 						},
@@ -8053,38 +8053,38 @@ var g = &grammar{
 		},
 		{
 			name: "SQLGroupBy",
-			pos:  position{line: 987, col: 1, offset: 28079},
+			pos:  position{line: 987, col: 1, offset: 28082},
 			expr: &actionExpr{
-				pos: position{line: 988, col: 5, offset: 28094},
+				pos: position{line: 988, col: 5, offset: 28097},
 				run: (*parser).callonSQLGroupBy1,
 				expr: &seqExpr{
-					pos: position{line: 988, col: 5, offset: 28094},
+					pos: position{line: 988, col: 5, offset: 28097},
 					exprs: []interface{}{
 						&ruleRefExpr{
-							pos:  position{line: 988, col: 5, offset: 28094},
+							pos:  position{line: 988, col: 5, offset: 28097},
 							name: "_",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 988, col: 7, offset: 28096},
+							pos:  position{line: 988, col: 7, offset: 28099},
 							name: "GROUP",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 988, col: 13, offset: 28102},
+							pos:  position{line: 988, col: 13, offset: 28105},
 							name: "_",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 988, col: 15, offset: 28104},
+							pos:  position{line: 988, col: 15, offset: 28107},
 							name: "BY",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 988, col: 18, offset: 28107},
+							pos:  position{line: 988, col: 18, offset: 28110},
 							name: "_",
 						},
 						&labeledExpr{
-							pos:   position{line: 988, col: 20, offset: 28109},
+							pos:   position{line: 988, col: 20, offset: 28112},
 							label: "columns",
 							expr: &ruleRefExpr{
-								pos:  position{line: 988, col: 28, offset: 28117},
+								pos:  position{line: 988, col: 28, offset: 28120},
 								name: "FieldExprs",
 							},
 						},
@@ -8094,30 +8094,30 @@ var g = &grammar{
 		},
 		{
 			name: "SQLHaving",
-			pos:  position{line: 990, col: 1, offset: 28153},
+			pos:  position{line: 990, col: 1, offset: 28156},
 			expr: &actionExpr{
-				pos: position{line: 991, col: 5, offset: 28167},
+				pos: position{line: 991, col: 5, offset: 28170},
 				run: (*parser).callonSQLHaving1,
 				expr: &seqExpr{
-					pos: position{line: 991, col: 5, offset: 28167},
+					pos: position{line: 991, col: 5, offset: 28170},
 					exprs: []interface{}{
 						&ruleRefExpr{
-							pos:  position{line: 991, col: 5, offset: 28167},
+							pos:  position{line: 991, col: 5, offset: 28170},
 							name: "_",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 991, col: 7, offset: 28169},
+							pos:  position{line: 991, col: 7, offset: 28172},
 							name: "HAVING",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 991, col: 14, offset: 28176},
+							pos:  position{line: 991, col: 14, offset: 28179},
 							name: "_",
 						},
 						&labeledExpr{
-							pos:   position{line: 991, col: 16, offset: 28178},
+							pos:   position{line: 991, col: 16, offset: 28181},
 							label: "expr",
 							expr: &ruleRefExpr{
-								pos:  position{line: 991, col: 21, offset: 28183},
+								pos:  position{line: 991, col: 21, offset: 28186},
 								name: "LogicalOrExpr",
 							},
 						},
@@ -8127,46 +8127,46 @@ var g = &grammar{
 		},
 		{
 			name: "SQLOrderBy",
-			pos:  position{line: 993, col: 1, offset: 28219},
+			pos:  position{line: 993, col: 1, offset: 28222},
 			expr: &actionExpr{
-				pos: position{line: 994, col: 5, offset: 28234},
+				pos: position{line: 994, col: 5, offset: 28237},
 				run: (*parser).callonSQLOrderBy1,
 				expr: &seqExpr{
-					pos: position{line: 994, col: 5, offset: 28234},
+					pos: position{line: 994, col: 5, offset: 28237},
 					exprs: []interface{}{
 						&ruleRefExpr{
-							pos:  position{line: 994, col: 5, offset: 28234},
+							pos:  position{line: 994, col: 5, offset: 28237},
 							name: "_",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 994, col: 7, offset: 28236},
+							pos:  position{line: 994, col: 7, offset: 28239},
 							name: "ORDER",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 994, col: 13, offset: 28242},
+							pos:  position{line: 994, col: 13, offset: 28245},
 							name: "_",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 994, col: 15, offset: 28244},
+							pos:  position{line: 994, col: 15, offset: 28247},
 							name: "BY",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 994, col: 18, offset: 28247},
+							pos:  position{line: 994, col: 18, offset: 28250},
 							name: "_",
 						},
 						&labeledExpr{
-							pos:   position{line: 994, col: 20, offset: 28249},
+							pos:   position{line: 994, col: 20, offset: 28252},
 							label: "keys",
 							expr: &ruleRefExpr{
-								pos:  position{line: 994, col: 25, offset: 28254},
+								pos:  position{line: 994, col: 25, offset: 28257},
 								name: "Exprs",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 994, col: 31, offset: 28260},
+							pos:   position{line: 994, col: 31, offset: 28263},
 							label: "order",
 							expr: &ruleRefExpr{
-								pos:  position{line: 994, col: 37, offset: 28266},
+								pos:  position{line: 994, col: 37, offset: 28269},
 								name: "SQLOrder",
 							},
 						},
@@ -8176,32 +8176,32 @@ var g = &grammar{
 		},
 		{
 			name: "SQLOrder",
-			pos:  position{line: 998, col: 1, offset: 28377},
+			pos:  position{line: 998, col: 1, offset: 28380},
 			expr: &choiceExpr{
-				pos: position{line: 999, col: 5, offset: 28390},
+				pos: position{line: 999, col: 5, offset: 28393},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 999, col: 5, offset: 28390},
+						pos: position{line: 999, col: 5, offset: 28393},
 						run: (*parser).callonSQLOrder2,
 						expr: &seqExpr{
-							pos: position{line: 999, col: 5, offset: 28390},
+							pos: position{line: 999, col: 5, offset: 28393},
 							exprs: []interface{}{
 								&ruleRefExpr{
-									pos:  position{line: 999, col: 5, offset: 28390},
+									pos:  position{line: 999, col: 5, offset: 28393},
 									name: "_",
 								},
 								&labeledExpr{
-									pos:   position{line: 999, col: 7, offset: 28392},
+									pos:   position{line: 999, col: 7, offset: 28395},
 									label: "dir",
 									expr: &choiceExpr{
-										pos: position{line: 999, col: 12, offset: 28397},
+										pos: position{line: 999, col: 12, offset: 28400},
 										alternatives: []interface{}{
 											&ruleRefExpr{
-												pos:  position{line: 999, col: 12, offset: 28397},
+												pos:  position{line: 999, col: 12, offset: 28400},
 												name: "ASC",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 999, col: 18, offset: 28403},
+												pos:  position{line: 999, col: 18, offset: 28406},
 												name: "DESC",
 											},
 										},
@@ -8211,10 +8211,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1000, col: 5, offset: 28433},
+						pos: position{line: 1000, col: 5, offset: 28436},
 						run: (*parser).callonSQLOrder9,
 						expr: &litMatcher{
-							pos:        position{line: 1000, col: 5, offset: 28433},
+							pos:        position{line: 1000, col: 5, offset: 28436},
 							val:        "",
 							ignoreCase: false,
 						},
@@ -8224,33 +8224,33 @@ var g = &grammar{
 		},
 		{
 			name: "SQLLimit",
-			pos:  position{line: 1002, col: 1, offset: 28459},
+			pos:  position{line: 1002, col: 1, offset: 28462},
 			expr: &choiceExpr{
-				pos: position{line: 1003, col: 5, offset: 28472},
+				pos: position{line: 1003, col: 5, offset: 28475},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1003, col: 5, offset: 28472},
+						pos: position{line: 1003, col: 5, offset: 28475},
 						run: (*parser).callonSQLLimit2,
 						expr: &seqExpr{
-							pos: position{line: 1003, col: 5, offset: 28472},
+							pos: position{line: 1003, col: 5, offset: 28475},
 							exprs: []interface{}{
 								&ruleRefExpr{
-									pos:  position{line: 1003, col: 5, offset: 28472},
+									pos:  position{line: 1003, col: 5, offset: 28475},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1003, col: 7, offset: 28474},
+									pos:  position{line: 1003, col: 7, offset: 28477},
 									name: "LIMIT",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1003, col: 13, offset: 28480},
+									pos:  position{line: 1003, col: 13, offset: 28483},
 									name: "_",
 								},
 								&labeledExpr{
-									pos:   position{line: 1003, col: 15, offset: 28482},
+									pos:   position{line: 1003, col: 15, offset: 28485},
 									label: "count",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1003, col: 21, offset: 28488},
+										pos:  position{line: 1003, col: 21, offset: 28491},
 										name: "UInt",
 									},
 								},
@@ -8258,10 +8258,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1004, col: 5, offset: 28519},
+						pos: position{line: 1004, col: 5, offset: 28522},
 						run: (*parser).callonSQLLimit9,
 						expr: &litMatcher{
-							pos:        position{line: 1004, col: 5, offset: 28519},
+							pos:        position{line: 1004, col: 5, offset: 28522},
 							val:        "",
 							ignoreCase: false,
 						},
@@ -8271,12 +8271,12 @@ var g = &grammar{
 		},
 		{
 			name: "SELECT",
-			pos:  position{line: 1006, col: 1, offset: 28541},
+			pos:  position{line: 1006, col: 1, offset: 28544},
 			expr: &actionExpr{
-				pos: position{line: 1006, col: 10, offset: 28550},
+				pos: position{line: 1006, col: 10, offset: 28553},
 				run: (*parser).callonSELECT1,
 				expr: &litMatcher{
-					pos:        position{line: 1006, col: 10, offset: 28550},
+					pos:        position{line: 1006, col: 10, offset: 28553},
 					val:        "select",
 					ignoreCase: true,
 				},
@@ -8284,12 +8284,12 @@ var g = &grammar{
 		},
 		{
 			name: "AS",
-			pos:  position{line: 1007, col: 1, offset: 28585},
+			pos:  position{line: 1007, col: 1, offset: 28588},
 			expr: &actionExpr{
-				pos: position{line: 1007, col: 6, offset: 28590},
+				pos: position{line: 1007, col: 6, offset: 28593},
 				run: (*parser).callonAS1,
 				expr: &litMatcher{
-					pos:        position{line: 1007, col: 6, offset: 28590},
+					pos:        position{line: 1007, col: 6, offset: 28593},
 					val:        "as",
 					ignoreCase: true,
 				},
@@ -8297,12 +8297,12 @@ var g = &grammar{
 		},
 		{
 			name: "FROM",
-			pos:  position{line: 1008, col: 1, offset: 28617},
+			pos:  position{line: 1008, col: 1, offset: 28620},
 			expr: &actionExpr{
-				pos: position{line: 1008, col: 8, offset: 28624},
+				pos: position{line: 1008, col: 8, offset: 28627},
 				run: (*parser).callonFROM1,
 				expr: &litMatcher{
-					pos:        position{line: 1008, col: 8, offset: 28624},
+					pos:        position{line: 1008, col: 8, offset: 28627},
 					val:        "from",
 					ignoreCase: true,
 				},
@@ -8310,12 +8310,12 @@ var g = &grammar{
 		},
 		{
 			name: "JOIN",
-			pos:  position{line: 1009, col: 1, offset: 28655},
+			pos:  position{line: 1009, col: 1, offset: 28658},
 			expr: &actionExpr{
-				pos: position{line: 1009, col: 8, offset: 28662},
+				pos: position{line: 1009, col: 8, offset: 28665},
 				run: (*parser).callonJOIN1,
 				expr: &litMatcher{
-					pos:        position{line: 1009, col: 8, offset: 28662},
+					pos:        position{line: 1009, col: 8, offset: 28665},
 					val:        "join",
 					ignoreCase: true,
 				},
@@ -8323,12 +8323,12 @@ var g = &grammar{
 		},
 		{
 			name: "WHERE",
-			pos:  position{line: 1010, col: 1, offset: 28693},
+			pos:  position{line: 1010, col: 1, offset: 28696},
 			expr: &actionExpr{
-				pos: position{line: 1010, col: 9, offset: 28701},
+				pos: position{line: 1010, col: 9, offset: 28704},
 				run: (*parser).callonWHERE1,
 				expr: &litMatcher{
-					pos:        position{line: 1010, col: 9, offset: 28701},
+					pos:        position{line: 1010, col: 9, offset: 28704},
 					val:        "where",
 					ignoreCase: true,
 				},
@@ -8336,12 +8336,12 @@ var g = &grammar{
 		},
 		{
 			name: "GROUP",
-			pos:  position{line: 1011, col: 1, offset: 28734},
+			pos:  position{line: 1011, col: 1, offset: 28737},
 			expr: &actionExpr{
-				pos: position{line: 1011, col: 9, offset: 28742},
+				pos: position{line: 1011, col: 9, offset: 28745},
 				run: (*parser).callonGROUP1,
 				expr: &litMatcher{
-					pos:        position{line: 1011, col: 9, offset: 28742},
+					pos:        position{line: 1011, col: 9, offset: 28745},
 					val:        "group",
 					ignoreCase: true,
 				},
@@ -8349,12 +8349,12 @@ var g = &grammar{
 		},
 		{
 			name: "BY",
-			pos:  position{line: 1012, col: 1, offset: 28775},
+			pos:  position{line: 1012, col: 1, offset: 28778},
 			expr: &actionExpr{
-				pos: position{line: 1012, col: 6, offset: 28780},
+				pos: position{line: 1012, col: 6, offset: 28783},
 				run: (*parser).callonBY1,
 				expr: &litMatcher{
-					pos:        position{line: 1012, col: 6, offset: 28780},
+					pos:        position{line: 1012, col: 6, offset: 28783},
 					val:        "by",
 					ignoreCase: true,
 				},
@@ -8362,12 +8362,12 @@ var g = &grammar{
 		},
 		{
 			name: "HAVING",
-			pos:  position{line: 1013, col: 1, offset: 28807},
+			pos:  position{line: 1013, col: 1, offset: 28810},
 			expr: &actionExpr{
-				pos: position{line: 1013, col: 10, offset: 28816},
+				pos: position{line: 1013, col: 10, offset: 28819},
 				run: (*parser).callonHAVING1,
 				expr: &litMatcher{
-					pos:        position{line: 1013, col: 10, offset: 28816},
+					pos:        position{line: 1013, col: 10, offset: 28819},
 					val:        "having",
 					ignoreCase: true,
 				},
@@ -8375,12 +8375,12 @@ var g = &grammar{
 		},
 		{
 			name: "ORDER",
-			pos:  position{line: 1014, col: 1, offset: 28851},
+			pos:  position{line: 1014, col: 1, offset: 28854},
 			expr: &actionExpr{
-				pos: position{line: 1014, col: 9, offset: 28859},
+				pos: position{line: 1014, col: 9, offset: 28862},
 				run: (*parser).callonORDER1,
 				expr: &litMatcher{
-					pos:        position{line: 1014, col: 9, offset: 28859},
+					pos:        position{line: 1014, col: 9, offset: 28862},
 					val:        "order",
 					ignoreCase: true,
 				},
@@ -8388,12 +8388,12 @@ var g = &grammar{
 		},
 		{
 			name: "ON",
-			pos:  position{line: 1015, col: 1, offset: 28892},
+			pos:  position{line: 1015, col: 1, offset: 28895},
 			expr: &actionExpr{
-				pos: position{line: 1015, col: 6, offset: 28897},
+				pos: position{line: 1015, col: 6, offset: 28900},
 				run: (*parser).callonON1,
 				expr: &litMatcher{
-					pos:        position{line: 1015, col: 6, offset: 28897},
+					pos:        position{line: 1015, col: 6, offset: 28900},
 					val:        "on",
 					ignoreCase: true,
 				},
@@ -8401,12 +8401,12 @@ var g = &grammar{
 		},
 		{
 			name: "LIMIT",
-			pos:  position{line: 1016, col: 1, offset: 28924},
+			pos:  position{line: 1016, col: 1, offset: 28927},
 			expr: &actionExpr{
-				pos: position{line: 1016, col: 9, offset: 28932},
+				pos: position{line: 1016, col: 9, offset: 28935},
 				run: (*parser).callonLIMIT1,
 				expr: &litMatcher{
-					pos:        position{line: 1016, col: 9, offset: 28932},
+					pos:        position{line: 1016, col: 9, offset: 28935},
 					val:        "limit",
 					ignoreCase: true,
 				},
@@ -8414,12 +8414,12 @@ var g = &grammar{
 		},
 		{
 			name: "ASC",
-			pos:  position{line: 1017, col: 1, offset: 28965},
+			pos:  position{line: 1017, col: 1, offset: 28968},
 			expr: &actionExpr{
-				pos: position{line: 1017, col: 7, offset: 28971},
+				pos: position{line: 1017, col: 7, offset: 28974},
 				run: (*parser).callonASC1,
 				expr: &litMatcher{
-					pos:        position{line: 1017, col: 7, offset: 28971},
+					pos:        position{line: 1017, col: 7, offset: 28974},
 					val:        "asc",
 					ignoreCase: true,
 				},
@@ -8427,12 +8427,12 @@ var g = &grammar{
 		},
 		{
 			name: "DESC",
-			pos:  position{line: 1018, col: 1, offset: 29000},
+			pos:  position{line: 1018, col: 1, offset: 29003},
 			expr: &actionExpr{
-				pos: position{line: 1018, col: 8, offset: 29007},
+				pos: position{line: 1018, col: 8, offset: 29010},
 				run: (*parser).callonDESC1,
 				expr: &litMatcher{
-					pos:        position{line: 1018, col: 8, offset: 29007},
+					pos:        position{line: 1018, col: 8, offset: 29010},
 					val:        "desc",
 					ignoreCase: true,
 				},
@@ -8440,12 +8440,12 @@ var g = &grammar{
 		},
 		{
 			name: "ANTI",
-			pos:  position{line: 1019, col: 1, offset: 29038},
+			pos:  position{line: 1019, col: 1, offset: 29041},
 			expr: &actionExpr{
-				pos: position{line: 1019, col: 8, offset: 29045},
+				pos: position{line: 1019, col: 8, offset: 29048},
 				run: (*parser).callonANTI1,
 				expr: &litMatcher{
-					pos:        position{line: 1019, col: 8, offset: 29045},
+					pos:        position{line: 1019, col: 8, offset: 29048},
 					val:        "anti",
 					ignoreCase: true,
 				},
@@ -8453,12 +8453,12 @@ var g = &grammar{
 		},
 		{
 			name: "LEFT",
-			pos:  position{line: 1020, col: 1, offset: 29076},
+			pos:  position{line: 1020, col: 1, offset: 29079},
 			expr: &actionExpr{
-				pos: position{line: 1020, col: 8, offset: 29083},
+				pos: position{line: 1020, col: 8, offset: 29086},
 				run: (*parser).callonLEFT1,
 				expr: &litMatcher{
-					pos:        position{line: 1020, col: 8, offset: 29083},
+					pos:        position{line: 1020, col: 8, offset: 29086},
 					val:        "left",
 					ignoreCase: true,
 				},
@@ -8466,12 +8466,12 @@ var g = &grammar{
 		},
 		{
 			name: "RIGHT",
-			pos:  position{line: 1021, col: 1, offset: 29114},
+			pos:  position{line: 1021, col: 1, offset: 29117},
 			expr: &actionExpr{
-				pos: position{line: 1021, col: 9, offset: 29122},
+				pos: position{line: 1021, col: 9, offset: 29125},
 				run: (*parser).callonRIGHT1,
 				expr: &litMatcher{
-					pos:        position{line: 1021, col: 9, offset: 29122},
+					pos:        position{line: 1021, col: 9, offset: 29125},
 					val:        "right",
 					ignoreCase: true,
 				},
@@ -8479,12 +8479,12 @@ var g = &grammar{
 		},
 		{
 			name: "INNER",
-			pos:  position{line: 1022, col: 1, offset: 29155},
+			pos:  position{line: 1022, col: 1, offset: 29158},
 			expr: &actionExpr{
-				pos: position{line: 1022, col: 9, offset: 29163},
+				pos: position{line: 1022, col: 9, offset: 29166},
 				run: (*parser).callonINNER1,
 				expr: &litMatcher{
-					pos:        position{line: 1022, col: 9, offset: 29163},
+					pos:        position{line: 1022, col: 9, offset: 29166},
 					val:        "inner",
 					ignoreCase: true,
 				},
@@ -8492,48 +8492,48 @@ var g = &grammar{
 		},
 		{
 			name: "SQLTokenSentinels",
-			pos:  position{line: 1024, col: 1, offset: 29197},
+			pos:  position{line: 1024, col: 1, offset: 29200},
 			expr: &choiceExpr{
-				pos: position{line: 1025, col: 5, offset: 29219},
+				pos: position{line: 1025, col: 5, offset: 29222},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1025, col: 5, offset: 29219},
+						pos:  position{line: 1025, col: 5, offset: 29222},
 						name: "SELECT",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1025, col: 14, offset: 29228},
+						pos:  position{line: 1025, col: 14, offset: 29231},
 						name: "AS",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1025, col: 19, offset: 29233},
+						pos:  position{line: 1025, col: 19, offset: 29236},
 						name: "FROM",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1025, col: 26, offset: 29240},
+						pos:  position{line: 1025, col: 26, offset: 29243},
 						name: "JOIN",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1025, col: 33, offset: 29247},
+						pos:  position{line: 1025, col: 33, offset: 29250},
 						name: "WHERE",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1025, col: 41, offset: 29255},
+						pos:  position{line: 1025, col: 41, offset: 29258},
 						name: "GROUP",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1025, col: 49, offset: 29263},
+						pos:  position{line: 1025, col: 49, offset: 29266},
 						name: "HAVING",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1025, col: 58, offset: 29272},
+						pos:  position{line: 1025, col: 58, offset: 29275},
 						name: "ORDER",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1025, col: 66, offset: 29280},
+						pos:  position{line: 1025, col: 66, offset: 29283},
 						name: "LIMIT",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1025, col: 74, offset: 29288},
+						pos:  position{line: 1025, col: 74, offset: 29291},
 						name: "ON",
 					},
 				},
@@ -8541,52 +8541,52 @@ var g = &grammar{
 		},
 		{
 			name: "Literal",
-			pos:  position{line: 1029, col: 1, offset: 29314},
+			pos:  position{line: 1029, col: 1, offset: 29317},
 			expr: &choiceExpr{
-				pos: position{line: 1030, col: 5, offset: 29326},
+				pos: position{line: 1030, col: 5, offset: 29329},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1030, col: 5, offset: 29326},
+						pos:  position{line: 1030, col: 5, offset: 29329},
 						name: "TypeLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1031, col: 5, offset: 29342},
+						pos:  position{line: 1031, col: 5, offset: 29345},
 						name: "TemplateLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1032, col: 5, offset: 29362},
+						pos:  position{line: 1032, col: 5, offset: 29365},
 						name: "SubnetLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1033, col: 5, offset: 29380},
+						pos:  position{line: 1033, col: 5, offset: 29383},
 						name: "AddressLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1034, col: 5, offset: 29399},
+						pos:  position{line: 1034, col: 5, offset: 29402},
 						name: "BytesLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1035, col: 5, offset: 29416},
+						pos:  position{line: 1035, col: 5, offset: 29419},
 						name: "Duration",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1036, col: 5, offset: 29429},
+						pos:  position{line: 1036, col: 5, offset: 29432},
 						name: "Time",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1037, col: 5, offset: 29438},
+						pos:  position{line: 1037, col: 5, offset: 29441},
 						name: "FloatLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1038, col: 5, offset: 29455},
+						pos:  position{line: 1038, col: 5, offset: 29458},
 						name: "IntegerLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1039, col: 5, offset: 29474},
+						pos:  position{line: 1039, col: 5, offset: 29477},
 						name: "BooleanLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1040, col: 5, offset: 29493},
+						pos:  position{line: 1040, col: 5, offset: 29496},
 						name: "NullLiteral",
 					},
 				},
@@ -8594,28 +8594,28 @@ var g = &grammar{
 		},
 		{
 			name: "SubnetLiteral",
-			pos:  position{line: 1042, col: 1, offset: 29506},
+			pos:  position{line: 1042, col: 1, offset: 29509},
 			expr: &choiceExpr{
-				pos: position{line: 1043, col: 5, offset: 29524},
+				pos: position{line: 1043, col: 5, offset: 29527},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1043, col: 5, offset: 29524},
+						pos: position{line: 1043, col: 5, offset: 29527},
 						run: (*parser).callonSubnetLiteral2,
 						expr: &seqExpr{
-							pos: position{line: 1043, col: 5, offset: 29524},
+							pos: position{line: 1043, col: 5, offset: 29527},
 							exprs: []interface{}{
 								&labeledExpr{
-									pos:   position{line: 1043, col: 5, offset: 29524},
+									pos:   position{line: 1043, col: 5, offset: 29527},
 									label: "v",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1043, col: 7, offset: 29526},
+										pos:  position{line: 1043, col: 7, offset: 29529},
 										name: "IP6Net",
 									},
 								},
 								&notExpr{
-									pos: position{line: 1043, col: 14, offset: 29533},
+									pos: position{line: 1043, col: 14, offset: 29536},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1043, col: 15, offset: 29534},
+										pos:  position{line: 1043, col: 15, offset: 29537},
 										name: "IdentifierRest",
 									},
 								},
@@ -8623,13 +8623,13 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1046, col: 5, offset: 29649},
+						pos: position{line: 1046, col: 5, offset: 29652},
 						run: (*parser).callonSubnetLiteral8,
 						expr: &labeledExpr{
-							pos:   position{line: 1046, col: 5, offset: 29649},
+							pos:   position{line: 1046, col: 5, offset: 29652},
 							label: "v",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1046, col: 7, offset: 29651},
+								pos:  position{line: 1046, col: 7, offset: 29654},
 								name: "IP4Net",
 							},
 						},
@@ -8639,28 +8639,28 @@ var g = &grammar{
 		},
 		{
 			name: "AddressLiteral",
-			pos:  position{line: 1050, col: 1, offset: 29755},
+			pos:  position{line: 1050, col: 1, offset: 29758},
 			expr: &choiceExpr{
-				pos: position{line: 1051, col: 5, offset: 29774},
+				pos: position{line: 1051, col: 5, offset: 29777},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1051, col: 5, offset: 29774},
+						pos: position{line: 1051, col: 5, offset: 29777},
 						run: (*parser).callonAddressLiteral2,
 						expr: &seqExpr{
-							pos: position{line: 1051, col: 5, offset: 29774},
+							pos: position{line: 1051, col: 5, offset: 29777},
 							exprs: []interface{}{
 								&labeledExpr{
-									pos:   position{line: 1051, col: 5, offset: 29774},
+									pos:   position{line: 1051, col: 5, offset: 29777},
 									label: "v",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1051, col: 7, offset: 29776},
+										pos:  position{line: 1051, col: 7, offset: 29779},
 										name: "IP6",
 									},
 								},
 								&notExpr{
-									pos: position{line: 1051, col: 11, offset: 29780},
+									pos: position{line: 1051, col: 11, offset: 29783},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1051, col: 12, offset: 29781},
+										pos:  position{line: 1051, col: 12, offset: 29784},
 										name: "IdentifierRest",
 									},
 								},
@@ -8668,13 +8668,13 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1054, col: 5, offset: 29895},
+						pos: position{line: 1054, col: 5, offset: 29898},
 						run: (*parser).callonAddressLiteral8,
 						expr: &labeledExpr{
-							pos:   position{line: 1054, col: 5, offset: 29895},
+							pos:   position{line: 1054, col: 5, offset: 29898},
 							label: "v",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1054, col: 7, offset: 29897},
+								pos:  position{line: 1054, col: 7, offset: 29900},
 								name: "IP",
 							},
 						},
@@ -8684,15 +8684,15 @@ var g = &grammar{
 		},
 		{
 			name: "FloatLiteral",
-			pos:  position{line: 1058, col: 1, offset: 29996},
+			pos:  position{line: 1058, col: 1, offset: 29999},
 			expr: &actionExpr{
-				pos: position{line: 1059, col: 5, offset: 30013},
+				pos: position{line: 1059, col: 5, offset: 30016},
 				run: (*parser).callonFloatLiteral1,
 				expr: &labeledExpr{
-					pos:   position{line: 1059, col: 5, offset: 30013},
+					pos:   position{line: 1059, col: 5, offset: 30016},
 					label: "v",
 					expr: &ruleRefExpr{
-						pos:  position{line: 1059, col: 7, offset: 30015},
+						pos:  position{line: 1059, col: 7, offset: 30018},
 						name: "FloatString",
 					},
 				},
@@ -8700,15 +8700,15 @@ var g = &grammar{
 		},
 		{
 			name: "IntegerLiteral",
-			pos:  position{line: 1063, col: 1, offset: 30128},
+			pos:  position{line: 1063, col: 1, offset: 30131},
 			expr: &actionExpr{
-				pos: position{line: 1064, col: 5, offset: 30147},
+				pos: position{line: 1064, col: 5, offset: 30150},
 				run: (*parser).callonIntegerLiteral1,
 				expr: &labeledExpr{
-					pos:   position{line: 1064, col: 5, offset: 30147},
+					pos:   position{line: 1064, col: 5, offset: 30150},
 					label: "v",
 					expr: &ruleRefExpr{
-						pos:  position{line: 1064, col: 7, offset: 30149},
+						pos:  position{line: 1064, col: 7, offset: 30152},
 						name: "IntString",
 					},
 				},
@@ -8716,24 +8716,24 @@ var g = &grammar{
 		},
 		{
 			name: "BooleanLiteral",
-			pos:  position{line: 1068, col: 1, offset: 30258},
+			pos:  position{line: 1068, col: 1, offset: 30261},
 			expr: &choiceExpr{
-				pos: position{line: 1069, col: 5, offset: 30277},
+				pos: position{line: 1069, col: 5, offset: 30280},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1069, col: 5, offset: 30277},
+						pos: position{line: 1069, col: 5, offset: 30280},
 						run: (*parser).callonBooleanLiteral2,
 						expr: &litMatcher{
-							pos:        position{line: 1069, col: 5, offset: 30277},
+							pos:        position{line: 1069, col: 5, offset: 30280},
 							val:        "true",
 							ignoreCase: false,
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1070, col: 5, offset: 30381},
+						pos: position{line: 1070, col: 5, offset: 30384},
 						run: (*parser).callonBooleanLiteral4,
 						expr: &litMatcher{
-							pos:        position{line: 1070, col: 5, offset: 30381},
+							pos:        position{line: 1070, col: 5, offset: 30384},
 							val:        "false",
 							ignoreCase: false,
 						},
@@ -8743,12 +8743,12 @@ var g = &grammar{
 		},
 		{
 			name: "NullLiteral",
-			pos:  position{line: 1072, col: 1, offset: 30483},
+			pos:  position{line: 1072, col: 1, offset: 30486},
 			expr: &actionExpr{
-				pos: position{line: 1073, col: 5, offset: 30499},
+				pos: position{line: 1073, col: 5, offset: 30502},
 				run: (*parser).callonNullLiteral1,
 				expr: &litMatcher{
-					pos:        position{line: 1073, col: 5, offset: 30499},
+					pos:        position{line: 1073, col: 5, offset: 30502},
 					val:        "null",
 					ignoreCase: false,
 				},
@@ -8756,22 +8756,22 @@ var g = &grammar{
 		},
 		{
 			name: "BytesLiteral",
-			pos:  position{line: 1075, col: 1, offset: 30595},
+			pos:  position{line: 1075, col: 1, offset: 30598},
 			expr: &actionExpr{
-				pos: position{line: 1076, col: 5, offset: 30612},
+				pos: position{line: 1076, col: 5, offset: 30615},
 				run: (*parser).callonBytesLiteral1,
 				expr: &seqExpr{
-					pos: position{line: 1076, col: 5, offset: 30612},
+					pos: position{line: 1076, col: 5, offset: 30615},
 					exprs: []interface{}{
 						&litMatcher{
-							pos:        position{line: 1076, col: 5, offset: 30612},
+							pos:        position{line: 1076, col: 5, offset: 30615},
 							val:        "0x",
 							ignoreCase: false,
 						},
 						&zeroOrMoreExpr{
-							pos: position{line: 1076, col: 10, offset: 30617},
+							pos: position{line: 1076, col: 10, offset: 30620},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1076, col: 10, offset: 30617},
+								pos:  position{line: 1076, col: 10, offset: 30620},
 								name: "HexDigit",
 							},
 						},
@@ -8781,28 +8781,28 @@ var g = &grammar{
 		},
 		{
 			name: "TypeLiteral",
-			pos:  position{line: 1080, col: 1, offset: 30732},
+			pos:  position{line: 1080, col: 1, offset: 30735},
 			expr: &actionExpr{
-				pos: position{line: 1081, col: 5, offset: 30748},
+				pos: position{line: 1081, col: 5, offset: 30751},
 				run: (*parser).callonTypeLiteral1,
 				expr: &seqExpr{
-					pos: position{line: 1081, col: 5, offset: 30748},
+					pos: position{line: 1081, col: 5, offset: 30751},
 					exprs: []interface{}{
 						&litMatcher{
-							pos:        position{line: 1081, col: 5, offset: 30748},
+							pos:        position{line: 1081, col: 5, offset: 30751},
 							val:        "<",
 							ignoreCase: false,
 						},
 						&labeledExpr{
-							pos:   position{line: 1081, col: 9, offset: 30752},
+							pos:   position{line: 1081, col: 9, offset: 30755},
 							label: "typ",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1081, col: 13, offset: 30756},
+								pos:  position{line: 1081, col: 13, offset: 30759},
 								name: "Type",
 							},
 						},
 						&litMatcher{
-							pos:        position{line: 1081, col: 18, offset: 30761},
+							pos:        position{line: 1081, col: 18, offset: 30764},
 							val:        ">",
 							ignoreCase: false,
 						},
@@ -8810,47 +8810,22 @@ var g = &grammar{
 				},
 			},
 		},
-		{
-			name: "CastType",
-			pos:  position{line: 1085, col: 1, offset: 30850},
-			expr: &choiceExpr{
-				pos: position{line: 1086, col: 5, offset: 30863},
-				alternatives: []interface{}{
-					&ruleRefExpr{
-						pos:  position{line: 1086, col: 5, offset: 30863},
-						name: "TypeLiteral",
-					},
-					&actionExpr{
-						pos: position{line: 1087, col: 5, offset: 30879},
-						run: (*parser).callonCastType3,
-						expr: &labeledExpr{
-							pos:   position{line: 1087, col: 5, offset: 30879},
-							label: "typ",
-							expr: &ruleRefExpr{
-								pos:  position{line: 1087, col: 9, offset: 30883},
-								name: "PrimitiveType",
-							},
-						},
-					},
-				},
-			},
-		},
 		{
 			name: "Type",
-			pos:  position{line: 1091, col: 1, offset: 30982},
+			pos:  position{line: 1085, col: 1, offset: 30853},
 			expr: &choiceExpr{
-				pos: position{line: 1092, col: 5, offset: 30991},
+				pos: position{line: 1086, col: 5, offset: 30862},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1092, col: 5, offset: 30991},
+						pos:  position{line: 1086, col: 5, offset: 30862},
 						name: "TypeLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1093, col: 5, offset: 31007},
+						pos:  position{line: 1087, col: 5, offset: 30878},
 						name: "AmbiguousType",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1094, col: 5, offset: 31025},
+						pos:  position{line: 1088, col: 5, offset: 30896},
 						name: "ComplexType",
 					},
 				},
@@ -8858,28 +8833,28 @@ var g = &grammar{
 		},
 		{
 			name: "AmbiguousType",
-			pos:  position{line: 1096, col: 1, offset: 31038},
+			pos:  position{line: 1090, col: 1, offset: 30909},
 			expr: &choiceExpr{
-				pos: position{line: 1097, col: 5, offset: 31056},
+				pos: position{line: 1091, col: 5, offset: 30927},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1097, col: 5, offset: 31056},
+						pos: position{line: 1091, col: 5, offset: 30927},
 						run: (*parser).callonAmbiguousType2,
 						expr: &seqExpr{
-							pos: position{line: 1097, col: 5, offset: 31056},
+							pos: position{line: 1091, col: 5, offset: 30927},
 							exprs: []interface{}{
 								&labeledExpr{
-									pos:   position{line: 1097, col: 5, offset: 31056},
+									pos:   position{line: 1091, col: 5, offset: 30927},
 									label: "name",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1097, col: 10, offset: 31061},
+										pos:  position{line: 1091, col: 10, offset: 30932},
 										name: "PrimitiveType",
 									},
 								},
 								&notExpr{
-									pos: position{line: 1097, col: 24, offset: 31075},
+									pos: position{line: 1091, col: 24, offset: 30946},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1097, col: 25, offset: 31076},
+										pos:  position{line: 1091, col: 25, offset: 30947},
 										name: "IdentifierRest",
 									},
 								},
@@ -8887,42 +8862,42 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1098, col: 5, offset: 31116},
+						pos: position{line: 1092, col: 5, offset: 30987},
 						run: (*parser).callonAmbiguousType8,
 						expr: &seqExpr{
-							pos: position{line: 1098, col: 5, offset: 31116},
+							pos: position{line: 1092, col: 5, offset: 30987},
 							exprs: []interface{}{
 								&labeledExpr{
-									pos:   position{line: 1098, col: 5, offset: 31116},
+									pos:   position{line: 1092, col: 5, offset: 30987},
 									label: "name",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1098, col: 10, offset: 31121},
+										pos:  position{line: 1092, col: 10, offset: 30992},
 										name: "IdentifierName",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1098, col: 25, offset: 31136},
+									pos:   position{line: 1092, col: 25, offset: 31007},
 									label: "opt",
 									expr: &zeroOrOneExpr{
-										pos: position{line: 1098, col: 29, offset: 31140},
+										pos: position{line: 1092, col: 29, offset: 31011},
 										expr: &seqExpr{
-											pos: position{line: 1098, col: 30, offset: 31141},
+											pos: position{line: 1092, col: 30, offset: 31012},
 											exprs: []interface{}{
 												&ruleRefExpr{
-													pos:  position{line: 1098, col: 30, offset: 31141},
+													pos:  position{line: 1092, col: 30, offset: 31012},
 													name: "__",
 												},
 												&litMatcher{
-													pos:        position{line: 1098, col: 33, offset: 31144},
+													pos:        position{line: 1092, col: 33, offset: 31015},
 													val:        "=",
 													ignoreCase: false,
 												},
 												&ruleRefExpr{
-													pos:  position{line: 1098, col: 37, offset: 31148},
+													pos:  position{line: 1092, col: 37, offset: 31019},
 													name: "__",
 												},
 												&ruleRefExpr{
-													pos:  position{line: 1098, col: 40, offset: 31151},
+													pos:  position{line: 1092, col: 40, offset: 31022},
 													name: "Type",
 												},
 											},
@@ -8933,42 +8908,42 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1104, col: 5, offset: 31383},
+						pos: position{line: 1098, col: 5, offset: 31254},
 						run: (*parser).callonAmbiguousType19,
 						expr: &labeledExpr{
-							pos:   position{line: 1104, col: 5, offset: 31383},
+							pos:   position{line: 1098, col: 5, offset: 31254},
 							label: "name",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1104, col: 10, offset: 31388},
+								pos:  position{line: 1098, col: 10, offset: 31259},
 								name: "QuotedString",
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1107, col: 5, offset: 31488},
+						pos: position{line: 1101, col: 5, offset: 31359},
 						run: (*parser).callonAmbiguousType22,
 						expr: &seqExpr{
-							pos: position{line: 1107, col: 5, offset: 31488},
+							pos: position{line: 1101, col: 5, offset: 31359},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1107, col: 5, offset: 31488},
+									pos:        position{line: 1101, col: 5, offset: 31359},
 									val:        "(",
 									ignoreCase: false,
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1107, col: 9, offset: 31492},
+									pos:  position{line: 1101, col: 9, offset: 31363},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 1107, col: 12, offset: 31495},
+									pos:   position{line: 1101, col: 12, offset: 31366},
 									label: "u",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1107, col: 14, offset: 31497},
+										pos:  position{line: 1101, col: 14, offset: 31368},
 										name: "TypeUnion",
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1107, col: 24, offset: 31507},
+									pos:        position{line: 1101, col: 24, offset: 31378},
 									val:        ")",
 									ignoreCase: false,
 								},
@@ -8980,15 +8955,15 @@ var g = &grammar{
 		},
 		{
 			name: "TypeUnion",
-			pos:  position{line: 1109, col: 1, offset: 31530},
+			pos:  position{line: 1103, col: 1, offset: 31401},
 			expr: &actionExpr{
-				pos: position{line: 1110, col: 5, offset: 31544},
+				pos: position{line: 1104, col: 5, offset: 31415},
 				run: (*parser).callonTypeUnion1,
 				expr: &labeledExpr{
-					pos:   position{line: 1110, col: 5, offset: 31544},
+					pos:   position{line: 1104, col: 5, offset: 31415},
 					label: "types",
 					expr: &ruleRefExpr{
-						pos:  position{line: 1110, col: 11, offset: 31550},
+						pos:  position{line: 1104, col: 11, offset: 31421},
 						name: "TypeList",
 					},
 				},
@@ -8996,28 +8971,28 @@ var g = &grammar{
 		},
 		{
 			name: "TypeList",
-			pos:  position{line: 1114, col: 1, offset: 31646},
+			pos:  position{line: 1108, col: 1, offset: 31517},
 			expr: &actionExpr{
-				pos: position{line: 1115, col: 5, offset: 31659},
+				pos: position{line: 1109, col: 5, offset: 31530},
 				run: (*parser).callonTypeList1,
 				expr: &seqExpr{
-					pos: position{line: 1115, col: 5, offset: 31659},
+					pos: position{line: 1109, col: 5, offset: 31530},
 					exprs: []interface{}{
 						&labeledExpr{
-							pos:   position{line: 1115, col: 5, offset: 31659},
+							pos:   position{line: 1109, col: 5, offset: 31530},
 							label: "first",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1115, col: 11, offset: 31665},
+								pos:  position{line: 1109, col: 11, offset: 31536},
 								name: "Type",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1115, col: 16, offset: 31670},
+							pos:   position{line: 1109, col: 16, offset: 31541},
 							label: "rest",
 							expr: &oneOrMoreExpr{
-								pos: position{line: 1115, col: 21, offset: 31675},
+								pos: position{line: 1109, col: 21, offset: 31546},
 								expr: &ruleRefExpr{
-									pos:  position{line: 1115, col: 21, offset: 31675},
+									pos:  position{line: 1109, col: 21, offset: 31546},
 									name: "TypeListTail",
 								},
 							},
@@ -9028,31 +9003,31 @@ var g = &grammar{
 		},
 		{
 			name: "TypeListTail",
-			pos:  position{line: 1119, col: 1, offset: 31769},
+			pos:  position{line: 1113, col: 1, offset: 31640},
 			expr: &actionExpr{
-				pos: position{line: 1119, col: 16, offset: 31784},
+				pos: position{line: 1113, col: 16, offset: 31655},
 				run: (*parser).callonTypeListTail1,
 				expr: &seqExpr{
-					pos: position{line: 1119, col: 16, offset: 31784},
+					pos: position{line: 1113, col: 16, offset: 31655},
 					exprs: []interface{}{
 						&ruleRefExpr{
-							pos:  position{line: 1119, col: 16, offset: 31784},
+							pos:  position{line: 1113, col: 16, offset: 31655},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1119, col: 19, offset: 31787},
+							pos:        position{line: 1113, col: 19, offset: 31658},
 							val:        ",",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1119, col: 23, offset: 31791},
+							pos:  position{line: 1113, col: 23, offset: 31662},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1119, col: 26, offset: 31794},
+							pos:   position{line: 1113, col: 26, offset: 31665},
 							label: "typ",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1119, col: 30, offset: 31798},
+								pos:  position{line: 1113, col: 30, offset: 31669},
 								name: "Type",
 							},
 						},
@@ -9062,39 +9037,39 @@ var g = &grammar{
 		},
 		{
 			name: "ComplexType",
-			pos:  position{line: 1121, col: 1, offset: 31824},
+			pos:  position{line: 1115, col: 1, offset: 31695},
 			expr: &choiceExpr{
-				pos: position{line: 1122, col: 5, offset: 31840},
+				pos: position{line: 1116, col: 5, offset: 31711},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1122, col: 5, offset: 31840},
+						pos: position{line: 1116, col: 5, offset: 31711},
 						run: (*parser).callonComplexType2,
 						expr: &seqExpr{
-							pos: position{line: 1122, col: 5, offset: 31840},
+							pos: position{line: 1116, col: 5, offset: 31711},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1122, col: 5, offset: 31840},
+									pos:        position{line: 1116, col: 5, offset: 31711},
 									val:        "{",
 									ignoreCase: false,
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1122, col: 9, offset: 31844},
+									pos:  position{line: 1116, col: 9, offset: 31715},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 1122, col: 12, offset: 31847},
+									pos:   position{line: 1116, col: 12, offset: 31718},
 									label: "fields",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1122, col: 19, offset: 31854},
+										pos:  position{line: 1116, col: 19, offset: 31725},
 										name: "TypeFieldList",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1122, col: 33, offset: 31868},
+									pos:  position{line: 1116, col: 33, offset: 31739},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 1122, col: 36, offset: 31871},
+									pos:        position{line: 1116, col: 36, offset: 31742},
 									val:        "}",
 									ignoreCase: false,
 								},
@@ -9102,34 +9077,34 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1125, col: 5, offset: 31968},
+						pos: position{line: 1119, col: 5, offset: 31839},
 						run: (*parser).callonComplexType10,
 						expr: &seqExpr{
-							pos: position{line: 1125, col: 5, offset: 31968},
+							pos: position{line: 1119, col: 5, offset: 31839},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1125, col: 5, offset: 31968},
+									pos:        position{line: 1119, col: 5, offset: 31839},
 									val:        "[",
 									ignoreCase: false,
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1125, col: 9, offset: 31972},
+									pos:  position{line: 1119, col: 9, offset: 31843},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 1125, col: 12, offset: 31975},
+									pos:   position{line: 1119, col: 12, offset: 31846},
 									label: "typ",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1125, col: 16, offset: 31979},
+										pos:  position{line: 1119, col: 16, offset: 31850},
 										name: "Type",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1125, col: 21, offset: 31984},
+									pos:  position{line: 1119, col: 21, offset: 31855},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 1125, col: 24, offset: 31987},
+									pos:        position{line: 1119, col: 24, offset: 31858},
 									val:        "]",
 									ignoreCase: false,
 								},
@@ -9137,34 +9112,34 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1128, col: 5, offset: 32078},
+						pos: position{line: 1122, col: 5, offset: 31949},
 						run: (*parser).callonComplexType18,
 						expr: &seqExpr{
-							pos: position{line: 1128, col: 5, offset: 32078},
+							pos: position{line: 1122, col: 5, offset: 31949},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1128, col: 5, offset: 32078},
+									pos:        position{line: 1122, col: 5, offset: 31949},
 									val:        "|[",
 									ignoreCase: false,
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1128, col: 10, offset: 32083},
+									pos:  position{line: 1122, col: 10, offset: 31954},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 1128, col: 13, offset: 32086},
+									pos:   position{line: 1122, col: 13, offset: 31957},
 									label: "typ",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1128, col: 17, offset: 32090},
+										pos:  position{line: 1122, col: 17, offset: 31961},
 										name: "Type",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1128, col: 22, offset: 32095},
+									pos:  position{line: 1122, col: 22, offset: 31966},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 1128, col: 25, offset: 32098},
+									pos:        position{line: 1122, col: 25, offset: 31969},
 									val:        "]|",
 									ignoreCase: false,
 								},
@@ -9172,55 +9147,55 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1131, col: 5, offset: 32188},
+						pos: position{line: 1125, col: 5, offset: 32059},
 						run: (*parser).callonComplexType26,
 						expr: &seqExpr{
-							pos: position{line: 1131, col: 5, offset: 32188},
+							pos: position{line: 1125, col: 5, offset: 32059},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1131, col: 5, offset: 32188},
+									pos:        position{line: 1125, col: 5, offset: 32059},
 									val:        "|{",
 									ignoreCase: false,
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1131, col: 10, offset: 32193},
+									pos:  position{line: 1125, col: 10, offset: 32064},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 1131, col: 13, offset: 32196},
+									pos:   position{line: 1125, col: 13, offset: 32067},
 									label: "keyType",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1131, col: 21, offset: 32204},
+										pos:  position{line: 1125, col: 21, offset: 32075},
 										name: "Type",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1131, col: 26, offset: 32209},
+									pos:  position{line: 1125, col: 26, offset: 32080},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 1131, col: 29, offset: 32212},
+									pos:        position{line: 1125, col: 29, offset: 32083},
 									val:        ":",
 									ignoreCase: false,
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1131, col: 33, offset: 32216},
+									pos:  position{line: 1125, col: 33, offset: 32087},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 1131, col: 36, offset: 32219},
+									pos:   position{line: 1125, col: 36, offset: 32090},
 									label: "valType",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1131, col: 44, offset: 32227},
+										pos:  position{line: 1125, col: 44, offset: 32098},
 										name: "Type",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1131, col: 49, offset: 32232},
+									pos:  position{line: 1125, col: 49, offset: 32103},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 1131, col: 52, offset: 32235},
+									pos:        position{line: 1125, col: 52, offset: 32106},
 									val:        "}|",
 									ignoreCase: false,
 								},
@@ -9232,15 +9207,15 @@ var g = &grammar{
 		},
 		{
 			name: "TemplateLiteral",
-			pos:  position{line: 1135, col: 1, offset: 32351},
+			pos:  position{line: 1129, col: 1, offset: 32222},
 			expr: &actionExpr{
-				pos: position{line: 1136, col: 5, offset: 32371},
+				pos: position{line: 1130, col: 5, offset: 32242},
 				run: (*parser).callonTemplateLiteral1,
 				expr: &labeledExpr{
-					pos:   position{line: 1136, col: 5, offset: 32371},
+					pos:   position{line: 1130, col: 5, offset: 32242},
 					label: "v",
 					expr: &ruleRefExpr{
-						pos:  position{line: 1136, col: 7, offset: 32373},
+						pos:  position{line: 1130, col: 7, offset: 32244},
 						name: "TemplateLiteralParts",
 					},
 				},
@@ -9248,34 +9223,34 @@ var g = &grammar{
 		},
 		{
 			name: "TemplateLiteralParts",
-			pos:  position{line: 1143, col: 1, offset: 32589},
+			pos:  position{line: 1137, col: 1, offset: 32460},
 			expr: &choiceExpr{
-				pos: position{line: 1144, col: 5, offset: 32614},
+				pos: position{line: 1138, col: 5, offset: 32485},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1144, col: 5, offset: 32614},
+						pos: position{line: 1138, col: 5, offset: 32485},
 						run: (*parser).callonTemplateLiteralParts2,
 						expr: &seqExpr{
-							pos: position{line: 1144, col: 5, offset: 32614},
+							pos: position{line: 1138, col: 5, offset: 32485},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1144, col: 5, offset: 32614},
+									pos:        position{line: 1138, col: 5, offset: 32485},
 									val:        "\"",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 1144, col: 9, offset: 32618},
+									pos:   position{line: 1138, col: 9, offset: 32489},
 									label: "v",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1144, col: 11, offset: 32620},
+										pos: position{line: 1138, col: 11, offset: 32491},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1144, col: 11, offset: 32620},
+											pos:  position{line: 1138, col: 11, offset: 32491},
 											name: "TemplateDoubleQuotedPart",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1144, col: 37, offset: 32646},
+									pos:        position{line: 1138, col: 37, offset: 32517},
 									val:        "\"",
 									ignoreCase: false,
 								},
@@ -9283,29 +9258,29 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1145, col: 5, offset: 32672},
+						pos: position{line: 1139, col: 5, offset: 32543},
 						run: (*parser).callonTemplateLiteralParts9,
 						expr: &seqExpr{
-							pos: position{line: 1145, col: 5, offset: 32672},
+							pos: position{line: 1139, col: 5, offset: 32543},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1145, col: 5, offset: 32672},
+									pos:        position{line: 1139, col: 5, offset: 32543},
 									val:        "'",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 1145, col: 9, offset: 32676},
+									pos:   position{line: 1139, col: 9, offset: 32547},
 									label: "v",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1145, col: 11, offset: 32678},
+										pos: position{line: 1139, col: 11, offset: 32549},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1145, col: 11, offset: 32678},
+											pos:  position{line: 1139, col: 11, offset: 32549},
 											name: "TemplateSingleQuotedPart",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1145, col: 37, offset: 32704},
+									pos:        position{line: 1139, col: 37, offset: 32575},
 									val:        "'",
 									ignoreCase: false,
 								},
@@ -9317,24 +9292,24 @@ var g = &grammar{
 		},
 		{
 			name: "TemplateDoubleQuotedPart",
-			pos:  position{line: 1147, col: 1, offset: 32727},
+			pos:  position{line: 1141, col: 1, offset: 32598},
 			expr: &choiceExpr{
-				pos: position{line: 1148, col: 5, offset: 32756},
+				pos: position{line: 1142, col: 5, offset: 32627},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1148, col: 5, offset: 32756},
+						pos:  position{line: 1142, col: 5, offset: 32627},
 						name: "TemplateExpr",
 					},
 					&actionExpr{
-						pos: position{line: 1149, col: 5, offset: 32773},
+						pos: position{line: 1143, col: 5, offset: 32644},
 						run: (*parser).callonTemplateDoubleQuotedPart3,
 						expr: &labeledExpr{
-							pos:   position{line: 1149, col: 5, offset: 32773},
+							pos:   position{line: 1143, col: 5, offset: 32644},
 							label: "v",
 							expr: &oneOrMoreExpr{
-								pos: position{line: 1149, col: 7, offset: 32775},
+								pos: position{line: 1143, col: 7, offset: 32646},
 								expr: &ruleRefExpr{
-									pos:  position{line: 1149, col: 7, offset: 32775},
+									pos:  position{line: 1143, col: 7, offset: 32646},
 									name: "TemplateDoubleQuotedChar",
 								},
 							},
@@ -9345,26 +9320,26 @@ var g = &grammar{
 		},
 		{
 			name: "TemplateDoubleQuotedChar",
-			pos:  position{line: 1153, col: 1, offset: 32912},
+			pos:  position{line: 1147, col: 1, offset: 32783},
 			expr: &choiceExpr{
-				pos: position{line: 1154, col: 5, offset: 32941},
+				pos: position{line: 1148, col: 5, offset: 32812},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1154, col: 5, offset: 32941},
+						pos: position{line: 1148, col: 5, offset: 32812},
 						run: (*parser).callonTemplateDoubleQuotedChar2,
 						expr: &seqExpr{
-							pos: position{line: 1154, col: 5, offset: 32941},
+							pos: position{line: 1148, col: 5, offset: 32812},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1154, col: 5, offset: 32941},
+									pos:        position{line: 1148, col: 5, offset: 32812},
 									val:        "\\",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 1154, col: 10, offset: 32946},
+									pos:   position{line: 1148, col: 10, offset: 32817},
 									label: "v",
 									expr: &litMatcher{
-										pos:        position{line: 1154, col: 12, offset: 32948},
+										pos:        position{line: 1148, col: 12, offset: 32819},
 										val:        "${",
 										ignoreCase: false,
 									},
@@ -9373,24 +9348,24 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1155, col: 5, offset: 32975},
+						pos: position{line: 1149, col: 5, offset: 32846},
 						run: (*parser).callonTemplateDoubleQuotedChar7,
 						expr: &seqExpr{
-							pos: position{line: 1155, col: 5, offset: 32975},
+							pos: position{line: 1149, col: 5, offset: 32846},
 							exprs: []interface{}{
 								&notExpr{
-									pos: position{line: 1155, col: 5, offset: 32975},
+									pos: position{line: 1149, col: 5, offset: 32846},
 									expr: &litMatcher{
-										pos:        position{line: 1155, col: 7, offset: 32977},
+										pos:        position{line: 1149, col: 7, offset: 32848},
 										val:        "${",
 										ignoreCase: false,
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1155, col: 13, offset: 32983},
+									pos:   position{line: 1149, col: 13, offset: 32854},
 									label: "v",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1155, col: 15, offset: 32985},
+										pos:  position{line: 1149, col: 15, offset: 32856},
 										name: "DoubleQuotedChar",
 									},
 								},
@@ -9402,24 +9377,24 @@ var g = &grammar{
 		},
 		{
 			name: "TemplateSingleQuotedPart",
-			pos:  position{line: 1157, col: 1, offset: 33021},
+			pos:  position{line: 1151, col: 1, offset: 32892},
 			expr: &choiceExpr{
-				pos: position{line: 1158, col: 5, offset: 33050},
+				pos: position{line: 1152, col: 5, offset: 32921},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1158, col: 5, offset: 33050},
+						pos:  position{line: 1152, col: 5, offset: 32921},
 						name: "TemplateExpr",
 					},
 					&actionExpr{
-						pos: position{line: 1159, col: 5, offset: 33067},
+						pos: position{line: 1153, col: 5, offset: 32938},
 						run: (*parser).callonTemplateSingleQuotedPart3,
 						expr: &labeledExpr{
-							pos:   position{line: 1159, col: 5, offset: 33067},
+							pos:   position{line: 1153, col: 5, offset: 32938},
 							label: "v",
 							expr: &oneOrMoreExpr{
-								pos: position{line: 1159, col: 7, offset: 33069},
+								pos: position{line: 1153, col: 7, offset: 32940},
 								expr: &ruleRefExpr{
-									pos:  position{line: 1159, col: 7, offset: 33069},
+									pos:  position{line: 1153, col: 7, offset: 32940},
 									name: "TemplateSingleQuotedChar",
 								},
 							},
@@ -9430,26 +9405,26 @@ var g = &grammar{
 		},
 		{
 			name: "TemplateSingleQuotedChar",
-			pos:  position{line: 1163, col: 1, offset: 33206},
+			pos:  position{line: 1157, col: 1, offset: 33077},
 			expr: &choiceExpr{
-				pos: position{line: 1164, col: 5, offset: 33235},
+				pos: position{line: 1158, col: 5, offset: 33106},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1164, col: 5, offset: 33235},
+						pos: position{line: 1158, col: 5, offset: 33106},
 						run: (*parser).callonTemplateSingleQuotedChar2,
 						expr: &seqExpr{
-							pos: position{line: 1164, col: 5, offset: 33235},
+							pos: position{line: 1158, col: 5, offset: 33106},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1164, col: 5, offset: 33235},
+									pos:        position{line: 1158, col: 5, offset: 33106},
 									val:        "\\",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 1164, col: 10, offset: 33240},
+									pos:   position{line: 1158, col: 10, offset: 33111},
 									label: "v",
 									expr: &litMatcher{
-										pos:        position{line: 1164, col: 12, offset: 33242},
+										pos:        position{line: 1158, col: 12, offset: 33113},
 										val:        "${",
 										ignoreCase: false,
 									},
@@ -9458,24 +9433,24 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1165, col: 5, offset: 33269},
+						pos: position{line: 1159, col: 5, offset: 33140},
 						run: (*parser).callonTemplateSingleQuotedChar7,
 						expr: &seqExpr{
-							pos: position{line: 1165, col: 5, offset: 33269},
+							pos: position{line: 1159, col: 5, offset: 33140},
 							exprs: []interface{}{
 								&notExpr{
-									pos: position{line: 1165, col: 5, offset: 33269},
+									pos: position{line: 1159, col: 5, offset: 33140},
 									expr: &litMatcher{
-										pos:        position{line: 1165, col: 7, offset: 33271},
+										pos:        position{line: 1159, col: 7, offset: 33142},
 										val:        "${",
 										ignoreCase: false,
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1165, col: 13, offset: 33277},
+									pos:   position{line: 1159, col: 13, offset: 33148},
 									label: "v",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1165, col: 15, offset: 33279},
+										pos:  position{line: 1159, col: 15, offset: 33150},
 										name: "SingleQuotedChar",
 									},
 								},
@@ -9487,36 +9462,36 @@ var g = &grammar{
 		},
 		{
 			name: "TemplateExpr",
-			pos:  position{line: 1167, col: 1, offset: 33315},
+			pos:  position{line: 1161, col: 1, offset: 33186},
 			expr: &actionExpr{
-				pos: position{line: 1168, col: 5, offset: 33332},
+				pos: position{line: 1162, col: 5, offset: 33203},
 				run: (*parser).callonTemplateExpr1,
 				expr: &seqExpr{
-					pos: position{line: 1168, col: 5, offset: 33332},
+					pos: position{line: 1162, col: 5, offset: 33203},
 					exprs: []interface{}{
 						&litMatcher{
-							pos:        position{line: 1168, col: 5, offset: 33332},
+							pos:        position{line: 1162, col: 5, offset: 33203},
 							val:        "${",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1168, col: 10, offset: 33337},
+							pos:  position{line: 1162, col: 10, offset: 33208},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1168, col: 13, offset: 33340},
+							pos:   position{line: 1162, col: 13, offset: 33211},
 							label: "e",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1168, col: 15, offset: 33342},
+								pos:  position{line: 1162, col: 15, offset: 33213},
 								name: "Expr",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1168, col: 20, offset: 33347},
+							pos:  position{line: 1162, col: 20, offset: 33218},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1168, col: 23, offset: 33350},
+							pos:        position{line: 1162, col: 23, offset: 33221},
 							val:        "}",
 							ignoreCase: false,
 						},
@@ -9526,110 +9501,110 @@ var g = &grammar{
 		},
 		{
 			name: "PrimitiveType",
-			pos:  position{line: 1183, col: 1, offset: 33646},
+			pos:  position{line: 1177, col: 1, offset: 33517},
 			expr: &actionExpr{
-				pos: position{line: 1184, col: 5, offset: 33664},
+				pos: position{line: 1178, col: 5, offset: 33535},
 				run: (*parser).callonPrimitiveType1,
 				expr: &choiceExpr{
-					pos: position{line: 1184, col: 9, offset: 33668},
+					pos: position{line: 1178, col: 9, offset: 33539},
 					alternatives: []interface{}{
 						&litMatcher{
-							pos:        position{line: 1184, col: 9, offset: 33668},
+							pos:        position{line: 1178, col: 9, offset: 33539},
 							val:        "uint8",
 							ignoreCase: false,
 						},
 						&litMatcher{
-							pos:        position{line: 1184, col: 19, offset: 33678},
+							pos:        position{line: 1178, col: 19, offset: 33549},
 							val:        "uint16",
 							ignoreCase: false,
 						},
 						&litMatcher{
-							pos:        position{line: 1184, col: 30, offset: 33689},
+							pos:        position{line: 1178, col: 30, offset: 33560},
 							val:        "uint32",
 							ignoreCase: false,
 						},
 						&litMatcher{
-							pos:        position{line: 1184, col: 41, offset: 33700},
+							pos:        position{line: 1178, col: 41, offset: 33571},
 							val:        "uint64",
 							ignoreCase: false,
 						},
 						&litMatcher{
-							pos:        position{line: 1185, col: 9, offset: 33717},
+							pos:        position{line: 1179, col: 9, offset: 33588},
 							val:        "int8",
 							ignoreCase: false,
 						},
 						&litMatcher{
-							pos:        position{line: 1185, col: 18, offset: 33726},
+							pos:        position{line: 1179, col: 18, offset: 33597},
 							val:        "int16",
 							ignoreCase: false,
 						},
 						&litMatcher{
-							pos:        position{line: 1185, col: 28, offset: 33736},
+							pos:        position{line: 1179, col: 28, offset: 33607},
 							val:        "int32",
 							ignoreCase: false,
 						},
 						&litMatcher{
-							pos:        position{line: 1185, col: 38, offset: 33746},
+							pos:        position{line: 1179, col: 38, offset: 33617},
 							val:        "int64",
 							ignoreCase: false,
 						},
 						&litMatcher{
-							pos:        position{line: 1186, col: 9, offset: 33762},
+							pos:        position{line: 1180, col: 9, offset: 33633},
 							val:        "float16",
 							ignoreCase: false,
 						},
 						&litMatcher{
-							pos:        position{line: 1186, col: 21, offset: 33774},
+							pos:        position{line: 1180, col: 21, offset: 33645},
 							val:        "float32",
 							ignoreCase: false,
 						},
 						&litMatcher{
-							pos:        position{line: 1186, col: 33, offset: 33786},
+							pos:        position{line: 1180, col: 33, offset: 33657},
 							val:        "float64",
 							ignoreCase: false,
 						},
 						&litMatcher{
-							pos:        position{line: 1187, col: 9, offset: 33804},
+							pos:        position{line: 1181, col: 9, offset: 33675},
 							val:        "bool",
 							ignoreCase: false,
 						},
 						&litMatcher{
-							pos:        position{line: 1187, col: 18, offset: 33813},
+							pos:        position{line: 1181, col: 18, offset: 33684},
 							val:        "string",
 							ignoreCase: false,
 						},
 						&litMatcher{
-							pos:        position{line: 1188, col: 9, offset: 33830},
+							pos:        position{line: 1182, col: 9, offset: 33701},
 							val:        "duration",
 							ignoreCase: false,
 						},
 						&litMatcher{
-							pos:        position{line: 1188, col: 22, offset: 33843},
+							pos:        position{line: 1182, col: 22, offset: 33714},
 							val:        "time",
 							ignoreCase: false,
 						},
 						&litMatcher{
-							pos:        position{line: 1189, col: 9, offset: 33858},
+							pos:        position{line: 1183, col: 9, offset: 33729},
 							val:        "bytes",
 							ignoreCase: false,
 						},
 						&litMatcher{
-							pos:        position{line: 1190, col: 9, offset: 33874},
+							pos:        position{line: 1184, col: 9, offset: 33745},
 							val:        "ip",
 							ignoreCase: false,
 						},
 						&litMatcher{
-							pos:        position{line: 1190, col: 16, offset: 33881},
+							pos:        position{line: 1184, col: 16, offset: 33752},
 							val:        "net",
 							ignoreCase: false,
 						},
 						&litMatcher{
-							pos:        position{line: 1191, col: 9, offset: 33895},
+							pos:        position{line: 1185, col: 9, offset: 33766},
 							val:        "type",
 							ignoreCase: false,
 						},
 						&litMatcher{
-							pos:        position{line: 1191, col: 18, offset: 33904},
+							pos:        position{line: 1185, col: 18, offset: 33775},
 							val:        "null",
 							ignoreCase: false,
 						},
@@ -9639,31 +9614,31 @@ var g = &grammar{
 		},
 		{
 			name: "TypeFieldList",
-			pos:  position{line: 1195, col: 1, offset: 34019},
+			pos:  position{line: 1189, col: 1, offset: 33890},
 			expr: &choiceExpr{
-				pos: position{line: 1196, col: 5, offset: 34037},
+				pos: position{line: 1190, col: 5, offset: 33908},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1196, col: 5, offset: 34037},
+						pos: position{line: 1190, col: 5, offset: 33908},
 						run: (*parser).callonTypeFieldList2,
 						expr: &seqExpr{
-							pos: position{line: 1196, col: 5, offset: 34037},
+							pos: position{line: 1190, col: 5, offset: 33908},
 							exprs: []interface{}{
 								&labeledExpr{
-									pos:   position{line: 1196, col: 5, offset: 34037},
+									pos:   position{line: 1190, col: 5, offset: 33908},
 									label: "first",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1196, col: 11, offset: 34043},
+										pos:  position{line: 1190, col: 11, offset: 33914},
 										name: "TypeField",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1196, col: 21, offset: 34053},
+									pos:   position{line: 1190, col: 21, offset: 33924},
 									label: "rest",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1196, col: 26, offset: 34058},
+										pos: position{line: 1190, col: 26, offset: 33929},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1196, col: 26, offset: 34058},
+											pos:  position{line: 1190, col: 26, offset: 33929},
 											name: "TypeFieldListTail",
 										},
 									},
@@ -9672,10 +9647,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1199, col: 5, offset: 34160},
+						pos: position{line: 1193, col: 5, offset: 34031},
 						run: (*parser).callonTypeFieldList9,
 						expr: &litMatcher{
-							pos:        position{line: 1199, col: 5, offset: 34160},
+							pos:        position{line: 1193, col: 5, offset: 34031},
 							val:        "",
 							ignoreCase: false,
 						},
@@ -9685,31 +9660,31 @@ var g = &grammar{
 		},
 		{
 			name: "TypeFieldListTail",
-			pos:  position{line: 1201, col: 1, offset: 34184},
+			pos:  position{line: 1195, col: 1, offset: 34055},
 			expr: &actionExpr{
-				pos: position{line: 1201, col: 21, offset: 34204},
+				pos: position{line: 1195, col: 21, offset: 34075},
 				run: (*parser).callonTypeFieldListTail1,
 				expr: &seqExpr{
-					pos: position{line: 1201, col: 21, offset: 34204},
+					pos: position{line: 1195, col: 21, offset: 34075},
 					exprs: []interface{}{
 						&ruleRefExpr{
-							pos:  position{line: 1201, col: 21, offset: 34204},
+							pos:  position{line: 1195, col: 21, offset: 34075},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1201, col: 24, offset: 34207},
+							pos:        position{line: 1195, col: 24, offset: 34078},
 							val:        ",",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1201, col: 28, offset: 34211},
+							pos:  position{line: 1195, col: 28, offset: 34082},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1201, col: 31, offset: 34214},
+							pos:   position{line: 1195, col: 31, offset: 34085},
 							label: "typ",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1201, col: 35, offset: 34218},
+								pos:  position{line: 1195, col: 35, offset: 34089},
 								name: "TypeField",
 							},
 						},
@@ -9719,39 +9694,39 @@ var g = &grammar{
 		},
 		{
 			name: "TypeField",
-			pos:  position{line: 1203, col: 1, offset: 34249},
+			pos:  position{line: 1197, col: 1, offset: 34120},
 			expr: &actionExpr{
-				pos: position{line: 1204, col: 5, offset: 34263},
+				pos: position{line: 1198, col: 5, offset: 34134},
 				run: (*parser).callonTypeField1,
 				expr: &seqExpr{
-					pos: position{line: 1204, col: 5, offset: 34263},
+					pos: position{line: 1198, col: 5, offset: 34134},
 					exprs: []interface{}{
 						&labeledExpr{
-							pos:   position{line: 1204, col: 5, offset: 34263},
+							pos:   position{line: 1198, col: 5, offset: 34134},
 							label: "name",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1204, col: 10, offset: 34268},
+								pos:  position{line: 1198, col: 10, offset: 34139},
 								name: "FieldName",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1204, col: 20, offset: 34278},
+							pos:  position{line: 1198, col: 20, offset: 34149},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1204, col: 23, offset: 34281},
+							pos:        position{line: 1198, col: 23, offset: 34152},
 							val:        ":",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1204, col: 27, offset: 34285},
+							pos:  position{line: 1198, col: 27, offset: 34156},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1204, col: 30, offset: 34288},
+							pos:   position{line: 1198, col: 30, offset: 34159},
 							label: "typ",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1204, col: 34, offset: 34292},
+								pos:  position{line: 1198, col: 34, offset: 34163},
 								name: "Type",
 							},
 						},
@@ -9761,16 +9736,16 @@ var g = &grammar{
 		},
 		{
 			name: "FieldName",
-			pos:  position{line: 1208, col: 1, offset: 34374},
+			pos:  position{line: 1202, col: 1, offset: 34245},
 			expr: &choiceExpr{
-				pos: position{line: 1209, col: 5, offset: 34388},
+				pos: position{line: 1203, col: 5, offset: 34259},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1209, col: 5, offset: 34388},
+						pos:  position{line: 1203, col: 5, offset: 34259},
 						name: "IdentifierName",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1210, col: 5, offset: 34407},
+						pos:  position{line: 1204, col: 5, offset: 34278},
 						name: "QuotedString",
 					},
 				},
@@ -9778,32 +9753,32 @@ var g = &grammar{
 		},
 		{
 			name: "AndToken",
-			pos:  position{line: 1212, col: 1, offset: 34421},
+			pos:  position{line: 1206, col: 1, offset: 34292},
 			expr: &actionExpr{
-				pos: position{line: 1212, col: 12, offset: 34432},
+				pos: position{line: 1206, col: 12, offset: 34303},
 				run: (*parser).callonAndToken1,
 				expr: &seqExpr{
-					pos: position{line: 1212, col: 12, offset: 34432},
+					pos: position{line: 1206, col: 12, offset: 34303},
 					exprs: []interface{}{
 						&choiceExpr{
-							pos: position{line: 1212, col: 13, offset: 34433},
+							pos: position{line: 1206, col: 13, offset: 34304},
 							alternatives: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1212, col: 13, offset: 34433},
+									pos:        position{line: 1206, col: 13, offset: 34304},
 									val:        "and",
 									ignoreCase: false,
 								},
 								&litMatcher{
-									pos:        position{line: 1212, col: 21, offset: 34441},
+									pos:        position{line: 1206, col: 21, offset: 34312},
 									val:        "AND",
 									ignoreCase: false,
 								},
 							},
 						},
 						&notExpr{
-							pos: position{line: 1212, col: 28, offset: 34448},
+							pos: position{line: 1206, col: 28, offset: 34319},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1212, col: 29, offset: 34449},
+								pos:  position{line: 1206, col: 29, offset: 34320},
 								name: "IdentifierRest",
 							},
 						},
@@ -9813,32 +9788,32 @@ var g = &grammar{
 		},
 		{
 			name: "OrToken",
-			pos:  position{line: 1213, col: 1, offset: 34486},
+			pos:  position{line: 1207, col: 1, offset: 34357},
 			expr: &actionExpr{
-				pos: position{line: 1213, col: 11, offset: 34496},
+				pos: position{line: 1207, col: 11, offset: 34367},
 				run: (*parser).callonOrToken1,
 				expr: &seqExpr{
-					pos: position{line: 1213, col: 11, offset: 34496},
+					pos: position{line: 1207, col: 11, offset: 34367},
 					exprs: []interface{}{
 						&choiceExpr{
-							pos: position{line: 1213, col: 12, offset: 34497},
+							pos: position{line: 1207, col: 12, offset: 34368},
 							alternatives: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1213, col: 12, offset: 34497},
+									pos:        position{line: 1207, col: 12, offset: 34368},
 									val:        "or",
 									ignoreCase: false,
 								},
 								&litMatcher{
-									pos:        position{line: 1213, col: 19, offset: 34504},
+									pos:        position{line: 1207, col: 19, offset: 34375},
 									val:        "OR",
 									ignoreCase: false,
 								},
 							},
 						},
 						&notExpr{
-							pos: position{line: 1213, col: 25, offset: 34510},
+							pos: position{line: 1207, col: 25, offset: 34381},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1213, col: 26, offset: 34511},
+								pos:  position{line: 1207, col: 26, offset: 34382},
 								name: "IdentifierRest",
 							},
 						},
@@ -9848,22 +9823,22 @@ var g = &grammar{
 		},
 		{
 			name: "InToken",
-			pos:  position{line: 1214, col: 1, offset: 34547},
+			pos:  position{line: 1208, col: 1, offset: 34418},
 			expr: &actionExpr{
-				pos: position{line: 1214, col: 11, offset: 34557},
+				pos: position{line: 1208, col: 11, offset: 34428},
 				run: (*parser).callonInToken1,
 				expr: &seqExpr{
-					pos: position{line: 1214, col: 11, offset: 34557},
+					pos: position{line: 1208, col: 11, offset: 34428},
 					exprs: []interface{}{
 						&litMatcher{
-							pos:        position{line: 1214, col: 11, offset: 34557},
+							pos:        position{line: 1208, col: 11, offset: 34428},
 							val:        "in",
 							ignoreCase: false,
 						},
 						&notExpr{
-							pos: position{line: 1214, col: 16, offset: 34562},
+							pos: position{line: 1208, col: 16, offset: 34433},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1214, col: 17, offset: 34563},
+								pos:  position{line: 1208, col: 17, offset: 34434},
 								name: "IdentifierRest",
 							},
 						},
@@ -9873,32 +9848,32 @@ var g = &grammar{
 		},
 		{
 			name: "NotToken",
-			pos:  position{line: 1215, col: 1, offset: 34599},
+			pos:  position{line: 1209, col: 1, offset: 34470},
 			expr: &actionExpr{
-				pos: position{line: 1215, col: 12, offset: 34610},
+				pos: position{line: 1209, col: 12, offset: 34481},
 				run: (*parser).callonNotToken1,
 				expr: &seqExpr{
-					pos: position{line: 1215, col: 12, offset: 34610},
+					pos: position{line: 1209, col: 12, offset: 34481},
 					exprs: []interface{}{
 						&choiceExpr{
-							pos: position{line: 1215, col: 13, offset: 34611},
+							pos: position{line: 1209, col: 13, offset: 34482},
 							alternatives: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1215, col: 13, offset: 34611},
+									pos:        position{line: 1209, col: 13, offset: 34482},
 									val:        "not",
 									ignoreCase: false,
 								},
 								&litMatcher{
-									pos:        position{line: 1215, col: 21, offset: 34619},
+									pos:        position{line: 1209, col: 21, offset: 34490},
 									val:        "NOT",
 									ignoreCase: false,
 								},
 							},
 						},
 						&notExpr{
-							pos: position{line: 1215, col: 28, offset: 34626},
+							pos: position{line: 1209, col: 28, offset: 34497},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1215, col: 29, offset: 34627},
+								pos:  position{line: 1209, col: 29, offset: 34498},
 								name: "IdentifierRest",
 							},
 						},
@@ -9908,22 +9883,22 @@ var g = &grammar{
 		},
 		{
 			name: "ByToken",
-			pos:  position{line: 1216, col: 1, offset: 34664},
+			pos:  position{line: 1210, col: 1, offset: 34535},
 			expr: &actionExpr{
-				pos: position{line: 1216, col: 11, offset: 34674},
+				pos: position{line: 1210, col: 11, offset: 34545},
 				run: (*parser).callonByToken1,
 				expr: &seqExpr{
-					pos: position{line: 1216, col: 11, offset: 34674},
+					pos: position{line: 1210, col: 11, offset: 34545},
 					exprs: []interface{}{
 						&litMatcher{
-							pos:        position{line: 1216, col: 11, offset: 34674},
+							pos:        position{line: 1210, col: 11, offset: 34545},
 							val:        "by",
 							ignoreCase: false,
 						},
 						&notExpr{
-							pos: position{line: 1216, col: 16, offset: 34679},
+							pos: position{line: 1210, col: 16, offset: 34550},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1216, col: 17, offset: 34680},
+								pos:  position{line: 1210, col: 17, offset: 34551},
 								name: "IdentifierRest",
 							},
 						},
@@ -9933,9 +9908,9 @@ var g = &grammar{
 		},
 		{
 			name: "IdentifierStart",
-			pos:  position{line: 1218, col: 1, offset: 34717},
+			pos:  position{line: 1212, col: 1, offset: 34588},
 			expr: &charClassMatcher{
-				pos:        position{line: 1218, col: 19, offset: 34735},
+				pos:        position{line: 1212, col: 19, offset: 34606},
 				val:        "[A-Za-z_$]",
 				chars:      []rune{'_', '$'},
 				ranges:     []rune{'A', 'Z', 'a', 'z'},
@@ -9945,16 +9920,16 @@ var g = &grammar{
 		},
 		{
 			name: "IdentifierRest",
-			pos:  position{line: 1220, col: 1, offset: 34747},
+			pos:  position{line: 1214, col: 1, offset: 34618},
 			expr: &choiceExpr{
-				pos: position{line: 1220, col: 18, offset: 34764},
+				pos: position{line: 1214, col: 18, offset: 34635},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1220, col: 18, offset: 34764},
+						pos:  position{line: 1214, col: 18, offset: 34635},
 						name: "IdentifierStart",
 					},
 					&charClassMatcher{
-						pos:        position{line: 1220, col: 36, offset: 34782},
+						pos:        position{line: 1214, col: 36, offset: 34653},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
@@ -9965,15 +9940,15 @@ var g = &grammar{
 		},
 		{
 			name: "Identifier",
-			pos:  position{line: 1222, col: 1, offset: 34789},
+			pos:  position{line: 1216, col: 1, offset: 34660},
 			expr: &actionExpr{
-				pos: position{line: 1223, col: 5, offset: 34804},
+				pos: position{line: 1217, col: 5, offset: 34675},
 				run: (*parser).callonIdentifier1,
 				expr: &labeledExpr{
-					pos:   position{line: 1223, col: 5, offset: 34804},
+					pos:   position{line: 1217, col: 5, offset: 34675},
 					label: "id",
 					expr: &ruleRefExpr{
-						pos:  position{line: 1223, col: 8, offset: 34807},
+						pos:  position{line: 1217, col: 8, offset: 34678},
 						name: "IdentifierName",
 					},
 				},
@@ -9981,29 +9956,29 @@ var g = &grammar{
 		},
 		{
 			name: "IdentifierName",
-			pos:  position{line: 1225, col: 1, offset: 34888},
+			pos:  position{line: 1219, col: 1, offset: 34759},
 			expr: &choiceExpr{
-				pos: position{line: 1226, col: 5, offset: 34907},
+				pos: position{line: 1220, col: 5, offset: 34778},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1226, col: 5, offset: 34907},
+						pos: position{line: 1220, col: 5, offset: 34778},
 						run: (*parser).callonIdentifierName2,
 						expr: &seqExpr{
-							pos: position{line: 1226, col: 5, offset: 34907},
+							pos: position{line: 1220, col: 5, offset: 34778},
 							exprs: []interface{}{
 								&notExpr{
-									pos: position{line: 1226, col: 5, offset: 34907},
+									pos: position{line: 1220, col: 5, offset: 34778},
 									expr: &seqExpr{
-										pos: position{line: 1226, col: 7, offset: 34909},
+										pos: position{line: 1220, col: 7, offset: 34780},
 										exprs: []interface{}{
 											&ruleRefExpr{
-												pos:  position{line: 1226, col: 7, offset: 34909},
+												pos:  position{line: 1220, col: 7, offset: 34780},
 												name: "IDGuard",
 											},
 											&notExpr{
-												pos: position{line: 1226, col: 15, offset: 34917},
+												pos: position{line: 1220, col: 15, offset: 34788},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1226, col: 16, offset: 34918},
+													pos:  position{line: 1220, col: 16, offset: 34789},
 													name: "IdentifierRest",
 												},
 											},
@@ -10011,13 +9986,13 @@ var g = &grammar{
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1226, col: 32, offset: 34934},
+									pos:  position{line: 1220, col: 32, offset: 34805},
 									name: "IdentifierStart",
 								},
 								&zeroOrMoreExpr{
-									pos: position{line: 1226, col: 48, offset: 34950},
+									pos: position{line: 1220, col: 48, offset: 34821},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1226, col: 48, offset: 34950},
+										pos:  position{line: 1220, col: 48, offset: 34821},
 										name: "IdentifierRest",
 									},
 								},
@@ -10025,30 +10000,30 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1227, col: 5, offset: 35001},
+						pos: position{line: 1221, col: 5, offset: 34872},
 						run: (*parser).callonIdentifierName12,
 						expr: &litMatcher{
-							pos:        position{line: 1227, col: 5, offset: 35001},
+							pos:        position{line: 1221, col: 5, offset: 34872},
 							val:        "$",
 							ignoreCase: false,
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1228, col: 5, offset: 35040},
+						pos: position{line: 1222, col: 5, offset: 34911},
 						run: (*parser).callonIdentifierName14,
 						expr: &seqExpr{
-							pos: position{line: 1228, col: 5, offset: 35040},
+							pos: position{line: 1222, col: 5, offset: 34911},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1228, col: 5, offset: 35040},
+									pos:        position{line: 1222, col: 5, offset: 34911},
 									val:        "\\",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 1228, col: 10, offset: 35045},
+									pos:   position{line: 1222, col: 10, offset: 34916},
 									label: "id",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1228, col: 13, offset: 35048},
+										pos:  position{line: 1222, col: 13, offset: 34919},
 										name: "IDGuard",
 									},
 								},
@@ -10056,39 +10031,39 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1230, col: 5, offset: 35139},
+						pos: position{line: 1224, col: 5, offset: 35010},
 						run: (*parser).callonIdentifierName19,
 						expr: &litMatcher{
-							pos:        position{line: 1230, col: 5, offset: 35139},
+							pos:        position{line: 1224, col: 5, offset: 35010},
 							val:        "type",
 							ignoreCase: false,
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1231, col: 5, offset: 35181},
+						pos: position{line: 1225, col: 5, offset: 35052},
 						run: (*parser).callonIdentifierName21,
 						expr: &seqExpr{
-							pos: position{line: 1231, col: 5, offset: 35181},
+							pos: position{line: 1225, col: 5, offset: 35052},
 							exprs: []interface{}{
 								&labeledExpr{
-									pos:   position{line: 1231, col: 5, offset: 35181},
+									pos:   position{line: 1225, col: 5, offset: 35052},
 									label: "id",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1231, col: 8, offset: 35184},
+										pos:  position{line: 1225, col: 8, offset: 35055},
 										name: "SQLTokenSentinels",
 									},
 								},
 								&andExpr{
-									pos: position{line: 1231, col: 26, offset: 35202},
+									pos: position{line: 1225, col: 26, offset: 35073},
 									expr: &seqExpr{
-										pos: position{line: 1231, col: 28, offset: 35204},
+										pos: position{line: 1225, col: 28, offset: 35075},
 										exprs: []interface{}{
 											&ruleRefExpr{
-												pos:  position{line: 1231, col: 28, offset: 35204},
+												pos:  position{line: 1225, col: 28, offset: 35075},
 												name: "__",
 											},
 											&litMatcher{
-												pos:        position{line: 1231, col: 31, offset: 35207},
+												pos:        position{line: 1225, col: 31, offset: 35078},
 												val:        "(",
 												ignoreCase: false,
 											},
@@ -10103,50 +10078,50 @@ var g = &grammar{
 		},
 		{
 			name: "IdentifierNames",
-			pos:  position{line: 1233, col: 1, offset: 35232},
+			pos:  position{line: 1227, col: 1, offset: 35103},
 			expr: &actionExpr{
-				pos: position{line: 1234, col: 5, offset: 35252},
+				pos: position{line: 1228, col: 5, offset: 35123},
 				run: (*parser).callonIdentifierNames1,
 				expr: &seqExpr{
-					pos: position{line: 1234, col: 5, offset: 35252},
+					pos: position{line: 1228, col: 5, offset: 35123},
 					exprs: []interface{}{
 						&labeledExpr{
-							pos:   position{line: 1234, col: 5, offset: 35252},
+							pos:   position{line: 1228, col: 5, offset: 35123},
 							label: "first",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1234, col: 11, offset: 35258},
+								pos:  position{line: 1228, col: 11, offset: 35129},
 								name: "IdentifierName",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1234, col: 26, offset: 35273},
+							pos:   position{line: 1228, col: 26, offset: 35144},
 							label: "rest",
 							expr: &zeroOrMoreExpr{
-								pos: position{line: 1234, col: 31, offset: 35278},
+								pos: position{line: 1228, col: 31, offset: 35149},
 								expr: &actionExpr{
-									pos: position{line: 1234, col: 32, offset: 35279},
+									pos: position{line: 1228, col: 32, offset: 35150},
 									run: (*parser).callonIdentifierNames7,
 									expr: &seqExpr{
-										pos: position{line: 1234, col: 32, offset: 35279},
+										pos: position{line: 1228, col: 32, offset: 35150},
 										exprs: []interface{}{
 											&ruleRefExpr{
-												pos:  position{line: 1234, col: 32, offset: 35279},
+												pos:  position{line: 1228, col: 32, offset: 35150},
 												name: "__",
 											},
 											&litMatcher{
-												pos:        position{line: 1234, col: 35, offset: 35282},
+												pos:        position{line: 1228, col: 35, offset: 35153},
 												val:        ",",
 												ignoreCase: false,
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1234, col: 39, offset: 35286},
+												pos:  position{line: 1228, col: 39, offset: 35157},
 												name: "__",
 											},
 											&labeledExpr{
-												pos:   position{line: 1234, col: 42, offset: 35289},
+												pos:   position{line: 1228, col: 42, offset: 35160},
 												label: "id",
 												expr: &ruleRefExpr{
-													pos:  position{line: 1234, col: 45, offset: 35292},
+													pos:  position{line: 1228, col: 45, offset: 35163},
 													name: "IdentifierName",
 												},
 											},
@@ -10161,24 +10136,24 @@ var g = &grammar{
 		},
 		{
 			name: "IDGuard",
-			pos:  position{line: 1238, col: 1, offset: 35408},
+			pos:  position{line: 1232, col: 1, offset: 35279},
 			expr: &choiceExpr{
-				pos: position{line: 1239, col: 5, offset: 35420},
+				pos: position{line: 1233, col: 5, offset: 35291},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1239, col: 5, offset: 35420},
+						pos:  position{line: 1233, col: 5, offset: 35291},
 						name: "BooleanLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1240, col: 5, offset: 35439},
+						pos:  position{line: 1234, col: 5, offset: 35310},
 						name: "NullLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1241, col: 5, offset: 35455},
+						pos:  position{line: 1235, col: 5, offset: 35326},
 						name: "NaN",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1242, col: 5, offset: 35463},
+						pos:  position{line: 1236, col: 5, offset: 35334},
 						name: "Infinity",
 					},
 				},
@@ -10186,24 +10161,24 @@ var g = &grammar{
 		},
 		{
 			name: "Time",
-			pos:  position{line: 1244, col: 1, offset: 35473},
+			pos:  position{line: 1238, col: 1, offset: 35344},
 			expr: &actionExpr{
-				pos: position{line: 1245, col: 5, offset: 35482},
+				pos: position{line: 1239, col: 5, offset: 35353},
 				run: (*parser).callonTime1,
 				expr: &seqExpr{
-					pos: position{line: 1245, col: 5, offset: 35482},
+					pos: position{line: 1239, col: 5, offset: 35353},
 					exprs: []interface{}{
 						&ruleRefExpr{
-							pos:  position{line: 1245, col: 5, offset: 35482},
+							pos:  position{line: 1239, col: 5, offset: 35353},
 							name: "FullDate",
 						},
 						&litMatcher{
-							pos:        position{line: 1245, col: 14, offset: 35491},
+							pos:        position{line: 1239, col: 14, offset: 35362},
 							val:        "T",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1245, col: 18, offset: 35495},
+							pos:  position{line: 1239, col: 18, offset: 35366},
 							name: "FullTime",
 						},
 					},
@@ -10212,30 +10187,30 @@ var g = &grammar{
 		},
 		{
 			name: "FullDate",
-			pos:  position{line: 1249, col: 1, offset: 35615},
+			pos:  position{line: 1243, col: 1, offset: 35486},
 			expr: &seqExpr{
-				pos: position{line: 1249, col: 12, offset: 35626},
+				pos: position{line: 1243, col: 12, offset: 35497},
 				exprs: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1249, col: 12, offset: 35626},
+						pos:  position{line: 1243, col: 12, offset: 35497},
 						name: "D4",
 					},
 					&litMatcher{
-						pos:        position{line: 1249, col: 15, offset: 35629},
+						pos:        position{line: 1243, col: 15, offset: 35500},
 						val:        "-",
 						ignoreCase: false,
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1249, col: 19, offset: 35633},
+						pos:  position{line: 1243, col: 19, offset: 35504},
 						name: "D2",
 					},
 					&litMatcher{
-						pos:        position{line: 1249, col: 22, offset: 35636},
+						pos:        position{line: 1243, col: 22, offset: 35507},
 						val:        "-",
 						ignoreCase: false,
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1249, col: 26, offset: 35640},
+						pos:  position{line: 1243, col: 26, offset: 35511},
 						name: "D2",
 					},
 				},
@@ -10243,33 +10218,33 @@ var g = &grammar{
 		},
 		{
 			name: "D4",
-			pos:  position{line: 1251, col: 1, offset: 35644},
+			pos:  position{line: 1245, col: 1, offset: 35515},
 			expr: &seqExpr{
-				pos: position{line: 1251, col: 6, offset: 35649},
+				pos: position{line: 1245, col: 6, offset: 35520},
 				exprs: []interface{}{
 					&charClassMatcher{
-						pos:        position{line: 1251, col: 6, offset: 35649},
+						pos:        position{line: 1245, col: 6, offset: 35520},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
 						inverted:   false,
 					},
 					&charClassMatcher{
-						pos:        position{line: 1251, col: 11, offset: 35654},
+						pos:        position{line: 1245, col: 11, offset: 35525},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
 						inverted:   false,
 					},
 					&charClassMatcher{
-						pos:        position{line: 1251, col: 16, offset: 35659},
+						pos:        position{line: 1245, col: 16, offset: 35530},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
 						inverted:   false,
 					},
 					&charClassMatcher{
-						pos:        position{line: 1251, col: 21, offset: 35664},
+						pos:        position{line: 1245, col: 21, offset: 35535},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
@@ -10280,19 +10255,19 @@ var g = &grammar{
 		},
 		{
 			name: "D2",
-			pos:  position{line: 1252, col: 1, offset: 35670},
+			pos:  position{line: 1246, col: 1, offset: 35541},
 			expr: &seqExpr{
-				pos: position{line: 1252, col: 6, offset: 35675},
+				pos: position{line: 1246, col: 6, offset: 35546},
 				exprs: []interface{}{
 					&charClassMatcher{
-						pos:        position{line: 1252, col: 6, offset: 35675},
+						pos:        position{line: 1246, col: 6, offset: 35546},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
 						inverted:   false,
 					},
 					&charClassMatcher{
-						pos:        position{line: 1252, col: 11, offset: 35680},
+						pos:        position{line: 1246, col: 11, offset: 35551},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
@@ -10303,16 +10278,16 @@ var g = &grammar{
 		},
 		{
 			name: "FullTime",
-			pos:  position{line: 1254, col: 1, offset: 35687},
+			pos:  position{line: 1248, col: 1, offset: 35558},
 			expr: &seqExpr{
-				pos: position{line: 1254, col: 12, offset: 35698},
+				pos: position{line: 1248, col: 12, offset: 35569},
 				exprs: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1254, col: 12, offset: 35698},
+						pos:  position{line: 1248, col: 12, offset: 35569},
 						name: "PartialTime",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1254, col: 24, offset: 35710},
+						pos:  position{line: 1248, col: 24, offset: 35581},
 						name: "TimeOffset",
 					},
 				},
@@ -10320,46 +10295,46 @@ var g = &grammar{
 		},
 		{
 			name: "PartialTime",
-			pos:  position{line: 1256, col: 1, offset: 35722},
+			pos:  position{line: 1250, col: 1, offset: 35593},
 			expr: &seqExpr{
-				pos: position{line: 1256, col: 15, offset: 35736},
+				pos: position{line: 1250, col: 15, offset: 35607},
 				exprs: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1256, col: 15, offset: 35736},
+						pos:  position{line: 1250, col: 15, offset: 35607},
 						name: "D2",
 					},
 					&litMatcher{
-						pos:        position{line: 1256, col: 18, offset: 35739},
+						pos:        position{line: 1250, col: 18, offset: 35610},
 						val:        ":",
 						ignoreCase: false,
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1256, col: 22, offset: 35743},
+						pos:  position{line: 1250, col: 22, offset: 35614},
 						name: "D2",
 					},
 					&litMatcher{
-						pos:        position{line: 1256, col: 25, offset: 35746},
+						pos:        position{line: 1250, col: 25, offset: 35617},
 						val:        ":",
 						ignoreCase: false,
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1256, col: 29, offset: 35750},
+						pos:  position{line: 1250, col: 29, offset: 35621},
 						name: "D2",
 					},
 					&zeroOrOneExpr{
-						pos: position{line: 1256, col: 32, offset: 35753},
+						pos: position{line: 1250, col: 32, offset: 35624},
 						expr: &seqExpr{
-							pos: position{line: 1256, col: 33, offset: 35754},
+							pos: position{line: 1250, col: 33, offset: 35625},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1256, col: 33, offset: 35754},
+									pos:        position{line: 1250, col: 33, offset: 35625},
 									val:        ".",
 									ignoreCase: false,
 								},
 								&oneOrMoreExpr{
-									pos: position{line: 1256, col: 37, offset: 35758},
+									pos: position{line: 1250, col: 37, offset: 35629},
 									expr: &charClassMatcher{
-										pos:        position{line: 1256, col: 37, offset: 35758},
+										pos:        position{line: 1250, col: 37, offset: 35629},
 										val:        "[0-9]",
 										ranges:     []rune{'0', '9'},
 										ignoreCase: false,
@@ -10374,60 +10349,60 @@ var g = &grammar{
 		},
 		{
 			name: "TimeOffset",
-			pos:  position{line: 1258, col: 1, offset: 35768},
+			pos:  position{line: 1252, col: 1, offset: 35639},
 			expr: &choiceExpr{
-				pos: position{line: 1259, col: 5, offset: 35783},
+				pos: position{line: 1253, col: 5, offset: 35654},
 				alternatives: []interface{}{
 					&litMatcher{
-						pos:        position{line: 1259, col: 5, offset: 35783},
+						pos:        position{line: 1253, col: 5, offset: 35654},
 						val:        "Z",
 						ignoreCase: false,
 					},
 					&seqExpr{
-						pos: position{line: 1260, col: 5, offset: 35791},
+						pos: position{line: 1254, col: 5, offset: 35662},
 						exprs: []interface{}{
 							&choiceExpr{
-								pos: position{line: 1260, col: 6, offset: 35792},
+								pos: position{line: 1254, col: 6, offset: 35663},
 								alternatives: []interface{}{
 									&litMatcher{
-										pos:        position{line: 1260, col: 6, offset: 35792},
+										pos:        position{line: 1254, col: 6, offset: 35663},
 										val:        "+",
 										ignoreCase: false,
 									},
 									&litMatcher{
-										pos:        position{line: 1260, col: 12, offset: 35798},
+										pos:        position{line: 1254, col: 12, offset: 35669},
 										val:        "-",
 										ignoreCase: false,
 									},
 								},
 							},
 							&ruleRefExpr{
-								pos:  position{line: 1260, col: 17, offset: 35803},
+								pos:  position{line: 1254, col: 17, offset: 35674},
 								name: "D2",
 							},
 							&litMatcher{
-								pos:        position{line: 1260, col: 20, offset: 35806},
+								pos:        position{line: 1254, col: 20, offset: 35677},
 								val:        ":",
 								ignoreCase: false,
 							},
 							&ruleRefExpr{
-								pos:  position{line: 1260, col: 24, offset: 35810},
+								pos:  position{line: 1254, col: 24, offset: 35681},
 								name: "D2",
 							},
 							&zeroOrOneExpr{
-								pos: position{line: 1260, col: 27, offset: 35813},
+								pos: position{line: 1254, col: 27, offset: 35684},
 								expr: &seqExpr{
-									pos: position{line: 1260, col: 28, offset: 35814},
+									pos: position{line: 1254, col: 28, offset: 35685},
 									exprs: []interface{}{
 										&litMatcher{
-											pos:        position{line: 1260, col: 28, offset: 35814},
+											pos:        position{line: 1254, col: 28, offset: 35685},
 											val:        ".",
 											ignoreCase: false,
 										},
 										&oneOrMoreExpr{
-											pos: position{line: 1260, col: 32, offset: 35818},
+											pos: position{line: 1254, col: 32, offset: 35689},
 											expr: &charClassMatcher{
-												pos:        position{line: 1260, col: 32, offset: 35818},
+												pos:        position{line: 1254, col: 32, offset: 35689},
 												val:        "[0-9]",
 												ranges:     []rune{'0', '9'},
 												ignoreCase: false,
@@ -10444,32 +10419,32 @@ var g = &grammar{
 		},
 		{
 			name: "Duration",
-			pos:  position{line: 1262, col: 1, offset: 35828},
+			pos:  position{line: 1256, col: 1, offset: 35699},
 			expr: &actionExpr{
-				pos: position{line: 1263, col: 5, offset: 35841},
+				pos: position{line: 1257, col: 5, offset: 35712},
 				run: (*parser).callonDuration1,
 				expr: &seqExpr{
-					pos: position{line: 1263, col: 5, offset: 35841},
+					pos: position{line: 1257, col: 5, offset: 35712},
 					exprs: []interface{}{
 						&zeroOrOneExpr{
-							pos: position{line: 1263, col: 5, offset: 35841},
+							pos: position{line: 1257, col: 5, offset: 35712},
 							expr: &litMatcher{
-								pos:        position{line: 1263, col: 5, offset: 35841},
+								pos:        position{line: 1257, col: 5, offset: 35712},
 								val:        "-",
 								ignoreCase: false,
 							},
 						},
 						&oneOrMoreExpr{
-							pos: position{line: 1263, col: 10, offset: 35846},
+							pos: position{line: 1257, col: 10, offset: 35717},
 							expr: &seqExpr{
-								pos: position{line: 1263, col: 11, offset: 35847},
+								pos: position{line: 1257, col: 11, offset: 35718},
 								exprs: []interface{}{
 									&ruleRefExpr{
-										pos:  position{line: 1263, col: 11, offset: 35847},
+										pos:  position{line: 1257, col: 11, offset: 35718},
 										name: "Decimal",
 									},
 									&ruleRefExpr{
-										pos:  position{line: 1263, col: 19, offset: 35855},
+										pos:  position{line: 1257, col: 19, offset: 35726},
 										name: "TimeUnit",
 									},
 								},
@@ -10481,26 +10456,26 @@ var g = &grammar{
 		},
 		{
 			name: "Decimal",
-			pos:  position{line: 1267, col: 1, offset: 35981},
+			pos:  position{line: 1261, col: 1, offset: 35852},
 			expr: &seqExpr{
-				pos: position{line: 1267, col: 11, offset: 35991},
+				pos: position{line: 1261, col: 11, offset: 35862},
 				exprs: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1267, col: 11, offset: 35991},
+						pos:  position{line: 1261, col: 11, offset: 35862},
 						name: "UInt",
 					},
 					&zeroOrOneExpr{
-						pos: position{line: 1267, col: 16, offset: 35996},
+						pos: position{line: 1261, col: 16, offset: 35867},
 						expr: &seqExpr{
-							pos: position{line: 1267, col: 17, offset: 35997},
+							pos: position{line: 1261, col: 17, offset: 35868},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1267, col: 17, offset: 35997},
+									pos:        position{line: 1261, col: 17, offset: 35868},
 									val:        ".",
 									ignoreCase: false,
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1267, col: 21, offset: 36001},
+									pos:  position{line: 1261, col: 21, offset: 35872},
 									name: "UInt",
 								},
 							},
@@ -10511,52 +10486,52 @@ var g = &grammar{
 		},
 		{
 			name: "TimeUnit",
-			pos:  position{line: 1269, col: 1, offset: 36009},
+			pos:  position{line: 1263, col: 1, offset: 35880},
 			expr: &choiceExpr{
-				pos: position{line: 1270, col: 5, offset: 36022},
+				pos: position{line: 1264, col: 5, offset: 35893},
 				alternatives: []interface{}{
 					&litMatcher{
-						pos:        position{line: 1270, col: 5, offset: 36022},
+						pos:        position{line: 1264, col: 5, offset: 35893},
 						val:        "ns",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1271, col: 5, offset: 36031},
+						pos:        position{line: 1265, col: 5, offset: 35902},
 						val:        "us",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1272, col: 5, offset: 36040},
+						pos:        position{line: 1266, col: 5, offset: 35911},
 						val:        "ms",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1273, col: 5, offset: 36049},
+						pos:        position{line: 1267, col: 5, offset: 35920},
 						val:        "s",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1274, col: 5, offset: 36057},
+						pos:        position{line: 1268, col: 5, offset: 35928},
 						val:        "m",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1275, col: 5, offset: 36065},
+						pos:        position{line: 1269, col: 5, offset: 35936},
 						val:        "h",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1276, col: 5, offset: 36073},
+						pos:        position{line: 1270, col: 5, offset: 35944},
 						val:        "d",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1277, col: 5, offset: 36081},
+						pos:        position{line: 1271, col: 5, offset: 35952},
 						val:        "w",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1278, col: 5, offset: 36089},
+						pos:        position{line: 1272, col: 5, offset: 35960},
 						val:        "y",
 						ignoreCase: false,
 					},
@@ -10565,42 +10540,42 @@ var g = &grammar{
 		},
 		{
 			name: "IP",
-			pos:  position{line: 1280, col: 1, offset: 36094},
+			pos:  position{line: 1274, col: 1, offset: 35965},
 			expr: &actionExpr{
-				pos: position{line: 1281, col: 5, offset: 36101},
+				pos: position{line: 1275, col: 5, offset: 35972},
 				run: (*parser).callonIP1,
 				expr: &seqExpr{
-					pos: position{line: 1281, col: 5, offset: 36101},
+					pos: position{line: 1275, col: 5, offset: 35972},
 					exprs: []interface{}{
 						&ruleRefExpr{
-							pos:  position{line: 1281, col: 5, offset: 36101},
+							pos:  position{line: 1275, col: 5, offset: 35972},
 							name: "UInt",
 						},
 						&litMatcher{
-							pos:        position{line: 1281, col: 10, offset: 36106},
+							pos:        position{line: 1275, col: 10, offset: 35977},
 							val:        ".",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1281, col: 14, offset: 36110},
+							pos:  position{line: 1275, col: 14, offset: 35981},
 							name: "UInt",
 						},
 						&litMatcher{
-							pos:        position{line: 1281, col: 19, offset: 36115},
+							pos:        position{line: 1275, col: 19, offset: 35986},
 							val:        ".",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1281, col: 23, offset: 36119},
+							pos:  position{line: 1275, col: 23, offset: 35990},
 							name: "UInt",
 						},
 						&litMatcher{
-							pos:        position{line: 1281, col: 28, offset: 36124},
+							pos:        position{line: 1275, col: 28, offset: 35995},
 							val:        ".",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1281, col: 32, offset: 36128},
+							pos:  position{line: 1275, col: 32, offset: 35999},
 							name: "UInt",
 						},
 					},
@@ -10609,42 +10584,42 @@ var g = &grammar{
 		},
 		{
 			name: "IP6",
-			pos:  position{line: 1283, col: 1, offset: 36165},
+			pos:  position{line: 1277, col: 1, offset: 36036},
 			expr: &actionExpr{
-				pos: position{line: 1284, col: 5, offset: 36173},
+				pos: position{line: 1278, col: 5, offset: 36044},
 				run: (*parser).callonIP61,
 				expr: &seqExpr{
-					pos: position{line: 1284, col: 5, offset: 36173},
+					pos: position{line: 1278, col: 5, offset: 36044},
 					exprs: []interface{}{
 						&notExpr{
-							pos: position{line: 1284, col: 5, offset: 36173},
+							pos: position{line: 1278, col: 5, offset: 36044},
 							expr: &seqExpr{
-								pos: position{line: 1284, col: 7, offset: 36175},
+								pos: position{line: 1278, col: 7, offset: 36046},
 								exprs: []interface{}{
 									&ruleRefExpr{
-										pos:  position{line: 1284, col: 7, offset: 36175},
+										pos:  position{line: 1278, col: 7, offset: 36046},
 										name: "Hex",
 									},
 									&litMatcher{
-										pos:        position{line: 1284, col: 11, offset: 36179},
+										pos:        position{line: 1278, col: 11, offset: 36050},
 										val:        ":",
 										ignoreCase: false,
 									},
 									&ruleRefExpr{
-										pos:  position{line: 1284, col: 15, offset: 36183},
+										pos:  position{line: 1278, col: 15, offset: 36054},
 										name: "Hex",
 									},
 									&notExpr{
-										pos: position{line: 1284, col: 19, offset: 36187},
+										pos: position{line: 1278, col: 19, offset: 36058},
 										expr: &choiceExpr{
-											pos: position{line: 1284, col: 21, offset: 36189},
+											pos: position{line: 1278, col: 21, offset: 36060},
 											alternatives: []interface{}{
 												&ruleRefExpr{
-													pos:  position{line: 1284, col: 21, offset: 36189},
+													pos:  position{line: 1278, col: 21, offset: 36060},
 													name: "HexDigit",
 												},
 												&litMatcher{
-													pos:        position{line: 1284, col: 32, offset: 36200},
+													pos:        position{line: 1278, col: 32, offset: 36071},
 													val:        ":",
 													ignoreCase: false,
 												},
@@ -10655,10 +10630,10 @@ var g = &grammar{
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1284, col: 38, offset: 36206},
+							pos:   position{line: 1278, col: 38, offset: 36077},
 							label: "v",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1284, col: 40, offset: 36208},
+								pos:  position{line: 1278, col: 40, offset: 36079},
 								name: "IP6Variations",
 							},
 						},
@@ -10668,32 +10643,32 @@ var g = &grammar{
 		},
 		{
 			name: "IP6Variations",
-			pos:  position{line: 1288, col: 1, offset: 36372},
+			pos:  position{line: 1282, col: 1, offset: 36243},
 			expr: &choiceExpr{
-				pos: position{line: 1289, col: 5, offset: 36390},
+				pos: position{line: 1283, col: 5, offset: 36261},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1289, col: 5, offset: 36390},
+						pos: position{line: 1283, col: 5, offset: 36261},
 						run: (*parser).callonIP6Variations2,
 						expr: &seqExpr{
-							pos: position{line: 1289, col: 5, offset: 36390},
+							pos: position{line: 1283, col: 5, offset: 36261},
 							exprs: []interface{}{
 								&labeledExpr{
-									pos:   position{line: 1289, col: 5, offset: 36390},
+									pos:   position{line: 1283, col: 5, offset: 36261},
 									label: "a",
 									expr: &oneOrMoreExpr{
-										pos: position{line: 1289, col: 7, offset: 36392},
+										pos: position{line: 1283, col: 7, offset: 36263},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1289, col: 7, offset: 36392},
+											pos:  position{line: 1283, col: 7, offset: 36263},
 											name: "HexColon",
 										},
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1289, col: 17, offset: 36402},
+									pos:   position{line: 1283, col: 17, offset: 36273},
 									label: "b",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1289, col: 19, offset: 36404},
+										pos:  position{line: 1283, col: 19, offset: 36275},
 										name: "IP6Tail",
 									},
 								},
@@ -10701,51 +10676,51 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1292, col: 5, offset: 36468},
+						pos: position{line: 1286, col: 5, offset: 36339},
 						run: (*parser).callonIP6Variations9,
 						expr: &seqExpr{
-							pos: position{line: 1292, col: 5, offset: 36468},
+							pos: position{line: 1286, col: 5, offset: 36339},
 							exprs: []interface{}{
 								&labeledExpr{
-									pos:   position{line: 1292, col: 5, offset: 36468},
+									pos:   position{line: 1286, col: 5, offset: 36339},
 									label: "a",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1292, col: 7, offset: 36470},
+										pos:  position{line: 1286, col: 7, offset: 36341},
 										name: "Hex",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1292, col: 11, offset: 36474},
+									pos:   position{line: 1286, col: 11, offset: 36345},
 									label: "b",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1292, col: 13, offset: 36476},
+										pos: position{line: 1286, col: 13, offset: 36347},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1292, col: 13, offset: 36476},
+											pos:  position{line: 1286, col: 13, offset: 36347},
 											name: "ColonHex",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1292, col: 23, offset: 36486},
+									pos:        position{line: 1286, col: 23, offset: 36357},
 									val:        "::",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 1292, col: 28, offset: 36491},
+									pos:   position{line: 1286, col: 28, offset: 36362},
 									label: "d",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1292, col: 30, offset: 36493},
+										pos: position{line: 1286, col: 30, offset: 36364},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1292, col: 30, offset: 36493},
+											pos:  position{line: 1286, col: 30, offset: 36364},
 											name: "HexColon",
 										},
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1292, col: 40, offset: 36503},
+									pos:   position{line: 1286, col: 40, offset: 36374},
 									label: "e",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1292, col: 42, offset: 36505},
+										pos:  position{line: 1286, col: 42, offset: 36376},
 										name: "IP6Tail",
 									},
 								},
@@ -10753,32 +10728,32 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1295, col: 5, offset: 36604},
+						pos: position{line: 1289, col: 5, offset: 36475},
 						run: (*parser).callonIP6Variations22,
 						expr: &seqExpr{
-							pos: position{line: 1295, col: 5, offset: 36604},
+							pos: position{line: 1289, col: 5, offset: 36475},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1295, col: 5, offset: 36604},
+									pos:        position{line: 1289, col: 5, offset: 36475},
 									val:        "::",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 1295, col: 10, offset: 36609},
+									pos:   position{line: 1289, col: 10, offset: 36480},
 									label: "a",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1295, col: 12, offset: 36611},
+										pos: position{line: 1289, col: 12, offset: 36482},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1295, col: 12, offset: 36611},
+											pos:  position{line: 1289, col: 12, offset: 36482},
 											name: "HexColon",
 										},
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1295, col: 22, offset: 36621},
+									pos:   position{line: 1289, col: 22, offset: 36492},
 									label: "b",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1295, col: 24, offset: 36623},
+										pos:  position{line: 1289, col: 24, offset: 36494},
 										name: "IP6Tail",
 									},
 								},
@@ -10786,32 +10761,32 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1298, col: 5, offset: 36694},
+						pos: position{line: 1292, col: 5, offset: 36565},
 						run: (*parser).callonIP6Variations30,
 						expr: &seqExpr{
-							pos: position{line: 1298, col: 5, offset: 36694},
+							pos: position{line: 1292, col: 5, offset: 36565},
 							exprs: []interface{}{
 								&labeledExpr{
-									pos:   position{line: 1298, col: 5, offset: 36694},
+									pos:   position{line: 1292, col: 5, offset: 36565},
 									label: "a",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1298, col: 7, offset: 36696},
+										pos:  position{line: 1292, col: 7, offset: 36567},
 										name: "Hex",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1298, col: 11, offset: 36700},
+									pos:   position{line: 1292, col: 11, offset: 36571},
 									label: "b",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1298, col: 13, offset: 36702},
+										pos: position{line: 1292, col: 13, offset: 36573},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1298, col: 13, offset: 36702},
+											pos:  position{line: 1292, col: 13, offset: 36573},
 											name: "ColonHex",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1298, col: 23, offset: 36712},
+									pos:        position{line: 1292, col: 23, offset: 36583},
 									val:        "::",
 									ignoreCase: false,
 								},
@@ -10819,10 +10794,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1301, col: 5, offset: 36780},
+						pos: position{line: 1295, col: 5, offset: 36651},
 						run: (*parser).callonIP6Variations38,
 						expr: &litMatcher{
-							pos:        position{line: 1301, col: 5, offset: 36780},
+							pos:        position{line: 1295, col: 5, offset: 36651},
 							val:        "::",
 							ignoreCase: false,
 						},
@@ -10832,16 +10807,16 @@ var g = &grammar{
 		},
 		{
 			name: "IP6Tail",
-			pos:  position{line: 1305, col: 1, offset: 36817},
+			pos:  position{line: 1299, col: 1, offset: 36688},
 			expr: &choiceExpr{
-				pos: position{line: 1306, col: 5, offset: 36829},
+				pos: position{line: 1300, col: 5, offset: 36700},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1306, col: 5, offset: 36829},
+						pos:  position{line: 1300, col: 5, offset: 36700},
 						name: "IP",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1307, col: 5, offset: 36836},
+						pos:  position{line: 1301, col: 5, offset: 36707},
 						name: "Hex",
 					},
 				},
@@ -10849,23 +10824,23 @@ var g = &grammar{
 		},
 		{
 			name: "ColonHex",
-			pos:  position{line: 1309, col: 1, offset: 36841},
+			pos:  position{line: 1303, col: 1, offset: 36712},
 			expr: &actionExpr{
-				pos: position{line: 1309, col: 12, offset: 36852},
+				pos: position{line: 1303, col: 12, offset: 36723},
 				run: (*parser).callonColonHex1,
 				expr: &seqExpr{
-					pos: position{line: 1309, col: 12, offset: 36852},
+					pos: position{line: 1303, col: 12, offset: 36723},
 					exprs: []interface{}{
 						&litMatcher{
-							pos:        position{line: 1309, col: 12, offset: 36852},
+							pos:        position{line: 1303, col: 12, offset: 36723},
 							val:        ":",
 							ignoreCase: false,
 						},
 						&labeledExpr{
-							pos:   position{line: 1309, col: 16, offset: 36856},
+							pos:   position{line: 1303, col: 16, offset: 36727},
 							label: "v",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1309, col: 18, offset: 36858},
+								pos:  position{line: 1303, col: 18, offset: 36729},
 								name: "Hex",
 							},
 						},
@@ -10875,23 +10850,23 @@ var g = &grammar{
 		},
 		{
 			name: "HexColon",
-			pos:  position{line: 1311, col: 1, offset: 36896},
+			pos:  position{line: 1305, col: 1, offset: 36767},
 			expr: &actionExpr{
-				pos: position{line: 1311, col: 12, offset: 36907},
+				pos: position{line: 1305, col: 12, offset: 36778},
 				run: (*parser).callonHexColon1,
 				expr: &seqExpr{
-					pos: position{line: 1311, col: 12, offset: 36907},
+					pos: position{line: 1305, col: 12, offset: 36778},
 					exprs: []interface{}{
 						&labeledExpr{
-							pos:   position{line: 1311, col: 12, offset: 36907},
+							pos:   position{line: 1305, col: 12, offset: 36778},
 							label: "v",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1311, col: 14, offset: 36909},
+								pos:  position{line: 1305, col: 14, offset: 36780},
 								name: "Hex",
 							},
 						},
 						&litMatcher{
-							pos:        position{line: 1311, col: 18, offset: 36913},
+							pos:        position{line: 1305, col: 18, offset: 36784},
 							val:        ":",
 							ignoreCase: false,
 						},
@@ -10901,31 +10876,31 @@ var g = &grammar{
 		},
 		{
 			name: "IP4Net",
-			pos:  position{line: 1313, col: 1, offset: 36951},
+			pos:  position{line: 1307, col: 1, offset: 36822},
 			expr: &actionExpr{
-				pos: position{line: 1314, col: 5, offset: 36962},
+				pos: position{line: 1308, col: 5, offset: 36833},
 				run: (*parser).callonIP4Net1,
 				expr: &seqExpr{
-					pos: position{line: 1314, col: 5, offset: 36962},
+					pos: position{line: 1308, col: 5, offset: 36833},
 					exprs: []interface{}{
 						&labeledExpr{
-							pos:   position{line: 1314, col: 5, offset: 36962},
+							pos:   position{line: 1308, col: 5, offset: 36833},
 							label: "a",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1314, col: 7, offset: 36964},
+								pos:  position{line: 1308, col: 7, offset: 36835},
 								name: "IP",
 							},
 						},
 						&litMatcher{
-							pos:        position{line: 1314, col: 10, offset: 36967},
+							pos:        position{line: 1308, col: 10, offset: 36838},
 							val:        "/",
 							ignoreCase: false,
 						},
 						&labeledExpr{
-							pos:   position{line: 1314, col: 14, offset: 36971},
+							pos:   position{line: 1308, col: 14, offset: 36842},
 							label: "m",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1314, col: 16, offset: 36973},
+								pos:  position{line: 1308, col: 16, offset: 36844},
 								name: "UInt",
 							},
 						},
@@ -10935,31 +10910,31 @@ var g = &grammar{
 		},
 		{
 			name: "IP6Net",
-			pos:  position{line: 1318, col: 1, offset: 37046},
+			pos:  position{line: 1312, col: 1, offset: 36917},
 			expr: &actionExpr{
-				pos: position{line: 1319, col: 5, offset: 37057},
+				pos: position{line: 1313, col: 5, offset: 36928},
 				run: (*parser).callonIP6Net1,
 				expr: &seqExpr{
-					pos: position{line: 1319, col: 5, offset: 37057},
+					pos: position{line: 1313, col: 5, offset: 36928},
 					exprs: []interface{}{
 						&labeledExpr{
-							pos:   position{line: 1319, col: 5, offset: 37057},
+							pos:   position{line: 1313, col: 5, offset: 36928},
 							label: "a",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1319, col: 7, offset: 37059},
+								pos:  position{line: 1313, col: 7, offset: 36930},
 								name: "IP6",
 							},
 						},
 						&litMatcher{
-							pos:        position{line: 1319, col: 11, offset: 37063},
+							pos:        position{line: 1313, col: 11, offset: 36934},
 							val:        "/",
 							ignoreCase: false,
 						},
 						&labeledExpr{
-							pos:   position{line: 1319, col: 15, offset: 37067},
+							pos:   position{line: 1313, col: 15, offset: 36938},
 							label: "m",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1319, col: 17, offset: 37069},
+								pos:  position{line: 1313, col: 17, offset: 36940},
 								name: "UInt",
 							},
 						},
@@ -10969,15 +10944,15 @@ var g = &grammar{
 		},
 		{
 			name: "UInt",
-			pos:  position{line: 1323, col: 1, offset: 37132},
+			pos:  position{line: 1317, col: 1, offset: 37003},
 			expr: &actionExpr{
-				pos: position{line: 1324, col: 4, offset: 37140},
+				pos: position{line: 1318, col: 4, offset: 37011},
 				run: (*parser).callonUInt1,
 				expr: &labeledExpr{
-					pos:   position{line: 1324, col: 4, offset: 37140},
+					pos:   position{line: 1318, col: 4, offset: 37011},
 					label: "s",
 					expr: &ruleRefExpr{
-						pos:  position{line: 1324, col: 6, offset: 37142},
+						pos:  position{line: 1318, col: 6, offset: 37013},
 						name: "UIntString",
 					},
 				},
@@ -10985,16 +10960,16 @@ var g = &grammar{
 		},
 		{
 			name: "IntString",
-			pos:  position{line: 1326, col: 1, offset: 37182},
+			pos:  position{line: 1320, col: 1, offset: 37053},
 			expr: &choiceExpr{
-				pos: position{line: 1327, col: 5, offset: 37196},
+				pos: position{line: 1321, col: 5, offset: 37067},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1327, col: 5, offset: 37196},
+						pos:  position{line: 1321, col: 5, offset: 37067},
 						name: "UIntString",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1328, col: 5, offset: 37211},
+						pos:  position{line: 1322, col: 5, offset: 37082},
 						name: "MinusIntString",
 					},
 				},
@@ -11002,14 +10977,14 @@ var g = &grammar{
 		},
 		{
 			name: "UIntString",
-			pos:  position{line: 1330, col: 1, offset: 37227},
+			pos:  position{line: 1324, col: 1, offset: 37098},
 			expr: &actionExpr{
-				pos: position{line: 1330, col: 14, offset: 37240},
+				pos: position{line: 1324, col: 14, offset: 37111},
 				run: (*parser).callonUIntString1,
 				expr: &oneOrMoreExpr{
-					pos: position{line: 1330, col: 14, offset: 37240},
+					pos: position{line: 1324, col: 14, offset: 37111},
 					expr: &charClassMatcher{
-						pos:        position{line: 1330, col: 14, offset: 37240},
+						pos:        position{line: 1324, col: 14, offset: 37111},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
@@ -11020,20 +10995,20 @@ var g = &grammar{
 		},
 		{
 			name: "MinusIntString",
-			pos:  position{line: 1332, col: 1, offset: 37279},
+			pos:  position{line: 1326, col: 1, offset: 37150},
 			expr: &actionExpr{
-				pos: position{line: 1333, col: 5, offset: 37298},
+				pos: position{line: 1327, col: 5, offset: 37169},
 				run: (*parser).callonMinusIntString1,
 				expr: &seqExpr{
-					pos: position{line: 1333, col: 5, offset: 37298},
+					pos: position{line: 1327, col: 5, offset: 37169},
 					exprs: []interface{}{
 						&litMatcher{
-							pos:        position{line: 1333, col: 5, offset: 37298},
+							pos:        position{line: 1327, col: 5, offset: 37169},
 							val:        "-",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1333, col: 9, offset: 37302},
+							pos:  position{line: 1327, col: 9, offset: 37173},
 							name: "UIntString",
 						},
 					},
@@ -11042,28 +11017,28 @@ var g = &grammar{
 		},
 		{
 			name: "FloatString",
-			pos:  position{line: 1335, col: 1, offset: 37345},
+			pos:  position{line: 1329, col: 1, offset: 37216},
 			expr: &choiceExpr{
-				pos: position{line: 1336, col: 5, offset: 37361},
+				pos: position{line: 1330, col: 5, offset: 37232},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1336, col: 5, offset: 37361},
+						pos: position{line: 1330, col: 5, offset: 37232},
 						run: (*parser).callonFloatString2,
 						expr: &seqExpr{
-							pos: position{line: 1336, col: 5, offset: 37361},
+							pos: position{line: 1330, col: 5, offset: 37232},
 							exprs: []interface{}{
 								&zeroOrOneExpr{
-									pos: position{line: 1336, col: 5, offset: 37361},
+									pos: position{line: 1330, col: 5, offset: 37232},
 									expr: &litMatcher{
-										pos:        position{line: 1336, col: 5, offset: 37361},
+										pos:        position{line: 1330, col: 5, offset: 37232},
 										val:        "-",
 										ignoreCase: false,
 									},
 								},
 								&oneOrMoreExpr{
-									pos: position{line: 1336, col: 10, offset: 37366},
+									pos: position{line: 1330, col: 10, offset: 37237},
 									expr: &charClassMatcher{
-										pos:        position{line: 1336, col: 10, offset: 37366},
+										pos:        position{line: 1330, col: 10, offset: 37237},
 										val:        "[0-9]",
 										ranges:     []rune{'0', '9'},
 										ignoreCase: false,
@@ -11071,14 +11046,14 @@ var g = &grammar{
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1336, col: 17, offset: 37373},
+									pos:        position{line: 1330, col: 17, offset: 37244},
 									val:        ".",
 									ignoreCase: false,
 								},
 								&zeroOrMoreExpr{
-									pos: position{line: 1336, col: 21, offset: 37377},
+									pos: position{line: 1330, col: 21, offset: 37248},
 									expr: &charClassMatcher{
-										pos:        position{line: 1336, col: 21, offset: 37377},
+										pos:        position{line: 1330, col: 21, offset: 37248},
 										val:        "[0-9]",
 										ranges:     []rune{'0', '9'},
 										ignoreCase: false,
@@ -11086,9 +11061,9 @@ var g = &grammar{
 									},
 								},
 								&zeroOrOneExpr{
-									pos: position{line: 1336, col: 28, offset: 37384},
+									pos: position{line: 1330, col: 28, offset: 37255},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1336, col: 28, offset: 37384},
+										pos:  position{line: 1330, col: 28, offset: 37255},
 										name: "ExponentPart",
 									},
 								},
@@ -11096,28 +11071,28 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1339, col: 5, offset: 37443},
+						pos: position{line: 1333, col: 5, offset: 37314},
 						run: (*parser).callonFloatString13,
 						expr: &seqExpr{
-							pos: position{line: 1339, col: 5, offset: 37443},
+							pos: position{line: 1333, col: 5, offset: 37314},
 							exprs: []interface{}{
 								&zeroOrOneExpr{
-									pos: position{line: 1339, col: 5, offset: 37443},
+									pos: position{line: 1333, col: 5, offset: 37314},
 									expr: &litMatcher{
-										pos:        position{line: 1339, col: 5, offset: 37443},
+										pos:        position{line: 1333, col: 5, offset: 37314},
 										val:        "-",
 										ignoreCase: false,
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1339, col: 10, offset: 37448},
+									pos:        position{line: 1333, col: 10, offset: 37319},
 									val:        ".",
 									ignoreCase: false,
 								},
 								&oneOrMoreExpr{
-									pos: position{line: 1339, col: 14, offset: 37452},
+									pos: position{line: 1333, col: 14, offset: 37323},
 									expr: &charClassMatcher{
-										pos:        position{line: 1339, col: 14, offset: 37452},
+										pos:        position{line: 1333, col: 14, offset: 37323},
 										val:        "[0-9]",
 										ranges:     []rune{'0', '9'},
 										ignoreCase: false,
@@ -11125,9 +11100,9 @@ var g = &grammar{
 									},
 								},
 								&zeroOrOneExpr{
-									pos: position{line: 1339, col: 21, offset: 37459},
+									pos: position{line: 1333, col: 21, offset: 37330},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1339, col: 21, offset: 37459},
+										pos:  position{line: 1333, col: 21, offset: 37330},
 										name: "ExponentPart",
 									},
 								},
@@ -11135,17 +11110,17 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1342, col: 5, offset: 37518},
+						pos: position{line: 1336, col: 5, offset: 37389},
 						run: (*parser).callonFloatString22,
 						expr: &choiceExpr{
-							pos: position{line: 1342, col: 6, offset: 37519},
+							pos: position{line: 1336, col: 6, offset: 37390},
 							alternatives: []interface{}{
 								&ruleRefExpr{
-									pos:  position{line: 1342, col: 6, offset: 37519},
+									pos:  position{line: 1336, col: 6, offset: 37390},
 									name: "NaN",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1342, col: 12, offset: 37525},
+									pos:  position{line: 1336, col: 12, offset: 37396},
 									name: "Infinity",
 								},
 							},
@@ -11156,19 +11131,19 @@ var g = &grammar{
 		},
 		{
 			name: "ExponentPart",
-			pos:  position{line: 1345, col: 1, offset: 37568},
+			pos:  position{line: 1339, col: 1, offset: 37439},
 			expr: &seqExpr{
-				pos: position{line: 1345, col: 16, offset: 37583},
+				pos: position{line: 1339, col: 16, offset: 37454},
 				exprs: []interface{}{
 					&litMatcher{
-						pos:        position{line: 1345, col: 16, offset: 37583},
+						pos:        position{line: 1339, col: 16, offset: 37454},
 						val:        "e",
 						ignoreCase: true,
 					},
 					&zeroOrOneExpr{
-						pos: position{line: 1345, col: 21, offset: 37588},
+						pos: position{line: 1339, col: 21, offset: 37459},
 						expr: &charClassMatcher{
-							pos:        position{line: 1345, col: 21, offset: 37588},
+							pos:        position{line: 1339, col: 21, offset: 37459},
 							val:        "[+-]",
 							chars:      []rune{'+', '-'},
 							ignoreCase: false,
@@ -11176,7 +11151,7 @@ var g = &grammar{
 						},
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1345, col: 27, offset: 37594},
+						pos:  position{line: 1339, col: 27, offset: 37465},
 						name: "UIntString",
 					},
 				},
@@ -11184,31 +11159,31 @@ var g = &grammar{
 		},
 		{
 			name: "NaN",
-			pos:  position{line: 1347, col: 1, offset: 37606},
+			pos:  position{line: 1341, col: 1, offset: 37477},
 			expr: &litMatcher{
-				pos:        position{line: 1347, col: 7, offset: 37612},
+				pos:        position{line: 1341, col: 7, offset: 37483},
 				val:        "NaN",
 				ignoreCase: false,
 			},
 		},
 		{
 			name: "Infinity",
-			pos:  position{line: 1349, col: 1, offset: 37619},
+			pos:  position{line: 1343, col: 1, offset: 37490},
 			expr: &seqExpr{
-				pos: position{line: 1349, col: 12, offset: 37630},
+				pos: position{line: 1343, col: 12, offset: 37501},
 				exprs: []interface{}{
 					&zeroOrOneExpr{
-						pos: position{line: 1349, col: 12, offset: 37630},
+						pos: position{line: 1343, col: 12, offset: 37501},
 						expr: &choiceExpr{
-							pos: position{line: 1349, col: 13, offset: 37631},
+							pos: position{line: 1343, col: 13, offset: 37502},
 							alternatives: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1349, col: 13, offset: 37631},
+									pos:        position{line: 1343, col: 13, offset: 37502},
 									val:        "-",
 									ignoreCase: false,
 								},
 								&litMatcher{
-									pos:        position{line: 1349, col: 19, offset: 37637},
+									pos:        position{line: 1343, col: 19, offset: 37508},
 									val:        "+",
 									ignoreCase: false,
 								},
@@ -11216,7 +11191,7 @@ var g = &grammar{
 						},
 					},
 					&litMatcher{
-						pos:        position{line: 1349, col: 25, offset: 37643},
+						pos:        position{line: 1343, col: 25, offset: 37514},
 						val:        "Inf",
 						ignoreCase: false,
 					},
@@ -11225,14 +11200,14 @@ var g = &grammar{
 		},
 		{
 			name: "Hex",
-			pos:  position{line: 1351, col: 1, offset: 37650},
+			pos:  position{line: 1345, col: 1, offset: 37521},
 			expr: &actionExpr{
-				pos: position{line: 1351, col: 7, offset: 37656},
+				pos: position{line: 1345, col: 7, offset: 37527},
 				run: (*parser).callonHex1,
 				expr: &oneOrMoreExpr{
-					pos: position{line: 1351, col: 7, offset: 37656},
+					pos: position{line: 1345, col: 7, offset: 37527},
 					expr: &ruleRefExpr{
-						pos:  position{line: 1351, col: 7, offset: 37656},
+						pos:  position{line: 1345, col: 7, offset: 37527},
 						name: "HexDigit",
 					},
 				},
@@ -11240,9 +11215,9 @@ var g = &grammar{
 		},
 		{
 			name: "HexDigit",
-			pos:  position{line: 1353, col: 1, offset: 37698},
+			pos:  position{line: 1347, col: 1, offset: 37569},
 			expr: &charClassMatcher{
-				pos:        position{line: 1353, col: 12, offset: 37709},
+				pos:        position{line: 1347, col: 12, offset: 37580},
 				val:        "[0-9a-fA-F]",
 				ranges:     []rune{'0', '9', 'a', 'f', 'A', 'F'},
 				ignoreCase: false,
@@ -11251,34 +11226,34 @@ var g = &grammar{
 		},
 		{
 			name: "QuotedString",
-			pos:  position{line: 1355, col: 1, offset: 37722},
+			pos:  position{line: 1349, col: 1, offset: 37593},
 			expr: &choiceExpr{
-				pos: position{line: 1356, col: 5, offset: 37739},
+				pos: position{line: 1350, col: 5, offset: 37610},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1356, col: 5, offset: 37739},
+						pos: position{line: 1350, col: 5, offset: 37610},
 						run: (*parser).callonQuotedString2,
 						expr: &seqExpr{
-							pos: position{line: 1356, col: 5, offset: 37739},
+							pos: position{line: 1350, col: 5, offset: 37610},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1356, col: 5, offset: 37739},
+									pos:        position{line: 1350, col: 5, offset: 37610},
 									val:        "\"",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 1356, col: 9, offset: 37743},
+									pos:   position{line: 1350, col: 9, offset: 37614},
 									label: "v",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1356, col: 11, offset: 37745},
+										pos: position{line: 1350, col: 11, offset: 37616},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1356, col: 11, offset: 37745},
+											pos:  position{line: 1350, col: 11, offset: 37616},
 											name: "DoubleQuotedChar",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1356, col: 29, offset: 37763},
+									pos:        position{line: 1350, col: 29, offset: 37634},
 									val:        "\"",
 									ignoreCase: false,
 								},
@@ -11286,29 +11261,29 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1357, col: 5, offset: 37800},
+						pos: position{line: 1351, col: 5, offset: 37671},
 						run: (*parser).callonQuotedString9,
 						expr: &seqExpr{
-							pos: position{line: 1357, col: 5, offset: 37800},
+							pos: position{line: 1351, col: 5, offset: 37671},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1357, col: 5, offset: 37800},
+									pos:        position{line: 1351, col: 5, offset: 37671},
 									val:        "'",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 1357, col: 9, offset: 37804},
+									pos:   position{line: 1351, col: 9, offset: 37675},
 									label: "v",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1357, col: 11, offset: 37806},
+										pos: position{line: 1351, col: 11, offset: 37677},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1357, col: 11, offset: 37806},
+											pos:  position{line: 1351, col: 11, offset: 37677},
 											name: "SingleQuotedChar",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1357, col: 29, offset: 37824},
+									pos:        position{line: 1351, col: 29, offset: 37695},
 									val:        "'",
 									ignoreCase: false,
 								},
@@ -11320,55 +11295,55 @@ var g = &grammar{
 		},
 		{
 			name: "DoubleQuotedChar",
-			pos:  position{line: 1359, col: 1, offset: 37858},
+			pos:  position{line: 1353, col: 1, offset: 37729},
 			expr: &choiceExpr{
-				pos: position{line: 1360, col: 5, offset: 37879},
+				pos: position{line: 1354, col: 5, offset: 37750},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1360, col: 5, offset: 37879},
+						pos: position{line: 1354, col: 5, offset: 37750},
 						run: (*parser).callonDoubleQuotedChar2,
 						expr: &seqExpr{
-							pos: position{line: 1360, col: 5, offset: 37879},
+							pos: position{line: 1354, col: 5, offset: 37750},
 							exprs: []interface{}{
 								&notExpr{
-									pos: position{line: 1360, col: 5, offset: 37879},
+									pos: position{line: 1354, col: 5, offset: 37750},
 									expr: &choiceExpr{
-										pos: position{line: 1360, col: 7, offset: 37881},
+										pos: position{line: 1354, col: 7, offset: 37752},
 										alternatives: []interface{}{
 											&litMatcher{
-												pos:        position{line: 1360, col: 7, offset: 37881},
+												pos:        position{line: 1354, col: 7, offset: 37752},
 												val:        "\"",
 												ignoreCase: false,
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1360, col: 13, offset: 37887},
+												pos:  position{line: 1354, col: 13, offset: 37758},
 												name: "EscapedChar",
 											},
 										},
 									},
 								},
 								&anyMatcher{
-									line: 1360, col: 26, offset: 37900,
+									line: 1354, col: 26, offset: 37771,
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1361, col: 5, offset: 37937},
+						pos: position{line: 1355, col: 5, offset: 37808},
 						run: (*parser).callonDoubleQuotedChar9,
 						expr: &seqExpr{
-							pos: position{line: 1361, col: 5, offset: 37937},
+							pos: position{line: 1355, col: 5, offset: 37808},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1361, col: 5, offset: 37937},
+									pos:        position{line: 1355, col: 5, offset: 37808},
 									val:        "\\",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 1361, col: 10, offset: 37942},
+									pos:   position{line: 1355, col: 10, offset: 37813},
 									label: "s",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1361, col: 12, offset: 37944},
+										pos:  position{line: 1355, col: 12, offset: 37815},
 										name: "EscapeSequence",
 									},
 								},
@@ -11380,28 +11355,28 @@ var g = &grammar{
 		},
 		{
 			name: "KeyWord",
-			pos:  position{line: 1363, col: 1, offset: 37978},
+			pos:  position{line: 1357, col: 1, offset: 37849},
 			expr: &actionExpr{
-				pos: position{line: 1364, col: 5, offset: 37990},
+				pos: position{line: 1358, col: 5, offset: 37861},
 				run: (*parser).callonKeyWord1,
 				expr: &seqExpr{
-					pos: position{line: 1364, col: 5, offset: 37990},
+					pos: position{line: 1358, col: 5, offset: 37861},
 					exprs: []interface{}{
 						&labeledExpr{
-							pos:   position{line: 1364, col: 5, offset: 37990},
+							pos:   position{line: 1358, col: 5, offset: 37861},
 							label: "head",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1364, col: 10, offset: 37995},
+								pos:  position{line: 1358, col: 10, offset: 37866},
 								name: "KeyWordStart",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1364, col: 23, offset: 38008},
+							pos:   position{line: 1358, col: 23, offset: 37879},
 							label: "tail",
 							expr: &zeroOrMoreExpr{
-								pos: position{line: 1364, col: 28, offset: 38013},
+								pos: position{line: 1358, col: 28, offset: 37884},
 								expr: &ruleRefExpr{
-									pos:  position{line: 1364, col: 28, offset: 38013},
+									pos:  position{line: 1358, col: 28, offset: 37884},
 									name: "KeyWordRest",
 								},
 							},
@@ -11412,16 +11387,16 @@ var g = &grammar{
 		},
 		{
 			name: "KeyWordStart",
-			pos:  position{line: 1366, col: 1, offset: 38075},
+			pos:  position{line: 1360, col: 1, offset: 37946},
 			expr: &choiceExpr{
-				pos: position{line: 1367, col: 5, offset: 38092},
+				pos: position{line: 1361, col: 5, offset: 37963},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1367, col: 5, offset: 38092},
+						pos:  position{line: 1361, col: 5, offset: 37963},
 						name: "KeyWordChars",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1368, col: 5, offset: 38109},
+						pos:  position{line: 1362, col: 5, offset: 37980},
 						name: "KeyWordEsc",
 					},
 				},
@@ -11429,12 +11404,12 @@ var g = &grammar{
 		},
 		{
 			name: "KeyWordChars",
-			pos:  position{line: 1370, col: 1, offset: 38121},
+			pos:  position{line: 1364, col: 1, offset: 37992},
 			expr: &actionExpr{
-				pos: position{line: 1370, col: 16, offset: 38136},
+				pos: position{line: 1364, col: 16, offset: 38007},
 				run: (*parser).callonKeyWordChars1,
 				expr: &charClassMatcher{
-					pos:        position{line: 1370, col: 16, offset: 38136},
+					pos:        position{line: 1364, col: 16, offset: 38007},
 					val:        "[a-zA-Z_.:/%#@~]",
 					chars:      []rune{'_', '.', ':', '/', '%', '#', '@', '~'},
 					ranges:     []rune{'a', 'z', 'A', 'Z'},
@@ -11445,16 +11420,16 @@ var g = &grammar{
 		},
 		{
 			name: "KeyWordRest",
-			pos:  position{line: 1372, col: 1, offset: 38185},
+			pos:  position{line: 1366, col: 1, offset: 38056},
 			expr: &choiceExpr{
-				pos: position{line: 1373, col: 5, offset: 38201},
+				pos: position{line: 1367, col: 5, offset: 38072},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1373, col: 5, offset: 38201},
+						pos:  position{line: 1367, col: 5, offset: 38072},
 						name: "KeyWordStart",
 					},
 					&charClassMatcher{
-						pos:        position{line: 1374, col: 5, offset: 38218},
+						pos:        position{line: 1368, col: 5, offset: 38089},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
@@ -11465,30 +11440,30 @@ var g = &grammar{
 		},
 		{
 			name: "KeyWordEsc",
-			pos:  position{line: 1376, col: 1, offset: 38225},
+			pos:  position{line: 1370, col: 1, offset: 38096},
 			expr: &actionExpr{
-				pos: position{line: 1376, col: 14, offset: 38238},
+				pos: position{line: 1370, col: 14, offset: 38109},
 				run: (*parser).callonKeyWordEsc1,
 				expr: &seqExpr{
-					pos: position{line: 1376, col: 14, offset: 38238},
+					pos: position{line: 1370, col: 14, offset: 38109},
 					exprs: []interface{}{
 						&litMatcher{
-							pos:        position{line: 1376, col: 14, offset: 38238},
+							pos:        position{line: 1370, col: 14, offset: 38109},
 							val:        "\\",
 							ignoreCase: false,
 						},
 						&labeledExpr{
-							pos:   position{line: 1376, col: 19, offset: 38243},
+							pos:   position{line: 1370, col: 19, offset: 38114},
 							label: "s",
 							expr: &choiceExpr{
-								pos: position{line: 1376, col: 22, offset: 38246},
+								pos: position{line: 1370, col: 22, offset: 38117},
 								alternatives: []interface{}{
 									&ruleRefExpr{
-										pos:  position{line: 1376, col: 22, offset: 38246},
+										pos:  position{line: 1370, col: 22, offset: 38117},
 										name: "KeywordEscape",
 									},
 									&ruleRefExpr{
-										pos:  position{line: 1376, col: 38, offset: 38262},
+										pos:  position{line: 1370, col: 38, offset: 38133},
 										name: "EscapeSequence",
 									},
 								},
@@ -11500,42 +11475,42 @@ var g = &grammar{
 		},
 		{
 			name: "GlobPattern",
-			pos:  position{line: 1378, col: 1, offset: 38297},
+			pos:  position{line: 1372, col: 1, offset: 38168},
 			expr: &actionExpr{
-				pos: position{line: 1379, col: 5, offset: 38313},
+				pos: position{line: 1373, col: 5, offset: 38184},
 				run: (*parser).callonGlobPattern1,
 				expr: &seqExpr{
-					pos: position{line: 1379, col: 5, offset: 38313},
+					pos: position{line: 1373, col: 5, offset: 38184},
 					exprs: []interface{}{
 						&andExpr{
-							pos: position{line: 1379, col: 5, offset: 38313},
+							pos: position{line: 1373, col: 5, offset: 38184},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1379, col: 6, offset: 38314},
+								pos:  position{line: 1373, col: 6, offset: 38185},
 								name: "GlobProperStart",
 							},
 						},
 						&andExpr{
-							pos: position{line: 1379, col: 22, offset: 38330},
+							pos: position{line: 1373, col: 22, offset: 38201},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1379, col: 23, offset: 38331},
+								pos:  position{line: 1373, col: 23, offset: 38202},
 								name: "GlobHasStar",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1379, col: 35, offset: 38343},
+							pos:   position{line: 1373, col: 35, offset: 38214},
 							label: "head",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1379, col: 40, offset: 38348},
+								pos:  position{line: 1373, col: 40, offset: 38219},
 								name: "GlobStart",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1379, col: 50, offset: 38358},
+							pos:   position{line: 1373, col: 50, offset: 38229},
 							label: "tail",
 							expr: &zeroOrMoreExpr{
-								pos: position{line: 1379, col: 55, offset: 38363},
+								pos: position{line: 1373, col: 55, offset: 38234},
 								expr: &ruleRefExpr{
-									pos:  position{line: 1379, col: 55, offset: 38363},
+									pos:  position{line: 1373, col: 55, offset: 38234},
 									name: "GlobRest",
 								},
 							},
@@ -11546,27 +11521,27 @@ var g = &grammar{
 		},
 		{
 			name: "GlobProperStart",
-			pos:  position{line: 1383, col: 1, offset: 38432},
+			pos:  position{line: 1377, col: 1, offset: 38303},
 			expr: &choiceExpr{
-				pos: position{line: 1383, col: 19, offset: 38450},
+				pos: position{line: 1377, col: 19, offset: 38321},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1383, col: 19, offset: 38450},
+						pos:  position{line: 1377, col: 19, offset: 38321},
 						name: "KeyWordStart",
 					},
 					&seqExpr{
-						pos: position{line: 1383, col: 34, offset: 38465},
+						pos: position{line: 1377, col: 34, offset: 38336},
 						exprs: []interface{}{
 							&oneOrMoreExpr{
-								pos: position{line: 1383, col: 34, offset: 38465},
+								pos: position{line: 1377, col: 34, offset: 38336},
 								expr: &litMatcher{
-									pos:        position{line: 1383, col: 34, offset: 38465},
+									pos:        position{line: 1377, col: 34, offset: 38336},
 									val:        "*",
 									ignoreCase: false,
 								},
 							},
 							&ruleRefExpr{
-								pos:  position{line: 1383, col: 39, offset: 38470},
+								pos:  position{line: 1377, col: 39, offset: 38341},
 								name: "KeyWordRest",
 							},
 						},
@@ -11576,19 +11551,19 @@ var g = &grammar{
 		},
 		{
 			name: "GlobHasStar",
-			pos:  position{line: 1384, col: 1, offset: 38482},
+			pos:  position{line: 1378, col: 1, offset: 38353},
 			expr: &seqExpr{
-				pos: position{line: 1384, col: 15, offset: 38496},
+				pos: position{line: 1378, col: 15, offset: 38367},
 				exprs: []interface{}{
 					&zeroOrMoreExpr{
-						pos: position{line: 1384, col: 15, offset: 38496},
+						pos: position{line: 1378, col: 15, offset: 38367},
 						expr: &ruleRefExpr{
-							pos:  position{line: 1384, col: 15, offset: 38496},
+							pos:  position{line: 1378, col: 15, offset: 38367},
 							name: "KeyWordRest",
 						},
 					},
 					&litMatcher{
-						pos:        position{line: 1384, col: 28, offset: 38509},
+						pos:        position{line: 1378, col: 28, offset: 38380},
 						val:        "*",
 						ignoreCase: false,
 					},
@@ -11597,23 +11572,23 @@ var g = &grammar{
 		},
 		{
 			name: "GlobStart",
-			pos:  position{line: 1386, col: 1, offset: 38514},
+			pos:  position{line: 1380, col: 1, offset: 38385},
 			expr: &choiceExpr{
-				pos: position{line: 1387, col: 5, offset: 38528},
+				pos: position{line: 1381, col: 5, offset: 38399},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1387, col: 5, offset: 38528},
+						pos:  position{line: 1381, col: 5, offset: 38399},
 						name: "KeyWordChars",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1388, col: 5, offset: 38545},
+						pos:  position{line: 1382, col: 5, offset: 38416},
 						name: "GlobEsc",
 					},
 					&actionExpr{
-						pos: position{line: 1389, col: 5, offset: 38557},
+						pos: position{line: 1383, col: 5, offset: 38428},
 						run: (*parser).callonGlobStart4,
 						expr: &litMatcher{
-							pos:        position{line: 1389, col: 5, offset: 38557},
+							pos:        position{line: 1383, col: 5, offset: 38428},
 							val:        "*",
 							ignoreCase: false,
 						},
@@ -11623,16 +11598,16 @@ var g = &grammar{
 		},
 		{
 			name: "GlobRest",
-			pos:  position{line: 1391, col: 1, offset: 38582},
+			pos:  position{line: 1385, col: 1, offset: 38453},
 			expr: &choiceExpr{
-				pos: position{line: 1392, col: 5, offset: 38595},
+				pos: position{line: 1386, col: 5, offset: 38466},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1392, col: 5, offset: 38595},
+						pos:  position{line: 1386, col: 5, offset: 38466},
 						name: "GlobStart",
 					},
 					&charClassMatcher{
-						pos:        position{line: 1393, col: 5, offset: 38609},
+						pos:        position{line: 1387, col: 5, offset: 38480},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
@@ -11643,30 +11618,30 @@ var g = &grammar{
 		},
 		{
 			name: "GlobEsc",
-			pos:  position{line: 1395, col: 1, offset: 38616},
+			pos:  position{line: 1389, col: 1, offset: 38487},
 			expr: &actionExpr{
-				pos: position{line: 1395, col: 11, offset: 38626},
+				pos: position{line: 1389, col: 11, offset: 38497},
 				run: (*parser).callonGlobEsc1,
 				expr: &seqExpr{
-					pos: position{line: 1395, col: 11, offset: 38626},
+					pos: position{line: 1389, col: 11, offset: 38497},
 					exprs: []interface{}{
 						&litMatcher{
-							pos:        position{line: 1395, col: 11, offset: 38626},
+							pos:        position{line: 1389, col: 11, offset: 38497},
 							val:        "\\",
 							ignoreCase: false,
 						},
 						&labeledExpr{
-							pos:   position{line: 1395, col: 16, offset: 38631},
+							pos:   position{line: 1389, col: 16, offset: 38502},
 							label: "s",
 							expr: &choiceExpr{
-								pos: position{line: 1395, col: 19, offset: 38634},
+								pos: position{line: 1389, col: 19, offset: 38505},
 								alternatives: []interface{}{
 									&ruleRefExpr{
-										pos:  position{line: 1395, col: 19, offset: 38634},
+										pos:  position{line: 1389, col: 19, offset: 38505},
 										name: "GlobEscape",
 									},
 									&ruleRefExpr{
-										pos:  position{line: 1395, col: 32, offset: 38647},
+										pos:  position{line: 1389, col: 32, offset: 38518},
 										name: "EscapeSequence",
 									},
 								},
@@ -11678,30 +11653,30 @@ var g = &grammar{
 		},
 		{
 			name: "GlobEscape",
-			pos:  position{line: 1397, col: 1, offset: 38682},
+			pos:  position{line: 1391, col: 1, offset: 38553},
 			expr: &choiceExpr{
-				pos: position{line: 1398, col: 5, offset: 38697},
+				pos: position{line: 1392, col: 5, offset: 38568},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1398, col: 5, offset: 38697},
+						pos: position{line: 1392, col: 5, offset: 38568},
 						run: (*parser).callonGlobEscape2,
 						expr: &litMatcher{
-							pos:        position{line: 1398, col: 5, offset: 38697},
+							pos:        position{line: 1392, col: 5, offset: 38568},
 							val:        "=",
 							ignoreCase: false,
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1399, col: 5, offset: 38725},
+						pos: position{line: 1393, col: 5, offset: 38596},
 						run: (*parser).callonGlobEscape4,
 						expr: &litMatcher{
-							pos:        position{line: 1399, col: 5, offset: 38725},
+							pos:        position{line: 1393, col: 5, offset: 38596},
 							val:        "*",
 							ignoreCase: false,
 						},
 					},
 					&charClassMatcher{
-						pos:        position{line: 1400, col: 5, offset: 38755},
+						pos:        position{line: 1394, col: 5, offset: 38626},
 						val:        "[+-]",
 						chars:      []rune{'+', '-'},
 						ignoreCase: false,
@@ -11712,55 +11687,55 @@ var g = &grammar{
 		},
 		{
 			name: "SingleQuotedChar",
-			pos:  position{line: 1402, col: 1, offset: 38761},
+			pos:  position{line: 1396, col: 1, offset: 38632},
 			expr: &choiceExpr{
-				pos: position{line: 1403, col: 5, offset: 38782},
+				pos: position{line: 1397, col: 5, offset: 38653},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1403, col: 5, offset: 38782},
+						pos: position{line: 1397, col: 5, offset: 38653},
 						run: (*parser).callonSingleQuotedChar2,
 						expr: &seqExpr{
-							pos: position{line: 1403, col: 5, offset: 38782},
+							pos: position{line: 1397, col: 5, offset: 38653},
 							exprs: []interface{}{
 								&notExpr{
-									pos: position{line: 1403, col: 5, offset: 38782},
+									pos: position{line: 1397, col: 5, offset: 38653},
 									expr: &choiceExpr{
-										pos: position{line: 1403, col: 7, offset: 38784},
+										pos: position{line: 1397, col: 7, offset: 38655},
 										alternatives: []interface{}{
 											&litMatcher{
-												pos:        position{line: 1403, col: 7, offset: 38784},
+												pos:        position{line: 1397, col: 7, offset: 38655},
 												val:        "'",
 												ignoreCase: false,
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1403, col: 13, offset: 38790},
+												pos:  position{line: 1397, col: 13, offset: 38661},
 												name: "EscapedChar",
 											},
 										},
 									},
 								},
 								&anyMatcher{
-									line: 1403, col: 26, offset: 38803,
+									line: 1397, col: 26, offset: 38674,
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1404, col: 5, offset: 38840},
+						pos: position{line: 1398, col: 5, offset: 38711},
 						run: (*parser).callonSingleQuotedChar9,
 						expr: &seqExpr{
-							pos: position{line: 1404, col: 5, offset: 38840},
+							pos: position{line: 1398, col: 5, offset: 38711},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1404, col: 5, offset: 38840},
+									pos:        position{line: 1398, col: 5, offset: 38711},
 									val:        "\\",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 1404, col: 10, offset: 38845},
+									pos:   position{line: 1398, col: 10, offset: 38716},
 									label: "s",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1404, col: 12, offset: 38847},
+										pos:  position{line: 1398, col: 12, offset: 38718},
 										name: "EscapeSequence",
 									},
 								},
@@ -11772,16 +11747,16 @@ var g = &grammar{
 		},
 		{
 			name: "EscapeSequence",
-			pos:  position{line: 1406, col: 1, offset: 38881},
+			pos:  position{line: 1400, col: 1, offset: 38752},
 			expr: &choiceExpr{
-				pos: position{line: 1407, col: 5, offset: 38900},
+				pos: position{line: 1401, col: 5, offset: 38771},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1407, col: 5, offset: 38900},
+						pos:  position{line: 1401, col: 5, offset: 38771},
 						name: "SingleCharEscape",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1408, col: 5, offset: 38921},
+						pos:  position{line: 1402, col: 5, offset: 38792},
 						name: "UnicodeEscape",
 					},
 				},
@@ -11789,79 +11764,79 @@ var g = &grammar{
 		},
 		{
 			name: "SingleCharEscape",
-			pos:  position{line: 1410, col: 1, offset: 38936},
+			pos:  position{line: 1404, col: 1, offset: 38807},
 			expr: &choiceExpr{
-				pos: position{line: 1411, col: 5, offset: 38957},
+				pos: position{line: 1405, col: 5, offset: 38828},
 				alternatives: []interface{}{
 					&litMatcher{
-						pos:        position{line: 1411, col: 5, offset: 38957},
+						pos:        position{line: 1405, col: 5, offset: 38828},
 						val:        "'",
 						ignoreCase: false,
 					},
 					&actionExpr{
-						pos: position{line: 1412, col: 5, offset: 38965},
+						pos: position{line: 1406, col: 5, offset: 38836},
 						run: (*parser).callonSingleCharEscape3,
 						expr: &litMatcher{
-							pos:        position{line: 1412, col: 5, offset: 38965},
+							pos:        position{line: 1406, col: 5, offset: 38836},
 							val:        "\"",
 							ignoreCase: false,
 						},
 					},
 					&litMatcher{
-						pos:        position{line: 1413, col: 5, offset: 39005},
+						pos:        position{line: 1407, col: 5, offset: 38876},
 						val:        "\\",
 						ignoreCase: false,
 					},
 					&actionExpr{
-						pos: position{line: 1414, col: 5, offset: 39014},
+						pos: position{line: 1408, col: 5, offset: 38885},
 						run: (*parser).callonSingleCharEscape6,
 						expr: &litMatcher{
-							pos:        position{line: 1414, col: 5, offset: 39014},
+							pos:        position{line: 1408, col: 5, offset: 38885},
 							val:        "b",
 							ignoreCase: false,
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1415, col: 5, offset: 39043},
+						pos: position{line: 1409, col: 5, offset: 38914},
 						run: (*parser).callonSingleCharEscape8,
 						expr: &litMatcher{
-							pos:        position{line: 1415, col: 5, offset: 39043},
+							pos:        position{line: 1409, col: 5, offset: 38914},
 							val:        "f",
 							ignoreCase: false,
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1416, col: 5, offset: 39072},
+						pos: position{line: 1410, col: 5, offset: 38943},
 						run: (*parser).callonSingleCharEscape10,
 						expr: &litMatcher{
-							pos:        position{line: 1416, col: 5, offset: 39072},
+							pos:        position{line: 1410, col: 5, offset: 38943},
 							val:        "n",
 							ignoreCase: false,
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1417, col: 5, offset: 39101},
+						pos: position{line: 1411, col: 5, offset: 38972},
 						run: (*parser).callonSingleCharEscape12,
 						expr: &litMatcher{
-							pos:        position{line: 1417, col: 5, offset: 39101},
+							pos:        position{line: 1411, col: 5, offset: 38972},
 							val:        "r",
 							ignoreCase: false,
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1418, col: 5, offset: 39130},
+						pos: position{line: 1412, col: 5, offset: 39001},
 						run: (*parser).callonSingleCharEscape14,
 						expr: &litMatcher{
-							pos:        position{line: 1418, col: 5, offset: 39130},
+							pos:        position{line: 1412, col: 5, offset: 39001},
 							val:        "t",
 							ignoreCase: false,
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1419, col: 5, offset: 39159},
+						pos: position{line: 1413, col: 5, offset: 39030},
 						run: (*parser).callonSingleCharEscape16,
 						expr: &litMatcher{
-							pos:        position{line: 1419, col: 5, offset: 39159},
+							pos:        position{line: 1413, col: 5, offset: 39030},
 							val:        "v",
 							ignoreCase: false,
 						},
@@ -11871,30 +11846,30 @@ var g = &grammar{
 		},
 		{
 			name: "KeywordEscape",
-			pos:  position{line: 1421, col: 1, offset: 39185},
+			pos:  position{line: 1415, col: 1, offset: 39056},
 			expr: &choiceExpr{
-				pos: position{line: 1422, col: 5, offset: 39203},
+				pos: position{line: 1416, col: 5, offset: 39074},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1422, col: 5, offset: 39203},
+						pos: position{line: 1416, col: 5, offset: 39074},
 						run: (*parser).callonKeywordEscape2,
 						expr: &litMatcher{
-							pos:        position{line: 1422, col: 5, offset: 39203},
+							pos:        position{line: 1416, col: 5, offset: 39074},
 							val:        "=",
 							ignoreCase: false,
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1423, col: 5, offset: 39231},
+						pos: position{line: 1417, col: 5, offset: 39102},
 						run: (*parser).callonKeywordEscape4,
 						expr: &litMatcher{
-							pos:        position{line: 1423, col: 5, offset: 39231},
+							pos:        position{line: 1417, col: 5, offset: 39102},
 							val:        "*",
 							ignoreCase: false,
 						},
 					},
 					&charClassMatcher{
-						pos:        position{line: 1424, col: 5, offset: 39259},
+						pos:        position{line: 1418, col: 5, offset: 39130},
 						val:        "[+-]",
 						chars:      []rune{'+', '-'},
 						ignoreCase: false,
@@ -11905,41 +11880,41 @@ var g = &grammar{
 		},
 		{
 			name: "UnicodeEscape",
-			pos:  position{line: 1426, col: 1, offset: 39265},
+			pos:  position{line: 1420, col: 1, offset: 39136},
 			expr: &choiceExpr{
-				pos: position{line: 1427, col: 5, offset: 39283},
+				pos: position{line: 1421, col: 5, offset: 39154},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1427, col: 5, offset: 39283},
+						pos: position{line: 1421, col: 5, offset: 39154},
 						run: (*parser).callonUnicodeEscape2,
 						expr: &seqExpr{
-							pos: position{line: 1427, col: 5, offset: 39283},
+							pos: position{line: 1421, col: 5, offset: 39154},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1427, col: 5, offset: 39283},
+									pos:        position{line: 1421, col: 5, offset: 39154},
 									val:        "u",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 1427, col: 9, offset: 39287},
+									pos:   position{line: 1421, col: 9, offset: 39158},
 									label: "chars",
 									expr: &seqExpr{
-										pos: position{line: 1427, col: 16, offset: 39294},
+										pos: position{line: 1421, col: 16, offset: 39165},
 										exprs: []interface{}{
 											&ruleRefExpr{
-												pos:  position{line: 1427, col: 16, offset: 39294},
+												pos:  position{line: 1421, col: 16, offset: 39165},
 												name: "HexDigit",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1427, col: 25, offset: 39303},
+												pos:  position{line: 1421, col: 25, offset: 39174},
 												name: "HexDigit",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1427, col: 34, offset: 39312},
+												pos:  position{line: 1421, col: 34, offset: 39183},
 												name: "HexDigit",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1427, col: 43, offset: 39321},
+												pos:  position{line: 1421, col: 43, offset: 39192},
 												name: "HexDigit",
 											},
 										},
@@ -11949,63 +11924,63 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1430, col: 5, offset: 39384},
+						pos: position{line: 1424, col: 5, offset: 39255},
 						run: (*parser).callonUnicodeEscape11,
 						expr: &seqExpr{
-							pos: position{line: 1430, col: 5, offset: 39384},
+							pos: position{line: 1424, col: 5, offset: 39255},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1430, col: 5, offset: 39384},
+									pos:        position{line: 1424, col: 5, offset: 39255},
 									val:        "u",
 									ignoreCase: false,
 								},
 								&litMatcher{
-									pos:        position{line: 1430, col: 9, offset: 39388},
+									pos:        position{line: 1424, col: 9, offset: 39259},
 									val:        "{",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 1430, col: 13, offset: 39392},
+									pos:   position{line: 1424, col: 13, offset: 39263},
 									label: "chars",
 									expr: &seqExpr{
-										pos: position{line: 1430, col: 20, offset: 39399},
+										pos: position{line: 1424, col: 20, offset: 39270},
 										exprs: []interface{}{
 											&ruleRefExpr{
-												pos:  position{line: 1430, col: 20, offset: 39399},
+												pos:  position{line: 1424, col: 20, offset: 39270},
 												name: "HexDigit",
 											},
 											&zeroOrOneExpr{
-												pos: position{line: 1430, col: 29, offset: 39408},
+												pos: position{line: 1424, col: 29, offset: 39279},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1430, col: 29, offset: 39408},
+													pos:  position{line: 1424, col: 29, offset: 39279},
 													name: "HexDigit",
 												},
 											},
 											&zeroOrOneExpr{
-												pos: position{line: 1430, col: 39, offset: 39418},
+												pos: position{line: 1424, col: 39, offset: 39289},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1430, col: 39, offset: 39418},
+													pos:  position{line: 1424, col: 39, offset: 39289},
 													name: "HexDigit",
 												},
 											},
 											&zeroOrOneExpr{
-												pos: position{line: 1430, col: 49, offset: 39428},
+												pos: position{line: 1424, col: 49, offset: 39299},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1430, col: 49, offset: 39428},
+													pos:  position{line: 1424, col: 49, offset: 39299},
 													name: "HexDigit",
 												},
 											},
 											&zeroOrOneExpr{
-												pos: position{line: 1430, col: 59, offset: 39438},
+												pos: position{line: 1424, col: 59, offset: 39309},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1430, col: 59, offset: 39438},
+													pos:  position{line: 1424, col: 59, offset: 39309},
 													name: "HexDigit",
 												},
 											},
 											&zeroOrOneExpr{
-												pos: position{line: 1430, col: 69, offset: 39448},
+												pos: position{line: 1424, col: 69, offset: 39319},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1430, col: 69, offset: 39448},
+													pos:  position{line: 1424, col: 69, offset: 39319},
 													name: "HexDigit",
 												},
 											},
@@ -12013,7 +11988,7 @@ var g = &grammar{
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1430, col: 80, offset: 39459},
+									pos:        position{line: 1424, col: 80, offset: 39330},
 									val:        "}",
 									ignoreCase: false,
 								},
@@ -12025,35 +12000,35 @@ var g = &grammar{
 		},
 		{
 			name: "RegexpPattern",
-			pos:  position{line: 1434, col: 1, offset: 39513},
+			pos:  position{line: 1428, col: 1, offset: 39384},
 			expr: &actionExpr{
-				pos: position{line: 1435, col: 5, offset: 39531},
+				pos: position{line: 1429, col: 5, offset: 39402},
 				run: (*parser).callonRegexpPattern1,
 				expr: &seqExpr{
-					pos: position{line: 1435, col: 5, offset: 39531},
+					pos: position{line: 1429, col: 5, offset: 39402},
 					exprs: []interface{}{
 						&litMatcher{
-							pos:        position{line: 1435, col: 5, offset: 39531},
+							pos:        position{line: 1429, col: 5, offset: 39402},
 							val:        "/",
 							ignoreCase: false,
 						},
 						&labeledExpr{
-							pos:   position{line: 1435, col: 9, offset: 39535},
+							pos:   position{line: 1429, col: 9, offset: 39406},
 							label: "body",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1435, col: 14, offset: 39540},
+								pos:  position{line: 1429, col: 14, offset: 39411},
 								name: "RegexpBody",
 							},
 						},
 						&litMatcher{
-							pos:        position{line: 1435, col: 25, offset: 39551},
+							pos:        position{line: 1429, col: 25, offset: 39422},
 							val:        "/",
 							ignoreCase: false,
 						},
 						&notExpr{
-							pos: position{line: 1435, col: 29, offset: 39555},
+							pos: position{line: 1429, col: 29, offset: 39426},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1435, col: 30, offset: 39556},
+								pos:  position{line: 1429, col: 30, offset: 39427},
 								name: "KeyWordStart",
 							},
 						},
@@ -12063,32 +12038,32 @@ var g = &grammar{
 		},
 		{
 			name: "RegexpBody",
-			pos:  position{line: 1437, col: 1, offset: 39591},
+			pos:  position{line: 1431, col: 1, offset: 39462},
 			expr: &actionExpr{
-				pos: position{line: 1438, col: 5, offset: 39606},
+				pos: position{line: 1432, col: 5, offset: 39477},
 				run: (*parser).callonRegexpBody1,
 				expr: &oneOrMoreExpr{
-					pos: position{line: 1438, col: 5, offset: 39606},
+					pos: position{line: 1432, col: 5, offset: 39477},
 					expr: &choiceExpr{
-						pos: position{line: 1438, col: 6, offset: 39607},
+						pos: position{line: 1432, col: 6, offset: 39478},
 						alternatives: []interface{}{
 							&charClassMatcher{
-								pos:        position{line: 1438, col: 6, offset: 39607},
+								pos:        position{line: 1432, col: 6, offset: 39478},
 								val:        "[^/\\\\]",
 								chars:      []rune{'/', '\\'},
 								ignoreCase: false,
 								inverted:   true,
 							},
 							&seqExpr{
-								pos: position{line: 1438, col: 15, offset: 39616},
+								pos: position{line: 1432, col: 15, offset: 39487},
 								exprs: []interface{}{
 									&litMatcher{
-										pos:        position{line: 1438, col: 15, offset: 39616},
+										pos:        position{line: 1432, col: 15, offset: 39487},
 										val:        "\\",
 										ignoreCase: false,
 									},
 									&anyMatcher{
-										line: 1438, col: 20, offset: 39621,
+										line: 1432, col: 20, offset: 39492,
 									},
 								},
 							},
@@ -12099,9 +12074,9 @@ var g = &grammar{
 		},
 		{
 			name: "EscapedChar",
-			pos:  position{line: 1440, col: 1, offset: 39657},
+			pos:  position{line: 1434, col: 1, offset: 39528},
 			expr: &charClassMatcher{
-				pos:        position{line: 1441, col: 5, offset: 39673},
+				pos:        position{line: 1435, col: 5, offset: 39544},
 				val:        "[\\x00-\\x1f\\\\]",
 				chars:      []rune{'\\'},
 				ranges:     []rune{'\x00', '\x1f'},
@@ -12111,42 +12086,42 @@ var g = &grammar{
 		},
 		{
 			name: "_",
-			pos:  position{line: 1443, col: 1, offset: 39688},
+			pos:  position{line: 1437, col: 1, offset: 39559},
 			expr: &oneOrMoreExpr{
-				pos: position{line: 1443, col: 5, offset: 39692},
+				pos: position{line: 1437, col: 5, offset: 39563},
 				expr: &ruleRefExpr{
-					pos:  position{line: 1443, col: 5, offset: 39692},
+					pos:  position{line: 1437, col: 5, offset: 39563},
 					name: "AnySpace",
 				},
 			},
 		},
 		{
 			name: "__",
-			pos:  position{line: 1445, col: 1, offset: 39703},
+			pos:  position{line: 1439, col: 1, offset: 39574},
 			expr: &zeroOrMoreExpr{
-				pos: position{line: 1445, col: 6, offset: 39708},
+				pos: position{line: 1439, col: 6, offset: 39579},
 				expr: &ruleRefExpr{
-					pos:  position{line: 1445, col: 6, offset: 39708},
+					pos:  position{line: 1439, col: 6, offset: 39579},
 					name: "AnySpace",
 				},
 			},
 		},
 		{
 			name: "AnySpace",
-			pos:  position{line: 1447, col: 1, offset: 39719},
+			pos:  position{line: 1441, col: 1, offset: 39590},
 			expr: &choiceExpr{
-				pos: position{line: 1448, col: 5, offset: 39732},
+				pos: position{line: 1442, col: 5, offset: 39603},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1448, col: 5, offset: 39732},
+						pos:  position{line: 1442, col: 5, offset: 39603},
 						name: "WhiteSpace",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1449, col: 5, offset: 39747},
+						pos:  position{line: 1443, col: 5, offset: 39618},
 						name: "LineTerminator",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1450, col: 5, offset: 39766},
+						pos:  position{line: 1444, col: 5, offset: 39637},
 						name: "Comment",
 					},
 				},
@@ -12154,45 +12129,45 @@ var g = &grammar{
 		},
 		{
 			name: "SourceCharacter",
-			pos:  position{line: 1452, col: 1, offset: 39775},
+			pos:  position{line: 1446, col: 1, offset: 39646},
 			expr: &anyMatcher{
-				line: 1453, col: 5, offset: 39795,
+				line: 1447, col: 5, offset: 39666,
 			},
 		},
 		{
 			name:        "WhiteSpace",
 			displayName: "\"whitespace\"",
-			pos:         position{line: 1455, col: 1, offset: 39798},
+			pos:         position{line: 1449, col: 1, offset: 39669},
 			expr: &choiceExpr{
-				pos: position{line: 1456, col: 5, offset: 39826},
+				pos: position{line: 1450, col: 5, offset: 39697},
 				alternatives: []interface{}{
 					&litMatcher{
-						pos:        position{line: 1456, col: 5, offset: 39826},
+						pos:        position{line: 1450, col: 5, offset: 39697},
 						val:        "\t",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1457, col: 5, offset: 39835},
+						pos:        position{line: 1451, col: 5, offset: 39706},
 						val:        "\v",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1458, col: 5, offset: 39844},
+						pos:        position{line: 1452, col: 5, offset: 39715},
 						val:        "\f",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1459, col: 5, offset: 39853},
+						pos:        position{line: 1453, col: 5, offset: 39724},
 						val:        " ",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1460, col: 5, offset: 39861},
+						pos:        position{line: 1454, col: 5, offset: 39732},
 						val:        "\u00a0",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1461, col: 5, offset: 39874},
+						pos:        position{line: 1455, col: 5, offset: 39745},
 						val:        "\ufeff",
 						ignoreCase: false,
 					},
@@ -12201,9 +12176,9 @@ var g = &grammar{
 		},
 		{
 			name: "LineTerminator",
-			pos:  position{line: 1463, col: 1, offset: 39884},
+			pos:  position{line: 1457, col: 1, offset: 39755},
 			expr: &charClassMatcher{
-				pos:        position{line: 1464, col: 5, offset: 39903},
+				pos:        position{line: 1458, col: 5, offset: 39774},
 				val:        "[\\n\\r\\u2028\\u2029]",
 				chars:      []rune{'\n', '\r', '\u2028', '\u2029'},
 				ignoreCase: false,
@@ -12213,45 +12188,45 @@ var g = &grammar{
 		{
 			name:        "Comment",
 			displayName: "\"comment\"",
-			pos:         position{line: 1470, col: 1, offset: 40233},
+			pos:         position{line: 1464, col: 1, offset: 40104},
 			expr: &ruleRefExpr{
-				pos:  position{line: 1473, col: 5, offset: 40304},
+				pos:  position{line: 1467, col: 5, offset: 40175},
 				name: "SingleLineComment",
 			},
 		},
 		{
 			name: "MultiLineComment",
-			pos:  position{line: 1475, col: 1, offset: 40323},
+			pos:  position{line: 1469, col: 1, offset: 40194},
 			expr: &seqExpr{
-				pos: position{line: 1476, col: 5, offset: 40344},
+				pos: position{line: 1470, col: 5, offset: 40215},
 				exprs: []interface{}{
 					&litMatcher{
-						pos:        position{line: 1476, col: 5, offset: 40344},
+						pos:        position{line: 1470, col: 5, offset: 40215},
 						val:        "/*",
 						ignoreCase: false,
 					},
 					&zeroOrMoreExpr{
-						pos: position{line: 1476, col: 10, offset: 40349},
+						pos: position{line: 1470, col: 10, offset: 40220},
 						expr: &seqExpr{
-							pos: position{line: 1476, col: 11, offset: 40350},
+							pos: position{line: 1470, col: 11, offset: 40221},
 							exprs: []interface{}{
 								&notExpr{
-									pos: position{line: 1476, col: 11, offset: 40350},
+									pos: position{line: 1470, col: 11, offset: 40221},
 									expr: &litMatcher{
-										pos:        position{line: 1476, col: 12, offset: 40351},
+										pos:        position{line: 1470, col: 12, offset: 40222},
 										val:        "*/",
 										ignoreCase: false,
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1476, col: 17, offset: 40356},
+									pos:  position{line: 1470, col: 17, offset: 40227},
 									name: "SourceCharacter",
 								},
 							},
 						},
 					},
 					&litMatcher{
-						pos:        position{line: 1476, col: 35, offset: 40374},
+						pos:        position{line: 1470, col: 35, offset: 40245},
 						val:        "*/",
 						ignoreCase: false,
 					},
@@ -12260,29 +12235,29 @@ var g = &grammar{
 		},
 		{
 			name: "SingleLineComment",
-			pos:  position{line: 1478, col: 1, offset: 40380},
+			pos:  position{line: 1472, col: 1, offset: 40251},
 			expr: &seqExpr{
-				pos: position{line: 1479, col: 5, offset: 40402},
+				pos: position{line: 1473, col: 5, offset: 40273},
 				exprs: []interface{}{
 					&litMatcher{
-						pos:        position{line: 1479, col: 5, offset: 40402},
+						pos:        position{line: 1473, col: 5, offset: 40273},
 						val:        "//",
 						ignoreCase: false,
 					},
 					&zeroOrMoreExpr{
-						pos: position{line: 1479, col: 10, offset: 40407},
+						pos: position{line: 1473, col: 10, offset: 40278},
 						expr: &seqExpr{
-							pos: position{line: 1479, col: 11, offset: 40408},
+							pos: position{line: 1473, col: 11, offset: 40279},
 							exprs: []interface{}{
 								&notExpr{
-									pos: position{line: 1479, col: 11, offset: 40408},
+									pos: position{line: 1473, col: 11, offset: 40279},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1479, col: 12, offset: 40409},
+										pos:  position{line: 1473, col: 12, offset: 40280},
 										name: "LineTerminator",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1479, col: 27, offset: 40424},
+									pos:  position{line: 1473, col: 27, offset: 40295},
 									name: "SourceCharacter",
 								},
 							},
@@ -12293,19 +12268,19 @@ var g = &grammar{
 		},
 		{
 			name: "EOL",
-			pos:  position{line: 1481, col: 1, offset: 40443},
+			pos:  position{line: 1475, col: 1, offset: 40314},
 			expr: &seqExpr{
-				pos: position{line: 1481, col: 7, offset: 40449},
+				pos: position{line: 1475, col: 7, offset: 40320},
 				exprs: []interface{}{
 					&zeroOrMoreExpr{
-						pos: position{line: 1481, col: 7, offset: 40449},
+						pos: position{line: 1475, col: 7, offset: 40320},
 						expr: &ruleRefExpr{
-							pos:  position{line: 1481, col: 7, offset: 40449},
+							pos:  position{line: 1475, col: 7, offset: 40320},
 							name: "WhiteSpace",
 						},
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1481, col: 19, offset: 40461},
+						pos:  position{line: 1475, col: 19, offset: 40332},
 						name: "LineTerminator",
 					},
 				},
@@ -12313,16 +12288,16 @@ var g = &grammar{
 		},
 		{
 			name: "EOT",
-			pos:  position{line: 1483, col: 1, offset: 40477},
+			pos:  position{line: 1477, col: 1, offset: 40348},
 			expr: &choiceExpr{
-				pos: position{line: 1483, col: 7, offset: 40483},
+				pos: position{line: 1477, col: 7, offset: 40354},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1483, col: 7, offset: 40483},
+						pos:  position{line: 1477, col: 7, offset: 40354},
 						name: "_",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1483, col: 11, offset: 40487},
+						pos:  position{line: 1477, col: 11, offset: 40358},
 						name: "EOF",
 					},
 				},
@@ -12330,21 +12305,21 @@ var g = &grammar{
 		},
 		{
 			name: "EOF",
-			pos:  position{line: 1485, col: 1, offset: 40492},
+			pos:  position{line: 1479, col: 1, offset: 40363},
 			expr: &notExpr{
-				pos: position{line: 1485, col: 7, offset: 40498},
+				pos: position{line: 1479, col: 7, offset: 40369},
 				expr: &anyMatcher{
-					line: 1485, col: 8, offset: 40499,
+					line: 1479, col: 8, offset: 40370,
 				},
 			},
 		},
 		{
 			name: "EOKW",
-			pos:  position{line: 1487, col: 1, offset: 40502},
+			pos:  position{line: 1481, col: 1, offset: 40373},
 			expr: &notExpr{
-				pos: position{line: 1487, col: 8, offset: 40509},
+				pos: position{line: 1481, col: 8, offset: 40380},
 				expr: &ruleRefExpr{
-					pos:  position{line: 1487, col: 9, offset: 40510},
+					pos:  position{line: 1481, col: 9, offset: 40381},
 					name: "KeyWordChars",
 				},
 			},
@@ -15095,17 +15070,6 @@ func (p *parser) callonTypeLiteral1() (interface{}, error) {
 	return p.cur.onTypeLiteral1(stack["typ"])
 }
 
-func (c *current) onCastType3(typ interface{}) (interface{}, error) {
-	return map[string]interface{}{"kind": "TypeValue", "value": typ}, nil
-
-}
-
-func (p *parser) callonCastType3() (interface{}, error) {
-	stack := p.vstack[len(p.vstack)-1]
-	_ = stack
-	return p.cur.onCastType3(stack["typ"])
-}
-
 func (c *current) onAmbiguousType2(name interface{}) (interface{}, error) {
 	return name, nil
 }
diff --git a/compiler/parser/parser.js b/compiler/parser/parser.js
index 7332b26bf3..0865e404f9 100644
--- a/compiler/parser/parser.js
+++ b/compiler/parser/parser.js
@@ -8475,7 +8475,7 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
-    s1 = peg$parseCastType();
+    s1 = peg$parseTypeLiteral();
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
       if (s2 !== peg$FAILED) {
@@ -11723,23 +11723,6 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parseCastType() {
-    var s0, s1;
-
-    s0 = peg$parseTypeLiteral();
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parsePrimitiveType();
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$c410(s1);
-      }
-      s0 = s1;
-    }
-
-    return s0;
-  }
-
   function peg$parseType() {
     var s0;
 
diff --git a/compiler/parser/parser.peg b/compiler/parser/parser.peg
index f1dd8148ab..6297fb03e4 100644
--- a/compiler/parser/parser.peg
+++ b/compiler/parser/parser.peg
@@ -746,7 +746,7 @@ NotFuncs
   / "select"
 
 Cast
-  = typ:CastType __ "(" __ expr:(OverExpr / Expr) __ ")" {
+  = typ:TypeLiteral __ "(" __ expr:(OverExpr / Expr) __ ")" {
       RETURN(MAP("kind": "Cast", "expr": expr, "type": typ))
     }
 
@@ -1067,12 +1067,6 @@ TypeLiteral
       RETURN(MAP("kind": "TypeValue", "value": typ))
     }
 
-CastType
-  = TypeLiteral
-  / typ:PrimitiveType {
-      RETURN(MAP("kind": "TypeValue", "value": typ))
-    }
-
 Type
   = TypeLiteral
   / AmbiguousType
diff --git a/compiler/parser/ztests/primitive-cast.yaml b/compiler/parser/ztests/primitive-cast.yaml
new file mode 100644
index 0000000000..fdebd86e39
--- /dev/null
+++ b/compiler/parser/ztests/primitive-cast.yaml
@@ -0,0 +1,14 @@
+script: |
+  zc -C -s 'int64(this)'
+  zc -C -s 'time(this)'
+  zc -C -s 'string(this)'
+
+outputs:
+  - name: "stdout"
+    data: |
+      reader
+      | yield cast(this, <int64>)
+      reader
+      | yield cast(this, <time>)
+      reader
+      | yield cast(this, <string>)
diff --git a/compiler/parser/ztests/shaper-single-arg.yaml b/compiler/parser/ztests/shaper-single-arg.yaml
new file mode 100644
index 0000000000..3ca7d74aac
--- /dev/null
+++ b/compiler/parser/ztests/shaper-single-arg.yaml
@@ -0,0 +1,8 @@
+script: |
+  zc -C -s 'yield cast(<int64>)'
+
+outputs:
+  - name: stdout
+    data: |
+      reader
+      | yield cast(this, <int64>)
diff --git a/compiler/semantic/expr.go b/compiler/semantic/expr.go
index 68c21341eb..4adb196c3f 100644
--- a/compiler/semantic/expr.go
+++ b/compiler/semantic/expr.go
@@ -12,6 +12,7 @@ import (
 	"github.com/brimdata/zed/pkg/reglob"
 	"github.com/brimdata/zed/runtime/expr"
 	"github.com/brimdata/zed/runtime/expr/agg"
+	"github.com/brimdata/zed/runtime/expr/function"
 	"github.com/brimdata/zed/zson"
 )
 
@@ -471,26 +472,50 @@ func (a *analyzer) semCall(call *ast.Call) (dag.Expr, error) {
 	}
 	exprs, err := a.semExprs(call.Args)
 	if err != nil {
-		return nil, fmt.Errorf("%s: bad argument: %w", call.Name, err)
+		return nil, fmt.Errorf("%s(): bad argument: %w", call.Name, err)
 	}
+	nargs := len(call.Args)
+	name := call.Name
 	// Call could be to a user defined func. Check if we have a matching func in
 	// scope.
-	e, err := a.scope.LookupExpr(call.Name)
+	udf, err := a.scope.LookupExpr(name)
 	if err != nil {
 		return nil, err
 	}
-	if e != nil {
-		f, ok := e.(*dag.Func)
+	ptyp := zed.LookupPrimitive(name)
+	shaper := expr.GetShaperTransforms(name)
+	switch {
+	// udf should be checked first since a udf can override builtin functions.
+	case udf != nil:
+		f, ok := udf.(*dag.Func)
 		if !ok {
-			return nil, fmt.Errorf("%s(): definition is not a function type: %T", call.Name, e)
+			return nil, fmt.Errorf("%s(): definition is not a function type: %T", name, udf)
 		}
-		if len(f.Params) != len(call.Args) {
-			return nil, fmt.Errorf("%s(): expects %d argument(s)", call.Name, len(f.Params))
+		if len(f.Params) != nargs {
+			return nil, fmt.Errorf("%s(): expects %d argument(s)", name, len(f.Params))
+		}
+	case ptyp != nil:
+		// Primitive function call, change this to a cast.
+		if err := function.CheckArgCount(nargs, 1, 1); err != nil {
+			return nil, fmt.Errorf("%s(): %w", name, err)
+		}
+		name = "cast"
+		exprs = append(exprs, &dag.Literal{Kind: "Literal", Value: fmt.Sprintf("<%s>", zson.FormatType(ptyp))})
+	case shaper != 0:
+		if err := function.CheckArgCount(nargs, 1, 2); err != nil {
+			return nil, fmt.Errorf("%s(): %w", name, err)
+		}
+		if nargs == 1 {
+			exprs = append([]dag.Expr{&dag.This{Kind: "This"}}, exprs...)
+		}
+	default:
+		if _, _, err = function.New(a.zctx, name, nargs); err != nil {
+			return nil, fmt.Errorf("%s(): %w", name, err)
 		}
 	}
 	return &dag.Call{
 		Kind: "Call",
-		Name: call.Name,
+		Name: name,
 		Args: exprs,
 	}, nil
 }
diff --git a/runtime/expr/function/function.go b/runtime/expr/function/function.go
index 1391503a93..886bc046f7 100644
--- a/runtime/expr/function/function.go
+++ b/runtime/expr/function/function.go
@@ -165,13 +165,20 @@ func New(zctx *zed.Context, name string, narg int) (expr.Function, field.Path, e
 	case "unflatten":
 		f = NewUnflatten(zctx)
 	}
+	if err := CheckArgCount(narg, argmin, argmax); err != nil {
+		return nil, nil, err
+	}
+	return f, path, nil
+}
+
+func CheckArgCount(narg int, argmin int, argmax int) error {
 	if argmin != -1 && narg < argmin {
-		return nil, nil, ErrTooFewArgs
+		return ErrTooFewArgs
 	}
 	if argmax != -1 && narg > argmax {
-		return nil, nil, ErrTooManyArgs
+		return ErrTooManyArgs
 	}
-	return f, path, nil
+	return nil
 }
 
 // HasBoolResult returns true if the function name returns a Boolean value.
diff --git a/runtime/expr/shaper.go b/runtime/expr/shaper.go
index e80f3c83ac..6542d155c7 100644
--- a/runtime/expr/shaper.go
+++ b/runtime/expr/shaper.go
@@ -25,6 +25,25 @@ const (
 	Order
 )
 
+func GetShaperTransforms(s string) ShaperTransform {
+	switch s {
+	case "cast":
+		return Cast
+	case "crop":
+		return Crop
+	case "fill":
+		return Fill
+	case "fit":
+		return Crop | Fill
+	case "order":
+		return Order
+	case "shape":
+		return Cast | Fill | Order
+	default:
+		return 0
+	}
+}
+
 // NewShaper returns a shaper that will shape the result of expr
 // to the type returned by typeExpr according to tf.
 func NewShaper(zctx *zed.Context, expr, typeExpr Evaluator, tf ShaperTransform) (Evaluator, error) {