minjs 0.1.5 → 0.1.7

data/lib/minjs/ecma262/lit.rb

@@ -15,7 +15,7 @@ module Minjs
       end
 
       def priority
-        10
+        PRIORITY_PRIMARY
       end
     end
 
@@ -98,6 +98,14 @@ module Minjs
       def self.get
         @@instance
       end
+
+      def to_ecma262_boolean
+        false
+      end
+
+      def ecma262_typeof
+        :boolean
+      end
     end
 
     class Boolean < Literal
@@ -130,7 +138,7 @@ module Minjs
       @@true = self.new(:true)
       @@false = self.new(:false)
       def self.get(val)
-        if val.to_sym == :true
+        if val.to_sym == :true || val == true
           @@true
         else
           @@false
@@ -183,6 +191,18 @@ module Minjs
         end
         t << "\""
       end
+
+      def to_ecma262_boolean
+        if @val.length == 0
+          false
+        else
+          true
+        end
+      end
+
+      def ecma262_typeof
+        :string
+      end
     end
 
     class ECMA262Numeric < Literal
@@ -307,6 +327,27 @@ module Minjs
           end
         end
       end
+
+      def to_ecma262_boolean
+        if @val == :nan or to_ecma262_string == "0"
+          false
+        else
+          true
+        end
+      end
+
+      def ecma262_typeof
+        :number
+      end
+
+      def ecma262_eval(type)
+        case type
+        when :boolean
+          to_ecma262_boolean
+        else
+          nil
+        end
+      end
     end
     NUMERIC_NAN = ECMA262Numeric.new(:nan)
 
@@ -350,6 +391,9 @@ module Minjs
       def to_js(options = {})
         "[" + @val.collect{|x| x.to_s}.join(",") + "]"
       end
+      def to_ecma262_boolean
+        true
+      end
     end
 
     class ECMA262Object < Literal
@@ -408,6 +452,18 @@ module Minjs
           end
         }.join(",") + "}"
       end
+      def to_ecma262_boolean
+        true
+      end
+#      def ecma262_eval(type)
+#
+#        case type
+#        when :boolean
+#          to_ecma262_boolean
+#        else
+#          nil
+#        end
+#      end
     end
 
     class SingleLineComment < Literal

data/lib/minjs/ecma262/st.rb

@@ -58,24 +58,7 @@ module Minjs
         t = @statement_list.statement_list.select{|s|
           s.class != StEmpty
         }
-        return false if t.length != 1
-        #
-        #  if(a){ //<= this block must not be removed
-        #    while(true)
-        #      if(b){
-        #        ;
-        #      }
-        #  }
-        #  else{
-        #   ;
-        #  }
-        #
-        last_st = t[0].last_statement[-2]
-        if last_st.kind_of?(StIf) and last_st.else_st.nil?
-          return false
-        else
-          return true
-        end
+        t.length == 1
       end
 
       def to_statement
@@ -167,11 +150,21 @@ module Minjs
 
       def remove_paren
         @vars.each do |x|
-          if x[1] and x[1].kind_of? ExpParen and x[1].val.priority <= 130
+          if x[1] and x[1].kind_of? ExpParen and x[1].val.priority <= PRIORITY_ASSIGNMENT
             x[1] = x[1].val
           end
         end
       end
+
+      def add_paren
+        @vars.each do |x|
+          if x[1] and x[1].priority > PRIORITY_ASSIGNMENT
+            x[1] = ExpParen.new(x[1])
+          end
+        end
+        self
+      end
+
       def last_statement
         [self]
       end
@@ -238,6 +231,11 @@ module Minjs
           @exp = @exp.val if @exp.remove_paren?
         end
       end
+
+      def add_paren
+        self
+      end
+
       def last_statement
         [self]
       end
@@ -258,7 +256,9 @@ module Minjs
       end
 
       def replace(from, to)
-        if from == @then_st
+        if from == @cond
+          @cond = to
+        elsif from == @then_st
           @then_st = to
         elsif from == @else_st
           @else_st = to
@@ -313,26 +313,22 @@ module Minjs
 
       def to_exp(options = {})
         return nil if to_exp? == false
-        if @else_st
+        if !@else_st
           then_exp = @then_st.to_exp(options)
-          else_exp = @else_st.to_exp(options)
+          if @cond.kind_of? ExpLogicalNot
+            return ExpParen.new(ExpLogicalOr.new(ExpParen.new(@cond.val), ExpParen.new(then_exp)))
+          else
+            return ExpParen.new(ExpLogicalAnd.new(ExpParen.new(@cond), ExpParen.new(then_exp)))
+          end
         else
-          then_exp = @then_st.to_exp(options)
-          return ExpLogicalAnd.new(ExpParen.new(@cond), ExpParen.new(then_exp))
-        end
-        if then_exp.kind_of? ExpComma
-          then_exp = ExpParen.new(then_exp)
-        end
-        if else_exp.kind_of? ExpComma
-          else_exp = ExpParen.new(else_exp)
+          then_exp = ExpParen.new(@then_st.to_exp(options))
+          else_exp = ExpParen.new(@else_st.to_exp(options))
         end
 
-        if @cond.kind_of? ExpComma
-          ExpCond.new(ExpParen.new(@cond), then_exp, else_exp)
-        elsif @cond.kind_of? ExpAssign
-          ExpCond.new(ExpParen.new(@cond), then_exp, else_exp)
+        if @cond.kind_of? ExpLogicalNot
+          ExpCond.new(ExpParen.new(@cond.val), else_exp, then_exp)
         else
-          ExpCond.new(@cond, then_exp, else_exp)
+          ExpCond.new(ExpParen.new(@cond), then_exp, else_exp)
         end
       end
 
@@ -340,6 +336,11 @@ module Minjs
         if @cond.kind_of? ExpParen
           @cond = @cond.val
         end
+        self
+      end
+
+      def add_paren
+        self
       end
 
       def last_statement
@@ -354,6 +355,8 @@ module Minjs
 
     #12.6
     class StWhile < St
+      attr_reader :exp, :statement
+
       def initialize(exp, statement)
         @exp, @statement = exp, statement
       end
@@ -388,6 +391,11 @@ module Minjs
         if @exp.kind_of? ExpParen
           @exp = @exp.val
         end
+        self
+      end
+
+      def add_paren
+        self
       end
 
       def last_statement
@@ -426,11 +434,18 @@ module Minjs
 
         concat options, :do, statement, :while, "(", @exp, ")", ";"
       end
+
       def remove_paren
         if @exp.kind_of? ExpParen
           @exp = @exp.val
         end
+        self
+      end
+
+      def add_paren
+        self
       end
+
       def last_statement
         list = [self]
         list.concat @statement.last_statement
@@ -441,6 +456,8 @@ module Minjs
     # 12.6.3 the for statement
     #
     class StFor < St
+      attr_reader :exp1, :exp2, :exp3, :statement
+
       def initialize(exp1, exp2, exp3, statement)
         @exp1 = exp1
         @exp2 = exp2
@@ -456,15 +473,21 @@ module Minjs
       end
 
       def replace(from, to)
-        if from == @statement
+        if from == @exp1
+          @exp1 = to
+        elsif from == @exp2
+          @exp2 = to
+        elsif from == @exp3
+          @exp3 = to
+        elsif from == @statement
           @statement = to
         end
       end
 
       def traverse(parent, &block)
-        @exp1.traverse(self, &block)
-        @exp2.traverse(self, &block)
-        @exp3.traverse(self, &block)
+        @exp1.traverse(self, &block) if @exp1
+        @exp2.traverse(self, &block) if @exp2
+        @exp3.traverse(self, &block) if @exp3
         @statement.traverse(self, &block)
         yield self, parent
       end
@@ -489,7 +512,13 @@ module Minjs
         if @exp3.kind_of? ExpParen
           @exp3 = @exp3.val
         end
+        self
       end
+
+      def add_paren
+        self
+      end
+
       def last_statement
         list = [self]
         list.concat @statement.last_statement
@@ -537,8 +566,8 @@ module Minjs
             x[1].traverse(self, &block)
           end
         end
-        @exp2.traverse(self, &block)
-        @exp3.traverse(self, &block)
+        @exp2.traverse(self, &block) if @exp2
+        @exp3.traverse(self, &block) if @exp3
         @statement.traverse(self, &block)
         yield self, parent
       end
@@ -593,7 +622,13 @@ module Minjs
         if @exp3.kind_of? ExpParen
           @exp3 = @exp3.val
         end
+        self
       end
+
+      def add_paren
+        self
+      end
+
       def last_statement
         list = [self]
         list.concat @statement.last_statement
@@ -635,13 +670,22 @@ module Minjs
       end
 
       def remove_paren
-        if @exp1.kind_of? ExpParen and @exp1.priority <= 20 #left-hand
+        if @exp1.kind_of? ExpParen and @exp1.val.priority <= PRIORITY_LEFT_HAND_SIDE
           @exp1 = @exp1.val
         end
         if @exp2.kind_of? ExpParen
           @exp2 = @exp2.val
         end
+        self
       end
+
+      def add_paren
+        if @exp1.priority > PRIORITY_LEFT_HAND_SIDE
+          @exp1 = ExpParen.new(@exp1)
+        end
+        self
+      end
+
       def last_statement
         list = [self]
         list.concat @statement.last_statement
@@ -687,6 +731,7 @@ module Minjs
         end
         StForIn.new(t, @exp2, @statement)
       end
+
       def to_js(options = {})
         if @statement.kind_of? StBlock and @statement.statement_list.length == 1
           statement = @statement.statement_list.statement_list[0]
@@ -710,6 +755,11 @@ module Minjs
         if @exp2.kind_of? ExpParen
           @exp2 = @exp2.val
         end
+        self
+      end
+
+      def add_paren
+        self
       end
 
       def last_statement
@@ -733,6 +783,7 @@ module Minjs
         @exp.traverse(self, &block) if @exp
         yield self, parent
       end
+
       def to_js(options = {})
         if @exp
           concat options, :continue, @exp, ";"
@@ -740,6 +791,7 @@ module Minjs
           concat options, :continue, ";"
         end
       end
+
       def last_statement
         [self]
       end
@@ -767,6 +819,7 @@ module Minjs
           concat options, :break, ";"
         end
       end
+
       def last_statement
         [self]
       end
@@ -814,11 +867,18 @@ module Minjs
           concat options, :return, ";"
         end
       end
+
       def remove_paren
         if @exp.kind_of? ExpParen
           @exp = @exp.val
         end
+        self
+      end
+
+      def add_paren
+        self
       end
+
       def last_statement
         [self]
       end
@@ -843,11 +903,18 @@ module Minjs
       def to_js(options = {})
         concat options, :with, "(", @exp, ")", @statement
       end
+
       def remove_paren
         if @exp.kind_of? ExpParen
           @exp = @exp.val
         end
+        self
+      end
+
+      def add_paren
+        self
       end
+
       def last_statement
         list = [self]
         list.concat @statement.last_statement
@@ -910,7 +977,13 @@ module Minjs
             b[0] = b[0].val
           end
         end
+        self
+      end
+
+      def add_paren
+        self
       end
+
       def last_statement
         list = [self]
       end
@@ -976,7 +1049,13 @@ module Minjs
 
     #12.14
     class StTry < St
-      def initialize(try, catch, finally)
+      attr_reader :context
+      attr_reader :catch_context
+      attr_reader :try, :catch, :finally
+
+      def initialize(context, catch_context, try, catch, finally)
+        @context = context
+        @catch_context = catch_context
         @try = try
         @catch = catch
         @finally = finally
@@ -1021,6 +1100,7 @@ module Minjs
         [self]
       end
     end
+
     #12.15
     class StDebugger < St
       def deep_dup

data/lib/minjs/func.rb

@@ -21,6 +21,8 @@ module Minjs
 
           context.var_env.record.create_mutable_binding(id, nil)
           context.var_env.record.set_mutable_binding(id, f, nil)
+          context.lex_env.record.create_mutable_binding(id, nil)
+          context.lex_env.record.set_mutable_binding(id, f, nil)
           f
         else
           if b
@@ -52,6 +54,8 @@ module Minjs
            if id_opt
              new_context.var_env.record.create_mutable_binding(id_opt, nil)
              new_context.var_env.record.set_mutable_binding(id_opt, f, nil)
+             new_context.lex_env.record.create_mutable_binding(id_opt, nil)
+             new_context.lex_env.record.set_mutable_binding(id_opt, f, nil)
              id_opt.context = new_context
            end
            f
@@ -80,6 +84,8 @@ module Minjs
         ret.each do |argName|
           context.var_env.record.create_mutable_binding(argName, nil)
           context.var_env.record.set_mutable_binding(argName, :undefined, nil, {:_parameter_list => true})
+          context.lex_env.record.create_mutable_binding(argName, nil)
+          context.lex_env.record.set_mutable_binding(argName, :undefined, nil, {:_parameter_list => true})
         end
         ret
       }

data/lib/minjs/literal.rb

@@ -34,9 +34,9 @@ module Minjs
     #
     def boolean_literal(lex, context)
       if lex.match_lit(ECMA262::ID_TRUE)
-        ECMA262::Boolean.new(:true)
+        ECMA262::Boolean.get(:true)
       elsif lex.match_lit(ECMA262::ID_FALSE)
-        ECMA262::Boolean.new(:false)
+        ECMA262::Boolean.get(:false)
       else
         nil
       end

data/lib/minjs/minjs_compressor.rb

@@ -20,7 +20,7 @@ module Minjs
     def evaluate(context, locals, &block)
       case context.content_type
       when 'application/javascript'
-        if logger.debug?
+        if logger.info?
           @@c = 0 unless defined?(@@c)
           puts "start: compressing"
           file = "tmp#{@@c}.js"
@@ -34,7 +34,7 @@ module Minjs
         end
         #TODO
         t = Minjs::Compressor.new(:logger => logger).compress(data)
-        if logger.debug?
+        if logger.info?
           tmp = open(output, "w")
           tmp.write(t)
           tmp.close

data/lib/minjs/statement.rb

@@ -124,11 +124,9 @@ module Minjs
 
     def var_decl(lex, context, options)
       lex.eval_lit {
-        a = lex.fwd_lit
+        a = identifier(lex, context)
         if !a
-          nil
-        elsif !a.kind_of?(ECMA262::IdentifierName)
-          nil
+          raise ParseError.new("bad identifier");
         else
           b = initialiser(lex, context, options)
           [a, b]
@@ -236,8 +234,8 @@ module Minjs
         # for(var i ; cond ; exp)
         next nil unless lex.match_lit(ECMA262::PUNC_LPARENTHESIS)
         if lex.match_lit(ECMA262::ID_VAR) and vl=var_decl_list(lex, context, :no_in =>true) and lex.match_lit(ECMA262::PUNC_SEMICOLON) and (e=exp(lex, context, {})||true) and lex.match_lit(ECMA262::PUNC_SEMICOLON) and (e2=exp(lex, context, {})||true) and lex.match_lit(ECMA262::PUNC_RPARENTHESIS) and s=statement(lex, context)
-          e = ECMA262::ExpEmpty.new if e == true
-          e2 = ECMA262::ExpEmpty.new if e2 == true
+          e = nil if e == true
+          e2 = nil if e2 == true
           #10.5
           vl.each do |v|
             dn = v[0]
@@ -260,9 +258,9 @@ module Minjs
         # for(i ; cond; exp)
         next nil unless lex.match_lit(ECMA262::PUNC_LPARENTHESIS)
         if (v=exp(lex, context, :no_in => true) || true) and lex.match_lit(ECMA262::PUNC_SEMICOLON) and (e=exp(lex, context, {}) || true) and lex.match_lit(ECMA262::PUNC_SEMICOLON) and (e2=exp(lex, context, {})||true) and lex.match_lit(ECMA262::PUNC_RPARENTHESIS) and s=statement(lex, context)
-          v = ECMA262::ExpEmpty.new if v == true
-          e = ECMA262::ExpEmpty.new if e == true
-          e2 = ECMA262::ExpEmpty.new if e2 == true
+          v = nil if v == true
+          e = nil if e == true
+          e2 = nil if e2 == true
           ECMA262::StFor.new(v, e, e2, s)
         else
           nil
@@ -405,25 +403,33 @@ module Minjs
     def try_statement(lex, context)
       return nil unless lex.match_lit(ECMA262::ID_TRY)
       lex.eval_lit {
+        catch_context = ECMA262::Context.new
+        catch_env = context.lex_env.new_declarative_env()
+        catch_context.lex_env = catch_env
+        catch_context.var_env = context.var_env
+
         t = block(lex, context)
         break nil unless t
 
         lex.eval_lit{
-          c = try_catch(lex, context)
+          c = try_catch(lex, catch_context)
           break nil unless c
 
           f = try_finally(lex, context)
-          ECMA262::StTry.new(t, c, f)
+          ECMA262::StTry.new(context, catch_context, t, c, f)
         } || lex.eval_lit{
           f = try_finally(lex, context)
           break nil unless f
-          ECMA262::StTry.new(t, nil, f)
+          ECMA262::StTry.new(context, catch_context, t, nil, f)
         }
       }
     end
-    def try_catch(lex, context)
+    def try_catch(lex, catch_context)
       return nil unless lex.match_lit(ECMA262::ID_CATCH)
-      if lex.match_lit(ECMA262::PUNC_LPARENTHESIS) and i=identifier(lex, context) and lex.match_lit(ECMA262::PUNC_RPARENTHESIS) and b=block(lex, context)
+
+      if lex.match_lit(ECMA262::PUNC_LPARENTHESIS) and i=identifier(lex, catch_context) and lex.match_lit(ECMA262::PUNC_RPARENTHESIS) and b=block(lex, catch_context)
+        catch_context.lex_env.record.create_mutable_binding(i, nil)
+        catch_context.lex_env.record.set_mutable_binding(i, :undefined, nil)
         [i, b]
       else
         nil

data/lib/minjs/version.rb

@@ -1,3 +1,3 @@
 module Minjs
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minjs
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Issei Numata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler