Skip to content

@luaIterator on array types #479

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
tomblind merged 2 commits into from
Mar 13, 2019
Merged

@luaIterator on array types #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1aa2429
enabling use of @luaIterator on Array types
tomblind Mar 13, 2019
260fa4f
removing focustest
tomblind Mar 13, 2019
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
10 changes: 5 additions & 5 deletions src/LuaTransformer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2073,14 +2073,14 @@ export class LuaTransformer {
// Transpile body
const body = tstl.createBlock(this.transformLoopBody(statement));

if (tsHelper.isArrayType(this.checker.getTypeAtLocation(statement.expression), this.checker)) {
// Arrays
return this.transformForOfArrayStatement(statement, body);

} else if (tsHelper.isLuaIteratorType(statement.expression, this.checker)) {
if (tsHelper.isLuaIteratorType(statement.expression, this.checker)) {
// LuaIterators
return this.transformForOfLuaIteratorStatement(statement, body);

} else if (tsHelper.isArrayType(this.checker.getTypeAtLocation(statement.expression), this.checker)) {
// Arrays
return this.transformForOfArrayStatement(statement, body);

} else {
// TS Iterables
return this.transformForOfIteratorStatement(statement, body);
Expand Down
21 changes: 21 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 @@ -542,6 +542,27 @@ export class LuaLoopTests
Expect(result).toBe("abc");
}

@Test("forof array lua iterator")
public forofArrayLuaIterator(): void {
const code = `const arr = ["a", "b", "c"];
/** @luaIterator */
interface Iter extends Array<string> {}
function luaIter(): Iter {
let i = 0;
return (() => arr[i++]) as any;
}
let result = "";
for (let e of luaIter()) { result += e; }
return result;`;
const compilerOptions = {
luaLibImport: LuaLibImportKind.Require,
luaTarget: LuaTarget.Lua53,
target: ts.ScriptTarget.ES2015,
};
const result = util.transpileAndExecute(code, compilerOptions);
Expect(result).toBe("abc");
}

@Test("forof lua iterator with existing variable")
public forofLuaIteratorExistingVar(): void {
const code = `const arr = ["a", "b", "c"];
Expand Down