| Index: source/i18n/regexcmp.h
|
| diff --git a/source/i18n/regexcmp.h b/source/i18n/regexcmp.h
|
| index b17e6bdc12e761dde87b51e8fead4981f2c1cc81..debdf45833ae6a2a1fa4aa547dca24e54d15626a 100644
|
| --- a/source/i18n/regexcmp.h
|
| +++ b/source/i18n/regexcmp.h
|
| @@ -1,7 +1,7 @@
|
| //
|
| // regexcmp.h
|
| //
|
| -// Copyright (C) 2002-2012, International Business Machines Corporation and others.
|
| +// Copyright (C) 2002-2014, International Business Machines Corporation and others.
|
| // All Rights Reserved.
|
| //
|
| // This file contains declarations for the class RegexCompile
|
| @@ -22,6 +22,7 @@
|
| #include "unicode/parseerr.h"
|
| #include "uhash.h"
|
| #include "uvector.h"
|
| +#include "uvectr32.h"
|
|
|
|
|
|
|
| @@ -37,7 +38,7 @@ struct RegexTableEl;
|
| class RegexPattern;
|
|
|
|
|
| -class RegexCompile : public UMemory {
|
| +class U_I18N_API RegexCompile : public UMemory {
|
| public:
|
|
|
| enum {
|
| @@ -103,11 +104,6 @@ private:
|
| void fixLiterals(UBool split=FALSE); // Generate code for pending literal characters.
|
| void insertOp(int32_t where); // Open up a slot for a new op in the
|
| // generated code at the specified location.
|
| - void appendOp(int32_t op); // Append a new op to the compiled pattern.
|
| - int32_t allocateData(int32_t size); // Allocate space in the matcher data area.
|
| - // Return index of the newly allocated data.
|
| - int32_t allocateStackData(int32_t size); // Allocate space in the match back-track stack frame.
|
| - // Return offset index in the frame.
|
| int32_t minMatchLength(int32_t start,
|
| int32_t end);
|
| int32_t maxMatchLength(int32_t start,
|
| @@ -120,6 +116,10 @@ private:
|
| UChar32 scanNamedChar();
|
| UnicodeSet *createSetForProperty(const UnicodeString &propName, UBool negated);
|
|
|
| +public: // Public for testing only.
|
| + static void U_EXPORT2 findCaseInsensitiveStarters(UChar32 c, UnicodeSet *starterChars);
|
| +private:
|
| +
|
|
|
| UErrorCode *fStatus;
|
| RegexPattern *fRXPat;
|
| @@ -187,9 +187,7 @@ private:
|
| int32_t fMatchOpenParen; // The position in the compiled pattern
|
| // of the slot reserved for a state save
|
| // at the start of the most recently processed
|
| - // parenthesized block. Updated when processing
|
| - // a close to the location for the corresponding open.
|
| -
|
| + // parenthesized block.
|
| int32_t fMatchCloseParen; // The position in the pattern of the first
|
| // location after the most recently processed
|
| // parenthesized block.
|
|
|