define modules and tests, no compiling

test/parser/helper.rb

@@ -37,9 +37,9 @@ module ParserHelper
     # check that @string_input parses and transforms to @transform_output
     def check_ast
       syntax    = @parser.parse(@string_input)
-      tree      = @transform.apply(syntax)
-      # puts tree.inspect
-      assert_equal @transform_output , tree
+      is      = @transform.apply(syntax)
+      #puts is.inspect
+      assert_equal @transform_output , is
     end
   end
 

test/parser/test_all.rb

@@ -1,12 +1,13 @@
 
-require_relative "test_basic"
-require_relative "test_compound"
 require_relative "test_arguments"
-require_relative "test_expressions"
+require_relative "test_basic"
 require_relative "test_call_site"
+require_relative "test_compound"
 require_relative "test_conditional"
-require_relative "test_while"
-require_relative "test_return"
-require_relative "test_operators"
+require_relative "test_expressions"
 require_relative "test_function_definition"
-require_relative "test_root"
+require_relative "test_module"
+require_relative "test_operators"
+require_relative "test_return"
+require_relative "test_root"
+require_relative "test_while"

test/parser/test_module.rb

@@ -0,0 +1,62 @@
+require_relative "helper"
+
+class TestModuleDef < MiniTest::Test
+  # include the magic (setup and parse -> test method translation), see there
+  include ParserHelper
+  
+  def test_simplest_module
+    @string_input    = <<HERE
+module foo
+  5
+end
+HERE
+    @parse_output = {:name=>"foo", :module_expressions=>[{:integer=>"5"}], :end=>"end"}
+    @transform_output = Ast::ModuleExpression.new("foo" ,[Ast::IntegerExpression.new(5)] )
+    @parser = @parser.module_def
+  end
+
+  def test_module_ops
+    @string_input    = <<HERE
+module ops
+  def foo(x)
+    abba = 5 
+    2 + 5
+  end
+end
+HERE
+    @parse_output = {:name=>"ops", :module_expressions=>[{:function_name=>{:name=>"foo"}, :parmeter_list=>[{:parmeter=>{:name=>"x"}}], :expressions=>[{:l=>{:name=>"abba"}, :o=>"= ", :r=>{:integer=>"5"}}, {:l=>{:integer=>"2"}, :o=>"+ ", :r=>{:integer=>"5"}}], :end=>"end"}], :end=>"end"}
+    @transform_output = Ast::ModuleExpression.new("ops" ,[Ast::FunctionExpression.new(:foo, [Ast::NameExpression.new("x")] , [Ast::OperatorExpression.new("=", Ast::NameExpression.new("abba"),Ast::IntegerExpression.new(5)),Ast::OperatorExpression.new("+", Ast::IntegerExpression.new(2),Ast::IntegerExpression.new(5))] )] )
+    @parser = @parser.module_def
+  end
+
+  def test_module_if
+    @string_input    = <<HERE
+module sif
+  def ofthen(n)
+    if(0)
+      isit = 42
+    else
+      maybenot = 667
+    end
+  end
+end
+HERE
+    @parse_output = {:name=>"sif", :module_expressions=>[{:function_name=>{:name=>"ofthen"}, :parmeter_list=>[{:parmeter=>{:name=>"n"}}], :expressions=>[{:if=>"if", :conditional=>{:integer=>"0"}, :if_true=>{:expressions=>[{:l=>{:name=>"isit"}, :o=>"= ", :r=>{:integer=>"42"}}], :else=>"else"}, :if_false=>{:expressions=>[{:l=>{:name=>"maybenot"}, :o=>"= ", :r=>{:integer=>"667"}}], :end=>"end"}}], :end=>"end"}], :end=>"end"}
+    @transform_output = Ast::ModuleExpression.new("sif" ,[Ast::FunctionExpression.new(:ofthen, [Ast::NameExpression.new("n")] , [Ast::IfExpression.new(Ast::IntegerExpression.new(0), [Ast::OperatorExpression.new("=", Ast::NameExpression.new("isit"),Ast::IntegerExpression.new(42))],[Ast::OperatorExpression.new("=", Ast::NameExpression.new("maybenot"),Ast::IntegerExpression.new(667))] )] )] )
+    @parser = @parser.module_def
+  end
+
+  def test_module_function
+    @string_input    = <<HERE
+module sif
+  ofthen(3+4 , var)
+  def ofthen(n,m)
+    44
+  end
+end
+HERE
+    @parse_output = {:name=>"sif", :module_expressions=>[{:call_site=>{:name=>"ofthen"}, :argument_list=>[{:argument=>{:l=>{:integer=>"3"}, :o=>"+", :r=>{:integer=>"4"}}}, {:argument=>{:name=>"var"}}]}, {:function_name=>{:name=>"ofthen"}, :parmeter_list=>[{:parmeter=>{:name=>"n"}}, {:parmeter=>{:name=>"m"}}], :expressions=>[{:integer=>"44"}], :end=>"end"}], :end=>"end"}
+    @transform_output = Ast::ModuleExpression.new(:sif ,[Ast::CallSiteExpression.new(:ofthen, [Ast::OperatorExpression.new("+", Ast::IntegerExpression.new(3),Ast::IntegerExpression.new(4)),Ast::NameExpression.new("var")] ), Ast::FunctionExpression.new(:ofthen, [Ast::NameExpression.new("n"),Ast::NameExpression.new("m")] , [Ast::IntegerExpression.new(44)] )] )
+    @parser = @parser.module_def
+  end
+end