Rename position to index (#1994)

https://github.com/tc39/proposal-intl-segmenter/pull/55
This commit is contained in:
Frank Yung-Fong Tang 2018-12-15 02:52:31 -08:00 committed by Leo Balter
parent be890421b8
commit bf6b753dd7
26 changed files with 89 additions and 89 deletions

View File

@ -24,9 +24,9 @@ const tests = [
[text.length - 1, text.length],
];
for (const [input, position] of tests) {
for (const [input, index] of tests) {
assert.sameValue(iter.following(input), false);
assert.sameValue(iter.position, position, String(input));
assert.sameValue(iter.index, index, String(input));
}
assert.throws(RangeError, () => iter.following(-3));

View File

@ -12,7 +12,7 @@ for (const granularity of ["grapheme", "word", "sentence", "line"]) {
const segmenter = new Intl.Segmenter("en", { granularity });
const iter = segmenter.segment(text);
assert.sameValue(typeof iter.position, "number");
assert.sameValue(iter.position, 0);
assert.sameValue(typeof iter.index, "number");
assert.sameValue(iter.index, 0);
assert.sameValue(iter.breakType, undefined);
}

View File

@ -11,4 +11,4 @@ const segmenter = new Intl.Segmenter();
const text = "Hello World, Test 123! Foo Bar. How are you?";
const iter = segmenter.segment(text);
assert.sameValue(iter.position, 0);
assert.sameValue(iter.index, 0);

View File

@ -22,9 +22,9 @@ const tests = [
[text.length, text.length - 1],
];
for (const [input, position] of tests) {
for (const [input, index] of tests) {
assert.sameValue(iter.preceding(input), false);
assert.sameValue(iter.position, position, String(input));
assert.sameValue(iter.index, index, String(input));
}
assert.throws(RangeError, () => iter.preceding("ABC"));

View File

@ -17,7 +17,7 @@ for (const func of ["next", "following", "preceding"]) {
});
}
for (const property of ["position", "breakType"]) {
for (const property of ["index", "breakType"]) {
let desc = Object.getOwnPropertyDescriptor(prototype, property);
assert.sameValue(desc.get.name, `get ${property}`);
assert.sameValue(typeof desc.get, "function")

View File

@ -33,11 +33,11 @@ for (const text of [
let segments = [];
while (!iter.following()) {
assert.sameValue(undefined, iter.breakType);
assert(iter.position >= 0);
assert(iter.position <= text.length);
assert(iter.position > prev);
segments.push(text.substring(prev, iter.position));
prev = iter.position;
assert(iter.index >= 0);
assert(iter.index <= text.length);
assert(iter.index > prev);
segments.push(text.substring(prev, iter.index));
prev = iter.index;
}
assert.sameValue(text, segments.join(""));
}

View File

@ -42,8 +42,8 @@ for (const text of [
// manually advance the iter.
assert.sameValue(iter.following(), false);
assert.sameValue(iter.breakType, v.breakType);
assert.sameValue(text.substring(prev, iter.position), v.segment);
prev = iter.position;
assert.sameValue(text.substring(prev, iter.index), v.segment);
prev = iter.index;
}
assert(iter.following());
assert.sameValue(text, segments.join(''));

View File

@ -37,9 +37,9 @@ for (const text of [
assert.sameValue("string", typeof v.segment);
assert(v.segment.length > 0);
segments.push(v.segment);
assert.sameValue(typeof v.position, "number");
assert(oldPos < v.position);
oldPos = v.position;
assert.sameValue(typeof v.index, "number");
assert(oldPos < v.index);
oldPos = v.index;
}
assert.sameValue(text, segments.join(''));
}

View File

@ -33,17 +33,17 @@ for (const text of [
let segments = [];
iter.preceding(prev)
assert.sameValue(undefined, iter.breakType)
assert(iter.position >= 0);
assert(iter.position < prev);
segments.push(text.substring(iter.position, prev));
prev = iter.position;
assert(iter.index >= 0);
assert(iter.index < prev);
segments.push(text.substring(iter.index, prev));
prev = iter.index;
while (!iter.preceding()) {
assert.sameValue(undefined, iter.breakType);
assert(iter.position >= 0);
assert(iter.position <= text.length);
assert(iter.position < prev);
segments.push(text.substring(iter.position, prev));
prev = iter.position;
assert(iter.index >= 0);
assert(iter.index <= text.length);
assert(iter.index < prev);
segments.push(text.substring(iter.index, prev));
prev = iter.index;
}
assert.sameValue(text, segments.reverse().join(""));
}

View File

@ -30,5 +30,5 @@ for (const text of [
]) {
const iter = seg.segment(text);
assert.sameValue(undefined, iter.breakType);
assert.sameValue(0, iter.position);
assert.sameValue(0, iter.index);
}

View File

@ -33,11 +33,11 @@ for (const text of [
let segments = [];
while (!iter.following()) {
assert(["soft", "hard"].includes(iter.breakType), iter.breakType);
assert(iter.position >= 0);
assert(iter.position <= text.length);
assert(iter.position > prev);
segments.push(text.substring(prev, iter.position));
prev = iter.position;
assert(iter.index >= 0);
assert(iter.index <= text.length);
assert(iter.index > prev);
segments.push(text.substring(prev, iter.index));
prev = iter.index;
}
assert.sameValue(text, segments.join(""));
}

View File

@ -42,8 +42,8 @@ for (const text of [
// manually advance the iter.
assert.sameValue(iter.following(), false);
assert.sameValue(iter.breakType, v.breakType);
assert.sameValue(text.substring(prev, iter.position), v.segment);
prev = iter.position;
assert.sameValue(text.substring(prev, iter.index), v.segment);
prev = iter.index;
}
assert(iter.following());
assert.sameValue(text, segments.join(''));

View File

@ -37,9 +37,9 @@ for (const text of [
assert.sameValue("string", typeof v.segment);
assert(v.segment.length > 0);
segments.push(v.segment);
assert.sameValue(typeof v.position, "number");
assert(oldPos < v.position);
oldPos = v.position;
assert.sameValue(typeof v.index, "number");
assert(oldPos < v.index);
oldPos = v.index;
}
assert.sameValue(text, segments.join(''));
}

View File

@ -33,17 +33,17 @@ for (const text of [
let segments = [];
iter.preceding(prev)
assert(["soft", "hard"].includes(iter.breakType), iter.breakType);
assert(iter.position >= 0);
assert(iter.position < prev);
segments.push(text.substring(iter.position, prev));
prev = iter.position;
assert(iter.index >= 0);
assert(iter.index < prev);
segments.push(text.substring(iter.index, prev));
prev = iter.index;
while (!iter.preceding()) {
assert(["soft", "hard"].includes(iter.breakType), iter.breakType);
assert(iter.position >= 0);
assert(iter.position <= text.length);
assert(iter.position < prev);
segments.push(text.substring(iter.position, prev));
prev = iter.position;
assert(iter.index >= 0);
assert(iter.index <= text.length);
assert(iter.index < prev);
segments.push(text.substring(iter.index, prev));
prev = iter.index;
}
assert.sameValue(text, segments.reverse().join(""));
}

View File

@ -30,5 +30,5 @@ for (const text of [
]) {
const iter = seg.segment(text);
assert.sameValue(undefined, iter.breakType);
assert.sameValue(0, iter.position);
assert.sameValue(0, iter.index);
}

View File

@ -33,11 +33,11 @@ for (const text of [
let segments = [];
while (!iter.following()) {
assert(["sep", "term"].includes(iter.breakType), iter.breakType);
assert(iter.position >= 0);
assert(iter.position <= text.length);
assert(iter.position > prev);
segments.push(text.substring(prev, iter.position));
prev = iter.position;
assert(iter.index >= 0);
assert(iter.index <= text.length);
assert(iter.index > prev);
segments.push(text.substring(prev, iter.index));
prev = iter.index;
}
assert.sameValue(text, segments.join(""));
}

View File

@ -42,8 +42,8 @@ for (const text of [
// manually advance the iter.
assert.sameValue(iter.following(), false);
assert.sameValue(iter.breakType, v.breakType);
assert.sameValue(text.substring(prev, iter.position), v.segment);
prev = iter.position;
assert.sameValue(text.substring(prev, iter.index), v.segment);
prev = iter.index;
}
assert(iter.following());
assert.sameValue(text, segments.join(''));

View File

@ -37,9 +37,9 @@ for (const text of [
assert.sameValue("string", typeof v.segment);
assert(v.segment.length > 0);
segments.push(v.segment);
assert.sameValue(typeof v.position, "number");
assert(oldPos < v.position);
oldPos = v.position;
assert.sameValue(typeof v.index, "number");
assert(oldPos < v.index);
oldPos = v.index;
}
assert.sameValue(text, segments.join(''));
}

View File

@ -33,17 +33,17 @@ for (const text of [
let segments = [];
iter.preceding(prev);
assert(["sep", "term"].includes(iter.breakType), iter.breakType);
assert(iter.position >= 0);
assert(iter.position < prev);
segments.push(text.substring(iter.position, prev));
prev = iter.position;
assert(iter.index >= 0);
assert(iter.index < prev);
segments.push(text.substring(iter.index, prev));
prev = iter.index;
while (!iter.preceding()) {
assert(["sep", "term"].includes(iter.breakType), iter.breakType);
assert(iter.position >= 0);
assert(iter.position <= text.length);
assert(iter.position < prev);
segments.push(text.substring(iter.position, prev));
prev = iter.position;
assert(iter.index >= 0);
assert(iter.index <= text.length);
assert(iter.index < prev);
segments.push(text.substring(iter.index, prev));
prev = iter.index;
}
assert.sameValue(text, segments.reverse().join(""));
}

View File

@ -30,5 +30,5 @@ for (const text of [
]) {
const iter = seg.segment(text);
assert.sameValue(undefined, iter.breakType);
assert.sameValue(0, iter.position);
assert.sameValue(0, iter.index);
}

View File

@ -29,7 +29,7 @@ for (const [args, expected] of tests) {
const result = iterator.next().value;
assert.sameValue(result.segment, expected, `Expected segment "${expected}", found "${result.segment}" for arguments ${args}`);
assert(["word", "none"].includes(result.breakType), `Expected valid breakType, found "${result.breakType}" for arguments ${args}`);
assert.sameValue(result.position, expected.length, `Expected position ${expected.length}, found ${result.position} for arguments ${args}`);
assert.sameValue(result.index, expected.length, `Expected index ${expected.length}, found ${result.index} for arguments ${args}`);
}
const symbol = Symbol();

View File

@ -33,11 +33,11 @@ for (const text of [
let segments = [];
while (!iter.following()) {
assert(["word", "none"].includes(iter.breakType), iter.breakType);
assert(iter.position >= 0);
assert(iter.position <= text.length);
assert(iter.position > prev);
segments.push(text.substring(prev, iter.position));
prev = iter.position;
assert(iter.index >= 0);
assert(iter.index <= text.length);
assert(iter.index > prev);
segments.push(text.substring(prev, iter.index));
prev = iter.index;
}
assert.sameValue(text, segments.join(""));
}

View File

@ -42,8 +42,8 @@ for (const text of [
// manually advance the iter.
assert.sameValue(iter.following(), false);
assert.sameValue(iter.breakType, v.breakType);
assert.sameValue(text.substring(prev, iter.position), v.segment);
prev = iter.position;
assert.sameValue(text.substring(prev, iter.index), v.segment);
prev = iter.index;
}
assert(iter.following());
assert.sameValue(text, segments.join(''));

View File

@ -37,9 +37,9 @@ for (const text of [
assert.sameValue("string", typeof v.segment);
assert(v.segment.length > 0);
segments.push(v.segment);
assert.sameValue(typeof v.position, "number");
assert(oldPos < v.position);
oldPos = v.position;
assert.sameValue(typeof v.index, "number");
assert(oldPos < v.index);
oldPos = v.index;
}
assert.sameValue(text, segments.join(''));
}

View File

@ -33,17 +33,17 @@ for (const text of [
let segments = [];
iter.preceding(prev);
assert(["word", "none"].includes(iter.breakType), iter.breakType);
assert(iter.position >= 0);
assert(iter.position < prev);
segments.push(text.substring(iter.position, prev));
prev = iter.position;
assert(iter.index >= 0);
assert(iter.index < prev);
segments.push(text.substring(iter.index, prev));
prev = iter.index;
while (!iter.preceding()) {
assert(["word", "none"].includes(iter.breakType), iter.breakType);
assert(iter.position >= 0);
assert(iter.position <= text.length);
assert(iter.position < prev);
segments.push(text.substring(iter.position, prev));
prev = iter.position;
assert(iter.index >= 0);
assert(iter.index <= text.length);
assert(iter.index < prev);
segments.push(text.substring(iter.index, prev));
prev = iter.index;
}
assert.sameValue(text, segments.reverse().join(""));
}

View File

@ -30,5 +30,5 @@ for (const text of [
]) {
const iter = seg.segment(text);
assert.sameValue(undefined, iter.breakType);
assert.sameValue(0, iter.position);
assert.sameValue(0, iter.index);
}