diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-17 07:05:30 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-17 07:05:30 +0000 |
| commit | f2e6cb4f3de6ca47a77e2c7bd0df39e3457f625b (patch) | |
| tree | 15b5a4a25ee5bdd1c1d0abe601f2126962cf5c87 /regparse.c | |
| parent | f4d1fd31751b8502326644820c30d304cb06a070 (diff) | |
* regparse.c (parse_char_class): fixes a wrong merge r25531.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25816 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regparse.c')
| -rw-r--r-- | regparse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/regparse.c b/regparse.c index 35b6c33e77..1fc0459fa6 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; |