summaryrefslogtreecommitdiff
path: root/re.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-06-13 09:42:40 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-06-13 09:42:40 +0000
commit9ee0cafbfe7a94a7b6a9d0e7f2dbf7c7fd229757 (patch)
tree6bf09f98a1fdc4f538a37d9d12b7ce602c63b0a6 /re.c
parent97f8593cf8af3b44e170fee5aca9b0a521cd3ffd (diff)
2000-06-13
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@750 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r--re.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/re.c b/re.c
index ca1972a..5559ce0 100644
--- a/re.c
+++ b/re.c
@@ -520,16 +520,20 @@ rb_reg_prepare_re(re)
VALUE re;
{
int need_recompile = 0;
+ int state;
rb_reg_check(re);
- /* case-flag not set for the object */
- if (!(RREGEXP(re)->ptr->options & RE_OPTION_IGNORECASE)) {
- int state = FL_TEST(re, REG_CASESTATE);
-
- if ((ruby_ignorecase || state) && !(ruby_ignorecase && state)) {
- RBASIC(re)->flags ^= REG_CASESTATE;
- need_recompile = 1;
- }
+ state = FL_TEST(re, REG_CASESTATE);
+ /* ignorecase status */
+ if (ruby_ignorecase && !state) {
+ FL_SET(re, REG_CASESTATE);
+ RREGEXP(re)->ptr->options |= RE_OPTION_IGNORECASE;
+ need_recompile = 1;
+ }
+ if (!ruby_ignorecase && state) {
+ FL_UNSET(re, REG_CASESTATE);
+ RREGEXP(re)->ptr->options &= ~RE_OPTION_IGNORECASE;
+ need_recompile = 1;
}
if (!FL_TEST(re, KCODE_FIXED) &&