github/coffeescript
1
1
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2026-02-18 03:21:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

caught a close call bug with object comprehensions and not specifying the value

Browse Source
This commit is contained in:
Jeremy Ashkenas
2010-01-10 17:44:19 -05:00
parent bb5bf7f94f
commit 24408c785a
5 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/coffee_script/nodes.rb
View File

@@ -643,7 +643,7 @@ module CoffeeScript
range = @source.is_a?(ValueNode) && @source.literal.is_a?(RangeNode) && @source.properties.empty?
source = range ? @source.literal : @source
scope = o[:scope]
scope.find(@name)
name_found = @name && scope.find(@name)
index_found = @index && scope.find(@index)
body_dent = idt(1)
svar = scope.free_variable
@@ -658,8 +658,8 @@ module CoffeeScript
index_var = nil
source_part = "#{svar} = #{source.compile(o)};\n#{idt}"
for_part = "#{ivar}=0; #{ivar}<#{svar}.length; #{ivar}++"
for_part = "#{@index} in #{svar}" if @object
var_part = "#{body_dent}#{@name} = #{svar}[#{ivar}];\n"
for_part = "#{ivar} in #{svar}" if @object
var_part = @name ? "#{body_dent}#{@name} = #{svar}[#{ivar}];\n" : ''
end
body = @body
set_result = rvar ? "#{idt}#{rvar} = []; " : idt
@@ -680,7 +680,7 @@ module CoffeeScript
end
if @object
body = Expressions.wrap(IfNode.new(
CallNode.new(ValueNode.new(LiteralNode.wrap(svar), [AccessorNode.new(Value.new('hasOwnProperty'))]), [LiteralNode.wrap(@index)]),
CallNode.new(ValueNode.new(LiteralNode.wrap(svar), [AccessorNode.new(Value.new('hasOwnProperty'))]), [LiteralNode.wrap(ivar)]),
Expressions.wrap(body),
nil,
{:statement => true}