%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.

diff --git a/ChangeLog b/ChangeLog
index 01e0d27ce3d796a703e7b9fd2e3b178419f63d2e..a2acb31c26dbd0385386a3aefe1f832d565139e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2001-12-29  Akim Demaille  <akim@epita.fr>
+
+       %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.
+
+       

 2001-12-29  Akim Demaille  <akim@epita.fr>
 
        * doc/bison.texinfo: Promote `%long-directive' over
 2001-12-29  Akim Demaille  <akim@epita.fr>
 
        * doc/bison.texinfo: Promote `%long-directive' over

diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index eb722d38dbbc8fa189d6f8d1496543a6ade82b18..f4360cd3cf8da01c02da46a6b60ac68daec6e720 100644 (file)
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -3289,10 +3289,10 @@ accurate parse error messages.
 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},
 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},

-@code{yylval}, @code{yychar} and @code{yydebug}.  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}.
+@code{yylval}, @code{yychar}, @code{yydebug}, and possible
+@code{yylloc}.  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
 
 @item %no-parser
 Do not include any C code in the parser file; generate tables only.  The

diff --git a/src/bison.simple b/src/bison.simple
index 3c58fc92c1339abb3daa79ea8e75ce6a1477f0fc..57190178353f8290b8cd76c749d601259c667049 100644 (file)
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -40,7 +40,7 @@
 /* Using locations.  */
 #define YYLSP_NEEDED %%locations-flag
 
 /* 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
    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
 #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
 
 /* Copy the user declarations.  */
 %%prologue

diff --git a/src/files.c b/src/files.c
index 0b958c1ae40d4c0a8414cdab91ce6e88df20f84f..dc886a0bf6a5aaac738621776e828b2098785a59 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -32,9 +32,16 @@ struct obstack action_obstack;
 struct obstack attrs_obstack;
 struct obstack output_obstack;
 
 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. */
 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. */
 char *spec_verbose_file = NULL;   /* for --verbose. */
 char *spec_graph_file = NULL;   /* for -g. */
 char *spec_defines_file = NULL; /* for --defines. */

diff --git a/src/output.c b/src/output.c
index 4b1f999ea99eef3507ad95711bb75106f6107c5c..34d6b06ae840305bd98bcf1547af8b41e3a25eb3 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -1075,7 +1075,8 @@ output_master_parser (void)
 
 #define MUSCLE_INSERT_PREFIX(Key, Value)                               \
 {                                                                      \
 
 #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));               \
 }
   obstack_1grow (&muscle_obstack, 0);                                  \
   muscle_insert (Key, obstack_finish (&muscle_obstack));               \
 }


@@ -1091,7 +1092,7 @@ prepare (void)
   MUSCLE_INSERT_INT ("final", final_state);
   MUSCLE_INSERT_INT ("maxtok", max_user_token_number);
   MUSCLE_INSERT_INT ("error-verbose", error_verbose);
   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);
 
   MUSCLE_INSERT_INT ("nnts", nvars);
   MUSCLE_INSERT_INT ("nrules", nrules);


@@ -1127,7 +1128,7 @@ yystype;\n\
 
   if (!pure_parser)
     fprintf (out, "\nextern YYSTYPE %slval;\n",
 
   if (!pure_parser)
     fprintf (out, "\nextern YYSTYPE %slval;\n",

-            spec_name_prefix);
+            spec_name_prefix ? spec_name_prefix : "yy");

 
   if (locations_flag)
     {
 
   if (locations_flag)
     {


@@ -1145,7 +1146,7 @@ typedef struct yyltype\n\
 #endif\n");
       if (!pure_parser)
        fprintf (out, "\nextern YYLTYPE %slloc;\n",
 #endif\n");
       if (!pure_parser)
        fprintf (out, "\nextern YYLTYPE %slloc;\n",

-                spec_name_prefix);
+                spec_name_prefix ? spec_name_prefix : "yy");

     }
 
   if (semantic_parser)
     }
 
   if (semantic_parser)

diff --git a/tests/headers.at b/tests/headers.at
index 5e2facb492c65e2d44bf98a652a7431e28317599..3f8ea961796a8939ab38057cc22a48b0300695ea 100644 (file)
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -82,18 +82,20 @@ AT_SETUP([export YYLTYPE])
 
 AT_DATA([input.y],
 [%locations
 
 AT_DATA([input.y],
 [%locations

+
+%name-prefix="my_"

 %{
 #include <stdio.h>
 #include <stdlib.h>
 
 static int
 %{
 #include <stdio.h>
 #include <stdlib.h>
 
 static int

-yylex (void)
+my_lex (void)

 {
   return EOF;
 }
 
 static void
 {
   return EOF;
 }
 
 static void

-yyerror (const char *msg)
+my_error (const char *msg)

 {
   fprintf (stderr, "%s\n", msg);
 }
 {
   fprintf (stderr, "%s\n", msg);
 }


@@ -105,22 +107,22 @@ exp:;
 
 AT_CHECK([bison --defines input.y -o input.c])
 
 
 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"
 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)
 {
 
 int
 main (void)
 {

-  return yyparse ();
+  return my_parse ();

 }
 ]])
 
 # Link and execute, just to make sure everything is fine (and in
 }
 ]])
 
 # 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])
 
 AT_CHECK([$CC $CFLAGS $CPPFLAGS caller.c input.c -o caller], 0, [], [ignore])
 AT_CHECK([caller])