first method test

lib/ast/function_expression.rb

@@ -1,7 +1,10 @@
 module Ast
   class FunctionExpression < Expression
 #    attr_reader  :name, :params, :body , :receiver
-    def compile context
+    def compile frame , method
+      method = Virtual::Method.new(name , params )
+    end
+    def scratch
       args = []
       locals = {}
       params.each_with_index do |param , index|

lib/virtual/method.rb

@@ -1,3 +1,4 @@
+require_relative "object"
 module Virtual
   # static description of a method
   # name
@@ -7,13 +8,16 @@ module Virtual
   # known local variable names
   # temp variables (numbered)
   #
-  class Method
+  class Method < Virtual::Object
     #return the main function (the top level) into which code is compiled
     def Method.main
       Method.new(:main)
     end
+    def attributes
+      [:name , :args]
+    end
     def initialize name , args = [] , receiver = Virtual::Reference  , return_type = Virtual::Reference 
-      @name = name
+      @name = name.to_sym
       @args = args
       @locals = []
       @receiver = receiver
@@ -21,7 +25,7 @@ module Virtual
       @start = MethodEnter.new
       @current = @start
     end
-    attr_reader :name
+    attr_reader :name , :args
 
     def add instruction
       @current.next = instruction

lib/virtual/object.rb

@@ -1,7 +1,3 @@
-module Boot
-  class BootSoace
-  end
-end
 module Virtual
   # our machine is made up of objects, some of which are code, some data
   #
@@ -26,6 +22,10 @@ module Virtual
       return true
     end
 
+    def inspect
+      self.class.name + ".new(" + attributes.collect{|a| send(a).inspect }.join(",")+ ")"
+    end
+
     def self.space
       if defined? @@space
         @@space

test/virtual/test_basic.rb

@@ -1,7 +1,6 @@
 require_relative "virtual_helper"
 
 class TestBasic < MiniTest::Test
-  # include the magic (setup and parse -> test method translation), see there
   include VirtualHelper
 
   def test_number

test/virtual/test_function_definition.rb

@@ -0,0 +1,128 @@
+require_relative "virtual_helper"
+
+class TestFunctionDefinition < MiniTest::Test
+  include VirtualHelper
+  
+  def test_simplest_function
+    @string_input    = <<HERE
+def foo(x) 
+  5
+end
+HERE
+    @output = [Virtual::Method.new(:foo,[Ast::NameExpression.new(:x)])]
+    check
+  end
+
+  def test_class_function
+    @string_input    = <<HERE
+def String.length(x)
+  @length
+end
+HERE
+    @parse_output = {:receiver=>{:module_name=>"String"}, :function_name=>{:name=>"length"}, :parameter_list=>[{:parameter=>{:name=>"x"}}], :expressions=>[{:instance_variable=>{:name=>"length"}}], :end=>"end"}
+    @transform_output = Ast::FunctionExpression.new(:length, [Ast::NameExpression.new("x")] , [Ast::VariableExpression.new(:length)] ,Ast::ModuleName.new("String") )
+    @parser = @parser.function_definition
+  end
+
+  def test_function_ops
+    @string_input    = <<HERE
+def foo(x) 
+ abba = 5 
+ 2 + 5
+end
+HERE
+    @parse_output = {:function_name=>{:name=>"foo"}, :parameter_list=>[{:parameter=>{:name=>"x"}}], :expressions=>[{:l=>{:name=>"abba"}, :o=>"= ", :r=>{:integer=>"5"}}, {:l=>{:integer=>"2"}, :o=>"+ ", :r=>{:integer=>"5"}}], :end=>"end"}
+    @transform_output = Ast::FunctionExpression.new(:foo, [Ast::NameExpression.new(:x)] , [Ast::AssignmentExpression.new(Ast::NameExpression.new(:abba),Ast::IntegerExpression.new(5)),Ast::OperatorExpression.new("+", Ast::IntegerExpression.new(2),Ast::IntegerExpression.new(5))] ,nil )
+    @parser = @parser.function_definition
+  end
+
+  def test_function_if
+    @string_input    = <<HERE
+def ofthen(n)
+  if(0)
+    isit = 42
+  else
+    maybenot = 667
+  end
+end
+HERE
+    @parse_output = {:function_name=>{:name=>"ofthen"}, :parameter_list=>[{:parameter=>{: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"}
+    @transform_output = Ast::FunctionExpression.new(:ofthen, [Ast::NameExpression.new(:n)] , [Ast::IfExpression.new(Ast::IntegerExpression.new(0), [Ast::AssignmentExpression.new(Ast::NameExpression.new(:isit),Ast::IntegerExpression.new(42))],[Ast::AssignmentExpression.new(Ast::NameExpression.new(:maybenot),Ast::IntegerExpression.new(667))] )] ,nil )
+    @parser = @parser.function_definition
+  end
+
+  def test_function_return
+    @string_input    = <<HERE
+def retvar(n)
+  i = 5
+  return i 
+end
+HERE
+    @parse_output = {:function_name=>{:name=>"retvar"}, :parameter_list=>[{:parameter=>{:name=>"n"}}], :expressions=>[{:l=>{:name=>"i"}, :o=>"= ", :r=>{:integer=>"5"}}, {:return=>"return", :return_expression=>{:name=>"i"}}], :end=>"end"}
+    @transform_output = Ast::FunctionExpression.new(:retvar, [Ast::NameExpression.new(:n)] , [Ast::AssignmentExpression.new(Ast::NameExpression.new(:i),Ast::IntegerExpression.new(5)),Ast::ReturnExpression.new(Ast::NameExpression.new(:i) )] ,nil )
+    @parser = @parser.function_definition
+  end
+
+  def test_function_return_if
+    @string_input    = <<HERE
+def retvar(n)
+  if( n > 5)
+    return 10
+  else
+    return 20
+  end 
+end
+HERE
+    @parse_output = {:function_name=>{:name=>"retvar"}, :parameter_list=>[{:parameter=>{:name=>"n"}}], :expressions=>[{:if=>"if", :conditional=>{:l=>{:name=>"n"}, :o=>"> ", :r=>{:integer=>"5"}}, :if_true=>{:expressions=>[{:return=>"return", :return_expression=>{:integer=>"10"}}], :else=>"else"}, :if_false=>{:expressions=>[{:return=>"return", :return_expression=>{:integer=>"20"}}], :end=>"end"}}], :end=>"end"}
+    @transform_output = Ast::FunctionExpression.new(:retvar, [Ast::NameExpression.new("n")] , [Ast::IfExpression.new(Ast::OperatorExpression.new(">", Ast::NameExpression.new("n"),Ast::IntegerExpression.new(5)), [Ast::ReturnExpression.new(Ast::IntegerExpression.new(10) )],[Ast::ReturnExpression.new(Ast::IntegerExpression.new(20) )] )] )
+    @parser = @parser.function_definition
+  end
+
+  def test_function_return_while
+    @string_input    = <<HERE
+def retvar(n)
+  while( n > 5) do
+    n = n + 1
+    return n
+  end 
+end
+HERE
+    @parse_output = {:function_name=>{:name=>"retvar"}, :parameter_list=>[{:parameter=>{:name=>"n"}}], :expressions=>[{:while=>"while", :while_cond=>{:l=>{:name=>"n"}, :o=>"> ", :r=>{:integer=>"5"}}, :do=>"do", :body=>{:expressions=>[{:l=>{:name=>"n"}, :o=>"= ", :r=>{:l=>{:name=>"n"}, :o=>"+ ", :r=>{:integer=>"1"}}}, {:return=>"return", :return_expression=>{:name=>"n"}}], :end=>"end"}}], :end=>"end"}
+    @transform_output = Ast::FunctionExpression.new(:retvar, [Ast::NameExpression.new(:n)] , [Ast::WhileExpression.new(Ast::OperatorExpression.new(">", Ast::NameExpression.new(:n),Ast::IntegerExpression.new(5)), [Ast::AssignmentExpression.new(Ast::NameExpression.new(:n),Ast::OperatorExpression.new("+", Ast::NameExpression.new(:n),Ast::IntegerExpression.new(1))), Ast::ReturnExpression.new(Ast::NameExpression.new(:n) )] )] ,nil )
+    @parser = @parser.function_definition
+  end
+
+  def test_function_while
+    @string_input    = <<HERE
+def fibonaccit(n)
+  a = 0
+  while (n) do
+    some = 43
+    other = some * 4
+  end
+end
+HERE
+    @parse_output = {:function_name=>{:name=>"fibonaccit"}, :parameter_list=>[{:parameter=>{:name=>"n"}}], :expressions=>[{:l=>{:name=>"a"}, :o=>"= ", :r=>{:integer=>"0"}}, {:while=>"while", :while_cond=>{:name=>"n"}, :do=>"do", :body=>{:expressions=>[{:l=>{:name=>"some"}, :o=>"= ", :r=>{:integer=>"43"}}, {:l=>{:name=>"other"}, :o=>"= ", :r=>{:l=>{:name=>"some"}, :o=>"* ", :r=>{:integer=>"4"}}}], :end=>"end"}}], :end=>"end"}
+    @transform_output = Ast::FunctionExpression.new(:fibonaccit, [Ast::NameExpression.new(:n)] , [Ast::AssignmentExpression.new(Ast::NameExpression.new(:a),Ast::IntegerExpression.new(0)),Ast::WhileExpression.new(Ast::NameExpression.new(:n), [Ast::AssignmentExpression.new(Ast::NameExpression.new(:some),Ast::IntegerExpression.new(43)), Ast::AssignmentExpression.new(Ast::NameExpression.new(:other),Ast::OperatorExpression.new("*", Ast::NameExpression.new(:some),Ast::IntegerExpression.new(4)))] )] ,nil )
+    @parser = @parser.function_definition
+  end
+
+  def test_function_big_while
+    @string_input    = <<HERE
+def fibonaccit(n)
+  a = 0 
+  b = 1
+  while( n > 1 ) do
+    tmp = a
+    a = b
+    b = tmp + b
+    puts(b)
+    n = n - 1
+  end
+end
+HERE
+    @parse_output = {:function_name=>{:name=>"fibonaccit"}, :parameter_list=>[{:parameter=>{:name=>"n"}}], :expressions=>[{:l=>{:name=>"a"}, :o=>"= ", :r=>{:integer=>"0"}}, {:l=>{:name=>"b"}, :o=>"= ", :r=>{:integer=>"1"}}, {:while=>"while", :while_cond=>{:l=>{:name=>"n"}, :o=>"> ", :r=>{:integer=>"1"}}, :do=>"do", :body=>{:expressions=>[{:l=>{:name=>"tmp"}, :o=>"= ", :r=>{:name=>"a"}}, {:l=>{:name=>"a"}, :o=>"= ", :r=>{:name=>"b"}}, {:l=>{:name=>"b"}, :o=>"= ", :r=>{:l=>{:name=>"tmp"}, :o=>"+ ", :r=>{:name=>"b"}}}, {:call_site=>{:name=>"puts"}, :argument_list=>[{:argument=>{:name=>"b"}}]}, {:l=>{:name=>"n"}, :o=>"= ", :r=>{:l=>{:name=>"n"}, :o=>"- ", :r=>{:integer=>"1"}}}], :end=>"end"}}], :end=>"end"}
+    @transform_output = Ast::FunctionExpression.new(:fibonaccit, [Ast::NameExpression.new(:n)] , [Ast::AssignmentExpression.new(Ast::NameExpression.new(:a),Ast::IntegerExpression.new(0)),Ast::AssignmentExpression.new(Ast::NameExpression.new(:b),Ast::IntegerExpression.new(1)),Ast::WhileExpression.new(Ast::OperatorExpression.new(">", Ast::NameExpression.new(:n),Ast::IntegerExpression.new(1)), [Ast::AssignmentExpression.new(Ast::NameExpression.new(:tmp),Ast::NameExpression.new(:a)), Ast::AssignmentExpression.new(Ast::NameExpression.new(:a),Ast::NameExpression.new(:b)), Ast::AssignmentExpression.new(Ast::NameExpression.new(:b),Ast::OperatorExpression.new("+", Ast::NameExpression.new(:tmp),Ast::NameExpression.new(:b))), Ast::CallSiteExpression.new(:puts, [Ast::NameExpression.new(:b)] ,Ast::NameExpression.new(:self)), Ast::AssignmentExpression.new(Ast::NameExpression.new(:n),Ast::OperatorExpression.new("-", Ast::NameExpression.new(:n),Ast::IntegerExpression.new(1)))] )] ,nil )
+    @parser = @parser.function_definition
+  end  
+end