Add comments

grammar.coffee

@@ -7,6 +7,8 @@ commaSep = (rule) ->
 module.exports = compiler.grammar
   name: 'javascript',
 
+  ubiquitous: ["comment"]
+
   rules:
     program: -> repeat(@statement)
 
@@ -150,8 +152,12 @@ module.exports = compiler.grammar
       seq('"', repeat(choice(/[^"]/, '\\"')), '"'),
       seq("'", repeat(choice(/[^']/, "\\'")), "'")))
 
+    comment: -> token(choice(
+      seq("//", /.*/),
+      seq("/*", repeat(choice(/[^\*]/, /\*[^/]/)), "*/")))
+
     regex: -> token(seq(
-      '/', repeat(choice(/[^/]/, '\\/')), '/',
+      '/', repeat(choice(/[^/\n]/, '\\/')), '/',
       repeat(choice('i', 'g'))))
 
     true: -> keyword("true")

grammar_test/statements.txt

@@ -77,3 +77,28 @@ var x, y = {}, z;
     (identifier)
     (identifier) (object)
     (identifier)))
+
+============================================
+Comments
+============================================
+
+{
+
+  // This is a property
+  aProperty: 1,
+
+
+  /*
+   * This is a method
+   */
+  aMethod: function() {}
+};
+
+---
+
+(program
+  (expression_statement (object
+    (comment)
+    (identifier) (number)
+    (comment)
+    (identifier) (function (formal_parameters) (statement_block)))))