summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--parse.y2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 35d891b120..d21fc912b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 29 08:08:07 2009 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * parse.y (regexp): regexp literal at the top of dstr is still needed
+ even if it is empty.
+
Wed Jul 29 03:36:24 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/json/lib/json/common.rb (JSON#recurse_proc): remove
diff --git a/parse.y b/parse.y
index 10ac878749..fbbad25fb8 100644
--- a/parse.y
+++ b/parse.y
@@ -3831,7 +3831,7 @@ regexp : tREGEXP_BEG xstring_contents tREGEXP_END
}
break;
default:
- node = NEW_NODE(NODE_DSTR, Qnil, 1, NEW_LIST(node));
+ node = NEW_NODE(NODE_DSTR, STR_NEW0(), 1, NEW_LIST(node));
case NODE_DSTR:
if (options & RE_OPTION_ONCE) {
nd_set_type(node, NODE_DREGX_ONCE);