Skip to content

Support for single-character escape sequences #160

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 5 commits into from
Jul 28, 2018
Merged

Support for single-character escape sequences #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
abdb7dd
Support for string literal character escape sequences
Janne252 Jul 28, 2018
41847b5
Add test files for character escape sequences
Janne252 Jul 28, 2018
c06103b
Merge branch 'master' of https://github.com/Perryvw/TypescriptToLua
Janne252 Jul 28, 2018
f620f93
Escape template string escape sequences
Janne252 Jul 28, 2018
6608764
Complex template string escape test
Janne252 Jul 28, 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
34 changes: 30 additions & 4 deletions src/Transpiler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,30 @@ export abstract class LuaTranspiler {
}
}

public escapeString(text: string): string {
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String
const escapeSequences: Array<[RegExp, string]> = [
[/[\\]/g, "\\\\"],
[/[\']/g, "\\\'"],
[/[\`]/g, "\\\`"],
[/[\"]/g, "\\\""],
[/[\n]/g, "\\n"],
[/[\r]/g, "\\r"],
[/[\v]/g, "\\v"],
[/[\t]/g, "\\t"],
[/[\b]/g, "\\b"],
[/[\f]/g, "\\f"],
[/[\0]/g, "\\0"],
];

if (text.length > 0) {
for (const [regex, replacement] of escapeSequences) {
text = text.replace(regex, replacement);
}
}
return text;
}

public transpileExpression(node: ts.Node, brackets?: boolean): string {
switch (node.kind) {
case ts.SyntaxKind.BinaryExpression:
Expand All @@ -714,7 +738,7 @@ export abstract class LuaTranspiler {
return this.transpileIdentifier(node as ts.Identifier);
case ts.SyntaxKind.StringLiteral:
case ts.SyntaxKind.NoSubstitutionTemplateLiteral:
const text = (node as ts.StringLiteral).text;
Copy link
Copy Markdown
Member

@Perryvw Perryvw Jul 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then this would just be something like const text = this.escapeString((node as ts.StringLiteral).text);

const text = this.escapeString((node as ts.StringLiteral).text);
return `"${text}"`;
case ts.SyntaxKind.TemplateExpression:
return this.transpileTemplateExpression(node as ts.TemplateExpression);
Expand Down Expand Up @@ -889,13 +913,15 @@ export abstract class LuaTranspiler {
}

public transpileTemplateExpression(node: ts.TemplateExpression): string {
const parts = [`"${node.head.text}"`];
const parts = [`"${this.escapeString(node.head.text)}"`];
node.templateSpans.forEach(span => {
const expr = this.transpileExpression(span.expression, true);
const text = this.escapeString(span.literal.text);

if (ts.isTemplateTail(span.literal)) {
parts.push(`tostring(${expr}).."${span.literal.text}"`);
parts.push(`tostring(${expr}).."${text}"`);
} else {
parts.push(`tostring(${expr}).."${span.literal.text}"`);
parts.push(`tostring(${expr}).."${text}"`);
}
});
return parts.join("..");
Expand Down
18 changes: 18 additions & 0 deletions test/translation/lua/characterEscapeSequence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
local quoteInDoubleQuotes = "\' \' \'"

local quoteInTemplateString = "\' \' \'"

local doubleQuoteInQuotes = "\" \" \""

local doubleQuoteInDoubleQuotes = "\" \" \""

local doubleQuoteInTemplateString = "\" \" \""

local escapedCharsInQuotes = "\\ \0 \b \t \n \v \f \" \' \`"

local escapedCharsInDoubleQUotes = "\\ \0 \b \t \n \v \f \" \' \`"

local escapedCharsInTemplateString = "\\ \0 \b \t \n \v \f \" \' \`"

local nonEmptyTemplateString = "Level 0: \n\t "..tostring("Level 1: \n\t\t "..tostring("Level 3: \n\t\t\t "..tostring("Last level \n --").." \n --").." \n --").." \n --"

12 changes: 12 additions & 0 deletions test/translation/ts/characterEscapeSequence.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
let quoteInDoubleQuotes = "' ' '";
let quoteInTemplateString = `' ' '`;

let doubleQuoteInQuotes = '" " "';
let doubleQuoteInDoubleQuotes = "\" \" \"";
let doubleQuoteInTemplateString = `" " "`;

let escapedCharsInQuotes = '\\ \0 \b \t \n \v \f \" \' \`';
let escapedCharsInDoubleQUotes = "\\ \0 \b \t \n \v \f \" \' \`";
let escapedCharsInTemplateString = `\\ \0 \b \t \n \v \f \" \' \``;

let nonEmptyTemplateString = `Level 0: \n\t ${`Level 1: \n\t\t ${`Level 3: \n\t\t\t ${'Last level \n --'} \n --`} \n --`} \n --`;