1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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
This commit is contained in:
yugui 2009-11-17 07:05:30 +00:00
parent f4d1fd3175
commit f2e6cb4f3d
3 changed files with 6 additions and 2 deletions

View file

@ -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.

View file

@ -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;

View file

@ -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