Cleanup of ScannerConstants, now named UnicodeCache.

src/dateparser.h

 // Copyright 2008 the V8 project authors. All rights reserved.

[Karl Klose, 2011/04/12 07:55:40]

Please update to 2011.

 // 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
 //       with the distribution.
@@ skipping 30 matching lines @@
   // [0]: year
   // [1]: month (0 = Jan, 1 = Feb, ...)
   // [2]: day
   // [3]: hour
   // [4]: minute
   // [5]: second
   // [6]: millisecond
   // [7]: UTC offset in seconds, or null value if no timezone specified
   // If parsing fails, return false (content of output array is not defined).
   template <typename Char>
-  static bool Parse(Vector<Char> str, FixedArray* output);
+  static bool Parse(Vector<Char> str, FixedArray* output, UnicodeCache* cache);
 
   enum {
     YEAR, MONTH, DAY, HOUR, MINUTE, SECOND, MILLISECOND, UTC_OFFSET, OUTPUT_SIZE
   };
 
  private:
   // Range testing
   static inline bool Between(int x, int lo, int hi) {
     return static_cast<unsigned>(x - lo) <= static_cast<unsigned>(hi - lo);
   }
   // Indicates a missing value.
   static const int kNone = kMaxInt;
 
   // InputReader provides basic string parsing and character classification.
   template <typename Char>
   class InputReader BASE_EMBEDDED {
    public:
-    explicit InputReader(Vector<Char> s)
+    explicit InputReader(UnicodeCache* unicode_cache, Vector<Char> s)

[Karl Klose, 2011/04/12 07:55:40]

Explicit is no longer needed here.

[Lasse Reichstein, 2011/04/12 08:18:47]

Removed.

         : index_(0),
           buffer_(s),
           has_read_number_(false),
-          scanner_constants_(Isolate::Current()->scanner_constants()) {
+          unicode_cache_(unicode_cache) {
       Next();
     }
 
     // Advance to the next character of the string.
     void Next() { ch_ = (index_ < buffer_.length()) ? buffer_[index_++] : 0; }
 
     // Read a string of digits as an unsigned number (cap just below kMaxInt).
     int ReadUnsignedNumber() {
       has_read_number_ = true;
       int n;
@@ skipping 30 matching lines @@
     // The skip methods return whether they actually skipped something.
     bool Skip(uint32_t c) {
       if (ch_ == c) {
         Next();
         return true;
       }
       return false;
     }
 
     bool SkipWhiteSpace() {
-      if (scanner_constants_->IsWhiteSpace(ch_)) {
+      if (unicode_cache_->IsWhiteSpace(ch_)) {
         Next();
         return true;
       }
       return false;
     }
 
     bool SkipParentheses() {
       if (ch_ != '(') return false;
       int balance = 0;
       do {
@@ skipping 15 matching lines @@
     int GetAsciiSignValue() const { return 44 - static_cast<int>(ch_); }
 
     // Indicates whether any (possibly empty!) numbers have been read.
     bool HasReadNumber() const { return has_read_number_; }
 
    private:
     int index_;
     Vector<Char> buffer_;
     bool has_read_number_;
     uint32_t ch_;
-    ScannerConstants* scanner_constants_;
+    UnicodeCache* unicode_cache_;
   };
 
   enum KeywordType { INVALID, MONTH_NAME, TIME_ZONE_NAME, AM_PM };
 
   // KeywordTable maps names of months, time zones, am/pm to numbers.
   class KeywordTable : public AllStatic {
    public:
     // Look up a word in the keyword table and return an index.
     // 'pre' contains a prefix of the word, zero-padded to size kPrefixLength
     // and 'len' is the word length.
@@ skipping 84 matching lines @@
     int comp_[kSize];
     int index_;
     int named_month_;
   };
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_DATEPARSER_H_