A little cleanup for transforms specs.

lib/compiler/ast/transforms.rb

@@ -111,7 +111,7 @@ def bytecode(g)
     # Emits fast VM instructions for certain methods.
     #
     class SendFastMath < SendWithArguments
-      transform :default, :fastmath, "VM instructions for math, relational methods"
+      transform :default, :fast_math, "VM instructions for math, relational methods"
 
       Operators = {
         :+    => :meta_send_op_plus,
@@ -147,7 +147,7 @@ def bytecode(g)
     # Emits a fast path for #new
     #
     class SendFastNew < SendWithArguments
-      transform :default, :fastnew, "Fast SomeClass.new path"
+      transform :default, :fast_new, "Fast SomeClass.new path"
 
       # FIXME duplicated from kernel/common/compiled_method.rb
       KernelMethodSerial = 47
@@ -225,7 +225,7 @@ def bytecode(g)
     # Maps various methods to VM instructions
     #
     class SendInstructionMethod < SendWithArguments
-      transform :default, :fastsystem, "VM instructions for certain methods"
+      transform :default, :fast_system, "VM instructions for certain methods"
 
       Methods = {
         :__kind_of__     => :kind_of,

spec/compiler/plugins/assembly_spec.rb → spec/compiler/transforms/assembly_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-describe "A Call node using InlineAssembly plugin" do
+describe "A Call node using InlineAssembly transform" do
   relates <<-ruby do
       Rubinius.asm(a) do |m|
         push 1

spec/compiler/plugins/block_given_spec.rb → spec/compiler/transforms/block_given_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-describe "A Call node using BlockGiven plugin" do
+describe "A Call node using BlockGiven transform" do
   block_given = lambda do |g|
     in_method :m do |d|
       no_blk = d.new_label

spec/compiler/plugins/fastmath_spec.rb → spec/compiler/transforms/fast_math_spec.rb

@@ -1,14 +1,14 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-describe "A Call node using FastMath plugin" do
+describe "A Call node using FastMath transform" do
   relates "1 + 1" do
     compile do |g|
       g.push 1
       g.push 1
       g.send :+, 1, false
     end
 
-    compile :fastmath do |g|
+    compile :fast_math do |g|
       g.push 1
       g.push 1
       g.meta_send_op_plus :+
@@ -25,7 +25,7 @@
       g.send_with_splat :+, 0, false, false
     end
 
-    compile :fastmath do |g|
+    compile :fast_math do |g|
       g.push 1
       g.push :self
       g.send :a, 0, true
@@ -42,7 +42,7 @@
       g.send :-, 1, false
     end
 
-    compile :fastmath do |g|
+    compile :fast_math do |g|
       g.push 1
       g.push 1
       g.meta_send_op_minus :-
@@ -56,7 +56,7 @@
       g.send :==, 1, false
     end
 
-    compile :fastmath do |g|
+    compile :fast_math do |g|
       g.push 1
       g.push 1
       g.meta_send_op_equal :==
@@ -70,7 +70,7 @@
       g.send :===, 1, false
     end
 
-    compile :fastmath do |g|
+    compile :fast_math do |g|
       g.push 1
       g.push 1
       g.meta_send_op_tequal :===
@@ -84,7 +84,7 @@
       g.send :<, 1, false
     end
 
-    compile :fastmath do |g|
+    compile :fast_math do |g|
       g.push 1
       g.push 1
       g.meta_send_op_lt :<
@@ -98,7 +98,7 @@
       g.send :>, 1, false
     end
 
-    compile :fastmath do |g|
+    compile :fast_math do |g|
       g.push 1
       g.push 1
       g.meta_send_op_gt :>

spec/compiler/plugins/fastnew_spec.rb → spec/compiler/transforms/fast_new_spec.rb

@@ -1,13 +1,13 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-describe "A Call node using FastNew plugin" do
+describe "A Call node using FastNew transform" do
   relates "new" do
     compile do |g|
       g.push :self
       g.send :new, 0, true
     end
 
-    compile :fastnew do |g|
+    compile :fast_new do |g|
       slow = g.new_label
       done = g.new_label
 
@@ -38,7 +38,7 @@
       g.send :new, 1, true
     end
 
-    compile :fastnew do |g|
+    compile :fast_new do |g|
       slow = g.new_label
       done = g.new_label
 
@@ -70,7 +70,7 @@
       g.send :new, 0, false
     end
 
-    compile :fastnew do |g|
+    compile :fast_new do |g|
       slow = g.new_label
       done = g.new_label
 
@@ -100,7 +100,7 @@
       g.send :new, 1, false
     end
 
-    compile :fastnew do |g|
+    compile :fast_new do |g|
       slow = g.new_label
       done = g.new_label
 

spec/compiler/plugins/fastsystem_spec.rb → spec/compiler/transforms/fast_system_spec.rb

@@ -10,7 +10,7 @@
       g.send :__kind_of__, 1, false
     end
 
-    compile :fastsystem do |g|
+    compile :fast_system do |g|
       g.push :self
       g.send :b, 0, true
       g.push :self
@@ -28,7 +28,7 @@
       g.send :__instance_of__, 1, false
     end
 
-    compile :fastsystem do |g|
+    compile :fast_system do |g|
       g.push :self
       g.send :b, 0, true
       g.push :self
@@ -44,7 +44,7 @@
       g.send :__nil__, 0, false
     end
 
-    compile :fastsystem do |g|
+    compile :fast_system do |g|
       g.push :self
       g.send :a, 0, true
       g.is_nil

spec/compiler/plugins/kernel_methods_spec.rb → spec/compiler/transforms/kernel_methods_spec.rb

@@ -1,29 +1,17 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-describe "A Call node using kernel_methods plugin" do
+describe "A Call node using kernel_methods transform" do
   relates "4 / 2" do
-    compile :kernel_methods do |g|
+    compile do |g|
       g.push 4
       g.push 2
-      g.send :divide, 1, false
+      g.send :/, 1, false
     end
-  end
 
-  relates "a.class" do
     compile :kernel_methods do |g|
-      g.push :self
-      g.send :a, 0, true
-      g.send :__class__, 0, false
-    end
-  end
-end
-
-describe "A Call node NOT using kernel_methods plugin" do
-  relates "4 / 2" do
-    compile do |g|
       g.push 4
       g.push 2
-      g.send :/, 1, false
+      g.send :divide, 1, false
     end
   end
 
@@ -33,5 +21,11 @@
       g.send :a, 0, true
       g.send :class, 0, false
     end
+
+    compile :kernel_methods do |g|
+      g.push :self
+      g.send :a, 0, true
+      g.send :__class__, 0, false
+    end
   end
 end

spec/compiler/plugins/primitive_spec.rb → spec/compiler/transforms/primitive_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-describe "A Call node using PrimitiveDeclaration plugin" do
+describe "A Call node using PrimitiveDeclaration transform" do
   relates <<-ruby do
       def m
         Ruby.primitive :prim