minjs 0.4.0 → 0.4.1

data/lib/minjs/ecma262/literal.rb

@@ -142,16 +142,13 @@ module Minjs
     #
     # @see http://www.ecma-international.org/ecma-262 ECMA262 11.1.1
     class This < Literal
-      attr_reader :context
-
-      def initialize(context)
-        @context = context
+      def initialize
       end
 
       # duplicate object
       # @see Base#deep_dup
       def deep_dup
-        self.class.new(@context)
+        self.class.new
       end
 
       # Traverses this children and itself with given block.
@@ -1000,7 +997,7 @@ module Minjs
       # Returns a ECMAScript string containg the representation of element.
       # @see Base#to_js
       def to_js(options = {})
-        "[" + @val.collect{|x| x.to_s}.join(",") + "]"
+        "[" + @val.collect{|x| x ? x.to_js : ""}.join(",") + "]"
       end
 
       # @return [Boolean] true if expression is kind of LeftHandSideExpression.
@@ -1177,22 +1174,21 @@ module Minjs
     #
     # @see http://www.ecma-international.org/ecma-262 ECMA262 7.6
     class IdentifierName < Literal
-      attr_accessor :context
+      attr_accessor :exe_context
       attr_reader :val
 
       @@sym = {}
 
-      def initialize(context, val)
-        @context = context
+      def initialize(val)
         @val = val.to_sym
       end
 
       # get instance
-      def self.get(context, val)
+      def self.get(val)
         if reserved?(val)
-          @@sym[val] ||= self.new(context, val)
+          @@sym[val] ||= self.new(val)
         else
-          self.new(context, val)
+          self.new(val)
         end
       end
 
@@ -1238,7 +1234,7 @@ module Minjs
       # duplicate object
       # @see Base#deep_dup
       def deep_dup
-        self.class.new(@context, @val)
+        self.class.new(@val)
       end
 
       # compare object
@@ -1252,19 +1248,19 @@ module Minjs
         val.to_s
       end
 
+      def to_s
+        val.to_s
+      end
+
       # @return [Boolean] true if expression is kind of LeftHandSideExpression.
       def left_hand_side_exp?
         true
       end
 
       # @return [EnvRecord] binding environment
-      def binding_env(type = :var)
-        return nil if context.nil?
-        if type == :var
-          v = context.var_env
-        else
-          v = context.lex_env
-        end
+      def binding_env(lex_env)
+        return nil if lex_env.nil?
+        v = lex_env
 
         while v
           if v.record.binding[val]
@@ -1278,67 +1274,67 @@ module Minjs
     end
 
     # reserved word "this"
-    ID_THIS = IdentifierName.get(nil, :this)
+    ID_THIS = IdentifierName.get(:this)
     # reserved word "var"
-    ID_VAR = IdentifierName.get(nil, :var)
+    ID_VAR = IdentifierName.get(:var)
     # reserved word "in"
-    ID_IN = IdentifierName.get(nil, :in)
+    ID_IN = IdentifierName.get(:in)
     # reserved word "instanceof"
-    ID_INSTANCEOF = IdentifierName.get(nil, :instanceof)
+    ID_INSTANCEOF = IdentifierName.get(:instanceof)
     # reserved word "function"
-    ID_FUNCTION = IdentifierName.get(nil, :function)
+    ID_FUNCTION = IdentifierName.get(:function)
     # reserved word "null"
-    ID_NULL = IdentifierName.get(nil, :null)
+    ID_NULL = IdentifierName.get(:null)
     # reserved word "true"
-    ID_TRUE = IdentifierName.get(nil, :true)
+    ID_TRUE = IdentifierName.get(:true)
     # reserved word "false"
-    ID_FALSE = IdentifierName.get(nil, :false)
+    ID_FALSE = IdentifierName.get(:false)
     # reserved word "new"
-    ID_NEW = IdentifierName.get(nil, :new)
+    ID_NEW = IdentifierName.get(:new)
     # reserved word "delete"
-    ID_DELETE = IdentifierName.get(nil, :delete)
+    ID_DELETE = IdentifierName.get(:delete)
     # reserved word "void"
-    ID_VOID = IdentifierName.get(nil, :void)
+    ID_VOID = IdentifierName.get(:void)
     # reserved word "typeof"
-    ID_TYPEOF = IdentifierName.get(nil, :typeof)
+    ID_TYPEOF = IdentifierName.get(:typeof)
     # reserved word "if"
-    ID_IF = IdentifierName.get(nil, :if)
+    ID_IF = IdentifierName.get(:if)
     # reserved word "else"
-    ID_ELSE = IdentifierName.get(nil, :else)
+    ID_ELSE = IdentifierName.get(:else)
     # reserved word "for"
-    ID_FOR = IdentifierName.get(nil, :for)
+    ID_FOR = IdentifierName.get(:for)
     # reserved word "while"
-    ID_WHILE = IdentifierName.get(nil, :while)
+    ID_WHILE = IdentifierName.get(:while)
     # reserved word "do"
-    ID_DO = IdentifierName.get(nil, :do)
+    ID_DO = IdentifierName.get(:do)
     # reserved word "continue"
-    ID_CONTINUE = IdentifierName.get(nil, :continue)
+    ID_CONTINUE = IdentifierName.get(:continue)
     # reserved word "break"
-    ID_BREAK = IdentifierName.get(nil, :break)
+    ID_BREAK = IdentifierName.get(:break)
     # reserved word "return"
-    ID_RETURN = IdentifierName.get(nil, :return)
+    ID_RETURN = IdentifierName.get(:return)
     # reserved word "with"
-    ID_WITH = IdentifierName.get(nil, :with)
+    ID_WITH = IdentifierName.get(:with)
     # reserved word "switch"
-    ID_SWITCH = IdentifierName.get(nil, :switch)
+    ID_SWITCH = IdentifierName.get(:switch)
     # reserved word "throw"
-    ID_THROW = IdentifierName.get(nil, :throw)
+    ID_THROW = IdentifierName.get(:throw)
     # reserved word "try"
-    ID_TRY = IdentifierName.get(nil, :try)
+    ID_TRY = IdentifierName.get(:try)
     # reserved word "catch"
-    ID_CATCH = IdentifierName.get(nil, :catch)
+    ID_CATCH = IdentifierName.get(:catch)
     # reserved word "finally"
-    ID_FINALLY = IdentifierName.get(nil, :finally)
+    ID_FINALLY = IdentifierName.get(:finally)
     # reserved word "debugger"
-    ID_DEBUGGER = IdentifierName.get(nil, :debugger)
+    ID_DEBUGGER = IdentifierName.get(:debugger)
     # reserved word "case"
-    ID_CASE = IdentifierName.get(nil, :case)
+    ID_CASE = IdentifierName.get(:case)
     # reserved word "default"
-    ID_DEFAULT = IdentifierName.get(nil, :default)
+    ID_DEFAULT = IdentifierName.get(:default)
     # get (non-reserved word)
-    ID_GET = IdentifierName.get(nil, :get)
+    ID_GET = IdentifierName.get(:get)
     # set (non-reserved word)
-    ID_SET = IdentifierName.get(nil, :set)
+    ID_SET = IdentifierName.get(:set)
 
   end
 end

data/lib/minjs/ecma262/statement.rb

@@ -87,7 +87,6 @@ module Minjs
         @statement_list.statement_list.select{|s|
           s.class != StEmpty
         }[0].to_exp.deep_dup
-
       end
 
       # @return true if block can convert to single statement.
@@ -145,20 +144,20 @@ module Minjs
     # @see http://www.ecma-international.org/ecma-262 ECMA262 12.2
     class StVar < Statement
       attr_reader :vars
-      attr_reader :context
+      attr_reader :var_env
       #
       # vars:
       #  [[name0,init0],[name1,init1],...]
       #
-      def initialize(context, vars)
+      def initialize(var_env, vars)
         @vars = vars
-        @context = context
+        @var_env = var_env
       end
 
       # duplicate object
       # @see Base#deep_dup
       def deep_dup
-        self.class.new(@context,
+        self.class.new(@var_env,
                        @vars.collect{|x,y|
                          [x.deep_dup, y ? y.deep_dup : nil]
                        })
@@ -717,15 +716,15 @@ module Minjs
     #
     # @see http://www.ecma-international.org/ecma-262 ECMA262 12.6.3
     class StForVar < Statement
-      attr_reader :context
+      attr_reader :var_env
       attr_reader :var_decl_list, :exp2, :exp3, :statement
 
       #
       # var_decl_list
       #  [[name0, init0],[name1, init1], ...]
       #
-      def initialize(context, var_decl_list, exp2, exp3, statement)
-        @context = context
+      def initialize(var_env, var_decl_list, exp2, exp3, statement)
+        @var_env = var_env
         @var_decl_list = var_decl_list
         @exp2 = exp2
         @exp3 = exp3
@@ -735,7 +734,7 @@ module Minjs
       # duplicate object
       # @see Base#deep_dup
       def deep_dup
-        self.class.new(@context,
+        self.class.new(@var_env,
                        @var_decl_list.collect{|x,y|
                          [x.deep_dup, y.deep_dup]
                        },
@@ -913,11 +912,11 @@ module Minjs
     #
     # @see http://www.ecma-international.org/ecma-262 ECMA262 12.6.4
     class StForInVar < Statement
-      attr_reader :context
+      attr_reader :var_env
       attr_reader :var_decl, :exp2, :statement
 
-      def initialize(context, var_decl, exp2, statement)
-        @context = context
+      def initialize(var_env, var_decl, exp2, statement)
+        @var_env = var_env
         @var_decl = var_decl
         @exp2 = exp2
         @statement = statement
@@ -926,7 +925,7 @@ module Minjs
       # duplicate object
       # @see Base#deep_dup
       def deep_dup
-        self.class.new(@context,
+        self.class.new(@var_env,
                        [@var_decl[0].deep_dup, @var_decl[1] ? @var_decl[1].deep_dup : nil],
                        @exp2.deep_dup,
                        @statement.deep_dup)
@@ -1154,10 +1153,10 @@ module Minjs
     #
     # @see http://www.ecma-international.org/ecma-262 ECMA262 12.10
     class StWith < Statement
-      attr_reader :exp, :statement, :context
+      attr_reader :exp, :statement, :var_env
 
-      def initialize(context, exp, statement)
-        @context = context
+      def initialize(var_env, exp, statement)
+        @var_env = var_env
         @exp = exp
         @statement = statement
       end
@@ -1165,7 +1164,7 @@ module Minjs
       # duplicate object
       # @see Base#deep_dup
       def deep_dup
-        self.class.new(@context, @exp.deep_dup, @statement.deep_dup)
+        self.class.new(@var_env, @exp.deep_dup, @statement.deep_dup)
       end
 
       # Replaces children object.
@@ -1382,15 +1381,67 @@ module Minjs
       end
     end
 
+    class StTryCatch < Statement
+      attr_reader :var_env
+      attr_reader :arg
+      attr_reader :block
+      attr_accessor :exe_context
+
+      def initialize(var_env, arg, block)
+        @var_env = var_env
+        @arg = arg
+        @block = block
+      end
+
+      def to_js(options = {})
+        concat(options, :catch, "(", @arg, ")", @block)
+      end
+
+      # duplicate object
+      # @see Base#deep_dup
+      def deep_dup
+        self.class.new(@var_env,
+                       @arg.deep_dup,
+                       @block.deep_dup)
+      end
+
+      # Traverses this children and itself with given block.
+      def traverse(parent, &block)
+        @arg.traverse(self, &block)
+        @block.traverse(self, &block)
+        yield parent, self
+      end
+
+      # Replaces children object.
+      # @see Base#replace
+      def replace(from, to)
+        if from .eql? @arg
+          @arg = to
+        elsif from .eql? @block
+          @block = to
+        end
+      end
+
+      def enter(outer_exe_context)
+        catch_env = LexEnv.new_declarative_env(outer_exe_context.lex_env)
+        catch_env.record.create_mutable_binding(@arg, nil)
+        catch_env.record.set_mutable_binding(@arg, :undefined, nil, nil)
+
+        new_exe_context = ExeContext.new
+        new_exe_context.lex_env = catch_env
+        new_exe_context
+      end
+    end
+
     # Base class of ECMA262 TryStatement element.
     #
     # @see http://www.ecma-international.org/ecma-262 ECMA262 12.14
     class StTry < Statement
-      attr_reader :context
+      attr_reader :var_env
       attr_reader :try, :catch, :finally
 
-      def initialize(context, try, catch, finally)
-        @context = context
+      def initialize(var_env, try, catch, finally)
+        @var_env = var_env
         @try = try
         @catch = catch
         @finally = finally
@@ -1399,9 +1450,9 @@ module Minjs
       # duplicate object
       # @see Base#deep_dup
       def deep_dup
-        self.class.new(@context,
+        self.class.new(@var_env,
                        @try.deep_dup,
-                       @catch ? [@catch[0].deep_dup, @catch[1].deep_dup] : nil,
+                       @catch ? @catch.deep_dup : nil,
                        @finally ? @finally.deep_dup : nil)
       end
 
@@ -1410,10 +1461,8 @@ module Minjs
       def replace(from, to)
         if from .eql? @try
           @try = to
-        elsif from .eql? @catch[0]
-          @catch[0] = to
-        elsif from .eql? @catch[1]
-          @catch[1] = to
+        elsif from .eql? @catch
+          @catch = to
         elsif from .eql? @finally
           @finally = to
         end
@@ -1422,10 +1471,7 @@ module Minjs
       # Traverses this children and itself with given block.
       def traverse(parent, &block)
         @try.traverse(self, &block)
-        if @catch
-          @catch[0].traverse(self, &block)
-          @catch[1].traverse(self, &block)
-        end
+        @catch.traverse(self, &block) if @catch
         @finally.traverse(self, &block) if @finally
         yield parent, self
       end
@@ -1442,13 +1488,14 @@ module Minjs
       # @see Base#to_js
       def to_js(options = {})
         if @catch and @finally
-          concat(options, :try, @try, :catch, "(", @catch[0], ")", @catch[1], :finally, @finally)
+          concat(options, :try, @try, @catch, :finally, @finally)
         elsif @catch
-          concat(options, :try, @try, :catch, "(", @catch[0], ")", @catch[1])
+          concat(options, :try, @try, @catch)
         else
           concat(options, :try, @try, :finally, @finally)
         end
       end
+
     end
 
     # Base class of ECMA262 DebuggerStatement element.
@@ -1486,10 +1533,11 @@ module Minjs
       attr_reader :name
       attr_reader :args
       attr_reader :statements
-      attr_reader :context
+      attr_reader :var_env
+      attr_accessor :exe_context
 
-      def initialize(context, name, args, statements, options = {})
-        @context = context
+      def initialize(var_env, name, args, statements, options = {})
+        @var_env = var_env
         @name = name
         @args = args #=> array
         @statements = statements #=> Prog
@@ -1506,10 +1554,10 @@ module Minjs
       # duplicate object
       # @see Base#deep_dup
       def deep_dup
-        self.class.new(@context, @name ? @name.deep_dup : nil,
-                       @args.collect{|args|args.deep_dup},
-                       @statements.deep_dup,
-                       {decl: @decl, getter: @getter, setter: @setter})
+        self.class.new(@var_env, @name ? @name.deep_dup : nil,
+                           @args.collect{|args|args.deep_dup},
+                           @statements.deep_dup,
+                           {decl: @decl, getter: @getter, setter: @setter})
       end
 
       # Traverses this children and itself with given block.
@@ -1562,6 +1610,19 @@ module Minjs
       def decl?
         @decl
       end
+
+      def enter(outer_exe_context)
+        local_env = LexEnv.new_declarative_env(outer_exe_context.lex_env)
+        var_env.record.binding.each do |k, v|
+          local_env.record.create_mutable_binding(k, nil)
+          val = v.delete(:value)
+          local_env.record.set_mutable_binding(k, val, nil, v)
+        end
+        new_exe_context = ExeContext.new
+        new_exe_context.lex_env = local_env
+        new_exe_context.var_env = var_env
+        new_exe_context
+      end
     end
   end
 end