add comment support

Author: tj

index.js

@@ -14,7 +14,9 @@ module.exports = function(css){
   function stylesheet() {
     var rules = [];
     var node;
+    comments();
     while (node = rule()) {
+      comments();
       rules.push(node);
     }
     return { stylesheet: { rules: rules }};
@@ -31,6 +33,37 @@ module.exports = function(css){
     return m;
   }
 
+  /**
+   * Parse whitespace.
+   */
+
+  function whitespace() {
+    match(/^\s*/);
+  }
+
+  /**
+   * Parse comments;
+   */
+
+  function comments() {
+    while (comment()) ;
+  }
+
+  /**
+   * Parse comment.
+   */
+
+  function comment() {
+    if ('/' == css[0] && '*' == css[1]) {
+      var i = 2;
+      while ('*' != css[i] && '/' != css[i + 1]) ++i;
+      i += 2;
+      css = css.slice(i);
+      whitespace();
+      return true;
+    }
+  }
+
   /**
    * Parse selector.
    */
@@ -71,12 +104,23 @@ module.exports = function(css){
 
   function rule() {
     var node = { selector: selector(), declarations: [] };
+
+    // selector
     if (!node.selector) return;
+    comments();
+
+    // {
     if (!match(/^{\s+/)) return;
+    comments();
+
+    // declarations
     var decl;
     while (decl = declaration()) {
       node.declarations.push(decl);
+      comments();
     }
+
+    // }
     if (!match(/^}\s*/)) return;
     return node;
   }

npm-debug.log

@@ -0,0 +1,36 @@
+0 info it worked if it ends with ok
+1 verbose cli [ '/usr/local/n/versions/0.8.2/bin/node',
+1 verbose cli   '/usr/local/bin/npm',
+1 verbose cli   'info',
+1 verbose cli   'css',
+1 verbose cli   'version' ]
+2 info using npm@1.1.33
+3 info using node@v0.8.2
+4 verbose config file /Users/tj/.npmrc
+5 verbose config file /usr/local/n/versions/0.8.2/etc/npmrc
+6 verbose config file /usr/local/lib/node_modules/npm/npmrc
+7 verbose url raw css
+8 verbose url resolving [ 'https://registry.npmjs.org/', './css' ]
+9 verbose url resolved https://registry.npmjs.org/css
+10 info retry registry request attempt 1 at 16:21:45
+11 http GET https://registry.npmjs.org/css
+12 http 404 https://registry.npmjs.org/css
+13 silly registry.get cb [ 404,
+13 silly registry.get   { server: 'CouchDB/1.2.0 (Erlang OTP/R15B)',
+13 silly registry.get     date: 'Wed, 18 Jul 2012 23:21:46 GMT',
+13 silly registry.get     'content-type': 'application/json',
+13 silly registry.get     'content-length': '52',
+13 silly registry.get     'cache-control': 'must-revalidate' } ]
+14 error 404 'css' is not in the npm registry.
+14 error 404 You should bug the author to publish it
+14 error 404
+14 error 404 Note that you can also install from a
+14 error 404 tarball, folder, or http url, or git url.
+15 error System Darwin 11.3.0
+16 error command "/usr/local/n/versions/0.8.2/bin/node" "/usr/local/bin/npm" "info" "css" "version"
+17 error cwd /Users/tj/projects/css-parse
+18 error node -v v0.8.2
+19 error npm -v 1.1.33
+20 error code E404
+21 error message 404 Not Found: css
+22 verbose exit [ 1, true ]

test/cases/comment.css

@@ -0,0 +1,14 @@
+/* foo */
+   /* bar */   
+   /* baz
+
+asdfasdfasdf
+asdfasdfasdf
+asdfasdfasdf
+asdfasdfasdf
+
+*/
+
+foo { /* hey */
+  /**/ bar: baz; /* hey */ /* hey */
+}

test/cases/comment.json

@@ -0,0 +1,15 @@
+{
+  "stylesheet": {
+    "rules": [
+      {
+        "selector": "foo",
+        "declarations": [
+          {
+            "property": "bar",
+            "value": "baz"
+          }
+        ]
+      }
+    ]
+  }
+}