Merge branch 'features/block-comment'

pugjs · Mar 4, 2011 · 33333d0 · 33333d0
2 parents 7cb7ac3 + a524ef1
commit 33333d0
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 1 deletion.
diff --git a/Readme.md b/Readme.md
@@ -17,6 +17,7 @@
   - parse tree manipulation via _filters_
   - supports [Express JS](http://expressjs.com) out of the box
   - transparent iteration over objects, arrays, and even non-enumerables via `- each`
+  - block comments
   - no tag prefix
   - filters
     - :sass must have [sass.js](http://github.com/visionmedia/sass.js) installed
@@ -184,6 +185,25 @@ outputting
     <p>foo</p>
     <p>bar</p>
 
+### Block Comments
+
+ A block comment is the `/` character followed by a block.
+
+      body
+        /
+          #content
+            h1 Example
+
+outputting
+
+    <body>
+      <!--
+      <div id="content">
+        <h1>Example</h1>
+      </div>
+      -->
+    </body>
+
 ### Nesting
 
     ul

diff --git a/lib/compiler.js b/lib/compiler.js
@@ -198,6 +198,19 @@ Compiler.prototype = {
     this.buffer('<!--' + utils.escape(comment.val) + '-->');
   },
 
+  /**
+   * Visit a `BlockComment`.
+   *
+   * @param {Comment} comment
+   * @api public
+   */
+
+  visitBlockComment: function(comment){
+    this.buffer('<!--');
+    this.visit(comment.block);
+    this.buffer('-->');
+  },
+
   /**
    * Visit `code`, respecting buffer / escape flags.
    * If the code is followed by a block, wrap it in

diff --git a/lib/lexer.js b/lib/lexer.js
@@ -151,6 +151,19 @@ Lexer.prototype = {
       ? this.tok('outdent')
       : this.tok('eos');
   },
+
+  /**
+   * Block comment
+   */
+
+   get blockComment() {
+     var captures;
+     if (captures = /^\//.exec(this.input)) {
+       this.consume(1);
+       var tok = this.tok('block-comment');
+       return tok;
+     }
+   },
 
   /**
    * Comment.
@@ -161,7 +174,7 @@ Lexer.prototype = {
     if (captures = /^ *\/\/(-)?([^\n]+)/.exec(this.input)) {
       this.consume(captures[0].length);
       var tok = this.tok('comment', captures[2]);
-      tok.buffer = captures[1] !== '-';
+      tok.buffer = '-' != captures[1];
       return tok;
     }
   },
@@ -354,6 +367,7 @@ Lexer.prototype = {
       || this.attrs
       || this.indent
       || this.comment
+      || this.blockComment
       || this.text;
   }
 };
diff --git a/lib/nodes/block-comment.js b/lib/nodes/block-comment.js
@@ -0,0 +1,29 @@
+
+/*!
+ * Jade - nodes - BlockComment
+ * Copyright(c) 2010 TJ Holowaychuk <tj@vision-media.ca>
+ * MIT Licensed
+ */
+
+/**
+ * Module dependencies.
+ */
+
+var Node = require('./node');
+
+/**
+ * Initialize a `BlockComment` with the given `block`.
+ *
+ * @param {Block} block
+ * @api public
+ */
+
+var BlockComment = module.exports = function BlockComment(block) {
+  this.block = block;
+};
+
+/**
+ * Inherit from `Node`.
+ */
+
+BlockComment.prototype.__proto__ = Node.prototype;
diff --git a/lib/nodes/index.js b/lib/nodes/index.js
@@ -13,4 +13,5 @@ exports.Text = require('./text');
 exports.Block = require('./block');
 exports.Filter = require('./filter');
 exports.Comment = require('./comment');
+exports.BlockComment = require('./block-comment');
 exports.Doctype = require('./doctype');
diff --git a/lib/parser.js b/lib/parser.js
@@ -161,6 +161,8 @@ Parser.prototype = {
         return this.parseFilter();
       case 'comment':
         return this.parseComment();
+      case 'block-comment':
+        return this.parseBlockComment();
       case 'text':
         return this.parseText();
       case 'each':
@@ -173,6 +175,8 @@ Parser.prototype = {
         this.lexer.defer(this.lexer.tok('tag', 'div'));
         this.lexer.defer(tok);
         return this.parseExpr();
+      default:
+        throw new Error('unexpected token "' + this.peek.type + '"');
     }
   },
 
@@ -200,6 +204,18 @@ Parser.prototype = {
     }
     return node;
   },
+
+  /**
+   * block comment
+   */
+
+  parseBlockComment: function(){
+    var tok = this.expect('block-comment')
+      , node = new nodes.BlockComment(this.parseBlock());
+    node.line = this.line;
+    return node;
+  },
+
 
   /**
    * comment