summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-12-29 16:12:13 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-12-29 16:12:13 +0000
commit57ea42c11270f3e64e364203ed3838c5dc25cbd6 (patch)
tree4270456aea6ea1e72094fe2545755f2638c0f375
parent5cdf16b6cf738ff134444fc936a03ba243b02b99 (diff)
downloadruby-57ea42c11270f3e64e364203ed3838c5dc25cbd6.tar.gz
ruby-57ea42c11270f3e64e364203ed3838c5dc25cbd6.tar.xz
ruby-57ea42c11270f3e64e364203ed3838c5dc25cbd6.zip
* eval.c (svalue_to_avalue): [ruby-dev:25366]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7686 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog2
-rw-r--r--eval.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a99636f4d..8203597ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
Thu Dec 30 00:41:42 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (svalue_to_avalue): [ruby-dev:25366]
+
* string.c (rb_str_justify): [ruby-dev:25367]
Wed Dec 29 11:07:07 2004 Dave Thomas <dave@pragprog.com>
diff --git a/eval.c b/eval.c
index a8a3cb19e..eb0fa3873 100644
--- a/eval.c
+++ b/eval.c
@@ -2545,7 +2545,7 @@ svalue_to_avalue(v)
if (RARRAY(tmp)->len == 1) {
top = rb_check_array_type(RARRAY(tmp)->ptr[0]);
if (!NIL_P(top) && RARRAY(top)->len > 1) {
- return v;
+ return tmp;
}
return rb_ary_new3(1, v);
}