From 8ab36f0306a511881fb008bd1c60abd7918dae46 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 11 Jun 2015 08:07:49 +0000 Subject: fake.rb.in: scan version.c * template/fake.rb.in: scan MKSTR and MKINT from version.c and then extract the value for them from version.i. * version.c (Init_version): use MKINT as the marker. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50833 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- template/fake.rb.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'template/fake.rb.in') diff --git a/template/fake.rb.in b/template/fake.rb.in index 646a89fe25..fa7f1f79e1 100644 --- a/template/fake.rb.in +++ b/template/fake.rb.in @@ -8,8 +8,10 @@ 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*\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') + File.read(File.join(arg['srcdir'], 'version.c')). + scan(/rb_define_global_const\("(RUBY_\w+)",[^;]*?\bMK(?:INT|STR)\(([^()]*)\)/m) do |n, v| + version[n] = + eval(src[/\bruby_#{v}(?:\[\])?\s*=\s*((?:"(?:\\.|[^\"\\])*"\s*)*(?=;)|[^{};]+)/m, 1].gsub(/#/, '\\#')) end end %>baseruby="<%=arg['BASERUBY']%>" -- cgit v1.2.3