minjs 0.2.0 → 0.2.1

data/lib/minjs/ecma262/env.rb

@@ -68,7 +68,7 @@ module Minjs
       end
 
       def debug
-        STDERR.puts @record.binding
+        STDERR.puts @record.binding.keys.join(", ")
       end
     end
 

data/lib/minjs/ecma262/exp.rb

@@ -232,6 +232,12 @@ module Minjs
         self
       end
 
+      def to_ecma262_boolean
+        return nil unless @val.respond_to? :to_ecma262_boolean
+        return nil if @val.to_ecma262_boolean.nil?
+        @val.to_ecma262_boolean
+      end
+
       def ecma262_typeof
         if @val.respond_to? :ecma262_typeof
           @val.ecma262_typeof
@@ -676,7 +682,6 @@ module Minjs
         PRIORITY_UNARY
       end
 
-      #feature
       def reduce(parent)
         if @val.kind_of? ECMA262Numeric and (@val.to_js == "0" || @val.to_js == "1")
           return
@@ -695,6 +700,20 @@ module Minjs
         end
       end
 
+      def to_ecma262_boolean
+        return nil unless @val.respond_to? :to_ecma262_boolean
+        return nil if @val.to_ecma262_boolean.nil?
+        !@val.to_ecma262_boolean
+      end
+
+      def to_ecma262_number
+        if @val.respond_to? :to_ecma262_number
+          v = @val.to_ecma262_number
+          return nil if v.nil?
+          v == 0 ? 1 : 0
+        end
+      end
+
       def ecma262_eval(type)
         if @val.respond_to? :ecma262_eval
           e = @val.ecma262_eval(type)
@@ -733,30 +752,14 @@ module Minjs
       end
 
       def reduce(parent)
-        # a * 1 => a
-        if @val.kind_of? ECMA262Numeric and @val2.kind_of? ECMA262Numeric and @val.to_num == 1
-          parent.replace(self, @val2)
-        end
-        # 1 * b => b
-        if @val.kind_of? ECMA262Numeric and @val2.kind_of? ECMA262Numeric and @val2.to_num == 1
-          parent.replace(self, @val)
-        end
-        # N * M => (N * M)
-        if @val.kind_of? ECMA262Numeric and @val2.kind_of? ECMA262Numeric and @val.integer? and @val2.integer?
-          parent.replace(self, ECMA262Numeric.new(@val.to_num * @val2.to_num))
-        end
-=begin
-        # ((a * N) * M) or ((N * a) * M)
-        if @val2.kind_of? ECMA262Numeric and @val2.integer? and @val.kind_of? ExpMul
-          if @val.val2.kind_of? ECMA262Numeric and @val.val2.integer?
-            @val2 = ECMA262Numeric.new(@val.val2.to_num * @val2.to_num)
-            @val = @val.val
-          elsif @val.val.kind_of? ECMA262Numeric and @val.val.integer?
-            @val2 = ECMA262Numeric.new(@val.val.to_num * @val2.to_num)
-            @val = @val.val2
+        # A * B
+        if @val.respond_to? :to_ecma262_number and @val2.respond_to? :to_ecma262_number
+          v = @val.to_ecma262_number
+          v2 = @val2.to_ecma262_number
+          if !v.nil? and !v2.nil?
+            parent.replace(self, ECMA262Numeric.new(v * v2))
           end
         end
-=end
       end
 
       def ecma262_typeof
@@ -815,17 +818,31 @@ module Minjs
       end
 
       def reduce(parent)
-        # a + 0 => a
-        if @val.kind_of? ECMA262Numeric and @val2.kind_of? ECMA262Numeric and @val.to_num == 0
-          parent.replace(self, @val2)
-        end
-        # 0 + b => b
-        if @val.kind_of? ECMA262Numeric and @val2.kind_of? ECMA262Numeric and @val2.to_num == 0
-          parent.replace(self, @val)
-        end
-        # N + M => (N + M)
-        if @val.kind_of? ECMA262Numeric and @val2.kind_of? ECMA262Numeric and @val.integer? and @val2.integer?
-          parent.replace(self, ECMA262Numeric.new(@val.to_num + @val2.to_num))
+        #
+        # String + String/
+        # a + b = a.concat(b)
+        if @val.kind_of? ECMA262String or @val2.kind_of? ECMA262String
+          if @val.respond_to? :to_ecma262_string and @val2.respond_to? :to_ecma262_string
+            v = @val.to_ecma262_string
+            v2 = @val2.to_ecma262_string
+            if !v.nil? and !v2.nil?
+              new_str = ECMA262String.new(v + v2)
+              parent.replace(self, new_str)
+            end
+          end
+        #
+        # Numeric + Numeric
+        #
+        elsif @val.respond_to? :to_ecma262_number and @val2.respond_to? :to_ecma262_number
+          #
+          #11.6.3 Applying the Additive Operators to Numbers(TODO)
+          #
+          # N + M => (N + M)
+          v = @val.to_ecma262_number
+          v2 = @val2.to_ecma262_number
+          if !v.nil? and !v2.nil?
+            parent.replace(self, ECMA262Numeric.new(v + v2))
+          end
         end
       end
     end
@@ -844,17 +861,13 @@ module Minjs
       end
 
       def reduce(parent)
-        # a - 0 => a
-        if @val.kind_of? ECMA262Numeric and @val2.kind_of? ECMA262Numeric and @val.to_num == 0
-          parent.replace(self, @val2)
-        end
-        # 0 - b => b
-        if @val2.kind_of? ECMA262Numeric and @val.kind_of? ECMA262Numeric and @val2.to_num == 0
-          parent.replace(self, @val)
-        end
-        # N - M => (N - M)
-        if @val.kind_of? ECMA262Numeric and @val2.kind_of? ECMA262Numeric and @val.integer? and @val2.integer?
-          parent.replace(self, ECMA262Numeric.new(@val.to_num - @val2.to_num))
+        # A - B
+        if @val.respond_to? :to_ecma262_number and @val2.respond_to? :to_ecma262_number
+          v = @val.to_ecma262_number
+          v2 = @val2.to_ecma262_number
+          if !v.nil? and !v2.nil?
+            parent.replace(self, ECMA262Numeric.new(v - v2))
+          end
         end
       end
 
@@ -1180,6 +1193,19 @@ module Minjs
         PRIORITY_LOGICAL_AND
       end
 
+      def to_ecma262_boolean
+        if @val.respond_to? :to_ecma262_boolean and @val2.respond_to? :to_ecma262_boolean
+          return nil if @val.to_ecma262_boolean == nil or @val2.to_ecma262_boolean == nil
+          if @val.to_ecma262_boolean and @val2.to_ecma262_boolean
+            true
+          else
+            false
+          end
+        else
+          nil
+        end
+      end
+
       def ecma262_typeof
         if @val.respond_to? :ecma262_typeof and @val2.respond_to? :ecma262_typeof
            if @val.ecma262_typeof == @val2.ecma262_typeof
@@ -1200,6 +1226,19 @@ module Minjs
         PRIORITY_LOGICAL_OR
       end
 
+      def to_ecma262_boolean
+        if @val.respond_to? :to_ecma262_boolean and @val2.respond_to? :to_ecma262_boolean
+          return nil if @val.to_ecma262_boolean == nil or @val2.to_ecma262_boolean == nil
+          if @val.to_ecma262_boolean or @val2.to_ecma262_boolean
+            true
+          else
+            false
+          end
+        else
+          nil
+        end
+      end
+
       def ecma262_typeof
         if @val.respond_to? :ecma262_typeof and @val2.respond_to? :ecma262_typeof
           if @val.ecma262_typeof == @val2.ecma262_typeof

data/lib/minjs/ecma262/lit.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+require 'set'
 module Minjs
   module ECMA262
     class Literal < Base
@@ -119,6 +120,14 @@ module Minjs
         false
       end
 
+      def to_ecma262_string
+        "null"
+      end
+
+      def to_ecma262_number
+        0
+      end
+
       def ecma262_typeof
         :boolean
       end
@@ -156,6 +165,14 @@ module Minjs
         @val == :true
       end
 
+      def to_ecma262_string
+        if @val == :false
+          "false"
+        else
+          "true"
+        end
+      end
+
       def to_ecma262_boolean
         if @val == :false
           false
@@ -164,6 +181,14 @@ module Minjs
         end
       end
 
+      def to_ecma262_number
+        if @val == :false
+          0
+        else
+          1
+        end
+      end
+
       def ecma262_typeof
         :boolean
       end
@@ -180,6 +205,7 @@ module Minjs
     end
 
     class ECMA262String < Literal
+      include Ctype
       attr_reader :val
 
       def initialize(val)
@@ -251,38 +277,209 @@ module Minjs
         end
       end
 
+      def to_ecma262_string
+        @val.dup
+      end
+      # 9.3.1 ToNumber Applied to the String Type
+      def to_ecma262_number
+        begin
+          pos1 = pos0 = pos = 0
+          v = @val.codepoints
+          while true
+            return 0 if v[pos].nil? # ToInteger(empty string) => 0
+            if white_space?(v[pos]) or line_terminator?(v[pos])
+              pos += 1
+            else
+              break
+            end
+          end
+          #hex
+          if v[pos] == 0x30 and (v[pos+1] == 0x78 || v[pos+1] == 0x58) and hex_number?(v[pos+2])
+            base = 16
+            pos += 2
+            pos0 = pos
+            while true
+              break if v[pos].nil?
+              if hex_number?(v[pos])
+                pos += 1
+              else
+                break
+              end
+            end
+          #decimal
+          else
+            base = 10
+            sign = 1
+            pos0 = pos
+            if v[pos].nil?
+              raise :error
+            elsif v[pos] == 0x2b #+
+              pos += 1
+            elsif v[pos] == 0x2d #-
+              sign = -1
+              pos += 1
+            end
+            has_decimal = false
+            has_exp = false
+
+            while true
+              break if v[pos].nil?
+              if v[pos] >= 0x30 and v[pos] <= 0x39
+                pos += 1
+              elsif v[pos] == 0x2e #.
+                pos += 1
+                has_decimal = true
+                break;
+              else
+                break
+              end
+            end
+            if has_decimal
+              while true
+                break if v[pos].nil?
+                if v[pos] >= 0x30 and v[pos] <= 0x39
+                  pos += 1
+                elsif v[pos] == 0x45 or v[pos] == 0x65 #E/e
+                  pos += 1
+                  has_exp = true
+                  break;
+                else
+                  break
+                end
+              end
+            end
+            if has_exp
+              if v[pos] == 0x2b #+
+                pos += 1
+              else v[pos] == 0x2d #-
+                pos += 1
+              end
+              while true
+                break if v[pos].nil?
+                if v[pos] >= 0x30 and v[pos] <= 0x39
+                  pos += 1
+                else
+                  break
+                end
+              end
+            end
+          end
+          pos1 = pos
+          while white_space?(v[pos]) or line_terminator?(v[pos])
+            raise :error if v[pos].nil?
+            pos += 1
+          end
+          raise :error unless v[pos].nil?
+          if base == 16
+            ret = v[pos0...pos1].pack("U*").to_i(base)
+          else
+            ret = v[pos0...pos1].pack("U*").to_f
+          end
+        rescue => e
+          ret = nil #Float::NAN
+        end
+        ret
+      end
+
       def ecma262_typeof
         :string
       end
     end
 
+    #
+    # 8.5 The Number Type
+    #
+    # ECMA262 say:
+    #
+    # The Number type has exactly 18437736874454810627
+    # (that is, 264−253+3) values, representing the
+    # double-precision 64-bit format IEEE 754 values
+    # as specified in the IEEE Standard for Binary
+    # Floating-Point Arithmetic
+    #
+    # To simplify the implementation,
+    # Minjs assumes that ruby has IEEE754 dobule precision.
+    #
     class ECMA262Numeric < Literal
-      attr_reader :integer, :decimal, :exp
+      attr_reader :integer, :decimal, :exp, :number
+
+      if Float::DIG != 15
+        if defined?(@logger)
+          @logger.warn{
+            "minjs assumes that ruby has IEEE754 dobule precision."
+          }
+        end
+      end
 
       def initialize(integer, decimal = nil, exp = nil)
-        if integer == :nan
-          integer = nil
-          @nan = true
-        elsif integer == :infinity
-          integer = nil
-          @infinity = true
-        elsif integer.kind_of? Float
-          @integer, @decimal = integer.to_i.to_s
-          @decimal = (integer - @integer).to_s.sub(/^.*0\./, '')
-        else
-          @integer = integer.to_s
-          if decimal
-            @decimal = decimal.to_s
+        if integer == :nan or integer == "NaN"
+          @number = Float::NAN
+          @integer = "NaN"
+          @decimal = nil
+          @exp = nil
+        elsif integer == :infinity or integer == Float::INFINITY or integer == "Infinity"
+          @number = Float::INFINITY
+          @integer = "Infinity"
+          @decimal = nil
+          @exp = nil
+        elsif integer == -Float::INFINITY or integer == "-Infinity"
+          @number = -Float::INFINITY
+          @integer = "-Infinity"
+          @decimal = nil
+          @exp = nil
+        elsif integer.kind_of? String
+          @integer = integer.to_s #String
+          @decimal = decimal.to_s #String
+          @exp = exp ? exp.to_i : nil
+          if @decimal == ""
+            d = ""
+          else
+            d = ".#{@decimal}"
+          end
+          if @exp
+            @number = "#{integer}#{d}e#{exp}".to_f
+          else
+            @number = "#{integer}#{d}".to_f
           end
-          if exp
-            @exp = exp.to_i
+          if @number.kind_of? Float and @number.nan?
+            @integer = "NaN"
+            @decimal = nil
+            @exp = nil
+          elsif @number == Float::INFINITY
+            @integer = "Infinity"
+            @decimal = nil
+            @exp = nil
+          elsif @number == -Float::INFINITY
+            @integer = "-Infinity"
+            @decimal = nil
+            @exp = nil
+          end
+        elsif integer.kind_of? Numeric
+          if integer.kind_of? Float and integer.nan?
+            @number = Float::NAN
+            @decimal = nil
+            @exp = nil
+          elsif integer == Float::INFINITY
+            @number = Float::INFINITY
+            @decimal = nil
+            @exp = nil
+          elsif integer == -Float::INFINITY
+            @number = -Float::INFINITY
+            @decimal = nil
+            @exp = nil
+          else
+            @number = integer
+            @integer = @number.to_i.to_s
+            @decimal = (@number - @integer.to_i).to_s.sub(/0\.?/, '')
+            @exp = nil
           end
+        else
+          raise 'internal error'
         end
-        @decimal = nil if @decimal == 0
       end
 
       def deep_dup
-        self.class.new(@integer, @decimal, @exp)
+        self.class.new(@number)
       end
 
       def traverse(parent, &block)
@@ -294,69 +491,75 @@ module Minjs
       end
 
       def to_js(options = {})
-        if @nan
+        if nan?
           return "NaN"
+        elsif @number == Float::INFINITY
+          return "Infinity"
+        elsif @number == -Float::INFINITY
+          return "-Infinity"
         end
-        t = @integer.dup.to_s
+        t0 = to_ecma262_string
+        t = @integer.nil? ? "" : @integer.dup.to_s
 
-        if @decimal
+        d = @decimal.to_s
+        if d == '0'
+          d = ''
+        end
+        if d.length > 0
           if @integer == '0'
-            t = ".#{@decimal}"
+            t = ".#{d}"
           else
-            t << ".#{@decimal}"
+            t << ".#{d}"
           end
         end
         if @exp
           t << "e#{@exp}"
         end
 
-        if @decimal.nil? and @exp.nil? and t.match(/0{3,}$/)
+        if !t.match(/e/) and !t.match(/\./) and t.match(/0{3,}$/)
           len = $&.length
           t.sub!(/0+$/, "e#{len}")
         end
-        t
+        t.sub!(/e\+/, 'e')
+        t0.sub!(/e\+/, 'e')
+
+        t.length <= t0.length ? t : t0
       end
 
-      def integer?
-        @decimal.nil?
+      def to_i
+        to_ecma262_string.to_i
       end
 
-      def to_num
-        if @decimal
-          to_f
-        else
-          to_i
-        end
+      def to_f
+        to_ecma262_string.to_f
       end
 
-      def to_i
-        if @exp
-          @integer.to_i * (10 ** @exp.to_i)
-        else
-          @integer.to_i
-        end
+      def nan?
+        @number.kind_of? Float and @number.nan?
       end
 
-      def to_f
-        d = @decimal
-        if d.to_s == ''
-          d = '0'
-        end
-        "#{@integer}.#{d}e#{@exp}".to_f
+      def infinity?
+        @number == Float::INFINITY || @number == -Float::INFINITY
+      end
+
+      def number?
+        !nan? and !infinity?
       end
 
       #
       # 9.8.1
       #
       def to_ecma262_string
-        if @nan
+        if nan?
           "NaN"
+        elsif @number == Float::INFINITY
+          "Infinity"
+        elsif @number == -Float::INFINITY
+          "-Infinity"
         elsif @integer == '0' and @decimal.nil? and @exp.nil?
           "0"
-        elsif @intinify
-          "Infinity"
         else
-          f = to_f.to_s
+          f = @number.to_f.to_s
           _n, _e = f.split('e')
           _i, _d = _n.split('.')
 
@@ -392,6 +595,18 @@ module Minjs
         end
       end
 
+      def to_ecma262_number
+        if nan?
+          nil
+        elsif @number == Float::INFINITY
+          nil
+        elsif @number == -Float::INFINITY
+          nil
+        else
+          @number
+        end
+      end
+
       def ecma262_typeof
         :number
       end
@@ -423,6 +638,10 @@ module Minjs
         yield self, parent
       end
 
+      def to_ecma262_boolean
+        true
+      end
+
       def ==(obj)
         self.class == obj.class and @body == obj.body and @flags == obj.flags
       end
@@ -512,12 +731,7 @@ module Minjs
           else
             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
+              t = a
             elsif idname?(x.val.to_s)
               t = "#{x.val.to_s}"
             else
@@ -612,7 +826,7 @@ module Minjs
         @@sym[val] ||= self.new(context, val)
       end
 
-      RESERVED_WORD = [
+      RESERVED_WORD = Set.new [
         :break, :do, :instanceof, :typeof, :case, :else,
         :new, :var, :catch, :finally, :return, :void, :continue,
         :for, :switch, :while,:debugger, :function, :this, :with,
@@ -623,11 +837,11 @@ module Minjs
         :null, :false, :true
       ]
       def reserved?
-        RESERVED_WORD.index(val)
+        RESERVED_WORD.include?(val)
       end
 
       def self.reserved?(val)
-        RESERVED_WORD.index(val)
+        RESERVED_WORD.include?(val)
       end
 
       def traverse(parent)

data/lib/minjs/ecma262/st.rb

@@ -279,10 +279,6 @@ module Minjs
         @else_st = else_st
       end
 
-      def deep_dup
-        self.class.new(@cond.deep_dup, @then_st.deep_dup, @else_st.deep_dup)
-      end
-
       def replace(from, to)
         if from .eql? @cond
           @cond = to

data/lib/minjs/lex.rb

@@ -59,14 +59,6 @@ module Minjs
         @error_pos = @pos
         return ret
       else
-        #        p pos0
-        #        p @pos
-        #@error_pos = @pos
-        #debug_lit
-        #raise 'no hint'
-        #regexp_literal
-        #div_punctuator
-        #nil #unknown
         ECMA262::LIT_DIV_OR_REGEXP_LITERAL
       end
     end
@@ -194,7 +186,8 @@ module Minjs
           chars.push(@codes[@pos])
           @pos += 1
         else
-          return ECMA262::IdentifierName.new(nil, chars.pack("U*").to_sym)
+          name = chars.pack("U*").to_sym
+          return ECMA262::IdentifierName.new(nil, name)
         end
       end
     end
@@ -488,7 +481,7 @@ module Minjs
           raise ParseError.new("The source character immediately following a NumericLiteral must not be an IdentifierStart or DecimalDigit", self)
         end
 
-        return ECMA262::ECMA262Numeric.new(0, f, e)
+        return ECMA262::ECMA262Numeric.new('0', f, e)
       end
 
       if code >= 0x30 and code <= 0x39