diff options
Diffstat (limited to 'libjava/gnu/java/util/regex')
21 files changed, 111 insertions, 76 deletions
diff --git a/libjava/gnu/java/util/regex/RE.h b/libjava/gnu/java/util/regex/RE.h index 4d431958915..ee798b7ad35 100644 --- a/libjava/gnu/java/util/regex/RE.h +++ b/libjava/gnu/java/util/regex/RE.h @@ -15,6 +15,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -87,9 +91,9 @@ public: virtual ::gnu::java::util::regex::REMatch * getMatch(::java::lang::Object *); virtual ::gnu::java::util::regex::REMatch * getMatch(::java::lang::Object *, jint); virtual ::gnu::java::util::regex::REMatch * getMatch(::java::lang::Object *, jint, jint); - virtual ::gnu::java::util::regex::REMatch * getMatch(::java::lang::Object *, jint, jint, ::java::lang::StringBuffer *); + virtual ::gnu::java::util::regex::REMatch * getMatch(::java::lang::Object *, jint, jint, ::gnu::java::lang::CPStringBuilder *); public: // actually package-private - virtual ::gnu::java::util::regex::REMatch * getMatchImpl(::gnu::java::util::regex::CharIndexed *, jint, jint, ::java::lang::StringBuffer *); + virtual ::gnu::java::util::regex::REMatch * getMatchImpl(::gnu::java::util::regex::CharIndexed *, jint, jint, ::gnu::java::lang::CPStringBuilder *); public: virtual ::gnu::java::util::regex::REMatchEnumeration * getMatchEnumeration(::java::lang::Object *); virtual ::gnu::java::util::regex::REMatchEnumeration * getMatchEnumeration(::java::lang::Object *, jint); @@ -110,12 +114,12 @@ public: private: void addToken(::gnu::java::util::regex::REToken *); static ::gnu::java::util::regex::REToken * setRepeated(::gnu::java::util::regex::REToken *, jint, jint, jint); - static jint getPosixSet(JArray< jchar > *, jint, ::java::lang::StringBuffer *); + static jint getPosixSet(JArray< jchar > *, jint, ::gnu::java::lang::CPStringBuilder *); jint getMinMax(JArray< jchar > *, jint, ::gnu::java::util::regex::RE$IntPair *, ::gnu::java::util::regex::RESyntax *); public: virtual ::java::lang::String * toString(); public: // actually package-private - virtual void dump(::java::lang::StringBuffer *); + virtual void dump(::gnu::java::lang::CPStringBuilder *); public: static ::gnu::java::util::regex::CharIndexed * makeCharIndexed(::java::lang::Object *, jint); private: diff --git a/libjava/gnu/java/util/regex/REMatchEnumeration.h b/libjava/gnu/java/util/regex/REMatchEnumeration.h index caab8c81e2f..6b0d888b753 100644 --- a/libjava/gnu/java/util/regex/REMatchEnumeration.h +++ b/libjava/gnu/java/util/regex/REMatchEnumeration.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -35,9 +39,9 @@ public: // actually package-private public: virtual jboolean hasMoreElements(); virtual jboolean hasMoreMatches(); - virtual jboolean hasMoreMatches(::java::lang::StringBuffer *); + virtual jboolean hasMoreMatches(::gnu::java::lang::CPStringBuilder *); + virtual ::gnu::java::util::regex::REMatch * REMatchEnumeration$nextElement(); virtual ::java::lang::Object * nextElement(); - virtual ::gnu::java::util::regex::REMatch * nextMatch(); private: static const jint YES = 1; static const jint MAYBE = 0; diff --git a/libjava/gnu/java/util/regex/REToken.h b/libjava/gnu/java/util/regex/REToken.h index 49ef5aef0c7..552d47a3bea 100644 --- a/libjava/gnu/java/util/regex/REToken.h +++ b/libjava/gnu/java/util/regex/REToken.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -53,8 +57,8 @@ public: // actually package-private virtual jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint); virtual ::gnu::java::util::regex::REMatch * backtrack(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, ::java::lang::Object *); virtual jboolean chain(::gnu::java::util::regex::REToken *); - virtual void dump(::java::lang::StringBuffer *) = 0; - virtual void dumpAll(::java::lang::StringBuffer *); + virtual void dump(::gnu::java::lang::CPStringBuilder *) = 0; + virtual void dumpAll(::gnu::java::lang::CPStringBuilder *); public: virtual ::java::lang::String * toString(); static jchar toLowerCase(jchar, jboolean); diff --git a/libjava/gnu/java/util/regex/RETokenAny.h b/libjava/gnu/java/util/regex/RETokenAny.h index d50be3d64fb..77f00aaad21 100644 --- a/libjava/gnu/java/util/regex/RETokenAny.h +++ b/libjava/gnu/java/util/regex/RETokenAny.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -37,7 +41,7 @@ public: // actually package-private jboolean matchOneChar(jchar); jboolean returnsFixedLengthMatches(); jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); private: jboolean __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) newline; jboolean matchNull; diff --git a/libjava/gnu/java/util/regex/RETokenBackRef.h b/libjava/gnu/java/util/regex/RETokenBackRef.h index 33cf3b679c2..4cadd540594 100644 --- a/libjava/gnu/java/util/regex/RETokenBackRef.h +++ b/libjava/gnu/java/util/regex/RETokenBackRef.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -32,7 +36,7 @@ class gnu::java::util::regex::RETokenBackRef : public ::gnu::java::util::regex:: public: // actually package-private RETokenBackRef(jint, jint, jboolean); ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); private: jint __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) num; jboolean insens; diff --git a/libjava/gnu/java/util/regex/RETokenChar.h b/libjava/gnu/java/util/regex/RETokenChar.h index abff1cdd803..723bed8c67d 100644 --- a/libjava/gnu/java/util/regex/RETokenChar.h +++ b/libjava/gnu/java/util/regex/RETokenChar.h @@ -15,6 +15,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -44,7 +48,7 @@ public: // actually package-private jboolean returnsFixedLengthMatches(); jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint); jboolean chain(::gnu::java::util::regex::REToken *); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); private: JArray< jchar > * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) ch; jboolean insens; diff --git a/libjava/gnu/java/util/regex/RETokenEnd.h b/libjava/gnu/java/util/regex/RETokenEnd.h index cdcb5b06000..975bb1625ec 100644 --- a/libjava/gnu/java/util/regex/RETokenEnd.h +++ b/libjava/gnu/java/util/regex/RETokenEnd.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -38,7 +42,7 @@ public: // actually package-private ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); jboolean returnsFixedLengthMatches(); jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); private: ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) newline; jboolean check_java_line_terminators; diff --git a/libjava/gnu/java/util/regex/RETokenEndOfPreviousMatch.h b/libjava/gnu/java/util/regex/RETokenEndOfPreviousMatch.h index 72f54647e82..be5683341ba 100644 --- a/libjava/gnu/java/util/regex/RETokenEndOfPreviousMatch.h +++ b/libjava/gnu/java/util/regex/RETokenEndOfPreviousMatch.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -35,7 +39,7 @@ public: // actually package-private virtual ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); virtual jboolean returnsFixedLengthmatches(); virtual jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint); - virtual void dump(::java::lang::StringBuffer *); + virtual void dump(::gnu::java::lang::CPStringBuilder *); public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/util/regex/RETokenEndSub.h b/libjava/gnu/java/util/regex/RETokenEndSub.h index 50f3281cae7..109e28b3e64 100644 --- a/libjava/gnu/java/util/regex/RETokenEndSub.h +++ b/libjava/gnu/java/util/regex/RETokenEndSub.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -35,7 +39,7 @@ public: // actually package-private ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); void setHitEnd(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/util/regex/RETokenIndependent.h b/libjava/gnu/java/util/regex/RETokenIndependent.h index f13c6b3eb6c..7800296841d 100644 --- a/libjava/gnu/java/util/regex/RETokenIndependent.h +++ b/libjava/gnu/java/util/regex/RETokenIndependent.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -35,7 +39,7 @@ public: // actually package-private jint getMinimumLength(); jint getMaximumLength(); ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) re; public: static ::java::lang::Class class$; diff --git a/libjava/gnu/java/util/regex/RETokenLookAhead.h b/libjava/gnu/java/util/regex/RETokenLookAhead.h index 64c147c530e..b3e1a72df0a 100644 --- a/libjava/gnu/java/util/regex/RETokenLookAhead.h +++ b/libjava/gnu/java/util/regex/RETokenLookAhead.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -34,7 +38,7 @@ public: // actually package-private RETokenLookAhead(::gnu::java::util::regex::REToken *, jboolean); jint getMaximumLength(); ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) re; jboolean negative; public: diff --git a/libjava/gnu/java/util/regex/RETokenLookBehind$RETokenMatchHereOnly.h b/libjava/gnu/java/util/regex/RETokenLookBehind$RETokenMatchHereOnly.h index 83d9b477a23..dc771b480d6 100644 --- a/libjava/gnu/java/util/regex/RETokenLookBehind$RETokenMatchHereOnly.h +++ b/libjava/gnu/java/util/regex/RETokenLookBehind$RETokenMatchHereOnly.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -33,7 +37,7 @@ public: // actually package-private virtual jint getMaximumLength(); RETokenLookBehind$RETokenMatchHereOnly(jint); virtual ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); - virtual void dump(::java::lang::StringBuffer *); + virtual void dump(::gnu::java::lang::CPStringBuilder *); private: jint __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) index; public: diff --git a/libjava/gnu/java/util/regex/RETokenLookBehind.h b/libjava/gnu/java/util/regex/RETokenLookBehind.h index b07cf6ccc9f..3aa8013f038 100644 --- a/libjava/gnu/java/util/regex/RETokenLookBehind.h +++ b/libjava/gnu/java/util/regex/RETokenLookBehind.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -34,7 +38,7 @@ public: // actually package-private RETokenLookBehind(::gnu::java::util::regex::REToken *, jboolean); jint getMaximumLength(); ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) re; jboolean negative; public: diff --git a/libjava/gnu/java/util/regex/RETokenNamedProperty.h b/libjava/gnu/java/util/regex/RETokenNamedProperty.h index 9f610cd7ade..a20a1a3ef91 100644 --- a/libjava/gnu/java/util/regex/RETokenNamedProperty.h +++ b/libjava/gnu/java/util/regex/RETokenNamedProperty.h @@ -15,6 +15,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -42,7 +46,7 @@ private: public: // actually package-private jboolean returnsFixedLengthMatches(); jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); private: ::gnu::java::util::regex::RETokenNamedProperty$Handler * getHandler(::java::lang::String *); public: // actually package-private diff --git a/libjava/gnu/java/util/regex/RETokenOneOf.h b/libjava/gnu/java/util/regex/RETokenOneOf.h index dec0561b405..b7f819dd795 100644 --- a/libjava/gnu/java/util/regex/RETokenOneOf.h +++ b/libjava/gnu/java/util/regex/RETokenOneOf.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -31,8 +35,8 @@ class gnu::java::util::regex::RETokenOneOf : public ::gnu::java::util::regex::RE public: // actually package-private RETokenOneOf(jint, ::java::lang::String *, jboolean, jboolean); - RETokenOneOf(jint, ::java::util::Vector *, jboolean); - RETokenOneOf(jint, ::java::util::Vector *, ::java::util::Vector *, jboolean); + RETokenOneOf(jint, ::java::util::List *, jboolean); + RETokenOneOf(jint, ::java::util::List *, ::java::util::List *, jboolean); jint getMinimumLength(); jint getMaximumLength(); jboolean match(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); @@ -49,12 +53,12 @@ private: public: // actually package-private jboolean returnsFixedLengthMatches(); jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); private: - ::java::util::Vector * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) options; + ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) options; jboolean negative; jboolean matchesOneChar; - ::java::util::Vector * addition; + ::java::util::List * addition; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/util/regex/RETokenPOSIX.h b/libjava/gnu/java/util/regex/RETokenPOSIX.h index a6a40c09ab3..5704ab8e6fd 100644 --- a/libjava/gnu/java/util/regex/RETokenPOSIX.h +++ b/libjava/gnu/java/util/regex/RETokenPOSIX.h @@ -15,6 +15,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -40,7 +44,7 @@ public: // actually package-private jboolean matchOneChar(jchar); jboolean returnsFixedLengthMatches(); jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); jint __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) type; jboolean insens; jboolean negated; diff --git a/libjava/gnu/java/util/regex/RETokenRange.h b/libjava/gnu/java/util/regex/RETokenRange.h index 22ff21a3f03..fa3c923b7bf 100644 --- a/libjava/gnu/java/util/regex/RETokenRange.h +++ b/libjava/gnu/java/util/regex/RETokenRange.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -37,7 +41,7 @@ public: // actually package-private jboolean matchOneChar(jchar); jboolean returnsFixedLengthMatches(); jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); private: jchar __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) lo; jchar hi; diff --git a/libjava/gnu/java/util/regex/RETokenRepeated$FindMatchControlStack.h b/libjava/gnu/java/util/regex/RETokenRepeated$FindMatchControlStack.h deleted file mode 100644 index 11bf5c18225..00000000000 --- a/libjava/gnu/java/util/regex/RETokenRepeated$FindMatchControlStack.h +++ /dev/null @@ -1,44 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_java_util_regex_RETokenRepeated$FindMatchControlStack__ -#define __gnu_java_util_regex_RETokenRepeated$FindMatchControlStack__ - -#pragma interface - -#include <java/util/ArrayList.h> -extern "Java" -{ - namespace gnu - { - namespace java - { - namespace util - { - namespace regex - { - class RETokenRepeated$FindMatchControl; - class RETokenRepeated$FindMatchControlStack; - } - } - } - } -} - -class gnu::java::util::regex::RETokenRepeated$FindMatchControlStack : public ::java::util::ArrayList -{ - - RETokenRepeated$FindMatchControlStack(); - void push(::gnu::java::util::regex::RETokenRepeated$FindMatchControl *); - ::gnu::java::util::regex::RETokenRepeated$FindMatchControl * pop(); - jboolean empty(); -public: // actually package-private - RETokenRepeated$FindMatchControlStack(::gnu::java::util::regex::RETokenRepeated$FindMatchControlStack *); - static void access$1(::gnu::java::util::regex::RETokenRepeated$FindMatchControlStack *, ::gnu::java::util::regex::RETokenRepeated$FindMatchControl *); - static jboolean access$2(::gnu::java::util::regex::RETokenRepeated$FindMatchControlStack *); - static ::gnu::java::util::regex::RETokenRepeated$FindMatchControl * access$3(::gnu::java::util::regex::RETokenRepeated$FindMatchControlStack *); -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_java_util_regex_RETokenRepeated$FindMatchControlStack__ diff --git a/libjava/gnu/java/util/regex/RETokenRepeated.h b/libjava/gnu/java/util/regex/RETokenRepeated.h index 17de5445b1f..09aca7a5803 100644 --- a/libjava/gnu/java/util/regex/RETokenRepeated.h +++ b/libjava/gnu/java/util/regex/RETokenRepeated.h @@ -15,6 +15,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -25,7 +29,6 @@ extern "Java" class REToken; class RETokenRepeated; class RETokenRepeated$DoablesFinder; - class RETokenRepeated$FindMatchControlStack; class RETokenRepeated$TryAnotherResult; } } @@ -48,7 +51,7 @@ public: // actually package-private ::gnu::java::util::regex::REMatch * backtrack(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, ::java::lang::Object *); private: ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::BacktrackStack *); - ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::BacktrackStack *, ::gnu::java::util::regex::RETokenRepeated$FindMatchControlStack *); + ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::BacktrackStack *, ::java::util::Deque *); ::gnu::java::util::regex::RETokenRepeated$TryAnotherResult * tryAnother(::gnu::java::util::regex::BacktrackStack *, ::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint, ::gnu::java::util::regex::RETokenRepeated$DoablesFinder *, JArray< jint > *); public: // actually package-private jboolean match(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); @@ -61,7 +64,7 @@ private: ::gnu::java::util::regex::REMatch * backtrackFixedLength(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, ::java::lang::Object *); ::gnu::java::util::regex::REMatch * findMatchFixedLength(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint, jint); public: // actually package-private - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); private: ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) token; jint min; diff --git a/libjava/gnu/java/util/regex/RETokenStart.h b/libjava/gnu/java/util/regex/RETokenStart.h index da6ad7f38bd..95654f79593 100644 --- a/libjava/gnu/java/util/regex/RETokenStart.h +++ b/libjava/gnu/java/util/regex/RETokenStart.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -34,9 +38,9 @@ public: // actually package-private RETokenStart(jint, ::java::lang::String *, jboolean); virtual jint getMaximumLength(); virtual ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); - virtual jboolean returnsFixedLengthmatches(); + virtual jboolean returnsFixedLengthMatches(); virtual jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint); - virtual void dump(::java::lang::StringBuffer *); + virtual void dump(::gnu::java::lang::CPStringBuilder *); private: ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) newline; jboolean check_java_line_terminators; diff --git a/libjava/gnu/java/util/regex/RETokenWordBoundary.h b/libjava/gnu/java/util/regex/RETokenWordBoundary.h index 1d3bb6b97c4..18d5b2ca101 100644 --- a/libjava/gnu/java/util/regex/RETokenWordBoundary.h +++ b/libjava/gnu/java/util/regex/RETokenWordBoundary.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -35,7 +39,7 @@ public: // actually package-private ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); jboolean returnsFixedLengthMatches(); jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); private: jboolean __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) negated; jint where; |
