Skip to content

[CS1] fix #4260 and #1349: splat error with soak properties or expressions #4643

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 4 commits into from
Aug 27, 2017
Merged

[CS1] fix #4260 and #1349: splat error with soak properties or expressions #4643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb21fbe
fix splat error with soak properties or expressions
Aug 15, 2017
a302e53
Add test based on #4260
Aug 23, 2017
16f782b
Add test based on #1349
Aug 23, 2017
17fb5ca
remove 'void 0' replacement; add Splat::compileNode
Aug 27, 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
12 changes: 6 additions & 6 deletions lib/coffee-script/nodes.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/nodes.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1812,7 +1812,7 @@ exports.Splat = class Splat extends Base
assigns: (name) ->
@name.assigns name

compileToFragments: (o) ->
compileNode: (o) ->
@name.compileToFragments o
Copy link
Collaborator

@GeoffreyBooth GeoffreyBooth Aug 27, 2017

Choose a reason for hiding this comment

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

Should this get LEVEL_OP too?

Copy link
Collaborator

@connec connec Aug 27, 2017

Choose a reason for hiding this comment

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

In this case no, since in CS1 splats are not operators, but are instead handled by Arr and Assign.


unwrap: -> @name
Expand Down
27 changes: 24 additions & 3 deletions test/arrays.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@ test "array splat expansions with assignments", ->
eq 4, b
arrayEq [0,1,2,3,4], list


test "mixed shorthand objects in array lists", ->

arr = [
a:1
'b'
Expand All @@ -58,7 +56,6 @@ test "mixed shorthand objects in array lists", ->
eq arr[2].b, 1
eq arr[3], 'b'


test "array splats with nested arrays", ->
nonce = {}
a = [nonce]
Expand All @@ -70,6 +67,30 @@ test "array splats with nested arrays", ->
list = [1, 2, a...]
arrayEq list, [1, 2, [nonce]]

test "#4260: splat after existential operator soak", ->
a = {b: [3]}
foo = (a) -> [a]
arrayEq [a?.b...], [3]
arrayEq [c?.b ? []...], []
arrayEq foo(a?.b...), [3]
arrayEq foo(c?.b ? []...), [undefined]
e = yes
f = null
arrayEq [(a if e)?.b...], [3]
arrayEq [(a if f)?.b ? []...], []
arrayEq foo((a if e)?.b...), [3]
arrayEq foo((a if f)?.b ? []...), [undefined]

test "#1349: trailing if after splat", ->
a = [3]
b = yes
c = null
foo = (a) -> [a]
arrayEq [a if b...], [3]
arrayEq [(a if c) ? []...], []
arrayEq foo((a if b)...), [3]
arrayEq foo((a if c) ? []...), [undefined]

test "#1274: `[] = a()` compiles to `false` instead of `a()`", ->
a = false
fn = -> a = true
Expand Down