[svn:parrot] r41771 - trunk/compilers/pirc/src
kjs at svn.parrot.org
kjs at svn.parrot.org
Fri Oct 9 09:54:55 UTC 2009
Author: kjs
Date: Fri Oct 9 09:54:53 2009
New Revision: 41771
URL: https://trac.parrot.org/parrot/changeset/41771
Log:
[pirc] replace '\n' token by usage of 'newline' nonterminal; that non-terminal takes care of counting lines, so that the line nr is correctly updated
Modified:
trunk/compilers/pirc/src/pir.y
trunk/compilers/pirc/src/pirparser.c
trunk/compilers/pirc/src/pirparser.h
Modified: trunk/compilers/pirc/src/pir.y
==============================================================================
--- trunk/compilers/pirc/src/pir.y Fri Oct 9 03:07:02 2009 (r41770)
+++ trunk/compilers/pirc/src/pir.y Fri Oct 9 09:54:53 2009 (r41771)
@@ -638,7 +638,7 @@
| macro_statements macro_statement
;
-macro_statement : macro_instr "\n"
+macro_statement : macro_instr newline
;
macro_instr : macro_label_decl
@@ -1695,7 +1695,7 @@
{ $$ = invoke(lexer, CALL_PCC, $2, $3); }
| ".nci_call" pmc_object
{ $$ = invoke(lexer, CALL_NCI, $2); }
- | ".invocant" pmc_object "\n"
+ | ".invocant" pmc_object newline
".meth_call" method
{ $$ = invoke(lexer, CALL_METHOD, $2, $5); }
;
@@ -2207,10 +2207,10 @@
;
pasm_line : pasm_statement
- | namespace_decl "\n"
+ | namespace_decl newline
| lex_decl /* lex_decl rule has already a "\n" token */
- | location_directive "\n"
- | macro_definition "\n"
+ | location_directive newline
+ | macro_definition newline
| macro_expansion
;
@@ -2233,7 +2233,7 @@
hence NULL */
;
-pasm_instruction : parrot_op op_args "\n"
+pasm_instruction : parrot_op op_args newline
{
if (is_parrot_op(lexer, $1)) {
Modified: trunk/compilers/pirc/src/pirparser.c
==============================================================================
--- trunk/compilers/pirc/src/pirparser.c Fri Oct 9 03:07:02 2009 (r41770)
+++ trunk/compilers/pirc/src/pirparser.c Fri Oct 9 09:54:53 2009 (r41771)
@@ -586,7 +586,7 @@
struct macro_def *mval;
struct macro_param *pval;
}
-/* Line 187 of yacc.c. */
+/* Line 193 of yacc.c. */
#line 591 "pirparser.c"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -650,7 +650,7 @@
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -815,7 +815,7 @@
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 11
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1154
+#define YYLAST 1178
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 139
@@ -937,7 +937,7 @@
147, -1, 148, -1, 108, 36, 114, -1, 149, 119,
150, 120, 34, 153, 105, -1, 104, 297, -1, -1,
151, -1, 152, -1, 151, 121, 152, -1, 297, -1,
- -1, 154, -1, 155, -1, 154, 155, -1, 156, 34,
+ -1, 154, -1, 155, -1, 154, 155, -1, 156, 143,
-1, 157, -1, 158, -1, 107, 109, -1, 106, 293,
110, -1, 4, 45, -1, 9, 47, -1, 10, 45,
-1, 3, 45, -1, 12, 122, 163, 123, -1, -1,
@@ -1009,7 +1009,7 @@
-1, 234, -1, 243, -1, 25, 143, 235, 238, 143,
240, 26, 143, -1, -1, 236, -1, 237, -1, 236,
237, -1, 29, 266, 143, -1, 28, 248, 239, -1,
- 31, 250, -1, 13, 250, 34, 14, 249, -1, -1,
+ 31, 250, -1, 13, 250, 143, 14, 249, -1, -1,
121, 250, -1, -1, 241, -1, 242, -1, 241, 242,
-1, 30, 254, 143, -1, 227, -1, 244, 143, -1,
251, 127, 245, -1, 294, 127, 245, -1, 245, -1,
@@ -1049,10 +1049,10 @@
73, -1, 74, -1, 75, -1, 76, -1, 79, -1,
77, -1, 78, -1, 80, -1, 81, -1, 69, -1,
70, -1, 68, -1, 303, 304, -1, 142, -1, 305,
- -1, 304, 305, -1, 306, -1, 162, 34, -1, 231,
- -1, 160, 34, -1, 146, 34, -1, 190, -1, 35,
+ -1, 304, 305, -1, 306, -1, 162, 143, -1, 231,
+ -1, 160, 143, -1, 146, 143, -1, 190, -1, 35,
307, -1, 308, 307, -1, 310, -1, 198, -1, 310,
- -1, 309, 170, 35, -1, 117, -1, 205, 207, 34,
+ -1, 309, 170, 35, -1, 117, -1, 205, 207, 143,
-1
};
@@ -1403,99 +1403,99 @@
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -593
+#define YYPACT_NINF -588
static const yytype_int16 yypact[] =
{
- -16, -3, -3, 45, -593, -593, -593, -593, 20, -593,
- 77, -593, 43, 18, 75, -43, 38, -593, 1101, 76,
- 4, -593, 93, -593, -593, 16, 105, 107, -593, 699,
- -593, 20, -593, -593, 38, -593, -593, -3, 87, 110,
- 923, 165, -3, -593, -593, -593, -593, -593, -593, -593,
- -593, -593, -593, 31, -593, -593, 114, -593, -593, -593,
- -593, -593, -593, -593, -593, -593, -593, -593, -593, -593,
- -593, -593, 55, 49, -3, -593, 1101, -593, -593, -593,
- -593, -593, -593, 35, -593, -593, -593, 889, 137, 54,
- -593, -593, -593, -593, 62, -593, -593, -593, 79, -593,
- -593, 815, -593, -593, -593, -593, -593, -593, 1101, 1101,
- 1101, -593, -593, 34, 740, 816, -593, 102, 53, -593,
- -593, 4, -593, -593, -593, 109, 106, -593, -593, -593,
- 113, 116, -593, -593, -593, -9, -593, -593, -593, -593,
- -593, -593, -593, 699, -593, -593, -593, -593, -593, -593,
- 128, 129, 128, -593, 131, -593, -593, 128, 128, 128,
- -593, 125, 126, 127, -593, -593, -593, -3, -593, -593,
- 114, -593, 32, -593, 49, 222, 1101, -593, 889, -593,
- 213, -593, -593, 923, -593, 171, -593, -593, -593, -593,
- 228, 229, 142, -593, 253, -593, -593, -593, 4, -593,
- -593, -593, -593, -593, 112, -593, -593, 164, 172, -593,
- 174, 177, -593, -593, -593, -593, -593, -593, -593, 534,
- 227, -593, -593, 227, 186, 194, 112, -593, 266, -593,
- -593, -593, -593, -593, 171, -593, 227, 165, 233, 182,
- 182, -3, -3, -3, 183, 462, 261, 649, 768, 906,
- 935, 399, 1101, -593, 98, 1054, -3, -593, -593, -593,
- -593, -593, -593, -593, -593, -593, -593, -593, -593, -3,
- 699, -593, -593, -3, -593, -3, 952, -593, -593, -593,
- -593, -593, -593, -593, -3, -593, -593, -593, 182, 179,
- 184, -593, -593, -593, -593, -593, -593, -593, -3, -593,
- -593, 843, -59, 62, -593, -593, -593, -593, -593, 1101,
- 206, -593, -593, -593, -593, -593, 1101, -593, 1101, -593,
- -593, -593, 969, -3, -3, 298, 299, 289, -3, -3,
- 199, -593, -3, -3, 197, 268, 205, 208, -593, -593,
- -593, -593, -593, -593, -593, 203, -593, -593, 8, 8,
- 8, 8, 8, 8, 8, 155, 15, 232, 232, 232,
- 282, 8, 232, 8, -593, -593, 586, 462, -593, -593,
- -593, -593, 986, 1003, -593, -593, -593, -593, -593, -593,
- -593, -593, -593, 682, 889, 207, 212, -593, -593, -10,
- -593, 237, 209, 284, 215, 217, -593, -593, -593, -593,
- -593, -593, -593, 889, 317, 298, -593, 889, 318, 299,
- -593, 889, 120, 289, -593, -593, -593, 234, -593, -593,
- 889, 399, -593, 1054, 67, 889, -593, -593, 1101, 1101,
- 1101, 1101, 1101, 1101, 1101, 297, 302, 303, 304, 305,
- 307, 308, 311, 1110, 8, 1101, 1101, 1101, -593, -593,
- -593, -593, -593, -593, 324, 436, 841, 1101, 1101, 889,
- 1101, -593, -593, -593, 182, -593, -593, -593, -593, -593,
- -593, -593, -593, 557, 650, 735, 735, 98, -593, -593,
- -593, 699, -593, -593, -593, -593, 735, 309, -19, 889,
- -593, 889, -593, 128, -593, -593, -593, 238, 128, -593,
- -593, -593, -593, -593, -593, 1101, -593, -593, -593, 1088,
- 889, -593, 969, -5, -3, -3, -593, -3, -3, -593,
- -3, 816, 462, 816, -3, -593, -3, -593, -593, -593,
- -593, -593, -593, -593, -593, -593, -593, -593, -593, 1101,
- 1101, 1101, 1101, 1101, 1101, 1101, 1101, 1101, -593, 1101,
- -593, -593, -593, -593, -593, -593, -593, -593, -593, -593,
- -593, -593, -593, -593, -593, -593, -593, -593, -593, -593,
- -593, -593, -593, -593, -593, -593, -593, -593, -593, -593,
- -593, -593, -593, -593, -593, -593, -593, -593, -593, -593,
- -593, -593, -593, -593, 1071, 1020, 1037, -593, 235, 257,
- 889, -593, -593, -593, -593, 171, -593, -593, -593, -593,
- -593, -593, -593, 128, -593, -593, -593, -593, -593, -593,
- -593, 325, 259, -593, -593, 40, -593, -593, -593, -593,
- -593, -593, -593, -593, -593, -593, -593, -593, -593, -593,
- -593, -593, -593, -593, -593, 699, 699, -593, 262, -593,
- 367, 816, -593, 1054, -593, 357, 40, -593, 54, 54,
- -593, 586, -593, -3, -3, -593, -593, -593, -593
+ 70, 25, 25, 55, -588, -588, -588, -588, 44, -588,
+ 73, -588, 22, 41, 27, 7, 57, -588, 923, 95,
+ 18, -588, 25, -588, -588, 20, 25, 25, -588, 699,
+ -588, 44, -588, -588, 57, -588, -588, 25, 106, 109,
+ 816, 127, 25, -588, -588, -588, -588, -588, -588, -588,
+ -588, -588, -588, 37, -588, -588, 115, -588, -588, -588,
+ -588, -588, -588, -588, -588, -588, -588, -588, -588, -588,
+ -588, -588, 62, 32, 25, -588, 923, -588, -588, -588,
+ -588, -588, -588, 47, -588, -588, -588, 889, 25, 50,
+ -588, -588, -588, -588, 58, -588, -588, -588, 72, -588,
+ -588, 815, -588, -588, -588, -588, -588, -588, 923, 923,
+ 923, -588, -588, 30, 740, 325, -588, 82, 96, -588,
+ -588, 18, -588, -588, -588, 76, 114, -588, -588, -588,
+ 110, 125, -588, -588, -588, 68, -588, -588, -588, -588,
+ -588, -588, -588, 699, -588, -588, -588, -588, -588, -588,
+ 129, 133, 129, -588, 135, -588, -588, 129, 129, 129,
+ -588, 140, 143, 144, -588, -588, -588, 25, -588, -588,
+ 115, -588, 15, -588, 32, 222, 923, -588, 889, -588,
+ 228, -588, -588, 816, -588, 171, -588, -588, -588, -588,
+ 237, 239, 173, -588, 279, -588, -588, -588, 18, -588,
+ -588, -588, -588, -588, 117, -588, -588, 168, 169, -588,
+ 170, 174, -588, -588, -588, -588, -588, -588, -588, 534,
+ 238, -588, -588, 238, 182, 187, 117, -588, 25, -588,
+ -588, -588, -588, -588, 171, -588, 238, 127, 150, 175,
+ 175, 25, 25, 25, 179, 462, 254, 649, 768, 906,
+ 935, 399, 923, -588, 40, 1071, 25, -588, -588, -588,
+ -588, -588, -588, -588, -588, -588, -588, -588, -588, 25,
+ 699, -588, -588, 25, -588, 25, 952, -588, -588, -588,
+ -588, -588, -588, -588, 25, -588, -588, -588, 175, 172,
+ 188, -588, -588, -588, -588, -588, -588, -588, 25, -588,
+ -588, 843, 4, 58, -588, -588, -588, -588, -588, 923,
+ 191, -588, -588, -588, -588, -588, 923, -588, 923, -588,
+ -588, -588, 969, 25, 25, 283, 296, 288, 25, 25,
+ 197, -588, 25, 25, 193, 268, 205, 203, -588, -588,
+ -588, -588, -588, -588, -588, 199, -588, -588, -21, -21,
+ -21, -21, -21, -21, -21, 270, -7, 204, 204, 204,
+ 285, -21, 204, -21, -588, -588, 1105, 462, -588, -588,
+ -588, -588, 1003, 1020, -588, -588, -588, -588, -588, -588,
+ -588, -588, -588, 682, 889, 206, 101, -588, -588, -6,
+ -588, 240, 207, 277, 215, 216, -588, -588, -588, -588,
+ -588, -588, -588, 889, 316, 283, -588, 889, 315, 296,
+ -588, 889, 105, 288, -588, -588, -588, 234, -588, -588,
+ 889, 399, -588, 1071, 128, 889, -588, -588, 923, 923,
+ 923, 923, 923, 923, 923, 297, 298, 299, 302, 303,
+ 304, 305, 307, 1134, -21, 923, 923, 923, -588, -588,
+ -588, -588, -588, -588, 436, 841, 986, 923, 923, 889,
+ 923, -588, -588, -588, 175, -588, -588, -588, -588, -588,
+ -588, -588, -588, 557, 650, 735, 735, 40, -588, -588,
+ -588, 699, -588, -588, -588, -588, 735, 318, -10, 889,
+ -588, 889, -588, 129, -588, -588, -588, 236, 129, -588,
+ -588, -588, -588, -588, -588, 923, -588, -588, -588, 1121,
+ 889, -588, 969, 2, 25, 25, -588, 25, 25, -588,
+ 25, 325, 462, 325, 25, -588, 25, -588, -588, -588,
+ -588, -588, -588, -588, -588, -588, -588, -588, -588, 923,
+ 923, 923, 923, 923, 923, 923, 923, 923, -588, 923,
+ -588, -588, -588, -588, -588, -588, -588, -588, -588, -588,
+ -588, -588, -588, -588, -588, -588, -588, -588, -588, -588,
+ -588, -588, -588, -588, -588, -588, -588, -588, -588, -588,
+ -588, -588, -588, -588, -588, -588, -588, -588, -588, -588,
+ -588, -588, -588, -588, 1088, 1037, 1054, -588, 235, 250,
+ 889, -588, -588, -588, -588, 171, -588, -588, -588, -588,
+ -588, -588, -588, 129, -588, -588, -588, -588, -588, -588,
+ -588, 25, 251, -588, -588, 21, -588, -588, -588, -588,
+ -588, -588, -588, -588, -588, -588, -588, -588, -588, -588,
+ -588, -588, -588, -588, -588, 699, 699, -588, 253, -588,
+ 343, 325, -588, 1071, -588, 332, 21, -588, 50, 50,
+ -588, 1105, -588, 25, 25, -588, -588, -588, -588
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -593, -593, -593, 19, -1, -593, 271, 9, -593, -593,
- -593, -593, -593, 210, -593, -593, 161, -593, -593, -593,
- -593, 12, -593, 13, -593, -593, 219, -593, -593, -593,
- 211, 341, -593, -593, -593, -593, -228, -593, -593, -593,
- -593, -593, -593, -593, -593, -593, -593, -593, 145, -593,
- -593, -194, -64, -593, -593, 221, -593, -593, -593, -172,
- -593, -171, -593, -593, -593, -593, -207, -593, 123, -422,
- -593, 254, -83, -593, -81, -593, -593, -593, -593, -593,
- -593, -593, -593, -593, -593, -593, -244, -593, -592, -593,
- -106, -593, -170, -593, -593, -593, -593, -593, -8, -593,
- -593, -593, -593, -252, -593, -593, -227, -593, -593, -116,
- -253, -98, 166, -593, -593, -415, -593, -12, -593, -593,
- -593, -593, -220, -593, -593, -99, -593, -257, -96, -593,
- -593, -593, -593, 17, -593, -593, 22, -593, -593, -149,
- -148, -593, -593, -593, -593, -593, -593, -2, -593, -593,
- -80, -27, 44, -176, -152, -193, -593, -25, -13, -205,
- -593, -385, -593, -593, -593, -593, 395, -593, 394, -593,
- -593, 51
+ -588, -588, -588, 42, -1, -588, 246, 9, -588, -588,
+ -588, -588, -588, 200, -588, -588, 151, -588, -588, -588,
+ -588, -2, -588, 12, -588, -588, 208, -588, -588, -588,
+ 198, 330, -588, -588, -588, -588, -230, -588, -588, -588,
+ -588, -588, -588, -588, -588, -588, -588, -588, 136, -588,
+ -588, -157, -74, -588, -588, 210, -588, -588, -588, -155,
+ -588, -153, -588, -588, -588, -588, -204, -588, 112, -408,
+ -588, 243, -94, -588, -81, -588, -588, -588, -588, -588,
+ -588, -588, -588, -588, -588, -588, -244, -588, -587, -588,
+ -116, -588, -144, -588, -588, -588, -588, -588, -20, -588,
+ -588, -588, -588, -264, -588, -588, -227, -588, -588, -128,
+ -266, -98, 153, -588, -588, -409, -588, -26, -588, -588,
+ -588, -588, -228, -588, -588, -113, -588, -261, -109, -588,
+ -588, -588, -588, -3, -588, -588, 1, -588, -588, -149,
+ -148, -588, -588, -588, -588, -588, -588, 13, -588, -588,
+ -80, -27, 29, -184, -178, -190, -588, -23, -13, -199,
+ -588, -405, -588, -588, -588, -588, 372, -588, 374, -588,
+ -588, 34
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -1505,55 +1505,55 @@
#define YYTABLE_NINF -367
static const yytype_int16 yytable[] =
{
- 6, 6, 95, 184, 97, 70, 315, 136, 529, 187,
- 188, 189, 270, 144, 303, -161, 98, 167, 329, 44,
- 324, 10, 46, 48, 4, 262, 301, 107, 12, 13,
- 14, 4, 15, 654, -6, 37, 102, 38, 39, 40,
- 270, 113, 303, 13, 14, 11, 15, 263, 265, 279,
- 41, 236, 426, 262, 301, 16, 17, 171, 332, 446,
- -275, 112, 339, 133, 654, 54, 197, 60, 365, -275,
- 653, 310, 4, 129, 17, 263, 265, 279, 37, 56,
- 38, 39, 40, 362, 316, 60, 13, 14, 53, 15,
- 595, 596, 613, 41, 614, 161, 162, 163, 206, 1,
- 2, 600, 168, 87, 213, 429, 430, 431, 432, 433,
- 434, 505, 72, 165, 177, 178, 95, 458, 97, 460,
- 55, 289, 44, 73, 18, 46, 48, 75, 19, 427,
- 98, 20, 103, 521, 222, 76, 447, 21, 18, 77,
- 466, 78, 19, 198, 199, 200, 514, 289, 522, 289,
- 517, 523, 115, 213, 520, 104, 484, -276, 201, 116,
- 121, 122, 123, 133, 493, 494, 195, 495, 496, 120,
- 107, 142, 214, 334, 124, 143, 481, 170, 488, 469,
- 472, 18, 455, 456, 87, 19, 459, 217, 218, 345,
- 486, 435, 436, 437, 438, 439, 440, 441, 442, 443,
- 549, -275, 108, 109, 444, 110, 302, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 209, -276, 223, 224,
- 87, 214, 385, 658, 659, 169, -276, 174, 528, 173,
- 339, 256, 168, 175, 302, 317, 320, 176, 663, 333,
- 325, 326, 327, 95, 570, 97, 4, 180, 183, 361,
- 185, 363, 190, 191, 192, 340, 204, 98, 207, 256,
- 220, 557, 561, 565, 304, 305, 306, 307, 341, 289,
- 108, 109, 346, 110, 347, 215, 445, 216, 318, 79,
- 80, 81, 82, 364, 231, 289, 448, 449, 450, 451,
- 452, 453, 232, 87, 233, 311, 387, 368, 234, 312,
- 314, 322, 255, 391, 490, 392, 330, 366, 492, 493,
- 494, 367, 495, 496, 497, 498, 388, 403, 411, 407,
- 417, 421, 401, 402, 420, 422, 457, 415, 416, 423,
- 425, 418, 419, 507, 491, 511, 509, 510, 512, 515,
- 527, 539, 518, -165, 604, 531, 540, 541, 542, 543,
- 606, 544, 545, 465, 168, 546, 645, 605, 487, 650,
- 61, 62, 63, 64, 65, 66, 67, 68, 69, 553,
- 302, 554, 555, 134, 84, 85, 86, 648, 646, 568,
- 651, 661, 660, 664, 164, 499, 205, 313, 506, 196,
- 526, 114, 331, 343, 208, 203, 597, 179, 598, 607,
- 599, 638, 641, 644, 665, 525, 622, 601, 666, 602,
- 328, 603, 530, 612, 611, 532, 533, 534, 535, 536,
- 537, 538, 516, 621, 623, 624, 99, 485, 100, 0,
- 548, 519, 550, 551, 552, 61, 62, 63, 64, 65,
+ 6, 6, 95, 184, 315, 70, 97, 136, 46, 187,
+ 188, 189, 324, 144, 529, 270, 98, 167, 329, 44,
+ 303, 75, 48, 426, -161, 77, 78, 107, 4, 301,
+ -6, 37, 236, 38, 39, 40, 102, 446, 654, 13,
+ 14, 113, 15, 270, 10, 310, 41, 171, 303, 197,
+ 60, 653, 12, 13, 14, 11, 15, 301, 316, 4,
+ 365, 332, 262, 133, 263, 339, 265, 53, 60, 654,
+ 595, 596, 55, 129, 37, 279, 38, 39, 40, 16,
+ 17, 600, 13, 14, 112, 15, 362, 142, 54, 41,
+ 262, 4, 263, 17, 265, 161, 162, 163, 206, 613,
+ 427, 614, 168, 279, 213, 429, 430, 431, 432, 433,
+ 434, 46, 87, 165, 447, 505, 95, 458, 521, 460,
+ 97, 289, 44, -275, 222, 48, 198, 199, 200, 56,
+ 98, 72, -275, 522, 18, 4, 523, 73, 19, 76,
+ 466, 201, 514, 121, 122, 123, 517, 289, 18, 289,
+ 520, 103, 19, 213, 104, 20, 484, 124, 115, -276,
+ 116, 21, 87, 133, 108, 109, 195, 110, -276, -276,
+ 107, 143, 214, 334, 455, 456, 120, 18, 459, 481,
+ 87, 19, 469, 472, 488, 1, 2, 108, 109, 345,
+ 110, 177, 178, 486, -275, 318, 173, 492, 493, 494,
+ 549, 495, 496, 497, 498, 169, 302, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 209, 256, 217, 218,
+ 170, 214, 385, 223, 224, 493, 494, 314, 495, 496,
+ 175, 528, 168, 339, 302, 174, 570, 658, 659, 333,
+ 325, 326, 327, 95, 663, 256, 176, 97, 180, 361,
+ 317, 320, 183, 363, 185, 340, 204, 98, 448, 449,
+ 450, 451, 452, 453, 557, 561, 565, 190, 341, 289,
+ 191, 192, 346, 207, 347, 304, 305, 306, 307, 79,
+ 80, 81, 82, 364, 215, 289, 220, 216, 231, 232,
+ 233, 311, 312, 87, 322, 234, 387, 368, 255, 330,
+ 366, 388, 403, 391, 490, 392, 435, 436, 437, 438,
+ 439, 440, 441, 442, 443, 367, 407, 411, 417, 444,
+ 420, 421, 401, 402, 423, 422, 425, 415, 416, 457,
+ 510, 418, 419, 491, 509, 511, 507, 512, 515, 518,
+ 527, 539, 540, 541, 604, 531, 542, 543, 544, 545,
+ 606, 546, -165, 465, 168, 605, 645, 661, 664, 164,
+ 487, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 302, 646, 651, 660, 166, 648, 205, 313, 196, 568,
+ 114, 208, 343, 331, 203, 499, 179, 598, 506, 607,
+ 526, 445, 665, 525, 622, 666, 597, 328, 530, 612,
+ 599, 611, 516, 99, 638, 641, 644, 601, 100, 602,
+ 519, 603, 485, 0, 0, 532, 533, 534, 535, 536,
+ 537, 538, 0, 621, 623, 624, 0, 0, 0, 0,
+ 548, 0, 550, 551, 552, 61, 62, 63, 64, 65,
66, 67, 68, 69, 566, 567, 0, 569, 134, 84,
- 85, 86, 0, 0, 95, 0, 97, 0, 0, 0,
- 339, 0, 0, 0, 649, 0, 0, 0, 98, 0,
+ 85, 86, 0, 0, 95, 0, 0, 0, 97, 0,
+ 0, 0, 0, 339, 649, 0, 0, 0, 98, 0,
0, 0, 61, 62, 63, 64, 65, 66, 67, 68,
- 69, 558, 609, 559, 560, 134, 84, 85, 86, 0,
+ 69, 553, 609, 554, 555, 134, 84, 85, 86, 0,
0, 0, 391, 0, 0, 0, 610, 0, 61, 62,
63, 64, 65, 66, 67, 68, 69, 253, 168, 168,
168, 166, 0, 616, 617, 0, 618, 619, 0, 620,
@@ -1567,8 +1567,8 @@
0, -160, 214, -138, -138, -138, -138, -138, -138, -138,
-138, -138, -138, -138, -138, -138, -138, -138, -138, -138,
0, 0, 0, 0, 0, 0, 0, 0, 95, 95,
- 97, 97, 61, 62, 63, 64, 65, 66, 67, 68,
- 69, 461, 98, 98, 0, 462, 0, 463, 168, 0,
+ 650, 0, 97, 97, 0, 0, 0, 0, 0, 0,
+ 0, 0, 98, 98, 0, 0, 0, 0, 168, 0,
0, 0, 0, 0, 0, 20, 0, 0, 465, 0,
37, 0, 0, 255, 0, 0, 0, 12, 13, 14,
236, 0, 667, 668, 237, 238, 239, 240, 0, 0,
@@ -1591,9 +1591,9 @@
154, 155, 156, 157, 158, 159, -366, -366, -366, -366,
-366, -366, -366, -366, -366, -366, -366, -366, -366, -366,
145, 0, 61, 62, 63, 64, 65, 66, 67, 68,
- 69, 0, 0, 0, 585, 166, 586, 587, 588, 589,
+ 69, 105, 0, 0, 585, 0, 586, 587, 588, 589,
590, 591, 592, 593, 0, 0, 0, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 562, -366, 563, 564,
+ 64, 65, 66, 67, 68, 69, 558, -366, 559, 560,
134, 84, 85, 86, 0, -366, -366, 146, 147, 148,
149, 150, 151, 152, 153, 154, 155, 156, 157, 158,
159, 369, 370, 371, 372, 373, 374, 375, 376, 377,
@@ -1601,77 +1601,79 @@
66, 67, 68, 69, 79, 80, 81, 82, 134, 84,
85, 86, -229, -229, -229, -229, -229, -229, -229, -229,
-229, -229, -229, -229, -229, -229, -229, -229, -229, 61,
- 62, 63, 64, 65, 66, 67, 68, 69, 105, 0,
+ 62, 63, 64, 65, 66, 67, 68, 69, 0, 0,
383, -230, -230, -230, -230, -230, -230, -230, -230, -230,
-230, -230, -230, -230, -230, -230, -230, -230, 348, 349,
350, 351, 352, 353, 354, 355, 356, 357, 80, 358,
359, 134, 84, 85, 86, 61, 62, 63, 64, 65,
66, 67, 68, 69, 393, 80, 81, 82, 134, 84,
85, 86, 61, 62, 63, 64, 65, 66, 67, 68,
- 69, 0, 0, 467, 468, 134, 84, 85, 86, 61,
+ 69, 562, 0, 563, 564, 134, 84, 85, 86, 61,
62, 63, 64, 65, 66, 67, 68, 69, 0, 0,
- 470, 471, 134, 84, 85, 86, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 0, 0, 639, 640, 134,
+ 467, 468, 134, 84, 85, 86, 61, 62, 63, 64,
+ 65, 66, 67, 68, 69, 0, 0, 470, 471, 134,
84, 85, 86, 61, 62, 63, 64, 65, 66, 67,
- 68, 69, 0, 0, 642, 643, 134, 84, 85, 86,
- 61, 62, 63, 64, 65, 66, 67, 68, 69, 335,
- 0, 0, 0, 134, 84, 85, 86, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 637, 0, 0, 0,
+ 68, 69, 0, 0, 639, 640, 134, 84, 85, 86,
+ 61, 62, 63, 64, 65, 66, 67, 68, 69, 0,
+ 0, 642, 643, 134, 84, 85, 86, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 335, 0, 0, 0,
134, 84, 85, 86, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 79, 80, 81, 82, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 61, 62, 63, 64,
- 65, 66, 67, 68, 547
+ 67, 68, 69, 637, 0, 0, 0, 134, 84, 85,
+ 86, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 461, 0, 0, 0, 462, 0, 463, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 79, 80, 81, 82,
+ 61, 62, 63, 64, 65, 66, 67, 68, 547
};
static const yytype_int16 yycheck[] =
{
- 1, 2, 29, 152, 29, 18, 234, 87, 423, 157,
- 158, 159, 219, 94, 219, 34, 29, 115, 245, 10,
- 240, 2, 10, 10, 34, 219, 219, 40, 8, 9,
- 10, 34, 12, 625, 0, 1, 37, 3, 4, 5,
- 247, 42, 247, 9, 10, 0, 12, 219, 219, 219,
- 16, 11, 44, 247, 247, 35, 36, 121, 251, 44,
- 119, 42, 255, 76, 656, 47, 34, 16, 288, 128,
- 30, 223, 34, 74, 36, 247, 247, 247, 1, 122,
- 3, 4, 5, 276, 236, 34, 9, 10, 45, 12,
- 475, 476, 97, 16, 99, 108, 109, 110, 178, 115,
- 116, 486, 115, 122, 185, 349, 350, 351, 352, 353,
- 354, 121, 36, 114, 123, 124, 143, 361, 143, 363,
- 45, 219, 113, 119, 104, 113, 113, 34, 108, 121,
- 143, 111, 45, 13, 198, 119, 121, 117, 104, 34,
- 367, 34, 108, 111, 112, 113, 403, 245, 28, 247,
- 407, 31, 121, 234, 411, 45, 383, 122, 126, 45,
- 111, 112, 113, 176, 97, 98, 167, 100, 101, 114,
- 183, 34, 185, 254, 125, 121, 383, 124, 383, 372,
- 373, 104, 358, 359, 122, 108, 362, 45, 46, 270,
+ 1, 2, 29, 152, 234, 18, 29, 87, 10, 157,
+ 158, 159, 240, 94, 423, 219, 29, 115, 245, 10,
+ 219, 22, 10, 44, 34, 26, 27, 40, 34, 219,
+ 0, 1, 11, 3, 4, 5, 37, 44, 625, 9,
+ 10, 42, 12, 247, 2, 223, 16, 121, 247, 34,
+ 16, 30, 8, 9, 10, 0, 12, 247, 236, 34,
+ 288, 251, 219, 76, 219, 255, 219, 45, 34, 656,
+ 475, 476, 45, 74, 1, 219, 3, 4, 5, 35,
+ 36, 486, 9, 10, 42, 12, 276, 88, 47, 16,
+ 247, 34, 247, 36, 247, 108, 109, 110, 178, 97,
+ 121, 99, 115, 247, 185, 349, 350, 351, 352, 353,
+ 354, 113, 122, 114, 121, 121, 143, 361, 13, 363,
+ 143, 219, 113, 119, 198, 113, 111, 112, 113, 122,
+ 143, 36, 128, 28, 104, 34, 31, 119, 108, 119,
+ 367, 126, 403, 111, 112, 113, 407, 245, 104, 247,
+ 411, 45, 108, 234, 45, 111, 383, 125, 121, 119,
+ 45, 117, 122, 176, 37, 38, 167, 40, 128, 122,
+ 183, 121, 185, 254, 358, 359, 114, 104, 362, 383,
+ 122, 108, 372, 373, 383, 115, 116, 37, 38, 270,
+ 40, 123, 124, 383, 122, 45, 120, 96, 97, 98,
+ 444, 100, 101, 102, 103, 123, 219, 36, 37, 38,
+ 39, 40, 41, 42, 43, 44, 45, 219, 45, 46,
+ 124, 234, 303, 106, 107, 97, 98, 228, 100, 101,
+ 120, 421, 245, 423, 247, 121, 464, 645, 646, 252,
+ 241, 242, 243, 270, 653, 247, 121, 270, 119, 276,
+ 237, 238, 119, 276, 119, 256, 34, 270, 54, 55,
+ 56, 57, 58, 59, 454, 455, 456, 127, 269, 367,
+ 127, 127, 273, 45, 275, 37, 38, 39, 40, 45,
+ 46, 47, 48, 284, 47, 383, 7, 48, 120, 120,
+ 120, 109, 105, 122, 119, 121, 309, 298, 119, 45,
+ 128, 110, 19, 316, 384, 318, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 127, 20, 29, 121, 49,
+ 127, 53, 323, 324, 121, 120, 127, 328, 329, 44,
+ 53, 332, 333, 127, 127, 120, 96, 121, 22, 24,
+ 420, 44, 44, 44, 493, 425, 44, 44, 44, 44,
+ 498, 44, 34, 366, 367, 119, 121, 14, 26, 113,
383, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 444, 122, 37, 38, 49, 40, 219, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 119, 106, 107,
- 122, 234, 303, 645, 646, 123, 128, 121, 421, 120,
- 423, 219, 245, 120, 247, 237, 238, 121, 653, 252,
- 241, 242, 243, 270, 464, 270, 34, 119, 119, 276,
- 119, 276, 127, 127, 127, 256, 34, 270, 45, 247,
- 7, 454, 455, 456, 37, 38, 39, 40, 269, 367,
- 37, 38, 273, 40, 275, 47, 121, 48, 45, 45,
- 46, 47, 48, 284, 120, 383, 54, 55, 56, 57,
- 58, 59, 120, 122, 120, 109, 309, 298, 121, 105,
- 34, 119, 119, 316, 384, 318, 45, 128, 96, 97,
- 98, 127, 100, 101, 102, 103, 110, 19, 29, 20,
- 121, 53, 323, 324, 127, 120, 44, 328, 329, 121,
- 127, 332, 333, 96, 127, 120, 127, 53, 121, 22,
- 420, 44, 24, 34, 493, 425, 44, 44, 44, 44,
- 498, 44, 44, 366, 367, 44, 121, 119, 383, 34,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- 383, 47, 48, 49, 50, 51, 52, 605, 121, 459,
- 121, 14, 120, 26, 113, 386, 176, 226, 389, 170,
- 417, 50, 247, 270, 183, 174, 477, 143, 481, 505,
- 481, 594, 595, 596, 656, 413, 522, 488, 661, 489,
- 244, 491, 424, 512, 510, 428, 429, 430, 431, 432,
- 433, 434, 405, 521, 522, 523, 31, 383, 34, -1,
- 443, 409, 445, 446, 447, 36, 37, 38, 39, 40,
+ 383, 121, 121, 120, 49, 605, 176, 226, 170, 459,
+ 50, 183, 270, 247, 174, 386, 143, 481, 389, 505,
+ 417, 121, 656, 413, 522, 661, 477, 244, 424, 512,
+ 481, 510, 405, 31, 594, 595, 596, 488, 34, 489,
+ 409, 491, 383, -1, -1, 428, 429, 430, 431, 432,
+ 433, 434, -1, 521, 522, 523, -1, -1, -1, -1,
+ 443, -1, 445, 446, 447, 36, 37, 38, 39, 40,
41, 42, 43, 44, 457, 458, -1, 460, 49, 50,
- 51, 52, -1, -1, 481, -1, 481, -1, -1, -1,
- 653, -1, -1, -1, 613, -1, -1, -1, 481, -1,
+ 51, 52, -1, -1, 481, -1, -1, -1, 481, -1,
+ -1, -1, -1, 653, 613, -1, -1, -1, 481, -1,
-1, -1, 36, 37, 38, 39, 40, 41, 42, 43,
44, 45, 509, 47, 48, 49, 50, 51, 52, -1,
-1, -1, 505, -1, -1, -1, 509, -1, 36, 37,
@@ -1687,8 +1689,8 @@
-1, 34, 605, 36, 37, 38, 39, 40, 41, 42,
43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
-1, -1, -1, -1, -1, -1, -1, -1, 645, 646,
- 645, 646, 36, 37, 38, 39, 40, 41, 42, 43,
- 44, 45, 645, 646, -1, 49, -1, 51, 651, -1,
+ 621, -1, 645, 646, -1, -1, -1, -1, -1, -1,
+ -1, -1, 645, 646, -1, -1, -1, -1, 651, -1,
-1, -1, -1, -1, -1, 111, -1, -1, 661, -1,
1, -1, -1, 119, -1, -1, -1, 8, 9, 10,
11, -1, 663, 664, 15, 16, 17, 18, -1, -1,
@@ -1711,7 +1713,7 @@
90, 91, 92, 93, 94, 95, 68, 69, 70, 71,
72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
35, -1, 36, 37, 38, 39, 40, 41, 42, 43,
- 44, -1, -1, -1, 129, 49, 131, 132, 133, 134,
+ 44, 45, -1, -1, 129, -1, 131, 132, 133, 134,
135, 136, 137, 138, -1, -1, -1, 36, 37, 38,
39, 40, 41, 42, 43, 44, 45, 119, 47, 48,
49, 50, 51, 52, -1, 127, 128, 82, 83, 84,
@@ -1721,26 +1723,28 @@
41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
51, 52, 36, 37, 38, 39, 40, 41, 42, 43,
44, 45, 46, 47, 48, 49, 50, 51, 52, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, -1,
+ 37, 38, 39, 40, 41, 42, 43, 44, -1, -1,
127, 36, 37, 38, 39, 40, 41, 42, 43, 44,
45, 46, 47, 48, 49, 50, 51, 52, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 49, 50, 51, 52, 36, 37, 38, 39, 40,
41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
51, 52, 36, 37, 38, 39, 40, 41, 42, 43,
- 44, -1, -1, 47, 48, 49, 50, 51, 52, 36,
+ 44, 45, -1, 47, 48, 49, 50, 51, 52, 36,
37, 38, 39, 40, 41, 42, 43, 44, -1, -1,
47, 48, 49, 50, 51, 52, 36, 37, 38, 39,
40, 41, 42, 43, 44, -1, -1, 47, 48, 49,
50, 51, 52, 36, 37, 38, 39, 40, 41, 42,
43, 44, -1, -1, 47, 48, 49, 50, 51, 52,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- -1, -1, -1, 49, 50, 51, 52, 36, 37, 38,
+ 36, 37, 38, 39, 40, 41, 42, 43, 44, -1,
+ -1, 47, 48, 49, 50, 51, 52, 36, 37, 38,
39, 40, 41, 42, 43, 44, 45, -1, -1, -1,
49, 50, 51, 52, 36, 37, 38, 39, 40, 41,
- 42, 43, 44, 45, 46, 47, 48, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 36, 37, 38, 39,
- 40, 41, 42, 43, 44
+ 42, 43, 44, 45, -1, -1, -1, 49, 50, 51,
+ 52, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, -1, -1, -1, 49, -1, 51, 36, 37, 38,
+ 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
+ 36, 37, 38, 39, 40, 41, 42, 43, 44
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1754,14 +1758,14 @@
5, 16, 144, 145, 146, 159, 160, 161, 162, 166,
168, 200, 281, 45, 47, 45, 122, 143, 198, 307,
310, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 297, 298, 36, 119, 191, 34, 119, 34, 34, 45,
+ 297, 298, 36, 119, 191, 143, 119, 143, 143, 45,
46, 47, 48, 49, 50, 51, 52, 122, 207, 208,
210, 211, 212, 213, 250, 290, 291, 296, 297, 305,
307, 170, 143, 45, 45, 45, 169, 297, 37, 38,
40, 286, 142, 143, 170, 121, 45, 163, 164, 165,
114, 111, 112, 113, 125, 192, 193, 194, 195, 143,
150, 151, 152, 297, 49, 214, 289, 290, 294, 295,
- 296, 297, 34, 121, 213, 35, 82, 83, 84, 85,
+ 296, 297, 143, 121, 213, 35, 82, 83, 84, 85,
86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
171, 297, 297, 297, 145, 143, 49, 250, 297, 123,
124, 191, 196, 120, 121, 120, 121, 123, 124, 210,
@@ -1778,7 +1782,7 @@
232, 233, 234, 243, 244, 245, 246, 247, 248, 250,
251, 257, 258, 259, 260, 268, 269, 280, 282, 283,
285, 294, 297, 298, 37, 38, 39, 40, 179, 293,
- 293, 109, 105, 155, 34, 175, 293, 286, 45, 284,
+ 293, 109, 105, 155, 143, 175, 293, 286, 45, 284,
286, 287, 119, 261, 261, 143, 143, 143, 251, 245,
45, 187, 294, 297, 213, 45, 252, 253, 254, 294,
143, 143, 206, 207, 209, 213, 143, 143, 36, 37,
@@ -1812,7 +1816,7 @@
143, 250, 248, 250, 250, 143, 143, 297, 297, 297,
297, 297, 297, 297, 297, 297, 297, 45, 294, 47,
48, 294, 47, 48, 294, 121, 121, 289, 175, 278,
- 34, 121, 239, 30, 227, 240, 241, 242, 208, 208,
+ 143, 121, 239, 30, 227, 240, 241, 242, 208, 208,
120, 14, 250, 254, 26, 242, 249, 143, 143
};
@@ -1887,7 +1891,7 @@
we won't break user code: when these are the locations we know. */
#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
@@ -4803,7 +4807,7 @@
/* Line 1267 of yacc.c. */
-#line 4807 "pirparser.c"
+#line 4811 "pirparser.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
Modified: trunk/compilers/pirc/src/pirparser.h
==============================================================================
--- trunk/compilers/pirc/src/pirparser.h Fri Oct 9 03:07:02 2009 (r41770)
+++ trunk/compilers/pirc/src/pirparser.h Fri Oct 9 09:54:53 2009 (r41771)
@@ -299,7 +299,7 @@
struct macro_def *mval;
struct macro_param *pval;
}
-/* Line 1489 of yacc.c. */
+/* Line 1529 of yacc.c. */
#line 304 "pirparser.h"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
More information about the parrot-commits
mailing list