From 05a157ed8a0f0c149e7b66331209ef87fe6225a9 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 20 Oct 2008 23:56:40 +0000 Subject: [PATCH] * regparse.c (parse_char_class): CCV_SB is only for single byte. [ruby-dev:36786] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19864 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 2 +- regparse.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2b30dc0fc..c7660793a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Tue Oct 21 07:45:15 2008 Nobuyoshi Nakada +Tue Oct 21 08:56:37 2008 Nobuyoshi Nakada * 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: