FYI: [bison-1_29-branch] turn_off_percent_ext.patch

[marc-alexandre autret]

Hi,

We turn off %{header,src}_extension features.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/bison/bison/ChangeLog,v
retrieving revision 1.173.2.31
diff -u -r1.173.2.31 ChangeLog
--- ChangeLog   2001/09/10 09:59:39     1.173.2.31
+++ ChangeLog   2001/09/17 22:08:21
@@ -1,3 +1,18 @@
+2001-09-18  Marc Autret  <address@hidden>
+
+       Turn off %{source,header}_extension feature.
+       
+       * src/files.c (compute_exts_from_gf): Update.
+       (compute_exts_from_src): Update.
+       (output_files): CPP-out useless code.
+       * src/files.h: Remove {header,source}_extension extern declarations.
+       * src/reader.c (parse_dquoted_param): CPP-out.
+       (parse_header_extension_decl): Remove.
+       (parse_source_extension_decl): Remove.
+       (read_declarations): Remove cases tok_{hdrext,srcext}.
+       * src/lex.c (percent_table): Remove {header,source}_extension entries.
+       * src/lex.h (token_t): Remove tok_hdrext and tok_srcext.
+
 2001-09-10  Akim Demaille  <address@hidden>
 
        * tests/output.at (AT_CHECK_BISON_FLAGS, AT_CHECK_BISON_PERCENT):
Index: src/files.c
===================================================================
RCS file: /cvsroot/bison/bison/src/files.c,v
retrieving revision 1.51
diff -u -r1.51 files.c
--- src/files.c 2001/08/15 08:53:15     1.51
+++ src/files.c 2001/09/17 22:08:21
@@ -260,20 +260,10 @@
 static void
 compute_exts_from_gf (const char *ext)
 {
-  /* Checks if SRC_EXTENSION is NULL. In the other case, %source_extension
-     was specified in the grammar file.  */
-  if (src_extension == NULL)
-    {
-      src_extension = tr (ext, 'y', 'c');
-      src_extension = tr (src_extension, 'Y', 'C');
-    }
-  /* Checks if HEADER_EXTENSION is NULL. In the other case,
-     %header_extension was specified in the grammar file.  */
-  if (header_extension == NULL)
-    {
-      header_extension = tr (ext, 'y', 'h');
-      header_extension = tr (header_extension, 'Y', 'H');
-    }
+  src_extension = tr (ext, 'y', 'c');
+  src_extension = tr (src_extension, 'Y', 'C');
+  header_extension = tr (ext, 'y', 'h');
+  header_extension = tr (header_extension, 'Y', 'H');
 }
 
 /* Computes extensions from the given c source file extension. */
@@ -428,11 +418,13 @@
 
   compute_base_names ();
 
+#if 0
   /* Set default extensions */
   if (!src_extension)
     src_extension = ".c";
   if (!header_extension)
     header_extension = ".h";
+#endif
 
   attrsfile = stringappend (short_base_name, EXT_STYPE_H);
 #ifndef MSDOS
Index: src/files.h
===================================================================
RCS file: /cvsroot/bison/bison/src/files.h,v
retrieving revision 1.18
diff -u -r1.18 files.h
--- src/files.h 2001/08/06 09:22:33     1.18
+++ src/files.h 2001/09/17 22:08:21
@@ -62,9 +62,6 @@
 extern char *infile;
 extern char *attrsfile;
 
-extern const char *src_extension;
-extern const char *header_extension;
-
 void open_files PARAMS((void));
 
 void output_files PARAMS((void));
Index: src/lex.c
===================================================================
RCS file: /cvsroot/bison/bison/src/lex.c,v
retrieving revision 1.33.2.2
diff -u -r1.33.2.2 lex.c
--- src/lex.c   2001/09/10 08:33:25     1.33.2.2
+++ src/lex.c   2001/09/17 22:08:22
@@ -555,8 +555,6 @@
   { "file_prefix",     &spec_file_prefix,      tok_setopt },   /* -b */
   { "name_prefix",     &spec_name_prefix,      tok_setopt },   /* -p */
 #endif
-  { "header_extension",        NULL,                   tok_hdrext },
-  { "source_extension",        NULL,                   tok_srcext },
   { "verbose",         &verbose_flag,          tok_noop },     /* -v */
   { "debug",           &debug_flag,            tok_noop },     /* -t */
   { "semantic_parser", &semantic_parser,       tok_noop },
Index: src/reader.c
===================================================================
RCS file: /cvsroot/bison/bison/src/reader.c,v
retrieving revision 1.72.2.3
diff -u -r1.72.2.3 reader.c
--- src/reader.c        2001/09/10 08:33:25     1.72.2.3
+++ src/reader.c        2001/09/17 22:08:22
@@ -874,10 +874,14 @@
   nsyms--;
 }
 
-/*--------------------------------------------------------------.
-| Parse what comes after %header_extension and %source_etension |
-`--------------------------------------------------------------*/
 
+/*-----------------------------------------------------------------------------.
+| Parse a double quoted parameter. It was used for %{source,header}_extension. 
|
+| For the moment, It is not used since extension features have been removed.   
|
+`-----------------------------------------------------------------------------*/
+
+#if 0
+
 static const char *
 parse_dquoted_param (const char *from)
 {
@@ -921,26 +925,9 @@
 
   return xstrdup (buff);
 }
-
-/* %header_extension case.  */
-static void
-parse_header_extension_decl (void)
-{
-  if (header_extension)
-    complain (_("multiple %%header_extension declarations"));
-
-  header_extension = parse_dquoted_param ("%header_extension");
-}
 
-/* %source_extension case.  */
-static void
-parse_source_extension_decl (void)
-{
-  if (src_extension)
-    complain (_("multiple %%source_extension declarations"));
+#endif
 
-  src_extension = parse_dquoted_param ("%source_extension");
-}
 
 /*----------------------------------------------------------------.
 | Read from finput until `%%' is seen.  Discard the `%%'.  Handle |
@@ -1009,14 +996,6 @@
 
            case tok_nonassoc:
              parse_assoc_decl (non_assoc);
-             break;
-
-           case tok_hdrext:
-             parse_header_extension_decl ();
-             break;
-
-           case tok_srcext:
-             parse_source_extension_decl ();
              break;
 
            case tok_noop:


-- 
Autret Marc (address@hidden)
Eleve Ingenieur en Informatique.