diff options
| author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-06 08:00:54 +0000 |
|---|---|---|
| committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-06 08:00:54 +0000 |
| commit | 56d4257a673d8059d6a0e019d1b10cf8f182132a (patch) | |
| tree | 47102de711f43b6de42adfd6390d2dbe1498d56c | |
| parent | 4194ca02fb2899ce00e6284953d1fd4ee8bdbf38 (diff) | |
| download | ruby-56d4257a673d8059d6a0e019d1b10cf8f182132a.tar.gz | |
* ext/psych/lib/psych/visitors/to_ruby.rb: fix support for regular
expressions with newlines. tenderlove/psych#222
* test/psych/test_yaml.rb: test for change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49524 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/psych/lib/psych/visitors/to_ruby.rb | 4 | ||||
| -rw-r--r-- | test/psych/test_yaml.rb | 4 |
3 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Fri Feb 6 16:58:31 2015 Aaron Patterson <aaron@tenderlovemaking.com> + + * ext/psych/lib/psych/visitors/to_ruby.rb: fix support for regular + expressions with newlines. tenderlove/psych#222 + + * test/psych/test_yaml.rb: test for change. + Fri Feb 6 10:31:50 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * vm_core.h (rb_call_info_kw_arg_struct): make keywords a symbols diff --git a/ext/psych/lib/psych/visitors/to_ruby.rb b/ext/psych/lib/psych/visitors/to_ruby.rb index 5bd33b4d7d..b68abb6919 100644 --- a/ext/psych/lib/psych/visitors/to_ruby.rb +++ b/ext/psych/lib/psych/visitors/to_ruby.rb @@ -32,7 +32,7 @@ module Psych return result if @domain_types.empty? || !target.tag key = target.tag.sub(/^[!\/]*/, '').sub(/(,\d+)\//, '\1:') - key = "tag:#{key}" unless key =~ /^(tag:|x-private)/ + key = "tag:#{key}" unless key =~ /^(?:tag:|x-private)/ if @domain_types.key? key value, block = @domain_types[key] @@ -89,7 +89,7 @@ module Psych Float(@ss.tokenize(o.value)) when "!ruby/regexp" klass = class_loader.regexp - o.value =~ /^\/(.*)\/([mixn]*)$/ + o.value =~ /^\/(.*)\/([mixn]*)$/m source = $1 options = 0 lang = nil diff --git a/test/psych/test_yaml.rb b/test/psych/test_yaml.rb index cd3e8ee72c..e6281753a5 100644 --- a/test/psych/test_yaml.rb +++ b/test/psych/test_yaml.rb @@ -27,6 +27,10 @@ class Psych_Unit_Tests < Psych::TestCase assert_match "2010-10-10 00:00:00.000000000 Z", yaml end + def test_multiline_regexp + assert_cycle(Regexp.new("foo\nbar")) + end + # [ruby-core:34969] def test_regexp_with_n assert_cycle(Regexp.new('',0,'n')) |