From ea8bdeb67142fefcae20910d28bef07122b3f5df Mon Sep 17 00:00:00 2001
From: John Kerl <kerl.john.r@gmail.com>
Date: Sun, 1 May 2022 23:25:55 -0400
Subject: [PATCH] Parser-generator artifacts; unit-test update; go mod update

---
 go.mod                                        |    1 +
 go.sum                                        |   27 +
 internal/pkg/parsing/lexer/acttab.go          |  306 +--
 internal/pkg/parsing/lexer/lexer.go           | 1139 +++++-----
 internal/pkg/parsing/lexer/transitiontable.go | 1878 +++++++++--------
 test/cases/dsl-parse/0019/expout              |   14 +-
 test/cases/dsl-parse/0019/mlr                 |    2 +-
 7 files changed, 1753 insertions(+), 1614 deletions(-)

diff --git a/go.mod b/go.mod
index 406ee3bdb..d281fef20 100644
--- a/go.mod
+++ b/go.mod
@@ -18,6 +18,7 @@ go 1.15
 
 require (
 	github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb
+	github.com/goccmack/gocc v0.0.0-20211213154817-7ea699349eca // indirect
 	github.com/johnkerl/lumin v1.0.0
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/lestrrat-go/strftime v1.0.6
diff --git a/go.sum b/go.sum
index 1b3b3acb8..c5c83c64b 100644
--- a/go.sum
+++ b/go.sum
@@ -2,6 +2,8 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb h1:IT4JYU7k4ikYg1SCxNI1/Tieq/NFvh6dzLdgi7eu0tM=
 github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb/go.mod h1:bH6Xx7IW64qjjJq8M2u4dxNaBiDfKK+z/3eGDpXEQhc=
+github.com/goccmack/gocc v0.0.0-20211213154817-7ea699349eca h1:NuA6w6b01Ojdig+4K1l9p4Pp3unlv4owphbOiENm8m4=
+github.com/goccmack/gocc v0.0.0-20211213154817-7ea699349eca/go.mod h1:c4Mb67Mg9+pl6OlxvnFBUiiQOSlXfh0QukINLl54OD0=
 github.com/johnkerl/lumin v1.0.0 h1:CV34cHZOJ92Y02RbQ0rd4gA0C06Qck9q8blOyaPoWpU=
 github.com/johnkerl/lumin v1.0.0/go.mod h1:eLf5AdQOaLvzZ2zVy4REr/DSeEwG+CZreHwNLICqv9E=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
@@ -22,12 +24,37 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38=
+golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0=
 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlpnxz5GSOhOmtHo3iPU6M=
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
diff --git a/internal/pkg/parsing/lexer/acttab.go b/internal/pkg/parsing/lexer/acttab.go
index 6de3eda3e..8f1b39dad 100644
--- a/internal/pkg/parsing/lexer/acttab.go
+++ b/internal/pkg/parsing/lexer/acttab.go
@@ -701,11 +701,11 @@ var ActTab = ActionTable{
 		Ignore: "",
 	},
 	ActionRow{ // S170
-		Accept: 106,
+		Accept: 0,
 		Ignore: "",
 	},
 	ActionRow{ // S171
-		Accept: 105,
+		Accept: 106,
 		Ignore: "",
 	},
 	ActionRow{ // S172
@@ -717,31 +717,31 @@ var ActTab = ActionTable{
 		Ignore: "",
 	},
 	ActionRow{ // S174
-		Accept: 58,
+		Accept: 105,
 		Ignore: "",
 	},
 	ActionRow{ // S175
-		Accept: 80,
+		Accept: 58,
 		Ignore: "",
 	},
 	ActionRow{ // S176
-		Accept: 59,
+		Accept: 80,
 		Ignore: "",
 	},
 	ActionRow{ // S177
-		Accept: 87,
+		Accept: 59,
 		Ignore: "",
 	},
 	ActionRow{ // S178
-		Accept: 53,
+		Accept: 87,
 		Ignore: "",
 	},
 	ActionRow{ // S179
-		Accept: 75,
+		Accept: 53,
 		Ignore: "",
 	},
 	ActionRow{ // S180
-		Accept: 35,
+		Accept: 75,
 		Ignore: "",
 	},
 	ActionRow{ // S181
@@ -753,7 +753,7 @@ var ActTab = ActionTable{
 		Ignore: "",
 	},
 	ActionRow{ // S183
-		Accept: 0,
+		Accept: 35,
 		Ignore: "",
 	},
 	ActionRow{ // S184
@@ -761,11 +761,11 @@ var ActTab = ActionTable{
 		Ignore: "",
 	},
 	ActionRow{ // S185
-		Accept: 127,
+		Accept: 0,
 		Ignore: "",
 	},
 	ActionRow{ // S186
-		Accept: 40,
+		Accept: 127,
 		Ignore: "",
 	},
 	ActionRow{ // S187
@@ -773,67 +773,67 @@ var ActTab = ActionTable{
 		Ignore: "",
 	},
 	ActionRow{ // S188
-		Accept: 124,
+		Accept: 40,
 		Ignore: "",
 	},
 	ActionRow{ // S189
-		Accept: 116,
+		Accept: 124,
 		Ignore: "",
 	},
 	ActionRow{ // S190
-		Accept: 115,
+		Accept: 116,
 		Ignore: "",
 	},
 	ActionRow{ // S191
-		Accept: 117,
+		Accept: 115,
 		Ignore: "",
 	},
 	ActionRow{ // S192
-		Accept: 109,
+		Accept: 117,
 		Ignore: "",
 	},
 	ActionRow{ // S193
-		Accept: 112,
+		Accept: 109,
 		Ignore: "",
 	},
 	ActionRow{ // S194
-		Accept: 40,
+		Accept: 112,
 		Ignore: "",
 	},
 	ActionRow{ // S195
-		Accept: 110,
+		Accept: 40,
 		Ignore: "",
 	},
 	ActionRow{ // S196
-		Accept: 119,
+		Accept: 110,
 		Ignore: "",
 	},
 	ActionRow{ // S197
-		Accept: 118,
+		Accept: 119,
 		Ignore: "",
 	},
 	ActionRow{ // S198
-		Accept: 120,
+		Accept: 118,
 		Ignore: "",
 	},
 	ActionRow{ // S199
-		Accept: 129,
+		Accept: 120,
 		Ignore: "",
 	},
 	ActionRow{ // S200
-		Accept: 51,
+		Accept: 129,
 		Ignore: "",
 	},
 	ActionRow{ // S201
-		Accept: 39,
+		Accept: 51,
 		Ignore: "",
 	},
 	ActionRow{ // S202
-		Accept: 41,
+		Accept: 39,
 		Ignore: "",
 	},
 	ActionRow{ // S203
-		Accept: 40,
+		Accept: 41,
 		Ignore: "",
 	},
 	ActionRow{ // S204
@@ -873,11 +873,11 @@ var ActTab = ActionTable{
 		Ignore: "",
 	},
 	ActionRow{ // S213
-		Accept: 132,
+		Accept: 40,
 		Ignore: "",
 	},
 	ActionRow{ // S214
-		Accept: 40,
+		Accept: 132,
 		Ignore: "",
 	},
 	ActionRow{ // S215
@@ -893,31 +893,31 @@ var ActTab = ActionTable{
 		Ignore: "",
 	},
 	ActionRow{ // S218
-		Accept: 138,
+		Accept: 40,
 		Ignore: "",
 	},
 	ActionRow{ // S219
-		Accept: 40,
+		Accept: 138,
 		Ignore: "",
 	},
 	ActionRow{ // S220
-		Accept: 44,
+		Accept: 40,
 		Ignore: "",
 	},
 	ActionRow{ // S221
-		Accept: 45,
+		Accept: 44,
 		Ignore: "",
 	},
 	ActionRow{ // S222
-		Accept: 40,
+		Accept: 45,
 		Ignore: "",
 	},
 	ActionRow{ // S223
-		Accept: 46,
+		Accept: 40,
 		Ignore: "",
 	},
 	ActionRow{ // S224
-		Accept: 40,
+		Accept: 46,
 		Ignore: "",
 	},
 	ActionRow{ // S225
@@ -929,19 +929,19 @@ var ActTab = ActionTable{
 		Ignore: "",
 	},
 	ActionRow{ // S227
-		Accept: 47,
+		Accept: 40,
 		Ignore: "",
 	},
 	ActionRow{ // S228
-		Accept: 40,
+		Accept: 47,
 		Ignore: "",
 	},
 	ActionRow{ // S229
-		Accept: 21,
+		Accept: 40,
 		Ignore: "",
 	},
 	ActionRow{ // S230
-		Accept: 40,
+		Accept: 21,
 		Ignore: "",
 	},
 	ActionRow{ // S231
@@ -949,31 +949,31 @@ var ActTab = ActionTable{
 		Ignore: "",
 	},
 	ActionRow{ // S232
-		Accept: 48,
-		Ignore: "",
-	},
-	ActionRow{ // S233
 		Accept: 40,
 		Ignore: "",
 	},
+	ActionRow{ // S233
+		Accept: 48,
+		Ignore: "",
+	},
 	ActionRow{ // S234
-		Accept: 50,
+		Accept: 40,
 		Ignore: "",
 	},
 	ActionRow{ // S235
-		Accept: 104,
+		Accept: 50,
 		Ignore: "",
 	},
 	ActionRow{ // S236
-		Accept: 33,
+		Accept: 104,
 		Ignore: "",
 	},
 	ActionRow{ // S237
-		Accept: 0,
+		Accept: 33,
 		Ignore: "",
 	},
 	ActionRow{ // S238
-		Accept: 31,
+		Accept: 0,
 		Ignore: "",
 	},
 	ActionRow{ // S239
@@ -981,7 +981,7 @@ var ActTab = ActionTable{
 		Ignore: "",
 	},
 	ActionRow{ // S240
-		Accept: 0,
+		Accept: 31,
 		Ignore: "",
 	},
 	ActionRow{ // S241
@@ -989,7 +989,7 @@ var ActTab = ActionTable{
 		Ignore: "",
 	},
 	ActionRow{ // S242
-		Accept: 106,
+		Accept: 0,
 		Ignore: "",
 	},
 	ActionRow{ // S243
@@ -997,55 +997,55 @@ var ActTab = ActionTable{
 		Ignore: "",
 	},
 	ActionRow{ // S244
-		Accept: 0,
+		Accept: 106,
 		Ignore: "",
 	},
 	ActionRow{ // S245
-		Accept: 106,
-		Ignore: "",
-	},
-	ActionRow{ // S246
-		Accept: 106,
-		Ignore: "",
-	},
-	ActionRow{ // S247
-		Accept: 60,
-		Ignore: "",
-	},
-	ActionRow{ // S248
-		Accept: 54,
-		Ignore: "",
-	},
-	ActionRow{ // S249
 		Accept: 0,
 		Ignore: "",
 	},
+	ActionRow{ // S246
+		Accept: 0,
+		Ignore: "",
+	},
+	ActionRow{ // S247
+		Accept: 0,
+		Ignore: "",
+	},
+	ActionRow{ // S248
+		Accept: 106,
+		Ignore: "",
+	},
+	ActionRow{ // S249
+		Accept: 106,
+		Ignore: "",
+	},
 	ActionRow{ // S250
-		Accept: 37,
+		Accept: 106,
 		Ignore: "",
 	},
 	ActionRow{ // S251
-		Accept: 37,
+		Accept: 60,
 		Ignore: "",
 	},
 	ActionRow{ // S252
-		Accept: 40,
+		Accept: 54,
 		Ignore: "",
 	},
 	ActionRow{ // S253
-		Accept: 40,
+		Accept: 0,
 		Ignore: "",
 	},
 	ActionRow{ // S254
-		Accept: 111,
+		Accept: 37,
 		Ignore: "",
 	},
 	ActionRow{ // S255
-		Accept: 40,
+		Accept: 37,
 		Ignore: "",
 	},
 	ActionRow{ // S256
-		Accept: 42,
+		Accept: 40,
 		Ignore: "",
 	},
 	ActionRow{ // S257
@@ -1053,7 +1053,7 @@ var ActTab = ActionTable{
 		Ignore: "",
 	},
 	ActionRow{ // S258
-		Accept: 130,
+		Accept: 111,
 		Ignore: "",
 	},
 	ActionRow{ // S259
@@ -1061,7 +1061,7 @@ var ActTab = ActionTable{
 		Ignore: "",
 	},
 	ActionRow{ // S260
-		Accept: 19,
+		Accept: 42,
 		Ignore: "",
 	},
 	ActionRow{ // S261
@@ -1069,15 +1069,15 @@ var ActTab = ActionTable{
 		Ignore: "",
 	},
 	ActionRow{ // S262
-		Accept: 134,
+		Accept: 130,
 		Ignore: "",
 	},
 	ActionRow{ // S263
-		Accept: 135,
+		Accept: 40,
 		Ignore: "",
 	},
 	ActionRow{ // S264
-		Accept: 24,
+		Accept: 19,
 		Ignore: "",
 	},
 	ActionRow{ // S265
@@ -1085,23 +1085,23 @@ var ActTab = ActionTable{
 		Ignore: "",
 	},
 	ActionRow{ // S266
-		Accept: 40,
+		Accept: 134,
 		Ignore: "",
 	},
 	ActionRow{ // S267
-		Accept: 40,
+		Accept: 135,
 		Ignore: "",
 	},
 	ActionRow{ // S268
-		Accept: 40,
+		Accept: 24,
 		Ignore: "",
 	},
 	ActionRow{ // S269
-		Accept: 142,
+		Accept: 40,
 		Ignore: "",
 	},
 	ActionRow{ // S270
-		Accept: 108,
+		Accept: 40,
 		Ignore: "",
 	},
 	ActionRow{ // S271
@@ -1113,19 +1113,19 @@ var ActTab = ActionTable{
 		Ignore: "",
 	},
 	ActionRow{ // S273
-		Accept: 40,
+		Accept: 142,
 		Ignore: "",
 	},
 	ActionRow{ // S274
-		Accept: 40,
+		Accept: 108,
 		Ignore: "",
 	},
 	ActionRow{ // S275
-		Accept: 143,
+		Accept: 40,
 		Ignore: "",
 	},
 	ActionRow{ // S276
-		Accept: 107,
+		Accept: 40,
 		Ignore: "",
 	},
 	ActionRow{ // S277
@@ -1137,67 +1137,67 @@ var ActTab = ActionTable{
 		Ignore: "",
 	},
 	ActionRow{ // S279
-		Accept: 0,
+		Accept: 143,
 		Ignore: "",
 	},
 	ActionRow{ // S280
-		Accept: 106,
+		Accept: 107,
 		Ignore: "",
 	},
 	ActionRow{ // S281
-		Accept: 0,
+		Accept: 40,
 		Ignore: "",
 	},
 	ActionRow{ // S282
-		Accept: 106,
+		Accept: 40,
 		Ignore: "",
 	},
 	ActionRow{ // S283
-		Accept: 106,
+		Accept: 0,
 		Ignore: "",
 	},
 	ActionRow{ // S284
-		Accept: 40,
+		Accept: 106,
 		Ignore: "",
 	},
 	ActionRow{ // S285
-		Accept: 40,
+		Accept: 106,
 		Ignore: "",
 	},
 	ActionRow{ // S286
-		Accept: 131,
+		Accept: 0,
 		Ignore: "",
 	},
 	ActionRow{ // S287
-		Accept: 140,
+		Accept: 0,
 		Ignore: "",
 	},
 	ActionRow{ // S288
-		Accept: 40,
+		Accept: 106,
 		Ignore: "",
 	},
 	ActionRow{ // S289
-		Accept: 20,
+		Accept: 106,
 		Ignore: "",
 	},
 	ActionRow{ // S290
-		Accept: 23,
+		Accept: 106,
 		Ignore: "",
 	},
 	ActionRow{ // S291
-		Accept: 22,
-		Ignore: "",
-	},
-	ActionRow{ // S292
-		Accept: 27,
-		Ignore: "",
-	},
-	ActionRow{ // S293
 		Accept: 40,
 		Ignore: "",
 	},
+	ActionRow{ // S292
+		Accept: 40,
+		Ignore: "",
+	},
+	ActionRow{ // S293
+		Accept: 131,
+		Ignore: "",
+	},
 	ActionRow{ // S294
-		Accept: 107,
+		Accept: 140,
 		Ignore: "",
 	},
 	ActionRow{ // S295
@@ -1205,19 +1205,19 @@ var ActTab = ActionTable{
 		Ignore: "",
 	},
 	ActionRow{ // S296
-		Accept: 43,
+		Accept: 20,
 		Ignore: "",
 	},
 	ActionRow{ // S297
-		Accept: 49,
+		Accept: 23,
 		Ignore: "",
 	},
 	ActionRow{ // S298
-		Accept: 14,
+		Accept: 22,
 		Ignore: "",
 	},
 	ActionRow{ // S299
-		Accept: 40,
+		Accept: 27,
 		Ignore: "",
 	},
 	ActionRow{ // S300
@@ -1225,23 +1225,23 @@ var ActTab = ActionTable{
 		Ignore: "",
 	},
 	ActionRow{ // S301
-		Accept: 40,
+		Accept: 107,
 		Ignore: "",
 	},
 	ActionRow{ // S302
-		Accept: 7,
+		Accept: 40,
 		Ignore: "",
 	},
 	ActionRow{ // S303
-		Accept: 136,
+		Accept: 43,
 		Ignore: "",
 	},
 	ActionRow{ // S304
-		Accept: 0,
+		Accept: 49,
 		Ignore: "",
 	},
 	ActionRow{ // S305
-		Accept: 106,
+		Accept: 14,
 		Ignore: "",
 	},
 	ActionRow{ // S306
@@ -1257,35 +1257,35 @@ var ActTab = ActionTable{
 		Ignore: "",
 	},
 	ActionRow{ // S309
-		Accept: 40,
+		Accept: 7,
 		Ignore: "",
 	},
 	ActionRow{ // S310
-		Accept: 17,
+		Accept: 136,
 		Ignore: "",
 	},
 	ActionRow{ // S311
-		Accept: 8,
+		Accept: 0,
 		Ignore: "",
 	},
 	ActionRow{ // S312
-		Accept: 16,
+		Accept: 106,
 		Ignore: "",
 	},
 	ActionRow{ // S313
-		Accept: 144,
+		Accept: 106,
 		Ignore: "",
 	},
 	ActionRow{ // S314
-		Accept: 13,
+		Accept: 40,
 		Ignore: "",
 	},
 	ActionRow{ // S315
-		Accept: 12,
+		Accept: 40,
 		Ignore: "",
 	},
 	ActionRow{ // S316
-		Accept: 0,
+		Accept: 40,
 		Ignore: "",
 	},
 	ActionRow{ // S317
@@ -1293,42 +1293,74 @@ var ActTab = ActionTable{
 		Ignore: "",
 	},
 	ActionRow{ // S318
-		Accept: 126,
+		Accept: 17,
 		Ignore: "",
 	},
 	ActionRow{ // S319
-		Accept: 121,
+		Accept: 8,
 		Ignore: "",
 	},
 	ActionRow{ // S320
-		Accept: 40,
+		Accept: 16,
 		Ignore: "",
 	},
 	ActionRow{ // S321
-		Accept: 18,
+		Accept: 144,
 		Ignore: "",
 	},
 	ActionRow{ // S322
-		Accept: 0,
+		Accept: 13,
 		Ignore: "",
 	},
 	ActionRow{ // S323
-		Accept: 125,
+		Accept: 12,
 		Ignore: "",
 	},
 	ActionRow{ // S324
-		Accept: 141,
+		Accept: 0,
 		Ignore: "",
 	},
 	ActionRow{ // S325
-		Accept: 0,
+		Accept: 40,
 		Ignore: "",
 	},
 	ActionRow{ // S326
-		Accept: 0,
+		Accept: 126,
 		Ignore: "",
 	},
 	ActionRow{ // S327
+		Accept: 121,
+		Ignore: "",
+	},
+	ActionRow{ // S328
+		Accept: 40,
+		Ignore: "",
+	},
+	ActionRow{ // S329
+		Accept: 18,
+		Ignore: "",
+	},
+	ActionRow{ // S330
+		Accept: 0,
+		Ignore: "",
+	},
+	ActionRow{ // S331
+		Accept: 125,
+		Ignore: "",
+	},
+	ActionRow{ // S332
+		Accept: 141,
+		Ignore: "",
+	},
+	ActionRow{ // S333
+		Accept: 0,
+		Ignore: "",
+	},
+	ActionRow{ // S334
+		Accept: 0,
+		Ignore: "",
+	},
+	ActionRow{ // S335
 		Accept: 113,
 		Ignore: "",
 	},
diff --git a/internal/pkg/parsing/lexer/lexer.go b/internal/pkg/parsing/lexer/lexer.go
index b98809f87..dea79dd4f 100644
--- a/internal/pkg/parsing/lexer/lexer.go
+++ b/internal/pkg/parsing/lexer/lexer.go
@@ -11,8 +11,8 @@ import (
 
 const (
 	NoState    = -1
-	NumStates  = 328
-	NumSymbols = 634
+	NumStates  = 336
+	NumSymbols = 639
 )
 
 type Lexer struct {
@@ -143,624 +143,629 @@ Lexer symbols:
 11: '.'
 12: '.'
 13: '-'
-14: '.'
+14: '+'
 15: '.'
-16: '-'
-17: '.'
+16: '.'
+17: '-'
 18: '.'
-19: '-'
-20: 'M'
-21: '_'
-22: 'P'
-23: 'I'
-24: 'M'
-25: '_'
-26: 'E'
-27: 'n'
-28: 'u'
-29: 'l'
-30: 'l'
-31: 'I'
+19: '+'
+20: '.'
+21: '.'
+22: '-'
+23: '.'
+24: '+'
+25: 'M'
+26: '_'
+27: 'P'
+28: 'I'
+29: 'M'
+30: '_'
+31: 'E'
 32: 'n'
-33: 'f'
-34: 'N'
-35: 'a'
-36: 'N'
-37: 'I'
-38: 'P'
-39: 'S'
-40: 'I'
-41: 'F'
-42: 'S'
-43: 'I'
-44: 'R'
-45: 'S'
-46: 'O'
-47: 'P'
-48: 'S'
-49: 'O'
-50: 'F'
-51: 'S'
-52: 'O'
-53: 'R'
-54: 'S'
+33: 'u'
+34: 'l'
+35: 'l'
+36: 'I'
+37: 'n'
+38: 'f'
+39: 'N'
+40: 'a'
+41: 'N'
+42: 'I'
+43: 'P'
+44: 'S'
+45: 'I'
+46: 'F'
+47: 'S'
+48: 'I'
+49: 'R'
+50: 'S'
+51: 'O'
+52: 'P'
+53: 'S'
+54: 'O'
 55: 'F'
-56: 'L'
-57: 'A'
-58: 'T'
+56: 'S'
+57: 'O'
+58: 'R'
 59: 'S'
-60: 'E'
-61: 'P'
-62: 'N'
-63: 'F'
-64: 'N'
-65: 'R'
-66: 'F'
+60: 'F'
+61: 'L'
+62: 'A'
+63: 'T'
+64: 'S'
+65: 'E'
+66: 'P'
 67: 'N'
-68: 'R'
-69: 'F'
-70: 'I'
-71: 'L'
-72: 'E'
-73: 'N'
-74: 'A'
-75: 'M'
-76: 'E'
-77: 'F'
-78: 'I'
-79: 'L'
-80: 'E'
-81: 'N'
-82: 'U'
-83: 'M'
-84: 'E'
-85: 'N'
-86: 'V'
-87: 'b'
-88: 'e'
-89: 'g'
-90: 'i'
-91: 'n'
-92: 'd'
-93: 'o'
-94: 'e'
-95: 'l'
-96: 'i'
-97: 'f'
-98: 'e'
-99: 'l'
-100: 's'
-101: 'e'
-102: 'e'
-103: 'n'
-104: 'd'
-105: 'f'
-106: 'i'
-107: 'l'
-108: 't'
-109: 'e'
-110: 'r'
-111: 'f'
-112: 'o'
-113: 'r'
-114: 'i'
-115: 'f'
-116: 'i'
-117: 'n'
-118: 'w'
-119: 'h'
-120: 'i'
-121: 'l'
-122: 'e'
-123: 'b'
-124: 'r'
-125: 'e'
-126: 'a'
-127: 'k'
-128: 'c'
-129: 'o'
-130: 'n'
-131: 't'
-132: 'i'
-133: 'n'
-134: 'u'
-135: 'e'
-136: 'r'
-137: 'e'
-138: 't'
+68: 'F'
+69: 'N'
+70: 'R'
+71: 'F'
+72: 'N'
+73: 'R'
+74: 'F'
+75: 'I'
+76: 'L'
+77: 'E'
+78: 'N'
+79: 'A'
+80: 'M'
+81: 'E'
+82: 'F'
+83: 'I'
+84: 'L'
+85: 'E'
+86: 'N'
+87: 'U'
+88: 'M'
+89: 'E'
+90: 'N'
+91: 'V'
+92: 'b'
+93: 'e'
+94: 'g'
+95: 'i'
+96: 'n'
+97: 'd'
+98: 'o'
+99: 'e'
+100: 'l'
+101: 'i'
+102: 'f'
+103: 'e'
+104: 'l'
+105: 's'
+106: 'e'
+107: 'e'
+108: 'n'
+109: 'd'
+110: 'f'
+111: 'i'
+112: 'l'
+113: 't'
+114: 'e'
+115: 'r'
+116: 'f'
+117: 'o'
+118: 'r'
+119: 'i'
+120: 'f'
+121: 'i'
+122: 'n'
+123: 'w'
+124: 'h'
+125: 'i'
+126: 'l'
+127: 'e'
+128: 'b'
+129: 'r'
+130: 'e'
+131: 'a'
+132: 'k'
+133: 'c'
+134: 'o'
+135: 'n'
+136: 't'
+137: 'i'
+138: 'n'
 139: 'u'
-140: 'r'
-141: 'n'
-142: 'f'
-143: 'u'
-144: 'n'
-145: 'c'
-146: 's'
-147: 'u'
-148: 'b'
-149: 'r'
+140: 'e'
+141: 'r'
+142: 'e'
+143: 't'
+144: 'u'
+145: 'r'
+146: 'n'
+147: 'f'
+148: 'u'
+149: 'n'
 150: 'c'
-151: 'a'
-152: 'l'
-153: 'l'
-154: 'a'
-155: 'r'
-156: 'r'
-157: 'b'
-158: 'o'
-159: 'o'
-160: 'l'
-161: 'f'
-162: 'l'
+151: 's'
+152: 'u'
+153: 'b'
+154: 'r'
+155: 'c'
+156: 'a'
+157: 'l'
+158: 'l'
+159: 'a'
+160: 'r'
+161: 'r'
+162: 'b'
 163: 'o'
-164: 'a'
-165: 't'
-166: 'i'
-167: 'n'
-168: 't'
-169: 'm'
-170: 'a'
-171: 'p'
+164: 'o'
+165: 'l'
+166: 'f'
+167: 'l'
+168: 'o'
+169: 'a'
+170: 't'
+171: 'i'
 172: 'n'
-173: 'u'
+173: 't'
 174: 'm'
-175: 's'
-176: 't'
-177: 'r'
-178: 'v'
-179: 'a'
-180: 'r'
-181: 'f'
-182: 'u'
-183: 'n'
-184: 'c'
-185: 't'
-186: 'u'
-187: 'n'
-188: 's'
-189: 'e'
+175: 'a'
+176: 'p'
+177: 'n'
+178: 'u'
+179: 'm'
+180: 's'
+181: 't'
+182: 'r'
+183: 'v'
+184: 'a'
+185: 'r'
+186: 'f'
+187: 'u'
+188: 'n'
+189: 'c'
 190: 't'
-191: 'd'
-192: 'u'
-193: 'm'
-194: 'p'
-195: 'e'
+191: 'u'
+192: 'n'
+193: 's'
+194: 'e'
+195: 't'
 196: 'd'
 197: 'u'
 198: 'm'
 199: 'p'
 200: 'e'
-201: 'm'
-202: 'i'
-203: 't'
-204: '1'
+201: 'd'
+202: 'u'
+203: 'm'
+204: 'p'
 205: 'e'
 206: 'm'
 207: 'i'
 208: 't'
-209: 'e'
-210: 'm'
-211: 'i'
-212: 't'
-213: 'p'
+209: '1'
+210: 'e'
+211: 'm'
+212: 'i'
+213: 't'
 214: 'e'
 215: 'm'
 216: 'i'
 217: 't'
-218: 'f'
+218: 'p'
 219: 'e'
-220: 'p'
-221: 'r'
-222: 'i'
-223: 'n'
-224: 't'
-225: 'e'
-226: 'p'
-227: 'r'
-228: 'i'
-229: 'n'
-230: 't'
-231: 'n'
-232: 'p'
-233: 'r'
-234: 'i'
-235: 'n'
-236: 't'
+220: 'm'
+221: 'i'
+222: 't'
+223: 'f'
+224: 'e'
+225: 'p'
+226: 'r'
+227: 'i'
+228: 'n'
+229: 't'
+230: 'e'
+231: 'p'
+232: 'r'
+233: 'i'
+234: 'n'
+235: 't'
+236: 'n'
 237: 'p'
 238: 'r'
 239: 'i'
 240: 'n'
 241: 't'
-242: 'n'
-243: 't'
-244: 'e'
-245: 'e'
-246: 's'
-247: 't'
-248: 'd'
-249: 'o'
-250: 'u'
-251: 't'
-252: 's'
-253: 't'
-254: 'd'
-255: 'e'
-256: 'r'
-257: 'r'
-258: '$'
-259: '$'
-260: '{'
-261: '}'
-262: '$'
-263: '*'
-264: '@'
-265: '@'
-266: '{'
-267: '}'
-268: '@'
-269: '*'
-270: 'a'
-271: 'l'
-272: 'l'
-273: '%'
-274: '%'
-275: '%'
-276: 'p'
-277: 'a'
-278: 'n'
-279: 'i'
-280: 'c'
-281: '%'
-282: '%'
-283: '%'
-284: ';'
-285: '{'
-286: '}'
-287: '='
-288: '>'
-289: '>'
-290: '>'
-291: '|'
-292: ','
-293: '('
-294: ')'
-295: '$'
-296: '['
-297: ']'
-298: '$'
-299: '['
-300: '['
-301: '$'
-302: '['
-303: '['
+242: 'p'
+243: 'r'
+244: 'i'
+245: 'n'
+246: 't'
+247: 'n'
+248: 't'
+249: 'e'
+250: 'e'
+251: 's'
+252: 't'
+253: 'd'
+254: 'o'
+255: 'u'
+256: 't'
+257: 's'
+258: 't'
+259: 'd'
+260: 'e'
+261: 'r'
+262: 'r'
+263: '$'
+264: '$'
+265: '{'
+266: '}'
+267: '$'
+268: '*'
+269: '@'
+270: '@'
+271: '{'
+272: '}'
+273: '@'
+274: '*'
+275: 'a'
+276: 'l'
+277: 'l'
+278: '%'
+279: '%'
+280: '%'
+281: 'p'
+282: 'a'
+283: 'n'
+284: 'i'
+285: 'c'
+286: '%'
+287: '%'
+288: '%'
+289: ';'
+290: '{'
+291: '}'
+292: '='
+293: '>'
+294: '>'
+295: '>'
+296: '|'
+297: ','
+298: '('
+299: ')'
+300: '$'
+301: '['
+302: ']'
+303: '$'
 304: '['
-305: '@'
-306: '['
-307: '|'
-308: '|'
-309: '='
-310: '^'
-311: '^'
-312: '='
-313: '&'
-314: '&'
-315: '='
-316: '?'
-317: '?'
-318: '='
-319: '?'
-320: '?'
+305: '['
+306: '$'
+307: '['
+308: '['
+309: '['
+310: '@'
+311: '['
+312: '|'
+313: '|'
+314: '='
+315: '^'
+316: '^'
+317: '='
+318: '&'
+319: '&'
+320: '='
 321: '?'
-322: '='
-323: '|'
-324: '='
-325: '&'
-326: '='
-327: '^'
-328: '='
-329: '<'
-330: '<'
+322: '?'
+323: '='
+324: '?'
+325: '?'
+326: '?'
+327: '='
+328: '|'
+329: '='
+330: '&'
 331: '='
-332: '>'
-333: '>'
-334: '='
-335: '>'
-336: '>'
+332: '^'
+333: '='
+334: '<'
+335: '<'
+336: '='
 337: '>'
-338: '='
-339: '+'
-340: '='
-341: '.'
-342: '='
-343: '-'
-344: '='
-345: '*'
-346: '='
-347: '/'
-348: '='
-349: '/'
-350: '/'
+338: '>'
+339: '='
+340: '>'
+341: '>'
+342: '>'
+343: '='
+344: '+'
+345: '='
+346: '.'
+347: '='
+348: '-'
+349: '='
+350: '*'
 351: '='
-352: '%'
+352: '/'
 353: '='
-354: '*'
-355: '*'
+354: '/'
+355: '/'
 356: '='
-357: '?'
-358: ':'
-359: '|'
-360: '|'
-361: '^'
-362: '^'
-363: '&'
-364: '&'
-365: '?'
-366: '?'
-367: '?'
-368: '?'
-369: '?'
-370: '='
-371: '~'
-372: '!'
-373: '='
-374: '~'
+357: '%'
+358: '='
+359: '*'
+360: '*'
+361: '='
+362: '?'
+363: ':'
+364: '|'
+365: '|'
+366: '^'
+367: '^'
+368: '&'
+369: '&'
+370: '?'
+371: '?'
+372: '?'
+373: '?'
+374: '?'
 375: '='
-376: '='
+376: '~'
 377: '!'
 378: '='
-379: '<'
+379: '~'
 380: '='
-381: '>'
-382: '>'
+381: '='
+382: '!'
 383: '='
 384: '<'
-385: '<'
-386: '='
-387: '^'
-388: '&'
+385: '='
+386: '>'
+387: '>'
+388: '='
 389: '<'
 390: '<'
-391: '>'
-392: '>'
-393: '>'
-394: '+'
-395: '-'
-396: '.'
-397: '+'
-398: '.'
-399: '-'
-400: '*'
-401: '/'
-402: '/'
-403: '/'
-404: '%'
-405: '.'
-406: '*'
-407: '.'
+391: '='
+392: '^'
+393: '&'
+394: '<'
+395: '<'
+396: '>'
+397: '>'
+398: '>'
+399: '+'
+400: '-'
+401: '.'
+402: '+'
+403: '.'
+404: '-'
+405: '*'
+406: '/'
+407: '/'
 408: '/'
-409: '.'
-410: '/'
-411: '/'
+409: '%'
+410: '.'
+411: '*'
 412: '.'
-413: '!'
-414: '~'
-415: '*'
-416: '*'
-417: '['
-418: '['
-419: '['
-420: '['
-421: '['
+413: '/'
+414: '.'
+415: '/'
+416: '/'
+417: '.'
+418: '!'
+419: '~'
+420: '*'
+421: '*'
 422: '['
-423: '_'
-424: '_'
-425: ' '
-426: '!'
-427: '#'
-428: '$'
-429: '%'
-430: '&'
-431: '''
-432: '\'
-433: '('
-434: ')'
-435: '*'
-436: '+'
-437: ','
-438: '-'
-439: '.'
-440: '/'
-441: ':'
-442: ';'
-443: '<'
-444: '='
-445: '>'
-446: '?'
-447: '@'
-448: '['
-449: ']'
-450: '^'
-451: '_'
-452: '`'
-453: '{'
-454: '|'
-455: '}'
-456: '~'
-457: '\'
-458: '\'
-459: '\'
-460: '"'
-461: '\'
-462: '['
+423: '['
+424: '['
+425: '['
+426: '['
+427: '['
+428: '_'
+429: '_'
+430: ' '
+431: '!'
+432: '#'
+433: '$'
+434: '%'
+435: '&'
+436: '''
+437: '\'
+438: '('
+439: ')'
+440: '*'
+441: '+'
+442: ','
+443: '-'
+444: '.'
+445: '/'
+446: ':'
+447: ';'
+448: '<'
+449: '='
+450: '>'
+451: '?'
+452: '@'
+453: '['
+454: ']'
+455: '^'
+456: '_'
+457: '`'
+458: '{'
+459: '|'
+460: '}'
+461: '~'
+462: '\'
 463: '\'
-464: ']'
-465: '\'
-466: '.'
-467: '\'
-468: '*'
-469: '\'
-470: '%'
-471: '\'
-472: 'A'
-473: '\'
-474: 'B'
-475: '\'
-476: 'C'
-477: '\'
-478: 'D'
-479: '\'
-480: 'G'
-481: '\'
-482: 'H'
-483: '\'
-484: 'K'
-485: '\'
-486: 'L'
-487: '\'
-488: 'N'
-489: '\'
-490: 'P'
-491: '\'
-492: 'R'
-493: '\'
-494: 'S'
-495: '\'
-496: 'U'
-497: '\'
-498: 'V'
-499: '\'
-500: 'W'
-501: '\'
-502: 'X'
-503: '\'
-504: 'Z'
-505: '\'
-506: 'a'
-507: '\'
-508: 'b'
-509: '\'
-510: 'c'
-511: '\'
-512: 'd'
-513: '\'
-514: 'f'
-515: '\'
-516: 'g'
-517: '\'
-518: 'h'
-519: '\'
-520: 'k'
-521: '\'
-522: 'l'
-523: '\'
-524: 'n'
-525: '\'
-526: 'p'
-527: '\'
-528: 'r'
-529: '\'
-530: 's'
-531: '\'
-532: 't'
-533: '\'
-534: 'u'
-535: '\'
-536: 'v'
-537: '\'
-538: 'w'
-539: '\'
-540: 'x'
-541: '\'
-542: 'z'
-543: '\'
-544: '0'
-545: '\'
-546: '1'
-547: '\'
-548: '2'
-549: '\'
-550: '3'
-551: '\'
-552: '4'
-553: '\'
-554: '5'
-555: '\'
-556: '6'
-557: '\'
-558: '7'
-559: '\'
-560: '8'
-561: '\'
-562: '9'
-563: 'e'
-564: 'E'
-565: 't'
-566: 'r'
-567: 'u'
+464: '\'
+465: '"'
+466: '\'
+467: '['
+468: '\'
+469: ']'
+470: '\'
+471: '.'
+472: '\'
+473: '*'
+474: '\'
+475: '%'
+476: '\'
+477: 'A'
+478: '\'
+479: 'B'
+480: '\'
+481: 'C'
+482: '\'
+483: 'D'
+484: '\'
+485: 'G'
+486: '\'
+487: 'H'
+488: '\'
+489: 'K'
+490: '\'
+491: 'L'
+492: '\'
+493: 'N'
+494: '\'
+495: 'P'
+496: '\'
+497: 'R'
+498: '\'
+499: 'S'
+500: '\'
+501: 'U'
+502: '\'
+503: 'V'
+504: '\'
+505: 'W'
+506: '\'
+507: 'X'
+508: '\'
+509: 'Z'
+510: '\'
+511: 'a'
+512: '\'
+513: 'b'
+514: '\'
+515: 'c'
+516: '\'
+517: 'd'
+518: '\'
+519: 'f'
+520: '\'
+521: 'g'
+522: '\'
+523: 'h'
+524: '\'
+525: 'k'
+526: '\'
+527: 'l'
+528: '\'
+529: 'n'
+530: '\'
+531: 'p'
+532: '\'
+533: 'r'
+534: '\'
+535: 's'
+536: '\'
+537: 't'
+538: '\'
+539: 'u'
+540: '\'
+541: 'v'
+542: '\'
+543: 'w'
+544: '\'
+545: 'x'
+546: '\'
+547: 'z'
+548: '\'
+549: '0'
+550: '\'
+551: '1'
+552: '\'
+553: '2'
+554: '\'
+555: '3'
+556: '\'
+557: '4'
+558: '\'
+559: '5'
+560: '\'
+561: '6'
+562: '\'
+563: '7'
+564: '\'
+565: '8'
+566: '\'
+567: '9'
 568: 'e'
-569: 'f'
-570: 'a'
-571: 'l'
-572: 's'
+569: 'E'
+570: 't'
+571: 'r'
+572: 'u'
 573: 'e'
-574: ' '
-575: '!'
-576: '#'
-577: '$'
-578: '%'
-579: '&'
-580: '''
-581: '\'
-582: '('
-583: ')'
-584: '*'
-585: '+'
-586: ','
-587: '-'
-588: '.'
-589: '/'
-590: ':'
-591: ';'
-592: '<'
-593: '='
-594: '>'
-595: '?'
-596: '@'
-597: '['
-598: ']'
-599: '^'
-600: '_'
-601: '`'
-602: '|'
-603: '~'
-604: '\'
-605: '{'
-606: '\'
-607: '}'
-608: ' '
-609: '\t'
-610: '\n'
-611: '\r'
-612: '#'
-613: '\n'
-614: 'a'-'z'
-615: 'A'-'Z'
-616: \u00a0-\u00ff
-617: \u0100-\U0010ffff
-618: '0'-'9'
-619: '0'-'9'
-620: 'a'-'f'
-621: 'A'-'F'
-622: '0'-'7'
-623: '0'-'1'
-624: 'A'-'Z'
-625: 'a'-'z'
-626: '0'-'9'
-627: \u00a0-\u00ff
-628: \u0100-\U0010ffff
+574: 'f'
+575: 'a'
+576: 'l'
+577: 's'
+578: 'e'
+579: ' '
+580: '!'
+581: '#'
+582: '$'
+583: '%'
+584: '&'
+585: '''
+586: '\'
+587: '('
+588: ')'
+589: '*'
+590: '+'
+591: ','
+592: '-'
+593: '.'
+594: '/'
+595: ':'
+596: ';'
+597: '<'
+598: '='
+599: '>'
+600: '?'
+601: '@'
+602: '['
+603: ']'
+604: '^'
+605: '_'
+606: '`'
+607: '|'
+608: '~'
+609: '\'
+610: '{'
+611: '\'
+612: '}'
+613: ' '
+614: '\t'
+615: '\n'
+616: '\r'
+617: '#'
+618: '\n'
+619: 'a'-'z'
+620: 'A'-'Z'
+621: \u00a0-\u00ff
+622: \u0100-\U0010ffff
+623: '0'-'9'
+624: '0'-'9'
+625: 'a'-'f'
+626: 'A'-'F'
+627: '0'-'7'
+628: '0'-'1'
 629: 'A'-'Z'
 630: 'a'-'z'
 631: '0'-'9'
-632: \u0100-\U0010ffff
-633: .
+632: \u00a0-\u00ff
+633: \u0100-\U0010ffff
+634: 'A'-'Z'
+635: 'a'-'z'
+636: '0'-'9'
+637: \u0100-\U0010ffff
+638: .
 */
diff --git a/internal/pkg/parsing/lexer/transitiontable.go b/internal/pkg/parsing/lexer/transitiontable.go
index ada7e9800..f7566d621 100644
--- a/internal/pkg/parsing/lexer/transitiontable.go
+++ b/internal/pkg/parsing/lexer/transitiontable.go
@@ -1616,10 +1616,12 @@ var TransTab = TransitionTable{
 	// S84
 	func(r rune) int {
 		switch {
-		case r == 45: // ['-','-']
+		case r == 43: // ['+','+']
 			return 169
-		case 48 <= r && r <= 57: // ['0','9']
+		case r == 45: // ['-','-']
 			return 170
+		case 48 <= r && r <= 57: // ['0','9']
+			return 171
 		}
 		return NoState
 	},
@@ -1627,7 +1629,7 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 49: // ['0','1']
-			return 171
+			return 172
 		}
 		return NoState
 	},
@@ -1635,7 +1637,7 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 55: // ['0','7']
-			return 172
+			return 173
 		}
 		return NoState
 	},
@@ -1643,11 +1645,11 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
-			return 173
+			return 174
 		case 65 <= r && r <= 70: // ['A','F']
-			return 173
+			return 174
 		case 97 <= r && r <= 102: // ['a','f']
-			return 173
+			return 174
 		}
 		return NoState
 	},
@@ -1655,7 +1657,7 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case r == 61: // ['=','=']
-			return 174
+			return 175
 		}
 		return NoState
 	},
@@ -1663,7 +1665,7 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case r == 62: // ['>','>']
-			return 175
+			return 176
 		}
 		return NoState
 	},
@@ -1689,9 +1691,9 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case r == 61: // ['=','=']
-			return 176
-		case r == 62: // ['>','>']
 			return 177
+		case r == 62: // ['>','>']
+			return 178
 		}
 		return NoState
 	},
@@ -1699,9 +1701,9 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case r == 61: // ['=','=']
-			return 178
-		case r == 63: // ['?','?']
 			return 179
+		case r == 63: // ['?','?']
+			return 180
 		}
 		return NoState
 	},
@@ -1715,17 +1717,17 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
-			return 180
+			return 181
 		case 65 <= r && r <= 90: // ['A','Z']
-			return 181
-		case r == 95: // ['_','_']
 			return 182
+		case r == 95: // ['_','_']
+			return 183
 		case 97 <= r && r <= 122: // ['a','z']
-			return 181
+			return 182
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
-			return 181
+			return 182
 		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 181
+			return 182
 		}
 		return NoState
 	},
@@ -1739,17 +1741,17 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
-			return 180
+			return 181
 		case 65 <= r && r <= 90: // ['A','Z']
-			return 181
-		case r == 95: // ['_','_']
 			return 182
+		case r == 95: // ['_','_']
+			return 183
 		case 97 <= r && r <= 122: // ['a','z']
-			return 181
+			return 182
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
-			return 181
+			return 182
 		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 181
+			return 182
 		}
 		return NoState
 	},
@@ -1757,73 +1759,73 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case r == 32: // [' ',' ']
-			return 183
-		case r == 33: // ['!','!']
-			return 183
-		case r == 35: // ['#','#']
-			return 183
-		case r == 36: // ['$','$']
-			return 183
-		case r == 37: // ['%','%']
-			return 183
-		case r == 38: // ['&','&']
-			return 183
-		case r == 39: // [''',''']
-			return 183
-		case r == 40: // ['(','(']
-			return 183
-		case r == 41: // [')',')']
-			return 183
-		case r == 42: // ['*','*']
-			return 183
-		case r == 43: // ['+','+']
-			return 183
-		case r == 44: // [',',',']
-			return 183
-		case r == 45: // ['-','-']
-			return 183
-		case r == 46: // ['.','.']
-			return 183
-		case r == 47: // ['/','/']
-			return 183
-		case 48 <= r && r <= 57: // ['0','9']
-			return 183
-		case r == 58: // [':',':']
-			return 183
-		case r == 59: // [';',';']
-			return 183
-		case r == 60: // ['<','<']
-			return 183
-		case r == 61: // ['=','=']
-			return 183
-		case r == 62: // ['>','>']
-			return 183
-		case r == 63: // ['?','?']
-			return 183
-		case r == 64: // ['@','@']
-			return 183
-		case 65 <= r && r <= 90: // ['A','Z']
-			return 183
-		case r == 91: // ['[','[']
-			return 183
-		case r == 92: // ['\','\']
 			return 184
+		case r == 33: // ['!','!']
+			return 184
+		case r == 35: // ['#','#']
+			return 184
+		case r == 36: // ['$','$']
+			return 184
+		case r == 37: // ['%','%']
+			return 184
+		case r == 38: // ['&','&']
+			return 184
+		case r == 39: // [''',''']
+			return 184
+		case r == 40: // ['(','(']
+			return 184
+		case r == 41: // [')',')']
+			return 184
+		case r == 42: // ['*','*']
+			return 184
+		case r == 43: // ['+','+']
+			return 184
+		case r == 44: // [',',',']
+			return 184
+		case r == 45: // ['-','-']
+			return 184
+		case r == 46: // ['.','.']
+			return 184
+		case r == 47: // ['/','/']
+			return 184
+		case 48 <= r && r <= 57: // ['0','9']
+			return 184
+		case r == 58: // [':',':']
+			return 184
+		case r == 59: // [';',';']
+			return 184
+		case r == 60: // ['<','<']
+			return 184
+		case r == 61: // ['=','=']
+			return 184
+		case r == 62: // ['>','>']
+			return 184
+		case r == 63: // ['?','?']
+			return 184
+		case r == 64: // ['@','@']
+			return 184
+		case 65 <= r && r <= 90: // ['A','Z']
+			return 184
+		case r == 91: // ['[','[']
+			return 184
+		case r == 92: // ['\','\']
+			return 185
 		case r == 93: // [']',']']
-			return 183
+			return 184
 		case r == 94: // ['^','^']
-			return 183
+			return 184
 		case r == 95: // ['_','_']
-			return 183
+			return 184
 		case r == 96: // ['`','`']
-			return 183
+			return 184
 		case 97 <= r && r <= 122: // ['a','z']
-			return 183
+			return 184
 		case r == 124: // ['|','|']
-			return 183
+			return 184
 		case r == 126: // ['~','~']
-			return 183
+			return 184
 		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 183
+			return 184
 		}
 		return NoState
 	},
@@ -1889,7 +1891,7 @@ var TransTab = TransitionTable{
 		case 65 <= r && r <= 85: // ['A','U']
 			return 101
 		case r == 86: // ['V','V']
-			return 185
+			return 186
 		case 87 <= r && r <= 90: // ['W','Z']
 			return 101
 		case r == 95: // ['_','_']
@@ -1911,7 +1913,7 @@ var TransTab = TransitionTable{
 		case 65 <= r && r <= 75: // ['A','K']
 			return 101
 		case r == 76: // ['L','L']
-			return 186
+			return 187
 		case 77 <= r && r <= 90: // ['M','Z']
 			return 101
 		case r == 95: // ['_','_']
@@ -1931,7 +1933,7 @@ var TransTab = TransitionTable{
 		case 48 <= r && r <= 57: // ['0','9']
 			return 100
 		case r == 65: // ['A','A']
-			return 187
+			return 188
 		case 66 <= r && r <= 90: // ['B','Z']
 			return 101
 		case r == 95: // ['_','_']
@@ -1953,7 +1955,7 @@ var TransTab = TransitionTable{
 		case 65 <= r && r <= 81: // ['A','Q']
 			return 101
 		case r == 82: // ['R','R']
-			return 188
+			return 189
 		case 83 <= r && r <= 90: // ['S','Z']
 			return 101
 		case r == 95: // ['_','_']
@@ -1975,7 +1977,7 @@ var TransTab = TransitionTable{
 		case 65 <= r && r <= 82: // ['A','R']
 			return 101
 		case r == 83: // ['S','S']
-			return 189
+			return 190
 		case 84 <= r && r <= 90: // ['T','Z']
 			return 101
 		case r == 95: // ['_','_']
@@ -1997,7 +1999,7 @@ var TransTab = TransitionTable{
 		case 65 <= r && r <= 82: // ['A','R']
 			return 101
 		case r == 83: // ['S','S']
-			return 190
+			return 191
 		case 84 <= r && r <= 90: // ['T','Z']
 			return 101
 		case r == 95: // ['_','_']
@@ -2019,7 +2021,7 @@ var TransTab = TransitionTable{
 		case 65 <= r && r <= 82: // ['A','R']
 			return 101
 		case r == 83: // ['S','S']
-			return 191
+			return 192
 		case 84 <= r && r <= 90: // ['T','Z']
 			return 101
 		case r == 95: // ['_','_']
@@ -2045,7 +2047,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 101: // ['a','e']
 			return 101
 		case r == 102: // ['f','f']
-			return 192
+			return 193
 		case 103 <= r && r <= 122: // ['g','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2063,11 +2065,11 @@ var TransTab = TransitionTable{
 		case 65 <= r && r <= 68: // ['A','D']
 			return 101
 		case r == 69: // ['E','E']
-			return 193
+			return 194
 		case 70 <= r && r <= 79: // ['F','O']
 			return 101
 		case r == 80: // ['P','P']
-			return 194
+			return 195
 		case 81 <= r && r <= 90: // ['Q','Z']
 			return 101
 		case r == 95: // ['_','_']
@@ -2125,7 +2127,7 @@ var TransTab = TransitionTable{
 		case 65 <= r && r <= 77: // ['A','M']
 			return 101
 		case r == 78: // ['N','N']
-			return 195
+			return 196
 		case 79 <= r && r <= 90: // ['O','Z']
 			return 101
 		case r == 95: // ['_','_']
@@ -2147,7 +2149,7 @@ var TransTab = TransitionTable{
 		case 65 <= r && r <= 82: // ['A','R']
 			return 101
 		case r == 83: // ['S','S']
-			return 196
+			return 197
 		case 84 <= r && r <= 90: // ['T','Z']
 			return 101
 		case r == 95: // ['_','_']
@@ -2169,7 +2171,7 @@ var TransTab = TransitionTable{
 		case 65 <= r && r <= 82: // ['A','R']
 			return 101
 		case r == 83: // ['S','S']
-			return 197
+			return 198
 		case 84 <= r && r <= 90: // ['T','Z']
 			return 101
 		case r == 95: // ['_','_']
@@ -2191,7 +2193,7 @@ var TransTab = TransitionTable{
 		case 65 <= r && r <= 82: // ['A','R']
 			return 101
 		case r == 83: // ['S','S']
-			return 198
+			return 199
 		case 84 <= r && r <= 90: // ['T','Z']
 			return 101
 		case r == 95: // ['_','_']
@@ -2209,7 +2211,7 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case r == 91: // ['[','[']
-			return 199
+			return 200
 		}
 		return NoState
 	},
@@ -2223,7 +2225,7 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case r == 61: // ['=','=']
-			return 200
+			return 201
 		}
 		return NoState
 	},
@@ -2239,7 +2241,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 107: // ['a','k']
 			return 101
 		case r == 108: // ['l','l']
-			return 201
+			return 202
 		case 109 <= r && r <= 122: // ['m','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2261,7 +2263,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 113: // ['a','q']
 			return 101
 		case r == 114: // ['r','r']
-			return 202
+			return 203
 		case 115 <= r && r <= 122: // ['s','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2283,7 +2285,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 102: // ['a','f']
 			return 101
 		case r == 103: // ['g','g']
-			return 203
+			return 204
 		case 104 <= r && r <= 122: // ['h','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2305,7 +2307,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 110: // ['a','n']
 			return 101
 		case r == 111: // ['o','o']
-			return 204
+			return 205
 		case 112 <= r && r <= 122: // ['p','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2327,7 +2329,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 100: // ['a','d']
 			return 101
 		case r == 101: // ['e','e']
-			return 205
+			return 206
 		case 102 <= r && r <= 122: // ['f','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2349,7 +2351,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 107: // ['a','k']
 			return 101
 		case r == 108: // ['l','l']
-			return 206
+			return 207
 		case 109 <= r && r <= 122: // ['m','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2371,7 +2373,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 109: // ['a','m']
 			return 101
 		case r == 110: // ['n','n']
-			return 207
+			return 208
 		case 111 <= r && r <= 122: // ['o','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2411,7 +2413,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 108: // ['a','l']
 			return 101
 		case r == 109: // ['m','m']
-			return 208
+			return 209
 		case 110 <= r && r <= 122: // ['n','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2433,7 +2435,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 116: // ['a','t']
 			return 101
 		case r == 117: // ['u','u']
-			return 209
+			return 210
 		case 118 <= r && r <= 122: // ['v','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2455,11 +2457,11 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 104: // ['a','h']
 			return 101
 		case r == 105: // ['i','i']
-			return 210
+			return 211
 		case 106 <= r && r <= 114: // ['j','r']
 			return 101
 		case r == 115: // ['s','s']
-			return 211
+			return 212
 		case 116 <= r && r <= 122: // ['t','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2481,7 +2483,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 104: // ['a','h']
 			return 101
 		case r == 105: // ['i','i']
-			return 212
+			return 213
 		case 106 <= r && r <= 122: // ['j','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2503,7 +2505,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 99: // ['a','c']
 			return 101
 		case r == 100: // ['d','d']
-			return 213
+			return 214
 		case 101 <= r && r <= 122: // ['e','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2525,7 +2527,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 113: // ['a','q']
 			return 101
 		case r == 114: // ['r','r']
-			return 214
+			return 215
 		case 115 <= r && r <= 122: // ['s','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2547,7 +2549,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 107: // ['a','k']
 			return 101
 		case r == 108: // ['l','l']
-			return 215
+			return 216
 		case 109 <= r && r <= 122: // ['m','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2569,7 +2571,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 107: // ['a','k']
 			return 101
 		case r == 108: // ['l','l']
-			return 216
+			return 217
 		case 109 <= r && r <= 122: // ['m','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2591,7 +2593,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 110: // ['a','n']
 			return 101
 		case r == 111: // ['o','o']
-			return 217
+			return 218
 		case 112 <= r && r <= 122: // ['p','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2613,7 +2615,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 113: // ['a','q']
 			return 101
 		case r == 114: // ['r','r']
-			return 218
+			return 219
 		case 115 <= r && r <= 122: // ['s','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2635,7 +2637,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 109: // ['a','m']
 			return 101
 		case r == 110: // ['n','n']
-			return 219
+			return 220
 		case 111 <= r && r <= 122: // ['o','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2675,7 +2677,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 115: // ['a','s']
 			return 101
 		case r == 116: // ['t','t']
-			return 220
+			return 221
 		case 117 <= r && r <= 122: // ['u','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2697,7 +2699,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 111: // ['a','o']
 			return 101
 		case r == 112: // ['p','p']
-			return 221
+			return 222
 		case 113 <= r && r <= 122: // ['q','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2719,9 +2721,9 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 107: // ['a','k']
 			return 101
 		case r == 108: // ['l','l']
-			return 222
-		case r == 109: // ['m','m']
 			return 223
+		case r == 109: // ['m','m']
+			return 224
 		case 110 <= r && r <= 122: // ['n','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2743,7 +2745,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 104: // ['a','h']
 			return 101
 		case r == 105: // ['i','i']
-			return 224
+			return 225
 		case 106 <= r && r <= 122: // ['j','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2765,7 +2767,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 115: // ['a','s']
 			return 101
 		case r == 116: // ['t','t']
-			return 225
+			return 226
 		case 117 <= r && r <= 122: // ['u','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2787,11 +2789,11 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 99: // ['a','c']
 			return 101
 		case r == 100: // ['d','d']
-			return 226
+			return 227
 		case 101 <= r && r <= 113: // ['e','q']
 			return 101
 		case r == 114: // ['r','r']
-			return 227
+			return 228
 		case 115 <= r && r <= 122: // ['s','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2813,7 +2815,7 @@ var TransTab = TransitionTable{
 		case r == 97: // ['a','a']
 			return 101
 		case r == 98: // ['b','b']
-			return 228
+			return 229
 		case 99 <= r && r <= 122: // ['c','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2835,7 +2837,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 100: // ['a','d']
 			return 101
 		case r == 101: // ['e','e']
-			return 229
+			return 230
 		case 102 <= r && r <= 122: // ['f','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2857,7 +2859,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 116: // ['a','t']
 			return 101
 		case r == 117: // ['u','u']
-			return 230
+			return 231
 		case 118 <= r && r <= 122: // ['v','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2879,7 +2881,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 114: // ['a','r']
 			return 101
 		case r == 115: // ['s','s']
-			return 231
+			return 232
 		case 116 <= r && r <= 122: // ['t','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2901,7 +2903,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 113: // ['a','q']
 			return 101
 		case r == 114: // ['r','r']
-			return 232
+			return 233
 		case 115 <= r && r <= 122: // ['s','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2923,7 +2925,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 104: // ['a','h']
 			return 101
 		case r == 105: // ['i','i']
-			return 233
+			return 234
 		case 106 <= r && r <= 122: // ['j','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -2943,7 +2945,7 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case r == 61: // ['=','=']
-			return 234
+			return 235
 		}
 		return NoState
 	},
@@ -3027,7 +3029,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 104: // ['a','h']
 			return 57
 		case r == 105: // ['i','i']
-			return 235
+			return 236
 		case 106 <= r && r <= 122: // ['j','z']
 			return 57
 		case r == 123: // ['{','{']
@@ -3049,7 +3051,7 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case r == 91: // ['[','[']
-			return 236
+			return 237
 		}
 		return NoState
 	},
@@ -3107,7 +3109,7 @@ var TransTab = TransitionTable{
 		case r == 91: // ['[','[']
 			return 159
 		case r == 92: // ['\','\']
-			return 237
+			return 238
 		case r == 93: // [']',']']
 			return 159
 		case r == 94: // ['^','^']
@@ -3121,7 +3123,7 @@ var TransTab = TransitionTable{
 		case r == 124: // ['|','|']
 			return 159
 		case r == 125: // ['}','}']
-			return 238
+			return 239
 		case r == 126: // ['~','~']
 			return 159
 		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
@@ -3135,7 +3137,7 @@ var TransTab = TransitionTable{
 		case r == 123: // ['{','{']
 			return 159
 		case r == 125: // ['}','}']
-			return 239
+			return 240
 		}
 		return NoState
 	},
@@ -3143,7 +3145,7 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case r == 112: // ['p','p']
-			return 240
+			return 241
 		}
 		return NoState
 	},
@@ -3168,10 +3170,12 @@ var TransTab = TransitionTable{
 	// S165
 	func(r rune) int {
 		switch {
-		case r == 45: // ['-','-']
-			return 241
-		case 48 <= r && r <= 57: // ['0','9']
+		case r == 43: // ['+','+']
 			return 242
+		case r == 45: // ['-','-']
+			return 243
+		case 48 <= r && r <= 57: // ['0','9']
+			return 244
 		}
 		return NoState
 	},
@@ -3187,19 +3191,21 @@ var TransTab = TransitionTable{
 		case 48 <= r && r <= 57: // ['0','9']
 			return 167
 		case r == 69: // ['E','E']
-			return 243
+			return 245
 		case r == 101: // ['e','e']
-			return 243
+			return 245
 		}
 		return NoState
 	},
 	// S168
 	func(r rune) int {
 		switch {
+		case r == 43: // ['+','+']
+			return 246
 		case r == 45: // ['-','-']
-			return 244
+			return 247
 		case 48 <= r && r <= 57: // ['0','9']
-			return 245
+			return 248
 		}
 		return NoState
 	},
@@ -3207,7 +3213,7 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
-			return 246
+			return 249
 		}
 		return NoState
 	},
@@ -3215,14 +3221,14 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
-			return 170
+			return 250
 		}
 		return NoState
 	},
 	// S171
 	func(r rune) int {
 		switch {
-		case 48 <= r && r <= 49: // ['0','1']
+		case 48 <= r && r <= 57: // ['0','9']
 			return 171
 		}
 		return NoState
@@ -3230,7 +3236,7 @@ var TransTab = TransitionTable{
 	// S172
 	func(r rune) int {
 		switch {
-		case 48 <= r && r <= 55: // ['0','7']
+		case 48 <= r && r <= 49: // ['0','1']
 			return 172
 		}
 		return NoState
@@ -3238,11 +3244,7 @@ var TransTab = TransitionTable{
 	// S173
 	func(r rune) int {
 		switch {
-		case 48 <= r && r <= 57: // ['0','9']
-			return 173
-		case 65 <= r && r <= 70: // ['A','F']
-			return 173
-		case 97 <= r && r <= 102: // ['a','f']
+		case 48 <= r && r <= 55: // ['0','7']
 			return 173
 		}
 		return NoState
@@ -3250,6 +3252,12 @@ var TransTab = TransitionTable{
 	// S174
 	func(r rune) int {
 		switch {
+		case 48 <= r && r <= 57: // ['0','9']
+			return 174
+		case 65 <= r && r <= 70: // ['A','F']
+			return 174
+		case 97 <= r && r <= 102: // ['a','f']
+			return 174
 		}
 		return NoState
 	},
@@ -3268,40 +3276,28 @@ var TransTab = TransitionTable{
 	// S177
 	func(r rune) int {
 		switch {
-		case r == 61: // ['=','=']
-			return 247
 		}
 		return NoState
 	},
 	// S178
 	func(r rune) int {
 		switch {
+		case r == 61: // ['=','=']
+			return 251
 		}
 		return NoState
 	},
 	// S179
 	func(r rune) int {
 		switch {
-		case r == 61: // ['=','=']
-			return 248
 		}
 		return NoState
 	},
 	// S180
 	func(r rune) int {
 		switch {
-		case 48 <= r && r <= 57: // ['0','9']
-			return 180
-		case 65 <= r && r <= 90: // ['A','Z']
-			return 181
-		case r == 95: // ['_','_']
-			return 182
-		case 97 <= r && r <= 122: // ['a','z']
-			return 181
-		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
-			return 181
-		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 181
+		case r == 61: // ['=','=']
+			return 252
 		}
 		return NoState
 	},
@@ -3309,17 +3305,17 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
-			return 180
+			return 181
 		case 65 <= r && r <= 90: // ['A','Z']
-			return 181
-		case r == 95: // ['_','_']
 			return 182
+		case r == 95: // ['_','_']
+			return 183
 		case 97 <= r && r <= 122: // ['a','z']
-			return 181
+			return 182
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
-			return 181
+			return 182
 		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 181
+			return 182
 		}
 		return NoState
 	},
@@ -3327,121 +3323,121 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
-			return 180
+			return 181
 		case 65 <= r && r <= 90: // ['A','Z']
-			return 181
-		case r == 95: // ['_','_']
 			return 182
+		case r == 95: // ['_','_']
+			return 183
 		case 97 <= r && r <= 122: // ['a','z']
-			return 181
+			return 182
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
-			return 181
+			return 182
 		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 181
+			return 182
 		}
 		return NoState
 	},
 	// S183
 	func(r rune) int {
 		switch {
-		case r == 32: // [' ',' ']
-			return 183
-		case r == 33: // ['!','!']
-			return 183
-		case r == 35: // ['#','#']
-			return 183
-		case r == 36: // ['$','$']
-			return 183
-		case r == 37: // ['%','%']
-			return 183
-		case r == 38: // ['&','&']
-			return 183
-		case r == 39: // [''',''']
-			return 183
-		case r == 40: // ['(','(']
-			return 183
-		case r == 41: // [')',')']
-			return 183
-		case r == 42: // ['*','*']
-			return 183
-		case r == 43: // ['+','+']
-			return 183
-		case r == 44: // [',',',']
-			return 183
-		case r == 45: // ['-','-']
-			return 183
-		case r == 46: // ['.','.']
-			return 183
-		case r == 47: // ['/','/']
-			return 183
 		case 48 <= r && r <= 57: // ['0','9']
-			return 183
-		case r == 58: // [':',':']
-			return 183
-		case r == 59: // [';',';']
-			return 183
-		case r == 60: // ['<','<']
-			return 183
-		case r == 61: // ['=','=']
-			return 183
-		case r == 62: // ['>','>']
-			return 183
-		case r == 63: // ['?','?']
-			return 183
-		case r == 64: // ['@','@']
-			return 183
+			return 181
 		case 65 <= r && r <= 90: // ['A','Z']
-			return 183
-		case r == 91: // ['[','[']
-			return 183
-		case r == 92: // ['\','\']
-			return 249
-		case r == 93: // [']',']']
-			return 183
-		case r == 94: // ['^','^']
-			return 183
+			return 182
 		case r == 95: // ['_','_']
 			return 183
-		case r == 96: // ['`','`']
-			return 183
 		case 97 <= r && r <= 122: // ['a','z']
-			return 183
-		case r == 124: // ['|','|']
-			return 183
-		case r == 125: // ['}','}']
-			return 250
-		case r == 126: // ['~','~']
-			return 183
+			return 182
+		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
+			return 182
 		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 183
+			return 182
 		}
 		return NoState
 	},
 	// S184
 	func(r rune) int {
 		switch {
-		case r == 123: // ['{','{']
-			return 183
+		case r == 32: // [' ',' ']
+			return 184
+		case r == 33: // ['!','!']
+			return 184
+		case r == 35: // ['#','#']
+			return 184
+		case r == 36: // ['$','$']
+			return 184
+		case r == 37: // ['%','%']
+			return 184
+		case r == 38: // ['&','&']
+			return 184
+		case r == 39: // [''',''']
+			return 184
+		case r == 40: // ['(','(']
+			return 184
+		case r == 41: // [')',')']
+			return 184
+		case r == 42: // ['*','*']
+			return 184
+		case r == 43: // ['+','+']
+			return 184
+		case r == 44: // [',',',']
+			return 184
+		case r == 45: // ['-','-']
+			return 184
+		case r == 46: // ['.','.']
+			return 184
+		case r == 47: // ['/','/']
+			return 184
+		case 48 <= r && r <= 57: // ['0','9']
+			return 184
+		case r == 58: // [':',':']
+			return 184
+		case r == 59: // [';',';']
+			return 184
+		case r == 60: // ['<','<']
+			return 184
+		case r == 61: // ['=','=']
+			return 184
+		case r == 62: // ['>','>']
+			return 184
+		case r == 63: // ['?','?']
+			return 184
+		case r == 64: // ['@','@']
+			return 184
+		case 65 <= r && r <= 90: // ['A','Z']
+			return 184
+		case r == 91: // ['[','[']
+			return 184
+		case r == 92: // ['\','\']
+			return 253
+		case r == 93: // [']',']']
+			return 184
+		case r == 94: // ['^','^']
+			return 184
+		case r == 95: // ['_','_']
+			return 184
+		case r == 96: // ['`','`']
+			return 184
+		case 97 <= r && r <= 122: // ['a','z']
+			return 184
+		case r == 124: // ['|','|']
+			return 184
 		case r == 125: // ['}','}']
-			return 251
+			return 254
+		case r == 126: // ['~','~']
+			return 184
+		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
+			return 184
 		}
 		return NoState
 	},
 	// S185
 	func(r rune) int {
 		switch {
-		case 48 <= r && r <= 57: // ['0','9']
-			return 100
-		case 65 <= r && r <= 90: // ['A','Z']
-			return 101
-		case r == 95: // ['_','_']
-			return 102
-		case 97 <= r && r <= 122: // ['a','z']
-			return 101
-		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
-			return 101
-		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 101
+		case r == 123: // ['{','{']
+			return 184
+		case r == 125: // ['}','}']
+			return 255
 		}
 		return NoState
 	},
@@ -3450,11 +3446,7 @@ var TransTab = TransitionTable{
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
 			return 100
-		case 65 <= r && r <= 68: // ['A','D']
-			return 101
-		case r == 69: // ['E','E']
-			return 252
-		case 70 <= r && r <= 90: // ['F','Z']
+		case 65 <= r && r <= 90: // ['A','Z']
 			return 101
 		case r == 95: // ['_','_']
 			return 102
@@ -3472,11 +3464,11 @@ var TransTab = TransitionTable{
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
 			return 100
-		case 65 <= r && r <= 83: // ['A','S']
+		case 65 <= r && r <= 68: // ['A','D']
 			return 101
-		case r == 84: // ['T','T']
-			return 253
-		case 85 <= r && r <= 90: // ['U','Z']
+		case r == 69: // ['E','E']
+			return 256
+		case 70 <= r && r <= 90: // ['F','Z']
 			return 101
 		case r == 95: // ['_','_']
 			return 102
@@ -3494,7 +3486,11 @@ var TransTab = TransitionTable{
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
 			return 100
-		case 65 <= r && r <= 90: // ['A','Z']
+		case 65 <= r && r <= 83: // ['A','S']
+			return 101
+		case r == 84: // ['T','T']
+			return 257
+		case 85 <= r && r <= 90: // ['U','Z']
 			return 101
 		case r == 95: // ['_','_']
 			return 102
@@ -3602,11 +3598,7 @@ var TransTab = TransitionTable{
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
 			return 100
-		case 65 <= r && r <= 72: // ['A','H']
-			return 101
-		case r == 73: // ['I','I']
-			return 254
-		case 74 <= r && r <= 90: // ['J','Z']
+		case 65 <= r && r <= 90: // ['A','Z']
 			return 101
 		case r == 95: // ['_','_']
 			return 102
@@ -3624,7 +3616,11 @@ var TransTab = TransitionTable{
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
 			return 100
-		case 65 <= r && r <= 90: // ['A','Z']
+		case 65 <= r && r <= 72: // ['A','H']
+			return 101
+		case r == 73: // ['I','I']
+			return 258
+		case 74 <= r && r <= 90: // ['J','Z']
 			return 101
 		case r == 95: // ['_','_']
 			return 102
@@ -3692,18 +3688,6 @@ var TransTab = TransitionTable{
 		return NoState
 	},
 	// S199
-	func(r rune) int {
-		switch {
-		}
-		return NoState
-	},
-	// S200
-	func(r rune) int {
-		switch {
-		}
-		return NoState
-	},
-	// S201
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
@@ -3721,6 +3705,18 @@ var TransTab = TransitionTable{
 		}
 		return NoState
 	},
+	// S200
+	func(r rune) int {
+		switch {
+		}
+		return NoState
+	},
+	// S201
+	func(r rune) int {
+		switch {
+		}
+		return NoState
+	},
 	// S202
 	func(r rune) int {
 		switch {
@@ -3748,11 +3744,7 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 104: // ['a','h']
-			return 101
-		case r == 105: // ['i','i']
-			return 255
-		case 106 <= r && r <= 122: // ['j','z']
+		case 97 <= r && r <= 122: // ['a','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -3770,11 +3762,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 107: // ['a','k']
+		case 97 <= r && r <= 104: // ['a','h']
 			return 101
-		case r == 108: // ['l','l']
-			return 256
-		case 109 <= r && r <= 122: // ['m','z']
+		case r == 105: // ['i','i']
+			return 259
+		case 106 <= r && r <= 122: // ['j','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -3792,9 +3784,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case r == 97: // ['a','a']
-			return 257
-		case 98 <= r && r <= 122: // ['b','z']
+		case 97 <= r && r <= 107: // ['a','k']
+			return 101
+		case r == 108: // ['l','l']
+			return 260
+		case 109 <= r && r <= 122: // ['m','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -3812,11 +3806,9 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 107: // ['a','k']
-			return 101
-		case r == 108: // ['l','l']
-			return 258
-		case 109 <= r && r <= 122: // ['m','z']
+		case r == 97: // ['a','a']
+			return 261
+		case 98 <= r && r <= 122: // ['b','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -3834,11 +3826,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 115: // ['a','s']
+		case 97 <= r && r <= 107: // ['a','k']
 			return 101
-		case r == 116: // ['t','t']
-			return 259
-		case 117 <= r && r <= 122: // ['u','z']
+		case r == 108: // ['l','l']
+			return 262
+		case 109 <= r && r <= 122: // ['m','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -3856,11 +3848,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 111: // ['a','o']
+		case 97 <= r && r <= 115: // ['a','s']
 			return 101
-		case r == 112: // ['p','p']
-			return 260
-		case 113 <= r && r <= 122: // ['q','z']
+		case r == 116: // ['t','t']
+			return 263
+		case 117 <= r && r <= 122: // ['u','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -3878,11 +3870,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 108: // ['a','l']
+		case 97 <= r && r <= 111: // ['a','o']
 			return 101
-		case r == 109: // ['m','m']
-			return 261
-		case 110 <= r && r <= 122: // ['n','z']
+		case r == 112: // ['p','p']
+			return 264
+		case 113 <= r && r <= 122: // ['q','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -3900,11 +3892,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 101: // ['a','e']
+		case 97 <= r && r <= 108: // ['a','l']
 			return 101
-		case r == 102: // ['f','f']
-			return 262
-		case 103 <= r && r <= 122: // ['g','z']
+		case r == 109: // ['m','m']
+			return 265
+		case 110 <= r && r <= 122: // ['n','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -3922,11 +3914,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 100: // ['a','d']
+		case 97 <= r && r <= 101: // ['a','e']
 			return 101
-		case r == 101: // ['e','e']
-			return 263
-		case 102 <= r && r <= 122: // ['f','z']
+		case r == 102: // ['f','f']
+			return 266
+		case 103 <= r && r <= 122: // ['g','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -3944,11 +3936,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 115: // ['a','s']
+		case 97 <= r && r <= 100: // ['a','d']
 			return 101
-		case r == 116: // ['t','t']
-			return 264
-		case 117 <= r && r <= 122: // ['u','z']
+		case r == 101: // ['e','e']
+			return 267
+		case 102 <= r && r <= 122: // ['f','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -3966,7 +3958,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 122: // ['a','z']
+		case 97 <= r && r <= 115: // ['a','s']
+			return 101
+		case r == 116: // ['t','t']
+			return 268
+		case 117 <= r && r <= 122: // ['u','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -3984,11 +3980,7 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 104: // ['a','h']
-			return 101
-		case r == 105: // ['i','i']
-			return 265
-		case 106 <= r && r <= 122: // ['j','z']
+		case 97 <= r && r <= 122: // ['a','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -4006,11 +3998,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 114: // ['a','r']
+		case 97 <= r && r <= 104: // ['a','h']
 			return 101
-		case r == 115: // ['s','s']
-			return 266
-		case 116 <= r && r <= 122: // ['t','z']
+		case r == 105: // ['i','i']
+			return 269
+		case 106 <= r && r <= 122: // ['j','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -4028,11 +4020,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 115: // ['a','s']
+		case 97 <= r && r <= 114: // ['a','r']
 			return 101
-		case r == 116: // ['t','t']
-			return 267
-		case 117 <= r && r <= 122: // ['u','z']
+		case r == 115: // ['s','s']
+			return 270
+		case 116 <= r && r <= 122: // ['t','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -4050,9 +4042,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case r == 97: // ['a','a']
-			return 268
-		case 98 <= r && r <= 122: // ['b','z']
+		case 97 <= r && r <= 115: // ['a','s']
+			return 101
+		case r == 116: // ['t','t']
+			return 271
+		case 117 <= r && r <= 122: // ['u','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -4070,7 +4064,9 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 122: // ['a','z']
+		case r == 97: // ['a','a']
+			return 272
+		case 98 <= r && r <= 122: // ['b','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -4088,11 +4084,7 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 98: // ['a','b']
-			return 101
-		case r == 99: // ['c','c']
-			return 269
-		case 100 <= r && r <= 122: // ['d','z']
+		case 97 <= r && r <= 122: // ['a','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -4110,7 +4102,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 122: // ['a','z']
+		case 97 <= r && r <= 98: // ['a','b']
+			return 101
+		case r == 99: // ['c','c']
+			return 273
+		case 100 <= r && r <= 122: // ['d','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -4146,11 +4142,7 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 107: // ['a','k']
-			return 101
-		case r == 108: // ['l','l']
-			return 270
-		case 109 <= r && r <= 122: // ['m','z']
+		case 97 <= r && r <= 122: // ['a','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -4168,7 +4160,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 122: // ['a','z']
+		case 97 <= r && r <= 107: // ['a','k']
+			return 101
+		case r == 108: // ['l','l']
+			return 274
+		case 109 <= r && r <= 122: // ['m','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -4186,11 +4182,7 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 109: // ['a','m']
-			return 101
-		case r == 110: // ['n','n']
-			return 271
-		case 111 <= r && r <= 122: // ['o','z']
+		case 97 <= r && r <= 122: // ['a','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -4208,11 +4200,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 116: // ['a','t']
+		case 97 <= r && r <= 109: // ['a','m']
 			return 101
-		case r == 117: // ['u','u']
-			return 272
-		case 118 <= r && r <= 122: // ['v','z']
+		case r == 110: // ['n','n']
+			return 275
+		case 111 <= r && r <= 122: // ['o','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -4230,15 +4222,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 100: // ['a','d']
+		case 97 <= r && r <= 116: // ['a','t']
 			return 101
-		case r == 101: // ['e','e']
-			return 273
-		case 102 <= r && r <= 110: // ['f','n']
-			return 101
-		case r == 111: // ['o','o']
-			return 274
-		case 112 <= r && r <= 122: // ['p','z']
+		case r == 117: // ['u','u']
+			return 276
+		case 118 <= r && r <= 122: // ['v','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -4256,7 +4244,15 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 122: // ['a','z']
+		case 97 <= r && r <= 100: // ['a','d']
+			return 101
+		case r == 101: // ['e','e']
+			return 277
+		case 102 <= r && r <= 110: // ['f','n']
+			return 101
+		case r == 111: // ['o','o']
+			return 278
+		case 112 <= r && r <= 122: // ['p','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -4274,11 +4270,7 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 113: // ['a','q']
-			return 101
-		case r == 114: // ['r','r']
-			return 275
-		case 115 <= r && r <= 122: // ['s','z']
+		case 97 <= r && r <= 122: // ['a','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -4296,7 +4288,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 122: // ['a','z']
+		case 97 <= r && r <= 113: // ['a','q']
+			return 101
+		case r == 114: // ['r','r']
+			return 279
+		case 115 <= r && r <= 122: // ['s','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -4314,11 +4310,7 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 100: // ['a','d']
-			return 101
-		case r == 101: // ['e','e']
-			return 276
-		case 102 <= r && r <= 122: // ['f','z']
+		case 97 <= r && r <= 122: // ['a','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -4339,7 +4331,7 @@ var TransTab = TransitionTable{
 		case 97 <= r && r <= 100: // ['a','d']
 			return 101
 		case r == 101: // ['e','e']
-			return 277
+			return 280
 		case 102 <= r && r <= 122: // ['f','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
@@ -4358,7 +4350,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 122: // ['a','z']
+		case 97 <= r && r <= 100: // ['a','d']
+			return 101
+		case r == 101: // ['e','e']
+			return 281
+		case 102 <= r && r <= 122: // ['f','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -4376,11 +4372,7 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 107: // ['a','k']
-			return 101
-		case r == 108: // ['l','l']
-			return 278
-		case 109 <= r && r <= 122: // ['m','z']
+		case 97 <= r && r <= 122: // ['a','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -4392,10 +4384,32 @@ var TransTab = TransitionTable{
 	// S234
 	func(r rune) int {
 		switch {
+		case 48 <= r && r <= 57: // ['0','9']
+			return 100
+		case 65 <= r && r <= 90: // ['A','Z']
+			return 101
+		case r == 95: // ['_','_']
+			return 102
+		case 97 <= r && r <= 107: // ['a','k']
+			return 101
+		case r == 108: // ['l','l']
+			return 282
+		case 109 <= r && r <= 122: // ['m','z']
+			return 101
+		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
+			return 101
+		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
+			return 101
 		}
 		return NoState
 	},
 	// S235
+	func(r rune) int {
+		switch {
+		}
+		return NoState
+	},
+	// S236
 	func(r rune) int {
 		switch {
 		case r == 32: // [' ',' ']
@@ -4477,29 +4491,29 @@ var TransTab = TransitionTable{
 		}
 		return NoState
 	},
-	// S236
-	func(r rune) int {
-		switch {
-		}
-		return NoState
-	},
 	// S237
 	func(r rune) int {
 		switch {
-		case r == 123: // ['{','{']
-			return 159
-		case r == 125: // ['}','}']
-			return 239
 		}
 		return NoState
 	},
 	// S238
 	func(r rune) int {
 		switch {
+		case r == 123: // ['{','{']
+			return 159
+		case r == 125: // ['}','}']
+			return 240
 		}
 		return NoState
 	},
 	// S239
+	func(r rune) int {
+		switch {
+		}
+		return NoState
+	},
+	// S240
 	func(r rune) int {
 		switch {
 		case r == 32: // [' ',' ']
@@ -4553,7 +4567,7 @@ var TransTab = TransitionTable{
 		case r == 91: // ['[','[']
 			return 159
 		case r == 92: // ['\','\']
-			return 237
+			return 238
 		case r == 93: // [']',']']
 			return 159
 		case r == 94: // ['^','^']
@@ -4567,7 +4581,7 @@ var TransTab = TransitionTable{
 		case r == 124: // ['|','|']
 			return 159
 		case r == 125: // ['}','}']
-			return 238
+			return 239
 		case r == 126: // ['~','~']
 			return 159
 		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
@@ -4575,19 +4589,11 @@ var TransTab = TransitionTable{
 		}
 		return NoState
 	},
-	// S240
-	func(r rune) int {
-		switch {
-		case r == 97: // ['a','a']
-			return 279
-		}
-		return NoState
-	},
 	// S241
 	func(r rune) int {
 		switch {
-		case 48 <= r && r <= 57: // ['0','9']
-			return 280
+		case r == 97: // ['a','a']
+			return 283
 		}
 		return NoState
 	},
@@ -4595,17 +4601,15 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
-			return 242
+			return 284
 		}
 		return NoState
 	},
 	// S243
 	func(r rune) int {
 		switch {
-		case r == 45: // ['-','-']
-			return 281
 		case 48 <= r && r <= 57: // ['0','9']
-			return 282
+			return 285
 		}
 		return NoState
 	},
@@ -4613,15 +4617,19 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
-			return 283
+			return 244
 		}
 		return NoState
 	},
 	// S245
 	func(r rune) int {
 		switch {
+		case r == 43: // ['+','+']
+			return 286
+		case r == 45: // ['-','-']
+			return 287
 		case 48 <= r && r <= 57: // ['0','9']
-			return 245
+			return 288
 		}
 		return NoState
 	},
@@ -4629,195 +4637,143 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
-			return 246
+			return 289
 		}
 		return NoState
 	},
 	// S247
 	func(r rune) int {
 		switch {
+		case 48 <= r && r <= 57: // ['0','9']
+			return 290
 		}
 		return NoState
 	},
 	// S248
 	func(r rune) int {
 		switch {
+		case 48 <= r && r <= 57: // ['0','9']
+			return 248
 		}
 		return NoState
 	},
 	// S249
 	func(r rune) int {
 		switch {
-		case r == 123: // ['{','{']
-			return 183
-		case r == 125: // ['}','}']
-			return 251
+		case 48 <= r && r <= 57: // ['0','9']
+			return 249
 		}
 		return NoState
 	},
 	// S250
 	func(r rune) int {
 		switch {
+		case 48 <= r && r <= 57: // ['0','9']
+			return 250
 		}
 		return NoState
 	},
 	// S251
 	func(r rune) int {
 		switch {
-		case r == 32: // [' ',' ']
-			return 183
-		case r == 33: // ['!','!']
-			return 183
-		case r == 35: // ['#','#']
-			return 183
-		case r == 36: // ['$','$']
-			return 183
-		case r == 37: // ['%','%']
-			return 183
-		case r == 38: // ['&','&']
-			return 183
-		case r == 39: // [''',''']
-			return 183
-		case r == 40: // ['(','(']
-			return 183
-		case r == 41: // [')',')']
-			return 183
-		case r == 42: // ['*','*']
-			return 183
-		case r == 43: // ['+','+']
-			return 183
-		case r == 44: // [',',',']
-			return 183
-		case r == 45: // ['-','-']
-			return 183
-		case r == 46: // ['.','.']
-			return 183
-		case r == 47: // ['/','/']
-			return 183
-		case 48 <= r && r <= 57: // ['0','9']
-			return 183
-		case r == 58: // [':',':']
-			return 183
-		case r == 59: // [';',';']
-			return 183
-		case r == 60: // ['<','<']
-			return 183
-		case r == 61: // ['=','=']
-			return 183
-		case r == 62: // ['>','>']
-			return 183
-		case r == 63: // ['?','?']
-			return 183
-		case r == 64: // ['@','@']
-			return 183
-		case 65 <= r && r <= 90: // ['A','Z']
-			return 183
-		case r == 91: // ['[','[']
-			return 183
-		case r == 92: // ['\','\']
-			return 249
-		case r == 93: // [']',']']
-			return 183
-		case r == 94: // ['^','^']
-			return 183
-		case r == 95: // ['_','_']
-			return 183
-		case r == 96: // ['`','`']
-			return 183
-		case 97 <= r && r <= 122: // ['a','z']
-			return 183
-		case r == 124: // ['|','|']
-			return 183
-		case r == 125: // ['}','}']
-			return 250
-		case r == 126: // ['~','~']
-			return 183
-		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 183
 		}
 		return NoState
 	},
 	// S252
 	func(r rune) int {
 		switch {
-		case 48 <= r && r <= 57: // ['0','9']
-			return 100
-		case 65 <= r && r <= 77: // ['A','M']
-			return 101
-		case r == 78: // ['N','N']
-			return 284
-		case 79 <= r && r <= 90: // ['O','Z']
-			return 101
-		case r == 95: // ['_','_']
-			return 102
-		case 97 <= r && r <= 122: // ['a','z']
-			return 101
-		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
-			return 101
-		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 101
 		}
 		return NoState
 	},
 	// S253
 	func(r rune) int {
 		switch {
-		case 48 <= r && r <= 57: // ['0','9']
-			return 100
-		case 65 <= r && r <= 82: // ['A','R']
-			return 101
-		case r == 83: // ['S','S']
-			return 285
-		case 84 <= r && r <= 90: // ['T','Z']
-			return 101
-		case r == 95: // ['_','_']
-			return 102
-		case 97 <= r && r <= 122: // ['a','z']
-			return 101
-		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
-			return 101
-		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 101
+		case r == 123: // ['{','{']
+			return 184
+		case r == 125: // ['}','}']
+			return 255
 		}
 		return NoState
 	},
 	// S254
 	func(r rune) int {
 		switch {
-		case 48 <= r && r <= 57: // ['0','9']
-			return 100
-		case 65 <= r && r <= 90: // ['A','Z']
-			return 101
-		case r == 95: // ['_','_']
-			return 102
-		case 97 <= r && r <= 122: // ['a','z']
-			return 101
-		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
-			return 101
-		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 101
 		}
 		return NoState
 	},
 	// S255
 	func(r rune) int {
 		switch {
+		case r == 32: // [' ',' ']
+			return 184
+		case r == 33: // ['!','!']
+			return 184
+		case r == 35: // ['#','#']
+			return 184
+		case r == 36: // ['$','$']
+			return 184
+		case r == 37: // ['%','%']
+			return 184
+		case r == 38: // ['&','&']
+			return 184
+		case r == 39: // [''',''']
+			return 184
+		case r == 40: // ['(','(']
+			return 184
+		case r == 41: // [')',')']
+			return 184
+		case r == 42: // ['*','*']
+			return 184
+		case r == 43: // ['+','+']
+			return 184
+		case r == 44: // [',',',']
+			return 184
+		case r == 45: // ['-','-']
+			return 184
+		case r == 46: // ['.','.']
+			return 184
+		case r == 47: // ['/','/']
+			return 184
 		case 48 <= r && r <= 57: // ['0','9']
-			return 100
+			return 184
+		case r == 58: // [':',':']
+			return 184
+		case r == 59: // [';',';']
+			return 184
+		case r == 60: // ['<','<']
+			return 184
+		case r == 61: // ['=','=']
+			return 184
+		case r == 62: // ['>','>']
+			return 184
+		case r == 63: // ['?','?']
+			return 184
+		case r == 64: // ['@','@']
+			return 184
 		case 65 <= r && r <= 90: // ['A','Z']
-			return 101
+			return 184
+		case r == 91: // ['[','[']
+			return 184
+		case r == 92: // ['\','\']
+			return 253
+		case r == 93: // [']',']']
+			return 184
+		case r == 94: // ['^','^']
+			return 184
 		case r == 95: // ['_','_']
-			return 102
-		case 97 <= r && r <= 109: // ['a','m']
-			return 101
-		case r == 110: // ['n','n']
-			return 286
-		case 111 <= r && r <= 122: // ['o','z']
-			return 101
-		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
-			return 101
+			return 184
+		case r == 96: // ['`','`']
+			return 184
+		case 97 <= r && r <= 122: // ['a','z']
+			return 184
+		case r == 124: // ['|','|']
+			return 184
+		case r == 125: // ['}','}']
+			return 254
+		case r == 126: // ['~','~']
+			return 184
 		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 101
+			return 184
 		}
 		return NoState
 	},
@@ -4826,7 +4782,11 @@ var TransTab = TransitionTable{
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
 			return 100
-		case 65 <= r && r <= 90: // ['A','Z']
+		case 65 <= r && r <= 77: // ['A','M']
+			return 101
+		case r == 78: // ['N','N']
+			return 291
+		case 79 <= r && r <= 90: // ['O','Z']
 			return 101
 		case r == 95: // ['_','_']
 			return 102
@@ -4844,15 +4804,15 @@ var TransTab = TransitionTable{
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
 			return 100
-		case 65 <= r && r <= 90: // ['A','Z']
+		case 65 <= r && r <= 82: // ['A','R']
+			return 101
+		case r == 83: // ['S','S']
+			return 292
+		case 84 <= r && r <= 90: // ['T','Z']
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 106: // ['a','j']
-			return 101
-		case r == 107: // ['k','k']
-			return 287
-		case 108 <= r && r <= 122: // ['l','z']
+		case 97 <= r && r <= 122: // ['a','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -4888,11 +4848,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 104: // ['a','h']
+		case 97 <= r && r <= 109: // ['a','m']
 			return 101
-		case r == 105: // ['i','i']
-			return 288
-		case 106 <= r && r <= 122: // ['j','z']
+		case r == 110: // ['n','n']
+			return 293
+		case 111 <= r && r <= 122: // ['o','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -4928,11 +4888,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 111: // ['a','o']
+		case 97 <= r && r <= 106: // ['a','j']
 			return 101
-		case r == 112: // ['p','p']
-			return 289
-		case 113 <= r && r <= 122: // ['q','z']
+		case r == 107: // ['k','k']
+			return 294
+		case 108 <= r && r <= 122: // ['l','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -4968,7 +4928,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 122: // ['a','z']
+		case 97 <= r && r <= 104: // ['a','h']
+			return 101
+		case r == 105: // ['i','i']
+			return 295
+		case 106 <= r && r <= 122: // ['j','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -4980,25 +4944,13 @@ var TransTab = TransitionTable{
 	// S264
 	func(r rune) int {
 		switch {
-		case r == 48: // ['0','0']
-			return 100
-		case r == 49: // ['1','1']
-			return 290
-		case 50 <= r && r <= 57: // ['2','9']
+		case 48 <= r && r <= 57: // ['0','9']
 			return 100
 		case 65 <= r && r <= 90: // ['A','Z']
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 101: // ['a','e']
-			return 101
-		case r == 102: // ['f','f']
-			return 291
-		case 103 <= r && r <= 111: // ['g','o']
-			return 101
-		case r == 112: // ['p','p']
-			return 292
-		case 113 <= r && r <= 122: // ['q','z']
+		case 97 <= r && r <= 122: // ['a','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5016,11 +4968,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 109: // ['a','m']
+		case 97 <= r && r <= 111: // ['a','o']
 			return 101
-		case r == 110: // ['n','n']
-			return 293
-		case 111 <= r && r <= 122: // ['o','z']
+		case r == 112: // ['p','p']
+			return 296
+		case 113 <= r && r <= 122: // ['q','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5038,11 +4990,7 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 100: // ['a','d']
-			return 101
-		case r == 101: // ['e','e']
-			return 294
-		case 102 <= r && r <= 122: // ['f','z']
+		case 97 <= r && r <= 122: // ['a','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5060,11 +5008,7 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 100: // ['a','d']
-			return 101
-		case r == 101: // ['e','e']
-			return 295
-		case 102 <= r && r <= 122: // ['f','z']
+		case 97 <= r && r <= 122: // ['a','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5076,17 +5020,25 @@ var TransTab = TransitionTable{
 	// S268
 	func(r rune) int {
 		switch {
-		case 48 <= r && r <= 57: // ['0','9']
+		case r == 48: // ['0','0']
+			return 100
+		case r == 49: // ['1','1']
+			return 297
+		case 50 <= r && r <= 57: // ['2','9']
 			return 100
 		case 65 <= r && r <= 90: // ['A','Z']
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 115: // ['a','s']
+		case 97 <= r && r <= 101: // ['a','e']
 			return 101
-		case r == 116: // ['t','t']
-			return 296
-		case 117 <= r && r <= 122: // ['u','z']
+		case r == 102: // ['f','f']
+			return 298
+		case 103 <= r && r <= 111: // ['g','o']
+			return 101
+		case r == 112: // ['p','p']
+			return 299
+		case 113 <= r && r <= 122: // ['q','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5104,11 +5056,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 115: // ['a','s']
+		case 97 <= r && r <= 109: // ['a','m']
 			return 101
-		case r == 116: // ['t','t']
-			return 297
-		case 117 <= r && r <= 122: // ['u','z']
+		case r == 110: // ['n','n']
+			return 300
+		case 111 <= r && r <= 122: // ['o','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5126,7 +5078,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 122: // ['a','z']
+		case 97 <= r && r <= 100: // ['a','d']
+			return 101
+		case r == 101: // ['e','e']
+			return 301
+		case 102 <= r && r <= 122: // ['f','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5144,11 +5100,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 115: // ['a','s']
+		case 97 <= r && r <= 100: // ['a','d']
 			return 101
-		case r == 116: // ['t','t']
-			return 298
-		case 117 <= r && r <= 122: // ['u','z']
+		case r == 101: // ['e','e']
+			return 302
+		case 102 <= r && r <= 122: // ['f','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5166,11 +5122,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 113: // ['a','q']
+		case 97 <= r && r <= 115: // ['a','s']
 			return 101
-		case r == 114: // ['r','r']
-			return 299
-		case 115 <= r && r <= 122: // ['s','z']
+		case r == 116: // ['t','t']
+			return 303
+		case 117 <= r && r <= 122: // ['u','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5188,11 +5144,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 113: // ['a','q']
+		case 97 <= r && r <= 115: // ['a','s']
 			return 101
-		case r == 114: // ['r','r']
-			return 300
-		case 115 <= r && r <= 122: // ['s','z']
+		case r == 116: // ['t','t']
+			return 304
+		case 117 <= r && r <= 122: // ['u','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5210,11 +5166,7 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 116: // ['a','t']
-			return 101
-		case r == 117: // ['u','u']
-			return 301
-		case 118 <= r && r <= 122: // ['v','z']
+		case 97 <= r && r <= 122: // ['a','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5232,7 +5184,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 122: // ['a','z']
+		case 97 <= r && r <= 115: // ['a','s']
+			return 101
+		case r == 116: // ['t','t']
+			return 305
+		case 117 <= r && r <= 122: // ['u','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5250,7 +5206,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 122: // ['a','z']
+		case 97 <= r && r <= 113: // ['a','q']
+			return 101
+		case r == 114: // ['r','r']
+			return 306
+		case 115 <= r && r <= 122: // ['s','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5268,11 +5228,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 115: // ['a','s']
+		case 97 <= r && r <= 113: // ['a','q']
 			return 101
-		case r == 116: // ['t','t']
-			return 302
-		case 117 <= r && r <= 122: // ['u','z']
+		case r == 114: // ['r','r']
+			return 307
+		case 115 <= r && r <= 122: // ['s','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5290,11 +5250,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 100: // ['a','d']
+		case 97 <= r && r <= 116: // ['a','t']
 			return 101
-		case r == 101: // ['e','e']
-			return 303
-		case 102 <= r && r <= 122: // ['f','z']
+		case r == 117: // ['u','u']
+			return 308
+		case 118 <= r && r <= 122: // ['v','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5306,8 +5266,18 @@ var TransTab = TransitionTable{
 	// S279
 	func(r rune) int {
 		switch {
-		case r == 110: // ['n','n']
-			return 304
+		case 48 <= r && r <= 57: // ['0','9']
+			return 100
+		case 65 <= r && r <= 90: // ['A','Z']
+			return 101
+		case r == 95: // ['_','_']
+			return 102
+		case 97 <= r && r <= 122: // ['a','z']
+			return 101
+		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
+			return 101
+		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
+			return 101
 		}
 		return NoState
 	},
@@ -5315,7 +5285,17 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
-			return 280
+			return 100
+		case 65 <= r && r <= 90: // ['A','Z']
+			return 101
+		case r == 95: // ['_','_']
+			return 102
+		case 97 <= r && r <= 122: // ['a','z']
+			return 101
+		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
+			return 101
+		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
+			return 101
 		}
 		return NoState
 	},
@@ -5323,7 +5303,21 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
-			return 305
+			return 100
+		case 65 <= r && r <= 90: // ['A','Z']
+			return 101
+		case r == 95: // ['_','_']
+			return 102
+		case 97 <= r && r <= 115: // ['a','s']
+			return 101
+		case r == 116: // ['t','t']
+			return 309
+		case 117 <= r && r <= 122: // ['u','z']
+			return 101
+		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
+			return 101
+		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
+			return 101
 		}
 		return NoState
 	},
@@ -5331,15 +5325,29 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
-			return 282
+			return 100
+		case 65 <= r && r <= 90: // ['A','Z']
+			return 101
+		case r == 95: // ['_','_']
+			return 102
+		case 97 <= r && r <= 100: // ['a','d']
+			return 101
+		case r == 101: // ['e','e']
+			return 310
+		case 102 <= r && r <= 122: // ['f','z']
+			return 101
+		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
+			return 101
+		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
+			return 101
 		}
 		return NoState
 	},
 	// S283
 	func(r rune) int {
 		switch {
-		case 48 <= r && r <= 57: // ['0','9']
-			return 283
+		case r == 110: // ['n','n']
+			return 311
 		}
 		return NoState
 	},
@@ -5347,23 +5355,7 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
-			return 100
-		case r == 65: // ['A','A']
-			return 306
-		case 66 <= r && r <= 84: // ['B','T']
-			return 101
-		case r == 85: // ['U','U']
-			return 307
-		case 86 <= r && r <= 90: // ['V','Z']
-			return 101
-		case r == 95: // ['_','_']
-			return 102
-		case 97 <= r && r <= 122: // ['a','z']
-			return 101
-		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
-			return 101
-		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 101
+			return 284
 		}
 		return NoState
 	},
@@ -5371,21 +5363,7 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
-			return 100
-		case 65 <= r && r <= 68: // ['A','D']
-			return 101
-		case r == 69: // ['E','E']
-			return 308
-		case 70 <= r && r <= 90: // ['F','Z']
-			return 101
-		case r == 95: // ['_','_']
-			return 102
-		case 97 <= r && r <= 122: // ['a','z']
-			return 101
-		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
-			return 101
-		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 101
+			return 285
 		}
 		return NoState
 	},
@@ -5393,17 +5371,7 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
-			return 100
-		case 65 <= r && r <= 90: // ['A','Z']
-			return 101
-		case r == 95: // ['_','_']
-			return 102
-		case 97 <= r && r <= 122: // ['a','z']
-			return 101
-		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
-			return 101
-		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 101
+			return 312
 		}
 		return NoState
 	},
@@ -5411,17 +5379,7 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
-			return 100
-		case 65 <= r && r <= 90: // ['A','Z']
-			return 101
-		case r == 95: // ['_','_']
-			return 102
-		case 97 <= r && r <= 122: // ['a','z']
-			return 101
-		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
-			return 101
-		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 101
+			return 313
 		}
 		return NoState
 	},
@@ -5429,21 +5387,7 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
-			return 100
-		case 65 <= r && r <= 90: // ['A','Z']
-			return 101
-		case r == 95: // ['_','_']
-			return 102
-		case 97 <= r && r <= 109: // ['a','m']
-			return 101
-		case r == 110: // ['n','n']
-			return 309
-		case 111 <= r && r <= 122: // ['o','z']
-			return 101
-		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
-			return 101
-		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 101
+			return 288
 		}
 		return NoState
 	},
@@ -5451,17 +5395,7 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
-			return 100
-		case 65 <= r && r <= 90: // ['A','Z']
-			return 101
-		case r == 95: // ['_','_']
-			return 102
-		case 97 <= r && r <= 122: // ['a','z']
-			return 101
-		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
-			return 101
-		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 101
+			return 289
 		}
 		return NoState
 	},
@@ -5469,17 +5403,7 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
-			return 100
-		case 65 <= r && r <= 90: // ['A','Z']
-			return 101
-		case r == 95: // ['_','_']
-			return 102
-		case 97 <= r && r <= 122: // ['a','z']
-			return 101
-		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
-			return 101
-		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 101
+			return 290
 		}
 		return NoState
 	},
@@ -5488,7 +5412,13 @@ var TransTab = TransitionTable{
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
 			return 100
-		case 65 <= r && r <= 90: // ['A','Z']
+		case r == 65: // ['A','A']
+			return 314
+		case 66 <= r && r <= 84: // ['B','T']
+			return 101
+		case r == 85: // ['U','U']
+			return 315
+		case 86 <= r && r <= 90: // ['V','Z']
 			return 101
 		case r == 95: // ['_','_']
 			return 102
@@ -5506,7 +5436,11 @@ var TransTab = TransitionTable{
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
 			return 100
-		case 65 <= r && r <= 90: // ['A','Z']
+		case 65 <= r && r <= 68: // ['A','D']
+			return 101
+		case r == 69: // ['E','E']
+			return 316
+		case 70 <= r && r <= 90: // ['F','Z']
 			return 101
 		case r == 95: // ['_','_']
 			return 102
@@ -5528,11 +5462,7 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 115: // ['a','s']
-			return 101
-		case r == 116: // ['t','t']
-			return 310
-		case 117 <= r && r <= 122: // ['u','z']
+		case 97 <= r && r <= 122: // ['a','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5568,11 +5498,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 113: // ['a','q']
+		case 97 <= r && r <= 109: // ['a','m']
 			return 101
-		case r == 114: // ['r','r']
-			return 311
-		case 115 <= r && r <= 122: // ['s','z']
+		case r == 110: // ['n','n']
+			return 317
+		case 111 <= r && r <= 122: // ['o','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5626,11 +5556,7 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 109: // ['a','m']
-			return 101
-		case r == 110: // ['n','n']
-			return 312
-		case 111 <= r && r <= 122: // ['o','z']
+		case 97 <= r && r <= 122: // ['a','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5648,11 +5574,7 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 109: // ['a','m']
-			return 101
-		case r == 110: // ['n','n']
-			return 313
-		case 111 <= r && r <= 122: // ['o','z']
+		case 97 <= r && r <= 122: // ['a','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5670,11 +5592,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 113: // ['a','q']
+		case 97 <= r && r <= 115: // ['a','s']
 			return 101
-		case r == 114: // ['r','r']
-			return 314
-		case 115 <= r && r <= 122: // ['s','z']
+		case r == 116: // ['t','t']
+			return 318
+		case 117 <= r && r <= 122: // ['u','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5692,11 +5614,7 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 115: // ['a','s']
-			return 101
-		case r == 116: // ['t','t']
-			return 315
-		case 117 <= r && r <= 122: // ['u','z']
+		case 97 <= r && r <= 122: // ['a','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5714,7 +5632,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 122: // ['a','z']
+		case 97 <= r && r <= 113: // ['a','q']
+			return 101
+		case r == 114: // ['r','r']
+			return 319
+		case 115 <= r && r <= 122: // ['s','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5744,86 +5666,22 @@ var TransTab = TransitionTable{
 	// S304
 	func(r rune) int {
 		switch {
-		case r == 105: // ['i','i']
-			return 316
+		case 48 <= r && r <= 57: // ['0','9']
+			return 100
+		case 65 <= r && r <= 90: // ['A','Z']
+			return 101
+		case r == 95: // ['_','_']
+			return 102
+		case 97 <= r && r <= 122: // ['a','z']
+			return 101
+		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
+			return 101
+		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
+			return 101
 		}
 		return NoState
 	},
 	// S305
-	func(r rune) int {
-		switch {
-		case 48 <= r && r <= 57: // ['0','9']
-			return 305
-		}
-		return NoState
-	},
-	// S306
-	func(r rune) int {
-		switch {
-		case 48 <= r && r <= 57: // ['0','9']
-			return 100
-		case 65 <= r && r <= 76: // ['A','L']
-			return 101
-		case r == 77: // ['M','M']
-			return 317
-		case 78 <= r && r <= 90: // ['N','Z']
-			return 101
-		case r == 95: // ['_','_']
-			return 102
-		case 97 <= r && r <= 122: // ['a','z']
-			return 101
-		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
-			return 101
-		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 101
-		}
-		return NoState
-	},
-	// S307
-	func(r rune) int {
-		switch {
-		case 48 <= r && r <= 57: // ['0','9']
-			return 100
-		case 65 <= r && r <= 76: // ['A','L']
-			return 101
-		case r == 77: // ['M','M']
-			return 318
-		case 78 <= r && r <= 90: // ['N','Z']
-			return 101
-		case r == 95: // ['_','_']
-			return 102
-		case 97 <= r && r <= 122: // ['a','z']
-			return 101
-		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
-			return 101
-		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 101
-		}
-		return NoState
-	},
-	// S308
-	func(r rune) int {
-		switch {
-		case 48 <= r && r <= 57: // ['0','9']
-			return 100
-		case 65 <= r && r <= 79: // ['A','O']
-			return 101
-		case r == 80: // ['P','P']
-			return 319
-		case 81 <= r && r <= 90: // ['Q','Z']
-			return 101
-		case r == 95: // ['_','_']
-			return 102
-		case 97 <= r && r <= 122: // ['a','z']
-			return 101
-		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
-			return 101
-		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 101
-		}
-		return NoState
-	},
-	// S309
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
@@ -5832,11 +5690,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 116: // ['a','t']
+		case 97 <= r && r <= 109: // ['a','m']
 			return 101
-		case r == 117: // ['u','u']
+		case r == 110: // ['n','n']
 			return 320
-		case 118 <= r && r <= 122: // ['v','z']
+		case 111 <= r && r <= 122: // ['o','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5845,7 +5703,7 @@ var TransTab = TransitionTable{
 		}
 		return NoState
 	},
-	// S310
+	// S306
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
@@ -5867,7 +5725,51 @@ var TransTab = TransitionTable{
 		}
 		return NoState
 	},
-	// S311
+	// S307
+	func(r rune) int {
+		switch {
+		case 48 <= r && r <= 57: // ['0','9']
+			return 100
+		case 65 <= r && r <= 90: // ['A','Z']
+			return 101
+		case r == 95: // ['_','_']
+			return 102
+		case 97 <= r && r <= 113: // ['a','q']
+			return 101
+		case r == 114: // ['r','r']
+			return 322
+		case 115 <= r && r <= 122: // ['s','z']
+			return 101
+		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
+			return 101
+		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
+			return 101
+		}
+		return NoState
+	},
+	// S308
+	func(r rune) int {
+		switch {
+		case 48 <= r && r <= 57: // ['0','9']
+			return 100
+		case 65 <= r && r <= 90: // ['A','Z']
+			return 101
+		case r == 95: // ['_','_']
+			return 102
+		case 97 <= r && r <= 115: // ['a','s']
+			return 101
+		case r == 116: // ['t','t']
+			return 323
+		case 117 <= r && r <= 122: // ['u','z']
+			return 101
+		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
+			return 101
+		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
+			return 101
+		}
+		return NoState
+	},
+	// S309
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
@@ -5885,21 +5787,37 @@ var TransTab = TransitionTable{
 		}
 		return NoState
 	},
+	// S310
+	func(r rune) int {
+		switch {
+		case 48 <= r && r <= 57: // ['0','9']
+			return 100
+		case 65 <= r && r <= 90: // ['A','Z']
+			return 101
+		case r == 95: // ['_','_']
+			return 102
+		case 97 <= r && r <= 122: // ['a','z']
+			return 101
+		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
+			return 101
+		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
+			return 101
+		}
+		return NoState
+	},
+	// S311
+	func(r rune) int {
+		switch {
+		case r == 105: // ['i','i']
+			return 324
+		}
+		return NoState
+	},
 	// S312
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
-			return 100
-		case 65 <= r && r <= 90: // ['A','Z']
-			return 101
-		case r == 95: // ['_','_']
-			return 102
-		case 97 <= r && r <= 122: // ['a','z']
-			return 101
-		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
-			return 101
-		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 101
+			return 312
 		}
 		return NoState
 	},
@@ -5907,17 +5825,7 @@ var TransTab = TransitionTable{
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
-			return 100
-		case 65 <= r && r <= 90: // ['A','Z']
-			return 101
-		case r == 95: // ['_','_']
-			return 102
-		case 97 <= r && r <= 122: // ['a','z']
-			return 101
-		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
-			return 101
-		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
-			return 101
+			return 313
 		}
 		return NoState
 	},
@@ -5926,7 +5834,11 @@ var TransTab = TransitionTable{
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
 			return 100
-		case 65 <= r && r <= 90: // ['A','Z']
+		case 65 <= r && r <= 76: // ['A','L']
+			return 101
+		case r == 77: // ['M','M']
+			return 325
+		case 78 <= r && r <= 90: // ['N','Z']
 			return 101
 		case r == 95: // ['_','_']
 			return 102
@@ -5944,7 +5856,11 @@ var TransTab = TransitionTable{
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
 			return 100
-		case 65 <= r && r <= 90: // ['A','Z']
+		case 65 <= r && r <= 76: // ['A','L']
+			return 101
+		case r == 77: // ['M','M']
+			return 326
+		case 78 <= r && r <= 90: // ['N','Z']
 			return 101
 		case r == 95: // ['_','_']
 			return 102
@@ -5960,8 +5876,22 @@ var TransTab = TransitionTable{
 	// S316
 	func(r rune) int {
 		switch {
-		case r == 99: // ['c','c']
-			return 322
+		case 48 <= r && r <= 57: // ['0','9']
+			return 100
+		case 65 <= r && r <= 79: // ['A','O']
+			return 101
+		case r == 80: // ['P','P']
+			return 327
+		case 81 <= r && r <= 90: // ['Q','Z']
+			return 101
+		case r == 95: // ['_','_']
+			return 102
+		case 97 <= r && r <= 122: // ['a','z']
+			return 101
+		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
+			return 101
+		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
+			return 101
 		}
 		return NoState
 	},
@@ -5970,15 +5900,15 @@ var TransTab = TransitionTable{
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
 			return 100
-		case 65 <= r && r <= 68: // ['A','D']
-			return 101
-		case r == 69: // ['E','E']
-			return 323
-		case 70 <= r && r <= 90: // ['F','Z']
+		case 65 <= r && r <= 90: // ['A','Z']
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 122: // ['a','z']
+		case 97 <= r && r <= 116: // ['a','t']
+			return 101
+		case r == 117: // ['u','u']
+			return 328
+		case 118 <= r && r <= 122: // ['v','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -5996,7 +5926,11 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 122: // ['a','z']
+		case 97 <= r && r <= 109: // ['a','m']
+			return 101
+		case r == 110: // ['n','n']
+			return 329
+		case 111 <= r && r <= 122: // ['o','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -6032,11 +5966,7 @@ var TransTab = TransitionTable{
 			return 101
 		case r == 95: // ['_','_']
 			return 102
-		case 97 <= r && r <= 100: // ['a','d']
-			return 101
-		case r == 101: // ['e','e']
-			return 324
-		case 102 <= r && r <= 122: // ['f','z']
+		case 97 <= r && r <= 122: // ['a','z']
 			return 101
 		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
 			return 101
@@ -6066,8 +5996,18 @@ var TransTab = TransitionTable{
 	// S322
 	func(r rune) int {
 		switch {
-		case r == 37: // ['%','%']
-			return 325
+		case 48 <= r && r <= 57: // ['0','9']
+			return 100
+		case 65 <= r && r <= 90: // ['A','Z']
+			return 101
+		case r == 95: // ['_','_']
+			return 102
+		case 97 <= r && r <= 122: // ['a','z']
+			return 101
+		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
+			return 101
+		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
+			return 101
 		}
 		return NoState
 	},
@@ -6090,6 +6030,36 @@ var TransTab = TransitionTable{
 		return NoState
 	},
 	// S324
+	func(r rune) int {
+		switch {
+		case r == 99: // ['c','c']
+			return 330
+		}
+		return NoState
+	},
+	// S325
+	func(r rune) int {
+		switch {
+		case 48 <= r && r <= 57: // ['0','9']
+			return 100
+		case 65 <= r && r <= 68: // ['A','D']
+			return 101
+		case r == 69: // ['E','E']
+			return 331
+		case 70 <= r && r <= 90: // ['F','Z']
+			return 101
+		case r == 95: // ['_','_']
+			return 102
+		case 97 <= r && r <= 122: // ['a','z']
+			return 101
+		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
+			return 101
+		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
+			return 101
+		}
+		return NoState
+	},
+	// S326
 	func(r rune) int {
 		switch {
 		case 48 <= r && r <= 57: // ['0','9']
@@ -6107,23 +6077,125 @@ var TransTab = TransitionTable{
 		}
 		return NoState
 	},
-	// S325
-	func(r rune) int {
-		switch {
-		case r == 37: // ['%','%']
-			return 326
-		}
-		return NoState
-	},
-	// S326
-	func(r rune) int {
-		switch {
-		case r == 37: // ['%','%']
-			return 327
-		}
-		return NoState
-	},
 	// S327
+	func(r rune) int {
+		switch {
+		case 48 <= r && r <= 57: // ['0','9']
+			return 100
+		case 65 <= r && r <= 90: // ['A','Z']
+			return 101
+		case r == 95: // ['_','_']
+			return 102
+		case 97 <= r && r <= 122: // ['a','z']
+			return 101
+		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
+			return 101
+		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
+			return 101
+		}
+		return NoState
+	},
+	// S328
+	func(r rune) int {
+		switch {
+		case 48 <= r && r <= 57: // ['0','9']
+			return 100
+		case 65 <= r && r <= 90: // ['A','Z']
+			return 101
+		case r == 95: // ['_','_']
+			return 102
+		case 97 <= r && r <= 100: // ['a','d']
+			return 101
+		case r == 101: // ['e','e']
+			return 332
+		case 102 <= r && r <= 122: // ['f','z']
+			return 101
+		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
+			return 101
+		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
+			return 101
+		}
+		return NoState
+	},
+	// S329
+	func(r rune) int {
+		switch {
+		case 48 <= r && r <= 57: // ['0','9']
+			return 100
+		case 65 <= r && r <= 90: // ['A','Z']
+			return 101
+		case r == 95: // ['_','_']
+			return 102
+		case 97 <= r && r <= 122: // ['a','z']
+			return 101
+		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
+			return 101
+		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
+			return 101
+		}
+		return NoState
+	},
+	// S330
+	func(r rune) int {
+		switch {
+		case r == 37: // ['%','%']
+			return 333
+		}
+		return NoState
+	},
+	// S331
+	func(r rune) int {
+		switch {
+		case 48 <= r && r <= 57: // ['0','9']
+			return 100
+		case 65 <= r && r <= 90: // ['A','Z']
+			return 101
+		case r == 95: // ['_','_']
+			return 102
+		case 97 <= r && r <= 122: // ['a','z']
+			return 101
+		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
+			return 101
+		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
+			return 101
+		}
+		return NoState
+	},
+	// S332
+	func(r rune) int {
+		switch {
+		case 48 <= r && r <= 57: // ['0','9']
+			return 100
+		case 65 <= r && r <= 90: // ['A','Z']
+			return 101
+		case r == 95: // ['_','_']
+			return 102
+		case 97 <= r && r <= 122: // ['a','z']
+			return 101
+		case 160 <= r && r <= 255: // [\u00a0,\u00ff]
+			return 101
+		case 256 <= r && r <= 1114111: // [\u0100,\U0010ffff]
+			return 101
+		}
+		return NoState
+	},
+	// S333
+	func(r rune) int {
+		switch {
+		case r == 37: // ['%','%']
+			return 334
+		}
+		return NoState
+	},
+	// S334
+	func(r rune) int {
+		switch {
+		case r == 37: // ['%','%']
+			return 335
+		}
+		return NoState
+	},
+	// S335
 	func(r rune) int {
 		switch {
 		}
diff --git a/test/cases/dsl-parse/0019/expout b/test/cases/dsl-parse/0019/expout
index d9087831d..b9e166462 100644
--- a/test/cases/dsl-parse/0019/expout
+++ b/test/cases/dsl-parse/0019/expout
@@ -1,5 +1,5 @@
 DSL EXPRESSION:
-$x = 123. + 1e-2 / .2e3 + 1.e-3
+$x = 123. + 1e-2 / .2e3 + 1.e-3 + 2e+1
 
 
 AST:
@@ -8,9 +8,11 @@ AST:
         * direct field value "x"
         * operator "+"
             * operator "+"
-                * float literal "123."
-                * operator "/"
-                    * float literal "1e-2"
-                    * float literal ".2e3"
-            * float literal "1.e-3"
+                * operator "+"
+                    * float literal "123."
+                    * operator "/"
+                        * float literal "1e-2"
+                        * float literal ".2e3"
+                * float literal "1.e-3"
+            * float literal "2e+1"
 
diff --git a/test/cases/dsl-parse/0019/mlr b/test/cases/dsl-parse/0019/mlr
index eb082fca5..5f8b85a50 100644
--- a/test/cases/dsl-parse/0019/mlr
+++ b/test/cases/dsl-parse/0019/mlr
@@ -1 +1 @@
-$x = 123. + 1e-2 / .2e3 + 1.e-3
+$x = 123. + 1e-2 / .2e3 + 1.e-3 + 2e+1