refactor

Author: zdenko

lib/coffeescript/grammar.js

@@ -333,11 +333,7 @@ grammar =
   Value: [
     o 'Assignable'
     o 'Literal',                                -> new Value $1
-    o 'Parenthetical',                          ->
-        if $1.hasParentheses()
-          new Value $1
-        else
-          $1
+    o 'Parenthetical',                          -> new Value $1
     o 'Range',                                  -> new Value $1
     o 'Invocation',                             -> new Value $1
     o 'This'
@@ -601,20 +597,8 @@ grammar =
   # where only values are accepted, wrapping it in parentheses will always do
   # the trick.
   Parenthetical: [
-    o '( Body )',                               ->
-        # When `Parens` block includes a `StatementLiteral` (e.g. `(b; break) for a in arr`),
-        # it won't compile since `Parens` (`(b; break)`) is compiled as `Value` and
-        # pure statement (`break`) can't be used in an expression.
-        # For this reasons, we return `Block`, which is passed further to `Value` and `Expression`.
-        if $2.hasStatementLiteral()
-          LOC(2)(Block.wrap [$2])
-        else
-          new Parens $2
-    o '( INDENT Body OUTDENT )',                ->
-        if $3.hasStatementLiteral()
-          LOC(3)(Block.wrap [$3])
-        else
-          new Parens $3
+    o '( Body )',                               -> new Parens $2
+    o '( INDENT Body OUTDENT )',                -> new Parens $3
   ]
 
   # The condition portion of a while loop.

lib/coffeescript/nodes.js

@@ -388,12 +388,6 @@ exports.Base = class Base
       answer = answer.concat fragments
     answer
 
-  hasStatementLiteral: ->
-    @contains (n) -> n instanceof StatementLiteral
-
-  hasParentheses: ->
-    @ instanceof Parens
-
 #### HoistTarget
 
 # A **HoistTargetNode** represents the output location in the node tree for a hoisted node.
@@ -869,6 +863,11 @@ exports.Value = class Value extends Base
   constructor: (base, props, tag, isDefaultValue = no) ->
     super()
     return base if not props and base instanceof Value
+    # When `Parens` block includes a `StatementLiteral` (e.g. `(b; break) for a in arr`),
+    # it won't compile since `Parens` (`(b; break)`) is compiled as `Value` and
+    # pure statement (`break`) can't be used in an expression.
+    # For this reasons, we return `Block` instead of `Parens`.
+    return base.unwrap() if base instanceof Parens and base.contains (n) -> n instanceof StatementLiteral
     @base           = base
     @properties     = props or []
     @[tag]          = yes if tag