summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--parse.y4
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3467104689..37687ce2b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 24 16:24:25 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * parse.y (reg_fragment_setenc_gen): recognize regexp with option n as
+ as ASCII-8BIT instead of US-ASCII. [ruby-dev:33339]
+
Thu Jan 24 15:44:42 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* array.c (collect_bang_i): use rb_ary_store() to avoid potential
diff --git a/parse.y b/parse.y
index aabcc5c18f..d6434d78c4 100644
--- a/parse.y
+++ b/parse.y
@@ -456,6 +456,7 @@ static int lvar_defined_gen(struct parser_params*, ID);
#define RE_OPTION_ENCODING_SHIFT 8
#define RE_OPTION_ENCODING(e) (((e)&0xff)<<RE_OPTION_ENCODING_SHIFT)
#define RE_OPTION_ENCODING_IDX(o) (((o)>>RE_OPTION_ENCODING_SHIFT)&0xff)
+#define RE_OPTION_ENCODING_NONE(o) ((o)&32)
#define RE_OPTION_MASK 0xff
#define NODE_STRTERM NODE_ZARRAY /* nothing to gc */
@@ -8478,6 +8479,9 @@ reg_fragment_setenc_gen(struct parser_params* parser, VALUE str, int options)
}
ENCODING_SET(str, idx);
}
+ else if (RE_OPTION_ENCODING_NONE(options)) {
+ rb_enc_associate(str, rb_ascii8bit_encoding());
+ }
}
static void