10-fyi-prefix.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * 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?
        
        
Index: src/files.c
--- src/files.c Sat, 08 Dec 2001 13:24:47 +0100 akim
+++ src/files.c Sat, 08 Dec 2001 17:08:38 +0100 akim
@@ -37,7 +37,7 @@
 
 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. */
Index: src/files.h
--- src/files.h Fri, 28 Sep 2001 09:33:42 +0200 akim
+++ src/files.h Sat, 08 Dec 2001 17:08:45 +0100 akim
@@ -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;
Index: src/getargs.h
--- src/getargs.h Sat, 08 Dec 2001 13:24:47 +0100 akim
+++ src/getargs.h Sat, 08 Dec 2001 17:09:51 +0100 akim
@@ -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 */
 
Index: src/muscle_tab.c
--- src/muscle_tab.c Sat, 08 Dec 2001 16:17:06 +0100 akim
+++ src/muscle_tab.c Sat, 08 Dec 2001 16:18:17 +0100 akim
@@ -85,7 +85,7 @@
   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");
 
Index: src/output.c
--- src/output.c Sat, 08 Dec 2001 15:51:17 +0100 akim
+++ src/output.c Sat, 08 Dec 2001 16:18:32 +0100 akim
@@ -1034,6 +1034,7 @@
   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 @@
   obstack_1grow (&action_obstack, 0);
   muscle_insert ("action", obstack_finish (&action_obstack));
 
-  if (spec_name_prefix)
-    MUSCLE_INSERT_STRING ("prefix", spec_name_prefix);
 }
 
 /*----------------------------------------------------------.
Index: src/print.c
--- src/print.c Sat, 08 Dec 2001 13:33:23 +0100 akim
+++ src/print.c Sat, 08 Dec 2001 16:20:01 +0100 akim
@@ -318,7 +318,7 @@
     {
       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");
 
Index: src/reader.c
--- src/reader.c Sat, 08 Dec 2001 16:12:03 +0100 akim
+++ src/reader.c Sat, 08 Dec 2001 17:07:59 +0100 akim
@@ -1914,15 +1914,8 @@
       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;
Index: src/vmsgetargs.c
--- src/vmsgetargs.c Sat, 11 Nov 2000 16:04:34 +0100 akim
+++ src/vmsgetargs.c Sat, 08 Dec 2001 17:13:12 +0100 akim
@@ -37,10 +37,6 @@
 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[];