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

Fix expansion in destructuring inside comprehensions

Browse source
This commit is contained in:
xixixao 2014-01-24 18:18:55 +00:00
parent daa6ad5470
commit bd6b4142fe
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/coffee-script/nodes.js
View file

@ -2144,6 +2144,7 @@
Expansion.prototype.isComplex = NO; Expansion.prototype.isComplex = NO;
Expansion.prototype.compileNode = function(o) { Expansion.prototype.compileNode = function(o) {
throw new Error;
return this.error('Expansion must be used inside a destructuring assignment or parameter list'); return this.error('Expansion must be used inside a destructuring assignment or parameter list');
}; };
@ -2679,7 +2680,9 @@
} }
source = this.range ? this.source.base : this.source; source = this.range ? this.source.base : this.source;
scope = o.scope; scope = o.scope;
name = this.name && (this.name.compile(o, LEVEL_LIST)); if (!this.pattern) {
name = this.name && (this.name.compile(o, LEVEL_LIST));
}
index = this.index && (this.index.compile(o, LEVEL_LIST)); index = this.index && (this.index.compile(o, LEVEL_LIST));
if (name && !this.pattern) { if (name && !this.pattern) {
scope.find(name); scope.find(name);

2
src/nodes.coffee
View file

@ -1914,7 +1914,7 @@ exports.For = class For extends While
@returns = no if lastJumps and lastJumps instanceof Return @returns = no if lastJumps and lastJumps instanceof Return
source = if @range then @source.base else @source source = if @range then @source.base else @source
scope = o.scope scope = o.scope
name = @name and (@name.compile o, LEVEL_LIST) name = @name and (@name.compile o, LEVEL_LIST) if not @pattern
index = @index and (@index.compile o, LEVEL_LIST) index = @index and (@index.compile o, LEVEL_LIST)
scope.find(name) if name and not @pattern scope.find(name) if name and not @pattern
scope.find(index) if index scope.find(index) if index

9
test/comprehensions.coffee
View file

@ -537,7 +537,10 @@ test "#2525, #1187, #1208, #1758, looping over an array backwards", ->
arrayEq (index for i, index in list by ident(-1) * 2), [4, 2, 0] arrayEq (index for i, index in list by ident(-1) * 2), [4, 2, 0]
test "splats in destructuring in comprehensions", ->
list = [[0, 1, 2], [2, 3, 4], [4, 5, 6]]
arrayEq (seq for [rep, seq...] in list), [[1, 2], [3, 4], [5, 6]]
test "#156: expansion in destructuring in comprehensions", ->
list = [[0, 1, 2], [2, 3, 4], [4, 5, 6]]
arrayEq (last for [..., last] in list), [2, 4, 6]