organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 23:10:40 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-22789 Add source CharSequence to Segment class

Browse source
This commit is contained in:
Elango Cheran 2025-01-01 18:05:30 -08:00
parent 5b6eaddced
commit 8ee08e31c8
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
icu4j/main/core/src/main/java/com/ibm/icu/text/segmenter/Segments.java
View file

@ -41,17 +41,19 @@ public interface Segments {
}
//
// Inner classes for Range, RangeIterable, and RangeIterator
// Inner classes for Segment, SegmentIterable, and SegmentIterator
//
class Segment {
public final int start;
public final int limit;
public final int ruleStatus = 0;
public final CharSequence soruce;
public Segment(int start, int limit) {
public Segment(int start, int limit, CharSequence source) {
this.start = start;
this.limit = limit;
this.soruce = source;
}
}
@ -61,30 +63,34 @@ public interface Segments {
*/
class SegmentIterable implements Iterable<Segment> {
BreakIterator breakIter;
IterationDirection direction;
final IterationDirection direction;
int startIdx;
final CharSequence source;
SegmentIterable(BreakIterator breakIter, IterationDirection direction, int startIdx) {
SegmentIterable(BreakIterator breakIter, IterationDirection direction, int startIdx, CharSequence source) {
this.breakIter = breakIter;
this.direction = direction;
this.startIdx = startIdx;
this.source = source;
}
@Override
public Iterator<Segment> iterator() {
return new SegmentIterator(this.breakIter, this.direction, this.startIdx);
return new SegmentIterator(this.breakIter, this.direction, this.startIdx, this.source);
}
}
class SegmentIterator implements Iterator<Segment> {
BreakIterator breakIter;
IterationDirection direction;
final IterationDirection direction;
int start;
int limit;
final CharSequence source;
SegmentIterator(BreakIterator breakIter, IterationDirection direction, int startIdx) {
SegmentIterator(BreakIterator breakIter, IterationDirection direction, int startIdx, CharSequence source) {
this.breakIter = breakIter;
this.direction = direction;
this.source = source;
if (direction == IterationDirection.FORWARDS) {
this.start = breakIter.following(startIdx);
@ -114,9 +120,9 @@ public interface Segments {
public Segment next() {
Segment result;
if (this.limit < this.start) {
result = new Segment(this.limit, this.start);
result = new Segment(this.limit, this.start, this.source);
} else {
result = new Segment(this.start, this.limit);
result = new Segment(this.start, this.limit, this.source);
}
this.start = this.limit;

8
icu4j/main/core/src/main/java/com/ibm/icu/text/segmenter/SegmentsImplUtils.java
View file

@ -24,7 +24,7 @@ public class SegmentsImplUtils {
breakIter.setText(sourceSequence);
// create a Stream from a Spliterator of an Iterable so that the Stream can be lazy, not eager
SegmentIterable iterable = new SegmentIterable(breakIter, IterationDirection.FORWARDS, i);
SegmentIterable iterable = new SegmentIterable(breakIter, IterationDirection.FORWARDS, i, sourceSequence);
return StreamSupport.stream(iterable.spliterator(), false);
}
@ -32,7 +32,7 @@ public class SegmentsImplUtils {
breakIter.setText(sourceSequence);
// create a Stream from a Spliterator of an Iterable so that the Stream can be lazy, not eager
SegmentIterable iterable = new SegmentIterable(breakIter, IterationDirection.BACKWARDS, i);
SegmentIterable iterable = new SegmentIterable(breakIter, IterationDirection.BACKWARDS, i, sourceSequence);
return StreamSupport.stream(iterable.spliterator(), false);
}
@ -49,7 +49,7 @@ public class SegmentsImplUtils {
return null;
}
return new Segment(start, limit);
return new Segment(start, limit, sourceSequence);
}
public static Segment rangeBeforeIndex(BreakIterator breakIter, CharSequence sourceSequence, int i) {
@ -71,7 +71,7 @@ public class SegmentsImplUtils {
assert limit <= start;
return new Segment(limit, start);
return new Segment(limit, start, sourceSequence);
}
public static Function<Segment, CharSequence> rangeToSequenceFn(CharSequence sourceSequence) {