minjs 0.2.2 → 0.3.0

data/lib/minjs/ecma262/base.rb

@@ -24,7 +24,7 @@ module Minjs
             if prev.match(/[\w\$]\z/) and js.match(/\A[\w\$]/)
               sep = ' '
             end
-            #;; means empty statement that must not be deleted
+            #';;' means 'empty statement' that must not be deleted
             if prev.match(/;;\Z/)
               prev.sub!(/;;\Z/, ";")
             elsif prev.match(/;\Z/) and js == "}"

data/lib/minjs/ecma262/exp.rb

@@ -30,6 +30,10 @@ module Minjs
       def reduce(parent)
       end
 
+      def left_hand_side_exp?
+        false
+      end
+
       def priority
         9999
       end
@@ -46,6 +50,7 @@ module Minjs
         end
         self
       end
+
       def add_paren
         if @val.priority > self.priority
           @val = ExpParen.new(@val)
@@ -142,6 +147,10 @@ module Minjs
       def to_js(options = {})
         concat options, sym, @val
       end
+
+      def left_hand_side_exp?
+        true
+      end
     end
 
     class ExpArg2 < Exp
@@ -212,6 +221,10 @@ module Minjs
         "(#{@val.to_js(options)})"
       end
 
+      def left_hand_side_exp?
+        true
+      end
+
       def remove_paren?
         js = @val.to_js
         if js.match(/^function/) or js.match(/^{/)
@@ -274,6 +287,10 @@ module Minjs
         "#{@val.to_js(options)}[#{@val2.to_js(options)}]"
       end
 
+      def left_hand_side_exp?
+        true
+      end
+
       def remove_paren
         if @val.kind_of? ExpParen and @val.val.priority <= PRIORITY_LEFT_HAND_SIDE
           @val = @val.val if @val.remove_paren?
@@ -286,7 +303,7 @@ module Minjs
 
       def add_paren
         if @val.priority > PRIORITY_LEFT_HAND_SIDE
-          @val = ExpPare.new(@val)
+          @val = ExpParen.new(@val)
         end
         self
       end
@@ -324,6 +341,10 @@ module Minjs
         "#{@val.to_js(options)}.#{@val2.val}"
       end
 
+      def left_hand_side_exp?
+        true
+      end
+
       def remove_paren
         if @val.kind_of? ExpParen and @val.val.priority <= PRIORITY_LEFT_HAND_SIDE
           @val = @val.val if @val.remove_paren?
@@ -390,6 +411,10 @@ module Minjs
         "#{@name.to_js(options)}(#{args})"
       end
 
+      def left_hand_side_exp?
+        true
+      end
+
       def remove_paren
         if @name.kind_of? ExpParen and @name.val.priority <= PRIORITY_LEFT_HAND_SIDE
           @name = @name.val if @name.remove_paren?
@@ -408,7 +433,7 @@ module Minjs
 
       def add_paren
         if @name.priority > PRIORITY_LEFT_HAND_SIDE
-          @name = ExpPare.new(@name)
+          @name = ExpParen.new(@name)
         end
         if @args
           @args.map! do |arg|
@@ -478,6 +503,10 @@ module Minjs
         end
       end
 
+      def left_hand_side_exp?
+        true
+      end
+
       def remove_paren
         if @name.kind_of? ExpParen and @name.val.priority <= PRIORITY_LEFT_HAND_SIDE
           @name = @name.val if @name.remove_paren?

data/lib/minjs/ecma262/lit.rb

@@ -86,6 +86,38 @@ module Minjs
 
     LIT_LINE_FEED = LineFeed.get
 
+    class This < Literal
+      attr_reader :context
+
+      def initialize(context)
+        @context = context
+      end
+
+      def deep_dup
+        self.class.new(@context)
+      end
+
+      def traverse(parent, &block)
+        yield self, parent
+      end
+
+      def to_s
+        "this"
+      end
+
+      def ==(obj)
+        self.class == obj.class
+      end
+
+      def to_js(options = {})
+        "this"
+      end
+
+      def left_hand_side_exp?
+        true
+      end
+    end
+
     class Null < Literal
       def initialize(val)
         @val = :null
@@ -111,6 +143,10 @@ module Minjs
         "null"
       end
 
+      def left_hand_side_exp?
+        true
+      end
+
       @@instance = self.new(nil)
       def self.get
         @@instance
@@ -161,6 +197,10 @@ module Minjs
         @val.to_s
       end
 
+      def left_hand_side_exp?
+        true
+      end
+
       def true?
         @val == :true
       end
@@ -269,6 +309,10 @@ module Minjs
         end
       end
 
+      def left_hand_side_exp?
+        true
+      end
+
       def to_ecma262_boolean
         if @val.length == 0
           false
@@ -294,13 +338,13 @@ module Minjs
             end
           end
           #hex
-          if v[pos] == 0x30 and (v[pos+1] == 0x78 || v[pos+1] == 0x58) and hex_number?(v[pos+2])
+          if v[pos] == 0x30 and (v[pos+1] == 0x78 || v[pos+1] == 0x58) and hex_digit?(v[pos+2])
             base = 16
             pos += 2
             pos0 = pos
             while true
               break if v[pos].nil?
-              if hex_number?(v[pos])
+              if hex_digit?(v[pos])
                 pos += 1
               else
                 break
@@ -499,6 +543,8 @@ module Minjs
           return "-Infinity"
         end
         t0 = to_ecma262_string
+        t0.sub!(/^0\./, '.')
+
         t = @integer.nil? ? "" : @integer.dup.to_s
 
         d = @decimal.to_s
@@ -526,6 +572,10 @@ module Minjs
         t.length <= t0.length ? t : t0
       end
 
+      def left_hand_side_exp?
+        true
+      end
+
       def to_i
         to_ecma262_string.to_i
       end
@@ -649,6 +699,10 @@ module Minjs
       def to_js(options = {})
         "/#{@body}/#{@flags}"
       end
+
+      def left_hand_side_exp?
+        true
+      end
     end
 
     LITERAL_TRUE = Boolean.new(:true)
@@ -679,6 +733,11 @@ module Minjs
       def to_js(options = {})
         "[" + @val.collect{|x| x.to_s}.join(",") + "]"
       end
+
+      def left_hand_side_exp?
+        true
+      end
+
       def to_ecma262_boolean
         true
       end
@@ -693,18 +752,6 @@ module Minjs
         @val = val
       end
 
-#=>Ctype
-#      def idname?(name)
-#        return false if name.length == 0
-#        s = name.codepoints
-#        return false unless identifier_start?(s[0])
-#        s.unshift
-#        s.each do |code|
-#          return false unless identifier_part?(code)
-#        end
-#        return true
-#      end
-
       def deep_dup
         self.class.new(@val.collect{|x, y| [x.deep_dup, y ? y.deep_dup : y]})
       end
@@ -722,38 +769,32 @@ module Minjs
       end
 
       def to_js(options = {})
-        "{" + @val.collect{|x, y|
-          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
-            if x.kind_of? ECMA262Numeric
-              a = "#{x.to_ecma262_string}"
-              t = a
-            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(",") + "}"
+        concat(options, "{" + @val.collect{|x, y|
+                 if y.kind_of? StFunc and (y.getter? || y.setter?)
+                   if y.name.val == :get
+                     t = concat options, "get", x.val, "()", "{", y.statements, "}"
+                   else
+                     t = concat options, "set", x.val, "(", y.args[0], ")", "{", y.statements, "}"
+                   end
+                 else
+                   if x.kind_of? ECMA262Numeric
+                     t = concat options, x.to_ecma262_string, ":", y
+                   elsif idname?(x.val.to_s)
+                     t = concat options, x.val, ":", y
+                   else
+                     t = concat options, x, ":", y
+                   end
+                 end
+               }.join(","), "}")
+      end
+
+      def left_hand_side_exp?
+        true
       end
+
       def to_ecma262_boolean
         true
       end
-#      def ecma262_eval(type)
-#
-#        case type
-#        when :boolean
-#          to_ecma262_boolean
-#        else
-#          nil
-#        end
-#      end
     end
 
     class SingleLineComment < Literal
@@ -780,27 +821,21 @@ module Minjs
 
     class MultiLineComment < Literal
       attr_reader :comment, :has_lf
+      include Ctype
 
-      def initialize(comment, has_lf)
+      def initialize(comment)
         @comment = comment
-        @has_lf = has_lf
       end
 
       def traverse(parent, &block)
       end
 
       def ==(obj)
-        self.class == obj.class and
-          @comment == obj.comment and
-          @has_lf == obj.has_lf
+        self.class == obj.class and @comment == obj.comment
       end
 
       def to_js(options)
-        if lt?
-          "/*#{@comment}*/"
-        else
-          "/*#{@comment}*/"
-        end
+        "/*#{@comment}*/"
       end
 
       def ws?
@@ -808,7 +843,10 @@ module Minjs
       end
 
       def lt?
-        @has_lf ? true : false
+        @comment.codepoints.each{|char|
+          return true if line_terminator?(char)
+        }
+        false
       end
     end
 
@@ -824,7 +862,11 @@ module Minjs
       end
 
       def self.get(context, val)
-        @@sym[val] ||= self.new(context, val)
+        if reserved?(val)
+          @@sym[val] ||= self.new(context, val)
+        else
+          self.new(context, val)
+        end
       end
 
       RESERVED_WORD = Set.new [
@@ -861,6 +903,10 @@ module Minjs
         val.to_s
       end
 
+      def left_hand_side_exp?
+        true
+      end
+
       def binding_env(type = :var)
         return nil if context.nil?
         if type == :var
@@ -907,10 +953,11 @@ module Minjs
     ID_CATCH = IdentifierName.get(nil, :catch)
     ID_FINALLY = IdentifierName.get(nil, :finally)
     ID_DEBUGGER = IdentifierName.get(nil, :debugger)
-    ID_GET = IdentifierName.get(nil, :get)
-    ID_SET = IdentifierName.get(nil, :set)
     ID_CASE = IdentifierName.get(nil, :case)
     ID_DEFAULT = IdentifierName.get(nil, :default)
+    # Note: get and set are not reserved word
+    ID_GET = IdentifierName.get(nil, :get)
+    ID_SET = IdentifierName.get(nil, :set)
 
   end
 end

data/lib/minjs/ecma262/punc.rb

@@ -31,12 +31,16 @@ module Minjs
         val.to_s
       end
 
+      def to_js
+        val.to_s
+      end
+
       def ==(obj)
         self.class == obj.class and self.val == obj.val
       end
     end
     PUNC_CONDIF = Punctuator.get('?')
-    PUNC_CONDELSE = Punctuator.get(':')
+    #PUNC_CONDELSE = Punctuator.get(':')
     PUNC_LET = Punctuator.get('=')
     PUNC_DIVLET = Punctuator.get('/=')
     PUNC_MULLET = Punctuator.get('*=')
@@ -81,7 +85,7 @@ module Minjs
     PUNC_LCURLYBRAC = Punctuator.get('{')
     PUNC_RCURLYBRAC = Punctuator.get('}')
     PUNC_COMMA = Punctuator.get(',')
-    PUNC_COLON = Punctuator.get(':')
+    PUNC_COLON = Punctuator.get(':') #= same as PUNC_CONDELSE
     PUNC_SEMICOLON = Punctuator.get(';')
     PUNC_PERIOD = Punctuator.get('.')
   end

data/lib/minjs/ecma262/st.rb

@@ -1237,8 +1237,8 @@ module Minjs
     end
 
     #
-    # 13 function / function expression
-    #
+    # 13 function declaration
+    # 13 function expression
     # 11.1.5 getter/setter
     #
     class StFunc < St
@@ -1287,7 +1287,7 @@ module Minjs
       def to_js(options = {})
         _args = @args.collect{|x|x.to_js(options)}.join(",")
         if @getter
-          concat options, :get, @name, '(', _args, ")", "{", @statements, "}"
+          concat options, :get, @name, "()", "{", @statements, "}"
         elsif @setter
           concat options, :set, @name, '(', _args, ")", "{", @statements, "}"
         else
@@ -1295,6 +1295,10 @@ module Minjs
         end
       end
 
+      def left_hand_side_exp?
+        true
+      end
+
       def getter?
         @getter
       end