minjs 0.1.2 → 0.1.3

data/lib/minjs/lex.rb

@@ -115,7 +115,7 @@ module Minjs
         lf = false
         while (@codes[@pos] != 0x2a or @codes[@pos + 1] != 0x2f)
           if @codes[@pos].nil?
-            raise ParseError.new("no `*/' at end of comment")
+            raise ParseError.new("no `*/' at end of comment", self)
           end
           if line_terminator?(@codes[@pos])
             lf = true
@@ -159,21 +159,44 @@ module Minjs
       ret
     end
 
+    def unicode_escape?
+      if @codes[@pos] == 0x5c and
+         @codes[@pos+1] == 0x75 and
+         hex_number?(@codes[@pos+2]) and
+         hex_number?(@codes[@pos+3]) and
+         hex_number?(@codes[@pos+4]) and
+         hex_number?(@codes[@pos+5])
+        [@codes[@pos+2],@codes[@pos+3],@codes[@pos+4],@codes[@pos+5]].pack("U*").to_i(16)
+      else
+        false
+      end
+    end
+
     def identifier_name
       pos0 = @pos
-      code = @codes[@pos]
-      return nil if code.nil?
-      if identifier_start?(code)
-        while true
+      return nil if @codes[@pos].nil?
+
+      chars = []
+      if u=unicode_escape? and identifier_start?(u)
+        chars.push(u)
+        @pos += 6
+      elsif identifier_start?(@codes[@pos])
+        chars.push(@codes[@pos])
+        @pos += 1
+      else
+        return nil
+      end
+
+      while true
+        code = @codes[@pos]
+        if u=unicode_escape? and (identifier_start?(u) || identifier_part?(u))
+          chars.push(u)
+          @pos += 6
+        elsif identifier_part?(@codes[@pos])
+          chars.push(@codes[@pos])
           @pos += 1
-          code = @codes[@pos]
-          if code.nil?
-            break
-          elsif identifier_part?(code)
-            ;#
-          else
-            return ECMA262::IdentifierName.new(nil, @codes[pos0...@pos].pack("U*").to_sym)
-          end
+        else
+          return ECMA262::IdentifierName.new(nil, chars.pack("U*").to_sym)
         end
       end
     end
@@ -359,22 +382,22 @@ module Minjs
 
     def regexp_body
       if @codes[@pos] == 0x2a
-        raise ParseError.new("first character of regular expression is `*'")
+        raise ParseError.new("first character of regular expression is `*'", self)
       end
       pos0 = @pos
       @pos += 1
       while !(@codes[@pos] == 0x2f)
         if @codes[@pos].nil?
-          raise ParseError.new("no `/' end of regular expression")
+          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")
+          raise ParseError.new("regular expression has line terminator in body", self)
         end
         if @codes[@pos] == 0x5c # \
           @pos += 1
           if line_terminator?(@codes[@pos])
-            raise ParseError.new("regular expression has line terminator in body")
+            raise ParseError.new("regular expression has line terminator in body", self)
           end
           @pos += 1
         elsif @codes[@pos] == 0x5b # [
@@ -389,20 +412,20 @@ module Minjs
 
     def regexp_class
       if @codes[@pos] != 0x5b
-        raise ParseError.new('bad regular expression')
+        raise ParseError.new('bad regular expression', self)
       end
       @pos += 1
       while !(@codes[@pos] == 0x5d)
         if @codes[@pos].nil?
-          raise ParseError.new("no `]' end of regular expression class")
+          raise ParseError.new("no `]' end of regular expression class", self)
         end
         if line_terminator?(@codes[@pos])
-          raise ParseError.new("regular expression has line terminator in body")
+          raise ParseError.new("regular expression has line terminator in body", self)
         end
         if @codes[@pos] == 0x5c # \
           @pos += 1
           if line_terminator?(@codes[@pos])
-            raise ParseError.new("regular expression has line terminator in body")
+            raise ParseError.new("regular expression has line terminator in body", self)
           end
           @pos += 1
         else
@@ -437,9 +460,11 @@ module Minjs
         while true
           code = @codes[@pos]
           if (code >= 0x30 and code <= 0x39) || (code >= 0x41 and code <= 0x4f) || (code >= 0x61 and code <= 0x6f)
+            ;
+          elsif identifier_start?(code)
+            raise ParseError.new("The source character immediately following a NumericLiteral must not be an IdentifierStart or DecimalDigit", self)
           else
-            raw = @codes[pos0...@pos].pack("U*")
-            return ECMA262::ECMA262Numeric.new(raw, @codes[(pos0+2)...@pos].pack("U*").to_i(16))
+            return ECMA262::ECMA262Numeric.new(@codes[(pos0+2)...@pos].pack("U*").to_i(16))
           end
           @pos += 1
         end
@@ -462,27 +487,34 @@ module Minjs
           @pos += 1
           e = exp_part
         end
-        raw = @codes[pos0...@pos].pack("U*")
-        return ECMA262::ECMA262Numeric.new(raw, 0, f, e)
-      else
-        nil
+        if identifier_start?(@codes[@pos])
+          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)
       end
+
       if code >= 0x30 and code <= 0x39
         i = decimal_digits
-        if @codes[@pos] == 0x2e
+        if @codes[@pos] == 0x2e #.
           @pos += 1
           f = decimal_digits
-          if @codes[@pos] == 0x65 || @codes[@pos] == 0x45
+          if @codes[@pos] == 0x65 || @codes[@pos] == 0x45 #e or E
             @pos += 1
             e = exp_part
           end
-        elsif @codes[@pos] == 0x65 || @codes[@pos] == 0x45
+        elsif @codes[@pos] == 0x65 || @codes[@pos] == 0x45 #e or E
           @pos += 1
           e = exp_part
         end
-        raw = @codes[pos0...@pos].pack("U*")
-        return ECMA262::ECMA262Numeric.new(raw, i, f, e)
+        if identifier_start?(@codes[@pos])
+          raise ParseError.new("The source character immediately following a NumericLiteral must not be an IdentifierStart or DecimalDigit", self)
+        end
+
+        return ECMA262::ECMA262Numeric.new(i, f, e)
       end
+
+      nil
     end
 
     def exp_part
@@ -493,7 +525,7 @@ module Minjs
         neg = true
       end
       if neg
-        e = -decimal_digits
+        e = "-#{decimal_digits}"
       else
         e = decimal_digits
       end
@@ -510,7 +542,7 @@ module Minjs
           if code >= 0x30 and code <= 0x39
             @pos += 1
           else
-            return @codes[pos0...@pos].pack("U*").to_i
+            return @codes[pos0...@pos].pack("U*")
           end
         end
       else
@@ -536,9 +568,9 @@ module Minjs
         @pos += 1
         code = @codes[@pos]
         if code.nil?
-          raise ParseError.new("no `#{term}' at end of string")
+          raise ParseError.new("no `#{term}' at end of string", self)
         elsif line_terminator?(code)
-          raise ParseError.new("string has line terminator in body")
+          raise ParseError.new("string has line terminator in body", self)
         elsif code == 0x5c #\
           @pos += 1
           str << esc_string
@@ -741,5 +773,22 @@ module Minjs
         end
       end
     end
+
+    def line_col(pos)
+      _pos = 0
+      row = 0
+      col = 1
+      @codes.each do |code|
+        break if _pos >= pos
+        if line_terminator?(code)
+          row += 1
+          row = 0
+        else
+          col += 1
+        end
+        _pos += 1
+      end
+      return [row+1, col]
+    end
   end
 end

data/lib/minjs/program.rb

@@ -9,10 +9,6 @@ module Minjs
         t = source_element(lex, context)
         if t
           prog.push(t)
-#        elsif !options[:no_exception]
-#          lex.debug_lit
-#          raise 'error'
-#          return nil
         else
           break
         end

data/lib/minjs/statement.rb

@@ -68,14 +68,7 @@ module Minjs
         if s = statement_list(lex, context) and lex.match_lit(ECMA262::PUNC_RCURLYBRAC)
           ECMA262::StBlock.new(s)
         else
-          if s
-            lex.debug_lit
-            puts lex.debug_code(pos0, lex.pos)
-            raise 'no "}" end of block'
-          else
-            lex.debug_lit
-            raise "bad block"
-          end
+          raise ParseError.new('no "}" end of block', lex)
         end
       }
     end
@@ -98,7 +91,7 @@ module Minjs
     # variable_statement
     #
     def var_statement(lex, context)
-      raise 'error' if context.nil?
+      raise 'internal error' if context.nil?
       return nil unless lex.match_lit(ECMA262::ID_VAR)
       lex.eval_lit {
         if vl = var_decl_list(lex, context, {}) and semicolon(lex, context)
@@ -111,7 +104,7 @@ module Minjs
           ECMA262::StVar.new(context, vl)
         else
           lex.debug_lit
-          raise Minjs::ParseError.new("var_statement")
+          raise Minjs::ParseError.new("var_statement", lex)
         end
       }
     end
@@ -185,9 +178,10 @@ module Minjs
     #12.5
     #
     def if_statement(lex, context)
+      return nil unless lex.match_lit(ECMA262::ID_IF)
       lex.eval_lit {
-        unless lex.match_lit(ECMA262::ID_IF) and lex.match_lit(ECMA262::PUNC_LPARENTHESIS) and cond=exp(lex, context, {}) and lex.match_lit(ECMA262::PUNC_RPARENTHESIS) and s=statement(lex, context)
-          next nil
+        unless lex.match_lit(ECMA262::PUNC_LPARENTHESIS) and cond=exp(lex, context, {}) and lex.match_lit(ECMA262::PUNC_RPARENTHESIS) and s=statement(lex, context)
+          raise ParseError.new("bad statement", lex)
         end
         if lex.match_lit(ECMA262::ID_ELSE) and e=statement(lex, context)
           ECMA262::StIf.new(cond, s, e)
@@ -209,7 +203,7 @@ module Minjs
         ECMA262::StWhile.new(e, s)
       else
         lex.debug_lit
-        raise ParseError.new("while_statement")
+        raise ParseError.new("while_statement", lex)
       end
     end
 
@@ -219,7 +213,7 @@ module Minjs
         ECMA262::StDoWhile.new(e, s)
       else
         lex.debug_lit
-        raise ParseError.new("do_while_statement")
+        raise ParseError.new("do_while_statement", lex)
       end
     end
 
@@ -324,7 +318,7 @@ module Minjs
           ECMA262::StWith.new(e, s)
         else
           lex.debug_lit
-          raise ParseError.new("switch_statement")
+          raise ParseError.new("switch_statement", lex)
         end
       }
     end
@@ -338,7 +332,7 @@ module Minjs
           ECMA262::StSwitch.new(e, c)
         else
           lex.debug_lit
-          raise ParseError.new("switch_statement")
+          raise ParseError.new("switch_statement", lex)
         end
       }
     end
@@ -384,7 +378,7 @@ module Minjs
           ECMA262::StThrow.new(e)
         else
           lex.debug_lit
-          raise ParseError.new("throw_statement")
+          raise ParseError.new("throw_statement", lex)
         end
       }
     end

data/lib/minjs/version.rb

@@ -1,3 +1,3 @@
 module Minjs
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minjs
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Issei Numata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler