-
-
Notifications
You must be signed in to change notification settings - Fork 667
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.
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
#1059: Add support for floating numbers separator #1093
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,7 +26,8 @@ import { | |
isIdentifierPart, | ||
isDecimalDigit, | ||
isOctalDigit, | ||
isKeywordCharacter | ||
isKeywordCharacter, | ||
isDecimalSeparator, | ||
} from "./util"; | ||
|
||
/** Named token types. */ | ||
|
@@ -1499,16 +1500,20 @@ export class Tokenizer extends DiagnosticEmitter { | |
} | ||
|
||
readDecimalFloat(): f64 { | ||
// TODO: numeric separators (parseFloat can't handle these) | ||
var start = this.pos; | ||
var end = this.end; | ||
var text = this.source.text; | ||
while (this.pos < end && isDecimalDigit(text.charCodeAt(this.pos))) { | ||
|
||
while (this.pos < end) { | ||
let ch = text.charCodeAt(this.pos); | ||
if (!(isDecimalDigit(ch) || isDecimalSeparator(ch))) break; | ||
++this.pos; | ||
} | ||
if (this.pos < end && text.charCodeAt(this.pos) == CharCode.DOT) { | ||
++this.pos; | ||
while (this.pos < end && isDecimalDigit(text.charCodeAt(this.pos))) { | ||
while (this.pos < end) { | ||
let ch = text.charCodeAt(this.pos); | ||
if (!(isDecimalDigit(ch) || isDecimalSeparator(ch))) break; | ||
++this.pos; | ||
} | ||
} | ||
|
@@ -1522,12 +1527,14 @@ export class Tokenizer extends DiagnosticEmitter { | |
) { | ||
++this.pos; | ||
} | ||
while (this.pos < end && isDecimalDigit(text.charCodeAt(this.pos))) { | ||
while (this.pos < end) { | ||
let ch = text.charCodeAt(this.pos); | ||
if (!(isDecimalDigit(ch) || isDecimalSeparator(ch))) break; | ||
++this.pos; | ||
} | ||
} | ||
} | ||
return parseFloat(text.substring(start, this.pos)); | ||
return parseFloat(text.substring(start, this.pos).replace(/_/g, '')); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also we try to avoid RegExp |
||
} | ||
|
||
readHexFloat(): f64 { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -174,7 +174,11 @@ export function isWhiteSpace(c: i32): bool { | |
|
||
/** Tests if the specified character code is a valid decimal digit. */ | ||
export function isDecimalDigit(c: i32): bool { | ||
return c >= CharCode._0 && c <= CharCode._9; | ||
return c >= CharCode._0 && c <= CharCode._9 ; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: unnecessary space between semicolon and |
||
} | ||
|
||
export function isDecimalSeparator(c: i32): bool { | ||
return c === CharCode._; | ||
} | ||
|
||
/** Tests if the specified character code is a valid octal digit. */ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -60,3 +60,4 @@ | |
"1\"23"; | ||
"1\"2\\3"; | ||
"\0\n\\n\r"; | ||
1000_000.1234_1234; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -60,3 +60,4 @@ | |
"1\"23"; | ||
"1\"2\\3"; | ||
"\0\n\\n\r"; | ||
1000000.12341234; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks like it would accept
___123___123___.___123___
. Is that valid?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Any thoughts on this? :)