diff --git a/compiler/kernel/expr.go b/compiler/kernel/expr.go
index 80d5dae6d4..75361ec889 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.NewShaperTransform(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 bfd666d8ce..e5cbad2fde 100644
--- a/compiler/parser/parser.es.js
+++ b/compiler/parser/parser.es.js
@@ -8365,7 +8365,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) {
@@ -11613,23 +11613,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 4e0d2769f3..f34a91689d 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,15 +9908,15 @@ var g = &grammar{
 		},
 		{
 			name: "Identifier",
-			pos:  position{line: 1218, col: 1, offset: 34717},
+			pos:  position{line: 1212, col: 1, offset: 34588},
 			expr: &actionExpr{
-				pos: position{line: 1219, col: 5, offset: 34732},
+				pos: position{line: 1213, col: 5, offset: 34603},
 				run: (*parser).callonIdentifier1,
 				expr: &labeledExpr{
-					pos:   position{line: 1219, col: 5, offset: 34732},
+					pos:   position{line: 1213, col: 5, offset: 34603},
 					label: "id",
 					expr: &ruleRefExpr{
-						pos:  position{line: 1219, col: 8, offset: 34735},
+						pos:  position{line: 1213, col: 8, offset: 34606},
 						name: "IdentifierName",
 					},
 				},
@@ -9949,29 +9924,29 @@ var g = &grammar{
 		},
 		{
 			name: "IdentifierName",
-			pos:  position{line: 1221, col: 1, offset: 34816},
+			pos:  position{line: 1215, col: 1, offset: 34687},
 			expr: &choiceExpr{
-				pos: position{line: 1222, col: 5, offset: 34835},
+				pos: position{line: 1216, col: 5, offset: 34706},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1222, col: 5, offset: 34835},
+						pos: position{line: 1216, col: 5, offset: 34706},
 						run: (*parser).callonIdentifierName2,
 						expr: &seqExpr{
-							pos: position{line: 1222, col: 5, offset: 34835},
+							pos: position{line: 1216, col: 5, offset: 34706},
 							exprs: []interface{}{
 								&notExpr{
-									pos: position{line: 1222, col: 5, offset: 34835},
+									pos: position{line: 1216, col: 5, offset: 34706},
 									expr: &seqExpr{
-										pos: position{line: 1222, col: 7, offset: 34837},
+										pos: position{line: 1216, col: 7, offset: 34708},
 										exprs: []interface{}{
 											&ruleRefExpr{
-												pos:  position{line: 1222, col: 7, offset: 34837},
+												pos:  position{line: 1216, col: 7, offset: 34708},
 												name: "IDGuard",
 											},
 											&notExpr{
-												pos: position{line: 1222, col: 15, offset: 34845},
+												pos: position{line: 1216, col: 15, offset: 34716},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1222, col: 16, offset: 34846},
+													pos:  position{line: 1216, col: 16, offset: 34717},
 													name: "IdentifierRest",
 												},
 											},
@@ -9979,13 +9954,13 @@ var g = &grammar{
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1222, col: 32, offset: 34862},
+									pos:  position{line: 1216, col: 32, offset: 34733},
 									name: "IdentifierStart",
 								},
 								&zeroOrMoreExpr{
-									pos: position{line: 1222, col: 48, offset: 34878},
+									pos: position{line: 1216, col: 48, offset: 34749},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1222, col: 48, offset: 34878},
+										pos:  position{line: 1216, col: 48, offset: 34749},
 										name: "IdentifierRest",
 									},
 								},
@@ -9993,30 +9968,30 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1223, col: 5, offset: 34929},
+						pos: position{line: 1217, col: 5, offset: 34800},
 						run: (*parser).callonIdentifierName12,
 						expr: &litMatcher{
-							pos:        position{line: 1223, col: 5, offset: 34929},
+							pos:        position{line: 1217, col: 5, offset: 34800},
 							val:        "$",
 							ignoreCase: false,
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1224, col: 5, offset: 34968},
+						pos: position{line: 1218, col: 5, offset: 34839},
 						run: (*parser).callonIdentifierName14,
 						expr: &seqExpr{
-							pos: position{line: 1224, col: 5, offset: 34968},
+							pos: position{line: 1218, col: 5, offset: 34839},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1224, col: 5, offset: 34968},
+									pos:        position{line: 1218, col: 5, offset: 34839},
 									val:        "\\",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 1224, col: 10, offset: 34973},
+									pos:   position{line: 1218, col: 10, offset: 34844},
 									label: "id",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1224, col: 13, offset: 34976},
+										pos:  position{line: 1218, col: 13, offset: 34847},
 										name: "IDGuard",
 									},
 								},
@@ -10024,39 +9999,39 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1226, col: 5, offset: 35067},
+						pos: position{line: 1220, col: 5, offset: 34938},
 						run: (*parser).callonIdentifierName19,
 						expr: &litMatcher{
-							pos:        position{line: 1226, col: 5, offset: 35067},
+							pos:        position{line: 1220, col: 5, offset: 34938},
 							val:        "type",
 							ignoreCase: false,
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1227, col: 5, offset: 35109},
+						pos: position{line: 1221, col: 5, offset: 34980},
 						run: (*parser).callonIdentifierName21,
 						expr: &seqExpr{
-							pos: position{line: 1227, col: 5, offset: 35109},
+							pos: position{line: 1221, col: 5, offset: 34980},
 							exprs: []interface{}{
 								&labeledExpr{
-									pos:   position{line: 1227, col: 5, offset: 35109},
+									pos:   position{line: 1221, col: 5, offset: 34980},
 									label: "id",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1227, col: 8, offset: 35112},
+										pos:  position{line: 1221, col: 8, offset: 34983},
 										name: "SQLTokenSentinels",
 									},
 								},
 								&andExpr{
-									pos: position{line: 1227, col: 26, offset: 35130},
+									pos: position{line: 1221, col: 26, offset: 35001},
 									expr: &seqExpr{
-										pos: position{line: 1227, col: 28, offset: 35132},
+										pos: position{line: 1221, col: 28, offset: 35003},
 										exprs: []interface{}{
 											&ruleRefExpr{
-												pos:  position{line: 1227, col: 28, offset: 35132},
+												pos:  position{line: 1221, col: 28, offset: 35003},
 												name: "__",
 											},
 											&litMatcher{
-												pos:        position{line: 1227, col: 31, offset: 35135},
+												pos:        position{line: 1221, col: 31, offset: 35006},
 												val:        "(",
 												ignoreCase: false,
 											},
@@ -10071,50 +10046,50 @@ var g = &grammar{
 		},
 		{
 			name: "IdentifierNames",
-			pos:  position{line: 1229, col: 1, offset: 35160},
+			pos:  position{line: 1223, col: 1, offset: 35031},
 			expr: &actionExpr{
-				pos: position{line: 1230, col: 5, offset: 35180},
+				pos: position{line: 1224, col: 5, offset: 35051},
 				run: (*parser).callonIdentifierNames1,
 				expr: &seqExpr{
-					pos: position{line: 1230, col: 5, offset: 35180},
+					pos: position{line: 1224, col: 5, offset: 35051},
 					exprs: []interface{}{
 						&labeledExpr{
-							pos:   position{line: 1230, col: 5, offset: 35180},
+							pos:   position{line: 1224, col: 5, offset: 35051},
 							label: "first",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1230, col: 11, offset: 35186},
+								pos:  position{line: 1224, col: 11, offset: 35057},
 								name: "IdentifierName",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1230, col: 26, offset: 35201},
+							pos:   position{line: 1224, col: 26, offset: 35072},
 							label: "rest",
 							expr: &zeroOrMoreExpr{
-								pos: position{line: 1230, col: 31, offset: 35206},
+								pos: position{line: 1224, col: 31, offset: 35077},
 								expr: &actionExpr{
-									pos: position{line: 1230, col: 32, offset: 35207},
+									pos: position{line: 1224, col: 32, offset: 35078},
 									run: (*parser).callonIdentifierNames7,
 									expr: &seqExpr{
-										pos: position{line: 1230, col: 32, offset: 35207},
+										pos: position{line: 1224, col: 32, offset: 35078},
 										exprs: []interface{}{
 											&ruleRefExpr{
-												pos:  position{line: 1230, col: 32, offset: 35207},
+												pos:  position{line: 1224, col: 32, offset: 35078},
 												name: "__",
 											},
 											&litMatcher{
-												pos:        position{line: 1230, col: 35, offset: 35210},
+												pos:        position{line: 1224, col: 35, offset: 35081},
 												val:        ",",
 												ignoreCase: false,
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1230, col: 39, offset: 35214},
+												pos:  position{line: 1224, col: 39, offset: 35085},
 												name: "__",
 											},
 											&labeledExpr{
-												pos:   position{line: 1230, col: 42, offset: 35217},
+												pos:   position{line: 1224, col: 42, offset: 35088},
 												label: "id",
 												expr: &ruleRefExpr{
-													pos:  position{line: 1230, col: 45, offset: 35220},
+													pos:  position{line: 1224, col: 45, offset: 35091},
 													name: "IdentifierName",
 												},
 											},
@@ -10129,21 +10104,21 @@ var g = &grammar{
 		},
 		{
 			name: "IdentifierStart",
-			pos:  position{line: 1234, col: 1, offset: 35336},
+			pos:  position{line: 1228, col: 1, offset: 35207},
 			expr: &choiceExpr{
-				pos: position{line: 1235, col: 5, offset: 35356},
+				pos: position{line: 1229, col: 5, offset: 35227},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1235, col: 5, offset: 35356},
+						pos:  position{line: 1229, col: 5, offset: 35227},
 						name: "UnicodeLetter",
 					},
 					&litMatcher{
-						pos:        position{line: 1236, col: 5, offset: 35374},
+						pos:        position{line: 1230, col: 5, offset: 35245},
 						val:        "$",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1237, col: 5, offset: 35382},
+						pos:        position{line: 1231, col: 5, offset: 35253},
 						val:        "_",
 						ignoreCase: false,
 					},
@@ -10152,24 +10127,24 @@ var g = &grammar{
 		},
 		{
 			name: "IdentifierRest",
-			pos:  position{line: 1239, col: 1, offset: 35387},
+			pos:  position{line: 1233, col: 1, offset: 35258},
 			expr: &choiceExpr{
-				pos: position{line: 1240, col: 5, offset: 35406},
+				pos: position{line: 1234, col: 5, offset: 35277},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1240, col: 5, offset: 35406},
+						pos:  position{line: 1234, col: 5, offset: 35277},
 						name: "IdentifierStart",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1241, col: 5, offset: 35426},
+						pos:  position{line: 1235, col: 5, offset: 35297},
 						name: "UnicodeCombiningMark",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1242, col: 5, offset: 35451},
+						pos:  position{line: 1236, col: 5, offset: 35322},
 						name: "UnicodeDigit",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1243, col: 5, offset: 35468},
+						pos:  position{line: 1237, col: 5, offset: 35339},
 						name: "UnicodeConnectorPunctuation",
 					},
 				},
@@ -10177,24 +10152,24 @@ var g = &grammar{
 		},
 		{
 			name: "IDGuard",
-			pos:  position{line: 1245, col: 1, offset: 35497},
+			pos:  position{line: 1239, col: 1, offset: 35368},
 			expr: &choiceExpr{
-				pos: position{line: 1246, col: 5, offset: 35509},
+				pos: position{line: 1240, col: 5, offset: 35380},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1246, col: 5, offset: 35509},
+						pos:  position{line: 1240, col: 5, offset: 35380},
 						name: "BooleanLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1247, col: 5, offset: 35528},
+						pos:  position{line: 1241, col: 5, offset: 35399},
 						name: "NullLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1248, col: 5, offset: 35544},
+						pos:  position{line: 1242, col: 5, offset: 35415},
 						name: "NaN",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1249, col: 5, offset: 35552},
+						pos:  position{line: 1243, col: 5, offset: 35423},
 						name: "Infinity",
 					},
 				},
@@ -10202,24 +10177,24 @@ var g = &grammar{
 		},
 		{
 			name: "Time",
-			pos:  position{line: 1251, col: 1, offset: 35562},
+			pos:  position{line: 1245, col: 1, offset: 35433},
 			expr: &actionExpr{
-				pos: position{line: 1252, col: 5, offset: 35571},
+				pos: position{line: 1246, col: 5, offset: 35442},
 				run: (*parser).callonTime1,
 				expr: &seqExpr{
-					pos: position{line: 1252, col: 5, offset: 35571},
+					pos: position{line: 1246, col: 5, offset: 35442},
 					exprs: []interface{}{
 						&ruleRefExpr{
-							pos:  position{line: 1252, col: 5, offset: 35571},
+							pos:  position{line: 1246, col: 5, offset: 35442},
 							name: "FullDate",
 						},
 						&litMatcher{
-							pos:        position{line: 1252, col: 14, offset: 35580},
+							pos:        position{line: 1246, col: 14, offset: 35451},
 							val:        "T",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1252, col: 18, offset: 35584},
+							pos:  position{line: 1246, col: 18, offset: 35455},
 							name: "FullTime",
 						},
 					},
@@ -10228,30 +10203,30 @@ var g = &grammar{
 		},
 		{
 			name: "FullDate",
-			pos:  position{line: 1256, col: 1, offset: 35704},
+			pos:  position{line: 1250, col: 1, offset: 35575},
 			expr: &seqExpr{
-				pos: position{line: 1256, col: 12, offset: 35715},
+				pos: position{line: 1250, col: 12, offset: 35586},
 				exprs: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1256, col: 12, offset: 35715},
+						pos:  position{line: 1250, col: 12, offset: 35586},
 						name: "D4",
 					},
 					&litMatcher{
-						pos:        position{line: 1256, col: 15, offset: 35718},
+						pos:        position{line: 1250, col: 15, offset: 35589},
 						val:        "-",
 						ignoreCase: false,
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1256, col: 19, offset: 35722},
+						pos:  position{line: 1250, col: 19, offset: 35593},
 						name: "D2",
 					},
 					&litMatcher{
-						pos:        position{line: 1256, col: 22, offset: 35725},
+						pos:        position{line: 1250, col: 22, offset: 35596},
 						val:        "-",
 						ignoreCase: false,
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1256, col: 26, offset: 35729},
+						pos:  position{line: 1250, col: 26, offset: 35600},
 						name: "D2",
 					},
 				},
@@ -10259,33 +10234,33 @@ var g = &grammar{
 		},
 		{
 			name: "D4",
-			pos:  position{line: 1258, col: 1, offset: 35733},
+			pos:  position{line: 1252, col: 1, offset: 35604},
 			expr: &seqExpr{
-				pos: position{line: 1258, col: 6, offset: 35738},
+				pos: position{line: 1252, col: 6, offset: 35609},
 				exprs: []interface{}{
 					&charClassMatcher{
-						pos:        position{line: 1258, col: 6, offset: 35738},
+						pos:        position{line: 1252, col: 6, offset: 35609},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
 						inverted:   false,
 					},
 					&charClassMatcher{
-						pos:        position{line: 1258, col: 11, offset: 35743},
+						pos:        position{line: 1252, col: 11, offset: 35614},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
 						inverted:   false,
 					},
 					&charClassMatcher{
-						pos:        position{line: 1258, col: 16, offset: 35748},
+						pos:        position{line: 1252, col: 16, offset: 35619},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
 						inverted:   false,
 					},
 					&charClassMatcher{
-						pos:        position{line: 1258, col: 21, offset: 35753},
+						pos:        position{line: 1252, col: 21, offset: 35624},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
@@ -10296,19 +10271,19 @@ var g = &grammar{
 		},
 		{
 			name: "D2",
-			pos:  position{line: 1259, col: 1, offset: 35759},
+			pos:  position{line: 1253, col: 1, offset: 35630},
 			expr: &seqExpr{
-				pos: position{line: 1259, col: 6, offset: 35764},
+				pos: position{line: 1253, col: 6, offset: 35635},
 				exprs: []interface{}{
 					&charClassMatcher{
-						pos:        position{line: 1259, col: 6, offset: 35764},
+						pos:        position{line: 1253, col: 6, offset: 35635},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
 						inverted:   false,
 					},
 					&charClassMatcher{
-						pos:        position{line: 1259, col: 11, offset: 35769},
+						pos:        position{line: 1253, col: 11, offset: 35640},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
@@ -10319,16 +10294,16 @@ var g = &grammar{
 		},
 		{
 			name: "FullTime",
-			pos:  position{line: 1261, col: 1, offset: 35776},
+			pos:  position{line: 1255, col: 1, offset: 35647},
 			expr: &seqExpr{
-				pos: position{line: 1261, col: 12, offset: 35787},
+				pos: position{line: 1255, col: 12, offset: 35658},
 				exprs: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1261, col: 12, offset: 35787},
+						pos:  position{line: 1255, col: 12, offset: 35658},
 						name: "PartialTime",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1261, col: 24, offset: 35799},
+						pos:  position{line: 1255, col: 24, offset: 35670},
 						name: "TimeOffset",
 					},
 				},
@@ -10336,46 +10311,46 @@ var g = &grammar{
 		},
 		{
 			name: "PartialTime",
-			pos:  position{line: 1263, col: 1, offset: 35811},
+			pos:  position{line: 1257, col: 1, offset: 35682},
 			expr: &seqExpr{
-				pos: position{line: 1263, col: 15, offset: 35825},
+				pos: position{line: 1257, col: 15, offset: 35696},
 				exprs: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1263, col: 15, offset: 35825},
+						pos:  position{line: 1257, col: 15, offset: 35696},
 						name: "D2",
 					},
 					&litMatcher{
-						pos:        position{line: 1263, col: 18, offset: 35828},
+						pos:        position{line: 1257, col: 18, offset: 35699},
 						val:        ":",
 						ignoreCase: false,
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1263, col: 22, offset: 35832},
+						pos:  position{line: 1257, col: 22, offset: 35703},
 						name: "D2",
 					},
 					&litMatcher{
-						pos:        position{line: 1263, col: 25, offset: 35835},
+						pos:        position{line: 1257, col: 25, offset: 35706},
 						val:        ":",
 						ignoreCase: false,
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1263, col: 29, offset: 35839},
+						pos:  position{line: 1257, col: 29, offset: 35710},
 						name: "D2",
 					},
 					&zeroOrOneExpr{
-						pos: position{line: 1263, col: 32, offset: 35842},
+						pos: position{line: 1257, col: 32, offset: 35713},
 						expr: &seqExpr{
-							pos: position{line: 1263, col: 33, offset: 35843},
+							pos: position{line: 1257, col: 33, offset: 35714},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1263, col: 33, offset: 35843},
+									pos:        position{line: 1257, col: 33, offset: 35714},
 									val:        ".",
 									ignoreCase: false,
 								},
 								&oneOrMoreExpr{
-									pos: position{line: 1263, col: 37, offset: 35847},
+									pos: position{line: 1257, col: 37, offset: 35718},
 									expr: &charClassMatcher{
-										pos:        position{line: 1263, col: 37, offset: 35847},
+										pos:        position{line: 1257, col: 37, offset: 35718},
 										val:        "[0-9]",
 										ranges:     []rune{'0', '9'},
 										ignoreCase: false,
@@ -10390,60 +10365,60 @@ var g = &grammar{
 		},
 		{
 			name: "TimeOffset",
-			pos:  position{line: 1265, col: 1, offset: 35857},
+			pos:  position{line: 1259, col: 1, offset: 35728},
 			expr: &choiceExpr{
-				pos: position{line: 1266, col: 5, offset: 35872},
+				pos: position{line: 1260, col: 5, offset: 35743},
 				alternatives: []interface{}{
 					&litMatcher{
-						pos:        position{line: 1266, col: 5, offset: 35872},
+						pos:        position{line: 1260, col: 5, offset: 35743},
 						val:        "Z",
 						ignoreCase: false,
 					},
 					&seqExpr{
-						pos: position{line: 1267, col: 5, offset: 35880},
+						pos: position{line: 1261, col: 5, offset: 35751},
 						exprs: []interface{}{
 							&choiceExpr{
-								pos: position{line: 1267, col: 6, offset: 35881},
+								pos: position{line: 1261, col: 6, offset: 35752},
 								alternatives: []interface{}{
 									&litMatcher{
-										pos:        position{line: 1267, col: 6, offset: 35881},
+										pos:        position{line: 1261, col: 6, offset: 35752},
 										val:        "+",
 										ignoreCase: false,
 									},
 									&litMatcher{
-										pos:        position{line: 1267, col: 12, offset: 35887},
+										pos:        position{line: 1261, col: 12, offset: 35758},
 										val:        "-",
 										ignoreCase: false,
 									},
 								},
 							},
 							&ruleRefExpr{
-								pos:  position{line: 1267, col: 17, offset: 35892},
+								pos:  position{line: 1261, col: 17, offset: 35763},
 								name: "D2",
 							},
 							&litMatcher{
-								pos:        position{line: 1267, col: 20, offset: 35895},
+								pos:        position{line: 1261, col: 20, offset: 35766},
 								val:        ":",
 								ignoreCase: false,
 							},
 							&ruleRefExpr{
-								pos:  position{line: 1267, col: 24, offset: 35899},
+								pos:  position{line: 1261, col: 24, offset: 35770},
 								name: "D2",
 							},
 							&zeroOrOneExpr{
-								pos: position{line: 1267, col: 27, offset: 35902},
+								pos: position{line: 1261, col: 27, offset: 35773},
 								expr: &seqExpr{
-									pos: position{line: 1267, col: 28, offset: 35903},
+									pos: position{line: 1261, col: 28, offset: 35774},
 									exprs: []interface{}{
 										&litMatcher{
-											pos:        position{line: 1267, col: 28, offset: 35903},
+											pos:        position{line: 1261, col: 28, offset: 35774},
 											val:        ".",
 											ignoreCase: false,
 										},
 										&oneOrMoreExpr{
-											pos: position{line: 1267, col: 32, offset: 35907},
+											pos: position{line: 1261, col: 32, offset: 35778},
 											expr: &charClassMatcher{
-												pos:        position{line: 1267, col: 32, offset: 35907},
+												pos:        position{line: 1261, col: 32, offset: 35778},
 												val:        "[0-9]",
 												ranges:     []rune{'0', '9'},
 												ignoreCase: false,
@@ -10460,32 +10435,32 @@ var g = &grammar{
 		},
 		{
 			name: "Duration",
-			pos:  position{line: 1269, col: 1, offset: 35917},
+			pos:  position{line: 1263, col: 1, offset: 35788},
 			expr: &actionExpr{
-				pos: position{line: 1270, col: 5, offset: 35930},
+				pos: position{line: 1264, col: 5, offset: 35801},
 				run: (*parser).callonDuration1,
 				expr: &seqExpr{
-					pos: position{line: 1270, col: 5, offset: 35930},
+					pos: position{line: 1264, col: 5, offset: 35801},
 					exprs: []interface{}{
 						&zeroOrOneExpr{
-							pos: position{line: 1270, col: 5, offset: 35930},
+							pos: position{line: 1264, col: 5, offset: 35801},
 							expr: &litMatcher{
-								pos:        position{line: 1270, col: 5, offset: 35930},
+								pos:        position{line: 1264, col: 5, offset: 35801},
 								val:        "-",
 								ignoreCase: false,
 							},
 						},
 						&oneOrMoreExpr{
-							pos: position{line: 1270, col: 10, offset: 35935},
+							pos: position{line: 1264, col: 10, offset: 35806},
 							expr: &seqExpr{
-								pos: position{line: 1270, col: 11, offset: 35936},
+								pos: position{line: 1264, col: 11, offset: 35807},
 								exprs: []interface{}{
 									&ruleRefExpr{
-										pos:  position{line: 1270, col: 11, offset: 35936},
+										pos:  position{line: 1264, col: 11, offset: 35807},
 										name: "Decimal",
 									},
 									&ruleRefExpr{
-										pos:  position{line: 1270, col: 19, offset: 35944},
+										pos:  position{line: 1264, col: 19, offset: 35815},
 										name: "TimeUnit",
 									},
 								},
@@ -10497,26 +10472,26 @@ var g = &grammar{
 		},
 		{
 			name: "Decimal",
-			pos:  position{line: 1274, col: 1, offset: 36070},
+			pos:  position{line: 1268, col: 1, offset: 35941},
 			expr: &seqExpr{
-				pos: position{line: 1274, col: 11, offset: 36080},
+				pos: position{line: 1268, col: 11, offset: 35951},
 				exprs: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1274, col: 11, offset: 36080},
+						pos:  position{line: 1268, col: 11, offset: 35951},
 						name: "UInt",
 					},
 					&zeroOrOneExpr{
-						pos: position{line: 1274, col: 16, offset: 36085},
+						pos: position{line: 1268, col: 16, offset: 35956},
 						expr: &seqExpr{
-							pos: position{line: 1274, col: 17, offset: 36086},
+							pos: position{line: 1268, col: 17, offset: 35957},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1274, col: 17, offset: 36086},
+									pos:        position{line: 1268, col: 17, offset: 35957},
 									val:        ".",
 									ignoreCase: false,
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1274, col: 21, offset: 36090},
+									pos:  position{line: 1268, col: 21, offset: 35961},
 									name: "UInt",
 								},
 							},
@@ -10527,52 +10502,52 @@ var g = &grammar{
 		},
 		{
 			name: "TimeUnit",
-			pos:  position{line: 1276, col: 1, offset: 36098},
+			pos:  position{line: 1270, col: 1, offset: 35969},
 			expr: &choiceExpr{
-				pos: position{line: 1277, col: 5, offset: 36111},
+				pos: position{line: 1271, col: 5, offset: 35982},
 				alternatives: []interface{}{
 					&litMatcher{
-						pos:        position{line: 1277, col: 5, offset: 36111},
+						pos:        position{line: 1271, col: 5, offset: 35982},
 						val:        "ns",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1278, col: 5, offset: 36120},
+						pos:        position{line: 1272, col: 5, offset: 35991},
 						val:        "us",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1279, col: 5, offset: 36129},
+						pos:        position{line: 1273, col: 5, offset: 36000},
 						val:        "ms",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1280, col: 5, offset: 36138},
+						pos:        position{line: 1274, col: 5, offset: 36009},
 						val:        "s",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1281, col: 5, offset: 36146},
+						pos:        position{line: 1275, col: 5, offset: 36017},
 						val:        "m",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1282, col: 5, offset: 36154},
+						pos:        position{line: 1276, col: 5, offset: 36025},
 						val:        "h",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1283, col: 5, offset: 36162},
+						pos:        position{line: 1277, col: 5, offset: 36033},
 						val:        "d",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1284, col: 5, offset: 36170},
+						pos:        position{line: 1278, col: 5, offset: 36041},
 						val:        "w",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1285, col: 5, offset: 36178},
+						pos:        position{line: 1279, col: 5, offset: 36049},
 						val:        "y",
 						ignoreCase: false,
 					},
@@ -10581,42 +10556,42 @@ var g = &grammar{
 		},
 		{
 			name: "IP",
-			pos:  position{line: 1287, col: 1, offset: 36183},
+			pos:  position{line: 1281, col: 1, offset: 36054},
 			expr: &actionExpr{
-				pos: position{line: 1288, col: 5, offset: 36190},
+				pos: position{line: 1282, col: 5, offset: 36061},
 				run: (*parser).callonIP1,
 				expr: &seqExpr{
-					pos: position{line: 1288, col: 5, offset: 36190},
+					pos: position{line: 1282, col: 5, offset: 36061},
 					exprs: []interface{}{
 						&ruleRefExpr{
-							pos:  position{line: 1288, col: 5, offset: 36190},
+							pos:  position{line: 1282, col: 5, offset: 36061},
 							name: "UInt",
 						},
 						&litMatcher{
-							pos:        position{line: 1288, col: 10, offset: 36195},
+							pos:        position{line: 1282, col: 10, offset: 36066},
 							val:        ".",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1288, col: 14, offset: 36199},
+							pos:  position{line: 1282, col: 14, offset: 36070},
 							name: "UInt",
 						},
 						&litMatcher{
-							pos:        position{line: 1288, col: 19, offset: 36204},
+							pos:        position{line: 1282, col: 19, offset: 36075},
 							val:        ".",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1288, col: 23, offset: 36208},
+							pos:  position{line: 1282, col: 23, offset: 36079},
 							name: "UInt",
 						},
 						&litMatcher{
-							pos:        position{line: 1288, col: 28, offset: 36213},
+							pos:        position{line: 1282, col: 28, offset: 36084},
 							val:        ".",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1288, col: 32, offset: 36217},
+							pos:  position{line: 1282, col: 32, offset: 36088},
 							name: "UInt",
 						},
 					},
@@ -10625,42 +10600,42 @@ var g = &grammar{
 		},
 		{
 			name: "IP6",
-			pos:  position{line: 1290, col: 1, offset: 36254},
+			pos:  position{line: 1284, col: 1, offset: 36125},
 			expr: &actionExpr{
-				pos: position{line: 1291, col: 5, offset: 36262},
+				pos: position{line: 1285, col: 5, offset: 36133},
 				run: (*parser).callonIP61,
 				expr: &seqExpr{
-					pos: position{line: 1291, col: 5, offset: 36262},
+					pos: position{line: 1285, col: 5, offset: 36133},
 					exprs: []interface{}{
 						&notExpr{
-							pos: position{line: 1291, col: 5, offset: 36262},
+							pos: position{line: 1285, col: 5, offset: 36133},
 							expr: &seqExpr{
-								pos: position{line: 1291, col: 7, offset: 36264},
+								pos: position{line: 1285, col: 7, offset: 36135},
 								exprs: []interface{}{
 									&ruleRefExpr{
-										pos:  position{line: 1291, col: 7, offset: 36264},
+										pos:  position{line: 1285, col: 7, offset: 36135},
 										name: "Hex",
 									},
 									&litMatcher{
-										pos:        position{line: 1291, col: 11, offset: 36268},
+										pos:        position{line: 1285, col: 11, offset: 36139},
 										val:        ":",
 										ignoreCase: false,
 									},
 									&ruleRefExpr{
-										pos:  position{line: 1291, col: 15, offset: 36272},
+										pos:  position{line: 1285, col: 15, offset: 36143},
 										name: "Hex",
 									},
 									&notExpr{
-										pos: position{line: 1291, col: 19, offset: 36276},
+										pos: position{line: 1285, col: 19, offset: 36147},
 										expr: &choiceExpr{
-											pos: position{line: 1291, col: 21, offset: 36278},
+											pos: position{line: 1285, col: 21, offset: 36149},
 											alternatives: []interface{}{
 												&ruleRefExpr{
-													pos:  position{line: 1291, col: 21, offset: 36278},
+													pos:  position{line: 1285, col: 21, offset: 36149},
 													name: "HexDigit",
 												},
 												&litMatcher{
-													pos:        position{line: 1291, col: 32, offset: 36289},
+													pos:        position{line: 1285, col: 32, offset: 36160},
 													val:        ":",
 													ignoreCase: false,
 												},
@@ -10671,10 +10646,10 @@ var g = &grammar{
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1291, col: 38, offset: 36295},
+							pos:   position{line: 1285, col: 38, offset: 36166},
 							label: "v",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1291, col: 40, offset: 36297},
+								pos:  position{line: 1285, col: 40, offset: 36168},
 								name: "IP6Variations",
 							},
 						},
@@ -10684,32 +10659,32 @@ var g = &grammar{
 		},
 		{
 			name: "IP6Variations",
-			pos:  position{line: 1295, col: 1, offset: 36461},
+			pos:  position{line: 1289, col: 1, offset: 36332},
 			expr: &choiceExpr{
-				pos: position{line: 1296, col: 5, offset: 36479},
+				pos: position{line: 1290, col: 5, offset: 36350},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1296, col: 5, offset: 36479},
+						pos: position{line: 1290, col: 5, offset: 36350},
 						run: (*parser).callonIP6Variations2,
 						expr: &seqExpr{
-							pos: position{line: 1296, col: 5, offset: 36479},
+							pos: position{line: 1290, col: 5, offset: 36350},
 							exprs: []interface{}{
 								&labeledExpr{
-									pos:   position{line: 1296, col: 5, offset: 36479},
+									pos:   position{line: 1290, col: 5, offset: 36350},
 									label: "a",
 									expr: &oneOrMoreExpr{
-										pos: position{line: 1296, col: 7, offset: 36481},
+										pos: position{line: 1290, col: 7, offset: 36352},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1296, col: 7, offset: 36481},
+											pos:  position{line: 1290, col: 7, offset: 36352},
 											name: "HexColon",
 										},
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1296, col: 17, offset: 36491},
+									pos:   position{line: 1290, col: 17, offset: 36362},
 									label: "b",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1296, col: 19, offset: 36493},
+										pos:  position{line: 1290, col: 19, offset: 36364},
 										name: "IP6Tail",
 									},
 								},
@@ -10717,51 +10692,51 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1299, col: 5, offset: 36557},
+						pos: position{line: 1293, col: 5, offset: 36428},
 						run: (*parser).callonIP6Variations9,
 						expr: &seqExpr{
-							pos: position{line: 1299, col: 5, offset: 36557},
+							pos: position{line: 1293, col: 5, offset: 36428},
 							exprs: []interface{}{
 								&labeledExpr{
-									pos:   position{line: 1299, col: 5, offset: 36557},
+									pos:   position{line: 1293, col: 5, offset: 36428},
 									label: "a",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1299, col: 7, offset: 36559},
+										pos:  position{line: 1293, col: 7, offset: 36430},
 										name: "Hex",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1299, col: 11, offset: 36563},
+									pos:   position{line: 1293, col: 11, offset: 36434},
 									label: "b",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1299, col: 13, offset: 36565},
+										pos: position{line: 1293, col: 13, offset: 36436},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1299, col: 13, offset: 36565},
+											pos:  position{line: 1293, col: 13, offset: 36436},
 											name: "ColonHex",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1299, col: 23, offset: 36575},
+									pos:        position{line: 1293, col: 23, offset: 36446},
 									val:        "::",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 1299, col: 28, offset: 36580},
+									pos:   position{line: 1293, col: 28, offset: 36451},
 									label: "d",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1299, col: 30, offset: 36582},
+										pos: position{line: 1293, col: 30, offset: 36453},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1299, col: 30, offset: 36582},
+											pos:  position{line: 1293, col: 30, offset: 36453},
 											name: "HexColon",
 										},
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1299, col: 40, offset: 36592},
+									pos:   position{line: 1293, col: 40, offset: 36463},
 									label: "e",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1299, col: 42, offset: 36594},
+										pos:  position{line: 1293, col: 42, offset: 36465},
 										name: "IP6Tail",
 									},
 								},
@@ -10769,32 +10744,32 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1302, col: 5, offset: 36693},
+						pos: position{line: 1296, col: 5, offset: 36564},
 						run: (*parser).callonIP6Variations22,
 						expr: &seqExpr{
-							pos: position{line: 1302, col: 5, offset: 36693},
+							pos: position{line: 1296, col: 5, offset: 36564},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1302, col: 5, offset: 36693},
+									pos:        position{line: 1296, col: 5, offset: 36564},
 									val:        "::",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 1302, col: 10, offset: 36698},
+									pos:   position{line: 1296, col: 10, offset: 36569},
 									label: "a",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1302, col: 12, offset: 36700},
+										pos: position{line: 1296, col: 12, offset: 36571},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1302, col: 12, offset: 36700},
+											pos:  position{line: 1296, col: 12, offset: 36571},
 											name: "HexColon",
 										},
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1302, col: 22, offset: 36710},
+									pos:   position{line: 1296, col: 22, offset: 36581},
 									label: "b",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1302, col: 24, offset: 36712},
+										pos:  position{line: 1296, col: 24, offset: 36583},
 										name: "IP6Tail",
 									},
 								},
@@ -10802,32 +10777,32 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1305, col: 5, offset: 36783},
+						pos: position{line: 1299, col: 5, offset: 36654},
 						run: (*parser).callonIP6Variations30,
 						expr: &seqExpr{
-							pos: position{line: 1305, col: 5, offset: 36783},
+							pos: position{line: 1299, col: 5, offset: 36654},
 							exprs: []interface{}{
 								&labeledExpr{
-									pos:   position{line: 1305, col: 5, offset: 36783},
+									pos:   position{line: 1299, col: 5, offset: 36654},
 									label: "a",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1305, col: 7, offset: 36785},
+										pos:  position{line: 1299, col: 7, offset: 36656},
 										name: "Hex",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1305, col: 11, offset: 36789},
+									pos:   position{line: 1299, col: 11, offset: 36660},
 									label: "b",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1305, col: 13, offset: 36791},
+										pos: position{line: 1299, col: 13, offset: 36662},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1305, col: 13, offset: 36791},
+											pos:  position{line: 1299, col: 13, offset: 36662},
 											name: "ColonHex",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1305, col: 23, offset: 36801},
+									pos:        position{line: 1299, col: 23, offset: 36672},
 									val:        "::",
 									ignoreCase: false,
 								},
@@ -10835,10 +10810,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1308, col: 5, offset: 36869},
+						pos: position{line: 1302, col: 5, offset: 36740},
 						run: (*parser).callonIP6Variations38,
 						expr: &litMatcher{
-							pos:        position{line: 1308, col: 5, offset: 36869},
+							pos:        position{line: 1302, col: 5, offset: 36740},
 							val:        "::",
 							ignoreCase: false,
 						},
@@ -10848,16 +10823,16 @@ var g = &grammar{
 		},
 		{
 			name: "IP6Tail",
-			pos:  position{line: 1312, col: 1, offset: 36906},
+			pos:  position{line: 1306, col: 1, offset: 36777},
 			expr: &choiceExpr{
-				pos: position{line: 1313, col: 5, offset: 36918},
+				pos: position{line: 1307, col: 5, offset: 36789},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1313, col: 5, offset: 36918},
+						pos:  position{line: 1307, col: 5, offset: 36789},
 						name: "IP",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1314, col: 5, offset: 36925},
+						pos:  position{line: 1308, col: 5, offset: 36796},
 						name: "Hex",
 					},
 				},
@@ -10865,23 +10840,23 @@ var g = &grammar{
 		},
 		{
 			name: "ColonHex",
-			pos:  position{line: 1316, col: 1, offset: 36930},
+			pos:  position{line: 1310, col: 1, offset: 36801},
 			expr: &actionExpr{
-				pos: position{line: 1316, col: 12, offset: 36941},
+				pos: position{line: 1310, col: 12, offset: 36812},
 				run: (*parser).callonColonHex1,
 				expr: &seqExpr{
-					pos: position{line: 1316, col: 12, offset: 36941},
+					pos: position{line: 1310, col: 12, offset: 36812},
 					exprs: []interface{}{
 						&litMatcher{
-							pos:        position{line: 1316, col: 12, offset: 36941},
+							pos:        position{line: 1310, col: 12, offset: 36812},
 							val:        ":",
 							ignoreCase: false,
 						},
 						&labeledExpr{
-							pos:   position{line: 1316, col: 16, offset: 36945},
+							pos:   position{line: 1310, col: 16, offset: 36816},
 							label: "v",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1316, col: 18, offset: 36947},
+								pos:  position{line: 1310, col: 18, offset: 36818},
 								name: "Hex",
 							},
 						},
@@ -10891,23 +10866,23 @@ var g = &grammar{
 		},
 		{
 			name: "HexColon",
-			pos:  position{line: 1318, col: 1, offset: 36985},
+			pos:  position{line: 1312, col: 1, offset: 36856},
 			expr: &actionExpr{
-				pos: position{line: 1318, col: 12, offset: 36996},
+				pos: position{line: 1312, col: 12, offset: 36867},
 				run: (*parser).callonHexColon1,
 				expr: &seqExpr{
-					pos: position{line: 1318, col: 12, offset: 36996},
+					pos: position{line: 1312, col: 12, offset: 36867},
 					exprs: []interface{}{
 						&labeledExpr{
-							pos:   position{line: 1318, col: 12, offset: 36996},
+							pos:   position{line: 1312, col: 12, offset: 36867},
 							label: "v",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1318, col: 14, offset: 36998},
+								pos:  position{line: 1312, col: 14, offset: 36869},
 								name: "Hex",
 							},
 						},
 						&litMatcher{
-							pos:        position{line: 1318, col: 18, offset: 37002},
+							pos:        position{line: 1312, col: 18, offset: 36873},
 							val:        ":",
 							ignoreCase: false,
 						},
@@ -10917,31 +10892,31 @@ var g = &grammar{
 		},
 		{
 			name: "IP4Net",
-			pos:  position{line: 1320, col: 1, offset: 37040},
+			pos:  position{line: 1314, col: 1, offset: 36911},
 			expr: &actionExpr{
-				pos: position{line: 1321, col: 5, offset: 37051},
+				pos: position{line: 1315, col: 5, offset: 36922},
 				run: (*parser).callonIP4Net1,
 				expr: &seqExpr{
-					pos: position{line: 1321, col: 5, offset: 37051},
+					pos: position{line: 1315, col: 5, offset: 36922},
 					exprs: []interface{}{
 						&labeledExpr{
-							pos:   position{line: 1321, col: 5, offset: 37051},
+							pos:   position{line: 1315, col: 5, offset: 36922},
 							label: "a",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1321, col: 7, offset: 37053},
+								pos:  position{line: 1315, col: 7, offset: 36924},
 								name: "IP",
 							},
 						},
 						&litMatcher{
-							pos:        position{line: 1321, col: 10, offset: 37056},
+							pos:        position{line: 1315, col: 10, offset: 36927},
 							val:        "/",
 							ignoreCase: false,
 						},
 						&labeledExpr{
-							pos:   position{line: 1321, col: 14, offset: 37060},
+							pos:   position{line: 1315, col: 14, offset: 36931},
 							label: "m",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1321, col: 16, offset: 37062},
+								pos:  position{line: 1315, col: 16, offset: 36933},
 								name: "UInt",
 							},
 						},
@@ -10951,31 +10926,31 @@ var g = &grammar{
 		},
 		{
 			name: "IP6Net",
-			pos:  position{line: 1325, col: 1, offset: 37135},
+			pos:  position{line: 1319, col: 1, offset: 37006},
 			expr: &actionExpr{
-				pos: position{line: 1326, col: 5, offset: 37146},
+				pos: position{line: 1320, col: 5, offset: 37017},
 				run: (*parser).callonIP6Net1,
 				expr: &seqExpr{
-					pos: position{line: 1326, col: 5, offset: 37146},
+					pos: position{line: 1320, col: 5, offset: 37017},
 					exprs: []interface{}{
 						&labeledExpr{
-							pos:   position{line: 1326, col: 5, offset: 37146},
+							pos:   position{line: 1320, col: 5, offset: 37017},
 							label: "a",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1326, col: 7, offset: 37148},
+								pos:  position{line: 1320, col: 7, offset: 37019},
 								name: "IP6",
 							},
 						},
 						&litMatcher{
-							pos:        position{line: 1326, col: 11, offset: 37152},
+							pos:        position{line: 1320, col: 11, offset: 37023},
 							val:        "/",
 							ignoreCase: false,
 						},
 						&labeledExpr{
-							pos:   position{line: 1326, col: 15, offset: 37156},
+							pos:   position{line: 1320, col: 15, offset: 37027},
 							label: "m",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1326, col: 17, offset: 37158},
+								pos:  position{line: 1320, col: 17, offset: 37029},
 								name: "UInt",
 							},
 						},
@@ -10985,15 +10960,15 @@ var g = &grammar{
 		},
 		{
 			name: "UInt",
-			pos:  position{line: 1330, col: 1, offset: 37221},
+			pos:  position{line: 1324, col: 1, offset: 37092},
 			expr: &actionExpr{
-				pos: position{line: 1331, col: 4, offset: 37229},
+				pos: position{line: 1325, col: 4, offset: 37100},
 				run: (*parser).callonUInt1,
 				expr: &labeledExpr{
-					pos:   position{line: 1331, col: 4, offset: 37229},
+					pos:   position{line: 1325, col: 4, offset: 37100},
 					label: "s",
 					expr: &ruleRefExpr{
-						pos:  position{line: 1331, col: 6, offset: 37231},
+						pos:  position{line: 1325, col: 6, offset: 37102},
 						name: "UIntString",
 					},
 				},
@@ -11001,16 +10976,16 @@ var g = &grammar{
 		},
 		{
 			name: "IntString",
-			pos:  position{line: 1333, col: 1, offset: 37271},
+			pos:  position{line: 1327, col: 1, offset: 37142},
 			expr: &choiceExpr{
-				pos: position{line: 1334, col: 5, offset: 37285},
+				pos: position{line: 1328, col: 5, offset: 37156},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1334, col: 5, offset: 37285},
+						pos:  position{line: 1328, col: 5, offset: 37156},
 						name: "UIntString",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1335, col: 5, offset: 37300},
+						pos:  position{line: 1329, col: 5, offset: 37171},
 						name: "MinusIntString",
 					},
 				},
@@ -11018,14 +10993,14 @@ var g = &grammar{
 		},
 		{
 			name: "UIntString",
-			pos:  position{line: 1337, col: 1, offset: 37316},
+			pos:  position{line: 1331, col: 1, offset: 37187},
 			expr: &actionExpr{
-				pos: position{line: 1337, col: 14, offset: 37329},
+				pos: position{line: 1331, col: 14, offset: 37200},
 				run: (*parser).callonUIntString1,
 				expr: &oneOrMoreExpr{
-					pos: position{line: 1337, col: 14, offset: 37329},
+					pos: position{line: 1331, col: 14, offset: 37200},
 					expr: &charClassMatcher{
-						pos:        position{line: 1337, col: 14, offset: 37329},
+						pos:        position{line: 1331, col: 14, offset: 37200},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
@@ -11036,20 +11011,20 @@ var g = &grammar{
 		},
 		{
 			name: "MinusIntString",
-			pos:  position{line: 1339, col: 1, offset: 37368},
+			pos:  position{line: 1333, col: 1, offset: 37239},
 			expr: &actionExpr{
-				pos: position{line: 1340, col: 5, offset: 37387},
+				pos: position{line: 1334, col: 5, offset: 37258},
 				run: (*parser).callonMinusIntString1,
 				expr: &seqExpr{
-					pos: position{line: 1340, col: 5, offset: 37387},
+					pos: position{line: 1334, col: 5, offset: 37258},
 					exprs: []interface{}{
 						&litMatcher{
-							pos:        position{line: 1340, col: 5, offset: 37387},
+							pos:        position{line: 1334, col: 5, offset: 37258},
 							val:        "-",
 							ignoreCase: false,
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1340, col: 9, offset: 37391},
+							pos:  position{line: 1334, col: 9, offset: 37262},
 							name: "UIntString",
 						},
 					},
@@ -11058,28 +11033,28 @@ var g = &grammar{
 		},
 		{
 			name: "FloatString",
-			pos:  position{line: 1342, col: 1, offset: 37434},
+			pos:  position{line: 1336, col: 1, offset: 37305},
 			expr: &choiceExpr{
-				pos: position{line: 1343, col: 5, offset: 37450},
+				pos: position{line: 1337, col: 5, offset: 37321},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1343, col: 5, offset: 37450},
+						pos: position{line: 1337, col: 5, offset: 37321},
 						run: (*parser).callonFloatString2,
 						expr: &seqExpr{
-							pos: position{line: 1343, col: 5, offset: 37450},
+							pos: position{line: 1337, col: 5, offset: 37321},
 							exprs: []interface{}{
 								&zeroOrOneExpr{
-									pos: position{line: 1343, col: 5, offset: 37450},
+									pos: position{line: 1337, col: 5, offset: 37321},
 									expr: &litMatcher{
-										pos:        position{line: 1343, col: 5, offset: 37450},
+										pos:        position{line: 1337, col: 5, offset: 37321},
 										val:        "-",
 										ignoreCase: false,
 									},
 								},
 								&oneOrMoreExpr{
-									pos: position{line: 1343, col: 10, offset: 37455},
+									pos: position{line: 1337, col: 10, offset: 37326},
 									expr: &charClassMatcher{
-										pos:        position{line: 1343, col: 10, offset: 37455},
+										pos:        position{line: 1337, col: 10, offset: 37326},
 										val:        "[0-9]",
 										ranges:     []rune{'0', '9'},
 										ignoreCase: false,
@@ -11087,14 +11062,14 @@ var g = &grammar{
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1343, col: 17, offset: 37462},
+									pos:        position{line: 1337, col: 17, offset: 37333},
 									val:        ".",
 									ignoreCase: false,
 								},
 								&zeroOrMoreExpr{
-									pos: position{line: 1343, col: 21, offset: 37466},
+									pos: position{line: 1337, col: 21, offset: 37337},
 									expr: &charClassMatcher{
-										pos:        position{line: 1343, col: 21, offset: 37466},
+										pos:        position{line: 1337, col: 21, offset: 37337},
 										val:        "[0-9]",
 										ranges:     []rune{'0', '9'},
 										ignoreCase: false,
@@ -11102,9 +11077,9 @@ var g = &grammar{
 									},
 								},
 								&zeroOrOneExpr{
-									pos: position{line: 1343, col: 28, offset: 37473},
+									pos: position{line: 1337, col: 28, offset: 37344},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1343, col: 28, offset: 37473},
+										pos:  position{line: 1337, col: 28, offset: 37344},
 										name: "ExponentPart",
 									},
 								},
@@ -11112,28 +11087,28 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1346, col: 5, offset: 37532},
+						pos: position{line: 1340, col: 5, offset: 37403},
 						run: (*parser).callonFloatString13,
 						expr: &seqExpr{
-							pos: position{line: 1346, col: 5, offset: 37532},
+							pos: position{line: 1340, col: 5, offset: 37403},
 							exprs: []interface{}{
 								&zeroOrOneExpr{
-									pos: position{line: 1346, col: 5, offset: 37532},
+									pos: position{line: 1340, col: 5, offset: 37403},
 									expr: &litMatcher{
-										pos:        position{line: 1346, col: 5, offset: 37532},
+										pos:        position{line: 1340, col: 5, offset: 37403},
 										val:        "-",
 										ignoreCase: false,
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1346, col: 10, offset: 37537},
+									pos:        position{line: 1340, col: 10, offset: 37408},
 									val:        ".",
 									ignoreCase: false,
 								},
 								&oneOrMoreExpr{
-									pos: position{line: 1346, col: 14, offset: 37541},
+									pos: position{line: 1340, col: 14, offset: 37412},
 									expr: &charClassMatcher{
-										pos:        position{line: 1346, col: 14, offset: 37541},
+										pos:        position{line: 1340, col: 14, offset: 37412},
 										val:        "[0-9]",
 										ranges:     []rune{'0', '9'},
 										ignoreCase: false,
@@ -11141,9 +11116,9 @@ var g = &grammar{
 									},
 								},
 								&zeroOrOneExpr{
-									pos: position{line: 1346, col: 21, offset: 37548},
+									pos: position{line: 1340, col: 21, offset: 37419},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1346, col: 21, offset: 37548},
+										pos:  position{line: 1340, col: 21, offset: 37419},
 										name: "ExponentPart",
 									},
 								},
@@ -11151,17 +11126,17 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1349, col: 5, offset: 37607},
+						pos: position{line: 1343, col: 5, offset: 37478},
 						run: (*parser).callonFloatString22,
 						expr: &choiceExpr{
-							pos: position{line: 1349, col: 6, offset: 37608},
+							pos: position{line: 1343, col: 6, offset: 37479},
 							alternatives: []interface{}{
 								&ruleRefExpr{
-									pos:  position{line: 1349, col: 6, offset: 37608},
+									pos:  position{line: 1343, col: 6, offset: 37479},
 									name: "NaN",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1349, col: 12, offset: 37614},
+									pos:  position{line: 1343, col: 12, offset: 37485},
 									name: "Infinity",
 								},
 							},
@@ -11172,19 +11147,19 @@ var g = &grammar{
 		},
 		{
 			name: "ExponentPart",
-			pos:  position{line: 1352, col: 1, offset: 37657},
+			pos:  position{line: 1346, col: 1, offset: 37528},
 			expr: &seqExpr{
-				pos: position{line: 1352, col: 16, offset: 37672},
+				pos: position{line: 1346, col: 16, offset: 37543},
 				exprs: []interface{}{
 					&litMatcher{
-						pos:        position{line: 1352, col: 16, offset: 37672},
+						pos:        position{line: 1346, col: 16, offset: 37543},
 						val:        "e",
 						ignoreCase: true,
 					},
 					&zeroOrOneExpr{
-						pos: position{line: 1352, col: 21, offset: 37677},
+						pos: position{line: 1346, col: 21, offset: 37548},
 						expr: &charClassMatcher{
-							pos:        position{line: 1352, col: 21, offset: 37677},
+							pos:        position{line: 1346, col: 21, offset: 37548},
 							val:        "[+-]",
 							chars:      []rune{'+', '-'},
 							ignoreCase: false,
@@ -11192,7 +11167,7 @@ var g = &grammar{
 						},
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1352, col: 27, offset: 37683},
+						pos:  position{line: 1346, col: 27, offset: 37554},
 						name: "UIntString",
 					},
 				},
@@ -11200,31 +11175,31 @@ var g = &grammar{
 		},
 		{
 			name: "NaN",
-			pos:  position{line: 1354, col: 1, offset: 37695},
+			pos:  position{line: 1348, col: 1, offset: 37566},
 			expr: &litMatcher{
-				pos:        position{line: 1354, col: 7, offset: 37701},
+				pos:        position{line: 1348, col: 7, offset: 37572},
 				val:        "NaN",
 				ignoreCase: false,
 			},
 		},
 		{
 			name: "Infinity",
-			pos:  position{line: 1356, col: 1, offset: 37708},
+			pos:  position{line: 1350, col: 1, offset: 37579},
 			expr: &seqExpr{
-				pos: position{line: 1356, col: 12, offset: 37719},
+				pos: position{line: 1350, col: 12, offset: 37590},
 				exprs: []interface{}{
 					&zeroOrOneExpr{
-						pos: position{line: 1356, col: 12, offset: 37719},
+						pos: position{line: 1350, col: 12, offset: 37590},
 						expr: &choiceExpr{
-							pos: position{line: 1356, col: 13, offset: 37720},
+							pos: position{line: 1350, col: 13, offset: 37591},
 							alternatives: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1356, col: 13, offset: 37720},
+									pos:        position{line: 1350, col: 13, offset: 37591},
 									val:        "-",
 									ignoreCase: false,
 								},
 								&litMatcher{
-									pos:        position{line: 1356, col: 19, offset: 37726},
+									pos:        position{line: 1350, col: 19, offset: 37597},
 									val:        "+",
 									ignoreCase: false,
 								},
@@ -11232,7 +11207,7 @@ var g = &grammar{
 						},
 					},
 					&litMatcher{
-						pos:        position{line: 1356, col: 25, offset: 37732},
+						pos:        position{line: 1350, col: 25, offset: 37603},
 						val:        "Inf",
 						ignoreCase: false,
 					},
@@ -11241,14 +11216,14 @@ var g = &grammar{
 		},
 		{
 			name: "Hex",
-			pos:  position{line: 1358, col: 1, offset: 37739},
+			pos:  position{line: 1352, col: 1, offset: 37610},
 			expr: &actionExpr{
-				pos: position{line: 1358, col: 7, offset: 37745},
+				pos: position{line: 1352, col: 7, offset: 37616},
 				run: (*parser).callonHex1,
 				expr: &oneOrMoreExpr{
-					pos: position{line: 1358, col: 7, offset: 37745},
+					pos: position{line: 1352, col: 7, offset: 37616},
 					expr: &ruleRefExpr{
-						pos:  position{line: 1358, col: 7, offset: 37745},
+						pos:  position{line: 1352, col: 7, offset: 37616},
 						name: "HexDigit",
 					},
 				},
@@ -11256,9 +11231,9 @@ var g = &grammar{
 		},
 		{
 			name: "HexDigit",
-			pos:  position{line: 1360, col: 1, offset: 37787},
+			pos:  position{line: 1354, col: 1, offset: 37658},
 			expr: &charClassMatcher{
-				pos:        position{line: 1360, col: 12, offset: 37798},
+				pos:        position{line: 1354, col: 12, offset: 37669},
 				val:        "[0-9a-fA-F]",
 				ranges:     []rune{'0', '9', 'a', 'f', 'A', 'F'},
 				ignoreCase: false,
@@ -11267,34 +11242,34 @@ var g = &grammar{
 		},
 		{
 			name: "QuotedString",
-			pos:  position{line: 1362, col: 1, offset: 37811},
+			pos:  position{line: 1356, col: 1, offset: 37682},
 			expr: &choiceExpr{
-				pos: position{line: 1363, col: 5, offset: 37828},
+				pos: position{line: 1357, col: 5, offset: 37699},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1363, col: 5, offset: 37828},
+						pos: position{line: 1357, col: 5, offset: 37699},
 						run: (*parser).callonQuotedString2,
 						expr: &seqExpr{
-							pos: position{line: 1363, col: 5, offset: 37828},
+							pos: position{line: 1357, col: 5, offset: 37699},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1363, col: 5, offset: 37828},
+									pos:        position{line: 1357, col: 5, offset: 37699},
 									val:        "\"",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 1363, col: 9, offset: 37832},
+									pos:   position{line: 1357, col: 9, offset: 37703},
 									label: "v",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1363, col: 11, offset: 37834},
+										pos: position{line: 1357, col: 11, offset: 37705},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1363, col: 11, offset: 37834},
+											pos:  position{line: 1357, col: 11, offset: 37705},
 											name: "DoubleQuotedChar",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1363, col: 29, offset: 37852},
+									pos:        position{line: 1357, col: 29, offset: 37723},
 									val:        "\"",
 									ignoreCase: false,
 								},
@@ -11302,29 +11277,29 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1364, col: 5, offset: 37889},
+						pos: position{line: 1358, col: 5, offset: 37760},
 						run: (*parser).callonQuotedString9,
 						expr: &seqExpr{
-							pos: position{line: 1364, col: 5, offset: 37889},
+							pos: position{line: 1358, col: 5, offset: 37760},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1364, col: 5, offset: 37889},
+									pos:        position{line: 1358, col: 5, offset: 37760},
 									val:        "'",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 1364, col: 9, offset: 37893},
+									pos:   position{line: 1358, col: 9, offset: 37764},
 									label: "v",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1364, col: 11, offset: 37895},
+										pos: position{line: 1358, col: 11, offset: 37766},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1364, col: 11, offset: 37895},
+											pos:  position{line: 1358, col: 11, offset: 37766},
 											name: "SingleQuotedChar",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1364, col: 29, offset: 37913},
+									pos:        position{line: 1358, col: 29, offset: 37784},
 									val:        "'",
 									ignoreCase: false,
 								},
@@ -11336,55 +11311,55 @@ var g = &grammar{
 		},
 		{
 			name: "DoubleQuotedChar",
-			pos:  position{line: 1366, col: 1, offset: 37947},
+			pos:  position{line: 1360, col: 1, offset: 37818},
 			expr: &choiceExpr{
-				pos: position{line: 1367, col: 5, offset: 37968},
+				pos: position{line: 1361, col: 5, offset: 37839},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1367, col: 5, offset: 37968},
+						pos: position{line: 1361, col: 5, offset: 37839},
 						run: (*parser).callonDoubleQuotedChar2,
 						expr: &seqExpr{
-							pos: position{line: 1367, col: 5, offset: 37968},
+							pos: position{line: 1361, col: 5, offset: 37839},
 							exprs: []interface{}{
 								&notExpr{
-									pos: position{line: 1367, col: 5, offset: 37968},
+									pos: position{line: 1361, col: 5, offset: 37839},
 									expr: &choiceExpr{
-										pos: position{line: 1367, col: 7, offset: 37970},
+										pos: position{line: 1361, col: 7, offset: 37841},
 										alternatives: []interface{}{
 											&litMatcher{
-												pos:        position{line: 1367, col: 7, offset: 37970},
+												pos:        position{line: 1361, col: 7, offset: 37841},
 												val:        "\"",
 												ignoreCase: false,
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1367, col: 13, offset: 37976},
+												pos:  position{line: 1361, col: 13, offset: 37847},
 												name: "EscapedChar",
 											},
 										},
 									},
 								},
 								&anyMatcher{
-									line: 1367, col: 26, offset: 37989,
+									line: 1361, col: 26, offset: 37860,
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1368, col: 5, offset: 38026},
+						pos: position{line: 1362, col: 5, offset: 37897},
 						run: (*parser).callonDoubleQuotedChar9,
 						expr: &seqExpr{
-							pos: position{line: 1368, col: 5, offset: 38026},
+							pos: position{line: 1362, col: 5, offset: 37897},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1368, col: 5, offset: 38026},
+									pos:        position{line: 1362, col: 5, offset: 37897},
 									val:        "\\",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 1368, col: 10, offset: 38031},
+									pos:   position{line: 1362, col: 10, offset: 37902},
 									label: "s",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1368, col: 12, offset: 38033},
+										pos:  position{line: 1362, col: 12, offset: 37904},
 										name: "EscapeSequence",
 									},
 								},
@@ -11396,28 +11371,28 @@ var g = &grammar{
 		},
 		{
 			name: "KeyWord",
-			pos:  position{line: 1370, col: 1, offset: 38067},
+			pos:  position{line: 1364, col: 1, offset: 37938},
 			expr: &actionExpr{
-				pos: position{line: 1371, col: 5, offset: 38079},
+				pos: position{line: 1365, col: 5, offset: 37950},
 				run: (*parser).callonKeyWord1,
 				expr: &seqExpr{
-					pos: position{line: 1371, col: 5, offset: 38079},
+					pos: position{line: 1365, col: 5, offset: 37950},
 					exprs: []interface{}{
 						&labeledExpr{
-							pos:   position{line: 1371, col: 5, offset: 38079},
+							pos:   position{line: 1365, col: 5, offset: 37950},
 							label: "head",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1371, col: 10, offset: 38084},
+								pos:  position{line: 1365, col: 10, offset: 37955},
 								name: "KeyWordStart",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1371, col: 23, offset: 38097},
+							pos:   position{line: 1365, col: 23, offset: 37968},
 							label: "tail",
 							expr: &zeroOrMoreExpr{
-								pos: position{line: 1371, col: 28, offset: 38102},
+								pos: position{line: 1365, col: 28, offset: 37973},
 								expr: &ruleRefExpr{
-									pos:  position{line: 1371, col: 28, offset: 38102},
+									pos:  position{line: 1365, col: 28, offset: 37973},
 									name: "KeyWordRest",
 								},
 							},
@@ -11428,16 +11403,16 @@ var g = &grammar{
 		},
 		{
 			name: "KeyWordStart",
-			pos:  position{line: 1373, col: 1, offset: 38164},
+			pos:  position{line: 1367, col: 1, offset: 38035},
 			expr: &choiceExpr{
-				pos: position{line: 1374, col: 5, offset: 38181},
+				pos: position{line: 1368, col: 5, offset: 38052},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1374, col: 5, offset: 38181},
+						pos:  position{line: 1368, col: 5, offset: 38052},
 						name: "KeyWordChars",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1375, col: 5, offset: 38198},
+						pos:  position{line: 1369, col: 5, offset: 38069},
 						name: "KeyWordEsc",
 					},
 				},
@@ -11445,16 +11420,16 @@ var g = &grammar{
 		},
 		{
 			name: "KeyWordRest",
-			pos:  position{line: 1377, col: 1, offset: 38210},
+			pos:  position{line: 1371, col: 1, offset: 38081},
 			expr: &choiceExpr{
-				pos: position{line: 1378, col: 5, offset: 38226},
+				pos: position{line: 1372, col: 5, offset: 38097},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1378, col: 5, offset: 38226},
+						pos:  position{line: 1372, col: 5, offset: 38097},
 						name: "KeyWordStart",
 					},
 					&charClassMatcher{
-						pos:        position{line: 1379, col: 5, offset: 38243},
+						pos:        position{line: 1373, col: 5, offset: 38114},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
@@ -11465,19 +11440,19 @@ var g = &grammar{
 		},
 		{
 			name: "KeyWordChars",
-			pos:  position{line: 1381, col: 1, offset: 38250},
+			pos:  position{line: 1375, col: 1, offset: 38121},
 			expr: &actionExpr{
-				pos: position{line: 1381, col: 16, offset: 38265},
+				pos: position{line: 1375, col: 16, offset: 38136},
 				run: (*parser).callonKeyWordChars1,
 				expr: &choiceExpr{
-					pos: position{line: 1381, col: 17, offset: 38266},
+					pos: position{line: 1375, col: 17, offset: 38137},
 					alternatives: []interface{}{
 						&ruleRefExpr{
-							pos:  position{line: 1381, col: 17, offset: 38266},
+							pos:  position{line: 1375, col: 17, offset: 38137},
 							name: "UnicodeLetter",
 						},
 						&charClassMatcher{
-							pos:        position{line: 1381, col: 33, offset: 38282},
+							pos:        position{line: 1375, col: 33, offset: 38153},
 							val:        "[_.:/%#@~]",
 							chars:      []rune{'_', '.', ':', '/', '%', '#', '@', '~'},
 							ignoreCase: false,
@@ -11489,30 +11464,30 @@ var g = &grammar{
 		},
 		{
 			name: "KeyWordEsc",
-			pos:  position{line: 1383, col: 1, offset: 38326},
+			pos:  position{line: 1377, col: 1, offset: 38197},
 			expr: &actionExpr{
-				pos: position{line: 1383, col: 14, offset: 38339},
+				pos: position{line: 1377, col: 14, offset: 38210},
 				run: (*parser).callonKeyWordEsc1,
 				expr: &seqExpr{
-					pos: position{line: 1383, col: 14, offset: 38339},
+					pos: position{line: 1377, col: 14, offset: 38210},
 					exprs: []interface{}{
 						&litMatcher{
-							pos:        position{line: 1383, col: 14, offset: 38339},
+							pos:        position{line: 1377, col: 14, offset: 38210},
 							val:        "\\",
 							ignoreCase: false,
 						},
 						&labeledExpr{
-							pos:   position{line: 1383, col: 19, offset: 38344},
+							pos:   position{line: 1377, col: 19, offset: 38215},
 							label: "s",
 							expr: &choiceExpr{
-								pos: position{line: 1383, col: 22, offset: 38347},
+								pos: position{line: 1377, col: 22, offset: 38218},
 								alternatives: []interface{}{
 									&ruleRefExpr{
-										pos:  position{line: 1383, col: 22, offset: 38347},
+										pos:  position{line: 1377, col: 22, offset: 38218},
 										name: "KeywordEscape",
 									},
 									&ruleRefExpr{
-										pos:  position{line: 1383, col: 38, offset: 38363},
+										pos:  position{line: 1377, col: 38, offset: 38234},
 										name: "EscapeSequence",
 									},
 								},
@@ -11524,42 +11499,42 @@ var g = &grammar{
 		},
 		{
 			name: "GlobPattern",
-			pos:  position{line: 1385, col: 1, offset: 38398},
+			pos:  position{line: 1379, col: 1, offset: 38269},
 			expr: &actionExpr{
-				pos: position{line: 1386, col: 5, offset: 38414},
+				pos: position{line: 1380, col: 5, offset: 38285},
 				run: (*parser).callonGlobPattern1,
 				expr: &seqExpr{
-					pos: position{line: 1386, col: 5, offset: 38414},
+					pos: position{line: 1380, col: 5, offset: 38285},
 					exprs: []interface{}{
 						&andExpr{
-							pos: position{line: 1386, col: 5, offset: 38414},
+							pos: position{line: 1380, col: 5, offset: 38285},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1386, col: 6, offset: 38415},
+								pos:  position{line: 1380, col: 6, offset: 38286},
 								name: "GlobProperStart",
 							},
 						},
 						&andExpr{
-							pos: position{line: 1386, col: 22, offset: 38431},
+							pos: position{line: 1380, col: 22, offset: 38302},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1386, col: 23, offset: 38432},
+								pos:  position{line: 1380, col: 23, offset: 38303},
 								name: "GlobHasStar",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1386, col: 35, offset: 38444},
+							pos:   position{line: 1380, col: 35, offset: 38315},
 							label: "head",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1386, col: 40, offset: 38449},
+								pos:  position{line: 1380, col: 40, offset: 38320},
 								name: "GlobStart",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1386, col: 50, offset: 38459},
+							pos:   position{line: 1380, col: 50, offset: 38330},
 							label: "tail",
 							expr: &zeroOrMoreExpr{
-								pos: position{line: 1386, col: 55, offset: 38464},
+								pos: position{line: 1380, col: 55, offset: 38335},
 								expr: &ruleRefExpr{
-									pos:  position{line: 1386, col: 55, offset: 38464},
+									pos:  position{line: 1380, col: 55, offset: 38335},
 									name: "GlobRest",
 								},
 							},
@@ -11570,27 +11545,27 @@ var g = &grammar{
 		},
 		{
 			name: "GlobProperStart",
-			pos:  position{line: 1390, col: 1, offset: 38533},
+			pos:  position{line: 1384, col: 1, offset: 38404},
 			expr: &choiceExpr{
-				pos: position{line: 1390, col: 19, offset: 38551},
+				pos: position{line: 1384, col: 19, offset: 38422},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1390, col: 19, offset: 38551},
+						pos:  position{line: 1384, col: 19, offset: 38422},
 						name: "KeyWordStart",
 					},
 					&seqExpr{
-						pos: position{line: 1390, col: 34, offset: 38566},
+						pos: position{line: 1384, col: 34, offset: 38437},
 						exprs: []interface{}{
 							&oneOrMoreExpr{
-								pos: position{line: 1390, col: 34, offset: 38566},
+								pos: position{line: 1384, col: 34, offset: 38437},
 								expr: &litMatcher{
-									pos:        position{line: 1390, col: 34, offset: 38566},
+									pos:        position{line: 1384, col: 34, offset: 38437},
 									val:        "*",
 									ignoreCase: false,
 								},
 							},
 							&ruleRefExpr{
-								pos:  position{line: 1390, col: 39, offset: 38571},
+								pos:  position{line: 1384, col: 39, offset: 38442},
 								name: "KeyWordRest",
 							},
 						},
@@ -11600,19 +11575,19 @@ var g = &grammar{
 		},
 		{
 			name: "GlobHasStar",
-			pos:  position{line: 1391, col: 1, offset: 38583},
+			pos:  position{line: 1385, col: 1, offset: 38454},
 			expr: &seqExpr{
-				pos: position{line: 1391, col: 15, offset: 38597},
+				pos: position{line: 1385, col: 15, offset: 38468},
 				exprs: []interface{}{
 					&zeroOrMoreExpr{
-						pos: position{line: 1391, col: 15, offset: 38597},
+						pos: position{line: 1385, col: 15, offset: 38468},
 						expr: &ruleRefExpr{
-							pos:  position{line: 1391, col: 15, offset: 38597},
+							pos:  position{line: 1385, col: 15, offset: 38468},
 							name: "KeyWordRest",
 						},
 					},
 					&litMatcher{
-						pos:        position{line: 1391, col: 28, offset: 38610},
+						pos:        position{line: 1385, col: 28, offset: 38481},
 						val:        "*",
 						ignoreCase: false,
 					},
@@ -11621,23 +11596,23 @@ var g = &grammar{
 		},
 		{
 			name: "GlobStart",
-			pos:  position{line: 1393, col: 1, offset: 38615},
+			pos:  position{line: 1387, col: 1, offset: 38486},
 			expr: &choiceExpr{
-				pos: position{line: 1394, col: 5, offset: 38629},
+				pos: position{line: 1388, col: 5, offset: 38500},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1394, col: 5, offset: 38629},
+						pos:  position{line: 1388, col: 5, offset: 38500},
 						name: "KeyWordChars",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1395, col: 5, offset: 38646},
+						pos:  position{line: 1389, col: 5, offset: 38517},
 						name: "GlobEsc",
 					},
 					&actionExpr{
-						pos: position{line: 1396, col: 5, offset: 38658},
+						pos: position{line: 1390, col: 5, offset: 38529},
 						run: (*parser).callonGlobStart4,
 						expr: &litMatcher{
-							pos:        position{line: 1396, col: 5, offset: 38658},
+							pos:        position{line: 1390, col: 5, offset: 38529},
 							val:        "*",
 							ignoreCase: false,
 						},
@@ -11647,16 +11622,16 @@ var g = &grammar{
 		},
 		{
 			name: "GlobRest",
-			pos:  position{line: 1398, col: 1, offset: 38683},
+			pos:  position{line: 1392, col: 1, offset: 38554},
 			expr: &choiceExpr{
-				pos: position{line: 1399, col: 5, offset: 38696},
+				pos: position{line: 1393, col: 5, offset: 38567},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1399, col: 5, offset: 38696},
+						pos:  position{line: 1393, col: 5, offset: 38567},
 						name: "GlobStart",
 					},
 					&charClassMatcher{
-						pos:        position{line: 1400, col: 5, offset: 38710},
+						pos:        position{line: 1394, col: 5, offset: 38581},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
@@ -11667,30 +11642,30 @@ var g = &grammar{
 		},
 		{
 			name: "GlobEsc",
-			pos:  position{line: 1402, col: 1, offset: 38717},
+			pos:  position{line: 1396, col: 1, offset: 38588},
 			expr: &actionExpr{
-				pos: position{line: 1402, col: 11, offset: 38727},
+				pos: position{line: 1396, col: 11, offset: 38598},
 				run: (*parser).callonGlobEsc1,
 				expr: &seqExpr{
-					pos: position{line: 1402, col: 11, offset: 38727},
+					pos: position{line: 1396, col: 11, offset: 38598},
 					exprs: []interface{}{
 						&litMatcher{
-							pos:        position{line: 1402, col: 11, offset: 38727},
+							pos:        position{line: 1396, col: 11, offset: 38598},
 							val:        "\\",
 							ignoreCase: false,
 						},
 						&labeledExpr{
-							pos:   position{line: 1402, col: 16, offset: 38732},
+							pos:   position{line: 1396, col: 16, offset: 38603},
 							label: "s",
 							expr: &choiceExpr{
-								pos: position{line: 1402, col: 19, offset: 38735},
+								pos: position{line: 1396, col: 19, offset: 38606},
 								alternatives: []interface{}{
 									&ruleRefExpr{
-										pos:  position{line: 1402, col: 19, offset: 38735},
+										pos:  position{line: 1396, col: 19, offset: 38606},
 										name: "GlobEscape",
 									},
 									&ruleRefExpr{
-										pos:  position{line: 1402, col: 32, offset: 38748},
+										pos:  position{line: 1396, col: 32, offset: 38619},
 										name: "EscapeSequence",
 									},
 								},
@@ -11702,30 +11677,30 @@ var g = &grammar{
 		},
 		{
 			name: "GlobEscape",
-			pos:  position{line: 1404, col: 1, offset: 38783},
+			pos:  position{line: 1398, col: 1, offset: 38654},
 			expr: &choiceExpr{
-				pos: position{line: 1405, col: 5, offset: 38798},
+				pos: position{line: 1399, col: 5, offset: 38669},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1405, col: 5, offset: 38798},
+						pos: position{line: 1399, col: 5, offset: 38669},
 						run: (*parser).callonGlobEscape2,
 						expr: &litMatcher{
-							pos:        position{line: 1405, col: 5, offset: 38798},
+							pos:        position{line: 1399, col: 5, offset: 38669},
 							val:        "=",
 							ignoreCase: false,
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1406, col: 5, offset: 38826},
+						pos: position{line: 1400, col: 5, offset: 38697},
 						run: (*parser).callonGlobEscape4,
 						expr: &litMatcher{
-							pos:        position{line: 1406, col: 5, offset: 38826},
+							pos:        position{line: 1400, col: 5, offset: 38697},
 							val:        "*",
 							ignoreCase: false,
 						},
 					},
 					&charClassMatcher{
-						pos:        position{line: 1407, col: 5, offset: 38856},
+						pos:        position{line: 1401, col: 5, offset: 38727},
 						val:        "[+-]",
 						chars:      []rune{'+', '-'},
 						ignoreCase: false,
@@ -11736,55 +11711,55 @@ var g = &grammar{
 		},
 		{
 			name: "SingleQuotedChar",
-			pos:  position{line: 1409, col: 1, offset: 38862},
+			pos:  position{line: 1403, col: 1, offset: 38733},
 			expr: &choiceExpr{
-				pos: position{line: 1410, col: 5, offset: 38883},
+				pos: position{line: 1404, col: 5, offset: 38754},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1410, col: 5, offset: 38883},
+						pos: position{line: 1404, col: 5, offset: 38754},
 						run: (*parser).callonSingleQuotedChar2,
 						expr: &seqExpr{
-							pos: position{line: 1410, col: 5, offset: 38883},
+							pos: position{line: 1404, col: 5, offset: 38754},
 							exprs: []interface{}{
 								&notExpr{
-									pos: position{line: 1410, col: 5, offset: 38883},
+									pos: position{line: 1404, col: 5, offset: 38754},
 									expr: &choiceExpr{
-										pos: position{line: 1410, col: 7, offset: 38885},
+										pos: position{line: 1404, col: 7, offset: 38756},
 										alternatives: []interface{}{
 											&litMatcher{
-												pos:        position{line: 1410, col: 7, offset: 38885},
+												pos:        position{line: 1404, col: 7, offset: 38756},
 												val:        "'",
 												ignoreCase: false,
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1410, col: 13, offset: 38891},
+												pos:  position{line: 1404, col: 13, offset: 38762},
 												name: "EscapedChar",
 											},
 										},
 									},
 								},
 								&anyMatcher{
-									line: 1410, col: 26, offset: 38904,
+									line: 1404, col: 26, offset: 38775,
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1411, col: 5, offset: 38941},
+						pos: position{line: 1405, col: 5, offset: 38812},
 						run: (*parser).callonSingleQuotedChar9,
 						expr: &seqExpr{
-							pos: position{line: 1411, col: 5, offset: 38941},
+							pos: position{line: 1405, col: 5, offset: 38812},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1411, col: 5, offset: 38941},
+									pos:        position{line: 1405, col: 5, offset: 38812},
 									val:        "\\",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 1411, col: 10, offset: 38946},
+									pos:   position{line: 1405, col: 10, offset: 38817},
 									label: "s",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1411, col: 12, offset: 38948},
+										pos:  position{line: 1405, col: 12, offset: 38819},
 										name: "EscapeSequence",
 									},
 								},
@@ -11796,16 +11771,16 @@ var g = &grammar{
 		},
 		{
 			name: "EscapeSequence",
-			pos:  position{line: 1413, col: 1, offset: 38982},
+			pos:  position{line: 1407, col: 1, offset: 38853},
 			expr: &choiceExpr{
-				pos: position{line: 1414, col: 5, offset: 39001},
+				pos: position{line: 1408, col: 5, offset: 38872},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1414, col: 5, offset: 39001},
+						pos:  position{line: 1408, col: 5, offset: 38872},
 						name: "SingleCharEscape",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1415, col: 5, offset: 39022},
+						pos:  position{line: 1409, col: 5, offset: 38893},
 						name: "UnicodeEscape",
 					},
 				},
@@ -11813,79 +11788,79 @@ var g = &grammar{
 		},
 		{
 			name: "SingleCharEscape",
-			pos:  position{line: 1417, col: 1, offset: 39037},
+			pos:  position{line: 1411, col: 1, offset: 38908},
 			expr: &choiceExpr{
-				pos: position{line: 1418, col: 5, offset: 39058},
+				pos: position{line: 1412, col: 5, offset: 38929},
 				alternatives: []interface{}{
 					&litMatcher{
-						pos:        position{line: 1418, col: 5, offset: 39058},
+						pos:        position{line: 1412, col: 5, offset: 38929},
 						val:        "'",
 						ignoreCase: false,
 					},
 					&actionExpr{
-						pos: position{line: 1419, col: 5, offset: 39066},
+						pos: position{line: 1413, col: 5, offset: 38937},
 						run: (*parser).callonSingleCharEscape3,
 						expr: &litMatcher{
-							pos:        position{line: 1419, col: 5, offset: 39066},
+							pos:        position{line: 1413, col: 5, offset: 38937},
 							val:        "\"",
 							ignoreCase: false,
 						},
 					},
 					&litMatcher{
-						pos:        position{line: 1420, col: 5, offset: 39106},
+						pos:        position{line: 1414, col: 5, offset: 38977},
 						val:        "\\",
 						ignoreCase: false,
 					},
 					&actionExpr{
-						pos: position{line: 1421, col: 5, offset: 39115},
+						pos: position{line: 1415, col: 5, offset: 38986},
 						run: (*parser).callonSingleCharEscape6,
 						expr: &litMatcher{
-							pos:        position{line: 1421, col: 5, offset: 39115},
+							pos:        position{line: 1415, col: 5, offset: 38986},
 							val:        "b",
 							ignoreCase: false,
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1422, col: 5, offset: 39144},
+						pos: position{line: 1416, col: 5, offset: 39015},
 						run: (*parser).callonSingleCharEscape8,
 						expr: &litMatcher{
-							pos:        position{line: 1422, col: 5, offset: 39144},
+							pos:        position{line: 1416, col: 5, offset: 39015},
 							val:        "f",
 							ignoreCase: false,
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1423, col: 5, offset: 39173},
+						pos: position{line: 1417, col: 5, offset: 39044},
 						run: (*parser).callonSingleCharEscape10,
 						expr: &litMatcher{
-							pos:        position{line: 1423, col: 5, offset: 39173},
+							pos:        position{line: 1417, col: 5, offset: 39044},
 							val:        "n",
 							ignoreCase: false,
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1424, col: 5, offset: 39202},
+						pos: position{line: 1418, col: 5, offset: 39073},
 						run: (*parser).callonSingleCharEscape12,
 						expr: &litMatcher{
-							pos:        position{line: 1424, col: 5, offset: 39202},
+							pos:        position{line: 1418, col: 5, offset: 39073},
 							val:        "r",
 							ignoreCase: false,
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1425, col: 5, offset: 39231},
+						pos: position{line: 1419, col: 5, offset: 39102},
 						run: (*parser).callonSingleCharEscape14,
 						expr: &litMatcher{
-							pos:        position{line: 1425, col: 5, offset: 39231},
+							pos:        position{line: 1419, col: 5, offset: 39102},
 							val:        "t",
 							ignoreCase: false,
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1426, col: 5, offset: 39260},
+						pos: position{line: 1420, col: 5, offset: 39131},
 						run: (*parser).callonSingleCharEscape16,
 						expr: &litMatcher{
-							pos:        position{line: 1426, col: 5, offset: 39260},
+							pos:        position{line: 1420, col: 5, offset: 39131},
 							val:        "v",
 							ignoreCase: false,
 						},
@@ -11895,30 +11870,30 @@ var g = &grammar{
 		},
 		{
 			name: "KeywordEscape",
-			pos:  position{line: 1428, col: 1, offset: 39286},
+			pos:  position{line: 1422, col: 1, offset: 39157},
 			expr: &choiceExpr{
-				pos: position{line: 1429, col: 5, offset: 39304},
+				pos: position{line: 1423, col: 5, offset: 39175},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1429, col: 5, offset: 39304},
+						pos: position{line: 1423, col: 5, offset: 39175},
 						run: (*parser).callonKeywordEscape2,
 						expr: &litMatcher{
-							pos:        position{line: 1429, col: 5, offset: 39304},
+							pos:        position{line: 1423, col: 5, offset: 39175},
 							val:        "=",
 							ignoreCase: false,
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1430, col: 5, offset: 39332},
+						pos: position{line: 1424, col: 5, offset: 39203},
 						run: (*parser).callonKeywordEscape4,
 						expr: &litMatcher{
-							pos:        position{line: 1430, col: 5, offset: 39332},
+							pos:        position{line: 1424, col: 5, offset: 39203},
 							val:        "*",
 							ignoreCase: false,
 						},
 					},
 					&charClassMatcher{
-						pos:        position{line: 1431, col: 5, offset: 39360},
+						pos:        position{line: 1425, col: 5, offset: 39231},
 						val:        "[+-]",
 						chars:      []rune{'+', '-'},
 						ignoreCase: false,
@@ -11929,41 +11904,41 @@ var g = &grammar{
 		},
 		{
 			name: "UnicodeEscape",
-			pos:  position{line: 1433, col: 1, offset: 39366},
+			pos:  position{line: 1427, col: 1, offset: 39237},
 			expr: &choiceExpr{
-				pos: position{line: 1434, col: 5, offset: 39384},
+				pos: position{line: 1428, col: 5, offset: 39255},
 				alternatives: []interface{}{
 					&actionExpr{
-						pos: position{line: 1434, col: 5, offset: 39384},
+						pos: position{line: 1428, col: 5, offset: 39255},
 						run: (*parser).callonUnicodeEscape2,
 						expr: &seqExpr{
-							pos: position{line: 1434, col: 5, offset: 39384},
+							pos: position{line: 1428, col: 5, offset: 39255},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1434, col: 5, offset: 39384},
+									pos:        position{line: 1428, col: 5, offset: 39255},
 									val:        "u",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 1434, col: 9, offset: 39388},
+									pos:   position{line: 1428, col: 9, offset: 39259},
 									label: "chars",
 									expr: &seqExpr{
-										pos: position{line: 1434, col: 16, offset: 39395},
+										pos: position{line: 1428, col: 16, offset: 39266},
 										exprs: []interface{}{
 											&ruleRefExpr{
-												pos:  position{line: 1434, col: 16, offset: 39395},
+												pos:  position{line: 1428, col: 16, offset: 39266},
 												name: "HexDigit",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1434, col: 25, offset: 39404},
+												pos:  position{line: 1428, col: 25, offset: 39275},
 												name: "HexDigit",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1434, col: 34, offset: 39413},
+												pos:  position{line: 1428, col: 34, offset: 39284},
 												name: "HexDigit",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1434, col: 43, offset: 39422},
+												pos:  position{line: 1428, col: 43, offset: 39293},
 												name: "HexDigit",
 											},
 										},
@@ -11973,63 +11948,63 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1437, col: 5, offset: 39485},
+						pos: position{line: 1431, col: 5, offset: 39356},
 						run: (*parser).callonUnicodeEscape11,
 						expr: &seqExpr{
-							pos: position{line: 1437, col: 5, offset: 39485},
+							pos: position{line: 1431, col: 5, offset: 39356},
 							exprs: []interface{}{
 								&litMatcher{
-									pos:        position{line: 1437, col: 5, offset: 39485},
+									pos:        position{line: 1431, col: 5, offset: 39356},
 									val:        "u",
 									ignoreCase: false,
 								},
 								&litMatcher{
-									pos:        position{line: 1437, col: 9, offset: 39489},
+									pos:        position{line: 1431, col: 9, offset: 39360},
 									val:        "{",
 									ignoreCase: false,
 								},
 								&labeledExpr{
-									pos:   position{line: 1437, col: 13, offset: 39493},
+									pos:   position{line: 1431, col: 13, offset: 39364},
 									label: "chars",
 									expr: &seqExpr{
-										pos: position{line: 1437, col: 20, offset: 39500},
+										pos: position{line: 1431, col: 20, offset: 39371},
 										exprs: []interface{}{
 											&ruleRefExpr{
-												pos:  position{line: 1437, col: 20, offset: 39500},
+												pos:  position{line: 1431, col: 20, offset: 39371},
 												name: "HexDigit",
 											},
 											&zeroOrOneExpr{
-												pos: position{line: 1437, col: 29, offset: 39509},
+												pos: position{line: 1431, col: 29, offset: 39380},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1437, col: 29, offset: 39509},
+													pos:  position{line: 1431, col: 29, offset: 39380},
 													name: "HexDigit",
 												},
 											},
 											&zeroOrOneExpr{
-												pos: position{line: 1437, col: 39, offset: 39519},
+												pos: position{line: 1431, col: 39, offset: 39390},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1437, col: 39, offset: 39519},
+													pos:  position{line: 1431, col: 39, offset: 39390},
 													name: "HexDigit",
 												},
 											},
 											&zeroOrOneExpr{
-												pos: position{line: 1437, col: 49, offset: 39529},
+												pos: position{line: 1431, col: 49, offset: 39400},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1437, col: 49, offset: 39529},
+													pos:  position{line: 1431, col: 49, offset: 39400},
 													name: "HexDigit",
 												},
 											},
 											&zeroOrOneExpr{
-												pos: position{line: 1437, col: 59, offset: 39539},
+												pos: position{line: 1431, col: 59, offset: 39410},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1437, col: 59, offset: 39539},
+													pos:  position{line: 1431, col: 59, offset: 39410},
 													name: "HexDigit",
 												},
 											},
 											&zeroOrOneExpr{
-												pos: position{line: 1437, col: 69, offset: 39549},
+												pos: position{line: 1431, col: 69, offset: 39420},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1437, col: 69, offset: 39549},
+													pos:  position{line: 1431, col: 69, offset: 39420},
 													name: "HexDigit",
 												},
 											},
@@ -12037,7 +12012,7 @@ var g = &grammar{
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1437, col: 80, offset: 39560},
+									pos:        position{line: 1431, col: 80, offset: 39431},
 									val:        "}",
 									ignoreCase: false,
 								},
@@ -12049,35 +12024,35 @@ var g = &grammar{
 		},
 		{
 			name: "RegexpPattern",
-			pos:  position{line: 1441, col: 1, offset: 39614},
+			pos:  position{line: 1435, col: 1, offset: 39485},
 			expr: &actionExpr{
-				pos: position{line: 1442, col: 5, offset: 39632},
+				pos: position{line: 1436, col: 5, offset: 39503},
 				run: (*parser).callonRegexpPattern1,
 				expr: &seqExpr{
-					pos: position{line: 1442, col: 5, offset: 39632},
+					pos: position{line: 1436, col: 5, offset: 39503},
 					exprs: []interface{}{
 						&litMatcher{
-							pos:        position{line: 1442, col: 5, offset: 39632},
+							pos:        position{line: 1436, col: 5, offset: 39503},
 							val:        "/",
 							ignoreCase: false,
 						},
 						&labeledExpr{
-							pos:   position{line: 1442, col: 9, offset: 39636},
+							pos:   position{line: 1436, col: 9, offset: 39507},
 							label: "body",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1442, col: 14, offset: 39641},
+								pos:  position{line: 1436, col: 14, offset: 39512},
 								name: "RegexpBody",
 							},
 						},
 						&litMatcher{
-							pos:        position{line: 1442, col: 25, offset: 39652},
+							pos:        position{line: 1436, col: 25, offset: 39523},
 							val:        "/",
 							ignoreCase: false,
 						},
 						&notExpr{
-							pos: position{line: 1442, col: 29, offset: 39656},
+							pos: position{line: 1436, col: 29, offset: 39527},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1442, col: 30, offset: 39657},
+								pos:  position{line: 1436, col: 30, offset: 39528},
 								name: "KeyWordStart",
 							},
 						},
@@ -12087,32 +12062,32 @@ var g = &grammar{
 		},
 		{
 			name: "RegexpBody",
-			pos:  position{line: 1444, col: 1, offset: 39692},
+			pos:  position{line: 1438, col: 1, offset: 39563},
 			expr: &actionExpr{
-				pos: position{line: 1445, col: 5, offset: 39707},
+				pos: position{line: 1439, col: 5, offset: 39578},
 				run: (*parser).callonRegexpBody1,
 				expr: &oneOrMoreExpr{
-					pos: position{line: 1445, col: 5, offset: 39707},
+					pos: position{line: 1439, col: 5, offset: 39578},
 					expr: &choiceExpr{
-						pos: position{line: 1445, col: 6, offset: 39708},
+						pos: position{line: 1439, col: 6, offset: 39579},
 						alternatives: []interface{}{
 							&charClassMatcher{
-								pos:        position{line: 1445, col: 6, offset: 39708},
+								pos:        position{line: 1439, col: 6, offset: 39579},
 								val:        "[^/\\\\]",
 								chars:      []rune{'/', '\\'},
 								ignoreCase: false,
 								inverted:   true,
 							},
 							&seqExpr{
-								pos: position{line: 1445, col: 15, offset: 39717},
+								pos: position{line: 1439, col: 15, offset: 39588},
 								exprs: []interface{}{
 									&litMatcher{
-										pos:        position{line: 1445, col: 15, offset: 39717},
+										pos:        position{line: 1439, col: 15, offset: 39588},
 										val:        "\\",
 										ignoreCase: false,
 									},
 									&anyMatcher{
-										line: 1445, col: 20, offset: 39722,
+										line: 1439, col: 20, offset: 39593,
 									},
 								},
 							},
@@ -12123,9 +12098,9 @@ var g = &grammar{
 		},
 		{
 			name: "EscapedChar",
-			pos:  position{line: 1447, col: 1, offset: 39758},
+			pos:  position{line: 1441, col: 1, offset: 39629},
 			expr: &charClassMatcher{
-				pos:        position{line: 1448, col: 5, offset: 39774},
+				pos:        position{line: 1442, col: 5, offset: 39645},
 				val:        "[\\x00-\\x1f\\\\]",
 				chars:      []rune{'\\'},
 				ranges:     []rune{'\x00', '\x1f'},
@@ -12135,42 +12110,42 @@ var g = &grammar{
 		},
 		{
 			name: "_",
-			pos:  position{line: 1450, col: 1, offset: 39789},
+			pos:  position{line: 1444, col: 1, offset: 39660},
 			expr: &oneOrMoreExpr{
-				pos: position{line: 1450, col: 5, offset: 39793},
+				pos: position{line: 1444, col: 5, offset: 39664},
 				expr: &ruleRefExpr{
-					pos:  position{line: 1450, col: 5, offset: 39793},
+					pos:  position{line: 1444, col: 5, offset: 39664},
 					name: "AnySpace",
 				},
 			},
 		},
 		{
 			name: "__",
-			pos:  position{line: 1452, col: 1, offset: 39804},
+			pos:  position{line: 1446, col: 1, offset: 39675},
 			expr: &zeroOrMoreExpr{
-				pos: position{line: 1452, col: 6, offset: 39809},
+				pos: position{line: 1446, col: 6, offset: 39680},
 				expr: &ruleRefExpr{
-					pos:  position{line: 1452, col: 6, offset: 39809},
+					pos:  position{line: 1446, col: 6, offset: 39680},
 					name: "AnySpace",
 				},
 			},
 		},
 		{
 			name: "AnySpace",
-			pos:  position{line: 1454, col: 1, offset: 39820},
+			pos:  position{line: 1448, col: 1, offset: 39691},
 			expr: &choiceExpr{
-				pos: position{line: 1455, col: 5, offset: 39833},
+				pos: position{line: 1449, col: 5, offset: 39704},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1455, col: 5, offset: 39833},
+						pos:  position{line: 1449, col: 5, offset: 39704},
 						name: "WhiteSpace",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1456, col: 5, offset: 39848},
+						pos:  position{line: 1450, col: 5, offset: 39719},
 						name: "LineTerminator",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1457, col: 5, offset: 39867},
+						pos:  position{line: 1451, col: 5, offset: 39738},
 						name: "Comment",
 					},
 				},
@@ -12178,32 +12153,32 @@ var g = &grammar{
 		},
 		{
 			name: "UnicodeLetter",
-			pos:  position{line: 1459, col: 1, offset: 39876},
+			pos:  position{line: 1453, col: 1, offset: 39747},
 			expr: &choiceExpr{
-				pos: position{line: 1460, col: 5, offset: 39894},
+				pos: position{line: 1454, col: 5, offset: 39765},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1460, col: 5, offset: 39894},
+						pos:  position{line: 1454, col: 5, offset: 39765},
 						name: "Lu",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1461, col: 5, offset: 39901},
+						pos:  position{line: 1455, col: 5, offset: 39772},
 						name: "Ll",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1462, col: 5, offset: 39908},
+						pos:  position{line: 1456, col: 5, offset: 39779},
 						name: "Lt",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1463, col: 5, offset: 39915},
+						pos:  position{line: 1457, col: 5, offset: 39786},
 						name: "Lm",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1464, col: 5, offset: 39922},
+						pos:  position{line: 1458, col: 5, offset: 39793},
 						name: "Lo",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1465, col: 5, offset: 39929},
+						pos:  position{line: 1459, col: 5, offset: 39800},
 						name: "Nl",
 					},
 				},
@@ -12211,16 +12186,16 @@ var g = &grammar{
 		},
 		{
 			name: "UnicodeCombiningMark",
-			pos:  position{line: 1467, col: 1, offset: 39933},
+			pos:  position{line: 1461, col: 1, offset: 39804},
 			expr: &choiceExpr{
-				pos: position{line: 1468, col: 5, offset: 39958},
+				pos: position{line: 1462, col: 5, offset: 39829},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1468, col: 5, offset: 39958},
+						pos:  position{line: 1462, col: 5, offset: 39829},
 						name: "Mn",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1469, col: 5, offset: 39965},
+						pos:  position{line: 1463, col: 5, offset: 39836},
 						name: "Mc",
 					},
 				},
@@ -12228,25 +12203,25 @@ var g = &grammar{
 		},
 		{
 			name: "UnicodeDigit",
-			pos:  position{line: 1471, col: 1, offset: 39969},
+			pos:  position{line: 1465, col: 1, offset: 39840},
 			expr: &ruleRefExpr{
-				pos:  position{line: 1472, col: 5, offset: 39986},
+				pos:  position{line: 1466, col: 5, offset: 39857},
 				name: "Nd",
 			},
 		},
 		{
 			name: "UnicodeConnectorPunctuation",
-			pos:  position{line: 1474, col: 1, offset: 39990},
+			pos:  position{line: 1468, col: 1, offset: 39861},
 			expr: &ruleRefExpr{
-				pos:  position{line: 1475, col: 5, offset: 40022},
+				pos:  position{line: 1469, col: 5, offset: 39893},
 				name: "Pc",
 			},
 		},
 		{
 			name: "Ll",
-			pos:  position{line: 1481, col: 1, offset: 40203},
+			pos:  position{line: 1475, col: 1, offset: 40074},
 			expr: &charClassMatcher{
-				pos:        position{line: 1481, col: 6, offset: 40208},
+				pos:        position{line: 1475, col: 6, offset: 40079},
 				val:        "[\\u0061-\\u007A\\u00B5\\u00DF-\\u00F6\\u00F8-\\u00FF\\u0101\\u0103\\u0105\\u0107\\u0109\\u010B\\u010D\\u010F\\u0111\\u0113\\u0115\\u0117\\u0119\\u011B\\u011D\\u011F\\u0121\\u0123\\u0125\\u0127\\u0129\\u012B\\u012D\\u012F\\u0131\\u0133\\u0135\\u0137-\\u0138\\u013A\\u013C\\u013E\\u0140\\u0142\\u0144\\u0146\\u0148-\\u0149\\u014B\\u014D\\u014F\\u0151\\u0153\\u0155\\u0157\\u0159\\u015B\\u015D\\u015F\\u0161\\u0163\\u0165\\u0167\\u0169\\u016B\\u016D\\u016F\\u0171\\u0173\\u0175\\u0177\\u017A\\u017C\\u017E-\\u0180\\u0183\\u0185\\u0188\\u018C-\\u018D\\u0192\\u0195\\u0199-\\u019B\\u019E\\u01A1\\u01A3\\u01A5\\u01A8\\u01AA-\\u01AB\\u01AD\\u01B0\\u01B4\\u01B6\\u01B9-\\u01BA\\u01BD-\\u01BF\\u01C6\\u01C9\\u01CC\\u01CE\\u01D0\\u01D2\\u01D4\\u01D6\\u01D8\\u01DA\\u01DC-\\u01DD\\u01DF\\u01E1\\u01E3\\u01E5\\u01E7\\u01E9\\u01EB\\u01ED\\u01EF-\\u01F0\\u01F3\\u01F5\\u01F9\\u01FB\\u01FD\\u01FF\\u0201\\u0203\\u0205\\u0207\\u0209\\u020B\\u020D\\u020F\\u0211\\u0213\\u0215\\u0217\\u0219\\u021B\\u021D\\u021F\\u0221\\u0223\\u0225\\u0227\\u0229\\u022B\\u022D\\u022F\\u0231\\u0233-\\u0239\\u023C\\u023F-\\u0240\\u0242\\u0247\\u0249\\u024B\\u024D\\u024F-\\u0293\\u0295-\\u02AF\\u0371\\u0373\\u0377\\u037B-\\u037D\\u0390\\u03AC-\\u03CE\\u03D0-\\u03D1\\u03D5-\\u03D7\\u03D9\\u03DB\\u03DD\\u03DF\\u03E1\\u03E3\\u03E5\\u03E7\\u03E9\\u03EB\\u03ED\\u03EF-\\u03F3\\u03F5\\u03F8\\u03FB-\\u03FC\\u0430-\\u045F\\u0461\\u0463\\u0465\\u0467\\u0469\\u046B\\u046D\\u046F\\u0471\\u0473\\u0475\\u0477\\u0479\\u047B\\u047D\\u047F\\u0481\\u048B\\u048D\\u048F\\u0491\\u0493\\u0495\\u0497\\u0499\\u049B\\u049D\\u049F\\u04A1\\u04A3\\u04A5\\u04A7\\u04A9\\u04AB\\u04AD\\u04AF\\u04B1\\u04B3\\u04B5\\u04B7\\u04B9\\u04BB\\u04BD\\u04BF\\u04C2\\u04C4\\u04C6\\u04C8\\u04CA\\u04CC\\u04CE-\\u04CF\\u04D1\\u04D3\\u04D5\\u04D7\\u04D9\\u04DB\\u04DD\\u04DF\\u04E1\\u04E3\\u04E5\\u04E7\\u04E9\\u04EB\\u04ED\\u04EF\\u04F1\\u04F3\\u04F5\\u04F7\\u04F9\\u04FB\\u04FD\\u04FF\\u0501\\u0503\\u0505\\u0507\\u0509\\u050B\\u050D\\u050F\\u0511\\u0513\\u0515\\u0517\\u0519\\u051B\\u051D\\u051F\\u0521\\u0523\\u0525\\u0527\\u0529\\u052B\\u052D\\u052F\\u0560-\\u0588\\u10D0-\\u10FA\\u10FD-\\u10FF\\u13F8-\\u13FD\\u1C80-\\u1C88\\u1D00-\\u1D2B\\u1D6B-\\u1D77\\u1D79-\\u1D9A\\u1E01\\u1E03\\u1E05\\u1E07\\u1E09\\u1E0B\\u1E0D\\u1E0F\\u1E11\\u1E13\\u1E15\\u1E17\\u1E19\\u1E1B\\u1E1D\\u1E1F\\u1E21\\u1E23\\u1E25\\u1E27\\u1E29\\u1E2B\\u1E2D\\u1E2F\\u1E31\\u1E33\\u1E35\\u1E37\\u1E39\\u1E3B\\u1E3D\\u1E3F\\u1E41\\u1E43\\u1E45\\u1E47\\u1E49\\u1E4B\\u1E4D\\u1E4F\\u1E51\\u1E53\\u1E55\\u1E57\\u1E59\\u1E5B\\u1E5D\\u1E5F\\u1E61\\u1E63\\u1E65\\u1E67\\u1E69\\u1E6B\\u1E6D\\u1E6F\\u1E71\\u1E73\\u1E75\\u1E77\\u1E79\\u1E7B\\u1E7D\\u1E7F\\u1E81\\u1E83\\u1E85\\u1E87\\u1E89\\u1E8B\\u1E8D\\u1E8F\\u1E91\\u1E93\\u1E95-\\u1E9D\\u1E9F\\u1EA1\\u1EA3\\u1EA5\\u1EA7\\u1EA9\\u1EAB\\u1EAD\\u1EAF\\u1EB1\\u1EB3\\u1EB5\\u1EB7\\u1EB9\\u1EBB\\u1EBD\\u1EBF\\u1EC1\\u1EC3\\u1EC5\\u1EC7\\u1EC9\\u1ECB\\u1ECD\\u1ECF\\u1ED1\\u1ED3\\u1ED5\\u1ED7\\u1ED9\\u1EDB\\u1EDD\\u1EDF\\u1EE1\\u1EE3\\u1EE5\\u1EE7\\u1EE9\\u1EEB\\u1EED\\u1EEF\\u1EF1\\u1EF3\\u1EF5\\u1EF7\\u1EF9\\u1EFB\\u1EFD\\u1EFF-\\u1F07\\u1F10-\\u1F15\\u1F20-\\u1F27\\u1F30-\\u1F37\\u1F40-\\u1F45\\u1F50-\\u1F57\\u1F60-\\u1F67\\u1F70-\\u1F7D\\u1F80-\\u1F87\\u1F90-\\u1F97\\u1FA0-\\u1FA7\\u1FB0-\\u1FB4\\u1FB6-\\u1FB7\\u1FBE\\u1FC2-\\u1FC4\\u1FC6-\\u1FC7\\u1FD0-\\u1FD3\\u1FD6-\\u1FD7\\u1FE0-\\u1FE7\\u1FF2-\\u1FF4\\u1FF6-\\u1FF7\\u210A\\u210E-\\u210F\\u2113\\u212F\\u2134\\u2139\\u213C-\\u213D\\u2146-\\u2149\\u214E\\u2184\\u2C30-\\u2C5E\\u2C61\\u2C65-\\u2C66\\u2C68\\u2C6A\\u2C6C\\u2C71\\u2C73-\\u2C74\\u2C76-\\u2C7B\\u2C81\\u2C83\\u2C85\\u2C87\\u2C89\\u2C8B\\u2C8D\\u2C8F\\u2C91\\u2C93\\u2C95\\u2C97\\u2C99\\u2C9B\\u2C9D\\u2C9F\\u2CA1\\u2CA3\\u2CA5\\u2CA7\\u2CA9\\u2CAB\\u2CAD\\u2CAF\\u2CB1\\u2CB3\\u2CB5\\u2CB7\\u2CB9\\u2CBB\\u2CBD\\u2CBF\\u2CC1\\u2CC3\\u2CC5\\u2CC7\\u2CC9\\u2CCB\\u2CCD\\u2CCF\\u2CD1\\u2CD3\\u2CD5\\u2CD7\\u2CD9\\u2CDB\\u2CDD\\u2CDF\\u2CE1\\u2CE3-\\u2CE4\\u2CEC\\u2CEE\\u2CF3\\u2D00-\\u2D25\\u2D27\\u2D2D\\uA641\\uA643\\uA645\\uA647\\uA649\\uA64B\\uA64D\\uA64F\\uA651\\uA653\\uA655\\uA657\\uA659\\uA65B\\uA65D\\uA65F\\uA661\\uA663\\uA665\\uA667\\uA669\\uA66B\\uA66D\\uA681\\uA683\\uA685\\uA687\\uA689\\uA68B\\uA68D\\uA68F\\uA691\\uA693\\uA695\\uA697\\uA699\\uA69B\\uA723\\uA725\\uA727\\uA729\\uA72B\\uA72D\\uA72F-\\uA731\\uA733\\uA735\\uA737\\uA739\\uA73B\\uA73D\\uA73F\\uA741\\uA743\\uA745\\uA747\\uA749\\uA74B\\uA74D\\uA74F\\uA751\\uA753\\uA755\\uA757\\uA759\\uA75B\\uA75D\\uA75F\\uA761\\uA763\\uA765\\uA767\\uA769\\uA76B\\uA76D\\uA76F\\uA771-\\uA778\\uA77A\\uA77C\\uA77F\\uA781\\uA783\\uA785\\uA787\\uA78C\\uA78E\\uA791\\uA793-\\uA795\\uA797\\uA799\\uA79B\\uA79D\\uA79F\\uA7A1\\uA7A3\\uA7A5\\uA7A7\\uA7A9\\uA7AF\\uA7B5\\uA7B7\\uA7B9\\uA7FA\\uAB30-\\uAB5A\\uAB60-\\uAB65\\uAB70-\\uABBF\\uFB00-\\uFB06\\uFB13-\\uFB17\\uFF41-\\uFF5A]",
 				chars:      []rune{'µ', 'ā', 'ă', 'ą', 'ć', 'ĉ', 'ċ', 'č', 'ď', 'đ', 'ē', 'ĕ', 'ė', 'ę', 'ě', 'ĝ', 'ğ', 'ġ', 'ģ', 'ĥ', 'ħ', 'ĩ', 'ī', 'ĭ', 'į', 'ı', 'ij', 'ĵ', 'ĺ', 'ļ', 'ľ', 'ŀ', 'ł', 'ń', 'ņ', 'ŋ', 'ō', 'ŏ', 'ő', 'œ', 'ŕ', 'ŗ', 'ř', 'ś', 'ŝ', 'ş', 'š', 'ţ', 'ť', 'ŧ', 'ũ', 'ū', 'ŭ', 'ů', 'ű', 'ų', 'ŵ', 'ŷ', 'ź', 'ż', 'ƃ', 'ƅ', 'ƈ', 'ƒ', 'ƕ', 'ƞ', 'ơ', 'ƣ', 'ƥ', 'ƨ', 'ƭ', 'ư', 'ƴ', 'ƶ', 'dž', 'lj', 'nj', 'ǎ', 'ǐ', 'ǒ', 'ǔ', 'ǖ', 'ǘ', 'ǚ', 'ǟ', 'ǡ', 'ǣ', 'ǥ', 'ǧ', 'ǩ', 'ǫ', 'ǭ', 'dz', 'ǵ', 'ǹ', 'ǻ', 'ǽ', 'ǿ', 'ȁ', 'ȃ', 'ȅ', 'ȇ', 'ȉ', 'ȋ', 'ȍ', 'ȏ', 'ȑ', 'ȓ', 'ȕ', 'ȗ', 'ș', 'ț', 'ȝ', 'ȟ', 'ȡ', 'ȣ', 'ȥ', 'ȧ', 'ȩ', 'ȫ', 'ȭ', 'ȯ', 'ȱ', 'ȼ', 'ɂ', 'ɇ', 'ɉ', 'ɋ', 'ɍ', 'ͱ', 'ͳ', 'ͷ', 'ΐ', 'ϙ', 'ϛ', 'ϝ', 'ϟ', 'ϡ', 'ϣ', 'ϥ', 'ϧ', 'ϩ', 'ϫ', 'ϭ', 'ϵ', 'ϸ', 'ѡ', 'ѣ', 'ѥ', 'ѧ', 'ѩ', 'ѫ', 'ѭ', 'ѯ', 'ѱ', 'ѳ', 'ѵ', 'ѷ', 'ѹ', 'ѻ', 'ѽ', 'ѿ', 'ҁ', 'ҋ', 'ҍ', 'ҏ', 'ґ', 'ғ', 'ҕ', 'җ', 'ҙ', 'қ', 'ҝ', 'ҟ', 'ҡ', 'ң', 'ҥ', 'ҧ', 'ҩ', 'ҫ', 'ҭ', 'ү', 'ұ', 'ҳ', 'ҵ', 'ҷ', 'ҹ', 'һ', 'ҽ', 'ҿ', 'ӂ', 'ӄ', 'ӆ', 'ӈ', 'ӊ', 'ӌ', 'ӑ', 'ӓ', 'ӕ', 'ӗ', 'ә', 'ӛ', 'ӝ', 'ӟ', 'ӡ', 'ӣ', 'ӥ', 'ӧ', 'ө', 'ӫ', 'ӭ', 'ӯ', 'ӱ', 'ӳ', 'ӵ', 'ӷ', 'ӹ', 'ӻ', 'ӽ', 'ӿ', 'ԁ', 'ԃ', 'ԅ', 'ԇ', 'ԉ', 'ԋ', 'ԍ', 'ԏ', 'ԑ', 'ԓ', 'ԕ', 'ԗ', 'ԙ', 'ԛ', 'ԝ', 'ԟ', 'ԡ', 'ԣ', 'ԥ', 'ԧ', 'ԩ', 'ԫ', 'ԭ', 'ԯ', 'ḁ', 'ḃ', 'ḅ', 'ḇ', 'ḉ', 'ḋ', 'ḍ', 'ḏ', 'ḑ', 'ḓ', 'ḕ', 'ḗ', 'ḙ', 'ḛ', 'ḝ', 'ḟ', 'ḡ', 'ḣ', 'ḥ', 'ḧ', 'ḩ', 'ḫ', 'ḭ', 'ḯ', 'ḱ', 'ḳ', 'ḵ', 'ḷ', 'ḹ', 'ḻ', 'ḽ', 'ḿ', 'ṁ', 'ṃ', 'ṅ', 'ṇ', 'ṉ', 'ṋ', 'ṍ', 'ṏ', 'ṑ', 'ṓ', 'ṕ', 'ṗ', 'ṙ', 'ṛ', 'ṝ', 'ṟ', 'ṡ', 'ṣ', 'ṥ', 'ṧ', 'ṩ', 'ṫ', 'ṭ', 'ṯ', 'ṱ', 'ṳ', 'ṵ', 'ṷ', 'ṹ', 'ṻ', 'ṽ', 'ṿ', 'ẁ', 'ẃ', 'ẅ', 'ẇ', 'ẉ', 'ẋ', 'ẍ', 'ẏ', 'ẑ', 'ẓ', 'ẟ', 'ạ', 'ả', 'ấ', 'ầ', 'ẩ', 'ẫ', 'ậ', 'ắ', 'ằ', 'ẳ', 'ẵ', 'ặ', 'ẹ', 'ẻ', 'ẽ', 'ế', 'ề', 'ể', 'ễ', 'ệ', 'ỉ', 'ị', 'ọ', 'ỏ', 'ố', 'ồ', 'ổ', 'ỗ', 'ộ', 'ớ', 'ờ', 'ở', 'ỡ', 'ợ', 'ụ', 'ủ', 'ứ', 'ừ', 'ử', 'ữ', 'ự', 'ỳ', 'ỵ', 'ỷ', 'ỹ', 'ỻ', 'ỽ', 'ι', 'ℊ', 'ℓ', 'ℯ', 'ℴ', 'ℹ', 'ⅎ', 'ↄ', 'ⱡ', 'ⱨ', 'ⱪ', 'ⱬ', 'ⱱ', 'ⲁ', 'ⲃ', 'ⲅ', 'ⲇ', 'ⲉ', 'ⲋ', 'ⲍ', 'ⲏ', 'ⲑ', 'ⲓ', 'ⲕ', 'ⲗ', 'ⲙ', 'ⲛ', 'ⲝ', 'ⲟ', 'ⲡ', 'ⲣ', 'ⲥ', 'ⲧ', 'ⲩ', 'ⲫ', 'ⲭ', 'ⲯ', 'ⲱ', 'ⲳ', 'ⲵ', 'ⲷ', 'ⲹ', 'ⲻ', 'ⲽ', 'ⲿ', 'ⳁ', 'ⳃ', 'ⳅ', 'ⳇ', 'ⳉ', 'ⳋ', 'ⳍ', 'ⳏ', 'ⳑ', 'ⳓ', 'ⳕ', 'ⳗ', 'ⳙ', 'ⳛ', 'ⳝ', 'ⳟ', 'ⳡ', 'ⳬ', 'ⳮ', 'ⳳ', 'ⴧ', 'ⴭ', 'ꙁ', 'ꙃ', 'ꙅ', 'ꙇ', 'ꙉ', 'ꙋ', 'ꙍ', 'ꙏ', 'ꙑ', 'ꙓ', 'ꙕ', 'ꙗ', 'ꙙ', 'ꙛ', 'ꙝ', 'ꙟ', 'ꙡ', 'ꙣ', 'ꙥ', 'ꙧ', 'ꙩ', 'ꙫ', 'ꙭ', 'ꚁ', 'ꚃ', 'ꚅ', 'ꚇ', 'ꚉ', 'ꚋ', 'ꚍ', 'ꚏ', 'ꚑ', 'ꚓ', 'ꚕ', 'ꚗ', 'ꚙ', 'ꚛ', 'ꜣ', 'ꜥ', 'ꜧ', 'ꜩ', 'ꜫ', 'ꜭ', 'ꜳ', 'ꜵ', 'ꜷ', 'ꜹ', 'ꜻ', 'ꜽ', 'ꜿ', 'ꝁ', 'ꝃ', 'ꝅ', 'ꝇ', 'ꝉ', 'ꝋ', 'ꝍ', 'ꝏ', 'ꝑ', 'ꝓ', 'ꝕ', 'ꝗ', 'ꝙ', 'ꝛ', 'ꝝ', 'ꝟ', 'ꝡ', 'ꝣ', 'ꝥ', 'ꝧ', 'ꝩ', 'ꝫ', 'ꝭ', 'ꝯ', 'ꝺ', 'ꝼ', 'ꝿ', 'ꞁ', 'ꞃ', 'ꞅ', 'ꞇ', 'ꞌ', 'ꞎ', 'ꞑ', 'ꞗ', 'ꞙ', 'ꞛ', 'ꞝ', 'ꞟ', 'ꞡ', 'ꞣ', 'ꞥ', 'ꞧ', 'ꞩ', 'ꞯ', 'ꞵ', 'ꞷ', 'ꞹ', 'ꟺ'},
 				ranges:     []rune{'a', 'z', 'ß', 'ö', 'ø', 'ÿ', 'ķ', 'ĸ', 'ň', 'ʼn', 'ž', 'ƀ', 'ƌ', 'ƍ', 'ƙ', 'ƛ', 'ƪ', 'ƫ', 'ƹ', 'ƺ', 'ƽ', 'ƿ', 'ǜ', 'ǝ', 'ǯ', 'ǰ', 'ȳ', 'ȹ', 'ȿ', 'ɀ', 'ɏ', 'ʓ', 'ʕ', 'ʯ', 'ͻ', 'ͽ', 'ά', 'ώ', 'ϐ', 'ϑ', 'ϕ', 'ϗ', 'ϯ', 'ϳ', 'ϻ', 'ϼ', 'а', 'џ', 'ӎ', 'ӏ', 'ՠ', 'ֈ', 'ა', 'ჺ', 'ჽ', 'ჿ', 'ᏸ', 'ᏽ', 'ᲀ', 'ᲈ', 'ᴀ', 'ᴫ', 'ᵫ', 'ᵷ', 'ᵹ', 'ᶚ', 'ẕ', 'ẝ', 'ỿ', 'ἇ', 'ἐ', 'ἕ', 'ἠ', 'ἧ', 'ἰ', 'ἷ', 'ὀ', 'ὅ', 'ὐ', 'ὗ', 'ὠ', 'ὧ', 'ὰ', 'ώ', 'ᾀ', 'ᾇ', 'ᾐ', 'ᾗ', 'ᾠ', 'ᾧ', 'ᾰ', 'ᾴ', 'ᾶ', 'ᾷ', 'ῂ', 'ῄ', 'ῆ', 'ῇ', 'ῐ', 'ΐ', 'ῖ', 'ῗ', 'ῠ', 'ῧ', 'ῲ', 'ῴ', 'ῶ', 'ῷ', 'ℎ', 'ℏ', 'ℼ', 'ℽ', 'ⅆ', 'ⅉ', 'ⰰ', 'ⱞ', 'ⱥ', 'ⱦ', 'ⱳ', 'ⱴ', 'ⱶ', 'ⱻ', 'ⳣ', 'ⳤ', 'ⴀ', 'ⴥ', 'ꜯ', 'ꜱ', 'ꝱ', 'ꝸ', 'ꞓ', 'ꞕ', 'ꬰ', 'ꭚ', 'ꭠ', 'ꭥ', 'ꭰ', 'ꮿ', 'ff', 'st', 'ﬓ', 'ﬗ', 'ａ', 'ｚ'},
@@ -12256,9 +12231,9 @@ var g = &grammar{
 		},
 		{
 			name: "Lm",
-			pos:  position{line: 1484, col: 1, offset: 44360},
+			pos:  position{line: 1478, col: 1, offset: 44231},
 			expr: &charClassMatcher{
-				pos:        position{line: 1484, col: 6, offset: 44365},
+				pos:        position{line: 1478, col: 6, offset: 44236},
 				val:        "[\\u02B0-\\u02C1\\u02C6-\\u02D1\\u02E0-\\u02E4\\u02EC\\u02EE\\u0374\\u037A\\u0559\\u0640\\u06E5-\\u06E6\\u07F4-\\u07F5\\u07FA\\u081A\\u0824\\u0828\\u0971\\u0E46\\u0EC6\\u10FC\\u17D7\\u1843\\u1AA7\\u1C78-\\u1C7D\\u1D2C-\\u1D6A\\u1D78\\u1D9B-\\u1DBF\\u2071\\u207F\\u2090-\\u209C\\u2C7C-\\u2C7D\\u2D6F\\u2E2F\\u3005\\u3031-\\u3035\\u303B\\u309D-\\u309E\\u30FC-\\u30FE\\uA015\\uA4F8-\\uA4FD\\uA60C\\uA67F\\uA69C-\\uA69D\\uA717-\\uA71F\\uA770\\uA788\\uA7F8-\\uA7F9\\uA9CF\\uA9E6\\uAA70\\uAADD\\uAAF3-\\uAAF4\\uAB5C-\\uAB5F\\uFF70\\uFF9E-\\uFF9F]",
 				chars:      []rune{'ˬ', 'ˮ', 'ʹ', 'ͺ', 'ՙ', 'ـ', 'ߺ', 'ࠚ', 'ࠤ', 'ࠨ', 'ॱ', 'ๆ', 'ໆ', 'ჼ', 'ៗ', 'ᡃ', 'ᪧ', 'ᵸ', 'ⁱ', 'ⁿ', 'ⵯ', 'ⸯ', '々', '〻', 'ꀕ', 'ꘌ', 'ꙿ', 'ꝰ', 'ꞈ', 'ꧏ', 'ꧦ', 'ꩰ', 'ꫝ', 'ｰ'},
 				ranges:     []rune{'ʰ', 'ˁ', 'ˆ', 'ˑ', 'ˠ', 'ˤ', 'ۥ', 'ۦ', 'ߴ', 'ߵ', 'ᱸ', 'ᱽ', 'ᴬ', 'ᵪ', 'ᶛ', 'ᶿ', 'ₐ', 'ₜ', 'ⱼ', 'ⱽ', '〱', '〵', 'ゝ', 'ゞ', 'ー', 'ヾ', 'ꓸ', 'ꓽ', 'ꚜ', 'ꚝ', 'ꜗ', 'ꜟ', 'ꟸ', 'ꟹ', 'ꫳ', 'ꫴ', 'ꭜ', 'ꭟ', 'ﾞ', 'ﾟ'},
@@ -12268,9 +12243,9 @@ var g = &grammar{
 		},
 		{
 			name: "Lo",
-			pos:  position{line: 1487, col: 1, offset: 44850},
+			pos:  position{line: 1481, col: 1, offset: 44721},
 			expr: &charClassMatcher{
-				pos:        position{line: 1487, col: 6, offset: 44855},
+				pos:        position{line: 1481, col: 6, offset: 44726},
 				val:        "[\\u00AA\\u00BA\\u01BB\\u01C0-\\u01C3\\u0294\\u05D0-\\u05EA\\u05EF-\\u05F2\\u0620-\\u063F\\u0641-\\u064A\\u066E-\\u066F\\u0671-\\u06D3\\u06D5\\u06EE-\\u06EF\\u06FA-\\u06FC\\u06FF\\u0710\\u0712-\\u072F\\u074D-\\u07A5\\u07B1\\u07CA-\\u07EA\\u0800-\\u0815\\u0840-\\u0858\\u0860-\\u086A\\u08A0-\\u08B4\\u08B6-\\u08BD\\u0904-\\u0939\\u093D\\u0950\\u0958-\\u0961\\u0972-\\u0980\\u0985-\\u098C\\u098F-\\u0990\\u0993-\\u09A8\\u09AA-\\u09B0\\u09B2\\u09B6-\\u09B9\\u09BD\\u09CE\\u09DC-\\u09DD\\u09DF-\\u09E1\\u09F0-\\u09F1\\u09FC\\u0A05-\\u0A0A\\u0A0F-\\u0A10\\u0A13-\\u0A28\\u0A2A-\\u0A30\\u0A32-\\u0A33\\u0A35-\\u0A36\\u0A38-\\u0A39\\u0A59-\\u0A5C\\u0A5E\\u0A72-\\u0A74\\u0A85-\\u0A8D\\u0A8F-\\u0A91\\u0A93-\\u0AA8\\u0AAA-\\u0AB0\\u0AB2-\\u0AB3\\u0AB5-\\u0AB9\\u0ABD\\u0AD0\\u0AE0-\\u0AE1\\u0AF9\\u0B05-\\u0B0C\\u0B0F-\\u0B10\\u0B13-\\u0B28\\u0B2A-\\u0B30\\u0B32-\\u0B33\\u0B35-\\u0B39\\u0B3D\\u0B5C-\\u0B5D\\u0B5F-\\u0B61\\u0B71\\u0B83\\u0B85-\\u0B8A\\u0B8E-\\u0B90\\u0B92-\\u0B95\\u0B99-\\u0B9A\\u0B9C\\u0B9E-\\u0B9F\\u0BA3-\\u0BA4\\u0BA8-\\u0BAA\\u0BAE-\\u0BB9\\u0BD0\\u0C05-\\u0C0C\\u0C0E-\\u0C10\\u0C12-\\u0C28\\u0C2A-\\u0C39\\u0C3D\\u0C58-\\u0C5A\\u0C60-\\u0C61\\u0C80\\u0C85-\\u0C8C\\u0C8E-\\u0C90\\u0C92-\\u0CA8\\u0CAA-\\u0CB3\\u0CB5-\\u0CB9\\u0CBD\\u0CDE\\u0CE0-\\u0CE1\\u0CF1-\\u0CF2\\u0D05-\\u0D0C\\u0D0E-\\u0D10\\u0D12-\\u0D3A\\u0D3D\\u0D4E\\u0D54-\\u0D56\\u0D5F-\\u0D61\\u0D7A-\\u0D7F\\u0D85-\\u0D96\\u0D9A-\\u0DB1\\u0DB3-\\u0DBB\\u0DBD\\u0DC0-\\u0DC6\\u0E01-\\u0E30\\u0E32-\\u0E33\\u0E40-\\u0E45\\u0E81-\\u0E82\\u0E84\\u0E87-\\u0E88\\u0E8A\\u0E8D\\u0E94-\\u0E97\\u0E99-\\u0E9F\\u0EA1-\\u0EA3\\u0EA5\\u0EA7\\u0EAA-\\u0EAB\\u0EAD-\\u0EB0\\u0EB2-\\u0EB3\\u0EBD\\u0EC0-\\u0EC4\\u0EDC-\\u0EDF\\u0F00\\u0F40-\\u0F47\\u0F49-\\u0F6C\\u0F88-\\u0F8C\\u1000-\\u102A\\u103F\\u1050-\\u1055\\u105A-\\u105D\\u1061\\u1065-\\u1066\\u106E-\\u1070\\u1075-\\u1081\\u108E\\u1100-\\u1248\\u124A-\\u124D\\u1250-\\u1256\\u1258\\u125A-\\u125D\\u1260-\\u1288\\u128A-\\u128D\\u1290-\\u12B0\\u12B2-\\u12B5\\u12B8-\\u12BE\\u12C0\\u12C2-\\u12C5\\u12C8-\\u12D6\\u12D8-\\u1310\\u1312-\\u1315\\u1318-\\u135A\\u1380-\\u138F\\u1401-\\u166C\\u166F-\\u167F\\u1681-\\u169A\\u16A0-\\u16EA\\u16F1-\\u16F8\\u1700-\\u170C\\u170E-\\u1711\\u1720-\\u1731\\u1740-\\u1751\\u1760-\\u176C\\u176E-\\u1770\\u1780-\\u17B3\\u17DC\\u1820-\\u1842\\u1844-\\u1878\\u1880-\\u1884\\u1887-\\u18A8\\u18AA\\u18B0-\\u18F5\\u1900-\\u191E\\u1950-\\u196D\\u1970-\\u1974\\u1980-\\u19AB\\u19B0-\\u19C9\\u1A00-\\u1A16\\u1A20-\\u1A54\\u1B05-\\u1B33\\u1B45-\\u1B4B\\u1B83-\\u1BA0\\u1BAE-\\u1BAF\\u1BBA-\\u1BE5\\u1C00-\\u1C23\\u1C4D-\\u1C4F\\u1C5A-\\u1C77\\u1CE9-\\u1CEC\\u1CEE-\\u1CF1\\u1CF5-\\u1CF6\\u2135-\\u2138\\u2D30-\\u2D67\\u2D80-\\u2D96\\u2DA0-\\u2DA6\\u2DA8-\\u2DAE\\u2DB0-\\u2DB6\\u2DB8-\\u2DBE\\u2DC0-\\u2DC6\\u2DC8-\\u2DCE\\u2DD0-\\u2DD6\\u2DD8-\\u2DDE\\u3006\\u303C\\u3041-\\u3096\\u309F\\u30A1-\\u30FA\\u30FF\\u3105-\\u312F\\u3131-\\u318E\\u31A0-\\u31BA\\u31F0-\\u31FF\\u3400-\\u4DB5\\u4E00-\\u9FEF\\uA000-\\uA014\\uA016-\\uA48C\\uA4D0-\\uA4F7\\uA500-\\uA60B\\uA610-\\uA61F\\uA62A-\\uA62B\\uA66E\\uA6A0-\\uA6E5\\uA78F\\uA7F7\\uA7FB-\\uA801\\uA803-\\uA805\\uA807-\\uA80A\\uA80C-\\uA822\\uA840-\\uA873\\uA882-\\uA8B3\\uA8F2-\\uA8F7\\uA8FB\\uA8FD-\\uA8FE\\uA90A-\\uA925\\uA930-\\uA946\\uA960-\\uA97C\\uA984-\\uA9B2\\uA9E0-\\uA9E4\\uA9E7-\\uA9EF\\uA9FA-\\uA9FE\\uAA00-\\uAA28\\uAA40-\\uAA42\\uAA44-\\uAA4B\\uAA60-\\uAA6F\\uAA71-\\uAA76\\uAA7A\\uAA7E-\\uAAAF\\uAAB1\\uAAB5-\\uAAB6\\uAAB9-\\uAABD\\uAAC0\\uAAC2\\uAADB-\\uAADC\\uAAE0-\\uAAEA\\uAAF2\\uAB01-\\uAB06\\uAB09-\\uAB0E\\uAB11-\\uAB16\\uAB20-\\uAB26\\uAB28-\\uAB2E\\uABC0-\\uABE2\\uAC00-\\uD7A3\\uD7B0-\\uD7C6\\uD7CB-\\uD7FB\\uF900-\\uFA6D\\uFA70-\\uFAD9\\uFB1D\\uFB1F-\\uFB28\\uFB2A-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40-\\uFB41\\uFB43-\\uFB44\\uFB46-\\uFBB1\\uFBD3-\\uFD3D\\uFD50-\\uFD8F\\uFD92-\\uFDC7\\uFDF0-\\uFDFB\\uFE70-\\uFE74\\uFE76-\\uFEFC\\uFF66-\\uFF6F\\uFF71-\\uFF9D\\uFFA0-\\uFFBE\\uFFC2-\\uFFC7\\uFFCA-\\uFFCF\\uFFD2-\\uFFD7\\uFFDA-\\uFFDC]",
 				chars:      []rune{'ª', 'º', 'ƻ', 'ʔ', 'ە', 'ۿ', 'ܐ', 'ޱ', 'ऽ', 'ॐ', 'ল', 'ঽ', 'ৎ', 'ৼ', 'ਫ਼', 'ઽ', 'ૐ', 'ૹ', 'ଽ', 'ୱ', 'ஃ', 'ஜ', 'ௐ', 'ఽ', 'ಀ', 'ಽ', 'ೞ', 'ഽ', 'ൎ', 'ල', 'ຄ', 'ຊ', 'ຍ', 'ລ', 'ວ', 'ຽ', 'ༀ', 'ဿ', 'ၡ', 'ႎ', 'ቘ', 'ዀ', 'ៜ', 'ᢪ', '〆', '〼', 'ゟ', 'ヿ', 'ꙮ', 'ꞏ', 'ꟷ', 'ꣻ', 'ꩺ', 'ꪱ', 'ꫀ', 'ꫂ', 'ꫲ', 'יִ', 'מּ'},
 				ranges:     []rune{'ǀ', 'ǃ', 'א', 'ת', 'ׯ', 'ײ', 'ؠ', 'ؿ', 'ف', 'ي', 'ٮ', 'ٯ', 'ٱ', 'ۓ', 'ۮ', 'ۯ', 'ۺ', 'ۼ', 'ܒ', 'ܯ', 'ݍ', 'ޥ', 'ߊ', 'ߪ', 'ࠀ', 'ࠕ', 'ࡀ', 'ࡘ', 'ࡠ', 'ࡪ', 'ࢠ', 'ࢴ', 'ࢶ', 'ࢽ', 'ऄ', 'ह', 'क़', 'ॡ', 'ॲ', 'ঀ', 'অ', 'ঌ', 'এ', 'ঐ', 'ও', 'ন', 'প', 'র', 'শ', 'হ', 'ড়', 'ঢ়', 'য়', 'ৡ', 'ৰ', 'ৱ', 'ਅ', 'ਊ', 'ਏ', 'ਐ', 'ਓ', 'ਨ', 'ਪ', 'ਰ', 'ਲ', 'ਲ਼', 'ਵ', 'ਸ਼', 'ਸ', 'ਹ', 'ਖ਼', 'ੜ', 'ੲ', 'ੴ', 'અ', 'ઍ', 'એ', 'ઑ', 'ઓ', 'ન', 'પ', 'ર', 'લ', 'ળ', 'વ', 'હ', 'ૠ', 'ૡ', 'ଅ', 'ଌ', 'ଏ', 'ଐ', 'ଓ', 'ନ', 'ପ', 'ର', 'ଲ', 'ଳ', 'ଵ', 'ହ', 'ଡ଼', 'ଢ଼', 'ୟ', 'ୡ', 'அ', 'ஊ', 'எ', 'ஐ', 'ஒ', 'க', 'ங', 'ச', 'ஞ', 'ட', 'ண', 'த', 'ந', 'ப', 'ம', 'ஹ', 'అ', 'ఌ', 'ఎ', 'ఐ', 'ఒ', 'న', 'ప', 'హ', 'ౘ', 'ౚ', 'ౠ', 'ౡ', 'ಅ', 'ಌ', 'ಎ', 'ಐ', 'ಒ', 'ನ', 'ಪ', 'ಳ', 'ವ', 'ಹ', 'ೠ', 'ೡ', 'ೱ', 'ೲ', 'അ', 'ഌ', 'എ', 'ഐ', 'ഒ', 'ഺ', 'ൔ', 'ൖ', 'ൟ', 'ൡ', 'ൺ', 'ൿ', 'අ', 'ඖ', 'ක', 'න', 'ඳ', 'ර', 'ව', 'ෆ', 'ก', 'ะ', 'า', 'ำ', 'เ', 'ๅ', 'ກ', 'ຂ', 'ງ', 'ຈ', 'ດ', 'ທ', 'ນ', 'ຟ', 'ມ', 'ຣ', 'ສ', 'ຫ', 'ອ', 'ະ', 'າ', 'ຳ', 'ເ', 'ໄ', 'ໜ', 'ໟ', 'ཀ', 'ཇ', 'ཉ', 'ཬ', 'ྈ', 'ྌ', 'က', 'ဪ', 'ၐ', 'ၕ', 'ၚ', 'ၝ', 'ၥ', 'ၦ', 'ၮ', 'ၰ', 'ၵ', 'ႁ', 'ᄀ', 'ቈ', 'ቊ', 'ቍ', 'ቐ', 'ቖ', 'ቚ', 'ቝ', 'በ', 'ኈ', 'ኊ', 'ኍ', 'ነ', 'ኰ', 'ኲ', 'ኵ', 'ኸ', 'ኾ', 'ዂ', 'ዅ', 'ወ', 'ዖ', 'ዘ', 'ጐ', 'ጒ', 'ጕ', 'ጘ', 'ፚ', 'ᎀ', 'ᎏ', 'ᐁ', 'ᙬ', 'ᙯ', 'ᙿ', 'ᚁ', 'ᚚ', 'ᚠ', 'ᛪ', 'ᛱ', 'ᛸ', 'ᜀ', 'ᜌ', 'ᜎ', 'ᜑ', 'ᜠ', 'ᜱ', 'ᝀ', 'ᝑ', 'ᝠ', 'ᝬ', 'ᝮ', 'ᝰ', 'ក', 'ឳ', 'ᠠ', 'ᡂ', 'ᡄ', 'ᡸ', 'ᢀ', 'ᢄ', 'ᢇ', 'ᢨ', 'ᢰ', 'ᣵ', 'ᤀ', 'ᤞ', 'ᥐ', 'ᥭ', 'ᥰ', 'ᥴ', 'ᦀ', 'ᦫ', 'ᦰ', 'ᧉ', 'ᨀ', 'ᨖ', 'ᨠ', 'ᩔ', 'ᬅ', 'ᬳ', 'ᭅ', 'ᭋ', 'ᮃ', 'ᮠ', 'ᮮ', 'ᮯ', 'ᮺ', 'ᯥ', 'ᰀ', 'ᰣ', 'ᱍ', 'ᱏ', 'ᱚ', 'ᱷ', 'ᳩ', 'ᳬ', 'ᳮ', 'ᳱ', 'ᳵ', 'ᳶ', 'ℵ', 'ℸ', 'ⴰ', 'ⵧ', 'ⶀ', 'ⶖ', 'ⶠ', 'ⶦ', 'ⶨ', 'ⶮ', 'ⶰ', 'ⶶ', 'ⶸ', 'ⶾ', 'ⷀ', 'ⷆ', 'ⷈ', 'ⷎ', 'ⷐ', 'ⷖ', 'ⷘ', 'ⷞ', 'ぁ', 'ゖ', 'ァ', 'ヺ', 'ㄅ', 'ㄯ', 'ㄱ', 'ㆎ', 'ㆠ', 'ㆺ', 'ㇰ', 'ㇿ', '㐀', '䶵', '一', '鿯', 'ꀀ', 'ꀔ', 'ꀖ', 'ꒌ', 'ꓐ', 'ꓷ', 'ꔀ', 'ꘋ', 'ꘐ', 'ꘟ', 'ꘪ', 'ꘫ', 'ꚠ', 'ꛥ', 'ꟻ', 'ꠁ', 'ꠃ', 'ꠅ', 'ꠇ', 'ꠊ', 'ꠌ', 'ꠢ', 'ꡀ', 'ꡳ', 'ꢂ', 'ꢳ', 'ꣲ', 'ꣷ', 'ꣽ', 'ꣾ', 'ꤊ', 'ꤥ', 'ꤰ', 'ꥆ', 'ꥠ', 'ꥼ', 'ꦄ', 'ꦲ', 'ꧠ', 'ꧤ', 'ꧧ', 'ꧯ', 'ꧺ', 'ꧾ', 'ꨀ', 'ꨨ', 'ꩀ', 'ꩂ', 'ꩄ', 'ꩋ', 'ꩠ', 'ꩯ', 'ꩱ', 'ꩶ', 'ꩾ', 'ꪯ', 'ꪵ', 'ꪶ', 'ꪹ', 'ꪽ', 'ꫛ', 'ꫜ', 'ꫠ', 'ꫪ', 'ꬁ', 'ꬆ', 'ꬉ', 'ꬎ', 'ꬑ', 'ꬖ', 'ꬠ', 'ꬦ', 'ꬨ', 'ꬮ', 'ꯀ', 'ꯢ', '가', '힣', 'ힰ', 'ퟆ', 'ퟋ', 'ퟻ', '豈', '舘', '並', '龎', 'ײַ', 'ﬨ', 'שׁ', 'זּ', 'טּ', 'לּ', 'נּ', 'סּ', 'ףּ', 'פּ', 'צּ', 'ﮱ', 'ﯓ', 'ﴽ', 'ﵐ', 'ﶏ', 'ﶒ', 'ﷇ', 'ﷰ', 'ﷻ', 'ﹰ', 'ﹴ', 'ﹶ', 'ﻼ', 'ｦ', 'ｯ', 'ｱ', 'ﾝ', 'ﾠ', 'ﾾ', 'ￂ', 'ￇ', 'ￊ', 'ￏ', 'ￒ', 'ￗ', 'ￚ', 'ￜ'},
@@ -12280,9 +12255,9 @@ var g = &grammar{
 		},
 		{
 			name: "Lt",
-			pos:  position{line: 1490, col: 1, offset: 48302},
+			pos:  position{line: 1484, col: 1, offset: 48173},
 			expr: &charClassMatcher{
-				pos:        position{line: 1490, col: 6, offset: 48307},
+				pos:        position{line: 1484, col: 6, offset: 48178},
 				val:        "[\\u01C5\\u01C8\\u01CB\\u01F2\\u1F88-\\u1F8F\\u1F98-\\u1F9F\\u1FA8-\\u1FAF\\u1FBC\\u1FCC\\u1FFC]",
 				chars:      []rune{'Dž', 'Lj', 'Nj', 'Dz', 'ᾼ', 'ῌ', 'ῼ'},
 				ranges:     []rune{'ᾈ', 'ᾏ', 'ᾘ', 'ᾟ', 'ᾨ', 'ᾯ'},
@@ -12292,9 +12267,9 @@ var g = &grammar{
 		},
 		{
 			name: "Lu",
-			pos:  position{line: 1493, col: 1, offset: 48413},
+			pos:  position{line: 1487, col: 1, offset: 48284},
 			expr: &charClassMatcher{
-				pos:        position{line: 1493, col: 6, offset: 48418},
+				pos:        position{line: 1487, col: 6, offset: 48289},
 				val:        "[\\u0041-\\u005A\\u00C0-\\u00D6\\u00D8-\\u00DE\\u0100\\u0102\\u0104\\u0106\\u0108\\u010A\\u010C\\u010E\\u0110\\u0112\\u0114\\u0116\\u0118\\u011A\\u011C\\u011E\\u0120\\u0122\\u0124\\u0126\\u0128\\u012A\\u012C\\u012E\\u0130\\u0132\\u0134\\u0136\\u0139\\u013B\\u013D\\u013F\\u0141\\u0143\\u0145\\u0147\\u014A\\u014C\\u014E\\u0150\\u0152\\u0154\\u0156\\u0158\\u015A\\u015C\\u015E\\u0160\\u0162\\u0164\\u0166\\u0168\\u016A\\u016C\\u016E\\u0170\\u0172\\u0174\\u0176\\u0178-\\u0179\\u017B\\u017D\\u0181-\\u0182\\u0184\\u0186-\\u0187\\u0189-\\u018B\\u018E-\\u0191\\u0193-\\u0194\\u0196-\\u0198\\u019C-\\u019D\\u019F-\\u01A0\\u01A2\\u01A4\\u01A6-\\u01A7\\u01A9\\u01AC\\u01AE-\\u01AF\\u01B1-\\u01B3\\u01B5\\u01B7-\\u01B8\\u01BC\\u01C4\\u01C7\\u01CA\\u01CD\\u01CF\\u01D1\\u01D3\\u01D5\\u01D7\\u01D9\\u01DB\\u01DE\\u01E0\\u01E2\\u01E4\\u01E6\\u01E8\\u01EA\\u01EC\\u01EE\\u01F1\\u01F4\\u01F6-\\u01F8\\u01FA\\u01FC\\u01FE\\u0200\\u0202\\u0204\\u0206\\u0208\\u020A\\u020C\\u020E\\u0210\\u0212\\u0214\\u0216\\u0218\\u021A\\u021C\\u021E\\u0220\\u0222\\u0224\\u0226\\u0228\\u022A\\u022C\\u022E\\u0230\\u0232\\u023A-\\u023B\\u023D-\\u023E\\u0241\\u0243-\\u0246\\u0248\\u024A\\u024C\\u024E\\u0370\\u0372\\u0376\\u037F\\u0386\\u0388-\\u038A\\u038C\\u038E-\\u038F\\u0391-\\u03A1\\u03A3-\\u03AB\\u03CF\\u03D2-\\u03D4\\u03D8\\u03DA\\u03DC\\u03DE\\u03E0\\u03E2\\u03E4\\u03E6\\u03E8\\u03EA\\u03EC\\u03EE\\u03F4\\u03F7\\u03F9-\\u03FA\\u03FD-\\u042F\\u0460\\u0462\\u0464\\u0466\\u0468\\u046A\\u046C\\u046E\\u0470\\u0472\\u0474\\u0476\\u0478\\u047A\\u047C\\u047E\\u0480\\u048A\\u048C\\u048E\\u0490\\u0492\\u0494\\u0496\\u0498\\u049A\\u049C\\u049E\\u04A0\\u04A2\\u04A4\\u04A6\\u04A8\\u04AA\\u04AC\\u04AE\\u04B0\\u04B2\\u04B4\\u04B6\\u04B8\\u04BA\\u04BC\\u04BE\\u04C0-\\u04C1\\u04C3\\u04C5\\u04C7\\u04C9\\u04CB\\u04CD\\u04D0\\u04D2\\u04D4\\u04D6\\u04D8\\u04DA\\u04DC\\u04DE\\u04E0\\u04E2\\u04E4\\u04E6\\u04E8\\u04EA\\u04EC\\u04EE\\u04F0\\u04F2\\u04F4\\u04F6\\u04F8\\u04FA\\u04FC\\u04FE\\u0500\\u0502\\u0504\\u0506\\u0508\\u050A\\u050C\\u050E\\u0510\\u0512\\u0514\\u0516\\u0518\\u051A\\u051C\\u051E\\u0520\\u0522\\u0524\\u0526\\u0528\\u052A\\u052C\\u052E\\u0531-\\u0556\\u10A0-\\u10C5\\u10C7\\u10CD\\u13A0-\\u13F5\\u1C90-\\u1CBA\\u1CBD-\\u1CBF\\u1E00\\u1E02\\u1E04\\u1E06\\u1E08\\u1E0A\\u1E0C\\u1E0E\\u1E10\\u1E12\\u1E14\\u1E16\\u1E18\\u1E1A\\u1E1C\\u1E1E\\u1E20\\u1E22\\u1E24\\u1E26\\u1E28\\u1E2A\\u1E2C\\u1E2E\\u1E30\\u1E32\\u1E34\\u1E36\\u1E38\\u1E3A\\u1E3C\\u1E3E\\u1E40\\u1E42\\u1E44\\u1E46\\u1E48\\u1E4A\\u1E4C\\u1E4E\\u1E50\\u1E52\\u1E54\\u1E56\\u1E58\\u1E5A\\u1E5C\\u1E5E\\u1E60\\u1E62\\u1E64\\u1E66\\u1E68\\u1E6A\\u1E6C\\u1E6E\\u1E70\\u1E72\\u1E74\\u1E76\\u1E78\\u1E7A\\u1E7C\\u1E7E\\u1E80\\u1E82\\u1E84\\u1E86\\u1E88\\u1E8A\\u1E8C\\u1E8E\\u1E90\\u1E92\\u1E94\\u1E9E\\u1EA0\\u1EA2\\u1EA4\\u1EA6\\u1EA8\\u1EAA\\u1EAC\\u1EAE\\u1EB0\\u1EB2\\u1EB4\\u1EB6\\u1EB8\\u1EBA\\u1EBC\\u1EBE\\u1EC0\\u1EC2\\u1EC4\\u1EC6\\u1EC8\\u1ECA\\u1ECC\\u1ECE\\u1ED0\\u1ED2\\u1ED4\\u1ED6\\u1ED8\\u1EDA\\u1EDC\\u1EDE\\u1EE0\\u1EE2\\u1EE4\\u1EE6\\u1EE8\\u1EEA\\u1EEC\\u1EEE\\u1EF0\\u1EF2\\u1EF4\\u1EF6\\u1EF8\\u1EFA\\u1EFC\\u1EFE\\u1F08-\\u1F0F\\u1F18-\\u1F1D\\u1F28-\\u1F2F\\u1F38-\\u1F3F\\u1F48-\\u1F4D\\u1F59\\u1F5B\\u1F5D\\u1F5F\\u1F68-\\u1F6F\\u1FB8-\\u1FBB\\u1FC8-\\u1FCB\\u1FD8-\\u1FDB\\u1FE8-\\u1FEC\\u1FF8-\\u1FFB\\u2102\\u2107\\u210B-\\u210D\\u2110-\\u2112\\u2115\\u2119-\\u211D\\u2124\\u2126\\u2128\\u212A-\\u212D\\u2130-\\u2133\\u213E-\\u213F\\u2145\\u2183\\u2C00-\\u2C2E\\u2C60\\u2C62-\\u2C64\\u2C67\\u2C69\\u2C6B\\u2C6D-\\u2C70\\u2C72\\u2C75\\u2C7E-\\u2C80\\u2C82\\u2C84\\u2C86\\u2C88\\u2C8A\\u2C8C\\u2C8E\\u2C90\\u2C92\\u2C94\\u2C96\\u2C98\\u2C9A\\u2C9C\\u2C9E\\u2CA0\\u2CA2\\u2CA4\\u2CA6\\u2CA8\\u2CAA\\u2CAC\\u2CAE\\u2CB0\\u2CB2\\u2CB4\\u2CB6\\u2CB8\\u2CBA\\u2CBC\\u2CBE\\u2CC0\\u2CC2\\u2CC4\\u2CC6\\u2CC8\\u2CCA\\u2CCC\\u2CCE\\u2CD0\\u2CD2\\u2CD4\\u2CD6\\u2CD8\\u2CDA\\u2CDC\\u2CDE\\u2CE0\\u2CE2\\u2CEB\\u2CED\\u2CF2\\uA640\\uA642\\uA644\\uA646\\uA648\\uA64A\\uA64C\\uA64E\\uA650\\uA652\\uA654\\uA656\\uA658\\uA65A\\uA65C\\uA65E\\uA660\\uA662\\uA664\\uA666\\uA668\\uA66A\\uA66C\\uA680\\uA682\\uA684\\uA686\\uA688\\uA68A\\uA68C\\uA68E\\uA690\\uA692\\uA694\\uA696\\uA698\\uA69A\\uA722\\uA724\\uA726\\uA728\\uA72A\\uA72C\\uA72E\\uA732\\uA734\\uA736\\uA738\\uA73A\\uA73C\\uA73E\\uA740\\uA742\\uA744\\uA746\\uA748\\uA74A\\uA74C\\uA74E\\uA750\\uA752\\uA754\\uA756\\uA758\\uA75A\\uA75C\\uA75E\\uA760\\uA762\\uA764\\uA766\\uA768\\uA76A\\uA76C\\uA76E\\uA779\\uA77B\\uA77D-\\uA77E\\uA780\\uA782\\uA784\\uA786\\uA78B\\uA78D\\uA790\\uA792\\uA796\\uA798\\uA79A\\uA79C\\uA79E\\uA7A0\\uA7A2\\uA7A4\\uA7A6\\uA7A8\\uA7AA-\\uA7AE\\uA7B0-\\uA7B4\\uA7B6\\uA7B8\\uFF21-\\uFF3A]",
 				chars:      []rune{'Ā', 'Ă', 'Ą', 'Ć', 'Ĉ', 'Ċ', 'Č', 'Ď', 'Đ', 'Ē', 'Ĕ', 'Ė', 'Ę', 'Ě', 'Ĝ', 'Ğ', 'Ġ', 'Ģ', 'Ĥ', 'Ħ', 'Ĩ', 'Ī', 'Ĭ', 'Į', 'İ', 'IJ', 'Ĵ', 'Ķ', 'Ĺ', 'Ļ', 'Ľ', 'Ŀ', 'Ł', 'Ń', 'Ņ', 'Ň', 'Ŋ', 'Ō', 'Ŏ', 'Ő', 'Œ', 'Ŕ', 'Ŗ', 'Ř', 'Ś', 'Ŝ', 'Ş', 'Š', 'Ţ', 'Ť', 'Ŧ', 'Ũ', 'Ū', 'Ŭ', 'Ů', 'Ű', 'Ų', 'Ŵ', 'Ŷ', 'Ż', 'Ž', 'Ƅ', 'Ƣ', 'Ƥ', 'Ʃ', 'Ƭ', 'Ƶ', 'Ƽ', 'DŽ', 'LJ', 'NJ', 'Ǎ', 'Ǐ', 'Ǒ', 'Ǔ', 'Ǖ', 'Ǘ', 'Ǚ', 'Ǜ', 'Ǟ', 'Ǡ', 'Ǣ', 'Ǥ', 'Ǧ', 'Ǩ', 'Ǫ', 'Ǭ', 'Ǯ', 'DZ', 'Ǵ', 'Ǻ', 'Ǽ', 'Ǿ', 'Ȁ', 'Ȃ', 'Ȅ', 'Ȇ', 'Ȉ', 'Ȋ', 'Ȍ', 'Ȏ', 'Ȑ', 'Ȓ', 'Ȕ', 'Ȗ', 'Ș', 'Ț', 'Ȝ', 'Ȟ', 'Ƞ', 'Ȣ', 'Ȥ', 'Ȧ', 'Ȩ', 'Ȫ', 'Ȭ', 'Ȯ', 'Ȱ', 'Ȳ', 'Ɂ', 'Ɉ', 'Ɋ', 'Ɍ', 'Ɏ', 'Ͱ', 'Ͳ', 'Ͷ', 'Ϳ', 'Ά', 'Ό', 'Ϗ', 'Ϙ', 'Ϛ', 'Ϝ', 'Ϟ', 'Ϡ', 'Ϣ', 'Ϥ', 'Ϧ', 'Ϩ', 'Ϫ', 'Ϭ', 'Ϯ', 'ϴ', 'Ϸ', 'Ѡ', 'Ѣ', 'Ѥ', 'Ѧ', 'Ѩ', 'Ѫ', 'Ѭ', 'Ѯ', 'Ѱ', 'Ѳ', 'Ѵ', 'Ѷ', 'Ѹ', 'Ѻ', 'Ѽ', 'Ѿ', 'Ҁ', 'Ҋ', 'Ҍ', 'Ҏ', 'Ґ', 'Ғ', 'Ҕ', 'Җ', 'Ҙ', 'Қ', 'Ҝ', 'Ҟ', 'Ҡ', 'Ң', 'Ҥ', 'Ҧ', 'Ҩ', 'Ҫ', 'Ҭ', 'Ү', 'Ұ', 'Ҳ', 'Ҵ', 'Ҷ', 'Ҹ', 'Һ', 'Ҽ', 'Ҿ', 'Ӄ', 'Ӆ', 'Ӈ', 'Ӊ', 'Ӌ', 'Ӎ', 'Ӑ', 'Ӓ', 'Ӕ', 'Ӗ', 'Ә', 'Ӛ', 'Ӝ', 'Ӟ', 'Ӡ', 'Ӣ', 'Ӥ', 'Ӧ', 'Ө', 'Ӫ', 'Ӭ', 'Ӯ', 'Ӱ', 'Ӳ', 'Ӵ', 'Ӷ', 'Ӹ', 'Ӻ', 'Ӽ', 'Ӿ', 'Ԁ', 'Ԃ', 'Ԅ', 'Ԇ', 'Ԉ', 'Ԋ', 'Ԍ', 'Ԏ', 'Ԑ', 'Ԓ', 'Ԕ', 'Ԗ', 'Ԙ', 'Ԛ', 'Ԝ', 'Ԟ', 'Ԡ', 'Ԣ', 'Ԥ', 'Ԧ', 'Ԩ', 'Ԫ', 'Ԭ', 'Ԯ', 'Ⴧ', 'Ⴭ', 'Ḁ', 'Ḃ', 'Ḅ', 'Ḇ', 'Ḉ', 'Ḋ', 'Ḍ', 'Ḏ', 'Ḑ', 'Ḓ', 'Ḕ', 'Ḗ', 'Ḙ', 'Ḛ', 'Ḝ', 'Ḟ', 'Ḡ', 'Ḣ', 'Ḥ', 'Ḧ', 'Ḩ', 'Ḫ', 'Ḭ', 'Ḯ', 'Ḱ', 'Ḳ', 'Ḵ', 'Ḷ', 'Ḹ', 'Ḻ', 'Ḽ', 'Ḿ', 'Ṁ', 'Ṃ', 'Ṅ', 'Ṇ', 'Ṉ', 'Ṋ', 'Ṍ', 'Ṏ', 'Ṑ', 'Ṓ', 'Ṕ', 'Ṗ', 'Ṙ', 'Ṛ', 'Ṝ', 'Ṟ', 'Ṡ', 'Ṣ', 'Ṥ', 'Ṧ', 'Ṩ', 'Ṫ', 'Ṭ', 'Ṯ', 'Ṱ', 'Ṳ', 'Ṵ', 'Ṷ', 'Ṹ', 'Ṻ', 'Ṽ', 'Ṿ', 'Ẁ', 'Ẃ', 'Ẅ', 'Ẇ', 'Ẉ', 'Ẋ', 'Ẍ', 'Ẏ', 'Ẑ', 'Ẓ', 'Ẕ', 'ẞ', 'Ạ', 'Ả', 'Ấ', 'Ầ', 'Ẩ', 'Ẫ', 'Ậ', 'Ắ', 'Ằ', 'Ẳ', 'Ẵ', 'Ặ', 'Ẹ', 'Ẻ', 'Ẽ', 'Ế', 'Ề', 'Ể', 'Ễ', 'Ệ', 'Ỉ', 'Ị', 'Ọ', 'Ỏ', 'Ố', 'Ồ', 'Ổ', 'Ỗ', 'Ộ', 'Ớ', 'Ờ', 'Ở', 'Ỡ', 'Ợ', 'Ụ', 'Ủ', 'Ứ', 'Ừ', 'Ử', 'Ữ', 'Ự', 'Ỳ', 'Ỵ', 'Ỷ', 'Ỹ', 'Ỻ', 'Ỽ', 'Ỿ', 'Ὑ', 'Ὓ', 'Ὕ', 'Ὗ', 'ℂ', 'ℇ', 'ℕ', 'ℤ', 'Ω', 'ℨ', 'ⅅ', 'Ↄ', 'Ⱡ', 'Ⱨ', 'Ⱪ', 'Ⱬ', 'Ⱳ', 'Ⱶ', 'Ⲃ', 'Ⲅ', 'Ⲇ', 'Ⲉ', 'Ⲋ', 'Ⲍ', 'Ⲏ', 'Ⲑ', 'Ⲓ', 'Ⲕ', 'Ⲗ', 'Ⲙ', 'Ⲛ', 'Ⲝ', 'Ⲟ', 'Ⲡ', 'Ⲣ', 'Ⲥ', 'Ⲧ', 'Ⲩ', 'Ⲫ', 'Ⲭ', 'Ⲯ', 'Ⲱ', 'Ⲳ', 'Ⲵ', 'Ⲷ', 'Ⲹ', 'Ⲻ', 'Ⲽ', 'Ⲿ', 'Ⳁ', 'Ⳃ', 'Ⳅ', 'Ⳇ', 'Ⳉ', 'Ⳋ', 'Ⳍ', 'Ⳏ', 'Ⳑ', 'Ⳓ', 'Ⳕ', 'Ⳗ', 'Ⳙ', 'Ⳛ', 'Ⳝ', 'Ⳟ', 'Ⳡ', 'Ⳣ', 'Ⳬ', 'Ⳮ', 'Ⳳ', 'Ꙁ', 'Ꙃ', 'Ꙅ', 'Ꙇ', 'Ꙉ', 'Ꙋ', 'Ꙍ', 'Ꙏ', 'Ꙑ', 'Ꙓ', 'Ꙕ', 'Ꙗ', 'Ꙙ', 'Ꙛ', 'Ꙝ', 'Ꙟ', 'Ꙡ', 'Ꙣ', 'Ꙥ', 'Ꙧ', 'Ꙩ', 'Ꙫ', 'Ꙭ', 'Ꚁ', 'Ꚃ', 'Ꚅ', 'Ꚇ', 'Ꚉ', 'Ꚋ', 'Ꚍ', 'Ꚏ', 'Ꚑ', 'Ꚓ', 'Ꚕ', 'Ꚗ', 'Ꚙ', 'Ꚛ', 'Ꜣ', 'Ꜥ', 'Ꜧ', 'Ꜩ', 'Ꜫ', 'Ꜭ', 'Ꜯ', 'Ꜳ', 'Ꜵ', 'Ꜷ', 'Ꜹ', 'Ꜻ', 'Ꜽ', 'Ꜿ', 'Ꝁ', 'Ꝃ', 'Ꝅ', 'Ꝇ', 'Ꝉ', 'Ꝋ', 'Ꝍ', 'Ꝏ', 'Ꝑ', 'Ꝓ', 'Ꝕ', 'Ꝗ', 'Ꝙ', 'Ꝛ', 'Ꝝ', 'Ꝟ', 'Ꝡ', 'Ꝣ', 'Ꝥ', 'Ꝧ', 'Ꝩ', 'Ꝫ', 'Ꝭ', 'Ꝯ', 'Ꝺ', 'Ꝼ', 'Ꞁ', 'Ꞃ', 'Ꞅ', 'Ꞇ', 'Ꞌ', 'Ɥ', 'Ꞑ', 'Ꞓ', 'Ꞗ', 'Ꞙ', 'Ꞛ', 'Ꞝ', 'Ꞟ', 'Ꞡ', 'Ꞣ', 'Ꞥ', 'Ꞧ', 'Ꞩ', 'Ꞷ', 'Ꞹ'},
 				ranges:     []rune{'A', 'Z', 'À', 'Ö', 'Ø', 'Þ', 'Ÿ', 'Ź', 'Ɓ', 'Ƃ', 'Ɔ', 'Ƈ', 'Ɖ', 'Ƌ', 'Ǝ', 'Ƒ', 'Ɠ', 'Ɣ', 'Ɩ', 'Ƙ', 'Ɯ', 'Ɲ', 'Ɵ', 'Ơ', 'Ʀ', 'Ƨ', 'Ʈ', 'Ư', 'Ʊ', 'Ƴ', 'Ʒ', 'Ƹ', 'Ƕ', 'Ǹ', 'Ⱥ', 'Ȼ', 'Ƚ', 'Ⱦ', 'Ƀ', 'Ɇ', 'Έ', 'Ί', 'Ύ', 'Ώ', 'Α', 'Ρ', 'Σ', 'Ϋ', 'ϒ', 'ϔ', 'Ϲ', 'Ϻ', 'Ͻ', 'Я', 'Ӏ', 'Ӂ', 'Ա', 'Ֆ', 'Ⴀ', 'Ⴥ', 'Ꭰ', 'Ᏽ', 'Ა', 'Ჺ', 'Ჽ', 'Ჿ', 'Ἀ', 'Ἇ', 'Ἐ', 'Ἕ', 'Ἠ', 'Ἧ', 'Ἰ', 'Ἷ', 'Ὀ', 'Ὅ', 'Ὠ', 'Ὧ', 'Ᾰ', 'Ά', 'Ὲ', 'Ή', 'Ῐ', 'Ί', 'Ῠ', 'Ῥ', 'Ὸ', 'Ώ', 'ℋ', 'ℍ', 'ℐ', 'ℒ', 'ℙ', 'ℝ', 'K', 'ℭ', 'ℰ', 'ℳ', 'ℾ', 'ℿ', 'Ⰰ', 'Ⱞ', 'Ɫ', 'Ɽ', 'Ɑ', 'Ɒ', 'Ȿ', 'Ⲁ', 'Ᵹ', 'Ꝿ', 'Ɦ', 'Ɪ', 'Ʞ', 'Ꞵ', 'Ａ', 'Ｚ'},
@@ -12304,9 +12279,9 @@ var g = &grammar{
 		},
 		{
 			name: "Mc",
-			pos:  position{line: 1496, col: 1, offset: 52419},
+			pos:  position{line: 1490, col: 1, offset: 52290},
 			expr: &charClassMatcher{
-				pos:        position{line: 1496, col: 6, offset: 52424},
+				pos:        position{line: 1490, col: 6, offset: 52295},
 				val:        "[\\u0903\\u093B\\u093E-\\u0940\\u0949-\\u094C\\u094E-\\u094F\\u0982-\\u0983\\u09BE-\\u09C0\\u09C7-\\u09C8\\u09CB-\\u09CC\\u09D7\\u0A03\\u0A3E-\\u0A40\\u0A83\\u0ABE-\\u0AC0\\u0AC9\\u0ACB-\\u0ACC\\u0B02-\\u0B03\\u0B3E\\u0B40\\u0B47-\\u0B48\\u0B4B-\\u0B4C\\u0B57\\u0BBE-\\u0BBF\\u0BC1-\\u0BC2\\u0BC6-\\u0BC8\\u0BCA-\\u0BCC\\u0BD7\\u0C01-\\u0C03\\u0C41-\\u0C44\\u0C82-\\u0C83\\u0CBE\\u0CC0-\\u0CC4\\u0CC7-\\u0CC8\\u0CCA-\\u0CCB\\u0CD5-\\u0CD6\\u0D02-\\u0D03\\u0D3E-\\u0D40\\u0D46-\\u0D48\\u0D4A-\\u0D4C\\u0D57\\u0D82-\\u0D83\\u0DCF-\\u0DD1\\u0DD8-\\u0DDF\\u0DF2-\\u0DF3\\u0F3E-\\u0F3F\\u0F7F\\u102B-\\u102C\\u1031\\u1038\\u103B-\\u103C\\u1056-\\u1057\\u1062-\\u1064\\u1067-\\u106D\\u1083-\\u1084\\u1087-\\u108C\\u108F\\u109A-\\u109C\\u17B6\\u17BE-\\u17C5\\u17C7-\\u17C8\\u1923-\\u1926\\u1929-\\u192B\\u1930-\\u1931\\u1933-\\u1938\\u1A19-\\u1A1A\\u1A55\\u1A57\\u1A61\\u1A63-\\u1A64\\u1A6D-\\u1A72\\u1B04\\u1B35\\u1B3B\\u1B3D-\\u1B41\\u1B43-\\u1B44\\u1B82\\u1BA1\\u1BA6-\\u1BA7\\u1BAA\\u1BE7\\u1BEA-\\u1BEC\\u1BEE\\u1BF2-\\u1BF3\\u1C24-\\u1C2B\\u1C34-\\u1C35\\u1CE1\\u1CF2-\\u1CF3\\u1CF7\\u302E-\\u302F\\uA823-\\uA824\\uA827\\uA880-\\uA881\\uA8B4-\\uA8C3\\uA952-\\uA953\\uA983\\uA9B4-\\uA9B5\\uA9BA-\\uA9BB\\uA9BD-\\uA9C0\\uAA2F-\\uAA30\\uAA33-\\uAA34\\uAA4D\\uAA7B\\uAA7D\\uAAEB\\uAAEE-\\uAAEF\\uAAF5\\uABE3-\\uABE4\\uABE6-\\uABE7\\uABE9-\\uABEA\\uABEC]",
 				chars:      []rune{'ः', 'ऻ', 'ৗ', 'ਃ', 'ઃ', 'ૉ', 'ା', 'ୀ', 'ୗ', 'ௗ', 'ಾ', 'ൗ', 'ཿ', 'ေ', 'း', 'ႏ', 'ា', 'ᩕ', 'ᩗ', 'ᩡ', 'ᬄ', 'ᬵ', 'ᬻ', 'ᮂ', 'ᮡ', '᮪', 'ᯧ', 'ᯮ', '᳡', '᳷', 'ꠧ', 'ꦃ', 'ꩍ', 'ꩻ', 'ꩽ', 'ꫫ', 'ꫵ', '꯬'},
 				ranges:     []rune{'ा', 'ी', 'ॉ', 'ौ', 'ॎ', 'ॏ', 'ং', 'ঃ', 'া', 'ী', 'ে', 'ৈ', 'ো', 'ৌ', 'ਾ', 'ੀ', 'ા', 'ી', 'ો', 'ૌ', 'ଂ', 'ଃ', 'େ', 'ୈ', 'ୋ', 'ୌ', 'ா', 'ி', 'ு', 'ூ', 'ெ', 'ை', 'ொ', 'ௌ', 'ఁ', 'ః', 'ు', 'ౄ', 'ಂ', 'ಃ', 'ೀ', 'ೄ', 'ೇ', 'ೈ', 'ೊ', 'ೋ', 'ೕ', 'ೖ', 'ം', 'ഃ', 'ാ', 'ീ', 'െ', 'ൈ', 'ൊ', 'ൌ', 'ං', 'ඃ', 'ා', 'ෑ', 'ෘ', 'ෟ', 'ෲ', 'ෳ', '༾', '༿', 'ါ', 'ာ', 'ျ', 'ြ', 'ၖ', 'ၗ', 'ၢ', 'ၤ', 'ၧ', 'ၭ', 'ႃ', 'ႄ', 'ႇ', 'ႌ', 'ႚ', 'ႜ', 'ើ', 'ៅ', 'ះ', 'ៈ', 'ᤣ', 'ᤦ', 'ᤩ', 'ᤫ', 'ᤰ', 'ᤱ', 'ᤳ', 'ᤸ', 'ᨙ', 'ᨚ', 'ᩣ', 'ᩤ', 'ᩭ', 'ᩲ', 'ᬽ', 'ᭁ', 'ᭃ', '᭄', 'ᮦ', 'ᮧ', 'ᯪ', 'ᯬ', '᯲', '᯳', 'ᰤ', 'ᰫ', 'ᰴ', 'ᰵ', 'ᳲ', 'ᳳ', '〮', '〯', 'ꠣ', 'ꠤ', 'ꢀ', 'ꢁ', 'ꢴ', 'ꣃ', 'ꥒ', '꥓', 'ꦴ', 'ꦵ', 'ꦺ', 'ꦻ', 'ꦽ', '꧀', 'ꨯ', 'ꨰ', 'ꨳ', 'ꨴ', 'ꫮ', 'ꫯ', 'ꯣ', 'ꯤ', 'ꯦ', 'ꯧ', 'ꯩ', 'ꯪ'},
@@ -12316,9 +12291,9 @@ var g = &grammar{
 		},
 		{
 			name: "Mn",
-			pos:  position{line: 1499, col: 1, offset: 53612},
+			pos:  position{line: 1493, col: 1, offset: 53483},
 			expr: &charClassMatcher{
-				pos:        position{line: 1499, col: 6, offset: 53617},
+				pos:        position{line: 1493, col: 6, offset: 53488},
 				val:        "[\\u0300-\\u036F\\u0483-\\u0487\\u0591-\\u05BD\\u05BF\\u05C1-\\u05C2\\u05C4-\\u05C5\\u05C7\\u0610-\\u061A\\u064B-\\u065F\\u0670\\u06D6-\\u06DC\\u06DF-\\u06E4\\u06E7-\\u06E8\\u06EA-\\u06ED\\u0711\\u0730-\\u074A\\u07A6-\\u07B0\\u07EB-\\u07F3\\u07FD\\u0816-\\u0819\\u081B-\\u0823\\u0825-\\u0827\\u0829-\\u082D\\u0859-\\u085B\\u08D3-\\u08E1\\u08E3-\\u0902\\u093A\\u093C\\u0941-\\u0948\\u094D\\u0951-\\u0957\\u0962-\\u0963\\u0981\\u09BC\\u09C1-\\u09C4\\u09CD\\u09E2-\\u09E3\\u09FE\\u0A01-\\u0A02\\u0A3C\\u0A41-\\u0A42\\u0A47-\\u0A48\\u0A4B-\\u0A4D\\u0A51\\u0A70-\\u0A71\\u0A75\\u0A81-\\u0A82\\u0ABC\\u0AC1-\\u0AC5\\u0AC7-\\u0AC8\\u0ACD\\u0AE2-\\u0AE3\\u0AFA-\\u0AFF\\u0B01\\u0B3C\\u0B3F\\u0B41-\\u0B44\\u0B4D\\u0B56\\u0B62-\\u0B63\\u0B82\\u0BC0\\u0BCD\\u0C00\\u0C04\\u0C3E-\\u0C40\\u0C46-\\u0C48\\u0C4A-\\u0C4D\\u0C55-\\u0C56\\u0C62-\\u0C63\\u0C81\\u0CBC\\u0CBF\\u0CC6\\u0CCC-\\u0CCD\\u0CE2-\\u0CE3\\u0D00-\\u0D01\\u0D3B-\\u0D3C\\u0D41-\\u0D44\\u0D4D\\u0D62-\\u0D63\\u0DCA\\u0DD2-\\u0DD4\\u0DD6\\u0E31\\u0E34-\\u0E3A\\u0E47-\\u0E4E\\u0EB1\\u0EB4-\\u0EB9\\u0EBB-\\u0EBC\\u0EC8-\\u0ECD\\u0F18-\\u0F19\\u0F35\\u0F37\\u0F39\\u0F71-\\u0F7E\\u0F80-\\u0F84\\u0F86-\\u0F87\\u0F8D-\\u0F97\\u0F99-\\u0FBC\\u0FC6\\u102D-\\u1030\\u1032-\\u1037\\u1039-\\u103A\\u103D-\\u103E\\u1058-\\u1059\\u105E-\\u1060\\u1071-\\u1074\\u1082\\u1085-\\u1086\\u108D\\u109D\\u135D-\\u135F\\u1712-\\u1714\\u1732-\\u1734\\u1752-\\u1753\\u1772-\\u1773\\u17B4-\\u17B5\\u17B7-\\u17BD\\u17C6\\u17C9-\\u17D3\\u17DD\\u180B-\\u180D\\u1885-\\u1886\\u18A9\\u1920-\\u1922\\u1927-\\u1928\\u1932\\u1939-\\u193B\\u1A17-\\u1A18\\u1A1B\\u1A56\\u1A58-\\u1A5E\\u1A60\\u1A62\\u1A65-\\u1A6C\\u1A73-\\u1A7C\\u1A7F\\u1AB0-\\u1ABD\\u1B00-\\u1B03\\u1B34\\u1B36-\\u1B3A\\u1B3C\\u1B42\\u1B6B-\\u1B73\\u1B80-\\u1B81\\u1BA2-\\u1BA5\\u1BA8-\\u1BA9\\u1BAB-\\u1BAD\\u1BE6\\u1BE8-\\u1BE9\\u1BED\\u1BEF-\\u1BF1\\u1C2C-\\u1C33\\u1C36-\\u1C37\\u1CD0-\\u1CD2\\u1CD4-\\u1CE0\\u1CE2-\\u1CE8\\u1CED\\u1CF4\\u1CF8-\\u1CF9\\u1DC0-\\u1DF9\\u1DFB-\\u1DFF\\u20D0-\\u20DC\\u20E1\\u20E5-\\u20F0\\u2CEF-\\u2CF1\\u2D7F\\u2DE0-\\u2DFF\\u302A-\\u302D\\u3099-\\u309A\\uA66F\\uA674-\\uA67D\\uA69E-\\uA69F\\uA6F0-\\uA6F1\\uA802\\uA806\\uA80B\\uA825-\\uA826\\uA8C4-\\uA8C5\\uA8E0-\\uA8F1\\uA8FF\\uA926-\\uA92D\\uA947-\\uA951\\uA980-\\uA982\\uA9B3\\uA9B6-\\uA9B9\\uA9BC\\uA9E5\\uAA29-\\uAA2E\\uAA31-\\uAA32\\uAA35-\\uAA36\\uAA43\\uAA4C\\uAA7C\\uAAB0\\uAAB2-\\uAAB4\\uAAB7-\\uAAB8\\uAABE-\\uAABF\\uAAC1\\uAAEC-\\uAAED\\uAAF6\\uABE5\\uABE8\\uABED\\uFB1E\\uFE00-\\uFE0F\\uFE20-\\uFE2F]",
 				chars:      []rune{'ֿ', 'ׇ', 'ٰ', 'ܑ', '߽', 'ऺ', '़', '्', 'ঁ', '়', '্', '৾', '਼', 'ੑ', 'ੵ', '઼', '્', 'ଁ', '଼', 'ି', '୍', 'ୖ', 'ஂ', 'ீ', '்', 'ఀ', 'ఄ', 'ಁ', '಼', 'ಿ', 'ೆ', '്', '්', 'ූ', 'ั', 'ັ', '༵', '༷', '༹', '࿆', 'ႂ', 'ႍ', 'ႝ', 'ំ', '៝', 'ᢩ', 'ᤲ', 'ᨛ', 'ᩖ', '᩠', 'ᩢ', '᩿', '᬴', 'ᬼ', 'ᭂ', '᯦', 'ᯭ', '᳭', '᳴', '⃡', '⵿', '꙯', 'ꠂ', '꠆', 'ꠋ', 'ꣿ', '꦳', 'ꦼ', 'ꧥ', 'ꩃ', 'ꩌ', 'ꩼ', 'ꪰ', '꫁', '꫶', 'ꯥ', 'ꯨ', '꯭', 'ﬞ'},
 				ranges:     []rune{'̀', 'ͯ', '҃', '҇', '֑', 'ֽ', 'ׁ', 'ׂ', 'ׄ', 'ׅ', 'ؐ', 'ؚ', 'ً', 'ٟ', 'ۖ', 'ۜ', '۟', 'ۤ', 'ۧ', 'ۨ', '۪', 'ۭ', 'ܰ', '݊', 'ަ', 'ް', '߫', '߳', 'ࠖ', '࠙', 'ࠛ', 'ࠣ', 'ࠥ', 'ࠧ', 'ࠩ', '࠭', '࡙', '࡛', '࣓', '࣡', 'ࣣ', 'ं', 'ु', 'ै', '॑', 'ॗ', 'ॢ', 'ॣ', 'ু', 'ৄ', 'ৢ', 'ৣ', 'ਁ', 'ਂ', 'ੁ', 'ੂ', 'ੇ', 'ੈ', 'ੋ', '੍', 'ੰ', 'ੱ', 'ઁ', 'ં', 'ુ', 'ૅ', 'ે', 'ૈ', 'ૢ', 'ૣ', 'ૺ', '૿', 'ୁ', 'ୄ', 'ୢ', 'ୣ', 'ా', 'ీ', 'ె', 'ై', 'ొ', '్', 'ౕ', 'ౖ', 'ౢ', 'ౣ', 'ೌ', '್', 'ೢ', 'ೣ', 'ഀ', 'ഁ', '഻', '഼', 'ു', 'ൄ', 'ൢ', 'ൣ', 'ි', 'ු', 'ิ', 'ฺ', '็', '๎', 'ິ', 'ູ', 'ົ', 'ຼ', '່', 'ໍ', '༘', '༙', 'ཱ', 'ཾ', 'ྀ', '྄', '྆', '྇', 'ྍ', 'ྗ', 'ྙ', 'ྼ', 'ိ', 'ူ', 'ဲ', '့', '္', '်', 'ွ', 'ှ', 'ၘ', 'ၙ', 'ၞ', 'ၠ', 'ၱ', 'ၴ', 'ႅ', 'ႆ', '፝', '፟', 'ᜒ', '᜔', 'ᜲ', '᜴', 'ᝒ', 'ᝓ', 'ᝲ', 'ᝳ', '឴', '឵', 'ិ', 'ួ', '៉', '៓', '᠋', '᠍', 'ᢅ', 'ᢆ', 'ᤠ', 'ᤢ', 'ᤧ', 'ᤨ', '᤹', '᤻', 'ᨗ', 'ᨘ', 'ᩘ', 'ᩞ', 'ᩥ', 'ᩬ', 'ᩳ', '᩼', '᪰', '᪽', 'ᬀ', 'ᬃ', 'ᬶ', 'ᬺ', '᭫', '᭳', 'ᮀ', 'ᮁ', 'ᮢ', 'ᮥ', 'ᮨ', 'ᮩ', '᮫', 'ᮭ', 'ᯨ', 'ᯩ', 'ᯯ', 'ᯱ', 'ᰬ', 'ᰳ', 'ᰶ', '᰷', '᳐', '᳒', '᳔', '᳠', '᳢', '᳨', '᳸', '᳹', '᷀', '᷹', '᷻', '᷿', '⃐', '⃜', '⃥', '⃰', '⳯', '⳱', 'ⷠ', 'ⷿ', '〪', '〭', '゙', '゚', 'ꙴ', '꙽', 'ꚞ', 'ꚟ', '꛰', '꛱', 'ꠥ', 'ꠦ', '꣄', 'ꣅ', '꣠', '꣱', 'ꤦ', '꤭', 'ꥇ', 'ꥑ', 'ꦀ', 'ꦂ', 'ꦶ', 'ꦹ', 'ꨩ', 'ꨮ', 'ꨱ', 'ꨲ', 'ꨵ', 'ꨶ', 'ꪲ', 'ꪴ', 'ꪷ', 'ꪸ', 'ꪾ', '꪿', 'ꫬ', 'ꫭ', '︀', '️', '︠', '︯'},
@@ -12328,9 +12303,9 @@ var g = &grammar{
 		},
 		{
 			name: "Nd",
-			pos:  position{line: 1502, col: 1, offset: 55797},
+			pos:  position{line: 1496, col: 1, offset: 55668},
 			expr: &charClassMatcher{
-				pos:        position{line: 1502, col: 6, offset: 55802},
+				pos:        position{line: 1496, col: 6, offset: 55673},
 				val:        "[\\u0030-\\u0039\\u0660-\\u0669\\u06F0-\\u06F9\\u07C0-\\u07C9\\u0966-\\u096F\\u09E6-\\u09EF\\u0A66-\\u0A6F\\u0AE6-\\u0AEF\\u0B66-\\u0B6F\\u0BE6-\\u0BEF\\u0C66-\\u0C6F\\u0CE6-\\u0CEF\\u0D66-\\u0D6F\\u0DE6-\\u0DEF\\u0E50-\\u0E59\\u0ED0-\\u0ED9\\u0F20-\\u0F29\\u1040-\\u1049\\u1090-\\u1099\\u17E0-\\u17E9\\u1810-\\u1819\\u1946-\\u194F\\u19D0-\\u19D9\\u1A80-\\u1A89\\u1A90-\\u1A99\\u1B50-\\u1B59\\u1BB0-\\u1BB9\\u1C40-\\u1C49\\u1C50-\\u1C59\\uA620-\\uA629\\uA8D0-\\uA8D9\\uA900-\\uA909\\uA9D0-\\uA9D9\\uA9F0-\\uA9F9\\uAA50-\\uAA59\\uABF0-\\uABF9\\uFF10-\\uFF19]",
 				ranges:     []rune{'0', '9', '٠', '٩', '۰', '۹', '߀', '߉', '०', '९', '০', '৯', '੦', '੯', '૦', '૯', '୦', '୯', '௦', '௯', '౦', '౯', '೦', '೯', '൦', '൯', '෦', '෯', '๐', '๙', '໐', '໙', '༠', '༩', '၀', '၉', '႐', '႙', '០', '៩', '᠐', '᠙', '᥆', '᥏', '᧐', '᧙', '᪀', '᪉', '᪐', '᪙', '᭐', '᭙', '᮰', '᮹', '᱀', '᱉', '᱐', '᱙', '꘠', '꘩', '꣐', '꣙', '꤀', '꤉', '꧐', '꧙', '꧰', '꧹', '꩐', '꩙', '꯰', '꯹', '０', '９'},
 				ignoreCase: false,
@@ -12339,9 +12314,9 @@ var g = &grammar{
 		},
 		{
 			name: "Nl",
-			pos:  position{line: 1505, col: 1, offset: 56305},
+			pos:  position{line: 1499, col: 1, offset: 56176},
 			expr: &charClassMatcher{
-				pos:        position{line: 1505, col: 6, offset: 56310},
+				pos:        position{line: 1499, col: 6, offset: 56181},
 				val:        "[\\u16EE-\\u16F0\\u2160-\\u2182\\u2185-\\u2188\\u3007\\u3021-\\u3029\\u3038-\\u303A\\uA6E6-\\uA6EF]",
 				chars:      []rune{'〇'},
 				ranges:     []rune{'ᛮ', 'ᛰ', 'Ⅰ', 'ↂ', 'ↅ', 'ↈ', '〡', '〩', '〸', '〺', 'ꛦ', 'ꛯ'},
@@ -12351,9 +12326,9 @@ var g = &grammar{
 		},
 		{
 			name: "Pc",
-			pos:  position{line: 1508, col: 1, offset: 56424},
+			pos:  position{line: 1502, col: 1, offset: 56295},
 			expr: &charClassMatcher{
-				pos:        position{line: 1508, col: 6, offset: 56429},
+				pos:        position{line: 1502, col: 6, offset: 56300},
 				val:        "[\\u005F\\u203F-\\u2040\\u2054\\uFE33-\\uFE34\\uFE4D-\\uFE4F\\uFF3F]",
 				chars:      []rune{'_', '⁔', '＿'},
 				ranges:     []rune{'‿', '⁀', '︳', '︴', '﹍', '﹏'},
@@ -12363,9 +12338,9 @@ var g = &grammar{
 		},
 		{
 			name: "Zs",
-			pos:  position{line: 1511, col: 1, offset: 56510},
+			pos:  position{line: 1505, col: 1, offset: 56381},
 			expr: &charClassMatcher{
-				pos:        position{line: 1511, col: 6, offset: 56515},
+				pos:        position{line: 1505, col: 6, offset: 56386},
 				val:        "[\\u0020\\u00A0\\u1680\\u2000-\\u200A\\u202F\\u205F\\u3000]",
 				chars:      []rune{' ', '\u00a0', '\u1680', '\u202f', '\u205f', '\u3000'},
 				ranges:     []rune{'\u2000', '\u200a'},
@@ -12375,50 +12350,50 @@ var g = &grammar{
 		},
 		{
 			name: "SourceCharacter",
-			pos:  position{line: 1513, col: 1, offset: 56568},
+			pos:  position{line: 1507, col: 1, offset: 56439},
 			expr: &anyMatcher{
-				line: 1514, col: 5, offset: 56588,
+				line: 1508, col: 5, offset: 56459,
 			},
 		},
 		{
 			name:        "WhiteSpace",
 			displayName: "\"whitespace\"",
-			pos:         position{line: 1516, col: 1, offset: 56591},
+			pos:         position{line: 1510, col: 1, offset: 56462},
 			expr: &choiceExpr{
-				pos: position{line: 1517, col: 5, offset: 56619},
+				pos: position{line: 1511, col: 5, offset: 56490},
 				alternatives: []interface{}{
 					&litMatcher{
-						pos:        position{line: 1517, col: 5, offset: 56619},
+						pos:        position{line: 1511, col: 5, offset: 56490},
 						val:        "\t",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1518, col: 5, offset: 56628},
+						pos:        position{line: 1512, col: 5, offset: 56499},
 						val:        "\v",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1519, col: 5, offset: 56637},
+						pos:        position{line: 1513, col: 5, offset: 56508},
 						val:        "\f",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1520, col: 5, offset: 56646},
+						pos:        position{line: 1514, col: 5, offset: 56517},
 						val:        " ",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1521, col: 5, offset: 56654},
+						pos:        position{line: 1515, col: 5, offset: 56525},
 						val:        "\u00a0",
 						ignoreCase: false,
 					},
 					&litMatcher{
-						pos:        position{line: 1522, col: 5, offset: 56667},
+						pos:        position{line: 1516, col: 5, offset: 56538},
 						val:        "\ufeff",
 						ignoreCase: false,
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1523, col: 5, offset: 56680},
+						pos:  position{line: 1517, col: 5, offset: 56551},
 						name: "Zs",
 					},
 				},
@@ -12426,9 +12401,9 @@ var g = &grammar{
 		},
 		{
 			name: "LineTerminator",
-			pos:  position{line: 1525, col: 1, offset: 56684},
+			pos:  position{line: 1519, col: 1, offset: 56555},
 			expr: &charClassMatcher{
-				pos:        position{line: 1526, col: 5, offset: 56703},
+				pos:        position{line: 1520, col: 5, offset: 56574},
 				val:        "[\\n\\r\\u2028\\u2029]",
 				chars:      []rune{'\n', '\r', '\u2028', '\u2029'},
 				ignoreCase: false,
@@ -12438,45 +12413,45 @@ var g = &grammar{
 		{
 			name:        "Comment",
 			displayName: "\"comment\"",
-			pos:         position{line: 1532, col: 1, offset: 57033},
+			pos:         position{line: 1526, col: 1, offset: 56904},
 			expr: &ruleRefExpr{
-				pos:  position{line: 1535, col: 5, offset: 57104},
+				pos:  position{line: 1529, col: 5, offset: 56975},
 				name: "SingleLineComment",
 			},
 		},
 		{
 			name: "MultiLineComment",
-			pos:  position{line: 1537, col: 1, offset: 57123},
+			pos:  position{line: 1531, col: 1, offset: 56994},
 			expr: &seqExpr{
-				pos: position{line: 1538, col: 5, offset: 57144},
+				pos: position{line: 1532, col: 5, offset: 57015},
 				exprs: []interface{}{
 					&litMatcher{
-						pos:        position{line: 1538, col: 5, offset: 57144},
+						pos:        position{line: 1532, col: 5, offset: 57015},
 						val:        "/*",
 						ignoreCase: false,
 					},
 					&zeroOrMoreExpr{
-						pos: position{line: 1538, col: 10, offset: 57149},
+						pos: position{line: 1532, col: 10, offset: 57020},
 						expr: &seqExpr{
-							pos: position{line: 1538, col: 11, offset: 57150},
+							pos: position{line: 1532, col: 11, offset: 57021},
 							exprs: []interface{}{
 								&notExpr{
-									pos: position{line: 1538, col: 11, offset: 57150},
+									pos: position{line: 1532, col: 11, offset: 57021},
 									expr: &litMatcher{
-										pos:        position{line: 1538, col: 12, offset: 57151},
+										pos:        position{line: 1532, col: 12, offset: 57022},
 										val:        "*/",
 										ignoreCase: false,
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1538, col: 17, offset: 57156},
+									pos:  position{line: 1532, col: 17, offset: 57027},
 									name: "SourceCharacter",
 								},
 							},
 						},
 					},
 					&litMatcher{
-						pos:        position{line: 1538, col: 35, offset: 57174},
+						pos:        position{line: 1532, col: 35, offset: 57045},
 						val:        "*/",
 						ignoreCase: false,
 					},
@@ -12485,29 +12460,29 @@ var g = &grammar{
 		},
 		{
 			name: "SingleLineComment",
-			pos:  position{line: 1540, col: 1, offset: 57180},
+			pos:  position{line: 1534, col: 1, offset: 57051},
 			expr: &seqExpr{
-				pos: position{line: 1541, col: 5, offset: 57202},
+				pos: position{line: 1535, col: 5, offset: 57073},
 				exprs: []interface{}{
 					&litMatcher{
-						pos:        position{line: 1541, col: 5, offset: 57202},
+						pos:        position{line: 1535, col: 5, offset: 57073},
 						val:        "//",
 						ignoreCase: false,
 					},
 					&zeroOrMoreExpr{
-						pos: position{line: 1541, col: 10, offset: 57207},
+						pos: position{line: 1535, col: 10, offset: 57078},
 						expr: &seqExpr{
-							pos: position{line: 1541, col: 11, offset: 57208},
+							pos: position{line: 1535, col: 11, offset: 57079},
 							exprs: []interface{}{
 								&notExpr{
-									pos: position{line: 1541, col: 11, offset: 57208},
+									pos: position{line: 1535, col: 11, offset: 57079},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1541, col: 12, offset: 57209},
+										pos:  position{line: 1535, col: 12, offset: 57080},
 										name: "LineTerminator",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1541, col: 27, offset: 57224},
+									pos:  position{line: 1535, col: 27, offset: 57095},
 									name: "SourceCharacter",
 								},
 							},
@@ -12518,19 +12493,19 @@ var g = &grammar{
 		},
 		{
 			name: "EOL",
-			pos:  position{line: 1543, col: 1, offset: 57243},
+			pos:  position{line: 1537, col: 1, offset: 57114},
 			expr: &seqExpr{
-				pos: position{line: 1543, col: 7, offset: 57249},
+				pos: position{line: 1537, col: 7, offset: 57120},
 				exprs: []interface{}{
 					&zeroOrMoreExpr{
-						pos: position{line: 1543, col: 7, offset: 57249},
+						pos: position{line: 1537, col: 7, offset: 57120},
 						expr: &ruleRefExpr{
-							pos:  position{line: 1543, col: 7, offset: 57249},
+							pos:  position{line: 1537, col: 7, offset: 57120},
 							name: "WhiteSpace",
 						},
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1543, col: 19, offset: 57261},
+						pos:  position{line: 1537, col: 19, offset: 57132},
 						name: "LineTerminator",
 					},
 				},
@@ -12538,16 +12513,16 @@ var g = &grammar{
 		},
 		{
 			name: "EOT",
-			pos:  position{line: 1545, col: 1, offset: 57277},
+			pos:  position{line: 1539, col: 1, offset: 57148},
 			expr: &choiceExpr{
-				pos: position{line: 1545, col: 7, offset: 57283},
+				pos: position{line: 1539, col: 7, offset: 57154},
 				alternatives: []interface{}{
 					&ruleRefExpr{
-						pos:  position{line: 1545, col: 7, offset: 57283},
+						pos:  position{line: 1539, col: 7, offset: 57154},
 						name: "_",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1545, col: 11, offset: 57287},
+						pos:  position{line: 1539, col: 11, offset: 57158},
 						name: "EOF",
 					},
 				},
@@ -12555,21 +12530,21 @@ var g = &grammar{
 		},
 		{
 			name: "EOF",
-			pos:  position{line: 1547, col: 1, offset: 57292},
+			pos:  position{line: 1541, col: 1, offset: 57163},
 			expr: &notExpr{
-				pos: position{line: 1547, col: 7, offset: 57298},
+				pos: position{line: 1541, col: 7, offset: 57169},
 				expr: &anyMatcher{
-					line: 1547, col: 8, offset: 57299,
+					line: 1541, col: 8, offset: 57170,
 				},
 			},
 		},
 		{
 			name: "EOKW",
-			pos:  position{line: 1549, col: 1, offset: 57302},
+			pos:  position{line: 1543, col: 1, offset: 57173},
 			expr: &notExpr{
-				pos: position{line: 1549, col: 8, offset: 57309},
+				pos: position{line: 1543, col: 8, offset: 57180},
 				expr: &ruleRefExpr{
-					pos:  position{line: 1549, col: 9, offset: 57310},
+					pos:  position{line: 1543, col: 9, offset: 57181},
 					name: "KeyWordChars",
 				},
 			},
@@ -15320,17 +15295,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 8c7236a4e3..30be1310c1 100644
--- a/compiler/parser/parser.js
+++ b/compiler/parser/parser.js
@@ -8497,7 +8497,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) {
@@ -11745,23 +11745,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 acfb0ed33b..2f1ed1d761 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/semantic/expr.go b/compiler/semantic/expr.go
index 68c21341eb..6ad1fde171 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,47 @@ 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)
 	}
+	name, nargs := call.Name, len(call.Args)
 	// 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)
+	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 zed.LookupPrimitive(name) != 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)
+		}
+		exprs = append(exprs, &dag.Literal{Kind: "Literal", Value: "<" + name + ">"})
+		name = "cast"
+	case expr.NewShaperTransform(name) != 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..3198e21741 100644
--- a/runtime/expr/shaper.go
+++ b/runtime/expr/shaper.go
@@ -25,6 +25,24 @@ const (
 	Order
 )
 
+func NewShaperTransform(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
+	}
+	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) {