minjs 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82f88a2a64ab93ccafd2abd3e699e8d5fa7682d0
-  data.tar.gz: 3e9aec62b059e22695c0111169b75c5bd3fc1141
+  metadata.gz: 6a8187931f76664dfc06d3ff52d9c41f984d0faa
+  data.tar.gz: 6f03506bef8148d713bff2ef74c377d6305876fd
 SHA512:
-  metadata.gz: b58b34b47810cec665a86a8d831f7a222a558eb0ed21996de5332caddd13a3e15000544bc9a7867ed0a3341535eb55bebe8af4092e73dc9d0b8f34e143cf2b88
-  data.tar.gz: 93c25a509a9bf2c6864433f4ef955b64887bb35471be4d4fe1b68fdcaf736341e9c04634150adf8136097a2ada5d2f6815298ac1257b62a8192512d716f0754b
+  metadata.gz: 33a3e964e04dca6ade14ee7ec3b10cc07c3b0fb73c0a99176dd240914987a3f2d786a93e69ef42a0843ac2b4a4f7edf89d796ad5c1f46dd3ac6ecefef3038119
+  data.tar.gz: 17cd44a4d705ac698f535b2ec2cf909f77da132ce33ac995933a7956af264b5dc9eb5d2434c2363d0043e301c681bc4d0670bad871059b24a445ae4dd4a86005

data/lib/minjs/compressor.rb

@@ -61,6 +61,9 @@ module Minjs
       @logger.info '* block_to_statement'
       block_to_statement
 
+      @logger.info '* reduce_if'
+      reduce_if
+
       @logger.info '* if_to_cond'
       if_to_cond
 
@@ -196,7 +199,7 @@ module Minjs
               ]
             }
             st.traverse(parent) {|st2, parent2|
-              if st2.kind_of? ECMA262::StVar and st2.context == @context
+              if st2.kind_of? ECMA262::StVar and st2.context.var_env == @context.var_env
                 st2.instance_eval{
                   blk = []
                   @vars.each do |vl|
@@ -207,9 +210,9 @@ module Minjs
                   end
                   parent2.replace(st2, ECMA262::StBlock.new(ECMA262::StatementList.new(blk)))
                 }
-              elsif st2.kind_of? ECMA262::StForVar and st2.context == @context
+              elsif st2.kind_of? ECMA262::StForVar and st2.context.var_env == @context.var_env
                 parent2.replace(st2, st2.to_st_for)
-              elsif st2.kind_of? ECMA262::StForInVar and st2.context == @context
+              elsif st2.kind_of? ECMA262::StForInVar and st2.context.var_env == @context.var_env
                 parent2.replace(st2, st2.to_st_for_in)
               end
             }
@@ -220,12 +223,14 @@ module Minjs
         end
       }
       remove_block_in_block
+      self
     end
 
     def remove_paren(node = @prog)
       node.traverse(nil) {|st, parent|
         if st.respond_to? :remove_paren
           st.remove_paren
+          st.add_paren
         end
       }
       self
@@ -246,19 +251,68 @@ module Minjs
         }
         break if !_retry
       end
+      self
     end
 
     def block_to_statement(node = @prog)
       node.traverse(nil) {|st, parent|
-        if st.kind_of? ECMA262::StBlock and !parent.kind_of?(ECMA262::StTry)
-          if st.to_statement?
-            parent.replace(st, st.to_statement)
+        if st.kind_of? ECMA262::StIf
+          #
+          # To determine removing "if block" is available or not is difficult.
+          # For example, next codes block must not be removed, because
+          # "else" cluase combined to second "if" statement.
+          #
+          #
+          #  if(a){ //<= this block must not be removed
+          #    while(true)
+          #      if(b){
+          #        ;
+          #      }
+          #  }
+          #  else{
+          #   ;
+          #  }
+
+          # The "else" cluase's block can be removed without condition.
+          if st.else_st and st.else_st.kind_of? ECMA262::StBlock and st.else_st.to_statement?
+            st.replace(st.else_st, st.else_st.to_statement)
+          end
+          #
+          # if "if" statement has no "else" clause, its block can be removed.
+          #
+          if st.else_st.nil? and st.then_st.kind_of? ECMA262::StBlock and st.then_st.to_statement?
+            st.replace(st.then_st, st.then_st.to_statement)
+          #
+          # if "if" statement has "else" clause, check "then" branch.
+          # If branch has no "if" statement or
+          # has "if-else" statement, its block can be removed.
+          #
+          elsif st.else_st and st.then_st.kind_of? ECMA262::StBlock and st.then_st.to_statement?
+            deblock = true
+            last_st = st.then_st.last_statement.map{|x|
+              if x.kind_of? ECMA262::StIf and x.else_st.nil?
+                deblock = false
+              end
+            }
+            if deblock
+              st.replace(st.then_st, st.then_st.to_statement)
+            end
           end
         end
       }
+      node.traverse(nil) {|st, parent|
+        if st.kind_of? ECMA262::StBlock and !parent.kind_of?(ECMA262::StTry) and !parent.kind_of?(ECMA262::StIf)
+            if st.to_statement?
+              parent.replace(st, st.to_statement)
+            end
+        end
+      }
       self
     end
 
+    def if_block_to_statemet(node = @prog)
+    end
+
     def if_to_cond(node = nil)
       node = @prog if node.nil?
       node.traverse(nil) {|st, parent|
@@ -304,6 +358,7 @@ module Minjs
         end
       }
       remove_paren
+      self
     end
 
     def compress_var(node = @prog)
@@ -311,13 +366,29 @@ module Minjs
       #traverse all statemtns and expression
       #
       node.traverse(nil) {|st, parent|
-        if st.kind_of? ECMA262::StFunc and st.context.var_env.outer
-          var_sym = :a
+        var_sym = :a
+        if st.kind_of? ECMA262::StTry and st.catch
+          _context = st.catch_context
+          _parent = st
+          _st = st.catch[1]
+        elsif st.kind_of? ECMA262::StFunc #and st.context.var_env.outer
+          _context = st.context
+          _parent = parent
+          _st = st
+        else
+          _parent = nil
+          _context = nil
+          _st = nil
+        end
+        if _parent and _context and _st
           #
-          # collect all variables under this function
+          # collect all variables under this function/catch
           #
           vars = {}
-          st.traverse(parent) {|st2|
+          if st.kind_of? ECMA262::StTry
+            vars[st.catch[0].val.to_sym] = 1
+          end
+          _st.traverse(_parent) {|st2|
             if st2.kind_of? ECMA262::IdentifierName
               vars[st2.val.to_sym] ||= 0
               vars[st2.val.to_sym] += 1
@@ -327,22 +398,35 @@ module Minjs
           # collect all var variables under this function
           #
           var_vars = {}
-          st.context.var_env.record.binding.each do|k, v|
-            var_vars[k] = vars[k]
-          end
-          st.traverse(parent) {|st2|
-            if st2.kind_of? ECMA262::StFunc
-              st2.context.var_env.record.binding.each do|k, v|
-                var_vars[k] = vars[k]
+          if st.kind_of? ECMA262::StFunc
+            _context.var_env.record.binding.each do|k, v|
+              var_vars[k] = (vars[k] || 1)
+            end
+            _st.traverse(parent) {|st2|
+              if st2.kind_of? ECMA262::StFunc
+                st2.context.var_env.record.binding.each do|k, v|
+                  var_vars[k] = (vars[k] || 1)
+                end
               end
+            }
+          end
+          #
+          # collect all lexical variables under this catch clause
+          #
+          # currently, only catch's args is lex_var
+          #
+          lex_vars = {}
+          if st.kind_of? ECMA262::StTry
+            _context.lex_env.record.binding.each do|k, v|
+              lex_vars[k] = (vars[k] || 1)
             end
-          }
+          end
           #
-          # check `eval' function is exist under this function
+          # check `eval' function is exist under this function/catch
           #
           unless var_vars[:eval]
             eval_flag = false
-            st.traverse(parent) {|st2|
+            _st.traverse(_parent) {|st2|
               if st2.kind_of? ECMA262::ExpCall and st2.name.to_js({}) == "eval"
                 eval_flag = true
                 break
@@ -370,8 +454,10 @@ module Minjs
               #
               # rename `name' to `var_sym'
               #
-              st.traverse(parent){|st2|
-                if st2.kind_of? ECMA262::IdentifierName and st2.context and st2.context.var_env == st.context.var_env.outer
+              _st.traverse(_parent){|st2|
+                if st2.kind_of? ECMA262::IdentifierName and st2.context.nil?
+                  ;# TODO, currently special identifier such as 'this' has no context
+                elsif st2.kind_of? ECMA262::IdentifierName and st2.context.var_env.outer == nil # global scope
                   ;
                 elsif st2.kind_of? ECMA262::IdentifierName and st2.val == name
                   st2.instance_eval{
@@ -385,6 +471,38 @@ module Minjs
             end
             var_sym = next_sym(var_sym)
           }
+          lex_vars.each {|name, count|
+            if name.nil?
+              next
+            end
+            while(vars[var_sym])
+              var_sym = next_sym(var_sym)
+            end
+            if name.to_s.bytesize > var_sym.to_s.bytesize
+              #
+              # rename `name' to `var_sym'
+              #
+              _st.traverse(_parent){|st2|
+                if st2.kind_of? ECMA262::IdentifierName and st2.context.nil?
+                  ;# TODO, currently special identifier such as 'this' has no context
+                elsif st2.kind_of? ECMA262::IdentifierName and st2.context.lex_env.outer == nil # global scope
+                  ;
+                elsif st2.kind_of? ECMA262::IdentifierName and st2.val == name
+                  st2.instance_eval{
+                    @val = var_sym
+                  }
+                end
+              }
+              if st.kind_of? ECMA262::StTry
+                if st.catch[0].kind_of? ECMA262::IdentifierName
+                  st.catch[0].instance_eval{
+                    @val = var_sym
+                  }
+                end
+              end
+            end
+            var_sym = next_sym(var_sym)
+          }
         end
       }
       self
@@ -396,22 +514,27 @@ module Minjs
           st.reduce(parent)
         end
       }
+      self
     end
 
     def simple_replacement(node = @prog)
       node.traverse(nil) {|st, parent|
+        #
         #true => !0
         #false => !1
+        #
         if st.kind_of? ECMA262::Boolean
           if st.true?
             parent.replace(st, ECMA262::ExpParen.new(ECMA262::ExpLogicalNot.new(ECMA262::ECMA262Numeric.new(0))))
           else
             parent.replace(st, ECMA262::ExpParen.new(ECMA262::ExpLogicalNot.new(ECMA262::ECMA262Numeric.new(1))))
           end
+        #
         #if(true){<then>}else{<else>} => then
+        #
         elsif st.kind_of? ECMA262::StIf
-          if st.cond.kind_of? ECMA262::Boolean
-            if st.cond.true?
+          if st.cond.respond_to? :to_ecma262_boolean
+            if st.cond.to_ecma262_boolean
               parent.replace(st, st.then_st)
             elsif st.else_st
               parent.replace(st, st.else_st)
@@ -419,8 +542,19 @@ module Minjs
               parent.replace(st, ECMA262::StEmpty.new())
             end
           end
+        #
+        # while(true) => for(;;)
+        # while(false) => remove
+        #
+        elsif st.kind_of? ECMA262::StWhile and st.exp.respond_to? :to_ecma262_boolean
+          if st.exp.to_ecma262_boolean
+            parent.replace(st, ECMA262::StFor.new(nil,nil,nil, st.statement))
+          else
+            parent.replace(st, ECMA262::StEmpty.new)
+          end
         end
       }
+      self
     end
 
     def return_to_exp(node = @prog)
@@ -446,7 +580,7 @@ module Minjs
     # var a; a=1
     # => var a=1
     #
-    def assignment_after_var(node = @prog)
+    def assignment_after_var_old(node = @prog)
       node.traverse(nil) {|st, parent|
         if st.kind_of? ECMA262::StExp and parent.kind_of? ECMA262::SourceElements
           if st.exp.kind_of? ECMA262::ExpAssign
@@ -476,6 +610,102 @@ module Minjs
           end
         end
       }
+      self
+    end
+    #
+    # reduce_if
+    #
+    # 1) rewrite nested "if" statemet such as:
+    # if(a)
+    #   if(b) ...;
+    #
+    # to:
+    #
+    # if(a && b) ...;
+    #
+    # NOTE:
+    # both if must not have "else" clause
+    #
+    def reduce_if(node = @prog)
+      node.traverse(nil) {|st, parent|
+        if st.kind_of? ECMA262::StIf
+          if st.else_st.nil? and
+            st.then_st.kind_of? ECMA262::StIf and st.then_st.else_st.nil?
+            st.replace(st.cond, ECMA262::ExpLogicalAnd.new(st.cond, st.then_st.cond))
+            st.replace(st.then_st, st.then_st.then_st)
+          end
+        end
+      }
+      self
+    end
+
+    def assignment_after_var(node = @prog)
+      def rewrite_var(var_st, name, initializer)
+        var_st.normalization
+        i = 0
+        var_st.vars.each do |_name, _initializer|
+          if _name == name and _initializer.nil?
+            var_st.vars[i] = [name, initializer]
+            var_st.normalization
+            return true
+          end
+          i += 1
+        end
+        false
+      end
+      node.traverse(nil) {|st, parent|
+        if st.kind_of? ECMA262::StVar and parent.kind_of? ECMA262::SourceElements
+          #
+          # index of 'var statement' is 0, after calling reorder_var
+          #
+          catch(:break){
+            idx = 1
+            while true
+              st2 = parent[idx]
+              if st2.kind_of? ECMA262::StEmpty
+                idx +=1
+                next
+              elsif st2.kind_of? ECMA262::StExp and st2.exp.kind_of? ECMA262::ExpAssign
+                if rewrite_var(st, st2.exp.val, st2.exp.val2)
+                  parent.replace(st2, ECMA262::StEmpty.new())
+                else
+                  throw :break
+                end
+                idx += 1
+                next
+              elsif st2.kind_of? ECMA262::StFor and st2.exp1.kind_of? ECMA262::ExpAssign
+                if rewrite_var(st, st2.exp1.val, st2.exp1.val2)
+                  st2.replace(st2.exp1, nil)
+                else
+                  throw :break
+                end
+                throw  :break
+              elsif st2.kind_of? ECMA262::StExp and st2.exp.kind_of? ECMA262::ExpComma
+                exp_parent = st2
+                exp = st2.exp
+
+                while exp.val.kind_of? ECMA262::ExpComma
+                  exp_parent = exp
+                  exp = exp.val
+                end
+
+                if exp.val.kind_of? ECMA262::ExpAssign
+                  if rewrite_var(st, exp.val.val, exp.val.val2)
+                    exp_parent.replace(exp, exp.val2)
+                  else
+                    throw :break
+                  end
+                else
+                  throw :break
+                end
+              else
+                throw :break
+              end
+            end
+          }
+        end
+      }
+      self
     end
   end
 end

data/lib/minjs/ecma262/base.rb

@@ -203,73 +203,6 @@ module Minjs
       def to_js(options = {})
         concat options, @source_elements
       end
-=begin
-      def grouping
-        remove_empty_statement
-        nsl = []
-        sl = []
-        g = []
-        @source_elements.each do |st|
-          if st.to_exp?
-            g.push(st)
-          else
-            if g.length > 0
-              sl.push(g)
-            end
-            sl.push([st])
-            g = []
-          end
-        end
-        if g.length > 0
-          sl.push(g)
-        end
-
-        sl.each do |g|
-          if g.length == 1
-            nsl.push(g[0])
-          else
-            i = 1
-            t = g[0].to_exp
-            while i < g.length
-              t = ExpComma.new(t, g[i].to_exp)
-              i += 1
-            end
-            nsl.push(StExp.new(t))
-          end
-        end
-
-        @source_elements = nsl
-      end
-
-      def replace(from, to)
-        idx = @source_elements.index(from)
-        if idx
-          @source_elements[idx] = to
-        end
-      end
-
-      def remove(st)
-        @source_elements.delete(st)
-      end
-
-      def remove_empty_statement
-        @source_elements.reject!{|x|
-          x.class == StEmpty
-        }
-      end
-
-      def each(&block)
-        @source_elements.each(&block)
-      end
-
-      def [](i)
-        @source_elements[i]
-      end
-
-      def index(st)
-        @source_elements.index(st)
-      end
-=end
     end
   end
 end

data/lib/minjs/ecma262/env.rb

@@ -8,12 +8,14 @@ module Minjs
         @binding = {}
         @options = {}
       end
+
       def create_mutable_binding(n, d, options = {})
         if n.kind_of? IdentifierName
           n = n.val
         end
         @binding[n] = {:value => nil}
       end
+
       def set_mutable_binding(n, v, s, options = {})
         if n.kind_of? IdentifierName
           n = n.val
@@ -54,7 +56,8 @@ module Minjs
       attr_accessor :this_binding
 
       def initialize(options = {})
-        @var_env = @lex_env = LexEnv.new(options)
+        @var_env = LexEnv.new(options)
+        @lex_env = LexEnv.new(options)
         @this_binding = ExObject.new(
           {
             attr: {