diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | regparse.c | 2 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Tue Nov 17 16:04:13 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp> + + * regparse.c (parse_char_class): fixes a wrong merge r25531. + Tue Nov 17 16:01:02 2009 NAKAMURA Usaku <usa@ruby-lang.org> * insns.def (opt_case_dispatch): need cast. 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; @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 338 +#define RUBY_PATCHLEVEL 339 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |