[前][次][番号順一覧][スレッド一覧]

ruby-changes:73418

From: Nobuyoshi <ko1@a...>
Date: Mon, 5 Sep 2022 11:26:00 +0900 (JST)
Subject: [ruby-changes:73418] 1420333455 (master): Fix fake.rb expansion from preprocessed version.h

https://git.ruby-lang.org/ruby.git/commit/?id=1420333455

From 1420333455ba335f46887ee7a06c4ee95faa37ad Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Mon, 5 Sep 2022 11:25:42 +0900
Subject: Fix fake.rb expansion from preprocessed version.h

---
 template/fake.rb.in | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/template/fake.rb.in b/template/fake.rb.in
index 67eb6dcec0..aff9bbb375 100644
--- a/template/fake.rb.in
+++ b/template/fake.rb.in
@@ -18,14 +18,13 @@ def src.value(name) https://github.com/ruby/ruby/blob/trunk/template/fake.rb.in#L18
   end
   eval(val.gsub(/#/, '\\#').gsub(/((?:\G|[^\\])(?:\\\\)*)\n/, '\1'))
 end
-version = Hash.new {|h, v| h[v] || src.value(v)}
-arg['versions'] = version
+arg['versions'] = version = {}
 File.read(File.join(arg['srcdir'], 'version.c')).
   scan(/rb_define_global_const\("(RUBY_\w+)",[^;]*?\bMK(?:INT|(STR))\(([^()]*)\)/m) do |n, s, v|
-  version[n] = arg[v] || (s ? "" : 0)
+  version[n] = arg[v] || src.value(v) || (s ? "" : 0)
 end
-arg['RUBY_DESCRIPTION_WITH_MJIT'] = arg['description_with_mjit'] || ""
-arg['RUBY_DESCRIPTION_WITH_YJIT'] = arg['description_with_yjit'] || ""
+arg['RUBY_DESCRIPTION_WITH_MJIT'] = src.value('description_with_mjit') || version['RUBY_DESCRIPTION']
+arg['RUBY_DESCRIPTION_WITH_YJIT'] = src.value('description_with_yjit') || version['RUBY_DESCRIPTION']
 %>baseruby="<%=arg['BASERUBY']%>"
 _\
 =begin
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]