refactoring

diff --git a/src/regint.h b/src/regint.h
index b70411a66bf0872d59c9b9f92ce8761388d4a1d4..1262866931120657fc7801893cf7df7bb3b545a1 100644 (file)
--- a/src/regint.h
+++ b/src/regint.h
@@ -286,7 +286,7 @@ typedef unsigned int  MemStatusType;
   (ONIGENC_IS_CODE_ASCII(code) && ONIGENC_IS_CODE_WORD(enc,code))
 #define IS_CODE_DIGIT_ASCII(enc, code) \
   ((code) < 128 && ONIGENC_IS_CODE_DIGIT(enc,code))
-#define ONIGENC_IS_CODE_XDIGIT_ASCII(enc, code) \
+#define IS_CODE_XDIGIT_ASCII(enc, code) \
   ((code) < 128 && ONIGENC_IS_CODE_XDIGIT(enc,code))
 
 #define DIGITVAL(code)    ((code) - '0')

diff --git a/src/regparse.c b/src/regparse.c
index 219b049a62d6039b4fbedf4ea63b8102dc6d1cb5..58b8f51a0e89227147016cfe9101ea4114e90d4a 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -2135,7 +2135,7 @@ scan_unsigned_hexadecimal_number(UChar** src, UChar* end, int maxlen,
   num = 0;
   while (! PEND && maxlen-- != 0) {
     PFETCH(c);
-    if (ONIGENC_IS_CODE_XDIGIT_ASCII(enc, c)) {
+    if (IS_CODE_XDIGIT_ASCII(enc, c)) {
       val = (unsigned int )XDIGITVAL(enc,c);
       if ((INT_MAX_LIMIT - val) / 16UL < num)
         return -1;  /* overflow */
@@ -3584,7 +3584,7 @@ fetch_token_in_cc(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
         if (num < 0) return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
         if (!PEND) {
           c2 = PPEEK;
-          if (ONIGENC_IS_CODE_XDIGIT_ASCII(enc, c2))
+          if (IS_CODE_XDIGIT_ASCII(enc, c2))
             return ONIGERR_TOO_LONG_WIDE_CHAR_VALUE;
         }
 
@@ -3969,7 +3969,7 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
         num = scan_unsigned_hexadecimal_number(&p, end, 8, enc);
         if (num < 0) return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
         if (!PEND) {
-          if (ONIGENC_IS_CODE_XDIGIT_ASCII(enc, PPEEK))
+          if (IS_CODE_XDIGIT_ASCII(enc, PPEEK))
             return ONIGERR_TOO_LONG_WIDE_CHAR_VALUE;
         }