summaryrefslogtreecommitdiffstats
path: root/regparse.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-25 14:47:06 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-25 14:47:06 +0000
commitf8c39639e54e6a326662b7b0e2f47bc2ff8d2c74 (patch)
treed5e0358861a98041e0133d8a7d4c325f3298cdbb /regparse.c
parent95d5f1eac3cf879117a0a52e9630735650e912b5 (diff)
downloadruby-f8c39639e54e6a326662b7b0e2f47bc2ff8d2c74.tar.gz
ruby-f8c39639e54e6a326662b7b0e2f47bc2ff8d2c74.tar.xz
ruby-f8c39639e54e6a326662b7b0e2f47bc2ff8d2c74.zip
merges r24546 from trunk into ruby_1_9_1.
-- * regparse.c (add_ctype_to_cc_by_range): fix the first character bigger than sb_out was dropped. * test/ruby/test_regexp.rb (TestRegexp#test_posix_bracket): add tests for above. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25484 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regparse.c')
-rw-r--r--regparse.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/regparse.c b/regparse.c
index 8a02966de..87008221f 100644
--- a/regparse.c
+++ b/regparse.c
@@ -3768,8 +3768,7 @@ add_ctype_to_cc_by_range(CClassNode* cc, int ctype ARG_UNUSED, int not,
for (j = ONIGENC_CODE_RANGE_FROM(mbr, i);
j <= ONIGENC_CODE_RANGE_TO(mbr, i); j++) {
if (j >= sb_out) {
- if (j == ONIGENC_CODE_RANGE_TO(mbr, i)) i++;
- else if (j > ONIGENC_CODE_RANGE_FROM(mbr, i)) {
+ if (j > ONIGENC_CODE_RANGE_FROM(mbr, i)) {
r = add_code_range_to_buf(&(cc->mbuf), j,
ONIGENC_CODE_RANGE_TO(mbr, i));
if (r != 0) return r;