Update ICU to 54.1 step 1

source/i18n/regeximp.h

 //
-//   Copyright (C) 2002-2012 International Business Machines Corporation
+//   Copyright (C) 2002-2013 International Business Machines Corporation
 //   and others. All rights reserved.
 //
 //   file:  regeximp.h
 //
 //           ICU Regular Expressions,
 //               Definitions of constant values used in the compiled form of
 //               a regular expression pattern.
 //
 
 #ifndef _REGEXIMP_H
 #define _REGEXIMP_H
 
 #include "unicode/utypes.h"
 #include "unicode/uobject.h"
 #include "unicode/uniset.h"
 #include "unicode/utext.h"
 
 #include "cmemory.h"
 #include "ucase.h"
 
 U_NAMESPACE_BEGIN
 
-// For debugging, define REGEX_DEBUG 
+// For debugging, define REGEX_DEBUG
 // To define with configure,
-//   ./runConfigureICU --enable-debug --disable-release Linux CPPFLAGS="-DREGEX_DEBUG"
+//   CPPFLAGS="-DREGEX_DEBUG" ./runConfigureICU --enable-debug --disable-release Linux 
 
-#ifdef REGEX_DEBUG   
+#ifdef REGEX_DEBUG
 //
 //  debugging options.  Enable one or more of the three #defines immediately following
 //
 
 //#define REGEX_SCAN_DEBUG
 #define REGEX_DUMP_DEBUG
 #define REGEX_RUN_DEBUG
 
 //  End of #defines inteded to be directly set.
 
 #include <stdio.h>
 #endif
 
 #ifdef REGEX_SCAN_DEBUG
 #define REGEX_SCAN_DEBUG_PRINTF(a) printf a
 #else
 #define REGEX_SCAN_DEBUG_PRINTF(a)
 #endif
 
-#ifdef REGEX_DUMP_DEBUG
-#define REGEX_DUMP_DEBUG_PRINTF(a) printf a
-#else
-#define REGEX_DUMP_DEBUG_PRINTF(a)
-#endif
-
-#ifdef REGEX_RUN_DEBUG
-#define REGEX_RUN_DEBUG_PRINTF(a) printf a
-#define REGEX_DUMP_DEBUG_PRINTF(a) printf a
-#else
-#define REGEX_RUN_DEBUG_PRINTF(a)
-#endif
-
 
 //
 //  Opcode types     In the compiled form of the regexp, these are the type, or opcodes,
 //                   of the entries.
 //
 enum {
      URX_RESERVED_OP   = 0,    // For multi-operand ops, most non-first words.
      URX_RESERVED_OP_N = 255,  // For multi-operand ops, negative operand values.
      URX_BACKTRACK     = 1,    // Force a backtrack, as if a match test had failed.
      URX_END           = 2,
@@ skipping 175 matching lines @@
         "LOOP_C",              \
         "LOOP_DOT_I",          \
         "BACKSLASH_BU",        \
         "DOLLAR_D",            \
         "DOLLAR_MD"
 
 
 //
 //  Convenience macros for assembling and disassembling a compiled operation.
 //
-int32_t URX_BUILD(int32_t val, int32_t type);
+#define URX_BUILD(type, val) (int32_t)((type << 24) | (val))
 #define URX_TYPE(x)          ((uint32_t)(x) >> 24)
 #define URX_VAL(x)           ((x) & 0xffffff)
 
 
 //
 //  Access to Unicode Sets composite character properties
 //     The sets are accessed by the match engine for things like \w (word boundary)
 //
 enum {
      URX_ISWORD_SET  = 1,
@@ skipping 98 matching lines @@
 //  Case folded UText Iterator helper class.
 //  Wraps a UText, provides a case-folded enumeration over its contents.
 //  Used in implementing case insensitive matching constructs.
 //  Implementation in rematch.cpp
 
 class CaseFoldingUTextIterator: public UMemory {
       public:
         CaseFoldingUTextIterator(UText &text);
         ~CaseFoldingUTextIterator();
 
-        UChar32 next();           // Next case folded character 
+        UChar32 next();           // Next case folded character
 
-        UBool   inExpansion();    // True if last char returned from next() and the 
+        UBool   inExpansion();    // True if last char returned from next() and the
                                   //  next to be returned both originated from a string
                                   //  folding of the same code point from the orignal UText.
       private:
         UText             &fUText;
         const  UCaseProps *fcsp;
         const  UChar      *fFoldChars;
         int32_t            fFoldLength;
         int32_t            fFoldIndex;
 
 };
 
 
 // Case folded UChar * string iterator.
 //  Wraps a UChar  *, provides a case-folded enumeration over its contents.
 //  Used in implementing case insensitive matching constructs.
 //  Implementation in rematch.cpp
 
 class CaseFoldingUCharIterator: public UMemory {
       public:
         CaseFoldingUCharIterator(const UChar *chars, int64_t start, int64_t limit);
         ~CaseFoldingUCharIterator();
 
-        UChar32 next();           // Next case folded character 
+        UChar32 next();           // Next case folded character
 
-        UBool   inExpansion();    // True if last char returned from next() and the 
+        UBool   inExpansion();    // True if last char returned from next() and the
                                   //  next to be returned both originated from a string
                                   //  folding of the same code point from the orignal UText.
 
         int64_t  getIndex();      // Return the current input buffer index.
 
       private:
         const  UChar      *fChars;
         int64_t            fIndex;
         int64_t            fLimit;
         const  UCaseProps *fcsp;
         const  UChar      *fFoldChars;
         int32_t            fFoldLength;
         int32_t            fFoldIndex;
 
 };
 
 U_NAMESPACE_END
 #endif