diff --git a/src/parser/xhpast/__tests__/data/variadic.php.test b/src/parser/xhpast/__tests__/data/nullable-type-hints.php.test
copy from src/parser/xhpast/__tests__/data/variadic.php.test
copy to src/parser/xhpast/__tests__/data/nullable-type-hints.php.test
--- a/src/parser/xhpast/__tests__/data/variadic.php.test
+++ b/src/parser/xhpast/__tests__/data/nullable-type-hints.php.test
@@ -1,16 +1,9 @@
 <?php
 
-function a(...$a) { }
+function t(?array $arr): array { }
+function t(array $arr): ?array { }
 
-function b(&...$a) { }
-
-function c(Type ...$a) { }
-
-function d(Type &...$a) { }
-
-a(...[1, 2, 3]);
-
-b(...$foo);
+function t(?array ... $arr): ?array { }
 
 ~~~~~~~~~~
 pass
@@ -19,12 +12,12 @@
   "tree": [
     9000,
     0,
-    77,
+    55,
     [
       [
         9006,
         0,
-        76,
+        54,
         [
           [
             9007,
@@ -34,12 +27,12 @@
           [
             9004,
             2,
-            12,
+            17,
             [
               [
                 9050,
                 2,
-                12,
+                17,
                 [
                   [
                     9005
@@ -55,29 +48,36 @@
                   [
                     9059,
                     5,
-                    8,
+                    10,
                     [
                       [
                         9060,
                         6,
-                        7,
+                        9,
                         [
                           [
-                            9005
-                          ],
-                          [
-                            9114,
+                            9115,
                             6,
                             7,
                             [
                               [
-                                9047,
+                                0,
+                                6,
+                                6
+                              ],
+                              [
+                                9061,
                                 7,
                                 7
                               ]
                             ]
                           ],
                           [
+                            9047,
+                            9,
+                            9
+                          ],
+                          [
                             9005
                           ]
                         ]
@@ -88,12 +88,24 @@
                     9005
                   ],
                   [
-                    9005
+                    9115,
+                    13,
+                    13,
+                    [
+                      [
+                        9005
+                      ],
+                      [
+                        9061,
+                        13,
+                        13
+                      ]
+                    ]
                   ],
                   [
                     9006,
-                    10,
-                    12
+                    15,
+                    17
                   ]
                 ]
               ]
@@ -101,13 +113,13 @@
           ],
           [
             9004,
-            14,
-            25,
+            19,
+            34,
             [
               [
                 9050,
-                14,
-                25,
+                19,
+                34,
                 [
                   [
                     9005
@@ -117,42 +129,40 @@
                   ],
                   [
                     9013,
-                    16,
-                    16
+                    21,
+                    21
                   ],
                   [
                     9059,
-                    17,
-                    21,
+                    22,
+                    26,
                     [
                       [
                         9060,
-                        18,
-                        18,
+                        23,
+                        25,
                         [
                           [
-                            9005
-                          ],
-                          [
-                            9049,
-                            18,
-                            20,
+                            9115,
+                            23,
+                            23,
                             [
                               [
-                                9114,
-                                19,
-                                20,
-                                [
-                                  [
-                                    9047,
-                                    20,
-                                    20
-                                  ]
-                                ]
+                                9005
+                              ],
+                              [
+                                9061,
+                                23,
+                                23
                               ]
                             ]
                           ],
                           [
+                            9047,
+                            25,
+                            25
+                          ],
+                          [
                             9005
                           ]
                         ]
@@ -163,82 +173,26 @@
                     9005
                   ],
                   [
-                    9005
-                  ],
-                  [
-                    9006,
-                    23,
-                    25
-                  ]
-                ]
-              ]
-            ]
-          ],
-          [
-            9004,
-            27,
-            39,
-            [
-              [
-                9050,
-                27,
-                39,
-                [
-                  [
-                    9005
-                  ],
-                  [
-                    9005
-                  ],
-                  [
-                    9013,
+                    9115,
                     29,
-                    29
-                  ],
-                  [
-                    9059,
                     30,
-                    35,
                     [
                       [
-                        9060,
-                        31,
-                        34,
-                        [
-                          [
-                            9090,
-                            31,
-                            31
-                          ],
-                          [
-                            9114,
-                            33,
-                            34,
-                            [
-                              [
-                                9047,
-                                34,
-                                34
-                              ]
-                            ]
-                          ],
-                          [
-                            9005
-                          ]
-                        ]
+                        0,
+                        29,
+                        29
+                      ],
+                      [
+                        9061,
+                        30,
+                        30
                       ]
                     ]
                   ],
                   [
-                    9005
-                  ],
-                  [
-                    9005
-                  ],
-                  [
                     9006,
-                    37,
-                    39
+                    32,
+                    34
                   ]
                 ]
               ]
@@ -246,12 +200,12 @@
           ],
           [
             9004,
-            41,
+            36,
             54,
             [
               [
                 9050,
-                41,
+                36,
                 54,
                 [
                   [
@@ -262,40 +216,45 @@
                   ],
                   [
                     9013,
-                    43,
-                    43
+                    38,
+                    38
                   ],
                   [
                     9059,
-                    44,
-                    50,
+                    39,
+                    46,
                     [
                       [
                         9060,
+                        40,
                         45,
-                        47,
                         [
                           [
-                            9090,
-                            45,
-                            45
+                            9115,
+                            40,
+                            41,
+                            [
+                              [
+                                0,
+                                40,
+                                40
+                              ],
+                              [
+                                9061,
+                                41,
+                                41
+                              ]
+                            ]
                           ],
                           [
-                            9049,
-                            47,
-                            49,
+                            9114,
+                            43,
+                            45,
                             [
                               [
-                                9114,
-                                48,
-                                49,
-                                [
-                                  [
-                                    9047,
-                                    49,
-                                    49
-                                  ]
-                                ]
+                                9047,
+                                45,
+                                45
                               ]
                             ]
                           ],
@@ -310,88 +269,26 @@
                     9005
                   ],
                   [
-                    9005
-                  ],
-                  [
-                    9006,
-                    52,
-                    54
-                  ]
-                ]
-              ]
-            ]
-          ],
-          [
-            9004,
-            56,
-            69,
-            [
-              [
-                9099,
-                56,
-                68,
-                [
-                  [
-                    9001,
-                    56,
-                    56
-                  ],
-                  [
-                    9095,
-                    57,
-                    68,
+                    9115,
+                    49,
+                    50,
                     [
                       [
-                        9114,
-                        58,
-                        58,
-                        [
-                          [
-                            0,
-                            58,
-                            58
-                          ]
-                        ]
+                        0,
+                        49,
+                        49
+                      ],
+                      [
+                        9061,
+                        50,
+                        50
                       ]
                     ]
-                  ]
-                ]
-              ]
-            ]
-          ],
-          [
-            9004,
-            71,
-            76,
-            [
-              [
-                9099,
-                71,
-                75,
-                [
-                  [
-                    9001,
-                    71,
-                    71
                   ],
                   [
-                    9095,
-                    72,
-                    75,
-                    [
-                      [
-                        9114,
-                        73,
-                        73,
-                        [
-                          [
-                            0,
-                            73,
-                            73
-                          ]
-                        ]
-                      ]
-                    ]
+                    9006,
+                    52,
+                    54
                   ]
                 ]
               ]
@@ -427,68 +324,36 @@
       1
     ],
     [
-      396,
-      3
-    ],
-    [
-      313,
-      2
-    ],
-    [
-      41,
-      1
-    ],
-    [
-      377,
+      63,
       1
     ],
     [
-      123,
-      1
+      365,
+      5
     ],
     [
       377,
       1
     ],
     [
-      125,
-      1
-    ],
-    [
-      377,
-      2
-    ],
-    [
-      339,
-      8
-    ],
-    [
-      377,
-      1
+      313,
+      4
     ],
     [
-      311,
+      41,
       1
     ],
     [
-      40,
+      58,
       1
     ],
     [
-      38,
+      377,
       1
     ],
     [
-      396,
-      3
-    ],
-    [
-      313,
-      2
-    ],
-    [
-      41,
-      1
+      365,
+      5
     ],
     [
       377,
@@ -508,7 +373,7 @@
     ],
     [
       377,
-      2
+      1
     ],
     [
       339,
@@ -527,31 +392,23 @@
       1
     ],
     [
-      311,
-      4
+      365,
+      5
     ],
     [
       377,
       1
     ],
     [
-      396,
-      3
-    ],
-    [
       313,
-      2
+      4
     ],
     [
       41,
       1
     ],
     [
-      377,
-      1
-    ],
-    [
-      123,
+      58,
       1
     ],
     [
@@ -559,79 +416,59 @@
       1
     ],
     [
-      125,
+      63,
       1
     ],
     [
-      377,
-      2
-    ],
-    [
-      339,
-      8
+      365,
+      5
     ],
     [
       377,
       1
     ],
     [
-      311,
-      1
-    ],
-    [
-      40,
+      123,
       1
     ],
     [
-      311,
-      4
-    ],
-    [
       377,
       1
     ],
     [
-      38,
+      125,
       1
     ],
     [
-      396,
-      3
-    ],
-    [
-      313,
+      377,
       2
     ],
     [
-      41,
-      1
+      339,
+      8
     ],
     [
       377,
       1
     ],
     [
-      123,
+      311,
       1
     ],
     [
-      377,
+      40,
       1
     ],
     [
-      125,
+      63,
       1
     ],
     [
-      377,
-      2
-    ],
-    [
-      311,
-      1
+      365,
+      5
     ],
     [
-      40,
+      377,
       1
     ],
     [
@@ -639,75 +476,47 @@
       3
     ],
     [
-      91,
-      1
-    ],
-    [
-      309,
-      1
-    ],
-    [
-      44,
-      1
-    ],
-    [
       377,
       1
     ],
     [
-      309,
-      1
-    ],
-    [
-      44,
-      1
+      313,
+      4
     ],
     [
-      377,
+      41,
       1
     ],
     [
-      309,
+      58,
       1
     ],
     [
-      93,
+      377,
       1
     ],
     [
-      41,
+      63,
       1
     ],
     [
-      59,
-      1
+      365,
+      5
     ],
     [
       377,
-      2
-    ],
-    [
-      311,
       1
     ],
     [
-      40,
+      123,
       1
     ],
     [
-      396,
-      3
-    ],
-    [
-      313,
-      4
-    ],
-    [
-      41,
+      377,
       1
     ],
     [
-      59,
+      125,
       1
     ],
     [
diff --git a/src/parser/xhpast/__tests__/data/php-callable-typehint.php.test b/src/parser/xhpast/__tests__/data/php-callable-typehint.php.test
--- a/src/parser/xhpast/__tests__/data/php-callable-typehint.php.test
+++ b/src/parser/xhpast/__tests__/data/php-callable-typehint.php.test
@@ -52,9 +52,19 @@
                         8,
                         [
                           [
-                            9061,
+                            9115,
                             6,
-                            6
+                            6,
+                            [
+                              [
+                                9005
+                              ],
+                              [
+                                9061,
+                                6,
+                                6
+                              ]
+                            ]
                           ],
                           [
                             9047,
diff --git a/src/parser/xhpast/__tests__/data/php-syntax.php.test b/src/parser/xhpast/__tests__/data/php-syntax.php.test
--- a/src/parser/xhpast/__tests__/data/php-syntax.php.test
+++ b/src/parser/xhpast/__tests__/data/php-syntax.php.test
@@ -618,9 +618,19 @@
                         70,
                         [
                           [
-                            9090,
+                            9115,
+                            68,
                             68,
-                            68
+                            [
+                              [
+                                9005
+                              ],
+                              [
+                                9090,
+                                68,
+                                68
+                              ]
+                            ]
                           ],
                           [
                             9047,
@@ -681,9 +691,19 @@
                         82,
                         [
                           [
-                            9061,
+                            9115,
                             80,
-                            80
+                            80,
+                            [
+                              [
+                                9005
+                              ],
+                              [
+                                9061,
+                                80,
+                                80
+                              ]
+                            ]
                           ],
                           [
                             9047,
@@ -744,9 +764,19 @@
                         100,
                         [
                           [
-                            9061,
+                            9115,
                             92,
-                            92
+                            92,
+                            [
+                              [
+                                9005
+                              ],
+                              [
+                                9061,
+                                92,
+                                92
+                              ]
+                            ]
                           ],
                           [
                             9047,
@@ -879,9 +909,19 @@
                         130,
                         [
                           [
-                            9090,
+                            9115,
                             124,
-                            124
+                            124,
+                            [
+                              [
+                                9005
+                              ],
+                              [
+                                9090,
+                                124,
+                                124
+                              ]
+                            ]
                           ],
                           [
                             9047,
diff --git a/src/parser/xhpast/__tests__/data/return-type.php.test b/src/parser/xhpast/__tests__/data/return-type.php.test
--- a/src/parser/xhpast/__tests__/data/return-type.php.test
+++ b/src/parser/xhpast/__tests__/data/return-type.php.test
@@ -71,9 +71,19 @@
                     9005
                   ],
                   [
-                    9090,
+                    9115,
+                    9,
                     9,
-                    9
+                    [
+                      [
+                        9005
+                      ],
+                      [
+                        9090,
+                        9,
+                        9
+                      ]
+                    ]
                   ],
                   [
                     9006,
@@ -114,9 +124,19 @@
                     9005
                   ],
                   [
-                    9061,
+                    9115,
                     22,
-                    22
+                    22,
+                    [
+                      [
+                        9005
+                      ],
+                      [
+                        9061,
+                        22,
+                        22
+                      ]
+                    ]
                   ],
                   [
                     9006,
@@ -157,9 +177,19 @@
                     9005
                   ],
                   [
-                    9061,
+                    9115,
+                    35,
                     35,
-                    35
+                    [
+                      [
+                        9005
+                      ],
+                      [
+                        9061,
+                        35,
+                        35
+                      ]
+                    ]
                   ],
                   [
                     9006,
@@ -231,9 +261,19 @@
                                 9005
                               ],
                               [
-                                9090,
+                                9115,
                                 54,
-                                54
+                                54,
+                                [
+                                  [
+                                    9005
+                                  ],
+                                  [
+                                    9090,
+                                    54,
+                                    54
+                                  ]
+                                ]
                               ],
                               [
                                 9006,
@@ -274,9 +314,19 @@
                                 9005
                               ],
                               [
-                                9061,
+                                9115,
                                 67,
-                                67
+                                67,
+                                [
+                                  [
+                                    9005
+                                  ],
+                                  [
+                                    9061,
+                                    67,
+                                    67
+                                  ]
+                                ]
                               ],
                               [
                                 9006,
@@ -317,9 +367,19 @@
                                 9005
                               ],
                               [
-                                9061,
+                                9115,
+                                80,
                                 80,
-                                80
+                                [
+                                  [
+                                    9005
+                                  ],
+                                  [
+                                    9061,
+                                    80,
+                                    80
+                                  ]
+                                ]
                               ],
                               [
                                 9006,
@@ -397,9 +457,19 @@
                                     9005
                                   ],
                                   [
-                                    9090,
+                                    9115,
                                     100,
-                                    100
+                                    100,
+                                    [
+                                      [
+                                        9005
+                                      ],
+                                      [
+                                        9090,
+                                        100,
+                                        100
+                                      ]
+                                    ]
                                   ],
                                   [
                                     9006,
@@ -441,9 +511,19 @@
                                     9005
                                   ],
                                   [
-                                    9061,
+                                    9115,
                                     113,
-                                    113
+                                    113,
+                                    [
+                                      [
+                                        9005
+                                      ],
+                                      [
+                                        9061,
+                                        113,
+                                        113
+                                      ]
+                                    ]
                                   ],
                                   [
                                     9006,
@@ -485,9 +565,19 @@
                                     9005
                                   ],
                                   [
-                                    9061,
+                                    9115,
                                     126,
-                                    126
+                                    126,
+                                    [
+                                      [
+                                        9005
+                                      ],
+                                      [
+                                        9061,
+                                        126,
+                                        126
+                                      ]
+                                    ]
                                   ],
                                   [
                                     9006,
@@ -534,9 +624,19 @@
                                     9005
                                   ],
                                   [
-                                    9090,
+                                    9115,
                                     141,
-                                    141
+                                    141,
+                                    [
+                                      [
+                                        9005
+                                      ],
+                                      [
+                                        9090,
+                                        141,
+                                        141
+                                      ]
+                                    ]
                                   ],
                                   [
                                     9006,
@@ -583,9 +683,19 @@
                                     9005
                                   ],
                                   [
-                                    9061,
+                                    9115,
                                     156,
-                                    156
+                                    156,
+                                    [
+                                      [
+                                        9005
+                                      ],
+                                      [
+                                        9061,
+                                        156,
+                                        156
+                                      ]
+                                    ]
                                   ],
                                   [
                                     9006,
@@ -632,9 +742,19 @@
                                     9005
                                   ],
                                   [
-                                    9061,
+                                    9115,
+                                    171,
                                     171,
-                                    171
+                                    [
+                                      [
+                                        9005
+                                      ],
+                                      [
+                                        9061,
+                                        171,
+                                        171
+                                      ]
+                                    ]
                                   ],
                                   [
                                     9006,
diff --git a/src/parser/xhpast/__tests__/data/variadic.php.test b/src/parser/xhpast/__tests__/data/variadic.php.test
--- a/src/parser/xhpast/__tests__/data/variadic.php.test
+++ b/src/parser/xhpast/__tests__/data/variadic.php.test
@@ -206,9 +206,19 @@
                         34,
                         [
                           [
-                            9090,
+                            9115,
                             31,
-                            31
+                            31,
+                            [
+                              [
+                                9005
+                              ],
+                              [
+                                9090,
+                                31,
+                                31
+                              ]
+                            ]
                           ],
                           [
                             9114,
@@ -276,9 +286,19 @@
                         47,
                         [
                           [
-                            9090,
+                            9115,
                             45,
-                            45
+                            45,
+                            [
+                              [
+                                9005
+                              ],
+                              [
+                                9090,
+                                45,
+                                45
+                              ]
+                            ]
                           ],
                           [
                             9049,
diff --git a/src/parser/xhpast/bin/PhutilXHPASTBinary.php b/src/parser/xhpast/bin/PhutilXHPASTBinary.php
--- a/src/parser/xhpast/bin/PhutilXHPASTBinary.php
+++ b/src/parser/xhpast/bin/PhutilXHPASTBinary.php
@@ -8,7 +8,7 @@
    * This is the version that would be obtained with an up-to-date XHPAST
    * build. The //actual// XHPAST build version may vary.
    */
-  const EXPECTED_VERSION = '7.0.3';
+  const EXPECTED_VERSION = '7.0.4';
 
   /**
    * The XHPAST build version.
diff --git a/src/parser/xhpast/parser_nodes.php b/src/parser/xhpast/parser_nodes.php
--- a/src/parser/xhpast/parser_nodes.php
+++ b/src/parser/xhpast/parser_nodes.php
@@ -121,5 +121,6 @@
     9112 => 'n_YIELD',
     9113 => 'n_FINALLY',
     9114 => 'n_UNPACK',
+    9115 => 'n_TYPE',
   );
 }
diff --git a/support/xhpast/generate_nodes.php b/support/xhpast/generate_nodes.php
--- a/support/xhpast/generate_nodes.php
+++ b/support/xhpast/generate_nodes.php
@@ -120,6 +120,7 @@
   'n_YIELD',
   'n_FINALLY',
   'n_UNPACK',
+  'n_TYPE',
 );
 
 $nodes = array_combine(
diff --git a/support/xhpast/parser.y b/support/xhpast/parser.y
--- a/support/xhpast/parser.y
+++ b/support/xhpast/parser.y
@@ -1066,7 +1066,20 @@
   %empty {
     $$ = NNEW(n_EMPTY);
   }
-| type
+| type_expr
+;
+
+type_expr:
+  type {
+    $$ = NNEW(n_TYPE);
+    $$->appendChild(NNEW(n_EMPTY));
+    $$->appendChild($1);
+  }
+| '?' type {
+    $$ = NNEW(n_TYPE);
+    $$->appendChild($1);
+    $$->appendChild($2);
+  }
 ;
 
 type:
@@ -1085,7 +1098,7 @@
   %empty {
     $$ = NNEW(n_EMPTY);
   }
-| ':' type {
+| ':' type_expr {
     $$ = $2;
   }
 ;
diff --git a/support/xhpast/parser.yacc.cpp b/support/xhpast/parser.yacc.cpp
--- a/support/xhpast/parser.yacc.cpp
+++ b/support/xhpast/parser.yacc.cpp
@@ -557,16 +557,16 @@
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   7553
+#define YYLAST   7705
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  168
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  135
+#define YYNNTS  136
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  441
+#define YYNRULES  443
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  906
+#define YYNSTATES  909
 
 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
    by yylex, with out-of-bounds checking.  */
@@ -639,38 +639,38 @@
      829,   837,   838,   846,   852,   863,   866,   876,   881,   893,
      896,   904,   914,   915,   919,   920,   928,   931,   941,   944,
      954,   957,   965,   968,   976,   977,   983,   991,  1000,  1009,
-    1017,  1025,  1034,  1044,  1056,  1060,  1066,  1069,  1073,  1076,
-    1079,  1085,  1088,  1094,  1095,  1101,  1104,  1110,  1111,  1114,
-    1121,  1125,  1132,  1135,  1139,  1146,  1154,  1162,  1170,  1181,
-    1184,  1190,  1198,  1202,  1205,  1205,  1223,  1231,  1234,  1240,
-    1243,  1249,  1252,  1258,  1262,  1269,  1272,  1278,  1286,  1290,
-    1297,  1301,  1307,  1315,  1321,  1330,  1333,  1341,  1344,  1350,
-    1351,  1358,  1361,  1368,  1372,  1378,  1379,  1380,  1381,  1382,
-    1383,  1387,  1394,  1401,  1408,  1418,  1427,  1439,  1442,  1449,
-    1452,  1457,  1460,  1467,  1475,  1481,  1491,  1505,  1510,  1516,
-    1522,  1528,  1534,  1540,  1546,  1552,  1558,  1564,  1570,  1576,
-    1581,  1586,  1591,  1596,  1602,  1608,  1614,  1620,  1626,  1632,
-    1638,  1644,  1670,  1676,  1682,  1688,  1694,  1700,  1706,  1712,
-    1717,  1722,  1727,  1732,  1738,  1744,  1750,  1756,  1762,  1768,
-    1774,  1780,  1786,  1792,  1793,  1794,  1802,  1810,  1816,  1817,
-    1822,  1827,  1832,  1837,  1842,  1847,  1852,  1857,  1862,  1866,
-    1867,  1868,  1869,  1874,  1880,  1895,  1919,  1925,  1931,  1937,
-    1946,  1950,  1953,  1961,  1964,  1969,  1973,  1982,  1987,  1994,
-    2000,  2009,  2018,  2027,  2036,  2044,  2047,  2050,  2054,  2061,
-    2064,  2068,  2075,  2076,  2080,  2095,  2099,  2102,  2108,  2114,
-    2117,  2121,  2129,  2132,  2138,  2141,  2144,  2147,  2150,  2153,
-    2156,  2159,  2162,  2165,  2168,  2171,  2177,  2178,  2179,  2183,
-    2187,  2192,  2197,  2202,  2207,  2211,  2219,  2220,  2221,  2222,
-    2225,  2228,  2232,  2235,  2241,  2244,  2248,  2259,  2266,  2273,
-    2283,  2284,  2288,  2292,  2296,  2300,  2326,  2330,  2333,  2339,
-    2349,  2355,  2364,  2370,  2371,  2372,  2378,  2379,  2394,  2399,
-    2407,  2411,  2417,  2426,  2427,  2428,  2432,  2433,  2436,  2448,
-    2452,  2458,  2464,  2468,  2471,  2479,  2482,  2488,  2489,  2493,
-    2499,  2505,  2509,  2513,  2519,  2522,  2537,  2540,  2547,  2548,
-    2552,  2558,  2561,  2567,  2574,  2581,  2588,  2595,  2602,  2609,
-    2616,  2626,  2636,  2646,  2649,  2652,  2662,  2665,  2671,  2675,
-    2681,  2686,  2692,  2698,  2704,  2710,  2716,  2725,  2730,  2738,
-    2747,  2752
+    1017,  1025,  1034,  1044,  1056,  1060,  1066,  1069,  1073,  1078,
+    1086,  1089,  1092,  1098,  1101,  1107,  1108,  1114,  1117,  1123,
+    1124,  1127,  1134,  1138,  1145,  1148,  1152,  1159,  1167,  1175,
+    1183,  1194,  1197,  1203,  1211,  1215,  1218,  1218,  1236,  1244,
+    1247,  1253,  1256,  1262,  1265,  1271,  1275,  1282,  1285,  1291,
+    1299,  1303,  1310,  1314,  1320,  1328,  1334,  1343,  1346,  1354,
+    1357,  1363,  1364,  1371,  1374,  1381,  1385,  1391,  1392,  1393,
+    1394,  1395,  1396,  1400,  1407,  1414,  1421,  1431,  1440,  1452,
+    1455,  1462,  1465,  1470,  1473,  1480,  1488,  1494,  1504,  1518,
+    1523,  1529,  1535,  1541,  1547,  1553,  1559,  1565,  1571,  1577,
+    1583,  1589,  1594,  1599,  1604,  1609,  1615,  1621,  1627,  1633,
+    1639,  1645,  1651,  1657,  1683,  1689,  1695,  1701,  1707,  1713,
+    1719,  1725,  1730,  1735,  1740,  1745,  1751,  1757,  1763,  1769,
+    1775,  1781,  1787,  1793,  1799,  1805,  1806,  1807,  1815,  1823,
+    1829,  1830,  1835,  1840,  1845,  1850,  1855,  1860,  1865,  1870,
+    1875,  1879,  1880,  1881,  1882,  1887,  1893,  1908,  1932,  1938,
+    1944,  1950,  1959,  1963,  1966,  1974,  1977,  1982,  1986,  1995,
+    2000,  2007,  2013,  2022,  2031,  2040,  2049,  2057,  2060,  2063,
+    2067,  2074,  2077,  2081,  2088,  2089,  2093,  2108,  2112,  2115,
+    2121,  2127,  2130,  2134,  2142,  2145,  2151,  2154,  2157,  2160,
+    2163,  2166,  2169,  2172,  2175,  2178,  2181,  2184,  2190,  2191,
+    2192,  2196,  2200,  2205,  2210,  2215,  2220,  2224,  2232,  2233,
+    2234,  2235,  2238,  2241,  2245,  2248,  2254,  2257,  2261,  2272,
+    2279,  2286,  2296,  2297,  2301,  2305,  2309,  2313,  2339,  2343,
+    2346,  2352,  2362,  2368,  2377,  2383,  2384,  2385,  2391,  2392,
+    2407,  2412,  2420,  2424,  2430,  2439,  2440,  2441,  2445,  2446,
+    2449,  2461,  2465,  2471,  2477,  2481,  2484,  2492,  2495,  2501,
+    2502,  2506,  2512,  2518,  2522,  2526,  2532,  2535,  2550,  2553,
+    2560,  2561,  2565,  2571,  2574,  2580,  2587,  2594,  2601,  2608,
+    2615,  2622,  2629,  2639,  2649,  2659,  2662,  2665,  2675,  2678,
+    2684,  2688,  2694,  2699,  2705,  2711,  2717,  2723,  2729,  2738,
+    2743,  2751,  2760,  2765
 };
 #endif
 
@@ -726,8 +726,8 @@
   "declare_statement", "declare_list", "switch_case_list", "case_list",
   "case_separator", "while_statement", "elseif_list", "new_elseif_list",
   "else_single", "new_else_single", "parameter_list",
-  "non_empty_parameter_list", "parameter", "optional_type", "type",
-  "return_type", "function_call_parameter_list",
+  "non_empty_parameter_list", "parameter", "optional_type", "type_expr",
+  "type", "return_type", "function_call_parameter_list",
   "non_empty_function_call_parameter_list", "argument", "global_var_list",
   "global_var", "static_var_list", "class_statement_list",
   "class_statement", "$@1", "trait_use_statement", "trait_list",
@@ -786,111 +786,111 @@
 };
 # endif
 
-#define YYPACT_NINF -690
+#define YYPACT_NINF -701
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-690)))
+  (!!((Yystate) == (-701)))
 
-#define YYTABLE_NINF -381
+#define YYTABLE_NINF -383
 
 #define yytable_value_is_error(Yytable_value) \
-  (!!((Yytable_value) == (-381)))
+  (!!((Yytable_value) == (-383)))
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
-    -690,    76,  1810,  -690,  5980,  5980,  -106,  5980,  5980,  5980,
-    5980,  5980,  5980,  5980,   173,   173,  5980,  5980,  5980,  5980,
-    5980,  5980,  5980,  5980,  4650,   387,  5980,  -104,   -81,  -690,
-    -690,    62,  -690,  -690,  -690,    93,  -690,  5980,  4508,   -39,
-     -32,    61,    79,    81,  4783,  4916,    99,  -690,   128,  5049,
-      48,  5980,    -8,    51,    -6,   123,   140,    98,   110,   114,
-     132,  -690,  -690,   143,   147,  -690,  -690,  -690,  -690,  -690,
-    -690,  -690,  -690,  -690,     0,  -690,  -690,   214,  -690,  -690,
-    5980,  6113,  -690,  -690,   154,   -60,  -690,    21,  -690,  -690,
-    -690,  -690,  -690,  -690,   256,   260,  -690,   187,   325,   300,
-     222,  -690,  -690,  6536,  -690,    45,  1218,   224,  -690,   253,
-     344,   287,  -690,    55,  -690,   137,  -690,  -690,   349,   351,
-    -690,   355,   356,   320,   274,  -690,   325,  7328,  7328,  5980,
-    7328,  7328,  7434,  -690,  -690,   377,  -690,  -690,  -690,   277,
-     214,   378,   103,   306,  -690,  -690,   307,  -690,  -690,  -690,
-    -690,  -690,  -690,  -690,  -690,  -690,   173,  7126,   276,   449,
-     308,   214,   313,   316,   318,  -690,   321,   334,   -22,   137,
-    -690,  5182,  -690,  5980,  -690,  5980,  5980,    22,  7328,   380,
-    5980,  5980,  5980,   408,  5980,  -690,  6579,  -690,  6622,   322,
-     471,  -690,   332,  7328,   761,  -690,  6673,   214,   -45,    23,
-    -690,  -690,   238,    24,  -690,   475,    25,   325,  -690,  -690,
-     173,   173,   173,   335,   172,  4650,   214,  -690,   -74,   -47,
-     199,  7169,   213,   342,  6716,   347,  1952,  5980,   421,  1262,
-     431,  -690,   393,   395,  -690,  -690,   -31,  5980,     6,  5980,
-    5980,  5980,  5315,  5980,  5980,  5980,  5980,  5980,  5980,  5980,
-    5980,  5980,  5980,  5980,  5980,  5980,  5980,  5980,  5980,  5980,
-    5980,  5980,  5980,  5980,  5980,  5980,   387,  -690,  -690,  -690,
-    5448,  5980,  5980,  5980,  5980,  5980,  5980,  5980,  5980,  5980,
-    5980,  5980,  1262,    42,  5980,    49,  5980,  5980,   154,    -9,
-    5980,  5980,  5980,   359,  6759,   214,   107,   347,    57,    73,
-    -690,  -690,  5581,  -690,  5714,  -690,   214,   313,   144,  1262,
-    -690,   144,    49,   -17,  -690,  6810,  6854,  7328,   369,   374,
-    5980,  -690,   361,  6897,   363,   534,  7328,   448,  1082,   531,
-      14,  6946,  -690,  -690,  -690,   898,  -690,  -690,  2094,  -690,
-     -37,   474,    -8,  -690,  5980,  -690,  -690,    51,  -690,   898,
-     469,  -690,   389,    18,  -690,  -690,  -690,    29,   390,   388,
-     394,  -690,    33,  -690,   398,    91,  1498,  -690,  -690,  1262,
-    5980,  -690,  -690,  -690,   396,  -690,  -690,  -690,  -690,  -690,
-    6258,  -690,   173,  5980,   406,   561,  -690,  7328,   557,    40,
-     446,    40,   413,   425,   297,   415,   426,   427,   -17,   137,
-    7370,  7409,  7434,  5980,  7272,  7459,  1659,  7481,  7502,  4703,
-    1405,  1478,  1478,  1478,  1478,  1478,  1073,  1073,  1073,  1073,
-     679,   679,   294,   294,   294,   377,   377,   377,  -690,    -7,
-    7434,  7434,  7434,  7434,  7434,  7434,  7434,  7434,  7434,  7434,
-    7434,  7434,   429,   428,   432,   430,  -690,  5980,  -690,   433,
-      -4,  -690,   435,  6301,   437,   438,   442,  -690,   120,   426,
-     428,   173,  7328,   173,  7227,   313,  -690,   436,  -690,  -690,
-    -690,  3798,  -690,  -690,  7328,  5980,  3940,  5980,  5980,   173,
-     242,   898,   524,  4082,    36,   898,   898,   898,  -690,   439,
-     457,   214,   -87,   464,  -690,  -690,  -690,   -54,   537,  -690,
-    -690,  6344,  -690,  -690,   601,   297,   173,   453,   173,  -690,
-    -690,  -690,   172,   172,   605,  -690,  1262,  -690,  1668,   460,
-     211,   418,   461,  -690,  -690,  7328,  -690,  1262,   898,   472,
-     214,   313,  -690,    40,   462,   619,  -690,  -690,   297,  -690,
-    -690,   467,   622,     8,  -690,  -690,  -690,  1262,  1262,   -17,
-    7459,  5980,   387,  -690,  -690,  1262,  1262,  -690,  6397,  1262,
-     567,   573,  -690,  5980,  5980,  -690,  -690,  -690,  -690,  -690,
-    -690,  -690,  5847,  -690,   513,  -690,  -690,  6990,  -690,  -690,
-    -690,   482,  7328,   520,   173,   520,  -690,  -690,   636,  -690,
-    -690,  -690,   487,   488,  -690,  -690,  -690,   527,   490,   652,
-     898,   214,   149,   596,   514,   510,   -54,  -690,  -690,  -690,
-    -690,   898,   515,  -690,  -690,  -690,    34,  -690,  5980,   516,
-    -690,  -690,   518,  -690,  -690,   214,   313,   619,  -690,    40,
-     450,   523,   577,   296,   -53,  -690,   599,   669,   535,   536,
-    7459,   318,   539,   542,  -690,   543,  5980,  5980,   580,   532,
-    6440,   173,  7328,    49,  -690,  3656,    32,   544,  2236,  5980,
-     242,   549,  -690,   550,   898,  2378,  -690,   257,  -690,    13,
-     898,  -690,   898,  -690,   553,   174,  -690,    40,  -690,  -690,
-    -690,  -690,  -690,   577,  -690,  7434,  -690,  -690,   313,   579,
-    -690,   641,    40,  -690,  -690,  -690,  -690,  -690,  -690,  -690,
-    -690,  -690,  -690,   642,   320,   399,  -690,    26,   692,   559,
-     692,    41,   708,  -690,   898,  -690,  -690,  -690,  -690,  -690,
-    -690,   562,   565,    49,  -690,  -690,  -690,  -690,  -690,   310,
-     572,  4508,  -690,  -690,   574,   576,  -690,  4224,  4224,  -690,
-     578,   299,   582,  5980,     2,   159,  -690,  -690,   608,  -690,
-     659,  2520,   692,  -690,   726,    19,  -690,   730,    31,  -690,
-    -690,   673,  -690,   296,   586,    59,   587,   -53,   739,   898,
-    -690,  -690,  -690,   433,   598,   731,   689,  5980,  -690,  -690,
-    4366,  -690,  -690,  -690,  -690,  -690,   600,  -690,  6485,  -690,
-    -690,  -690,  -690,   898,   604,  -690,   609,   898,    40,  -690,
-     179,  -690,   898,   685,  -690,   325,   773,  -690,  -690,   710,
-    -690,    37,  -690,   777,   898,  -690,  -690,  5980,  -690,   628,
-    7033,  -690,  -690,  -690,  2662,  -690,  -690,  3656,  -690,   630,
-    -690,  -690,  -690,   709,   640,   179,  -690,   643,   713,   656,
-     648,   665,  -690,   800,   742,   898,  2804,  -690,    64,  -690,
-    2946,   898,  -690,  7082,  3656,  -690,  4508,  3088,   655,  3656,
-    -690,  3230,  -690,  -690,  -690,   687,    40,  -690,   744,   898,
-     660,  -690,  -690,   746,  -690,  -690,  -690,   801,  -690,   666,
-    -690,  3372,  -690,   756,   757,   825,  -690,  -690,  -690,   297,
-    -690,  -690,  -690,  -690,  -690,    40,   672,  3656,  -690,   692,
-     230,  -690,  -690,  -690,  3514,  -690
+    -701,    61,  1848,  -701,  6151,  6151,   -77,  6151,  6151,  6151,
+    6151,  6151,  6151,  6151,   199,   199,  6151,  6151,  6151,  6151,
+    6151,  6151,  6151,  6151,  4821,   264,  6151,   -68,   -39,  -701,
+    -701,    48,  -701,  -701,  -701,    81,  -701,  6151,  4546,    -8,
+      66,    89,   101,   104,  4954,  5087,   109,  -701,   170,  5220,
+     136,  6151,   -29,   -18,    -1,   126,   184,   155,   167,   189,
+     196,  -701,  -701,   198,   205,  -701,  -701,  -701,  -701,  -701,
+    -701,  -701,  -701,  -701,    87,  -701,  -701,   239,  -701,  -701,
+    6151,  6284,  -701,  -701,   147,   -47,  -701,    15,  -701,  -701,
+    -701,  -701,  -701,  -701,   256,   263,  -701,   207,   329,   307,
+     227,  -701,  -701,  1287,  -701,   224,  1348,   229,  -701,   245,
+     338,   268,  -701,    74,  -701,    46,  -701,  -701,   343,   345,
+    -701,   346,   348,   313,   262,  -701,   329,  7457,  7457,  6151,
+    7457,  7457,  7563,  -701,  -701,   367,  -701,  -701,  -701,   267,
+     239,   356,   -93,   276,  -701,  -701,   279,  -701,  -701,  -701,
+    -701,  -701,  -701,  -701,  -701,  -701,   199,  7252,   266,   426,
+     283,   239,   299,   306,   293,  -701,   324,   333,   -27,    46,
+    -701,  5353,  -701,  6151,  -701,  6151,  6151,    17,  7457,   368,
+    6151,  6151,  6151,   385,  6151,  -701,  6707,  -701,  6750,   309,
+     464,  -701,   316,  7457,  1024,  -701,  6793,   239,   -45,    18,
+    -701,  -701,   192,    19,  -701,   471,    20,   329,  -701,  -701,
+     199,   199,   199,   325,   243,  4821,   239,  -701,   -83,   162,
+     125,  7295,   150,   326,  6844,   327,  1990,  6151,   415,  4688,
+     419,  -701,   371,   372,  -701,  -701,   -36,  6151,   141,  6151,
+    6151,  6151,  5486,  6151,  6151,  6151,  6151,  6151,  6151,  6151,
+    6151,  6151,  6151,  6151,  6151,  6151,  6151,  6151,  6151,  6151,
+    6151,  6151,  6151,  6151,  6151,  6151,   264,  -701,  -701,  -701,
+    5619,  6151,  6151,  6151,  6151,  6151,  6151,  6151,  6151,  6151,
+    6151,  6151,  4688,   153,  6151,   182,  6151,  6151,   147,    62,
+    6151,  6151,  6151,   361,  6887,   239,   -78,   327,   177,   181,
+    -701,  -701,  5752,  -701,  5885,  -701,   239,   299,    75,  4688,
+    -701,    75,   182,   -17,  -701,  6930,  6980,  7457,   332,   337,
+    6151,  -701,   363,  7023,   364,   498,  7457,   414,  1211,   513,
+      25,  7066,  -701,  -701,  -701,  1453,  -701,  -701,  2132,  -701,
+     120,   455,   -29,  -701,  6151,  -701,  -701,   -18,  -701,  1453,
+     462,  -701,   381,    26,  -701,  -701,  -701,    27,   370,   380,
+     384,  -701,    28,  -701,   386,   238,  1564,  -701,  -701,  4688,
+    6151,  -701,  -701,  -701,   389,  -701,  -701,  -701,  -701,  -701,
+    6429,  -701,   199,  6151,   391,   538,  -701,  7457,   534,   -43,
+     429,   -43,   387,   394,    67,   390,   395,   404,   -17,    46,
+    7499,  7538,  7563,  6151,  7399,  7588,  7611,  7633,  7654,  4741,
+    1698,  1840,  1840,  1840,  1840,  1840,  1057,  1057,  1057,  1057,
+     466,   466,   489,   489,   489,   367,   367,   367,  -701,   -12,
+    7563,  7563,  7563,  7563,  7563,  7563,  7563,  7563,  7563,  7563,
+    7563,  7563,   405,   407,   408,   403,  -701,  6151,  -701,   410,
+      -7,  -701,   406,  6472,   412,   413,   416,  -701,   107,   395,
+     407,   199,  7457,   199,  7356,   299,  -701,   420,  -701,  -701,
+    -701,  3836,  -701,  -701,  7457,  6151,  3978,  6151,  6151,   199,
+      83,  1453,   497,  4120,    31,  1453,  1453,  1453,  -701,   423,
+     421,   239,   -49,   428,  -701,  -701,  -701,   -62,   502,  -701,
+    -701,  6515,  -701,  -701,   572,    67,   199,   424,   199,  -701,
+    -701,  -701,   243,   243,   573,  -701,  4688,  -701,  1706,   427,
+     200,   948,   430,  -701,  -701,  7457,  -701,  4688,  1453,   435,
+     239,   299,  -701,   -43,   432,   582,  -701,  -701,    67,   247,
+    -701,  -701,   431,   583,    41,  -701,  -701,  -701,  -701,  4688,
+    4688,   -17,  7588,  6151,   264,  -701,  -701,  4688,  4688,  -701,
+    6568,  4688,   535,   536,  -701,  6151,  6151,  -701,  -701,  -701,
+    -701,  -701,  -701,  -701,  6018,  -701,   476,  -701,  -701,  7116,
+    -701,  -701,  -701,   440,  7457,   477,   199,   477,  -701,  -701,
+     593,  -701,  -701,  -701,   444,   446,  -701,  -701,  -701,   483,
+     445,   603,  1453,   239,   -42,   539,   452,   453,   -62,  -701,
+    -701,  -701,  -701,  1453,   454,  -701,  -701,  -701,    29,  -701,
+    6151,   456,  -701,  -701,   457,  -701,  -701,   239,   299,   582,
+    -701,   -43,   328,   463,  -701,   510,    84,   -24,  -701,   547,
+     616,   468,   472,  7588,   293,   473,   478,  -701,   479,  6151,
+    6151,   507,   480,  6611,   199,  7457,   182,  -701,  3694,   308,
+     475,  2274,  6151,    83,   482,  -701,   486,  1453,  2416,  -701,
+     185,  -701,   -10,  1453,  -701,  1453,  -701,   490,   128,  -701,
+     -43,  -701,  -701,  -701,  -701,  -701,   510,  -701,  7563,  -701,
+    -701,   299,   353,  -701,   564,   -43,  -701,  -701,  -701,  -701,
+    -701,  -701,  -701,  -701,  -701,  -701,   574,   313,   335,  -701,
+      22,   627,   494,   627,    54,   644,  -701,  1453,  -701,  -701,
+    -701,  -701,  -701,  -701,   493,   496,   182,  -701,  -701,  -701,
+    -701,  -701,   312,   500,  4546,  -701,  -701,   501,   503,  -701,
+    4262,  4262,  -701,   504,   236,   508,  6151,    45,    -4,  -701,
+    -701,   545,  -701,   596,  2558,   627,  -701,   661,    13,  -701,
+     663,    23,  -701,  -701,   602,  -701,    84,   515,    35,   517,
+     -24,   669,  1453,  -701,  -701,  -701,   410,   524,   660,   615,
+    6151,  -701,  -701,  4404,  -701,  -701,  -701,  -701,  -701,   525,
+    -701,  6656,  -701,  -701,  -701,  -701,  1453,   527,  -701,   528,
+    1453,   -43,  -701,   171,  -701,  1453,   614,  -701,   329,   680,
+    -701,  -701,   617,  -701,    36,  -701,   682,  1453,  -701,  -701,
+    6151,  -701,   537,  7159,  -701,  -701,  -701,  2700,  -701,  -701,
+    3694,  -701,   542,  -701,  -701,  -701,   604,   543,   171,  -701,
+     546,   619,   556,   548,   569,  -701,   704,   643,  1453,  2842,
+    -701,   178,  -701,  2984,  1453,  -701,  7202,  3694,  -701,  4546,
+    3126,   557,  3694,  -701,  3268,  -701,  -701,  -701,   448,   -43,
+    -701,   646,  1453,   558,  -701,  -701,   645,  -701,  -701,  -701,
+     698,  -701,   565,  -701,  3410,  -701,   652,   656,   725,  -701,
+    -701,  -701,    67,  -701,  -701,  -701,  -701,  -701,   -43,   570,
+    3694,  -701,   627,   242,  -701,  -701,  -701,  3552,  -701
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -900,133 +900,133 @@
 {
        4,     0,     2,     1,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   411,     0,     0,   319,     0,   324,
-     325,     5,   346,   393,    52,   326,   278,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   290,     0,     0,
-       0,     0,     0,     0,   305,     0,     0,     0,     0,     0,
-       0,    80,    86,     0,     0,   330,   331,   333,   327,   328,
-      32,    33,    34,   335,     0,   334,   329,     0,    83,   332,
-     283,     0,    59,    25,   404,   348,     3,     0,     7,    30,
-       8,     9,    73,    74,     0,     0,   361,     0,    75,   385,
-       0,   351,   279,     0,   360,     0,   362,     0,   389,     0,
-     384,   366,   383,   386,   392,     0,   268,   263,   280,   281,
-     264,   347,     5,   305,     0,   283,    75,   423,   424,     0,
-     426,   427,   282,   249,   250,   251,   252,     5,   305,     0,
-       0,     0,   306,     0,   230,   364,     0,   232,   269,   270,
-     271,   272,   273,   274,   275,   277,     0,   416,     0,   354,
-       0,     0,   306,   312,   322,   313,     0,   315,   386,     0,
-     217,     0,   276,     0,    31,   395,   395,     0,   208,     0,
-       0,   209,     0,     0,     0,    42,     0,    44,     0,     0,
-       0,    46,   361,     0,   362,    25,     0,     0,    18,     0,
-      17,   152,     0,     0,   151,   157,     0,    75,    81,    82,
-       0,     0,     0,     0,   410,   411,     0,     4,     0,   350,
-     361,     0,   362,     0,     0,   264,     0,     0,     0,   144,
-       0,    15,    84,    87,    54,    76,     0,   395,     0,     0,
+       0,     0,     0,     0,   413,     0,     0,   321,     0,   326,
+     327,     5,   348,   395,    52,   328,   280,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   292,     0,     0,
+       0,     0,     0,     0,   307,     0,     0,     0,     0,     0,
+       0,    80,    86,     0,     0,   332,   333,   335,   329,   330,
+      32,    33,    34,   337,     0,   336,   331,     0,    83,   334,
+     285,     0,    59,    25,   406,   350,     3,     0,     7,    30,
+       8,     9,    73,    74,     0,     0,   363,     0,    75,   387,
+       0,   353,   281,     0,   362,     0,   364,     0,   391,     0,
+     386,   368,   385,   388,   394,     0,   270,   265,   282,   283,
+     266,   349,     5,   307,     0,   285,    75,   425,   426,     0,
+     428,   429,   284,   251,   252,   253,   254,     5,   307,     0,
+       0,     0,   308,     0,   232,   366,     0,   234,   271,   272,
+     273,   274,   275,   276,   277,   279,     0,   418,     0,   356,
+       0,     0,   308,   314,   324,   315,     0,   317,   388,     0,
+     219,     0,   278,     0,    31,   397,   397,     0,   210,     0,
+       0,   211,     0,     0,     0,    42,     0,    44,     0,     0,
+       0,    46,   363,     0,   364,    25,     0,     0,    18,     0,
+      17,   154,     0,     0,   153,   159,     0,    75,    81,    82,
+       0,     0,     0,     0,   412,   413,     0,     4,     0,   352,
+     363,     0,   364,     0,     0,   266,     0,     0,     0,   146,
+       0,    15,    84,    87,    54,    76,     0,   397,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    53,   229,   231,
+       0,     0,     0,     0,     0,     0,     0,    53,   231,   233,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   144,     0,   395,     0,   395,     0,   405,   388,
-     395,   395,   395,     0,     0,     0,   308,     0,     0,     0,
-     420,   363,     0,   438,   355,   412,     0,   308,     0,   144,
-     439,     0,     0,   388,   320,     0,     0,   396,     0,     0,
-       0,    51,     0,     0,     0,   210,   212,   361,   362,     0,
+       0,     0,   146,     0,   397,     0,   397,     0,   407,   390,
+     397,   397,   397,     0,     0,     0,   310,     0,     0,     0,
+     422,   365,     0,   440,   357,   414,     0,   310,     0,   146,
+     441,     0,     0,   390,   322,     0,     0,   398,     0,     0,
+       0,    51,     0,     0,     0,   212,   214,   363,   364,     0,
        0,     0,    43,    45,    63,     0,    47,    48,     0,    62,
-      20,     0,     0,    14,     0,   153,   362,     0,    49,     0,
-       0,    50,     0,     0,    70,    72,   428,     0,     0,     0,
-       0,   408,     0,   407,     0,   349,     0,    11,     4,   144,
-       0,   431,   430,   387,     0,    35,    24,    26,    27,    28,
-       0,     6,     0,     0,     0,   143,   145,   147,     0,     0,
-      89,     0,     0,     0,   136,     0,   440,   378,   376,     0,
-     235,   237,   236,     0,     0,   267,   233,   234,   238,   240,
-     239,   255,   256,   253,   254,   261,   257,   258,   259,   260,
-     247,   248,   242,   243,   241,   244,   245,   246,   262,     0,
-     214,   218,   219,   220,   221,   222,   223,   224,   225,   226,
-     227,   228,     0,   441,   379,     0,   402,     0,   398,   375,
-     397,   401,     0,     0,     0,     0,     0,   425,   307,     0,
-       0,     0,   415,     0,   414,   307,   378,     0,   379,   317,
-     321,     0,   436,   434,   207,     0,     0,   209,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   352,   326,     0,
-       0,     0,   337,     0,   336,    23,   344,     0,     0,    19,
-      16,     0,   150,   158,   155,   136,     0,     0,     0,   421,
-     422,    10,   410,   410,     0,   437,   144,    13,     0,     0,
-     361,   362,     0,   394,   149,   148,   297,     0,     0,     0,
-       0,   309,    85,     0,     0,    88,    91,   160,   136,   139,
-     140,     0,   124,     0,   137,   138,   382,   144,   144,   377,
-     266,     0,     0,   215,   304,   144,   144,   381,     0,   144,
-     374,   373,   368,   395,     0,   390,   391,   433,   432,   435,
-     419,   418,     0,   323,   314,    25,   116,     0,    25,   114,
-      38,     0,   211,    93,     0,    93,    95,   103,     0,    25,
-     101,    58,   109,   109,    41,   340,   341,   359,     0,   354,
-     352,     0,   339,     0,     0,     0,    67,    65,    61,    21,
-     154,     0,     0,    71,    55,   429,     0,   406,     0,     0,
-      12,   299,     0,   146,    22,     0,   311,    90,   160,     0,
-     191,     0,   291,   136,     0,   135,     0,   126,     0,     0,
-     265,   322,     0,     0,   403,     0,   395,   395,   365,     0,
-       0,     0,   413,     0,   316,   118,   120,     0,     0,   209,
-       0,     0,    96,     0,     0,     0,   109,     0,   109,     0,
-       0,   343,   355,   353,     0,   338,   345,     0,    25,    64,
-      60,    68,   156,   291,   409,   213,   298,    29,   310,   191,
-      92,     0,     0,   198,   199,   200,   197,   196,   195,   190,
-      79,   159,   163,     0,     0,   189,   193,     0,   141,     0,
-     141,     0,   127,   134,     0,   300,   303,   216,   301,   302,
-     372,     0,     0,     0,   367,   399,   400,   417,   318,   122,
-       0,     0,    36,    39,     0,     0,    94,     0,     0,   104,
-       0,     0,     0,     0,     0,     0,   105,   358,   357,   342,
-       0,     0,   141,    78,     0,     0,   167,   203,     0,   164,
-     194,     0,   162,     0,     0,     0,     0,     0,   130,     0,
-     129,   370,   371,   375,     0,     0,     0,     0,   121,   115,
-       0,    25,    99,    57,    56,   102,     0,   107,     0,   112,
-     113,    25,   106,     0,     0,    69,     0,     0,     0,   169,
-     171,   166,     0,     0,   161,    75,     0,   142,    25,     0,
-     295,     0,    25,   131,     0,   128,   369,     0,    25,     0,
-       0,    25,    97,    40,     0,   108,    25,   111,   356,     0,
-      25,   206,   168,     5,     0,   172,   173,     0,     0,   181,
-       0,     0,   204,   201,     0,     0,     0,   296,     0,   292,
-       0,     0,   133,     0,   123,    37,     0,     0,     0,   110,
-      25,     0,   170,   174,   175,   185,     0,   176,     0,     0,
-       0,   205,    77,     0,   293,   284,   132,     0,   117,     0,
-     100,     0,   285,     0,   184,   177,   178,   182,   202,   136,
-     294,    25,    98,    66,   183,     0,     0,   119,   179,   141,
-       0,   187,    25,   165,     0,   188
+      20,     0,     0,    14,     0,   155,   364,     0,    49,     0,
+       0,    50,     0,     0,    70,    72,   430,     0,     0,     0,
+       0,   410,     0,   409,     0,   351,     0,    11,     4,   146,
+       0,   433,   432,   389,     0,    35,    24,    26,    27,    28,
+       0,     6,     0,     0,     0,   145,   147,   149,     0,     0,
+      89,     0,     0,     0,   136,     0,   442,   380,   378,     0,
+     237,   239,   238,     0,     0,   269,   235,   236,   240,   242,
+     241,   257,   258,   255,   256,   263,   259,   260,   261,   262,
+     249,   250,   244,   245,   243,   246,   247,   248,   264,     0,
+     216,   220,   221,   222,   223,   224,   225,   226,   227,   228,
+     229,   230,     0,   443,   381,     0,   404,     0,   400,   377,
+     399,   403,     0,     0,     0,     0,     0,   427,   309,     0,
+       0,     0,   417,     0,   416,   309,   380,     0,   381,   319,
+     323,     0,   438,   436,   209,     0,     0,   211,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   354,   328,     0,
+       0,     0,   339,     0,   338,    23,   346,     0,     0,    19,
+      16,     0,   152,   160,   157,   136,     0,     0,     0,   423,
+     424,    10,   412,   412,     0,   439,   146,    13,     0,     0,
+     363,   364,     0,   396,   151,   150,   299,     0,     0,     0,
+       0,   311,    85,     0,     0,    88,    91,   162,   136,     0,
+     141,   142,     0,   124,     0,   137,   138,   140,   384,   146,
+     146,   379,   268,     0,     0,   217,   306,   146,   146,   383,
+       0,   146,   376,   375,   370,   397,     0,   392,   393,   435,
+     434,   437,   421,   420,     0,   325,   316,    25,   116,     0,
+      25,   114,    38,     0,   213,    93,     0,    93,    95,   103,
+       0,    25,   101,    58,   109,   109,    41,   342,   343,   361,
+       0,   356,   354,     0,   341,     0,     0,     0,    67,    65,
+      61,    21,   156,     0,     0,    71,    55,   431,     0,   408,
+       0,     0,    12,   301,     0,   148,    22,     0,   313,    90,
+     162,     0,   193,     0,   139,   293,   136,     0,   135,     0,
+     126,     0,     0,   267,   324,     0,     0,   405,     0,   397,
+     397,   367,     0,     0,     0,   415,     0,   318,   118,   120,
+       0,     0,   211,     0,     0,    96,     0,     0,     0,   109,
+       0,   109,     0,     0,   345,   357,   355,     0,   340,   347,
+       0,    25,    64,    60,    68,   158,   293,   411,   215,   300,
+      29,   312,   193,    92,     0,     0,   200,   201,   202,   199,
+     198,   197,   192,    79,   161,   165,     0,     0,   191,   195,
+       0,   143,     0,   143,     0,   127,   134,     0,   302,   305,
+     218,   303,   304,   374,     0,     0,     0,   369,   401,   402,
+     419,   320,   122,     0,     0,    36,    39,     0,     0,    94,
+       0,     0,   104,     0,     0,     0,     0,     0,     0,   105,
+     360,   359,   344,     0,     0,   143,    78,     0,     0,   169,
+     205,     0,   166,   196,     0,   164,     0,     0,     0,     0,
+       0,   130,     0,   129,   372,   373,   377,     0,     0,     0,
+       0,   121,   115,     0,    25,    99,    57,    56,   102,     0,
+     107,     0,   112,   113,    25,   106,     0,     0,    69,     0,
+       0,     0,   171,   173,   168,     0,     0,   163,    75,     0,
+     144,    25,     0,   297,     0,    25,   131,     0,   128,   371,
+       0,    25,     0,     0,    25,    97,    40,     0,   108,    25,
+     111,   358,     0,    25,   208,   170,     5,     0,   174,   175,
+       0,     0,   183,     0,     0,   206,   203,     0,     0,     0,
+     298,     0,   294,     0,     0,   133,     0,   123,    37,     0,
+       0,     0,   110,    25,     0,   172,   176,   177,   187,     0,
+     178,     0,     0,     0,   207,    77,     0,   295,   286,   132,
+       0,   117,     0,   100,     0,   287,     0,   186,   179,   180,
+     184,   204,   136,   296,    25,    98,    66,   185,     0,     0,
+     119,   181,   143,     0,   189,    25,   167,     0,   190
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -690,  -690,  -202,    -5,  -690,  -690,   493,  -690,  -160,  -690,
-      16,  -690,  -690,   231,  -690,   232,  -690,   330,    12,    17,
-    -125,  -690,  -690,  -690,  -690,  -690,  -690,  -690,   309,   254,
-     181,  -690,   105,  -690,  -690,  -690,  -352,    63,  -690,  -690,
-    -690,  -690,  -690,  -502,  -690,  -588,   212,    84,  -689,  -196,
-    -690,   323,  -690,   502,  -690,   225,  -690,  -690,  -690,  -690,
-    -690,  -690,  -690,    27,  -690,  -690,  -690,  -690,  -690,  -690,
-    -690,  -690,  -690,  -690,  -688,  -690,  -690,  -690,  -461,  -690,
-     -42,   775,    -2,   171,  -690,  -690,   156,  -222,  -258,  -690,
-    -690,  -690,  -690,   217,  -324,   -80,  -690,  -690,   263,   261,
-    -690,   910,   663,  -369,   397,    95,  -690,  -690,  -690,  -690,
-      94,  -234,  -690,   558,  -690,  -690,   -23,   -20,  -690,  -153,
-    -306,  -690,  -690,   -13,   354,   358,   653,  -690,  -690,  -690,
-    -690,  -690,  -690,   139,  -690
+    -701,  -701,  -193,    -5,  -701,  -701,   392,  -701,  -179,  -701,
+       2,  -701,  -701,   127,  -701,   129,  -701,   232,     1,     3,
+    -125,  -701,  -701,  -701,  -701,  -701,  -701,  -701,   206,   154,
+      77,  -701,     5,  -701,  -701,  -701,  -552,   -44,  -701,  -701,
+    -701,  -701,  -701,  -497,  -701,  -571,   108,   -16,   209,  -700,
+    -253,  -701,   222,  -701,   409,  -701,   121,  -701,  -701,  -701,
+    -701,  -701,  -701,  -701,   -85,  -701,  -701,  -701,  -701,  -701,
+    -701,  -701,  -701,  -701,  -701,  -689,  -701,  -701,  -701,  -462,
+    -701,   -38,   673,    -2,    69,  -701,  -701,   217,  -340,  -252,
+    -701,  -701,  -701,  -701,   113,   638,   724,  -701,  -701,   156,
+     158,  -701,   899,   560,  -360,   373,   880,  -701,  -701,  -701,
+    -701,   -11,  -221,  -701,   115,  -701,  -701,   -23,   -19,  -701,
+    -158,  -305,  -701,  -701,   -13,   248,   250,   549,  -701,  -701,
+    -701,  -701,  -701,  -701,     4,  -701
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
       -1,     1,     2,    85,    86,   199,   200,    87,   226,   376,
-     377,    89,   606,   607,   680,   608,   353,   354,   378,   379,
-     236,    92,    93,    94,   390,    95,   392,   534,   535,   661,
-     585,   823,   783,   591,   330,   594,   667,   791,   580,   656,
-     729,   732,   776,   541,   542,   637,   543,   544,   764,   384,
-     385,   386,   203,   204,   206,   630,   701,   805,   702,   755,
-     801,   834,   835,   836,   837,   885,   838,   839,   840,   883,
-     903,   703,   704,   705,   706,   758,   707,   177,   324,   325,
-      96,    97,   126,   710,   811,    99,   100,   545,   164,   165,
-     574,   654,   172,   310,   101,   597,   496,   102,   598,   305,
-     599,   103,   104,   300,   105,   106,   648,   724,   560,   561,
-     562,   107,   108,   109,   110,   111,   112,   113,   114,   318,
-     449,   450,   451,   115,   362,   363,   158,   159,   116,   357,
-     117,   118,   119,   120,   121
+     377,    89,   608,   609,   683,   610,   353,   354,   378,   379,
+     236,    92,    93,    94,   390,    95,   392,   534,   535,   664,
+     587,   826,   786,   593,   330,   596,   670,   794,   582,   659,
+     732,   735,   779,   542,   543,   640,   544,   545,   546,   767,
+     384,   385,   386,   203,   204,   206,   632,   704,   808,   705,
+     758,   804,   837,   838,   839,   840,   888,   841,   842,   843,
+     886,   906,   706,   707,   708,   709,   761,   710,   177,   324,
+     325,    96,    97,   126,   713,   814,    99,   100,   547,   164,
+     165,   576,   657,   172,   310,   101,   599,   496,   102,   600,
+     305,   601,   103,   104,   300,   105,   106,   651,   727,   562,
+     563,   564,   107,   108,   109,   110,   111,   112,   113,   114,
+     318,   449,   450,   451,   115,   362,   363,   158,   159,   116,
+     357,   117,   118,   119,   120,   121
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -1034,179 +1034,197 @@
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
-      98,   293,   167,   612,   397,   168,   469,   192,   428,   142,
-     142,   494,   169,   524,    90,   366,   581,   760,    88,    91,
-     162,   766,   482,   319,   635,   494,   506,   798,   789,   230,
-     320,   342,   347,   350,   761,   338,   631,   508,   220,   803,
-     634,   513,   513,   286,   393,   848,   712,   198,   286,   444,
-     341,   448,   207,   604,   179,   129,   286,   171,   498,   552,
-    -306,   563,   592,   796,   397,   444,   228,   137,   137,   218,
-      33,   205,   219,   767,   466,   137,     3,   468,   448,   228,
-     173,   396,   352,    33,   395,   635,   442,  -306,   174,   367,
-     368,   809,   570,   228,   571,   289,   873,    47,   268,   269,
-    -308,   229,   730,   731,   138,   605,   228,   636,   228,   145,
-     145,   743,   744,   467,   369,   137,   228,   443,   635,    33,
-     286,   207,   180,   768,   446,  -380,    33,   175,   201,   181,
-     394,   445,   459,   452,    33,   296,   810,   454,   455,   456,
-     327,   874,   287,   139,   194,   197,   140,   287,   460,   313,
-      33,   142,  -377,   216,   141,   287,   307,   494,   176,    84,
-     564,   494,   494,   494,   217,   790,   518,   532,   636,   536,
-     143,   143,    84,   519,   189,   222,   483,   884,   746,   813,
-     507,   163,   799,   800,   231,   321,   343,   348,   351,   762,
-     529,   509,   340,   530,   804,   514,   684,   142,   735,   849,
-     593,   636,  -380,   190,   494,   142,   142,   142,    84,   142,
-     900,   365,   195,   447,    33,    84,  -376,   202,   398,   287,
-     225,    33,   182,    84,    98,   399,   270,   271,   272,   273,
-     274,   275,   276,   277,   278,   279,   280,   281,  -307,    84,
-     183,   669,   184,   167,   228,   208,   168,   137,   137,    33,
-      33,   301,   516,   169,   833,   495,   228,   743,   744,   210,
-     228,   162,   209,   398,   229,   398,  -364,  -364,   369,   503,
-     399,   211,   399,   228,   584,   212,   494,   328,   398,   398,
-     297,   516,   727,   138,   138,   399,   399,   494,   398,   137,
-     458,   398,   398,   213,   641,   399,  -308,   346,   399,   399,
-     360,   465,   228,   288,   214,   355,   356,   358,   215,   361,
-      84,   536,   143,   137,   741,    33,   745,   137,   227,    33,
-     619,  -307,   139,   139,   792,   140,   140,   228,   520,   529,
-     492,   232,   530,   141,   141,   233,    98,   198,    84,    84,
-     494,   263,   264,   265,   492,   266,   494,   728,   494,   138,
-     234,   638,   639,   138,   742,   743,   744,   235,   143,   642,
-     643,  -286,  -286,   645,    98,   237,   143,   143,   143,   238,
-     143,   137,   137,  -288,  -288,  -287,  -287,   142,    90,   549,
-     774,   775,    88,    91,   531,   282,   531,   896,   139,   531,
-     494,   140,   139,   901,   902,   140,   786,   743,   744,   141,
-     283,   587,   344,   141,    84,   595,   596,   690,    84,   284,
-     649,   144,   147,   285,   290,   655,   291,   773,   658,   448,
-     292,   175,   163,    47,   142,   539,   539,   216,   266,   665,
-     295,   270,   271,   272,   273,   274,   275,   276,   277,   278,
-     279,   280,   281,   303,    25,   494,   529,   529,   624,   530,
-     530,   540,   540,   298,   299,   750,   142,   304,   142,  -125,
-     312,   306,   137,   308,    33,   521,   228,   322,   311,   494,
-     756,  -364,  -364,   494,   142,   142,   492,   301,   494,   309,
-     492,   492,   492,   329,   335,   334,   602,   576,   349,   448,
-     494,   493,   579,   721,   722,   336,   381,   359,   138,   590,
-     531,   142,  -192,   142,   371,   493,   388,   142,   142,   373,
-     693,   694,   695,   696,   697,   698,    98,   389,   751,   391,
-     394,   494,   475,   492,   553,   626,   477,   494,   531,   167,
-      90,   682,   168,   531,    88,    91,   472,   160,   143,   169,
-     161,   473,   478,   479,   481,   494,   504,   162,   141,   499,
-     505,   511,   510,    84,   691,   512,   301,   522,   301,   692,
-     515,   693,   694,   695,   696,   697,   698,   699,   526,   527,
-     528,   533,   146,   146,   583,   586,   832,   537,   841,   142,
-    -289,  -289,   546,   166,   739,   143,   538,   547,   548,   555,
-     747,   554,   748,   556,   559,   492,   675,   557,   573,   588,
-     600,   355,   565,   615,   567,   568,   492,   361,   361,   569,
-     601,   603,   609,   841,   611,   700,   614,   143,   618,   143,
-     688,   824,   621,   622,   531,   625,   628,   629,   531,   632,
-     633,   827,   646,   398,   770,   143,   143,   493,   647,   653,
-     399,   493,   493,   493,   886,   659,   142,   660,   846,   664,
-     666,   668,   850,    98,   670,   142,    98,   671,   854,   492,
-     672,   857,   143,    98,   143,   492,   859,   492,   143,   143,
-     861,   676,   531,   898,   678,   677,   713,   683,   686,   662,
-     844,   687,   714,   691,   493,   708,   709,   531,   692,   815,
-     693,   694,   695,   696,   697,   698,   699,   715,   716,   725,
-     881,   718,   759,   398,   719,   720,   723,   733,   163,   492,
-     399,   737,   738,   828,   146,   749,   754,   831,   763,   757,
-     765,   769,   842,   260,   261,   262,   263,   264,   265,   771,
-     266,   897,   772,   777,   852,   793,   794,   779,   780,   797,
-     143,   785,   904,   802,   753,   787,   301,   778,   806,    98,
-     808,   812,   814,   782,   782,   586,   493,   818,   531,   817,
-     146,   819,   843,   825,   492,   871,   829,   493,   146,   146,
-     146,   876,   146,   830,   270,   271,   272,   273,   274,   275,
-     276,   277,   278,   279,   280,   281,   845,   847,   492,   888,
-     851,   855,   492,   531,   860,   531,   822,   492,   693,   694,
-     695,   696,   697,   698,  -180,   862,   864,   143,   865,   492,
-     866,   867,   868,   869,  -364,  -364,   143,   870,   880,   887,
-     493,   889,    98,   890,   166,    98,   493,   891,   493,   892,
-     531,   894,  -186,   895,   899,   500,   613,   679,   681,   663,
-     492,   736,   627,   784,    98,   711,   492,   807,    98,   502,
-     623,   826,    98,   689,   752,    98,   223,    98,   717,    98,
-     673,   531,   863,   674,   492,   345,   616,   816,   364,     0,
-     493,   617,   878,     0,     0,     0,     0,     0,     0,    98,
-       0,     0,     0,     0,   531,     0,     0,     0,     0,     0,
-     531,     0,     0,     0,     0,    98,     0,     0,     0,     0,
-       0,     0,    98,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   127,   128,     0,   130,   131,   132,
-     133,   134,   135,   136,   337,   493,   148,   149,   150,   151,
-     152,   153,   154,   155,   157,     0,   170,     0,     0,     0,
-     146,     0,   485,   486,     0,     0,     0,   178,     0,   493,
-       0,     0,     0,   493,   186,   188,     0,     0,   493,   193,
-       0,   196,     0,   487,     0,     0,     0,     0,     0,     0,
-     493,    29,    30,   137,     0,     0,     0,     0,     0,     0,
-       0,   488,     0,     0,     0,     0,     0,   146,     0,     0,
-     221,   224,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   493,     0,     0,     0,     0,     0,   493,     0,   138,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   146,
-       0,   146,     0,     0,     0,   493,     0,   489,    65,    66,
-      67,    68,    69,     0,     0,     0,     0,   146,   146,   294,
-       0,     0,    73,     0,     0,     0,     0,     0,   490,    75,
-      76,   491,     0,     0,     0,    79,     0,     0,     0,     0,
-       0,     0,     0,     0,   146,     0,   146,     0,     0,     0,
-     146,   146,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   315,     0,   316,     0,   317,   317,     0,     0,     0,
-     323,   326,   193,     0,   331,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,     0,     0,     0,
-     166,  -381,  -381,  -381,  -381,   258,   259,   260,   261,   262,
-     263,   264,   265,     0,   266,   157,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  -364,  -364,   380,     0,   387,
-       0,     0,   146,     0,     0,     0,     0,   317,     0,   400,
-     401,   402,   404,   405,   406,   407,   408,   409,   410,   411,
-     412,   413,   414,   415,   416,   417,   418,   419,   420,   421,
-     422,   423,   424,   425,   426,   427,     0,   480,     0,     0,
-     430,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-     440,   441,   387,     0,   317,     0,   317,   453,     0,     0,
-     317,   317,   317,     0,     0,     0,     0,     0,     0,   146,
-       0,     0,   462,     0,   464,     0,     0,     0,   146,   387,
+      98,   293,   167,    90,    88,    91,   168,   469,   614,   142,
+     142,   192,   169,   769,   428,   583,   338,   397,   319,   763,
+     162,   801,   524,   230,   366,   320,   342,   347,   350,   442,
+     764,   806,   137,   482,   506,   508,   513,   513,   286,   393,
+     179,   633,   220,   672,   851,   606,   137,   198,   286,   532,
+     341,   536,   207,   638,   554,   799,   467,   594,   565,   201,
+     228,     3,   444,   137,   448,    33,   715,   812,   229,   218,
+     228,   792,   219,   637,   174,   228,   205,   397,   444,   395,
+     367,   368,   352,   369,   129,   225,   770,   466,   746,   747,
+     468,   448,   539,   171,   746,   747,   289,   607,  -308,   138,
+    -308,   572,    47,   573,   228,  -310,   228,   529,   228,   539,
+     530,   228,   813,   175,   229,   586,   519,   744,   638,   748,
+    -382,   207,   173,    33,   197,   394,   445,   286,   452,   146,
+     146,   638,   454,   455,   456,   296,   639,   287,   139,   286,
+     166,   140,   137,   771,   327,   297,   176,   287,   202,   141,
+     313,   142,    33,   180,    84,   749,   307,   566,   137,   137,
+      33,   795,   137,   270,   271,   272,   273,   274,   275,   276,
+     277,   278,   279,   280,   281,   518,   802,   803,   231,   887,
+     321,   343,   348,   351,   189,   765,   807,   483,   507,   509,
+     514,   687,   340,   536,   138,   595,   540,   142,   852,   816,
+     738,   639,   903,  -366,  -366,   142,   142,   142,   793,   142,
+     876,   365,   288,   540,   639,   498,   396,   529,    33,   398,
+     530,  -382,   541,  -379,    98,   399,   287,   181,   443,  -125,
+      33,   143,   143,   139,   529,  -378,   140,   530,   287,   541,
+     216,    84,   163,   167,   141,   190,   836,   168,   208,    84,
+     182,   217,   459,   169,    33,   877,   460,   446,    33,    33,
+     228,   162,   183,   621,   398,   184,   398,   137,   516,    33,
+     399,   146,   399,   228,   137,  -309,    33,   268,   269,   398,
+     398,   228,   745,   746,   747,   399,   399,  -288,  -288,   398,
+     458,   693,   398,   398,   730,   399,   641,   642,   399,   399,
+     195,   465,   644,   138,   645,   646,   209,    84,   648,  -310,
+     138,   227,  -289,  -289,   137,   228,   210,   146,   137,    84,
+      33,   529,   137,   369,   530,   146,   146,   146,   211,   146,
+     492,   232,   520,   789,   746,   747,    98,   198,   233,   137,
+     753,    33,   139,    84,   492,   140,   447,    84,    84,   139,
+     212,   731,   140,   141,   138,   759,   344,   213,    84,   214,
+     141,   235,  -290,  -290,    98,    84,   215,    90,    88,    91,
+     234,   360,   237,   143,   238,   138,   540,   142,   733,   734,
+     551,   166,   777,   778,   531,  -309,   531,   144,   147,   531,
+     282,   228,   283,   139,   285,   899,   140,   529,   658,   516,
+     530,   661,   541,   284,   141,   904,   905,   652,   290,    84,
+     291,   292,   668,   175,   160,   216,    47,   161,   266,   143,
+     295,   776,    25,   298,   142,   141,   299,   143,   143,   143,
+      84,   143,   694,   303,   304,   448,   306,   695,  -194,   696,
+     697,   698,   699,   700,   701,   702,   696,   697,   698,   699,
+     700,   701,   228,   308,   309,   322,   142,   694,   142,   312,
+     329,   835,   695,   844,   696,   697,   698,   699,   700,   701,
+     702,   311,   334,   578,   142,   142,   492,   335,   581,   336,
+     492,   492,   492,   163,   349,   592,   604,   359,   371,   373,
+     381,   724,   725,   703,   388,   389,   391,   146,   844,   472,
+     531,   142,   754,   142,   473,   448,   478,   142,   142,   479,
+     260,   261,   262,   263,   264,   265,    98,   266,   756,    90,
+      88,    91,   394,   492,   475,   628,   481,   477,   531,   889,
+     499,   167,   510,   531,   531,   168,   263,   264,   265,   504,
+     266,   169,   505,   511,   146,   512,   527,   528,   515,   162,
+     522,   537,   493,   526,   533,   538,   549,   548,   901,   696,
+     697,   698,   699,   700,   701,   550,   493,   556,   557,   558,
+     559,   561,   590,   567,   603,   605,   146,   611,   146,   569,
+     570,   142,   575,   571,   602,   613,   620,   616,   627,   623,
+     631,   636,   624,   635,   146,   146,   630,   492,   678,   143,
+     649,   650,   656,   662,   663,   827,   667,   669,   492,   671,
+     673,   675,   674,   680,   679,   830,   686,   681,   689,   712,
+     690,   146,   691,   146,   716,   711,   531,   146,   146,   717,
+     718,   531,   849,   726,   719,   721,   853,   398,   736,   757,
+     722,   723,   857,   399,   740,   860,   143,   728,   741,   142,
+     862,   760,   752,   766,   864,   768,    98,   772,   142,    98,
+     774,   780,   492,   775,   782,   783,    98,   788,   492,   166,
+     492,   790,   796,   797,   800,   531,   805,   809,   143,   811,
+     143,   815,   817,   847,   884,   820,   821,   822,   828,   832,
+     531,   846,   833,   848,   850,   854,   143,   143,   493,  -182,
+     858,   146,   493,   493,   493,   762,   863,   398,   865,   867,
+     869,   870,   492,   399,   868,   900,   871,   872,   873,   892,
+     883,   890,   893,   143,   894,   143,   907,   897,   895,   143,
+     143,  -188,   902,   898,   500,   682,   781,   684,   615,   629,
+     739,   666,   785,   785,   714,   493,   787,   829,   634,   625,
+     810,   692,    98,   866,   223,   755,   502,   720,   677,   676,
+     618,   531,   345,   619,   364,   819,     0,   492,     0,   146,
+       0,   163,     0,     0,     0,     0,     0,     0,   146,     0,
+       0,     0,     0,     0,     0,   825,     0,     0,     0,     0,
+       0,   492,     0,     0,     0,   492,   531,     0,   531,     0,
+     492,     0,     0,   143,     0,     0,     0,     0,     0,     0,
+       0,     0,   492,     0,     0,     0,     0,     0,     0,   493,
+       0,     0,     0,     0,     0,    98,     0,     0,    98,     0,
+     493,     0,     0,   531,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   492,     0,     0,     0,    98,     0,   492,
+       0,    98,     0,     0,     0,    98,     0,     0,    98,     0,
+      98,   881,    98,     0,   531,     0,     0,   492,     0,     0,
+       0,   143,     0,     0,     0,     0,     0,     0,     0,     0,
+     143,     0,    98,     0,   493,     0,     0,   531,     0,     0,
+     493,     0,   493,   531,   145,   145,     0,     0,    98,     0,
+       0,     0,     0,   127,   128,    98,   130,   131,   132,   133,
+     134,   135,   136,     0,     0,   148,   149,   150,   151,   152,
+     153,   154,   155,   157,     0,   170,     0,     0,     0,   194,
+       0,     0,     0,     0,   493,     0,   178,     0,     0,     0,
+       0,     0,     0,   186,   188,     0,     0,     0,   193,     0,
+     196,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     222,   270,   271,   272,   273,   274,   275,   276,   277,   278,
+     279,   280,   281,   494,     0,     0,     0,     0,     0,   221,
+     224,     0,     0,     0,     0,     0,     0,   494,     0,   493,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     474,   270,   271,   272,   273,   274,   275,   276,   277,   278,
-     279,   280,   281,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   501,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     4,     5,     6,     7,     8,
-       0,  -364,  -364,     0,     9,     0,     0,     0,     0,   387,
-     193,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   525,   382,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    10,    11,     0,     0,
-       0,     0,    12,   550,    13,    14,    15,    16,    17,    18,
-       0,     0,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,     0,     0,     0,     0,    29,    30,   122,    32,    33,
-       0,     0,     0,     0,     0,    35,    36,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   558,     0,     0,
-       0,     0,     0,     0,     0,    47,     0,     0,     0,     0,
-       0,     0,     0,   123,     0,     0,     0,     0,     0,     0,
-       0,    58,    59,     0,     0,   577,     0,   326,   582,     0,
-      63,    64,    65,    66,    67,    68,    69,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    73,     0,     0,     0,
-       0,     0,   124,    75,    76,    77,     0,     0,     0,    79,
-     125,     0,   383,    81,     0,     0,   387,     0,    84,     0,
-       0,     0,     0,     0,     0,     0,     0,   387,   249,   250,
-     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
-     261,   262,   263,   264,   265,     0,   266,   387,   387,     0,
-       0,   640,     0,     0,     0,   387,   387,     0,     0,   387,
-       0,     0,     0,   317,   650,     0,     0,     0,     0,     0,
-       0,     0,   652,     0,     0,     0,     0,     0,     0,     0,
+       0,  -366,  -366,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   493,     0,     0,     0,   493,     0,     0,
+       0,     0,   493,     0,     0,     0,     0,     0,   294,     0,
+       0,     0,     0,     0,   493,     0,   301,   270,   271,   272,
+     273,   274,   275,   276,   277,   278,   279,   280,   281,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   495,
+       0,     0,   328,     0,     0,   493,     0,     0,     0,     0,
+     315,   493,   316,   503,   317,   317,     0,  -366,  -366,   323,
+     326,   193,   346,   331,     0,     0,     0,     0,     0,   493,
+     355,   356,   358,     0,   361,  -383,  -383,  -383,  -383,   258,
+     259,   260,   261,   262,   263,   264,   265,     0,   266,     0,
+    -291,  -291,     0,     0,   157,     0,     0,     0,     0,   494,
+       0,     0,     0,   494,   494,   494,   380,     0,   387,     0,
+       0,     0,     0,     0,     0,     0,   317,     0,   400,   401,
+     402,   404,   405,   406,   407,   408,   409,   410,   411,   412,
+     413,   414,   415,   416,   417,   418,   419,   420,   421,   422,
+     423,   424,   425,   426,   427,     0,   494,     0,     0,   430,
+     431,   432,   433,   434,   435,   436,   437,   438,   439,   440,
+     441,   387,     0,   317,     0,   317,   453,   337,     0,   317,
+     317,   317,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   462,     0,   464,     0,   589,     0,     0,   387,   597,
+     598,     0,     0,     0,     0,     0,     0,     0,     0,   474,
+       0,     0,     0,     0,   270,   271,   272,   273,   274,   275,
+     276,   277,   278,   279,   280,   281,     0,     0,     0,     0,
+     494,     0,     0,   501,     0,     0,     0,     0,     0,     0,
+     521,   494,   626,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   301,     0,  -366,  -366,     0,     0,   387,   193,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     4,     5,     6,     7,     8,     0,     0,     0,     0,
-       9,  -381,  -381,  -381,  -381,  -381,   254,   255,   256,   257,
-     258,   259,   260,   261,   262,   263,   264,   265,   685,   266,
+       0,     0,   525,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   239,   240,   241,     0,
+       0,     0,   552,     0,     0,   494,   480,     0,     0,   555,
+       0,   494,   242,   494,   243,   244,   245,   246,   247,   248,
+     249,   250,   251,   252,   253,   254,   255,   256,   257,   258,
+     259,   260,   261,   262,   263,   264,   265,   685,   266,     0,
+       0,   301,     0,   301,     0,     0,   560,     0,     0,     0,
+       0,     0,     0,     0,     0,   494,     0,     0,     0,   585,
+     588,   270,   271,   272,   273,   274,   275,   276,   277,   278,
+     279,   280,   281,     0,   579,     0,   326,   584,     0,     0,
+       0,     0,     0,     0,     0,     0,   355,     0,   617,     0,
+       0,   742,   361,   361,     0,     0,     0,   750,     0,   751,
+       0,  -366,  -366,     0,     0,     0,     0,     0,     0,     0,
+     494,     0,     0,     0,     0,   387,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   387,     0,     0,     0,
+       0,     0,     0,     0,   494,     0,     0,     0,   494,     0,
+       0,   773,     0,   494,     0,     0,     0,     0,   387,   387,
+     267,     0,   643,     0,     0,   494,   387,   387,     0,     0,
+     387,     0,     0,     0,   317,   653,   665,     0,     0,     0,
+       0,     0,     0,   655,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   494,     0,     0,     0,
+       0,     0,   494,     0,     0,     0,   818,   485,   486,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    10,    11,     0,     0,     0,     0,    12,     0,
-      13,    14,    15,    16,    17,    18,   317,   317,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,     0,   326,
-       0,    29,    30,    31,    32,    33,     0,    34,     0,     0,
-       0,    35,    36,    37,    38,    39,     0,    40,     0,    41,
-       0,    42,     0,     0,    43,     0,     0,     0,    44,    45,
-      46,    47,    48,    49,    50,     0,    51,    52,    53,    54,
-      55,    56,     0,     0,     0,     0,    57,    58,    59,    60,
-      61,    62,     0,     0,     0,     0,    63,    64,    65,    66,
-      67,    68,    69,     0,     0,    70,    71,     0,    72,     0,
-       0,     0,    73,     0,     0,     0,     0,     0,    74,    75,
-      76,    77,     0,   788,    78,    79,    80,     0,     0,    81,
-       0,    82,    83,   517,    84,     0,     0,     0,     0,     0,
-       0,     4,     5,     6,     7,     8,     0,     0,     0,     0,
-       9,     0,     0,     0,     0,     0,     0,   820,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,     0,
-     266,     0,    10,    11,     0,     0,     0,     0,    12,     0,
-      13,    14,    15,    16,    17,    18,     0,   853,    19,    20,
+     494,     0,     0,     0,     0,     0,     0,     0,   487,   688,
+     831,     0,     0,     0,   834,     0,    29,    30,   137,   845,
+       0,     0,     0,     0,   301,     0,   488,     0,     0,     0,
+       0,   855,     0,   588,     0,     0,     0,     0,   317,   317,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   326,     0,     0,   138,     0,     0,     4,     5,     6,
+       7,     8,   874,     0,     0,     0,     9,     0,   879,     0,
+       0,     0,   489,    65,    66,    67,    68,    69,     0,     0,
+       0,     0,     0,     0,     0,     0,   891,    73,     0,     0,
+       0,     0,     0,   490,    75,    76,   491,     0,    10,    11,
+      79,     0,     0,     0,    12,     0,    13,    14,    15,    16,
+      17,    18,     0,     0,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,     0,     0,     0,    29,    30,    31,
+      32,    33,     0,    34,     0,   791,     0,    35,    36,    37,
+      38,    39,     0,    40,     0,    41,     0,    42,     0,     0,
+      43,     0,     0,     0,    44,    45,    46,    47,    48,    49,
+      50,     0,    51,    52,    53,    54,    55,    56,     0,   823,
+       0,     0,    57,    58,    59,    60,    61,    62,     0,     0,
+       0,     0,    63,    64,    65,    66,    67,    68,    69,     0,
+       0,    70,    71,     0,    72,     0,     0,     0,    73,     4,
+       5,     6,     7,     8,    74,    75,    76,    77,     9,   856,
+      78,    79,    80,     0,     0,    81,     0,    82,    83,   517,
+      84,   249,   250,   251,   252,   253,   254,   255,   256,   257,
+     258,   259,   260,   261,   262,   263,   264,   265,     0,   266,
+      10,    11,     0,     0,     0,     0,    12,     0,    13,    14,
+      15,    16,    17,    18,     0,     0,    19,    20,    21,    22,
+      23,    24,    25,    26,    27,    28,     0,     0,     0,    29,
+      30,    31,    32,    33,     0,    34,     0,     0,     0,    35,
+      36,    37,    38,    39,     0,    40,     0,    41,     0,    42,
+       0,     0,    43,     0,     0,     0,    44,    45,    46,    47,
+      48,    49,    50,     0,    51,    52,    53,    54,    55,    56,
+       0,     0,     0,     0,    57,    58,    59,    60,    61,    62,
+       0,     0,     0,     0,    63,    64,    65,    66,    67,    68,
+      69,     0,     0,    70,    71,     0,    72,     0,     0,     0,
+      73,     4,     5,     6,     7,     8,    74,    75,    76,    77,
+       9,     0,    78,    79,    80,     0,     0,    81,     0,    82,
+      83,   622,    84,  -383,  -383,  -383,  -383,  -383,   254,   255,
+     256,   257,   258,   259,   260,   261,   262,   263,   264,   265,
+       0,   266,    10,    11,     0,     0,     0,     0,    12,     0,
+      13,    14,    15,    16,    17,    18,     0,     0,    19,    20,
       21,    22,    23,    24,    25,    26,    27,    28,     0,     0,
        0,    29,    30,    31,    32,    33,     0,    34,     0,     0,
        0,    35,    36,    37,    38,    39,     0,    40,     0,    41,
@@ -1217,7 +1235,7 @@
       67,    68,    69,     0,     0,    70,    71,     0,    72,     0,
        0,     0,    73,     4,     5,     6,     7,     8,    74,    75,
       76,    77,     9,     0,    78,    79,    80,     0,     0,    81,
-       0,    82,    83,   620,    84,     0,     0,     0,     0,     0,
+       0,    82,    83,     0,    84,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,    10,    11,     0,     0,     0,     0,
       12,     0,    13,    14,    15,    16,    17,    18,     0,     0,
@@ -1225,13 +1243,13 @@
        0,     0,     0,    29,    30,    31,    32,    33,     0,    34,
        0,     0,     0,    35,    36,    37,    38,    39,     0,    40,
        0,    41,     0,    42,     0,     0,    43,     0,     0,     0,
-      44,    45,    46,    47,    48,    49,    50,     0,    51,    52,
+      44,    45,    46,    47,     0,    49,    50,     0,    51,     0,
       53,    54,    55,    56,     0,     0,     0,     0,    57,    58,
-      59,    60,    61,    62,     0,     0,     0,     0,    63,    64,
+      59,   374,    61,    62,     0,     0,     0,     0,    63,    64,
       65,    66,    67,    68,    69,     0,     0,    70,    71,     0,
       72,     0,     0,     0,    73,     4,     5,     6,     7,     8,
-      74,    75,    76,    77,     9,     0,    78,    79,    80,     0,
-       0,    81,     0,    82,    83,     0,    84,     0,     0,     0,
+     124,    75,    76,    77,     9,     0,    78,    79,    80,     0,
+       0,    81,     0,    82,    83,   375,    84,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,    10,    11,     0,     0,
        0,     0,    12,     0,    13,    14,    15,    16,    17,    18,
@@ -1245,29 +1263,29 @@
       63,    64,    65,    66,    67,    68,    69,     0,     0,    70,
       71,     0,    72,     0,     0,     0,    73,     4,     5,     6,
        7,     8,   124,    75,    76,    77,     9,     0,    78,    79,
-      80,     0,     0,    81,     0,    82,    83,   375,    84,     0,
+      80,     0,     0,    81,     0,    82,    83,   497,    84,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,    10,    11,
        0,     0,     0,     0,    12,     0,    13,    14,    15,    16,
       17,    18,     0,     0,    19,    20,    21,    22,    23,    24,
       25,    26,    27,    28,     0,     0,     0,    29,    30,    31,
       32,    33,     0,    34,     0,     0,     0,    35,    36,    37,
-      38,    39,     0,    40,     0,    41,     0,    42,     0,     0,
+      38,    39,   737,    40,     0,    41,     0,    42,     0,     0,
       43,     0,     0,     0,    44,    45,    46,    47,     0,    49,
       50,     0,    51,     0,    53,    54,    55,    56,     0,     0,
        0,     0,    57,    58,    59,   374,    61,    62,     0,     0,
        0,     0,    63,    64,    65,    66,    67,    68,    69,     0,
        0,    70,    71,     0,    72,     0,     0,     0,    73,     4,
        5,     6,     7,     8,   124,    75,    76,    77,     9,     0,
-      78,    79,    80,     0,     0,    81,     0,    82,    83,   497,
+      78,    79,    80,     0,     0,    81,     0,    82,    83,     0,
       84,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
       10,    11,     0,     0,     0,     0,    12,     0,    13,    14,
       15,    16,    17,    18,     0,     0,    19,    20,    21,    22,
       23,    24,    25,    26,    27,    28,     0,     0,     0,    29,
       30,    31,    32,    33,     0,    34,     0,     0,     0,    35,
-      36,    37,    38,    39,   734,    40,     0,    41,     0,    42,
-       0,     0,    43,     0,     0,     0,    44,    45,    46,    47,
+      36,    37,    38,    39,     0,    40,     0,    41,     0,    42,
+     743,     0,    43,     0,     0,     0,    44,    45,    46,    47,
        0,    49,    50,     0,    51,     0,    53,    54,    55,    56,
        0,     0,     0,     0,    57,    58,    59,   374,    61,    62,
        0,     0,     0,     0,    63,    64,    65,    66,    67,    68,
@@ -1281,42 +1299,42 @@
       21,    22,    23,    24,    25,    26,    27,    28,     0,     0,
        0,    29,    30,    31,    32,    33,     0,    34,     0,     0,
        0,    35,    36,    37,    38,    39,     0,    40,     0,    41,
-       0,    42,   740,     0,    43,     0,     0,     0,    44,    45,
+       0,    42,     0,     0,    43,     0,     0,     0,    44,    45,
       46,    47,     0,    49,    50,     0,    51,     0,    53,    54,
       55,    56,     0,     0,     0,     0,    57,    58,    59,   374,
       61,    62,     0,     0,     0,     0,    63,    64,    65,    66,
       67,    68,    69,     0,     0,    70,    71,     0,    72,     0,
        0,     0,    73,     4,     5,     6,     7,     8,   124,    75,
       76,    77,     9,     0,    78,    79,    80,     0,     0,    81,
-       0,    82,    83,     0,    84,     0,     0,     0,     0,     0,
+       0,    82,    83,   798,    84,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,    10,    11,     0,     0,     0,     0,
       12,     0,    13,    14,    15,    16,    17,    18,     0,     0,
       19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
        0,     0,     0,    29,    30,    31,    32,    33,     0,    34,
        0,     0,     0,    35,    36,    37,    38,    39,     0,    40,
-       0,    41,     0,    42,     0,     0,    43,     0,     0,     0,
+       0,    41,   861,    42,     0,     0,    43,     0,     0,     0,
       44,    45,    46,    47,     0,    49,    50,     0,    51,     0,
       53,    54,    55,    56,     0,     0,     0,     0,    57,    58,
       59,   374,    61,    62,     0,     0,     0,     0,    63,    64,
       65,    66,    67,    68,    69,     0,     0,    70,    71,     0,
       72,     0,     0,     0,    73,     4,     5,     6,     7,     8,
      124,    75,    76,    77,     9,     0,    78,    79,    80,     0,
-       0,    81,     0,    82,    83,   795,    84,     0,     0,     0,
+       0,    81,     0,    82,    83,     0,    84,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,    10,    11,     0,     0,
        0,     0,    12,     0,    13,    14,    15,    16,    17,    18,
        0,     0,    19,    20,    21,    22,    23,    24,    25,    26,
       27,    28,     0,     0,     0,    29,    30,    31,    32,    33,
        0,    34,     0,     0,     0,    35,    36,    37,    38,    39,
-       0,    40,     0,    41,   858,    42,     0,     0,    43,     0,
+       0,    40,     0,    41,     0,    42,     0,     0,    43,     0,
        0,     0,    44,    45,    46,    47,     0,    49,    50,     0,
       51,     0,    53,    54,    55,    56,     0,     0,     0,     0,
       57,    58,    59,   374,    61,    62,     0,     0,     0,     0,
       63,    64,    65,    66,    67,    68,    69,     0,     0,    70,
       71,     0,    72,     0,     0,     0,    73,     4,     5,     6,
        7,     8,   124,    75,    76,    77,     9,     0,    78,    79,
-      80,     0,     0,    81,     0,    82,    83,     0,    84,     0,
+      80,     0,     0,    81,     0,    82,    83,   875,    84,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,    10,    11,
        0,     0,     0,     0,    12,     0,    13,    14,    15,    16,
@@ -1330,14 +1348,14 @@
        0,     0,    63,    64,    65,    66,    67,    68,    69,     0,
        0,    70,    71,     0,    72,     0,     0,     0,    73,     4,
        5,     6,     7,     8,   124,    75,    76,    77,     9,     0,
-      78,    79,    80,     0,     0,    81,     0,    82,    83,   872,
+      78,    79,    80,     0,     0,    81,     0,    82,    83,   878,
       84,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
       10,    11,     0,     0,     0,     0,    12,     0,    13,    14,
       15,    16,    17,    18,     0,     0,    19,    20,    21,    22,
       23,    24,    25,    26,    27,    28,     0,     0,     0,    29,
       30,    31,    32,    33,     0,    34,     0,     0,     0,    35,
-      36,    37,    38,    39,     0,    40,     0,    41,     0,    42,
+      36,    37,    38,    39,     0,    40,   882,    41,     0,    42,
        0,     0,    43,     0,     0,     0,    44,    45,    46,    47,
        0,    49,    50,     0,    51,     0,    53,    54,    55,    56,
        0,     0,     0,     0,    57,    58,    59,   374,    61,    62,
@@ -1345,13 +1363,13 @@
       69,     0,     0,    70,    71,     0,    72,     0,     0,     0,
       73,     4,     5,     6,     7,     8,   124,    75,    76,    77,
        9,     0,    78,    79,    80,     0,     0,    81,     0,    82,
-      83,   875,    84,     0,     0,     0,     0,     0,     0,     0,
+      83,     0,    84,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,    10,    11,     0,     0,     0,     0,    12,     0,
       13,    14,    15,    16,    17,    18,     0,     0,    19,    20,
       21,    22,    23,    24,    25,    26,    27,    28,     0,     0,
        0,    29,    30,    31,    32,    33,     0,    34,     0,     0,
-       0,    35,    36,    37,    38,    39,     0,    40,   879,    41,
+       0,    35,    36,    37,    38,    39,     0,    40,     0,    41,
        0,    42,     0,     0,    43,     0,     0,     0,    44,    45,
       46,    47,     0,    49,    50,     0,    51,     0,    53,    54,
       55,    56,     0,     0,     0,     0,    57,    58,    59,   374,
@@ -1359,7 +1377,7 @@
       67,    68,    69,     0,     0,    70,    71,     0,    72,     0,
        0,     0,    73,     4,     5,     6,     7,     8,   124,    75,
       76,    77,     9,     0,    78,    79,    80,     0,     0,    81,
-       0,    82,    83,     0,    84,     0,     0,     0,     0,     0,
+       0,    82,    83,   885,    84,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,    10,    11,     0,     0,     0,     0,
       12,     0,    13,    14,    15,    16,    17,    18,     0,     0,
@@ -1373,7 +1391,7 @@
       65,    66,    67,    68,    69,     0,     0,    70,    71,     0,
       72,     0,     0,     0,    73,     4,     5,     6,     7,     8,
      124,    75,    76,    77,     9,     0,    78,    79,    80,     0,
-       0,    81,     0,    82,    83,   882,    84,     0,     0,     0,
+       0,    81,     0,    82,    83,   896,    84,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,    10,    11,     0,     0,
        0,     0,    12,     0,    13,    14,    15,    16,    17,    18,
@@ -1387,7 +1405,7 @@
       63,    64,    65,    66,    67,    68,    69,     0,     0,    70,
       71,     0,    72,     0,     0,     0,    73,     4,     5,     6,
        7,     8,   124,    75,    76,    77,     9,     0,    78,    79,
-      80,     0,     0,    81,     0,    82,    83,   893,    84,     0,
+      80,     0,     0,    81,     0,    82,    83,   908,    84,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,    10,    11,
        0,     0,     0,     0,    12,     0,    13,    14,    15,    16,
@@ -1401,8 +1419,8 @@
        0,     0,    63,    64,    65,    66,    67,    68,    69,     0,
        0,    70,    71,     0,    72,     0,     0,     0,    73,     4,
        5,     6,     7,     8,   124,    75,    76,    77,     9,     0,
-      78,    79,    80,     0,     0,    81,     0,    82,    83,   905,
-      84,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      78,    79,    80,     0,     0,    81,     0,    82,    83,     0,
+      84,     0,   577,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
       10,    11,     0,     0,     0,     0,    12,     0,    13,    14,
       15,    16,    17,    18,     0,     0,    19,    20,    21,    22,
@@ -1410,13 +1428,13 @@
       30,    31,    32,    33,     0,    34,     0,     0,     0,    35,
       36,    37,    38,    39,     0,    40,     0,    41,     0,    42,
        0,     0,    43,     0,     0,     0,    44,    45,    46,    47,
-       0,    49,    50,     0,    51,     0,    53,    54,    55,    56,
-       0,     0,     0,     0,    57,    58,    59,   374,    61,    62,
+       0,    49,    50,     0,    51,     0,    53,    54,     0,     0,
+       0,     0,     0,     0,    57,    58,    59,     0,     0,     0,
        0,     0,     0,     0,    63,    64,    65,    66,    67,    68,
       69,     0,     0,    70,    71,     0,    72,     0,     0,     0,
       73,     4,     5,     6,     7,     8,   124,    75,    76,    77,
-       9,     0,    78,    79,    80,     0,     0,    81,     0,    82,
-      83,     0,    84,     0,   575,     0,     0,     0,     0,     0,
+       9,     0,     0,    79,    80,     0,     0,    81,     0,    82,
+      83,     0,    84,     0,   580,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,    10,    11,     0,     0,     0,     0,    12,     0,
       13,    14,    15,    16,    17,    18,     0,     0,    19,    20,
@@ -1430,7 +1448,7 @@
       67,    68,    69,     0,     0,    70,    71,     0,    72,     0,
        0,     0,    73,     4,     5,     6,     7,     8,   124,    75,
       76,    77,     9,     0,     0,    79,    80,     0,     0,    81,
-       0,    82,    83,     0,    84,     0,   578,     0,     0,     0,
+       0,    82,    83,     0,    84,     0,   591,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,    10,    11,     0,     0,     0,     0,
       12,     0,    13,    14,    15,    16,    17,    18,     0,     0,
@@ -1444,7 +1462,7 @@
       65,    66,    67,    68,    69,     0,     0,    70,    71,     0,
       72,     0,     0,     0,    73,     4,     5,     6,     7,     8,
      124,    75,    76,    77,     9,     0,     0,    79,    80,     0,
-       0,    81,     0,    82,    83,     0,    84,     0,   589,     0,
+       0,    81,     0,    82,    83,     0,    84,     0,   784,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,    10,    11,     0,     0,
        0,     0,    12,     0,    13,    14,    15,    16,    17,    18,
@@ -1459,7 +1477,7 @@
       71,     0,    72,     0,     0,     0,    73,     4,     5,     6,
        7,     8,   124,    75,    76,    77,     9,     0,     0,    79,
       80,     0,     0,    81,     0,    82,    83,     0,    84,     0,
-     781,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     824,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,    10,    11,
        0,     0,     0,     0,    12,     0,    13,    14,    15,    16,
       17,    18,     0,     0,    19,    20,    21,    22,    23,    24,
@@ -1473,7 +1491,7 @@
        0,    70,    71,     0,    72,     0,     0,     0,    73,     4,
        5,     6,     7,     8,   124,    75,    76,    77,     9,     0,
        0,    79,    80,     0,     0,    81,     0,    82,    83,     0,
-      84,     0,   821,     0,     0,     0,     0,     0,     0,     0,
+      84,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
       10,    11,     0,     0,     0,     0,    12,     0,    13,    14,
       15,    16,    17,    18,     0,     0,    19,    20,    21,    22,
@@ -1488,34 +1506,73 @@
       73,     4,     5,     6,     7,     8,   124,    75,    76,    77,
        9,     0,     0,    79,    80,     0,     0,    81,     0,    82,
       83,     0,    84,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     382,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,    10,    11,     0,     0,     0,     0,    12,     0,
       13,    14,    15,    16,    17,    18,     0,     0,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,     0,     0,
-       0,    29,    30,    31,    32,    33,     0,    34,     0,     0,
-       0,    35,    36,    37,    38,    39,     0,    40,     0,    41,
-       0,    42,     0,     0,    43,     0,     0,     0,    44,    45,
-      46,    47,     0,    49,    50,     0,    51,     0,    53,    54,
-       0,     0,     0,     0,     0,     0,    57,    58,    59,     0,
+      21,    22,    23,    24,    25,    26,    27,     0,     0,     0,
+       0,    29,    30,   122,    32,    33,     0,     0,     0,     0,
+       0,    35,    36,   248,   249,   250,   251,   252,   253,   254,
+     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,    47,   266,     0,     0,     0,     0,     0,     0,   123,
+       0,     0,     0,     0,     0,     0,     0,    58,    59,     0,
        0,     0,     0,     0,     0,     0,    63,    64,    65,    66,
-      67,    68,    69,     0,     0,    70,    71,     0,    72,     0,
-       0,     0,    73,     4,     5,     6,     7,     8,   124,    75,
-      76,    77,     9,     0,     0,    79,    80,     0,     0,    81,
-       0,    82,    83,     0,    84,     0,     0,     0,     0,     0,
-       0,     0,   156,     0,     0,     0,     0,     0,     0,     0,
+      67,    68,    69,     0,     4,     5,     6,     7,     8,     0,
+       0,     0,    73,     9,     0,     0,     0,     0,   124,    75,
+      76,    77,     0,     0,     0,    79,   125,     0,   383,    81,
+       0,     0,     0,   156,    84,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    10,    11,     0,     0,     0,
+       0,    12,     0,    13,    14,    15,    16,    17,    18,     0,
+       0,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+       0,     0,     0,     0,    29,    30,   122,    32,    33,     0,
+       0,     0,     0,     0,    35,    36,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    47,     0,     0,     0,     0,     0,
+       0,     0,   123,     0,     0,     0,     0,     0,     0,     0,
+      58,    59,     0,     0,     0,     0,     0,     0,     0,    63,
+      64,    65,    66,    67,    68,    69,     0,     4,     5,     6,
+       7,     8,     0,     0,     0,    73,     9,     0,     0,     0,
+       0,   124,    75,    76,    77,     0,     0,     0,    79,   125,
+       0,     0,    81,     0,     0,     0,     0,    84,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    10,    11,
+       0,     0,     0,     0,    12,     0,    13,    14,    15,    16,
+      17,    18,     0,     0,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,     0,     0,     0,     0,    29,    30,   122,
+      32,    33,     0,     0,     0,     0,     0,    35,    36,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    47,     0,     0,
+       0,     0,     0,     0,     0,   123,     0,     0,     0,     0,
+       0,     0,     0,    58,    59,     0,     0,     0,     0,     0,
+       0,     0,    63,    64,    65,    66,    67,    68,    69,     0,
+       4,     5,     6,     7,     8,     0,     0,     0,    73,     9,
+       0,     0,     0,     0,   124,    75,    76,    77,     0,     0,
+       0,    79,   125,     0,     0,    81,     0,   185,     0,     0,
+      84,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    10,    11,     0,     0,     0,     0,    12,     0,    13,
+      14,    15,    16,    17,    18,     0,     0,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,     0,     0,     0,     0,
+      29,    30,   122,    32,    33,     0,     0,     0,     0,     0,
+      35,    36,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      47,     0,     0,     0,     0,     0,     0,     0,   123,     0,
+       0,     0,     0,     0,     0,     0,    58,    59,     0,     0,
+       0,     0,     0,     0,     0,    63,    64,    65,    66,    67,
+      68,    69,     0,     4,     5,     6,     7,     8,     0,     0,
+       0,    73,     9,     0,     0,     0,     0,   124,    75,    76,
+      77,     0,     0,     0,    79,   125,     0,     0,    81,     0,
+     187,     0,     0,    84,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,    10,    11,     0,     0,     0,     0,
       12,     0,    13,    14,    15,    16,    17,    18,     0,     0,
       19,    20,    21,    22,    23,    24,    25,    26,    27,     0,
        0,     0,     0,    29,    30,   122,    32,    33,     0,     0,
-       0,     0,     0,    35,    36,   248,   249,   250,   251,   252,
-     253,   254,   255,   256,   257,   258,   259,   260,   261,   262,
-     263,   264,   265,    47,   266,     0,     0,     0,     0,     0,
+       0,     0,     0,    35,    36,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    47,     0,     0,     0,     0,     0,     0,
        0,   123,     0,     0,     0,     0,     0,     0,     0,    58,
       59,     0,     0,     0,     0,     0,     0,     0,    63,    64,
       65,    66,    67,    68,    69,     0,     4,     5,     6,     7,
        8,     0,     0,     0,    73,     9,     0,     0,     0,     0,
      124,    75,    76,    77,     0,     0,     0,    79,   125,     0,
-       0,    81,     0,     0,     0,     0,    84,     0,     0,     0,
+       0,    81,     0,   191,     0,     0,    84,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,    10,    11,     0,
        0,     0,     0,    12,     0,    13,    14,    15,    16,    17,
       18,     0,     0,    19,    20,    21,    22,    23,    24,    25,
@@ -1528,7 +1585,7 @@
        0,    63,    64,    65,    66,    67,    68,    69,     0,     4,
        5,     6,     7,     8,     0,     0,     0,    73,     9,     0,
        0,     0,     0,   124,    75,    76,    77,     0,     0,     0,
-      79,   125,     0,     0,    81,     0,   185,     0,     0,    84,
+      79,   125,   403,     0,    81,   314,     0,     0,     0,    84,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
       10,    11,     0,     0,     0,     0,    12,     0,    13,    14,
       15,    16,    17,    18,     0,     0,    19,    20,    21,    22,
@@ -1541,8 +1598,8 @@
        0,     0,     0,     0,    63,    64,    65,    66,    67,    68,
       69,     0,     4,     5,     6,     7,     8,     0,     0,     0,
       73,     9,     0,     0,     0,     0,   124,    75,    76,    77,
-       0,     0,     0,    79,   125,     0,     0,    81,     0,   187,
-       0,     0,    84,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    79,   125,     0,     0,    81,     0,     0,
+       0,   429,    84,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,    10,    11,     0,     0,     0,     0,    12,
        0,    13,    14,    15,    16,    17,    18,     0,     0,    19,
       20,    21,    22,    23,    24,    25,    26,    27,     0,     0,
@@ -1555,7 +1612,7 @@
       66,    67,    68,    69,     0,     4,     5,     6,     7,     8,
        0,     0,     0,    73,     9,     0,     0,     0,     0,   124,
       75,    76,    77,     0,     0,     0,    79,   125,     0,     0,
-      81,     0,   191,     0,     0,    84,     0,     0,     0,     0,
+      81,     0,     0,     0,   461,    84,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,    10,    11,     0,     0,
        0,     0,    12,     0,    13,    14,    15,    16,    17,    18,
        0,     0,    19,    20,    21,    22,    23,    24,    25,    26,
@@ -1568,7 +1625,7 @@
       63,    64,    65,    66,    67,    68,    69,     0,     4,     5,
        6,     7,     8,     0,     0,     0,    73,     9,     0,     0,
        0,     0,   124,    75,    76,    77,     0,     0,     0,    79,
-     125,   403,     0,    81,   314,     0,     0,     0,    84,     0,
+     125,     0,     0,    81,     0,     0,     0,   463,    84,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,    10,
       11,     0,     0,     0,     0,    12,     0,    13,    14,    15,
       16,    17,    18,     0,     0,    19,    20,    21,    22,    23,
@@ -1582,7 +1639,7 @@
        0,     4,     5,     6,     7,     8,     0,     0,     0,    73,
        9,     0,     0,     0,     0,   124,    75,    76,    77,     0,
        0,     0,    79,   125,     0,     0,    81,     0,     0,     0,
-     429,    84,     0,     0,     0,     0,     0,     0,     0,     0,
+     654,    84,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,    10,    11,     0,     0,     0,     0,    12,     0,
       13,    14,    15,    16,    17,    18,     0,     0,    19,    20,
       21,    22,    23,    24,    25,    26,    27,     0,     0,     0,
@@ -1595,7 +1652,7 @@
       67,    68,    69,     0,     4,     5,     6,     7,     8,     0,
        0,     0,    73,     9,     0,     0,     0,     0,   124,    75,
       76,    77,     0,     0,     0,    79,   125,     0,     0,    81,
-       0,     0,     0,   461,    84,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    84,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,    10,    11,     0,     0,     0,
        0,    12,     0,    13,    14,    15,    16,    17,    18,     0,
        0,    19,    20,    21,    22,    23,    24,    25,    26,    27,
@@ -1608,7 +1665,7 @@
       64,    65,    66,    67,    68,    69,     0,     4,     5,     6,
        7,     8,     0,     0,     0,    73,     9,     0,     0,     0,
        0,   124,    75,    76,    77,     0,     0,     0,    79,   125,
-       0,     0,    81,     0,     0,     0,   463,    84,     0,     0,
+       0,     0,    81,     0,     0,     0,     0,    84,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,    10,    11,
        0,     0,     0,     0,    12,     0,    13,    14,    15,    16,
       17,    18,     0,     0,    19,    20,    21,    22,    23,    24,
@@ -1619,354 +1676,330 @@
        0,     0,     0,     0,     0,   123,     0,     0,     0,     0,
        0,     0,     0,    58,    59,     0,     0,     0,     0,     0,
        0,     0,    63,    64,    65,    66,    67,    68,    69,     0,
-       4,     5,     6,     7,     8,     0,     0,     0,    73,     9,
-       0,     0,     0,     0,   124,    75,    76,    77,     0,     0,
-       0,    79,   125,     0,     0,    81,     0,     0,     0,   651,
-      84,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    10,    11,     0,     0,     0,     0,    12,     0,    13,
-      14,    15,    16,    17,    18,     0,     0,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,     0,     0,     0,     0,
-      29,    30,   122,    32,    33,     0,     0,     0,     0,     0,
-      35,    36,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      47,     0,     0,     0,     0,     0,     0,     0,   123,     0,
-       0,     0,     0,     0,     0,     0,    58,    59,     0,     0,
-       0,     0,     0,     0,     0,    63,    64,    65,    66,    67,
-      68,    69,     0,     4,     5,     6,     7,     8,     0,     0,
-       0,    73,     9,     0,     0,     0,     0,   124,    75,    76,
-      77,     0,     0,     0,    79,   125,     0,     0,    81,     0,
-       0,     0,     0,    84,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    10,    11,     0,     0,     0,     0,
-      12,     0,    13,    14,    15,    16,    17,    18,     0,     0,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,     0,
-       0,     0,     0,    29,    30,   122,    32,    33,     0,     0,
-       0,     0,     0,    35,    36,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    73,     0,
+       0,     0,     0,     0,   124,    75,    76,    77,   239,   240,
+     241,    79,    80,     0,     0,    81,     0,     0,     0,     0,
+      84,     0,     0,     0,   242,     0,   243,   244,   245,   246,
+     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
+     257,   258,   259,   260,   261,   262,   263,   264,   265,     0,
+     266,   239,   240,   241,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   242,     0,   243,
+     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
+     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
+     264,   265,     0,   266,   239,   240,   241,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    47,     0,     0,     0,     0,     0,     0,
-       0,   123,     0,     0,     0,     0,     0,     0,     0,    58,
-      59,     0,     0,     0,     0,     0,     0,     0,    63,    64,
-      65,    66,    67,    68,    69,     0,     4,     5,     6,     7,
-       8,     0,     0,     0,    73,     9,     0,     0,     0,     0,
-     124,    75,    76,    77,     0,     0,     0,    79,   125,     0,
-       0,    81,     0,     0,     0,     0,    84,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    10,    11,     0,
-       0,     0,     0,    12,     0,    13,    14,    15,    16,    17,
-      18,     0,     0,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,     0,     0,     0,     0,    29,    30,   122,    32,
-      33,     0,     0,     0,     0,     0,    35,    36,     0,     0,
+     242,     0,   243,   244,   245,   246,   247,   248,   249,   250,
+     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
+     261,   262,   263,   264,   265,     0,   266,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   239,   240,   241,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    47,     0,     0,     0,
-       0,     0,     0,     0,   123,     0,     0,     0,     0,     0,
-       0,     0,    58,    59,     0,     0,     0,     0,     0,     0,
-       0,    63,    64,    65,    66,    67,    68,    69,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    73,     0,     0,
-       0,     0,     0,   124,    75,    76,    77,   239,   240,   241,
-      79,    80,     0,     0,    81,     0,     0,     0,     0,    84,
-       0,     0,     0,   242,     0,   243,   244,   245,   246,   247,
+       0,     0,     0,   242,   523,   243,   244,   245,   246,   247,
      248,   249,   250,   251,   252,   253,   254,   255,   256,   257,
      258,   259,   260,   261,   262,   263,   264,   265,     0,   266,
      239,   240,   241,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   242,     0,   243,   244,
+       0,     0,     0,     0,     0,     0,   242,   568,   243,   244,
      245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
      255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,     0,   266,   239,   240,   241,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   242,
-       0,   243,   244,   245,   246,   247,   248,   249,   250,   251,
-     252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
-     262,   263,   264,   265,     0,   266,     0,     0,     0,     0,
+     265,     0,   266,     0,     0,   239,   240,   241,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     612,   242,   792,   243,   244,   245,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
+     260,   261,   262,   263,   264,   265,     0,   266,     0,     0,
        0,     0,     0,     0,     0,     0,   239,   240,   241,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   242,   523,   243,   244,   245,   246,   247,   248,
+       0,     0,   242,   647,   243,   244,   245,   246,   247,   248,
      249,   250,   251,   252,   253,   254,   255,   256,   257,   258,
      259,   260,   261,   262,   263,   264,   265,     0,   266,   239,
      240,   241,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   242,   566,   243,   244,   245,
+       0,     0,     0,     0,     0,   242,   729,   243,   244,   245,
      246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
      256,   257,   258,   259,   260,   261,   262,   263,   264,   265,
-       0,   266,     0,     0,   239,   240,   241,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   610,
-     242,   789,   243,   244,   245,   246,   247,   248,   249,   250,
-     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
-     261,   262,   263,   264,   265,     0,   266,     0,     0,     0,
-       0,     0,     0,     0,     0,   239,   240,   241,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   242,   644,   243,   244,   245,   246,   247,   248,   249,
-     250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
-     260,   261,   262,   263,   264,   265,     0,   266,   239,   240,
-     241,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   242,   726,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,     0,
-     266,   239,   240,   241,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   242,   790,   243,
-     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
-     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
-     264,   265,     0,   266,     0,     0,     0,     0,     0,     0,
-       0,     0,   239,   240,   241,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   242,   267,
+       0,   266,   239,   240,   241,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   242,   793,
      243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
      253,   254,   255,   256,   257,   258,   259,   260,   261,   262,
-     263,   264,   265,     0,   266,   239,   240,   241,     0,     0,
+     263,   264,   265,     0,   266,     0,     0,     0,     0,     0,
+       0,     0,     0,   239,   240,   241,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   242,
+     332,   243,   244,   245,   246,   247,   248,   249,   250,   251,
+     252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
+     262,   263,   264,   265,     0,   266,   239,   240,   241,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   242,   332,   243,   244,   245,   246,   247,   248,   249,
-     250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
-     260,   261,   262,   263,   264,   265,     0,   266,   239,   240,
-     241,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   242,   333,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,     0,
-     266,     0,     0,     0,     0,     0,     0,     0,     0,   239,
+       0,     0,   242,   333,   243,   244,   245,   246,   247,   248,
+     249,   250,   251,   252,   253,   254,   255,   256,   257,   258,
+     259,   260,   261,   262,   263,   264,   265,     0,   266,   239,
      240,   241,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,   242,   339,   243,   244,   245,
      246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
      256,   257,   258,   259,   260,   261,   262,   263,   264,   265,
-       0,   266,     0,   239,   240,   241,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   372,   242,
-       0,   243,   244,   245,   246,   247,   248,   249,   250,   251,
-     252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
-     262,   263,   264,   265,     0,   266,   239,   240,   241,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   457,   242,     0,   243,   244,   245,   246,   247,   248,
-     249,   250,   251,   252,   253,   254,   255,   256,   257,   258,
-     259,   260,   261,   262,   263,   264,   265,     0,   266,     0,
-       0,     0,     0,     0,     0,   239,   240,   241,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   242,   470,   243,   244,   245,   246,   247,   248,   249,
-     250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
-     260,   261,   262,   263,   264,   265,     0,   266,     0,   239,
+       0,   266,     0,     0,     0,     0,     0,     0,     0,   239,
      240,   241,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   242,   471,   243,   244,   245,
+       0,     0,     0,     0,     0,   242,   372,   243,   244,   245,
      246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
      256,   257,   258,   259,   260,   261,   262,   263,   264,   265,
        0,   266,   239,   240,   241,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   242,   476,
+       0,     0,     0,     0,     0,     0,     0,     0,   242,   457,
      243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
      253,   254,   255,   256,   257,   258,   259,   260,   261,   262,
-     263,   264,   265,     0,   266,     0,     0,     0,     0,     0,
-       0,   239,   240,   241,     0,     0,     0,     0,     0,     0,
+     263,   264,   265,     0,   266,   239,   240,   241,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   242,   470,   243,   244,   245,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
+     260,   261,   262,   263,   264,   265,     0,   266,     0,     0,
+       0,     0,     0,     0,     0,   239,   240,   241,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   242,   471,   243,   244,   245,   246,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
+     260,   261,   262,   263,   264,   265,     0,   266,   239,   240,
+     241,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   242,   476,   243,   244,   245,   246,
+     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
+     257,   258,   259,   260,   261,   262,   263,   264,   265,     0,
+     266,   239,   240,   241,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,   242,   484,   243,
      244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
      254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
-     264,   265,     0,   266,     0,   239,   240,   241,     0,     0,
+     264,   265,     0,   266,     0,     0,     0,     0,     0,     0,
+       0,   239,   240,   241,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   242,   660,   243,
+     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
+     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
+     264,   265,     0,   266,   239,   240,   241,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     242,   859,   243,   244,   245,   246,   247,   248,   249,   250,
+     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
+     261,   262,   263,   264,   265,     0,   266,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   242,   657,   243,   244,   245,   246,   247,   248,   249,
+       0,     0,     0,     0,   880,   239,   240,   241,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   302,
+       0,   242,     0,   243,   244,   245,   246,   247,   248,   249,
      250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
      260,   261,   262,   263,   264,   265,     0,   266,   239,   240,
      241,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   242,   856,   243,   244,   245,   246,
+       0,     0,   370,     0,   242,   553,   243,   244,   245,   246,
      247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
      257,   258,   259,   260,   261,   262,   263,   264,   265,     0,
      266,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,   239,   240,   241,     0,
-       0,     0,     0,     0,   877,     0,     0,     0,     0,     0,
-       0,     0,   242,   302,   243,   244,   245,   246,   247,   248,
-     249,   250,   251,   252,   253,   254,   255,   256,   257,   258,
-     259,   260,   261,   262,   263,   264,   265,     0,   266,     0,
-       0,   239,   240,   241,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   370,   242,   551,   243,
-     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
-     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
-     264,   265,     0,   266,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   239,   240,   241,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   242,   572,   243,   244,   245,   246,   247,
-     248,   249,   250,   251,   252,   253,   254,   255,   256,   257,
-     258,   259,   260,   261,   262,   263,   264,   265,     0,   266,
-     240,   241,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   242,     0,   243,   244,   245,
-     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
-     256,   257,   258,   259,   260,   261,   262,   263,   264,   265,
-     241,   266,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   242,   574,   243,   244,   245,   246,   247,   248,
+     249,   250,   251,   252,   253,   254,   255,   256,   257,   258,
+     259,   260,   261,   262,   263,   264,   265,     0,   266,   240,
+     241,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,   242,     0,   243,   244,   245,   246,
      247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,   242,
-     266,   243,   244,   245,   246,   247,   248,   249,   250,   251,
-     252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
-     262,   263,   264,   265,     0,   266,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,     0,
-     266,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     257,   258,   259,   260,   261,   262,   263,   264,   265,   241,
+     266,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   242,     0,   243,   244,   245,   246,   247,
+     248,   249,   250,   251,   252,   253,   254,   255,   256,   257,
+     258,   259,   260,   261,   262,   263,   264,   265,   242,   266,
+     243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
+     253,   254,   255,   256,   257,   258,   259,   260,   261,   262,
+     263,   264,   265,     0,   266,   243,   244,   245,   246,   247,
+     248,   249,   250,   251,   252,   253,   254,   255,   256,   257,
+     258,   259,   260,   261,   262,   263,   264,   265,     0,   266,
+     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
      255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,     0,   266,   247,   248,   249,   250,   251,   252,   253,
-     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
-     264,   265,     0,   266
+     265,     0,   266,   246,   247,   248,   249,   250,   251,   252,
+     253,   254,   255,   256,   257,   258,   259,   260,   261,   262,
+     263,   264,   265,     0,   266,   247,   248,   249,   250,   251,
+     252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
+     262,   263,   264,   265,     0,   266
 };
 
 static const yytype_int16 yycheck[] =
 {
-       2,   126,    25,   505,   238,    25,   312,    49,   266,    14,
-      15,   335,    25,   382,     2,   217,   477,   705,     2,     2,
-      25,   710,     8,   176,    77,   349,     8,     8,    26,     8,
-       8,     8,     8,     8,     8,   195,   538,     8,    80,     8,
-      32,     8,     8,    65,    75,     8,   634,    52,    65,   283,
-      95,   285,    54,   107,    38,   161,    65,   161,    95,    66,
-     147,    65,    26,   752,   298,   299,   153,    75,    75,    74,
-      77,    77,    77,    32,   308,    75,     0,   311,   312,   153,
-     161,    75,   207,    77,   237,    77,   282,   147,    26,   163,
-     164,    32,   461,   153,   463,   115,    32,   103,    53,    54,
-     147,   161,    70,    71,   111,   159,   153,   160,   153,    14,
-      15,    98,    99,   309,   161,    75,   153,    75,    77,    77,
-      65,   123,   161,   711,    75,   147,    77,    65,    77,   161,
-     161,   284,    75,   286,    77,   140,    77,   290,   291,   292,
-     182,    77,   164,   150,    49,   153,   153,   164,    75,   169,
-      77,   156,   161,   153,   161,   164,   161,   481,    65,   166,
-     164,   485,   486,   487,   164,   163,   368,   389,   160,   391,
-      14,    15,   166,   369,    75,    80,   162,   865,   165,   767,
-     162,    25,   163,   164,   163,   163,   163,   163,   163,   163,
-     150,   162,   197,   153,   163,   162,   162,   202,   659,   162,
-     164,   160,   147,    75,   528,   210,   211,   212,   166,   214,
-     899,   216,   164,   164,    77,   166,   161,   166,   238,   164,
-      81,    77,   161,   166,   226,   238,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,   147,   166,
-     161,   593,   161,   266,   153,   122,   266,    75,    75,    77,
-      77,   156,   161,   266,    75,   335,   153,    98,    99,   161,
-     153,   266,   122,   283,   161,   285,    53,    54,   161,   349,
-     283,   161,   285,   153,    32,   161,   600,   182,   298,   299,
-     141,   161,   651,   111,   111,   298,   299,   611,   308,    75,
-     295,   311,   312,   161,   552,   308,   147,   202,   311,   312,
-     128,   306,   153,   166,   161,   210,   211,   212,   161,   214,
-     166,   533,   156,    75,   666,    77,   668,    75,   164,    77,
-     516,   147,   150,   150,   165,   153,   153,   153,   370,   150,
-     335,    75,   153,   161,   161,    75,   338,   342,   166,   166,
-     664,    47,    48,    49,   349,    51,   670,   653,   672,   111,
-     163,   547,   548,   111,    97,    98,    99,    32,   202,   555,
-     556,   162,   163,   559,   366,    65,   210,   211,   212,   147,
-     214,    75,    75,   162,   163,   162,   163,   382,   366,   399,
-      70,    71,   366,   366,   389,   161,   391,   889,   150,   394,
-     714,   153,   150,   163,   164,   153,    97,    98,    99,   161,
-     147,   481,   164,   161,   166,   485,   486,   629,   166,    65,
-     563,    14,    15,   126,    65,   575,    65,   723,   578,   653,
-      65,    65,   266,   103,   429,   129,   129,   153,    51,   589,
-     153,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,   167,    66,   769,   150,   150,   528,   153,
-     153,   155,   155,   147,   147,   677,   461,     8,   463,   162,
-     126,   153,    75,   147,    77,   370,   153,    87,   147,   793,
-     692,    53,    54,   797,   479,   480,   481,   382,   802,   161,
-     485,   486,   487,    75,    13,   163,   491,   471,    13,   723,
-     814,   335,   476,   646,   647,   163,    75,   162,   111,   483,
-     505,   506,   103,   508,   162,   349,    75,   512,   513,   162,
-     111,   112,   113,   114,   115,   116,   518,   124,   678,   124,
-     161,   845,   161,   528,   429,   530,   163,   851,   533,   552,
-     518,   611,   552,   538,   518,   518,   167,   150,   382,   552,
-     153,   167,     8,    95,    13,   869,    77,   552,   161,    75,
-     161,   163,   162,   166,   104,   161,   461,   161,   463,   109,
-     162,   111,   112,   113,   114,   115,   116,   117,   162,     8,
-      13,   125,    14,    15,   479,   480,   798,   164,   800,   584,
-     162,   163,   167,    25,   664,   429,   161,   161,   161,   161,
-     670,   162,   672,   161,   161,   600,   601,   167,   162,    75,
-     161,   506,   167,   508,   167,   167,   611,   512,   513,   167,
-     153,   147,    75,   835,    13,   165,   163,   461,    13,   463,
-     625,   781,   162,   162,   629,   153,   164,     8,   633,   162,
-       8,   791,    65,   653,   714,   479,   480,   481,    65,   126,
-     653,   485,   486,   487,   866,   163,   651,   127,   808,    13,
-     163,   163,   812,   655,   127,   660,   658,   167,   818,   664,
-       8,   821,   506,   665,   508,   670,   826,   672,   512,   513,
-     830,    75,   677,   895,   164,   161,    77,   162,   162,   584,
-     805,   163,    13,   104,   528,   162,   109,   692,   109,   769,
-     111,   112,   113,   114,   115,   116,   117,   162,   162,   167,
-     860,   162,   704,   723,   162,   162,   126,   163,   552,   714,
-     723,   162,   162,   793,   156,   162,    75,   797,    26,    77,
-     161,    13,   802,    44,    45,    46,    47,    48,    49,   167,
-      51,   891,   167,   161,   814,   127,    77,   163,   162,    13,
-     584,   163,   902,    13,   165,   163,   651,   731,    75,   751,
-     164,   164,    13,   737,   738,   660,   600,    26,   763,   161,
-     202,    72,    77,   163,   769,   845,   162,   611,   210,   211,
-     212,   851,   214,   164,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    13,    77,   793,   869,
-      13,   163,   797,   798,   164,   800,   780,   802,   111,   112,
-     113,   114,   115,   116,    95,   165,   163,   651,    95,   814,
-     154,   163,   147,    13,    53,    54,   660,    75,   163,    75,
-     664,   161,   824,    77,   266,   827,   670,    26,   672,   163,
-     835,    75,    75,     8,   162,   342,   506,   606,   606,   585,
-     845,   660,   533,   738,   846,   633,   851,   763,   850,   347,
-     527,   788,   854,   628,   683,   857,    81,   859,   641,   861,
-     599,   866,   835,   600,   869,   202,   512,   773,   215,    -1,
-     714,   513,   856,    -1,    -1,    -1,    -1,    -1,    -1,   881,
-      -1,    -1,    -1,    -1,   889,    -1,    -1,    -1,    -1,    -1,
-     895,    -1,    -1,    -1,    -1,   897,    -1,    -1,    -1,    -1,
-      -1,    -1,   904,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,     4,     5,    -1,     7,     8,     9,
-      10,    11,    12,    13,   163,   769,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    -1,    26,    -1,    -1,    -1,
-     382,    -1,    44,    45,    -1,    -1,    -1,    37,    -1,   793,
-      -1,    -1,    -1,   797,    44,    45,    -1,    -1,   802,    49,
-      -1,    51,    -1,    65,    -1,    -1,    -1,    -1,    -1,    -1,
-     814,    73,    74,    75,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    83,    -1,    -1,    -1,    -1,    -1,   429,    -1,    -1,
-      80,    81,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   845,    -1,    -1,    -1,    -1,    -1,   851,    -1,   111,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   461,
-      -1,   463,    -1,    -1,    -1,   869,    -1,   129,   130,   131,
-     132,   133,   134,    -1,    -1,    -1,    -1,   479,   480,   129,
-      -1,    -1,   144,    -1,    -1,    -1,    -1,    -1,   150,   151,
-     152,   153,    -1,    -1,    -1,   157,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   506,    -1,   508,    -1,    -1,    -1,
-     512,   513,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   171,    -1,   173,    -1,   175,   176,    -1,    -1,    -1,
-     180,   181,   182,    -1,   184,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    -1,    -1,    -1,
-     552,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    -1,    51,   215,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    53,    54,   227,    -1,   229,
-      -1,    -1,   584,    -1,    -1,    -1,    -1,   237,    -1,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   248,   249,
-     250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
-     260,   261,   262,   263,   264,   265,    -1,    95,    -1,    -1,
-     270,   271,   272,   273,   274,   275,   276,   277,   278,   279,
-     280,   281,   282,    -1,   284,    -1,   286,   287,    -1,    -1,
-     290,   291,   292,    -1,    -1,    -1,    -1,    -1,    -1,   651,
-      -1,    -1,   302,    -1,   304,    -1,    -1,    -1,   660,   309,
+       2,   126,    25,     2,     2,     2,    25,   312,   505,    14,
+      15,    49,    25,   713,   266,   477,   195,   238,   176,   708,
+      25,     8,   382,     8,   217,     8,     8,     8,     8,   282,
+       8,     8,    75,     8,     8,     8,     8,     8,    65,    75,
+      38,   538,    80,   595,     8,   107,    75,    52,    65,   389,
+      95,   391,    54,    77,    66,   755,   309,    26,    65,    77,
+     153,     0,   283,    75,   285,    77,   637,    32,   161,    74,
+     153,    26,    77,    32,    26,   153,    77,   298,   299,   237,
+     163,   164,   207,   161,   161,    81,    32,   308,    98,    99,
+     311,   312,    25,   161,    98,    99,   115,   159,   147,   111,
+     147,   461,   103,   463,   153,   147,   153,   150,   153,    25,
+     153,   153,    77,    65,   161,    32,   369,   669,    77,   671,
+     147,   123,   161,    77,   153,   161,   284,    65,   286,    14,
+      15,    77,   290,   291,   292,   140,   160,   164,   150,    65,
+      25,   153,    75,   714,   182,   141,    65,   164,   166,   161,
+     169,   156,    77,   161,   166,   165,   161,   164,    75,    75,
+      77,   165,    75,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,   368,   163,   164,   163,   868,
+     163,   163,   163,   163,    75,   163,   163,   162,   162,   162,
+     162,   162,   197,   533,   111,   164,   129,   202,   162,   770,
+     662,   160,   902,    53,    54,   210,   211,   212,   163,   214,
+      32,   216,   166,   129,   160,    95,    75,   150,    77,   238,
+     153,   147,   155,   161,   226,   238,   164,   161,    75,   162,
+      77,    14,    15,   150,   150,   161,   153,   153,   164,   155,
+     153,   166,    25,   266,   161,    75,    75,   266,   122,   166,
+     161,   164,    75,   266,    77,    77,    75,    75,    77,    77,
+     153,   266,   161,   516,   283,   161,   285,    75,   161,    77,
+     283,   156,   285,   153,    75,   147,    77,    53,    54,   298,
+     299,   153,    97,    98,    99,   298,   299,   162,   163,   308,
+     295,   631,   311,   312,   654,   308,   549,   550,   311,   312,
+     164,   306,   554,   111,   557,   558,   122,   166,   561,   147,
+     111,   164,   162,   163,    75,   153,   161,   202,    75,   166,
+      77,   150,    75,   161,   153,   210,   211,   212,   161,   214,
+     335,    75,   370,    97,    98,    99,   338,   342,    75,    75,
+     680,    77,   150,   166,   349,   153,   164,   166,   166,   150,
+     161,   656,   153,   161,   111,   695,   164,   161,   166,   161,
+     161,    32,   162,   163,   366,   166,   161,   366,   366,   366,
+     163,   128,    65,   156,   147,   111,   129,   382,    70,    71,
+     399,   266,    70,    71,   389,   147,   391,    14,    15,   394,
+     161,   153,   147,   150,   126,   892,   153,   150,   577,   161,
+     153,   580,   155,    65,   161,   163,   164,   565,    65,   166,
+      65,    65,   591,    65,   150,   153,   103,   153,    51,   202,
+     153,   726,    66,   147,   429,   161,   147,   210,   211,   212,
+     166,   214,   104,   167,     8,   656,   153,   109,   103,   111,
+     112,   113,   114,   115,   116,   117,   111,   112,   113,   114,
+     115,   116,   153,   147,   161,    87,   461,   104,   463,   126,
+      75,   801,   109,   803,   111,   112,   113,   114,   115,   116,
+     117,   147,   163,   471,   479,   480,   481,    13,   476,   163,
+     485,   486,   487,   266,    13,   483,   491,   162,   162,   162,
+      75,   649,   650,   165,    75,   124,   124,   382,   838,   167,
+     505,   506,   681,   508,   167,   726,     8,   512,   513,    95,
+      44,    45,    46,    47,    48,    49,   518,    51,   165,   518,
+     518,   518,   161,   528,   161,   530,    13,   163,   533,   869,
+      75,   554,   162,   538,   539,   554,    47,    48,    49,    77,
+      51,   554,   161,   163,   429,   161,     8,    13,   162,   554,
+     161,   164,   335,   162,   125,   161,   161,   167,   898,   111,
+     112,   113,   114,   115,   116,   161,   349,   162,   161,   161,
+     167,   161,    75,   167,   153,   147,   461,    75,   463,   167,
+     167,   586,   162,   167,   161,    13,    13,   163,   153,   162,
+       8,     8,   162,   162,   479,   480,   164,   602,   603,   382,
+      65,    65,   126,   163,   127,   784,    13,   163,   613,   163,
+     127,     8,   167,   161,    75,   794,   162,   164,   162,   109,
+     163,   506,   627,   508,    77,   162,   631,   512,   513,    13,
+     162,   636,   811,   126,   162,   162,   815,   656,   163,    75,
+     162,   162,   821,   656,   162,   824,   429,   167,   162,   654,
+     829,    77,   162,    26,   833,   161,   658,    13,   663,   661,
+     167,   161,   667,   167,   163,   162,   668,   163,   673,   554,
+     675,   163,   127,    77,    13,   680,    13,    75,   461,   164,
+     463,   164,    13,   808,   863,   161,    26,    72,   163,   162,
+     695,    77,   164,    13,    77,    13,   479,   480,   481,    95,
+     163,   586,   485,   486,   487,   707,   164,   726,   165,   163,
+     154,   163,   717,   726,    95,   894,   147,    13,    75,   161,
+     163,    75,    77,   506,    26,   508,   905,    75,   163,   512,
+     513,    75,   162,     8,   342,   608,   734,   608,   506,   533,
+     663,   587,   740,   741,   636,   528,   741,   791,   539,   527,
+     766,   630,   754,   838,    81,   686,   347,   644,   602,   601,
+     512,   766,   202,   513,   215,   776,    -1,   772,    -1,   654,
+      -1,   554,    -1,    -1,    -1,    -1,    -1,    -1,   663,    -1,
+      -1,    -1,    -1,    -1,    -1,   783,    -1,    -1,    -1,    -1,
+      -1,   796,    -1,    -1,    -1,   800,   801,    -1,   803,    -1,
+     805,    -1,    -1,   586,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   817,    -1,    -1,    -1,    -1,    -1,    -1,   602,
+      -1,    -1,    -1,    -1,    -1,   827,    -1,    -1,   830,    -1,
+     613,    -1,    -1,   838,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   848,    -1,    -1,    -1,   849,    -1,   854,
+      -1,   853,    -1,    -1,    -1,   857,    -1,    -1,   860,    -1,
+     862,   859,   864,    -1,   869,    -1,    -1,   872,    -1,    -1,
+      -1,   654,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     663,    -1,   884,    -1,   667,    -1,    -1,   892,    -1,    -1,
+     673,    -1,   675,   898,    14,    15,    -1,    -1,   900,    -1,
+      -1,    -1,    -1,     4,     5,   907,     7,     8,     9,    10,
+      11,    12,    13,    -1,    -1,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,    -1,    26,    -1,    -1,    -1,    49,
+      -1,    -1,    -1,    -1,   717,    -1,    37,    -1,    -1,    -1,
+      -1,    -1,    -1,    44,    45,    -1,    -1,    -1,    49,    -1,
+      51,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      80,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,   335,    -1,    -1,    -1,    -1,    -1,    80,
+      81,    -1,    -1,    -1,    -1,    -1,    -1,   349,    -1,   772,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     320,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   344,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     3,     4,     5,     6,     7,
-      -1,    53,    54,    -1,    12,    -1,    -1,    -1,    -1,   369,
-     370,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   383,    32,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    44,    45,    -1,    -1,
-      -1,    -1,    50,   403,    52,    53,    54,    55,    56,    57,
-      -1,    -1,    60,    61,    62,    63,    64,    65,    66,    67,
-      68,    -1,    -1,    -1,    -1,    73,    74,    75,    76,    77,
-      -1,    -1,    -1,    -1,    -1,    83,    84,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   447,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   103,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   111,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   119,   120,    -1,    -1,   475,    -1,   477,   478,    -1,
-     128,   129,   130,   131,   132,   133,   134,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   144,    -1,    -1,    -1,
-      -1,    -1,   150,   151,   152,   153,    -1,    -1,    -1,   157,
-     158,    -1,   160,   161,    -1,    -1,   516,    -1,   166,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   527,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    -1,    51,   547,   548,    -1,
-      -1,   551,    -1,    -1,    -1,   555,   556,    -1,    -1,   559,
-      -1,    -1,    -1,   563,   564,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   572,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    53,    54,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   796,    -1,    -1,    -1,   800,    -1,    -1,
+      -1,    -1,   805,    -1,    -1,    -1,    -1,    -1,   129,    -1,
+      -1,    -1,    -1,    -1,   817,    -1,   156,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   335,
+      -1,    -1,   182,    -1,    -1,   848,    -1,    -1,    -1,    -1,
+     171,   854,   173,   349,   175,   176,    -1,    53,    54,   180,
+     181,   182,   202,   184,    -1,    -1,    -1,    -1,    -1,   872,
+     210,   211,   212,    -1,   214,    38,    39,    40,    41,    42,
+      43,    44,    45,    46,    47,    48,    49,    -1,    51,    -1,
+     162,   163,    -1,    -1,   215,    -1,    -1,    -1,    -1,   481,
+      -1,    -1,    -1,   485,   486,   487,   227,    -1,   229,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   237,    -1,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   248,   249,   250,
+     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
+     261,   262,   263,   264,   265,    -1,   528,    -1,    -1,   270,
+     271,   272,   273,   274,   275,   276,   277,   278,   279,   280,
+     281,   282,    -1,   284,    -1,   286,   287,   163,    -1,   290,
+     291,   292,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   302,    -1,   304,    -1,   481,    -1,    -1,   309,   485,
+     486,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   320,
+      -1,    -1,    -1,    -1,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    -1,    -1,    -1,    -1,
+     602,    -1,    -1,   344,    -1,    -1,    -1,    -1,    -1,    -1,
+     370,   613,   528,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   382,    -1,    53,    54,    -1,    -1,   369,   370,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,     3,     4,     5,     6,     7,    -1,    -1,    -1,    -1,
-      12,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    43,    44,    45,    46,    47,    48,    49,   618,    51,
+      -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,     9,    10,    11,    -1,
+      -1,    -1,   403,    -1,    -1,   667,    95,    -1,    -1,   429,
+      -1,   673,    25,   675,    27,    28,    29,    30,    31,    32,
+      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
+      43,    44,    45,    46,    47,    48,    49,   613,    51,    -1,
+      -1,   461,    -1,   463,    -1,    -1,   447,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   717,    -1,    -1,    -1,   479,
+     480,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    -1,   475,    -1,   477,   478,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   506,    -1,   508,    -1,
+      -1,   667,   512,   513,    -1,    -1,    -1,   673,    -1,   675,
+      -1,    53,    54,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     772,    -1,    -1,    -1,    -1,   516,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   527,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   796,    -1,    -1,    -1,   800,    -1,
+      -1,   717,    -1,   805,    -1,    -1,    -1,    -1,   549,   550,
+     163,    -1,   553,    -1,    -1,   817,   557,   558,    -1,    -1,
+     561,    -1,    -1,    -1,   565,   566,   586,    -1,    -1,    -1,
+      -1,    -1,    -1,   574,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   848,    -1,    -1,    -1,
+      -1,    -1,   854,    -1,    -1,    -1,   772,    44,    45,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    44,    45,    -1,    -1,    -1,    -1,    50,    -1,
-      52,    53,    54,    55,    56,    57,   646,   647,    60,    61,
-      62,    63,    64,    65,    66,    67,    68,    69,    -1,   659,
-      -1,    73,    74,    75,    76,    77,    -1,    79,    -1,    -1,
-      -1,    83,    84,    85,    86,    87,    -1,    89,    -1,    91,
-      -1,    93,    -1,    -1,    96,    -1,    -1,    -1,   100,   101,
-     102,   103,   104,   105,   106,    -1,   108,   109,   110,   111,
-     112,   113,    -1,    -1,    -1,    -1,   118,   119,   120,   121,
-     122,   123,    -1,    -1,    -1,    -1,   128,   129,   130,   131,
-     132,   133,   134,    -1,    -1,   137,   138,    -1,   140,    -1,
-      -1,    -1,   144,    -1,    -1,    -1,    -1,    -1,   150,   151,
-     152,   153,    -1,   743,   156,   157,   158,    -1,    -1,   161,
-      -1,   163,   164,   165,   166,    -1,    -1,    -1,    -1,    -1,
-      -1,     3,     4,     5,     6,     7,    -1,    -1,    -1,    -1,
-      12,    -1,    -1,    -1,    -1,    -1,    -1,   777,    29,    30,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    -1,
-      51,    -1,    44,    45,    -1,    -1,    -1,    -1,    50,    -1,
-      52,    53,    54,    55,    56,    57,    -1,   817,    60,    61,
+     872,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    65,   620,
+     796,    -1,    -1,    -1,   800,    -1,    73,    74,    75,   805,
+      -1,    -1,    -1,    -1,   654,    -1,    83,    -1,    -1,    -1,
+      -1,   817,    -1,   663,    -1,    -1,    -1,    -1,   649,   650,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   662,    -1,    -1,   111,    -1,    -1,     3,     4,     5,
+       6,     7,   848,    -1,    -1,    -1,    12,    -1,   854,    -1,
+      -1,    -1,   129,   130,   131,   132,   133,   134,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   872,   144,    -1,    -1,
+      -1,    -1,    -1,   150,   151,   152,   153,    -1,    44,    45,
+     157,    -1,    -1,    -1,    50,    -1,    52,    53,    54,    55,
+      56,    57,    -1,    -1,    60,    61,    62,    63,    64,    65,
+      66,    67,    68,    69,    -1,    -1,    -1,    73,    74,    75,
+      76,    77,    -1,    79,    -1,   746,    -1,    83,    84,    85,
+      86,    87,    -1,    89,    -1,    91,    -1,    93,    -1,    -1,
+      96,    -1,    -1,    -1,   100,   101,   102,   103,   104,   105,
+     106,    -1,   108,   109,   110,   111,   112,   113,    -1,   780,
+      -1,    -1,   118,   119,   120,   121,   122,   123,    -1,    -1,
+      -1,    -1,   128,   129,   130,   131,   132,   133,   134,    -1,
+      -1,   137,   138,    -1,   140,    -1,    -1,    -1,   144,     3,
+       4,     5,     6,     7,   150,   151,   152,   153,    12,   820,
+     156,   157,   158,    -1,    -1,   161,    -1,   163,   164,   165,
+     166,    33,    34,    35,    36,    37,    38,    39,    40,    41,
+      42,    43,    44,    45,    46,    47,    48,    49,    -1,    51,
+      44,    45,    -1,    -1,    -1,    -1,    50,    -1,    52,    53,
+      54,    55,    56,    57,    -1,    -1,    60,    61,    62,    63,
+      64,    65,    66,    67,    68,    69,    -1,    -1,    -1,    73,
+      74,    75,    76,    77,    -1,    79,    -1,    -1,    -1,    83,
+      84,    85,    86,    87,    -1,    89,    -1,    91,    -1,    93,
+      -1,    -1,    96,    -1,    -1,    -1,   100,   101,   102,   103,
+     104,   105,   106,    -1,   108,   109,   110,   111,   112,   113,
+      -1,    -1,    -1,    -1,   118,   119,   120,   121,   122,   123,
+      -1,    -1,    -1,    -1,   128,   129,   130,   131,   132,   133,
+     134,    -1,    -1,   137,   138,    -1,   140,    -1,    -1,    -1,
+     144,     3,     4,     5,     6,     7,   150,   151,   152,   153,
+      12,    -1,   156,   157,   158,    -1,    -1,   161,    -1,   163,
+     164,   165,   166,    33,    34,    35,    36,    37,    38,    39,
+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
+      -1,    51,    44,    45,    -1,    -1,    -1,    -1,    50,    -1,
+      52,    53,    54,    55,    56,    57,    -1,    -1,    60,    61,
       62,    63,    64,    65,    66,    67,    68,    69,    -1,    -1,
       -1,    73,    74,    75,    76,    77,    -1,    79,    -1,    -1,
       -1,    83,    84,    85,    86,    87,    -1,    89,    -1,    91,
@@ -1977,7 +2010,7 @@
      132,   133,   134,    -1,    -1,   137,   138,    -1,   140,    -1,
       -1,    -1,   144,     3,     4,     5,     6,     7,   150,   151,
      152,   153,    12,    -1,   156,   157,   158,    -1,    -1,   161,
-      -1,   163,   164,   165,   166,    -1,    -1,    -1,    -1,    -1,
+      -1,   163,   164,    -1,   166,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    44,    45,    -1,    -1,    -1,    -1,
       50,    -1,    52,    53,    54,    55,    56,    57,    -1,    -1,
@@ -1985,13 +2018,13 @@
       -1,    -1,    -1,    73,    74,    75,    76,    77,    -1,    79,
       -1,    -1,    -1,    83,    84,    85,    86,    87,    -1,    89,
       -1,    91,    -1,    93,    -1,    -1,    96,    -1,    -1,    -1,
-     100,   101,   102,   103,   104,   105,   106,    -1,   108,   109,
+     100,   101,   102,   103,    -1,   105,   106,    -1,   108,    -1,
      110,   111,   112,   113,    -1,    -1,    -1,    -1,   118,   119,
      120,   121,   122,   123,    -1,    -1,    -1,    -1,   128,   129,
      130,   131,   132,   133,   134,    -1,    -1,   137,   138,    -1,
      140,    -1,    -1,    -1,   144,     3,     4,     5,     6,     7,
      150,   151,   152,   153,    12,    -1,   156,   157,   158,    -1,
-      -1,   161,    -1,   163,   164,    -1,   166,    -1,    -1,    -1,
+      -1,   161,    -1,   163,   164,   165,   166,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    44,    45,    -1,    -1,
       -1,    -1,    50,    -1,    52,    53,    54,    55,    56,    57,
@@ -2012,22 +2045,22 @@
       56,    57,    -1,    -1,    60,    61,    62,    63,    64,    65,
       66,    67,    68,    69,    -1,    -1,    -1,    73,    74,    75,
       76,    77,    -1,    79,    -1,    -1,    -1,    83,    84,    85,
-      86,    87,    -1,    89,    -1,    91,    -1,    93,    -1,    -1,
+      86,    87,    88,    89,    -1,    91,    -1,    93,    -1,    -1,
       96,    -1,    -1,    -1,   100,   101,   102,   103,    -1,   105,
      106,    -1,   108,    -1,   110,   111,   112,   113,    -1,    -1,
       -1,    -1,   118,   119,   120,   121,   122,   123,    -1,    -1,
       -1,    -1,   128,   129,   130,   131,   132,   133,   134,    -1,
       -1,   137,   138,    -1,   140,    -1,    -1,    -1,   144,     3,
        4,     5,     6,     7,   150,   151,   152,   153,    12,    -1,
-     156,   157,   158,    -1,    -1,   161,    -1,   163,   164,   165,
+     156,   157,   158,    -1,    -1,   161,    -1,   163,   164,    -1,
      166,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       44,    45,    -1,    -1,    -1,    -1,    50,    -1,    52,    53,
       54,    55,    56,    57,    -1,    -1,    60,    61,    62,    63,
       64,    65,    66,    67,    68,    69,    -1,    -1,    -1,    73,
       74,    75,    76,    77,    -1,    79,    -1,    -1,    -1,    83,
-      84,    85,    86,    87,    88,    89,    -1,    91,    -1,    93,
-      -1,    -1,    96,    -1,    -1,    -1,   100,   101,   102,   103,
+      84,    85,    86,    87,    -1,    89,    -1,    91,    -1,    93,
+      94,    -1,    96,    -1,    -1,    -1,   100,   101,   102,   103,
       -1,   105,   106,    -1,   108,    -1,   110,   111,   112,   113,
       -1,    -1,    -1,    -1,   118,   119,   120,   121,   122,   123,
       -1,    -1,    -1,    -1,   128,   129,   130,   131,   132,   133,
@@ -2041,42 +2074,42 @@
       62,    63,    64,    65,    66,    67,    68,    69,    -1,    -1,
       -1,    73,    74,    75,    76,    77,    -1,    79,    -1,    -1,
       -1,    83,    84,    85,    86,    87,    -1,    89,    -1,    91,
-      -1,    93,    94,    -1,    96,    -1,    -1,    -1,   100,   101,
+      -1,    93,    -1,    -1,    96,    -1,    -1,    -1,   100,   101,
      102,   103,    -1,   105,   106,    -1,   108,    -1,   110,   111,
      112,   113,    -1,    -1,    -1,    -1,   118,   119,   120,   121,
      122,   123,    -1,    -1,    -1,    -1,   128,   129,   130,   131,
      132,   133,   134,    -1,    -1,   137,   138,    -1,   140,    -1,
       -1,    -1,   144,     3,     4,     5,     6,     7,   150,   151,
      152,   153,    12,    -1,   156,   157,   158,    -1,    -1,   161,
-      -1,   163,   164,    -1,   166,    -1,    -1,    -1,    -1,    -1,
+      -1,   163,   164,   165,   166,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    44,    45,    -1,    -1,    -1,    -1,
       50,    -1,    52,    53,    54,    55,    56,    57,    -1,    -1,
       60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
       -1,    -1,    -1,    73,    74,    75,    76,    77,    -1,    79,
       -1,    -1,    -1,    83,    84,    85,    86,    87,    -1,    89,
-      -1,    91,    -1,    93,    -1,    -1,    96,    -1,    -1,    -1,
+      -1,    91,    92,    93,    -1,    -1,    96,    -1,    -1,    -1,
      100,   101,   102,   103,    -1,   105,   106,    -1,   108,    -1,
      110,   111,   112,   113,    -1,    -1,    -1,    -1,   118,   119,
      120,   121,   122,   123,    -1,    -1,    -1,    -1,   128,   129,
      130,   131,   132,   133,   134,    -1,    -1,   137,   138,    -1,
      140,    -1,    -1,    -1,   144,     3,     4,     5,     6,     7,
      150,   151,   152,   153,    12,    -1,   156,   157,   158,    -1,
-      -1,   161,    -1,   163,   164,   165,   166,    -1,    -1,    -1,
+      -1,   161,    -1,   163,   164,    -1,   166,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    44,    45,    -1,    -1,
       -1,    -1,    50,    -1,    52,    53,    54,    55,    56,    57,
       -1,    -1,    60,    61,    62,    63,    64,    65,    66,    67,
       68,    69,    -1,    -1,    -1,    73,    74,    75,    76,    77,
       -1,    79,    -1,    -1,    -1,    83,    84,    85,    86,    87,
-      -1,    89,    -1,    91,    92,    93,    -1,    -1,    96,    -1,
+      -1,    89,    -1,    91,    -1,    93,    -1,    -1,    96,    -1,
       -1,    -1,   100,   101,   102,   103,    -1,   105,   106,    -1,
      108,    -1,   110,   111,   112,   113,    -1,    -1,    -1,    -1,
      118,   119,   120,   121,   122,   123,    -1,    -1,    -1,    -1,
      128,   129,   130,   131,   132,   133,   134,    -1,    -1,   137,
      138,    -1,   140,    -1,    -1,    -1,   144,     3,     4,     5,
        6,     7,   150,   151,   152,   153,    12,    -1,   156,   157,
-     158,    -1,    -1,   161,    -1,   163,   164,    -1,   166,    -1,
+     158,    -1,    -1,   161,    -1,   163,   164,   165,   166,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    44,    45,
       -1,    -1,    -1,    -1,    50,    -1,    52,    53,    54,    55,
@@ -2097,7 +2130,7 @@
       54,    55,    56,    57,    -1,    -1,    60,    61,    62,    63,
       64,    65,    66,    67,    68,    69,    -1,    -1,    -1,    73,
       74,    75,    76,    77,    -1,    79,    -1,    -1,    -1,    83,
-      84,    85,    86,    87,    -1,    89,    -1,    91,    -1,    93,
+      84,    85,    86,    87,    -1,    89,    90,    91,    -1,    93,
       -1,    -1,    96,    -1,    -1,    -1,   100,   101,   102,   103,
       -1,   105,   106,    -1,   108,    -1,   110,   111,   112,   113,
       -1,    -1,    -1,    -1,   118,   119,   120,   121,   122,   123,
@@ -2105,13 +2138,13 @@
      134,    -1,    -1,   137,   138,    -1,   140,    -1,    -1,    -1,
      144,     3,     4,     5,     6,     7,   150,   151,   152,   153,
       12,    -1,   156,   157,   158,    -1,    -1,   161,    -1,   163,
-     164,   165,   166,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     164,    -1,   166,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    44,    45,    -1,    -1,    -1,    -1,    50,    -1,
       52,    53,    54,    55,    56,    57,    -1,    -1,    60,    61,
       62,    63,    64,    65,    66,    67,    68,    69,    -1,    -1,
       -1,    73,    74,    75,    76,    77,    -1,    79,    -1,    -1,
-      -1,    83,    84,    85,    86,    87,    -1,    89,    90,    91,
+      -1,    83,    84,    85,    86,    87,    -1,    89,    -1,    91,
       -1,    93,    -1,    -1,    96,    -1,    -1,    -1,   100,   101,
      102,   103,    -1,   105,   106,    -1,   108,    -1,   110,   111,
      112,   113,    -1,    -1,    -1,    -1,   118,   119,   120,   121,
@@ -2119,7 +2152,7 @@
      132,   133,   134,    -1,    -1,   137,   138,    -1,   140,    -1,
       -1,    -1,   144,     3,     4,     5,     6,     7,   150,   151,
      152,   153,    12,    -1,   156,   157,   158,    -1,    -1,   161,
-      -1,   163,   164,    -1,   166,    -1,    -1,    -1,    -1,    -1,
+      -1,   163,   164,   165,   166,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    44,    45,    -1,    -1,    -1,    -1,
       50,    -1,    52,    53,    54,    55,    56,    57,    -1,    -1,
@@ -2161,8 +2194,8 @@
       -1,    -1,   128,   129,   130,   131,   132,   133,   134,    -1,
       -1,   137,   138,    -1,   140,    -1,    -1,    -1,   144,     3,
        4,     5,     6,     7,   150,   151,   152,   153,    12,    -1,
-     156,   157,   158,    -1,    -1,   161,    -1,   163,   164,   165,
-     166,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     156,   157,   158,    -1,    -1,   161,    -1,   163,   164,    -1,
+     166,    -1,    26,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       44,    45,    -1,    -1,    -1,    -1,    50,    -1,    52,    53,
       54,    55,    56,    57,    -1,    -1,    60,    61,    62,    63,
@@ -2170,12 +2203,12 @@
       74,    75,    76,    77,    -1,    79,    -1,    -1,    -1,    83,
       84,    85,    86,    87,    -1,    89,    -1,    91,    -1,    93,
       -1,    -1,    96,    -1,    -1,    -1,   100,   101,   102,   103,
-      -1,   105,   106,    -1,   108,    -1,   110,   111,   112,   113,
-      -1,    -1,    -1,    -1,   118,   119,   120,   121,   122,   123,
+      -1,   105,   106,    -1,   108,    -1,   110,   111,    -1,    -1,
+      -1,    -1,    -1,    -1,   118,   119,   120,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,   128,   129,   130,   131,   132,   133,
      134,    -1,    -1,   137,   138,    -1,   140,    -1,    -1,    -1,
      144,     3,     4,     5,     6,     7,   150,   151,   152,   153,
-      12,    -1,   156,   157,   158,    -1,    -1,   161,    -1,   163,
+      12,    -1,    -1,   157,   158,    -1,    -1,   161,    -1,   163,
      164,    -1,   166,    -1,    26,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    44,    45,    -1,    -1,    -1,    -1,    50,    -1,
@@ -2233,7 +2266,7 @@
       -1,   137,   138,    -1,   140,    -1,    -1,    -1,   144,     3,
        4,     5,     6,     7,   150,   151,   152,   153,    12,    -1,
       -1,   157,   158,    -1,    -1,   161,    -1,   163,   164,    -1,
-     166,    -1,    26,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     166,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       44,    45,    -1,    -1,    -1,    -1,    50,    -1,    52,    53,
       54,    55,    56,    57,    -1,    -1,    60,    61,    62,    63,
@@ -2248,34 +2281,73 @@
      144,     3,     4,     5,     6,     7,   150,   151,   152,   153,
       12,    -1,    -1,   157,   158,    -1,    -1,   161,    -1,   163,
      164,    -1,   166,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      32,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    44,    45,    -1,    -1,    -1,    -1,    50,    -1,
       52,    53,    54,    55,    56,    57,    -1,    -1,    60,    61,
-      62,    63,    64,    65,    66,    67,    68,    69,    -1,    -1,
-      -1,    73,    74,    75,    76,    77,    -1,    79,    -1,    -1,
-      -1,    83,    84,    85,    86,    87,    -1,    89,    -1,    91,
-      -1,    93,    -1,    -1,    96,    -1,    -1,    -1,   100,   101,
-     102,   103,    -1,   105,   106,    -1,   108,    -1,   110,   111,
-      -1,    -1,    -1,    -1,    -1,    -1,   118,   119,   120,    -1,
+      62,    63,    64,    65,    66,    67,    68,    -1,    -1,    -1,
+      -1,    73,    74,    75,    76,    77,    -1,    -1,    -1,    -1,
+      -1,    83,    84,    32,    33,    34,    35,    36,    37,    38,
+      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
+      49,   103,    51,    -1,    -1,    -1,    -1,    -1,    -1,   111,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   119,   120,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,   128,   129,   130,   131,
-     132,   133,   134,    -1,    -1,   137,   138,    -1,   140,    -1,
-      -1,    -1,   144,     3,     4,     5,     6,     7,   150,   151,
-     152,   153,    12,    -1,    -1,   157,   158,    -1,    -1,   161,
-      -1,   163,   164,    -1,   166,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    32,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     132,   133,   134,    -1,     3,     4,     5,     6,     7,    -1,
+      -1,    -1,   144,    12,    -1,    -1,    -1,    -1,   150,   151,
+     152,   153,    -1,    -1,    -1,   157,   158,    -1,   160,   161,
+      -1,    -1,    -1,    32,   166,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    44,    45,    -1,    -1,    -1,
+      -1,    50,    -1,    52,    53,    54,    55,    56,    57,    -1,
+      -1,    60,    61,    62,    63,    64,    65,    66,    67,    68,
+      -1,    -1,    -1,    -1,    73,    74,    75,    76,    77,    -1,
+      -1,    -1,    -1,    -1,    83,    84,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   103,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   111,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     119,   120,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   128,
+     129,   130,   131,   132,   133,   134,    -1,     3,     4,     5,
+       6,     7,    -1,    -1,    -1,   144,    12,    -1,    -1,    -1,
+      -1,   150,   151,   152,   153,    -1,    -1,    -1,   157,   158,
+      -1,    -1,   161,    -1,    -1,    -1,    -1,   166,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    44,    45,
+      -1,    -1,    -1,    -1,    50,    -1,    52,    53,    54,    55,
+      56,    57,    -1,    -1,    60,    61,    62,    63,    64,    65,
+      66,    67,    68,    -1,    -1,    -1,    -1,    73,    74,    75,
+      76,    77,    -1,    -1,    -1,    -1,    -1,    83,    84,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   103,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   111,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   119,   120,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   128,   129,   130,   131,   132,   133,   134,    -1,
+       3,     4,     5,     6,     7,    -1,    -1,    -1,   144,    12,
+      -1,    -1,    -1,    -1,   150,   151,   152,   153,    -1,    -1,
+      -1,   157,   158,    -1,    -1,   161,    -1,   163,    -1,    -1,
+     166,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    44,    45,    -1,    -1,    -1,    -1,    50,    -1,    52,
+      53,    54,    55,    56,    57,    -1,    -1,    60,    61,    62,
+      63,    64,    65,    66,    67,    68,    -1,    -1,    -1,    -1,
+      73,    74,    75,    76,    77,    -1,    -1,    -1,    -1,    -1,
+      83,    84,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     103,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   119,   120,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   128,   129,   130,   131,   132,
+     133,   134,    -1,     3,     4,     5,     6,     7,    -1,    -1,
+      -1,   144,    12,    -1,    -1,    -1,    -1,   150,   151,   152,
+     153,    -1,    -1,    -1,   157,   158,    -1,    -1,   161,    -1,
+     163,    -1,    -1,   166,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    44,    45,    -1,    -1,    -1,    -1,
       50,    -1,    52,    53,    54,    55,    56,    57,    -1,    -1,
       60,    61,    62,    63,    64,    65,    66,    67,    68,    -1,
       -1,    -1,    -1,    73,    74,    75,    76,    77,    -1,    -1,
-      -1,    -1,    -1,    83,    84,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,   103,    51,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    83,    84,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   103,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,   111,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   119,
      120,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   128,   129,
      130,   131,   132,   133,   134,    -1,     3,     4,     5,     6,
        7,    -1,    -1,    -1,   144,    12,    -1,    -1,    -1,    -1,
      150,   151,   152,   153,    -1,    -1,    -1,   157,   158,    -1,
-      -1,   161,    -1,    -1,    -1,    -1,   166,    -1,    -1,    -1,
+      -1,   161,    -1,   163,    -1,    -1,   166,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    44,    45,    -1,
       -1,    -1,    -1,    50,    -1,    52,    53,    54,    55,    56,
       57,    -1,    -1,    60,    61,    62,    63,    64,    65,    66,
@@ -2288,7 +2360,7 @@
       -1,   128,   129,   130,   131,   132,   133,   134,    -1,     3,
        4,     5,     6,     7,    -1,    -1,    -1,   144,    12,    -1,
       -1,    -1,    -1,   150,   151,   152,   153,    -1,    -1,    -1,
-     157,   158,    -1,    -1,   161,    -1,   163,    -1,    -1,   166,
+     157,   158,    26,    -1,   161,   162,    -1,    -1,    -1,   166,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       44,    45,    -1,    -1,    -1,    -1,    50,    -1,    52,    53,
       54,    55,    56,    57,    -1,    -1,    60,    61,    62,    63,
@@ -2301,8 +2373,8 @@
       -1,    -1,    -1,    -1,   128,   129,   130,   131,   132,   133,
      134,    -1,     3,     4,     5,     6,     7,    -1,    -1,    -1,
      144,    12,    -1,    -1,    -1,    -1,   150,   151,   152,   153,
-      -1,    -1,    -1,   157,   158,    -1,    -1,   161,    -1,   163,
-      -1,    -1,   166,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   157,   158,    -1,    -1,   161,    -1,    -1,
+      -1,    32,   166,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    44,    45,    -1,    -1,    -1,    -1,    50,
       -1,    52,    53,    54,    55,    56,    57,    -1,    -1,    60,
       61,    62,    63,    64,    65,    66,    67,    68,    -1,    -1,
@@ -2315,7 +2387,7 @@
      131,   132,   133,   134,    -1,     3,     4,     5,     6,     7,
       -1,    -1,    -1,   144,    12,    -1,    -1,    -1,    -1,   150,
      151,   152,   153,    -1,    -1,    -1,   157,   158,    -1,    -1,
-     161,    -1,   163,    -1,    -1,   166,    -1,    -1,    -1,    -1,
+     161,    -1,    -1,    -1,    32,   166,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    44,    45,    -1,    -1,
       -1,    -1,    50,    -1,    52,    53,    54,    55,    56,    57,
       -1,    -1,    60,    61,    62,    63,    64,    65,    66,    67,
@@ -2328,7 +2400,7 @@
      128,   129,   130,   131,   132,   133,   134,    -1,     3,     4,
        5,     6,     7,    -1,    -1,    -1,   144,    12,    -1,    -1,
       -1,    -1,   150,   151,   152,   153,    -1,    -1,    -1,   157,
-     158,    26,    -1,   161,   162,    -1,    -1,    -1,   166,    -1,
+     158,    -1,    -1,   161,    -1,    -1,    -1,    32,   166,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    44,
       45,    -1,    -1,    -1,    -1,    50,    -1,    52,    53,    54,
       55,    56,    57,    -1,    -1,    60,    61,    62,    63,    64,
@@ -2355,7 +2427,7 @@
      132,   133,   134,    -1,     3,     4,     5,     6,     7,    -1,
       -1,    -1,   144,    12,    -1,    -1,    -1,    -1,   150,   151,
      152,   153,    -1,    -1,    -1,   157,   158,    -1,    -1,   161,
-      -1,    -1,    -1,    32,   166,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   166,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    44,    45,    -1,    -1,    -1,
       -1,    50,    -1,    52,    53,    54,    55,    56,    57,    -1,
       -1,    60,    61,    62,    63,    64,    65,    66,    67,    68,
@@ -2368,7 +2440,7 @@
      129,   130,   131,   132,   133,   134,    -1,     3,     4,     5,
        6,     7,    -1,    -1,    -1,   144,    12,    -1,    -1,    -1,
       -1,   150,   151,   152,   153,    -1,    -1,    -1,   157,   158,
-      -1,    -1,   161,    -1,    -1,    -1,    32,   166,    -1,    -1,
+      -1,    -1,   161,    -1,    -1,    -1,    -1,   166,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    44,    45,
       -1,    -1,    -1,    -1,    50,    -1,    52,    53,    54,    55,
       56,    57,    -1,    -1,    60,    61,    62,    63,    64,    65,
@@ -2379,61 +2451,35 @@
       -1,    -1,    -1,    -1,    -1,   111,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,   119,   120,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,   128,   129,   130,   131,   132,   133,   134,    -1,
-       3,     4,     5,     6,     7,    -1,    -1,    -1,   144,    12,
-      -1,    -1,    -1,    -1,   150,   151,   152,   153,    -1,    -1,
-      -1,   157,   158,    -1,    -1,   161,    -1,    -1,    -1,    32,
-     166,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    44,    45,    -1,    -1,    -1,    -1,    50,    -1,    52,
-      53,    54,    55,    56,    57,    -1,    -1,    60,    61,    62,
-      63,    64,    65,    66,    67,    68,    -1,    -1,    -1,    -1,
-      73,    74,    75,    76,    77,    -1,    -1,    -1,    -1,    -1,
-      83,    84,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     103,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   119,   120,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   128,   129,   130,   131,   132,
-     133,   134,    -1,     3,     4,     5,     6,     7,    -1,    -1,
-      -1,   144,    12,    -1,    -1,    -1,    -1,   150,   151,   152,
-     153,    -1,    -1,    -1,   157,   158,    -1,    -1,   161,    -1,
-      -1,    -1,    -1,   166,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    44,    45,    -1,    -1,    -1,    -1,
-      50,    -1,    52,    53,    54,    55,    56,    57,    -1,    -1,
-      60,    61,    62,    63,    64,    65,    66,    67,    68,    -1,
-      -1,    -1,    -1,    73,    74,    75,    76,    77,    -1,    -1,
-      -1,    -1,    -1,    83,    84,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   144,    -1,
+      -1,    -1,    -1,    -1,   150,   151,   152,   153,     9,    10,
+      11,   157,   158,    -1,    -1,   161,    -1,    -1,    -1,    -1,
+     166,    -1,    -1,    -1,    25,    -1,    27,    28,    29,    30,
+      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
+      41,    42,    43,    44,    45,    46,    47,    48,    49,    -1,
+      51,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    25,    -1,    27,
+      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
+      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,    -1,    51,     9,    10,    11,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   103,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   111,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   119,
-     120,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   128,   129,
-     130,   131,   132,   133,   134,    -1,     3,     4,     5,     6,
-       7,    -1,    -1,    -1,   144,    12,    -1,    -1,    -1,    -1,
-     150,   151,   152,   153,    -1,    -1,    -1,   157,   158,    -1,
-      -1,   161,    -1,    -1,    -1,    -1,   166,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    44,    45,    -1,
-      -1,    -1,    -1,    50,    -1,    52,    53,    54,    55,    56,
-      57,    -1,    -1,    60,    61,    62,    63,    64,    65,    66,
-      67,    68,    -1,    -1,    -1,    -1,    73,    74,    75,    76,
-      77,    -1,    -1,    -1,    -1,    -1,    83,    84,    -1,    -1,
+      25,    -1,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    -1,    51,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     9,    10,    11,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   103,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   111,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   119,   120,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   128,   129,   130,   131,   132,   133,   134,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   144,    -1,    -1,
-      -1,    -1,    -1,   150,   151,   152,   153,     9,    10,    11,
-     157,   158,    -1,    -1,   161,    -1,    -1,    -1,    -1,   166,
-      -1,    -1,    -1,    25,    -1,    27,    28,    29,    30,    31,
+      -1,    -1,    -1,    25,   165,    27,    28,    29,    30,    31,
       32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
       42,    43,    44,    45,    46,    47,    48,    49,    -1,    51,
        9,    10,    11,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    25,    -1,    27,    28,
+      -1,    -1,    -1,    -1,    -1,    -1,    25,   165,    27,    28,
       29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
       39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    -1,    51,     9,    10,    11,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    25,
-      -1,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    -1,    51,    -1,    -1,    -1,    -1,
+      49,    -1,    51,    -1,    -1,     9,    10,    11,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     165,    25,    26,    27,    28,    29,    30,    31,    32,    33,
+      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
+      44,    45,    46,    47,    48,    49,    -1,    51,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,     9,    10,    11,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    25,   165,    27,    28,    29,    30,    31,    32,
@@ -2443,57 +2489,25 @@
       -1,    -1,    -1,    -1,    -1,    25,   165,    27,    28,    29,
       30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
       40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-      -1,    51,    -1,    -1,     9,    10,    11,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   165,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    -1,    51,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     9,    10,    11,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    25,   165,    27,    28,    29,    30,    31,    32,    33,
-      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
-      44,    45,    46,    47,    48,    49,    -1,    51,     9,    10,
-      11,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    25,   165,    27,    28,    29,    30,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    -1,
-      51,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    25,   163,    27,
-      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
-      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-      48,    49,    -1,    51,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,
+      -1,    51,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    25,   163,
       27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
       37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    -1,    51,     9,    10,    11,    -1,    -1,
+      47,    48,    49,    -1,    51,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,     9,    10,    11,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    25,
+     163,    27,    28,    29,    30,    31,    32,    33,    34,    35,
+      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
+      46,    47,    48,    49,    -1,    51,     9,    10,    11,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    25,   163,    27,    28,    29,    30,    31,    32,    33,
-      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
-      44,    45,    46,    47,    48,    49,    -1,    51,     9,    10,
-      11,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    25,   163,    27,    28,    29,    30,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    -1,
-      51,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     9,
+      -1,    -1,    25,   163,    27,    28,    29,    30,    31,    32,
+      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
+      43,    44,    45,    46,    47,    48,    49,    -1,    51,     9,
       10,    11,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    25,   163,    27,    28,    29,
       30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
       40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-      -1,    51,    -1,     9,    10,    11,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   162,    25,
-      -1,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    -1,    51,     9,    10,    11,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   162,    25,    -1,    27,    28,    29,    30,    31,    32,
-      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    -1,    51,    -1,
-      -1,    -1,    -1,    -1,    -1,     9,    10,    11,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    25,   162,    27,    28,    29,    30,    31,    32,    33,
-      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
-      44,    45,    46,    47,    48,    49,    -1,    51,    -1,     9,
+      -1,    51,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     9,
       10,    11,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    25,   162,    27,    28,    29,
       30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
@@ -2502,54 +2516,70 @@
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    25,   162,
       27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
       37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    -1,    51,    -1,    -1,    -1,    -1,    -1,
+      47,    48,    49,    -1,    51,     9,    10,    11,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    25,   162,    27,    28,    29,    30,    31,    32,    33,
+      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
+      44,    45,    46,    47,    48,    49,    -1,    51,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,     9,    10,    11,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    25,   162,    27,    28,    29,    30,    31,    32,    33,
+      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
+      44,    45,    46,    47,    48,    49,    -1,    51,     9,    10,
+      11,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    25,   162,    27,    28,    29,    30,
+      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
+      41,    42,    43,    44,    45,    46,    47,    48,    49,    -1,
+      51,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    25,   162,    27,
+      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
+      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,    -1,    51,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    25,   162,    27,
       28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
       38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-      48,    49,    -1,    51,    -1,     9,    10,    11,    -1,    -1,
+      48,    49,    -1,    51,     9,    10,    11,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    25,   162,    27,    28,    29,    30,    31,    32,    33,
+      25,   162,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    -1,    51,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   162,     9,    10,    11,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   127,
+      -1,    25,    -1,    27,    28,    29,    30,    31,    32,    33,
       34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
       44,    45,    46,    47,    48,    49,    -1,    51,     9,    10,
       11,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    25,   162,    27,    28,    29,    30,
+      -1,    -1,   127,    -1,    25,    26,    27,    28,    29,    30,
       31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
       41,    42,    43,    44,    45,    46,    47,    48,    49,    -1,
       51,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,     9,    10,    11,    -1,
-      -1,    -1,    -1,    -1,   162,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    25,   127,    27,    28,    29,    30,    31,    32,
       33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    -1,    51,    -1,
-      -1,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   127,    25,    26,    27,
-      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
-      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-      48,    49,    -1,    51,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,     9,    10,    11,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    25,   127,    27,    28,    29,    30,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    43,    44,    45,    46,    47,    48,    49,    -1,    51,
-      10,    11,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    25,    -1,    27,    28,    29,
-      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-      11,    51,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      43,    44,    45,    46,    47,    48,    49,    -1,    51,    10,
+      11,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    25,    -1,    27,    28,    29,    30,
       31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    25,
-      51,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    -1,    51,    27,    28,    29,    30,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    -1,
-      51,    30,    31,    32,    33,    34,    35,    36,    37,    38,
+      41,    42,    43,    44,    45,    46,    47,    48,    49,    11,
+      51,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    25,    -1,    27,    28,    29,    30,    31,
+      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
+      42,    43,    44,    45,    46,    47,    48,    49,    25,    51,
+      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    -1,    51,    27,    28,    29,    30,    31,
+      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
+      42,    43,    44,    45,    46,    47,    48,    49,    -1,    51,
+      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
       39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    -1,    51,    31,    32,    33,    34,    35,    36,    37,
-      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-      48,    49,    -1,    51
+      49,    -1,    51,    30,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    -1,    51,    31,    32,    33,    34,    35,
+      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
+      46,    47,    48,    49,    -1,    51
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -2565,88 +2595,88 @@
      121,   122,   123,   128,   129,   130,   131,   132,   133,   134,
      137,   138,   140,   144,   150,   151,   152,   153,   156,   157,
      158,   161,   163,   164,   166,   171,   172,   175,   178,   179,
-     186,   187,   189,   190,   191,   193,   248,   249,   250,   253,
-     254,   262,   265,   269,   270,   272,   273,   279,   280,   281,
-     282,   283,   284,   285,   286,   291,   296,   298,   299,   300,
-     301,   302,    75,   111,   150,   158,   250,   269,   269,   161,
-     269,   269,   269,   269,   269,   269,   269,    75,   111,   150,
-     153,   161,   171,   254,   272,   273,   281,   272,   269,   269,
-     269,   269,   269,   269,   269,   269,    32,   269,   294,   295,
-     150,   153,   171,   254,   256,   257,   281,   284,   285,   291,
-     269,   161,   260,   161,    26,    65,    65,   245,   269,   178,
-     161,   161,   161,   161,   161,   163,   269,   163,   269,    75,
-      75,   163,   248,   269,   273,   164,   269,   153,   171,   173,
-     174,    77,   166,   220,   221,    77,   222,   250,   122,   122,
+     186,   187,   189,   190,   191,   193,   249,   250,   251,   254,
+     255,   263,   266,   270,   271,   273,   274,   280,   281,   282,
+     283,   284,   285,   286,   287,   292,   297,   299,   300,   301,
+     302,   303,    75,   111,   150,   158,   251,   270,   270,   161,
+     270,   270,   270,   270,   270,   270,   270,    75,   111,   150,
+     153,   161,   171,   255,   273,   274,   282,   273,   270,   270,
+     270,   270,   270,   270,   270,   270,    32,   270,   295,   296,
+     150,   153,   171,   255,   257,   258,   282,   285,   286,   292,
+     270,   161,   261,   161,    26,    65,    65,   246,   270,   178,
+     161,   161,   161,   161,   161,   163,   270,   163,   270,    75,
+      75,   163,   249,   270,   274,   164,   270,   153,   171,   173,
+     174,    77,   166,   221,   222,    77,   223,   251,   122,   122,
      161,   161,   161,   161,   161,   161,   153,   164,   171,   171,
-     248,   269,   273,   249,   269,   301,   176,   164,   153,   161,
+     249,   270,   274,   250,   270,   302,   176,   164,   153,   161,
        8,   163,    75,    75,   163,    32,   188,    65,   147,     9,
       10,    11,    25,    27,    28,    29,    30,    31,    32,    33,
       34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
       44,    45,    46,    47,    48,    49,    51,   163,    53,    54,
       13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,   161,   147,    65,   126,    65,   164,   166,   285,
-      65,    65,    65,   188,   269,   153,   171,   301,   147,   147,
-     271,   273,   127,   167,     8,   267,   153,   171,   147,   161,
-     261,   147,   126,   285,   162,   269,   269,   269,   287,   287,
-       8,   163,    87,   269,   246,   247,   269,   248,   273,    75,
-     202,   269,   163,   163,   163,    13,   163,   163,   176,   163,
-     171,    95,     8,   163,   164,   270,   273,     8,   163,    13,
-       8,   163,   188,   184,   185,   273,   273,   297,   273,   162,
-     128,   273,   292,   293,   294,   171,   170,   163,   164,   161,
+      23,    24,   161,   147,    65,   126,    65,   164,   166,   286,
+      65,    65,    65,   188,   270,   153,   171,   302,   147,   147,
+     272,   274,   127,   167,     8,   268,   153,   171,   147,   161,
+     262,   147,   126,   286,   162,   270,   270,   270,   288,   288,
+       8,   163,    87,   270,   247,   248,   270,   249,   274,    75,
+     202,   270,   163,   163,   163,    13,   163,   163,   176,   163,
+     171,    95,     8,   163,   164,   271,   274,     8,   163,    13,
+       8,   163,   188,   184,   185,   274,   274,   298,   274,   162,
+     128,   274,   293,   294,   295,   171,   170,   163,   164,   161,
      127,   162,   162,   162,   121,   165,   177,   178,   186,   187,
-     269,    75,    32,   160,   217,   218,   219,   269,    75,   124,
-     192,   124,   194,    75,   161,   287,    75,   279,   285,   291,
-     269,   269,   269,    26,   269,   269,   269,   269,   269,   269,
-     269,   269,   269,   269,   269,   269,   269,   269,   269,   269,
-     269,   269,   269,   269,   269,   269,   269,   269,   256,    32,
-     269,   269,   269,   269,   269,   269,   269,   269,   269,   269,
-     269,   269,   217,    75,   279,   287,    75,   164,   279,   288,
-     289,   290,   287,   269,   287,   287,   287,   162,   171,    75,
-      75,    32,   269,    32,   269,   171,   279,   217,   279,   288,
-     162,   162,   167,   167,   269,   161,   162,   163,     8,    95,
+     270,    75,    32,   160,   218,   219,   220,   270,    75,   124,
+     192,   124,   194,    75,   161,   288,    75,   280,   286,   292,
+     270,   270,   270,    26,   270,   270,   270,   270,   270,   270,
+     270,   270,   270,   270,   270,   270,   270,   270,   270,   270,
+     270,   270,   270,   270,   270,   270,   270,   270,   257,    32,
+     270,   270,   270,   270,   270,   270,   270,   270,   270,   270,
+     270,   270,   218,    75,   280,   288,    75,   164,   280,   289,
+     290,   291,   288,   270,   288,   288,   288,   162,   171,    75,
+      75,    32,   270,    32,   270,   171,   280,   218,   280,   289,
+     162,   162,   167,   167,   270,   161,   162,   163,     8,    95,
       95,    13,     8,   162,   162,    44,    45,    65,    83,   129,
-     150,   153,   171,   254,   262,   263,   264,   165,    95,    75,
-     174,   269,   221,   263,    77,   161,     8,   162,     8,   162,
-     162,   163,   161,     8,   162,   162,   161,   165,   170,   217,
-     248,   273,   161,   165,   271,   269,   162,     8,    13,   150,
-     153,   171,   255,   125,   195,   196,   255,   164,   161,   129,
-     155,   211,   212,   214,   215,   255,   167,   161,   161,   285,
-     269,    26,    66,   273,   162,   161,   161,   167,   269,   161,
-     276,   277,   278,    65,   164,   167,   165,   167,   167,   167,
-     271,   271,   127,   162,   258,    26,   178,   269,    26,   178,
-     206,   246,   269,   273,    32,   198,   273,   263,    75,    26,
-     178,   201,    26,   164,   203,   263,   263,   263,   266,   268,
-     161,   153,   171,   147,   107,   159,   180,   181,   183,    75,
-     165,    13,   211,   185,   163,   273,   292,   293,    13,   217,
-     165,   162,   162,   219,   263,   153,   171,   196,   164,     8,
-     223,   211,   162,     8,    32,    77,   160,   213,   217,   217,
-     269,   256,   217,   217,   165,   217,    65,    65,   274,   287,
-     269,    32,   269,   126,   259,   176,   207,   162,   176,   163,
-     127,   197,   273,   197,    13,   176,   163,   204,   163,   204,
-     127,   167,     8,   267,   266,   171,    75,   161,   164,   181,
-     182,   183,   263,   162,   162,   269,   162,   163,   171,   223,
-     255,   104,   109,   111,   112,   113,   114,   115,   116,   117,
-     165,   224,   226,   239,   240,   241,   242,   244,   162,   109,
-     251,   214,   213,    77,    13,   162,   162,   261,   162,   162,
-     162,   287,   287,   126,   275,   167,   165,   271,   288,   208,
-      70,    71,   209,   163,    88,   246,   198,   162,   162,   263,
-      94,   204,    97,    98,    99,   204,   165,   263,   263,   162,
-     255,   176,   251,   165,    75,   227,   255,    77,   243,   250,
-     242,     8,   163,    26,   216,   161,   216,    32,   213,    13,
-     263,   167,   167,   288,    70,    71,   210,   161,   178,   163,
-     162,    26,   178,   200,   200,   163,    97,   163,   269,    26,
-     163,   205,   165,   127,    77,   165,   216,    13,     8,   163,
-     164,   228,    13,     8,   163,   225,    75,   215,   164,    32,
-      77,   252,   164,   213,    13,   263,   278,   161,    26,    72,
-     269,    26,   178,   199,   176,   163,   205,   176,   263,   162,
-     164,   263,   255,    75,   229,   230,   231,   232,   234,   235,
-     236,   255,   263,    77,   188,    13,   176,    77,     8,   162,
-     176,    13,   263,   269,   176,   163,   162,   176,    92,   176,
-     164,   176,   165,   231,   163,    95,   154,   163,   147,    13,
-      75,   263,   165,    32,    77,   165,   263,   162,   178,    90,
-     163,   176,   165,   237,   242,   233,   255,    75,   263,   161,
-      77,    26,   163,   165,    75,     8,   211,   176,   255,   162,
-     216,   163,   164,   238,   176,   165
+     150,   153,   171,   255,   263,   264,   265,   165,    95,    75,
+     174,   270,   222,   264,    77,   161,     8,   162,     8,   162,
+     162,   163,   161,     8,   162,   162,   161,   165,   170,   218,
+     249,   274,   161,   165,   272,   270,   162,     8,    13,   150,
+     153,   171,   256,   125,   195,   196,   256,   164,   161,    25,
+     129,   155,   211,   212,   214,   215,   216,   256,   167,   161,
+     161,   286,   270,    26,    66,   274,   162,   161,   161,   167,
+     270,   161,   277,   278,   279,    65,   164,   167,   165,   167,
+     167,   167,   272,   272,   127,   162,   259,    26,   178,   270,
+      26,   178,   206,   247,   270,   274,    32,   198,   274,   264,
+      75,    26,   178,   201,    26,   164,   203,   264,   264,   264,
+     267,   269,   161,   153,   171,   147,   107,   159,   180,   181,
+     183,    75,   165,    13,   211,   185,   163,   274,   293,   294,
+      13,   218,   165,   162,   162,   220,   264,   153,   171,   196,
+     164,     8,   224,   211,   216,   162,     8,    32,    77,   160,
+     213,   218,   218,   270,   257,   218,   218,   165,   218,    65,
+      65,   275,   288,   270,    32,   270,   126,   260,   176,   207,
+     162,   176,   163,   127,   197,   274,   197,    13,   176,   163,
+     204,   163,   204,   127,   167,     8,   268,   267,   171,    75,
+     161,   164,   181,   182,   183,   264,   162,   162,   270,   162,
+     163,   171,   224,   256,   104,   109,   111,   112,   113,   114,
+     115,   116,   117,   165,   225,   227,   240,   241,   242,   243,
+     245,   162,   109,   252,   214,   213,    77,    13,   162,   162,
+     262,   162,   162,   162,   288,   288,   126,   276,   167,   165,
+     272,   289,   208,    70,    71,   209,   163,    88,   247,   198,
+     162,   162,   264,    94,   204,    97,    98,    99,   204,   165,
+     264,   264,   162,   256,   176,   252,   165,    75,   228,   256,
+      77,   244,   251,   243,     8,   163,    26,   217,   161,   217,
+      32,   213,    13,   264,   167,   167,   289,    70,    71,   210,
+     161,   178,   163,   162,    26,   178,   200,   200,   163,    97,
+     163,   270,    26,   163,   205,   165,   127,    77,   165,   217,
+      13,     8,   163,   164,   229,    13,     8,   163,   226,    75,
+     215,   164,    32,    77,   253,   164,   213,    13,   264,   279,
+     161,    26,    72,   270,    26,   178,   199,   176,   163,   205,
+     176,   264,   162,   164,   264,   256,    75,   230,   231,   232,
+     233,   235,   236,   237,   256,   264,    77,   188,    13,   176,
+      77,     8,   162,   176,    13,   264,   270,   176,   163,   162,
+     176,    92,   176,   164,   176,   165,   232,   163,    95,   154,
+     163,   147,    13,    75,   264,   165,    32,    77,   165,   264,
+     162,   178,    90,   163,   176,   165,   238,   243,   234,   256,
+      75,   264,   161,    77,    26,   163,   165,    75,     8,   211,
+     176,   256,   162,   217,   163,   164,   239,   176,   165
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
@@ -2666,37 +2696,37 @@
      204,   204,   205,   205,   206,   206,   207,   207,   208,   208,
      209,   209,   210,   210,   211,   211,   212,   212,   212,   212,
      212,   212,   212,   212,   213,   213,   214,   214,   215,   215,
-     215,   216,   216,   217,   217,   218,   218,   219,   219,   219,
-     220,   220,   221,   221,   221,   222,   222,   222,   222,   223,
-     223,   224,   224,   224,   225,   224,   226,   227,   227,   228,
-     228,   229,   229,   230,   230,   231,   231,   232,   233,   233,
-     234,   234,   235,   236,   236,   237,   237,   238,   238,   239,
-     239,   240,   240,   241,   241,   242,   242,   242,   242,   242,
-     242,   243,   243,   243,   243,   244,   244,   245,   245,   246,
-     246,   247,   247,   248,   248,   248,   248,   248,   248,   248,
-     248,   248,   248,   248,   248,   248,   248,   248,   248,   248,
-     248,   248,   248,   248,   248,   248,   248,   248,   248,   248,
-     248,   248,   248,   248,   248,   248,   248,   248,   248,   248,
-     248,   248,   248,   248,   248,   248,   248,   248,   248,   248,
-     248,   248,   248,   248,   248,   248,   248,   248,   248,   248,
-     248,   248,   248,   248,   248,   248,   248,   248,   248,   248,
-     248,   248,   248,   248,   248,   248,   249,   249,   249,   249,
-     250,   251,   251,   252,   252,   252,   252,   253,   253,   253,
-     253,   253,   253,   253,   253,   254,   254,   254,   254,   255,
-     255,   255,   256,   256,   257,   257,   258,   258,   259,   260,
-     260,   260,   261,   261,   262,   262,   262,   262,   262,   262,
-     262,   262,   262,   262,   262,   262,   263,   263,   263,   263,
-     263,   263,   263,   263,   263,   264,   265,   265,   265,   265,
-     265,   265,   266,   266,   267,   267,   268,   268,   268,   268,
-     269,   269,   270,   271,   272,   273,   273,   274,   274,   275,
-     276,   276,   277,   278,   278,   278,   279,   279,   280,   280,
-     281,   282,   282,   283,   283,   283,   284,   284,   284,   284,
-     285,   285,   285,   286,   286,   287,   287,   288,   288,   289,
-     289,   289,   290,   290,   291,   291,   292,   292,   293,   293,
-     293,   294,   294,   295,   295,   295,   295,   295,   295,   295,
-     295,   296,   296,   296,   296,   296,   296,   296,   297,   297,
-     298,   298,   299,   299,   299,   299,   299,   300,   300,   301,
-     302,   302
+     216,   216,   216,   217,   217,   218,   218,   219,   219,   220,
+     220,   220,   221,   221,   222,   222,   222,   223,   223,   223,
+     223,   224,   224,   225,   225,   225,   226,   225,   227,   228,
+     228,   229,   229,   230,   230,   231,   231,   232,   232,   233,
+     234,   234,   235,   235,   236,   237,   237,   238,   238,   239,
+     239,   240,   240,   241,   241,   242,   242,   243,   243,   243,
+     243,   243,   243,   244,   244,   244,   244,   245,   245,   246,
+     246,   247,   247,   248,   248,   249,   249,   249,   249,   249,
+     249,   249,   249,   249,   249,   249,   249,   249,   249,   249,
+     249,   249,   249,   249,   249,   249,   249,   249,   249,   249,
+     249,   249,   249,   249,   249,   249,   249,   249,   249,   249,
+     249,   249,   249,   249,   249,   249,   249,   249,   249,   249,
+     249,   249,   249,   249,   249,   249,   249,   249,   249,   249,
+     249,   249,   249,   249,   249,   249,   249,   249,   249,   249,
+     249,   249,   249,   249,   249,   249,   249,   249,   250,   250,
+     250,   250,   251,   252,   252,   253,   253,   253,   253,   254,
+     254,   254,   254,   254,   254,   254,   254,   255,   255,   255,
+     255,   256,   256,   256,   257,   257,   258,   258,   259,   259,
+     260,   261,   261,   261,   262,   262,   263,   263,   263,   263,
+     263,   263,   263,   263,   263,   263,   263,   263,   264,   264,
+     264,   264,   264,   264,   264,   264,   264,   265,   266,   266,
+     266,   266,   266,   266,   267,   267,   268,   268,   269,   269,
+     269,   269,   270,   270,   271,   272,   273,   274,   274,   275,
+     275,   276,   277,   277,   278,   279,   279,   279,   280,   280,
+     281,   281,   282,   283,   283,   284,   284,   284,   285,   285,
+     285,   285,   286,   286,   286,   287,   287,   288,   288,   289,
+     289,   290,   290,   290,   291,   291,   292,   292,   293,   293,
+     294,   294,   294,   295,   295,   296,   296,   296,   296,   296,
+     296,   296,   296,   297,   297,   297,   297,   297,   297,   297,
+     298,   298,   299,   299,   300,   300,   300,   300,   300,   301,
+     301,   302,   303,   303
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -2715,38 +2745,38 @@
        4,     1,     4,     3,     5,     3,     4,     4,     5,     0,
        5,     4,     1,     1,     1,     4,     0,     6,     0,     7,
        0,     2,     0,     3,     1,     0,     2,     3,     5,     4,
-       4,     5,     7,     6,     2,     1,     0,     1,     1,     1,
-       1,     0,     2,     1,     0,     1,     3,     1,     2,     2,
-       3,     1,     1,     2,     4,     3,     5,     1,     3,     2,
-       0,     3,     2,     1,     0,    10,     3,     1,     3,     1,
-       3,     0,     1,     1,     2,     2,     2,     3,     1,     3,
-       1,     1,     3,     4,     3,     0,     1,     1,     3,     1,
-       1,     0,     1,     1,     2,     1,     1,     1,     1,     1,
-       1,     3,     5,     1,     3,     5,     4,     3,     1,     0,
-       1,     3,     1,     6,     3,     4,     6,     2,     3,     3,
-       3,     3,     3,     3,     3,     3,     3,     3,     3,     2,
-       2,     2,     2,     3,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     3,     3,     3,     3,     2,
-       2,     2,     2,     3,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     1,     1,     5,     4,     3,     1,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     1,     1,
-       1,     1,     2,     1,    10,    11,     2,     2,     4,     4,
-       1,     0,     4,     3,     4,     1,     2,     4,     6,     5,
-       6,     6,     6,     6,     4,     1,     1,     3,     2,     1,
-       3,     2,     1,     1,     4,     1,     2,     0,     2,     0,
-       2,     3,     0,     3,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     3,     2,
-       2,     2,     4,     3,     1,     3,     1,     1,     1,     3,
-       2,     1,     0,     2,     0,     1,     5,     3,     3,     1,
-       1,     1,     1,     1,     1,     5,     1,     2,     0,     3,
-       4,     4,     3,     1,     1,     0,     1,     2,     3,     3,
-       1,     4,     4,     1,     1,     1,     1,     3,     2,     1,
-       4,     4,     1,     1,     4,     0,     1,     1,     1,     4,
-       4,     1,     1,     3,     1,     2,     3,     1,     1,     4,
-       0,     0,     2,     5,     3,     3,     1,     6,     4,     4,
-       2,     4,     4,     2,     2,     4,     2,     2,     1,     3,
-       3,     3,     4,     4,     4,     4,     4,     4,     3,     3,
-       3,     3
+       4,     5,     7,     6,     2,     1,     0,     1,     1,     2,
+       1,     1,     1,     0,     2,     1,     0,     1,     3,     1,
+       2,     2,     3,     1,     1,     2,     4,     3,     5,     1,
+       3,     2,     0,     3,     2,     1,     0,    10,     3,     1,
+       3,     1,     3,     0,     1,     1,     2,     2,     2,     3,
+       1,     3,     1,     1,     3,     4,     3,     0,     1,     1,
+       3,     1,     1,     0,     1,     1,     2,     1,     1,     1,
+       1,     1,     1,     3,     5,     1,     3,     5,     4,     3,
+       1,     0,     1,     3,     1,     6,     3,     4,     6,     2,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     2,     2,     2,     2,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     2,     2,     2,     2,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     1,     1,     5,     4,     3,
+       1,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       1,     1,     1,     1,     2,     1,    10,    11,     2,     2,
+       4,     4,     1,     0,     4,     3,     4,     1,     2,     4,
+       6,     5,     6,     6,     6,     6,     4,     1,     1,     3,
+       2,     1,     3,     2,     1,     1,     4,     1,     2,     0,
+       2,     0,     2,     3,     0,     3,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       3,     2,     2,     2,     4,     3,     1,     3,     1,     1,
+       1,     3,     2,     1,     0,     2,     0,     1,     5,     3,
+       3,     1,     1,     1,     1,     1,     1,     5,     1,     2,
+       0,     3,     4,     4,     3,     1,     1,     0,     1,     2,
+       3,     3,     1,     4,     4,     1,     1,     1,     1,     3,
+       2,     1,     4,     4,     1,     1,     4,     0,     1,     1,
+       1,     4,     4,     1,     1,     3,     1,     2,     3,     1,
+       1,     4,     0,     0,     2,     5,     3,     3,     1,     6,
+       4,     4,     2,     4,     4,     2,     2,     4,     2,     2,
+       1,     3,     3,     3,     4,     4,     4,     4,     4,     4,
+       3,     3,     3,     3
 };
 
 
@@ -3435,7 +3465,7 @@
     {
     *root = NNEW(n_PROGRAM)->appendChild((yyvsp[0]));
   }
-#line 3439 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3469 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 3:
@@ -3443,7 +3473,7 @@
     {
     (yyval) = (yyvsp[-1])->appendChild((yyvsp[0]));
   }
-#line 3447 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3477 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 4:
@@ -3451,7 +3481,7 @@
     {
     (yyval) = NNEW(n_STATEMENT_LIST);
   }
-#line 3455 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3485 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 5:
@@ -3459,7 +3489,7 @@
     {
     (yyval) = NTYPE((yyvsp[0]), n_SYMBOL_NAME);
   }
-#line 3463 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3493 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 6:
@@ -3467,7 +3497,7 @@
     {
     (yyval) = NMORE((yyvsp[-2]), (yyvsp[0]));
   }
-#line 3471 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3501 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 10:
@@ -3477,7 +3507,7 @@
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-3]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 3481 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3511 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 11:
@@ -3489,7 +3519,7 @@
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-2]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 3493 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3523 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 12:
@@ -3500,7 +3530,7 @@
   (yyvsp[-4])->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
   (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-4]));
   }
-#line 3504 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3534 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 13:
@@ -3513,7 +3543,7 @@
   (yyvsp[-3])->appendChild((yyvsp[-1]));
   (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-3]));
   }
-#line 3517 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3547 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 14:
@@ -3523,7 +3553,7 @@
   (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-1]));
   NMORE((yyval), (yyvsp[0]));
   }
-#line 3527 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3557 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 15:
@@ -3532,7 +3562,7 @@
   (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-1]));
   NMORE((yyval), (yyvsp[0]));
   }
-#line 3536 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3566 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 16:
@@ -3540,7 +3570,7 @@
     {
     (yyval) = (yyvsp[-2])->appendChild((yyvsp[0]));
   }
-#line 3544 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3574 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 17:
@@ -3549,7 +3579,7 @@
     (yyval) = NNEW(n_USE_LIST);
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 3553 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3583 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 18:
@@ -3559,7 +3589,7 @@
     (yyval)->appendChild((yyvsp[0]));
     (yyval)->appendChild(NNEW(n_EMPTY));
   }
-#line 3563 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3593 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 19:
@@ -3570,7 +3600,7 @@
     NTYPE((yyvsp[0]), n_STRING);
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 3574 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3604 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 20:
@@ -3581,7 +3611,7 @@
     (yyval)->appendChild((yyvsp[0]));
     (yyval)->appendChild(NNEW(n_EMPTY));
   }
-#line 3585 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3615 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 21:
@@ -3593,7 +3623,7 @@
     NTYPE((yyvsp[0]), n_STRING);
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 3597 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3627 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 22:
@@ -3605,7 +3635,7 @@
         ->appendChild(NTYPE((yyvsp[-2]), n_STRING))
         ->appendChild((yyvsp[0])));
   }
-#line 3609 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3639 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 23:
@@ -3617,7 +3647,7 @@
         ->appendChild(NTYPE((yyvsp[-2]), n_STRING))
         ->appendChild((yyvsp[0])));
   }
-#line 3621 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3651 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 24:
@@ -3625,7 +3655,7 @@
     {
     (yyval) = (yyvsp[-1])->appendChild((yyvsp[0]));
   }
-#line 3629 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3659 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 25:
@@ -3633,7 +3663,7 @@
     {
     (yyval) = NNEW(n_STATEMENT_LIST);
   }
-#line 3637 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3667 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 29:
@@ -3643,7 +3673,7 @@
   (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-3]));
   NMORE((yyval), (yyvsp[0]));
   }
-#line 3647 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3677 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 31:
@@ -3654,7 +3684,7 @@
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 3658 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3688 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 32:
@@ -3662,7 +3692,7 @@
     {
     (yyval) = NTYPE((yyvsp[0]), n_OPEN_TAG);
   }
-#line 3666 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3696 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 33:
@@ -3670,7 +3700,7 @@
     {
     (yyval) = NTYPE((yyvsp[0]), n_OPEN_TAG);
   }
-#line 3674 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3704 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 34:
@@ -3678,7 +3708,7 @@
     {
     (yyval) = NTYPE((yyvsp[0]), n_CLOSE_TAG);
   }
-#line 3682 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3712 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 35:
@@ -3686,7 +3716,7 @@
     {
     (yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
   }
-#line 3690 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3720 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 36:
@@ -3721,7 +3751,7 @@
 
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyval));
   }
-#line 3725 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3755 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 37:
@@ -3741,7 +3771,7 @@
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyval));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 3745 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3775 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 38:
@@ -3753,7 +3783,7 @@
 
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-4]));
   }
-#line 3757 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3787 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 39:
@@ -3766,7 +3796,7 @@
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-6]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 3770 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3800 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 40:
@@ -3784,7 +3814,7 @@
 
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-8]));
   }
-#line 3788 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3818 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 41:
@@ -3796,7 +3826,7 @@
 
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-4]));
   }
-#line 3800 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3830 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 42:
@@ -3808,7 +3838,7 @@
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 3812 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3842 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 43:
@@ -3820,7 +3850,7 @@
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-2]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 3824 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3854 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 44:
@@ -3832,7 +3862,7 @@
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 3836 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3866 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 45:
@@ -3844,7 +3874,7 @@
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-2]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 3848 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3878 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 46:
@@ -3856,7 +3886,7 @@
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 3860 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3890 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 47:
@@ -3868,7 +3898,7 @@
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-2]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 3872 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3902 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 48:
@@ -3880,7 +3910,7 @@
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-2]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 3884 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3914 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 49:
@@ -3890,7 +3920,7 @@
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 3894 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3924 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 50:
@@ -3900,7 +3930,7 @@
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 3904 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3934 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 51:
@@ -3910,7 +3940,7 @@
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 3914 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3944 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 52:
@@ -3919,7 +3949,7 @@
     NTYPE((yyvsp[0]), n_INLINE_HTML);
     (yyval) = (yyvsp[0]);
   }
-#line 3923 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3953 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 53:
@@ -3928,7 +3958,7 @@
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 3932 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3962 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 54:
@@ -3937,7 +3967,7 @@
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 3941 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3971 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 55:
@@ -3948,7 +3978,7 @@
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-2]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 3952 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 3982 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 56:
@@ -3970,7 +4000,7 @@
 
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-7]));
   }
-#line 3974 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4004 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 57:
@@ -3991,7 +4021,7 @@
 
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-7]));
   }
-#line 3995 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4025 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 58:
@@ -4002,7 +4032,7 @@
     (yyvsp[-4])->appendChild((yyvsp[0]));
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-4]));
   }
-#line 4006 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4036 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 59:
@@ -4011,7 +4041,7 @@
     (yyval) = NNEW(n_STATEMENT)->appendChild(NNEW(n_EMPTY));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 4015 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4045 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 60:
@@ -4025,7 +4055,7 @@
 
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-5]));
   }
-#line 4029 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4059 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 61:
@@ -4039,7 +4069,7 @@
 
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-4]));
   }
-#line 4043 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4073 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 62:
@@ -4052,7 +4082,7 @@
   NMORE((yyval), (yyvsp[0]));
 
   }
-#line 4056 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4086 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 63:
@@ -4065,7 +4095,7 @@
   (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-2]));
   NMORE((yyval), (yyvsp[0]));
   }
-#line 4069 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4099 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 64:
@@ -4074,7 +4104,7 @@
     (yyvsp[-1])->appendChild((yyvsp[0]));
     (yyval) = (yyvsp[-1]);
   }
-#line 4078 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4108 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 65:
@@ -4083,7 +4113,7 @@
   (yyval) = NNEW(n_CATCH_LIST);
   (yyval)->appendChild((yyvsp[0]));
 }
-#line 4087 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4117 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 66:
@@ -4096,7 +4126,7 @@
     NMORE((yyvsp[-7]), (yyvsp[0]));
     (yyval) = (yyvsp[-7]);
   }
-#line 4100 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4130 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 67:
@@ -4104,7 +4134,7 @@
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 4108 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4138 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 69:
@@ -4115,7 +4145,7 @@
     NMORE((yyvsp[-3]), (yyvsp[0]));
     (yyval) = (yyvsp[-3]);
   }
-#line 4119 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4149 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 70:
@@ -4124,7 +4154,7 @@
     (yyval) = NNEW(n_UNSET_LIST);
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 4128 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4158 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 71:
@@ -4133,7 +4163,7 @@
     (yyvsp[-2])->appendChild((yyvsp[0]));
     (yyval) = (yyvsp[-2]);
   }
-#line 4137 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4167 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 75:
@@ -4141,7 +4171,7 @@
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 4145 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4175 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 76:
@@ -4149,7 +4179,7 @@
     {
     (yyval) = NTYPE((yyvsp[0]), n_REFERENCE);
   }
-#line 4153 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4183 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 77:
@@ -4166,7 +4196,7 @@
 
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-9]));
   }
-#line 4170 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4200 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 78:
@@ -4182,7 +4212,7 @@
 
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyval));
   }
-#line 4186 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4216 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 79:
@@ -4199,7 +4229,7 @@
 
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyval));
   }
-#line 4203 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4233 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 80:
@@ -4208,7 +4238,7 @@
     NTYPE((yyvsp[0]), n_CLASS_ATTRIBUTES);
     (yyval) = (yyvsp[0]);
   }
-#line 4212 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4242 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 81:
@@ -4220,7 +4250,7 @@
 
     (yyval) = (yyvsp[0]);
   }
-#line 4224 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4254 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 82:
@@ -4232,7 +4262,7 @@
 
     (yyval) = (yyvsp[0]);
   }
-#line 4236 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4266 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 83:
@@ -4241,7 +4271,7 @@
     (yyval) = NNEW(n_CLASS_ATTRIBUTES);
     (yyval)->appendChild(NTYPE((yyvsp[0]), n_STRING));
   }
-#line 4245 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4275 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 84:
@@ -4249,7 +4279,7 @@
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 4253 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4283 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 85:
@@ -4257,7 +4287,7 @@
     {
     (yyval) = NTYPE((yyvsp[-1]), n_EXTENDS_LIST)->appendChild((yyvsp[0]));
   }
-#line 4261 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4291 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 87:
@@ -4265,7 +4295,7 @@
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 4269 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4299 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 88:
@@ -4275,7 +4305,7 @@
     (yyvsp[-1])->appendChildren((yyvsp[0]));
     (yyval) = (yyvsp[-1]);
   }
-#line 4279 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4309 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 89:
@@ -4283,7 +4313,7 @@
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 4287 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4317 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 90:
@@ -4293,7 +4323,7 @@
     (yyvsp[-1])->appendChildren((yyvsp[0]));
     (yyval) = (yyvsp[-1]);
   }
-#line 4297 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4327 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 91:
@@ -4301,7 +4331,7 @@
     {
     (yyval) = NNEW(n_IMPLEMENTS_LIST)->appendChild((yyvsp[0]));
   }
-#line 4305 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4335 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 92:
@@ -4309,7 +4339,7 @@
     {
     (yyval) = (yyvsp[-2])->appendChild((yyvsp[0]));
   }
-#line 4313 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4343 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 93:
@@ -4317,7 +4347,7 @@
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 4321 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4351 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 94:
@@ -4325,7 +4355,7 @@
     {
     (yyval) = (yyvsp[0]);
   }
-#line 4329 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4359 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 96:
@@ -4335,7 +4365,7 @@
     (yyvsp[-1])->appendChild((yyvsp[0]));
     (yyval) = (yyvsp[-1]);
   }
-#line 4339 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4369 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 98:
@@ -4345,7 +4375,7 @@
   NMORE((yyvsp[-2]), (yyvsp[0]));
   (yyval) = (yyvsp[-2]);
   }
-#line 4349 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4379 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 100:
@@ -4355,7 +4385,7 @@
   NMORE((yyvsp[-2]), (yyvsp[0]));
   (yyval) = (yyvsp[-2]);
   }
-#line 4359 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4389 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 102:
@@ -4365,7 +4395,7 @@
   NMORE((yyvsp[-2]), (yyvsp[0]));
   (yyval) = (yyvsp[-2]);
   }
-#line 4369 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4399 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 103:
@@ -4376,7 +4406,7 @@
     (yyval)->appendChild((yyvsp[0]));
     (yyval) = NNEW(n_DECLARE_DECLARATION_LIST)->appendChild((yyval));
   }
-#line 4380 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4410 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 104:
@@ -4389,7 +4419,7 @@
     (yyvsp[-4])->appendChild((yyval));
     (yyval) = (yyvsp[-4]);
   }
-#line 4393 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4423 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 105:
@@ -4397,7 +4427,7 @@
     {
     (yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
   }
-#line 4401 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4431 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 106:
@@ -4412,7 +4442,7 @@
     (yyval)->appendChildren((yyvsp[-1]));
     NEXPAND((yyvsp[-3]), (yyval), (yyvsp[0]));
   }
-#line 4416 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4446 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 107:
@@ -4422,7 +4452,7 @@
     NMORE((yyvsp[-2]), (yyvsp[-3]));
     (yyval) = (yyvsp[-2]);
   }
-#line 4426 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4456 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 108:
@@ -4436,7 +4466,7 @@
     NMORE((yyval), (yyvsp[0]));
     NMORE((yyval), (yyvsp[-4]));
   }
-#line 4440 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4470 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 109:
@@ -4444,7 +4474,7 @@
     {
     (yyval) = NNEW(n_STATEMENT_LIST);
   }
-#line 4448 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4478 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 110:
@@ -4457,7 +4487,7 @@
     (yyvsp[-4])->appendChild((yyvsp[-3]));
     (yyval) = (yyvsp[-4]);
   }
-#line 4461 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4491 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 111:
@@ -4469,7 +4499,7 @@
     (yyvsp[-3])->appendChild((yyvsp[-2]));
     (yyval) = (yyvsp[-3]);
   }
-#line 4473 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4503 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 115:
@@ -4479,7 +4509,7 @@
   NMORE((yyvsp[-2]), (yyvsp[-3]));
   (yyval) = (yyvsp[-2]);
   }
-#line 4483 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4513 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 116:
@@ -4487,7 +4517,7 @@
     {
     (yyval) = NNEW(n_CONDITION_LIST);
   }
-#line 4491 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4521 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 117:
@@ -4499,7 +4529,7 @@
 
     (yyval) = (yyvsp[-5])->appendChild((yyvsp[-4]));
   }
-#line 4503 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4533 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 118:
@@ -4507,7 +4537,7 @@
     {
     (yyval) = NNEW(n_CONDITION_LIST);
   }
-#line 4511 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4541 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 119:
@@ -4519,7 +4549,7 @@
 
     (yyval) = (yyvsp[-6])->appendChild((yyvsp[-5]));
   }
-#line 4523 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4553 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 120:
@@ -4527,7 +4557,7 @@
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 4531 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4561 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 121:
@@ -4537,7 +4567,7 @@
     (yyvsp[-1])->appendChild((yyvsp[0]));
     (yyval) = (yyvsp[-1]);
   }
-#line 4541 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4571 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 122:
@@ -4545,7 +4575,7 @@
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 4549 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4579 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 123:
@@ -4555,7 +4585,7 @@
     (yyvsp[-2])->appendChild((yyvsp[0]));
     (yyval) = (yyvsp[-2]);
   }
-#line 4559 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4589 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 125:
@@ -4563,7 +4593,7 @@
     {
     (yyval) = NNEW(n_DECLARATION_PARAMETER_LIST);
   }
-#line 4567 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4597 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 126:
@@ -4576,7 +4606,7 @@
 
     (yyval) = NNEW(n_DECLARATION_PARAMETER_LIST)->appendChild((yyval));
   }
-#line 4580 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4610 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 127:
@@ -4590,7 +4620,7 @@
 
     (yyval) = NNEW(n_DECLARATION_PARAMETER_LIST)->appendChild((yyval));
   }
-#line 4594 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4624 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 128:
@@ -4604,7 +4634,7 @@
 
     (yyval) = NNEW(n_DECLARATION_PARAMETER_LIST)->appendChild((yyval));
   }
-#line 4608 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4638 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 129:
@@ -4617,7 +4647,7 @@
 
     (yyval) = NNEW(n_DECLARATION_PARAMETER_LIST)->appendChild((yyval));
   }
-#line 4621 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4651 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 130:
@@ -4630,7 +4660,7 @@
 
     (yyval) = (yyvsp[-3])->appendChild((yyval));
   }
-#line 4634 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4664 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 131:
@@ -4644,7 +4674,7 @@
 
     (yyval) = (yyvsp[-4])->appendChild((yyval));
   }
-#line 4648 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4678 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 132:
@@ -4658,7 +4688,7 @@
 
     (yyval) = (yyvsp[-6])->appendChild((yyval));
   }
-#line 4662 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4692 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 133:
@@ -4671,7 +4701,7 @@
 
     (yyval) = (yyvsp[-5])->appendChild((yyval));
   }
-#line 4675 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4705 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 134:
@@ -4680,7 +4710,7 @@
     (yyval) = NTYPE((yyvsp[-1]), n_UNPACK);
     (yyval)->appendChild(NTYPE((yyvsp[0]), n_VARIABLE));
   }
-#line 4684 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4714 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 135:
@@ -4688,7 +4718,7 @@
     {
     (yyval) = NTYPE((yyvsp[0]), n_VARIABLE);
   }
-#line 4692 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4722 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 136:
@@ -4696,136 +4726,156 @@
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 4700 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4730 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 138:
 #line 1073 "parser.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[0]);
+    (yyval) = NNEW(n_TYPE);
+    (yyval)->appendChild(NNEW(n_EMPTY));
+    (yyval)->appendChild((yyvsp[0]));
   }
-#line 4708 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4740 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 139:
-#line 1076 "parser.y" /* yacc.c:1646  */
+#line 1078 "parser.y" /* yacc.c:1646  */
     {
-    (yyval) = NTYPE((yyvsp[0]), n_TYPE_NAME);
+    (yyval) = NNEW(n_TYPE);
+    (yyval)->appendChild((yyvsp[-1]));
+    (yyval)->appendChild((yyvsp[0]));
   }
-#line 4716 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4750 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 140:
-#line 1079 "parser.y" /* yacc.c:1646  */
+#line 1086 "parser.y" /* yacc.c:1646  */
     {
-    (yyval) = NTYPE((yyvsp[0]), n_TYPE_NAME);
+    (yyval) = (yyvsp[0]);
   }
-#line 4724 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4758 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 141:
-#line 1085 "parser.y" /* yacc.c:1646  */
+#line 1089 "parser.y" /* yacc.c:1646  */
     {
-    (yyval) = NNEW(n_EMPTY);
+    (yyval) = NTYPE((yyvsp[0]), n_TYPE_NAME);
   }
-#line 4732 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4766 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 142:
-#line 1088 "parser.y" /* yacc.c:1646  */
+#line 1092 "parser.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[0]);
+    (yyval) = NTYPE((yyvsp[0]), n_TYPE_NAME);
   }
-#line 4740 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4774 "parser.yacc.cpp" /* yacc.c:1646  */
+    break;
+
+  case 143:
+#line 1098 "parser.y" /* yacc.c:1646  */
+    {
+    (yyval) = NNEW(n_EMPTY);
+  }
+#line 4782 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 144:
-#line 1095 "parser.y" /* yacc.c:1646  */
+#line 1101 "parser.y" /* yacc.c:1646  */
+    {
+    (yyval) = (yyvsp[0]);
+  }
+#line 4790 "parser.yacc.cpp" /* yacc.c:1646  */
+    break;
+
+  case 146:
+#line 1108 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CALL_PARAMETER_LIST);
   }
-#line 4748 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4798 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 145:
-#line 1101 "parser.y" /* yacc.c:1646  */
+  case 147:
+#line 1114 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CALL_PARAMETER_LIST)->appendChild((yyvsp[0]));
   }
-#line 4756 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4806 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 146:
-#line 1104 "parser.y" /* yacc.c:1646  */
+  case 148:
+#line 1117 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = (yyvsp[-2])->appendChild((yyvsp[0]));
   }
-#line 4764 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4814 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 148:
-#line 1111 "parser.y" /* yacc.c:1646  */
+  case 150:
+#line 1124 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_UNPACK)->appendChild((yyvsp[-1]));
   }
-#line 4772 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4822 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 149:
-#line 1114 "parser.y" /* yacc.c:1646  */
+  case 151:
+#line 1127 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-1]), n_VARIABLE_REFERENCE);
     (yyval) = (yyvsp[-1])->appendChild((yyvsp[0]));
   }
-#line 4781 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4831 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 150:
-#line 1121 "parser.y" /* yacc.c:1646  */
+  case 152:
+#line 1134 "parser.y" /* yacc.c:1646  */
     {
     (yyvsp[-2])->appendChild((yyvsp[0]));
     (yyval) = (yyvsp[-2]);
   }
-#line 4790 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4840 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 151:
-#line 1125 "parser.y" /* yacc.c:1646  */
+  case 153:
+#line 1138 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_GLOBAL_DECLARATION_LIST);
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 4799 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4849 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 152:
-#line 1132 "parser.y" /* yacc.c:1646  */
+  case 154:
+#line 1145 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_VARIABLE);
   }
-#line 4807 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4857 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 153:
-#line 1135 "parser.y" /* yacc.c:1646  */
+  case 155:
+#line 1148 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[-1]), n_VARIABLE_VARIABLE);
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 4816 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4866 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 154:
-#line 1139 "parser.y" /* yacc.c:1646  */
+  case 156:
+#line 1152 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[-3]), n_VARIABLE_VARIABLE);
     (yyval)->appendChild((yyvsp[-1]));
   }
-#line 4825 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4875 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 155:
-#line 1146 "parser.y" /* yacc.c:1646  */
+  case 157:
+#line 1159 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[0]), n_VARIABLE);
     (yyval) = NNEW(n_STATIC_DECLARATION);
@@ -4834,11 +4884,11 @@
 
     (yyval) = (yyvsp[-2])->appendChild((yyval));
   }
-#line 4838 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4888 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 156:
-#line 1154 "parser.y" /* yacc.c:1646  */
+  case 158:
+#line 1167 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-2]), n_VARIABLE);
     (yyval) = NNEW(n_STATIC_DECLARATION);
@@ -4847,11 +4897,11 @@
 
     (yyval) = (yyvsp[-4])->appendChild((yyval));
   }
-#line 4851 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4901 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 157:
-#line 1162 "parser.y" /* yacc.c:1646  */
+  case 159:
+#line 1175 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[0]), n_VARIABLE);
     (yyval) = NNEW(n_STATIC_DECLARATION);
@@ -4860,11 +4910,11 @@
 
     (yyval) = NNEW(n_STATIC_DECLARATION_LIST)->appendChild((yyval));
   }
-#line 4864 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4914 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 158:
-#line 1170 "parser.y" /* yacc.c:1646  */
+  case 160:
+#line 1183 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-2]), n_VARIABLE);
     (yyval) = NNEW(n_STATIC_DECLARATION);
@@ -4873,27 +4923,27 @@
 
     (yyval) = NNEW(n_STATIC_DECLARATION_LIST)->appendChild((yyval));
   }
-#line 4877 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4927 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 159:
-#line 1181 "parser.y" /* yacc.c:1646  */
+  case 161:
+#line 1194 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = (yyvsp[-1])->appendChild((yyvsp[0]));
   }
-#line 4885 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4935 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 160:
-#line 1184 "parser.y" /* yacc.c:1646  */
+  case 162:
+#line 1197 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_STATEMENT_LIST);
   }
-#line 4893 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4943 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 161:
-#line 1190 "parser.y" /* yacc.c:1646  */
+  case 163:
+#line 1203 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_MEMBER_DECLARATION_LIST);
     (yyval)->appendChild((yyvsp[-2]));
@@ -4902,36 +4952,36 @@
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyval));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 4906 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4956 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 162:
-#line 1198 "parser.y" /* yacc.c:1646  */
+  case 164:
+#line 1211 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 4915 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4965 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 163:
-#line 1202 "parser.y" /* yacc.c:1646  */
+  case 165:
+#line 1215 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = (yyvsp[0]);
   }
-#line 4923 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4973 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 164:
-#line 1205 "parser.y" /* yacc.c:1646  */
+  case 166:
+#line 1218 "parser.y" /* yacc.c:1646  */
     {
     /* empty */
   }
-#line 4931 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4981 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 165:
-#line 1207 "parser.y" /* yacc.c:1646  */
+  case 167:
+#line 1220 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_METHOD_DECLARATION);
     NMORE((yyval), (yyvsp[-8]));
@@ -4945,256 +4995,256 @@
 
     (yyval) = NNEW(n_STATEMENT)->appendChild((yyval));
   }
-#line 4949 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 4999 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 166:
-#line 1223 "parser.y" /* yacc.c:1646  */
+  case 168:
+#line 1236 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[-2]), n_TRAIT_USE);
     (yyval)->appendChildren((yyvsp[-1]));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 4959 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5009 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 167:
-#line 1231 "parser.y" /* yacc.c:1646  */
+  case 169:
+#line 1244 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_TRAIT_USE_LIST)->appendChild((yyvsp[0]));
   }
-#line 4967 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5017 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 168:
-#line 1234 "parser.y" /* yacc.c:1646  */
+  case 170:
+#line 1247 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = (yyvsp[-2])->appendChild((yyvsp[0]));
   }
-#line 4975 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5025 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 169:
-#line 1240 "parser.y" /* yacc.c:1646  */
+  case 171:
+#line 1253 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 4983 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5033 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 170:
-#line 1243 "parser.y" /* yacc.c:1646  */
+  case 172:
+#line 1256 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
   }
-#line 4991 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5041 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 171:
-#line 1249 "parser.y" /* yacc.c:1646  */
+  case 173:
+#line 1262 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_TRAIT_ADAPTATION_LIST);
   }
-#line 4999 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5049 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 172:
-#line 1252 "parser.y" /* yacc.c:1646  */
+  case 174:
+#line 1265 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = (yyvsp[0]);
   }
-#line 5007 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5057 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 173:
-#line 1258 "parser.y" /* yacc.c:1646  */
+  case 175:
+#line 1271 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_TRAIT_ADAPTATION_LIST);
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5016 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5066 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 174:
-#line 1262 "parser.y" /* yacc.c:1646  */
+  case 176:
+#line 1275 "parser.y" /* yacc.c:1646  */
     {
     (yyvsp[-1])->appendChild((yyvsp[0]));
     (yyval) = (yyvsp[-1]);
   }
-#line 5025 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5075 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 175:
-#line 1269 "parser.y" /* yacc.c:1646  */
+  case 177:
+#line 1282 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NMORE((yyvsp[-1]), (yyvsp[0]));
   }
-#line 5033 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5083 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 176:
-#line 1272 "parser.y" /* yacc.c:1646  */
+  case 178:
+#line 1285 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NMORE((yyvsp[-1]), (yyvsp[0]));
   }
-#line 5041 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5091 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 177:
-#line 1278 "parser.y" /* yacc.c:1646  */
+  case 179:
+#line 1291 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_TRAIT_INSTEADOF);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5051 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5101 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 178:
-#line 1286 "parser.y" /* yacc.c:1646  */
+  case 180:
+#line 1299 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_TRAIT_REFERENCE_LIST);
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5060 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5110 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 179:
-#line 1290 "parser.y" /* yacc.c:1646  */
+  case 181:
+#line 1303 "parser.y" /* yacc.c:1646  */
     {
     (yyvsp[-2])->appendChild((yyvsp[0]));
     (yyval) = (yyvsp[-2]);
   }
-#line 5069 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5119 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 180:
-#line 1297 "parser.y" /* yacc.c:1646  */
+  case 182:
+#line 1310 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_TRAIT_METHOD_REFERENCE);
     (yyval)->appendChild(NTYPE((yyvsp[0]), n_STRING));
   }
-#line 5078 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5128 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 181:
-#line 1301 "parser.y" /* yacc.c:1646  */
+  case 183:
+#line 1314 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = (yyvsp[0]);
   }
-#line 5086 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5136 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 182:
-#line 1307 "parser.y" /* yacc.c:1646  */
+  case 184:
+#line 1320 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-1]), n_TRAIT_METHOD_REFERENCE);
     NEXPAND((yyvsp[-2]), (yyvsp[-1]), NTYPE((yyvsp[0]), n_STRING));
     (yyval) = (yyvsp[-1]);
   }
-#line 5096 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5146 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 183:
-#line 1315 "parser.y" /* yacc.c:1646  */
+  case 185:
+#line 1328 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_TRAIT_AS);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-1]));
     (yyval)->appendChild(NTYPE((yyvsp[0]), n_STRING));
   }
-#line 5107 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5157 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 184:
-#line 1321 "parser.y" /* yacc.c:1646  */
+  case 186:
+#line 1334 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_TRAIT_AS);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild((yyvsp[0]));
     (yyval)->appendChild(NNEW(n_EMPTY));
   }
-#line 5118 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5168 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 185:
-#line 1330 "parser.y" /* yacc.c:1646  */
+  case 187:
+#line 1343 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 5126 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5176 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 186:
-#line 1333 "parser.y" /* yacc.c:1646  */
+  case 188:
+#line 1346 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_METHOD_MODIFIER_LIST);
     (yyval)->appendChild(NTYPE((yyvsp[0]), n_STRING));
   }
-#line 5135 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5185 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 187:
-#line 1341 "parser.y" /* yacc.c:1646  */
+  case 189:
+#line 1354 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 5143 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5193 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 188:
-#line 1344 "parser.y" /* yacc.c:1646  */
+  case 190:
+#line 1357 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
   }
-#line 5151 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5201 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 190:
-#line 1351 "parser.y" /* yacc.c:1646  */
+  case 192:
+#line 1364 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_MEMBER_MODIFIER_LIST);
     (yyval)->appendChild(NTYPE((yyvsp[0]), n_STRING));
   }
-#line 5160 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5210 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 191:
-#line 1358 "parser.y" /* yacc.c:1646  */
+  case 193:
+#line 1371 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_METHOD_MODIFIER_LIST);
   }
-#line 5168 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5218 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 192:
-#line 1361 "parser.y" /* yacc.c:1646  */
+  case 194:
+#line 1374 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[0]), n_METHOD_MODIFIER_LIST);
     (yyval) = (yyvsp[0]);
   }
-#line 5177 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5227 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 193:
-#line 1368 "parser.y" /* yacc.c:1646  */
+  case 195:
+#line 1381 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_MEMBER_MODIFIER_LIST);
     (yyval)->appendChild(NTYPE((yyvsp[0]), n_STRING));
   }
-#line 5186 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5236 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 194:
-#line 1372 "parser.y" /* yacc.c:1646  */
+  case 196:
+#line 1385 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = (yyvsp[-1])->appendChild(NTYPE((yyvsp[0]), n_STRING));
   }
-#line 5194 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5244 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 201:
-#line 1387 "parser.y" /* yacc.c:1646  */
+  case 203:
+#line 1400 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_MEMBER_DECLARATION);
     (yyval)->appendChild(NTYPE((yyvsp[0]), n_VARIABLE));
@@ -5202,11 +5252,11 @@
 
     (yyval) = (yyvsp[-2])->appendChild((yyval));
   }
-#line 5206 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5256 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 202:
-#line 1394 "parser.y" /* yacc.c:1646  */
+  case 204:
+#line 1407 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_MEMBER_DECLARATION);
     (yyval)->appendChild(NTYPE((yyvsp[-2]), n_VARIABLE));
@@ -5214,11 +5264,11 @@
 
     (yyval) = (yyvsp[-4])->appendChild((yyval));
   }
-#line 5218 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5268 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 203:
-#line 1401 "parser.y" /* yacc.c:1646  */
+  case 205:
+#line 1414 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_MEMBER_DECLARATION);
     (yyval)->appendChild(NTYPE((yyvsp[0]), n_VARIABLE));
@@ -5226,11 +5276,11 @@
 
     (yyval) = NNEW(n_CLASS_MEMBER_DECLARATION_LIST)->appendChild((yyval));
   }
-#line 5230 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5280 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 204:
-#line 1408 "parser.y" /* yacc.c:1646  */
+  case 206:
+#line 1421 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_MEMBER_DECLARATION);
     (yyval)->appendChild(NTYPE((yyvsp[-2]), n_VARIABLE));
@@ -5238,11 +5288,11 @@
 
     (yyval) = NNEW(n_CLASS_MEMBER_DECLARATION_LIST)->appendChild((yyval));
   }
-#line 5242 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5292 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 205:
-#line 1418 "parser.y" /* yacc.c:1646  */
+  case 207:
+#line 1431 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_CONSTANT_DECLARATION);
     (yyval)->appendChild(NTYPE((yyvsp[-2]), n_STRING));
@@ -5252,11 +5302,11 @@
 
     (yyval) = (yyvsp[-4]);
   }
-#line 5256 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5306 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 206:
-#line 1427 "parser.y" /* yacc.c:1646  */
+  case 208:
+#line 1440 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-3]), n_CLASS_CONSTANT_DECLARATION_LIST);
     (yyval) = NNEW(n_CLASS_CONSTANT_DECLARATION);
@@ -5266,53 +5316,53 @@
 
     (yyval) = (yyvsp[-3]);
   }
-#line 5270 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5320 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 207:
-#line 1439 "parser.y" /* yacc.c:1646  */
+  case 209:
+#line 1452 "parser.y" /* yacc.c:1646  */
     {
     (yyvsp[-2])->appendChild((yyvsp[0]));
   }
-#line 5278 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5328 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 208:
-#line 1442 "parser.y" /* yacc.c:1646  */
+  case 210:
+#line 1455 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ECHO_LIST);
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5287 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5337 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 209:
-#line 1449 "parser.y" /* yacc.c:1646  */
+  case 211:
+#line 1462 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 5295 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5345 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 211:
-#line 1457 "parser.y" /* yacc.c:1646  */
+  case 213:
+#line 1470 "parser.y" /* yacc.c:1646  */
     {
     (yyvsp[-2])->appendChild((yyvsp[0]));
   }
-#line 5303 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5353 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 212:
-#line 1460 "parser.y" /* yacc.c:1646  */
+  case 214:
+#line 1473 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EXPRESSION_LIST);
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5312 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5362 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 213:
-#line 1467 "parser.y" /* yacc.c:1646  */
+  case 215:
+#line 1480 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-5]), n_LIST);
     (yyvsp[-5])->appendChild(NEXPAND((yyvsp[-4]), (yyvsp[-3]), (yyvsp[-2])));
@@ -5321,22 +5371,22 @@
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5325 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5375 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 214:
-#line 1475 "parser.y" /* yacc.c:1646  */
+  case 216:
+#line 1488 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5336 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5386 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 215:
-#line 1481 "parser.y" /* yacc.c:1646  */
+  case 217:
+#line 1494 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-3]));
@@ -5347,11 +5397,11 @@
 
     (yyval)->appendChild((yyvsp[-1]));
   }
-#line 5351 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5401 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 216:
-#line 1491 "parser.y" /* yacc.c:1646  */
+  case 218:
+#line 1504 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-5]));
@@ -5366,270 +5416,270 @@
 
     (yyval)->appendChild((yyvsp[-3]));
   }
-#line 5370 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5420 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 217:
-#line 1505 "parser.y" /* yacc.c:1646  */
+  case 219:
+#line 1518 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5380 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5430 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 218:
-#line 1510 "parser.y" /* yacc.c:1646  */
+  case 220:
+#line 1523 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5391 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5441 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 219:
-#line 1516 "parser.y" /* yacc.c:1646  */
+  case 221:
+#line 1529 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5402 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5452 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 220:
-#line 1522 "parser.y" /* yacc.c:1646  */
+  case 222:
+#line 1535 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5413 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5463 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 221:
-#line 1528 "parser.y" /* yacc.c:1646  */
+  case 223:
+#line 1541 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5424 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5474 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 222:
-#line 1534 "parser.y" /* yacc.c:1646  */
+  case 224:
+#line 1547 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5435 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5485 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 223:
-#line 1540 "parser.y" /* yacc.c:1646  */
+  case 225:
+#line 1553 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5446 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5496 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 224:
-#line 1546 "parser.y" /* yacc.c:1646  */
+  case 226:
+#line 1559 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5457 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5507 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 225:
-#line 1552 "parser.y" /* yacc.c:1646  */
+  case 227:
+#line 1565 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5468 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5518 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 226:
-#line 1558 "parser.y" /* yacc.c:1646  */
+  case 228:
+#line 1571 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5479 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5529 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 227:
-#line 1564 "parser.y" /* yacc.c:1646  */
+  case 229:
+#line 1577 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5490 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5540 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 228:
-#line 1570 "parser.y" /* yacc.c:1646  */
+  case 230:
+#line 1583 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5501 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5551 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 229:
-#line 1576 "parser.y" /* yacc.c:1646  */
+  case 231:
+#line 1589 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_UNARY_POSTFIX_EXPRESSION);
     (yyval)->appendChild((yyvsp[-1]));
     (yyval)->appendChild(NTYPE((yyvsp[0]), n_OPERATOR));
   }
-#line 5511 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5561 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 230:
-#line 1581 "parser.y" /* yacc.c:1646  */
+  case 232:
+#line 1594 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5521 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5571 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 231:
-#line 1586 "parser.y" /* yacc.c:1646  */
+  case 233:
+#line 1599 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_UNARY_POSTFIX_EXPRESSION);
     (yyval)->appendChild((yyvsp[-1]));
     (yyval)->appendChild(NTYPE((yyvsp[0]), n_OPERATOR));
   }
-#line 5531 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5581 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 232:
-#line 1591 "parser.y" /* yacc.c:1646  */
+  case 234:
+#line 1604 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5541 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5591 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 233:
-#line 1596 "parser.y" /* yacc.c:1646  */
+  case 235:
+#line 1609 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5552 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5602 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 234:
-#line 1602 "parser.y" /* yacc.c:1646  */
+  case 236:
+#line 1615 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5563 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5613 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 235:
-#line 1608 "parser.y" /* yacc.c:1646  */
+  case 237:
+#line 1621 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5574 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5624 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 236:
-#line 1614 "parser.y" /* yacc.c:1646  */
+  case 238:
+#line 1627 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5585 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5635 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 237:
-#line 1620 "parser.y" /* yacc.c:1646  */
+  case 239:
+#line 1633 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5596 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5646 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 238:
-#line 1626 "parser.y" /* yacc.c:1646  */
+  case 240:
+#line 1639 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5607 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5657 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 239:
-#line 1632 "parser.y" /* yacc.c:1646  */
+  case 241:
+#line 1645 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5618 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5668 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 240:
-#line 1638 "parser.y" /* yacc.c:1646  */
+  case 242:
+#line 1651 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5629 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5679 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 241:
-#line 1644 "parser.y" /* yacc.c:1646  */
+  case 243:
+#line 1657 "parser.y" /* yacc.c:1646  */
     {
 
     /* The concatenation operator generates n_CONCATENATION_LIST instead of
@@ -5656,238 +5706,238 @@
       (yyval)->appendChild((yyvsp[0]));
     }
   }
-#line 5660 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5710 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 242:
-#line 1670 "parser.y" /* yacc.c:1646  */
+  case 244:
+#line 1683 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5671 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5721 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 243:
-#line 1676 "parser.y" /* yacc.c:1646  */
+  case 245:
+#line 1689 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5682 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5732 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 244:
-#line 1682 "parser.y" /* yacc.c:1646  */
+  case 246:
+#line 1695 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5693 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5743 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 245:
-#line 1688 "parser.y" /* yacc.c:1646  */
+  case 247:
+#line 1701 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5704 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5754 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 246:
-#line 1694 "parser.y" /* yacc.c:1646  */
+  case 248:
+#line 1707 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5715 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5765 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 247:
-#line 1700 "parser.y" /* yacc.c:1646  */
+  case 249:
+#line 1713 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5726 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5776 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 248:
-#line 1706 "parser.y" /* yacc.c:1646  */
+  case 250:
+#line 1719 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5737 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5787 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 249:
-#line 1712 "parser.y" /* yacc.c:1646  */
+  case 251:
+#line 1725 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5747 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5797 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 250:
-#line 1717 "parser.y" /* yacc.c:1646  */
+  case 252:
+#line 1730 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5757 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5807 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 251:
-#line 1722 "parser.y" /* yacc.c:1646  */
+  case 253:
+#line 1735 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5767 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5817 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 252:
-#line 1727 "parser.y" /* yacc.c:1646  */
+  case 254:
+#line 1740 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5777 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5827 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 253:
-#line 1732 "parser.y" /* yacc.c:1646  */
+  case 255:
+#line 1745 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5788 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5838 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 254:
-#line 1738 "parser.y" /* yacc.c:1646  */
+  case 256:
+#line 1751 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5799 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5849 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 255:
-#line 1744 "parser.y" /* yacc.c:1646  */
+  case 257:
+#line 1757 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5810 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5860 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 256:
-#line 1750 "parser.y" /* yacc.c:1646  */
+  case 258:
+#line 1763 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5821 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5871 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 257:
-#line 1756 "parser.y" /* yacc.c:1646  */
+  case 259:
+#line 1769 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5832 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5882 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 258:
-#line 1762 "parser.y" /* yacc.c:1646  */
+  case 260:
+#line 1775 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5843 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5893 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 259:
-#line 1768 "parser.y" /* yacc.c:1646  */
+  case 261:
+#line 1781 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5854 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5904 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 260:
-#line 1774 "parser.y" /* yacc.c:1646  */
+  case 262:
+#line 1787 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5865 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5915 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 261:
-#line 1780 "parser.y" /* yacc.c:1646  */
+  case 263:
+#line 1793 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5876 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5926 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 262:
-#line 1786 "parser.y" /* yacc.c:1646  */
+  case 264:
+#line 1799 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5887 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5937 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 265:
-#line 1794 "parser.y" /* yacc.c:1646  */
+  case 267:
+#line 1807 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_TERNARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-4]));
@@ -5896,11 +5946,11 @@
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5900 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5950 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 266:
-#line 1802 "parser.y" /* yacc.c:1646  */
+  case 268:
+#line 1815 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_TERNARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-3]));
@@ -5909,142 +5959,142 @@
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5913 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5963 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 267:
-#line 1810 "parser.y" /* yacc.c:1646  */
+  case 269:
+#line 1823 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_BINARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5924 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5974 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 269:
-#line 1817 "parser.y" /* yacc.c:1646  */
+  case 271:
+#line 1830 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CAST_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5934 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5984 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 270:
-#line 1822 "parser.y" /* yacc.c:1646  */
+  case 272:
+#line 1835 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CAST_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5944 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5994 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 271:
-#line 1827 "parser.y" /* yacc.c:1646  */
+  case 273:
+#line 1840 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CAST_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5954 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6004 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 272:
-#line 1832 "parser.y" /* yacc.c:1646  */
+  case 274:
+#line 1845 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CAST_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5964 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6014 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 273:
-#line 1837 "parser.y" /* yacc.c:1646  */
+  case 275:
+#line 1850 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CAST_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5974 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6024 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 274:
-#line 1842 "parser.y" /* yacc.c:1646  */
+  case 276:
+#line 1855 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CAST_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5984 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6034 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 275:
-#line 1847 "parser.y" /* yacc.c:1646  */
+  case 277:
+#line 1860 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CAST_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5994 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6044 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 276:
-#line 1852 "parser.y" /* yacc.c:1646  */
+  case 278:
+#line 1865 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 6004 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6054 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 277:
-#line 1857 "parser.y" /* yacc.c:1646  */
+  case 279:
+#line 1870 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 6014 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6064 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 278:
-#line 1862 "parser.y" /* yacc.c:1646  */
+  case 280:
+#line 1875 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[0]), n_BACKTICKS_EXPRESSION);
     (yyval) = (yyvsp[0]);
   }
-#line 6023 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6073 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 282:
-#line 1869 "parser.y" /* yacc.c:1646  */
+  case 284:
+#line 1882 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 6033 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6083 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 283:
-#line 1874 "parser.y" /* yacc.c:1646  */
+  case 285:
+#line 1887 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[0]), n_YIELD);
     (yyvsp[0])->appendChild(NNEW(n_EMPTY));
     (yyvsp[0])->appendChild(NNEW(n_EMPTY));
     (yyval) = (yyvsp[0]);
   }
-#line 6044 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6094 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 284:
-#line 1883 "parser.y" /* yacc.c:1646  */
+  case 286:
+#line 1896 "parser.y" /* yacc.c:1646  */
     {
     NSPAN((yyvsp[-9]), n_FUNCTION_DECLARATION, (yyvsp[-1]));
     (yyvsp[-9])->appendChild(NNEW(n_EMPTY));
@@ -6057,11 +6107,11 @@
 
     (yyval) = (yyvsp[-9]);
   }
-#line 6061 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6111 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 285:
-#line 1898 "parser.y" /* yacc.c:1646  */
+  case 287:
+#line 1911 "parser.y" /* yacc.c:1646  */
     {
     NSPAN((yyvsp[-9]), n_FUNCTION_DECLARATION, (yyvsp[-1]));
     NMORE((yyvsp[-9]), (yyvsp[-10]));
@@ -6080,143 +6130,143 @@
 
     (yyval) = (yyvsp[-9]);
   }
-#line 6084 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6134 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 286:
-#line 1919 "parser.y" /* yacc.c:1646  */
+  case 288:
+#line 1932 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-1]), n_YIELD);
     (yyvsp[0])->appendChild(NNEW(n_EMPTY));
     (yyvsp[-1])->appendChild((yyvsp[0]));
     (yyval) = (yyvsp[-1]);
   }
-#line 6095 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6145 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 287:
-#line 1925 "parser.y" /* yacc.c:1646  */
+  case 289:
+#line 1938 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-1]), n_YIELD);
     (yyvsp[0])->appendChild(NNEW(n_EMPTY));
     (yyvsp[-1])->appendChild((yyvsp[0]));
     (yyval) = (yyvsp[-1]);
   }
-#line 6106 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6156 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 288:
-#line 1931 "parser.y" /* yacc.c:1646  */
+  case 290:
+#line 1944 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-3]), n_YIELD);
     (yyvsp[-3])->appendChild((yyvsp[-2]));
     (yyvsp[-3])->appendChild((yyvsp[0]));
     (yyval) = (yyvsp[-3]);
   }
-#line 6117 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6167 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 289:
-#line 1937 "parser.y" /* yacc.c:1646  */
+  case 291:
+#line 1950 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-3]), n_YIELD);
     (yyvsp[-3])->appendChild((yyvsp[-2]));
     (yyvsp[-3])->appendChild((yyvsp[0]));
     (yyval) = (yyvsp[-3]);
   }
-#line 6128 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6178 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 291:
-#line 1950 "parser.y" /* yacc.c:1646  */
+  case 293:
+#line 1963 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 6136 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6186 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 292:
-#line 1953 "parser.y" /* yacc.c:1646  */
+  case 294:
+#line 1966 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-3]), n_LEXICAL_VARIABLE_LIST);
     (yyvsp[-3])->appendChildren((yyvsp[-1]));
     (yyval) = (yyvsp[-3]);
   }
-#line 6146 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6196 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 293:
-#line 1961 "parser.y" /* yacc.c:1646  */
+  case 295:
+#line 1974 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = (yyvsp[-2])->appendChild(NTYPE((yyvsp[0]), n_VARIABLE));
   }
-#line 6154 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6204 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 294:
-#line 1964 "parser.y" /* yacc.c:1646  */
+  case 296:
+#line 1977 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-1]), n_VARIABLE_REFERENCE);
     (yyvsp[-1])->appendChild(NTYPE((yyvsp[0]), n_VARIABLE));
     (yyval) = (yyvsp[-3])->appendChild((yyvsp[-1]));
   }
-#line 6164 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6214 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 295:
-#line 1969 "parser.y" /* yacc.c:1646  */
+  case 297:
+#line 1982 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_LEXICAL_VARIABLE_LIST);
     (yyval)->appendChild(NTYPE((yyvsp[0]), n_VARIABLE));
   }
-#line 6173 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6223 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 296:
-#line 1973 "parser.y" /* yacc.c:1646  */
+  case 298:
+#line 1986 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-1]), n_VARIABLE_REFERENCE);
     (yyvsp[-1])->appendChild(NTYPE((yyvsp[0]), n_VARIABLE));
     (yyval) = NNEW(n_LEXICAL_VARIABLE_LIST);
     (yyval)->appendChild((yyvsp[-1]));
   }
-#line 6184 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6234 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 297:
-#line 1982 "parser.y" /* yacc.c:1646  */
+  case 299:
+#line 1995 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_FUNCTION_CALL);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
   }
-#line 6194 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6244 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 298:
-#line 1988 "parser.y" /* yacc.c:1646  */
+  case 300:
+#line 2001 "parser.y" /* yacc.c:1646  */
     {
     NMORE((yyvsp[-3]), (yyvsp[-5]));
     (yyval) = NNEW(n_FUNCTION_CALL);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
   }
-#line 6205 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6255 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 299:
-#line 1994 "parser.y" /* yacc.c:1646  */
+  case 301:
+#line 2007 "parser.y" /* yacc.c:1646  */
     {
     NMORE((yyvsp[-3]), (yyvsp[-4]));
     (yyval) = NNEW(n_FUNCTION_CALL);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
   }
-#line 6216 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6266 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 300:
-#line 2001 "parser.y" /* yacc.c:1646  */
+  case 302:
+#line 2014 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_STATIC_ACCESS);
     (yyval)->appendChild((yyvsp[-5]));
@@ -6225,11 +6275,11 @@
     (yyval) = NNEW(n_FUNCTION_CALL)->appendChild((yyval));
     (yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
   }
-#line 6229 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6279 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 301:
-#line 2010 "parser.y" /* yacc.c:1646  */
+  case 303:
+#line 2023 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_STATIC_ACCESS);
     (yyval)->appendChild((yyvsp[-5]));
@@ -6238,11 +6288,11 @@
     (yyval) = NNEW(n_FUNCTION_CALL)->appendChild((yyval));
     (yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
   }
-#line 6242 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6292 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 302:
-#line 2019 "parser.y" /* yacc.c:1646  */
+  case 304:
+#line 2032 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_STATIC_ACCESS);
     (yyval)->appendChild((yyvsp[-5]));
@@ -6251,11 +6301,11 @@
     (yyval) = NNEW(n_FUNCTION_CALL)->appendChild((yyval));
     (yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
   }
-#line 6255 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6305 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 303:
-#line 2028 "parser.y" /* yacc.c:1646  */
+  case 305:
+#line 2041 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_STATIC_ACCESS);
     (yyval)->appendChild((yyvsp[-5]));
@@ -6264,81 +6314,81 @@
     (yyval) = NNEW(n_FUNCTION_CALL)->appendChild((yyval));
     (yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
   }
-#line 6268 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6318 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 304:
-#line 2036 "parser.y" /* yacc.c:1646  */
+  case 306:
+#line 2049 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_FUNCTION_CALL);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
   }
-#line 6278 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6328 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 305:
-#line 2044 "parser.y" /* yacc.c:1646  */
+  case 307:
+#line 2057 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
   }
-#line 6286 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6336 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 306:
-#line 2047 "parser.y" /* yacc.c:1646  */
+  case 308:
+#line 2060 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
   }
-#line 6294 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6344 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 307:
-#line 2050 "parser.y" /* yacc.c:1646  */
+  case 309:
+#line 2063 "parser.y" /* yacc.c:1646  */
     {
     NMORE((yyvsp[0]), (yyvsp[-2]));
     (yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
   }
-#line 6303 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6353 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 308:
-#line 2054 "parser.y" /* yacc.c:1646  */
+  case 310:
+#line 2067 "parser.y" /* yacc.c:1646  */
     {
     NMORE((yyvsp[0]), (yyvsp[-1]));
     (yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
   }
-#line 6312 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6362 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 309:
-#line 2061 "parser.y" /* yacc.c:1646  */
+  case 311:
+#line 2074 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
   }
-#line 6320 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6370 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 310:
-#line 2064 "parser.y" /* yacc.c:1646  */
+  case 312:
+#line 2077 "parser.y" /* yacc.c:1646  */
     {
     NMORE((yyvsp[0]), (yyvsp[-2]));
     (yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
   }
-#line 6329 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6379 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 311:
-#line 2068 "parser.y" /* yacc.c:1646  */
+  case 313:
+#line 2081 "parser.y" /* yacc.c:1646  */
     {
     NMORE((yyvsp[0]), (yyvsp[-1]));
     (yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
   }
-#line 6338 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6388 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 314:
-#line 2083 "parser.y" /* yacc.c:1646  */
+  case 316:
+#line 2096 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_OBJECT_PROPERTY_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
@@ -6351,282 +6401,282 @@
       (yyval)->appendChild(*ii);
     }
   }
-#line 6355 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6405 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 316:
-#line 2099 "parser.y" /* yacc.c:1646  */
+  case 318:
+#line 2112 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = (yyvsp[-1])->appendChild((yyvsp[0]));
   }
-#line 6363 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6413 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 317:
-#line 2102 "parser.y" /* yacc.c:1646  */
+  case 319:
+#line 2115 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 6371 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6421 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 318:
-#line 2108 "parser.y" /* yacc.c:1646  */
+  case 320:
+#line 2121 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = (yyvsp[0]);
   }
-#line 6379 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6429 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 319:
-#line 2114 "parser.y" /* yacc.c:1646  */
+  case 321:
+#line 2127 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 6387 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6437 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 320:
-#line 2117 "parser.y" /* yacc.c:1646  */
+  case 322:
+#line 2130 "parser.y" /* yacc.c:1646  */
     {
     NSPAN((yyvsp[-1]), n_EMPTY, (yyvsp[0]));
     (yyval) = (yyvsp[-1]);
   }
-#line 6396 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6446 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 321:
-#line 2121 "parser.y" /* yacc.c:1646  */
+  case 323:
+#line 2134 "parser.y" /* yacc.c:1646  */
     {
     NSPAN((yyvsp[-2]), n_PARENTHETICAL_EXPRESSION, (yyvsp[0]));
     (yyvsp[-2])->appendChild((yyvsp[-1]));
     (yyval) = (yyvsp[-2]);
   }
-#line 6406 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6456 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 322:
-#line 2129 "parser.y" /* yacc.c:1646  */
+  case 324:
+#line 2142 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 6414 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6464 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 323:
-#line 2132 "parser.y" /* yacc.c:1646  */
+  case 325:
+#line 2145 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
   }
-#line 6422 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6472 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 324:
-#line 2138 "parser.y" /* yacc.c:1646  */
+  case 326:
+#line 2151 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_NUMERIC_SCALAR);
   }
-#line 6430 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6480 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 325:
-#line 2141 "parser.y" /* yacc.c:1646  */
+  case 327:
+#line 2154 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_NUMERIC_SCALAR);
   }
-#line 6438 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6488 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 326:
-#line 2144 "parser.y" /* yacc.c:1646  */
+  case 328:
+#line 2157 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_STRING_SCALAR);
   }
-#line 6446 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6496 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 327:
-#line 2147 "parser.y" /* yacc.c:1646  */
+  case 329:
+#line 2160 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
   }
-#line 6454 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6504 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 328:
-#line 2150 "parser.y" /* yacc.c:1646  */
+  case 330:
+#line 2163 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
   }
-#line 6462 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6512 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 329:
-#line 2153 "parser.y" /* yacc.c:1646  */
+  case 331:
+#line 2166 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
   }
-#line 6470 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6520 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 330:
-#line 2156 "parser.y" /* yacc.c:1646  */
+  case 332:
+#line 2169 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
   }
-#line 6478 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6528 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 331:
-#line 2159 "parser.y" /* yacc.c:1646  */
+  case 333:
+#line 2172 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
   }
-#line 6486 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6536 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 332:
-#line 2162 "parser.y" /* yacc.c:1646  */
+  case 334:
+#line 2175 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
   }
-#line 6494 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6544 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 333:
-#line 2165 "parser.y" /* yacc.c:1646  */
+  case 335:
+#line 2178 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
   }
-#line 6502 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6552 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 334:
-#line 2168 "parser.y" /* yacc.c:1646  */
+  case 336:
+#line 2181 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
   }
-#line 6510 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6560 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 335:
-#line 2171 "parser.y" /* yacc.c:1646  */
+  case 337:
+#line 2184 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_HEREDOC);
   }
-#line 6518 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6568 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 338:
-#line 2179 "parser.y" /* yacc.c:1646  */
+  case 340:
+#line 2192 "parser.y" /* yacc.c:1646  */
     {
     NMORE((yyvsp[0]), (yyvsp[-2]));
     (yyval) = (yyvsp[0]);
   }
-#line 6527 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6577 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 339:
-#line 2183 "parser.y" /* yacc.c:1646  */
+  case 341:
+#line 2196 "parser.y" /* yacc.c:1646  */
     {
     NMORE((yyvsp[0]), (yyvsp[-1]));
     (yyval) = (yyvsp[0]);
   }
-#line 6536 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6586 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 340:
-#line 2187 "parser.y" /* yacc.c:1646  */
+  case 342:
+#line 2200 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 6546 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6596 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 341:
-#line 2192 "parser.y" /* yacc.c:1646  */
+  case 343:
+#line 2205 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 6556 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6606 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 342:
-#line 2197 "parser.y" /* yacc.c:1646  */
+  case 344:
+#line 2210 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-3]), n_ARRAY_LITERAL);
     (yyvsp[-3])->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
     (yyval) = (yyvsp[-3]);
   }
-#line 6566 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6616 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 343:
-#line 2202 "parser.y" /* yacc.c:1646  */
+  case 345:
+#line 2215 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-2]), n_ARRAY_LITERAL);
     (yyvsp[-2])->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
     (yyval) = (yyvsp[-2]);
   }
-#line 6576 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6626 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 345:
-#line 2211 "parser.y" /* yacc.c:1646  */
+  case 347:
+#line 2224 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_STATIC_ACCESS);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[0]), n_STRING));
   }
-#line 6586 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6636 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 349:
-#line 2222 "parser.y" /* yacc.c:1646  */
+  case 351:
+#line 2235 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NMORE((yyvsp[0]), (yyvsp[-2]));
   }
-#line 6594 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6644 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 350:
-#line 2225 "parser.y" /* yacc.c:1646  */
+  case 352:
+#line 2238 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NMORE((yyvsp[0]), (yyvsp[-1]));
   }
-#line 6602 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6652 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 352:
-#line 2232 "parser.y" /* yacc.c:1646  */
+  case 354:
+#line 2245 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE_LIST);
   }
-#line 6610 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6660 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 353:
-#line 2235 "parser.y" /* yacc.c:1646  */
+  case 355:
+#line 2248 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NMORE((yyvsp[-1]), (yyvsp[0]));
   }
-#line 6618 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6668 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 354:
-#line 2241 "parser.y" /* yacc.c:1646  */
+  case 356:
+#line 2254 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 6626 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6676 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 356:
-#line 2252 "parser.y" /* yacc.c:1646  */
+  case 358:
+#line 2265 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild((yyvsp[-2]));
@@ -6634,11 +6684,11 @@
 
     (yyval) = (yyvsp[-4])->appendChild((yyval));
   }
-#line 6638 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6688 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 357:
-#line 2259 "parser.y" /* yacc.c:1646  */
+  case 359:
+#line 2272 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild(NNEW(n_EMPTY));
@@ -6646,11 +6696,11 @@
 
     (yyval) = (yyvsp[-2])->appendChild((yyval));
   }
-#line 6650 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6700 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 358:
-#line 2266 "parser.y" /* yacc.c:1646  */
+  case 360:
+#line 2279 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild((yyvsp[-2]));
@@ -6658,11 +6708,11 @@
 
     (yyval) = NNEW(n_ARRAY_VALUE_LIST)->appendChild((yyval));
   }
-#line 6662 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6712 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 359:
-#line 2273 "parser.y" /* yacc.c:1646  */
+  case 361:
+#line 2286 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild(NNEW(n_EMPTY));
@@ -6670,11 +6720,11 @@
 
     (yyval) = NNEW(n_ARRAY_VALUE_LIST)->appendChild((yyval));
   }
-#line 6674 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6724 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 365:
-#line 2303 "parser.y" /* yacc.c:1646  */
+  case 367:
+#line 2316 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_OBJECT_PROPERTY_ACCESS);
     (yyval)->appendChild((yyvsp[-4]));
@@ -6698,27 +6748,27 @@
       }
     }
   }
-#line 6702 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6752 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 367:
-#line 2330 "parser.y" /* yacc.c:1646  */
+  case 369:
+#line 2343 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = (yyvsp[-1])->appendChildren((yyvsp[0]));
   }
-#line 6710 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6760 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 368:
-#line 2333 "parser.y" /* yacc.c:1646  */
+  case 370:
+#line 2346 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 6718 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6768 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 369:
-#line 2339 "parser.y" /* yacc.c:1646  */
+  case 371:
+#line 2352 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
     (yyval)->appendChild((yyvsp[-1]));
@@ -6726,49 +6776,49 @@
       (yyval)->appendChild((yyvsp[0]));
     }
   }
-#line 6730 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6780 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 370:
-#line 2349 "parser.y" /* yacc.c:1646  */
+  case 372:
+#line 2362 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 6741 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6791 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 371:
-#line 2355 "parser.y" /* yacc.c:1646  */
+  case 373:
+#line 2368 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 6752 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6802 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 372:
-#line 2364 "parser.y" /* yacc.c:1646  */
+  case 374:
+#line 2377 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
   }
-#line 6760 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6810 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 375:
-#line 2372 "parser.y" /* yacc.c:1646  */
+  case 377:
+#line 2385 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 6768 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6818 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 377:
-#line 2379 "parser.y" /* yacc.c:1646  */
+  case 379:
+#line 2392 "parser.y" /* yacc.c:1646  */
     {
     xhpast::Node *last = (yyvsp[-1]);
     NMORE((yyvsp[-1]), (yyvsp[0]));
@@ -6781,61 +6831,61 @@
 
     (yyval) = (yyvsp[-1]);
   }
-#line 6785 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6835 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 378:
-#line 2394 "parser.y" /* yacc.c:1646  */
+  case 380:
+#line 2407 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_STATIC_ACCESS);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 6795 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6845 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 379:
-#line 2399 "parser.y" /* yacc.c:1646  */
+  case 381:
+#line 2412 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_STATIC_ACCESS);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 6805 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6855 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 381:
-#line 2411 "parser.y" /* yacc.c:1646  */
+  case 383:
+#line 2424 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 6816 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6866 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 382:
-#line 2417 "parser.y" /* yacc.c:1646  */
+  case 384:
+#line 2430 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 6827 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6877 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 387:
-#line 2433 "parser.y" /* yacc.c:1646  */
+  case 389:
+#line 2446 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
   }
-#line 6835 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6885 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 388:
-#line 2436 "parser.y" /* yacc.c:1646  */
+  case 390:
+#line 2449 "parser.y" /* yacc.c:1646  */
     {
     xhpast::Node *last = (yyvsp[-1]);
     NMORE((yyvsp[-1]), (yyvsp[0]));
@@ -6848,114 +6898,114 @@
 
     (yyval) = (yyvsp[-1]);
   }
-#line 6852 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6902 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 390:
-#line 2452 "parser.y" /* yacc.c:1646  */
+  case 392:
+#line 2465 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 6863 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6913 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 391:
-#line 2458 "parser.y" /* yacc.c:1646  */
+  case 393:
+#line 2471 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 6874 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6924 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 393:
-#line 2468 "parser.y" /* yacc.c:1646  */
+  case 395:
+#line 2481 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[0]), n_VARIABLE);
   }
-#line 6882 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6932 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 394:
-#line 2471 "parser.y" /* yacc.c:1646  */
+  case 396:
+#line 2484 "parser.y" /* yacc.c:1646  */
     {
     NSPAN((yyvsp[-3]), n_VARIABLE_EXPRESSION, (yyvsp[0]));
     (yyvsp[-3])->appendChild((yyvsp[-1]));
     (yyval) = (yyvsp[-3]);
   }
-#line 6892 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6942 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 395:
-#line 2479 "parser.y" /* yacc.c:1646  */
+  case 397:
+#line 2492 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 6900 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6950 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 396:
-#line 2482 "parser.y" /* yacc.c:1646  */
+  case 398:
+#line 2495 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = (yyvsp[0]);
   }
-#line 6908 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6958 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 399:
-#line 2493 "parser.y" /* yacc.c:1646  */
+  case 401:
+#line 2506 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 6919 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6969 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 400:
-#line 2499 "parser.y" /* yacc.c:1646  */
+  case 402:
+#line 2512 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 6930 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6980 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 402:
-#line 2509 "parser.y" /* yacc.c:1646  */
+  case 404:
+#line 2522 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[0]), n_STRING);
     (yyval) = (yyvsp[0]);
   }
-#line 6939 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6989 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 403:
-#line 2513 "parser.y" /* yacc.c:1646  */
+  case 405:
+#line 2526 "parser.y" /* yacc.c:1646  */
     {
   (yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
   }
-#line 6947 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6997 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 404:
-#line 2519 "parser.y" /* yacc.c:1646  */
+  case 406:
+#line 2532 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_VARIABLE_VARIABLE);
   }
-#line 6955 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7005 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 405:
-#line 2522 "parser.y" /* yacc.c:1646  */
+  case 407:
+#line 2535 "parser.y" /* yacc.c:1646  */
     {
     (yyvsp[0]) = NTYPE((yyvsp[0]), n_VARIABLE_VARIABLE);
 
@@ -6968,61 +7018,61 @@
 
     (yyval) = (yyvsp[-1]);
   }
-#line 6972 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7022 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 406:
-#line 2537 "parser.y" /* yacc.c:1646  */
+  case 408:
+#line 2550 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = (yyvsp[-2])->appendChild((yyvsp[0]));
   }
-#line 6980 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7030 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 407:
-#line 2540 "parser.y" /* yacc.c:1646  */
+  case 409:
+#line 2553 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ASSIGNMENT_LIST);
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 6989 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7039 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 409:
-#line 2548 "parser.y" /* yacc.c:1646  */
+  case 411:
+#line 2561 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_LIST);
     (yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
   }
-#line 6998 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7048 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 410:
-#line 2552 "parser.y" /* yacc.c:1646  */
+  case 412:
+#line 2565 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 7006 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7056 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 411:
-#line 2558 "parser.y" /* yacc.c:1646  */
+  case 413:
+#line 2571 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE_LIST);
   }
-#line 7014 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7064 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 412:
-#line 2561 "parser.y" /* yacc.c:1646  */
+  case 414:
+#line 2574 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NMORE((yyvsp[-1]), (yyvsp[0]));
   }
-#line 7022 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7072 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 413:
-#line 2567 "parser.y" /* yacc.c:1646  */
+  case 415:
+#line 2580 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild((yyvsp[-2]));
@@ -7030,11 +7080,11 @@
 
     (yyval) = (yyvsp[-4])->appendChild((yyval));
   }
-#line 7034 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7084 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 414:
-#line 2574 "parser.y" /* yacc.c:1646  */
+  case 416:
+#line 2587 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild(NNEW(n_EMPTY));
@@ -7042,11 +7092,11 @@
 
     (yyval) = (yyvsp[-2])->appendChild((yyval));
   }
-#line 7046 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7096 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 415:
-#line 2581 "parser.y" /* yacc.c:1646  */
+  case 417:
+#line 2594 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild((yyvsp[-2]));
@@ -7054,11 +7104,11 @@
 
     (yyval) = NNEW(n_ARRAY_VALUE_LIST)->appendChild((yyval));
   }
-#line 7058 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7108 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 416:
-#line 2588 "parser.y" /* yacc.c:1646  */
+  case 418:
+#line 2601 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild(NNEW(n_EMPTY));
@@ -7066,11 +7116,11 @@
 
     (yyval) = NNEW(n_ARRAY_VALUE_LIST)->appendChild((yyval));
   }
-#line 7070 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7120 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 417:
-#line 2595 "parser.y" /* yacc.c:1646  */
+  case 419:
+#line 2608 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild((yyvsp[-3]));
@@ -7078,11 +7128,11 @@
 
     (yyval) = (yyvsp[-5])->appendChild((yyval));
   }
-#line 7082 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7132 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 418:
-#line 2602 "parser.y" /* yacc.c:1646  */
+  case 420:
+#line 2615 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild(NNEW(n_EMPTY));
@@ -7090,11 +7140,11 @@
 
     (yyval) = (yyvsp[-3])->appendChild((yyval));
   }
-#line 7094 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7144 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 419:
-#line 2609 "parser.y" /* yacc.c:1646  */
+  case 421:
+#line 2622 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild((yyvsp[-3]));
@@ -7102,11 +7152,11 @@
 
     (yyval) = NNEW(n_ARRAY_VALUE_LIST)->appendChild((yyval));
   }
-#line 7106 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7156 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 420:
-#line 2616 "parser.y" /* yacc.c:1646  */
+  case 422:
+#line 2629 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild(NNEW(n_EMPTY));
@@ -7114,11 +7164,11 @@
 
     (yyval) = NNEW(n_ARRAY_VALUE_LIST)->appendChild((yyval));
   }
-#line 7118 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7168 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 421:
-#line 2626 "parser.y" /* yacc.c:1646  */
+  case 423:
+#line 2639 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-3]), n_SYMBOL_NAME);
 
@@ -7129,11 +7179,11 @@
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-2]));
   }
-#line 7133 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7183 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 422:
-#line 2636 "parser.y" /* yacc.c:1646  */
+  case 424:
+#line 2649 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-3]), n_SYMBOL_NAME);
 
@@ -7144,27 +7194,27 @@
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-2]));
   }
-#line 7148 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7198 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 423:
-#line 2646 "parser.y" /* yacc.c:1646  */
+  case 425:
+#line 2659 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[-1]), n_INCLUDE_FILE)->appendChild((yyvsp[0]));
   }
-#line 7156 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7206 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 424:
-#line 2649 "parser.y" /* yacc.c:1646  */
+  case 426:
+#line 2662 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[-1]), n_INCLUDE_FILE)->appendChild((yyvsp[0]));
   }
-#line 7164 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7214 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 425:
-#line 2652 "parser.y" /* yacc.c:1646  */
+  case 427:
+#line 2665 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-3]), n_SYMBOL_NAME);
 
@@ -7175,168 +7225,168 @@
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-2]));
   }
-#line 7179 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7229 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 426:
-#line 2662 "parser.y" /* yacc.c:1646  */
+  case 428:
+#line 2675 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[-1]), n_INCLUDE_FILE)->appendChild((yyvsp[0]));
   }
-#line 7187 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7237 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 427:
-#line 2665 "parser.y" /* yacc.c:1646  */
+  case 429:
+#line 2678 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[-1]), n_INCLUDE_FILE)->appendChild((yyvsp[0]));
   }
-#line 7195 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7245 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 428:
-#line 2671 "parser.y" /* yacc.c:1646  */
+  case 430:
+#line 2684 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 7204 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7254 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 429:
-#line 2675 "parser.y" /* yacc.c:1646  */
+  case 431:
+#line 2688 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = (yyvsp[-2])->appendChild((yyvsp[0]));
   }
-#line 7212 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7262 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 430:
-#line 2681 "parser.y" /* yacc.c:1646  */
+  case 432:
+#line 2694 "parser.y" /* yacc.c:1646  */
     {
     NSPAN((yyvsp[-2]), n_PARENTHETICAL_EXPRESSION, (yyvsp[0]));
     (yyvsp[-2])->appendChild((yyvsp[-1]));
     (yyval) = (yyvsp[-2]);
   }
-#line 7222 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7272 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 431:
-#line 2686 "parser.y" /* yacc.c:1646  */
+  case 433:
+#line 2699 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
   }
-#line 7230 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7280 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 432:
-#line 2692 "parser.y" /* yacc.c:1646  */
+  case 434:
+#line 2705 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 7241 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7291 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 433:
-#line 2698 "parser.y" /* yacc.c:1646  */
+  case 435:
+#line 2711 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 7252 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7302 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 434:
-#line 2704 "parser.y" /* yacc.c:1646  */
+  case 436:
+#line 2717 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild(NTYPE((yyvsp[-3]), n_STRING_SCALAR));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 7263 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7313 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 435:
-#line 2710 "parser.y" /* yacc.c:1646  */
+  case 437:
+#line 2723 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 7274 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7324 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 436:
-#line 2716 "parser.y" /* yacc.c:1646  */
+  case 438:
+#line 2729 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild(NTYPE((yyvsp[-3]), n_STRING));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 7285 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7335 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 437:
-#line 2725 "parser.y" /* yacc.c:1646  */
+  case 439:
+#line 2738 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-3]), n_ARRAY_LITERAL);
     (yyvsp[-3])->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
     (yyval) = (yyvsp[-3]);
   }
-#line 7295 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7345 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 438:
-#line 2730 "parser.y" /* yacc.c:1646  */
+  case 440:
+#line 2743 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-2]), n_ARRAY_LITERAL);
     (yyvsp[-2])->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
     (yyval) = (yyvsp[-2]);
   }
-#line 7305 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7355 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 439:
-#line 2738 "parser.y" /* yacc.c:1646  */
+  case 441:
+#line 2751 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-2]), n_NEW);
     (yyvsp[-2])->appendChild((yyvsp[-1]));
     (yyvsp[-2])->appendChild((yyvsp[0]));
     (yyval) = (yyvsp[-2]);
   }
-#line 7316 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7366 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 440:
-#line 2747 "parser.y" /* yacc.c:1646  */
+  case 442:
+#line 2760 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_STATIC_ACCESS);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[0]), n_STRING));
   }
-#line 7326 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7376 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
-  case 441:
-#line 2752 "parser.y" /* yacc.c:1646  */
+  case 443:
+#line 2765 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_STATIC_ACCESS);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[0]), n_STRING));
   }
-#line 7336 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7386 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
 
-#line 7340 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7390 "parser.yacc.cpp" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -7564,7 +7614,7 @@
 #endif
   return yyresult;
 }
-#line 2759 "parser.y" /* yacc.c:1906  */
+#line 2772 "parser.y" /* yacc.c:1906  */
 
 
 const char* yytokname(int tok) {
diff --git a/support/xhpast/parser_nodes.php b/support/xhpast/parser_nodes.php
--- a/support/xhpast/parser_nodes.php
+++ b/support/xhpast/parser_nodes.php
@@ -121,5 +121,6 @@
     9112 => 'n_YIELD',
     9113 => 'n_FINALLY',
     9114 => 'n_UNPACK',
+    9115 => 'n_TYPE',
   );
 }
diff --git a/support/xhpast/scanner.lex.hpp b/support/xhpast/scanner.lex.hpp
--- a/support/xhpast/scanner.lex.hpp
+++ b/support/xhpast/scanner.lex.hpp
@@ -12,8 +12,8 @@
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 0
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -214,7 +214,7 @@
 
 YY_BUFFER_STATE xhpast_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
 YY_BUFFER_STATE xhpast_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
-YY_BUFFER_STATE xhpast_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
+YY_BUFFER_STATE xhpast_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner );
 
 void *xhpastalloc (yy_size_t ,yyscan_t yyscanner );
 void *xhpastrealloc (void *,yy_size_t ,yyscan_t yyscanner );
@@ -222,7 +222,7 @@
 
 /* Begin user sect3 */
 
-#define xhpastwrap(n) 1
+#define xhpastwrap(yyscanner) (/*CONSTCOND*/1)
 #define YY_SKIP_YYWRAP
 
 #define yytext_ptr yytext_r
@@ -273,19 +273,23 @@
 
 FILE *xhpastget_in (yyscan_t yyscanner );
 
-void xhpastset_in  (FILE * in_str ,yyscan_t yyscanner );
+void xhpastset_in  (FILE * _in_str ,yyscan_t yyscanner );
 
 FILE *xhpastget_out (yyscan_t yyscanner );
 
-void xhpastset_out  (FILE * out_str ,yyscan_t yyscanner );
+void xhpastset_out  (FILE * _out_str ,yyscan_t yyscanner );
 
-int xhpastget_leng (yyscan_t yyscanner );
+yy_size_t xhpastget_leng (yyscan_t yyscanner );
 
 char *xhpastget_text (yyscan_t yyscanner );
 
 int xhpastget_lineno (yyscan_t yyscanner );
 
-void xhpastset_lineno (int line_number ,yyscan_t yyscanner );
+void xhpastset_lineno (int _line_number ,yyscan_t yyscanner );
+
+int xhpastget_column  (yyscan_t yyscanner );
+
+void xhpastset_column (int _column_no ,yyscan_t yyscanner );
 
 YYSTYPE * xhpastget_lval (yyscan_t yyscanner );
 
@@ -360,7 +364,7 @@
 #line 367 "scanner.l"
 
 
-#line 364 "scanner.lex.hpp"
+#line 368 "scanner.lex.hpp"
 #undef xhpastIN_HEADER
 #endif /* xhpastHEADER_H */
 /* @generated */
diff --git a/support/xhpast/scanner.lex.cpp b/support/xhpast/scanner.lex.cpp
--- a/support/xhpast/scanner.lex.cpp
+++ b/support/xhpast/scanner.lex.cpp
@@ -8,8 +8,8 @@
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 0
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -179,11 +179,17 @@
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
 #endif
 
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
 
     #define YY_LESS_LINENO(n)
+    #define YY_LINENO_REWIND_TO(ptr)
     
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
@@ -201,11 +207,6 @@
 
 #define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
 
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
 #ifndef YY_STRUCT_YY_BUFFER_STATE
 #define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
@@ -302,7 +303,7 @@
 
 YY_BUFFER_STATE xhpast_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
 YY_BUFFER_STATE xhpast_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
-YY_BUFFER_STATE xhpast_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
+YY_BUFFER_STATE xhpast_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner );
 
 void *xhpastalloc (yy_size_t ,yyscan_t yyscanner );
 void *xhpastrealloc (void *,yy_size_t ,yyscan_t yyscanner );
@@ -334,7 +335,7 @@
 
 /* Begin user sect3 */
 
-#define xhpastwrap(n) 1
+#define xhpastwrap(yyscanner) (/*CONSTCOND*/1)
 #define YY_SKIP_YYWRAP
 
 typedef unsigned char YY_CHAR;
@@ -346,6 +347,9 @@
 static yy_state_type yy_get_previous_state (yyscan_t yyscanner );
 static yy_state_type yy_try_NUL_trans (yy_state_type current_state  ,yyscan_t yyscanner);
 static int yy_get_next_buffer (yyscan_t yyscanner );
+#if defined(__GNUC__) && __GNUC__ >= 3
+__attribute__((__noreturn__))
+#endif
 static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
 
 /* Done after the current pattern has been matched and before the
@@ -24435,7 +24439,7 @@
 
 
 
-#line 24439 "scanner.lex.cpp"
+#line 24443 "scanner.lex.cpp"
 
 #define INITIAL 0
 #define PHP 1
@@ -24475,7 +24479,7 @@
     YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
     char yy_hold_char;
     int yy_n_chars;
-    int yyleng_r;
+    yy_size_t yyleng_r;
     char *yy_c_buf_p;
     int yy_init;
     int yy_start;
@@ -24522,19 +24526,23 @@
 
 FILE *xhpastget_in (yyscan_t yyscanner );
 
-void xhpastset_in  (FILE * in_str ,yyscan_t yyscanner );
+void xhpastset_in  (FILE * _in_str ,yyscan_t yyscanner );
 
 FILE *xhpastget_out (yyscan_t yyscanner );
 
-void xhpastset_out  (FILE * out_str ,yyscan_t yyscanner );
+void xhpastset_out  (FILE * _out_str ,yyscan_t yyscanner );
 
-int xhpastget_leng (yyscan_t yyscanner );
+yy_size_t xhpastget_leng (yyscan_t yyscanner );
 
 char *xhpastget_text (yyscan_t yyscanner );
 
 int xhpastget_lineno (yyscan_t yyscanner );
 
-void xhpastset_lineno (int line_number ,yyscan_t yyscanner );
+void xhpastset_lineno (int _line_number ,yyscan_t yyscanner );
+
+int xhpastget_column  (yyscan_t yyscanner );
+
+void xhpastset_column (int _column_no ,yyscan_t yyscanner );
 
 YYSTYPE * xhpastget_lval (yyscan_t yyscanner );
 
@@ -24552,8 +24560,12 @@
 #endif
 #endif
 
+#ifndef YY_NO_UNPUT
+    
     static void yyunput (int c,char *buf_ptr  ,yyscan_t yyscanner);
     
+#endif
+
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
 #endif
@@ -24572,7 +24584,7 @@
 
 #endif
 
-    static void yy_push_state (int new_state ,yyscan_t yyscanner);
+    static void yy_push_state (int _new_state ,yyscan_t yyscanner);
     
     static void yy_pop_state (yyscan_t yyscanner );
     
@@ -24658,7 +24670,7 @@
 
 /* Code executed at the end of each rule. */
 #ifndef YY_BREAK
-#define YY_BREAK break;
+#define YY_BREAK /*LINTED*/break;
 #endif
 
 #define YY_RULE_SETUP \
@@ -24668,17 +24680,11 @@
  */
 YY_DECL
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
+	yy_state_type yy_current_state;
+	char *yy_cp, *yy_bp;
+	int yy_act;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
-#line 67 "scanner.l"
-
-
- /* Open / close PHP + inline HTML */
-#line 24681 "scanner.lex.cpp"
-
     yylval = yylval_param;
 
 	if ( !yyg->yy_init )
@@ -24707,7 +24713,14 @@
 		xhpast_load_buffer_state(yyscanner );
 		}
 
-	while ( 1 )		/* loops until end-of-file is reached */
+	{
+#line 67 "scanner.l"
+
+
+ /* Open / close PHP + inline HTML */
+#line 24722 "scanner.lex.cpp"
+
+	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
 		yyg->yy_more_len = 0;
 		if ( yyg->yy_more_flag )
@@ -24728,9 +24741,9 @@
 		yy_current_state = yy_start_state_list[yyg->yy_start];
 yy_match:
 		{
-		register yyconst struct yy_trans_info *yy_trans_info;
+		yyconst struct yy_trans_info *yy_trans_info;
 
-		register YY_CHAR yy_c;
+		YY_CHAR yy_c;
 
 		for ( yy_c = YY_SC_TO_UI(*yy_cp);
 		      (yy_trans_info = &yy_current_state[(unsigned int) yy_c])->
@@ -24766,6 +24779,7 @@
 case 1:
 /* rule 1 can match eol */
 *yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */
+YY_LINENO_REWIND_TO(yy_bp + 5);
 yyg->yy_c_buf_p = yy_cp = yy_bp + 5;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
@@ -25649,7 +25663,7 @@
 #line 367 "scanner.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 25653 "scanner.lex.cpp"
+#line 25667 "scanner.lex.cpp"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(PHP):
 case YY_STATE_EOF(PHP_HEREDOC_START):
@@ -25787,6 +25801,7 @@
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
+	} /* end of user's declarations */
 } /* end of xhpastlex */
 
 /* yy_get_next_buffer - try to read in a new buffer
@@ -25799,9 +25814,9 @@
 static int yy_get_next_buffer (yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = yyg->yytext_ptr;
-	register int number_to_move, i;
+	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	char *source = yyg->yytext_ptr;
+	yy_size_t number_to_move, i;
 	int ret_val;
 
 	if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] )
@@ -25830,7 +25845,7 @@
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1;
+	number_to_move = (yy_size_t) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1;
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
@@ -25843,21 +25858,21 @@
 
 	else
 		{
-			int num_to_read =
+			yy_size_t num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
 			{ /* Not enough room in the buffer - grow it. */
 
 			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
 
 			int yy_c_buf_p_offset =
 				(int) (yyg->yy_c_buf_p - b->yy_ch_buf);
 
 			if ( b->yy_is_our_buffer )
 				{
-				int new_size = b->yy_buf_size * 2;
+				yy_size_t new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->yy_buf_size += b->yy_buf_size / 8;
@@ -25888,7 +25903,7 @@
 
 		/* Read in more data. */
 		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			yyg->yy_n_chars, (size_t) num_to_read );
+			yyg->yy_n_chars, num_to_read );
 
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
 		}
@@ -25912,9 +25927,9 @@
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+	if ((int) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
 		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
+		int new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
 		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) xhpastrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner );
 		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
 			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
@@ -25933,8 +25948,8 @@
 
     static yy_state_type yy_get_previous_state (yyscan_t yyscanner)
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
+	yy_state_type yy_current_state;
+	char *yy_cp;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
 	yy_current_state = yy_start_state_list[yyg->yy_start];
@@ -25959,12 +25974,12 @@
  */
     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state , yyscan_t yyscanner)
 {
-	register int yy_is_jam;
+	int yy_is_jam;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */
-	register char *yy_cp = yyg->yy_c_buf_p;
+	char *yy_cp = yyg->yy_c_buf_p;
 
-	register int yy_c = 256;
-	register yyconst struct yy_trans_info *yy_trans_info;
+	int yy_c = 256;
+	yyconst struct yy_trans_info *yy_trans_info;
 
 	yy_trans_info = &yy_current_state[(unsigned int) yy_c];
 	yy_current_state += yy_trans_info->yy_nxt;
@@ -25979,12 +25994,15 @@
 			}
 		}
 
+	(void)yyg;
 	return yy_is_jam ? 0 : yy_current_state;
 }
 
-    static void yyunput (int c, register char * yy_bp , yyscan_t yyscanner)
+#ifndef YY_NO_UNPUT
+
+    static void yyunput (int c, char * yy_bp , yyscan_t yyscanner)
 {
-	register char *yy_cp;
+	char *yy_cp;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
     yy_cp = yyg->yy_c_buf_p;
@@ -25995,10 +26013,10 @@
 	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register int number_to_move = yyg->yy_n_chars + 2;
-		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+		yy_size_t number_to_move = yyg->yy_n_chars + 2;
+		char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
 					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
-		register char *source =
+		char *source =
 				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
 
 		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
@@ -26020,6 +26038,8 @@
 	yyg->yy_c_buf_p = yy_cp;
 }
 
+#endif
+
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
     static int yyinput (yyscan_t yyscanner)
@@ -26045,7 +26065,7 @@
 
 		else
 			{ /* need more input */
-			int offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
+			yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
 			++yyg->yy_c_buf_p;
 
 			switch ( yy_get_next_buffer( yyscanner ) )
@@ -26173,7 +26193,7 @@
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in xhpast_create_buffer()" );
 
-	b->yy_buf_size = size;
+	b->yy_buf_size = (yy_size_t)size;
 
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
@@ -26209,10 +26229,6 @@
 	xhpastfree((void *) b ,yyscanner );
 }
 
-#ifndef __cplusplus
-extern int isatty (int );
-#endif /* __cplusplus */
-    
 /* Initializes or reinitializes a buffer.
  * This function is sometimes called more than once on the same buffer,
  * such as during a xhpastrestart() or at EOF.
@@ -26329,7 +26345,7 @@
  */
 static void xhpastensure_buffer_stack (yyscan_t yyscanner)
 {
-	int num_to_alloc;
+	yy_size_t num_to_alloc;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
 	if (!yyg->yy_buffer_stack) {
@@ -26338,7 +26354,7 @@
 		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
 		 * immediate realloc on the next call.
          */
-		num_to_alloc = 1;
+		num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
 		yyg->yy_buffer_stack = (struct yy_buffer_state**)xhpastalloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								, yyscanner);
@@ -26355,7 +26371,7 @@
 	if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){
 
 		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
+		yy_size_t grow_size = 8 /* arbitrary grow size */;
 
 		num_to_alloc = yyg->yy_buffer_stack_max + grow_size;
 		yyg->yy_buffer_stack = (struct yy_buffer_state**)xhpastrealloc
@@ -26427,12 +26443,12 @@
  * @param yyscanner The scanner object.
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE xhpast_scan_bytes  (yyconst char * yybytes, int  _yybytes_len , yyscan_t yyscanner)
+YY_BUFFER_STATE xhpast_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len , yyscan_t yyscanner)
 {
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
-	int i;
+	yy_size_t i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
@@ -26457,7 +26473,7 @@
 	return b;
 }
 
-    static void yy_push_state (int  new_state , yyscan_t yyscanner)
+    static void yy_push_state (int  _new_state , yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 	if ( yyg->yy_start_stack_ptr >= yyg->yy_start_stack_depth )
@@ -26479,7 +26495,7 @@
 
 	yyg->yy_start_stack[yyg->yy_start_stack_ptr++] = YY_START;
 
-	BEGIN(new_state);
+	BEGIN(_new_state);
 }
 
     static void yy_pop_state  (yyscan_t yyscanner)
@@ -26503,7 +26519,9 @@
 
 static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
 {
-    	(void) fprintf( stderr, "%s\n", msg );
+	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	(void)yyg;
+	(void) fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
 }
 
@@ -26582,7 +26600,7 @@
 /** Get the length of the current token.
  * @param yyscanner The scanner object.
  */
-int xhpastget_leng  (yyscan_t yyscanner)
+yy_size_t xhpastget_leng  (yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
     return yyleng;
@@ -26609,51 +26627,51 @@
 }
 
 /** Set the current line number.
- * @param line_number
+ * @param _line_number line number
  * @param yyscanner The scanner object.
  */
-void xhpastset_lineno (int  line_number , yyscan_t yyscanner)
+void xhpastset_lineno (int  _line_number , yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
         /* lineno is only valid if an input buffer exists. */
         if (! YY_CURRENT_BUFFER )
-           yy_fatal_error( "xhpastset_lineno called with no buffer" , yyscanner); 
+           YY_FATAL_ERROR( "xhpastset_lineno called with no buffer" );
     
-    yylineno = line_number;
+    yylineno = _line_number;
 }
 
 /** Set the current column.
- * @param line_number
+ * @param _column_no column number
  * @param yyscanner The scanner object.
  */
-void xhpastset_column (int  column_no , yyscan_t yyscanner)
+void xhpastset_column (int  _column_no , yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
         /* column is only valid if an input buffer exists. */
         if (! YY_CURRENT_BUFFER )
-           yy_fatal_error( "xhpastset_column called with no buffer" , yyscanner); 
+           YY_FATAL_ERROR( "xhpastset_column called with no buffer" );
     
-    yycolumn = column_no;
+    yycolumn = _column_no;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
- * @param in_str A readable stream.
+ * @param _in_str A readable stream.
  * @param yyscanner The scanner object.
  * @see xhpast_switch_to_buffer
  */
-void xhpastset_in (FILE *  in_str , yyscan_t yyscanner)
+void xhpastset_in (FILE *  _in_str , yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yyin = in_str ;
+    yyin = _in_str ;
 }
 
-void xhpastset_out (FILE *  out_str , yyscan_t yyscanner)
+void xhpastset_out (FILE *  _out_str , yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yyout = out_str ;
+    yyout = _out_str ;
 }
 
 int xhpastget_debug  (yyscan_t yyscanner)
@@ -26662,10 +26680,10 @@
     return yy_flex_debug;
 }
 
-void xhpastset_debug (int  bdebug , yyscan_t yyscanner)
+void xhpastset_debug (int  _bdebug , yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yy_flex_debug = bdebug ;
+    yy_flex_debug = _bdebug ;
 }
 
 /* Accessor methods for yylval and yylloc */
@@ -26816,7 +26834,10 @@
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner)
 {
-	register int i;
+	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	(void)yyg;
+
+	int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
 }
@@ -26825,7 +26846,7 @@
 #ifdef YY_NEED_STRLEN
 static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner)
 {
-	register int n;
+	int n;
 	for ( n = 0; s[n]; ++n )
 		;
 
@@ -26835,11 +26856,16 @@
 
 void *xhpastalloc (yy_size_t  size , yyscan_t yyscanner)
 {
+	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	(void)yyg;
 	return (void *) malloc( size );
 }
 
 void *xhpastrealloc  (void * ptr, yy_size_t  size , yyscan_t yyscanner)
 {
+	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	(void)yyg;
+
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
 	 * that use void* generic pointers.  It works with the latter
@@ -26852,6 +26878,8 @@
 
 void xhpastfree (void * ptr , yyscan_t yyscanner)
 {
+	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	(void)yyg;
 	free( (char *) ptr );	/* see xhpastrealloc() for (char *) cast */
 }
 
diff --git a/support/xhpast/xhpast.cpp b/support/xhpast/xhpast.cpp
--- a/support/xhpast/xhpast.cpp
+++ b/support/xhpast/xhpast.cpp
@@ -12,7 +12,7 @@
 int main(int argc, char* argv[]) {
   if (argc != 1) {
     // Coupling: modify also src/parser/xhpast/bin/PhutilXHPASTBinary.php
-    cout << "7.0.3\n";
+    cout << "7.0.4\n";
     return 0;
   }