From 096845e09f2a41943d97bbab3bb58d171679eaa2 Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 19 Dec 2008 11:37:41 +0000 Subject: merges r20859 from trunk into ruby_1_9_1. * lib/optparse/version.rb: remove variable shadowing to stop warning. [ruby-core:20612] * lib/irb/completion.rb, lib/net/imap.rb, lib/prime.rb, lib/rinda/ring.rb, lib/racc/parser.rb, lib/shell/command-processor.rb, lib/yaml/yamlnode.rb: ditto. * lib/racc/parser.rb: remove space before parentheses. * lib/shell/command-processor.rb, lib/shell/process-controller.rb: use parentheses around arguments. * lib/irb/ext/change-ws.rb, lib/rexml/validation/relaxng.rb, lib/yaml/baseemitter.rb: indentation fix. * lib/matrix.rb: small cosmetic change. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20880 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/yaml/yamlnode.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/yaml/yamlnode.rb') diff --git a/lib/yaml/yamlnode.rb b/lib/yaml/yamlnode.rb index e36a18e69..8afa14266 100644 --- a/lib/yaml/yamlnode.rb +++ b/lib/yaml/yamlnode.rb @@ -11,13 +11,13 @@ module YAML class YamlNode include BaseNode attr_accessor :kind, :type_id, :value, :anchor - def initialize( t, v ) + def initialize(t, v) @type_id = t if Hash === v @kind = 'map' @value = {} - v.each { |k,v| - @value[ k.transform ] = [ k, v ] + v.each {|key,val| + @value[key.transform] = [key, val] } elsif Array === v @kind = 'seq' -- cgit