* src/getargs.h: Don't declare `spec_name_prefix' and

`spec_file_prefix', declared by src/files.h.
* src/files.c, src/files.h: Default for spec_name_prefix is "yy".
* src/muscle_tab.c (muscle_init): Default prefix to NULL.
* src/output.c (prepare): Adjust.
* src/reader.c (symbols_output): Likewise.
* src/vmsgetargs.c: Vaguely adjust, but who cares?

diff --git a/ChangeLog b/ChangeLog
index d4ddec2c56b819a7fc4a2983530817dd98ce92db..dbf340ac37b46d216f63472f47e0b3ed9b89caf2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-12-10  Akim Demaille  <akim@epita.fr>
+
+       * src/getargs.h: Don't declare `spec_name_prefix' and
+       `spec_file_prefix', declared by src/files.h.
+       * src/files.c, src/files.h: Default for spec_name_prefix is "yy".
+       * src/muscle_tab.c (muscle_init): Default prefix to NULL.
+       * src/output.c (prepare): Adjust.
+       * src/reader.c (symbols_output): Likewise.
+       * src/vmsgetargs.c: Vaguely adjust, but who cares?
+
+       
 2001-12-10  Akim Demaille  <akim@epita.fr>
 
        * src/muscle_tab.c (muscle_init): NULL is a better default than

diff --git a/src/files.c b/src/files.c
index d86415216c41cedb7741c973f12addd8dbaf5987..fa31b0327fad890827c0d7d4b0c35b5da8253bea 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -37,7 +37,7 @@ struct obstack output_obstack;
 
 char *spec_outfile = NULL;     /* for -o. */
 char *spec_file_prefix = NULL; /* for -b. */
-char *spec_name_prefix = NULL; /* for -p. */
+const char *spec_name_prefix = "yy";   /* for -p. */
 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/files.h b/src/files.h
index fa99d6aa058f3994a21d24a2c67d2e7c26c1b88b..2ef0a4ad66e3aa261f081a98a56f1ec10da76470 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -28,7 +28,7 @@
 extern char *spec_outfile;
 
 /* For -a. */
-extern char *spec_name_prefix;
+extern const char *spec_name_prefix;
 
 /* File name pfx specified with -b, or 0 if no -b.  */
 extern char *spec_file_prefix;

diff --git a/src/getargs.h b/src/getargs.h
index 5eef6404e30dd9b4d7967b4394a66d2d13aeedcc..5559517221482569c640ebdffcb38adc3f96e3ee 100644 (file)
--- a/src/getargs.h
+++ b/src/getargs.h
@@ -22,8 +22,6 @@
 # define GETARGS_H_
 
 /* flags set by % directives */
-extern char *spec_file_prefix;         /* for -b */
-extern char *spec_name_prefix;         /* for -p */
 extern const char *skeleton;           /* for -S */
 extern const char *include;            /* for -I */
 

diff --git a/src/muscle_tab.c b/src/muscle_tab.c
index c2ac3876ea40e51869e85281042e4472dea5aad9..53f83e464b73d72cb4f39619f77595fbe2e59f4c 100644 (file)
--- a/src/muscle_tab.c
+++ b/src/muscle_tab.c
@@ -85,7 +85,7 @@ muscle_init (void)
   muscle_insert ("maxtok", NULL);
   muscle_insert ("ntbase", NULL);
   muscle_insert ("error-verbose", NULL);
-  muscle_insert ("prefix", "yy");
+  muscle_insert ("prefix", NULL);
   /* Default #line formatting.  */
   muscle_insert ("linef", "#line %d %s\n");
 

diff --git a/src/output.c b/src/output.c
index cf5c05939acaeefa44055d980cd4a4d43f8f71fd..17b4d914081948668235ea5ecd03ddcf865d1410 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -1034,6 +1034,7 @@ prepare (void)
   MUSCLE_INSERT_INT ("maxtok", max_user_token_number);
   MUSCLE_INSERT_INT ("ntbase", ntokens);
   MUSCLE_INSERT_INT ("error-verbose", error_verbose);
+  MUSCLE_INSERT_STRING ("prefix", spec_name_prefix);
 
   MUSCLE_INSERT_INT ("nnts", nvars);
   MUSCLE_INSERT_INT ("nrules", nrules);
@@ -1046,8 +1047,6 @@ prepare (void)
   obstack_1grow (&action_obstack, 0);
   muscle_insert ("action", obstack_finish (&action_obstack));
 
-  if (spec_name_prefix)
-    MUSCLE_INSERT_STRING ("prefix", spec_name_prefix);
 }
 
 /*----------------------------------------------------------.

diff --git a/src/print.c b/src/print.c
index e80b5239e9c28e95c0a52d1b48e04dca6da888ba..013b57804c8ec6f1906d588a89bbf221ed7741f9 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -318,7 +318,7 @@ print_results (void)
     {
       int i;
 
-      /* We used to use just .out if spec_name_prefix (-p) was used, but
+      /* We used to use just .out if SPEC_NAME_PREFIX (-p) was used, but
         that conflicts with Posix.  */
       FILE *out = xfopen (spec_verbose_file, "w");
 

diff --git a/src/reader.c b/src/reader.c
index cb013b207b3e4eef56b403e9d90f402d6247a041..3e901c4bca9ceab11cfbd6d8736408748e75588e 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -1914,15 +1914,8 @@ symbols_output (void)
       output_token_defines (&defines_obstack);
 
       if (!pure_parser)
-       {
-         if (spec_name_prefix)
-           obstack_fgrow1 (&defines_obstack, "\nextern YYSTYPE %slval;\n",
-                           spec_name_prefix);
-         else
-           obstack_sgrow (&defines_obstack,
-                                "\nextern YYSTYPE yylval;\n");
-       }
-
+       obstack_fgrow1 (&defines_obstack, "\nextern YYSTYPE %slval;\n",
+                       spec_name_prefix);
       if (semantic_parser)
        {
          int i;

diff --git a/src/vmsgetargs.c b/src/vmsgetargs.c
index d3427304333ef587a27be755cf912f312aaaf72f..e5faa5ad05c72cf34f329d5f371709f67e1e941d 100644 (file)
--- a/src/vmsgetargs.c
+++ b/src/vmsgetargs.c
@@ -37,10 +37,6 @@ extern int raw_flag;
 extern int yacc_flag;
 extern char * version_string;
 
-/* Allocate storgate and initialize, since bison uses them elsewhere.  */
-char *spec_name_prefix;
-char *spec_file_prefix;
-
 getargs(argc,argv)
      int argc;
      char *argv[];