iv-phonic 0.1.7 → 0.1.8

data/Manifest.txt

@@ -4,73 +4,73 @@ README.rdoc
 Rakefile
 lib/iv/phonic/ast.rb
 test/test_iv_phonic.rb
-ext/include/iv/ast_factory.h
-ext/include/iv/uchar.h
-ext/include/iv/space.h
-ext/include/iv/lexer.h
-ext/include/iv/conversions.h
-ext/include/iv/dtoa.h
+ext/include/iv/chars.h
+ext/include/iv/fixedcontainer.h
+ext/include/iv/ast_visitor.h
+ext/include/iv/location.h
+ext/include/iv/ast_serializer.h
+ext/include/iv/ustringpiece.h
 ext/include/iv/mt19937.h
-ext/include/iv/byteorder.h
 ext/include/iv/about.h
-ext/include/iv/ast.h
-ext/include/iv/noncopyable.h
+ext/include/iv/ast_info.h
 ext/include/iv/stringpiece.h
-ext/include/iv/static_assert.h
+ext/include/iv/cmdline.h
+ext/include/iv/ustring.h
+ext/include/iv/token.h
 ext/include/iv/functor.h
-ext/include/iv/ast_fwd.h
+ext/include/iv/keyword.h
+ext/include/iv/lexer.h
 ext/include/iv/parser.h
-ext/include/iv/errors.h
-ext/include/iv/token.h
-ext/include/iv/enable_if.h
 ext/include/iv/any.h
-ext/include/iv/keyword.h
-ext/include/iv/cmdline.h
-ext/include/iv/xorshift.h
-ext/include/iv/location.h
-ext/include/iv/ast_info.h
-ext/include/iv/none.h
-ext/include/iv/ustring.h
-ext/include/iv/ast_serializer.h
-ext/include/iv/utils.h
-ext/include/iv/ast_visitor.h
 ext/include/iv/alloc.h
-ext/include/iv/chars.h
-ext/include/iv/fixedcontainer.h
+ext/include/iv/space.h
+ext/include/iv/dtoa.h
+ext/include/iv/static_assert.h
+ext/include/iv/conversions.h
+ext/include/iv/ast_fwd.h
+ext/include/iv/ast_factory.h
+ext/include/iv/enable_if.h
+ext/include/iv/unicode.h
+ext/include/iv/noncopyable.h
+ext/include/iv/uchar.h
 ext/include/iv/maybe.h
-ext/include/iv/ustringpiece.h
 ext/include/iv/character.h
-ext/include/iv/ucdata.h
+ext/include/iv/ast.h
+ext/include/iv/byteorder.h
+ext/include/iv/none.h
+ext/include/iv/platform.h
+ext/include/iv/utils.h
+ext/include/iv/errors.h
 ext/iv/phonic/third_party/netlib_dtoa/SConscript
 ext/iv/phonic/third_party/netlib_dtoa/netlib_dtoa.c
 ext/iv/phonic/third_party/netlib_dtoa/netlib_dtoa_config.h
-ext/iv/phonic/third_party/v8_dtoa/fast-dtoa.cc
-ext/iv/phonic/third_party/v8_dtoa/conversions.h
-ext/iv/phonic/third_party/v8_dtoa/dtoa.h
-ext/iv/phonic/third_party/v8_dtoa/globals.h
-ext/iv/phonic/third_party/v8_dtoa/checks.cc
-ext/iv/phonic/third_party/v8_dtoa/platform.h
+ext/iv/phonic/third_party/v8_dtoa/diy-fp.cc
 ext/iv/phonic/third_party/v8_dtoa/README
-ext/iv/phonic/third_party/v8_dtoa/v8-dtoa.cc
 ext/iv/phonic/third_party/v8_dtoa/SConscript
-ext/iv/phonic/third_party/v8_dtoa/double.h
 ext/iv/phonic/third_party/v8_dtoa/include-v8.h
-ext/iv/phonic/third_party/v8_dtoa/cached-powers.h
+ext/iv/phonic/third_party/v8_dtoa/diy-fp.h
 ext/iv/phonic/third_party/v8_dtoa/checks.h
+ext/iv/phonic/third_party/v8_dtoa/fast-dtoa.h
+ext/iv/phonic/third_party/v8_dtoa/powers-ten.h
 ext/iv/phonic/third_party/v8_dtoa/conversions.cc
 ext/iv/phonic/third_party/v8_dtoa/utils.cc
-ext/iv/phonic/third_party/v8_dtoa/diy-fp.h
-ext/iv/phonic/third_party/v8_dtoa/utils.h
-ext/iv/phonic/third_party/v8_dtoa/powers-ten.h
+ext/iv/phonic/third_party/v8_dtoa/v8-dtoa.cc
 ext/iv/phonic/third_party/v8_dtoa/platform.cc
+ext/iv/phonic/third_party/v8_dtoa/globals.h
+ext/iv/phonic/third_party/v8_dtoa/checks.cc
+ext/iv/phonic/third_party/v8_dtoa/dtoa.h
+ext/iv/phonic/third_party/v8_dtoa/conversions.h
 ext/iv/phonic/third_party/v8_dtoa/v8.h
-ext/iv/phonic/third_party/v8_dtoa/diy-fp.cc
-ext/iv/phonic/third_party/v8_dtoa/fast-dtoa.h
-ext/iv/phonic/factory.h
-ext/iv/phonic/ast_fwd.h
-ext/iv/phonic/parser.h
+ext/iv/phonic/third_party/v8_dtoa/cached-powers.h
+ext/iv/phonic/third_party/v8_dtoa/double.h
+ext/iv/phonic/third_party/v8_dtoa/fast-dtoa.cc
+ext/iv/phonic/third_party/v8_dtoa/platform.h
+ext/iv/phonic/third_party/v8_dtoa/utils.h
 ext/iv/phonic/encoding.h
-ext/iv/phonic/source.h
 ext/iv/phonic/phonic.cc
+ext/iv/phonic/source.h
 ext/iv/phonic/creator.h
-ext/iv/phonic/extconf.rb
+ext/iv/phonic/parser.h
+ext/iv/phonic/factory.h
+ext/iv/phonic/extconf.rb
+ext/iv/phonic/ast_fwd.h

data/Rakefile

@@ -6,7 +6,7 @@ require 'hoe'
 require 'pp'
 $root = File.dirname(__FILE__)
 $name = 'iv-phonic'
-$version = '0.1.7'
+$version = '0.1.8'
 
 directory "ext/include/iv"
 

data/ext/include/iv/ast.h

@@ -929,23 +929,6 @@ class StringLiteral : public StringLiteralBase<Factory> {
   value_type value_;
 };
 
-// Directivable
-template<typename Factory>
-class Inherit<Factory, kDirectivable>
-  : public StringLiteral<Factory> {
-};
-INHERIT(Directivable);
-
-template<typename Factory>
-class Directivable : public DirectivableBase<Factory> {
- public:
-  explicit Directivable(const std::vector<uc16>& buffer,
-                        Factory* factory) {
-    InitializeStringLiteral(buffer, factory);
-  }
-  DECLARE_NODE_TYPE(Directivable)
-};
-
 // NumberLiteral
 template<typename Factory>
 class Inherit<Factory, kNumberLiteral>

data/ext/include/iv/ast_factory.h

@@ -71,12 +71,6 @@ class BasicAstFactory {
         StringLiteral(buffer, static_cast<Factory*>(this));
   }
 
-  Directivable* NewDirectivable(const std::vector<uc16>& buffer,
-                                std::size_t begin, std::size_t end) {
-    return new (static_cast<Factory*>(this))
-        Directivable(buffer, static_cast<Factory*>(this));
-  }
-
   RegExpLiteral* NewRegExpLiteral(const std::vector<uc16>& content,
                                   const std::vector<uc16>& flags,
                                   std::size_t begin,

data/ext/include/iv/ast_fwd.h

@@ -39,7 +39,6 @@ V(Literal)\
 V(Identifier)\
 V(NumberLiteral)\
 V(StringLiteral)\
-V(Directivable)\
 V(RegExpLiteral)\
 V(FunctionLiteral)\
 V(ArrayLiteral)\

data/ext/include/iv/ast_serializer.h

@@ -556,21 +556,21 @@ class AstSerializer: public AstVisitor<Factory>::const_type {
           if (val < 0x20) {
             if (val < 0x10) {
               Append("\\u000");
-              std::snprintf(buf, sizeof(buf), "%x", val);
+              snprintf(buf, sizeof(buf), "%x", val);
               Append(buf);
             } else if (0x10 <= val && val < 0x20) {
               Append("\\u00");
-              std::snprintf(buf, sizeof(buf), "%x", val);
+              snprintf(buf, sizeof(buf), "%x", val);
               Append(buf);
             }
           } else if (0x80 <= val) {
             if (0x80 <= val && val < 0x1000) {
               Append("\\u0");
-              std::snprintf(buf, sizeof(buf), "%x", val);
+              snprintf(buf, sizeof(buf), "%x", val);
               Append(buf);
             } else if (0x1000 <= val) {
               Append("\\u");
-              std::snprintf(buf, sizeof(buf), "%x", val);
+              snprintf(buf, sizeof(buf), "%x", val);
               Append(buf);
             }
           } else {

data/ext/include/iv/conversions.h

@@ -239,7 +239,7 @@ inline double StringToDouble(Iter it, Iter last, bool parse_float) {
     if (exponent > 9999) {
       exponent = 9999;
     }
-    std::snprintf(buffer.data()+pos, 5, "%d", exponent);  // NOLINT
+    snprintf(buffer.data()+pos, 5, "%d", exponent);  // NOLINT
     pos+=4;
   }
 

data/ext/include/iv/lexer.h

@@ -467,7 +467,6 @@ class Lexer: private Noncopyable<Lexer<Source> >::type {
 
   bool ScanRegExpFlags() {
     buffer16_.clear();
-    uc16 uc;
     while (Chars::IsIdentifierPart(c_)) {
       if (c_ == '\\') {
         Advance();
@@ -476,7 +475,7 @@ class Lexer: private Noncopyable<Lexer<Source> >::type {
         }
         Advance();
         bool ng = false;
-        uc = ScanHexEscape('u', 4, &ng);
+        const uc16 uc = ScanHexEscape('u', 4, &ng);
         if (ng || uc == '\\') {
           return false;
         }
@@ -614,8 +613,6 @@ class Lexer: private Noncopyable<Lexer<Source> >::type {
 
   template<typename LexType>
   Token::Type ScanIdentifier(bool strict) {
-    uc16 uc;
-
     buffer16_.clear();
 
     if (c_ == '\\') {
@@ -625,7 +622,7 @@ class Lexer: private Noncopyable<Lexer<Source> >::type {
       }
       Advance();
       bool ng = false;
-      uc = ScanHexEscape('u', 4, &ng);
+      const uc16 uc = ScanHexEscape('u', 4, &ng);
       if (ng || uc == '\\' || !Chars::IsIdentifierStart(uc)) {
         return Token::ILLEGAL;
       }
@@ -642,7 +639,7 @@ class Lexer: private Noncopyable<Lexer<Source> >::type {
         }
         Advance();
         bool ng = false;
-        uc = ScanHexEscape('u', 4, &ng);
+        const uc16 uc = ScanHexEscape('u', 4, &ng);
         if (ng || uc == '\\' || !Chars::IsIdentifierPart(uc)) {
           return Token::ILLEGAL;
         }
@@ -695,26 +692,32 @@ class Lexer: private Noncopyable<Lexer<Source> >::type {
       case '\\':
         Record16Advance();
         break;
+
       case 'b' :
         Record16('\b');
         Advance();
         break;
+
       case 'f' :
         Record16('\f');
         Advance();
         break;
+
       case 'n' :
         Record16('\n');
         Advance();
         break;
+
       case 'r' :
         Record16('\r');
         Advance();
         break;
+
       case 't' :
         Record16('\t');
         Advance();
         break;
+
       case 'u' : {
         Advance();
         bool ng = false;
@@ -725,10 +728,12 @@ class Lexer: private Noncopyable<Lexer<Source> >::type {
         Record16(uc);
         break;
       }
+
       case 'v' :
         Record16('\v');
         Advance();
         break;
+
       case 'x' : {
         Advance();
         bool ng = false;
@@ -739,7 +744,15 @@ class Lexer: private Noncopyable<Lexer<Source> >::type {
         Record16(uc);
         break;
       }
-      case '0' :
+
+      case '0' : {
+        if (type_ != OCTAL) {
+          type_ = OCTAL;
+        }
+        Record16(ScanOctalEscape());
+        break;
+      }
+
       case '1' :
       case '2' :
       case '3' :

data/ext/include/iv/parser.h

@@ -293,33 +293,66 @@ class Parser
                            Statements* body,
                            bool *res) {
     Statement* stmt;
-    bool recognize_directive = true;
     const StrictSwitcher strict_switcher(this);
+
+    // directive prologue
+    {
+      bool octal_escaped_directive_found = false;
+      std::size_t line;
+      while (token_ != end) {
+        if (token_ != Token::STRING) {
+          // this is not directive
+          break;
+        }
+        const typename lexer_type::State state = lexer_.StringEscapeType();
+        if (!octal_escaped_directive_found &&
+            state == lexer_type::OCTAL) {
+            // octal escaped string literal
+            octal_escaped_directive_found = true;
+            line = lexer_.line_number();
+        }
+        stmt = ParseStatement(CHECK);
+        body->push_back(stmt);
+        if (stmt->AsExpressionStatement() &&
+            stmt->AsExpressionStatement()->expr()->AsStringLiteral()) {
+          Expression* const expr = stmt->AsExpressionStatement()->expr();
+          // expression is directive
+          if (!strict_switcher.IsStrict() &&
+              state == lexer_type::NONE &&
+              expr->AsStringLiteral()->value().compare(
+                  ParserData::kUseStrict.data()) == 0) {
+            strict_switcher.SwitchStrictMode();
+            if (octal_escaped_directive_found) {
+              RAISE_WITH_NUMBER(
+                  "octal excape sequence not allowed in strict code",
+                  line);
+            }
+            // and one token lexed is not in strict
+            // so rescan
+            if (token_ == Token::IDENTIFIER) {
+              typedef detail::Keyword<IdentifyReservedWords> KeywordChecker;
+              token_ =  KeywordChecker::Detect(lexer_.Buffer(), true);
+              break;
+            }
+          } else {
+            // other directive
+          }
+        } else {
+          // not directive, like
+          // "String", "Comma"
+          break;
+        }
+      }
+    }
+
+    // statements
     while (token_ != end) {
       if (token_ == Token::FUNCTION) {
         // FunctionDeclaration
         stmt = ParseFunctionDeclaration(CHECK);
         body->push_back(stmt);
-        recognize_directive = false;
       } else {
         stmt = ParseStatement(CHECK);
-        // directive prologue
-        if (recognize_directive) {
-          if (stmt->AsExpressionStatement()) {
-            Expression* const expr = stmt->AsExpressionStatement()->expr();
-            if (expr->AsDirectivable()) {
-              // expression is directive
-              if (expr->AsStringLiteral()->value().compare(
-                      ParserData::kUseStrict.data()) == 0) {
-                strict_switcher.SwitchStrictMode();
-              }
-            } else {
-              recognize_directive = false;
-            }
-          } else {
-            recognize_directive = false;
-          }
-        }
         body->push_back(stmt);
       }
     }
@@ -1753,15 +1786,9 @@ class Parser
         if (strict_ && state == lexer_type::OCTAL) {
           RAISE("octal excape sequence not allowed in strict code");
         }
-        if (state == lexer_type::NONE) {
-          result = factory_->NewDirectivable(lexer_.Buffer(),
-                                             lexer_.begin_position(),
-                                             lexer_.end_position());
-        } else {
-          result = factory_->NewStringLiteral(lexer_.Buffer(),
-                                              lexer_.begin_position(),
-                                              lexer_.end_position());
-        }
+        result = factory_->NewStringLiteral(lexer_.Buffer(),
+                                            lexer_.begin_position(),
+                                            lexer_.end_position());
         Next();
         break;
       }
@@ -2336,9 +2363,9 @@ class Parser
   void SetErrorHeader(std::size_t line) {
     std::tr1::array<char, 40> buf;
     error_.append(lexer_.filename());
-    const int num = std::snprintf(buf.data(), buf.size(),
-                                  ":%lu: SyntaxError: ",
-                                  static_cast<unsigned long>(line));  // NOLINT
+    const int num = snprintf(buf.data(), buf.size(),
+                             ":%lu: SyntaxError: ",
+                             static_cast<unsigned long>(line));  // NOLINT
     error_.append(buf.data(), num);
   }
 

data/ext/include/iv/platform.h

@@ -0,0 +1,18 @@
+#ifndef _IV_PLATFORM_H_
+#define _IV_PLATFORM_H_
+
+#if defined(WIN32) || defined(WIN64)
+#ifndef OS_WIN
+#define OS_WIN 1
+#endif  // OS_WIN
+#elif defined(__APPLE__) || defined(__darwin__)
+#ifndef OS_MACOSX
+#define OS_MACOSX 1
+#endif  // OS_MACOSX
+#elif defined(__linux__)
+#ifndef OS_LINUX
+#define OS_LINUX 1
+#endif  // OS_LINUX
+#endif
+
+#endif  // _IV_PLATFORM_H_