ruby.git/ext/psych, branch ruby_2_0_0

merge revision(s) r45453: [Backport #9798]

2014-05-07T17:30:15+00:00

	* ext/psych/yaml/config.h: ditto.

	* ext/psych/yaml/scanner.c: ditto.

	* ext/psych/yaml/yaml_private.h: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45870 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

merge revision(s) r45003: [Backport #9481]

2014-02-21T11:55:57+00:00

	ext/psych/yaml: suppress warnings

	* ext/psych/yaml/emitter.c (WRITE_BREAK, PUT_BREAK): suppress
  unused-value warnings.

	* ext/psych/yaml/parser.c, ext/psych/yaml/scanner.c: suppress
  unused-but-set-variable warnings.

	* ext/psych/yaml/yaml_private.h (STACK_EMPTY): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45077 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

merge revision(s) r44809,r44813,r44815,r44816,r44817,r44818,r44918: [Backport #9481]

2014-02-15T16:48:09+00:00

	* ext/psych/yaml/emitter.c: merge libyaml 0.1.5

	* ext/psych/yaml/loader.c: ditto

	* ext/psych/yaml/parser.c: ditto

	* ext/psych/yaml/reader.c: ditto

	* ext/psych/yaml/scanner.c: ditto

	* ext/psych/yaml/writer.c: ditto

	* ext/psych/yaml/yaml_private.h: ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44988 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

merge revision(s) 39286,39287:

2013-03-04T14:43:08+00:00

	* ext/psych/lib/psych/y.rb: Document Kernel#y by Adam Stankiewicz
	  [Github tenderlove/psych#118]
	  [Github tenderlove/psych#127]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39582 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/psych/lib/psych/visitors/yaml_tree.rb: fixing string quotation

2013-02-07T23:54:29+00:00

  when dumping Ruby strings. Thanks Ingy

* test/psych/test_psych.rb: appropriate tests.

* test/psych/test_yaml.rb: ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39144 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/psych/lib/psych/visitors/yaml_tree.rb: change output reference

2013-02-07T23:52:01+00:00

  ids to be sequential numbers.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/psych/lib/psych/scalar_scanner.rb: use constants rather than

2013-01-17T01:49:55+00:00

  calculating Inf and NaN.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38857 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/psych/yaml/scanner.c: Fix typos, patch by James Dabbs

2013-01-13T07:47:10+00:00

  [Github tenderlove/psych#118]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/psych/lib/psych/visitors/to_ruby.rb: merge key values that

2013-01-12T00:00:12+00:00

  contain something besides a hash should be left in tact.

* test/psych/test_merge_keys.rb: test for change

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38788 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/psych/lib/psych/scalar_scanner.rb: strip trailing dots from

2013-01-09T19:26:45+00:00

  floats so that Float() will not raise an exception.

* test/psych/test_numeric.rb: test to ensure "1." can be loaded

* test/psych/test_string.rb: make sure "1." can round trip

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38754 b2dd03c8-39d4-4d8f-98ff-823fe69b080e