diff --git a/compiler/ast/ast.go b/compiler/ast/ast.go
index d08b73abae..42d28f2906 100644
--- a/compiler/ast/ast.go
+++ b/compiler/ast/ast.go
@@ -297,6 +297,47 @@ type OverExpr struct {
 func (o *OverExpr) Pos() int { return o.KeywordPos }
 func (o *OverExpr) End() int { return o.Body.End() }
 
+type FString struct {
+	Kind     string        `json:"kind" unpack:""`
+	StartPos int           `json:"start_pos"`
+	Elems    []FStringElem `json:"elems"`
+}
+
+func (f *FString) Pos() int { return f.StartPos }
+func (f *FString) End() int {
+	if n := len(f.Elems); n > 0 {
+		return f.Elems[n-1].End() + 1
+	}
+	return f.StartPos + 3
+}
+
+type FStringElem interface {
+	Node
+	FStringElem()
+}
+
+type FStringText struct {
+	Kind    string `json:"kind" unpack:""`
+	Text    string `json:"text"`
+	TextPos int    `json:"text_pos"`
+}
+
+func (f *FStringText) Pos() int { return f.TextPos }
+func (f *FStringText) End() int { return f.TextPos + len(f.Text) }
+
+type FStringExpr struct {
+	Kind   string `json:"kind" unpack:""`
+	Lbrace int    `json:"lbrace"`
+	Expr   Expr   `json:"expr"`
+	Rbrace int    `json:"rbrace"`
+}
+
+func (f *FStringExpr) Pos() int { return f.Lbrace }
+func (f *FStringExpr) End() int { return f.Rbrace + 1 }
+
+func (*FStringText) FStringElem() {}
+func (*FStringExpr) FStringElem() {}
+
 func (*UnaryExpr) ExprAST()   {}
 func (*BinaryExpr) ExprAST()  {}
 func (*Conditional) ExprAST() {}
@@ -318,6 +359,7 @@ func (*ArrayExpr) ExprAST()  {}
 func (*SetExpr) ExprAST()    {}
 func (*MapExpr) ExprAST()    {}
 func (*OverExpr) ExprAST()   {}
+func (*FString) ExprAST()    {}
 
 type ConstDecl struct {
 	Kind       string `json:"kind" unpack:""`
diff --git a/compiler/ast/unpack.go b/compiler/ast/unpack.go
index fadbac9cb0..45773fbe5a 100644
--- a/compiler/ast/unpack.go
+++ b/compiler/ast/unpack.go
@@ -30,6 +30,9 @@ var unpacker = unpack.New(
 	Field{},
 	File{},
 	From{},
+	FString{},
+	FStringExpr{},
+	FStringText{},
 	FuncDecl{},
 	Fuse{},
 	Summarize{},
diff --git a/compiler/ast/zed/value.go b/compiler/ast/zed/value.go
index 6a1839abce..5f51a6489d 100644
--- a/compiler/ast/zed/value.go
+++ b/compiler/ast/zed/value.go
@@ -97,5 +97,14 @@ func (*TypeValue) ExprDAG() {}
 func (x *Primitive) Pos() int { return x.TextPos }
 func (x *TypeValue) Pos() int { return x.Lbrack }
 
-func (x *Primitive) End() int { return x.TextPos + len(x.Text) }
+func (x *Primitive) End() int {
+	// If Primitive type is string we need to adjust the end for quotations
+	// marks since they are currently not captured in the Value string. They
+	// should be but this will require a change to the ZSON lexer as well as
+	// the Zed parser.
+	if x.Type == "string" {
+		return x.TextPos + len(x.Text) + 2
+	}
+	return x.TextPos + len(x.Text)
+}
 func (x *TypeValue) End() int { return x.Rbrack + 1 }
diff --git a/compiler/parser/parser.go b/compiler/parser/parser.go
index 4b6ceaf68b..860e4fbd89 100644
--- a/compiler/parser/parser.go
+++ b/compiler/parser/parser.go
@@ -7885,42 +7885,46 @@ var g = &grammar{
 					},
 					&ruleRefExpr{
 						pos:  position{line: 1154, col: 5, offset: 28496},
-						name: "TemplateLiteral",
+						name: "StringLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1155, col: 5, offset: 28516},
+						pos:  position{line: 1155, col: 5, offset: 28514},
+						name: "FString",
+					},
+					&ruleRefExpr{
+						pos:  position{line: 1156, col: 5, offset: 28526},
 						name: "SubnetLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1156, col: 5, offset: 28534},
+						pos:  position{line: 1157, col: 5, offset: 28544},
 						name: "AddressLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1157, col: 5, offset: 28553},
+						pos:  position{line: 1158, col: 5, offset: 28563},
 						name: "BytesLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1158, col: 5, offset: 28570},
+						pos:  position{line: 1159, col: 5, offset: 28580},
 						name: "Duration",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1159, col: 5, offset: 28583},
+						pos:  position{line: 1160, col: 5, offset: 28593},
 						name: "Time",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1160, col: 5, offset: 28592},
+						pos:  position{line: 1161, col: 5, offset: 28602},
 						name: "FloatLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1161, col: 5, offset: 28609},
+						pos:  position{line: 1162, col: 5, offset: 28619},
 						name: "IntegerLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1162, col: 5, offset: 28628},
+						pos:  position{line: 1163, col: 5, offset: 28638},
 						name: "BooleanLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1163, col: 5, offset: 28647},
+						pos:  position{line: 1164, col: 5, offset: 28657},
 						name: "NullLiteral",
 					},
 				},
@@ -7930,28 +7934,28 @@ var g = &grammar{
 		},
 		{
 			name: "SubnetLiteral",
-			pos:  position{line: 1165, col: 1, offset: 28660},
+			pos:  position{line: 1166, col: 1, offset: 28670},
 			expr: &choiceExpr{
-				pos: position{line: 1166, col: 5, offset: 28678},
+				pos: position{line: 1167, col: 5, offset: 28688},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1166, col: 5, offset: 28678},
+						pos: position{line: 1167, col: 5, offset: 28688},
 						run: (*parser).callonSubnetLiteral2,
 						expr: &seqExpr{
-							pos: position{line: 1166, col: 5, offset: 28678},
+							pos: position{line: 1167, col: 5, offset: 28688},
 							exprs: []any{
 								&labeledExpr{
-									pos:   position{line: 1166, col: 5, offset: 28678},
+									pos:   position{line: 1167, col: 5, offset: 28688},
 									label: "v",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1166, col: 7, offset: 28680},
+										pos:  position{line: 1167, col: 7, offset: 28690},
 										name: "IP6Net",
 									},
 								},
 								&notExpr{
-									pos: position{line: 1166, col: 14, offset: 28687},
+									pos: position{line: 1167, col: 14, offset: 28697},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1166, col: 15, offset: 28688},
+										pos:  position{line: 1167, col: 15, offset: 28698},
 										name: "IdentifierRest",
 									},
 								},
@@ -7959,13 +7963,13 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1169, col: 5, offset: 28768},
+						pos: position{line: 1170, col: 5, offset: 28778},
 						run: (*parser).callonSubnetLiteral8,
 						expr: &labeledExpr{
-							pos:   position{line: 1169, col: 5, offset: 28768},
+							pos:   position{line: 1170, col: 5, offset: 28778},
 							label: "v",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1169, col: 7, offset: 28770},
+								pos:  position{line: 1170, col: 7, offset: 28780},
 								name: "IP4Net",
 							},
 						},
@@ -7977,28 +7981,28 @@ var g = &grammar{
 		},
 		{
 			name: "AddressLiteral",
-			pos:  position{line: 1173, col: 1, offset: 28839},
+			pos:  position{line: 1174, col: 1, offset: 28849},
 			expr: &choiceExpr{
-				pos: position{line: 1174, col: 5, offset: 28858},
+				pos: position{line: 1175, col: 5, offset: 28868},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1174, col: 5, offset: 28858},
+						pos: position{line: 1175, col: 5, offset: 28868},
 						run: (*parser).callonAddressLiteral2,
 						expr: &seqExpr{
-							pos: position{line: 1174, col: 5, offset: 28858},
+							pos: position{line: 1175, col: 5, offset: 28868},
 							exprs: []any{
 								&labeledExpr{
-									pos:   position{line: 1174, col: 5, offset: 28858},
+									pos:   position{line: 1175, col: 5, offset: 28868},
 									label: "v",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1174, col: 7, offset: 28860},
+										pos:  position{line: 1175, col: 7, offset: 28870},
 										name: "IP6",
 									},
 								},
 								&notExpr{
-									pos: position{line: 1174, col: 11, offset: 28864},
+									pos: position{line: 1175, col: 11, offset: 28874},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1174, col: 12, offset: 28865},
+										pos:  position{line: 1175, col: 12, offset: 28875},
 										name: "IdentifierRest",
 									},
 								},
@@ -8006,13 +8010,13 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1177, col: 5, offset: 28944},
+						pos: position{line: 1178, col: 5, offset: 28954},
 						run: (*parser).callonAddressLiteral8,
 						expr: &labeledExpr{
-							pos:   position{line: 1177, col: 5, offset: 28944},
+							pos:   position{line: 1178, col: 5, offset: 28954},
 							label: "v",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1177, col: 7, offset: 28946},
+								pos:  position{line: 1178, col: 7, offset: 28956},
 								name: "IP",
 							},
 						},
@@ -8024,15 +8028,15 @@ var g = &grammar{
 		},
 		{
 			name: "FloatLiteral",
-			pos:  position{line: 1181, col: 1, offset: 29010},
+			pos:  position{line: 1182, col: 1, offset: 29020},
 			expr: &actionExpr{
-				pos: position{line: 1182, col: 5, offset: 29027},
+				pos: position{line: 1183, col: 5, offset: 29037},
 				run: (*parser).callonFloatLiteral1,
 				expr: &labeledExpr{
-					pos:   position{line: 1182, col: 5, offset: 29027},
+					pos:   position{line: 1183, col: 5, offset: 29037},
 					label: "v",
 					expr: &ruleRefExpr{
-						pos:  position{line: 1182, col: 7, offset: 29029},
+						pos:  position{line: 1183, col: 7, offset: 29039},
 						name: "FloatString",
 					},
 				},
@@ -8042,15 +8046,15 @@ var g = &grammar{
 		},
 		{
 			name: "IntegerLiteral",
-			pos:  position{line: 1186, col: 1, offset: 29107},
+			pos:  position{line: 1187, col: 1, offset: 29117},
 			expr: &actionExpr{
-				pos: position{line: 1187, col: 5, offset: 29126},
+				pos: position{line: 1188, col: 5, offset: 29136},
 				run: (*parser).callonIntegerLiteral1,
 				expr: &labeledExpr{
-					pos:   position{line: 1187, col: 5, offset: 29126},
+					pos:   position{line: 1188, col: 5, offset: 29136},
 					label: "v",
 					expr: &ruleRefExpr{
-						pos:  position{line: 1187, col: 7, offset: 29128},
+						pos:  position{line: 1188, col: 7, offset: 29138},
 						name: "IntString",
 					},
 				},
@@ -8060,23 +8064,23 @@ var g = &grammar{
 		},
 		{
 			name: "BooleanLiteral",
-			pos:  position{line: 1191, col: 1, offset: 29202},
+			pos:  position{line: 1192, col: 1, offset: 29212},
 			expr: &choiceExpr{
-				pos: position{line: 1192, col: 5, offset: 29221},
+				pos: position{line: 1193, col: 5, offset: 29231},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1192, col: 5, offset: 29221},
+						pos: position{line: 1193, col: 5, offset: 29231},
 						run: (*parser).callonBooleanLiteral2,
 						expr: &ruleRefExpr{
-							pos:  position{line: 1192, col: 5, offset: 29221},
+							pos:  position{line: 1193, col: 5, offset: 29231},
 							name: "TrueToken",
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1193, col: 5, offset: 29284},
+						pos: position{line: 1194, col: 5, offset: 29294},
 						run: (*parser).callonBooleanLiteral4,
 						expr: &ruleRefExpr{
-							pos:  position{line: 1193, col: 5, offset: 29284},
+							pos:  position{line: 1194, col: 5, offset: 29294},
 							name: "FalseToken",
 						},
 					},
@@ -8087,12 +8091,12 @@ var g = &grammar{
 		},
 		{
 			name: "NullLiteral",
-			pos:  position{line: 1195, col: 1, offset: 29345},
+			pos:  position{line: 1196, col: 1, offset: 29355},
 			expr: &actionExpr{
-				pos: position{line: 1196, col: 5, offset: 29361},
+				pos: position{line: 1197, col: 5, offset: 29371},
 				run: (*parser).callonNullLiteral1,
 				expr: &ruleRefExpr{
-					pos:  position{line: 1196, col: 5, offset: 29361},
+					pos:  position{line: 1197, col: 5, offset: 29371},
 					name: "NullToken",
 				},
 			},
@@ -8101,23 +8105,23 @@ var g = &grammar{
 		},
 		{
 			name: "BytesLiteral",
-			pos:  position{line: 1198, col: 1, offset: 29416},
+			pos:  position{line: 1199, col: 1, offset: 29426},
 			expr: &actionExpr{
-				pos: position{line: 1199, col: 5, offset: 29433},
+				pos: position{line: 1200, col: 5, offset: 29443},
 				run: (*parser).callonBytesLiteral1,
 				expr: &seqExpr{
-					pos: position{line: 1199, col: 5, offset: 29433},
+					pos: position{line: 1200, col: 5, offset: 29443},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1199, col: 5, offset: 29433},
+							pos:        position{line: 1200, col: 5, offset: 29443},
 							val:        "0x",
 							ignoreCase: false,
 							want:       "\"0x\"",
 						},
 						&zeroOrMoreExpr{
-							pos: position{line: 1199, col: 10, offset: 29438},
+							pos: position{line: 1200, col: 10, offset: 29448},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1199, col: 10, offset: 29438},
+								pos:  position{line: 1200, col: 10, offset: 29448},
 								name: "HexDigit",
 							},
 						},
@@ -8129,29 +8133,29 @@ var g = &grammar{
 		},
 		{
 			name: "TypeLiteral",
-			pos:  position{line: 1203, col: 1, offset: 29512},
+			pos:  position{line: 1204, col: 1, offset: 29522},
 			expr: &actionExpr{
-				pos: position{line: 1204, col: 5, offset: 29528},
+				pos: position{line: 1205, col: 5, offset: 29538},
 				run: (*parser).callonTypeLiteral1,
 				expr: &seqExpr{
-					pos: position{line: 1204, col: 5, offset: 29528},
+					pos: position{line: 1205, col: 5, offset: 29538},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1204, col: 5, offset: 29528},
+							pos:        position{line: 1205, col: 5, offset: 29538},
 							val:        "<",
 							ignoreCase: false,
 							want:       "\"<\"",
 						},
 						&labeledExpr{
-							pos:   position{line: 1204, col: 9, offset: 29532},
+							pos:   position{line: 1205, col: 9, offset: 29542},
 							label: "typ",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1204, col: 13, offset: 29536},
+								pos:  position{line: 1205, col: 13, offset: 29546},
 								name: "Type",
 							},
 						},
 						&litMatcher{
-							pos:        position{line: 1204, col: 18, offset: 29541},
+							pos:        position{line: 1205, col: 18, offset: 29551},
 							val:        ">",
 							ignoreCase: false,
 							want:       "\">\"",
@@ -8164,16 +8168,16 @@ var g = &grammar{
 		},
 		{
 			name: "Type",
-			pos:  position{line: 1213, col: 1, offset: 29722},
+			pos:  position{line: 1214, col: 1, offset: 29732},
 			expr: &choiceExpr{
-				pos: position{line: 1214, col: 5, offset: 29731},
+				pos: position{line: 1215, col: 5, offset: 29741},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1214, col: 5, offset: 29731},
+						pos:  position{line: 1215, col: 5, offset: 29741},
 						name: "AmbiguousType",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1215, col: 5, offset: 29749},
+						pos:  position{line: 1216, col: 5, offset: 29759},
 						name: "ComplexType",
 					},
 				},
@@ -8183,28 +8187,28 @@ var g = &grammar{
 		},
 		{
 			name: "AmbiguousType",
-			pos:  position{line: 1217, col: 1, offset: 29762},
+			pos:  position{line: 1218, col: 1, offset: 29772},
 			expr: &choiceExpr{
-				pos: position{line: 1218, col: 5, offset: 29780},
+				pos: position{line: 1219, col: 5, offset: 29790},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1218, col: 5, offset: 29780},
+						pos: position{line: 1219, col: 5, offset: 29790},
 						run: (*parser).callonAmbiguousType2,
 						expr: &seqExpr{
-							pos: position{line: 1218, col: 5, offset: 29780},
+							pos: position{line: 1219, col: 5, offset: 29790},
 							exprs: []any{
 								&labeledExpr{
-									pos:   position{line: 1218, col: 5, offset: 29780},
+									pos:   position{line: 1219, col: 5, offset: 29790},
 									label: "name",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1218, col: 10, offset: 29785},
+										pos:  position{line: 1219, col: 10, offset: 29795},
 										name: "PrimitiveType",
 									},
 								},
 								&notExpr{
-									pos: position{line: 1218, col: 24, offset: 29799},
+									pos: position{line: 1219, col: 24, offset: 29809},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1218, col: 25, offset: 29800},
+										pos:  position{line: 1219, col: 25, offset: 29810},
 										name: "IdentifierRest",
 									},
 								},
@@ -8212,45 +8216,45 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1219, col: 5, offset: 29840},
+						pos: position{line: 1220, col: 5, offset: 29850},
 						run: (*parser).callonAmbiguousType8,
 						expr: &seqExpr{
-							pos: position{line: 1219, col: 5, offset: 29840},
+							pos: position{line: 1220, col: 5, offset: 29850},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1219, col: 5, offset: 29840},
+									pos:        position{line: 1220, col: 5, offset: 29850},
 									val:        "error",
 									ignoreCase: false,
 									want:       "\"error\"",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1219, col: 13, offset: 29848},
+									pos:  position{line: 1220, col: 13, offset: 29858},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 1219, col: 16, offset: 29851},
+									pos:        position{line: 1220, col: 16, offset: 29861},
 									val:        "(",
 									ignoreCase: false,
 									want:       "\"(\"",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1219, col: 20, offset: 29855},
+									pos:  position{line: 1220, col: 20, offset: 29865},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 1219, col: 23, offset: 29858},
+									pos:   position{line: 1220, col: 23, offset: 29868},
 									label: "t",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1219, col: 25, offset: 29860},
+										pos:  position{line: 1220, col: 25, offset: 29870},
 										name: "Type",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1219, col: 30, offset: 29865},
+									pos:  position{line: 1220, col: 30, offset: 29875},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 1219, col: 33, offset: 29868},
+									pos:        position{line: 1220, col: 33, offset: 29878},
 									val:        ")",
 									ignoreCase: false,
 									want:       "\")\"",
@@ -8259,43 +8263,43 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1227, col: 5, offset: 30062},
+						pos: position{line: 1228, col: 5, offset: 30072},
 						run: (*parser).callonAmbiguousType18,
 						expr: &seqExpr{
-							pos: position{line: 1227, col: 5, offset: 30062},
+							pos: position{line: 1228, col: 5, offset: 30072},
 							exprs: []any{
 								&labeledExpr{
-									pos:   position{line: 1227, col: 5, offset: 30062},
+									pos:   position{line: 1228, col: 5, offset: 30072},
 									label: "name",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1227, col: 10, offset: 30067},
+										pos:  position{line: 1228, col: 10, offset: 30077},
 										name: "IdentifierName",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1227, col: 25, offset: 30082},
+									pos:   position{line: 1228, col: 25, offset: 30092},
 									label: "opt",
 									expr: &zeroOrOneExpr{
-										pos: position{line: 1227, col: 29, offset: 30086},
+										pos: position{line: 1228, col: 29, offset: 30096},
 										expr: &seqExpr{
-											pos: position{line: 1227, col: 30, offset: 30087},
+											pos: position{line: 1228, col: 30, offset: 30097},
 											exprs: []any{
 												&ruleRefExpr{
-													pos:  position{line: 1227, col: 30, offset: 30087},
+													pos:  position{line: 1228, col: 30, offset: 30097},
 													name: "__",
 												},
 												&litMatcher{
-													pos:        position{line: 1227, col: 33, offset: 30090},
+													pos:        position{line: 1228, col: 33, offset: 30100},
 													val:        "=",
 													ignoreCase: false,
 													want:       "\"=\"",
 												},
 												&ruleRefExpr{
-													pos:  position{line: 1227, col: 37, offset: 30094},
+													pos:  position{line: 1228, col: 37, offset: 30104},
 													name: "__",
 												},
 												&ruleRefExpr{
-													pos:  position{line: 1227, col: 40, offset: 30097},
+													pos:  position{line: 1228, col: 40, offset: 30107},
 													name: "Type",
 												},
 											},
@@ -8306,43 +8310,43 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1238, col: 5, offset: 30435},
+						pos: position{line: 1239, col: 5, offset: 30445},
 						run: (*parser).callonAmbiguousType29,
 						expr: &labeledExpr{
-							pos:   position{line: 1238, col: 5, offset: 30435},
+							pos:   position{line: 1239, col: 5, offset: 30445},
 							label: "name",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1238, col: 10, offset: 30440},
+								pos:  position{line: 1239, col: 10, offset: 30450},
 								name: "QuotedString",
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1241, col: 5, offset: 30562},
+						pos: position{line: 1242, col: 5, offset: 30572},
 						run: (*parser).callonAmbiguousType32,
 						expr: &seqExpr{
-							pos: position{line: 1241, col: 5, offset: 30562},
+							pos: position{line: 1242, col: 5, offset: 30572},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1241, col: 5, offset: 30562},
+									pos:        position{line: 1242, col: 5, offset: 30572},
 									val:        "(",
 									ignoreCase: false,
 									want:       "\"(\"",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1241, col: 9, offset: 30566},
+									pos:  position{line: 1242, col: 9, offset: 30576},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 1241, col: 12, offset: 30569},
+									pos:   position{line: 1242, col: 12, offset: 30579},
 									label: "types",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1241, col: 18, offset: 30575},
+										pos:  position{line: 1242, col: 18, offset: 30585},
 										name: "TypeList",
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1241, col: 27, offset: 30584},
+									pos:        position{line: 1242, col: 27, offset: 30594},
 									val:        ")",
 									ignoreCase: false,
 									want:       "\")\"",
@@ -8357,28 +8361,28 @@ var g = &grammar{
 		},
 		{
 			name: "TypeList",
-			pos:  position{line: 1250, col: 1, offset: 30776},
+			pos:  position{line: 1251, col: 1, offset: 30786},
 			expr: &actionExpr{
-				pos: position{line: 1251, col: 5, offset: 30789},
+				pos: position{line: 1252, col: 5, offset: 30799},
 				run: (*parser).callonTypeList1,
 				expr: &seqExpr{
-					pos: position{line: 1251, col: 5, offset: 30789},
+					pos: position{line: 1252, col: 5, offset: 30799},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 1251, col: 5, offset: 30789},
+							pos:   position{line: 1252, col: 5, offset: 30799},
 							label: "first",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1251, col: 11, offset: 30795},
+								pos:  position{line: 1252, col: 11, offset: 30805},
 								name: "Type",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1251, col: 16, offset: 30800},
+							pos:   position{line: 1252, col: 16, offset: 30810},
 							label: "rest",
 							expr: &oneOrMoreExpr{
-								pos: position{line: 1251, col: 21, offset: 30805},
+								pos: position{line: 1252, col: 21, offset: 30815},
 								expr: &ruleRefExpr{
-									pos:  position{line: 1251, col: 21, offset: 30805},
+									pos:  position{line: 1252, col: 21, offset: 30815},
 									name: "TypeListTail",
 								},
 							},
@@ -8391,32 +8395,32 @@ var g = &grammar{
 		},
 		{
 			name: "TypeListTail",
-			pos:  position{line: 1255, col: 1, offset: 30863},
+			pos:  position{line: 1256, col: 1, offset: 30873},
 			expr: &actionExpr{
-				pos: position{line: 1255, col: 16, offset: 30878},
+				pos: position{line: 1256, col: 16, offset: 30888},
 				run: (*parser).callonTypeListTail1,
 				expr: &seqExpr{
-					pos: position{line: 1255, col: 16, offset: 30878},
+					pos: position{line: 1256, col: 16, offset: 30888},
 					exprs: []any{
 						&ruleRefExpr{
-							pos:  position{line: 1255, col: 16, offset: 30878},
+							pos:  position{line: 1256, col: 16, offset: 30888},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1255, col: 19, offset: 30881},
+							pos:        position{line: 1256, col: 19, offset: 30891},
 							val:        ",",
 							ignoreCase: false,
 							want:       "\",\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1255, col: 23, offset: 30885},
+							pos:  position{line: 1256, col: 23, offset: 30895},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1255, col: 26, offset: 30888},
+							pos:   position{line: 1256, col: 26, offset: 30898},
 							label: "typ",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1255, col: 30, offset: 30892},
+								pos:  position{line: 1256, col: 30, offset: 30902},
 								name: "Type",
 							},
 						},
@@ -8428,40 +8432,40 @@ var g = &grammar{
 		},
 		{
 			name: "ComplexType",
-			pos:  position{line: 1257, col: 1, offset: 30918},
+			pos:  position{line: 1258, col: 1, offset: 30928},
 			expr: &choiceExpr{
-				pos: position{line: 1258, col: 5, offset: 30934},
+				pos: position{line: 1259, col: 5, offset: 30944},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1258, col: 5, offset: 30934},
+						pos: position{line: 1259, col: 5, offset: 30944},
 						run: (*parser).callonComplexType2,
 						expr: &seqExpr{
-							pos: position{line: 1258, col: 5, offset: 30934},
+							pos: position{line: 1259, col: 5, offset: 30944},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1258, col: 5, offset: 30934},
+									pos:        position{line: 1259, col: 5, offset: 30944},
 									val:        "{",
 									ignoreCase: false,
 									want:       "\"{\"",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1258, col: 9, offset: 30938},
+									pos:  position{line: 1259, col: 9, offset: 30948},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 1258, col: 12, offset: 30941},
+									pos:   position{line: 1259, col: 12, offset: 30951},
 									label: "fields",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1258, col: 19, offset: 30948},
+										pos:  position{line: 1259, col: 19, offset: 30958},
 										name: "TypeFieldList",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1258, col: 33, offset: 30962},
+									pos:  position{line: 1259, col: 33, offset: 30972},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 1258, col: 36, offset: 30965},
+									pos:        position{line: 1259, col: 36, offset: 30975},
 									val:        "}",
 									ignoreCase: false,
 									want:       "\"}\"",
@@ -8470,35 +8474,35 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1266, col: 5, offset: 31177},
+						pos: position{line: 1267, col: 5, offset: 31187},
 						run: (*parser).callonComplexType10,
 						expr: &seqExpr{
-							pos: position{line: 1266, col: 5, offset: 31177},
+							pos: position{line: 1267, col: 5, offset: 31187},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1266, col: 5, offset: 31177},
+									pos:        position{line: 1267, col: 5, offset: 31187},
 									val:        "[",
 									ignoreCase: false,
 									want:       "\"[\"",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1266, col: 9, offset: 31181},
+									pos:  position{line: 1267, col: 9, offset: 31191},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 1266, col: 12, offset: 31184},
+									pos:   position{line: 1267, col: 12, offset: 31194},
 									label: "typ",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1266, col: 16, offset: 31188},
+										pos:  position{line: 1267, col: 16, offset: 31198},
 										name: "Type",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1266, col: 21, offset: 31193},
+									pos:  position{line: 1267, col: 21, offset: 31203},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 1266, col: 24, offset: 31196},
+									pos:        position{line: 1267, col: 24, offset: 31206},
 									val:        "]",
 									ignoreCase: false,
 									want:       "\"]\"",
@@ -8507,35 +8511,35 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1274, col: 5, offset: 31388},
+						pos: position{line: 1275, col: 5, offset: 31398},
 						run: (*parser).callonComplexType18,
 						expr: &seqExpr{
-							pos: position{line: 1274, col: 5, offset: 31388},
+							pos: position{line: 1275, col: 5, offset: 31398},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1274, col: 5, offset: 31388},
+									pos:        position{line: 1275, col: 5, offset: 31398},
 									val:        "|[",
 									ignoreCase: false,
 									want:       "\"|[\"",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1274, col: 10, offset: 31393},
+									pos:  position{line: 1275, col: 10, offset: 31403},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 1274, col: 13, offset: 31396},
+									pos:   position{line: 1275, col: 13, offset: 31406},
 									label: "typ",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1274, col: 17, offset: 31400},
+										pos:  position{line: 1275, col: 17, offset: 31410},
 										name: "Type",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1274, col: 22, offset: 31405},
+									pos:  position{line: 1275, col: 22, offset: 31415},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 1274, col: 25, offset: 31408},
+									pos:        position{line: 1275, col: 25, offset: 31418},
 									val:        "]|",
 									ignoreCase: false,
 									want:       "\"]|\"",
@@ -8544,57 +8548,57 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1282, col: 5, offset: 31595},
+						pos: position{line: 1283, col: 5, offset: 31605},
 						run: (*parser).callonComplexType26,
 						expr: &seqExpr{
-							pos: position{line: 1282, col: 5, offset: 31595},
+							pos: position{line: 1283, col: 5, offset: 31605},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1282, col: 5, offset: 31595},
+									pos:        position{line: 1283, col: 5, offset: 31605},
 									val:        "|{",
 									ignoreCase: false,
 									want:       "\"|{\"",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1282, col: 10, offset: 31600},
+									pos:  position{line: 1283, col: 10, offset: 31610},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 1282, col: 13, offset: 31603},
+									pos:   position{line: 1283, col: 13, offset: 31613},
 									label: "keyType",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1282, col: 21, offset: 31611},
+										pos:  position{line: 1283, col: 21, offset: 31621},
 										name: "Type",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1282, col: 26, offset: 31616},
+									pos:  position{line: 1283, col: 26, offset: 31626},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 1282, col: 29, offset: 31619},
+									pos:        position{line: 1283, col: 29, offset: 31629},
 									val:        ":",
 									ignoreCase: false,
 									want:       "\":\"",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1282, col: 33, offset: 31623},
+									pos:  position{line: 1283, col: 33, offset: 31633},
 									name: "__",
 								},
 								&labeledExpr{
-									pos:   position{line: 1282, col: 36, offset: 31626},
+									pos:   position{line: 1283, col: 36, offset: 31636},
 									label: "valType",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1282, col: 44, offset: 31634},
+										pos:  position{line: 1283, col: 44, offset: 31644},
 										name: "Type",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1282, col: 49, offset: 31639},
+									pos:  position{line: 1283, col: 49, offset: 31649},
 									name: "__",
 								},
 								&litMatcher{
-									pos:        position{line: 1282, col: 52, offset: 31642},
+									pos:        position{line: 1283, col: 52, offset: 31652},
 									val:        "}|",
 									ignoreCase: false,
 									want:       "\"}|\"",
@@ -8608,17 +8612,74 @@ var g = &grammar{
 			leftRecursive: false,
 		},
 		{
-			name: "TemplateLiteral",
-			pos:  position{line: 1292, col: 1, offset: 31865},
-			expr: &actionExpr{
-				pos: position{line: 1293, col: 5, offset: 31885},
-				run: (*parser).callonTemplateLiteral1,
-				expr: &labeledExpr{
-					pos:   position{line: 1293, col: 5, offset: 31885},
-					label: "v",
-					expr: &ruleRefExpr{
-						pos:  position{line: 1293, col: 7, offset: 31887},
-						name: "TemplateLiteralParts",
+			name: "StringLiteral",
+			pos:  position{line: 1293, col: 1, offset: 31875},
+			expr: &choiceExpr{
+				pos: position{line: 1294, col: 5, offset: 31893},
+				alternatives: []any{
+					&actionExpr{
+						pos: position{line: 1294, col: 5, offset: 31893},
+						run: (*parser).callonStringLiteral2,
+						expr: &seqExpr{
+							pos: position{line: 1294, col: 5, offset: 31893},
+							exprs: []any{
+								&litMatcher{
+									pos:        position{line: 1294, col: 5, offset: 31893},
+									val:        "\"",
+									ignoreCase: false,
+									want:       "\"\\\"\"",
+								},
+								&labeledExpr{
+									pos:   position{line: 1294, col: 9, offset: 31897},
+									label: "v",
+									expr: &zeroOrMoreExpr{
+										pos: position{line: 1294, col: 11, offset: 31899},
+										expr: &ruleRefExpr{
+											pos:  position{line: 1294, col: 11, offset: 31899},
+											name: "DoubleQuotedChar",
+										},
+									},
+								},
+								&litMatcher{
+									pos:        position{line: 1294, col: 29, offset: 31917},
+									val:        "\"",
+									ignoreCase: false,
+									want:       "\"\\\"\"",
+								},
+							},
+						},
+					},
+					&actionExpr{
+						pos: position{line: 1295, col: 5, offset: 31981},
+						run: (*parser).callonStringLiteral9,
+						expr: &seqExpr{
+							pos: position{line: 1295, col: 5, offset: 31981},
+							exprs: []any{
+								&litMatcher{
+									pos:        position{line: 1295, col: 5, offset: 31981},
+									val:        "'",
+									ignoreCase: false,
+									want:       "\"'\"",
+								},
+								&labeledExpr{
+									pos:   position{line: 1295, col: 9, offset: 31985},
+									label: "v",
+									expr: &zeroOrMoreExpr{
+										pos: position{line: 1295, col: 11, offset: 31987},
+										expr: &ruleRefExpr{
+											pos:  position{line: 1295, col: 11, offset: 31987},
+											name: "SingleQuotedChar",
+										},
+									},
+								},
+								&litMatcher{
+									pos:        position{line: 1295, col: 29, offset: 32005},
+									val:        "'",
+									ignoreCase: false,
+									want:       "\"'\"",
+								},
+							},
+						},
 					},
 				},
 			},
@@ -8626,36 +8687,36 @@ var g = &grammar{
 			leftRecursive: false,
 		},
 		{
-			name: "TemplateLiteralParts",
-			pos:  position{line: 1300, col: 1, offset: 32049},
+			name: "FString",
+			pos:  position{line: 1297, col: 1, offset: 32066},
 			expr: &choiceExpr{
-				pos: position{line: 1301, col: 5, offset: 32074},
+				pos: position{line: 1298, col: 5, offset: 32078},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1301, col: 5, offset: 32074},
-						run: (*parser).callonTemplateLiteralParts2,
+						pos: position{line: 1298, col: 5, offset: 32078},
+						run: (*parser).callonFString2,
 						expr: &seqExpr{
-							pos: position{line: 1301, col: 5, offset: 32074},
+							pos: position{line: 1298, col: 5, offset: 32078},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1301, col: 5, offset: 32074},
-									val:        "\"",
+									pos:        position{line: 1298, col: 5, offset: 32078},
+									val:        "f\"",
 									ignoreCase: false,
-									want:       "\"\\\"\"",
+									want:       "\"f\\\"\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1301, col: 9, offset: 32078},
+									pos:   position{line: 1298, col: 11, offset: 32084},
 									label: "v",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1301, col: 11, offset: 32080},
+										pos: position{line: 1298, col: 13, offset: 32086},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1301, col: 11, offset: 32080},
-											name: "TemplateDoubleQuotedPart",
+											pos:  position{line: 1298, col: 13, offset: 32086},
+											name: "FStringDoubleQuotedElem",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1301, col: 37, offset: 32106},
+									pos:        position{line: 1298, col: 38, offset: 32111},
 									val:        "\"",
 									ignoreCase: false,
 									want:       "\"\\\"\"",
@@ -8664,30 +8725,30 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1302, col: 5, offset: 32132},
-						run: (*parser).callonTemplateLiteralParts9,
+						pos: position{line: 1305, col: 5, offset: 32268},
+						run: (*parser).callonFString9,
 						expr: &seqExpr{
-							pos: position{line: 1302, col: 5, offset: 32132},
+							pos: position{line: 1305, col: 5, offset: 32268},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1302, col: 5, offset: 32132},
-									val:        "'",
+									pos:        position{line: 1305, col: 5, offset: 32268},
+									val:        "f'",
 									ignoreCase: false,
-									want:       "\"'\"",
+									want:       "\"f'\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1302, col: 9, offset: 32136},
+									pos:   position{line: 1305, col: 10, offset: 32273},
 									label: "v",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1302, col: 11, offset: 32138},
+										pos: position{line: 1305, col: 12, offset: 32275},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1302, col: 11, offset: 32138},
-											name: "TemplateSingleQuotedPart",
+											pos:  position{line: 1305, col: 12, offset: 32275},
+											name: "FStringSingleQuotedElem",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1302, col: 37, offset: 32164},
+									pos:        position{line: 1305, col: 37, offset: 32300},
 									val:        "'",
 									ignoreCase: false,
 									want:       "\"'\"",
@@ -8701,26 +8762,26 @@ var g = &grammar{
 			leftRecursive: false,
 		},
 		{
-			name: "TemplateDoubleQuotedPart",
-			pos:  position{line: 1304, col: 1, offset: 32187},
+			name: "FStringDoubleQuotedElem",
+			pos:  position{line: 1313, col: 1, offset: 32454},
 			expr: &choiceExpr{
-				pos: position{line: 1305, col: 5, offset: 32216},
+				pos: position{line: 1314, col: 5, offset: 32482},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1305, col: 5, offset: 32216},
-						name: "TemplateExpr",
+						pos:  position{line: 1314, col: 5, offset: 32482},
+						name: "FStringExpr",
 					},
 					&actionExpr{
-						pos: position{line: 1306, col: 5, offset: 32233},
-						run: (*parser).callonTemplateDoubleQuotedPart3,
+						pos: position{line: 1315, col: 5, offset: 32498},
+						run: (*parser).callonFStringDoubleQuotedElem3,
 						expr: &labeledExpr{
-							pos:   position{line: 1306, col: 5, offset: 32233},
+							pos:   position{line: 1315, col: 5, offset: 32498},
 							label: "v",
 							expr: &oneOrMoreExpr{
-								pos: position{line: 1306, col: 7, offset: 32235},
+								pos: position{line: 1315, col: 7, offset: 32500},
 								expr: &ruleRefExpr{
-									pos:  position{line: 1306, col: 7, offset: 32235},
-									name: "TemplateDoubleQuotedChar",
+									pos:  position{line: 1315, col: 7, offset: 32500},
+									name: "FStringDoubleQuotedChar",
 								},
 							},
 						},
@@ -8731,56 +8792,56 @@ var g = &grammar{
 			leftRecursive: false,
 		},
 		{
-			name: "TemplateDoubleQuotedChar",
-			pos:  position{line: 1310, col: 1, offset: 32328},
+			name: "FStringDoubleQuotedChar",
+			pos:  position{line: 1319, col: 1, offset: 32633},
 			expr: &choiceExpr{
-				pos: position{line: 1311, col: 5, offset: 32357},
+				pos: position{line: 1320, col: 5, offset: 32661},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1311, col: 5, offset: 32357},
-						run: (*parser).callonTemplateDoubleQuotedChar2,
+						pos: position{line: 1320, col: 5, offset: 32661},
+						run: (*parser).callonFStringDoubleQuotedChar2,
 						expr: &seqExpr{
-							pos: position{line: 1311, col: 5, offset: 32357},
+							pos: position{line: 1320, col: 5, offset: 32661},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1311, col: 5, offset: 32357},
+									pos:        position{line: 1320, col: 5, offset: 32661},
 									val:        "\\",
 									ignoreCase: false,
 									want:       "\"\\\\\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1311, col: 10, offset: 32362},
+									pos:   position{line: 1320, col: 10, offset: 32666},
 									label: "v",
 									expr: &litMatcher{
-										pos:        position{line: 1311, col: 12, offset: 32364},
-										val:        "${",
+										pos:        position{line: 1320, col: 12, offset: 32668},
+										val:        "{",
 										ignoreCase: false,
-										want:       "\"${\"",
+										want:       "\"{\"",
 									},
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1312, col: 5, offset: 32391},
-						run: (*parser).callonTemplateDoubleQuotedChar7,
+						pos: position{line: 1321, col: 5, offset: 32694},
+						run: (*parser).callonFStringDoubleQuotedChar7,
 						expr: &seqExpr{
-							pos: position{line: 1312, col: 5, offset: 32391},
+							pos: position{line: 1321, col: 5, offset: 32694},
 							exprs: []any{
 								&notExpr{
-									pos: position{line: 1312, col: 5, offset: 32391},
+									pos: position{line: 1321, col: 5, offset: 32694},
 									expr: &litMatcher{
-										pos:        position{line: 1312, col: 7, offset: 32393},
-										val:        "${",
+										pos:        position{line: 1321, col: 7, offset: 32696},
+										val:        "{",
 										ignoreCase: false,
-										want:       "\"${\"",
+										want:       "\"{\"",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1312, col: 13, offset: 32399},
+									pos:   position{line: 1321, col: 12, offset: 32701},
 									label: "v",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1312, col: 15, offset: 32401},
+										pos:  position{line: 1321, col: 14, offset: 32703},
 										name: "DoubleQuotedChar",
 									},
 								},
@@ -8793,26 +8854,26 @@ var g = &grammar{
 			leftRecursive: false,
 		},
 		{
-			name: "TemplateSingleQuotedPart",
-			pos:  position{line: 1314, col: 1, offset: 32437},
+			name: "FStringSingleQuotedElem",
+			pos:  position{line: 1323, col: 1, offset: 32739},
 			expr: &choiceExpr{
-				pos: position{line: 1315, col: 5, offset: 32466},
+				pos: position{line: 1324, col: 5, offset: 32767},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1315, col: 5, offset: 32466},
-						name: "TemplateExpr",
+						pos:  position{line: 1324, col: 5, offset: 32767},
+						name: "FStringExpr",
 					},
 					&actionExpr{
-						pos: position{line: 1316, col: 5, offset: 32483},
-						run: (*parser).callonTemplateSingleQuotedPart3,
+						pos: position{line: 1325, col: 5, offset: 32783},
+						run: (*parser).callonFStringSingleQuotedElem3,
 						expr: &labeledExpr{
-							pos:   position{line: 1316, col: 5, offset: 32483},
+							pos:   position{line: 1325, col: 5, offset: 32783},
 							label: "v",
 							expr: &oneOrMoreExpr{
-								pos: position{line: 1316, col: 7, offset: 32485},
+								pos: position{line: 1325, col: 7, offset: 32785},
 								expr: &ruleRefExpr{
-									pos:  position{line: 1316, col: 7, offset: 32485},
-									name: "TemplateSingleQuotedChar",
+									pos:  position{line: 1325, col: 7, offset: 32785},
+									name: "FStringSingleQuotedChar",
 								},
 							},
 						},
@@ -8823,56 +8884,56 @@ var g = &grammar{
 			leftRecursive: false,
 		},
 		{
-			name: "TemplateSingleQuotedChar",
-			pos:  position{line: 1320, col: 1, offset: 32578},
+			name: "FStringSingleQuotedChar",
+			pos:  position{line: 1329, col: 1, offset: 32918},
 			expr: &choiceExpr{
-				pos: position{line: 1321, col: 5, offset: 32607},
+				pos: position{line: 1330, col: 5, offset: 32946},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1321, col: 5, offset: 32607},
-						run: (*parser).callonTemplateSingleQuotedChar2,
+						pos: position{line: 1330, col: 5, offset: 32946},
+						run: (*parser).callonFStringSingleQuotedChar2,
 						expr: &seqExpr{
-							pos: position{line: 1321, col: 5, offset: 32607},
+							pos: position{line: 1330, col: 5, offset: 32946},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1321, col: 5, offset: 32607},
+									pos:        position{line: 1330, col: 5, offset: 32946},
 									val:        "\\",
 									ignoreCase: false,
 									want:       "\"\\\\\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1321, col: 10, offset: 32612},
+									pos:   position{line: 1330, col: 10, offset: 32951},
 									label: "v",
 									expr: &litMatcher{
-										pos:        position{line: 1321, col: 12, offset: 32614},
-										val:        "${",
+										pos:        position{line: 1330, col: 12, offset: 32953},
+										val:        "{",
 										ignoreCase: false,
-										want:       "\"${\"",
+										want:       "\"{\"",
 									},
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1322, col: 5, offset: 32641},
-						run: (*parser).callonTemplateSingleQuotedChar7,
+						pos: position{line: 1331, col: 5, offset: 32979},
+						run: (*parser).callonFStringSingleQuotedChar7,
 						expr: &seqExpr{
-							pos: position{line: 1322, col: 5, offset: 32641},
+							pos: position{line: 1331, col: 5, offset: 32979},
 							exprs: []any{
 								&notExpr{
-									pos: position{line: 1322, col: 5, offset: 32641},
+									pos: position{line: 1331, col: 5, offset: 32979},
 									expr: &litMatcher{
-										pos:        position{line: 1322, col: 7, offset: 32643},
-										val:        "${",
+										pos:        position{line: 1331, col: 7, offset: 32981},
+										val:        "{",
 										ignoreCase: false,
-										want:       "\"${\"",
+										want:       "\"{\"",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1322, col: 13, offset: 32649},
+									pos:   position{line: 1331, col: 12, offset: 32986},
 									label: "v",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1322, col: 15, offset: 32651},
+										pos:  position{line: 1331, col: 14, offset: 32988},
 										name: "SingleQuotedChar",
 									},
 								},
@@ -8885,38 +8946,38 @@ var g = &grammar{
 			leftRecursive: false,
 		},
 		{
-			name: "TemplateExpr",
-			pos:  position{line: 1326, col: 1, offset: 32798},
+			name: "FStringExpr",
+			pos:  position{line: 1333, col: 1, offset: 33024},
 			expr: &actionExpr{
-				pos: position{line: 1327, col: 5, offset: 32815},
-				run: (*parser).callonTemplateExpr1,
+				pos: position{line: 1334, col: 5, offset: 33040},
+				run: (*parser).callonFStringExpr1,
 				expr: &seqExpr{
-					pos: position{line: 1327, col: 5, offset: 32815},
+					pos: position{line: 1334, col: 5, offset: 33040},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1327, col: 5, offset: 32815},
-							val:        "${",
+							pos:        position{line: 1334, col: 5, offset: 33040},
+							val:        "{",
 							ignoreCase: false,
-							want:       "\"${\"",
+							want:       "\"{\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1327, col: 10, offset: 32820},
+							pos:  position{line: 1334, col: 9, offset: 33044},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1327, col: 13, offset: 32823},
+							pos:   position{line: 1334, col: 12, offset: 33047},
 							label: "e",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1327, col: 15, offset: 32825},
+								pos:  position{line: 1334, col: 14, offset: 33049},
 								name: "Expr",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1327, col: 20, offset: 32830},
+							pos:  position{line: 1334, col: 19, offset: 33054},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1327, col: 23, offset: 32833},
+							pos:        position{line: 1334, col: 22, offset: 33057},
 							val:        "}",
 							ignoreCase: false,
 							want:       "\"}\"",
@@ -8929,129 +8990,129 @@ var g = &grammar{
 		},
 		{
 			name: "PrimitiveType",
-			pos:  position{line: 1338, col: 1, offset: 33086},
+			pos:  position{line: 1343, col: 1, offset: 33235},
 			expr: &actionExpr{
-				pos: position{line: 1339, col: 5, offset: 33104},
+				pos: position{line: 1344, col: 5, offset: 33253},
 				run: (*parser).callonPrimitiveType1,
 				expr: &choiceExpr{
-					pos: position{line: 1339, col: 9, offset: 33108},
+					pos: position{line: 1344, col: 9, offset: 33257},
 					alternatives: []any{
 						&litMatcher{
-							pos:        position{line: 1339, col: 9, offset: 33108},
+							pos:        position{line: 1344, col: 9, offset: 33257},
 							val:        "uint8",
 							ignoreCase: false,
 							want:       "\"uint8\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1339, col: 19, offset: 33118},
+							pos:        position{line: 1344, col: 19, offset: 33267},
 							val:        "uint16",
 							ignoreCase: false,
 							want:       "\"uint16\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1339, col: 30, offset: 33129},
+							pos:        position{line: 1344, col: 30, offset: 33278},
 							val:        "uint32",
 							ignoreCase: false,
 							want:       "\"uint32\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1339, col: 41, offset: 33140},
+							pos:        position{line: 1344, col: 41, offset: 33289},
 							val:        "uint64",
 							ignoreCase: false,
 							want:       "\"uint64\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1340, col: 9, offset: 33157},
+							pos:        position{line: 1345, col: 9, offset: 33306},
 							val:        "int8",
 							ignoreCase: false,
 							want:       "\"int8\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1340, col: 18, offset: 33166},
+							pos:        position{line: 1345, col: 18, offset: 33315},
 							val:        "int16",
 							ignoreCase: false,
 							want:       "\"int16\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1340, col: 28, offset: 33176},
+							pos:        position{line: 1345, col: 28, offset: 33325},
 							val:        "int32",
 							ignoreCase: false,
 							want:       "\"int32\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1340, col: 38, offset: 33186},
+							pos:        position{line: 1345, col: 38, offset: 33335},
 							val:        "int64",
 							ignoreCase: false,
 							want:       "\"int64\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1341, col: 9, offset: 33202},
+							pos:        position{line: 1346, col: 9, offset: 33351},
 							val:        "float16",
 							ignoreCase: false,
 							want:       "\"float16\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1341, col: 21, offset: 33214},
+							pos:        position{line: 1346, col: 21, offset: 33363},
 							val:        "float32",
 							ignoreCase: false,
 							want:       "\"float32\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1341, col: 33, offset: 33226},
+							pos:        position{line: 1346, col: 33, offset: 33375},
 							val:        "float64",
 							ignoreCase: false,
 							want:       "\"float64\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1342, col: 9, offset: 33244},
+							pos:        position{line: 1347, col: 9, offset: 33393},
 							val:        "bool",
 							ignoreCase: false,
 							want:       "\"bool\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1342, col: 18, offset: 33253},
+							pos:        position{line: 1347, col: 18, offset: 33402},
 							val:        "string",
 							ignoreCase: false,
 							want:       "\"string\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1343, col: 9, offset: 33270},
+							pos:        position{line: 1348, col: 9, offset: 33419},
 							val:        "duration",
 							ignoreCase: false,
 							want:       "\"duration\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1343, col: 22, offset: 33283},
+							pos:        position{line: 1348, col: 22, offset: 33432},
 							val:        "time",
 							ignoreCase: false,
 							want:       "\"time\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1344, col: 9, offset: 33298},
+							pos:        position{line: 1349, col: 9, offset: 33447},
 							val:        "bytes",
 							ignoreCase: false,
 							want:       "\"bytes\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1345, col: 9, offset: 33314},
+							pos:        position{line: 1350, col: 9, offset: 33463},
 							val:        "ip",
 							ignoreCase: false,
 							want:       "\"ip\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1345, col: 16, offset: 33321},
+							pos:        position{line: 1350, col: 16, offset: 33470},
 							val:        "net",
 							ignoreCase: false,
 							want:       "\"net\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1346, col: 9, offset: 33335},
+							pos:        position{line: 1351, col: 9, offset: 33484},
 							val:        "type",
 							ignoreCase: false,
 							want:       "\"type\"",
 						},
 						&litMatcher{
-							pos:        position{line: 1346, col: 18, offset: 33344},
+							pos:        position{line: 1351, col: 18, offset: 33493},
 							val:        "null",
 							ignoreCase: false,
 							want:       "\"null\"",
@@ -9064,31 +9125,31 @@ var g = &grammar{
 		},
 		{
 			name: "TypeFieldList",
-			pos:  position{line: 1354, col: 1, offset: 33542},
+			pos:  position{line: 1359, col: 1, offset: 33691},
 			expr: &choiceExpr{
-				pos: position{line: 1355, col: 5, offset: 33560},
+				pos: position{line: 1360, col: 5, offset: 33709},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1355, col: 5, offset: 33560},
+						pos: position{line: 1360, col: 5, offset: 33709},
 						run: (*parser).callonTypeFieldList2,
 						expr: &seqExpr{
-							pos: position{line: 1355, col: 5, offset: 33560},
+							pos: position{line: 1360, col: 5, offset: 33709},
 							exprs: []any{
 								&labeledExpr{
-									pos:   position{line: 1355, col: 5, offset: 33560},
+									pos:   position{line: 1360, col: 5, offset: 33709},
 									label: "first",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1355, col: 11, offset: 33566},
+										pos:  position{line: 1360, col: 11, offset: 33715},
 										name: "TypeField",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1355, col: 21, offset: 33576},
+									pos:   position{line: 1360, col: 21, offset: 33725},
 									label: "rest",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1355, col: 26, offset: 33581},
+										pos: position{line: 1360, col: 26, offset: 33730},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1355, col: 26, offset: 33581},
+											pos:  position{line: 1360, col: 26, offset: 33730},
 											name: "TypeFieldListTail",
 										},
 									},
@@ -9097,10 +9158,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1358, col: 5, offset: 33647},
+						pos: position{line: 1363, col: 5, offset: 33796},
 						run: (*parser).callonTypeFieldList9,
 						expr: &litMatcher{
-							pos:        position{line: 1358, col: 5, offset: 33647},
+							pos:        position{line: 1363, col: 5, offset: 33796},
 							val:        "",
 							ignoreCase: false,
 							want:       "\"\"",
@@ -9113,32 +9174,32 @@ var g = &grammar{
 		},
 		{
 			name: "TypeFieldListTail",
-			pos:  position{line: 1360, col: 1, offset: 33671},
+			pos:  position{line: 1365, col: 1, offset: 33820},
 			expr: &actionExpr{
-				pos: position{line: 1360, col: 21, offset: 33691},
+				pos: position{line: 1365, col: 21, offset: 33840},
 				run: (*parser).callonTypeFieldListTail1,
 				expr: &seqExpr{
-					pos: position{line: 1360, col: 21, offset: 33691},
+					pos: position{line: 1365, col: 21, offset: 33840},
 					exprs: []any{
 						&ruleRefExpr{
-							pos:  position{line: 1360, col: 21, offset: 33691},
+							pos:  position{line: 1365, col: 21, offset: 33840},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1360, col: 24, offset: 33694},
+							pos:        position{line: 1365, col: 24, offset: 33843},
 							val:        ",",
 							ignoreCase: false,
 							want:       "\",\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1360, col: 28, offset: 33698},
+							pos:  position{line: 1365, col: 28, offset: 33847},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1360, col: 31, offset: 33701},
+							pos:   position{line: 1365, col: 31, offset: 33850},
 							label: "typ",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1360, col: 35, offset: 33705},
+								pos:  position{line: 1365, col: 35, offset: 33854},
 								name: "TypeField",
 							},
 						},
@@ -9150,40 +9211,40 @@ var g = &grammar{
 		},
 		{
 			name: "TypeField",
-			pos:  position{line: 1362, col: 1, offset: 33736},
+			pos:  position{line: 1367, col: 1, offset: 33885},
 			expr: &actionExpr{
-				pos: position{line: 1363, col: 5, offset: 33750},
+				pos: position{line: 1368, col: 5, offset: 33899},
 				run: (*parser).callonTypeField1,
 				expr: &seqExpr{
-					pos: position{line: 1363, col: 5, offset: 33750},
+					pos: position{line: 1368, col: 5, offset: 33899},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 1363, col: 5, offset: 33750},
+							pos:   position{line: 1368, col: 5, offset: 33899},
 							label: "name",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1363, col: 10, offset: 33755},
+								pos:  position{line: 1368, col: 10, offset: 33904},
 								name: "FieldName",
 							},
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1363, col: 20, offset: 33765},
+							pos:  position{line: 1368, col: 20, offset: 33914},
 							name: "__",
 						},
 						&litMatcher{
-							pos:        position{line: 1363, col: 23, offset: 33768},
+							pos:        position{line: 1368, col: 23, offset: 33917},
 							val:        ":",
 							ignoreCase: false,
 							want:       "\":\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1363, col: 27, offset: 33772},
+							pos:  position{line: 1368, col: 27, offset: 33921},
 							name: "__",
 						},
 						&labeledExpr{
-							pos:   position{line: 1363, col: 30, offset: 33775},
+							pos:   position{line: 1368, col: 30, offset: 33924},
 							label: "typ",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1363, col: 34, offset: 33779},
+								pos:  position{line: 1368, col: 34, offset: 33928},
 								name: "Type",
 							},
 						},
@@ -9195,16 +9256,16 @@ var g = &grammar{
 		},
 		{
 			name: "FieldName",
-			pos:  position{line: 1370, col: 1, offset: 33903},
+			pos:  position{line: 1375, col: 1, offset: 34052},
 			expr: &choiceExpr{
-				pos: position{line: 1371, col: 5, offset: 33917},
+				pos: position{line: 1376, col: 5, offset: 34066},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1371, col: 5, offset: 33917},
+						pos:  position{line: 1376, col: 5, offset: 34066},
 						name: "IdentifierName",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1372, col: 5, offset: 33936},
+						pos:  position{line: 1377, col: 5, offset: 34085},
 						name: "QuotedString",
 					},
 				},
@@ -9214,24 +9275,24 @@ var g = &grammar{
 		},
 		{
 			name: "AndToken",
-			pos:  position{line: 1374, col: 1, offset: 33950},
+			pos:  position{line: 1379, col: 1, offset: 34099},
 			expr: &actionExpr{
-				pos: position{line: 1374, col: 12, offset: 33961},
+				pos: position{line: 1379, col: 12, offset: 34110},
 				run: (*parser).callonAndToken1,
 				expr: &seqExpr{
-					pos: position{line: 1374, col: 12, offset: 33961},
+					pos: position{line: 1379, col: 12, offset: 34110},
 					exprs: []any{
 						&choiceExpr{
-							pos: position{line: 1374, col: 13, offset: 33962},
+							pos: position{line: 1379, col: 13, offset: 34111},
 							alternatives: []any{
 								&litMatcher{
-									pos:        position{line: 1374, col: 13, offset: 33962},
+									pos:        position{line: 1379, col: 13, offset: 34111},
 									val:        "and",
 									ignoreCase: false,
 									want:       "\"and\"",
 								},
 								&litMatcher{
-									pos:        position{line: 1374, col: 21, offset: 33970},
+									pos:        position{line: 1379, col: 21, offset: 34119},
 									val:        "AND",
 									ignoreCase: false,
 									want:       "\"AND\"",
@@ -9239,9 +9300,9 @@ var g = &grammar{
 							},
 						},
 						&notExpr{
-							pos: position{line: 1374, col: 28, offset: 33977},
+							pos: position{line: 1379, col: 28, offset: 34126},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1374, col: 29, offset: 33978},
+								pos:  position{line: 1379, col: 29, offset: 34127},
 								name: "IdentifierRest",
 							},
 						},
@@ -9253,20 +9314,20 @@ var g = &grammar{
 		},
 		{
 			name: "ByToken",
-			pos:  position{line: 1375, col: 1, offset: 34015},
+			pos:  position{line: 1380, col: 1, offset: 34164},
 			expr: &seqExpr{
-				pos: position{line: 1375, col: 11, offset: 34025},
+				pos: position{line: 1380, col: 11, offset: 34174},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 1375, col: 11, offset: 34025},
+						pos:        position{line: 1380, col: 11, offset: 34174},
 						val:        "by",
 						ignoreCase: false,
 						want:       "\"by\"",
 					},
 					&notExpr{
-						pos: position{line: 1375, col: 16, offset: 34030},
+						pos: position{line: 1380, col: 16, offset: 34179},
 						expr: &ruleRefExpr{
-							pos:  position{line: 1375, col: 17, offset: 34031},
+							pos:  position{line: 1380, col: 17, offset: 34180},
 							name: "IdentifierRest",
 						},
 					},
@@ -9277,20 +9338,20 @@ var g = &grammar{
 		},
 		{
 			name: "FalseToken",
-			pos:  position{line: 1376, col: 1, offset: 34046},
+			pos:  position{line: 1381, col: 1, offset: 34195},
 			expr: &seqExpr{
-				pos: position{line: 1376, col: 14, offset: 34059},
+				pos: position{line: 1381, col: 14, offset: 34208},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 1376, col: 14, offset: 34059},
+						pos:        position{line: 1381, col: 14, offset: 34208},
 						val:        "false",
 						ignoreCase: false,
 						want:       "\"false\"",
 					},
 					&notExpr{
-						pos: position{line: 1376, col: 22, offset: 34067},
+						pos: position{line: 1381, col: 22, offset: 34216},
 						expr: &ruleRefExpr{
-							pos:  position{line: 1376, col: 23, offset: 34068},
+							pos:  position{line: 1381, col: 23, offset: 34217},
 							name: "IdentifierRest",
 						},
 					},
@@ -9301,20 +9362,20 @@ var g = &grammar{
 		},
 		{
 			name: "InToken",
-			pos:  position{line: 1377, col: 1, offset: 34083},
+			pos:  position{line: 1382, col: 1, offset: 34232},
 			expr: &seqExpr{
-				pos: position{line: 1377, col: 11, offset: 34093},
+				pos: position{line: 1382, col: 11, offset: 34242},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 1377, col: 11, offset: 34093},
+						pos:        position{line: 1382, col: 11, offset: 34242},
 						val:        "in",
 						ignoreCase: false,
 						want:       "\"in\"",
 					},
 					&notExpr{
-						pos: position{line: 1377, col: 16, offset: 34098},
+						pos: position{line: 1382, col: 16, offset: 34247},
 						expr: &ruleRefExpr{
-							pos:  position{line: 1377, col: 17, offset: 34099},
+							pos:  position{line: 1382, col: 17, offset: 34248},
 							name: "IdentifierRest",
 						},
 					},
@@ -9325,24 +9386,24 @@ var g = &grammar{
 		},
 		{
 			name: "NotToken",
-			pos:  position{line: 1378, col: 1, offset: 34114},
+			pos:  position{line: 1383, col: 1, offset: 34263},
 			expr: &actionExpr{
-				pos: position{line: 1378, col: 12, offset: 34125},
+				pos: position{line: 1383, col: 12, offset: 34274},
 				run: (*parser).callonNotToken1,
 				expr: &seqExpr{
-					pos: position{line: 1378, col: 12, offset: 34125},
+					pos: position{line: 1383, col: 12, offset: 34274},
 					exprs: []any{
 						&choiceExpr{
-							pos: position{line: 1378, col: 13, offset: 34126},
+							pos: position{line: 1383, col: 13, offset: 34275},
 							alternatives: []any{
 								&litMatcher{
-									pos:        position{line: 1378, col: 13, offset: 34126},
+									pos:        position{line: 1383, col: 13, offset: 34275},
 									val:        "not",
 									ignoreCase: false,
 									want:       "\"not\"",
 								},
 								&litMatcher{
-									pos:        position{line: 1378, col: 21, offset: 34134},
+									pos:        position{line: 1383, col: 21, offset: 34283},
 									val:        "NOT",
 									ignoreCase: false,
 									want:       "\"NOT\"",
@@ -9350,9 +9411,9 @@ var g = &grammar{
 							},
 						},
 						&notExpr{
-							pos: position{line: 1378, col: 28, offset: 34141},
+							pos: position{line: 1383, col: 28, offset: 34290},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1378, col: 29, offset: 34142},
+								pos:  position{line: 1383, col: 29, offset: 34291},
 								name: "IdentifierRest",
 							},
 						},
@@ -9364,20 +9425,20 @@ var g = &grammar{
 		},
 		{
 			name: "NullToken",
-			pos:  position{line: 1379, col: 1, offset: 34179},
+			pos:  position{line: 1384, col: 1, offset: 34328},
 			expr: &seqExpr{
-				pos: position{line: 1379, col: 13, offset: 34191},
+				pos: position{line: 1384, col: 13, offset: 34340},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 1379, col: 13, offset: 34191},
+						pos:        position{line: 1384, col: 13, offset: 34340},
 						val:        "null",
 						ignoreCase: false,
 						want:       "\"null\"",
 					},
 					&notExpr{
-						pos: position{line: 1379, col: 20, offset: 34198},
+						pos: position{line: 1384, col: 20, offset: 34347},
 						expr: &ruleRefExpr{
-							pos:  position{line: 1379, col: 21, offset: 34199},
+							pos:  position{line: 1384, col: 21, offset: 34348},
 							name: "IdentifierRest",
 						},
 					},
@@ -9388,24 +9449,24 @@ var g = &grammar{
 		},
 		{
 			name: "OrToken",
-			pos:  position{line: 1380, col: 1, offset: 34214},
+			pos:  position{line: 1385, col: 1, offset: 34363},
 			expr: &actionExpr{
-				pos: position{line: 1380, col: 11, offset: 34224},
+				pos: position{line: 1385, col: 11, offset: 34373},
 				run: (*parser).callonOrToken1,
 				expr: &seqExpr{
-					pos: position{line: 1380, col: 11, offset: 34224},
+					pos: position{line: 1385, col: 11, offset: 34373},
 					exprs: []any{
 						&choiceExpr{
-							pos: position{line: 1380, col: 12, offset: 34225},
+							pos: position{line: 1385, col: 12, offset: 34374},
 							alternatives: []any{
 								&litMatcher{
-									pos:        position{line: 1380, col: 12, offset: 34225},
+									pos:        position{line: 1385, col: 12, offset: 34374},
 									val:        "or",
 									ignoreCase: false,
 									want:       "\"or\"",
 								},
 								&litMatcher{
-									pos:        position{line: 1380, col: 19, offset: 34232},
+									pos:        position{line: 1385, col: 19, offset: 34381},
 									val:        "OR",
 									ignoreCase: false,
 									want:       "\"OR\"",
@@ -9413,9 +9474,9 @@ var g = &grammar{
 							},
 						},
 						&notExpr{
-							pos: position{line: 1380, col: 25, offset: 34238},
+							pos: position{line: 1385, col: 25, offset: 34387},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1380, col: 26, offset: 34239},
+								pos:  position{line: 1385, col: 26, offset: 34388},
 								name: "IdentifierRest",
 							},
 						},
@@ -9427,20 +9488,20 @@ var g = &grammar{
 		},
 		{
 			name: "TrueToken",
-			pos:  position{line: 1381, col: 1, offset: 34275},
+			pos:  position{line: 1386, col: 1, offset: 34424},
 			expr: &seqExpr{
-				pos: position{line: 1381, col: 13, offset: 34287},
+				pos: position{line: 1386, col: 13, offset: 34436},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 1381, col: 13, offset: 34287},
+						pos:        position{line: 1386, col: 13, offset: 34436},
 						val:        "true",
 						ignoreCase: false,
 						want:       "\"true\"",
 					},
 					&notExpr{
-						pos: position{line: 1381, col: 20, offset: 34294},
+						pos: position{line: 1386, col: 20, offset: 34443},
 						expr: &ruleRefExpr{
-							pos:  position{line: 1381, col: 21, offset: 34295},
+							pos:  position{line: 1386, col: 21, offset: 34444},
 							name: "IdentifierRest",
 						},
 					},
@@ -9451,15 +9512,15 @@ var g = &grammar{
 		},
 		{
 			name: "Identifier",
-			pos:  position{line: 1383, col: 1, offset: 34311},
+			pos:  position{line: 1388, col: 1, offset: 34460},
 			expr: &actionExpr{
-				pos: position{line: 1384, col: 5, offset: 34326},
+				pos: position{line: 1389, col: 5, offset: 34475},
 				run: (*parser).callonIdentifier1,
 				expr: &labeledExpr{
-					pos:   position{line: 1384, col: 5, offset: 34326},
+					pos:   position{line: 1389, col: 5, offset: 34475},
 					label: "id",
 					expr: &ruleRefExpr{
-						pos:  position{line: 1384, col: 8, offset: 34329},
+						pos:  position{line: 1389, col: 8, offset: 34478},
 						name: "IdentifierName",
 					},
 				},
@@ -9469,29 +9530,29 @@ var g = &grammar{
 		},
 		{
 			name: "IdentifierName",
-			pos:  position{line: 1392, col: 1, offset: 34472},
+			pos:  position{line: 1397, col: 1, offset: 34621},
 			expr: &choiceExpr{
-				pos: position{line: 1393, col: 5, offset: 34491},
+				pos: position{line: 1398, col: 5, offset: 34640},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1393, col: 5, offset: 34491},
+						pos: position{line: 1398, col: 5, offset: 34640},
 						run: (*parser).callonIdentifierName2,
 						expr: &seqExpr{
-							pos: position{line: 1393, col: 5, offset: 34491},
+							pos: position{line: 1398, col: 5, offset: 34640},
 							exprs: []any{
 								&notExpr{
-									pos: position{line: 1393, col: 5, offset: 34491},
+									pos: position{line: 1398, col: 5, offset: 34640},
 									expr: &seqExpr{
-										pos: position{line: 1393, col: 7, offset: 34493},
+										pos: position{line: 1398, col: 7, offset: 34642},
 										exprs: []any{
 											&ruleRefExpr{
-												pos:  position{line: 1393, col: 7, offset: 34493},
+												pos:  position{line: 1398, col: 7, offset: 34642},
 												name: "IDGuard",
 											},
 											&notExpr{
-												pos: position{line: 1393, col: 15, offset: 34501},
+												pos: position{line: 1398, col: 15, offset: 34650},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1393, col: 16, offset: 34502},
+													pos:  position{line: 1398, col: 16, offset: 34651},
 													name: "IdentifierRest",
 												},
 											},
@@ -9499,13 +9560,13 @@ var g = &grammar{
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1393, col: 32, offset: 34518},
+									pos:  position{line: 1398, col: 32, offset: 34667},
 									name: "IdentifierStart",
 								},
 								&zeroOrMoreExpr{
-									pos: position{line: 1393, col: 48, offset: 34534},
+									pos: position{line: 1398, col: 48, offset: 34683},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1393, col: 48, offset: 34534},
+										pos:  position{line: 1398, col: 48, offset: 34683},
 										name: "IdentifierRest",
 									},
 								},
@@ -9513,32 +9574,32 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1394, col: 5, offset: 34585},
+						pos: position{line: 1399, col: 5, offset: 34734},
 						run: (*parser).callonIdentifierName12,
 						expr: &litMatcher{
-							pos:        position{line: 1394, col: 5, offset: 34585},
+							pos:        position{line: 1399, col: 5, offset: 34734},
 							val:        "$",
 							ignoreCase: false,
 							want:       "\"$\"",
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1395, col: 5, offset: 34624},
+						pos: position{line: 1400, col: 5, offset: 34773},
 						run: (*parser).callonIdentifierName14,
 						expr: &seqExpr{
-							pos: position{line: 1395, col: 5, offset: 34624},
+							pos: position{line: 1400, col: 5, offset: 34773},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1395, col: 5, offset: 34624},
+									pos:        position{line: 1400, col: 5, offset: 34773},
 									val:        "\\",
 									ignoreCase: false,
 									want:       "\"\\\\\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1395, col: 10, offset: 34629},
+									pos:   position{line: 1400, col: 10, offset: 34778},
 									label: "id",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1395, col: 13, offset: 34632},
+										pos:  position{line: 1400, col: 13, offset: 34781},
 										name: "IDGuard",
 									},
 								},
@@ -9546,10 +9607,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1397, col: 5, offset: 34723},
+						pos: position{line: 1402, col: 5, offset: 34872},
 						run: (*parser).callonIdentifierName19,
 						expr: &litMatcher{
-							pos:        position{line: 1397, col: 5, offset: 34723},
+							pos:        position{line: 1402, col: 5, offset: 34872},
 							val:        "type",
 							ignoreCase: false,
 							want:       "\"type\"",
@@ -9562,51 +9623,51 @@ var g = &grammar{
 		},
 		{
 			name: "IdentifierNames",
-			pos:  position{line: 1399, col: 1, offset: 34762},
+			pos:  position{line: 1404, col: 1, offset: 34911},
 			expr: &actionExpr{
-				pos: position{line: 1400, col: 5, offset: 34782},
+				pos: position{line: 1405, col: 5, offset: 34931},
 				run: (*parser).callonIdentifierNames1,
 				expr: &seqExpr{
-					pos: position{line: 1400, col: 5, offset: 34782},
+					pos: position{line: 1405, col: 5, offset: 34931},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 1400, col: 5, offset: 34782},
+							pos:   position{line: 1405, col: 5, offset: 34931},
 							label: "first",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1400, col: 11, offset: 34788},
+								pos:  position{line: 1405, col: 11, offset: 34937},
 								name: "IdentifierName",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1400, col: 26, offset: 34803},
+							pos:   position{line: 1405, col: 26, offset: 34952},
 							label: "rest",
 							expr: &zeroOrMoreExpr{
-								pos: position{line: 1400, col: 31, offset: 34808},
+								pos: position{line: 1405, col: 31, offset: 34957},
 								expr: &actionExpr{
-									pos: position{line: 1400, col: 32, offset: 34809},
+									pos: position{line: 1405, col: 32, offset: 34958},
 									run: (*parser).callonIdentifierNames7,
 									expr: &seqExpr{
-										pos: position{line: 1400, col: 32, offset: 34809},
+										pos: position{line: 1405, col: 32, offset: 34958},
 										exprs: []any{
 											&ruleRefExpr{
-												pos:  position{line: 1400, col: 32, offset: 34809},
+												pos:  position{line: 1405, col: 32, offset: 34958},
 												name: "__",
 											},
 											&litMatcher{
-												pos:        position{line: 1400, col: 35, offset: 34812},
+												pos:        position{line: 1405, col: 35, offset: 34961},
 												val:        ",",
 												ignoreCase: false,
 												want:       "\",\"",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1400, col: 39, offset: 34816},
+												pos:  position{line: 1405, col: 39, offset: 34965},
 												name: "__",
 											},
 											&labeledExpr{
-												pos:   position{line: 1400, col: 42, offset: 34819},
+												pos:   position{line: 1405, col: 42, offset: 34968},
 												label: "id",
 												expr: &ruleRefExpr{
-													pos:  position{line: 1400, col: 45, offset: 34822},
+													pos:  position{line: 1405, col: 45, offset: 34971},
 													name: "IdentifierName",
 												},
 											},
@@ -9623,22 +9684,22 @@ var g = &grammar{
 		},
 		{
 			name: "IdentifierStart",
-			pos:  position{line: 1404, col: 1, offset: 34902},
+			pos:  position{line: 1409, col: 1, offset: 35051},
 			expr: &choiceExpr{
-				pos: position{line: 1405, col: 5, offset: 34922},
+				pos: position{line: 1410, col: 5, offset: 35071},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1405, col: 5, offset: 34922},
+						pos:  position{line: 1410, col: 5, offset: 35071},
 						name: "UnicodeLetter",
 					},
 					&litMatcher{
-						pos:        position{line: 1406, col: 5, offset: 34940},
+						pos:        position{line: 1411, col: 5, offset: 35089},
 						val:        "$",
 						ignoreCase: false,
 						want:       "\"$\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1407, col: 5, offset: 34948},
+						pos:        position{line: 1412, col: 5, offset: 35097},
 						val:        "_",
 						ignoreCase: false,
 						want:       "\"_\"",
@@ -9650,24 +9711,24 @@ var g = &grammar{
 		},
 		{
 			name: "IdentifierRest",
-			pos:  position{line: 1409, col: 1, offset: 34953},
+			pos:  position{line: 1414, col: 1, offset: 35102},
 			expr: &choiceExpr{
-				pos: position{line: 1410, col: 5, offset: 34972},
+				pos: position{line: 1415, col: 5, offset: 35121},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1410, col: 5, offset: 34972},
+						pos:  position{line: 1415, col: 5, offset: 35121},
 						name: "IdentifierStart",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1411, col: 5, offset: 34992},
+						pos:  position{line: 1416, col: 5, offset: 35141},
 						name: "UnicodeCombiningMark",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1412, col: 5, offset: 35017},
+						pos:  position{line: 1417, col: 5, offset: 35166},
 						name: "UnicodeDigit",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1413, col: 5, offset: 35034},
+						pos:  position{line: 1418, col: 5, offset: 35183},
 						name: "UnicodeConnectorPunctuation",
 					},
 				},
@@ -9677,24 +9738,24 @@ var g = &grammar{
 		},
 		{
 			name: "IDGuard",
-			pos:  position{line: 1415, col: 1, offset: 35063},
+			pos:  position{line: 1420, col: 1, offset: 35212},
 			expr: &choiceExpr{
-				pos: position{line: 1416, col: 5, offset: 35075},
+				pos: position{line: 1421, col: 5, offset: 35224},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1416, col: 5, offset: 35075},
+						pos:  position{line: 1421, col: 5, offset: 35224},
 						name: "BooleanLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1417, col: 5, offset: 35094},
+						pos:  position{line: 1422, col: 5, offset: 35243},
 						name: "NullLiteral",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1418, col: 5, offset: 35110},
+						pos:  position{line: 1423, col: 5, offset: 35259},
 						name: "NaN",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1419, col: 5, offset: 35118},
+						pos:  position{line: 1424, col: 5, offset: 35267},
 						name: "Infinity",
 					},
 				},
@@ -9704,25 +9765,25 @@ var g = &grammar{
 		},
 		{
 			name: "Time",
-			pos:  position{line: 1421, col: 1, offset: 35128},
+			pos:  position{line: 1426, col: 1, offset: 35277},
 			expr: &actionExpr{
-				pos: position{line: 1422, col: 5, offset: 35137},
+				pos: position{line: 1427, col: 5, offset: 35286},
 				run: (*parser).callonTime1,
 				expr: &seqExpr{
-					pos: position{line: 1422, col: 5, offset: 35137},
+					pos: position{line: 1427, col: 5, offset: 35286},
 					exprs: []any{
 						&ruleRefExpr{
-							pos:  position{line: 1422, col: 5, offset: 35137},
+							pos:  position{line: 1427, col: 5, offset: 35286},
 							name: "FullDate",
 						},
 						&litMatcher{
-							pos:        position{line: 1422, col: 14, offset: 35146},
+							pos:        position{line: 1427, col: 14, offset: 35295},
 							val:        "T",
 							ignoreCase: false,
 							want:       "\"T\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1422, col: 18, offset: 35150},
+							pos:  position{line: 1427, col: 18, offset: 35299},
 							name: "FullTime",
 						},
 					},
@@ -9733,32 +9794,32 @@ var g = &grammar{
 		},
 		{
 			name: "FullDate",
-			pos:  position{line: 1426, col: 1, offset: 35226},
+			pos:  position{line: 1431, col: 1, offset: 35375},
 			expr: &seqExpr{
-				pos: position{line: 1426, col: 12, offset: 35237},
+				pos: position{line: 1431, col: 12, offset: 35386},
 				exprs: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1426, col: 12, offset: 35237},
+						pos:  position{line: 1431, col: 12, offset: 35386},
 						name: "D4",
 					},
 					&litMatcher{
-						pos:        position{line: 1426, col: 15, offset: 35240},
+						pos:        position{line: 1431, col: 15, offset: 35389},
 						val:        "-",
 						ignoreCase: false,
 						want:       "\"-\"",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1426, col: 19, offset: 35244},
+						pos:  position{line: 1431, col: 19, offset: 35393},
 						name: "D2",
 					},
 					&litMatcher{
-						pos:        position{line: 1426, col: 22, offset: 35247},
+						pos:        position{line: 1431, col: 22, offset: 35396},
 						val:        "-",
 						ignoreCase: false,
 						want:       "\"-\"",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1426, col: 26, offset: 35251},
+						pos:  position{line: 1431, col: 26, offset: 35400},
 						name: "D2",
 					},
 				},
@@ -9768,33 +9829,33 @@ var g = &grammar{
 		},
 		{
 			name: "D4",
-			pos:  position{line: 1428, col: 1, offset: 35255},
+			pos:  position{line: 1433, col: 1, offset: 35404},
 			expr: &seqExpr{
-				pos: position{line: 1428, col: 6, offset: 35260},
+				pos: position{line: 1433, col: 6, offset: 35409},
 				exprs: []any{
 					&charClassMatcher{
-						pos:        position{line: 1428, col: 6, offset: 35260},
+						pos:        position{line: 1433, col: 6, offset: 35409},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
 						inverted:   false,
 					},
 					&charClassMatcher{
-						pos:        position{line: 1428, col: 11, offset: 35265},
+						pos:        position{line: 1433, col: 11, offset: 35414},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
 						inverted:   false,
 					},
 					&charClassMatcher{
-						pos:        position{line: 1428, col: 16, offset: 35270},
+						pos:        position{line: 1433, col: 16, offset: 35419},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
 						inverted:   false,
 					},
 					&charClassMatcher{
-						pos:        position{line: 1428, col: 21, offset: 35275},
+						pos:        position{line: 1433, col: 21, offset: 35424},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
@@ -9807,19 +9868,19 @@ var g = &grammar{
 		},
 		{
 			name: "D2",
-			pos:  position{line: 1429, col: 1, offset: 35281},
+			pos:  position{line: 1434, col: 1, offset: 35430},
 			expr: &seqExpr{
-				pos: position{line: 1429, col: 6, offset: 35286},
+				pos: position{line: 1434, col: 6, offset: 35435},
 				exprs: []any{
 					&charClassMatcher{
-						pos:        position{line: 1429, col: 6, offset: 35286},
+						pos:        position{line: 1434, col: 6, offset: 35435},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
 						inverted:   false,
 					},
 					&charClassMatcher{
-						pos:        position{line: 1429, col: 11, offset: 35291},
+						pos:        position{line: 1434, col: 11, offset: 35440},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
@@ -9832,16 +9893,16 @@ var g = &grammar{
 		},
 		{
 			name: "FullTime",
-			pos:  position{line: 1431, col: 1, offset: 35298},
+			pos:  position{line: 1436, col: 1, offset: 35447},
 			expr: &seqExpr{
-				pos: position{line: 1431, col: 12, offset: 35309},
+				pos: position{line: 1436, col: 12, offset: 35458},
 				exprs: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1431, col: 12, offset: 35309},
+						pos:  position{line: 1436, col: 12, offset: 35458},
 						name: "PartialTime",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1431, col: 24, offset: 35321},
+						pos:  position{line: 1436, col: 24, offset: 35470},
 						name: "TimeOffset",
 					},
 				},
@@ -9851,49 +9912,49 @@ var g = &grammar{
 		},
 		{
 			name: "PartialTime",
-			pos:  position{line: 1433, col: 1, offset: 35333},
+			pos:  position{line: 1438, col: 1, offset: 35482},
 			expr: &seqExpr{
-				pos: position{line: 1433, col: 15, offset: 35347},
+				pos: position{line: 1438, col: 15, offset: 35496},
 				exprs: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1433, col: 15, offset: 35347},
+						pos:  position{line: 1438, col: 15, offset: 35496},
 						name: "D2",
 					},
 					&litMatcher{
-						pos:        position{line: 1433, col: 18, offset: 35350},
+						pos:        position{line: 1438, col: 18, offset: 35499},
 						val:        ":",
 						ignoreCase: false,
 						want:       "\":\"",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1433, col: 22, offset: 35354},
+						pos:  position{line: 1438, col: 22, offset: 35503},
 						name: "D2",
 					},
 					&litMatcher{
-						pos:        position{line: 1433, col: 25, offset: 35357},
+						pos:        position{line: 1438, col: 25, offset: 35506},
 						val:        ":",
 						ignoreCase: false,
 						want:       "\":\"",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1433, col: 29, offset: 35361},
+						pos:  position{line: 1438, col: 29, offset: 35510},
 						name: "D2",
 					},
 					&zeroOrOneExpr{
-						pos: position{line: 1433, col: 32, offset: 35364},
+						pos: position{line: 1438, col: 32, offset: 35513},
 						expr: &seqExpr{
-							pos: position{line: 1433, col: 33, offset: 35365},
+							pos: position{line: 1438, col: 33, offset: 35514},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1433, col: 33, offset: 35365},
+									pos:        position{line: 1438, col: 33, offset: 35514},
 									val:        ".",
 									ignoreCase: false,
 									want:       "\".\"",
 								},
 								&oneOrMoreExpr{
-									pos: position{line: 1433, col: 37, offset: 35369},
+									pos: position{line: 1438, col: 37, offset: 35518},
 									expr: &charClassMatcher{
-										pos:        position{line: 1433, col: 37, offset: 35369},
+										pos:        position{line: 1438, col: 37, offset: 35518},
 										val:        "[0-9]",
 										ranges:     []rune{'0', '9'},
 										ignoreCase: false,
@@ -9910,30 +9971,30 @@ var g = &grammar{
 		},
 		{
 			name: "TimeOffset",
-			pos:  position{line: 1435, col: 1, offset: 35379},
+			pos:  position{line: 1440, col: 1, offset: 35528},
 			expr: &choiceExpr{
-				pos: position{line: 1436, col: 5, offset: 35394},
+				pos: position{line: 1441, col: 5, offset: 35543},
 				alternatives: []any{
 					&litMatcher{
-						pos:        position{line: 1436, col: 5, offset: 35394},
+						pos:        position{line: 1441, col: 5, offset: 35543},
 						val:        "Z",
 						ignoreCase: false,
 						want:       "\"Z\"",
 					},
 					&seqExpr{
-						pos: position{line: 1437, col: 5, offset: 35402},
+						pos: position{line: 1442, col: 5, offset: 35551},
 						exprs: []any{
 							&choiceExpr{
-								pos: position{line: 1437, col: 6, offset: 35403},
+								pos: position{line: 1442, col: 6, offset: 35552},
 								alternatives: []any{
 									&litMatcher{
-										pos:        position{line: 1437, col: 6, offset: 35403},
+										pos:        position{line: 1442, col: 6, offset: 35552},
 										val:        "+",
 										ignoreCase: false,
 										want:       "\"+\"",
 									},
 									&litMatcher{
-										pos:        position{line: 1437, col: 12, offset: 35409},
+										pos:        position{line: 1442, col: 12, offset: 35558},
 										val:        "-",
 										ignoreCase: false,
 										want:       "\"-\"",
@@ -9941,34 +10002,34 @@ var g = &grammar{
 								},
 							},
 							&ruleRefExpr{
-								pos:  position{line: 1437, col: 17, offset: 35414},
+								pos:  position{line: 1442, col: 17, offset: 35563},
 								name: "D2",
 							},
 							&litMatcher{
-								pos:        position{line: 1437, col: 20, offset: 35417},
+								pos:        position{line: 1442, col: 20, offset: 35566},
 								val:        ":",
 								ignoreCase: false,
 								want:       "\":\"",
 							},
 							&ruleRefExpr{
-								pos:  position{line: 1437, col: 24, offset: 35421},
+								pos:  position{line: 1442, col: 24, offset: 35570},
 								name: "D2",
 							},
 							&zeroOrOneExpr{
-								pos: position{line: 1437, col: 27, offset: 35424},
+								pos: position{line: 1442, col: 27, offset: 35573},
 								expr: &seqExpr{
-									pos: position{line: 1437, col: 28, offset: 35425},
+									pos: position{line: 1442, col: 28, offset: 35574},
 									exprs: []any{
 										&litMatcher{
-											pos:        position{line: 1437, col: 28, offset: 35425},
+											pos:        position{line: 1442, col: 28, offset: 35574},
 											val:        ".",
 											ignoreCase: false,
 											want:       "\".\"",
 										},
 										&oneOrMoreExpr{
-											pos: position{line: 1437, col: 32, offset: 35429},
+											pos: position{line: 1442, col: 32, offset: 35578},
 											expr: &charClassMatcher{
-												pos:        position{line: 1437, col: 32, offset: 35429},
+												pos:        position{line: 1442, col: 32, offset: 35578},
 												val:        "[0-9]",
 												ranges:     []rune{'0', '9'},
 												ignoreCase: false,
@@ -9987,33 +10048,33 @@ var g = &grammar{
 		},
 		{
 			name: "Duration",
-			pos:  position{line: 1439, col: 1, offset: 35439},
+			pos:  position{line: 1444, col: 1, offset: 35588},
 			expr: &actionExpr{
-				pos: position{line: 1440, col: 5, offset: 35452},
+				pos: position{line: 1445, col: 5, offset: 35601},
 				run: (*parser).callonDuration1,
 				expr: &seqExpr{
-					pos: position{line: 1440, col: 5, offset: 35452},
+					pos: position{line: 1445, col: 5, offset: 35601},
 					exprs: []any{
 						&zeroOrOneExpr{
-							pos: position{line: 1440, col: 5, offset: 35452},
+							pos: position{line: 1445, col: 5, offset: 35601},
 							expr: &litMatcher{
-								pos:        position{line: 1440, col: 5, offset: 35452},
+								pos:        position{line: 1445, col: 5, offset: 35601},
 								val:        "-",
 								ignoreCase: false,
 								want:       "\"-\"",
 							},
 						},
 						&oneOrMoreExpr{
-							pos: position{line: 1440, col: 10, offset: 35457},
+							pos: position{line: 1445, col: 10, offset: 35606},
 							expr: &seqExpr{
-								pos: position{line: 1440, col: 11, offset: 35458},
+								pos: position{line: 1445, col: 11, offset: 35607},
 								exprs: []any{
 									&ruleRefExpr{
-										pos:  position{line: 1440, col: 11, offset: 35458},
+										pos:  position{line: 1445, col: 11, offset: 35607},
 										name: "Decimal",
 									},
 									&ruleRefExpr{
-										pos:  position{line: 1440, col: 19, offset: 35466},
+										pos:  position{line: 1445, col: 19, offset: 35615},
 										name: "TimeUnit",
 									},
 								},
@@ -10027,27 +10088,27 @@ var g = &grammar{
 		},
 		{
 			name: "Decimal",
-			pos:  position{line: 1444, col: 1, offset: 35548},
+			pos:  position{line: 1449, col: 1, offset: 35697},
 			expr: &seqExpr{
-				pos: position{line: 1444, col: 11, offset: 35558},
+				pos: position{line: 1449, col: 11, offset: 35707},
 				exprs: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1444, col: 11, offset: 35558},
+						pos:  position{line: 1449, col: 11, offset: 35707},
 						name: "UInt",
 					},
 					&zeroOrOneExpr{
-						pos: position{line: 1444, col: 16, offset: 35563},
+						pos: position{line: 1449, col: 16, offset: 35712},
 						expr: &seqExpr{
-							pos: position{line: 1444, col: 17, offset: 35564},
+							pos: position{line: 1449, col: 17, offset: 35713},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1444, col: 17, offset: 35564},
+									pos:        position{line: 1449, col: 17, offset: 35713},
 									val:        ".",
 									ignoreCase: false,
 									want:       "\".\"",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1444, col: 21, offset: 35568},
+									pos:  position{line: 1449, col: 21, offset: 35717},
 									name: "UInt",
 								},
 							},
@@ -10060,60 +10121,60 @@ var g = &grammar{
 		},
 		{
 			name: "TimeUnit",
-			pos:  position{line: 1446, col: 1, offset: 35576},
+			pos:  position{line: 1451, col: 1, offset: 35725},
 			expr: &choiceExpr{
-				pos: position{line: 1447, col: 5, offset: 35589},
+				pos: position{line: 1452, col: 5, offset: 35738},
 				alternatives: []any{
 					&litMatcher{
-						pos:        position{line: 1447, col: 5, offset: 35589},
+						pos:        position{line: 1452, col: 5, offset: 35738},
 						val:        "ns",
 						ignoreCase: false,
 						want:       "\"ns\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1448, col: 5, offset: 35598},
+						pos:        position{line: 1453, col: 5, offset: 35747},
 						val:        "us",
 						ignoreCase: false,
 						want:       "\"us\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1449, col: 5, offset: 35607},
+						pos:        position{line: 1454, col: 5, offset: 35756},
 						val:        "ms",
 						ignoreCase: false,
 						want:       "\"ms\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1450, col: 5, offset: 35616},
+						pos:        position{line: 1455, col: 5, offset: 35765},
 						val:        "s",
 						ignoreCase: false,
 						want:       "\"s\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1451, col: 5, offset: 35624},
+						pos:        position{line: 1456, col: 5, offset: 35773},
 						val:        "m",
 						ignoreCase: false,
 						want:       "\"m\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1452, col: 5, offset: 35632},
+						pos:        position{line: 1457, col: 5, offset: 35781},
 						val:        "h",
 						ignoreCase: false,
 						want:       "\"h\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1453, col: 5, offset: 35640},
+						pos:        position{line: 1458, col: 5, offset: 35789},
 						val:        "d",
 						ignoreCase: false,
 						want:       "\"d\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1454, col: 5, offset: 35648},
+						pos:        position{line: 1459, col: 5, offset: 35797},
 						val:        "w",
 						ignoreCase: false,
 						want:       "\"w\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1455, col: 5, offset: 35656},
+						pos:        position{line: 1460, col: 5, offset: 35805},
 						val:        "y",
 						ignoreCase: false,
 						want:       "\"y\"",
@@ -10125,45 +10186,45 @@ var g = &grammar{
 		},
 		{
 			name: "IP",
-			pos:  position{line: 1457, col: 1, offset: 35661},
+			pos:  position{line: 1462, col: 1, offset: 35810},
 			expr: &actionExpr{
-				pos: position{line: 1458, col: 5, offset: 35668},
+				pos: position{line: 1463, col: 5, offset: 35817},
 				run: (*parser).callonIP1,
 				expr: &seqExpr{
-					pos: position{line: 1458, col: 5, offset: 35668},
+					pos: position{line: 1463, col: 5, offset: 35817},
 					exprs: []any{
 						&ruleRefExpr{
-							pos:  position{line: 1458, col: 5, offset: 35668},
+							pos:  position{line: 1463, col: 5, offset: 35817},
 							name: "UInt",
 						},
 						&litMatcher{
-							pos:        position{line: 1458, col: 10, offset: 35673},
+							pos:        position{line: 1463, col: 10, offset: 35822},
 							val:        ".",
 							ignoreCase: false,
 							want:       "\".\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1458, col: 14, offset: 35677},
+							pos:  position{line: 1463, col: 14, offset: 35826},
 							name: "UInt",
 						},
 						&litMatcher{
-							pos:        position{line: 1458, col: 19, offset: 35682},
+							pos:        position{line: 1463, col: 19, offset: 35831},
 							val:        ".",
 							ignoreCase: false,
 							want:       "\".\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1458, col: 23, offset: 35686},
+							pos:  position{line: 1463, col: 23, offset: 35835},
 							name: "UInt",
 						},
 						&litMatcher{
-							pos:        position{line: 1458, col: 28, offset: 35691},
+							pos:        position{line: 1463, col: 28, offset: 35840},
 							val:        ".",
 							ignoreCase: false,
 							want:       "\".\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1458, col: 32, offset: 35695},
+							pos:  position{line: 1463, col: 32, offset: 35844},
 							name: "UInt",
 						},
 					},
@@ -10174,43 +10235,43 @@ var g = &grammar{
 		},
 		{
 			name: "IP6",
-			pos:  position{line: 1460, col: 1, offset: 35732},
+			pos:  position{line: 1465, col: 1, offset: 35881},
 			expr: &actionExpr{
-				pos: position{line: 1461, col: 5, offset: 35740},
+				pos: position{line: 1466, col: 5, offset: 35889},
 				run: (*parser).callonIP61,
 				expr: &seqExpr{
-					pos: position{line: 1461, col: 5, offset: 35740},
+					pos: position{line: 1466, col: 5, offset: 35889},
 					exprs: []any{
 						&notExpr{
-							pos: position{line: 1461, col: 5, offset: 35740},
+							pos: position{line: 1466, col: 5, offset: 35889},
 							expr: &seqExpr{
-								pos: position{line: 1461, col: 7, offset: 35742},
+								pos: position{line: 1466, col: 7, offset: 35891},
 								exprs: []any{
 									&ruleRefExpr{
-										pos:  position{line: 1461, col: 7, offset: 35742},
+										pos:  position{line: 1466, col: 7, offset: 35891},
 										name: "Hex",
 									},
 									&litMatcher{
-										pos:        position{line: 1461, col: 11, offset: 35746},
+										pos:        position{line: 1466, col: 11, offset: 35895},
 										val:        ":",
 										ignoreCase: false,
 										want:       "\":\"",
 									},
 									&ruleRefExpr{
-										pos:  position{line: 1461, col: 15, offset: 35750},
+										pos:  position{line: 1466, col: 15, offset: 35899},
 										name: "Hex",
 									},
 									&notExpr{
-										pos: position{line: 1461, col: 19, offset: 35754},
+										pos: position{line: 1466, col: 19, offset: 35903},
 										expr: &choiceExpr{
-											pos: position{line: 1461, col: 21, offset: 35756},
+											pos: position{line: 1466, col: 21, offset: 35905},
 											alternatives: []any{
 												&ruleRefExpr{
-													pos:  position{line: 1461, col: 21, offset: 35756},
+													pos:  position{line: 1466, col: 21, offset: 35905},
 													name: "HexDigit",
 												},
 												&litMatcher{
-													pos:        position{line: 1461, col: 32, offset: 35767},
+													pos:        position{line: 1466, col: 32, offset: 35916},
 													val:        ":",
 													ignoreCase: false,
 													want:       "\":\"",
@@ -10222,10 +10283,10 @@ var g = &grammar{
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1461, col: 38, offset: 35773},
+							pos:   position{line: 1466, col: 38, offset: 35922},
 							label: "v",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1461, col: 40, offset: 35775},
+								pos:  position{line: 1466, col: 40, offset: 35924},
 								name: "IP6Variations",
 							},
 						},
@@ -10237,32 +10298,32 @@ var g = &grammar{
 		},
 		{
 			name: "IP6Variations",
-			pos:  position{line: 1465, col: 1, offset: 35939},
+			pos:  position{line: 1470, col: 1, offset: 36088},
 			expr: &choiceExpr{
-				pos: position{line: 1466, col: 5, offset: 35957},
+				pos: position{line: 1471, col: 5, offset: 36106},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1466, col: 5, offset: 35957},
+						pos: position{line: 1471, col: 5, offset: 36106},
 						run: (*parser).callonIP6Variations2,
 						expr: &seqExpr{
-							pos: position{line: 1466, col: 5, offset: 35957},
+							pos: position{line: 1471, col: 5, offset: 36106},
 							exprs: []any{
 								&labeledExpr{
-									pos:   position{line: 1466, col: 5, offset: 35957},
+									pos:   position{line: 1471, col: 5, offset: 36106},
 									label: "a",
 									expr: &oneOrMoreExpr{
-										pos: position{line: 1466, col: 7, offset: 35959},
+										pos: position{line: 1471, col: 7, offset: 36108},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1466, col: 7, offset: 35959},
+											pos:  position{line: 1471, col: 7, offset: 36108},
 											name: "HexColon",
 										},
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1466, col: 17, offset: 35969},
+									pos:   position{line: 1471, col: 17, offset: 36118},
 									label: "b",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1466, col: 19, offset: 35971},
+										pos:  position{line: 1471, col: 19, offset: 36120},
 										name: "IP6Tail",
 									},
 								},
@@ -10270,52 +10331,52 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1469, col: 5, offset: 36035},
+						pos: position{line: 1474, col: 5, offset: 36184},
 						run: (*parser).callonIP6Variations9,
 						expr: &seqExpr{
-							pos: position{line: 1469, col: 5, offset: 36035},
+							pos: position{line: 1474, col: 5, offset: 36184},
 							exprs: []any{
 								&labeledExpr{
-									pos:   position{line: 1469, col: 5, offset: 36035},
+									pos:   position{line: 1474, col: 5, offset: 36184},
 									label: "a",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1469, col: 7, offset: 36037},
+										pos:  position{line: 1474, col: 7, offset: 36186},
 										name: "Hex",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1469, col: 11, offset: 36041},
+									pos:   position{line: 1474, col: 11, offset: 36190},
 									label: "b",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1469, col: 13, offset: 36043},
+										pos: position{line: 1474, col: 13, offset: 36192},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1469, col: 13, offset: 36043},
+											pos:  position{line: 1474, col: 13, offset: 36192},
 											name: "ColonHex",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1469, col: 23, offset: 36053},
+									pos:        position{line: 1474, col: 23, offset: 36202},
 									val:        "::",
 									ignoreCase: false,
 									want:       "\"::\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1469, col: 28, offset: 36058},
+									pos:   position{line: 1474, col: 28, offset: 36207},
 									label: "d",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1469, col: 30, offset: 36060},
+										pos: position{line: 1474, col: 30, offset: 36209},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1469, col: 30, offset: 36060},
+											pos:  position{line: 1474, col: 30, offset: 36209},
 											name: "HexColon",
 										},
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1469, col: 40, offset: 36070},
+									pos:   position{line: 1474, col: 40, offset: 36219},
 									label: "e",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1469, col: 42, offset: 36072},
+										pos:  position{line: 1474, col: 42, offset: 36221},
 										name: "IP6Tail",
 									},
 								},
@@ -10323,33 +10384,33 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1472, col: 5, offset: 36171},
+						pos: position{line: 1477, col: 5, offset: 36320},
 						run: (*parser).callonIP6Variations22,
 						expr: &seqExpr{
-							pos: position{line: 1472, col: 5, offset: 36171},
+							pos: position{line: 1477, col: 5, offset: 36320},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1472, col: 5, offset: 36171},
+									pos:        position{line: 1477, col: 5, offset: 36320},
 									val:        "::",
 									ignoreCase: false,
 									want:       "\"::\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1472, col: 10, offset: 36176},
+									pos:   position{line: 1477, col: 10, offset: 36325},
 									label: "a",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1472, col: 12, offset: 36178},
+										pos: position{line: 1477, col: 12, offset: 36327},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1472, col: 12, offset: 36178},
+											pos:  position{line: 1477, col: 12, offset: 36327},
 											name: "HexColon",
 										},
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1472, col: 22, offset: 36188},
+									pos:   position{line: 1477, col: 22, offset: 36337},
 									label: "b",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1472, col: 24, offset: 36190},
+										pos:  position{line: 1477, col: 24, offset: 36339},
 										name: "IP6Tail",
 									},
 								},
@@ -10357,32 +10418,32 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1475, col: 5, offset: 36261},
+						pos: position{line: 1480, col: 5, offset: 36410},
 						run: (*parser).callonIP6Variations30,
 						expr: &seqExpr{
-							pos: position{line: 1475, col: 5, offset: 36261},
+							pos: position{line: 1480, col: 5, offset: 36410},
 							exprs: []any{
 								&labeledExpr{
-									pos:   position{line: 1475, col: 5, offset: 36261},
+									pos:   position{line: 1480, col: 5, offset: 36410},
 									label: "a",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1475, col: 7, offset: 36263},
+										pos:  position{line: 1480, col: 7, offset: 36412},
 										name: "Hex",
 									},
 								},
 								&labeledExpr{
-									pos:   position{line: 1475, col: 11, offset: 36267},
+									pos:   position{line: 1480, col: 11, offset: 36416},
 									label: "b",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1475, col: 13, offset: 36269},
+										pos: position{line: 1480, col: 13, offset: 36418},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1475, col: 13, offset: 36269},
+											pos:  position{line: 1480, col: 13, offset: 36418},
 											name: "ColonHex",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1475, col: 23, offset: 36279},
+									pos:        position{line: 1480, col: 23, offset: 36428},
 									val:        "::",
 									ignoreCase: false,
 									want:       "\"::\"",
@@ -10391,10 +10452,10 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1478, col: 5, offset: 36347},
+						pos: position{line: 1483, col: 5, offset: 36496},
 						run: (*parser).callonIP6Variations38,
 						expr: &litMatcher{
-							pos:        position{line: 1478, col: 5, offset: 36347},
+							pos:        position{line: 1483, col: 5, offset: 36496},
 							val:        "::",
 							ignoreCase: false,
 							want:       "\"::\"",
@@ -10407,16 +10468,16 @@ var g = &grammar{
 		},
 		{
 			name: "IP6Tail",
-			pos:  position{line: 1482, col: 1, offset: 36384},
+			pos:  position{line: 1487, col: 1, offset: 36533},
 			expr: &choiceExpr{
-				pos: position{line: 1483, col: 5, offset: 36396},
+				pos: position{line: 1488, col: 5, offset: 36545},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1483, col: 5, offset: 36396},
+						pos:  position{line: 1488, col: 5, offset: 36545},
 						name: "IP",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1484, col: 5, offset: 36403},
+						pos:  position{line: 1489, col: 5, offset: 36552},
 						name: "Hex",
 					},
 				},
@@ -10426,24 +10487,24 @@ var g = &grammar{
 		},
 		{
 			name: "ColonHex",
-			pos:  position{line: 1486, col: 1, offset: 36408},
+			pos:  position{line: 1491, col: 1, offset: 36557},
 			expr: &actionExpr{
-				pos: position{line: 1486, col: 12, offset: 36419},
+				pos: position{line: 1491, col: 12, offset: 36568},
 				run: (*parser).callonColonHex1,
 				expr: &seqExpr{
-					pos: position{line: 1486, col: 12, offset: 36419},
+					pos: position{line: 1491, col: 12, offset: 36568},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1486, col: 12, offset: 36419},
+							pos:        position{line: 1491, col: 12, offset: 36568},
 							val:        ":",
 							ignoreCase: false,
 							want:       "\":\"",
 						},
 						&labeledExpr{
-							pos:   position{line: 1486, col: 16, offset: 36423},
+							pos:   position{line: 1491, col: 16, offset: 36572},
 							label: "v",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1486, col: 18, offset: 36425},
+								pos:  position{line: 1491, col: 18, offset: 36574},
 								name: "Hex",
 							},
 						},
@@ -10455,23 +10516,23 @@ var g = &grammar{
 		},
 		{
 			name: "HexColon",
-			pos:  position{line: 1488, col: 1, offset: 36463},
+			pos:  position{line: 1493, col: 1, offset: 36612},
 			expr: &actionExpr{
-				pos: position{line: 1488, col: 12, offset: 36474},
+				pos: position{line: 1493, col: 12, offset: 36623},
 				run: (*parser).callonHexColon1,
 				expr: &seqExpr{
-					pos: position{line: 1488, col: 12, offset: 36474},
+					pos: position{line: 1493, col: 12, offset: 36623},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 1488, col: 12, offset: 36474},
+							pos:   position{line: 1493, col: 12, offset: 36623},
 							label: "v",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1488, col: 14, offset: 36476},
+								pos:  position{line: 1493, col: 14, offset: 36625},
 								name: "Hex",
 							},
 						},
 						&litMatcher{
-							pos:        position{line: 1488, col: 18, offset: 36480},
+							pos:        position{line: 1493, col: 18, offset: 36629},
 							val:        ":",
 							ignoreCase: false,
 							want:       "\":\"",
@@ -10484,32 +10545,32 @@ var g = &grammar{
 		},
 		{
 			name: "IP4Net",
-			pos:  position{line: 1490, col: 1, offset: 36518},
+			pos:  position{line: 1495, col: 1, offset: 36667},
 			expr: &actionExpr{
-				pos: position{line: 1491, col: 5, offset: 36529},
+				pos: position{line: 1496, col: 5, offset: 36678},
 				run: (*parser).callonIP4Net1,
 				expr: &seqExpr{
-					pos: position{line: 1491, col: 5, offset: 36529},
+					pos: position{line: 1496, col: 5, offset: 36678},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 1491, col: 5, offset: 36529},
+							pos:   position{line: 1496, col: 5, offset: 36678},
 							label: "a",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1491, col: 7, offset: 36531},
+								pos:  position{line: 1496, col: 7, offset: 36680},
 								name: "IP",
 							},
 						},
 						&litMatcher{
-							pos:        position{line: 1491, col: 10, offset: 36534},
+							pos:        position{line: 1496, col: 10, offset: 36683},
 							val:        "/",
 							ignoreCase: false,
 							want:       "\"/\"",
 						},
 						&labeledExpr{
-							pos:   position{line: 1491, col: 14, offset: 36538},
+							pos:   position{line: 1496, col: 14, offset: 36687},
 							label: "m",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1491, col: 16, offset: 36540},
+								pos:  position{line: 1496, col: 16, offset: 36689},
 								name: "UIntString",
 							},
 						},
@@ -10521,32 +10582,32 @@ var g = &grammar{
 		},
 		{
 			name: "IP6Net",
-			pos:  position{line: 1495, col: 1, offset: 36608},
+			pos:  position{line: 1500, col: 1, offset: 36757},
 			expr: &actionExpr{
-				pos: position{line: 1496, col: 5, offset: 36619},
+				pos: position{line: 1501, col: 5, offset: 36768},
 				run: (*parser).callonIP6Net1,
 				expr: &seqExpr{
-					pos: position{line: 1496, col: 5, offset: 36619},
+					pos: position{line: 1501, col: 5, offset: 36768},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 1496, col: 5, offset: 36619},
+							pos:   position{line: 1501, col: 5, offset: 36768},
 							label: "a",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1496, col: 7, offset: 36621},
+								pos:  position{line: 1501, col: 7, offset: 36770},
 								name: "IP6",
 							},
 						},
 						&litMatcher{
-							pos:        position{line: 1496, col: 11, offset: 36625},
+							pos:        position{line: 1501, col: 11, offset: 36774},
 							val:        "/",
 							ignoreCase: false,
 							want:       "\"/\"",
 						},
 						&labeledExpr{
-							pos:   position{line: 1496, col: 15, offset: 36629},
+							pos:   position{line: 1501, col: 15, offset: 36778},
 							label: "m",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1496, col: 17, offset: 36631},
+								pos:  position{line: 1501, col: 17, offset: 36780},
 								name: "UIntString",
 							},
 						},
@@ -10558,15 +10619,15 @@ var g = &grammar{
 		},
 		{
 			name: "UInt",
-			pos:  position{line: 1500, col: 1, offset: 36699},
+			pos:  position{line: 1505, col: 1, offset: 36848},
 			expr: &actionExpr{
-				pos: position{line: 1501, col: 4, offset: 36707},
+				pos: position{line: 1506, col: 4, offset: 36856},
 				run: (*parser).callonUInt1,
 				expr: &labeledExpr{
-					pos:   position{line: 1501, col: 4, offset: 36707},
+					pos:   position{line: 1506, col: 4, offset: 36856},
 					label: "s",
 					expr: &ruleRefExpr{
-						pos:  position{line: 1501, col: 6, offset: 36709},
+						pos:  position{line: 1506, col: 6, offset: 36858},
 						name: "UIntString",
 					},
 				},
@@ -10576,16 +10637,16 @@ var g = &grammar{
 		},
 		{
 			name: "IntString",
-			pos:  position{line: 1503, col: 1, offset: 36749},
+			pos:  position{line: 1508, col: 1, offset: 36898},
 			expr: &choiceExpr{
-				pos: position{line: 1504, col: 5, offset: 36763},
+				pos: position{line: 1509, col: 5, offset: 36912},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1504, col: 5, offset: 36763},
+						pos:  position{line: 1509, col: 5, offset: 36912},
 						name: "UIntString",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1505, col: 5, offset: 36778},
+						pos:  position{line: 1510, col: 5, offset: 36927},
 						name: "MinusIntString",
 					},
 				},
@@ -10595,14 +10656,14 @@ var g = &grammar{
 		},
 		{
 			name: "UIntString",
-			pos:  position{line: 1507, col: 1, offset: 36794},
+			pos:  position{line: 1512, col: 1, offset: 36943},
 			expr: &actionExpr{
-				pos: position{line: 1507, col: 14, offset: 36807},
+				pos: position{line: 1512, col: 14, offset: 36956},
 				run: (*parser).callonUIntString1,
 				expr: &oneOrMoreExpr{
-					pos: position{line: 1507, col: 14, offset: 36807},
+					pos: position{line: 1512, col: 14, offset: 36956},
 					expr: &charClassMatcher{
-						pos:        position{line: 1507, col: 14, offset: 36807},
+						pos:        position{line: 1512, col: 14, offset: 36956},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
@@ -10615,21 +10676,21 @@ var g = &grammar{
 		},
 		{
 			name: "MinusIntString",
-			pos:  position{line: 1509, col: 1, offset: 36846},
+			pos:  position{line: 1514, col: 1, offset: 36995},
 			expr: &actionExpr{
-				pos: position{line: 1510, col: 5, offset: 36865},
+				pos: position{line: 1515, col: 5, offset: 37014},
 				run: (*parser).callonMinusIntString1,
 				expr: &seqExpr{
-					pos: position{line: 1510, col: 5, offset: 36865},
+					pos: position{line: 1515, col: 5, offset: 37014},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1510, col: 5, offset: 36865},
+							pos:        position{line: 1515, col: 5, offset: 37014},
 							val:        "-",
 							ignoreCase: false,
 							want:       "\"-\"",
 						},
 						&ruleRefExpr{
-							pos:  position{line: 1510, col: 9, offset: 36869},
+							pos:  position{line: 1515, col: 9, offset: 37018},
 							name: "UIntString",
 						},
 					},
@@ -10640,29 +10701,29 @@ var g = &grammar{
 		},
 		{
 			name: "FloatString",
-			pos:  position{line: 1512, col: 1, offset: 36912},
+			pos:  position{line: 1517, col: 1, offset: 37061},
 			expr: &choiceExpr{
-				pos: position{line: 1513, col: 5, offset: 36928},
+				pos: position{line: 1518, col: 5, offset: 37077},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1513, col: 5, offset: 36928},
+						pos: position{line: 1518, col: 5, offset: 37077},
 						run: (*parser).callonFloatString2,
 						expr: &seqExpr{
-							pos: position{line: 1513, col: 5, offset: 36928},
+							pos: position{line: 1518, col: 5, offset: 37077},
 							exprs: []any{
 								&zeroOrOneExpr{
-									pos: position{line: 1513, col: 5, offset: 36928},
+									pos: position{line: 1518, col: 5, offset: 37077},
 									expr: &litMatcher{
-										pos:        position{line: 1513, col: 5, offset: 36928},
+										pos:        position{line: 1518, col: 5, offset: 37077},
 										val:        "-",
 										ignoreCase: false,
 										want:       "\"-\"",
 									},
 								},
 								&oneOrMoreExpr{
-									pos: position{line: 1513, col: 10, offset: 36933},
+									pos: position{line: 1518, col: 10, offset: 37082},
 									expr: &charClassMatcher{
-										pos:        position{line: 1513, col: 10, offset: 36933},
+										pos:        position{line: 1518, col: 10, offset: 37082},
 										val:        "[0-9]",
 										ranges:     []rune{'0', '9'},
 										ignoreCase: false,
@@ -10670,15 +10731,15 @@ var g = &grammar{
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1513, col: 17, offset: 36940},
+									pos:        position{line: 1518, col: 17, offset: 37089},
 									val:        ".",
 									ignoreCase: false,
 									want:       "\".\"",
 								},
 								&zeroOrMoreExpr{
-									pos: position{line: 1513, col: 21, offset: 36944},
+									pos: position{line: 1518, col: 21, offset: 37093},
 									expr: &charClassMatcher{
-										pos:        position{line: 1513, col: 21, offset: 36944},
+										pos:        position{line: 1518, col: 21, offset: 37093},
 										val:        "[0-9]",
 										ranges:     []rune{'0', '9'},
 										ignoreCase: false,
@@ -10686,9 +10747,9 @@ var g = &grammar{
 									},
 								},
 								&zeroOrOneExpr{
-									pos: position{line: 1513, col: 28, offset: 36951},
+									pos: position{line: 1518, col: 28, offset: 37100},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1513, col: 28, offset: 36951},
+										pos:  position{line: 1518, col: 28, offset: 37100},
 										name: "ExponentPart",
 									},
 								},
@@ -10696,30 +10757,30 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1514, col: 5, offset: 37000},
+						pos: position{line: 1519, col: 5, offset: 37149},
 						run: (*parser).callonFloatString13,
 						expr: &seqExpr{
-							pos: position{line: 1514, col: 5, offset: 37000},
+							pos: position{line: 1519, col: 5, offset: 37149},
 							exprs: []any{
 								&zeroOrOneExpr{
-									pos: position{line: 1514, col: 5, offset: 37000},
+									pos: position{line: 1519, col: 5, offset: 37149},
 									expr: &litMatcher{
-										pos:        position{line: 1514, col: 5, offset: 37000},
+										pos:        position{line: 1519, col: 5, offset: 37149},
 										val:        "-",
 										ignoreCase: false,
 										want:       "\"-\"",
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1514, col: 10, offset: 37005},
+									pos:        position{line: 1519, col: 10, offset: 37154},
 									val:        ".",
 									ignoreCase: false,
 									want:       "\".\"",
 								},
 								&oneOrMoreExpr{
-									pos: position{line: 1514, col: 14, offset: 37009},
+									pos: position{line: 1519, col: 14, offset: 37158},
 									expr: &charClassMatcher{
-										pos:        position{line: 1514, col: 14, offset: 37009},
+										pos:        position{line: 1519, col: 14, offset: 37158},
 										val:        "[0-9]",
 										ranges:     []rune{'0', '9'},
 										ignoreCase: false,
@@ -10727,9 +10788,9 @@ var g = &grammar{
 									},
 								},
 								&zeroOrOneExpr{
-									pos: position{line: 1514, col: 21, offset: 37016},
+									pos: position{line: 1519, col: 21, offset: 37165},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1514, col: 21, offset: 37016},
+										pos:  position{line: 1519, col: 21, offset: 37165},
 										name: "ExponentPart",
 									},
 								},
@@ -10737,17 +10798,17 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1515, col: 5, offset: 37065},
+						pos: position{line: 1520, col: 5, offset: 37214},
 						run: (*parser).callonFloatString22,
 						expr: &choiceExpr{
-							pos: position{line: 1515, col: 6, offset: 37066},
+							pos: position{line: 1520, col: 6, offset: 37215},
 							alternatives: []any{
 								&ruleRefExpr{
-									pos:  position{line: 1515, col: 6, offset: 37066},
+									pos:  position{line: 1520, col: 6, offset: 37215},
 									name: "NaN",
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1515, col: 12, offset: 37072},
+									pos:  position{line: 1520, col: 12, offset: 37221},
 									name: "Infinity",
 								},
 							},
@@ -10760,20 +10821,20 @@ var g = &grammar{
 		},
 		{
 			name: "ExponentPart",
-			pos:  position{line: 1518, col: 1, offset: 37115},
+			pos:  position{line: 1523, col: 1, offset: 37264},
 			expr: &seqExpr{
-				pos: position{line: 1518, col: 16, offset: 37130},
+				pos: position{line: 1523, col: 16, offset: 37279},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 1518, col: 16, offset: 37130},
+						pos:        position{line: 1523, col: 16, offset: 37279},
 						val:        "e",
 						ignoreCase: true,
 						want:       "\"e\"i",
 					},
 					&zeroOrOneExpr{
-						pos: position{line: 1518, col: 21, offset: 37135},
+						pos: position{line: 1523, col: 21, offset: 37284},
 						expr: &charClassMatcher{
-							pos:        position{line: 1518, col: 21, offset: 37135},
+							pos:        position{line: 1523, col: 21, offset: 37284},
 							val:        "[+-]",
 							chars:      []rune{'+', '-'},
 							ignoreCase: false,
@@ -10781,7 +10842,7 @@ var g = &grammar{
 						},
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1518, col: 27, offset: 37141},
+						pos:  position{line: 1523, col: 27, offset: 37290},
 						name: "UIntString",
 					},
 				},
@@ -10791,9 +10852,9 @@ var g = &grammar{
 		},
 		{
 			name: "NaN",
-			pos:  position{line: 1520, col: 1, offset: 37153},
+			pos:  position{line: 1525, col: 1, offset: 37302},
 			expr: &litMatcher{
-				pos:        position{line: 1520, col: 7, offset: 37159},
+				pos:        position{line: 1525, col: 7, offset: 37308},
 				val:        "NaN",
 				ignoreCase: false,
 				want:       "\"NaN\"",
@@ -10803,23 +10864,23 @@ var g = &grammar{
 		},
 		{
 			name: "Infinity",
-			pos:  position{line: 1522, col: 1, offset: 37166},
+			pos:  position{line: 1527, col: 1, offset: 37315},
 			expr: &seqExpr{
-				pos: position{line: 1522, col: 12, offset: 37177},
+				pos: position{line: 1527, col: 12, offset: 37326},
 				exprs: []any{
 					&zeroOrOneExpr{
-						pos: position{line: 1522, col: 12, offset: 37177},
+						pos: position{line: 1527, col: 12, offset: 37326},
 						expr: &choiceExpr{
-							pos: position{line: 1522, col: 13, offset: 37178},
+							pos: position{line: 1527, col: 13, offset: 37327},
 							alternatives: []any{
 								&litMatcher{
-									pos:        position{line: 1522, col: 13, offset: 37178},
+									pos:        position{line: 1527, col: 13, offset: 37327},
 									val:        "-",
 									ignoreCase: false,
 									want:       "\"-\"",
 								},
 								&litMatcher{
-									pos:        position{line: 1522, col: 19, offset: 37184},
+									pos:        position{line: 1527, col: 19, offset: 37333},
 									val:        "+",
 									ignoreCase: false,
 									want:       "\"+\"",
@@ -10828,7 +10889,7 @@ var g = &grammar{
 						},
 					},
 					&litMatcher{
-						pos:        position{line: 1522, col: 25, offset: 37190},
+						pos:        position{line: 1527, col: 25, offset: 37339},
 						val:        "Inf",
 						ignoreCase: false,
 						want:       "\"Inf\"",
@@ -10840,14 +10901,14 @@ var g = &grammar{
 		},
 		{
 			name: "Hex",
-			pos:  position{line: 1524, col: 1, offset: 37197},
+			pos:  position{line: 1529, col: 1, offset: 37346},
 			expr: &actionExpr{
-				pos: position{line: 1524, col: 7, offset: 37203},
+				pos: position{line: 1529, col: 7, offset: 37352},
 				run: (*parser).callonHex1,
 				expr: &oneOrMoreExpr{
-					pos: position{line: 1524, col: 7, offset: 37203},
+					pos: position{line: 1529, col: 7, offset: 37352},
 					expr: &ruleRefExpr{
-						pos:  position{line: 1524, col: 7, offset: 37203},
+						pos:  position{line: 1529, col: 7, offset: 37352},
 						name: "HexDigit",
 					},
 				},
@@ -10857,9 +10918,9 @@ var g = &grammar{
 		},
 		{
 			name: "HexDigit",
-			pos:  position{line: 1526, col: 1, offset: 37245},
+			pos:  position{line: 1531, col: 1, offset: 37394},
 			expr: &charClassMatcher{
-				pos:        position{line: 1526, col: 12, offset: 37256},
+				pos:        position{line: 1531, col: 12, offset: 37405},
 				val:        "[0-9a-fA-F]",
 				ranges:     []rune{'0', '9', 'a', 'f', 'A', 'F'},
 				ignoreCase: false,
@@ -10870,35 +10931,35 @@ var g = &grammar{
 		},
 		{
 			name: "QuotedString",
-			pos:  position{line: 1528, col: 1, offset: 37269},
+			pos:  position{line: 1533, col: 1, offset: 37418},
 			expr: &choiceExpr{
-				pos: position{line: 1529, col: 5, offset: 37286},
+				pos: position{line: 1534, col: 5, offset: 37435},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1529, col: 5, offset: 37286},
+						pos: position{line: 1534, col: 5, offset: 37435},
 						run: (*parser).callonQuotedString2,
 						expr: &seqExpr{
-							pos: position{line: 1529, col: 5, offset: 37286},
+							pos: position{line: 1534, col: 5, offset: 37435},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1529, col: 5, offset: 37286},
+									pos:        position{line: 1534, col: 5, offset: 37435},
 									val:        "\"",
 									ignoreCase: false,
 									want:       "\"\\\"\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1529, col: 9, offset: 37290},
+									pos:   position{line: 1534, col: 9, offset: 37439},
 									label: "v",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1529, col: 11, offset: 37292},
+										pos: position{line: 1534, col: 11, offset: 37441},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1529, col: 11, offset: 37292},
+											pos:  position{line: 1534, col: 11, offset: 37441},
 											name: "DoubleQuotedChar",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1529, col: 29, offset: 37310},
+									pos:        position{line: 1534, col: 29, offset: 37459},
 									val:        "\"",
 									ignoreCase: false,
 									want:       "\"\\\"\"",
@@ -10907,30 +10968,30 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1530, col: 5, offset: 37347},
+						pos: position{line: 1535, col: 5, offset: 37496},
 						run: (*parser).callonQuotedString9,
 						expr: &seqExpr{
-							pos: position{line: 1530, col: 5, offset: 37347},
+							pos: position{line: 1535, col: 5, offset: 37496},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1530, col: 5, offset: 37347},
+									pos:        position{line: 1535, col: 5, offset: 37496},
 									val:        "'",
 									ignoreCase: false,
 									want:       "\"'\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1530, col: 9, offset: 37351},
+									pos:   position{line: 1535, col: 9, offset: 37500},
 									label: "v",
 									expr: &zeroOrMoreExpr{
-										pos: position{line: 1530, col: 11, offset: 37353},
+										pos: position{line: 1535, col: 11, offset: 37502},
 										expr: &ruleRefExpr{
-											pos:  position{line: 1530, col: 11, offset: 37353},
+											pos:  position{line: 1535, col: 11, offset: 37502},
 											name: "SingleQuotedChar",
 										},
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1530, col: 29, offset: 37371},
+									pos:        position{line: 1535, col: 29, offset: 37520},
 									val:        "'",
 									ignoreCase: false,
 									want:       "\"'\"",
@@ -10945,57 +11006,57 @@ var g = &grammar{
 		},
 		{
 			name: "DoubleQuotedChar",
-			pos:  position{line: 1532, col: 1, offset: 37405},
+			pos:  position{line: 1537, col: 1, offset: 37554},
 			expr: &choiceExpr{
-				pos: position{line: 1533, col: 5, offset: 37426},
+				pos: position{line: 1538, col: 5, offset: 37575},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1533, col: 5, offset: 37426},
+						pos: position{line: 1538, col: 5, offset: 37575},
 						run: (*parser).callonDoubleQuotedChar2,
 						expr: &seqExpr{
-							pos: position{line: 1533, col: 5, offset: 37426},
+							pos: position{line: 1538, col: 5, offset: 37575},
 							exprs: []any{
 								&notExpr{
-									pos: position{line: 1533, col: 5, offset: 37426},
+									pos: position{line: 1538, col: 5, offset: 37575},
 									expr: &choiceExpr{
-										pos: position{line: 1533, col: 7, offset: 37428},
+										pos: position{line: 1538, col: 7, offset: 37577},
 										alternatives: []any{
 											&litMatcher{
-												pos:        position{line: 1533, col: 7, offset: 37428},
+												pos:        position{line: 1538, col: 7, offset: 37577},
 												val:        "\"",
 												ignoreCase: false,
 												want:       "\"\\\"\"",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1533, col: 13, offset: 37434},
+												pos:  position{line: 1538, col: 13, offset: 37583},
 												name: "EscapedChar",
 											},
 										},
 									},
 								},
 								&anyMatcher{
-									line: 1533, col: 26, offset: 37447,
+									line: 1538, col: 26, offset: 37596,
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1534, col: 5, offset: 37484},
+						pos: position{line: 1539, col: 5, offset: 37633},
 						run: (*parser).callonDoubleQuotedChar9,
 						expr: &seqExpr{
-							pos: position{line: 1534, col: 5, offset: 37484},
+							pos: position{line: 1539, col: 5, offset: 37633},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1534, col: 5, offset: 37484},
+									pos:        position{line: 1539, col: 5, offset: 37633},
 									val:        "\\",
 									ignoreCase: false,
 									want:       "\"\\\\\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1534, col: 10, offset: 37489},
+									pos:   position{line: 1539, col: 10, offset: 37638},
 									label: "s",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1534, col: 12, offset: 37491},
+										pos:  position{line: 1539, col: 12, offset: 37640},
 										name: "EscapeSequence",
 									},
 								},
@@ -11009,28 +11070,28 @@ var g = &grammar{
 		},
 		{
 			name: "KeyWord",
-			pos:  position{line: 1536, col: 1, offset: 37525},
+			pos:  position{line: 1541, col: 1, offset: 37674},
 			expr: &actionExpr{
-				pos: position{line: 1537, col: 5, offset: 37537},
+				pos: position{line: 1542, col: 5, offset: 37686},
 				run: (*parser).callonKeyWord1,
 				expr: &seqExpr{
-					pos: position{line: 1537, col: 5, offset: 37537},
+					pos: position{line: 1542, col: 5, offset: 37686},
 					exprs: []any{
 						&labeledExpr{
-							pos:   position{line: 1537, col: 5, offset: 37537},
+							pos:   position{line: 1542, col: 5, offset: 37686},
 							label: "head",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1537, col: 10, offset: 37542},
+								pos:  position{line: 1542, col: 10, offset: 37691},
 								name: "KeyWordStart",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1537, col: 23, offset: 37555},
+							pos:   position{line: 1542, col: 23, offset: 37704},
 							label: "tail",
 							expr: &zeroOrMoreExpr{
-								pos: position{line: 1537, col: 28, offset: 37560},
+								pos: position{line: 1542, col: 28, offset: 37709},
 								expr: &ruleRefExpr{
-									pos:  position{line: 1537, col: 28, offset: 37560},
+									pos:  position{line: 1542, col: 28, offset: 37709},
 									name: "KeyWordRest",
 								},
 							},
@@ -11043,16 +11104,16 @@ var g = &grammar{
 		},
 		{
 			name: "KeyWordStart",
-			pos:  position{line: 1539, col: 1, offset: 37622},
+			pos:  position{line: 1544, col: 1, offset: 37771},
 			expr: &choiceExpr{
-				pos: position{line: 1540, col: 5, offset: 37639},
+				pos: position{line: 1545, col: 5, offset: 37788},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1540, col: 5, offset: 37639},
+						pos:  position{line: 1545, col: 5, offset: 37788},
 						name: "KeyWordChars",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1541, col: 5, offset: 37656},
+						pos:  position{line: 1546, col: 5, offset: 37805},
 						name: "KeyWordEsc",
 					},
 				},
@@ -11062,16 +11123,16 @@ var g = &grammar{
 		},
 		{
 			name: "KeyWordRest",
-			pos:  position{line: 1543, col: 1, offset: 37668},
+			pos:  position{line: 1548, col: 1, offset: 37817},
 			expr: &choiceExpr{
-				pos: position{line: 1544, col: 5, offset: 37684},
+				pos: position{line: 1549, col: 5, offset: 37833},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1544, col: 5, offset: 37684},
+						pos:  position{line: 1549, col: 5, offset: 37833},
 						name: "KeyWordStart",
 					},
 					&charClassMatcher{
-						pos:        position{line: 1545, col: 5, offset: 37701},
+						pos:        position{line: 1550, col: 5, offset: 37850},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
@@ -11084,19 +11145,19 @@ var g = &grammar{
 		},
 		{
 			name: "KeyWordChars",
-			pos:  position{line: 1547, col: 1, offset: 37708},
+			pos:  position{line: 1552, col: 1, offset: 37857},
 			expr: &actionExpr{
-				pos: position{line: 1547, col: 16, offset: 37723},
+				pos: position{line: 1552, col: 16, offset: 37872},
 				run: (*parser).callonKeyWordChars1,
 				expr: &choiceExpr{
-					pos: position{line: 1547, col: 17, offset: 37724},
+					pos: position{line: 1552, col: 17, offset: 37873},
 					alternatives: []any{
 						&ruleRefExpr{
-							pos:  position{line: 1547, col: 17, offset: 37724},
+							pos:  position{line: 1552, col: 17, offset: 37873},
 							name: "UnicodeLetter",
 						},
 						&charClassMatcher{
-							pos:        position{line: 1547, col: 33, offset: 37740},
+							pos:        position{line: 1552, col: 33, offset: 37889},
 							val:        "[_.:/%#@~]",
 							chars:      []rune{'_', '.', ':', '/', '%', '#', '@', '~'},
 							ignoreCase: false,
@@ -11110,31 +11171,31 @@ var g = &grammar{
 		},
 		{
 			name: "KeyWordEsc",
-			pos:  position{line: 1549, col: 1, offset: 37784},
+			pos:  position{line: 1554, col: 1, offset: 37933},
 			expr: &actionExpr{
-				pos: position{line: 1549, col: 14, offset: 37797},
+				pos: position{line: 1554, col: 14, offset: 37946},
 				run: (*parser).callonKeyWordEsc1,
 				expr: &seqExpr{
-					pos: position{line: 1549, col: 14, offset: 37797},
+					pos: position{line: 1554, col: 14, offset: 37946},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1549, col: 14, offset: 37797},
+							pos:        position{line: 1554, col: 14, offset: 37946},
 							val:        "\\",
 							ignoreCase: false,
 							want:       "\"\\\\\"",
 						},
 						&labeledExpr{
-							pos:   position{line: 1549, col: 19, offset: 37802},
+							pos:   position{line: 1554, col: 19, offset: 37951},
 							label: "s",
 							expr: &choiceExpr{
-								pos: position{line: 1549, col: 22, offset: 37805},
+								pos: position{line: 1554, col: 22, offset: 37954},
 								alternatives: []any{
 									&ruleRefExpr{
-										pos:  position{line: 1549, col: 22, offset: 37805},
+										pos:  position{line: 1554, col: 22, offset: 37954},
 										name: "KeywordEscape",
 									},
 									&ruleRefExpr{
-										pos:  position{line: 1549, col: 38, offset: 37821},
+										pos:  position{line: 1554, col: 38, offset: 37970},
 										name: "EscapeSequence",
 									},
 								},
@@ -11148,42 +11209,42 @@ var g = &grammar{
 		},
 		{
 			name: "GlobPattern",
-			pos:  position{line: 1551, col: 1, offset: 37856},
+			pos:  position{line: 1556, col: 1, offset: 38005},
 			expr: &actionExpr{
-				pos: position{line: 1552, col: 5, offset: 37872},
+				pos: position{line: 1557, col: 5, offset: 38021},
 				run: (*parser).callonGlobPattern1,
 				expr: &seqExpr{
-					pos: position{line: 1552, col: 5, offset: 37872},
+					pos: position{line: 1557, col: 5, offset: 38021},
 					exprs: []any{
 						&andExpr{
-							pos: position{line: 1552, col: 5, offset: 37872},
+							pos: position{line: 1557, col: 5, offset: 38021},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1552, col: 6, offset: 37873},
+								pos:  position{line: 1557, col: 6, offset: 38022},
 								name: "GlobProperStart",
 							},
 						},
 						&andExpr{
-							pos: position{line: 1552, col: 22, offset: 37889},
+							pos: position{line: 1557, col: 22, offset: 38038},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1552, col: 23, offset: 37890},
+								pos:  position{line: 1557, col: 23, offset: 38039},
 								name: "GlobHasStar",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1552, col: 35, offset: 37902},
+							pos:   position{line: 1557, col: 35, offset: 38051},
 							label: "head",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1552, col: 40, offset: 37907},
+								pos:  position{line: 1557, col: 40, offset: 38056},
 								name: "GlobStart",
 							},
 						},
 						&labeledExpr{
-							pos:   position{line: 1552, col: 50, offset: 37917},
+							pos:   position{line: 1557, col: 50, offset: 38066},
 							label: "tail",
 							expr: &zeroOrMoreExpr{
-								pos: position{line: 1552, col: 55, offset: 37922},
+								pos: position{line: 1557, col: 55, offset: 38071},
 								expr: &ruleRefExpr{
-									pos:  position{line: 1552, col: 55, offset: 37922},
+									pos:  position{line: 1557, col: 55, offset: 38071},
 									name: "GlobRest",
 								},
 							},
@@ -11196,28 +11257,28 @@ var g = &grammar{
 		},
 		{
 			name: "GlobProperStart",
-			pos:  position{line: 1556, col: 1, offset: 37991},
+			pos:  position{line: 1561, col: 1, offset: 38140},
 			expr: &choiceExpr{
-				pos: position{line: 1556, col: 19, offset: 38009},
+				pos: position{line: 1561, col: 19, offset: 38158},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1556, col: 19, offset: 38009},
+						pos:  position{line: 1561, col: 19, offset: 38158},
 						name: "KeyWordStart",
 					},
 					&seqExpr{
-						pos: position{line: 1556, col: 34, offset: 38024},
+						pos: position{line: 1561, col: 34, offset: 38173},
 						exprs: []any{
 							&oneOrMoreExpr{
-								pos: position{line: 1556, col: 34, offset: 38024},
+								pos: position{line: 1561, col: 34, offset: 38173},
 								expr: &litMatcher{
-									pos:        position{line: 1556, col: 34, offset: 38024},
+									pos:        position{line: 1561, col: 34, offset: 38173},
 									val:        "*",
 									ignoreCase: false,
 									want:       "\"*\"",
 								},
 							},
 							&ruleRefExpr{
-								pos:  position{line: 1556, col: 39, offset: 38029},
+								pos:  position{line: 1561, col: 39, offset: 38178},
 								name: "KeyWordRest",
 							},
 						},
@@ -11229,19 +11290,19 @@ var g = &grammar{
 		},
 		{
 			name: "GlobHasStar",
-			pos:  position{line: 1557, col: 1, offset: 38041},
+			pos:  position{line: 1562, col: 1, offset: 38190},
 			expr: &seqExpr{
-				pos: position{line: 1557, col: 15, offset: 38055},
+				pos: position{line: 1562, col: 15, offset: 38204},
 				exprs: []any{
 					&zeroOrMoreExpr{
-						pos: position{line: 1557, col: 15, offset: 38055},
+						pos: position{line: 1562, col: 15, offset: 38204},
 						expr: &ruleRefExpr{
-							pos:  position{line: 1557, col: 15, offset: 38055},
+							pos:  position{line: 1562, col: 15, offset: 38204},
 							name: "KeyWordRest",
 						},
 					},
 					&litMatcher{
-						pos:        position{line: 1557, col: 28, offset: 38068},
+						pos:        position{line: 1562, col: 28, offset: 38217},
 						val:        "*",
 						ignoreCase: false,
 						want:       "\"*\"",
@@ -11253,23 +11314,23 @@ var g = &grammar{
 		},
 		{
 			name: "GlobStart",
-			pos:  position{line: 1559, col: 1, offset: 38073},
+			pos:  position{line: 1564, col: 1, offset: 38222},
 			expr: &choiceExpr{
-				pos: position{line: 1560, col: 5, offset: 38087},
+				pos: position{line: 1565, col: 5, offset: 38236},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1560, col: 5, offset: 38087},
+						pos:  position{line: 1565, col: 5, offset: 38236},
 						name: "KeyWordChars",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1561, col: 5, offset: 38104},
+						pos:  position{line: 1566, col: 5, offset: 38253},
 						name: "GlobEsc",
 					},
 					&actionExpr{
-						pos: position{line: 1562, col: 5, offset: 38116},
+						pos: position{line: 1567, col: 5, offset: 38265},
 						run: (*parser).callonGlobStart4,
 						expr: &litMatcher{
-							pos:        position{line: 1562, col: 5, offset: 38116},
+							pos:        position{line: 1567, col: 5, offset: 38265},
 							val:        "*",
 							ignoreCase: false,
 							want:       "\"*\"",
@@ -11282,16 +11343,16 @@ var g = &grammar{
 		},
 		{
 			name: "GlobRest",
-			pos:  position{line: 1564, col: 1, offset: 38141},
+			pos:  position{line: 1569, col: 1, offset: 38290},
 			expr: &choiceExpr{
-				pos: position{line: 1565, col: 5, offset: 38154},
+				pos: position{line: 1570, col: 5, offset: 38303},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1565, col: 5, offset: 38154},
+						pos:  position{line: 1570, col: 5, offset: 38303},
 						name: "GlobStart",
 					},
 					&charClassMatcher{
-						pos:        position{line: 1566, col: 5, offset: 38168},
+						pos:        position{line: 1571, col: 5, offset: 38317},
 						val:        "[0-9]",
 						ranges:     []rune{'0', '9'},
 						ignoreCase: false,
@@ -11304,31 +11365,31 @@ var g = &grammar{
 		},
 		{
 			name: "GlobEsc",
-			pos:  position{line: 1568, col: 1, offset: 38175},
+			pos:  position{line: 1573, col: 1, offset: 38324},
 			expr: &actionExpr{
-				pos: position{line: 1568, col: 11, offset: 38185},
+				pos: position{line: 1573, col: 11, offset: 38334},
 				run: (*parser).callonGlobEsc1,
 				expr: &seqExpr{
-					pos: position{line: 1568, col: 11, offset: 38185},
+					pos: position{line: 1573, col: 11, offset: 38334},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1568, col: 11, offset: 38185},
+							pos:        position{line: 1573, col: 11, offset: 38334},
 							val:        "\\",
 							ignoreCase: false,
 							want:       "\"\\\\\"",
 						},
 						&labeledExpr{
-							pos:   position{line: 1568, col: 16, offset: 38190},
+							pos:   position{line: 1573, col: 16, offset: 38339},
 							label: "s",
 							expr: &choiceExpr{
-								pos: position{line: 1568, col: 19, offset: 38193},
+								pos: position{line: 1573, col: 19, offset: 38342},
 								alternatives: []any{
 									&ruleRefExpr{
-										pos:  position{line: 1568, col: 19, offset: 38193},
+										pos:  position{line: 1573, col: 19, offset: 38342},
 										name: "GlobEscape",
 									},
 									&ruleRefExpr{
-										pos:  position{line: 1568, col: 32, offset: 38206},
+										pos:  position{line: 1573, col: 32, offset: 38355},
 										name: "EscapeSequence",
 									},
 								},
@@ -11342,32 +11403,32 @@ var g = &grammar{
 		},
 		{
 			name: "GlobEscape",
-			pos:  position{line: 1570, col: 1, offset: 38241},
+			pos:  position{line: 1575, col: 1, offset: 38390},
 			expr: &choiceExpr{
-				pos: position{line: 1571, col: 5, offset: 38256},
+				pos: position{line: 1576, col: 5, offset: 38405},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1571, col: 5, offset: 38256},
+						pos: position{line: 1576, col: 5, offset: 38405},
 						run: (*parser).callonGlobEscape2,
 						expr: &litMatcher{
-							pos:        position{line: 1571, col: 5, offset: 38256},
+							pos:        position{line: 1576, col: 5, offset: 38405},
 							val:        "=",
 							ignoreCase: false,
 							want:       "\"=\"",
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1572, col: 5, offset: 38284},
+						pos: position{line: 1577, col: 5, offset: 38433},
 						run: (*parser).callonGlobEscape4,
 						expr: &litMatcher{
-							pos:        position{line: 1572, col: 5, offset: 38284},
+							pos:        position{line: 1577, col: 5, offset: 38433},
 							val:        "*",
 							ignoreCase: false,
 							want:       "\"*\"",
 						},
 					},
 					&charClassMatcher{
-						pos:        position{line: 1573, col: 5, offset: 38314},
+						pos:        position{line: 1578, col: 5, offset: 38463},
 						val:        "[+-]",
 						chars:      []rune{'+', '-'},
 						ignoreCase: false,
@@ -11380,57 +11441,57 @@ var g = &grammar{
 		},
 		{
 			name: "SingleQuotedChar",
-			pos:  position{line: 1575, col: 1, offset: 38320},
+			pos:  position{line: 1580, col: 1, offset: 38469},
 			expr: &choiceExpr{
-				pos: position{line: 1576, col: 5, offset: 38341},
+				pos: position{line: 1581, col: 5, offset: 38490},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1576, col: 5, offset: 38341},
+						pos: position{line: 1581, col: 5, offset: 38490},
 						run: (*parser).callonSingleQuotedChar2,
 						expr: &seqExpr{
-							pos: position{line: 1576, col: 5, offset: 38341},
+							pos: position{line: 1581, col: 5, offset: 38490},
 							exprs: []any{
 								&notExpr{
-									pos: position{line: 1576, col: 5, offset: 38341},
+									pos: position{line: 1581, col: 5, offset: 38490},
 									expr: &choiceExpr{
-										pos: position{line: 1576, col: 7, offset: 38343},
+										pos: position{line: 1581, col: 7, offset: 38492},
 										alternatives: []any{
 											&litMatcher{
-												pos:        position{line: 1576, col: 7, offset: 38343},
+												pos:        position{line: 1581, col: 7, offset: 38492},
 												val:        "'",
 												ignoreCase: false,
 												want:       "\"'\"",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1576, col: 13, offset: 38349},
+												pos:  position{line: 1581, col: 13, offset: 38498},
 												name: "EscapedChar",
 											},
 										},
 									},
 								},
 								&anyMatcher{
-									line: 1576, col: 26, offset: 38362,
+									line: 1581, col: 26, offset: 38511,
 								},
 							},
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1577, col: 5, offset: 38399},
+						pos: position{line: 1582, col: 5, offset: 38548},
 						run: (*parser).callonSingleQuotedChar9,
 						expr: &seqExpr{
-							pos: position{line: 1577, col: 5, offset: 38399},
+							pos: position{line: 1582, col: 5, offset: 38548},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1577, col: 5, offset: 38399},
+									pos:        position{line: 1582, col: 5, offset: 38548},
 									val:        "\\",
 									ignoreCase: false,
 									want:       "\"\\\\\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1577, col: 10, offset: 38404},
+									pos:   position{line: 1582, col: 10, offset: 38553},
 									label: "s",
 									expr: &ruleRefExpr{
-										pos:  position{line: 1577, col: 12, offset: 38406},
+										pos:  position{line: 1582, col: 12, offset: 38555},
 										name: "EscapeSequence",
 									},
 								},
@@ -11444,16 +11505,16 @@ var g = &grammar{
 		},
 		{
 			name: "EscapeSequence",
-			pos:  position{line: 1579, col: 1, offset: 38440},
+			pos:  position{line: 1584, col: 1, offset: 38589},
 			expr: &choiceExpr{
-				pos: position{line: 1580, col: 5, offset: 38459},
+				pos: position{line: 1585, col: 5, offset: 38608},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1580, col: 5, offset: 38459},
+						pos:  position{line: 1585, col: 5, offset: 38608},
 						name: "SingleCharEscape",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1581, col: 5, offset: 38480},
+						pos:  position{line: 1586, col: 5, offset: 38629},
 						name: "UnicodeEscape",
 					},
 				},
@@ -11463,87 +11524,87 @@ var g = &grammar{
 		},
 		{
 			name: "SingleCharEscape",
-			pos:  position{line: 1583, col: 1, offset: 38495},
+			pos:  position{line: 1588, col: 1, offset: 38644},
 			expr: &choiceExpr{
-				pos: position{line: 1584, col: 5, offset: 38516},
+				pos: position{line: 1589, col: 5, offset: 38665},
 				alternatives: []any{
 					&litMatcher{
-						pos:        position{line: 1584, col: 5, offset: 38516},
+						pos:        position{line: 1589, col: 5, offset: 38665},
 						val:        "'",
 						ignoreCase: false,
 						want:       "\"'\"",
 					},
 					&actionExpr{
-						pos: position{line: 1585, col: 5, offset: 38524},
+						pos: position{line: 1590, col: 5, offset: 38673},
 						run: (*parser).callonSingleCharEscape3,
 						expr: &litMatcher{
-							pos:        position{line: 1585, col: 5, offset: 38524},
+							pos:        position{line: 1590, col: 5, offset: 38673},
 							val:        "\"",
 							ignoreCase: false,
 							want:       "\"\\\"\"",
 						},
 					},
 					&litMatcher{
-						pos:        position{line: 1586, col: 5, offset: 38564},
+						pos:        position{line: 1591, col: 5, offset: 38713},
 						val:        "\\",
 						ignoreCase: false,
 						want:       "\"\\\\\"",
 					},
 					&actionExpr{
-						pos: position{line: 1587, col: 5, offset: 38573},
+						pos: position{line: 1592, col: 5, offset: 38722},
 						run: (*parser).callonSingleCharEscape6,
 						expr: &litMatcher{
-							pos:        position{line: 1587, col: 5, offset: 38573},
+							pos:        position{line: 1592, col: 5, offset: 38722},
 							val:        "b",
 							ignoreCase: false,
 							want:       "\"b\"",
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1588, col: 5, offset: 38602},
+						pos: position{line: 1593, col: 5, offset: 38751},
 						run: (*parser).callonSingleCharEscape8,
 						expr: &litMatcher{
-							pos:        position{line: 1588, col: 5, offset: 38602},
+							pos:        position{line: 1593, col: 5, offset: 38751},
 							val:        "f",
 							ignoreCase: false,
 							want:       "\"f\"",
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1589, col: 5, offset: 38631},
+						pos: position{line: 1594, col: 5, offset: 38780},
 						run: (*parser).callonSingleCharEscape10,
 						expr: &litMatcher{
-							pos:        position{line: 1589, col: 5, offset: 38631},
+							pos:        position{line: 1594, col: 5, offset: 38780},
 							val:        "n",
 							ignoreCase: false,
 							want:       "\"n\"",
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1590, col: 5, offset: 38660},
+						pos: position{line: 1595, col: 5, offset: 38809},
 						run: (*parser).callonSingleCharEscape12,
 						expr: &litMatcher{
-							pos:        position{line: 1590, col: 5, offset: 38660},
+							pos:        position{line: 1595, col: 5, offset: 38809},
 							val:        "r",
 							ignoreCase: false,
 							want:       "\"r\"",
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1591, col: 5, offset: 38689},
+						pos: position{line: 1596, col: 5, offset: 38838},
 						run: (*parser).callonSingleCharEscape14,
 						expr: &litMatcher{
-							pos:        position{line: 1591, col: 5, offset: 38689},
+							pos:        position{line: 1596, col: 5, offset: 38838},
 							val:        "t",
 							ignoreCase: false,
 							want:       "\"t\"",
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1592, col: 5, offset: 38718},
+						pos: position{line: 1597, col: 5, offset: 38867},
 						run: (*parser).callonSingleCharEscape16,
 						expr: &litMatcher{
-							pos:        position{line: 1592, col: 5, offset: 38718},
+							pos:        position{line: 1597, col: 5, offset: 38867},
 							val:        "v",
 							ignoreCase: false,
 							want:       "\"v\"",
@@ -11556,32 +11617,32 @@ var g = &grammar{
 		},
 		{
 			name: "KeywordEscape",
-			pos:  position{line: 1594, col: 1, offset: 38744},
+			pos:  position{line: 1599, col: 1, offset: 38893},
 			expr: &choiceExpr{
-				pos: position{line: 1595, col: 5, offset: 38762},
+				pos: position{line: 1600, col: 5, offset: 38911},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1595, col: 5, offset: 38762},
+						pos: position{line: 1600, col: 5, offset: 38911},
 						run: (*parser).callonKeywordEscape2,
 						expr: &litMatcher{
-							pos:        position{line: 1595, col: 5, offset: 38762},
+							pos:        position{line: 1600, col: 5, offset: 38911},
 							val:        "=",
 							ignoreCase: false,
 							want:       "\"=\"",
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1596, col: 5, offset: 38790},
+						pos: position{line: 1601, col: 5, offset: 38939},
 						run: (*parser).callonKeywordEscape4,
 						expr: &litMatcher{
-							pos:        position{line: 1596, col: 5, offset: 38790},
+							pos:        position{line: 1601, col: 5, offset: 38939},
 							val:        "*",
 							ignoreCase: false,
 							want:       "\"*\"",
 						},
 					},
 					&charClassMatcher{
-						pos:        position{line: 1597, col: 5, offset: 38818},
+						pos:        position{line: 1602, col: 5, offset: 38967},
 						val:        "[+-]",
 						chars:      []rune{'+', '-'},
 						ignoreCase: false,
@@ -11594,42 +11655,42 @@ var g = &grammar{
 		},
 		{
 			name: "UnicodeEscape",
-			pos:  position{line: 1599, col: 1, offset: 38824},
+			pos:  position{line: 1604, col: 1, offset: 38973},
 			expr: &choiceExpr{
-				pos: position{line: 1600, col: 5, offset: 38842},
+				pos: position{line: 1605, col: 5, offset: 38991},
 				alternatives: []any{
 					&actionExpr{
-						pos: position{line: 1600, col: 5, offset: 38842},
+						pos: position{line: 1605, col: 5, offset: 38991},
 						run: (*parser).callonUnicodeEscape2,
 						expr: &seqExpr{
-							pos: position{line: 1600, col: 5, offset: 38842},
+							pos: position{line: 1605, col: 5, offset: 38991},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1600, col: 5, offset: 38842},
+									pos:        position{line: 1605, col: 5, offset: 38991},
 									val:        "u",
 									ignoreCase: false,
 									want:       "\"u\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1600, col: 9, offset: 38846},
+									pos:   position{line: 1605, col: 9, offset: 38995},
 									label: "chars",
 									expr: &seqExpr{
-										pos: position{line: 1600, col: 16, offset: 38853},
+										pos: position{line: 1605, col: 16, offset: 39002},
 										exprs: []any{
 											&ruleRefExpr{
-												pos:  position{line: 1600, col: 16, offset: 38853},
+												pos:  position{line: 1605, col: 16, offset: 39002},
 												name: "HexDigit",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1600, col: 25, offset: 38862},
+												pos:  position{line: 1605, col: 25, offset: 39011},
 												name: "HexDigit",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1600, col: 34, offset: 38871},
+												pos:  position{line: 1605, col: 34, offset: 39020},
 												name: "HexDigit",
 											},
 											&ruleRefExpr{
-												pos:  position{line: 1600, col: 43, offset: 38880},
+												pos:  position{line: 1605, col: 43, offset: 39029},
 												name: "HexDigit",
 											},
 										},
@@ -11639,65 +11700,65 @@ var g = &grammar{
 						},
 					},
 					&actionExpr{
-						pos: position{line: 1603, col: 5, offset: 38943},
+						pos: position{line: 1608, col: 5, offset: 39092},
 						run: (*parser).callonUnicodeEscape11,
 						expr: &seqExpr{
-							pos: position{line: 1603, col: 5, offset: 38943},
+							pos: position{line: 1608, col: 5, offset: 39092},
 							exprs: []any{
 								&litMatcher{
-									pos:        position{line: 1603, col: 5, offset: 38943},
+									pos:        position{line: 1608, col: 5, offset: 39092},
 									val:        "u",
 									ignoreCase: false,
 									want:       "\"u\"",
 								},
 								&litMatcher{
-									pos:        position{line: 1603, col: 9, offset: 38947},
+									pos:        position{line: 1608, col: 9, offset: 39096},
 									val:        "{",
 									ignoreCase: false,
 									want:       "\"{\"",
 								},
 								&labeledExpr{
-									pos:   position{line: 1603, col: 13, offset: 38951},
+									pos:   position{line: 1608, col: 13, offset: 39100},
 									label: "chars",
 									expr: &seqExpr{
-										pos: position{line: 1603, col: 20, offset: 38958},
+										pos: position{line: 1608, col: 20, offset: 39107},
 										exprs: []any{
 											&ruleRefExpr{
-												pos:  position{line: 1603, col: 20, offset: 38958},
+												pos:  position{line: 1608, col: 20, offset: 39107},
 												name: "HexDigit",
 											},
 											&zeroOrOneExpr{
-												pos: position{line: 1603, col: 29, offset: 38967},
+												pos: position{line: 1608, col: 29, offset: 39116},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1603, col: 29, offset: 38967},
+													pos:  position{line: 1608, col: 29, offset: 39116},
 													name: "HexDigit",
 												},
 											},
 											&zeroOrOneExpr{
-												pos: position{line: 1603, col: 39, offset: 38977},
+												pos: position{line: 1608, col: 39, offset: 39126},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1603, col: 39, offset: 38977},
+													pos:  position{line: 1608, col: 39, offset: 39126},
 													name: "HexDigit",
 												},
 											},
 											&zeroOrOneExpr{
-												pos: position{line: 1603, col: 49, offset: 38987},
+												pos: position{line: 1608, col: 49, offset: 39136},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1603, col: 49, offset: 38987},
+													pos:  position{line: 1608, col: 49, offset: 39136},
 													name: "HexDigit",
 												},
 											},
 											&zeroOrOneExpr{
-												pos: position{line: 1603, col: 59, offset: 38997},
+												pos: position{line: 1608, col: 59, offset: 39146},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1603, col: 59, offset: 38997},
+													pos:  position{line: 1608, col: 59, offset: 39146},
 													name: "HexDigit",
 												},
 											},
 											&zeroOrOneExpr{
-												pos: position{line: 1603, col: 69, offset: 39007},
+												pos: position{line: 1608, col: 69, offset: 39156},
 												expr: &ruleRefExpr{
-													pos:  position{line: 1603, col: 69, offset: 39007},
+													pos:  position{line: 1608, col: 69, offset: 39156},
 													name: "HexDigit",
 												},
 											},
@@ -11705,7 +11766,7 @@ var g = &grammar{
 									},
 								},
 								&litMatcher{
-									pos:        position{line: 1603, col: 80, offset: 39018},
+									pos:        position{line: 1608, col: 80, offset: 39167},
 									val:        "}",
 									ignoreCase: false,
 									want:       "\"}\"",
@@ -11720,37 +11781,37 @@ var g = &grammar{
 		},
 		{
 			name: "RegexpPattern",
-			pos:  position{line: 1607, col: 1, offset: 39072},
+			pos:  position{line: 1612, col: 1, offset: 39221},
 			expr: &actionExpr{
-				pos: position{line: 1608, col: 5, offset: 39090},
+				pos: position{line: 1613, col: 5, offset: 39239},
 				run: (*parser).callonRegexpPattern1,
 				expr: &seqExpr{
-					pos: position{line: 1608, col: 5, offset: 39090},
+					pos: position{line: 1613, col: 5, offset: 39239},
 					exprs: []any{
 						&litMatcher{
-							pos:        position{line: 1608, col: 5, offset: 39090},
+							pos:        position{line: 1613, col: 5, offset: 39239},
 							val:        "/",
 							ignoreCase: false,
 							want:       "\"/\"",
 						},
 						&labeledExpr{
-							pos:   position{line: 1608, col: 9, offset: 39094},
+							pos:   position{line: 1613, col: 9, offset: 39243},
 							label: "body",
 							expr: &ruleRefExpr{
-								pos:  position{line: 1608, col: 14, offset: 39099},
+								pos:  position{line: 1613, col: 14, offset: 39248},
 								name: "RegexpBody",
 							},
 						},
 						&litMatcher{
-							pos:        position{line: 1608, col: 25, offset: 39110},
+							pos:        position{line: 1613, col: 25, offset: 39259},
 							val:        "/",
 							ignoreCase: false,
 							want:       "\"/\"",
 						},
 						&notExpr{
-							pos: position{line: 1608, col: 29, offset: 39114},
+							pos: position{line: 1613, col: 29, offset: 39263},
 							expr: &ruleRefExpr{
-								pos:  position{line: 1608, col: 30, offset: 39115},
+								pos:  position{line: 1613, col: 30, offset: 39264},
 								name: "KeyWordStart",
 							},
 						},
@@ -11762,33 +11823,33 @@ var g = &grammar{
 		},
 		{
 			name: "RegexpBody",
-			pos:  position{line: 1610, col: 1, offset: 39150},
+			pos:  position{line: 1615, col: 1, offset: 39299},
 			expr: &actionExpr{
-				pos: position{line: 1611, col: 5, offset: 39165},
+				pos: position{line: 1616, col: 5, offset: 39314},
 				run: (*parser).callonRegexpBody1,
 				expr: &oneOrMoreExpr{
-					pos: position{line: 1611, col: 5, offset: 39165},
+					pos: position{line: 1616, col: 5, offset: 39314},
 					expr: &choiceExpr{
-						pos: position{line: 1611, col: 6, offset: 39166},
+						pos: position{line: 1616, col: 6, offset: 39315},
 						alternatives: []any{
 							&charClassMatcher{
-								pos:        position{line: 1611, col: 6, offset: 39166},
+								pos:        position{line: 1616, col: 6, offset: 39315},
 								val:        "[^/\\\\]",
 								chars:      []rune{'/', '\\'},
 								ignoreCase: false,
 								inverted:   true,
 							},
 							&seqExpr{
-								pos: position{line: 1611, col: 15, offset: 39175},
+								pos: position{line: 1616, col: 15, offset: 39324},
 								exprs: []any{
 									&litMatcher{
-										pos:        position{line: 1611, col: 15, offset: 39175},
+										pos:        position{line: 1616, col: 15, offset: 39324},
 										val:        "\\",
 										ignoreCase: false,
 										want:       "\"\\\\\"",
 									},
 									&anyMatcher{
-										line: 1611, col: 20, offset: 39180,
+										line: 1616, col: 20, offset: 39329,
 									},
 								},
 							},
@@ -11801,9 +11862,9 @@ var g = &grammar{
 		},
 		{
 			name: "EscapedChar",
-			pos:  position{line: 1613, col: 1, offset: 39216},
+			pos:  position{line: 1618, col: 1, offset: 39365},
 			expr: &charClassMatcher{
-				pos:        position{line: 1614, col: 5, offset: 39232},
+				pos:        position{line: 1619, col: 5, offset: 39381},
 				val:        "[\\x00-\\x1f\\\\]",
 				chars:      []rune{'\\'},
 				ranges:     []rune{'\x00', '\x1f'},
@@ -11815,11 +11876,11 @@ var g = &grammar{
 		},
 		{
 			name: "_",
-			pos:  position{line: 1616, col: 1, offset: 39247},
+			pos:  position{line: 1621, col: 1, offset: 39396},
 			expr: &oneOrMoreExpr{
-				pos: position{line: 1616, col: 5, offset: 39251},
+				pos: position{line: 1621, col: 5, offset: 39400},
 				expr: &ruleRefExpr{
-					pos:  position{line: 1616, col: 5, offset: 39251},
+					pos:  position{line: 1621, col: 5, offset: 39400},
 					name: "AnySpace",
 				},
 			},
@@ -11828,11 +11889,11 @@ var g = &grammar{
 		},
 		{
 			name: "__",
-			pos:  position{line: 1618, col: 1, offset: 39262},
+			pos:  position{line: 1623, col: 1, offset: 39411},
 			expr: &zeroOrMoreExpr{
-				pos: position{line: 1618, col: 6, offset: 39267},
+				pos: position{line: 1623, col: 6, offset: 39416},
 				expr: &ruleRefExpr{
-					pos:  position{line: 1618, col: 6, offset: 39267},
+					pos:  position{line: 1623, col: 6, offset: 39416},
 					name: "AnySpace",
 				},
 			},
@@ -11841,20 +11902,20 @@ var g = &grammar{
 		},
 		{
 			name: "AnySpace",
-			pos:  position{line: 1620, col: 1, offset: 39278},
+			pos:  position{line: 1625, col: 1, offset: 39427},
 			expr: &choiceExpr{
-				pos: position{line: 1621, col: 5, offset: 39291},
+				pos: position{line: 1626, col: 5, offset: 39440},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1621, col: 5, offset: 39291},
+						pos:  position{line: 1626, col: 5, offset: 39440},
 						name: "WhiteSpace",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1622, col: 5, offset: 39306},
+						pos:  position{line: 1627, col: 5, offset: 39455},
 						name: "LineTerminator",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1623, col: 5, offset: 39325},
+						pos:  position{line: 1628, col: 5, offset: 39474},
 						name: "Comment",
 					},
 				},
@@ -11864,32 +11925,32 @@ var g = &grammar{
 		},
 		{
 			name: "UnicodeLetter",
-			pos:  position{line: 1625, col: 1, offset: 39334},
+			pos:  position{line: 1630, col: 1, offset: 39483},
 			expr: &choiceExpr{
-				pos: position{line: 1626, col: 5, offset: 39352},
+				pos: position{line: 1631, col: 5, offset: 39501},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1626, col: 5, offset: 39352},
+						pos:  position{line: 1631, col: 5, offset: 39501},
 						name: "Lu",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1627, col: 5, offset: 39359},
+						pos:  position{line: 1632, col: 5, offset: 39508},
 						name: "Ll",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1628, col: 5, offset: 39366},
+						pos:  position{line: 1633, col: 5, offset: 39515},
 						name: "Lt",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1629, col: 5, offset: 39373},
+						pos:  position{line: 1634, col: 5, offset: 39522},
 						name: "Lm",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1630, col: 5, offset: 39380},
+						pos:  position{line: 1635, col: 5, offset: 39529},
 						name: "Lo",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1631, col: 5, offset: 39387},
+						pos:  position{line: 1636, col: 5, offset: 39536},
 						name: "Nl",
 					},
 				},
@@ -11899,16 +11960,16 @@ var g = &grammar{
 		},
 		{
 			name: "UnicodeCombiningMark",
-			pos:  position{line: 1633, col: 1, offset: 39391},
+			pos:  position{line: 1638, col: 1, offset: 39540},
 			expr: &choiceExpr{
-				pos: position{line: 1634, col: 5, offset: 39416},
+				pos: position{line: 1639, col: 5, offset: 39565},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1634, col: 5, offset: 39416},
+						pos:  position{line: 1639, col: 5, offset: 39565},
 						name: "Mn",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1635, col: 5, offset: 39423},
+						pos:  position{line: 1640, col: 5, offset: 39572},
 						name: "Mc",
 					},
 				},
@@ -11918,9 +11979,9 @@ var g = &grammar{
 		},
 		{
 			name: "UnicodeDigit",
-			pos:  position{line: 1637, col: 1, offset: 39427},
+			pos:  position{line: 1642, col: 1, offset: 39576},
 			expr: &ruleRefExpr{
-				pos:  position{line: 1638, col: 5, offset: 39444},
+				pos:  position{line: 1643, col: 5, offset: 39593},
 				name: "Nd",
 			},
 			leader:        false,
@@ -11928,9 +11989,9 @@ var g = &grammar{
 		},
 		{
 			name: "UnicodeConnectorPunctuation",
-			pos:  position{line: 1640, col: 1, offset: 39448},
+			pos:  position{line: 1645, col: 1, offset: 39597},
 			expr: &ruleRefExpr{
-				pos:  position{line: 1641, col: 5, offset: 39480},
+				pos:  position{line: 1646, col: 5, offset: 39629},
 				name: "Pc",
 			},
 			leader:        false,
@@ -11938,9 +11999,9 @@ var g = &grammar{
 		},
 		{
 			name: "Ll",
-			pos:  position{line: 1647, col: 1, offset: 39661},
+			pos:  position{line: 1652, col: 1, offset: 39810},
 			expr: &charClassMatcher{
-				pos:        position{line: 1647, col: 6, offset: 39666},
+				pos:        position{line: 1652, col: 6, offset: 39815},
 				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', 'ﬓ', 'ﬗ', 'ａ', 'ｚ'},
@@ -11952,9 +12013,9 @@ var g = &grammar{
 		},
 		{
 			name: "Lm",
-			pos:  position{line: 1650, col: 1, offset: 43818},
+			pos:  position{line: 1655, col: 1, offset: 43967},
 			expr: &charClassMatcher{
-				pos:        position{line: 1650, col: 6, offset: 43823},
+				pos:        position{line: 1655, col: 6, offset: 43972},
 				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{'ʰ', 'ˁ', 'ˆ', 'ˑ', 'ˠ', 'ˤ', 'ۥ', 'ۦ', 'ߴ', 'ߵ', 'ᱸ', 'ᱽ', 'ᴬ', 'ᵪ', 'ᶛ', 'ᶿ', 'ₐ', 'ₜ', 'ⱼ', 'ⱽ', '〱', '〵', 'ゝ', 'ゞ', 'ー', 'ヾ', 'ꓸ', 'ꓽ', 'ꚜ', 'ꚝ', 'ꜗ', 'ꜟ', 'ꟸ', 'ꟹ', 'ꫳ', 'ꫴ', 'ꭜ', 'ꭟ', 'ﾞ', 'ﾟ'},
@@ -11966,9 +12027,9 @@ var g = &grammar{
 		},
 		{
 			name: "Lo",
-			pos:  position{line: 1653, col: 1, offset: 44308},
+			pos:  position{line: 1658, col: 1, offset: 44457},
 			expr: &charClassMatcher{
-				pos:        position{line: 1653, col: 6, offset: 44313},
+				pos:        position{line: 1658, col: 6, offset: 44462},
 				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{'ǀ', 'ǃ', 'א', 'ת', 'ׯ', 'ײ', 'ؠ', 'ؿ', 'ف', 'ي', 'ٮ', 'ٯ', 'ٱ', 'ۓ', 'ۮ', 'ۯ', 'ۺ', 'ۼ', 'ܒ', 'ܯ', 'ݍ', 'ޥ', 'ߊ', 'ߪ', 'ࠀ', 'ࠕ', 'ࡀ', 'ࡘ', 'ࡠ', 'ࡪ', 'ࢠ', 'ࢴ', 'ࢶ', 'ࢽ', 'ऄ', 'ह', 'क़', 'ॡ', 'ॲ', 'ঀ', 'অ', 'ঌ', 'এ', 'ঐ', 'ও', 'ন', 'প', 'র', 'শ', 'হ', 'ড়', 'ঢ়', 'য়', 'ৡ', 'ৰ', 'ৱ', 'ਅ', 'ਊ', 'ਏ', 'ਐ', 'ਓ', 'ਨ', 'ਪ', 'ਰ', 'ਲ', 'ਲ਼', 'ਵ', 'ਸ਼', 'ਸ', 'ਹ', 'ਖ਼', 'ੜ', 'ੲ', 'ੴ', 'અ', 'ઍ', 'એ', 'ઑ', 'ઓ', 'ન', 'પ', 'ર', 'લ', 'ળ', 'વ', 'હ', 'ૠ', 'ૡ', 'ଅ', 'ଌ', 'ଏ', 'ଐ', 'ଓ', 'ନ', 'ପ', 'ର', 'ଲ', 'ଳ', 'ଵ', 'ହ', 'ଡ଼', 'ଢ଼', 'ୟ', 'ୡ', 'அ', 'ஊ', 'எ', 'ஐ', 'ஒ', 'க', 'ங', 'ச', 'ஞ', 'ட', 'ண', 'த', 'ந', 'ப', 'ம', 'ஹ', 'అ', 'ఌ', 'ఎ', 'ఐ', 'ఒ', 'న', 'ప', 'హ', 'ౘ', 'ౚ', 'ౠ', 'ౡ', 'ಅ', 'ಌ', 'ಎ', 'ಐ', 'ಒ', 'ನ', 'ಪ', 'ಳ', 'ವ', 'ಹ', 'ೠ', 'ೡ', 'ೱ', 'ೲ', 'അ', 'ഌ', 'എ', 'ഐ', 'ഒ', 'ഺ', 'ൔ', 'ൖ', 'ൟ', 'ൡ', 'ൺ', 'ൿ', 'අ', 'ඖ', 'ක', 'න', 'ඳ', 'ර', 'ව', 'ෆ', 'ก', 'ะ', 'า', 'ำ', 'เ', 'ๅ', 'ກ', 'ຂ', 'ງ', 'ຈ', 'ດ', 'ທ', 'ນ', 'ຟ', 'ມ', 'ຣ', 'ສ', 'ຫ', 'ອ', 'ະ', 'າ', 'ຳ', 'ເ', 'ໄ', 'ໜ', 'ໟ', 'ཀ', 'ཇ', 'ཉ', 'ཬ', 'ྈ', 'ྌ', 'က', 'ဪ', 'ၐ', 'ၕ', 'ၚ', 'ၝ', 'ၥ', 'ၦ', 'ၮ', 'ၰ', 'ၵ', 'ႁ', 'ᄀ', 'ቈ', 'ቊ', 'ቍ', 'ቐ', 'ቖ', 'ቚ', 'ቝ', 'በ', 'ኈ', 'ኊ', 'ኍ', 'ነ', 'ኰ', 'ኲ', 'ኵ', 'ኸ', 'ኾ', 'ዂ', 'ዅ', 'ወ', 'ዖ', 'ዘ', 'ጐ', 'ጒ', 'ጕ', 'ጘ', 'ፚ', 'ᎀ', 'ᎏ', 'ᐁ', 'ᙬ', 'ᙯ', 'ᙿ', 'ᚁ', 'ᚚ', 'ᚠ', 'ᛪ', 'ᛱ', 'ᛸ', 'ᜀ', 'ᜌ', 'ᜎ', 'ᜑ', 'ᜠ', 'ᜱ', 'ᝀ', 'ᝑ', 'ᝠ', 'ᝬ', 'ᝮ', 'ᝰ', 'ក', 'ឳ', 'ᠠ', 'ᡂ', 'ᡄ', 'ᡸ', 'ᢀ', 'ᢄ', 'ᢇ', 'ᢨ', 'ᢰ', 'ᣵ', 'ᤀ', 'ᤞ', 'ᥐ', 'ᥭ', 'ᥰ', 'ᥴ', 'ᦀ', 'ᦫ', 'ᦰ', 'ᧉ', 'ᨀ', 'ᨖ', 'ᨠ', 'ᩔ', 'ᬅ', 'ᬳ', 'ᭅ', 'ᭋ', 'ᮃ', 'ᮠ', 'ᮮ', 'ᮯ', 'ᮺ', 'ᯥ', 'ᰀ', 'ᰣ', 'ᱍ', 'ᱏ', 'ᱚ', 'ᱷ', 'ᳩ', 'ᳬ', 'ᳮ', 'ᳱ', 'ᳵ', 'ᳶ', 'ℵ', 'ℸ', 'ⴰ', 'ⵧ', 'ⶀ', 'ⶖ', 'ⶠ', 'ⶦ', 'ⶨ', 'ⶮ', 'ⶰ', 'ⶶ', 'ⶸ', 'ⶾ', 'ⷀ', 'ⷆ', 'ⷈ', 'ⷎ', 'ⷐ', 'ⷖ', 'ⷘ', 'ⷞ', 'ぁ', 'ゖ', 'ァ', 'ヺ', 'ㄅ', 'ㄯ', 'ㄱ', 'ㆎ', 'ㆠ', 'ㆺ', 'ㇰ', 'ㇿ', '㐀', '䶵', '一', '鿯', 'ꀀ', 'ꀔ', 'ꀖ', 'ꒌ', 'ꓐ', 'ꓷ', 'ꔀ', 'ꘋ', 'ꘐ', 'ꘟ', 'ꘪ', 'ꘫ', 'ꚠ', 'ꛥ', 'ꟻ', 'ꠁ', 'ꠃ', 'ꠅ', 'ꠇ', 'ꠊ', 'ꠌ', 'ꠢ', 'ꡀ', 'ꡳ', 'ꢂ', 'ꢳ', 'ꣲ', 'ꣷ', 'ꣽ', 'ꣾ', 'ꤊ', 'ꤥ', 'ꤰ', 'ꥆ', 'ꥠ', 'ꥼ', 'ꦄ', 'ꦲ', 'ꧠ', 'ꧤ', 'ꧧ', 'ꧯ', 'ꧺ', 'ꧾ', 'ꨀ', 'ꨨ', 'ꩀ', 'ꩂ', 'ꩄ', 'ꩋ', 'ꩠ', 'ꩯ', 'ꩱ', 'ꩶ', 'ꩾ', 'ꪯ', 'ꪵ', 'ꪶ', 'ꪹ', 'ꪽ', 'ꫛ', 'ꫜ', 'ꫠ', 'ꫪ', 'ꬁ', 'ꬆ', 'ꬉ', 'ꬎ', 'ꬑ', 'ꬖ', 'ꬠ', 'ꬦ', 'ꬨ', 'ꬮ', 'ꯀ', 'ꯢ', '가', '힣', 'ힰ', 'ퟆ', 'ퟋ', 'ퟻ', '豈', '舘', '並', '龎', 'ײַ', 'ﬨ', 'שׁ', 'זּ', 'טּ', 'לּ', 'נּ', 'סּ', 'ףּ', 'פּ', 'צּ', 'ﮱ', 'ﯓ', 'ﴽ', 'ﵐ', 'ﶏ', 'ﶒ', 'ﷇ', 'ﷰ', 'ﷻ', 'ﹰ', 'ﹴ', 'ﹶ', 'ﻼ', 'ｦ', 'ｯ', 'ｱ', 'ﾝ', 'ﾠ', 'ﾾ', 'ￂ', 'ￇ', 'ￊ', 'ￏ', 'ￒ', 'ￗ', 'ￚ', 'ￜ'},
@@ -11980,9 +12041,9 @@ var g = &grammar{
 		},
 		{
 			name: "Lt",
-			pos:  position{line: 1656, col: 1, offset: 47760},
+			pos:  position{line: 1661, col: 1, offset: 47909},
 			expr: &charClassMatcher{
-				pos:        position{line: 1656, col: 6, offset: 47765},
+				pos:        position{line: 1661, col: 6, offset: 47914},
 				val:        "[\\u01C5\\u01C8\\u01CB\\u01F2\\u1F88-\\u1F8F\\u1F98-\\u1F9F\\u1FA8-\\u1FAF\\u1FBC\\u1FCC\\u1FFC]",
 				chars:      []rune{'Dž', 'Lj', 'Nj', 'Dz', 'ᾼ', 'ῌ', 'ῼ'},
 				ranges:     []rune{'ᾈ', 'ᾏ', 'ᾘ', 'ᾟ', 'ᾨ', 'ᾯ'},
@@ -11994,9 +12055,9 @@ var g = &grammar{
 		},
 		{
 			name: "Lu",
-			pos:  position{line: 1659, col: 1, offset: 47871},
+			pos:  position{line: 1664, col: 1, offset: 48020},
 			expr: &charClassMatcher{
-				pos:        position{line: 1659, col: 6, offset: 47876},
+				pos:        position{line: 1664, col: 6, offset: 48025},
 				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', 'ℭ', 'ℰ', 'ℳ', 'ℾ', 'ℿ', 'Ⰰ', 'Ⱞ', 'Ɫ', 'Ɽ', 'Ɑ', 'Ɒ', 'Ȿ', 'Ⲁ', 'Ᵹ', 'Ꝿ', 'Ɦ', 'Ɪ', 'Ʞ', 'Ꞵ', 'Ａ', 'Ｚ'},
@@ -12008,9 +12069,9 @@ var g = &grammar{
 		},
 		{
 			name: "Mc",
-			pos:  position{line: 1662, col: 1, offset: 51877},
+			pos:  position{line: 1667, col: 1, offset: 52026},
 			expr: &charClassMatcher{
-				pos:        position{line: 1662, col: 6, offset: 51882},
+				pos:        position{line: 1667, col: 6, offset: 52031},
 				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{'ा', 'ी', 'ॉ', 'ौ', 'ॎ', 'ॏ', 'ং', 'ঃ', 'া', 'ী', 'ে', 'ৈ', 'ো', 'ৌ', 'ਾ', 'ੀ', 'ા', 'ી', 'ો', 'ૌ', 'ଂ', 'ଃ', 'େ', 'ୈ', 'ୋ', 'ୌ', 'ா', 'ி', 'ு', 'ூ', 'ெ', 'ை', 'ொ', 'ௌ', 'ఁ', 'ః', 'ు', 'ౄ', 'ಂ', 'ಃ', 'ೀ', 'ೄ', 'ೇ', 'ೈ', 'ೊ', 'ೋ', 'ೕ', 'ೖ', 'ം', 'ഃ', 'ാ', 'ീ', 'െ', 'ൈ', 'ൊ', 'ൌ', 'ං', 'ඃ', 'ා', 'ෑ', 'ෘ', 'ෟ', 'ෲ', 'ෳ', '༾', '༿', 'ါ', 'ာ', 'ျ', 'ြ', 'ၖ', 'ၗ', 'ၢ', 'ၤ', 'ၧ', 'ၭ', 'ႃ', 'ႄ', 'ႇ', 'ႌ', 'ႚ', 'ႜ', 'ើ', 'ៅ', 'ះ', 'ៈ', 'ᤣ', 'ᤦ', 'ᤩ', 'ᤫ', 'ᤰ', 'ᤱ', 'ᤳ', 'ᤸ', 'ᨙ', 'ᨚ', 'ᩣ', 'ᩤ', 'ᩭ', 'ᩲ', 'ᬽ', 'ᭁ', 'ᭃ', '᭄', 'ᮦ', 'ᮧ', 'ᯪ', 'ᯬ', '᯲', '᯳', 'ᰤ', 'ᰫ', 'ᰴ', 'ᰵ', 'ᳲ', 'ᳳ', '〮', '〯', 'ꠣ', 'ꠤ', 'ꢀ', 'ꢁ', 'ꢴ', 'ꣃ', 'ꥒ', '꥓', 'ꦴ', 'ꦵ', 'ꦺ', 'ꦻ', 'ꦽ', '꧀', 'ꨯ', 'ꨰ', 'ꨳ', 'ꨴ', 'ꫮ', 'ꫯ', 'ꯣ', 'ꯤ', 'ꯦ', 'ꯧ', 'ꯩ', 'ꯪ'},
@@ -12022,9 +12083,9 @@ var g = &grammar{
 		},
 		{
 			name: "Mn",
-			pos:  position{line: 1665, col: 1, offset: 53070},
+			pos:  position{line: 1670, col: 1, offset: 53219},
 			expr: &charClassMatcher{
-				pos:        position{line: 1665, col: 6, offset: 53075},
+				pos:        position{line: 1670, col: 6, offset: 53224},
 				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{'̀', 'ͯ', '҃', '҇', '֑', 'ֽ', 'ׁ', 'ׂ', 'ׄ', 'ׅ', 'ؐ', 'ؚ', 'ً', 'ٟ', 'ۖ', 'ۜ', '۟', 'ۤ', 'ۧ', 'ۨ', '۪', 'ۭ', 'ܰ', '݊', 'ަ', 'ް', '߫', '߳', 'ࠖ', '࠙', 'ࠛ', 'ࠣ', 'ࠥ', 'ࠧ', 'ࠩ', '࠭', '࡙', '࡛', '࣓', '࣡', 'ࣣ', 'ं', 'ु', 'ै', '॑', 'ॗ', 'ॢ', 'ॣ', 'ু', 'ৄ', 'ৢ', 'ৣ', 'ਁ', 'ਂ', 'ੁ', 'ੂ', 'ੇ', 'ੈ', 'ੋ', '੍', 'ੰ', 'ੱ', 'ઁ', 'ં', 'ુ', 'ૅ', 'ે', 'ૈ', 'ૢ', 'ૣ', 'ૺ', '૿', 'ୁ', 'ୄ', 'ୢ', 'ୣ', 'ా', 'ీ', 'ె', 'ై', 'ొ', '్', 'ౕ', 'ౖ', 'ౢ', 'ౣ', 'ೌ', '್', 'ೢ', 'ೣ', 'ഀ', 'ഁ', '഻', '഼', 'ു', 'ൄ', 'ൢ', 'ൣ', 'ි', 'ු', 'ิ', 'ฺ', '็', '๎', 'ິ', 'ູ', 'ົ', 'ຼ', '່', 'ໍ', '༘', '༙', 'ཱ', 'ཾ', 'ྀ', '྄', '྆', '྇', 'ྍ', 'ྗ', 'ྙ', 'ྼ', 'ိ', 'ူ', 'ဲ', '့', '္', '်', 'ွ', 'ှ', 'ၘ', 'ၙ', 'ၞ', 'ၠ', 'ၱ', 'ၴ', 'ႅ', 'ႆ', '፝', '፟', 'ᜒ', '᜔', 'ᜲ', '᜴', 'ᝒ', 'ᝓ', 'ᝲ', 'ᝳ', '឴', '឵', 'ិ', 'ួ', '៉', '៓', '᠋', '᠍', 'ᢅ', 'ᢆ', 'ᤠ', 'ᤢ', 'ᤧ', 'ᤨ', '᤹', '᤻', 'ᨗ', 'ᨘ', 'ᩘ', 'ᩞ', 'ᩥ', 'ᩬ', 'ᩳ', '᩼', '᪰', '᪽', 'ᬀ', 'ᬃ', 'ᬶ', 'ᬺ', '᭫', '᭳', 'ᮀ', 'ᮁ', 'ᮢ', 'ᮥ', 'ᮨ', 'ᮩ', '᮫', 'ᮭ', 'ᯨ', 'ᯩ', 'ᯯ', 'ᯱ', 'ᰬ', 'ᰳ', 'ᰶ', '᰷', '᳐', '᳒', '᳔', '᳠', '᳢', '᳨', '᳸', '᳹', '᷀', '᷹', '᷻', '᷿', '⃐', '⃜', '⃥', '⃰', '⳯', '⳱', 'ⷠ', 'ⷿ', '〪', '〭', '゙', '゚', 'ꙴ', '꙽', 'ꚞ', 'ꚟ', '꛰', '꛱', 'ꠥ', 'ꠦ', '꣄', 'ꣅ', '꣠', '꣱', 'ꤦ', '꤭', 'ꥇ', 'ꥑ', 'ꦀ', 'ꦂ', 'ꦶ', 'ꦹ', 'ꨩ', 'ꨮ', 'ꨱ', 'ꨲ', 'ꨵ', 'ꨶ', 'ꪲ', 'ꪴ', 'ꪷ', 'ꪸ', 'ꪾ', '꪿', 'ꫬ', 'ꫭ', '︀', '️', '︠', '︯'},
@@ -12036,9 +12097,9 @@ var g = &grammar{
 		},
 		{
 			name: "Nd",
-			pos:  position{line: 1668, col: 1, offset: 55255},
+			pos:  position{line: 1673, col: 1, offset: 55404},
 			expr: &charClassMatcher{
-				pos:        position{line: 1668, col: 6, offset: 55260},
+				pos:        position{line: 1673, col: 6, offset: 55409},
 				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,
@@ -12049,9 +12110,9 @@ var g = &grammar{
 		},
 		{
 			name: "Nl",
-			pos:  position{line: 1671, col: 1, offset: 55763},
+			pos:  position{line: 1676, col: 1, offset: 55912},
 			expr: &charClassMatcher{
-				pos:        position{line: 1671, col: 6, offset: 55768},
+				pos:        position{line: 1676, col: 6, offset: 55917},
 				val:        "[\\u16EE-\\u16F0\\u2160-\\u2182\\u2185-\\u2188\\u3007\\u3021-\\u3029\\u3038-\\u303A\\uA6E6-\\uA6EF]",
 				chars:      []rune{'〇'},
 				ranges:     []rune{'ᛮ', 'ᛰ', 'Ⅰ', 'ↂ', 'ↅ', 'ↈ', '〡', '〩', '〸', '〺', 'ꛦ', 'ꛯ'},
@@ -12063,9 +12124,9 @@ var g = &grammar{
 		},
 		{
 			name: "Pc",
-			pos:  position{line: 1674, col: 1, offset: 55882},
+			pos:  position{line: 1679, col: 1, offset: 56031},
 			expr: &charClassMatcher{
-				pos:        position{line: 1674, col: 6, offset: 55887},
+				pos:        position{line: 1679, col: 6, offset: 56036},
 				val:        "[\\u005F\\u203F-\\u2040\\u2054\\uFE33-\\uFE34\\uFE4D-\\uFE4F\\uFF3F]",
 				chars:      []rune{'_', '⁔', '＿'},
 				ranges:     []rune{'‿', '⁀', '︳', '︴', '﹍', '﹏'},
@@ -12077,9 +12138,9 @@ var g = &grammar{
 		},
 		{
 			name: "Zs",
-			pos:  position{line: 1677, col: 1, offset: 55968},
+			pos:  position{line: 1682, col: 1, offset: 56117},
 			expr: &charClassMatcher{
-				pos:        position{line: 1677, col: 6, offset: 55973},
+				pos:        position{line: 1682, col: 6, offset: 56122},
 				val:        "[\\u0020\\u00A0\\u1680\\u2000-\\u200A\\u202F\\u205F\\u3000]",
 				chars:      []rune{' ', '\u00a0', '\u1680', '\u202f', '\u205f', '\u3000'},
 				ranges:     []rune{'\u2000', '\u200a'},
@@ -12091,9 +12152,9 @@ var g = &grammar{
 		},
 		{
 			name: "SourceCharacter",
-			pos:  position{line: 1679, col: 1, offset: 56026},
+			pos:  position{line: 1684, col: 1, offset: 56175},
 			expr: &anyMatcher{
-				line: 1680, col: 5, offset: 56046,
+				line: 1685, col: 5, offset: 56195,
 			},
 			leader:        false,
 			leftRecursive: false,
@@ -12101,48 +12162,48 @@ var g = &grammar{
 		{
 			name:        "WhiteSpace",
 			displayName: "\"whitespace\"",
-			pos:         position{line: 1682, col: 1, offset: 56049},
+			pos:         position{line: 1687, col: 1, offset: 56198},
 			expr: &choiceExpr{
-				pos: position{line: 1683, col: 5, offset: 56077},
+				pos: position{line: 1688, col: 5, offset: 56226},
 				alternatives: []any{
 					&litMatcher{
-						pos:        position{line: 1683, col: 5, offset: 56077},
+						pos:        position{line: 1688, col: 5, offset: 56226},
 						val:        "\t",
 						ignoreCase: false,
 						want:       "\"\\t\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1684, col: 5, offset: 56086},
+						pos:        position{line: 1689, col: 5, offset: 56235},
 						val:        "\v",
 						ignoreCase: false,
 						want:       "\"\\v\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1685, col: 5, offset: 56095},
+						pos:        position{line: 1690, col: 5, offset: 56244},
 						val:        "\f",
 						ignoreCase: false,
 						want:       "\"\\f\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1686, col: 5, offset: 56104},
+						pos:        position{line: 1691, col: 5, offset: 56253},
 						val:        " ",
 						ignoreCase: false,
 						want:       "\" \"",
 					},
 					&litMatcher{
-						pos:        position{line: 1687, col: 5, offset: 56112},
+						pos:        position{line: 1692, col: 5, offset: 56261},
 						val:        "\u00a0",
 						ignoreCase: false,
 						want:       "\"\\u00a0\"",
 					},
 					&litMatcher{
-						pos:        position{line: 1688, col: 5, offset: 56125},
+						pos:        position{line: 1693, col: 5, offset: 56274},
 						val:        "\ufeff",
 						ignoreCase: false,
 						want:       "\"\\ufeff\"",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1689, col: 5, offset: 56138},
+						pos:  position{line: 1694, col: 5, offset: 56287},
 						name: "Zs",
 					},
 				},
@@ -12152,9 +12213,9 @@ var g = &grammar{
 		},
 		{
 			name: "LineTerminator",
-			pos:  position{line: 1691, col: 1, offset: 56142},
+			pos:  position{line: 1696, col: 1, offset: 56291},
 			expr: &charClassMatcher{
-				pos:        position{line: 1692, col: 5, offset: 56161},
+				pos:        position{line: 1697, col: 5, offset: 56310},
 				val:        "[\\n\\r\\u2028\\u2029]",
 				chars:      []rune{'\n', '\r', '\u2028', '\u2029'},
 				ignoreCase: false,
@@ -12166,9 +12227,9 @@ var g = &grammar{
 		{
 			name:        "Comment",
 			displayName: "\"comment\"",
-			pos:         position{line: 1698, col: 1, offset: 56491},
+			pos:         position{line: 1703, col: 1, offset: 56640},
 			expr: &ruleRefExpr{
-				pos:  position{line: 1701, col: 5, offset: 56562},
+				pos:  position{line: 1706, col: 5, offset: 56711},
 				name: "SingleLineComment",
 			},
 			leader:        false,
@@ -12176,39 +12237,39 @@ var g = &grammar{
 		},
 		{
 			name: "MultiLineComment",
-			pos:  position{line: 1703, col: 1, offset: 56581},
+			pos:  position{line: 1708, col: 1, offset: 56730},
 			expr: &seqExpr{
-				pos: position{line: 1704, col: 5, offset: 56602},
+				pos: position{line: 1709, col: 5, offset: 56751},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 1704, col: 5, offset: 56602},
+						pos:        position{line: 1709, col: 5, offset: 56751},
 						val:        "/*",
 						ignoreCase: false,
 						want:       "\"/*\"",
 					},
 					&zeroOrMoreExpr{
-						pos: position{line: 1704, col: 10, offset: 56607},
+						pos: position{line: 1709, col: 10, offset: 56756},
 						expr: &seqExpr{
-							pos: position{line: 1704, col: 11, offset: 56608},
+							pos: position{line: 1709, col: 11, offset: 56757},
 							exprs: []any{
 								&notExpr{
-									pos: position{line: 1704, col: 11, offset: 56608},
+									pos: position{line: 1709, col: 11, offset: 56757},
 									expr: &litMatcher{
-										pos:        position{line: 1704, col: 12, offset: 56609},
+										pos:        position{line: 1709, col: 12, offset: 56758},
 										val:        "*/",
 										ignoreCase: false,
 										want:       "\"*/\"",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1704, col: 17, offset: 56614},
+									pos:  position{line: 1709, col: 17, offset: 56763},
 									name: "SourceCharacter",
 								},
 							},
 						},
 					},
 					&litMatcher{
-						pos:        position{line: 1704, col: 35, offset: 56632},
+						pos:        position{line: 1709, col: 35, offset: 56781},
 						val:        "*/",
 						ignoreCase: false,
 						want:       "\"*/\"",
@@ -12220,30 +12281,30 @@ var g = &grammar{
 		},
 		{
 			name: "SingleLineComment",
-			pos:  position{line: 1706, col: 1, offset: 56638},
+			pos:  position{line: 1711, col: 1, offset: 56787},
 			expr: &seqExpr{
-				pos: position{line: 1707, col: 5, offset: 56660},
+				pos: position{line: 1712, col: 5, offset: 56809},
 				exprs: []any{
 					&litMatcher{
-						pos:        position{line: 1707, col: 5, offset: 56660},
+						pos:        position{line: 1712, col: 5, offset: 56809},
 						val:        "//",
 						ignoreCase: false,
 						want:       "\"//\"",
 					},
 					&zeroOrMoreExpr{
-						pos: position{line: 1707, col: 10, offset: 56665},
+						pos: position{line: 1712, col: 10, offset: 56814},
 						expr: &seqExpr{
-							pos: position{line: 1707, col: 11, offset: 56666},
+							pos: position{line: 1712, col: 11, offset: 56815},
 							exprs: []any{
 								&notExpr{
-									pos: position{line: 1707, col: 11, offset: 56666},
+									pos: position{line: 1712, col: 11, offset: 56815},
 									expr: &ruleRefExpr{
-										pos:  position{line: 1707, col: 12, offset: 56667},
+										pos:  position{line: 1712, col: 12, offset: 56816},
 										name: "LineTerminator",
 									},
 								},
 								&ruleRefExpr{
-									pos:  position{line: 1707, col: 27, offset: 56682},
+									pos:  position{line: 1712, col: 27, offset: 56831},
 									name: "SourceCharacter",
 								},
 							},
@@ -12256,19 +12317,19 @@ var g = &grammar{
 		},
 		{
 			name: "EOL",
-			pos:  position{line: 1709, col: 1, offset: 56701},
+			pos:  position{line: 1714, col: 1, offset: 56850},
 			expr: &seqExpr{
-				pos: position{line: 1709, col: 7, offset: 56707},
+				pos: position{line: 1714, col: 7, offset: 56856},
 				exprs: []any{
 					&zeroOrMoreExpr{
-						pos: position{line: 1709, col: 7, offset: 56707},
+						pos: position{line: 1714, col: 7, offset: 56856},
 						expr: &ruleRefExpr{
-							pos:  position{line: 1709, col: 7, offset: 56707},
+							pos:  position{line: 1714, col: 7, offset: 56856},
 							name: "WhiteSpace",
 						},
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1709, col: 19, offset: 56719},
+						pos:  position{line: 1714, col: 19, offset: 56868},
 						name: "LineTerminator",
 					},
 				},
@@ -12278,16 +12339,16 @@ var g = &grammar{
 		},
 		{
 			name: "EOT",
-			pos:  position{line: 1711, col: 1, offset: 56735},
+			pos:  position{line: 1716, col: 1, offset: 56884},
 			expr: &choiceExpr{
-				pos: position{line: 1711, col: 7, offset: 56741},
+				pos: position{line: 1716, col: 7, offset: 56890},
 				alternatives: []any{
 					&ruleRefExpr{
-						pos:  position{line: 1711, col: 7, offset: 56741},
+						pos:  position{line: 1716, col: 7, offset: 56890},
 						name: "_",
 					},
 					&ruleRefExpr{
-						pos:  position{line: 1711, col: 11, offset: 56745},
+						pos:  position{line: 1716, col: 11, offset: 56894},
 						name: "EOF",
 					},
 				},
@@ -12297,11 +12358,11 @@ var g = &grammar{
 		},
 		{
 			name: "EOF",
-			pos:  position{line: 1713, col: 1, offset: 56750},
+			pos:  position{line: 1718, col: 1, offset: 56899},
 			expr: &notExpr{
-				pos: position{line: 1713, col: 7, offset: 56756},
+				pos: position{line: 1718, col: 7, offset: 56905},
 				expr: &anyMatcher{
-					line: 1713, col: 8, offset: 56757,
+					line: 1718, col: 8, offset: 56906,
 				},
 			},
 			leader:        false,
@@ -12309,11 +12370,11 @@ var g = &grammar{
 		},
 		{
 			name: "EOKW",
-			pos:  position{line: 1715, col: 1, offset: 56760},
+			pos:  position{line: 1720, col: 1, offset: 56909},
 			expr: &notExpr{
-				pos: position{line: 1715, col: 8, offset: 56767},
+				pos: position{line: 1720, col: 8, offset: 56916},
 				expr: &ruleRefExpr{
-					pos:  position{line: 1715, col: 9, offset: 56768},
+					pos:  position{line: 1720, col: 9, offset: 56917},
 					name: "KeyWordChars",
 				},
 			},
@@ -15062,118 +15123,132 @@ func (p *parser) callonComplexType26() (any, error) {
 	return p.cur.onComplexType26(stack["keyType"], stack["valType"])
 }
 
-func (c *current) onTemplateLiteral1(v any) (any, error) {
-	if len(v.([]any)) == 0 {
-		return newPrimitive(c, "string", ""), nil
-	}
-	return makeTemplateExprChain(v), nil
+func (c *current) onStringLiteral2(v any) (any, error) {
+	return newPrimitive(c, "string", joinChars(v)), nil
+}
+
+func (p *parser) callonStringLiteral2() (any, error) {
+	stack := p.vstack[len(p.vstack)-1]
+	_ = stack
+	return p.cur.onStringLiteral2(stack["v"])
+}
 
+func (c *current) onStringLiteral9(v any) (any, error) {
+	return newPrimitive(c, "string", joinChars(v)), nil
 }
 
-func (p *parser) callonTemplateLiteral1() (any, error) {
+func (p *parser) callonStringLiteral9() (any, error) {
 	stack := p.vstack[len(p.vstack)-1]
 	_ = stack
-	return p.cur.onTemplateLiteral1(stack["v"])
+	return p.cur.onStringLiteral9(stack["v"])
 }
 
-func (c *current) onTemplateLiteralParts2(v any) (any, error) {
-	return v, nil
+func (c *current) onFString2(v any) (any, error) {
+	return &ast.FString{
+		Kind:     "FString",
+		StartPos: c.pos.offset,
+		Elems:    sliceOf[ast.FStringElem](v),
+	}, nil
+
 }
 
-func (p *parser) callonTemplateLiteralParts2() (any, error) {
+func (p *parser) callonFString2() (any, error) {
 	stack := p.vstack[len(p.vstack)-1]
 	_ = stack
-	return p.cur.onTemplateLiteralParts2(stack["v"])
+	return p.cur.onFString2(stack["v"])
 }
 
-func (c *current) onTemplateLiteralParts9(v any) (any, error) {
-	return v, nil
+func (c *current) onFString9(v any) (any, error) {
+	return &ast.FString{
+		Kind:     "FString",
+		StartPos: c.pos.offset,
+		Elems:    sliceOf[ast.FStringElem](v),
+	}, nil
+
 }
 
-func (p *parser) callonTemplateLiteralParts9() (any, error) {
+func (p *parser) callonFString9() (any, error) {
 	stack := p.vstack[len(p.vstack)-1]
 	_ = stack
-	return p.cur.onTemplateLiteralParts9(stack["v"])
+	return p.cur.onFString9(stack["v"])
 }
 
-func (c *current) onTemplateDoubleQuotedPart3(v any) (any, error) {
-	return newPrimitive(c, "string", joinChars(v)), nil
+func (c *current) onFStringDoubleQuotedElem3(v any) (any, error) {
+	return &ast.FStringText{Kind: "FStringText", TextPos: c.pos.offset, Text: joinChars(v)}, nil
 
 }
 
-func (p *parser) callonTemplateDoubleQuotedPart3() (any, error) {
+func (p *parser) callonFStringDoubleQuotedElem3() (any, error) {
 	stack := p.vstack[len(p.vstack)-1]
 	_ = stack
-	return p.cur.onTemplateDoubleQuotedPart3(stack["v"])
+	return p.cur.onFStringDoubleQuotedElem3(stack["v"])
 }
 
-func (c *current) onTemplateDoubleQuotedChar2(v any) (any, error) {
+func (c *current) onFStringDoubleQuotedChar2(v any) (any, error) {
 	return v, nil
 }
 
-func (p *parser) callonTemplateDoubleQuotedChar2() (any, error) {
+func (p *parser) callonFStringDoubleQuotedChar2() (any, error) {
 	stack := p.vstack[len(p.vstack)-1]
 	_ = stack
-	return p.cur.onTemplateDoubleQuotedChar2(stack["v"])
+	return p.cur.onFStringDoubleQuotedChar2(stack["v"])
 }
 
-func (c *current) onTemplateDoubleQuotedChar7(v any) (any, error) {
+func (c *current) onFStringDoubleQuotedChar7(v any) (any, error) {
 	return v, nil
 }
 
-func (p *parser) callonTemplateDoubleQuotedChar7() (any, error) {
+func (p *parser) callonFStringDoubleQuotedChar7() (any, error) {
 	stack := p.vstack[len(p.vstack)-1]
 	_ = stack
-	return p.cur.onTemplateDoubleQuotedChar7(stack["v"])
+	return p.cur.onFStringDoubleQuotedChar7(stack["v"])
 }
 
-func (c *current) onTemplateSingleQuotedPart3(v any) (any, error) {
-	return newPrimitive(c, "string", joinChars(v)), nil
+func (c *current) onFStringSingleQuotedElem3(v any) (any, error) {
+	return &ast.FStringText{Kind: "FStringText", TextPos: c.pos.offset, Text: joinChars(v)}, nil
 
 }
 
-func (p *parser) callonTemplateSingleQuotedPart3() (any, error) {
+func (p *parser) callonFStringSingleQuotedElem3() (any, error) {
 	stack := p.vstack[len(p.vstack)-1]
 	_ = stack
-	return p.cur.onTemplateSingleQuotedPart3(stack["v"])
+	return p.cur.onFStringSingleQuotedElem3(stack["v"])
 }
 
-func (c *current) onTemplateSingleQuotedChar2(v any) (any, error) {
+func (c *current) onFStringSingleQuotedChar2(v any) (any, error) {
 	return v, nil
 }
 
-func (p *parser) callonTemplateSingleQuotedChar2() (any, error) {
+func (p *parser) callonFStringSingleQuotedChar2() (any, error) {
 	stack := p.vstack[len(p.vstack)-1]
 	_ = stack
-	return p.cur.onTemplateSingleQuotedChar2(stack["v"])
+	return p.cur.onFStringSingleQuotedChar2(stack["v"])
 }
 
-func (c *current) onTemplateSingleQuotedChar7(v any) (any, error) {
+func (c *current) onFStringSingleQuotedChar7(v any) (any, error) {
 	return v, nil
 }
 
-func (p *parser) callonTemplateSingleQuotedChar7() (any, error) {
+func (p *parser) callonFStringSingleQuotedChar7() (any, error) {
 	stack := p.vstack[len(p.vstack)-1]
 	_ = stack
-	return p.cur.onTemplateSingleQuotedChar7(stack["v"])
+	return p.cur.onFStringSingleQuotedChar7(stack["v"])
 }
 
-func (c *current) onTemplateExpr1(e any) (any, error) {
-	return &ast.Cast{
-		Kind: "Cast",
-		Expr: e.(ast.Expr),
-		Type: &astzed.TypeValue{
-			Kind:  "TypeValue",
-			Value: &astzed.TypePrimitive{Kind: "TypePrimitive", Name: "string"},
-		},
+func (c *current) onFStringExpr1(e any) (any, error) {
+	return &ast.FStringExpr{
+		Kind:   "FStringExpr",
+		Lbrace: c.pos.offset,
+		Expr:   e.(ast.Expr),
+		Rbrace: lastPos(c, "}"),
 	}, nil
 
 }
 
-func (p *parser) callonTemplateExpr1() (any, error) {
+func (p *parser) callonFStringExpr1() (any, error) {
 	stack := p.vstack[len(p.vstack)-1]
 	_ = stack
-	return p.cur.onTemplateExpr1(stack["e"])
+	return p.cur.onFStringExpr1(stack["e"])
 }
 
 func (c *current) onPrimitiveType1() (any, error) {
diff --git a/compiler/parser/parser.peg b/compiler/parser/parser.peg
index b3feba65eb..be77d9faf3 100644
--- a/compiler/parser/parser.peg
+++ b/compiler/parser/parser.peg
@@ -1151,7 +1151,8 @@ Entry
 
 Literal
   = TypeLiteral
-  / TemplateLiteral
+  / StringLiteral
+  / FString
   / SubnetLiteral
   / AddressLiteral
   / BytesLiteral
@@ -1289,49 +1290,53 @@ ComplexType
       }, nil
     }
 
-TemplateLiteral
-  = v:TemplateLiteralParts {
-      if len(v.([]any)) == 0 {
-        return newPrimitive(c, "string", ""), nil
-      }
-      return makeTemplateExprChain(v), nil
-    }
+StringLiteral
+  = '"' v:DoubleQuotedChar* '"' { return newPrimitive(c, "string", joinChars(v)), nil }
+  / "'" v:SingleQuotedChar* "'" { return newPrimitive(c, "string", joinChars(v)), nil }
 
-TemplateLiteralParts
-  = '"' v:TemplateDoubleQuotedPart* '"' { return v, nil }
-  / "'" v:TemplateSingleQuotedPart* "'" { return v, nil }
+FString
+  = "f\"" v:FStringDoubleQuotedElem* '"' {
+      return &ast.FString{
+        Kind: "FString",
+        StartPos: c.pos.offset,
+        Elems: sliceOf[ast.FStringElem](v),
+      }, nil
+    }
+  / "f'" v:FStringSingleQuotedElem* "'" {
+      return &ast.FString{
+        Kind: "FString",
+        StartPos: c.pos.offset,
+        Elems: sliceOf[ast.FStringElem](v),
+      }, nil
+    }
 
-TemplateDoubleQuotedPart
-  = TemplateExpr
-  / v:TemplateDoubleQuotedChar+ {
-      return newPrimitive(c, "string", joinChars(v)), nil
+FStringDoubleQuotedElem
+  = FStringExpr
+  / v:FStringDoubleQuotedChar+ {
+      return &ast.FStringText{Kind: "FStringText", TextPos: c.pos.offset, Text: joinChars(v)}, nil
     }
 
-TemplateDoubleQuotedChar
-  = "\\" v:"${" { return v, nil }
-  / !("${") v:DoubleQuotedChar { return v, nil }
+FStringDoubleQuotedChar
+  = "\\" v:"{" { return v, nil }
+  / !("{") v:DoubleQuotedChar { return v, nil }
 
-TemplateSingleQuotedPart
-  = TemplateExpr
-  / v:TemplateSingleQuotedChar+ {
-      return newPrimitive(c, "string", joinChars(v)), nil
+FStringSingleQuotedElem
+  = FStringExpr
+  / v:FStringSingleQuotedChar+ {
+      return &ast.FStringText{Kind: "FStringText", TextPos: c.pos.offset, Text: joinChars(v)}, nil
     }
 
-TemplateSingleQuotedChar
-  = "\\" v:"${" { return v, nil }
-  / !("${") v:SingleQuotedChar { return v, nil }
+FStringSingleQuotedChar
+  = "\\" v:"{" { return v, nil }
+  / !("{") v:SingleQuotedChar { return v, nil }
 
-// XXX This shouldn't add all this extra AST stuff but rather the semantic
-// pass should fill this stuff out.
-TemplateExpr
-  = "${" __ e:Expr __ "}" {
-      return &ast.Cast{
-        Kind: "Cast",
+FStringExpr
+  = "{" __ e:Expr __ "}" {
+      return &ast.FStringExpr{
+        Kind: "FStringExpr",
+        Lbrace: c.pos.offset, 
         Expr: e.(ast.Expr),
-        Type: &astzed.TypeValue{
-            Kind: "TypeValue",
-            Value: &astzed.TypePrimitive{Kind:"TypePrimitive",Name:"string"},
-        },
+        Rbrace: lastPos(c, "}"),
       }, nil
     }
 
diff --git a/compiler/semantic/expr.go b/compiler/semantic/expr.go
index 5bd23e48a2..51084a9dcd 100644
--- a/compiler/semantic/expr.go
+++ b/compiler/semantic/expr.go
@@ -236,6 +236,8 @@ func (a *analyzer) semExpr(e ast.Expr) dag.Expr {
 			Exprs: exprs,
 			Body:  a.semSeq(e.Body),
 		}
+	case *ast.FString:
+		return a.semFString(e)
 	}
 	panic(errors.New("invalid expression type"))
 }
@@ -662,3 +664,32 @@ func (a *analyzer) semVectorElems(elems []ast.VectorElem) []dag.VectorElem {
 	}
 	return out
 }
+
+func (a *analyzer) semFString(f *ast.FString) dag.Expr {
+	if len(f.Elems) == 0 {
+		return &dag.Literal{Kind: "Literal", Value: `""`}
+	}
+	var out dag.Expr
+	for _, elem := range f.Elems {
+		var e dag.Expr
+		switch elem := elem.(type) {
+		case *ast.FStringExpr:
+			e = a.semExpr(elem.Expr)
+			e = &dag.Call{
+				Kind: "Call",
+				Name: "cast",
+				Args: []dag.Expr{e, &dag.Literal{Kind: "Literal", Value: "<string>"}},
+			}
+		case *ast.FStringText:
+			e = &dag.Literal{Kind: "Literal", Value: zson.QuotedString([]byte(elem.Text))}
+		default:
+			panic(fmt.Errorf("internal error: unsupported f-string elem %T", elem))
+		}
+		if out == nil {
+			out = e
+			continue
+		}
+		out = &dag.BinaryExpr{Kind: "BinaryExpr", LHS: out, Op: "+", RHS: e}
+	}
+	return out
+}
diff --git a/compiler/parser/ztests/template-literals.yaml b/compiler/ztests/f-string.yaml
similarity index 50%
rename from compiler/parser/ztests/template-literals.yaml
rename to compiler/ztests/f-string.yaml
index 28230a6afa..82cda2e5cf 100644
--- a/compiler/parser/ztests/template-literals.yaml
+++ b/compiler/ztests/f-string.yaml
@@ -1,11 +1,11 @@
 zed: |
   yield
-    "hello ${this}",
-    'hello ${hex(bytes(this))}',
-    "hello \${this}",
-    'hello \${hex(this)}',
-    'yo ${"dawg ${this}"}',
-    '${this}',
+    f"hello {this}",
+    f'hello {hex(bytes(this))}',
+    f"hello \{this}",
+    f'hello \{hex(this)}',
+    f'yo {f"dawg {this}"}',
+    f'{this}',
     "==="
 
 input: |
@@ -14,15 +14,15 @@ input: |
 output: |
    "hello world"
    "hello 776f726c64"
-   "hello ${this}"
-   "hello ${hex(this)}"
+   "hello {this}"
+   "hello {hex(this)}"
    "yo dawg world"
    "world"
    "==="
    "hello 127.0.0.1"
    "hello 7f000001"
-   "hello ${this}"
-   "hello ${hex(this)}"
+   "hello {this}"
+   "hello {hex(this)}"
    "yo dawg 127.0.0.1"
    "127.0.0.1"
    "==="
diff --git a/compiler/ztests/head.yaml b/compiler/ztests/head.yaml
index e4e6ca31ac..3b99ac569e 100644
--- a/compiler/ztests/head.yaml
+++ b/compiler/ztests/head.yaml
@@ -23,9 +23,9 @@ outputs:
       expression value must be an integer value: 1. at line 1, column 6:
       head 1.
            ~~
-      expression value must be an integer value: "1" at line 1, column 7:
+      expression value must be an integer value: "1" at line 1, column 6:
       head "1"
-            ~
+           ~~~
       expression value must be an integer value: error("missing") at line 1, column 6:
       head x
            ~
diff --git a/compiler/ztests/tail.yaml b/compiler/ztests/tail.yaml
index 76a4f5f767..dc1f82952b 100644
--- a/compiler/ztests/tail.yaml
+++ b/compiler/ztests/tail.yaml
@@ -23,9 +23,9 @@ outputs:
       expression value must be an integer value: 1. at line 1, column 6:
       tail 1.
            ~~
-      expression value must be an integer value: "1" at line 1, column 7:
+      expression value must be an integer value: "1" at line 1, column 6:
       tail "1"
-            ~
+           ~~~
       expression value must be an integer value: error("missing") at line 1, column 6:
       tail x
            ~
diff --git a/docs/language/expressions.md b/docs/language/expressions.md
index 6e4c563f69..51428ae848 100644
--- a/docs/language/expressions.md
+++ b/docs/language/expressions.md
@@ -270,38 +270,39 @@ must conform to UTF-8 encoding and follow the JavaScript escaping
 conventions and unicode escape syntax.  Also, if the sequence `${` appears
 in a string the `$` character must be escaped, i.e., `\$`.
 
-### String Interpolation
+### Formatted String Literals
 
-Strings may include interpolation expressions, which has the form
+A formatted string literal (or f-string) is a string literal prefixed with `f`.
+These strings may include replacement expressions which are delimited by curly
+braces:
 ```
-${ <expr> }
+f"{ <expr> }"
 ```
-In this case, the characters starting with `$` and ending at `}` are substituted
+In this case, the characters starting with `{` and ending at `}` are substituted
 with the result of evaluating the expression `<expr>`.  If this result is not
 a string, it is implicitly cast to a string.
 
 For example,
 ```mdtest-command
-echo '{numerator:22.0, denominator:7.0}' | zq -z 'yield "pi is approximately ${numerator / denominator}"' -
+echo '{numerator:22.0, denominator:7.0}' | zq -z 'yield f"pi is approximately {numerator / denominator}"' -
 ```
 produces
 ```mdtest-output
 "pi is approximately 3.142857142857143"
 ```
 
-If any template expression results in an error, then the value of the template
-literal is the first error encountered in left-to-right order.
+If any expression results in an error, then the value of the f-string is the
+first error encountered in left-to-right order.
 
 > TBD: we could improve an error result here by creating a structured error
 > containing the string template text along with a list of values/errors of
 > the expressions.
 
-String interpolation may be nested, where `<expr>` contains additional strings
-with interpolated expressions.
+F-strings may be nested, where a child `<expr>` may contain f-strings.
 
 For example,
 ```mdtest-command
-echo '{foo:"hello", bar:"world", HELLOWORLD:"hi!"}' | zq -z 'yield "oh ${this[upper("${foo + bar}")]}"' -
+echo '{foo:"hello", bar:"world", HELLOWORLD:"hi!"}' | zq -z 'yield f"oh {this[upper(f"{foo + bar}")]}"' -
 ```
 produces
 ```mdtest-output
diff --git a/docs/language/operators/from.md b/docs/language/operators/from.md
index 8c878dbccd..367b7ff059 100644
--- a/docs/language/operators/from.md
+++ b/docs/language/operators/from.md
@@ -184,7 +184,7 @@ zed -lake example query -z '
   ) on flip=number word
   | from (
     pass
-    pool coinflips@trial => c:=count() | yield "There were ${int64(c)} flips"
+    pool coinflips@trial => c:=count() | yield f"There were {int64(c)} flips"
   ) | sort this'
 ```
 =>
diff --git a/docs/tutorials/zq.md b/docs/tutorials/zq.md
index 721ae159e4..2a121e5f03 100644
--- a/docs/tutorials/zq.md
+++ b/docs/tutorials/zq.md
@@ -917,7 +917,7 @@ to put your clean data into all the right places.
 Let's start with something simple.  How about we output a "PR Report" listing
 the title of each PR along with its PR number and creation date:
 ```mdtest-command dir=docs/tutorials
-zq -f table '{DATE:created_at,NUMBER:"PR #${number}",TITLE:title}' prs.zng
+zq -f table '{DATE:created_at,NUMBER:f"PR #{number}",TITLE:title}' prs.zng
 ```
 and you'll see this output...
 ```mdtest-output head
@@ -929,14 +929,14 @@ DATE                 NUMBER TITLE
 2019-11-12T16:49:07Z PR #6  a few clarifications to the zson spec
 ...
 ```
-Note that we used [string interpolation](../language/expressions.md#string-interpolation)
+Note that we used a [formatted string literal](../language/expressions.md#formatted-string-literals)
 to convert the field `number` into a string and format it with surrounding text.
 
 Instead of old PRs, we can get the latest list of PRs using the
 [tail operator](../language/operators/tail.md) since we know the data is sorted
 chronologically. This command retrieves the last five PRs in the dataset:
 ```mdtest-command dir=docs/tutorials
-zq -f table 'tail 5 | {DATE:created_at,"NUMBER":"PR #${number}",TITLE:title}' prs.zng
+zq -f table 'tail 5 | {DATE:created_at,"NUMBER":f"PR #{number}",TITLE:title}' prs.zng
 ```
 and the output is:
 ```mdtest-output
diff --git a/lake/ztests/compact-vectors.yaml b/lake/ztests/compact-vectors.yaml
index b8c0168b5b..5cb4e3bfbf 100644
--- a/lake/ztests/compact-vectors.yaml
+++ b/lake/ztests/compact-vectors.yaml
@@ -2,9 +2,9 @@ script: |
   export ZED_LAKE=test
   zed init -q
   zed create -use -q test
-  seq 10 | zq '{ts:this-1,s:"val${this-1}"}' - | zed load -q -
-  seq 10 | zq '{ts:this-1,s:"val${this-1}"}' - | zed load -q -
-  ids=$(zed query -f text 'from test@main:objects | yield "0x${hex(id)}"')
+  seq 10 | zq '{ts:this-1,s:f"val{this-1}"}' - | zed load -q -
+  seq 10 | zq '{ts:this-1,s:f"val{this-1}"}' - | zed load -q -
+  ids=$(zed query -f text 'from test@main:objects | yield f"0x{hex(id)}"')
   zed compact -q -vectors $ids
   zed query -f lake 'from test@main:vectors'
 
diff --git a/lake/ztests/compact.yaml b/lake/ztests/compact.yaml
index 7f2fb10a7f..9fb5c251ec 100644
--- a/lake/ztests/compact.yaml
+++ b/lake/ztests/compact.yaml
@@ -2,9 +2,9 @@ script: |
   export ZED_LAKE=test
   zed init -q
   zed create -use -q test
-  seq 10 | zq '{ts:this-1,s:"val${this-1}"}' - | zed load -q -
-  seq 10 | zq '{ts:this-1,s:"val${this-1}"}' - | zed load -q -
-  ids=$(zed query -f text 'from test@main:objects | yield "0x${hex(id)}"')
+  seq 10 | zq '{ts:this-1,s:f"val{this-1}"}' - | zed load -q -
+  seq 10 | zq '{ts:this-1,s:f"val{this-1}"}' - | zed load -q -
+  ids=$(zed query -f text 'from test@main:objects | yield f"0x{hex(id)}"')
   zed compact -q $ids
   zed query -f lake 'from test@main:objects'
 
diff --git a/lake/ztests/delete-where.yaml b/lake/ztests/delete-where.yaml
index 3c2bff6bc2..499cec0f98 100644
--- a/lake/ztests/delete-where.yaml
+++ b/lake/ztests/delete-where.yaml
@@ -4,7 +4,7 @@ script: |
   for order in desc asc; do
     echo === $order ===
     zed create -use -q -S 1KB -orderby ts:$order test
-    seq 1000 | zq '{ts:this-1,s:"val${this-1}"}' - | zed load -q -
+    seq 1000 | zq '{ts:this-1,s:f"val{this-1}"}' - | zed load -q -
     zed delete -q -where 'ts > 400 and ts <= 500'
     zed query -z 'count:=count()'
     zed delete -q -where 's == "val1" or s == "val999"'
diff --git a/service/ztests/compact-vectors.yaml b/service/ztests/compact-vectors.yaml
index 3bcc13bae5..107511a2aa 100644
--- a/service/ztests/compact-vectors.yaml
+++ b/service/ztests/compact-vectors.yaml
@@ -1,9 +1,9 @@
 script: |
   source service.sh
   zed create -use -q test
-  seq 10 | zq '{ts:this-1,s:"val${this-1}"}' - | zed load -q -
-  seq 10 | zq '{ts:this-1,s:"val${this-1}"}' - | zed load -q -
-  ids=$(zed query -f text 'from test@main:objects | yield "0x${hex(id)}"')
+  seq 10 | zq '{ts:this-1,s:f"val{this-1}"}' - | zed load -q -
+  seq 10 | zq '{ts:this-1,s:f"val{this-1}"}' - | zed load -q -
+  ids=$(zed query -f text 'from test@main:objects | yield f"0x{hex(id)}"')
   zed compact -q -vectors $ids
   zed query -f lake 'from test@main:vectors'
 
diff --git a/service/ztests/compact.yaml b/service/ztests/compact.yaml
index 5be826e7e7..25263cbefd 100644
--- a/service/ztests/compact.yaml
+++ b/service/ztests/compact.yaml
@@ -1,9 +1,9 @@
 script: |
   source service.sh
   zed create -use -q test
-  seq 10 | zq '{ts:this-1,s:"val${this-1}"}' - | zed load -q -
-  seq 10 | zq '{ts:this-1,s:"val${this-1}"}' - | zed load -q -
-  ids=$(zed query -f text 'from test@main:objects | yield "0x${hex(id)}"')
+  seq 10 | zq '{ts:this-1,s:f"val{this-1}"}' - | zed load -q -
+  seq 10 | zq '{ts:this-1,s:f"val{this-1}"}' - | zed load -q -
+  ids=$(zed query -f text 'from test@main:objects | yield f"0x{hex(id)}"')
   zed compact -q $ids
   zed query -f lake 'from test@main:objects'
 
diff --git a/service/ztests/delete-where.yaml b/service/ztests/delete-where.yaml
index dd46290477..959cd6aad2 100644
--- a/service/ztests/delete-where.yaml
+++ b/service/ztests/delete-where.yaml
@@ -3,7 +3,7 @@ script: |
   for order in desc asc; do
     echo === $order === | tee >(cat >&2)
     zed create -use -q -S 1KB -orderby ts:$order test
-    seq 1000 | zq '{ts:this-1,s:"val${this-1}"}' - | zed load -q -
+    seq 1000 | zq '{ts:this-1,s:f"val{this-1}"}' - | zed load -q -
     zed delete -q -where 'ts > 400 and ts <= 500'
     zed query -z 'count()'
     zed delete -q -where 's == "val1" or s == "val999"'
diff --git a/zfmt/ast.go b/zfmt/ast.go
index 2876b53e78..9708473ed5 100644
--- a/zfmt/ast.go
+++ b/zfmt/ast.go
@@ -207,6 +207,21 @@ func (c *canon) expr(e ast.Expr, parent string) {
 		c.ret()
 		c.flush()
 		c.write(")")
+	case *ast.FString:
+		c.write(`f"`)
+		for _, elem := range e.Elems {
+			switch elem := elem.(type) {
+			case *ast.FStringExpr:
+				c.write("{")
+				c.expr(elem.Expr, "")
+				c.write("}")
+			case *ast.FStringText:
+				c.write(elem.Text)
+			default:
+				c.write("(unknown f-string element %T)", elem)
+			}
+		}
+		c.write(`"`)
 	default:
 		c.write("(unknown expr %T)", e)
 	}
diff --git a/zfmt/ztests/f-string.yaml b/zfmt/ztests/f-string.yaml
new file mode 100644
index 0000000000..cee9b4736c
--- /dev/null
+++ b/zfmt/ztests/f-string.yaml
@@ -0,0 +1,7 @@
+script: |
+  zc -C 'yield f"hello {f"world"}"'
+
+outputs:
+  - name: stdout
+    data: |
+      yield f"hello {f"world"}"