From dd84ed90a62445d2c4cc282d68c87556840c9605 Mon Sep 17 00:00:00 2001
From: vadim <vadim@ecomitize.com>
Date: Fri, 1 Dec 2017 09:15:46 +0200
Subject: [PATCH] reorder

---
 parser.go | 3730 +++++++++++++++++++++++++++--------------------------
 parser.y  |  835 ++++++------
 2 files changed, 2292 insertions(+), 2273 deletions(-)

diff --git a/parser.go b/parser.go
index 18d8d20..af5c4a8 100644
--- a/parser.go
+++ b/parser.go
@@ -368,7 +368,7 @@ const yyEofCode = 1
 const yyErrCode = 2
 const yyInitialStackSize = 16
 
-//line parser.y:1271
+//line parser.y:1286
 const src = `<?php
 $a = static function($a) use ($b) {
 
@@ -388,169 +388,169 @@ var yyExca = [...]int{
 	1, -1,
 	-2, 0,
 	-1, 43,
-	69, 436,
-	133, 436,
-	153, 436,
-	162, 436,
-	-2, 445,
+	69, 417,
+	133, 417,
+	153, 417,
+	162, 417,
+	-2, 412,
 	-1, 47,
-	159, 439,
-	-2, 468,
+	159, 420,
+	-2, 429,
 	-1, 81,
-	69, 438,
-	133, 438,
-	153, 438,
-	159, 441,
-	162, 438,
-	-2, 396,
+	69, 419,
+	133, 419,
+	153, 419,
+	159, 422,
+	162, 419,
+	-2, 407,
 	-1, 104,
-	153, 427,
-	-2, 423,
+	153, 380,
+	-2, 409,
 	-1, 219,
-	69, 436,
-	133, 436,
-	153, 436,
-	162, 436,
-	-2, 318,
+	69, 417,
+	133, 417,
+	153, 417,
+	162, 417,
+	-2, 309,
 	-1, 222,
-	159, 441,
-	-2, 438,
+	159, 422,
+	-2, 419,
 	-1, 224,
-	69, 436,
-	133, 436,
-	153, 436,
-	162, 436,
-	-2, 320,
+	69, 417,
+	133, 417,
+	153, 417,
+	162, 417,
+	-2, 311,
 	-1, 349,
 	38, 0,
 	39, 0,
 	40, 0,
 	41, 0,
 	42, 0,
-	-2, 342,
+	-2, 333,
 	-1, 350,
 	38, 0,
 	39, 0,
 	40, 0,
 	41, 0,
 	42, 0,
-	-2, 343,
+	-2, 334,
 	-1, 351,
 	38, 0,
 	39, 0,
 	40, 0,
 	41, 0,
 	42, 0,
-	-2, 344,
+	-2, 335,
 	-1, 352,
 	38, 0,
 	39, 0,
 	40, 0,
 	41, 0,
 	42, 0,
-	-2, 345,
+	-2, 336,
 	-1, 353,
 	38, 0,
 	39, 0,
 	40, 0,
 	41, 0,
 	42, 0,
-	-2, 346,
+	-2, 337,
 	-1, 354,
 	43, 0,
 	44, 0,
 	45, 0,
 	46, 0,
-	-2, 347,
+	-2, 338,
 	-1, 355,
 	43, 0,
 	44, 0,
 	45, 0,
 	46, 0,
-	-2, 348,
+	-2, 339,
 	-1, 356,
 	43, 0,
 	44, 0,
 	45, 0,
 	46, 0,
-	-2, 349,
+	-2, 340,
 	-1, 357,
 	43, 0,
 	44, 0,
 	45, 0,
 	46, 0,
-	-2, 350,
+	-2, 341,
 	-1, 364,
-	9, 219,
-	160, 219,
-	-2, 436,
+	9, 161,
+	160, 161,
+	-2, 417,
 	-1, 371,
-	160, 282,
-	-2, 287,
+	160, 211,
+	-2, 216,
 	-1, 405,
-	69, 437,
-	133, 437,
-	153, 437,
-	159, 440,
-	162, 437,
-	-2, 352,
-	-1, 418,
-	159, 459,
-	-2, 424,
+	69, 418,
+	133, 418,
+	153, 418,
+	159, 421,
+	162, 418,
+	-2, 343,
+	-1, 419,
+	159, 443,
+	-2, 410,
 	-1, 420,
-	159, 461,
-	-2, 477,
-	-1, 498,
-	159, 459,
-	-2, 425,
+	159, 445,
+	-2, 435,
+	-1, 499,
+	159, 443,
+	-2, 411,
 	-1, 500,
-	159, 461,
-	-2, 478,
+	159, 445,
+	-2, 436,
 	-1, 527,
-	9, 202,
-	160, 202,
-	164, 202,
-	-2, 436,
+	9, 457,
+	160, 457,
+	164, 457,
+	-2, 417,
 	-1, 553,
-	160, 282,
-	-2, 287,
+	160, 211,
+	-2, 216,
 	-1, 563,
-	160, 282,
-	-2, 287,
+	160, 211,
+	-2, 216,
 	-1, 591,
-	159, 440,
-	-2, 437,
+	159, 421,
+	-2, 418,
 	-1, 651,
-	15, 190,
-	160, 190,
-	-2, 436,
+	15, 181,
+	160, 181,
+	-2, 417,
 	-1, 673,
-	88, 261,
-	-2, 267,
+	88, 263,
+	-2, 266,
 	-1, 701,
-	9, 201,
-	160, 201,
-	164, 201,
-	-2, 436,
+	9, 456,
+	160, 456,
+	164, 456,
+	-2, 417,
 	-1, 723,
-	15, 191,
-	160, 191,
-	-2, 436,
+	15, 182,
+	160, 182,
+	-2, 417,
 	-1, 775,
-	15, 193,
-	160, 193,
-	-2, 443,
+	15, 184,
+	160, 184,
+	-2, 391,
 	-1, 846,
 	105, 76,
-	-2, 78,
+	-2, 80,
 	-1, 869,
-	160, 282,
-	-2, 287,
+	160, 211,
+	-2, 216,
 }
 
 const yyPrivate = 57344
 
-const yyLast = 7380
+const yyLast = 7420
 
 var yyAct = [...]int{
 
@@ -562,89 +562,89 @@ var yyAct = [...]int{
 	7, 218, 81, 126, 225, 226, 227, 228, 229, 148,
 	501, 230, 231, 232, 233, 234, 235, 236, 77, 239,
 	280, 141, 247, 248, 249, 309, 310, 135, 5, 6,
-	2, 187, 253, 502, 419, 125, 262, 263, 123, 265,
+	2, 187, 253, 123, 502, 418, 262, 263, 125, 265,
 	266, 407, 764, 765, 775, 764, 765, 258, 694, 138,
-	139, 683, 243, 79, 222, 222, 223, 690, 282, 604,
-	587, 102, 524, 902, 903, 401, 115, 102, 102, 102,
-	220, 220, 285, 848, 803, 601, 289, 290, 645, 800,
+	139, 683, 243, 79, 222, 222, 223, 401, 282, 102,
+	690, 604, 587, 524, 102, 848, 115, 102, 102, 285,
+	220, 220, 803, 289, 290, 601, 902, 903, 645, 800,
 	314, 797, 757, 602, 319, 320, 302, 894, 855, 286,
-	833, 288, 823, 821, 529, 529, 295, 810, 529, 301,
+	823, 288, 833, 821, 529, 529, 295, 810, 529, 301,
 	763, 529, 332, 333, 334, 335, 336, 337, 338, 339,
 	340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
 	350, 351, 352, 353, 354, 355, 356, 357, 43, 359,
-	361, 215, 365, 778, 132, 367, 255, 110, 274, 276,
-	103, 402, 258, 272, 244, 291, 103, 103, 103, 410,
+	361, 215, 365, 402, 132, 367, 255, 110, 103, 274,
+	276, 272, 258, 103, 244, 291, 103, 103, 787, 410,
 	383, 385, 386, 387, 388, 389, 390, 391, 392, 393,
 	394, 395, 396, 316, 115, 397, 136, 399, 504, 600,
-	706, 635, 404, 379, 629, 808, 328, 540, 787, 752,
-	219, 224, 223, 222, 736, 666, 579, 375, 298, 136,
-	183, 331, 115, 897, 102, 217, 413, 880, 873, 220,
-	872, 136, 327, 794, 795, 418, 498, 245, 246, 644,
-	358, 511, 512, 854, 325, 513, 817, 304, 366, 811,
-	298, 804, 516, 517, 216, 761, 521, 749, 282, 76,
-	720, 255, 506, 718, 257, 112, 716, 714, 711, 895,
-	114, 548, 832, 398, 570, 533, 530, 381, 115, 222,
-	864, 369, 507, 142, 304, 323, 544, 322, 722, 321,
-	132, 505, 302, 110, 292, 220, 406, 881, 508, 4,
-	816, 815, 523, 103, 805, 536, 799, 539, 417, 730,
-	554, 719, 149, 703, 699, 8, 222, 499, 697, 7,
-	660, 648, 636, 622, 408, 409, 592, 572, 573, 287,
-	115, 869, 220, 735, 370, 809, 782, 777, 543, 364,
-	724, 557, 259, 652, 702, 275, 132, 5, 6, 110,
-	408, 531, 409, 409, 408, 563, 553, 552, 112, 582,
-	786, 583, 371, 273, 584, 585, 571, 537, 115, 577,
-	534, 555, 581, 330, 547, 654, 545, 551, 528, 572,
-	573, 380, 223, 590, 326, 378, 153, 155, 154, 277,
-	264, 261, 115, 260, 102, 574, 324, 603, 132, 303,
-	108, 110, 297, 115, 606, 415, 178, 371, 179, 151,
+	706, 635, 404, 379, 629, 808, 328, 540, 778, 752,
+	219, 224, 223, 222, 736, 666, 570, 579, 298, 136,
+	375, 183, 115, 331, 102, 217, 413, 327, 897, 220,
+	325, 136, 304, 794, 795, 419, 499, 245, 246, 644,
+	358, 511, 512, 880, 298, 513, 873, 869, 872, 864,
+	854, 366, 516, 517, 216, 817, 521, 811, 282, 76,
+	804, 255, 506, 761, 257, 112, 749, 720, 718, 895,
+	114, 716, 115, 398, 832, 714, 711, 548, 115, 222,
+	304, 533, 507, 142, 530, 381, 544, 369, 722, 323,
+	132, 505, 302, 110, 322, 220, 406, 881, 508, 4,
+	321, 292, 523, 103, 816, 536, 815, 539, 417, 805,
+	554, 799, 149, 730, 719, 8, 222, 703, 498, 7,
+	699, 572, 573, 697, 408, 409, 660, 572, 573, 782,
+	786, 648, 220, 636, 370, 809, 622, 592, 543, 364,
+	132, 557, 259, 110, 287, 735, 132, 5, 6, 110,
+	408, 531, 409, 409, 408, 777, 724, 552, 702, 582,
+	275, 583, 537, 273, 584, 585, 571, 115, 112, 577,
+	534, 555, 581, 107, 563, 330, 553, 551, 371, 326,
+	223, 547, 324, 590, 303, 545, 153, 155, 154, 528,
+	115, 380, 102, 378, 285, 574, 297, 603, 108, 115,
+	863, 277, 606, 264, 261, 415, 178, 371, 179, 151,
 	152, 156, 158, 157, 170, 171, 168, 169, 172, 173,
 	174, 175, 176, 166, 167, 160, 161, 159, 162, 164,
-	165, 863, 177, 721, 115, 561, 132, 259, 238, 110,
-	653, 106, 527, 214, 163, 679, 680, 681, 678, 677,
-	676, 679, 680, 681, 678, 677, 676, 182, 181, 180,
-	132, 121, 122, 110, 589, 221, 134, 133, 129, 111,
-	300, 300, 300, 103, 538, 300, 285, 403, 876, 115,
-	503, 252, 244, 605, 251, 136, 610, 410, 411, 672,
-	300, 576, 674, 244, 374, 672, 118, 732, 674, 377,
-	874, 728, 729, 621, 144, 120, 282, 624, 146, 282,
-	244, 420, 500, 74, 75, 614, 244, 742, 741, 875,
-	315, 267, 285, 630, 542, 619, 691, 535, 640, 319,
-	642, 613, 847, 144, 302, 611, 633, 647, 829, 4,
-	751, 646, 299, 865, 515, 245, 246, 539, 571, 539,
-	296, 659, 412, 627, 638, 8, 245, 246, 571, 7,
-	827, 667, 609, 607, 189, 571, 641, 740, 783, 656,
-	242, 581, 514, 245, 246, 146, 623, 682, 268, 245,
-	246, 649, 692, 859, 596, 142, 115, 5, 6, 664,
-	665, 598, 222, 222, 687, 250, 511, 244, 127, 107,
-	115, 521, 410, 163, 541, 244, 223, 529, 220, 220,
-	271, 826, 244, 372, 294, 193, 115, 241, 102, 188,
-	594, 712, 597, 595, 108, 705, 192, 121, 122, 696,
-	709, 633, 698, 191, 700, 282, 858, 707, 539, 726,
-	812, 764, 765, 539, 539, 767, 764, 765, 710, 679,
-	680, 681, 678, 677, 676, 717, 571, 743, 222, 744,
-	245, 246, 185, 663, 737, 106, 780, 581, 245, 246,
-	750, 269, 270, 733, 220, 245, 246, 748, 746, 725,
-	196, 198, 197, 282, 132, 222, 177, 110, 382, 221,
-	194, 195, 747, 672, 186, 319, 674, 103, 163, 45,
-	834, 220, 705, 828, 633, 282, 788, 329, 758, 305,
-	754, 756, 634, 683, 781, 539, 759, 539, 364, 651,
-	769, 773, 755, 708, 117, 661, 766, 753, 768, 771,
-	796, 620, 762, 615, 784, 559, 785, 190, 679, 680,
-	681, 678, 677, 676, 549, 806, 525, 1, 824, 774,
-	798, 801, 813, 240, 814, 222, 237, 162, 164, 165,
-	820, 177, 802, 608, 539, 509, 403, 612, 59, 831,
-	256, 220, 819, 163, 58, 571, 835, 822, 254, 844,
-	78, 830, 672, 105, 701, 674, 519, 376, 116, 853,
-	843, 679, 680, 681, 678, 677, 676, 293, 48, 852,
-	49, 80, 593, 861, 792, 862, 69, 857, 901, 866,
-	841, 723, 842, 850, 840, 868, 839, 837, 793, 671,
-	789, 844, 738, 771, 867, 745, 673, 871, 670, 669,
-	727, 818, 843, 877, 878, 658, 655, 879, 85, 86,
-	87, 88, 89, 281, 279, 362, 147, 71, 72, 143,
-	73, 140, 643, 885, 882, 849, 318, 886, 637, 887,
-	891, 890, 889, 15, 571, 42, 14, 41, 47, 581,
-	44, 565, 567, 37, 896, 306, 898, 3, 899, 422,
-	734, 651, 662, 53, 54, 904, 0, 0, 0, 55,
+	165, 561, 177, 721, 260, 132, 238, 259, 110, 106,
+	876, 214, 527, 182, 163, 679, 680, 681, 678, 677,
+	676, 679, 680, 681, 678, 677, 676, 181, 132, 180,
+	134, 110, 133, 221, 129, 589, 111, 300, 300, 300,
+	538, 103, 115, 115, 503, 300, 252, 403, 251, 576,
+	374, 377, 244, 605, 875, 136, 610, 410, 874, 672,
+	300, 732, 674, 118, 144, 672, 411, 146, 674, 121,
+	122, 728, 729, 621, 244, 315, 282, 624, 691, 282,
+	244, 420, 500, 74, 75, 614, 742, 741, 242, 285,
+	630, 542, 144, 865, 827, 619, 859, 535, 640, 319,
+	642, 613, 847, 740, 302, 611, 633, 647, 829, 4,
+	751, 646, 299, 120, 296, 245, 246, 539, 571, 539,
+	783, 659, 244, 627, 638, 8, 146, 410, 571, 7,
+	412, 667, 609, 607, 189, 571, 641, 245, 246, 656,
+	115, 581, 514, 245, 246, 826, 623, 682, 244, 858,
+	115, 649, 692, 267, 598, 142, 127, 5, 6, 664,
+	665, 541, 222, 222, 687, 529, 511, 121, 122, 372,
+	193, 521, 679, 680, 681, 678, 677, 676, 220, 220,
+	250, 294, 244, 192, 515, 245, 246, 271, 244, 269,
+	270, 712, 191, 241, 596, 705, 812, 764, 765, 696,
+	709, 633, 698, 185, 700, 282, 163, 707, 539, 726,
+	268, 245, 246, 539, 539, 188, 672, 663, 710, 674,
+	767, 764, 765, 194, 195, 717, 571, 743, 222, 744,
+	594, 45, 597, 595, 737, 177, 780, 581, 748, 382,
+	750, 186, 834, 733, 220, 245, 246, 163, 746, 725,
+	828, 245, 246, 282, 788, 222, 196, 198, 197, 785,
+	329, 305, 747, 683, 634, 319, 162, 164, 165, 190,
+	177, 220, 705, 755, 633, 282, 117, 708, 758, 661,
+	754, 756, 163, 620, 781, 539, 759, 539, 364, 651,
+	769, 773, 615, 559, 1, 549, 766, 753, 768, 771,
+	796, 525, 762, 824, 784, 240, 237, 509, 679, 680,
+	681, 678, 677, 676, 59, 806, 256, 58, 254, 774,
+	798, 801, 813, 78, 814, 222, 105, 519, 376, 116,
+	820, 293, 802, 608, 539, 48, 403, 612, 49, 831,
+	80, 220, 819, 593, 69, 571, 835, 822, 901, 844,
+	841, 830, 672, 842, 701, 674, 840, 839, 837, 853,
+	843, 679, 680, 681, 678, 677, 676, 793, 671, 852,
+	789, 738, 673, 861, 792, 862, 670, 857, 669, 866,
+	727, 723, 818, 850, 658, 868, 655, 281, 279, 362,
+	147, 844, 143, 771, 867, 745, 140, 871, 643, 849,
+	318, 637, 843, 877, 878, 15, 42, 879, 85, 86,
+	87, 88, 89, 14, 41, 47, 44, 71, 72, 565,
+	73, 567, 37, 885, 882, 306, 3, 886, 423, 887,
+	891, 890, 889, 734, 571, 662, 0, 0, 0, 581,
+	0, 0, 0, 0, 896, 0, 898, 0, 899, 0,
+	0, 651, 0, 53, 54, 904, 0, 0, 0, 55,
 	0, 56, 51, 52, 60, 61, 62, 63, 64, 65,
 	66, 68, 0, 107, 82, 50, 0, 0, 0, 0,
 	24, 74, 75, 0, 0, 0, 67, 46, 90, 91,
@@ -894,14 +894,14 @@ var yyAct = [...]int{
 	439, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	668, 0, 0, 0, 440, 441, 0, 444, 445, 446,
 	425, 426, 427, 428, 429, 430, 442, 443, 0, 0,
-	421, 0, 102, 0, 0, 0, 0, 0, 0, 447,
+	422, 0, 102, 0, 0, 0, 0, 0, 0, 447,
 	448, 449, 450, 451, 452, 453, 454, 455, 456, 457,
 	477, 478, 479, 480, 481, 469, 470, 471, 472, 473,
 	458, 459, 460, 461, 462, 463, 464, 465, 466, 467,
 	468, 0, 489, 487, 488, 484, 485, 0, 476, 482,
 	483, 490, 491, 493, 492, 494, 495, 0, 0, 0,
 	0, 0, 85, 86, 87, 88, 89, 0, 486, 497,
-	496, 71, 72, 0, 73, 0, 423, 0, 0, 0,
+	496, 71, 72, 0, 73, 0, 421, 0, 0, 0,
 	0, 103, 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, 54, 0,
@@ -1068,7 +1068,7 @@ var yyAct = [...]int{
 	439, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 440, 441, 0, 444, 445, 446,
 	425, 426, 427, 428, 429, 430, 442, 443, 0, 0,
-	421, 0, 0, 0, 0, 0, 0, 0, 0, 447,
+	422, 0, 0, 0, 0, 0, 0, 0, 0, 447,
 	448, 449, 450, 451, 452, 453, 454, 455, 456, 457,
 	477, 478, 479, 480, 481, 469, 470, 471, 472, 473,
 	458, 459, 460, 461, 462, 463, 464, 465, 466, 467,
@@ -1268,21 +1268,25 @@ var yyAct = [...]int{
 	158, 157, 170, 171, 168, 169, 172, 173, 174, 175,
 	176, 166, 167, 160, 161, 159, 162, 164, 165, 0,
 	177, 153, 155, 154, 0, 0, 0, 0, 0, 0,
-	586, 0, 163, 0, 0, 0, 0, 0, 0, 0,
+	586, 0, 163, 0, 652, 0, 0, 0, 0, 0,
 	0, 178, 0, 179, 151, 152, 156, 158, 157, 170,
 	171, 168, 169, 172, 173, 174, 175, 176, 166, 167,
-	160, 161, 159, 162, 164, 165, 0, 177, 153, 155,
-	154, 0, 0, 0, 0, 0, 0, 550, 0, 163,
-	0, 0, 0, 0, 0, 0, 0, 0, 178, 0,
-	179, 151, 152, 156, 158, 157, 170, 171, 168, 169,
-	172, 173, 174, 175, 176, 166, 167, 160, 161, 159,
-	162, 164, 165, 0, 177, 153, 155, 154, 0, 0,
-	0, 0, 0, 0, 546, 0, 163, 0, 0, 0,
-	0, 0, 0, 0, 0, 178, 556, 179, 151, 152,
-	156, 158, 157, 170, 171, 168, 169, 172, 173, 174,
-	175, 176, 166, 167, 160, 161, 159, 162, 164, 165,
-	0, 177, 0, 560, 153, 155, 154, 0, 0, 526,
-	0, 405, 0, 163, 0, 0, 0, 0, 0, 0,
+	160, 161, 159, 162, 164, 165, 654, 177, 0, 0,
+	153, 155, 154, 223, 0, 0, 0, 550, 0, 163,
+	0, 0, 0, 115, 0, 102, 0, 0, 0, 0,
+	178, 108, 179, 151, 152, 156, 158, 157, 170, 171,
+	168, 169, 172, 173, 174, 175, 176, 166, 167, 160,
+	161, 159, 162, 164, 165, 0, 177, 0, 0, 0,
+	0, 0, 0, 0, 546, 0, 0, 0, 163, 0,
+	0, 653, 106, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 132, 0, 0, 110, 0, 221, 153, 155, 154,
+	0, 0, 0, 0, 103, 560, 0, 0, 0, 0,
+	0, 405, 0, 0, 0, 0, 0, 178, 556, 179,
+	151, 152, 156, 158, 157, 170, 171, 168, 169, 172,
+	173, 174, 175, 176, 166, 167, 160, 161, 159, 162,
+	164, 165, 0, 177, 153, 155, 154, 0, 0, 526,
+	0, 0, 0, 0, 0, 163, 0, 0, 0, 0,
 	0, 0, 0, 0, 178, 0, 179, 151, 152, 156,
 	158, 157, 170, 171, 168, 169, 172, 173, 174, 175,
 	176, 166, 167, 160, 161, 159, 162, 164, 165, 0,
@@ -1295,113 +1299,113 @@ var yyAct = [...]int{
 }
 var yyPact = [...]int{
 
-	-1000, -1000, 1182, -1000, -1000, -1000, -1000, -1000, -1000, 330,
-	128, 368, 532, -1000, -1000, -1000, 329, 4890, 328, 327,
-	6135, 6135, 6135, 23, 440, 6135, -1000, 6651, 320, 319,
-	318, -1000, 78, 6135, 596, 683, 602, 456, 567, 560,
-	549, 637, 627, 2836, -1000, -1000, 304, -1000, -1000, 112,
-	6135, 550, 550, 6135, 6135, 6135, 6135, 6135, -1000, -1000,
-	6135, 6135, 6135, 6135, 6135, 6135, 6135, 299, 6135, -1000,
-	544, 6135, 6135, 6135, -1000, -1000, -1000, 546, -1000, 351,
-	348, -1000, 156, 254, 252, 6135, 6135, 251, 6135, 6135,
+	-1000, -1000, 1182, -1000, -1000, -1000, -1000, -1000, -1000, 327,
+	128, 406, 520, -1000, -1000, -1000, 325, 4890, 323, 321,
+	6135, 6135, 6135, 26, 429, 6135, -1000, 6651, 320, 318,
+	304, -1000, 79, 6135, 567, 660, 628, 456, 556, 547,
+	534, 600, 633, 2836, -1000, -1000, 302, -1000, -1000, 112,
+	6135, 324, 324, 6135, 6135, 6135, 6135, 6135, -1000, -1000,
+	6135, 6135, 6135, 6135, 6135, 6135, 6135, 297, 6135, -1000,
+	550, 6135, 6135, 6135, -1000, -1000, -1000, 561, -1000, 345,
+	343, -1000, 156, 295, 265, 6135, 6135, 264, 6135, 6135,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	448, 537, -1000, 31, 206, 206, 250, 5337, -1000, 339,
-	520, 189, 520, -35, -1000, -1000, 153, 413, 261, 405,
-	520, -1000, -1000, -1000, -1000, 258, -1000, 712, 3458, 6135,
-	443, 602, 221, 6135, 6135, 148, 7311, 411, 146, 144,
-	255, -1000, -1000, 243, 602, -1000, 710, 232, -1000, 7311,
+	510, 544, -1000, 29, 221, 221, 262, 5337, -1000, 257,
+	514, 204, 514, -38, -1000, -1000, 160, 407, 255, 405,
+	514, -1000, -1000, -1000, -1000, 243, -1000, 694, 3458, 6135,
+	428, 628, 231, 6135, 6135, 159, 7351, 401, 153, 148,
+	241, -1000, -1000, 238, 628, -1000, 693, 234, -1000, 7351,
 	-1000, 6135, 6135, 6135, 6135, 6135, 6135, 6135, 6135, 6135,
 	6135, 6135, 6135, 6135, 6135, 6135, 6135, 6135, 6135, 6135,
 	6135, 6135, 6135, 6135, 6135, 6135, 6135, 30, 6021, 6135,
-	550, 6135, 532, -1000, 6604, 140, -1000, 268, -1000, 547,
-	-1000, 383, 75, 388, 246, 4890, 242, 136, 677, 5907,
+	324, 6135, 520, -1000, 6604, 146, -1000, 268, -1000, 533,
+	-1000, 369, 78, 370, 254, 4890, 252, 144, 658, 5907,
 	6135, 6135, 6135, 6135, 6135, 6135, 6135, 6135, 6135, 6135,
-	6135, 6135, -1000, -1000, 6135, 6135, 6135, 29, -1000, -1000,
-	546, 6135, -1000, -1000, -1000, 555, 555, 650, 555, 7121,
-	555, 555, 555, 555, 555, 555, 555, -1000, 6135, 555,
-	-74, 425, 529, -1000, 439, 5793, 550, 1495, 1167, 1495,
-	6135, 3314, 3314, 206, -1000, 347, 149, 206, -1000, -1000,
-	6135, 6135, 7311, 7311, 6135, 7311, 7311, 442, -1000, 414,
-	106, 425, 6135, -1000, -1000, 5565, -1000, 5337, -52, 757,
-	-1000, -1000, 7264, 550, 239, 541, 339, 135, 339, -1000,
-	-1000, 1018, -1000, 134, 229, 390, 520, -1000, 337, 65,
-	538, 387, -1000, -1000, 532, 6135, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, 237, 7074, 235, 223, 130, 755, 7311,
-	7027, -1000, -1000, -1000, -1000, 23, -1000, 507, 217, 6135,
+	6135, 6135, -1000, -1000, 6135, 6135, 6135, 21, -1000, -1000,
+	561, 6135, -1000, -1000, -1000, 588, 588, 629, 588, 7121,
+	588, 588, 588, 588, 588, 588, 588, -1000, 6135, 588,
+	-74, 436, 414, -1000, 447, 5793, 324, 1495, 1167, 1495,
+	6135, 3314, 3314, 221, -1000, 341, 149, 221, -1000, -1000,
+	6135, 6135, 7351, 7351, 6135, 7351, 7351, 442, -1000, 484,
+	106, 436, 6135, -1000, -1000, 5565, -1000, 5337, -51, 742,
+	-1000, -1000, 7304, 324, 250, 529, 257, 143, 257, -1000,
+	-1000, 1018, -1000, 140, 229, 390, 514, -1000, 333, 65,
+	525, 384, -1000, -1000, 520, 6135, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, 246, 7074, 242, 239, 136, 736, 7351,
+	7027, -1000, -1000, -1000, -1000, 26, -1000, 488, 237, 6135,
 	-1000, 6135, 1821, 1985, 1334, 1495, 1006, 2149, 2473, 2310,
-	725, 725, 725, 650, 555, 650, 650, 2318, 2318, 2632,
-	2632, 2632, 2632, 2632, 2642, 2642, 2642, 2642, -1000, 7215,
-	6135, 1659, 746, -1000, -1000, 7168, 295, 3150, -1000, -1000,
-	216, 264, 383, 379, 302, -1000, 74, 302, 6135, -1000,
+	664, 664, 664, 629, 588, 629, 629, 2318, 2318, 2632,
+	2632, 2632, 2632, 2632, 2642, 2642, 2642, 2642, -1000, 7257,
+	6135, 1659, 734, -1000, -1000, 7170, 291, 3150, -1000, -1000,
+	235, 206, 369, 367, 301, -1000, 75, 301, 6135, -1000,
 	6135, -1000, -1000, 1495, 6135, 1495, 1495, 1495, 1495, 1495,
-	1495, 1495, 1495, 1495, 1495, 1495, 1495, 6980, -54, 6510,
-	206, -1000, 6135, -1000, 6933, -1000, 186, -1000, -1000, -1000,
-	-1000, 554, 525, 6463, 56, -30, 6135, -55, -1000, 206,
-	-1000, -1000, -1000, 6135, -1000, -1000, -1000, -1000, -1000, -1000,
+	1495, 1495, 1495, 1495, 1495, 1495, 1495, 6980, -52, 6510,
+	221, -1000, 6135, -1000, 6933, -1000, 197, -1000, -1000, -1000,
+	-1000, 594, 518, 6463, 56, -30, 6135, -53, 221, -1000,
+	-1000, 6135, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 206,
-	-1000, -1000, -1000, 23, 6135, 6135, 29, 23, 383, 744,
-	-1000, 7311, 6886, 6839, -1000, -1000, -1000, 6416, -1000, 742,
-	-1000, 7311, 6135, 183, -1000, 5337, 5451, -1000, 5337, -1000,
-	-1000, 854, -1000, -1000, -1000, 62, 386, -1000, 520, 385,
-	534, -1000, 59, -1000, 7311, 182, 4726, 6135, 6135, 6135,
-	97, -1000, -1000, 264, 7311, -1000, 6135, 1659, 181, 550,
-	326, 4562, -1000, 264, 180, 736, -1000, 646, -1000, -1000,
-	212, -1000, -1000, -1000, 379, 73, 302, -1000, 3217, -1000,
-	724, -1000, 6792, 6745, 2986, 2473, 4398, -1000, -1000, -1000,
-	6369, -1000, -1000, -57, -1000, -1000, 457, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 221, -1000,
+	-1000, -1000, -1000, 26, 6135, 6135, 21, 26, 369, 733,
+	-1000, 7351, 6886, 6839, -1000, -1000, -1000, 6416, -1000, 724,
+	-1000, 7351, 6135, 196, -1000, 5337, 5451, -1000, 5337, -1000,
+	-1000, 854, -1000, -1000, -1000, 62, 383, -1000, 514, 382,
+	504, -1000, 59, -1000, 7351, 193, 4726, 6135, 6135, 6135,
+	97, -1000, -1000, 206, 7351, -1000, 6135, 1659, 191, 324,
+	7107, 4562, -1000, 206, 186, 720, -1000, 630, -1000, -1000,
+	212, -1000, -1000, -1000, 367, 73, 301, -1000, 3217, -1000,
+	704, -1000, 6792, 6745, 2986, 2473, 4398, -1000, -1000, -1000,
+	6369, -1000, -1000, -54, -1000, -1000, 439, -1000, -1000, -1000,
 	-1000, 6135, -1000, 1495, -1000, -1000, 6322, -1000, -1000, -66,
-	6275, -1000, -1000, 379, 178, 6135, -1000, -1000, -1000, 174,
-	5679, 7311, -1000, -1000, 7311, 550, 205, 173, -1000, 520,
-	58, 734, -1000, -1000, 520, 534, 127, -1000, -1000, -1000,
-	6698, 126, 7311, -1000, 125, 122, 171, 1659, 119, -1000,
-	293, -1000, 550, 201, 5337, -1000, -1000, -1000, 404, 169,
-	397, 264, 195, -1000, -1000, 72, -1000, 724, -1000, -1000,
-	499, 424, 302, 735, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, 682, 302, 4890, 666, 116, -1000, -1000, -1000,
+	6275, -1000, -1000, 367, 183, 6135, -1000, -1000, -1000, 180,
+	5679, 7351, -1000, -1000, 7351, 324, 219, 177, -1000, 514,
+	58, 718, -1000, -1000, 514, 504, 135, -1000, -1000, -1000,
+	6698, 134, 7351, -1000, 130, 127, 174, 1659, 126, -1000,
+	293, -1000, 324, 217, 5337, -1000, -1000, -1000, 404, 173,
+	391, 206, 207, -1000, -1000, 72, -1000, 704, -1000, -1000,
+	465, 423, 301, 735, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, 682, 301, 4890, 657, 125, -1000, -1000, -1000,
 	-1000, -1000, 396, -1000, -1000, -1000, 67, -1000, -1000, -1000,
-	-1000, -1000, 5337, -1000, 733, -1000, 520, -31, 534, -1000,
-	734, -1000, 2822, 114, 6135, -13, -1000, 558, -1000, 397,
-	-1000, 4070, 326, -1000, 5337, -70, 2658, -1000, 198, 21,
-	655, 655, 197, -1000, 500, -1000, -1000, 593, 219, -1000,
-	709, 5054, 602, 92, -1000, -1000, -1000, -1000, -1000, -1000,
-	3622, -32, -1000, 166, -34, 520, 733, -1000, -1000, -39,
-	110, -1000, 164, -1000, 6135, 194, -16, 108, 553, 655,
-	-1000, -1000, -1000, 161, 160, -1000, 105, 302, -1000, -19,
-	264, -20, 543, 706, 395, -1000, -1000, 499, 6135, 131,
-	-1000, 703, 5054, -1000, -1000, 3925, 3622, -1000, 389, -1000,
-	-1000, -1000, -40, -1000, -1000, 4234, 6557, -1000, -1000, -1000,
-	-1000, -1000, 102, -24, 2494, 4070, -1000, -1000, 568, -1000,
-	2330, -1000, -1000, -1000, 291, -1000, -1000, 475, 6135, -1000,
-	-1000, 7311, -1000, 5054, 6135, 192, -1000, 3786, -1000, 89,
-	87, 399, 434, 345, -1000, 221, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, 3622, -1000, -1000, 86, -1000, 157, 302,
-	-1000, 2166, 2002, -1000, 543, -1000, 7311, -1000, 7311, 264,
-	-1000, -1000, -1000, -1000, 302, 5193, 5054, 1838, 3622, 1674,
-	-1000, -25, -1000, -1000, -1000, -1000, 129, 724, -1000, -1000,
-	5054, -1000, 82, -1000, -1000, 655, -1000, -1000, 1510, -48,
+	-1000, -1000, 5337, -1000, 714, -1000, 514, -31, 504, -1000,
+	718, -1000, 2822, 122, 6135, -13, -1000, 563, -1000, 391,
+	-1000, 4070, 7107, -1000, 5337, -70, 2658, -1000, 216, 66,
+	655, 655, 190, -1000, 482, -1000, -1000, 546, 189, -1000,
+	687, 5054, 628, 92, -1000, -1000, -1000, -1000, -1000, -1000,
+	3622, -32, -1000, 171, -34, 514, 714, -1000, -1000, -41,
+	119, -1000, 169, -1000, 6135, 194, -16, 116, 539, 655,
+	-1000, -1000, -1000, 166, 164, -1000, 114, 301, -1000, -19,
+	206, -22, 507, 683, 395, -1000, -1000, 465, 6135, 133,
+	-1000, 675, 5054, -1000, -1000, 3925, 3622, -1000, 389, -1000,
+	-1000, -1000, -48, -1000, -1000, 4234, 6557, -1000, -1000, -1000,
+	-1000, -1000, 109, -24, 2494, 4070, -1000, -1000, 511, -1000,
+	2330, -1000, -1000, -1000, 260, -1000, -1000, 455, 6135, -1000,
+	-1000, 7351, -1000, 5054, 6135, 108, -1000, 3786, -1000, 107,
+	105, 387, 399, 307, -1000, 231, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, 3622, -1000, -1000, 102, -1000, 157, 301,
+	-1000, 2166, 2002, -1000, 507, -1000, 7351, -1000, 7351, 206,
+	-1000, -1000, -1000, -1000, 301, 5193, 5054, 1838, 3622, 1674,
+	-1000, -25, -1000, -1000, -1000, -1000, 129, 704, -1000, -1000,
+	5054, -1000, 87, -1000, -1000, 655, -1000, -1000, 1510, -35,
 	-1000, -1000, -1000, -1000, 1346, -1000,
 }
 var yyPgo = [...]int{
 
-	0, 719, 902, 900, 81, 6, 899, 3, 897, 28,
-	14, 80, 27, 895, 1, 893, 76, 75, 892, 2,
-	16, 38, 7, 891, 31, 0, 890, 888, 178, 279,
-	887, 886, 885, 883, 878, 37, 876, 875, 872, 29,
-	77, 871, 71, 869, 49, 866, 59, 865, 41, 18,
-	44, 70, 864, 863, 11, 85, 53, 856, 855, 851,
-	850, 17, 849, 848, 846, 5, 842, 13, 840, 10,
-	839, 4, 838, 837, 9, 836, 834, 832, 830, 828,
-	826, 590, 102, 822, 68, 103, 821, 820, 52, 818,
-	48, 732, 817, 808, 32, 24, 516, 19, 15, 88,
-	47, 43, 807, 42, 35, 83, 806, 33, 803, 800,
-	84, 798, 794, 60, 82, 790, 788, 785, 36, 776,
-	773, 20, 768, 8, 767, 25, 12,
+	0, 681, 885, 883, 81, 6, 878, 3, 876, 28,
+	14, 80, 27, 875, 1, 872, 76, 75, 871, 2,
+	16, 38, 7, 869, 31, 0, 866, 865, 178, 279,
+	864, 863, 856, 855, 851, 37, 850, 849, 848, 29,
+	77, 846, 71, 842, 49, 840, 59, 839, 41, 18,
+	44, 70, 838, 837, 11, 88, 53, 836, 834, 832,
+	830, 17, 828, 826, 822, 5, 821, 13, 820, 10,
+	818, 4, 817, 808, 9, 807, 806, 803, 800, 798,
+	794, 538, 102, 793, 68, 103, 790, 788, 52, 785,
+	48, 714, 781, 779, 32, 24, 513, 19, 15, 83,
+	47, 43, 778, 42, 35, 84, 777, 33, 776, 773,
+	85, 768, 767, 60, 82, 766, 764, 757, 36, 756,
+	755, 20, 753, 8, 744, 25, 12,
 }
 var yyR1 = [...]int{
 
@@ -1412,48 +1416,48 @@ var yyR1 = [...]int{
 	5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
 	5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
 	5, 5, 5, 5, 5, 5, 5, 5, 5, 6,
-	6, 6, 6, 6, 6, 6, 7, 7, 9, 9,
-	10, 10, 10, 11, 11, 8, 8, 8, 8, 8,
+	6, 6, 6, 6, 6, 6, 7, 7, 11, 11,
+	9, 9, 10, 10, 10, 8, 8, 8, 8, 8,
 	8, 8, 8, 8, 8, 8, 8, 8, 8, 91,
-	91, 92, 92, 93, 93, 94, 94, 95, 95, 96,
-	96, 97, 97, 98, 98, 99, 99, 14, 14, 13,
-	13, 13, 13, 13, 13, 12, 12, 12, 12, 12,
+	91, 92, 92, 93, 93, 125, 125, 94, 94, 95,
+	95, 96, 96, 97, 97, 98, 98, 99, 99, 55,
+	55, 14, 14, 13, 13, 13, 13, 13, 13, 12,
 	12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-	12, 12, 12, 12, 12, 12, 12, 12, 12, 58,
-	58, 59, 59, 60, 60, 55, 55, 56, 57, 57,
-	30, 30, 31, 31, 32, 32, 33, 33, 34, 34,
-	35, 35, 36, 36, 111, 112, 112, 113, 113, 38,
-	38, 38, 38, 39, 39, 39, 126, 126, 37, 37,
-	49, 49, 49, 49, 50, 51, 51, 52, 52, 53,
-	53, 53, 53, 53, 53, 54, 54, 41, 41, 42,
-	43, 43, 44, 44, 45, 45, 46, 47, 47, 48,
-	125, 125, 16, 16, 15, 15, 1, 1, 100, 101,
-	103, 103, 102, 102, 104, 104, 61, 61, 62, 62,
-	62, 62, 71, 71, 72, 72, 72, 73, 73, 74,
-	74, 75, 76, 76, 76, 76, 77, 77, 78, 79,
-	79, 63, 63, 68, 68, 69, 70, 70, 64, 64,
-	65, 65, 65, 65, 65, 65, 66, 66, 67, 67,
-	17, 22, 22, 23, 23, 24, 24, 18, 18, 4,
-	4, 2, 2, 3, 3, 20, 20, 21, 21, 21,
-	19, 19, 26, 26, 26, 26, 26, 26, 26, 26,
+	12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+	12, 12, 12, 58, 58, 59, 59, 60, 60, 47,
+	47, 48, 17, 2, 2, 3, 3, 16, 16, 15,
+	15, 1, 1, 100, 101, 103, 103, 102, 102, 104,
+	104, 49, 49, 49, 49, 37, 37, 54, 54, 57,
+	57, 38, 38, 38, 38, 39, 39, 39, 126, 126,
+	34, 34, 30, 30, 31, 31, 32, 32, 33, 33,
+	22, 22, 23, 23, 24, 24, 18, 18, 20, 20,
+	21, 21, 21, 19, 19, 105, 105, 106, 106, 107,
+	107, 41, 41, 42, 43, 43, 44, 44, 61, 61,
+	62, 62, 62, 62, 71, 71, 72, 72, 72, 73,
+	73, 74, 74, 75, 76, 76, 76, 76, 77, 77,
+	78, 79, 79, 63, 63, 70, 70, 64, 64, 65,
+	65, 65, 65, 65, 65, 66, 66, 67, 67, 68,
+	68, 69, 56, 45, 45, 46, 35, 35, 36, 36,
+	111, 112, 112, 26, 26, 26, 26, 26, 26, 26,
 	26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
 	26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
 	26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
 	26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
 	26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
 	26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-	26, 26, 26, 26, 26, 26, 121, 121, 122, 122,
-	123, 123, 80, 80, 80, 80, 80, 80, 80, 80,
-	80, 80, 80, 80, 80, 80, 80, 80, 81, 81,
-	81, 81, 82, 82, 82, 82, 82, 82, 82, 83,
-	83, 83, 83, 116, 116, 116, 116, 116, 116, 116,
-	117, 117, 118, 84, 84, 84, 85, 85, 114, 114,
-	119, 119, 120, 120, 120, 86, 87, 87, 87, 108,
-	108, 108, 88, 88, 88, 25, 25, 40, 40, 27,
-	27, 27, 27, 27, 27, 109, 109, 109, 109, 110,
-	110, 110, 105, 105, 106, 106, 107, 107, 28, 28,
-	28, 90, 90, 90, 29, 29, 29, 89, 89, 115,
-	115, 115, 115, 115, 115,
+	26, 26, 26, 26, 26, 26, 26, 4, 4, 121,
+	121, 122, 122, 123, 123, 109, 109, 109, 109, 85,
+	85, 114, 114, 119, 119, 120, 120, 120, 113, 113,
+	88, 88, 88, 80, 80, 80, 80, 80, 80, 80,
+	80, 80, 80, 80, 80, 80, 80, 80, 80, 84,
+	84, 84, 25, 25, 40, 40, 86, 87, 87, 87,
+	108, 108, 108, 27, 27, 27, 27, 27, 27, 28,
+	28, 28, 29, 29, 29, 89, 89, 115, 115, 115,
+	115, 115, 115, 110, 110, 110, 90, 90, 90, 50,
+	51, 51, 52, 52, 53, 53, 53, 53, 53, 53,
+	81, 81, 81, 81, 82, 82, 82, 82, 82, 82,
+	82, 83, 83, 83, 83, 116, 116, 116, 116, 116,
+	116, 116, 117, 117, 118,
 }
 var yyR2 = [...]int{
 
@@ -1464,48 +1468,48 @@ var yyR2 = [...]int{
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 3,
-	1, 2, 3, 2, 0, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 2, 0,
+	1, 3, 1, 2, 3, 1, 1, 1, 1, 1,
 	4, 3, 5, 4, 3, 4, 3, 4, 3, 1,
-	1, 6, 7, 6, 7, 3, 1, 3, 1, 3,
-	1, 1, 2, 1, 3, 1, 2, 2, 0, 1,
-	1, 1, 1, 1, 4, 3, 1, 1, 5, 7,
-	9, 5, 3, 3, 3, 3, 3, 3, 1, 2,
-	6, 7, 9, 5, 1, 6, 3, 3, 2, 0,
-	9, 1, 3, 0, 4, 3, 1, 3, 1, 4,
-	5, 6, 1, 3, 6, 7, 3, 6, 1, 4,
-	0, 1, 3, 1, 7, 3, 2, 0, 1, 3,
-	4, 4, 5, 0, 5, 4, 1, 1, 1, 4,
-	1, 2, 4, 3, 1, 0, 1, 3, 1, 3,
-	1, 4, 2, 6, 4, 1, 4, 3, 1, 1,
-	3, 1, 1, 3, 3, 1, 1, 1, 3, 1,
-	0, 1, 8, 7, 1, 2, 1, 1, 5, 6,
-	0, 2, 0, 2, 0, 2, 2, 0, 3, 4,
-	3, 9, 1, 3, 1, 2, 3, 1, 2, 2,
-	2, 3, 3, 3, 4, 3, 1, 1, 3, 1,
-	3, 1, 1, 3, 1, 3, 0, 1, 1, 2,
-	1, 1, 1, 1, 1, 1, 3, 1, 1, 3,
-	10, 1, 0, 1, 3, 4, 6, 0, 1, 0,
-	1, 0, 1, 0, 1, 1, 2, 1, 1, 1,
-	0, 2, 3, 4, 2, 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,
+	1, 6, 7, 6, 7, 0, 1, 3, 1, 3,
+	1, 3, 1, 1, 2, 1, 3, 1, 2, 3,
+	1, 2, 0, 1, 1, 1, 1, 1, 4, 3,
+	1, 1, 5, 7, 9, 5, 3, 3, 3, 3,
+	3, 3, 1, 2, 6, 7, 9, 5, 1, 6,
+	3, 3, 2, 0, 9, 1, 3, 0, 4, 1,
+	3, 1, 10, 0, 1, 0, 1, 8, 7, 1,
+	2, 1, 1, 5, 6, 0, 2, 0, 2, 0,
+	2, 1, 2, 4, 3, 1, 4, 1, 4, 1,
+	4, 3, 4, 4, 5, 0, 5, 4, 1, 1,
+	1, 4, 5, 6, 1, 3, 6, 7, 3, 6,
+	1, 0, 1, 3, 4, 6, 0, 1, 1, 2,
+	1, 1, 1, 0, 2, 2, 4, 1, 3, 1,
+	2, 3, 1, 1, 3, 1, 1, 3, 2, 0,
+	3, 4, 3, 9, 1, 3, 1, 2, 3, 1,
+	2, 2, 2, 3, 3, 3, 4, 3, 1, 1,
+	3, 1, 3, 1, 1, 0, 1, 1, 2, 1,
+	1, 1, 1, 1, 1, 3, 1, 1, 3, 3,
+	1, 3, 3, 3, 1, 1, 0, 1, 3, 1,
+	7, 3, 2, 3, 4, 2, 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, 3, 1, 5, 4, 3, 1, 2, 2,
-	2, 2, 2, 2, 2, 2, 2, 1, 3, 2,
-	1, 2, 4, 2, 10, 11, 0, 4, 3, 1,
-	1, 2, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 3, 2, 3, 3, 1, 1, 2, 2,
-	1, 2, 1, 4, 3, 3, 3, 6, 3, 1,
-	1, 2, 1, 5, 4, 2, 2, 4, 2, 2,
-	1, 3, 1, 1, 3, 3, 1, 1, 1, 1,
-	0, 3, 0, 1, 1, 1, 1, 3, 1, 1,
-	3, 1, 4, 3, 1, 1, 1, 0, 1, 1,
-	4, 4, 4, 4, 1, 2, 4, 4, 2, 1,
-	3, 1, 2, 4, 1, 3, 1, 2, 1, 1,
-	3, 1, 3, 1, 1, 4, 2, 3, 3, 1,
-	4, 4, 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, 3, 1, 5, 4, 3, 1, 2,
+	2, 2, 2, 2, 2, 2, 2, 2, 1, 3,
+	2, 1, 2, 4, 2, 10, 11, 0, 1, 0,
+	4, 3, 1, 1, 2, 2, 4, 4, 2, 1,
+	1, 1, 1, 0, 3, 0, 1, 1, 0, 1,
+	4, 3, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 3, 2, 3, 3, 1, 1, 1,
+	3, 3, 1, 1, 0, 1, 1, 1, 3, 1,
+	1, 3, 1, 1, 4, 4, 4, 4, 1, 1,
+	1, 3, 1, 4, 2, 3, 3, 1, 4, 4,
+	3, 3, 3, 1, 3, 1, 1, 3, 1, 1,
+	0, 1, 3, 1, 3, 1, 4, 2, 6, 4,
+	2, 2, 1, 2, 1, 4, 3, 3, 3, 6,
+	3, 1, 1, 2, 1, 5, 4, 2, 2, 4,
+	2, 2, 1, 3, 1,
 }
 var yyChk = [...]int{
 
@@ -1550,15 +1554,15 @@ var yyChk = [...]int{
 	159, 161, 31, -25, 37, -25, -25, -25, -25, -25,
 	-25, -25, -25, -25, -25, -25, -25, -25, -40, -25,
 	-90, 86, 162, -29, -25, 160, -40, 165, -82, -82,
-	93, 69, 133, -25, 87, -28, 15, -40, -7, -110,
-	-29, 86, -6, 162, -5, 76, 77, 78, 79, 80,
+	93, 69, 133, -25, 87, -28, 15, -40, -110, -7,
+	-29, 162, 86, -6, -5, 76, 77, 78, 79, 80,
 	81, 4, 5, 6, 7, 8, 10, 11, 12, 56,
 	70, 71, 82, 83, 73, 74, 75, 95, 96, 97,
 	98, 99, 100, 101, 102, 103, 104, 105, 116, 117,
 	118, 119, 120, 121, 122, 123, 124, 125, 126, 111,
 	112, 113, 114, 115, 13, 14, 134, 106, 107, 108,
 	109, 110, 135, 136, 131, 132, 154, 129, 130, 128,
-	137, 138, 140, 139, 141, 142, 156, 155, -7, -110,
+	137, 138, 140, 139, 141, 142, 156, 155, -110, -7,
 	-29, -113, -105, 153, 69, 162, 133, 153, -113, -117,
 	-118, -25, -25, -25, 150, 150, 166, -25, 160, -106,
 	-107, -25, 158, -50, 164, 9, 15, -28, 159, 86,
@@ -1603,97 +1607,97 @@ var yyChk = [...]int{
 }
 var yyDef = [...]int{
 
-	84, -2, 1, 83, 85, 86, 87, 88, 89, 0,
-	0, 0, 0, 118, 126, 127, 0, 0, 0, 0,
-	447, 447, 447, 0, 426, 0, 138, 0, 0, 0,
-	0, 144, 0, 0, 0, 78, 289, 0, 0, 0,
-	0, 162, 0, -2, 446, 224, 0, -2, 469, 435,
-	0, 0, 0, 0, 0, 0, 0, 0, 353, 357,
-	0, 0, 0, 0, 0, 0, 0, 430, 0, 367,
-	432, 0, 370, 0, 226, 227, 449, 397, 454, 0,
+	79, -2, 1, 78, 85, 86, 87, 88, 89, 0,
+	0, 0, 0, 122, 130, 131, 0, 0, 0, 0,
+	414, 414, 414, 0, 379, 0, 142, 0, 0, 0,
+	0, 148, 0, 0, 0, 80, 367, 0, 0, 0,
+	0, 204, 0, -2, 413, 169, 0, -2, 430, 416,
+	0, 0, 0, 0, 0, 0, 0, 0, 344, 348,
+	0, 0, 0, 0, 0, 0, 0, 383, 0, 358,
+	385, 0, 361, 0, 171, 172, 423, 408, 428, 0,
 	0, -2, 0, 0, 0, 0, 0, 0, 0, 0,
-	382, 383, 384, 385, 386, 387, 388, 389, 390, 391,
-	0, 0, 474, 0, -2, 0, 0, 195, 444, 80,
-	0, 0, 0, 0, 84, 78, 0, 0, 0, 113,
-	0, 99, 100, 110, 115, 0, 156, 0, 0, 0,
-	0, 289, 0, 170, 0, 0, 448, 426, 0, 0,
-	0, 208, 209, 0, 289, 211, 212, 0, 215, 216,
-	139, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	393, 394, 395, 396, 397, 398, 399, 400, 401, 402,
+	0, 0, 432, 0, -2, 0, 0, 450, 392, 82,
+	0, 0, 0, 0, 79, 80, 0, 0, 0, 115,
+	0, 99, 100, 112, 117, 0, 120, 0, 0, 0,
+	0, 367, 0, 286, 0, 0, 415, 379, 0, 0,
+	0, 232, 233, 0, 367, 235, 236, 0, 284, 285,
+	143, 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,
-	0, 0, 0, 118, 0, 0, 148, 0, 290, 0,
-	225, 230, 0, 232, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 122, 0, 0, 152, 0, 368, 0,
+	170, 175, 0, 177, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 317, 319, 0, 447, 0, 0, 304, -2,
-	0, 0, -2, 426, -2, 338, 339, 340, 341, 0,
-	358, 359, 360, 361, 362, 363, 364, 365, 447, 366,
-	0, 433, 434, 400, 402, 0, 0, 369, 371, 373,
-	447, 0, 0, 177, 176, 428, 429, 177, 427, 479,
-	0, 0, 415, 416, 0, 418, 419, 0, 393, 0,
-	0, 0, 0, 476, 455, 0, 458, 195, 0, 194,
-	198, 196, 200, 0, 0, 0, 81, 0, 82, 91,
-	84, 0, 94, 0, 0, 113, 0, 96, 0, 0,
-	0, 113, 116, 98, 0, 0, 117, 125, 119, 120,
-	121, 122, 123, 0, 0, 0, 0, 0, 171, 173,
-	0, 132, 133, 134, 135, 0, 136, 0, 0, 0,
-	137, 0, 321, 322, 323, 324, 325, 326, 327, 328,
-	329, 330, 331, 332, 333, 334, 335, 336, 337, -2,
-	-2, -2, -2, -2, -2, -2, -2, -2, 351, 0,
-	0, 356, 220, 217, -2, 0, 0, 0, 146, 147,
-	0, -2, 230, 234, 0, 237, 0, 0, 0, 163,
-	0, 166, 118, 302, 0, 305, 306, 307, 308, 309,
-	310, 311, 312, 313, 314, 315, 316, 0, 0, 0,
-	470, 471, 0, 473, 0, -2, 0, 368, 401, 398,
-	399, 0, 0, 0, 0, 436, 0, 0, -2, 0,
-	-2, 76, 77, 0, 69, 70, 71, 72, 73, 74,
+	0, 0, 308, 310, 0, 414, 0, 0, 295, -2,
+	0, 0, -2, 379, -2, 329, 330, 331, 332, 0,
+	349, 350, 351, 352, 353, 354, 355, 356, 414, 357,
+	0, 386, 387, 462, 464, 0, 0, 360, 362, 364,
+	414, 0, 0, 388, 292, 381, 382, 388, 380, 437,
+	0, 0, 477, 478, 0, 480, 481, 0, 404, 0,
+	0, 0, 0, 434, 375, 0, 378, 450, 0, 449,
+	453, 451, 455, 0, 0, 0, 83, 0, 84, 91,
+	79, 0, 94, 0, 0, 115, 0, 96, 0, 0,
+	0, 115, 118, 98, 0, 0, 121, 129, 123, 124,
+	125, 126, 127, 0, 0, 0, 0, 0, 287, 289,
+	0, 136, 137, 138, 139, 0, 140, 0, 0, 0,
+	141, 0, 312, 313, 314, 315, 316, 317, 318, 319,
+	320, 321, 322, 323, 324, 325, 326, 327, 328, -2,
+	-2, -2, -2, -2, -2, -2, -2, -2, 342, 0,
+	0, 347, 105, 159, -2, 0, 0, 0, 150, 151,
+	0, -2, 175, 179, 0, 239, 0, 0, 0, 205,
+	0, 208, 122, 293, 0, 296, 297, 298, 299, 300,
+	301, 302, 303, 304, 305, 306, 307, 0, 0, 0,
+	431, 446, 0, 448, 0, -2, 0, 359, 463, 460,
+	461, 0, 0, 0, 0, 417, 0, 0, 0, -2,
+	-2, 0, 76, 77, 69, 70, 71, 72, 73, 74,
 	75, 2, 3, 4, 5, 6, 7, 8, 9, 10,
 	11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
 	21, 22, 23, 24, 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, 50,
 	51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
-	61, 62, 63, 64, 65, 66, 67, 68, -2, 0,
-	-2, 175, 178, 0, 447, 0, 0, 0, 230, 220,
-	420, 422, 0, 0, 392, 395, 394, 0, 462, 220,
-	464, 466, 0, 0, 443, 195, 0, -2, 195, 79,
-	90, 0, 93, 95, 97, 0, 113, 109, 0, 113,
-	0, 114, 0, 155, 157, 0, 0, 0, 170, 0,
-	0, 207, 210, -2, 213, 214, 0, 355, 0, 221,
-	0, 0, 149, -2, 0, 281, 283, 291, 288, 295,
-	0, 297, 298, 299, 234, 0, 0, 231, 266, 237,
-	233, 242, 0, 0, 0, 303, 0, 450, 452, 453,
-	0, -2, 431, 0, 409, 410, 0, 412, 404, 405,
-	406, 0, 408, 372, 451, 456, 0, 457, 483, 0,
-	0, 482, 484, 234, 0, 221, 414, 417, 475, 0,
-	221, 467, 442, 197, 199, 0, 0, 0, 92, 0,
-	0, 220, 106, 111, 0, 0, 0, 128, 168, 118,
-	0, 0, 172, 131, 183, 183, 0, 354, 0, 218,
-	0, -2, 0, 0, 195, 143, 158, 118, 153, 0,
-	376, 287, 293, 292, 296, 0, 237, 235, 228, 236,
-	0, 0, 0, -2, 262, 268, 270, 271, 272, 273,
-	274, 275, 266, 0, 0, 0, 0, 160, 118, 472,
-	403, 411, 0, 460, 480, 481, 0, 413, 421, 463,
-	465, -2, 195, 204, 220, 108, 0, 0, 221, 112,
-	220, 124, 0, 0, 170, 0, 183, 0, 183, 376,
-	140, 0, 0, -2, 195, 0, 0, 145, 0, 0,
-	300, 300, 0, 284, 0, 294, 237, 266, 0, 277,
-	278, 0, 289, 0, 269, 229, 243, 161, 118, 167,
-	164, 0, 237, 0, 0, 221, 220, 103, 105, 0,
-	0, 129, 0, 179, 0, 0, 0, 0, 0, 300,
-	141, 205, 118, 0, 0, -2, 0, 0, 118, 0,
-	0, 0, 0, 285, 266, 223, 238, 0, 0, 0,
-	264, 0, 0, 240, 244, 0, 165, 407, 266, 203,
-	101, 107, 0, 104, 169, 0, 0, 118, 186, 187,
-	180, 181, 0, 0, 0, 0, 192, 159, 0, 151,
-	0, 118, 301, 118, 0, 379, 380, 0, 0, 222,
-	276, 279, 239, 0, 0, 0, 245, 0, 247, 0,
-	0, 257, 0, 0, 256, 57, -2, 174, 102, 130,
-	188, 118, 118, 185, 182, 118, 0, 142, 0, 0,
-	154, 0, 0, 377, 0, 381, 286, 263, 265, -2,
-	246, 248, 249, 250, 0, 0, 0, 0, 184, 0,
-	206, 0, 152, 280, 374, 378, 0, 251, 252, 253,
-	255, 258, 0, 375, 118, 300, 254, 189, 0, 0,
-	150, 241, 259, 118, 0, 260,
+	61, 62, 63, 64, 65, 66, 67, 68, 0, -2,
+	-2, 291, 389, 0, 414, 0, 0, 0, 175, 105,
+	482, 484, 0, 0, 403, 406, 405, 0, 225, 105,
+	227, 229, 0, 0, 391, 450, 0, -2, 450, 81,
+	90, 0, 93, 95, 97, 0, 115, 111, 0, 115,
+	0, 116, 0, 119, 282, 0, 0, 0, 286, 0,
+	0, 231, 234, -2, 237, 283, 0, 346, 0, 106,
+	0, 0, 153, -2, 0, 210, 212, 163, 217, 218,
+	0, 220, 221, 222, 179, 0, 0, 176, 265, 239,
+	178, 244, 0, 0, 0, 294, 0, 424, 426, 427,
+	0, -2, 384, 0, 471, 472, 0, 474, 466, 467,
+	468, 0, 470, 363, 425, 376, 0, 377, 441, 0,
+	0, 440, 442, 179, 0, 106, 476, 479, 433, 0,
+	106, 230, 390, 452, 454, 0, 0, 0, 92, 0,
+	0, 105, 108, 113, 0, 0, 0, 132, 200, 122,
+	0, 0, 288, 135, 195, 195, 0, 345, 0, 160,
+	0, -2, 0, 0, 450, 147, 189, 122, 157, 0,
+	369, 216, 165, 164, 219, 0, 239, 180, 173, 238,
+	0, 0, 0, -2, 264, 267, 269, 270, 271, 272,
+	273, 274, 265, 0, 0, 0, 0, 202, 122, 447,
+	465, 473, 0, 444, 438, 439, 0, 475, 483, 226,
+	228, -2, 450, 459, 105, 110, 0, 0, 106, 114,
+	105, 128, 0, 0, 286, 0, 195, 0, 195, 369,
+	144, 0, 0, -2, 450, 0, 0, 149, 0, 0,
+	223, 223, 0, 213, 0, 166, 239, 265, 0, 276,
+	277, 0, 367, 0, 268, 174, 245, 203, 122, 209,
+	206, 0, 239, 0, 0, 106, 105, 103, 107, 0,
+	0, 133, 0, 191, 0, 0, 0, 0, 0, 223,
+	145, 187, 122, 0, 0, -2, 0, 0, 122, 0,
+	0, 0, 0, 214, 265, 168, 240, 0, 0, 0,
+	280, 0, 0, 242, 246, 0, 207, 469, 265, 458,
+	101, 109, 0, 104, 201, 0, 0, 122, 198, 199,
+	192, 193, 0, 0, 0, 0, 183, 190, 0, 155,
+	0, 122, 224, 122, 0, 372, 373, 0, 0, 167,
+	275, 278, 241, 0, 0, 0, 247, 0, 249, 0,
+	0, 259, 0, 0, 258, 57, -2, 290, 102, 134,
+	185, 122, 122, 197, 194, 122, 0, 146, 0, 0,
+	158, 0, 0, 370, 0, 374, 215, 279, 281, -2,
+	248, 250, 251, 252, 0, 0, 0, 0, 196, 0,
+	188, 0, 156, 162, 365, 371, 0, 253, 254, 255,
+	257, 260, 0, 366, 122, 223, 256, 186, 0, 0,
+	154, 243, 261, 122, 0, 262,
 }
 var yyTok1 = [...]int{
 
@@ -2532,46 +2536,46 @@ yydefault:
 			yyVAL.node = Node("identifier").attribute("value", yyDollar[1].value)
 		}
 	case 78:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		//line parser.y:346
 		{
-			yyVAL.node = Node("NamespaceParts").append(Node(yyDollar[1].token))
+			yyVAL.node = yyDollar[1].node.append(yyDollar[2].node)
 		}
 	case 79:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 		//line parser.y:347
 		{
-			yyVAL.node = yyDollar[1].node.append(Node(yyDollar[3].token))
+			yyVAL.node = Node("Statements")
 		}
 	case 80:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line parser.y:351
 		{
-			yyVAL.node = Node("Name").append(yyDollar[1].node)
+			yyVAL.node = Node("NamespaceParts").append(Node(yyDollar[1].token))
 		}
 	case 81:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:352
 		{
-			yyVAL.node = Node("Name").append(yyDollar[2].node).attribute("FullyQualified", "true")
+			yyVAL.node = yyDollar[1].node.append(Node(yyDollar[3].token))
 		}
 	case 82:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:353
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:356
 		{
-			yyVAL.node = Node("Name").append(yyDollar[3].node).attribute("Relative", "true")
+			yyVAL.node = Node("Name").append(yyDollar[1].node)
 		}
 	case 83:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		//line parser.y:357
 		{
-			yyVAL.node = yyDollar[1].node.append(yyDollar[2].node)
+			yyVAL.node = Node("Name").append(yyDollar[2].node).attribute("FullyQualified", "true")
 		}
 	case 84:
-		yyDollar = yyS[yypt-0 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:358
 		{
-			yyVAL.node = Node("Statements")
+			yyVAL.node = Node("Name").append(yyDollar[3].node).attribute("Relative", "true")
 		}
 	case 85:
 		yyDollar = yyS[yypt-1 : yypt+1]
@@ -2693,18 +2697,6 @@ yydefault:
 		{
 			yyVAL.node = Node("MixedGroupUse").append(yyDollar[2].node).append(yyDollar[5].node)
 		}
-	case 105:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:400
-		{
-			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
-		}
-	case 106:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:401
-		{
-			yyVAL.node = Node("UseList").append(yyDollar[1].node)
-		}
 	case 107:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:405
@@ -2719,137 +2711,161 @@ yydefault:
 		}
 	case 109:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:409
+		//line parser.y:411
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
 	case 110:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:410
+		//line parser.y:412
 		{
 			yyVAL.node = Node("UseList").append(yyDollar[1].node)
 		}
 	case 111:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:413
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:416
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
 	case 112:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:414
-		{
-			yyVAL.node = yyDollar[2].node.append(yyDollar[1].node)
-		}
-	case 113:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line parser.y:417
 		{
-			yyVAL.node = Node("UseElem").append(yyDollar[1].node)
+			yyVAL.node = Node("UseList").append(yyDollar[1].node)
 		}
-	case 114:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:418
-		{
-			yyVAL.node = Node("UseElem").append(yyDollar[1].node).append(Node("as").attribute("value", yyDollar[3].token))
-		}
-	case 115:
+	case 113:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line parser.y:421
 		{
 			yyVAL.node = yyDollar[1].node
 		}
-	case 116:
+	case 114:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		//line parser.y:422
 		{
-			yyVAL.node = yyDollar[2].node
+			yyVAL.node = yyDollar[2].node.append(yyDollar[1].node)
 		}
-	case 117:
-		yyDollar = yyS[yypt-2 : yypt+1]
+	case 115:
+		yyDollar = yyS[yypt-1 : yypt+1]
 		//line parser.y:426
 		{
-			yyVAL.node = yyDollar[1].node.append(yyDollar[2].node)
+			yyVAL.node = Node("UseElem").append(yyDollar[1].node)
 		}
-	case 118:
-		yyDollar = yyS[yypt-0 : yypt+1]
+	case 116:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:427
 		{
-			yyVAL.node = Node("stmt")
+			yyVAL.node = Node("UseElem").append(yyDollar[1].node).append(Node("as").attribute("value", yyDollar[3].token))
 		}
-	case 119:
+	case 117:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line parser.y:431
 		{
 			yyVAL.node = yyDollar[1].node
 		}
-	case 120:
-		yyDollar = yyS[yypt-1 : yypt+1]
+	case 118:
+		yyDollar = yyS[yypt-2 : yypt+1]
 		//line parser.y:432
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = yyDollar[2].node
+		}
+	case 119:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:436
+		{
+			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
+		}
+	case 120:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:437
+		{
+			yyVAL.node = Node("ConstList").append(yyDollar[1].node)
 		}
 	case 121:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:433
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:441
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = yyDollar[1].node.append(yyDollar[2].node)
 		}
 	case 122:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:434
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line parser.y:442
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("stmt")
 		}
 	case 123:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:435
+		//line parser.y:446
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 124:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:436
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:447
 		{
-			yyVAL.node = Node("THaltCompiler")
+			yyVAL.node = yyDollar[1].node
 		}
 	case 125:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:439
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:448
 		{
-			yyVAL.node = yyDollar[2].node
+			yyVAL.node = yyDollar[1].node
 		}
 	case 126:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:440
+		//line parser.y:449
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 127:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:441
+		//line parser.y:450
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 128:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:451
+		{
+			yyVAL.node = Node("THaltCompiler")
+		}
+	case 129:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:454
+		{
+			yyVAL.node = yyDollar[2].node
+		}
+	case 130:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:455
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 131:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:456
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 132:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:443
+		//line parser.y:458
 		{
 			yyVAL.node = Node("While").
 				append(Node("expr").append(yyDollar[3].node)).
 				append(Node("stmt").append(yyDollar[5].node))
 		}
-	case 129:
+	case 133:
 		yyDollar = yyS[yypt-7 : yypt+1]
-		//line parser.y:449
+		//line parser.y:464
 		{
 			yyVAL.node = Node("DoWhile").
 				append(Node("expr").append(yyDollar[5].node)).
 				append(Node("stmt").append(yyDollar[2].node))
 		}
-	case 130:
+	case 134:
 		yyDollar = yyS[yypt-9 : yypt+1]
-		//line parser.y:455
+		//line parser.y:470
 		{
 			yyVAL.node = Node("For").
 				append(Node("expr1").append(yyDollar[3].node)).
@@ -2857,78 +2873,78 @@ yydefault:
 				append(Node("expr3").append(yyDollar[7].node)).
 				append(Node("stmt").append(yyDollar[9].node))
 		}
-	case 131:
+	case 135:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:462
+		//line parser.y:477
 		{
 			yyVAL.node = Node("Switch").append(Node("expr").append(yyDollar[3].node)).append(yyDollar[5].node)
 		}
-	case 132:
+	case 136:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:463
+		//line parser.y:478
 		{
 			yyVAL.node = Node("Break").append(yyDollar[2].node)
 		}
-	case 133:
+	case 137:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:464
+		//line parser.y:479
 		{
 			yyVAL.node = Node("Continue").append(yyDollar[2].node)
 		}
-	case 134:
+	case 138:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:465
+		//line parser.y:480
 		{
 			yyVAL.node = Node("Return").append(yyDollar[2].node)
 		}
-	case 135:
+	case 139:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:466
+		//line parser.y:481
 		{
 			yyVAL.node = yyDollar[2].node
 		}
-	case 136:
+	case 140:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:467
+		//line parser.y:482
 		{
 			yyVAL.node = yyDollar[2].node
 		}
-	case 137:
+	case 141:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:468
+		//line parser.y:483
 		{
 			yyVAL.node = yyDollar[2].node
 		}
-	case 138:
+	case 142:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:469
+		//line parser.y:484
 		{
 			yyVAL.node = Node("Echo").append(Node("InlineHtml").attribute("value", yyDollar[1].token))
 		}
-	case 139:
+	case 143:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:470
+		//line parser.y:485
 		{
 			yyVAL.node = yyDollar[1].node
 		}
-	case 140:
+	case 144:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line parser.y:472
+		//line parser.y:487
 		{
 			yyVAL.node = Node("Unset").append(yyDollar[3].node)
 		}
-	case 141:
+	case 145:
 		yyDollar = yyS[yypt-7 : yypt+1]
-		//line parser.y:474
+		//line parser.y:489
 		{
 			yyVAL.node = Node("Foreach").
 				append(Node("expr").append(yyDollar[3].node)).
 				append(Node("ForeachVariable").append(yyDollar[5].node)).
 				append(yyDollar[7].node)
 		}
-	case 142:
+	case 146:
 		yyDollar = yyS[yypt-9 : yypt+1]
-		//line parser.y:481
+		//line parser.y:496
 		{
 			yyVAL.node = Node("Foreach").
 				append(Node("expr").append(yyDollar[3].node)).
@@ -2936,470 +2952,137 @@ yydefault:
 				append(Node("ForeachVariable").append(yyDollar[7].node)).
 				append(yyDollar[9].node)
 		}
-	case 143:
+	case 147:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:488
+		//line parser.y:503
 		{
 			yyVAL.node = Node("Declare").append(yyDollar[3].node).append(yyDollar[5].node)
 		}
-	case 144:
+	case 148:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:489
+		//line parser.y:504
 		{
 			yyVAL.node = Node("")
 		}
-	case 145:
+	case 149:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line parser.y:491
+		//line parser.y:506
 		{
 			yyVAL.node = Node("Try").
 				append(yyDollar[3].node).
 				append(yyDollar[5].node).
 				append(yyDollar[6].node)
 		}
-	case 146:
+	case 150:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:497
+		//line parser.y:512
 		{
 			yyVAL.node = Node("Throw").append(yyDollar[2].node)
 		}
-	case 147:
+	case 151:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:498
+		//line parser.y:513
 		{
 			yyVAL.node = Node("GoTo").attribute("Label", yyDollar[2].token)
 		}
-	case 148:
+	case 152:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:499
+		//line parser.y:514
 		{
 			yyVAL.node = Node("Label").attribute("name", yyDollar[1].token)
 		}
-	case 149:
+	case 153:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:502
+		//line parser.y:517
 		{
 			yyVAL.node = Node("CatchList")
 		}
-	case 150:
+	case 154:
 		yyDollar = yyS[yypt-9 : yypt+1]
-		//line parser.y:504
+		//line parser.y:519
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[4].node).append(Node("Variable").attribute("name", yyDollar[5].token)).append(yyDollar[8].node)
 		}
-	case 151:
+	case 155:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:507
+		//line parser.y:522
 		{
 			yyVAL.node = Node("CatchNameList").append(yyDollar[1].node)
 		}
-	case 152:
+	case 156:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:508
+		//line parser.y:523
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
-	case 153:
+	case 157:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:512
+		//line parser.y:527
 		{
 			yyVAL.node = Node("")
 		}
-	case 154:
+	case 158:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:513
+		//line parser.y:528
 		{
 			yyVAL.node = Node("Finnaly").append(yyDollar[3].node)
 		}
-	case 155:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:517
-		{
-			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
-		}
-	case 156:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:518
-		{
-			yyVAL.node = Node("ConstList").append(yyDollar[1].node)
-		}
-	case 157:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:522
-		{
-			yyVAL.node = Node("Const").attribute("name", yyDollar[1].token).append(yyDollar[3].node)
-		}
-	case 158:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:526
-		{
-			yyVAL.node = yyDollar[1].node
-		}
 	case 159:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:527
-		{
-			yyVAL.node = yyDollar[2].node
-		}
-	case 160:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		//line parser.y:532
-		{
-			yyVAL.node = Node("If").append(Node("expr").append(yyDollar[3].node)).append(Node("stmt").append(yyDollar[5].node))
-		}
-	case 161:
-		yyDollar = yyS[yypt-6 : yypt+1]
-		//line parser.y:536
-		{
-			yyVAL.node = yyDollar[1].node.append(Node("ElseIf").append(Node("expr").append(yyDollar[4].node)).append(Node("stmt").append(yyDollar[6].node)))
-		}
-	case 162:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:542
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 163:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:544
-		{
-			yyVAL.node = yyDollar[1].node.append(Node("Else").append(Node("stmt").append(yyDollar[3].node)))
-		}
-	case 164:
-		yyDollar = yyS[yypt-6 : yypt+1]
-		//line parser.y:551
-		{
-			yyVAL.node = Node("AltIf").append(Node("expr").append(yyDollar[3].node)).append(Node("stmt").append(yyDollar[6].node))
-		}
-	case 165:
-		yyDollar = yyS[yypt-7 : yypt+1]
-		//line parser.y:555
-		{
-			yyVAL.node = yyDollar[1].node.append(Node("AltElseIf").append(Node("expr").append(yyDollar[4].node)).append(Node("stmt").append(yyDollar[7].node)))
-		}
-	case 166:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:561
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 167:
-		yyDollar = yyS[yypt-6 : yypt+1]
-		//line parser.y:563
-		{
-			yyVAL.node = yyDollar[1].node.append(Node("AltElse").append(Node("stmt").append(yyDollar[4].node)))
-		}
-	case 168:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:569
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 169:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:570
-		{
-			yyVAL.node = yyDollar[2].node
-		}
-	case 170:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:574
-		{
-			yyVAL.node = Node("")
-		}
-	case 171:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:575
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 172:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:578
-		{
-			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
-		}
-	case 173:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:579
-		{
-			yyVAL.node = Node("ExpressionList").append(yyDollar[1].node)
-		}
-	case 174:
-		yyDollar = yyS[yypt-7 : yypt+1]
-		//line parser.y:584
-		{
-			yyVAL.node = Node("AnonymousClass").
-				attribute("name", yyDollar[1].token).
-				append(yyDollar[2].node).
-				append(yyDollar[3].node).
-				append(yyDollar[4].node).
-				append(yyDollar[6].node)
-		}
-	case 175:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:595
-		{
-			yyVAL.node = Node("New").append(yyDollar[2].node).append(yyDollar[3].node)
-		}
-	case 176:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:596
-		{
-			yyVAL.node = Node("New").append(yyDollar[2].node)
-		}
-	case 177:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:600
-		{
-			yyVAL.node = Node("ArgumentList")
-		}
-	case 178:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:601
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 179:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:605
-		{
-			yyVAL.node = yyDollar[2].node
-		}
-	case 180:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:606
-		{
-			yyVAL.node = yyDollar[3].node
-		}
-	case 181:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:607
-		{
-			yyVAL.node = yyDollar[2].node
-		}
-	case 182:
-		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:608
-		{
-			yyVAL.node = yyDollar[3].node
-		}
-	case 183:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:612
-		{
-			yyVAL.node = Node("CaseList")
-		}
-	case 184:
-		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:614
-		{
-			yyVAL.node = yyDollar[1].node.append(Node("Case").append(Node("expr").append(yyDollar[3].node)).append(yyDollar[5].node))
-		}
-	case 185:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:618
-		{
-			yyVAL.node = yyDollar[1].node.append(Node("Default").append(yyDollar[4].node))
-		}
-	case 188:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:629
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 189:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:630
-		{
-			yyVAL.node = yyDollar[2].node
-		}
-	case 190:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:634
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 191:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:635
-		{
-			yyVAL.node = Node("Ref").append(yyDollar[2].node)
-		}
-	case 192:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:636
-		{
-			yyVAL.node = Node("List").append(yyDollar[3].node)
-		}
-	case 193:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:637
-		{
-			yyVAL.node = Node("ShortList").append(yyDollar[2].node)
-		}
-	case 194:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:641
-		{ /* TODO: allow single trailing comma */
-			yyVAL.node = yyDollar[1].node
-		}
-	case 195:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:645
-		{
-			yyVAL.node = Node("")
-		}
-	case 196:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:646
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 197:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:651
-		{
-			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
-		}
-	case 198:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:652
-		{
-			yyVAL.node = Node("ArrayPairList").append(yyDollar[1].node)
-		}
-	case 199:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:656
-		{
-			yyVAL.node = Node("ArrayElement").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 200:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:657
-		{
-			yyVAL.node = Node("ArrayElement").append(yyDollar[1].node)
-		}
-	case 201:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:658
-		{
-			yyVAL.node = Node("ArrayElement").append(yyDollar[1].node).append(Node("Ref").append(yyDollar[4].node))
-		}
-	case 202:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:659
-		{
-			yyVAL.node = Node("ArrayElement").append(Node("Ref").append(yyDollar[2].node))
-		}
-	case 203:
-		yyDollar = yyS[yypt-6 : yypt+1]
-		//line parser.y:661
-		{
-			yyVAL.node = Node("ArrayElement").
-				append(yyDollar[1].node).
-				append(Node("ArrayList").append(yyDollar[5].node))
-		}
-	case 204:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:667
-		{
-			yyVAL.node = Node("ArrayElement").
-				append(Node("ArrayList").append(yyDollar[3].node))
-		}
-	case 205:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:674
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 206:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:675
-		{
-			yyVAL.node = yyDollar[2].node
-		}
-	case 207:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:679
-		{
-			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
-		}
-	case 208:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:680
-		{
-			yyVAL.node = Node("GlobalVarList").append(yyDollar[1].node)
-		}
-	case 209:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:684
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 210:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:688
-		{
-			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
-		}
-	case 211:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:689
-		{
-			yyVAL.node = Node("StaticVarList").append(yyDollar[1].node)
-		}
-	case 212:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:693
-		{
-			yyVAL.node = Node("StaticVariable").attribute("Name", yyDollar[1].token)
-		}
-	case 213:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:694
-		{
-			yyVAL.node = Node("StaticVariable").attribute("Name", yyDollar[1].token).append(Node("expr").append(yyDollar[3].node))
-		}
-	case 214:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:698
-		{
-			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
-		}
-	case 215:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:699
-		{
-			yyVAL.node = Node("EchoList").append(yyDollar[1].node)
-		}
-	case 216:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:703
-		{
-			yyVAL.node = Node("Echo").append(yyDollar[1].node)
-		}
-	case 217:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:707
 		{
 			yyVAL.node = Node("UnsetVariablesList").append(yyDollar[1].node)
 		}
-	case 218:
+	case 160:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:708
+		//line parser.y:533
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
-	case 219:
+	case 161:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:712
+		//line parser.y:537
 		{
 			yyVAL.node = yyDollar[1].node
 		}
-	case 222:
+	case 162:
+		yyDollar = yyS[yypt-10 : yypt+1]
+		//line parser.y:542
+		{
+			yyVAL.node = Node("Function").
+				attribute("name", yyDollar[3].token).
+				attribute("returns_ref", yyDollar[2].value).
+				append(yyDollar[5].node).
+				append(yyDollar[7].node).
+				append(yyDollar[9].node)
+		}
+	case 163:
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line parser.y:553
+		{
+			yyVAL.value = "false"
+		}
+	case 164:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:554
+		{
+			yyVAL.value = "true"
+		}
+	case 165:
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line parser.y:558
+		{
+			yyVAL.value = "false"
+		}
+	case 166:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:559
+		{
+			yyVAL.value = "true"
+		}
+	case 167:
 		yyDollar = yyS[yypt-8 : yypt+1]
-		//line parser.y:722
+		//line parser.y:564
 		{
 			yyVAL.node = Node("Class").
 				attribute("name", yyDollar[3].token).
@@ -3408,9 +3091,9 @@ yydefault:
 				append(Node("Implements").append(yyDollar[5].node)).
 				append(yyDollar[7].node)
 		}
-	case 223:
+	case 168:
 		yyDollar = yyS[yypt-7 : yypt+1]
-		//line parser.y:731
+		//line parser.y:573
 		{
 			yyVAL.node = Node("Class").
 				attribute("name", yyDollar[2].token).
@@ -3418,114 +3101,454 @@ yydefault:
 				append(Node("Implements").append(yyDollar[4].node)).
 				append(yyDollar[6].node)
 		}
-	case 224:
+	case 169:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:741
+		//line parser.y:583
 		{
 			yyVAL.node = Node("Class").attribute(yyDollar[1].value, "true")
 		}
-	case 225:
+	case 170:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:742
+		//line parser.y:584
 		{
 			yyVAL.node = yyDollar[1].node.attribute(yyDollar[2].value, "true")
 		}
-	case 226:
+	case 171:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:746
+		//line parser.y:588
 		{
 			yyVAL.value = "abstract"
 		}
-	case 227:
+	case 172:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:747
+		//line parser.y:589
 		{
 			yyVAL.value = "final"
 		}
-	case 228:
+	case 173:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:751
+		//line parser.y:593
 		{
 			yyVAL.node = Node("Trait").attribute("name", yyDollar[2].token).append(yyDollar[4].node)
 		}
-	case 229:
+	case 174:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line parser.y:756
+		//line parser.y:598
 		{
 			yyVAL.node = Node("Interface").
 				attribute("name", yyDollar[2].token).
 				append(Node("Extends").append(yyDollar[3].node)).
 				append(yyDollar[5].node)
 		}
-	case 230:
+	case 175:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:765
+		//line parser.y:607
 		{
 			yyVAL.node = Node("")
 		}
+	case 176:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:608
+		{
+			yyVAL.node = yyDollar[2].node
+		}
+	case 177:
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line parser.y:612
+		{
+			yyVAL.node = Node("")
+		}
+	case 178:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:613
+		{
+			yyVAL.node = yyDollar[2].node
+		}
+	case 179:
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line parser.y:617
+		{
+			yyVAL.node = Node("")
+		}
+	case 180:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:618
+		{
+			yyVAL.node = yyDollar[2].node
+		}
+	case 181:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:622
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 182:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:623
+		{
+			yyVAL.node = Node("Ref").append(yyDollar[2].node)
+		}
+	case 183:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:624
+		{
+			yyVAL.node = Node("List").append(yyDollar[3].node)
+		}
+	case 184:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:625
+		{
+			yyVAL.node = Node("ShortList").append(yyDollar[2].node)
+		}
+	case 185:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:629
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 186:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:630
+		{
+			yyVAL.node = yyDollar[2].node
+		}
+	case 187:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:634
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 188:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:635
+		{
+			yyVAL.node = yyDollar[2].node
+		}
+	case 189:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:639
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 190:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:640
+		{
+			yyVAL.node = yyDollar[2].node
+		}
+	case 191:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:644
+		{
+			yyVAL.node = yyDollar[2].node
+		}
+	case 192:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:645
+		{
+			yyVAL.node = yyDollar[3].node
+		}
+	case 193:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:646
+		{
+			yyVAL.node = yyDollar[2].node
+		}
+	case 194:
+		yyDollar = yyS[yypt-5 : yypt+1]
+		//line parser.y:647
+		{
+			yyVAL.node = yyDollar[3].node
+		}
+	case 195:
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line parser.y:651
+		{
+			yyVAL.node = Node("CaseList")
+		}
+	case 196:
+		yyDollar = yyS[yypt-5 : yypt+1]
+		//line parser.y:653
+		{
+			yyVAL.node = yyDollar[1].node.append(Node("Case").append(Node("expr").append(yyDollar[3].node)).append(yyDollar[5].node))
+		}
+	case 197:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:657
+		{
+			yyVAL.node = yyDollar[1].node.append(Node("Default").append(yyDollar[4].node))
+		}
+	case 200:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:668
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 201:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:669
+		{
+			yyVAL.node = yyDollar[2].node
+		}
+	case 202:
+		yyDollar = yyS[yypt-5 : yypt+1]
+		//line parser.y:674
+		{
+			yyVAL.node = Node("If").append(Node("expr").append(yyDollar[3].node)).append(Node("stmt").append(yyDollar[5].node))
+		}
+	case 203:
+		yyDollar = yyS[yypt-6 : yypt+1]
+		//line parser.y:678
+		{
+			yyVAL.node = yyDollar[1].node.append(Node("ElseIf").append(Node("expr").append(yyDollar[4].node)).append(Node("stmt").append(yyDollar[6].node)))
+		}
+	case 204:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:684
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 205:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:686
+		{
+			yyVAL.node = yyDollar[1].node.append(Node("Else").append(Node("stmt").append(yyDollar[3].node)))
+		}
+	case 206:
+		yyDollar = yyS[yypt-6 : yypt+1]
+		//line parser.y:693
+		{
+			yyVAL.node = Node("AltIf").append(Node("expr").append(yyDollar[3].node)).append(Node("stmt").append(yyDollar[6].node))
+		}
+	case 207:
+		yyDollar = yyS[yypt-7 : yypt+1]
+		//line parser.y:697
+		{
+			yyVAL.node = yyDollar[1].node.append(Node("AltElseIf").append(Node("expr").append(yyDollar[4].node)).append(Node("stmt").append(yyDollar[7].node)))
+		}
+	case 208:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:703
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 209:
+		yyDollar = yyS[yypt-6 : yypt+1]
+		//line parser.y:705
+		{
+			yyVAL.node = yyDollar[1].node.append(Node("AltElse").append(Node("stmt").append(yyDollar[4].node)))
+		}
+	case 210:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:711
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 211:
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line parser.y:712
+		{
+			yyVAL.node = Node("Parameter list")
+		}
+	case 212:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:716
+		{
+			yyVAL.node = Node("Parameter list").append(yyDollar[1].node)
+		}
+	case 213:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:717
+		{
+			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
+		}
+	case 214:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:722
+		{
+			yyVAL.node = Node("Parameter").
+				append(yyDollar[1].node).
+				attribute("is_reference", yyDollar[2].value).
+				attribute("is_variadic", yyDollar[3].value).
+				attribute("var", yyDollar[4].token)
+		}
+	case 215:
+		yyDollar = yyS[yypt-6 : yypt+1]
+		//line parser.y:730
+		{
+			yyVAL.node = Node("Parameter").
+				append(yyDollar[1].node).
+				attribute("is_reference", yyDollar[2].value).
+				attribute("is_variadic", yyDollar[3].value).
+				attribute("var", yyDollar[4].token).
+				append(yyDollar[6].node)
+		}
+	case 216:
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line parser.y:741
+		{
+			yyVAL.node = Node("No type")
+		}
+	case 217:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:742
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 218:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:746
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 219:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:747
+		{
+			yyVAL.node = yyDollar[2].node
+			yyVAL.node.attribute("nullable", "true")
+		}
+	case 220:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:751
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 221:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:752
+		{
+			yyVAL.node = Node("array type")
+		}
+	case 222:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:753
+		{
+			yyVAL.node = Node("callable type")
+		}
+	case 223:
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line parser.y:757
+		{
+			yyVAL.node = Node("No return type")
+		}
+	case 224:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:758
+		{
+			yyVAL.node = yyDollar[2].node
+		}
+	case 225:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:762
+		{
+			yyVAL.node = Node("ArgumentList")
+		}
+	case 226:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:763
+		{
+			yyVAL.node = yyDollar[2].node
+		}
+	case 227:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:767
+		{
+			yyVAL.node = Node("ArgumentList").append(yyDollar[1].node)
+		}
+	case 228:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:768
+		{
+			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
+		}
+	case 229:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:772
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 230:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:773
+		{
+			yyVAL.node = Node("Unpack").append(yyDollar[2].node)
+		}
 	case 231:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:766
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:777
 		{
-			yyVAL.node = yyDollar[2].node
+			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
 	case 232:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:770
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:778
 		{
-			yyVAL.node = Node("")
+			yyVAL.node = Node("GlobalVarList").append(yyDollar[1].node)
 		}
 	case 233:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:771
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:782
 		{
-			yyVAL.node = yyDollar[2].node
+			yyVAL.node = yyDollar[1].node
 		}
 	case 234:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:775
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:786
 		{
-			yyVAL.node = Node("")
+			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
 	case 235:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:776
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:787
 		{
-			yyVAL.node = yyDollar[2].node
+			yyVAL.node = Node("StaticVarList").append(yyDollar[1].node)
 		}
 	case 236:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:791
+		{
+			yyVAL.node = Node("StaticVariable").attribute("Name", yyDollar[1].token)
+		}
+	case 237:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:792
+		{
+			yyVAL.node = Node("StaticVariable").attribute("Name", yyDollar[1].token).append(Node("expr").append(yyDollar[3].node))
+		}
+	case 238:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:780
+		//line parser.y:796
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[2].node)
 		}
-	case 237:
+	case 239:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:781
+		//line parser.y:797
 		{
 			yyVAL.node = Node("Stmt")
 		}
-	case 238:
+	case 240:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:785
+		//line parser.y:801
 		{
 			yyVAL.node = yyDollar[2].node.append(yyDollar[1].node)
 		}
-	case 239:
+	case 241:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:786
+		//line parser.y:802
 		{
 			yyVAL.node = yyDollar[3].node.append(yyDollar[1].node)
 		}
-	case 240:
+	case 242:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:787
+		//line parser.y:803
 		{
 			yyVAL.node = Node("Use").append(yyDollar[2].node).append(yyDollar[3].node)
 		}
-	case 241:
+	case 243:
 		yyDollar = yyS[yypt-9 : yypt+1]
-		//line parser.y:790
+		//line parser.y:806
 		{
 			yyVAL.node = Node("Function").
 				append(yyDollar[1].node).
@@ -3535,816 +3558,740 @@ yydefault:
 				append(yyDollar[8].node).
 				append(yyDollar[9].node)
 		}
-	case 242:
+	case 244:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:802
+		//line parser.y:818
 		{
 			yyVAL.node = Node("NameList").append(yyDollar[1].node)
 		}
-	case 243:
+	case 245:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:803
+		//line parser.y:819
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
-	case 244:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:807
-		{
-			yyVAL.node = Node("")
-		}
-	case 245:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:808
-		{
-			yyVAL.node = Node("")
-		}
 	case 246:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:823
+		{
+			yyVAL.node = Node("")
+		}
+	case 247:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:824
+		{
+			yyVAL.node = Node("")
+		}
+	case 248:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:809
+		//line parser.y:825
 		{
 			yyVAL.node = yyDollar[2].node
 		}
-	case 247:
+	case 249:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:813
+		//line parser.y:829
 		{
 			yyVAL.node = Node("TraitAdaptionList").append(yyDollar[1].node)
 		}
-	case 248:
+	case 250:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:814
+		//line parser.y:830
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[2].node)
 		}
-	case 249:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:818
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 250:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:819
-		{
-			yyVAL.node = yyDollar[1].node
-		}
 	case 251:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:824
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:834
 		{
-			yyVAL.node = Node("TraitPrecedence").append(yyDollar[1].node).append(yyDollar[3].node)
+			yyVAL.node = yyDollar[1].node
 		}
 	case 252:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:828
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:835
 		{
-			yyVAL.node = yyDollar[1].node.append(Node("as").attribute("value", yyDollar[3].token))
+			yyVAL.node = yyDollar[1].node
 		}
 	case 253:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:830
+		//line parser.y:840
 		{
-			yyVAL.node = yyDollar[1].node.append(Node("as").append(Node("reservedNonModifiers")))
+			yyVAL.node = Node("TraitPrecedence").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
 	case 254:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:832
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:844
 		{
-			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node).append(yyDollar[4].node)
+			yyVAL.node = yyDollar[1].node.append(Node("as").attribute("value", yyDollar[3].token))
 		}
 	case 255:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:833
+		//line parser.y:846
+		{
+			yyVAL.node = yyDollar[1].node.append(Node("as").append(Node("reservedNonModifiers")))
+		}
+	case 256:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:848
+		{
+			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node).append(yyDollar[4].node)
+		}
+	case 257:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:849
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
-	case 256:
+	case 258:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:836
+		//line parser.y:853
 		{
 			yyVAL.node = Node("TraitMethodRef").append(yyDollar[1].node)
 		}
-	case 257:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:837
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 258:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:841
-		{
-			yyVAL.node = Node("TraitMethodRef").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
 	case 259:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:845
+		//line parser.y:854
 		{
-			yyVAL.node = Node("")
+			yyVAL.node = yyDollar[1].node
 		}
 	case 260:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:846
+		//line parser.y:858
 		{
-			yyVAL.node = yyDollar[2].node
+			yyVAL.node = Node("TraitMethodRef").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
 	case 261:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:850
+		//line parser.y:862
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("")
 		}
 	case 262:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:851
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:863
 		{
-			yyVAL.node = Node("VarMemberModifier")
+			yyVAL.node = yyDollar[2].node
 		}
 	case 263:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:855
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:867
 		{
-			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
+			yyVAL.node = yyDollar[1].node
 		}
 	case 264:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:856
-		{
-			yyVAL.node = Node("ConstList").append(yyDollar[1].node)
-		}
-	case 265:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:860
-		{
-			yyVAL.node = Node("Const").append(yyDollar[3].node)
-		}
-	case 266:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:864
-		{
-			yyVAL.node = Node("PublicMemberModifier")
-		}
-	case 267:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:865
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 268:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line parser.y:868
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("VarMemberModifier")
 		}
-	case 269:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:869
-		{
-			yyVAL.node = yyDollar[1].node.append(yyDollar[2].node)
-		}
-	case 270:
-		yyDollar = yyS[yypt-1 : yypt+1]
+	case 265:
+		yyDollar = yyS[yypt-0 : yypt+1]
 		//line parser.y:872
 		{
 			yyVAL.node = Node("PublicMemberModifier")
 		}
-	case 271:
+	case 266:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line parser.y:873
 		{
-			yyVAL.node = Node("ProtectedMemberModifier")
+			yyVAL.node = yyDollar[1].node
 		}
-	case 272:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:874
-		{
-			yyVAL.node = Node("PrivateMemberModifier")
-		}
-	case 273:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:875
-		{
-			yyVAL.node = Node("StaticMemberModifier")
-		}
-	case 274:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:876
-		{
-			yyVAL.node = Node("AbstractMemberModifier")
-		}
-	case 275:
+	case 267:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line parser.y:877
 		{
-			yyVAL.node = Node("FinalMemberModifier")
+			yyVAL.node = yyDollar[1].node
 		}
-	case 276:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:881
+	case 268:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:878
 		{
-			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
+			yyVAL.node = yyDollar[1].node.append(yyDollar[2].node)
 		}
-	case 277:
+	case 269:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line parser.y:882
 		{
-			yyVAL.node = Node("PropertyList").append(yyDollar[1].node)
+			yyVAL.node = Node("PublicMemberModifier")
 		}
-	case 278:
+	case 270:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:883
+		{
+			yyVAL.node = Node("ProtectedMemberModifier")
+		}
+	case 271:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:884
+		{
+			yyVAL.node = Node("PrivateMemberModifier")
+		}
+	case 272:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line parser.y:885
 		{
-			yyVAL.node = Node("Property").attribute("name", yyDollar[1].token)
+			yyVAL.node = Node("StaticMemberModifier")
 		}
-	case 279:
-		yyDollar = yyS[yypt-3 : yypt+1]
+	case 273:
+		yyDollar = yyS[yypt-1 : yypt+1]
 		//line parser.y:886
 		{
-			yyVAL.node = Node("Property").attribute("name", yyDollar[1].token).append(Node("Default").append(yyDollar[3].node))
+			yyVAL.node = Node("AbstractMemberModifier")
 		}
-	case 280:
-		yyDollar = yyS[yypt-10 : yypt+1]
-		//line parser.y:891
-		{
-			yyVAL.node = Node("Function").
-				attribute("name", yyDollar[3].token).
-				attribute("returns_ref", yyDollar[2].value).
-				append(yyDollar[5].node).
-				append(yyDollar[7].node).
-				append(yyDollar[9].node)
-		}
-	case 281:
+	case 274:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:902
+		//line parser.y:887
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("FinalMemberModifier")
 		}
-	case 282:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:903
-		{
-			yyVAL.node = Node("Parameter list")
-		}
-	case 283:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:906
-		{
-			yyVAL.node = Node("Parameter list").append(yyDollar[1].node)
-		}
-	case 284:
+	case 275:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:907
+		//line parser.y:891
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
-	case 285:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:911
+	case 276:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:892
 		{
-			yyVAL.node = Node("Parameter").
-				append(yyDollar[1].node).
-				attribute("is_reference", yyDollar[2].value).
-				attribute("is_variadic", yyDollar[3].value).
-				attribute("var", yyDollar[4].token)
+			yyVAL.node = Node("PropertyList").append(yyDollar[1].node)
 		}
-	case 286:
-		yyDollar = yyS[yypt-6 : yypt+1]
+	case 277:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:896
+		{
+			yyVAL.node = Node("Property").attribute("name", yyDollar[1].token)
+		}
+	case 278:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:897
+		{
+			yyVAL.node = Node("Property").attribute("name", yyDollar[1].token).append(Node("Default").append(yyDollar[3].node))
+		}
+	case 279:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:901
+		{
+			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
+		}
+	case 280:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:902
+		{
+			yyVAL.node = Node("ConstList").append(yyDollar[1].node)
+		}
+	case 281:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:906
+		{
+			yyVAL.node = Node("Const").append(yyDollar[3].node)
+		}
+	case 282:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:910
+		{
+			yyVAL.node = Node("Const").attribute("name", yyDollar[1].token).append(yyDollar[3].node)
+		}
+	case 283:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:914
+		{
+			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
+		}
+	case 284:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:915
+		{
+			yyVAL.node = Node("EchoList").append(yyDollar[1].node)
+		}
+	case 285:
+		yyDollar = yyS[yypt-1 : yypt+1]
 		//line parser.y:919
 		{
-			yyVAL.node = Node("Parameter").
-				append(yyDollar[1].node).
-				attribute("is_reference", yyDollar[2].value).
-				attribute("is_variadic", yyDollar[3].value).
-				attribute("var", yyDollar[4].token).
-				append(yyDollar[6].node)
+			yyVAL.node = Node("Echo").append(yyDollar[1].node)
+		}
+	case 286:
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line parser.y:923
+		{
+			yyVAL.node = Node("")
 		}
 	case 287:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:930
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:924
 		{
-			yyVAL.node = Node("No type")
+			yyVAL.node = yyDollar[1].node
 		}
 	case 288:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:931
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:927
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
 	case 289:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:935
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:928
 		{
-			yyVAL.value = "false"
+			yyVAL.node = Node("ExpressionList").append(yyDollar[1].node)
 		}
 	case 290:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:936
+		yyDollar = yyS[yypt-7 : yypt+1]
+		//line parser.y:933
 		{
-			yyVAL.value = "true"
+			yyVAL.node = Node("AnonymousClass").
+				attribute("name", yyDollar[1].token).
+				append(yyDollar[2].node).
+				append(yyDollar[3].node).
+				append(yyDollar[4].node).
+				append(yyDollar[6].node)
 		}
 	case 291:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:940
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:944
 		{
-			yyVAL.value = "false"
+			yyVAL.node = Node("New").append(yyDollar[2].node).append(yyDollar[3].node)
 		}
 	case 292:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:941
-		{
-			yyVAL.value = "true"
-		}
-	case 293:
-		yyDollar = yyS[yypt-0 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		//line parser.y:945
 		{
-			yyVAL.value = "false"
+			yyVAL.node = Node("New").append(yyDollar[2].node)
 		}
-	case 294:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:946
-		{
-			yyVAL.value = "true"
-		}
-	case 295:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:950
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 296:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:951
-		{
-			yyVAL.node = yyDollar[2].node
-			yyVAL.node.attribute("nullable", "true")
-		}
-	case 297:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:955
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 298:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:956
-		{
-			yyVAL.node = Node("array type")
-		}
-	case 299:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:957
-		{
-			yyVAL.node = Node("callable type")
-		}
-	case 300:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:961
-		{
-			yyVAL.node = Node("No return type")
-		}
-	case 301:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:962
-		{
-			yyVAL.node = yyDollar[2].node
-		}
-	case 302:
+	case 293:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:966
+		//line parser.y:949
 		{
 			yyVAL.node = Node("Assign").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 303:
+	case 294:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:967
+		//line parser.y:950
 		{
 			yyVAL.node = Node("AssignRef").append(yyDollar[1].node).append(yyDollar[4].node)
 		}
-	case 304:
+	case 295:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:968
+		//line parser.y:951
 		{
 			yyVAL.node = Node("Clone").append(yyDollar[2].node)
 		}
-	case 305:
+	case 296:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:969
+		//line parser.y:952
 		{
 			yyVAL.node = Node("AssignAdd").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 306:
+	case 297:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:970
+		//line parser.y:953
 		{
 			yyVAL.node = Node("AssignSub").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 307:
+	case 298:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:971
+		//line parser.y:954
 		{
 			yyVAL.node = Node("AssignMul").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 308:
+	case 299:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:972
+		//line parser.y:955
 		{
 			yyVAL.node = Node("AssignPow").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 309:
+	case 300:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:973
+		//line parser.y:956
 		{
 			yyVAL.node = Node("AssignDiv").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 310:
+	case 301:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:974
+		//line parser.y:957
 		{
 			yyVAL.node = Node("AssignConcat").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 311:
+	case 302:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:975
+		//line parser.y:958
 		{
 			yyVAL.node = Node("AssignMod").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 312:
+	case 303:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:976
+		//line parser.y:959
 		{
 			yyVAL.node = Node("AssignAnd").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 313:
+	case 304:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:977
+		//line parser.y:960
 		{
 			yyVAL.node = Node("AssignOr").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 314:
+	case 305:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:978
+		//line parser.y:961
 		{
 			yyVAL.node = Node("AssignXor").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 315:
+	case 306:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:979
+		//line parser.y:962
 		{
 			yyVAL.node = Node("AssignShiftLeft").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 316:
+	case 307:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:980
+		//line parser.y:963
 		{
 			yyVAL.node = Node("AssignShiftRight").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 317:
+	case 308:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:981
+		//line parser.y:964
 		{
 			yyVAL.node = Node("PostIncrement").append(yyDollar[1].node)
 		}
-	case 318:
+	case 309:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:982
+		//line parser.y:965
 		{
 			yyVAL.node = Node("PreIncrement").append(yyDollar[2].node)
 		}
-	case 319:
+	case 310:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:983
+		//line parser.y:966
 		{
 			yyVAL.node = Node("PostDecrement").append(yyDollar[1].node)
 		}
-	case 320:
+	case 311:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:984
+		//line parser.y:967
 		{
 			yyVAL.node = Node("PreDecrement").append(yyDollar[2].node)
 		}
-	case 321:
+	case 312:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:985
+		//line parser.y:968
 		{
 			yyVAL.node = Node("Or").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 322:
+	case 313:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:986
+		//line parser.y:969
 		{
 			yyVAL.node = Node("And").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 323:
+	case 314:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:987
+		//line parser.y:970
 		{
 			yyVAL.node = Node("Or").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 324:
+	case 315:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:988
+		//line parser.y:971
 		{
 			yyVAL.node = Node("And").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 325:
+	case 316:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:989
+		//line parser.y:972
 		{
 			yyVAL.node = Node("Xor").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 326:
+	case 317:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:990
+		//line parser.y:973
 		{
 			yyVAL.node = Node("BitwiseOr").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 327:
+	case 318:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:991
+		//line parser.y:974
 		{
 			yyVAL.node = Node("BitwiseAnd").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 328:
+	case 319:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:992
+		//line parser.y:975
 		{
 			yyVAL.node = Node("BitwiseXor").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 329:
+	case 320:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:993
+		//line parser.y:976
 		{
 			yyVAL.node = Node("Concat").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 330:
+	case 321:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:994
+		//line parser.y:977
 		{
 			yyVAL.node = Node("Add").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 331:
+	case 322:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:995
+		//line parser.y:978
 		{
 			yyVAL.node = Node("Sub").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 332:
+	case 323:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:996
+		//line parser.y:979
 		{
 			yyVAL.node = Node("Mul").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 333:
+	case 324:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:997
+		//line parser.y:980
 		{
 			yyVAL.node = Node("Pow").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 334:
+	case 325:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:998
+		//line parser.y:981
 		{
 			yyVAL.node = Node("Div").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 335:
+	case 326:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:999
+		//line parser.y:982
 		{
 			yyVAL.node = Node("Mod").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 336:
+	case 327:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1000
+		//line parser.y:983
 		{
 			yyVAL.node = Node("ShiftLeft").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 337:
+	case 328:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1001
+		//line parser.y:984
 		{
 			yyVAL.node = Node("ShiftRight").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 338:
+	case 329:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1002
+		//line parser.y:985
 		{
 			yyVAL.node = Node("UnaryPlus").append(yyDollar[2].node)
 		}
-	case 339:
+	case 330:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1003
+		//line parser.y:986
 		{
 			yyVAL.node = Node("UnaryMinus").append(yyDollar[2].node)
 		}
-	case 340:
+	case 331:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1004
+		//line parser.y:987
 		{
 			yyVAL.node = Node("BooleanNot").append(yyDollar[2].node)
 		}
-	case 341:
+	case 332:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1005
+		//line parser.y:988
 		{
 			yyVAL.node = Node("BitwiseNot").append(yyDollar[2].node)
 		}
-	case 342:
+	case 333:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1006
+		//line parser.y:989
 		{
 			yyVAL.node = Node("Identical").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 343:
+	case 334:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1007
+		//line parser.y:990
 		{
 			yyVAL.node = Node("NotIdentical").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 344:
+	case 335:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1008
+		//line parser.y:991
 		{
 			yyVAL.node = Node("Equal").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 345:
+	case 336:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1009
+		//line parser.y:992
 		{
 			yyVAL.node = Node("NotEqual").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 346:
+	case 337:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1010
+		//line parser.y:993
 		{
 			yyVAL.node = Node("Spaceship").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 347:
+	case 338:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1011
+		//line parser.y:994
 		{
 			yyVAL.node = Node("Smaller").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 348:
+	case 339:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1012
+		//line parser.y:995
 		{
 			yyVAL.node = Node("SmallerOrEqual").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 349:
+	case 340:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1013
+		//line parser.y:996
 		{
 			yyVAL.node = Node("Greater").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 350:
+	case 341:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1014
+		//line parser.y:997
 		{
 			yyVAL.node = Node("GreaterOrEqual").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 351:
+	case 342:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1015
+		//line parser.y:998
 		{
 			yyVAL.node = Node("InstanceOf").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 352:
+	case 343:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1016
+		//line parser.y:999
 		{
 			yyVAL.node = yyDollar[2].node
 		}
-	case 353:
+	case 344:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1017
+		//line parser.y:1000
 		{
 			yyVAL.node = yyDollar[1].node
 		}
-	case 354:
+	case 345:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:1018
+		//line parser.y:1001
 		{
 			yyVAL.node = Node("Ternary").append(yyDollar[1].node).append(yyDollar[3].node).append(yyDollar[5].node)
 		}
-	case 355:
+	case 346:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:1019
+		//line parser.y:1002
 		{
 			yyVAL.node = Node("Ternary").append(yyDollar[1].node).append(yyDollar[4].node)
 		}
-	case 356:
+	case 347:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1020
+		//line parser.y:1003
 		{
 			yyVAL.node = Node("Coalesce").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 357:
+	case 348:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1021
+		//line parser.y:1004
 		{
 			yyVAL.node = yyDollar[1].node
 		}
-	case 358:
+	case 349:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1022
+		//line parser.y:1005
 		{
 			yyVAL.node = Node("CastInt").append(yyDollar[2].node)
 		}
-	case 359:
+	case 350:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1023
+		//line parser.y:1006
 		{
 			yyVAL.node = Node("CastDouble").append(yyDollar[2].node)
 		}
-	case 360:
+	case 351:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1024
+		//line parser.y:1007
 		{
 			yyVAL.node = Node("CastString").append(yyDollar[2].node)
 		}
-	case 361:
+	case 352:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1025
+		//line parser.y:1008
 		{
 			yyVAL.node = Node("CastArray").append(yyDollar[2].node)
 		}
-	case 362:
+	case 353:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1026
+		//line parser.y:1009
 		{
 			yyVAL.node = Node("CastObject").append(yyDollar[2].node)
 		}
-	case 363:
+	case 354:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1027
+		//line parser.y:1010
 		{
 			yyVAL.node = Node("CastBool").append(yyDollar[2].node)
 		}
-	case 364:
+	case 355:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1028
+		//line parser.y:1011
 		{
 			yyVAL.node = Node("CastUnset").append(yyDollar[2].node)
 		}
-	case 365:
+	case 356:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1029
+		//line parser.y:1012
 		{
 			yyVAL.node = Node("Exit").append(yyDollar[2].node)
 		}
-	case 366:
+	case 357:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1030
+		//line parser.y:1013
 		{
 			yyVAL.node = Node("Silence").append(yyDollar[2].node)
 		}
-	case 367:
+	case 358:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1031
+		//line parser.y:1014
 		{
 			yyVAL.node = yyDollar[1].node
 		}
-	case 368:
+	case 359:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1032
+		//line parser.y:1015
 		{
 			yyVAL.node = Node("ShellExec").append(yyDollar[2].node)
 		}
-	case 369:
+	case 360:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1033
+		//line parser.y:1016
 		{
 			yyVAL.node = Node("Print").append(yyDollar[2].node)
 		}
-	case 370:
+	case 361:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1034
+		//line parser.y:1017
 		{
 			yyVAL.node = Node("Yield")
 		}
-	case 371:
+	case 362:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1035
+		//line parser.y:1018
 		{
 			yyVAL.node = Node("Yield").append(yyDollar[2].node)
 		}
-	case 372:
+	case 363:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:1036
+		//line parser.y:1019
 		{
 			yyVAL.node = Node("Yield").append(yyDollar[2].node).append(yyDollar[4].node)
 		}
-	case 373:
+	case 364:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1037
+		//line parser.y:1020
 		{
 			yyVAL.node = Node("YieldFrom").append(yyDollar[2].node)
 		}
-	case 374:
+	case 365:
 		yyDollar = yyS[yypt-10 : yypt+1]
-		//line parser.y:1039
+		//line parser.y:1022
 		{
 			yyVAL.node = Node("Closure").
 				attribute("returns_ref", yyDollar[2].value).
@@ -4353,9 +4300,9 @@ yydefault:
 				append(yyDollar[7].node).
 				append(yyDollar[9].node)
 		}
-	case 375:
+	case 366:
 		yyDollar = yyS[yypt-11 : yypt+1]
-		//line parser.y:1048
+		//line parser.y:1031
 		{
 			yyVAL.node = Node("StaticClosure").
 				attribute("returns_ref", yyDollar[3].value).
@@ -4364,659 +4311,716 @@ yydefault:
 				append(yyDollar[8].node).
 				append(yyDollar[10].node)
 		}
-	case 376:
+	case 367:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:1059
+		//line parser.y:1042
+		{
+			yyVAL.value = "false"
+		}
+	case 368:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1043
+		{
+			yyVAL.value = "true"
+		}
+	case 369:
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line parser.y:1047
 		{
 			yyVAL.node = Node("")
 		}
-	case 377:
+	case 370:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:1060
+		//line parser.y:1048
 		{
 			yyVAL.node = yyDollar[3].node
 		}
-	case 378:
+	case 371:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1064
+		//line parser.y:1052
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
-	case 379:
+	case 372:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1065
+		//line parser.y:1053
 		{
 			yyVAL.node = Node("ClosureUses").append(yyDollar[1].node)
 		}
-	case 380:
+	case 373:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1069
+		//line parser.y:1057
 		{
 			yyVAL.node = Node("Variable").attribute("value", yyDollar[1].token)
 		}
-	case 381:
+	case 374:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1070
+		//line parser.y:1058
 		{
 			yyVAL.node = Node("Variable").attribute("value", yyDollar[2].token).attribute("ref", "true")
 		}
-	case 382:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1074
-		{
-			yyVAL.node = Node("Scalar").append(Node("Lnumber").attribute("value", yyDollar[1].token))
-		}
-	case 383:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1075
-		{
-			yyVAL.node = Node("Scalar").append(Node("Dnumber").attribute("value", yyDollar[1].token))
-		}
-	case 384:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1076
-		{
-			yyVAL.node = Node("Scalar").append(Node("__LINE__"))
-		}
-	case 385:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1077
-		{
-			yyVAL.node = Node("Scalar").append(Node("__FILE__"))
-		}
-	case 386:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1078
-		{
-			yyVAL.node = Node("Scalar").append(Node("__DIR__"))
-		}
-	case 387:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1079
-		{
-			yyVAL.node = Node("Scalar").append(Node("__TRAIT__"))
-		}
-	case 388:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1080
-		{
-			yyVAL.node = Node("Scalar").append(Node("__METHOD__"))
-		}
-	case 389:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1081
-		{
-			yyVAL.node = Node("Scalar").append(Node("__FUNCTION__"))
-		}
-	case 390:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1082
-		{
-			yyVAL.node = Node("Scalar").append(Node("__NAMESPACE__"))
-		}
-	case 391:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1083
-		{
-			yyVAL.node = Node("Scalar").append(Node("__CLASS__"))
-		}
-	case 392:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1085
-		{
-			yyVAL.node = Node("Scalar").append(Node("Heredoc").attribute("value", yyDollar[2].token))
-		}
-	case 393:
+	case 375:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1087
+		//line parser.y:1062
 		{
-			yyVAL.node = Node("Scalar").append(Node("Heredoc"))
+			yyVAL.node = Node("FunctionCall").append(yyDollar[1].node).append(yyDollar[2].node)
 		}
-	case 394:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1088
-		{
-			yyVAL.node = yyDollar[2].node
-		}
-	case 395:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1089
-		{
-			yyVAL.node = yyDollar[2].node
-		}
-	case 396:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1090
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 397:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1091
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 398:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1095
-		{
-			yyVAL.node = yyDollar[1].node.append(yyDollar[2].node)
-		}
-	case 399:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1096
-		{
-			yyVAL.node = yyDollar[1].node.append(Node("String").attribute("value", yyDollar[2].token))
-		}
-	case 400:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1097
-		{
-			yyVAL.node = Node("EncapsList").append(yyDollar[1].node)
-		}
-	case 401:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1098
-		{
-			yyVAL.node = Node("EncapsList").append(Node("String").attribute("value", yyDollar[1].token)).append(yyDollar[2].node)
-		}
-	case 402:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1101
-		{
-			yyVAL.node = Node("Variable").attribute("value", yyDollar[1].token)
-		}
-	case 403:
+	case 376:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:1102
+		//line parser.y:1064
 		{
-			yyVAL.node = Node("Variable").attribute("value", yyDollar[1].token).append(Node("offset").append(yyDollar[3].node))
+			yyVAL.node = Node("StaticCall").append(yyDollar[1].node).append(yyDollar[3].node).append(yyDollar[4].node)
 		}
-	case 404:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1103
-		{
-			yyVAL.node = Node("Variable").attribute("value", yyDollar[1].token).append(Node("property").attribute("value", yyDollar[3].token))
-		}
-	case 405:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1104
-		{
-			yyVAL.node = Node("Variable").append(Node("expr").append(yyDollar[2].node))
-		}
-	case 406:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1105
-		{
-			yyVAL.node = Node("Variable").attribute("value", yyDollar[2].token)
-		}
-	case 407:
-		yyDollar = yyS[yypt-6 : yypt+1]
-		//line parser.y:1107
-		{
-			yyVAL.node = Node("Variable").attribute("value", yyDollar[2].token).append(Node("offset").append(yyDollar[4].node))
-		}
-	case 408:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1108
-		{
-			yyVAL.node = yyDollar[2].node
-		}
-	case 409:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1111
-		{
-			yyVAL.node = Node("OffsetString").attribute("value", yyDollar[1].token)
-		}
-	case 410:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1112
-		{
-			yyVAL.node = Node("OffsetNumString").attribute("value", yyDollar[1].token)
-		}
-	case 411:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1113
-		{
-			yyVAL.node = Node("OffsetNegateNumString").attribute("value", yyDollar[2].token)
-		}
-	case 412:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1114
-		{
-			yyVAL.node = Node("OffsetVariable").attribute("value", yyDollar[1].token)
-		}
-	case 413:
-		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:1118
-		{
-			yyVAL.node = yyDollar[3].node
-		}
-	case 414:
+	case 377:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:1119
+		//line parser.y:1066
 		{
-			yyVAL.node = Node("Empty").append(yyDollar[3].node)
+			yyVAL.node = Node("StaticCall").append(yyDollar[1].node).append(yyDollar[3].node).append(yyDollar[4].node)
 		}
-	case 415:
+	case 378:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1120
+		//line parser.y:1067
 		{
-			yyVAL.node = Node("Include").append(yyDollar[2].node)
+			yyVAL.node = Node("Call").append(yyDollar[1].node).append(yyDollar[2].node)
 		}
-	case 416:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1121
-		{
-			yyVAL.node = Node("IncludeOnce").append(yyDollar[2].node)
-		}
-	case 417:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:1122
-		{
-			yyVAL.node = Node("Eval").append(yyDollar[3].node)
-		}
-	case 418:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1123
-		{
-			yyVAL.node = Node("Require").append(yyDollar[2].node)
-		}
-	case 419:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1124
-		{
-			yyVAL.node = Node("RequireOnce").append(yyDollar[2].node)
-		}
-	case 420:
+	case 379:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1128
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 421:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1129
-		{
-			yyVAL.node = Node("AndIsset").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 422:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1133
-		{
-			yyVAL.node = Node("Isset").append(yyDollar[1].node)
-		}
-	case 423:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1137
-		{
-			yyVAL.node = Node("Const").append(yyDollar[1].node)
-		}
-	case 424:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1138
-		{
-			yyVAL.node = Node("Const").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 425:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1140
-		{
-			yyVAL.node = Node("Const").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 426:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1144
+		//line parser.y:1071
 		{
 			yyVAL.node = Node("Static")
 		}
-	case 427:
+	case 380:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1072
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 381:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1076
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 382:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1077
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 383:
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line parser.y:1081
+		{
+			yyVAL.node = Node("")
+		}
+	case 384:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:1082
+		{
+			yyVAL.node = yyDollar[2].node
+		}
+	case 385:
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line parser.y:1086
+		{
+			yyVAL.node = Node("EmptyBackticks")
+		}
+	case 386:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1087
+		{
+			yyVAL.node = Node("String").attribute("value", yyDollar[1].token)
+		}
+	case 387:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1088
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 388:
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line parser.y:1092
+		{
+			yyVAL.node = Node("ArgumentList")
+		}
+	case 389:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1093
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 390:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:1097
+		{
+			yyVAL.node = yyDollar[3].node
+		}
+	case 391:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:1098
+		{
+			yyVAL.node = yyDollar[2].node
+		}
+	case 392:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1099
+		{
+			yyVAL.node = Node("String").attribute("value", yyDollar[1].token)
+		}
+	case 393:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1103
+		{
+			yyVAL.node = Node("Scalar").append(Node("Lnumber").attribute("value", yyDollar[1].token))
+		}
+	case 394:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1104
+		{
+			yyVAL.node = Node("Scalar").append(Node("Dnumber").attribute("value", yyDollar[1].token))
+		}
+	case 395:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1105
+		{
+			yyVAL.node = Node("Scalar").append(Node("__LINE__"))
+		}
+	case 396:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1106
+		{
+			yyVAL.node = Node("Scalar").append(Node("__FILE__"))
+		}
+	case 397:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1107
+		{
+			yyVAL.node = Node("Scalar").append(Node("__DIR__"))
+		}
+	case 398:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1108
+		{
+			yyVAL.node = Node("Scalar").append(Node("__TRAIT__"))
+		}
+	case 399:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1109
+		{
+			yyVAL.node = Node("Scalar").append(Node("__METHOD__"))
+		}
+	case 400:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1110
+		{
+			yyVAL.node = Node("Scalar").append(Node("__FUNCTION__"))
+		}
+	case 401:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1111
+		{
+			yyVAL.node = Node("Scalar").append(Node("__NAMESPACE__"))
+		}
+	case 402:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1112
+		{
+			yyVAL.node = Node("Scalar").append(Node("__CLASS__"))
+		}
+	case 403:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:1114
+		{
+			yyVAL.node = Node("Scalar").append(Node("Heredoc").attribute("value", yyDollar[2].token))
+		}
+	case 404:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:1116
+		{
+			yyVAL.node = Node("Scalar").append(Node("Heredoc"))
+		}
+	case 405:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:1117
+		{
+			yyVAL.node = yyDollar[2].node
+		}
+	case 406:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:1118
+		{
+			yyVAL.node = yyDollar[2].node
+		}
+	case 407:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1119
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 408:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1120
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 409:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1124
+		{
+			yyVAL.node = Node("Const").append(yyDollar[1].node)
+		}
+	case 410:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:1125
+		{
+			yyVAL.node = Node("Const").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 411:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:1127
+		{
+			yyVAL.node = Node("Const").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 412:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1131
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 413:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1132
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 414:
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line parser.y:1136
+		{
+			yyVAL.node = Node("")
+		}
+	case 415:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1137
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 416:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1141
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 417:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line parser.y:1145
 		{
 			yyVAL.node = yyDollar[1].node
 		}
+	case 418:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:1146
+		{
+			yyVAL.node = yyDollar[2].node
+		}
+	case 419:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1147
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 420:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1151
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 421:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:1152
+		{
+			yyVAL.node = yyDollar[2].node
+		}
+	case 422:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1153
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 423:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1157
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 424:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:1158
+		{
+			yyVAL.node = Node("Dim").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 425:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:1159
+		{
+			yyVAL.node = Node("Dim").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 426:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:1160
+		{
+			yyVAL.node = Node("Dim").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 427:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:1162
+		{
+			yyVAL.node = Node("MethodCall").append(yyDollar[1].node).append(yyDollar[3].node).append(yyDollar[4].node)
+		}
 	case 428:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1149
+		//line parser.y:1163
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 429:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1150
+		//line parser.y:1167
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 430:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:1154
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1168
 		{
-			yyVAL.node = Node("")
+			yyVAL.node = yyDollar[1].node
 		}
 	case 431:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1155
-		{
-			yyVAL.node = yyDollar[2].node
-		}
-	case 432:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:1159
-		{
-			yyVAL.node = Node("EmptyBackticks")
-		}
-	case 433:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1160
-		{
-			yyVAL.node = Node("String").attribute("value", yyDollar[1].token)
-		}
-	case 434:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1161
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 435:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1165
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 436:
-		yyDollar = yyS[yypt-1 : yypt+1]
 		//line parser.y:1169
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("Property").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 437:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1170
-		{
-			yyVAL.node = yyDollar[2].node
-		}
-	case 438:
+	case 432:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1171
+		//line parser.y:1173
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("Variable").attribute("name", yyDollar[1].token)
 		}
-	case 439:
-		yyDollar = yyS[yypt-1 : yypt+1]
+	case 433:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:1174
+		{
+			yyVAL.node = Node("Variable").append(yyDollar[3].node)
+		}
+	case 434:
+		yyDollar = yyS[yypt-2 : yypt+1]
 		//line parser.y:1175
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("Variable").append(yyDollar[2].node)
 		}
-	case 440:
+	case 435:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1176
+		//line parser.y:1180
 		{
-			yyVAL.node = yyDollar[2].node
+			yyVAL.node = Node("StaticProp").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 441:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1177
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 442:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:1181
-		{
-			yyVAL.node = yyDollar[3].node
-		}
-	case 443:
+	case 436:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:1182
 		{
-			yyVAL.node = yyDollar[2].node
+			yyVAL.node = Node("StaticProp").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 444:
+	case 437:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1183
+		//line parser.y:1186
 		{
-			yyVAL.node = Node("String").attribute("value", yyDollar[1].token)
+			yyVAL.node = yyDollar[1].node
 		}
-	case 445:
-		yyDollar = yyS[yypt-1 : yypt+1]
+	case 438:
+		yyDollar = yyS[yypt-4 : yypt+1]
 		//line parser.y:1187
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("Dim").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 446:
-		yyDollar = yyS[yypt-1 : yypt+1]
+	case 439:
+		yyDollar = yyS[yypt-4 : yypt+1]
 		//line parser.y:1188
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("Dim").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 447:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:1192
+	case 440:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:1189
 		{
-			yyVAL.node = Node("")
+			yyVAL.node = Node("Property").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 448:
-		yyDollar = yyS[yypt-1 : yypt+1]
+	case 441:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:1191
+		{
+			yyVAL.node = Node("StaticProperty").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 442:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:1193
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("StaticProperty").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 449:
+	case 443:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line parser.y:1197
 		{
 			yyVAL.node = yyDollar[1].node
 		}
-	case 450:
-		yyDollar = yyS[yypt-4 : yypt+1]
+	case 444:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:1198
 		{
-			yyVAL.node = Node("Dim").append(yyDollar[1].node).append(yyDollar[3].node)
+			yyVAL.node = yyDollar[2].node
 		}
-	case 451:
-		yyDollar = yyS[yypt-4 : yypt+1]
+	case 445:
+		yyDollar = yyS[yypt-1 : yypt+1]
 		//line parser.y:1199
 		{
-			yyVAL.node = Node("Dim").append(yyDollar[1].node).append(yyDollar[3].node)
+			yyVAL.node = yyDollar[1].node
 		}
-	case 452:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:1200
-		{
-			yyVAL.node = Node("Dim").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 453:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:1202
-		{
-			yyVAL.node = Node("MethodCall").append(yyDollar[1].node).append(yyDollar[3].node).append(yyDollar[4].node)
-		}
-	case 454:
+	case 446:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line parser.y:1203
+		{
+			yyVAL.node = Node("PropertyName").attribute("value", yyDollar[1].token)
+		}
+	case 447:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:1204
+		{
+			yyVAL.node = yyDollar[2].node
+		}
+	case 448:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1205
 		{
 			yyVAL.node = yyDollar[1].node
 		}
-	case 455:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1207
-		{
-			yyVAL.node = Node("FunctionCall").append(yyDollar[1].node).append(yyDollar[2].node)
-		}
-	case 456:
-		yyDollar = yyS[yypt-4 : yypt+1]
+	case 449:
+		yyDollar = yyS[yypt-1 : yypt+1]
 		//line parser.y:1209
-		{
-			yyVAL.node = Node("StaticCall").append(yyDollar[1].node).append(yyDollar[3].node).append(yyDollar[4].node)
+		{ /* TODO: allow single trailing comma */
+			yyVAL.node = yyDollar[1].node
 		}
-	case 457:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:1211
+	case 450:
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line parser.y:1213
 		{
-			yyVAL.node = Node("StaticCall").append(yyDollar[1].node).append(yyDollar[3].node).append(yyDollar[4].node)
+			yyVAL.node = Node("")
 		}
-	case 458:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1212
-		{
-			yyVAL.node = Node("Call").append(yyDollar[1].node).append(yyDollar[2].node)
-		}
-	case 459:
+	case 451:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1216
+		//line parser.y:1214
 		{
 			yyVAL.node = yyDollar[1].node
 		}
-	case 460:
+	case 452:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1217
-		{
-			yyVAL.node = yyDollar[2].node
-		}
-	case 461:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1218
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 462:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1222
-		{
-			yyVAL.node = Node("ArgumentList")
-		}
-	case 463:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:1223
-		{
-			yyVAL.node = yyDollar[2].node
-		}
-	case 464:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1226
-		{
-			yyVAL.node = Node("ArgumentList").append(yyDollar[1].node)
-		}
-	case 465:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1227
+		//line parser.y:1219
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
-	case 466:
+	case 453:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1230
+		//line parser.y:1220
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("ArrayPairList").append(yyDollar[1].node)
 		}
-	case 467:
+	case 454:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:1224
+		{
+			yyVAL.node = Node("ArrayElement").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 455:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1225
+		{
+			yyVAL.node = Node("ArrayElement").append(yyDollar[1].node)
+		}
+	case 456:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:1226
+		{
+			yyVAL.node = Node("ArrayElement").append(yyDollar[1].node).append(Node("Ref").append(yyDollar[4].node))
+		}
+	case 457:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1231
+		//line parser.y:1227
 		{
-			yyVAL.node = Node("Unpack").append(yyDollar[2].node)
+			yyVAL.node = Node("ArrayElement").append(Node("Ref").append(yyDollar[2].node))
 		}
-	case 468:
-		yyDollar = yyS[yypt-1 : yypt+1]
+	case 458:
+		yyDollar = yyS[yypt-6 : yypt+1]
+		//line parser.y:1229
+		{
+			yyVAL.node = Node("ArrayElement").
+				append(yyDollar[1].node).
+				append(Node("ArrayList").append(yyDollar[5].node))
+		}
+	case 459:
+		yyDollar = yyS[yypt-4 : yypt+1]
 		//line parser.y:1235
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("ArrayElement").
+				append(Node("ArrayList").append(yyDollar[3].node))
+		}
+	case 460:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:1242
+		{
+			yyVAL.node = yyDollar[1].node.append(yyDollar[2].node)
+		}
+	case 461:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:1243
+		{
+			yyVAL.node = yyDollar[1].node.append(Node("String").attribute("value", yyDollar[2].token))
+		}
+	case 462:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1244
+		{
+			yyVAL.node = Node("EncapsList").append(yyDollar[1].node)
+		}
+	case 463:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:1245
+		{
+			yyVAL.node = Node("EncapsList").append(Node("String").attribute("value", yyDollar[1].token)).append(yyDollar[2].node)
+		}
+	case 464:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1249
+		{
+			yyVAL.node = Node("Variable").attribute("value", yyDollar[1].token)
+		}
+	case 465:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:1250
+		{
+			yyVAL.node = Node("Variable").attribute("value", yyDollar[1].token).append(Node("offset").append(yyDollar[3].node))
+		}
+	case 466:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:1251
+		{
+			yyVAL.node = Node("Variable").attribute("value", yyDollar[1].token).append(Node("property").attribute("value", yyDollar[3].token))
+		}
+	case 467:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:1252
+		{
+			yyVAL.node = Node("Variable").append(Node("expr").append(yyDollar[2].node))
+		}
+	case 468:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:1253
+		{
+			yyVAL.node = Node("Variable").attribute("value", yyDollar[2].token)
 		}
 	case 469:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1236
+		yyDollar = yyS[yypt-6 : yypt+1]
+		//line parser.y:1255
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("Variable").attribute("value", yyDollar[2].token).append(Node("offset").append(yyDollar[4].node))
 		}
 	case 470:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1237
-		{
-			yyVAL.node = Node("Property").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 471:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1241
-		{
-			yyVAL.node = Node("PropertyName").attribute("value", yyDollar[1].token)
-		}
-	case 472:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1242
+		//line parser.y:1256
 		{
 			yyVAL.node = yyDollar[2].node
 		}
-	case 473:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1243
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 474:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:1247
-		{
-			yyVAL.node = Node("Variable").attribute("name", yyDollar[1].token)
-		}
-	case 475:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:1248
-		{
-			yyVAL.node = Node("Variable").append(yyDollar[3].node)
-		}
-	case 476:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:1249
-		{
-			yyVAL.node = Node("Variable").append(yyDollar[2].node)
-		}
-	case 477:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1254
-		{
-			yyVAL.node = Node("StaticProp").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 478:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1256
-		{
-			yyVAL.node = Node("StaticProp").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 479:
+	case 471:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line parser.y:1259
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("OffsetString").attribute("value", yyDollar[1].token)
 		}
-	case 480:
-		yyDollar = yyS[yypt-4 : yypt+1]
+	case 472:
+		yyDollar = yyS[yypt-1 : yypt+1]
 		//line parser.y:1260
 		{
-			yyVAL.node = Node("Dim").append(yyDollar[1].node).append(yyDollar[3].node)
+			yyVAL.node = Node("OffsetNumString").attribute("value", yyDollar[1].token)
 		}
-	case 481:
-		yyDollar = yyS[yypt-4 : yypt+1]
+	case 473:
+		yyDollar = yyS[yypt-2 : yypt+1]
 		//line parser.y:1261
 		{
-			yyVAL.node = Node("Dim").append(yyDollar[1].node).append(yyDollar[3].node)
+			yyVAL.node = Node("OffsetNegateNumString").attribute("value", yyDollar[2].token)
 		}
-	case 482:
-		yyDollar = yyS[yypt-3 : yypt+1]
+	case 474:
+		yyDollar = yyS[yypt-1 : yypt+1]
 		//line parser.y:1262
 		{
-			yyVAL.node = Node("Property").append(yyDollar[1].node).append(yyDollar[3].node)
+			yyVAL.node = Node("OffsetVariable").attribute("value", yyDollar[1].token)
+		}
+	case 475:
+		yyDollar = yyS[yypt-5 : yypt+1]
+		//line parser.y:1266
+		{
+			yyVAL.node = yyDollar[3].node
+		}
+	case 476:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:1267
+		{
+			yyVAL.node = Node("Empty").append(yyDollar[3].node)
+		}
+	case 477:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:1268
+		{
+			yyVAL.node = Node("Include").append(yyDollar[2].node)
+		}
+	case 478:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:1269
+		{
+			yyVAL.node = Node("IncludeOnce").append(yyDollar[2].node)
+		}
+	case 479:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:1270
+		{
+			yyVAL.node = Node("Eval").append(yyDollar[3].node)
+		}
+	case 480:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:1271
+		{
+			yyVAL.node = Node("Require").append(yyDollar[2].node)
+		}
+	case 481:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:1272
+		{
+			yyVAL.node = Node("RequireOnce").append(yyDollar[2].node)
+		}
+	case 482:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1276
+		{
+			yyVAL.node = yyDollar[1].node
 		}
 	case 483:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1264
+		//line parser.y:1277
 		{
-			yyVAL.node = Node("StaticProperty").append(yyDollar[1].node).append(yyDollar[3].node)
+			yyVAL.node = Node("AndIsset").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
 	case 484:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:1266
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:1281
 		{
-			yyVAL.node = Node("StaticProperty").append(yyDollar[1].node).append(yyDollar[3].node)
+			yyVAL.node = Node("Isset").append(yyDollar[1].node)
 		}
 	}
 	goto yystack /* stack new state and value */
diff --git a/parser.y b/parser.y
index 4c1ff9d..9ba097d 100644
--- a/parser.y
+++ b/parser.y
@@ -342,6 +342,11 @@ identifier:
     |   semi_reserved                                   { $$ = Node("identifier").attribute("value", $1) }
 ;
 
+top_statement_list:
+        top_statement_list top_statement                { $$ = $1.append($2); }
+    |   /* empty */                                     { $$ = Node("Statements") }
+;
+
 namespace_name:
         T_STRING                                        { $$ = Node("NamespaceParts").append(Node($1)); }
     |   namespace_name T_NS_SEPARATOR T_STRING          { $$ = $1.append(Node($3)); }
@@ -353,11 +358,6 @@ name:
     | T_NAMESPACE T_NS_SEPARATOR namespace_name         { $$ = Node("Name").append($3).attribute("Relative", "true"); }
 ;
 
-top_statement_list:
-        top_statement_list top_statement                { $$ = $1.append($2); }
-    |   /* empty */                                     { $$ = Node("Statements") }
-;
-
 top_statement:
         statement                                       { $$ = $1 }
     |   function_declaration_statement                  { $$ = $1 }
@@ -395,33 +395,48 @@ mixed_group_use_declaration:
                                                         { $$ = Node("MixedGroupUse").append($2).append($5); }
 ;
 
+possible_comma:
+        /* empty */
+    |   ','
+;
+
 inline_use_declarations:
         inline_use_declarations ',' inline_use_declaration
                                                         { $$ = $1.append($3) }
     |   inline_use_declaration                          { $$ = Node("UseList").append($1) }
 ;
+
 unprefixed_use_declarations:
         unprefixed_use_declarations ',' unprefixed_use_declaration
                                                         { $$ = $1.append($3) }
     |   unprefixed_use_declaration                      { $$ = Node("UseList").append($1) }
 ;
+
 use_declarations:
         use_declarations ',' use_declaration            { $$ = $1.append($3) }
     |   use_declaration                                 { $$ = Node("UseList").append($1) }
 ;
+
 inline_use_declaration:
         unprefixed_use_declaration                      { $$ = $1; }
     |   use_type unprefixed_use_declaration             { $$ = $2.append($1) }
 ;
+
 unprefixed_use_declaration:
         namespace_name                                  { $$ = Node("UseElem").append($1); }
     |   namespace_name T_AS T_STRING                    { $$ = Node("UseElem").append($1).append(Node("as").attribute("value", $3)); }
 ;
+
 use_declaration:
         unprefixed_use_declaration                      { $$ = $1; }
     |   T_NS_SEPARATOR unprefixed_use_declaration       { $$ = $2; }
 ;
 
+const_list:
+        const_list ',' const_decl                       { $$ = $1.append($3) }
+    |   const_decl                                      { $$ = Node("ConstList").append($1) }
+;
+
 inner_statement_list:
         inner_statement_list inner_statement            { $$ = $1.append($2); }
     |   /* empty */                                     { $$ = Node("stmt") }
@@ -513,196 +528,6 @@ finally_statement:
     |   T_FINALLY '{' inner_statement_list '}'          { $$ = Node("Finnaly").append($3) }
 ;
 
-const_list:
-        const_list ',' const_decl                       { $$ = $1.append($3) }
-    |   const_decl                                      { $$ = Node("ConstList").append($1) }
-;
-
-const_decl:
-    T_STRING '=' expr                                   { $$ = Node("Const").attribute("name", $1).append($3) }
-;
-
-declare_statement:
-        statement                                       { $$ = $1; }
-    |   ':' inner_statement_list T_ENDDECLARE ';'       { $$ = $2; }
-;
-
-if_stmt_without_else:
-        T_IF '(' expr ')' statement
-            {
-                $$ = Node("If").append(Node("expr").append($3)).append(Node("stmt").append($5))
-            }
-    |   if_stmt_without_else T_ELSEIF '(' expr ')' statement
-            { 
-                $$ = $1.append(Node("ElseIf").append(Node("expr").append($4)).append(Node("stmt").append($6)))
-            }
-;
-
-if_stmt:
-        if_stmt_without_else %prec T_NOELSE             { $$ = $1; }
-    |   if_stmt_without_else T_ELSE statement
-            {
-                $$ = $1.append(Node("Else").append(Node("stmt").append($3)))
-            }
-;
-
-alt_if_stmt_without_else:
-        T_IF '(' expr ')' ':' inner_statement_list
-            { 
-                $$ = Node("AltIf").append(Node("expr").append($3)).append(Node("stmt").append($6))
-            }
-    |   alt_if_stmt_without_else T_ELSEIF '(' expr ')' ':' inner_statement_list
-            {
-                $$ = $1.append(Node("AltElseIf").append(Node("expr").append($4)).append(Node("stmt").append($7)))
-            }
-;
-
-alt_if_stmt:
-        alt_if_stmt_without_else T_ENDIF ';'            { $$ = $1; }
-    |   alt_if_stmt_without_else T_ELSE ':' inner_statement_list T_ENDIF ';'
-            {
-                $$ = $1.append(Node("AltElse").append(Node("stmt").append($4)))
-            }
-;
-
-while_statement:
-        statement                                       { $$ = $1; }
-    |   ':' inner_statement_list T_ENDWHILE ';'         { $$ = $2; }
-;
-
-for_exprs:
-        /* empty */                                     { $$ = Node(""); }
-    |   non_empty_for_exprs                             { $$ = $1; }
-;
-non_empty_for_exprs:
-        non_empty_for_exprs ',' expr                    { $$ = $1.append($3) }
-    |   expr                                            { $$ = Node("ExpressionList").append($1) }
-;
-
-anonymous_class:
-    T_CLASS ctor_arguments extends_from implements_list '{' class_statement_list '}'
-        {
-            $$ = Node("AnonymousClass").
-                attribute("name", $1).
-                append($2).
-                append($3).
-                append($4).
-                append($6);
-        }
-;
-
-new_expr:
-        T_NEW class_name_reference ctor_arguments       { $$ = Node("New").append($2).append($3) }
-    |   T_NEW anonymous_class                           { $$ = Node("New").append($2) }
-;
-
-ctor_arguments:
-        /* empty */	                                    { $$ = Node("ArgumentList") }
-    |   argument_list                                   { $$ = $1; }
-;
-
-switch_case_list:
-        '{' case_list '}'                               { $$ = $2; }
-    |   '{' ';' case_list '}'                           { $$ = $3; }
-    |   ':' case_list T_ENDSWITCH ';'                   { $$ = $2; }
-    |   ':' ';' case_list T_ENDSWITCH ';'               { $$ = $3; }
-;
-
-case_list:
-        /* empty */                                     { $$ = Node("CaseList") }
-    |   case_list T_CASE expr case_separator inner_statement_list
-            {
-                $$ = $1.append(Node("Case").append(Node("expr").append($3)).append($5))
-            }
-    |   case_list T_DEFAULT case_separator inner_statement_list
-            {
-                $$ = $1.append(Node("Default").append($4))
-            }
-;
-
-case_separator:
-        ':'
-    |   ';'
-;
-
-for_statement:
-        statement                                       { $$ = $1; }
-    |    ':' inner_statement_list T_ENDFOR ';'          { $$ = $2; }
-;
-
-foreach_variable:
-        variable                                        { $$ = $1; }
-    |   '&' variable                                    { $$ = Node("Ref").append($2); }
-    |   T_LIST '(' array_pair_list ')'                  { $$ = Node("List").append($3) }
-    |   '[' array_pair_list ']'                         { $$ = Node("ShortList").append($2) }
-;
-
-array_pair_list:
-    non_empty_array_pair_list                           { /* TODO: allow single trailing comma */ $$ = $1 }
-;
-
-possible_array_pair:
-        /* empty */                                     { $$ = Node(""); }
-    |   array_pair                                      { $$ = $1; }
-;
-
-non_empty_array_pair_list:
-        non_empty_array_pair_list ',' possible_array_pair
-                                                        { $$ = $1.append($3) }
-    |   possible_array_pair                             { $$ = Node("ArrayPairList").append($1) }
-;
-
-array_pair:
-        expr T_DOUBLE_ARROW expr                        { $$ = Node("ArrayElement").append($1).append($3) }
-    |   expr                                            { $$ = Node("ArrayElement").append($1) }
-    |   expr T_DOUBLE_ARROW '&' variable                { $$ = Node("ArrayElement").append($1).append(Node("Ref").append($4)) }
-    |   '&' variable                                    { $$ = Node("ArrayElement").append(Node("Ref").append($2)) }
-    |   expr T_DOUBLE_ARROW T_LIST '(' array_pair_list ')'
-            { 
-                $$ = Node("ArrayElement").
-                    append($1).
-                    append(Node("ArrayList").append($5))
-            }
-    |   T_LIST '(' array_pair_list ')'
-            {
-                $$ = Node("ArrayElement").
-                    append(Node("ArrayList").append($3))
-            }
-;
-
-foreach_statement:
-        statement                                       { $$ = $1; }
-    |   ':' inner_statement_list T_ENDFOREACH ';'       { $$ = $2; }
-;
-
-global_var_list:
-        global_var_list ',' global_var                  { $$ = $1.append($3); }
-    |   global_var                                      { $$ = Node("GlobalVarList").append($1); }
-;
-
-global_var:
-    simple_variable                                     { $$ = $1 }
-;
-
-static_var_list:
-        static_var_list ',' static_var                  { $$ = $1.append($3); }
-    |   static_var                                      { $$ = Node("StaticVarList").append($1); }
-;
-
-static_var:
-        T_VARIABLE                                      { $$ = Node("StaticVariable").attribute("Name", $1); }
-    |   T_VARIABLE '=' expr                             { $$ = Node("StaticVariable").attribute("Name", $1).append(Node("expr").append($3)); }
-;
-
-echo_expr_list:
-        echo_expr_list ',' echo_expr                    { $$ = $1.append($3) }
-    |   echo_expr                                       { $$ = Node("EchoList").append($1) }
-;
-
-echo_expr:
-    expr                                                { $$ = Node("Echo").append($1) }
-;
-
 unset_variables:
         unset_variable                                  { $$ = Node("UnsetVariablesList").append($1) }
     |   unset_variables ',' unset_variable              { $$ = $1.append($3) }
@@ -712,9 +537,26 @@ unset_variable:
     variable                                            { $$ = $1 }
 ;
 
-possible_comma:
-        /* empty */
-    |   ','
+function_declaration_statement:
+    T_FUNCTION returns_ref T_STRING '(' parameter_list ')' return_type '{' inner_statement_list '}'
+        {
+            $$ = Node("Function").
+                attribute("name", $3).
+                attribute("returns_ref", $2).
+                append($5).
+                append($7).
+                append($9);
+        }
+;
+
+is_reference:
+        /* empty */                                     { $$ = "false"; }
+    |   '&'                                             { $$ = "true"; }
+;
+
+is_variadic:
+        /* empty */                                     { $$ = "false"; }
+    |   T_ELLIPSIS                                      { $$ = "true"; }
 ;
 
 class_declaration_statement:
@@ -776,6 +618,180 @@ implements_list:
     |   T_IMPLEMENTS name_list                          { $$ = $2; }
 ;
 
+foreach_variable:
+        variable                                        { $$ = $1; }
+    |   '&' variable                                    { $$ = Node("Ref").append($2); }
+    |   T_LIST '(' array_pair_list ')'                  { $$ = Node("List").append($3) }
+    |   '[' array_pair_list ']'                         { $$ = Node("ShortList").append($2) }
+;
+
+for_statement:
+        statement                                       { $$ = $1; }
+    |    ':' inner_statement_list T_ENDFOR ';'          { $$ = $2; }
+;
+
+foreach_statement:
+        statement                                       { $$ = $1; }
+    |   ':' inner_statement_list T_ENDFOREACH ';'       { $$ = $2; }
+;
+
+declare_statement:
+        statement                                       { $$ = $1; }
+    |   ':' inner_statement_list T_ENDDECLARE ';'       { $$ = $2; }
+;
+
+switch_case_list:
+        '{' case_list '}'                               { $$ = $2; }
+    |   '{' ';' case_list '}'                           { $$ = $3; }
+    |   ':' case_list T_ENDSWITCH ';'                   { $$ = $2; }
+    |   ':' ';' case_list T_ENDSWITCH ';'               { $$ = $3; }
+;
+
+case_list:
+        /* empty */                                     { $$ = Node("CaseList") }
+    |   case_list T_CASE expr case_separator inner_statement_list
+            {
+                $$ = $1.append(Node("Case").append(Node("expr").append($3)).append($5))
+            }
+    |   case_list T_DEFAULT case_separator inner_statement_list
+            {
+                $$ = $1.append(Node("Default").append($4))
+            }
+;
+
+case_separator:
+        ':'
+    |   ';'
+;
+
+while_statement:
+        statement                                       { $$ = $1; }
+    |   ':' inner_statement_list T_ENDWHILE ';'         { $$ = $2; }
+;
+
+if_stmt_without_else:
+        T_IF '(' expr ')' statement
+            {
+                $$ = Node("If").append(Node("expr").append($3)).append(Node("stmt").append($5))
+            }
+    |   if_stmt_without_else T_ELSEIF '(' expr ')' statement
+            { 
+                $$ = $1.append(Node("ElseIf").append(Node("expr").append($4)).append(Node("stmt").append($6)))
+            }
+;
+
+if_stmt:
+        if_stmt_without_else %prec T_NOELSE             { $$ = $1; }
+    |   if_stmt_without_else T_ELSE statement
+            {
+                $$ = $1.append(Node("Else").append(Node("stmt").append($3)))
+            }
+;
+
+alt_if_stmt_without_else:
+        T_IF '(' expr ')' ':' inner_statement_list
+            { 
+                $$ = Node("AltIf").append(Node("expr").append($3)).append(Node("stmt").append($6))
+            }
+    |   alt_if_stmt_without_else T_ELSEIF '(' expr ')' ':' inner_statement_list
+            {
+                $$ = $1.append(Node("AltElseIf").append(Node("expr").append($4)).append(Node("stmt").append($7)))
+            }
+;
+
+alt_if_stmt:
+        alt_if_stmt_without_else T_ENDIF ';'            { $$ = $1; }
+    |   alt_if_stmt_without_else T_ELSE ':' inner_statement_list T_ENDIF ';'
+            {
+                $$ = $1.append(Node("AltElse").append(Node("stmt").append($4)))
+            }
+;
+
+parameter_list:
+        non_empty_parameter_list                        { $$ = $1; }
+    |   /* empty */                                     { $$ = Node("Parameter list"); }
+;
+
+non_empty_parameter_list:
+        parameter                                       { $$ = Node("Parameter list").append($1) }
+    |   non_empty_parameter_list ',' parameter          { $$ = $1.append($3); }
+;
+
+parameter:
+        optional_type is_reference is_variadic T_VARIABLE
+            {
+                $$ = Node("Parameter").
+                    append($1).
+                    attribute("is_reference", $2).
+                    attribute("is_variadic", $3).
+                    attribute("var", $4);
+            }
+    |   optional_type is_reference is_variadic T_VARIABLE '=' expr
+            {
+                $$ = Node("Parameter").
+                    append($1).
+                    attribute("is_reference", $2).
+                    attribute("is_variadic", $3).
+                    attribute("var", $4).
+                    append($6);
+            }
+;
+
+optional_type:
+        /* empty */                                     { $$ = Node("No type") }
+    |   type_expr                                       { $$ = $1; }
+;
+
+type_expr:
+        type                                            { $$ = $1; }
+    |   '?' type                                        { $$ = $2; $$.attribute("nullable", "true") }
+;
+
+type:
+        name                                            { $$ = $1; }
+    |   T_ARRAY                                         { $$ = Node("array type"); }
+    |   T_CALLABLE                                      { $$ = Node("callable type"); }
+;
+
+return_type:
+        /* empty */                                     { $$ = Node("No return type"); }
+    |   ':' type_expr                                   { $$ = $2; }
+;
+
+argument_list:
+        '(' ')'                                         { $$ = Node("ArgumentList") }
+    |   '(' non_empty_argument_list possible_comma ')'  { $$ = $2; }
+;
+
+non_empty_argument_list:
+        argument                                        { $$ = Node("ArgumentList").append($1) }
+    |   non_empty_argument_list ',' argument            { $$ = $1.append($3) }
+;
+
+argument:
+        expr                                            { $$ = $1; }
+    |   T_ELLIPSIS expr                                 { $$ = Node("Unpack").append($2) }
+;
+
+global_var_list:
+        global_var_list ',' global_var                  { $$ = $1.append($3); }
+    |   global_var                                      { $$ = Node("GlobalVarList").append($1); }
+;
+
+global_var:
+    simple_variable                                     { $$ = $1 }
+;
+
+static_var_list:
+        static_var_list ',' static_var                  { $$ = $1.append($3); }
+    |   static_var                                      { $$ = Node("StaticVarList").append($1); }
+;
+
+static_var:
+        T_VARIABLE                                      { $$ = Node("StaticVariable").attribute("Name", $1); }
+    |   T_VARIABLE '=' expr                             { $$ = Node("StaticVariable").attribute("Name", $1).append(Node("expr").append($3)); }
+;
+
 class_statement_list:
         class_statement_list class_statement            { $$ = $1.append($2) }
     |   /* empty */                                     { $$ = Node("Stmt") }
@@ -832,6 +848,7 @@ trait_alias:
                                                         { $$ = $1.append($3).append($4); }
     |   trait_method_reference T_AS member_modifier     { $$ = $1.append($3); }
 ;
+
 trait_method_reference:
         identifier                                      { $$ = Node("TraitMethodRef").append($1); }
     |   absolute_trait_method_reference                 { $$ = $1; }
@@ -851,23 +868,16 @@ variable_modifiers:
     |   T_VAR                                           { $$ = Node("VarMemberModifier") }
 ;
 
-class_const_list:
-        class_const_list ',' class_const_decl           { $$ = $1.append($3) }
-    |   class_const_decl                                { $$ = Node("ConstList").append($1) }
-;
-
-class_const_decl:
-    identifier '=' expr                                 { $$ = Node("Const").append($3) }
-;
-
 method_modifiers:
         /* empty */                                     { $$ = Node("PublicMemberModifier"); }
     |   non_empty_member_modifiers                      { $$ = $1; }
+;
 
 non_empty_member_modifiers:
         member_modifier	                                { $$ = $1; }
     |   non_empty_member_modifiers member_modifier      { $$ = $1.append($2) }
 ;
+
 member_modifier:
         T_PUBLIC                                        { $$ = Node("PublicMemberModifier"); }
     |   T_PROTECTED                                     { $$ = Node("ProtectedMemberModifier"); }
@@ -881,85 +891,58 @@ property_list:
         property_list ',' property                      { $$ = $1.append($3) }
     |   property                                        { $$ = Node("PropertyList").append($1) }
 ;
+
 property:
         T_VARIABLE                                      { $$ = Node("Property").attribute("name", $1) }
     |   T_VARIABLE '=' expr                             { $$ = Node("Property").attribute("name", $1).append(Node("Default").append($3)) }
 ;
 
-function_declaration_statement:
-    T_FUNCTION returns_ref T_STRING '(' parameter_list ')' return_type '{' inner_statement_list '}'
+class_const_list:
+        class_const_list ',' class_const_decl           { $$ = $1.append($3) }
+    |   class_const_decl                                { $$ = Node("ConstList").append($1) }
+;
+
+class_const_decl:
+    identifier '=' expr                                 { $$ = Node("Const").append($3) }
+;
+
+const_decl:
+    T_STRING '=' expr                                   { $$ = Node("Const").attribute("name", $1).append($3) }
+;
+
+echo_expr_list:
+        echo_expr_list ',' echo_expr                    { $$ = $1.append($3) }
+    |   echo_expr                                       { $$ = Node("EchoList").append($1) }
+;
+
+echo_expr:
+    expr                                                { $$ = Node("Echo").append($1) }
+;
+
+for_exprs:
+        /* empty */                                     { $$ = Node(""); }
+    |   non_empty_for_exprs                             { $$ = $1; }
+;
+non_empty_for_exprs:
+        non_empty_for_exprs ',' expr                    { $$ = $1.append($3) }
+    |   expr                                            { $$ = Node("ExpressionList").append($1) }
+;
+
+anonymous_class:
+    T_CLASS ctor_arguments extends_from implements_list '{' class_statement_list '}'
         {
-            $$ = Node("Function").
-                attribute("name", $3).
-                attribute("returns_ref", $2).
-                append($5).
-                append($7).
-                append($9);
+            $$ = Node("AnonymousClass").
+                attribute("name", $1).
+                append($2).
+                append($3).
+                append($4).
+                append($6);
         }
 ;
 
-parameter_list:
-        non_empty_parameter_list                        { $$ = $1; }
-    |   /* empty */                                     { $$ = Node("Parameter list"); }
-;
-non_empty_parameter_list:
-        parameter                                       { $$ = Node("Parameter list").append($1) }
-    |   non_empty_parameter_list ',' parameter          { $$ = $1.append($3); }
-;
-parameter:
-        optional_type is_reference is_variadic T_VARIABLE
-            {
-                $$ = Node("Parameter").
-                    append($1).
-                    attribute("is_reference", $2).
-                    attribute("is_variadic", $3).
-                    attribute("var", $4);
-            }
-    |   optional_type is_reference is_variadic T_VARIABLE '=' expr
-            {
-                $$ = Node("Parameter").
-                    append($1).
-                    attribute("is_reference", $2).
-                    attribute("is_variadic", $3).
-                    attribute("var", $4).
-                    append($6);
-            }
-;
-
-optional_type:
-        /* empty */                                     { $$ = Node("No type") }
-    |   type_expr                                       { $$ = $1; }
-;
-
-returns_ref:
-        /* empty */                                     { $$ = "false"; }
-    |   '&'                                             { $$ = "true"; }
-;
-
-is_reference:
-        /* empty */                                     { $$ = "false"; }
-    |   '&'                                             { $$ = "true"; }
-;
-
-is_variadic:
-        /* empty */                                     { $$ = "false"; }
-    |   T_ELLIPSIS                                      { $$ = "true"; }
-;
-
-type_expr:
-        type                                            { $$ = $1; }
-    |   '?' type                                        { $$ = $2; $$.attribute("nullable", "true") }
-;
-
-type:
-        name                                            { $$ = $1; }
-    |   T_ARRAY                                         { $$ = Node("array type"); }
-    |   T_CALLABLE                                      { $$ = Node("callable type"); }
-;
-
-return_type:
-        /* empty */                                     { $$ = Node("No return type"); }
-    |   ':' type_expr                                   { $$ = $2; }
+new_expr:
+        T_NEW class_name_reference ctor_arguments       { $$ = Node("New").append($2).append($3) }
+    |   T_NEW anonymous_class                           { $$ = Node("New").append($2) }
 ;
 
 expr_without_variable:
@@ -1055,6 +1038,11 @@ expr_without_variable:
             }
 ;
 
+returns_ref:
+        /* empty */                                     { $$ = "false"; }
+    |   '&'                                             { $$ = "true"; }
+;
+
 lexical_vars:
         /* empty */                                     { $$ = Node("") }
     |   T_USE '(' lexical_var_list ')'                  { $$ = $3; }
@@ -1070,6 +1058,47 @@ lexical_var:
     |   '&' T_VARIABLE                                  { $$ = Node("Variable").attribute("value", $2).attribute("ref", "true") }
 ;
 
+function_call:
+        name argument_list                              { $$ = Node("FunctionCall").append($1).append($2) }
+    |   class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
+                                                        { $$ = Node("StaticCall").append($1).append($3).append($4) }
+    |   variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
+                                                        { $$ = Node("StaticCall").append($1).append($3).append($4) }
+    |   callable_expr argument_list                     { $$ = Node("Call").append($1).append($2); }
+;
+
+class_name:
+        T_STATIC                                        { $$ = Node("Static") }
+    |   name                                            { $$ = $1; }
+;
+
+class_name_reference:
+        class_name                                      { $$ = $1; }
+    |   new_variable                                    { $$ = $1; }
+;
+
+exit_expr:
+        /* empty */                                     { $$ = Node("") }
+    |   '(' optional_expr ')'                           { $$ = $2; }
+;
+
+backticks_expr:
+        /* empty */                                     { $$ = Node("EmptyBackticks") }
+    |   T_ENCAPSED_AND_WHITESPACE                       { $$ = Node("String").attribute("value", $1) }
+    |   encaps_list                                     { $$ = $1; }
+;
+
+ctor_arguments:
+        /* empty */	                                    { $$ = Node("ArgumentList") }
+    |   argument_list                                   { $$ = $1; }
+;
+
+dereferencable_scalar:
+        T_ARRAY '(' array_pair_list ')'                 { $$ = $3; }
+    |   '[' array_pair_list ']'                         { $$ = $2; }
+    |   T_CONSTANT_ENCAPSED_STRING                      { $$ = Node("String").attribute("value", $1) }
+;
+
 scalar:
         T_LNUMBER                                       { $$ = Node("Scalar").append(Node("Lnumber").attribute("value", $1)) }
     |   T_DNUMBER                                       { $$ = Node("Scalar").append(Node("Dnumber").attribute("value", $1)) }
@@ -1091,12 +1120,131 @@ scalar:
     |   constant                                        { $$ = $1; }
 ;
 
+constant:
+        name                                            { $$ = Node("Const").append($1) }
+    |   class_name T_PAAMAYIM_NEKUDOTAYIM identifier    { $$ = Node("Const").append($1).append($3) }
+    |   variable_class_name T_PAAMAYIM_NEKUDOTAYIM identifier
+                                                        { $$ = Node("Const").append($1).append($3) }
+;
+
+expr:
+        variable                                        { $$ = $1; }
+    |   expr_without_variable                           { $$ = $1; }
+;
+
+optional_expr:
+        /* empty */                                     { $$ = Node("") }
+    |   expr                                            { $$ = $1; }
+;
+
+variable_class_name:
+    dereferencable                                      { $$ = $1; }
+;
+
+dereferencable:
+        variable                                        { $$ = $1; }
+    |   '(' expr ')'                                    { $$ = $2; }
+    |   dereferencable_scalar                           { $$ = $1; }
+;
+
+callable_expr:
+        callable_variable                               { $$ = $1; }
+    |   '(' expr ')'                                    { $$ = $2; }
+    |   dereferencable_scalar                           { $$ = $1; }
+;
+
+callable_variable:
+    simple_variable                                     { $$ = $1; }
+    |   dereferencable '[' optional_expr ']'            { $$ = Node("Dim").append($1).append($3)}
+    |   constant '[' optional_expr ']'                  { $$ = Node("Dim").append($1).append($3)}
+    |   dereferencable '{' expr '}'                     { $$ = Node("Dim").append($1).append($3)}
+    |   dereferencable T_OBJECT_OPERATOR property_name argument_list
+                                                        { $$ = Node("MethodCall").append($1).append($3).append($4)}
+    |   function_call                                   { $$ = $1; }
+;
+
+variable:
+        callable_variable                               { $$ = $1; }
+    |   static_member                                   { $$ = $1; }
+    |   dereferencable T_OBJECT_OPERATOR property_name  { $$ = Node("Property").append($1).append($3) }
+;
+
+simple_variable:
+        T_VARIABLE                                      { $$ = Node("Variable").attribute("name", $1); }
+    |   '$' '{' expr '}'                                { $$ = Node("Variable").append($3); }
+    |   '$' simple_variable                             { $$ = Node("Variable").append($2); }
+;
+
+static_member:
+        class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable
+                                                        { $$ = Node("StaticProp").append($1).append($3) }
+    |   variable_class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable
+                                                        { $$ = Node("StaticProp").append($1).append($3) }
+;
+
+new_variable:
+        simple_variable                                 { $$ = $1 }
+    |   new_variable '[' optional_expr ']'              { $$ = Node("Dim").append($1).append($3) }
+    |   new_variable '{' expr '}'                       { $$ = Node("Dim").append($1).append($3) }
+    |   new_variable T_OBJECT_OPERATOR property_name    { $$ = Node("Property").append($1).append($3) }
+    |   class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable
+                                                        { $$ = Node("StaticProperty").append($1).append($3) }
+    |   new_variable T_PAAMAYIM_NEKUDOTAYIM simple_variable
+                                                        { $$ = Node("StaticProperty").append($1).append($3) }
+;
+
+member_name:
+        identifier                                      { $$ = $1; }
+    |   '{' expr '}'                                    { $$ = $2; }
+    |   simple_variable                                 { $$ = $1 }
+;
+
+property_name:
+        T_STRING                                        { $$ = Node("PropertyName").attribute("value", $1) }
+    |   '{' expr '}'                                    { $$ = $2; }
+    |   simple_variable                                 { $$ = $1 }
+;
+
+array_pair_list:
+    non_empty_array_pair_list                           { /* TODO: allow single trailing comma */ $$ = $1 }
+;
+
+possible_array_pair:
+        /* empty */                                     { $$ = Node(""); }
+    |   array_pair                                      { $$ = $1; }
+;
+
+non_empty_array_pair_list:
+        non_empty_array_pair_list ',' possible_array_pair
+                                                        { $$ = $1.append($3) }
+    |   possible_array_pair                             { $$ = Node("ArrayPairList").append($1) }
+;
+
+array_pair:
+        expr T_DOUBLE_ARROW expr                        { $$ = Node("ArrayElement").append($1).append($3) }
+    |   expr                                            { $$ = Node("ArrayElement").append($1) }
+    |   expr T_DOUBLE_ARROW '&' variable                { $$ = Node("ArrayElement").append($1).append(Node("Ref").append($4)) }
+    |   '&' variable                                    { $$ = Node("ArrayElement").append(Node("Ref").append($2)) }
+    |   expr T_DOUBLE_ARROW T_LIST '(' array_pair_list ')'
+            { 
+                $$ = Node("ArrayElement").
+                    append($1).
+                    append(Node("ArrayList").append($5))
+            }
+    |   T_LIST '(' array_pair_list ')'
+            {
+                $$ = Node("ArrayElement").
+                    append(Node("ArrayList").append($3))
+            }
+;
+
 encaps_list:
         encaps_list encaps_var                          { $$ = $1.append($2) }
     |   encaps_list T_ENCAPSED_AND_WHITESPACE           { $$ = $1.append(Node("String").attribute("value", $2)) }
     |   encaps_var                                      { $$ = Node("EncapsList").append($1) }
     |   T_ENCAPSED_AND_WHITESPACE encaps_var            { $$ = Node("EncapsList").append(Node("String").attribute("value", $1)).append($2) }
 ;
+
 encaps_var:
         T_VARIABLE                                      { $$ = Node("Variable").attribute("value", $1) }
     |   T_VARIABLE '[' encaps_var_offset ']'            { $$ = Node("Variable").attribute("value", $1).append(Node("offset").append($3)) }
@@ -1133,139 +1281,6 @@ isset_variable:
     expr                                                { $$ = Node("Isset").append($1) }
 ;
 
-constant:
-        name                                            { $$ = Node("Const").append($1) }
-    |   class_name T_PAAMAYIM_NEKUDOTAYIM identifier    { $$ = Node("Const").append($1).append($3) }
-    |   variable_class_name T_PAAMAYIM_NEKUDOTAYIM identifier
-                                                        { $$ = Node("Const").append($1).append($3) }
-;
-
-class_name:
-        T_STATIC                                        { $$ = Node("Static") }
-    |   name                                            { $$ = $1; }
-;
-
-class_name_reference:
-        class_name                                      { $$ = $1; }
-    |   new_variable                                    { $$ = $1; }
-;
-
-exit_expr:
-        /* empty */                                     { $$ = Node("") }
-    |   '(' optional_expr ')'                           { $$ = $2; }
-;
-
-backticks_expr:
-        /* empty */                                     { $$ = Node("EmptyBackticks") }
-    |   T_ENCAPSED_AND_WHITESPACE                       { $$ = Node("String").attribute("value", $1) }
-    |   encaps_list                                     { $$ = $1; }
-;
-
-variable_class_name:
-    dereferencable                                      { $$ = $1; }
-;
-
-dereferencable:
-        variable                                        { $$ = $1; }
-    |   '(' expr ')'                                    { $$ = $2; }
-    |   dereferencable_scalar                           { $$ = $1; }
-;
-
-callable_expr:
-        callable_variable                               { $$ = $1; }
-    |   '(' expr ')'                                    { $$ = $2; }
-    |   dereferencable_scalar                           { $$ = $1; }
-;
-
-dereferencable_scalar:
-        T_ARRAY '(' array_pair_list ')'                 { $$ = $3; }
-    |   '[' array_pair_list ']'                         { $$ = $2; }
-    |   T_CONSTANT_ENCAPSED_STRING                      { $$ = Node("String").attribute("value", $1) }
-;
-
-expr:
-        variable                                        { $$ = $1; }
-    |   expr_without_variable                           { $$ = $1; }
-;
-
-optional_expr:
-        /* empty */                                     { $$ = Node("") }
-    |   expr                                            { $$ = $1; }
-;
-
-callable_variable:
-    simple_variable                                     { $$ = $1; }
-    |   dereferencable '[' optional_expr ']'            { $$ = Node("Dim").append($1).append($3)}
-    |   constant '[' optional_expr ']'                  { $$ = Node("Dim").append($1).append($3)}
-    |   dereferencable '{' expr '}'                     { $$ = Node("Dim").append($1).append($3)}
-    |   dereferencable T_OBJECT_OPERATOR property_name argument_list
-                                                        { $$ = Node("MethodCall").append($1).append($3).append($4)}
-    |   function_call                                   { $$ = $1; }
-;
-
-function_call:
-        name argument_list                              { $$ = Node("FunctionCall").append($1).append($2) }
-    |   class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
-                                                        { $$ = Node("StaticCall").append($1).append($3).append($4) }
-    |   variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list
-                                                        { $$ = Node("StaticCall").append($1).append($3).append($4) }
-    |   callable_expr argument_list                     { $$ = Node("Call").append($1).append($2); }
-;
-
-member_name:
-        identifier                                      { $$ = $1; }
-    |   '{' expr '}'                                    { $$ = $2; }
-    |   simple_variable                                 { $$ = $1 }
-;
-
-argument_list:
-        '(' ')'                                         { $$ = Node("ArgumentList") }
-    |   '(' non_empty_argument_list possible_comma ')'  { $$ = $2; }
-;
-non_empty_argument_list:
-        argument                                        { $$ = Node("ArgumentList").append($1) }
-    |   non_empty_argument_list ',' argument            { $$ = $1.append($3) }
-;
-argument:
-        expr                                            { $$ = $1; }
-    |   T_ELLIPSIS expr                                 { $$ = Node("Unpack").append($2) }
-;
-
-variable:
-        callable_variable                               { $$ = $1; }
-    |   static_member                                   { $$ = $1; }
-    |   dereferencable T_OBJECT_OPERATOR property_name  { $$ = Node("Property").append($1).append($3) }
-;
-
-property_name:
-        T_STRING                                        { $$ = Node("PropertyName").attribute("value", $1) }
-    |   '{' expr '}'                                    { $$ = $2; }
-    |   simple_variable                                 { $$ = $1 }
-;
-
-simple_variable:
-        T_VARIABLE                                      { $$ = Node("Variable").attribute("name", $1); }
-    |   '$' '{' expr '}'                                { $$ = Node("Variable").append($3); }
-    |   '$' simple_variable                             { $$ = Node("Variable").append($2); }
-;
-
-static_member:
-        class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable
-                                                        { $$ = Node("StaticProp").append($1).append($3) }
-    |   variable_class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable
-                                                        { $$ = Node("StaticProp").append($1).append($3) }
-;
-new_variable:
-        simple_variable                                 { $$ = $1 }
-    |   new_variable '[' optional_expr ']'              { $$ = Node("Dim").append($1).append($3) }
-    |   new_variable '{' expr '}'                       { $$ = Node("Dim").append($1).append($3) }
-    |   new_variable T_OBJECT_OPERATOR property_name    { $$ = Node("Property").append($1).append($3) }
-    |   class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable
-                                                        { $$ = Node("StaticProperty").append($1).append($3) }
-    |   new_variable T_PAAMAYIM_NEKUDOTAYIM simple_variable
-                                                        { $$ = Node("StaticProperty").append($1).append($3) }
-;
-
 /////////////////////////////////////////////////////////////////////////
 
 %%