Skip to content

Added support for the 2 static string functions that currently exist #23

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
Feb 13, 2018
Merged

Added support for the 2 static string functions that currently exist #23

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
7210bcb
Added support for the 2 static string functions that currently exist …
lolleko Feb 12, 2018
c945629
Updated comment
lolleko Feb 12, 2018
5b7b8e4
Updated Dist
lolleko Feb 12, 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
29 changes: 24 additions & 5 deletions dist/Transpiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ var LuaTranspiler = /** @class */ (function () {
};
LuaTranspiler.prototype.transpileImport = function (node) {
var importFile = this.transpileExpression(node.moduleSpecifier);
if (!node.importClause) {
if (!node.importClause || !node.importClause.namedBindings) {
throw new TranspileError("Default Imports are not supported, please use named imports instead!", node);
}
var imports = node.importClause.namedBindings;
Expand Down Expand Up @@ -542,16 +542,20 @@ var LuaTranspiler = /** @class */ (function () {
var params_1 = this.transpileArguments(node.arguments);
return this.transpileMathExpression(node.expression.name) + ("(" + params_1 + ")");
}
if (ts.isIdentifier(node.expression) && node.expression.escapedText == "String") {
var params_2 = this.transpileArguments(node.arguments);
return this.transpileStringExpression(node.expression.name) + ("(" + params_2 + ")");
}
// Include context parameter if present
var callPath_1 = (expType && expType.symbol) ? expType.symbol.name + "." + node.expression.name.escapedText : this.transpileExpression(node.expression);
var params_2 = this.transpileArguments(node.arguments, node.expression.expression);
return callPath_1 + "(" + params_2 + ")";
var params_3 = this.transpileArguments(node.arguments, node.expression.expression);
return callPath_1 + "(" + params_3 + ")";
}
// Handle super calls properly
if (node.expression.kind == ts.SyntaxKind.SuperKeyword) {
var callPath_2 = this.transpileExpression(node.expression);
var params_3 = this.transpileArguments(node.arguments, ts.createNode(ts.SyntaxKind.ThisKeyword));
return "self.__base.constructor(" + params_3 + ")";
var params_4 = this.transpileArguments(node.arguments, ts.createNode(ts.SyntaxKind.ThisKeyword));
return "self.__base.constructor(" + params_4 + ")";
}
var callPath = this.transpileExpression(node.expression);
var params = this.transpileArguments(node.arguments);
Expand Down Expand Up @@ -584,6 +588,21 @@ var LuaTranspiler = /** @class */ (function () {
throw new TranspileError("Unsupported string function: " + expression.name.escapedText, node);
}
};
// Transpile a String._ property
LuaTranspiler.prototype.transpileStringExpression = function (identifier) {
var translation = {
fromCharCode: "string.char",
fromCodePoint: "utf8.char"
};
// TODO at check if compiler options is LUA 5.3
// should throw an exception if codepoint is used sub 5.3
if (translation[identifier.escapedText]) {
return "" + translation[identifier.escapedText];
}
else {
throw new TranspileError("Unsupported string property " + identifier.escapedText + ".", identifier);
}
};
LuaTranspiler.prototype.transpileArrayCallExpression = function (node) {
var expression = node.expression;
var params = this.transpileArguments(node.arguments);
Expand Down
26 changes: 24 additions & 2 deletions src/Transpiler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export class LuaTranspiler {

transpileImport(node: ts.ImportDeclaration): string {
const importFile = this.transpileExpression(node.moduleSpecifier);
if (!node.importClause) {
if (!node.importClause || !node.importClause.namedBindings) {
throw new TranspileError("Default Imports are not supported, please use named imports instead!", node);
}

Expand Down Expand Up @@ -595,10 +595,15 @@ export class LuaTranspiler {
return this.transpileMathExpression(node.expression.name) + `(${params})`;
}

if (ts.isIdentifier(node.expression) && node.expression.escapedText == "String") {
const params = this.transpileArguments(node.arguments);
return this.transpileStringExpression(node.expression.name) + `(${params})`;
}

// Include context parameter if present
let callPath = (expType && expType.symbol) ? `${expType.symbol.name}.${node.expression.name.escapedText}` : this.transpileExpression(node.expression);
let params = this.transpileArguments(node.arguments, node.expression.expression);

return `${callPath}(${params})`;
}

Expand Down Expand Up @@ -640,6 +645,23 @@ export class LuaTranspiler {
}
}

// Transpile a String._ property
transpileStringExpression(identifier: ts.Identifier): string {
const translation = {
fromCharCode: "string.char",
fromCodePoint: "utf8.char"
};

// TODO at check if compiler options is LUA 5.3
// should throw an exception if codepoint is used sub 5.3

if (translation[<string>identifier.escapedText]) {
return `${translation[<string>identifier.escapedText]}`;
} else {
throw new TranspileError(`Unsupported string property ${identifier.escapedText}.`, identifier);
}
}

transpileArrayCallExpression(node: ts.CallExpression): string {
const expression = <ts.PropertyAccessExpression>node.expression;
const params = this.transpileArguments(node.arguments);
Expand Down