* src/scan-skel.l: Use a couple of asserts.

diff --git a/ChangeLog b/ChangeLog
index 2b829bacdebe25a1f6057575d9a8127f9cf855db..2712c547f79052b28b059cec7450ff13f692fadc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-09  Akim Demaille  <akim@epita.fr>
+
+       * src/scan-skel.l: Use a couple of asserts.
+

 2005-11-03  Akim Demaille  <akim@epita.fr>
 
        In some (weird) cases, the final state number is incorrect.
 2005-11-03  Akim Demaille  <akim@epita.fr>
 
        In some (weird) cases, the final state number is incorrect.

diff --git a/src/scan-skel.l b/src/scan-skel.l
index e3a5eabd437d2c95158247b6d1dd5b18bb9b6eb5..b14fb40c1f5e467de957a116e2cbe89e6267c35c 100644 (file)
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -41,6 +41,9 @@
 #define QPUTS(String) \
    fputs (quotearg_style (c_quoting_style, (String)), yyout)
 
 #define QPUTS(String) \
    fputs (quotearg_style (c_quoting_style, (String)), yyout)
 

+#define BASE_QPUTS(File) \
+   assert (File), QPUTS (base_name (File))
+

 %}
 %%
 
 %}
 %%
 


@@ -60,13 +63,18 @@
   if (*file_name == '@')
     {
       if (strcmp (file_name, "@output_header_name@") == 0)
   if (*file_name == '@')
     {
       if (strcmp (file_name, "@output_header_name@") == 0)

-       file_name = spec_defines_file;
+       {
+         assert (spec_defines_file);
+         file_name = spec_defines_file;
+       }

       else if (strcmp (file_name, "@output_parser_name@") == 0)
       else if (strcmp (file_name, "@output_parser_name@") == 0)

-       file_name = parser_file_name;
+       {
+         assert (parser_file_name);
+         file_name = parser_file_name;
+       }

       else
        fatal ("invalid token in skeleton: %s", yytext);
     }
       else
        fatal ("invalid token in skeleton: %s", yytext);
     }

-

   if (outname)
     {
       free (outname);
   if (outname)
     {
       free (outname);


@@ -84,8 +92,8 @@
 "@oline@"  fprintf (yyout, "%d", lineno + 1);
 "@ofile@"  QPUTS (outname);
 "@dir_prefix@" QPUTS (dir_prefix);
 "@oline@"  fprintf (yyout, "%d", lineno + 1);
 "@ofile@"  QPUTS (outname);
 "@dir_prefix@" QPUTS (dir_prefix);

-"@output_parser_name@" QPUTS (base_name (parser_file_name));
-"@output_header_name@" QPUTS (base_name (spec_defines_file));
+"@output_parser_name@" BASE_QPUTS (parser_file_name);
+"@output_header_name@" BASE_QPUTS (spec_defines_file);

 
   /* This pattern must not match more than the previous @ patterns. */
 @[^{}@\n]* fatal ("invalid @ in skeleton: %s", yytext);
 
   /* This pattern must not match more than the previous @ patterns. */
 @[^{}@\n]* fatal ("invalid @ in skeleton: %s", yytext);