Merge pull request jashkenas#1605 from geraldalewis/1513_obj_front_ops

jashkenas · jashkenas · commit 604e39b413d8 · 2011-08-15T08:55:24.000-07:00
jashkenas#1513 Top level bare obj literals with unary and exist ops
diff --git a/lib/coffee-script/nodes.js b/lib/coffee-script/nodes.js
diff --git a/src/nodes.coffee b/src/nodes.coffee
@@ -1324,11 +1324,14 @@ exports.Op = class Op extends Base
   unfoldSoak: (o) ->
     @operator in ['++', '--', 'delete'] and unfoldSoak o, this, 'first'
 
-  compileNode: (o) ->
+  compileNode: (o) ->    
+    isChain = @isChainable() and @first.isChainable()
+    # In chains, there's no need to wrap bare obj literals in parens, 
+    # as the chained expression is wrapped.
+    @first.front = @front unless isChain
     return @compileUnary     o if @isUnary()
-    return @compileChain     o if @isChainable() and @first.isChainable()
+    return @compileChain     o if isChain
     return @compileExistence o if @operator is '?'
-    @first.front = @front
     code = @first.compile(o, LEVEL_OP) + ' ' + @operator + ' ' +
            @second.compile(o, LEVEL_OP)
     if o.level <= LEVEL_OP then code else "(#{code})"
@@ -1469,6 +1472,7 @@ exports.Existence = class Existence extends Base
   invert: NEGATE
 
   compileNode: (o) ->
+    @expression.front = @front
     code = @expression.compile o, LEVEL_OP
     if IDENTIFIER.test(code) and not o.scope.check code
       [cmp, cnj] = if @negated then ['===', '||'] else ['!==', '&&']
diff --git a/test/objects.coffee b/test/objects.coffee
@@ -233,3 +233,7 @@ test "#1322: implicit call against implicit object with block comments", ->
     x: 2
     ### y ###
     y: 3
+
+test "#1513: Top level bare objs need to be wrapped in parens for unary and existence ops", ->
+  doesNotThrow -> CoffeeScript.run "{}?", bare: true
+  doesNotThrow -> CoffeeScript.run "{}.a++", bare: true
