minjs 0.1.2 → 0.1.3

data/lib/minjs/ecma262/lit.rb

@@ -13,6 +13,10 @@ module Minjs
       def to_exp?
         false
       end
+
+      def priority(exp)
+        10
+      end
     end
 
     class DivOrRegexpLiteral < Literal
@@ -169,10 +173,9 @@ module Minjs
     end
 
     class ECMA262Numeric < Literal
-      attr_reader :integer, :decimal, :exp, :raw
+      attr_reader :integer, :decimal, :exp
 
-      def initialize(raw, integer, decimal = nil, exp = nil)
-        @raw = raw
+      def initialize(integer, decimal = nil, exp = nil)
         if integer == :nan
           integer = nil
           @nan = true
@@ -187,10 +190,11 @@ module Minjs
           if decimal
             @decimal = decimal.to_s
           end
-          @exp = exp
+          if exp
+            @exp = exp.to_i
+          end
         end
         @decimal = nil if @decimal == 0
-        @exp = nil if @exp == 1
       end
 
       def traverse(parent, &block)
@@ -242,120 +246,52 @@ module Minjs
       end
 
       def to_f
-        "#{@integer}.#{@decimal}e#{@exp}".to_f
+        d = @decimal
+        if d.to_s == ''
+          d = '0'
+        end
+        "#{@integer}.#{d}e#{@exp}".to_f
       end
-=begin
-TODO
       #
       # 9.8.1
       #
       def to_ecma262_string
         if @nan
           "NaN"
-        elsif @integer == 0 and @decimal.nil? and @exp.nil?
+        elsif @integer == '0' and @decimal.nil? and @exp.nil?
           "0"
-        elsif @integer.to_i < 0
-          ECMA262Numeric.new(-@integer, @decimal, @exp).to_string
         elsif @intinify
           "Infinity"
         else
-          #puts "to_f:"
-          #puts to_f
-          _i = @integer
-          _d = @decimal
-          _e = @exp.to_i || 0
-
-          if _d
-            _e -= _d.length
-            _i += _d
-            _d = nil
-          end
-
-          if _i.match(/^0/) and _i != '0'
-            _i = _i.sub(/^0/, '')
-          end
-          #puts "i,d,e:"
-          #p _i
-          #p _d
-          #p _e
-
-          while(_i % 10 == 0)
-            _i /= 10
-            _e += 1
-          end
-          k = _i.to_s.length
-          s = _i
-          n = k + _e
-          #
-          # Otherwise, let n, k, and s be integers such that k ≥ 1,
-          # 10k−1 ≤ s < 10k, the Number value for s × 10n−k is m,
-          # and k is as small as possible. Note that k is the number
-          # of digits in the decimal representation of s, that s is
-          # not divisible by 10, and that the least significant digit
-          # of s is not necessarily uniquely determined by these
-          # criteria.
-          #
-          #puts "k=#{k}"
-          #puts "s=#{s}"
-          #puts "n=#{n}"
-          #puts "#{s}e#{n-k}"
-          #puts eval("#{s}e#{n-k}")
-          #
-          # If k ≤ n ≤ 21, return the String consisting of the k digits
-          # of the decimal representation of s (in order, with no
-          # leading zeroes), followed by n−k occurrences of the
-          # character ‘0’.
-          #
-          if k <= n and n <= 21
-            "#{s * 10 ** (n-k)}"
-          #
-          # If 0 < n ≤ 21, return the String consisting of the most
-          # significant n digits of the decimal representation of s,
-          # followed by a decimal point ‘.’, followed by the
-          # remaining k−n digits of the decimal representation of s.
-          #
-          elsif 0 < n and n <= 21
-            "#{s[0...n]}.#{s[n..-1]}"
-          #
-          # If −6 < n ≤ 0, return the String consisting of the
-          # character ‘0’, followed by a decimal point ‘.’,
-          # followed by −n occurrences of the character ‘0’,
-          # followed by the k digits of the decimal representation of
-          # s.
-          #
-          elsif -6 < n and n <= 0
-            to_f.to_s #TODO
-            #"0.#{'0' * -n}#{s}"
-          #
-          # Otherwise, if k = 1, return the String consisting of the
-          # single digit of s, followed by lowercase character ‘e’,
-          # followed by a plus sign ‘+’ or minus sign ‘−’
-          # according to whether n−1 is positive or negative,
-          # followed by the decimal representation of the integer
-          # abs(n−1) (with no leading zeroes).
-          #
-          elsif k == 1
-            to_f.to_s #TODO
-            #"#{s}e#{n-1 > 0 ? '+' : '-'}#{(n-1).abs}"
-          #
-          # Return the String consisting of the most significant digit
-          # of the decimal representation of s, followed by a decimal
-          # point ‘.’, followed by the remaining k−1 digits of the
-          # decimal representation of s, followed by the lowercase
-          # character ‘e’, followed by a plus sign ‘+’ or minus
-          # sign ‘−’ according to whether n−1 is positive or
-          # negative, followed by the decimal representation of the
-          # integer abs(n−1) (with no leading zeroes).
-          #
+          f = to_f.to_s
+          _n, _e = f.split('e')
+          _i, _d = _n.split('.')
+
+          e = _e.to_i
+          if(e == 0)
+            if _d.to_i != 0
+              return _n
+            else
+              return _i
+            end
+          elsif(e > 0 && e < 21)
+            _n = _i + _d
+            _n += '0' * (21 - _n.length)
+            return _n
+          elsif(e < 0 && e >= -6)
+            _n = "0." + ('0' * (-e-1)) + _i + _d
+            return _n
           else
-            to_f.to_s #TODO
+            if e<0
+              return "#{_i}.#{_d}e#{e}"
+            else
+              return "#{_i}.#{_d}e+#{e}"
+            end
           end
         end
       end
-=end
-
-      NUMERIC_NAN = ECMA262Numeric.new('NaN', :nan)
     end
+    NUMERIC_NAN = ECMA262Numeric.new(:nan)
 
     class ECMA262RegExp < Literal
       def initialize(body, flags)
@@ -417,12 +353,27 @@ TODO
       end
       def to_js(options = {})
         "{" + @val.collect{|x, y|
-          if x.kind_of? ECMA262Numeric
-            "#{x.raw}:#{y.to_js(options)}"
-          elsif idname?(x.val.to_s)
-            "#{x.val.to_s}:#{y.to_js(options)}"
+          if y.kind_of? StFunc and (y.getter? || y.setter?)
+            if y.name.val == :get
+              t = "get #{x.val.to_s}(){#{y.statements.to_js(options)}}"
+            else
+              t = "set #{x.val.to_s}(#{y.args[0].to_js(options)}){#{y.statements.to_js(options)}}"
+            end
           else
-            "#{x.to_js(options)}:#{y.to_js(options)}"
+            if x.kind_of? ECMA262Numeric
+              a = "#{x.to_ecma262_string}"
+              b = "#{x.to_js}"
+              if a.length <= b.length || a == "Infinity"
+                t = a
+              else
+                t = b
+              end
+            elsif idname?(x.val.to_s)
+              t = "#{x.val.to_s}"
+            else
+              t = "#{x.to_js(options)}"
+            end
+            t << ":#{y.to_js(options)}"
           end
         }.join(",") + "}"
       end

data/lib/minjs/ecma262/st.rb

@@ -5,8 +5,12 @@ module Minjs
         false
       end
 
-      def replace(from, to)
-        puts "warning: not implement"
+      def to_return?
+        false
+      end
+
+      def priority(exp)
+        999
       end
     end
 
@@ -60,6 +64,12 @@ module Minjs
         @statement_list.delete(st)
       end
 
+      def remove_empty_statement
+        @statement_list.reject!{|x|
+          x.class == StEmpty
+        }
+      end
+
       def traverse(parent, &block)
         @statement_list.each do|st|
           st.traverse(self, &block)
@@ -114,9 +124,6 @@ module Minjs
 
       #statement_list:StList
       def initialize(statement_list)
-        if statement_list.class == Array
-          raise 'bad class'
-        end
         @statement_list = statement_list
       end
 
@@ -136,6 +143,17 @@ module Minjs
       def to_exp(options)
         @statement_list[0].to_exp({})
       end
+
+      def to_statement?
+        @statement_list.statement_list.select{|s|
+          s.class != StEmpty
+        }.length == 1
+      end
+
+      def to_statement
+        statement_list.remove_empty_statement
+        @statement_list[0]
+      end
     end
     #
     # 12.2
@@ -223,10 +241,18 @@ module Minjs
       def initialize(exp)
         @exp = exp
       end
+
+      def replace(from, to)
+        if @exp == from
+          @exp = to
+        end
+      end
+
       def traverse(parent, &block)
         @exp.traverse(self, &block)
         yield self, parent
       end
+
       def to_js(options = {})
         concat(options, @exp, ";")
       end
@@ -275,9 +301,35 @@ module Minjs
         end
       end
 
+      def to_return?
+        if !@else_st
+          return true if @then_st.class == StReturn
+        else
+          return true if @then_st.class == StReturn and @else_st.class == StReturn
+        end
+      end
+
+      def to_return
+        if !@else_st
+          cond = ExpParen.new(@cond)
+          then_exp = ExpParen.new(then_st.exp)
+          else_exp = ExpVoid.new(ECMA262Numeric.new('0'))
+          StReturn.new(ExpCond.new(cond, then_exp, else_exp))
+        else
+          cond = ExpParen.new(@cond)
+          then_exp = ExpParen.new(then_st.exp)
+          else_exp = ExpParen.new(else_st.exp)
+          StReturn.new(ExpCond.new(cond, then_exp, else_exp))
+        end
+      end
+
       def to_exp?
-        return false if @then_st.to_exp? == false
-        return false if @else_st and @else_st.to_exp? == false
+        if !@else_st
+          return false if @then_st.to_exp? == false
+        else
+          return false if @then_st.to_exp? == false
+          return false if @else_st.to_exp? == false
+        end
         return true
       end
 
@@ -288,7 +340,6 @@ module Minjs
           else_exp = @else_st.to_exp(options)
         else
           then_exp = @then_st.to_exp(options)
-          #else_exp = ECMA262Numeric.new(0)
           return ExpLogicalAnd.new(ExpParen.new(@cond), ExpParen.new(then_exp))
         end
         if then_exp.kind_of? ExpComma
@@ -365,6 +416,9 @@ module Minjs
       end
     end
 
+    #
+    # for(var i=0,... ; ; )
+    #
     class StForVar < St
       attr_reader :context
 
@@ -433,11 +487,7 @@ module Minjs
             concat options, x[0]
           end
         }.join(",")
-#        if options[:compress_var]
-#          t = concat({:for_args => true}.merge(options), :for, "(", _var_decl_list, ";", @exp2, ";", @exp3, ")")
-#        else
-          t = concat({:for_args => true}.merge(options), :for, "(", _var_decl_list, ";", @exp2, ";", @exp3, ")")
-#        end
+        t = concat({:for_args => true}.merge(options), :for, "(var", _var_decl_list, ";", @exp2, ";", @exp3, ")")
         concat options, t, statement
       end
     end
@@ -637,7 +687,7 @@ module Minjs
       end
 
       def to_js(options = {})
-        concat options, :with, "(", @exp, ")","{", @statement, "}"
+        concat options, :with, "(", @exp, ")", @statement
       end
     end
     #12.11
@@ -740,8 +790,6 @@ module Minjs
           @catch[1] = to
         elsif from == @finally
           @finally = to
-        else
-          raise 'unknown'
         end
       end
 
@@ -778,16 +826,21 @@ module Minjs
     class StFunc < St
       attr_reader :name
       attr_reader :args
-      attr_reader :statement
+      attr_reader :statements
       attr_reader :context
-      attr_reader :decl
 
-      def initialize(context, name, args, statements, decl = false)
+      def initialize(context, name, args, statements, options = {})
         @name = name
-        @args = args
+        @args = args #=> array
         @statements = statements #=> Prog
         @context = context
-        @decl = decl
+        @decl = options[:decl]
+        @getter = options[:getter]
+        @setter = options[:setter]
+      end
+
+      def priority(exp)
+        10
       end
 
       def traverse(parent, &block)
@@ -801,7 +854,25 @@ module Minjs
 
       def to_js(options = {})
         _args = @args.collect{|x|x.to_js(options)}.join(",")
-        concat options, :function, @name, '(', _args, ")", "{", @statements, "}"
+        if @getter
+          concat options, :get, @name, '(', _args, ")", "{", @statements, "}"
+        elsif @setter
+          concat options, :set, @name, '(', _args, ")", "{", @statements, "}"
+        else
+          concat options, :function, @name, '(', _args, ")", "{", @statements, "}"
+        end
+      end
+
+      def getter?
+        @getter
+      end
+
+      def setter?
+        @setter
+      end
+
+      def decl?
+        @decl
       end
     end
   end

data/lib/minjs/exceptions.rb

@@ -2,14 +2,22 @@ module Minjs
   class ParseError < StandardError
     def initialize(error_message = nil, lex = nil)
       super(error_message)
-      @lex = lex
+      if lex
+        @lex = lex
+        @lex_pos = lex.pos
+      end
     end
 
     def to_s
       t = ''
       t << super
       t << "\n"
-      t << @lex.debug_str if @lex
+      if @lex
+        line, col = @lex.line_col(@lex_pos)
+        t << "line: #{line}, col: #{col}\n"
+        t << @lex.debug_str(@lex_pos)
+      end
+      t
     end
   end
 end

data/lib/minjs/expression.rb

@@ -19,7 +19,7 @@ module Minjs
           STDERR.puts "*** primary_exp => ()" if @debug
           return ECMA262::ExpParen.new(a)
         else
-          raise 'error'
+          raise ParseError.new("no `)' at end of expression", lex)
         end
       end
 
@@ -103,18 +103,17 @@ module Minjs
             break
           end
           lex.eval_lit{
+            if lex.match_lit(ECMA262::ID_GET) and a=property_name(lex, context) and lex.match_lit(ECMA262::PUNC_LPARENTHESIS) and lex.match_lit(ECMA262::PUNC_RPARENTHESIS) and lex.match_lit(ECMA262::PUNC_LCURLYBRAC) and b=func_body(lex, context) and lex.match_lit(ECMA262::PUNC_RCURLYBRAC)
+              h.push([a, ECMA262::StFunc.new(context, ECMA262::ID_GET, [], b, :getter => true)])
+            elsif lex.match_lit(ECMA262::ID_SET) and a=property_name(lex, context) and lex.match_lit(ECMA262::PUNC_LPARENTHESIS) and arg=property_set_parameter_list(lex, context) and lex.match_lit(ECMA262::PUNC_RPARENTHESIS) and lex.match_lit(ECMA262::PUNC_LCURLYBRAC) and b=func_body(lex, context) and lex.match_lit(ECMA262::PUNC_RCURLYBRAC)
+              h.push([a, ECMA262::StFunc.new(context, ECMA262::ID_SET, arg, b, :setter => true)])
+            else
+              nil
+            end
+          } or lex.eval_lit{
             a=property_name(lex, context) and lex.match_lit(ECMA262::PUNC_COLON) and b=assignment_exp(lex, context, options)
             h.push([a, b])
           }
-#          or lex.eval_lit{
-#            if lex.match_lit(ECMA262::ID_GET) and a=property_name(lex, context) and lex.match_lit(ECMA262::PUNC_LPARENTHESIS) and lex.match_lit(ECMA262::PUNC_RPARENTHESIS) and lex.match_lit(ECMA262::PUNC_LCURLYBRAC) and func_body(lex, context) and lex.match_lit(ECMA262::PUNC_RCURLYBRAC)
-#              h[a] = "getter" #TODO
-#            elsif lex.match_lit(ECMA262::ID_SET) and a=property_name(lex, context) and lex.match_lit(ECMA262::PUNC_LPARENTHESIS) and property_set_parameter_list(lex, context) and lex.match_lit(ECMA262::PUNC_RPARENTHESIS) and lex.match_lit(ECMA262::PUNC_LCURLYBRAC) and func_body(lex, context) and lex.match_lit(ECMA262::PUNC_RCURLYBRAC)
-#              h[a] = "setter" #TODO
-#            else
-#              return nil
-#            end
-#          }
 
           if lex.match_lit(ECMA262::PUNC_COMMA)
             break if lex.match_lit(ECMA262::PUNC_RCURLYBRAC)
@@ -138,7 +137,7 @@ module Minjs
         elsif a.kind_of?(ECMA262::ECMA262Numeric)
           a
         else
-          raise ParseError.new("The Property name must be kind_of ItentiferName or String", lex)
+          nil
         end
       }
     end
@@ -147,7 +146,7 @@ module Minjs
       lex.eval_lit {
         a = lex.fwd_lit
         if a.kind_of?(ECMA262::IdentifierName) and !a.reserved?
-          a
+          [a]
         else
           nil
         end
@@ -292,12 +291,11 @@ module Minjs
       STDERR.puts "*** postfix_exp" if @debug
       lex.debug_lit if @debug
 
-      next_exp = :left_hand_side_exp
       t = lex.eval_lit{
-        a = __send__(next_exp, lex, context, options)
+        a = left_hand_side_exp(lex, context, options)
         return nil if a.nil?
-        if punc = (lex.match_lit(ECMA262::PUNC_INC) ||
-                   lex.match_lit(ECMA262::PUNC_DEC))
+        if punc = (lex.match_lit(ECMA262::PUNC_INC, :nolt => true) ||
+                   lex.match_lit(ECMA262::PUNC_DEC, :nolt => true))
           if punc == ECMA262::PUNC_INC
             ECMA262::ExpPostInc.new(a)
           else
@@ -683,7 +681,7 @@ module Minjs
             when ECMA262::PUNC_XORLET
               ECMA262::ExpXorAssign.new(left_hand, b)
             else
-              raise "not implement"
+              raise "internal error"
             end
           else # some assignment operator presents but no assignment_expression => fail
             return nil

data/lib/minjs/func.rb

@@ -17,13 +17,17 @@ module Minjs
           lex.match_lit(ECMA262::PUNC_RPARENTHESIS) and
           lex.match_lit(ECMA262::PUNC_LCURLYBRAC) and
           b=func_body(lex, new_context) and lex.match_lit(ECMA262::PUNC_RCURLYBRAC)
-          f = ECMA262::StFunc.new(new_context, id, args, b, true)
+          f = ECMA262::StFunc.new(new_context, id, args, b, {:decl => true})
 
           context.var_env.record.create_mutable_binding(id, nil)
           context.var_env.record.set_mutable_binding(id, f, nil)
           f
         else
-          nil
+          if b
+            raise ParseError.new("No `}' at end of function", lex)
+          else
+            raise ParseError.new("Bad function declaration", lex)
+          end
         end
       }
     end
@@ -53,8 +57,11 @@ module Minjs
            end
            f
          else
-           lex.debug_lit
-           raise 'error'
+          if b
+            raise ParseError.new("No `}' at end of function", lex)
+          else
+            raise ParseError.new("Bad function declaration", lex)
+          end
          end
        }
     end