@quenk/wml 2.11.4 → 2.12.0

package/lib/parse/generated.js

@@ -672,28 +672,28 @@ symbols_: {
   "arguments": 129,
   "attribute": 114,
   "attribute_value": 115,
-  "attribute_value_group": 170,
+  "attribute_value_group": 172,
   "attributes": 113,
   "binary_expression": 132,
-  "binary_operator": 159,
-  "binary_operator_group": 175,
-  "boolean_literal": 150,
+  "binary_operator": 161,
+  "binary_operator_group": 179,
+  "boolean_literal": 152,
   "call_expression": 140,
   "characters": 128,
   "child": 109,
-  "child_group": 165,
+  "child_group": 167,
   "children": 108,
   "composite_member": 72,
-  "cons": 153,
+  "cons": 155,
   "construct_expression": 139,
   "constructor_type": 97,
   "context_from_statement": 88,
   "context_members": 80,
-  "context_property": 151,
+  "context_property": 153,
   "context_statement": 79,
-  "context_variable": 152,
+  "context_variable": 154,
   "control": 119,
-  "control_group": 171,
+  "control_group": 173,
   "element": 110,
   "else_clause": 127,
   "error": 2,
@@ -709,11 +709,11 @@ symbols_: {
   "for_parameters": 124,
   "for_statement": 120,
   "fun_statement": 90,
-  "function_expression": 142,
+  "function_expression": 144,
   "function_type": 102,
   "function_type_parameters": 103,
   "grouped_type": 95,
-  "identifier": 156,
+  "identifier": 158,
   "if_expression": 131,
   "if_statement": 126,
   "import_member": 69,
@@ -721,40 +721,44 @@ symbols_: {
   "imports": 67,
   "interpolation": 116,
   "let_statement": 82,
-  "list": 147,
+  "list": 149,
   "list_type": 99,
-  "literal": 143,
-  "literal_group": 173,
+  "literal": 145,
+  "literal_group": 177,
   "member": 74,
   "member_declaration": 84,
-  "member_declaration_option": 164,
+  "member_declaration_option": 166,
   "member_declarations": 83,
   "member_expression": 141,
-  "member_group": 162,
+  "member_expression_head": 142,
+  "member_expression_head_group": 175,
+  "member_expression_tail": 143,
+  "member_expression_tail_group": 176,
+  "member_group": 164,
   "member_list": 73,
-  "member_list_group": 160,
-  "member_list_group2": 161,
+  "member_list_group": 162,
+  "member_list_group2": 163,
   "member_path": 85,
   "module": 66,
   "node": 111,
-  "node_option": 166,
-  "node_option2": 167,
+  "node_option": 168,
+  "node_option2": 169,
   "non_function_type": 96,
-  "number_literal": 149,
+  "number_literal": 151,
   "parameter": 106,
   "parameter_list": 105,
   "parameters": 104,
   "parent_context": 81,
-  "properties": 145,
-  "property": 146,
-  "property_group": 174,
-  "qualified_constructor": 154,
-  "qualified_identifier": 157,
-  "record": 144,
+  "properties": 147,
+  "property": 148,
+  "property_group": 178,
+  "qualified_constructor": 156,
+  "qualified_identifier": 159,
+  "record": 146,
   "record_type": 98,
   "simple_expression": 135,
-  "simple_expression_group": 172,
-  "string_literal": 148,
+  "simple_expression_group": 174,
+  "string_literal": 150,
   "tuple_type": 100,
   "tuple_type_members": 101,
   "type": 94,
@@ -766,18 +770,18 @@ symbols_: {
   "type_parameter_list": 92,
   "type_parameters": 91,
   "type_statement": 77,
-  "type_statement_option": 163,
+  "type_statement_option": 165,
   "unary_expression": 133,
-  "unqualified_constructor": 155,
-  "unqualified_identifier": 158,
+  "unqualified_constructor": 157,
+  "unqualified_identifier": 160,
   "untyped_parameter": 107,
   "view_construction": 136,
   "view_directives": 89,
   "view_statement": 86,
   "view_statement_context": 87,
   "widget": 112,
-  "widget_option": 168,
-  "widget_option2": 169,
+  "widget_option": 170,
+  "widget_option2": 171,
   "{": 13,
   "{%": 24,
   "{{": 39,
@@ -1080,47 +1084,45 @@ productions_: bp({
   s,
   [140, 18],
   s,
-  [141, 11],
-  s,
-  [142, 3],
+  [141, 3],
+  142,
   143,
-  144,
-  144,
-  145,
+  s,
+  [144, 3],
   145,
   146,
+  146,
   147,
+  147,
+  148,
+  149,
   s,
-  [147, 4, 1],
-  150,
-  151,
-  151,
+  [149, 4, 1],
   152,
   153,
   153,
   154,
-  154,
+  155,
   155,
   156,
   156,
   157,
+  158,
+  158,
+  159,
   s,
-  [157, 4, 1],
-  160,
-  161,
-  161,
-  162,
+  [159, 4, 1],
   162,
   163,
   163,
   164,
   164,
-  s,
-  [165, 5],
+  165,
+  165,
   166,
   166,
-  167,
-  167,
+  s,
+  [167, 5],
   168,
   168,
   169,
@@ -1129,14 +1131,22 @@ productions_: bp({
   170,
   171,
   171,
+  172,
+  172,
+  173,
+  173,
   s,
-  [172, 9],
+  [174, 9],
   s,
-  [173, 5],
-  174,
-  174,
+  [175, 9],
+  s,
+  [176, 3],
   s,
-  [175, 14]
+  [177, 5],
+  178,
+  178,
+  s,
+  [179, 14]
 ]),
   rule: u([
   3,
@@ -1270,25 +1280,23 @@ productions_: bp({
   6,
   s,
   [6, 4, -1],
-  s,
-  [3, 8],
-  5,
+  3,
   c,
-  [124, 4],
+  [157, 6],
   2,
   c,
-  [133, 3],
+  [127, 3],
   c,
-  [179, 4],
+  [7, 4],
   c,
-  [65, 5],
+  [59, 5],
   2,
   c,
-  [182, 3],
+  [19, 3],
   c,
-  [156, 6],
+  [150, 6],
   c,
-  [161, 7],
+  [155, 7],
   s,
   [1, 3],
   0,
@@ -1299,7 +1307,11 @@ productions_: bp({
   c,
   [13, 9],
   s,
-  [1, 29]
+  [1, 16],
+  c,
+  [47, 9],
+  s,
+  [1, 16]
 ])
 }),
 performAction: function parser__PerformAction(yyloc, yystate /* action[1] */, yysp, yyvstack, yylstack) {
@@ -1428,7 +1440,11 @@ case 22:
     /*! Production::    export : view_statement */
 case 23:
     /*! Production::    export : fun_statement */
-case 208:
+case 197:
+    /*! Production::    member_expression_head : member_expression_head_group */
+case 198:
+    /*! Production::    member_expression_tail : member_expression_tail_group */
+case 202:
     /*! Production::    literal : literal_group */
 
     // default action (generated by JISON mode classic/merge :: 1,VT,VA,-,-,LT,LA,-,-):
@@ -1504,7 +1520,7 @@ case 149:
     /*! Production::    arguments : expression */
 case 172:
     /*! Production::    type_arg_list : type */
-case 211:
+case 205:
     /*! Production::    properties : property */
 
     // default action (generated by JISON mode classic/merge :: 1,VT,VA,VU,-,LT,LA,-,-):
@@ -1545,7 +1561,7 @@ case 150:
     /*! Production::    arguments : arguments "," expression */
 case 173:
     /*! Production::    type_arg_list : type_arg_list "," type */
-case 212:
+case 206:
     /*! Production::    properties : properties "," property */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,-,-):
@@ -1610,117 +1626,139 @@ case 156:
     /*! Production::    expression : function_expression */
 case 168:
     /*! Production::    simple_expression : simple_expression_group */
-case 223:
+case 217:
     /*! Production::    cons : qualified_constructor */
-case 224:
+case 218:
     /*! Production::    cons : unqualified_constructor */
-case 228:
+case 222:
     /*! Production::    identifier : qualified_identifier */
-case 229:
+case 223:
     /*! Production::    identifier : unqualified_identifier */
-case 233:
+case 227:
     /*! Production::    binary_operator : binary_operator_group */
-case 234:
+case 228:
     /*! Production::    member_list_group : member */
-case 235:
+case 229:
     /*! Production::    member_list_group : aliased_member */
-case 236:
+case 230:
     /*! Production::    member_list_group2 : member */
-case 237:
+case 231:
     /*! Production::    member_list_group2 : aliased_member */
-case 238:
+case 232:
     /*! Production::    member_group : unqualified_identifier */
-case 239:
+case 233:
     /*! Production::    member_group : unqualified_constructor */
-case 241:
+case 235:
     /*! Production::    type_statement_option : type_parameters */
-case 243:
+case 237:
     /*! Production::    member_declaration_option : "?" */
-case 244:
+case 238:
     /*! Production::    child_group : element */
-case 245:
+case 239:
     /*! Production::    child_group : interpolation */
-case 246:
+case 240:
     /*! Production::    child_group : control */
-case 247:
+case 241:
     /*! Production::    child_group : characters */
-case 248:
+case 242:
     /*! Production::    child_group : identifier */
-case 250:
+case 244:
     /*! Production::    node_option : children */
-case 252:
+case 246:
     /*! Production::    node_option2 : children */
-case 254:
+case 248:
     /*! Production::    widget_option : children */
-case 256:
+case 250:
     /*! Production::    widget_option2 : children */
-case 257:
+case 251:
     /*! Production::    attribute_value_group : interpolation */
-case 258:
+case 252:
     /*! Production::    attribute_value_group : literal */
-case 259:
+case 253:
     /*! Production::    control_group : for_statement */
-case 260:
+case 254:
     /*! Production::    control_group : if_statement */
-case 261:
+case 255:
     /*! Production::    simple_expression_group : construct_expression */
-case 262:
+case 256:
     /*! Production::    simple_expression_group : call_expression */
-case 263:
+case 257:
     /*! Production::    simple_expression_group : view_construction */
-case 264:
+case 258:
     /*! Production::    simple_expression_group : member_expression */
-case 265:
+case 259:
     /*! Production::    simple_expression_group : literal */
-case 266:
+case 260:
     /*! Production::    simple_expression_group : context_property */
+case 261:
+    /*! Production::    simple_expression_group : unqualified_constructor */
+case 262:
+    /*! Production::    simple_expression_group : unqualified_identifier */
+case 263:
+    /*! Production::    simple_expression_group : context_variable */
+case 264:
+    /*! Production::    member_expression_head_group : unqualified_identifier */
+case 265:
+    /*! Production::    member_expression_head_group : unqualified_constructor */
+case 266:
+    /*! Production::    member_expression_head_group : context_variable */
 case 267:
-    /*! Production::    simple_expression_group : cons */
+    /*! Production::    member_expression_head_group : context_property */
 case 268:
-    /*! Production::    simple_expression_group : identifier */
+    /*! Production::    member_expression_head_group : list */
 case 269:
-    /*! Production::    simple_expression_group : context_variable */
+    /*! Production::    member_expression_head_group : record */
 case 270:
-    /*! Production::    literal_group : record */
+    /*! Production::    member_expression_head_group : string_literal */
 case 271:
+    /*! Production::    member_expression_head_group : call_expression */
+case 273:
+    /*! Production::    member_expression_tail_group : unqualified_identifier */
+case 274:
+    /*! Production::    member_expression_tail_group : unqualified_constructor */
+case 275:
+    /*! Production::    member_expression_tail_group : string_literal */
+case 276:
+    /*! Production::    literal_group : record */
+case 277:
     /*! Production::    literal_group : list */
-case 272:
+case 278:
     /*! Production::    literal_group : string_literal */
-case 273:
+case 279:
     /*! Production::    literal_group : number_literal */
-case 274:
+case 280:
     /*! Production::    literal_group : boolean_literal */
-case 275:
+case 281:
     /*! Production::    property_group : unqualified_identifier */
-case 276:
+case 282:
     /*! Production::    property_group : string_literal */
-case 277:
+case 283:
     /*! Production::    binary_operator_group : ">" */
-case 278:
+case 284:
     /*! Production::    binary_operator_group : ">=" */
-case 279:
+case 285:
     /*! Production::    binary_operator_group : "<" */
-case 280:
+case 286:
     /*! Production::    binary_operator_group : "<=" */
-case 281:
+case 287:
     /*! Production::    binary_operator_group : "==" */
-case 282:
+case 288:
     /*! Production::    binary_operator_group : "!=" */
-case 283:
+case 289:
     /*! Production::    binary_operator_group : "+" */
-case 284:
+case 290:
     /*! Production::    binary_operator_group : "/" */
-case 285:
+case 291:
     /*! Production::    binary_operator_group : "-" */
-case 286:
+case 292:
     /*! Production::    binary_operator_group : "=" */
-case 287:
+case 293:
     /*! Production::    binary_operator_group : "&&" */
-case 288:
+case 294:
     /*! Production::    binary_operator_group : "||" */
-case 289:
+case 295:
     /*! Production::    binary_operator_group : "^" */
-case 290:
+case 296:
     /*! Production::    binary_operator_group : INSTANCEOF */
 
     // default action (generated by JISON mode classic/merge :: 1,VT,VA,VU,-,LT,LA,-,-):
@@ -1995,7 +2033,7 @@ case 65:
     break;
 
 case 75:
-    /*! Production::    constructor_type : cons */
+    /*! Production::    constructor_type : unqualified_constructor */
 
     // default action (generated by JISON mode classic/merge :: 1,VT,VA,VU,-,LT,LA,LU,LUbA):
     this._$ = yylstack[yysp];
@@ -2006,7 +2044,7 @@ case 75:
     break;
 
 case 76:
-    /*! Production::    constructor_type : cons type_parameters */
+    /*! Production::    constructor_type : unqualified_constructor type_parameters */
 
     // default action (generated by JISON mode classic/merge :: 2,VT,VA,VU,-,LT,LA,LU,LUbA):
     this._$ = yyparser.yyMergeLocationInfo(yysp - 1, yysp);
@@ -2039,7 +2077,7 @@ case 78:
     break;
 
 case 79:
-    /*! Production::    list_type : cons "[" "]" */
+    /*! Production::    list_type : unqualified_constructor "[" "]" */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,LU,LUbA):
     this._$ = yyparser.yyMergeLocationInfo(yysp - 2, yysp);
@@ -2051,7 +2089,7 @@ case 79:
     break;
 
 case 80:
-    /*! Production::    list_type : cons type_parameters "[" "]" */
+    /*! Production::    list_type : unqualified_constructor type_parameters "[" "]" */
 
     // default action (generated by JISON mode classic/merge :: 4,VT,VA,VU,-,LT,LA,LU,LUbA):
     this._$ = yyparser.yyMergeLocationInfo(yysp - 3, yysp);
@@ -2640,7 +2678,7 @@ case 170:
     break;
 
 case 174:
-    /*! Production::    construct_expression : cons "(" arguments ")" */
+    /*! Production::    construct_expression : unqualified_constructor "(" arguments ")" */
 
     // default action (generated by JISON mode classic/merge :: 4,VT,VA,VU,-,LT,LA,LU,LUbA):
     this._$ = yyparser.yyMergeLocationInfo(yysp - 3, yysp);
@@ -2651,7 +2689,7 @@ case 174:
     break;
 
 case 175:
-    /*! Production::    construct_expression : cons "(" ")" */
+    /*! Production::    construct_expression : unqualified_constructor "(" ")" */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,LU,LUbA):
     this._$ = yyparser.yyMergeLocationInfo(yysp - 2, yysp);
@@ -2662,7 +2700,7 @@ case 175:
     break;
 
 case 176:
-    /*! Production::    call_expression : identifier type_arguments "(" arguments ")" */
+    /*! Production::    call_expression : unqualified_identifier type_arguments "(" arguments ")" */
 case 180:
     /*! Production::    call_expression : context_property type_arguments "(" arguments ")" */
 case 184:
@@ -2677,7 +2715,7 @@ case 184:
     break;
 
 case 177:
-    /*! Production::    call_expression : identifier type_arguments "(" ")" */
+    /*! Production::    call_expression : unqualified_identifier type_arguments "(" ")" */
 case 181:
     /*! Production::    call_expression : context_property type_arguments "(" ")" */
 case 185:
@@ -2692,7 +2730,7 @@ case 185:
     break;
 
 case 178:
-    /*! Production::    call_expression : identifier "(" arguments ")" */
+    /*! Production::    call_expression : unqualified_identifier "(" arguments ")" */
 case 182:
     /*! Production::    call_expression : context_property "(" arguments ")" */
 case 186:
@@ -2709,7 +2747,7 @@ case 192:
     break;
 
 case 179:
-    /*! Production::    call_expression : identifier "(" ")" */
+    /*! Production::    call_expression : unqualified_identifier "(" ")" */
 case 183:
     /*! Production::    call_expression : context_property "(" ")" */
 case 187:
@@ -2770,23 +2808,9 @@ case 191:
     break;
 
 case 194:
-    /*! Production::    member_expression : qualified_identifier "." unqualified_identifier */
+    /*! Production::    member_expression : member_expression_head "." member_expression_tail */
 case 195:
-    /*! Production::    member_expression : qualified_constructor "." unqualified_identifier */
-case 196:
-    /*! Production::    member_expression : context_variable "." unqualified_identifier */
-case 197:
-    /*! Production::    member_expression : context_property "." unqualified_identifier */
-case 198:
-    /*! Production::    member_expression : list "." unqualified_identifier */
-case 199:
-    /*! Production::    member_expression : record "." unqualified_identifier */
-case 200:
-    /*! Production::    member_expression : string_literal "." unqualified_identifier */
-case 201:
-    /*! Production::    member_expression : call_expression "." unqualified_identifier */
-case 203:
-    /*! Production::    member_expression : member_expression "." unqualified_identifier */
+    /*! Production::    member_expression : member_expression "." member_expression_tail */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,LU,LUbA):
     this._$ = yyparser.yyMergeLocationInfo(yysp - 2, yysp);
@@ -2796,18 +2820,7 @@ case 203:
     this.$ = new yy.ast.MemberExpression(yyvstack[yysp - 2], yyvstack[yysp], this._$);
     break;
 
-case 202:
-    /*! Production::    member_expression : "(" expression ")" "." unqualified_identifier */
-
-    // default action (generated by JISON mode classic/merge :: 5,VT,VA,VU,-,LT,LA,LU,LUbA):
-    this._$ = yyparser.yyMergeLocationInfo(yysp - 4, yysp);
-    // END of default action (generated by JISON mode classic/merge :: 5,VT,VA,VU,-,LT,LA,LU,LUbA)
-    
-    
-    this.$ = new yy.ast.MemberExpression(yyvstack[yysp - 3], yyvstack[yysp], this._$);
-    break;
-
-case 204:
+case 196:
     /*! Production::    member_expression : member_expression "[" string_literal "]" */
 
     // default action (generated by JISON mode classic/merge :: 4,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2818,7 +2831,7 @@ case 204:
     this.$ = new yy.ast.MemberExpression(yyvstack[yysp - 3], yyvstack[yysp - 1], this._$);
     break;
 
-case 205:
+case 199:
     /*! Production::    function_expression : parameters "->" expression */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2829,7 +2842,7 @@ case 205:
     this.$ = new yy.ast.FunctionExpression(yyvstack[yysp - 2], yyvstack[yysp], this._$);
     break;
 
-case 206:
+case 200:
     /*! Production::    function_expression : untyped_parameter "->" expression */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2840,7 +2853,7 @@ case 206:
     this.$ = new yy.ast.FunctionExpression([yyvstack[yysp - 2]], yyvstack[yysp], this._$);
     break;
 
-case 207:
+case 201:
     /*! Production::    function_expression : "->" expression */
 
     // default action (generated by JISON mode classic/merge :: 2,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2851,7 +2864,7 @@ case 207:
     this.$ = new yy.ast.FunctionExpression([], yyvstack[yysp], this._$);
     break;
 
-case 209:
+case 203:
     /*! Production::    record : "{" "}" */
 
     // default action (generated by JISON mode classic/merge :: 2,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2862,7 +2875,7 @@ case 209:
     this.$ = new yy.ast.Record([], this._$);
     break;
 
-case 210:
+case 204:
     /*! Production::    record : "{" properties "}" */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2873,7 +2886,7 @@ case 210:
     this.$ = new yy.ast.Record(yyvstack[yysp - 1], this._$);
     break;
 
-case 213:
+case 207:
     /*! Production::    property : property_group "=" expression */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2884,7 +2897,7 @@ case 213:
     this.$ = new yy.ast.Property(yyvstack[yysp - 2], yyvstack[yysp], this._$);
     break;
 
-case 214:
+case 208:
     /*! Production::    list : "[" "]" */
 
     // default action (generated by JISON mode classic/merge :: 2,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2895,7 +2908,7 @@ case 214:
     this.$ = new yy.ast.List([], this._$);
     break;
 
-case 215:
+case 209:
     /*! Production::    list : "[" arguments "]" */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2906,7 +2919,7 @@ case 215:
     this.$ = new yy.ast.List(yyvstack[yysp - 1], this._$);
     break;
 
-case 216:
+case 210:
     /*! Production::    string_literal : STRING_LITERAL */
 
     // default action (generated by JISON mode classic/merge :: 1,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2917,7 +2930,7 @@ case 216:
     this.$ = new yy.ast.StringLiteral(yyvstack[yysp].slice(1, yyvstack[yysp].length - 1, this._$));
     break;
 
-case 217:
+case 211:
     /*! Production::    number_literal : NUMBER_LITERAL */
 
     // default action (generated by JISON mode classic/merge :: 1,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2928,7 +2941,7 @@ case 217:
     this.$ = new yy.ast.NumberLiteral(yyvstack[yysp], this._$);
     break;
 
-case 218:
+case 212:
     /*! Production::    boolean_literal : TRUE */
 
     // default action (generated by JISON mode classic/merge :: 1,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2939,7 +2952,7 @@ case 218:
     this.$ = new yy.ast.BooleanLiteral(true, this._$);
     break;
 
-case 219:
+case 213:
     /*! Production::    boolean_literal : FALSE */
 
     // default action (generated by JISON mode classic/merge :: 1,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2950,7 +2963,7 @@ case 219:
     this.$ = new yy.ast.BooleanLiteral(false, this._$);
     break;
 
-case 220:
+case 214:
     /*! Production::    context_property : "@" unqualified_identifier */
 
     // default action (generated by JISON mode classic/merge :: 2,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2961,7 +2974,7 @@ case 220:
     this.$ = new yy.ast.ContextProperty(yyvstack[yysp], this._$)
     break;
 
-case 221:
+case 215:
     /*! Production::    context_property : "@" "[" string_literal "]" */
 
     // default action (generated by JISON mode classic/merge :: 4,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2972,7 +2985,7 @@ case 221:
     this.$ = new yy.ast.ContextProperty(yyvstack[yysp - 1], this._$)
     break;
 
-case 222:
+case 216:
     /*! Production::    context_variable : "@" */
 
     // default action (generated by JISON mode classic/merge :: 1,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2983,9 +2996,9 @@ case 222:
     this.$ = new yy.ast.ContextVariable(this._$);
     break;
 
-case 225:
+case 219:
     /*! Production::    qualified_constructor : IDENTIFIER "." CONSTRUCTOR */
-case 226:
+case 220:
     /*! Production::    qualified_constructor : CONSTRUCTOR "." CONSTRUCTOR */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -2996,7 +3009,7 @@ case 226:
     this.$ = new yy.ast.QualifiedConstructor(yyvstack[yysp - 2], yyvstack[yysp], this._$);
     break;
 
-case 227:
+case 221:
     /*! Production::    unqualified_constructor : CONSTRUCTOR */
 
     // default action (generated by JISON mode classic/merge :: 1,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -3007,9 +3020,9 @@ case 227:
     this.$ = new yy.ast.UnqualifiedConstructor(yyvstack[yysp], this._$);
     break;
 
-case 230:
+case 224:
     /*! Production::    qualified_identifier : IDENTIFIER "." IDENTIFIER */
-case 231:
+case 225:
     /*! Production::    qualified_identifier : CONSTRUCTOR "." IDENTIFIER */
 
     // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -3020,7 +3033,7 @@ case 231:
     this.$ = new yy.ast.QualifiedIdentifier(yyvstack[yysp - 2], yyvstack[yysp], this._$);
     break;
 
-case 232:
+case 226:
     /*! Production::    unqualified_identifier : IDENTIFIER */
 
     // default action (generated by JISON mode classic/merge :: 1,VT,VA,VU,-,LT,LA,LU,LUbA):
@@ -3031,17 +3044,17 @@ case 232:
     this.$ = new yy.ast.UnqualifiedIdentifier(yyvstack[yysp], this._$);
     break;
 
-case 240:
+case 234:
     /*! Production::    type_statement_option : %epsilon */
-case 242:
+case 236:
     /*! Production::    member_declaration_option : %epsilon */
-case 249:
+case 243:
     /*! Production::    node_option : %epsilon */
-case 251:
+case 245:
     /*! Production::    node_option2 : %epsilon */
-case 253:
+case 247:
     /*! Production::    widget_option : %epsilon */
-case 255:
+case 249:
     /*! Production::    widget_option2 : %epsilon */
 
     // default action (generated by JISON mode classic/merge :: 0,VT,VA,VU,-,LT,LA,-,-):
@@ -3052,6 +3065,17 @@ case 255:
     this.$ = undefined;
     break;
 
+case 272:
+    /*! Production::    member_expression_head_group : "(" expression ")" */
+
+    // default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,-,-):
+    this._$ = yyparser.yyMergeLocationInfo(yysp - 2, yysp);
+    // END of default action (generated by JISON mode classic/merge :: 3,VT,VA,VU,-,LT,LA,-,-)
+    
+    
+    this.$ = [yyvstack[yysp - 2], yyvstack[yysp - 1], yyvstack[yysp]];
+    break;
+
 }
 },
 table: bt({
@@ -3076,8 +3100,8 @@ table: bt({
   6,
   c,
   [23, 5],
-  32,
-  29,
+  4,
+  4,
   0,
   1,
   s,
@@ -3109,8 +3133,8 @@ table: bt({
   0,
   9,
   1,
-  17,
-  8,
+  14,
+  5,
   2,
   9,
   2,
@@ -3121,7 +3145,7 @@ table: bt({
   24,
   s,
   [0, 7],
-  44,
+  42,
   s,
   [0, 4],
   10,
@@ -3137,12 +3161,13 @@ table: bt({
   [15, 4],
   0,
   8,
-  18,
+  15,
   c,
   [57, 3],
   2,
-  c,
-  [124, 3],
+  0,
+  0,
+  3,
   4,
   0,
   c,
@@ -3153,174 +3178,165 @@ table: bt({
   0,
   s,
   [11, 3],
-  17,
-  18,
+  14,
+  15,
   12,
   8,
-  19,
-  1,
-  14,
+  16,
   1,
   2,
   0,
   6,
-  8,
+  5,
   c,
-  [75, 3],
+  [73, 3],
   24,
   23,
   0,
   2,
   c,
-  [122, 3],
+  [120, 3],
   24,
   5,
   c,
-  [95, 3],
+  [93, 3],
   s,
   [0, 3],
   27,
   0,
-  47,
+  45,
   s,
-  [44, 3],
-  47,
+  [42, 3],
+  45,
   c,
   [18, 3],
-  44,
+  42,
   c,
   [12, 3],
   29,
   0,
   29,
-  26,
-  28,
-  26,
-  28,
-  32,
-  28,
   27,
+  30,
+  26,
+  30,
+  1,
+  c,
+  [9, 3],
   s,
   [26, 3],
-  0,
-  29,
-  8,
-  s,
-  [0, 5],
   c,
-  [27, 3],
+  [79, 3],
+  c,
+  [164, 5],
+  42,
+  6,
   c,
-  [81, 4],
+  [43, 5],
   s,
-  [0, 5],
-  46,
+  [0, 3],
+  44,
   c,
-  [57, 4],
+  [56, 4],
   c,
-  [157, 3],
+  [154, 3],
   c,
-  [101, 3],
-  3,
-  17,
-  0,
-  8,
-  0,
+  [98, 4],
+  14,
+  c,
+  [30, 3],
   1,
   4,
   0,
   2,
-  44,
-  17,
-  17,
+  42,
+  14,
+  14,
   s,
   [1, 4],
   s,
   [0, 4, 1],
   1,
-  18,
+  15,
   2,
   11,
   5,
   c,
   [28, 3],
   c,
-  [99, 5],
+  [98, 4],
   c,
-  [114, 3],
-  1,
-  2,
+  [3, 4],
   7,
   24,
   23,
   23,
   1,
   c,
-  [44, 3],
+  [42, 3],
   5,
   c,
   [5, 3],
   0,
-  44,
-  32,
+  42,
+  30,
   s,
   [0, 16],
   1,
-  20,
+  22,
   c,
-  [185, 3],
-  17,
+  [180, 3],
+  14,
   c,
-  [47, 3],
-  44,
+  [45, 3],
+  42,
+  42,
+  c,
+  [90, 3],
   44,
-  0,
-  46,
-  2,
+  8,
+  17,
   1,
-  46,
-  2,
-  20,
-  c,
-  [4, 3],
-  18,
-  46,
+  44,
+  15,
   c,
-  [5, 3],
+  [8, 3],
   1,
-  44,
-  s,
-  [2, 5],
+  42,
+  15,
+  8,
   c,
-  [27, 3],
+  [21, 3],
   c,
-  [71, 3],
+  [65, 3],
   c,
-  [41, 3],
-  3,
-  4,
-  0,
+  [35, 3],
+  c,
+  [201, 3],
   5,
   0,
-  c,
-  [71, 4],
   17,
+  5,
+  1,
+  c,
+  [80, 3],
+  14,
   s,
   [0, 4],
   c,
   [5, 4],
   c,
-  [243, 5],
+  [234, 5],
   c,
   [11, 3],
   1,
-  14,
-  0,
-  14,
   c,
-  [111, 3],
+  [222, 3],
   c,
-  [371, 4],
-  17,
+  [159, 3],
+  c,
+  [362, 4],
+  14,
   7,
   0,
   1,
@@ -3333,101 +3349,102 @@ table: bt({
   3,
   c,
   [34, 9],
-  44,
+  42,
   31,
-  44,
+  42,
   1,
   c,
-  [309, 4],
-  c,
-  [152, 3],
-  46,
+  [300, 4],
+  2,
+  0,
+  44,
   c,
-  [4, 3],
+  [149, 4],
   c,
-  [151, 3],
+  [24, 4],
   c,
-  [7, 4],
+  [11, 5],
   c,
-  [6, 6],
+  [16, 6],
   c,
-  [35, 7],
-  1,
+  [178, 3],
   0,
   6,
-  44,
+  42,
   24,
-  44,
-  44,
+  42,
+  42,
   4,
-  44,
+  42,
   c,
-  [16, 7],
-  17,
+  [12, 4],
+  c,
+  [51, 5],
+  14,
   0,
-  16,
+  13,
   1,
   0,
-  16,
+  13,
   c,
-  [67, 4],
+  [66, 4],
   0,
   6,
   c,
-  [80, 4],
+  [79, 4],
   c,
-  [399, 5],
+  [389, 5],
   1,
-  32,
+  30,
   0,
   c,
-  [152, 5],
+  [149, 4],
   c,
-  [74, 5],
+  [72, 4],
   c,
-  [36, 3],
+  [35, 4],
   c,
-  [232, 6],
+  [224, 6],
   c,
   [150, 3],
   0,
   0,
   24,
   c,
-  [127, 4],
+  [54, 4],
   c,
   [3, 4],
   2,
   c,
-  [135, 5],
+  [133, 5],
   1,
   c,
-  [145, 3],
-  44,
+  [64, 3],
+  42,
   c,
-  [95, 4],
+  [91, 3],
   c,
-  [427, 5],
+  [415, 5],
   c,
-  [481, 3],
+  [469, 3],
   0,
   24,
   24,
-  44,
+  42,
   3,
-  16,
+  13,
   c,
-  [124, 5],
+  [118, 5],
   c,
   [5, 4],
   c,
-  [275, 3],
+  [268, 3],
+  1,
   1,
   c,
-  [182, 3],
-  0,
+  [192, 3],
   24,
-  44,
+  42,
   4,
   4,
   24,
@@ -3446,15 +3463,14 @@ table: bt({
   3,
   1,
   c,
-  [305, 5],
+  [298, 5],
   4,
   0,
   3,
   c,
-  [115, 3],
+  [113, 3],
   c,
-  [86, 4],
-  0
+  [139, 5]
 ]),
   symbol: u([
   1,
@@ -3491,7 +3507,7 @@ table: bt({
   57,
   58,
   s,
-  [153, 6, 1],
+  [155, 6, 1],
   c,
   [26, 12],
   c,
@@ -3503,15 +3519,15 @@ table: bt({
   s,
   [69, 4, 1],
   74,
-  155,
-  158,
-  162,
+  157,
+  160,
+  164,
   58,
-  155,
+  157,
   58,
-  155,
+  157,
   57,
-  158,
+  160,
   c,
   [4, 4],
   16,
@@ -3521,31 +3537,11 @@ table: bt({
   114,
   c,
   [6, 7],
-  s,
-  [4, 9, 1],
-  14,
-  15,
-  16,
-  s,
-  [20, 4, 1],
-  27,
-  36,
-  38,
-  40,
-  44,
-  46,
-  50,
-  52,
-  57,
-  s,
-  [59, 7, 1],
-  c,
-  [32, 5],
   10,
   c,
-  [30, 9],
+  [7, 3],
   c,
-  [29, 14],
+  [4, 4],
   26,
   28,
   28,
@@ -3554,13 +3550,13 @@ table: bt({
   70,
   73,
   c,
-  [94, 3],
-  160,
+  [41, 3],
   162,
+  164,
   7,
   11,
   91,
-  163,
+  165,
   11,
   27,
   31,
@@ -3575,9 +3571,9 @@ table: bt({
   91,
   104,
   c,
-  [96, 3],
+  [32, 3],
   114,
-  158,
+  160,
   15,
   24,
   37,
@@ -3593,28 +3589,28 @@ table: bt({
   126,
   128,
   c,
-  [169, 3],
-  165,
+  [116, 3],
   167,
-  171,
+  169,
+  173,
   7,
   9,
   c,
   [33, 3],
   c,
   [36, 29],
-  169,
   171,
+  173,
   57,
   58,
   57,
   58,
   53,
-  148,
+  150,
   57,
   58,
   c,
-  [191, 4],
+  [138, 4],
   c,
   [6, 6],
   5,
@@ -3626,7 +3622,7 @@ table: bt({
   58,
   92,
   93,
-  155,
+  157,
   9,
   53,
   57,
@@ -3634,31 +3630,27 @@ table: bt({
   81,
   84,
   85,
-  148,
-  158,
+  150,
+  160,
   31,
   4,
   11,
   13,
   36,
-  57,
   58,
   s,
   [94, 7, 1],
   102,
-  c,
-  [266, 3],
-  57,
+  157,
   58,
   87,
   88,
   97,
-  c,
-  [8, 3],
+  157,
   4,
   31,
   c,
-  [37, 9],
+  [31, 9],
   4,
   104,
   7,
@@ -3668,17 +3660,17 @@ table: bt({
   105,
   106,
   c,
-  [109, 25],
-  166,
-  171,
+  [103, 25],
+  168,
+  173,
   37,
   c,
   [27, 7],
   c,
   [26, 16],
-  171,
+  173,
   c,
-  [96, 3],
+  [90, 3],
   15,
   17,
   18,
@@ -3692,70 +3684,76 @@ table: bt({
   s,
   [130, 7, 1],
   s,
-  [139, 6, 1],
+  [139, 4, 1],
+  144,
+  145,
+  146,
   s,
-  [147, 12, 1],
-  172,
-  173,
+  [149, 6, 1],
+  157,
+  160,
+  174,
+  175,
+  177,
   10,
   15,
   16,
   24,
   27,
   c,
-  [71, 5],
+  [69, 5],
   10,
   41,
   47,
   57,
-  158,
+  160,
   11,
   13,
   39,
   c,
-  [53, 4],
+  [51, 4],
   115,
   116,
   c,
-  [40, 6],
+  [37, 6],
+  172,
+  177,
+  c,
+  [125, 24],
   170,
-  173,
   c,
-  [127, 24],
-  168,
-  c,
-  [127, 26],
+  [125, 26],
   27,
   c,
-  [355, 3],
+  [347, 3],
   c,
-  [251, 3],
-  161,
-  162,
+  [243, 3],
+  163,
+  164,
   c,
-  [232, 6],
+  [224, 5],
   78,
   c,
-  [233, 11],
+  [225, 9],
   6,
   12,
   6,
   9,
   12,
   6,
-  c,
-  [33, 3],
-  c,
-  [238, 4],
+  27,
+  58,
+  97,
+  157,
   9,
   10,
   19,
-  164,
+  166,
   c,
-  [240, 9],
+  [232, 9],
   7,
-  c,
-  [439, 4],
+  s,
+  [5, 4, 1],
   12,
   14,
   27,
@@ -3764,46 +3762,36 @@ table: bt({
   45,
   c,
   [10, 4],
+  11,
   c,
-  [479, 3],
-  c,
-  [11, 37],
+  [11, 39],
   c,
-  [331, 17],
+  [317, 14],
   4,
   5,
   c,
-  [18, 5],
+  [15, 4],
   c,
-  [17, 7],
+  [14, 7],
   103,
+  157,
   c,
-  [18, 3],
-  c,
-  [46, 11],
+  [40, 11],
   91,
   14,
   53,
   57,
   83,
   c,
-  [350, 5],
+  [336, 5],
   11,
   12,
   c,
-  [56, 11],
+  [50, 10],
   101,
-  c,
-  [57, 4],
-  10,
-  c,
-  [568, 5],
-  c,
-  [41, 3],
-  16,
-  26,
-  c,
-  [100, 5],
+  102,
+  157,
+  5,
   5,
   26,
   5,
@@ -3813,9 +3801,9 @@ table: bt({
   27,
   91,
   c,
-  [412, 8],
+  [377, 5],
   c,
-  [170, 9],
+  [143, 9],
   6,
   27,
   7,
@@ -3823,8 +3811,8 @@ table: bt({
   15,
   24,
   c,
-  [277, 21],
-  171,
+  [244, 21],
+  173,
   c,
   [24, 6],
   c,
@@ -3833,7 +3821,7 @@ table: bt({
   6,
   9,
   c,
-  [302, 25],
+  [269, 25],
   57,
   58,
   c,
@@ -3843,241 +3831,251 @@ table: bt({
   117,
   118,
   c,
-  [257, 6],
-  c,
-  [695, 7],
-  c,
-  [694, 5],
-  c,
-  [693, 7],
-  159,
-  175,
+  [230, 6],
+  15,
+  16,
+  s,
+  [20, 4, 1],
+  27,
+  40,
+  44,
+  46,
+  50,
+  52,
+  s,
+  [59, 7, 1],
+  161,
+  179,
   c,
-  [213, 4],
+  [189, 4],
   c,
-  [466, 13],
+  [431, 13],
   105,
   106,
   c,
-  [468, 28],
+  [433, 26],
   c,
-  [512, 44],
+  [475, 42],
   c,
-  [44, 88],
+  [42, 84],
   3,
   c,
-  [355, 4],
+  [326, 4],
   c,
-  [46, 14],
+  [44, 14],
   s,
   [129, 8, 1],
   c,
-  [47, 20],
+  [45, 18],
   36,
   36,
   c,
-  [137, 45],
+  [131, 43],
   c,
-  [996, 14],
+  [288, 4],
+  10,
   c,
-  [301, 12],
+  [289, 21],
   c,
   [27, 6],
   c,
-  [1054, 10],
+  [463, 3],
   c,
-  [28, 12],
+  [28, 19],
   137,
   c,
-  [29, 34],
-  c,
-  [84, 26],
+  [29, 35],
   c,
-  [54, 23],
-  c,
-  [138, 31],
+  [85, 37],
+  36,
   c,
-  [1191, 11],
+  [57, 13],
   c,
-  [28, 13],
+  [56, 27],
   c,
-  [237, 3],
+  [210, 3],
   18,
   c,
-  [233, 6],
+  [206, 6],
   c,
-  [226, 5],
+  [199, 6],
   c,
-  [225, 22],
+  [846, 14],
   c,
-  [115, 22],
-  c,
-  [253, 27],
+  [142, 20],
+  57,
   c,
-  [26, 83],
+  [59, 7],
+  160,
   c,
-  [132, 15],
+  [86, 26],
   c,
-  [1353, 8],
-  158,
+  [26, 52],
   c,
-  [842, 3],
-  145,
-  146,
+  [728, 3],
+  147,
   148,
-  158,
-  174,
+  150,
+  160,
+  178,
   57,
   57,
   c,
-  [441, 44],
+  [358, 42],
   57,
   106,
   107,
   124,
   125,
-  158,
+  160,
   7,
   c,
-  [1350, 3],
+  [1214, 3],
   c,
-  [543, 46],
+  [456, 44],
   c,
-  [830, 27],
+  [733, 27],
   c,
-  [994, 5],
-  28,
+  [1418, 3],
+  c,
+  [1240, 3],
   8,
   27,
   58,
   93,
-  155,
+  157,
   c,
-  [1037, 17],
+  [913, 14],
   c,
-  [948, 3],
+  [848, 3],
   c,
-  [947, 5],
+  [847, 5],
   c,
   [8, 3],
   c,
-  [952, 4],
+  [852, 4],
   c,
-  [748, 47],
+  [652, 45],
   c,
-  [1113, 15],
+  [984, 12],
   c,
-  [17, 16],
+  [14, 13],
   s,
   [12, 4],
   36,
   c,
-  [1503, 4],
+  [1354, 4],
   36,
   5,
   c,
-  [1141, 18],
+  [1009, 15],
   11,
   c,
-  [26, 3],
+  [23, 3],
   c,
-  [1143, 9],
+  [1011, 9],
   12,
   c,
-  [1535, 4],
+  [1383, 4],
   6,
   14,
   6,
   12,
-  58,
-  58,
   27,
   53,
-  148,
+  150,
   5,
   6,
   c,
-  [1087, 3],
+  [974, 3],
   82,
   89,
   c,
-  [202, 3],
+  [186, 3],
   c,
-  [1094, 47],
+  [981, 47],
   c,
   [23, 23],
   27,
   57,
   106,
   c,
-  [1232, 3],
+  [1098, 3],
   c,
-  [1618, 17],
+  [149, 12],
   c,
-  [28, 3],
+  [994, 5],
   16,
   8,
   40,
   118,
   c,
-  [992, 48],
+  [880, 46],
   c,
-  [662, 28],
+  [581, 26],
   c,
-  [232, 3],
+  [220, 3],
   7,
   9,
+  10,
   11,
   c,
-  [527, 6],
+  [499, 6],
   36,
   c,
-  [550, 8],
+  [660, 9],
   50,
   c,
-  [124, 17],
+  [119, 14],
   6,
   12,
   c,
-  [1153, 89],
+  [1034, 85],
   c,
-  [1288, 16],
+  [1163, 16],
   c,
-  [565, 29],
-  57,
-  158,
+  [535, 27],
   4,
   c,
-  [49, 49],
+  [45, 44],
+  53,
+  57,
+  58,
+  143,
+  150,
+  157,
+  160,
+  176,
   c,
-  [204, 3],
+  [197, 4],
   53,
   c,
-  [205, 10],
+  [198, 9],
   138,
-  148,
+  150,
+  157,
   c,
-  [505, 4],
+  [70, 45],
   c,
-  [69, 52],
+  [259, 13],
+  138,
   c,
-  [68, 11],
+  [1526, 5],
   c,
-  [1685, 7],
+  [174, 85],
+  16,
   c,
-  [66, 42],
+  [1209, 45],
   c,
-  [113, 49],
+  [1010, 5],
   16,
   c,
-  [899, 45],
-  158,
-  57,
-  158,
+  [925, 5],
+  137,
   c,
-  [4, 6],
+  [232, 8],
   53,
-  148,
+  150,
   6,
   14,
   7,
@@ -4093,122 +4091,128 @@ table: bt({
   42,
   45,
   c,
-  [2046, 17],
+  [1883, 17],
   c,
-  [863, 5],
+  [830, 5],
+  16,
+  10,
+  10,
   c,
-  [95, 4],
+  [109, 4],
   c,
-  [780, 31],
+  [755, 25],
   c,
-  [859, 4],
+  [826, 4],
   c,
-  [18, 14],
+  [15, 11],
   c,
-  [1488, 4],
+  [1362, 4],
   c,
-  [786, 8],
+  [758, 7],
   c,
-  [50, 6],
+  [41, 4],
   c,
-  [14, 11],
+  [11, 8],
   5,
   12,
   53,
   57,
   c,
-  [1927, 6],
+  [1764, 6],
   c,
-  [54, 15],
+  [45, 12],
   c,
-  [793, 7],
+  [761, 7],
   c,
-  [801, 10],
+  [769, 10],
   82,
   c,
   [6, 3],
   32,
   c,
-  [761, 24],
+  [729, 24],
   35,
   41,
   47,
   c,
-  [251, 45],
+  [247, 46],
   c,
-  [1535, 29],
+  [1400, 26],
   c,
-  [1894, 3],
+  [1747, 3],
   c,
-  [75, 43],
+  [73, 41],
   c,
-  [739, 45],
+  [711, 43],
   5,
   6,
   c,
-  [466, 46],
+  [452, 44],
   5,
   c,
-  [2343, 3],
+  [2160, 3],
   12,
   c,
-  [51, 48],
+  [49, 46],
   c,
-  [101, 50],
+  [97, 48],
   c,
-  [390, 4],
+  [375, 4],
   c,
-  [1475, 4],
+  [1411, 4],
   c,
-  [203, 44],
+  [195, 42],
   c,
-  [1203, 24],
+  [1157, 24],
   c,
-  [1010, 88],
+  [972, 84],
   c,
-  [1585, 3],
+  [1517, 3],
   c,
-  [550, 4],
+  [529, 4],
   c,
-  [48, 41],
+  [46, 39],
+  16,
+  58,
+  58,
   c,
-  [684, 24],
+  [648, 19],
   c,
-  [16, 10],
+  [13, 8],
   11,
   c,
-  [17, 16],
+  [14, 13],
   6,
   11,
   36,
   c,
-  [616, 6],
+  [589, 6],
   c,
-  [629, 13],
+  [602, 13],
   c,
-  [604, 3],
+  [577, 3],
   27,
   5,
   c,
-  [1959, 33],
+  [1243, 30],
   c,
-  [938, 48],
+  [901, 45],
   44,
   c,
-  [567, 47],
+  [538, 45],
   c,
-  [205, 16],
+  [188, 13],
   c,
-  [487, 5],
+  [459, 5],
   10,
   11,
   16,
   137,
   c,
-  [787, 17],
+  [749, 17],
   127,
   c,
-  [788, 7],
+  [750, 7],
   27,
   46,
   5,
@@ -4216,46 +4220,43 @@ table: bt({
   36,
   4,
   c,
-  [196, 6],
+  [185, 6],
   27,
   c,
-  [753, 3],
-  c,
-  [752, 5],
+  [964, 8],
   c,
-  [746, 5],
-  137,
+  [963, 6],
   c,
-  [1386, 90],
+  [1326, 86],
   c,
-  [170, 5],
+  [163, 5],
   c,
-  [92, 41],
+  [88, 39],
   41,
   44,
   47,
   48,
   c,
-  [1787, 30],
+  [1711, 30],
   c,
-  [608, 62],
+  [578, 60],
   c,
-  [3000, 3],
+  [2806, 3],
   c,
-  [484, 16],
+  [462, 13],
   5,
   c,
-  [1909, 3],
+  [1828, 3],
   27,
   47,
   c,
-  [1880, 47],
+  [1799, 47],
   c,
-  [328, 3],
+  [317, 3],
   c,
-  [320, 13],
+  [309, 13],
   c,
-  [156, 68],
+  [151, 66],
   41,
   43,
   44,
@@ -4263,14 +4264,14 @@ table: bt({
   c,
   [4, 4],
   c,
-  [2043, 47],
+  [1960, 47],
   s,
   [27, 5],
   c,
   [28, 23],
   41,
   c,
-  [334, 50],
+  [327, 50],
   c,
   [24, 24],
   41,
@@ -4279,11 +4280,11 @@ table: bt({
   c,
   [102, 18],
   c,
-  [602, 7],
+  [589, 7],
   c,
-  [317, 47],
+  [315, 47],
   c,
-  [485, 4],
+  [478, 4],
   c,
   [79, 3],
   c,
@@ -4317,17 +4318,17 @@ table: bt({
   c,
   [6, 9],
   s,
-  [2, 63],
+  [2, 10],
   c,
-  [112, 9],
+  [59, 9],
   c,
-  [83, 6],
+  [30, 6],
   c,
   [19, 5],
   c,
   [13, 8],
   c,
-  [95, 8],
+  [42, 8],
   s,
   [0, 19],
   c,
@@ -4341,211 +4342,207 @@ table: bt({
   c,
   [44, 12],
   c,
-  [245, 12],
+  [192, 12],
   c,
-  [63, 15],
+  [195, 13],
   c,
-  [26, 13],
+  [57, 10],
   c,
-  [253, 9],
+  [194, 8],
   c,
-  [240, 13],
+  [181, 13],
   c,
-  [145, 29],
+  [139, 29],
   c,
   [25, 23],
   c,
   [59, 26],
   c,
-  [44, 24],
-  c,
-  [110, 18],
+  [42, 22],
   c,
-  [127, 54],
+  [108, 18],
   c,
-  [34, 12],
+  [125, 54],
   c,
-  [110, 21],
+  [262, 12],
   c,
-  [40, 8],
+  [313, 22],
   c,
-  [277, 16],
+  [263, 16],
+  s,
+  [2, 54],
   c,
-  [466, 61],
+  [92, 15],
   c,
-  [349, 24],
+  [214, 20],
   c,
-  [223, 13],
+  [105, 9],
   c,
-  [214, 24],
+  [218, 23],
   c,
-  [91, 24],
+  [547, 4],
   c,
-  [683, 17],
+  [406, 18],
   c,
-  [345, 28],
+  [244, 22],
   c,
-  [401, 34],
+  [366, 34],
   c,
   [28, 19],
   c,
-  [652, 10],
+  [611, 10],
   c,
-  [222, 24],
+  [196, 24],
   c,
-  [240, 27],
+  [214, 25],
   c,
-  [468, 34],
+  [433, 34],
   c,
-  [512, 44],
+  [475, 42],
   c,
-  [44, 89],
+  [42, 85],
   c,
-  [180, 32],
+  [172, 30],
   c,
-  [47, 46],
+  [45, 44],
   c,
-  [551, 56],
+  [513, 56],
   c,
   [29, 57],
   c,
-  [54, 79],
-  c,
-  [233, 33],
-  s,
-  [2, 161],
+  [57, 66],
   c,
-  [842, 16],
+  [198, 48],
   c,
-  [441, 40],
+  [746, 61],
   c,
-  [222, 25],
+  [130, 26],
   c,
-  [543, 38],
+  [358, 45],
   c,
-  [830, 24],
+  [166, 25],
   c,
-  [807, 12],
+  [456, 36],
   c,
-  [1162, 19],
+  [733, 24],
   c,
-  [837, 21],
+  [710, 11],
   c,
-  [611, 36],
+  [1029, 17],
   c,
-  [17, 34],
+  [737, 21],
   c,
-  [1159, 30],
+  [521, 33],
   c,
-  [26, 11],
+  [14, 28],
   c,
-  [562, 14],
+  [1024, 27],
   c,
-  [1070, 28],
+  [24, 12],
   c,
-  [1094, 30],
+  [372, 12],
   c,
-  [259, 21],
+  [957, 28],
   c,
-  [1618, 22],
+  [981, 30],
   c,
-  [672, 19],
+  [243, 21],
   c,
-  [855, 40],
+  [123, 16],
   c,
-  [662, 49],
+  [231, 7],
   c,
-  [972, 72],
+  [749, 53],
   c,
-  [1016, 45],
+  [581, 41],
   c,
-  [565, 31],
+  [1251, 27],
   c,
-  [1157, 49],
+  [992, 91],
   c,
-  [1774, 21],
+  [991, 72],
   c,
-  [69, 55],
+  [1414, 25],
   c,
-  [184, 59],
+  [1106, 51],
   c,
-  [231, 64],
+  [174, 102],
   c,
-  [47, 32],
+  [1857, 58],
   c,
-  [2392, 12],
+  [1982, 11],
   c,
-  [460, 30],
+  [873, 29],
   c,
-  [2178, 23],
+  [2194, 14],
   c,
-  [1910, 41],
+  [755, 29],
   c,
-  [2329, 15],
+  [29, 21],
   c,
-  [14, 12],
+  [11, 19],
   c,
-  [72, 23],
+  [666, 19],
   c,
-  [952, 15],
+  [379, 12],
   c,
-  [2179, 28],
+  [2001, 28],
   c,
-  [1095, 49],
+  [1045, 47],
   c,
-  [704, 31],
+  [1175, 31],
   c,
-  [650, 89],
+  [626, 85],
   c,
-  [1262, 56],
+  [1206, 54],
   c,
-  [51, 63],
+  [49, 61],
   c,
-  [50, 36],
+  [48, 34],
   c,
-  [898, 54],
+  [864, 52],
   c,
-  [2119, 107],
+  [1964, 103],
   c,
-  [92, 54],
+  [88, 53],
   c,
-  [178, 27],
+  [648, 22],
   c,
-  [2786, 22],
+  [2909, 15],
   c,
-  [637, 13],
+  [249, 10],
   c,
-  [481, 41],
+  [602, 18],
   c,
-  [938, 95],
+  [1243, 45],
   c,
-  [1371, 26],
+  [901, 78],
   c,
-  [392, 34],
+  [2524, 19],
   c,
-  [3036, 26],
+  [368, 32],
   c,
-  [1386, 84],
+  [2820, 26],
   c,
-  [783, 55],
+  [1326, 123],
   c,
-  [608, 95],
+  [2692, 51],
   c,
-  [63, 22],
+  [490, 59],
   c,
-  [2997, 51],
+  [55, 29],
   c,
-  [372, 39],
+  [1070, 39],
   c,
-  [3439, 50],
+  [729, 81],
   c,
-  [3137, 70],
+  [2941, 71],
   c,
-  [334, 55],
+  [327, 55],
   c,
-  [410, 69],
+  [403, 69],
   c,
-  [317, 37]
+  [315, 37]
 ]),
   state: u([
   1,
@@ -4645,620 +4642,605 @@ table: bt({
   [140, 4, 1],
   138,
   146,
-  33,
-  34,
+  149,
   151,
-  153,
+  150,
   152,
-  154,
-  33,
-  34,
-  157,
+  155,
   c,
-  [23, 5],
-  158,
+  [19, 5],
+  156,
+  160,
+  161,
   162,
-  163,
   164,
-  166,
   c,
-  [64, 16],
-  165,
+  [60, 16],
+  163,
   98,
-  168,
+  166,
   c,
   [18, 15],
   98,
-  182,
-  183,
+  180,
+  181,
   s,
-  [169, 6, 1],
-  187,
+  [167, 6, 1],
   185,
+  183,
+  184,
   186,
+  193,
+  173,
+  187,
+  s,
+  [197, 5, 1],
   188,
-  175,
+  191,
   189,
-  199,
-  198,
-  200,
-  204,
-  205,
   190,
-  193,
-  191,
-  197,
-  34,
-  192,
+  179,
   196,
   194,
-  181,
-  201,
-  213,
-  214,
+  210,
+  211,
   s,
-  [216, 5, 1],
-  204,
-  205,
-  215,
+  [213, 5, 1],
+  200,
   201,
-  223,
+  212,
+  194,
+  220,
   c,
-  [76, 16],
-  222,
+  [74, 16],
+  219,
   c,
-  [76, 18],
-  228,
-  227,
+  [74, 18],
+  225,
+  224,
   47,
   46,
-  226,
+  223,
   45,
-  229,
-  230,
-  c,
-  [146, 10],
-  236,
+  226,
+  227,
   c,
-  [144, 3],
+  [140, 8],
+  233,
+  152,
+  234,
   237,
-  240,
   c,
-  [145, 5],
-  248,
+  [139, 5],
+  245,
   c,
-  [22, 10],
-  254,
+  [18, 8],
   251,
+  248,
   c,
-  [10, 4],
+  [8, 4],
+  249,
+  247,
+  146,
   252,
-  250,
+  254,
+  256,
   c,
-  [11, 3],
-  255,
-  257,
+  [24, 3],
   259,
   c,
-  [28, 3],
+  [24, 6],
+  258,
+  138,
+  146,
   262,
+  263,
   c,
-  [28, 6],
-  261,
+  [184, 3],
+  264,
   c,
-  [29, 4],
-  267,
+  [45, 5],
   268,
   c,
-  [198, 5],
-  269,
-  c,
-  [53, 5],
-  273,
-  c,
-  [118, 16],
+  [106, 16],
   98,
-  274,
+  269,
   c,
   [17, 16],
   c,
-  [134, 17],
-  279,
+  [122, 17],
+  274,
   31,
   32,
+  276,
+  277,
+  279,
   281,
-  282,
-  284,
-  286,
-  182,
-  162,
-  163,
-  183,
-  301,
-  c,
-  [219, 23],
-  302,
+  180,
+  160,
+  161,
   181,
-  201,
-  182,
-  183,
-  303,
+  296,
   c,
-  [248, 26],
-  182,
-  183,
-  304,
+  [205, 20],
+  297,
   c,
-  [29, 28],
-  305,
+  [205, 3],
+  180,
+  181,
+  298,
   c,
-  [29, 28],
-  308,
-  309,
+  [232, 24],
+  180,
+  181,
+  299,
   c,
-  [30, 28],
-  312,
+  [27, 26],
+  300,
   c,
-  [29, 26],
-  315,
+  [27, 26],
+  303,
+  304,
+  c,
+  [28, 26],
+  307,
+  c,
+  [27, 24],
+  309,
+  313,
+  317,
   319,
-  324,
-  327,
   c,
-  [25, 4],
+  [23, 5],
   c,
-  [24, 13],
-  32,
+  [22, 9],
+  321,
+  c,
+  [22, 3],
+  323,
+  326,
+  327,
+  330,
+  329,
+  328,
+  180,
   181,
-  201,
+  331,
+  c,
+  [55, 24],
+  336,
+  333,
+  332,
   334,
-  337,
-  338,
-  341,
-  340,
-  339,
-  182,
-  183,
-  342,
+  335,
   c,
-  [59, 26],
-  347,
+  [115, 28],
+  c,
+  [277, 17],
+  339,
+  33,
+  34,
   344,
-  343,
+  127,
   345,
-  346,
   c,
-  [123, 30],
+  [379, 8],
+  346,
+  347,
   c,
-  [295, 17],
+  [348, 3],
   350,
-  33,
-  34,
-  353,
-  127,
-  354,
+  349,
+  180,
+  181,
+  352,
   c,
-  [405, 10],
-  355,
-  356,
+  [65, 24],
+  353,
   c,
-  [368, 3],
-  359,
-  358,
-  182,
-  183,
-  361,
+  [43, 8],
+  354,
   c,
-  [69, 26],
-  362,
+  [431, 14],
+  365,
+  247,
+  146,
   c,
-  [47, 10],
-  363,
+  [616, 3],
+  373,
+  378,
+  377,
+  376,
+  14,
+  15,
+  380,
   c,
-  [463, 16],
-  374,
+  [413, 17],
+  381,
   c,
-  [463, 4],
+  [413, 33],
+  384,
+  162,
+  385,
   c,
-  [662, 3],
-  382,
-  387,
+  [81, 8],
   386,
-  385,
-  14,
-  15,
+  31,
+  32,
   389,
-  c,
-  [441, 17],
+  180,
+  181,
   390,
   c,
-  [441, 33],
-  393,
-  164,
-  394,
+  [130, 24],
+  391,
   c,
-  [85, 10],
+  [280, 18],
+  317,
   395,
-  31,
-  32,
+  c,
+  [60, 8],
+  180,
+  181,
   398,
-  182,
-  183,
+  c,
+  [366, 26],
   399,
   c,
-  [140, 26],
+  [27, 26],
   400,
   c,
-  [300, 20],
-  404,
+  [421, 27],
+  403,
   c,
-  [65, 10],
-  182,
-  183,
-  407,
+  [28, 25],
+  405,
+  s,
+  [409, 4, -1],
+  412,
   c,
-  [393, 28],
-  408,
+  [124, 7],
+  411,
+  410,
   c,
-  [29, 28],
-  409,
+  [126, 3],
+  414,
   c,
-  [329, 27],
-  411,
-  182,
-  183,
-  413,
+  [44, 25],
   c,
-  [31, 27],
-  415,
-  418,
+  [39, 9],
   c,
-  [131, 7],
-  417,
+  [38, 3],
   416,
   c,
-  [133, 5],
-  420,
+  [110, 27],
+  419,
   c,
-  [44, 27],
+  [28, 27],
   422,
   c,
-  [44, 9],
-  c,
-  [43, 5],
+  [27, 24],
+  317,
   423,
   c,
-  [570, 29],
-  426,
-  c,
-  [30, 27],
-  428,
-  182,
-  183,
-  430,
-  c,
-  [30, 26],
-  s,
-  [431, 6, 1],
-  445,
+  [138, 4],
+  424,
+  433,
   c,
-  [971, 9],
-  446,
+  [906, 9],
+  434,
   33,
   34,
-  448,
-  c,
-  [296, 10],
-  449,
+  438,
   c,
-  [11, 10],
-  451,
+  [276, 8],
+  439,
   c,
-  [11, 10],
-  455,
-  453,
+  [9, 8],
+  441,
   c,
-  [10, 4],
+  [9, 8],
+  445,
+  443,
   c,
-  [9, 4],
-  456,
+  [8, 4],
+  146,
+  445,
+  446,
   c,
-  [9, 7],
-  460,
+  [7, 5],
+  450,
   c,
-  [543, 3],
-  461,
+  [500, 3],
+  451,
   c,
-  [33, 10],
-  387,
-  463,
-  462,
+  [27, 8],
+  378,
+  453,
+  452,
   14,
   15,
-  387,
-  466,
-  465,
+  378,
+  456,
+  455,
   14,
   15,
-  468,
-  467,
+  458,
+  457,
   14,
   15,
   c,
-  [1111, 19],
-  473,
-  c,
-  [145, 26],
-  476,
-  474,
-  286,
-  182,
-  183,
-  479,
+  [1032, 19],
+  463,
   c,
-  [237, 28],
-  481,
+  [132, 24],
+  466,
+  464,
+  281,
+  180,
+  181,
+  468,
   c,
-  [29, 28],
-  483,
+  [189, 26],
+  470,
   c,
-  [296, 29],
-  489,
+  [27, 26],
+  472,
   c,
-  [30, 29],
-  493,
+  [244, 27],
+  478,
   c,
-  [30, 27],
-  498,
+  [28, 27],
+  482,
   c,
-  [871, 5],
-  499,
+  [28, 25],
+  487,
   c,
-  [33, 26],
-  500,
+  [808, 5],
+  488,
   c,
-  [725, 17],
-  182,
-  183,
-  501,
+  [31, 24],
+  489,
   c,
-  [110, 28],
-  502,
+  [674, 17],
+  180,
+  181,
+  490,
   c,
-  [29, 26],
-  503,
-  504,
+  [104, 26],
+  491,
   c,
-  [945, 3],
-  505,
+  [27, 24],
+  492,
+  493,
   c,
-  [32, 26],
-  507,
+  [878, 3],
+  494,
   c,
-  [864, 11],
-  509,
+  [30, 24],
+  496,
   c,
-  [10, 4],
-  508,
+  [803, 9],
+  498,
   c,
-  [10, 9],
-  252,
+  [8, 4],
+  497,
   c,
-  [10, 3],
-  468,
-  511,
+  [8, 7],
+  249,
+  146,
+  458,
+  500,
   c,
-  [382, 3],
-  513,
-  512,
+  [356, 3],
+  502,
+  501,
   c,
-  [382, 3],
-  514,
+  [356, 3],
+  503,
   14,
   15,
-  518,
+  507,
   c,
-  [779, 20],
-  182,
-  183,
-  521,
+  [720, 18],
+  180,
+  181,
+  510,
   c,
-  [236, 27],
-  523,
-  182,
-  183,
-  525,
+  [246, 27],
+  513,
   c,
-  [30, 26],
-  527,
+  [27, 24],
+  515,
   c,
-  [125, 10],
-  476,
+  [112, 8],
+  466,
   c,
-  [475, 11],
-  532,
+  [440, 11],
+  520,
   c,
-  [245, 6],
-  468,
-  538,
+  [224, 6],
+  458,
+  526,
   14,
   15,
-  476,
-  182,
-  183,
-  540,
-  c,
-  [250, 28],
-  541,
+  466,
+  180,
+  181,
+  528,
   c,
-  [390, 29],
-  544,
+  [87, 26],
+  529,
   c,
-  [29, 26],
-  547,
+  [115, 27],
+  532,
   c,
-  [356, 17],
-  548,
+  [27, 24],
+  535,
   c,
-  [374, 19],
-  549,
+  [329, 17],
+  536,
   c,
-  [65, 26],
-  254,
-  551,
+  [347, 19],
+  537,
   c,
-  [187, 4],
-  550,
+  [63, 24],
+  251,
+  539,
   c,
-  [187, 3],
+  [177, 4],
+  538,
+  146,
   c,
-  [661, 17],
+  [616, 17],
   c,
   [17, 17],
-  476,
-  561,
+  466,
+  549,
   c,
-  [92, 19],
-  562,
+  [88, 19],
+  550,
   c,
-  [92, 26],
-  567,
+  [88, 24],
+  555,
   c,
-  [47, 17],
+  [45, 17],
   c,
-  [100, 34],
-  576,
+  [98, 34],
+  564,
   c,
   [52, 17],
-  577,
+  565,
   c,
   [18, 17],
-  578,
+  566,
   c,
   [88, 28],
-  582,
+  570,
   c,
   [106, 40]
 ]),
   mode: u([
   s,
-  [1, 40],
-  s,
-  [2, 6],
-  c,
-  [7, 7],
+  [1, 41],
   s,
-  [2, 24],
+  [2, 3],
   c,
-  [31, 24],
+  [4, 5],
   c,
-  [66, 6],
+  [12, 5],
   c,
-  [82, 16],
+  [28, 16],
   c,
-  [89, 9],
+  [35, 10],
   c,
-  [31, 22],
+  [31, 21],
   c,
   [17, 16],
   c,
-  [60, 19],
+  [58, 17],
   c,
-  [53, 17],
+  [51, 17],
   c,
-  [171, 11],
-  c,
-  [88, 8],
+  [80, 8],
+  s,
+  [2, 6],
   c,
-  [51, 32],
+  [51, 36],
   c,
-  [181, 3],
+  [158, 3],
   c,
-  [142, 14],
+  [138, 13],
   c,
-  [201, 11],
+  [56, 5],
   c,
-  [157, 5],
+  [7, 10],
   c,
-  [219, 17],
+  [11, 11],
   c,
-  [11, 18],
+  [29, 14],
   c,
-  [127, 17],
+  [40, 12],
   c,
-  [24, 18],
+  [123, 14],
   c,
-  [57, 14],
+  [22, 17],
   c,
-  [118, 4],
+  [18, 4],
   c,
-  [3, 5],
+  [205, 28],
   c,
-  [227, 34],
+  [147, 10],
   c,
-  [41, 6],
+  [300, 11],
   c,
-  [159, 12],
+  [70, 6],
   s,
   [1, 104],
+  s,
+  [2, 26],
   c,
-  [466, 26],
+  [211, 6],
   c,
-  [27, 6],
+  [33, 22],
   c,
-  [28, 55],
+  [164, 7],
   c,
-  [54, 27],
+  [28, 27],
   c,
-  [601, 49],
+  [55, 49],
+  s,
+  [2, 27],
   c,
-  [651, 27],
+  [176, 17],
   c,
-  [528, 15],
+  [66, 15],
   c,
-  [66, 28],
+  [81, 49],
   c,
-  [120, 52],
+  [118, 49],
   c,
-  [172, 53],
+  [726, 14],
   c,
-  [27, 15],
+  [456, 25],
   c,
-  [622, 9],
+  [439, 63],
   c,
-  [383, 24],
+  [602, 22],
   c,
-  [535, 26],
+  [82, 62],
   c,
-  [518, 67],
+  [644, 5],
   c,
-  [704, 24],
+  [216, 35],
+  s,
+  [1, 130],
   c,
-  [84, 63],
+  [458, 13],
   c,
-  [255, 17],
-  s,
-  [1, 168],
+  [936, 14],
+  c,
+  [26, 6],
   c,
-  [644, 9],
+  [825, 21],
   c,
-  [845, 87],
+  [287, 65],
   c,
-  [443, 4],
+  [90, 10],
   c,
-  [968, 117],
+  [286, 157],
   c,
-  [1056, 90],
+  [210, 42],
   c,
-  [1147, 92],
+  [69, 67],
   c,
-  [1420, 10],
+  [414, 31],
   c,
-  [91, 83],
+  [505, 82],
   c,
-  [122, 117],
+  [535, 39],
   s,
-  [1, 30]
+  [1, 109]
 ]),
   goto: u([
   4,
@@ -5292,22 +5274,18 @@ table: bt({
   61,
   62,
   48,
-  s,
-  [232, 6],
   63,
   s,
-  [232, 25],
-  s,
-  [227, 5],
+  [226, 3],
   64,
   s,
-  [227, 23],
+  [221, 3],
   65,
   66,
   67,
   48,
   49,
-  240,
+  234,
   74,
   74,
   75,
@@ -5323,7 +5301,7 @@ table: bt({
   48,
   16,
   107,
-  251,
+  245,
   97,
   99,
   102,
@@ -5336,19 +5314,19 @@ table: bt({
   111,
   c,
   [15, 3],
-  255,
+  249,
   c,
   [15, 4],
   s,
   [114, 4, 1],
   119,
   c,
-  [116, 3],
+  [63, 3],
   49,
   122,
   123,
-  234,
-  234,
+  228,
+  228,
   67,
   124,
   49,
@@ -5360,705 +5338,694 @@ table: bt({
   148,
   147,
   144,
-  149,
-  150,
-  149,
-  150,
-  155,
-  156,
+  49,
+  49,
+  153,
+  154,
   c,
-  [14, 3],
+  [12, 3],
   84,
-  160,
+  158,
+  157,
   159,
-  161,
   c,
-  [45, 3],
-  249,
+  [43, 3],
+  243,
   c,
-  [45, 4],
-  167,
+  [43, 4],
+  165,
   16,
   107,
-  252,
+  246,
   c,
   [8, 4],
-  176,
-  180,
-  203,
-  195,
+  174,
   178,
   202,
-  184,
+  192,
+  176,
+  195,
+  182,
+  175,
   177,
-  179,
   119,
+  203,
+  204,
+  205,
+  48,
+  49,
   206,
+  s,
+  [226, 9],
   207,
-  208,
-  35,
-  36,
   209,
-  s,
-  [232, 9],
-  210,
-  212,
-  211,
+  208,
   48,
-  221,
-  203,
+  218,
+  202,
   97,
   c,
   [23, 4],
   16,
   107,
-  253,
+  247,
   c,
   [43, 4],
-  224,
+  221,
   16,
   107,
-  256,
+  250,
   c,
   [8, 4],
-  225,
+  222,
   48,
   49,
   c,
-  [87, 6],
-  232,
-  231,
+  [85, 5],
+  229,
+  228,
   64,
-  233,
+  230,
   64,
+  232,
+  231,
+  49,
+  236,
   235,
-  234,
-  149,
-  150,
-  242,
-  238,
-  239,
+  236,
   c,
-  [95, 3],
-  241,
+  [93, 3],
+  238,
   s,
   [66, 7],
-  242,
+  239,
   66,
   66,
   s,
   [68, 4],
-  244,
+  241,
   s,
   [68, 3],
-  243,
+  240,
   68,
   68,
   s,
   [72, 4],
-  245,
+  242,
   s,
   [72, 6],
   s,
   [73, 4],
-  246,
+  243,
   s,
   [73, 6],
   s,
   [74, 4],
-  247,
+  244,
   s,
   [74, 6],
   c,
-  [76, 6],
-  253,
-  249,
+  [74, 5],
+  250,
+  246,
   c,
-  [7, 5],
+  [6, 4],
   s,
   [75, 4],
-  256,
+  253,
   s,
   [75, 6],
-  258,
+  255,
   119,
   48,
   145,
   148,
-  260,
+  257,
   c,
-  [21, 4],
-  263,
-  s,
-  [227, 4],
-  264,
-  s,
-  [227, 9],
-  265,
+  [20, 3],
+  260,
   52,
-  266,
+  261,
   75,
   75,
   74,
   75,
   75,
-  149,
-  150,
   c,
-  [117, 3],
-  235,
-  270,
-  272,
-  271,
+  [203, 4],
+  232,
+  265,
+  267,
+  266,
   16,
   107,
   c,
-  [151, 4],
+  [130, 4],
   c,
   [6, 6],
   s,
-  [275, 4, 1],
+  [270, 4, 1],
   16,
   107,
-  250,
+  244,
   c,
   [11, 4],
   102,
   103,
-  283,
-  280,
+  278,
+  275,
   155,
   155,
-  296,
+  291,
   s,
   [155, 3],
+  284,
+  282,
+  288,
   289,
-  287,
-  293,
+  290,
   294,
-  295,
-  299,
   s,
   [155, 5],
+  280,
+  283,
   285,
-  288,
-  290,
-  291,
+  286,
+  287,
   292,
-  297,
-  298,
-  300,
-  176,
-  161,
+  293,
+  295,
+  174,
+  159,
   c,
-  [249, 14],
+  [228, 14],
   c,
-  [264, 15],
+  [243, 15],
   c,
   [15, 30],
-  306,
-  176,
-  180,
-  307,
+  301,
+  174,
+  178,
+  302,
   c,
   [17, 13],
-  310,
-  311,
+  305,
+  306,
   c,
   [34, 15],
-  313,
+  308,
   s,
-  [262, 4],
-  314,
+  [256, 4],
+  271,
   s,
-  [262, 21],
-  316,
+  [256, 21],
+  310,
   s,
-  [264, 4],
-  317,
-  318,
+  [258, 4],
+  311,
+  312,
   s,
-  [264, 21],
-  320,
+  [258, 21],
+  314,
   s,
-  [266, 4],
-  321,
-  322,
+  [260, 4],
+  267,
+  315,
   s,
-  [266, 21],
-  323,
+  [260, 21],
+  316,
   s,
-  [267, 25],
-  325,
+  [261, 4],
+  265,
   s,
-  [268, 4],
-  322,
+  [261, 21],
+  318,
   s,
-  [268, 21],
+  [262, 4],
+  264,
+  315,
   s,
-  [269, 4],
-  326,
+  [262, 9],
+  103,
   s,
-  [269, 21],
+  [262, 12],
   s,
-  [229, 15],
-  103,
+  [263, 4],
+  266,
   s,
-  [229, 12],
-  328,
-  221,
-  203,
-  195,
+  [263, 21],
+  320,
+  218,
   202,
+  192,
+  195,
   c,
-  [201, 6],
-  s,
-  [228, 5],
-  329,
-  s,
-  [228, 22],
-  s,
-  [223, 5],
-  330,
-  s,
-  [223, 21],
+  [176, 6],
+  322,
   s,
-  [271, 4],
-  331,
+  [216, 5],
+  324,
   s,
-  [271, 21],
+  [216, 14],
+  48,
   s,
-  [270, 4],
-  332,
+  [216, 7],
   s,
-  [270, 21],
+  [276, 4],
+  269,
   s,
-  [272, 4],
-  333,
+  [276, 21],
   s,
-  [272, 21],
+  [277, 4],
+  268,
   s,
-  [222, 5],
-  335,
+  [277, 21],
   s,
-  [222, 14],
-  48,
+  [278, 4],
+  270,
   s,
-  [222, 7],
-  336,
+  [278, 21],
+  325,
   119,
   48,
   114,
   116,
   c,
-  [382, 15],
+  [303, 15],
   48,
-  348,
+  337,
   s,
   [121, 3],
   c,
-  [420, 16],
-  349,
+  [341, 16],
+  338,
   16,
   107,
-  254,
+  248,
   c,
-  [535, 4],
-  149,
-  150,
-  236,
-  236,
+  [456, 4],
+  340,
+  341,
+  230,
+  230,
   67,
-  352,
-  351,
+  343,
+  342,
   c,
-  [708, 7],
+  [608, 6],
   c,
-  [579, 3],
-  357,
+  [499, 3],
+  348,
   c,
-  [582, 3],
-  360,
+  [502, 3],
+  351,
   c,
-  [66, 15],
+  [65, 15],
   c,
-  [29, 6],
+  [28, 5],
   c,
-  [6, 6],
+  [5, 5],
   s,
-  [364, 9, 1],
-  242,
-  373,
+  [355, 9, 1],
+  239,
+  364,
   c,
-  [678, 7],
-  244,
-  243,
+  [578, 6],
+  241,
+  240,
   s,
   [76, 4],
-  375,
+  366,
   s,
   [76, 6],
-  376,
+  367,
   49,
-  378,
-  377,
-  380,
-  379,
-  115,
-  117,
-  381,
+  369,
+  368,
+  371,
+  370,
+  372,
   119,
-  383,
-  235,
-  384,
+  374,
+  232,
+  375,
   16,
-  388,
+  379,
   c,
-  [653, 12],
+  [568, 12],
   16,
-  391,
+  382,
   c,
   [6, 4],
-  392,
+  383,
   c,
-  [712, 3],
+  [610, 3],
   c,
-  [54, 4],
+  [51, 3],
   102,
   103,
-  396,
-  283,
+  387,
+  278,
+  388,
+  c,
+  [98, 15],
+  392,
+  c,
+  [301, 10],
+  393,
+  c,
+  [368, 3],
+  272,
+  c,
+  [367, 8],
+  c,
+  [364, 9],
+  394,
+  c,
+  [59, 5],
   397,
+  396,
   c,
-  [104, 15],
+  [586, 31],
   401,
   c,
-  [362, 10],
+  [16, 14],
   402,
-  s,
-  [229, 3],
-  277,
+  174,
+  404,
   c,
-  [398, 16],
-  403,
+  [17, 14],
   c,
-  [59, 6],
-  406,
-  405,
+  [939, 3],
   c,
-  [672, 31],
-  410,
+  [73, 4],
+  119,
+  49,
+  413,
+  174,
+  415,
   c,
-  [257, 15],
-  412,
-  176,
-  414,
+  [228, 19],
+  174,
+  417,
   c,
-  [18, 15],
+  [21, 14],
+  418,
+  174,
+  420,
   c,
-  [73, 4],
-  119,
-  149,
-  150,
-  419,
-  176,
+  [17, 14],
   421,
   c,
-  [25, 19],
-  149,
-  150,
-  176,
-  424,
+  [113, 15],
   c,
-  [23, 14],
+  [540, 4],
+  c,
+  [539, 10],
+  c,
+  [94, 3],
+  119,
+  426,
   425,
-  176,
   427,
-  c,
-  [40, 15],
+  428,
+  431,
   429,
-  c,
-  [357, 16],
-  s,
-  [48, 4],
-  119,
-  438,
-  437,
-  439,
-  440,
-  443,
-  441,
-  442,
+  430,
   142,
-  444,
+  432,
   142,
   142,
   103,
   103,
-  277,
+  272,
   103,
   103,
   c,
-  [1075, 7],
-  149,
-  150,
-  447,
+  [977, 7],
+  340,
+  341,
+  435,
+  436,
+  437,
+  221,
   c,
-  [323, 12],
-  450,
+  [329, 10],
+  440,
   c,
-  [7, 6],
-  452,
-  454,
+  [6, 5],
+  442,
+  444,
   148,
   147,
-  149,
-  150,
-  457,
+  49,
+  447,
   c,
-  [5, 4],
-  458,
-  459,
+  [4, 3],
+  448,
+  449,
   c,
-  [991, 4],
+  [895, 4],
   c,
-  [21, 4],
+  [18, 3],
   16,
-  388,
-  464,
+  379,
+  454,
   c,
-  [310, 3],
-  388,
+  [315, 3],
+  379,
   26,
   16,
-  469,
+  459,
   c,
-  [301, 4],
-  470,
-  471,
-  212,
-  211,
-  472,
+  [306, 4],
+  460,
+  461,
+  209,
+  208,
+  462,
   c,
-  [106, 15],
-  477,
+  [115, 15],
+  467,
   157,
   157,
-  296,
+  291,
   157,
-  478,
-  322,
+  272,
+  315,
   157,
   157,
   c,
-  [968, 6],
+  [888, 6],
   s,
   [157, 5],
-  475,
+  465,
   c,
-  [968, 8],
+  [888, 8],
   c,
   [43, 14],
-  480,
+  469,
   c,
   [16, 15],
-  482,
-  406,
-  176,
-  484,
+  471,
+  397,
+  174,
+  473,
   c,
   [18, 14],
-  485,
-  406,
-  486,
-  488,
-  487,
-  176,
-  490,
+  474,
+  397,
+  475,
+  477,
+  476,
+  174,
+  479,
   c,
   [21, 14],
-  491,
-  406,
-  492,
-  406,
-  176,
-  494,
+  480,
+  397,
+  481,
+  397,
+  174,
+  483,
   c,
   [20, 14],
-  495,
-  406,
-  496,
-  497,
+  484,
+  397,
+  485,
+  486,
   119,
   48,
   c,
   [80, 15],
   c,
-  [472, 6],
+  [477, 6],
   c,
-  [397, 30],
+  [403, 30],
   c,
   [52, 16],
-  506,
+  495,
+  115,
+  117,
   c,
-  [266, 12],
-  244,
+  [262, 10],
+  241,
   c,
-  [7, 6],
-  510,
+  [6, 5],
+  499,
   70,
   70,
   c,
-  [245, 4],
+  [244, 4],
   16,
-  388,
-  515,
-  212,
-  211,
-  516,
-  517,
-  519,
+  379,
+  504,
+  209,
+  208,
+  505,
+  506,
+  508,
   c,
-  [518, 10],
-  520,
-  176,
-  522,
+  [523, 10],
+  509,
+  174,
+  511,
   c,
-  [78, 15],
-  524,
+  [61, 14],
+  512,
   c,
-  [79, 15],
-  526,
-  406,
+  [77, 15],
+  514,
+  397,
   c,
-  [67, 6],
-  528,
-  406,
-  529,
-  406,
-  477,
-  478,
-  322,
-  530,
+  [65, 5],
+  516,
+  397,
+  517,
+  397,
+  467,
+  272,
+  315,
+  518,
   16,
-  531,
+  519,
   c,
-  [147, 4],
+  [144, 4],
   s,
-  [533, 4, 1],
-  371,
-  242,
-  537,
+  [521, 4, 1],
+  362,
+  239,
+  525,
   16,
-  388,
-  539,
-  477,
+  379,
+  527,
+  467,
   s,
   [160, 3],
-  478,
-  322,
+  272,
+  315,
   s,
   [160, 7],
   c,
-  [170, 16],
-  542,
+  [167, 16],
+  530,
   c,
   [16, 14],
-  543,
-  406,
+  531,
+  397,
   c,
   [33, 15],
-  212,
-  546,
-  211,
-  545,
+  209,
+  534,
+  208,
+  533,
   c,
-  [706, 12],
+  [708, 12],
   c,
   [31, 15],
   97,
   97,
   70,
   c,
-  [125, 6],
-  552,
-  553,
-  406,
-  554,
-  555,
-  556,
+  [124, 5],
+  540,
+  541,
+  397,
+  542,
+  543,
+  544,
   16,
-  557,
+  545,
   c,
-  [42, 5],
-  558,
+  [41, 5],
+  546,
   c,
   [6, 4],
-  559,
-  560,
-  242,
-  477,
+  547,
+  548,
+  239,
+  467,
   s,
   [162, 3],
-  478,
-  322,
+  272,
+  315,
   s,
   [162, 7],
   c,
-  [64, 21],
-  212,
-  563,
-  564,
-  211,
-  212,
-  565,
-  566,
-  211,
+  [63, 21],
+  209,
+  551,
+  552,
+  208,
+  209,
+  553,
+  554,
+  208,
   c,
-  [99, 7],
-  568,
+  [98, 7],
+  556,
   c,
   [6, 4],
   s,
-  [569, 5, 1],
+  [557, 5, 1],
   16,
-  574,
+  562,
   c,
   [11, 4],
-  212,
-  211,
-  575,
+  209,
+  208,
+  563,
   c,
-  [831, 13],
+  [832, 13],
   c,
   [6, 5],
-  212,
-  579,
-  211,
-  580,
+  209,
+  567,
+  208,
+  568,
   16,
-  581,
+  569,
   c,
   [16, 5],
-  583,
+  571,
   c,
   [6, 5],
-  584,
+  572,
   c,
   [6, 4],
-  585,
+  573,
   c,
-  [170, 3],
-  586,
-  212,
-  587,
-  211,
-  212,
-  588,
-  211,
-  589,
-  590,
-  591
+  [169, 3],
+  574,
+  209,
+  575,
+  208,
+  209,
+  576,
+  208,
+  577,
+  578,
+  579
 ])
 }),
 defaultActions: bda({
@@ -6104,142 +6071,142 @@ defaultActions: bda({
   134,
   138,
   140,
-  153,
+  151,
+  159,
   161,
-  163,
-  168,
+  166,
   s,
-  [170, 4, 1],
-  175,
-  181,
+  [168, 4, 1],
+  173,
+  179,
+  183,
   185,
   187,
-  189,
+  194,
+  196,
+  200,
   201,
+  203,
+  204,
+  205,
   s,
-  [204, 5, 1],
-  s,
-  [214, 7, 1],
+  [211, 7, 1],
+  222,
+  223,
   225,
-  226,
+  227,
   228,
-  230,
   231,
-  234,
+  233,
   236,
-  239,
-  248,
-  258,
+  245,
+  255,
+  256,
+  257,
   259,
-  260,
   262,
-  267,
+  270,
   275,
-  280,
-  282,
+  277,
   s,
-  [285, 16, 1],
+  [280, 16, 1],
+  299,
+  300,
+  302,
   304,
-  305,
   307,
-  309,
-  312,
   s,
-  [334, 4, 2],
-  341,
-  345,
-  347,
-  351,
+  [323, 4, 2],
+  330,
+  334,
+  336,
+  342,
   s,
-  [353, 4, 1],
-  358,
-  359,
-  360,
+  [344, 4, 1],
+  349,
+  350,
+  351,
   s,
-  [362, 6, 1],
-  371,
+  [353, 6, 1],
+  362,
+  364,
+  367,
+  368,
+  370,
   373,
   376,
-  377,
-  379,
-  382,
+  378,
+  383,
+  384,
   385,
-  387,
-  392,
-  393,
-  394,
   s,
-  [396, 5, 1],
-  405,
-  407,
-  408,
-  410,
-  411,
-  414,
+  [387, 5, 1],
+  396,
+  398,
+  399,
+  401,
+  s,
+  [404, 6, 1],
+  412,
   415,
-  418,
+  417,
+  420,
   421,
-  422,
-  424,
-  427,
-  428,
-  429,
-  s,
-  [431, 5, 1],
-  437,
-  445,
+  423,
+  425,
+  433,
+  435,
   s,
-  [447, 5, 1],
-  453,
-  456,
+  [438, 4, 1],
+  443,
+  446,
   s,
-  [459, 4, 1],
+  [449, 4, 1],
+  455,
+  457,
+  458,
+  460,
+  462,
   465,
-  467,
-  468,
   470,
-  472,
-  475,
-  481,
-  482,
+  471,
   s,
-  [484, 4, 1],
-  490,
-  491,
+  [473, 4, 1],
+  479,
+  480,
+  481,
+  483,
+  484,
+  486,
+  487,
+  488,
   492,
-  494,
+  493,
   495,
-  497,
-  498,
-  499,
-  503,
-  504,
-  506,
-  507,
-  511,
+  496,
+  500,
   s,
-  [512, 4, 2],
-  522,
-  523,
+  [501, 4, 2],
+  511,
   s,
-  [525, 6, 1],
+  [513, 6, 1],
+  520,
+  526,
+  527,
+  530,
+  531,
   532,
-  538,
-  539,
+  541,
   542,
-  543,
-  544,
-  553,
-  554,
+  548,
+  558,
   560,
+  568,
   570,
-  572,
-  580,
-  582,
-  585,
-  589,
-  590,
-  591
+  573,
+  577,
+  578,
+  579
 ]),
   goto: u([
   4,
@@ -6253,45 +6220,45 @@ defaultActions: bda({
   6,
   3,
   18,
-  228,
-  229,
+  222,
   223,
-  224,
+  217,
+  218,
   1,
   8,
   9,
   10,
   16,
-  238,
-  239,
   232,
-  227,
+  233,
+  226,
+  221,
   112,
   117,
   116,
   14,
+  229,
   235,
-  241,
   28,
   111,
   118,
   104,
   106,
   s,
-  [244, 5, 1],
+  [238, 5, 1],
   129,
   148,
-  259,
-  260,
+  253,
+  254,
   130,
   131,
   132,
   115,
-  230,
+  224,
+  219,
   225,
-  231,
-  226,
-  216,
+  220,
+  210,
   12,
   11,
   13,
@@ -6310,30 +6277,31 @@ defaultActions: bda({
   [151, 4, 1],
   156,
   168,
-  261,
-  263,
-  265,
-  208,
-  273,
-  274,
-  217,
-  218,
-  219,
+  255,
+  257,
+  259,
+  202,
+  197,
+  279,
+  280,
+  211,
+  212,
+  213,
   120,
   123,
-  257,
-  258,
-  270,
-  271,
-  272,
+  251,
+  252,
+  276,
+  277,
+  278,
   7,
   15,
-  237,
+  231,
   26,
   61,
   29,
   35,
-  243,
+  237,
   89,
   78,
   37,
@@ -6344,19 +6312,19 @@ defaultActions: bda({
   124,
   126,
   165,
-  233,
+  227,
   s,
-  [277, 14, 1],
+  [283, 14, 1],
   163,
   164,
-  214,
+  208,
   149,
-  207,
-  220,
-  209,
-  211,
-  275,
-  276,
+  201,
+  214,
+  203,
+  205,
+  281,
+  282,
   138,
   141,
   25,
@@ -6389,26 +6357,23 @@ defaultActions: bda({
   127,
   128,
   159,
-  215,
-  205,
-  206,
+  209,
+  199,
+  200,
   193,
-  201,
   187,
-  203,
+  195,
+  198,
+  273,
+  274,
+  275,
   172,
   183,
-  197,
   175,
   179,
-  196,
   169,
   194,
-  195,
-  198,
-  199,
-  200,
-  210,
+  204,
   119,
   114,
   27,
@@ -6431,16 +6396,16 @@ defaultActions: bda({
   192,
   185,
   186,
-  204,
+  196,
   171,
   181,
   182,
   174,
   177,
   178,
-  221,
-  212,
-  213,
+  215,
+  206,
+  207,
   139,
   140,
   113,
@@ -6451,7 +6416,6 @@ defaultActions: bda({
   58,
   161,
   191,
-  202,
   167,
   184,
   173,
@@ -6514,7 +6478,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, 592 /* === table.length :: ensures that anyone using this new state will fail dramatically! */];
+    var NO_ACTION = [0, 580 /* === table.length :: ensures that anyone using this new state will fail dramatically! */];
 
     var lexer;
     if (this.__lexer__) {