merge revisions 61753:61750 61747:61740 61737:61728

Revert all the VM generator rewrites; requested by naruse


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61755 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 10 insertions, 5 deletions

diff --git a/tool/insns2vm.rb b/tool/insns2vm.rb
index e6fe64d189..ecbbb52643 100755
--- a/tool/insns2vm.rb
+++ b/tool/insns2vm.rb
@@ -3,11 +3,16 @@
 # This is used by Makefile.in to generate .inc files.
 # See Makefile.in for details.
 
-require_relative 'ruby_vm/scripts/insns2vm'
+require 'optparse'
+
+Version = %w$Revision: 11626 $[1..-1]
+
+require "#{File.join(File.dirname(__FILE__), 'instruction')}"
 
 if $0 == __FILE__
-  router(ARGV).each do |(path, generator)|
-    str = generator.generate path
-    path.write str, mode: 'wb:utf-8'
-  end
+  opts = ARGV.options
+  maker = RubyVM::SourceCodeGenerator.def_options(opts)
+  files = opts.parse!
+  generator = maker.call
+  generator.generate(files)
 end