Implement optional trailing commas #97
Merged
Conversation
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
Trailing commas are allowed in these situations in JS/TS: * Array literals * Argument lists * Parameter lists * Enums * Type parameter lists * Type argument lists (Technically filed as microsoft/TypeScript#21984 ) They're also allowed in these cases not (yet) supported by AssemblyScript: * Object literals * Array destructures * Object destructures All of these cases had similar-looking code, which needed to be tweaked to handle the possibility of a comma before the close-delimiter. Type arguments were a little different because they take a backtracking approach. I also fixed a missing case in the AST printer: `export function` wasn't being printed right.
dcodeIO
reviewed
May 6, 2018
src/parser.ts
Outdated
| @@ -900,17 +902,21 @@ export class Parser extends DiagnosticEmitter { | |||
|
|
|||
| var typeParameters = new Array<TypeParameterNode>(); | |||
| if (!tn.skip(Token.GREATERTHAN)) { | |||
| do { | |||
| while (!tn.skip(Token.GREATERTHAN)) { | |||
There was a problem hiding this comment.
Maybe you have an idea how the initial double-check for GREATERTHAN could be avoided? :)
There was a problem hiding this comment.
I guess do/while handles that pretty nicely here. Will update.
There was a problem hiding this comment.
Actually, I'll just do a length check for the "no type parameters" case so this looks like the other cases.
|
Thanks! |
alangpierce
added a commit
to alangpierce/assemblyscript
that referenced
this pull request
May 20, 2018
This uses the same strategy as AssemblyScript#97 for two more cases in the parser.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Trailing commas are allowed in these situations in JS/TS:
They're also allowed in these cases not (yet) supported by AssemblyScript:
All of these cases had similar-looking code, which needed to be tweaked to
handle the possibility of a comma before the close-delimiter. Type arguments
were a little different because they take a backtracking approach.
I also fixed a missing case in the AST printer:
export functionwasn't beingprinted right.