diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-02-24 06:32:48 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-02-24 06:32:48 +0000 |
| commit | e795dfe2ded7a3e2495167536abb9d467e54be3e (patch) | |
| tree | 8e857818e371256600c8a942d70c74a4f0840e2c | |
| parent | 207914bc1e7c78ad92e226fd7cd239a913f311bd (diff) | |
Update psych-2.2.3
* It's only typo fix for CRuby.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ext/psych/lib/psych/versions.rb | 4 | ||||
| -rw-r--r-- | ext/psych/psych.gemspec | 6 | ||||
| -rw-r--r-- | ext/psych/yaml/emitter.c | 8 |
3 files changed, 8 insertions, 10 deletions
diff --git a/ext/psych/lib/psych/versions.rb b/ext/psych/lib/psych/versions.rb index 455a0142cf..689d4f3db6 100644 --- a/ext/psych/lib/psych/versions.rb +++ b/ext/psych/lib/psych/versions.rb @@ -1,9 +1,9 @@ # frozen_string_literal: false module Psych # The version is Psych you're using - VERSION = '2.2.2' + VERSION = '2.2.3' if RUBY_ENGINE == 'jruby' - DEFAULT_SNAKEYAML_VERSION = '1.17'.freeze + DEFAULT_SNAKEYAML_VERSION = '1.18'.freeze end end diff --git a/ext/psych/psych.gemspec b/ext/psych/psych.gemspec index 9597e9866b..c73df3580c 100644 --- a/ext/psych/psych.gemspec +++ b/ext/psych/psych.gemspec @@ -1,10 +1,8 @@ # -*- encoding: utf-8 -*- -$:.unshift File.expand_path("../lib", __FILE__) -require 'psych' Gem::Specification.new do |s| s.name = "psych" - s.version = Psych::VERSION + s.version = "2.2.3" s.authors = ["Aaron Patterson", "SHIBATA Hiroshi", "Charles Oliver Nutter"] s.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org", "headius@headius.com"] s.date = "2016-11-14" @@ -34,7 +32,7 @@ DESCRIPTION if RUBY_ENGINE == 'jruby' s.platform = 'java' s.files.concat ["ext/java/PsychEmitter.java", "ext/java/PsychLibrary.java", "ext/java/PsychParser.java", "ext/java/PsychToRuby.java", "ext/java/PsychYamlTree.java", "lib/psych_jars.rb", "lib/psych.jar"] - s.requirements = "jar org.yaml:snakeyaml, 1.17" + s.requirements = "jar org.yaml:snakeyaml, 1.18" s.add_dependency 'jar-dependencies', '>= 0.1.7' s.add_development_dependency 'ruby-maven' else diff --git a/ext/psych/yaml/emitter.c b/ext/psych/yaml/emitter.c index cb0b3a2ebc..5adcbdeb32 100644 --- a/ext/psych/yaml/emitter.c +++ b/ext/psych/yaml/emitter.c @@ -1493,7 +1493,7 @@ yaml_emitter_analyze_scalar(yaml_emitter_t *emitter, int break_space = 0; int space_break = 0; - int preceeded_by_whitespace = 0; + int preceded_by_whitespace = 0; int followed_by_whitespace = 0; int previous_space = 0; int previous_break = 0; @@ -1524,7 +1524,7 @@ yaml_emitter_analyze_scalar(yaml_emitter_t *emitter, flow_indicators = 1; } - preceeded_by_whitespace = 1; + preceded_by_whitespace = 1; followed_by_whitespace = IS_BLANKZ_AT(string, WIDTH(string)); while (string.pointer != string.end) @@ -1570,7 +1570,7 @@ yaml_emitter_analyze_scalar(yaml_emitter_t *emitter, } } - if (CHECK(string, '#') && preceeded_by_whitespace) { + if (CHECK(string, '#') && preceded_by_whitespace) { flow_indicators = 1; block_indicators = 1; } @@ -1619,7 +1619,7 @@ yaml_emitter_analyze_scalar(yaml_emitter_t *emitter, previous_break = 0; } - preceeded_by_whitespace = IS_BLANKZ(string); + preceded_by_whitespace = IS_BLANKZ(string); MOVE(string); if (string.pointer != string.end) { followed_by_whitespace = IS_BLANKZ_AT(string, WIDTH(string)); |