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

lots of tweaks make the tests pass again

Browse Source
This commit is contained in:
Jeremy Ashkenas
2009-12-18 23:13:59 -05:00
parent 6f81ac3684
commit ad3b887df4
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/coffee_script/nodes.rb
View File

@@ -112,6 +112,10 @@ module CoffeeScript
@expression = expression
end
def line_ending
@expression.custom_return? ? '' : ';'
end
def compile(indent, scope, opts={})
return @expression.compile(indent, scope, opts.merge(:return => true)) if @expression.custom_return?
compiled = @expression.compile(indent, scope)
@@ -407,12 +411,12 @@ module CoffeeScript
set_result = "var #{rvar} = [];\n#{indent}"
save_result += "#{rvar}[#{ivar}] = "
return_result = rvar
return_result = "#{opts[:assign]} = #{return_result}" if opts[:assign]
return_result = "return #{return_result}" if opts[:return]
return_result = "#{opts[:assign]} = #{return_result};" if opts[:assign]
return_result = "return #{return_result};" if opts[:return]
return_result = "\n#{indent}#{return_result}"
if @filter
body = CallNode.new(ValueNode.new(LiteralNode.new(rvar), [AccessorNode.new('push')]), [@body])
body = @filter ? IfNode.new(@filter, body, nil, :statement) : body
body = IfNode.new(@filter, body, nil, :statement)
save_result = ''
suffix = ''
end
@@ -495,12 +499,12 @@ module CoffeeScript
class IfNode < Node
attr_reader :condition, :body, :else_body
def initialize(condition, body, else_body=nil, tag=nil)
def initialize(condition, body, else_body=nil, tags={})
@condition = condition
@body = body && body.unwrap
@else_body = else_body && else_body.unwrap
@tag = tag
@condition = OpNode.new("!", @condition) if @tag == :invert
@tags = tags
@condition = OpNode.new("!", @condition) if @tags[:invert]
end
def <<(else_body)
@@ -530,7 +534,7 @@ module CoffeeScript
# The IfNode only compiles into a statement if either of the bodies needs
# to be a statement.
def statement?
@is_statement ||= ((@tag == :statement) || @body.statement? || (@else_body && @else_body.statement?))
@is_statement ||= !!(@tags[:statement] || @body.statement? || (@else_body && @else_body.statement?))
end
def custom_return?