diff --git a/lyx/lexer.go b/lyx/lexer.go
index c0c01a2..1c558a9 100644
--- a/lyx/lexer.go
+++ b/lyx/lexer.go
@@ -1107,20 +1107,24 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		goto st_case_514
 	case 515:
 		goto st_case_515
+	case 516:
+		goto st_case_516
+	case 517:
+		goto st_case_517
 	}
 	goto st_out
 tr2:
-//line lyx/lexer.rl:314
+//line lyx/lexer.rl:315
  lex.te = ( lex.p)+1
 { lval.str = string(lex.data[lex.ts + 1:lex.te - 1]); tok = IDENT; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
 tr5:
-//line lyx/lexer.rl:316
+//line lyx/lexer.rl:317
  lex.te = ( lex.p)+1
 { lval.str = string(lex.data[lex.ts + 1:lex.te - 1]); tok = SCONST; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
 tr6:
-//line lyx/lexer.rl:330
+//line lyx/lexer.rl:331
 ( lex.p) = ( lex.te) - 1
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = TMINUS; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
@@ -1275,317 +1279,320 @@ tr9:
  lval.str = string(lex.data[lex.ts:lex.te]); tok = KEY; {( lex.p)++;  lex.cs = 8; goto _out }}
 	case 59:
 	{( lex.p) = ( lex.te) - 1
- lval.str = string(lex.data[lex.ts:lex.te]); tok = SHOW; {( lex.p)++;  lex.cs = 8; goto _out }}
+ lval.str = string(lex.data[lex.ts:lex.te]); tok = RESET; {( lex.p)++;  lex.cs = 8; goto _out }}
 	case 60:
 	{( lex.p) = ( lex.te) - 1
- lval.str = string(lex.data[lex.ts:lex.te]); tok = FROM; {( lex.p)++;  lex.cs = 8; goto _out }}
+ lval.str = string(lex.data[lex.ts:lex.te]); tok = SHOW; {( lex.p)++;  lex.cs = 8; goto _out }}
 	case 61:
 	{( lex.p) = ( lex.te) - 1
- lval.str = string(lex.data[lex.ts:lex.te]); tok = WHERE; {( lex.p)++;  lex.cs = 8; goto _out }}
+ lval.str = string(lex.data[lex.ts:lex.te]); tok = FROM; {( lex.p)++;  lex.cs = 8; goto _out }}
 	case 62:
 	{( lex.p) = ( lex.te) - 1
- lval.str = string(lex.data[lex.ts:lex.te]); tok = ORDER; {( lex.p)++;  lex.cs = 8; goto _out }}
+ lval.str = string(lex.data[lex.ts:lex.te]); tok = WHERE; {( lex.p)++;  lex.cs = 8; goto _out }}
 	case 63:
 	{( lex.p) = ( lex.te) - 1
- lval.str = string(lex.data[lex.ts:lex.te]); tok = GROUP; {( lex.p)++;  lex.cs = 8; goto _out }}
+ lval.str = string(lex.data[lex.ts:lex.te]); tok = ORDER; {( lex.p)++;  lex.cs = 8; goto _out }}
 	case 64:
 	{( lex.p) = ( lex.te) - 1
- lval.str = string(lex.data[lex.ts:lex.te]); tok = BY; {( lex.p)++;  lex.cs = 8; goto _out }}
+ lval.str = string(lex.data[lex.ts:lex.te]); tok = GROUP; {( lex.p)++;  lex.cs = 8; goto _out }}
 	case 65:
 	{( lex.p) = ( lex.te) - 1
+ lval.str = string(lex.data[lex.ts:lex.te]); tok = BY; {( lex.p)++;  lex.cs = 8; goto _out }}
+	case 66:
+	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = HAVING; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 67:
+	case 68:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = AND; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 69:
+	case 70:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = EXPLAIN; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 70:
+	case 71:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = RETURNING; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 71:
+	case 72:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = DEFAULT; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 72:
+	case 73:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = COPY; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 73:
+	case 74:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = TO; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 74:
+	case 75:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = STDOUT; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 75:
+	case 76:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = LIMIT; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 76:
+	case 77:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = DISTINCT; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 77:
+	case 78:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = LIKE; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 79:
+	case 80:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = ISNULL; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 81:
+	case 82:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = NULLS_LA; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 83:
+	case 84:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = NOTNULL; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 84:
+	case 85:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = LATERAL_P; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 85:
+	case 86:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = ORDINALITY; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 87:
+	case 88:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = TRUE_P; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 88:
+	case 89:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = FALSE_P; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 89:
+	case 90:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = FIRST_P; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 90:
+	case 91:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = LAST_P; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 91:
+	case 92:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = ASC; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 92:
+	case 93:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = DESC; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 93:
+	case 94:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = CHARACTERISTICS; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 94:
+	case 95:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = SESSION; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 95:
+	case 96:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = ISOLATION; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 96:
+	case 97:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = LEVEL; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 97:
+	case 98:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = COMMITTED; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 98:
+	case 99:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = ARRAY; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 99:
+	case 100:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = ROW; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 100:
+	case 101:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = EXISTS; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 101:
+	case 102:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = JOIN; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 102:
+	case 103:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = CROSS; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 103:
+	case 104:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = LEFT; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 104:
+	case 105:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = RIGHT; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 105:
+	case 106:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = FULL; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 106:
+	case 107:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = OUTER_P; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 107:
+	case 108:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = INNER_P; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 111:
+	case 112:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = LOCKED; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 112:
+	case 113:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = SKIP; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 113:
+	case 114:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = RECURSIVE; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 114:
+	case 115:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = SEARCH; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 115:
+	case 116:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = CYCLE; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 116:
+	case 117:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = BREADTH; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 117:
+	case 118:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = DEPTH; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 118:
+	case 119:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = SHARE; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 119:
+	case 120:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = USING; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 120:
+	case 121:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = VACUUM; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 121:
+	case 122:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = CLUSTER; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 122:
+	case 123:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = ANALYZE; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 123:
+	case 124:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = ALTER; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 124:
+	case 125:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = INDEX; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 125:
+	case 126:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = BINARY; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 126:
+	case 127:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = DELIMITERS; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 128:
+	case 129:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = CSV; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 129:
+	case 130:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = HEADER_P; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 130:
+	case 131:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = QUOTE; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 131:
+	case 132:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = ESCAPE; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 132:
+	case 133:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = ENCODING; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 133:
+	case 134:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = PROGRAM; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 134:
+	case 135:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = STDIN; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 135:
+	case 136:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = ASYMMETRIC; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 136:
+	case 137:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = BETWEEN; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 137:
+	case 138:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = DROP; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 138:
+	case 139:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = BEGIN; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 139:
+	case 140:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = ELSE; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 140:
+	case 141:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = END_P; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 141:
+	case 142:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = TRANSACTION; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 142:
+	case 143:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = READ; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 143:
+	case 144:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = ONLY; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 144:
+	case 145:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = WRITE; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 145:
+	case 146:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = DEFERRABLE; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 148:
+	case 149:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = UNCOMMITTED; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 150:
+	case 151:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = REPEATABLE; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 151:
+	case 152:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = SERIALIZABLE; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 152:
+	case 153:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = START; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 153:
+	case 154:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = ABORT_P; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 155:
+	case 156:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = ROLLBACK; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 157:
+	case 158:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = CASE; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 158:
+	case 159:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = WHEN; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 159:
+	case 160:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = THEN; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 161:
+	case 162:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = CONFLICT; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 163:
+	case 164:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = NOTHING; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 165:
+	case 166:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = UNION; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 166:
+	case 167:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = EXCEPT; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 167:
+	case 168:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = INTERSECT; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 168:
+	case 169:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = ALL; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 169:
+	case 170:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = PARTITION; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 171:
+	case 172:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = IDENT; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 178:
+	case 179:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = TDOT; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 181:
+	case 182:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = TPLUS; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 183:
+	case 184:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = TMUL; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 184:
+	case 185:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = TMOD; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 185:
+	case 186:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = TPOW; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 188:
+	case 189:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = TEQ; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 189:
+	case 190:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = TNOT_EQUALS; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 190:
+	case 191:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = TLESS_EQUALS; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 191:
+	case 192:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = TGREATER_EQUALS; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 192:
+	case 193:
 	{( lex.p) = ( lex.te) - 1
  lval.str = string(lex.data[lex.ts:lex.te]); tok = TNOT_EQUALS; {( lex.p)++;  lex.cs = 8; goto _out }}
-	case 193:
+	case 194:
 	{( lex.p) = ( lex.te) - 1
 
                 lval.str = string(lex.data[lex.ts:lex.te]); tok = int(OP);    
@@ -1595,32 +1602,32 @@ tr9:
 	
 	goto st8
 tr17:
-//line lyx/lexer.rl:322
+//line lyx/lexer.rl:323
  lex.te = ( lex.p)+1
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = TOPENBR; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
 tr18:
-//line lyx/lexer.rl:323
+//line lyx/lexer.rl:324
  lex.te = ( lex.p)+1
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = TCLOSEBR; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
 tr21:
-//line lyx/lexer.rl:321
+//line lyx/lexer.rl:322
  lex.te = ( lex.p)+1
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = TCOMMA; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
 tr28:
-//line lyx/lexer.rl:327
+//line lyx/lexer.rl:328
  lex.te = ( lex.p)+1
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = TSEMICOLON; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
 tr58:
-//line lyx/lexer.rl:324
+//line lyx/lexer.rl:325
  lex.te = ( lex.p)+1
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = TSQOPENBR; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
 tr59:
-//line lyx/lexer.rl:325
+//line lyx/lexer.rl:326
  lex.te = ( lex.p)+1
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = TSQCLOSEBR; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
@@ -1631,7 +1638,7 @@ tr61:
 { /* do nothing */ }
 	goto st8
 tr62:
-//line lyx/lexer.rl:345
+//line lyx/lexer.rl:346
  lex.te = ( lex.p)
 ( lex.p)--
 {
@@ -1649,7 +1656,7 @@ tr64:
             }
 	goto st8
 tr65:
-//line lyx/lexer.rl:330
+//line lyx/lexer.rl:331
  lex.te = ( lex.p)
 ( lex.p)--
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = TMINUS; {( lex.p)++;  lex.cs = 8; goto _out }}
@@ -1673,7 +1680,7 @@ tr72:
 { lval.int, _ = strconv.Atoi(string(lex.data[lex.ts:lex.te])); tok = ICONST; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
 tr73:
-//line lyx/lexer.rl:328
+//line lyx/lexer.rl:329
  lex.te = ( lex.p)
 ( lex.p)--
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = TCOLON; {( lex.p)++;  lex.cs = 8; goto _out }}
@@ -1684,25 +1691,25 @@ tr74:
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = TYPECAST; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
 tr75:
-//line lyx/lexer.rl:335
+//line lyx/lexer.rl:336
  lex.te = ( lex.p)
 ( lex.p)--
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = TLESS; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
 tr78:
-//line lyx/lexer.rl:336
+//line lyx/lexer.rl:337
  lex.te = ( lex.p)
 ( lex.p)--
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = TGREATER; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
 tr80:
-//line lyx/lexer.rl:315
+//line lyx/lexer.rl:316
  lex.te = ( lex.p)
 ( lex.p)--
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = IDENT; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
 tr102:
-//line lyx/lexer.rl:179
+//line lyx/lexer.rl:180
  lex.te = ( lex.p)
 ( lex.p)--
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = AS; {( lex.p)++;  lex.cs = 8; goto _out }}
@@ -1720,7 +1727,7 @@ tr162:
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = CHARACTER; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
 tr180:
-//line lyx/lexer.rl:295
+//line lyx/lexer.rl:296
  lex.te = ( lex.p)
 ( lex.p)--
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = COMMIT; {( lex.p)++;  lex.cs = 8; goto _out }}
@@ -1732,25 +1739,25 @@ tr226:
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = DEC; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
 tr251:
-//line lyx/lexer.rl:262
+//line lyx/lexer.rl:263
  lex.te = ( lex.p)
 ( lex.p)--
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = DELIMITER; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
 tr262:
-//line lyx/lexer.rl:305
+//line lyx/lexer.rl:306
  lex.te = ( lex.p)
 ( lex.p)--
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = DO; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
 tr320:
-//line lyx/lexer.rl:236
+//line lyx/lexer.rl:237
  lex.te = ( lex.p)
 ( lex.p)--
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = FOR; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
 tr349:
-//line lyx/lexer.rl:235
+//line lyx/lexer.rl:236
  lex.te = ( lex.p)
 ( lex.p)--
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = IN_P; {( lex.p)++;  lex.cs = 8; goto _out }}
@@ -1762,43 +1769,43 @@ tr361:
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = INT_P; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
 tr375:
-//line lyx/lexer.rl:196
+//line lyx/lexer.rl:197
  lex.te = ( lex.p)
 ( lex.p)--
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = IS; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
 tr440:
-//line lyx/lexer.rl:200
+//line lyx/lexer.rl:201
  lex.te = ( lex.p)
 ( lex.p)--
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = NOT; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
 tr452:
-//line lyx/lexer.rl:198
+//line lyx/lexer.rl:199
  lex.te = ( lex.p)
 ( lex.p)--
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = NULL_P; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
 tr462:
-//line lyx/lexer.rl:234
+//line lyx/lexer.rl:235
  lex.te = ( lex.p)
 ( lex.p)--
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = ON; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
 tr465:
-//line lyx/lexer.rl:181
+//line lyx/lexer.rl:182
  lex.te = ( lex.p)
 ( lex.p)--
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = OR; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
-tr592:
+tr595:
 //line lyx/lexer.rl:171
  lex.te = ( lex.p)
 ( lex.p)--
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = SET; {( lex.p)++;  lex.cs = 8; goto _out }}
 	goto st8
-tr690:
-//line lyx/lexer.rl:204
+tr693:
+//line lyx/lexer.rl:205
  lex.te = ( lex.p)
 ( lex.p)--
 { lval.str = string(lex.data[lex.ts:lex.te]); tok = WITH; {( lex.p)++;  lex.cs = 8; goto _out }}
@@ -1817,7 +1824,7 @@ tr690:
 //line NONE:1
  lex.ts = ( lex.p)
 
-//line lyx/lexer.go:1821
+//line lyx/lexer.go:1828
 		switch  lex.data[( lex.p)] {
 		case 32:
 			goto st9
@@ -1896,21 +1903,21 @@ tr690:
 		case 82:
 			goto st358
 		case 83:
-			goto st396
+			goto st398
 		case 84:
-			goto st445
+			goto st447
 		case 85:
-			goto st467
+			goto st469
 		case 86:
-			goto st486
+			goto st488
 		case 87:
-			goto st498
+			goto st500
 		case 88:
 			goto tr55
 		case 89:
-			goto st510
+			goto st512
 		case 90:
-			goto st513
+			goto st515
 		case 91:
 			goto tr58
 		case 93:
@@ -1956,21 +1963,21 @@ tr690:
 		case 114:
 			goto st358
 		case 115:
-			goto st396
+			goto st398
 		case 116:
-			goto st445
+			goto st447
 		case 117:
-			goto st467
+			goto st469
 		case 118:
-			goto st486
+			goto st488
 		case 119:
-			goto st498
+			goto st500
 		case 120:
 			goto tr55
 		case 121:
-			goto st510
+			goto st512
 		case 122:
-			goto st513
+			goto st515
 		case 124:
 			goto tr14
 		case 126:
@@ -2057,78 +2064,78 @@ tr14:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:345
- lex.act = 193;
+//line lyx/lexer.rl:346
+ lex.act = 194;
 	goto st11
 tr16:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:333
- lex.act = 184;
+//line lyx/lexer.rl:334
+ lex.act = 185;
 	goto st11
 tr19:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:331
- lex.act = 183;
+//line lyx/lexer.rl:332
+ lex.act = 184;
 	goto st11
 tr20:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:329
- lex.act = 181;
+//line lyx/lexer.rl:330
+ lex.act = 182;
 	goto st11
 tr30:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:337
- lex.act = 188;
+//line lyx/lexer.rl:338
+ lex.act = 189;
 	goto st11
 tr60:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:334
- lex.act = 185;
+//line lyx/lexer.rl:335
+ lex.act = 186;
 	goto st11
 tr63:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:342
- lex.act = 192;
+//line lyx/lexer.rl:343
+ lex.act = 193;
 	goto st11
 tr76:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:340
- lex.act = 190;
+//line lyx/lexer.rl:341
+ lex.act = 191;
 	goto st11
 tr77:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:339
- lex.act = 189;
+//line lyx/lexer.rl:340
+ lex.act = 190;
 	goto st11
 tr79:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:341
- lex.act = 191;
+//line lyx/lexer.rl:342
+ lex.act = 192;
 	goto st11
 	st11:
 		if ( lex.p)++; ( lex.p) == ( lex.pe) {
 			goto _test_eof11
 		}
 	st_case_11:
-//line lyx/lexer.go:2132
+//line lyx/lexer.go:2139
 		switch  lex.data[( lex.p)] {
 		case 33:
 			goto tr14
@@ -2211,7 +2218,7 @@ tr22:
 			goto _test_eof13
 		}
 	st_case_13:
-//line lyx/lexer.go:2215
+//line lyx/lexer.go:2222
 		switch  lex.data[( lex.p)] {
 		case 33:
 			goto tr14
@@ -2322,15 +2329,15 @@ tr23:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:326
- lex.act = 178;
+//line lyx/lexer.rl:327
+ lex.act = 179;
 	goto st16
 	st16:
 		if ( lex.p)++; ( lex.p) == ( lex.pe) {
 			goto _test_eof16
 		}
 	st_case_16:
-//line lyx/lexer.go:2334
+//line lyx/lexer.go:2341
 		if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 			goto tr7
 		}
@@ -2389,7 +2396,7 @@ tr11:
 			goto _test_eof18
 		}
 	st_case_18:
-//line lyx/lexer.go:2393
+//line lyx/lexer.go:2400
 		if  lex.data[( lex.p)] == 42 {
 			goto st7
 		}
@@ -2424,85 +2431,85 @@ tr55:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:315
- lex.act = 171;
+//line lyx/lexer.rl:316
+ lex.act = 172;
 	goto st20
 tr88:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:292
- lex.act = 153;
+//line lyx/lexer.rl:293
+ lex.act = 154;
 	goto st20
 tr89:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:310
- lex.act = 168;
+//line lyx/lexer.rl:311
+ lex.act = 169;
 	goto st20
 tr92:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:256
- lex.act = 123;
+//line lyx/lexer.rl:257
+ lex.act = 124;
 	goto st20
 tr94:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:180
- lex.act = 67;
+//line lyx/lexer.rl:181
+ lex.act = 68;
 	goto st20
 tr98:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:254
- lex.act = 122;
+//line lyx/lexer.rl:255
+ lex.act = 123;
 	goto st20
 tr101:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:221
- lex.act = 98;
+//line lyx/lexer.rl:222
+ lex.act = 99;
 	goto st20
 tr103:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:210
- lex.act = 91;
+//line lyx/lexer.rl:211
+ lex.act = 92;
 	goto st20
 tr111:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:271
- lex.act = 135;
+//line lyx/lexer.rl:272
+ lex.act = 136;
 	goto st20
 tr116:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:177
- lex.act = 64;
+//line lyx/lexer.rl:178
+ lex.act = 65;
 	goto st20
 tr120:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:276
- lex.act = 138;
+//line lyx/lexer.rl:277
+ lex.act = 139;
 	goto st20
 tr124:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:272
- lex.act = 136;
+//line lyx/lexer.rl:273
+ lex.act = 137;
 	goto st20
 tr127:
 //line NONE:1
@@ -2522,8 +2529,8 @@ tr133:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:260
- lex.act = 125;
+//line lyx/lexer.rl:261
+ lex.act = 126;
 	goto st20
 tr138:
 //line NONE:1
@@ -2536,15 +2543,15 @@ tr143:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:245
- lex.act = 116;
+//line lyx/lexer.rl:246
+ lex.act = 117;
 	goto st20
 tr152:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:297
- lex.act = 157;
+//line lyx/lexer.rl:298
+ lex.act = 158;
 	goto st20
 tr153:
 //line NONE:1
@@ -2557,36 +2564,36 @@ tr168:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:213
- lex.act = 93;
+//line lyx/lexer.rl:214
+ lex.act = 94;
 	goto st20
 tr173:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:253
- lex.act = 121;
+//line lyx/lexer.rl:254
+ lex.act = 122;
 	goto st20
 tr183:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:218
- lex.act = 97;
+//line lyx/lexer.rl:219
+ lex.act = 98;
 	goto st20
 tr188:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:302
- lex.act = 161;
+//line lyx/lexer.rl:303
+ lex.act = 162;
 	goto st20
 tr189:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:188
- lex.act = 72;
+//line lyx/lexer.rl:189
+ lex.act = 73;
 	goto st20
 tr194:
 //line NONE:1
@@ -2599,22 +2606,22 @@ tr196:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:228
- lex.act = 102;
+//line lyx/lexer.rl:229
+ lex.act = 103;
 	goto st20
 tr197:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:263
- lex.act = 128;
+//line lyx/lexer.rl:264
+ lex.act = 129;
 	goto st20
 tr200:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:244
- lex.act = 115;
+//line lyx/lexer.rl:245
+ lex.act = 116;
 	goto st20
 tr207:
 //line NONE:1
@@ -2648,15 +2655,15 @@ tr235:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:186
- lex.act = 71;
+//line lyx/lexer.rl:187
+ lex.act = 72;
 	goto st20
 tr241:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:283
- lex.act = 145;
+//line lyx/lexer.rl:284
+ lex.act = 146;
 	goto st20
 tr245:
 //line NONE:1
@@ -2669,29 +2676,29 @@ tr252:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:261
- lex.act = 126;
+//line lyx/lexer.rl:262
+ lex.act = 127;
 	goto st20
 tr254:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:246
- lex.act = 117;
+//line lyx/lexer.rl:247
+ lex.act = 118;
 	goto st20
 tr255:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:211
- lex.act = 92;
+//line lyx/lexer.rl:212
+ lex.act = 93;
 	goto st20
 tr261:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:193
- lex.act = 76;
+//line lyx/lexer.rl:194
+ lex.act = 77;
 	goto st20
 tr266:
 //line NONE:1
@@ -2704,43 +2711,43 @@ tr268:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:273
- lex.act = 137;
+//line lyx/lexer.rl:274
+ lex.act = 138;
 	goto st20
 tr274:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:277
- lex.act = 139;
+//line lyx/lexer.rl:278
+ lex.act = 140;
 	goto st20
 tr276:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:278
- lex.act = 140;
+//line lyx/lexer.rl:279
+ lex.act = 141;
 	goto st20
 tr281:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:267
- lex.act = 132;
+//line lyx/lexer.rl:268
+ lex.act = 133;
 	goto st20
 tr285:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:266
- lex.act = 131;
+//line lyx/lexer.rl:267
+ lex.act = 132;
 	goto st20
 tr292:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:308
- lex.act = 166;
+//line lyx/lexer.rl:309
+ lex.act = 167;
 	goto st20
 tr296:
 //line NONE:1
@@ -2753,29 +2760,29 @@ tr299:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:224
- lex.act = 100;
+//line lyx/lexer.rl:225
+ lex.act = 101;
 	goto st20
 tr303:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:183
- lex.act = 69;
+//line lyx/lexer.rl:184
+ lex.act = 70;
 	goto st20
 tr312:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:206
- lex.act = 88;
+//line lyx/lexer.rl:207
+ lex.act = 89;
 	goto st20
 tr315:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:208
- lex.act = 89;
+//line lyx/lexer.rl:209
+ lex.act = 90;
 	goto st20
 tr318:
 //line NONE:1
@@ -2795,36 +2802,36 @@ tr326:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:173
- lex.act = 60;
+//line lyx/lexer.rl:174
+ lex.act = 61;
 	goto st20
 tr328:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:231
- lex.act = 105;
+//line lyx/lexer.rl:232
+ lex.act = 106;
 	goto st20
 tr332:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:176
- lex.act = 63;
+//line lyx/lexer.rl:177
+ lex.act = 64;
 	goto st20
 tr339:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:178
- lex.act = 65;
+//line lyx/lexer.rl:179
+ lex.act = 66;
 	goto st20
 tr343:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:264
- lex.act = 129;
+//line lyx/lexer.rl:265
+ lex.act = 130;
 	goto st20
 tr345:
 //line NONE:1
@@ -2844,15 +2851,15 @@ tr355:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:258
- lex.act = 124;
+//line lyx/lexer.rl:259
+ lex.act = 125;
 	goto st20
 tr357:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:233
- lex.act = 107;
+//line lyx/lexer.rl:234
+ lex.act = 108;
 	goto st20
 tr360:
 //line NONE:1
@@ -2879,8 +2886,8 @@ tr372:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:309
- lex.act = 167;
+//line lyx/lexer.rl:310
+ lex.act = 168;
 	goto st20
 tr374:
 //line NONE:1
@@ -2893,22 +2900,22 @@ tr380:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:197
- lex.act = 79;
+//line lyx/lexer.rl:198
+ lex.act = 80;
 	goto st20
 tr386:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:215
- lex.act = 95;
+//line lyx/lexer.rl:216
+ lex.act = 96;
 	goto st20
 tr389:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:227
- lex.act = 101;
+//line lyx/lexer.rl:228
+ lex.act = 102;
 	goto st20
 tr391:
 //line NONE:1
@@ -2921,50 +2928,50 @@ tr398:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:209
- lex.act = 90;
+//line lyx/lexer.rl:210
+ lex.act = 91;
 	goto st20
 tr402:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:202
- lex.act = 84;
+//line lyx/lexer.rl:203
+ lex.act = 85;
 	goto st20
 tr405:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:229
- lex.act = 103;
+//line lyx/lexer.rl:230
+ lex.act = 104;
 	goto st20
 tr407:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:216
- lex.act = 96;
+//line lyx/lexer.rl:217
+ lex.act = 97;
 	goto st20
 tr410:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:194
- lex.act = 77;
+//line lyx/lexer.rl:195
+ lex.act = 78;
 	goto st20
 tr412:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:192
- lex.act = 75;
+//line lyx/lexer.rl:193
+ lex.act = 76;
 	goto st20
 tr416:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:239
- lex.act = 111;
+//line lyx/lexer.rl:240
+ lex.act = 112;
 	goto st20
 tr422:
 //line NONE:1
@@ -2998,22 +3005,22 @@ tr445:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:304
- lex.act = 163;
+//line lyx/lexer.rl:305
+ lex.act = 164;
 	goto st20
 tr448:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:201
- lex.act = 83;
+//line lyx/lexer.rl:202
+ lex.act = 84;
 	goto st20
 tr453:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:199
- lex.act = 81;
+//line lyx/lexer.rl:200
+ lex.act = 82;
 	goto st20
 tr457:
 //line NONE:1
@@ -3033,36 +3040,36 @@ tr464:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:281
- lex.act = 143;
+//line lyx/lexer.rl:282
+ lex.act = 144;
 	goto st20
 tr469:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:175
- lex.act = 62;
+//line lyx/lexer.rl:176
+ lex.act = 63;
 	goto st20
 tr475:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:203
- lex.act = 85;
+//line lyx/lexer.rl:204
+ lex.act = 86;
 	goto st20
 tr478:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:232
- lex.act = 106;
+//line lyx/lexer.rl:233
+ lex.act = 107;
 	goto st20
 tr487:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:312
- lex.act = 169;
+//line lyx/lexer.rl:313
+ lex.act = 170;
 	goto st20
 tr494:
 //line NONE:1
@@ -3082,318 +3089,325 @@ tr502:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:268
- lex.act = 133;
+//line lyx/lexer.rl:269
+ lex.act = 134;
 	goto st20
 tr506:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:265
- lex.act = 130;
+//line lyx/lexer.rl:266
+ lex.act = 131;
 	goto st20
-tr515:
+tr516:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:280
- lex.act = 142;
+//line lyx/lexer.rl:281
+ lex.act = 143;
 	goto st20
-tr516:
+tr517:
 //line NONE:1
  lex.te = ( lex.p)+1
 
 //line lyx/lexer.rl:118
  lex.act = 14;
 	goto st20
-tr522:
+tr523:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:242
- lex.act = 113;
+//line lyx/lexer.rl:243
+ lex.act = 114;
 	goto st20
-tr529:
+tr530:
 //line NONE:1
  lex.te = ( lex.p)+1
 
 //line lyx/lexer.rl:169
  lex.act = 56;
 	goto st20
-tr536:
+tr537:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:288
- lex.act = 150;
+//line lyx/lexer.rl:289
+ lex.act = 151;
 	goto st20
-tr542:
+tr539:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:185
- lex.act = 70;
+//line lyx/lexer.rl:172
+ lex.act = 59;
 	goto st20
 tr545:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:230
- lex.act = 104;
+//line lyx/lexer.rl:186
+ lex.act = 71;
 	goto st20
-tr547:
+tr548:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:223
- lex.act = 99;
+//line lyx/lexer.rl:231
+ lex.act = 105;
 	goto st20
-tr548:
+tr550:
+//line NONE:1
+ lex.te = ( lex.p)+1
+
+//line lyx/lexer.rl:224
+ lex.act = 100;
+	goto st20
+tr551:
 //line NONE:1
  lex.te = ( lex.p)+1
 
 //line lyx/lexer.rl:166
  lex.act = 53;
 	goto st20
-tr553:
+tr556:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:294
- lex.act = 155;
+//line lyx/lexer.rl:295
+ lex.act = 156;
 	goto st20
-tr563:
+tr566:
 //line NONE:1
  lex.te = ( lex.p)+1
 
 //line lyx/lexer.rl:164
  lex.act = 51;
 	goto st20
-tr572:
+tr575:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:243
- lex.act = 114;
+//line lyx/lexer.rl:244
+ lex.act = 115;
 	goto st20
-tr575:
+tr578:
 //line NONE:1
  lex.te = ( lex.p)+1
 
 //line lyx/lexer.rl:134
  lex.act = 28;
 	goto st20
-tr578:
+tr581:
 //line NONE:1
  lex.te = ( lex.p)+1
 
 //line lyx/lexer.rl:155
  lex.act = 42;
 	goto st20
-tr587:
+tr590:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:289
- lex.act = 151;
+//line lyx/lexer.rl:290
+ lex.act = 152;
 	goto st20
-tr591:
+tr594:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:214
- lex.act = 94;
+//line lyx/lexer.rl:215
+ lex.act = 95;
 	goto st20
-tr594:
+tr597:
 //line NONE:1
  lex.te = ( lex.p)+1
 
 //line lyx/lexer.rl:113
  lex.act = 9;
 	goto st20
-tr598:
+tr601:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:248
- lex.act = 118;
+//line lyx/lexer.rl:249
+ lex.act = 119;
 	goto st20
-tr599:
+tr602:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:172
- lex.act = 59;
+//line lyx/lexer.rl:173
+ lex.act = 60;
 	goto st20
-tr601:
+tr604:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:240
- lex.act = 112;
+//line lyx/lexer.rl:241
+ lex.act = 113;
 	goto st20
-tr607:
+tr610:
 //line NONE:1
  lex.te = ( lex.p)+1
 
 //line lyx/lexer.rl:116
  lex.act = 12;
 	goto st20
-tr611:
+tr614:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:291
- lex.act = 152;
+//line lyx/lexer.rl:292
+ lex.act = 153;
 	goto st20
-tr614:
+tr617:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:269
- lex.act = 134;
+//line lyx/lexer.rl:270
+ lex.act = 135;
 	goto st20
-tr616:
+tr619:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:190
- lex.act = 74;
+//line lyx/lexer.rl:191
+ lex.act = 75;
 	goto st20
-tr620:
+tr623:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:189
- lex.act = 73;
+//line lyx/lexer.rl:190
+ lex.act = 74;
 	goto st20
-tr624:
+tr627:
 //line NONE:1
  lex.te = ( lex.p)+1
 
 //line lyx/lexer.rl:163
  lex.act = 50;
 	goto st20
-tr626:
+tr629:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:299
- lex.act = 159;
+//line lyx/lexer.rl:300
+ lex.act = 160;
 	goto st20
-tr628:
+tr631:
 //line NONE:1
  lex.te = ( lex.p)+1
 
 //line lyx/lexer.rl:145
  lex.act = 35;
 	goto st20
-tr638:
+tr641:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:279
- lex.act = 141;
+//line lyx/lexer.rl:280
+ lex.act = 142;
 	goto st20
-tr639:
+tr642:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:205
- lex.act = 87;
+//line lyx/lexer.rl:206
+ lex.act = 88;
 	goto st20
-tr644:
+tr647:
 //line NONE:1
  lex.te = ( lex.p)+1
 
 //line lyx/lexer.rl:162
  lex.act = 49;
 	goto st20
-tr657:
+tr660:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:286
- lex.act = 148;
+//line lyx/lexer.rl:287
+ lex.act = 149;
 	goto st20
-tr659:
+tr662:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:307
- lex.act = 165;
+//line lyx/lexer.rl:308
+ lex.act = 166;
 	goto st20
-tr663:
+tr666:
 //line NONE:1
  lex.te = ( lex.p)+1
 
 //line lyx/lexer.rl:159
  lex.act = 46;
 	goto st20
-tr666:
+tr669:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:250
- lex.act = 119;
+//line lyx/lexer.rl:251
+ lex.act = 120;
 	goto st20
-tr673:
+tr676:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:252
- lex.act = 120;
+//line lyx/lexer.rl:253
+ lex.act = 121;
 	goto st20
-tr676:
+tr679:
 //line NONE:1
  lex.te = ( lex.p)+1
 
 //line lyx/lexer.rl:158
  lex.act = 45;
 	goto st20
-tr680:
+tr683:
 //line NONE:1
  lex.te = ( lex.p)+1
 
 //line lyx/lexer.rl:139
  lex.act = 31;
 	goto st20
-tr685:
+tr688:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:298
- lex.act = 158;
+//line lyx/lexer.rl:299
+ lex.act = 159;
 	goto st20
-tr687:
+tr690:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:174
- lex.act = 61;
+//line lyx/lexer.rl:175
+ lex.act = 62;
 	goto st20
-tr693:
+tr696:
 //line NONE:1
  lex.te = ( lex.p)+1
 
 //line lyx/lexer.rl:144
  lex.act = 34;
 	goto st20
-tr696:
+tr699:
 //line NONE:1
  lex.te = ( lex.p)+1
 
-//line lyx/lexer.rl:282
- lex.act = 144;
+//line lyx/lexer.rl:283
+ lex.act = 145;
 	goto st20
-tr699:
+tr702:
 //line NONE:1
  lex.te = ( lex.p)+1
 
 //line lyx/lexer.rl:129
  lex.act = 23;
 	goto st20
-tr702:
+tr705:
 //line NONE:1
  lex.te = ( lex.p)+1
 
@@ -3405,7 +3419,7 @@ tr702:
 			goto _test_eof20
 		}
 	st_case_20:
-//line lyx/lexer.go:3409
+//line lyx/lexer.go:3423
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
@@ -13171,17 +13185,17 @@ tr702:
 		case 69:
 			goto st359
 		case 73:
-			goto st387
+			goto st389
 		case 79:
-			goto st390
+			goto st392
 		case 95:
 			goto tr55
 		case 101:
 			goto st359
 		case 105:
-			goto st387
+			goto st389
 		case 111:
-			goto st390
+			goto st392
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -13212,8 +13226,10 @@ tr702:
 			goto st367
 		case 80:
 			goto st374
-		case 84:
+		case 83:
 			goto st381
+		case 84:
+			goto st383
 		case 95:
 			goto tr55
 		case 97:
@@ -13224,8 +13240,10 @@ tr702:
 			goto st367
 		case 112:
 			goto st374
-		case 116:
+		case 115:
 			goto st381
+		case 116:
+			goto st383
 		}
 		switch {
 		case  lex.data[( lex.p)] < 66:
@@ -13249,15 +13267,15 @@ tr702:
 		case 36:
 			goto tr55
 		case 68:
-			goto tr515
-		case 76:
 			goto tr516
+		case 76:
+			goto tr517
 		case 95:
 			goto tr55
 		case 100:
-			goto tr515
-		case 108:
 			goto tr516
+		case 108:
+			goto tr517
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -13421,11 +13439,11 @@ tr702:
 		case 36:
 			goto tr55
 		case 69:
-			goto tr522
+			goto tr523
 		case 95:
 			goto tr55
 		case 101:
-			goto tr522
+			goto tr523
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -13617,11 +13635,11 @@ tr702:
 		case 36:
 			goto tr55
 		case 83:
-			goto tr529
+			goto tr530
 		case 95:
 			goto tr55
 		case 115:
-			goto tr529
+			goto tr530
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -13813,11 +13831,11 @@ tr702:
 		case 36:
 			goto tr55
 		case 69:
-			goto tr536
+			goto tr537
 		case 95:
 			goto tr55
 		case 101:
-			goto tr536
+			goto tr537
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -13840,11 +13858,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 85:
+		case 69:
 			goto st382
 		case 95:
 			goto tr55
-		case 117:
+		case 101:
 			goto st382
 		}
 		switch {
@@ -13868,12 +13886,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 82:
-			goto st383
+		case 84:
+			goto tr539
 		case 95:
 			goto tr55
-		case 114:
-			goto st383
+		case 116:
+			goto tr539
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -13896,11 +13914,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 78:
+		case 85:
 			goto st384
 		case 95:
 			goto tr55
-		case 110:
+		case 117:
 			goto st384
 		}
 		switch {
@@ -13924,11 +13942,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 73:
+		case 82:
 			goto st385
 		case 95:
 			goto tr55
-		case 105:
+		case 114:
 			goto st385
 		}
 		switch {
@@ -13980,12 +13998,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 71:
-			goto tr542
+		case 73:
+			goto st387
 		case 95:
 			goto tr55
-		case 103:
-			goto tr542
+		case 105:
+			goto st387
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -14008,11 +14026,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 71:
+		case 78:
 			goto st388
 		case 95:
 			goto tr55
-		case 103:
+		case 110:
 			goto st388
 		}
 		switch {
@@ -14036,12 +14054,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 72:
-			goto st389
+		case 71:
+			goto tr545
 		case 95:
 			goto tr55
-		case 104:
-			goto st389
+		case 103:
+			goto tr545
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -14064,12 +14082,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 84:
-			goto tr545
+		case 71:
+			goto st390
 		case 95:
 			goto tr55
-		case 116:
-			goto tr545
+		case 103:
+			goto st390
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -14092,16 +14110,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 76:
+		case 72:
 			goto st391
-		case 87:
-			goto tr547
 		case 95:
 			goto tr55
-		case 108:
+		case 104:
 			goto st391
-		case 119:
-			goto tr547
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -14124,16 +14138,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 69:
+		case 84:
 			goto tr548
-		case 76:
-			goto st392
 		case 95:
 			goto tr55
-		case 101:
+		case 116:
 			goto tr548
-		case 108:
-			goto st392
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -14156,12 +14166,16 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 66:
+		case 76:
 			goto st393
+		case 87:
+			goto tr550
 		case 95:
 			goto tr55
-		case 98:
+		case 108:
 			goto st393
+		case 119:
+			goto tr550
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -14184,20 +14198,24 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 65:
+		case 69:
+			goto tr551
+		case 76:
 			goto st394
 		case 95:
 			goto tr55
-		case 97:
+		case 101:
+			goto tr551
+		case 108:
 			goto st394
 		}
 		switch {
-		case  lex.data[( lex.p)] < 66:
+		case  lex.data[( lex.p)] < 65:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -14212,11 +14230,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 67:
+		case 66:
 			goto st395
 		case 95:
 			goto tr55
-		case 99:
+		case 98:
 			goto st395
 		}
 		switch {
@@ -14240,20 +14258,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 75:
-			goto tr553
+		case 65:
+			goto st396
 		case 95:
 			goto tr55
-		case 107:
-			goto tr553
+		case 97:
+			goto st396
 		}
 		switch {
-		case  lex.data[( lex.p)] < 65:
+		case  lex.data[( lex.p)] < 66:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -14270,30 +14288,10 @@ tr702:
 			goto tr55
 		case 67:
 			goto st397
-		case 69:
-			goto st401
-		case 72:
-			goto st426
-		case 75:
-			goto st430
-		case 77:
-			goto st432
-		case 84:
-			goto st438
 		case 95:
 			goto tr55
 		case 99:
 			goto st397
-		case 101:
-			goto st401
-		case 104:
-			goto st426
-		case 107:
-			goto st430
-		case 109:
-			goto st432
-		case 116:
-			goto st438
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -14316,12 +14314,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 72:
-			goto st398
+		case 75:
+			goto tr556
 		case 95:
 			goto tr55
-		case 104:
-			goto st398
+		case 107:
+			goto tr556
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -14344,12 +14342,32 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 69:
+		case 67:
 			goto st399
+		case 69:
+			goto st403
+		case 72:
+			goto st428
+		case 75:
+			goto st432
+		case 77:
+			goto st434
+		case 84:
+			goto st440
 		case 95:
 			goto tr55
-		case 101:
+		case 99:
 			goto st399
+		case 101:
+			goto st403
+		case 104:
+			goto st428
+		case 107:
+			goto st432
+		case 109:
+			goto st434
+		case 116:
+			goto st440
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -14372,11 +14390,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 77:
+		case 72:
 			goto st400
 		case 95:
 			goto tr55
-		case 109:
+		case 104:
 			goto st400
 		}
 		switch {
@@ -14400,20 +14418,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 65:
-			goto tr563
+		case 69:
+			goto st401
 		case 95:
 			goto tr55
-		case 97:
-			goto tr563
+		case 101:
+			goto st401
 		}
 		switch {
-		case  lex.data[( lex.p)] < 66:
+		case  lex.data[( lex.p)] < 65:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -14428,40 +14446,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 65:
+		case 77:
 			goto st402
-		case 67:
-			goto st405
-		case 76:
-			goto st408
-		case 82:
-			goto st411
-		case 83:
-			goto st420
-		case 84:
-			goto st424
 		case 95:
 			goto tr55
-		case 97:
+		case 109:
 			goto st402
-		case 99:
-			goto st405
-		case 108:
-			goto st408
-		case 114:
-			goto st411
-		case 115:
-			goto st420
-		case 116:
-			goto st424
 		}
 		switch {
-		case  lex.data[( lex.p)] < 66:
+		case  lex.data[( lex.p)] < 65:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -14476,20 +14474,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 82:
-			goto st403
+		case 65:
+			goto tr566
 		case 95:
 			goto tr55
-		case 114:
-			goto st403
+		case 97:
+			goto tr566
 		}
 		switch {
-		case  lex.data[( lex.p)] < 65:
+		case  lex.data[( lex.p)] < 66:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -14504,20 +14502,40 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 67:
+		case 65:
 			goto st404
+		case 67:
+			goto st407
+		case 76:
+			goto st410
+		case 82:
+			goto st413
+		case 83:
+			goto st422
+		case 84:
+			goto st426
 		case 95:
 			goto tr55
-		case 99:
+		case 97:
 			goto st404
+		case 99:
+			goto st407
+		case 108:
+			goto st410
+		case 114:
+			goto st413
+		case 115:
+			goto st422
+		case 116:
+			goto st426
 		}
 		switch {
-		case  lex.data[( lex.p)] < 65:
+		case  lex.data[( lex.p)] < 66:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -14532,12 +14550,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 72:
-			goto tr572
+		case 82:
+			goto st405
 		case 95:
 			goto tr55
-		case 104:
-			goto tr572
+		case 114:
+			goto st405
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -14560,11 +14578,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 79:
+		case 67:
 			goto st406
 		case 95:
 			goto tr55
-		case 111:
+		case 99:
 			goto st406
 		}
 		switch {
@@ -14588,12 +14606,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 78:
-			goto st407
+		case 72:
+			goto tr575
 		case 95:
 			goto tr55
-		case 110:
-			goto st407
+		case 104:
+			goto tr575
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -14616,12 +14634,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 68:
-			goto tr575
+		case 79:
+			goto st408
 		case 95:
 			goto tr55
-		case 100:
-			goto tr575
+		case 111:
+			goto st408
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -14644,11 +14662,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 69:
+		case 78:
 			goto st409
 		case 95:
 			goto tr55
-		case 101:
+		case 110:
 			goto st409
 		}
 		switch {
@@ -14672,12 +14690,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 67:
-			goto st410
+		case 68:
+			goto tr578
 		case 95:
 			goto tr55
-		case 99:
-			goto st410
+		case 100:
+			goto tr578
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -14700,12 +14718,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 84:
-			goto tr578
+		case 69:
+			goto st411
 		case 95:
 			goto tr55
-		case 116:
-			goto tr578
+		case 101:
+			goto st411
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -14728,11 +14746,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 73:
+		case 67:
 			goto st412
 		case 95:
 			goto tr55
-		case 105:
+		case 99:
 			goto st412
 		}
 		switch {
@@ -14756,20 +14774,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 65:
-			goto st413
+		case 84:
+			goto tr581
 		case 95:
 			goto tr55
-		case 97:
-			goto st413
+		case 116:
+			goto tr581
 		}
 		switch {
-		case  lex.data[( lex.p)] < 66:
+		case  lex.data[( lex.p)] < 65:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -14784,11 +14802,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 76:
+		case 73:
 			goto st414
 		case 95:
 			goto tr55
-		case 108:
+		case 105:
 			goto st414
 		}
 		switch {
@@ -14812,20 +14830,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 73:
+		case 65:
 			goto st415
 		case 95:
 			goto tr55
-		case 105:
+		case 97:
 			goto st415
 		}
 		switch {
-		case  lex.data[( lex.p)] < 65:
+		case  lex.data[( lex.p)] < 66:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -14840,11 +14858,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 90:
+		case 76:
 			goto st416
 		case 95:
 			goto tr55
-		case 122:
+		case 108:
 			goto st416
 		}
 		switch {
@@ -14852,8 +14870,8 @@ tr702:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
-		case  lex.data[( lex.p)] > 89:
-			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 121 {
+		case  lex.data[( lex.p)] > 90:
+			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -14868,20 +14886,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 65:
+		case 73:
 			goto st417
 		case 95:
 			goto tr55
-		case 97:
+		case 105:
 			goto st417
 		}
 		switch {
-		case  lex.data[( lex.p)] < 66:
+		case  lex.data[( lex.p)] < 65:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -14896,11 +14914,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 66:
+		case 90:
 			goto st418
 		case 95:
 			goto tr55
-		case 98:
+		case 122:
 			goto st418
 		}
 		switch {
@@ -14908,8 +14926,8 @@ tr702:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
-		case  lex.data[( lex.p)] > 90:
-			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+		case  lex.data[( lex.p)] > 89:
+			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 121 {
 				goto tr55
 			}
 		default:
@@ -14924,20 +14942,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 76:
+		case 65:
 			goto st419
 		case 95:
 			goto tr55
-		case 108:
+		case 97:
 			goto st419
 		}
 		switch {
-		case  lex.data[( lex.p)] < 65:
+		case  lex.data[( lex.p)] < 66:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -14952,12 +14970,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 69:
-			goto tr587
+		case 66:
+			goto st420
 		case 95:
 			goto tr55
-		case 101:
-			goto tr587
+		case 98:
+			goto st420
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -14980,11 +14998,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 83:
+		case 76:
 			goto st421
 		case 95:
 			goto tr55
-		case 115:
+		case 108:
 			goto st421
 		}
 		switch {
@@ -15008,12 +15026,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 73:
-			goto st422
+		case 69:
+			goto tr590
 		case 95:
 			goto tr55
-		case 105:
-			goto st422
+		case 101:
+			goto tr590
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -15036,11 +15054,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 79:
+		case 83:
 			goto st423
 		case 95:
 			goto tr55
-		case 111:
+		case 115:
 			goto st423
 		}
 		switch {
@@ -15064,12 +15082,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 78:
-			goto tr591
+		case 73:
+			goto st424
 		case 95:
 			goto tr55
-		case 110:
-			goto tr591
+		case 105:
+			goto st424
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -15111,7 +15129,7 @@ tr702:
 		default:
 			goto tr55
 		}
-		goto tr592
+		goto tr80
 	st425:
 		if ( lex.p)++; ( lex.p) == ( lex.pe) {
 			goto _test_eof425
@@ -15120,11 +15138,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 70:
+		case 78:
 			goto tr594
 		case 95:
 			goto tr55
-		case 102:
+		case 110:
 			goto tr594
 		}
 		switch {
@@ -15148,30 +15166,26 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 65:
-			goto st427
 		case 79:
-			goto st429
+			goto st427
 		case 95:
 			goto tr55
-		case 97:
-			goto st427
 		case 111:
-			goto st429
+			goto st427
 		}
 		switch {
-		case  lex.data[( lex.p)] < 66:
+		case  lex.data[( lex.p)] < 65:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
 			goto tr55
 		}
-		goto tr80
+		goto tr595
 	st427:
 		if ( lex.p)++; ( lex.p) == ( lex.pe) {
 			goto _test_eof427
@@ -15180,12 +15194,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 82:
-			goto st428
+		case 70:
+			goto tr597
 		case 95:
 			goto tr55
-		case 114:
-			goto st428
+		case 102:
+			goto tr597
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -15208,20 +15222,24 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 69:
-			goto tr598
+		case 65:
+			goto st429
+		case 79:
+			goto st431
 		case 95:
 			goto tr55
-		case 101:
-			goto tr598
+		case 97:
+			goto st429
+		case 111:
+			goto st431
 		}
 		switch {
-		case  lex.data[( lex.p)] < 65:
+		case  lex.data[( lex.p)] < 66:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -15236,12 +15254,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 87:
-			goto tr599
+		case 82:
+			goto st430
 		case 95:
 			goto tr55
-		case 119:
-			goto tr599
+		case 114:
+			goto st430
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -15264,12 +15282,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 73:
-			goto st431
+		case 69:
+			goto tr601
 		case 95:
 			goto tr55
-		case 105:
-			goto st431
+		case 101:
+			goto tr601
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -15292,12 +15310,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 80:
-			goto tr601
+		case 87:
+			goto tr602
 		case 95:
 			goto tr55
-		case 112:
-			goto tr601
+		case 119:
+			goto tr602
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -15320,20 +15338,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 65:
+		case 73:
 			goto st433
 		case 95:
 			goto tr55
-		case 97:
+		case 105:
 			goto st433
 		}
 		switch {
-		case  lex.data[( lex.p)] < 66:
+		case  lex.data[( lex.p)] < 65:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -15348,12 +15366,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 76:
-			goto st434
+		case 80:
+			goto tr604
 		case 95:
 			goto tr55
-		case 108:
-			goto st434
+		case 112:
+			goto tr604
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -15376,20 +15394,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 76:
+		case 65:
 			goto st435
 		case 95:
 			goto tr55
-		case 108:
+		case 97:
 			goto st435
 		}
 		switch {
-		case  lex.data[( lex.p)] < 65:
+		case  lex.data[( lex.p)] < 66:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -15404,11 +15422,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 73:
+		case 76:
 			goto st436
 		case 95:
 			goto tr55
-		case 105:
+		case 108:
 			goto st436
 		}
 		switch {
@@ -15432,11 +15450,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 78:
+		case 76:
 			goto st437
 		case 95:
 			goto tr55
-		case 110:
+		case 108:
 			goto st437
 		}
 		switch {
@@ -15460,12 +15478,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 84:
-			goto tr607
+		case 73:
+			goto st438
 		case 95:
 			goto tr55
-		case 116:
-			goto tr607
+		case 105:
+			goto st438
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -15488,24 +15506,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 65:
+		case 78:
 			goto st439
-		case 68:
-			goto st441
 		case 95:
 			goto tr55
-		case 97:
+		case 110:
 			goto st439
-		case 100:
-			goto st441
 		}
 		switch {
-		case  lex.data[( lex.p)] < 66:
+		case  lex.data[( lex.p)] < 65:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -15520,12 +15534,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 82:
-			goto st440
+		case 84:
+			goto tr610
 		case 95:
 			goto tr55
-		case 114:
-			goto st440
+		case 116:
+			goto tr610
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -15548,20 +15562,24 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 84:
-			goto tr611
+		case 65:
+			goto st441
+		case 68:
+			goto st443
 		case 95:
 			goto tr55
-		case 116:
-			goto tr611
+		case 97:
+			goto st441
+		case 100:
+			goto st443
 		}
 		switch {
-		case  lex.data[( lex.p)] < 65:
+		case  lex.data[( lex.p)] < 66:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -15576,16 +15594,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 73:
+		case 82:
 			goto st442
-		case 79:
-			goto st443
 		case 95:
 			goto tr55
-		case 105:
+		case 114:
 			goto st442
-		case 111:
-			goto st443
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -15608,11 +15622,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 78:
+		case 84:
 			goto tr614
 		case 95:
 			goto tr55
-		case 110:
+		case 116:
 			goto tr614
 		}
 		switch {
@@ -15636,12 +15650,16 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 85:
+		case 73:
 			goto st444
+		case 79:
+			goto st445
 		case 95:
 			goto tr55
-		case 117:
+		case 105:
 			goto st444
+		case 111:
+			goto st445
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -15664,12 +15682,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 84:
-			goto tr616
+		case 78:
+			goto tr617
 		case 95:
 			goto tr55
-		case 116:
-			goto tr616
+		case 110:
+			goto tr617
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -15692,36 +15710,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 65:
+		case 85:
 			goto st446
-		case 72:
-			goto st449
-		case 73:
-			goto st451
-		case 79:
-			goto tr620
-		case 82:
-			goto st453
 		case 95:
 			goto tr55
-		case 97:
+		case 117:
 			goto st446
-		case 104:
-			goto st449
-		case 105:
-			goto st451
-		case 111:
-			goto tr620
-		case 114:
-			goto st453
 		}
 		switch {
-		case  lex.data[( lex.p)] < 66:
+		case  lex.data[( lex.p)] < 65:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -15736,12 +15738,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 66:
-			goto st447
+		case 84:
+			goto tr619
 		case 95:
 			goto tr55
-		case 98:
-			goto st447
+		case 116:
+			goto tr619
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -15764,20 +15766,36 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 76:
+		case 65:
 			goto st448
+		case 72:
+			goto st451
+		case 73:
+			goto st453
+		case 79:
+			goto tr623
+		case 82:
+			goto st455
 		case 95:
 			goto tr55
-		case 108:
+		case 97:
 			goto st448
+		case 104:
+			goto st451
+		case 105:
+			goto st453
+		case 111:
+			goto tr623
+		case 114:
+			goto st455
 		}
 		switch {
-		case  lex.data[( lex.p)] < 65:
+		case  lex.data[( lex.p)] < 66:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -15792,12 +15810,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 69:
-			goto tr624
+		case 66:
+			goto st449
 		case 95:
 			goto tr55
-		case 101:
-			goto tr624
+		case 98:
+			goto st449
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -15820,11 +15838,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 69:
+		case 76:
 			goto st450
 		case 95:
 			goto tr55
-		case 101:
+		case 108:
 			goto st450
 		}
 		switch {
@@ -15848,12 +15866,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 78:
-			goto tr626
+		case 69:
+			goto tr627
 		case 95:
 			goto tr55
-		case 110:
-			goto tr626
+		case 101:
+			goto tr627
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -15876,11 +15894,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 77:
+		case 69:
 			goto st452
 		case 95:
 			goto tr55
-		case 109:
+		case 101:
 			goto st452
 		}
 		switch {
@@ -15904,12 +15922,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 69:
-			goto tr628
+		case 78:
+			goto tr629
 		case 95:
 			goto tr55
-		case 101:
-			goto tr628
+		case 110:
+			goto tr629
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -15932,24 +15950,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 65:
+		case 77:
 			goto st454
-		case 85:
-			goto st462
 		case 95:
 			goto tr55
-		case 97:
+		case 109:
 			goto st454
-		case 117:
-			goto st462
 		}
 		switch {
-		case  lex.data[( lex.p)] < 66:
+		case  lex.data[( lex.p)] < 65:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -15964,12 +15978,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 78:
-			goto st455
+		case 69:
+			goto tr631
 		case 95:
 			goto tr55
-		case 110:
-			goto st455
+		case 101:
+			goto tr631
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -15992,20 +16006,24 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 83:
+		case 65:
 			goto st456
+		case 85:
+			goto st464
 		case 95:
 			goto tr55
-		case 115:
+		case 97:
 			goto st456
+		case 117:
+			goto st464
 		}
 		switch {
-		case  lex.data[( lex.p)] < 65:
+		case  lex.data[( lex.p)] < 66:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -16020,20 +16038,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 65:
+		case 78:
 			goto st457
 		case 95:
 			goto tr55
-		case 97:
+		case 110:
 			goto st457
 		}
 		switch {
-		case  lex.data[( lex.p)] < 66:
+		case  lex.data[( lex.p)] < 65:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -16048,11 +16066,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 67:
+		case 83:
 			goto st458
 		case 95:
 			goto tr55
-		case 99:
+		case 115:
 			goto st458
 		}
 		switch {
@@ -16076,20 +16094,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 84:
+		case 65:
 			goto st459
 		case 95:
 			goto tr55
-		case 116:
+		case 97:
 			goto st459
 		}
 		switch {
-		case  lex.data[( lex.p)] < 65:
+		case  lex.data[( lex.p)] < 66:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -16104,11 +16122,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 73:
+		case 67:
 			goto st460
 		case 95:
 			goto tr55
-		case 105:
+		case 99:
 			goto st460
 		}
 		switch {
@@ -16132,11 +16150,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 79:
+		case 84:
 			goto st461
 		case 95:
 			goto tr55
-		case 111:
+		case 116:
 			goto st461
 		}
 		switch {
@@ -16160,12 +16178,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 78:
-			goto tr638
+		case 73:
+			goto st462
 		case 95:
 			goto tr55
-		case 110:
-			goto tr638
+		case 105:
+			goto st462
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -16188,15 +16206,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 69:
-			goto tr639
-		case 78:
+		case 79:
 			goto st463
 		case 95:
 			goto tr55
-		case 101:
-			goto tr639
-		case 110:
+		case 111:
 			goto st463
 		}
 		switch {
@@ -16220,12 +16234,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 67:
-			goto st464
+		case 78:
+			goto tr641
 		case 95:
 			goto tr55
-		case 99:
-			goto st464
+		case 110:
+			goto tr641
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -16248,20 +16262,24 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 65:
+		case 69:
+			goto tr642
+		case 78:
 			goto st465
 		case 95:
 			goto tr55
-		case 97:
+		case 101:
+			goto tr642
+		case 110:
 			goto st465
 		}
 		switch {
-		case  lex.data[( lex.p)] < 66:
+		case  lex.data[( lex.p)] < 65:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -16276,11 +16294,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 84:
+		case 67:
 			goto st466
 		case 95:
 			goto tr55
-		case 116:
+		case 99:
 			goto st466
 		}
 		switch {
@@ -16304,20 +16322,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 69:
-			goto tr644
+		case 65:
+			goto st467
 		case 95:
 			goto tr55
-		case 101:
-			goto tr644
+		case 97:
+			goto st467
 		}
 		switch {
-		case  lex.data[( lex.p)] < 65:
+		case  lex.data[( lex.p)] < 66:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -16332,20 +16350,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 78:
+		case 84:
 			goto st468
-		case 80:
-			goto st479
-		case 83:
-			goto st483
 		case 95:
 			goto tr55
-		case 110:
+		case 116:
 			goto st468
-		case 112:
-			goto st479
-		case 115:
-			goto st483
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -16368,16 +16378,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 67:
-			goto st469
-		case 73:
-			goto st477
+		case 69:
+			goto tr647
 		case 95:
 			goto tr55
-		case 99:
-			goto st469
-		case 105:
-			goto st477
+		case 101:
+			goto tr647
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -16400,12 +16406,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 79:
+		case 78:
 			goto st470
+		case 80:
+			goto st481
+		case 83:
+			goto st485
 		case 95:
 			goto tr55
-		case 111:
+		case 110:
 			goto st470
+		case 112:
+			goto st481
+		case 115:
+			goto st485
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -16428,12 +16442,16 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 77:
+		case 67:
 			goto st471
+		case 73:
+			goto st479
 		case 95:
 			goto tr55
-		case 109:
+		case 99:
 			goto st471
+		case 105:
+			goto st479
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -16456,11 +16474,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 77:
+		case 79:
 			goto st472
 		case 95:
 			goto tr55
-		case 109:
+		case 111:
 			goto st472
 		}
 		switch {
@@ -16484,11 +16502,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 73:
+		case 77:
 			goto st473
 		case 95:
 			goto tr55
-		case 105:
+		case 109:
 			goto st473
 		}
 		switch {
@@ -16512,11 +16530,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 84:
+		case 77:
 			goto st474
 		case 95:
 			goto tr55
-		case 116:
+		case 109:
 			goto st474
 		}
 		switch {
@@ -16540,11 +16558,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 84:
+		case 73:
 			goto st475
 		case 95:
 			goto tr55
-		case 116:
+		case 105:
 			goto st475
 		}
 		switch {
@@ -16568,11 +16586,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 69:
+		case 84:
 			goto st476
 		case 95:
 			goto tr55
-		case 101:
+		case 116:
 			goto st476
 		}
 		switch {
@@ -16596,12 +16614,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 68:
-			goto tr657
+		case 84:
+			goto st477
 		case 95:
 			goto tr55
-		case 100:
-			goto tr657
+		case 116:
+			goto st477
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -16624,11 +16642,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 79:
+		case 69:
 			goto st478
 		case 95:
 			goto tr55
-		case 111:
+		case 101:
 			goto st478
 		}
 		switch {
@@ -16652,12 +16670,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 78:
-			goto tr659
+		case 68:
+			goto tr660
 		case 95:
 			goto tr55
-		case 110:
-			goto tr659
+		case 100:
+			goto tr660
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -16680,11 +16698,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 68:
+		case 79:
 			goto st480
 		case 95:
 			goto tr55
-		case 100:
+		case 111:
 			goto st480
 		}
 		switch {
@@ -16708,20 +16726,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 65:
-			goto st481
+		case 78:
+			goto tr662
 		case 95:
 			goto tr55
-		case 97:
-			goto st481
+		case 110:
+			goto tr662
 		}
 		switch {
-		case  lex.data[( lex.p)] < 66:
+		case  lex.data[( lex.p)] < 65:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -16736,11 +16754,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 84:
+		case 68:
 			goto st482
 		case 95:
 			goto tr55
-		case 116:
+		case 100:
 			goto st482
 		}
 		switch {
@@ -16764,20 +16782,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 69:
-			goto tr663
+		case 65:
+			goto st483
 		case 95:
 			goto tr55
-		case 101:
-			goto tr663
+		case 97:
+			goto st483
 		}
 		switch {
-		case  lex.data[( lex.p)] < 65:
+		case  lex.data[( lex.p)] < 66:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -16792,11 +16810,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 73:
+		case 84:
 			goto st484
 		case 95:
 			goto tr55
-		case 105:
+		case 116:
 			goto st484
 		}
 		switch {
@@ -16820,12 +16838,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 78:
-			goto st485
+		case 69:
+			goto tr666
 		case 95:
 			goto tr55
-		case 110:
-			goto st485
+		case 101:
+			goto tr666
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -16848,12 +16866,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 71:
-			goto tr666
+		case 73:
+			goto st486
 		case 95:
 			goto tr55
-		case 103:
-			goto tr666
+		case 105:
+			goto st486
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -16876,20 +16894,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 65:
+		case 78:
 			goto st487
 		case 95:
 			goto tr55
-		case 97:
+		case 110:
 			goto st487
 		}
 		switch {
-		case  lex.data[( lex.p)] < 66:
+		case  lex.data[( lex.p)] < 65:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -16904,20 +16922,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 67:
-			goto st488
-		case 76:
-			goto st491
-		case 82:
-			goto st494
+		case 71:
+			goto tr669
 		case 95:
 			goto tr55
-		case 99:
-			goto st488
-		case 108:
-			goto st491
-		case 114:
-			goto st494
+		case 103:
+			goto tr669
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -16940,20 +16950,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 85:
+		case 65:
 			goto st489
 		case 95:
 			goto tr55
-		case 117:
+		case 97:
 			goto st489
 		}
 		switch {
-		case  lex.data[( lex.p)] < 65:
+		case  lex.data[( lex.p)] < 66:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -16968,12 +16978,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 85:
+		case 67:
 			goto st490
+		case 76:
+			goto st493
+		case 82:
+			goto st496
 		case 95:
 			goto tr55
-		case 117:
+		case 99:
 			goto st490
+		case 108:
+			goto st493
+		case 114:
+			goto st496
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -16996,12 +17014,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 77:
-			goto tr673
+		case 85:
+			goto st491
 		case 95:
 			goto tr55
-		case 109:
-			goto tr673
+		case 117:
+			goto st491
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -17052,12 +17070,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 69:
-			goto st493
+		case 77:
+			goto tr676
 		case 95:
 			goto tr55
-		case 101:
-			goto st493
+		case 109:
+			goto tr676
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -17080,12 +17098,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 83:
-			goto tr676
+		case 85:
+			goto st494
 		case 95:
 			goto tr55
-		case 115:
-			goto tr676
+		case 117:
+			goto st494
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -17108,11 +17126,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 67:
+		case 69:
 			goto st495
 		case 95:
 			goto tr55
-		case 99:
+		case 101:
 			goto st495
 		}
 		switch {
@@ -17136,12 +17154,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 72:
-			goto st496
+		case 83:
+			goto tr679
 		case 95:
 			goto tr55
-		case 104:
-			goto st496
+		case 115:
+			goto tr679
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -17164,20 +17182,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 65:
+		case 67:
 			goto st497
 		case 95:
 			goto tr55
-		case 97:
+		case 99:
 			goto st497
 		}
 		switch {
-		case  lex.data[( lex.p)] < 66:
+		case  lex.data[( lex.p)] < 65:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -17192,12 +17210,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 82:
-			goto tr680
+		case 72:
+			goto st498
 		case 95:
 			goto tr55
-		case 114:
-			goto tr680
+		case 104:
+			goto st498
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -17220,28 +17238,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 72:
+		case 65:
 			goto st499
-		case 73:
-			goto st502
-		case 82:
-			goto st507
 		case 95:
 			goto tr55
-		case 104:
+		case 97:
 			goto st499
-		case 105:
-			goto st502
-		case 114:
-			goto st507
 		}
 		switch {
-		case  lex.data[( lex.p)] < 65:
+		case  lex.data[( lex.p)] < 66:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -17256,12 +17266,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 69:
-			goto st500
+		case 82:
+			goto tr683
 		case 95:
 			goto tr55
-		case 101:
-			goto st500
+		case 114:
+			goto tr683
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -17284,16 +17294,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 78:
-			goto tr685
-		case 82:
+		case 72:
 			goto st501
+		case 73:
+			goto st504
+		case 82:
+			goto st509
 		case 95:
 			goto tr55
-		case 110:
-			goto tr685
-		case 114:
+		case 104:
 			goto st501
+		case 105:
+			goto st504
+		case 114:
+			goto st509
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -17317,11 +17331,11 @@ tr702:
 		case 36:
 			goto tr55
 		case 69:
-			goto tr687
+			goto st502
 		case 95:
 			goto tr55
 		case 101:
-			goto tr687
+			goto st502
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -17344,11 +17358,15 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 84:
+		case 78:
+			goto tr688
+		case 82:
 			goto st503
 		case 95:
 			goto tr55
-		case 116:
+		case 110:
+			goto tr688
+		case 114:
 			goto st503
 		}
 		switch {
@@ -17372,12 +17390,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 72:
-			goto st504
+		case 69:
+			goto tr690
 		case 95:
 			goto tr55
-		case 104:
-			goto st504
+		case 101:
+			goto tr690
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -17400,11 +17418,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 79:
+		case 84:
 			goto st505
 		case 95:
 			goto tr55
-		case 111:
+		case 116:
 			goto st505
 		}
 		switch {
@@ -17419,7 +17437,7 @@ tr702:
 		default:
 			goto tr55
 		}
-		goto tr690
+		goto tr80
 	st505:
 		if ( lex.p)++; ( lex.p) == ( lex.pe) {
 			goto _test_eof505
@@ -17428,11 +17446,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 85:
+		case 72:
 			goto st506
 		case 95:
 			goto tr55
-		case 117:
+		case 104:
 			goto st506
 		}
 		switch {
@@ -17456,12 +17474,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 84:
-			goto tr693
+		case 79:
+			goto st507
 		case 95:
 			goto tr55
-		case 116:
-			goto tr693
+		case 111:
+			goto st507
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -17475,7 +17493,7 @@ tr702:
 		default:
 			goto tr55
 		}
-		goto tr80
+		goto tr693
 	st507:
 		if ( lex.p)++; ( lex.p) == ( lex.pe) {
 			goto _test_eof507
@@ -17484,11 +17502,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 73:
+		case 85:
 			goto st508
 		case 95:
 			goto tr55
-		case 105:
+		case 117:
 			goto st508
 		}
 		switch {
@@ -17513,11 +17531,11 @@ tr702:
 		case 36:
 			goto tr55
 		case 84:
-			goto st509
+			goto tr696
 		case 95:
 			goto tr55
 		case 116:
-			goto st509
+			goto tr696
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -17540,12 +17558,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 69:
-			goto tr696
+		case 73:
+			goto st510
 		case 95:
 			goto tr55
-		case 101:
-			goto tr696
+		case 105:
+			goto st510
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -17568,11 +17586,11 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 69:
+		case 84:
 			goto st511
 		case 95:
 			goto tr55
-		case 101:
+		case 116:
 			goto st511
 		}
 		switch {
@@ -17596,20 +17614,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 65:
-			goto st512
+		case 69:
+			goto tr699
 		case 95:
 			goto tr55
-		case 97:
-			goto st512
+		case 101:
+			goto tr699
 		}
 		switch {
-		case  lex.data[( lex.p)] < 66:
+		case  lex.data[( lex.p)] < 65:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -17624,12 +17642,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 82:
-			goto tr699
+		case 69:
+			goto st513
 		case 95:
 			goto tr55
-		case 114:
-			goto tr699
+		case 101:
+			goto st513
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -17652,20 +17670,20 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 79:
+		case 65:
 			goto st514
 		case 95:
 			goto tr55
-		case 111:
+		case 97:
 			goto st514
 		}
 		switch {
-		case  lex.data[( lex.p)] < 65:
+		case  lex.data[( lex.p)] < 66:
 			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
 				goto tr55
 			}
 		case  lex.data[( lex.p)] > 90:
-			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+			if 98 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
 				goto tr55
 			}
 		default:
@@ -17680,12 +17698,12 @@ tr702:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
-		case 78:
-			goto st515
+		case 82:
+			goto tr702
 		case 95:
 			goto tr55
-		case 110:
-			goto st515
+		case 114:
+			goto tr702
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -17705,15 +17723,71 @@ tr702:
 			goto _test_eof515
 		}
 	st_case_515:
+		switch  lex.data[( lex.p)] {
+		case 36:
+			goto tr55
+		case 79:
+			goto st516
+		case 95:
+			goto tr55
+		case 111:
+			goto st516
+		}
+		switch {
+		case  lex.data[( lex.p)] < 65:
+			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
+				goto tr55
+			}
+		case  lex.data[( lex.p)] > 90:
+			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+				goto tr55
+			}
+		default:
+			goto tr55
+		}
+		goto tr80
+	st516:
+		if ( lex.p)++; ( lex.p) == ( lex.pe) {
+			goto _test_eof516
+		}
+	st_case_516:
+		switch  lex.data[( lex.p)] {
+		case 36:
+			goto tr55
+		case 78:
+			goto st517
+		case 95:
+			goto tr55
+		case 110:
+			goto st517
+		}
+		switch {
+		case  lex.data[( lex.p)] < 65:
+			if 48 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 57 {
+				goto tr55
+			}
+		case  lex.data[( lex.p)] > 90:
+			if 97 <=  lex.data[( lex.p)] &&  lex.data[( lex.p)] <= 122 {
+				goto tr55
+			}
+		default:
+			goto tr55
+		}
+		goto tr80
+	st517:
+		if ( lex.p)++; ( lex.p) == ( lex.pe) {
+			goto _test_eof517
+		}
+	st_case_517:
 		switch  lex.data[( lex.p)] {
 		case 36:
 			goto tr55
 		case 69:
-			goto tr702
+			goto tr705
 		case 95:
 			goto tr55
 		case 101:
-			goto tr702
+			goto tr705
 		}
 		switch {
 		case  lex.data[( lex.p)] < 65:
@@ -18244,6 +18318,8 @@ tr702:
 	_test_eof513:  lex.cs = 513; goto _test_eof
 	_test_eof514:  lex.cs = 514; goto _test_eof
 	_test_eof515:  lex.cs = 515; goto _test_eof
+	_test_eof516:  lex.cs = 516; goto _test_eof
+	_test_eof517:  lex.cs = 517; goto _test_eof
 
 	_test_eof: {}
 	if ( lex.p) == eof {
@@ -19085,11 +19161,11 @@ tr702:
 		case 423:
 			goto tr80
 		case 424:
-			goto tr592
+			goto tr80
 		case 425:
 			goto tr80
 		case 426:
-			goto tr80
+			goto tr595
 		case 427:
 			goto tr80
 		case 428:
@@ -19245,11 +19321,11 @@ tr702:
 		case 503:
 			goto tr80
 		case 504:
-			goto tr690
+			goto tr80
 		case 505:
 			goto tr80
 		case 506:
-			goto tr80
+			goto tr693
 		case 507:
 			goto tr80
 		case 508:
@@ -19268,13 +19344,17 @@ tr702:
 			goto tr80
 		case 515:
 			goto tr80
+		case 516:
+			goto tr80
+		case 517:
+			goto tr80
 		}
 	}
 
 	_out: {}
 	}
 
-//line lyx/lexer.rl:356
+//line lyx/lexer.rl:357
 
 
     return int(tok);
diff --git a/lyx/lexer.rl b/lyx/lexer.rl
index 906a948..ceb3978 100644
--- a/lyx/lexer.rl
+++ b/lyx/lexer.rl
@@ -169,6 +169,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
             /references/i => { lval.str = string(lex.data[lex.ts:lex.te]); tok = REFERENCES; fbreak;};
             /key/i => { lval.str = string(lex.data[lex.ts:lex.te]); tok = KEY; fbreak;};
             /set/i => { lval.str = string(lex.data[lex.ts:lex.te]); tok = SET; fbreak;};
+            /reset/i => { lval.str = string(lex.data[lex.ts:lex.te]); tok = RESET; fbreak;};
             /show/i => { lval.str = string(lex.data[lex.ts:lex.te]); tok = SHOW; fbreak;};
             /from/i => { lval.str = string(lex.data[lex.ts:lex.te]); tok = FROM; fbreak;};
             /where/i => { lval.str = string(lex.data[lex.ts:lex.te]); tok = WHERE; fbreak;};
diff --git a/lyx/yx_test.go b/lyx/yx_test.go
index f1c2381..c4ff722 100644
--- a/lyx/yx_test.go
+++ b/lyx/yx_test.go
@@ -3684,6 +3684,26 @@ func TestSetStmt(t *testing.T) {
 			},
 			err: nil,
 		},
+		{
+			query: `
+			reset __spqr_lol;`,
+			exp: &lyx.VariableSetStmt{
+				Session: false,
+				Name:    "__spqr_lol",
+				Kind:    lyx.VarTypeReset,
+			},
+			err: nil,
+		},
+		{
+			query: `
+			reset ALL;`,
+			exp: &lyx.VariableSetStmt{
+				Session: false,
+				Name:    "ALL",
+				Kind:    lyx.VarTypeResetAll,
+			},
+			err: nil,
+		},
 	} {
 		tmp, err := lyx.Parse(tt.query)