[前][次][番号順一覧][スレッド一覧]

ruby-changes:8336

From: nobu <ko1@a...>
Date: Tue, 21 Oct 2008 08:56:58 +0900 (JST)
Subject: [ruby-changes:8336] Ruby:r19864 (trunk): * regparse.c (parse_char_class): CCV_SB is only for single

nobu	2008-10-21 08:56:40 +0900 (Tue, 21 Oct 2008)

  New Revision: 19864

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19864

  Log:
    * regparse.c (parse_char_class): CCV_SB is only for single
      byte.  [ruby-dev:36786]

  Modified files:
    trunk/ChangeLog
    trunk/regparse.c

Index: regparse.c
===================================================================
--- regparse.c	(revision 19863)
+++ regparse.c	(revision 19864)
@@ -4218,9 +4218,8 @@
     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 @@
       break;
 
     case TK_CODE_POINT:
-    code_point:
       v = tok->u.code;
       in_israw = 1;
     val_entry:
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19863)
+++ ChangeLog	(revision 19864)
@@ -1,4 +1,4 @@
-Tue Oct 21 07:45:15 2008  Nobuyoshi Nakada  <nobu@r...>
+Tue Oct 21 08:56:37 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* regparse.c (parse_char_class): CCV_SB is only for single
 	  byte.  [ruby-dev:36786]

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]