Skip to content

[CS2] merge master post-#4585 #4597

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 1 commit into from
Jul 4, 2017
Merged

[CS2] merge master post-#4585 #4597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion docs/v1/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@
<p><strong>Latest Version:</strong> <a href="https://github.com/jashkenas/coffeescript/tarball/1.12.6">1.12.6</a></p>
<blockquote class="uneditable-code-block"><pre><code class="language-bash">npm install -g coffeescript
</code></pre>
</blockquote><p><strong>CoffeeScript 2 is coming!</strong> It adds support for <a href="/v2/#classes">ES2015 classes</a>, <a href="/v2/#fat-arrow"><code>async</code>/<code>await</code></a>, and generates JavaScript using ES2015+ syntax. <a href="/v2/">Learn more</a>.</p></p>
</blockquote><p><strong>CoffeeScript 2 is coming!</strong> It adds support for <a href="/v2/#classes">ES2015 classes</a>, <a href="/v2/#fat-arrow"><code>async</code>/<code>await</code></a>, <a href="/v2/#jsx">JSX</a>, <a href="/v2/#splats">object rest/spread syntax</a>, and generates JavaScript using ES2015+ syntax. <a href="/v2/">Learn more</a>.</p></p>

<h2>Overview</h2>
<p><em>CoffeeScript on the left, compiled JavaScript output on the right.</em></p>
Expand Down
2 changes: 1 addition & 1 deletion lib/coffeescript/rewriter.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion src/rewriter.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ exports.Rewriter = class Rewriter

startImplicitCall = (idx) ->
stack.push ['(', idx, ours: yes]
tokens.splice idx, 0, generate 'CALL_START', '('
tokens.splice idx, 0, generate 'CALL_START', '(', ['', 'implicit function call', token[2]]

endImplicitCall = ->
stack.pop()
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 @@ -1627,3 +1627,12 @@ test "#3906: error for unusual indentation", ->
c
^^
'''

test "#4283: error message for implicit call", ->
assertErrorFormat '''
(a, b c) ->
''', '''
[stdin]:1:5: error: unexpected implicit function call
(a, b c) ->
^
'''