Skip to content

Add support for extended Unicode escape sequences in strings and templates #2169

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
DanielRosenwasser merged 16 commits into from
Mar 3, 2015
Merged

Add support for extended Unicode escape sequences in strings and templates #2169

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f16e875
Added tests for escapes in strings, regexes, and templates.
DanielRosenwasser Feb 25, 2015
ee71954
Simplified scanHexDigits by just wrapping the intended functionality …
DanielRosenwasser Feb 25, 2015
1e602de
Merge branch 'master' into withANameLikeUnicodeYoudThinkThereWouldntB…
DanielRosenwasser Feb 26, 2015
6ad1780
Added tests and updated baselines.
DanielRosenwasser Feb 26, 2015
bbf9579
Added scanning support for extended escapes.
DanielRosenwasser Feb 26, 2015
a81bf8c
Emit non-ASCII characters with unicode escape sequences.
DanielRosenwasser Feb 27, 2015
9d89668
Made unicode escapes use uppercase hex codes.
DanielRosenwasser Feb 27, 2015
4657c2d
Emit all strings with extended escapes using the same scheme as templ…
DanielRosenwasser Feb 27, 2015
cad8f6b
Only add an extended Unicode escape when it is entirely valid.
DanielRosenwasser Feb 27, 2015
3c34478
Merge branch 'master' into withANameLikeUnicodeYoudThinkThereWouldntB…
DanielRosenwasser Feb 27, 2015
5437b3d
Removed unused variable.
DanielRosenwasser Feb 28, 2015
b1837c8
Addressed some CR feedback.
DanielRosenwasser Feb 28, 2015
6be13a9
Fixed error message.
DanielRosenwasser Mar 2, 2015
5ec68eb
Harden against trees without parent pointers for emitting literals; f…
DanielRosenwasser Mar 2, 2015
f9cc013
Addressed CR feedback, also properly accounted for template literals.
DanielRosenwasser Mar 3, 2015
5c5a489
Words.
DanielRosenwasser Mar 3, 2015
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
Prev Previous commit
Next Next commit
Harden against trees without parent pointers for emitting literals; f… 
…ix lookahead in text for numeric literal indicators.
  • Loading branch information
@DanielRosenwasser
DanielRosenwasser committed Mar 2, 2015
commit 5ec68eb0e454cc70f7e339e4a3d23911c61d5833
26 changes: 15 additions & 11 deletions src/compiler/emitter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2178,15 +2178,17 @@ module ts {
}
}

function isBinaryOrOctalIntegerLiteral(text: string): boolean {
if (text.length <= 0) {
return false;
}

if (text.charCodeAt(1) === CharacterCodes.B || text.charCodeAt(1) === CharacterCodes.b ||
text.charCodeAt(1) === CharacterCodes.O || text.charCodeAt(1) === CharacterCodes.o) {
return true;
function isBinaryOrOctalIntegerLiteral(node: LiteralExpression, text: string): boolean {
if (node.kind === SyntaxKind.NumericLiteral && text.length > 1) {
switch (text.charCodeAt(1)) {
case CharacterCodes.b:
case CharacterCodes.B:
case CharacterCodes.o:
case CharacterCodes.O:
return true;
}
}

return false;
}

Expand All @@ -2195,13 +2197,15 @@ module ts {
? getDoubleQuotedStringTextOfLiteral(node)
: node.parent
? getSourceTextOfNodeFromSourceFile(currentSourceFile, node)
: node.text; // TODO(drosen): Is this correct?
: node.kind === SyntaxKind.NumericLiteral
? node.text
: getDoubleQuotedStringTextOfLiteral(node);

if (compilerOptions.sourceMap && (node.kind === SyntaxKind.StringLiteral || isTemplateLiteralKind(node.kind))) {
writer.writeLiteral(text);
}
// For version below ES6, emit binary integer literal and octal integer literal in canonical form
else if (languageVersion < ScriptTarget.ES6 && node.kind === SyntaxKind.NumericLiteral && isBinaryOrOctalIntegerLiteral(text)) {
// For versions below ES6, emit binary & octal literals in their canonical decimal form.
else if (languageVersion < ScriptTarget.ES6 && isBinaryOrOctalIntegerLiteral(node, text)) {
write(node.text);
}
else {
Expand Down