Merge pull request #449 from chrisleishman/underscore_underscore

Replace internal __ var with __jade
pugjs · Dec 23, 2011 · 3a9602f · 3a9602f
2 parents 7d16c73 + 9de38aa
commit 3a9602f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/jade.js b/jade.js
@@ -173,10 +173,10 @@ Compiler.prototype = {
     var debug = this.debug;
 
     if (debug) {
-      this.buf.push('__.unshift({ lineno: ' + node.line
+      this.buf.push('__jade.unshift({ lineno: ' + node.line
         + ', filename: ' + (node.filename
           ? '"' + node.filename + '"'
-          : '__[0].filename')
+          : '__jade[0].filename')
         + ' });');
     }
 
@@ -189,7 +189,7 @@ Compiler.prototype = {
 
     this.visitNode(node);
 
-    if (debug) this.buf.push('__.shift();');
+    if (debug) this.buf.push('__jade.shift();');
   },
 
   /**
@@ -836,11 +836,11 @@ exports.compile = function(str, options){
 
   if (options.compileDebug !== false) {
     fn = [
-        'var __ = [{ lineno: 1, filename: ' + filename + ' }];'
+        'var __jade = [{ lineno: 1, filename: ' + filename + ' }];'
       , 'try {'
       , parse(String(str), options || {})
       , '} catch (err) {'
-      , '  rethrow(err, __[0].filename, __[0].lineno);'
+      , '  rethrow(err, __jade[0].filename, __jade[0].lineno);'
       , '}'
     ].join('\n');
   } else {

diff --git a/lib/compiler.js b/lib/compiler.js
@@ -126,10 +126,10 @@ Compiler.prototype = {
     var debug = this.debug;
 
     if (debug) {
-      this.buf.push('__.unshift({ lineno: ' + node.line
+      this.buf.push('__jade.unshift({ lineno: ' + node.line
         + ', filename: ' + (node.filename
           ? '"' + node.filename + '"'
-          : '__[0].filename')
+          : '__jade[0].filename')
         + ' });');
     }
 
@@ -142,7 +142,7 @@ Compiler.prototype = {
 
     this.visitNode(node);
 
-    if (debug) this.buf.push('__.shift();');
+    if (debug) this.buf.push('__jade.shift();');
   },
 
   /**

diff --git a/lib/jade.js b/lib/jade.js
@@ -143,11 +143,11 @@ exports.compile = function(str, options){
 
   if (options.compileDebug !== false) {
     fn = [
-        'var __ = [{ lineno: 1, filename: ' + filename + ' }];'
+        'var __jade = [{ lineno: 1, filename: ' + filename + ' }];'
       , 'try {'
       , parse(String(str), options || {})
       , '} catch (err) {'
-      , '  rethrow(err, __[0].filename, __[0].lineno);'
+      , '  rethrow(err, __jade[0].filename, __jade[0].lineno);'
       , '}'
     ].join('\n');
   } else {
@@ -235,4 +235,4 @@ exports.renderFile = function(path, options, fn){
  * Express support.
  */
 
-exports.__express = exports.renderFile;
+exports.__express = exports.renderFile;