AmberVM 0.0.19 → 0.0.20

data/bin/ambervm

@@ -185,7 +185,7 @@ if not @options.dont_execute
       
       begin
         v "Compiling core library #{lib}."
-        code = @compiler.compile(File.read(lib), true)
+        code = @compiler.compile(File.read(lib), true, lib)
         v "Optimizing library #{lib}" if @options.optimize
         code = code.optimize(@optvars) if @options.optimize
         begin
@@ -234,12 +234,13 @@ end
 if @options.code
   v "Executing: #{@options.code}."
   @source = @options.code
+  @file = "Commandline"
 else
-  if file = ARGV.first
-    if File.exist?(file)
-      @source = File.read(file)
+  if @file = ARGV.first
+    if File.exist?(@file)
+      @source = File.read(@file)
     else
-      puts "ERROR: Could not load source file: #{file}"
+      puts "ERROR: Could not load source file: #{@file}"
       exit 7
     end
   else
@@ -256,7 +257,7 @@ begin
     i = 0; puts @source.gsub(/^/) { "%3d: " % [i += 1] }
   end
   v "Compiling program code."
-  code = @compiler.compile(@source, @options.run_as_core)
+  code = @compiler.compile(@source, @options.run_as_core, @file)
   v "Optimizing code" if @options.optimize
   code = code.optimize(@optvars) if @options.optimize
   if @options.compilation
@@ -268,7 +269,7 @@ begin
       v "Executing program code."
       p code.execute(@env)
     rescue Exception => e
-      puts "ERROR: could not execute program code #=> #{}"
+      puts "ERROR: could not execute program code #=> #{e}"
       raise e
     end
   end

data/lib/amber.rb

@@ -15,7 +15,7 @@ require 'timeout'
 #
 # It also contains some usefull functions that wil allow to make the usuage easyer.
 module AmberVM
-  VERSION = "0.0.19" unless defined?(AmberVM::VERSION)
+  VERSION = "0.0.20" unless defined?(AmberVM::VERSION)
 
   # This class is designed to allow execting code more safely
   #

data/lib/amber/classes/object.rb

@@ -40,10 +40,11 @@ module AmberVM
 
       
       def obj_send(method, params, env)
-        m = @variables[method] || @object_class.variables[method]
+        m = (@variables[method] || @object_class.variables[method]).val
         raise "Unknown method #{method} for object #{self}" if not m or not m.respond_to?(:call)
         AmberVM::debug "Calling object function method #{method}." if $DEBUG
-        env = AmberVM::Interpreter::Environment.new({:params => params||[], :locals => @variables}, env)
+        params ||= []
+        env = AmberVM::Interpreter::Environment.new({:params => ([self] + params), :locals => @variables}, env)
         m.call(params, env)
       end
       

data/lib/amber/environment.rb

@@ -171,6 +171,12 @@ module AmberVM
       #              written, which might be helpfull when trying to publish
       #              some data to a script that is not supposed to be changed.
       def initialize val = nil
+        val = val.val if val.is_a? VariableStorage
+        @val = val
+      end
+      
+      def val= val
+        val = val.val if val.is_a? VariableStorage
         @val = val
       end
       
@@ -183,20 +189,11 @@ module AmberVM
       end
     end
     
-    class ROVariableStorage
+    class ROVariableStorage < VariableStorage
       
       # Lets the script read the value of the variable.
       attr_reader :val
-      
-      # The storage is initialized with two optional parameters:
-      #
-      # +val+:: which is the value to be stores.
-      # +writable+:: which when set to false prevents the variable to be
-      #              written, which might be helpfull when trying to publish
-      #              some data to a script that is not supposed to be changed.
-      def initialize val = nil
-        @val = val
-      end
+ 
       
       def pretty_print(q)
         q.text "Variable(#{object_id})"
@@ -229,15 +226,16 @@ module AmberVM
       #
       def initialize obj, var, writable = true
         super(nil)
+        @writable = writable
         @obj = obj
         @get = var.to_sym
-        @set = "#{var}=".to_sym
+        @set = "#{var}=".to_sym if writable
       end
       
       # This methods sets the variable passed to the object by sending it to
       # the setter method.
       def val= v
-        @obj.send(@set,v) if @writable
+        @obj.send(@set, v) if @writable
         @obj.send(@get)
       end
       

data/lib/amber/interpreter.rb

@@ -36,12 +36,12 @@ module AmberVM
     end
     
     class RuntimeError < Exception
-      attr_accessor :total, :line, :char, :error_message
-      def initialize message, total = nil, line = nil, char = nil
+      attr_accessor :total, :line, :char, :file, :error_message
+      def initialize message, pos = [], file = nil
         super()
-        @line = line
-        @char = char
-        @total = total
+        @line = pos[1]
+        @char = pos[2]
+        @total = pos[0]
         @error_message = message
       end
       
@@ -57,7 +57,10 @@ module AmberVM
           res << " line #{@line}"
         end
         if @char
-          res << ":#{@char}"
+          res << " position #{@char}"
+        end
+        if @file
+          res << " in file #{@file}"
         end
         res << ": #{@error_message}"
         res
@@ -90,8 +93,9 @@ module AmberVM
 
 
     class Program < Element
-      def initialize code
+      def initialize code, filename = "direct input"
         @code = code
+        @filename = filename
         @variables = {}
       end
       
@@ -105,7 +109,13 @@ module AmberVM
         @variables.each do |name, var|
           var.val = env[name].val if env[name]
         end
-        res = @code.execute(env)
+        
+        begin
+          res = @code.execute(env)
+        rescue RuntimeError => e
+          e.file = @filename
+          raise e
+        end
         @variables.each do |name, var|
           env[name] = var.val
         end
@@ -828,6 +838,10 @@ module AmberVM
         q.text ".value"
       end
       
+      def to_s
+        @pos.join('-')
+      end
+      
       def optimize variables = {}
         variable = @variable.optimize variables
         VariableValue.new(variable)
@@ -859,7 +873,9 @@ module AmberVM
       def execute env
         AmberVM::debug "Executing SimpleVariable at #{@pos}..." if $DEBUG
         begin
-          obj = @object.execute(env) #.val
+          #DEBUG
+          obj = @object.execute(env)
+          obj = obj.val if obj.is_a? VariableStorage
           r = obj.variables[@name]
           if not r
             if @require_declaration
@@ -871,7 +887,7 @@ module AmberVM
           @type = r.val.data_type if r.val.respond_to?(:data_type)
           r
         rescue Exception => e
-          raise RuntimeError.new("Failed to get object variable Variable #{$!}", @pos[0], @pos[1], @pos[2])
+          raise RuntimeError.new("Failed to get object variable Variable: #{$!}", @pos)
         end
       end
       
@@ -971,7 +987,7 @@ module AmberVM
         AmberVM::debug "Executing Sequence... #{inspect}" if $DEBUG
         for item in @data
           r = item.execute env
-        end
+        end if @data
         r
       end
       
@@ -1164,19 +1180,19 @@ module AmberVM
           @function.call(args, env,  @pos)
           # The function is a selfdefined function (or object function)
         elsif @function.is_a? AmberVM::Interpreter::Element
-            fun = @function.execute(env)
-            # The arguments are executed.
-            args = @arguments.map do |arg|
-              arg.execute env
-            end
-            # Call the function
-            begin
-              fun.call(args, env,  @pos)
-            rescue Exception => e
-              exit
-            end
-            # The function is a selfdefined function (or object function)
-          elsif fun = env.function(@function)
+          fun = @function.execute(env)
+          # The arguments are executed.
+          args = @arguments.map do |arg|
+            arg.execute env
+          end
+          # Call the function
+          begin
+            fun.call(args, env,  @pos)
+          rescue Exception => e
+            raise RuntimeError.new("Cound not call function: #{$!.to_s.gsub('<','&lt;')}<br/>#{e.to_s.gsub('<','&lt;')}", @pos)
+          end
+          # The function is a selfdefined function (or object function)
+        elsif fun = env.function(@function)
           # The arguments are executed.
           args = @arguments.map do |arg|
             arg.execute env

data/lib/amber/languages.rb

@@ -47,7 +47,7 @@ module AmberVM
           @core_libs = additional_core_libs
           Dir[File.join(File.dirname(__FILE__), 'languages', self.class.plugin_id.to_s, 'core-*')].each do |f|
             begin
-              @core_libs << compile(File.read(f),true)
+              @core_libs << compile(File.read(f), true, f)
             rescue Exception => e
               puts "Failed to compile core library: #{f}."
               raise e

data/lib/amber/languages/ecma/compiler.rb

@@ -24,12 +24,12 @@ module AmberVM
     class ECMA
       class Compiler < Racc::Parser
 
-module_eval(<<'...end ecma.y/module_eval...', 'ecma.y', 351)
+module_eval(<<'...end ecma.y/module_eval...', 'ecma.y', 353)
 	
 	include AmberVM::Interpreter
 	
 	
-	def compile(str, include_core = false)
+	def compile(str, include_core = false, file = nil)
 		@variables = Environment.new
 		@q = []
 		str = str.chomp(';') + ';'
@@ -120,7 +120,7 @@ module_eval(<<'...end ecma.y/module_eval...', 'ecma.y', 351)
 		end
 		@q.push([false, '$end'])
 		
-		Program.new(do_parse)
+		Program.new(do_parse, file)
 	end
 
   def version
@@ -138,6 +138,17 @@ module_eval(<<'...end ecma.y/module_eval...', 'ecma.y', 351)
 	def core_fun(fun)
 		VariableValue.new(ObjectVariable.new(VariableValue.new(SimpleVariable.new('Core')), fun))
 	end
+	
+	def core_fun_call fun, args, pos
+	  last_self = StaticVariable.new(nil, pos)
+    result = StaticVariable.new(nil, pos)
+	  Sequence.new([
+      Assignment.new(last_self, VariableValue.new(Variable.new(:self, pos), pos)),
+      Assignment.new(result, FunctionCall.new(core_fun(fun), [VariableValue.new(SimpleVariable.new('Core'))] + args ,pos), pos),
+      Assignment.new(Variable.new(:self, pos), VariableValue.new(last_self, pos)),
+      VariableValue.new(result, pos)
+    ], pos)
+   end
 ...end ecma.y/module_eval...
 ##### State transition tables begin ###
 
@@ -1007,7 +1018,7 @@ module_eval(<<'.,.,', 'ecma.y', 94)
 				if rhs.is_a?(Constant) and rhs.value.is_a?(AmberVM::Classes::Number)
 					result = CoreCall.new(:add, [lhs, rhs], val[1][1])
 				else
-					result = result = FunctionCall.new(core_fun('plus'), [lhs, rhs] ,val[1][1])
+					result = result = core_fun_call('plus', [lhs, rhs] ,val[1][1])
 				end
 			
     result
@@ -1188,7 +1199,7 @@ module_eval(<<'.,.,', 'ecma.y', 129)
 
 module_eval(<<'.,.,', 'ecma.y', 130)
   def _reduce_57(val, _values, result)
-     result = VariableValue.new(result) 
+     result = VariableValue.new(result, ['g','g','g']) 
     result
   end
 .,.,
@@ -1199,7 +1210,7 @@ module_eval(<<'.,.,', 'ecma.y', 130)
 
 module_eval(<<'.,.,', 'ecma.y', 133)
   def _reduce_60(val, _values, result)
-     result = FunctionCall.new(core_fun('type'), [val[1]] ,val[0][1])
+     result = core_fun_call('type', [val[1]] ,val[0][1])
     result
   end
 .,.,
@@ -1231,7 +1242,7 @@ module_eval(<<'.,.,', 'ecma.y', 141)
 
 module_eval(<<'.,.,', 'ecma.y', 148)
   def _reduce_71(val, _values, result)
-    	      result = ObjectVariable.new(VariableValue.new(val[0]), val[2][0], val[1][1])
+    	      result = ObjectVariable.new(VariableValue.new(val[0], val[1][1]), val[2][0], val[1][1])
 	  
     result
   end
@@ -1240,19 +1251,18 @@ module_eval(<<'.,.,', 'ecma.y', 148)
 module_eval(<<'.,.,', 'ecma.y', 152)
   def _reduce_72(val, _values, result)
     	  if val[0].is_a? ObjectVariable
-	    last_self = StaticVariable.new(nil)
-      result = StaticVariable.new(nil)
+	    last_self = StaticVariable.new(nil, val[1][1])
+      result = StaticVariable.new(nil, val[1][1])
       obj = val[0].object
       var = val[0].name
 	    result = Sequence.new([
-        Assignment.new(last_self, VariableValue.new(Variable.new(:self))),
-        Assignment.new(Variable.new(:self), obj),
-        Assignment.new(result,FunctionCall.new(VariableValue.new(ObjectVariable.new(VariableValue.new(Variable.new(:self)), var, val[0].pos)),val[2])),
-        Assignment.new(Variable.new(:self), VariableValue.new(last_self)),
-        VariableValue.new(result)
-      ])
+        Assignment.new(last_self, VariableValue.new(Variable.new(:self, val[1][1]), val[1][1])),
+        Assignment.new(result, FunctionCall.new(VariableValue.new(val[0], val[1][1]), [obj] + val[2], val[1][1]), val[1][1]),
+        Assignment.new(Variable.new(:self, val[1][1]), VariableValue.new(last_self, val[1][1])),
+        VariableValue.new(result, val[1][1])
+      ], val[1][1])
     else
-	    result = FunctionCall.new(VariableValue.new(val[0]), val[2], val[1][1]) 
+	    result = FunctionCall.new(VariableValue.new(val[0], val[1][1]), [VariableValue.new(Variable.new(:self,val[1][1]),val[1][1])] + val[2], val[1][1]) 
     end
 	
     result
@@ -1263,28 +1273,28 @@ module_eval(<<'.,.,', 'ecma.y', 152)
 
 # reduce 74 omitted
 
-module_eval(<<'.,.,', 'ecma.y', 173)
+module_eval(<<'.,.,', 'ecma.y', 172)
   def _reduce_75(val, _values, result)
      result = [val[0][0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 174)
+module_eval(<<'.,.,', 'ecma.y', 173)
   def _reduce_76(val, _values, result)
      result << val[2][0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 175)
+module_eval(<<'.,.,', 'ecma.y', 174)
   def _reduce_77(val, _values, result)
      result = [] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 178)
+module_eval(<<'.,.,', 'ecma.y', 177)
   def _reduce_78(val, _values, result)
     			result = CoreCall.new(val[2][0], val[4], val[1][1])
 		
@@ -1292,7 +1302,7 @@ module_eval(<<'.,.,', 'ecma.y', 178)
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 181)
+module_eval(<<'.,.,', 'ecma.y', 180)
   def _reduce_79(val, _values, result)
      result = CoreCall.new(:at, [VariableValue.new(val[0]), val[2]], val[1][1]) 
     result
@@ -1301,7 +1311,7 @@ module_eval(<<'.,.,', 'ecma.y', 181)
 
 # reduce 80 omitted
 
-module_eval(<<'.,.,', 'ecma.y', 186)
+module_eval(<<'.,.,', 'ecma.y', 185)
   def _reduce_81(val, _values, result)
     			result = SimpleDeclaration.new(val[0][0], val[2], val[1][1])
 		
@@ -1309,7 +1319,7 @@ module_eval(<<'.,.,', 'ecma.y', 186)
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 189)
+module_eval(<<'.,.,', 'ecma.y', 188)
   def _reduce_82(val, _values, result)
     		result = SimpleDeclaration.new(val[0][0], const(:null,nil), val[0][1])
 	
@@ -1317,68 +1327,68 @@ module_eval(<<'.,.,', 'ecma.y', 189)
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 192)
+module_eval(<<'.,.,', 'ecma.y', 191)
   def _reduce_83(val, _values, result)
      result = val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 194)
+module_eval(<<'.,.,', 'ecma.y', 193)
   def _reduce_84(val, _values, result)
      result = Sequence.new([result]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 195)
+module_eval(<<'.,.,', 'ecma.y', 194)
   def _reduce_85(val, _values, result)
      result << val[2] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 197)
+module_eval(<<'.,.,', 'ecma.y', 196)
   def _reduce_86(val, _values, result)
      result = Assignment.new(val[0], val[2], val[1][1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 198)
+module_eval(<<'.,.,', 'ecma.y', 197)
   def _reduce_87(val, _values, result)
      result = Assignment.new(val[0], val[2], val[1][1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 199)
+module_eval(<<'.,.,', 'ecma.y', 198)
   def _reduce_88(val, _values, result)
      result = Assignment.new(val[0], val[2], val[1][1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 200)
+module_eval(<<'.,.,', 'ecma.y', 199)
   def _reduce_89(val, _values, result)
-     result = Assignment.new(val[1], FunctionCall.new(core_fun('inc'), [val[1]] ,val[0][1]), val[0][1]) 
+     result = Assignment.new(val[1], core_fun_call('inc', [val[1]] ,val[0][1]), val[0][1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 201)
+module_eval(<<'.,.,', 'ecma.y', 200)
   def _reduce_90(val, _values, result)
-     result = Assignment.new(val[1], FunctionCall.new(core_fun('dec'), [val[1]] ,val[0][1]), val[0][1]) 
+     result = Assignment.new(val[1], core_fun_call('dec', [val[1]] ,val[0][1]), val[0][1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 203)
+module_eval(<<'.,.,', 'ecma.y', 202)
   def _reduce_91(val, _values, result)
     				seq = Sequence.new()
 				var = StaticVariable.new(nil)
 				seq << Assignment.new(var, VariableValue.new(result, val[1][1]), val[1][1]);
-				seq << Assignment.new(result, FunctionCall.new(core_fun('inc'), [result] ,val[1][1]), val[1][1])
+				seq << Assignment.new(result, core_fun_call('inc', [result] ,val[1][1]), val[1][1])
 				seq << VariableValue.new(var, val[1][1])
 				result = seq
 			 
@@ -1386,12 +1396,12 @@ module_eval(<<'.,.,', 'ecma.y', 203)
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 211)
+module_eval(<<'.,.,', 'ecma.y', 210)
   def _reduce_92(val, _values, result)
     			 seq = Sequence.new()
 			 var = StaticVariable.new(nil)
 			 seq << Assignment.new(var, VariableValue.new(result, val[1][1]), val[1][1]);
-			 seq << Assignment.new(result, FunctionCall.new(core_fun('dec'), [result] ,val[1][1]), val[1][1])
+			 seq << Assignment.new(result, core_fun_call('dec', [result] ,val[1][1]), val[1][1])
 			 seq << VariableValue.new(var, val[1][1])
 			 result = seq
 			 
@@ -1399,101 +1409,102 @@ module_eval(<<'.,.,', 'ecma.y', 211)
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 219)
+module_eval(<<'.,.,', 'ecma.y', 218)
   def _reduce_93(val, _values, result)
     			 lhs = val[0]
 			 rhs = val[2]
 			 if rhs.is_a?(Constant) and rhs.value.is_a?(AmberVM::Classes::Number)
 				 result = Assignment.new(val[0], CoreCall.new(:add, [VariableValue.new(lhs, val[1][1]), rhs], val[1][1]), val[1][1])
 			 else
-				 result = Assignment.new(val[0], FunctionCall.new(core_fun('plus'), [VariableValue.new(lhs, val[1][1]), rhs] ,val[1][1]), val[1][1])
+				 result = Assignment.new(val[0], core_fun_call('plus', [VariableValue.new(lhs, val[1][1]), rhs] ,val[1][1]), val[1][1])
 			 end
 			 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 227)
+module_eval(<<'.,.,', 'ecma.y', 226)
   def _reduce_94(val, _values, result)
      result = Assignment.new(val[0], CoreCall.new(:sub, [VariableValue.new(val[0], val[1][1]), val[2]], val[1][1]), val[1][1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 228)
+module_eval(<<'.,.,', 'ecma.y', 227)
   def _reduce_95(val, _values, result)
      result = Assignment.new(val[0], CoreCall.new(:mul, [VariableValue.new(val[0], val[1][1]), val[2]], val[1][1]), val[1][1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 229)
+module_eval(<<'.,.,', 'ecma.y', 228)
   def _reduce_96(val, _values, result)
      result = Assignment.new(val[0], CoreCall.new(:div, [VariableValue.new(val[0], val[1][1]), val[2]], val[1][1]), val[1][1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 230)
+module_eval(<<'.,.,', 'ecma.y', 229)
   def _reduce_97(val, _values, result)
      result = Assignment.new(val[0], CoreCall.new(:mod, [VariableValue.new(val[0], val[1][1]), val[2]], val[1][1]), val[1][1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 231)
+module_eval(<<'.,.,', 'ecma.y', 230)
   def _reduce_98(val, _values, result)
      result = Assignment.new(val[0], CoreCall.new(:bitwise_or,	 [VariableValue.new(val[0], val[1][1]), val[2]], val[1][1]), val[1][1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 232)
+module_eval(<<'.,.,', 'ecma.y', 231)
   def _reduce_99(val, _values, result)
      result = Assignment.new(val[0], CoreCall.new(:bitwise_and, [VariableValue.new(val[0], val[1][1]), val[2]], val[1][1]), val[1][1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 233)
+module_eval(<<'.,.,', 'ecma.y', 232)
   def _reduce_100(val, _values, result)
      result = Assignment.new(val[0], CoreCall.new(:bitwise_xor, [VariableValue.new(val[0], val[1][1]), val[2]], val[1][1]), val[1][1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 234)
+module_eval(<<'.,.,', 'ecma.y', 233)
   def _reduce_101(val, _values, result)
      result = Assignment.new(val[0], CoreCall.new(:shl,	 [VariableValue.new(val[0], val[1][1]), val[2]], val[1][1]), val[1][1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 235)
+module_eval(<<'.,.,', 'ecma.y', 234)
   def _reduce_102(val, _values, result)
      result = Assignment.new(val[0], CoreCall.new(:shr, [VariableValue.new(val[0], val[1][1]), val[2]], val[1][1]), val[1][1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 236)
+module_eval(<<'.,.,', 'ecma.y', 235)
   def _reduce_103(val, _values, result)
      result = Assignment.new(val[0], CoreCall.new(:shr, [VariableValue.new(val[0], val[1][1]), val[2]], val[1][1]), val[1][1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 240)
+module_eval(<<'.,.,', 'ecma.y', 239)
   def _reduce_104(val, _values, result)
     					 name = nil
 					 arg_def = val[2]
 					 block = val[4]
-					 i=0
 					 if not block.is_a?(Sequence)
 						 temp_block = block
 						 block = Sequence.new()
 						 block << temp_block
 					 end
+					 i = 1
+					 block.unshift  Assignment.new(Variable.new(:self), Parameter.new(const(:number, 0)))
 					 val[2].each do |a|
 						 block.unshift SimpleDeclaration.new(a, Parameter.new(const(:number, i)))
 						 i +=1
@@ -1511,12 +1522,14 @@ module_eval(<<'.,.,', 'ecma.y', 258)
     					 name = val[1][0]
 					 arg_def = val[3]
 					 block = val[5]
-					 i = 0
+					 
 					 if not block.is_a?(Sequence)
 						 temp_block = block
 						 block = Sequence.new()
 						 block << temp_block
 					 end
+					 i = 1
+					 block.unshift  Assignment.new(Variable.new(:self), Parameter.new(const(:number, 0)))
 					 val[3].each do |a|
 						 block.unshift SimpleDeclaration.new(a, Parameter.new(const(:number, i)))
 						 i +=1
@@ -1533,7 +1546,7 @@ module_eval(<<'.,.,', 'ecma.y', 258)
 
 # reduce 107 omitted
 
-module_eval(<<'.,.,', 'ecma.y', 280)
+module_eval(<<'.,.,', 'ecma.y', 282)
   def _reduce_108(val, _values, result)
     			 cond = val[2]
 			 body = val[4]
@@ -1543,7 +1556,7 @@ module_eval(<<'.,.,', 'ecma.y', 280)
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 285)
+module_eval(<<'.,.,', 'ecma.y', 287)
   def _reduce_109(val, _values, result)
     			 cond = val[4]
 			 block = val[1]
@@ -1555,7 +1568,7 @@ module_eval(<<'.,.,', 'ecma.y', 285)
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 293)
+module_eval(<<'.,.,', 'ecma.y', 295)
   def _reduce_110(val, _values, result)
     			init = val[2]
 			cond = val[4]
@@ -1576,42 +1589,42 @@ module_eval(<<'.,.,', 'ecma.y', 293)
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 309)
+module_eval(<<'.,.,', 'ecma.y', 311)
   def _reduce_111(val, _values, result)
      result = Condition.new(val[2], val[4], val[6], val[0][1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 310)
+module_eval(<<'.,.,', 'ecma.y', 312)
   def _reduce_112(val, _values, result)
      result = Condition.new(val[2], val[4], nil, val[0][1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 312)
+module_eval(<<'.,.,', 'ecma.y', 314)
   def _reduce_113(val, _values, result)
      result = Return.new(val[1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 313)
+module_eval(<<'.,.,', 'ecma.y', 315)
   def _reduce_114(val, _values, result)
      result = Return.new(val[1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 315)
+module_eval(<<'.,.,', 'ecma.y', 317)
   def _reduce_115(val, _values, result)
      result = const(:object, nil) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 318)
+module_eval(<<'.,.,', 'ecma.y', 320)
   def _reduce_116(val, _values, result)
     		object = const(:object, nil)
 		result = Sequence.new([])
@@ -1630,21 +1643,21 @@ module_eval(<<'.,.,', 'ecma.y', 318)
 
 # reduce 118 omitted
 
-module_eval(<<'.,.,', 'ecma.y', 329)
+module_eval(<<'.,.,', 'ecma.y', 331)
   def _reduce_119(val, _values, result)
      result = [val[0][0], val[2]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 330)
+module_eval(<<'.,.,', 'ecma.y', 332)
   def _reduce_120(val, _values, result)
      result = [result] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 331)
+module_eval(<<'.,.,', 'ecma.y', 333)
   def _reduce_121(val, _values, result)
      result << val[2] 
     result