* tests/regression.at (Invalid CPP headers): New.

From Alexander Belopolsky.
* src/files.c (compute_header_macro): Map non alnum chars to `_'.

ChangeLog

@@ -1,3 +1,9 @@
+2001-10-02  Akim Demaille  <[email protected]>
+
+	* tests/regression.at (Invalid CPP headers): New.
+	From Alexander Belopolsky.
+	* src/files.c (compute_header_macro): Map non alnum chars to `_'.
+
 2001-10-02  Akim Demaille  <[email protected]>
 
 	* tests/regression.at (Invalid input): New.

THANKS

@@ -1,24 +1,25 @@
 Bison was originally written by Robert Corbett.  It would not be what
 it is today without the invaluable help of these people:
 
-Akim Demaille		[email protected]
+Akim Demaille           [email protected]
 Albert Chin-A-Young     [email protected]
-Daniel Hagerty  	[email protected]
+Alexander Belopolsky    [email protected]
-David J. MacKenzie  	djm@gnu.org
+Daniel Hagerty          hag@gnu.org
-Fabrice Bauzac		[email protected]
+David J. MacKenzie      [email protected]
-Hans Aberg		[email protected]
+Fabrice Bauzac          [email protected]
-Jesse Thilo  		[email protected]
+Hans Aberg              [email protected]
-Jim Meyering  		meyering@gnu.org
+Jesse Thilo             jthilo@gnu.org
-Juan Manuel Guerrero	[email protected]
+Jim Meyering            [email protected]
-Keith Browne		[email protected]
+Juan Manuel Guerrero    [email protected]
-Laurent Mascherpa	[email protected]
+Keith Browne            [email protected]
+Laurent Mascherpa       [email protected]
 Marc Autret             [email protected]
-Neil Booth		[email protected]
+Neil Booth              [email protected]
-Noah Friedman  		[email protected]
+Noah Friedman           [email protected]
 Pascal Bart             [email protected]
-Paul Eggert  		[email protected]
+Paul Eggert             [email protected]
-Piotr Gackiewicz	[email protected]
+Piotr Gackiewicz        [email protected]
-Richard Stallman  	[email protected]
+Richard Stallman        [email protected]
 Robert Anisko           [email protected]
 Shura                   [email protected]
 

src/files.c

@@ -94,8 +94,7 @@ stringappend (const char *string1, const char *string2)
 static char *
 compute_header_macro (void)
 {
-  int ite;
+  char *macro_name, *cp;
-  char *macro_name;
 
   if (spec_defines_file)
     macro_name = xstrdup (spec_defines_file);
@@ -109,14 +108,12 @@ compute_header_macro (void)
       strcat (macro_name, header_extension);
     }
 
-  for (ite = 0; macro_name[ite]; ite++)
+  for (cp = macro_name; *cp; ++cp)
-    if (macro_name[ite] == '.')
+    if (islower (*cp))
-      macro_name[ite] = '_';
+      *cp = toupper (*cp);
-    else
+    else if (!isalnum (*cp))
-      {
+      *cp = '_';
-	if (islower (macro_name[ite]))
+
-	  macro_name[ite] -= ('a' - 'A');
-      }
   return macro_name;
 }
 

tests/regression.at

@@ -107,3 +107,25 @@ input.y:3: fatal error: no rules in the input grammar
 ])
 
 AT_CLEANUP
+
+
+## --------------------- ##
+## Invalid CPP headers.  ##
+## --------------------- ##
+
+AT_SETUP([Invalid CPP headers])
+
+mkdir input
+
+AT_DATA([input/input.y],
+[%%
+dummy:
+])
+
+AT_CHECK([bison --defines input/input.y])
+
+AT_CHECK([sed 1q input/input.tab.h], 0,
+[[#ifndef INPUT_INPUT_TAB_H
+]])
+
+AT_CLEANUP(input)