aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-11 04:46:42 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-11 04:46:42 +0000
commit1571682719525d67ae355e4a0394c002f4aa30f1 (patch)
tree7a430f1db89189d02a0e92664b473906b0d9bc95 /ChangeLog
parent81ce0e38535d71e53635354bfab6f64a30d556f0 (diff)
downloadruby-1571682719525d67ae355e4a0394c002f4aa30f1.tar.gz
parse.y: precedence of duplicated keys
* parse.y (assocs): concatenate splatted literal hashes. the former key has precedence even if duplicated literal keys follow. [ruby-core:65368] [Bug #10315] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47877 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bbb6357a70..afe887032b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Oct 11 13:46:53 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (assocs): concatenate splatted literal hashes. the
+ former key has precedence even if duplicated literal keys
+ follow. [ruby-core:65368] [Bug #10315]
+
Sat Oct 11 12:27:03 2014 Yuki Yugui Sonoda <yugui@yugui.jp>
* configure.in (RUBY_NACL): automatically locate pnacl-clang.