@quenk/wml 2.13.0 → 2.13.2

package/lib/parse/generated.js

@@ -1071,7 +1071,7 @@ productions_: bp({
   [131, 6],
   132,
   s,
-  [133, 4],
+  [133, 6],
   s,
   [134, 4],
   135,
@@ -1149,7 +1149,7 @@ productions_: bp({
   179,
   179,
   s,
-  [180, 15]
+  [180, 14]
 ]),
   rule: u([
   3,
@@ -1263,7 +1263,8 @@ productions_: bp({
   [1, 5],
   3,
   6,
-  3,
+  c,
+  [67, 3],
   5,
   5,
   7,
@@ -1272,7 +1273,7 @@ productions_: bp({
   4,
   1,
   c,
-  [76, 3],
+  [11, 3],
   c,
   [4, 3],
   4,
@@ -1285,19 +1286,19 @@ productions_: bp({
   [6, 4, -1],
   3,
   c,
-  [160, 6],
+  [162, 6],
   c,
-  [128, 4],
+  [130, 4],
   c,
   [7, 4],
   c,
-  [59, 5],
+  [61, 5],
   c,
   [50, 3],
   c,
-  [153, 7],
+  [155, 7],
   c,
-  [158, 7],
+  [160, 7],
   s,
   [1, 3],
   0,
@@ -1312,7 +1313,7 @@ productions_: bp({
   c,
   [49, 9],
   s,
-  [1, 17]
+  [1, 16]
 ])
 }),
 performAction: function parser__PerformAction(yyloc, yystate /* action[1] */, yysp, yyvstack, yylstack) {
@@ -1441,11 +1442,11 @@ case 22:
     /*! Production::    export : view_statement */
 case 23:
     /*! Production::    export : fun_statement */
-case 200:
+case 202:
     /*! Production::    member_expression_head : member_expression_head_group */
-case 201:
+case 203:
     /*! Production::    member_expression_tail : member_expression_tail_group */
-case 205:
+case 207:
     /*! Production::    literal : literal_group */
 
     // default action (generated by JISON mode classic/merge :: 1,VT,VA,-,-,LT,LA,-,-):
@@ -1519,9 +1520,9 @@ case 141:
     /*! Production::    for_parameters : for_parameter */
 case 152:
     /*! Production::    arguments : expression */
-case 173:
+case 175:
     /*! Production::    type_arg_list : type */
-case 208:
+case 210:
     /*! Production::    properties : property */
 
     // default action (generated by JISON mode classic/merge :: 1,VT,VA,VU,-,LT,LA,-,-):
@@ -1560,9 +1561,9 @@ case 143:
     /*! Production::    for_parameters : for_parameters "," untyped_parameter */
 case 153:
     /*! Production::    arguments : arguments "," expression */
-case 174:
+case 176:
     /*! Production::    type_arg_list : type_arg_list "," type */
-case 209:
+case 211:
     /*! Production::    properties : properties "," property */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,-,-):
@@ -1623,146 +1624,144 @@ case 157:
     /*! Production::    expression : simple_expression */
 case 158:
     /*! Production::    expression : function_expression */
-case 169:
+case 171:
     /*! Production::    simple_expression : simple_expression_group */
-case 220:
+case 222:
     /*! Production::    cons : qualified_constructor */
-case 221:
+case 223:
     /*! Production::    cons : unqualified_constructor */
-case 225:
+case 227:
     /*! Production::    identifier : qualified_identifier */
-case 226:
+case 228:
     /*! Production::    identifier : unqualified_identifier */
-case 230:
+case 232:
     /*! Production::    binary_operator : binary_operator_group */
-case 231:
+case 233:
     /*! Production::    member_list_group : member */
-case 232:
+case 234:
     /*! Production::    member_list_group : aliased_member */
-case 233:
+case 235:
     /*! Production::    member_list_group2 : member */
-case 234:
+case 236:
     /*! Production::    member_list_group2 : aliased_member */
-case 235:
+case 237:
     /*! Production::    member_group : unqualified_identifier */
-case 236:
-    /*! Production::    member_group : unqualified_constructor */
 case 238:
-    /*! Production::    type_statement_option : type_parameters */
+    /*! Production::    member_group : unqualified_constructor */
 case 240:
+    /*! Production::    type_statement_option : type_parameters */
+case 242:
     /*! Production::    member_declaration_option : "?" */
-case 241:
+case 243:
     /*! Production::    child_group : element */
-case 242:
+case 244:
     /*! Production::    child_group : interpolation */
-case 243:
+case 245:
     /*! Production::    child_group : control */
-case 244:
+case 246:
     /*! Production::    child_group : characters */
-case 245:
-    /*! Production::    child_group : identifier */
 case 247:
-    /*! Production::    node_option : children */
+    /*! Production::    child_group : identifier */
 case 249:
-    /*! Production::    node_option2 : children */
+    /*! Production::    node_option : children */
 case 251:
-    /*! Production::    widget_option : children */
+    /*! Production::    node_option2 : children */
 case 253:
-    /*! Production::    widget_option2 : children */
+    /*! Production::    widget_option : children */
 case 255:
+    /*! Production::    widget_option2 : children */
+case 257:
     /*! Production::    widget_constructor_option : type_arguments */
-case 256:
+case 258:
     /*! Production::    attribute_value_group : interpolation */
-case 257:
+case 259:
     /*! Production::    attribute_value_group : literal */
-case 258:
+case 260:
     /*! Production::    control_group : for_statement */
-case 259:
+case 261:
     /*! Production::    control_group : if_statement */
-case 260:
+case 262:
     /*! Production::    simple_expression_group : construct_expression */
-case 261:
+case 263:
     /*! Production::    simple_expression_group : call_expression */
-case 262:
+case 264:
     /*! Production::    simple_expression_group : view_construction */
-case 263:
+case 265:
     /*! Production::    simple_expression_group : member_expression */
-case 264:
+case 266:
     /*! Production::    simple_expression_group : literal */
-case 265:
+case 267:
     /*! Production::    simple_expression_group : context_property */
-case 266:
+case 268:
     /*! Production::    simple_expression_group : unqualified_constructor */
-case 267:
+case 269:
     /*! Production::    simple_expression_group : unqualified_identifier */
-case 268:
+case 270:
     /*! Production::    simple_expression_group : context_variable */
-case 269:
+case 271:
     /*! Production::    member_expression_head_group : unqualified_identifier */
-case 270:
+case 272:
     /*! Production::    member_expression_head_group : unqualified_constructor */
-case 271:
+case 273:
     /*! Production::    member_expression_head_group : context_variable */
-case 272:
+case 274:
     /*! Production::    member_expression_head_group : context_property */
-case 273:
+case 275:
     /*! Production::    member_expression_head_group : list */
-case 274:
+case 276:
     /*! Production::    member_expression_head_group : record */
-case 275:
+case 277:
     /*! Production::    member_expression_head_group : string_literal */
-case 276:
-    /*! Production::    member_expression_head_group : call_expression */
 case 278:
+    /*! Production::    member_expression_head_group : call_expression */
+case 280:
     /*! Production::    member_expression_tail_group : unqualified_identifier */
-case 279:
+case 281:
     /*! Production::    member_expression_tail_group : unqualified_constructor */
-case 280:
+case 282:
     /*! Production::    member_expression_tail_group : string_literal */
-case 281:
+case 283:
     /*! Production::    literal_group : record */
-case 282:
+case 284:
     /*! Production::    literal_group : list */
-case 283:
+case 285:
     /*! Production::    literal_group : string_literal */
-case 284:
+case 286:
     /*! Production::    literal_group : number_literal */
-case 285:
+case 287:
     /*! Production::    literal_group : boolean_literal */
-case 286:
+case 288:
     /*! Production::    property_group : unqualified_identifier */
-case 287:
+case 289:
     /*! Production::    property_group : string_literal */
-case 288:
+case 290:
     /*! Production::    binary_operator_group : ">" */
-case 289:
+case 291:
     /*! Production::    binary_operator_group : ">=" */
-case 290:
+case 292:
     /*! Production::    binary_operator_group : "<" */
-case 291:
+case 293:
     /*! Production::    binary_operator_group : "<=" */
-case 292:
+case 294:
     /*! Production::    binary_operator_group : "==" */
-case 293:
+case 295:
     /*! Production::    binary_operator_group : "!=" */
-case 294:
+case 296:
     /*! Production::    binary_operator_group : "+" */
-case 295:
+case 297:
     /*! Production::    binary_operator_group : "/" */
-case 296:
+case 298:
     /*! Production::    binary_operator_group : "-" */
-case 297:
+case 299:
     /*! Production::    binary_operator_group : "=" */
-case 298:
+case 300:
     /*! Production::    binary_operator_group : "&&" */
-case 299:
+case 301:
     /*! Production::    binary_operator_group : "||" */
-case 300:
+case 302:
     /*! Production::    binary_operator_group : "^" */
-case 301:
+case 303:
     /*! Production::    binary_operator_group : INSTANCEOF */
-case 302:
-    /*! Production::    binary_operator_group : AS */
 
     // default action (generated by JISON mode classic/merge :: 1,VT,VA,VU,-,LT,LA,-,-):
     this._$ = yylstack[yysp];
@@ -2002,7 +2001,7 @@ case 101:
     /*! Production::    parameters : "(" parameter_list ")" */
 case 159:
     /*! Production::    expression : "(" expression ")" */
-case 172:
+case 174:
     /*! Production::    type_arguments : "[" type_arg_list "]" */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,-,-):
@@ -2585,6 +2584,8 @@ case 160:
 
 case 161:
     /*! Production::    binary_expression : simple_expression binary_operator simple_expression */
+case 163:
+    /*! Production::    binary_expression : simple_expression AS type */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,LU,LUbA):
     this._$ = yyparser.yyMergeLocationInfo(yysp - 2, yysp);
@@ -2605,8 +2606,10 @@ case 162:
     this.$ = new yy.ast.BinaryExpression(yyvstack[yysp - 4], yyvstack[yysp - 3], yyvstack[yysp - 1], this._$);
     break;
 
-case 163:
+case 164:
     /*! Production::    binary_expression : "(" expression ")" binary_operator simple_expression */
+case 165:
+    /*! Production::    binary_expression : "(" expression ")" AS type */
 
     // default action (generated by JISON mode classic/merge :: 5,VT,VA,VU,-,LT,LA,LU,LUbA):
     this._$ = yyparser.yyMergeLocationInfo(yysp - 4, yysp);
@@ -2616,7 +2619,7 @@ case 163:
     this.$ = new yy.ast.BinaryExpression(yyvstack[yysp - 3], yyvstack[yysp - 1], yyvstack[yysp], this._$);
     break;
 
-case 164:
+case 166:
     /*! Production::    binary_expression : "(" expression ")" binary_operator "(" expression ")" */
 
     // default action (generated by JISON mode classic/merge :: 7,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2627,9 +2630,9 @@ case 164:
     this.$ = new yy.ast.BinaryExpression(yyvstack[yysp - 5], yyvstack[yysp - 3], yyvstack[yysp - 1], this._$);
     break;
 
-case 165:
+case 167:
     /*! Production::    unary_expression : "!" expression */
-case 166:
+case 168:
     /*! Production::    unary_expression : "..." expression */
 
     // default action (generated by JISON mode classic/merge :: 2,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2640,7 +2643,7 @@ case 166:
     this.$ = new yy.ast.UnaryExpression(yyvstack[yysp - 1], yyvstack[yysp], this._$);
     break;
 
-case 167:
+case 169:
     /*! Production::    unary_expression : simple_expression "??" */
 
     // default action (generated by JISON mode classic/merge :: 2,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2651,7 +2654,7 @@ case 167:
     this.$ = new yy.ast.UnaryExpression(yyvstack[yysp], yyvstack[yysp - 1], this._$);
     break;
 
-case 168:
+case 170:
     /*! Production::    unary_expression : "(" expression ")" "??" */
 
     // default action (generated by JISON mode classic/merge :: 4,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2662,7 +2665,7 @@ case 168:
     this.$ = new yy.ast.UnaryExpression(yyvstack[yysp], yyvstack[yysp - 2], this._$);
     break;
 
-case 170:
+case 172:
     /*! Production::    view_construction : "<" simple_expression ">" */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2673,7 +2676,7 @@ case 170:
     this.$ = new yy.ast.ViewConstruction(yyvstack[yysp - 1], this._$);
     break;
 
-case 171:
+case 173:
     /*! Production::    view_construction : "<" "(" expression ")" ">" */
 
     // default action (generated by JISON mode classic/merge :: 5,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2684,7 +2687,7 @@ case 171:
     this.$ = new yy.ast.ViewConstruction(yyvstack[yysp - 2], this._$);
     break;
 
-case 175:
+case 177:
     /*! Production::    construct_expression : unqualified_constructor type_arguments "(" arguments ")" */
 
     // default action (generated by JISON mode classic/merge :: 5,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2695,7 +2698,7 @@ case 175:
     this.$ = new yy.ast.ConstructExpression(yyvstack[yysp - 4], yyvstack[yysp - 3], yyvstack[yysp - 1], this._$);
     break;
 
-case 176:
+case 178:
     /*! Production::    construct_expression : unqualified_constructor "(" arguments ")" */
 
     // default action (generated by JISON mode classic/merge :: 4,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2706,7 +2709,7 @@ case 176:
     this.$ = new yy.ast.ConstructExpression(yyvstack[yysp - 3], [], yyvstack[yysp - 1], this._$);
     break;
 
-case 177:
+case 179:
     /*! Production::    construct_expression : unqualified_constructor type_arguments "(" ")" */
 
     // default action (generated by JISON mode classic/merge :: 4,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2717,7 +2720,7 @@ case 177:
     this.$ = new yy.ast.ConstructExpression(yyvstack[yysp - 3], yyvstack[yysp - 2], [], this._$);
     break;
 
-case 178:
+case 180:
     /*! Production::    construct_expression : unqualified_constructor "(" ")" */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2728,11 +2731,11 @@ case 178:
     this.$ = new yy.ast.ConstructExpression(yyvstack[yysp - 2], [], [], this._$);
     break;
 
-case 179:
+case 181:
     /*! Production::    call_expression : unqualified_identifier type_arguments "(" arguments ")" */
-case 183:
+case 185:
     /*! Production::    call_expression : context_property type_arguments "(" arguments ")" */
-case 187:
+case 189:
     /*! Production::    call_expression : member_expression type_arguments "(" arguments ")" */
 
     // default action (generated by JISON mode classic/merge :: 5,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2743,11 +2746,11 @@ case 187:
     this.$ = new yy.ast.CallExpression(yyvstack[yysp - 4], yyvstack[yysp - 3], yyvstack[yysp - 1], this._$);
     break;
 
-case 180:
+case 182:
     /*! Production::    call_expression : unqualified_identifier type_arguments "(" ")" */
-case 184:
+case 186:
     /*! Production::    call_expression : context_property type_arguments "(" ")" */
-case 188:
+case 190:
     /*! Production::    call_expression : member_expression type_arguments "(" ")" */
 
     // default action (generated by JISON mode classic/merge :: 4,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2758,13 +2761,13 @@ case 188:
     this.$ = new yy.ast.CallExpression(yyvstack[yysp - 3], yyvstack[yysp - 2], [], this._$);
     break;
 
-case 181:
+case 183:
     /*! Production::    call_expression : unqualified_identifier "(" arguments ")" */
-case 185:
+case 187:
     /*! Production::    call_expression : context_property "(" arguments ")" */
-case 189:
+case 191:
     /*! Production::    call_expression : member_expression "(" arguments ")" */
-case 195:
+case 197:
     /*! Production::    call_expression : call_expression "(" arguments ")" */
 
     // default action (generated by JISON mode classic/merge :: 4,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2775,13 +2778,13 @@ case 195:
     this.$ = new yy.ast.CallExpression(yyvstack[yysp - 3], [], yyvstack[yysp - 1], this._$);
     break;
 
-case 182:
+case 184:
     /*! Production::    call_expression : unqualified_identifier "(" ")" */
-case 186:
+case 188:
     /*! Production::    call_expression : context_property "(" ")" */
-case 190:
+case 192:
     /*! Production::    call_expression : member_expression "(" ")" */
-case 196:
+case 198:
     /*! Production::    call_expression : call_expression "(" ")" */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2792,7 +2795,7 @@ case 196:
     this.$ = new yy.ast.CallExpression(yyvstack[yysp - 2], [], [], this._$);
     break;
 
-case 191:
+case 193:
     /*! Production::    call_expression : "(" expression ")" type_arguments "(" arguments ")" */
 
     // default action (generated by JISON mode classic/merge :: 7,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2803,7 +2806,7 @@ case 191:
     this.$ = new yy.ast.CallExpression(yyvstack[yysp - 5], yyvstack[yysp - 3], yyvstack[yysp - 1], this._$);
     break;
 
-case 192:
+case 194:
     /*! Production::    call_expression : "(" expression ")" type_arguments "(" ")" */
 
     // default action (generated by JISON mode classic/merge :: 6,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2814,7 +2817,7 @@ case 192:
     this.$ = new yy.ast.CallExpression(yyvstack[yysp - 4], yyvstack[yysp - 2], [], this._$);
     break;
 
-case 193:
+case 195:
     /*! Production::    call_expression : "(" expression ")" "(" arguments ")" */
 
     // default action (generated by JISON mode classic/merge :: 6,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2825,7 +2828,7 @@ case 193:
     this.$ = new yy.ast.CallExpression(yyvstack[yysp - 4], [], yyvstack[yysp - 1], this._$);
     break;
 
-case 194:
+case 196:
     /*! Production::    call_expression : "(" expression ")" "(" ")" */
 
     // default action (generated by JISON mode classic/merge :: 5,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2836,9 +2839,9 @@ case 194:
     this.$ = new yy.ast.CallExpression(yyvstack[yysp - 3], [], [], this._$);
     break;
 
-case 197:
+case 199:
     /*! Production::    member_expression : member_expression_head "." member_expression_tail */
-case 198:
+case 200:
     /*! Production::    member_expression : member_expression "." member_expression_tail */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2849,7 +2852,7 @@ case 198:
     this.$ = new yy.ast.MemberExpression(yyvstack[yysp - 2], yyvstack[yysp], this._$);
     break;
 
-case 199:
+case 201:
     /*! Production::    member_expression : member_expression "[" string_literal "]" */
 
     // default action (generated by JISON mode classic/merge :: 4,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2860,7 +2863,7 @@ case 199:
     this.$ = new yy.ast.MemberExpression(yyvstack[yysp - 3], yyvstack[yysp - 1], this._$);
     break;
 
-case 202:
+case 204:
     /*! Production::    function_expression : parameters "->" expression */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2871,7 +2874,7 @@ case 202:
     this.$ = new yy.ast.FunctionExpression(yyvstack[yysp - 2], yyvstack[yysp], this._$);
     break;
 
-case 203:
+case 205:
     /*! Production::    function_expression : untyped_parameter "->" expression */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2882,7 +2885,7 @@ case 203:
     this.$ = new yy.ast.FunctionExpression([yyvstack[yysp - 2]], yyvstack[yysp], this._$);
     break;
 
-case 204:
+case 206:
     /*! Production::    function_expression : "->" expression */
 
     // default action (generated by JISON mode classic/merge :: 2,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2893,7 +2896,7 @@ case 204:
     this.$ = new yy.ast.FunctionExpression([], yyvstack[yysp], this._$);
     break;
 
-case 206:
+case 208:
     /*! Production::    record : "{" "}" */
 
     // default action (generated by JISON mode classic/merge :: 2,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2904,7 +2907,7 @@ case 206:
     this.$ = new yy.ast.Record([], this._$);
     break;
 
-case 207:
+case 209:
     /*! Production::    record : "{" properties "}" */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2915,7 +2918,7 @@ case 207:
     this.$ = new yy.ast.Record(yyvstack[yysp - 1], this._$);
     break;
 
-case 210:
+case 212:
     /*! Production::    property : property_group "=" expression */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2926,7 +2929,7 @@ case 210:
     this.$ = new yy.ast.Property(yyvstack[yysp - 2], yyvstack[yysp], this._$);
     break;
 
-case 211:
+case 213:
     /*! Production::    list : "[" "]" */
 
     // default action (generated by JISON mode classic/merge :: 2,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2937,7 +2940,7 @@ case 211:
     this.$ = new yy.ast.List([], this._$);
     break;
 
-case 212:
+case 214:
     /*! Production::    list : "[" arguments "]" */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2948,7 +2951,7 @@ case 212:
     this.$ = new yy.ast.List(yyvstack[yysp - 1], this._$);
     break;
 
-case 213:
+case 215:
     /*! Production::    string_literal : STRING_LITERAL */
 
     // default action (generated by JISON mode classic/merge :: 1,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2959,7 +2962,7 @@ case 213:
     this.$ = new yy.ast.StringLiteral(yyvstack[yysp].slice(1, yyvstack[yysp].length - 1, this._$));
     break;
 
-case 214:
+case 216:
     /*! Production::    number_literal : NUMBER_LITERAL */
 
     // default action (generated by JISON mode classic/merge :: 1,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2970,7 +2973,7 @@ case 214:
     this.$ = new yy.ast.NumberLiteral(yyvstack[yysp], this._$);
     break;
 
-case 215:
+case 217:
     /*! Production::    boolean_literal : TRUE */
 
     // default action (generated by JISON mode classic/merge :: 1,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2981,7 +2984,7 @@ case 215:
     this.$ = new yy.ast.BooleanLiteral(true, this._$);
     break;
 
-case 216:
+case 218:
     /*! Production::    boolean_literal : FALSE */
 
     // default action (generated by JISON mode classic/merge :: 1,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2992,7 +2995,7 @@ case 216:
     this.$ = new yy.ast.BooleanLiteral(false, this._$);
     break;
 
-case 217:
+case 219:
     /*! Production::    context_property : "@" unqualified_identifier */
 
     // default action (generated by JISON mode classic/merge :: 2,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -3003,7 +3006,7 @@ case 217:
     this.$ = new yy.ast.ContextProperty(yyvstack[yysp], this._$)
     break;
 
-case 218:
+case 220:
     /*! Production::    context_property : "@" "[" string_literal "]" */
 
     // default action (generated by JISON mode classic/merge :: 4,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -3014,7 +3017,7 @@ case 218:
     this.$ = new yy.ast.ContextProperty(yyvstack[yysp - 1], this._$)
     break;
 
-case 219:
+case 221:
     /*! Production::    context_variable : "@" */
 
     // default action (generated by JISON mode classic/merge :: 1,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -3025,9 +3028,9 @@ case 219:
     this.$ = new yy.ast.ContextVariable(this._$);
     break;
 
-case 222:
+case 224:
     /*! Production::    qualified_constructor : IDENTIFIER "." CONSTRUCTOR */
-case 223:
+case 225:
     /*! Production::    qualified_constructor : CONSTRUCTOR "." CONSTRUCTOR */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -3038,7 +3041,7 @@ case 223:
     this.$ = new yy.ast.QualifiedConstructor(yyvstack[yysp - 2], yyvstack[yysp], this._$);
     break;
 
-case 224:
+case 226:
     /*! Production::    unqualified_constructor : CONSTRUCTOR */
 
     // default action (generated by JISON mode classic/merge :: 1,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -3049,9 +3052,9 @@ case 224:
     this.$ = new yy.ast.UnqualifiedConstructor(yyvstack[yysp], this._$);
     break;
 
-case 227:
+case 229:
     /*! Production::    qualified_identifier : IDENTIFIER "." IDENTIFIER */
-case 228:
+case 230:
     /*! Production::    qualified_identifier : CONSTRUCTOR "." IDENTIFIER */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -3062,7 +3065,7 @@ case 228:
     this.$ = new yy.ast.QualifiedIdentifier(yyvstack[yysp - 2], yyvstack[yysp], this._$);
     break;
 
-case 229:
+case 231:
     /*! Production::    unqualified_identifier : IDENTIFIER */
 
     // default action (generated by JISON mode classic/merge :: 1,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -3073,19 +3076,19 @@ case 229:
     this.$ = new yy.ast.UnqualifiedIdentifier(yyvstack[yysp], this._$);
     break;
 
-case 237:
-    /*! Production::    type_statement_option : %epsilon */
 case 239:
+    /*! Production::    type_statement_option : %epsilon */
+case 241:
     /*! Production::    member_declaration_option : %epsilon */
-case 246:
-    /*! Production::    node_option : %epsilon */
 case 248:
-    /*! Production::    node_option2 : %epsilon */
+    /*! Production::    node_option : %epsilon */
 case 250:
-    /*! Production::    widget_option : %epsilon */
+    /*! Production::    node_option2 : %epsilon */
 case 252:
-    /*! Production::    widget_option2 : %epsilon */
+    /*! Production::    widget_option : %epsilon */
 case 254:
+    /*! Production::    widget_option2 : %epsilon */
+case 256:
     /*! Production::    widget_constructor_option : %epsilon */
 
     // default action (generated by JISON mode classic/merge :: 0,VT,VA,VU,-,LT,LA,-,-):
@@ -3096,7 +3099,7 @@ case 254:
     this.$ = undefined;
     break;
 
-case 277:
+case 279:
     /*! Production::    member_expression_head_group : "(" expression ")" */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,-,-):
@@ -3193,19 +3196,19 @@ table: bt({
   [24, 3],
   2,
   0,
-  10,
+  14,
   0,
-  11,
+  15,
   0,
   s,
-  [11, 3],
+  [15, 3],
+  16,
+  17,
   16,
   17,
-  12,
-  13,
   8,
   18,
-  14,
+  18,
   c,
   [27, 4],
   c,
@@ -3285,7 +3288,7 @@ table: bt({
   1,
   17,
   2,
-  11,
+  15,
   5,
   c,
   [78, 3],
@@ -3325,8 +3328,9 @@ table: bt({
   0,
   41,
   30,
+  16,
   s,
-  [0, 17],
+  [0, 16],
   1,
   c,
   [30, 3],
@@ -3373,11 +3377,11 @@ table: bt({
   0,
   16,
   0,
-  16,
   c,
-  [19, 5],
+  [81, 5],
   c,
-  [73, 4],
+  [5, 4],
+  1,
   7,
   c,
   [3, 4],
@@ -3387,24 +3391,24 @@ table: bt({
   3,
   c,
   [258, 8],
-  0,
-  41,
+  c,
+  [302, 3],
   32,
   c,
-  [304, 3],
+  [305, 3],
   2,
   0,
   43,
   c,
-  [164, 4],
+  [165, 4],
   c,
-  [21, 4],
+  [22, 4],
   c,
   [9, 3],
   c,
   [3, 6],
   c,
-  [32, 3],
+  [33, 3],
   1,
   0,
   6,
@@ -3416,70 +3420,69 @@ table: bt({
   41,
   4,
   c,
-  [256, 3],
+  [257, 3],
   c,
-  [68, 4],
+  [69, 4],
   15,
   1,
   0,
   15,
   c,
-  [59, 4],
+  [60, 4],
   s,
   [0, 4],
   6,
   c,
-  [75, 4],
+  [76, 4],
   c,
-  [392, 5],
+  [393, 5],
   1,
-  30,
   c,
-  [55, 3],
-  1,
+  [181, 3],
+  c,
+  [149, 3],
   c,
-  [230, 7],
+  [232, 7],
   c,
   [3, 7],
   c,
-  [455, 4],
+  [457, 4],
   0,
   24,
   c,
-  [131, 4],
+  [133, 4],
   c,
   [3, 4],
   2,
   c,
-  [139, 5],
+  [141, 5],
   1,
-  0,
-  14,
-  0,
-  41,
   c,
-  [90, 3],
+  [394, 3],
+  c,
+  [201, 3],
+  2,
   c,
-  [417, 5],
+  [420, 6],
   c,
-  [348, 3],
+  [351, 3],
   24,
   24,
   41,
   3,
   15,
   c,
-  [30, 4],
+  [31, 4],
   c,
-  [120, 4],
+  [122, 4],
   2,
   c,
-  [261, 3],
+  [264, 3],
   1,
   1,
   14,
   c,
-  [53, 3],
+  [54, 3],
   41,
   4,
   4,
@@ -3499,14 +3502,14 @@ table: bt({
   3,
   1,
   c,
-  [291, 5],
+  [294, 5],
   4,
   0,
   3,
   c,
-  [111, 3],
+  [113, 3],
   c,
-  [84, 4],
+  [85, 4],
   0
 ]),
   symbol: u([
@@ -3781,15 +3784,19 @@ table: bt({
   14,
   27,
   36,
+  40,
   42,
+  44,
   45,
+  46,
+  50,
   c,
-  [10, 4],
+  [14, 4],
   11,
   c,
-  [11, 39],
+  [15, 55],
   c,
-  [274, 16],
+  [294, 16],
   4,
   5,
   c,
@@ -3800,47 +3807,47 @@ table: bt({
   156,
   157,
   c,
-  [44, 11],
+  [48, 15],
   91,
   c,
-  [12, 7],
+  [16, 7],
   26,
   c,
-  [13, 5],
+  [17, 9],
   14,
   53,
   57,
   83,
   c,
-  [306, 5],
+  [334, 5],
   11,
   12,
   c,
-  [67, 11],
+  [75, 11],
   101,
   c,
-  [68, 3],
+  [76, 3],
   c,
-  [39, 4],
+  [43, 4],
   10,
   c,
-  [40, 3],
+  [44, 3],
   16,
   c,
-  [41, 5],
+  [45, 9],
   10,
   27,
   c,
-  [522, 3],
+  [554, 3],
   c,
-  [401, 3],
+  [433, 3],
   163,
   164,
   c,
-  [108, 6],
+  [120, 6],
   78,
   c,
-  [109, 10],
+  [121, 10],
   6,
   12,
   6,
@@ -3850,13 +3857,13 @@ table: bt({
   c,
   [32, 3],
   c,
-  [388, 3],
+  [420, 3],
   9,
   10,
   19,
   166,
   c,
-  [390, 9],
+  [422, 9],
   7,
   5,
   5,
@@ -3868,7 +3875,7 @@ table: bt({
   27,
   91,
   c,
-  [418, 7],
+  [450, 7],
   c,
   [26, 9],
   6,
@@ -3878,7 +3885,7 @@ table: bt({
   15,
   24,
   c,
-  [286, 21],
+  [318, 21],
   174,
   c,
   [24, 6],
@@ -3888,7 +3895,7 @@ table: bt({
   6,
   9,
   c,
-  [311, 25],
+  [343, 25],
   57,
   58,
   c,
@@ -3898,7 +3905,7 @@ table: bt({
   118,
   119,
   c,
-  [318, 6],
+  [350, 6],
   15,
   16,
   s,
@@ -3915,15 +3922,15 @@ table: bt({
   161,
   180,
   c,
-  [276, 4],
+  [288, 4],
   c,
-  [473, 13],
+  [505, 13],
   105,
   106,
   c,
-  [475, 25],
+  [507, 25],
   c,
-  [516, 41],
+  [548, 41],
   c,
   [41, 82],
   36,
@@ -3931,13 +3938,13 @@ table: bt({
   c,
   [84, 42],
   c,
-  [419, 5],
+  [423, 5],
   c,
   [240, 22],
   c,
   [28, 6],
   c,
-  [447, 3],
+  [451, 3],
   c,
   [29, 20],
   137,
@@ -3956,7 +3963,7 @@ table: bt({
   c,
   [207, 6],
   c,
-  [847, 14],
+  [879, 14],
   c,
   [118, 21],
   57,
@@ -3968,14 +3975,14 @@ table: bt({
   c,
   [27, 54],
   c,
-  [762, 3],
+  [766, 3],
   147,
   148,
   150,
   160,
   179,
   c,
-  [762, 4],
+  [766, 4],
   c,
   [368, 14],
   s,
@@ -3994,32 +4001,32 @@ table: bt({
   160,
   7,
   c,
-  [1281, 3],
+  [1313, 3],
   c,
   [694, 27],
   c,
-  [1448, 3],
+  [1480, 3],
   c,
-  [954, 17],
+  [966, 17],
   c,
   [16, 31],
   s,
   [12, 4],
   36,
   c,
-  [1301, 4],
+  [1333, 4],
   36,
   5,
   c,
-  [997, 17],
+  [1009, 17],
   11,
   c,
   [25, 3],
   c,
-  [999, 9],
+  [1011, 13],
   12,
   c,
-  [1332, 4],
+  [1368, 4],
   6,
   14,
   6,
@@ -4027,45 +4034,45 @@ table: bt({
   58,
   58,
   c,
-  [1346, 3],
+  [1382, 3],
   8,
   27,
   58,
   93,
   c,
-  [76, 17],
+  [80, 17],
   c,
-  [911, 3],
+  [915, 3],
   c,
-  [910, 5],
+  [914, 5],
   c,
   [8, 3],
   c,
-  [915, 4],
+  [919, 4],
   c,
-  [220, 41],
+  [224, 41],
   27,
   53,
   150,
   5,
   6,
   c,
-  [960, 3],
+  [964, 3],
   82,
   89,
   c,
-  [211, 3],
+  [215, 3],
   c,
-  [967, 47],
+  [971, 47],
   c,
   [23, 23],
   27,
   57,
   106,
   c,
-  [1155, 3],
+  [1163, 3],
   c,
-  [1495, 16],
+  [1531, 16],
   c,
   [27, 3],
   16,
@@ -4073,28 +4080,31 @@ table: bt({
   40,
   119,
   c,
-  [869, 45],
+  [873, 45],
   c,
-  [609, 26],
+  [613, 26],
   c,
-  [305, 3],
+  [96, 16],
+  c,
+  [325, 3],
   7,
   9,
   10,
   11,
   c,
-  [524, 6],
+  [544, 6],
   28,
   36,
   c,
-  [690, 9],
-  50,
+  [710, 9],
+  c,
+  [1374, 4],
   c,
-  [1006, 83],
+  [1026, 80],
   c,
-  [1132, 16],
+  [1152, 16],
   c,
-  [596, 26],
+  [616, 26],
   4,
   c,
   [44, 43],
@@ -4107,26 +4117,26 @@ table: bt({
   160,
   177,
   c,
-  [298, 4],
+  [218, 4],
   c,
   [12, 3],
   c,
-  [1849, 9],
+  [1901, 9],
   150,
   c,
-  [552, 3],
+  [572, 3],
   c,
   [115, 87],
   c,
   [44, 44],
   16,
   c,
-  [1210, 44],
+  [1230, 44],
   c,
-  [1628, 6],
+  [1652, 6],
   27,
   c,
-  [914, 4],
+  [934, 4],
   137,
   c,
   [216, 8],
@@ -4149,19 +4159,19 @@ table: bt({
   42,
   45,
   c,
-  [1879, 17],
+  [1931, 17],
   c,
-  [823, 5],
+  [843, 5],
   c,
   [107, 4],
   c,
-  [557, 13],
+  [477, 13],
   c,
-  [1334, 4],
+  [1354, 4],
   c,
-  [780, 8],
+  [800, 8],
   c,
-  [822, 5],
+  [842, 5],
   c,
   [13, 10],
   5,
@@ -4169,28 +4179,28 @@ table: bt({
   53,
   57,
   c,
-  [1763, 6],
+  [1787, 6],
   c,
-  [875, 46],
+  [895, 46],
   c,
-  [738, 8],
+  [754, 8],
   c,
-  [746, 10],
+  [762, 10],
   82,
   c,
   [6, 3],
   32,
   c,
-  [706, 24],
+  [722, 24],
   35,
   41,
   47,
   c,
   [257, 45],
   c,
-  [1379, 27],
+  [1399, 27],
   c,
-  [1709, 3],
+  [1729, 3],
   c,
   [73, 40],
   5,
@@ -4207,15 +4217,15 @@ table: bt({
   c,
   [404, 4],
   c,
-  [1405, 6],
+  [1425, 6],
   c,
   [891, 80],
   c,
-  [1168, 24],
+  [1184, 24],
   c,
   [106, 82],
   c,
-  [1507, 3],
+  [1527, 3],
   c,
   [596, 4],
   c,
@@ -4241,23 +4251,23 @@ table: bt({
   27,
   5,
   c,
-  [1254, 30],
+  [1270, 46],
   c,
-  [945, 44],
+  [961, 44],
   44,
   c,
-  [1609, 4],
+  [1645, 4],
   c,
   [4, 4],
   4,
   c,
-  [3055, 3],
+  [3123, 3],
   137,
   c,
-  [729, 17],
+  [745, 17],
   128,
   c,
-  [730, 7],
+  [746, 7],
   27,
   46,
   5,
@@ -4265,14 +4275,14 @@ table: bt({
   36,
   4,
   c,
-  [130, 6],
+  [146, 6],
   27,
   c,
-  [955, 8],
+  [971, 8],
   c,
-  [954, 6],
+  [970, 6],
   c,
-  [1298, 84],
+  [1314, 84],
   c,
   [143, 3],
   c,
@@ -4282,20 +4292,20 @@ table: bt({
   47,
   48,
   c,
-  [1665, 30],
+  [1697, 30],
   c,
-  [521, 59],
+  [537, 59],
   c,
-  [2747, 3],
+  [2783, 3],
   c,
-  [405, 15],
+  [421, 15],
   5,
   c,
-  [1783, 3],
+  [1815, 3],
   27,
   47,
   c,
-  [1754, 47],
+  [1786, 47],
   c,
   [315, 3],
   c,
@@ -4309,7 +4319,7 @@ table: bt({
   c,
   [4, 4],
   c,
-  [1914, 47],
+  [1946, 47],
   s,
   [27, 5],
   c,
@@ -4413,49 +4423,51 @@ table: bt({
   c,
   [124, 64],
   s,
-  [2, 47],
+  [2, 67],
   c,
-  [123, 27],
+  [143, 27],
   c,
-  [169, 19],
+  [42, 16],
   c,
-  [13, 9],
+  [59, 17],
   c,
-  [173, 23],
+  [46, 8],
   c,
-  [96, 24],
+  [174, 18],
   c,
-  [41, 26],
+  [108, 28],
   c,
-  [421, 7],
+  [45, 26],
   c,
-  [425, 16],
+  [453, 7],
   c,
-  [466, 9],
+  [457, 16],
+  c,
+  [498, 9],
   c,
   [26, 19],
   c,
-  [286, 19],
+  [318, 19],
   c,
-  [283, 34],
+  [315, 34],
   c,
   [28, 19],
   c,
-  [673, 10],
+  [705, 10],
   c,
-  [284, 25],
+  [296, 25],
   c,
-  [302, 26],
+  [314, 26],
   c,
-  [475, 32],
+  [507, 32],
   c,
-  [516, 41],
+  [548, 41],
   c,
   [41, 83],
   c,
   [43, 45],
   c,
-  [553, 41],
+  [565, 41],
   c,
   [30, 89],
   c,
@@ -4465,7 +4477,7 @@ table: bt({
   c,
   [88, 69],
   c,
-  [817, 51],
+  [829, 51],
   c,
   [536, 43],
   c,
@@ -4475,71 +4487,71 @@ table: bt({
   c,
   [694, 24],
   c,
-  [937, 20],
+  [949, 20],
   c,
   [16, 32],
   c,
-  [1014, 29],
+  [1026, 29],
   c,
-  [911, 14],
+  [29, 15],
   c,
-  [770, 17],
+  [774, 20],
   c,
-  [1596, 18],
+  [1632, 18],
   c,
-  [799, 21],
+  [803, 21],
   c,
-  [632, 29],
+  [636, 29],
   c,
-  [1388, 11],
+  [1424, 11],
   c,
-  [967, 53],
+  [971, 53],
   c,
-  [268, 21],
+  [272, 21],
   c,
-  [1495, 21],
+  [1531, 21],
   c,
-  [507, 19],
+  [511, 19],
   c,
-  [416, 37],
+  [420, 37],
   c,
-  [609, 42],
+  [1682, 35],
   c,
-  [513, 43],
+  [622, 40],
   c,
-  [922, 57],
+  [985, 83],
   c,
-  [596, 70],
+  [616, 70],
   c,
-  [1453, 27],
+  [1477, 27],
   c,
   [71, 48],
   c,
   [44, 101],
   c,
-  [1851, 44],
+  [1903, 44],
   c,
-  [1975, 11],
+  [2027, 11],
   c,
-  [1756, 33],
+  [1788, 33],
   c,
-  [1761, 26],
+  [1793, 26],
   c,
-  [2120, 14],
+  [2172, 14],
   c,
   [13, 11],
   c,
-  [859, 42],
+  [879, 42],
   c,
-  [799, 23],
+  [815, 23],
   c,
-  [2193, 19],
+  [2245, 19],
   c,
-  [606, 34],
+  [1235, 34],
   c,
-  [1467, 55],
+  [1487, 55],
   c,
-  [1583, 61],
+  [1603, 61],
   c,
   [461, 45],
   c,
@@ -4547,9 +4559,9 @@ table: bt({
   c,
   [45, 78],
   c,
-  [1856, 92],
+  [1876, 92],
   c,
-  [1962, 101],
+  [1982, 101],
   c,
   [86, 51],
   c,
@@ -4561,29 +4573,29 @@ table: bt({
   c,
   [637, 18],
   c,
-  [1254, 45],
+  [1270, 61],
   c,
-  [437, 40],
+  [453, 40],
   c,
-  [314, 34],
+  [330, 34],
   c,
-  [2805, 26],
+  [2873, 26],
   c,
-  [1298, 120],
+  [1314, 120],
   c,
-  [2632, 51],
+  [2668, 51],
   c,
   [179, 51],
   c,
   [59, 21],
   c,
-  [2744, 51],
+  [2780, 51],
   c,
   [359, 39],
   c,
-  [1341, 47],
+  [1357, 47],
   c,
-  [2881, 70],
+  [2917, 70],
   c,
   [327, 55],
   c,
@@ -4816,7 +4828,7 @@ table: bt({
   288,
   289,
   291,
-  293,
+  294,
   187,
   169,
   170,
@@ -4937,240 +4949,246 @@ table: bt({
   402,
   c,
   [291, 18],
+  404,
+  c,
+  [59, 9],
   326,
   187,
   188,
-  406,
-  c,
-  [285, 25],
   407,
   c,
-  [26, 25],
+  [295, 25],
   408,
   c,
-  [338, 26],
-  411,
+  [26, 25],
+  409,
+  c,
+  [348, 26],
+  412,
   c,
   [27, 24],
-  413,
+  414,
   s,
-  [417, 4, -1],
+  [418, 4, -1],
   c,
-  [857, 9],
-  418,
+  [867, 9],
+  419,
   130,
   129,
   187,
   188,
-  420,
+  421,
   c,
   [71, 26],
-  423,
+  424,
   c,
   [27, 26],
-  426,
+  427,
   c,
   [27, 26],
-  429,
+  430,
   c,
   [26, 23],
   326,
-  430,
-  c,
-  [125, 4],
   431,
-  442,
   c,
-  [866, 9],
+  [125, 4],
+  432,
   443,
+  c,
+  [876, 9],
+  444,
   36,
   37,
-  445,
+  446,
   c,
-  [310, 9],
-  449,
-  447,
+  [261, 9],
+  450,
+  448,
   c,
   [9, 4],
   c,
   [8, 3],
-  450,
+  451,
   c,
   [8, 6],
-  454,
-  c,
-  [428, 3],
   455,
   c,
-  [30, 9],
+  [438, 3],
   456,
   c,
-  [10, 9],
+  [30, 9],
   457,
   c,
   [10, 9],
+  458,
+  c,
+  [10, 9],
   389,
+  461,
   460,
-  459,
   14,
   15,
   389,
+  464,
   463,
-  462,
   14,
   15,
+  466,
   465,
-  464,
   14,
   15,
   c,
-  [997, 19],
-  470,
+  [1007, 19],
+  471,
   c,
   [137, 23],
-  473,
-  471,
-  293,
+  475,
+  472,
+  294,
   187,
   188,
-  475,
+  477,
   c,
   [192, 25],
-  477,
+  479,
   c,
   [219, 26],
-  481,
+  483,
   c,
   [27, 26],
-  484,
+  486,
   c,
   [27, 26],
-  487,
+  489,
   c,
   [27, 24],
-  492,
+  494,
   c,
-  [794, 5],
-  493,
+  [804, 5],
+  495,
   c,
   [57, 25],
-  494,
+  496,
   c,
   [26, 23],
-  495,
+  497,
   c,
-  [674, 17],
+  [684, 17],
   187,
   188,
-  496,
+  498,
   c,
   [70, 25],
-  497,
+  499,
   c,
   [26, 23],
-  498,
-  499,
+  500,
+  501,
   347,
   187,
   188,
-  500,
-  c,
-  [29, 23],
   502,
   c,
-  [847, 10],
+  [29, 23],
   504,
   c,
+  [857, 10],
+  506,
+  c,
   [9, 4],
-  503,
+  505,
   c,
   [9, 8],
   241,
   130,
   129,
-  465,
-  506,
-  c,
-  [376, 3],
+  466,
   508,
-  507,
   c,
   [376, 3],
+  510,
   509,
+  c,
+  [376, 3],
+  511,
   14,
   15,
-  513,
+  515,
+  c,
+  [730, 18],
+  517,
   c,
-  [720, 18],
+  [60, 9],
   187,
   188,
-  516,
+  519,
   c,
-  [242, 24],
-  473,
+  [252, 24],
+  475,
   c,
-  [423, 11],
-  525,
+  [433, 11],
+  528,
   c,
-  [187, 6],
-  465,
-  531,
+  [197, 6],
+  466,
+  534,
   14,
   15,
-  473,
+  475,
   187,
   188,
-  533,
-  c,
-  [192, 25],
-  534,
+  536,
   c,
-  [346, 26],
+  [202, 25],
   537,
   c,
-  [26, 23],
+  [356, 26],
   540,
   c,
-  [289, 17],
-  541,
+  [26, 23],
+  543,
   c,
-  [307, 19],
-  542,
+  [299, 17],
+  544,
+  c,
+  [317, 19],
+  545,
   c,
   [62, 23],
   243,
-  544,
+  547,
   c,
-  [233, 4],
-  543,
+  [201, 4],
+  546,
   130,
   129,
   c,
-  [596, 17],
+  [606, 17],
   c,
   [17, 17],
-  473,
-  554,
+  475,
+  557,
   c,
   [88, 19],
-  555,
+  558,
   c,
   [88, 23],
-  560,
+  563,
   c,
   [44, 17],
   c,
   [97, 34],
-  569,
+  572,
   c,
   [52, 17],
-  570,
+  573,
   c,
   [18, 17],
-  571,
+  574,
   c,
   [88, 28],
-  575,
+  578,
   c,
   [106, 40]
 ]),
@@ -5204,36 +5222,36 @@ table: bt({
   [51, 28],
   c,
   [35, 8],
+  s,
+  [2, 10],
   c,
-  [7, 10],
-  c,
-  [11, 11],
+  [180, 9],
   c,
-  [29, 14],
+  [26, 17],
   c,
-  [40, 12],
+  [15, 30],
   c,
-  [104, 16],
+  [124, 17],
   c,
-  [46, 19],
+  [58, 27],
   c,
-  [33, 24],
+  [41, 28],
   c,
-  [141, 14],
+  [173, 14],
   c,
   [15, 5],
   c,
-  [148, 10],
+  [180, 10],
   c,
-  [41, 5],
+  [45, 5],
   c,
-  [241, 35],
+  [273, 35],
   c,
   [41, 6],
   c,
-  [196, 8],
+  [228, 8],
   c,
-  [355, 10],
+  [387, 10],
   s,
   [1, 82],
   s,
@@ -5243,9 +5261,9 @@ table: bt({
   c,
   [29, 27],
   c,
-  [280, 12],
+  [292, 16],
   c,
-  [29, 70],
+  [29, 66],
   s,
   [2, 28],
   c,
@@ -5257,25 +5275,25 @@ table: bt({
   c,
   [122, 50],
   c,
-  [785, 30],
+  [817, 30],
   c,
-  [743, 24],
+  [775, 24],
   c,
   [382, 27],
   c,
-  [628, 15],
+  [644, 19],
   c,
-  [490, 89],
+  [494, 89],
   c,
-  [886, 15],
+  [928, 21],
   c,
-  [302, 18],
+  [312, 18],
   s,
   [1, 142],
   c,
-  [465, 13],
+  [293, 13],
   c,
-  [805, 15],
+  [815, 15],
   c,
   [28, 7],
   c,
@@ -5283,17 +5301,17 @@ table: bt({
   c,
   [93, 10],
   c,
-  [892, 93],
+  [902, 93],
   c,
   [345, 120],
   c,
-  [51, 50],
+  [57, 56],
   c,
-  [416, 31],
+  [422, 31],
   c,
-  [507, 82],
+  [513, 82],
   c,
-  [538, 40],
+  [544, 40],
   s,
   [1, 109]
 ]),
@@ -5331,19 +5349,19 @@ table: bt({
   49,
   66,
   s,
-  [254, 3],
+  [256, 3],
   67,
   s,
-  [229, 3],
+  [231, 3],
   68,
   s,
-  [224, 4],
+  [226, 4],
   69,
   70,
   71,
   49,
   50,
-  237,
+  239,
   78,
   78,
   79,
@@ -5359,7 +5377,7 @@ table: bt({
   49,
   16,
   111,
-  248,
+  250,
   101,
   103,
   106,
@@ -5372,7 +5390,7 @@ table: bt({
   115,
   c,
   [15, 3],
-  252,
+  254,
   c,
   [15, 4],
   128,
@@ -5389,8 +5407,8 @@ table: bt({
   50,
   143,
   144,
-  231,
-  231,
+  233,
+  233,
   71,
   145,
   50,
@@ -5412,13 +5430,13 @@ table: bt({
   168,
   c,
   [51, 3],
-  246,
+  248,
   c,
   [51, 4],
   174,
   16,
   111,
-  249,
+  251,
   c,
   [8, 4],
   182,
@@ -5438,7 +5456,7 @@ table: bt({
   50,
   214,
   s,
-  [229, 9],
+  [231, 9],
   215,
   217,
   216,
@@ -5450,13 +5468,13 @@ table: bt({
   [23, 4],
   16,
   111,
-  250,
+  252,
   c,
   [43, 4],
   228,
   16,
   111,
-  253,
+  255,
   c,
   [8, 4],
   230,
@@ -5464,33 +5482,33 @@ table: bt({
   s,
   [66, 7],
   231,
-  66,
-  66,
+  s,
+  [66, 6],
   s,
   [68, 4],
   233,
   s,
   [68, 3],
   232,
-  68,
-  68,
+  s,
+  [68, 6],
   s,
   [72, 4],
   234,
   s,
-  [72, 6],
+  [72, 10],
   s,
   [73, 4],
   235,
   s,
-  [73, 6],
+  [73, 10],
   s,
   [74, 4],
   236,
   s,
-  [74, 6],
+  [74, 10],
   c,
-  [140, 6],
+  [160, 6],
   242,
   238,
   c,
@@ -5499,12 +5517,12 @@ table: bt({
   [75, 4],
   245,
   s,
-  [75, 6],
+  [75, 10],
   s,
   [77, 4],
   78,
   s,
-  [77, 7],
+  [77, 11],
   248,
   140,
   49,
@@ -5512,18 +5530,18 @@ table: bt({
   132,
   250,
   c,
-  [33, 4],
+  [41, 4],
   s,
-  [224, 4],
+  [226, 4],
   253,
   s,
-  [224, 9],
+  [226, 13],
   254,
   255,
   49,
   50,
   c,
-  [64, 6],
+  [76, 6],
   262,
   261,
   64,
@@ -5533,11 +5551,11 @@ table: bt({
   264,
   134,
   133,
-  239,
+  241,
   268,
   269,
   c,
-  [212, 3],
+  [244, 3],
   271,
   272,
   52,
@@ -5558,14 +5576,14 @@ table: bt({
   16,
   111,
   c,
-  [165, 4],
+  [197, 4],
   c,
   [6, 6],
   s,
   [282, 4, 1],
   16,
   111,
-  247,
+  249,
   c,
   [11, 4],
   106,
@@ -5574,33 +5592,33 @@ table: bt({
   287,
   157,
   157,
-  303,
+  304,
   s,
   [157, 3],
-  296,
-  294,
-  300,
+  297,
+  295,
   301,
   302,
-  306,
+  303,
+  307,
   157,
-  308,
+  292,
   s,
   [157, 4],
-  292,
-  295,
-  297,
+  293,
+  296,
   298,
   299,
-  304,
+  300,
   305,
-  307,
+  306,
+  308,
   182,
   168,
   c,
-  [264, 14],
+  [296, 14],
   c,
-  [279, 15],
+  [311, 15],
   c,
   [15, 30],
   314,
@@ -5609,46 +5627,46 @@ table: bt({
   [17, 15],
   317,
   s,
-  [261, 4],
-  276,
+  [263, 4],
+  278,
   s,
-  [261, 22],
+  [263, 22],
   319,
   s,
-  [263, 4],
+  [265, 4],
   320,
   321,
   s,
-  [263, 22],
+  [265, 22],
   323,
   s,
-  [265, 4],
-  272,
+  [267, 4],
+  274,
   66,
   s,
-  [265, 22],
+  [267, 22],
   325,
   s,
-  [266, 4],
-  270,
+  [268, 4],
+  272,
   66,
   s,
-  [266, 22],
+  [268, 22],
   327,
   s,
-  [267, 4],
-  269,
+  [269, 4],
+  271,
   66,
   s,
-  [267, 10],
+  [269, 10],
   105,
   s,
-  [267, 12],
+  [269, 12],
   s,
-  [268, 4],
-  271,
+  [270, 4],
+  273,
   s,
-  [268, 22],
+  [270, 22],
   329,
   c,
   [187, 3],
@@ -5657,28 +5675,28 @@ table: bt({
   [183, 6],
   331,
   s,
-  [219, 5],
+  [221, 5],
   333,
   s,
-  [219, 15],
+  [221, 15],
   49,
   s,
-  [219, 7],
+  [221, 7],
   s,
-  [281, 4],
-  274,
+  [283, 4],
+  276,
   s,
-  [281, 22],
+  [283, 22],
   s,
-  [282, 4],
-  273,
+  [284, 4],
+  275,
   s,
-  [282, 22],
+  [284, 22],
   s,
-  [283, 4],
-  275,
+  [285, 4],
+  277,
   s,
-  [283, 22],
+  [285, 22],
   334,
   140,
   49,
@@ -5698,7 +5716,7 @@ table: bt({
   350,
   16,
   111,
-  251,
+  253,
   c,
   [451, 4],
   134,
@@ -5712,14 +5730,14 @@ table: bt({
   231,
   364,
   c,
-  [602, 7],
+  [614, 7],
   233,
   232,
   s,
   [76, 4],
   366,
   s,
-  [76, 6],
+  [76, 10],
   367,
   50,
   369,
@@ -5728,21 +5746,21 @@ table: bt({
   370,
   138,
   136,
-  233,
-  233,
+  235,
+  235,
   71,
   373,
   372,
   c,
-  [578, 7],
+  [582, 7],
   c,
-  [552, 3],
+  [556, 3],
   378,
   c,
-  [555, 3],
+  [559, 3],
   381,
   c,
-  [107, 15],
+  [111, 15],
   383,
   140,
   385,
@@ -5751,14 +5769,14 @@ table: bt({
   16,
   390,
   c,
-  [575, 12],
+  [579, 12],
   16,
   393,
   c,
   [6, 4],
   394,
   c,
-  [659, 3],
+  [667, 3],
   c,
   [56, 4],
   106,
@@ -5770,69 +5788,71 @@ table: bt({
   [53, 15],
   403,
   c,
-  [318, 10],
-  404,
+  [322, 10],
+  c,
+  [37, 6],
+  405,
   c,
-  [387, 3],
+  [397, 3],
   284,
   c,
-  [386, 9],
+  [396, 9],
   c,
-  [383, 9],
-  405,
+  [393, 9],
+  406,
   c,
-  [587, 31],
-  409,
+  [597, 31],
+  410,
   c,
   [16, 14],
-  410,
+  411,
   182,
-  412,
+  413,
   c,
   [17, 14],
   c,
-  [978, 3],
+  [1020, 3],
   c,
-  [127, 4],
+  [96, 4],
   140,
   134,
   133,
-  419,
+  420,
   182,
-  421,
+  422,
   c,
   [27, 14],
-  422,
+  423,
   182,
-  424,
+  425,
   c,
   [17, 14],
-  425,
+  426,
   182,
-  427,
+  428,
   c,
   [17, 14],
-  428,
+  429,
   c,
   [110, 15],
   c,
-  [550, 4],
+  [560, 4],
   c,
-  [549, 10],
+  [559, 10],
   c,
   [91, 3],
   140,
-  433,
-  432,
   434,
-  436,
+  433,
   435,
   437,
-  440,
+  436,
   438,
+  441,
   439,
+  440,
   145,
-  441,
+  442,
   145,
   145,
   105,
@@ -5841,263 +5861,263 @@ table: bt({
   105,
   105,
   c,
-  [1013, 7],
+  [1055, 7],
   134,
   133,
-  444,
+  445,
   c,
-  [247, 6],
-  446,
-  448,
+  [216, 6],
+  447,
+  449,
   132,
   131,
   134,
   133,
-  451,
+  452,
   c,
   [5, 4],
-  452,
   453,
+  454,
   c,
-  [927, 4],
+  [941, 4],
   c,
-  [387, 16],
-  458,
+  [397, 16],
+  459,
   16,
   390,
-  461,
+  462,
   c,
-  [312, 3],
+  [318, 3],
   390,
   26,
   16,
-  466,
-  c,
-  [303, 4],
   467,
+  c,
+  [309, 4],
   468,
+  469,
   217,
   216,
-  469,
+  470,
   c,
   [120, 15],
-  474,
+  476,
   159,
   159,
-  303,
+  304,
   159,
-  277,
+  279,
   66,
   159,
   159,
   c,
-  [892, 6],
+  [902, 6],
   159,
-  308,
+  473,
   s,
   [159, 4],
-  472,
+  474,
   c,
-  [892, 8],
+  [902, 8],
   c,
   [44, 14],
-  476,
-  436,
-  182,
   478,
+  437,
+  182,
+  480,
   c,
   [18, 14],
-  479,
-  436,
-  480,
-  182,
+  481,
+  437,
   482,
+  182,
+  484,
   c,
   [19, 14],
-  483,
-  436,
-  182,
   485,
+  437,
+  182,
+  487,
   c,
   [18, 14],
-  486,
-  436,
-  182,
   488,
+  437,
+  182,
+  490,
   c,
   [18, 14],
-  489,
-  436,
-  490,
   491,
+  437,
+  492,
+  493,
   c,
-  [611, 4],
+  [621, 4],
   c,
   [383, 28],
   c,
-  [488, 6],
+  [494, 6],
   c,
   [36, 30],
   c,
   [67, 16],
-  501,
+  503,
   c,
   [253, 12],
   233,
   c,
   [7, 6],
-  505,
+  507,
   70,
   70,
   c,
   [259, 4],
   16,
   390,
-  510,
+  512,
   217,
   216,
-  511,
-  512,
+  513,
   514,
+  516,
   c,
-  [534, 10],
-  515,
-  182,
-  517,
-  c,
-  [62, 14],
+  [540, 16],
   518,
-  519,
-  436,
+  182,
   520,
-  436,
+  c,
+  [68, 14],
   521,
-  436,
   522,
-  436,
-  474,
-  277,
-  66,
+  437,
   523,
-  16,
+  437,
   524,
+  437,
+  525,
+  437,
+  476,
+  279,
+  66,
+  526,
+  16,
+  527,
   c,
-  [127, 4],
+  [133, 4],
   s,
-  [526, 4, 1],
+  [529, 4, 1],
   362,
   231,
-  530,
+  533,
   16,
   390,
-  532,
-  474,
+  535,
+  476,
   s,
   [162, 3],
-  277,
+  279,
   66,
   s,
   [162, 7],
   c,
-  [150, 16],
-  535,
+  [156, 16],
+  538,
   c,
   [16, 14],
-  536,
-  436,
+  539,
+  437,
   c,
   [33, 15],
   217,
-  539,
+  542,
   216,
-  538,
+  541,
   c,
-  [702, 12],
+  [714, 12],
   c,
   [31, 15],
   99,
   99,
   70,
   c,
-  [172, 6],
-  545,
-  546,
-  436,
-  547,
+  [147, 6],
   548,
   549,
-  16,
+  437,
   550,
+  551,
+  552,
+  16,
+  553,
   c,
   [42, 5],
-  551,
+  554,
   c,
   [6, 4],
-  552,
-  553,
+  555,
+  556,
   231,
-  474,
+  476,
   s,
-  [164, 3],
-  277,
+  [166, 3],
+  279,
   66,
   s,
-  [164, 7],
+  [166, 7],
   c,
   [64, 21],
   217,
-  556,
-  557,
+  559,
+  560,
   216,
   217,
-  558,
-  559,
+  561,
+  562,
   216,
   c,
   [99, 7],
-  561,
+  564,
   c,
   [6, 4],
   s,
-  [562, 5, 1],
+  [565, 5, 1],
   16,
-  567,
+  570,
   c,
   [11, 4],
   217,
   216,
-  568,
+  571,
   c,
-  [827, 13],
+  [839, 13],
   c,
   [6, 5],
   217,
-  572,
+  575,
   216,
-  573,
+  576,
   16,
-  574,
+  577,
   c,
   [16, 5],
-  576,
+  579,
   c,
   [6, 5],
-  577,
+  580,
   c,
   [6, 4],
-  578,
+  581,
   c,
   [170, 3],
-  579,
+  582,
   217,
-  580,
+  583,
   216,
   217,
-  581,
+  584,
   216,
-  582,
-  583,
-  584
+  585,
+  586,
+  587
 ])
 }),
 defaultActions: bda({
@@ -6189,7 +6209,7 @@ defaultActions: bda({
   287,
   289,
   s,
-  [292, 17, 1],
+  [293, 16, 1],
   312,
   313,
   316,
@@ -6221,70 +6241,71 @@ defaultActions: bda({
   396,
   s,
   [398, 5, 1],
-  406,
+  404,
   407,
-  409,
+  408,
+  410,
   s,
-  [412, 6, 1],
-  421,
-  424,
-  427,
+  [413, 6, 1],
+  422,
+  425,
   428,
-  430,
-  432,
-  435,
-  442,
-  444,
+  429,
+  431,
+  433,
+  436,
+  443,
   445,
-  447,
-  450,
+  446,
+  448,
+  451,
   s,
-  [453, 7, 1],
-  462,
-  464,
+  [454, 7, 1],
+  463,
   465,
-  467,
-  469,
-  472,
-  476,
+  466,
+  468,
+  470,
+  474,
   478,
-  479,
   480,
+  481,
   482,
-  483,
+  484,
   485,
-  486,
+  487,
   488,
-  489,
+  490,
+  491,
   s,
-  [491, 4, 1],
-  498,
-  499,
+  [493, 4, 1],
+  500,
   501,
-  502,
-  506,
+  503,
+  504,
+  508,
   s,
-  [507, 4, 2],
-  517,
+  [509, 5, 2],
+  520,
   s,
-  [519, 5, 1],
-  525,
-  531,
-  532,
+  [522, 5, 1],
+  528,
+  534,
   535,
-  536,
-  537,
-  546,
-  547,
-  553,
-  563,
-  565,
-  573,
-  575,
+  538,
+  539,
+  540,
+  549,
+  550,
+  556,
+  566,
+  568,
+  576,
   578,
-  582,
-  583,
-  584
+  581,
+  585,
+  586,
+  587
 ]),
   goto: u([
   4,
@@ -6298,50 +6319,50 @@ defaultActions: bda({
   6,
   3,
   18,
-  225,
-  226,
-  220,
-  221,
+  227,
+  228,
+  222,
+  223,
   1,
   8,
   9,
   10,
   16,
-  235,
-  236,
-  229,
-  224,
+  237,
+  238,
+  231,
+  226,
   114,
   120,
   118,
   119,
-  255,
+  257,
   14,
-  232,
-  238,
+  234,
+  240,
   28,
   113,
   121,
   106,
   108,
   s,
-  [241, 5, 1],
+  [243, 5, 1],
   132,
   151,
-  258,
-  259,
+  260,
+  261,
   133,
   134,
   135,
   117,
-  173,
+  175,
   67,
   71,
-  227,
-  222,
-  228,
-  223,
-  213,
+  229,
+  224,
+  230,
+  225,
+  215,
   12,
   11,
   13,
@@ -6358,25 +6379,25 @@ defaultActions: bda({
   155,
   156,
   158,
-  169,
-  260,
+  171,
   262,
   264,
-  205,
-  200,
-  284,
-  285,
-  214,
-  215,
+  266,
+  207,
+  202,
+  286,
+  287,
   216,
+  217,
+  218,
   123,
   126,
-  256,
-  257,
-  281,
-  282,
+  258,
+  259,
   283,
-  172,
+  284,
+  285,
+  174,
   91,
   78,
   80,
@@ -6385,33 +6406,33 @@ defaultActions: bda({
   89,
   7,
   15,
-  234,
+  236,
   26,
   61,
   29,
   35,
-  240,
+  242,
   76,
   101,
   127,
   129,
-  167,
-  230,
+  169,
+  232,
   s,
-  [288, 15, 1],
-  165,
-  166,
-  204,
-  217,
+  [290, 14, 1],
+  167,
+  168,
   206,
+  219,
   208,
-  286,
-  287,
-  211,
+  210,
+  288,
+  289,
+  213,
   152,
   141,
   144,
-  174,
+  176,
   93,
   94,
   84,
@@ -6442,22 +6463,23 @@ defaultActions: bda({
   130,
   131,
   161,
-  202,
-  203,
-  196,
-  190,
+  163,
+  204,
+  205,
   198,
-  201,
-  278,
-  279,
+  192,
+  200,
+  203,
   280,
-  186,
-  178,
-  182,
-  170,
-  197,
-  207,
-  212,
+  281,
+  282,
+  188,
+  180,
+  184,
+  172,
+  199,
+  209,
+  214,
   122,
   116,
   92,
@@ -6475,20 +6497,20 @@ defaultActions: bda({
   56,
   59,
   111,
-  168,
-  195,
-  188,
-  189,
-  199,
-  184,
-  185,
-  177,
-  176,
-  180,
-  181,
-  218,
-  209,
-  210,
+  170,
+  197,
+  190,
+  191,
+  201,
+  186,
+  187,
+  179,
+  178,
+  182,
+  183,
+  220,
+  211,
+  212,
   153,
   142,
   143,
@@ -6498,20 +6520,21 @@ defaultActions: bda({
   46,
   51,
   58,
-  163,
-  194,
-  187,
-  183,
-  175,
-  179,
-  171,
+  164,
+  165,
+  196,
+  189,
+  185,
+  177,
+  181,
+  173,
   147,
   47,
   57,
-  192,
-  193,
+  194,
+  195,
   160,
-  191,
+  193,
   146,
   97,
   136,
@@ -6561,7 +6584,7 @@ parse: function parse(input) {
     var TERROR = this.TERROR;
     var EOF = this.EOF;
     var ERROR_RECOVERY_TOKEN_DISCARD_COUNT = (this.options.errorRecoveryTokenDiscardCount | 0) || 3;
-    var NO_ACTION = [0, 585 /* === table.length :: ensures that anyone using this new state will fail dramatically! */];
+    var NO_ACTION = [0, 588 /* === table.length :: ensures that anyone using this new state will fail dramatically! */];
 
     var lexer;
     if (this.__lexer__) {