diff options
| author | Fred Fish <fnf@specifix.com> | 1992-12-31 19:08:08 +0000 |
|---|---|---|
| committer | Fred Fish <fnf@specifix.com> | 1992-12-31 19:08:08 +0000 |
| commit | 19d0f3f41df4654c842e29c9c09f58dd3ddf9951 (patch) | |
| tree | f475cef93c1740bf9f7d8587a7aded1774ce80e6 /gdb/m2-exp.y | |
| parent | 8a1c3e99492d67497a338ce1efd71bb169bd85e5 (diff) | |
| download | ppe42-binutils-19d0f3f41df4654c842e29c9c09f58dd3ddf9951.tar.gz ppe42-binutils-19d0f3f41df4654c842e29c9c09f58dd3ddf9951.zip | |
* Makefile.in (BISON): Add comment that when bison is used, it
must include the "-y" option.
* c-exp.y, m2-exp.y (yyrule, yyname, yyss, yyssp, yyvs, yyvsp):
Remove defines to remap non-yacc symbols, thus backing out of
previous recent changes. Standard policy is that non-yacc parser
generators get fixed, rather than adding bug workarounds in gdb
for each new one that pops up. Expand comment to note this.
* c-exp.y, m2-exp.y (YYDEBUG): Revert back to disabled by default.
Diffstat (limited to 'gdb/m2-exp.y')
| -rw-r--r-- | gdb/m2-exp.y | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/gdb/m2-exp.y b/gdb/m2-exp.y index 0132e033c3..f3ced60ac5 100644 --- a/gdb/m2-exp.y +++ b/gdb/m2-exp.y @@ -45,9 +45,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "parser-defs.h" #include "m2-lang.h" -/* These MUST be included in any grammar file!!!! Please choose unique names! - Note that this are a combined list of variables that can be produced - by any one of bison, byacc, or yacc. */ +/* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc), + as well as gratuitiously global symbol names, so we can have multiple + yacc generated parsers in gdb. Note that these are only the variables + produced by yacc. If other parser generators (bison, byacc, etc) produce + additional global names that conflict at link time, then those parser + generators need to be fixed instead of adding those names to this list. */ + #define yymaxdepth m2_maxdepth #define yyparse m2_parse #define yylex m2_lex @@ -75,22 +79,15 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #define yy_yyv m2_yyv #define yyval m2_val #define yylloc m2_lloc -#define yyrule m2_rule /* With YYDEBUG defined, byacc */ -#define yyname m2_name /* With YYDEBUG defined, byacc */ #define yyreds m2_reds /* With YYDEBUG defined */ #define yytoks m2_toks /* With YYDEBUG defined */ -#define yyss m2_yyss /* byacc */ -#define yyssp m2_yysp /* byacc */ -#define yyvs m2_yyvs /* byacc */ -#define yyvsp m2_yyvsp /* byacc */ -#if 0 -static char * -make_qualname PARAMS ((char *, char *)); +#ifndef YYDEBUG +#define YYDEBUG 0 /* Default to no yydebug support */ #endif -static int -parse_number PARAMS ((int)); +int +yyparse PARAMS ((void)); static int yylex PARAMS ((void)); @@ -98,8 +95,13 @@ yylex PARAMS ((void)); void yyerror PARAMS ((char *)); -int -yyparse PARAMS ((void)); +#if 0 +static char * +make_qualname PARAMS ((char *, char *)); +#endif + +static int +parse_number PARAMS ((int)); /* The sign of the number being parsed. */ static int number_sign = 1; @@ -110,10 +112,6 @@ static int number_sign = 1; static struct block *modblock=0; #endif -#if MAINTENANCE_CMDS -#define YYDEBUG 1 -#endif - %} /* Although the yacc "value" of an expression is not used, |
