diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-06-05 17:36:47 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-06-05 17:36:47 -0700 |
| commit | 7880a4bc224f938e2d22f1f94315e8cd49aa6d1c (patch) | |
| tree | dcfe38f9c0fc38984e86ec8f5ec0846584c92027 | |
| parent | e13ab955a58e152fbf4c78ebc90fe2a14cda9f4a (diff) | |
| download | psych-7880a4bc224f938e2d22f1f94315e8cd49aa6d1c.zip | |
merging from ruby trunk
| -rw-r--r-- | lib/psych/nodes.rb | 2 | ||||
| -rw-r--r-- | test/psych/test_null.rb | 2 | ||||
| -rw-r--r-- | test/psych/test_struct.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/psych/nodes.rb b/lib/psych/nodes.rb index 9e5946d..f3b33fe 100644 --- a/lib/psych/nodes.rb +++ b/lib/psych/nodes.rb @@ -31,7 +31,7 @@ module Psych # doc = Psych::Nodes::Document.new # seq = Psych::Nodes::Sequence.new # scalar = Psych::Nodes::Scalar.new('foo') - # + # # # Build up our tree # stream.children << doc # doc.children << seq diff --git a/test/psych/test_null.rb b/test/psych/test_null.rb index 1ebf644..0fee1d2 100644 --- a/test/psych/test_null.rb +++ b/test/psych/test_null.rb @@ -10,7 +10,7 @@ module Psych --- - ~ - null -- +- - Null - NULL eoyml diff --git a/test/psych/test_struct.rb b/test/psych/test_struct.rb index 42c4e11..39e38f7 100644 --- a/test/psych/test_struct.rb +++ b/test/psych/test_struct.rb @@ -39,7 +39,7 @@ module Psych def test_load obj = Psych.load(<<-eoyml) ---- !ruby/struct:PsychStructWithIvar +--- !ruby/struct:PsychStructWithIvar :foo: bar :@bar: hello eoyml |