diff options
| author | Joel E. Denny <jdenny@clemson.edu> | 2009-08-26 02:40:38 -0400 |
|---|---|---|
| committer | Joel E. Denny <jdenny@clemson.edu> | 2009-08-26 03:14:58 -0400 |
| commit | e4bcae3c5a7701f28bcc3430c60db97b86d13618 (patch) | |
| tree | 39e33fc251c5171e4fa3b1ff6552a96eafa968d8 /data/yacc.c | |
| parent | d5eb0826afb8ede89bfe314671f2b37db55bd817 (diff) | |
| download | bison-e4bcae3c5a7701f28bcc3430c60db97b86d13618.tar.gz | |
Actually handle the yytable zero value correctly this time.
* data/glr.c, data/lalr1.cc, data/lalr1.java, data/yacc.c: Don't
mention zero values in the YYTABLE comments.
* data/glr.c (yytable_value_is_error): Don't check for zero
value.
* data/lalr1.cc (yy_table_value_is_error_): Likewise.
* data/yacc.c (yytable_value_is_error): Likewise.
* data/lalr1.java (yy_table_value_is_error_): Likewise.
(yysyntax_error): Fix typo in code: use yytable_ not yycheck_.
* src/tables.h: In header comments, explain why it's useless to
check for a zero value in yytable.
(cherry picked from commit aa0cb40d61cda5bfa9d325a45735439cbbd06327)
Conflicts:
data/bison.m4
data/lalr1.java
Diffstat (limited to 'data/yacc.c')
| -rw-r--r-- | data/yacc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/data/yacc.c b/data/yacc.c index 9f997e84..2dc7112a 100644 --- a/data/yacc.c +++ b/data/yacc.c @@ -578,7 +578,7 @@ static const ]b4_int_type_for([b4_pgoto])[ yypgoto[] = /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which - number is the opposite. If zero or YYTABLE_NINF, syntax error. */ + number is the opposite. If YYTABLE_NINF, syntax error. */ #define YYTABLE_NINF ]b4_table_ninf[ static const ]b4_int_type_for([b4_table])[ yytable[] = { @@ -589,8 +589,7 @@ static const ]b4_int_type_for([b4_table])[ yytable[] = ]b4_table_value_equals([[pact]], [[yystate]], [b4_pact_ninf])[ #define yytable_value_is_error(yytable_value) \ - (]b4_table_value_equals([[table]], [[yytable_value]], [b4_table_ninf])[ \ - || ]b4_table_value_equals([[table]], [[yytable_value]], [[0]])[) + ]b4_table_value_equals([[table]], [[yytable_value]], [b4_table_ninf])[ static const ]b4_int_type_for([b4_check])[ yycheck[] = { |