add prop support

Author: tj

lib/compiler.js

@@ -8,9 +8,14 @@
  */
 
 module.exports = function(node){
+  var indents = 0;
 
   return visit(node);
 
+  /**
+   * Visit `node`.
+   */
+
   function visit(node) {
     switch (node[0]) {
       case 'root':
@@ -26,15 +31,30 @@ module.exports = function(node){
     }
   }
 
+  /**
+   * Visit block.
+   */
+
   function block(node) {
     var props = node[1];
-    return props.map(visit).join(';\n');
+    ++indents;
+    var ret = props.map(visit).join(';\n');
+    --indents;
+    return ret;
   }
 
+  /**
+   * Visit prop.
+   */
+
   function prop(node) {
-    return '  ' + node[1];
+    return Array(indents).join('  ') + node[1];
   }
 
+  /**
+   * Visit rule.
+   */
+
   function rule(node) {
     var rule = node[1];
     var block = node[2];
@@ -46,6 +66,10 @@ module.exports = function(node){
       + '\n}';
   }
 
+  /**
+   * Visit root.
+   */
+
   function root(node) {
     var buf = [];
     for (var i=0; i < node[1].length; ++i) {

lib/lexer.js

@@ -44,6 +44,7 @@ module.exports = function(str) {
   function next() {
     return stashed()
       || indentation()
+      || prop()
       || rule();
   }
 
@@ -97,6 +98,17 @@ module.exports = function(str) {
     return stashed();
   }
 
+  /**
+   * <prop>: <val>
+   */
+
+  function prop() {
+    var m = str.match(/^ *([^:]+): *([^\n]+)/);
+    if (!m) return;
+    str = str.slice(m[0].length);
+    return ['prop', m[1], m[2]];
+  }
+
   /**
    * (^ newline)+
    */

lib/parser.js

@@ -65,25 +65,19 @@ module.exports = function(str) {
   function block() {
     var props = [];
     expect('indent');
-    while (!is('outdent')) props.push(prop());
+    while (!is('outdent')) props.push(stmt());
     expect('outdent');
     return ['block', props];
   }
 
   /**
-   * prop
-   */
-
-  function prop() {
-    return ['prop', next()[1]];
-  }
-
-  /**
-   * rule
+   *   rule
+   * | prop
    */
 
   function stmt() {
     if (is('rule')) return rule();
+    if (is('prop')) return next();
   }
 
   /**