c-format.c (maybe_read_dollar_number): Use safe-ctype macros and/or fold extra calls into fewer ones.

	* c-format.c (maybe_read_dollar_number): Use safe-ctype macros
	and/or fold extra calls into fewer ones.
	* collect2.c (dump_file): Likewise.
	* cppexp.c (parse_number): Likewise.
	* cpplex.c (_cpp_lex_direct): Likewise.
	* final.c (output_asm_insn, asm_fprintf): Likewise.
	* fix-header.c (inf_scan_ident, main): Likewise.
	* fixinc/fixfixes.c (char_macro_use_fix, char_macro_def_fix):
	Likewise.
	* fold-const.c (real_hex_to_f): Likewise.
	* gen-protos.c (parse_fn_proto): Likewise.
	* genattrtab.c (check_attr_test, check_attr_value): Likewise.
	* genrecog.c (change_state, write_action): Likewise.
	* gensupport.c (shift_output_template): Likewise.
	* local-alloc.c (requires_inout): Likewise.
	* mips-tfile.c (IS_ASM_IDENT): Likewise.
	* protoize.c (is_id_char, main): Likewise.
	* real.c (asctoeg): Likewise.
	* recog.c (asm_operand_ok): Likewise.
	* reload.c (find_reloads): Likewise.
	* scan.c (scan_identget_token): Likewise.
	* sched-vis.c (print_value): Likewise.
	* stringpool.c (ggc_alloc_string): Likewise.
	* toplev.c (read_integral_parameter, decode_g_option): Likewise.
	* tradcif.y (parse_number, yylex, parse_escape): Likewise.
	* tradcpp.c (rescan): Likewise.
	* tree.c (clean_symbol_name): Likewise.
	* varasm.c (decode_reg_name): Likewise.

	* alpha.h (ASM_OUTPUT_ASCII): Likewise.
	* darwin.c (name_needs_quotes, func_name_maybe_scoped): Likewise.
	* dsp16xx.h (ASM_OUTPUT_ASCII): Likewise.
	* m88k.c (output_ascii): Likewise.
	* m88k.h (OVERRIDE_OPTIONS): Likewise.
	* mcore.h (REG_CLASS_FROM_LETTER): Likewise.
	* ns32k/encore.h (ASM_OUTPUT_ASCII): Likewise.
	* sh.h (REG_CLASS_FROM_LETTER): Likewise.

cp:
	* xref.c (GNU_xref_member): Use safe-ctype macros and/or fold
	extra calls into fewer ones.

f:
	* bad.c (ffebad_finish): Use safe-ctype macros and/or fold extra
	calls into fewer ones.
	* implic.c (ffeimplic_lookup_): Likewise.
	* intdoc.c (dumpimp): Likewise.
	* intrin.c (ffeintrin_init_0): Likewise.
	* lex.c (ffelex_backslash_, ffelex_cfebackslash_, ffelex_hash_):
	Likewise.
	* lex.h (ffelex_is_firstnamechar): Likewise.
	* target.c (ffetarget_integerhex): Likewise.

java:
	* gjavah.c (jni_print_char, decode_signature_piece): Use
	safe-ctype macros and/or fold extra calls into fewer ones.
	* lex.c (java_read_unicode, java_lex): Likewise.
	* lex.h (JAVA_START_CHAR_P, JAVA_PART_CHAR_P, JAVA_ASCII_DIGIT,
	JAVA_ASCII_HEXDIGIT, JAVA_ASCII_LETTER): Likewise.
	* mangle_name.c (append_unicode_mangled_name,
	unicode_mangling_length): Likewise.

From-SVN: r46397

8 files changed, 32 insertions, 35 deletions

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 14fb6c1fa32..4e1335a4b36 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,15 @@
+Sun Oct 21 17:28:17 2001  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* bad.c (ffebad_finish): Use safe-ctype macros and/or fold extra
+	calls into fewer ones.
+	* implic.c (ffeimplic_lookup_): Likewise.
+	* intdoc.c (dumpimp): Likewise.
+	* intrin.c (ffeintrin_init_0): Likewise.
+	* lex.c (ffelex_backslash_, ffelex_cfebackslash_, ffelex_hash_):
+	Likewise.
+	* lex.h (ffelex_is_firstnamechar): Likewise.
+	* target.c (ffetarget_integerhex): Likewise.
+
 2001-10-21  Craig Prescott  <prescott@phys.ufl.edu>
 
 	* target.h (FFETARGET_32bit_longs): Don't define 
diff --git a/gcc/f/bad.c b/gcc/f/bad.c
index 67eade03cbd..d258648e543 100644
--- a/gcc/f/bad.c
+++ b/gcc/f/bad.c
@@ -473,7 +473,7 @@ ffebad_finish ()
       if (c == '%')
 	{
 	  c = ffebad_message_[++i];
-	  if (ISALPHA (c) && ISUPPER (c))
+	  if (ISUPPER (c))
 	    {
 	      index = c - 'A';
 
diff --git a/gcc/f/implic.c b/gcc/f/implic.c
index 7e0c61b1605..625742fbbca 100644
--- a/gcc/f/implic.c
+++ b/gcc/f/implic.c
@@ -92,7 +92,7 @@ static ffeimplic_
 ffeimplic_lookup_ (unsigned char c)
 {
   /* NOTE: This is definitely ASCII-specific!!  */
-  if (ISALPHA (c) || (c == '_'))
+  if (ISIDST (c))
     return &ffeimplic_table_[c - 'A'];
   return NULL;
 }
diff --git a/gcc/f/intdoc.c b/gcc/f/intdoc.c
index 44ab7a8ff85..84720a321c1 100644
--- a/gcc/f/intdoc.c
+++ b/gcc/f/intdoc.c
@@ -399,15 +399,12 @@ dumpimp (int menu, const char *name, const char *name_uc, size_t genno,
 
 	  for (c = summaries[imp]; c[0] != '\0'; ++c)
 	    {
-	      if ((c[0] == '@')
-		  && (c[1] >= '0')
-	      && (c[1] <= '9'))
+	      if (c[0] == '@' && ISDIGIT (c[1]))
 		{
 		  int argno = c[1] - '0';
 
 		  c += 2;
-		  while ((c[0] >= '0')
-			 && (c[0] <= '9'))
+		  while (ISDIGIT (c[0]))
 		    {
 		      argno = 10 * argno + (c[0] - '0');
 		      ++c;
@@ -495,8 +492,7 @@ external procedure.\n\
       const char *arg_string;
       const char *arg_info;
 
-      if ((c[colon + 1] >= '0')
-	  && (c[colon + 1] <= '9'))
+      if (ISDIGIT (c[colon + 1]))
 	{
 	  other_arg = c[colon + 1] - '0';
 	  arg_string = argument_name_string (imp, other_arg);
@@ -548,9 +544,7 @@ this intrinsic is valid only when used as the argument to\n\
 	printf (", the exact type being wide enough to hold a pointer\n\
 on the target system (typically @code{INTEGER(KIND=1)} or @code{INTEGER(KIND=4)}).\n\n");
 #endif
-      else if ((c[1] == '=')
-	       && (c[colon + 1] >= '0')
-	       && (c[colon + 1] <= '9'))
+      else if (c[1] == '=' && ISDIGIT (c[colon + 1]))
 	{
 	  assert (other_arg >= 0);
 
@@ -1011,15 +1005,12 @@ Description:\n\
 
       while (c[0] != '\0')
 	{
-	  if ((c[0] == '@')
-	      && (c[1] >= '0')
-	  && (c[1] <= '9'))
+	  if (c[0] == '@' && ISDIGIT (c[1]))
 	    {
 	      int argno = c[1] - '0';
 
 	      c += 2;
-	      while ((c[0] >= '0')
-		     && (c[0] <= '9'))
+	      while (ISDIGIT (c[0]))
 		{
 		  argno = 10 * argno + (c[0] - '0');
 		  ++c;
diff --git a/gcc/f/intrin.c b/gcc/f/intrin.c
index 6b89bfadfce..393706aa331 100644
--- a/gcc/f/intrin.c
+++ b/gcc/f/intrin.c
@@ -1628,8 +1628,7 @@ ffeintrin_init_0 ()
 	}
       if ((c[colon + 1] != '-')
 	  && (c[colon + 1] != '*')
-	  && ((c[colon + 1] < '0')
-	      || (c[colon + 1] > '9')))
+	  && (! ISDIGIT (c[colon + 1])))
 	{
 	  fprintf (stderr, "%s: bad COL-spec\n",
 		   ffeintrin_imps_[i].name);
@@ -1683,9 +1682,9 @@ ffeintrin_init_0 ()
 	    }
 	  if (c[3] == '[')
 	    {
-	      if (((c[4] < '0') || (c[4] > '9'))
+	      if ((! ISDIGIT (c[4]))
 		  || ((c[5] != ']')
-		      && (++c, (c[4] < '0') || (c[4] > '9')
+		      && (++c, ! ISDIGIT (c[4])
 			  || (c[5] != ']'))))
 		{
 		  fprintf (stderr, "%s: bad arg-len\n",
@@ -1696,9 +1695,9 @@ ffeintrin_init_0 ()
 	    }
 	  if (c[3] == '(')
 	    {
-	      if (((c[4] < '0') || (c[4] > '9'))
+	      if ((! ISDIGIT (c[4]))
 		  || ((c[5] != ')')
-		      && (++c, (c[4] < '0') || (c[4] > '9')
+		      && (++c, ! ISDIGIT (c[4])
 			  || (c[5] != ')'))))
 		{
 		  fprintf (stderr, "%s: bad arg-rank\n",
diff --git a/gcc/f/lex.c b/gcc/f/lex.c
index 9fef050a0e9..afdfd44b88f 100644
--- a/gcc/f/lex.c
+++ b/gcc/f/lex.c
@@ -394,16 +394,14 @@ ffelex_backslash_ (int c, ffewhereColumnNumber col)
       return c;
 
     case 2:
-      if ((c >= 'a' && c <= 'f')
-	  || (c >= 'A' && c <= 'F')
-	  || (c >= '0' && c <= '9'))
+      if (ISXDIGIT (c))
 	{
 	  code *= 16;
 	  if (c >= 'a' && c <= 'f')
 	    code += c - 'a' + 10;
 	  if (c >= 'A' && c <= 'F')
 	    code += c - 'A' + 10;
-	  if (c >= '0' && c <= '9')
+	  if (ISDIGIT (c))
 	    code += c - '0';
 	  if (code != 0 || count != 0)
 	    {
@@ -599,9 +597,7 @@ ffelex_cfebackslash_ (int *use_d, int *d, FILE *finput)
       while (1)
 	{
 	  c = getc (finput);
-	  if (!(c >= 'a' && c <= 'f')
-	      && !(c >= 'A' && c <= 'F')
-	      && !(c >= '0' && c <= '9'))
+	  if (! ISXDIGIT (c))
 	    {
 	      *use_d = 1;
 	      *d = c;
@@ -612,7 +608,7 @@ ffelex_cfebackslash_ (int *use_d, int *d, FILE *finput)
 	    code += c - 'a' + 10;
 	  if (c >= 'A' && c <= 'F')
 	    code += c - 'A' + 10;
-	  if (c >= '0' && c <= '9')
+	  if (ISDIGIT (c))
 	    code += c - '0';
 	  if (code != 0 || count != 0)
 	    {
@@ -1079,7 +1075,7 @@ ffelex_hash_ (FILE *finput)
      it and ignore it; otherwise, ignore the line, with an error
      if the word isn't `pragma', `ident', `define', or `undef'.  */
 
-  if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'))
+  if (ISALPHA(c))
     {
       if (c == 'p')
 	{
diff --git a/gcc/f/lex.h b/gcc/f/lex.h
index a28d0ac1691..04dfbed426d 100644
--- a/gcc/f/lex.h
+++ b/gcc/f/lex.h
@@ -171,8 +171,7 @@ ffelexToken ffelex_token_use (ffelexToken t);
 #define ffelex_init_2()
 #define ffelex_init_3()
 #define ffelex_init_4()
-#define ffelex_is_firstnamechar(c) \
-  (ISALPHA ((c)) || ((c) == '_'))
+#define ffelex_is_firstnamechar(c) ISIDST (c)
 #define ffelex_terminate_0()
 #define ffelex_terminate_1()
 #define ffelex_terminate_2()
diff --git a/gcc/f/target.c b/gcc/f/target.c
index b52e37f5002..7bda0328f6c 100644
--- a/gcc/f/target.c
+++ b/gcc/f/target.c
@@ -1451,7 +1451,7 @@ ffetarget_integerhex (ffetargetIntegerDefault *val, ffelexToken integer)
 	c = c - 'A' + 10;
       else if ((c >= 'a') && (c <= 'f'))
 	c = c - 'a' + 10;
-      else if ((c >= '0') && (c <= '9'))
+      else if (ISDIGIT (c))
 	c -= '0';
       else
 	{