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

Issue #619. 'new' operator misbehavior.

Browse Source
This commit is contained in:
Jeremy Ashkenas
2010-08-21 18:54:24 -04:00
parent d5d5de55ae
commit e7834de929
7 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nodes.coffee
View File

@@ -449,7 +449,9 @@ exports.CallNode = class CallNode extends BaseNode
compilation = if @isSuper
@compileSuper(args.join(', '), o)
else
"#{@prefix()}#{@variable.compile(o)}(#{ args.join(', ') })"
value = @variable.compile o
value = "(#{value})" if @isNew and @variable instanceof ValueNode and @variable.hasProperties()
"#{@prefix()}#{value}(#{ args.join(', ') })"
compilation
# `super()` is converted into a call against the superclass's implementation
@@ -760,7 +762,7 @@ exports.ClassNode = class ClassNode extends BaseNode
construct = @idt() + (new AssignNode(@variable, constructor)).compile(merge o, {sharedScope: constScope}) + ';'
props = if !props.empty() then '\n' + props.compile(o) else ''
extension = if extension then '\n' + @idt() + extension.compile(o) + ';' else ''
returns = if @returns then '\n' + new ReturnNode(@variable).compile(o) else ''
returns = if @returns then '\n' + (new ReturnNode(@variable)).compile(o) else ''
construct + extension + props + returns
#### AssignNode
@@ -850,7 +852,7 @@ exports.AssignNode = class AssignNode extends BaseNode
else
idx = literal(if splat then "#{valVar}.length - #{olength - idx}" else idx) if typeof idx isnt 'object'
val = new ValueNode(literal(valVar), [new accessClass(idx)])
assigns.push(new AssignNode(obj, val).compile(o))
assigns.push((new AssignNode(obj, val)).compile(o))
code = assigns.join("\n")
code
@@ -1068,7 +1070,7 @@ exports.WhileNode = class WhileNode extends BaseNode
pre = "#{set}#{@tab}while (#{cond})"
@body = Expressions.wrap([new IfNode(@guard, @body)]) if @guard
if @returns
post = '\n' + new ReturnNode(literal(rvar)).compile(merge(o, indent: @idt()))
post = '\n' + (new ReturnNode(literal(rvar))).compile merge o, indent: @idt()
else
post = ''
"#{pre} {\n#{ @body.compile(o) }\n#{@tab}}#{post}"
@@ -1342,7 +1344,7 @@ exports.ForNode = class ForNode extends BaseNode
this
compileReturnValue: (val, o) ->
return '\n' + new ReturnNode(literal(val)).compile(o) if @returns
return '\n' + (new ReturnNode(literal(val))).compile(o) if @returns
return '\n' + val if val
''
@@ -1372,7 +1374,7 @@ exports.ForNode = class ForNode extends BaseNode
svar = scope.freeVariable()
sourcePart = "#{svar} = #{ @source.compile(o) };"
if @pattern
namePart = new AssignNode(@name, literal("#{svar}[#{ivar}]")).compile(merge o, {indent: @idt(1), top: true}) + '\n'
namePart = (new AssignNode(@name, literal("#{svar}[#{ivar}]"))).compile(merge o, {indent: @idt(1), top: true}) + '\n'
else
namePart = "#{name} = #{svar}[#{ivar}]" if name
unless @object