Author: kjs
Date: Sun Dec 28 10:02:23 2008
New Revision: 34507
Modified:
trunk/compilers/pirc/new/pir.y
trunk/compilers/pirc/new/pirparser.c
Log:
[pirc] Allow .call "foo" in a .begin/.end_call sequence. imcc does not allow
this, but I think it adds to consistency to allow this.
Modified: trunk/compilers/pirc/new/pir.y
==============================================================================
--- trunk/compilers/pirc/new/pir.y (original)
+++ trunk/compilers/pirc/new/pir.y Sun Dec 28 10:02:23 2008
@@ -1618,7 +1618,7 @@
{ $$ = $2; }
;
-long_invocation : ".call" pmc_object opt_ret_cont
+long_invocation : ".call" sub opt_ret_cont
{ $$ = invoke(lexer, CALL_PCC, $2, $3); }
| ".nci_call" pmc_object
{ $$ = invoke(lexer, CALL_NCI, $2); }
Modified: trunk/compilers/pirc/new/pirparser.c
==============================================================================
--- trunk/compilers/pirc/new/pirparser.c (original)
+++ trunk/compilers/pirc/new/pirparser.c Sun Dec 28 10:02:23 2008
@@ -809,7 +809,7 @@
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 10
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1009
+#define YYLAST 1007
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 139
@@ -818,7 +818,7 @@
/* YYNRULES -- Number of rules. */
#define YYNRULES 416
/* YYNRULES -- Number of states. */
-#define YYNSTATES 647
+#define YYNSTATES 648
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -999,7 +999,7 @@
35, -1, 229, -1, 230, -1, 239, -1, 26, 35,
231, 234, 35, 236, 27, 35, -1, -1, 232, -1,
233, -1, 232, 233, -1, 30, 262, 35, -1, 29,
- 246, 235, -1, 32, 246, -1, 14, 246, 35, 15,
+ 244, 235, -1, 32, 246, -1, 14, 246, 35, 15,
245, -1, -1, 121, 246, -1, -1, 237, -1, 238,
-1, 237, 238, -1, 31, 250, 35, -1, 223, -1,
240, 35, -1, 247, 122, 241, -1, 285, 122, 241,
@@ -1349,11 +1349,11 @@
367, 368, 369, 370, 372, 0, 0, 0, 163, 150,
161, 0, 162, 171, 173, 281, 0, 229, 297, 294,
316, 314, 313, 306, 301, 311, 300, 242, 0, 246,
- 244, 248, 184, 185, 186, 187, 188, 189, 190, 192,
- 191, 194, 178, 177, 179, 181, 175, 182, 180, 176,
- 0, 0, 172, 71, 0, 72, 70, 315, 0, 0,
- 243, 0, 253, 0, 249, 250, 149, 151, 83, 0,
- 247, 0, 0, 251, 245, 252, 237
+ 262, 244, 248, 184, 185, 186, 187, 188, 189, 190,
+ 192, 191, 194, 178, 177, 179, 181, 175, 182, 180,
+ 176, 0, 0, 172, 71, 0, 72, 70, 315, 0,
+ 0, 243, 0, 253, 0, 249, 250, 149, 151, 83,
+ 0, 247, 0, 0, 251, 245, 252, 237
};
/* YYDEFGOTO[NTERM-NUM]. */
@@ -1362,13 +1362,13 @@
-1, 3, 8, 5, 42, 43, 21, 22, 23, 24,
132, 133, 134, 225, 226, 227, 228, 229, 230, 45,
25, 47, 48, 49, 26, 119, 120, 121, 51, 254,
- 52, 106, 101, 162, 624, 199, 200, 221, 304, 376,
+ 52, 106, 101, 162, 625, 199, 200, 221, 304, 376,
485, 486, 487, 219, 255, 256, 257, 27, 75, 127,
128, 129, 130, 177, 208, 59, 260, 261, 262, 263,
264, 265, 28, 332, 89, 90, 334, 91, 92, 93,
94, 137, 267, 268, 469, 269, 470, 270, 271, 350,
537, 272, 415, 273, 274, 379, 380, 492, 29, 276,
- 277, 278, 401, 402, 403, 507, 630, 633, 634, 635,
+ 277, 278, 401, 402, 403, 507, 631, 634, 635, 636,
279, 280, 281, 282, 283, 284, 451, 95, 286, 326,
327, 328, 411, 488, 287, 288, 289, 290, 315, 383,
384, 385, 386, 387, 388, 291, 292, 393, 394, 395,
@@ -1380,96 +1380,96 @@
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -582
+#define YYPACT_NINF -583
static const yytype_int16 yypact[] =
{
- 83, 12, 12, 50, -582, -582, -582, 15, -582, 53,
- -582, 23, 42, 52, -18, 47, -582, 345, 64, -6,
- -582, 82, -582, -582, 6, 92, 100, -582, 533, -582,
- 15, -582, -582, 47, -582, -582, 114, 116, 119, 718,
- 95, 123, 137, -582, -582, -582, -582, -582, -582, -582,
- -582, -582, -582, -582, 56, -582, -582, 135, -582, -582,
- -582, -582, -582, -582, -582, -582, -582, -582, -582, -582,
- -582, -582, -582, 87, 3, 170, -582, 345, -582, -582,
- -582, -582, -582, 84, -582, -582, -582, -582, 754, 183,
- 104, -582, -582, -582, -582, 98, -582, -582, 110, -582,
- -582, 658, -582, 126, -582, -582, -582, -582, 345, 345,
- 345, 345, -582, 129, 53, -582, 588, 576, -582, 157,
- 136, -582, -582, -6, -582, -582, -582, 149, 161, -582,
- -582, -582, 164, 165, -582, -582, -582, 99, -582, -582,
- -582, -582, -582, -582, -582, 533, -582, -582, -582, -582,
- -582, -582, 171, 172, 171, -582, -582, -582, -582, 171,
- 171, 171, -582, 246, 186, 187, 202, 203, 283, -582,
- -582, -582, 295, -582, -582, 135, -582, -16, -582, 3,
- 298, 345, -582, 754, -582, 288, -582, -582, 718, -582,
- -582, -582, -582, -582, 289, 290, 291, 106, -582, -582,
- 333, -582, -582, -582, -6, -582, -582, -582, -582, -582,
- 124, -582, -582, 222, 223, -582, -582, -582, -582, 261,
- 226, -582, -582, 226, 235, 240, 124, -582, 311, -582,
- -582, -582, -582, 312, -582, 226, 95, 230, 230, 315,
- 316, 317, 234, 437, 513, 648, 771, 794, 395, 345,
- -582, -88, 395, 319, -582, -582, -582, -582, -582, -582,
- -582, -582, -582, -582, -582, 320, 533, -582, -582, 322,
- -582, 323, 811, -582, -582, -582, -582, -582, -582, -582,
- 324, -582, -582, -582, 230, 232, 239, -582, -582, -582,
- -582, -582, -582, -582, 327, -582, -582, 708, -38, 98,
- -582, -582, -582, -582, -582, 345, 253, -582, -582, -582,
- -582, -582, 345, -582, 828, 329, 331, 347, 352, 344,
- 341, 342, -582, 343, 360, 257, 285, 276, -582, -582,
- -582, -582, -582, -582, -582, 284, -582, -582, -13, -13,
+ 83, 12, 12, 50, -583, -583, -583, 15, -583, 53,
+ -583, 23, 42, 52, -18, 47, -583, 345, 64, -6,
+ -583, 82, -583, -583, 6, 92, 100, -583, 533, -583,
+ 15, -583, -583, 47, -583, -583, 114, 116, 119, 608,
+ 95, 123, 137, -583, -583, -583, -583, -583, -583, -583,
+ -583, -583, -583, -583, 56, -583, -583, 135, -583, -583,
+ -583, -583, -583, -583, -583, -583, -583, -583, -583, -583,
+ -583, -583, -583, 87, 3, 170, -583, 345, -583, -583,
+ -583, -583, -583, 84, -583, -583, -583, -583, 752, 183,
+ 104, -583, -583, -583, -583, 98, -583, -583, 108, -583,
+ -583, 658, -583, 107, -583, -583, -583, -583, 345, 345,
+ 345, 345, -583, 112, 53, -583, 589, 718, -583, 124,
+ 125, -583, -583, -6, -583, -583, -583, 141, 148, -583,
+ -583, -583, 164, 165, -583, -583, -583, 99, -583, -583,
+ -583, -583, -583, -583, -583, 533, -583, -583, -583, -583,
+ -583, -583, 171, 172, 171, -583, -583, -583, -583, 171,
+ 171, 171, -583, 246, 186, 187, 202, 203, 283, -583,
+ -583, -583, 295, -583, -583, 135, -583, -16, -583, 3,
+ 298, 345, -583, 752, -583, 288, -583, -583, 608, -583,
+ -583, -583, -583, -583, 289, 290, 291, 106, -583, -583,
+ 333, -583, -583, -583, -6, -583, -583, -583, -583, -583,
+ 131, -583, -583, 222, 223, -583, -583, -583, -583, 261,
+ 226, -583, -583, 226, 235, 240, 131, -583, 311, -583,
+ -583, -583, -583, 312, -583, 226, 95, 230, 230, 315,
+ 316, 317, 234, 437, 511, 646, 769, 792, 395, 345,
+ -583, -88, 395, 319, -583, -583, -583, -583, -583, -583,
+ -583, -583, -583, -583, -583, 320, 533, -583, -583, 322,
+ -583, 323, 809, -583, -583, -583, -583, -583, -583, -583,
+ 324, -583, -583, -583, 230, 232, 239, -583, -583, -583,
+ -583, -583, -583, -583, 327, -583, -583, 706, -38, 98,
+ -583, -583, -583, -583, -583, 345, 253, -583, -583, -583,
+ -583, -583, 345, -583, 826, 329, 331, 347, 352, 344,
+ 341, 342, -583, 343, 360, 257, 285, 276, -583, -583,
+ -583, -583, -583, -583, -583, 284, -583, -583, -13, -13,
-13, -13, -13, -13, -13, 214, -12, 154, 154, 154,
- 362, -13, 154, -13, -582, -582, 277, 437, -582, -582,
- -582, -582, 893, 909, -582, -582, -582, -582, -582, -582,
- -582, -582, -582, 145, 754, 286, 77, -582, -582, -14,
- -582, 313, 355, 292, 293, -582, -582, -582, -582, -582,
- -582, -582, 754, 388, 347, -582, 754, 393, 352, -582,
- 754, 48, 344, -582, -582, -582, -582, -582, 754, -582,
- 395, 118, 754, -582, -582, 345, 345, 345, 345, 345,
- 345, 345, 374, 375, 376, 377, 378, 380, 381, 384,
- 610, -13, 345, 345, 345, -582, -582, -582, -582, -582,
- -582, 845, 861, 877, 345, 345, 754, 345, -582, -582,
- -582, 230, -582, -582, -582, -582, -582, -582, -582, -582,
- 415, 578, 602, 602, -88, -582, -582, -582, 533, -582,
- -582, -582, 602, 396, -20, 754, -582, 754, -582, -582,
- 171, -582, -582, -582, 330, -582, -582, -582, -582, -582,
- 345, -582, -582, 754, -582, 828, -56, 413, 434, -582,
- 435, 436, -582, 449, 576, 576, 576, 450, -582, -582,
- -582, -582, -582, -582, -582, -582, -582, -582, -582, -582,
- 345, 345, 345, 345, 345, 345, 345, 345, 345, -582,
- 345, -582, -582, -582, -582, -582, -582, -582, -582, -582,
- -582, -582, -582, -582, -582, -582, -582, -582, -582, -582,
- -582, -582, -582, -582, -582, -582, -582, -582, -582, -582,
- -582, -582, -582, -582, -582, -582, -582, -582, -582, -582,
- -582, -582, -582, -582, -582, 957, 925, 941, -582, 351,
- 369, 754, -582, -582, -582, -582, 105, -582, -582, -582,
- 171, -582, -582, -582, -582, -582, -582, -582, 456, 371,
- -582, 18, -582, -582, -582, -582, -582, -582, -582, -582,
- -582, -582, -582, -582, -582, -582, -582, -582, -582, -582,
- 533, 533, -582, -582, 379, -582, -582, -582, 479, 576,
- -582, 395, -582, 468, 18, -582, 104, 104, -582, 277,
- -582, 461, 462, -582, -582, -582, -582
+ 362, -13, 154, -13, -583, -583, 277, 437, -583, -583,
+ -583, -583, 891, 907, -583, -583, -583, -583, -583, -583,
+ -583, -583, -583, 145, 752, 286, 77, -583, -583, -14,
+ -583, 313, 355, 292, 293, -583, -583, -583, -583, -583,
+ -583, -583, 752, 388, 347, -583, 752, 393, 352, -583,
+ 752, 48, 344, -583, -583, -583, -583, -583, 752, -583,
+ 395, 118, 752, -583, -583, 345, 345, 345, 345, 345,
+ 345, 345, 374, 375, 376, 377, 378, 379, 381, 384,
+ 659, -13, 345, 345, 345, -583, -583, -583, -583, -583,
+ -583, 843, 859, 875, 345, 345, 752, 345, -583, -583,
+ -583, 230, -583, -583, -583, -583, -583, -583, -583, -583,
+ 415, 576, 602, 602, -88, -583, -583, -583, 533, -583,
+ -583, -583, 602, 396, -20, 752, -583, 752, -583, -583,
+ 171, -583, -583, -583, 330, -583, -583, -583, -583, -583,
+ 345, -583, -583, 752, -583, 826, -56, 413, 434, -583,
+ 435, 436, -583, 449, 718, 437, 718, 450, -583, -583,
+ -583, -583, -583, -583, -583, -583, -583, -583, -583, -583,
+ 345, 345, 345, 345, 345, 345, 345, 345, 345, -583,
+ 345, -583, -583, -583, -583, -583, -583, -583, -583, -583,
+ -583, -583, -583, -583, -583, -583, -583, -583, -583, -583,
+ -583, -583, -583, -583, -583, -583, -583, -583, -583, -583,
+ -583, -583, -583, -583, -583, -583, -583, -583, -583, -583,
+ -583, -583, -583, -583, -583, 955, 923, 939, -583, 351,
+ 369, 752, -583, -583, -583, -583, 105, -583, -583, -583,
+ 171, -583, -583, -583, -583, -583, -583, -583, 456, 371,
+ -583, -583, 18, -583, -583, -583, -583, -583, -583, -583,
+ -583, -583, -583, -583, -583, -583, -583, -583, -583, -583,
+ -583, 533, 533, -583, -583, 382, -583, -583, -583, 479,
+ 718, -583, 395, -583, 468, 18, -583, 104, 104, -583,
+ 277, -583, 461, 462, -583, -583, -583, -583
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -582, -582, -582, 25, -582, 387, 7, -582, -582, -582,
- -582, -582, 321, -582, -582, 272, -582, -582, -582, -582,
- -4, -582, -582, -582, 8, -582, -582, 337, -582, -582,
- -582, 332, 463, -582, -582, -582, -582, -582, -582, -582,
- -582, -582, -582, -582, -582, 273, -582, -196, -105, -582,
- -582, 339, -582, -582, -582, -190, -582, -582, -582, -582,
- -582, -582, -206, -582, 255, -383, -582, 382, 51, -582,
- -93, -582, -582, -582, -582, -582, -582, -582, -582, -582,
- -582, -582, -268, -582, -581, -582, 36, -582, -183, -582,
- -582, -582, -582, -582, 131, -582, -582, -582, -582, -100,
- -582, -582, -233, -582, -582, -582, -111, -113, 294, -582,
- -582, -402, -582, 132, -582, -582, -582, -582, -229, -582,
- -582, 45, -582, -192, 49, -582, -582, -582, -582, 150,
- -582, -582, 147, -582, -582, -148, -22, -582, -582, -176,
- -582, 325, -81, -27, -106, -189, -207, -582, -25, -17,
- -205, -582, -384, -582, -582, -582, -582, 517, -582, 516,
- -582, -582, 71
+ -583, -583, -583, 25, -583, 385, 7, -583, -583, -583,
+ -583, -583, 334, -583, -583, 272, -583, -583, -583, -583,
+ -4, -583, -583, -583, 8, -583, -583, 326, -583, -583,
+ -583, 328, 466, -583, -583, -583, -583, -583, -583, -583,
+ -583, -583, -583, -583, -583, 270, -583, -196, -105, -583,
+ -583, 340, -583, -583, -583, -190, -583, -583, -583, -583,
+ -583, -583, -206, -583, 258, -340, -583, 380, 58, -583,
+ -93, -583, -583, -583, -583, -583, -583, -583, -583, -583,
+ -583, -583, -268, -583, -582, -583, 41, -583, -183, -583,
+ -583, -583, -583, -583, 130, -583, -583, -583, -583, -101,
+ -583, -583, -233, -583, -583, 31, -100, -113, 299, -583,
+ -583, -402, -583, 132, -583, -583, -583, -583, -229, -583,
+ -583, 63, -583, -192, 49, -583, -583, -583, -583, 151,
+ -583, -583, 149, -583, -583, -148, -22, -583, -583, -176,
+ -583, 332, -81, -27, -106, -189, -207, -583, -25, -17,
+ -205, -583, -384, -583, -583, -583, -583, 529, -583, 531,
+ -583, -583, 71
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -1481,10 +1481,10 @@
{
71, 96, 146, 97, 172, 46, 189, 138, 510, 316,
321, 98, 297, 266, 299, -154, 44, 50, 176, 203,
- 632, 489, 107, 258, 11, 12, 13, 9, 14, 259,
+ 633, 489, 107, 258, 11, 12, 13, 9, 14, 259,
235, -269, 413, 433, 306, 88, 275, 297, 266, 299,
- -269, 323, 590, 295, 591, 329, 312, 4, 258, 631,
- 10, 15, 16, 632, 259, 355, 36, 37, 38, 39,
+ -269, 323, 590, 295, 591, 329, 312, 4, 258, 632,
+ 10, 15, 16, 633, 259, 355, 36, 37, 38, 39,
135, 275, 504, 12, 13, 352, 14, 115, 295, 54,
40, 416, 417, 418, 419, 420, 421, 505, 576, 577,
506, -268, 58, 445, 16, 447, 61, 41, 581, 55,
@@ -1494,20 +1494,20 @@
97, 44, 50, 18, 453, 77, 19, 78, 98, 126,
285, 285, 20, 108, 109, 79, 110, 190, 191, 192,
471, 111, 62, 63, 64, 65, 66, 67, 68, 69,
- 70, 623, 80, 81, 82, 456, 459, 17, 325, 87,
+ 70, 624, 80, 81, 82, 456, 459, 17, 325, 87,
102, 18, 103, 530, 135, 104, 472, 468, 474, 113,
218, 107, 114, 335, 479, 480, 481, 117, 482, 483,
484, 118, 460, 63, 64, 65, 66, 67, 68, 69,
70, 461, 462, 463, 464, 84, 85, 86, 1, 2,
497, 122, 298, 329, 500, 131, 375, -269, 503, 435,
436, 437, 438, 439, 440, 253, 480, 481, 144, 482,
- 483, 88, 551, 182, 183, 145, 173, 298, 88, 641,
- 223, 224, 324, -268, 538, 542, 546, 636, 637, 96,
- 253, 97, 442, 443, 285, 351, 446, 353, 163, 98,
- 168, 422, 423, 424, 425, 426, 427, 428, 429, 430,
- 285, 175, 233, 431, 300, 301, 302, 303, 234, 178,
+ 483, 88, 551, 182, 183, 145, 173, 298, 88, 163,
+ 642, -268, 324, 168, 538, 542, 546, 223, 224, 96,
+ 253, 97, 442, 443, 285, 351, 446, 353, 174, 98,
+ 175, 422, 423, 424, 425, 426, 427, 428, 429, 430,
+ 285, 178, 233, 431, 300, 301, 302, 303, 234, 179,
11, 12, 13, 235, 465, 466, 467, 236, 40, 237,
- 238, 174, 179, 239, 180, 240, 181, 241, 377, 242,
+ 238, 637, 638, 239, 180, 240, 181, 241, 377, 242,
185, 188, 193, 476, 243, 381, 58, 244, 245, 63,
64, 65, 66, 246, 247, 248, 249, 250, 194, 195,
251, 84, 85, 86, 62, 63, 64, 65, 66, 67,
@@ -1515,81 +1515,81 @@
201, 512, 585, 210, 213, 432, 215, 217, 216, 452,
173, 220, 231, 232, 307, 308, 310, 311, 473, 314,
317, 318, 319, 252, 330, 331, 298, 336, 337, 354,
- 356, 357, 358, 378, 390, 549, 391, 392, 613, 616,
- 619, 578, 19, 396, 400, 580, 404, 405, 406, 408,
+ 356, 357, 358, 378, 390, 549, 391, 392, 614, 617,
+ 620, 578, 19, 396, 400, 580, 404, 405, 406, 408,
252, 582, 62, 63, 64, 65, 66, 67, 68, 69,
- 70, 598, 599, 600, 583, 407, 584, 410, 513, 514,
+ 70, 598, 600, 601, 583, 407, 584, 410, 513, 514,
515, 516, 517, 518, 519, 409, 412, 444, 477, 493,
491, 498, 494, 529, 495, 531, 532, 533, 501, 520,
- 521, 522, 523, 524, 329, 525, 526, 547, 548, 527,
+ 521, 522, 523, 524, 525, 329, 526, 547, 548, 527,
550, -158, 62, 63, 64, 65, 66, 67, 68, 69,
- 70, 96, 627, 97, 136, 84, 85, 86, 593, 586,
+ 70, 96, 628, 97, 136, 84, 85, 86, 593, 586,
-153, 98, -131, -131, -131, -131, -131, -131, -131, -131,
-131, -131, -131, -131, -131, -131, -131, -131, -131, 594,
- 595, 596, 620, 381, 62, 63, 64, 65, 66, 67,
- 68, 69, 70, 250, 597, 601, 171, 173, 173, 173,
- 621, 628, 629, 625, 639, 642, 645, 646, 309, 638,
- 622, 169, 211, 602, 603, 604, 605, 606, 607, 608,
- 609, 610, 202, 611, 233, 116, 640, 322, 209, 579,
- 214, 333, 11, 12, 13, 235, 587, 184, 644, 236,
- 40, 237, 238, 508, 643, 239, 320, 240, -131, 241,
- 589, 242, 588, 511, 499, 502, 243, 99, 58, 100,
- 245, 63, 64, 65, 66, 246, 247, 248, 249, 250,
- 0, 313, 251, 84, 85, 86, 0, 0, 0, 626,
+ 595, 596, 621, 381, 62, 63, 64, 65, 66, 67,
+ 68, 69, 70, 250, 597, 602, 171, 173, 173, 173,
+ 622, 629, 630, 626, 640, 643, 646, 647, 309, 169,
+ 623, 202, 639, 603, 604, 605, 606, 607, 608, 609,
+ 610, 611, 233, 612, 322, 211, 214, 641, 116, 209,
+ 11, 12, 13, 235, 333, 184, 579, 236, 40, 237,
+ 238, 587, 508, 239, 644, 240, 599, 241, -131, 242,
+ 645, 320, 588, 511, 243, 499, 58, 502, 245, 63,
+ 64, 65, 66, 246, 247, 248, 249, 250, 589, 99,
+ 251, 84, 85, 86, 100, 0, 0, 0, 313, 627,
62, 63, 64, 65, 66, 67, 68, 69, 70, 80,
81, 82, 83, 84, 85, 86, 87, 0, 0, 0,
- 0, 0, 0, 96, 96, 97, 97, 0, 0, 0,
- 0, 0, 0, 98, 98, 0, 0, 0, 0, 0,
- 0, 0, 173, 62, 63, 64, 65, 66, 67, 68,
- 69, 70, 452, 170, 19, 171, 0, 0, 0, 0,
- 0, 0, 252, 552, 553, 554, 555, 556, 557, 558,
- 559, 560, 561, 562, 563, 564, 565, 62, 63, 64,
- 65, 66, 67, 68, 69, 528, 88, 552, 553, 554,
+ 0, 0, 0, 0, 96, 96, 97, 97, 0, 0,
+ 0, 0, 0, 0, 98, 98, 0, 0, 0, 0,
+ 0, 0, 0, 173, 0, 0, 0, 0, 0, 0,
+ 0, 0, 19, 452, 170, 0, 0, 0, 0, 0,
+ 252, 552, 553, 554, 555, 556, 557, 558, 559, 560,
+ 561, 562, 563, 564, 565, 62, 63, 64, 65, 66,
+ 67, 68, 69, 70, 105, 0, 88, 552, 553, 554,
555, 556, 557, 558, 559, 560, 561, 562, 563, 564,
- 565, 148, 149, 150, 151, 152, 153, 154, 155, 156,
- 157, 158, 159, 160, 161, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 147, 0, 0, -263, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 566, 0, 567,
- 568, 569, 570, 571, 572, 573, 574, -351, -351, -351,
- -351, -351, -351, -351, -351, -351, -351, -351, -351, -351,
- -351, 566, 0, 567, 568, 569, 570, 571, 572, 573,
+ 565, 0, 148, 149, 150, 151, 152, 153, 154, 155,
+ 156, 157, 158, 159, 160, 161, 0, 0, 0, 0,
+ 0, 0, 0, 0, 147, -263, 62, 63, 64, 65,
+ 66, 67, 68, 69, 528, 566, 0, 567, 568, 569,
+ 570, 571, 572, 573, 574, -351, -351, -351, -351, -351,
+ -351, -351, -351, -351, -351, -351, -351, -351, -351, 0,
+ 0, 566, 0, 567, 568, 569, 570, 571, 572, 573,
574, 148, 149, 150, 151, 152, 153, 154, 155, 156,
157, 158, 159, 160, 161, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 105, 0, 0, -351, 0, 0,
- -351, 0, 0, 0, 0, 0, -351, 359, 360, 361,
- 362, 363, 364, 365, 366, 367, 368, 369, 370, 371,
- 372, 62, 63, 64, 65, 66, 67, 68, 69, 70,
- 80, 81, 82, 136, 84, 85, 86, 87, -222, -222,
+ 67, 68, 69, 70, 0, -351, 0, 171, -351, 0,
+ 0, 0, 0, 0, -351, 359, 360, 361, 362, 363,
+ 364, 365, 366, 367, 368, 369, 370, 371, 372, 62,
+ 63, 64, 65, 66, 67, 68, 69, 70, 80, 81,
+ 82, 136, 84, 85, 86, 87, -222, -222, -222, -222,
-222, -222, -222, -222, -222, -222, -222, -222, -222, -222,
- -222, -222, -222, -222, -222, 0, 0, 0, 0, 0,
- 373, -223, -223, -223, -223, -223, -223, -223, -223, -223,
- -223, -223, -223, -223, -223, -223, -223, -223, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 136, 84, 85, 86, 87, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 382, 81, 82, 136, 84, 85,
- 86, 87, 62, 63, 64, 65, 66, 67, 68, 69,
- 70, 534, 535, 536, 136, 84, 85, 86, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 539, 540, 541,
+ -222, -222, -222, 0, 0, 0, 0, 0, 373, -223,
+ -223, -223, -223, -223, -223, -223, -223, -223, -223, -223,
+ -223, -223, -223, -223, -223, -223, 338, 339, 340, 341,
+ 342, 343, 344, 345, 346, 347, 348, 349, 136, 84,
+ 85, 86, 87, 62, 63, 64, 65, 66, 67, 68,
+ 69, 70, 382, 81, 82, 136, 84, 85, 86, 87,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, 534,
+ 535, 536, 136, 84, 85, 86, 62, 63, 64, 65,
+ 66, 67, 68, 69, 70, 539, 540, 541, 136, 84,
+ 85, 86, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, 543, 544, 545, 136, 84, 85, 86, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 0, 454, 455,
136, 84, 85, 86, 62, 63, 64, 65, 66, 67,
- 68, 69, 70, 543, 544, 545, 136, 84, 85, 86,
+ 68, 69, 70, 0, 457, 458, 136, 84, 85, 86,
62, 63, 64, 65, 66, 67, 68, 69, 70, 0,
- 454, 455, 136, 84, 85, 86, 62, 63, 64, 65,
- 66, 67, 68, 69, 70, 0, 457, 458, 136, 84,
+ 615, 616, 136, 84, 85, 86, 62, 63, 64, 65,
+ 66, 67, 68, 69, 70, 0, 618, 619, 136, 84,
85, 86, 62, 63, 64, 65, 66, 67, 68, 69,
- 70, 0, 614, 615, 136, 84, 85, 86, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 0, 617, 618,
- 136, 84, 85, 86, 62, 63, 64, 65, 66, 67,
- 68, 69, 70, 612, 0, 0, 136, 84, 85, 86
+ 70, 613, 0, 0, 136, 84, 85, 86
};
static const yytype_int16 yycheck[] =
{
17, 28, 95, 28, 117, 9, 154, 88, 410, 238,
243, 28, 219, 219, 219, 35, 9, 9, 123, 35,
- 601, 35, 39, 219, 9, 10, 11, 2, 13, 219,
+ 602, 35, 39, 219, 9, 10, 11, 2, 13, 219,
12, 119, 45, 45, 223, 123, 219, 244, 244, 244,
128, 248, 98, 219, 100, 252, 235, 35, 244, 31,
- 0, 36, 37, 634, 244, 284, 3, 4, 5, 6,
+ 0, 36, 37, 635, 244, 284, 3, 4, 5, 6,
77, 244, 14, 10, 11, 272, 13, 42, 244, 46,
17, 339, 340, 341, 342, 343, 344, 29, 462, 463,
32, 119, 35, 351, 37, 353, 15, 34, 472, 47,
@@ -1606,13 +1606,13 @@
45, 46, 47, 48, 49, 50, 51, 52, 115, 116,
392, 114, 219, 410, 396, 35, 299, 123, 400, 55,
56, 57, 58, 59, 60, 219, 98, 99, 35, 101,
- 102, 123, 451, 124, 125, 121, 243, 244, 123, 631,
- 106, 107, 249, 123, 441, 442, 443, 620, 621, 266,
- 244, 266, 348, 349, 357, 272, 352, 272, 122, 266,
- 121, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- 373, 125, 1, 49, 38, 39, 40, 41, 7, 120,
+ 102, 123, 451, 124, 125, 121, 243, 244, 123, 122,
+ 632, 123, 249, 121, 441, 442, 443, 106, 107, 266,
+ 244, 266, 348, 349, 357, 272, 352, 272, 124, 266,
+ 125, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ 373, 120, 1, 49, 38, 39, 40, 41, 7, 121,
9, 10, 11, 12, 129, 130, 131, 16, 17, 18,
- 19, 124, 121, 22, 120, 24, 121, 26, 305, 28,
+ 19, 621, 622, 22, 120, 24, 121, 26, 305, 28,
119, 119, 46, 374, 33, 312, 35, 36, 37, 38,
39, 40, 41, 42, 43, 44, 45, 46, 122, 122,
49, 50, 51, 52, 37, 38, 39, 40, 41, 42,
@@ -1626,65 +1626,65 @@
45, 504, 505, 506, 475, 35, 477, 121, 415, 416,
417, 418, 419, 420, 421, 120, 122, 45, 122, 54,
97, 23, 120, 430, 121, 432, 433, 434, 25, 45,
- 45, 45, 45, 45, 631, 45, 45, 444, 445, 45,
+ 45, 45, 45, 45, 45, 632, 45, 444, 445, 45,
447, 35, 37, 38, 39, 40, 41, 42, 43, 44,
45, 468, 590, 468, 49, 50, 51, 52, 35, 119,
35, 468, 37, 38, 39, 40, 41, 42, 43, 44,
45, 46, 47, 48, 49, 50, 51, 52, 53, 35,
35, 35, 121, 490, 37, 38, 39, 40, 41, 42,
43, 44, 45, 46, 35, 35, 49, 504, 505, 506,
- 121, 35, 121, 586, 15, 27, 35, 35, 226, 120,
- 581, 114, 181, 520, 521, 522, 523, 524, 525, 526,
- 527, 528, 175, 530, 1, 52, 629, 244, 179, 468,
- 188, 266, 9, 10, 11, 12, 490, 145, 639, 16,
- 17, 18, 19, 402, 634, 22, 242, 24, 123, 26,
- 495, 28, 493, 411, 394, 398, 33, 30, 35, 33,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- -1, 236, 49, 50, 51, 52, -1, -1, -1, 586,
+ 121, 35, 121, 586, 15, 27, 35, 35, 226, 114,
+ 581, 175, 120, 520, 521, 522, 523, 524, 525, 526,
+ 527, 528, 1, 530, 244, 181, 188, 630, 52, 179,
+ 9, 10, 11, 12, 266, 145, 468, 16, 17, 18,
+ 19, 490, 402, 22, 635, 24, 505, 26, 123, 28,
+ 640, 242, 493, 411, 33, 394, 35, 398, 37, 38,
+ 39, 40, 41, 42, 43, 44, 45, 46, 495, 30,
+ 49, 50, 51, 52, 33, -1, -1, -1, 236, 586,
37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
47, 48, 49, 50, 51, 52, 53, -1, -1, -1,
- -1, -1, -1, 620, 621, 620, 621, -1, -1, -1,
- -1, -1, -1, 620, 621, -1, -1, -1, -1, -1,
- -1, -1, 629, 37, 38, 39, 40, 41, 42, 43,
- 44, 45, 639, 35, 111, 49, -1, -1, -1, -1,
- -1, -1, 119, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 65, 66, 67, 68, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 123, 55, 56, 57,
+ -1, -1, -1, -1, 621, 622, 621, 622, -1, -1,
+ -1, -1, -1, -1, 621, 622, -1, -1, -1, -1,
+ -1, -1, -1, 630, -1, -1, -1, -1, -1, -1,
+ -1, -1, 111, 640, 35, -1, -1, -1, -1, -1,
+ 119, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, -1, 123, 55, 56, 57,
58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
- 68, 83, 84, 85, 86, 87, 88, 89, 90, 91,
- 92, 93, 94, 95, 96, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 36, -1, -1, 119, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 129, -1, 131,
- 132, 133, 134, 135, 136, 137, 138, 69, 70, 71,
- 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
- 82, 129, -1, 131, 132, 133, 134, 135, 136, 137,
+ 68, -1, 83, 84, 85, 86, 87, 88, 89, 90,
+ 91, 92, 93, 94, 95, 96, -1, -1, -1, -1,
+ -1, -1, -1, -1, 36, 119, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 129, -1, 131, 132, 133,
+ 134, 135, 136, 137, 138, 69, 70, 71, 72, 73,
+ 74, 75, 76, 77, 78, 79, 80, 81, 82, -1,
+ -1, 129, -1, 131, 132, 133, 134, 135, 136, 137,
138, 83, 84, 85, 86, 87, 88, 89, 90, 91,
92, 93, 94, 95, 96, 37, 38, 39, 40, 41,
- 42, 43, 44, 45, 46, -1, -1, 119, -1, -1,
- 122, -1, -1, -1, -1, -1, 128, 69, 70, 71,
- 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
- 82, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
- 49, 50, 51, 52, 53, -1, -1, -1, -1, -1,
- 122, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
- 49, 50, 51, 52, 53, 37, 38, 39, 40, 41,
- 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
- 52, 53, 37, 38, 39, 40, 41, 42, 43, 44,
+ 42, 43, 44, 45, -1, 119, -1, 49, 122, -1,
+ -1, -1, -1, -1, 128, 69, 70, 71, 72, 73,
+ 74, 75, 76, 77, 78, 79, 80, 81, 82, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+ 51, 52, 53, -1, -1, -1, -1, -1, 122, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+ 51, 52, 53, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
+ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
+ 47, 48, 49, 50, 51, 52, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+ 51, 52, 37, 38, 39, 40, 41, 42, 43, 44,
45, 46, 47, 48, 49, 50, 51, 52, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
+ 39, 40, 41, 42, 43, 44, 45, -1, 47, 48,
49, 50, 51, 52, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+ 43, 44, 45, -1, 47, 48, 49, 50, 51, 52,
37, 38, 39, 40, 41, 42, 43, 44, 45, -1,
47, 48, 49, 50, 51, 52, 37, 38, 39, 40,
41, 42, 43, 44, 45, -1, 47, 48, 49, 50,
51, 52, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, -1, 47, 48, 49, 50, 51, 52, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, -1, 47, 48,
- 49, 50, 51, 52, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, -1, -1, 49, 50, 51, 52
+ 45, 46, -1, -1, 49, 50, 51, 52
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1750,12 +1750,12 @@
63, 64, 65, 66, 67, 68, 129, 131, 132, 133,
134, 135, 136, 137, 138, 291, 291, 291, 209, 207,
209, 291, 209, 281, 281, 274, 119, 225, 263, 260,
- 98, 100, 273, 35, 35, 35, 35, 35, 246, 246,
- 246, 35, 288, 288, 288, 288, 288, 288, 288, 288,
- 288, 288, 46, 285, 47, 48, 285, 47, 48, 285,
- 121, 121, 281, 46, 173, 209, 288, 274, 35, 121,
- 235, 31, 223, 236, 237, 238, 204, 204, 120, 15,
- 246, 250, 27, 238, 245, 35, 35
+ 98, 100, 273, 35, 35, 35, 35, 35, 246, 244,
+ 246, 246, 35, 288, 288, 288, 288, 288, 288, 288,
+ 288, 288, 288, 46, 285, 47, 48, 285, 47, 48,
+ 285, 121, 121, 281, 46, 173, 209, 288, 274, 35,
+ 121, 235, 31, 223, 236, 237, 238, 204, 204, 120,
+ 15, 246, 250, 27, 238, 245, 35, 35
};
#define yyerrok (yyerrstatus = 0)
