rename IS_CODE_SB_WORD() to IS_CODE_WORD_ASCII()

diff --git a/src/regcomp.c b/src/regcomp.c
index 7c04a4d9a180e068f4f43fb200466094778162d0..5278986bb055b719cade71bad64acb9326a0c7d5 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -2533,7 +2533,7 @@ is_exclusive(Node* x, Node* y, regex_t* reg)
             if (IS_NULL(xc->mbuf) && !IS_NCCLASS_NOT(xc)) {
               for (i = 0; i < SINGLE_BYTE_SIZE; i++) {
                 if (BITSET_AT(xc->bs, i)) {
-                  if (IS_CODE_SB_WORD(reg->enc, i)) return 0;
+                  if (IS_CODE_WORD_ASCII(reg->enc, i)) return 0;
                 }
               }
               return 1;
@@ -2543,7 +2543,7 @@ is_exclusive(Node* x, Node* y, regex_t* reg)
           else {
             if (IS_NOT_NULL(xc->mbuf)) return 0;
             for (i = 0; i < SINGLE_BYTE_SIZE; i++) {
-              if (! IS_CODE_SB_WORD(reg->enc, i)) {
+              if (! IS_CODE_WORD_ASCII(reg->enc, i)) {
                 if (!IS_NCCLASS_NOT(xc)) {
                   if (BITSET_AT(xc->bs, i))
                     return 0;

diff --git a/src/regint.h b/src/regint.h
index 8cd47c4017b414237a41c83bc9e766306d301050..4df470e8a79a0968b2be32c41a2a85ceacf69774 100644 (file)
--- a/src/regint.h
+++ b/src/regint.h
@@ -729,7 +729,7 @@ typedef struct {
 } OnigMatchArg;
 
 
-#define IS_CODE_SB_WORD(enc,code) \
+#define IS_CODE_WORD_ASCII(enc,code) \
   (ONIGENC_IS_CODE_ASCII(code) && ONIGENC_IS_CODE_WORD(enc,code))
 
 typedef struct OnigEndCallListItem {

diff --git a/src/regparse.c b/src/regparse.c
index 65d36535ce8eeb52c82babb1c89612cb2f34ab95..f46652d9075b348699940cf753c44b78d02dc389 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -4521,7 +4521,7 @@ add_ctype_to_cc(CClassNode* cc, int ctype, int not, ScanEnv* env)
   case ONIGENC_CTYPE_WORD:
     if (not == 0) {
       for (c = 0; c < SINGLE_BYTE_SIZE; c++) {
-        if (IS_CODE_SB_WORD(enc, c)) BITSET_SET_BIT(cc->bs, c);
+        if (IS_CODE_WORD_ASCII(enc, c)) BITSET_SET_BIT(cc->bs, c);
       }
       ADD_ALL_MULTI_BYTE_RANGE(enc, cc->mbuf);
     }