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

2 files changed, 0 insertions, 117 deletions

diff --git a/tool/ruby_vm/scripts/converter.rb b/tool/ruby_vm/scripts/converter.rb
deleted file mode 100644
index 4e7c28d67b..0000000000
--- a/tool/ruby_vm/scripts/converter.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# This script was needed only once when I converted the old insns.def.
-# Consider historical.
-#
-# ruby converter.rb insns.def | sponge insns.def
-
-BEGIN { $str = ARGF.read }
-END   { puts $str }
-
-# deal with spaces
-$str.gsub! %r/\r\n|\r|\n|\z/, "\n"
-$str.gsub! %r/([^\t\n]*)\t/ do
-  x = $1
-  y = 8 - x.length % 8
-  next x + ' ' * y
-end
-$str.gsub! %r/\s+$/, "\n"
-
-# deal with comments
-$str.gsub! %r/@c.*?@e/m, ''
-$str.gsub! %r/@j.*?\*\//m, '*/'
-$str.gsub! %r/\n(\s*\n)+/, "\n\n"
-$str.gsub! %r/\/\*\*?\s*\n\s*/, "/* "
-$str.gsub! %r/\n\s+\*\//, " */"
-$str.gsub! %r/^(?!.*\/\*.+\*\/$)(.+?)\s*\*\//, "\\1\n */"
-
-# deal with sp_inc
-$str.gsub! %r/ \/\/ inc -= (.*)/, ' // inc += -\\1'
-$str.gsub! %r/\s+\/\/ inc \+= (.*)/, "\n// attr rb_snum_t sp_inc = \\1;"
-$str.gsub! %r/;;$/, ";"
diff --git a/tool/ruby_vm/scripts/insns2vm.rb b/tool/ruby_vm/scripts/insns2vm.rb
deleted file mode 100644
index 1083e42b8e..0000000000
--- a/tool/ruby_vm/scripts/insns2vm.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-#! /your/favourite/path/to/ruby
-# -*- mode: ruby; coding: utf-8; indent-tabs-mode: nil; ruby-indent-level: 2 -*-
-# -*- frozen_string_literal: true; -*-
-# -*- warn_indent: true; -*-
-#
-# Copyright (c) 2017 Urabe, Shyouhei.  All rights reserved.
-#
-# This file is  a part of the programming language  Ruby.  Permission is hereby
-# granted, to  either redistribute and/or  modify this file, provided  that the
-# conditions  mentioned in  the file  COPYING are  met.  Consult  the file  for
-# details.
-
-require 'optparse'
-require_relative '../controllers/application_controller.rb'
-
-def router argv
-  targets = generate_parser.parse argv
-  return targets.map do |i|
-    next ApplicationController.new.generate i
-  end
-end
-
-def generate_parser
-  OptionParser.new do |this|
-    this.on "-I", "--srcdir=DIR", <<'end'
-  Historically this option has been passed to the script.  This is
-  supposedly because at the beginning the script was placed outside
-  of the ruby source tree.  Decades passed since the merge of
-  YARV, now I can safely assume this feature is obsolescent.  Just
-  ignore the passed value here.
-end
-
-    this.on "-L", "--vpath=SPEC", <<'end'
-  Likewise, this option is no longer supported.
-end
-
-    this.on "--path-separator=SEP", /\A(?:\W\z|\.(\W).+)/, <<'end'
-  Old script says this option is a "separator for vpath".  I am
-  confident we no longer need this option.
-end
-
-    this.on "-Dname", "--enable=name[,name...]", Array, <<'end'
-  This option used to override VM option that is defined in
-  vm_opts.h. Now it is officially unsupported because vm_opts.h to
-  remain mismatched with this option must break things.  Just edit
-  vm_opts.h directly.
-end
-
-    this.on "-Uname", "--disable=name[,name...]", Array, <<'end'
-  This option used to override VM option that is defined in
-  vm_opts.h. Now it is officially unsupported because vm_opts.h to
-  remain mismatched with this option must break things.  Just edit
-  vm_opts.h directly.
-end
-
-    this.on "-i", "--insnsdef=FILE", "--instructions-def", <<'end'
-  This option used to specify alternative path to insns.def.  For
-  the same reason to ignore -I, we no longer support this.
-end
-
-    this.on "-o", "--opt-operanddef=FILE", "--opt-operand-def", <<'end'
-  This option used to specify alternative path to opt_operand.def.
-  For the same reason to ignore -I, we no longer support this.
-end
-
-    this.on "-u", "--opt-insnunifdef=FILE", "--opt-insn-unif-def", <<'end'
-  This option used to specify alternative path to
-  opt_insn_unif.def.  For the same reason to ignore -I, we no
-  longer support this.
-end
-
-    this.on "-C", "--[no-]use-const", <<'end'
-  We use const whenever possible now so this option is ignored.
-  The author believes that C compilers can constant-fold.
-end
-
-    this.on "-d", "--destdir", "--output-directory=DIR", <<'begin' do |dir|
-  THIS IS THE ONLY OPTION THAT WORKS today.  Change destination
-  directory from the current working directory to the given path.
-begin
-      Dir.chdir dir
-    end
-
-    this.on "-V", "--[no-]verbose", <<'end'
-  Please let us ignore this and be modest.
-end
-  end
-end