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

ruby-changes:53897

From: duerst <ko1@a...>
Date: Sat, 1 Dec 2018 17:26:44 +0900 (JST)
Subject: [ruby-changes:53897] duerst:r66116 (trunk): remove unnecessary code removing CR/LF from range

duerst	2018-12-01 17:26:39 +0900 (Sat, 01 Dec 2018)

  New Revision: 66116

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66116

  Log:
    remove unnecessary code removing CR/LF from range
    
    Remove code that tries to remove CR and LF from Grapheme_Cluster_Break=Control.
    This code is unnecessary because Grapheme_Cluster_Break=Control already excludes
    CR and LF.

  Modified files:
    trunk/regparse.c
Index: regparse.c
===================================================================
--- regparse.c	(revision 66115)
+++ regparse.c	(revision 66116)
@@ -5878,22 +5878,7 @@ node_extended_grapheme_cluster(Node** np https://github.com/ruby/ruby/blob/trunk/regparse.c#L5878
     if (IS_NULL(np1)) goto err;
     cc = NCCLASS(np1);
     R_ERR(add_property_to_cc(cc, "Grapheme_Cluster_Break=Control", 1, env));
-    if (ONIGENC_MBC_MINLEN(env->enc) > 1) {
-      BBuf *pbuf2 = NULL;
-      R_ERR(add_code_range(&pbuf1, env, 0x0a, 0x0a));
-      R_ERR(add_code_range(&pbuf1, env, 0x0d, 0x0d));
-      if (r != 0) goto err;
-      r = and_code_range_buf(cc->mbuf, 0, pbuf1, 1, &pbuf2, env);
-      if (r != 0) {
-	bbuf_free(pbuf2);
-	goto err;
-      }
-      bbuf_free(pbuf1);
-      pbuf1 = NULL;
-      bbuf_free(cc->mbuf);
-      cc->mbuf = pbuf2;
-    }
-    else {
+    if (! (ONIGENC_MBC_MINLEN(env->enc) > 1)) {
       BITSET_CLEAR_BIT(cc->bs, 0x0a);
       BITSET_CLEAR_BIT(cc->bs, 0x0d);
     }

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

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