diff --git a/parser.go b/parser.go index 8eeecae..3589029 100644 --- a/parser.go +++ b/parser.go @@ -365,16 +365,12 @@ const yyEofCode = 1 const yyErrCode = 2 const yyInitialStackSize = 16 -//line parser.y:506 +//line parser.y:514 const src = ` $b) : - $b=$c; -elseif ($a === $b) : +do { -else : - -endif; +} while ($a >= $b || $a < $c); ` @@ -390,30 +386,9 @@ var yyExca = [...]int{ -1, 1, 1, -1, -2, 0, - -1, 72, + -1, 73, 159, 46, - -2, 207, - -1, 244, - 38, 0, - 39, 0, - 40, 0, - 41, 0, - 42, 0, - -2, 179, - -1, 245, - 38, 0, - 39, 0, - 40, 0, - 41, 0, - 42, 0, - -2, 180, - -1, 246, - 38, 0, - 39, 0, - 40, 0, - 41, 0, - 42, 0, - -2, 181, + -2, 210, -1, 247, 38, 0, 39, 0, @@ -429,22 +404,25 @@ var yyExca = [...]int{ 42, 0, -2, 183, -1, 249, - 43, 0, - 44, 0, - 45, 0, - 46, 0, + 38, 0, + 39, 0, + 40, 0, + 41, 0, + 42, 0, -2, 184, -1, 250, - 43, 0, - 44, 0, - 45, 0, - 46, 0, + 38, 0, + 39, 0, + 40, 0, + 41, 0, + 42, 0, -2, 185, -1, 251, - 43, 0, - 44, 0, - 45, 0, - 46, 0, + 38, 0, + 39, 0, + 40, 0, + 41, 0, + 42, 0, -2, 186, -1, 252, 43, 0, @@ -452,279 +430,315 @@ var yyExca = [...]int{ 45, 0, 46, 0, -2, 187, - -1, 288, - 163, 117, - -2, 122, + -1, 253, + 43, 0, + 44, 0, + 45, 0, + 46, 0, + -2, 188, + -1, 254, + 43, 0, + 44, 0, + 45, 0, + 46, 0, + -2, 189, + -1, 255, + 43, 0, + 44, 0, + 45, 0, + 46, 0, + -2, 190, + -1, 292, + 163, 120, + -2, 125, } const yyPrivate = 57344 -const yyLast = 1995 +const yyLast = 2170 var yyAct = [...]int{ - 13, 134, 306, 304, 312, 307, 322, 54, 308, 288, - 285, 261, 131, 259, 202, 200, 191, 315, 290, 341, - 223, 289, 258, 4, 51, 192, 333, 51, 195, 196, - 197, 198, 199, 135, 201, 331, 203, 204, 205, 206, - 207, 208, 209, 210, 211, 212, 213, 214, 215, 262, - 219, 218, 133, 338, 140, 142, 141, 328, 220, 48, - 49, 226, 343, 133, 133, 192, 284, 54, 201, 257, - 203, 204, 213, 214, 164, 256, 165, 138, 139, 143, - 145, 144, 157, 158, 155, 156, 159, 160, 161, 162, - 163, 153, 154, 147, 148, 146, 149, 151, 152, 216, - 52, 310, 311, 52, 170, 173, 175, 174, 171, 172, - 168, 150, 150, 310, 311, 149, 151, 152, 325, 167, - 314, 335, 330, 313, 263, 345, 323, 224, 56, 57, - 5, 150, 314, 225, 1, 313, 8, 54, 50, 227, - 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, - 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, - 248, 249, 250, 251, 252, 253, 255, 11, 18, 153, - 154, 147, 148, 146, 149, 151, 152, 264, 266, 267, - 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, - 150, 217, 278, 260, 147, 148, 146, 149, 151, 152, - 19, 280, 21, 281, 10, 17, 23, 321, 20, 140, - 142, 141, 303, 150, 302, 334, 305, 283, 169, 15, - 221, 2, 309, 132, 3, 53, 193, 194, 166, 164, - 337, 165, 138, 139, 143, 145, 144, 157, 158, 155, - 156, 159, 160, 161, 162, 163, 153, 154, 147, 148, - 146, 149, 151, 152, 324, 287, 0, 0, 0, 0, - 291, 0, 292, 0, 0, 293, 294, 150, 160, 161, - 162, 163, 153, 154, 147, 148, 146, 149, 151, 152, - 0, 0, 0, 298, 0, 0, 300, 301, 0, 0, - 0, 0, 0, 150, 0, 0, 66, 67, 68, 69, - 70, 0, 73, 74, 75, 71, 72, 0, 47, 0, - 0, 0, 0, 0, 326, 0, 319, 0, 327, 0, - 0, 0, 332, 0, 0, 0, 0, 336, 0, 0, - 0, 0, 340, 339, 0, 0, 0, 329, 342, 0, - 0, 27, 28, 344, 0, 0, 347, 29, 76, 30, - 25, 26, 37, 38, 39, 40, 41, 42, 43, 44, - 299, 0, 77, 64, 0, 80, 81, 82, 58, 59, - 60, 61, 62, 63, 78, 79, 0, 0, 55, 0, - 51, 0, 0, 0, 0, 0, 0, 83, 84, 85, - 86, 87, 88, 89, 90, 91, 92, 93, 110, 111, - 112, 113, 114, 104, 105, 106, 107, 108, 94, 95, - 96, 97, 98, 99, 100, 101, 102, 103, 65, 0, - 122, 120, 121, 117, 118, 0, 109, 115, 116, 123, - 124, 126, 125, 127, 128, 0, 0, 0, 0, 0, - 136, 33, 34, 35, 36, 0, 119, 130, 129, 45, - 46, 0, 47, 0, 31, 0, 52, 0, 139, 143, - 145, 144, 157, 158, 155, 156, 159, 160, 161, 162, - 163, 153, 154, 147, 148, 146, 149, 151, 152, 0, - 0, 0, 0, 0, 0, 27, 28, 0, 0, 0, - 0, 29, 150, 30, 25, 26, 37, 38, 39, 40, - 41, 42, 43, 44, 0, 0, 0, 24, 0, 0, - 0, 0, 0, 48, 49, 0, 0, 0, 0, 22, - 0, 0, 0, 0, 51, 0, 0, 0, 0, 0, - 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, - 140, 142, 141, 0, 0, 0, 136, 33, 34, 35, - 36, 0, 32, 0, 16, 45, 46, 0, 47, 0, - 164, 0, 165, 138, 139, 143, 145, 144, 157, 158, - 155, 156, 159, 160, 161, 162, 163, 153, 154, 147, - 148, 146, 149, 151, 152, 0, 9, 346, 31, 0, - 52, 27, 28, 0, 0, 0, 0, 29, 150, 30, - 25, 26, 37, 38, 39, 40, 41, 42, 43, 44, - 0, 0, 0, 24, 0, 0, 0, 318, 0, 48, - 49, 0, 0, 0, 0, 22, 0, 0, 0, 0, - 51, 0, 0, 0, 0, 0, 0, 0, 12, 0, + 14, 135, 313, 311, 319, 314, 330, 55, 292, 315, + 289, 264, 132, 262, 204, 202, 193, 136, 322, 294, + 225, 351, 293, 4, 261, 52, 194, 350, 52, 197, + 198, 199, 200, 201, 137, 203, 342, 205, 206, 207, + 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, + 339, 265, 221, 134, 220, 142, 144, 143, 347, 336, + 222, 49, 50, 229, 353, 134, 194, 134, 55, 203, + 152, 205, 206, 215, 216, 166, 287, 167, 140, 141, + 145, 147, 146, 159, 160, 157, 158, 161, 162, 163, + 164, 165, 155, 156, 149, 150, 148, 151, 153, 154, + 218, 53, 317, 318, 53, 260, 259, 172, 175, 177, + 176, 333, 170, 152, 317, 318, 173, 174, 151, 153, + 154, 321, 169, 344, 320, 338, 266, 355, 331, 226, + 57, 58, 5, 321, 152, 227, 320, 228, 8, 55, + 1, 230, 231, 232, 233, 234, 235, 236, 237, 238, + 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, + 249, 250, 251, 252, 253, 254, 255, 256, 258, 304, + 11, 155, 156, 149, 150, 148, 151, 153, 154, 267, + 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, + 279, 280, 152, 22, 281, 263, 149, 150, 148, 151, + 153, 154, 19, 283, 10, 284, 51, 18, 329, 24, + 171, 21, 142, 144, 143, 152, 310, 309, 343, 286, + 312, 138, 34, 35, 36, 37, 16, 223, 2, 316, + 46, 47, 166, 48, 167, 140, 141, 145, 147, 146, + 159, 160, 157, 158, 161, 162, 163, 164, 165, 155, + 156, 149, 150, 148, 151, 153, 154, 133, 291, 3, + 219, 54, 168, 295, 346, 296, 28, 29, 297, 298, + 152, 20, 30, 332, 31, 26, 27, 38, 39, 40, + 41, 42, 43, 44, 45, 0, 302, 0, 25, 0, + 307, 308, 0, 0, 49, 50, 0, 0, 195, 196, + 23, 0, 0, 0, 0, 52, 0, 0, 328, 305, + 0, 0, 0, 13, 12, 0, 0, 0, 0, 0, + 326, 334, 0, 0, 0, 335, 0, 0, 0, 340, + 15, 0, 0, 0, 0, 345, 0, 0, 0, 0, + 349, 348, 0, 33, 337, 17, 0, 352, 0, 0, + 0, 0, 0, 354, 0, 0, 357, 67, 68, 69, + 70, 71, 0, 74, 75, 76, 72, 73, 0, 48, + 0, 0, 0, 0, 0, 0, 0, 9, 356, 32, + 0, 53, 162, 163, 164, 165, 155, 156, 149, 150, + 148, 151, 153, 154, 0, 0, 0, 0, 0, 0, + 0, 0, 28, 29, 0, 0, 0, 152, 30, 77, + 31, 26, 27, 38, 39, 40, 41, 42, 43, 44, + 45, 0, 0, 78, 65, 0, 81, 82, 83, 59, + 60, 61, 62, 63, 64, 79, 80, 0, 0, 56, + 0, 52, 0, 0, 0, 0, 0, 0, 84, 85, + 86, 87, 88, 89, 90, 91, 92, 93, 94, 111, + 112, 113, 114, 115, 105, 106, 107, 108, 109, 95, + 96, 97, 98, 99, 100, 101, 102, 103, 104, 66, + 0, 123, 121, 122, 118, 119, 0, 110, 116, 117, + 124, 125, 127, 126, 128, 129, 0, 0, 0, 0, + 0, 138, 34, 35, 36, 37, 0, 120, 131, 130, + 46, 47, 0, 48, 0, 32, 0, 53, 0, 141, + 145, 147, 146, 159, 160, 157, 158, 161, 162, 163, + 164, 165, 155, 156, 149, 150, 148, 151, 153, 154, + 0, 0, 0, 0, 0, 0, 28, 29, 0, 0, + 0, 0, 30, 152, 31, 26, 27, 38, 39, 40, + 41, 42, 43, 44, 45, 0, 0, 0, 25, 0, + 0, 0, 0, 0, 49, 50, 0, 0, 0, 0, + 23, 0, 0, 0, 0, 52, 0, 0, 0, 0, + 0, 0, 0, 13, 12, 341, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, - 0, 0, 136, 33, 34, 35, 36, 0, 32, 0, - 16, 45, 46, 0, 47, 157, 158, 155, 156, 159, - 160, 161, 162, 163, 153, 154, 147, 148, 146, 149, - 151, 152, 0, 317, 0, 0, 0, 0, 0, 0, - 0, 0, 9, 0, 31, 150, 52, 27, 28, 0, - 0, 0, 0, 29, 0, 30, 25, 26, 37, 38, - 39, 40, 41, 42, 43, 44, 0, 0, 0, 24, - 0, 0, 0, 0, 0, 48, 49, 0, 0, 0, - 0, 22, 0, 0, 0, 0, 51, 0, 0, 0, - 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, + 15, 142, 144, 143, 0, 0, 0, 138, 34, 35, + 36, 37, 0, 33, 0, 17, 46, 47, 0, 48, + 0, 166, 0, 167, 140, 141, 145, 147, 146, 159, + 160, 157, 158, 161, 162, 163, 164, 165, 155, 156, + 149, 150, 148, 151, 153, 154, 0, 9, 0, 32, + 0, 53, 28, 29, 0, 0, 0, 0, 30, 152, + 31, 26, 27, 38, 39, 40, 41, 42, 43, 44, + 45, 0, 0, 0, 25, 0, 0, 0, 325, 0, + 49, 50, 0, 0, 0, 0, 23, 0, 0, 0, + 0, 52, 0, 0, 0, 0, 0, 0, 0, 13, + 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, + 0, 0, 0, 138, 34, 35, 36, 37, 0, 33, + 0, 17, 46, 47, 0, 48, 159, 160, 157, 158, + 161, 162, 163, 164, 165, 155, 156, 149, 150, 148, + 151, 153, 154, 0, 324, 0, 0, 0, 0, 0, + 0, 0, 0, 9, 0, 32, 152, 53, 28, 29, + 0, 0, 0, 0, 30, 0, 31, 26, 27, 38, + 39, 40, 41, 42, 43, 44, 45, 0, 0, 0, + 25, 0, 0, 0, 0, 0, 49, 50, 0, 0, + 0, 0, 23, 0, 0, 0, 0, 52, 0, 0, + 0, 0, 0, 0, 0, 13, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 14, 140, 142, 141, 0, 0, 0, 6, 33, - 34, 35, 36, 0, 32, 0, 16, 45, 46, 0, - 47, 0, 164, 0, 165, 138, 139, 143, 145, 144, - 157, 158, 155, 156, 159, 160, 161, 162, 163, 153, - 154, 147, 148, 146, 149, 151, 152, 0, 9, 222, - 31, 0, 52, 27, 28, 0, 0, 0, 0, 29, - 150, 30, 25, 26, 37, 38, 39, 40, 41, 42, - 43, 44, 0, 0, 0, 24, 0, 0, 0, 0, - 0, 48, 49, 0, 0, 0, 0, 22, 0, 0, - 0, 0, 51, 0, 0, 0, 0, 0, 0, 0, - 12, 176, 177, 178, 179, 181, 182, 183, 184, 185, - 186, 187, 188, 180, 0, 0, 0, 14, 0, 0, - 0, 0, 0, 0, 136, 33, 34, 35, 36, 0, - 32, 0, 16, 45, 46, 0, 47, 0, 0, 0, - 0, 0, 189, 190, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 316, 0, 0, 7, 0, - 0, 0, 0, 0, 9, 0, 31, 0, 52, 27, - 28, 0, 0, 0, 0, 29, 0, 30, 25, 26, - 37, 38, 39, 40, 41, 42, 43, 44, 0, 0, - 0, 24, 0, 0, 0, 0, 0, 48, 49, 0, - 0, 0, 0, 22, 0, 0, 0, 0, 51, 136, - 33, 34, 35, 36, 0, 0, 12, 0, 45, 46, - 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 14, 0, 0, 320, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 32, 0, 16, 136, - 33, 34, 35, 36, 27, 28, 0, 0, 45, 46, - 29, 47, 30, 25, 26, 37, 38, 39, 40, 41, - 42, 43, 44, 0, 0, 0, 24, 0, 0, 0, - 9, 0, 31, 0, 52, 0, 0, 0, 22, 0, - 0, 0, 0, 51, 27, 28, 0, 0, 0, 0, - 29, 12, 30, 25, 26, 37, 38, 39, 40, 41, - 42, 43, 44, 0, 0, 0, 24, 0, 0, 0, - 140, 142, 141, 0, 0, 0, 0, 0, 22, 0, - 0, 32, 0, 51, 0, 0, 0, 0, 0, 0, - 164, 12, 165, 138, 139, 143, 145, 144, 157, 158, - 155, 156, 159, 160, 161, 162, 163, 153, 154, 147, - 148, 146, 149, 151, 152, 9, 0, 31, 0, 52, - 0, 32, 0, 0, 0, 0, 0, 0, 150, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 140, 142, - 141, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 9, 0, 31, 164, 52, - 165, 138, 139, 143, 145, 144, 157, 158, 155, 156, - 159, 160, 161, 162, 163, 153, 154, 147, 148, 146, - 149, 151, 152, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 150, 0, 0, 0, - 0, 0, 140, 142, 141, 0, 0, 0, 0, 0, + 0, 0, 15, 142, 144, 143, 0, 0, 0, 6, + 34, 35, 36, 37, 0, 33, 0, 17, 46, 47, + 0, 48, 0, 166, 0, 167, 140, 141, 145, 147, + 146, 159, 160, 157, 158, 161, 162, 163, 164, 165, + 155, 156, 149, 150, 148, 151, 153, 154, 0, 9, + 224, 32, 0, 53, 28, 29, 0, 0, 0, 0, + 30, 152, 31, 26, 27, 38, 39, 40, 41, 42, + 43, 44, 45, 0, 0, 0, 25, 0, 0, 0, + 0, 0, 49, 50, 0, 0, 0, 0, 23, 0, + 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, + 0, 13, 12, 178, 179, 180, 181, 183, 184, 185, + 186, 187, 188, 189, 190, 182, 0, 0, 15, 0, + 0, 0, 0, 0, 0, 138, 34, 35, 36, 37, + 0, 33, 0, 17, 46, 47, 0, 48, 0, 0, + 0, 0, 0, 0, 191, 192, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 323, 0, 0, 7, + 0, 0, 0, 0, 0, 9, 0, 32, 0, 53, + 28, 29, 0, 0, 0, 0, 30, 0, 31, 26, + 27, 38, 39, 40, 41, 42, 43, 44, 45, 0, + 0, 0, 25, 0, 0, 0, 0, 0, 49, 50, + 0, 0, 0, 0, 23, 0, 0, 0, 0, 52, + 138, 34, 35, 36, 37, 0, 0, 13, 12, 46, + 47, 0, 48, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 15, 0, 0, 327, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 33, 0, 17, + 0, 0, 0, 0, 0, 28, 29, 0, 0, 0, + 0, 30, 0, 31, 26, 27, 38, 39, 40, 41, + 42, 43, 44, 45, 0, 0, 0, 25, 0, 0, + 0, 9, 0, 32, 0, 53, 0, 0, 0, 23, + 0, 0, 0, 0, 52, 138, 34, 35, 36, 37, + 0, 0, 13, 12, 46, 47, 0, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 164, 297, 165, 138, 139, 143, 145, 144, - 157, 158, 155, 156, 159, 160, 161, 162, 163, 153, - 154, 147, 148, 146, 149, 151, 152, 0, 0, 0, + 0, 0, 306, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 33, 0, 0, 0, 0, 0, 0, 0, + 28, 29, 0, 0, 0, 0, 30, 0, 31, 26, + 27, 38, 39, 40, 41, 42, 43, 44, 45, 0, + 0, 0, 25, 0, 0, 0, 9, 0, 32, 0, + 53, 142, 144, 143, 23, 0, 0, 0, 0, 52, + 138, 34, 35, 36, 37, 0, 0, 13, 12, 46, + 47, 166, 48, 167, 140, 141, 145, 147, 146, 159, + 160, 157, 158, 161, 162, 163, 164, 165, 155, 156, + 149, 150, 148, 151, 153, 154, 0, 33, 0, 0, + 0, 0, 0, 0, 0, 28, 29, 0, 0, 152, + 0, 30, 0, 31, 26, 27, 38, 39, 40, 41, + 42, 43, 44, 45, 0, 0, 0, 25, 0, 0, + 0, 9, 0, 32, 0, 53, 142, 144, 143, 23, + 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, + 0, 0, 13, 12, 0, 0, 166, 0, 167, 140, + 141, 145, 147, 146, 159, 160, 157, 158, 161, 162, + 163, 164, 165, 155, 156, 149, 150, 148, 151, 153, + 154, 0, 33, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 152, 0, 0, 0, 0, 142, + 144, 143, 0, 0, 301, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 9, 0, 32, 166, + 53, 167, 140, 141, 145, 147, 146, 159, 160, 157, + 158, 161, 162, 163, 164, 165, 155, 156, 149, 150, + 148, 151, 153, 154, 142, 144, 143, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 152, 0, 0, + 0, 0, 0, 0, 166, 0, 167, 140, 141, 145, + 147, 146, 159, 160, 157, 158, 161, 162, 163, 164, + 165, 155, 156, 149, 150, 148, 151, 153, 154, 300, + 142, 144, 143, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 152, 0, 0, 0, 0, 0, 0, 0, + 166, 0, 167, 140, 141, 145, 147, 146, 159, 160, + 157, 158, 161, 162, 163, 164, 165, 155, 156, 149, + 150, 148, 151, 153, 154, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 152, 0, + 0, 0, 299, 138, 34, 35, 36, 37, 0, 0, + 0, 0, 46, 47, 0, 48, 0, 0, 0, 0, + 0, 0, 0, 138, 34, 35, 36, 37, 0, 0, + 0, 0, 46, 47, 0, 48, 268, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 288, 28, 29, + 257, 0, 0, 0, 30, 0, 31, 26, 27, 38, + 39, 40, 41, 42, 43, 44, 45, 0, 28, 29, + 25, 0, 0, 0, 30, 0, 31, 26, 27, 38, + 39, 40, 41, 42, 43, 44, 45, 52, 0, 0, + 25, 0, 0, 282, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, + 0, 138, 34, 35, 36, 37, 0, 0, 0, 0, + 46, 47, 0, 48, 0, 33, 147, 146, 159, 160, + 157, 158, 161, 162, 163, 164, 165, 155, 156, 149, + 150, 148, 151, 153, 154, 33, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 28, 29, 152, 0, + 0, 32, 30, 53, 31, 26, 27, 38, 39, 40, + 41, 42, 43, 44, 45, 0, 0, 0, 25, 0, + 0, 32, 0, 53, 142, 144, 143, 0, 0, 0, + 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, + 0, 0, 0, 0, 166, 0, 167, 140, 141, 145, + 147, 146, 159, 160, 157, 158, 161, 162, 163, 164, + 165, 155, 156, 149, 150, 148, 151, 153, 154, 0, + 0, 0, 0, 33, 0, 0, 0, 0, 0, 0, + 0, 0, 152, 0, 0, 0, 0, 0, 0, 0, + 142, 144, 143, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, + 166, 53, 167, 140, 141, 145, 147, 146, 159, 160, + 157, 158, 161, 162, 163, 164, 165, 155, 156, 149, + 150, 148, 151, 153, 154, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 152, 0, + 0, 0, 0, 0, 0, 0, 142, 144, 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 150, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 140, 142, 141, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 303, 166, 290, 167, 140, + 141, 145, 147, 146, 159, 160, 157, 158, 161, 162, + 163, 164, 165, 155, 156, 149, 150, 148, 151, 153, + 154, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 152, 0, 0, 0, 0, 144, + 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 166, 139, + 167, 140, 141, 145, 147, 146, 159, 160, 157, 158, + 161, 162, 163, 164, 165, 155, 156, 149, 150, 148, + 151, 153, 154, 143, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 152, 0, 0, 0, + 0, 166, 0, 167, 140, 141, 145, 147, 146, 159, + 160, 157, 158, 161, 162, 163, 164, 165, 155, 156, + 149, 150, 148, 151, 153, 154, 285, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 152, + 0, 166, 0, 167, 140, 141, 145, 147, 146, 159, + 160, 157, 158, 161, 162, 163, 164, 165, 155, 156, + 149, 150, 148, 151, 153, 154, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 166, 152, + 167, 140, 141, 145, 147, 146, 159, 160, 157, 158, + 161, 162, 163, 164, 165, 155, 156, 149, 150, 148, + 151, 153, 154, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 152, 167, 140, 141, + 145, 147, 146, 159, 160, 157, 158, 161, 162, 163, + 164, 165, 155, 156, 149, 150, 148, 151, 153, 154, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 164, 296, 165, 138, 139, 143, 145, 144, 157, 158, - 155, 156, 159, 160, 161, 162, 163, 153, 154, 147, - 148, 146, 149, 151, 152, 136, 33, 34, 35, 36, - 0, 0, 0, 0, 45, 46, 0, 47, 150, 0, - 0, 0, 0, 0, 0, 136, 33, 34, 35, 36, - 0, 0, 0, 0, 45, 46, 0, 47, 265, 0, - 0, 0, 0, 0, 0, 295, 0, 0, 0, 0, - 27, 28, 254, 0, 0, 0, 29, 0, 30, 25, - 26, 37, 38, 39, 40, 41, 42, 43, 44, 0, - 27, 28, 24, 0, 0, 0, 29, 0, 30, 25, - 26, 37, 38, 39, 40, 41, 42, 43, 44, 51, - 0, 0, 24, 0, 0, 136, 33, 34, 35, 36, - 0, 0, 0, 0, 45, 46, 0, 47, 0, 51, - 0, 0, 0, 279, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 27, 28, 0, 0, 0, 0, 29, 32, 30, 25, - 26, 37, 38, 39, 40, 41, 42, 43, 44, 0, - 0, 0, 24, 31, 0, 52, 140, 142, 141, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 51, - 0, 0, 0, 31, 0, 52, 164, 0, 165, 138, - 139, 143, 145, 144, 157, 158, 155, 156, 159, 160, - 161, 162, 163, 153, 154, 147, 148, 146, 149, 151, - 152, 0, 0, 0, 0, 0, 0, 32, 0, 0, - 0, 0, 0, 0, 150, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 140, 142, 141, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 31, 0, 52, 164, 286, 165, 138, - 139, 143, 145, 144, 157, 158, 155, 156, 159, 160, - 161, 162, 163, 153, 154, 147, 148, 146, 149, 151, - 152, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 150, 0, 140, 142, 141, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 137, 164, 0, 165, 138, - 139, 143, 145, 144, 157, 158, 155, 156, 159, 160, - 161, 162, 163, 153, 154, 147, 148, 146, 149, 151, - 152, 142, 141, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 150, 0, 0, 0, 0, 0, - 164, 0, 165, 138, 139, 143, 145, 144, 157, 158, - 155, 156, 159, 160, 161, 162, 163, 153, 154, 147, - 148, 146, 149, 151, 152, 141, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 150, 0, - 0, 0, 0, 164, 0, 165, 138, 139, 143, 145, - 144, 157, 158, 155, 156, 159, 160, 161, 162, 163, - 153, 154, 147, 148, 146, 149, 151, 152, 282, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 150, 0, 164, 0, 165, 138, 139, 143, 145, - 144, 157, 158, 155, 156, 159, 160, 161, 162, 163, - 153, 154, 147, 148, 146, 149, 151, 152, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 164, 150, 165, 138, 139, 143, 145, 144, 157, 158, - 155, 156, 159, 160, 161, 162, 163, 153, 154, 147, - 148, 146, 149, 151, 152, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 150, 165, - 138, 139, 143, 145, 144, 157, 158, 155, 156, 159, - 160, 161, 162, 163, 153, 154, 147, 148, 146, 149, - 151, 152, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 150, 143, 145, 144, 157, - 158, 155, 156, 159, 160, 161, 162, 163, 153, 154, - 147, 148, 146, 149, 151, 152, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 150, - 145, 144, 157, 158, 155, 156, 159, 160, 161, 162, - 163, 153, 154, 147, 148, 146, 149, 151, 152, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 150, 144, 157, 158, 155, 156, 159, 160, - 161, 162, 163, 153, 154, 147, 148, 146, 149, 151, - 152, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 150, + 0, 0, 0, 152, 145, 147, 146, 159, 160, 157, + 158, 161, 162, 163, 164, 165, 155, 156, 149, 150, + 148, 151, 153, 154, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 152, 146, 159, + 160, 157, 158, 161, 162, 163, 164, 165, 155, 156, + 149, 150, 148, 151, 153, 154, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 152, } var yyPact = [...]int{ - -1000, -1000, 784, -1000, -1000, -1000, 292, -23, -1000, -1000, - -1000, -1000, 1025, 1496, 82, -18, 18, 35, 32, 864, - -1000, -1000, -146, -1000, 1431, -64, -64, 1431, 1431, 1431, - 1431, 1431, -147, 1431, -148, 1431, 1431, 1431, 1431, 1431, - 1431, 1431, 1431, 1431, 1431, 1431, 1431, 1431, -1000, -1000, - -1000, -1000, -61, -108, 1626, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, 1431, -147, 1431, 1431, -148, 1431, - 1431, 1431, 1431, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, 845, -1000, -1000, -1000, 353, -19, -1000, -1000, + -1000, -1000, -145, 1216, 1750, 85, -16, 21, 43, 35, + 926, -1000, -1000, -146, -1000, 1617, -63, -63, 1617, 1617, + 1617, 1617, 1617, -147, 1617, -148, 1617, 1617, 1617, 1617, + 1617, 1617, 1617, 1617, 1617, 1617, 1617, 1617, 1617, -1000, + -1000, -1000, -1000, -60, -105, 202, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, 1617, -147, 1617, 1617, -148, + 1617, 1617, 1617, 1617, -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, -109, -99, -1000, 668, -36, 1431, -1000, 1431, 1431, - 1431, 1431, 1431, 1431, 1431, 1431, 1431, 1431, 1431, 1431, - 1431, 1431, 1431, 1431, 1431, 1431, 1431, 1431, 1431, 1431, - 1431, 1431, 1431, 1431, 1361, 1431, -11, -1000, -17, -1000, - -138, -149, 1025, -151, -110, 93, 1341, 1431, 1431, 1431, - 1431, 1431, 1431, 1431, 1431, 1431, 1431, 1431, 1431, -1000, - -1000, 1431, -1000, -1000, -1000, 43, 43, 43, 43, 1290, - 1431, 1626, 1431, 1626, 1626, 43, 43, 43, 43, 43, - 43, 43, 43, 1790, 1753, 1790, 1431, -1000, -1000, -1000, - -20, -1000, -1000, -1000, -1000, -1000, -152, 424, 1861, 1670, - 1790, 1713, 1894, 647, 1926, 63, 63, 63, 43, 43, - 43, 43, 145, 145, 225, 225, 225, 225, 225, 122, - 122, 122, 122, 1566, 1431, 1827, -153, -139, -143, 1431, - -1000, 1431, -1000, -1000, 1790, 1431, 1790, 1790, 1790, 1790, - 1790, 1790, 1790, 1790, 1790, 1790, 1790, 1790, 1222, -1000, - 1158, 1090, 1431, 199, -1000, 1431, 1431, 1827, -22, -144, - -1000, 772, 540, 552, 647, 985, -1000, -1000, 1790, -1000, - 44, 1827, -157, 117, -1000, 81, -1000, -1000, -34, -1000, - -1000, -1000, -1000, -23, -100, -1000, 1025, 91, -124, -1000, - -1000, -133, 90, -22, -105, -1000, -1000, -1000, -23, -1000, - -1000, -1000, 900, -1000, -141, -22, -1000, -26, -1000, -1000, - 900, -1000, -1000, 108, 436, 1431, -1000, 1626, + -1000, -1000, -107, -97, -1000, 729, 1617, -34, 1617, -1000, + 1617, 1617, 1617, 1617, 1617, 1617, 1617, 1617, 1617, 1617, + 1617, 1617, 1617, 1617, 1617, 1617, 1617, 1617, 1617, 1617, + 1617, 1617, 1617, 1617, 1617, 1617, 1529, 1617, 20, -1000, + 19, -1000, -136, -149, 1216, -151, -108, 95, 1509, 1617, + 1617, 1617, 1617, 1617, 1617, 1617, 1617, 1617, 1617, 1617, + 1617, -1000, -1000, 1617, -1000, -1000, -1000, 2, 2, 2, + 2, 1440, 1617, 202, 1617, 202, 202, 2, 2, 2, + 2, 2, 2, 2, 2, 1998, 1961, 1998, 1617, -1000, + -1000, -1000, -10, -1000, -1000, -1000, -1000, -1000, 1394, -152, + 485, 2069, 1878, 1998, 1921, 1600, 708, 2101, 66, 66, + 66, 2, 2, 2, 2, 147, 147, 339, 339, 339, + 339, 339, 124, 124, 124, 124, 1816, 1617, 2035, -154, + -138, -142, 1617, -1000, 1617, -1000, -1000, 1998, 1617, 1998, + 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, 1998, + 1998, 1349, -1000, 1286, 1201, 1617, 1684, -1000, 1131, 1617, + 1617, 2035, -21, -143, -1000, 833, 601, 613, 708, 1046, + -1000, -1000, 1998, -1000, -1000, -1000, -1000, 45, 2035, -157, + 119, -1000, 74, -1000, -1000, -33, -1000, -1000, -1000, -1000, + -19, -98, -1000, 1216, 94, -109, -1000, -1000, 497, -123, + 92, -21, -100, -1000, -1000, -1000, -19, -1000, -1000, -1000, + 961, -132, -1000, -139, -21, -1000, -24, -1000, -1000, 961, + -1000, -1000, -1000, 110, 217, 1617, -1000, 202, } var yyPgo = [...]int{ - 0, 202, 254, 230, 228, 225, 224, 4, 223, 222, - 221, 20, 220, 1, 219, 133, 127, 216, 215, 2, - 5, 214, 212, 3, 0, 208, 206, 200, 138, 205, - 204, 168, 167, 134, 129, 128, + 0, 193, 273, 264, 262, 261, 259, 4, 257, 229, + 228, 20, 227, 1, 226, 135, 129, 220, 218, 2, + 5, 217, 216, 3, 0, 211, 209, 271, 206, 207, + 204, 202, 170, 169, 140, 131, 130, } var yyR1 = [...]int{ - 0, 33, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 35, - 35, 35, 35, 35, 35, 35, 5, 5, 8, 8, + 0, 34, 35, 35, 35, 35, 35, 35, 35, 35, + 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, + 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, + 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, + 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, + 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, + 35, 35, 35, 35, 35, 35, 35, 35, 35, 36, + 36, 36, 36, 36, 36, 36, 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, 29, 29, 30, 30, 31, 31, 32, 32, 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, + 11, 11, 29, 29, 30, 30, 31, 31, 32, 32, + 33, 33, 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, 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, @@ -732,7 +746,8 @@ var yyR1 = [...]int{ 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, 26, 27, 28, 28, 28, + 25, 25, 25, 25, 24, 24, 26, 27, 28, 28, + 28, } var yyR2 = [...]int{ @@ -745,95 +760,98 @@ var yyR2 = [...]int{ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 2, 3, 2, 0, 1, 1, 3, 3, - 1, 2, 0, 1, 1, 1, 3, 1, 1, 7, - 2, 5, 6, 1, 3, 6, 7, 3, 6, 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, 4, + 1, 2, 0, 1, 1, 1, 3, 1, 1, 5, + 7, 2, 5, 6, 1, 3, 6, 7, 3, 6, + 1, 4, 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, 4, 2, 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, 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, 1, 1, 1, 4, 2, + 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, 1, 1, 1, 4, + 2, } var yyChk = [...]int{ - -1000, -33, -10, -6, -11, -16, 4, 154, -15, 160, - -30, -32, 96, -24, 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, 164, -5, -24, 86, -35, -34, 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, 104, 105, 116, 117, 118, 119, 120, 121, - 122, 123, 124, 125, 111, 112, 113, 114, 115, 134, - 106, 107, 108, 109, 110, 135, 136, 131, 132, 154, - 129, 130, 128, 137, 138, 140, 139, 141, 142, 156, - 155, -7, -8, 86, -13, -11, 4, 159, 33, 34, - 10, 12, 11, 35, 37, 36, 51, 49, 50, 52, - 68, 53, 54, 47, 48, 40, 41, 38, 39, 42, - 43, 44, 45, 46, 30, 32, -4, 37, 128, -1, - 86, 73, 74, 73, 75, 74, 17, 18, 19, 20, - 29, 21, 22, 23, 24, 25, 26, 27, 28, 58, - 59, 162, -24, -27, -27, -24, -24, -24, -24, -24, - 162, -24, 162, -24, -24, -24, -24, -24, -24, -24, - -24, -24, -24, -24, -24, -24, 160, -28, 159, 159, - 157, -12, 161, -11, -16, -15, 97, -24, -24, -24, + -1000, -34, -10, -6, -11, -16, 4, 154, -15, 160, + -30, -32, 97, 96, -24, 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, 164, -5, -24, 86, -36, -35, 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, 104, 105, 116, 117, 118, 119, 120, + 121, 122, 123, 124, 125, 111, 112, 113, 114, 115, + 134, 106, 107, 108, 109, 110, 135, 136, 131, 132, + 154, 129, 130, 128, 137, 138, 140, 139, 141, 142, + 156, 155, -7, -8, 86, -13, 162, -11, 4, 159, + 33, 34, 10, 12, 11, 35, 37, 36, 51, 49, + 50, 52, 68, 53, 54, 47, 48, 40, 41, 38, + 39, 42, 43, 44, 45, 46, 30, 32, -4, 37, + 128, -1, 86, 73, 74, 73, 75, 74, 17, 18, + 19, 20, 29, 21, 22, 23, 24, 25, 26, 27, + 28, 58, 59, 162, -24, -27, -27, -24, -24, -24, + -24, -24, 162, -24, 162, -24, -24, -24, -24, -24, + -24, -24, -24, -24, -24, -24, -24, -24, 160, -28, + 159, 159, 157, -12, 161, -11, -16, -15, -24, 97, -24, -24, -24, -24, -24, -24, -24, -24, -24, -24, -24, -24, -24, -24, -24, -24, -24, -24, -24, -24, - -24, -24, -24, -24, 31, -24, 86, 86, 160, 162, - -11, 162, 159, 31, -24, 37, -24, -24, -24, -24, - -24, -24, -24, -24, -24, -24, -24, -24, -24, 163, - -24, -24, 15, -24, 86, 162, 31, -24, 162, 160, - 161, -24, -24, -13, -24, 163, 163, 163, -24, 161, - -24, -24, -21, -22, -23, -17, -19, -20, 30, -9, - 135, 136, -7, 157, 154, 161, 163, 163, 75, -11, - 31, 163, 163, 9, -2, 37, -20, -7, 157, -11, - 31, 159, -13, 159, -18, 31, -23, -3, 158, -7, - -13, 160, -19, 88, -13, 17, 161, -24, + -24, -24, -24, -24, -24, -24, -24, 31, -24, 86, + 86, 160, 162, -11, 162, 159, 31, -24, 37, -24, + -24, -24, -24, -24, -24, -24, -24, -24, -24, -24, + -24, -24, 163, -24, -24, 15, -24, 86, 163, 162, + 31, -24, 162, 160, 161, -24, -24, -13, -24, 163, + 163, 163, -24, 161, -33, -11, 31, -24, -24, -21, + -22, -23, -17, -19, -20, 30, -9, 135, 136, -7, + 157, 154, 161, 163, 163, 75, -11, 31, -13, 163, + 163, 9, -2, 37, -20, -7, 157, -11, 31, 159, + -13, 98, 159, -18, 31, -23, -3, 158, -7, -13, + 159, 160, -19, 88, -13, 17, 161, -24, } var yyDef = [...]int{ 85, -2, 1, 84, 86, 87, 0, 0, 90, 92, - 97, 98, 0, 0, 124, 0, 0, 103, 0, 211, - 212, 111, 0, 214, 0, 0, 0, 0, 0, 0, + 97, 98, 0, 0, 0, 127, 0, 0, 104, 0, + 214, 215, 114, 0, 217, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 207, 0, 113, 114, - 213, 215, 0, 0, 193, 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, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 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, 100, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 210, 0, 116, + 117, 216, 218, 0, 0, 196, 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, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 36, 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, 101, 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, 125, 0, 112, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, + 0, 115, 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, 154, - 156, 0, 140, 155, 157, 175, 176, 177, 178, 0, - 0, 194, 0, 196, 197, 198, 199, 200, 201, 202, - 203, 204, 205, 206, 208, 210, 0, 217, 88, 89, - 0, 91, 96, 93, 94, 95, 0, 158, 159, 160, + 0, 157, 159, 0, 143, 158, 160, 178, 179, 180, + 181, 0, 0, 197, 0, 199, 200, 201, 202, 203, + 204, 205, 206, 207, 208, 209, 211, 213, 0, 220, + 88, 89, 0, 91, 96, 93, 94, 95, 0, 0, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, - 171, 172, 173, 174, -2, -2, -2, -2, -2, -2, - -2, -2, -2, 0, 0, 191, 0, 0, 0, 0, - 104, 0, 107, 92, 137, 0, 141, 142, 143, 144, - 145, 146, 147, 148, 150, 151, 152, 153, 0, 188, - 0, 0, 0, 0, 79, 0, 0, 190, -2, 0, - 110, 0, 0, 0, 138, 0, 192, 195, 209, 216, - 0, 189, 0, 116, 118, 126, 123, 130, 0, 132, - 133, 134, 81, 0, 0, 109, 0, 0, 0, 101, - 92, 0, 135, 122, 128, 127, 131, 82, 0, 102, - 92, 108, 105, 99, 0, 0, 119, 0, 129, 83, - 106, 92, 136, 120, 0, 0, 115, 121, + 171, 172, 173, 174, 175, 176, 177, -2, -2, -2, + -2, -2, -2, -2, -2, -2, 0, 0, 194, 0, + 0, 0, 0, 105, 0, 108, 92, 140, 0, 144, + 145, 146, 147, 148, 149, 150, 151, 153, 154, 155, + 156, 0, 191, 0, 0, 0, 0, 79, 0, 0, + 0, 193, -2, 0, 113, 0, 0, 0, 141, 0, + 195, 198, 212, 219, 99, 110, 92, 0, 192, 0, + 119, 121, 129, 126, 133, 0, 135, 136, 137, 81, + 0, 0, 112, 0, 0, 0, 102, 92, 0, 0, + 138, 125, 131, 130, 134, 82, 0, 103, 92, 109, + 106, 0, 100, 0, 0, 122, 0, 132, 83, 107, + 111, 92, 139, 123, 0, 0, 118, 124, } var yyTok1 = [...]int{ @@ -1211,247 +1229,265 @@ yydefault: case 1: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:211 + //line parser.y:212 { fmt.Println(yyDollar[1].node) } case 76: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:230 + //line parser.y:231 { yyVAL.node = Node("identifier") } case 77: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:231 + //line parser.y:232 { yyVAL.node = Node("reserved") } case 78: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:235 + //line parser.y:236 { yyVAL.node = Node("NamespaceParts").append(Node(yyDollar[1].token)) } case 79: yyDollar = yyS[yypt-3 : yypt+1] - //line parser.y:236 + //line parser.y:237 { yyVAL.node = yyDollar[1].node.append(Node(yyDollar[3].token)) } case 80: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:240 + //line parser.y:241 { yyVAL.node = yyDollar[1].node } case 81: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:244 + //line parser.y:245 { yyVAL.node = Node("Name").append(yyDollar[1].node) } case 82: yyDollar = yyS[yypt-2 : yypt+1] - //line parser.y:245 + //line parser.y:246 { yyVAL.node = Node("Name").append(yyDollar[2].node).attribute("FullyQualified", "true") } case 83: yyDollar = yyS[yypt-3 : yypt+1] - //line parser.y:246 + //line parser.y:247 { yyVAL.node = Node("Name").append(yyDollar[3].node).attribute("Relative", "true") } case 84: yyDollar = yyS[yypt-2 : yypt+1] - //line parser.y:250 + //line parser.y:251 { yyVAL.node = yyDollar[1].node.append(yyDollar[2].node) } case 85: yyDollar = yyS[yypt-0 : yypt+1] - //line parser.y:251 + //line parser.y:252 { yyVAL.node = Node("Statements") } case 86: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:255 + //line parser.y:256 { yyVAL.node = yyDollar[1].node } case 87: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:256 + //line parser.y:257 { yyVAL.node = yyDollar[1].node } case 88: yyDollar = yyS[yypt-3 : yypt+1] - //line parser.y:257 + //line parser.y:258 { yyVAL.node = yyDollar[2].node /*TODO: identifier stub, refactor it*/ } case 89: yyDollar = yyS[yypt-3 : yypt+1] - //line parser.y:258 + //line parser.y:259 { yyVAL.node = Node("Namespace").append(yyDollar[2].node) } case 90: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:259 + //line parser.y:260 { yyVAL.node = yyDollar[1].node } case 91: yyDollar = yyS[yypt-2 : yypt+1] - //line parser.y:263 + //line parser.y:264 { yyVAL.node = yyDollar[1].node.append(yyDollar[2].node) } case 92: yyDollar = yyS[yypt-0 : yypt+1] - //line parser.y:264 + //line parser.y:265 { yyVAL.node = Node("statement_list") } case 93: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:268 + //line parser.y:269 { yyVAL.node = yyDollar[1].node } case 94: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:269 + //line parser.y:270 { yyVAL.node = yyDollar[1].node } case 95: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:270 + //line parser.y:271 { yyVAL.node = yyDollar[1].node } case 96: yyDollar = yyS[yypt-3 : yypt+1] - //line parser.y:273 + //line parser.y:274 { yyVAL.node = yyDollar[2].node } case 97: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:274 + //line parser.y:275 { yyVAL.node = yyDollar[1].node } case 98: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:275 + //line parser.y:276 { yyVAL.node = yyDollar[1].node } case 99: - yyDollar = yyS[yypt-7 : yypt+1] - //line parser.y:276 + yyDollar = yyS[yypt-5 : yypt+1] + //line parser.y:277 { - yyVAL.node = Node("Do While").append(yyDollar[2].node).append(yyDollar[5].node) + yyVAL.node = Node("While").append(Node("expr").append(yyDollar[3].node)).append(Node("stmt").append(yyDollar[5].node)) } case 100: + yyDollar = yyS[yypt-7 : yypt+1] + //line parser.y:278 + { + yyVAL.node = Node("Do While").append(Node("expr").append(yyDollar[5].node)).append(Node("stmt").append(yyDollar[2].node)) + } + case 101: yyDollar = yyS[yypt-2 : yypt+1] - //line parser.y:277 + //line parser.y:279 { yyVAL.node = yyDollar[1].node } - case 101: + case 102: yyDollar = yyS[yypt-5 : yypt+1] - //line parser.y:281 + //line parser.y:283 { yyVAL.node = Node("If").append(Node("expr").append(yyDollar[3].node)).append(Node("stmt").append(yyDollar[5].node)) } - case 102: + case 103: yyDollar = yyS[yypt-6 : yypt+1] - //line parser.y:285 + //line parser.y:287 { yyVAL.node = yyDollar[1].node.append(Node("ElseIf").append(Node("expr").append(yyDollar[4].node)).append(Node("stmt").append(yyDollar[6].node))) } - case 103: + case 104: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:291 + //line parser.y:293 { yyVAL.node = yyDollar[1].node } - case 104: + case 105: yyDollar = yyS[yypt-3 : yypt+1] - //line parser.y:293 + //line parser.y:295 { yyVAL.node = yyDollar[1].node.append(Node("Else").append(Node("stmt").append(yyDollar[3].node))) } - case 105: + case 106: yyDollar = yyS[yypt-6 : yypt+1] - //line parser.y:300 + //line parser.y:302 { yyVAL.node = Node("AltIf").append(Node("expr").append(yyDollar[3].node)).append(Node("stmt").append(yyDollar[6].node)) } - case 106: + case 107: yyDollar = yyS[yypt-7 : yypt+1] - //line parser.y:304 + //line parser.y:306 { yyVAL.node = yyDollar[1].node.append(Node("AltElseIf").append(Node("expr").append(yyDollar[4].node)).append(Node("stmt").append(yyDollar[7].node))) } - case 107: + case 108: yyDollar = yyS[yypt-3 : yypt+1] - //line parser.y:310 + //line parser.y:312 { yyVAL.node = yyDollar[1].node } - case 108: + case 109: yyDollar = yyS[yypt-6 : yypt+1] - //line parser.y:312 + //line parser.y:314 { yyVAL.node = yyDollar[1].node.append(Node("AltElse").append(Node("stmt").append(yyDollar[4].node))) } - case 109: + case 110: + yyDollar = yyS[yypt-1 : yypt+1] + //line parser.y:320 + { + yyVAL.node = yyDollar[1].node + } + case 111: + yyDollar = yyS[yypt-4 : yypt+1] + //line parser.y:321 + { + yyVAL.node = yyDollar[2].node + } + case 112: yyDollar = yyS[yypt-5 : yypt+1] - //line parser.y:318 + //line parser.y:326 { yyVAL.node = yyDollar[1].node.attribute("name", yyDollar[3].token) } - case 110: + case 113: yyDollar = yyS[yypt-4 : yypt+1] - //line parser.y:319 + //line parser.y:327 { yyVAL.node = Node("Class").attribute("name", yyDollar[2].token) } - case 111: + case 114: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:322 + //line parser.y:330 { yyVAL.node = Node("Class").attribute(yyDollar[1].value, "true") } - case 112: + case 115: yyDollar = yyS[yypt-2 : yypt+1] - //line parser.y:323 + //line parser.y:331 { yyVAL.node = yyDollar[1].node.attribute(yyDollar[2].value, "true") } - case 113: + case 116: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:327 + //line parser.y:335 { yyVAL.value = "abstract" } - case 114: + case 117: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:328 + //line parser.y:336 { yyVAL.value = "final" } - case 115: + case 118: yyDollar = yyS[yypt-10 : yypt+1] - //line parser.y:333 + //line parser.y:341 { yyVAL.node = Node("Function"). attribute("name", yyDollar[3].token). @@ -1460,33 +1496,33 @@ yydefault: append(yyDollar[7].node). append(yyDollar[9].node) } - case 116: + case 119: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:344 + //line parser.y:352 { yyVAL.node = yyDollar[1].node } - case 117: + case 120: yyDollar = yyS[yypt-0 : yypt+1] - //line parser.y:345 + //line parser.y:353 { yyVAL.node = Node("Parameter list") } - case 118: + case 121: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:348 + //line parser.y:356 { yyVAL.node = Node("Parameter list").append(yyDollar[1].node) } - case 119: + case 122: yyDollar = yyS[yypt-3 : yypt+1] - //line parser.y:349 + //line parser.y:357 { yyVAL.node = yyDollar[1].node.append(yyDollar[3].node) } - case 120: + case 123: yyDollar = yyS[yypt-4 : yypt+1] - //line parser.y:353 + //line parser.y:361 { yyVAL.node = Node("Parameter"). append(yyDollar[1].node). @@ -1494,9 +1530,9 @@ yydefault: attribute("is_variadic", yyDollar[3].value). attribute("var", yyDollar[4].token) } - case 121: + case 124: yyDollar = yyS[yypt-6 : yypt+1] - //line parser.y:361 + //line parser.y:369 { yyVAL.node = Node("Parameter"). append(yyDollar[1].node). @@ -1505,580 +1541,580 @@ yydefault: attribute("var", yyDollar[4].token). append(yyDollar[6].node) } - case 122: + case 125: yyDollar = yyS[yypt-0 : yypt+1] - //line parser.y:372 + //line parser.y:380 { yyVAL.node = Node("No type") } - case 123: + case 126: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:373 + //line parser.y:381 { yyVAL.node = yyDollar[1].node } - case 124: - yyDollar = yyS[yypt-0 : yypt+1] - //line parser.y:377 - { - yyVAL.value = "false" - } - case 125: - yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:378 - { - yyVAL.value = "true" - } - case 126: - yyDollar = yyS[yypt-0 : yypt+1] - //line parser.y:382 - { - yyVAL.value = "false" - } case 127: - yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:383 + yyDollar = yyS[yypt-0 : yypt+1] + //line parser.y:385 { - yyVAL.value = "true" + yyVAL.value = "false" } case 128: - yyDollar = yyS[yypt-0 : yypt+1] - //line parser.y:387 - { - yyVAL.value = "false" - } - case 129: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:388 + //line parser.y:386 { yyVAL.value = "true" } + case 129: + yyDollar = yyS[yypt-0 : yypt+1] + //line parser.y:390 + { + yyVAL.value = "false" + } case 130: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:392 + //line parser.y:391 + { + yyVAL.value = "true" + } + case 131: + yyDollar = yyS[yypt-0 : yypt+1] + //line parser.y:395 + { + yyVAL.value = "false" + } + case 132: + yyDollar = yyS[yypt-1 : yypt+1] + //line parser.y:396 + { + yyVAL.value = "true" + } + case 133: + yyDollar = yyS[yypt-1 : yypt+1] + //line parser.y:400 { yyVAL.node = yyDollar[1].node } - case 131: + case 134: yyDollar = yyS[yypt-2 : yypt+1] - //line parser.y:393 + //line parser.y:401 { yyVAL.node = yyDollar[2].node yyVAL.node.attribute("nullable", "true") } - case 132: + case 135: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:397 + //line parser.y:405 { yyVAL.node = yyDollar[1].node } - case 133: + case 136: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:398 + //line parser.y:406 { yyVAL.node = Node("array type") } - case 134: + case 137: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:399 + //line parser.y:407 { yyVAL.node = Node("callable type") } - case 135: + case 138: yyDollar = yyS[yypt-0 : yypt+1] - //line parser.y:403 + //line parser.y:411 { yyVAL.node = Node("void") } - case 136: + case 139: yyDollar = yyS[yypt-2 : yypt+1] - //line parser.y:404 + //line parser.y:412 { yyVAL.node = yyDollar[2].node } - case 137: - yyDollar = yyS[yypt-3 : yypt+1] - //line parser.y:408 - { - yyVAL.node = Node("Assign").append(yyDollar[1].node).append(yyDollar[3].node) - } - case 138: - yyDollar = yyS[yypt-4 : yypt+1] - //line parser.y:409 - { - yyVAL.node = Node("AssignRef").append(yyDollar[1].node).append(yyDollar[4].node) - } - case 139: - yyDollar = yyS[yypt-4 : yypt+1] - //line parser.y:410 - { - yyVAL.node = Node("AssignRef").append(yyDollar[1].node).append(yyDollar[4].node) - } case 140: - yyDollar = yyS[yypt-2 : yypt+1] - //line parser.y:411 - { - yyVAL.node = Node("Clone").append(yyDollar[2].node) - } - case 141: - yyDollar = yyS[yypt-3 : yypt+1] - //line parser.y:412 - { - yyVAL.node = Node("AssignAdd").append(yyDollar[1].node).append(yyDollar[3].node) - } - case 142: - yyDollar = yyS[yypt-3 : yypt+1] - //line parser.y:413 - { - yyVAL.node = Node("AssignSub").append(yyDollar[1].node).append(yyDollar[3].node) - } - case 143: - yyDollar = yyS[yypt-3 : yypt+1] - //line parser.y:414 - { - yyVAL.node = Node("AssignMul").append(yyDollar[1].node).append(yyDollar[3].node) - } - case 144: - yyDollar = yyS[yypt-3 : yypt+1] - //line parser.y:415 - { - yyVAL.node = Node("AssignPow").append(yyDollar[1].node).append(yyDollar[3].node) - } - case 145: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:416 { - yyVAL.node = Node("AssignDiv").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("Assign").append(yyDollar[1].node).append(yyDollar[3].node) } - case 146: - yyDollar = yyS[yypt-3 : yypt+1] + case 141: + yyDollar = yyS[yypt-4 : yypt+1] //line parser.y:417 { - yyVAL.node = Node("AssignConcat").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("AssignRef").append(yyDollar[1].node).append(yyDollar[4].node) } - case 147: - yyDollar = yyS[yypt-3 : yypt+1] + case 142: + yyDollar = yyS[yypt-4 : yypt+1] //line parser.y:418 { - yyVAL.node = Node("AssignMod").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("AssignRef").append(yyDollar[1].node).append(yyDollar[4].node) } - case 148: - yyDollar = yyS[yypt-3 : yypt+1] + case 143: + yyDollar = yyS[yypt-2 : yypt+1] //line parser.y:419 { - yyVAL.node = Node("AssignAnd").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("Clone").append(yyDollar[2].node) } - case 149: + case 144: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:420 { - yyVAL.node = Node("AssignAnd").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("AssignAdd").append(yyDollar[1].node).append(yyDollar[3].node) } - case 150: + case 145: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:421 { - yyVAL.node = Node("AssignOr").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("AssignSub").append(yyDollar[1].node).append(yyDollar[3].node) } - case 151: + case 146: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:422 { - yyVAL.node = Node("AssignXor").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("AssignMul").append(yyDollar[1].node).append(yyDollar[3].node) } - case 152: + case 147: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:423 { - yyVAL.node = Node("AssignShiftLeft").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("AssignPow").append(yyDollar[1].node).append(yyDollar[3].node) } - case 153: + case 148: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:424 { - yyVAL.node = Node("AssignShiftRight").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("AssignDiv").append(yyDollar[1].node).append(yyDollar[3].node) } - case 154: - yyDollar = yyS[yypt-2 : yypt+1] + case 149: + yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:425 { - yyVAL.node = Node("PostIncrement").append(yyDollar[1].node) + yyVAL.node = Node("AssignConcat").append(yyDollar[1].node).append(yyDollar[3].node) } - case 155: - yyDollar = yyS[yypt-2 : yypt+1] + case 150: + yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:426 { - yyVAL.node = Node("PreIncrement").append(yyDollar[2].node) + yyVAL.node = Node("AssignMod").append(yyDollar[1].node).append(yyDollar[3].node) } - case 156: - yyDollar = yyS[yypt-2 : yypt+1] + case 151: + yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:427 { - yyVAL.node = Node("PostDecrement").append(yyDollar[1].node) + yyVAL.node = Node("AssignAnd").append(yyDollar[1].node).append(yyDollar[3].node) } - case 157: - yyDollar = yyS[yypt-2 : yypt+1] + case 152: + yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:428 { - yyVAL.node = Node("PreDecrement").append(yyDollar[2].node) + yyVAL.node = Node("AssignAnd").append(yyDollar[1].node).append(yyDollar[3].node) } - case 158: + case 153: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:429 { - yyVAL.node = Node("Or").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("AssignOr").append(yyDollar[1].node).append(yyDollar[3].node) } - case 159: + case 154: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:430 { - yyVAL.node = Node("And").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("AssignXor").append(yyDollar[1].node).append(yyDollar[3].node) } - case 160: + case 155: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:431 { - yyVAL.node = Node("Or").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("AssignShiftLeft").append(yyDollar[1].node).append(yyDollar[3].node) } - case 161: + case 156: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:432 { - yyVAL.node = Node("And").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("AssignShiftRight").append(yyDollar[1].node).append(yyDollar[3].node) } - case 162: - yyDollar = yyS[yypt-3 : yypt+1] + case 157: + yyDollar = yyS[yypt-2 : yypt+1] //line parser.y:433 { - yyVAL.node = Node("Xor").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("PostIncrement").append(yyDollar[1].node) } - case 163: - yyDollar = yyS[yypt-3 : yypt+1] + case 158: + yyDollar = yyS[yypt-2 : yypt+1] //line parser.y:434 { - yyVAL.node = Node("BitwiseOr").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("PreIncrement").append(yyDollar[2].node) } - case 164: - yyDollar = yyS[yypt-3 : yypt+1] + case 159: + yyDollar = yyS[yypt-2 : yypt+1] //line parser.y:435 { - yyVAL.node = Node("BitwiseAnd").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("PostDecrement").append(yyDollar[1].node) } - case 165: - yyDollar = yyS[yypt-3 : yypt+1] + case 160: + yyDollar = yyS[yypt-2 : yypt+1] //line parser.y:436 { - yyVAL.node = Node("BitwiseXor").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("PreDecrement").append(yyDollar[2].node) } - case 166: + case 161: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:437 { - yyVAL.node = Node("Concat").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("Or").append(yyDollar[1].node).append(yyDollar[3].node) } - case 167: + case 162: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:438 { - yyVAL.node = Node("Add").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("And").append(yyDollar[1].node).append(yyDollar[3].node) } - case 168: + case 163: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:439 { - yyVAL.node = Node("Sub").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("Or").append(yyDollar[1].node).append(yyDollar[3].node) } - case 169: + case 164: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:440 { - yyVAL.node = Node("Mul").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("And").append(yyDollar[1].node).append(yyDollar[3].node) } - case 170: + case 165: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:441 { - yyVAL.node = Node("Pow").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("Xor").append(yyDollar[1].node).append(yyDollar[3].node) } - case 171: + case 166: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:442 { - yyVAL.node = Node("Div").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("BitwiseOr").append(yyDollar[1].node).append(yyDollar[3].node) } - case 172: + case 167: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:443 { - yyVAL.node = Node("Mod").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("BitwiseAnd").append(yyDollar[1].node).append(yyDollar[3].node) } - case 173: + case 168: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:444 { - yyVAL.node = Node("ShiftLeft").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("BitwiseXor").append(yyDollar[1].node).append(yyDollar[3].node) } - case 174: + case 169: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:445 { - yyVAL.node = Node("ShiftRight").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("Concat").append(yyDollar[1].node).append(yyDollar[3].node) } - case 175: - yyDollar = yyS[yypt-2 : yypt+1] + case 170: + yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:446 { - yyVAL.node = Node("UnaryPlus").append(yyDollar[2].node) + yyVAL.node = Node("Add").append(yyDollar[1].node).append(yyDollar[3].node) } - case 176: - yyDollar = yyS[yypt-2 : yypt+1] + case 171: + yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:447 { - yyVAL.node = Node("UnaryMinus").append(yyDollar[2].node) + yyVAL.node = Node("Sub").append(yyDollar[1].node).append(yyDollar[3].node) } - case 177: - yyDollar = yyS[yypt-2 : yypt+1] + case 172: + yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:448 { - yyVAL.node = Node("BooleanNot").append(yyDollar[2].node) + yyVAL.node = Node("Mul").append(yyDollar[1].node).append(yyDollar[3].node) } - case 178: - yyDollar = yyS[yypt-2 : yypt+1] + case 173: + yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:449 { - yyVAL.node = Node("BitwiseNot").append(yyDollar[2].node) + yyVAL.node = Node("Pow").append(yyDollar[1].node).append(yyDollar[3].node) } - case 179: + case 174: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:450 { - yyVAL.node = Node("Identical").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("Div").append(yyDollar[1].node).append(yyDollar[3].node) } - case 180: + case 175: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:451 { - yyVAL.node = Node("NotIdentical").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("Mod").append(yyDollar[1].node).append(yyDollar[3].node) } - case 181: + case 176: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:452 { - yyVAL.node = Node("Equal").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("ShiftLeft").append(yyDollar[1].node).append(yyDollar[3].node) } - case 182: + case 177: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:453 { - yyVAL.node = Node("NotEqual").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("ShiftRight").append(yyDollar[1].node).append(yyDollar[3].node) } - case 183: - yyDollar = yyS[yypt-3 : yypt+1] + case 178: + yyDollar = yyS[yypt-2 : yypt+1] //line parser.y:454 { - yyVAL.node = Node("Spaceship").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("UnaryPlus").append(yyDollar[2].node) } - case 184: - yyDollar = yyS[yypt-3 : yypt+1] + case 179: + yyDollar = yyS[yypt-2 : yypt+1] //line parser.y:455 { - yyVAL.node = Node("Smaller").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("UnaryMinus").append(yyDollar[2].node) } - case 185: - yyDollar = yyS[yypt-3 : yypt+1] + case 180: + yyDollar = yyS[yypt-2 : yypt+1] //line parser.y:456 { - yyVAL.node = Node("SmallerOrEqual").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("BooleanNot").append(yyDollar[2].node) } - case 186: - yyDollar = yyS[yypt-3 : yypt+1] + case 181: + yyDollar = yyS[yypt-2 : yypt+1] //line parser.y:457 { - yyVAL.node = Node("Greater").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("BitwiseNot").append(yyDollar[2].node) } - case 187: + case 182: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:458 { - yyVAL.node = Node("GreaterOrEqual").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("Identical").append(yyDollar[1].node).append(yyDollar[3].node) } - case 188: + case 183: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:459 { - yyVAL.node = yyDollar[2].node + yyVAL.node = Node("NotIdentical").append(yyDollar[1].node).append(yyDollar[3].node) } - case 189: - yyDollar = yyS[yypt-5 : yypt+1] + case 184: + yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:460 { - yyVAL.node = Node("Ternary").append(yyDollar[1].node).append(yyDollar[3].node).append(yyDollar[5].node) + yyVAL.node = Node("Equal").append(yyDollar[1].node).append(yyDollar[3].node) } - case 190: - yyDollar = yyS[yypt-4 : yypt+1] + case 185: + yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:461 { - yyVAL.node = Node("Ternary").append(yyDollar[1].node).append(yyDollar[4].node) + yyVAL.node = Node("NotEqual").append(yyDollar[1].node).append(yyDollar[3].node) } - case 191: + case 186: yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:462 { - yyVAL.node = Node("Coalesce").append(yyDollar[1].node).append(yyDollar[3].node) + yyVAL.node = Node("Spaceship").append(yyDollar[1].node).append(yyDollar[3].node) } - case 192: - yyDollar = yyS[yypt-4 : yypt+1] + case 187: + yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:463 { - yyVAL.node = Node("Empty").append(yyDollar[3].node) + yyVAL.node = Node("Smaller").append(yyDollar[1].node).append(yyDollar[3].node) } - case 193: - yyDollar = yyS[yypt-2 : yypt+1] + case 188: + yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:464 { - yyVAL.node = Node("Include").append(yyDollar[2].node) + yyVAL.node = Node("SmallerOrEqual").append(yyDollar[1].node).append(yyDollar[3].node) } - case 194: - yyDollar = yyS[yypt-2 : yypt+1] + case 189: + yyDollar = yyS[yypt-3 : yypt+1] //line parser.y:465 { - yyVAL.node = Node("IncludeOnce").append(yyDollar[2].node) + yyVAL.node = Node("Greater").append(yyDollar[1].node).append(yyDollar[3].node) + } + case 190: + yyDollar = yyS[yypt-3 : yypt+1] + //line parser.y:466 + { + yyVAL.node = Node("GreaterOrEqual").append(yyDollar[1].node).append(yyDollar[3].node) + } + case 191: + yyDollar = yyS[yypt-3 : yypt+1] + //line parser.y:467 + { + yyVAL.node = yyDollar[2].node + } + case 192: + yyDollar = yyS[yypt-5 : yypt+1] + //line parser.y:468 + { + yyVAL.node = Node("Ternary").append(yyDollar[1].node).append(yyDollar[3].node).append(yyDollar[5].node) + } + case 193: + yyDollar = yyS[yypt-4 : yypt+1] + //line parser.y:469 + { + yyVAL.node = Node("Ternary").append(yyDollar[1].node).append(yyDollar[4].node) + } + case 194: + yyDollar = yyS[yypt-3 : yypt+1] + //line parser.y:470 + { + yyVAL.node = Node("Coalesce").append(yyDollar[1].node).append(yyDollar[3].node) } case 195: yyDollar = yyS[yypt-4 : yypt+1] - //line parser.y:466 + //line parser.y:471 { - yyVAL.node = Node("Eval").append(yyDollar[3].node) + yyVAL.node = Node("Empty").append(yyDollar[3].node) } case 196: yyDollar = yyS[yypt-2 : yypt+1] - //line parser.y:467 + //line parser.y:472 { - yyVAL.node = Node("Require").append(yyDollar[2].node) + yyVAL.node = Node("Include").append(yyDollar[2].node) } case 197: yyDollar = yyS[yypt-2 : yypt+1] - //line parser.y:468 + //line parser.y:473 { - yyVAL.node = Node("RequireOnce").append(yyDollar[2].node) + yyVAL.node = Node("IncludeOnce").append(yyDollar[2].node) } case 198: - yyDollar = yyS[yypt-2 : yypt+1] - //line parser.y:469 + yyDollar = yyS[yypt-4 : yypt+1] + //line parser.y:474 { - yyVAL.node = Node("CastInt").append(yyDollar[2].node) + yyVAL.node = Node("Eval").append(yyDollar[3].node) } case 199: yyDollar = yyS[yypt-2 : yypt+1] - //line parser.y:470 + //line parser.y:475 { - yyVAL.node = Node("CastDouble").append(yyDollar[2].node) + yyVAL.node = Node("Require").append(yyDollar[2].node) } case 200: yyDollar = yyS[yypt-2 : yypt+1] - //line parser.y:471 + //line parser.y:476 { - yyVAL.node = Node("CastString").append(yyDollar[2].node) + yyVAL.node = Node("RequireOnce").append(yyDollar[2].node) } case 201: yyDollar = yyS[yypt-2 : yypt+1] - //line parser.y:472 + //line parser.y:477 { - yyVAL.node = Node("CastArray").append(yyDollar[2].node) + yyVAL.node = Node("CastInt").append(yyDollar[2].node) } case 202: yyDollar = yyS[yypt-2 : yypt+1] - //line parser.y:473 + //line parser.y:478 { - yyVAL.node = Node("CastObject").append(yyDollar[2].node) + yyVAL.node = Node("CastDouble").append(yyDollar[2].node) } case 203: yyDollar = yyS[yypt-2 : yypt+1] - //line parser.y:474 + //line parser.y:479 { - yyVAL.node = Node("CastBool").append(yyDollar[2].node) + yyVAL.node = Node("CastString").append(yyDollar[2].node) } case 204: yyDollar = yyS[yypt-2 : yypt+1] - //line parser.y:475 + //line parser.y:480 { - yyVAL.node = Node("CastUnset").append(yyDollar[2].node) + yyVAL.node = Node("CastArray").append(yyDollar[2].node) } case 205: yyDollar = yyS[yypt-2 : yypt+1] - //line parser.y:476 + //line parser.y:481 { - yyVAL.node = Node("Silence").append(yyDollar[2].node) + yyVAL.node = Node("CastObject").append(yyDollar[2].node) } case 206: yyDollar = yyS[yypt-2 : yypt+1] - //line parser.y:478 + //line parser.y:482 { - yyVAL.node = Node("Print").append(yyDollar[2].node) + yyVAL.node = Node("CastBool").append(yyDollar[2].node) } case 207: - yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:479 + yyDollar = yyS[yypt-2 : yypt+1] + //line parser.y:483 { - yyVAL.node = Node("Yield") + yyVAL.node = Node("CastUnset").append(yyDollar[2].node) } case 208: yyDollar = yyS[yypt-2 : yypt+1] - //line parser.y:480 + //line parser.y:484 { - yyVAL.node = Node("Yield").append(yyDollar[2].node) + yyVAL.node = Node("Silence").append(yyDollar[2].node) } case 209: - yyDollar = yyS[yypt-4 : yypt+1] - //line parser.y:481 - { - yyVAL.node = Node("Yield").append(yyDollar[2].node).append(yyDollar[4].node) - } - case 210: yyDollar = yyS[yypt-2 : yypt+1] - //line parser.y:482 - { - yyVAL.node = Node("YieldFrom").append(yyDollar[2].node) - } - case 211: - yyDollar = yyS[yypt-1 : yypt+1] //line parser.y:486 { - yyVAL.node = yyDollar[1].node + yyVAL.node = Node("Print").append(yyDollar[2].node) } - case 212: + case 210: yyDollar = yyS[yypt-1 : yypt+1] //line parser.y:487 { - yyVAL.node = yyDollar[1].node + yyVAL.node = Node("Yield") + } + case 211: + yyDollar = yyS[yypt-2 : yypt+1] + //line parser.y:488 + { + yyVAL.node = Node("Yield").append(yyDollar[2].node) + } + case 212: + yyDollar = yyS[yypt-4 : yypt+1] + //line parser.y:489 + { + yyVAL.node = Node("Yield").append(yyDollar[2].node).append(yyDollar[4].node) } case 213: - yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:491 + yyDollar = yyS[yypt-2 : yypt+1] + //line parser.y:490 { - yyVAL.node = yyDollar[1].node + yyVAL.node = Node("YieldFrom").append(yyDollar[2].node) } case 214: yyDollar = yyS[yypt-1 : yypt+1] - //line parser.y:495 + //line parser.y:494 { yyVAL.node = yyDollar[1].node } case 215: + yyDollar = yyS[yypt-1 : yypt+1] + //line parser.y:495 + { + yyVAL.node = yyDollar[1].node + } + case 216: yyDollar = yyS[yypt-1 : yypt+1] //line parser.y:499 + { + yyVAL.node = yyDollar[1].node + } + case 217: + yyDollar = yyS[yypt-1 : yypt+1] + //line parser.y:503 + { + yyVAL.node = yyDollar[1].node + } + case 218: + yyDollar = yyS[yypt-1 : yypt+1] + //line parser.y:507 { yyVAL.node = Node("Variable").attribute("name", yyDollar[1].token) } - case 216: + case 219: yyDollar = yyS[yypt-4 : yypt+1] - //line parser.y:500 + //line parser.y:508 { yyVAL.node = yyDollar[3].node } - case 217: + case 220: yyDollar = yyS[yypt-2 : yypt+1] - //line parser.y:501 + //line parser.y:509 { yyVAL.node = Node("Variable").append(yyDollar[2].node) } diff --git a/parser.y b/parser.y index bd2e804..da75468 100644 --- a/parser.y +++ b/parser.y @@ -202,6 +202,7 @@ func (n node) attribute(key string, value string) node { %type if_stmt %type alt_if_stmt_without_else %type alt_if_stmt +%type while_statement %% @@ -273,7 +274,8 @@ statement: '{' inner_statement_list '}' { $$ = $2; } | if_stmt { $$ = $1; } | alt_if_stmt { $$ = $1; } - | T_DO statement T_WHILE '(' expr ')' ';' { $$ = Node("Do While").append($2).append($5)} + | T_WHILE '(' expr ')' while_statement { $$ = Node("While").append(Node("expr").append($3)).append(Node("stmt").append($5)) } + | T_DO statement T_WHILE '(' expr ')' ';' { $$ = Node("DoWhile").append(Node("expr").append($5)).append(Node("stmt").append($2))} | expr ';' { $$ = $1; } if_stmt_without_else: @@ -314,6 +316,12 @@ alt_if_stmt: } ; +while_statement: + statement { $$ = $1; } + | ':' inner_statement_list T_ENDWHILE ';' { $$ = $2; } +; + + class_declaration_statement: class_modifiers T_CLASS T_STRING '{' '}' { $$ = $1.attribute("name", $3) } | T_CLASS T_STRING '{' '}' { $$ = Node("Class").attribute("name", $2) } @@ -507,13 +515,9 @@ simple_variable: const src = ` $b) : - $b=$c; -elseif ($a === $b) : +do { -else : - -endif; +} while ($a >= $b || $a < $c); `