removed the structs (code smell)

test/test_nodes.rb

@@ -1,15 +1,15 @@
-$: << File.expand_path(File.dirname(__FILE__) + '/../lib')
-$: << File.expand_path(File.dirname(__FILE__))
-
-require 'minitest/autorun'
+require_relative "helper"
 require 'minitest/spec'
-require 'vm/nodes'
 
 include Vm
 
 class FakeBuilder
   attr_reader :result
 
+  Asm::InstructionTools::REGISTERS.each do |reg , number|
+    define_method(reg) { Asm::Register.new(reg , number) }
+  end
+
   def initialize
     @result = ''
   end
@@ -36,7 +36,7 @@ describe 'Nodes' do
   end
 
   it 'emits a number' do
-    input    = Vm::Number.new 42
+    input    = Vm::NumberExpression.new 42
     expected = <<HERE
 mov r0, 42
 HERE
@@ -48,8 +48,8 @@ HERE
   it 'emits a function call' do
     @context[:params] = ['foo']
 
-    input    = Vm::Funcall.new 'baz', [Vm::Number.new(42),
-                                          Vm::Name.new('foo')]
+    input    = Vm::FuncallExpression.new 'baz', [Vm::NumberExpression.new(42),
+                                          Vm::NameExpression.new('foo')]
     expected = <<HERE
 mov r0, 42
 iload 0
@@ -62,10 +62,10 @@ HERE
   end
 
   it 'emits a conditional' do
-    input    = Vm::Conditional.new \
-      Vm::Number.new(0),
-      Vm::Number.new(42),
-      Vm::Number.new(667)
+    input    = Vm::ConditionalExpression.new \
+      Vm::NumberExpression.new(0),
+      Vm::NumberExpression.new(42),
+      Vm::NumberExpression.new(667)
     expected = <<HERE
 mov r0, 0
 ifeq else
@@ -81,10 +81,10 @@ HERE
   end
 
   it 'emits a function definition' do
-    input    = Vm::Function.new \
+    input    = Vm::FunctionExpression.new \
       'foo',
-      Vm::Name.new('x'),
-      Vm::Number.new(5)
+      Vm::NameExpression.new('x'),
+      Vm::NumberExpression.new(5)
 
     expected = <<HERE
 public_static_method foo, int, int

test/test_transform.rb

@@ -11,14 +11,14 @@ describe Transform do
 
   it 'transforms a number' do
     input    = {:number => '42'}
-    expected = Vm::Number.new(42)
+    expected = Vm::NumberExpression.new(42)
 
     @transform.apply(input).must_equal expected
   end
 
   it 'transforms a name' do
     input    = {:name => 'foo'}
-    expected = Vm::Name.new('foo')
+    expected = Vm::NameExpression.new('foo')
 
     @transform.apply(input).must_equal expected
   end
@@ -26,8 +26,8 @@ describe Transform do
   it 'transforms an argument list' do
     input    = {:args => [{:arg => {:number => '42'}},
                           {:arg => {:name   => 'foo'}}]}
-    expected = [Vm::Number.new(42),
-                Vm::Name.new('foo')]
+    expected = [Vm::NumberExpression.new(42),
+                Vm::NameExpression.new('foo')]
 
     @transform.apply(input).must_equal expected
   end
@@ -35,7 +35,7 @@ describe Transform do
   it 'transforms a single-argument function call' do
     input = {:funcall => {:name => 'foo'},
              :args    => [{:arg => {:number => '42'}}]}
-    expected = Vm::Funcall.new 'foo', [Vm::Number.new(42)]
+    expected = Vm::FuncallExpression.new 'foo', [Vm::NumberExpression.new(42)]
 
     @transform.apply(input).must_equal expected
   end
@@ -44,8 +44,8 @@ describe Transform do
     input = {:funcall => {:name => 'baz'},
              :args    => [{:arg => {:number => '42'}},
                           {:arg => {:name => 'foo'}}]}
-    expected = Vm::Funcall.new 'baz', [Vm::Number.new(42),
-                                          Vm::Name.new('foo')]
+    expected = Vm::FuncallExpression.new 'baz', [Vm::NumberExpression.new(42),
+                                          Vm::NameExpression.new('foo')]
 
     @transform.apply(input).must_equal expected
   end
@@ -54,10 +54,10 @@ describe Transform do
     input = {:cond     => {:number => '0'},
              :if_true  => {:body => {:number => '42'}},
              :if_false => {:body => {:number => '667'}}}
-    expected = Vm::Conditional.new \
-      Vm::Number.new(0),
-      Vm::Number.new(42),
-      Vm::Number.new(667)
+    expected = Vm::ConditionalExpression.new \
+      Vm::NumberExpression.new(0),
+      Vm::NumberExpression.new(42),
+      Vm::NumberExpression.new(667)
 
     @transform.apply(input).must_equal expected
   end
@@ -66,10 +66,10 @@ describe Transform do
     input = {:func   => {:name => 'foo'},
              :params => {:param => {:name => 'x'}},
              :body   => {:number => '5'}}
-    expected = Vm::Function.new \
+    expected = Vm::FunctionExpression.new \
       'foo',
-      [Vm::Name.new('x')],
-      Vm::Number.new(5)
+      [Vm::NameExpression.new('x')],
+      Vm::NumberExpression.new(5)
 
     @transform.apply(input).must_equal expected
   end