Skip to content

Commit

Permalink
* lib/yaml/rubytypes.rb (Fixnum): Bignum could not be loaded in
Browse files Browse the repository at this point in the history
  ruby 1.8.3/1.8.4. [ruby-core:6115]

* lib/yaml/rubytypes.rb (Numeric): Subclass of Numeric could not
  be dumped properly. [ruby-core:7047]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9816 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
ocean committed Jan 10, 2006
1 parent 163224f commit 12d3325
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 10 deletions.
8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
Tue Jan 10 12:47:41 2006 Hirokazu Yamamoto <[email protected]>

* lib/yaml/rubytypes.rb (Fixnum): Bignum could not be loaded in
ruby 1.8.3/1.8.4. [ruby-core:6115]

* lib/yaml/rubytypes.rb (Numeric): Subclass of Numeric could not
be dumped properly. [ruby-core:7047]

Tue Jan 10 12:00:48 2006 Aaron Schrab <aaron @nospam@ schrab.com>

* lib/yaml/rubytypes.rb (Symbol#yaml_new): YAML loading of quoted
Expand Down
22 changes: 12 additions & 10 deletions lib/yaml/rubytypes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,17 @@ def to_yaml( opts = {} )
end
end

class Numeric
class Integer
yaml_as "tag:yaml.org,2002:int"
def to_yaml( opts = {} )
YAML::quick_emit( nil, opts ) do |out|
out.scalar( "tag:yaml.org,2002:int", self.to_s, :plain )
end
end
end

class Float
yaml_as "tag:yaml.org,2002:float"
def to_yaml( opts = {} )
YAML::quick_emit( nil, opts ) do |out|
str = self.to_s
Expand All @@ -364,19 +374,11 @@ def to_yaml( opts = {} )
elsif str == "NaN"
str = ".NaN"
end
out.scalar( taguri, str, :plain )
out.scalar( "tag:yaml.org,2002:float", str, :plain )
end
end
end

class Fixnum
yaml_as "tag:yaml.org,2002:int"
end

class Float
yaml_as "tag:yaml.org,2002:float"
end

class TrueClass
yaml_as "tag:yaml.org,2002:bool#yes"
def to_yaml( opts = {} )
Expand Down
17 changes: 17 additions & 0 deletions test/yaml/test_yaml.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1236,6 +1236,23 @@ def test_symbol_cycle
assert_cycle(:"^foo")
end

#
# Test Numeric cycle
#
class NumericTest < Numeric
def initialize(value)
@value = value
end
def ==(other)
@value == other.instance_eval{ @value }
end
end
def test_numeric_cycle
assert_cycle(1) # Fixnum
assert_cycle(111111111111111111111111111111111) # Bignum
assert_cycle(NumericTest.new(3)) # Subclass of Numeric
end

end

if $0 == __FILE__
Expand Down

0 comments on commit 12d3325

Please sign in to comment.