diff --git a/compiler/parser/parser.go b/compiler/parser/parser.go
index f15f88582e..ea5b376a4a 100644
--- a/compiler/parser/parser.go
+++ b/compiler/parser/parser.go
@@ -4561,7 +4561,7 @@ var g = &grammar{
 					},
 				},
 			},
-			leader:        true,
+			leader:        false,
 			leftRecursive: true,
 		},
 		{
@@ -7861,18 +7861,16 @@ var g = &grammar{
 													pos:  position{line: 1111, col: 29, offset: 26951},
 													name: "_",
 												},
-												&litMatcher{
-													pos:        position{line: 1111, col: 31, offset: 26953},
-													val:        "else",
-													ignoreCase: false,
-													want:       "\"else\"",
+												&ruleRefExpr{
+													pos:  position{line: 1111, col: 31, offset: 26953},
+													name: "ELSE",
 												},
 												&ruleRefExpr{
-													pos:  position{line: 1111, col: 38, offset: 26960},
+													pos:  position{line: 1111, col: 36, offset: 26958},
 													name: "_",
 												},
 												&ruleRefExpr{
-													pos:  position{line: 1111, col: 40, offset: 26962},
+													pos:  position{line: 1111, col: 38, offset: 26960},
 													name: "Expr",
 												},
 											},
@@ -7880,24 +7878,24 @@ var g = &grammar{
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1111, col: 47, offset: 26969},
+									pos:  position{line: 1111, col: 45, offset: 26967},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1111, col: 49, offset: 26971},
+									pos:  position{line: 1111, col: 47, offset: 26969},
 									name: "END",
 								},
 								&zeroOrOneExpr{
-									pos: position{line: 1111, col: 53, offset: 26975},
+									pos: position{line: 1111, col: 51, offset: 26973},
 									expr: &seqExpr{
-										pos: position{line: 1111, col: 54, offset: 26976},
+										pos: position{line: 1111, col: 52, offset: 26974},
 										exprs: []any{
 											&ruleRefExpr{
-												pos:  position{line: 1111, col: 54, offset: 26976},
+												pos:  position{line: 1111, col: 52, offset: 26974},
 												name: "_",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1111, col: 56, offset: 26978},
+												pos:  position{line: 1111, col: 54, offset: 26976},
 												name: "CASE",
 											},
 										},
@@ -7907,62 +7905,60 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1135, col: 5, offset: 27627},
+						pos: position{line: 1135, col: 5, offset: 27625},
 						run: (*parser).callonCaseExpr21,
 						expr: &seqExpr{
-							pos: position{line: 1135, col: 5, offset: 27627},
+							pos: position{line: 1135, col: 5, offset: 27625},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 1135, col: 5, offset: 27627},
+									pos:  position{line: 1135, col: 5, offset: 27625},
 									name: "CASE",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1135, col: 10, offset: 27632},
+									pos:  position{line: 1135, col: 10, offset: 27630},
 									name: "_",
 								},
 								&labeledExpr{
-									pos:   position{line: 1135, col: 12, offset: 27634},
+									pos:   position{line: 1135, col: 12, offset: 27632},
 									label: "expr",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1135, col: 17, offset: 27639},
+										pos:  position{line: 1135, col: 17, offset: 27637},
 										name: "Expr",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1135, col: 22, offset: 27644},
+									pos:   position{line: 1135, col: 22, offset: 27642},
 									label: "whens",
 									expr: &oneOrMoreExpr{
-										pos: position{line: 1135, col: 28, offset: 27650},
+										pos: position{line: 1135, col: 28, offset: 27648},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1135, col: 28, offset: 27650},
+											pos:  position{line: 1135, col: 28, offset: 27648},
 											name: "When",
 										},
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1135, col: 34, offset: 27656},
+									pos:   position{line: 1135, col: 34, offset: 27654},
 									label: "else_",
 									expr: &zeroOrOneExpr{
-										pos: position{line: 1135, col: 40, offset: 27662},
+										pos: position{line: 1135, col: 40, offset: 27660},
 										expr: &seqExpr{
-											pos: position{line: 1135, col: 41, offset: 27663},
+											pos: position{line: 1135, col: 41, offset: 27661},
 											exprs: []any{
 												&ruleRefExpr{
-													pos:  position{line: 1135, col: 41, offset: 27663},
+													pos:  position{line: 1135, col: 41, offset: 27661},
 													name: "_",
 												},
-												&litMatcher{
-													pos:        position{line: 1135, col: 43, offset: 27665},
-													val:        "else",
-													ignoreCase: false,
-													want:       "\"else\"",
+												&ruleRefExpr{
+													pos:  position{line: 1135, col: 43, offset: 27663},
+													name: "ELSE",
 												},
 												&ruleRefExpr{
-													pos:  position{line: 1135, col: 50, offset: 27672},
+													pos:  position{line: 1135, col: 48, offset: 27668},
 													name: "_",
 												},
 												&ruleRefExpr{
-													pos:  position{line: 1135, col: 52, offset: 27674},
+													pos:  position{line: 1135, col: 50, offset: 27670},
 													name: "Expr",
 												},
 											},
@@ -7970,24 +7966,24 @@ var g = &grammar{
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1135, col: 59, offset: 27681},
+									pos:  position{line: 1135, col: 57, offset: 27677},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1135, col: 61, offset: 27683},
+									pos:  position{line: 1135, col: 59, offset: 27679},
 									name: "END",
 								},
 								&zeroOrOneExpr{
-									pos: position{line: 1135, col: 65, offset: 27687},
+									pos: position{line: 1135, col: 63, offset: 27683},
 									expr: &seqExpr{
-										pos: position{line: 1135, col: 66, offset: 27688},
+										pos: position{line: 1135, col: 64, offset: 27684},
 										exprs: []any{
 											&ruleRefExpr{
-												pos:  position{line: 1135, col: 66, offset: 27688},
+												pos:  position{line: 1135, col: 64, offset: 27684},
 												name: "_",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1135, col: 68, offset: 27690},
+												pos:  position{line: 1135, col: 66, offset: 27686},
 												name: "CASE",
 											},
 										},
@@ -8003,50 +7999,50 @@ var g = &grammar{
 		},
 		{
 			name: "When",
-			pos:  position{line: 1148, col: 1, offset: 27996},
+			pos:  position{line: 1148, col: 1, offset: 27992},
 			expr: &actionExpr{
-				pos: position{line: 1149, col: 5, offset: 28005},
+				pos: position{line: 1149, col: 5, offset: 28001},
 				run: (*parser).callonWhen1,
 				expr: &seqExpr{
-					pos: position{line: 1149, col: 5, offset: 28005},
+					pos: position{line: 1149, col: 5, offset: 28001},
 					exprs: []any{
 						&ruleRefExpr{
-							pos:  position{line: 1149, col: 5, offset: 28005},
+							pos:  position{line: 1149, col: 5, offset: 28001},
 							name: "_",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1149, col: 7, offset: 28007},
+							pos:  position{line: 1149, col: 7, offset: 28003},
 							name: "WHEN",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1149, col: 12, offset: 28012},
+							pos:  position{line: 1149, col: 12, offset: 28008},
 							name: "_",
 						},
 						&labeledExpr{
-							pos:   position{line: 1149, col: 14, offset: 28014},
+							pos:   position{line: 1149, col: 14, offset: 28010},
 							label: "cond",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1149, col: 19, offset: 28019},
+								pos:  position{line: 1149, col: 19, offset: 28015},
 								name: "Expr",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1149, col: 24, offset: 28024},
+							pos:  position{line: 1149, col: 24, offset: 28020},
 							name: "_",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1149, col: 26, offset: 28026},
+							pos:  position{line: 1149, col: 26, offset: 28022},
 							name: "THEN",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1149, col: 31, offset: 28031},
+							pos:  position{line: 1149, col: 31, offset: 28027},
 							name: "_",
 						},
 						&labeledExpr{
-							pos:   position{line: 1149, col: 33, offset: 28033},
+							pos:   position{line: 1149, col: 33, offset: 28029},
 							label: "then",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1149, col: 38, offset: 28038},
+								pos:  position{line: 1149, col: 38, offset: 28034},
 								name: "Expr",
 							},
 						},
@@ -8058,57 +8054,57 @@ var g = &grammar{
 		},
 		{
 			name: "OverExpr",
-			pos:  position{line: 1158, col: 1, offset: 28197},
+			pos:  position{line: 1158, col: 1, offset: 28193},
 			expr: &actionExpr{
-				pos: position{line: 1159, col: 5, offset: 28210},
+				pos: position{line: 1159, col: 5, offset: 28206},
 				run: (*parser).callonOverExpr1,
 				expr: &seqExpr{
-					pos: position{line: 1159, col: 5, offset: 28210},
+					pos: position{line: 1159, col: 5, offset: 28206},
 					exprs: []any{
 						&ruleRefExpr{
-							pos:  position{line: 1159, col: 5, offset: 28210},
+							pos:  position{line: 1159, col: 5, offset: 28206},
 							name: "OVER",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1159, col: 10, offset: 28215},
+							pos:  position{line: 1159, col: 10, offset: 28211},
 							name: "_",
 						},
 						&labeledExpr{
-							pos:   position{line: 1159, col: 12, offset: 28217},
+							pos:   position{line: 1159, col: 12, offset: 28213},
 							label: "exprs",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1159, col: 18, offset: 28223},
+								pos:  position{line: 1159, col: 18, offset: 28219},
 								name: "Exprs",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1159, col: 24, offset: 28229},
+							pos:   position{line: 1159, col: 24, offset: 28225},
 							label: "locals",
 							expr: &zeroOrOneExpr{
-								pos: position{line: 1159, col: 31, offset: 28236},
+								pos: position{line: 1159, col: 31, offset: 28232},
 								expr: &ruleRefExpr{
-									pos:  position{line: 1159, col: 31, offset: 28236},
+									pos:  position{line: 1159, col: 31, offset: 28232},
 									name: "Locals",
 								},
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1159, col: 39, offset: 28244},
+							pos:  position{line: 1159, col: 39, offset: 28240},
 							name: "__",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1159, col: 42, offset: 28247},
+							pos:  position{line: 1159, col: 42, offset: 28243},
 							name: "Pipe",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1159, col: 47, offset: 28252},
+							pos:  position{line: 1159, col: 47, offset: 28248},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1159, col: 50, offset: 28255},
+							pos:   position{line: 1159, col: 50, offset: 28251},
 							label: "body",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1159, col: 55, offset: 28260},
+								pos:  position{line: 1159, col: 55, offset: 28256},
 								name: "Seq",
 							},
 						},
@@ -8120,37 +8116,37 @@ var g = &grammar{
 		},
 		{
 			name: "Record",
-			pos:  position{line: 1169, col: 1, offset: 28491},
+			pos:  position{line: 1169, col: 1, offset: 28487},
 			expr: &actionExpr{
-				pos: position{line: 1170, col: 5, offset: 28502},
+				pos: position{line: 1170, col: 5, offset: 28498},
 				run: (*parser).callonRecord1,
 				expr: &seqExpr{
-					pos: position{line: 1170, col: 5, offset: 28502},
+					pos: position{line: 1170, col: 5, offset: 28498},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1170, col: 5, offset: 28502},
+							pos:        position{line: 1170, col: 5, offset: 28498},
 							val:        "{",
 							ignoreCase: false,
 							want:       "\"{\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1170, col: 9, offset: 28506},
+							pos:  position{line: 1170, col: 9, offset: 28502},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1170, col: 12, offset: 28509},
+							pos:   position{line: 1170, col: 12, offset: 28505},
 							label: "elems",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1170, col: 18, offset: 28515},
+								pos:  position{line: 1170, col: 18, offset: 28511},
 								name: "RecordElems",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1170, col: 30, offset: 28527},
+							pos:  position{line: 1170, col: 30, offset: 28523},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1170, col: 33, offset: 28530},
+							pos:        position{line: 1170, col: 33, offset: 28526},
 							val:        "}",
 							ignoreCase: false,
 							want:       "\"}\"",
@@ -8163,31 +8159,31 @@ var g = &grammar{
 		},
 		{
 			name: "RecordElems",
-			pos:  position{line: 1178, col: 1, offset: 28688},
+			pos:  position{line: 1178, col: 1, offset: 28684},
 			expr: &choiceExpr{
-				pos: position{line: 1179, col: 5, offset: 28704},
+				pos: position{line: 1179, col: 5, offset: 28700},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1179, col: 5, offset: 28704},
+						pos: position{line: 1179, col: 5, offset: 28700},
 						run: (*parser).callonRecordElems2,
 						expr: &seqExpr{
-							pos: position{line: 1179, col: 5, offset: 28704},
+							pos: position{line: 1179, col: 5, offset: 28700},
 							exprs: []any{
 								&labeledExpr{
-									pos:   position{line: 1179, col: 5, offset: 28704},
+									pos:   position{line: 1179, col: 5, offset: 28700},
 									label: "first",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1179, col: 11, offset: 28710},
+										pos:  position{line: 1179, col: 11, offset: 28706},
 										name: "RecordElem",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1179, col: 22, offset: 28721},
+									pos:   position{line: 1179, col: 22, offset: 28717},
 									label: "rest",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1179, col: 27, offset: 28726},
+										pos: position{line: 1179, col: 27, offset: 28722},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1179, col: 27, offset: 28726},
+											pos:  position{line: 1179, col: 27, offset: 28722},
 											name: "RecordElemTail",
 										},
 									},
@@ -8196,10 +8192,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1182, col: 5, offset: 28789},
+						pos: position{line: 1182, col: 5, offset: 28785},
 						run: (*parser).callonRecordElems9,
 						expr: &ruleRefExpr{
-							pos:  position{line: 1182, col: 5, offset: 28789},
+							pos:  position{line: 1182, col: 5, offset: 28785},
 							name: "__",
 						},
 					},
@@ -8210,32 +8206,32 @@ var g = &grammar{
 		},
 		{
 			name: "RecordElemTail",
-			pos:  position{line: 1184, col: 1, offset: 28813},
+			pos:  position{line: 1184, col: 1, offset: 28809},
 			expr: &actionExpr{
-				pos: position{line: 1184, col: 18, offset: 28830},
+				pos: position{line: 1184, col: 18, offset: 28826},
 				run: (*parser).callonRecordElemTail1,
 				expr: &seqExpr{
-					pos: position{line: 1184, col: 18, offset: 28830},
+					pos: position{line: 1184, col: 18, offset: 28826},
 					exprs: []any{
 						&ruleRefExpr{
-							pos:  position{line: 1184, col: 18, offset: 28830},
+							pos:  position{line: 1184, col: 18, offset: 28826},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1184, col: 21, offset: 28833},
+							pos:        position{line: 1184, col: 21, offset: 28829},
 							val:        ",",
 							ignoreCase: false,
 							want:       "\",\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1184, col: 25, offset: 28837},
+							pos:  position{line: 1184, col: 25, offset: 28833},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1184, col: 28, offset: 28840},
+							pos:   position{line: 1184, col: 28, offset: 28836},
 							label: "elem",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1184, col: 33, offset: 28845},
+								pos:  position{line: 1184, col: 33, offset: 28841},
 								name: "RecordElem",
 							},
 						},
@@ -8247,20 +8243,20 @@ var g = &grammar{
 		},
 		{
 			name: "RecordElem",
-			pos:  position{line: 1186, col: 1, offset: 28878},
+			pos:  position{line: 1186, col: 1, offset: 28874},
 			expr: &choiceExpr{
-				pos: position{line: 1187, col: 5, offset: 28893},
+				pos: position{line: 1187, col: 5, offset: 28889},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1187, col: 5, offset: 28893},
+						pos:  position{line: 1187, col: 5, offset: 28889},
 						name: "Spread",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1188, col: 5, offset: 28904},
+						pos:  position{line: 1188, col: 5, offset: 28900},
 						name: "FieldExpr",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1189, col: 5, offset: 28918},
+						pos:  position{line: 1189, col: 5, offset: 28914},
 						name: "Identifier",
 					},
 				},
@@ -8270,28 +8266,28 @@ var g = &grammar{
 		},
 		{
 			name: "Spread",
-			pos:  position{line: 1191, col: 1, offset: 28930},
+			pos:  position{line: 1191, col: 1, offset: 28926},
 			expr: &actionExpr{
-				pos: position{line: 1192, col: 5, offset: 28941},
+				pos: position{line: 1192, col: 5, offset: 28937},
 				run: (*parser).callonSpread1,
 				expr: &seqExpr{
-					pos: position{line: 1192, col: 5, offset: 28941},
+					pos: position{line: 1192, col: 5, offset: 28937},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1192, col: 5, offset: 28941},
+							pos:        position{line: 1192, col: 5, offset: 28937},
 							val:        "...",
 							ignoreCase: false,
 							want:       "\"...\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1192, col: 11, offset: 28947},
+							pos:  position{line: 1192, col: 11, offset: 28943},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1192, col: 14, offset: 28950},
+							pos:   position{line: 1192, col: 14, offset: 28946},
 							label: "expr",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1192, col: 19, offset: 28955},
+								pos:  position{line: 1192, col: 19, offset: 28951},
 								name: "Expr",
 							},
 						},
@@ -8303,40 +8299,40 @@ var g = &grammar{
 		},
 		{
 			name: "FieldExpr",
-			pos:  position{line: 1196, col: 1, offset: 29051},
+			pos:  position{line: 1196, col: 1, offset: 29047},
 			expr: &actionExpr{
-				pos: position{line: 1197, col: 5, offset: 29065},
+				pos: position{line: 1197, col: 5, offset: 29061},
 				run: (*parser).callonFieldExpr1,
 				expr: &seqExpr{
-					pos: position{line: 1197, col: 5, offset: 29065},
+					pos: position{line: 1197, col: 5, offset: 29061},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 1197, col: 5, offset: 29065},
+							pos:   position{line: 1197, col: 5, offset: 29061},
 							label: "name",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1197, col: 10, offset: 29070},
+								pos:  position{line: 1197, col: 10, offset: 29066},
 								name: "Name",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1197, col: 15, offset: 29075},
+							pos:  position{line: 1197, col: 15, offset: 29071},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1197, col: 18, offset: 29078},
+							pos:        position{line: 1197, col: 18, offset: 29074},
 							val:        ":",
 							ignoreCase: false,
 							want:       "\":\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1197, col: 22, offset: 29082},
+							pos:  position{line: 1197, col: 22, offset: 29078},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1197, col: 25, offset: 29085},
+							pos:   position{line: 1197, col: 25, offset: 29081},
 							label: "value",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1197, col: 31, offset: 29091},
+								pos:  position{line: 1197, col: 31, offset: 29087},
 								name: "Expr",
 							},
 						},
@@ -8348,37 +8344,37 @@ var g = &grammar{
 		},
 		{
 			name: "Array",
-			pos:  position{line: 1206, col: 1, offset: 29260},
+			pos:  position{line: 1206, col: 1, offset: 29256},
 			expr: &actionExpr{
-				pos: position{line: 1207, col: 5, offset: 29270},
+				pos: position{line: 1207, col: 5, offset: 29266},
 				run: (*parser).callonArray1,
 				expr: &seqExpr{
-					pos: position{line: 1207, col: 5, offset: 29270},
+					pos: position{line: 1207, col: 5, offset: 29266},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1207, col: 5, offset: 29270},
+							pos:        position{line: 1207, col: 5, offset: 29266},
 							val:        "[",
 							ignoreCase: false,
 							want:       "\"[\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1207, col: 9, offset: 29274},
+							pos:  position{line: 1207, col: 9, offset: 29270},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1207, col: 12, offset: 29277},
+							pos:   position{line: 1207, col: 12, offset: 29273},
 							label: "elems",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1207, col: 18, offset: 29283},
+								pos:  position{line: 1207, col: 18, offset: 29279},
 								name: "VectorElems",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1207, col: 30, offset: 29295},
+							pos:  position{line: 1207, col: 30, offset: 29291},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1207, col: 33, offset: 29298},
+							pos:        position{line: 1207, col: 33, offset: 29294},
 							val:        "]",
 							ignoreCase: false,
 							want:       "\"]\"",
@@ -8391,37 +8387,37 @@ var g = &grammar{
 		},
 		{
 			name: "Set",
-			pos:  position{line: 1215, col: 1, offset: 29454},
+			pos:  position{line: 1215, col: 1, offset: 29450},
 			expr: &actionExpr{
-				pos: position{line: 1216, col: 5, offset: 29462},
+				pos: position{line: 1216, col: 5, offset: 29458},
 				run: (*parser).callonSet1,
 				expr: &seqExpr{
-					pos: position{line: 1216, col: 5, offset: 29462},
+					pos: position{line: 1216, col: 5, offset: 29458},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1216, col: 5, offset: 29462},
+							pos:        position{line: 1216, col: 5, offset: 29458},
 							val:        "|[",
 							ignoreCase: false,
 							want:       "\"|[\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1216, col: 10, offset: 29467},
+							pos:  position{line: 1216, col: 10, offset: 29463},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1216, col: 13, offset: 29470},
+							pos:   position{line: 1216, col: 13, offset: 29466},
 							label: "elems",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1216, col: 19, offset: 29476},
+								pos:  position{line: 1216, col: 19, offset: 29472},
 								name: "VectorElems",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1216, col: 31, offset: 29488},
+							pos:  position{line: 1216, col: 31, offset: 29484},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1216, col: 34, offset: 29491},
+							pos:        position{line: 1216, col: 34, offset: 29487},
 							val:        "]|",
 							ignoreCase: false,
 							want:       "\"]|\"",
@@ -8434,54 +8430,54 @@ var g = &grammar{
 		},
 		{
 			name: "VectorElems",
-			pos:  position{line: 1224, col: 1, offset: 29644},
+			pos:  position{line: 1224, col: 1, offset: 29640},
 			expr: &choiceExpr{
-				pos: position{line: 1225, col: 5, offset: 29660},
+				pos: position{line: 1225, col: 5, offset: 29656},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1225, col: 5, offset: 29660},
+						pos: position{line: 1225, col: 5, offset: 29656},
 						run: (*parser).callonVectorElems2,
 						expr: &seqExpr{
-							pos: position{line: 1225, col: 5, offset: 29660},
+							pos: position{line: 1225, col: 5, offset: 29656},
 							exprs: []any{
 								&labeledExpr{
-									pos:   position{line: 1225, col: 5, offset: 29660},
+									pos:   position{line: 1225, col: 5, offset: 29656},
 									label: "first",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1225, col: 11, offset: 29666},
+										pos:  position{line: 1225, col: 11, offset: 29662},
 										name: "VectorElem",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1225, col: 22, offset: 29677},
+									pos:   position{line: 1225, col: 22, offset: 29673},
 									label: "rest",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1225, col: 27, offset: 29682},
+										pos: position{line: 1225, col: 27, offset: 29678},
 										expr: &actionExpr{
-											pos: position{line: 1225, col: 28, offset: 29683},
+											pos: position{line: 1225, col: 28, offset: 29679},
 											run: (*parser).callonVectorElems8,
 											expr: &seqExpr{
-												pos: position{line: 1225, col: 28, offset: 29683},
+												pos: position{line: 1225, col: 28, offset: 29679},
 												exprs: []any{
 													&ruleRefExpr{
-														pos:  position{line: 1225, col: 28, offset: 29683},
+														pos:  position{line: 1225, col: 28, offset: 29679},
 														name: "__",
 													},
 													&litMatcher{
-														pos:        position{line: 1225, col: 31, offset: 29686},
+														pos:        position{line: 1225, col: 31, offset: 29682},
 														val:        ",",
 														ignoreCase: false,
 														want:       "\",\"",
 													},
 													&ruleRefExpr{
-														pos:  position{line: 1225, col: 35, offset: 29690},
+														pos:  position{line: 1225, col: 35, offset: 29686},
 														name: "__",
 													},
 													&labeledExpr{
-														pos:   position{line: 1225, col: 38, offset: 29693},
+														pos:   position{line: 1225, col: 38, offset: 29689},
 														label: "e",
 														expr: &ruleRefExpr{
-															pos:  position{line: 1225, col: 40, offset: 29695},
+															pos:  position{line: 1225, col: 40, offset: 29691},
 															name: "VectorElem",
 														},
 													},
@@ -8494,10 +8490,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1228, col: 5, offset: 29777},
+						pos: position{line: 1228, col: 5, offset: 29773},
 						run: (*parser).callonVectorElems15,
 						expr: &ruleRefExpr{
-							pos:  position{line: 1228, col: 5, offset: 29777},
+							pos:  position{line: 1228, col: 5, offset: 29773},
 							name: "__",
 						},
 					},
@@ -8508,22 +8504,22 @@ var g = &grammar{
 		},
 		{
 			name: "VectorElem",
-			pos:  position{line: 1230, col: 1, offset: 29801},
+			pos:  position{line: 1230, col: 1, offset: 29797},
 			expr: &choiceExpr{
-				pos: position{line: 1231, col: 5, offset: 29816},
+				pos: position{line: 1231, col: 5, offset: 29812},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1231, col: 5, offset: 29816},
+						pos:  position{line: 1231, col: 5, offset: 29812},
 						name: "Spread",
 					},
 					&actionExpr{
-						pos: position{line: 1232, col: 5, offset: 29827},
+						pos: position{line: 1232, col: 5, offset: 29823},
 						run: (*parser).callonVectorElem3,
 						expr: &labeledExpr{
-							pos:   position{line: 1232, col: 5, offset: 29827},
+							pos:   position{line: 1232, col: 5, offset: 29823},
 							label: "e",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1232, col: 7, offset: 29829},
+								pos:  position{line: 1232, col: 7, offset: 29825},
 								name: "Expr",
 							},
 						},
@@ -8535,37 +8531,37 @@ var g = &grammar{
 		},
 		{
 			name: "Map",
-			pos:  position{line: 1234, col: 1, offset: 29920},
+			pos:  position{line: 1234, col: 1, offset: 29916},
 			expr: &actionExpr{
-				pos: position{line: 1235, col: 5, offset: 29928},
+				pos: position{line: 1235, col: 5, offset: 29924},
 				run: (*parser).callonMap1,
 				expr: &seqExpr{
-					pos: position{line: 1235, col: 5, offset: 29928},
+					pos: position{line: 1235, col: 5, offset: 29924},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1235, col: 5, offset: 29928},
+							pos:        position{line: 1235, col: 5, offset: 29924},
 							val:        "|{",
 							ignoreCase: false,
 							want:       "\"|{\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1235, col: 10, offset: 29933},
+							pos:  position{line: 1235, col: 10, offset: 29929},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1235, col: 13, offset: 29936},
+							pos:   position{line: 1235, col: 13, offset: 29932},
 							label: "exprs",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1235, col: 19, offset: 29942},
+								pos:  position{line: 1235, col: 19, offset: 29938},
 								name: "Entries",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1235, col: 27, offset: 29950},
+							pos:  position{line: 1235, col: 27, offset: 29946},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1235, col: 30, offset: 29953},
+							pos:        position{line: 1235, col: 30, offset: 29949},
 							val:        "}|",
 							ignoreCase: false,
 							want:       "\"}|\"",
@@ -8578,31 +8574,31 @@ var g = &grammar{
 		},
 		{
 			name: "Entries",
-			pos:  position{line: 1243, col: 1, offset: 30107},
+			pos:  position{line: 1243, col: 1, offset: 30103},
 			expr: &choiceExpr{
-				pos: position{line: 1244, col: 5, offset: 30119},
+				pos: position{line: 1244, col: 5, offset: 30115},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1244, col: 5, offset: 30119},
+						pos: position{line: 1244, col: 5, offset: 30115},
 						run: (*parser).callonEntries2,
 						expr: &seqExpr{
-							pos: position{line: 1244, col: 5, offset: 30119},
+							pos: position{line: 1244, col: 5, offset: 30115},
 							exprs: []any{
 								&labeledExpr{
-									pos:   position{line: 1244, col: 5, offset: 30119},
+									pos:   position{line: 1244, col: 5, offset: 30115},
 									label: "first",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1244, col: 11, offset: 30125},
+										pos:  position{line: 1244, col: 11, offset: 30121},
 										name: "Entry",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1244, col: 17, offset: 30131},
+									pos:   position{line: 1244, col: 17, offset: 30127},
 									label: "rest",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1244, col: 22, offset: 30136},
+										pos: position{line: 1244, col: 22, offset: 30132},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1244, col: 22, offset: 30136},
+											pos:  position{line: 1244, col: 22, offset: 30132},
 											name: "EntryTail",
 										},
 									},
@@ -8611,10 +8607,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1247, col: 5, offset: 30194},
+						pos: position{line: 1247, col: 5, offset: 30190},
 						run: (*parser).callonEntries9,
 						expr: &ruleRefExpr{
-							pos:  position{line: 1247, col: 5, offset: 30194},
+							pos:  position{line: 1247, col: 5, offset: 30190},
 							name: "__",
 						},
 					},
@@ -8625,32 +8621,32 @@ var g = &grammar{
 		},
 		{
 			name: "EntryTail",
-			pos:  position{line: 1250, col: 1, offset: 30219},
+			pos:  position{line: 1250, col: 1, offset: 30215},
 			expr: &actionExpr{
-				pos: position{line: 1250, col: 13, offset: 30231},
+				pos: position{line: 1250, col: 13, offset: 30227},
 				run: (*parser).callonEntryTail1,
 				expr: &seqExpr{
-					pos: position{line: 1250, col: 13, offset: 30231},
+					pos: position{line: 1250, col: 13, offset: 30227},
 					exprs: []any{
 						&ruleRefExpr{
-							pos:  position{line: 1250, col: 13, offset: 30231},
+							pos:  position{line: 1250, col: 13, offset: 30227},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1250, col: 16, offset: 30234},
+							pos:        position{line: 1250, col: 16, offset: 30230},
 							val:        ",",
 							ignoreCase: false,
 							want:       "\",\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1250, col: 20, offset: 30238},
+							pos:  position{line: 1250, col: 20, offset: 30234},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1250, col: 23, offset: 30241},
+							pos:   position{line: 1250, col: 23, offset: 30237},
 							label: "e",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1250, col: 25, offset: 30243},
+								pos:  position{line: 1250, col: 25, offset: 30239},
 								name: "Entry",
 							},
 						},
@@ -8662,40 +8658,40 @@ var g = &grammar{
 		},
 		{
 			name: "Entry",
-			pos:  position{line: 1252, col: 1, offset: 30268},
+			pos:  position{line: 1252, col: 1, offset: 30264},
 			expr: &actionExpr{
-				pos: position{line: 1253, col: 5, offset: 30278},
+				pos: position{line: 1253, col: 5, offset: 30274},
 				run: (*parser).callonEntry1,
 				expr: &seqExpr{
-					pos: position{line: 1253, col: 5, offset: 30278},
+					pos: position{line: 1253, col: 5, offset: 30274},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 1253, col: 5, offset: 30278},
+							pos:   position{line: 1253, col: 5, offset: 30274},
 							label: "key",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1253, col: 9, offset: 30282},
+								pos:  position{line: 1253, col: 9, offset: 30278},
 								name: "Expr",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1253, col: 14, offset: 30287},
+							pos:  position{line: 1253, col: 14, offset: 30283},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1253, col: 17, offset: 30290},
+							pos:        position{line: 1253, col: 17, offset: 30286},
 							val:        ":",
 							ignoreCase: false,
 							want:       "\":\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1253, col: 21, offset: 30294},
+							pos:  position{line: 1253, col: 21, offset: 30290},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1253, col: 24, offset: 30297},
+							pos:   position{line: 1253, col: 24, offset: 30293},
 							label: "value",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1253, col: 30, offset: 30303},
+								pos:  position{line: 1253, col: 30, offset: 30299},
 								name: "Expr",
 							},
 						},
@@ -8707,61 +8703,61 @@ var g = &grammar{
 		},
 		{
 			name: "Tuple",
-			pos:  position{line: 1257, col: 1, offset: 30406},
+			pos:  position{line: 1257, col: 1, offset: 30402},
 			expr: &actionExpr{
-				pos: position{line: 1258, col: 5, offset: 30416},
+				pos: position{line: 1258, col: 5, offset: 30412},
 				run: (*parser).callonTuple1,
 				expr: &seqExpr{
-					pos: position{line: 1258, col: 5, offset: 30416},
+					pos: position{line: 1258, col: 5, offset: 30412},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1258, col: 5, offset: 30416},
+							pos:        position{line: 1258, col: 5, offset: 30412},
 							val:        "(",
 							ignoreCase: false,
 							want:       "\"(\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1258, col: 9, offset: 30420},
+							pos:  position{line: 1258, col: 9, offset: 30416},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1258, col: 12, offset: 30423},
+							pos:   position{line: 1258, col: 12, offset: 30419},
 							label: "first",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1258, col: 18, offset: 30429},
+								pos:  position{line: 1258, col: 18, offset: 30425},
 								name: "Expr",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1258, col: 23, offset: 30434},
+							pos:   position{line: 1258, col: 23, offset: 30430},
 							label: "rest",
 							expr: &oneOrMoreExpr{
-								pos: position{line: 1258, col: 28, offset: 30439},
+								pos: position{line: 1258, col: 28, offset: 30435},
 								expr: &actionExpr{
-									pos: position{line: 1258, col: 29, offset: 30440},
+									pos: position{line: 1258, col: 29, offset: 30436},
 									run: (*parser).callonTuple9,
 									expr: &seqExpr{
-										pos: position{line: 1258, col: 29, offset: 30440},
+										pos: position{line: 1258, col: 29, offset: 30436},
 										exprs: []any{
 											&ruleRefExpr{
-												pos:  position{line: 1258, col: 29, offset: 30440},
+												pos:  position{line: 1258, col: 29, offset: 30436},
 												name: "__",
 											},
 											&litMatcher{
-												pos:        position{line: 1258, col: 32, offset: 30443},
+												pos:        position{line: 1258, col: 32, offset: 30439},
 												val:        ",",
 												ignoreCase: false,
 												want:       "\",\"",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1258, col: 36, offset: 30447},
+												pos:  position{line: 1258, col: 36, offset: 30443},
 												name: "__",
 											},
 											&labeledExpr{
-												pos:   position{line: 1258, col: 39, offset: 30450},
+												pos:   position{line: 1258, col: 39, offset: 30446},
 												label: "e",
 												expr: &ruleRefExpr{
-													pos:  position{line: 1258, col: 41, offset: 30452},
+													pos:  position{line: 1258, col: 41, offset: 30448},
 													name: "Expr",
 												},
 											},
@@ -8771,11 +8767,11 @@ var g = &grammar{
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1258, col: 66, offset: 30477},
+							pos:  position{line: 1258, col: 66, offset: 30473},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1258, col: 69, offset: 30480},
+							pos:        position{line: 1258, col: 69, offset: 30476},
 							val:        ")",
 							ignoreCase: false,
 							want:       "\")\"",
@@ -8788,56 +8784,56 @@ var g = &grammar{
 		},
 		{
 			name: "Literal",
-			pos:  position{line: 1268, col: 1, offset: 30661},
+			pos:  position{line: 1268, col: 1, offset: 30657},
 			expr: &choiceExpr{
-				pos: position{line: 1269, col: 5, offset: 30673},
+				pos: position{line: 1269, col: 5, offset: 30669},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1269, col: 5, offset: 30673},
+						pos:  position{line: 1269, col: 5, offset: 30669},
 						name: "TypeLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1270, col: 5, offset: 30689},
+						pos:  position{line: 1270, col: 5, offset: 30685},
 						name: "StringLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1271, col: 5, offset: 30707},
+						pos:  position{line: 1271, col: 5, offset: 30703},
 						name: "FString",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1272, col: 5, offset: 30719},
+						pos:  position{line: 1272, col: 5, offset: 30715},
 						name: "SubnetLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1273, col: 5, offset: 30737},
+						pos:  position{line: 1273, col: 5, offset: 30733},
 						name: "AddressLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1274, col: 5, offset: 30756},
+						pos:  position{line: 1274, col: 5, offset: 30752},
 						name: "BytesLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1275, col: 5, offset: 30773},
+						pos:  position{line: 1275, col: 5, offset: 30769},
 						name: "Duration",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1276, col: 5, offset: 30786},
+						pos:  position{line: 1276, col: 5, offset: 30782},
 						name: "Time",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1277, col: 5, offset: 30795},
+						pos:  position{line: 1277, col: 5, offset: 30791},
 						name: "FloatLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1278, col: 5, offset: 30812},
+						pos:  position{line: 1278, col: 5, offset: 30808},
 						name: "IntegerLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1279, col: 5, offset: 30831},
+						pos:  position{line: 1279, col: 5, offset: 30827},
 						name: "BooleanLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1280, col: 5, offset: 30850},
+						pos:  position{line: 1280, col: 5, offset: 30846},
 						name: "NullLiteral",
 					},
 				},
@@ -8847,28 +8843,28 @@ var g = &grammar{
 		},
 		{
 			name: "SubnetLiteral",
-			pos:  position{line: 1282, col: 1, offset: 30863},
+			pos:  position{line: 1282, col: 1, offset: 30859},
 			expr: &choiceExpr{
-				pos: position{line: 1283, col: 5, offset: 30881},
+				pos: position{line: 1283, col: 5, offset: 30877},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1283, col: 5, offset: 30881},
+						pos: position{line: 1283, col: 5, offset: 30877},
 						run: (*parser).callonSubnetLiteral2,
 						expr: &seqExpr{
-							pos: position{line: 1283, col: 5, offset: 30881},
+							pos: position{line: 1283, col: 5, offset: 30877},
 							exprs: []any{
 								&labeledExpr{
-									pos:   position{line: 1283, col: 5, offset: 30881},
+									pos:   position{line: 1283, col: 5, offset: 30877},
 									label: "v",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1283, col: 7, offset: 30883},
+										pos:  position{line: 1283, col: 7, offset: 30879},
 										name: "IP6Net",
 									},
 								},
 								&notExpr{
-									pos: position{line: 1283, col: 14, offset: 30890},
+									pos: position{line: 1283, col: 14, offset: 30886},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1283, col: 15, offset: 30891},
+										pos:  position{line: 1283, col: 15, offset: 30887},
 										name: "IdentifierRest",
 									},
 								},
@@ -8876,13 +8872,13 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1286, col: 5, offset: 30971},
+						pos: position{line: 1286, col: 5, offset: 30967},
 						run: (*parser).callonSubnetLiteral8,
 						expr: &labeledExpr{
-							pos:   position{line: 1286, col: 5, offset: 30971},
+							pos:   position{line: 1286, col: 5, offset: 30967},
 							label: "v",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1286, col: 7, offset: 30973},
+								pos:  position{line: 1286, col: 7, offset: 30969},
 								name: "IP4Net",
 							},
 						},
@@ -8894,28 +8890,28 @@ var g = &grammar{
 		},
 		{
 			name: "AddressLiteral",
-			pos:  position{line: 1290, col: 1, offset: 31042},
+			pos:  position{line: 1290, col: 1, offset: 31038},
 			expr: &choiceExpr{
-				pos: position{line: 1291, col: 5, offset: 31061},
+				pos: position{line: 1291, col: 5, offset: 31057},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1291, col: 5, offset: 31061},
+						pos: position{line: 1291, col: 5, offset: 31057},
 						run: (*parser).callonAddressLiteral2,
 						expr: &seqExpr{
-							pos: position{line: 1291, col: 5, offset: 31061},
+							pos: position{line: 1291, col: 5, offset: 31057},
 							exprs: []any{
 								&labeledExpr{
-									pos:   position{line: 1291, col: 5, offset: 31061},
+									pos:   position{line: 1291, col: 5, offset: 31057},
 									label: "v",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1291, col: 7, offset: 31063},
+										pos:  position{line: 1291, col: 7, offset: 31059},
 										name: "IP6",
 									},
 								},
 								&notExpr{
-									pos: position{line: 1291, col: 11, offset: 31067},
+									pos: position{line: 1291, col: 11, offset: 31063},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1291, col: 12, offset: 31068},
+										pos:  position{line: 1291, col: 12, offset: 31064},
 										name: "IdentifierRest",
 									},
 								},
@@ -8923,13 +8919,13 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1294, col: 5, offset: 31147},
+						pos: position{line: 1294, col: 5, offset: 31143},
 						run: (*parser).callonAddressLiteral8,
 						expr: &labeledExpr{
-							pos:   position{line: 1294, col: 5, offset: 31147},
+							pos:   position{line: 1294, col: 5, offset: 31143},
 							label: "v",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1294, col: 7, offset: 31149},
+								pos:  position{line: 1294, col: 7, offset: 31145},
 								name: "IP",
 							},
 						},
@@ -8941,15 +8937,15 @@ var g = &grammar{
 		},
 		{
 			name: "FloatLiteral",
-			pos:  position{line: 1298, col: 1, offset: 31213},
+			pos:  position{line: 1298, col: 1, offset: 31209},
 			expr: &actionExpr{
-				pos: position{line: 1299, col: 5, offset: 31230},
+				pos: position{line: 1299, col: 5, offset: 31226},
 				run: (*parser).callonFloatLiteral1,
 				expr: &labeledExpr{
-					pos:   position{line: 1299, col: 5, offset: 31230},
+					pos:   position{line: 1299, col: 5, offset: 31226},
 					label: "v",
 					expr: &ruleRefExpr{
-						pos:  position{line: 1299, col: 7, offset: 31232},
+						pos:  position{line: 1299, col: 7, offset: 31228},
 						name: "FloatString",
 					},
 				},
@@ -8959,15 +8955,15 @@ var g = &grammar{
 		},
 		{
 			name: "IntegerLiteral",
-			pos:  position{line: 1303, col: 1, offset: 31310},
+			pos:  position{line: 1303, col: 1, offset: 31306},
 			expr: &actionExpr{
-				pos: position{line: 1304, col: 5, offset: 31329},
+				pos: position{line: 1304, col: 5, offset: 31325},
 				run: (*parser).callonIntegerLiteral1,
 				expr: &labeledExpr{
-					pos:   position{line: 1304, col: 5, offset: 31329},
+					pos:   position{line: 1304, col: 5, offset: 31325},
 					label: "v",
 					expr: &ruleRefExpr{
-						pos:  position{line: 1304, col: 7, offset: 31331},
+						pos:  position{line: 1304, col: 7, offset: 31327},
 						name: "IntString",
 					},
 				},
@@ -8977,23 +8973,23 @@ var g = &grammar{
 		},
 		{
 			name: "BooleanLiteral",
-			pos:  position{line: 1308, col: 1, offset: 31405},
+			pos:  position{line: 1308, col: 1, offset: 31401},
 			expr: &choiceExpr{
-				pos: position{line: 1309, col: 5, offset: 31424},
+				pos: position{line: 1309, col: 5, offset: 31420},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1309, col: 5, offset: 31424},
+						pos: position{line: 1309, col: 5, offset: 31420},
 						run: (*parser).callonBooleanLiteral2,
 						expr: &ruleRefExpr{
-							pos:  position{line: 1309, col: 5, offset: 31424},
+							pos:  position{line: 1309, col: 5, offset: 31420},
 							name: "TRUE",
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1310, col: 5, offset: 31482},
+						pos: position{line: 1310, col: 5, offset: 31478},
 						run: (*parser).callonBooleanLiteral4,
 						expr: &ruleRefExpr{
-							pos:  position{line: 1310, col: 5, offset: 31482},
+							pos:  position{line: 1310, col: 5, offset: 31478},
 							name: "FALSE",
 						},
 					},
@@ -9004,12 +9000,12 @@ var g = &grammar{
 		},
 		{
 			name: "NullLiteral",
-			pos:  position{line: 1312, col: 1, offset: 31538},
+			pos:  position{line: 1312, col: 1, offset: 31534},
 			expr: &actionExpr{
-				pos: position{line: 1313, col: 5, offset: 31554},
+				pos: position{line: 1313, col: 5, offset: 31550},
 				run: (*parser).callonNullLiteral1,
 				expr: &ruleRefExpr{
-					pos:  position{line: 1313, col: 5, offset: 31554},
+					pos:  position{line: 1313, col: 5, offset: 31550},
 					name: "NULL",
 				},
 			},
@@ -9018,23 +9014,23 @@ var g = &grammar{
 		},
 		{
 			name: "BytesLiteral",
-			pos:  position{line: 1315, col: 1, offset: 31604},
+			pos:  position{line: 1315, col: 1, offset: 31600},
 			expr: &actionExpr{
-				pos: position{line: 1316, col: 5, offset: 31621},
+				pos: position{line: 1316, col: 5, offset: 31617},
 				run: (*parser).callonBytesLiteral1,
 				expr: &seqExpr{
-					pos: position{line: 1316, col: 5, offset: 31621},
+					pos: position{line: 1316, col: 5, offset: 31617},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1316, col: 5, offset: 31621},
+							pos:        position{line: 1316, col: 5, offset: 31617},
 							val:        "0x",
 							ignoreCase: false,
 							want:       "\"0x\"",
 						},
 						&zeroOrMoreExpr{
-							pos: position{line: 1316, col: 10, offset: 31626},
+							pos: position{line: 1316, col: 10, offset: 31622},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1316, col: 10, offset: 31626},
+								pos:  position{line: 1316, col: 10, offset: 31622},
 								name: "HexDigit",
 							},
 						},
@@ -9046,29 +9042,29 @@ var g = &grammar{
 		},
 		{
 			name: "TypeLiteral",
-			pos:  position{line: 1320, col: 1, offset: 31700},
+			pos:  position{line: 1320, col: 1, offset: 31696},
 			expr: &actionExpr{
-				pos: position{line: 1321, col: 5, offset: 31716},
+				pos: position{line: 1321, col: 5, offset: 31712},
 				run: (*parser).callonTypeLiteral1,
 				expr: &seqExpr{
-					pos: position{line: 1321, col: 5, offset: 31716},
+					pos: position{line: 1321, col: 5, offset: 31712},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1321, col: 5, offset: 31716},
+							pos:        position{line: 1321, col: 5, offset: 31712},
 							val:        "<",
 							ignoreCase: false,
 							want:       "\"<\"",
 						},
 						&labeledExpr{
-							pos:   position{line: 1321, col: 9, offset: 31720},
+							pos:   position{line: 1321, col: 9, offset: 31716},
 							label: "typ",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1321, col: 13, offset: 31724},
+								pos:  position{line: 1321, col: 13, offset: 31720},
 								name: "Type",
 							},
 						},
 						&litMatcher{
-							pos:        position{line: 1321, col: 18, offset: 31729},
+							pos:        position{line: 1321, col: 18, offset: 31725},
 							val:        ">",
 							ignoreCase: false,
 							want:       "\">\"",
@@ -9081,16 +9077,16 @@ var g = &grammar{
 		},
 		{
 			name: "Type",
-			pos:  position{line: 1329, col: 1, offset: 31862},
+			pos:  position{line: 1329, col: 1, offset: 31858},
 			expr: &choiceExpr{
-				pos: position{line: 1330, col: 5, offset: 31871},
+				pos: position{line: 1330, col: 5, offset: 31867},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1330, col: 5, offset: 31871},
+						pos:  position{line: 1330, col: 5, offset: 31867},
 						name: "AmbiguousType",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1331, col: 5, offset: 31889},
+						pos:  position{line: 1331, col: 5, offset: 31885},
 						name: "ComplexType",
 					},
 				},
@@ -9100,28 +9096,28 @@ var g = &grammar{
 		},
 		{
 			name: "AmbiguousType",
-			pos:  position{line: 1333, col: 1, offset: 31902},
+			pos:  position{line: 1333, col: 1, offset: 31898},
 			expr: &choiceExpr{
-				pos: position{line: 1334, col: 5, offset: 31920},
+				pos: position{line: 1334, col: 5, offset: 31916},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1334, col: 5, offset: 31920},
+						pos: position{line: 1334, col: 5, offset: 31916},
 						run: (*parser).callonAmbiguousType2,
 						expr: &seqExpr{
-							pos: position{line: 1334, col: 5, offset: 31920},
+							pos: position{line: 1334, col: 5, offset: 31916},
 							exprs: []any{
 								&labeledExpr{
-									pos:   position{line: 1334, col: 5, offset: 31920},
+									pos:   position{line: 1334, col: 5, offset: 31916},
 									label: "name",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1334, col: 10, offset: 31925},
+										pos:  position{line: 1334, col: 10, offset: 31921},
 										name: "PrimitiveType",
 									},
 								},
 								&notExpr{
-									pos: position{line: 1334, col: 24, offset: 31939},
+									pos: position{line: 1334, col: 24, offset: 31935},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1334, col: 25, offset: 31940},
+										pos:  position{line: 1334, col: 25, offset: 31936},
 										name: "IdentifierRest",
 									},
 								},
@@ -9129,43 +9125,43 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1335, col: 5, offset: 31980},
+						pos: position{line: 1335, col: 5, offset: 31976},
 						run: (*parser).callonAmbiguousType8,
 						expr: &seqExpr{
-							pos: position{line: 1335, col: 5, offset: 31980},
+							pos: position{line: 1335, col: 5, offset: 31976},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 1335, col: 5, offset: 31980},
+									pos:  position{line: 1335, col: 5, offset: 31976},
 									name: "ERROR",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1335, col: 11, offset: 31986},
+									pos:  position{line: 1335, col: 11, offset: 31982},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 1335, col: 14, offset: 31989},
+									pos:        position{line: 1335, col: 14, offset: 31985},
 									val:        "(",
 									ignoreCase: false,
 									want:       "\"(\"",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1335, col: 18, offset: 31993},
+									pos:  position{line: 1335, col: 18, offset: 31989},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 1335, col: 21, offset: 31996},
+									pos:   position{line: 1335, col: 21, offset: 31992},
 									label: "t",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1335, col: 23, offset: 31998},
+										pos:  position{line: 1335, col: 23, offset: 31994},
 										name: "Type",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1335, col: 28, offset: 32003},
+									pos:  position{line: 1335, col: 28, offset: 31999},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 1335, col: 31, offset: 32006},
+									pos:        position{line: 1335, col: 31, offset: 32002},
 									val:        ")",
 									ignoreCase: false,
 									want:       "\")\"",
@@ -9174,43 +9170,43 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1342, col: 5, offset: 32146},
+						pos: position{line: 1342, col: 5, offset: 32142},
 						run: (*parser).callonAmbiguousType18,
 						expr: &seqExpr{
-							pos: position{line: 1342, col: 5, offset: 32146},
+							pos: position{line: 1342, col: 5, offset: 32142},
 							exprs: []any{
 								&labeledExpr{
-									pos:   position{line: 1342, col: 5, offset: 32146},
+									pos:   position{line: 1342, col: 5, offset: 32142},
 									label: "name",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1342, col: 10, offset: 32151},
+										pos:  position{line: 1342, col: 10, offset: 32147},
 										name: "Name",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1342, col: 15, offset: 32156},
+									pos:   position{line: 1342, col: 15, offset: 32152},
 									label: "opt",
 									expr: &zeroOrOneExpr{
-										pos: position{line: 1342, col: 19, offset: 32160},
+										pos: position{line: 1342, col: 19, offset: 32156},
 										expr: &seqExpr{
-											pos: position{line: 1342, col: 20, offset: 32161},
+											pos: position{line: 1342, col: 20, offset: 32157},
 											exprs: []any{
 												&ruleRefExpr{
-													pos:  position{line: 1342, col: 20, offset: 32161},
+													pos:  position{line: 1342, col: 20, offset: 32157},
 													name: "__",
 												},
 												&litMatcher{
-													pos:        position{line: 1342, col: 23, offset: 32164},
+													pos:        position{line: 1342, col: 23, offset: 32160},
 													val:        "=",
 													ignoreCase: false,
 													want:       "\"=\"",
 												},
 												&ruleRefExpr{
-													pos:  position{line: 1342, col: 27, offset: 32168},
+													pos:  position{line: 1342, col: 27, offset: 32164},
 													name: "__",
 												},
 												&ruleRefExpr{
-													pos:  position{line: 1342, col: 30, offset: 32171},
+													pos:  position{line: 1342, col: 30, offset: 32167},
 													name: "Type",
 												},
 											},
@@ -9221,31 +9217,31 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1353, col: 5, offset: 32496},
+						pos: position{line: 1353, col: 5, offset: 32492},
 						run: (*parser).callonAmbiguousType29,
 						expr: &seqExpr{
-							pos: position{line: 1353, col: 5, offset: 32496},
+							pos: position{line: 1353, col: 5, offset: 32492},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1353, col: 5, offset: 32496},
+									pos:        position{line: 1353, col: 5, offset: 32492},
 									val:        "(",
 									ignoreCase: false,
 									want:       "\"(\"",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1353, col: 9, offset: 32500},
+									pos:  position{line: 1353, col: 9, offset: 32496},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 1353, col: 12, offset: 32503},
+									pos:   position{line: 1353, col: 12, offset: 32499},
 									label: "types",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1353, col: 18, offset: 32509},
+										pos:  position{line: 1353, col: 18, offset: 32505},
 										name: "TypeList",
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1353, col: 27, offset: 32518},
+									pos:        position{line: 1353, col: 27, offset: 32514},
 									val:        ")",
 									ignoreCase: false,
 									want:       "\")\"",
@@ -9260,28 +9256,28 @@ var g = &grammar{
 		},
 		{
 			name: "TypeList",
-			pos:  position{line: 1361, col: 1, offset: 32662},
+			pos:  position{line: 1361, col: 1, offset: 32658},
 			expr: &actionExpr{
-				pos: position{line: 1362, col: 5, offset: 32675},
+				pos: position{line: 1362, col: 5, offset: 32671},
 				run: (*parser).callonTypeList1,
 				expr: &seqExpr{
-					pos: position{line: 1362, col: 5, offset: 32675},
+					pos: position{line: 1362, col: 5, offset: 32671},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 1362, col: 5, offset: 32675},
+							pos:   position{line: 1362, col: 5, offset: 32671},
 							label: "first",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1362, col: 11, offset: 32681},
+								pos:  position{line: 1362, col: 11, offset: 32677},
 								name: "Type",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1362, col: 16, offset: 32686},
+							pos:   position{line: 1362, col: 16, offset: 32682},
 							label: "rest",
 							expr: &oneOrMoreExpr{
-								pos: position{line: 1362, col: 21, offset: 32691},
+								pos: position{line: 1362, col: 21, offset: 32687},
 								expr: &ruleRefExpr{
-									pos:  position{line: 1362, col: 21, offset: 32691},
+									pos:  position{line: 1362, col: 21, offset: 32687},
 									name: "TypeListTail",
 								},
 							},
@@ -9294,32 +9290,32 @@ var g = &grammar{
 		},
 		{
 			name: "TypeListTail",
-			pos:  position{line: 1366, col: 1, offset: 32749},
+			pos:  position{line: 1366, col: 1, offset: 32745},
 			expr: &actionExpr{
-				pos: position{line: 1366, col: 16, offset: 32764},
+				pos: position{line: 1366, col: 16, offset: 32760},
 				run: (*parser).callonTypeListTail1,
 				expr: &seqExpr{
-					pos: position{line: 1366, col: 16, offset: 32764},
+					pos: position{line: 1366, col: 16, offset: 32760},
 					exprs: []any{
 						&ruleRefExpr{
-							pos:  position{line: 1366, col: 16, offset: 32764},
+							pos:  position{line: 1366, col: 16, offset: 32760},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1366, col: 19, offset: 32767},
+							pos:        position{line: 1366, col: 19, offset: 32763},
 							val:        ",",
 							ignoreCase: false,
 							want:       "\",\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1366, col: 23, offset: 32771},
+							pos:  position{line: 1366, col: 23, offset: 32767},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1366, col: 26, offset: 32774},
+							pos:   position{line: 1366, col: 26, offset: 32770},
 							label: "typ",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1366, col: 30, offset: 32778},
+								pos:  position{line: 1366, col: 30, offset: 32774},
 								name: "Type",
 							},
 						},
@@ -9331,40 +9327,40 @@ var g = &grammar{
 		},
 		{
 			name: "ComplexType",
-			pos:  position{line: 1368, col: 1, offset: 32804},
+			pos:  position{line: 1368, col: 1, offset: 32800},
 			expr: &choiceExpr{
-				pos: position{line: 1369, col: 5, offset: 32820},
+				pos: position{line: 1369, col: 5, offset: 32816},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1369, col: 5, offset: 32820},
+						pos: position{line: 1369, col: 5, offset: 32816},
 						run: (*parser).callonComplexType2,
 						expr: &seqExpr{
-							pos: position{line: 1369, col: 5, offset: 32820},
+							pos: position{line: 1369, col: 5, offset: 32816},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1369, col: 5, offset: 32820},
+									pos:        position{line: 1369, col: 5, offset: 32816},
 									val:        "{",
 									ignoreCase: false,
 									want:       "\"{\"",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1369, col: 9, offset: 32824},
+									pos:  position{line: 1369, col: 9, offset: 32820},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 1369, col: 12, offset: 32827},
+									pos:   position{line: 1369, col: 12, offset: 32823},
 									label: "fields",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1369, col: 19, offset: 32834},
+										pos:  position{line: 1369, col: 19, offset: 32830},
 										name: "TypeFieldList",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1369, col: 33, offset: 32848},
+									pos:  position{line: 1369, col: 33, offset: 32844},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 1369, col: 36, offset: 32851},
+									pos:        position{line: 1369, col: 36, offset: 32847},
 									val:        "}",
 									ignoreCase: false,
 									want:       "\"}\"",
@@ -9373,35 +9369,35 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1376, col: 5, offset: 33013},
+						pos: position{line: 1376, col: 5, offset: 33009},
 						run: (*parser).callonComplexType10,
 						expr: &seqExpr{
-							pos: position{line: 1376, col: 5, offset: 33013},
+							pos: position{line: 1376, col: 5, offset: 33009},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1376, col: 5, offset: 33013},
+									pos:        position{line: 1376, col: 5, offset: 33009},
 									val:        "[",
 									ignoreCase: false,
 									want:       "\"[\"",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1376, col: 9, offset: 33017},
+									pos:  position{line: 1376, col: 9, offset: 33013},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 1376, col: 12, offset: 33020},
+									pos:   position{line: 1376, col: 12, offset: 33016},
 									label: "typ",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1376, col: 16, offset: 33024},
+										pos:  position{line: 1376, col: 16, offset: 33020},
 										name: "Type",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1376, col: 21, offset: 33029},
+									pos:  position{line: 1376, col: 21, offset: 33025},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 1376, col: 24, offset: 33032},
+									pos:        position{line: 1376, col: 24, offset: 33028},
 									val:        "]",
 									ignoreCase: false,
 									want:       "\"]\"",
@@ -9410,35 +9406,35 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1383, col: 5, offset: 33174},
+						pos: position{line: 1383, col: 5, offset: 33170},
 						run: (*parser).callonComplexType18,
 						expr: &seqExpr{
-							pos: position{line: 1383, col: 5, offset: 33174},
+							pos: position{line: 1383, col: 5, offset: 33170},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1383, col: 5, offset: 33174},
+									pos:        position{line: 1383, col: 5, offset: 33170},
 									val:        "|[",
 									ignoreCase: false,
 									want:       "\"|[\"",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1383, col: 10, offset: 33179},
+									pos:  position{line: 1383, col: 10, offset: 33175},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 1383, col: 13, offset: 33182},
+									pos:   position{line: 1383, col: 13, offset: 33178},
 									label: "typ",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1383, col: 17, offset: 33186},
+										pos:  position{line: 1383, col: 17, offset: 33182},
 										name: "Type",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1383, col: 22, offset: 33191},
+									pos:  position{line: 1383, col: 22, offset: 33187},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 1383, col: 25, offset: 33194},
+									pos:        position{line: 1383, col: 25, offset: 33190},
 									val:        "]|",
 									ignoreCase: false,
 									want:       "\"]|\"",
@@ -9447,57 +9443,57 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1390, col: 5, offset: 33333},
+						pos: position{line: 1390, col: 5, offset: 33329},
 						run: (*parser).callonComplexType26,
 						expr: &seqExpr{
-							pos: position{line: 1390, col: 5, offset: 33333},
+							pos: position{line: 1390, col: 5, offset: 33329},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1390, col: 5, offset: 33333},
+									pos:        position{line: 1390, col: 5, offset: 33329},
 									val:        "|{",
 									ignoreCase: false,
 									want:       "\"|{\"",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1390, col: 10, offset: 33338},
+									pos:  position{line: 1390, col: 10, offset: 33334},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 1390, col: 13, offset: 33341},
+									pos:   position{line: 1390, col: 13, offset: 33337},
 									label: "keyType",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1390, col: 21, offset: 33349},
+										pos:  position{line: 1390, col: 21, offset: 33345},
 										name: "Type",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1390, col: 26, offset: 33354},
+									pos:  position{line: 1390, col: 26, offset: 33350},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 1390, col: 29, offset: 33357},
+									pos:        position{line: 1390, col: 29, offset: 33353},
 									val:        ":",
 									ignoreCase: false,
 									want:       "\":\"",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1390, col: 33, offset: 33361},
+									pos:  position{line: 1390, col: 33, offset: 33357},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 1390, col: 36, offset: 33364},
+									pos:   position{line: 1390, col: 36, offset: 33360},
 									label: "valType",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1390, col: 44, offset: 33372},
+										pos:  position{line: 1390, col: 44, offset: 33368},
 										name: "Type",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1390, col: 49, offset: 33377},
+									pos:  position{line: 1390, col: 49, offset: 33373},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 1390, col: 52, offset: 33380},
+									pos:        position{line: 1390, col: 52, offset: 33376},
 									val:        "}|",
 									ignoreCase: false,
 									want:       "\"}|\"",
@@ -9512,35 +9508,35 @@ var g = &grammar{
 		},
 		{
 			name: "StringLiteral",
-			pos:  position{line: 1399, col: 1, offset: 33554},
+			pos:  position{line: 1399, col: 1, offset: 33550},
 			expr: &choiceExpr{
-				pos: position{line: 1400, col: 5, offset: 33572},
+				pos: position{line: 1400, col: 5, offset: 33568},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1400, col: 5, offset: 33572},
+						pos: position{line: 1400, col: 5, offset: 33568},
 						run: (*parser).callonStringLiteral2,
 						expr: &seqExpr{
-							pos: position{line: 1400, col: 5, offset: 33572},
+							pos: position{line: 1400, col: 5, offset: 33568},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1400, col: 5, offset: 33572},
+									pos:        position{line: 1400, col: 5, offset: 33568},
 									val:        "\"",
 									ignoreCase: false,
 									want:       "\"\\\"\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1400, col: 9, offset: 33576},
+									pos:   position{line: 1400, col: 9, offset: 33572},
 									label: "v",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1400, col: 11, offset: 33578},
+										pos: position{line: 1400, col: 11, offset: 33574},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1400, col: 11, offset: 33578},
+											pos:  position{line: 1400, col: 11, offset: 33574},
 											name: "DoubleQuotedChar",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1400, col: 29, offset: 33596},
+									pos:        position{line: 1400, col: 29, offset: 33592},
 									val:        "\"",
 									ignoreCase: false,
 									want:       "\"\\\"\"",
@@ -9549,30 +9545,30 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1401, col: 5, offset: 33660},
+						pos: position{line: 1401, col: 5, offset: 33656},
 						run: (*parser).callonStringLiteral9,
 						expr: &seqExpr{
-							pos: position{line: 1401, col: 5, offset: 33660},
+							pos: position{line: 1401, col: 5, offset: 33656},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1401, col: 5, offset: 33660},
+									pos:        position{line: 1401, col: 5, offset: 33656},
 									val:        "'",
 									ignoreCase: false,
 									want:       "\"'\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1401, col: 9, offset: 33664},
+									pos:   position{line: 1401, col: 9, offset: 33660},
 									label: "v",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1401, col: 11, offset: 33666},
+										pos: position{line: 1401, col: 11, offset: 33662},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1401, col: 11, offset: 33666},
+											pos:  position{line: 1401, col: 11, offset: 33662},
 											name: "SingleQuotedChar",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1401, col: 29, offset: 33684},
+									pos:        position{line: 1401, col: 29, offset: 33680},
 									val:        "'",
 									ignoreCase: false,
 									want:       "\"'\"",
@@ -9587,35 +9583,35 @@ var g = &grammar{
 		},
 		{
 			name: "FString",
-			pos:  position{line: 1403, col: 1, offset: 33745},
+			pos:  position{line: 1403, col: 1, offset: 33741},
 			expr: &choiceExpr{
-				pos: position{line: 1404, col: 5, offset: 33757},
+				pos: position{line: 1404, col: 5, offset: 33753},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1404, col: 5, offset: 33757},
+						pos: position{line: 1404, col: 5, offset: 33753},
 						run: (*parser).callonFString2,
 						expr: &seqExpr{
-							pos: position{line: 1404, col: 5, offset: 33757},
+							pos: position{line: 1404, col: 5, offset: 33753},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1404, col: 5, offset: 33757},
+									pos:        position{line: 1404, col: 5, offset: 33753},
 									val:        "f\"",
 									ignoreCase: false,
 									want:       "\"f\\\"\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1404, col: 11, offset: 33763},
+									pos:   position{line: 1404, col: 11, offset: 33759},
 									label: "v",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1404, col: 13, offset: 33765},
+										pos: position{line: 1404, col: 13, offset: 33761},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1404, col: 13, offset: 33765},
+											pos:  position{line: 1404, col: 13, offset: 33761},
 											name: "FStringDoubleQuotedElem",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1404, col: 38, offset: 33790},
+									pos:        position{line: 1404, col: 38, offset: 33786},
 									val:        "\"",
 									ignoreCase: false,
 									want:       "\"\\\"\"",
@@ -9624,30 +9620,30 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1411, col: 5, offset: 33936},
+						pos: position{line: 1411, col: 5, offset: 33932},
 						run: (*parser).callonFString9,
 						expr: &seqExpr{
-							pos: position{line: 1411, col: 5, offset: 33936},
+							pos: position{line: 1411, col: 5, offset: 33932},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1411, col: 5, offset: 33936},
+									pos:        position{line: 1411, col: 5, offset: 33932},
 									val:        "f'",
 									ignoreCase: false,
 									want:       "\"f'\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1411, col: 10, offset: 33941},
+									pos:   position{line: 1411, col: 10, offset: 33937},
 									label: "v",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1411, col: 12, offset: 33943},
+										pos: position{line: 1411, col: 12, offset: 33939},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1411, col: 12, offset: 33943},
+											pos:  position{line: 1411, col: 12, offset: 33939},
 											name: "FStringSingleQuotedElem",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1411, col: 37, offset: 33968},
+									pos:        position{line: 1411, col: 37, offset: 33964},
 									val:        "'",
 									ignoreCase: false,
 									want:       "\"'\"",
@@ -9662,24 +9658,24 @@ var g = &grammar{
 		},
 		{
 			name: "FStringDoubleQuotedElem",
-			pos:  position{line: 1419, col: 1, offset: 34111},
+			pos:  position{line: 1419, col: 1, offset: 34107},
 			expr: &choiceExpr{
-				pos: position{line: 1420, col: 5, offset: 34139},
+				pos: position{line: 1420, col: 5, offset: 34135},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1420, col: 5, offset: 34139},
+						pos:  position{line: 1420, col: 5, offset: 34135},
 						name: "FStringExpr",
 					},
 					&actionExpr{
-						pos: position{line: 1421, col: 5, offset: 34155},
+						pos: position{line: 1421, col: 5, offset: 34151},
 						run: (*parser).callonFStringDoubleQuotedElem3,
 						expr: &labeledExpr{
-							pos:   position{line: 1421, col: 5, offset: 34155},
+							pos:   position{line: 1421, col: 5, offset: 34151},
 							label: "v",
 							expr: &oneOrMoreExpr{
-								pos: position{line: 1421, col: 7, offset: 34157},
+								pos: position{line: 1421, col: 7, offset: 34153},
 								expr: &ruleRefExpr{
-									pos:  position{line: 1421, col: 7, offset: 34157},
+									pos:  position{line: 1421, col: 7, offset: 34153},
 									name: "FStringDoubleQuotedChar",
 								},
 							},
@@ -9692,27 +9688,27 @@ var g = &grammar{
 		},
 		{
 			name: "FStringDoubleQuotedChar",
-			pos:  position{line: 1425, col: 1, offset: 34280},
+			pos:  position{line: 1425, col: 1, offset: 34276},
 			expr: &choiceExpr{
-				pos: position{line: 1426, col: 5, offset: 34308},
+				pos: position{line: 1426, col: 5, offset: 34304},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1426, col: 5, offset: 34308},
+						pos: position{line: 1426, col: 5, offset: 34304},
 						run: (*parser).callonFStringDoubleQuotedChar2,
 						expr: &seqExpr{
-							pos: position{line: 1426, col: 5, offset: 34308},
+							pos: position{line: 1426, col: 5, offset: 34304},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1426, col: 5, offset: 34308},
+									pos:        position{line: 1426, col: 5, offset: 34304},
 									val:        "\\",
 									ignoreCase: false,
 									want:       "\"\\\\\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1426, col: 10, offset: 34313},
+									pos:   position{line: 1426, col: 10, offset: 34309},
 									label: "v",
 									expr: &litMatcher{
-										pos:        position{line: 1426, col: 12, offset: 34315},
+										pos:        position{line: 1426, col: 12, offset: 34311},
 										val:        "{",
 										ignoreCase: false,
 										want:       "\"{\"",
@@ -9722,25 +9718,25 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1427, col: 5, offset: 34341},
+						pos: position{line: 1427, col: 5, offset: 34337},
 						run: (*parser).callonFStringDoubleQuotedChar7,
 						expr: &seqExpr{
-							pos: position{line: 1427, col: 5, offset: 34341},
+							pos: position{line: 1427, col: 5, offset: 34337},
 							exprs: []any{
 								&notExpr{
-									pos: position{line: 1427, col: 5, offset: 34341},
+									pos: position{line: 1427, col: 5, offset: 34337},
 									expr: &litMatcher{
-										pos:        position{line: 1427, col: 7, offset: 34343},
+										pos:        position{line: 1427, col: 7, offset: 34339},
 										val:        "{",
 										ignoreCase: false,
 										want:       "\"{\"",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1427, col: 12, offset: 34348},
+									pos:   position{line: 1427, col: 12, offset: 34344},
 									label: "v",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1427, col: 14, offset: 34350},
+										pos:  position{line: 1427, col: 14, offset: 34346},
 										name: "DoubleQuotedChar",
 									},
 								},
@@ -9754,24 +9750,24 @@ var g = &grammar{
 		},
 		{
 			name: "FStringSingleQuotedElem",
-			pos:  position{line: 1429, col: 1, offset: 34386},
+			pos:  position{line: 1429, col: 1, offset: 34382},
 			expr: &choiceExpr{
-				pos: position{line: 1430, col: 5, offset: 34414},
+				pos: position{line: 1430, col: 5, offset: 34410},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1430, col: 5, offset: 34414},
+						pos:  position{line: 1430, col: 5, offset: 34410},
 						name: "FStringExpr",
 					},
 					&actionExpr{
-						pos: position{line: 1431, col: 5, offset: 34430},
+						pos: position{line: 1431, col: 5, offset: 34426},
 						run: (*parser).callonFStringSingleQuotedElem3,
 						expr: &labeledExpr{
-							pos:   position{line: 1431, col: 5, offset: 34430},
+							pos:   position{line: 1431, col: 5, offset: 34426},
 							label: "v",
 							expr: &oneOrMoreExpr{
-								pos: position{line: 1431, col: 7, offset: 34432},
+								pos: position{line: 1431, col: 7, offset: 34428},
 								expr: &ruleRefExpr{
-									pos:  position{line: 1431, col: 7, offset: 34432},
+									pos:  position{line: 1431, col: 7, offset: 34428},
 									name: "FStringSingleQuotedChar",
 								},
 							},
@@ -9784,27 +9780,27 @@ var g = &grammar{
 		},
 		{
 			name: "FStringSingleQuotedChar",
-			pos:  position{line: 1435, col: 1, offset: 34555},
+			pos:  position{line: 1435, col: 1, offset: 34551},
 			expr: &choiceExpr{
-				pos: position{line: 1436, col: 5, offset: 34583},
+				pos: position{line: 1436, col: 5, offset: 34579},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1436, col: 5, offset: 34583},
+						pos: position{line: 1436, col: 5, offset: 34579},
 						run: (*parser).callonFStringSingleQuotedChar2,
 						expr: &seqExpr{
-							pos: position{line: 1436, col: 5, offset: 34583},
+							pos: position{line: 1436, col: 5, offset: 34579},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1436, col: 5, offset: 34583},
+									pos:        position{line: 1436, col: 5, offset: 34579},
 									val:        "\\",
 									ignoreCase: false,
 									want:       "\"\\\\\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1436, col: 10, offset: 34588},
+									pos:   position{line: 1436, col: 10, offset: 34584},
 									label: "v",
 									expr: &litMatcher{
-										pos:        position{line: 1436, col: 12, offset: 34590},
+										pos:        position{line: 1436, col: 12, offset: 34586},
 										val:        "{",
 										ignoreCase: false,
 										want:       "\"{\"",
@@ -9814,25 +9810,25 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1437, col: 5, offset: 34616},
+						pos: position{line: 1437, col: 5, offset: 34612},
 						run: (*parser).callonFStringSingleQuotedChar7,
 						expr: &seqExpr{
-							pos: position{line: 1437, col: 5, offset: 34616},
+							pos: position{line: 1437, col: 5, offset: 34612},
 							exprs: []any{
 								&notExpr{
-									pos: position{line: 1437, col: 5, offset: 34616},
+									pos: position{line: 1437, col: 5, offset: 34612},
 									expr: &litMatcher{
-										pos:        position{line: 1437, col: 7, offset: 34618},
+										pos:        position{line: 1437, col: 7, offset: 34614},
 										val:        "{",
 										ignoreCase: false,
 										want:       "\"{\"",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1437, col: 12, offset: 34623},
+									pos:   position{line: 1437, col: 12, offset: 34619},
 									label: "v",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1437, col: 14, offset: 34625},
+										pos:  position{line: 1437, col: 14, offset: 34621},
 										name: "SingleQuotedChar",
 									},
 								},
@@ -9846,37 +9842,37 @@ var g = &grammar{
 		},
 		{
 			name: "FStringExpr",
-			pos:  position{line: 1439, col: 1, offset: 34661},
+			pos:  position{line: 1439, col: 1, offset: 34657},
 			expr: &actionExpr{
-				pos: position{line: 1440, col: 5, offset: 34677},
+				pos: position{line: 1440, col: 5, offset: 34673},
 				run: (*parser).callonFStringExpr1,
 				expr: &seqExpr{
-					pos: position{line: 1440, col: 5, offset: 34677},
+					pos: position{line: 1440, col: 5, offset: 34673},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1440, col: 5, offset: 34677},
+							pos:        position{line: 1440, col: 5, offset: 34673},
 							val:        "{",
 							ignoreCase: false,
 							want:       "\"{\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1440, col: 9, offset: 34681},
+							pos:  position{line: 1440, col: 9, offset: 34677},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1440, col: 12, offset: 34684},
+							pos:   position{line: 1440, col: 12, offset: 34680},
 							label: "e",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1440, col: 14, offset: 34686},
+								pos:  position{line: 1440, col: 14, offset: 34682},
 								name: "Expr",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1440, col: 19, offset: 34691},
+							pos:  position{line: 1440, col: 19, offset: 34687},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1440, col: 22, offset: 34694},
+							pos:        position{line: 1440, col: 22, offset: 34690},
 							val:        "}",
 							ignoreCase: false,
 							want:       "\"}\"",
@@ -9889,129 +9885,129 @@ var g = &grammar{
 		},
 		{
 			name: "PrimitiveType",
-			pos:  position{line: 1448, col: 1, offset: 34829},
+			pos:  position{line: 1448, col: 1, offset: 34825},
 			expr: &actionExpr{
-				pos: position{line: 1449, col: 5, offset: 34847},
+				pos: position{line: 1449, col: 5, offset: 34843},
 				run: (*parser).callonPrimitiveType1,
 				expr: &choiceExpr{
-					pos: position{line: 1449, col: 9, offset: 34851},
+					pos: position{line: 1449, col: 9, offset: 34847},
 					alternatives: []any{
 						&litMatcher{
-							pos:        position{line: 1449, col: 9, offset: 34851},
+							pos:        position{line: 1449, col: 9, offset: 34847},
 							val:        "uint8",
 							ignoreCase: false,
 							want:       "\"uint8\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1449, col: 19, offset: 34861},
+							pos:        position{line: 1449, col: 19, offset: 34857},
 							val:        "uint16",
 							ignoreCase: false,
 							want:       "\"uint16\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1449, col: 30, offset: 34872},
+							pos:        position{line: 1449, col: 30, offset: 34868},
 							val:        "uint32",
 							ignoreCase: false,
 							want:       "\"uint32\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1449, col: 41, offset: 34883},
+							pos:        position{line: 1449, col: 41, offset: 34879},
 							val:        "uint64",
 							ignoreCase: false,
 							want:       "\"uint64\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1450, col: 9, offset: 34900},
+							pos:        position{line: 1450, col: 9, offset: 34896},
 							val:        "int8",
 							ignoreCase: false,
 							want:       "\"int8\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1450, col: 18, offset: 34909},
+							pos:        position{line: 1450, col: 18, offset: 34905},
 							val:        "int16",
 							ignoreCase: false,
 							want:       "\"int16\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1450, col: 28, offset: 34919},
+							pos:        position{line: 1450, col: 28, offset: 34915},
 							val:        "int32",
 							ignoreCase: false,
 							want:       "\"int32\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1450, col: 38, offset: 34929},
+							pos:        position{line: 1450, col: 38, offset: 34925},
 							val:        "int64",
 							ignoreCase: false,
 							want:       "\"int64\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1451, col: 9, offset: 34945},
+							pos:        position{line: 1451, col: 9, offset: 34941},
 							val:        "float16",
 							ignoreCase: false,
 							want:       "\"float16\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1451, col: 21, offset: 34957},
+							pos:        position{line: 1451, col: 21, offset: 34953},
 							val:        "float32",
 							ignoreCase: false,
 							want:       "\"float32\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1451, col: 33, offset: 34969},
+							pos:        position{line: 1451, col: 33, offset: 34965},
 							val:        "float64",
 							ignoreCase: false,
 							want:       "\"float64\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1452, col: 9, offset: 34987},
+							pos:        position{line: 1452, col: 9, offset: 34983},
 							val:        "bool",
 							ignoreCase: false,
 							want:       "\"bool\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1452, col: 18, offset: 34996},
+							pos:        position{line: 1452, col: 18, offset: 34992},
 							val:        "string",
 							ignoreCase: false,
 							want:       "\"string\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1453, col: 9, offset: 35013},
+							pos:        position{line: 1453, col: 9, offset: 35009},
 							val:        "duration",
 							ignoreCase: false,
 							want:       "\"duration\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1453, col: 22, offset: 35026},
+							pos:        position{line: 1453, col: 22, offset: 35022},
 							val:        "time",
 							ignoreCase: false,
 							want:       "\"time\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1454, col: 9, offset: 35041},
+							pos:        position{line: 1454, col: 9, offset: 35037},
 							val:        "bytes",
 							ignoreCase: false,
 							want:       "\"bytes\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1455, col: 9, offset: 35057},
+							pos:        position{line: 1455, col: 9, offset: 35053},
 							val:        "ip",
 							ignoreCase: false,
 							want:       "\"ip\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1455, col: 16, offset: 35064},
+							pos:        position{line: 1455, col: 16, offset: 35060},
 							val:        "net",
 							ignoreCase: false,
 							want:       "\"net\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1456, col: 9, offset: 35078},
+							pos:        position{line: 1456, col: 9, offset: 35074},
 							val:        "type",
 							ignoreCase: false,
 							want:       "\"type\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1456, col: 18, offset: 35087},
+							pos:        position{line: 1456, col: 18, offset: 35083},
 							val:        "null",
 							ignoreCase: false,
 							want:       "\"null\"",
@@ -10024,31 +10020,31 @@ var g = &grammar{
 		},
 		{
 			name: "TypeFieldList",
-			pos:  position{line: 1464, col: 1, offset: 35272},
+			pos:  position{line: 1464, col: 1, offset: 35268},
 			expr: &choiceExpr{
-				pos: position{line: 1465, col: 5, offset: 35290},
+				pos: position{line: 1465, col: 5, offset: 35286},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1465, col: 5, offset: 35290},
+						pos: position{line: 1465, col: 5, offset: 35286},
 						run: (*parser).callonTypeFieldList2,
 						expr: &seqExpr{
-							pos: position{line: 1465, col: 5, offset: 35290},
+							pos: position{line: 1465, col: 5, offset: 35286},
 							exprs: []any{
 								&labeledExpr{
-									pos:   position{line: 1465, col: 5, offset: 35290},
+									pos:   position{line: 1465, col: 5, offset: 35286},
 									label: "first",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1465, col: 11, offset: 35296},
+										pos:  position{line: 1465, col: 11, offset: 35292},
 										name: "TypeField",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1465, col: 21, offset: 35306},
+									pos:   position{line: 1465, col: 21, offset: 35302},
 									label: "rest",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1465, col: 26, offset: 35311},
+										pos: position{line: 1465, col: 26, offset: 35307},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1465, col: 26, offset: 35311},
+											pos:  position{line: 1465, col: 26, offset: 35307},
 											name: "TypeFieldListTail",
 										},
 									},
@@ -10057,10 +10053,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1468, col: 5, offset: 35377},
+						pos: position{line: 1468, col: 5, offset: 35373},
 						run: (*parser).callonTypeFieldList9,
 						expr: &litMatcher{
-							pos:        position{line: 1468, col: 5, offset: 35377},
+							pos:        position{line: 1468, col: 5, offset: 35373},
 							val:        "",
 							ignoreCase: false,
 							want:       "\"\"",
@@ -10073,32 +10069,32 @@ var g = &grammar{
 		},
 		{
 			name: "TypeFieldListTail",
-			pos:  position{line: 1470, col: 1, offset: 35401},
+			pos:  position{line: 1470, col: 1, offset: 35397},
 			expr: &actionExpr{
-				pos: position{line: 1470, col: 21, offset: 35421},
+				pos: position{line: 1470, col: 21, offset: 35417},
 				run: (*parser).callonTypeFieldListTail1,
 				expr: &seqExpr{
-					pos: position{line: 1470, col: 21, offset: 35421},
+					pos: position{line: 1470, col: 21, offset: 35417},
 					exprs: []any{
 						&ruleRefExpr{
-							pos:  position{line: 1470, col: 21, offset: 35421},
+							pos:  position{line: 1470, col: 21, offset: 35417},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1470, col: 24, offset: 35424},
+							pos:        position{line: 1470, col: 24, offset: 35420},
 							val:        ",",
 							ignoreCase: false,
 							want:       "\",\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1470, col: 28, offset: 35428},
+							pos:  position{line: 1470, col: 28, offset: 35424},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1470, col: 31, offset: 35431},
+							pos:   position{line: 1470, col: 31, offset: 35427},
 							label: "typ",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1470, col: 35, offset: 35435},
+								pos:  position{line: 1470, col: 35, offset: 35431},
 								name: "TypeField",
 							},
 						},
@@ -10110,40 +10106,40 @@ var g = &grammar{
 		},
 		{
 			name: "TypeField",
-			pos:  position{line: 1472, col: 1, offset: 35466},
+			pos:  position{line: 1472, col: 1, offset: 35462},
 			expr: &actionExpr{
-				pos: position{line: 1473, col: 5, offset: 35480},
+				pos: position{line: 1473, col: 5, offset: 35476},
 				run: (*parser).callonTypeField1,
 				expr: &seqExpr{
-					pos: position{line: 1473, col: 5, offset: 35480},
+					pos: position{line: 1473, col: 5, offset: 35476},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 1473, col: 5, offset: 35480},
+							pos:   position{line: 1473, col: 5, offset: 35476},
 							label: "name",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1473, col: 10, offset: 35485},
+								pos:  position{line: 1473, col: 10, offset: 35481},
 								name: "Name",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1473, col: 15, offset: 35490},
+							pos:  position{line: 1473, col: 15, offset: 35486},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1473, col: 18, offset: 35493},
+							pos:        position{line: 1473, col: 18, offset: 35489},
 							val:        ":",
 							ignoreCase: false,
 							want:       "\":\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1473, col: 22, offset: 35497},
+							pos:  position{line: 1473, col: 22, offset: 35493},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1473, col: 25, offset: 35500},
+							pos:   position{line: 1473, col: 25, offset: 35496},
 							label: "typ",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1473, col: 29, offset: 35504},
+								pos:  position{line: 1473, col: 29, offset: 35500},
 								name: "Type",
 							},
 						},
@@ -10155,54 +10151,54 @@ var g = &grammar{
 		},
 		{
 			name: "Name",
-			pos:  position{line: 1481, col: 1, offset: 35653},
+			pos:  position{line: 1481, col: 1, offset: 35649},
 			expr: &choiceExpr{
-				pos: position{line: 1482, col: 5, offset: 35662},
+				pos: position{line: 1482, col: 5, offset: 35658},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1482, col: 5, offset: 35662},
+						pos: position{line: 1482, col: 5, offset: 35658},
 						run: (*parser).callonName2,
 						expr: &labeledExpr{
-							pos:   position{line: 1482, col: 5, offset: 35662},
+							pos:   position{line: 1482, col: 5, offset: 35658},
 							label: "s",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1482, col: 7, offset: 35664},
+								pos:  position{line: 1482, col: 7, offset: 35660},
 								name: "DottedIDs",
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1483, col: 5, offset: 35753},
+						pos: position{line: 1483, col: 5, offset: 35749},
 						run: (*parser).callonName5,
 						expr: &labeledExpr{
-							pos:   position{line: 1483, col: 5, offset: 35753},
+							pos:   position{line: 1483, col: 5, offset: 35749},
 							label: "s",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1483, col: 7, offset: 35755},
+								pos:  position{line: 1483, col: 7, offset: 35751},
 								name: "IdentifierName",
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1484, col: 5, offset: 35844},
+						pos: position{line: 1484, col: 5, offset: 35840},
 						run: (*parser).callonName8,
 						expr: &labeledExpr{
-							pos:   position{line: 1484, col: 5, offset: 35844},
+							pos:   position{line: 1484, col: 5, offset: 35840},
 							label: "s",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1484, col: 7, offset: 35846},
+								pos:  position{line: 1484, col: 7, offset: 35842},
 								name: "QuotedString",
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1485, col: 5, offset: 35935},
+						pos: position{line: 1485, col: 5, offset: 35931},
 						run: (*parser).callonName11,
 						expr: &labeledExpr{
-							pos:   position{line: 1485, col: 5, offset: 35935},
+							pos:   position{line: 1485, col: 5, offset: 35931},
 							label: "s",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1485, col: 7, offset: 35937},
+								pos:  position{line: 1485, col: 7, offset: 35933},
 								name: "KSUID",
 							},
 						},
@@ -10214,22 +10210,22 @@ var g = &grammar{
 		},
 		{
 			name: "DottedIDs",
-			pos:  position{line: 1487, col: 1, offset: 36023},
+			pos:  position{line: 1487, col: 1, offset: 36019},
 			expr: &actionExpr{
-				pos: position{line: 1488, col: 5, offset: 36037},
+				pos: position{line: 1488, col: 5, offset: 36033},
 				run: (*parser).callonDottedIDs1,
 				expr: &seqExpr{
-					pos: position{line: 1488, col: 5, offset: 36037},
+					pos: position{line: 1488, col: 5, offset: 36033},
 					exprs: []any{
 						&choiceExpr{
-							pos: position{line: 1488, col: 6, offset: 36038},
+							pos: position{line: 1488, col: 6, offset: 36034},
 							alternatives: []any{
 								&ruleRefExpr{
-									pos:  position{line: 1488, col: 6, offset: 36038},
+									pos:  position{line: 1488, col: 6, offset: 36034},
 									name: "IdentifierStart",
 								},
 								&litMatcher{
-									pos:        position{line: 1488, col: 24, offset: 36056},
+									pos:        position{line: 1488, col: 24, offset: 36052},
 									val:        ".",
 									ignoreCase: false,
 									want:       "\".\"",
@@ -10237,16 +10233,16 @@ var g = &grammar{
 							},
 						},
 						&zeroOrMoreExpr{
-							pos: position{line: 1488, col: 29, offset: 36061},
+							pos: position{line: 1488, col: 29, offset: 36057},
 							expr: &choiceExpr{
-								pos: position{line: 1488, col: 30, offset: 36062},
+								pos: position{line: 1488, col: 30, offset: 36058},
 								alternatives: []any{
 									&ruleRefExpr{
-										pos:  position{line: 1488, col: 30, offset: 36062},
+										pos:  position{line: 1488, col: 30, offset: 36058},
 										name: "IdentifierRest",
 									},
 									&litMatcher{
-										pos:        position{line: 1488, col: 47, offset: 36079},
+										pos:        position{line: 1488, col: 47, offset: 36075},
 										val:        ".",
 										ignoreCase: false,
 										want:       "\".\"",
@@ -10262,15 +10258,15 @@ var g = &grammar{
 		},
 		{
 			name: "Identifier",
-			pos:  position{line: 1490, col: 1, offset: 36117},
+			pos:  position{line: 1490, col: 1, offset: 36113},
 			expr: &actionExpr{
-				pos: position{line: 1491, col: 5, offset: 36132},
+				pos: position{line: 1491, col: 5, offset: 36128},
 				run: (*parser).callonIdentifier1,
 				expr: &labeledExpr{
-					pos:   position{line: 1491, col: 5, offset: 36132},
+					pos:   position{line: 1491, col: 5, offset: 36128},
 					label: "id",
 					expr: &ruleRefExpr{
-						pos:  position{line: 1491, col: 8, offset: 36135},
+						pos:  position{line: 1491, col: 8, offset: 36131},
 						name: "IdentifierName",
 					},
 				},
@@ -10280,51 +10276,51 @@ var g = &grammar{
 		},
 		{
 			name: "Identifiers",
-			pos:  position{line: 1499, col: 1, offset: 36268},
+			pos:  position{line: 1499, col: 1, offset: 36264},
 			expr: &actionExpr{
-				pos: position{line: 1500, col: 5, offset: 36284},
+				pos: position{line: 1500, col: 5, offset: 36280},
 				run: (*parser).callonIdentifiers1,
 				expr: &seqExpr{
-					pos: position{line: 1500, col: 5, offset: 36284},
+					pos: position{line: 1500, col: 5, offset: 36280},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 1500, col: 5, offset: 36284},
+							pos:   position{line: 1500, col: 5, offset: 36280},
 							label: "first",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1500, col: 11, offset: 36290},
+								pos:  position{line: 1500, col: 11, offset: 36286},
 								name: "Identifier",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1500, col: 22, offset: 36301},
+							pos:   position{line: 1500, col: 22, offset: 36297},
 							label: "rest",
 							expr: &zeroOrMoreExpr{
-								pos: position{line: 1500, col: 27, offset: 36306},
+								pos: position{line: 1500, col: 27, offset: 36302},
 								expr: &actionExpr{
-									pos: position{line: 1500, col: 28, offset: 36307},
+									pos: position{line: 1500, col: 28, offset: 36303},
 									run: (*parser).callonIdentifiers7,
 									expr: &seqExpr{
-										pos: position{line: 1500, col: 28, offset: 36307},
+										pos: position{line: 1500, col: 28, offset: 36303},
 										exprs: []any{
 											&ruleRefExpr{
-												pos:  position{line: 1500, col: 28, offset: 36307},
+												pos:  position{line: 1500, col: 28, offset: 36303},
 												name: "__",
 											},
 											&litMatcher{
-												pos:        position{line: 1500, col: 31, offset: 36310},
+												pos:        position{line: 1500, col: 31, offset: 36306},
 												val:        ",",
 												ignoreCase: false,
 												want:       "\",\"",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1500, col: 35, offset: 36314},
+												pos:  position{line: 1500, col: 35, offset: 36310},
 												name: "__",
 											},
 											&labeledExpr{
-												pos:   position{line: 1500, col: 38, offset: 36317},
+												pos:   position{line: 1500, col: 38, offset: 36313},
 												label: "name",
 												expr: &ruleRefExpr{
-													pos:  position{line: 1500, col: 43, offset: 36322},
+													pos:  position{line: 1500, col: 43, offset: 36318},
 													name: "Identifier",
 												},
 											},
@@ -10341,29 +10337,29 @@ var g = &grammar{
 		},
 		{
 			name: "IdentifierName",
-			pos:  position{line: 1504, col: 1, offset: 36400},
+			pos:  position{line: 1504, col: 1, offset: 36396},
 			expr: &choiceExpr{
-				pos: position{line: 1505, col: 5, offset: 36419},
+				pos: position{line: 1505, col: 5, offset: 36415},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1505, col: 5, offset: 36419},
+						pos: position{line: 1505, col: 5, offset: 36415},
 						run: (*parser).callonIdentifierName2,
 						expr: &seqExpr{
-							pos: position{line: 1505, col: 5, offset: 36419},
+							pos: position{line: 1505, col: 5, offset: 36415},
 							exprs: []any{
 								&notExpr{
-									pos: position{line: 1505, col: 5, offset: 36419},
+									pos: position{line: 1505, col: 5, offset: 36415},
 									expr: &seqExpr{
-										pos: position{line: 1505, col: 7, offset: 36421},
+										pos: position{line: 1505, col: 7, offset: 36417},
 										exprs: []any{
 											&ruleRefExpr{
-												pos:  position{line: 1505, col: 7, offset: 36421},
+												pos:  position{line: 1505, col: 7, offset: 36417},
 												name: "IDGuard",
 											},
 											&notExpr{
-												pos: position{line: 1505, col: 15, offset: 36429},
+												pos: position{line: 1505, col: 15, offset: 36425},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1505, col: 16, offset: 36430},
+													pos:  position{line: 1505, col: 16, offset: 36426},
 													name: "IdentifierRest",
 												},
 											},
@@ -10371,13 +10367,13 @@ var g = &grammar{
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1505, col: 32, offset: 36446},
+									pos:  position{line: 1505, col: 32, offset: 36442},
 									name: "IdentifierStart",
 								},
 								&zeroOrMoreExpr{
-									pos: position{line: 1505, col: 48, offset: 36462},
+									pos: position{line: 1505, col: 48, offset: 36458},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1505, col: 48, offset: 36462},
+										pos:  position{line: 1505, col: 48, offset: 36458},
 										name: "IdentifierRest",
 									},
 								},
@@ -10385,32 +10381,32 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1506, col: 5, offset: 36513},
+						pos: position{line: 1506, col: 5, offset: 36509},
 						run: (*parser).callonIdentifierName12,
 						expr: &litMatcher{
-							pos:        position{line: 1506, col: 5, offset: 36513},
+							pos:        position{line: 1506, col: 5, offset: 36509},
 							val:        "$",
 							ignoreCase: false,
 							want:       "\"$\"",
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1507, col: 5, offset: 36552},
+						pos: position{line: 1507, col: 5, offset: 36548},
 						run: (*parser).callonIdentifierName14,
 						expr: &seqExpr{
-							pos: position{line: 1507, col: 5, offset: 36552},
+							pos: position{line: 1507, col: 5, offset: 36548},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1507, col: 5, offset: 36552},
+									pos:        position{line: 1507, col: 5, offset: 36548},
 									val:        "\\",
 									ignoreCase: false,
 									want:       "\"\\\\\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1507, col: 10, offset: 36557},
+									pos:   position{line: 1507, col: 10, offset: 36553},
 									label: "id",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1507, col: 13, offset: 36560},
+										pos:  position{line: 1507, col: 13, offset: 36556},
 										name: "IDGuard",
 									},
 								},
@@ -10418,17 +10414,17 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1509, col: 5, offset: 36651},
+						pos: position{line: 1509, col: 5, offset: 36647},
 						run: (*parser).callonIdentifierName19,
 						expr: &litMatcher{
-							pos:        position{line: 1509, col: 5, offset: 36651},
+							pos:        position{line: 1509, col: 5, offset: 36647},
 							val:        "type",
 							ignoreCase: false,
 							want:       "\"type\"",
 						},
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1510, col: 5, offset: 36693},
+						pos:  position{line: 1510, col: 5, offset: 36689},
 						name: "BacktickString",
 					},
 				},
@@ -10438,22 +10434,22 @@ var g = &grammar{
 		},
 		{
 			name: "IdentifierStart",
-			pos:  position{line: 1512, col: 1, offset: 36710},
+			pos:  position{line: 1512, col: 1, offset: 36706},
 			expr: &choiceExpr{
-				pos: position{line: 1513, col: 5, offset: 36730},
+				pos: position{line: 1513, col: 5, offset: 36726},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1513, col: 5, offset: 36730},
+						pos:  position{line: 1513, col: 5, offset: 36726},
 						name: "UnicodeLetter",
 					},
 					&litMatcher{
-						pos:        position{line: 1514, col: 5, offset: 36748},
+						pos:        position{line: 1514, col: 5, offset: 36744},
 						val:        "$",
 						ignoreCase: false,
 						want:       "\"$\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1515, col: 5, offset: 36756},
+						pos:        position{line: 1515, col: 5, offset: 36752},
 						val:        "_",
 						ignoreCase: false,
 						want:       "\"_\"",
@@ -10465,24 +10461,24 @@ var g = &grammar{
 		},
 		{
 			name: "IdentifierRest",
-			pos:  position{line: 1517, col: 1, offset: 36761},
+			pos:  position{line: 1517, col: 1, offset: 36757},
 			expr: &choiceExpr{
-				pos: position{line: 1518, col: 5, offset: 36780},
+				pos: position{line: 1518, col: 5, offset: 36776},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1518, col: 5, offset: 36780},
+						pos:  position{line: 1518, col: 5, offset: 36776},
 						name: "IdentifierStart",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1519, col: 5, offset: 36800},
+						pos:  position{line: 1519, col: 5, offset: 36796},
 						name: "UnicodeCombiningMark",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1520, col: 5, offset: 36825},
+						pos:  position{line: 1520, col: 5, offset: 36821},
 						name: "UnicodeDigit",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1521, col: 5, offset: 36842},
+						pos:  position{line: 1521, col: 5, offset: 36838},
 						name: "UnicodeConnectorPunctuation",
 					},
 				},
@@ -10492,24 +10488,24 @@ var g = &grammar{
 		},
 		{
 			name: "IDGuard",
-			pos:  position{line: 1523, col: 1, offset: 36871},
+			pos:  position{line: 1523, col: 1, offset: 36867},
 			expr: &choiceExpr{
-				pos: position{line: 1524, col: 5, offset: 36883},
+				pos: position{line: 1524, col: 5, offset: 36879},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1524, col: 5, offset: 36883},
+						pos:  position{line: 1524, col: 5, offset: 36879},
 						name: "BooleanLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1525, col: 5, offset: 36902},
+						pos:  position{line: 1525, col: 5, offset: 36898},
 						name: "NullLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1526, col: 5, offset: 36918},
+						pos:  position{line: 1526, col: 5, offset: 36914},
 						name: "NaN",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1527, col: 5, offset: 36926},
+						pos:  position{line: 1527, col: 5, offset: 36922},
 						name: "Infinity",
 					},
 				},
@@ -10519,25 +10515,25 @@ var g = &grammar{
 		},
 		{
 			name: "Time",
-			pos:  position{line: 1529, col: 1, offset: 36936},
+			pos:  position{line: 1529, col: 1, offset: 36932},
 			expr: &actionExpr{
-				pos: position{line: 1530, col: 5, offset: 36945},
+				pos: position{line: 1530, col: 5, offset: 36941},
 				run: (*parser).callonTime1,
 				expr: &seqExpr{
-					pos: position{line: 1530, col: 5, offset: 36945},
+					pos: position{line: 1530, col: 5, offset: 36941},
 					exprs: []any{
 						&ruleRefExpr{
-							pos:  position{line: 1530, col: 5, offset: 36945},
+							pos:  position{line: 1530, col: 5, offset: 36941},
 							name: "FullDate",
 						},
 						&litMatcher{
-							pos:        position{line: 1530, col: 14, offset: 36954},
+							pos:        position{line: 1530, col: 14, offset: 36950},
 							val:        "T",
 							ignoreCase: false,
 							want:       "\"T\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1530, col: 18, offset: 36958},
+							pos:  position{line: 1530, col: 18, offset: 36954},
 							name: "FullTime",
 						},
 					},
@@ -10548,32 +10544,32 @@ var g = &grammar{
 		},
 		{
 			name: "FullDate",
-			pos:  position{line: 1534, col: 1, offset: 37034},
+			pos:  position{line: 1534, col: 1, offset: 37030},
 			expr: &seqExpr{
-				pos: position{line: 1534, col: 12, offset: 37045},
+				pos: position{line: 1534, col: 12, offset: 37041},
 				exprs: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1534, col: 12, offset: 37045},
+						pos:  position{line: 1534, col: 12, offset: 37041},
 						name: "D4",
 					},
 					&litMatcher{
-						pos:        position{line: 1534, col: 15, offset: 37048},
+						pos:        position{line: 1534, col: 15, offset: 37044},
 						val:        "-",
 						ignoreCase: false,
 						want:       "\"-\"",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1534, col: 19, offset: 37052},
+						pos:  position{line: 1534, col: 19, offset: 37048},
 						name: "D2",
 					},
 					&litMatcher{
-						pos:        position{line: 1534, col: 22, offset: 37055},
+						pos:        position{line: 1534, col: 22, offset: 37051},
 						val:        "-",
 						ignoreCase: false,
 						want:       "\"-\"",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1534, col: 26, offset: 37059},
+						pos:  position{line: 1534, col: 26, offset: 37055},
 						name: "D2",
 					},
 				},
@@ -10583,33 +10579,33 @@ var g = &grammar{
 		},
 		{
 			name: "D4",
-			pos:  position{line: 1536, col: 1, offset: 37063},
+			pos:  position{line: 1536, col: 1, offset: 37059},
 			expr: &seqExpr{
-				pos: position{line: 1536, col: 6, offset: 37068},
+				pos: position{line: 1536, col: 6, offset: 37064},
 				exprs: []any{
 					&charClassMatcher{
-						pos:        position{line: 1536, col: 6, offset: 37068},
+						pos:        position{line: 1536, col: 6, offset: 37064},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
 						inverted:   false,
 					},
 					&charClassMatcher{
-						pos:        position{line: 1536, col: 11, offset: 37073},
+						pos:        position{line: 1536, col: 11, offset: 37069},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
 						inverted:   false,
 					},
 					&charClassMatcher{
-						pos:        position{line: 1536, col: 16, offset: 37078},
+						pos:        position{line: 1536, col: 16, offset: 37074},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
 						inverted:   false,
 					},
 					&charClassMatcher{
-						pos:        position{line: 1536, col: 21, offset: 37083},
+						pos:        position{line: 1536, col: 21, offset: 37079},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
@@ -10622,19 +10618,19 @@ var g = &grammar{
 		},
 		{
 			name: "D2",
-			pos:  position{line: 1537, col: 1, offset: 37089},
+			pos:  position{line: 1537, col: 1, offset: 37085},
 			expr: &seqExpr{
-				pos: position{line: 1537, col: 6, offset: 37094},
+				pos: position{line: 1537, col: 6, offset: 37090},
 				exprs: []any{
 					&charClassMatcher{
-						pos:        position{line: 1537, col: 6, offset: 37094},
+						pos:        position{line: 1537, col: 6, offset: 37090},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
 						inverted:   false,
 					},
 					&charClassMatcher{
-						pos:        position{line: 1537, col: 11, offset: 37099},
+						pos:        position{line: 1537, col: 11, offset: 37095},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
@@ -10647,16 +10643,16 @@ var g = &grammar{
 		},
 		{
 			name: "FullTime",
-			pos:  position{line: 1539, col: 1, offset: 37106},
+			pos:  position{line: 1539, col: 1, offset: 37102},
 			expr: &seqExpr{
-				pos: position{line: 1539, col: 12, offset: 37117},
+				pos: position{line: 1539, col: 12, offset: 37113},
 				exprs: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1539, col: 12, offset: 37117},
+						pos:  position{line: 1539, col: 12, offset: 37113},
 						name: "PartialTime",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1539, col: 24, offset: 37129},
+						pos:  position{line: 1539, col: 24, offset: 37125},
 						name: "TimeOffset",
 					},
 				},
@@ -10666,49 +10662,49 @@ var g = &grammar{
 		},
 		{
 			name: "PartialTime",
-			pos:  position{line: 1541, col: 1, offset: 37141},
+			pos:  position{line: 1541, col: 1, offset: 37137},
 			expr: &seqExpr{
-				pos: position{line: 1541, col: 15, offset: 37155},
+				pos: position{line: 1541, col: 15, offset: 37151},
 				exprs: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1541, col: 15, offset: 37155},
+						pos:  position{line: 1541, col: 15, offset: 37151},
 						name: "D2",
 					},
 					&litMatcher{
-						pos:        position{line: 1541, col: 18, offset: 37158},
+						pos:        position{line: 1541, col: 18, offset: 37154},
 						val:        ":",
 						ignoreCase: false,
 						want:       "\":\"",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1541, col: 22, offset: 37162},
+						pos:  position{line: 1541, col: 22, offset: 37158},
 						name: "D2",
 					},
 					&litMatcher{
-						pos:        position{line: 1541, col: 25, offset: 37165},
+						pos:        position{line: 1541, col: 25, offset: 37161},
 						val:        ":",
 						ignoreCase: false,
 						want:       "\":\"",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1541, col: 29, offset: 37169},
+						pos:  position{line: 1541, col: 29, offset: 37165},
 						name: "D2",
 					},
 					&zeroOrOneExpr{
-						pos: position{line: 1541, col: 32, offset: 37172},
+						pos: position{line: 1541, col: 32, offset: 37168},
 						expr: &seqExpr{
-							pos: position{line: 1541, col: 33, offset: 37173},
+							pos: position{line: 1541, col: 33, offset: 37169},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1541, col: 33, offset: 37173},
+									pos:        position{line: 1541, col: 33, offset: 37169},
 									val:        ".",
 									ignoreCase: false,
 									want:       "\".\"",
 								},
 								&oneOrMoreExpr{
-									pos: position{line: 1541, col: 37, offset: 37177},
+									pos: position{line: 1541, col: 37, offset: 37173},
 									expr: &charClassMatcher{
-										pos:        position{line: 1541, col: 37, offset: 37177},
+										pos:        position{line: 1541, col: 37, offset: 37173},
 										val:        "[0-9]",
 										ranges:     []rune{'0', '9'},
 										ignoreCase: false,
@@ -10725,30 +10721,30 @@ var g = &grammar{
 		},
 		{
 			name: "TimeOffset",
-			pos:  position{line: 1543, col: 1, offset: 37187},
+			pos:  position{line: 1543, col: 1, offset: 37183},
 			expr: &choiceExpr{
-				pos: position{line: 1544, col: 5, offset: 37202},
+				pos: position{line: 1544, col: 5, offset: 37198},
 				alternatives: []any{
 					&litMatcher{
-						pos:        position{line: 1544, col: 5, offset: 37202},
+						pos:        position{line: 1544, col: 5, offset: 37198},
 						val:        "Z",
 						ignoreCase: false,
 						want:       "\"Z\"",
 					},
 					&seqExpr{
-						pos: position{line: 1545, col: 5, offset: 37210},
+						pos: position{line: 1545, col: 5, offset: 37206},
 						exprs: []any{
 							&choiceExpr{
-								pos: position{line: 1545, col: 6, offset: 37211},
+								pos: position{line: 1545, col: 6, offset: 37207},
 								alternatives: []any{
 									&litMatcher{
-										pos:        position{line: 1545, col: 6, offset: 37211},
+										pos:        position{line: 1545, col: 6, offset: 37207},
 										val:        "+",
 										ignoreCase: false,
 										want:       "\"+\"",
 									},
 									&litMatcher{
-										pos:        position{line: 1545, col: 12, offset: 37217},
+										pos:        position{line: 1545, col: 12, offset: 37213},
 										val:        "-",
 										ignoreCase: false,
 										want:       "\"-\"",
@@ -10756,34 +10752,34 @@ var g = &grammar{
 								},
 							},
 							&ruleRefExpr{
-								pos:  position{line: 1545, col: 17, offset: 37222},
+								pos:  position{line: 1545, col: 17, offset: 37218},
 								name: "D2",
 							},
 							&litMatcher{
-								pos:        position{line: 1545, col: 20, offset: 37225},
+								pos:        position{line: 1545, col: 20, offset: 37221},
 								val:        ":",
 								ignoreCase: false,
 								want:       "\":\"",
 							},
 							&ruleRefExpr{
-								pos:  position{line: 1545, col: 24, offset: 37229},
+								pos:  position{line: 1545, col: 24, offset: 37225},
 								name: "D2",
 							},
 							&zeroOrOneExpr{
-								pos: position{line: 1545, col: 27, offset: 37232},
+								pos: position{line: 1545, col: 27, offset: 37228},
 								expr: &seqExpr{
-									pos: position{line: 1545, col: 28, offset: 37233},
+									pos: position{line: 1545, col: 28, offset: 37229},
 									exprs: []any{
 										&litMatcher{
-											pos:        position{line: 1545, col: 28, offset: 37233},
+											pos:        position{line: 1545, col: 28, offset: 37229},
 											val:        ".",
 											ignoreCase: false,
 											want:       "\".\"",
 										},
 										&oneOrMoreExpr{
-											pos: position{line: 1545, col: 32, offset: 37237},
+											pos: position{line: 1545, col: 32, offset: 37233},
 											expr: &charClassMatcher{
-												pos:        position{line: 1545, col: 32, offset: 37237},
+												pos:        position{line: 1545, col: 32, offset: 37233},
 												val:        "[0-9]",
 												ranges:     []rune{'0', '9'},
 												ignoreCase: false,
@@ -10802,33 +10798,33 @@ var g = &grammar{
 		},
 		{
 			name: "Duration",
-			pos:  position{line: 1547, col: 1, offset: 37247},
+			pos:  position{line: 1547, col: 1, offset: 37243},
 			expr: &actionExpr{
-				pos: position{line: 1548, col: 5, offset: 37260},
+				pos: position{line: 1548, col: 5, offset: 37256},
 				run: (*parser).callonDuration1,
 				expr: &seqExpr{
-					pos: position{line: 1548, col: 5, offset: 37260},
+					pos: position{line: 1548, col: 5, offset: 37256},
 					exprs: []any{
 						&zeroOrOneExpr{
-							pos: position{line: 1548, col: 5, offset: 37260},
+							pos: position{line: 1548, col: 5, offset: 37256},
 							expr: &litMatcher{
-								pos:        position{line: 1548, col: 5, offset: 37260},
+								pos:        position{line: 1548, col: 5, offset: 37256},
 								val:        "-",
 								ignoreCase: false,
 								want:       "\"-\"",
 							},
 						},
 						&oneOrMoreExpr{
-							pos: position{line: 1548, col: 10, offset: 37265},
+							pos: position{line: 1548, col: 10, offset: 37261},
 							expr: &seqExpr{
-								pos: position{line: 1548, col: 11, offset: 37266},
+								pos: position{line: 1548, col: 11, offset: 37262},
 								exprs: []any{
 									&ruleRefExpr{
-										pos:  position{line: 1548, col: 11, offset: 37266},
+										pos:  position{line: 1548, col: 11, offset: 37262},
 										name: "Decimal",
 									},
 									&ruleRefExpr{
-										pos:  position{line: 1548, col: 19, offset: 37274},
+										pos:  position{line: 1548, col: 19, offset: 37270},
 										name: "TimeUnit",
 									},
 								},
@@ -10842,27 +10838,27 @@ var g = &grammar{
 		},
 		{
 			name: "Decimal",
-			pos:  position{line: 1552, col: 1, offset: 37356},
+			pos:  position{line: 1552, col: 1, offset: 37352},
 			expr: &seqExpr{
-				pos: position{line: 1552, col: 11, offset: 37366},
+				pos: position{line: 1552, col: 11, offset: 37362},
 				exprs: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1552, col: 11, offset: 37366},
+						pos:  position{line: 1552, col: 11, offset: 37362},
 						name: "UInt",
 					},
 					&zeroOrOneExpr{
-						pos: position{line: 1552, col: 16, offset: 37371},
+						pos: position{line: 1552, col: 16, offset: 37367},
 						expr: &seqExpr{
-							pos: position{line: 1552, col: 17, offset: 37372},
+							pos: position{line: 1552, col: 17, offset: 37368},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1552, col: 17, offset: 37372},
+									pos:        position{line: 1552, col: 17, offset: 37368},
 									val:        ".",
 									ignoreCase: false,
 									want:       "\".\"",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1552, col: 21, offset: 37376},
+									pos:  position{line: 1552, col: 21, offset: 37372},
 									name: "UInt",
 								},
 							},
@@ -10875,60 +10871,60 @@ var g = &grammar{
 		},
 		{
 			name: "TimeUnit",
-			pos:  position{line: 1554, col: 1, offset: 37384},
+			pos:  position{line: 1554, col: 1, offset: 37380},
 			expr: &choiceExpr{
-				pos: position{line: 1555, col: 5, offset: 37397},
+				pos: position{line: 1555, col: 5, offset: 37393},
 				alternatives: []any{
 					&litMatcher{
-						pos:        position{line: 1555, col: 5, offset: 37397},
+						pos:        position{line: 1555, col: 5, offset: 37393},
 						val:        "ns",
 						ignoreCase: false,
 						want:       "\"ns\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1556, col: 5, offset: 37406},
+						pos:        position{line: 1556, col: 5, offset: 37402},
 						val:        "us",
 						ignoreCase: false,
 						want:       "\"us\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1557, col: 5, offset: 37415},
+						pos:        position{line: 1557, col: 5, offset: 37411},
 						val:        "ms",
 						ignoreCase: false,
 						want:       "\"ms\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1558, col: 5, offset: 37424},
+						pos:        position{line: 1558, col: 5, offset: 37420},
 						val:        "s",
 						ignoreCase: false,
 						want:       "\"s\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1559, col: 5, offset: 37432},
+						pos:        position{line: 1559, col: 5, offset: 37428},
 						val:        "m",
 						ignoreCase: false,
 						want:       "\"m\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1560, col: 5, offset: 37440},
+						pos:        position{line: 1560, col: 5, offset: 37436},
 						val:        "h",
 						ignoreCase: false,
 						want:       "\"h\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1561, col: 5, offset: 37448},
+						pos:        position{line: 1561, col: 5, offset: 37444},
 						val:        "d",
 						ignoreCase: false,
 						want:       "\"d\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1562, col: 5, offset: 37456},
+						pos:        position{line: 1562, col: 5, offset: 37452},
 						val:        "w",
 						ignoreCase: false,
 						want:       "\"w\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1563, col: 5, offset: 37464},
+						pos:        position{line: 1563, col: 5, offset: 37460},
 						val:        "y",
 						ignoreCase: false,
 						want:       "\"y\"",
@@ -10940,45 +10936,45 @@ var g = &grammar{
 		},
 		{
 			name: "IP",
-			pos:  position{line: 1565, col: 1, offset: 37469},
+			pos:  position{line: 1565, col: 1, offset: 37465},
 			expr: &actionExpr{
-				pos: position{line: 1566, col: 5, offset: 37476},
+				pos: position{line: 1566, col: 5, offset: 37472},
 				run: (*parser).callonIP1,
 				expr: &seqExpr{
-					pos: position{line: 1566, col: 5, offset: 37476},
+					pos: position{line: 1566, col: 5, offset: 37472},
 					exprs: []any{
 						&ruleRefExpr{
-							pos:  position{line: 1566, col: 5, offset: 37476},
+							pos:  position{line: 1566, col: 5, offset: 37472},
 							name: "UInt",
 						},
 						&litMatcher{
-							pos:        position{line: 1566, col: 10, offset: 37481},
+							pos:        position{line: 1566, col: 10, offset: 37477},
 							val:        ".",
 							ignoreCase: false,
 							want:       "\".\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1566, col: 14, offset: 37485},
+							pos:  position{line: 1566, col: 14, offset: 37481},
 							name: "UInt",
 						},
 						&litMatcher{
-							pos:        position{line: 1566, col: 19, offset: 37490},
+							pos:        position{line: 1566, col: 19, offset: 37486},
 							val:        ".",
 							ignoreCase: false,
 							want:       "\".\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1566, col: 23, offset: 37494},
+							pos:  position{line: 1566, col: 23, offset: 37490},
 							name: "UInt",
 						},
 						&litMatcher{
-							pos:        position{line: 1566, col: 28, offset: 37499},
+							pos:        position{line: 1566, col: 28, offset: 37495},
 							val:        ".",
 							ignoreCase: false,
 							want:       "\".\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1566, col: 32, offset: 37503},
+							pos:  position{line: 1566, col: 32, offset: 37499},
 							name: "UInt",
 						},
 					},
@@ -10989,43 +10985,43 @@ var g = &grammar{
 		},
 		{
 			name: "IP6",
-			pos:  position{line: 1568, col: 1, offset: 37540},
+			pos:  position{line: 1568, col: 1, offset: 37536},
 			expr: &actionExpr{
-				pos: position{line: 1569, col: 5, offset: 37548},
+				pos: position{line: 1569, col: 5, offset: 37544},
 				run: (*parser).callonIP61,
 				expr: &seqExpr{
-					pos: position{line: 1569, col: 5, offset: 37548},
+					pos: position{line: 1569, col: 5, offset: 37544},
 					exprs: []any{
 						&notExpr{
-							pos: position{line: 1569, col: 5, offset: 37548},
+							pos: position{line: 1569, col: 5, offset: 37544},
 							expr: &seqExpr{
-								pos: position{line: 1569, col: 7, offset: 37550},
+								pos: position{line: 1569, col: 7, offset: 37546},
 								exprs: []any{
 									&ruleRefExpr{
-										pos:  position{line: 1569, col: 7, offset: 37550},
+										pos:  position{line: 1569, col: 7, offset: 37546},
 										name: "Hex",
 									},
 									&litMatcher{
-										pos:        position{line: 1569, col: 11, offset: 37554},
+										pos:        position{line: 1569, col: 11, offset: 37550},
 										val:        ":",
 										ignoreCase: false,
 										want:       "\":\"",
 									},
 									&ruleRefExpr{
-										pos:  position{line: 1569, col: 15, offset: 37558},
+										pos:  position{line: 1569, col: 15, offset: 37554},
 										name: "Hex",
 									},
 									&notExpr{
-										pos: position{line: 1569, col: 19, offset: 37562},
+										pos: position{line: 1569, col: 19, offset: 37558},
 										expr: &choiceExpr{
-											pos: position{line: 1569, col: 21, offset: 37564},
+											pos: position{line: 1569, col: 21, offset: 37560},
 											alternatives: []any{
 												&ruleRefExpr{
-													pos:  position{line: 1569, col: 21, offset: 37564},
+													pos:  position{line: 1569, col: 21, offset: 37560},
 													name: "HexDigit",
 												},
 												&litMatcher{
-													pos:        position{line: 1569, col: 32, offset: 37575},
+													pos:        position{line: 1569, col: 32, offset: 37571},
 													val:        ":",
 													ignoreCase: false,
 													want:       "\":\"",
@@ -11037,10 +11033,10 @@ var g = &grammar{
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1569, col: 38, offset: 37581},
+							pos:   position{line: 1569, col: 38, offset: 37577},
 							label: "v",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1569, col: 40, offset: 37583},
+								pos:  position{line: 1569, col: 40, offset: 37579},
 								name: "IP6Variations",
 							},
 						},
@@ -11052,32 +11048,32 @@ var g = &grammar{
 		},
 		{
 			name: "IP6Variations",
-			pos:  position{line: 1573, col: 1, offset: 37747},
+			pos:  position{line: 1573, col: 1, offset: 37743},
 			expr: &choiceExpr{
-				pos: position{line: 1574, col: 5, offset: 37765},
+				pos: position{line: 1574, col: 5, offset: 37761},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1574, col: 5, offset: 37765},
+						pos: position{line: 1574, col: 5, offset: 37761},
 						run: (*parser).callonIP6Variations2,
 						expr: &seqExpr{
-							pos: position{line: 1574, col: 5, offset: 37765},
+							pos: position{line: 1574, col: 5, offset: 37761},
 							exprs: []any{
 								&labeledExpr{
-									pos:   position{line: 1574, col: 5, offset: 37765},
+									pos:   position{line: 1574, col: 5, offset: 37761},
 									label: "a",
 									expr: &oneOrMoreExpr{
-										pos: position{line: 1574, col: 7, offset: 37767},
+										pos: position{line: 1574, col: 7, offset: 37763},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1574, col: 7, offset: 37767},
+											pos:  position{line: 1574, col: 7, offset: 37763},
 											name: "HexColon",
 										},
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1574, col: 17, offset: 37777},
+									pos:   position{line: 1574, col: 17, offset: 37773},
 									label: "b",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1574, col: 19, offset: 37779},
+										pos:  position{line: 1574, col: 19, offset: 37775},
 										name: "IP6Tail",
 									},
 								},
@@ -11085,52 +11081,52 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1577, col: 5, offset: 37843},
+						pos: position{line: 1577, col: 5, offset: 37839},
 						run: (*parser).callonIP6Variations9,
 						expr: &seqExpr{
-							pos: position{line: 1577, col: 5, offset: 37843},
+							pos: position{line: 1577, col: 5, offset: 37839},
 							exprs: []any{
 								&labeledExpr{
-									pos:   position{line: 1577, col: 5, offset: 37843},
+									pos:   position{line: 1577, col: 5, offset: 37839},
 									label: "a",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1577, col: 7, offset: 37845},
+										pos:  position{line: 1577, col: 7, offset: 37841},
 										name: "Hex",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1577, col: 11, offset: 37849},
+									pos:   position{line: 1577, col: 11, offset: 37845},
 									label: "b",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1577, col: 13, offset: 37851},
+										pos: position{line: 1577, col: 13, offset: 37847},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1577, col: 13, offset: 37851},
+											pos:  position{line: 1577, col: 13, offset: 37847},
 											name: "ColonHex",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1577, col: 23, offset: 37861},
+									pos:        position{line: 1577, col: 23, offset: 37857},
 									val:        "::",
 									ignoreCase: false,
 									want:       "\"::\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1577, col: 28, offset: 37866},
+									pos:   position{line: 1577, col: 28, offset: 37862},
 									label: "d",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1577, col: 30, offset: 37868},
+										pos: position{line: 1577, col: 30, offset: 37864},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1577, col: 30, offset: 37868},
+											pos:  position{line: 1577, col: 30, offset: 37864},
 											name: "HexColon",
 										},
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1577, col: 40, offset: 37878},
+									pos:   position{line: 1577, col: 40, offset: 37874},
 									label: "e",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1577, col: 42, offset: 37880},
+										pos:  position{line: 1577, col: 42, offset: 37876},
 										name: "IP6Tail",
 									},
 								},
@@ -11138,33 +11134,33 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1580, col: 5, offset: 37979},
+						pos: position{line: 1580, col: 5, offset: 37975},
 						run: (*parser).callonIP6Variations22,
 						expr: &seqExpr{
-							pos: position{line: 1580, col: 5, offset: 37979},
+							pos: position{line: 1580, col: 5, offset: 37975},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1580, col: 5, offset: 37979},
+									pos:        position{line: 1580, col: 5, offset: 37975},
 									val:        "::",
 									ignoreCase: false,
 									want:       "\"::\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1580, col: 10, offset: 37984},
+									pos:   position{line: 1580, col: 10, offset: 37980},
 									label: "a",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1580, col: 12, offset: 37986},
+										pos: position{line: 1580, col: 12, offset: 37982},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1580, col: 12, offset: 37986},
+											pos:  position{line: 1580, col: 12, offset: 37982},
 											name: "HexColon",
 										},
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1580, col: 22, offset: 37996},
+									pos:   position{line: 1580, col: 22, offset: 37992},
 									label: "b",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1580, col: 24, offset: 37998},
+										pos:  position{line: 1580, col: 24, offset: 37994},
 										name: "IP6Tail",
 									},
 								},
@@ -11172,32 +11168,32 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1583, col: 5, offset: 38069},
+						pos: position{line: 1583, col: 5, offset: 38065},
 						run: (*parser).callonIP6Variations30,
 						expr: &seqExpr{
-							pos: position{line: 1583, col: 5, offset: 38069},
+							pos: position{line: 1583, col: 5, offset: 38065},
 							exprs: []any{
 								&labeledExpr{
-									pos:   position{line: 1583, col: 5, offset: 38069},
+									pos:   position{line: 1583, col: 5, offset: 38065},
 									label: "a",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1583, col: 7, offset: 38071},
+										pos:  position{line: 1583, col: 7, offset: 38067},
 										name: "Hex",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1583, col: 11, offset: 38075},
+									pos:   position{line: 1583, col: 11, offset: 38071},
 									label: "b",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1583, col: 13, offset: 38077},
+										pos: position{line: 1583, col: 13, offset: 38073},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1583, col: 13, offset: 38077},
+											pos:  position{line: 1583, col: 13, offset: 38073},
 											name: "ColonHex",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1583, col: 23, offset: 38087},
+									pos:        position{line: 1583, col: 23, offset: 38083},
 									val:        "::",
 									ignoreCase: false,
 									want:       "\"::\"",
@@ -11206,10 +11202,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1586, col: 5, offset: 38155},
+						pos: position{line: 1586, col: 5, offset: 38151},
 						run: (*parser).callonIP6Variations38,
 						expr: &litMatcher{
-							pos:        position{line: 1586, col: 5, offset: 38155},
+							pos:        position{line: 1586, col: 5, offset: 38151},
 							val:        "::",
 							ignoreCase: false,
 							want:       "\"::\"",
@@ -11222,16 +11218,16 @@ var g = &grammar{
 		},
 		{
 			name: "IP6Tail",
-			pos:  position{line: 1590, col: 1, offset: 38192},
+			pos:  position{line: 1590, col: 1, offset: 38188},
 			expr: &choiceExpr{
-				pos: position{line: 1591, col: 5, offset: 38204},
+				pos: position{line: 1591, col: 5, offset: 38200},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1591, col: 5, offset: 38204},
+						pos:  position{line: 1591, col: 5, offset: 38200},
 						name: "IP",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1592, col: 5, offset: 38211},
+						pos:  position{line: 1592, col: 5, offset: 38207},
 						name: "Hex",
 					},
 				},
@@ -11241,24 +11237,24 @@ var g = &grammar{
 		},
 		{
 			name: "ColonHex",
-			pos:  position{line: 1594, col: 1, offset: 38216},
+			pos:  position{line: 1594, col: 1, offset: 38212},
 			expr: &actionExpr{
-				pos: position{line: 1594, col: 12, offset: 38227},
+				pos: position{line: 1594, col: 12, offset: 38223},
 				run: (*parser).callonColonHex1,
 				expr: &seqExpr{
-					pos: position{line: 1594, col: 12, offset: 38227},
+					pos: position{line: 1594, col: 12, offset: 38223},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1594, col: 12, offset: 38227},
+							pos:        position{line: 1594, col: 12, offset: 38223},
 							val:        ":",
 							ignoreCase: false,
 							want:       "\":\"",
 						},
 						&labeledExpr{
-							pos:   position{line: 1594, col: 16, offset: 38231},
+							pos:   position{line: 1594, col: 16, offset: 38227},
 							label: "v",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1594, col: 18, offset: 38233},
+								pos:  position{line: 1594, col: 18, offset: 38229},
 								name: "Hex",
 							},
 						},
@@ -11270,23 +11266,23 @@ var g = &grammar{
 		},
 		{
 			name: "HexColon",
-			pos:  position{line: 1596, col: 1, offset: 38271},
+			pos:  position{line: 1596, col: 1, offset: 38267},
 			expr: &actionExpr{
-				pos: position{line: 1596, col: 12, offset: 38282},
+				pos: position{line: 1596, col: 12, offset: 38278},
 				run: (*parser).callonHexColon1,
 				expr: &seqExpr{
-					pos: position{line: 1596, col: 12, offset: 38282},
+					pos: position{line: 1596, col: 12, offset: 38278},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 1596, col: 12, offset: 38282},
+							pos:   position{line: 1596, col: 12, offset: 38278},
 							label: "v",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1596, col: 14, offset: 38284},
+								pos:  position{line: 1596, col: 14, offset: 38280},
 								name: "Hex",
 							},
 						},
 						&litMatcher{
-							pos:        position{line: 1596, col: 18, offset: 38288},
+							pos:        position{line: 1596, col: 18, offset: 38284},
 							val:        ":",
 							ignoreCase: false,
 							want:       "\":\"",
@@ -11299,32 +11295,32 @@ var g = &grammar{
 		},
 		{
 			name: "IP4Net",
-			pos:  position{line: 1598, col: 1, offset: 38326},
+			pos:  position{line: 1598, col: 1, offset: 38322},
 			expr: &actionExpr{
-				pos: position{line: 1599, col: 5, offset: 38337},
+				pos: position{line: 1599, col: 5, offset: 38333},
 				run: (*parser).callonIP4Net1,
 				expr: &seqExpr{
-					pos: position{line: 1599, col: 5, offset: 38337},
+					pos: position{line: 1599, col: 5, offset: 38333},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 1599, col: 5, offset: 38337},
+							pos:   position{line: 1599, col: 5, offset: 38333},
 							label: "a",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1599, col: 7, offset: 38339},
+								pos:  position{line: 1599, col: 7, offset: 38335},
 								name: "IP",
 							},
 						},
 						&litMatcher{
-							pos:        position{line: 1599, col: 10, offset: 38342},
+							pos:        position{line: 1599, col: 10, offset: 38338},
 							val:        "/",
 							ignoreCase: false,
 							want:       "\"/\"",
 						},
 						&labeledExpr{
-							pos:   position{line: 1599, col: 14, offset: 38346},
+							pos:   position{line: 1599, col: 14, offset: 38342},
 							label: "m",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1599, col: 16, offset: 38348},
+								pos:  position{line: 1599, col: 16, offset: 38344},
 								name: "UIntString",
 							},
 						},
@@ -11336,32 +11332,32 @@ var g = &grammar{
 		},
 		{
 			name: "IP6Net",
-			pos:  position{line: 1603, col: 1, offset: 38416},
+			pos:  position{line: 1603, col: 1, offset: 38412},
 			expr: &actionExpr{
-				pos: position{line: 1604, col: 5, offset: 38427},
+				pos: position{line: 1604, col: 5, offset: 38423},
 				run: (*parser).callonIP6Net1,
 				expr: &seqExpr{
-					pos: position{line: 1604, col: 5, offset: 38427},
+					pos: position{line: 1604, col: 5, offset: 38423},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 1604, col: 5, offset: 38427},
+							pos:   position{line: 1604, col: 5, offset: 38423},
 							label: "a",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1604, col: 7, offset: 38429},
+								pos:  position{line: 1604, col: 7, offset: 38425},
 								name: "IP6",
 							},
 						},
 						&litMatcher{
-							pos:        position{line: 1604, col: 11, offset: 38433},
+							pos:        position{line: 1604, col: 11, offset: 38429},
 							val:        "/",
 							ignoreCase: false,
 							want:       "\"/\"",
 						},
 						&labeledExpr{
-							pos:   position{line: 1604, col: 15, offset: 38437},
+							pos:   position{line: 1604, col: 15, offset: 38433},
 							label: "m",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1604, col: 17, offset: 38439},
+								pos:  position{line: 1604, col: 17, offset: 38435},
 								name: "UIntString",
 							},
 						},
@@ -11373,15 +11369,15 @@ var g = &grammar{
 		},
 		{
 			name: "UInt",
-			pos:  position{line: 1608, col: 1, offset: 38507},
+			pos:  position{line: 1608, col: 1, offset: 38503},
 			expr: &actionExpr{
-				pos: position{line: 1609, col: 4, offset: 38515},
+				pos: position{line: 1609, col: 4, offset: 38511},
 				run: (*parser).callonUInt1,
 				expr: &labeledExpr{
-					pos:   position{line: 1609, col: 4, offset: 38515},
+					pos:   position{line: 1609, col: 4, offset: 38511},
 					label: "s",
 					expr: &ruleRefExpr{
-						pos:  position{line: 1609, col: 6, offset: 38517},
+						pos:  position{line: 1609, col: 6, offset: 38513},
 						name: "UIntString",
 					},
 				},
@@ -11391,16 +11387,16 @@ var g = &grammar{
 		},
 		{
 			name: "IntString",
-			pos:  position{line: 1611, col: 1, offset: 38557},
+			pos:  position{line: 1611, col: 1, offset: 38553},
 			expr: &choiceExpr{
-				pos: position{line: 1612, col: 5, offset: 38571},
+				pos: position{line: 1612, col: 5, offset: 38567},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1612, col: 5, offset: 38571},
+						pos:  position{line: 1612, col: 5, offset: 38567},
 						name: "UIntString",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1613, col: 5, offset: 38586},
+						pos:  position{line: 1613, col: 5, offset: 38582},
 						name: "MinusIntString",
 					},
 				},
@@ -11410,14 +11406,14 @@ var g = &grammar{
 		},
 		{
 			name: "UIntString",
-			pos:  position{line: 1615, col: 1, offset: 38602},
+			pos:  position{line: 1615, col: 1, offset: 38598},
 			expr: &actionExpr{
-				pos: position{line: 1615, col: 14, offset: 38615},
+				pos: position{line: 1615, col: 14, offset: 38611},
 				run: (*parser).callonUIntString1,
 				expr: &oneOrMoreExpr{
-					pos: position{line: 1615, col: 14, offset: 38615},
+					pos: position{line: 1615, col: 14, offset: 38611},
 					expr: &charClassMatcher{
-						pos:        position{line: 1615, col: 14, offset: 38615},
+						pos:        position{line: 1615, col: 14, offset: 38611},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
@@ -11430,21 +11426,21 @@ var g = &grammar{
 		},
 		{
 			name: "MinusIntString",
-			pos:  position{line: 1617, col: 1, offset: 38654},
+			pos:  position{line: 1617, col: 1, offset: 38650},
 			expr: &actionExpr{
-				pos: position{line: 1618, col: 5, offset: 38673},
+				pos: position{line: 1618, col: 5, offset: 38669},
 				run: (*parser).callonMinusIntString1,
 				expr: &seqExpr{
-					pos: position{line: 1618, col: 5, offset: 38673},
+					pos: position{line: 1618, col: 5, offset: 38669},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1618, col: 5, offset: 38673},
+							pos:        position{line: 1618, col: 5, offset: 38669},
 							val:        "-",
 							ignoreCase: false,
 							want:       "\"-\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1618, col: 9, offset: 38677},
+							pos:  position{line: 1618, col: 9, offset: 38673},
 							name: "UIntString",
 						},
 					},
@@ -11455,29 +11451,29 @@ var g = &grammar{
 		},
 		{
 			name: "FloatString",
-			pos:  position{line: 1620, col: 1, offset: 38720},
+			pos:  position{line: 1620, col: 1, offset: 38716},
 			expr: &choiceExpr{
-				pos: position{line: 1621, col: 5, offset: 38736},
+				pos: position{line: 1621, col: 5, offset: 38732},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1621, col: 5, offset: 38736},
+						pos: position{line: 1621, col: 5, offset: 38732},
 						run: (*parser).callonFloatString2,
 						expr: &seqExpr{
-							pos: position{line: 1621, col: 5, offset: 38736},
+							pos: position{line: 1621, col: 5, offset: 38732},
 							exprs: []any{
 								&zeroOrOneExpr{
-									pos: position{line: 1621, col: 5, offset: 38736},
+									pos: position{line: 1621, col: 5, offset: 38732},
 									expr: &litMatcher{
-										pos:        position{line: 1621, col: 5, offset: 38736},
+										pos:        position{line: 1621, col: 5, offset: 38732},
 										val:        "-",
 										ignoreCase: false,
 										want:       "\"-\"",
 									},
 								},
 								&oneOrMoreExpr{
-									pos: position{line: 1621, col: 10, offset: 38741},
+									pos: position{line: 1621, col: 10, offset: 38737},
 									expr: &charClassMatcher{
-										pos:        position{line: 1621, col: 10, offset: 38741},
+										pos:        position{line: 1621, col: 10, offset: 38737},
 										val:        "[0-9]",
 										ranges:     []rune{'0', '9'},
 										ignoreCase: false,
@@ -11485,15 +11481,15 @@ var g = &grammar{
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1621, col: 17, offset: 38748},
+									pos:        position{line: 1621, col: 17, offset: 38744},
 									val:        ".",
 									ignoreCase: false,
 									want:       "\".\"",
 								},
 								&zeroOrMoreExpr{
-									pos: position{line: 1621, col: 21, offset: 38752},
+									pos: position{line: 1621, col: 21, offset: 38748},
 									expr: &charClassMatcher{
-										pos:        position{line: 1621, col: 21, offset: 38752},
+										pos:        position{line: 1621, col: 21, offset: 38748},
 										val:        "[0-9]",
 										ranges:     []rune{'0', '9'},
 										ignoreCase: false,
@@ -11501,9 +11497,9 @@ var g = &grammar{
 									},
 								},
 								&zeroOrOneExpr{
-									pos: position{line: 1621, col: 28, offset: 38759},
+									pos: position{line: 1621, col: 28, offset: 38755},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1621, col: 28, offset: 38759},
+										pos:  position{line: 1621, col: 28, offset: 38755},
 										name: "ExponentPart",
 									},
 								},
@@ -11511,30 +11507,30 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1622, col: 5, offset: 38808},
+						pos: position{line: 1622, col: 5, offset: 38804},
 						run: (*parser).callonFloatString13,
 						expr: &seqExpr{
-							pos: position{line: 1622, col: 5, offset: 38808},
+							pos: position{line: 1622, col: 5, offset: 38804},
 							exprs: []any{
 								&zeroOrOneExpr{
-									pos: position{line: 1622, col: 5, offset: 38808},
+									pos: position{line: 1622, col: 5, offset: 38804},
 									expr: &litMatcher{
-										pos:        position{line: 1622, col: 5, offset: 38808},
+										pos:        position{line: 1622, col: 5, offset: 38804},
 										val:        "-",
 										ignoreCase: false,
 										want:       "\"-\"",
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1622, col: 10, offset: 38813},
+									pos:        position{line: 1622, col: 10, offset: 38809},
 									val:        ".",
 									ignoreCase: false,
 									want:       "\".\"",
 								},
 								&oneOrMoreExpr{
-									pos: position{line: 1622, col: 14, offset: 38817},
+									pos: position{line: 1622, col: 14, offset: 38813},
 									expr: &charClassMatcher{
-										pos:        position{line: 1622, col: 14, offset: 38817},
+										pos:        position{line: 1622, col: 14, offset: 38813},
 										val:        "[0-9]",
 										ranges:     []rune{'0', '9'},
 										ignoreCase: false,
@@ -11542,9 +11538,9 @@ var g = &grammar{
 									},
 								},
 								&zeroOrOneExpr{
-									pos: position{line: 1622, col: 21, offset: 38824},
+									pos: position{line: 1622, col: 21, offset: 38820},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1622, col: 21, offset: 38824},
+										pos:  position{line: 1622, col: 21, offset: 38820},
 										name: "ExponentPart",
 									},
 								},
@@ -11552,17 +11548,17 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1623, col: 5, offset: 38873},
+						pos: position{line: 1623, col: 5, offset: 38869},
 						run: (*parser).callonFloatString22,
 						expr: &choiceExpr{
-							pos: position{line: 1623, col: 6, offset: 38874},
+							pos: position{line: 1623, col: 6, offset: 38870},
 							alternatives: []any{
 								&ruleRefExpr{
-									pos:  position{line: 1623, col: 6, offset: 38874},
+									pos:  position{line: 1623, col: 6, offset: 38870},
 									name: "NaN",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1623, col: 12, offset: 38880},
+									pos:  position{line: 1623, col: 12, offset: 38876},
 									name: "Infinity",
 								},
 							},
@@ -11575,20 +11571,20 @@ var g = &grammar{
 		},
 		{
 			name: "ExponentPart",
-			pos:  position{line: 1626, col: 1, offset: 38923},
+			pos:  position{line: 1626, col: 1, offset: 38919},
 			expr: &seqExpr{
-				pos: position{line: 1626, col: 16, offset: 38938},
+				pos: position{line: 1626, col: 16, offset: 38934},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 1626, col: 16, offset: 38938},
+						pos:        position{line: 1626, col: 16, offset: 38934},
 						val:        "e",
 						ignoreCase: true,
 						want:       "\"e\"i",
 					},
 					&zeroOrOneExpr{
-						pos: position{line: 1626, col: 21, offset: 38943},
+						pos: position{line: 1626, col: 21, offset: 38939},
 						expr: &charClassMatcher{
-							pos:        position{line: 1626, col: 21, offset: 38943},
+							pos:        position{line: 1626, col: 21, offset: 38939},
 							val:        "[+-]",
 							chars:      []rune{'+', '-'},
 							ignoreCase: false,
@@ -11596,7 +11592,7 @@ var g = &grammar{
 						},
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1626, col: 27, offset: 38949},
+						pos:  position{line: 1626, col: 27, offset: 38945},
 						name: "UIntString",
 					},
 				},
@@ -11606,9 +11602,9 @@ var g = &grammar{
 		},
 		{
 			name: "NaN",
-			pos:  position{line: 1628, col: 1, offset: 38961},
+			pos:  position{line: 1628, col: 1, offset: 38957},
 			expr: &litMatcher{
-				pos:        position{line: 1628, col: 7, offset: 38967},
+				pos:        position{line: 1628, col: 7, offset: 38963},
 				val:        "NaN",
 				ignoreCase: false,
 				want:       "\"NaN\"",
@@ -11618,23 +11614,23 @@ var g = &grammar{
 		},
 		{
 			name: "Infinity",
-			pos:  position{line: 1630, col: 1, offset: 38974},
+			pos:  position{line: 1630, col: 1, offset: 38970},
 			expr: &seqExpr{
-				pos: position{line: 1630, col: 12, offset: 38985},
+				pos: position{line: 1630, col: 12, offset: 38981},
 				exprs: []any{
 					&zeroOrOneExpr{
-						pos: position{line: 1630, col: 12, offset: 38985},
+						pos: position{line: 1630, col: 12, offset: 38981},
 						expr: &choiceExpr{
-							pos: position{line: 1630, col: 13, offset: 38986},
+							pos: position{line: 1630, col: 13, offset: 38982},
 							alternatives: []any{
 								&litMatcher{
-									pos:        position{line: 1630, col: 13, offset: 38986},
+									pos:        position{line: 1630, col: 13, offset: 38982},
 									val:        "-",
 									ignoreCase: false,
 									want:       "\"-\"",
 								},
 								&litMatcher{
-									pos:        position{line: 1630, col: 19, offset: 38992},
+									pos:        position{line: 1630, col: 19, offset: 38988},
 									val:        "+",
 									ignoreCase: false,
 									want:       "\"+\"",
@@ -11643,7 +11639,7 @@ var g = &grammar{
 						},
 					},
 					&litMatcher{
-						pos:        position{line: 1630, col: 25, offset: 38998},
+						pos:        position{line: 1630, col: 25, offset: 38994},
 						val:        "Inf",
 						ignoreCase: false,
 						want:       "\"Inf\"",
@@ -11655,14 +11651,14 @@ var g = &grammar{
 		},
 		{
 			name: "Hex",
-			pos:  position{line: 1632, col: 1, offset: 39005},
+			pos:  position{line: 1632, col: 1, offset: 39001},
 			expr: &actionExpr{
-				pos: position{line: 1632, col: 7, offset: 39011},
+				pos: position{line: 1632, col: 7, offset: 39007},
 				run: (*parser).callonHex1,
 				expr: &oneOrMoreExpr{
-					pos: position{line: 1632, col: 7, offset: 39011},
+					pos: position{line: 1632, col: 7, offset: 39007},
 					expr: &ruleRefExpr{
-						pos:  position{line: 1632, col: 7, offset: 39011},
+						pos:  position{line: 1632, col: 7, offset: 39007},
 						name: "HexDigit",
 					},
 				},
@@ -11672,9 +11668,9 @@ var g = &grammar{
 		},
 		{
 			name: "HexDigit",
-			pos:  position{line: 1634, col: 1, offset: 39053},
+			pos:  position{line: 1634, col: 1, offset: 39049},
 			expr: &charClassMatcher{
-				pos:        position{line: 1634, col: 12, offset: 39064},
+				pos:        position{line: 1634, col: 12, offset: 39060},
 				val:        "[0-9a-fA-F]",
 				ranges:     []rune{'0', '9', 'a', 'f', 'A', 'F'},
 				ignoreCase: false,
@@ -11685,35 +11681,35 @@ var g = &grammar{
 		},
 		{
 			name: "QuotedString",
-			pos:  position{line: 1636, col: 1, offset: 39077},
+			pos:  position{line: 1636, col: 1, offset: 39073},
 			expr: &choiceExpr{
-				pos: position{line: 1637, col: 5, offset: 39094},
+				pos: position{line: 1637, col: 5, offset: 39090},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1637, col: 5, offset: 39094},
+						pos: position{line: 1637, col: 5, offset: 39090},
 						run: (*parser).callonQuotedString2,
 						expr: &seqExpr{
-							pos: position{line: 1637, col: 5, offset: 39094},
+							pos: position{line: 1637, col: 5, offset: 39090},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1637, col: 5, offset: 39094},
+									pos:        position{line: 1637, col: 5, offset: 39090},
 									val:        "\"",
 									ignoreCase: false,
 									want:       "\"\\\"\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1637, col: 9, offset: 39098},
+									pos:   position{line: 1637, col: 9, offset: 39094},
 									label: "v",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1637, col: 11, offset: 39100},
+										pos: position{line: 1637, col: 11, offset: 39096},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1637, col: 11, offset: 39100},
+											pos:  position{line: 1637, col: 11, offset: 39096},
 											name: "DoubleQuotedChar",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1637, col: 29, offset: 39118},
+									pos:        position{line: 1637, col: 29, offset: 39114},
 									val:        "\"",
 									ignoreCase: false,
 									want:       "\"\\\"\"",
@@ -11722,30 +11718,30 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1638, col: 5, offset: 39155},
+						pos: position{line: 1638, col: 5, offset: 39151},
 						run: (*parser).callonQuotedString9,
 						expr: &seqExpr{
-							pos: position{line: 1638, col: 5, offset: 39155},
+							pos: position{line: 1638, col: 5, offset: 39151},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1638, col: 5, offset: 39155},
+									pos:        position{line: 1638, col: 5, offset: 39151},
 									val:        "'",
 									ignoreCase: false,
 									want:       "\"'\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1638, col: 9, offset: 39159},
+									pos:   position{line: 1638, col: 9, offset: 39155},
 									label: "v",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1638, col: 11, offset: 39161},
+										pos: position{line: 1638, col: 11, offset: 39157},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1638, col: 11, offset: 39161},
+											pos:  position{line: 1638, col: 11, offset: 39157},
 											name: "SingleQuotedChar",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1638, col: 29, offset: 39179},
+									pos:        position{line: 1638, col: 29, offset: 39175},
 									val:        "'",
 									ignoreCase: false,
 									want:       "\"'\"",
@@ -11760,57 +11756,57 @@ var g = &grammar{
 		},
 		{
 			name: "DoubleQuotedChar",
-			pos:  position{line: 1640, col: 1, offset: 39213},
+			pos:  position{line: 1640, col: 1, offset: 39209},
 			expr: &choiceExpr{
-				pos: position{line: 1641, col: 5, offset: 39234},
+				pos: position{line: 1641, col: 5, offset: 39230},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1641, col: 5, offset: 39234},
+						pos: position{line: 1641, col: 5, offset: 39230},
 						run: (*parser).callonDoubleQuotedChar2,
 						expr: &seqExpr{
-							pos: position{line: 1641, col: 5, offset: 39234},
+							pos: position{line: 1641, col: 5, offset: 39230},
 							exprs: []any{
 								&notExpr{
-									pos: position{line: 1641, col: 5, offset: 39234},
+									pos: position{line: 1641, col: 5, offset: 39230},
 									expr: &choiceExpr{
-										pos: position{line: 1641, col: 7, offset: 39236},
+										pos: position{line: 1641, col: 7, offset: 39232},
 										alternatives: []any{
 											&litMatcher{
-												pos:        position{line: 1641, col: 7, offset: 39236},
+												pos:        position{line: 1641, col: 7, offset: 39232},
 												val:        "\"",
 												ignoreCase: false,
 												want:       "\"\\\"\"",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1641, col: 13, offset: 39242},
+												pos:  position{line: 1641, col: 13, offset: 39238},
 												name: "EscapedChar",
 											},
 										},
 									},
 								},
 								&anyMatcher{
-									line: 1641, col: 26, offset: 39255,
+									line: 1641, col: 26, offset: 39251,
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1642, col: 5, offset: 39292},
+						pos: position{line: 1642, col: 5, offset: 39288},
 						run: (*parser).callonDoubleQuotedChar9,
 						expr: &seqExpr{
-							pos: position{line: 1642, col: 5, offset: 39292},
+							pos: position{line: 1642, col: 5, offset: 39288},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1642, col: 5, offset: 39292},
+									pos:        position{line: 1642, col: 5, offset: 39288},
 									val:        "\\",
 									ignoreCase: false,
 									want:       "\"\\\\\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1642, col: 10, offset: 39297},
+									pos:   position{line: 1642, col: 10, offset: 39293},
 									label: "s",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1642, col: 12, offset: 39299},
+										pos:  position{line: 1642, col: 12, offset: 39295},
 										name: "EscapeSequence",
 									},
 								},
@@ -11824,32 +11820,32 @@ var g = &grammar{
 		},
 		{
 			name: "BacktickString",
-			pos:  position{line: 1644, col: 1, offset: 39333},
+			pos:  position{line: 1644, col: 1, offset: 39329},
 			expr: &actionExpr{
-				pos: position{line: 1645, col: 5, offset: 39352},
+				pos: position{line: 1645, col: 5, offset: 39348},
 				run: (*parser).callonBacktickString1,
 				expr: &seqExpr{
-					pos: position{line: 1645, col: 5, offset: 39352},
+					pos: position{line: 1645, col: 5, offset: 39348},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1645, col: 5, offset: 39352},
+							pos:        position{line: 1645, col: 5, offset: 39348},
 							val:        "`",
 							ignoreCase: false,
 							want:       "\"`\"",
 						},
 						&labeledExpr{
-							pos:   position{line: 1645, col: 9, offset: 39356},
+							pos:   position{line: 1645, col: 9, offset: 39352},
 							label: "v",
 							expr: &zeroOrMoreExpr{
-								pos: position{line: 1645, col: 11, offset: 39358},
+								pos: position{line: 1645, col: 11, offset: 39354},
 								expr: &ruleRefExpr{
-									pos:  position{line: 1645, col: 11, offset: 39358},
+									pos:  position{line: 1645, col: 11, offset: 39354},
 									name: "BacktickChar",
 								},
 							},
 						},
 						&litMatcher{
-							pos:        position{line: 1645, col: 25, offset: 39372},
+							pos:        position{line: 1645, col: 25, offset: 39368},
 							val:        "`",
 							ignoreCase: false,
 							want:       "\"`\"",
@@ -11862,57 +11858,57 @@ var g = &grammar{
 		},
 		{
 			name: "BacktickChar",
-			pos:  position{line: 1647, col: 1, offset: 39406},
+			pos:  position{line: 1647, col: 1, offset: 39402},
 			expr: &choiceExpr{
-				pos: position{line: 1648, col: 5, offset: 39423},
+				pos: position{line: 1648, col: 5, offset: 39419},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1648, col: 5, offset: 39423},
+						pos: position{line: 1648, col: 5, offset: 39419},
 						run: (*parser).callonBacktickChar2,
 						expr: &seqExpr{
-							pos: position{line: 1648, col: 5, offset: 39423},
+							pos: position{line: 1648, col: 5, offset: 39419},
 							exprs: []any{
 								&notExpr{
-									pos: position{line: 1648, col: 5, offset: 39423},
+									pos: position{line: 1648, col: 5, offset: 39419},
 									expr: &choiceExpr{
-										pos: position{line: 1648, col: 7, offset: 39425},
+										pos: position{line: 1648, col: 7, offset: 39421},
 										alternatives: []any{
 											&litMatcher{
-												pos:        position{line: 1648, col: 7, offset: 39425},
+												pos:        position{line: 1648, col: 7, offset: 39421},
 												val:        "`",
 												ignoreCase: false,
 												want:       "\"`\"",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1648, col: 13, offset: 39431},
+												pos:  position{line: 1648, col: 13, offset: 39427},
 												name: "EscapedChar",
 											},
 										},
 									},
 								},
 								&anyMatcher{
-									line: 1648, col: 26, offset: 39444,
+									line: 1648, col: 26, offset: 39440,
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1649, col: 5, offset: 39481},
+						pos: position{line: 1649, col: 5, offset: 39477},
 						run: (*parser).callonBacktickChar9,
 						expr: &seqExpr{
-							pos: position{line: 1649, col: 5, offset: 39481},
+							pos: position{line: 1649, col: 5, offset: 39477},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1649, col: 5, offset: 39481},
+									pos:        position{line: 1649, col: 5, offset: 39477},
 									val:        "\\",
 									ignoreCase: false,
 									want:       "\"\\\\\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1649, col: 10, offset: 39486},
+									pos:   position{line: 1649, col: 10, offset: 39482},
 									label: "s",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1649, col: 12, offset: 39488},
+										pos:  position{line: 1649, col: 12, offset: 39484},
 										name: "EscapeSequence",
 									},
 								},
@@ -11926,28 +11922,28 @@ var g = &grammar{
 		},
 		{
 			name: "KeyWord",
-			pos:  position{line: 1651, col: 1, offset: 39522},
+			pos:  position{line: 1651, col: 1, offset: 39518},
 			expr: &actionExpr{
-				pos: position{line: 1652, col: 5, offset: 39534},
+				pos: position{line: 1652, col: 5, offset: 39530},
 				run: (*parser).callonKeyWord1,
 				expr: &seqExpr{
-					pos: position{line: 1652, col: 5, offset: 39534},
+					pos: position{line: 1652, col: 5, offset: 39530},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 1652, col: 5, offset: 39534},
+							pos:   position{line: 1652, col: 5, offset: 39530},
 							label: "head",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1652, col: 10, offset: 39539},
+								pos:  position{line: 1652, col: 10, offset: 39535},
 								name: "KeyWordStart",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1652, col: 23, offset: 39552},
+							pos:   position{line: 1652, col: 23, offset: 39548},
 							label: "tail",
 							expr: &zeroOrMoreExpr{
-								pos: position{line: 1652, col: 28, offset: 39557},
+								pos: position{line: 1652, col: 28, offset: 39553},
 								expr: &ruleRefExpr{
-									pos:  position{line: 1652, col: 28, offset: 39557},
+									pos:  position{line: 1652, col: 28, offset: 39553},
 									name: "KeyWordRest",
 								},
 							},
@@ -11960,16 +11956,16 @@ var g = &grammar{
 		},
 		{
 			name: "KeyWordStart",
-			pos:  position{line: 1654, col: 1, offset: 39619},
+			pos:  position{line: 1654, col: 1, offset: 39615},
 			expr: &choiceExpr{
-				pos: position{line: 1655, col: 5, offset: 39636},
+				pos: position{line: 1655, col: 5, offset: 39632},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1655, col: 5, offset: 39636},
+						pos:  position{line: 1655, col: 5, offset: 39632},
 						name: "KeyWordChars",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1656, col: 5, offset: 39653},
+						pos:  position{line: 1656, col: 5, offset: 39649},
 						name: "KeyWordEsc",
 					},
 				},
@@ -11979,16 +11975,16 @@ var g = &grammar{
 		},
 		{
 			name: "KeyWordRest",
-			pos:  position{line: 1658, col: 1, offset: 39665},
+			pos:  position{line: 1658, col: 1, offset: 39661},
 			expr: &choiceExpr{
-				pos: position{line: 1659, col: 5, offset: 39681},
+				pos: position{line: 1659, col: 5, offset: 39677},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1659, col: 5, offset: 39681},
+						pos:  position{line: 1659, col: 5, offset: 39677},
 						name: "KeyWordStart",
 					},
 					&charClassMatcher{
-						pos:        position{line: 1660, col: 5, offset: 39698},
+						pos:        position{line: 1660, col: 5, offset: 39694},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
@@ -12001,19 +11997,19 @@ var g = &grammar{
 		},
 		{
 			name: "KeyWordChars",
-			pos:  position{line: 1662, col: 1, offset: 39705},
+			pos:  position{line: 1662, col: 1, offset: 39701},
 			expr: &actionExpr{
-				pos: position{line: 1662, col: 16, offset: 39720},
+				pos: position{line: 1662, col: 16, offset: 39716},
 				run: (*parser).callonKeyWordChars1,
 				expr: &choiceExpr{
-					pos: position{line: 1662, col: 17, offset: 39721},
+					pos: position{line: 1662, col: 17, offset: 39717},
 					alternatives: []any{
 						&ruleRefExpr{
-							pos:  position{line: 1662, col: 17, offset: 39721},
+							pos:  position{line: 1662, col: 17, offset: 39717},
 							name: "UnicodeLetter",
 						},
 						&charClassMatcher{
-							pos:        position{line: 1662, col: 33, offset: 39737},
+							pos:        position{line: 1662, col: 33, offset: 39733},
 							val:        "[_.:/%#@~]",
 							chars:      []rune{'_', '.', ':', '/', '%', '#', '@', '~'},
 							ignoreCase: false,
@@ -12027,31 +12023,31 @@ var g = &grammar{
 		},
 		{
 			name: "KeyWordEsc",
-			pos:  position{line: 1664, col: 1, offset: 39781},
+			pos:  position{line: 1664, col: 1, offset: 39777},
 			expr: &actionExpr{
-				pos: position{line: 1664, col: 14, offset: 39794},
+				pos: position{line: 1664, col: 14, offset: 39790},
 				run: (*parser).callonKeyWordEsc1,
 				expr: &seqExpr{
-					pos: position{line: 1664, col: 14, offset: 39794},
+					pos: position{line: 1664, col: 14, offset: 39790},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1664, col: 14, offset: 39794},
+							pos:        position{line: 1664, col: 14, offset: 39790},
 							val:        "\\",
 							ignoreCase: false,
 							want:       "\"\\\\\"",
 						},
 						&labeledExpr{
-							pos:   position{line: 1664, col: 19, offset: 39799},
+							pos:   position{line: 1664, col: 19, offset: 39795},
 							label: "s",
 							expr: &choiceExpr{
-								pos: position{line: 1664, col: 22, offset: 39802},
+								pos: position{line: 1664, col: 22, offset: 39798},
 								alternatives: []any{
 									&ruleRefExpr{
-										pos:  position{line: 1664, col: 22, offset: 39802},
+										pos:  position{line: 1664, col: 22, offset: 39798},
 										name: "KeywordEscape",
 									},
 									&ruleRefExpr{
-										pos:  position{line: 1664, col: 38, offset: 39818},
+										pos:  position{line: 1664, col: 38, offset: 39814},
 										name: "EscapeSequence",
 									},
 								},
@@ -12065,42 +12061,42 @@ var g = &grammar{
 		},
 		{
 			name: "GlobPattern",
-			pos:  position{line: 1666, col: 1, offset: 39853},
+			pos:  position{line: 1666, col: 1, offset: 39849},
 			expr: &actionExpr{
-				pos: position{line: 1667, col: 5, offset: 39869},
+				pos: position{line: 1667, col: 5, offset: 39865},
 				run: (*parser).callonGlobPattern1,
 				expr: &seqExpr{
-					pos: position{line: 1667, col: 5, offset: 39869},
+					pos: position{line: 1667, col: 5, offset: 39865},
 					exprs: []any{
 						&andExpr{
-							pos: position{line: 1667, col: 5, offset: 39869},
+							pos: position{line: 1667, col: 5, offset: 39865},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1667, col: 6, offset: 39870},
+								pos:  position{line: 1667, col: 6, offset: 39866},
 								name: "GlobProperStart",
 							},
 						},
 						&andExpr{
-							pos: position{line: 1667, col: 22, offset: 39886},
+							pos: position{line: 1667, col: 22, offset: 39882},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1667, col: 23, offset: 39887},
+								pos:  position{line: 1667, col: 23, offset: 39883},
 								name: "GlobHasStar",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1667, col: 35, offset: 39899},
+							pos:   position{line: 1667, col: 35, offset: 39895},
 							label: "head",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1667, col: 40, offset: 39904},
+								pos:  position{line: 1667, col: 40, offset: 39900},
 								name: "GlobStart",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1667, col: 50, offset: 39914},
+							pos:   position{line: 1667, col: 50, offset: 39910},
 							label: "tail",
 							expr: &zeroOrMoreExpr{
-								pos: position{line: 1667, col: 55, offset: 39919},
+								pos: position{line: 1667, col: 55, offset: 39915},
 								expr: &ruleRefExpr{
-									pos:  position{line: 1667, col: 55, offset: 39919},
+									pos:  position{line: 1667, col: 55, offset: 39915},
 									name: "GlobRest",
 								},
 							},
@@ -12113,28 +12109,28 @@ var g = &grammar{
 		},
 		{
 			name: "GlobProperStart",
-			pos:  position{line: 1671, col: 1, offset: 39988},
+			pos:  position{line: 1671, col: 1, offset: 39984},
 			expr: &choiceExpr{
-				pos: position{line: 1671, col: 19, offset: 40006},
+				pos: position{line: 1671, col: 19, offset: 40002},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1671, col: 19, offset: 40006},
+						pos:  position{line: 1671, col: 19, offset: 40002},
 						name: "KeyWordStart",
 					},
 					&seqExpr{
-						pos: position{line: 1671, col: 34, offset: 40021},
+						pos: position{line: 1671, col: 34, offset: 40017},
 						exprs: []any{
 							&oneOrMoreExpr{
-								pos: position{line: 1671, col: 34, offset: 40021},
+								pos: position{line: 1671, col: 34, offset: 40017},
 								expr: &litMatcher{
-									pos:        position{line: 1671, col: 34, offset: 40021},
+									pos:        position{line: 1671, col: 34, offset: 40017},
 									val:        "*",
 									ignoreCase: false,
 									want:       "\"*\"",
 								},
 							},
 							&ruleRefExpr{
-								pos:  position{line: 1671, col: 39, offset: 40026},
+								pos:  position{line: 1671, col: 39, offset: 40022},
 								name: "KeyWordRest",
 							},
 						},
@@ -12146,19 +12142,19 @@ var g = &grammar{
 		},
 		{
 			name: "GlobHasStar",
-			pos:  position{line: 1672, col: 1, offset: 40038},
+			pos:  position{line: 1672, col: 1, offset: 40034},
 			expr: &seqExpr{
-				pos: position{line: 1672, col: 15, offset: 40052},
+				pos: position{line: 1672, col: 15, offset: 40048},
 				exprs: []any{
 					&zeroOrMoreExpr{
-						pos: position{line: 1672, col: 15, offset: 40052},
+						pos: position{line: 1672, col: 15, offset: 40048},
 						expr: &ruleRefExpr{
-							pos:  position{line: 1672, col: 15, offset: 40052},
+							pos:  position{line: 1672, col: 15, offset: 40048},
 							name: "KeyWordRest",
 						},
 					},
 					&litMatcher{
-						pos:        position{line: 1672, col: 28, offset: 40065},
+						pos:        position{line: 1672, col: 28, offset: 40061},
 						val:        "*",
 						ignoreCase: false,
 						want:       "\"*\"",
@@ -12170,23 +12166,23 @@ var g = &grammar{
 		},
 		{
 			name: "GlobStart",
-			pos:  position{line: 1674, col: 1, offset: 40070},
+			pos:  position{line: 1674, col: 1, offset: 40066},
 			expr: &choiceExpr{
-				pos: position{line: 1675, col: 5, offset: 40084},
+				pos: position{line: 1675, col: 5, offset: 40080},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1675, col: 5, offset: 40084},
+						pos:  position{line: 1675, col: 5, offset: 40080},
 						name: "KeyWordChars",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1676, col: 5, offset: 40101},
+						pos:  position{line: 1676, col: 5, offset: 40097},
 						name: "GlobEsc",
 					},
 					&actionExpr{
-						pos: position{line: 1677, col: 5, offset: 40113},
+						pos: position{line: 1677, col: 5, offset: 40109},
 						run: (*parser).callonGlobStart4,
 						expr: &litMatcher{
-							pos:        position{line: 1677, col: 5, offset: 40113},
+							pos:        position{line: 1677, col: 5, offset: 40109},
 							val:        "*",
 							ignoreCase: false,
 							want:       "\"*\"",
@@ -12199,16 +12195,16 @@ var g = &grammar{
 		},
 		{
 			name: "GlobRest",
-			pos:  position{line: 1679, col: 1, offset: 40138},
+			pos:  position{line: 1679, col: 1, offset: 40134},
 			expr: &choiceExpr{
-				pos: position{line: 1680, col: 5, offset: 40151},
+				pos: position{line: 1680, col: 5, offset: 40147},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1680, col: 5, offset: 40151},
+						pos:  position{line: 1680, col: 5, offset: 40147},
 						name: "GlobStart",
 					},
 					&charClassMatcher{
-						pos:        position{line: 1681, col: 5, offset: 40165},
+						pos:        position{line: 1681, col: 5, offset: 40161},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
@@ -12221,31 +12217,31 @@ var g = &grammar{
 		},
 		{
 			name: "GlobEsc",
-			pos:  position{line: 1683, col: 1, offset: 40172},
+			pos:  position{line: 1683, col: 1, offset: 40168},
 			expr: &actionExpr{
-				pos: position{line: 1683, col: 11, offset: 40182},
+				pos: position{line: 1683, col: 11, offset: 40178},
 				run: (*parser).callonGlobEsc1,
 				expr: &seqExpr{
-					pos: position{line: 1683, col: 11, offset: 40182},
+					pos: position{line: 1683, col: 11, offset: 40178},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1683, col: 11, offset: 40182},
+							pos:        position{line: 1683, col: 11, offset: 40178},
 							val:        "\\",
 							ignoreCase: false,
 							want:       "\"\\\\\"",
 						},
 						&labeledExpr{
-							pos:   position{line: 1683, col: 16, offset: 40187},
+							pos:   position{line: 1683, col: 16, offset: 40183},
 							label: "s",
 							expr: &choiceExpr{
-								pos: position{line: 1683, col: 19, offset: 40190},
+								pos: position{line: 1683, col: 19, offset: 40186},
 								alternatives: []any{
 									&ruleRefExpr{
-										pos:  position{line: 1683, col: 19, offset: 40190},
+										pos:  position{line: 1683, col: 19, offset: 40186},
 										name: "GlobEscape",
 									},
 									&ruleRefExpr{
-										pos:  position{line: 1683, col: 32, offset: 40203},
+										pos:  position{line: 1683, col: 32, offset: 40199},
 										name: "EscapeSequence",
 									},
 								},
@@ -12259,32 +12255,32 @@ var g = &grammar{
 		},
 		{
 			name: "GlobEscape",
-			pos:  position{line: 1685, col: 1, offset: 40238},
+			pos:  position{line: 1685, col: 1, offset: 40234},
 			expr: &choiceExpr{
-				pos: position{line: 1686, col: 5, offset: 40253},
+				pos: position{line: 1686, col: 5, offset: 40249},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1686, col: 5, offset: 40253},
+						pos: position{line: 1686, col: 5, offset: 40249},
 						run: (*parser).callonGlobEscape2,
 						expr: &litMatcher{
-							pos:        position{line: 1686, col: 5, offset: 40253},
+							pos:        position{line: 1686, col: 5, offset: 40249},
 							val:        "=",
 							ignoreCase: false,
 							want:       "\"=\"",
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1687, col: 5, offset: 40281},
+						pos: position{line: 1687, col: 5, offset: 40277},
 						run: (*parser).callonGlobEscape4,
 						expr: &litMatcher{
-							pos:        position{line: 1687, col: 5, offset: 40281},
+							pos:        position{line: 1687, col: 5, offset: 40277},
 							val:        "*",
 							ignoreCase: false,
 							want:       "\"*\"",
 						},
 					},
 					&charClassMatcher{
-						pos:        position{line: 1688, col: 5, offset: 40311},
+						pos:        position{line: 1688, col: 5, offset: 40307},
 						val:        "[+-]",
 						chars:      []rune{'+', '-'},
 						ignoreCase: false,
@@ -12297,57 +12293,57 @@ var g = &grammar{
 		},
 		{
 			name: "SingleQuotedChar",
-			pos:  position{line: 1690, col: 1, offset: 40317},
+			pos:  position{line: 1690, col: 1, offset: 40313},
 			expr: &choiceExpr{
-				pos: position{line: 1691, col: 5, offset: 40338},
+				pos: position{line: 1691, col: 5, offset: 40334},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1691, col: 5, offset: 40338},
+						pos: position{line: 1691, col: 5, offset: 40334},
 						run: (*parser).callonSingleQuotedChar2,
 						expr: &seqExpr{
-							pos: position{line: 1691, col: 5, offset: 40338},
+							pos: position{line: 1691, col: 5, offset: 40334},
 							exprs: []any{
 								&notExpr{
-									pos: position{line: 1691, col: 5, offset: 40338},
+									pos: position{line: 1691, col: 5, offset: 40334},
 									expr: &choiceExpr{
-										pos: position{line: 1691, col: 7, offset: 40340},
+										pos: position{line: 1691, col: 7, offset: 40336},
 										alternatives: []any{
 											&litMatcher{
-												pos:        position{line: 1691, col: 7, offset: 40340},
+												pos:        position{line: 1691, col: 7, offset: 40336},
 												val:        "'",
 												ignoreCase: false,
 												want:       "\"'\"",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1691, col: 13, offset: 40346},
+												pos:  position{line: 1691, col: 13, offset: 40342},
 												name: "EscapedChar",
 											},
 										},
 									},
 								},
 								&anyMatcher{
-									line: 1691, col: 26, offset: 40359,
+									line: 1691, col: 26, offset: 40355,
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1692, col: 5, offset: 40396},
+						pos: position{line: 1692, col: 5, offset: 40392},
 						run: (*parser).callonSingleQuotedChar9,
 						expr: &seqExpr{
-							pos: position{line: 1692, col: 5, offset: 40396},
+							pos: position{line: 1692, col: 5, offset: 40392},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1692, col: 5, offset: 40396},
+									pos:        position{line: 1692, col: 5, offset: 40392},
 									val:        "\\",
 									ignoreCase: false,
 									want:       "\"\\\\\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1692, col: 10, offset: 40401},
+									pos:   position{line: 1692, col: 10, offset: 40397},
 									label: "s",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1692, col: 12, offset: 40403},
+										pos:  position{line: 1692, col: 12, offset: 40399},
 										name: "EscapeSequence",
 									},
 								},
@@ -12361,16 +12357,16 @@ var g = &grammar{
 		},
 		{
 			name: "EscapeSequence",
-			pos:  position{line: 1694, col: 1, offset: 40437},
+			pos:  position{line: 1694, col: 1, offset: 40433},
 			expr: &choiceExpr{
-				pos: position{line: 1695, col: 5, offset: 40456},
+				pos: position{line: 1695, col: 5, offset: 40452},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1695, col: 5, offset: 40456},
+						pos:  position{line: 1695, col: 5, offset: 40452},
 						name: "SingleCharEscape",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1696, col: 5, offset: 40477},
+						pos:  position{line: 1696, col: 5, offset: 40473},
 						name: "UnicodeEscape",
 					},
 				},
@@ -12380,87 +12376,87 @@ var g = &grammar{
 		},
 		{
 			name: "SingleCharEscape",
-			pos:  position{line: 1698, col: 1, offset: 40492},
+			pos:  position{line: 1698, col: 1, offset: 40488},
 			expr: &choiceExpr{
-				pos: position{line: 1699, col: 5, offset: 40513},
+				pos: position{line: 1699, col: 5, offset: 40509},
 				alternatives: []any{
 					&litMatcher{
-						pos:        position{line: 1699, col: 5, offset: 40513},
+						pos:        position{line: 1699, col: 5, offset: 40509},
 						val:        "'",
 						ignoreCase: false,
 						want:       "\"'\"",
 					},
 					&actionExpr{
-						pos: position{line: 1700, col: 5, offset: 40521},
+						pos: position{line: 1700, col: 5, offset: 40517},
 						run: (*parser).callonSingleCharEscape3,
 						expr: &litMatcher{
-							pos:        position{line: 1700, col: 5, offset: 40521},
+							pos:        position{line: 1700, col: 5, offset: 40517},
 							val:        "\"",
 							ignoreCase: false,
 							want:       "\"\\\"\"",
 						},
 					},
 					&litMatcher{
-						pos:        position{line: 1701, col: 5, offset: 40561},
+						pos:        position{line: 1701, col: 5, offset: 40557},
 						val:        "\\",
 						ignoreCase: false,
 						want:       "\"\\\\\"",
 					},
 					&actionExpr{
-						pos: position{line: 1702, col: 5, offset: 40570},
+						pos: position{line: 1702, col: 5, offset: 40566},
 						run: (*parser).callonSingleCharEscape6,
 						expr: &litMatcher{
-							pos:        position{line: 1702, col: 5, offset: 40570},
+							pos:        position{line: 1702, col: 5, offset: 40566},
 							val:        "b",
 							ignoreCase: false,
 							want:       "\"b\"",
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1703, col: 5, offset: 40599},
+						pos: position{line: 1703, col: 5, offset: 40595},
 						run: (*parser).callonSingleCharEscape8,
 						expr: &litMatcher{
-							pos:        position{line: 1703, col: 5, offset: 40599},
+							pos:        position{line: 1703, col: 5, offset: 40595},
 							val:        "f",
 							ignoreCase: false,
 							want:       "\"f\"",
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1704, col: 5, offset: 40628},
+						pos: position{line: 1704, col: 5, offset: 40624},
 						run: (*parser).callonSingleCharEscape10,
 						expr: &litMatcher{
-							pos:        position{line: 1704, col: 5, offset: 40628},
+							pos:        position{line: 1704, col: 5, offset: 40624},
 							val:        "n",
 							ignoreCase: false,
 							want:       "\"n\"",
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1705, col: 5, offset: 40657},
+						pos: position{line: 1705, col: 5, offset: 40653},
 						run: (*parser).callonSingleCharEscape12,
 						expr: &litMatcher{
-							pos:        position{line: 1705, col: 5, offset: 40657},
+							pos:        position{line: 1705, col: 5, offset: 40653},
 							val:        "r",
 							ignoreCase: false,
 							want:       "\"r\"",
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1706, col: 5, offset: 40686},
+						pos: position{line: 1706, col: 5, offset: 40682},
 						run: (*parser).callonSingleCharEscape14,
 						expr: &litMatcher{
-							pos:        position{line: 1706, col: 5, offset: 40686},
+							pos:        position{line: 1706, col: 5, offset: 40682},
 							val:        "t",
 							ignoreCase: false,
 							want:       "\"t\"",
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1707, col: 5, offset: 40715},
+						pos: position{line: 1707, col: 5, offset: 40711},
 						run: (*parser).callonSingleCharEscape16,
 						expr: &litMatcher{
-							pos:        position{line: 1707, col: 5, offset: 40715},
+							pos:        position{line: 1707, col: 5, offset: 40711},
 							val:        "v",
 							ignoreCase: false,
 							want:       "\"v\"",
@@ -12473,32 +12469,32 @@ var g = &grammar{
 		},
 		{
 			name: "KeywordEscape",
-			pos:  position{line: 1709, col: 1, offset: 40741},
+			pos:  position{line: 1709, col: 1, offset: 40737},
 			expr: &choiceExpr{
-				pos: position{line: 1710, col: 5, offset: 40759},
+				pos: position{line: 1710, col: 5, offset: 40755},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1710, col: 5, offset: 40759},
+						pos: position{line: 1710, col: 5, offset: 40755},
 						run: (*parser).callonKeywordEscape2,
 						expr: &litMatcher{
-							pos:        position{line: 1710, col: 5, offset: 40759},
+							pos:        position{line: 1710, col: 5, offset: 40755},
 							val:        "=",
 							ignoreCase: false,
 							want:       "\"=\"",
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1711, col: 5, offset: 40787},
+						pos: position{line: 1711, col: 5, offset: 40783},
 						run: (*parser).callonKeywordEscape4,
 						expr: &litMatcher{
-							pos:        position{line: 1711, col: 5, offset: 40787},
+							pos:        position{line: 1711, col: 5, offset: 40783},
 							val:        "*",
 							ignoreCase: false,
 							want:       "\"*\"",
 						},
 					},
 					&charClassMatcher{
-						pos:        position{line: 1712, col: 5, offset: 40815},
+						pos:        position{line: 1712, col: 5, offset: 40811},
 						val:        "[+-]",
 						chars:      []rune{'+', '-'},
 						ignoreCase: false,
@@ -12511,42 +12507,42 @@ var g = &grammar{
 		},
 		{
 			name: "UnicodeEscape",
-			pos:  position{line: 1714, col: 1, offset: 40821},
+			pos:  position{line: 1714, col: 1, offset: 40817},
 			expr: &choiceExpr{
-				pos: position{line: 1715, col: 5, offset: 40839},
+				pos: position{line: 1715, col: 5, offset: 40835},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1715, col: 5, offset: 40839},
+						pos: position{line: 1715, col: 5, offset: 40835},
 						run: (*parser).callonUnicodeEscape2,
 						expr: &seqExpr{
-							pos: position{line: 1715, col: 5, offset: 40839},
+							pos: position{line: 1715, col: 5, offset: 40835},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1715, col: 5, offset: 40839},
+									pos:        position{line: 1715, col: 5, offset: 40835},
 									val:        "u",
 									ignoreCase: false,
 									want:       "\"u\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1715, col: 9, offset: 40843},
+									pos:   position{line: 1715, col: 9, offset: 40839},
 									label: "chars",
 									expr: &seqExpr{
-										pos: position{line: 1715, col: 16, offset: 40850},
+										pos: position{line: 1715, col: 16, offset: 40846},
 										exprs: []any{
 											&ruleRefExpr{
-												pos:  position{line: 1715, col: 16, offset: 40850},
+												pos:  position{line: 1715, col: 16, offset: 40846},
 												name: "HexDigit",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1715, col: 25, offset: 40859},
+												pos:  position{line: 1715, col: 25, offset: 40855},
 												name: "HexDigit",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1715, col: 34, offset: 40868},
+												pos:  position{line: 1715, col: 34, offset: 40864},
 												name: "HexDigit",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1715, col: 43, offset: 40877},
+												pos:  position{line: 1715, col: 43, offset: 40873},
 												name: "HexDigit",
 											},
 										},
@@ -12556,65 +12552,65 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1718, col: 5, offset: 40940},
+						pos: position{line: 1718, col: 5, offset: 40936},
 						run: (*parser).callonUnicodeEscape11,
 						expr: &seqExpr{
-							pos: position{line: 1718, col: 5, offset: 40940},
+							pos: position{line: 1718, col: 5, offset: 40936},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1718, col: 5, offset: 40940},
+									pos:        position{line: 1718, col: 5, offset: 40936},
 									val:        "u",
 									ignoreCase: false,
 									want:       "\"u\"",
 								},
 								&litMatcher{
-									pos:        position{line: 1718, col: 9, offset: 40944},
+									pos:        position{line: 1718, col: 9, offset: 40940},
 									val:        "{",
 									ignoreCase: false,
 									want:       "\"{\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1718, col: 13, offset: 40948},
+									pos:   position{line: 1718, col: 13, offset: 40944},
 									label: "chars",
 									expr: &seqExpr{
-										pos: position{line: 1718, col: 20, offset: 40955},
+										pos: position{line: 1718, col: 20, offset: 40951},
 										exprs: []any{
 											&ruleRefExpr{
-												pos:  position{line: 1718, col: 20, offset: 40955},
+												pos:  position{line: 1718, col: 20, offset: 40951},
 												name: "HexDigit",
 											},
 											&zeroOrOneExpr{
-												pos: position{line: 1718, col: 29, offset: 40964},
+												pos: position{line: 1718, col: 29, offset: 40960},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1718, col: 29, offset: 40964},
+													pos:  position{line: 1718, col: 29, offset: 40960},
 													name: "HexDigit",
 												},
 											},
 											&zeroOrOneExpr{
-												pos: position{line: 1718, col: 39, offset: 40974},
+												pos: position{line: 1718, col: 39, offset: 40970},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1718, col: 39, offset: 40974},
+													pos:  position{line: 1718, col: 39, offset: 40970},
 													name: "HexDigit",
 												},
 											},
 											&zeroOrOneExpr{
-												pos: position{line: 1718, col: 49, offset: 40984},
+												pos: position{line: 1718, col: 49, offset: 40980},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1718, col: 49, offset: 40984},
+													pos:  position{line: 1718, col: 49, offset: 40980},
 													name: "HexDigit",
 												},
 											},
 											&zeroOrOneExpr{
-												pos: position{line: 1718, col: 59, offset: 40994},
+												pos: position{line: 1718, col: 59, offset: 40990},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1718, col: 59, offset: 40994},
+													pos:  position{line: 1718, col: 59, offset: 40990},
 													name: "HexDigit",
 												},
 											},
 											&zeroOrOneExpr{
-												pos: position{line: 1718, col: 69, offset: 41004},
+												pos: position{line: 1718, col: 69, offset: 41000},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1718, col: 69, offset: 41004},
+													pos:  position{line: 1718, col: 69, offset: 41000},
 													name: "HexDigit",
 												},
 											},
@@ -12622,7 +12618,7 @@ var g = &grammar{
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1718, col: 80, offset: 41015},
+									pos:        position{line: 1718, col: 80, offset: 41011},
 									val:        "}",
 									ignoreCase: false,
 									want:       "\"}\"",
@@ -12637,37 +12633,37 @@ var g = &grammar{
 		},
 		{
 			name: "RegexpPattern",
-			pos:  position{line: 1722, col: 1, offset: 41069},
+			pos:  position{line: 1722, col: 1, offset: 41065},
 			expr: &actionExpr{
-				pos: position{line: 1723, col: 5, offset: 41087},
+				pos: position{line: 1723, col: 5, offset: 41083},
 				run: (*parser).callonRegexpPattern1,
 				expr: &seqExpr{
-					pos: position{line: 1723, col: 5, offset: 41087},
+					pos: position{line: 1723, col: 5, offset: 41083},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1723, col: 5, offset: 41087},
+							pos:        position{line: 1723, col: 5, offset: 41083},
 							val:        "/",
 							ignoreCase: false,
 							want:       "\"/\"",
 						},
 						&labeledExpr{
-							pos:   position{line: 1723, col: 9, offset: 41091},
+							pos:   position{line: 1723, col: 9, offset: 41087},
 							label: "body",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1723, col: 14, offset: 41096},
+								pos:  position{line: 1723, col: 14, offset: 41092},
 								name: "RegexpBody",
 							},
 						},
 						&litMatcher{
-							pos:        position{line: 1723, col: 25, offset: 41107},
+							pos:        position{line: 1723, col: 25, offset: 41103},
 							val:        "/",
 							ignoreCase: false,
 							want:       "\"/\"",
 						},
 						&notExpr{
-							pos: position{line: 1723, col: 29, offset: 41111},
+							pos: position{line: 1723, col: 29, offset: 41107},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1723, col: 30, offset: 41112},
+								pos:  position{line: 1723, col: 30, offset: 41108},
 								name: "KeyWordStart",
 							},
 						},
@@ -12679,33 +12675,33 @@ var g = &grammar{
 		},
 		{
 			name: "RegexpBody",
-			pos:  position{line: 1725, col: 1, offset: 41147},
+			pos:  position{line: 1725, col: 1, offset: 41143},
 			expr: &actionExpr{
-				pos: position{line: 1726, col: 5, offset: 41162},
+				pos: position{line: 1726, col: 5, offset: 41158},
 				run: (*parser).callonRegexpBody1,
 				expr: &oneOrMoreExpr{
-					pos: position{line: 1726, col: 5, offset: 41162},
+					pos: position{line: 1726, col: 5, offset: 41158},
 					expr: &choiceExpr{
-						pos: position{line: 1726, col: 6, offset: 41163},
+						pos: position{line: 1726, col: 6, offset: 41159},
 						alternatives: []any{
 							&charClassMatcher{
-								pos:        position{line: 1726, col: 6, offset: 41163},
+								pos:        position{line: 1726, col: 6, offset: 41159},
 								val:        "[^/\\\\]",
 								chars:      []rune{'/', '\\'},
 								ignoreCase: false,
 								inverted:   true,
 							},
 							&seqExpr{
-								pos: position{line: 1726, col: 15, offset: 41172},
+								pos: position{line: 1726, col: 15, offset: 41168},
 								exprs: []any{
 									&litMatcher{
-										pos:        position{line: 1726, col: 15, offset: 41172},
+										pos:        position{line: 1726, col: 15, offset: 41168},
 										val:        "\\",
 										ignoreCase: false,
 										want:       "\"\\\\\"",
 									},
 									&anyMatcher{
-										line: 1726, col: 20, offset: 41177,
+										line: 1726, col: 20, offset: 41173,
 									},
 								},
 							},
@@ -12718,9 +12714,9 @@ var g = &grammar{
 		},
 		{
 			name: "EscapedChar",
-			pos:  position{line: 1728, col: 1, offset: 41213},
+			pos:  position{line: 1728, col: 1, offset: 41209},
 			expr: &charClassMatcher{
-				pos:        position{line: 1729, col: 5, offset: 41229},
+				pos:        position{line: 1729, col: 5, offset: 41225},
 				val:        "[\\x00-\\x1f\\\\]",
 				chars:      []rune{'\\'},
 				ranges:     []rune{'\x00', '\x1f'},
@@ -12732,11 +12728,11 @@ var g = &grammar{
 		},
 		{
 			name: "_",
-			pos:  position{line: 1731, col: 1, offset: 41244},
+			pos:  position{line: 1731, col: 1, offset: 41240},
 			expr: &oneOrMoreExpr{
-				pos: position{line: 1731, col: 5, offset: 41248},
+				pos: position{line: 1731, col: 5, offset: 41244},
 				expr: &ruleRefExpr{
-					pos:  position{line: 1731, col: 5, offset: 41248},
+					pos:  position{line: 1731, col: 5, offset: 41244},
 					name: "AnySpace",
 				},
 			},
@@ -12745,11 +12741,11 @@ var g = &grammar{
 		},
 		{
 			name: "__",
-			pos:  position{line: 1733, col: 1, offset: 41259},
+			pos:  position{line: 1733, col: 1, offset: 41255},
 			expr: &zeroOrMoreExpr{
-				pos: position{line: 1733, col: 6, offset: 41264},
+				pos: position{line: 1733, col: 6, offset: 41260},
 				expr: &ruleRefExpr{
-					pos:  position{line: 1733, col: 6, offset: 41264},
+					pos:  position{line: 1733, col: 6, offset: 41260},
 					name: "AnySpace",
 				},
 			},
@@ -12758,20 +12754,20 @@ var g = &grammar{
 		},
 		{
 			name: "AnySpace",
-			pos:  position{line: 1735, col: 1, offset: 41275},
+			pos:  position{line: 1735, col: 1, offset: 41271},
 			expr: &choiceExpr{
-				pos: position{line: 1736, col: 5, offset: 41288},
+				pos: position{line: 1736, col: 5, offset: 41284},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1736, col: 5, offset: 41288},
+						pos:  position{line: 1736, col: 5, offset: 41284},
 						name: "WhiteSpace",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1737, col: 5, offset: 41303},
+						pos:  position{line: 1737, col: 5, offset: 41299},
 						name: "LineTerminator",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1738, col: 5, offset: 41322},
+						pos:  position{line: 1738, col: 5, offset: 41318},
 						name: "Comment",
 					},
 				},
@@ -12781,32 +12777,32 @@ var g = &grammar{
 		},
 		{
 			name: "UnicodeLetter",
-			pos:  position{line: 1740, col: 1, offset: 41331},
+			pos:  position{line: 1740, col: 1, offset: 41327},
 			expr: &choiceExpr{
-				pos: position{line: 1741, col: 5, offset: 41349},
+				pos: position{line: 1741, col: 5, offset: 41345},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1741, col: 5, offset: 41349},
+						pos:  position{line: 1741, col: 5, offset: 41345},
 						name: "Lu",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1742, col: 5, offset: 41356},
+						pos:  position{line: 1742, col: 5, offset: 41352},
 						name: "Ll",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1743, col: 5, offset: 41363},
+						pos:  position{line: 1743, col: 5, offset: 41359},
 						name: "Lt",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1744, col: 5, offset: 41370},
+						pos:  position{line: 1744, col: 5, offset: 41366},
 						name: "Lm",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1745, col: 5, offset: 41377},
+						pos:  position{line: 1745, col: 5, offset: 41373},
 						name: "Lo",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1746, col: 5, offset: 41384},
+						pos:  position{line: 1746, col: 5, offset: 41380},
 						name: "Nl",
 					},
 				},
@@ -12816,16 +12812,16 @@ var g = &grammar{
 		},
 		{
 			name: "UnicodeCombiningMark",
-			pos:  position{line: 1748, col: 1, offset: 41388},
+			pos:  position{line: 1748, col: 1, offset: 41384},
 			expr: &choiceExpr{
-				pos: position{line: 1749, col: 5, offset: 41413},
+				pos: position{line: 1749, col: 5, offset: 41409},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1749, col: 5, offset: 41413},
+						pos:  position{line: 1749, col: 5, offset: 41409},
 						name: "Mn",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1750, col: 5, offset: 41420},
+						pos:  position{line: 1750, col: 5, offset: 41416},
 						name: "Mc",
 					},
 				},
@@ -12835,9 +12831,9 @@ var g = &grammar{
 		},
 		{
 			name: "UnicodeDigit",
-			pos:  position{line: 1752, col: 1, offset: 41424},
+			pos:  position{line: 1752, col: 1, offset: 41420},
 			expr: &ruleRefExpr{
-				pos:  position{line: 1753, col: 5, offset: 41441},
+				pos:  position{line: 1753, col: 5, offset: 41437},
 				name: "Nd",
 			},
 			leader:        false,
@@ -12845,9 +12841,9 @@ var g = &grammar{
 		},
 		{
 			name: "UnicodeConnectorPunctuation",
-			pos:  position{line: 1755, col: 1, offset: 41445},
+			pos:  position{line: 1755, col: 1, offset: 41441},
 			expr: &ruleRefExpr{
-				pos:  position{line: 1756, col: 5, offset: 41477},
+				pos:  position{line: 1756, col: 5, offset: 41473},
 				name: "Pc",
 			},
 			leader:        false,
@@ -12855,9 +12851,9 @@ var g = &grammar{
 		},
 		{
 			name: "Ll",
-			pos:  position{line: 1762, col: 1, offset: 41658},
+			pos:  position{line: 1762, col: 1, offset: 41654},
 			expr: &charClassMatcher{
-				pos:        position{line: 1762, col: 6, offset: 41663},
+				pos:        position{line: 1762, col: 6, offset: 41659},
 				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', 'ﬓ', 'ﬗ', 'ａ', 'ｚ'},
@@ -12869,9 +12865,9 @@ var g = &grammar{
 		},
 		{
 			name: "Lm",
-			pos:  position{line: 1765, col: 1, offset: 45815},
+			pos:  position{line: 1765, col: 1, offset: 45811},
 			expr: &charClassMatcher{
-				pos:        position{line: 1765, col: 6, offset: 45820},
+				pos:        position{line: 1765, col: 6, offset: 45816},
 				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{'ʰ', 'ˁ', 'ˆ', 'ˑ', 'ˠ', 'ˤ', 'ۥ', 'ۦ', 'ߴ', 'ߵ', 'ᱸ', 'ᱽ', 'ᴬ', 'ᵪ', 'ᶛ', 'ᶿ', 'ₐ', 'ₜ', 'ⱼ', 'ⱽ', '〱', '〵', 'ゝ', 'ゞ', 'ー', 'ヾ', 'ꓸ', 'ꓽ', 'ꚜ', 'ꚝ', 'ꜗ', 'ꜟ', 'ꟸ', 'ꟹ', 'ꫳ', 'ꫴ', 'ꭜ', 'ꭟ', 'ﾞ', 'ﾟ'},
@@ -12883,9 +12879,9 @@ var g = &grammar{
 		},
 		{
 			name: "Lo",
-			pos:  position{line: 1768, col: 1, offset: 46305},
+			pos:  position{line: 1768, col: 1, offset: 46301},
 			expr: &charClassMatcher{
-				pos:        position{line: 1768, col: 6, offset: 46310},
+				pos:        position{line: 1768, col: 6, offset: 46306},
 				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{'ǀ', 'ǃ', 'א', 'ת', 'ׯ', 'ײ', 'ؠ', 'ؿ', 'ف', 'ي', 'ٮ', 'ٯ', 'ٱ', 'ۓ', 'ۮ', 'ۯ', 'ۺ', 'ۼ', 'ܒ', 'ܯ', 'ݍ', 'ޥ', 'ߊ', 'ߪ', 'ࠀ', 'ࠕ', 'ࡀ', 'ࡘ', 'ࡠ', 'ࡪ', 'ࢠ', 'ࢴ', 'ࢶ', 'ࢽ', 'ऄ', 'ह', 'क़', 'ॡ', 'ॲ', 'ঀ', 'অ', 'ঌ', 'এ', 'ঐ', 'ও', 'ন', 'প', 'র', 'শ', 'হ', 'ড়', 'ঢ়', 'য়', 'ৡ', 'ৰ', 'ৱ', 'ਅ', 'ਊ', 'ਏ', 'ਐ', 'ਓ', 'ਨ', 'ਪ', 'ਰ', 'ਲ', 'ਲ਼', 'ਵ', 'ਸ਼', 'ਸ', 'ਹ', 'ਖ਼', 'ੜ', 'ੲ', 'ੴ', 'અ', 'ઍ', 'એ', 'ઑ', 'ઓ', 'ન', 'પ', 'ર', 'લ', 'ળ', 'વ', 'હ', 'ૠ', 'ૡ', 'ଅ', 'ଌ', 'ଏ', 'ଐ', 'ଓ', 'ନ', 'ପ', 'ର', 'ଲ', 'ଳ', 'ଵ', 'ହ', 'ଡ଼', 'ଢ଼', 'ୟ', 'ୡ', 'அ', 'ஊ', 'எ', 'ஐ', 'ஒ', 'க', 'ங', 'ச', 'ஞ', 'ட', 'ண', 'த', 'ந', 'ப', 'ம', 'ஹ', 'అ', 'ఌ', 'ఎ', 'ఐ', 'ఒ', 'న', 'ప', 'హ', 'ౘ', 'ౚ', 'ౠ', 'ౡ', 'ಅ', 'ಌ', 'ಎ', 'ಐ', 'ಒ', 'ನ', 'ಪ', 'ಳ', 'ವ', 'ಹ', 'ೠ', 'ೡ', 'ೱ', 'ೲ', 'അ', 'ഌ', 'എ', 'ഐ', 'ഒ', 'ഺ', 'ൔ', 'ൖ', 'ൟ', 'ൡ', 'ൺ', 'ൿ', 'අ', 'ඖ', 'ක', 'න', 'ඳ', 'ර', 'ව', 'ෆ', 'ก', 'ะ', 'า', 'ำ', 'เ', 'ๅ', 'ກ', 'ຂ', 'ງ', 'ຈ', 'ດ', 'ທ', 'ນ', 'ຟ', 'ມ', 'ຣ', 'ສ', 'ຫ', 'ອ', 'ະ', 'າ', 'ຳ', 'ເ', 'ໄ', 'ໜ', 'ໟ', 'ཀ', 'ཇ', 'ཉ', 'ཬ', 'ྈ', 'ྌ', 'က', 'ဪ', 'ၐ', 'ၕ', 'ၚ', 'ၝ', 'ၥ', 'ၦ', 'ၮ', 'ၰ', 'ၵ', 'ႁ', 'ᄀ', 'ቈ', 'ቊ', 'ቍ', 'ቐ', 'ቖ', 'ቚ', 'ቝ', 'በ', 'ኈ', 'ኊ', 'ኍ', 'ነ', 'ኰ', 'ኲ', 'ኵ', 'ኸ', 'ኾ', 'ዂ', 'ዅ', 'ወ', 'ዖ', 'ዘ', 'ጐ', 'ጒ', 'ጕ', 'ጘ', 'ፚ', 'ᎀ', 'ᎏ', 'ᐁ', 'ᙬ', 'ᙯ', 'ᙿ', 'ᚁ', 'ᚚ', 'ᚠ', 'ᛪ', 'ᛱ', 'ᛸ', 'ᜀ', 'ᜌ', 'ᜎ', 'ᜑ', 'ᜠ', 'ᜱ', 'ᝀ', 'ᝑ', 'ᝠ', 'ᝬ', 'ᝮ', 'ᝰ', 'ក', 'ឳ', 'ᠠ', 'ᡂ', 'ᡄ', 'ᡸ', 'ᢀ', 'ᢄ', 'ᢇ', 'ᢨ', 'ᢰ', 'ᣵ', 'ᤀ', 'ᤞ', 'ᥐ', 'ᥭ', 'ᥰ', 'ᥴ', 'ᦀ', 'ᦫ', 'ᦰ', 'ᧉ', 'ᨀ', 'ᨖ', 'ᨠ', 'ᩔ', 'ᬅ', 'ᬳ', 'ᭅ', 'ᭋ', 'ᮃ', 'ᮠ', 'ᮮ', 'ᮯ', 'ᮺ', 'ᯥ', 'ᰀ', 'ᰣ', 'ᱍ', 'ᱏ', 'ᱚ', 'ᱷ', 'ᳩ', 'ᳬ', 'ᳮ', 'ᳱ', 'ᳵ', 'ᳶ', 'ℵ', 'ℸ', 'ⴰ', 'ⵧ', 'ⶀ', 'ⶖ', 'ⶠ', 'ⶦ', 'ⶨ', 'ⶮ', 'ⶰ', 'ⶶ', 'ⶸ', 'ⶾ', 'ⷀ', 'ⷆ', 'ⷈ', 'ⷎ', 'ⷐ', 'ⷖ', 'ⷘ', 'ⷞ', 'ぁ', 'ゖ', 'ァ', 'ヺ', 'ㄅ', 'ㄯ', 'ㄱ', 'ㆎ', 'ㆠ', 'ㆺ', 'ㇰ', 'ㇿ', '㐀', '䶵', '一', '鿯', 'ꀀ', 'ꀔ', 'ꀖ', 'ꒌ', 'ꓐ', 'ꓷ', 'ꔀ', 'ꘋ', 'ꘐ', 'ꘟ', 'ꘪ', 'ꘫ', 'ꚠ', 'ꛥ', 'ꟻ', 'ꠁ', 'ꠃ', 'ꠅ', 'ꠇ', 'ꠊ', 'ꠌ', 'ꠢ', 'ꡀ', 'ꡳ', 'ꢂ', 'ꢳ', 'ꣲ', 'ꣷ', 'ꣽ', 'ꣾ', 'ꤊ', 'ꤥ', 'ꤰ', 'ꥆ', 'ꥠ', 'ꥼ', 'ꦄ', 'ꦲ', 'ꧠ', 'ꧤ', 'ꧧ', 'ꧯ', 'ꧺ', 'ꧾ', 'ꨀ', 'ꨨ', 'ꩀ', 'ꩂ', 'ꩄ', 'ꩋ', 'ꩠ', 'ꩯ', 'ꩱ', 'ꩶ', 'ꩾ', 'ꪯ', 'ꪵ', 'ꪶ', 'ꪹ', 'ꪽ', 'ꫛ', 'ꫜ', 'ꫠ', 'ꫪ', 'ꬁ', 'ꬆ', 'ꬉ', 'ꬎ', 'ꬑ', 'ꬖ', 'ꬠ', 'ꬦ', 'ꬨ', 'ꬮ', 'ꯀ', 'ꯢ', '가', '힣', 'ힰ', 'ퟆ', 'ퟋ', 'ퟻ', '豈', '舘', '並', '龎', 'ײַ', 'ﬨ', 'שׁ', 'זּ', 'טּ', 'לּ', 'נּ', 'סּ', 'ףּ', 'פּ', 'צּ', 'ﮱ', 'ﯓ', 'ﴽ', 'ﵐ', 'ﶏ', 'ﶒ', 'ﷇ', 'ﷰ', 'ﷻ', 'ﹰ', 'ﹴ', 'ﹶ', 'ﻼ', 'ｦ', 'ｯ', 'ｱ', 'ﾝ', 'ﾠ', 'ﾾ', 'ￂ', 'ￇ', 'ￊ', 'ￏ', 'ￒ', 'ￗ', 'ￚ', 'ￜ'},
@@ -12897,9 +12893,9 @@ var g = &grammar{
 		},
 		{
 			name: "Lt",
-			pos:  position{line: 1771, col: 1, offset: 49757},
+			pos:  position{line: 1771, col: 1, offset: 49753},
 			expr: &charClassMatcher{
-				pos:        position{line: 1771, col: 6, offset: 49762},
+				pos:        position{line: 1771, col: 6, offset: 49758},
 				val:        "[\\u01C5\\u01C8\\u01CB\\u01F2\\u1F88-\\u1F8F\\u1F98-\\u1F9F\\u1FA8-\\u1FAF\\u1FBC\\u1FCC\\u1FFC]",
 				chars:      []rune{'Dž', 'Lj', 'Nj', 'Dz', 'ᾼ', 'ῌ', 'ῼ'},
 				ranges:     []rune{'ᾈ', 'ᾏ', 'ᾘ', 'ᾟ', 'ᾨ', 'ᾯ'},
@@ -12911,9 +12907,9 @@ var g = &grammar{
 		},
 		{
 			name: "Lu",
-			pos:  position{line: 1774, col: 1, offset: 49868},
+			pos:  position{line: 1774, col: 1, offset: 49864},
 			expr: &charClassMatcher{
-				pos:        position{line: 1774, col: 6, offset: 49873},
+				pos:        position{line: 1774, col: 6, offset: 49869},
 				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', 'ℭ', 'ℰ', 'ℳ', 'ℾ', 'ℿ', 'Ⰰ', 'Ⱞ', 'Ɫ', 'Ɽ', 'Ɑ', 'Ɒ', 'Ȿ', 'Ⲁ', 'Ᵹ', 'Ꝿ', 'Ɦ', 'Ɪ', 'Ʞ', 'Ꞵ', 'Ａ', 'Ｚ'},
@@ -12925,9 +12921,9 @@ var g = &grammar{
 		},
 		{
 			name: "Mc",
-			pos:  position{line: 1777, col: 1, offset: 53874},
+			pos:  position{line: 1777, col: 1, offset: 53870},
 			expr: &charClassMatcher{
-				pos:        position{line: 1777, col: 6, offset: 53879},
+				pos:        position{line: 1777, col: 6, offset: 53875},
 				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{'ा', 'ी', 'ॉ', 'ौ', 'ॎ', 'ॏ', 'ং', 'ঃ', 'া', 'ী', 'ে', 'ৈ', 'ো', 'ৌ', 'ਾ', 'ੀ', 'ા', 'ી', 'ો', 'ૌ', 'ଂ', 'ଃ', 'େ', 'ୈ', 'ୋ', 'ୌ', 'ா', 'ி', 'ு', 'ூ', 'ெ', 'ை', 'ொ', 'ௌ', 'ఁ', 'ః', 'ు', 'ౄ', 'ಂ', 'ಃ', 'ೀ', 'ೄ', 'ೇ', 'ೈ', 'ೊ', 'ೋ', 'ೕ', 'ೖ', 'ം', 'ഃ', 'ാ', 'ീ', 'െ', 'ൈ', 'ൊ', 'ൌ', 'ං', 'ඃ', 'ා', 'ෑ', 'ෘ', 'ෟ', 'ෲ', 'ෳ', '༾', '༿', 'ါ', 'ာ', 'ျ', 'ြ', 'ၖ', 'ၗ', 'ၢ', 'ၤ', 'ၧ', 'ၭ', 'ႃ', 'ႄ', 'ႇ', 'ႌ', 'ႚ', 'ႜ', 'ើ', 'ៅ', 'ះ', 'ៈ', 'ᤣ', 'ᤦ', 'ᤩ', 'ᤫ', 'ᤰ', 'ᤱ', 'ᤳ', 'ᤸ', 'ᨙ', 'ᨚ', 'ᩣ', 'ᩤ', 'ᩭ', 'ᩲ', 'ᬽ', 'ᭁ', 'ᭃ', '᭄', 'ᮦ', 'ᮧ', 'ᯪ', 'ᯬ', '᯲', '᯳', 'ᰤ', 'ᰫ', 'ᰴ', 'ᰵ', 'ᳲ', 'ᳳ', '〮', '〯', 'ꠣ', 'ꠤ', 'ꢀ', 'ꢁ', 'ꢴ', 'ꣃ', 'ꥒ', '꥓', 'ꦴ', 'ꦵ', 'ꦺ', 'ꦻ', 'ꦽ', '꧀', 'ꨯ', 'ꨰ', 'ꨳ', 'ꨴ', 'ꫮ', 'ꫯ', 'ꯣ', 'ꯤ', 'ꯦ', 'ꯧ', 'ꯩ', 'ꯪ'},
@@ -12939,9 +12935,9 @@ var g = &grammar{
 		},
 		{
 			name: "Mn",
-			pos:  position{line: 1780, col: 1, offset: 55067},
+			pos:  position{line: 1780, col: 1, offset: 55063},
 			expr: &charClassMatcher{
-				pos:        position{line: 1780, col: 6, offset: 55072},
+				pos:        position{line: 1780, col: 6, offset: 55068},
 				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{'̀', 'ͯ', '҃', '҇', '֑', 'ֽ', 'ׁ', 'ׂ', 'ׄ', 'ׅ', 'ؐ', 'ؚ', 'ً', 'ٟ', 'ۖ', 'ۜ', '۟', 'ۤ', 'ۧ', 'ۨ', '۪', 'ۭ', 'ܰ', '݊', 'ަ', 'ް', '߫', '߳', 'ࠖ', '࠙', 'ࠛ', 'ࠣ', 'ࠥ', 'ࠧ', 'ࠩ', '࠭', '࡙', '࡛', '࣓', '࣡', 'ࣣ', 'ं', 'ु', 'ै', '॑', 'ॗ', 'ॢ', 'ॣ', 'ু', 'ৄ', 'ৢ', 'ৣ', 'ਁ', 'ਂ', 'ੁ', 'ੂ', 'ੇ', 'ੈ', 'ੋ', '੍', 'ੰ', 'ੱ', 'ઁ', 'ં', 'ુ', 'ૅ', 'ે', 'ૈ', 'ૢ', 'ૣ', 'ૺ', '૿', 'ୁ', 'ୄ', 'ୢ', 'ୣ', 'ా', 'ీ', 'ె', 'ై', 'ొ', '్', 'ౕ', 'ౖ', 'ౢ', 'ౣ', 'ೌ', '್', 'ೢ', 'ೣ', 'ഀ', 'ഁ', '഻', '഼', 'ു', 'ൄ', 'ൢ', 'ൣ', 'ි', 'ු', 'ิ', 'ฺ', '็', '๎', 'ິ', 'ູ', 'ົ', 'ຼ', '່', 'ໍ', '༘', '༙', 'ཱ', 'ཾ', 'ྀ', '྄', '྆', '྇', 'ྍ', 'ྗ', 'ྙ', 'ྼ', 'ိ', 'ူ', 'ဲ', '့', '္', '်', 'ွ', 'ှ', 'ၘ', 'ၙ', 'ၞ', 'ၠ', 'ၱ', 'ၴ', 'ႅ', 'ႆ', '፝', '፟', 'ᜒ', '᜔', 'ᜲ', '᜴', 'ᝒ', 'ᝓ', 'ᝲ', 'ᝳ', '឴', '឵', 'ិ', 'ួ', '៉', '៓', '᠋', '᠍', 'ᢅ', 'ᢆ', 'ᤠ', 'ᤢ', 'ᤧ', 'ᤨ', '᤹', '᤻', 'ᨗ', 'ᨘ', 'ᩘ', 'ᩞ', 'ᩥ', 'ᩬ', 'ᩳ', '᩼', '᪰', '᪽', 'ᬀ', 'ᬃ', 'ᬶ', 'ᬺ', '᭫', '᭳', 'ᮀ', 'ᮁ', 'ᮢ', 'ᮥ', 'ᮨ', 'ᮩ', '᮫', 'ᮭ', 'ᯨ', 'ᯩ', 'ᯯ', 'ᯱ', 'ᰬ', 'ᰳ', 'ᰶ', '᰷', '᳐', '᳒', '᳔', '᳠', '᳢', '᳨', '᳸', '᳹', '᷀', '᷹', '᷻', '᷿', '⃐', '⃜', '⃥', '⃰', '⳯', '⳱', 'ⷠ', 'ⷿ', '〪', '〭', '゙', '゚', 'ꙴ', '꙽', 'ꚞ', 'ꚟ', '꛰', '꛱', 'ꠥ', 'ꠦ', '꣄', 'ꣅ', '꣠', '꣱', 'ꤦ', '꤭', 'ꥇ', 'ꥑ', 'ꦀ', 'ꦂ', 'ꦶ', 'ꦹ', 'ꨩ', 'ꨮ', 'ꨱ', 'ꨲ', 'ꨵ', 'ꨶ', 'ꪲ', 'ꪴ', 'ꪷ', 'ꪸ', 'ꪾ', '꪿', 'ꫬ', 'ꫭ', '︀', '️', '︠', '︯'},
@@ -12953,9 +12949,9 @@ var g = &grammar{
 		},
 		{
 			name: "Nd",
-			pos:  position{line: 1783, col: 1, offset: 57252},
+			pos:  position{line: 1783, col: 1, offset: 57248},
 			expr: &charClassMatcher{
-				pos:        position{line: 1783, col: 6, offset: 57257},
+				pos:        position{line: 1783, col: 6, offset: 57253},
 				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,
@@ -12966,9 +12962,9 @@ var g = &grammar{
 		},
 		{
 			name: "Nl",
-			pos:  position{line: 1786, col: 1, offset: 57760},
+			pos:  position{line: 1786, col: 1, offset: 57756},
 			expr: &charClassMatcher{
-				pos:        position{line: 1786, col: 6, offset: 57765},
+				pos:        position{line: 1786, col: 6, offset: 57761},
 				val:        "[\\u16EE-\\u16F0\\u2160-\\u2182\\u2185-\\u2188\\u3007\\u3021-\\u3029\\u3038-\\u303A\\uA6E6-\\uA6EF]",
 				chars:      []rune{'〇'},
 				ranges:     []rune{'ᛮ', 'ᛰ', 'Ⅰ', 'ↂ', 'ↅ', 'ↈ', '〡', '〩', '〸', '〺', 'ꛦ', 'ꛯ'},
@@ -12980,9 +12976,9 @@ var g = &grammar{
 		},
 		{
 			name: "Pc",
-			pos:  position{line: 1789, col: 1, offset: 57879},
+			pos:  position{line: 1789, col: 1, offset: 57875},
 			expr: &charClassMatcher{
-				pos:        position{line: 1789, col: 6, offset: 57884},
+				pos:        position{line: 1789, col: 6, offset: 57880},
 				val:        "[\\u005F\\u203F-\\u2040\\u2054\\uFE33-\\uFE34\\uFE4D-\\uFE4F\\uFF3F]",
 				chars:      []rune{'_', '⁔', '＿'},
 				ranges:     []rune{'‿', '⁀', '︳', '︴', '﹍', '﹏'},
@@ -12994,9 +12990,9 @@ var g = &grammar{
 		},
 		{
 			name: "Zs",
-			pos:  position{line: 1792, col: 1, offset: 57965},
+			pos:  position{line: 1792, col: 1, offset: 57961},
 			expr: &charClassMatcher{
-				pos:        position{line: 1792, col: 6, offset: 57970},
+				pos:        position{line: 1792, col: 6, offset: 57966},
 				val:        "[\\u0020\\u00A0\\u1680\\u2000-\\u200A\\u202F\\u205F\\u3000]",
 				chars:      []rune{' ', '\u00a0', '\u1680', '\u202f', '\u205f', '\u3000'},
 				ranges:     []rune{'\u2000', '\u200a'},
@@ -13008,9 +13004,9 @@ var g = &grammar{
 		},
 		{
 			name: "SourceCharacter",
-			pos:  position{line: 1794, col: 1, offset: 58023},
+			pos:  position{line: 1794, col: 1, offset: 58019},
 			expr: &anyMatcher{
-				line: 1795, col: 5, offset: 58043,
+				line: 1795, col: 5, offset: 58039,
 			},
 			leader:        false,
 			leftRecursive: false,
@@ -13018,48 +13014,48 @@ var g = &grammar{
 		{
 			name:        "WhiteSpace",
 			displayName: "\"whitespace\"",
-			pos:         position{line: 1797, col: 1, offset: 58046},
+			pos:         position{line: 1797, col: 1, offset: 58042},
 			expr: &choiceExpr{
-				pos: position{line: 1798, col: 5, offset: 58074},
+				pos: position{line: 1798, col: 5, offset: 58070},
 				alternatives: []any{
 					&litMatcher{
-						pos:        position{line: 1798, col: 5, offset: 58074},
+						pos:        position{line: 1798, col: 5, offset: 58070},
 						val:        "\t",
 						ignoreCase: false,
 						want:       "\"\\t\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1799, col: 5, offset: 58083},
+						pos:        position{line: 1799, col: 5, offset: 58079},
 						val:        "\v",
 						ignoreCase: false,
 						want:       "\"\\v\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1800, col: 5, offset: 58092},
+						pos:        position{line: 1800, col: 5, offset: 58088},
 						val:        "\f",
 						ignoreCase: false,
 						want:       "\"\\f\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1801, col: 5, offset: 58101},
+						pos:        position{line: 1801, col: 5, offset: 58097},
 						val:        " ",
 						ignoreCase: false,
 						want:       "\" \"",
 					},
 					&litMatcher{
-						pos:        position{line: 1802, col: 5, offset: 58109},
+						pos:        position{line: 1802, col: 5, offset: 58105},
 						val:        "\u00a0",
 						ignoreCase: false,
 						want:       "\"\\u00a0\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1803, col: 5, offset: 58122},
+						pos:        position{line: 1803, col: 5, offset: 58118},
 						val:        "\ufeff",
 						ignoreCase: false,
 						want:       "\"\\ufeff\"",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1804, col: 5, offset: 58135},
+						pos:  position{line: 1804, col: 5, offset: 58131},
 						name: "Zs",
 					},
 				},
@@ -13069,9 +13065,9 @@ var g = &grammar{
 		},
 		{
 			name: "LineTerminator",
-			pos:  position{line: 1806, col: 1, offset: 58139},
+			pos:  position{line: 1806, col: 1, offset: 58135},
 			expr: &charClassMatcher{
-				pos:        position{line: 1807, col: 5, offset: 58158},
+				pos:        position{line: 1807, col: 5, offset: 58154},
 				val:        "[\\n\\r\\u2028\\u2029]",
 				chars:      []rune{'\n', '\r', '\u2028', '\u2029'},
 				ignoreCase: false,
@@ -13083,9 +13079,9 @@ var g = &grammar{
 		{
 			name:        "Comment",
 			displayName: "\"comment\"",
-			pos:         position{line: 1813, col: 1, offset: 58488},
+			pos:         position{line: 1813, col: 1, offset: 58484},
 			expr: &ruleRefExpr{
-				pos:  position{line: 1816, col: 5, offset: 58559},
+				pos:  position{line: 1816, col: 5, offset: 58555},
 				name: "SingleLineComment",
 			},
 			leader:        false,
@@ -13093,39 +13089,39 @@ var g = &grammar{
 		},
 		{
 			name: "MultiLineComment",
-			pos:  position{line: 1818, col: 1, offset: 58578},
+			pos:  position{line: 1818, col: 1, offset: 58574},
 			expr: &seqExpr{
-				pos: position{line: 1819, col: 5, offset: 58599},
+				pos: position{line: 1819, col: 5, offset: 58595},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 1819, col: 5, offset: 58599},
+						pos:        position{line: 1819, col: 5, offset: 58595},
 						val:        "/*",
 						ignoreCase: false,
 						want:       "\"/*\"",
 					},
 					&zeroOrMoreExpr{
-						pos: position{line: 1819, col: 10, offset: 58604},
+						pos: position{line: 1819, col: 10, offset: 58600},
 						expr: &seqExpr{
-							pos: position{line: 1819, col: 11, offset: 58605},
+							pos: position{line: 1819, col: 11, offset: 58601},
 							exprs: []any{
 								&notExpr{
-									pos: position{line: 1819, col: 11, offset: 58605},
+									pos: position{line: 1819, col: 11, offset: 58601},
 									expr: &litMatcher{
-										pos:        position{line: 1819, col: 12, offset: 58606},
+										pos:        position{line: 1819, col: 12, offset: 58602},
 										val:        "*/",
 										ignoreCase: false,
 										want:       "\"*/\"",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1819, col: 17, offset: 58611},
+									pos:  position{line: 1819, col: 17, offset: 58607},
 									name: "SourceCharacter",
 								},
 							},
 						},
 					},
 					&litMatcher{
-						pos:        position{line: 1819, col: 35, offset: 58629},
+						pos:        position{line: 1819, col: 35, offset: 58625},
 						val:        "*/",
 						ignoreCase: false,
 						want:       "\"*/\"",
@@ -13137,33 +13133,33 @@ var g = &grammar{
 		},
 		{
 			name: "SingleLineComment",
-			pos:  position{line: 1821, col: 1, offset: 58635},
+			pos:  position{line: 1821, col: 1, offset: 58631},
 			expr: &choiceExpr{
-				pos: position{line: 1822, col: 5, offset: 58657},
+				pos: position{line: 1822, col: 5, offset: 58653},
 				alternatives: []any{
 					&seqExpr{
-						pos: position{line: 1822, col: 5, offset: 58657},
+						pos: position{line: 1822, col: 5, offset: 58653},
 						exprs: []any{
 							&litMatcher{
-								pos:        position{line: 1822, col: 5, offset: 58657},
+								pos:        position{line: 1822, col: 5, offset: 58653},
 								val:        "//",
 								ignoreCase: false,
 								want:       "\"//\"",
 							},
 							&zeroOrMoreExpr{
-								pos: position{line: 1822, col: 10, offset: 58662},
+								pos: position{line: 1822, col: 10, offset: 58658},
 								expr: &seqExpr{
-									pos: position{line: 1822, col: 11, offset: 58663},
+									pos: position{line: 1822, col: 11, offset: 58659},
 									exprs: []any{
 										&notExpr{
-											pos: position{line: 1822, col: 11, offset: 58663},
+											pos: position{line: 1822, col: 11, offset: 58659},
 											expr: &ruleRefExpr{
-												pos:  position{line: 1822, col: 12, offset: 58664},
+												pos:  position{line: 1822, col: 12, offset: 58660},
 												name: "LineTerminator",
 											},
 										},
 										&ruleRefExpr{
-											pos:  position{line: 1822, col: 27, offset: 58679},
+											pos:  position{line: 1822, col: 27, offset: 58675},
 											name: "SourceCharacter",
 										},
 									},
@@ -13172,28 +13168,28 @@ var g = &grammar{
 						},
 					},
 					&seqExpr{
-						pos: position{line: 1823, col: 5, offset: 58701},
+						pos: position{line: 1823, col: 5, offset: 58697},
 						exprs: []any{
 							&litMatcher{
-								pos:        position{line: 1823, col: 5, offset: 58701},
+								pos:        position{line: 1823, col: 5, offset: 58697},
 								val:        "--",
 								ignoreCase: false,
 								want:       "\"--\"",
 							},
 							&zeroOrMoreExpr{
-								pos: position{line: 1823, col: 10, offset: 58706},
+								pos: position{line: 1823, col: 10, offset: 58702},
 								expr: &seqExpr{
-									pos: position{line: 1823, col: 11, offset: 58707},
+									pos: position{line: 1823, col: 11, offset: 58703},
 									exprs: []any{
 										&notExpr{
-											pos: position{line: 1823, col: 11, offset: 58707},
+											pos: position{line: 1823, col: 11, offset: 58703},
 											expr: &ruleRefExpr{
-												pos:  position{line: 1823, col: 12, offset: 58708},
+												pos:  position{line: 1823, col: 12, offset: 58704},
 												name: "LineTerminator",
 											},
 										},
 										&ruleRefExpr{
-											pos:  position{line: 1823, col: 27, offset: 58723},
+											pos:  position{line: 1823, col: 27, offset: 58719},
 											name: "SourceCharacter",
 										},
 									},
@@ -13208,19 +13204,19 @@ var g = &grammar{
 		},
 		{
 			name: "EOL",
-			pos:  position{line: 1825, col: 1, offset: 58742},
+			pos:  position{line: 1825, col: 1, offset: 58738},
 			expr: &seqExpr{
-				pos: position{line: 1825, col: 7, offset: 58748},
+				pos: position{line: 1825, col: 7, offset: 58744},
 				exprs: []any{
 					&zeroOrMoreExpr{
-						pos: position{line: 1825, col: 7, offset: 58748},
+						pos: position{line: 1825, col: 7, offset: 58744},
 						expr: &ruleRefExpr{
-							pos:  position{line: 1825, col: 7, offset: 58748},
+							pos:  position{line: 1825, col: 7, offset: 58744},
 							name: "WhiteSpace",
 						},
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1825, col: 19, offset: 58760},
+						pos:  position{line: 1825, col: 19, offset: 58756},
 						name: "LineTerminator",
 					},
 				},
@@ -13230,16 +13226,16 @@ var g = &grammar{
 		},
 		{
 			name: "EOT",
-			pos:  position{line: 1827, col: 1, offset: 58776},
+			pos:  position{line: 1827, col: 1, offset: 58772},
 			expr: &choiceExpr{
-				pos: position{line: 1827, col: 7, offset: 58782},
+				pos: position{line: 1827, col: 7, offset: 58778},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1827, col: 7, offset: 58782},
+						pos:  position{line: 1827, col: 7, offset: 58778},
 						name: "_",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1827, col: 11, offset: 58786},
+						pos:  position{line: 1827, col: 11, offset: 58782},
 						name: "EOF",
 					},
 				},
@@ -13249,11 +13245,11 @@ var g = &grammar{
 		},
 		{
 			name: "EOF",
-			pos:  position{line: 1829, col: 1, offset: 58791},
+			pos:  position{line: 1829, col: 1, offset: 58787},
 			expr: &notExpr{
-				pos: position{line: 1829, col: 7, offset: 58797},
+				pos: position{line: 1829, col: 7, offset: 58793},
 				expr: &anyMatcher{
-					line: 1829, col: 8, offset: 58798,
+					line: 1829, col: 8, offset: 58794,
 				},
 			},
 			leader:        false,
@@ -13261,11 +13257,11 @@ var g = &grammar{
 		},
 		{
 			name: "EOKW",
-			pos:  position{line: 1831, col: 1, offset: 58801},
+			pos:  position{line: 1831, col: 1, offset: 58797},
 			expr: &notExpr{
-				pos: position{line: 1831, col: 8, offset: 58808},
+				pos: position{line: 1831, col: 8, offset: 58804},
 				expr: &ruleRefExpr{
-					pos:  position{line: 1831, col: 9, offset: 58809},
+					pos:  position{line: 1831, col: 9, offset: 58805},
 					name: "KeyWordChars",
 				},
 			},
@@ -13274,15 +13270,15 @@ var g = &grammar{
 		},
 		{
 			name: "SQLPipe",
-			pos:  position{line: 1835, col: 1, offset: 58845},
+			pos:  position{line: 1835, col: 1, offset: 58841},
 			expr: &actionExpr{
-				pos: position{line: 1836, col: 5, offset: 58858},
+				pos: position{line: 1836, col: 5, offset: 58854},
 				run: (*parser).callonSQLPipe1,
 				expr: &labeledExpr{
-					pos:   position{line: 1836, col: 5, offset: 58858},
+					pos:   position{line: 1836, col: 5, offset: 58854},
 					label: "s",
 					expr: &ruleRefExpr{
-						pos:  position{line: 1836, col: 7, offset: 58860},
+						pos:  position{line: 1836, col: 7, offset: 58856},
 						name: "Seq",
 					},
 				},
@@ -13292,27 +13288,27 @@ var g = &grammar{
 		},
 		{
 			name: "SelectOp",
-			pos:  position{line: 1844, col: 1, offset: 59006},
+			pos:  position{line: 1844, col: 1, offset: 59002},
 			expr: &actionExpr{
-				pos: position{line: 1844, col: 12, offset: 59017},
+				pos: position{line: 1844, col: 12, offset: 59013},
 				run: (*parser).callonSelectOp1,
 				expr: &seqExpr{
-					pos: position{line: 1844, col: 12, offset: 59017},
+					pos: position{line: 1844, col: 12, offset: 59013},
 					exprs: []any{
 						&notExpr{
-							pos: position{line: 1844, col: 12, offset: 59017},
+							pos: position{line: 1844, col: 12, offset: 59013},
 							expr: &litMatcher{
-								pos:        position{line: 1844, col: 13, offset: 59018},
+								pos:        position{line: 1844, col: 13, offset: 59014},
 								val:        "(",
 								ignoreCase: false,
 								want:       "\"(\"",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1844, col: 17, offset: 59022},
+							pos:   position{line: 1844, col: 17, offset: 59018},
 							label: "op",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1844, col: 20, offset: 59025},
+								pos:  position{line: 1844, col: 20, offset: 59021},
 								name: "SelectExpr",
 							},
 						},
@@ -13324,65 +13320,65 @@ var g = &grammar{
 		},
 		{
 			name: "SelectExpr",
-			pos:  position{line: 1846, col: 1, offset: 59055},
+			pos:  position{line: 1846, col: 1, offset: 59051},
 			expr: &actionExpr{
-				pos: position{line: 1847, col: 5, offset: 59071},
+				pos: position{line: 1847, col: 5, offset: 59067},
 				run: (*parser).callonSelectExpr1,
 				expr: &seqExpr{
-					pos: position{line: 1847, col: 5, offset: 59071},
+					pos: position{line: 1847, col: 5, offset: 59067},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 1847, col: 5, offset: 59071},
+							pos:   position{line: 1847, col: 5, offset: 59067},
 							label: "with",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1847, col: 10, offset: 59076},
+								pos:  position{line: 1847, col: 10, offset: 59072},
 								name: "OptWithClause",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1848, col: 5, offset: 59094},
+							pos:   position{line: 1848, col: 5, offset: 59090},
 							label: "body",
 							expr: &choiceExpr{
-								pos: position{line: 1849, col: 9, offset: 59109},
+								pos: position{line: 1849, col: 9, offset: 59105},
 								alternatives: []any{
 									&ruleRefExpr{
-										pos:  position{line: 1849, col: 9, offset: 59109},
+										pos:  position{line: 1849, col: 9, offset: 59105},
 										name: "SetOperation",
 									},
 									&ruleRefExpr{
-										pos:  position{line: 1850, col: 9, offset: 59130},
+										pos:  position{line: 1850, col: 9, offset: 59126},
 										name: "Select",
 									},
 									&actionExpr{
-										pos: position{line: 1851, col: 9, offset: 59145},
+										pos: position{line: 1851, col: 9, offset: 59141},
 										run: (*parser).callonSelectExpr9,
 										expr: &seqExpr{
-											pos: position{line: 1851, col: 9, offset: 59145},
+											pos: position{line: 1851, col: 9, offset: 59141},
 											exprs: []any{
 												&litMatcher{
-													pos:        position{line: 1851, col: 9, offset: 59145},
+													pos:        position{line: 1851, col: 9, offset: 59141},
 													val:        "(",
 													ignoreCase: false,
 													want:       "\"(\"",
 												},
 												&ruleRefExpr{
-													pos:  position{line: 1851, col: 13, offset: 59149},
+													pos:  position{line: 1851, col: 13, offset: 59145},
 													name: "__",
 												},
 												&labeledExpr{
-													pos:   position{line: 1851, col: 16, offset: 59152},
+													pos:   position{line: 1851, col: 16, offset: 59148},
 													label: "s",
 													expr: &ruleRefExpr{
-														pos:  position{line: 1851, col: 18, offset: 59154},
+														pos:  position{line: 1851, col: 18, offset: 59150},
 														name: "SQLPipe",
 													},
 												},
 												&ruleRefExpr{
-													pos:  position{line: 1851, col: 26, offset: 59162},
+													pos:  position{line: 1851, col: 26, offset: 59158},
 													name: "__",
 												},
 												&litMatcher{
-													pos:        position{line: 1851, col: 28, offset: 59164},
+													pos:        position{line: 1851, col: 28, offset: 59160},
 													val:        ")",
 													ignoreCase: false,
 													want:       "\")\"",
@@ -13394,18 +13390,18 @@ var g = &grammar{
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1853, col: 5, offset: 59201},
+							pos:   position{line: 1853, col: 5, offset: 59197},
 							label: "orderby",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1853, col: 13, offset: 59209},
+								pos:  position{line: 1853, col: 13, offset: 59205},
 								name: "OptOrderByClause",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1854, col: 5, offset: 59230},
+							pos:   position{line: 1854, col: 5, offset: 59226},
 							label: "limit",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1854, col: 11, offset: 59236},
+								pos:  position{line: 1854, col: 11, offset: 59232},
 								name: "OptLimitClause",
 							},
 						},
@@ -13417,74 +13413,74 @@ var g = &grammar{
 		},
 		{
 			name: "Select",
-			pos:  position{line: 1874, col: 1, offset: 59622},
+			pos:  position{line: 1874, col: 1, offset: 59618},
 			expr: &actionExpr{
-				pos: position{line: 1875, col: 5, offset: 59634},
+				pos: position{line: 1875, col: 5, offset: 59630},
 				run: (*parser).callonSelect1,
 				expr: &seqExpr{
-					pos: position{line: 1875, col: 5, offset: 59634},
+					pos: position{line: 1875, col: 5, offset: 59630},
 					exprs: []any{
 						&ruleRefExpr{
-							pos:  position{line: 1875, col: 5, offset: 59634},
+							pos:  position{line: 1875, col: 5, offset: 59630},
 							name: "SELECT",
 						},
 						&labeledExpr{
-							pos:   position{line: 1876, col: 5, offset: 59646},
+							pos:   position{line: 1876, col: 5, offset: 59642},
 							label: "distinct",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1876, col: 14, offset: 59655},
+								pos:  position{line: 1876, col: 14, offset: 59651},
 								name: "OptDistinct",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1877, col: 5, offset: 59671},
+							pos:   position{line: 1877, col: 5, offset: 59667},
 							label: "value",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1877, col: 11, offset: 59677},
+								pos:  position{line: 1877, col: 11, offset: 59673},
 								name: "OptSelectValue",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1880, col: 5, offset: 59817},
+							pos:  position{line: 1880, col: 5, offset: 59813},
 							name: "_",
 						},
 						&labeledExpr{
-							pos:   position{line: 1880, col: 7, offset: 59819},
+							pos:   position{line: 1880, col: 7, offset: 59815},
 							label: "selection",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1880, col: 17, offset: 59829},
+								pos:  position{line: 1880, col: 17, offset: 59825},
 								name: "Selection",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1881, col: 5, offset: 59843},
+							pos:   position{line: 1881, col: 5, offset: 59839},
 							label: "from",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1881, col: 10, offset: 59848},
+								pos:  position{line: 1881, col: 10, offset: 59844},
 								name: "OptFromClause",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1882, col: 5, offset: 59866},
+							pos:   position{line: 1882, col: 5, offset: 59862},
 							label: "where",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1882, col: 11, offset: 59872},
+								pos:  position{line: 1882, col: 11, offset: 59868},
 								name: "OptWhereClause",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1883, col: 5, offset: 59891},
+							pos:   position{line: 1883, col: 5, offset: 59887},
 							label: "group",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1883, col: 11, offset: 59897},
+								pos:  position{line: 1883, col: 11, offset: 59893},
 								name: "OptGroupClause",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1884, col: 5, offset: 59916},
+							pos:   position{line: 1884, col: 5, offset: 59912},
 							label: "having",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1884, col: 12, offset: 59923},
+								pos:  position{line: 1884, col: 12, offset: 59919},
 								name: "OptHavingClause",
 							},
 						},
@@ -13496,49 +13492,49 @@ var g = &grammar{
 		},
 		{
 			name: "OptDistinct",
-			pos:  position{line: 1910, col: 1, offset: 60529},
+			pos:  position{line: 1910, col: 1, offset: 60525},
 			expr: &choiceExpr{
-				pos: position{line: 1911, col: 5, offset: 60545},
+				pos: position{line: 1911, col: 5, offset: 60541},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1911, col: 5, offset: 60545},
+						pos: position{line: 1911, col: 5, offset: 60541},
 						run: (*parser).callonOptDistinct2,
 						expr: &seqExpr{
-							pos: position{line: 1911, col: 5, offset: 60545},
+							pos: position{line: 1911, col: 5, offset: 60541},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 1911, col: 5, offset: 60545},
+									pos:  position{line: 1911, col: 5, offset: 60541},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1911, col: 7, offset: 60547},
+									pos:  position{line: 1911, col: 7, offset: 60543},
 									name: "ALL",
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1912, col: 5, offset: 60584},
+						pos: position{line: 1912, col: 5, offset: 60580},
 						run: (*parser).callonOptDistinct6,
 						expr: &seqExpr{
-							pos: position{line: 1912, col: 5, offset: 60584},
+							pos: position{line: 1912, col: 5, offset: 60580},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 1912, col: 5, offset: 60584},
+									pos:  position{line: 1912, col: 5, offset: 60580},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1912, col: 7, offset: 60586},
+									pos:  position{line: 1912, col: 7, offset: 60582},
 									name: "DISTINCT",
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1913, col: 5, offset: 60622},
+						pos: position{line: 1913, col: 5, offset: 60618},
 						run: (*parser).callonOptDistinct10,
 						expr: &litMatcher{
-							pos:        position{line: 1913, col: 5, offset: 60622},
+							pos:        position{line: 1913, col: 5, offset: 60618},
 							val:        "",
 							ignoreCase: false,
 							want:       "\"\"",
@@ -13551,57 +13547,57 @@ var g = &grammar{
 		},
 		{
 			name: "OptSelectValue",
-			pos:  position{line: 1915, col: 1, offset: 60661},
+			pos:  position{line: 1915, col: 1, offset: 60657},
 			expr: &choiceExpr{
-				pos: position{line: 1916, col: 5, offset: 60680},
+				pos: position{line: 1916, col: 5, offset: 60676},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1916, col: 5, offset: 60680},
+						pos: position{line: 1916, col: 5, offset: 60676},
 						run: (*parser).callonOptSelectValue2,
 						expr: &seqExpr{
-							pos: position{line: 1916, col: 5, offset: 60680},
+							pos: position{line: 1916, col: 5, offset: 60676},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 1916, col: 5, offset: 60680},
+									pos:  position{line: 1916, col: 5, offset: 60676},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1916, col: 7, offset: 60682},
+									pos:  position{line: 1916, col: 7, offset: 60678},
 									name: "AS",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1916, col: 10, offset: 60685},
+									pos:  position{line: 1916, col: 10, offset: 60681},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1916, col: 12, offset: 60687},
+									pos:  position{line: 1916, col: 12, offset: 60683},
 									name: "VALUE",
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1917, col: 5, offset: 60719},
+						pos: position{line: 1917, col: 5, offset: 60715},
 						run: (*parser).callonOptSelectValue8,
 						expr: &seqExpr{
-							pos: position{line: 1917, col: 5, offset: 60719},
+							pos: position{line: 1917, col: 5, offset: 60715},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 1917, col: 5, offset: 60719},
+									pos:  position{line: 1917, col: 5, offset: 60715},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1917, col: 7, offset: 60721},
+									pos:  position{line: 1917, col: 7, offset: 60717},
 									name: "VALUE",
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1918, col: 5, offset: 60792},
+						pos: position{line: 1918, col: 5, offset: 60788},
 						run: (*parser).callonOptSelectValue12,
 						expr: &litMatcher{
-							pos:        position{line: 1918, col: 5, offset: 60792},
+							pos:        position{line: 1918, col: 5, offset: 60788},
 							val:        "",
 							ignoreCase: false,
 							want:       "\"\"",
@@ -13614,19 +13610,19 @@ var g = &grammar{
 		},
 		{
 			name: "OptWithClause",
-			pos:  position{line: 1920, col: 1, offset: 60835},
+			pos:  position{line: 1920, col: 1, offset: 60831},
 			expr: &choiceExpr{
-				pos: position{line: 1921, col: 5, offset: 60854},
+				pos: position{line: 1921, col: 5, offset: 60850},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1921, col: 5, offset: 60854},
+						pos:  position{line: 1921, col: 5, offset: 60850},
 						name: "WithClause",
 					},
 					&actionExpr{
-						pos: position{line: 1922, col: 5, offset: 60870},
+						pos: position{line: 1922, col: 5, offset: 60866},
 						run: (*parser).callonOptWithClause3,
 						expr: &litMatcher{
-							pos:        position{line: 1922, col: 5, offset: 60870},
+							pos:        position{line: 1922, col: 5, offset: 60866},
 							val:        "",
 							ignoreCase: false,
 							want:       "\"\"",
@@ -13639,38 +13635,38 @@ var g = &grammar{
 		},
 		{
 			name: "WithClause",
-			pos:  position{line: 1924, col: 1, offset: 60903},
+			pos:  position{line: 1924, col: 1, offset: 60899},
 			expr: &actionExpr{
-				pos: position{line: 1925, col: 5, offset: 60919},
+				pos: position{line: 1925, col: 5, offset: 60915},
 				run: (*parser).callonWithClause1,
 				expr: &seqExpr{
-					pos: position{line: 1925, col: 5, offset: 60919},
+					pos: position{line: 1925, col: 5, offset: 60915},
 					exprs: []any{
 						&ruleRefExpr{
-							pos:  position{line: 1925, col: 5, offset: 60919},
+							pos:  position{line: 1925, col: 5, offset: 60915},
 							name: "_",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1925, col: 7, offset: 60921},
+							pos:  position{line: 1925, col: 7, offset: 60917},
 							name: "WITH",
 						},
 						&labeledExpr{
-							pos:   position{line: 1925, col: 12, offset: 60926},
+							pos:   position{line: 1925, col: 12, offset: 60922},
 							label: "r",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1925, col: 14, offset: 60928},
+								pos:  position{line: 1925, col: 14, offset: 60924},
 								name: "OptRecursive",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1925, col: 27, offset: 60941},
+							pos:  position{line: 1925, col: 27, offset: 60937},
 							name: "_",
 						},
 						&labeledExpr{
-							pos:   position{line: 1925, col: 29, offset: 60943},
+							pos:   position{line: 1925, col: 29, offset: 60939},
 							label: "ctes",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1925, col: 34, offset: 60948},
+								pos:  position{line: 1925, col: 34, offset: 60944},
 								name: "CteList",
 							},
 						},
@@ -13682,32 +13678,32 @@ var g = &grammar{
 		},
 		{
 			name: "OptRecursive",
-			pos:  position{line: 1934, col: 1, offset: 61133},
+			pos:  position{line: 1934, col: 1, offset: 61129},
 			expr: &choiceExpr{
-				pos: position{line: 1935, col: 5, offset: 61151},
+				pos: position{line: 1935, col: 5, offset: 61147},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1935, col: 5, offset: 61151},
+						pos: position{line: 1935, col: 5, offset: 61147},
 						run: (*parser).callonOptRecursive2,
 						expr: &seqExpr{
-							pos: position{line: 1935, col: 5, offset: 61151},
+							pos: position{line: 1935, col: 5, offset: 61147},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 1935, col: 5, offset: 61151},
+									pos:  position{line: 1935, col: 5, offset: 61147},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1935, col: 7, offset: 61153},
+									pos:  position{line: 1935, col: 7, offset: 61149},
 									name: "RECURSIVE",
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1936, col: 5, offset: 61189},
+						pos: position{line: 1936, col: 5, offset: 61185},
 						run: (*parser).callonOptRecursive6,
 						expr: &litMatcher{
-							pos:        position{line: 1936, col: 5, offset: 61189},
+							pos:        position{line: 1936, col: 5, offset: 61185},
 							val:        "",
 							ignoreCase: false,
 							want:       "\"\"",
@@ -13720,51 +13716,51 @@ var g = &grammar{
 		},
 		{
 			name: "CteList",
-			pos:  position{line: 1938, col: 1, offset: 61228},
+			pos:  position{line: 1938, col: 1, offset: 61224},
 			expr: &actionExpr{
-				pos: position{line: 1938, col: 11, offset: 61238},
+				pos: position{line: 1938, col: 11, offset: 61234},
 				run: (*parser).callonCteList1,
 				expr: &seqExpr{
-					pos: position{line: 1938, col: 11, offset: 61238},
+					pos: position{line: 1938, col: 11, offset: 61234},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 1938, col: 11, offset: 61238},
+							pos:   position{line: 1938, col: 11, offset: 61234},
 							label: "first",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1938, col: 17, offset: 61244},
+								pos:  position{line: 1938, col: 17, offset: 61240},
 								name: "Cte",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1938, col: 21, offset: 61248},
+							pos:   position{line: 1938, col: 21, offset: 61244},
 							label: "rest",
 							expr: &zeroOrMoreExpr{
-								pos: position{line: 1938, col: 26, offset: 61253},
+								pos: position{line: 1938, col: 26, offset: 61249},
 								expr: &actionExpr{
-									pos: position{line: 1938, col: 28, offset: 61255},
+									pos: position{line: 1938, col: 28, offset: 61251},
 									run: (*parser).callonCteList7,
 									expr: &seqExpr{
-										pos: position{line: 1938, col: 28, offset: 61255},
+										pos: position{line: 1938, col: 28, offset: 61251},
 										exprs: []any{
 											&ruleRefExpr{
-												pos:  position{line: 1938, col: 28, offset: 61255},
+												pos:  position{line: 1938, col: 28, offset: 61251},
 												name: "__",
 											},
 											&litMatcher{
-												pos:        position{line: 1938, col: 31, offset: 61258},
+												pos:        position{line: 1938, col: 31, offset: 61254},
 												val:        ",",
 												ignoreCase: false,
 												want:       "\",\"",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1938, col: 35, offset: 61262},
+												pos:  position{line: 1938, col: 35, offset: 61258},
 												name: "__",
 											},
 											&labeledExpr{
-												pos:   position{line: 1938, col: 38, offset: 61265},
+												pos:   position{line: 1938, col: 38, offset: 61261},
 												label: "cte",
 												expr: &ruleRefExpr{
-													pos:  position{line: 1938, col: 42, offset: 61269},
+													pos:  position{line: 1938, col: 42, offset: 61265},
 													name: "Cte",
 												},
 											},
@@ -13781,65 +13777,65 @@ var g = &grammar{
 		},
 		{
 			name: "Cte",
-			pos:  position{line: 1942, col: 1, offset: 61338},
+			pos:  position{line: 1942, col: 1, offset: 61334},
 			expr: &actionExpr{
-				pos: position{line: 1943, col: 5, offset: 61346},
+				pos: position{line: 1943, col: 5, offset: 61342},
 				run: (*parser).callonCte1,
 				expr: &seqExpr{
-					pos: position{line: 1943, col: 5, offset: 61346},
+					pos: position{line: 1943, col: 5, offset: 61342},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 1943, col: 5, offset: 61346},
+							pos:   position{line: 1943, col: 5, offset: 61342},
 							label: "name",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1943, col: 10, offset: 61351},
+								pos:  position{line: 1943, col: 10, offset: 61347},
 								name: "AliasName",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1943, col: 20, offset: 61361},
+							pos:  position{line: 1943, col: 20, offset: 61357},
 							name: "_",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1943, col: 22, offset: 61363},
+							pos:  position{line: 1943, col: 22, offset: 61359},
 							name: "AS",
 						},
 						&labeledExpr{
-							pos:   position{line: 1943, col: 25, offset: 61366},
+							pos:   position{line: 1943, col: 25, offset: 61362},
 							label: "m",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1943, col: 27, offset: 61368},
+								pos:  position{line: 1943, col: 27, offset: 61364},
 								name: "OptMaterialized",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1943, col: 43, offset: 61384},
+							pos:  position{line: 1943, col: 43, offset: 61380},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1943, col: 46, offset: 61387},
+							pos:        position{line: 1943, col: 46, offset: 61383},
 							val:        "(",
 							ignoreCase: false,
 							want:       "\"(\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1943, col: 50, offset: 61391},
+							pos:  position{line: 1943, col: 50, offset: 61387},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1943, col: 53, offset: 61394},
+							pos:   position{line: 1943, col: 53, offset: 61390},
 							label: "s",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1943, col: 55, offset: 61396},
+								pos:  position{line: 1943, col: 55, offset: 61392},
 								name: "SQLPipe",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1943, col: 63, offset: 61404},
+							pos:  position{line: 1943, col: 63, offset: 61400},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1943, col: 66, offset: 61407},
+							pos:        position{line: 1943, col: 66, offset: 61403},
 							val:        ")",
 							ignoreCase: false,
 							want:       "\")\"",
@@ -13852,9 +13848,9 @@ var g = &grammar{
 		},
 		{
 			name: "AliasName",
-			pos:  position{line: 1952, col: 1, offset: 61582},
+			pos:  position{line: 1952, col: 1, offset: 61578},
 			expr: &ruleRefExpr{
-				pos:  position{line: 1952, col: 13, offset: 61594},
+				pos:  position{line: 1952, col: 13, offset: 61590},
 				name: "Identifier",
 			},
 			leader:        false,
@@ -13862,65 +13858,65 @@ var g = &grammar{
 		},
 		{
 			name: "OptMaterialized",
-			pos:  position{line: 1954, col: 1, offset: 61606},
+			pos:  position{line: 1954, col: 1, offset: 61602},
 			expr: &choiceExpr{
-				pos: position{line: 1955, col: 5, offset: 61627},
+				pos: position{line: 1955, col: 5, offset: 61623},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1955, col: 5, offset: 61627},
+						pos: position{line: 1955, col: 5, offset: 61623},
 						run: (*parser).callonOptMaterialized2,
 						expr: &seqExpr{
-							pos: position{line: 1955, col: 5, offset: 61627},
+							pos: position{line: 1955, col: 5, offset: 61623},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 1955, col: 5, offset: 61627},
+									pos:  position{line: 1955, col: 5, offset: 61623},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1955, col: 7, offset: 61629},
+									pos:  position{line: 1955, col: 7, offset: 61625},
 									name: "MATERIALIZED",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1955, col: 20, offset: 61642},
+									pos:  position{line: 1955, col: 20, offset: 61638},
 									name: "_",
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1956, col: 5, offset: 61681},
+						pos: position{line: 1956, col: 5, offset: 61677},
 						run: (*parser).callonOptMaterialized7,
 						expr: &seqExpr{
-							pos: position{line: 1956, col: 5, offset: 61681},
+							pos: position{line: 1956, col: 5, offset: 61677},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 1956, col: 5, offset: 61681},
+									pos:  position{line: 1956, col: 5, offset: 61677},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1956, col: 7, offset: 61683},
+									pos:  position{line: 1956, col: 7, offset: 61679},
 									name: "NOT",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1956, col: 11, offset: 61687},
+									pos:  position{line: 1956, col: 11, offset: 61683},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1956, col: 13, offset: 61689},
+									pos:  position{line: 1956, col: 13, offset: 61685},
 									name: "MATERIALIZED",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1956, col: 26, offset: 61702},
+									pos:  position{line: 1956, col: 26, offset: 61698},
 									name: "_",
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1957, col: 5, offset: 61733},
+						pos: position{line: 1957, col: 5, offset: 61729},
 						run: (*parser).callonOptMaterialized14,
 						expr: &litMatcher{
-							pos:        position{line: 1957, col: 5, offset: 61733},
+							pos:        position{line: 1957, col: 5, offset: 61729},
 							val:        "",
 							ignoreCase: false,
 							want:       "\"\"",
@@ -13933,25 +13929,25 @@ var g = &grammar{
 		},
 		{
 			name: "OptAllClause",
-			pos:  position{line: 1959, col: 1, offset: 61788},
+			pos:  position{line: 1959, col: 1, offset: 61784},
 			expr: &choiceExpr{
-				pos: position{line: 1960, col: 5, offset: 61805},
+				pos: position{line: 1960, col: 5, offset: 61801},
 				alternatives: []any{
 					&seqExpr{
-						pos: position{line: 1960, col: 5, offset: 61805},
+						pos: position{line: 1960, col: 5, offset: 61801},
 						exprs: []any{
 							&ruleRefExpr{
-								pos:  position{line: 1960, col: 5, offset: 61805},
+								pos:  position{line: 1960, col: 5, offset: 61801},
 								name: "_",
 							},
 							&ruleRefExpr{
-								pos:  position{line: 1960, col: 7, offset: 61807},
+								pos:  position{line: 1960, col: 7, offset: 61803},
 								name: "ALL",
 							},
 						},
 					},
 					&litMatcher{
-						pos:        position{line: 1961, col: 5, offset: 61816},
+						pos:        position{line: 1961, col: 5, offset: 61812},
 						val:        "",
 						ignoreCase: false,
 						want:       "\"\"",
@@ -13963,25 +13959,25 @@ var g = &grammar{
 		},
 		{
 			name: "OptFromClause",
-			pos:  position{line: 1963, col: 1, offset: 61820},
+			pos:  position{line: 1963, col: 1, offset: 61816},
 			expr: &choiceExpr{
-				pos: position{line: 1964, col: 5, offset: 61838},
+				pos: position{line: 1964, col: 5, offset: 61834},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1964, col: 5, offset: 61838},
+						pos: position{line: 1964, col: 5, offset: 61834},
 						run: (*parser).callonOptFromClause2,
 						expr: &seqExpr{
-							pos: position{line: 1964, col: 5, offset: 61838},
+							pos: position{line: 1964, col: 5, offset: 61834},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 1964, col: 5, offset: 61838},
+									pos:  position{line: 1964, col: 5, offset: 61834},
 									name: "_",
 								},
 								&labeledExpr{
-									pos:   position{line: 1964, col: 7, offset: 61840},
+									pos:   position{line: 1964, col: 7, offset: 61836},
 									label: "from",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1964, col: 12, offset: 61845},
+										pos:  position{line: 1964, col: 12, offset: 61841},
 										name: "FromOp",
 									},
 								},
@@ -13989,10 +13985,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1967, col: 5, offset: 61887},
+						pos: position{line: 1967, col: 5, offset: 61883},
 						run: (*parser).callonOptFromClause7,
 						expr: &litMatcher{
-							pos:        position{line: 1967, col: 5, offset: 61887},
+							pos:        position{line: 1967, col: 5, offset: 61883},
 							val:        "",
 							ignoreCase: false,
 							want:       "\"\"",
@@ -14005,27 +14001,27 @@ var g = &grammar{
 		},
 		{
 			name: "OptWhereClause",
-			pos:  position{line: 1969, col: 1, offset: 61928},
+			pos:  position{line: 1969, col: 1, offset: 61924},
 			expr: &choiceExpr{
-				pos: position{line: 1970, col: 5, offset: 61947},
+				pos: position{line: 1970, col: 5, offset: 61943},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1970, col: 5, offset: 61947},
+						pos: position{line: 1970, col: 5, offset: 61943},
 						run: (*parser).callonOptWhereClause2,
 						expr: &labeledExpr{
-							pos:   position{line: 1970, col: 5, offset: 61947},
+							pos:   position{line: 1970, col: 5, offset: 61943},
 							label: "where",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1970, col: 11, offset: 61953},
+								pos:  position{line: 1970, col: 11, offset: 61949},
 								name: "WhereClause",
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1971, col: 5, offset: 61995},
+						pos: position{line: 1971, col: 5, offset: 61991},
 						run: (*parser).callonOptWhereClause5,
 						expr: &litMatcher{
-							pos:        position{line: 1971, col: 5, offset: 61995},
+							pos:        position{line: 1971, col: 5, offset: 61991},
 							val:        "",
 							ignoreCase: false,
 							want:       "\"\"",
@@ -14038,25 +14034,25 @@ var g = &grammar{
 		},
 		{
 			name: "OptGroupClause",
-			pos:  position{line: 1973, col: 1, offset: 62040},
+			pos:  position{line: 1973, col: 1, offset: 62036},
 			expr: &choiceExpr{
-				pos: position{line: 1974, col: 5, offset: 62059},
+				pos: position{line: 1974, col: 5, offset: 62055},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1974, col: 5, offset: 62059},
+						pos: position{line: 1974, col: 5, offset: 62055},
 						run: (*parser).callonOptGroupClause2,
 						expr: &seqExpr{
-							pos: position{line: 1974, col: 5, offset: 62059},
+							pos: position{line: 1974, col: 5, offset: 62055},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 1974, col: 5, offset: 62059},
+									pos:  position{line: 1974, col: 5, offset: 62055},
 									name: "_",
 								},
 								&labeledExpr{
-									pos:   position{line: 1974, col: 7, offset: 62061},
+									pos:   position{line: 1974, col: 7, offset: 62057},
 									label: "group",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1974, col: 13, offset: 62067},
+										pos:  position{line: 1974, col: 13, offset: 62063},
 										name: "GroupClause",
 									},
 								},
@@ -14064,10 +14060,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1975, col: 5, offset: 62105},
+						pos: position{line: 1975, col: 5, offset: 62101},
 						run: (*parser).callonOptGroupClause7,
 						expr: &litMatcher{
-							pos:        position{line: 1975, col: 5, offset: 62105},
+							pos:        position{line: 1975, col: 5, offset: 62101},
 							val:        "",
 							ignoreCase: false,
 							want:       "\"\"",
@@ -14080,34 +14076,34 @@ var g = &grammar{
 		},
 		{
 			name: "GroupClause",
-			pos:  position{line: 1977, col: 1, offset: 62146},
+			pos:  position{line: 1977, col: 1, offset: 62142},
 			expr: &actionExpr{
-				pos: position{line: 1978, col: 5, offset: 62162},
+				pos: position{line: 1978, col: 5, offset: 62158},
 				run: (*parser).callonGroupClause1,
 				expr: &seqExpr{
-					pos: position{line: 1978, col: 5, offset: 62162},
+					pos: position{line: 1978, col: 5, offset: 62158},
 					exprs: []any{
 						&ruleRefExpr{
-							pos:  position{line: 1978, col: 5, offset: 62162},
+							pos:  position{line: 1978, col: 5, offset: 62158},
 							name: "GROUP",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1978, col: 11, offset: 62168},
+							pos:  position{line: 1978, col: 11, offset: 62164},
 							name: "_",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1978, col: 13, offset: 62170},
+							pos:  position{line: 1978, col: 13, offset: 62166},
 							name: "BY",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1978, col: 16, offset: 62173},
+							pos:  position{line: 1978, col: 16, offset: 62169},
 							name: "_",
 						},
 						&labeledExpr{
-							pos:   position{line: 1978, col: 18, offset: 62175},
+							pos:   position{line: 1978, col: 18, offset: 62171},
 							label: "list",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1978, col: 23, offset: 62180},
+								pos:  position{line: 1978, col: 23, offset: 62176},
 								name: "GroupByList",
 							},
 						},
@@ -14119,51 +14115,51 @@ var g = &grammar{
 		},
 		{
 			name: "GroupByList",
-			pos:  position{line: 1980, col: 1, offset: 62214},
+			pos:  position{line: 1980, col: 1, offset: 62210},
 			expr: &actionExpr{
-				pos: position{line: 1981, col: 5, offset: 62231},
+				pos: position{line: 1981, col: 5, offset: 62227},
 				run: (*parser).callonGroupByList1,
 				expr: &seqExpr{
-					pos: position{line: 1981, col: 5, offset: 62231},
+					pos: position{line: 1981, col: 5, offset: 62227},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 1981, col: 5, offset: 62231},
+							pos:   position{line: 1981, col: 5, offset: 62227},
 							label: "first",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1981, col: 11, offset: 62237},
+								pos:  position{line: 1981, col: 11, offset: 62233},
 								name: "GroupByItem",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1981, col: 23, offset: 62249},
+							pos:   position{line: 1981, col: 23, offset: 62245},
 							label: "rest",
 							expr: &zeroOrMoreExpr{
-								pos: position{line: 1981, col: 28, offset: 62254},
+								pos: position{line: 1981, col: 28, offset: 62250},
 								expr: &actionExpr{
-									pos: position{line: 1981, col: 30, offset: 62256},
+									pos: position{line: 1981, col: 30, offset: 62252},
 									run: (*parser).callonGroupByList7,
 									expr: &seqExpr{
-										pos: position{line: 1981, col: 30, offset: 62256},
+										pos: position{line: 1981, col: 30, offset: 62252},
 										exprs: []any{
 											&ruleRefExpr{
-												pos:  position{line: 1981, col: 30, offset: 62256},
+												pos:  position{line: 1981, col: 30, offset: 62252},
 												name: "__",
 											},
 											&litMatcher{
-												pos:        position{line: 1981, col: 33, offset: 62259},
+												pos:        position{line: 1981, col: 33, offset: 62255},
 												val:        ",",
 												ignoreCase: false,
 												want:       "\",\"",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1981, col: 37, offset: 62263},
+												pos:  position{line: 1981, col: 37, offset: 62259},
 												name: "__",
 											},
 											&labeledExpr{
-												pos:   position{line: 1981, col: 40, offset: 62266},
+												pos:   position{line: 1981, col: 40, offset: 62262},
 												label: "g",
 												expr: &ruleRefExpr{
-													pos:  position{line: 1981, col: 42, offset: 62268},
+													pos:  position{line: 1981, col: 42, offset: 62264},
 													name: "GroupByItem",
 												},
 											},
@@ -14180,9 +14176,9 @@ var g = &grammar{
 		},
 		{
 			name: "GroupByItem",
-			pos:  position{line: 1985, col: 1, offset: 62349},
+			pos:  position{line: 1985, col: 1, offset: 62345},
 			expr: &ruleRefExpr{
-				pos:  position{line: 1985, col: 15, offset: 62363},
+				pos:  position{line: 1985, col: 15, offset: 62359},
 				name: "Expr",
 			},
 			leader:        false,
@@ -14190,25 +14186,25 @@ var g = &grammar{
 		},
 		{
 			name: "OptHavingClause",
-			pos:  position{line: 1987, col: 1, offset: 62369},
+			pos:  position{line: 1987, col: 1, offset: 62365},
 			expr: &choiceExpr{
-				pos: position{line: 1988, col: 5, offset: 62389},
+				pos: position{line: 1988, col: 5, offset: 62385},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1988, col: 5, offset: 62389},
+						pos: position{line: 1988, col: 5, offset: 62385},
 						run: (*parser).callonOptHavingClause2,
 						expr: &seqExpr{
-							pos: position{line: 1988, col: 5, offset: 62389},
+							pos: position{line: 1988, col: 5, offset: 62385},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 1988, col: 5, offset: 62389},
+									pos:  position{line: 1988, col: 5, offset: 62385},
 									name: "_",
 								},
 								&labeledExpr{
-									pos:   position{line: 1988, col: 7, offset: 62391},
+									pos:   position{line: 1988, col: 7, offset: 62387},
 									label: "h",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1988, col: 9, offset: 62393},
+										pos:  position{line: 1988, col: 9, offset: 62389},
 										name: "HavingClause",
 									},
 								},
@@ -14216,10 +14212,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1989, col: 5, offset: 62428},
+						pos: position{line: 1989, col: 5, offset: 62424},
 						run: (*parser).callonOptHavingClause7,
 						expr: &litMatcher{
-							pos:        position{line: 1989, col: 5, offset: 62428},
+							pos:        position{line: 1989, col: 5, offset: 62424},
 							val:        "",
 							ignoreCase: false,
 							want:       "\"\"",
@@ -14232,26 +14228,26 @@ var g = &grammar{
 		},
 		{
 			name: "HavingClause",
-			pos:  position{line: 1991, col: 1, offset: 62452},
+			pos:  position{line: 1991, col: 1, offset: 62448},
 			expr: &actionExpr{
-				pos: position{line: 1992, col: 5, offset: 62469},
+				pos: position{line: 1992, col: 5, offset: 62465},
 				run: (*parser).callonHavingClause1,
 				expr: &seqExpr{
-					pos: position{line: 1992, col: 5, offset: 62469},
+					pos: position{line: 1992, col: 5, offset: 62465},
 					exprs: []any{
 						&ruleRefExpr{
-							pos:  position{line: 1992, col: 5, offset: 62469},
+							pos:  position{line: 1992, col: 5, offset: 62465},
 							name: "HAVING",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1992, col: 12, offset: 62476},
+							pos:  position{line: 1992, col: 12, offset: 62472},
 							name: "_",
 						},
 						&labeledExpr{
-							pos:   position{line: 1992, col: 14, offset: 62478},
+							pos:   position{line: 1992, col: 14, offset: 62474},
 							label: "e",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1992, col: 16, offset: 62480},
+								pos:  position{line: 1992, col: 16, offset: 62476},
 								name: "Expr",
 							},
 						},
@@ -14263,49 +14259,49 @@ var g = &grammar{
 		},
 		{
 			name: "JoinOperation",
-			pos:  position{line: 1994, col: 1, offset: 62504},
+			pos:  position{line: 1994, col: 1, offset: 62500},
 			expr: &choiceExpr{
-				pos: position{line: 1995, col: 5, offset: 62522},
+				pos: position{line: 1995, col: 5, offset: 62518},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1995, col: 5, offset: 62522},
+						pos:  position{line: 1995, col: 5, offset: 62518},
 						name: "CrossJoin",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1996, col: 5, offset: 62536},
+						pos:  position{line: 1996, col: 5, offset: 62532},
 						name: "ConditionJoin",
 					},
 				},
 			},
-			leader:        false,
+			leader:        true,
 			leftRecursive: true,
 		},
 		{
 			name: "CrossJoin",
-			pos:  position{line: 1998, col: 1, offset: 62551},
+			pos:  position{line: 1998, col: 1, offset: 62547},
 			expr: &actionExpr{
-				pos: position{line: 1999, col: 5, offset: 62565},
+				pos: position{line: 1999, col: 5, offset: 62561},
 				run: (*parser).callonCrossJoin1,
 				expr: &seqExpr{
-					pos: position{line: 1999, col: 5, offset: 62565},
+					pos: position{line: 1999, col: 5, offset: 62561},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 1999, col: 5, offset: 62565},
+							pos:   position{line: 1999, col: 5, offset: 62561},
 							label: "left",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1999, col: 10, offset: 62570},
+								pos:  position{line: 1999, col: 10, offset: 62566},
 								name: "FromElem",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1999, col: 19, offset: 62579},
+							pos:  position{line: 1999, col: 19, offset: 62575},
 							name: "CrossJoinOp",
 						},
 						&labeledExpr{
-							pos:   position{line: 1999, col: 31, offset: 62591},
+							pos:   position{line: 1999, col: 31, offset: 62587},
 							label: "right",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1999, col: 37, offset: 62597},
+								pos:  position{line: 1999, col: 37, offset: 62593},
 								name: "FromElem",
 							},
 						},
@@ -14317,50 +14313,50 @@ var g = &grammar{
 		},
 		{
 			name: "CrossJoinOp",
-			pos:  position{line: 2008, col: 1, offset: 62799},
+			pos:  position{line: 2008, col: 1, offset: 62795},
 			expr: &choiceExpr{
-				pos: position{line: 2009, col: 5, offset: 62816},
+				pos: position{line: 2009, col: 5, offset: 62812},
 				alternatives: []any{
 					&seqExpr{
-						pos: position{line: 2009, col: 5, offset: 62816},
+						pos: position{line: 2009, col: 5, offset: 62812},
 						exprs: []any{
 							&ruleRefExpr{
-								pos:  position{line: 2009, col: 5, offset: 62816},
+								pos:  position{line: 2009, col: 5, offset: 62812},
 								name: "__",
 							},
 							&litMatcher{
-								pos:        position{line: 2009, col: 8, offset: 62819},
+								pos:        position{line: 2009, col: 8, offset: 62815},
 								val:        ",",
 								ignoreCase: false,
 								want:       "\",\"",
 							},
 							&ruleRefExpr{
-								pos:  position{line: 2009, col: 12, offset: 62823},
+								pos:  position{line: 2009, col: 12, offset: 62819},
 								name: "__",
 							},
 						},
 					},
 					&seqExpr{
-						pos: position{line: 2010, col: 5, offset: 62831},
+						pos: position{line: 2010, col: 5, offset: 62827},
 						exprs: []any{
 							&ruleRefExpr{
-								pos:  position{line: 2010, col: 5, offset: 62831},
+								pos:  position{line: 2010, col: 5, offset: 62827},
 								name: "_",
 							},
 							&ruleRefExpr{
-								pos:  position{line: 2010, col: 7, offset: 62833},
+								pos:  position{line: 2010, col: 7, offset: 62829},
 								name: "CROSS",
 							},
 							&ruleRefExpr{
-								pos:  position{line: 2010, col: 13, offset: 62839},
+								pos:  position{line: 2010, col: 13, offset: 62835},
 								name: "_",
 							},
 							&ruleRefExpr{
-								pos:  position{line: 2010, col: 15, offset: 62841},
+								pos:  position{line: 2010, col: 15, offset: 62837},
 								name: "JOIN",
 							},
 							&ruleRefExpr{
-								pos:  position{line: 2010, col: 20, offset: 62846},
+								pos:  position{line: 2010, col: 20, offset: 62842},
 								name: "_",
 							},
 						},
@@ -14372,46 +14368,46 @@ var g = &grammar{
 		},
 		{
 			name: "ConditionJoin",
-			pos:  position{line: 2012, col: 1, offset: 62850},
+			pos:  position{line: 2012, col: 1, offset: 62846},
 			expr: &actionExpr{
-				pos: position{line: 2013, col: 5, offset: 62868},
+				pos: position{line: 2013, col: 5, offset: 62864},
 				run: (*parser).callonConditionJoin1,
 				expr: &seqExpr{
-					pos: position{line: 2013, col: 5, offset: 62868},
+					pos: position{line: 2013, col: 5, offset: 62864},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 2013, col: 5, offset: 62868},
+							pos:   position{line: 2013, col: 5, offset: 62864},
 							label: "left",
 							expr: &ruleRefExpr{
-								pos:  position{line: 2013, col: 10, offset: 62873},
+								pos:  position{line: 2013, col: 10, offset: 62869},
 								name: "FromElem",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 2013, col: 19, offset: 62882},
+							pos:   position{line: 2013, col: 19, offset: 62878},
 							label: "style",
 							expr: &ruleRefExpr{
-								pos:  position{line: 2013, col: 25, offset: 62888},
+								pos:  position{line: 2013, col: 25, offset: 62884},
 								name: "SQLJoinStyle",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 2013, col: 38, offset: 62901},
+							pos:  position{line: 2013, col: 38, offset: 62897},
 							name: "_",
 						},
 						&labeledExpr{
-							pos:   position{line: 2013, col: 40, offset: 62903},
+							pos:   position{line: 2013, col: 40, offset: 62899},
 							label: "right",
 							expr: &ruleRefExpr{
-								pos:  position{line: 2013, col: 46, offset: 62909},
+								pos:  position{line: 2013, col: 46, offset: 62905},
 								name: "FromElem",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 2013, col: 55, offset: 62918},
+							pos:   position{line: 2013, col: 55, offset: 62914},
 							label: "e",
 							expr: &ruleRefExpr{
-								pos:  position{line: 2013, col: 57, offset: 62920},
+								pos:  position{line: 2013, col: 57, offset: 62916},
 								name: "JoinExpr",
 							},
 						},
@@ -14423,161 +14419,161 @@ var g = &grammar{
 		},
 		{
 			name: "SQLJoinStyle",
-			pos:  position{line: 2024, col: 1, offset: 63189},
+			pos:  position{line: 2024, col: 1, offset: 63185},
 			expr: &choiceExpr{
-				pos: position{line: 2025, col: 5, offset: 63207},
+				pos: position{line: 2025, col: 5, offset: 63203},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 2025, col: 5, offset: 63207},
+						pos: position{line: 2025, col: 5, offset: 63203},
 						run: (*parser).callonSQLJoinStyle2,
 						expr: &seqExpr{
-							pos: position{line: 2025, col: 5, offset: 63207},
+							pos: position{line: 2025, col: 5, offset: 63203},
 							exprs: []any{
 								&zeroOrOneExpr{
-									pos: position{line: 2025, col: 5, offset: 63207},
+									pos: position{line: 2025, col: 5, offset: 63203},
 									expr: &seqExpr{
-										pos: position{line: 2025, col: 6, offset: 63208},
+										pos: position{line: 2025, col: 6, offset: 63204},
 										exprs: []any{
 											&ruleRefExpr{
-												pos:  position{line: 2025, col: 6, offset: 63208},
+												pos:  position{line: 2025, col: 6, offset: 63204},
 												name: "_",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 2025, col: 8, offset: 63210},
+												pos:  position{line: 2025, col: 8, offset: 63206},
 												name: "INNER",
 											},
 										},
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2025, col: 16, offset: 63218},
+									pos:  position{line: 2025, col: 16, offset: 63214},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2025, col: 18, offset: 63220},
+									pos:  position{line: 2025, col: 18, offset: 63216},
 									name: "JOIN",
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 2026, col: 5, offset: 63265},
+						pos: position{line: 2026, col: 5, offset: 63261},
 						run: (*parser).callonSQLJoinStyle10,
 						expr: &seqExpr{
-							pos: position{line: 2026, col: 5, offset: 63265},
+							pos: position{line: 2026, col: 5, offset: 63261},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 2026, col: 5, offset: 63265},
+									pos:  position{line: 2026, col: 5, offset: 63261},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2026, col: 7, offset: 63267},
+									pos:  position{line: 2026, col: 7, offset: 63263},
 									name: "FULL",
 								},
 								&zeroOrOneExpr{
-									pos: position{line: 2026, col: 12, offset: 63272},
+									pos: position{line: 2026, col: 12, offset: 63268},
 									expr: &seqExpr{
-										pos: position{line: 2026, col: 13, offset: 63273},
+										pos: position{line: 2026, col: 13, offset: 63269},
 										exprs: []any{
 											&ruleRefExpr{
-												pos:  position{line: 2026, col: 13, offset: 63273},
+												pos:  position{line: 2026, col: 13, offset: 63269},
 												name: "_",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 2026, col: 15, offset: 63275},
+												pos:  position{line: 2026, col: 15, offset: 63271},
 												name: "OUTER",
 											},
 										},
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2026, col: 23, offset: 63283},
+									pos:  position{line: 2026, col: 23, offset: 63279},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2026, col: 25, offset: 63285},
+									pos:  position{line: 2026, col: 25, offset: 63281},
 									name: "JOIN",
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 2027, col: 5, offset: 63319},
+						pos: position{line: 2027, col: 5, offset: 63315},
 						run: (*parser).callonSQLJoinStyle20,
 						expr: &seqExpr{
-							pos: position{line: 2027, col: 5, offset: 63319},
+							pos: position{line: 2027, col: 5, offset: 63315},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 2027, col: 5, offset: 63319},
+									pos:  position{line: 2027, col: 5, offset: 63315},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2027, col: 7, offset: 63321},
+									pos:  position{line: 2027, col: 7, offset: 63317},
 									name: "LEFT",
 								},
 								&zeroOrOneExpr{
-									pos: position{line: 2027, col: 12, offset: 63326},
+									pos: position{line: 2027, col: 12, offset: 63322},
 									expr: &seqExpr{
-										pos: position{line: 2027, col: 13, offset: 63327},
+										pos: position{line: 2027, col: 13, offset: 63323},
 										exprs: []any{
 											&ruleRefExpr{
-												pos:  position{line: 2027, col: 13, offset: 63327},
+												pos:  position{line: 2027, col: 13, offset: 63323},
 												name: "_",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 2027, col: 15, offset: 63329},
+												pos:  position{line: 2027, col: 15, offset: 63325},
 												name: "OUTER",
 											},
 										},
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2027, col: 23, offset: 63337},
+									pos:  position{line: 2027, col: 23, offset: 63333},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2027, col: 25, offset: 63339},
+									pos:  position{line: 2027, col: 25, offset: 63335},
 									name: "JOIN",
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 2028, col: 5, offset: 63373},
+						pos: position{line: 2028, col: 5, offset: 63369},
 						run: (*parser).callonSQLJoinStyle30,
 						expr: &seqExpr{
-							pos: position{line: 2028, col: 5, offset: 63373},
+							pos: position{line: 2028, col: 5, offset: 63369},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 2028, col: 5, offset: 63373},
+									pos:  position{line: 2028, col: 5, offset: 63369},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2028, col: 7, offset: 63375},
+									pos:  position{line: 2028, col: 7, offset: 63371},
 									name: "RIGHT",
 								},
 								&zeroOrOneExpr{
-									pos: position{line: 2028, col: 13, offset: 63381},
+									pos: position{line: 2028, col: 13, offset: 63377},
 									expr: &seqExpr{
-										pos: position{line: 2028, col: 14, offset: 63382},
+										pos: position{line: 2028, col: 14, offset: 63378},
 										exprs: []any{
 											&ruleRefExpr{
-												pos:  position{line: 2028, col: 14, offset: 63382},
+												pos:  position{line: 2028, col: 14, offset: 63378},
 												name: "_",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 2028, col: 16, offset: 63384},
+												pos:  position{line: 2028, col: 16, offset: 63380},
 												name: "OUTER",
 											},
 										},
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2028, col: 24, offset: 63392},
+									pos:  position{line: 2028, col: 24, offset: 63388},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2028, col: 26, offset: 63394},
+									pos:  position{line: 2028, col: 26, offset: 63390},
 									name: "JOIN",
 								},
 							},
@@ -14590,33 +14586,33 @@ var g = &grammar{
 		},
 		{
 			name: "JoinExpr",
-			pos:  position{line: 2030, col: 1, offset: 63426},
+			pos:  position{line: 2030, col: 1, offset: 63422},
 			expr: &choiceExpr{
-				pos: position{line: 2031, col: 5, offset: 63440},
+				pos: position{line: 2031, col: 5, offset: 63436},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 2031, col: 5, offset: 63440},
+						pos: position{line: 2031, col: 5, offset: 63436},
 						run: (*parser).callonJoinExpr2,
 						expr: &seqExpr{
-							pos: position{line: 2031, col: 5, offset: 63440},
+							pos: position{line: 2031, col: 5, offset: 63436},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 2031, col: 5, offset: 63440},
+									pos:  position{line: 2031, col: 5, offset: 63436},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2031, col: 7, offset: 63442},
+									pos:  position{line: 2031, col: 7, offset: 63438},
 									name: "ON",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2031, col: 10, offset: 63445},
+									pos:  position{line: 2031, col: 10, offset: 63441},
 									name: "_",
 								},
 								&labeledExpr{
-									pos:   position{line: 2031, col: 12, offset: 63447},
+									pos:   position{line: 2031, col: 12, offset: 63443},
 									label: "e",
 									expr: &ruleRefExpr{
-										pos:  position{line: 2031, col: 14, offset: 63449},
+										pos:  position{line: 2031, col: 14, offset: 63445},
 										name: "Expr",
 									},
 								},
@@ -14624,47 +14620,47 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 2037, col: 5, offset: 63579},
+						pos: position{line: 2037, col: 5, offset: 63575},
 						run: (*parser).callonJoinExpr9,
 						expr: &seqExpr{
-							pos: position{line: 2037, col: 5, offset: 63579},
+							pos: position{line: 2037, col: 5, offset: 63575},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 2037, col: 5, offset: 63579},
+									pos:  position{line: 2037, col: 5, offset: 63575},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2037, col: 7, offset: 63581},
+									pos:  position{line: 2037, col: 7, offset: 63577},
 									name: "USING",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2037, col: 13, offset: 63587},
+									pos:  position{line: 2037, col: 13, offset: 63583},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 2037, col: 16, offset: 63590},
+									pos:        position{line: 2037, col: 16, offset: 63586},
 									val:        "(",
 									ignoreCase: false,
 									want:       "\"(\"",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2037, col: 20, offset: 63594},
+									pos:  position{line: 2037, col: 20, offset: 63590},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 2037, col: 23, offset: 63597},
+									pos:   position{line: 2037, col: 23, offset: 63593},
 									label: "fields",
 									expr: &ruleRefExpr{
-										pos:  position{line: 2037, col: 30, offset: 63604},
+										pos:  position{line: 2037, col: 30, offset: 63600},
 										name: "Lvals",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2037, col: 36, offset: 63610},
+									pos:  position{line: 2037, col: 36, offset: 63606},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 2037, col: 39, offset: 63613},
+									pos:        position{line: 2037, col: 39, offset: 63609},
 									val:        ")",
 									ignoreCase: false,
 									want:       "\")\"",
@@ -14679,40 +14675,40 @@ var g = &grammar{
 		},
 		{
 			name: "OptOrdinality",
-			pos:  position{line: 2044, col: 1, offset: 63758},
+			pos:  position{line: 2044, col: 1, offset: 63754},
 			expr: &choiceExpr{
-				pos: position{line: 2045, col: 5, offset: 63777},
+				pos: position{line: 2045, col: 5, offset: 63773},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 2045, col: 5, offset: 63777},
+						pos: position{line: 2045, col: 5, offset: 63773},
 						run: (*parser).callonOptOrdinality2,
 						expr: &seqExpr{
-							pos: position{line: 2045, col: 5, offset: 63777},
+							pos: position{line: 2045, col: 5, offset: 63773},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 2045, col: 5, offset: 63777},
+									pos:  position{line: 2045, col: 5, offset: 63773},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2045, col: 7, offset: 63779},
+									pos:  position{line: 2045, col: 7, offset: 63775},
 									name: "WITH",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2045, col: 12, offset: 63784},
+									pos:  position{line: 2045, col: 12, offset: 63780},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2045, col: 14, offset: 63786},
+									pos:  position{line: 2045, col: 14, offset: 63782},
 									name: "ORDINALITY",
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 2051, col: 5, offset: 63915},
+						pos: position{line: 2051, col: 5, offset: 63911},
 						run: (*parser).callonOptOrdinality8,
 						expr: &litMatcher{
-							pos:        position{line: 2051, col: 5, offset: 63915},
+							pos:        position{line: 2051, col: 5, offset: 63911},
 							val:        "",
 							ignoreCase: false,
 							want:       "\"\"",
@@ -14725,25 +14721,25 @@ var g = &grammar{
 		},
 		{
 			name: "OptAlias",
-			pos:  position{line: 2053, col: 1, offset: 63964},
+			pos:  position{line: 2053, col: 1, offset: 63960},
 			expr: &choiceExpr{
-				pos: position{line: 2054, col: 5, offset: 63977},
+				pos: position{line: 2054, col: 5, offset: 63973},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 2054, col: 5, offset: 63977},
+						pos: position{line: 2054, col: 5, offset: 63973},
 						run: (*parser).callonOptAlias2,
 						expr: &seqExpr{
-							pos: position{line: 2054, col: 5, offset: 63977},
+							pos: position{line: 2054, col: 5, offset: 63973},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 2054, col: 5, offset: 63977},
+									pos:  position{line: 2054, col: 5, offset: 63973},
 									name: "_",
 								},
 								&labeledExpr{
-									pos:   position{line: 2054, col: 7, offset: 63979},
+									pos:   position{line: 2054, col: 7, offset: 63975},
 									label: "a",
 									expr: &ruleRefExpr{
-										pos:  position{line: 2054, col: 9, offset: 63981},
+										pos:  position{line: 2054, col: 9, offset: 63977},
 										name: "AliasClause",
 									},
 								},
@@ -14751,10 +14747,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 2055, col: 5, offset: 64015},
+						pos: position{line: 2055, col: 5, offset: 64011},
 						run: (*parser).callonOptAlias7,
 						expr: &litMatcher{
-							pos:        position{line: 2055, col: 5, offset: 64015},
+							pos:        position{line: 2055, col: 5, offset: 64011},
 							val:        "",
 							ignoreCase: false,
 							want:       "\"\"",
@@ -14767,50 +14763,50 @@ var g = &grammar{
 		},
 		{
 			name: "AliasClause",
-			pos:  position{line: 2057, col: 1, offset: 64052},
+			pos:  position{line: 2057, col: 1, offset: 64048},
 			expr: &actionExpr{
-				pos: position{line: 2058, col: 5, offset: 64069},
+				pos: position{line: 2058, col: 5, offset: 64065},
 				run: (*parser).callonAliasClause1,
 				expr: &seqExpr{
-					pos: position{line: 2058, col: 5, offset: 64069},
+					pos: position{line: 2058, col: 5, offset: 64065},
 					exprs: []any{
 						&zeroOrOneExpr{
-							pos: position{line: 2058, col: 5, offset: 64069},
+							pos: position{line: 2058, col: 5, offset: 64065},
 							expr: &seqExpr{
-								pos: position{line: 2058, col: 6, offset: 64070},
+								pos: position{line: 2058, col: 6, offset: 64066},
 								exprs: []any{
 									&ruleRefExpr{
-										pos:  position{line: 2058, col: 6, offset: 64070},
+										pos:  position{line: 2058, col: 6, offset: 64066},
 										name: "AS",
 									},
 									&ruleRefExpr{
-										pos:  position{line: 2058, col: 9, offset: 64073},
+										pos:  position{line: 2058, col: 9, offset: 64069},
 										name: "_",
 									},
 								},
 							},
 						},
 						&notExpr{
-							pos: position{line: 2058, col: 13, offset: 64077},
+							pos: position{line: 2058, col: 13, offset: 64073},
 							expr: &choiceExpr{
-								pos: position{line: 2058, col: 15, offset: 64079},
+								pos: position{line: 2058, col: 15, offset: 64075},
 								alternatives: []any{
 									&ruleRefExpr{
-										pos:  position{line: 2058, col: 15, offset: 64079},
+										pos:  position{line: 2058, col: 15, offset: 64075},
 										name: "SQLGuard",
 									},
 									&ruleRefExpr{
-										pos:  position{line: 2058, col: 26, offset: 64090},
+										pos:  position{line: 2058, col: 26, offset: 64086},
 										name: "DeprecatedFroms",
 									},
 								},
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 2058, col: 43, offset: 64107},
+							pos:   position{line: 2058, col: 43, offset: 64103},
 							label: "name",
 							expr: &ruleRefExpr{
-								pos:  position{line: 2058, col: 48, offset: 64112},
+								pos:  position{line: 2058, col: 48, offset: 64108},
 								name: "IdentifierName",
 							},
 						},
@@ -14822,51 +14818,51 @@ var g = &grammar{
 		},
 		{
 			name: "Selection",
-			pos:  position{line: 2062, col: 1, offset: 64245},
+			pos:  position{line: 2062, col: 1, offset: 64241},
 			expr: &actionExpr{
-				pos: position{line: 2063, col: 5, offset: 64259},
+				pos: position{line: 2063, col: 5, offset: 64255},
 				run: (*parser).callonSelection1,
 				expr: &seqExpr{
-					pos: position{line: 2063, col: 5, offset: 64259},
+					pos: position{line: 2063, col: 5, offset: 64255},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 2063, col: 5, offset: 64259},
+							pos:   position{line: 2063, col: 5, offset: 64255},
 							label: "first",
 							expr: &ruleRefExpr{
-								pos:  position{line: 2063, col: 11, offset: 64265},
+								pos:  position{line: 2063, col: 11, offset: 64261},
 								name: "SelectElem",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 2063, col: 22, offset: 64276},
+							pos:   position{line: 2063, col: 22, offset: 64272},
 							label: "rest",
 							expr: &zeroOrMoreExpr{
-								pos: position{line: 2063, col: 27, offset: 64281},
+								pos: position{line: 2063, col: 27, offset: 64277},
 								expr: &actionExpr{
-									pos: position{line: 2063, col: 29, offset: 64283},
+									pos: position{line: 2063, col: 29, offset: 64279},
 									run: (*parser).callonSelection7,
 									expr: &seqExpr{
-										pos: position{line: 2063, col: 29, offset: 64283},
+										pos: position{line: 2063, col: 29, offset: 64279},
 										exprs: []any{
 											&ruleRefExpr{
-												pos:  position{line: 2063, col: 29, offset: 64283},
+												pos:  position{line: 2063, col: 29, offset: 64279},
 												name: "__",
 											},
 											&litMatcher{
-												pos:        position{line: 2063, col: 32, offset: 64286},
+												pos:        position{line: 2063, col: 32, offset: 64282},
 												val:        ",",
 												ignoreCase: false,
 												want:       "\",\"",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 2063, col: 36, offset: 64290},
+												pos:  position{line: 2063, col: 36, offset: 64286},
 												name: "__",
 											},
 											&labeledExpr{
-												pos:   position{line: 2063, col: 39, offset: 64293},
+												pos:   position{line: 2063, col: 39, offset: 64289},
 												label: "s",
 												expr: &ruleRefExpr{
-													pos:  position{line: 2063, col: 41, offset: 64295},
+													pos:  position{line: 2063, col: 41, offset: 64291},
 													name: "SelectElem",
 												},
 											},
@@ -14883,29 +14879,29 @@ var g = &grammar{
 		},
 		{
 			name: "SelectElem",
-			pos:  position{line: 2072, col: 1, offset: 64521},
+			pos:  position{line: 2072, col: 1, offset: 64517},
 			expr: &choiceExpr{
-				pos: position{line: 2073, col: 5, offset: 64537},
+				pos: position{line: 2073, col: 5, offset: 64533},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 2073, col: 5, offset: 64537},
+						pos: position{line: 2073, col: 5, offset: 64533},
 						run: (*parser).callonSelectElem2,
 						expr: &seqExpr{
-							pos: position{line: 2073, col: 5, offset: 64537},
+							pos: position{line: 2073, col: 5, offset: 64533},
 							exprs: []any{
 								&labeledExpr{
-									pos:   position{line: 2073, col: 5, offset: 64537},
+									pos:   position{line: 2073, col: 5, offset: 64533},
 									label: "e",
 									expr: &ruleRefExpr{
-										pos:  position{line: 2073, col: 7, offset: 64539},
+										pos:  position{line: 2073, col: 7, offset: 64535},
 										name: "Expr",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 2073, col: 12, offset: 64544},
+									pos:   position{line: 2073, col: 12, offset: 64540},
 									label: "as",
 									expr: &ruleRefExpr{
-										pos:  position{line: 2073, col: 15, offset: 64547},
+										pos:  position{line: 2073, col: 15, offset: 64543},
 										name: "OptAsClause",
 									},
 								},
@@ -14913,10 +14909,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 2084, col: 5, offset: 64763},
+						pos: position{line: 2084, col: 5, offset: 64759},
 						run: (*parser).callonSelectElem8,
 						expr: &litMatcher{
-							pos:        position{line: 2084, col: 5, offset: 64763},
+							pos:        position{line: 2084, col: 5, offset: 64759},
 							val:        "*",
 							ignoreCase: false,
 							want:       "\"*\"",
@@ -14929,33 +14925,33 @@ var g = &grammar{
 		},
 		{
 			name: "OptAsClause",
-			pos:  position{line: 2089, col: 1, offset: 64865},
+			pos:  position{line: 2089, col: 1, offset: 64861},
 			expr: &choiceExpr{
-				pos: position{line: 2090, col: 5, offset: 64882},
+				pos: position{line: 2090, col: 5, offset: 64878},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 2090, col: 5, offset: 64882},
+						pos: position{line: 2090, col: 5, offset: 64878},
 						run: (*parser).callonOptAsClause2,
 						expr: &seqExpr{
-							pos: position{line: 2090, col: 5, offset: 64882},
+							pos: position{line: 2090, col: 5, offset: 64878},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 2090, col: 5, offset: 64882},
+									pos:  position{line: 2090, col: 5, offset: 64878},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2090, col: 7, offset: 64884},
+									pos:  position{line: 2090, col: 7, offset: 64880},
 									name: "AS",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2090, col: 10, offset: 64887},
+									pos:  position{line: 2090, col: 10, offset: 64883},
 									name: "_",
 								},
 								&labeledExpr{
-									pos:   position{line: 2090, col: 12, offset: 64889},
+									pos:   position{line: 2090, col: 12, offset: 64885},
 									label: "id",
 									expr: &ruleRefExpr{
-										pos:  position{line: 2090, col: 15, offset: 64892},
+										pos:  position{line: 2090, col: 15, offset: 64888},
 										name: "Identifier",
 									},
 								},
@@ -14963,10 +14959,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 2091, col: 5, offset: 64926},
+						pos: position{line: 2091, col: 5, offset: 64922},
 						run: (*parser).callonOptAsClause9,
 						expr: &litMatcher{
-							pos:        position{line: 2091, col: 5, offset: 64926},
+							pos:        position{line: 2091, col: 5, offset: 64922},
 							val:        "",
 							ignoreCase: false,
 							want:       "\"\"",
@@ -14979,41 +14975,41 @@ var g = &grammar{
 		},
 		{
 			name: "OptOrderByClause",
-			pos:  position{line: 2093, col: 1, offset: 64951},
+			pos:  position{line: 2093, col: 1, offset: 64947},
 			expr: &choiceExpr{
-				pos: position{line: 2094, col: 5, offset: 64973},
+				pos: position{line: 2094, col: 5, offset: 64969},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 2094, col: 5, offset: 64973},
+						pos: position{line: 2094, col: 5, offset: 64969},
 						run: (*parser).callonOptOrderByClause2,
 						expr: &seqExpr{
-							pos: position{line: 2094, col: 5, offset: 64973},
+							pos: position{line: 2094, col: 5, offset: 64969},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 2094, col: 5, offset: 64973},
+									pos:  position{line: 2094, col: 5, offset: 64969},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2094, col: 7, offset: 64975},
+									pos:  position{line: 2094, col: 7, offset: 64971},
 									name: "ORDER",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2094, col: 13, offset: 64981},
+									pos:  position{line: 2094, col: 13, offset: 64977},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2094, col: 15, offset: 64983},
+									pos:  position{line: 2094, col: 15, offset: 64979},
 									name: "BY",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2094, col: 18, offset: 64986},
+									pos:  position{line: 2094, col: 18, offset: 64982},
 									name: "_",
 								},
 								&labeledExpr{
-									pos:   position{line: 2094, col: 20, offset: 64988},
+									pos:   position{line: 2094, col: 20, offset: 64984},
 									label: "list",
 									expr: &ruleRefExpr{
-										pos:  position{line: 2094, col: 25, offset: 64993},
+										pos:  position{line: 2094, col: 25, offset: 64989},
 										name: "OrderByList",
 									},
 								},
@@ -15021,10 +15017,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 2101, col: 5, offset: 65152},
+						pos: position{line: 2101, col: 5, offset: 65148},
 						run: (*parser).callonOptOrderByClause11,
 						expr: &litMatcher{
-							pos:        position{line: 2101, col: 5, offset: 65152},
+							pos:        position{line: 2101, col: 5, offset: 65148},
 							val:        "",
 							ignoreCase: false,
 							want:       "\"\"",
@@ -15037,51 +15033,51 @@ var g = &grammar{
 		},
 		{
 			name: "OrderByList",
-			pos:  position{line: 2103, col: 1, offset: 65185},
+			pos:  position{line: 2103, col: 1, offset: 65181},
 			expr: &actionExpr{
-				pos: position{line: 2104, col: 5, offset: 65202},
+				pos: position{line: 2104, col: 5, offset: 65198},
 				run: (*parser).callonOrderByList1,
 				expr: &seqExpr{
-					pos: position{line: 2104, col: 5, offset: 65202},
+					pos: position{line: 2104, col: 5, offset: 65198},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 2104, col: 5, offset: 65202},
+							pos:   position{line: 2104, col: 5, offset: 65198},
 							label: "first",
 							expr: &ruleRefExpr{
-								pos:  position{line: 2104, col: 11, offset: 65208},
+								pos:  position{line: 2104, col: 11, offset: 65204},
 								name: "OrderByItem",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 2104, col: 23, offset: 65220},
+							pos:   position{line: 2104, col: 23, offset: 65216},
 							label: "rest",
 							expr: &zeroOrMoreExpr{
-								pos: position{line: 2104, col: 28, offset: 65225},
+								pos: position{line: 2104, col: 28, offset: 65221},
 								expr: &actionExpr{
-									pos: position{line: 2104, col: 30, offset: 65227},
+									pos: position{line: 2104, col: 30, offset: 65223},
 									run: (*parser).callonOrderByList7,
 									expr: &seqExpr{
-										pos: position{line: 2104, col: 30, offset: 65227},
+										pos: position{line: 2104, col: 30, offset: 65223},
 										exprs: []any{
 											&ruleRefExpr{
-												pos:  position{line: 2104, col: 30, offset: 65227},
+												pos:  position{line: 2104, col: 30, offset: 65223},
 												name: "__",
 											},
 											&litMatcher{
-												pos:        position{line: 2104, col: 33, offset: 65230},
+												pos:        position{line: 2104, col: 33, offset: 65226},
 												val:        ",",
 												ignoreCase: false,
 												want:       "\",\"",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 2104, col: 37, offset: 65234},
+												pos:  position{line: 2104, col: 37, offset: 65230},
 												name: "__",
 											},
 											&labeledExpr{
-												pos:   position{line: 2104, col: 40, offset: 65237},
+												pos:   position{line: 2104, col: 40, offset: 65233},
 												label: "o",
 												expr: &ruleRefExpr{
-													pos:  position{line: 2104, col: 42, offset: 65239},
+													pos:  position{line: 2104, col: 42, offset: 65235},
 													name: "OrderByItem",
 												},
 											},
@@ -15098,34 +15094,34 @@ var g = &grammar{
 		},
 		{
 			name: "OrderByItem",
-			pos:  position{line: 2108, col: 1, offset: 65340},
+			pos:  position{line: 2108, col: 1, offset: 65336},
 			expr: &actionExpr{
-				pos: position{line: 2109, col: 5, offset: 65356},
+				pos: position{line: 2109, col: 5, offset: 65352},
 				run: (*parser).callonOrderByItem1,
 				expr: &seqExpr{
-					pos: position{line: 2109, col: 5, offset: 65356},
+					pos: position{line: 2109, col: 5, offset: 65352},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 2109, col: 5, offset: 65356},
+							pos:   position{line: 2109, col: 5, offset: 65352},
 							label: "e",
 							expr: &ruleRefExpr{
-								pos:  position{line: 2109, col: 7, offset: 65358},
+								pos:  position{line: 2109, col: 7, offset: 65354},
 								name: "Expr",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 2109, col: 12, offset: 65363},
+							pos:   position{line: 2109, col: 12, offset: 65359},
 							label: "order",
 							expr: &ruleRefExpr{
-								pos:  position{line: 2109, col: 18, offset: 65369},
+								pos:  position{line: 2109, col: 18, offset: 65365},
 								name: "OptAscDesc",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 2109, col: 29, offset: 65380},
+							pos:   position{line: 2109, col: 29, offset: 65376},
 							label: "nulls",
 							expr: &ruleRefExpr{
-								pos:  position{line: 2109, col: 35, offset: 65386},
+								pos:  position{line: 2109, col: 35, offset: 65382},
 								name: "OptNullsOrder",
 							},
 						},
@@ -15137,49 +15133,49 @@ var g = &grammar{
 		},
 		{
 			name: "OptAscDesc",
-			pos:  position{line: 2120, col: 1, offset: 65636},
+			pos:  position{line: 2120, col: 1, offset: 65632},
 			expr: &choiceExpr{
-				pos: position{line: 2121, col: 5, offset: 65651},
+				pos: position{line: 2121, col: 5, offset: 65647},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 2121, col: 5, offset: 65651},
+						pos: position{line: 2121, col: 5, offset: 65647},
 						run: (*parser).callonOptAscDesc2,
 						expr: &seqExpr{
-							pos: position{line: 2121, col: 5, offset: 65651},
+							pos: position{line: 2121, col: 5, offset: 65647},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 2121, col: 5, offset: 65651},
+									pos:  position{line: 2121, col: 5, offset: 65647},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2121, col: 7, offset: 65653},
+									pos:  position{line: 2121, col: 7, offset: 65649},
 									name: "ASC",
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 2122, col: 5, offset: 65725},
+						pos: position{line: 2122, col: 5, offset: 65721},
 						run: (*parser).callonOptAscDesc6,
 						expr: &seqExpr{
-							pos: position{line: 2122, col: 5, offset: 65725},
+							pos: position{line: 2122, col: 5, offset: 65721},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 2122, col: 5, offset: 65725},
+									pos:  position{line: 2122, col: 5, offset: 65721},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2122, col: 7, offset: 65727},
+									pos:  position{line: 2122, col: 7, offset: 65723},
 									name: "DESC",
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 2123, col: 5, offset: 65799},
+						pos: position{line: 2123, col: 5, offset: 65795},
 						run: (*parser).callonOptAscDesc10,
 						expr: &litMatcher{
-							pos:        position{line: 2123, col: 5, offset: 65799},
+							pos:        position{line: 2123, col: 5, offset: 65795},
 							val:        "",
 							ignoreCase: false,
 							want:       "\"\"",
@@ -15192,65 +15188,65 @@ var g = &grammar{
 		},
 		{
 			name: "OptNullsOrder",
-			pos:  position{line: 2125, col: 1, offset: 65831},
+			pos:  position{line: 2125, col: 1, offset: 65827},
 			expr: &choiceExpr{
-				pos: position{line: 2126, col: 5, offset: 65849},
+				pos: position{line: 2126, col: 5, offset: 65845},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 2126, col: 5, offset: 65849},
+						pos: position{line: 2126, col: 5, offset: 65845},
 						run: (*parser).callonOptNullsOrder2,
 						expr: &seqExpr{
-							pos: position{line: 2126, col: 5, offset: 65849},
+							pos: position{line: 2126, col: 5, offset: 65845},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 2126, col: 5, offset: 65849},
+									pos:  position{line: 2126, col: 5, offset: 65845},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2126, col: 7, offset: 65851},
+									pos:  position{line: 2126, col: 7, offset: 65847},
 									name: "NULLS",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2126, col: 13, offset: 65857},
+									pos:  position{line: 2126, col: 13, offset: 65853},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2126, col: 15, offset: 65859},
+									pos:  position{line: 2126, col: 15, offset: 65855},
 									name: "FIRST",
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 2127, col: 5, offset: 65935},
+						pos: position{line: 2127, col: 5, offset: 65931},
 						run: (*parser).callonOptNullsOrder8,
 						expr: &seqExpr{
-							pos: position{line: 2127, col: 5, offset: 65935},
+							pos: position{line: 2127, col: 5, offset: 65931},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 2127, col: 5, offset: 65935},
+									pos:  position{line: 2127, col: 5, offset: 65931},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2127, col: 7, offset: 65937},
+									pos:  position{line: 2127, col: 7, offset: 65933},
 									name: "NULLS",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2127, col: 13, offset: 65943},
+									pos:  position{line: 2127, col: 13, offset: 65939},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2127, col: 15, offset: 65945},
+									pos:  position{line: 2127, col: 15, offset: 65941},
 									name: "LAST",
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 2128, col: 5, offset: 66020},
+						pos: position{line: 2128, col: 5, offset: 66016},
 						run: (*parser).callonOptNullsOrder14,
 						expr: &litMatcher{
-							pos:        position{line: 2128, col: 5, offset: 66020},
+							pos:        position{line: 2128, col: 5, offset: 66016},
 							val:        "",
 							ignoreCase: false,
 							want:       "\"\"",
@@ -15263,29 +15259,29 @@ var g = &grammar{
 		},
 		{
 			name: "SelectLimit",
-			pos:  position{line: 2130, col: 1, offset: 66065},
+			pos:  position{line: 2130, col: 1, offset: 66061},
 			expr: &choiceExpr{
-				pos: position{line: 2131, col: 5, offset: 66081},
+				pos: position{line: 2131, col: 5, offset: 66077},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 2131, col: 5, offset: 66081},
+						pos: position{line: 2131, col: 5, offset: 66077},
 						run: (*parser).callonSelectLimit2,
 						expr: &seqExpr{
-							pos: position{line: 2131, col: 5, offset: 66081},
+							pos: position{line: 2131, col: 5, offset: 66077},
 							exprs: []any{
 								&labeledExpr{
-									pos:   position{line: 2131, col: 5, offset: 66081},
+									pos:   position{line: 2131, col: 5, offset: 66077},
 									label: "l",
 									expr: &ruleRefExpr{
-										pos:  position{line: 2131, col: 7, offset: 66083},
+										pos:  position{line: 2131, col: 7, offset: 66079},
 										name: "LimitClause",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 2131, col: 19, offset: 66095},
+									pos:   position{line: 2131, col: 19, offset: 66091},
 									label: "o",
 									expr: &ruleRefExpr{
-										pos:  position{line: 2131, col: 21, offset: 66097},
+										pos:  position{line: 2131, col: 21, offset: 66093},
 										name: "OptOffsetClause",
 									},
 								},
@@ -15293,24 +15289,24 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 2138, col: 5, offset: 66243},
+						pos: position{line: 2138, col: 5, offset: 66239},
 						run: (*parser).callonSelectLimit8,
 						expr: &seqExpr{
-							pos: position{line: 2138, col: 5, offset: 66243},
+							pos: position{line: 2138, col: 5, offset: 66239},
 							exprs: []any{
 								&labeledExpr{
-									pos:   position{line: 2138, col: 5, offset: 66243},
+									pos:   position{line: 2138, col: 5, offset: 66239},
 									label: "o",
 									expr: &ruleRefExpr{
-										pos:  position{line: 2138, col: 7, offset: 66245},
+										pos:  position{line: 2138, col: 7, offset: 66241},
 										name: "OffsetClause",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 2138, col: 20, offset: 66258},
+									pos:   position{line: 2138, col: 20, offset: 66254},
 									label: "l",
 									expr: &ruleRefExpr{
-										pos:  position{line: 2138, col: 22, offset: 66260},
+										pos:  position{line: 2138, col: 22, offset: 66256},
 										name: "OptLimitClause",
 									},
 								},
@@ -15324,25 +15320,25 @@ var g = &grammar{
 		},
 		{
 			name: "OptLimitClause",
-			pos:  position{line: 2151, col: 1, offset: 66532},
+			pos:  position{line: 2151, col: 1, offset: 66528},
 			expr: &choiceExpr{
-				pos: position{line: 2152, col: 5, offset: 66552},
+				pos: position{line: 2152, col: 5, offset: 66548},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 2152, col: 5, offset: 66552},
+						pos: position{line: 2152, col: 5, offset: 66548},
 						run: (*parser).callonOptLimitClause2,
 						expr: &seqExpr{
-							pos: position{line: 2152, col: 5, offset: 66552},
+							pos: position{line: 2152, col: 5, offset: 66548},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 2152, col: 5, offset: 66552},
+									pos:  position{line: 2152, col: 5, offset: 66548},
 									name: "_",
 								},
 								&labeledExpr{
-									pos:   position{line: 2152, col: 7, offset: 66554},
+									pos:   position{line: 2152, col: 7, offset: 66550},
 									label: "l",
 									expr: &ruleRefExpr{
-										pos:  position{line: 2152, col: 9, offset: 66556},
+										pos:  position{line: 2152, col: 9, offset: 66552},
 										name: "LimitClause",
 									},
 								},
@@ -15350,10 +15346,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 2153, col: 5, offset: 66590},
+						pos: position{line: 2153, col: 5, offset: 66586},
 						run: (*parser).callonOptLimitClause7,
 						expr: &litMatcher{
-							pos:        position{line: 2153, col: 5, offset: 66590},
+							pos:        position{line: 2153, col: 5, offset: 66586},
 							val:        "",
 							ignoreCase: false,
 							want:       "\"\"",
@@ -15366,50 +15362,50 @@ var g = &grammar{
 		},
 		{
 			name: "LimitClause",
-			pos:  position{line: 2155, col: 1, offset: 66627},
+			pos:  position{line: 2155, col: 1, offset: 66623},
 			expr: &choiceExpr{
-				pos: position{line: 2156, col: 5, offset: 66644},
+				pos: position{line: 2156, col: 5, offset: 66640},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 2156, col: 5, offset: 66644},
+						pos: position{line: 2156, col: 5, offset: 66640},
 						run: (*parser).callonLimitClause2,
 						expr: &seqExpr{
-							pos: position{line: 2156, col: 5, offset: 66644},
+							pos: position{line: 2156, col: 5, offset: 66640},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 2156, col: 5, offset: 66644},
+									pos:  position{line: 2156, col: 5, offset: 66640},
 									name: "LIMIT",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2156, col: 11, offset: 66650},
+									pos:  position{line: 2156, col: 11, offset: 66646},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2156, col: 13, offset: 66652},
+									pos:  position{line: 2156, col: 13, offset: 66648},
 									name: "ALL",
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 2157, col: 5, offset: 66714},
+						pos: position{line: 2157, col: 5, offset: 66710},
 						run: (*parser).callonLimitClause7,
 						expr: &seqExpr{
-							pos: position{line: 2157, col: 5, offset: 66714},
+							pos: position{line: 2157, col: 5, offset: 66710},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 2157, col: 5, offset: 66714},
+									pos:  position{line: 2157, col: 5, offset: 66710},
 									name: "LIMIT",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2157, col: 11, offset: 66720},
+									pos:  position{line: 2157, col: 11, offset: 66716},
 									name: "_",
 								},
 								&labeledExpr{
-									pos:   position{line: 2157, col: 13, offset: 66722},
+									pos:   position{line: 2157, col: 13, offset: 66718},
 									label: "e",
 									expr: &ruleRefExpr{
-										pos:  position{line: 2157, col: 15, offset: 66724},
+										pos:  position{line: 2157, col: 15, offset: 66720},
 										name: "Expr",
 									},
 								},
@@ -15423,25 +15419,25 @@ var g = &grammar{
 		},
 		{
 			name: "OptOffsetClause",
-			pos:  position{line: 2165, col: 1, offset: 66849},
+			pos:  position{line: 2165, col: 1, offset: 66845},
 			expr: &choiceExpr{
-				pos: position{line: 2166, col: 5, offset: 66870},
+				pos: position{line: 2166, col: 5, offset: 66866},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 2166, col: 5, offset: 66870},
+						pos: position{line: 2166, col: 5, offset: 66866},
 						run: (*parser).callonOptOffsetClause2,
 						expr: &seqExpr{
-							pos: position{line: 2166, col: 5, offset: 66870},
+							pos: position{line: 2166, col: 5, offset: 66866},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 2166, col: 5, offset: 66870},
+									pos:  position{line: 2166, col: 5, offset: 66866},
 									name: "_",
 								},
 								&labeledExpr{
-									pos:   position{line: 2166, col: 7, offset: 66872},
+									pos:   position{line: 2166, col: 7, offset: 66868},
 									label: "o",
 									expr: &ruleRefExpr{
-										pos:  position{line: 2166, col: 9, offset: 66874},
+										pos:  position{line: 2166, col: 9, offset: 66870},
 										name: "OffsetClause",
 									},
 								},
@@ -15449,10 +15445,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 2167, col: 5, offset: 66910},
+						pos: position{line: 2167, col: 5, offset: 66906},
 						run: (*parser).callonOptOffsetClause7,
 						expr: &litMatcher{
-							pos:        position{line: 2167, col: 5, offset: 66910},
+							pos:        position{line: 2167, col: 5, offset: 66906},
 							val:        "",
 							ignoreCase: false,
 							want:       "\"\"",
@@ -15465,26 +15461,26 @@ var g = &grammar{
 		},
 		{
 			name: "OffsetClause",
-			pos:  position{line: 2169, col: 1, offset: 66935},
+			pos:  position{line: 2169, col: 1, offset: 66931},
 			expr: &actionExpr{
-				pos: position{line: 2170, col: 5, offset: 66953},
+				pos: position{line: 2170, col: 5, offset: 66949},
 				run: (*parser).callonOffsetClause1,
 				expr: &seqExpr{
-					pos: position{line: 2170, col: 5, offset: 66953},
+					pos: position{line: 2170, col: 5, offset: 66949},
 					exprs: []any{
 						&ruleRefExpr{
-							pos:  position{line: 2170, col: 5, offset: 66953},
+							pos:  position{line: 2170, col: 5, offset: 66949},
 							name: "OFFSET",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 2170, col: 12, offset: 66960},
+							pos:  position{line: 2170, col: 12, offset: 66956},
 							name: "_",
 						},
 						&labeledExpr{
-							pos:   position{line: 2170, col: 14, offset: 66962},
+							pos:   position{line: 2170, col: 14, offset: 66958},
 							label: "e",
 							expr: &ruleRefExpr{
-								pos:  position{line: 2170, col: 16, offset: 66964},
+								pos:  position{line: 2170, col: 16, offset: 66960},
 								name: "Expr",
 							},
 						},
@@ -15496,38 +15492,38 @@ var g = &grammar{
 		},
 		{
 			name: "SetOperation",
-			pos:  position{line: 2172, col: 1, offset: 66989},
+			pos:  position{line: 2172, col: 1, offset: 66985},
 			expr: &actionExpr{
-				pos: position{line: 2173, col: 5, offset: 67006},
+				pos: position{line: 2173, col: 5, offset: 67002},
 				run: (*parser).callonSetOperation1,
 				expr: &seqExpr{
-					pos: position{line: 2173, col: 5, offset: 67006},
+					pos: position{line: 2173, col: 5, offset: 67002},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 2173, col: 5, offset: 67006},
+							pos:   position{line: 2173, col: 5, offset: 67002},
 							label: "left",
 							expr: &ruleRefExpr{
-								pos:  position{line: 2173, col: 10, offset: 67011},
+								pos:  position{line: 2173, col: 10, offset: 67007},
 								name: "SelectExpr",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 2173, col: 21, offset: 67022},
+							pos:   position{line: 2173, col: 21, offset: 67018},
 							label: "distinct",
 							expr: &ruleRefExpr{
-								pos:  position{line: 2173, col: 30, offset: 67031},
+								pos:  position{line: 2173, col: 30, offset: 67027},
 								name: "SetOp",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 2173, col: 36, offset: 67037},
+							pos:  position{line: 2173, col: 36, offset: 67033},
 							name: "_",
 						},
 						&labeledExpr{
-							pos:   position{line: 2173, col: 38, offset: 67039},
+							pos:   position{line: 2173, col: 38, offset: 67035},
 							label: "right",
 							expr: &ruleRefExpr{
-								pos:  position{line: 2173, col: 44, offset: 67045},
+								pos:  position{line: 2173, col: 44, offset: 67041},
 								name: "SelectExpr",
 							},
 						},
@@ -15539,65 +15535,65 @@ var g = &grammar{
 		},
 		{
 			name: "SetOp",
-			pos:  position{line: 2183, col: 1, offset: 67266},
+			pos:  position{line: 2183, col: 1, offset: 67262},
 			expr: &choiceExpr{
-				pos: position{line: 2184, col: 5, offset: 67277},
+				pos: position{line: 2184, col: 5, offset: 67273},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 2184, col: 5, offset: 67277},
+						pos: position{line: 2184, col: 5, offset: 67273},
 						run: (*parser).callonSetOp2,
 						expr: &seqExpr{
-							pos: position{line: 2184, col: 5, offset: 67277},
+							pos: position{line: 2184, col: 5, offset: 67273},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 2184, col: 5, offset: 67277},
+									pos:  position{line: 2184, col: 5, offset: 67273},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2184, col: 7, offset: 67279},
+									pos:  position{line: 2184, col: 7, offset: 67275},
 									name: "UNION",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2184, col: 13, offset: 67285},
+									pos:  position{line: 2184, col: 13, offset: 67281},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2184, col: 15, offset: 67287},
+									pos:  position{line: 2184, col: 15, offset: 67283},
 									name: "ALL",
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 2185, col: 5, offset: 67323},
+						pos: position{line: 2185, col: 5, offset: 67319},
 						run: (*parser).callonSetOp8,
 						expr: &seqExpr{
-							pos: position{line: 2185, col: 5, offset: 67323},
+							pos: position{line: 2185, col: 5, offset: 67319},
 							exprs: []any{
 								&ruleRefExpr{
-									pos:  position{line: 2185, col: 5, offset: 67323},
+									pos:  position{line: 2185, col: 5, offset: 67319},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2185, col: 7, offset: 67325},
+									pos:  position{line: 2185, col: 7, offset: 67321},
 									name: "UNION",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2185, col: 13, offset: 67331},
+									pos:  position{line: 2185, col: 13, offset: 67327},
 									name: "_",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 2185, col: 15, offset: 67333},
+									pos:  position{line: 2185, col: 15, offset: 67329},
 									name: "DISTINCT",
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 2186, col: 5, offset: 67368},
+						pos: position{line: 2186, col: 5, offset: 67364},
 						run: (*parser).callonSetOp14,
 						expr: &litMatcher{
-							pos:        position{line: 2186, col: 5, offset: 67368},
+							pos:        position{line: 2186, col: 5, offset: 67364},
 							val:        "",
 							ignoreCase: false,
 							want:       "\"\"",
@@ -15610,80 +15606,80 @@ var g = &grammar{
 		},
 		{
 			name: "SQLGuard",
-			pos:  position{line: 2189, col: 1, offset: 67431},
+			pos:  position{line: 2189, col: 1, offset: 67427},
 			expr: &choiceExpr{
-				pos: position{line: 2190, col: 5, offset: 67446},
+				pos: position{line: 2190, col: 5, offset: 67442},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 2190, col: 5, offset: 67446},
+						pos:  position{line: 2190, col: 5, offset: 67442},
 						name: "FROM",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 2190, col: 12, offset: 67453},
+						pos:  position{line: 2190, col: 12, offset: 67449},
 						name: "GROUP",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 2190, col: 20, offset: 67461},
+						pos:  position{line: 2190, col: 20, offset: 67457},
 						name: "HAVING",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 2190, col: 29, offset: 67470},
+						pos:  position{line: 2190, col: 29, offset: 67466},
 						name: "SELECT",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 2190, col: 38, offset: 67479},
+						pos:  position{line: 2190, col: 38, offset: 67475},
 						name: "RECURSIVE",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 2191, col: 5, offset: 67493},
+						pos:  position{line: 2191, col: 5, offset: 67489},
 						name: "INNER",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 2191, col: 13, offset: 67501},
+						pos:  position{line: 2191, col: 13, offset: 67497},
 						name: "LEFT",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 2191, col: 20, offset: 67508},
+						pos:  position{line: 2191, col: 20, offset: 67504},
 						name: "RIGHT",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 2191, col: 28, offset: 67516},
+						pos:  position{line: 2191, col: 28, offset: 67512},
 						name: "OUTER",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 2191, col: 36, offset: 67524},
+						pos:  position{line: 2191, col: 36, offset: 67520},
 						name: "CROSS",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 2191, col: 44, offset: 67532},
+						pos:  position{line: 2191, col: 44, offset: 67528},
 						name: "JOIN",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 2192, col: 5, offset: 67541},
+						pos:  position{line: 2192, col: 5, offset: 67537},
 						name: "UNION",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 2193, col: 5, offset: 67551},
+						pos:  position{line: 2193, col: 5, offset: 67547},
 						name: "ORDER",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 2194, col: 5, offset: 67561},
+						pos:  position{line: 2194, col: 5, offset: 67557},
 						name: "LIMIT",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 2195, col: 5, offset: 67571},
+						pos:  position{line: 2195, col: 5, offset: 67567},
 						name: "WHERE",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 2196, col: 5, offset: 67582},
+						pos:  position{line: 2196, col: 5, offset: 67578},
 						name: "WITH",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 2197, col: 5, offset: 67591},
+						pos:  position{line: 2197, col: 5, offset: 67587},
 						name: "USING",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 2198, col: 5, offset: 67601},
+						pos:  position{line: 2198, col: 5, offset: 67597},
 						name: "ON",
 					},
 				},
@@ -15693,20 +15689,20 @@ var g = &grammar{
 		},
 		{
 			name: "AGGREGATE",
-			pos:  position{line: 2200, col: 1, offset: 67605},
+			pos:  position{line: 2200, col: 1, offset: 67601},
 			expr: &seqExpr{
-				pos: position{line: 2200, col: 14, offset: 67618},
+				pos: position{line: 2200, col: 14, offset: 67614},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2200, col: 14, offset: 67618},
+						pos:        position{line: 2200, col: 14, offset: 67614},
 						val:        "aggregate",
 						ignoreCase: true,
 						want:       "\"AGGREGATE\"i",
 					},
 					&notExpr{
-						pos: position{line: 2200, col: 33, offset: 67637},
+						pos: position{line: 2200, col: 33, offset: 67633},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2200, col: 34, offset: 67638},
+							pos:  position{line: 2200, col: 34, offset: 67634},
 							name: "IdentifierRest",
 						},
 					},
@@ -15717,20 +15713,20 @@ var g = &grammar{
 		},
 		{
 			name: "ALL",
-			pos:  position{line: 2201, col: 1, offset: 67653},
+			pos:  position{line: 2201, col: 1, offset: 67649},
 			expr: &seqExpr{
-				pos: position{line: 2201, col: 14, offset: 67666},
+				pos: position{line: 2201, col: 14, offset: 67662},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2201, col: 14, offset: 67666},
+						pos:        position{line: 2201, col: 14, offset: 67662},
 						val:        "all",
 						ignoreCase: true,
 						want:       "\"ALL\"i",
 					},
 					&notExpr{
-						pos: position{line: 2201, col: 33, offset: 67685},
+						pos: position{line: 2201, col: 33, offset: 67681},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2201, col: 34, offset: 67686},
+							pos:  position{line: 2201, col: 34, offset: 67682},
 							name: "IdentifierRest",
 						},
 					},
@@ -15741,23 +15737,23 @@ var g = &grammar{
 		},
 		{
 			name: "AND",
-			pos:  position{line: 2202, col: 1, offset: 67701},
+			pos:  position{line: 2202, col: 1, offset: 67697},
 			expr: &actionExpr{
-				pos: position{line: 2202, col: 14, offset: 67714},
+				pos: position{line: 2202, col: 14, offset: 67710},
 				run: (*parser).callonAND1,
 				expr: &seqExpr{
-					pos: position{line: 2202, col: 14, offset: 67714},
+					pos: position{line: 2202, col: 14, offset: 67710},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 2202, col: 14, offset: 67714},
+							pos:        position{line: 2202, col: 14, offset: 67710},
 							val:        "and",
 							ignoreCase: true,
 							want:       "\"AND\"i",
 						},
 						&notExpr{
-							pos: position{line: 2202, col: 33, offset: 67733},
+							pos: position{line: 2202, col: 33, offset: 67729},
 							expr: &ruleRefExpr{
-								pos:  position{line: 2202, col: 34, offset: 67734},
+								pos:  position{line: 2202, col: 34, offset: 67730},
 								name: "IdentifierRest",
 							},
 						},
@@ -15769,20 +15765,20 @@ var g = &grammar{
 		},
 		{
 			name: "ANTI",
-			pos:  position{line: 2203, col: 1, offset: 67771},
+			pos:  position{line: 2203, col: 1, offset: 67767},
 			expr: &seqExpr{
-				pos: position{line: 2203, col: 14, offset: 67784},
+				pos: position{line: 2203, col: 14, offset: 67780},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2203, col: 14, offset: 67784},
+						pos:        position{line: 2203, col: 14, offset: 67780},
 						val:        "anti",
 						ignoreCase: true,
 						want:       "\"ANTI\"i",
 					},
 					&notExpr{
-						pos: position{line: 2203, col: 33, offset: 67803},
+						pos: position{line: 2203, col: 33, offset: 67799},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2203, col: 34, offset: 67804},
+							pos:  position{line: 2203, col: 34, offset: 67800},
 							name: "IdentifierRest",
 						},
 					},
@@ -15793,20 +15789,20 @@ var g = &grammar{
 		},
 		{
 			name: "AS",
-			pos:  position{line: 2204, col: 1, offset: 67819},
+			pos:  position{line: 2204, col: 1, offset: 67815},
 			expr: &seqExpr{
-				pos: position{line: 2204, col: 14, offset: 67832},
+				pos: position{line: 2204, col: 14, offset: 67828},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2204, col: 14, offset: 67832},
+						pos:        position{line: 2204, col: 14, offset: 67828},
 						val:        "as",
 						ignoreCase: true,
 						want:       "\"AS\"i",
 					},
 					&notExpr{
-						pos: position{line: 2204, col: 33, offset: 67851},
+						pos: position{line: 2204, col: 33, offset: 67847},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2204, col: 34, offset: 67852},
+							pos:  position{line: 2204, col: 34, offset: 67848},
 							name: "IdentifierRest",
 						},
 					},
@@ -15817,23 +15813,23 @@ var g = &grammar{
 		},
 		{
 			name: "ASC",
-			pos:  position{line: 2205, col: 1, offset: 67867},
+			pos:  position{line: 2205, col: 1, offset: 67863},
 			expr: &actionExpr{
-				pos: position{line: 2205, col: 14, offset: 67880},
+				pos: position{line: 2205, col: 14, offset: 67876},
 				run: (*parser).callonASC1,
 				expr: &seqExpr{
-					pos: position{line: 2205, col: 14, offset: 67880},
+					pos: position{line: 2205, col: 14, offset: 67876},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 2205, col: 14, offset: 67880},
+							pos:        position{line: 2205, col: 14, offset: 67876},
 							val:        "asc",
 							ignoreCase: true,
 							want:       "\"ASC\"i",
 						},
 						&notExpr{
-							pos: position{line: 2205, col: 33, offset: 67899},
+							pos: position{line: 2205, col: 33, offset: 67895},
 							expr: &ruleRefExpr{
-								pos:  position{line: 2205, col: 34, offset: 67900},
+								pos:  position{line: 2205, col: 34, offset: 67896},
 								name: "IdentifierRest",
 							},
 						},
@@ -15845,20 +15841,20 @@ var g = &grammar{
 		},
 		{
 			name: "ASSERT",
-			pos:  position{line: 2206, col: 1, offset: 67937},
+			pos:  position{line: 2206, col: 1, offset: 67933},
 			expr: &seqExpr{
-				pos: position{line: 2206, col: 14, offset: 67950},
+				pos: position{line: 2206, col: 14, offset: 67946},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2206, col: 14, offset: 67950},
+						pos:        position{line: 2206, col: 14, offset: 67946},
 						val:        "assert",
 						ignoreCase: true,
 						want:       "\"ASSERT\"i",
 					},
 					&notExpr{
-						pos: position{line: 2206, col: 33, offset: 67969},
+						pos: position{line: 2206, col: 33, offset: 67965},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2206, col: 34, offset: 67970},
+							pos:  position{line: 2206, col: 34, offset: 67966},
 							name: "IdentifierRest",
 						},
 					},
@@ -15869,20 +15865,20 @@ var g = &grammar{
 		},
 		{
 			name: "AT",
-			pos:  position{line: 2207, col: 1, offset: 67985},
+			pos:  position{line: 2207, col: 1, offset: 67981},
 			expr: &seqExpr{
-				pos: position{line: 2207, col: 14, offset: 67998},
+				pos: position{line: 2207, col: 14, offset: 67994},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2207, col: 14, offset: 67998},
+						pos:        position{line: 2207, col: 14, offset: 67994},
 						val:        "at",
 						ignoreCase: true,
 						want:       "\"AT\"i",
 					},
 					&notExpr{
-						pos: position{line: 2207, col: 33, offset: 68017},
+						pos: position{line: 2207, col: 33, offset: 68013},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2207, col: 34, offset: 68018},
+							pos:  position{line: 2207, col: 34, offset: 68014},
 							name: "IdentifierRest",
 						},
 					},
@@ -15893,20 +15889,20 @@ var g = &grammar{
 		},
 		{
 			name: "AUTHOR",
-			pos:  position{line: 2208, col: 1, offset: 68033},
+			pos:  position{line: 2208, col: 1, offset: 68029},
 			expr: &seqExpr{
-				pos: position{line: 2208, col: 14, offset: 68046},
+				pos: position{line: 2208, col: 14, offset: 68042},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2208, col: 14, offset: 68046},
+						pos:        position{line: 2208, col: 14, offset: 68042},
 						val:        "author",
 						ignoreCase: true,
 						want:       "\"AUTHOR\"i",
 					},
 					&notExpr{
-						pos: position{line: 2208, col: 33, offset: 68065},
+						pos: position{line: 2208, col: 33, offset: 68061},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2208, col: 34, offset: 68066},
+							pos:  position{line: 2208, col: 34, offset: 68062},
 							name: "IdentifierRest",
 						},
 					},
@@ -15917,20 +15913,20 @@ var g = &grammar{
 		},
 		{
 			name: "BETWEEN",
-			pos:  position{line: 2209, col: 1, offset: 68081},
+			pos:  position{line: 2209, col: 1, offset: 68077},
 			expr: &seqExpr{
-				pos: position{line: 2209, col: 14, offset: 68094},
+				pos: position{line: 2209, col: 14, offset: 68090},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2209, col: 14, offset: 68094},
+						pos:        position{line: 2209, col: 14, offset: 68090},
 						val:        "between",
 						ignoreCase: true,
 						want:       "\"BETWEEN\"i",
 					},
 					&notExpr{
-						pos: position{line: 2209, col: 33, offset: 68113},
+						pos: position{line: 2209, col: 33, offset: 68109},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2209, col: 34, offset: 68114},
+							pos:  position{line: 2209, col: 34, offset: 68110},
 							name: "IdentifierRest",
 						},
 					},
@@ -15941,20 +15937,20 @@ var g = &grammar{
 		},
 		{
 			name: "BODY",
-			pos:  position{line: 2210, col: 1, offset: 68129},
+			pos:  position{line: 2210, col: 1, offset: 68125},
 			expr: &seqExpr{
-				pos: position{line: 2210, col: 14, offset: 68142},
+				pos: position{line: 2210, col: 14, offset: 68138},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2210, col: 14, offset: 68142},
+						pos:        position{line: 2210, col: 14, offset: 68138},
 						val:        "body",
 						ignoreCase: true,
 						want:       "\"BODY\"i",
 					},
 					&notExpr{
-						pos: position{line: 2210, col: 33, offset: 68161},
+						pos: position{line: 2210, col: 33, offset: 68157},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2210, col: 34, offset: 68162},
+							pos:  position{line: 2210, col: 34, offset: 68158},
 							name: "IdentifierRest",
 						},
 					},
@@ -15965,20 +15961,20 @@ var g = &grammar{
 		},
 		{
 			name: "BY",
-			pos:  position{line: 2211, col: 1, offset: 68177},
+			pos:  position{line: 2211, col: 1, offset: 68173},
 			expr: &seqExpr{
-				pos: position{line: 2211, col: 14, offset: 68190},
+				pos: position{line: 2211, col: 14, offset: 68186},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2211, col: 14, offset: 68190},
+						pos:        position{line: 2211, col: 14, offset: 68186},
 						val:        "by",
 						ignoreCase: true,
 						want:       "\"BY\"i",
 					},
 					&notExpr{
-						pos: position{line: 2211, col: 33, offset: 68209},
+						pos: position{line: 2211, col: 33, offset: 68205},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2211, col: 34, offset: 68210},
+							pos:  position{line: 2211, col: 34, offset: 68206},
 							name: "IdentifierRest",
 						},
 					},
@@ -15989,20 +15985,20 @@ var g = &grammar{
 		},
 		{
 			name: "CASE",
-			pos:  position{line: 2212, col: 1, offset: 68225},
+			pos:  position{line: 2212, col: 1, offset: 68221},
 			expr: &seqExpr{
-				pos: position{line: 2212, col: 14, offset: 68238},
+				pos: position{line: 2212, col: 14, offset: 68234},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2212, col: 14, offset: 68238},
+						pos:        position{line: 2212, col: 14, offset: 68234},
 						val:        "case",
 						ignoreCase: true,
 						want:       "\"CASE\"i",
 					},
 					&notExpr{
-						pos: position{line: 2212, col: 33, offset: 68257},
+						pos: position{line: 2212, col: 33, offset: 68253},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2212, col: 34, offset: 68258},
+							pos:  position{line: 2212, col: 34, offset: 68254},
 							name: "IdentifierRest",
 						},
 					},
@@ -16013,20 +16009,20 @@ var g = &grammar{
 		},
 		{
 			name: "CONST",
-			pos:  position{line: 2213, col: 1, offset: 68273},
+			pos:  position{line: 2213, col: 1, offset: 68269},
 			expr: &seqExpr{
-				pos: position{line: 2213, col: 14, offset: 68286},
+				pos: position{line: 2213, col: 14, offset: 68282},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2213, col: 14, offset: 68286},
+						pos:        position{line: 2213, col: 14, offset: 68282},
 						val:        "const",
 						ignoreCase: true,
 						want:       "\"CONST\"i",
 					},
 					&notExpr{
-						pos: position{line: 2213, col: 33, offset: 68305},
+						pos: position{line: 2213, col: 33, offset: 68301},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2213, col: 34, offset: 68306},
+							pos:  position{line: 2213, col: 34, offset: 68302},
 							name: "IdentifierRest",
 						},
 					},
@@ -16037,20 +16033,20 @@ var g = &grammar{
 		},
 		{
 			name: "CROSS",
-			pos:  position{line: 2214, col: 1, offset: 68321},
+			pos:  position{line: 2214, col: 1, offset: 68317},
 			expr: &seqExpr{
-				pos: position{line: 2214, col: 14, offset: 68334},
+				pos: position{line: 2214, col: 14, offset: 68330},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2214, col: 14, offset: 68334},
+						pos:        position{line: 2214, col: 14, offset: 68330},
 						val:        "cross",
 						ignoreCase: true,
 						want:       "\"CROSS\"i",
 					},
 					&notExpr{
-						pos: position{line: 2214, col: 33, offset: 68353},
+						pos: position{line: 2214, col: 33, offset: 68349},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2214, col: 34, offset: 68354},
+							pos:  position{line: 2214, col: 34, offset: 68350},
 							name: "IdentifierRest",
 						},
 					},
@@ -16061,20 +16057,20 @@ var g = &grammar{
 		},
 		{
 			name: "CUT",
-			pos:  position{line: 2215, col: 1, offset: 68369},
+			pos:  position{line: 2215, col: 1, offset: 68365},
 			expr: &seqExpr{
-				pos: position{line: 2215, col: 14, offset: 68382},
+				pos: position{line: 2215, col: 14, offset: 68378},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2215, col: 14, offset: 68382},
+						pos:        position{line: 2215, col: 14, offset: 68378},
 						val:        "cut",
 						ignoreCase: true,
 						want:       "\"CUT\"i",
 					},
 					&notExpr{
-						pos: position{line: 2215, col: 33, offset: 68401},
+						pos: position{line: 2215, col: 33, offset: 68397},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2215, col: 34, offset: 68402},
+							pos:  position{line: 2215, col: 34, offset: 68398},
 							name: "IdentifierRest",
 						},
 					},
@@ -16085,20 +16081,20 @@ var g = &grammar{
 		},
 		{
 			name: "DEBUG",
-			pos:  position{line: 2216, col: 1, offset: 68417},
+			pos:  position{line: 2216, col: 1, offset: 68413},
 			expr: &seqExpr{
-				pos: position{line: 2216, col: 14, offset: 68430},
+				pos: position{line: 2216, col: 14, offset: 68426},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2216, col: 14, offset: 68430},
+						pos:        position{line: 2216, col: 14, offset: 68426},
 						val:        "debug",
 						ignoreCase: true,
 						want:       "\"DEBUG\"i",
 					},
 					&notExpr{
-						pos: position{line: 2216, col: 33, offset: 68449},
+						pos: position{line: 2216, col: 33, offset: 68445},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2216, col: 34, offset: 68450},
+							pos:  position{line: 2216, col: 34, offset: 68446},
 							name: "IdentifierRest",
 						},
 					},
@@ -16109,20 +16105,20 @@ var g = &grammar{
 		},
 		{
 			name: "DEFAULT",
-			pos:  position{line: 2217, col: 1, offset: 68465},
+			pos:  position{line: 2217, col: 1, offset: 68461},
 			expr: &seqExpr{
-				pos: position{line: 2217, col: 14, offset: 68478},
+				pos: position{line: 2217, col: 14, offset: 68474},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2217, col: 14, offset: 68478},
+						pos:        position{line: 2217, col: 14, offset: 68474},
 						val:        "default",
 						ignoreCase: true,
 						want:       "\"DEFAULT\"i",
 					},
 					&notExpr{
-						pos: position{line: 2217, col: 33, offset: 68497},
+						pos: position{line: 2217, col: 33, offset: 68493},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2217, col: 34, offset: 68498},
+							pos:  position{line: 2217, col: 34, offset: 68494},
 							name: "IdentifierRest",
 						},
 					},
@@ -16133,23 +16129,23 @@ var g = &grammar{
 		},
 		{
 			name: "DESC",
-			pos:  position{line: 2218, col: 1, offset: 68513},
+			pos:  position{line: 2218, col: 1, offset: 68509},
 			expr: &actionExpr{
-				pos: position{line: 2218, col: 14, offset: 68526},
+				pos: position{line: 2218, col: 14, offset: 68522},
 				run: (*parser).callonDESC1,
 				expr: &seqExpr{
-					pos: position{line: 2218, col: 14, offset: 68526},
+					pos: position{line: 2218, col: 14, offset: 68522},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 2218, col: 14, offset: 68526},
+							pos:        position{line: 2218, col: 14, offset: 68522},
 							val:        "desc",
 							ignoreCase: true,
 							want:       "\"DESC\"i",
 						},
 						&notExpr{
-							pos: position{line: 2218, col: 33, offset: 68545},
+							pos: position{line: 2218, col: 33, offset: 68541},
 							expr: &ruleRefExpr{
-								pos:  position{line: 2218, col: 34, offset: 68546},
+								pos:  position{line: 2218, col: 34, offset: 68542},
 								name: "IdentifierRest",
 							},
 						},
@@ -16161,20 +16157,20 @@ var g = &grammar{
 		},
 		{
 			name: "DISTINCT",
-			pos:  position{line: 2219, col: 1, offset: 68584},
+			pos:  position{line: 2219, col: 1, offset: 68580},
 			expr: &seqExpr{
-				pos: position{line: 2219, col: 14, offset: 68597},
+				pos: position{line: 2219, col: 14, offset: 68593},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2219, col: 14, offset: 68597},
+						pos:        position{line: 2219, col: 14, offset: 68593},
 						val:        "distinct",
 						ignoreCase: true,
 						want:       "\"DISTINCT\"i",
 					},
 					&notExpr{
-						pos: position{line: 2219, col: 33, offset: 68616},
+						pos: position{line: 2219, col: 33, offset: 68612},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2219, col: 34, offset: 68617},
+							pos:  position{line: 2219, col: 34, offset: 68613},
 							name: "IdentifierRest",
 						},
 					},
@@ -16185,20 +16181,44 @@ var g = &grammar{
 		},
 		{
 			name: "DROP",
-			pos:  position{line: 2220, col: 1, offset: 68632},
+			pos:  position{line: 2220, col: 1, offset: 68628},
 			expr: &seqExpr{
-				pos: position{line: 2220, col: 14, offset: 68645},
+				pos: position{line: 2220, col: 14, offset: 68641},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2220, col: 14, offset: 68645},
+						pos:        position{line: 2220, col: 14, offset: 68641},
 						val:        "drop",
 						ignoreCase: true,
 						want:       "\"DROP\"i",
 					},
 					&notExpr{
-						pos: position{line: 2220, col: 33, offset: 68664},
+						pos: position{line: 2220, col: 33, offset: 68660},
+						expr: &ruleRefExpr{
+							pos:  position{line: 2220, col: 34, offset: 68661},
+							name: "IdentifierRest",
+						},
+					},
+				},
+			},
+			leader:        false,
+			leftRecursive: false,
+		},
+		{
+			name: "ELSE",
+			pos:  position{line: 2221, col: 1, offset: 68677},
+			expr: &seqExpr{
+				pos: position{line: 2221, col: 14, offset: 68690},
+				exprs: []any{
+					&litMatcher{
+						pos:        position{line: 2221, col: 14, offset: 68690},
+						val:        "else",
+						ignoreCase: true,
+						want:       "\"ELSE\"i",
+					},
+					&notExpr{
+						pos: position{line: 2221, col: 33, offset: 68709},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2220, col: 34, offset: 68665},
+							pos:  position{line: 2221, col: 34, offset: 68710},
 							name: "IdentifierRest",
 						},
 					},
@@ -16209,20 +16229,20 @@ var g = &grammar{
 		},
 		{
 			name: "END",
-			pos:  position{line: 2221, col: 1, offset: 68681},
+			pos:  position{line: 2222, col: 1, offset: 68725},
 			expr: &seqExpr{
-				pos: position{line: 2221, col: 14, offset: 68694},
+				pos: position{line: 2222, col: 14, offset: 68738},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2221, col: 14, offset: 68694},
+						pos:        position{line: 2222, col: 14, offset: 68738},
 						val:        "end",
 						ignoreCase: true,
 						want:       "\"END\"i",
 					},
 					&notExpr{
-						pos: position{line: 2221, col: 33, offset: 68713},
+						pos: position{line: 2222, col: 33, offset: 68757},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2221, col: 34, offset: 68714},
+							pos:  position{line: 2222, col: 34, offset: 68758},
 							name: "IdentifierRest",
 						},
 					},
@@ -16233,20 +16253,20 @@ var g = &grammar{
 		},
 		{
 			name: "ERROR",
-			pos:  position{line: 2222, col: 1, offset: 68729},
+			pos:  position{line: 2223, col: 1, offset: 68773},
 			expr: &seqExpr{
-				pos: position{line: 2222, col: 14, offset: 68742},
+				pos: position{line: 2223, col: 14, offset: 68786},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2222, col: 14, offset: 68742},
+						pos:        position{line: 2223, col: 14, offset: 68786},
 						val:        "error",
 						ignoreCase: true,
 						want:       "\"ERROR\"i",
 					},
 					&notExpr{
-						pos: position{line: 2222, col: 33, offset: 68761},
+						pos: position{line: 2223, col: 33, offset: 68805},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2222, col: 34, offset: 68762},
+							pos:  position{line: 2223, col: 34, offset: 68806},
 							name: "IdentifierRest",
 						},
 					},
@@ -16257,20 +16277,20 @@ var g = &grammar{
 		},
 		{
 			name: "EVAL",
-			pos:  position{line: 2223, col: 1, offset: 68777},
+			pos:  position{line: 2224, col: 1, offset: 68821},
 			expr: &seqExpr{
-				pos: position{line: 2223, col: 14, offset: 68790},
+				pos: position{line: 2224, col: 14, offset: 68834},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2223, col: 14, offset: 68790},
+						pos:        position{line: 2224, col: 14, offset: 68834},
 						val:        "eval",
 						ignoreCase: true,
 						want:       "\"EVAL\"i",
 					},
 					&notExpr{
-						pos: position{line: 2223, col: 33, offset: 68809},
+						pos: position{line: 2224, col: 33, offset: 68853},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2223, col: 34, offset: 68810},
+							pos:  position{line: 2224, col: 34, offset: 68854},
 							name: "IdentifierRest",
 						},
 					},
@@ -16281,20 +16301,20 @@ var g = &grammar{
 		},
 		{
 			name: "EXPLODE",
-			pos:  position{line: 2224, col: 1, offset: 68825},
+			pos:  position{line: 2225, col: 1, offset: 68869},
 			expr: &seqExpr{
-				pos: position{line: 2224, col: 14, offset: 68838},
+				pos: position{line: 2225, col: 14, offset: 68882},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2224, col: 14, offset: 68838},
+						pos:        position{line: 2225, col: 14, offset: 68882},
 						val:        "explode",
 						ignoreCase: true,
 						want:       "\"EXPLODE\"i",
 					},
 					&notExpr{
-						pos: position{line: 2224, col: 33, offset: 68857},
+						pos: position{line: 2225, col: 33, offset: 68901},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2224, col: 34, offset: 68858},
+							pos:  position{line: 2225, col: 34, offset: 68902},
 							name: "IdentifierRest",
 						},
 					},
@@ -16305,20 +16325,20 @@ var g = &grammar{
 		},
 		{
 			name: "FALSE",
-			pos:  position{line: 2225, col: 1, offset: 68873},
+			pos:  position{line: 2226, col: 1, offset: 68917},
 			expr: &seqExpr{
-				pos: position{line: 2225, col: 14, offset: 68886},
+				pos: position{line: 2226, col: 14, offset: 68930},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2225, col: 14, offset: 68886},
+						pos:        position{line: 2226, col: 14, offset: 68930},
 						val:        "false",
 						ignoreCase: true,
 						want:       "\"FALSE\"i",
 					},
 					&notExpr{
-						pos: position{line: 2225, col: 33, offset: 68905},
+						pos: position{line: 2226, col: 33, offset: 68949},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2225, col: 34, offset: 68906},
+							pos:  position{line: 2226, col: 34, offset: 68950},
 							name: "IdentifierRest",
 						},
 					},
@@ -16329,20 +16349,20 @@ var g = &grammar{
 		},
 		{
 			name: "FIRST",
-			pos:  position{line: 2226, col: 1, offset: 68921},
+			pos:  position{line: 2227, col: 1, offset: 68965},
 			expr: &seqExpr{
-				pos: position{line: 2226, col: 14, offset: 68934},
+				pos: position{line: 2227, col: 14, offset: 68978},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2226, col: 14, offset: 68934},
+						pos:        position{line: 2227, col: 14, offset: 68978},
 						val:        "first",
 						ignoreCase: true,
 						want:       "\"FIRST\"i",
 					},
 					&notExpr{
-						pos: position{line: 2226, col: 33, offset: 68953},
+						pos: position{line: 2227, col: 33, offset: 68997},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2226, col: 34, offset: 68954},
+							pos:  position{line: 2227, col: 34, offset: 68998},
 							name: "IdentifierRest",
 						},
 					},
@@ -16353,20 +16373,20 @@ var g = &grammar{
 		},
 		{
 			name: "FORK",
-			pos:  position{line: 2227, col: 1, offset: 68969},
+			pos:  position{line: 2228, col: 1, offset: 69013},
 			expr: &seqExpr{
-				pos: position{line: 2227, col: 14, offset: 68982},
+				pos: position{line: 2228, col: 14, offset: 69026},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2227, col: 14, offset: 68982},
+						pos:        position{line: 2228, col: 14, offset: 69026},
 						val:        "fork",
 						ignoreCase: true,
 						want:       "\"FORK\"i",
 					},
 					&notExpr{
-						pos: position{line: 2227, col: 33, offset: 69001},
+						pos: position{line: 2228, col: 33, offset: 69045},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2227, col: 34, offset: 69002},
+							pos:  position{line: 2228, col: 34, offset: 69046},
 							name: "IdentifierRest",
 						},
 					},
@@ -16377,20 +16397,20 @@ var g = &grammar{
 		},
 		{
 			name: "FORMAT",
-			pos:  position{line: 2228, col: 1, offset: 69017},
+			pos:  position{line: 2229, col: 1, offset: 69061},
 			expr: &seqExpr{
-				pos: position{line: 2228, col: 14, offset: 69030},
+				pos: position{line: 2229, col: 14, offset: 69074},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2228, col: 14, offset: 69030},
+						pos:        position{line: 2229, col: 14, offset: 69074},
 						val:        "format",
 						ignoreCase: true,
 						want:       "\"FORMAT\"i",
 					},
 					&notExpr{
-						pos: position{line: 2228, col: 33, offset: 69049},
+						pos: position{line: 2229, col: 33, offset: 69093},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2228, col: 34, offset: 69050},
+							pos:  position{line: 2229, col: 34, offset: 69094},
 							name: "IdentifierRest",
 						},
 					},
@@ -16401,20 +16421,20 @@ var g = &grammar{
 		},
 		{
 			name: "FROM",
-			pos:  position{line: 2229, col: 1, offset: 69065},
+			pos:  position{line: 2230, col: 1, offset: 69109},
 			expr: &seqExpr{
-				pos: position{line: 2229, col: 14, offset: 69078},
+				pos: position{line: 2230, col: 14, offset: 69122},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2229, col: 14, offset: 69078},
+						pos:        position{line: 2230, col: 14, offset: 69122},
 						val:        "from",
 						ignoreCase: true,
 						want:       "\"FROM\"i",
 					},
 					&notExpr{
-						pos: position{line: 2229, col: 33, offset: 69097},
+						pos: position{line: 2230, col: 33, offset: 69141},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2229, col: 34, offset: 69098},
+							pos:  position{line: 2230, col: 34, offset: 69142},
 							name: "IdentifierRest",
 						},
 					},
@@ -16425,20 +16445,20 @@ var g = &grammar{
 		},
 		{
 			name: "FULL",
-			pos:  position{line: 2230, col: 1, offset: 69113},
+			pos:  position{line: 2231, col: 1, offset: 69157},
 			expr: &seqExpr{
-				pos: position{line: 2230, col: 14, offset: 69126},
+				pos: position{line: 2231, col: 14, offset: 69170},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2230, col: 14, offset: 69126},
+						pos:        position{line: 2231, col: 14, offset: 69170},
 						val:        "full",
 						ignoreCase: true,
 						want:       "\"FULL\"i",
 					},
 					&notExpr{
-						pos: position{line: 2230, col: 33, offset: 69145},
+						pos: position{line: 2231, col: 33, offset: 69189},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2230, col: 34, offset: 69146},
+							pos:  position{line: 2231, col: 34, offset: 69190},
 							name: "IdentifierRest",
 						},
 					},
@@ -16449,20 +16469,20 @@ var g = &grammar{
 		},
 		{
 			name: "FUNC",
-			pos:  position{line: 2231, col: 1, offset: 69161},
+			pos:  position{line: 2232, col: 1, offset: 69205},
 			expr: &seqExpr{
-				pos: position{line: 2231, col: 14, offset: 69174},
+				pos: position{line: 2232, col: 14, offset: 69218},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2231, col: 14, offset: 69174},
+						pos:        position{line: 2232, col: 14, offset: 69218},
 						val:        "func",
 						ignoreCase: true,
 						want:       "\"FUNC\"i",
 					},
 					&notExpr{
-						pos: position{line: 2231, col: 33, offset: 69193},
+						pos: position{line: 2232, col: 33, offset: 69237},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2231, col: 34, offset: 69194},
+							pos:  position{line: 2232, col: 34, offset: 69238},
 							name: "IdentifierRest",
 						},
 					},
@@ -16473,20 +16493,20 @@ var g = &grammar{
 		},
 		{
 			name: "FUSE",
-			pos:  position{line: 2232, col: 1, offset: 69209},
+			pos:  position{line: 2233, col: 1, offset: 69253},
 			expr: &seqExpr{
-				pos: position{line: 2232, col: 14, offset: 69222},
+				pos: position{line: 2233, col: 14, offset: 69266},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2232, col: 14, offset: 69222},
+						pos:        position{line: 2233, col: 14, offset: 69266},
 						val:        "fuse",
 						ignoreCase: true,
 						want:       "\"FUSE\"i",
 					},
 					&notExpr{
-						pos: position{line: 2232, col: 33, offset: 69241},
+						pos: position{line: 2233, col: 33, offset: 69285},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2232, col: 34, offset: 69242},
+							pos:  position{line: 2233, col: 34, offset: 69286},
 							name: "IdentifierRest",
 						},
 					},
@@ -16497,20 +16517,20 @@ var g = &grammar{
 		},
 		{
 			name: "GREP",
-			pos:  position{line: 2233, col: 1, offset: 69257},
+			pos:  position{line: 2234, col: 1, offset: 69301},
 			expr: &seqExpr{
-				pos: position{line: 2233, col: 14, offset: 69270},
+				pos: position{line: 2234, col: 14, offset: 69314},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2233, col: 14, offset: 69270},
+						pos:        position{line: 2234, col: 14, offset: 69314},
 						val:        "grep",
 						ignoreCase: true,
 						want:       "\"GREP\"i",
 					},
 					&notExpr{
-						pos: position{line: 2233, col: 33, offset: 69289},
+						pos: position{line: 2234, col: 33, offset: 69333},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2233, col: 34, offset: 69290},
+							pos:  position{line: 2234, col: 34, offset: 69334},
 							name: "IdentifierRest",
 						},
 					},
@@ -16521,20 +16541,20 @@ var g = &grammar{
 		},
 		{
 			name: "GROUP",
-			pos:  position{line: 2234, col: 1, offset: 69305},
+			pos:  position{line: 2235, col: 1, offset: 69349},
 			expr: &seqExpr{
-				pos: position{line: 2234, col: 14, offset: 69318},
+				pos: position{line: 2235, col: 14, offset: 69362},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2234, col: 14, offset: 69318},
+						pos:        position{line: 2235, col: 14, offset: 69362},
 						val:        "group",
 						ignoreCase: true,
 						want:       "\"GROUP\"i",
 					},
 					&notExpr{
-						pos: position{line: 2234, col: 33, offset: 69337},
+						pos: position{line: 2235, col: 33, offset: 69381},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2234, col: 34, offset: 69338},
+							pos:  position{line: 2235, col: 34, offset: 69382},
 							name: "IdentifierRest",
 						},
 					},
@@ -16545,20 +16565,20 @@ var g = &grammar{
 		},
 		{
 			name: "HAVING",
-			pos:  position{line: 2235, col: 1, offset: 69353},
+			pos:  position{line: 2236, col: 1, offset: 69397},
 			expr: &seqExpr{
-				pos: position{line: 2235, col: 14, offset: 69366},
+				pos: position{line: 2236, col: 14, offset: 69410},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2235, col: 14, offset: 69366},
+						pos:        position{line: 2236, col: 14, offset: 69410},
 						val:        "having",
 						ignoreCase: true,
 						want:       "\"HAVING\"i",
 					},
 					&notExpr{
-						pos: position{line: 2235, col: 33, offset: 69385},
+						pos: position{line: 2236, col: 33, offset: 69429},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2235, col: 34, offset: 69386},
+							pos:  position{line: 2236, col: 34, offset: 69430},
 							name: "IdentifierRest",
 						},
 					},
@@ -16569,20 +16589,20 @@ var g = &grammar{
 		},
 		{
 			name: "HEAD",
-			pos:  position{line: 2236, col: 1, offset: 69401},
+			pos:  position{line: 2237, col: 1, offset: 69445},
 			expr: &seqExpr{
-				pos: position{line: 2236, col: 14, offset: 69414},
+				pos: position{line: 2237, col: 14, offset: 69458},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2236, col: 14, offset: 69414},
+						pos:        position{line: 2237, col: 14, offset: 69458},
 						val:        "head",
 						ignoreCase: true,
 						want:       "\"HEAD\"i",
 					},
 					&notExpr{
-						pos: position{line: 2236, col: 33, offset: 69433},
+						pos: position{line: 2237, col: 33, offset: 69477},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2236, col: 34, offset: 69434},
+							pos:  position{line: 2237, col: 34, offset: 69478},
 							name: "IdentifierRest",
 						},
 					},
@@ -16593,20 +16613,20 @@ var g = &grammar{
 		},
 		{
 			name: "HEADERS",
-			pos:  position{line: 2237, col: 1, offset: 69450},
+			pos:  position{line: 2238, col: 1, offset: 69494},
 			expr: &seqExpr{
-				pos: position{line: 2237, col: 14, offset: 69463},
+				pos: position{line: 2238, col: 14, offset: 69507},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2237, col: 14, offset: 69463},
+						pos:        position{line: 2238, col: 14, offset: 69507},
 						val:        "headers",
 						ignoreCase: true,
 						want:       "\"HEADERS\"i",
 					},
 					&notExpr{
-						pos: position{line: 2237, col: 33, offset: 69482},
+						pos: position{line: 2238, col: 33, offset: 69526},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2237, col: 34, offset: 69483},
+							pos:  position{line: 2238, col: 34, offset: 69527},
 							name: "IdentifierRest",
 						},
 					},
@@ -16617,20 +16637,20 @@ var g = &grammar{
 		},
 		{
 			name: "IN",
-			pos:  position{line: 2238, col: 1, offset: 69498},
+			pos:  position{line: 2239, col: 1, offset: 69542},
 			expr: &seqExpr{
-				pos: position{line: 2238, col: 14, offset: 69511},
+				pos: position{line: 2239, col: 14, offset: 69555},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2238, col: 14, offset: 69511},
+						pos:        position{line: 2239, col: 14, offset: 69555},
 						val:        "in",
 						ignoreCase: true,
 						want:       "\"IN\"i",
 					},
 					&notExpr{
-						pos: position{line: 2238, col: 33, offset: 69530},
+						pos: position{line: 2239, col: 33, offset: 69574},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2238, col: 34, offset: 69531},
+							pos:  position{line: 2239, col: 34, offset: 69575},
 							name: "IdentifierRest",
 						},
 					},
@@ -16641,20 +16661,20 @@ var g = &grammar{
 		},
 		{
 			name: "INNER",
-			pos:  position{line: 2239, col: 1, offset: 69546},
+			pos:  position{line: 2240, col: 1, offset: 69590},
 			expr: &seqExpr{
-				pos: position{line: 2239, col: 14, offset: 69559},
+				pos: position{line: 2240, col: 14, offset: 69603},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2239, col: 14, offset: 69559},
+						pos:        position{line: 2240, col: 14, offset: 69603},
 						val:        "inner",
 						ignoreCase: true,
 						want:       "\"INNER\"i",
 					},
 					&notExpr{
-						pos: position{line: 2239, col: 33, offset: 69578},
+						pos: position{line: 2240, col: 33, offset: 69622},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2239, col: 34, offset: 69579},
+							pos:  position{line: 2240, col: 34, offset: 69623},
 							name: "IdentifierRest",
 						},
 					},
@@ -16665,20 +16685,20 @@ var g = &grammar{
 		},
 		{
 			name: "IS",
-			pos:  position{line: 2240, col: 1, offset: 69594},
+			pos:  position{line: 2241, col: 1, offset: 69638},
 			expr: &seqExpr{
-				pos: position{line: 2240, col: 14, offset: 69607},
+				pos: position{line: 2241, col: 14, offset: 69651},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2240, col: 14, offset: 69607},
+						pos:        position{line: 2241, col: 14, offset: 69651},
 						val:        "is",
 						ignoreCase: true,
 						want:       "\"IS\"i",
 					},
 					&notExpr{
-						pos: position{line: 2240, col: 33, offset: 69626},
+						pos: position{line: 2241, col: 33, offset: 69670},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2240, col: 34, offset: 69627},
+							pos:  position{line: 2241, col: 34, offset: 69671},
 							name: "IdentifierRest",
 						},
 					},
@@ -16689,20 +16709,20 @@ var g = &grammar{
 		},
 		{
 			name: "JOIN",
-			pos:  position{line: 2241, col: 1, offset: 69642},
+			pos:  position{line: 2242, col: 1, offset: 69686},
 			expr: &seqExpr{
-				pos: position{line: 2241, col: 14, offset: 69655},
+				pos: position{line: 2242, col: 14, offset: 69699},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2241, col: 14, offset: 69655},
+						pos:        position{line: 2242, col: 14, offset: 69699},
 						val:        "join",
 						ignoreCase: true,
 						want:       "\"JOIN\"i",
 					},
 					&notExpr{
-						pos: position{line: 2241, col: 33, offset: 69674},
+						pos: position{line: 2242, col: 33, offset: 69718},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2241, col: 34, offset: 69675},
+							pos:  position{line: 2242, col: 34, offset: 69719},
 							name: "IdentifierRest",
 						},
 					},
@@ -16713,20 +16733,20 @@ var g = &grammar{
 		},
 		{
 			name: "LAST",
-			pos:  position{line: 2242, col: 1, offset: 69690},
+			pos:  position{line: 2243, col: 1, offset: 69734},
 			expr: &seqExpr{
-				pos: position{line: 2242, col: 14, offset: 69703},
+				pos: position{line: 2243, col: 14, offset: 69747},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2242, col: 14, offset: 69703},
+						pos:        position{line: 2243, col: 14, offset: 69747},
 						val:        "last",
 						ignoreCase: true,
 						want:       "\"LAST\"i",
 					},
 					&notExpr{
-						pos: position{line: 2242, col: 33, offset: 69722},
+						pos: position{line: 2243, col: 33, offset: 69766},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2242, col: 34, offset: 69723},
+							pos:  position{line: 2243, col: 34, offset: 69767},
 							name: "IdentifierRest",
 						},
 					},
@@ -16737,20 +16757,20 @@ var g = &grammar{
 		},
 		{
 			name: "LEFT",
-			pos:  position{line: 2243, col: 1, offset: 69738},
+			pos:  position{line: 2244, col: 1, offset: 69782},
 			expr: &seqExpr{
-				pos: position{line: 2243, col: 14, offset: 69751},
+				pos: position{line: 2244, col: 14, offset: 69795},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2243, col: 14, offset: 69751},
+						pos:        position{line: 2244, col: 14, offset: 69795},
 						val:        "left",
 						ignoreCase: true,
 						want:       "\"LEFT\"i",
 					},
 					&notExpr{
-						pos: position{line: 2243, col: 33, offset: 69770},
+						pos: position{line: 2244, col: 33, offset: 69814},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2243, col: 34, offset: 69771},
+							pos:  position{line: 2244, col: 34, offset: 69815},
 							name: "IdentifierRest",
 						},
 					},
@@ -16761,20 +16781,20 @@ var g = &grammar{
 		},
 		{
 			name: "LIKE",
-			pos:  position{line: 2244, col: 1, offset: 69786},
+			pos:  position{line: 2245, col: 1, offset: 69830},
 			expr: &seqExpr{
-				pos: position{line: 2244, col: 14, offset: 69799},
+				pos: position{line: 2245, col: 14, offset: 69843},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2244, col: 14, offset: 69799},
+						pos:        position{line: 2245, col: 14, offset: 69843},
 						val:        "like",
 						ignoreCase: true,
 						want:       "\"LIKE\"i",
 					},
 					&notExpr{
-						pos: position{line: 2244, col: 32, offset: 69817},
+						pos: position{line: 2245, col: 32, offset: 69861},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2244, col: 33, offset: 69818},
+							pos:  position{line: 2245, col: 33, offset: 69862},
 							name: "IdentifierRest",
 						},
 					},
@@ -16785,20 +16805,20 @@ var g = &grammar{
 		},
 		{
 			name: "LIMIT",
-			pos:  position{line: 2245, col: 1, offset: 69833},
+			pos:  position{line: 2246, col: 1, offset: 69877},
 			expr: &seqExpr{
-				pos: position{line: 2245, col: 14, offset: 69846},
+				pos: position{line: 2246, col: 14, offset: 69890},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2245, col: 14, offset: 69846},
+						pos:        position{line: 2246, col: 14, offset: 69890},
 						val:        "limit",
 						ignoreCase: true,
 						want:       "\"LIMIT\"i",
 					},
 					&notExpr{
-						pos: position{line: 2245, col: 33, offset: 69865},
+						pos: position{line: 2246, col: 33, offset: 69909},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2245, col: 34, offset: 69866},
+							pos:  position{line: 2246, col: 34, offset: 69910},
 							name: "IdentifierRest",
 						},
 					},
@@ -16809,20 +16829,20 @@ var g = &grammar{
 		},
 		{
 			name: "LOAD",
-			pos:  position{line: 2246, col: 1, offset: 69881},
+			pos:  position{line: 2247, col: 1, offset: 69925},
 			expr: &seqExpr{
-				pos: position{line: 2246, col: 14, offset: 69894},
+				pos: position{line: 2247, col: 14, offset: 69938},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2246, col: 14, offset: 69894},
+						pos:        position{line: 2247, col: 14, offset: 69938},
 						val:        "load",
 						ignoreCase: true,
 						want:       "\"LOAD\"i",
 					},
 					&notExpr{
-						pos: position{line: 2246, col: 33, offset: 69913},
+						pos: position{line: 2247, col: 33, offset: 69957},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2246, col: 34, offset: 69914},
+							pos:  position{line: 2247, col: 34, offset: 69958},
 							name: "IdentifierRest",
 						},
 					},
@@ -16833,20 +16853,20 @@ var g = &grammar{
 		},
 		{
 			name: "MATERIALIZED",
-			pos:  position{line: 2247, col: 1, offset: 69929},
+			pos:  position{line: 2248, col: 1, offset: 69973},
 			expr: &seqExpr{
-				pos: position{line: 2247, col: 16, offset: 69944},
+				pos: position{line: 2248, col: 16, offset: 69988},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2247, col: 16, offset: 69944},
+						pos:        position{line: 2248, col: 16, offset: 69988},
 						val:        "materialized",
 						ignoreCase: true,
 						want:       "\"MATERIALIZED\"i",
 					},
 					&notExpr{
-						pos: position{line: 2247, col: 33, offset: 69961},
+						pos: position{line: 2248, col: 33, offset: 70005},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2247, col: 34, offset: 69962},
+							pos:  position{line: 2248, col: 34, offset: 70006},
 							name: "IdentifierRest",
 						},
 					},
@@ -16857,20 +16877,20 @@ var g = &grammar{
 		},
 		{
 			name: "MERGE",
-			pos:  position{line: 2248, col: 1, offset: 69977},
+			pos:  position{line: 2249, col: 1, offset: 70021},
 			expr: &seqExpr{
-				pos: position{line: 2248, col: 14, offset: 69990},
+				pos: position{line: 2249, col: 14, offset: 70034},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2248, col: 14, offset: 69990},
+						pos:        position{line: 2249, col: 14, offset: 70034},
 						val:        "merge",
 						ignoreCase: true,
 						want:       "\"MERGE\"i",
 					},
 					&notExpr{
-						pos: position{line: 2248, col: 33, offset: 70009},
+						pos: position{line: 2249, col: 33, offset: 70053},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2248, col: 34, offset: 70010},
+							pos:  position{line: 2249, col: 34, offset: 70054},
 							name: "IdentifierRest",
 						},
 					},
@@ -16881,20 +16901,20 @@ var g = &grammar{
 		},
 		{
 			name: "MESSAGE",
-			pos:  position{line: 2249, col: 1, offset: 70025},
+			pos:  position{line: 2250, col: 1, offset: 70069},
 			expr: &seqExpr{
-				pos: position{line: 2249, col: 14, offset: 70038},
+				pos: position{line: 2250, col: 14, offset: 70082},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2249, col: 14, offset: 70038},
+						pos:        position{line: 2250, col: 14, offset: 70082},
 						val:        "message",
 						ignoreCase: true,
 						want:       "\"MESSAGE\"i",
 					},
 					&notExpr{
-						pos: position{line: 2249, col: 33, offset: 70057},
+						pos: position{line: 2250, col: 33, offset: 70101},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2249, col: 34, offset: 70058},
+							pos:  position{line: 2250, col: 34, offset: 70102},
 							name: "IdentifierRest",
 						},
 					},
@@ -16905,20 +16925,20 @@ var g = &grammar{
 		},
 		{
 			name: "META",
-			pos:  position{line: 2250, col: 1, offset: 70073},
+			pos:  position{line: 2251, col: 1, offset: 70117},
 			expr: &seqExpr{
-				pos: position{line: 2250, col: 14, offset: 70086},
+				pos: position{line: 2251, col: 14, offset: 70130},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2250, col: 14, offset: 70086},
+						pos:        position{line: 2251, col: 14, offset: 70130},
 						val:        "meta",
 						ignoreCase: true,
 						want:       "\"META\"i",
 					},
 					&notExpr{
-						pos: position{line: 2250, col: 33, offset: 70105},
+						pos: position{line: 2251, col: 33, offset: 70149},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2250, col: 34, offset: 70106},
+							pos:  position{line: 2251, col: 34, offset: 70150},
 							name: "IdentifierRest",
 						},
 					},
@@ -16929,20 +16949,20 @@ var g = &grammar{
 		},
 		{
 			name: "METHOD",
-			pos:  position{line: 2251, col: 1, offset: 70121},
+			pos:  position{line: 2252, col: 1, offset: 70165},
 			expr: &seqExpr{
-				pos: position{line: 2251, col: 14, offset: 70134},
+				pos: position{line: 2252, col: 14, offset: 70178},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2251, col: 14, offset: 70134},
+						pos:        position{line: 2252, col: 14, offset: 70178},
 						val:        "method",
 						ignoreCase: true,
 						want:       "\"METHOD\"i",
 					},
 					&notExpr{
-						pos: position{line: 2251, col: 33, offset: 70153},
+						pos: position{line: 2252, col: 33, offset: 70197},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2251, col: 34, offset: 70154},
+							pos:  position{line: 2252, col: 34, offset: 70198},
 							name: "IdentifierRest",
 						},
 					},
@@ -16953,20 +16973,20 @@ var g = &grammar{
 		},
 		{
 			name: "NOT",
-			pos:  position{line: 2252, col: 1, offset: 70169},
+			pos:  position{line: 2253, col: 1, offset: 70213},
 			expr: &seqExpr{
-				pos: position{line: 2252, col: 14, offset: 70182},
+				pos: position{line: 2253, col: 14, offset: 70226},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2252, col: 14, offset: 70182},
+						pos:        position{line: 2253, col: 14, offset: 70226},
 						val:        "not",
 						ignoreCase: true,
 						want:       "\"NOT\"i",
 					},
 					&notExpr{
-						pos: position{line: 2252, col: 33, offset: 70201},
+						pos: position{line: 2253, col: 33, offset: 70245},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2252, col: 34, offset: 70202},
+							pos:  position{line: 2253, col: 34, offset: 70246},
 							name: "IdentifierRest",
 						},
 					},
@@ -16977,20 +16997,20 @@ var g = &grammar{
 		},
 		{
 			name: "NULL",
-			pos:  position{line: 2253, col: 1, offset: 70217},
+			pos:  position{line: 2254, col: 1, offset: 70261},
 			expr: &seqExpr{
-				pos: position{line: 2253, col: 14, offset: 70230},
+				pos: position{line: 2254, col: 14, offset: 70274},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2253, col: 14, offset: 70230},
+						pos:        position{line: 2254, col: 14, offset: 70274},
 						val:        "null",
 						ignoreCase: true,
 						want:       "\"NULL\"i",
 					},
 					&notExpr{
-						pos: position{line: 2253, col: 33, offset: 70249},
+						pos: position{line: 2254, col: 33, offset: 70293},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2253, col: 34, offset: 70250},
+							pos:  position{line: 2254, col: 34, offset: 70294},
 							name: "IdentifierRest",
 						},
 					},
@@ -17001,20 +17021,20 @@ var g = &grammar{
 		},
 		{
 			name: "NULLS",
-			pos:  position{line: 2254, col: 1, offset: 70265},
+			pos:  position{line: 2255, col: 1, offset: 70309},
 			expr: &seqExpr{
-				pos: position{line: 2254, col: 14, offset: 70278},
+				pos: position{line: 2255, col: 14, offset: 70322},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2254, col: 14, offset: 70278},
+						pos:        position{line: 2255, col: 14, offset: 70322},
 						val:        "nulls",
 						ignoreCase: true,
 						want:       "\"NULLS\"i",
 					},
 					&notExpr{
-						pos: position{line: 2254, col: 33, offset: 70297},
+						pos: position{line: 2255, col: 33, offset: 70341},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2254, col: 34, offset: 70298},
+							pos:  position{line: 2255, col: 34, offset: 70342},
 							name: "IdentifierRest",
 						},
 					},
@@ -17025,20 +17045,20 @@ var g = &grammar{
 		},
 		{
 			name: "OFFSET",
-			pos:  position{line: 2255, col: 1, offset: 70313},
+			pos:  position{line: 2256, col: 1, offset: 70357},
 			expr: &seqExpr{
-				pos: position{line: 2255, col: 14, offset: 70326},
+				pos: position{line: 2256, col: 14, offset: 70370},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2255, col: 14, offset: 70326},
+						pos:        position{line: 2256, col: 14, offset: 70370},
 						val:        "offset",
 						ignoreCase: true,
 						want:       "\"OFFSET\"i",
 					},
 					&notExpr{
-						pos: position{line: 2255, col: 33, offset: 70345},
+						pos: position{line: 2256, col: 33, offset: 70389},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2255, col: 34, offset: 70346},
+							pos:  position{line: 2256, col: 34, offset: 70390},
 							name: "IdentifierRest",
 						},
 					},
@@ -17049,20 +17069,20 @@ var g = &grammar{
 		},
 		{
 			name: "ON",
-			pos:  position{line: 2256, col: 1, offset: 70361},
+			pos:  position{line: 2257, col: 1, offset: 70405},
 			expr: &seqExpr{
-				pos: position{line: 2256, col: 14, offset: 70374},
+				pos: position{line: 2257, col: 14, offset: 70418},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2256, col: 14, offset: 70374},
+						pos:        position{line: 2257, col: 14, offset: 70418},
 						val:        "on",
 						ignoreCase: true,
 						want:       "\"ON\"i",
 					},
 					&notExpr{
-						pos: position{line: 2256, col: 33, offset: 70393},
+						pos: position{line: 2257, col: 33, offset: 70437},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2256, col: 34, offset: 70394},
+							pos:  position{line: 2257, col: 34, offset: 70438},
 							name: "IdentifierRest",
 						},
 					},
@@ -17073,20 +17093,20 @@ var g = &grammar{
 		},
 		{
 			name: "OP",
-			pos:  position{line: 2257, col: 1, offset: 70409},
+			pos:  position{line: 2258, col: 1, offset: 70453},
 			expr: &seqExpr{
-				pos: position{line: 2257, col: 14, offset: 70422},
+				pos: position{line: 2258, col: 14, offset: 70466},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2257, col: 14, offset: 70422},
+						pos:        position{line: 2258, col: 14, offset: 70466},
 						val:        "op",
 						ignoreCase: true,
 						want:       "\"OP\"i",
 					},
 					&notExpr{
-						pos: position{line: 2257, col: 33, offset: 70441},
+						pos: position{line: 2258, col: 33, offset: 70485},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2257, col: 34, offset: 70442},
+							pos:  position{line: 2258, col: 34, offset: 70486},
 							name: "IdentifierRest",
 						},
 					},
@@ -17097,23 +17117,23 @@ var g = &grammar{
 		},
 		{
 			name: "OR",
-			pos:  position{line: 2258, col: 1, offset: 70457},
+			pos:  position{line: 2259, col: 1, offset: 70501},
 			expr: &actionExpr{
-				pos: position{line: 2258, col: 14, offset: 70470},
+				pos: position{line: 2259, col: 14, offset: 70514},
 				run: (*parser).callonOR1,
 				expr: &seqExpr{
-					pos: position{line: 2258, col: 14, offset: 70470},
+					pos: position{line: 2259, col: 14, offset: 70514},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 2258, col: 14, offset: 70470},
+							pos:        position{line: 2259, col: 14, offset: 70514},
 							val:        "or",
 							ignoreCase: true,
 							want:       "\"OR\"i",
 						},
 						&notExpr{
-							pos: position{line: 2258, col: 33, offset: 70489},
+							pos: position{line: 2259, col: 33, offset: 70533},
 							expr: &ruleRefExpr{
-								pos:  position{line: 2258, col: 34, offset: 70490},
+								pos:  position{line: 2259, col: 34, offset: 70534},
 								name: "IdentifierRest",
 							},
 						},
@@ -17125,20 +17145,20 @@ var g = &grammar{
 		},
 		{
 			name: "ORDER",
-			pos:  position{line: 2259, col: 1, offset: 70526},
+			pos:  position{line: 2260, col: 1, offset: 70570},
 			expr: &seqExpr{
-				pos: position{line: 2259, col: 14, offset: 70539},
+				pos: position{line: 2260, col: 14, offset: 70583},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2259, col: 14, offset: 70539},
+						pos:        position{line: 2260, col: 14, offset: 70583},
 						val:        "order",
 						ignoreCase: true,
 						want:       "\"ORDER\"i",
 					},
 					&notExpr{
-						pos: position{line: 2259, col: 33, offset: 70558},
+						pos: position{line: 2260, col: 33, offset: 70602},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2259, col: 34, offset: 70559},
+							pos:  position{line: 2260, col: 34, offset: 70603},
 							name: "IdentifierRest",
 						},
 					},
@@ -17149,20 +17169,20 @@ var g = &grammar{
 		},
 		{
 			name: "ORDINALITY",
-			pos:  position{line: 2260, col: 1, offset: 70574},
+			pos:  position{line: 2261, col: 1, offset: 70618},
 			expr: &seqExpr{
-				pos: position{line: 2260, col: 14, offset: 70587},
+				pos: position{line: 2261, col: 14, offset: 70631},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2260, col: 14, offset: 70587},
+						pos:        position{line: 2261, col: 14, offset: 70631},
 						val:        "ordinality",
 						ignoreCase: true,
 						want:       "\"ORDINALITY\"i",
 					},
 					&notExpr{
-						pos: position{line: 2260, col: 33, offset: 70606},
+						pos: position{line: 2261, col: 33, offset: 70650},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2260, col: 34, offset: 70607},
+							pos:  position{line: 2261, col: 34, offset: 70651},
 							name: "IdentifierRest",
 						},
 					},
@@ -17173,20 +17193,20 @@ var g = &grammar{
 		},
 		{
 			name: "OUTER",
-			pos:  position{line: 2261, col: 1, offset: 70622},
+			pos:  position{line: 2262, col: 1, offset: 70666},
 			expr: &seqExpr{
-				pos: position{line: 2261, col: 14, offset: 70635},
+				pos: position{line: 2262, col: 14, offset: 70679},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2261, col: 14, offset: 70635},
+						pos:        position{line: 2262, col: 14, offset: 70679},
 						val:        "outer",
 						ignoreCase: true,
 						want:       "\"OUTER\"i",
 					},
 					&notExpr{
-						pos: position{line: 2261, col: 33, offset: 70654},
+						pos: position{line: 2262, col: 33, offset: 70698},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2261, col: 34, offset: 70655},
+							pos:  position{line: 2262, col: 34, offset: 70699},
 							name: "IdentifierRest",
 						},
 					},
@@ -17197,20 +17217,20 @@ var g = &grammar{
 		},
 		{
 			name: "OUTPUT",
-			pos:  position{line: 2262, col: 1, offset: 70670},
+			pos:  position{line: 2263, col: 1, offset: 70714},
 			expr: &seqExpr{
-				pos: position{line: 2262, col: 14, offset: 70683},
+				pos: position{line: 2263, col: 14, offset: 70727},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2262, col: 14, offset: 70683},
+						pos:        position{line: 2263, col: 14, offset: 70727},
 						val:        "output",
 						ignoreCase: true,
 						want:       "\"OUTPUT\"i",
 					},
 					&notExpr{
-						pos: position{line: 2262, col: 33, offset: 70702},
+						pos: position{line: 2263, col: 33, offset: 70746},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2262, col: 34, offset: 70703},
+							pos:  position{line: 2263, col: 34, offset: 70747},
 							name: "IdentifierRest",
 						},
 					},
@@ -17221,20 +17241,20 @@ var g = &grammar{
 		},
 		{
 			name: "OVER",
-			pos:  position{line: 2263, col: 1, offset: 70718},
+			pos:  position{line: 2264, col: 1, offset: 70762},
 			expr: &seqExpr{
-				pos: position{line: 2263, col: 14, offset: 70731},
+				pos: position{line: 2264, col: 14, offset: 70775},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2263, col: 14, offset: 70731},
+						pos:        position{line: 2264, col: 14, offset: 70775},
 						val:        "over",
 						ignoreCase: true,
 						want:       "\"OVER\"i",
 					},
 					&notExpr{
-						pos: position{line: 2263, col: 33, offset: 70750},
+						pos: position{line: 2264, col: 33, offset: 70794},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2263, col: 34, offset: 70751},
+							pos:  position{line: 2264, col: 34, offset: 70795},
 							name: "IdentifierRest",
 						},
 					},
@@ -17245,20 +17265,20 @@ var g = &grammar{
 		},
 		{
 			name: "PASS",
-			pos:  position{line: 2264, col: 1, offset: 70766},
+			pos:  position{line: 2265, col: 1, offset: 70810},
 			expr: &seqExpr{
-				pos: position{line: 2264, col: 14, offset: 70779},
+				pos: position{line: 2265, col: 14, offset: 70823},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2264, col: 14, offset: 70779},
+						pos:        position{line: 2265, col: 14, offset: 70823},
 						val:        "pass",
 						ignoreCase: true,
 						want:       "\"PASS\"i",
 					},
 					&notExpr{
-						pos: position{line: 2264, col: 33, offset: 70798},
+						pos: position{line: 2265, col: 33, offset: 70842},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2264, col: 34, offset: 70799},
+							pos:  position{line: 2265, col: 34, offset: 70843},
 							name: "IdentifierRest",
 						},
 					},
@@ -17269,20 +17289,20 @@ var g = &grammar{
 		},
 		{
 			name: "PUT",
-			pos:  position{line: 2265, col: 1, offset: 70814},
+			pos:  position{line: 2266, col: 1, offset: 70858},
 			expr: &seqExpr{
-				pos: position{line: 2265, col: 14, offset: 70827},
+				pos: position{line: 2266, col: 14, offset: 70871},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2265, col: 14, offset: 70827},
+						pos:        position{line: 2266, col: 14, offset: 70871},
 						val:        "put",
 						ignoreCase: true,
 						want:       "\"PUT\"i",
 					},
 					&notExpr{
-						pos: position{line: 2265, col: 33, offset: 70846},
+						pos: position{line: 2266, col: 33, offset: 70890},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2265, col: 34, offset: 70847},
+							pos:  position{line: 2266, col: 34, offset: 70891},
 							name: "IdentifierRest",
 						},
 					},
@@ -17293,20 +17313,20 @@ var g = &grammar{
 		},
 		{
 			name: "RECURSIVE",
-			pos:  position{line: 2266, col: 1, offset: 70862},
+			pos:  position{line: 2267, col: 1, offset: 70906},
 			expr: &seqExpr{
-				pos: position{line: 2266, col: 14, offset: 70875},
+				pos: position{line: 2267, col: 14, offset: 70919},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2266, col: 14, offset: 70875},
+						pos:        position{line: 2267, col: 14, offset: 70919},
 						val:        "RECURSIVE",
 						ignoreCase: false,
 						want:       "\"RECURSIVE\"",
 					},
 					&notExpr{
-						pos: position{line: 2266, col: 33, offset: 70894},
+						pos: position{line: 2267, col: 33, offset: 70938},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2266, col: 34, offset: 70895},
+							pos:  position{line: 2267, col: 34, offset: 70939},
 							name: "IdentifierRest",
 						},
 					},
@@ -17317,20 +17337,20 @@ var g = &grammar{
 		},
 		{
 			name: "REGEXP",
-			pos:  position{line: 2267, col: 1, offset: 70910},
+			pos:  position{line: 2268, col: 1, offset: 70954},
 			expr: &seqExpr{
-				pos: position{line: 2267, col: 14, offset: 70923},
+				pos: position{line: 2268, col: 14, offset: 70967},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2267, col: 14, offset: 70923},
+						pos:        position{line: 2268, col: 14, offset: 70967},
 						val:        "regexp",
 						ignoreCase: true,
 						want:       "\"REGEXP\"i",
 					},
 					&notExpr{
-						pos: position{line: 2267, col: 33, offset: 70942},
+						pos: position{line: 2268, col: 33, offset: 70986},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2267, col: 34, offset: 70943},
+							pos:  position{line: 2268, col: 34, offset: 70987},
 							name: "IdentifierRest",
 						},
 					},
@@ -17341,20 +17361,20 @@ var g = &grammar{
 		},
 		{
 			name: "REGEXP_REPLACE",
-			pos:  position{line: 2268, col: 1, offset: 70958},
+			pos:  position{line: 2269, col: 1, offset: 71002},
 			expr: &seqExpr{
-				pos: position{line: 2268, col: 18, offset: 70975},
+				pos: position{line: 2269, col: 18, offset: 71019},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2268, col: 18, offset: 70975},
+						pos:        position{line: 2269, col: 18, offset: 71019},
 						val:        "regexp_replace",
 						ignoreCase: true,
 						want:       "\"REGEXP_REPLACE\"i",
 					},
 					&notExpr{
-						pos: position{line: 2268, col: 36, offset: 70993},
+						pos: position{line: 2269, col: 36, offset: 71037},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2268, col: 37, offset: 70994},
+							pos:  position{line: 2269, col: 37, offset: 71038},
 							name: "IdentifierRest",
 						},
 					},
@@ -17365,20 +17385,20 @@ var g = &grammar{
 		},
 		{
 			name: "RENAME",
-			pos:  position{line: 2269, col: 1, offset: 71009},
+			pos:  position{line: 2270, col: 1, offset: 71053},
 			expr: &seqExpr{
-				pos: position{line: 2269, col: 14, offset: 71022},
+				pos: position{line: 2270, col: 14, offset: 71066},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2269, col: 14, offset: 71022},
+						pos:        position{line: 2270, col: 14, offset: 71066},
 						val:        "rename",
 						ignoreCase: true,
 						want:       "\"RENAME\"i",
 					},
 					&notExpr{
-						pos: position{line: 2269, col: 33, offset: 71041},
+						pos: position{line: 2270, col: 33, offset: 71085},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2269, col: 34, offset: 71042},
+							pos:  position{line: 2270, col: 34, offset: 71086},
 							name: "IdentifierRest",
 						},
 					},
@@ -17389,20 +17409,20 @@ var g = &grammar{
 		},
 		{
 			name: "RIGHT",
-			pos:  position{line: 2270, col: 1, offset: 71057},
+			pos:  position{line: 2271, col: 1, offset: 71101},
 			expr: &seqExpr{
-				pos: position{line: 2270, col: 14, offset: 71070},
+				pos: position{line: 2271, col: 14, offset: 71114},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2270, col: 14, offset: 71070},
+						pos:        position{line: 2271, col: 14, offset: 71114},
 						val:        "right",
 						ignoreCase: true,
 						want:       "\"RIGHT\"i",
 					},
 					&notExpr{
-						pos: position{line: 2270, col: 33, offset: 71089},
+						pos: position{line: 2271, col: 33, offset: 71133},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2270, col: 34, offset: 71090},
+							pos:  position{line: 2271, col: 34, offset: 71134},
 							name: "IdentifierRest",
 						},
 					},
@@ -17413,20 +17433,20 @@ var g = &grammar{
 		},
 		{
 			name: "SAMPLE",
-			pos:  position{line: 2271, col: 1, offset: 71105},
+			pos:  position{line: 2272, col: 1, offset: 71149},
 			expr: &seqExpr{
-				pos: position{line: 2271, col: 14, offset: 71118},
+				pos: position{line: 2272, col: 14, offset: 71162},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2271, col: 14, offset: 71118},
+						pos:        position{line: 2272, col: 14, offset: 71162},
 						val:        "sample",
 						ignoreCase: true,
 						want:       "\"SAMPLE\"i",
 					},
 					&notExpr{
-						pos: position{line: 2271, col: 33, offset: 71137},
+						pos: position{line: 2272, col: 33, offset: 71181},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2271, col: 34, offset: 71138},
+							pos:  position{line: 2272, col: 34, offset: 71182},
 							name: "IdentifierRest",
 						},
 					},
@@ -17437,20 +17457,20 @@ var g = &grammar{
 		},
 		{
 			name: "SEARCH",
-			pos:  position{line: 2272, col: 1, offset: 71153},
+			pos:  position{line: 2273, col: 1, offset: 71197},
 			expr: &seqExpr{
-				pos: position{line: 2272, col: 14, offset: 71166},
+				pos: position{line: 2273, col: 14, offset: 71210},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2272, col: 14, offset: 71166},
+						pos:        position{line: 2273, col: 14, offset: 71210},
 						val:        "search",
 						ignoreCase: true,
 						want:       "\"SEARCH\"i",
 					},
 					&notExpr{
-						pos: position{line: 2272, col: 33, offset: 71185},
+						pos: position{line: 2273, col: 33, offset: 71229},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2272, col: 34, offset: 71186},
+							pos:  position{line: 2273, col: 34, offset: 71230},
 							name: "IdentifierRest",
 						},
 					},
@@ -17461,20 +17481,20 @@ var g = &grammar{
 		},
 		{
 			name: "SELECT",
-			pos:  position{line: 2273, col: 1, offset: 71201},
+			pos:  position{line: 2274, col: 1, offset: 71245},
 			expr: &seqExpr{
-				pos: position{line: 2273, col: 14, offset: 71214},
+				pos: position{line: 2274, col: 14, offset: 71258},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2273, col: 14, offset: 71214},
+						pos:        position{line: 2274, col: 14, offset: 71258},
 						val:        "select",
 						ignoreCase: true,
 						want:       "\"SELECT\"i",
 					},
 					&notExpr{
-						pos: position{line: 2273, col: 33, offset: 71233},
+						pos: position{line: 2274, col: 33, offset: 71277},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2273, col: 34, offset: 71234},
+							pos:  position{line: 2274, col: 34, offset: 71278},
 							name: "IdentifierRest",
 						},
 					},
@@ -17485,20 +17505,20 @@ var g = &grammar{
 		},
 		{
 			name: "SHAPE",
-			pos:  position{line: 2274, col: 1, offset: 71249},
+			pos:  position{line: 2275, col: 1, offset: 71293},
 			expr: &seqExpr{
-				pos: position{line: 2274, col: 14, offset: 71262},
+				pos: position{line: 2275, col: 14, offset: 71306},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2274, col: 14, offset: 71262},
+						pos:        position{line: 2275, col: 14, offset: 71306},
 						val:        "shape",
 						ignoreCase: true,
 						want:       "\"SHAPE\"i",
 					},
 					&notExpr{
-						pos: position{line: 2274, col: 33, offset: 71281},
+						pos: position{line: 2275, col: 33, offset: 71325},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2274, col: 34, offset: 71282},
+							pos:  position{line: 2275, col: 34, offset: 71326},
 							name: "IdentifierRest",
 						},
 					},
@@ -17509,20 +17529,20 @@ var g = &grammar{
 		},
 		{
 			name: "SORT",
-			pos:  position{line: 2275, col: 1, offset: 71297},
+			pos:  position{line: 2276, col: 1, offset: 71341},
 			expr: &seqExpr{
-				pos: position{line: 2275, col: 14, offset: 71310},
+				pos: position{line: 2276, col: 14, offset: 71354},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2275, col: 14, offset: 71310},
+						pos:        position{line: 2276, col: 14, offset: 71354},
 						val:        "sort",
 						ignoreCase: true,
 						want:       "\"SORT\"i",
 					},
 					&notExpr{
-						pos: position{line: 2275, col: 33, offset: 71329},
+						pos: position{line: 2276, col: 33, offset: 71373},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2275, col: 34, offset: 71330},
+							pos:  position{line: 2276, col: 34, offset: 71374},
 							name: "IdentifierRest",
 						},
 					},
@@ -17533,20 +17553,20 @@ var g = &grammar{
 		},
 		{
 			name: "SUMMARIZE",
-			pos:  position{line: 2276, col: 1, offset: 71345},
+			pos:  position{line: 2277, col: 1, offset: 71389},
 			expr: &seqExpr{
-				pos: position{line: 2276, col: 14, offset: 71358},
+				pos: position{line: 2277, col: 14, offset: 71402},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2276, col: 14, offset: 71358},
+						pos:        position{line: 2277, col: 14, offset: 71402},
 						val:        "summarize",
 						ignoreCase: true,
 						want:       "\"SUMMARIZE\"i",
 					},
 					&notExpr{
-						pos: position{line: 2276, col: 33, offset: 71377},
+						pos: position{line: 2277, col: 33, offset: 71421},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2276, col: 34, offset: 71378},
+							pos:  position{line: 2277, col: 34, offset: 71422},
 							name: "IdentifierRest",
 						},
 					},
@@ -17557,20 +17577,20 @@ var g = &grammar{
 		},
 		{
 			name: "SWITCH",
-			pos:  position{line: 2277, col: 1, offset: 71393},
+			pos:  position{line: 2278, col: 1, offset: 71437},
 			expr: &seqExpr{
-				pos: position{line: 2277, col: 14, offset: 71406},
+				pos: position{line: 2278, col: 14, offset: 71450},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2277, col: 14, offset: 71406},
+						pos:        position{line: 2278, col: 14, offset: 71450},
 						val:        "switch",
 						ignoreCase: true,
 						want:       "\"SWITCH\"i",
 					},
 					&notExpr{
-						pos: position{line: 2277, col: 33, offset: 71425},
+						pos: position{line: 2278, col: 33, offset: 71469},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2277, col: 34, offset: 71426},
+							pos:  position{line: 2278, col: 34, offset: 71470},
 							name: "IdentifierRest",
 						},
 					},
@@ -17581,20 +17601,20 @@ var g = &grammar{
 		},
 		{
 			name: "TAIL",
-			pos:  position{line: 2278, col: 1, offset: 71441},
+			pos:  position{line: 2279, col: 1, offset: 71485},
 			expr: &seqExpr{
-				pos: position{line: 2278, col: 14, offset: 71454},
+				pos: position{line: 2279, col: 14, offset: 71498},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2278, col: 14, offset: 71454},
+						pos:        position{line: 2279, col: 14, offset: 71498},
 						val:        "tail",
 						ignoreCase: true,
 						want:       "\"TAIL\"i",
 					},
 					&notExpr{
-						pos: position{line: 2278, col: 33, offset: 71473},
+						pos: position{line: 2279, col: 33, offset: 71517},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2278, col: 34, offset: 71474},
+							pos:  position{line: 2279, col: 34, offset: 71518},
 							name: "IdentifierRest",
 						},
 					},
@@ -17605,20 +17625,20 @@ var g = &grammar{
 		},
 		{
 			name: "TAP",
-			pos:  position{line: 2279, col: 1, offset: 71490},
+			pos:  position{line: 2280, col: 1, offset: 71534},
 			expr: &seqExpr{
-				pos: position{line: 2279, col: 14, offset: 71503},
+				pos: position{line: 2280, col: 14, offset: 71547},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2279, col: 14, offset: 71503},
+						pos:        position{line: 2280, col: 14, offset: 71547},
 						val:        "tap",
 						ignoreCase: true,
 						want:       "\"TAP\"i",
 					},
 					&notExpr{
-						pos: position{line: 2279, col: 33, offset: 71522},
+						pos: position{line: 2280, col: 33, offset: 71566},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2279, col: 34, offset: 71523},
+							pos:  position{line: 2280, col: 34, offset: 71567},
 							name: "IdentifierRest",
 						},
 					},
@@ -17629,20 +17649,20 @@ var g = &grammar{
 		},
 		{
 			name: "THEN",
-			pos:  position{line: 2280, col: 1, offset: 71538},
+			pos:  position{line: 2281, col: 1, offset: 71582},
 			expr: &seqExpr{
-				pos: position{line: 2280, col: 14, offset: 71551},
+				pos: position{line: 2281, col: 14, offset: 71595},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2280, col: 14, offset: 71551},
+						pos:        position{line: 2281, col: 14, offset: 71595},
 						val:        "then",
 						ignoreCase: true,
 						want:       "\"THEN\"i",
 					},
 					&notExpr{
-						pos: position{line: 2280, col: 33, offset: 71570},
+						pos: position{line: 2281, col: 33, offset: 71614},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2280, col: 34, offset: 71571},
+							pos:  position{line: 2281, col: 34, offset: 71615},
 							name: "IdentifierRest",
 						},
 					},
@@ -17653,20 +17673,20 @@ var g = &grammar{
 		},
 		{
 			name: "TOP",
-			pos:  position{line: 2281, col: 1, offset: 71586},
+			pos:  position{line: 2282, col: 1, offset: 71630},
 			expr: &seqExpr{
-				pos: position{line: 2281, col: 14, offset: 71599},
+				pos: position{line: 2282, col: 14, offset: 71643},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2281, col: 14, offset: 71599},
+						pos:        position{line: 2282, col: 14, offset: 71643},
 						val:        "top",
 						ignoreCase: true,
 						want:       "\"TOP\"i",
 					},
 					&notExpr{
-						pos: position{line: 2281, col: 33, offset: 71618},
+						pos: position{line: 2282, col: 33, offset: 71662},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2281, col: 34, offset: 71619},
+							pos:  position{line: 2282, col: 34, offset: 71663},
 							name: "IdentifierRest",
 						},
 					},
@@ -17677,20 +17697,20 @@ var g = &grammar{
 		},
 		{
 			name: "TRUE",
-			pos:  position{line: 2282, col: 1, offset: 71634},
+			pos:  position{line: 2283, col: 1, offset: 71678},
 			expr: &seqExpr{
-				pos: position{line: 2282, col: 14, offset: 71647},
+				pos: position{line: 2283, col: 14, offset: 71691},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2282, col: 14, offset: 71647},
+						pos:        position{line: 2283, col: 14, offset: 71691},
 						val:        "true",
 						ignoreCase: true,
 						want:       "\"TRUE\"i",
 					},
 					&notExpr{
-						pos: position{line: 2282, col: 33, offset: 71666},
+						pos: position{line: 2283, col: 33, offset: 71710},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2282, col: 34, offset: 71667},
+							pos:  position{line: 2283, col: 34, offset: 71711},
 							name: "IdentifierRest",
 						},
 					},
@@ -17701,20 +17721,20 @@ var g = &grammar{
 		},
 		{
 			name: "TYPE",
-			pos:  position{line: 2283, col: 1, offset: 71682},
+			pos:  position{line: 2284, col: 1, offset: 71726},
 			expr: &seqExpr{
-				pos: position{line: 2283, col: 14, offset: 71695},
+				pos: position{line: 2284, col: 14, offset: 71739},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2283, col: 14, offset: 71695},
+						pos:        position{line: 2284, col: 14, offset: 71739},
 						val:        "type",
 						ignoreCase: true,
 						want:       "\"TYPE\"i",
 					},
 					&notExpr{
-						pos: position{line: 2283, col: 33, offset: 71714},
+						pos: position{line: 2284, col: 33, offset: 71758},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2283, col: 34, offset: 71715},
+							pos:  position{line: 2284, col: 34, offset: 71759},
 							name: "IdentifierRest",
 						},
 					},
@@ -17725,20 +17745,20 @@ var g = &grammar{
 		},
 		{
 			name: "UNION",
-			pos:  position{line: 2284, col: 1, offset: 71730},
+			pos:  position{line: 2285, col: 1, offset: 71774},
 			expr: &seqExpr{
-				pos: position{line: 2284, col: 14, offset: 71743},
+				pos: position{line: 2285, col: 14, offset: 71787},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2284, col: 14, offset: 71743},
+						pos:        position{line: 2285, col: 14, offset: 71787},
 						val:        "union",
 						ignoreCase: true,
 						want:       "\"UNION\"i",
 					},
 					&notExpr{
-						pos: position{line: 2284, col: 33, offset: 71762},
+						pos: position{line: 2285, col: 33, offset: 71806},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2284, col: 34, offset: 71763},
+							pos:  position{line: 2285, col: 34, offset: 71807},
 							name: "IdentifierRest",
 						},
 					},
@@ -17749,20 +17769,20 @@ var g = &grammar{
 		},
 		{
 			name: "UNIQ",
-			pos:  position{line: 2285, col: 1, offset: 71778},
+			pos:  position{line: 2286, col: 1, offset: 71822},
 			expr: &seqExpr{
-				pos: position{line: 2285, col: 14, offset: 71791},
+				pos: position{line: 2286, col: 14, offset: 71835},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2285, col: 14, offset: 71791},
+						pos:        position{line: 2286, col: 14, offset: 71835},
 						val:        "uniq",
 						ignoreCase: true,
 						want:       "\"UNIQ\"i",
 					},
 					&notExpr{
-						pos: position{line: 2285, col: 33, offset: 71810},
+						pos: position{line: 2286, col: 33, offset: 71854},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2285, col: 34, offset: 71811},
+							pos:  position{line: 2286, col: 34, offset: 71855},
 							name: "IdentifierRest",
 						},
 					},
@@ -17773,20 +17793,20 @@ var g = &grammar{
 		},
 		{
 			name: "UNNEST",
-			pos:  position{line: 2286, col: 1, offset: 71827},
+			pos:  position{line: 2287, col: 1, offset: 71871},
 			expr: &seqExpr{
-				pos: position{line: 2286, col: 14, offset: 71840},
+				pos: position{line: 2287, col: 14, offset: 71884},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2286, col: 14, offset: 71840},
+						pos:        position{line: 2287, col: 14, offset: 71884},
 						val:        "unnest",
 						ignoreCase: true,
 						want:       "\"UNNEST\"i",
 					},
 					&notExpr{
-						pos: position{line: 2286, col: 33, offset: 71859},
+						pos: position{line: 2287, col: 33, offset: 71903},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2286, col: 34, offset: 71860},
+							pos:  position{line: 2287, col: 34, offset: 71904},
 							name: "IdentifierRest",
 						},
 					},
@@ -17797,20 +17817,20 @@ var g = &grammar{
 		},
 		{
 			name: "USING",
-			pos:  position{line: 2287, col: 1, offset: 71875},
+			pos:  position{line: 2288, col: 1, offset: 71919},
 			expr: &seqExpr{
-				pos: position{line: 2287, col: 14, offset: 71888},
+				pos: position{line: 2288, col: 14, offset: 71932},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2287, col: 14, offset: 71888},
+						pos:        position{line: 2288, col: 14, offset: 71932},
 						val:        "using",
 						ignoreCase: true,
 						want:       "\"USING\"i",
 					},
 					&notExpr{
-						pos: position{line: 2287, col: 33, offset: 71907},
+						pos: position{line: 2288, col: 33, offset: 71951},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2287, col: 34, offset: 71908},
+							pos:  position{line: 2288, col: 34, offset: 71952},
 							name: "IdentifierRest",
 						},
 					},
@@ -17821,20 +17841,20 @@ var g = &grammar{
 		},
 		{
 			name: "VALUE",
-			pos:  position{line: 2288, col: 1, offset: 71923},
+			pos:  position{line: 2289, col: 1, offset: 71967},
 			expr: &seqExpr{
-				pos: position{line: 2288, col: 14, offset: 71936},
+				pos: position{line: 2289, col: 14, offset: 71980},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2288, col: 14, offset: 71936},
+						pos:        position{line: 2289, col: 14, offset: 71980},
 						val:        "value",
 						ignoreCase: true,
 						want:       "\"VALUE\"i",
 					},
 					&notExpr{
-						pos: position{line: 2288, col: 33, offset: 71955},
+						pos: position{line: 2289, col: 33, offset: 71999},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2288, col: 34, offset: 71956},
+							pos:  position{line: 2289, col: 34, offset: 72000},
 							name: "IdentifierRest",
 						},
 					},
@@ -17845,20 +17865,20 @@ var g = &grammar{
 		},
 		{
 			name: "WHEN",
-			pos:  position{line: 2289, col: 1, offset: 71971},
+			pos:  position{line: 2290, col: 1, offset: 72015},
 			expr: &seqExpr{
-				pos: position{line: 2289, col: 14, offset: 71984},
+				pos: position{line: 2290, col: 14, offset: 72028},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2289, col: 14, offset: 71984},
+						pos:        position{line: 2290, col: 14, offset: 72028},
 						val:        "when",
 						ignoreCase: true,
 						want:       "\"WHEN\"i",
 					},
 					&notExpr{
-						pos: position{line: 2289, col: 33, offset: 72003},
+						pos: position{line: 2290, col: 33, offset: 72047},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2289, col: 34, offset: 72004},
+							pos:  position{line: 2290, col: 34, offset: 72048},
 							name: "IdentifierRest",
 						},
 					},
@@ -17869,20 +17889,20 @@ var g = &grammar{
 		},
 		{
 			name: "WHERE",
-			pos:  position{line: 2290, col: 1, offset: 72019},
+			pos:  position{line: 2291, col: 1, offset: 72063},
 			expr: &seqExpr{
-				pos: position{line: 2290, col: 14, offset: 72032},
+				pos: position{line: 2291, col: 14, offset: 72076},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2290, col: 14, offset: 72032},
+						pos:        position{line: 2291, col: 14, offset: 72076},
 						val:        "where",
 						ignoreCase: true,
 						want:       "\"WHERE\"i",
 					},
 					&notExpr{
-						pos: position{line: 2290, col: 33, offset: 72051},
+						pos: position{line: 2291, col: 33, offset: 72095},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2290, col: 34, offset: 72052},
+							pos:  position{line: 2291, col: 34, offset: 72096},
 							name: "IdentifierRest",
 						},
 					},
@@ -17893,20 +17913,20 @@ var g = &grammar{
 		},
 		{
 			name: "WITH",
-			pos:  position{line: 2291, col: 1, offset: 72067},
+			pos:  position{line: 2292, col: 1, offset: 72111},
 			expr: &seqExpr{
-				pos: position{line: 2291, col: 14, offset: 72080},
+				pos: position{line: 2292, col: 14, offset: 72124},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2291, col: 14, offset: 72080},
+						pos:        position{line: 2292, col: 14, offset: 72124},
 						val:        "with",
 						ignoreCase: true,
 						want:       "\"WITH\"i",
 					},
 					&notExpr{
-						pos: position{line: 2291, col: 33, offset: 72099},
+						pos: position{line: 2292, col: 33, offset: 72143},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2291, col: 34, offset: 72100},
+							pos:  position{line: 2292, col: 34, offset: 72144},
 							name: "IdentifierRest",
 						},
 					},
@@ -17917,20 +17937,20 @@ var g = &grammar{
 		},
 		{
 			name: "YIELD",
-			pos:  position{line: 2292, col: 1, offset: 72115},
+			pos:  position{line: 2293, col: 1, offset: 72159},
 			expr: &seqExpr{
-				pos: position{line: 2292, col: 14, offset: 72128},
+				pos: position{line: 2293, col: 14, offset: 72172},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 2292, col: 14, offset: 72128},
+						pos:        position{line: 2293, col: 14, offset: 72172},
 						val:        "yield",
 						ignoreCase: true,
 						want:       "\"YIELD\"i",
 					},
 					&notExpr{
-						pos: position{line: 2292, col: 33, offset: 72147},
+						pos: position{line: 2293, col: 33, offset: 72191},
 						expr: &ruleRefExpr{
-							pos:  position{line: 2292, col: 34, offset: 72148},
+							pos:  position{line: 2293, col: 34, offset: 72192},
 							name: "IdentifierRest",
 						},
 					},
diff --git a/compiler/parser/parser.peg b/compiler/parser/parser.peg
index 48a7679f2d..dbb7b980ce 100644
--- a/compiler/parser/parser.peg
+++ b/compiler/parser/parser.peg
@@ -1108,7 +1108,7 @@ Primary
   / "(" __ expr:Expr __ ")" { return expr, nil }
 
 CaseExpr
-  = CASE cases:When+ else_:(_ "else" _ Expr)? _ END (_ CASE)? {
+  = CASE cases:When+ else_:(_ ELSE _ Expr)? _ END (_ CASE)? {
         whens := sliceOf[ast.When](cases)
         cond := &ast.Conditional{
             Kind: "Conditional",
@@ -1132,7 +1132,7 @@ CaseExpr
         }
         return cond, nil
     }
-  / CASE _ expr:Expr whens:When+ else_:(_ "else" _ Expr)? _ END (_ CASE)?  {
+  / CASE _ expr:Expr whens:When+ else_:(_ ELSE _ Expr)? _ END (_ CASE)?  {
         cond := &ast.CaseExpr{
             Kind: "CaseExpr",
             Expr: expr.(ast.Expr),
@@ -2218,6 +2218,7 @@ DEFAULT    = "DEFAULT"i         !IdentifierRest
 DESC       = "DESC"i            !IdentifierRest { return "desc", nil }
 DISTINCT   = "DISTINCT"i        !IdentifierRest
 DROP       = "DROP"i            !IdentifierRest 
+ELSE       = "ELSE"i            !IdentifierRest
 END        = "END"i             !IdentifierRest
 ERROR      = "ERROR"i           !IdentifierRest
 EVAL       = "EVAL"i            !IdentifierRest
diff --git a/compiler/parser/ztests/case-upper.yaml b/compiler/parser/ztests/case-upper.yaml
new file mode 100644
index 0000000000..5f628ec646
--- /dev/null
+++ b/compiler/parser/ztests/case-upper.yaml
@@ -0,0 +1,30 @@
+script: super -z -I query.sql
+
+inputs:
+  - name: query.sql
+    data: |
+      SELECT OrderID, Quantity,
+      CASE
+          WHEN Quantity > 30 THEN 'The quantity is greater than 30'
+          WHEN Quantity = 30 THEN 'The quantity is 30'
+          ELSE 'The quantity is under 30'
+      END AS QuantityText
+      FROM order_details.csv;
+
+  - name: order_details.csv
+    data: |
+      OrderID,Quantity
+      1,10
+      2,20
+      3,35
+      4,20
+      5,30
+
+outputs:
+  - name: stdout
+    data: |
+      {OrderID:1.,Quantity:10.,QuantityText:"The quantity is under 30"}
+      {OrderID:2.,Quantity:20.,QuantityText:"The quantity is under 30"}
+      {OrderID:3.,Quantity:35.,QuantityText:"The quantity is greater than 30"}
+      {OrderID:4.,Quantity:20.,QuantityText:"The quantity is under 30"}
+      {OrderID:5.,Quantity:30.,QuantityText:"The quantity is 30"}