From c016a516bfac8ebb1d80e050a25e6e1dd8571831 Mon Sep 17 00:00:00 2001 From: ksaito Date: Tue, 27 Apr 2004 16:04:30 +0000 Subject: This commit was generated by cvs2svn to compensate for changes in r6227, which included commits to RCS files with non-trunk default branches. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- regcomp.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'regcomp.c') diff --git a/regcomp.c b/regcomp.c index de44cfe03..69a63011d 100644 --- a/regcomp.c +++ b/regcomp.c @@ -3950,17 +3950,22 @@ optimize_node_left(Node* node, NodeOptInfo* opt, OptEnv* env) } } - if (! ONIGENC_IS_SINGLEBYTE(env->enc)) { - if (! IS_NULL(cc->mbuf) || - (cc->not != 0 && found != 0)) { - for (i = 0; i < SINGLE_BYTE_SIZE; i++) { - z = ONIGENC_IS_MBC_HEAD(env->enc, i); - if (z) { - mb_found = 1; - add_char_opt_map_info(&opt->map, i); - } - } - } + if (IS_NULL(cc->mbuf)) { + if (cc->not) { + for (i = 0; i < SINGLE_BYTE_SIZE; i++) { + add_char_opt_map_info(&opt->map, i); + } + mb_found = 1; + } + } + else { + for (i = 0; i < SINGLE_BYTE_SIZE; i++) { + z = ONIGENC_IS_MBC_HEAD(env->enc, i); + if (z) { + mb_found = 1; + add_char_opt_map_info(&opt->map, i); + } + } } if (mb_found) { -- cgit