system.h (CTYPE_CONV, [...]): New macros.

	* system.h (CTYPE_CONV, TOUPPER, TOLOWER): New macros.  Use
	CTYPE_CONV in all ctype macros.

	* cccp.c (initialize_char_syntax): Use uppercase ctype macro
	from system.h.

	* cexp.y (initialize_random_junk): Likewise.

	* c4x.c (c4x_interrupt_function_p, c4x_handle_pragma): Likewise.

	* i370.c (handle_pragma): Likewise.

	* i370.h (ASM_OUTPUT_LABELREF, ASM_OUTPUT_ASCII): Likewise.

	* v850.c (override_options): Likewise.

	* doprint.c (_doprnt): Likewise.

	* fixinc/fixincl.c (main, quoted_file_exists, extract_quoted_files):
	Likewise.

	* fixinc/server.c (load_data): Likewise.

	* fold-const.c (real_hex_to_f): Likewise.

	* genattr.c (write_upcase, gen_attr): Likewise.

	* genattrtab.c (convert_const_symbol_ref, evaluate_eq_attr,
	write_upcase): Likewise.

	* genemit.c (print_code): Likewise.

	* genopinit.c (gen_insn): Likewise.

	* genpeep.c (print_code): Likewise.

	* genrecog.c (print_code): Likewise.

	* optabs.c (init_libfuncs): Likewise.

ch:

	* lex.c (maybe_downcase, getlc, handle_generic_pragma,
	check_newline): Likewise.

f:

	* bad.c (ffebad_finish): Likewise.

	* fini.c (main): Likewise.

	* intrin.c (ffeintrin_init_0): Likewise.

	* lex.c (ffelex_hash_): Likewise.

	* src.c (ffesrc_init_1): Likewise.

From-SVN: r29463

6 files changed, 27 insertions, 14 deletions

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index acf6222..8fd19f3 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,15 @@
+Thu Sep 16 18:07:11 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* bad.c (ffebad_finish): Use uppercase ctype macro from system.h.
+
+	* fini.c (main): Likewise.
+
+	* intrin.c (ffeintrin_init_0): Likewise.
+
+	* lex.c (ffelex_hash_): Likewise.
+
+	* src.c (ffesrc_init_1): Likewise.
+
 Tue Sep 14 12:14:28 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* g77spec.c (lang_specific_driver): Remove unnecessary argument in
diff --git a/gcc/f/bad.c b/gcc/f/bad.c
index 704fa12..5b42129 100644
--- a/gcc/f/bad.c
+++ b/gcc/f/bad.c
@@ -461,7 +461,7 @@ ffebad_finish ()
 	{
 	  char c;
 
-	  c = toupper (s[0]);
+	  c = TOUPPER (s[0]);
 	  fprintf (stderr, "%c%s ", c, &s[1]);
 	}
       else if (s[0] != '\0')
diff --git a/gcc/f/fini.c b/gcc/f/fini.c
index 1b7c981..d09161f 100644
--- a/gcc/f/fini.c
+++ b/gcc/f/fini.c
@@ -381,8 +381,8 @@ main (int argc, char **argv)
 	  cc = buf[i];
 	  if (ISALPHA (cc))
 	    {
-	      newname->name_uc[i] = toupper (cc);
-	      newname->name_lc[i] = tolower (cc);
+	      newname->name_uc[i] = TOUPPER (cc);
+	      newname->name_lc[i] = TOLOWER (cc);
 	      newname->name_ic[i] = cc;
 	    }
 	  else
diff --git a/gcc/f/intrin.c b/gcc/f/intrin.c
index dbf375b..d59458c 100644
--- a/gcc/f/intrin.c
+++ b/gcc/f/intrin.c
@@ -1588,7 +1588,7 @@ ffeintrin_init_0 ()
 	  if ((ISDIGIT (*p1) || (*p1 == '_')) && (*p1 == *p2) && (*p1 == *p3))
 	    continue;
 	  if (! ISUPPER ((unsigned char)*p1) || ! ISLOWER ((unsigned char)*p2)
-	      || (*p1 != toupper ((unsigned char)*p2))
+	      || (*p1 != TOUPPER (*p2))
 	      || ((*p3 != *p1) && (*p3 != *p2)))
 	    break;
 	}
diff --git a/gcc/f/lex.c b/gcc/f/lex.c
index 3136d40..b6198b2 100644
--- a/gcc/f/lex.c
+++ b/gcc/f/lex.c
@@ -1126,8 +1126,9 @@ ffelex_hash_ (FILE *finput)
 	      static char buffer [128];
 	      char * buff = buffer;
 
-	      /* Read the pragma name into a buffer.  */
-	      while (isspace (c = getc (finput)))
+	      /* Read the pragma name into a buffer.
+		 ISSPACE() may evaluate its argument more than once!  */
+	      while (((c = getc (finput)), ISSPACE(c)))
 		continue;
 	      
 	      do
@@ -1135,7 +1136,7 @@ ffelex_hash_ (FILE *finput)
 		  * buff ++ = c;
 		  c = getc (finput);
 		}
-	      while (c != EOF && ! isspace (c) && c != '\n'
+	      while (c != EOF && ! ISSPACE (c) && c != '\n'
 		     && buff < buffer + 128);
 
 	      pragma_ungetc (c);
diff --git a/gcc/f/src.c b/gcc/f/src.c
index 7b23931..e434fbf 100644
--- a/gcc/f/src.c
+++ b/gcc/f/src.c
@@ -120,10 +120,10 @@ ffesrc_init_1 ()
     }
 
   for (i = 'A'; i <= 'Z'; ++i)
-    ffesrc_tolower_[i] = tolower (i);
+    ffesrc_tolower_[i] = TOLOWER (i);
 
   for (i = 'a'; i <= 'z'; ++i)
-    ffesrc_toupper_[i] = toupper (i);
+    ffesrc_toupper_[i] = TOUPPER (i);
 
   ffesrc_check_symbol_ = (ffe_case_symbol () != FFE_caseNONE);
 
@@ -153,7 +153,7 @@ ffesrc_init_1 ()
 
   if (ffesrc_ok_match_init_lower_)
     for (i = 'a'; i <= 'z'; ++i)
-      ffesrc_char_match_init_[i] = toupper (i);
+      ffesrc_char_match_init_[i] = TOUPPER (i);
   else
     for (i = 'a'; i <= 'z'; ++i)
       ffesrc_char_match_init_[i] = FFESRC_INVALID_SYMBOL_CHAR_;
@@ -164,21 +164,21 @@ ffesrc_init_1 ()
 
   if (ffesrc_ok_match_noninit_lower_)
     for (i = 'a'; i <= 'z'; ++i)
-      ffesrc_char_match_noninit_[i] = toupper (i);
+      ffesrc_char_match_noninit_[i] = TOUPPER (i);
   else
     for (i = 'a'; i <= 'z'; ++i)
       ffesrc_char_match_noninit_[i] = FFESRC_INVALID_SYMBOL_CHAR_;
 
   if (ffe_case_source () == FFE_caseLOWER)
     for (i = 'A'; i <= 'Z'; ++i)
-      ffesrc_char_source_[i] = tolower (i);
+      ffesrc_char_source_[i] = TOLOWER (i);
   else if (ffe_case_source () == FFE_caseUPPER)
     for (i = 'a'; i <= 'z'; ++i)
-      ffesrc_char_source_[i] = toupper (i);
+      ffesrc_char_source_[i] = TOUPPER (i);
 
   if (ffe_case_match () == FFE_caseLOWER)
     for (i = 'A'; i <= 'Z'; ++i)
-      ffesrc_char_internal_init_[i] = tolower (i);
+      ffesrc_char_internal_init_[i] = TOLOWER (i);
 
   switch (ffe_case_symbol ())
     {