Skip to content

Make strings iterable #891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Perryvw merged 3 commits into from
Jun 9, 2020
Merged

Make strings iterable #891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e20c1f5
Make strings iterable
ark120202 Jun 1, 2020
6f73d39
Add changelog
ark120202 Jun 1, 2020
6a6ff81
Merge remote-tracking branch 'upstream/master' into iterable-string
ark120202 Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/lualib/Iterator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,25 @@ function __TS__IteratorIteratorStep<T>(this: Iterator<T>): [true, T] | [] {
return [true, result.value];
}

/** @tupleReturn */
function __TS__IteratorStringStep(this: string, index: number): [number, string] | [] {
index += 1;
if (index > this.length) return [];
return [index, string.sub(this, index, index)];
}

/** @tupleReturn */
function __TS__Iterator<T>(
this: void,
iterable: Iterable<T> | GeneratorIterator | readonly T[]
): [(...args: any[]) => [any, T] | [], ...any[]] {
): [(...args: any[]) => [any, any] | [], ...any[]] {
if ("____coroutine" in iterable) {
return [__TS__IteratorGeneratorStep, iterable];
} else if (iterable[Symbol.iterator]) {
const iterator = iterable[Symbol.iterator]();
return [__TS__IteratorIteratorStep, iterator];
} else if (typeof iterable === "string") {
return [__TS__IteratorStringStep, iterable, 0];
} else {
return ipairs(iterable as readonly T[]) as any;
}
Expand Down
10 changes: 10 additions & 0 deletions test/unit/loops.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,16 @@ test("forof with array typed as iterable", () => {
`.expectToMatchJsResult();
});

test.each(["", "abc", "a\0c"])("forof string (%p)", string => {
util.testFunctionTemplate`
const results: string[] = [];
for (const x of ${string}) {
results.push(x);
}
return results;
`.expectToMatchJsResult();
});

describe("for...of empty destructuring", () => {
const declareTests = (destructuringPrefix: string) => {
test("array", () => {
Expand Down