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

Use new @ escapes consistently.

Browse Source 
(b4_input_suffix, b4_output_parser_suffix, b4_output_parser_name,
b4_output_header_suffix, b4_output_header_name, b4_header_guard):
Remove, since they couldn't handle arbitrary characters in file
names.

Remove use of "#ifdef b4_header_guard", since it
mishandled funny characters in file names, and anyway it isn't
needed any more.

(YYSTYPE_IS_TRIVIAL): Define when the .h file would.
This commit is contained in:
Paul Eggert
2002-11-12 07:22:01 +00:00
parent 6ad762a8c0
commit 947427ae83
2 changed files with 23 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
data/glr.c
View File

@@ -115,7 +115,7 @@ m4_define([b4_lhs_value],
# Expansion of $<TYPE>NUM, where the current rule has RULE-LENGTH # Expansion of $<TYPE>NUM, where the current rule has RULE-LENGTH
# symbols on RHS. # symbols on RHS.
m4_define([b4_rhs_value], m4_define([b4_rhs_value],
[yyvsp@<:@m4_eval([$2 - $1])@:>@.yystate.yysemantics.yysval[]m4_ifval([$3], [.$3])]) [yyvsp@{m4_eval([$2 - $1])@}.yystate.yysemantics.yysval[]m4_ifval([$3], [.$3])])
@@ -135,38 +135,13 @@ m4_define([b4_lhs_location],
# Expansion of @NUM, where the current rule has RULE-LENGTH symbols # Expansion of @NUM, where the current rule has RULE-LENGTH symbols
# on RHS. # on RHS.
m4_define([b4_rhs_location], m4_define([b4_rhs_location],
[yyvsp@<:@m4_eval([$2 - $1])@:>@.yystate.yyloc]) [yyvsp@{m4_eval([$2 - $1])@}.yystate.yyloc])
## ------------------- ##
## Output file names. ##
## ------------------- ##
m4_define_default([b4_input_suffix], [.y])
m4_define_default([b4_output_parser_suffix],
[m4_translit(b4_input_suffix, [yY], [cC])])
m4_define_default([b4_output_parser_name],
[b4_output_prefix[]b4_output_infix[]b4_output_parser_suffix[]])
m4_define_default([b4_output_header_suffix],
[m4_translit(b4_input_suffix, [yY], [hH])])
m4_define_default([b4_output_header_name],
[b4_output_prefix[]b4_output_infix[]b4_output_header_suffix[]])
m4_define_default([b4_header_guard],
[m4_bpatsubst(m4_toupper([BISON_]b4_output_header_name),
[[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]], [_])])
# We do want M4 expansion after # for CPP macros. # We do want M4 expansion after # for CPP macros.
m4_changecom() m4_changecom()
m4_divert(0)dnl m4_divert(0)dnl
#output "b4_output_parser_name" @output @output_parser_name@
b4_copyright([Skeleton parser for GLR parsing with Bison], [2002]) b4_copyright([Skeleton parser for GLR parsing with Bison], [2002])
[ [
/* This is the parser code for GLR (Generalized LR) parser. */ /* This is the parser code for GLR (Generalized LR) parser. */
@@ -214,7 +189,7 @@ b4_pre_prologue[
[b4_syncline([b4_stype_line], [b4_filename]) [b4_syncline([b4_stype_line], [b4_filename])
typedef union b4_stype yystype; typedef union b4_stype yystype;
/* Line __line__ of __file__. */ /* Line __line__ of __file__. */
b4_syncline([__oline__], [__ofile__])], b4_syncline([@oline@], [@ofile@])],
[typedef int yystype;])[ [typedef int yystype;])[
# define YYSTYPE yystype # define YYSTYPE yystype
# define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_TRIVIAL 1
@@ -234,7 +209,7 @@ typedef struct yyltype
/* Default (constant) values used for initialization for null /* Default (constant) values used for initialization for null
right-hand sides. Unlike the standard bison.simple template, right-hand sides. Unlike the standard bison.simple template,
here we set the default values of the $$ and $@ to zeroed-out here we set the default values of $$ and $@@ to zeroed-out
values. Since the default value of these quantities is undefined, values. Since the default value of these quantities is undefined,
this behavior is technically correct. */ this behavior is technically correct. */
static YYSTYPE yyval_default; static YYSTYPE yyval_default;
@@ -244,7 +219,7 @@ static YYLTYPE yyloc_default;
]b4_post_prologue[ ]b4_post_prologue[
]/* Line __line__ of __file__. */ ]/* Line __line__ of __file__. */
b4_syncline([__oline__], [__ofile__]) b4_syncline([@oline@], [@ofile@])
[ [
#if ! defined (__cplusplus) #if ! defined (__cplusplus)
typedef char bool; typedef char bool;
@@ -615,7 +590,7 @@ yytokenName (yySymbol yytoken)
/** Perform user action for rule number YYN, with RHS length YYRHSLEN, /** Perform user action for rule number YYN, with RHS length YYRHSLEN,
* and top stack item YYVSP. YYLVALP points to place to put semantic * and top stack item YYVSP. YYLVALP points to place to put semantic
* value ($$), and yylocp points to place for location information * value ($$), and yylocp points to place for location information
* (@$). Returns yyok for normal return, yyaccept for YYACCEPT, * (@@$). Returns yyok for normal return, yyaccept for YYACCEPT,
* yyerr for YYERROR, yyabort for YYABORT. */ * yyerr for YYERROR, yyabort for YYABORT. */
static YYRESULTTAG static YYRESULTTAG
yyuserAction (yyRuleNum yyn, int yyrhslen, yyGLRStackItem* yyvsp, yyuserAction (yyRuleNum yyn, int yyrhslen, yyGLRStackItem* yyvsp,
@@ -672,7 +647,7 @@ yyuserAction (yyRuleNum yyn, int yyrhslen, yyGLRStackItem* yyvsp,
# undef yyclearin # undef yyclearin
# undef YYRECOVERING # undef YYRECOVERING
/* Line __line__ of __file__. */ /* Line __line__ of __file__. */
b4_syncline([__oline__], [__ofile__]) b4_syncline([@oline@], [@ofile@])
} }
@@ -1867,7 +1842,7 @@ yy_yypstack (yyGLRState* yys)
yy_yypstack (yys->yypred); yy_yypstack (yys->yypred);
fprintf (stderr, " -> "); fprintf (stderr, " -> ");
} }
fprintf (stderr, "%d@%lu", yys->yylrState, (unsigned long) yys->yyposn); fprintf (stderr, "%d@@%lu", yys->yylrState, (unsigned long) yys->yyposn);
} }
static void static void
@@ -1927,10 +1902,8 @@ yypdumpstack (yyGLRStack* yystack)
b4_epilogue b4_epilogue
m4_if(b4_defines_flag, 0, [], m4_if(b4_defines_flag, 0, [],
[#output "b4_output_header_name" [@output @output_header_name@
b4_copyright([Skeleton parser for GLR parsing with Bison], [2002]) b4_copyright([Skeleton parser for GLR parsing with Bison], [2002])
#ifndef b4_header_guard
# define b4_header_guard
b4_token_defines(b4_tokens) b4_token_defines(b4_tokens)
@@ -1939,9 +1912,10 @@ m4_ifdef([b4_stype],
[b4_syncline([b4_stype_line], [b4_filename]) [b4_syncline([b4_stype_line], [b4_filename])
typedef union b4_stype yystype; typedef union b4_stype yystype;
/* Line __line__ of __file__. */ /* Line __line__ of __file__. */
b4_syncline([__oline__], [__ofile__])], b4_syncline([@oline@], [@ofile@])],
[typedef int yystype;]) [typedef int yystype;])
# define YYSTYPE yystype # define YYSTYPE yystype
# define YYSTYPE_IS_TRIVIAL 1
#endif #endif
b4_pure_if([], b4_pure_if([],
@@ -1962,5 +1936,4 @@ typedef struct yyltype
m4_if(b4_pure, [0], m4_if(b4_pure, [0],
[extern YYLTYPE b4_prefix[]lloc;]) [extern YYLTYPE b4_prefix[]lloc;])
]) ])
#endif /* not b4_header_guard */
]) ])

50
data/yacc.c
View File

@@ -39,7 +39,7 @@ m4_define_default([b4_location_type], [yyltype])
## ------------------------ ## ## ------------------------ ##
# b4_Pure_if(IF-TRUE, IF-FALSE) # b4_pure_if(IF-TRUE, IF-FALSE)
# ----------------------------- # -----------------------------
# Expand IF-TRUE, if %pure-parser and %parse-param, IF-FALSE otherwise. # Expand IF-TRUE, if %pure-parser and %parse-param, IF-FALSE otherwise.
m4_define([b4_Pure_if], m4_define([b4_Pure_if],
@@ -105,7 +105,7 @@ m4_define([b4_lhs_value],
# Expansion of $<TYPE>NUM, where the current rule has RULE-LENGTH # Expansion of $<TYPE>NUM, where the current rule has RULE-LENGTH
# symbols on RHS. # symbols on RHS.
m4_define([b4_rhs_value], m4_define([b4_rhs_value],
[yyvsp@<:@m4_eval([$2 - $1])@:>@m4_ifval([$3], [.$3])]) [yyvsp@{m4_eval([$2 - $1])@}m4_ifval([$3], [.$3])])
@@ -125,32 +125,7 @@ m4_define([b4_lhs_location],
# Expansion of @NUM, where the current rule has RULE-LENGTH symbols # Expansion of @NUM, where the current rule has RULE-LENGTH symbols
# on RHS. # on RHS.
m4_define([b4_rhs_location], m4_define([b4_rhs_location],
[yylsp@<:@m4_eval([$2 - $1])@:>@]) [yylsp@{m4_eval([$2 - $1])@}])
## ------------------- ##
## Output file names. ##
## ------------------- ##
m4_define_default([b4_input_suffix], [.y])
m4_define_default([b4_output_parser_suffix],
[m4_translit(b4_input_suffix, [yY], [cC])])
m4_define_default([b4_output_parser_name],
[b4_output_prefix[]b4_output_infix[]b4_output_parser_suffix[]])
m4_define_default([b4_output_header_suffix],
[m4_translit(b4_input_suffix, [yY], [hH])])
m4_define_default([b4_output_header_name],
[b4_output_prefix[]b4_output_infix[]b4_output_header_suffix[]])
m4_define_default([b4_header_guard],
[m4_bpatsubst(m4_toupper([BISON_]b4_output_header_name),
[[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]], [_])])
@@ -168,7 +143,7 @@ m4_pushdef([b4_at_dollar], [yylocation])dnl
case $4: /* $3 */ case $4: /* $3 */
b4_syncline([$2], [$1]) b4_syncline([$2], [$1])
$5; $5;
b4_syncline([__oline__], [__ofile__]) b4_syncline([@oline@], [@ofile@])
break; break;
m4_popdef([b4_at_dollar])dnl m4_popdef([b4_at_dollar])dnl
m4_popdef([b4_dollar_dollar])dnl m4_popdef([b4_dollar_dollar])dnl
@@ -178,7 +153,7 @@ m4_popdef([b4_dollar_dollar])dnl
# We do want M4 expansion after # for CPP macros. # We do want M4 expansion after # for CPP macros.
m4_changecom() m4_changecom()
m4_divert(0)dnl m4_divert(0)dnl
#output "b4_output_parser_name" @output @output_parser_name@
b4_copyright([Skeleton parser for Yacc-like parsing with Bison], b4_copyright([Skeleton parser for Yacc-like parsing with Bison],
[1984, 1989, 1990, 2000, 2001, 2002]) [1984, 1989, 1990, 2000, 2001, 2002])
@@ -233,7 +208,7 @@ m4_ifdef([b4_stype],
[b4_syncline([b4_stype_line], [b4_filename]) [b4_syncline([b4_stype_line], [b4_filename])
typedef union b4_stype yystype; typedef union b4_stype yystype;
/* Line __line__ of __file__. */ /* Line __line__ of __file__. */
b4_syncline([__oline__], [__ofile__])], b4_syncline([@oline@], [@ofile@])],
[typedef int yystype;]) [typedef int yystype;])
# define YYSTYPE yystype # define YYSTYPE yystype
# define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_TRIVIAL 1
@@ -255,7 +230,7 @@ typedef struct yyltype
b4_post_prologue b4_post_prologue
/* Line __line__ of __file__. */ /* Line __line__ of __file__. */
b4_syncline([__oline__], [__ofile__]) b4_syncline([@oline@], [@ofile@])
#if ! defined (yyoverflow) || YYERROR_VERBOSE #if ! defined (yyoverflow) || YYERROR_VERBOSE
@@ -1054,7 +1029,7 @@ yyreduce:
} }
/* Line __line__ of __file__. */ /* Line __line__ of __file__. */
b4_syncline([__oline__], [__ofile__]) b4_syncline([@oline@], [@ofile@])
[ yyvsp -= yylen; [ yyvsp -= yylen;
yyssp -= yylen; yyssp -= yylen;
@@ -1275,7 +1250,7 @@ yyreturn:
b4_epilogue b4_epilogue
m4_if(b4_defines_flag, 0, [], m4_if(b4_defines_flag, 0, [],
[#output "b4_output_header_name" [@output @output_header_name@
b4_copyright([Skeleton parser for Yacc-like parsing with Bison], b4_copyright([Skeleton parser for Yacc-like parsing with Bison],
[1984, 1989, 1990, 2000, 2001, 2002]) [1984, 1989, 1990, 2000, 2001, 2002])
@@ -1284,9 +1259,6 @@ b4_copyright([Skeleton parser for Yacc-like parsing with Bison],
This special exception was added by the Free Software Foundation This special exception was added by the Free Software Foundation
in version 1.24 of Bison. */ in version 1.24 of Bison. */
#ifndef b4_header_guard
# define b4_header_guard
b4_token_defines(b4_tokens) b4_token_defines(b4_tokens)
#ifndef YYSTYPE #ifndef YYSTYPE
@@ -1294,9 +1266,10 @@ m4_ifdef([b4_stype],
[b4_syncline([b4_stype_line], [b4_filename]) [b4_syncline([b4_stype_line], [b4_filename])
typedef union b4_stype yystype; typedef union b4_stype yystype;
/* Line __line__ of __file__. */ /* Line __line__ of __file__. */
b4_syncline([__oline__], [__ofile__])], b4_syncline([@oline@], [@ofile@])],
[typedef int yystype;]) [typedef int yystype;])
# define YYSTYPE yystype # define YYSTYPE yystype
# define YYSTYPE_IS_TRIVIAL 1
#endif #endif
b4_pure_if([], b4_pure_if([],
@@ -1317,5 +1290,4 @@ typedef struct yyltype
m4_if(b4_pure, [0], m4_if(b4_pure, [0],
[extern YYLTYPE b4_prefix[]lloc;]) [extern YYLTYPE b4_prefix[]lloc;])
]) ])
#endif /* not b4_header_guard */
]) ])