AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-1289 Change to use UCharacterIterator to iterate over the text.

Browse Source 
X-SVN-Rev: 8979
This commit is contained in:
Eric Mader 2002-06-29 01:43:19 +00:00
parent c16c9ab43e
commit 89dd133d16
1 changed files with 39 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
icu4j/src/com/ibm/icu/lang/UScriptRun.java
View File

@ -9,6 +9,9 @@
package com.ibm.icu.lang; package com.ibm.icu.lang;
import com.ibm.icu.impl.UCharacterIterator;
import com.ibm.icu.impl.UForwardCharacterIterator;
/** /**
* <code>UScriptRun</code> is used to find runs of characters in * <code>UScriptRun</code> is used to find runs of characters in
* the same script, as defined in the <code>UScript</code> class. * the same script, as defined in the <code>UScript</code> class.
@ -29,11 +32,11 @@ package com.ibm.icu.lang;
* Here is an example of how to iterate over script runs: * Here is an example of how to iterate over script runs:
* <pre> * <pre>
* void printScriptRuns(char []text) * void printScriptRuns(char[] text)
* { * {
* UScriptRun scriptRun = new UScriptRun(text); * UScriptRun scriptRun = new UScriptRun(text);
* *
* while (scriptRun.next())) { * while (scriptRun.next()) {
* int start = scriptRun.getScriptStart(); * int start = scriptRun.getScriptStart();
* int limit = scriptRun.getScriptLimit(); * int limit = scriptRun.getScriptLimit();
* int script = scriptRun.getScriptCode(); * int script = scriptRun.getScriptCode();
@ -115,11 +118,14 @@ public final class UScriptRun
/** /**
* Reset the iterator to the start of the text. * Reset the iterator to the start of the text.
*/ */
public final void reset() { public final void reset()
scriptStart = charStart; {
scriptLimit = charStart; scriptStart = textStart;
scriptLimit = textStart;
scriptCode = UScript.INVALID_CODE; scriptCode = UScript.INVALID_CODE;
parenSP = -1; parenSP = -1;
text.setToStart();
} }
/** /**
@ -136,16 +142,16 @@ public final class UScriptRun
{ {
int len = 0; int len = 0;
if (charArray != null) { if (text != null) {
len = charArray.length; len = text.getLength();
} }
if (start < 0 || count < 0 || start > len - count) { if (start < 0 || count < 0 || start > len - count) {
throw new IllegalArgumentException(); throw new IllegalArgumentException();
} }
charStart = start; textStart = start;
charLimit = start + count; textLimit = start + count;
reset(); reset();
} }
@ -161,7 +167,11 @@ public final class UScriptRun
*/ */
public final void reset(char[] chars, int start, int count) public final void reset(char[] chars, int start, int count)
{ {
charArray = chars; if (chars == null) {
chars = emptyCharArray;
}
text = UCharacterIterator.getInstance(chars, start, start + count);
reset(start, count); reset(start, count);
} }
@ -264,30 +274,16 @@ public final class UScriptRun
int startSP = parenSP; // used to find the first new open character int startSP = parenSP; // used to find the first new open character
// if we've fallen off the end of the text, we're done // if we've fallen off the end of the text, we're done
if (scriptLimit >= charLimit) { if (scriptLimit >= textLimit) {
return false; return false;
} }
scriptCode = UScript.COMMON; scriptCode = UScript.COMMON;
scriptStart = scriptLimit;
for (scriptStart = scriptLimit; scriptLimit < charLimit; scriptLimit += 1) { int ch;
int high = charArray[scriptLimit];
int ch = high;
// if the character is a high surrogate and it's not the last one
// in the text, see if it's followed by a low surrogate
if (high >= 0xD800 && high <= 0xDBFF && scriptLimit < charLimit - 1)
{
int low = charArray[scriptLimit + 1];
// if it is followed by a low surrogate,
// consume it and form the full character
if (low >= 0xDC00 && low <= 0xDFFF) {
ch = (high - 0xD800) * 0x0400 + low - 0xDC00 + 0x10000;
scriptLimit += 1;
}
}
while ((ch = text.nextCodePoint()) != UForwardCharacterIterator.DONE) {
int sc = UScript.getScript(ch); int sc = UScript.getScript(ch);
int pairIndex = getPairIndex(ch); int pairIndex = getPairIndex(ch);
@ -335,16 +331,15 @@ public final class UScriptRun
startSP -= 1; startSP -= 1;
} }
} else { } else {
// if the run broke on a surrogate pair, // We've just seen the first character of
// end it before the high surrogate // the next run. Back over it so we'll see
if (ch >= 0x10000) { // it again the next time.
scriptLimit -= 1; text.previousCodePoint();
} break;
break;
} }
} }
scriptLimit = textStart + text.getIndex();
return true; return true;
} }
@ -377,9 +372,12 @@ public final class UScriptRun
} }
}; };
private int charStart; private char[] emptyCharArray = {};
private int charLimit;
private char charArray[]; private UCharacterIterator text;
private int textStart;
private int textLimit;
private int scriptStart; private int scriptStart;
private int scriptLimit; private int scriptLimit;