rVM 0.0.6 → 0.0.7

data/lib/rvm/classes/block.rb

@@ -16,8 +16,8 @@ module RVM
         true
       end
       
-      def call params, env
-        #Logger.debug "Calling Block...(#{env},#{params})" if $DEBUG
+      def call params, env, pos = nil
+        RVM::debug "Calling Block at #{pos}...(#{env},#{params})" if $DEBUG
         env = RVM::Interpreter::Enviroment.new({:params => params||[]}, env)
         begin
           @code.execute(env)

data/lib/rvm/classes/error.rb

@@ -15,7 +15,7 @@ module RVM
       end
       
       def to_s
-				"##{@value.abs * -1} #{@text}"
+				"##{@value} #{@text}"
       end
     end
   end

data/lib/rvm/classes/list.rb

@@ -11,6 +11,19 @@ module RVM
         :list
       end
       
+      
+      def variables
+        @variables ||= {}
+      end
+
+      
+      def functions
+        @functions ||= {
+          'size' => RVM::Functions[:size],
+          'length' => RVM::Functions[:size]
+        }
+      end
+      
       def initialize source= [], sepperator = ' '
         super()
         if source.is_a?(::String) # Okay we've to hack here to get sure we get the /real/ String

data/lib/rvm/functions.rb

@@ -28,13 +28,13 @@ module RVM
           true
         end
         
-        def call params, env
+        def call params, env, pos = nil
           i = 0
           sig = :any 
           params.map! do |p| 
             sig = signature[i] || sig
             if sig != :any and p.class != RVM::Classes[sig]
-              raise "TYPE MISMATCH" if RVM::strict
+              raise "TYPE MISMATCH! expected #{sig} got #{p.class}(#{pos}) at " if RVM::strict
               p = RVM::Classes[sig].new(p)
             end
             i+=1

data/lib/rvm/functions/array/at.rb

@@ -0,0 +1,22 @@
+module RVM
+  module Functions
+    class At < Function
+      class << self 
+        def execute params, env
+          if params.length == 2
+            array = params.shift
+            pos = params.shift
+            array[pos.to_i]
+          else
+            RVM::Classes[:error].new(1,"FUNCTION (#{self.class}) EXPECTS 2 ARGUMENTS BUT GOT #{params.length}")
+          end
+        end
+        
+        def signature
+          [:list, :number]
+        end
+      end
+      register_for :at
+    end
+  end
+end

data/lib/rvm/functions/array/size.rb

@@ -0,0 +1,22 @@
+module RVM
+  module Functions
+    class Size < Function
+      class << self 
+        def execute params, env
+          if (this = env.read_var_val(:self)).is_a?(RVM::Classes[:list]) and params.empty?
+            RVM::Classes[:number].new(this.size)
+          elsif params.length == 1
+            RVM::Classes[:number].new(params[0].size)
+          else
+            RVM::Classes[:error].new(1,"FUNCTION (#{self.class}) EXPECTS 2 ARGUMENTS BUT GOT #{params.length}")
+          end
+        end
+        
+        def signature
+          [:any]
+        end
+      end
+      register_for :size
+    end
+  end
+end

data/lib/rvm/functions/logic/or.rb

@@ -3,8 +3,8 @@ module RVM
     class Or < RVM::Functions::Function
       class << self
         def execute params, env
-          while not result and not params.empty?
-            v =  params.shift.execute(env)
+          params.each do |p|
+            v =  p.execute(env)
             return v if v.is_true?
           end
           return RVM::Classes::Boolean.new(false)

data/lib/rvm/interpreter.rb

@@ -18,8 +18,8 @@ module RVM
     # This is a helper function that generates a constat of a simple constant,
     # for example if you've a lot of string constants it is way quickly to call
     # this then writing it out the whole time.
-    def Interpreter.const type,value
-      RVM::Interpreter::Constant.new(RVM::Classes[type].new(value))
+    def Interpreter.const type, value, pos = nil
+      RVM::Interpreter::Constant.new(RVM::Classes[type].new(value), pos)
     end
     
     class VariableStorage
@@ -98,13 +98,18 @@ module RVM
       def []= k, v
         #TODO: add capability to have the privious env variables changed
         RVM::debug "Setting variable #{k} to #{v}"
-        if (self[:locals] and r = self[:locals][k])
+        if (r = self[k])
           r.val = v
         else
           @data[:locals][k] = VariableStorage.new(v)
         end
         v
       end
+      # Defines a varialbe in the current scope, priviose variables are not
+      # changed
+      def define k, v
+        @data[:locals][k] = VariableStorage.new(v)
+      end
       
       # Returns a function for the current enviroment.
       # The result is to be execpted to be of the +RVM::Classes::Block+ class.
@@ -121,7 +126,7 @@ module RVM
       # 
       # It also checks if the given block is truely a +RVM::Classes::Block+ object.       
       def def_function k, b
-        rise(ArgumentError, "Function definitions must be of block class.")if not b.is_a?(RVM::Classes::Block)
+        raise(ArgumentError, "Function definitions must be of block class.") if not b.is_a?(RVM::Classes::Block)
         @data[:functions][k] = b
         RVM::debug "Setting functon #{k} (#{b})"
         nil
@@ -130,9 +135,15 @@ module RVM
       # This functin is closely related to +[]+ with the difference that it returns the value
       # And not the VariableData object.
       def read_var_val name
+        
+        r = nil
         if (v = self[name])
-          v.val
+          r = v.val
+        else
+          r = RVM::Classes[:error].new(0, "Variable #{name} is not defined.")
         end
+        RVM::debug "Getting variable value #{name} (#{r})"
+        r
       end
     end
     
@@ -144,16 +155,18 @@ module RVM
     #
     # The class is stred in :class
     class ObjectContext
-      def initialize object, code
+      def initialize object, code, pos = nil
         @object = object
         @code = code
+        @pos = pos
       end
       
       def execute env
         #The new 
         obj = @object.execute(env)
-        env = Interpreter::Enviroment.new({:functions => obj.functions, :locals => obj.variables}, env)
-        @code.execute(env)
+        new_env = Interpreter::Enviroment.new({:functions => obj.functions, :locals => obj.variables}, env)
+        new_env.define(:self, obj)
+        @code.execute(new_env)
       end
     end
     
@@ -162,10 +175,11 @@ module RVM
     #
     #To define class functions use ObjectContext and define the function normaly, nifty isn't it?
     class SetClassFunction
-      def initialize obj, name, function
+      def initialize obj, name, function, pos = nil
         @object = obj
         @name = name
         @function = function
+        @pos = pos
       end
       
       def execute env
@@ -181,8 +195,9 @@ module RVM
     # With outer code.
     class Block
       attr_reader :content
-      def initialize content
+      def initialize content, pos = nil
         @content = content
+        @pos = pos
       end
       
       # When executed a temporary enviroment is created with the passed
@@ -210,15 +225,16 @@ module RVM
       # override:: when true (default) earlyer definitions are 
       #            replaced when it is called a second time.
       #            When false a exception is thrown
-      def initialize name, body, override = true
+      def initialize name, body, override = true, pos = nil
         @name = name
         @body = body
         @override = override
+        @pos = pos
       end
       
       def execute env
         if (not @override) and env.function(@name)
-          raise "Function #{@name} already defined!"
+          raise "Function #{@name} already defined at #{@pos}!"
         end
         env.def_function(@name.execute(env),@body)
         nil
@@ -235,9 +251,10 @@ module RVM
       #             to true the loop is executed another time otherwise the
       #             exection ends.
       # body::      For each itteration of the loop this is executed once.
-      def initialize(condition, body)
+      def initialize(condition, body, pos = nil)
         @condition = condition
         @body = body
+        @pos = pos
       end
       
       def execute env
@@ -253,8 +270,9 @@ module RVM
     # value isn't evaluated.
     class Constant
       attr_reader :value
-      def initialize value
+      def initialize value, pos = nil
         @value = value
+        @pos = pos
       end
       
       def data_type
@@ -270,7 +288,7 @@ module RVM
       end
       
       def execute env
-        RVM::debug "Executing Constant: #{@value}"
+        RVM::debug "Executing Constant at #{@pos}: #{@value}"
         @value
       end
     end
@@ -304,10 +322,11 @@ module RVM
       #    false casae s executed.
       #  * true_case - is only executed if value evalutes to true (is_true?)
       #  * false_case - is only executed if value evalutes to false (!is_true?)
-      def initialize value, true_case, false_case = nil
+      def initialize value, true_case, false_case = nil, pos = nil
         @value = value
         @true_case = true_case
         @false_case = false_case
+        @pos = pos
       end
       
       def data_type
@@ -336,9 +355,10 @@ module RVM
     # Both the *name* and the *value* are evaluated before the assignment
     # is done.
     class Assignment
-      def initialize name, value
+      def initialize name, value, pos = nil
         @name = name
         @value = value
+        @pos = pos
       end
       
       def data_type
@@ -346,7 +366,7 @@ module RVM
       end
       
       def execute env
-        RVM::debug "Executing Assignment..."
+        RVM::debug "Executing Assignment at #{@pos}..."
         env[@name.execute(env).to_s] = @value.execute env
       end
     end
@@ -355,9 +375,10 @@ module RVM
     #
     # The *name* is evaluated before the variable is retrieved.  
     class Variable
-      def initialize name
+      def initialize name, pos = nil
         @name = name
         @type = :any
+        @pos = pos
       end
       
       # The type can only be tretrieved when the name is aconstant
@@ -367,9 +388,13 @@ module RVM
       end
       
       def execute env
-        RVM::debug "Executing Variable..."
-        r = env.read_var_val(@name.execute(env).to_s)
-        @type = r.data_type if r
+        RVM::debug "Executing Variable at #{@pos}..."
+        n = @name
+        if not @name.is_a?(Symbol)
+          n = n.execute(env).to_s
+        end
+        r = env.read_var_val(n)
+        #@type = r.data_type if r
         r
       end
     end
@@ -377,9 +402,10 @@ module RVM
     # This evauates to the parameter passed to the function call.
     # The number of it is evaluated and typecasted to an interger.
     class Parameter
-      def initialize num
+      def initialize num, pos = nil
         @num = num
         @type = :any
+        @pos = pos
       end
       
       # The type can only be tretrieved when the num is aconstant
@@ -389,7 +415,7 @@ module RVM
       end
       
       def execute env
-        RVM::debug "Executing Parameter..."
+        RVM::debug "Executing Parameter at #{@pos}..."
         r = env.param(@num.execute(env).to_i)
         @type = r.data_type if r
         r
@@ -425,9 +451,10 @@ module RVM
     # The catching is handled bythe +RVM::Classes::Block+ class.
     class ReturnException < Exception
       attr_reader :val
-      def initialize val
+      def initialize val, pos = nil
         super()
         @val = val
+        @pos = pos
       end
     end
     
@@ -435,8 +462,9 @@ module RVM
     # +ReturnException+ which can be caught to have the function
     # or block return what they wish.
     class Return
-      def initialize val
+      def initialize val, pos = nil
         @val = val
+        @pos = pos
       end
       
       def data_type
@@ -461,9 +489,10 @@ module RVM
       # class.
       #
       # Arguments is a list of the arguments to the function.
-      def initialize function,  arguments
+      def initialize function,  arguments, pos = nil
         @function = function
         @arguments = arguments
+        @pos = pos
       end
       
       def data_type
@@ -480,25 +509,25 @@ module RVM
       
       def execute env
         RVM::debug "Executing FunctionCall..."
-        args = @arguments
+        args = @arguments.dup
         if @function.is_a? RVM::Classes[:block]
-          args = @arguments.map do |arg|
+           args.map! do |arg|
             arg.execute env
           end
-          @function.call(args, env)
+          @function.call(args, env,  @pos)
         elsif (fun = env.function(@function))
-          args = @arguments.map do |arg|
+          args.map! do |arg|
             arg.execute env
           end
-          fun.call(args, env)
+          fun.call(args, env, @pos)
         else
           fun = RVM::Functions[@function]
           if fun.execargs
-            args = @arguments.map do |arg|
+            args.map! do |arg|
               arg.execute env
             end
           end
-          fun.call(args, env)
+          fun.call(args, env,  @pos)
         end
       end
     end

data/lib/rvm/languages/ecma.rb

@@ -11,13 +11,14 @@ require 'strscan'
 require 'rvm/functions/math'
 require 'rvm/functions/logic'
 require 'rvm/functions/array'
+require 'rvm/functions/general'
 require 'pp'
 
 module RVM
   module Languages
     class ECMA < Racc::Parser
 
-module_eval(<<'...end ecma.y/module_eval...', 'ecma.y', 194)
+module_eval(<<'...end ecma.y/module_eval...', 'ecma.y', 191)
   extend Plugin
   plugin_host RVM::Languages
   register_for :ecma
@@ -27,7 +28,7 @@ module_eval(<<'...end ecma.y/module_eval...', 'ecma.y', 194)
     s = StringScanner.new(str)
     while not s.eos?
       if s.scan(/\/\/.*?\n/)
-      elsif s.scan(/\/*.*?*\//)
+      elsif s.scan(/\/\*.*?\*\//m)
       elsif s.scan(/('(\\.|[^'])*')/)
         m = s.matched.gsub(/^'/,'').gsub(/'$/,'')
         @q.push [:STRING, [m, s.pos]]
@@ -69,7 +70,7 @@ module_eval(<<'...end ecma.y/module_eval...', 'ecma.y', 194)
           :IDENT
         end
         @q.push [type, [m, s.pos]]
-      elsif s.scan(/(([<>]=?)|([!=]=)|[.+*\/(){},=;\[\]-]|&&|\|\|)/) # This ones do not get a new line (sepperator added)
+      elsif s.scan(/(([<>]=?)|([!=]=)|[.+*\/(),=;\!-]|&&|\|\|)/) # This ones do not get a new line (sepperator added)
         m = s.matched
         @q.push [m, [m, s.pos]]
       elsif s.scan(/\n+/)
@@ -90,246 +91,296 @@ module_eval(<<'...end ecma.y/module_eval...', 'ecma.y', 194)
 ##### State transition tables begin ###
 
 racc_action_table = [
-    33,     2,    61,    62,   113,    42,    61,    62,    69,    77,
-    30,    35,    78,     7,     9,    13,    69,    18,    21,    24,
-    28,    69,   103,     3,    71,    12,    69,    15,    33,     2,
-    72,    26,    69,    33,     2,   112,    69,    69,    30,    35,
-    61,    62,    52,    30,    35,    69,    69,    24,    61,    62,
-    69,     3,    24,    61,    62,    15,     3,    33,     2,    26,
-    15,    61,    62,   114,    26,   115,   110,    30,    35,    51,
-    69,     9,    13,    51,    18,    21,    24,    28,    69,   132,
-     3,   115,    12,    69,    15,    33,     2,   117,    26,   118,
-   109,    69,   108,    69,    12,    30,    35,   106,    70,     9,
-    13,    42,    18,    21,    24,    28,    73,    74,     3,    49,
-    12,    47,    15,    33,     2,    44,    26,    12,    33,     2,
-    42,   129,   130,    30,    35,   131,    82,    69,    30,    35,
-    69,    43,    24,    42,   135,    40,     3,    24,   nil,   nil,
-    15,     3,    33,     2,    26,    15,   nil,   nil,   nil,    26,
-   nil,   nil,    30,    35,   nil,   nil,     9,    13,   nil,    18,
-    21,    24,    28,   nil,   nil,     3,   nil,    12,   nil,    15,
-    33,     2,   nil,    26,   nil,    33,     2,    33,     2,   nil,
-    30,    35,   nil,   nil,   nil,    30,    35,    30,    35,    24,
-   nil,   nil,   nil,     3,    24,   nil,    24,    15,     3,   nil,
-     3,    26,    15,   nil,    15,   124,    26,   nil,    26,    33,
-     2,    61,    62,    63,    64,    65,    66,    67,    68,    30,
-    35,   nil,   nil,     9,    13,   nil,    18,    21,    24,    28,
-   nil,   nil,     3,   nil,    12,   nil,    15,    33,     2,   nil,
-    26,    69,    33,     2,   nil,   nil,   nil,    30,    35,   nil,
-   nil,   nil,    30,    35,   nil,   nil,    24,   nil,   nil,   nil,
-     3,    24,   nil,   nil,    15,     3,    33,     2,    26,    15,
-   nil,   nil,   nil,    26,   nil,   nil,    30,    35,   nil,   nil,
-     9,    13,   nil,    18,    21,    24,    28,   nil,   nil,     3,
-   nil,    12,   nil,    15,    33,     2,   nil,    26,   nil,    33,
-     2,   nil,   nil,   nil,    30,    35,   nil,   nil,   nil,    30,
-    35,   nil,   nil,    24,   nil,   nil,   nil,     3,    24,   nil,
-   nil,    15,     3,    33,     2,    26,    15,   nil,   nil,   nil,
-    26,   nil,   nil,    30,    35,   nil,   nil,     9,    13,   nil,
-    18,    21,    24,    28,   nil,   nil,     3,   nil,    12,   nil,
-    15,    33,     2,   nil,    26,   nil,    33,     2,   nil,   nil,
-   nil,    30,    35,   nil,   nil,   nil,    30,    35,   nil,   nil,
-    24,   nil,   nil,   nil,     3,    24,   nil,   nil,    15,     3,
-    33,     2,    26,    15,   nil,   nil,   nil,    26,   nil,   nil,
-    30,    35,   nil,   nil,     9,    13,   nil,    18,    21,    24,
-    28,   nil,   nil,     3,   nil,    12,   nil,    15,    33,     2,
-   nil,    26,   nil,    33,     2,    33,     2,   nil,    30,    35,
-   nil,   nil,   nil,    30,    35,    30,    35,    24,   nil,   nil,
-   nil,     3,    24,   nil,    24,    15,     3,   nil,     3,    26,
-    15,   100,    15,   nil,    26,   nil,    26,    33,     2,    55,
-    56,    57,    58,    54,   nil,   nil,   nil,    30,    35,   nil,
-   nil,   nil,    33,     2,   nil,   nil,    24,   nil,   nil,   nil,
-     3,   nil,    30,    35,    15,     7,     9,    13,    26,    18,
-    21,    24,    28,   nil,   nil,     3,   nil,    12,   nil,    15,
-    33,     2,   nil,    26,   nil,    33,     2,    33,     2,   nil,
-    30,    35,   nil,   nil,   nil,    30,    35,    30,    35,    24,
-   nil,   nil,   nil,     3,    24,   nil,    24,    15,     3,   nil,
-     3,    26,    15,   nil,    15,   nil,    26,   nil,    26,    33,
-     2,    33,     2,   nil,    33,     2,    33,     2,   nil,    30,
-    35,    30,    35,   nil,    30,    35,    30,    35,    24,   nil,
-    24,   nil,     3,    24,     3,    24,    15,     3,    15,     3,
-    26,    15,    26,    15,   nil,    26,   nil,    26,    33,     2,
-    33,     2,   nil,    33,     2,    33,     2,   nil,    30,    35,
-    30,    35,   nil,    30,    35,    30,    35,    24,   nil,    24,
-   nil,     3,    24,     3,    24,    15,     3,    15,     3,    26,
-    15,    26,    15,   nil,    26,   nil,    26,    33,     2,    33,
-     2,   nil,    33,     2,    33,     2,   nil,    30,    35,    30,
-    35,   nil,    30,    35,    30,    35,    24,   nil,    24,   nil,
-     3,    24,     3,    24,    15,     3,    15,     3,    26,    15,
-    26,    15,   nil,    26,   nil,    26,    61,    62,    63,    64,
-    65,    66,    67,    68,   nil,    61,    62,    63,    64,    65,
-    66,    67,    68,    61,    62,    63,    64,    65,    66,    67,
-    68,   nil,    80,   nil,   nil,   nil,    69,   111,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    69,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    69,    61,    62,    63,    64,    65,    66,
-    67,    68,    61,    62,    63,    64,    65,    66,    67,    68,
-    61,    62,    63,    64,    65,    66,    67,    68,   nil,   nil,
-   nil,   nil,   nil,   nil,    69,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    69,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    69 ]
+    63,    65,    67,    68,    55,    63,    65,    67,    63,   110,
+    63,    65,    67,    68,    55,    56,    57,    58,    59,    60,
+    61,    62,    64,    54,    54,    41,    54,   132,   113,   115,
+    54,    54,    66,    66,    54,    66,    54,   111,   -68,    66,
+    66,    63,   103,    66,   112,    66,    63,    65,    67,    68,
+    55,    56,    57,    63,    65,    67,    68,    55,    56,    57,
+    63,    65,    67,    68,    55,    56,    57,    54,    54,    69,
+    76,    54,    54,    77,    73,    10,    66,    66,    70,    54,
+    66,    66,    96,   114,    71,   115,    54,   117,    66,   118,
+    72,    81,    69,   106,    50,    66,    63,    65,    67,    68,
+    55,    56,    57,    58,    59,    60,    61,    62,    64,    63,
+    65,    67,    68,    55,    56,    57,    63,    65,    67,    68,
+    55,    48,    54,    63,    65,    67,    68,    55,    56,    57,
+    46,    66,    10,    41,   129,    54,   130,   131,   108,   109,
+    43,    42,    54,    41,    66,    63,    65,    67,   135,    54,
+    39,    66,   nil,   nil,   nil,   nil,    32,     1,    66,    63,
+    65,    67,    68,    55,    56,    57,    28,    36,   nil,   nil,
+   nil,    54,   nil,   nil,   nil,    22,   nil,   nil,    31,     2,
+    66,   nil,   nil,    13,   nil,    54,   nil,    25,   nil,   nil,
+   nil,   nil,   nil,   nil,    66,    63,    65,    67,    68,    55,
+    56,    57,    58,    59,    60,    61,    62,    64,    63,    65,
+    67,    68,    55,    56,    57,    58,    59,    60,    61,    62,
+    64,    54,   nil,   nil,   nil,   nil,    79,   nil,   nil,   nil,
+    66,   nil,   nil,   nil,    54,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    66,    63,    65,    67,    68,    55,    56,
+    57,    58,    59,    60,    61,    62,    64,    63,    65,    67,
+    68,    55,    56,    57,    58,    59,    60,    61,    62,    64,
+    54,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    66,
+   nil,   nil,   nil,    54,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    66,    63,    65,    67,    68,    55,    56,    57,
+    58,    59,    60,    61,    62,    64,   nil,    32,     1,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    28,    34,    54,
+   nil,     7,    11,   nil,    16,    19,    22,    26,    66,    31,
+     2,   nil,    10,   nil,    13,    32,     1,   nil,    25,   nil,
+   nil,    32,     1,   nil,   nil,    28,    34,   nil,   nil,   nil,
+   nil,    28,    34,   nil,    22,   nil,   nil,    31,     2,   nil,
+    22,   nil,    13,    31,     2,   nil,    25,   nil,    13,    32,
+     1,   nil,    25,   nil,   nil,   nil,   nil,   nil,   nil,    28,
+    34,   nil,     5,     7,    11,   nil,    16,    19,    22,    26,
+   nil,    31,     2,   nil,    10,   nil,    13,    32,     1,   nil,
+    25,   nil,   nil,    32,     1,   nil,   nil,    28,    34,   nil,
+   nil,   nil,   nil,    28,    36,   nil,    22,   nil,   nil,    31,
+     2,   nil,    22,   nil,    13,    31,     2,   nil,    25,   nil,
+    13,    32,     1,   nil,    25,   nil,   nil,    32,     1,   nil,
+   nil,    28,    34,   nil,   nil,   nil,   nil,    28,    34,   nil,
+    22,   nil,   nil,    31,     2,   nil,    22,   nil,    13,    31,
+     2,   nil,    25,   nil,    13,    32,     1,   nil,    25,   nil,
+   nil,    32,     1,   nil,   nil,    28,    34,   nil,   nil,   nil,
+   nil,    28,    36,   nil,    22,   nil,   nil,    31,     2,   nil,
+    22,   nil,    13,    31,     2,   nil,    25,   nil,    13,    32,
+     1,   nil,    25,   nil,   nil,    32,     1,   nil,   nil,    28,
+    34,   nil,   nil,   nil,   nil,    28,    36,   nil,    22,   nil,
+   nil,    31,     2,   nil,    22,   nil,    13,    31,     2,   nil,
+    25,   nil,    13,    32,     1,   nil,    25,   nil,   nil,   nil,
+   nil,   nil,   nil,    28,    34,   nil,   nil,     7,    11,   nil,
+    16,    19,    22,    26,   nil,    31,     2,   nil,    10,   nil,
+    13,    32,     1,   nil,    25,   nil,   nil,    32,     1,   nil,
+   nil,    28,    36,   nil,   nil,   nil,   nil,    28,    36,   nil,
+    22,   nil,   nil,    31,     2,   nil,    22,   nil,    13,    31,
+     2,   nil,    25,   nil,    13,    32,     1,   nil,    25,   nil,
+   nil,    32,     1,   nil,   nil,    28,    36,   nil,   nil,   nil,
+   nil,    28,    36,   nil,    22,   nil,   nil,    31,     2,   nil,
+    22,   nil,    13,    31,     2,   nil,    25,   nil,    13,    32,
+     1,   nil,    25,   nil,   nil,    32,     1,   nil,   nil,    28,
+    36,   nil,   nil,   nil,   nil,    28,    36,   nil,    22,   nil,
+   nil,    31,     2,   nil,    22,   nil,    13,    31,     2,   nil,
+    25,   nil,    13,    32,     1,   nil,    25,   nil,   nil,    32,
+     1,   nil,   nil,    28,    36,   nil,   nil,   nil,   nil,    28,
+    36,   nil,    22,   nil,   nil,    31,     2,   nil,    22,   nil,
+    13,    31,     2,   nil,    25,   nil,    13,    32,     1,   nil,
+    25,   nil,   nil,    32,     1,   nil,   nil,    28,    36,   nil,
+   nil,   nil,   nil,    28,    36,   nil,    22,   nil,   nil,    31,
+     2,   nil,    22,   nil,    13,    31,     2,   nil,    25,   nil,
+    13,    32,     1,   nil,    25,   nil,   nil,   nil,   nil,   nil,
+   nil,    28,    36,   nil,   nil,   nil,    32,     1,   nil,   nil,
+    22,   nil,   nil,    31,     2,   nil,    28,    34,    13,   nil,
+     7,    11,    25,    16,    19,    22,    26,   nil,    31,     2,
+   nil,    10,   nil,    13,    32,     1,   nil,    25,   nil,   nil,
+   nil,    32,     1,   nil,    28,    36,   nil,   nil,    32,     1,
+   nil,    28,    36,    22,   nil,   nil,    31,     2,    28,    36,
+    22,    13,   125,    31,     2,    25,   nil,    22,    13,   nil,
+    31,     2,    25,    32,     1,    13,   nil,   nil,   nil,    25,
+    32,     1,   nil,    28,    36,   nil,   nil,    32,     1,   nil,
+    28,    36,    22,   nil,   nil,    31,     2,    28,    36,    22,
+    13,   100,    31,     2,    25,   nil,    22,    13,   nil,    31,
+     2,    25,    32,     1,    13,   nil,   nil,   nil,    25,   nil,
+   nil,   nil,    28,    34,   nil,   nil,     7,    11,   nil,    16,
+    19,    22,    26,   nil,    31,     2,   nil,    10,   nil,    13,
+    32,     1,   nil,    25,   nil,   nil,   nil,   nil,   nil,   nil,
+    28,    34,   nil,   nil,     7,    11,   nil,    16,    19,    22,
+    26,   nil,    31,     2,   nil,    10,   nil,    13,    32,     1,
+   nil,    25,   nil,   nil,   nil,   nil,   nil,   nil,    28,    34,
+   nil,   nil,   nil,    32,     1,   nil,   nil,    22,   nil,   nil,
+    31,     2,   nil,    28,    34,    13,   nil,     7,    11,    25,
+    16,    19,    22,    26,   nil,    31,     2,   nil,    10,   nil,
+    13,    32,     1,   nil,    25,   nil,   nil,   nil,   nil,   nil,
+   nil,    28,    34,   nil,   nil,     7,    11,   nil,    16,    19,
+    22,    26,   nil,    31,     2,   nil,    10,   nil,    13,    32,
+     1,   nil,    25,   nil,   nil,    32,     1,   nil,   nil,    28,
+    36,   nil,   nil,   nil,   nil,    28,    36,   nil,    22,   nil,
+   nil,    31,     2,   nil,    22,   nil,    13,    31,     2,   nil,
+    25,   nil,    13,    32,     1,   nil,    25,   nil,   nil,   nil,
+   nil,   nil,   nil,    28,    34,   nil,     5,     7,    11,   nil,
+    16,    19,    22,    26,   nil,    31,     2,   nil,    10,   nil,
+    13,    32,     1,   nil,    25,   nil,   nil,   nil,   nil,   nil,
+   nil,    28,    36,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    22,   nil,   nil,    31,     2,   nil,   nil,   nil,    13,   nil,
+   nil,   nil,    25 ]
 
 racc_action_check = [
-     0,     0,    95,    95,    98,    74,    93,    93,    60,    45,
-     0,     0,    45,     0,     0,     0,    90,     0,     0,     0,
-     0,    91,    74,     0,    38,     0,    88,     0,     2,     2,
-    38,     0,    95,     3,     3,    98,    93,    87,     2,     2,
-    94,    94,    25,     3,     3,    86,    89,     2,    96,    96,
-    85,     2,     3,    97,    97,     2,     3,   135,   135,     2,
-     3,    92,    92,    99,     3,    99,    82,   135,   135,    25,
-    94,   135,   135,    36,   135,   135,   135,   135,    96,   123,
-   135,   123,   135,    97,   135,   130,   130,   105,   135,   105,
-    81,    92,    79,    37,   103,   130,   130,    76,    35,   130,
-   130,    69,   130,   130,   130,   130,    40,    41,   130,    18,
-   130,    13,   130,   129,   129,     9,   130,   117,   115,   115,
-   118,   119,   120,   129,   129,   122,    50,   125,   115,   115,
-    53,     8,   129,     7,   133,     5,   129,   115,   nil,   nil,
-   129,   115,    12,    12,   129,   115,   nil,   nil,   nil,   115,
-   nil,   nil,    12,    12,   nil,   nil,    12,    12,   nil,    12,
-    12,    12,    12,   nil,   nil,    12,   nil,    12,   nil,    12,
-   113,   113,   nil,    12,   nil,    15,    15,   112,   112,   nil,
-   113,   113,   nil,   nil,   nil,    15,    15,   112,   112,   113,
-   nil,   nil,   nil,   113,    15,   nil,   112,   113,    15,   nil,
-   112,   113,    15,   nil,   112,   112,    15,   nil,   112,    21,
-    21,   126,   126,   126,   126,   126,   126,   126,   126,    21,
-    21,   nil,   nil,    21,    21,   nil,    21,    21,    21,    21,
-   nil,   nil,    21,   nil,    21,   nil,    21,   110,   110,   nil,
-    21,   126,    26,    26,   nil,   nil,   nil,   110,   110,   nil,
-   nil,   nil,    26,    26,   nil,   nil,   110,   nil,   nil,   nil,
-   110,    26,   nil,   nil,   110,    26,   109,   109,   110,    26,
-   nil,   nil,   nil,    26,   nil,   nil,   109,   109,   nil,   nil,
-   109,   109,   nil,   109,   109,   109,   109,   nil,   nil,   109,
-   nil,   109,   nil,   109,    28,    28,   nil,   109,   nil,    33,
-    33,   nil,   nil,   nil,    28,    28,   nil,   nil,   nil,    33,
-    33,   nil,   nil,    28,   nil,   nil,   nil,    28,    33,   nil,
-   nil,    28,    33,   108,   108,    28,    33,   nil,   nil,   nil,
-    33,   nil,   nil,   108,   108,   nil,   nil,   108,   108,   nil,
-   108,   108,   108,   108,   nil,   nil,   108,   nil,   108,   nil,
-   108,   106,   106,   nil,   108,   nil,    61,    61,   nil,   nil,
-   nil,   106,   106,   nil,   nil,   nil,    61,    61,   nil,   nil,
-   106,   nil,   nil,   nil,   106,    61,   nil,   nil,   106,    61,
-    78,    78,   106,    61,   nil,   nil,   nil,    61,   nil,   nil,
-    78,    78,   nil,   nil,    78,    78,   nil,    78,    78,    78,
-    78,   nil,   nil,    78,   nil,    78,   nil,    78,    72,    72,
-   nil,    78,   nil,    70,    70,    68,    68,   nil,    72,    72,
-   nil,   nil,   nil,    70,    70,    68,    68,    72,   nil,   nil,
-   nil,    72,    70,   nil,    68,    72,    70,   nil,    68,    72,
-    70,    70,    68,   nil,    70,   nil,    68,    67,    67,    27,
-    27,    27,    27,    27,   nil,   nil,   nil,    67,    67,   nil,
-   nil,   nil,    43,    43,   nil,   nil,    67,   nil,   nil,   nil,
-    67,   nil,    43,    43,    67,    43,    43,    43,    67,    43,
-    43,    43,    43,   nil,   nil,    43,   nil,    43,   nil,    43,
-    44,    44,   nil,    43,   nil,    66,    66,    47,    47,   nil,
-    44,    44,   nil,   nil,   nil,    66,    66,    47,    47,    44,
-   nil,   nil,   nil,    44,    66,   nil,    47,    44,    66,   nil,
-    47,    44,    66,   nil,    47,   nil,    66,   nil,    47,    65,
-    65,    49,    49,   nil,    64,    64,    51,    51,   nil,    65,
-    65,    49,    49,   nil,    64,    64,    51,    51,    65,   nil,
-    49,   nil,    65,    64,    49,    51,    65,    64,    49,    51,
-    65,    64,    49,    51,   nil,    64,   nil,    51,    52,    52,
-    63,    63,   nil,    54,    54,    55,    55,   nil,    52,    52,
-    63,    63,   nil,    54,    54,    55,    55,    52,   nil,    63,
-   nil,    52,    54,    63,    55,    52,    54,    63,    55,    52,
-    54,    63,    55,   nil,    54,   nil,    55,    56,    56,    57,
-    57,   nil,    58,    58,    62,    62,   nil,    56,    56,    57,
-    57,   nil,    58,    58,    62,    62,    56,   nil,    57,   nil,
-    56,    58,    57,    62,    56,    58,    57,    62,    56,    58,
-    57,    62,   nil,    58,   nil,    62,    48,    48,    48,    48,
-    48,    48,    48,    48,   nil,    83,    83,    83,    83,    83,
-    83,    83,    83,    34,    34,    34,    34,    34,    34,    34,
-    34,   nil,    48,   nil,   nil,   nil,    48,    83,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    83,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    34,    39,    39,    39,    39,    39,    39,
-    39,    39,   102,   102,   102,   102,   102,   102,   102,   102,
-   101,   101,   101,   101,   101,   101,   101,   101,   nil,   nil,
-   nil,   nil,   nil,   nil,    39,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   102,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   101 ]
+    85,    85,    85,    85,    85,    84,    84,    84,    94,    81,
+    83,    83,    83,    83,    83,    83,    83,    83,    83,    83,
+    83,    83,    83,   123,    53,    73,    85,   124,    96,   124,
+    35,    84,   123,    53,    94,    85,    83,    83,    34,    35,
+    84,    97,    73,    94,    95,    83,    87,    87,    87,    87,
+    87,    87,    87,    88,    88,    88,    88,    88,    88,    88,
+    89,    89,    89,    89,    89,    89,    89,    97,    51,    34,
+    44,    92,    87,    44,    40,   103,    97,    51,    37,    88,
+    92,    87,    66,    99,    37,    99,    89,   105,    88,   105,
+    39,    49,    36,    75,    23,    89,   126,   126,   126,   126,
+   126,   126,   126,   126,   126,   126,   126,   126,   126,    90,
+    90,    90,    90,    90,    90,    90,    86,    86,    86,    86,
+    86,    16,   126,    91,    91,    91,    91,    91,    91,    91,
+    11,   126,   117,   118,   119,    90,   120,   122,    78,    80,
+     7,     6,    86,     5,    90,    98,    98,    98,   133,    91,
+     4,    86,   nil,   nil,   nil,   nil,    65,    65,    91,    93,
+    93,    93,    93,    93,    93,    93,    65,    65,   nil,   nil,
+   nil,    98,   nil,   nil,   nil,    65,   nil,   nil,    65,    65,
+    98,   nil,   nil,    65,   nil,    93,   nil,    65,   nil,   nil,
+   nil,   nil,   nil,   nil,    93,    47,    47,    47,    47,    47,
+    47,    47,    47,    47,    47,    47,    47,    47,   101,   101,
+   101,   101,   101,   101,   101,   101,   101,   101,   101,   101,
+   101,    47,   nil,   nil,   nil,   nil,    47,   nil,   nil,   nil,
+    47,   nil,   nil,   nil,   101,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   101,    33,    33,    33,    33,    33,    33,
+    33,    33,    33,    33,    33,    33,    33,   102,   102,   102,
+   102,   102,   102,   102,   102,   102,   102,   102,   102,   102,
+    33,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    33,
+   nil,   nil,   nil,   102,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   102,    38,    38,    38,    38,    38,    38,    38,
+    38,    38,    38,    38,    38,    38,   nil,   108,   108,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   108,   108,    38,
+   nil,   108,   108,   nil,   108,   108,   108,   108,    38,   108,
+   108,   nil,   108,   nil,   108,   110,   110,   nil,   108,   nil,
+   nil,   106,   106,   nil,   nil,   110,   110,   nil,   nil,   nil,
+   nil,   106,   106,   nil,   110,   nil,   nil,   110,   110,   nil,
+   106,   nil,   110,   106,   106,   nil,   110,   nil,   106,    42,
+    42,   nil,   106,   nil,   nil,   nil,   nil,   nil,   nil,    42,
+    42,   nil,    42,    42,    42,   nil,    42,    42,    42,    42,
+   nil,    42,    42,   nil,    42,   nil,    42,    43,    43,   nil,
+    42,   nil,   nil,    32,    32,   nil,   nil,    43,    43,   nil,
+   nil,   nil,   nil,    32,    32,   nil,    43,   nil,   nil,    43,
+    43,   nil,    32,   nil,    43,    32,    32,   nil,    43,   nil,
+    32,    46,    46,   nil,    32,   nil,   nil,    26,    26,   nil,
+   nil,    46,    46,   nil,   nil,   nil,   nil,    26,    26,   nil,
+    46,   nil,   nil,    46,    46,   nil,    26,   nil,    46,    26,
+    26,   nil,    46,   nil,    26,    48,    48,   nil,    26,   nil,
+   nil,    25,    25,   nil,   nil,    48,    48,   nil,   nil,   nil,
+   nil,    25,    25,   nil,    48,   nil,   nil,    48,    48,   nil,
+    25,   nil,    48,    25,    25,   nil,    48,   nil,    25,    50,
+    50,   nil,    25,   nil,   nil,   112,   112,   nil,   nil,    50,
+    50,   nil,   nil,   nil,   nil,   112,   112,   nil,    50,   nil,
+   nil,    50,    50,   nil,   112,   nil,    50,   112,   112,   nil,
+    50,   nil,   112,    19,    19,   nil,   112,   nil,   nil,   nil,
+   nil,   nil,   nil,    19,    19,   nil,   nil,    19,    19,   nil,
+    19,    19,    19,    19,   nil,    19,    19,   nil,    19,   nil,
+    19,    54,    54,   nil,    19,   nil,   nil,    55,    55,   nil,
+   nil,    54,    54,   nil,   nil,   nil,   nil,    55,    55,   nil,
+    54,   nil,   nil,    54,    54,   nil,    55,   nil,    54,    55,
+    55,   nil,    54,   nil,    55,    56,    56,   nil,    55,   nil,
+   nil,    57,    57,   nil,   nil,    56,    56,   nil,   nil,   nil,
+   nil,    57,    57,   nil,    56,   nil,   nil,    56,    56,   nil,
+    57,   nil,    56,    57,    57,   nil,    56,   nil,    57,    58,
+    58,   nil,    57,   nil,   nil,    59,    59,   nil,   nil,    58,
+    58,   nil,   nil,   nil,   nil,    59,    59,   nil,    58,   nil,
+   nil,    58,    58,   nil,    59,   nil,    58,    59,    59,   nil,
+    58,   nil,    59,    60,    60,   nil,    59,   nil,   nil,    61,
+    61,   nil,   nil,    60,    60,   nil,   nil,   nil,   nil,    61,
+    61,   nil,    60,   nil,   nil,    60,    60,   nil,    61,   nil,
+    60,    61,    61,   nil,    60,   nil,    61,    62,    62,   nil,
+    61,   nil,   nil,    63,    63,   nil,   nil,    62,    62,   nil,
+   nil,   nil,   nil,    63,    63,   nil,    62,   nil,   nil,    62,
+    62,   nil,    63,   nil,    62,    63,    63,   nil,    62,   nil,
+    63,    64,    64,   nil,    63,   nil,   nil,   nil,   nil,   nil,
+   nil,    64,    64,   nil,   nil,   nil,   109,   109,   nil,   nil,
+    64,   nil,   nil,    64,    64,   nil,   109,   109,    64,   nil,
+   109,   109,    64,   109,   109,   109,   109,   nil,   109,   109,
+   nil,   109,   nil,   109,   113,   113,   nil,   109,   nil,   nil,
+   nil,    67,    67,   nil,   113,   113,   nil,   nil,    13,    13,
+   nil,    67,    67,   113,   nil,   nil,   113,   113,    13,    13,
+    67,   113,   113,    67,    67,   113,   nil,    13,    67,   nil,
+    13,    13,    67,    69,    69,    13,   nil,   nil,   nil,    13,
+    71,    71,   nil,    69,    69,   nil,   nil,   115,   115,   nil,
+    71,    71,    69,   nil,   nil,    69,    69,   115,   115,    71,
+    69,    69,    71,    71,    69,   nil,   115,    71,   nil,   115,
+   115,    71,    10,    10,   115,   nil,   nil,   nil,   115,   nil,
+   nil,   nil,    10,    10,   nil,   nil,    10,    10,   nil,    10,
+    10,    10,    10,   nil,    10,    10,   nil,    10,   nil,    10,
+    77,    77,   nil,    10,   nil,   nil,   nil,   nil,   nil,   nil,
+    77,    77,   nil,   nil,    77,    77,   nil,    77,    77,    77,
+    77,   nil,    77,    77,   nil,    77,   nil,    77,   129,   129,
+   nil,    77,   nil,   nil,   nil,   nil,   nil,   nil,   129,   129,
+   nil,   nil,   nil,   130,   130,   nil,   nil,   129,   nil,   nil,
+   129,   129,   nil,   130,   130,   129,   nil,   130,   130,   129,
+   130,   130,   130,   130,   nil,   130,   130,   nil,   130,   nil,
+   130,   135,   135,   nil,   130,   nil,   nil,   nil,   nil,   nil,
+   nil,   135,   135,   nil,   nil,   135,   135,   nil,   135,   135,
+   135,   135,   nil,   135,   135,   nil,   135,   nil,   135,     2,
+     2,   nil,   135,   nil,   nil,     1,     1,   nil,   nil,     2,
+     2,   nil,   nil,   nil,   nil,     1,     1,   nil,     2,   nil,
+   nil,     2,     2,   nil,     1,   nil,     2,     1,     1,   nil,
+     2,   nil,     1,     0,     0,   nil,     1,   nil,   nil,   nil,
+   nil,   nil,   nil,     0,     0,   nil,     0,     0,     0,   nil,
+     0,     0,     0,     0,   nil,     0,     0,   nil,     0,   nil,
+     0,    68,    68,   nil,     0,   nil,   nil,   nil,   nil,   nil,
+   nil,    68,    68,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    68,   nil,   nil,    68,    68,   nil,   nil,   nil,    68,   nil,
+   nil,   nil,    68 ]
 
 racc_action_pointer = [
-   -10,   nil,    18,    23,   nil,   135,   nil,   112,    92,    78,
-   nil,   nil,   132,    74,   nil,   165,   nil,   nil,    72,   nil,
-   nil,   199,   nil,   nil,   nil,    36,   232,   442,   284,   nil,
-   nil,   nil,   nil,   289,   651,    61,    40,    51,   -10,   682,
-   106,    70,   nil,   452,   480,   -27,   nil,   487,   634,   521,
-    99,   526,   558,    88,   563,   565,   597,   599,   602,   nil,
-   -34,   346,   604,   560,   524,   519,   485,   437,   405,    80,
-   403,   nil,   398,   nil,   -16,   nil,    58,   nil,   370,    54,
-   nil,    52,    29,   643,   nil,     8,     3,    -5,   -16,     4,
-   -26,   -21,    49,    -6,    28,   -10,    36,    41,    -2,    25,
-   nil,   698,   690,    59,   nil,    49,   341,   nil,   313,   256,
-   227,   nil,   167,   160,   nil,   108,   nil,    82,    99,    82,
-    96,   nil,    87,    41,   nil,    85,   199,   nil,   nil,   103,
-    75,   nil,   nil,    96,   nil,    47,   nil ]
+  1003,   975,   969,   nil,   150,   122,   102,   103,   nil,   nil,
+   842,    93,   nil,   778,   nil,   nil,    84,   nil,   nil,   523,
+   nil,   nil,   nil,    88,   nil,   461,   427,   nil,   nil,   nil,
+   nil,   nil,   393,   237,    32,    -3,    55,    44,   286,    90,
+    37,   nil,   359,   387,    34,   nil,   421,   188,   455,    64,
+   489,    35,   nil,    -9,   551,   557,   585,   591,   619,   625,
+   653,   659,   687,   693,   721,   146,    61,   771,  1031,   803,
+   nil,   810,   nil,     4,   nil,    54,   nil,   870,   100,   nil,
+   101,   -28,   nil,     3,    -2,    -7,   109,    39,    46,    53,
+   102,   116,    38,   152,     1,    38,    -9,    34,   138,    45,
+   nil,   201,   250,    40,   nil,    49,   331,   nil,   297,   736,
+   325,   nil,   495,   764,   nil,   817,   nil,    97,   112,    95,
+   110,   nil,    99,   -10,   -11,   nil,    89,   nil,   nil,   898,
+   913,   nil,   nil,   110,   nil,   941,   nil ]
 
 racc_action_default = [
-    -2,   -52,   -70,   -70,   -22,   -70,   -56,   -70,    -1,   -70,
-   -53,   -24,   -70,   -70,   -25,   -70,   -26,    -7,   -70,   -27,
-    -5,   -70,   -63,    -6,   -62,   -54,   -70,   -46,   -70,   -23,
-   -61,   -37,   -51,   -70,   -16,   -69,   -54,   -49,   -70,   -30,
-   -70,   -70,   -69,    -9,   -70,   -70,   -18,   -70,   -70,   -70,
-   -70,   -70,   -70,   -48,   -70,   -70,   -70,   -70,   -70,   -28,
-   -50,   -70,   -70,   -70,   -70,   -70,   -70,   -70,   -70,   -70,
-   -70,   -29,   -70,   137,   -70,    -8,   -70,   -21,   -20,   -70,
-   -55,   -70,   -70,   -70,   -17,   -33,   -36,   -34,   -35,   -32,
-   -44,   -45,   -39,   -38,   -42,   -43,   -40,   -41,   -57,   -70,
-    -3,   -14,   -31,   -70,   -12,   -70,   -70,   -19,   -70,   -70,
-   -70,   -47,   -70,   -70,    -4,   -70,   -10,   -70,   -70,   -70,
-   -65,   -67,   -70,   -70,   -60,   -58,   -15,   -11,   -13,   -70,
-   -70,   -68,   -59,   -70,   -64,   -70,   -66 ]
+    -2,   -69,   -69,   -22,   -69,   -69,    -1,   -69,   -45,   -24,
+   -69,   -69,   -25,   -69,   -26,    -7,   -69,   -27,    -5,   -69,
+   -62,    -6,   -61,   -69,   -43,   -69,   -69,   -23,   -60,   -44,
+   -49,   -47,   -69,   -16,   -46,   -39,   -46,   -69,   -30,   -69,
+   -69,   -68,    -9,   -69,   -69,   -18,   -69,   -69,   -69,   -69,
+   -69,   -38,   -28,   -40,   -69,   -69,   -69,   -69,   -69,   -69,
+   -69,   -69,   -69,   -69,   -69,   -69,   -69,   -69,   -69,   -69,
+   -29,   -69,   137,   -69,    -8,   -69,   -21,   -20,   -69,   -48,
+   -69,   -69,   -17,   -69,   -33,   -41,   -42,   -51,   -50,   -54,
+   -55,   -52,   -36,   -53,   -34,   -56,   -68,   -35,   -32,   -69,
+    -3,   -14,   -31,   -69,   -12,   -69,   -69,   -19,   -69,   -69,
+   -69,   -37,   -69,   -69,    -4,   -69,   -10,   -69,   -69,   -69,
+   -64,   -66,   -69,   -57,   -69,   -59,   -15,   -11,   -13,   -69,
+   -69,   -67,   -58,   -69,   -63,   -69,   -65 ]
 
 racc_goto_table = [
-    25,    46,    17,    59,    99,     5,   116,    41,   105,     8,
-    50,    45,    25,    38,   nil,   nil,   nil,   nil,   nil,    76,
-   127,    25,    79,   nil,    81,   nil,   nil,    84,    25,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    25,    25,    75,   123,    25,   nil,    25,
-   nil,   nil,    25,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   107,   nil,    98,
-   nil,   nil,   nil,   nil,   104,   nil,   nil,   nil,    25,   nil,
-   nil,   119,   nil,   nil,   nil,   122,   nil,   nil,   nil,    37,
-    39,   nil,   nil,   nil,   nil,   nil,   nil,   120,   121,   nil,
-   nil,   nil,    48,   nil,   133,   nil,    25,   nil,    25,    25,
-    25,   nil,   nil,    53,   nil,   nil,   nil,   nil,   128,   134,
-    60,   nil,   nil,   nil,   136,   nil,   nil,   nil,   nil,    25,
-    25,   nil,   nil,   nil,   nil,    25,   nil,   nil,    83,   nil,
-   nil,    85,    86,    87,    88,    89,   nil,   nil,    90,    91,
-    92,    93,    94,    95,    96,    97,   nil,   101,   nil,   102,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   101,
-   125,   nil,   126 ]
+    45,    52,    35,    38,    99,    15,   116,     4,   105,    49,
+    40,     6,    44,    37,    47,   nil,   nil,   nil,    75,   nil,
+   127,    78,   nil,    80,   nil,    82,    51,   nil,   nil,   nil,
+   nil,   nil,   nil,    53,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    74,   124,   nil,
+   nil,   nil,   nil,   nil,   nil,    83,    84,    85,    86,    87,
+    88,    89,    90,    91,    92,    93,    94,   107,    97,    98,
+   101,    95,   102,   nil,   nil,   nil,   nil,   nil,   104,   nil,
+   nil,   119,   nil,   nil,   nil,   122,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   120,   121,
+   nil,   nil,   nil,   nil,   133,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   123,   101,   nil,   126,   nil,   nil,   nil,
+   134,   nil,   nil,   128,   nil,   136 ]
 
 racc_goto_check = [
-     8,     6,     5,    12,     4,     1,     9,     8,    10,     2,
-     6,    13,     8,    19,   nil,   nil,   nil,   nil,   nil,    12,
-     9,     8,    12,   nil,    12,   nil,   nil,    12,     8,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,     8,     8,     5,     4,     8,   nil,     8,
-   nil,   nil,     8,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,     6,   nil,     8,
-   nil,   nil,   nil,   nil,     8,   nil,   nil,   nil,     8,   nil,
-   nil,    12,   nil,   nil,   nil,    12,   nil,   nil,   nil,    11,
-    11,   nil,   nil,   nil,   nil,   nil,   nil,     6,     6,   nil,
-   nil,   nil,    11,   nil,    12,   nil,     8,   nil,     8,     8,
-     8,   nil,   nil,    11,   nil,   nil,   nil,   nil,     8,     6,
-    11,   nil,   nil,   nil,     6,   nil,   nil,   nil,   nil,     8,
-     8,   nil,   nil,   nil,   nil,     8,   nil,   nil,    11,   nil,
-   nil,    11,    11,    11,    11,    11,   nil,   nil,    11,    11,
-    11,    11,    11,    11,    11,    11,   nil,    11,   nil,    11,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    11,
-    11,   nil,    11 ]
+     6,    12,    11,    11,     4,     5,     9,     1,    10,     6,
+     8,     2,    13,    19,    11,   nil,   nil,   nil,    12,   nil,
+     9,    12,   nil,    12,   nil,    12,    11,   nil,   nil,   nil,
+   nil,   nil,   nil,    11,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,     5,     4,   nil,
+   nil,   nil,   nil,   nil,   nil,    11,    11,    11,    11,    11,
+    11,    11,    11,    11,    11,    11,    11,     6,    11,    11,
+    11,     8,    11,   nil,   nil,   nil,   nil,   nil,     8,   nil,
+   nil,    12,   nil,   nil,   nil,    12,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     6,     6,
+   nil,   nil,   nil,   nil,    12,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    11,    11,   nil,    11,   nil,   nil,   nil,
+     6,   nil,   nil,     8,   nil,     6 ]
 
 racc_goto_pointer = [
-   nil,     5,     9,   nil,   -66,     2,   -11,   nil,     0,   -97,
-   -66,    87,   -25,    -1,   nil,   nil,   nil,   nil,   nil,    10,
-   nil,   nil,   nil,   nil,   nil ]
+   nil,     7,    11,   nil,   -65,     5,   -10,   nil,     5,   -97,
+   -65,     1,   -25,     2,   nil,   nil,   nil,   nil,   nil,    11,
+   nil,   nil,   nil ]
 
 racc_goto_default = [
-   nil,   nil,   nil,    10,   nil,   nil,    20,    23,    36,    29,
-   nil,    34,     4,   nil,    11,    14,    16,    19,    22,   nil,
-    27,    31,    32,     1,     6 ]
+   nil,   nil,   nil,     8,   nil,   nil,    18,    21,    23,    27,
+   nil,    33,     3,   nil,     9,    12,    14,    17,    20,   nil,
+    24,    29,    30 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
@@ -369,41 +420,40 @@ racc_reduce_table = [
   3, 54, :_reduce_34,
   3, 54, :_reduce_35,
   3, 54, :_reduce_36,
+  4, 54, :_reduce_37,
+  2, 54, :_reduce_38,
+  2, 54, :_reduce_39,
+  2, 54, :_reduce_none,
+  3, 54, :_reduce_41,
+  3, 54, :_reduce_42,
   1, 54, :_reduce_none,
-  3, 65, :_reduce_38,
-  3, 65, :_reduce_39,
-  3, 65, :_reduce_40,
-  3, 65, :_reduce_41,
-  3, 65, :_reduce_42,
-  3, 65, :_reduce_43,
-  3, 65, :_reduce_44,
-  3, 65, :_reduce_45,
-  1, 64, :_reduce_none,
-  4, 64, :_reduce_47,
-  2, 64, :_reduce_48,
-  2, 64, :_reduce_49,
-  2, 64, :_reduce_none,
-  1, 64, :_reduce_none,
-  1, 64, :_reduce_none,
-  1, 64, :_reduce_none,
-  1, 63, :_reduce_54,
+  1, 54, :_reduce_none,
+  1, 54, :_reduce_none,
+  1, 54, :_reduce_46,
+  1, 54, :_reduce_47,
+  3, 54, :_reduce_48,
+  1, 54, :_reduce_none,
+  3, 63, :_reduce_50,
+  3, 63, :_reduce_51,
+  3, 63, :_reduce_52,
+  3, 63, :_reduce_53,
+  3, 63, :_reduce_54,
   3, 63, :_reduce_55,
-  1, 63, :_reduce_56,
-  3, 66, :_reduce_57,
-  5, 66, :_reduce_58,
-  6, 66, :_reduce_59,
-  5, 66, :_reduce_60,
-  1, 67, :_reduce_61,
-  1, 67, :_reduce_62,
-  1, 67, :_reduce_none,
-  7, 58, :_reduce_64,
-  5, 58, :_reduce_65,
-  9, 57, :_reduce_66,
-  5, 59, :_reduce_67,
-  6, 59, :_reduce_68,
-  1, 51, :_reduce_69 ]
-
-racc_reduce_n = 70
+  3, 64, :_reduce_56,
+  5, 64, :_reduce_57,
+  6, 64, :_reduce_58,
+  5, 64, :_reduce_59,
+  1, 65, :_reduce_60,
+  1, 65, :_reduce_61,
+  1, 65, :_reduce_none,
+  7, 58, :_reduce_63,
+  5, 58, :_reduce_64,
+  9, 57, :_reduce_65,
+  5, 59, :_reduce_66,
+  6, 59, :_reduce_67,
+  1, 51, :_reduce_68 ]
+
+racc_reduce_n = 69
 
 racc_shift_n = 137
 
@@ -536,8 +586,6 @@ Racc_token_to_s_table = [
   "return",
   "ARRAY",
   "array_content",
-  "atom",
-  "exp0",
   "comp",
   "objcall",
   "const" ]
@@ -559,14 +607,14 @@ module_eval(<<'.,.,', 'ecma.y', 31)
 
 module_eval(<<'.,.,', 'ecma.y', 33)
   def _reduce_3(val, _values, result)
-     result = RVM::Interpreter::FunctionCall.new(val[0], []) 
+     result = RVM::Interpreter::FunctionCall.new(val[0][0], [], val[0][1]) 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'ecma.y', 34)
   def _reduce_4(val, _values, result)
-     result = RVM::Interpreter::FunctionCall.new(val[0], val[2]) 
+     result = RVM::Interpreter::FunctionCall.new(val[0][0], val[2], val[0][1]) 
     result
   end
 .,.,
@@ -764,176 +812,174 @@ module_eval(<<'.,.,', 'ecma.y', 106)
   end
 .,.,
 
-# reduce 37 omitted
+module_eval(<<'.,.,', 'ecma.y', 107)
+  def _reduce_37(val, _values, result)
+     result = RVM::Interpreter::FunctionCall.new(:at, [result, val[2]])
+    result
+  end
+.,.,
 
-module_eval(<<'.,.,', 'ecma.y', 109)
+module_eval(<<'.,.,', 'ecma.y', 108)
   def _reduce_38(val, _values, result)
-     result = RVM::Interpreter::FunctionCall.new(:lt, [result, val[2]]) 
+     result = RVM::Interpreter::FunctionCall.new(:not, [val[1]]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 110)
+module_eval(<<'.,.,', 'ecma.y', 109)
   def _reduce_39(val, _values, result)
-     result = RVM::Interpreter::FunctionCall.new(:gt, [result, val[2]]) 
+     result = RVM::Interpreter::FunctionCall.new(:neg, [val[1]])  
     result
   end
 .,.,
 
+# reduce 40 omitted
+
 module_eval(<<'.,.,', 'ecma.y', 111)
-  def _reduce_40(val, _values, result)
-     result = RVM::Interpreter::FunctionCall.new(:eq, [result, val[2]]) 
+  def _reduce_41(val, _values, result)
+     result = RVM::Interpreter::FunctionCall.new(:and, [result, val[2]]) 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'ecma.y', 112)
-  def _reduce_41(val, _values, result)
-     result = RVM::Interpreter::FunctionCall.new(:neq, [result, val[2]]) 
+  def _reduce_42(val, _values, result)
+     result = RVM::Interpreter::FunctionCall.new(:or, [result, val[2]]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 113)
-  def _reduce_42(val, _values, result)
-     result = RVM::Interpreter::FunctionCall.new(:gte, [result, val[2]]) 
+# reduce 43 omitted
+
+# reduce 44 omitted
+
+# reduce 45 omitted
+
+module_eval(<<'.,.,', 'ecma.y', 116)
+  def _reduce_46(val, _values, result)
+     result = RVM::Interpreter::Variable.new(RVM::Interpreter.const(:string,result[0], result[1][1])) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 114)
-  def _reduce_43(val, _values, result)
-     result = RVM::Interpreter::FunctionCall.new(:lte, [result, val[2]]) 
+module_eval(<<'.,.,', 'ecma.y', 117)
+  def _reduce_47(val, _values, result)
+     result = RVM::Interpreter::Variable.new(:self) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 115)
-  def _reduce_44(val, _values, result)
-     result = RVM::Interpreter::FunctionCall.new(:and, [result, val[2]]) 
+module_eval(<<'.,.,', 'ecma.y', 118)
+  def _reduce_48(val, _values, result)
+     result = val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 116)
-  def _reduce_45(val, _values, result)
-     result = RVM::Interpreter::FunctionCall.new(:or, [result, val[2]]) 
+# reduce 49 omitted
+
+module_eval(<<'.,.,', 'ecma.y', 121)
+  def _reduce_50(val, _values, result)
+     result = RVM::Interpreter::FunctionCall.new(:lt, [result, val[2]]) 
     result
   end
 .,.,
 
-# reduce 46 omitted
-
-module_eval(<<'.,.,', 'ecma.y', 119)
-  def _reduce_47(val, _values, result)
-     result = RVM::Interpreter::FunctionCall.new(:at, val[0])
+module_eval(<<'.,.,', 'ecma.y', 122)
+  def _reduce_51(val, _values, result)
+     result = RVM::Interpreter::FunctionCall.new(:gt, [result, val[2]]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 120)
-  def _reduce_48(val, _values, result)
-     result = RVM::Interpreter::FunctionCall.new(:not, [result, val[2]]) 
+module_eval(<<'.,.,', 'ecma.y', 123)
+  def _reduce_52(val, _values, result)
+     result = RVM::Interpreter::FunctionCall.new(:eq, [result, val[2]]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 121)
-  def _reduce_49(val, _values, result)
-     result = RVM::Interpreter::FunctionCall.new(:neg, [val[1]])  
+module_eval(<<'.,.,', 'ecma.y', 124)
+  def _reduce_53(val, _values, result)
+     result = RVM::Interpreter::FunctionCall.new(:neq, [result, val[2]]) 
     result
   end
 .,.,
 
-# reduce 50 omitted
-
-# reduce 51 omitted
-
-# reduce 52 omitted
-
-# reduce 53 omitted
-
-module_eval(<<'.,.,', 'ecma.y', 128)
+module_eval(<<'.,.,', 'ecma.y', 125)
   def _reduce_54(val, _values, result)
-     result = RVM::Interpreter::Variable.new(result) 
+     result = RVM::Interpreter::FunctionCall.new(:gte, [result, val[2]]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 129)
+module_eval(<<'.,.,', 'ecma.y', 126)
   def _reduce_55(val, _values, result)
-     result = val[1] 
+     result = RVM::Interpreter::FunctionCall.new(:lte, [result, val[2]]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 130)
+module_eval(<<'.,.,', 'ecma.y', 128)
   def _reduce_56(val, _values, result)
-     result 
+     result = RVM::Interpreter::ObjectContext.new(val[0], RVM::Interpreter::Variable.new(val[2])) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 132)
+module_eval(<<'.,.,', 'ecma.y', 129)
   def _reduce_57(val, _values, result)
-     result = RVM::Interpreter::ObjectContext.new(val[0], RVM::Interpreter::Variable.new(val[2])) 
+     result = RVM::Interpreter::ObjectContext.new(val[0], RVM::Interpreter::Assignment.new(val[2], val[4])) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 133)
+module_eval(<<'.,.,', 'ecma.y', 130)
   def _reduce_58(val, _values, result)
-     result = RVM::Interpreter::ObjectContext.new(val[0], RVM::Interpreter::Assignment.new(val[2], val[4])) 
+     result = RVM::Interpreter::ObjectContext.new(val[0],RVM::Interpreter::FunctionCall.new(val[2][0], val[4]))
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 134)
+module_eval(<<'.,.,', 'ecma.y', 131)
   def _reduce_59(val, _values, result)
-     result = RVM::Interpreter::ObjectContext.new(val[0],RVM::Interpreter::FunctionCall.new(val[2], val[3]))
+     result = RVM::Interpreter::ObjectContext.new(val[0],RVM::Interpreter::FunctionCall.new(val[2][0], []))
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 135)
+module_eval(<<'.,.,', 'ecma.y', 133)
   def _reduce_60(val, _values, result)
-     result = RVM::Interpreter::ObjectContext.new(val[0],RVM::Interpreter::FunctionCall.new(val[2], []))
+     result = RVM::Interpreter.const(:number, val[0][0], val[0][1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 137)
+module_eval(<<'.,.,', 'ecma.y', 134)
   def _reduce_61(val, _values, result)
-     result = RVM::Interpreter.const(:number, val[0][0]) 
+     result = RVM::Interpreter.const(:string, val[0][0], val[0][1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 138)
-  def _reduce_62(val, _values, result)
-     result = RVM::Interpreter.const(:string, val[0][0]) 
-    result
-  end
-.,.,
+# reduce 62 omitted
 
-# reduce 63 omitted
-
-module_eval(<<'.,.,', 'ecma.y', 141)
-  def _reduce_64(val, _values, result)
+module_eval(<<'.,.,', 'ecma.y', 137)
+  def _reduce_63(val, _values, result)
     result = RVM::Interpreter::Condition.new(val[2], val[4], val[6])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 142)
-  def _reduce_65(val, _values, result)
+module_eval(<<'.,.,', 'ecma.y', 138)
+  def _reduce_64(val, _values, result)
     result = RVM::Interpreter::Condition.new(val[2], val[4])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 145)
-  def _reduce_66(val, _values, result)
+module_eval(<<'.,.,', 'ecma.y', 141)
+  def _reduce_65(val, _values, result)
         init = val[2]
     cond = val[4]
     event = val[6]
@@ -955,8 +1001,8 @@ module_eval(<<'.,.,', 'ecma.y', 145)
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 164)
-  def _reduce_67(val, _values, result)
+module_eval(<<'.,.,', 'ecma.y', 160)
+  def _reduce_66(val, _values, result)
                cond = val[2]
            body = val[4]
            result = RVM::Interpreter::Block.new(
@@ -967,8 +1013,8 @@ module_eval(<<'.,.,', 'ecma.y', 164)
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 171)
-  def _reduce_68(val, _values, result)
+module_eval(<<'.,.,', 'ecma.y', 167)
+  def _reduce_67(val, _values, result)
                cond = val[4]
            body = val[1]
            result = RVM::Interpreter::Block.new(
@@ -981,9 +1027,9 @@ module_eval(<<'.,.,', 'ecma.y', 171)
   end
 .,.,
 
-module_eval(<<'.,.,', 'ecma.y', 180)
-  def _reduce_69(val, _values, result)
-     result = RVM::Interpreter.const(:string,result[0]) 
+module_eval(<<'.,.,', 'ecma.y', 176)
+  def _reduce_68(val, _values, result)
+     result = RVM::Interpreter.const(:string,result[0], result[1][1]) 
     result
   end
 .,.,