summaryrefslogtreecommitdiffstats
path: root/regparse.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-17 07:05:30 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-17 07:05:30 +0000
commit571e78d2080c63f31f6325120497c2d1dc4b7450 (patch)
tree15b5a4a25ee5bdd1c1d0abe601f2126962cf5c87 /regparse.c
parent239897c2e6fa04dc3660a6234129b919e84ca51c (diff)
downloadruby-571e78d2080c63f31f6325120497c2d1dc4b7450.tar.gz
ruby-571e78d2080c63f31f6325120497c2d1dc4b7450.tar.xz
ruby-571e78d2080c63f31f6325120497c2d1dc4b7450.zip
* regparse.c (parse_char_class): fixes a wrong merge r25531.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25816 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regparse.c')
-rw-r--r--regparse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/regparse.c b/regparse.c
index 35b6c33e7..1fc0459fa 100644
--- a/regparse.c
+++ b/regparse.c
@@ -4406,7 +4406,7 @@ parse_char_class(Node** np, OnigToken* tok, UChar** src, UChar* end,
r = parse_char_class(&anode, tok, &p, end, env);
if (r == 0) {
acc = NCCLASS(anode);
- r = or_cclass(cc, acc, env);
+ r = or_cclass(cc, acc, env->enc);
}
onig_node_free(anode);
if (r != 0) goto err;