new insns.def format (2nd try)

- Gave up @j comments
- Room for sp_inc to be a proper grammer element

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

3 files changed, 33 insertions, 3 deletions

diff --git a/tool/instruction.rb b/tool/instruction.rb
index 447fed5948..21af9a5800 100755
--- a/tool/instruction.rb
+++ b/tool/instruction.rb
@@ -265,9 +265,11 @@ class RubyVM
             insn_in = true
             body    = ''
 
-            sp_inc = rets_str[%r"//\s*(.+)", 1]
 
-            raise unless /^\{$/ =~ f.gets.chomp
+          when /^\/\/ attr rb_snum_t sp_inc = (.+)$/
+            sp_inc = 'inc +=' + $1
+
+          when /^\{$/
             line_no = f.line_no
 
           # end instruction body
@@ -1246,4 +1248,3 @@ class RubyVM
     end
   end
 end
-
diff --git a/tool/ruby_vm/scripts/converter.rb b/tool/ruby_vm/scripts/converter.rb
new file mode 100644
index 0000000000..4e7c28d67b
--- /dev/null
+++ b/tool/ruby_vm/scripts/converter.rb
@@ -0,0 +1,29 @@
+# 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/tests/.gitkeep b/tool/ruby_vm/tests/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tool/ruby_vm/tests/.gitkeep