summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-12 12:04:53 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-12 12:04:53 +0000
commit84a5f020ced8df5b2778b4172064c99da00b89f7 (patch)
tree1762f2206afe7109d8ff741de474fc12e5e0bd1e
parentbd2c5f691d035e781431362571083067945afe86 (diff)
downloadruby-84a5f020ced8df5b2778b4172064c99da00b89f7.tar.gz
ruby-84a5f020ced8df5b2778b4172064c99da00b89f7.tar.xz
ruby-84a5f020ced8df5b2778b4172064c99da00b89f7.zip
* parse.y (exc_list): should use mrhs if non array.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15447 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--parse.y2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c1784574a..224e37c8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 12 21:04:51 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (exc_list): should use mrhs if non array.
+
Tue Feb 12 20:32:50 2008 Tadayoshi Funaba <tadf@dotrb.org>
* lib/rational.rb (floor, ceil, truncate, round): do not use
diff --git a/parse.y b/parse.y
index c0ff1fad2..3a769631d 100644
--- a/parse.y
+++ b/parse.y
@@ -3549,7 +3549,7 @@ exc_list : arg_value
| mrhs
{
/*%%%*/
- $$ = splat_array($1);
+ if (!($$ = splat_array($1))) $$ = $1;
/*%
$$ = $1;
%*/