Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-21 10:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

yysyntax_error: prepare for readability of next patches.

Browse Source 
These are purely whitespace changes that result in ugly code
but that make the next couple of patches much easier to read.
* data/glr.c (yyreportSyntaxError): Reindent.
* data/lalr1.cc (yy::parser::yysyntax_error_): Reindent.
* data/lalr1.java (YYParser::yysyntax_error): Reindent.
* data/yacc.c (yysyntax_error): Reindent.
(cherry picked from commit b4bbc4a03c)

Conflicts:

	src/parse-gram.c
	src/parse-gram.h
This commit is contained in:
Joel E. Denny
2010-11-07 09:44:07 -05:00
parent 0e0f066b76
commit f953cb20cf
7 changed files with 483 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -1,3 +1,13 @@
2010-11-07 Joel E. Denny <jdenny@clemson.edu>
yysyntax_error: prepare for readability of next patches.
These are purely whitespace changes that result in ugly code
but that make the next couple of patches much easier to read.
* data/glr.c (yyreportSyntaxError): Reindent.
* data/lalr1.cc (yy::parser::yysyntax_error_): Reindent.
* data/lalr1.java (YYParser::yysyntax_error): Reindent.
* data/yacc.c (yysyntax_error): Reindent.
2010-10-31 Joel E. Denny <joeldenny@joeldenny.org> 2010-10-31 Joel E. Denny <joeldenny@joeldenny.org>
yysyntax_error: improve invocation readability. yysyntax_error: improve invocation readability.

4
data/lalr1.cc
View File

@@ -852,8 +852,8 @@ b4_error_verbose_if([int yystate, int yytoken],
if (yypact_ninf_ < yyn && yyn <= yylast_) if (yypact_ninf_ < yyn && yyn <= yylast_)
{ {
/* Start YYX at -YYN if negative to avoid negative indexes in /* Start YYX at -YYN if negative to avoid negative indexes in
YYCHECK. In other words, skip the first -YYN actions for this YYCHECK. In other words, skip the first -YYN actions for
state because they are default actions. */ this state because they are default actions. */
int yyxbegin = yyn < 0 ? -yyn : 0; int yyxbegin = yyn < 0 ? -yyn : 0;
/* Stay within bounds of both yycheck and yytname. */ /* Stay within bounds of both yycheck and yytname. */

7
data/lalr1.java
View File

@@ -688,9 +688,10 @@ m4_popdef([b4_at_dollar])])dnl
{ {
StringBuffer res; StringBuffer res;
/* Start YYX at -YYN if negative to avoid negative indexes in /* Start YYX at -YYN if negative to avoid negative
YYCHECK. In other words, skip the first -YYN actions for this indexes in YYCHECK. In other words, skip the first
state because they are default actions. */ -YYN actions for this state because they are default
actions. */
int yyxbegin = yyn < 0 ? -yyn : 0; int yyxbegin = yyn < 0 ? -yyn : 0;
/* Stay within bounds of both yycheck and yytname. */ /* Stay within bounds of both yycheck and yytname. */

7
data/yacc.c
View File

@@ -997,8 +997,8 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
/* Start YYX at -YYN if negative to avoid negative indexes in /* Start YYX at -YYN if negative to avoid negative indexes in
YYCHECK. In other words, skip the first -YYN actions for this YYCHECK. In other words, skip the first -YYN actions for
state because they are default actions. */ this state because they are default actions. */
int yyxbegin = yyn < 0 ? -yyn : 0; int yyxbegin = yyn < 0 ? -yyn : 0;
/* Stay within bounds of both yycheck and yytname. */ /* Stay within bounds of both yycheck and yytname. */
@@ -1023,8 +1023,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
} }
yyarg[yycount++] = yytname[yyx]; yyarg[yycount++] = yytname[yyx];
yysize1 = yysize + yytnamerr (0, yytname[yyx]); yysize1 = yysize + yytnamerr (0, yytname[yyx]);
if (! (yysize <= yysize1 if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
&& yysize1 <= YYSTACK_ALLOC_MAXIMUM))
{ {
/* Overflow. */ /* Overflow. */
*yymsg_alloc = 0; *yymsg_alloc = 0;

223
src/parse-gram.c
View File

@@ -1,4 +1,4 @@
/* A Bison parser, made by GNU Bison 2.4.1.243-8699. */ /* A Bison parser, made by GNU Bison 2.4.1.247-0e0f-dirty. */
/* Skeleton implementation for Bison's Yacc-like parsers in C /* Skeleton implementation for Bison's Yacc-like parsers in C
@@ -45,7 +45,7 @@
#define YYBISON 1 #define YYBISON 1
/* Bison version. */ /* Bison version. */
#define YYBISON_VERSION "2.4.1.243-8699" #define YYBISON_VERSION "2.4.1.247-0e0f-dirty"
/* Skeleton name. */ /* Skeleton name. */
#define YYSKELETON_NAME "yacc.c" #define YYSKELETON_NAME "yacc.c"
@@ -1471,8 +1471,8 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
/* Start YYX at -YYN if negative to avoid negative indexes in /* Start YYX at -YYN if negative to avoid negative indexes in
YYCHECK. In other words, skip the first -YYN actions for this YYCHECK. In other words, skip the first -YYN actions for
state because they are default actions. */ this state because they are default actions. */
int yyxbegin = yyn < 0 ? -yyn : 0; int yyxbegin = yyn < 0 ? -yyn : 0;
/* Stay within bounds of both yycheck and yytname. */ /* Stay within bounds of both yycheck and yytname. */
@@ -1497,8 +1497,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
} }
yyarg[yycount++] = yytname[yyx]; yyarg[yycount++] = yytname[yyx];
yysize1 = yysize + yytnamerr (0, yytname[yyx]); yysize1 = yysize + yytnamerr (0, yytname[yyx]);
if (! (yysize <= yysize1 if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
&& yysize1 <= YYSTACK_ALLOC_MAXIMUM))
{ {
/* Overflow. */ /* Overflow. */
*yymsg_alloc = 0; *yymsg_alloc = 0;
@@ -1734,7 +1733,7 @@ YYLTYPE yylloc;
/* User initialization code. */ /* User initialization code. */
/* Line 1280 of yacc.c */ /* Line 1279 of yacc.c */
#line 86 "parse-gram.y" #line 86 "parse-gram.y"
{ {
/* Bison's grammar can initial empty locations, hence a default /* Bison's grammar can initial empty locations, hence a default
@@ -1743,8 +1742,8 @@ YYLTYPE yylloc;
boundary_set (&yylloc.end, current_file, 1, 1); boundary_set (&yylloc.end, current_file, 1, 1);
} }
/* Line 1280 of yacc.c */ /* Line 1279 of yacc.c */
#line 1748 "parse-gram.c" #line 1747 "parse-gram.c"
yylsp[0] = yylloc; yylsp[0] = yylloc;
goto yysetstate; goto yysetstate;
@@ -1931,7 +1930,7 @@ yyreduce:
{ {
case 6: case 6:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 225 "parse-gram.y" #line 225 "parse-gram.y"
{ {
code_props plain_code; code_props plain_code;
@@ -1946,14 +1945,14 @@ yyreduce:
case 7: case 7:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 234 "parse-gram.y" #line 234 "parse-gram.y"
{ debug_flag = true; } { debug_flag = true; }
break; break;
case 8: case 8:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 236 "parse-gram.y" #line 236 "parse-gram.y"
{ {
muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars),
@@ -1963,14 +1962,14 @@ yyreduce:
case 9: case 9:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 240 "parse-gram.y" #line 240 "parse-gram.y"
{ defines_flag = true; } { defines_flag = true; }
break; break;
case 10: case 10:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 242 "parse-gram.y" #line 242 "parse-gram.y"
{ {
defines_flag = true; defines_flag = true;
@@ -1980,42 +1979,42 @@ yyreduce:
case 11: case 11:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 246 "parse-gram.y" #line 246 "parse-gram.y"
{ error_verbose = true; } { error_verbose = true; }
break; break;
case 12: case 12:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 247 "parse-gram.y" #line 247 "parse-gram.y"
{ expected_sr_conflicts = (yyvsp[(2) - (2)].integer); } { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
break; break;
case 13: case 13:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 248 "parse-gram.y" #line 248 "parse-gram.y"
{ expected_rr_conflicts = (yyvsp[(2) - (2)].integer); } { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
break; break;
case 14: case 14:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 249 "parse-gram.y" #line 249 "parse-gram.y"
{ spec_file_prefix = (yyvsp[(2) - (2)].chars); } { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
break; break;
case 15: case 15:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 250 "parse-gram.y" #line 250 "parse-gram.y"
{ spec_file_prefix = (yyvsp[(3) - (3)].chars); } { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
break; break;
case 16: case 16:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 252 "parse-gram.y" #line 252 "parse-gram.y"
{ {
nondeterministic_parser = true; nondeterministic_parser = true;
@@ -2025,7 +2024,7 @@ yyreduce:
case 17: case 17:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 257 "parse-gram.y" #line 257 "parse-gram.y"
{ {
code_props action; code_props action;
@@ -2039,77 +2038,77 @@ yyreduce:
case 18: case 18:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 265 "parse-gram.y" #line 265 "parse-gram.y"
{ language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); } { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); }
break; break;
case 19: case 19:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 266 "parse-gram.y" #line 266 "parse-gram.y"
{ add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
break; break;
case 20: case 20:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 267 "parse-gram.y" #line 267 "parse-gram.y"
{ locations_flag = true; } { locations_flag = true; }
break; break;
case 21: case 21:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 268 "parse-gram.y" #line 268 "parse-gram.y"
{ spec_name_prefix = (yyvsp[(2) - (2)].chars); } { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
break; break;
case 22: case 22:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 269 "parse-gram.y" #line 269 "parse-gram.y"
{ spec_name_prefix = (yyvsp[(3) - (3)].chars); } { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
break; break;
case 23: case 23:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 270 "parse-gram.y" #line 270 "parse-gram.y"
{ no_lines_flag = true; } { no_lines_flag = true; }
break; break;
case 24: case 24:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 271 "parse-gram.y" #line 271 "parse-gram.y"
{ nondeterministic_parser = true; } { nondeterministic_parser = true; }
break; break;
case 25: case 25:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 272 "parse-gram.y" #line 272 "parse-gram.y"
{ spec_outfile = (yyvsp[(2) - (2)].chars); } { spec_outfile = (yyvsp[(2) - (2)].chars); }
break; break;
case 26: case 26:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 273 "parse-gram.y" #line 273 "parse-gram.y"
{ spec_outfile = (yyvsp[(3) - (3)].chars); } { spec_outfile = (yyvsp[(3) - (3)].chars); }
break; break;
case 27: case 27:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 274 "parse-gram.y" #line 274 "parse-gram.y"
{ add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
break; break;
case 28: case 28:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 276 "parse-gram.y" #line 276 "parse-gram.y"
{ {
/* %pure-parser is deprecated in favor of `%define api.pure', so use /* %pure-parser is deprecated in favor of `%define api.pure', so use
@@ -2129,14 +2128,14 @@ yyreduce:
case 29: case 29:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 290 "parse-gram.y" #line 290 "parse-gram.y"
{ version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); } { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
break; break;
case 30: case 30:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 292 "parse-gram.y" #line 292 "parse-gram.y"
{ {
char const *skeleton_user = (yyvsp[(2) - (2)].chars); char const *skeleton_user = (yyvsp[(2) - (2)].chars);
@@ -2165,28 +2164,28 @@ yyreduce:
case 31: case 31:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 315 "parse-gram.y" #line 315 "parse-gram.y"
{ token_table_flag = true; } { token_table_flag = true; }
break; break;
case 32: case 32:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 316 "parse-gram.y" #line 316 "parse-gram.y"
{ report_flag |= report_states; } { report_flag |= report_states; }
break; break;
case 33: case 33:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 317 "parse-gram.y" #line 317 "parse-gram.y"
{ yacc_flag = true; } { yacc_flag = true; }
break; break;
case 37: case 37:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 325 "parse-gram.y" #line 325 "parse-gram.y"
{ {
grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
@@ -2195,7 +2194,7 @@ yyreduce:
case 38: case 38:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 329 "parse-gram.y" #line 329 "parse-gram.y"
{ {
symbol_list *list; symbol_list *list;
@@ -2207,7 +2206,7 @@ yyreduce:
case 39: case 39:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 336 "parse-gram.y" #line 336 "parse-gram.y"
{ {
symbol_list *list; symbol_list *list;
@@ -2219,7 +2218,7 @@ yyreduce:
case 40: case 40:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 343 "parse-gram.y" #line 343 "parse-gram.y"
{ {
default_prec = true; default_prec = true;
@@ -2228,7 +2227,7 @@ yyreduce:
case 41: case 41:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 347 "parse-gram.y" #line 347 "parse-gram.y"
{ {
default_prec = false; default_prec = false;
@@ -2237,7 +2236,7 @@ yyreduce:
case 42: case 42:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 351 "parse-gram.y" #line 351 "parse-gram.y"
{ {
/* Do not invoke muscle_percent_code_grow here since it invokes /* Do not invoke muscle_percent_code_grow here since it invokes
@@ -2249,7 +2248,7 @@ yyreduce:
case 43: case 43:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 358 "parse-gram.y" #line 358 "parse-gram.y"
{ {
muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
@@ -2259,21 +2258,21 @@ yyreduce:
case 44: case 44:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 372 "parse-gram.y" #line 372 "parse-gram.y"
{} {}
break; break;
case 45: case 45:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 373 "parse-gram.y" #line 373 "parse-gram.y"
{ muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break; break;
case 46: case 46:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 378 "parse-gram.y" #line 378 "parse-gram.y"
{ {
union_seen = true; union_seen = true;
@@ -2284,14 +2283,14 @@ yyreduce:
case 47: case 47:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 389 "parse-gram.y" #line 389 "parse-gram.y"
{ current_class = nterm_sym; } { current_class = nterm_sym; }
break; break;
case 48: case 48:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 390 "parse-gram.y" #line 390 "parse-gram.y"
{ {
current_class = unknown_sym; current_class = unknown_sym;
@@ -2301,14 +2300,14 @@ yyreduce:
case 49: case 49:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 394 "parse-gram.y" #line 394 "parse-gram.y"
{ current_class = token_sym; } { current_class = token_sym; }
break; break;
case 50: case 50:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 395 "parse-gram.y" #line 395 "parse-gram.y"
{ {
current_class = unknown_sym; current_class = unknown_sym;
@@ -2318,7 +2317,7 @@ yyreduce:
case 51: case 51:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 400 "parse-gram.y" #line 400 "parse-gram.y"
{ {
symbol_list *list; symbol_list *list;
@@ -2331,7 +2330,7 @@ yyreduce:
case 52: case 52:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 411 "parse-gram.y" #line 411 "parse-gram.y"
{ {
symbol_list *list; symbol_list *list;
@@ -2348,126 +2347,126 @@ yyreduce:
case 53: case 53:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 425 "parse-gram.y" #line 425 "parse-gram.y"
{ (yyval.assoc) = left_assoc; } { (yyval.assoc) = left_assoc; }
break; break;
case 54: case 54:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 426 "parse-gram.y" #line 426 "parse-gram.y"
{ (yyval.assoc) = right_assoc; } { (yyval.assoc) = right_assoc; }
break; break;
case 55: case 55:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 427 "parse-gram.y" #line 427 "parse-gram.y"
{ (yyval.assoc) = non_assoc; } { (yyval.assoc) = non_assoc; }
break; break;
case 56: case 56:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 431 "parse-gram.y" #line 431 "parse-gram.y"
{ current_type = NULL; } { current_type = NULL; }
break; break;
case 57: case 57:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 432 "parse-gram.y" #line 432 "parse-gram.y"
{ current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
break; break;
case 58: case 58:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 438 "parse-gram.y" #line 438 "parse-gram.y"
{ (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
break; break;
case 59: case 59:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 440 "parse-gram.y" #line 440 "parse-gram.y"
{ (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); } { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
break; break;
case 60: case 60:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 444 "parse-gram.y" #line 444 "parse-gram.y"
{ (yyval.symbol) = (yyvsp[(1) - (1)].symbol); } { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
break; break;
case 61: case 61:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 445 "parse-gram.y" #line 445 "parse-gram.y"
{ (yyval.symbol) = (yyvsp[(1) - (2)].symbol); symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)])); } { (yyval.symbol) = (yyvsp[(1) - (2)].symbol); symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)])); }
break; break;
case 62: case 62:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 451 "parse-gram.y" #line 451 "parse-gram.y"
{ (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
break; break;
case 63: case 63:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 453 "parse-gram.y" #line 453 "parse-gram.y"
{ (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); } { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
break; break;
case 64: case 64:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 457 "parse-gram.y" #line 457 "parse-gram.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); } { (yyval.list) = (yyvsp[(1) - (1)].list); }
break; break;
case 65: case 65:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 458 "parse-gram.y" #line 458 "parse-gram.y"
{ (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); } { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
break; break;
case 66: case 66:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 462 "parse-gram.y" #line 462 "parse-gram.y"
{ (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
break; break;
case 67: case 67:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 463 "parse-gram.y" #line 463 "parse-gram.y"
{ (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break; break;
case 68: case 68:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 464 "parse-gram.y" #line 464 "parse-gram.y"
{ (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); } { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
break; break;
case 69: case 69:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 465 "parse-gram.y" #line 465 "parse-gram.y"
{ (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); } { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
break; break;
case 70: case 70:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 471 "parse-gram.y" #line 471 "parse-gram.y"
{ {
current_type = (yyvsp[(1) - (1)].uniqstr); current_type = (yyvsp[(1) - (1)].uniqstr);
@@ -2477,7 +2476,7 @@ yyreduce:
case 71: case 71:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 476 "parse-gram.y" #line 476 "parse-gram.y"
{ {
symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true); symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true);
@@ -2487,7 +2486,7 @@ yyreduce:
case 72: case 72:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 481 "parse-gram.y" #line 481 "parse-gram.y"
{ {
symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true); symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
@@ -2498,7 +2497,7 @@ yyreduce:
case 73: case 73:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 487 "parse-gram.y" #line 487 "parse-gram.y"
{ {
symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true); symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
@@ -2509,7 +2508,7 @@ yyreduce:
case 74: case 74:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 493 "parse-gram.y" #line 493 "parse-gram.y"
{ {
symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true); symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true);
@@ -2521,7 +2520,7 @@ yyreduce:
case 81: case 81:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 523 "parse-gram.y" #line 523 "parse-gram.y"
{ {
yyerrok; yyerrok;
@@ -2530,7 +2529,7 @@ yyreduce:
case 82: case 82:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 529 "parse-gram.y" #line 529 "parse-gram.y"
{ current_lhs = (yyvsp[(1) - (2)].symbol); current_lhs_location = (yylsp[(1) - (2)]); { current_lhs = (yyvsp[(1) - (2)].symbol); current_lhs_location = (yylsp[(1) - (2)]);
current_lhs_named_ref = (yyvsp[(2) - (2)].named_ref); } current_lhs_named_ref = (yyvsp[(2) - (2)].named_ref); }
@@ -2538,21 +2537,21 @@ yyreduce:
case 84: case 84:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 534 "parse-gram.y" #line 534 "parse-gram.y"
{ grammar_current_rule_end ((yylsp[(1) - (1)])); } { grammar_current_rule_end ((yylsp[(1) - (1)])); }
break; break;
case 85: case 85:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 535 "parse-gram.y" #line 535 "parse-gram.y"
{ grammar_current_rule_end ((yylsp[(3) - (3)])); } { grammar_current_rule_end ((yylsp[(3) - (3)])); }
break; break;
case 87: case 87:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 541 "parse-gram.y" #line 541 "parse-gram.y"
{ grammar_current_rule_begin (current_lhs, current_lhs_location, { grammar_current_rule_begin (current_lhs, current_lhs_location,
current_lhs_named_ref); } current_lhs_named_ref); }
@@ -2560,77 +2559,77 @@ yyreduce:
case 88: case 88:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 544 "parse-gram.y" #line 544 "parse-gram.y"
{ grammar_current_rule_symbol_append ((yyvsp[(2) - (3)].symbol), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); } { grammar_current_rule_symbol_append ((yyvsp[(2) - (3)].symbol), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); }
break; break;
case 89: case 89:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 546 "parse-gram.y" #line 546 "parse-gram.y"
{ grammar_current_rule_action_append ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); } { grammar_current_rule_action_append ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); }
break; break;
case 90: case 90:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 548 "parse-gram.y" #line 548 "parse-gram.y"
{ grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); } { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
break; break;
case 91: case 91:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 550 "parse-gram.y" #line 550 "parse-gram.y"
{ grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); } { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
break; break;
case 92: case 92:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 552 "parse-gram.y" #line 552 "parse-gram.y"
{ grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); } { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
break; break;
case 93: case 93:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 556 "parse-gram.y" #line 556 "parse-gram.y"
{ (yyval.named_ref) = 0; } { (yyval.named_ref) = 0; }
break; break;
case 94: case 94:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 558 "parse-gram.y" #line 558 "parse-gram.y"
{ (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } { (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break; break;
case 96: case 96:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 570 "parse-gram.y" #line 570 "parse-gram.y"
{ (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); } { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
break; break;
case 97: case 97:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 575 "parse-gram.y" #line 575 "parse-gram.y"
{ (yyval.chars) = ""; } { (yyval.chars) = ""; }
break; break;
case 98: case 98:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 576 "parse-gram.y" #line 576 "parse-gram.y"
{ (yyval.chars) = (yyvsp[(1) - (1)].uniqstr); } { (yyval.chars) = (yyvsp[(1) - (1)].uniqstr); }
break; break;
case 100: case 100:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 587 "parse-gram.y" #line 587 "parse-gram.y"
{ {
code_props plain_code; code_props plain_code;
@@ -2644,14 +2643,14 @@ yyreduce:
case 101: case 101:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 607 "parse-gram.y" #line 607 "parse-gram.y"
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break; break;
case 102: case 102:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 609 "parse-gram.y" #line 609 "parse-gram.y"
{ {
(yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)])); (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));
@@ -2662,14 +2661,14 @@ yyreduce:
case 103: case 103:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 617 "parse-gram.y" #line 617 "parse-gram.y"
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break; break;
case 106: case 106:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 629 "parse-gram.y" #line 629 "parse-gram.y"
{ {
(yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)])); (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));
@@ -2679,7 +2678,7 @@ yyreduce:
case 108: case 108:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 638 "parse-gram.y" #line 638 "parse-gram.y"
{ {
code_props plain_code; code_props plain_code;
@@ -2693,8 +2692,8 @@ yyreduce:
/* Line 1493 of yacc.c */ /* Line 1492 of yacc.c */
#line 2698 "parse-gram.c" #line 2697 "parse-gram.c"
default: break; default: break;
} }
/* User semantic actions sometimes alter yychar, and that requires /* User semantic actions sometimes alter yychar, and that requires
@@ -2747,28 +2746,34 @@ yyerrlab:
#if ! YYERROR_VERBOSE #if ! YYERROR_VERBOSE
yyerror (YY_("syntax error")); yyerror (YY_("syntax error"));
#else #else
while (1) # define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, yystate, \
yytoken)
{ {
int yysyntax_error_status = char const *yymsgp = YY_("syntax error");
yysyntax_error (&yymsg_alloc, &yymsg, yystate, yytoken); int yysyntax_error_status = YYSYNTAX_ERROR;
if (yysyntax_error_status == 2 && 0 < yymsg_alloc) if (yysyntax_error_status == 0)
yymsgp = yymsg;
else if (yysyntax_error_status == 2 && 0 < yymsg_alloc)
{ {
if (yymsg != yymsgbuf) if (yymsg != yymsgbuf)
YYSTACK_FREE (yymsg); YYSTACK_FREE (yymsg);
yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
if (yymsg) if (!yymsg)
continue; {
yymsg = yymsgbuf; yymsg = yymsgbuf;
yymsg_alloc = sizeof yymsgbuf; yymsg_alloc = sizeof yymsgbuf;
} }
if (yysyntax_error_status == 0)
yyerror (yymsg);
else else
yyerror (YY_("syntax error")); {
yysyntax_error_status = YYSYNTAX_ERROR;
yymsgp = yymsg;
}
}
yyerror (yymsgp);
if (yysyntax_error_status == 2) if (yysyntax_error_status == 2)
goto yyexhaustedlab; goto yyexhaustedlab;
break;
} }
# undef YYSYNTAX_ERROR
#endif #endif
} }
@@ -2923,7 +2928,7 @@ yyreturn:
/* Line 1724 of yacc.c */ /* Line 1729 of yacc.c */
#line 648 "parse-gram.y" #line 648 "parse-gram.y"

6
src/parse-gram.h
View File

@@ -1,4 +1,4 @@
/* A Bison parser, made by GNU Bison 2.4.1.243-8699. */ /* A Bison parser, made by GNU Bison 2.4.1.247-0e0f-dirty. */
/* Skeleton interface for Bison's Yacc-like parsers in C /* Skeleton interface for Bison's Yacc-like parsers in C
@@ -161,7 +161,7 @@
typedef union YYSTYPE typedef union YYSTYPE
{ {
/* Line 1725 of yacc.c */ /* Line 1730 of yacc.c */
#line 94 "parse-gram.y" #line 94 "parse-gram.y"
symbol *symbol; symbol *symbol;
@@ -176,7 +176,7 @@ typedef union YYSTYPE
/* Line 1725 of yacc.c */ /* Line 1730 of yacc.c */
#line 181 "parse-gram.h" #line 181 "parse-gram.h"
} YYSTYPE; } YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_TRIVIAL 1