[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
32-fyi-name-prefix-fix.patch
From: |
Akim Demaille |
Subject: |
32-fyi-name-prefix-fix.patch |
Date: |
Sat, 29 Dec 2001 15:15:53 +0100 |
Index: ChangeLog
from Akim Demaille <address@hidden>
%name-prefix is broken.
* src/files.c (spec_name_prefix): Initialize to NULL, not to "yy".
Adjust all dependencies.
* tests/headers.at (export YYLTYPE): Strengthen this test: use
%name-prefix.
Renaming yylval but not yylloc is not consistent. Now we do.
* src/bison.simple: Prefix yylloc if used.
* doc/bison.texinfo (Decl Summary): Document that.
Index: doc/bison.texinfo
--- doc/bison.texinfo Sat, 29 Dec 2001 13:47:42 +0100 akim
+++ doc/bison.texinfo Sat, 29 Dec 2001 13:47:57 +0100 akim
@@ -3289,10 +3289,10 @@ directives:
Rename the external symbols used in the parser so that they start with
@var{prefix} instead of @samp{yy}. The precise list of symbols renamed
is @code{yyparse}, @code{yylex}, @code{yyerror}, @code{yynerrs},
address@hidden, @code{yychar} and @code{yydebug}. For example, if you
-use @samp{%name-prefix="c_"}, the names become @code{c_parse},
address@hidden, and so on. @xref{Multiple Parsers, ,Multiple Parsers in
-the Same Program}.
address@hidden, @code{yychar}, @code{yydebug}, and possible
address@hidden For example, if you use @samp{%name-prefix="c_"}, the
+names become @code{c_parse}, @code{c_lex}, and so on. @xref{Multiple
+Parsers, ,Multiple Parsers in the Same Program}.
@item %no-parser
Do not include any C code in the parser file; generate tables only. The
Index: src/bison.simple
--- src/bison.simple Sat, 29 Dec 2001 12:06:57 +0100 akim
+++ src/bison.simple Sat, 29 Dec 2001 13:47:57 +0100 akim
@@ -40,7 +40,7 @@
/* Using locations. */
#define YYLSP_NEEDED %%locations-flag
-/* If name_prefix is specify substitute the variables and functions
+/* If NAME_PREFIX is specified substitute the variables and functions
names. */
#define yyparse %%prefix##parse
#define yylex %%prefix##lex
@@ -49,6 +49,10 @@
#define yychar %%prefix##char
#define yydebug %%prefix##debug
#define yynerrs %%prefix##nerrs
+#if YYLSP_NEEDED
+# define yylloc %%prefix##lloc
+#endif
+
/* Copy the user declarations. */
%%prologue
Index: src/files.c
--- src/files.c Wed, 26 Dec 2001 19:41:07 +0100 akim
+++ src/files.c Sat, 29 Dec 2001 13:47:57 +0100 akim
@@ -32,9 +32,16 @@
struct obstack attrs_obstack;
struct obstack output_obstack;
+/* Initializing some values below (such SPEC_NAME_PREFIX to `yy') is
+ tempting, but don't do that: for the time being our handling of the
+ %directive vs --option leaves precedence to the options by deciding
+ that if a %directive sets a variable which is really set (i.e., not
+ NULL), then the %directive is ignored. As a result, %name-prefix,
+ for instance, will not be honored. */
+
char *spec_outfile = NULL; /* for -o. */
char *spec_file_prefix = NULL; /* for -b. */
-const char *spec_name_prefix = "yy"; /* for -p. */
+const char *spec_name_prefix = NULL; /* for -p. */
char *spec_verbose_file = NULL; /* for --verbose. */
char *spec_graph_file = NULL; /* for -g. */
char *spec_defines_file = NULL; /* for --defines. */
Index: src/output.c
--- src/output.c Sat, 29 Dec 2001 10:06:57 +0100 akim
+++ src/output.c Sat, 29 Dec 2001 13:47:57 +0100 akim
@@ -1075,7 +1075,8 @@
#define MUSCLE_INSERT_PREFIX(Key, Value) \
{ \
- obstack_fgrow2 (&muscle_obstack, "%s%s", spec_name_prefix, Value); \
+ obstack_fgrow2 (&muscle_obstack, "%s%s", \
+ spec_name_prefix ? spec_name_prefix : "yy", Value); \
obstack_1grow (&muscle_obstack, 0); \
muscle_insert (Key, obstack_finish (&muscle_obstack)); \
}
@@ -1091,7 +1092,7 @@
MUSCLE_INSERT_INT ("final", final_state);
MUSCLE_INSERT_INT ("maxtok", max_user_token_number);
MUSCLE_INSERT_INT ("error-verbose", error_verbose);
- MUSCLE_INSERT_STRING ("prefix", spec_name_prefix);
+ MUSCLE_INSERT_STRING ("prefix", spec_name_prefix ? spec_name_prefix : "yy");
MUSCLE_INSERT_INT ("nnts", nvars);
MUSCLE_INSERT_INT ("nrules", nrules);
@@ -1127,7 +1128,7 @@
if (!pure_parser)
fprintf (out, "\nextern YYSTYPE %slval;\n",
- spec_name_prefix);
+ spec_name_prefix ? spec_name_prefix : "yy");
if (locations_flag)
{
@@ -1145,7 +1146,7 @@
#endif\n");
if (!pure_parser)
fprintf (out, "\nextern YYLTYPE %slloc;\n",
- spec_name_prefix);
+ spec_name_prefix ? spec_name_prefix : "yy");
}
if (semantic_parser)
Index: tests/headers.at
--- tests/headers.at Sat, 29 Dec 2001 10:06:57 +0100 akim
+++ tests/headers.at Sat, 29 Dec 2001 13:47:57 +0100 akim
@@ -82,18 +82,20 @@ dummy:
AT_DATA([input.y],
[%locations
+
+%name-prefix="my_"
%{
#include <stdio.h>
#include <stdlib.h>
static int
-yylex (void)
+my_lex (void)
{
return EOF;
}
static void
-yyerror (const char *msg)
+my_error (const char *msg)
{
fprintf (stderr, "%s\n", msg);
}
@@ -105,22 +107,22 @@ exp:;
AT_CHECK([bison --defines input.y -o input.c])
-# YYLTYPE should be defined, and YYLLOC declared.
+# YYLTYPE should be defined, and MY_LLOC declared.
AT_DATA([caller.c],
[[#include "input.h"
-YYLTYPE *yyllocp = &yylloc;
+YYLTYPE *my_llocp = &my_lloc;
-int yyparse (void);
+int my_parse (void);
int
main (void)
{
- return yyparse ();
+ return my_parse ();
}
]])
# Link and execute, just to make sure everything is fine (and in
-# particular, that YYLLOC is indeed defined somewhere).
+# particular, that MY_LLOC is indeed defined somewhere).
AT_CHECK([$CC $CFLAGS $CPPFLAGS caller.c input.c -o caller], 0, [], [ignore])
AT_CHECK([caller])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- 32-fyi-name-prefix-fix.patch,
Akim Demaille <=