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.

diff --git a/ChangeLog b/ChangeLog
index 3465cc6d7971dec1cb52fa083db1bc88e5462b4b..13b1dd61fa9e4d25d9da84c06243cb62b6275d6c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2001-09-18  Marc Autret  <autret_m@epita.fr>
+
+       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  <akim@epita.fr>
 
        * tests/output.at (AT_CHECK_BISON_FLAGS, AT_CHECK_BISON_PERCENT):
 2001-09-10  Akim Demaille  <akim@epita.fr>
 
        * tests/output.at (AT_CHECK_BISON_FLAGS, AT_CHECK_BISON_PERCENT):

diff --git a/src/files.c b/src/files.c
index 6bf301f906ec9936dda005792ae9afd8c75ac269..35cd872dd43d83083b47bc8834f2b41cabc31f96 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -260,20 +260,10 @@ get_extension_index (const char *filename)
 static void
 compute_exts_from_gf (const char *ext)
 {
 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. */
 }
 
 /* Computes extensions from the given c source file extension. */


@@ -428,11 +418,13 @@ output_files (void)
 
   compute_base_names ();
 
 
   compute_base_names ();
 

+#if 0

   /* Set default extensions */
   if (!src_extension)
     src_extension = ".c";
   if (!header_extension)
     header_extension = ".h";
   /* 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
 
   attrsfile = stringappend (short_base_name, EXT_STYPE_H);
 #ifndef MSDOS

diff --git a/src/files.h b/src/files.h
index 3c1b2f064a79fe73f873394083520bfefedbc66a..7ffaf9580e149bb6e84e1aba4934e7bca1a6dc15 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -62,9 +62,6 @@ extern struct obstack graph_obstack;
 extern char *infile;
 extern char *attrsfile;
 
 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));
 void open_files PARAMS((void));
 
 void output_files PARAMS((void));

diff --git a/src/lex.c b/src/lex.c
index b8846ba9cf45dbfa506265acd89cfa82f919d763..cbb7f27846cd4982448cbcd70013113993383312 100644 (file)
--- a/src/lex.c
+++ b/src/lex.c
@@ -555,8 +555,6 @@ struct percent_table_struct percent_table[] =
   { "file_prefix",     &spec_file_prefix,      tok_setopt },   /* -b */
   { "name_prefix",     &spec_name_prefix,      tok_setopt },   /* -p */
 #endif
   { "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 },
   { "verbose",         &verbose_flag,          tok_noop },     /* -v */
   { "debug",           &debug_flag,            tok_noop },     /* -t */
   { "semantic_parser", &semantic_parser,       tok_noop },

diff --git a/src/reader.c b/src/reader.c
index b4dcea070bb24af24494536c0707400ae79defbc..52ed614502aa5a2b84011e7f4e1a3713144f76de 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -874,9 +874,13 @@ parse_thong_decl (void)
   nsyms--;
 }
 
   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)
 
 static const char *
 parse_dquoted_param (const char *from)


@@ -922,25 +926,8 @@ parse_dquoted_param (const char *from)
   return xstrdup (buff);
 }
 
   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 |
 
 /*----------------------------------------------------------------.
 | Read from finput until `%%' is seen.  Discard the `%%'.  Handle |


@@ -1011,14 +998,6 @@ read_declarations (void)
              parse_assoc_decl (non_assoc);
              break;
 
              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:
              break;
 
            case tok_noop:
              break;