minjs 0.1.3 → 0.1.5

data/lib/minjs/exceptions.rb

@@ -15,7 +15,7 @@ module Minjs
       if @lex
         line, col = @lex.line_col(@lex_pos)
         t << "line: #{line}, col: #{col}\n"
-        t << @lex.debug_str(@lex_pos)
+        t << @lex.debug_str(@lex_pos, line, col)
       end
       t
     end

data/lib/minjs/expression.rb

@@ -5,18 +5,16 @@ module Minjs
     # 11.1
     #
     def primary_exp(lex, context, options)
-      STDERR.puts "*** primary_exp" if @debug
-      lex.debug_lit if @debug
-      #STDERR.puts caller if @debug
-      #this
+      @logger.debug "*** primary_exp"
+
       if lex.match_lit(ECMA262::ID_THIS)
-      STDERR.puts "*** primary_exp => this" if @debug
+      @logger.debug "*** primary_exp => this"
         return ECMA262::ID_THIS
       end
       # (exp)
       if lex.match_lit(ECMA262::PUNC_LPARENTHESIS)
         if a=exp(lex, context, options) and lex.match_lit(ECMA262::PUNC_RPARENTHESIS)
-          STDERR.puts "*** primary_exp => ()" if @debug
+          @logger.debug "*** primary_exp => ()"
           return ECMA262::ExpParen.new(a)
         else
           raise ParseError.new("no `)' at end of expression", lex)
@@ -33,7 +31,7 @@ module Minjs
       } || lex.eval_lit {
         object_literal(lex, context, options)
       }
-      STDERR.puts "*** primary_exp => #{t}" if @debug
+      @logger.debug "*** primary_exp => #{t ? t.to_js : t}"
       t
     end
 
@@ -157,22 +155,25 @@ module Minjs
     # 11.2
     #
     def left_hand_side_exp(lex, context, options)
-      STDERR.puts "*** left_hand_side_exp" if @debug
-      lex.debug_lit if @debug
+      @logger.debug "*** left_hand_side_exp"
 
       t = lex.eval_lit{
         call_exp(lex, context, options)
       } || lex.eval_lit{
         new_exp(lex, context, options)
       }
-      STDERR.puts "*** left_hand_side_exp => #{t}" if @debug
+      @logger.debug "*** left_hand_side_exp => #{t ? t.to_js: t}"
       t
     end
 
     def new_exp(lex, context, options)
       lex.eval_lit{
-        if lex.match_lit(ECMA262::ID_NEW) and a=new_exp(lex, context, options)
-          ECMA262::ExpNew.new(a, nil)
+        if lex.match_lit(ECMA262::ID_NEW)
+          if a=new_exp(lex, context, options)
+            ECMA262::ExpNew.new(a, nil)
+          else
+            raise ParseError.new("unexpceted token", lex)
+          end
         else
           nil
         end
@@ -211,10 +212,18 @@ module Minjs
         while true
           if b=arguments(lex, context, options)
             t = ECMA262::ExpCall.new(t, b)
-          elsif lex.match_lit(ECMA262::PUNC_LSQBRAC) and b=exp(lex, context, options) and lex.match_lit(ECMA262::PUNC_RSQBRAC)
-            t = ECMA262::ExpPropBrac.new(t, b)
-          elsif lex.match_lit(ECMA262::PUNC_PERIOD) and (b=lex.fwd_lit()).kind_of?(ECMA262::IdentifierName)
-            t = ECMA262::ExpProp.new(t, b)
+          elsif lex.match_lit(ECMA262::PUNC_LSQBRAC)
+            if b=exp(lex, context, options) and lex.match_lit(ECMA262::PUNC_RSQBRAC)
+              t = ECMA262::ExpPropBrac.new(t, b)
+            else
+              raise ParseError.new("unexpceted token", lex)
+            end
+          elsif lex.match_lit(ECMA262::PUNC_PERIOD)
+            if (b=lex.fwd_lit()).kind_of?(ECMA262::IdentifierName)
+              t = ECMA262::ExpProp.new(t, b)
+            else
+              raise ParseError.new("unexpceted token", lex)
+            end
           else
             break
           end
@@ -250,10 +259,18 @@ module Minjs
 
       lex.eval_lit {
         while true
-          if lex.match_lit(ECMA262::PUNC_LSQBRAC) and b=exp(lex, context, options) and lex.match_lit(ECMA262::PUNC_RSQBRAC)
-            t = ECMA262::ExpPropBrac.new(t, b)
-          elsif lex.match_lit(ECMA262::PUNC_PERIOD) and (b=lex.fwd_lit()).kind_of?(ECMA262::IdentifierName)
-            t = ECMA262::ExpProp.new(t, b)
+          if lex.match_lit(ECMA262::PUNC_LSQBRAC)
+            if b=exp(lex, context, options) and lex.match_lit(ECMA262::PUNC_RSQBRAC)
+              t = ECMA262::ExpPropBrac.new(t, b)
+            else
+              raise ParseError.new("unexpceted token", lex)
+            end
+          elsif lex.match_lit(ECMA262::PUNC_PERIOD)
+            if (b=lex.fwd_lit()).kind_of?(ECMA262::IdentifierName)
+              t = ECMA262::ExpProp.new(t, b)
+            else
+              raise ParseError.new("unexpceted token", lex)
+            end
           else
             break
           end
@@ -288,9 +305,6 @@ module Minjs
     # 11.3
     #
     def postfix_exp(lex, context, options)
-      STDERR.puts "*** postfix_exp" if @debug
-      lex.debug_lit if @debug
-
       t = lex.eval_lit{
         a = left_hand_side_exp(lex, context, options)
         return nil if a.nil?
@@ -305,7 +319,6 @@ module Minjs
           a
         end
       }
-      STDERR.puts "*** postfix_exp => #{t}" if @debug
       t
     end
 
@@ -313,7 +326,6 @@ module Minjs
     # 11.4
     #
     def unary_exp(lex, context, options)
-      next_exp = :postfix_exp
       lex.eval_lit{
         if punc = (lex.match_lit(ECMA262::ID_DELETE) ||
                    lex.match_lit(ECMA262::ID_VOID) ||
@@ -323,8 +335,11 @@ module Minjs
                    lex.match_lit(ECMA262::PUNC_ADD) ||
                    lex.match_lit(ECMA262::PUNC_SUB) ||
                    lex.match_lit(ECMA262::PUNC_NOT) ||
-                   lex.match_lit(ECMA262::PUNC_LNOT)) and a = unary_exp(lex, context, options)
-          if punc.val == :delete
+                   lex.match_lit(ECMA262::PUNC_LNOT))
+          a = unary_exp(lex, context, options)
+          if a.nil?
+            raise ParseError.new("unexpceted token", lex)
+          elsif punc.val == :delete
             ECMA262::ExpDelete.new(a)
           elsif punc.val == :void
             ECMA262::ExpVoid.new(a)
@@ -345,7 +360,7 @@ module Minjs
           end
         end
       } || lex.eval_lit{
-        __send__(next_exp, lex, context, options)
+        postfix_exp(lex, context, options)
       }
     end
 
@@ -353,16 +368,15 @@ module Minjs
     # 11.5
     #
     def multiplicative_exp(lex, context, options)
-      next_exp = :unary_exp
       lex.eval_lit {
-        a = __send__(next_exp, lex, context, options)
+        a = unary_exp(lex, context, options)
         next nil if !a
         t = a
         while punc = lex.match_lit(ECMA262::PUNC_MUL) ||
                      lex.match_lit(ECMA262::PUNC_DIV, :hint => :div) ||
                      lex.match_lit(ECMA262::PUNC_MOD)
 
-          if b = __send__(next_exp, lex, context, options)
+          if b = unary_exp(lex, context, options)
             if punc == ECMA262::PUNC_MUL
               t = ECMA262::ExpMul.new(t, b)
             elsif punc == ECMA262::PUNC_DIV
@@ -371,7 +385,7 @@ module Minjs
               t = ECMA262::ExpMod.new(t, b)
             end
           else
-            break
+            raise ParseError.new("unexpceted token", lex)
           end
         end
         t
@@ -382,21 +396,20 @@ module Minjs
     # 11.6
     #
     def additive_exp(lex, context, options)
-      next_exp = :multiplicative_exp
       lex.eval_lit {
-        a = __send__(next_exp, lex, context, options)
+        a = multiplicative_exp(lex, context, options)
         next nil if !a
 
         t = a
         while punc = lex.match_lit(ECMA262::PUNC_ADD) || lex.match_lit(ECMA262::PUNC_SUB)
-          if b = __send__(next_exp, lex, context, options)
+          if b = multiplicative_exp(lex, context, options)
             if punc == ECMA262::PUNC_ADD
               t = ECMA262::ExpAdd.new(t, b)
             else
               t = ECMA262::ExpSub.new(t, b)
             end
           else
-            break
+            raise ParseError.new("unexpceted token", lex)
           end
         end
 
@@ -406,16 +419,15 @@ module Minjs
     #
     # 11.7
     def shift_exp(lex, context, options)
-      next_exp = :additive_exp
       lex.eval_lit {
-        a = __send__(next_exp, lex, context, options)
+        a = additive_exp(lex, context, options)
         next nil if !a
 
         t = a
         while punc = lex.match_lit(ECMA262::PUNC_LSHIFT) ||
                      lex.match_lit(ECMA262::PUNC_RSHIFT) ||
                      lex.match_lit(ECMA262::PUNC_URSHIFT)
-          if b = __send__(next_exp, lex, context, options)
+          if b = additive_exp(lex, context, options)
             if punc == ECMA262::PUNC_LSHIFT
               t = ECMA262::ExpLShift.new(t, b)
             elsif punc == ECMA262::PUNC_RSHIFT
@@ -424,7 +436,7 @@ module Minjs
               t = ECMA262::ExpURShift.new(t, b)
             end
           else
-            break
+            raise ParseError.new("unexpceted token", lex)
           end
         end
         t
@@ -435,16 +447,15 @@ module Minjs
     # 11.8
     #
     def relational_exp(lex, context, options)
-      next_exp = :shift_exp
       lex.eval_lit {
-        a = __send__(next_exp, lex, context, options)
+        a = shift_exp(lex, context, options)
         next nil if !a
 
         t = a
         while (punc = lex.match_lit(ECMA262::PUNC_LT) || lex.match_lit(ECMA262::PUNC_GT) ||
                       lex.match_lit(ECMA262::PUNC_LTEQ) || lex.match_lit(ECMA262::PUNC_GTEQ) ||
-                      lex.match_lit(ECMA262::ID_INSTANCEOF) || lex.match_lit(ECMA262::ID_IN))
-          if b = __send__(next_exp, lex, context, options)
+                      lex.match_lit(ECMA262::ID_INSTANCEOF) || (!options[:no_in] && lex.match_lit(ECMA262::ID_IN)))
+          if b = shift_exp(lex, context, options)
             if punc == ECMA262::PUNC_LT
               t = ECMA262::ExpLt.new(t, b)
             elsif punc == ECMA262::PUNC_GT
@@ -460,7 +471,7 @@ module Minjs
             else
             end
           else
-            break
+            raise ParseError.new("unexpceted token", lex)
           end
         end
 
@@ -476,9 +487,8 @@ module Minjs
     # a !== b
     #
     def equality_exp(lex, context, options)
-      next_exp = :relational_exp
       lex.eval_lit {
-        a = __send__(next_exp, lex, context, options)
+        a = relational_exp(lex, context, options)
         next nil if !a
 
         t = a
@@ -486,7 +496,7 @@ module Minjs
                      lex.match_lit(ECMA262::PUNC_NEQ) ||
                      lex.match_lit(ECMA262::PUNC_SEQ) ||
                      lex.match_lit(ECMA262::PUNC_SNEQ)
-          if b = __send__(next_exp, lex, context, options)
+          if b = relational_exp(lex, context, options)
             if punc == ECMA262::PUNC_EQ
               t = ECMA262::ExpEq.new(t, b)
             elsif punc == ECMA262::PUNC_NEQ
@@ -497,7 +507,7 @@ module Minjs
               t = ECMA262::ExpStrictNotEq.new(t, b)
             end
           else
-            break
+            raise ParseError.new("unexpceted token", lex)
           end
         end
 
@@ -510,17 +520,16 @@ module Minjs
     # a & b
     #
     def bitwise_and_exp(lex, context, options)
-      next_exp = :equality_exp
       lex.eval_lit {
-        a = __send__(next_exp, lex, context, options)
+        a = equality_exp(lex, context, options)
         next nil if !a
 
         t = a
         while punc = lex.match_lit(ECMA262::PUNC_AND)
-          if b = __send__(next_exp, lex, context, options)
+          if b = equality_exp(lex, context, options)
             t = ECMA262::ExpAnd.new(t, b)
           else
-            break
+            raise ParseError.new("unexpceted token", lex)
           end
         end
 
@@ -532,17 +541,16 @@ module Minjs
     # a ^ b
     #
     def bitwise_xor_exp(lex, context, options)
-      next_exp = :bitwise_and_exp
       lex.eval_lit {
-        a = __send__(next_exp, lex, context, options)
+        a = bitwise_and_exp(lex, context, options)
         next nil if !a
 
         t = a
         while punc = lex.match_lit(ECMA262::PUNC_XOR)
-          if b = __send__(next_exp, lex, context, options)
+          if b = bitwise_and_exp(lex, context, options)
             t = ECMA262::ExpXor.new(t, b)
           else
-            break
+            raise ParseError.new("unexpceted token", lex)
           end
         end
 
@@ -554,17 +562,16 @@ module Minjs
     # a | b
     #
     def bitwise_or_exp(lex, context, options)
-      next_exp = :bitwise_xor_exp
       lex.eval_lit {
-        a = __send__(next_exp, lex, context, options)
+        a = bitwise_xor_exp(lex, context, options)
         next nil if !a
 
         t = a
         while punc = lex.match_lit(ECMA262::PUNC_OR)
-          if b = __send__(next_exp, lex, context, options)
+          if b = bitwise_xor_exp(lex, context, options)
             t = ECMA262::ExpOr.new(t, b)
           else
-            break
+            raise ParseError.new("unexpceted token", lex)
           end
         end
 
@@ -576,17 +583,16 @@ module Minjs
     # a && b
     #
     def logical_and_exp(lex, context, options)
-      next_exp = :bitwise_or_exp
       lex.eval_lit {
-        a = __send__(next_exp, lex, context, options)
+        a = bitwise_or_exp(lex, context, options)
         next nil if !a
 
         t = a
         while punc = lex.match_lit(ECMA262::PUNC_LAND)
-          if b = __send__(next_exp, lex, context, options)
+          if b = bitwise_or_exp(lex, context, options)
             t = ECMA262::ExpLogicalAnd.new(t, b)
           else
-            break
+            raise ParseError.new("unexpceted token", lex)
           end
         end
 
@@ -595,17 +601,16 @@ module Minjs
     end
 
     def logical_or_exp(lex, context, options)
-      next_exp = :logical_and_exp
       lex.eval_lit {
-        a = __send__(next_exp, lex, context, options)
+        a = logical_and_exp(lex, context, options)
         next nil if !a
 
         t = a
         while punc = lex.match_lit(ECMA262::PUNC_LOR)
-          if b = __send__(next_exp, lex, context, options)
+          if b = logical_and_exp(lex, context, options)
             t = ECMA262::ExpLogicalOr.new(t, b)
           else
-            break
+            raise ParseError.new("unexpceted token", lex)
           end
         end
 
@@ -621,8 +626,12 @@ module Minjs
         a = logical_or_exp(lex, context, options)
         next nil if !a
 
-        if lex.match_lit(ECMA262::PUNC_CONDIF) and b=assignment_exp(lex, context, options) and lex.match_lit(ECMA262::PUNC_CONDELSE) and c=assignment_exp(lex, context, options)
-          ECMA262::ExpCond.new(a, b, c)
+        if lex.match_lit(ECMA262::PUNC_CONDIF)
+          if b=assignment_exp(lex, context, options) and lex.match_lit(ECMA262::PUNC_CONDELSE) and c=assignment_exp(lex, context, options)
+            ECMA262::ExpCond.new(a, b, c)
+          else
+            raise ParseError.new("unexpceted token", lex)
+          end
         else
           a
         end
@@ -633,8 +642,8 @@ module Minjs
     #11.13
     #
     def assignment_exp(lex, context, options)
-      STDERR.puts "*** assignment_exp" if @debug
-      lex.debug_lit if @debug
+      @logger.debug "*** assignment_exp"
+
       left_hand = nil
       t = cond_exp(lex, context, options)
       return nil if t.nil?
@@ -683,10 +692,11 @@ module Minjs
             else
               raise "internal error"
             end
-          else # some assignment operator presents but no assignment_expression => fail
-            return nil
+          else
+            raise ParseError.new("unexpceted token", lex)
           end
         else
+          @logger.debug "*** assignment_exp => #{t ? t.to_js : t}"
           t
         end
       }
@@ -696,15 +706,17 @@ module Minjs
     # 11.14
     #
     def exp(lex, context, options)
+      @logger.debug "*** expression"
       lex.eval_lit{
         t = assignment_exp(lex, context, {:hint => :regexp}.merge(options))
         while punc = lex.match_lit(ECMA262::PUNC_COMMA)
           if b = assignment_exp(lex,context, {:hint => :regexp}.merge(options))
             t = ECMA262::ExpComma.new(t, b)
           else
-            break
+            raise ParseError.new("unexpceted token", lex)
           end
         end
+        @logger.debug "*** expression => #{t ? t.to_js : t}"
         t
       }
     end

data/lib/minjs/func.rb

@@ -34,8 +34,7 @@ module Minjs
 
     def func_exp(lex, context)
       return nil if lex.match_lit(ECMA262::ID_FUNCTION).nil?
-      STDERR.puts "*** func_exp" if @debug
-      lex.debug_lit if @debug
+      @logger.debug "*** func_exp"
 
       lex.eval_lit {
          id_opt = identifier(lex, context)

data/lib/minjs/lex.rb

@@ -14,9 +14,7 @@ module Minjs
       @pos = 0
       @lit_cache = []
       @lit_nextpos = []
-      if options[:debug]
-        @debug = true
-      end
+      @logger = options[:logger]
     end
 
     def next_input_element(options = {})
@@ -391,7 +389,6 @@ module Minjs
           raise ParseError.new("no `/' end of regular expression", self)
         end
         if line_terminator?(@codes[@pos])
-          debug_lit
           raise ParseError.new("regular expression has line terminator in body", self)
         end
         if @codes[@pos] == 0x5c # \
@@ -535,6 +532,7 @@ module Minjs
     def decimal_digits
       pos0 = @pos
       code = @codes[@pos]
+      return nil if code.nil?
       if code >= 0x30 and code <= 0x39
         @pos += 1
         while true
@@ -652,7 +650,6 @@ module Minjs
     def match_lit(l, options = {})
       eval_lit {
         t = fwd_lit(options)
-        STDERR.puts "match_lit #{t} <=> #{l} #{t==l}" if @debug
         t == l ? t : nil
       }
     end
@@ -717,7 +714,7 @@ module Minjs
       @codes[from,to].pack("U*")
     end
 
-    def debug_str(pos = nil)
+    def debug_str(pos = nil, line = nil, col = nil)
       if pos.nil?
         pos = @error_pos
         if pos.nil?
@@ -731,8 +728,11 @@ module Minjs
         pos0 = pos
         pos = 0
       end
+      if col and col > 2
+        pos0 = col - 2;
+      end
       t = ''
-      t << @codes[pos..(pos+80)].collect{|u| u == 10 ? 0x20 : u}.pack("U*")
+      t << @codes[pos..(pos+80)].pack("U*")
       t << "\n"
       t << (' ' * pos0) + "^"
       t

data/lib/minjs/minjs_compressor.rb

@@ -1,8 +1,9 @@
 require 'tilt'
+require 'logger'
 
 module Minjs
   class MinjsCompressor < Tilt::Template
-    DEBUG = false
+    attr_reader :logger
 
     def self.engine_initialized?
       defined?(::Minjs)
@@ -12,12 +13,14 @@ module Minjs
     end
 
     def prepare
+      @logger = Logger.new(STDERR)
+      @logger.level = Logger::WARN
     end
 
     def evaluate(context, locals, &block)
       case context.content_type
       when 'application/javascript'
-        if DEBUG
+        if logger.debug?
           @@c = 0 unless defined?(@@c)
           puts "start: compressing"
           file = "tmp#{@@c}.js"
@@ -29,8 +32,9 @@ module Minjs
           tmp.write(data)
           tmp.close
         end
-        t = Minjs::Compressor.new.compress(data)
-        if DEBUG
+        #TODO
+        t = Minjs::Compressor.new(:logger => logger).compress(data)
+        if logger.debug?
           tmp = open(output, "w")
           tmp.write(t)
           tmp.close

data/lib/minjs/program.rb

@@ -13,7 +13,7 @@ module Minjs
           break
         end
       end
-      ECMA262::Prog.new(context, prog)
+      ECMA262::Prog.new(context, ECMA262::SourceElements.new(prog))
     end
 
     def source_element(lex, context)