From 9ddccb154e04158771e52a914aea85aca373c03c Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 10 Jun 2015 15:34:42 +0000 Subject: fake.rb.in: match spaces * template/fake.rb.in: expanded macro result may have spaces between tokens. [ruby-dev:49047] [Bug #11243] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50816 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- template/fake.rb.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'template/fake.rb.in') diff --git a/template/fake.rb.in b/template/fake.rb.in index a2de876e35..646a89fe25 100644 --- a/template/fake.rb.in +++ b/template/fake.rb.in @@ -8,8 +8,8 @@ end if arg['i'] src = File.read(arg['i']) arg['versions'] = version = {} - src.scan(/rb_define_global_const\("(RUBY_\w+)",\s*(?:.*rb_\w*str_new\w*\((\w+)|\(*\(VALUE\)\((.+)\)\)\s*<<\s?)/) do |n, s, i| - version[n] = i ? i.to_i : src[/\b#{s}\[\]\s*=\s*((?:"(?:\\.|[^\"\\])*"\s*)*);/m, 1].gsub(/\A"|"\z|" *"/, '').gsub(/\\(.)/, '\1') + src.scan(/rb_define_global_const\("(RUBY_\w+)",\s*(?:.*rb_\w*str_new\w*\s*\(\s*(\w+)|[\(\s]*\(\s*VALUE\s*\)\s*\((.+)\)\s*\)\s*<<\s?)/) do |n, s, i| + version[n] = i ? i.gsub(/\s+/, '').to_i : src[/\b#{s}\[\]\s*=\s*((?:"(?:\\.|[^\"\\])*"\s*)*);/m, 1].gsub(/\A"|"\s*\z|" *"/, '').gsub(/\\(.)/, '\1') end end %>baseruby="<%=arg['BASERUBY']%>" -- cgit v1.2.3