From f15e67119d737e05646f92c25db707ecf730c3f0 Mon Sep 17 00:00:00 2001
From: vadim <vadim@ecomitize.com>
Date: Wed, 29 Nov 2017 16:21:44 +0200
Subject: [PATCH] parse class properties

---
 parser.go | 1641 ++++++++++++++++++++++++++++-------------------------
 parser.y  |   56 +-
 2 files changed, 933 insertions(+), 764 deletions(-)

diff --git a/parser.go b/parser.go
index a01add7..f922764 100644
--- a/parser.go
+++ b/parser.go
@@ -366,12 +366,13 @@ const yyEofCode = 1
 const yyErrCode = 2
 const yyInitialStackSize = 16
 
-//line parser.y:751
+//line parser.y:796
 const src = `<?php
 
-throw $exception;
-goto test;
-test:
+abstract class test {
+    public static $a ,$b = $c;
+}
+
 `
 
 func main() {
@@ -388,132 +389,138 @@ var yyExca = [...]int{
 	-2, 0,
 	-1, 90,
 	159, 46,
-	-2, 284,
+	-2, 301,
 	-1, 300,
 	38, 0,
 	39, 0,
 	40, 0,
 	41, 0,
 	42, 0,
-	-2, 256,
+	-2, 273,
 	-1, 301,
 	38, 0,
 	39, 0,
 	40, 0,
 	41, 0,
 	42, 0,
-	-2, 257,
+	-2, 274,
 	-1, 302,
 	38, 0,
 	39, 0,
 	40, 0,
 	41, 0,
 	42, 0,
-	-2, 258,
+	-2, 275,
 	-1, 303,
 	38, 0,
 	39, 0,
 	40, 0,
 	41, 0,
 	42, 0,
-	-2, 259,
+	-2, 276,
 	-1, 304,
 	38, 0,
 	39, 0,
 	40, 0,
 	41, 0,
 	42, 0,
-	-2, 260,
+	-2, 277,
 	-1, 305,
 	43, 0,
 	44, 0,
 	45, 0,
 	46, 0,
-	-2, 261,
+	-2, 278,
 	-1, 306,
 	43, 0,
 	44, 0,
 	45, 0,
 	46, 0,
-	-2, 262,
+	-2, 279,
 	-1, 307,
 	43, 0,
 	44, 0,
 	45, 0,
 	46, 0,
-	-2, 263,
+	-2, 280,
 	-1, 308,
 	43, 0,
 	44, 0,
 	45, 0,
 	46, 0,
-	-2, 264,
+	-2, 281,
 	-1, 369,
-	163, 196,
-	-2, 201,
+	163, 213,
+	-2, 218,
 }
 
 const yyPrivate = 57344
 
-const yyLast = 4210
+const yyLast = 4264
 
 var yyAct = [...]int{
 
-	23, 152, 435, 466, 411, 489, 408, 72, 437, 406,
-	393, 409, 269, 414, 426, 317, 313, 159, 159, 159,
-	264, 149, 170, 4, 169, 166, 163, 69, 69, 471,
-	204, 37, 535, 530, 154, 520, 497, 496, 487, 461,
-	462, 461, 462, 233, 446, 391, 236, 237, 238, 239,
-	240, 68, 242, 432, 244, 245, 246, 247, 248, 249,
-	250, 251, 252, 253, 254, 255, 256, 519, 477, 475,
-	434, 164, 369, 352, 327, 234, 235, 366, 325, 243,
-	241, 232, 202, 233, 201, 72, 242, 200, 244, 245,
-	254, 255, 492, 417, 460, 282, 157, 156, 153, 257,
-	151, 174, 176, 175, 70, 70, 371, 389, 536, 507,
-	478, 410, 370, 490, 324, 395, 279, 277, 203, 537,
-	528, 198, 258, 199, 172, 173, 177, 179, 178, 191,
+	23, 152, 447, 483, 411, 509, 467, 72, 408, 406,
+	449, 393, 414, 438, 409, 423, 371, 159, 159, 159,
+	149, 317, 170, 264, 269, 169, 4, 313, 163, 166,
+	204, 37, 69, 69, 488, 557, 552, 154, 542, 517,
+	516, 478, 479, 233, 507, 458, 236, 237, 238, 239,
+	240, 68, 242, 444, 244, 245, 246, 247, 248, 249,
+	250, 251, 252, 253, 254, 255, 256, 478, 479, 391,
+	541, 164, 494, 492, 446, 234, 235, 366, 369, 352,
+	327, 325, 243, 233, 241, 72, 242, 232, 244, 245,
+	254, 255, 202, 201, 512, 464, 200, 157, 156, 153,
+	151, 174, 176, 175, 257, 389, 558, 527, 510, 70,
+	70, 410, 503, 495, 370, 395, 324, 282, 279, 277,
+	477, 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, 515, 397, 503, 412,
-	413, 493, 486, 458, 267, 455, 72, 271, 272, 184,
-	430, 429, 427, 425, 353, 328, 69, 151, 416, 151,
-	321, 415, 275, 283, 284, 285, 286, 287, 288, 289,
+	181, 182, 180, 183, 185, 186, 203, 397, 559, 412,
+	413, 550, 537, 523, 267, 513, 72, 271, 272, 184,
+	427, 428, 429, 426, 425, 424, 69, 151, 416, 506,
+	475, 415, 472, 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, 431, 315, 274, 273, 319, 260, 259, 483, 452,
-	261, 268, 396, 66, 67, 522, 412, 413, 330, 332,
+	311, 443, 315, 151, 442, 319, 441, 422, 439, 437,
+	353, 328, 396, 321, 275, 274, 412, 413, 330, 332,
 	333, 334, 335, 336, 337, 338, 339, 340, 341, 342,
-	343, 365, 314, 344, 326, 416, 388, 416, 415, 509,
-	415, 491, 346, 70, 347, 281, 444, 445, 494, 461,
-	462, 464, 461, 462, 424, 167, 151, 318, 349, 350,
-	323, 322, 211, 205, 209, 184, 278, 276, 521, 214,
-	216, 215, 212, 213, 449, 208, 480, 454, 39, 329,
-	525, 358, 206, 170, 177, 179, 178, 191, 192, 189,
-	190, 193, 194, 195, 196, 197, 187, 188, 181, 182,
-	180, 183, 185, 186, 356, 357, 367, 359, 183, 185,
-	186, 361, 210, 280, 472, 447, 363, 184, 354, 265,
-	266, 362, 5, 8, 184, 74, 372, 158, 373, 164,
-	75, 374, 375, 194, 195, 196, 197, 187, 188, 181,
-	182, 180, 183, 185, 186, 160, 161, 1, 443, 379,
-	504, 403, 398, 384, 271, 386, 316, 438, 184, 436,
-	312, 390, 168, 165, 162, 387, 385, 510, 402, 270,
-	381, 11, 382, 36, 10, 35, 41, 38, 405, 404,
-	392, 479, 401, 407, 33, 423, 399, 187, 188, 181,
-	182, 180, 183, 185, 186, 314, 394, 421, 439, 262,
-	2, 150, 442, 3, 428, 71, 207, 482, 184, 181,
-	182, 180, 183, 185, 186, 448, 0, 0, 0, 0,
-	0, 0, 450, 0, 456, 0, 271, 433, 184, 451,
-	0, 0, 0, 0, 0, 439, 0, 470, 459, 453,
-	0, 0, 463, 469, 465, 0, 0, 0, 0, 0,
-	0, 0, 467, 0, 0, 0, 485, 481, 0, 0,
-	0, 0, 488, 0, 394, 0, 484, 0, 0, 0,
-	495, 0, 474, 439, 499, 0, 439, 0, 502, 0,
-	506, 498, 505, 0, 0, 0, 0, 508, 0, 0,
-	0, 514, 0, 0, 513, 84, 85, 86, 87, 88,
-	517, 91, 92, 93, 89, 90, 0, 65, 511, 524,
-	0, 0, 0, 0, 526, 527, 0, 467, 0, 0,
-	439, 0, 529, 0, 0, 0, 533, 531, 0, 0,
-	0, 0, 518, 0, 0, 0, 0, 0, 538, 0,
-	45, 46, 0, 0, 0, 0, 47, 94, 48, 43,
+	343, 365, 314, 344, 388, 416, 511, 326, 415, 273,
+	261, 260, 346, 70, 347, 465, 259, 500, 427, 428,
+	429, 426, 425, 424, 436, 268, 66, 67, 349, 456,
+	457, 544, 502, 514, 478, 479, 468, 281, 278, 276,
+	529, 416, 167, 151, 415, 481, 478, 479, 318, 350,
+	323, 358, 322, 170, 427, 428, 429, 426, 425, 424,
+	211, 205, 214, 216, 215, 422, 187, 188, 181, 182,
+	180, 183, 185, 186, 212, 213, 356, 209, 359, 357,
+	184, 361, 461, 208, 543, 497, 39, 184, 471, 329,
+	206, 489, 547, 504, 367, 280, 372, 459, 373, 164,
+	363, 374, 375, 418, 194, 195, 196, 197, 187, 188,
+	181, 182, 180, 183, 185, 186, 354, 362, 74, 379,
+	210, 158, 75, 384, 271, 386, 183, 185, 186, 184,
+	1, 390, 181, 182, 180, 183, 185, 186, 402, 160,
+	161, 265, 184, 266, 5, 382, 8, 466, 385, 421,
+	420, 184, 419, 455, 524, 435, 403, 417, 401, 399,
+	398, 392, 316, 450, 448, 314, 394, 312, 451, 168,
+	433, 165, 454, 440, 178, 191, 192, 189, 190, 193,
+	194, 195, 196, 197, 187, 188, 181, 182, 180, 183,
+	185, 186, 162, 387, 532, 462, 270, 445, 463, 381,
+	11, 36, 10, 35, 41, 184, 473, 469, 271, 38,
+	405, 404, 496, 407, 33, 262, 2, 451, 150, 487,
+	3, 71, 207, 480, 470, 482, 486, 499, 460, 0,
+	0, 0, 476, 0, 0, 0, 0, 484, 0, 498,
+	0, 0, 0, 505, 0, 0, 394, 501, 0, 508,
+	0, 0, 0, 0, 491, 0, 0, 515, 0, 0,
+	451, 519, 0, 451, 0, 522, 0, 526, 0, 525,
+	518, 0, 0, 0, 0, 531, 528, 0, 0, 0,
+	530, 536, 0, 0, 535, 0, 0, 0, 0, 0,
+	539, 0, 0, 0, 0, 0, 0, 0, 0, 546,
+	0, 533, 0, 0, 0, 0, 548, 549, 0, 0,
+	484, 0, 451, 0, 551, 0, 0, 0, 555, 553,
+	0, 348, 540, 0, 0, 84, 85, 86, 87, 88,
+	560, 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,
@@ -538,14 +545,14 @@ var yyAct = [...]int{
 	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, 539, 49, 0, 0,
+	180, 183, 185, 186, 27, 9, 561, 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,
-	534, 25, 0, 26, 0, 0, 15, 0, 0, 0,
+	556, 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,
@@ -563,7 +570,7 @@ var yyAct = [...]int{
 	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, 532, 49, 0, 0,
+	0, 0, 0, 0, 27, 9, 554, 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,
@@ -576,13 +583,13 @@ var yyAct = [...]int{
 	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, 523, 49, 0, 0, 70, 0, 0, 0, 0,
+	9, 545, 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, 516, 26, 0,
+	21, 13, 12, 0, 14, 0, 25, 538, 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,
@@ -595,7 +602,7 @@ var yyAct = [...]int{
 	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, 476, 0, 15, 0, 0, 0,
+	0, 25, 0, 26, 493, 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,
@@ -607,7 +614,7 @@ var yyAct = [...]int{
 	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, 457, 14, 0, 25, 0, 26, 0,
+	21, 13, 12, 474, 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,
@@ -617,7 +624,7 @@ var yyAct = [...]int{
 	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, 420, 20, 66, 67, 0,
+	0, 42, 0, 0, 0, 432, 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,
@@ -675,7 +682,7 @@ var yyAct = [...]int{
 	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, 468, 0, 0, 27,
+	0, 0, 0, 0, 0, 0, 485, 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,
@@ -687,7 +694,7 @@ var yyAct = [...]int{
 	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, 512,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 534,
 	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,
@@ -700,7 +707,7 @@ var yyAct = [...]int{
 	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, 422, 0, 0, 0, 0, 27, 9, 0,
+	0, 0, 434, 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,
@@ -735,10 +742,10 @@ var yyAct = [...]int{
 	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,
+	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, 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,
@@ -750,20 +757,20 @@ var yyAct = [...]int{
 	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, 440, 49, 0, 0, 70, 0, 0, 155, 51,
+	9, 452, 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, 500, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 520, 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, 441, 0,
+	50, 0, 69, 0, 0, 0, 0, 0, 453, 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, 501, 0,
+	50, 0, 0, 331, 0, 0, 0, 0, 521, 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, 49, 42, 0, 70,
@@ -798,12 +805,12 @@ var yyAct = [...]int{
 	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, 419, 0, 198, 0, 199,
+	184, 0, 0, 0, 0, 431, 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,
-	418, 0, 198, 0, 199, 172, 173, 177, 179, 178,
+	430, 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,
@@ -825,7 +832,7 @@ var yyAct = [...]int{
 	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, 351, 0, 198, 490, 199,
+	184, 0, 0, 0, 0, 351, 0, 198, 510, 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,
@@ -838,11 +845,11 @@ var yyAct = [...]int{
 	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, 491, 0, 0, 0,
+	0, 0, 0, 0, 0, 184, 511, 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, 473, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 490, 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,
@@ -863,10 +870,6 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 184,
 	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, 348,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 184, 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, 198, 184, 199, 172, 173, 177, 179, 178, 191,
@@ -876,88 +879,96 @@ var yyAct = [...]int{
 	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, 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, 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, 1885, -1000, -1000, -1000, 491, 170, -1000, -1000,
-	-1000, -1000, -64, 2750, -65, -66, 3095, 3095, 3095, -60,
-	167, 3095, -1000, 3727, -75, -78, -80, -1000, -42, 3095,
-	177, 251, 238, 136, 176, 199, 196, 2969, -1000, -1000,
-	-81, -1000, 3095, -60, -60, 3095, 3095, 3095, 3095, 3095,
-	-82, 3095, -83, 3095, 3095, 3095, 3095, 3095, 3095, 3095,
-	3095, 3095, 3095, 3095, 3095, 3095, -1000, -1000, -1000, -1000,
-	-61, 48, 3907, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, 3095, -82, 3095, 3095, -83, 3095, 3095, 3095,
-	3095, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, 1945, -1000, -1000, -1000, 551, 187, -1000, -1000,
+	-1000, -1000, -63, 2810, -64, -65, 3155, 3155, 3155, -55,
+	184, 3155, -1000, 3787, -66, -69, -70, -1000, -14, 3155,
+	205, 289, 276, 179, 204, 231, 219, 3029, -1000, -1000,
+	-75, -1000, 3155, -55, -55, 3155, 3155, 3155, 3155, 3155,
+	-78, 3155, -80, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+	3155, 3155, 3155, 3155, 3155, 3155, -1000, -1000, -1000, -1000,
+	-56, 87, 3967, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, 3155, -78, 3155, 3155, -80, 3155, 3155, 3155,
+	3155, -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, 47,
-	53, -1000, 1760, 3095, 114, 3095, 3095, 3095, 45, 3907,
-	44, 13, 108, -1000, -1000, 107, -1000, 296, 86, -1000,
-	3907, -1000, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095,
-	3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095,
-	3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3076, 3095,
-	-60, 3095, 171, -1000, 3682, 11, -1000, 175, -1000, 174,
-	-1000, -46, -84, 2750, -88, 6, 248, 3006, 3095, 3095,
-	3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095,
-	-1000, -1000, 3095, -1000, -1000, -1000, 197, 197, 197, 197,
-	3547, 3095, 3907, 3095, 3907, 3907, 197, 197, 197, 197,
-	197, 197, 197, 197, 4071, 4034, 4071, 3095, -1000, -1000,
-	-1000, 173, -1000, -1000, -1000, -1000, -1000, 3502, -89, 5,
-	309, 3907, 3457, -1000, -1000, -1000, -1000, -60, -1000, 167,
-	3095, -1000, 3095, 623, 249, 3951, 4071, 3994, 4141, 739,
-	2730, 256, 256, 256, 197, 197, 197, 197, 360, 360,
-	290, 290, 290, 290, 290, 340, 340, 340, 340, 3862,
-	3095, 4108, 307, -1000, -1000, 3772, 68, -1000, 289, 1635,
-	-1000, -1000, -90, -48, -55, 3095, -1000, 3095, -1000, -1000,
-	4071, 3095, 4071, 4071, 4071, 4071, 4071, 4071, 4071, 4071,
-	4071, 4071, 4071, 4071, 3412, -1000, 3367, 3322, 3095, 3592,
-	-1000, 2627, 3095, 3095, 3095, 76, -1000, -1000, 3907, -1000,
-	3095, 4108, -118, -60, 78, 2504, 171, 3095, -1000, 81,
-	-68, -1000, 3277, 3232, 1510, 739, 2381, -1000, -1000, 4071,
-	-1000, -1000, -1000, -1000, 91, 4, 3907, -1000, 3, 2,
-	4108, 1, -1000, 38, -1000, -60, -92, 2874, -1000, -1000,
-	-1000, -1000, 3907, 129, -119, 306, -1000, 237, -1000, -1000,
-	14, -1000, -1000, -1000, -1000, 170, 52, -1000, 2750, 246,
-	-4, -1000, -1000, 1385, -6, 3095, -67, -1000, 144, -1000,
-	-1000, 2135, 78, -1000, 2874, -135, 305, -1000, -1000, 3817,
-	-60, -93, 1260, -1000, -94, -50, 245, 81, 50, -1000,
-	-1000, -1000, 170, -1000, -1000, -1000, 2010, -7, -1000, -125,
-	-1000, 3095, 82, -69, -8, 141, -1000, -1000, -1000, -126,
-	-127, -1000, 2874, 2914, -1000, 2874, -11, 83, -1000, -51,
-	81, -1000, 151, -1000, -1000, 2010, -1000, 2258, 3637, -1000,
-	-1000, -1000, -1000, -1000, -13, 1135, 2135, -1000, -1000, 3907,
-	-60, -95, -128, -1000, 180, -1000, 1010, -1000, -1000, 263,
-	-1000, -1000, -1000, -1000, 2010, -1000, -39, -1000, -1000, 2874,
-	-1000, -130, 83, -1000, 885, 3095, 760, 2010, -1000, -131,
-	-52, -1000, -1000, 3907, -40, -1000, -1000, -1000, 635, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 82,
+	83, -1000, 1820, 3155, 158, 3155, 3155, 3155, 80, 3967,
+	56, 55, 110, -1000, -1000, 109, -1000, 308, 108, -1000,
+	3967, -1000, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+	3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+	3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3136, 3155,
+	-55, 3155, 192, -1000, 3742, 54, -1000, 196, -1000, 194,
+	-1000, -44, -81, 2810, -82, 52, 288, 3066, 3155, 3155,
+	3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+	-1000, -1000, 3155, -1000, -1000, -1000, 242, 242, 242, 242,
+	3607, 3155, 3967, 3155, 3967, 3967, 242, 242, 242, 242,
+	242, 242, 242, 242, 4091, 536, 4091, 3155, -1000, -1000,
+	-1000, 193, -1000, -1000, -1000, -1000, -1000, 3562, -83, 51,
+	337, 3967, 3517, -1000, -1000, -1000, -1000, -55, -1000, 184,
+	3155, -1000, 3155, 683, 4162, 4011, 4091, 4054, 4195, 799,
+	367, 304, 304, 304, 242, 242, 242, 242, 313, 313,
+	291, 291, 291, 291, 291, 249, 249, 249, 249, 3922,
+	3155, 4128, 321, -1000, -1000, 3832, 68, -1000, 307, 1695,
+	-1000, -1000, -84, -46, -1000, 3155, -1000, 3155, -1000, -1000,
+	4091, 3155, 4091, 4091, 4091, 4091, 4091, 4091, 4091, 4091,
+	4091, 4091, 4091, 4091, 3472, -1000, 3427, 3382, 3155, 3652,
+	-1000, 2687, 3155, 3155, 3155, 74, -1000, -1000, 3967, -1000,
+	3155, 4128, -94, -55, 78, 2564, 192, 3155, -1000, 81,
+	-1000, 172, 3337, 3292, 1570, 799, 2441, -1000, -1000, 4091,
+	-1000, -1000, -1000, -1000, 91, 50, 3967, -1000, 49, 47,
+	4128, 45, -1000, 38, -1000, -55, -88, 2934, -1000, -1000,
+	-1000, -1000, 3967, 142, -118, 318, -1000, 275, -1000, -1000,
+	14, -1000, -1000, -1000, -1000, 187, -62, 84, -1000, -1000,
+	178, 208, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	2810, 287, 13, -1000, -1000, 1445, 11, 3155, -41, -1000,
+	168, -1000, -1000, 2195, 78, -1000, 2934, -130, 312, -1000,
+	-1000, 3877, -55, -89, 1320, -1000, -90, -47, 284, 81,
+	89, -1000, -1000, -1000, 187, -1000, 103, -1000, 306, -1000,
+	-1000, -1000, -1000, 2070, 10, -1000, -119, -1000, 3155, 77,
+	-67, -4, 156, -1000, -1000, -1000, -123, -124, -1000, 2934,
+	2974, -1000, 2934, -6, 117, -1000, -53, 81, -1000, 182,
+	-1000, -1000, -1000, 178, 3155, 2070, -1000, 2318, 3697, -1000,
+	-1000, -1000, -1000, -1000, -7, 1195, 2195, -1000, -1000, 3967,
+	-55, -92, -125, -1000, 226, -1000, 1070, -1000, -1000, 305,
+	-1000, 3967, -1000, -1000, -1000, -1000, 2070, -1000, -8, -1000,
+	-1000, 2934, -1000, -127, 117, -1000, 945, 3155, 820, 2070,
+	-1000, -128, -54, -1000, -1000, 3967, -11, -1000, -1000, -1000,
+	695, -1000,
 }
 var yyPgo = [...]int{
 
-	0, 278, 415, 407, 406, 405, 403, 13, 401, 4,
-	400, 20, 399, 1, 384, 320, 319, 383, 381, 6,
-	11, 379, 378, 9, 0, 377, 376, 31, 51, 375,
-	374, 373, 371, 370, 12, 369, 367, 365, 14, 327,
-	364, 26, 363, 25, 362, 24, 360, 16, 10, 2,
-	8, 359, 357, 3, 356, 15, 352, 351, 350, 348,
-	347, 330, 325, 321, 5,
+	0, 316, 458, 457, 452, 451, 450, 12, 448, 4,
+	446, 23, 445, 1, 444, 373, 371, 443, 442, 8,
+	14, 441, 440, 9, 0, 439, 434, 31, 51, 433,
+	432, 431, 430, 429, 24, 426, 424, 423, 13, 351,
+	422, 28, 401, 29, 399, 25, 397, 27, 11, 2,
+	10, 394, 393, 3, 392, 21, 390, 386, 384, 383,
+	16, 382, 380, 379, 15, 377, 6, 360, 352, 348,
+	347, 5,
 }
 var yyR1 = [...]int{
 
-	0, 60, 61, 61, 61, 61, 61, 61, 61, 61,
-	61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
-	61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
-	61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
-	61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
-	61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
-	61, 61, 61, 61, 61, 61, 61, 61, 61, 62,
-	62, 62, 62, 62, 62, 62, 5, 5, 8, 8,
+	0, 67, 68, 68, 68, 68, 68, 68, 68, 68,
+	68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+	68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+	68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+	68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+	68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+	68, 68, 68, 68, 68, 68, 68, 68, 68, 69,
+	69, 69, 69, 69, 69, 69, 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,
@@ -965,21 +976,23 @@ 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, 64, 64, 36, 36, 48, 48, 48, 48,
+	38, 38, 71, 71, 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, 63, 63, 15, 15,
-	14, 14, 1, 1, 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,
+	44, 44, 45, 46, 46, 47, 70, 70, 15, 15,
+	14, 14, 1, 1, 60, 60, 61, 62, 62, 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, 25, 24, 24,
-	39, 39, 26, 27, 28, 28, 28,
+	25, 25, 25, 25, 25, 24, 24, 39, 39, 26,
+	27, 28, 28, 28,
 }
 var yyR2 = [...]int{
 
@@ -1001,29 +1014,31 @@ var yyR2 = [...]int{
 	5, 4, 1, 1, 1, 4, 1, 2, 4, 3,
 	1, 0, 1, 3, 1, 3, 1, 4, 2, 6,
 	4, 1, 4, 3, 1, 1, 3, 1, 1, 3,
-	3, 1, 1, 1, 3, 1, 0, 1, 5, 4,
-	1, 2, 1, 1, 10, 1, 0, 1, 3, 4,
-	6, 0, 1, 0, 1, 0, 1, 0, 1, 1,
-	2, 1, 1, 1, 0, 2, 3, 4, 2, 3,
-	3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-	3, 2, 2, 2, 2, 3, 3, 3, 3, 3,
-	3, 3, 3, 3, 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, 1, 1, 1, 3, 1, 0, 1, 6, 5,
+	1, 2, 1, 1, 2, 0, 3, 1, 1, 1,
+	2, 1, 1, 1, 1, 1, 1, 3, 1, 1,
+	3, 10, 1, 0, 1, 3, 4, 6, 0, 1,
+	0, 1, 0, 1, 0, 1, 1, 2, 1, 1,
+	1, 0, 2, 3, 4, 2, 3, 3, 3, 3,
+	3, 3, 3, 3, 3, 3, 3, 3, 2, 2,
+	2, 2, 3, 3, 3, 3, 3, 3, 3, 3,
+	3, 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, -60, -10, -6, -11, -16, 4, 154, -15, 160,
+	-1000, -67, -10, -6, -11, -16, 4, 154, -15, 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, -62, -61, 76, 77, 78, 79,
+	165, -5, -24, 86, -69, -68, 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,
@@ -1052,35 +1067,38 @@ 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, -63, 9, 105, 163, 9, 17, 161, 162,
-	160, 161, -24, -24, -13, -24, 163, 163, 163, -24,
+	31, -24, -70, 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, 161, 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, -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, -13, 159, 163, -24, -64,
+	30, -9, 135, 136, -7, 157, 154, -60, 161, -61,
+	-62, -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, -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, -13, 159, 163, -24, -71,
 	31, 159, 161, 159, 107, -13, 163, 163, -50, -24,
 	37, 134, -49, 159, -58, -9, -13, 160, -19, 88,
-	-36, -11, 31, -64, -13, 159, 102, -53, -27, 162,
-	163, 88, 35, 161, -13, 17, -13, -13, 159, -49,
-	163, -9, 161, -24, 100, 163, 160, 159, -13, 161,
+	-66, -24, -36, -11, 31, -71, -13, 159, 102, -53,
+	-27, 162, 163, 88, 35, 161, -13, 17, -13, -13,
+	159, -49, 163, -9, 161, -24, 100, 163, 160, 159,
+	-13, 161,
 }
 var yyDef = [...]int{
 
 	85, -2, 1, 84, 86, 87, 0, 0, 90, 92,
-	97, 98, 0, 0, 0, 0, 290, 290, 290, 0,
+	97, 98, 0, 0, 0, 0, 307, 307, 307, 0,
 	0, 0, 109, 0, 0, 0, 0, 115, 0, 0,
-	0, 0, 203, 0, 0, 133, 0, 288, 289, 190,
-	0, 293, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 220, 0, 0, 133, 0, 305, 306, 190,
+	0, 310, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 284, 0, 192, 193, 292, 294,
-	0, 0, 270, 76, 77, 69, 70, 71, 72, 73,
+	0, 0, 0, 0, 301, 0, 192, 193, 309, 311,
+	0, 0, 287, 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,
@@ -1088,45 +1106,48 @@ 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, 291,
+	80, 78, 0, 0, 0, 0, 141, 0, 0, 308,
 	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, 204, 0,
+	0, 0, 0, 92, 0, 0, 119, 0, 221, 0,
 	191, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	231, 233, 0, 218, 232, 234, 252, 253, 254, 255,
-	0, 0, 271, 0, 273, 274, 275, 276, 277, 278,
-	279, 280, 281, 282, 283, 285, 287, 0, 296, 88,
+	248, 250, 0, 235, 249, 251, 269, 270, 271, 272,
+	0, 0, 288, 0, 290, 291, 292, 293, 294, 295,
+	296, 297, 298, 299, 300, 302, 304, 0, 313, 88,
 	89, 0, 91, 96, 93, 94, 95, 0, 0, 0,
 	142, 144, 0, 103, 104, 105, 106, 0, 107, 0,
-	0, 108, 0, 235, 236, 237, 238, 239, 240, 241,
-	242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+	0, 108, 0, 252, 253, 254, 255, 256, 257, 258,
+	259, 260, 261, 262, 263, 264, 265, 266, 267, 268,
 	-2, -2, -2, -2, -2, -2, -2, -2, -2, 0,
-	0, 268, 186, 183, 185, 0, 0, 127, 0, 0,
-	117, 118, 0, 0, 0, 0, 134, 0, 137, 92,
-	216, 0, 219, 220, 221, 222, 223, 224, 225, 226,
-	227, 228, 229, 230, 0, 265, 0, 0, 0, 0,
+	0, 285, 186, 183, 185, 0, 0, 127, 0, 0,
+	117, 118, 0, 0, 195, 0, 134, 0, 137, 92,
+	233, 0, 236, 237, 238, 239, 240, 241, 242, 243,
+	244, 245, 246, 247, 0, 282, 0, 0, 0, 0,
 	79, 0, 0, 141, 0, 0, 173, 176, 179, 180,
-	0, 267, 0, 187, 0, 0, 0, 0, 120, -2,
-	0, 189, 0, 0, 0, 217, 0, 269, 272, 286,
-	295, 99, 139, 92, 0, 0, 143, 102, 149, 149,
-	266, 0, 184, 0, 156, 0, 0, 161, 114, 129,
-	92, 126, 128, 124, 0, 195, 197, 205, 202, 209,
-	0, 211, 212, 213, 81, 0, 0, 188, 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, 214, 201, 207, 206,
-	210, 82, 0, 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, 198, 0, 208, 83, 136, 140, 0, 0, 92,
+	0, 284, 0, 187, 0, 0, 0, 0, 120, -2,
+	195, 0, 0, 0, 0, 234, 0, 286, 289, 303,
+	312, 99, 139, 92, 0, 0, 143, 102, 149, 149,
+	283, 0, 184, 0, 156, 0, 0, 161, 114, 129,
+	92, 126, 128, 124, 0, 212, 214, 222, 219, 226,
+	0, 228, 229, 230, 81, 0, 0, 0, 189, 194,
+	0, 197, 198, 199, 201, 202, 203, 204, 205, 206,
+	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, 231, 218,
+	224, 223, 227, 82, 0, 188, 0, 208, 209, 200,
+	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, 215, 0,
+	225, 83, 196, 0, 0, 136, 140, 0, 0, 92,
 	152, 153, 146, 147, 0, 0, 0, 158, 163, 165,
-	0, 0, 0, 130, 0, 122, 0, 92, 215, 199,
-	101, 154, 92, 92, 151, 148, 0, 113, 167, 161,
-	170, 0, 0, 125, 0, 0, 0, 150, 172, 0,
-	0, 123, 194, 200, 0, 169, 92, 155, 0, 121,
+	0, 0, 0, 130, 0, 122, 0, 92, 232, 216,
+	207, 210, 101, 154, 92, 92, 151, 148, 0, 113,
+	167, 161, 170, 0, 0, 125, 0, 0, 0, 150,
+	172, 0, 0, 123, 211, 217, 0, 169, 92, 155,
+	0, 121,
 }
 var yyTok1 = [...]int{
 
@@ -1504,151 +1525,151 @@ yydefault:
 
 	case 1:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:238
+		//line parser.y:245
 		{
 			fmt.Println(yyDollar[1].node)
 		}
 	case 76:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:257
+		//line parser.y:264
 		{
 			yyVAL.node = Node("identifier")
 		}
 	case 77:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:258
+		//line parser.y:265
 		{
 			yyVAL.node = Node("reserved")
 		}
 	case 78:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:262
+		//line parser.y:269
 		{
 			yyVAL.node = Node("NamespaceParts").append(Node(yyDollar[1].token))
 		}
 	case 79:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:263
+		//line parser.y:270
 		{
 			yyVAL.node = yyDollar[1].node.append(Node(yyDollar[3].token))
 		}
 	case 80:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:267
+		//line parser.y:274
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 81:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:271
+		//line parser.y:278
 		{
 			yyVAL.node = Node("Name").append(yyDollar[1].node)
 		}
 	case 82:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:272
+		//line parser.y:279
 		{
 			yyVAL.node = Node("Name").append(yyDollar[2].node).attribute("FullyQualified", "true")
 		}
 	case 83:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:273
+		//line parser.y:280
 		{
 			yyVAL.node = Node("Name").append(yyDollar[3].node).attribute("Relative", "true")
 		}
 	case 84:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:277
+		//line parser.y:284
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[2].node)
 		}
 	case 85:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:278
+		//line parser.y:285
 		{
 			yyVAL.node = Node("Statements")
 		}
 	case 86:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:282
+		//line parser.y:289
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 87:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:283
+		//line parser.y:290
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 88:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:284
+		//line parser.y:291
 		{
 			yyVAL.node = yyDollar[2].node /*TODO: identifier stub, refactor it*/
 		}
 	case 89:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:285
+		//line parser.y:292
 		{
 			yyVAL.node = Node("Namespace").append(yyDollar[2].node)
 		}
 	case 90:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:286
+		//line parser.y:293
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 91:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:290
+		//line parser.y:297
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[2].node)
 		}
 	case 92:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:291
+		//line parser.y:298
 		{
 			yyVAL.node = Node("stmt")
 		}
 	case 93:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:295
+		//line parser.y:302
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 94:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:296
+		//line parser.y:303
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 95:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:297
+		//line parser.y:304
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 96:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:300
+		//line parser.y:307
 		{
 			yyVAL.node = yyDollar[2].node
 		}
 	case 97:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:301
+		//line parser.y:308
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 98:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:302
+		//line parser.y:309
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 99:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:304
+		//line parser.y:311
 		{
 			yyVAL.node = Node("While").
 				append(Node("expr").append(yyDollar[3].node)).
@@ -1656,7 +1677,7 @@ yydefault:
 		}
 	case 100:
 		yyDollar = yyS[yypt-7 : yypt+1]
-		//line parser.y:310
+		//line parser.y:317
 		{
 			yyVAL.node = Node("DoWhile").
 				append(Node("expr").append(yyDollar[5].node)).
@@ -1664,7 +1685,7 @@ yydefault:
 		}
 	case 101:
 		yyDollar = yyS[yypt-9 : yypt+1]
-		//line parser.y:316
+		//line parser.y:323
 		{
 			yyVAL.node = Node("For").
 				append(Node("expr1").append(yyDollar[3].node)).
@@ -1674,67 +1695,67 @@ yydefault:
 		}
 	case 102:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:323
+		//line parser.y:330
 		{
 			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:324
+		//line parser.y:331
 		{
 			yyVAL.node = Node("Break").append(yyDollar[2].node)
 		}
 	case 104:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:325
+		//line parser.y:332
 		{
 			yyVAL.node = Node("Continue").append(yyDollar[2].node)
 		}
 	case 105:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:326
+		//line parser.y:333
 		{
 			yyVAL.node = Node("Return").append(yyDollar[2].node)
 		}
 	case 106:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:327
+		//line parser.y:334
 		{
 			yyVAL.node = yyDollar[2].node
 		}
 	case 107:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:328
+		//line parser.y:335
 		{
 			yyVAL.node = yyDollar[2].node
 		}
 	case 108:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:329
+		//line parser.y:336
 		{
 			yyVAL.node = yyDollar[2].node
 		}
 	case 109:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:330
+		//line parser.y:337
 		{
 			yyVAL.node = Node("Echo").append(Node("InlineHtml").attribute("value", yyDollar[1].token))
 		}
 	case 110:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:331
+		//line parser.y:338
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 111:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line parser.y:333
+		//line parser.y:340
 		{
 			yyVAL.node = Node("Unset").append(yyDollar[3].node)
 		}
 	case 112:
 		yyDollar = yyS[yypt-7 : yypt+1]
-		//line parser.y:335
+		//line parser.y:342
 		{
 			yyVAL.node = Node("Foreach").
 				append(Node("expr").append(yyDollar[3].node)).
@@ -1743,7 +1764,7 @@ yydefault:
 		}
 	case 113:
 		yyDollar = yyS[yypt-9 : yypt+1]
-		//line parser.y:342
+		//line parser.y:349
 		{
 			yyVAL.node = Node("Foreach").
 				append(Node("expr").append(yyDollar[3].node)).
@@ -1753,19 +1774,19 @@ yydefault:
 		}
 	case 114:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:349
+		//line parser.y:356
 		{
 			yyVAL.node = Node("Declare").append(yyDollar[3].node).append(yyDollar[5].node)
 		}
 	case 115:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:350
+		//line parser.y:357
 		{
 			yyVAL.node = Node("")
 		}
 	case 116:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line parser.y:352
+		//line parser.y:359
 		{
 			yyVAL.node = Node("Try").
 				append(yyDollar[3].node).
@@ -1774,307 +1795,307 @@ yydefault:
 		}
 	case 117:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:358
+		//line parser.y:365
 		{
 			yyVAL.node = Node("Throw").append(yyDollar[2].node)
 		}
 	case 118:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:359
+		//line parser.y:366
 		{
 			yyVAL.node = Node("GoTo").attribute("Label", yyDollar[2].token)
 		}
 	case 119:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:360
+		//line parser.y:367
 		{
 			yyVAL.node = Node("Label").attribute("name", yyDollar[1].token)
 		}
 	case 120:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:363
+		//line parser.y:370
 		{
 			yyVAL.node = Node("CatchList")
 		}
 	case 121:
 		yyDollar = yyS[yypt-9 : yypt+1]
-		//line parser.y:365
+		//line parser.y:372
 		{
 			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:368
+		//line parser.y:375
 		{
 			yyVAL.node = Node("CatchNameList").append(yyDollar[1].node)
 		}
 	case 123:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:369
+		//line parser.y:376
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
 	case 124:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:373
+		//line parser.y:380
 		{
 			yyVAL.node = Node("")
 		}
 	case 125:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:374
+		//line parser.y:381
 		{
 			yyVAL.node = Node("Finnaly").append(yyDollar[3].node)
 		}
 	case 126:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:378
+		//line parser.y:385
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
 	case 127:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:379
+		//line parser.y:386
 		{
 			yyVAL.node = Node("ConstList").append(yyDollar[1].node)
 		}
 	case 128:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:383
+		//line parser.y:390
 		{
 			yyVAL.node = Node("Const").attribute("name", yyDollar[1].token).append(yyDollar[3].node)
 		}
 	case 129:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:387
+		//line parser.y:394
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 130:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:388
+		//line parser.y:395
 		{
 			yyVAL.node = yyDollar[2].node
 		}
 	case 131:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:393
+		//line parser.y:400
 		{
 			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:397
+		//line parser.y:404
 		{
 			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:403
+		//line parser.y:410
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 134:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:405
+		//line parser.y:412
 		{
 			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:412
+		//line parser.y:419
 		{
 			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:416
+		//line parser.y:423
 		{
 			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:422
+		//line parser.y:429
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 138:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line parser.y:424
+		//line parser.y:431
 		{
 			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:430
+		//line parser.y:437
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 140:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:431
+		//line parser.y:438
 		{
 			yyVAL.node = yyDollar[2].node
 		}
 	case 141:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:435
+		//line parser.y:442
 		{
 			yyVAL.node = Node("")
 		}
 	case 142:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:436
+		//line parser.y:443
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 143:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:439
+		//line parser.y:446
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
 	case 144:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:440
+		//line parser.y:447
 		{
 			yyVAL.node = Node("ExpressionList").append(yyDollar[1].node)
 		}
 	case 145:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:444
+		//line parser.y:451
 		{
 			yyVAL.node = yyDollar[2].node
 		}
 	case 146:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:445
+		//line parser.y:452
 		{
 			yyVAL.node = yyDollar[3].node
 		}
 	case 147:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:446
+		//line parser.y:453
 		{
 			yyVAL.node = yyDollar[2].node
 		}
 	case 148:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:447
+		//line parser.y:454
 		{
 			yyVAL.node = yyDollar[3].node
 		}
 	case 149:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:451
+		//line parser.y:458
 		{
 			yyVAL.node = Node("CaseList")
 		}
 	case 150:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:453
+		//line parser.y:460
 		{
 			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:457
+		//line parser.y:464
 		{
 			yyVAL.node = yyDollar[1].node.append(Node("Default").append(yyDollar[4].node))
 		}
 	case 154:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:468
+		//line parser.y:475
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 155:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:469
+		//line parser.y:476
 		{
 			yyVAL.node = yyDollar[2].node
 		}
 	case 156:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:473
+		//line parser.y:480
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 157:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:474
+		//line parser.y:481
 		{
 			yyVAL.node = Node("Ref").append(yyDollar[2].node)
 		}
 	case 158:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:475
+		//line parser.y:482
 		{
 			yyVAL.node = Node("List").append(yyDollar[3].node)
 		}
 	case 159:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:476
+		//line parser.y:483
 		{
 			yyVAL.node = Node("ShortList").append(yyDollar[2].node)
 		}
 	case 160:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:480
+		//line parser.y:487
 		{ /* TODO: allow single trailing comma */
 			yyVAL.node = yyDollar[1].node
 		}
 	case 161:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:484
+		//line parser.y:491
 		{
 			yyVAL.node = Node("")
 		}
 	case 162:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:485
+		//line parser.y:492
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 163:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:490
+		//line parser.y:497
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
 	case 164:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:491
+		//line parser.y:498
 		{
 			yyVAL.node = Node("ArrayPairList").append(yyDollar[1].node)
 		}
 	case 165:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:495
+		//line parser.y:502
 		{
 			yyVAL.node = Node("ArrayElement").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
 	case 166:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:496
+		//line parser.y:503
 		{
 			yyVAL.node = Node("ArrayElement").append(yyDollar[1].node)
 		}
 	case 167:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:497
+		//line parser.y:504
 		{
 			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:498
+		//line parser.y:505
 		{
 			yyVAL.node = Node("ArrayElement").append(Node("Ref").append(yyDollar[2].node))
 		}
 	case 169:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line parser.y:500
+		//line parser.y:507
 		{
 			yyVAL.node = Node("ArrayElement").
 				append(yyDollar[1].node).
@@ -2082,140 +2103,242 @@ yydefault:
 		}
 	case 170:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:506
+		//line parser.y:513
 		{
 			yyVAL.node = Node("ArrayElement").
 				append(Node("ArrayList").append(yyDollar[3].node))
 		}
 	case 171:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:513
+		//line parser.y:520
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 172:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:514
+		//line parser.y:521
 		{
 			yyVAL.node = yyDollar[2].node
 		}
 	case 173:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:518
+		//line parser.y:525
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
 	case 174:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:519
+		//line parser.y:526
 		{
 			yyVAL.node = Node("GlobalVarList").append(yyDollar[1].node)
 		}
 	case 175:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:523
+		//line parser.y:530
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 176:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:527
+		//line parser.y:534
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
 	case 177:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:528
+		//line parser.y:535
 		{
 			yyVAL.node = Node("StaticVarList").append(yyDollar[1].node)
 		}
 	case 178:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:532
+		//line parser.y:539
 		{
 			yyVAL.node = Node("StaticVariable").attribute("Name", yyDollar[1].token)
 		}
 	case 179:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:533
+		//line parser.y:540
 		{
 			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:537
+		//line parser.y:544
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
 	case 181:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:538
+		//line parser.y:545
 		{
 			yyVAL.node = Node("EchoList").append(yyDollar[1].node)
 		}
 	case 182:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:542
+		//line parser.y:549
 		{
 			yyVAL.node = Node("Echo").append(yyDollar[1].node)
 		}
 	case 183:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:546
+		//line parser.y:553
 		{
 			yyVAL.node = Node("UnsetVariablesList").append(yyDollar[1].node)
 		}
 	case 184:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:547
+		//line parser.y:554
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
 	case 185:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:551
+		//line parser.y:558
 		{
 			yyVAL.node = yyDollar[1].node
 		}
 	case 188:
-		yyDollar = yyS[yypt-5 : yypt+1]
-		//line parser.y:560
+		yyDollar = yyS[yypt-6 : yypt+1]
+		//line parser.y:568
 		{
-			yyVAL.node = yyDollar[1].node.attribute("name", yyDollar[3].token)
+			yyVAL.node = yyDollar[1].node.attribute("name", yyDollar[3].token).append(yyDollar[5].node)
 		}
 	case 189:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:561
+		yyDollar = yyS[yypt-5 : yypt+1]
+		//line parser.y:569
 		{
-			yyVAL.node = Node("Class").attribute("name", yyDollar[2].token)
+			yyVAL.node = Node("Class").attribute("name", yyDollar[2].token).append(yyDollar[4].node)
 		}
 	case 190:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:564
+		//line parser.y:573
 		{
 			yyVAL.node = Node("Class").attribute(yyDollar[1].value, "true")
 		}
 	case 191:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:565
+		//line parser.y:574
 		{
 			yyVAL.node = yyDollar[1].node.attribute(yyDollar[2].value, "true")
 		}
 	case 192:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:569
+		//line parser.y:578
 		{
 			yyVAL.value = "abstract"
 		}
 	case 193:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:570
+		//line parser.y:579
 		{
 			yyVAL.value = "final"
 		}
 	case 194:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:583
+		{
+			yyVAL.node = yyDollar[1].node.append(yyDollar[2].node)
+		}
+	case 195:
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line parser.y:584
+		{
+			yyVAL.node = Node("Stmt")
+		}
+	case 196:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:588
+		{
+			yyVAL.node = yyDollar[2].node.append(yyDollar[1].node)
+		}
+	case 197:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:592
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 198:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:593
+		{
+			yyVAL.node = Node("VarMemberModifier")
+		}
+	case 199:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:597
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 200:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:598
+		{
+			yyVAL.node = yyDollar[1].node.append(yyDollar[2].node)
+		}
+	case 201:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:601
+		{
+			yyVAL.node = Node("PublicMemberModifier")
+		}
+	case 202:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:602
+		{
+			yyVAL.node = Node("ProtectedMemberModifier")
+		}
+	case 203:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:603
+		{
+			yyVAL.node = Node("PrivateMemberModifier")
+		}
+	case 204:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:604
+		{
+			yyVAL.node = Node("StaticMemberModifier")
+		}
+	case 205:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:605
+		{
+			yyVAL.node = Node("AbstractMemberModifier")
+		}
+	case 206:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:606
+		{
+			yyVAL.node = Node("FinalMemberModifier")
+		}
+	case 207:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:610
+		{
+			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
+		}
+	case 208:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:611
+		{
+			yyVAL.node = Node("PropertyList").append(yyDollar[1].node)
+		}
+	case 209:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:614
+		{
+			yyVAL.node = Node("Property").attribute("name", yyDollar[1].token)
+		}
+	case 210:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:615
+		{
+			yyVAL.node = Node("Property").attribute("name", yyDollar[1].token).append(Node("Default").append(yyDollar[3].node))
+		}
+	case 211:
 		yyDollar = yyS[yypt-10 : yypt+1]
-		//line parser.y:575
+		//line parser.y:620
 		{
 			yyVAL.node = Node("Function").
 				attribute("name", yyDollar[3].token).
@@ -2224,33 +2347,33 @@ yydefault:
 				append(yyDollar[7].node).
 				append(yyDollar[9].node)
 		}
-	case 195:
+	case 212:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:586
+		//line parser.y:631
 		{
 			yyVAL.node = yyDollar[1].node
 		}
-	case 196:
+	case 213:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:587
+		//line parser.y:632
 		{
 			yyVAL.node = Node("Parameter list")
 		}
-	case 197:
+	case 214:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:590
+		//line parser.y:635
 		{
 			yyVAL.node = Node("Parameter list").append(yyDollar[1].node)
 		}
-	case 198:
+	case 215:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:591
+		//line parser.y:636
 		{
 			yyVAL.node = yyDollar[1].node.append(yyDollar[3].node)
 		}
-	case 199:
+	case 216:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:595
+		//line parser.y:640
 		{
 			yyVAL.node = Node("Parameter").
 				append(yyDollar[1].node).
@@ -2258,9 +2381,9 @@ yydefault:
 				attribute("is_variadic", yyDollar[3].value).
 				attribute("var", yyDollar[4].token)
 		}
-	case 200:
+	case 217:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line parser.y:603
+		//line parser.y:648
 		{
 			yyVAL.node = Node("Parameter").
 				append(yyDollar[1].node).
@@ -2269,580 +2392,580 @@ yydefault:
 				attribute("var", yyDollar[4].token).
 				append(yyDollar[6].node)
 		}
-	case 201:
+	case 218:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:614
+		//line parser.y:659
 		{
 			yyVAL.node = Node("No type")
 		}
-	case 202:
+	case 219:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:615
+		//line parser.y:660
 		{
 			yyVAL.node = yyDollar[1].node
 		}
-	case 203:
+	case 220:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:619
+		//line parser.y:664
 		{
 			yyVAL.value = "false"
 		}
-	case 204:
+	case 221:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:620
+		//line parser.y:665
 		{
 			yyVAL.value = "true"
 		}
-	case 205:
+	case 222:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:624
+		//line parser.y:669
 		{
 			yyVAL.value = "false"
 		}
-	case 206:
+	case 223:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:625
+		//line parser.y:670
 		{
 			yyVAL.value = "true"
 		}
-	case 207:
+	case 224:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:629
+		//line parser.y:674
 		{
 			yyVAL.value = "false"
 		}
-	case 208:
+	case 225:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:630
+		//line parser.y:675
 		{
 			yyVAL.value = "true"
 		}
-	case 209:
+	case 226:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:634
+		//line parser.y:679
 		{
 			yyVAL.node = yyDollar[1].node
 		}
-	case 210:
+	case 227:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:635
+		//line parser.y:680
 		{
 			yyVAL.node = yyDollar[2].node
 			yyVAL.node.attribute("nullable", "true")
 		}
-	case 211:
+	case 228:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:639
+		//line parser.y:684
 		{
 			yyVAL.node = yyDollar[1].node
 		}
-	case 212:
+	case 229:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:640
+		//line parser.y:685
 		{
 			yyVAL.node = Node("array type")
 		}
-	case 213:
+	case 230:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:641
+		//line parser.y:686
 		{
 			yyVAL.node = Node("callable type")
 		}
-	case 214:
+	case 231:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:645
+		//line parser.y:690
 		{
 			yyVAL.node = Node("void")
 		}
-	case 215:
+	case 232:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:646
+		//line parser.y:691
 		{
 			yyVAL.node = yyDollar[2].node
 		}
-	case 216:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:650
-		{
-			yyVAL.node = Node("Assign").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 217:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:651
-		{
-			yyVAL.node = Node("AssignRef").append(yyDollar[1].node).append(yyDollar[4].node)
-		}
-	case 218:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:652
-		{
-			yyVAL.node = Node("Clone").append(yyDollar[2].node)
-		}
-	case 219:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:653
-		{
-			yyVAL.node = Node("AssignAdd").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 220:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:654
-		{
-			yyVAL.node = Node("AssignSub").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 221:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:655
-		{
-			yyVAL.node = Node("AssignMul").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 222:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:656
-		{
-			yyVAL.node = Node("AssignPow").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 223:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:657
-		{
-			yyVAL.node = Node("AssignDiv").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 224:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:658
-		{
-			yyVAL.node = Node("AssignConcat").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 225:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:659
-		{
-			yyVAL.node = Node("AssignMod").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 226:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:660
-		{
-			yyVAL.node = Node("AssignAnd").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 227:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:661
-		{
-			yyVAL.node = Node("AssignOr").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 228:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:662
-		{
-			yyVAL.node = Node("AssignXor").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 229:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:663
-		{
-			yyVAL.node = Node("AssignShiftLeft").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 230:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:664
-		{
-			yyVAL.node = Node("AssignShiftRight").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 231:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:665
-		{
-			yyVAL.node = Node("PostIncrement").append(yyDollar[1].node)
-		}
-	case 232:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:666
-		{
-			yyVAL.node = Node("PreIncrement").append(yyDollar[2].node)
-		}
 	case 233:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:667
-		{
-			yyVAL.node = Node("PostDecrement").append(yyDollar[1].node)
-		}
-	case 234:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:668
-		{
-			yyVAL.node = Node("PreDecrement").append(yyDollar[2].node)
-		}
-	case 235:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:669
-		{
-			yyVAL.node = Node("Or").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 236:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:670
-		{
-			yyVAL.node = Node("And").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 237:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:671
-		{
-			yyVAL.node = Node("Or").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 238:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:672
-		{
-			yyVAL.node = Node("And").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 239:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:673
-		{
-			yyVAL.node = Node("Xor").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 240:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:674
-		{
-			yyVAL.node = Node("BitwiseOr").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 241:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:675
-		{
-			yyVAL.node = Node("BitwiseAnd").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 242:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:676
-		{
-			yyVAL.node = Node("BitwiseXor").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 243:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:677
-		{
-			yyVAL.node = Node("Concat").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 244:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:678
-		{
-			yyVAL.node = Node("Add").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 245:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:679
-		{
-			yyVAL.node = Node("Sub").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 246:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:680
-		{
-			yyVAL.node = Node("Mul").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 247:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:681
-		{
-			yyVAL.node = Node("Pow").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 248:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:682
-		{
-			yyVAL.node = Node("Div").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 249:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:683
-		{
-			yyVAL.node = Node("Mod").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 250:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:684
-		{
-			yyVAL.node = Node("ShiftLeft").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 251:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:685
-		{
-			yyVAL.node = Node("ShiftRight").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 252:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:686
-		{
-			yyVAL.node = Node("UnaryPlus").append(yyDollar[2].node)
-		}
-	case 253:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:687
-		{
-			yyVAL.node = Node("UnaryMinus").append(yyDollar[2].node)
-		}
-	case 254:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:688
-		{
-			yyVAL.node = Node("BooleanNot").append(yyDollar[2].node)
-		}
-	case 255:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:689
-		{
-			yyVAL.node = Node("BitwiseNot").append(yyDollar[2].node)
-		}
-	case 256:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:690
-		{
-			yyVAL.node = Node("Identical").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 257:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:691
-		{
-			yyVAL.node = Node("NotIdentical").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 258:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:692
-		{
-			yyVAL.node = Node("Equal").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 259:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:693
-		{
-			yyVAL.node = Node("NotEqual").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 260:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line parser.y:694
-		{
-			yyVAL.node = Node("Spaceship").append(yyDollar[1].node).append(yyDollar[3].node)
-		}
-	case 261:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:695
 		{
-			yyVAL.node = Node("Smaller").append(yyDollar[1].node).append(yyDollar[3].node)
+			yyVAL.node = Node("Assign").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 262:
-		yyDollar = yyS[yypt-3 : yypt+1]
+	case 234:
+		yyDollar = yyS[yypt-4 : yypt+1]
 		//line parser.y:696
 		{
-			yyVAL.node = Node("SmallerOrEqual").append(yyDollar[1].node).append(yyDollar[3].node)
+			yyVAL.node = Node("AssignRef").append(yyDollar[1].node).append(yyDollar[4].node)
 		}
-	case 263:
-		yyDollar = yyS[yypt-3 : yypt+1]
+	case 235:
+		yyDollar = yyS[yypt-2 : yypt+1]
 		//line parser.y:697
 		{
-			yyVAL.node = Node("Greater").append(yyDollar[1].node).append(yyDollar[3].node)
+			yyVAL.node = Node("Clone").append(yyDollar[2].node)
 		}
-	case 264:
+	case 236:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:698
 		{
-			yyVAL.node = Node("GreaterOrEqual").append(yyDollar[1].node).append(yyDollar[3].node)
+			yyVAL.node = Node("AssignAdd").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 265:
+	case 237:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:699
 		{
-			yyVAL.node = yyDollar[2].node
+			yyVAL.node = Node("AssignSub").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 266:
-		yyDollar = yyS[yypt-5 : yypt+1]
+	case 238:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:700
 		{
-			yyVAL.node = Node("Ternary").append(yyDollar[1].node).append(yyDollar[3].node).append(yyDollar[5].node)
+			yyVAL.node = Node("AssignMul").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 267:
-		yyDollar = yyS[yypt-4 : yypt+1]
+	case 239:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:701
 		{
-			yyVAL.node = Node("Ternary").append(yyDollar[1].node).append(yyDollar[4].node)
+			yyVAL.node = Node("AssignPow").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 268:
+	case 240:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:702
 		{
-			yyVAL.node = Node("Coalesce").append(yyDollar[1].node).append(yyDollar[3].node)
+			yyVAL.node = Node("AssignDiv").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 269:
-		yyDollar = yyS[yypt-4 : yypt+1]
+	case 241:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:703
 		{
-			yyVAL.node = Node("Empty").append(yyDollar[3].node)
+			yyVAL.node = Node("AssignConcat").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 270:
-		yyDollar = yyS[yypt-2 : yypt+1]
+	case 242:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:704
 		{
-			yyVAL.node = Node("Include").append(yyDollar[2].node)
+			yyVAL.node = Node("AssignMod").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 271:
-		yyDollar = yyS[yypt-2 : yypt+1]
+	case 243:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:705
 		{
-			yyVAL.node = Node("IncludeOnce").append(yyDollar[2].node)
+			yyVAL.node = Node("AssignAnd").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 272:
-		yyDollar = yyS[yypt-4 : yypt+1]
+	case 244:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:706
 		{
-			yyVAL.node = Node("Eval").append(yyDollar[3].node)
+			yyVAL.node = Node("AssignOr").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 273:
-		yyDollar = yyS[yypt-2 : yypt+1]
+	case 245:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:707
 		{
-			yyVAL.node = Node("Require").append(yyDollar[2].node)
+			yyVAL.node = Node("AssignXor").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 274:
-		yyDollar = yyS[yypt-2 : yypt+1]
+	case 246:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:708
 		{
-			yyVAL.node = Node("RequireOnce").append(yyDollar[2].node)
+			yyVAL.node = Node("AssignShiftLeft").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 275:
-		yyDollar = yyS[yypt-2 : yypt+1]
+	case 247:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:709
 		{
-			yyVAL.node = Node("CastInt").append(yyDollar[2].node)
+			yyVAL.node = Node("AssignShiftRight").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 276:
+	case 248:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		//line parser.y:710
 		{
-			yyVAL.node = Node("CastDouble").append(yyDollar[2].node)
+			yyVAL.node = Node("PostIncrement").append(yyDollar[1].node)
 		}
-	case 277:
+	case 249:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		//line parser.y:711
 		{
-			yyVAL.node = Node("CastString").append(yyDollar[2].node)
+			yyVAL.node = Node("PreIncrement").append(yyDollar[2].node)
 		}
-	case 278:
+	case 250:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		//line parser.y:712
 		{
-			yyVAL.node = Node("CastArray").append(yyDollar[2].node)
+			yyVAL.node = Node("PostDecrement").append(yyDollar[1].node)
 		}
-	case 279:
+	case 251:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		//line parser.y:713
 		{
-			yyVAL.node = Node("CastObject").append(yyDollar[2].node)
+			yyVAL.node = Node("PreDecrement").append(yyDollar[2].node)
 		}
-	case 280:
-		yyDollar = yyS[yypt-2 : yypt+1]
+	case 252:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:714
 		{
-			yyVAL.node = Node("CastBool").append(yyDollar[2].node)
+			yyVAL.node = Node("Or").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 281:
-		yyDollar = yyS[yypt-2 : yypt+1]
+	case 253:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:715
 		{
-			yyVAL.node = Node("CastUnset").append(yyDollar[2].node)
+			yyVAL.node = Node("And").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 282:
-		yyDollar = yyS[yypt-2 : yypt+1]
+	case 254:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:716
 		{
-			yyVAL.node = Node("Silence").append(yyDollar[2].node)
+			yyVAL.node = Node("Or").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 283:
-		yyDollar = yyS[yypt-2 : yypt+1]
+	case 255:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:717
+		{
+			yyVAL.node = Node("And").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 256:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:718
 		{
-			yyVAL.node = Node("Print").append(yyDollar[2].node)
+			yyVAL.node = Node("Xor").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 284:
-		yyDollar = yyS[yypt-1 : yypt+1]
+	case 257:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:719
 		{
-			yyVAL.node = Node("Yield")
+			yyVAL.node = Node("BitwiseOr").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
-	case 285:
-		yyDollar = yyS[yypt-2 : yypt+1]
+	case 258:
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line parser.y:720
 		{
-			yyVAL.node = Node("Yield").append(yyDollar[2].node)
+			yyVAL.node = Node("BitwiseAnd").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 259:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:721
+		{
+			yyVAL.node = Node("BitwiseXor").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 260:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:722
+		{
+			yyVAL.node = Node("Concat").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 261:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:723
+		{
+			yyVAL.node = Node("Add").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 262:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:724
+		{
+			yyVAL.node = Node("Sub").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 263:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:725
+		{
+			yyVAL.node = Node("Mul").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 264:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:726
+		{
+			yyVAL.node = Node("Pow").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 265:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:727
+		{
+			yyVAL.node = Node("Div").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 266:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:728
+		{
+			yyVAL.node = Node("Mod").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 267:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:729
+		{
+			yyVAL.node = Node("ShiftLeft").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 268:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:730
+		{
+			yyVAL.node = Node("ShiftRight").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 269:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:731
+		{
+			yyVAL.node = Node("UnaryPlus").append(yyDollar[2].node)
+		}
+	case 270:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:732
+		{
+			yyVAL.node = Node("UnaryMinus").append(yyDollar[2].node)
+		}
+	case 271:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:733
+		{
+			yyVAL.node = Node("BooleanNot").append(yyDollar[2].node)
+		}
+	case 272:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:734
+		{
+			yyVAL.node = Node("BitwiseNot").append(yyDollar[2].node)
+		}
+	case 273:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:735
+		{
+			yyVAL.node = Node("Identical").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 274:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:736
+		{
+			yyVAL.node = Node("NotIdentical").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 275:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:737
+		{
+			yyVAL.node = Node("Equal").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 276:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:738
+		{
+			yyVAL.node = Node("NotEqual").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 277:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:739
+		{
+			yyVAL.node = Node("Spaceship").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 278:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:740
+		{
+			yyVAL.node = Node("Smaller").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 279:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:741
+		{
+			yyVAL.node = Node("SmallerOrEqual").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 280:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:742
+		{
+			yyVAL.node = Node("Greater").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 281:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:743
+		{
+			yyVAL.node = Node("GreaterOrEqual").append(yyDollar[1].node).append(yyDollar[3].node)
+		}
+	case 282:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:744
+		{
+			yyVAL.node = yyDollar[2].node
+		}
+	case 283:
+		yyDollar = yyS[yypt-5 : yypt+1]
+		//line parser.y:745
+		{
+			yyVAL.node = Node("Ternary").append(yyDollar[1].node).append(yyDollar[3].node).append(yyDollar[5].node)
+		}
+	case 284:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:746
+		{
+			yyVAL.node = Node("Ternary").append(yyDollar[1].node).append(yyDollar[4].node)
+		}
+	case 285:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line parser.y:747
+		{
+			yyVAL.node = Node("Coalesce").append(yyDollar[1].node).append(yyDollar[3].node)
 		}
 	case 286:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:721
+		//line parser.y:748
 		{
-			yyVAL.node = Node("Yield").append(yyDollar[2].node).append(yyDollar[4].node)
+			yyVAL.node = Node("Empty").append(yyDollar[3].node)
 		}
 	case 287:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:722
+		//line parser.y:749
 		{
-			yyVAL.node = Node("YieldFrom").append(yyDollar[2].node)
+			yyVAL.node = Node("Include").append(yyDollar[2].node)
 		}
 	case 288:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:726
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:750
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("IncludeOnce").append(yyDollar[2].node)
 		}
 	case 289:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:727
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:751
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("Eval").append(yyDollar[3].node)
 		}
 	case 290:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line parser.y:731
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:752
 		{
-			yyVAL.node = Node("")
+			yyVAL.node = Node("Require").append(yyDollar[2].node)
 		}
 	case 291:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:732
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:753
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("RequireOnce").append(yyDollar[2].node)
 		}
 	case 292:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:736
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:754
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("CastInt").append(yyDollar[2].node)
 		}
 	case 293:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:740
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:755
 		{
-			yyVAL.node = yyDollar[1].node
+			yyVAL.node = Node("CastDouble").append(yyDollar[2].node)
 		}
 	case 294:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line parser.y:744
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:756
 		{
-			yyVAL.node = Node("Variable").attribute("name", yyDollar[1].token)
+			yyVAL.node = Node("CastString").append(yyDollar[2].node)
 		}
 	case 295:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line parser.y:745
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:757
 		{
-			yyVAL.node = yyDollar[3].node
+			yyVAL.node = Node("CastArray").append(yyDollar[2].node)
 		}
 	case 296:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line parser.y:746
+		//line parser.y:758
+		{
+			yyVAL.node = Node("CastObject").append(yyDollar[2].node)
+		}
+	case 297:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:759
+		{
+			yyVAL.node = Node("CastBool").append(yyDollar[2].node)
+		}
+	case 298:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:760
+		{
+			yyVAL.node = Node("CastUnset").append(yyDollar[2].node)
+		}
+	case 299:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:761
+		{
+			yyVAL.node = Node("Silence").append(yyDollar[2].node)
+		}
+	case 300:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:763
+		{
+			yyVAL.node = Node("Print").append(yyDollar[2].node)
+		}
+	case 301:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:764
+		{
+			yyVAL.node = Node("Yield")
+		}
+	case 302:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:765
+		{
+			yyVAL.node = Node("Yield").append(yyDollar[2].node)
+		}
+	case 303:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:766
+		{
+			yyVAL.node = Node("Yield").append(yyDollar[2].node).append(yyDollar[4].node)
+		}
+	case 304:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:767
+		{
+			yyVAL.node = Node("YieldFrom").append(yyDollar[2].node)
+		}
+	case 305:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:771
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 306:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:772
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 307:
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line parser.y:776
+		{
+			yyVAL.node = Node("")
+		}
+	case 308:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:777
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 309:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:781
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 310:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:785
+		{
+			yyVAL.node = yyDollar[1].node
+		}
+	case 311:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line parser.y:789
+		{
+			yyVAL.node = Node("Variable").attribute("name", yyDollar[1].token)
+		}
+	case 312:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line parser.y:790
+		{
+			yyVAL.node = yyDollar[3].node
+		}
+	case 313:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line parser.y:791
 		{
 			yyVAL.node = Node("Variable").append(yyDollar[2].node)
 		}
diff --git a/parser.y b/parser.y
index ad3b54f..232bdb0 100644
--- a/parser.y
+++ b/parser.y
@@ -229,6 +229,13 @@ func (n node) attribute(key string, value string) node {
 %type <node> catch_list
 %type <node> catch_name_list
 %type <node> finally_statement
+%type <node> class_statement_list
+%type <node> class_statement
+%type <node> variable_modifiers
+%type <node> non_empty_member_modifiers
+%type <node> member_modifier
+%type <node> property_list
+%type <node> property
 
 %%
 
@@ -557,9 +564,11 @@ possible_comma:
 ;
 
 class_declaration_statement:
-        class_modifiers T_CLASS T_STRING '{' '}'        { $$ = $1.attribute("name", $3) }
-    |   T_CLASS T_STRING '{' '}'                        { $$ = Node("Class").attribute("name", $2) }
+        class_modifiers T_CLASS T_STRING '{' class_statement_list '}'
+                                                        { $$ = $1.attribute("name", $3).append($5) }
+    |   T_CLASS T_STRING '{' class_statement_list '}'   { $$ = Node("Class").attribute("name", $2).append($4) }
 ;
+
 class_modifiers:
         class_modifier                                  { $$ = Node("Class").attribute($1, "true") }
     |   class_modifiers class_modifier                  { $$ = $1.attribute($2, "true") }
@@ -570,6 +579,42 @@ class_modifier:
     |   T_FINAL                                         { $$ = "final" }
 ;
 
+class_statement_list:
+        class_statement_list class_statement            { $$ = $1.append($2) }
+    |   /* empty */                                     { $$ = Node("Stmt") }
+;
+
+class_statement:
+        variable_modifiers property_list ';'            { $$ = $2.append($1) }
+;
+
+variable_modifiers:
+        non_empty_member_modifiers                      { $$ = $1; }
+    |   T_VAR                                           { $$ = Node("VarMemberModifier") }
+;
+
+non_empty_member_modifiers:
+        member_modifier	                                { $$ = $1; }
+    |   non_empty_member_modifiers member_modifier      { $$ = $1.append($2) }
+;
+member_modifier:
+        T_PUBLIC                                        { $$ = Node("PublicMemberModifier"); }
+    |   T_PROTECTED                                     { $$ = Node("ProtectedMemberModifier"); }
+    |   T_PRIVATE                                       { $$ = Node("PrivateMemberModifier"); }
+    |   T_STATIC                                        { $$ = Node("StaticMemberModifier"); }
+    |   T_ABSTRACT                                      { $$ = Node("AbstractMemberModifier"); }
+    |   T_FINAL                                         { $$ = Node("FinalMemberModifier"); }
+;
+
+property_list:
+        property_list ',' property                      { $$ = $1.append($3) }
+    |   property                                        { $$ = Node("PropertyList").append($1) }
+;
+property:
+        T_VARIABLE                                      { $$ = Node("Property").attribute("name", $1) }
+    |   T_VARIABLE '=' expr                             { $$ = Node("Property").attribute("name", $1).append(Node("Default").append($3)) }
+;
+
 function_declaration_statement:
     T_FUNCTION returns_ref T_STRING '(' parameter_list ')' return_type '{' inner_statement_list '}'
         {
@@ -752,9 +797,10 @@ simple_variable:
 
 const src = `<?php
 
-throw $exception;
-goto test;
-test:
+abstract class test {
+    public static $a ,$b = $c;
+}
+
 `
 
 func main() {