Merge (7265, 7271] from bleeding_edge to experimental/gc branch....

src/scanner-base.h

 // Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 101 matching lines @@
   // are more characters available, return true.
   virtual bool ReadBlock() = 0;
   virtual unsigned SlowSeekForward(unsigned character_count) = 0;
 
   const uc16* buffer_cursor_;
   const uc16* buffer_end_;
   unsigned pos_;
 };
 
 
+class ScannerConstants {
 // ---------------------------------------------------------------------
 // Constants used by scanners.
-
-class ScannerConstants : AllStatic {
  public:
   typedef unibrow::Utf8InputBuffer<1024> Utf8Decoder;
 
-  static StaticResource<Utf8Decoder>* utf8_decoder() {
+  StaticResource<Utf8Decoder>* utf8_decoder() {
     return &utf8_decoder_;
   }
 
-  static unibrow::Predicate<IdentifierStart, 128> kIsIdentifierStart;
-  static unibrow::Predicate<IdentifierPart, 128> kIsIdentifierPart;
-  static unibrow::Predicate<unibrow::LineTerminator, 128> kIsLineTerminator;
-  static unibrow::Predicate<unibrow::WhiteSpace, 128> kIsWhiteSpace;
+  bool IsIdentifierStart(unibrow::uchar c) { return kIsIdentifierStart.get(c); }
+  bool IsIdentifierPart(unibrow::uchar c) { return kIsIdentifierPart.get(c); }
+  bool IsLineTerminator(unibrow::uchar c) { return kIsLineTerminator.get(c); }
+  bool IsWhiteSpace(unibrow::uchar c) { return kIsWhiteSpace.get(c); }
 
-  static bool IsIdentifier(unibrow::CharacterStream* buffer);
+  bool IsIdentifier(unibrow::CharacterStream* buffer);
 
  private:
-  static StaticResource<Utf8Decoder> utf8_decoder_;
+  ScannerConstants() {}
+
+  unibrow::Predicate<IdentifierStart, 128> kIsIdentifierStart;
+  unibrow::Predicate<IdentifierPart, 128> kIsIdentifierPart;
+  unibrow::Predicate<unibrow::LineTerminator, 128> kIsLineTerminator;
+  unibrow::Predicate<unibrow::WhiteSpace, 128> kIsWhiteSpace;
+  StaticResource<Utf8Decoder> utf8_decoder_;
+
+  friend class Isolate;
+  DISALLOW_COPY_AND_ASSIGN(ScannerConstants);
 };
 
 // ----------------------------------------------------------------------------
 // LiteralBuffer -  Collector of chars of literals.
 
 class LiteralBuffer {
  public:
   LiteralBuffer() : is_ascii_(true), position_(0), backing_store_() { }
 
   ~LiteralBuffer() {
@@ skipping 79 matching lines @@
       backing_store_.Dispose();
       backing_store_ = new_store;
     }
     position_ = new_content_size;
     is_ascii_ = false;
   }
 
   bool is_ascii_;
   int position_;
   Vector<byte> backing_store_;
+
+  DISALLOW_COPY_AND_ASSIGN(LiteralBuffer);
 };
 
 
 // ----------------------------------------------------------------------------
 // Scanner base-class.
 
 // Generic functionality used by both JSON and JavaScript scanners.
 class Scanner {
  public:
   // -1 is outside of the range of any real source code.
   static const int kNoOctalLocation = -1;
 
   typedef unibrow::Utf8InputBuffer<1024> Utf8Decoder;
 
   class LiteralScope {
    public:
     explicit LiteralScope(Scanner* self);
     ~LiteralScope();
     void Complete();
 
    private:
     Scanner* scanner_;
     bool complete_;
   };
 
-  Scanner();
+  explicit Scanner(Isolate* isolate);
 
   // Returns the current token again.
   Token::Value current_token() { return current_.token; }
 
   // One token look-ahead (past the token returned by Next()).
   Token::Value peek() const { return next_.token; }
 
   struct Location {
     Location(int b, int e) : beg_pos(b), end_pos(e) { }
     Location() : beg_pos(0), end_pos(0) { }
@@ skipping 134 matching lines @@
   uc32 ScanHexEscape(uc32 c, int length);
 
   // Scans octal escape sequence. Also accepts "\0" decimal escape sequence.
   uc32 ScanOctalEscape(uc32 c, int length);
 
   // Return the current source position.
   int source_pos() {
     return source_->pos() - kCharacterLookaheadBufferSize;
   }
 
+  ScannerConstants* scanner_constants_;
+
   // Buffers collecting literal strings, numbers, etc.
   LiteralBuffer literal_buffer1_;
   LiteralBuffer literal_buffer2_;
 
   TokenDesc current_;  // desc for current token (as returned by Next())
   TokenDesc next_;     // desc for next token (one token look-ahead)
 
   // Input stream. Must be initialized to an UC16CharacterStream.
   UC16CharacterStream* source_;
 
@@ skipping 24 matching lines @@
     void Complete() {
       scanner_->TerminateLiteral();
       complete_ = true;
     }
 
    private:
     JavaScriptScanner* scanner_;
     bool complete_;
   };
 
-  JavaScriptScanner();
+  explicit JavaScriptScanner(Isolate* isolate);
 
   // Returns the next token.
   Token::Value Next();
 
   // Returns true if there was a line terminator before the peek'ed token.
   bool has_line_terminator_before_next() const {
     return has_line_terminator_before_next_;
   }
 
   // Scans the input as a regular expression pattern, previous
@@ skipping 168 matching lines @@
   // keyword with the current prefix).
   const char* keyword_;
   int counter_;
   Token::Value keyword_token_;
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_SCANNER_BASE_H_