diff options
| author | Mark Wielaard <mark@klomp.org> | 2007-03-05 17:27:44 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-03-05 17:27:44 +0000 |
| commit | 666ff4f65d256dec0974941605cf76db0b138a76 (patch) | |
| tree | 7094a7844e13e49f92832894c3b7a7f8ff638d8b /libjava/java/lang/Character.h | |
| parent | b48a45922ddcdfd0aa2cd3ff24c7c158d20c1f2e (diff) | |
| download | gcc-666ff4f65d256dec0974941605cf76db0b138a76.zip gcc-666ff4f65d256dec0974941605cf76db0b138a76.tar.gz gcc-666ff4f65d256dec0974941605cf76db0b138a76.tar.bz2 | |
Character.java: Re-merged with Classpath.
2007-03-05 Mark Wielaard <mark@klomp.org>
* java/lang/Character.java: Re-merged with Classpath.
* java/lang/natString.cc (nativeCompareTo): Renamed from
compareTo.
* java/lang/StringBuilder.java: Re-merged with Classpath.
* java/lang/String.java: Re-merged with Classpath.
(nativeCompareTo): Renamed from compareTo.
* java/lang/StringBuffer.java: Re-merged with Classpath.
* jni.cc (_Jv_JNI_GetAnyMethodID): Split calls to append.
From-SVN: r122560
Diffstat (limited to 'libjava/java/lang/Character.h')
| -rw-r--r-- | libjava/java/lang/Character.h | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/libjava/java/lang/Character.h b/libjava/java/lang/Character.h index ed913ab..7c3a4b9 100644 --- a/libjava/java/lang/Character.h +++ b/libjava/java/lang/Character.h @@ -34,6 +34,10 @@ public: static jboolean isDefined(jint); static jboolean isLetter(jchar); static jboolean isLetter(jint); + static jint offsetByCodePoints(::java::lang::CharSequence *, jint, jint); + static jint offsetByCodePoints(JArray< jchar > *, jint, jint, jint, jint); + static jint codePointCount(::java::lang::CharSequence *, jint, jint); + static jint codePointCount(JArray< jchar > *, jint, jint); static jboolean isLetterOrDigit(jchar); static jboolean isLetterOrDigit(jint); static jboolean isJavaLetter(jchar); @@ -72,8 +76,7 @@ public: static jbyte getDirectionality(jint); static jboolean isMirrored(jchar); static jboolean isMirrored(jint); - jint compareTo(::java::lang::Character *); - jint compareTo(::java::lang::Object *); + jint target$compareTo(::java::lang::Character *); static ::java::lang::Character * valueOf(jchar); static jchar reverseBytes(jchar); static JArray< jchar > * toChars(jint); @@ -91,6 +94,7 @@ public: static jint codePointBefore(JArray< jchar > *, jint); static jint codePointBefore(JArray< jchar > *, jint, jint); static jint codePointBefore(::java::lang::CharSequence *, jint); + jint compareTo(::java::lang::Object *); private: jchar __attribute__((aligned(__alignof__( ::java::lang::Object)))) value; static const jlong serialVersionUID = 3786198910865385080LL; @@ -99,6 +103,15 @@ public: static const jint MAX_RADIX = 36; static const jchar MIN_VALUE = 0; static const jchar MAX_VALUE = 65535; + static const jint MIN_CODE_POINT = 0; + static const jint MAX_CODE_POINT = 1114111; + static const jchar MIN_HIGH_SURROGATE = 55296; + static const jchar MAX_HIGH_SURROGATE = 56319; + static const jchar MIN_LOW_SURROGATE = 56320; + static const jchar MAX_LOW_SURROGATE = 57343; + static const jchar MIN_SURROGATE = 55296; + static const jchar MAX_SURROGATE = 57343; + static const jint MIN_SUPPLEMENTARY_CODE_POINT = 65536; static ::java::lang::Class * TYPE; static const jint SIZE = 16; private: @@ -160,15 +173,6 @@ private: static const jint NO_BREAK_MASK = 32; static const jint MIRROR_MASK = 64; public: - static const jint MIN_SUPPLEMENTARY_CODE_POINT = 65536; - static const jint MIN_CODE_POINT = 0; - static const jint MAX_CODE_POINT = 1114111; - static const jchar MIN_HIGH_SURROGATE = 55296; - static const jchar MAX_HIGH_SURROGATE = 56319; - static const jchar MIN_LOW_SURROGATE = 56320; - static const jchar MAX_LOW_SURROGATE = 57343; - static const jchar MIN_SURROGATE = 55296; - static const jchar MAX_SURROGATE = 57343; static ::java::lang::Class class$; }; |