diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | parse.y | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -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 @@ -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); } |