From 57e9b915ec39eb42316a913136692e1529a2cc28 Mon Sep 17 00:00:00 2001
From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>
Date: Sat, 10 Nov 2001 04:52:13 +0000
Subject: [PATCH] * tradcif.y (parse_number): Use
 TOLOWER/ISXDIGIT/hex_value/hex_p.

From-SVN: r46913
---
 gcc/ChangeLog |  1 +
 gcc/tradcif.y | 19 ++++++-------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 86b64a7824d..7fb785025c4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -3,6 +3,7 @@
 	* cppexp.c (parse_number): Use ISXDIGIT/hex_value.
 	* cpplex.c (hex_digit_value): Use hex_p/hex_value.
 	* cppmain.c (general_init): Call hex_init.
+	* tradcif.y (parse_number): Use TOLOWER/ISXDIGIT/hex_value/hex_p.
 
 	* config.gcc (i[34567]86-dg-dgux*): Don't set `out_file'.
 
diff --git a/gcc/tradcif.y b/gcc/tradcif.y
index 7cedecc2daf..baafad1999e 100644
--- a/gcc/tradcif.y
+++ b/gcc/tradcif.y
@@ -248,14 +248,11 @@ parse_number (olen)
     c = *p++;
     len--;
     if (ISUPPER (c))
-      c += 'a' - 'A';
+      c = TOLOWER (c);
 
-    if (ISDIGIT (c)) {
-      n *= base;
-      n += c - '0';
-    } else if (base == 16 && c >= 'a' && c <= 'f') {
-      n *= base;
-      n += c - 'a' + 10;
+    if (ISDIGIT (c)
+	|| (base == 16 && ISXDIGIT (c))) {
+      n = (n * base) + hex_value (c);
     } else {
       /* `l' means long, and `u' means unsigned.  */
       while (1) {
@@ -509,12 +506,8 @@ parse_escape (string_ptr)
 	for (;;)
 	  {
 	    c = *(*string_ptr)++;
-	    if (ISDIGIT (c))
-	      i = (i << 4) + c - '0';
-	    else if (c >= 'a' && c <= 'f')
-	      i = (i << 4) + c - 'a' + 10;
-	    else if (c >= 'A' && c <= 'F')
-	      i = (i << 4) + c - 'A' + 10;
+	    if (hex_p (c))
+	      i = (i << 4) + hex_value (c);
 	    else
 	      {
 		(*string_ptr)--;