rename function_call to call_site in all levels to avoid confusion

lib/ast/call_site_expression.rb

@@ -0,0 +1,31 @@
+module Ast
+  # assignment, like operators are really function calls
+  
+  class CallSiteExpression < Expression
+    attr_reader  :name, :args
+    def initialize name, args
+      @name , @args = name.to_sym , args
+    end
+    def compile context , into
+      params = args.collect{ |a| a.compile(context, into) }
+      function = context.program.get_or_create_function(name)
+      raise "Forward declaration not implemented (#{name}) #{inspect}" if function == nil
+      call = Vm::CallSite.new( name ,  params  , function)
+      call.load_args into
+      call.do_call into
+      call
+    end
+    
+    def inspect
+      self.class.name + ".new(" + name.inspect + ", ["+ 
+        args.collect{|m| m.inspect }.join( ",") +"] )"  
+    end
+    def to_s
+      "#{name}(" + args.join(",") + ")"
+    end
+    def attributes
+      [:name , :args]
+    end
+  end
+  
+end

lib/ast/expression.rb

@@ -38,3 +38,4 @@ require_relative "conditional_expression"
 require_relative "while_expression"
 require_relative "function_expression"
 require_relative "operator_expressions"
+require_relative "call_site_expression"

lib/ast/operator_expressions.rb

@@ -1,34 +1,5 @@
 module Ast
-  
-  # assignment, like operators are really function calls
-  
-  class FuncallExpression < Expression
-    attr_reader  :name, :args
-    def initialize name, args
-      @name , @args = name.to_sym , args
-    end
-    def compile context , into
-      params = args.collect{ |a| a.compile(context, into) }
-      function = context.program.get_or_create_function(name)
-      raise "Forward declaration not implemented (#{name}) #{inspect}" if function == nil
-      call = Vm::FunctionCall.new( name ,  params  , function)
-      call.load_args into
-      call.do_call into
-      call
-    end
     
-    def inspect
-      self.class.name + ".new(" + name.inspect + ", ["+ 
-        args.collect{|m| m.inspect }.join( ",") +"] )"  
-    end
-    def to_s
-      "#{name}(" + args.join(",") + ")"
-    end
-    def attributes
-      [:name , :args]
-    end
-  end
-  
   class OperatorExpression < Expression
     attr_reader  :operator, :left, :right