aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-05-18 05:00:58 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-05-18 05:00:58 +0000
commit06ec03900534450824896d6fb0bb7eadad2a4ba2 (patch)
tree30a9e1b0287f662e68eb367bf7fd50db8de71f05
parent3375c0bf6a50d148d8d8ead725f1f557b8a14feb (diff)
downloadruby-06ec03900534450824896d6fb0bb7eadad2a4ba2.tar.gz
* node.h (NEW_DSTR): adjust list length.
* parse.y (literal_concat): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6356 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--node.h2
-rw-r--r--parse.y1
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f2feffaae9..8222a09a5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue May 18 14:00:46 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * node.h (NEW_DSTR): adjust list length.
+
+ * parse.y (literal_concat): ditto.
+
Tue May 18 09:30:25 2004 SASADA Koichi <ko1@atdot.net>
* eval.c (rb_method_node): search cache entry first.
diff --git a/node.h b/node.h
index c994961bad..3795a91b2d 100644
--- a/node.h
+++ b/node.h
@@ -297,7 +297,7 @@ typedef struct RNode {
#define NEW_MATCH3(r,n2) NEW_NODE(NODE_MATCH3,r,n2,0)
#define NEW_LIT(l) NEW_NODE(NODE_LIT,l,0,0)
#define NEW_STR(s) NEW_NODE(NODE_STR,s,0,0)
-#define NEW_DSTR(s) NEW_NODE(NODE_DSTR,s,0,0)
+#define NEW_DSTR(s) NEW_NODE(NODE_DSTR,s,1,0)
#define NEW_XSTR(s) NEW_NODE(NODE_XSTR,s,0,0)
#define NEW_DXSTR(s) NEW_NODE(NODE_DXSTR,s,0,0)
#define NEW_DSYM(s) NEW_NODE(NODE_DSYM,s,0,0)
diff --git a/parse.y b/parse.y
index 03369ea242..d934774eb4 100644
--- a/parse.y
+++ b/parse.y
@@ -4681,6 +4681,7 @@ literal_concat(head, tail)
case NODE_EVSTR:
if (htype == NODE_STR) {
nd_set_type(head, NODE_DSTR);
+ head->nd_alen = 1;
}
list_append(head, tail);
break;