diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | regparse.c | 6 |
2 files changed, 3 insertions, 5 deletions
@@ -1,4 +1,4 @@ -Tue Oct 21 07:45:15 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Oct 21 08:56:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * regparse.c (parse_char_class): CCV_SB is only for single byte. [ruby-dev:36786] diff --git a/regparse.c b/regparse.c index 9ec441dab8..c7b42eaf74 100644 --- a/regparse.c +++ b/regparse.c @@ -4218,9 +4218,8 @@ parse_char_class(Node** np, OnigToken* tok, UChar** src, UChar* end, fetched = 0; switch (r) { case TK_CHAR: - if (tok->u.code >= SINGLE_BYTE_SIZE) goto code_point; - len = ONIGENC_CODE_TO_MBCLEN(env->enc, tok->u.c); - if (len > 1) { + if ((tok->u.code >= SINGLE_BYTE_SIZE) || + (len = ONIGENC_CODE_TO_MBCLEN(env->enc, tok->u.c)) > 1) { in_type = CCV_CODE_POINT; } else if (len < 0) { @@ -4292,7 +4291,6 @@ parse_char_class(Node** np, OnigToken* tok, UChar** src, UChar* end, break; case TK_CODE_POINT: - code_point: v = tok->u.code; in_israw = 1; val_entry: |