corrected and rewrote char_macro_* fixes to parse the text with regexes

From-SVN: r33931

gcc/ChangeLog

+
+2000-05-16  Bruce Korb  <bkorb@gnu.org>
+
+	* fixinc/README:  corrected return address
+	* fixinc/check.diff:  regenerate, now that test works
+	* fixinc/fixfixes.c(format_fix,format_write): reformatted
+	(char_macro_def_fix,char_macro_use_fix): corrected and
+	rewrote to use regex to parse the text
+	* fixinc/inclhack.def: more testing
+	* fixinc/fixincl.x:  regenerated
+
 2000-05-16  Alexandre Oliva  <aoliva@cygnus.com>
 
 	* config/mn10300/mn10300.h (ASM_OUTPUT_DWARF2_ADDR_CONST): Remove.

gcc/fixinc/README

@@ -33,7 +33,7 @@ broken by the manufacturer, or is broken by the fixinclude process,
 then you will need to alter or add information to the include fix
 definitions file, ``inclhack.def''.  Please also send relevant
 information to gcc-bugs@gcc.gnu.org, gcc-patches@gcc.gnu.org and,
-please, to me:  autogen@linuxbox.com.
+please, to me:  bkorb@gnu.org.
 
 Here are the rules for making fixes in the inclhack.def file:
 
@@ -109,6 +109,8 @@ Here are the rules for making fixes in the inclhack.def file:
     3.  A C language subroutine method for both tests and fixes.
         See ``fixtests.c'' for instructions on writing C-language
         applicability tests and ``fixfixes.c'' for C-language fixing.
+        These files also contain tables that describe the currently
+        implemented fixes and tests.
 
     4.  Replacement text.  If the replacement is empty, then no
         fix is applied.  Otherwise, the replacement text is

gcc/fixinc/check.diff

@@ -704,16 +704,6 @@
 *** 1,33 ****
   
   
-  #ifndef IO_QUOTES_DEF_CHECK
-! #define BSD43__IOWR(n, x) (('n'<<8)+x)
-  #endif  /* IO_QUOTES_DEF_CHECK */
-  
-  
-  #ifndef IO_QUOTES_USE_CHECK
-! #define TIOCFOO BSD43__IOWR(T, 1)
-  #endif  /* IO_QUOTES_USE_CHECK */
-  
-  
   #ifndef CTRL_QUOTES_DEF_CHECK
 ! #define BSD43_CTRL(n, x) (('n'<<8)+x)
   #endif  /* CTRL_QUOTES_DEF_CHECK */
@@ -724,6 +714,16 @@
   #endif  /* CTRL_QUOTES_USE_CHECK */
   
   
+  #ifndef IO_QUOTES_DEF_CHECK
+! #define BSD43__IOWR(n, x) (('n'<<8)+x)
+  #endif  /* IO_QUOTES_DEF_CHECK */
+  
+  
+  #ifndef IO_QUOTES_USE_CHECK
+! #define TIOCFOO BSD43__IOWR(T, 1)
+  #endif  /* IO_QUOTES_USE_CHECK */
+  
+  
   #ifndef MACHINE_NAME_CHECK
 ! #ifdef i386 /* no uniform machine_name test, so
                  this only works on i?86 machines */
@@ -738,16 +738,6 @@
 --- 1,37 ----
   
   
-  #ifndef IO_QUOTES_DEF_CHECK
-! #define BSD43__IOWR(n, x) ((n<<8)+x)
-  #endif  /* IO_QUOTES_DEF_CHECK */
-  
-  
-  #ifndef IO_QUOTES_USE_CHECK
-! #define TIOCFOO BSD43__IOWR('T', 1)
-  #endif  /* IO_QUOTES_USE_CHECK */
-  
-  
   #ifndef CTRL_QUOTES_DEF_CHECK
 ! #define BSD43_CTRL(n, x) ((n<<8)+x)
   #endif  /* CTRL_QUOTES_DEF_CHECK */
@@ -758,6 +748,16 @@
   #endif  /* CTRL_QUOTES_USE_CHECK */
   
   
+  #ifndef IO_QUOTES_DEF_CHECK
+! #define BSD43__IOWR(n, x) ((n<<8)+x)
+  #endif  /* IO_QUOTES_DEF_CHECK */
+  
+  
+  #ifndef IO_QUOTES_USE_CHECK
+! #define TIOCFOO BSD43__IOWR('T', 1)
+  #endif  /* IO_QUOTES_USE_CHECK */
+  
+  
   #ifndef MACHINE_NAME_CHECK
 ! #ifdef __i386__ /* no uniform machine_name test, so
                  this only works on i?86 machines */