From dc7aa7302d8e06828baf00eed2bc794571ef3736 Mon Sep 17 00:00:00 2001
From: z7zmey <z7zmey@gmail.com>
Date: Sun, 29 Dec 2019 16:36:56 +0200
Subject: [PATCH] [#82] property type

---
 node/stmt/n_property_list.go        |   10 +-
 node/stmt/t_property_list_test.go   |  107 +++
 node/stmt/t_visitor_test.go         |    3 +-
 php5/php5.go                        |    2 +-
 php5/php5.y                         |    2 +-
 php7/php7.go                        | 1138 ++++++++++++++-------------
 php7/php7.y                         |   10 +-
 printer/printer.go                  |    6 +
 printer/printer_parsed_php7_test.go |    2 +-
 printer/printer_test.go             |    9 +-
 10 files changed, 715 insertions(+), 574 deletions(-)

diff --git a/node/stmt/n_property_list.go b/node/stmt/n_property_list.go
index fd76373..b542c12 100644
--- a/node/stmt/n_property_list.go
+++ b/node/stmt/n_property_list.go
@@ -12,14 +12,16 @@ type PropertyList struct {
 	FreeFloating freefloating.Collection
 	Position     *position.Position
 	Modifiers    []node.Node
+	Type         node.Node
 	Properties   []node.Node
 }
 
 // NewPropertyList node constructor
-func NewPropertyList(Modifiers []node.Node, Properties []node.Node) *PropertyList {
+func NewPropertyList(Modifiers []node.Node, Type node.Node, Properties []node.Node) *PropertyList {
 	return &PropertyList{
 		FreeFloating: nil,
 		Modifiers:    Modifiers,
+		Type:         Type,
 		Properties:   Properties,
 	}
 }
@@ -60,6 +62,12 @@ func (n *PropertyList) Walk(v walker.Visitor) {
 		v.LeaveChildList("Modifiers", n)
 	}
 
+	if n.Type != nil {
+		v.EnterChildNode("Type", n)
+		n.Type.Walk(v)
+		v.LeaveChildNode("Type", n)
+	}
+
 	if n.Properties != nil {
 		v.EnterChildList("Properties", n)
 		for _, nn := range n.Properties {
diff --git a/node/stmt/t_property_list_test.go b/node/stmt/t_property_list_test.go
index 8e28817..2072d7a 100644
--- a/node/stmt/t_property_list_test.go
+++ b/node/stmt/t_property_list_test.go
@@ -6,6 +6,7 @@ import (
 	"gotest.tools/assert"
 
 	"github.com/z7zmey/php-parser/node/expr"
+	"github.com/z7zmey/php-parser/node/name"
 	"github.com/z7zmey/php-parser/node/scalar"
 	"github.com/z7zmey/php-parser/position"
 
@@ -378,3 +379,109 @@ func TestProperties2(t *testing.T) {
 	actual = php5parser.GetRootNode()
 	assert.DeepEqual(t, expected, actual)
 }
+
+func TestPropertyType(t *testing.T) {
+	src := `<? class foo {var bar $a;}`
+
+	expected := &node.Root{
+		Position: &position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  3,
+			EndPos:    26,
+		},
+		Stmts: []node.Node{
+			&stmt.Class{
+				Position: &position.Position{
+					StartLine: 1,
+					EndLine:   1,
+					StartPos:  3,
+					EndPos:    26,
+				},
+				PhpDocComment: "",
+				ClassName: &node.Identifier{
+					Position: &position.Position{
+						StartLine: 1,
+						EndLine:   1,
+						StartPos:  9,
+						EndPos:    12,
+					},
+					Value: "foo",
+				},
+				Stmts: []node.Node{
+					&stmt.PropertyList{
+						Position: &position.Position{
+							StartLine: 1,
+							EndLine:   1,
+							StartPos:  14,
+							EndPos:    25,
+						},
+						Modifiers: []node.Node{
+							&node.Identifier{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  14,
+									EndPos:    17,
+								},
+								Value: "var",
+							},
+						},
+						Type: &name.Name{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  18,
+								EndPos:    21,
+							},
+							Parts: []node.Node{
+								&name.NamePart{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  18,
+										EndPos:    21,
+									},
+									Value: "bar",
+								},
+							},
+						},
+						Properties: []node.Node{
+							&stmt.Property{
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  22,
+									EndPos:    24,
+								},
+								PhpDocComment: "",
+								Variable: &expr.Variable{
+									Position: &position.Position{
+										StartLine: 1,
+										EndLine:   1,
+										StartPos:  22,
+										EndPos:    24,
+									},
+									VarName: &node.Identifier{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  22,
+											EndPos:    24,
+										},
+										Value: "a",
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	php7parser := php7.NewParser([]byte(src), "7.4")
+	php7parser.Parse()
+	actual := php7parser.GetRootNode()
+	assert.DeepEqual(t, expected, actual)
+}
diff --git a/node/stmt/t_visitor_test.go b/node/stmt/t_visitor_test.go
index bf760b6..d2c220a 100644
--- a/node/stmt/t_visitor_test.go
+++ b/node/stmt/t_visitor_test.go
@@ -323,9 +323,10 @@ var nodesToTest = []struct {
 	{
 		&stmt.PropertyList{
 			Modifiers:  []node.Node{&stmt.Expression{}},
+			Type:       &name.Name{},
 			Properties: []node.Node{&stmt.Expression{}},
 		},
-		[]string{"Modifiers", "Properties"},
+		[]string{"Modifiers", "Type", "Properties"},
 		nil,
 	},
 	{
diff --git a/php5/php5.go b/php5/php5.go
index fdf87e8..ac06677 100644
--- a/php5/php5.go
+++ b/php5/php5.go
@@ -4904,7 +4904,7 @@ yydefault:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line php5/php5.y:2703
 		{
-			yyVAL.node = stmt.NewPropertyList(yyDollar[1].list, yyDollar[2].list)
+			yyVAL.node = stmt.NewPropertyList(yyDollar[1].list, nil, yyDollar[2].list)
 
 			// save position
 			yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[3].token))
diff --git a/php5/php5.y b/php5/php5.y
index ab34ad0..5b465ac 100644
--- a/php5/php5.y
+++ b/php5/php5.y
@@ -2701,7 +2701,7 @@ class_statement_list:
 class_statement:
         variable_modifiers class_variable_declaration ';'
             {
-                $$ = stmt.NewPropertyList($1, $2)
+                $$ = stmt.NewPropertyList($1, nil, $2)
 
                 // save position
                 $$.SetPosition(yylex.(*Parser).positionBuilder.NewNodeListTokenPosition($1, $3))
diff --git a/php7/php7.go b/php7/php7.go
index c8fc4cd..8f09ae6 100644
--- a/php7/php7.go
+++ b/php7/php7.go
@@ -505,8 +505,9 @@ var yyExca = [...]int{
 	149, 185,
 	-2, 426,
 	-1, 744,
-	12, 266,
-	-2, 269,
+	37, 269,
+	39, 269,
+	-2, 266,
 	-1, 758,
 	94, 209,
 	95, 209,
@@ -518,164 +519,132 @@ var yyExca = [...]int{
 	-1, 789,
 	149, 187,
 	-2, 400,
-	-1, 806,
+	-1, 804,
 	94, 210,
 	95, 210,
 	96, 210,
 	-2, 0,
-	-1, 857,
+	-1, 854,
 	31, 200,
 	32, 200,
 	33, 200,
 	145, 200,
 	-2, 0,
-	-1, 887,
+	-1, 886,
 	29, 77,
 	-2, 81,
-	-1, 892,
+	-1, 891,
 	31, 199,
 	32, 199,
 	33, 199,
 	145, 199,
 	-2, 0,
-	-1, 918,
+	-1, 919,
 	149, 214,
 	-2, 219,
 }
 
 const yyPrivate = 57344
 
-const yyLast = 7654
+const yyLast = 7764
 
 var yyAct = [...]int{
 
-	28, 132, 763, 629, 844, 867, 879, 583, 746, 440,
-	783, 109, 843, 820, 799, 680, 191, 633, 113, 666,
-	326, 128, 140, 140, 140, 648, 647, 153, 570, 710,
-	117, 123, 538, 81, 224, 188, 379, 721, 631, 527,
-	371, 634, 381, 578, 317, 321, 226, 5, 9, 149,
-	409, 152, 320, 228, 231, 8, 85, 239, 240, 241,
-	242, 243, 130, 134, 244, 245, 246, 247, 248, 249,
-	250, 319, 253, 145, 7, 261, 262, 263, 139, 318,
-	257, 44, 6, 127, 518, 519, 434, 129, 233, 233,
-	276, 277, 875, 279, 280, 83, 267, 861, 272, 851,
-	2, 142, 143, 689, 848, 841, 847, 595, 410, 337,
-	107, 235, 235, 313, 898, 873, 80, 838, 547, 573,
-	682, 682, 107, 286, 769, 899, 714, 704, 338, 874,
-	312, 839, 306, 294, 323, 296, 232, 238, 328, 329,
-	303, 146, 339, 309, 641, 626, 310, 571, 107, 562,
-	415, 868, 325, 192, 706, 181, 340, 341, 342, 343,
+	28, 132, 763, 629, 841, 878, 864, 583, 440, 746,
+	840, 109, 783, 818, 191, 837, 633, 680, 113, 632,
+	666, 128, 140, 140, 140, 710, 648, 153, 379, 570,
+	117, 123, 631, 647, 224, 188, 326, 578, 634, 538,
+	371, 527, 381, 226, 317, 721, 152, 5, 321, 320,
+	409, 9, 8, 228, 231, 145, 81, 239, 240, 241,
+	242, 243, 149, 134, 244, 245, 246, 247, 248, 249,
+	250, 319, 253, 2, 7, 261, 262, 263, 139, 318,
+	257, 85, 6, 130, 127, 519, 518, 434, 874, 871,
+	276, 277, 267, 279, 280, 129, 848, 689, 272, 858,
+	595, 142, 143, 845, 337, 844, 410, 83, 107, 313,
+	107, 233, 233, 897, 872, 868, 573, 547, 338, 682,
+	682, 286, 769, 714, 898, 704, 641, 312, 873, 869,
+	335, 306, 339, 294, 323, 296, 235, 235, 328, 329,
+	303, 626, 571, 309, 336, 107, 310, 562, 415, 865,
+	325, 192, 706, 789, 698, 181, 340, 341, 342, 343,
 	344, 345, 346, 347, 348, 349, 350, 351, 352, 353,
 	354, 355, 356, 357, 358, 359, 360, 361, 362, 363,
-	364, 365, 269, 367, 369, 335, 373, 333, 311, 375,
-	852, 789, 918, 272, 698, 289, 291, 167, 694, 336,
-	615, 334, 312, 273, 391, 393, 394, 395, 396, 397,
-	398, 399, 400, 401, 402, 403, 404, 405, 233, 299,
-	406, 140, 408, 305, 228, 288, 611, 602, 166, 168,
-	169, 612, 119, 383, 107, 419, 264, 306, 228, 590,
-	112, 235, 411, 414, 387, 929, 862, 764, 894, 428,
-	828, 827, 818, 140, 287, 181, 807, 108, 413, 835,
-	429, 793, 119, 233, 107, 140, 372, 736, 523, 108,
-	435, 516, 420, 726, 374, 528, 529, 269, 366, 530,
-	708, 222, 605, 111, 608, 606, 235, 703, 535, 524,
-	701, 539, 869, 228, 233, 108, 693, 167, 273, 407,
-	664, 653, 136, 643, 603, 114, 594, 119, 295, 107,
-	791, 417, 822, 821, 557, 112, 729, 235, 165, 164,
-	692, 236, 675, 549, 290, 552, 310, 541, 166, 168,
-	169, 422, 136, 163, 576, 114, 424, 425, 566, 412,
-	153, 427, 431, 433, 5, 9, 661, 560, 558, 662,
-	756, 236, 8, 515, 522, 534, 525, 669, 111, 418,
-	521, 181, 424, 388, 425, 425, 424, 221, 386, 569,
-	234, 7, 237, 220, 292, 556, 278, 136, 275, 6,
-	114, 108, 436, 517, 274, 293, 565, 585, 252, 586,
-	550, 567, 587, 588, 580, 223, 236, 584, 219, 544,
-	816, 186, 185, 167, 170, 171, 184, 138, 564, 137,
-	133, 108, 593, 115, 119, 575, 228, 597, 933, 228,
-	932, 582, 390, 577, 165, 164, 607, 157, 159, 158,
-	181, 778, 779, 614, 166, 168, 169, 190, 617, 163,
-	778, 779, 924, 119, 908, 234, 298, 670, 297, 907,
-	668, 146, 893, 600, 183, 180, 108, 858, 829, 824,
-	817, 775, 596, 757, 725, 636, 637, 724, 722, 720,
+	364, 365, 694, 367, 369, 333, 373, 311, 305, 375,
+	44, 615, 299, 272, 269, 289, 291, 167, 80, 334,
+	602, 312, 306, 590, 391, 393, 394, 395, 396, 397,
+	398, 399, 400, 401, 402, 403, 404, 405, 165, 164,
+	406, 140, 408, 146, 228, 383, 523, 181, 166, 168,
+	169, 414, 428, 163, 605, 419, 608, 606, 228, 264,
+	411, 233, 287, 119, 387, 232, 238, 524, 859, 611,
+	930, 893, 826, 140, 612, 108, 825, 108, 413, 816,
+	429, 222, 119, 805, 107, 140, 235, 793, 736, 167,
+	435, 516, 420, 726, 366, 528, 529, 708, 703, 530,
+	701, 693, 374, 664, 653, 273, 233, 643, 535, 269,
+	866, 539, 108, 228, 636, 637, 603, 594, 295, 407,
+	166, 168, 169, 919, 833, 271, 791, 288, 820, 819,
+	764, 235, 522, 136, 557, 729, 114, 233, 521, 692,
+	675, 290, 756, 549, 427, 552, 310, 541, 576, 560,
+	661, 422, 136, 662, 390, 114, 424, 425, 566, 558,
+	153, 534, 235, 433, 5, 418, 388, 221, 9, 8,
+	386, 236, 292, 220, 515, 278, 275, 274, 525, 252,
+	223, 181, 424, 219, 425, 425, 424, 186, 185, 569,
+	184, 7, 544, 138, 137, 372, 133, 115, 607, 6,
+	273, 293, 934, 190, 933, 635, 567, 585, 925, 586,
+	564, 550, 587, 588, 580, 908, 556, 584, 849, 565,
+	778, 779, 907, 167, 170, 171, 892, 575, 778, 779,
+	855, 108, 593, 582, 827, 822, 228, 597, 815, 228,
+	417, 412, 775, 577, 165, 164, 757, 157, 159, 158,
+	181, 725, 724, 614, 166, 168, 169, 722, 617, 163,
+	720, 119, 298, 107, 297, 717, 561, 546, 543, 389,
+	377, 431, 258, 600, 183, 180, 332, 426, 331, 596,
+	330, 300, 814, 811, 436, 517, 806, 771, 542, 119,
 	155, 156, 167, 170, 171, 172, 173, 174, 175, 177,
-	179, 717, 561, 546, 136, 822, 821, 114, 543, 389,
-	377, 182, 161, 165, 164, 592, 332, 331, 330, 300,
-	160, 813, 162, 166, 168, 169, 176, 178, 163, 808,
-	771, 613, 542, 258, 217, 218, 116, 542, 426, 913,
-	616, 865, 140, 621, 864, 542, 542, 204, 205, 206,
-	207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
-	809, 642, 796, 423, 823, 792, 638, 738, 167, 119,
-	681, 107, 767, 777, 581, 625, 635, 187, 116, 77,
-	181, 657, 328, 659, 122, 293, 640, 911, 624, 663,
-	552, 203, 552, 310, 622, 649, 256, 118, 259, 260,
-	676, 308, 658, 193, 520, 148, 850, 679, 638, 5,
-	9, 584, 271, 266, 652, 308, 690, 8, 198, 199,
-	620, 618, 167, 308, 655, 233, 233, 200, 202, 201,
-	119, 308, 665, 696, 265, 678, 7, 727, 672, 136,
-	579, 677, 114, 119, 6, 382, 119, 528, 235, 235,
-	78, 79, 233, 385, 686, 293, 909, 619, 236, 795,
-	412, 623, 539, 533, 910, 119, 712, 638, 324, 646,
-	125, 651, 126, 372, 667, 235, 695, 555, 718, 645,
-	553, 733, 734, 308, 552, 548, 702, 711, 700, 552,
-	552, 228, 715, 649, 709, 731, 713, 707, 716, 735,
-	691, 283, 284, 551, 135, 106, 302, 638, 900, 758,
-	759, 650, 800, 228, 754, 119, 124, 753, 108, 304,
-	723, 148, 233, 258, 121, 730, 750, 751, 752, 749,
-	748, 747, 258, 812, 737, 136, 638, 307, 114, 119,
-	150, 328, 125, 150, 126, 235, 46, 760, 755, 609,
-	228, 552, 131, 552, 711, 554, 649, 762, 542, 768,
-	772, 776, 770, 765, 802, 773, 801, 786, 135, 106,
-	728, 803, 258, 804, 797, 584, 380, 426, 806, 119,
-	780, 233, 782, 378, 788, 194, 197, 531, 259, 260,
-	258, 784, 825, 778, 779, 281, 638, 259, 260, 819,
-	196, 195, 811, 1, 235, 189, 38, 826, 552, 743,
-	744, 814, 745, 741, 832, 742, 833, 834, 630, 815,
-	810, 537, 225, 831, 781, 778, 779, 526, 866, 787,
-	636, 637, 836, 370, 878, 147, 532, 259, 260, 845,
-	798, 144, 857, 743, 327, 849, 745, 151, 842, 136,
-	674, 830, 114, 856, 282, 259, 260, 840, 860, 254,
-	794, 384, 872, 750, 751, 752, 749, 748, 747, 654,
-	876, 889, 890, 885, 871, 853, 931, 891, 892, 258,
-	884, 660, 846, 854, 426, 227, 896, 897, 258, 43,
-	42, 16, 784, 285, 895, 15, 903, 750, 751, 752,
-	749, 748, 747, 885, 604, 906, 270, 902, 258, 888,
-	884, 49, 48, 255, 110, 50, 84, 82, 72, 251,
-	62, 268, 61, 883, 882, 916, 881, 880, 740, 901,
-	45, 632, 732, 904, 671, 925, 923, 919, 314, 922,
-	921, 584, 926, 870, 259, 260, 120, 927, 301, 3,
-	638, 439, 930, 259, 260, 934, 766, 705, 0, 4,
-	917, 89, 90, 70, 47, 94, 95, 36, 0, 107,
-	0, 27, 0, 259, 260, 112, 26, 18, 17, 0,
-	19, 0, 30, 0, 31, 0, 0, 20, 0, 0,
-	0, 21, 22, 35, 37, 106, 13, 23, 33, 0,
-	0, 34, 12, 0, 24, 0, 29, 87, 88, 10,
-	39, 40, 41, 0, 0, 0, 0, 51, 111, 0,
-	103, 99, 100, 101, 96, 97, 743, 0, 0, 745,
-	0, 0, 104, 0, 0, 0, 0, 11, 102, 98,
-	114, 0, 91, 92, 93, 0, 0, 0, 0, 86,
-	53, 0, 0, 0, 74, 75, 25, 78, 79, 0,
-	0, 0, 54, 55, 76, 63, 64, 65, 66, 67,
-	68, 69, 0, 0, 0, 0, 0, 0, 0, 0,
-	750, 751, 752, 749, 748, 747, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 105,
-	73, 14, 644, 32, 0, 60, 0, 52, 0, 0,
-	0, 57, 56, 58, 59, 71, 108, 4, 0, 89,
-	90, 70, 47, 94, 95, 36, 837, 107, 0, 27,
-	0, 0, 0, 112, 26, 18, 17, 0, 19, 0,
-	30, 0, 31, 0, 0, 20, 0, 0, 0, 21,
-	22, 35, 37, 106, 13, 23, 33, 0, 0, 34,
-	12, 0, 24, 0, 29, 87, 88, 10, 39, 40,
-	41, 0, 0, 0, 0, 51, 111, 0, 103, 99,
-	100, 101, 96, 97, 743, 0, 0, 745, 0, 0,
-	104, 0, 0, 0, 0, 11, 102, 98, 114, 0,
-	91, 92, 93, 0, 0, 0, 0, 86, 53, 0,
-	0, 0, 74, 75, 25, 78, 79, 0, 0, 0,
-	54, 55, 76, 63, 64, 65, 66, 67, 68, 69,
-	0, 0, 0, 0, 0, 0, 0, 0, 750, 751,
-	752, 749, 748, 747, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 105, 73, 14,
-	545, 32, 0, 60, 0, 52, 0, 0, 0, 57,
-	56, 58, 59, 71, 108, 4, 0, 89, 90, 70,
-	47, 94, 95, 36, 805, 107, 0, 27, 0, 0,
+	179, 743, 613, 542, 745, 820, 819, 542, 542, 913,
+	862, 182, 161, 165, 164, 592, 861, 807, 796, 792,
+	160, 738, 162, 166, 168, 169, 176, 178, 163, 681,
+	581, 136, 423, 821, 114, 187, 181, 259, 260, 77,
+	616, 777, 140, 621, 167, 256, 122, 198, 199, 193,
+	236, 767, 119, 146, 116, 750, 751, 752, 749, 748,
+	747, 642, 116, 308, 293, 148, 638, 750, 751, 752,
+	749, 748, 747, 119, 911, 308, 625, 308, 167, 119,
+	308, 657, 328, 659, 200, 202, 201, 640, 624, 663,
+	552, 308, 552, 310, 622, 649, 78, 79, 520, 119,
+	676, 887, 533, 266, 265, 258, 652, 679, 638, 5,
+	108, 584, 847, 9, 8, 727, 690, 293, 658, 795,
+	620, 618, 712, 118, 655, 551, 125, 678, 126, 646,
+	579, 555, 665, 696, 548, 677, 7, 651, 672, 382,
+	385, 645, 553, 136, 6, 307, 114, 528, 233, 233,
+	283, 284, 304, 909, 686, 910, 258, 119, 258, 107,
+	150, 426, 539, 426, 119, 112, 324, 638, 302, 531,
+	259, 260, 124, 235, 235, 233, 733, 734, 718, 135,
+	106, 148, 700, 695, 552, 135, 106, 711, 702, 552,
+	552, 228, 715, 649, 707, 731, 46, 713, 258, 735,
+	235, 709, 119, 281, 800, 716, 799, 638, 111, 758,
+	759, 838, 899, 228, 754, 636, 637, 810, 150, 753,
+	532, 259, 260, 259, 260, 730, 737, 136, 723, 125,
+	114, 126, 119, 609, 136, 194, 638, 114, 131, 619,
+	554, 328, 412, 623, 542, 233, 236, 760, 755, 762,
+	228, 552, 650, 552, 711, 380, 649, 765, 770, 258,
+	768, 772, 282, 259, 260, 121, 773, 258, 786, 378,
+	235, 801, 285, 638, 802, 584, 797, 776, 804, 197,
+	196, 798, 372, 667, 788, 1, 195, 258, 780, 189,
+	782, 784, 255, 38, 744, 234, 638, 237, 741, 817,
+	742, 809, 630, 537, 233, 225, 108, 824, 552, 691,
+	526, 812, 808, 863, 830, 370, 831, 832, 877, 147,
+	813, 836, 144, 829, 259, 260, 823, 778, 779, 235,
+	327, 151, 259, 260, 834, 842, 781, 778, 779, 839,
+	854, 674, 828, 254, 794, 846, 384, 654, 850, 932,
+	660, 853, 259, 260, 843, 227, 43, 42, 857, 16,
+	15, 604, 270, 49, 48, 110, 50, 875, 888, 889,
+	884, 84, 82, 72, 890, 891, 251, 883, 62, 728,
+	268, 851, 61, 895, 896, 882, 881, 870, 880, 879,
+	784, 894, 901, 740, 45, 903, 732, 217, 218, 671,
+	314, 120, 884, 906, 902, 900, 301, 3, 439, 883,
+	204, 205, 206, 207, 208, 209, 210, 211, 212, 213,
+	214, 215, 216, 766, 904, 916, 705, 0, 0, 0,
+	0, 0, 0, 0, 0, 926, 924, 920, 787, 922,
+	923, 584, 0, 927, 0, 0, 0, 0, 928, 0,
+	917, 638, 918, 931, 203, 4, 935, 89, 90, 70,
+	47, 94, 95, 36, 0, 107, 0, 27, 0, 0,
 	0, 112, 26, 18, 17, 0, 19, 0, 30, 0,
 	31, 0, 0, 20, 0, 0, 0, 21, 22, 35,
 	37, 106, 13, 23, 33, 0, 0, 34, 12, 0,
@@ -688,57 +657,57 @@ var yyAct = [...]int{
 	76, 63, 64, 65, 66, 67, 68, 69, 0, 0,
 	0, 0, 0, 0, 0, 0, 750, 751, 752, 749,
 	748, 747, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 105, 73, 14, 0, 32,
+	0, 0, 0, 0, 0, 105, 73, 14, 644, 32,
 	0, 60, 0, 52, 0, 0, 0, 57, 56, 58,
-	59, 71, 108, 316, 0, 89, 90, 70, 47, 94,
-	95, 36, 739, 107, 0, 27, 0, 0, 0, 112,
+	59, 71, 108, 4, 0, 89, 90, 70, 47, 94,
+	95, 36, 867, 107, 0, 27, 0, 0, 0, 112,
 	26, 18, 17, 0, 19, 0, 30, 0, 31, 0,
 	0, 20, 0, 0, 0, 21, 22, 35, 37, 106,
-	0, 23, 33, 0, 0, 34, 0, 0, 24, 0,
-	29, 87, 88, 322, 39, 40, 41, 0, 0, 0,
+	13, 23, 33, 0, 0, 34, 12, 0, 24, 0,
+	29, 87, 88, 10, 39, 40, 41, 0, 0, 0,
 	0, 51, 111, 0, 103, 99, 100, 101, 96, 97,
-	0, 0, 0, 0, 0, 0, 104, 0, 0, 0,
-	0, 136, 102, 98, 114, 0, 91, 92, 93, 0,
+	743, 0, 0, 745, 0, 0, 104, 0, 0, 0,
+	0, 11, 102, 98, 114, 0, 91, 92, 93, 0,
 	0, 0, 0, 86, 53, 0, 0, 0, 74, 75,
 	25, 78, 79, 0, 0, 0, 54, 55, 76, 63,
 	64, 65, 66, 67, 68, 69, 0, 0, 0, 0,
+	0, 0, 0, 0, 750, 751, 752, 749, 748, 747,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 105, 73, 14, 935, 32, 0, 60,
+	0, 0, 0, 105, 73, 14, 545, 32, 0, 60,
 	0, 52, 0, 0, 0, 57, 56, 58, 59, 71,
-	108, 316, 0, 89, 90, 70, 47, 94, 95, 36,
-	0, 107, 0, 27, 0, 0, 0, 112, 26, 18,
+	108, 4, 0, 89, 90, 70, 47, 94, 95, 36,
+	835, 107, 0, 27, 0, 0, 0, 112, 26, 18,
 	17, 0, 19, 0, 30, 0, 31, 0, 0, 20,
-	0, 0, 0, 21, 22, 35, 37, 106, 0, 23,
-	33, 0, 0, 34, 0, 0, 24, 0, 29, 87,
-	88, 322, 39, 40, 41, 0, 0, 0, 0, 51,
-	111, 0, 103, 99, 100, 101, 96, 97, 0, 0,
-	0, 0, 0, 0, 104, 0, 0, 0, 0, 136,
+	0, 0, 0, 21, 22, 35, 37, 106, 13, 23,
+	33, 0, 0, 34, 12, 0, 24, 0, 29, 87,
+	88, 10, 39, 40, 41, 0, 0, 0, 0, 51,
+	111, 0, 103, 99, 100, 101, 96, 97, 743, 0,
+	0, 745, 0, 0, 104, 0, 0, 0, 0, 11,
 	102, 98, 114, 0, 91, 92, 93, 0, 0, 0,
 	0, 86, 53, 0, 0, 0, 74, 75, 25, 78,
 	79, 0, 0, 0, 54, 55, 76, 63, 64, 65,
 	66, 67, 68, 69, 0, 0, 0, 0, 0, 0,
+	0, 0, 750, 751, 752, 749, 748, 747, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 105, 73, 14, 928, 32, 0, 60, 0, 52,
+	0, 105, 73, 14, 0, 32, 0, 60, 0, 52,
 	0, 0, 0, 57, 56, 58, 59, 71, 108, 316,
-	0, 89, 90, 70, 47, 94, 95, 36, 0, 107,
+	0, 89, 90, 70, 47, 94, 95, 36, 803, 107,
 	0, 27, 0, 0, 0, 112, 26, 18, 17, 0,
 	19, 0, 30, 0, 31, 0, 0, 20, 0, 0,
 	0, 21, 22, 35, 37, 106, 0, 23, 33, 0,
 	0, 34, 0, 0, 24, 0, 29, 87, 88, 322,
 	39, 40, 41, 0, 0, 0, 0, 51, 111, 0,
-	103, 99, 100, 101, 96, 97, 0, 0, 0, 0,
+	103, 99, 100, 101, 96, 97, 743, 0, 0, 745,
 	0, 0, 104, 0, 0, 0, 0, 136, 102, 98,
 	114, 0, 91, 92, 93, 0, 0, 0, 0, 86,
 	53, 0, 0, 0, 74, 75, 25, 78, 79, 0,
 	0, 0, 54, 55, 76, 63, 64, 65, 66, 67,
 	68, 69, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	750, 751, 752, 749, 748, 747, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 105,
-	73, 14, 915, 32, 0, 60, 0, 52, 0, 0,
+	73, 14, 936, 32, 0, 60, 0, 52, 0, 0,
 	0, 57, 56, 58, 59, 71, 108, 316, 0, 89,
-	90, 70, 47, 94, 95, 36, 0, 107, 0, 27,
+	90, 70, 47, 94, 95, 36, 739, 107, 0, 27,
 	0, 0, 0, 112, 26, 18, 17, 0, 19, 0,
 	30, 0, 31, 0, 0, 20, 0, 0, 0, 21,
 	22, 35, 37, 106, 0, 23, 33, 0, 0, 34,
@@ -752,10 +721,10 @@ var yyAct = [...]int{
 	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, 105, 73, 14,
-	914, 32, 0, 60, 0, 52, 0, 0, 0, 57,
+	929, 32, 0, 60, 0, 52, 0, 0, 0, 57,
 	56, 58, 59, 71, 108, 316, 0, 89, 90, 70,
 	47, 94, 95, 36, 0, 107, 0, 27, 0, 0,
-	0, 112, 26, 18, 17, 0, 19, 912, 30, 0,
+	0, 112, 26, 18, 17, 0, 19, 0, 30, 0,
 	31, 0, 0, 20, 0, 0, 0, 21, 22, 35,
 	37, 106, 0, 23, 33, 0, 0, 34, 0, 0,
 	24, 0, 29, 87, 88, 322, 39, 40, 41, 0,
@@ -767,7 +736,7 @@ var yyAct = [...]int{
 	76, 63, 64, 65, 66, 67, 68, 69, 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, 105, 73, 14, 0, 32,
+	0, 0, 0, 0, 0, 105, 73, 14, 915, 32,
 	0, 60, 0, 52, 0, 0, 0, 57, 56, 58,
 	59, 71, 108, 316, 0, 89, 90, 70, 47, 94,
 	95, 36, 0, 107, 0, 27, 0, 0, 0, 112,
@@ -783,11 +752,11 @@ var yyAct = [...]int{
 	64, 65, 66, 67, 68, 69, 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, 105, 73, 14, 863, 32, 0, 60,
+	0, 0, 0, 105, 73, 14, 914, 32, 0, 60,
 	0, 52, 0, 0, 0, 57, 56, 58, 59, 71,
 	108, 316, 0, 89, 90, 70, 47, 94, 95, 36,
 	0, 107, 0, 27, 0, 0, 0, 112, 26, 18,
-	17, 0, 19, 0, 30, 859, 31, 0, 0, 20,
+	17, 0, 19, 912, 30, 0, 31, 0, 0, 20,
 	0, 0, 0, 21, 22, 35, 37, 106, 0, 23,
 	33, 0, 0, 34, 0, 0, 24, 0, 29, 87,
 	88, 322, 39, 40, 41, 0, 0, 0, 0, 51,
@@ -803,7 +772,7 @@ var yyAct = [...]int{
 	0, 0, 0, 57, 56, 58, 59, 71, 108, 316,
 	0, 89, 90, 70, 47, 94, 95, 36, 0, 107,
 	0, 27, 0, 0, 0, 112, 26, 18, 17, 0,
-	19, 0, 30, 0, 31, 790, 0, 20, 0, 0,
+	19, 0, 30, 0, 31, 0, 0, 20, 0, 0,
 	0, 21, 22, 35, 37, 106, 0, 23, 33, 0,
 	0, 34, 0, 0, 24, 0, 29, 87, 88, 322,
 	39, 40, 41, 0, 0, 0, 0, 51, 111, 0,
@@ -815,11 +784,11 @@ var yyAct = [...]int{
 	68, 69, 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, 105,
-	73, 14, 0, 32, 0, 60, 0, 52, 0, 0,
+	73, 14, 860, 32, 0, 60, 0, 52, 0, 0,
 	0, 57, 56, 58, 59, 71, 108, 316, 0, 89,
 	90, 70, 47, 94, 95, 36, 0, 107, 0, 27,
-	0, 0, 0, 112, 26, 18, 17, 774, 19, 0,
-	30, 0, 31, 0, 0, 20, 0, 0, 0, 21,
+	0, 0, 0, 112, 26, 18, 17, 0, 19, 0,
+	30, 856, 31, 0, 0, 20, 0, 0, 0, 21,
 	22, 35, 37, 106, 0, 23, 33, 0, 0, 34,
 	0, 0, 24, 0, 29, 87, 88, 322, 39, 40,
 	41, 0, 0, 0, 0, 51, 111, 0, 103, 99,
@@ -835,13 +804,13 @@ var yyAct = [...]int{
 	56, 58, 59, 71, 108, 316, 0, 89, 90, 70,
 	47, 94, 95, 36, 0, 107, 0, 27, 0, 0,
 	0, 112, 26, 18, 17, 0, 19, 0, 30, 0,
-	31, 0, 0, 20, 0, 0, 0, 21, 22, 35,
+	31, 790, 0, 20, 0, 0, 0, 21, 22, 35,
 	37, 106, 0, 23, 33, 0, 0, 34, 0, 0,
 	24, 0, 29, 87, 88, 322, 39, 40, 41, 0,
 	0, 0, 0, 51, 111, 0, 103, 99, 100, 101,
 	96, 97, 0, 0, 0, 0, 0, 0, 104, 0,
 	0, 0, 0, 136, 102, 98, 114, 0, 91, 92,
-	93, 0, 0, 0, 0, 86, 53, 0, 0, 685,
+	93, 0, 0, 0, 0, 86, 53, 0, 0, 0,
 	74, 75, 25, 78, 79, 0, 0, 0, 54, 55,
 	76, 63, 64, 65, 66, 67, 68, 69, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -850,7 +819,7 @@ var yyAct = [...]int{
 	0, 60, 0, 52, 0, 0, 0, 57, 56, 58,
 	59, 71, 108, 316, 0, 89, 90, 70, 47, 94,
 	95, 36, 0, 107, 0, 27, 0, 0, 0, 112,
-	26, 18, 17, 0, 19, 0, 30, 0, 31, 0,
+	26, 18, 17, 774, 19, 0, 30, 0, 31, 0,
 	0, 20, 0, 0, 0, 21, 22, 35, 37, 106,
 	0, 23, 33, 0, 0, 34, 0, 0, 24, 0,
 	29, 87, 88, 322, 39, 40, 41, 0, 0, 0,
@@ -862,7 +831,7 @@ var yyAct = [...]int{
 	64, 65, 66, 67, 68, 69, 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, 105, 73, 14, 574, 32, 0, 60,
+	0, 0, 0, 105, 73, 14, 0, 32, 0, 60,
 	0, 52, 0, 0, 0, 57, 56, 58, 59, 71,
 	108, 316, 0, 89, 90, 70, 47, 94, 95, 36,
 	0, 107, 0, 27, 0, 0, 0, 112, 26, 18,
@@ -873,12 +842,12 @@ var yyAct = [...]int{
 	111, 0, 103, 99, 100, 101, 96, 97, 0, 0,
 	0, 0, 0, 0, 104, 0, 0, 0, 0, 136,
 	102, 98, 114, 0, 91, 92, 93, 0, 0, 0,
-	0, 86, 53, 0, 0, 0, 74, 75, 25, 78,
+	0, 86, 53, 0, 0, 685, 74, 75, 25, 78,
 	79, 0, 0, 0, 54, 55, 76, 63, 64, 65,
 	66, 67, 68, 69, 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, 105, 73, 14, 315, 32, 0, 60, 0, 52,
+	0, 105, 73, 14, 0, 32, 0, 60, 0, 52,
 	0, 0, 0, 57, 56, 58, 59, 71, 108, 316,
 	0, 89, 90, 70, 47, 94, 95, 36, 0, 107,
 	0, 27, 0, 0, 0, 112, 26, 18, 17, 0,
@@ -894,48 +863,64 @@ var yyAct = [...]int{
 	68, 69, 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, 105,
-	73, 14, 0, 32, 0, 60, 0, 52, 0, 0,
-	0, 57, 56, 58, 59, 71, 108, 447, 448, 458,
-	459, 0, 0, 438, 0, 107, 0, 0, 0, 0,
-	0, 0, 463, 464, 465, 466, 467, 468, 469, 470,
-	471, 472, 473, 493, 494, 495, 496, 497, 485, 486,
-	487, 514, 488, 489, 474, 475, 476, 477, 478, 479,
-	480, 481, 482, 483, 484, 0, 505, 503, 504, 500,
-	501, 0, 0, 492, 498, 499, 506, 507, 509, 508,
-	510, 511, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 502, 513, 512, 0, 0, 449, 450,
-	451, 452, 453, 454, 455, 456, 457, 460, 461, 462,
-	490, 491, 441, 442, 443, 444, 445, 446, 89, 90,
-	70, 47, 94, 95, 36, 0, 107, 0, 27, 0,
-	0, 0, 112, 26, 18, 17, 0, 19, 0, 30,
-	0, 31, 0, 0, 20, 0, 0, 0, 21, 22,
-	35, 135, 106, 0, 23, 33, 0, 437, 34, 0,
-	0, 24, 0, 29, 87, 88, 181, 0, 0, 0,
-	0, 0, 108, 0, 51, 111, 0, 103, 99, 100,
-	101, 96, 97, 0, 0, 0, 0, 0, 0, 104,
-	0, 0, 0, 0, 136, 102, 98, 114, 0, 91,
-	92, 93, 0, 0, 0, 0, 86, 53, 167, 170,
-	171, 74, 75, 25, 0, 177, 179, 0, 0, 54,
-	55, 76, 63, 64, 65, 66, 67, 68, 69, 165,
-	164, 0, 0, 0, 0, 0, 0, 0, 0, 166,
-	168, 169, 176, 178, 163, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 105, 73, 14, 0,
-	32, 785, 60, 0, 52, 0, 0, 0, 57, 56,
-	58, 59, 71, 108, 89, 90, 70, 47, 94, 95,
+	73, 14, 574, 32, 0, 60, 0, 52, 0, 0,
+	0, 57, 56, 58, 59, 71, 108, 316, 0, 89,
+	90, 70, 47, 94, 95, 36, 0, 107, 0, 27,
+	0, 0, 0, 112, 26, 18, 17, 0, 19, 0,
+	30, 0, 31, 0, 0, 20, 0, 0, 0, 21,
+	22, 35, 37, 106, 0, 23, 33, 0, 0, 34,
+	0, 0, 24, 0, 29, 87, 88, 322, 39, 40,
+	41, 0, 0, 0, 0, 51, 111, 0, 103, 99,
+	100, 101, 96, 97, 0, 0, 0, 0, 0, 0,
+	104, 0, 0, 0, 0, 136, 102, 98, 114, 0,
+	91, 92, 93, 0, 0, 0, 0, 86, 53, 0,
+	0, 0, 74, 75, 25, 78, 79, 0, 0, 0,
+	54, 55, 76, 63, 64, 65, 66, 67, 68, 69,
+	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, 105, 73, 14,
+	315, 32, 0, 60, 0, 52, 0, 0, 0, 57,
+	56, 58, 59, 71, 108, 316, 0, 89, 90, 70,
+	47, 94, 95, 36, 0, 107, 0, 27, 0, 0,
+	0, 112, 26, 18, 17, 0, 19, 0, 30, 0,
+	31, 0, 0, 20, 0, 0, 0, 21, 22, 35,
+	37, 106, 0, 23, 33, 0, 0, 34, 0, 0,
+	24, 0, 29, 87, 88, 322, 39, 40, 41, 0,
+	0, 0, 0, 51, 111, 0, 103, 99, 100, 101,
+	96, 97, 0, 0, 0, 0, 0, 0, 104, 0,
+	0, 0, 0, 136, 102, 98, 114, 0, 91, 92,
+	93, 0, 0, 0, 0, 86, 53, 0, 0, 0,
+	74, 75, 25, 78, 79, 0, 0, 0, 54, 55,
+	76, 63, 64, 65, 66, 67, 68, 69, 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, 105, 73, 14, 0, 32,
+	0, 60, 0, 52, 0, 0, 0, 57, 56, 58,
+	59, 71, 108, 447, 448, 458, 459, 0, 0, 438,
+	0, 107, 0, 0, 0, 0, 0, 0, 463, 464,
+	465, 466, 467, 468, 469, 470, 471, 472, 473, 493,
+	494, 495, 496, 497, 485, 486, 487, 514, 488, 489,
+	474, 475, 476, 477, 478, 479, 480, 481, 482, 483,
+	484, 0, 505, 503, 504, 500, 501, 0, 0, 492,
+	498, 499, 506, 507, 509, 508, 510, 511, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 502,
+	513, 512, 0, 0, 449, 450, 451, 452, 453, 454,
+	455, 456, 457, 460, 461, 462, 490, 491, 441, 442,
+	443, 444, 445, 446, 89, 90, 70, 47, 94, 95,
 	36, 0, 107, 0, 27, 0, 0, 0, 112, 26,
 	18, 17, 0, 19, 0, 30, 0, 31, 0, 0,
 	20, 0, 0, 0, 21, 22, 35, 135, 106, 0,
-	23, 33, 0, 0, 34, 0, 0, 24, 0, 29,
-	87, 88, 0, 0, 0, 0, 0, 0, 0, 0,
+	23, 33, 0, 437, 34, 0, 0, 24, 0, 29,
+	87, 88, 181, 0, 0, 0, 0, 0, 108, 0,
 	51, 111, 0, 103, 99, 100, 101, 96, 97, 0,
 	0, 0, 0, 0, 0, 104, 0, 0, 0, 0,
 	136, 102, 98, 114, 0, 91, 92, 93, 0, 0,
-	0, 0, 86, 53, 0, 0, 0, 74, 75, 25,
-	0, 0, 0, 0, 0, 54, 55, 76, 63, 64,
-	65, 66, 67, 68, 69, 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, 105, 73, 14, 0, 32, 855, 60, 0,
+	0, 0, 86, 53, 167, 170, 171, 74, 75, 25,
+	0, 177, 179, 0, 0, 54, 55, 76, 63, 64,
+	65, 66, 67, 68, 69, 165, 164, 0, 0, 0,
+	0, 0, 0, 0, 0, 166, 168, 169, 176, 178,
+	163, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 105, 73, 14, 0, 32, 785, 60, 0,
 	52, 0, 0, 0, 57, 56, 58, 59, 71, 108,
 	89, 90, 70, 47, 94, 95, 36, 0, 107, 0,
 	27, 0, 0, 0, 112, 26, 18, 17, 0, 19,
@@ -951,7 +936,7 @@ var yyAct = [...]int{
 	69, 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, 105, 73,
-	14, 0, 32, 687, 60, 0, 52, 0, 0, 0,
+	14, 0, 32, 852, 60, 0, 52, 0, 0, 0,
 	57, 56, 58, 59, 71, 108, 89, 90, 70, 47,
 	94, 95, 36, 0, 107, 0, 27, 0, 0, 0,
 	112, 26, 18, 17, 0, 19, 0, 30, 0, 31,
@@ -966,7 +951,7 @@ var yyAct = [...]int{
 	63, 64, 65, 66, 67, 68, 69, 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, 105, 73, 14, 0, 32, 673,
+	0, 0, 0, 0, 105, 73, 14, 0, 32, 687,
 	60, 0, 52, 0, 0, 0, 57, 56, 58, 59,
 	71, 108, 89, 90, 70, 47, 94, 95, 36, 0,
 	107, 0, 27, 0, 0, 0, 112, 26, 18, 17,
@@ -982,7 +967,7 @@ var yyAct = [...]int{
 	67, 68, 69, 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,
-	105, 73, 14, 0, 32, 656, 60, 0, 52, 0,
+	105, 73, 14, 0, 32, 673, 60, 0, 52, 0,
 	0, 0, 57, 56, 58, 59, 71, 108, 89, 90,
 	70, 47, 94, 95, 36, 0, 107, 0, 27, 0,
 	0, 0, 112, 26, 18, 17, 0, 19, 0, 30,
@@ -998,80 +983,107 @@ var yyAct = [...]int{
 	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, 105, 73, 14, 0,
-	32, 0, 60, 0, 52, 0, 0, 0, 57, 56,
-	58, 59, 71, 108, 447, 448, 458, 459, 0, 0,
-	887, 0, 0, 0, 0, 0, 0, 0, 0, 463,
-	464, 465, 466, 467, 468, 469, 470, 471, 472, 473,
-	493, 494, 495, 496, 497, 485, 486, 487, 514, 488,
-	489, 474, 475, 476, 477, 478, 479, 480, 481, 482,
-	483, 484, 0, 505, 503, 504, 500, 501, 0, 0,
-	492, 498, 499, 506, 507, 509, 508, 510, 511, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	886, 513, 512, 114, 0, 449, 450, 451, 452, 453,
-	454, 455, 456, 457, 460, 461, 462, 490, 491, 441,
-	442, 443, 444, 445, 446, 0, 0, 0, 0, 0,
+	32, 656, 60, 0, 52, 0, 0, 0, 57, 56,
+	58, 59, 71, 108, 89, 90, 70, 47, 94, 95,
+	36, 0, 107, 0, 27, 0, 0, 0, 112, 26,
+	18, 17, 0, 19, 0, 30, 0, 31, 0, 0,
+	20, 0, 0, 0, 21, 22, 35, 135, 106, 0,
+	23, 33, 0, 0, 34, 0, 0, 24, 0, 29,
+	87, 88, 0, 0, 0, 0, 0, 0, 0, 0,
+	51, 111, 0, 103, 99, 100, 101, 96, 97, 0,
+	0, 0, 0, 0, 0, 104, 0, 0, 0, 0,
+	136, 102, 98, 114, 0, 91, 92, 93, 0, 0,
+	0, 0, 86, 53, 0, 0, 0, 74, 75, 25,
+	0, 0, 0, 0, 0, 54, 55, 76, 63, 64,
+	65, 66, 67, 68, 69, 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, 447, 448, 458, 459, 0, 0, 887, 0, 0,
-	0, 0, 0, 0, 0, 905, 463, 464, 465, 466,
-	467, 468, 469, 470, 471, 472, 473, 493, 494, 495,
-	496, 497, 485, 486, 487, 514, 488, 489, 474, 475,
-	476, 477, 478, 479, 480, 481, 482, 483, 484, 0,
-	505, 503, 504, 500, 501, 0, 0, 492, 498, 499,
-	506, 507, 509, 508, 510, 511, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 886, 513, 512,
-	114, 0, 449, 450, 451, 452, 453, 454, 455, 456,
-	457, 460, 461, 462, 490, 491, 441, 442, 443, 444,
-	445, 446, 89, 90, 70, 0, 94, 95, 119, 0,
+	0, 0, 105, 73, 14, 0, 32, 0, 60, 0,
+	52, 0, 0, 0, 57, 56, 58, 59, 71, 108,
+	447, 448, 458, 459, 0, 0, 886, 0, 0, 0,
+	0, 0, 0, 0, 0, 463, 464, 465, 466, 467,
+	468, 469, 470, 471, 472, 473, 493, 494, 495, 496,
+	497, 485, 486, 487, 514, 488, 489, 474, 475, 476,
+	477, 478, 479, 480, 481, 482, 483, 484, 0, 505,
+	503, 504, 500, 501, 0, 0, 492, 498, 499, 506,
+	507, 509, 508, 510, 511, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 885, 513, 512, 114,
+	0, 449, 450, 451, 452, 453, 454, 455, 456, 457,
+	460, 461, 462, 490, 491, 441, 442, 443, 444, 445,
+	446, 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, 447, 448, 458,
+	459, 0, 0, 886, 0, 0, 0, 0, 0, 0,
+	0, 905, 463, 464, 465, 466, 467, 468, 469, 470,
+	471, 472, 473, 493, 494, 495, 496, 497, 485, 486,
+	487, 514, 488, 489, 474, 475, 476, 477, 478, 479,
+	480, 481, 482, 483, 484, 0, 505, 503, 504, 500,
+	501, 0, 0, 492, 498, 499, 506, 507, 509, 508,
+	510, 511, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 885, 513, 512, 114, 0, 449, 450,
+	451, 452, 453, 454, 455, 456, 457, 460, 461, 462,
+	490, 491, 441, 442, 443, 444, 445, 446, 89, 90,
+	70, 0, 94, 95, 119, 0, 107, 0, 0, 0,
+	0, 0, 112, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 135, 106, 0, 0, 0, 0, 0, 876, 0,
+	0, 0, 0, 0, 87, 88, 0, 0, 0, 0,
+	0, 0, 0, 0, 51, 111, 0, 103, 99, 100,
+	101, 96, 97, 0, 0, 0, 0, 0, 0, 104,
+	0, 0, 0, 0, 136, 102, 98, 114, 540, 91,
+	92, 93, 0, 0, 0, 0, 86, 53, 0, 0,
+	0, 74, 75, 141, 0, 0, 0, 0, 0, 54,
+	55, 76, 63, 64, 65, 66, 67, 68, 69, 0,
+	0, 0, 89, 90, 70, 0, 94, 95, 119, 0,
 	107, 0, 0, 0, 0, 0, 112, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 135, 106, 0, 0, 0,
-	0, 0, 877, 0, 0, 0, 0, 0, 87, 88,
-	0, 0, 0, 0, 0, 0, 0, 0, 51, 111,
+	0, 0, 0, 0, 0, 0, 105, 73, 0, 0,
+	0, 0, 60, 536, 52, 135, 106, 0, 57, 56,
+	58, 59, 71, 108, 0, 0, 0, 0, 87, 88,
+	0, 0, 0, 0, 0, 0, 0, 0, 230, 111,
 	0, 103, 99, 100, 101, 96, 97, 0, 0, 0,
 	0, 0, 0, 104, 0, 0, 0, 0, 136, 102,
-	98, 114, 540, 91, 92, 93, 0, 0, 0, 0,
+	98, 114, 0, 91, 92, 93, 0, 0, 0, 0,
 	86, 53, 0, 0, 0, 74, 75, 141, 0, 0,
 	0, 0, 0, 54, 55, 76, 63, 64, 65, 66,
 	67, 68, 69, 0, 0, 0, 89, 90, 70, 0,
 	94, 95, 119, 0, 107, 0, 0, 0, 0, 0,
 	112, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	105, 73, 0, 0, 0, 0, 60, 536, 52, 135,
-	106, 0, 57, 56, 58, 59, 71, 108, 0, 0,
+	105, 73, 0, 0, 0, 0, 60, 0, 52, 135,
+	106, 229, 57, 56, 58, 59, 71, 108, 0, 0,
 	0, 0, 87, 88, 0, 0, 0, 0, 0, 0,
-	0, 0, 230, 111, 0, 103, 99, 100, 101, 96,
+	0, 0, 51, 111, 0, 103, 99, 100, 101, 96,
 	97, 0, 0, 0, 0, 0, 0, 104, 0, 0,
-	0, 0, 136, 102, 98, 114, 0, 91, 92, 93,
+	0, 0, 136, 102, 98, 114, 540, 91, 92, 93,
 	0, 0, 0, 0, 86, 53, 0, 0, 0, 74,
 	75, 141, 0, 0, 0, 0, 0, 54, 55, 76,
 	63, 64, 65, 66, 67, 68, 69, 0, 0, 0,
 	89, 90, 70, 0, 94, 95, 119, 0, 107, 0,
 	0, 0, 0, 0, 112, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 105, 73, 0, 0, 0, 0,
-	60, 0, 52, 135, 106, 229, 57, 56, 58, 59,
+	60, 0, 52, 135, 106, 0, 57, 56, 58, 59,
 	71, 108, 0, 0, 0, 0, 87, 88, 0, 0,
-	0, 0, 0, 0, 0, 0, 51, 111, 0, 103,
+	0, 0, 0, 0, 0, 0, 599, 111, 0, 103,
 	99, 100, 101, 96, 97, 0, 0, 0, 0, 0,
 	0, 104, 0, 0, 0, 0, 136, 102, 98, 114,
-	540, 91, 92, 93, 0, 0, 0, 0, 86, 53,
+	0, 91, 92, 93, 0, 0, 0, 0, 86, 53,
 	0, 0, 0, 74, 75, 141, 0, 0, 0, 0,
 	0, 54, 55, 76, 63, 64, 65, 66, 67, 68,
 	69, 0, 0, 0, 89, 90, 70, 0, 94, 95,
-	119, 0, 107, 0, 0, 0, 0, 0, 112, 0,
+	119, 430, 107, 0, 0, 0, 0, 0, 112, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 105, 73,
-	0, 0, 0, 0, 60, 0, 52, 135, 106, 0,
+	0, 0, 0, 0, 60, 0, 52, 135, 106, 598,
 	57, 56, 58, 59, 71, 108, 0, 0, 0, 0,
 	87, 88, 0, 0, 0, 0, 0, 0, 0, 0,
-	599, 111, 0, 103, 99, 100, 101, 96, 97, 0,
+	51, 111, 0, 103, 99, 100, 101, 96, 97, 0,
 	0, 0, 0, 0, 0, 104, 0, 0, 0, 0,
 	136, 102, 98, 114, 0, 91, 92, 93, 0, 0,
 	0, 0, 86, 53, 0, 0, 0, 74, 75, 141,
 	0, 0, 0, 0, 0, 54, 55, 76, 63, 64,
 	65, 66, 67, 68, 69, 0, 0, 0, 89, 90,
-	70, 0, 94, 95, 119, 430, 107, 0, 0, 0,
+	70, 0, 94, 95, 119, 0, 107, 0, 0, 0,
 	0, 0, 112, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 105, 73, 0, 0, 0, 0, 60, 0,
-	52, 135, 106, 598, 57, 56, 58, 59, 71, 108,
+	52, 135, 106, 0, 57, 56, 58, 59, 71, 108,
 	0, 0, 0, 0, 87, 88, 0, 0, 0, 0,
 	0, 0, 0, 0, 51, 111, 0, 103, 99, 100,
 	101, 96, 97, 0, 0, 0, 0, 0, 0, 104,
@@ -1082,7 +1094,7 @@ var yyAct = [...]int{
 	0, 0, 89, 90, 70, 0, 94, 95, 119, 0,
 	107, 0, 0, 0, 0, 0, 112, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 105, 73, 0, 0,
-	0, 0, 60, 0, 52, 135, 106, 0, 57, 56,
+	0, 0, 60, 0, 52, 135, 106, 392, 57, 56,
 	58, 59, 71, 108, 0, 0, 0, 0, 87, 88,
 	0, 0, 0, 0, 0, 0, 0, 0, 51, 111,
 	0, 103, 99, 100, 101, 96, 97, 0, 0, 0,
@@ -1093,275 +1105,275 @@ var yyAct = [...]int{
 	67, 68, 69, 0, 0, 0, 89, 90, 70, 0,
 	94, 95, 119, 0, 107, 0, 0, 0, 0, 0,
 	112, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	105, 73, 0, 0, 0, 0, 60, 0, 52, 135,
-	106, 392, 57, 56, 58, 59, 71, 108, 0, 0,
+	105, 73, 0, 0, 0, 368, 60, 0, 52, 135,
+	106, 0, 57, 56, 58, 59, 71, 108, 0, 0,
 	0, 0, 87, 88, 0, 0, 0, 0, 0, 0,
 	0, 0, 51, 111, 0, 103, 99, 100, 101, 96,
 	97, 0, 0, 0, 0, 0, 0, 104, 0, 0,
 	0, 0, 136, 102, 98, 114, 0, 91, 92, 93,
 	0, 0, 0, 0, 86, 53, 0, 0, 0, 74,
 	75, 141, 0, 0, 0, 0, 0, 54, 55, 76,
-	63, 64, 65, 66, 67, 68, 69, 0, 0, 0,
-	89, 90, 70, 0, 94, 95, 119, 0, 107, 0,
-	0, 0, 0, 0, 112, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 105, 73, 0, 0, 0, 368,
-	60, 0, 52, 135, 106, 0, 57, 56, 58, 59,
-	71, 108, 0, 0, 0, 0, 87, 88, 0, 0,
-	0, 0, 0, 0, 0, 0, 51, 111, 0, 103,
-	99, 100, 101, 96, 97, 0, 0, 0, 0, 0,
-	0, 104, 0, 0, 0, 0, 136, 102, 98, 114,
-	0, 91, 92, 93, 0, 0, 0, 0, 86, 53,
-	0, 0, 0, 74, 75, 141, 0, 0, 0, 0,
-	0, 54, 55, 76, 63, 64, 65, 66, 67, 68,
-	69, 0, 0, 157, 159, 158, 181, 0, 0, 0,
+	63, 64, 65, 66, 67, 68, 69, 0, 0, 157,
+	159, 158, 181, 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, 105, 73,
-	183, 180, 0, 0, 60, 0, 52, 0, 0, 0,
-	57, 56, 58, 59, 71, 108, 155, 156, 167, 170,
-	171, 172, 173, 174, 175, 177, 179, 0, 157, 159,
-	158, 181, 0, 0, 0, 0, 761, 182, 161, 165,
-	164, 0, 0, 0, 0, 0, 160, 0, 162, 166,
-	168, 169, 176, 178, 163, 183, 180, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 155, 156, 167, 170, 171, 172, 173, 174, 175,
-	177, 179, 0, 157, 159, 158, 181, 0, 0, 719,
-	0, 0, 182, 161, 165, 164, 0, 0, 0, 0,
-	0, 160, 0, 162, 166, 168, 169, 176, 178, 163,
-	183, 180, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 155, 156, 167, 170,
-	171, 172, 173, 174, 175, 177, 179, 0, 0, 0,
-	699, 157, 159, 158, 181, 0, 0, 182, 161, 165,
-	164, 0, 0, 0, 0, 0, 160, 0, 162, 166,
-	168, 169, 176, 178, 163, 0, 0, 0, 183, 180,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 155, 156, 167, 170, 171, 172,
-	173, 174, 175, 177, 179, 0, 0, 0, 697, 157,
-	159, 158, 181, 0, 0, 182, 161, 165, 164, 0,
-	0, 0, 0, 0, 160, 0, 162, 166, 168, 169,
-	176, 178, 163, 0, 0, 0, 183, 180, 0, 0,
+	0, 0, 0, 0, 105, 73, 183, 180, 0, 0,
+	60, 0, 52, 0, 0, 0, 57, 56, 58, 59,
+	71, 108, 155, 156, 167, 170, 171, 172, 173, 174,
+	175, 177, 179, 0, 157, 159, 158, 181, 0, 0,
+	0, 0, 761, 182, 161, 165, 164, 0, 0, 0,
+	0, 0, 160, 0, 162, 166, 168, 169, 176, 178,
+	163, 183, 180, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 155, 156, 167,
+	170, 171, 172, 173, 174, 175, 177, 179, 0, 157,
+	159, 158, 181, 0, 0, 719, 0, 0, 182, 161,
+	165, 164, 0, 0, 0, 0, 0, 160, 0, 162,
+	166, 168, 169, 176, 178, 163, 183, 180, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 155, 156, 167, 170, 171, 172, 173, 174,
-	175, 177, 179, 0, 0, 0, 688, 157, 159, 158,
+	175, 177, 179, 0, 0, 0, 699, 157, 159, 158,
 	181, 0, 0, 182, 161, 165, 164, 0, 0, 0,
 	0, 0, 160, 0, 162, 166, 168, 169, 176, 178,
 	163, 0, 0, 0, 183, 180, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	155, 156, 167, 170, 171, 172, 173, 174, 175, 177,
-	179, 0, 157, 159, 158, 181, 0, 0, 684, 0,
-	0, 182, 161, 165, 164, 0, 0, 0, 0, 0,
-	160, 0, 162, 166, 168, 169, 176, 178, 163, 183,
-	180, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 155, 156, 167, 170, 171,
-	172, 173, 174, 175, 177, 179, 0, 157, 159, 158,
-	181, 0, 0, 683, 0, 0, 182, 161, 165, 164,
-	0, 0, 0, 0, 0, 160, 0, 162, 166, 168,
-	169, 176, 178, 163, 183, 180, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	155, 156, 167, 170, 171, 172, 173, 174, 175, 177,
-	179, 0, 0, 0, 639, 157, 159, 158, 181, 0,
+	179, 0, 0, 0, 697, 157, 159, 158, 181, 0,
 	0, 182, 161, 165, 164, 0, 0, 0, 0, 0,
 	160, 0, 162, 166, 168, 169, 176, 178, 163, 0,
 	0, 0, 183, 180, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 155, 156,
 	167, 170, 171, 172, 173, 174, 175, 177, 179, 0,
-	157, 159, 158, 181, 0, 0, 628, 0, 0, 182,
-	161, 165, 164, 0, 0, 0, 0, 0, 160, 0,
-	162, 166, 168, 169, 176, 178, 163, 183, 180, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 155, 156, 167, 170, 171, 172, 173,
-	174, 175, 177, 179, 0, 157, 159, 158, 181, 0,
-	0, 627, 0, 0, 182, 161, 165, 164, 0, 0,
-	0, 0, 0, 160, 0, 162, 166, 168, 169, 176,
-	178, 163, 183, 180, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 155, 156,
-	167, 170, 171, 172, 173, 174, 175, 177, 179, 0,
-	0, 0, 610, 157, 159, 158, 181, 0, 0, 182,
+	0, 0, 688, 157, 159, 158, 181, 0, 0, 182,
 	161, 165, 164, 0, 0, 0, 0, 0, 160, 0,
 	162, 166, 168, 169, 176, 178, 163, 0, 0, 0,
 	183, 180, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 155, 156, 167, 170,
 	171, 172, 173, 174, 175, 177, 179, 0, 157, 159,
-	158, 181, 0, 0, 601, 0, 0, 182, 161, 165,
+	158, 181, 0, 0, 684, 0, 0, 182, 161, 165,
 	164, 0, 0, 0, 0, 0, 160, 0, 162, 166,
 	168, 169, 176, 178, 163, 183, 180, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 155, 156, 167, 170, 171, 172, 173, 174, 175,
-	177, 179, 572, 0, 0, 591, 157, 159, 158, 181,
+	177, 179, 0, 157, 159, 158, 181, 0, 0, 683,
+	0, 0, 182, 161, 165, 164, 0, 0, 0, 0,
+	0, 160, 0, 162, 166, 168, 169, 176, 178, 163,
+	183, 180, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 155, 156, 167, 170,
+	171, 172, 173, 174, 175, 177, 179, 0, 0, 0,
+	639, 157, 159, 158, 181, 0, 0, 182, 161, 165,
+	164, 0, 0, 0, 0, 0, 160, 0, 162, 166,
+	168, 169, 176, 178, 163, 0, 0, 0, 183, 180,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 155, 156, 167, 170, 171, 172,
+	173, 174, 175, 177, 179, 0, 157, 159, 158, 181,
+	0, 0, 628, 0, 0, 182, 161, 165, 164, 0,
+	0, 0, 0, 0, 160, 0, 162, 166, 168, 169,
+	176, 178, 163, 183, 180, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 155,
+	156, 167, 170, 171, 172, 173, 174, 175, 177, 179,
+	0, 157, 159, 158, 181, 0, 0, 627, 0, 0,
+	182, 161, 165, 164, 0, 0, 0, 0, 0, 160,
+	0, 162, 166, 168, 169, 176, 178, 163, 183, 180,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 155, 156, 167, 170, 171, 172,
+	173, 174, 175, 177, 179, 0, 0, 0, 610, 157,
+	159, 158, 181, 0, 0, 182, 161, 165, 164, 0,
+	0, 0, 0, 0, 160, 0, 162, 166, 168, 169,
+	176, 178, 163, 0, 0, 0, 183, 180, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 155, 156, 167, 170, 171, 172, 173, 174,
+	175, 177, 179, 0, 157, 159, 158, 181, 0, 0,
+	601, 0, 0, 182, 161, 165, 164, 0, 0, 0,
+	0, 0, 160, 0, 162, 166, 168, 169, 176, 178,
+	163, 183, 180, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 155, 156, 167,
+	170, 171, 172, 173, 174, 175, 177, 179, 572, 0,
+	0, 591, 157, 159, 158, 181, 0, 0, 182, 161,
+	165, 164, 0, 0, 0, 0, 0, 160, 0, 162,
+	166, 168, 169, 176, 178, 163, 0, 0, 0, 183,
+	180, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 155, 156, 167, 170, 171,
+	172, 173, 174, 175, 177, 179, 0, 157, 159, 158,
+	181, 0, 0, 589, 0, 0, 182, 161, 165, 164,
+	0, 0, 0, 0, 0, 160, 0, 162, 166, 168,
+	169, 176, 178, 163, 183, 180, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	155, 156, 167, 170, 171, 172, 173, 174, 175, 177,
+	179, 0, 157, 159, 158, 181, 0, 0, 0, 0,
+	0, 182, 161, 165, 164, 0, 0, 0, 0, 0,
+	160, 0, 162, 166, 168, 169, 176, 178, 163, 183,
+	180, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 155, 156, 167, 170, 171,
+	172, 173, 174, 175, 177, 179, 0, 157, 159, 158,
+	181, 568, 0, 0, 0, 0, 182, 161, 165, 164,
+	0, 0, 0, 0, 0, 160, 0, 162, 166, 168,
+	169, 176, 178, 163, 183, 180, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	155, 156, 167, 170, 171, 172, 173, 174, 175, 177,
+	179, 0, 157, 159, 158, 181, 0, 0, 563, 0,
+	0, 182, 161, 165, 164, 0, 0, 0, 0, 0,
+	160, 0, 162, 166, 168, 169, 176, 178, 163, 183,
+	180, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 155, 156, 167, 170, 171,
+	172, 173, 174, 175, 177, 179, 0, 157, 159, 158,
+	181, 0, 0, 559, 0, 0, 182, 161, 165, 164,
+	0, 0, 0, 0, 0, 160, 0, 162, 166, 168,
+	169, 176, 178, 163, 183, 180, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 416, 0, 0, 0,
+	155, 156, 167, 170, 171, 172, 173, 174, 175, 177,
+	179, 0, 0, 0, 0, 0, 0, 0, 421, 0,
+	0, 182, 161, 165, 164, 157, 159, 158, 181, 0,
+	160, 0, 162, 166, 168, 169, 176, 178, 163, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 183, 180, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 155, 156,
+	167, 170, 171, 172, 173, 174, 175, 177, 179, 0,
+	157, 159, 158, 181, 0, 0, 0, 0, 0, 182,
+	161, 165, 164, 0, 0, 0, 0, 0, 160, 0,
+	162, 166, 168, 169, 176, 178, 163, 183, 180, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 155, 156, 167, 170, 171, 172, 173,
+	174, 175, 177, 179, 0, 0, 0, 0, 376, 157,
+	159, 158, 181, 0, 182, 161, 165, 164, 0, 0,
+	0, 0, 0, 160, 0, 162, 166, 168, 169, 176,
+	178, 163, 0, 0, 0, 0, 183, 180, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 155, 156, 167, 170, 171, 172, 173, 174,
+	175, 177, 179, 0, 0, 0, 0, 154, 157, 159,
+	158, 181, 0, 182, 161, 165, 164, 0, 0, 0,
+	0, 0, 160, 0, 162, 166, 168, 169, 176, 178,
+	163, 0, 0, 0, 0, 183, 180, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 155, 156, 167, 170, 171, 172, 173, 174, 175,
+	177, 179, 0, 0, 159, 158, 181, 0, 0, 0,
+	0, 0, 182, 161, 165, 164, 0, 0, 0, 0,
+	0, 160, 0, 162, 166, 168, 169, 176, 178, 163,
+	183, 180, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 155, 156, 167, 170,
+	171, 172, 173, 174, 175, 177, 179, 0, 0, 0,
+	158, 181, 0, 0, 0, 0, 0, 182, 161, 165,
+	164, 0, 0, 0, 0, 0, 160, 0, 162, 166,
+	168, 169, 176, 178, 163, 183, 180, 432, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 155, 156, 167, 170, 171, 172, 173, 174, 175,
+	177, 179, 0, 0, 0, 0, 0, 0, 0, 181,
 	0, 0, 182, 161, 165, 164, 0, 0, 0, 0,
 	0, 160, 0, 162, 166, 168, 169, 176, 178, 163,
 	0, 0, 0, 183, 180, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 155,
 	156, 167, 170, 171, 172, 173, 174, 175, 177, 179,
-	0, 157, 159, 158, 181, 0, 0, 589, 0, 0,
+	0, 0, 0, 0, 181, 0, 0, 0, 0, 0,
 	182, 161, 165, 164, 0, 0, 0, 0, 0, 160,
 	0, 162, 166, 168, 169, 176, 178, 163, 183, 180,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 155, 156, 167, 170, 171, 172,
-	173, 174, 175, 177, 179, 0, 157, 159, 158, 181,
+	173, 174, 175, 177, 179, 0, 0, 0, 0, 181,
 	0, 0, 0, 0, 0, 182, 161, 165, 164, 0,
 	0, 0, 0, 0, 160, 0, 162, 166, 168, 169,
 	176, 178, 163, 183, 180, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 155,
 	156, 167, 170, 171, 172, 173, 174, 175, 177, 179,
-	0, 157, 159, 158, 181, 568, 0, 0, 0, 0,
-	182, 161, 165, 164, 0, 0, 0, 0, 0, 160,
-	0, 162, 166, 168, 169, 176, 178, 163, 183, 180,
+	0, 0, 0, 181, 0, 0, 0, 0, 0, 0,
+	0, 161, 165, 164, 0, 0, 0, 0, 0, 160,
+	0, 162, 166, 168, 169, 176, 178, 163, 180, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 155, 156, 167, 170, 171, 172,
-	173, 174, 175, 177, 179, 0, 157, 159, 158, 181,
-	0, 0, 563, 0, 0, 182, 161, 165, 164, 0,
-	0, 0, 0, 0, 160, 0, 162, 166, 168, 169,
-	176, 178, 163, 183, 180, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 155,
-	156, 167, 170, 171, 172, 173, 174, 175, 177, 179,
-	0, 157, 159, 158, 181, 0, 0, 559, 0, 0,
-	182, 161, 165, 164, 0, 0, 0, 0, 0, 160,
-	0, 162, 166, 168, 169, 176, 178, 163, 183, 180,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	416, 0, 0, 0, 155, 156, 167, 170, 171, 172,
-	173, 174, 175, 177, 179, 0, 0, 0, 0, 0,
-	0, 0, 421, 0, 0, 182, 161, 165, 164, 157,
-	159, 158, 181, 0, 160, 0, 162, 166, 168, 169,
-	176, 178, 163, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 183, 180, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 155, 156, 167, 170, 171, 172, 173, 174,
-	175, 177, 179, 0, 157, 159, 158, 181, 0, 0,
-	0, 0, 0, 182, 161, 165, 164, 0, 0, 0,
-	0, 0, 160, 0, 162, 166, 168, 169, 176, 178,
-	163, 183, 180, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 155, 156, 167,
-	170, 171, 172, 173, 174, 175, 177, 179, 0, 0,
-	0, 0, 376, 157, 159, 158, 181, 0, 182, 161,
-	165, 164, 0, 0, 0, 0, 0, 160, 0, 162,
-	166, 168, 169, 176, 178, 163, 0, 0, 0, 0,
-	183, 180, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 155, 156, 167, 170,
-	171, 172, 173, 174, 175, 177, 179, 0, 0, 0,
-	0, 154, 157, 159, 158, 181, 0, 182, 161, 165,
-	164, 0, 0, 0, 0, 0, 160, 0, 162, 166,
-	168, 169, 176, 178, 163, 0, 0, 0, 0, 183,
-	180, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 155, 156, 167, 170, 171,
-	172, 173, 174, 175, 177, 179, 0, 0, 159, 158,
-	181, 0, 0, 0, 0, 0, 182, 161, 165, 164,
-	0, 0, 0, 0, 0, 160, 0, 162, 166, 168,
-	169, 176, 178, 163, 183, 180, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	155, 156, 167, 170, 171, 172, 173, 174, 175, 177,
-	179, 0, 0, 0, 158, 181, 0, 0, 0, 0,
-	0, 182, 161, 165, 164, 0, 0, 0, 0, 0,
-	160, 0, 162, 166, 168, 169, 176, 178, 163, 183,
-	180, 432, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 155, 156, 167, 170, 171,
-	172, 173, 174, 175, 177, 179, 0, 0, 0, 0,
-	0, 0, 0, 181, 0, 0, 182, 161, 165, 164,
-	0, 0, 0, 0, 0, 160, 0, 162, 166, 168,
-	169, 176, 178, 163, 0, 0, 0, 183, 180, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 155, 156, 167, 170, 171, 172, 173,
-	174, 175, 177, 179, 0, 0, 0, 0, 181, 0,
-	0, 0, 0, 0, 182, 161, 165, 164, 0, 0,
+	0, 0, 0, 181, 156, 167, 170, 171, 172, 173,
+	174, 175, 177, 179, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 161, 165, 164, 180, 0,
 	0, 0, 0, 160, 0, 162, 166, 168, 169, 176,
-	178, 163, 183, 180, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 155, 156,
-	167, 170, 171, 172, 173, 174, 175, 177, 179, 0,
-	0, 0, 0, 181, 0, 0, 0, 0, 0, 182,
-	161, 165, 164, 0, 0, 0, 0, 0, 160, 0,
-	162, 166, 168, 169, 176, 178, 163, 183, 180, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 155, 156, 167, 170, 171, 172, 173,
-	174, 175, 177, 179, 0, 0, 0, 181, 0, 0,
-	0, 0, 0, 0, 0, 161, 165, 164, 0, 0,
+	178, 163, 0, 181, 0, 167, 170, 171, 172, 173,
+	174, 175, 177, 179, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 161, 165, 164, 180, 0,
 	0, 0, 0, 160, 0, 162, 166, 168, 169, 176,
-	178, 163, 180, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 181, 156, 167,
-	170, 171, 172, 173, 174, 175, 177, 179, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 161,
-	165, 164, 180, 0, 0, 0, 0, 160, 0, 162,
-	166, 168, 169, 176, 178, 163, 0, 181, 0, 167,
-	170, 171, 172, 173, 174, 175, 177, 179, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 161,
-	165, 164, 180, 0, 0, 0, 0, 160, 0, 162,
-	166, 168, 169, 176, 178, 163, 0, 181, 0, 167,
-	170, 171, 172, 173, 174, 175, 177, 179, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 161,
-	165, 164, 180, 0, 0, 0, 0, 0, 0, 162,
-	166, 168, 169, 176, 178, 163, 0, 181, 0, 167,
-	170, 171, 172, 173, 174, 175, 177, 179, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 161,
-	165, 164, 180, 0, 0, 0, 0, 0, 0, 0,
-	166, 168, 169, 176, 178, 163, 0, 0, 0, 167,
-	170, 171, 172, 173, 174, 175, 177, 179, 0, 0,
+	178, 163, 0, 181, 0, 167, 170, 171, 172, 173,
+	174, 175, 177, 179, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 161, 165, 164, 180, 0,
+	0, 0, 0, 0, 0, 162, 166, 168, 169, 176,
+	178, 163, 0, 181, 0, 167, 170, 171, 172, 173,
+	174, 175, 177, 179, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 161, 165, 164, 180, 0,
+	0, 0, 0, 0, 0, 0, 166, 168, 169, 176,
+	178, 163, 0, 0, 0, 167, 170, 171, 172, 173,
+	174, 175, 177, 179, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 165, 164, 447, 448,
+	458, 459, 0, 0, 438, 0, 166, 168, 169, 176,
+	178, 163, 0, 463, 464, 465, 466, 467, 468, 469,
+	470, 471, 472, 473, 493, 494, 495, 496, 497, 485,
+	486, 487, 514, 488, 489, 474, 475, 476, 477, 478,
+	479, 480, 481, 482, 483, 484, 0, 505, 503, 504,
+	500, 501, 0, 0, 492, 498, 499, 506, 507, 509,
+	508, 510, 511, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 502, 513, 512, 0, 0, 449,
+	450, 451, 452, 453, 454, 455, 456, 457, 460, 461,
+	462, 490, 491, 441, 442, 443, 444, 445, 446, 447,
+	448, 458, 459, 0, 0, 921, 0, 0, 0, 0,
+	0, 0, 0, 0, 463, 464, 465, 466, 467, 468,
+	469, 470, 471, 472, 473, 493, 494, 495, 496, 497,
+	485, 486, 487, 514, 488, 489, 474, 475, 476, 477,
+	478, 479, 480, 481, 482, 483, 484, 0, 505, 503,
+	504, 500, 501, 0, 0, 492, 498, 499, 506, 507,
+	509, 508, 510, 511, 119, 0, 107, 0, 0, 0,
+	0, 0, 112, 0, 0, 502, 513, 512, 0, 0,
+	449, 450, 451, 452, 453, 454, 455, 456, 457, 460,
+	461, 462, 490, 491, 750, 751, 752, 749, 748, 747,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	165, 164, 447, 448, 458, 459, 0, 0, 438, 0,
-	166, 168, 169, 176, 178, 163, 0, 463, 464, 465,
-	466, 467, 468, 469, 470, 471, 472, 473, 493, 494,
-	495, 496, 497, 485, 486, 487, 514, 488, 489, 474,
-	475, 476, 477, 478, 479, 480, 481, 482, 483, 484,
-	0, 505, 503, 504, 500, 501, 0, 0, 492, 498,
-	499, 506, 507, 509, 508, 510, 511, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 502, 513,
-	512, 0, 0, 449, 450, 451, 452, 453, 454, 455,
-	456, 457, 460, 461, 462, 490, 491, 441, 442, 443,
-	444, 445, 446, 447, 448, 458, 459, 0, 0, 920,
-	0, 0, 0, 0, 0, 0, 0, 0, 463, 464,
-	465, 466, 467, 468, 469, 470, 471, 472, 473, 493,
-	494, 495, 496, 497, 485, 486, 487, 514, 488, 489,
-	474, 475, 476, 477, 478, 479, 480, 481, 482, 483,
-	484, 0, 505, 503, 504, 500, 501, 0, 0, 492,
-	498, 499, 506, 507, 509, 508, 510, 511, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 502,
-	513, 512, 0, 0, 449, 450, 451, 452, 453, 454,
-	455, 456, 457, 460, 461, 462, 490, 491, 750, 751,
-	752, 749, 748, 747,
+	0, 0, 0, 0, 669, 111, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 136, 0, 0, 114, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 236, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 234, 0, 670, 0, 0, 668, 0, 0,
+	0, 0, 0, 108,
 }
 var yyPact = [...]int{
 
-	-1000, -1000, 1253, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	265, 433, 613, 722, -1000, -1000, -1000, 262, 4344, 261,
-	259, 5526, 5526, 5526, 136, 711, 5526, -1000, 6745, 258,
-	254, 253, -1000, 413, 5526, 775, 290, 0, 530, 771,
-	770, 756, 504, 513, 409, -1000, -1000, 250, -1000, -1000,
-	223, 247, 4842, 5526, 222, 222, 5526, 5526, 5526, 5526,
-	5526, -1000, -1000, 5526, 5526, 5526, 5526, 5526, 5526, 5526,
-	240, 5526, -1000, 876, 5526, 5526, 5526, -1000, -1000, -1000,
-	-1000, 86, -1000, 535, 514, -1000, 539, 236, 230, 5526,
-	5526, 228, 5526, 5526, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, 758, 856, 0, -1000, 110, 176,
-	176, 226, -1000, 482, 709, 159, 709, 302, -1000, -1000,
-	353, 616, 77, 634, 709, -1000, -1000, -1000, -1000, 42,
-	-1000, -49, 3149, 5526, 627, 0, 475, 5526, 5526, 352,
-	6804, 647, 351, 350, 41, -1000, -1000, 39, -1000, -1000,
-	-53, -18, -1000, 6804, -1000, 5526, 5526, 5526, 5526, 5526,
-	5526, 5526, 5526, 5526, 5526, 5526, 5526, 5526, 5526, 5526,
-	5526, 5526, 5526, 5526, 5526, 5526, 5526, 5526, 5526, 5526,
-	5526, 252, 5412, 5526, 222, 5526, 722, -1000, 6686, 344,
-	-1000, 753, -1000, 746, -1000, 569, -1000, 577, 220, 4344,
-	215, 343, 275, 5298, 5526, 5526, 5526, 5526, 5526, 5526,
-	5526, 5526, 5526, 5526, 5526, 5526, 5526, -1000, -1000, 5526,
-	5526, 5526, 98, 4842, 92, -10, -1000, -1000, 6631, 222,
-	211, -1000, -1000, 86, 5526, -1000, -1000, 4842, -1000, 415,
-	415, 469, 415, 6563, 415, 415, 415, 415, 415, 415,
-	415, -1000, 5526, 415, 400, 700, 847, -1000, 191, 5184,
-	222, 7027, 6972, 7027, 5526, 3463, 3463, 176, -1000, 505,
-	210, 176, -1000, -1000, 5526, 5526, 6804, 6804, 5526, 6804,
-	6804, 691, -1000, 740, 501, 700, 207, 5526, -1000, -1000,
-	4728, -1000, 4842, 728, 482, 342, 482, -1000, -1000, 1095,
-	-1000, 337, -28, 582, 709, -1000, 600, 516, 725, 574,
-	-1000, -1000, 722, 5526, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, 200, 6508, 199, -1000, 336, -11, 6804, 6453,
-	-1000, -1000, -1000, -1000, 136, -1000, 708, 5526, -1000, 5526,
-	7136, 7176, 6859, 7027, 6914, 7216, 7296, 7256, 64, 64,
-	64, 469, 415, 469, 469, 164, 164, 3525, 3525, 3525,
-	3525, 270, 270, 270, 270, 3525, -1000, 6398, 5526, 7082,
-	-13, -1000, -1000, 6343, -30, 2991, -1000, -1000, -1000, 186,
-	569, 563, 635, 410, -1000, 635, 5526, -1000, 5526, -1000,
-	-1000, 7027, 5526, 7027, 7027, 7027, 7027, 7027, 7027, 7027,
-	7027, 7027, 7027, 7027, 7027, 6804, 6288, 88, 6230, 176,
-	-1000, 5526, -1000, 157, -55, 4842, 5070, -1000, 4842, 6175,
-	76, -1000, 155, -1000, -1000, -1000, -1000, 272, 719, 6117,
-	81, 366, 5526, 49, 176, -1000, -1000, 5526, -1000, -1000,
+	-1000, -1000, 1249, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	229, 459, 569, 708, -1000, -1000, -1000, 228, 4340, 226,
+	225, 5522, 5522, 5522, 133, 628, 5522, -1000, 6741, 222,
+	220, 219, -1000, 371, 5522, 759, 236, -2, 476, 756,
+	750, 749, 433, 470, 772, -1000, -1000, 215, -1000, -1000,
+	203, 212, 4838, 5522, 627, 627, 5522, 5522, 5522, 5522,
+	5522, -1000, -1000, 5522, 5522, 5522, 5522, 5522, 5522, 5522,
+	211, 5522, -1000, 755, 5522, 5522, 5522, -1000, -1000, -1000,
+	-1000, 89, -1000, 505, 504, -1000, 252, 209, 208, 5522,
+	5522, 207, 5522, 5522, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, 666, 735, -2, -1000, 98, 173,
+	173, 204, -1000, 461, 702, 149, 702, 298, -1000, -1000,
+	315, 549, 42, 542, 702, -1000, -1000, -1000, -1000, 41,
+	-1000, -53, 3145, 5522, 625, -2, 451, 5522, 5522, 314,
+	6800, 622, 312, 310, 39, -1000, -1000, -16, -1000, -1000,
+	-58, -28, -1000, 6800, -1000, 5522, 5522, 5522, 5522, 5522,
+	5522, 5522, 5522, 5522, 5522, 5522, 5522, 5522, 5522, 5522,
+	5522, 5522, 5522, 5522, 5522, 5522, 5522, 5522, 5522, 5522,
+	5522, 431, 5408, 5522, 627, 5522, 708, -1000, 6682, 304,
+	-1000, 739, -1000, 725, -1000, 563, -1000, 564, 202, 4340,
+	198, 303, 187, 5294, 5522, 5522, 5522, 5522, 5522, 5522,
+	5522, 5522, 5522, 5522, 5522, 5522, 5522, -1000, -1000, 5522,
+	5522, 5522, 96, 4838, 80, -12, -1000, -1000, 6627, 627,
+	197, -1000, -1000, 89, 5522, -1000, -1000, 4838, -1000, 391,
+	391, 425, 391, 6559, 391, 391, 391, 391, 391, 391,
+	391, -1000, 5522, 391, 369, 727, 626, -1000, 174, 5180,
+	627, 7023, 6968, 7023, 5522, 3459, 3459, 173, -1000, 499,
+	168, 173, -1000, -1000, 5522, 5522, 6800, 6800, 5522, 6800,
+	6800, 573, -1000, 624, 440, 727, 193, 5522, -1000, -1000,
+	4724, -1000, 4838, 714, 461, 302, 461, -1000, -1000, 1091,
+	-1000, 301, -29, 531, 702, -1000, 522, 478, 710, 528,
+	-1000, -1000, 708, 5522, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, 191, 6504, 181, -1000, 300, -13, 6800, 6449,
+	-1000, -1000, -1000, -1000, 133, -1000, 686, 5522, -1000, 5522,
+	7132, 7172, 6855, 7023, 6910, 7212, 7292, 7252, 136, 136,
+	136, 425, 391, 425, 425, 64, 64, 3521, 3521, 3521,
+	3521, 270, 270, 270, 270, 3521, -1000, 6394, 5522, 7078,
+	-18, -1000, -1000, 6339, -33, 2987, -1000, -1000, -1000, 180,
+	563, 553, 543, 366, -1000, 543, 5522, -1000, 5522, -1000,
+	-1000, 7023, 5522, 7023, 7023, 7023, 7023, 7023, 7023, 7023,
+	7023, 7023, 7023, 7023, 7023, 6800, 6284, 52, 6226, 173,
+	-1000, 5522, -1000, 148, -62, 4838, 5066, -1000, 4838, 6171,
+	49, -1000, 147, -1000, -1000, -1000, -1000, 224, 703, 6113,
+	104, 337, 5522, 40, 173, -1000, -1000, 5522, -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,
@@ -1369,65 +1381,65 @@ var yyPact = [...]int{
 	-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, 176, -1000, -1000, -1000, -1000,
-	136, 5526, 5526, 98, 136, 569, -15, -1000, 6804, 6062,
-	6007, -1000, -1000, -1000, 404, 5949, -1000, -16, -1000, 6804,
-	5526, 154, -1000, -1000, 937, -1000, -1000, -1000, 515, 566,
-	-1000, 709, 552, 685, -1000, 507, -1000, 6804, 152, 4188,
-	5526, 5526, 5526, 202, -1000, -1000, 6804, -1000, 5526, 7082,
-	151, 222, 297, 4032, -1000, 174, 404, 563, -1000, 635,
-	-1000, -1000, 406, -39, -1000, 5894, 5839, 2833, 7296, 3876,
-	-1000, -1000, -1000, 5781, -59, 5526, -1000, 6804, 222, 172,
-	147, -1000, -1000, -1000, 47, -1000, -1000, 643, -1000, -1000,
-	-1000, -1000, 5526, -1000, 7027, -1000, -1000, 5723, -1000, -1000,
-	43, 5665, -1000, -1000, 563, 141, 5526, -1000, -1000, 138,
-	-33, -1000, 1, -1000, -1000, 749, -1000, -1000, -1000, -1000,
-	131, 4956, 6804, -1000, -1000, 709, 502, -34, -1000, -1000,
-	709, 685, -1000, 335, -1000, -1000, -1000, 5610, 323, 6804,
-	-1000, 322, 321, 7082, 318, -1000, 124, 558, 222, 168,
-	4842, -1000, -1000, -1000, 619, 404, 118, -1000, 403, -39,
-	1277, -1000, 635, 4344, 203, 317, -1000, -1000, -1000, 5526,
-	7027, -1000, 4842, -59, -1000, -1000, 5555, -1000, -1000, -1000,
-	-1000, -1000, -1000, 100, 404, 468, -1000, -1000, -1000, -1000,
-	-36, -1000, 709, 365, 685, -1000, -34, -1000, 2675, 315,
-	5526, 408, -1000, 773, -1000, -1000, 3564, 297, -1000, 4842,
-	40, 2517, -1000, 162, 401, 112, 594, 398, -1000, -1000,
-	-1000, 680, 707, 635, 607, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, 1119, -1000, -1000, -1000, -1000, 3307, 7027,
-	107, 364, 396, -1000, 404, -1000, 701, -1000, 356, 709,
-	-36, -1000, -1000, 255, 314, -1000, 103, -1000, 5526, 166,
-	399, 313, 741, -1000, -1000, -1000, 102, -1000, 101, -1000,
-	312, 635, -1000, 100, 100, 111, -1000, 961, -29, -1000,
-	-57, 7448, 0, -40, -1000, -1000, 3307, -59, -1000, -1000,
-	527, -1000, -63, -1000, -1000, 45, -1000, -1000, 3720, 339,
-	-1000, -1000, -1000, -1000, -1000, 311, 2359, 3564, -1000, -1000,
-	85, -1000, 2201, 380, 377, 139, 778, -1000, -1000, 680,
-	-1000, 5526, -31, -1000, -70, 7448, -1000, -1000, 4627, 744,
-	5526, 5526, -1000, -1000, -1000, -1000, -1000, 3307, -1000, 306,
-	-1000, 99, 635, -1000, -1000, -1000, -35, -1000, -1000, 676,
-	-1000, -1000, 6804, -1000, 7448, 5526, -1000, -1000, 4500, -1000,
-	303, 298, 590, 615, 488, -1000, 475, -1000, -1000, 7027,
-	6804, 2043, 3307, -1000, 375, -1000, 1885, 1727, -1000, 139,
-	-1000, -1000, -1000, 6804, 44, -1000, -1000, -1000, -1000, 635,
-	7549, 7448, 296, -1000, -1000, -1000, -1000, -1000, 404, -39,
-	-1000, -1000, 7448, -1000, -1000, 1569, 96, -1000, -1000, 100,
-	274, -1000, -1000, -1000, 1411, -1000,
+	-1000, -1000, -1000, -1000, -1000, 173, -1000, -1000, -1000, -1000,
+	133, 5522, 5522, 96, 133, 563, -19, -1000, 6800, 6058,
+	6003, -1000, -1000, -1000, 233, 5945, -1000, -34, -1000, 6800,
+	5522, 138, -1000, -1000, 933, -1000, -1000, -1000, 477, 526,
+	-1000, 702, 514, 672, -1000, 473, -1000, 6800, 135, 4184,
+	5522, 5522, 5522, 186, -1000, -1000, 6800, -1000, 5522, 7078,
+	134, 627, 7604, 4028, -1000, 172, 233, 553, -1000, 543,
+	-1000, -1000, 365, -40, -1000, 5890, 5835, 2829, 7292, 3872,
+	-1000, -1000, -1000, 5777, -65, 5522, -1000, 6800, 627, 171,
+	132, -1000, -1000, -1000, 31, -1000, -1000, 650, -1000, -1000,
+	-1000, -1000, 5522, -1000, 7023, -1000, -1000, 5719, -1000, -1000,
+	3, 5661, -1000, -1000, 553, 131, 5522, -1000, -1000, 129,
+	-35, -1000, -1, -1000, -1000, 634, -1000, -1000, -1000, -1000,
+	128, 4952, 6800, -1000, -1000, 702, 458, -37, -1000, -1000,
+	702, 672, -1000, 299, -1000, -1000, -1000, 5606, 294, 6800,
+	-1000, 291, 286, 7078, 285, -1000, 124, 536, 627, 167,
+	4838, -1000, -1000, -1000, 614, 233, 119, -1000, 357, -40,
+	1431, -1000, 543, 4340, 175, 280, -1000, -1000, -1000, 5522,
+	7023, -1000, 4838, -65, -1000, -1000, 5551, -1000, -1000, -1000,
+	-1000, -1000, -1000, 163, 233, 447, -1000, -1000, -1000, -1000,
+	-38, -1000, 702, 322, 672, -1000, -37, -1000, 2671, 276,
+	5522, 376, -1000, 785, -1000, -1000, 3560, 7604, -1000, 4838,
+	2, 2513, -1000, 158, 355, 118, 554, 354, -1000, -1000,
+	-1000, 233, 647, 543, 448, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, 1273, -1000, -1000, -1000, -1000, 3303, 7023,
+	114, 321, 353, -1000, 233, -1000, 685, -1000, 318, 702,
+	-38, -1000, -1000, 317, 272, -1000, 110, -1000, 5522, 162,
+	368, 269, 775, -1000, -1000, -1000, 107, -1000, 103, -1000,
+	268, 543, -1000, 163, 163, 156, -1000, 1115, 679, 7444,
+	-2, -41, -1000, -1000, 3303, -65, -1000, -1000, 533, -1000,
+	-66, -1000, -1000, 253, -1000, -1000, 3716, 339, -1000, -1000,
+	-1000, -1000, -1000, 264, 2355, 3560, -1000, -1000, 87, -1000,
+	2197, 352, 346, 137, 957, -1000, -31, -1000, -73, -32,
+	-1000, -74, 7444, -1000, -1000, 4623, 436, 5522, 5522, -1000,
+	-1000, -1000, -1000, -1000, 3303, -1000, 260, -1000, 102, 543,
+	-1000, -1000, -1000, -36, -1000, -1000, 680, -1000, -1000, 679,
+	-1000, 5522, -1000, 7444, 5522, -1000, -1000, 4496, -1000, 256,
+	249, 587, 606, 475, -1000, 451, -1000, -1000, 7023, 6800,
+	2039, 3303, -1000, 345, -1000, 1881, 1723, -1000, 137, -1000,
+	-1000, 6800, -1000, 6800, 155, -1000, -1000, -1000, -1000, 543,
+	7545, 7444, 242, -1000, -1000, -1000, -1000, -1000, -1000, 233,
+	-40, -1000, -1000, 7444, -1000, -1000, 1565, 101, -1000, -1000,
+	163, 238, -1000, -1000, -1000, 1407, -1000,
 }
 var yyPgo = [...]int{
 
-	0, 937, 936, 16, 9, 931, 4, 28, 13, 929,
-	11, 44, 79, 71, 52, 45, 928, 25, 926, 83,
-	21, 62, 918, 0, 78, 914, 912, 40, 81, 38,
-	911, 32, 910, 73, 49, 908, 6, 907, 906, 904,
-	903, 14, 51, 902, 901, 95, 96, 116, 900, 899,
-	898, 5, 897, 86, 50, 896, 56, 33, 895, 894,
-	892, 891, 886, 80, 884, 875, 871, 870, 12, 869,
-	865, 46, 39, 41, 2, 17, 726, 85, 84, 862,
-	861, 856, 10, 855, 849, 559, 42, 43, 841, 840,
-	8, 691, 19, 576, 839, 18, 831, 830, 828, 87,
-	827, 20, 824, 821, 29, 26, 820, 815, 37, 814,
-	813, 564, 808, 807, 802, 34, 801, 100, 1, 3,
-	798, 15, 795, 793, 790, 7, 786, 36, 783,
+	0, 906, 903, 14, 8, 888, 4, 29, 13, 887,
+	11, 44, 79, 71, 49, 48, 886, 26, 881, 84,
+	21, 83, 880, 0, 78, 879, 876, 40, 190, 32,
+	19, 39, 874, 55, 62, 873, 5, 869, 868, 866,
+	865, 15, 46, 862, 860, 107, 92, 198, 858, 856,
+	853, 6, 852, 87, 50, 851, 81, 56, 846, 845,
+	844, 843, 842, 80, 841, 840, 839, 837, 10, 836,
+	835, 43, 41, 38, 2, 16, 676, 85, 86, 834,
+	830, 829, 12, 828, 827, 519, 42, 37, 826, 824,
+	9, 732, 20, 525, 823, 18, 822, 821, 819, 95,
+	811, 36, 810, 802, 25, 33, 801, 799, 45, 798,
+	795, 526, 793, 790, 785, 34, 783, 73, 1, 3,
+	782, 17, 780, 778, 774, 7, 773, 28, 765,
 }
 var yyR1 = [...]int{
 
@@ -1508,7 +1520,7 @@ var yyR2 = [...]int{
 	7, 3, 6, 1, 0, 1, 3, 4, 6, 0,
 	1, 1, 2, 1, 1, 1, 0, 2, 2, 4,
 	1, 3, 1, 2, 3, 1, 1, 3, 1, 1,
-	3, 2, 0, 3, 4, 3, 10, 1, 3, 1,
+	3, 2, 0, 4, 4, 3, 10, 1, 3, 1,
 	2, 3, 1, 2, 2, 2, 3, 3, 3, 4,
 	3, 1, 1, 3, 1, 3, 1, 1, 0, 1,
 	1, 2, 1, 1, 1, 1, 1, 1, 3, 1,
@@ -1616,21 +1628,21 @@ var yyChk = [...]int{
 	-115, 151, -127, -74, 147, -29, -2, 84, -7, 160,
 	-104, 145, -17, -7, 22, 146, -101, 145, 32, 33,
 	-108, 31, -108, -82, -11, 147, -92, -28, -115, 151,
-	28, 148, 144, 149, -89, 45, 144, -121, -106, -41,
-	12, 39, 37, -125, -90, 145, -118, 149, 145, 144,
-	-127, -75, 12, 145, -20, -7, 145, 146, 149, -23,
-	-8, 147, 146, 145, 146, 31, -118, 149, 149, 146,
-	-96, -10, -118, -74, -74, 148, -121, 145, 146, 160,
-	-127, 162, -98, -68, -6, -3, -79, 146, 144, -121,
-	59, 162, 145, -83, -11, 147, -8, -118, 146, 26,
-	-82, 12, 161, 145, 144, 144, -112, -51, 12, 153,
-	145, -41, -23, 146, 160, 162, -6, 145, -109, -36,
-	-37, -38, -39, -40, -10, -6, 80, 10, 145, -23,
-	-23, -118, -118, 146, 149, -10, -118, -118, 149, 160,
-	12, -127, -68, -23, -127, 145, -36, 146, 146, 46,
-	29, 79, 24, 144, 145, 145, -51, -127, 148, -125,
-	10, -4, -90, -6, 146, -118, -119, -6, 145, 149,
-	-74, -81, 146, 144, -118, 145,
+	28, 148, 144, 149, -89, 45, 144, -121, -30, 39,
+	37, -125, -90, 145, -118, 149, 145, 144, -127, -75,
+	12, 145, -20, -7, 145, 146, 149, -23, -8, 147,
+	146, 145, 146, 31, -118, 149, 149, 146, -96, -10,
+	-118, -74, -74, 148, -121, 145, -106, -41, 12, -98,
+	-68, -6, -3, -79, 146, 144, -121, 59, 162, 145,
+	-83, -11, 147, -8, -118, 146, 26, -82, 12, 161,
+	145, 144, 144, -112, -51, 12, 153, 145, 146, 160,
+	-127, 162, 146, 160, 162, -6, 145, -109, -36, -37,
+	-38, -39, -40, -10, -6, 80, 10, 145, -23, -23,
+	-118, -118, 146, 149, -10, -118, -118, 149, 160, 12,
+	-41, -23, -68, -23, -127, 145, -36, 146, 146, 46,
+	29, 79, 24, 144, 145, 145, -51, -127, -127, 148,
+	-125, 10, -4, -90, -6, 146, -118, -119, -6, 145,
+	149, -74, -81, 146, 144, -118, 145,
 }
 var yyDef = [...]int{
 
@@ -1708,26 +1720,26 @@ var yyDef = [...]int{
 	107, 112, 0, 0, 108, 116, 107, 131, 0, 0,
 	289, 0, 198, 0, 198, 147, 0, 0, -2, 459,
 	0, 0, 152, 0, 0, 0, 378, 0, 242, 176,
-	241, 0, 0, 0, -2, 267, 270, 272, 273, 274,
+	241, 219, 0, 0, -2, 267, 270, 272, 273, 274,
 	275, 276, 277, 268, 248, 206, 124, 212, -2, 296,
 	0, 0, 0, 375, 0, 216, 0, 169, 0, 108,
 	107, 105, 109, 0, 0, 136, 0, 194, 0, 0,
 	0, 0, 0, 148, 190, 124, 0, -2, 0, -2,
-	0, 0, 124, 226, 226, 0, 242, 268, 0, 279,
-	375, 0, 376, 0, 271, 177, -2, 467, 478, 242,
-	0, 227, 217, 103, 111, 0, 106, 204, 0, 0,
-	124, 201, 202, 195, 196, 0, 0, 0, 186, 193,
-	0, 158, 0, 0, 0, 0, 268, 171, 243, 0,
-	280, 0, 0, 283, 0, 0, 245, 249, 0, 268,
-	0, 0, 104, 137, 188, 124, 124, -2, 197, 0,
-	149, 0, 0, 161, 124, 124, 0, 381, 382, 0,
-	170, 278, 375, 244, 0, 0, 375, 250, 0, 252,
-	0, 0, 262, 0, 0, 261, 57, -2, 293, 374,
-	218, 0, -2, 191, 0, 159, 0, 0, 379, 0,
-	383, 281, 282, 375, 0, 251, 253, 254, 255, 0,
-	0, 0, 0, 124, 165, 373, 380, 284, -2, 256,
-	257, 258, 260, 263, 189, 0, 0, 259, 157, 226,
-	0, 246, 264, 124, 0, 265,
+	0, 0, 124, 226, 226, 0, 242, 268, 0, 0,
+	376, 0, 271, 177, -2, 467, 478, 242, 0, 227,
+	217, 103, 111, 0, 106, 204, 0, 0, 124, 201,
+	202, 195, 196, 0, 0, 0, 186, 193, 0, 158,
+	0, 0, 0, 0, 268, 171, 0, 279, 375, 0,
+	283, 0, 0, 245, 249, 0, 268, 0, 0, 104,
+	137, 188, 124, 124, -2, 197, 0, 149, 0, 0,
+	161, 124, 124, 0, 381, 382, 0, 170, 243, 0,
+	280, 0, 244, 0, 0, 375, 250, 0, 252, 0,
+	0, 262, 0, 0, 261, 57, -2, 293, 374, 218,
+	0, -2, 191, 0, 159, 0, 0, 379, 0, 383,
+	278, 375, 282, 375, 0, 251, 253, 254, 255, 0,
+	0, 0, 0, 124, 165, 373, 380, 281, 284, -2,
+	256, 257, 258, 260, 263, 189, 0, 0, 259, 157,
+	226, 0, 246, 264, 124, 0, 265,
 }
 var yyTok1 = [...]int{
 
@@ -4887,18 +4899,18 @@ yydefault:
 			yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
 		}
 	case 243:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		//line php7/php7.y:2500
 		{
-			yyVAL.node = stmt.NewPropertyList(yyDollar[1].list, yyDollar[2].list)
+			yyVAL.node = stmt.NewPropertyList(yyDollar[1].list, yyDollar[2].node, yyDollar[3].list)
 
 			// save position
-			yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[3].token))
+			yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[4].token))
 
 			// save comments
 			yylex.(*Parser).MoveFreeFloating(yyDollar[1].list[0], yyVAL.node)
-			yylex.(*Parser).setFreeFloating(yyVAL.node, freefloating.PropertyList, yyDollar[3].token.FreeFloating)
-			yylex.(*Parser).setFreeFloating(yyVAL.node, freefloating.SemiColon, yylex.(*Parser).GetFreeFloatingToken(yyDollar[3].token))
+			yylex.(*Parser).setFreeFloating(yyVAL.node, freefloating.PropertyList, yyDollar[4].token.FreeFloating)
+			yylex.(*Parser).setFreeFloating(yyVAL.node, freefloating.SemiColon, yylex.(*Parser).GetFreeFloatingToken(yyDollar[4].token))
 
 			yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
 		}
diff --git a/php7/php7.y b/php7/php7.y
index 7e4419e..39fe5b0 100644
--- a/php7/php7.y
+++ b/php7/php7.y
@@ -2496,17 +2496,17 @@ class_statement_list:
 ;
 
 class_statement:
-        variable_modifiers property_list ';'
+        variable_modifiers optional_type property_list ';'
             {
-                $$ = stmt.NewPropertyList($1, $2)
+                $$ = stmt.NewPropertyList($1, $2, $3)
 
                 // save position
-                $$.SetPosition(yylex.(*Parser).positionBuilder.NewNodeListTokenPosition($1, $3))
+                $$.SetPosition(yylex.(*Parser).positionBuilder.NewNodeListTokenPosition($1, $4))
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1[0], $$)
-                yylex.(*Parser).setFreeFloating($$, freefloating.PropertyList, $3.FreeFloating)
-                yylex.(*Parser).setFreeFloating($$, freefloating.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
+                yylex.(*Parser).setFreeFloating($$, freefloating.PropertyList, $4.FreeFloating)
+                yylex.(*Parser).setFreeFloating($$, freefloating.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
diff --git a/printer/printer.go b/printer/printer.go
index 0ca8cf3..50f8f1e 100644
--- a/printer/printer.go
+++ b/printer/printer.go
@@ -2888,6 +2888,12 @@ func (p *Printer) printStmtPropertyList(n node.Node) {
 		p.Print(m)
 	}
 
+	if nn.Type != nil && nn.Type.GetFreeFloating().IsEmpty() {
+		io.WriteString(p.w, " ")
+	}
+
+	p.Print(nn.Type)
+
 	if nn.Properties[0].GetFreeFloating().IsEmpty() {
 		io.WriteString(p.w, " ")
 	}
diff --git a/printer/printer_parsed_php7_test.go b/printer/printer_parsed_php7_test.go
index 7bdccab..f691922 100644
--- a/printer/printer_parsed_php7_test.go
+++ b/printer/printer_parsed_php7_test.go
@@ -1256,7 +1256,7 @@ func TestParseAndPrintPropertyList(t *testing.T) {
 	class Foo {
 		var $a = '' , $b = null ;
 		private $c ;
-		public static $d ;
+		public static Bar $d ;
 		
 	}`
 
diff --git a/printer/printer_test.go b/printer/printer_test.go
index 946d062..8bf928f 100644
--- a/printer/printer_test.go
+++ b/printer/printer_test.go
@@ -3928,6 +3928,13 @@ func TestPrinterPrintPropertyList(t *testing.T) {
 			&node.Identifier{Value: "public"},
 			&node.Identifier{Value: "static"},
 		},
+		Type: &name.Name{
+			Parts: []node.Node{
+				&name.NamePart{
+					Value: "Foo",
+				},
+			},
+		},
 		Properties: []node.Node{
 			&stmt.Property{
 				Variable: &expr.Variable{
@@ -3943,7 +3950,7 @@ func TestPrinterPrintPropertyList(t *testing.T) {
 		},
 	})
 
-	expected := `public static $a='a',$b;`
+	expected := `public static Foo $a='a',$b;`
 	actual := o.String()
 
 	if expected != actual {