Skip to content

[CS2] Fix #3098: Suppressed newline should be unsuppressed by semicolon #4669

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
merged 2 commits into from
Sep 1, 2017
Merged

[CS2] Fix #3098: Suppressed newline should be unsuppressed by semicolon #4669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a93368a
Fix #3098: Suppressed newline should be unsuppressed by semicolon
GeoffreyBooth Aug 30, 2017
5da535a
Merge branch '2' into semicolon-unsuppression
GeoffreyBooth Aug 31, 2017
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
31 changes: 22 additions & 9 deletions lib/coffeescript/lexer.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions src/lexer.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ exports.Lexer = class Lexer
@token 'OUTDENT', moveOut, 0, outdentLength
moveOut -= dent
@outdebt -= moveOut if dent
@tokens.pop() while @value() is ';'
@suppressSemicolons()

@token 'TERMINATOR', '\n', outdentLength, 0 unless @tag() is 'TERMINATOR' or noNewlines
@indent = decreasedIndent
Expand All @@ -527,7 +527,7 @@ exports.Lexer = class Lexer

# Generate a newline token. Consecutive newlines get merged together.
newlineToken: (offset) ->
@tokens.pop() while @value() is ';'
@suppressSemicolons()
@token 'TERMINATOR', '\n', offset, 0 unless @tag() is 'TERMINATOR'
this

Expand Down Expand Up @@ -662,6 +662,7 @@ exports.Lexer = class Lexer
@exportSpecifierList = no

if value is ';'
@error 'unexpected ;' if prev?[0] in ['=', UNFINISHED...]
Copy link
Collaborator

@vendethiel vendethiel Aug 30, 2017

Choose a reason for hiding this comment

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

do we not want = in UNFINISHED?

Copy link
Collaborator

@vendethiel vendethiel Aug 30, 2017

Choose a reason for hiding this comment

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

or maybe the other way around: what does adding in UNFINISHED fixes, given that prev?[0] is '=' is the relevant fix here? Same in suppressSemicolons.

Copy link
Collaborator Author

@GeoffreyBooth GeoffreyBooth Aug 30, 2017

Choose a reason for hiding this comment

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

See #3098 (comment)

UNFINISHED covers all the similar tokens like += etc. I think @jashkenas in his comment was worried about the special cases around =, like =(newline)(object literal).

Copy link
Collaborator Author

@GeoffreyBooth GeoffreyBooth Aug 31, 2017

Choose a reason for hiding this comment

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

Also, putting = into UNFINISHED causes tests to fail.

Copy link
Collaborator

@vendethiel vendethiel Sep 1, 2017

Choose a reason for hiding this comment

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

Ok. LGTM then.

@seenFor = @seenImport = @seenExport = no
tag = 'TERMINATOR'
else if value is '*' and prev?[0] is 'EXPORT'
Expand Down Expand Up @@ -1053,6 +1054,11 @@ exports.Lexer = class Lexer
when other then (if options.double then "\\#{other}" else other)
"#{options.delimiter}#{body}#{options.delimiter}"

suppressSemicolons: ->
while @value() is ';'
@tokens.pop()
@error 'unexpected ;' if @prev()?[0] in ['=', UNFINISHED...]

# Throws an error at either a given offset from the current chunk or at the
# location of a token (`token[2]`).
error: (message, options = {}) ->
Expand Down
9 changes: 9 additions & 0 deletions test/error_messages.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1759,3 +1759,12 @@ test "#3199: error message for throw indented comprehension", ->
x for x in [1, 2, 3]
^
'''

test "#3098: suppressed newline should be unsuppressed by semicolon", ->
assertErrorFormat '''
a = ; 5
''', '''
[stdin]:1:5: error: unexpected ;
a = ; 5
^
'''