diff options
author | Kevin Newton <kddnewton@gmail.com> | 2023-09-27 12:39:53 -0400 |
---|---|---|
committer | Kevin Newton <kddnewton@gmail.com> | 2023-09-27 13:57:38 -0400 |
commit | 3d0a46796b780417096b65de5edb590d3b1537f1 (patch) | |
tree | 973fb1135d3d8ddfd5ebd6c8171b2bef8507d60e /tool | |
parent | 4f73a7c2f7ff16aa78cf0dec2d4c7f90a2c41c9b (diff) | |
download | ruby-3d0a46796b780417096b65de5edb590d3b1537f1.tar.gz |
Rename YARP symbols to prism
Diffstat (limited to 'tool')
-rwxr-xr-x | tool/leaked-globals | 2 | ||||
-rwxr-xr-x | tool/sync_default_gems.rb | 4 | ||||
-rwxr-xr-x | tool/update-deps | 16 |
3 files changed, 11 insertions, 11 deletions
diff --git a/tool/leaked-globals b/tool/leaked-globals index 99de52dd6c..4f4a35cc30 100755 --- a/tool/leaked-globals +++ b/tool/leaked-globals @@ -68,7 +68,7 @@ IO.foreach("|#{NM} #{ARGV.join(' ')}") do |line| next if n.include?(".") next if !so and n.start_with?("___asan_") case n - when /\A(?:Init_|InitVM_|yp_|[Oo]nig|dln_|coroutine_)/ + when /\A(?:Init_|InitVM_|pm_|[Oo]nig|dln_|coroutine_)/ next when /\Aruby_static_id_/ next unless so diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 4f8dba5ad3..0a75aadce8 100755 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -53,6 +53,7 @@ module SyncDefaultGems pathname: "ruby/pathname", pp: "ruby/pp", prettyprint: "ruby/prettyprint", + prism: ["ruby/prism", "main"], pstore: "ruby/pstore", psych: 'ruby/psych', rdoc: 'ruby/rdoc', @@ -79,7 +80,6 @@ module SyncDefaultGems weakref: "ruby/weakref", win32ole: "ruby/win32ole", yaml: "ruby/yaml", - yarp: ["ruby/yarp", "main"], zlib: 'ruby/zlib', }.transform_keys(&:to_s) @@ -397,7 +397,7 @@ module SyncDefaultGems rm_rf(%w[spec/syntax_suggest libexec/syntax_suggest]) cp_r("#{upstream}/spec", "spec/syntax_suggest") cp_r("#{upstream}/exe/syntax_suggest", "libexec/syntax_suggest") - when "yarp" + when "prism" # We don't want to remove prism-specific files that existing in ruby/ruby # that do not exist in ruby/prism, so we temporarily move them out of the # prism dir, wipe the prism dir, and then put them back. diff --git a/tool/update-deps b/tool/update-deps index 90107e50c8..2a07d55e37 100755 --- a/tool/update-deps +++ b/tool/update-deps @@ -150,13 +150,13 @@ FILES_NEED_VPATH = %w[ enc/trans/utf8_mac.c enc/trans/utf_16_32.c - yarp/api_node.c - yarp/ast.h - yarp/node.c - yarp/prettyprint.c - yarp/serialize.c - yarp/token_type.c - yarp/version.h + prism/api_node.c + prism/ast.h + prism/node.c + prism/prettyprint.c + prism/serialize.c + prism/token_type.c + prism/version.h ] # Multiple files with same filename. @@ -184,7 +184,7 @@ def in_makefile(target, source) target = target.to_s source = source.to_s case target - when %r{\A[^/]*\z}, %r{\Acoroutine/}, %r{\Ayarp/} + when %r{\A[^/]*\z}, %r{\Acoroutine/}, %r{\Aprism/} target2 = "#{target.sub(/\.o\z/, '.$(OBJEXT)')}" case source when *FILES_IN_SOURCE_DIRECTORY then source2 = "$(top_srcdir)/#{source}" |