Merge regexp2000 back into bleeding_edge

src/unicode.h

 // Copyright 2007-2008 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 26 matching lines @@
 
 namespace unibrow {
 
 typedef unsigned int uchar;
 typedef unsigned char byte;
 
 /**
  * The max length of the result of converting the case of a single
  * character.
  */
-static const int kMaxCaseConvertedSize = 3;
+static const int kMaxMappingSize = 4;
 
 template <class T, int size = 256>
 class Predicate {
  public:
   inline Predicate() { }
   inline bool get(uchar c);
  private:
   friend class Test;
   bool CalculateValue(uchar c);
   struct CacheEntry {
@@ skipping 15 matching lines @@
 // map differently depending on context are always looked up.
 template <class T, int size = 256>
 class Mapping {
  public:
   inline Mapping() { }
   inline int get(uchar c, uchar n, uchar* result);
  private:
   friend class Test;
   int CalculateValue(uchar c, uchar n, uchar* result);
   struct CacheEntry {
-    inline CacheEntry() : code_point_(0), offset_(0) { }
+    inline CacheEntry() : code_point_(kNoChar), offset_(0) { }
     inline CacheEntry(uchar code_point, signed offset)
       : code_point_(code_point),
         offset_(offset) { }
-    uchar code_point_ : 21;
-    signed offset_ : 11;
+    uchar code_point_;
+    signed offset_;
+    static const int kNoChar = (1 << 21) - 1;
   };
   static const int kSize = size;
   static const int kMask = kSize - 1;
   CacheEntry entries_[kSize];
 };
 
 class UnicodeData {
  private:
   friend class Test;
   static int GetByteCount();
@@ skipping 116 matching lines @@
 };
 struct Lowercase {
   static bool Is(uchar c);
 };
 struct Letter {
   static bool Is(uchar c);
 };
 struct Space {
   static bool Is(uchar c);
 };
-struct Titlecase {
-  static bool Is(uchar c);
-};
 struct Number {
   static bool Is(uchar c);
 };
-struct DecimalDigit {
-  static bool Is(uchar c);
-};
-struct Ideographic {
-  static bool Is(uchar c);
-};
 struct WhiteSpace {
   static bool Is(uchar c);
 };
-struct HexDigit {
-  static bool Is(uchar c);
-};
-struct AsciiHexDigit {
-  static bool Is(uchar c);
-};
-struct BidiControl {
-  static bool Is(uchar c);
-};
-struct JoinControl {
-  static bool Is(uchar c);
-};
-struct Dash {
-  static bool Is(uchar c);
-};
-struct Hyphen {
-  static bool Is(uchar c);
-};
 struct LineTerminator {
   static bool Is(uchar c);
 };
-struct RegExpSpecialChar {
-  static bool Is(uchar c);
-};
 struct CombiningMark {
   static bool Is(uchar c);
 };
 struct ConnectorPunctuation {
   static bool Is(uchar c);
 };
 struct ToLowercase {
+  static const int kMaxWidth = 3;
   static int Convert(uchar c,
                      uchar n,
                      uchar* result,
                      bool* allow_caching_ptr);
 };
 struct ToUppercase {
+  static const int kMaxWidth = 3;
+  static int Convert(uchar c,
+                     uchar n,
+                     uchar* result,
+                     bool* allow_caching_ptr);
+};
+struct Ecma262Canonicalize {
+  static const int kMaxWidth = 1;
+  static int Convert(uchar c,
+                     uchar n,
+                     uchar* result,
+                     bool* allow_caching_ptr);
+};
+struct Ecma262UnCanonicalize {
+  static const int kMaxWidth = 4;
+  static int Convert(uchar c,
+                     uchar n,
+                     uchar* result,
+                     bool* allow_caching_ptr);
+};
+struct CanonicalizationRange {
+  static const int kMaxWidth = 1;
   static int Convert(uchar c,
                      uchar n,
                      uchar* result,
                      bool* allow_caching_ptr);
 };
 
 }  // namespace unibrow
 
 #endif  // __UNIBROW_H__