From: Akim Demaille <akim@epita.fr>
Date: Wed, 9 Nov 2005 16:11:25 +0000 (+0000)
Subject: * src/scan-skel.l: Use a couple of asserts.
X-Git-Tag: v2.3b~583
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/a8991a1da4639dbbb41237bd715d829bd8c5b4c6

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

diff --git a/ChangeLog b/ChangeLog
index 2b829bac..2712c547 100644
--- 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.
diff --git a/src/scan-skel.l b/src/scan-skel.l
index e3a5eabd..b14fb40c 100644
--- 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 BASE_QPUTS(File) \
+   assert (File), QPUTS (base_name (File))
+
 %}
 %%
 
@@ -60,13 +63,18 @@
   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)
-	file_name = parser_file_name;
+	{
+	  assert (parser_file_name);
+	  file_name = parser_file_name;
+	}
       else
 	fatal ("invalid token in skeleton: %s", yytext);
     }
-
   if (outname)
     {
       free (outname);
@@ -84,8 +92,8 @@
 "@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);