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

* re.c (rb_reg_initialize_m): shoule not preset "kcode" unless

encoding is explicitly specified.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3453 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2003-02-06 10:06:47 +00:00
parent f3607247c8
commit 766f2adb74
2 changed files with 22 additions and 15 deletions

View file

@ -1,3 +1,8 @@
Thu Feb 6 19:04:32 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* re.c (rb_reg_initialize_m): shoule not preset "kcode" unless
encoding is explicitly specified.
Thu Feb 6 19:01:32 2003 Minero Aoki <aamine@loveruby.net>
* lib/fileutils.rb: new method FileUtils.pwd.

32
re.c
View file

@ -1239,21 +1239,23 @@ rb_reg_initialize_m(argc, argv, self)
}
rb_reg_check(argv[0]);
flags = RREGEXP(argv[0])->ptr->options & 0xf;
switch (RBASIC(argv[0])->flags & KCODE_MASK) {
case KCODE_NONE:
flags |= 16;
break;
case KCODE_EUC:
flags |= 32;
break;
case KCODE_SJIS:
flags |= 48;
break;
case KCODE_UTF8:
flags |= 64;
break;
default:
break;
if (FL_TEST(argv[0], KCODE_FIXED)) {
switch (RBASIC(argv[0])->flags & KCODE_MASK) {
case KCODE_NONE:
flags |= 16;
break;
case KCODE_EUC:
flags |= 32;
break;
case KCODE_SJIS:
flags |= 48;
break;
case KCODE_UTF8:
flags |= 64;
break;
default:
break;
}
}
s = RREGEXP(argv[0])->str;
len = RREGEXP(argv[0])->len;