1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* parse.y: Improve duplicate key warning with patch by @andremedeiros

[Fix GH-938] https://github.com/ruby/ruby/pull/938 [Bug #11327]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51196 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
zzak 2015-07-09 00:27:04 +00:00
parent 39051ba1b9
commit d5e6c16762
2 changed files with 7 additions and 2 deletions

View file

@ -1,3 +1,8 @@
Thu Jul 9 09:25:50 2015 Zachary Scott <e@zzak.io>
* parse.y: Improve duplicate key warning with patch by @andremedeiros
[Fix GH-938] https://github.com/ruby/ruby/pull/938 [Bug #11327]
Wed Jul 8 07:43:01 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* lib/csv.rb: typo fix [ci skip][fix GH-958] Patch by @henrik

View file

@ -9934,8 +9934,8 @@ remove_duplicate_keys(struct parser_params *parser, NODE *hash)
if (nd_type(head) == NODE_LIT &&
st_lookup(literal_keys, (key = head->nd_lit), &data)) {
rb_compile_warn(ruby_sourcefile, nd_line((NODE *)data),
"duplicated key at line %d ignored: %+"PRIsVALUE,
nd_line(head), head->nd_lit);
"key %+"PRIsVALUE" is duplicated and overwritten on line %d",
head->nd_lit, nd_line(head));
head = ((NODE *)data)->nd_next;
head->nd_head = block_append(head->nd_head, value->nd_head);
}