[WIP][CS2] Block comments in array literals

src/grammar.coffee

@@ -464,8 +464,7 @@ grammar =
 
   # The array literal.
   Array: [
-    o '[ ]',                                    -> new Arr []
-    o '[ ArgList OptComma ]',                   -> new Arr $2
+    o '[ ElementList OptComma ]',               -> new Arr $2
   ]
 
   # Inclusive and exclusive range dots.
@@ -487,8 +486,17 @@ grammar =
     o 'RangeDots',                              -> new Range null, null, $1
   ]
 
-  # The **ArgList** is both the list of objects passed into a function call,
-  # as well as the contents of an array literal
+  # The **ElementList** holds the contents of an array literal
+  # (i.e. comma-separated expressions). Newlines work as well.
+  ElementList: [
+    o '',                                                         -> []
+    o 'Arg',                                                      -> [$1]
+    o 'ElementList , Arg',                                        -> $1.concat $3
+    o 'ElementList OptComma TERMINATOR Arg',                      -> $1.concat $4
+    o 'ElementList OptComma INDENT ElementList OptComma OUTDENT', -> $1.concat $4
+  ]
+
+  # The **ArgList** is the list of objects passed into a function call,
   # (i.e. comma-separated expressions). Newlines work as well.
   ArgList: [
     o 'Arg',                                              -> [$1]

src/nodes.coffee

@@ -69,7 +69,10 @@ exports.Base = class Base
     node     = @unfoldSoak(o) or this
     node.tab = o.indent
     if o.level is LEVEL_TOP or not node.isStatement(o)
-      node.compileNode o
+      if node instanceof Comment and not o.level is LEVEL_TOP
+        node.error 'block comments not permitted here'
+      else
+        node.compileNode o
     else
       node.compileClosure o
 
@@ -765,7 +768,7 @@ exports.Comment = class Comment extends Base
     comment = @comment.replace /^(\s*)#(?=\s)/gm, "$1 *"
     code = "/*#{multident comment, @tab}#{if '\n' in comment then "\n#{@tab}" else ''} */"
     code = o.indent + code if (level or o.level) is LEVEL_TOP
-    [@makeCode("\n"), @makeCode(code)]
+    [@makeCode(code)]
 
 #### Call
 
@@ -1223,10 +1226,12 @@ exports.Arr = class Arr extends Base
 
     compiledObjs = (obj.compileToFragments o, LEVEL_LIST for obj in @objects)
     for fragments, index in compiledObjs
-      if index
-        answer.push @makeCode ", "
       answer.push fragments...
-    if fragmentsToText(answer).indexOf('\n') >= 0
+      if fragments[0].type is 'Comment'
+        answer.push @makeCode ' '
+      else unless index is compiledObjs.length - 1
+        answer.push @makeCode ', '
+    if fragmentsToText(answer).includes('\n')
       answer.unshift @makeCode "[\n#{o.indent}"
       answer.push @makeCode "\n#{@tab}]"
     else
@@ -3086,7 +3091,9 @@ exports.If = class If extends Base
     cond = @condition.compileToFragments o, LEVEL_COND
     body = @bodyNode().compileToFragments o, LEVEL_LIST
     alt  = if @elseBodyNode() then @elseBodyNode().compileToFragments(o, LEVEL_LIST) else [@makeCode('void 0')]
-    fragments = cond.concat @makeCode(" ? "), body, @makeCode(" : "), alt
+    body.push @makeCode('void 0') if @bodyNode()     instanceof Comment
+    alt.push  @makeCode('void 0') if @elseBodyNode() instanceof Comment
+    fragments = cond.concat @makeCode(' ? '), body, @makeCode(' : '), alt
     if o.level >= LEVEL_COND then @wrapInParentheses fragments else fragments
 
   unfoldSoak: ->

test/classes.coffee

@@ -553,7 +553,6 @@ test "#1966: external constructors should produce their return value", ->
   ok (new A) not instanceof A
 
 test "#1980: regression with an inherited class with static function members", ->
-
   class A
 
   class B extends A
@@ -572,28 +571,6 @@ test "#1534: class then 'use strict'", ->
   doesNotThrow -> CoffeeScript.run "class then #{error}", bare: yes
   doesNotThrow -> CoffeeScript.run "class then #{error};'use strict'", bare: yes
 
-  # comments are ignored in the Directive Prologue
-  comments = ["""
-  class
-    ### comment ###
-    'use strict'
-    #{error}""",
-  """
-  class
-    ### comment 1 ###
-    ### comment 2 ###
-    'use strict'
-    #{error}""",
-  """
-  class
-    ### comment 1 ###
-    ### comment 2 ###
-    'use strict'
-    #{error}
-    ### comment 3 ###"""
-  ]
-  throws (-> CoffeeScript.run comment, bare: yes) for comment in comments
-
   # [ES5 §14.1](http://es5.github.com/#x14.1) allows for other directives
   directives = ["""
   class
@@ -607,16 +584,9 @@ test "#1534: class then 'use strict'", ->
     #{error}""",
   """
   class
-    ### comment 1 ###
     'directive 1'
     'use strict'
-    #{error}""",
-  """
-  class
-    ### comment 1 ###
-    'directive 1'
-    ### comment 2 ###
-    'use strict'
+    ### comment ###
     #{error}"""
   ]
   throws (-> CoffeeScript.run directive, bare: yes) for directive in directives
@@ -632,8 +602,8 @@ test "#2052: classes should work in strict mode", ->
 test "directives in class with extends ", ->
   strictTest = """
     class extends Object
-      ### comment ###
       'use strict'
+      ### comment ###
       do -> eq this, undefined
   """
   CoffeeScript.run strictTest, bare: yes

test/comments.coffee

@@ -267,7 +267,6 @@ test "#3132: Format indented block-comment nicely", ->
   var fn;
 
   fn = function() {
-
     /*
      * Indented
     Multiline
@@ -362,7 +361,6 @@ test "#3132: Place block-comments nicely", ->
 
   DummyClass = (function() {
     class DummyClass {
-
       /**
        * @constructor
        */
@@ -371,7 +369,6 @@ test "#3132: Place block-comments nicely", ->
 
     };
 
-
     /**
      * Singleton reference
      *
@@ -412,3 +409,6 @@ test "#3761: Multiline comment at end of an object", ->
 test "#4375: UTF-8 characters in comments", ->
   # 智に働けば角が立つ、情に掉させば流される。
   ok yes
+
+test "#3735: Multiline comment not treated as value", ->
+  throws -> CoffeeScript.compile 'a + ### Comment ###'