diff --git a/parser.go b/parser.go
index c35e3e7..5a0493b 100644
--- a/parser.go
+++ b/parser.go
@@ -366,12 +366,17 @@ const yyEofCode = 1
 const yyErrCode = 2
 const yyInitialStackSize = 16
 
-//line parser.y:813
+//line parser.y:864
 const src = `<?php
 
 abstract class test {
-    public static $a ,$b = $c;
-    private static const TEST = $a, TEST2 = $b;
+    use \test\tt, tt {
+        tt::test insteadof test;
+        \test\tt::test as include;
+        \test\tt::test as public include;
+        \test\tt::test as public private;
+        \test\tt::test as private somestring;
+    }
 }
 
 `
@@ -390,320 +395,393 @@ var yyExca = [...]int{
 	-2, 0,
 	-1, 90,
 	159, 46,
-	-2, 307,
+	-2, 325,
 	-1, 300,
 	38, 0,
 	39, 0,
 	40, 0,
 	41, 0,
 	42, 0,
-	-2, 279,
+	-2, 297,
 	-1, 301,
 	38, 0,
 	39, 0,
 	40, 0,
 	41, 0,
 	42, 0,
-	-2, 280,
+	-2, 298,
 	-1, 302,
 	38, 0,
 	39, 0,
 	40, 0,
 	41, 0,
 	42, 0,
-	-2, 281,
+	-2, 299,
 	-1, 303,
 	38, 0,
 	39, 0,
 	40, 0,
 	41, 0,
 	42, 0,
-	-2, 282,
+	-2, 300,
 	-1, 304,
 	38, 0,
 	39, 0,
 	40, 0,
 	41, 0,
 	42, 0,
-	-2, 283,
+	-2, 301,
 	-1, 305,
 	43, 0,
 	44, 0,
 	45, 0,
 	46, 0,
-	-2, 284,
+	-2, 302,
 	-1, 306,
 	43, 0,
 	44, 0,
 	45, 0,
 	46, 0,
-	-2, 285,
+	-2, 303,
 	-1, 307,
 	43, 0,
 	44, 0,
 	45, 0,
 	46, 0,
-	-2, 286,
+	-2, 304,
 	-1, 308,
 	43, 0,
 	44, 0,
 	45, 0,
 	46, 0,
-	-2, 287,
+	-2, 305,
 	-1, 369,
-	163, 219,
-	-2, 224,
-	-1, 422,
-	114, 204,
-	-2, 198,
+	163, 237,
+	-2, 242,
+	-1, 423,
+	114, 222,
+	-2, 216,
+	-1, 567,
+	105, 76,
+	-2, 78,
 }
 
 const yyPrivate = 57344
 
-const yyLast = 4242
+const yyLast = 4660
 
 var yyAct = [...]int{
 
-	23, 152, 448, 508, 411, 485, 523, 468, 72, 408,
-	450, 414, 406, 393, 439, 269, 371, 159, 159, 159,
-	149, 424, 170, 409, 317, 313, 264, 169, 166, 4,
-	204, 68, 69, 69, 163, 490, 37, 576, 571, 559,
-	154, 531, 530, 233, 395, 521, 236, 237, 238, 239,
-	240, 164, 242, 445, 244, 245, 246, 247, 248, 249,
-	250, 251, 252, 253, 254, 255, 256, 459, 391, 558,
-	496, 494, 447, 369, 352, 327, 397, 366, 325, 243,
-	234, 235, 241, 233, 232, 72, 242, 202, 244, 245,
-	254, 255, 174, 176, 175, 69, 480, 481, 480, 481,
-	201, 200, 258, 157, 257, 156, 547, 389, 153, 70,
-	70, 410, 198, 577, 199, 172, 173, 177, 179, 178,
-	191, 192, 189, 190, 193, 194, 195, 196, 197, 187,
-	188, 181, 182, 180, 183, 185, 186, 541, 497, 370,
-	324, 396, 203, 578, 151, 524, 569, 470, 554, 526,
-	184, 479, 537, 527, 267, 520, 72, 271, 272, 477,
-	474, 428, 429, 430, 427, 426, 425, 151, 505, 282,
-	443, 279, 70, 283, 284, 285, 286, 287, 288, 289,
+	23, 152, 512, 472, 559, 411, 425, 75, 72, 449,
+	71, 511, 530, 488, 469, 408, 451, 159, 159, 159,
+	264, 406, 170, 4, 393, 440, 409, 414, 269, 317,
+	204, 313, 371, 169, 154, 37, 149, 166, 493, 69,
+	163, 69, 607, 233, 597, 578, 236, 237, 238, 239,
+	240, 68, 242, 446, 244, 245, 246, 247, 248, 249,
+	250, 251, 252, 253, 254, 255, 256, 538, 537, 528,
+	460, 164, 391, 577, 499, 497, 448, 366, 369, 234,
+	235, 352, 327, 233, 325, 72, 242, 243, 244, 245,
+	254, 255, 241, 483, 484, 483, 484, 523, 232, 202,
+	201, 174, 176, 175, 200, 157, 156, 153, 389, 608,
+	554, 257, 548, 531, 500, 395, 70, 508, 70, 370,
+	324, 198, 258, 199, 172, 173, 177, 179, 178, 191,
+	192, 189, 190, 193, 194, 195, 196, 197, 187, 188,
+	181, 182, 180, 183, 185, 186, 533, 397, 482, 203,
+	410, 610, 595, 589, 267, 588, 72, 271, 272, 184,
+	429, 430, 431, 428, 427, 426, 69, 151, 573, 282,
+	279, 277, 544, 283, 284, 285, 286, 287, 288, 289,
 	290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
 	300, 301, 302, 303, 304, 305, 306, 307, 308, 309,
-	311, 444, 315, 442, 151, 319, 277, 440, 423, 438,
-	353, 328, 416, 321, 275, 415, 412, 413, 330, 332,
+	311, 445, 315, 534, 422, 319, 151, 424, 151, 527,
+	480, 477, 396, 444, 443, 441, 412, 413, 330, 332,
 	333, 334, 335, 336, 337, 338, 339, 340, 341, 342,
-	343, 365, 274, 344, 273, 416, 388, 314, 415, 260,
-	326, 502, 346, 259, 347, 437, 466, 465, 261, 457,
-	458, 268, 469, 412, 413, 543, 546, 167, 349, 528,
-	480, 481, 174, 176, 175, 151, 428, 429, 430, 427,
-	426, 425, 416, 525, 318, 415, 66, 67, 483, 480,
-	481, 358, 198, 170, 199, 172, 173, 177, 179, 178,
-	191, 192, 189, 190, 193, 194, 195, 196, 197, 187,
-	188, 181, 182, 180, 183, 185, 186, 561, 357, 164,
-	359, 361, 356, 423, 350, 323, 322, 211, 504, 281,
-	184, 278, 205, 214, 216, 215, 372, 209, 373, 212,
-	213, 374, 375, 428, 429, 430, 427, 426, 425, 181,
-	182, 180, 183, 185, 186, 184, 462, 208, 499, 379,
-	39, 418, 473, 384, 271, 386, 276, 329, 184, 564,
-	560, 390, 155, 51, 52, 53, 54, 206, 402, 385,
-	548, 63, 64, 506, 65, 158, 367, 280, 382, 491,
-	183, 185, 186, 460, 210, 436, 363, 417, 354, 392,
-	362, 401, 399, 160, 161, 331, 184, 509, 452, 74,
-	314, 394, 455, 434, 441, 71, 265, 45, 46, 5,
-	75, 320, 1, 47, 421, 48, 43, 44, 55, 56,
-	57, 58, 59, 60, 61, 62, 507, 464, 266, 42,
-	467, 6, 446, 422, 463, 420, 419, 475, 456, 271,
-	538, 403, 398, 316, 471, 451, 69, 449, 452, 312,
-	489, 168, 165, 162, 478, 482, 387, 484, 472, 488,
-	549, 270, 187, 188, 181, 182, 180, 183, 185, 186,
-	381, 486, 11, 500, 36, 519, 10, 503, 35, 41,
-	38, 522, 394, 184, 50, 405, 404, 498, 407, 529,
-	493, 33, 452, 533, 262, 452, 2, 536, 150, 540,
-	3, 539, 532, 207, 501, 461, 0, 545, 0, 542,
-	0, 0, 0, 544, 0, 0, 0, 0, 0, 0,
-	49, 0, 0, 70, 0, 553, 0, 0, 0, 552,
-	0, 0, 0, 0, 0, 0, 556, 0, 0, 0,
-	0, 0, 0, 563, 0, 0, 0, 0, 550, 566,
-	0, 565, 0, 567, 568, 0, 0, 486, 0, 452,
-	0, 570, 0, 0, 0, 574, 572, 175, 0, 0,
-	0, 557, 0, 0, 84, 85, 86, 87, 88, 579,
-	91, 92, 93, 89, 90, 198, 65, 199, 172, 173,
-	177, 179, 178, 191, 192, 189, 190, 193, 194, 195,
-	196, 197, 187, 188, 181, 182, 180, 183, 185, 186,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 45,
-	46, 0, 0, 184, 0, 47, 94, 48, 43, 44,
-	55, 56, 57, 58, 59, 60, 61, 62, 0, 0,
-	95, 82, 0, 98, 99, 100, 76, 77, 78, 79,
-	80, 81, 96, 97, 0, 0, 73, 0, 69, 0,
-	0, 0, 0, 0, 0, 101, 102, 103, 104, 105,
-	106, 107, 108, 109, 110, 111, 128, 129, 130, 131,
-	132, 122, 123, 124, 125, 126, 112, 113, 114, 115,
-	116, 117, 118, 119, 120, 121, 83, 0, 140, 138,
-	139, 135, 136, 0, 127, 133, 134, 141, 142, 144,
-	143, 145, 146, 510, 511, 512, 513, 514, 0, 91,
-	92, 93, 517, 518, 137, 148, 147, 0, 0, 0,
-	0, 0, 49, 0, 198, 70, 199, 172, 173, 177,
+	343, 365, 439, 344, 326, 416, 314, 388, 415, 353,
+	466, 532, 346, 70, 347, 467, 328, 524, 525, 321,
+	592, 275, 274, 273, 438, 412, 413, 260, 349, 259,
+	553, 505, 261, 590, 174, 176, 175, 507, 458, 459,
+	471, 591, 66, 67, 416, 268, 416, 415, 470, 415,
+	550, 358, 167, 170, 198, 151, 199, 172, 173, 177,
 	179, 178, 191, 192, 189, 190, 193, 194, 195, 196,
-	197, 187, 188, 181, 182, 180, 183, 185, 186, 0,
-	0, 0, 0, 0, 0, 94, 0, 0, 0, 0,
-	0, 0, 184, 0, 0, 0, 0, 0, 0, 95,
-	515, 0, 98, 99, 100, 76, 77, 78, 79, 80,
-	81, 96, 97, 0, 0, 73, 0, 0, 0, 0,
-	0, 0, 0, 0, 101, 102, 103, 104, 105, 106,
-	107, 108, 109, 110, 111, 128, 129, 130, 131, 132,
-	122, 123, 124, 125, 126, 112, 113, 114, 115, 116,
-	117, 118, 119, 120, 121, 516, 0, 140, 138, 139,
-	135, 136, 0, 127, 133, 134, 141, 142, 144, 143,
-	145, 146, 176, 175, 0, 0, 0, 155, 51, 52,
-	53, 54, 0, 137, 148, 147, 63, 64, 0, 65,
-	0, 198, 0, 199, 172, 173, 177, 179, 178, 191,
+	197, 187, 188, 181, 182, 180, 183, 185, 186, 580,
+	318, 361, 535, 483, 484, 350, 359, 357, 356, 281,
+	278, 276, 184, 209, 323, 322, 372, 211, 373, 164,
+	205, 374, 375, 429, 430, 431, 428, 427, 426, 486,
+	483, 484, 429, 430, 431, 428, 427, 426, 184, 379,
+	214, 216, 215, 384, 271, 386, 212, 213, 183, 185,
+	186, 390, 579, 463, 208, 502, 476, 39, 402, 329,
+	206, 583, 382, 555, 184, 509, 367, 422, 280, 523,
+	424, 494, 385, 461, 363, 437, 399, 187, 188, 181,
+	182, 180, 183, 185, 186, 392, 401, 435, 453, 314,
+	394, 210, 456, 417, 354, 362, 265, 266, 184, 5,
+	6, 74, 1, 562, 158, 442, 563, 433, 418, 561,
+	181, 182, 180, 183, 185, 186, 560, 558, 473, 522,
+	474, 447, 160, 161, 421, 510, 468, 464, 478, 184,
+	271, 423, 420, 465, 419, 457, 545, 403, 398, 453,
+	316, 452, 450, 475, 312, 168, 165, 162, 492, 387,
+	568, 270, 381, 11, 36, 10, 489, 485, 481, 487,
+	35, 491, 41, 38, 405, 404, 501, 407, 526, 33,
+	262, 2, 394, 503, 529, 150, 3, 207, 504, 462,
+	496, 0, 536, 0, 506, 453, 540, 0, 453, 0,
+	0, 0, 547, 0, 0, 546, 0, 543, 0, 0,
+	552, 539, 0, 0, 0, 0, 0, 0, 549, 0,
+	0, 0, 0, 551, 0, 0, 0, 0, 565, 556,
+	0, 564, 572, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 571, 0, 0, 0, 0, 0, 0, 569,
+	582, 575, 0, 0, 0, 0, 585, 0, 489, 0,
+	0, 565, 0, 587, 564, 0, 584, 0, 0, 0,
+	0, 0, 593, 594, 0, 0, 0, 576, 453, 0,
+	0, 0, 0, 0, 600, 0, 598, 596, 0, 0,
+	0, 0, 0, 0, 601, 605, 473, 0, 604, 603,
+	0, 0, 174, 176, 175, 0, 0, 609, 0, 0,
+	611, 84, 85, 86, 87, 88, 0, 91, 92, 93,
+	89, 90, 198, 65, 199, 172, 173, 177, 179, 178,
+	191, 192, 189, 190, 193, 194, 195, 196, 197, 187,
+	188, 181, 182, 180, 183, 185, 186, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 45, 46, 0, 0,
+	184, 0, 47, 94, 48, 43, 44, 55, 56, 57,
+	58, 59, 60, 61, 62, 0, 0, 95, 82, 0,
+	98, 99, 100, 76, 77, 78, 79, 80, 81, 96,
+	97, 0, 0, 73, 0, 69, 0, 0, 0, 0,
+	0, 0, 101, 102, 103, 104, 105, 106, 107, 108,
+	109, 110, 111, 128, 129, 130, 131, 132, 122, 123,
+	124, 125, 126, 112, 113, 114, 115, 116, 117, 118,
+	119, 120, 121, 83, 0, 140, 138, 139, 135, 136,
+	0, 127, 133, 134, 141, 142, 144, 143, 145, 146,
+	513, 514, 515, 516, 517, 432, 91, 92, 93, 520,
+	521, 137, 148, 147, 0, 0, 0, 0, 0, 49,
+	0, 198, 70, 199, 172, 173, 177, 179, 178, 191,
 	192, 189, 190, 193, 194, 195, 196, 197, 187, 188,
 	181, 182, 180, 183, 185, 186, 0, 0, 0, 0,
-	0, 0, 45, 46, 0, 0, 0, 0, 47, 184,
-	48, 43, 44, 55, 56, 57, 58, 59, 60, 61,
-	62, 0, 0, 0, 42, 0, 0, 0, 0, 20,
-	66, 67, 0, 0, 0, 0, 40, 0, 0, 31,
-	0, 69, 0, 22, 0, 0, 0, 0, 21, 13,
-	12, 0, 14, 0, 25, 0, 26, 0, 0, 15,
-	0, 0, 0, 16, 17, 30, 32, 0, 18, 28,
-	0, 0, 29, 0, 0, 19, 0, 24, 0, 50,
-	0, 34, 155, 51, 52, 53, 54, 0, 0, 0,
-	0, 63, 64, 0, 65, 191, 192, 189, 190, 193,
-	194, 195, 196, 197, 187, 188, 181, 182, 180, 183,
-	185, 186, 27, 9, 580, 49, 0, 0, 70, 0,
-	0, 0, 0, 0, 0, 184, 0, 45, 46, 0,
-	0, 0, 0, 47, 0, 48, 43, 44, 55, 56,
-	57, 58, 59, 60, 61, 62, 0, 0, 0, 42,
-	0, 0, 0, 0, 20, 66, 67, 0, 0, 0,
-	0, 40, 0, 0, 31, 0, 69, 0, 22, 0,
-	0, 0, 0, 21, 13, 12, 0, 14, 575, 25,
-	0, 26, 0, 0, 15, 0, 0, 0, 16, 17,
-	30, 32, 0, 18, 28, 0, 0, 29, 0, 0,
-	19, 0, 24, 0, 50, 0, 34, 155, 51, 52,
-	53, 54, 0, 0, 0, 0, 63, 64, 0, 65,
-	194, 195, 196, 197, 187, 188, 181, 182, 180, 183,
-	185, 186, 0, 0, 0, 0, 0, 27, 9, 0,
-	49, 0, 0, 70, 0, 184, 0, 0, 0, 0,
-	0, 0, 45, 46, 0, 0, 0, 0, 47, 0,
-	48, 43, 44, 55, 56, 57, 58, 59, 60, 61,
-	62, 0, 0, 0, 42, 0, 0, 0, 0, 20,
-	66, 67, 0, 0, 0, 0, 40, 0, 0, 31,
-	0, 69, 0, 22, 0, 0, 0, 0, 21, 13,
-	12, 0, 14, 0, 25, 0, 26, 0, 0, 15,
-	0, 0, 0, 16, 17, 30, 32, 0, 18, 28,
-	0, 0, 29, 0, 0, 19, 0, 24, 0, 50,
-	0, 34, 155, 51, 52, 53, 54, 0, 0, 0,
-	0, 63, 64, 0, 65, 0, 0, 0, 0, 0,
+	0, 0, 94, 0, 0, 0, 0, 0, 0, 184,
+	0, 0, 0, 0, 0, 0, 95, 518, 0, 98,
+	99, 100, 76, 77, 78, 79, 80, 81, 96, 97,
+	0, 0, 567, 0, 0, 0, 0, 0, 0, 0,
+	0, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+	110, 111, 128, 129, 130, 131, 132, 122, 123, 124,
+	125, 126, 112, 113, 114, 115, 116, 117, 118, 119,
+	120, 121, 519, 0, 140, 138, 139, 135, 136, 0,
+	127, 133, 134, 141, 142, 144, 143, 145, 146, 513,
+	514, 515, 516, 517, 175, 91, 92, 93, 520, 521,
+	566, 148, 147, 415, 0, 0, 0, 586, 0, 0,
+	0, 0, 198, 0, 199, 172, 173, 177, 179, 178,
+	191, 192, 189, 190, 193, 194, 195, 196, 197, 187,
+	188, 181, 182, 180, 183, 185, 186, 0, 0, 0,
+	0, 94, 0, 0, 0, 0, 0, 0, 0, 0,
+	184, 0, 0, 0, 0, 95, 518, 0, 98, 99,
+	100, 76, 77, 78, 79, 80, 81, 96, 97, 0,
+	0, 567, 0, 0, 0, 0, 0, 0, 0, 0,
+	101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
+	111, 128, 129, 130, 131, 132, 122, 123, 124, 125,
+	126, 112, 113, 114, 115, 116, 117, 118, 119, 120,
+	121, 519, 0, 140, 138, 139, 135, 136, 0, 127,
+	133, 134, 141, 142, 144, 143, 145, 146, 513, 514,
+	515, 516, 517, 348, 91, 92, 93, 520, 521, 566,
+	148, 147, 415, 0, 0, 0, 557, 0, 198, 0,
+	199, 172, 173, 177, 179, 178, 191, 192, 189, 190,
+	193, 194, 195, 196, 197, 187, 188, 181, 182, 180,
+	183, 185, 186, 0, 0, 0, 0, 0, 0, 0,
+	94, 0, 0, 0, 0, 0, 184, 0, 0, 0,
+	0, 0, 0, 0, 95, 518, 0, 98, 99, 100,
+	76, 77, 78, 79, 80, 81, 96, 97, 0, 0,
+	73, 0, 0, 0, 0, 0, 0, 0, 0, 101,
+	102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+	128, 129, 130, 131, 132, 122, 123, 124, 125, 126,
+	112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+	519, 0, 140, 138, 139, 135, 136, 0, 127, 133,
+	134, 141, 142, 144, 143, 145, 146, 513, 514, 515,
+	516, 517, 0, 91, 92, 93, 520, 521, 137, 148,
+	147, 199, 172, 173, 177, 179, 178, 191, 192, 189,
+	190, 193, 194, 195, 196, 197, 187, 188, 181, 182,
+	180, 183, 185, 186, 194, 195, 196, 197, 187, 188,
+	181, 182, 180, 183, 185, 186, 0, 184, 0, 94,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 184,
+	0, 0, 0, 95, 518, 0, 98, 99, 100, 429,
+	430, 431, 428, 427, 426, 96, 97, 0, 0, 602,
+	0, 0, 0, 0, 0, 0, 0, 0, 101, 102,
+	103, 104, 105, 106, 107, 108, 109, 110, 111, 128,
+	129, 130, 131, 132, 122, 123, 124, 125, 126, 112,
+	113, 114, 115, 116, 117, 118, 119, 120, 121, 519,
+	0, 140, 138, 139, 135, 136, 0, 127, 133, 134,
+	141, 142, 144, 143, 145, 146, 176, 175, 0, 0,
+	0, 155, 51, 52, 53, 54, 0, 137, 148, 147,
+	63, 64, 0, 65, 0, 198, 0, 199, 172, 173,
+	177, 179, 178, 191, 192, 189, 190, 193, 194, 195,
+	196, 197, 187, 188, 181, 182, 180, 183, 185, 186,
+	0, 0, 0, 0, 0, 0, 45, 46, 0, 0,
+	0, 0, 47, 184, 48, 43, 44, 55, 56, 57,
+	58, 59, 60, 61, 62, 0, 0, 0, 42, 0,
+	0, 0, 0, 20, 66, 67, 0, 0, 0, 0,
+	40, 0, 0, 31, 0, 69, 0, 22, 0, 0,
+	0, 0, 21, 13, 12, 0, 14, 0, 25, 0,
+	26, 0, 0, 15, 0, 0, 0, 16, 17, 30,
+	32, 0, 18, 28, 0, 0, 29, 0, 0, 19,
+	0, 24, 0, 50, 0, 34, 155, 51, 52, 53,
+	54, 0, 0, 0, 0, 63, 64, 0, 65, 191,
+	192, 189, 190, 193, 194, 195, 196, 197, 187, 188,
+	181, 182, 180, 183, 185, 186, 27, 9, 612, 49,
+	0, 0, 70, 0, 0, 0, 0, 0, 0, 184,
+	0, 45, 46, 0, 0, 0, 0, 47, 0, 48,
+	43, 44, 55, 56, 57, 58, 59, 60, 61, 62,
+	0, 0, 0, 42, 0, 0, 0, 0, 20, 66,
+	67, 0, 0, 0, 0, 40, 0, 0, 31, 0,
+	69, 0, 22, 0, 0, 0, 0, 21, 13, 12,
+	0, 14, 606, 25, 0, 26, 0, 0, 15, 0,
+	0, 0, 16, 17, 30, 32, 0, 18, 28, 0,
+	0, 29, 0, 0, 19, 0, 24, 0, 50, 0,
+	34, 155, 51, 52, 53, 54, 0, 0, 0, 0,
+	63, 64, 0, 65, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 27, 9, 573, 49, 0, 0, 70, 0,
-	0, 0, 0, 0, 0, 0, 0, 45, 46, 0,
-	0, 0, 0, 47, 0, 48, 43, 44, 55, 56,
-	57, 58, 59, 60, 61, 62, 0, 0, 0, 42,
-	0, 0, 0, 0, 20, 66, 67, 0, 0, 0,
-	0, 40, 0, 0, 31, 0, 69, 0, 22, 0,
-	0, 0, 0, 21, 13, 12, 0, 14, 0, 25,
-	0, 26, 0, 0, 15, 0, 0, 0, 16, 17,
-	30, 32, 0, 18, 28, 0, 0, 29, 0, 0,
-	19, 0, 24, 0, 50, 0, 34, 155, 51, 52,
+	0, 27, 9, 0, 49, 0, 0, 70, 0, 0,
+	0, 0, 0, 0, 0, 0, 45, 46, 0, 0,
+	0, 0, 47, 0, 48, 43, 44, 55, 56, 57,
+	58, 59, 60, 61, 62, 0, 0, 0, 42, 0,
+	0, 0, 0, 20, 66, 67, 0, 0, 0, 0,
+	40, 0, 0, 31, 0, 69, 0, 22, 0, 0,
+	0, 0, 21, 13, 12, 0, 14, 0, 25, 0,
+	26, 0, 0, 15, 0, 0, 0, 16, 17, 30,
+	32, 0, 18, 28, 0, 0, 29, 0, 0, 19,
+	0, 24, 0, 50, 0, 34, 155, 51, 52, 53,
+	54, 0, 0, 0, 0, 63, 64, 0, 65, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 27, 9, 599, 49,
+	0, 0, 70, 0, 0, 0, 0, 0, 0, 0,
+	0, 45, 46, 0, 0, 0, 0, 47, 0, 48,
+	43, 44, 55, 56, 57, 58, 59, 60, 61, 62,
+	0, 0, 0, 42, 0, 0, 0, 0, 20, 66,
+	67, 0, 0, 0, 0, 40, 0, 0, 31, 0,
+	69, 0, 22, 0, 0, 0, 0, 21, 13, 12,
+	0, 14, 0, 25, 0, 26, 0, 0, 15, 0,
+	0, 0, 16, 17, 30, 32, 0, 18, 28, 0,
+	0, 29, 0, 0, 19, 0, 24, 0, 50, 0,
+	34, 155, 51, 52, 53, 54, 0, 0, 0, 0,
+	63, 64, 0, 65, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 27, 9, 581, 49, 0, 0, 70, 0, 0,
+	0, 0, 0, 0, 0, 0, 45, 46, 0, 0,
+	0, 0, 47, 0, 48, 43, 44, 55, 56, 57,
+	58, 59, 60, 61, 62, 0, 0, 0, 42, 0,
+	0, 0, 0, 20, 66, 67, 0, 0, 0, 0,
+	40, 0, 0, 31, 0, 69, 0, 22, 0, 0,
+	0, 0, 21, 13, 12, 0, 14, 0, 25, 574,
+	26, 0, 0, 15, 0, 0, 0, 16, 17, 30,
+	32, 0, 18, 28, 0, 0, 29, 0, 0, 19,
+	0, 24, 0, 50, 0, 34, 155, 51, 52, 53,
+	54, 0, 0, 0, 0, 63, 64, 0, 65, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 27, 9, 0, 49,
+	0, 0, 70, 0, 0, 0, 0, 0, 0, 0,
+	0, 45, 46, 0, 0, 0, 0, 47, 0, 48,
+	43, 44, 55, 56, 57, 58, 59, 60, 61, 62,
+	0, 0, 0, 42, 0, 0, 0, 0, 20, 66,
+	67, 0, 0, 0, 0, 40, 0, 0, 31, 0,
+	69, 0, 22, 0, 0, 0, 0, 21, 13, 12,
+	0, 14, 0, 25, 0, 26, 498, 0, 15, 0,
+	0, 0, 16, 17, 30, 32, 0, 18, 28, 0,
+	0, 29, 0, 0, 19, 0, 24, 0, 50, 0,
+	34, 155, 51, 52, 53, 54, 0, 0, 0, 0,
+	63, 64, 0, 65, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 27, 9, 0, 49, 0, 0, 70, 0, 0,
+	0, 0, 0, 0, 0, 0, 45, 46, 0, 0,
+	0, 0, 47, 0, 48, 43, 44, 55, 56, 57,
+	58, 59, 60, 61, 62, 0, 0, 0, 42, 0,
+	0, 0, 0, 20, 66, 67, 0, 0, 0, 0,
+	40, 0, 0, 31, 0, 69, 0, 22, 0, 0,
+	0, 0, 21, 13, 12, 479, 14, 0, 25, 0,
+	26, 0, 0, 15, 0, 0, 0, 16, 17, 30,
+	32, 0, 18, 28, 0, 0, 29, 0, 0, 19,
+	0, 24, 0, 50, 0, 34, 155, 51, 52, 53,
+	54, 0, 0, 0, 0, 63, 64, 0, 65, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 27, 9, 0, 49,
+	0, 0, 70, 0, 0, 0, 0, 0, 0, 0,
+	0, 45, 46, 0, 0, 0, 0, 47, 0, 48,
+	43, 44, 55, 56, 57, 58, 59, 60, 61, 62,
+	0, 0, 0, 42, 0, 0, 0, 434, 20, 66,
+	67, 0, 0, 0, 0, 40, 0, 0, 31, 0,
+	69, 0, 22, 0, 0, 0, 0, 21, 13, 12,
+	0, 14, 0, 25, 0, 26, 0, 0, 15, 0,
+	0, 0, 16, 17, 30, 32, 0, 18, 28, 0,
+	0, 29, 0, 0, 19, 0, 24, 0, 50, 0,
+	34, 155, 51, 52, 53, 54, 0, 0, 0, 0,
+	63, 64, 0, 65, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 27, 9, 0, 49, 0, 0, 70, 0, 0,
+	0, 0, 0, 0, 0, 0, 45, 46, 0, 0,
+	0, 0, 47, 0, 48, 43, 44, 55, 56, 57,
+	58, 59, 60, 61, 62, 0, 0, 0, 42, 0,
+	0, 0, 0, 20, 66, 67, 0, 0, 0, 0,
+	40, 0, 0, 31, 0, 69, 0, 22, 0, 0,
+	0, 0, 21, 13, 12, 0, 14, 0, 25, 0,
+	26, 0, 0, 15, 0, 0, 0, 16, 17, 30,
+	32, 0, 18, 28, 0, 0, 29, 0, 0, 19,
+	0, 24, 0, 50, 0, 34, 155, 51, 52, 53,
+	54, 0, 0, 0, 0, 63, 64, 0, 65, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 27, 9, 368, 49,
+	0, 0, 70, 0, 0, 0, 0, 0, 0, 0,
+	0, 45, 46, 0, 0, 0, 0, 47, 0, 48,
+	43, 44, 55, 56, 57, 58, 59, 60, 61, 62,
+	0, 0, 0, 42, 0, 0, 0, 0, 20, 66,
+	67, 0, 0, 0, 0, 40, 0, 0, 31, 0,
+	69, 0, 22, 0, 0, 0, 0, 21, 13, 12,
+	0, 14, 0, 25, 0, 26, 0, 0, 15, 0,
+	0, 0, 16, 17, 30, 32, 0, 18, 28, 0,
+	0, 29, 0, 0, 19, 0, 24, 0, 50, 0,
+	34, 7, 51, 52, 53, 54, 0, 0, 0, 0,
+	63, 64, 0, 65, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 27, 9, 263, 49, 0, 0, 70, 0, 0,
+	0, 0, 0, 0, 0, 0, 45, 46, 0, 0,
+	0, 0, 47, 0, 48, 43, 44, 55, 56, 57,
+	58, 59, 60, 61, 62, 0, 0, 0, 42, 0,
+	0, 0, 0, 20, 66, 67, 0, 0, 0, 0,
+	40, 0, 0, 31, 0, 69, 0, 22, 0, 0,
+	0, 0, 21, 13, 12, 0, 14, 0, 25, 0,
+	26, 0, 0, 15, 0, 0, 0, 16, 17, 30,
+	32, 0, 18, 28, 0, 0, 29, 0, 0, 19,
+	0, 24, 0, 50, 0, 34, 155, 51, 52, 53,
+	54, 0, 0, 0, 0, 63, 64, 0, 65, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 8, 0, 0, 0, 0, 27, 9, 0, 49,
+	0, 0, 70, 0, 0, 0, 0, 0, 0, 0,
+	0, 45, 46, 0, 0, 0, 0, 47, 0, 48,
+	43, 44, 55, 56, 57, 58, 59, 60, 61, 62,
+	0, 0, 0, 42, 0, 0, 0, 0, 20, 66,
+	67, 0, 0, 0, 0, 40, 0, 0, 31, 0,
+	69, 0, 22, 0, 0, 0, 0, 21, 13, 12,
+	0, 14, 0, 25, 0, 26, 0, 0, 15, 0,
+	0, 0, 16, 17, 30, 32, 0, 18, 28, 0,
+	0, 29, 0, 0, 19, 0, 24, 0, 50, 0,
+	34, 155, 51, 52, 53, 54, 0, 0, 0, 0,
+	63, 64, 0, 65, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 490, 0,
+	0, 27, 9, 0, 49, 0, 0, 70, 0, 0,
+	0, 0, 0, 0, 0, 0, 45, 46, 0, 0,
+	0, 0, 47, 0, 48, 43, 44, 55, 56, 57,
+	58, 59, 60, 61, 62, 0, 0, 0, 42, 0,
+	0, 0, 0, 20, 0, 0, 0, 0, 0, 0,
+	40, 0, 0, 31, 0, 69, 0, 22, 0, 0,
+	0, 0, 21, 13, 12, 0, 14, 0, 25, 0,
+	26, 0, 0, 15, 0, 0, 0, 16, 17, 30,
+	0, 0, 18, 28, 0, 0, 29, 0, 0, 19,
+	0, 24, 0, 50, 155, 51, 52, 53, 54, 0,
+	0, 0, 0, 63, 64, 0, 65, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 570, 0, 0, 0, 0, 27, 9, 0, 49,
+	0, 0, 70, 0, 0, 0, 0, 0, 0, 45,
+	46, 0, 0, 0, 0, 47, 0, 48, 43, 44,
+	55, 56, 57, 58, 59, 60, 61, 62, 0, 0,
+	0, 42, 0, 0, 0, 0, 20, 0, 0, 0,
+	0, 0, 0, 40, 0, 0, 31, 0, 69, 0,
+	22, 0, 0, 0, 0, 21, 13, 12, 0, 14,
+	0, 25, 0, 26, 0, 0, 15, 0, 0, 0,
+	16, 17, 30, 0, 0, 18, 28, 0, 0, 29,
+	0, 0, 19, 0, 24, 0, 50, 155, 51, 52,
 	53, 54, 0, 0, 0, 0, 63, 64, 0, 65,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 27, 9, 562,
-	49, 0, 0, 70, 0, 0, 0, 0, 0, 0,
-	0, 0, 45, 46, 0, 0, 0, 0, 47, 0,
-	48, 43, 44, 55, 56, 57, 58, 59, 60, 61,
-	62, 0, 0, 0, 42, 0, 0, 0, 0, 20,
-	66, 67, 0, 0, 0, 0, 40, 0, 0, 31,
-	0, 69, 0, 22, 0, 0, 0, 0, 21, 13,
-	12, 0, 14, 0, 25, 555, 26, 0, 0, 15,
-	0, 0, 0, 16, 17, 30, 32, 0, 18, 28,
-	0, 0, 29, 0, 0, 19, 0, 24, 0, 50,
-	0, 34, 155, 51, 52, 53, 54, 0, 0, 0,
-	0, 63, 64, 0, 65, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 27, 9, 0, 49, 0, 0, 70, 0,
-	0, 0, 0, 0, 0, 0, 0, 45, 46, 0,
-	0, 0, 0, 47, 0, 48, 43, 44, 55, 56,
-	57, 58, 59, 60, 61, 62, 0, 0, 0, 42,
-	0, 0, 0, 0, 20, 66, 67, 0, 0, 0,
-	0, 40, 0, 0, 31, 0, 69, 0, 22, 0,
-	0, 0, 0, 21, 13, 12, 0, 14, 0, 25,
-	0, 26, 495, 0, 15, 0, 0, 0, 16, 17,
-	30, 32, 0, 18, 28, 0, 0, 29, 0, 0,
-	19, 0, 24, 0, 50, 0, 34, 155, 51, 52,
-	53, 54, 0, 0, 0, 0, 63, 64, 0, 65,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 27, 9, 0,
-	49, 0, 0, 70, 0, 0, 0, 0, 0, 0,
-	0, 0, 45, 46, 0, 0, 0, 0, 47, 0,
-	48, 43, 44, 55, 56, 57, 58, 59, 60, 61,
-	62, 0, 0, 0, 42, 0, 0, 0, 0, 20,
-	66, 67, 0, 0, 0, 0, 40, 0, 0, 31,
-	0, 69, 0, 22, 0, 0, 0, 0, 21, 13,
-	12, 476, 14, 0, 25, 0, 26, 0, 0, 15,
-	0, 0, 0, 16, 17, 30, 32, 0, 18, 28,
-	0, 0, 29, 0, 0, 19, 0, 24, 0, 50,
-	0, 34, 155, 51, 52, 53, 54, 0, 0, 0,
-	0, 63, 64, 0, 65, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 27, 9, 0, 49, 0, 0, 70, 0,
-	0, 0, 0, 0, 0, 0, 0, 45, 46, 0,
-	0, 0, 0, 47, 0, 48, 43, 44, 55, 56,
-	57, 58, 59, 60, 61, 62, 0, 0, 0, 42,
-	0, 0, 0, 433, 20, 66, 67, 0, 0, 0,
-	0, 40, 0, 0, 31, 0, 69, 0, 22, 0,
-	0, 0, 0, 21, 13, 12, 0, 14, 0, 25,
-	0, 26, 0, 0, 15, 0, 0, 0, 16, 17,
-	30, 32, 0, 18, 28, 0, 0, 29, 0, 0,
-	19, 0, 24, 0, 50, 0, 34, 155, 51, 52,
-	53, 54, 0, 0, 0, 0, 63, 64, 0, 65,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 27, 9, 0,
-	49, 0, 0, 70, 0, 0, 0, 0, 0, 0,
-	0, 0, 45, 46, 0, 0, 0, 0, 47, 0,
-	48, 43, 44, 55, 56, 57, 58, 59, 60, 61,
-	62, 0, 0, 0, 42, 0, 0, 0, 0, 20,
-	66, 67, 0, 0, 0, 0, 40, 0, 0, 31,
-	0, 69, 0, 22, 0, 0, 0, 0, 21, 13,
-	12, 0, 14, 0, 25, 0, 26, 0, 0, 15,
-	0, 0, 0, 16, 17, 30, 32, 0, 18, 28,
-	0, 0, 29, 0, 0, 19, 0, 24, 0, 50,
-	0, 34, 155, 51, 52, 53, 54, 0, 0, 0,
-	0, 63, 64, 0, 65, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 27, 9, 368, 49, 0, 0, 70, 0,
-	0, 0, 0, 0, 0, 0, 0, 45, 46, 0,
-	0, 0, 0, 47, 0, 48, 43, 44, 55, 56,
-	57, 58, 59, 60, 61, 62, 0, 0, 0, 42,
-	0, 0, 0, 0, 20, 66, 67, 0, 0, 0,
-	0, 40, 0, 0, 31, 0, 69, 0, 22, 0,
-	0, 0, 0, 21, 13, 12, 0, 14, 0, 25,
-	0, 26, 0, 0, 15, 0, 0, 0, 16, 17,
-	30, 32, 0, 18, 28, 0, 0, 29, 0, 0,
-	19, 0, 24, 0, 50, 0, 34, 7, 51, 52,
-	53, 54, 0, 0, 0, 0, 63, 64, 0, 65,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 27, 9, 263,
-	49, 0, 0, 70, 0, 0, 0, 0, 0, 0,
-	0, 0, 45, 46, 0, 0, 0, 0, 47, 0,
-	48, 43, 44, 55, 56, 57, 58, 59, 60, 61,
-	62, 0, 0, 0, 42, 0, 0, 0, 0, 20,
-	66, 67, 0, 0, 0, 0, 40, 0, 0, 31,
-	0, 69, 0, 22, 0, 0, 0, 0, 21, 13,
-	12, 0, 14, 0, 25, 0, 26, 0, 0, 15,
-	0, 0, 0, 16, 17, 30, 32, 0, 18, 28,
-	0, 0, 29, 0, 0, 19, 0, 24, 0, 50,
-	0, 34, 155, 51, 52, 53, 54, 0, 0, 0,
-	0, 63, 64, 0, 65, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 8, 0, 0,
-	0, 0, 27, 9, 0, 49, 0, 0, 70, 0,
-	0, 0, 0, 0, 0, 0, 0, 45, 46, 0,
-	0, 0, 0, 47, 0, 48, 43, 44, 55, 56,
-	57, 58, 59, 60, 61, 62, 0, 0, 0, 42,
-	0, 0, 0, 0, 20, 66, 67, 0, 0, 0,
-	0, 40, 0, 0, 31, 0, 69, 0, 22, 0,
-	0, 0, 0, 21, 13, 12, 0, 14, 0, 25,
-	0, 26, 0, 0, 15, 0, 0, 0, 16, 17,
-	30, 32, 0, 18, 28, 0, 0, 29, 0, 0,
-	19, 0, 24, 0, 50, 0, 34, 155, 51, 52,
-	53, 54, 0, 0, 0, 0, 63, 64, 0, 65,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 487, 0, 0, 27, 9, 0,
-	49, 0, 0, 70, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 436, 0, 0, 0, 0, 27,
+	9, 0, 49, 0, 0, 70, 0, 0, 0, 0,
 	0, 0, 45, 46, 0, 0, 0, 0, 47, 0,
 	48, 43, 44, 55, 56, 57, 58, 59, 60, 61,
 	62, 0, 0, 0, 42, 0, 0, 0, 0, 20,
@@ -714,7 +792,7 @@ var yyAct = [...]int{
 	0, 0, 29, 0, 0, 19, 0, 24, 0, 50,
 	155, 51, 52, 53, 54, 0, 0, 0, 0, 63,
 	64, 0, 65, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 551, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 400, 0, 0,
 	0, 0, 27, 9, 0, 49, 0, 0, 70, 0,
 	0, 0, 0, 0, 0, 45, 46, 0, 0, 0,
 	0, 47, 0, 48, 43, 44, 55, 56, 57, 58,
@@ -727,7 +805,7 @@ var yyAct = [...]int{
 	24, 0, 50, 155, 51, 52, 53, 54, 0, 0,
 	0, 0, 63, 64, 0, 65, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	435, 0, 0, 0, 0, 27, 9, 0, 49, 0,
+	383, 0, 0, 0, 0, 27, 9, 0, 49, 0,
 	0, 70, 0, 0, 0, 0, 0, 0, 45, 46,
 	0, 0, 0, 0, 47, 0, 48, 43, 44, 55,
 	56, 57, 58, 59, 60, 61, 62, 0, 0, 0,
@@ -737,100 +815,75 @@ var yyAct = [...]int{
 	25, 0, 26, 0, 0, 15, 0, 0, 0, 16,
 	17, 30, 0, 0, 18, 28, 0, 0, 29, 0,
 	0, 19, 0, 24, 0, 50, 155, 51, 52, 53,
-	54, 0, 0, 0, 0, 63, 64, 0, 65, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 400, 0, 0, 0, 0, 27, 9,
+	54, 0, 0, 0, 0, 63, 64, 0, 65, 178,
+	191, 192, 189, 190, 193, 194, 195, 196, 197, 187,
+	188, 181, 182, 180, 183, 185, 186, 0, 27, 9,
 	0, 49, 0, 0, 70, 0, 0, 0, 0, 0,
-	0, 45, 46, 0, 0, 0, 0, 47, 0, 48,
+	184, 45, 46, 0, 0, 0, 0, 47, 0, 48,
 	43, 44, 55, 56, 57, 58, 59, 60, 61, 62,
 	0, 0, 0, 42, 0, 0, 0, 0, 20, 0,
 	0, 0, 0, 0, 0, 40, 0, 0, 31, 0,
 	69, 0, 22, 0, 0, 0, 0, 21, 13, 12,
 	0, 14, 0, 25, 0, 26, 0, 0, 15, 0,
 	0, 0, 16, 17, 30, 0, 0, 18, 28, 0,
-	0, 29, 0, 0, 19, 0, 24, 0, 50, 155,
-	51, 52, 53, 54, 0, 0, 0, 0, 63, 64,
-	0, 65, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 383, 0, 0, 0,
-	0, 27, 9, 0, 49, 0, 0, 70, 0, 0,
-	0, 0, 0, 0, 45, 46, 0, 0, 0, 0,
-	47, 0, 48, 43, 44, 55, 56, 57, 58, 59,
-	60, 61, 62, 0, 0, 0, 42, 0, 0, 0,
-	0, 20, 0, 0, 0, 0, 0, 0, 40, 0,
-	0, 31, 0, 69, 0, 22, 0, 0, 0, 0,
-	21, 13, 12, 0, 14, 0, 25, 0, 26, 0,
-	0, 15, 0, 0, 0, 16, 17, 30, 0, 0,
-	18, 28, 0, 0, 29, 0, 0, 19, 0, 24,
-	0, 50, 155, 51, 52, 53, 54, 0, 0, 0,
-	0, 63, 64, 0, 65, 178, 191, 192, 189, 190,
-	193, 194, 195, 196, 197, 187, 188, 181, 182, 180,
-	183, 185, 186, 0, 27, 9, 0, 49, 0, 0,
-	70, 0, 0, 0, 0, 0, 184, 45, 46, 0,
+	0, 29, 0, 0, 19, 0, 24, 0, 50, 0,
+	155, 51, 52, 53, 54, 0, 0, 0, 0, 63,
+	64, 0, 65, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 27, 9, 454, 49, 0, 0, 70, 0, 0,
+	155, 51, 52, 53, 54, 45, 46, 0, 0, 63,
+	64, 47, 65, 48, 43, 44, 55, 56, 57, 58,
+	59, 60, 61, 62, 0, 0, 0, 42, 0, 0,
+	0, 0, 0, 541, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 69, 45, 46, 0, 0, 0,
+	0, 47, 0, 48, 43, 44, 55, 56, 57, 58,
+	59, 60, 61, 62, 0, 0, 0, 42, 217, 218,
+	219, 220, 222, 223, 224, 225, 226, 227, 228, 229,
+	221, 0, 50, 0, 69, 0, 0, 0, 0, 0,
+	455, 0, 155, 51, 52, 53, 54, 0, 0, 0,
+	0, 63, 64, 0, 65, 0, 0, 0, 0, 230,
+	231, 0, 0, 0, 0, 0, 0, 0, 49, 0,
+	0, 70, 50, 0, 0, 331, 0, 0, 0, 0,
+	542, 0, 0, 0, 0, 0, 0, 45, 46, 0,
 	0, 0, 0, 47, 0, 48, 43, 44, 55, 56,
-	57, 58, 59, 60, 61, 62, 0, 0, 0, 42,
-	0, 0, 0, 0, 20, 0, 0, 0, 0, 0,
-	0, 40, 0, 0, 31, 0, 69, 0, 22, 0,
-	0, 0, 0, 21, 13, 12, 0, 14, 0, 25,
-	0, 26, 0, 0, 15, 0, 0, 0, 16, 17,
-	30, 0, 0, 18, 28, 0, 0, 29, 0, 0,
-	19, 0, 24, 0, 50, 0, 155, 51, 52, 53,
-	54, 0, 0, 0, 0, 63, 64, 0, 65, 0,
+	57, 58, 59, 60, 61, 62, 0, 0, 49, 42,
+	0, 70, 155, 51, 52, 53, 54, 0, 0, 0,
+	0, 63, 64, 0, 65, 0, 69, 0, 0, 0,
+	0, 155, 51, 52, 53, 54, 0, 0, 0, 310,
+	63, 64, 0, 65, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 45, 46, 0,
+	0, 0, 0, 47, 50, 48, 43, 44, 55, 56,
+	57, 58, 59, 60, 61, 62, 45, 46, 0, 42,
+	0, 0, 47, 0, 48, 43, 44, 55, 56, 57,
+	58, 59, 60, 61, 62, 0, 69, 0, 42, 0,
+	49, 0, 0, 70, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 69, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 27, 9, 453,
-	49, 0, 0, 70, 0, 0, 155, 51, 52, 53,
-	54, 45, 46, 0, 0, 63, 64, 47, 65, 48,
-	43, 44, 55, 56, 57, 58, 59, 60, 61, 62,
-	0, 0, 0, 42, 0, 0, 0, 0, 0, 534,
+	0, 0, 0, 0, 50, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	69, 45, 46, 0, 0, 0, 0, 47, 0, 48,
-	43, 44, 55, 56, 57, 58, 59, 60, 61, 62,
-	0, 0, 0, 42, 217, 218, 219, 220, 222, 223,
-	224, 225, 226, 227, 228, 229, 221, 0, 50, 0,
-	69, 0, 0, 0, 0, 0, 454, 0, 155, 51,
-	52, 53, 54, 0, 0, 0, 0, 63, 64, 0,
-	65, 0, 0, 0, 0, 230, 231, 0, 0, 0,
-	0, 0, 0, 0, 49, 310, 0, 70, 50, 0,
-	155, 51, 52, 53, 54, 0, 535, 0, 0, 63,
-	64, 0, 65, 45, 46, 0, 0, 0, 0, 47,
-	0, 48, 43, 44, 55, 56, 57, 58, 59, 60,
-	61, 62, 0, 0, 49, 42, 0, 70, 0, 0,
-	0, 0, 0, 0, 0, 45, 46, 0, 0, 0,
-	0, 47, 69, 48, 43, 44, 55, 56, 57, 58,
-	59, 60, 61, 62, 0, 0, 0, 42, 0, 174,
+	0, 0, 0, 50, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	49, 0, 0, 70, 174, 176, 175, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 49,
+	0, 0, 70, 0, 198, 0, 199, 172, 173, 177,
+	179, 178, 191, 192, 189, 190, 193, 194, 195, 196,
+	197, 187, 188, 181, 182, 180, 183, 185, 186, 174,
 	176, 175, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 69, 0, 0, 0, 0, 198,
-	50, 199, 172, 173, 177, 179, 178, 191, 192, 189,
+	0, 0, 184, 0, 0, 0, 0, 0, 0, 198,
+	0, 199, 172, 173, 177, 179, 178, 191, 192, 189,
 	190, 193, 194, 195, 196, 197, 187, 188, 181, 182,
-	180, 183, 185, 186, 0, 0, 0, 0, 0, 0,
-	0, 0, 50, 0, 0, 0, 49, 184, 0, 70,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	174, 176, 175, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 49, 0,
-	198, 70, 199, 172, 173, 177, 179, 178, 191, 192,
-	189, 190, 193, 194, 195, 196, 197, 187, 188, 181,
-	182, 180, 183, 185, 186, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 184, 0,
-	0, 174, 176, 175, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 198, 432, 199, 172, 173, 177, 179, 178, 191,
-	192, 189, 190, 193, 194, 195, 196, 197, 187, 188,
-	181, 182, 180, 183, 185, 186, 174, 176, 175, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 184,
-	0, 0, 0, 0, 0, 0, 198, 0, 199, 172,
-	173, 177, 179, 178, 191, 192, 189, 190, 193, 194,
-	195, 196, 197, 187, 188, 181, 182, 180, 183, 185,
-	186, 0, 0, 431, 174, 176, 175, 0, 0, 0,
-	0, 0, 0, 0, 184, 0, 0, 0, 0, 0,
+	180, 183, 185, 186, 174, 176, 175, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 184, 0, 0,
 	0, 0, 0, 0, 198, 0, 199, 172, 173, 177,
 	179, 178, 191, 192, 189, 190, 193, 194, 195, 196,
 	197, 187, 188, 181, 182, 180, 183, 185, 186, 174,
 	176, 175, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 184, 0, 378, 0, 0, 0, 0, 198,
+	0, 0, 184, 0, 0, 0, 0, 378, 0, 198,
 	0, 199, 172, 173, 177, 179, 178, 191, 192, 189,
 	190, 193, 194, 195, 196, 197, 187, 188, 181, 182,
 	180, 183, 185, 186, 174, 176, 175, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 184, 0, 377,
-	0, 0, 0, 0, 198, 0, 199, 172, 173, 177,
+	0, 0, 0, 0, 0, 0, 0, 184, 0, 0,
+	0, 0, 377, 0, 198, 0, 199, 172, 173, 177,
 	179, 178, 191, 192, 189, 190, 193, 194, 195, 196,
 	197, 187, 188, 181, 182, 180, 183, 185, 186, 174,
 	176, 175, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -844,7 +897,7 @@ var yyAct = [...]int{
 	197, 187, 188, 181, 182, 180, 183, 185, 186, 174,
 	176, 175, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 184, 0, 0, 0, 0, 351, 0, 198,
-	524, 199, 172, 173, 177, 179, 178, 191, 192, 189,
+	531, 199, 172, 173, 177, 179, 178, 191, 192, 189,
 	190, 193, 194, 195, 196, 197, 187, 188, 181, 182,
 	180, 183, 185, 186, 174, 176, 175, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 184, 0, 0,
@@ -855,124 +908,124 @@ var yyAct = [...]int{
 	0, 0, 184, 0, 0, 380, 0, 0, 0, 198,
 	0, 199, 172, 173, 177, 179, 178, 191, 192, 189,
 	190, 193, 194, 195, 196, 197, 187, 188, 181, 182,
-	180, 183, 185, 186, 174, 176, 175, 0, 0, 492,
-	0, 0, 0, 0, 0, 0, 0, 184, 525, 0,
+	180, 183, 185, 186, 174, 176, 175, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 184, 532, 0,
 	0, 0, 0, 0, 198, 0, 199, 172, 173, 177,
 	179, 178, 191, 192, 189, 190, 193, 194, 195, 196,
 	197, 187, 188, 181, 182, 180, 183, 185, 186, 174,
-	176, 175, 0, 0, 364, 0, 0, 0, 0, 0,
-	0, 0, 184, 171, 0, 0, 0, 0, 0, 198,
-	360, 199, 172, 173, 177, 179, 178, 191, 192, 189,
+	176, 175, 0, 0, 495, 0, 0, 0, 0, 0,
+	0, 0, 184, 320, 0, 0, 0, 0, 0, 198,
+	0, 199, 172, 173, 177, 179, 178, 191, 192, 189,
 	190, 193, 194, 195, 196, 197, 187, 188, 181, 182,
-	180, 183, 185, 186, 174, 176, 175, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 184, 0, 0,
-	0, 0, 0, 0, 198, 0, 199, 172, 173, 177,
+	180, 183, 185, 186, 174, 176, 175, 0, 0, 364,
+	0, 0, 0, 0, 0, 0, 0, 184, 171, 0,
+	0, 0, 0, 0, 198, 360, 199, 172, 173, 177,
 	179, 178, 191, 192, 189, 190, 193, 194, 195, 196,
-	197, 187, 188, 181, 182, 180, 183, 185, 186, 348,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 184, 0, 198, 0, 199, 172, 173, 177,
+	197, 187, 188, 181, 182, 180, 183, 185, 186, 174,
+	176, 175, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 184, 0, 0, 0, 0, 0, 0, 198,
+	0, 199, 172, 173, 177, 179, 178, 191, 192, 189,
+	190, 193, 194, 195, 196, 197, 187, 188, 181, 182,
+	180, 183, 185, 186, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 184, 173, 177,
 	179, 178, 191, 192, 189, 190, 193, 194, 195, 196,
 	197, 187, 188, 181, 182, 180, 183, 185, 186, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 184, 199, 172, 173, 177, 179, 178, 191,
+	0, 0, 184, 177, 179, 178, 191, 192, 189, 190,
+	193, 194, 195, 196, 197, 187, 188, 181, 182, 180,
+	183, 185, 186, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 184, 179, 178, 191,
 	192, 189, 190, 193, 194, 195, 196, 197, 187, 188,
 	181, 182, 180, 183, 185, 186, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 184,
-	173, 177, 179, 178, 191, 192, 189, 190, 193, 194,
-	195, 196, 197, 187, 188, 181, 182, 180, 183, 185,
-	186, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 184, 177, 179, 178, 191, 192,
-	189, 190, 193, 194, 195, 196, 197, 187, 188, 181,
-	182, 180, 183, 185, 186, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 184, 179,
-	178, 191, 192, 189, 190, 193, 194, 195, 196, 197,
-	187, 188, 181, 182, 180, 183, 185, 186, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 184,
 }
 var yyPact = [...]int{
 
-	-1000, -1000, 2103, -1000, -1000, -1000, -1000, 570, 179, -1000,
-	-1000, -1000, -54, 2968, -57, -59, 3256, 3256, 3256, -55,
-	169, 3256, -1000, 3814, -61, -62, -75, -1000, -18, 3256,
-	236, 336, 310, 199, 231, 256, 250, 3187, -1000, -1000,
-	-78, -1000, 3256, -55, -55, 3256, 3256, 3256, 3256, 3256,
-	-80, 3256, -83, 3256, 3256, 3256, 3256, 3256, 3256, 3256,
-	3256, 3256, 3256, 3256, 3256, 3256, -1000, -1000, -1000, -1000,
-	-56, 84, 3994, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, 3256, -80, 3256, 3256, -83, 3256, 3256, 3256,
-	3256, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, 2557, -1000, -1000, -1000, -1000, 607, 199, -1000,
+	-1000, -1000, -55, 3422, -56, -57, 3767, 3767, 3767, -47,
+	194, 3767, -1000, 4309, -58, -62, -63, -1000, -11, 3767,
+	244, 339, 327, 195, 241, 283, 277, 3641, -1000, -1000,
+	-64, -1000, 3767, -47, -47, 3767, 3767, 3767, 3767, 3767,
+	-70, 3767, -75, 3767, 3767, 3767, 3767, 3767, 3767, 3767,
+	3767, 3767, 3767, 3767, 3767, 3767, -1000, -1000, -1000, -1000,
+	-49, 100, 4489, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, 3767, -70, 3767, 3767, -75, 3767, 3767, 3767,
+	3767, -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, 80,
-	91, -1000, 1978, 3256, 154, 3256, 3256, 3256, 75, 3994,
-	73, 55, 197, -1000, -1000, 162, -1000, 360, 160, -1000,
-	3994, -1000, 3256, 3256, 3256, 3256, 3256, 3256, 3256, 3256,
-	3256, 3256, 3256, 3256, 3256, 3256, 3256, 3256, 3256, 3256,
-	3256, 3256, 3256, 3256, 3256, 3256, 3256, 3256, 3224, 3256,
-	-55, 3256, 188, -1000, 252, 54, -1000, 230, -1000, 229,
-	-1000, -20, -84, 2968, -87, 52, 326, 358, 3256, 3256,
-	3256, 3256, 3256, 3256, 3256, 3256, 3256, 3256, 3256, 3256,
-	-1000, -1000, 3256, -1000, -1000, -1000, 277, 277, 277, 277,
-	3679, 3256, 3994, 3256, 3994, 3994, 277, 277, 277, 277,
-	277, 277, 277, 277, 704, 4034, 704, 3256, -1000, -1000,
-	-1000, 228, -1000, -1000, -1000, -1000, -1000, 3634, -88, 51,
-	379, 3994, 3589, -1000, -1000, -1000, -1000, -55, -1000, 169,
-	3256, -1000, 3256, 4106, 4140, 841, 704, 555, 4173, 957,
-	2948, 328, 328, 328, 277, 277, 277, 277, 290, 290,
-	1077, 1077, 1077, 1077, 1077, 415, 415, 415, 415, 3949,
-	3256, 4071, 377, -1000, -1000, 3859, 68, -1000, 359, 1853,
-	-1000, -1000, -89, -21, -1000, 3256, -1000, 3256, -1000, -1000,
-	704, 3256, 704, 704, 704, 704, 704, 704, 704, 704,
-	704, 704, 704, 704, 3544, -1000, 3496, 3451, 3256, 3724,
-	-1000, 2845, 3256, 3256, 3256, 76, -1000, -1000, 3994, -1000,
-	3256, 4071, -95, -55, 7, 2722, 188, 3256, -1000, 81,
-	-1000, 190, 3390, 3319, 1728, 957, 2599, -1000, -1000, 704,
-	-1000, -1000, -1000, -1000, 82, 50, 3994, -1000, 48, 44,
-	4071, 11, -1000, 38, -1000, -55, -90, 3092, -1000, -1000,
-	-1000, -1000, 3994, 132, -96, 374, -1000, 309, -1000, -1000,
-	118, -1000, -1000, -1000, -1000, 179, 90, 85, -1000, -1000,
-	164, 33, 257, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, 2968, 321, 1, -1000, -1000, 1603, 0, 3256, -10,
-	-1000, 171, -1000, -1000, 2353, 7, -1000, 3092, -129, 370,
-	-1000, -1000, 3904, -55, -91, 1478, -1000, -92, -22, 317,
-	81, 83, -1000, -1000, -1000, 179, -1000, 159, -1000, 356,
-	709, -1000, -1000, -1000, -1000, 2228, -4, -1000, -118, -1000,
-	3256, 114, -12, -6, 152, -1000, -1000, -1000, -121, -122,
-	-1000, 3092, 3132, -1000, 3092, -7, 58, -1000, -23, 81,
-	-1000, 167, -1000, -1000, -1000, 164, 3256, 97, -1000, 353,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 2228,
-	-1000, 2476, 3769, -1000, -1000, -1000, -1000, -1000, -11, 1353,
-	2353, -1000, -1000, 3994, -55, -93, -124, -1000, 272, -1000,
-	1228, -1000, -1000, 342, -1000, 3994, -1000, 709, 3256, -1000,
-	-1000, -1000, -1000, 2228, -1000, -13, -1000, -1000, 3092, -1000,
-	-125, 58, -1000, 1103, 3256, -1000, 3994, 978, 2228, -1000,
-	-126, -47, -1000, -1000, 3994, -16, -1000, -1000, -1000, 853,
-	-1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 98,
+	105, -1000, 2432, 3767, 178, 3767, 3767, 3767, 94, 4489,
+	93, 92, 162, -1000, -1000, 161, -1000, 361, 160, -1000,
+	4489, -1000, 3767, 3767, 3767, 3767, 3767, 3767, 3767, 3767,
+	3767, 3767, 3767, 3767, 3767, 3767, 3767, 3767, 3767, 3767,
+	3767, 3767, 3767, 3767, 3767, 3767, 3767, 3767, 3748, 3767,
+	-47, 3767, 224, -1000, 4264, 90, -1000, 239, -1000, 238,
+	-1000, -40, -78, 3422, -80, 87, 338, 3678, 3767, 3767,
+	3767, 3767, 3767, 3767, 3767, 3767, 3767, 3767, 3767, 3767,
+	-1000, -1000, 3767, -1000, -1000, -1000, 280, 280, 280, 280,
+	4129, 3767, 4489, 3767, 4489, 4489, 280, 280, 280, 280,
+	280, 280, 280, 280, 741, 1018, 741, 3767, -1000, -1000,
+	-1000, 229, -1000, -1000, -1000, -1000, -1000, 4084, -81, 80,
+	395, 4489, 4039, -1000, -1000, -1000, -1000, -47, -1000, 194,
+	3767, -1000, 3767, 4524, 4558, 1295, 741, 882, 4591, 1411,
+	3402, 306, 306, 306, 280, 280, 280, 280, 371, 371,
+	1161, 1161, 1161, 1161, 1161, 340, 340, 340, 340, 4444,
+	3767, 1149, 375, -1000, -1000, 4354, 68, -1000, 359, 2307,
+	-1000, -1000, -84, -41, -1000, 3767, -1000, 3767, -1000, -1000,
+	741, 3767, 741, 741, 741, 741, 741, 741, 741, 741,
+	741, 741, 741, 741, 3994, -1000, 3949, 3904, 3767, 4174,
+	-1000, 3299, 3767, 3767, 3767, 77, -1000, -1000, 4489, -1000,
+	3767, 1149, -91, -47, 78, 3176, 224, 3767, -1000, 120,
+	-1000, 257, 592, 254, 2182, 1411, 3053, -1000, -1000, 741,
+	-1000, -1000, -1000, -1000, 91, 73, 4489, -1000, 56, 55,
+	1149, 54, -1000, 38, -1000, -47, -86, 3546, -1000, -1000,
+	-1000, -1000, 4489, 151, -93, 374, -1000, 326, -1000, -1000,
+	81, -1000, -1000, -1000, -1000, 199, 83, 84, -1000, -1000,
+	190, 156, 122, 266, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, 3422, 335, 52, -1000, -1000, 2057, 51, 3767,
+	-13, -1000, 232, -1000, -1000, 2807, 78, -1000, 3546, -126,
+	372, -1000, -1000, 4399, -47, -87, 1932, -1000, -88, -46,
+	334, 120, 103, -1000, -1000, -1000, 199, -1000, 108, -1000,
+	358, 1024, 88, -1000, -1000, -1000, -1000, -1000, 2682, 50,
+	-1000, -94, -1000, 3767, 82, -15, 44, 205, -1000, -1000,
+	-1000, -95, -96, -1000, 3546, 3586, -1000, 3546, 13, 122,
+	-1000, -48, 120, -1000, 192, -1000, -1000, -1000, 190, 3767,
+	101, -1000, 356, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, 122, -1000, 885, 2682, -1000, 2930, 4219,
+	-1000, -1000, -1000, -1000, -1000, 9, 1807, 2807, -1000, -1000,
+	4489, -47, -89, -118, -1000, 274, -1000, 1682, -1000, -1000,
+	354, -1000, 4489, -1000, 1024, 3767, -1000, -1000, 746, -1000,
+	-4, -6, 142, 166, 97, -1000, 83, -1000, -1000, -1000,
+	-1000, -1000, 2682, -1000, -7, -1000, -1000, 3546, -1000, -119,
+	122, -1000, 1557, 3767, -1000, 4489, -1000, -1000, -1000, -1000,
+	122, 1163, 1024, 1432, 2682, -1000, -121, -51, -1000, -1000,
+	4489, 370, -1000, -1000, 1024, -1000, -8, -1000, -1000, -1000,
+	-1000, 1307, -1000,
 }
 var yyPgo = [...]int{
 
-	0, 350, 505, 504, 503, 397, 500, 11, 498, 4,
-	496, 26, 494, 1, 491, 428, 406, 488, 487, 9,
-	23, 486, 485, 12, 0, 480, 479, 36, 31, 478,
-	476, 474, 472, 470, 15, 461, 460, 456, 14, 375,
-	453, 34, 452, 28, 451, 27, 449, 25, 13, 2,
-	10, 447, 445, 5, 443, 24, 442, 441, 440, 438,
-	16, 436, 435, 433, 21, 430, 7, 426, 3, 414,
-	412, 410, 399, 390, 6,
+	0, 367, 489, 488, 487, 2, 486, 27, 485, 5,
+	481, 20, 480, 1, 479, 407, 406, 477, 476, 15,
+	26, 475, 474, 21, 0, 473, 472, 35, 51, 470,
+	465, 464, 463, 462, 28, 461, 460, 459, 25, 414,
+	457, 40, 456, 37, 455, 33, 454, 31, 24, 9,
+	16, 452, 451, 13, 450, 29, 448, 447, 446, 445,
+	32, 444, 442, 441, 6, 436, 14, 435, 11, 434,
+	3, 429, 427, 4, 426, 419, 416, 413, 412, 7,
+	411, 405, 12,
 }
 var yyR1 = [...]int{
 
-	0, 70, 71, 71, 71, 71, 71, 71, 71, 71,
-	71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-	71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-	71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-	71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-	71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-	71, 71, 71, 71, 71, 71, 71, 71, 71, 72,
-	72, 72, 72, 72, 72, 72, 5, 5, 8, 8,
+	0, 78, 79, 79, 79, 79, 79, 79, 79, 79,
+	79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
+	79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
+	79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
+	79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
+	79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
+	79, 79, 79, 79, 79, 79, 79, 79, 79, 80,
+	80, 80, 80, 80, 80, 80, 5, 5, 8, 8,
 	7, 9, 9, 9, 10, 10, 6, 6, 6, 6,
 	6, 13, 13, 12, 12, 12, 11, 11, 11, 11,
 	11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
@@ -980,23 +1033,25 @@ var yyR1 = [...]int{
 	57, 57, 58, 58, 59, 59, 54, 54, 55, 56,
 	56, 29, 29, 30, 30, 31, 31, 32, 32, 33,
 	33, 34, 34, 35, 35, 37, 37, 37, 37, 38,
-	38, 38, 74, 74, 36, 36, 48, 48, 48, 48,
+	38, 38, 82, 82, 36, 36, 48, 48, 48, 48,
 	49, 50, 50, 51, 51, 52, 52, 52, 52, 52,
 	52, 53, 53, 40, 40, 41, 42, 42, 43, 43,
-	44, 44, 45, 46, 46, 47, 73, 73, 15, 15,
-	14, 14, 1, 1, 60, 60, 61, 61, 62, 62,
-	67, 67, 68, 69, 69, 63, 63, 64, 64, 64,
-	64, 64, 64, 65, 65, 66, 66, 16, 21, 21,
-	22, 22, 23, 23, 17, 17, 4, 4, 2, 2,
-	3, 3, 19, 19, 20, 20, 20, 18, 18, 25,
+	44, 44, 45, 46, 46, 47, 81, 81, 15, 15,
+	14, 14, 1, 1, 60, 60, 61, 61, 61, 70,
+	70, 71, 71, 71, 72, 72, 73, 73, 74, 75,
+	75, 75, 75, 76, 76, 77, 62, 62, 67, 67,
+	68, 69, 69, 63, 63, 64, 64, 64, 64, 64,
+	64, 65, 65, 66, 66, 16, 21, 21, 22, 22,
+	23, 23, 17, 17, 4, 4, 2, 2, 3, 3,
+	19, 19, 20, 20, 20, 18, 18, 25, 25, 25,
 	25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
 	25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
 	25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
 	25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
 	25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
 	25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	25, 24, 24, 39, 39, 26, 27, 28, 28, 28,
+	25, 25, 25, 25, 25, 25, 25, 25, 25, 24,
+	24, 39, 39, 26, 27, 28, 28, 28,
 }
 var yyR2 = [...]int{
 
@@ -1019,30 +1074,32 @@ var yyR2 = [...]int{
 	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, 6, 5,
-	1, 2, 1, 1, 2, 0, 3, 4, 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,
+	1, 2, 1, 1, 2, 0, 3, 4, 3, 1,
+	3, 1, 2, 3, 1, 2, 2, 2, 3, 3,
+	3, 4, 3, 1, 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, 3, 3, 3, 2, 2, 2, 2, 3,
-	3, 3, 3, 3, 3, 3, 3, 3, 3, 5,
-	4, 3, 4, 2, 2, 4, 2, 2, 2, 2,
-	2, 2, 2, 2, 2, 2, 2, 1, 2, 4,
-	2, 1, 1, 0, 1, 1, 1, 1, 4, 2,
+	3, 3, 2, 2, 2, 2, 3, 3, 3, 3,
+	3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+	3, 3, 3, 2, 2, 2, 2, 3, 3, 3,
+	3, 3, 3, 3, 3, 3, 3, 5, 4, 3,
+	4, 2, 2, 4, 2, 2, 2, 2, 2, 2,
+	2, 2, 2, 2, 2, 1, 2, 4, 2, 1,
+	1, 0, 1, 1, 1, 1, 4, 2,
 }
 var yyChk = [...]int{
 
-	-1000, -70, -10, -6, -11, -16, -15, 4, 154, 160,
+	-1000, -78, -10, -6, -11, -16, -15, 4, 154, 160,
 	-30, -32, 97, 96, 99, 106, 110, 111, 115, 122,
 	76, 95, 90, -24, 124, 101, 103, 159, 116, 119,
 	112, 86, 113, -14, 128, -29, -31, -27, -25, -1,
 	83, -26, 71, 58, 59, 49, 50, 55, 57, 162,
 	126, 5, 6, 7, 8, 60, 61, 62, 63, 64,
 	65, 66, 67, 13, 14, 16, 77, 78, -28, 88,
-	165, -5, -24, 86, -72, -71, 76, 77, 78, 79,
+	165, -5, -24, 86, -80, -79, 76, 77, 78, 79,
 	80, 81, 71, 126, 4, 5, 6, 7, 8, 13,
 	14, 10, 11, 12, 56, 70, 82, 83, 73, 74,
 	75, 95, 96, 97, 98, 99, 100, 101, 102, 103,
@@ -1071,40 +1128,43 @@ var yyChk = [...]int{
 	-24, 37, -24, -24, -24, -24, -24, -24, -24, -24,
 	-24, -24, -24, -24, -24, 163, -24, -24, 15, -24,
 	86, 163, 162, 159, 9, 163, -41, -43, -24, -45,
-	31, -24, -73, 9, 105, 163, 9, 17, 161, 162,
+	31, -24, -81, 9, 105, 163, 9, 17, 161, 162,
 	160, -60, -24, -24, -13, -24, 163, 163, 163, -24,
 	161, -33, -11, 31, -24, -34, -24, -37, 160, 31,
 	-24, 163, -47, -48, -27, 37, 134, 69, -56, -11,
 	31, -55, -24, -57, -21, -22, -23, -17, -19, -20,
 	30, -9, 135, 136, -7, 157, 154, -60, 161, -61,
-	-62, -69, -63, 123, -64, 81, 80, 79, 76, 77,
-	78, 163, 163, 75, -11, 31, -13, 163, 159, -38,
-	159, -38, 159, 159, 163, 15, -27, 162, -49, -51,
-	-50, -52, -24, 37, 134, -13, -59, 117, 118, 163,
-	9, -2, 37, -20, -7, 157, 161, -65, -66, 88,
-	114, -64, -11, 31, 159, -13, 98, 159, -34, 161,
-	108, 109, -38, 107, -38, -53, -11, 31, -48, -49,
-	164, 9, 15, -27, 162, 104, 162, 160, -18, 31,
-	-23, -3, 158, -7, 159, 9, 17, -67, -68, -5,
-	4, 5, 6, 7, 8, 71, 126, 13, 14, -13,
-	159, 163, -24, -74, 31, 159, 161, 159, 107, -13,
-	163, 163, -50, -24, 37, 134, -49, 159, -58, -9,
-	-13, 160, -19, 88, -66, -24, 159, 9, 17, -36,
-	-11, 31, -74, -13, 159, 102, -53, -27, 162, 163,
-	88, 35, 161, -13, 17, -68, -24, -13, -13, 159,
-	-49, 163, -9, 161, -24, 100, 163, 160, 159, -13,
-	161,
+	-62, -69, 120, -63, 123, -64, 81, 80, 79, 76,
+	77, 78, 163, 163, 75, -11, 31, -13, 163, 159,
+	-38, 159, -38, 159, 159, 163, 15, -27, 162, -49,
+	-51, -50, -52, -24, 37, 134, -13, -59, 117, 118,
+	163, 9, -2, 37, -20, -7, 157, 161, -65, -66,
+	88, 114, -70, -9, -64, -11, 31, 159, -13, 98,
+	159, -34, 161, 108, 109, -38, 107, -38, -53, -11,
+	31, -48, -49, 164, 9, 15, -27, 162, 104, 162,
+	160, -18, 31, -23, -3, 158, -7, 159, 9, 17,
+	-67, -68, -5, 4, 5, 6, 7, 8, 71, 126,
+	13, 14, -71, 9, 159, 160, -13, 159, 163, -24,
+	-82, 31, 159, 161, 159, 107, -13, 163, 163, -50,
+	-24, 37, 134, -49, 159, -58, -9, -13, 160, -19,
+	88, -66, -24, 159, 9, 17, -9, 161, -72, -73,
+	-74, -75, -77, -76, -9, -5, 154, 86, -36, -11,
+	31, -82, -13, 159, 102, -53, -27, 162, 163, 88,
+	35, 161, -13, 17, -68, -24, 161, -73, 159, 159,
+	121, 105, 153, -13, -13, 159, -49, 163, -9, 161,
+	-24, -70, 86, -79, -64, -5, 100, 163, 160, -5,
+	159, -13, 161,
 }
 var yyDef = [...]int{
 
 	85, -2, 1, 84, 86, 87, 88, 0, 0, 92,
-	97, 98, 0, 0, 0, 0, 313, 313, 313, 0,
+	97, 98, 0, 0, 0, 0, 331, 331, 331, 0,
 	0, 0, 109, 0, 0, 0, 0, 115, 0, 0,
-	0, 0, 226, 0, 0, 133, 0, 311, 312, 190,
-	0, 316, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 244, 0, 0, 133, 0, 329, 330, 190,
+	0, 334, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 307, 0, 192, 193, 315, 317,
-	0, 0, 293, 76, 77, 69, 70, 71, 72, 73,
+	0, 0, 0, 0, 325, 0, 192, 193, 333, 335,
+	0, 0, 311, 76, 77, 69, 70, 71, 72, 73,
 	74, 75, 12, 39, 2, 3, 4, 5, 6, 45,
 	-2, 7, 8, 9, 10, 11, 13, 14, 15, 16,
 	17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
@@ -1112,50 +1172,53 @@ var yyDef = [...]int{
 	37, 38, 40, 41, 42, 43, 44, 47, 48, 49,
 	50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
 	60, 61, 62, 63, 64, 65, 66, 67, 68, 0,
-	80, 78, 0, 0, 0, 0, 141, 0, 0, 314,
+	80, 78, 0, 0, 0, 0, 141, 0, 0, 332,
 	0, 0, 0, 174, 175, 0, 177, 178, 0, 181,
 	182, 110, 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, 92, 0, 0, 119, 0, 227, 0,
+	0, 0, 0, 92, 0, 0, 119, 0, 245, 0,
 	191, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	254, 256, 0, 241, 255, 257, 275, 276, 277, 278,
-	0, 0, 294, 0, 296, 297, 298, 299, 300, 301,
-	302, 303, 304, 305, 306, 308, 310, 0, 319, 89,
+	272, 274, 0, 259, 273, 275, 293, 294, 295, 296,
+	0, 0, 312, 0, 314, 315, 316, 317, 318, 319,
+	320, 321, 322, 323, 324, 326, 328, 0, 337, 89,
 	90, 0, 91, 96, 93, 94, 95, 0, 0, 0,
 	142, 144, 0, 103, 104, 105, 106, 0, 107, 0,
-	0, 108, 0, 258, 259, 260, 261, 262, 263, 264,
-	265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
+	0, 108, 0, 276, 277, 278, 279, 280, 281, 282,
+	283, 284, 285, 286, 287, 288, 289, 290, 291, 292,
 	-2, -2, -2, -2, -2, -2, -2, -2, -2, 0,
-	0, 291, 186, 183, 185, 0, 0, 127, 0, 0,
+	0, 309, 186, 183, 185, 0, 0, 127, 0, 0,
 	117, 118, 0, 0, 195, 0, 134, 0, 137, 92,
-	239, 0, 242, 243, 244, 245, 246, 247, 248, 249,
-	250, 251, 252, 253, 0, 288, 0, 0, 0, 0,
+	257, 0, 260, 261, 262, 263, 264, 265, 266, 267,
+	268, 269, 270, 271, 0, 306, 0, 0, 0, 0,
 	79, 0, 0, 141, 0, 0, 173, 176, 179, 180,
-	0, 290, 0, 187, 0, 0, 0, 0, 120, -2,
-	195, 203, 0, 0, 0, 240, 0, 292, 295, 309,
-	318, 99, 139, 92, 0, 0, 143, 102, 149, 149,
-	289, 0, 184, 0, 156, 0, 0, 161, 114, 129,
-	92, 126, 128, 124, 0, 218, 220, 228, 225, 232,
-	0, 234, 235, 236, 81, 0, 0, 203, 189, 194,
-	0, 0, -2, 199, 205, 207, 208, 209, 210, 211,
-	212, 0, 0, 0, 131, 92, 0, 0, 141, 0,
-	149, 0, 149, 111, 0, 0, 157, 161, 0, 160,
-	164, 162, 166, 0, 0, 0, 116, 0, 0, 237,
-	224, 230, 229, 233, 82, 0, 188, 0, 214, 215,
-	0, 206, 132, 92, 138, 135, 0, 100, 0, 145,
-	0, 0, 0, 0, 0, 112, 171, 92, 0, 0,
-	159, 161, 0, 168, 161, 0, 0, 92, 0, 0,
-	221, 0, 231, 83, 196, 0, 0, 0, 201, 0,
-	2, 3, 4, 5, 6, 12, 39, 45, 46, 136,
-	140, 0, 0, 92, 152, 153, 146, 147, 0, 0,
-	0, 158, 163, 165, 0, 0, 0, 130, 0, 122,
-	0, 92, 238, 222, 213, 216, 197, 0, 0, 101,
-	154, 92, 92, 151, 148, 0, 113, 167, 161, 170,
-	0, 0, 125, 0, 0, 200, 202, 0, 150, 172,
-	0, 0, 123, 217, 223, 0, 169, 92, 155, 0,
-	121,
+	0, 308, 0, 187, 0, 0, 0, 0, 120, -2,
+	195, 221, 0, 0, 0, 258, 0, 310, 313, 327,
+	336, 99, 139, 92, 0, 0, 143, 102, 149, 149,
+	307, 0, 184, 0, 156, 0, 0, 161, 114, 129,
+	92, 126, 128, 124, 0, 236, 238, 246, 243, 250,
+	0, 252, 253, 254, 81, 0, 0, 221, 189, 194,
+	0, 0, 0, -2, 217, 223, 225, 226, 227, 228,
+	229, 230, 0, 0, 0, 131, 92, 0, 0, 141,
+	0, 149, 0, 149, 111, 0, 0, 157, 161, 0,
+	160, 164, 162, 166, 0, 0, 0, 116, 0, 0,
+	255, 242, 248, 247, 251, 82, 0, 188, 0, 232,
+	233, 0, 0, 199, 224, 132, 92, 138, 135, 0,
+	100, 0, 145, 0, 0, 0, 0, 0, 112, 171,
+	92, 0, 0, 159, 161, 0, 168, 161, 0, 0,
+	92, 0, 0, 239, 0, 249, 83, 196, 0, 0,
+	0, 219, 0, 2, 3, 4, 5, 6, 12, 39,
+	45, 46, 198, 0, 201, 0, 136, 140, 0, 0,
+	92, 152, 153, 146, 147, 0, 0, 0, 158, 163,
+	165, 0, 0, 0, 130, 0, 122, 0, 92, 256,
+	240, 231, 234, 197, 0, 0, 200, 202, 0, 204,
+	0, 0, 214, 0, 0, 213, 57, -2, 101, 154,
+	92, 92, 151, 148, 0, 113, 167, 161, 170, 0,
+	0, 125, 0, 0, 218, 220, 203, 205, 206, 207,
+	0, 0, 0, 0, 150, 172, 0, 0, 123, 235,
+	241, 208, 209, 210, 212, 215, 0, 169, 92, 211,
+	155, 0, 121,
 }
 var yyTok1 = [...]int{
 
@@ -1533,151 +1596,151 @@ yydefault:
 
 	case 1:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:248
+		//line parser.y:256
 		{
 			fmt.Println(yyDollar[1].node)
 		}
 	case 76:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:267
+		//line parser.y:275
 		{
-			yyVAL.node = Node("identifier")
+			yyVAL.node = Node("identifier").attribute("value", yyDollar[1].token)
 		}
 	case 77:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:268
+		//line parser.y:276
 		{
-			yyVAL.node = Node("reserved")
+			yyVAL.node = Node("identifier").attribute("value", "reserved")
 		}
 	case 78:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:272
+		//line parser.y:280
 		{
 			yyVAL.node = Node("NamespaceParts").append(Node(yyDollar[1].token))
 		}
 	case 79:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:273
+		//line parser.y:281
 		{
 			yyVAL.node = yyDollar[1].node.append(Node(yyDollar[3].token))
 		}
 	case 80:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:277
+		//line parser.y:285
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 81:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:281
+		//line parser.y:289
 		{
 			yyVAL.node = Node("Name").append(yyDollar[1].node)
 		}
 	case 82:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:282
+		//line parser.y:290
 		{
 			yyVAL.node = Node("Name").append(yyDollar[2].node).attribute("FullyQualified", "true")
 		}
 	case 83:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:283
+		//line parser.y:291
 		{
 			yyVAL.node = Node("Name").append(yyDollar[3].node).attribute("Relative", "true")
 		}
 	case 84:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:287
+		//line parser.y:295
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[2].node)
 		}
 	case 85:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:288
+		//line parser.y:296
 		{
 			yyVAL.node = Node("Statements")
 		}
 	case 86:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:292
+		//line parser.y:300
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 87:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:293
+		//line parser.y:301
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 88:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:294
+		//line parser.y:302
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 89:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:295
+		//line parser.y:303
 		{
 			yyVAL.node = yyDollar[2].node /*TODO: identifier stub, refactor it*/
 		}
 	case 90:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:296
+		//line parser.y:304
 		{
 			yyVAL.node = Node("Namespace").append(yyDollar[2].node)
 		}
 	case 91:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:300
+		//line parser.y:308
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[2].node)
 		}
 	case 92:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:301
+		//line parser.y:309
 		{
 			yyVAL.node = Node("stmt")
 		}
 	case 93:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:305
+		//line parser.y:313
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 94:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:306
+		//line parser.y:314
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 95:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:307
+		//line parser.y:315
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 96:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:310
+		//line parser.y:318
 		{
 			yyVAL.node = yyDollar[2].node
 		}
 	case 97:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:311
+		//line parser.y:319
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 98:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:312
+		//line parser.y:320
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 99:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:314
+		//line parser.y:322
 		{
 			yyVAL.node = Node("While").
 				append(Node("expr").append(yyDollar[3].node)).
@@ -1685,7 +1748,7 @@ yydefault:
 		}
 	case 100:
 		yyDollar = yyS[yypt-7 : yypt+1]
-		//line parser.y:320
+		//line parser.y:328
 		{
 			yyVAL.node = Node("DoWhile").
 				append(Node("expr").append(yyDollar[5].node)).
@@ -1693,7 +1756,7 @@ yydefault:
 		}
 	case 101:
 		yyDollar = yyS[yypt-9 : yypt+1]
-		//line parser.y:326
+		//line parser.y:334
 		{
 			yyVAL.node = Node("For").
 				append(Node("expr1").append(yyDollar[3].node)).
@@ -1703,67 +1766,67 @@ yydefault:
 		}
 	case 102:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:333
+		//line parser.y:341
 		{
 			yyVAL.node = Node("Switch").append(Node("expr").append(yyDollar[3].node)).append(yyDollar[5].node)
 		}
 	case 103:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:334
+		//line parser.y:342
 		{
 			yyVAL.node = Node("Break").append(yyDollar[2].node)
 		}
 	case 104:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:335
+		//line parser.y:343
 		{
 			yyVAL.node = Node("Continue").append(yyDollar[2].node)
 		}
 	case 105:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:336
+		//line parser.y:344
 		{
 			yyVAL.node = Node("Return").append(yyDollar[2].node)
 		}
 	case 106:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:337
+		//line parser.y:345
 		{
 			yyVAL.node = yyDollar[2].node
 		}
 	case 107:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:338
+		//line parser.y:346
 		{
 			yyVAL.node = yyDollar[2].node
 		}
 	case 108:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:339
+		//line parser.y:347
 		{
 			yyVAL.node = yyDollar[2].node
 		}
 	case 109:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:340
+		//line parser.y:348
 		{
 			yyVAL.node = Node("Echo").append(Node("InlineHtml").attribute("value", yyDollar[1].token))
 		}
 	case 110:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:341
+		//line parser.y:349
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 111:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line parser.y:343
+		//line parser.y:351
 		{
 			yyVAL.node = Node("Unset").append(yyDollar[3].node)
 		}
 	case 112:
 		yyDollar = yyS[yypt-7 : yypt+1]
-		//line parser.y:345
+		//line parser.y:353
 		{
 			yyVAL.node = Node("Foreach").
 				append(Node("expr").append(yyDollar[3].node)).
@@ -1772,7 +1835,7 @@ yydefault:
 		}
 	case 113:
 		yyDollar = yyS[yypt-9 : yypt+1]
-		//line parser.y:352
+		//line parser.y:360
 		{
 			yyVAL.node = Node("Foreach").
 				append(Node("expr").append(yyDollar[3].node)).
@@ -1782,19 +1845,19 @@ yydefault:
 		}
 	case 114:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:359
+		//line parser.y:367
 		{
 			yyVAL.node = Node("Declare").append(yyDollar[3].node).append(yyDollar[5].node)
 		}
 	case 115:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:360
+		//line parser.y:368
 		{
 			yyVAL.node = Node("")
 		}
 	case 116:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line parser.y:362
+		//line parser.y:370
 		{
 			yyVAL.node = Node("Try").
 				append(yyDollar[3].node).
@@ -1803,307 +1866,307 @@ yydefault:
 		}
 	case 117:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:368
+		//line parser.y:376
 		{
 			yyVAL.node = Node("Throw").append(yyDollar[2].node)
 		}
 	case 118:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:369
+		//line parser.y:377
 		{
 			yyVAL.node = Node("GoTo").attribute("Label", yyDollar[2].token)
 		}
 	case 119:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:370
+		//line parser.y:378
 		{
 			yyVAL.node = Node("Label").attribute("name", yyDollar[1].token)
 		}
 	case 120:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:373
+		//line parser.y:381
 		{
 			yyVAL.node = Node("CatchList")
 		}
 	case 121:
 		yyDollar = yyS[yypt-9 : yypt+1]
-		//line parser.y:375
+		//line parser.y:383
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[4].node).append(Node("Variable").attribute("name", yyDollar[5].token)).append(yyDollar[8].node)
 		}
 	case 122:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:378
+		//line parser.y:386
 		{
 			yyVAL.node = Node("CatchNameList").append(yyDollar[1].node)
 		}
 	case 123:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:379
+		//line parser.y:387
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
 	case 124:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:383
+		//line parser.y:391
 		{
 			yyVAL.node = Node("")
 		}
 	case 125:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:384
+		//line parser.y:392
 		{
 			yyVAL.node = Node("Finnaly").append(yyDollar[3].node)
 		}
 	case 126:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:388
+		//line parser.y:396
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
 	case 127:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:389
+		//line parser.y:397
 		{
 			yyVAL.node = Node("ConstList").append(yyDollar[1].node)
 		}
 	case 128:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:393
+		//line parser.y:401
 		{
 			yyVAL.node = Node("Const").attribute("name", yyDollar[1].token).append(yyDollar[3].node)
 		}
 	case 129:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:397
+		//line parser.y:405
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 130:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:398
+		//line parser.y:406
 		{
 			yyVAL.node = yyDollar[2].node
 		}
 	case 131:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:403
+		//line parser.y:411
 		{
 			yyVAL.node = Node("If").append(Node("expr").append(yyDollar[3].node)).append(Node("stmt").append(yyDollar[5].node))
 		}
 	case 132:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line parser.y:407
+		//line parser.y:415
 		{
 			yyVAL.node = yyDollar[1].node.append(Node("ElseIf").append(Node("expr").append(yyDollar[4].node)).append(Node("stmt").append(yyDollar[6].node)))
 		}
 	case 133:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:413
+		//line parser.y:421
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 134:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:415
+		//line parser.y:423
 		{
 			yyVAL.node = yyDollar[1].node.append(Node("Else").append(Node("stmt").append(yyDollar[3].node)))
 		}
 	case 135:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line parser.y:422
+		//line parser.y:430
 		{
 			yyVAL.node = Node("AltIf").append(Node("expr").append(yyDollar[3].node)).append(Node("stmt").append(yyDollar[6].node))
 		}
 	case 136:
 		yyDollar = yyS[yypt-7 : yypt+1]
-		//line parser.y:426
+		//line parser.y:434
 		{
 			yyVAL.node = yyDollar[1].node.append(Node("AltElseIf").append(Node("expr").append(yyDollar[4].node)).append(Node("stmt").append(yyDollar[7].node)))
 		}
 	case 137:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:432
+		//line parser.y:440
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 138:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line parser.y:434
+		//line parser.y:442
 		{
 			yyVAL.node = yyDollar[1].node.append(Node("AltElse").append(Node("stmt").append(yyDollar[4].node)))
 		}
 	case 139:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:440
+		//line parser.y:448
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 140:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:441
+		//line parser.y:449
 		{
 			yyVAL.node = yyDollar[2].node
 		}
 	case 141:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:445
+		//line parser.y:453
 		{
 			yyVAL.node = Node("")
 		}
 	case 142:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:446
+		//line parser.y:454
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 143:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:449
+		//line parser.y:457
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
 	case 144:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:450
+		//line parser.y:458
 		{
 			yyVAL.node = Node("ExpressionList").append(yyDollar[1].node)
 		}
 	case 145:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:454
+		//line parser.y:462
 		{
 			yyVAL.node = yyDollar[2].node
 		}
 	case 146:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:455
+		//line parser.y:463
 		{
 			yyVAL.node = yyDollar[3].node
 		}
 	case 147:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:456
+		//line parser.y:464
 		{
 			yyVAL.node = yyDollar[2].node
 		}
 	case 148:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:457
+		//line parser.y:465
 		{
 			yyVAL.node = yyDollar[3].node
 		}
 	case 149:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:461
+		//line parser.y:469
 		{
 			yyVAL.node = Node("CaseList")
 		}
 	case 150:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:463
+		//line parser.y:471
 		{
 			yyVAL.node = yyDollar[1].node.append(Node("Case").append(Node("expr").append(yyDollar[3].node)).append(yyDollar[5].node))
 		}
 	case 151:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:467
+		//line parser.y:475
 		{
 			yyVAL.node = yyDollar[1].node.append(Node("Default").append(yyDollar[4].node))
 		}
 	case 154:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:478
+		//line parser.y:486
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 155:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:479
+		//line parser.y:487
 		{
 			yyVAL.node = yyDollar[2].node
 		}
 	case 156:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:483
+		//line parser.y:491
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 157:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:484
+		//line parser.y:492
 		{
 			yyVAL.node = Node("Ref").append(yyDollar[2].node)
 		}
 	case 158:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:485
+		//line parser.y:493
 		{
 			yyVAL.node = Node("List").append(yyDollar[3].node)
 		}
 	case 159:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:486
+		//line parser.y:494
 		{
 			yyVAL.node = Node("ShortList").append(yyDollar[2].node)
 		}
 	case 160:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:490
+		//line parser.y:498
 		{ /* TODO: allow single trailing comma */
 			yyVAL.node = yyDollar[1].node
 		}
 	case 161:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:494
+		//line parser.y:502
 		{
 			yyVAL.node = Node("")
 		}
 	case 162:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:495
+		//line parser.y:503
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 163:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:500
+		//line parser.y:508
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
 	case 164:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:501
+		//line parser.y:509
 		{
 			yyVAL.node = Node("ArrayPairList").append(yyDollar[1].node)
 		}
 	case 165:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:505
+		//line parser.y:513
 		{
 			yyVAL.node = Node("ArrayElement").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
 	case 166:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:506
+		//line parser.y:514
 		{
 			yyVAL.node = Node("ArrayElement").append(yyDollar[1].node)
 		}
 	case 167:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:507
+		//line parser.y:515
 		{
 			yyVAL.node = Node("ArrayElement").append(yyDollar[1].node).append(Node("Ref").append(yyDollar[4].node))
 		}
 	case 168:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:508
+		//line parser.y:516
 		{
 			yyVAL.node = Node("ArrayElement").append(Node("Ref").append(yyDollar[2].node))
 		}
 	case 169:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line parser.y:510
+		//line parser.y:518
 		{
 			yyVAL.node = Node("ArrayElement").
 				append(yyDollar[1].node).
@@ -2111,278 +2174,386 @@ yydefault:
 		}
 	case 170:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:516
+		//line parser.y:524
 		{
 			yyVAL.node = Node("ArrayElement").
 				append(Node("ArrayList").append(yyDollar[3].node))
 		}
 	case 171:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:523
+		//line parser.y:531
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 172:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:524
+		//line parser.y:532
 		{
 			yyVAL.node = yyDollar[2].node
 		}
 	case 173:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:528
+		//line parser.y:536
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
 	case 174:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:529
+		//line parser.y:537
 		{
 			yyVAL.node = Node("GlobalVarList").append(yyDollar[1].node)
 		}
 	case 175:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:533
+		//line parser.y:541
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 176:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:537
+		//line parser.y:545
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
 	case 177:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:538
+		//line parser.y:546
 		{
 			yyVAL.node = Node("StaticVarList").append(yyDollar[1].node)
 		}
 	case 178:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:542
+		//line parser.y:550
 		{
 			yyVAL.node = Node("StaticVariable").attribute("Name", yyDollar[1].token)
 		}
 	case 179:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:543
+		//line parser.y:551
 		{
 			yyVAL.node = Node("StaticVariable").attribute("Name", yyDollar[1].token).append(Node("expr").append(yyDollar[3].node))
 		}
 	case 180:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:547
+		//line parser.y:555
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
 	case 181:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:548
+		//line parser.y:556
 		{
 			yyVAL.node = Node("EchoList").append(yyDollar[1].node)
 		}
 	case 182:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:552
+		//line parser.y:560
 		{
 			yyVAL.node = Node("Echo").append(yyDollar[1].node)
 		}
 	case 183:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:556
+		//line parser.y:564
 		{
 			yyVAL.node = Node("UnsetVariablesList").append(yyDollar[1].node)
 		}
 	case 184:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:557
+		//line parser.y:565
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
 	case 185:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:561
+		//line parser.y:569
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 188:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line parser.y:571
+		//line parser.y:579
 		{
 			yyVAL.node = yyDollar[1].node.attribute("name", yyDollar[3].token).append(yyDollar[5].node)
 		}
 	case 189:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:572
+		//line parser.y:580
 		{
 			yyVAL.node = Node("Class").attribute("name", yyDollar[2].token).append(yyDollar[4].node)
 		}
 	case 190:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:576
+		//line parser.y:584
 		{
 			yyVAL.node = Node("Class").attribute(yyDollar[1].value, "true")
 		}
 	case 191:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:577
+		//line parser.y:585
 		{
 			yyVAL.node = yyDollar[1].node.attribute(yyDollar[2].value, "true")
 		}
 	case 192:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:581
+		//line parser.y:589
 		{
 			yyVAL.value = "abstract"
 		}
 	case 193:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:582
+		//line parser.y:590
 		{
 			yyVAL.value = "final"
 		}
 	case 194:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:586
+		//line parser.y:594
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[2].node)
 		}
 	case 195:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:587
+		//line parser.y:595
 		{
 			yyVAL.node = Node("Stmt")
 		}
 	case 196:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:591
+		//line parser.y:599
 		{
 			yyVAL.node = yyDollar[2].node.append(yyDollar[1].node)
 		}
 	case 197:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:592
+		//line parser.y:600
 		{
 			yyVAL.node = yyDollar[3].node.append(yyDollar[1].node)
 		}
 	case 198:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:596
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:601
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("Use").append(yyDollar[2].node).append(yyDollar[3].node)
 		}
 	case 199:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:597
+		//line parser.y:605
 		{
-			yyVAL.node = Node("VarMemberModifier")
+			yyVAL.node = Node("NameList").append(yyDollar[1].node)
 		}
 	case 200:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:601
+		//line parser.y:606
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
 	case 201:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:602
-		{
-			yyVAL.node = Node("ConstList").append(yyDollar[1].node)
-		}
-	case 202:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:606
-		{
-			yyVAL.node = Node("Const").append(yyDollar[3].node)
-		}
-	case 203:
-		yyDollar = yyS[yypt-0 : yypt+1]
 		//line parser.y:610
 		{
-			yyVAL.node = Node("PublicMemberModifier")
+			yyVAL.node = Node("")
+		}
+	case 202:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:611
+		{
+			yyVAL.node = Node("")
+		}
+	case 203:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:612
+		{
+			yyVAL.node = yyDollar[2].node
 		}
 	case 204:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:611
+		//line parser.y:616
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("TraitAdaptionList").append(yyDollar[1].node)
 		}
 	case 205:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:614
-		{
-			yyVAL.node = yyDollar[1].node
-		}
-	case 206:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:615
+		//line parser.y:617
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[2].node)
 		}
-	case 207:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:618
-		{
-			yyVAL.node = Node("PublicMemberModifier")
-		}
-	case 208:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:619
-		{
-			yyVAL.node = Node("ProtectedMemberModifier")
-		}
-	case 209:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:620
-		{
-			yyVAL.node = Node("PrivateMemberModifier")
-		}
-	case 210:
-		yyDollar = yyS[yypt-1 : yypt+1]
+	case 206:
+		yyDollar = yyS[yypt-2 : yypt+1]
 		//line parser.y:621
 		{
-			yyVAL.node = Node("StaticMemberModifier")
+			yyVAL.node = yyDollar[1].node
 		}
-	case 211:
-		yyDollar = yyS[yypt-1 : yypt+1]
+	case 207:
+		yyDollar = yyS[yypt-2 : yypt+1]
 		//line parser.y:622
 		{
-			yyVAL.node = Node("AbstractMemberModifier")
+			yyVAL.node = yyDollar[1].node
 		}
-	case 212:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:623
-		{
-			yyVAL.node = Node("FinalMemberModifier")
-		}
-	case 213:
+	case 208:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:627
+		{
+			yyVAL.node = Node("TraitPrecedence").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 209:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:631
+		{
+			yyVAL.node = yyDollar[1].node.append(Node("as").attribute("value", yyDollar[3].token))
+		}
+	case 210:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:633
+		{
+			yyVAL.node = yyDollar[1].node.append(Node("as").append(Node("reservedNonModifiers")))
+		}
+	case 211:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:635
+		{
+			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node).append(yyDollar[4].node)
+		}
+	case 212:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:636
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
+	case 213:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:639
+		{
+			yyVAL.node = Node("TraitMethodRef").append(yyDollar[1].node)
+		}
 	case 214:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:628
+		//line parser.y:640
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 215:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:644
+		{
+			yyVAL.node = Node("TraitMethodRef").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 216:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:647
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 217:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:648
+		{
+			yyVAL.node = Node("VarMemberModifier")
+		}
+	case 218:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:652
+		{
+			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
+		}
+	case 219:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:653
+		{
+			yyVAL.node = Node("ConstList").append(yyDollar[1].node)
+		}
+	case 220:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:657
+		{
+			yyVAL.node = Node("Const").append(yyDollar[3].node)
+		}
+	case 221:
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line parser.y:661
+		{
+			yyVAL.node = Node("PublicMemberModifier")
+		}
+	case 222:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:662
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 223:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:665
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 224:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:666
+		{
+			yyVAL.node = yyDollar[1].node.append(yyDollar[2].node)
+		}
+	case 225:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:669
+		{
+			yyVAL.node = Node("PublicMemberModifier")
+		}
+	case 226:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:670
+		{
+			yyVAL.node = Node("ProtectedMemberModifier")
+		}
+	case 227:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:671
+		{
+			yyVAL.node = Node("PrivateMemberModifier")
+		}
+	case 228:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:672
+		{
+			yyVAL.node = Node("StaticMemberModifier")
+		}
+	case 229:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:673
+		{
+			yyVAL.node = Node("AbstractMemberModifier")
+		}
+	case 230:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:674
+		{
+			yyVAL.node = Node("FinalMemberModifier")
+		}
+	case 231:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:678
+		{
+			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
+		}
+	case 232:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:679
 		{
 			yyVAL.node = Node("PropertyList").append(yyDollar[1].node)
 		}
-	case 215:
+	case 233:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:631
+		//line parser.y:682
 		{
 			yyVAL.node = Node("Property").attribute("name", yyDollar[1].token)
 		}
-	case 216:
+	case 234:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:632
+		//line parser.y:683
 		{
 			yyVAL.node = Node("Property").attribute("name", yyDollar[1].token).append(Node("Default").append(yyDollar[3].node))
 		}
-	case 217:
+	case 235:
 		yyDollar = yyS[yypt-10 : yypt+1]
-		//line parser.y:637
+		//line parser.y:688
 		{
 			yyVAL.node = Node("Function").
 				attribute("name", yyDollar[3].token).
@@ -2391,33 +2562,33 @@ yydefault:
 				append(yyDollar[7].node).
 				append(yyDollar[9].node)
 		}
-	case 218:
+	case 236:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:648
+		//line parser.y:699
 		{
 			yyVAL.node = yyDollar[1].node
 		}
-	case 219:
+	case 237:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:649
+		//line parser.y:700
 		{
 			yyVAL.node = Node("Parameter list")
 		}
-	case 220:
+	case 238:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:652
+		//line parser.y:703
 		{
 			yyVAL.node = Node("Parameter list").append(yyDollar[1].node)
 		}
-	case 221:
+	case 239:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:653
+		//line parser.y:704
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
-	case 222:
+	case 240:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:657
+		//line parser.y:708
 		{
 			yyVAL.node = Node("Parameter").
 				append(yyDollar[1].node).
@@ -2425,9 +2596,9 @@ yydefault:
 				attribute("is_variadic", yyDollar[3].value).
 				attribute("var", yyDollar[4].token)
 		}
-	case 223:
+	case 241:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line parser.y:665
+		//line parser.y:716
 		{
 			yyVAL.node = Node("Parameter").
 				append(yyDollar[1].node).
@@ -2436,580 +2607,580 @@ yydefault:
 				attribute("var", yyDollar[4].token).
 				append(yyDollar[6].node)
 		}
-	case 224:
+	case 242:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:676
+		//line parser.y:727
 		{
 			yyVAL.node = Node("No type")
 		}
-	case 225:
+	case 243:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:677
+		//line parser.y:728
 		{
 			yyVAL.node = yyDollar[1].node
 		}
-	case 226:
+	case 244:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:681
+		//line parser.y:732
 		{
 			yyVAL.value = "false"
 		}
-	case 227:
+	case 245:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:682
+		//line parser.y:733
 		{
 			yyVAL.value = "true"
 		}
-	case 228:
+	case 246:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:686
+		//line parser.y:737
 		{
 			yyVAL.value = "false"
 		}
-	case 229:
+	case 247:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:687
+		//line parser.y:738
 		{
 			yyVAL.value = "true"
 		}
-	case 230:
+	case 248:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:691
+		//line parser.y:742
 		{
 			yyVAL.value = "false"
 		}
-	case 231:
+	case 249:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:692
+		//line parser.y:743
 		{
 			yyVAL.value = "true"
 		}
-	case 232:
+	case 250:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:696
+		//line parser.y:747
 		{
 			yyVAL.node = yyDollar[1].node
 		}
-	case 233:
+	case 251:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:697
+		//line parser.y:748
 		{
 			yyVAL.node = yyDollar[2].node
 			yyVAL.node.attribute("nullable", "true")
 		}
-	case 234:
+	case 252:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:701
+		//line parser.y:752
 		{
 			yyVAL.node = yyDollar[1].node
 		}
-	case 235:
+	case 253:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:702
+		//line parser.y:753
 		{
 			yyVAL.node = Node("array type")
 		}
-	case 236:
+	case 254:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:703
+		//line parser.y:754
 		{
 			yyVAL.node = Node("callable type")
 		}
-	case 237:
+	case 255:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:707
+		//line parser.y:758
 		{
 			yyVAL.node = Node("void")
 		}
-	case 238:
+	case 256:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:708
+		//line parser.y:759
 		{
 			yyVAL.node = yyDollar[2].node
 		}
-	case 239:
+	case 257:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:712
+		//line parser.y:763
 		{
 			yyVAL.node = Node("Assign").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 240:
+	case 258:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:713
+		//line parser.y:764
 		{
 			yyVAL.node = Node("AssignRef").append(yyDollar[1].node).append(yyDollar[4].node)
 		}
-	case 241:
+	case 259:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:714
+		//line parser.y:765
 		{
 			yyVAL.node = Node("Clone").append(yyDollar[2].node)
 		}
-	case 242:
+	case 260:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:715
+		//line parser.y:766
 		{
 			yyVAL.node = Node("AssignAdd").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 243:
+	case 261:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:716
+		//line parser.y:767
 		{
 			yyVAL.node = Node("AssignSub").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 244:
+	case 262:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:717
+		//line parser.y:768
 		{
 			yyVAL.node = Node("AssignMul").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 245:
+	case 263:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:718
+		//line parser.y:769
 		{
 			yyVAL.node = Node("AssignPow").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 246:
+	case 264:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:719
+		//line parser.y:770
 		{
 			yyVAL.node = Node("AssignDiv").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 247:
+	case 265:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:720
+		//line parser.y:771
 		{
 			yyVAL.node = Node("AssignConcat").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 248:
+	case 266:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:721
+		//line parser.y:772
 		{
 			yyVAL.node = Node("AssignMod").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 249:
+	case 267:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:722
+		//line parser.y:773
 		{
 			yyVAL.node = Node("AssignAnd").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 250:
+	case 268:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:723
+		//line parser.y:774
 		{
 			yyVAL.node = Node("AssignOr").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 251:
+	case 269:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:724
+		//line parser.y:775
 		{
 			yyVAL.node = Node("AssignXor").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 252:
+	case 270:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:725
+		//line parser.y:776
 		{
 			yyVAL.node = Node("AssignShiftLeft").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 253:
+	case 271:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:726
+		//line parser.y:777
 		{
 			yyVAL.node = Node("AssignShiftRight").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 254:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:727
-		{
-			yyVAL.node = Node("PostIncrement").append(yyDollar[1].node)
-		}
-	case 255:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:728
-		{
-			yyVAL.node = Node("PreIncrement").append(yyDollar[2].node)
-		}
-	case 256:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:729
-		{
-			yyVAL.node = Node("PostDecrement").append(yyDollar[1].node)
-		}
-	case 257:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:730
-		{
-			yyVAL.node = Node("PreDecrement").append(yyDollar[2].node)
-		}
-	case 258:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:731
-		{
-			yyVAL.node = Node("Or").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 259:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:732
-		{
-			yyVAL.node = Node("And").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 260:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:733
-		{
-			yyVAL.node = Node("Or").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 261:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:734
-		{
-			yyVAL.node = Node("And").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 262:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:735
-		{
-			yyVAL.node = Node("Xor").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 263:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:736
-		{
-			yyVAL.node = Node("BitwiseOr").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 264:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:737
-		{
-			yyVAL.node = Node("BitwiseAnd").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 265:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:738
-		{
-			yyVAL.node = Node("BitwiseXor").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 266:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:739
-		{
-			yyVAL.node = Node("Concat").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 267:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:740
-		{
-			yyVAL.node = Node("Add").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 268:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:741
-		{
-			yyVAL.node = Node("Sub").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 269:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:742
-		{
-			yyVAL.node = Node("Mul").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 270:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:743
-		{
-			yyVAL.node = Node("Pow").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 271:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:744
-		{
-			yyVAL.node = Node("Div").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
 	case 272:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:745
-		{
-			yyVAL.node = Node("Mod").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 273:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:746
-		{
-			yyVAL.node = Node("ShiftLeft").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 274:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:747
-		{
-			yyVAL.node = Node("ShiftRight").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 275:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:748
-		{
-			yyVAL.node = Node("UnaryPlus").append(yyDollar[2].node)
-		}
-	case 276:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:749
-		{
-			yyVAL.node = Node("UnaryMinus").append(yyDollar[2].node)
-		}
-	case 277:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:750
-		{
-			yyVAL.node = Node("BooleanNot").append(yyDollar[2].node)
-		}
-	case 278:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:751
-		{
-			yyVAL.node = Node("BitwiseNot").append(yyDollar[2].node)
-		}
-	case 279:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:752
-		{
-			yyVAL.node = Node("Identical").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 280:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:753
-		{
-			yyVAL.node = Node("NotIdentical").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 281:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:754
-		{
-			yyVAL.node = Node("Equal").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 282:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:755
-		{
-			yyVAL.node = Node("NotEqual").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 283:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:756
-		{
-			yyVAL.node = Node("Spaceship").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 284:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:757
-		{
-			yyVAL.node = Node("Smaller").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 285:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:758
-		{
-			yyVAL.node = Node("SmallerOrEqual").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 286:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:759
-		{
-			yyVAL.node = Node("Greater").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 287:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:760
-		{
-			yyVAL.node = Node("GreaterOrEqual").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 288:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:761
-		{
-			yyVAL.node = yyDollar[2].node
-		}
-	case 289:
-		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:762
-		{
-			yyVAL.node = Node("Ternary").append(yyDollar[1].node).append(yyDollar[3].node).append(yyDollar[5].node)
-		}
-	case 290:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:763
-		{
-			yyVAL.node = Node("Ternary").append(yyDollar[1].node).append(yyDollar[4].node)
-		}
-	case 291:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:764
-		{
-			yyVAL.node = Node("Coalesce").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 292:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:765
-		{
-			yyVAL.node = Node("Empty").append(yyDollar[3].node)
-		}
-	case 293:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:766
-		{
-			yyVAL.node = Node("Include").append(yyDollar[2].node)
-		}
-	case 294:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:767
-		{
-			yyVAL.node = Node("IncludeOnce").append(yyDollar[2].node)
-		}
-	case 295:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:768
-		{
-			yyVAL.node = Node("Eval").append(yyDollar[3].node)
-		}
-	case 296:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:769
-		{
-			yyVAL.node = Node("Require").append(yyDollar[2].node)
-		}
-	case 297:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:770
-		{
-			yyVAL.node = Node("RequireOnce").append(yyDollar[2].node)
-		}
-	case 298:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:771
-		{
-			yyVAL.node = Node("CastInt").append(yyDollar[2].node)
-		}
-	case 299:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:772
-		{
-			yyVAL.node = Node("CastDouble").append(yyDollar[2].node)
-		}
-	case 300:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:773
-		{
-			yyVAL.node = Node("CastString").append(yyDollar[2].node)
-		}
-	case 301:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:774
-		{
-			yyVAL.node = Node("CastArray").append(yyDollar[2].node)
-		}
-	case 302:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:775
-		{
-			yyVAL.node = Node("CastObject").append(yyDollar[2].node)
-		}
-	case 303:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:776
-		{
-			yyVAL.node = Node("CastBool").append(yyDollar[2].node)
-		}
-	case 304:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:777
-		{
-			yyVAL.node = Node("CastUnset").append(yyDollar[2].node)
-		}
-	case 305:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		//line parser.y:778
 		{
-			yyVAL.node = Node("Silence").append(yyDollar[2].node)
+			yyVAL.node = Node("PostIncrement").append(yyDollar[1].node)
 		}
-	case 306:
+	case 273:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:779
+		{
+			yyVAL.node = Node("PreIncrement").append(yyDollar[2].node)
+		}
+	case 274:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		//line parser.y:780
 		{
-			yyVAL.node = Node("Print").append(yyDollar[2].node)
+			yyVAL.node = Node("PostDecrement").append(yyDollar[1].node)
 		}
-	case 307:
-		yyDollar = yyS[yypt-1 : yypt+1]
+	case 275:
+		yyDollar = yyS[yypt-2 : yypt+1]
 		//line parser.y:781
 		{
-			yyVAL.node = Node("Yield")
+			yyVAL.node = Node("PreDecrement").append(yyDollar[2].node)
 		}
-	case 308:
-		yyDollar = yyS[yypt-2 : yypt+1]
+	case 276:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:782
 		{
-			yyVAL.node = Node("Yield").append(yyDollar[2].node)
+			yyVAL.node = Node("Or").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 309:
-		yyDollar = yyS[yypt-4 : yypt+1]
+	case 277:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:783
 		{
-			yyVAL.node = Node("Yield").append(yyDollar[2].node).append(yyDollar[4].node)
+			yyVAL.node = Node("And").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 310:
-		yyDollar = yyS[yypt-2 : yypt+1]
+	case 278:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:784
 		{
-			yyVAL.node = Node("YieldFrom").append(yyDollar[2].node)
+			yyVAL.node = Node("Or").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 311:
-		yyDollar = yyS[yypt-1 : yypt+1]
+	case 279:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:785
+		{
+			yyVAL.node = Node("And").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 280:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:786
+		{
+			yyVAL.node = Node("Xor").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 281:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:787
+		{
+			yyVAL.node = Node("BitwiseOr").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 282:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:788
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("BitwiseAnd").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 312:
-		yyDollar = yyS[yypt-1 : yypt+1]
+	case 283:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:789
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("BitwiseXor").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 313:
-		yyDollar = yyS[yypt-0 : yypt+1]
+	case 284:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:790
+		{
+			yyVAL.node = Node("Concat").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 285:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:791
+		{
+			yyVAL.node = Node("Add").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 286:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:792
+		{
+			yyVAL.node = Node("Sub").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 287:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:793
 		{
-			yyVAL.node = Node("")
+			yyVAL.node = Node("Mul").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 314:
-		yyDollar = yyS[yypt-1 : yypt+1]
+	case 288:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:794
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("Pow").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 315:
-		yyDollar = yyS[yypt-1 : yypt+1]
+	case 289:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:795
+		{
+			yyVAL.node = Node("Div").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 290:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:796
+		{
+			yyVAL.node = Node("Mod").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 291:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:797
+		{
+			yyVAL.node = Node("ShiftLeft").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 292:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:798
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("ShiftRight").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 316:
-		yyDollar = yyS[yypt-1 : yypt+1]
+	case 293:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:799
+		{
+			yyVAL.node = Node("UnaryPlus").append(yyDollar[2].node)
+		}
+	case 294:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:800
+		{
+			yyVAL.node = Node("UnaryMinus").append(yyDollar[2].node)
+		}
+	case 295:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:801
+		{
+			yyVAL.node = Node("BooleanNot").append(yyDollar[2].node)
+		}
+	case 296:
+		yyDollar = yyS[yypt-2 : yypt+1]
 		//line parser.y:802
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("BitwiseNot").append(yyDollar[2].node)
 		}
-	case 317:
-		yyDollar = yyS[yypt-1 : yypt+1]
+	case 297:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:803
+		{
+			yyVAL.node = Node("Identical").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 298:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:804
+		{
+			yyVAL.node = Node("NotIdentical").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 299:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:805
+		{
+			yyVAL.node = Node("Equal").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 300:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:806
 		{
-			yyVAL.node = Node("Variable").attribute("name", yyDollar[1].token)
+			yyVAL.node = Node("NotEqual").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 318:
-		yyDollar = yyS[yypt-4 : yypt+1]
+	case 301:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:807
 		{
-			yyVAL.node = yyDollar[3].node
+			yyVAL.node = Node("Spaceship").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 302:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:808
+		{
+			yyVAL.node = Node("Smaller").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 303:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:809
+		{
+			yyVAL.node = Node("SmallerOrEqual").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 304:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:810
+		{
+			yyVAL.node = Node("Greater").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 305:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:811
+		{
+			yyVAL.node = Node("GreaterOrEqual").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 306:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:812
+		{
+			yyVAL.node = yyDollar[2].node
+		}
+	case 307:
+		yyDollar = yyS[yypt-5 : yypt+1]
+		//line parser.y:813
+		{
+			yyVAL.node = Node("Ternary").append(yyDollar[1].node).append(yyDollar[3].node).append(yyDollar[5].node)
+		}
+	case 308:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:814
+		{
+			yyVAL.node = Node("Ternary").append(yyDollar[1].node).append(yyDollar[4].node)
+		}
+	case 309:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:815
+		{
+			yyVAL.node = Node("Coalesce").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 310:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:816
+		{
+			yyVAL.node = Node("Empty").append(yyDollar[3].node)
+		}
+	case 311:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:817
+		{
+			yyVAL.node = Node("Include").append(yyDollar[2].node)
+		}
+	case 312:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:818
+		{
+			yyVAL.node = Node("IncludeOnce").append(yyDollar[2].node)
+		}
+	case 313:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:819
+		{
+			yyVAL.node = Node("Eval").append(yyDollar[3].node)
+		}
+	case 314:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:820
+		{
+			yyVAL.node = Node("Require").append(yyDollar[2].node)
+		}
+	case 315:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:821
+		{
+			yyVAL.node = Node("RequireOnce").append(yyDollar[2].node)
+		}
+	case 316:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:822
+		{
+			yyVAL.node = Node("CastInt").append(yyDollar[2].node)
+		}
+	case 317:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:823
+		{
+			yyVAL.node = Node("CastDouble").append(yyDollar[2].node)
+		}
+	case 318:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:824
+		{
+			yyVAL.node = Node("CastString").append(yyDollar[2].node)
 		}
 	case 319:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:808
+		//line parser.y:825
+		{
+			yyVAL.node = Node("CastArray").append(yyDollar[2].node)
+		}
+	case 320:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:826
+		{
+			yyVAL.node = Node("CastObject").append(yyDollar[2].node)
+		}
+	case 321:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:827
+		{
+			yyVAL.node = Node("CastBool").append(yyDollar[2].node)
+		}
+	case 322:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:828
+		{
+			yyVAL.node = Node("CastUnset").append(yyDollar[2].node)
+		}
+	case 323:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:829
+		{
+			yyVAL.node = Node("Silence").append(yyDollar[2].node)
+		}
+	case 324:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:831
+		{
+			yyVAL.node = Node("Print").append(yyDollar[2].node)
+		}
+	case 325:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:832
+		{
+			yyVAL.node = Node("Yield")
+		}
+	case 326:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:833
+		{
+			yyVAL.node = Node("Yield").append(yyDollar[2].node)
+		}
+	case 327:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:834
+		{
+			yyVAL.node = Node("Yield").append(yyDollar[2].node).append(yyDollar[4].node)
+		}
+	case 328:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:835
+		{
+			yyVAL.node = Node("YieldFrom").append(yyDollar[2].node)
+		}
+	case 329:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:839
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 330:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:840
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 331:
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line parser.y:844
+		{
+			yyVAL.node = Node("")
+		}
+	case 332:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:845
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 333:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:849
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 334:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:853
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 335:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:857
+		{
+			yyVAL.node = Node("Variable").attribute("name", yyDollar[1].token)
+		}
+	case 336:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:858
+		{
+			yyVAL.node = yyDollar[3].node
+		}
+	case 337:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:859
 		{
 			yyVAL.node = Node("Variable").append(yyDollar[2].node)
 		}
diff --git a/parser.y b/parser.y
index d5a844b..19e25d1 100644
--- a/parser.y
+++ b/parser.y
@@ -239,6 +239,14 @@ func (n node) attribute(key string, value string) node {
 %type <node> class_const_list
 %type <node> class_const_decl
 %type <node> method_modifiers
+%type <node> name_list
+%type <node> trait_adaptations
+%type <node> trait_adaptation_list
+%type <node> trait_adaptation
+%type <node> trait_precedence
+%type <node> trait_alias
+%type <node> trait_method_reference
+%type <node> absolute_trait_method_reference
 
 %%
 
@@ -264,8 +272,8 @@ semi_reserved:
 ;
 
 identifier:
-        T_STRING                                        { $$ = Node("identifier") }
-    |   semi_reserved                                   { $$ = Node("reserved") }
+        T_STRING                                        { $$ = Node("identifier").attribute("value", $1) }
+    |   semi_reserved                                   { $$ = Node("identifier").attribute("value", "reserved") }
 ;
 
 namespace_name_parts:
@@ -590,8 +598,51 @@ class_statement_list:
 class_statement:
         variable_modifiers property_list ';'            { $$ = $2.append($1) }
     |   method_modifiers T_CONST class_const_list ';'   { $$ = $3.append($1); }
+    |   T_USE name_list trait_adaptations               { $$ = Node("Use").append($2).append($3); }
 ;
 
+name_list:
+        name                                            { $$ = Node("NameList").append($1) }
+    |   name_list ',' name                              { $$ = $1.append($3) }
+;
+
+trait_adaptations:
+        ';'                                             { $$ = Node(""); }
+    |   '{' '}'                                         { $$ = Node(""); }
+    |   '{' trait_adaptation_list '}'                   { $$ = $2; }
+;
+
+trait_adaptation_list:
+        trait_adaptation                                { $$ = Node("TraitAdaptionList").append($1) }
+    |   trait_adaptation_list trait_adaptation          { $$ = $1.append($2) }
+;
+
+trait_adaptation:
+        trait_precedence ';'                            { $$ = $1; }
+    |   trait_alias ';'                                 { $$ = $1; }
+;
+
+trait_precedence:
+    absolute_trait_method_reference T_INSTEADOF name_list
+                                                        { $$ = Node("TraitPrecedence").append($1).append($3) }
+;
+
+trait_alias:
+        trait_method_reference T_AS T_STRING            { $$ = $1.append(Node("as").attribute("value", $3)); }
+    |   trait_method_reference T_AS reserved_non_modifiers
+                                                        { $$ = $1.append(Node("as").append(Node("reservedNonModifiers")));  }
+    |   trait_method_reference T_AS member_modifier identifier
+                                                        { $$ = $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; }
+;
+
+absolute_trait_method_reference:
+    name T_PAAMAYIM_NEKUDOTAYIM identifier              { $$ = Node("TraitMethodRef").append($1).append($3) }
+
 variable_modifiers:
         non_empty_member_modifiers                      { $$ = $1; }
     |   T_VAR                                           { $$ = Node("VarMemberModifier") }
@@ -815,8 +866,13 @@ simple_variable:
 const src = `<?php
 
 abstract class test {
-    public static $a ,$b = $c;
-    private static const TEST = $a, TEST2 = $b;
+    use \test\tt, tt {
+        tt::test insteadof test;
+        \test\tt::test as include;
+        \test\tt::test as public include;
+        \test\tt::test as public private;
+        \test\tt::test as private somestring;
+    }
 }
 
 `