minjs 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8242f875c695e92b930cd716c7c8979fe8164607
-  data.tar.gz: 9ca6b42d5d6db0894c65fd64ab2f89cde0e16e6e
+  metadata.gz: dff56ddbe102f06b6d07d67ca3cbb7076dec2bc2
+  data.tar.gz: 2bf1104e9aeda92155019cd2784e4313614fc958
 SHA512:
-  metadata.gz: b9948715e0ac544058ea8437b1bdaeab2a16709d9aaf3b784d42e7e0b730ba07bc35540533f6c299f0320df079cf77b6ebf5aadcb2d2680e61184bc5ab6ac5bb
-  data.tar.gz: 24400fa76290a15563d3c4384ed9697761f889e69313aa445faacc399b1774ea0011e2ded343727f442385c740c40928c38f657a6d2d255c23b12b4ddf8980d4
+  metadata.gz: 546ff6b86865bc79856e034b4bba733093170ccc4f514de33f390b597bb9cd0cf6608e2c00c8619ccfe2cd3e3ab3977df50fb3f022def02982b06a99f4dcee80
+  data.tar.gz: 4ce28cc2d02368b99335fd1fe5bd69a7d03ccd72b4399fb775782e3186bf42d839df584f30468b83e6be4b9040a3c6054722ff266b79a96a177fee53c25ae9e4

data/lib/minjs/compressor.rb

@@ -38,15 +38,17 @@ module Minjs
       parse(data)
 
       reorder_function_decl
-      return_after
       simple_replacement
       reorder_var
       assignment_after_var
       grouping_statement
       block_to_exp
-      if_to_cond #buggy
+      if_to_cond
       compress_var
       reduce_exp
+      remove_paren
+      #feature
+      #return_to_exp
       @heading_comments.reverse.each do |c|
         @prog.source_elements.unshift(c)
       end
@@ -141,7 +143,7 @@ module Minjs
 
     def reorder_function_decl
       self.traverse {|st, parent|
-        if st.kind_of? ECMA262::StFunc and parent.kind_of? ECMA262::Prog and st.decl
+        if st.kind_of? ECMA262::StFunc and parent.kind_of? ECMA262::Prog and st.decl?
           if parent.index(st)
             parent.remove(st)
             parent.source_elements.unshift(st)
@@ -193,6 +195,28 @@ module Minjs
       remove_block_in_block
     end
 
+    #feature
+    def remove_paren
+      self.traverse {|st, parent|
+        if st.kind_of? ECMA262::ExpParen
+          #
+          # ECMA262 say:
+          # expression statement cannot start with "function"
+          #
+          if parent.priority(st) > st.val.priority(nil)
+            if st.val.to_js.match(/^function/)
+              ;
+            elsif st.val.to_js.match(/^{/)
+              ;
+            else
+              parent.replace(st, st.val)
+            end
+          end
+        end
+      }
+      self
+    end
+
     def remove_block_in_block
       while true
         _retry = false
@@ -227,13 +251,47 @@ module Minjs
       }
     end
 
+    def block_to_statement
+      self.traverse {|st, parent|
+        if st.kind_of? ECMA262::StBlock and st.to_statement?
+          if parent.kind_of? ECMA262::StTry
+          else
+            parent.replace(st, st.to_statement)
+          end
+        end
+      }
+    end
+
     def if_to_cond
-      #traverse all statemtns and expression
       self.traverse {|st, parent|
         if st.kind_of? ECMA262::StIf and st.to_exp?
           if t = ECMA262::StExp.new(st.to_exp({}))
             parent.replace(st, t)
           end
+          # feature...
+=begin
+        elsif st.kind_of? ECMA262::StIf and st.to_return?
+          #
+          # if(...)
+          #   return a;
+          # return b;
+          #
+          # => if(...)return a;else return b;
+          #
+          if parent.kind_of? ECMA262::StList and st.else_st.nil? and (nxt = parent[parent.index(st) + 1]).kind_of? ECMA262::StReturn
+            st.replace(st.else_st, nxt)
+            parent.replace(nxt, ECMA262::StEmpty.new())
+            parent.replace(st, st.to_return)
+          #
+          # if(...)
+          # return a;
+          # else
+          # return b;
+          #
+          else
+            parent.replace(st, st.to_return)
+          end
+=end
         end
       }
     end
@@ -311,6 +369,7 @@ module Minjs
         end
       }
     end
+
     def reduce_exp
       self.traverse {|st, parent|
         if st.kind_of? ECMA262::Exp
@@ -325,9 +384,9 @@ module Minjs
         #false => !1
         if st.kind_of? ECMA262::Boolean
           if st.true?
-            parent.replace(st, ECMA262::ExpLogicalNot.new(ECMA262::ECMA262Numeric.new('0', 0)))
+            parent.replace(st, ECMA262::ExpParen.new(ECMA262::ExpLogicalNot.new(ECMA262::ECMA262Numeric.new(0))))
           else
-            parent.replace(st, ECMA262::ExpLogicalNot.new(ECMA262::ECMA262Numeric.new('1', 1)))
+            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
@@ -344,29 +403,35 @@ module Minjs
       }
     end
 
-    def return_after
+    def return_to_exp
       self.traverse {|st, parent|
         if st.kind_of? ECMA262::StReturn
-          if parent.kind_of? ECMA262::StList
-            idx = parent.index(st)
-            idx += 1
-            while parent.statement_list[idx]
-              parent.statement_list[idx] = ECMA262::StEmpty.new;
-              idx += 1
-            end
-          elsif parent.kind_of? ECMA262::Prog
-            idx = parent.index(st)
-            idx += 1
-            while parent.source_elements[idx]
-              parent.source_elements[idx] = ECMA262::StEmpty.new;
-              idx += 1
+          if parent.kind_of? ECMA262::Prog
+            parent.remove_empty_statement
+            #
+            # a=1;return b; => return a=1,b;
+            #
+            # check statement:
+            # last one is return and its previous is expression or not
+            if parent.source_elements[-1] == st and (prev=parent.source_elements[-2]).class == ECMA262::StExp
+              if st.exp
+                st.replace(st.exp, ECMA262::ExpComma.new(prev.exp, st.exp))
+                parent.replace(prev, ECMA262::StEmpty.new())
+              end
             end
-            if st.exp.nil?
-              parent.replace(st, ECMA262::StEmpty.new)
+          elsif parent.kind_of? ECMA262::StList
+            parent.remove_empty_statement
+            if parent.statement_list[-1] == st and (prev=parent.statement_list[-2]).class == ECMA262::StExp
+              if st.exp
+                st.replace(st.exp, ECMA262::ExpComma.new(prev.exp, st.exp))
+                parent.replace(prev, ECMA262::StEmpty.new())
+              end
             end
           end
         end
       }
+      block_to_statement
+      if_to_cond
     end
     #
     # var a; a=1

data/lib/minjs/ctype.rb

@@ -1,5 +1,10 @@
 module Minjs
   module Ctype
+    def hex_number?(code)
+      code >= 0x30 && code <= 0x39 or
+        code >= 0x41 && code <= 0x46 or
+        code >= 0x61 && code <= 0x66
+    end
     def white_space?(code)
       code == 0x20 || code == 0x9 || code == 0xb || code == 0xc || code == 0xa0 || code == 0xfeff
     end

data/lib/minjs/ecma262/base.rb

@@ -43,6 +43,10 @@ module Minjs
         end
         j.join("")
       end
+
+      def replace(from, to)
+        puts "warning: #{self.class}: replace not implement"
+      end
     end
 
     class Prog < Base
@@ -110,6 +114,12 @@ module Minjs
         @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