diff options
| author | duerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-01 08:26:39 +0000 |
|---|---|---|
| committer | duerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-01 08:26:39 +0000 |
| commit | d1f8694171eed1544a8cc7c29ede155679efa0ca (patch) | |
| tree | 5292164c63da663d6e3fb25260e7b171d211c783 /regparse.c | |
| parent | 36b3e41a57d4e0ae40af446196617b881956b22a (diff) | |
| download | ruby-d1f8694171eed1544a8cc7c29ede155679efa0ca.tar.gz | |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66116 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regparse.c')
| -rw-r--r-- | regparse.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/regparse.c b/regparse.c index e17a73d5b6..401dbd4b17 100644 --- a/regparse.c +++ b/regparse.c @@ -5878,22 +5878,7 @@ node_extended_grapheme_cluster(Node** np, ScanEnv* env) 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); } |