shyouhei	2018-01-12 17:38:10 +0900 (Fri, 12 Jan 2018)

  New Revision: 61785

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=61785

  Log:
    tool/ruby_vm support for pre-2.3 BASERUBY
    
    as requested by devs, support for BASERUBY prior to 2.3

  Modified files:
    trunk/tool/ruby_vm/scripts/insns2vm.rb
    trunk/tool/ruby_vm/views/optinsn.inc.erb
Index: tool/ruby_vm/views/optinsn.inc.erb
===================================================================
--- tool/ruby_vm/views/optinsn.inc.erb	(revision 61784)
+++ tool/ruby_vm/views/optinsn.inc.erb	(revision 61785)
@@ -59,7 +59,7 @@ rb_insn_unified_local_var_level(VALUE in https://github.com/ruby/ruby/blob/trunk/tool/ruby_vm/views/optinsn.inc.erb#L59
 % RubyVM::OperandsUnifications.each_group do |orig, unifs|
 %   unifs.each do|insn|
       case <%= insn.bin %>:
-%     insn.spec.map{|(var,val)|val}.grep_v('*').each do |val|
+%     insn.spec.map{|(var,val)|val}.reject{|i| i == '*' }.each do |val|
 	return <%= val %>;
 %       break
 %     end
Index: tool/ruby_vm/scripts/insns2vm.rb
===================================================================
--- tool/ruby_vm/scripts/insns2vm.rb	(revision 61784)
+++ tool/ruby_vm/scripts/insns2vm.rb	(revision 61785)
@@ -22,7 +22,7 @@ end https://github.com/ruby/ruby/blob/trunk/tool/ruby_vm/scripts/insns2vm.rb#L22
 
 def generate_parser
   OptionParser.new do |this|
-    this.on "-I", "--srcdir=DIR", <<~'end'
+    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
@@ -30,58 +30,58 @@ def generate_parser https://github.com/ruby/ruby/blob/trunk/tool/ruby_vm/scripts/insns2vm.rb#L30
       Just ignore the passed value here.
     end
 
-    this.on "-L", "--vpath=SPEC", <<~'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'
+    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.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.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.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.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.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'
+    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.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'
+    this.on "-V", "--[no-]verbose", <<-'end'
       Please let us ignore this and be modest.
     end
   end

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