kotovalexarian-likes-github/jashkenas--coffeescript
1
0
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2022-11-09 12:23:24 -05:00
Code Releases Activity

merge master (#4597)

Browse source
This commit is contained in:
Julian Rosse 2017-07-03 22:52:49 -05:00 committed by Geoffrey Booth
parent 704924c3cd
commit 8ea7edf02a
4 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/v1/index.html
View file

@ -615,7 +615,7 @@ pre .xml .cdata {
<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>

2
lib/coffeescript/rewriter.js
View file

@ -214,7 +214,7 @@
ours: true
}
]);
return tokens.splice(idx, 0, generate('CALL_START', '('));
return tokens.splice(idx, 0, generate('CALL_START', '(', ['', 'implicit function call', token[2]]));
};
endImplicitCall = function() {
stack.pop();

2
src/rewriter.coffee
View file

@ -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()

9
test/error_messages.coffee
View file

@ -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) ->
^
'''