Skip to content

Fixed concat if seperator is omitted #41

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 2 commits into from
Feb 21, 2018
Merged

Fixed concat if seperator is omitted #41

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
28531c8
Fixed concat if separator is omitted
lolleko Feb 21, 2018
880ce9d
Updated condition
lolleko Feb 21, 2018
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
7 changes: 6 additions & 1 deletion src/Transpiler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,12 @@ export class LuaTranspiler {
case "splice":
return `TS_splice(${caller}, ${params})`;
case "join":
return `table.concat(${caller}, ${params})`;
if (node.arguments.length === 0) {
// if seperator is omitted default seperator is ","
return `table.concat(${caller}, ",")`;
} else {
return `table.concat(${caller}, ${params})`;
}
default:
throw new TranspileError("Unsupported array function: " + expression.name.escapedText, node);
}
Expand Down
31 changes: 31 additions & 0 deletions test/integration/lua/lualib.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,4 +138,35 @@ export class LuaLibArrayTests {
Expect(result).toBe(JSON.stringify(inp.splice(start)));
}
}

@TestCase([], "")
@TestCase(["test1"], "test1")
@TestCase(["test1", "test2"], "test1,test2")
@TestCase(["test1", "test2"], "test1;test2", ";")
@TestCase(["test1", "test2"], "test1test2", "")
@Test("array.join")
public join<T>(inp: T[], expected: string, seperator?: string) {
let seperatorLua;
if (seperator === "") {
seperatorLua = "\"\"";
} else if (seperator) {
seperatorLua = "\"" + seperator + "\"";
} else {
seperatorLua = "";
}
// Transpile
let lua = util.transpileString(
`let joinTestTable = ${JSON.stringify(inp)};
return joinTestTable.join(${seperatorLua});`,
util.dummyTypes.Array
);

// Execute
let result = util.executeLua(lua);

// Assert
let joinedInp = inp.join(seperator);
Expect(result).toBe(joinedInp);
}

}