diff --git a/.gitignore b/.gitignore
index 353261164..e09104305 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 .idea
+.vscode
 testing
 node_modules
 lib-cov
diff --git a/packages/pug-lexer/index.js b/packages/pug-lexer/index.js
index c4f3db5c3..434e3a048 100644
--- a/packages/pug-lexer/index.js
+++ b/packages/pug-lexer/index.js
@@ -41,6 +41,7 @@ function Lexer(str, options) {
   this.indentRe = null;
   // If #{}, !{} or #[] syntax is allowed when adding text
   this.interpolationAllowed = true;
+  this.whitespaceRe = /[ \n\t]/;
 
   this.tokens = [];
   this.ended = false;
@@ -106,12 +107,37 @@ Lexer.prototype = {
    */
 
   tok: function(type, val){
-    var res = {type: type, line: this.lineno, col: this.colno};
+    var res = {
+      type: type, 
+      loc: {
+        start: {
+          line: this.lineno, 
+          column: this.colno
+        },
+        filename: this.filename
+      }
+    };
 
     if (val !== undefined) res.val = val;
 
     return res;
   },
+  
+  /**
+   * Set the token's `loc.end` value.
+   * 
+   * @param {Object} tok
+   * @returns {Object}
+   * @api private
+   */
+  
+  tokEnd: function(tok){
+    tok.loc.end = {
+      line: this.lineno,
+      column: this.colno
+    };
+    return tok;
+  },
 
   /**
    * Increment `this.lineno` and reset `this.colno`.
@@ -275,9 +301,9 @@ Lexer.prototype = {
       this.error('NO_END_BRACKET', 'End of line was reached with no closing bracket for interpolation.');
     }
     for (var i = 0; this.indentStack[i]; i++) {
-      this.tokens.push(this.tok('outdent'));
+      this.tokens.push(this.tokEnd(this.tok('outdent')));
     }
-    this.tokens.push(this.tok('eos'));
+    this.tokens.push(this.tokEnd(this.tok('eos')));
     this.ended = true;
     return true;
   },
@@ -308,6 +334,7 @@ Lexer.prototype = {
       this.interpolationAllowed = tok.buffer;
       this.tokens.push(tok);
       this.incrementColumn(captures[0].length);
+      this.tokEnd(tok);
       this.callLexerFunction('pipelessText');
       return true;
     }
@@ -330,6 +357,7 @@ Lexer.prototype = {
       var lines = splitted.length - 1;
       this.incrementLine(lines);
       this.incrementColumn(splitted[lines].length + 1); // + 1 → '}'
+      this.tokEnd(tok);
       return true;
     }
   },
@@ -347,6 +375,7 @@ Lexer.prototype = {
       tok = this.tok('tag', name);
       this.tokens.push(tok);
       this.incrementColumn(len);
+      this.tokEnd(tok);
       return true;
     }
   },
@@ -361,6 +390,7 @@ Lexer.prototype = {
     if (tok) {
       this.tokens.push(tok);
       this.incrementColumn(tok.val.length);
+      this.tokEnd(tok);
       this.callLexerFunction('attrs');
       if (!inInclude) {
         this.interpolationAllowed = false;
@@ -377,7 +407,7 @@ Lexer.prototype = {
   doctype: function() {
     var node = this.scanEndOfLine(/^doctype *([^\n]*)/, 'doctype');
     if (node) {
-      this.tokens.push(node);
+      this.tokens.push(this.tokEnd(node));
       return true;
     }
   },
@@ -391,6 +421,7 @@ Lexer.prototype = {
     if (tok) {
       this.tokens.push(tok);
       this.incrementColumn(tok.val.length);
+      this.tokEnd(tok);
       return true;
     }
     if (/^#/.test(this.input)) {
@@ -407,6 +438,7 @@ Lexer.prototype = {
     if (tok) {
       this.tokens.push(tok);
       this.incrementColumn(tok.val.length);
+      this.tokEnd(tok);
       return true;
     }
     if (/^\.[_a-z0-9\-]+/i.test(this.input)) {
@@ -428,8 +460,10 @@ Lexer.prototype = {
     }
   },
   addText: function (type, value, prefix, escaped) {
+    var tok;
     if (value + prefix === '') return;
     prefix = prefix || '';
+    escaped = escaped || 0;
     var indexOfEnd = this.interpolated ? value.indexOf(']') : -1;
     var indexOfStart = this.interpolationAllowed ? value.indexOf('#[') : -1;
     var indexOfEscaped = this.interpolationAllowed ? value.indexOf('\\#[') : -1;
@@ -442,14 +476,15 @@ Lexer.prototype = {
 
     if (indexOfEscaped !== Infinity && indexOfEscaped < indexOfEnd && indexOfEscaped < indexOfStart && indexOfEscaped < indexOfStringInterp) {
       prefix = prefix + value.substring(0, indexOfEscaped) + '#[';
-      return this.addText(type, value.substring(indexOfEscaped + 3), prefix, true);
+      return this.addText(type, value.substring(indexOfEscaped + 3), prefix, escaped + 1);
     }
     if (indexOfStart !== Infinity && indexOfStart < indexOfEnd && indexOfStart < indexOfEscaped && indexOfStart < indexOfStringInterp) {
-      this.tokens.push(this.tok(type, prefix + value.substring(0, indexOfStart)));
-      this.incrementColumn(prefix.length + indexOfStart);
-      if (escaped) this.incrementColumn(1);
-      this.tokens.push(this.tok('start-pug-interpolation'));
+      tok = this.tok(type, prefix + value.substring(0, indexOfStart));
+      this.incrementColumn(prefix.length + indexOfStart + escaped);
+      this.tokens.push(this.tokEnd(tok));
+      tok = this.tok('start-pug-interpolation');
       this.incrementColumn(2);
+      this.tokens.push(this.tokEnd(tok));
       var child = new this.constructor(value.substr(indexOfStart + 2), {
         filename: this.filename,
         interpolated: true,
@@ -468,8 +503,9 @@ Lexer.prototype = {
       }
       this.colno = child.colno;
       this.tokens = this.tokens.concat(interpolated);
-      this.tokens.push(this.tok('end-pug-interpolation'));
+      tok = this.tok('end-pug-interpolation');
       this.incrementColumn(1);
+      this.tokens.push(this.tokEnd(tok));
       this.addText(type, child.input);
       return;
     }
@@ -484,18 +520,19 @@ Lexer.prototype = {
     if (indexOfStringInterp !== Infinity) {
       if (matchOfStringInterp[1]) {
         prefix = prefix + value.substring(0, indexOfStringInterp) + '#{';
-        return this.addText(type, value.substring(indexOfStringInterp + 3), prefix);
+        return this.addText(type, value.substring(indexOfStringInterp + 3), prefix, escaped + 1);
       }
       var before = value.substr(0, indexOfStringInterp);
       if (prefix || before) {
         before = prefix + before;
-        this.tokens.push(this.tok(type, before));
-        this.incrementColumn(before.length);
+        tok = this.tok(type, before);
+        this.incrementColumn(before.length + escaped);
+        this.tokens.push(this.tokEnd(tok));
       }
 
       var rest = matchOfStringInterp[3];
       var range;
-      var tok = this.tok('interpolated-code');
+      tok = this.tok('interpolated-code');
       this.incrementColumn(2);
       try {
         range = characterParser.parseUntil(rest, '}');
@@ -515,21 +552,23 @@ Lexer.prototype = {
       tok.buffer = true;
       tok.val = range.src;
       this.assertExpression(range.src);
-      this.tokens.push(tok);
 
       if (range.end + 1 < rest.length) {
         rest = rest.substr(range.end + 1);
         this.incrementColumn(range.end + 1);
+        this.tokens.push(this.tokEnd(tok));
         this.addText(type, rest);
       } else {
         this.incrementColumn(rest.length);
+        this.tokens.push(this.tokEnd(tok));
       }
       return;
     }
 
     value = prefix + value;
-    this.tokens.push(this.tok(type, value));
-    this.incrementColumn(value.length);
+    tok = this.tok(type, value);
+    this.incrementColumn(value.length + escaped);
+    this.tokens.push(this.tokEnd(tok));
   },
 
   text: function() {
@@ -557,7 +596,7 @@ Lexer.prototype = {
   dot: function() {
     var tok;
     if (tok = this.scanEndOfLine(/^\./, 'dot')) {
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       this.callLexerFunction('pipelessText');
       return true;
     }
@@ -570,7 +609,7 @@ Lexer.prototype = {
   "extends": function() {
     var tok = this.scan(/^extends?(?= |$|\n)/, 'extends');
     if (tok) {
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       if (!this.callLexerFunction('path')) {
         this.error('NO_EXTENDS_PATH', 'missing path for extends');
       }
@@ -595,10 +634,14 @@ Lexer.prototype = {
         name = name.split('//')[0].trim();
       }
       if (!name) return;
-      this.consume(captures[0].length - comment.length);
       var tok = this.tok('block', name);
+      var len = captures[0].length - comment.length;
+      while(this.whitespaceRe.test(this.input.charAt(len - 1))) len--;
+      this.incrementColumn(len);
       tok.mode = 'prepend';
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
+      this.consume(captures[0].length - comment.length);
+      this.incrementColumn(captures[0].length - comment.length - len);
       return true;
     }
   },
@@ -617,10 +660,14 @@ Lexer.prototype = {
         name = name.split('//')[0].trim();
       }
       if (!name) return;
-      this.consume(captures[0].length - comment.length);
       var tok = this.tok('block', name);
+      var len = captures[0].length - comment.length;
+      while(this.whitespaceRe.test(this.input.charAt(len - 1))) len--;
+      this.incrementColumn(len);
       tok.mode = 'append';
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
+      this.consume(captures[0].length - comment.length);
+      this.incrementColumn(captures[0].length - comment.length - len);
       return true;
     }
   },
@@ -639,10 +686,14 @@ Lexer.prototype = {
         name = name.split('//')[0].trim();
       }
       if (!name) return;
-      this.consume(captures[0].length - comment.length);
       var tok = this.tok('block', name);
+      var len = captures[0].length - comment.length;
+      while(this.whitespaceRe.test(this.input.charAt(len - 1))) len--;
+      this.incrementColumn(len);
       tok.mode = 'replace';
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
+      this.consume(captures[0].length - comment.length);
+      this.incrementColumn(captures[0].length - comment.length - len);
       return true;
     }
   },
@@ -654,7 +705,7 @@ Lexer.prototype = {
   mixinBlock: function() {
     var tok;
     if (tok = this.scanEndOfLine(/^block/, 'mixin-block')) {
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
   },
@@ -666,7 +717,7 @@ Lexer.prototype = {
   'yield': function() {
     var tok = this.scanEndOfLine(/^yield/, 'yield');
     if (tok) {
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
   },
@@ -678,7 +729,7 @@ Lexer.prototype = {
   include: function() {
     var tok = this.scan(/^include(?=:| |$|\n)/, 'include');
     if (tok) {
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       while (this.callLexerFunction('filter', { inInclude: true }));
       if (!this.callLexerFunction('path')) {
         if (/^[^ \n]+/.test(this.input)) {
@@ -703,7 +754,7 @@ Lexer.prototype = {
   path: function() {
     var tok = this.scanEndOfLine(/^ ([^\n]+)/, 'path');
     if (tok && (tok.val = tok.val.trim())) {
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
   },
@@ -718,7 +769,7 @@ Lexer.prototype = {
       this.incrementColumn(-tok.val.length);
       this.assertExpression(tok.val);
       this.incrementColumn(tok.val.length);
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
     if (this.scan(/^case\b/)) {
@@ -747,7 +798,7 @@ Lexer.prototype = {
       this.incrementColumn(-tok.val.length);
       this.assertExpression(tok.val);
       this.incrementColumn(tok.val.length);
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
     if (this.scan(/^when\b/)) {
@@ -762,7 +813,7 @@ Lexer.prototype = {
   "default": function() {
     var tok = this.scanEndOfLine(/^default/, 'default');
     if (tok) {
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
     if (this.scan(/^default\b/)) {
@@ -813,7 +864,7 @@ Lexer.prototype = {
           }
         }
       }
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
   },
@@ -828,7 +879,8 @@ Lexer.prototype = {
       this.consume(captures[0].length);
       var tok = this.tok('mixin', captures[1]);
       tok.args = captures[2] || null;
-      this.tokens.push(tok);
+      this.incrementColumn(captures[0].length);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
   },
@@ -866,7 +918,8 @@ Lexer.prototype = {
           }
           break;
       }
-      this.tokens.push(tok);
+      this.incrementColumn(js.length);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
   },
@@ -876,11 +929,13 @@ Lexer.prototype = {
    */
 
   "while": function() {
-    var captures;
+    var captures, tok;
     if (captures = /^while +([^\n]+)/.exec(this.input)) {
       this.consume(captures[0].length);
-      this.assertExpression(captures[1])
-      this.tokens.push(this.tok('while', captures[1]));
+      this.assertExpression(captures[1]);
+      tok = this.tok('while', captures[1]);
+      this.incrementColumn(captures[0].length);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
     if (this.scan(/^while\b/)) {
@@ -902,7 +957,7 @@ Lexer.prototype = {
       this.assertExpression(captures[3])
       tok.code = captures[3];
       this.incrementColumn(captures[3].length);
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
     if (this.scan(/^(?:each|for)\b/)) {
@@ -980,6 +1035,7 @@ Lexer.prototype = {
       //     ---            code
       //        ^           after colno
       this.incrementColumn(code.length);
+      this.tokEnd(tok);
       return true;
     }
   },
@@ -990,172 +1046,242 @@ Lexer.prototype = {
   blockCode: function() {
     var tok
     if (tok = this.scanEndOfLine(/^-/, 'blockcode')) {
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       this.interpolationAllowed = false;
       this.callLexerFunction('pipelessText');
       return true;
     }
   },
-
+  
   /**
-   * Attributes.
+   * Attribute Name.
    */
-
-  attrs: function() {
-    if ('(' == this.input.charAt(0)) {
-      var startingLine = this.lineno;
-      this.tokens.push(this.tok('start-attributes'));
-      var index = this.bracketExpression().end
-        , str = this.input.substr(1, index-1);
-
+  attribute: function(str){
+    var quote = '';
+    var quoteRe = /['"]/;
+    var key = '';
+    var i;
+    
+    // consume all whitespace before the key
+    for(i = 0; i < str.length; i++){
+      if(!this.whitespaceRe.test(str[i])) break;
+      if(str[i] === '\n'){
+        this.incrementLine(1);
+      } else {
+        this.incrementColumn(1);
+      }
+    }
+    
+    if(i === str.length){
+      return '';
+    }
+    
+    var tok = this.tok('attribute');
+    
+    // quote?
+    if(quoteRe.test(str[i])){
+      quote = str[i];
       this.incrementColumn(1);
-      this.assertNestingCorrect(str);
-
-      var quote = '';
-      var self = this;
-
-      this.consume(index + 1);
-
-      var whitespaceRe = /[ \n\t]/;
-      var quoteRe = /['"]/;
-
-      var escapedAttr = false
-      var key = '';
-      var val = '';
-      var state = characterParser.defaultState();
-      var lineno = startingLine;
-      var colnoBeginAttr = this.colno;
-      var colnoBeginVal;
-      var loc = 'key';
-      var isEndOfAttribute = function (i) {
-        // if the key is not started, then the attribute cannot be ended
-        if (key.trim() === '') {
-          colnoBeginAttr = this.colno;
-          return false;
+      i++;
+    }
+    
+    // start looping through the key
+    for (; i < str.length; i++) {
+      
+      if(quote){
+        if (str[i] === quote) {
+          this.incrementColumn(1);
+          i++;
+          break;
         }
-        // if there's nothing more then the attribute must be ended
-        if (i === str.length) return true;
-
-        if (loc === 'key') {
-          if (whitespaceRe.test(str[i])) {
-            // find the first non-whitespace character
-            for (var x = i; x < str.length; x++) {
-              if (!whitespaceRe.test(str[x])) {
-                // starts a `value`
-                if (str[x] === '=' || str[x] === '!') return false;
-                // will be handled when x === i
-                else if (str[x] === ',') return false;
-                // attribute ended
-                else return true;
+      } else {
+        if(this.whitespaceRe.test(str[i]) || str[i] === '!' || str[i] === '=' || str[i] === ',') {
+          break;
+        }
+      }
+      
+      key += str[i];
+        
+      if (str[i] === '\n') {
+        this.incrementLine(1);
+      } else {
+        this.incrementColumn(1);
+      }
+    }
+    
+    tok.name = key;
+    
+    var valueResponse = this.attributeValue(str.substr(i));
+    
+    if (valueResponse.val) {
+      tok.val = valueResponse.val;
+      tok.mustEscape = valueResponse.mustEscape;
+    } else {
+      // was a boolean attribute (ex: `input(disabled)`)
+      tok.val = true;
+      tok.mustEscape = true;
+    }
+    
+    str = valueResponse.remainingSource;
+    
+    this.tokens.push(this.tokEnd(tok));
+    
+    for(i = 0; i < str.length; i++){
+      if(!this.whitespaceRe.test(str[i])) {
+        break;
+      }
+      if(str[i] === '\n'){
+        this.incrementLine(1);
+      } else {
+        this.incrementColumn(1);
+      }
+    }
+    
+    if(str[i] === ','){
+      this.incrementColumn(1);
+      i++;
+    }
+    
+    return str.substr(i);
+  },
+  
+  /**
+   * Attribute Value.
+   */
+  attributeValue: function(str){
+    var quoteRe = /['"]/;
+    var val = '';
+    var done, i, x;
+    var escapeAttr = true;
+    var state = characterParser.defaultState();
+    var col = this.colno;
+    var line = this.lineno;
+    
+    // consume all whitespace before the equals sign
+    for(i = 0; i < str.length; i++){
+      if(!this.whitespaceRe.test(str[i])) break;
+      if(str[i] === '\n'){
+        line++;
+        col = 1;
+      } else {
+        col++;
+      }
+    }
+    
+    if(i === str.length){
+      return { remainingSource: str };
+    }
+    
+    if(str[i] === '!'){
+      escapeAttr = false;
+      col++;
+      i++;
+      if (str[i] !== '=') this.error('INVALID_KEY_CHARACTER', 'Unexpected character ' + str[i] + ' expected `=`');
+    }
+    
+    if(str[i] !== '='){
+      // check for anti-pattern `div("foo"bar)`
+      if (i === 0 && str && !this.whitespaceRe.test(str[0]) && str[0] !== ','){
+        this.error('INVALID_KEY_CHARACTER', 'Unexpected character ' + str[0] + ' expected `=`');
+      } else {
+        return { remainingSource: str };
+      }
+    }
+    
+    this.lineno = line;
+    this.colno = col + 1;
+    i++;
+    
+    // consume all whitespace before the value
+    for(; i < str.length; i++){
+      if(!this.whitespaceRe.test(str[i])) break;
+      if(str[i] === '\n'){
+        this.incrementLine(1);
+      } else {
+        this.incrementColumn(1);
+      }
+    }
+    
+    line = this.lineno;
+    col = this.colno;
+    
+    // start looping through the value
+    for (; i < str.length; i++) {
+      // if the character is in a string or in parentheses/brackets/braces
+      if (!(state.isNesting() || state.isString())){
+        
+        if (this.whitespaceRe.test(str[i])) {
+          done = false;
+          
+          // find the first non-whitespace character
+          for (x = i; x < str.length; x++) {
+            if (!this.whitespaceRe.test(str[x])) {
+              // if it is a JavaScript punctuator, then assume that it is
+              // a part of the value
+              if((!characterParser.isPunctuator(str[x]) || quoteRe.test(str[x]) || str[x] === ':') && this.assertExpression(val, true)){
+                done = true;
               }
+              break;
             }
           }
-          // if there's no whitespace and the character is not ',', the
-          // attribute did not end.
-          return str[i] === ',';
-        } else if (loc === 'value') {
-          // if the character is in a string or in parentheses/brackets/braces
-          if (state.isNesting() || state.isString()) return false;
-
-          // if the current value expression is not valid JavaScript, then
-          // assume that the user did not end the value.  To enforce this,
-          // we call `self.assertExpression(val, true)`, but since the other
-          // tests are much faster, we run the other tests first.
-
-          if (whitespaceRe.test(str[i])) {
-            // find the first non-whitespace character
-            for (var x = i; x < str.length; x++) {
-              if (!whitespaceRe.test(str[x])) {
-                // if it is a JavaScript punctuator, then assume that it is
-                // a part of the value
-                return (!characterParser.isPunctuator(str[x]) || quoteRe.test(str[x]) || str[x] === ':') && self.assertExpression(val, true);
-              }
-            }
+          
+          // if everything else is whitespace, return now so last attribute
+          // does not include trailing whitespace
+          if(done || x === str.length){
+            break;
           }
-          // if there's no whitespace and the character is not ',', the
-          // attribute did not end.
-          return str[i] === ',' && self.assertExpression(val, true);
+        }
+        
+        // if there's no whitespace and the character is not ',', the
+        // attribute did not end.
+        if(str[i] === ',' && this.assertExpression(val, true)){
+          break;
         }
       }
+      
+      state = characterParser.parseChar(str[i], state);
+      val += str[i];
+      
+      if (str[i] === '\n') {
+        line++;
+        col = 1;
+      } else {
+        col++;
+      }
+    }
+    
+    this.assertExpression(val);
+    
+    this.lineno = line;
+    this.colno = col;
+    
+    return { val: val, mustEscape: escapeAttr, remainingSource: str.substr(i) };
+  },
 
-      for (var i = 0; i <= str.length; i++) {
-        if (isEndOfAttribute.call(this, i)) {
-          if (val.trim()) {
-            var saved = this.colno;
-            this.colno = colnoBeginVal;
-            this.assertExpression(val);
-            this.colno = saved;
-          }
-
-          val = val.trim();
-
-          key = key.trim();
-          key = key.replace(/^['"]|['"]$/g, '');
+  /**
+   * Attributes.
+   */
+  
+  attrs: function() {
+    var tok;
+    
+    if ('(' == this.input.charAt(0)) {
+      tok = this.tok('start-attributes');
+      var index = this.bracketExpression().end;
+      var str = this.input.substr(1, index-1);
 
-          var tok = this.tok('attribute');
-          tok.name = key;
-          tok.val = '' == val ? true : val;
-          tok.col = colnoBeginAttr;
-          tok.mustEscape = escapedAttr;
-          this.tokens.push(tok);
+      this.incrementColumn(1);
+      this.tokens.push(this.tokEnd(tok));
+      this.assertNestingCorrect(str);
+      this.consume(index + 1);
 
-          key = val = '';
-          loc = 'key';
-          escapedAttr = false;
-          this.lineno = lineno;
-        } else {
-          switch (loc) {
-            case 'key-char':
-              if (str[i] === quote) {
-                loc = 'key';
-                if (i + 1 < str.length && !/[ ,!=\n\t]/.test(str[i + 1]))
-                  this.error('INVALID_KEY_CHARACTER', 'Unexpected character "' + str[i + 1] + '" expected ` `, `\\n`, `\t`, `,`, `!` or `=`');
-              } else {
-                key += str[i];
-              }
-              break;
-            case 'key':
-              if (key === '' && quoteRe.test(str[i])) {
-                loc = 'key-char';
-                quote = str[i];
-              } else if (str[i] === '!' || str[i] === '=') {
-                escapedAttr = str[i] !== '!';
-                if (str[i] === '!') {
-                  this.incrementColumn(1);
-                  i++;
-                }
-                if (str[i] !== '=') this.error('INVALID_KEY_CHARACTER', 'Unexpected character ' + str[i] + ' expected `=`');
-                loc = 'value';
-                colnoBeginVal = this.colno + 1;
-                state = characterParser.defaultState();
-              } else {
-                key += str[i]
-              }
-              break;
-            case 'value':
-              state = characterParser.parseChar(str[i], state);
-              val += str[i];
-              break;
-          }
-        }
-        if (str[i] === '\n') {
-          // Save the line number locally to keep this.lineno at the start of
-          // the attribute.
-          lineno++;
-          this.colno = 1;
-          // If the key has not been started, update this.lineno immediately.
-          if (!key.trim()) this.lineno = lineno;
-        } else if (str[i] !== undefined) {
-          this.incrementColumn(1);
-        }
+      while(str){
+        str = this.attribute(str);
       }
 
-      // Reset the line numbers based on the line started on
-      // plus the number of newline characters encountered
-      this.lineno = startingLine + (str.match(/\n/g) || []).length;
-
-      this.tokens.push(this.tok('end-attributes'));
+      tok = this.tok('end-attributes');
       this.incrementColumn(1);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
   },
@@ -1173,8 +1299,8 @@ Lexer.prototype = {
       consumed = args.end + 1;
       this.consume(consumed);
       tok.val = args.src;
-      this.tokens.push(tok);
       this.incrementColumn(consumed);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
   },
@@ -1185,6 +1311,7 @@ Lexer.prototype = {
 
   indent: function() {
     var captures = this.scanIndentation();
+    var tok;
 
     if (captures) {
       var indents = captures[1].length;
@@ -1199,28 +1326,36 @@ Lexer.prototype = {
       // blank line
       if ('\n' == this.input[0]) {
         this.interpolationAllowed = true;
-        return this.tok('newline');
+        return this.tokEnd(this.tok('newline'));
       }
 
       // outdent
       if (indents < this.indentStack[0]) {
+        var outdent_count = 0;
         while (this.indentStack[0] > indents) {
           if (this.indentStack[1] < indents) {
             this.error('INCONSISTENT_INDENTATION', 'Inconsistent indentation. Expecting either ' + this.indentStack[1] + ' or ' + this.indentStack[0] + ' spaces/tabs.');
           }
-          this.colno = this.indentStack[1] + 1;
-          this.tokens.push(this.tok('outdent'));
+          outdent_count++;
           this.indentStack.shift();
         }
+        while(outdent_count--){
+          this.colno = 1;
+          tok = this.tok('outdent');
+          this.colno = this.indentStack[0] + 1;
+          this.tokens.push(this.tokEnd(tok));
+        }
       // indent
       } else if (indents && indents != this.indentStack[0]) {
-        this.tokens.push(this.tok('indent', indents));
+        tok = this.tok('indent', indents);
         this.colno = 1 + indents;
+        this.tokens.push(this.tokEnd(tok));
         this.indentStack.unshift(indents);
       // newline
       } else {
-        this.tokens.push(this.tok('newline'));
-        this.colno = 1 + (this.indentStack[0] || 0);
+        tok = this.tok('newline');
+        this.colno = 1 + Math.min(this.indentStack[0] || 0, indents);
+        this.tokens.push(this.tokEnd(tok));
       }
 
       this.interpolationAllowed = true;
@@ -1235,8 +1370,9 @@ Lexer.prototype = {
 
     indents = indents || captures && captures[1].length;
     if (indents > this.indentStack[0]) {
-      this.tokens.push(this.tok('start-pipeless-text'));
+      this.tokens.push(this.tokEnd(this.tok('start-pipeless-text')));
       var tokens = [];
+      var token_indent = [];
       var isMatch;
       // Index in this.input. Can't use this.consume because we might need to
       // retry lexing the block.
@@ -1248,7 +1384,9 @@ Lexer.prototype = {
         var str = this.input.substr(stringPtr + 1, i);
         var lineCaptures = this.indentRe.exec('\n' + str);
         var lineIndents = lineCaptures && lineCaptures[1].length;
-        isMatch = lineIndents >= indents || !str.trim();
+        isMatch = lineIndents >= indents;
+        token_indent.push(isMatch);
+        isMatch = isMatch || !str.trim();
         if (isMatch) {
           // consume test along with `\n` prefix if match
           stringPtr += str.length + 1;
@@ -1263,12 +1401,14 @@ Lexer.prototype = {
       this.consume(stringPtr);
       while (this.input.length === 0 && tokens[tokens.length - 1] === '') tokens.pop();
       tokens.forEach(function (token, i) {
+        var tok;
         this.incrementLine(1);
-        if (i !== 0) this.tokens.push(this.tok('newline'));
-        this.incrementColumn(indents);
+        if (i !== 0) tok = this.tok('newline');
+        if (token_indent[i]) this.incrementColumn(indents);
+        if (tok) this.tokens.push(this.tokEnd(tok));
         this.addText('text', token);
       }.bind(this));
-      this.tokens.push(this.tok('end-pipeless-text'));
+      this.tokens.push(this.tokEnd(this.tok('end-pipeless-text')));
       return true;
     }
   },
@@ -1280,7 +1420,7 @@ Lexer.prototype = {
   slash: function() {
     var tok = this.scan(/^\//, 'slash');
     if (tok) {
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
   },
@@ -1292,7 +1432,7 @@ Lexer.prototype = {
   colon: function() {
     var tok = this.scan(/^: +/, ':');
     if (tok) {
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
   },
diff --git a/packages/pug-lexer/test/__snapshots__/index.test.js.snap b/packages/pug-lexer/test/__snapshots__/index.test.js.snap
index 368020744..0484b309b 100644
--- a/packages/pug-lexer/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-lexer/test/__snapshots__/index.test.js.snap
@@ -2,55 +2,136 @@ exports[`test attr-es2015.pug 1`] = `
 Array [
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 50,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attr-es2015.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var avatar = \'219b77f9d21de75e81851b6b886057c7\'",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attr-es2015.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attr-es2015.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 4,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attr-es2015.pug",
+      "start": Object {
+        "column": 4,
+        "line": 3,
+      },
+    },
     "type": "class",
     "val": "avatar-div",
   },
   Object {
-    "col": 15,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attr-es2015.pug",
+      "start": Object {
+        "column": 15,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 16,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 88,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attr-es2015.pug",
+      "start": Object {
+        "column": 16,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "style",
     "type": "attribute",
     "val": "\`background-image: url(https://www.gravatar.com/avatar/\${avatar})\`",
   },
   Object {
-    "col": 88,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 89,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attr-es2015.pug",
+      "start": Object {
+        "column": 88,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attr-es2015.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attr-es2015.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -69,474 +150,1176 @@ exports[`test attrs.js.pug 1`] = `
 Array [
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var id = 5",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "function answer() { return 42; }",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 2,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'/user/\' + id",
   },
   Object {
-    "col": 23,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 23,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'button\'",
   },
   Object {
-    "col": 37,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 37,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 2,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'/user/\' + id",
   },
   Object {
-    "col": 27,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 27,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'button\'",
   },
   Object {
-    "col": 45,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 46,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 45,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "meta",
   },
   Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 6,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 6,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "key",
     "type": "attribute",
     "val": "\'answer\'",
   },
   Object {
-    "col": 20,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 20,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
     "val": "answer()",
   },
   Object {
-    "col": 34,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 34,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 2,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "[\'class1\', \'class2\']",
   },
   Object {
-    "col": 31,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 31,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 2,
+        "line": 7,
+      },
+    },
     "type": "class",
     "val": "tag-class",
   },
   Object {
-    "col": 12,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 12,
+        "line": 7,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 13,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 13,
+        "line": 7,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "[\'class1\', \'class2\']",
   },
   Object {
-    "col": 41,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 41,
+        "line": 7,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 2,
+        "line": 9,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'/user/\' + id",
   },
   Object {
-    "col": 22,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 22,
+        "line": 9,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'button\'",
   },
   Object {
-    "col": 36,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 36,
+        "line": 9,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 2,
+        "line": 10,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 3,
+        "line": 10,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'/user/\' + id",
   },
   Object {
-    "col": 26,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 26,
+        "line": 10,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'button\'",
   },
   Object {
-    "col": 44,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 44,
+        "line": 10,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 11,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "tag",
     "val": "meta",
   },
   Object {
-    "col": 5,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 5,
+        "line": 11,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 6,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 6,
+        "line": 11,
+      },
+    },
     "mustEscape": true,
     "name": "key",
     "type": "attribute",
     "val": "\'answer\'",
   },
   Object {
-    "col": 19,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 19,
+        "line": 11,
+      },
+    },
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
     "val": "answer()",
   },
   Object {
-    "col": 33,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 33,
+        "line": 11,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 12,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 2,
+        "line": 12,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 3,
+        "line": 12,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "[\'class1\', \'class2\']",
   },
   Object {
-    "col": 31,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 31,
+        "line": 12,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 2,
+        "line": 13,
+      },
+    },
     "type": "class",
     "val": "tag-class",
   },
   Object {
-    "col": 12,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 12,
+        "line": 13,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 13,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 13,
+        "line": 13,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "[\'class1\', \'class2\']",
   },
   Object {
-    "col": 41,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 41,
+        "line": 13,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 15,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 4,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 4,
+        "line": 15,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 5,
+        "line": 15,
+      },
+    },
     "mustEscape": true,
     "name": "id",
     "type": "attribute",
     "val": "id",
   },
   Object {
-    "col": 10,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 10,
+        "line": 15,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 11,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 11,
+        "line": 15,
+      },
+    },
     "type": "&attributes",
     "val": "{foo: \'bar\'}",
   },
   Object {
-    "col": 1,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var bar = null",
   },
   Object {
-    "col": 1,
-    "line": 17,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 4,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 4,
+        "line": 17,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 5,
+        "line": 17,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "null",
   },
   Object {
-    "col": 14,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 14,
+        "line": 17,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "bar",
   },
   Object {
-    "col": 21,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 21,
+        "line": 17,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 22,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 47,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 22,
+        "line": 17,
+      },
+    },
     "type": "&attributes",
     "val": "{baz: \'baz\'}",
   },
   Object {
-    "col": 1,
-    "line": 18,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -545,1094 +1328,2714 @@ Array [
 exports[`test attrs.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 1,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'/contact\'",
   },
   Object {
-    "col": 18,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 18,
+        "line": 1,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 20,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 20,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "contact",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'/save\'",
   },
   Object {
-    "col": 15,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 15,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 16,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 16,
+        "line": 2,
+      },
+    },
     "type": "class",
     "val": "button",
   },
   Object {
-    "col": 24,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 24,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "save",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 3,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
+    "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 8,
-    "line": 3,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 8,
+        "line": 3,
+      },
+    },
+    "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 13,
-    "line": 3,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 13,
+        "line": 3,
+      },
+    },
+    "mustEscape": true,
     "name": "baz",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 16,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 16,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "\'foo, bar, baz\'",
   },
   Object {
-    "col": 24,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 24,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "1",
   },
   Object {
-    "col": 29,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 29,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "\'((foo))\'",
   },
   Object {
-    "col": 18,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 18,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "(1) ? 1 : 0",
   },
   Object {
-    "col": 35,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 35,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "select",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "option",
   },
   Object {
-    "col": 9,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 9,
+        "line": 7,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 10,
+        "line": 7,
+      },
+    },
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
     "val": "\'foo\'",
   },
   Object {
-    "col": 23,
-    "line": 7,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 23,
+        "line": 7,
+      },
+    },
+    "mustEscape": true,
     "name": "selected",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 31,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 31,
+        "line": 7,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 33,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 33,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "Foo",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "option",
   },
   Object {
-    "col": 9,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 9,
+        "line": 8,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 8,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 10,
+        "line": 8,
+      },
+    },
+    "mustEscape": true,
     "name": "selected",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 20,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 20,
+        "line": 8,
+      },
+    },
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
     "val": "\'bar\'",
   },
   Object {
-    "col": 31,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 31,
+        "line": 8,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 33,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 33,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "Bar",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 9,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "\"class:\"",
   },
   Object {
-    "col": 15,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 15,
+        "line": 9,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 6,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 6,
+        "line": 10,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 7,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 7,
+        "line": 10,
+      },
+    },
     "mustEscape": true,
     "name": "pattern",
     "type": "attribute",
     "val": "\'\\\\S+\'",
   },
   Object {
-    "col": 21,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 21,
+        "line": 10,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 12,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 12,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 12,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'/contact\'",
   },
   Object {
-    "col": 18,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 18,
+        "line": 12,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 20,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 20,
+        "line": 12,
+      },
+    },
     "type": "text",
     "val": "contact",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 13,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 13,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'/save\'",
   },
   Object {
-    "col": 15,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 15,
+        "line": 13,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 16,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 16,
+        "line": 13,
+      },
+    },
     "type": "class",
     "val": "button",
   },
   Object {
-    "col": 24,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 24,
+        "line": 13,
+      },
+    },
     "type": "text",
     "val": "save",
   },
   Object {
-    "col": 1,
-    "line": 14,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 14,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 14,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 14,
+      },
+    },
+    "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 7,
-    "line": 14,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 7,
+        "line": 14,
+      },
+    },
+    "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 11,
-    "line": 14,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 11,
+        "line": 14,
+      },
+    },
+    "mustEscape": true,
     "name": "baz",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 14,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 14,
+        "line": 14,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 15,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 15,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 15,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "\'foo, bar, baz\'",
   },
   Object {
-    "col": 23,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 23,
+        "line": 15,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "1",
   },
   Object {
-    "col": 28,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 28,
+        "line": 15,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 16,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 16,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 16,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "\'((foo))\'",
   },
   Object {
-    "col": 17,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 17,
+        "line": 16,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "(1) ? 1 : 0",
   },
   Object {
-    "col": 34,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 34,
+        "line": 16,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 17,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "tag",
     "val": "select",
   },
   Object {
-    "col": 1,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 18,
+      },
+    },
     "type": "tag",
     "val": "option",
   },
   Object {
-    "col": 9,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 9,
+        "line": 18,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 10,
+        "line": 18,
+      },
+    },
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
     "val": "\'foo\'",
   },
   Object {
-    "col": 22,
-    "line": 18,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 22,
+        "line": 18,
+      },
+    },
+    "mustEscape": true,
     "name": "selected",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 30,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 30,
+        "line": 18,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 32,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 32,
+        "line": 18,
+      },
+    },
     "type": "text",
     "val": "Foo",
   },
   Object {
-    "col": 1,
-    "line": 19,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 19,
+      },
+    },
     "type": "tag",
     "val": "option",
   },
   Object {
-    "col": 9,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 9,
+        "line": 19,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 19,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 10,
+        "line": 19,
+      },
+    },
+    "mustEscape": true,
     "name": "selected",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 19,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 19,
+        "line": 19,
+      },
+    },
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
     "val": "\'bar\'",
   },
   Object {
-    "col": 30,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 30,
+        "line": 19,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 32,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 32,
+        "line": 19,
+      },
+    },
     "type": "text",
     "val": "Bar",
   },
   Object {
-    "col": 1,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 20,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 20,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "\"class:\"",
   },
   Object {
-    "col": 15,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 15,
+        "line": 20,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 21,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 6,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 6,
+        "line": 21,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 7,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 7,
+        "line": 21,
+      },
+    },
     "mustEscape": true,
     "name": "pattern",
     "type": "attribute",
     "val": "\'\\\\S+\'",
   },
   Object {
-    "col": 21,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 21,
+        "line": 21,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 22,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 22,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 22,
+      },
+    },
     "mustEscape": true,
     "name": "terse",
     "type": "attribute",
     "val": "\"true\"",
   },
   Object {
-    "col": 17,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 17,
+        "line": 22,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 23,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 23,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 23,
+      },
+    },
     "mustEscape": true,
     "name": "date",
     "type": "attribute",
     "val": "new Date(0)",
   },
   Object {
-    "col": 21,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 21,
+        "line": 23,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 25,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 25,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 25,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 25,
+      },
+    },
+    "mustEscape": true,
     "name": "abc",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 5,
-    "line": 26,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 26,
+      },
+    },
+    "mustEscape": true,
     "name": "def",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 8,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 8,
+        "line": 26,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 27,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 27,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 27,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 27,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 27,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 27,
+      },
+    },
+    "mustEscape": true,
     "name": "abc",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 5,
-    "line": 28,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 28,
+      },
+    },
+    "mustEscape": true,
     "name": "def",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 8,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 8,
+        "line": 28,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 29,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 29,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 29,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 29,
+      },
+    },
+    "mustEscape": true,
     "name": "abc",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 3,
-    "line": 30,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 30,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 30,
+      },
+    },
+    "mustEscape": true,
     "name": "def",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 6,
-    "line": 30,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 30,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 6,
+        "line": 30,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 31,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 31,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 31,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 31,
+      },
+    },
+    "mustEscape": true,
     "name": "abc",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 4,
-    "line": 32,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 32,
+      },
+    },
+    "mustEscape": true,
     "name": "def",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 7,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 7,
+        "line": 32,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 33,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 33,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 33,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 33,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 33,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 33,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 33,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 33,
+      },
+    },
+    "mustEscape": true,
     "name": "abc",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 3,
-    "line": 34,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 34,
+      },
+    },
+    "mustEscape": true,
     "name": "def",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 6,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 6,
+        "line": 34,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 35,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 35,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 35,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 35,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 35,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 35,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 35,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 35,
+      },
+    },
+    "mustEscape": true,
     "name": "abc",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 5,
-    "line": 36,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 36,
+      },
+    },
+    "mustEscape": true,
     "name": "def",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 8,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 8,
+        "line": 36,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 38,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 38,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 38,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 38,
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 38,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 38,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var attrs = {foo: \'bar\', bar: \'<baz>\'}",
   },
   Object {
-    "col": 1,
-    "line": 40,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 40,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 40,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 4,
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 40,
+      },
+    },
     "type": "&attributes",
     "val": "attrs",
   },
   Object {
-    "col": 1,
-    "line": 42,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 42,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 42,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 42,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 42,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 42,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 42,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 42,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "\'foo\'",
   },
   Object {
-    "col": 14,
-    "line": 42,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 13,
+        "line": 42,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "\"bar\"",
   },
   Object {
-    "col": 24,
-    "line": 42,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 24,
+        "line": 42,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 43,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 43,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 43,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 43,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 43,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "\'foo\'",
   },
   Object {
-    "col": 14,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 13,
+        "line": 43,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "\'bar\'",
   },
   Object {
-    "col": 24,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 24,
+        "line": 43,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 44,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 44,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 44,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 44,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -1641,90 +4044,225 @@ Array [
 exports[`test attrs.unescaped.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 7,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 7,
+        "line": 1,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 8,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 8,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text/x-template\'",
   },
   Object {
-    "col": 30,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 30,
+        "line": 1,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 6,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 6,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 7,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 7,
+        "line": 2,
+      },
+    },
     "mustEscape": false,
     "name": "id",
     "type": "attribute",
     "val": "\'user-<%= user.id %>\'",
   },
   Object {
-    "col": 32,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 32,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
-    "col": 8,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 8,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "<%= user.title %>",
   },
   Object {
-    "col": 25,
-    "line": 3,
-    "type": "outdent",
-  },
-  Object {
-    "col": 25,
-    "line": 3,
-    "type": "outdent",
-  },
-  Object {
-    "col": 25,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 25,
+        "line": 3,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 25,
+        "line": 3,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 25,
+        "line": 3,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -1734,194 +4272,491 @@ exports[`test attrs-data.pug 1`] = `
 Array [
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var user = { name: \'tobi\' }",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 4,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 5,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "data-user",
     "type": "attribute",
     "val": "user",
   },
   Object {
-    "col": 19,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 19,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 4,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "data-items",
     "type": "attribute",
     "val": "[1,2,3]",
   },
   Object {
-    "col": 23,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 23,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 4,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "data-username",
     "type": "attribute",
     "val": "\'tobi\'",
   },
   Object {
-    "col": 25,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 25,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 4,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "data-escaped",
     "type": "attribute",
     "val": "{message: \"Let\'s rock!\"}",
   },
   Object {
-    "col": 42,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 43,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 42,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 4,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 60,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "data-ampersand",
     "type": "attribute",
     "val": "{message: \"a quote: &quot; this & that\"}",
   },
   Object {
-    "col": 60,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 61,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 60,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 4,
+        "line": 7,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 5,
+        "line": 7,
+      },
+    },
     "mustEscape": true,
     "name": "data-epoc",
     "type": "attribute",
     "val": "new Date(0)",
   },
   Object {
-    "col": 26,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 26,
+        "line": 7,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -1930,54 +4765,135 @@ Array [
 exports[`test basic.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/basic.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/basic.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/basic.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/basic.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/basic.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
-    "col": 8,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/basic.pug",
+      "start": Object {
+        "column": 8,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "Title",
   },
   Object {
-    "col": 13,
-    "line": 3,
-    "type": "outdent",
-  },
-  Object {
-    "col": 13,
-    "line": 3,
-    "type": "outdent",
-  },
-  Object {
-    "col": 13,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/basic.pug",
+      "start": Object {
+        "column": 13,
+        "line": 3,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/basic.pug",
+      "start": Object {
+        "column": 13,
+        "line": 3,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/basic.pug",
+      "start": Object {
+        "column": 13,
+        "line": 3,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -1986,76 +4902,193 @@ Array [
 exports[`test blanks.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 6,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 6,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 6,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 6,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 6,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 6,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "baz",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -2064,159 +5097,411 @@ Array [
 exports[`test block-code.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "blockcode",
   },
   Object {
-    "col": 2,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 2,
+        "line": 1,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "list = [\"uno\", \"dos\", \"tres\",",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "        \"cuatro\", \"cinco\", \"seis\"];",
   },
   Object {
-    "col": 38,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 38,
+        "line": 3,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 70,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "comment",
     "val": " Without a block, the element is accepted and no code is generated",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "blockcode",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "newline",
   },
   Object {
     "code": "list",
-    "col": 1,
     "key": null,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "each",
     "val": "item",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "blockcode",
   },
   Object {
-    "col": 4,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 4,
+        "line": 7,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 5,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 5,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "string = item.charAt(0)",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 5,
+        "line": 10,
+      },
+    },
     "type": "text",
     "val": "  .toUpperCase() +",
   },
   Object {
-    "col": 1,
-    "line": 11,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 5,
+        "line": 11,
+      },
+    },
     "type": "text",
     "val": "item.slice(1);",
   },
   Object {
-    "col": 19,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 19,
+        "line": 11,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 12,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 3,
+        "line": 12,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 5,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 5,
+        "line": 12,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "string",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -2225,124 +5510,313 @@ Array [
 exports[`test block-expansion.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 5,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 5,
+        "line": 2,
+      },
+    },
     "type": ":",
   },
   Object {
-    "col": 7,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 7,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 8,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 8,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'#\'",
   },
   Object {
-    "col": 17,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 17,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 19,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 19,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": ":",
   },
   Object {
-    "col": 7,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 7,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 8,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 8,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 9,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 9,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'#\'",
   },
   Object {
-    "col": 17,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 17,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 19,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 19,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "baz",
   },
   Object {
-    "col": 6,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 6,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -2351,65 +5825,164 @@ Array [
 exports[`test block-expansion.shorthands.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.shorthands.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.shorthands.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.shorthands.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 5,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.shorthands.pug",
+      "start": Object {
+        "column": 5,
+        "line": 2,
+      },
+    },
     "type": "class",
     "val": "list-item",
   },
   Object {
-    "col": 15,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.shorthands.pug",
+      "start": Object {
+        "column": 15,
+        "line": 2,
+      },
+    },
     "type": ":",
   },
   Object {
-    "col": 17,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.shorthands.pug",
+      "start": Object {
+        "column": 17,
+        "line": 2,
+      },
+    },
     "type": "class",
     "val": "foo",
   },
   Object {
-    "col": 21,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.shorthands.pug",
+      "start": Object {
+        "column": 21,
+        "line": 2,
+      },
+    },
     "type": ":",
   },
   Object {
-    "col": 23,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.shorthands.pug",
+      "start": Object {
+        "column": 23,
+        "line": 2,
+      },
+    },
     "type": "id",
     "val": "bar",
   },
   Object {
-    "col": 28,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.shorthands.pug",
+      "start": Object {
+        "column": 28,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "baz",
   },
   Object {
-    "col": 31,
-    "line": 2,
-    "type": "outdent",
-  },
-  Object {
-    "col": 31,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.shorthands.pug",
+      "start": Object {
+        "column": 31,
+        "line": 2,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.shorthands.pug",
+      "start": Object {
+        "column": 31,
+        "line": 2,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -2418,61 +5991,151 @@ Array [
 exports[`test blockquote.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blockquote.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "figure",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blockquote.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blockquote.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "blockquote",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blockquote.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 7,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 123,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blockquote.pug",
+      "start": Object {
+        "column": 7,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "Try to define yourself by what you do, and you&#8217;ll burnout every time. You are. That is enough. I rest in that.",
   },
   Object {
-    "col": 3,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blockquote.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blockquote.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "figcaption",
   },
   Object {
-    "col": 14,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 47,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blockquote.pug",
+      "start": Object {
+        "column": 14,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "from @thefray at 1:43pm on May 10",
   },
   Object {
-    "col": 47,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 47,
-    "line": 4,
-    "type": "eos",
+    "loc": Object {
+      "end": Object {
+        "column": 47,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blockquote.pug",
+      "start": Object {
+        "column": 47,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 47,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blockquote.pug",
+      "start": Object {
+        "column": 47,
+        "line": 4,
+      },
+    },
+    "type": "eos",
   },
 ]
 `;
@@ -2480,54 +6143,135 @@ Array [
 exports[`test blocks-in-blocks.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 9,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 48,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-blocks.pug",
+      "start": Object {
+        "column": 9,
+        "line": 1,
+      },
+    },
     "type": "path",
     "val": "./auxiliary/blocks-in-blocks-layout.pug",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
-    "col": 6,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-blocks.pug",
+      "start": Object {
+        "column": 6,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "Page 2",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -2537,262 +6281,658 @@ exports[`test blocks-in-if.pug 1`] = `
 Array [
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 49,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "comment",
     "val": " see https://github.com/pugjs/pug/issues/1589",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var ajax = true",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "if( ajax )",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 46,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "type": "comment",
     "val": " return only contents if ajax requests",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 5,
+        "line": 7,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "contents",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 9,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 11,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 11,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "ajax contents",
   },
   Object {
-    "col": 5,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "else",
   },
   Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 5,
+        "line": 11,
+      },
+    },
     "type": "comment",
     "val": " return all html",
   },
   Object {
-    "col": 1,
-    "line": 12,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 5,
+        "line": 12,
+      },
+    },
     "type": "doctype",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 5,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 9,
+        "line": 14,
+      },
+    },
     "type": "tag",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "indent",
     "val": 12,
   },
   Object {
-    "col": 13,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 13,
+        "line": 15,
+      },
+    },
     "type": "tag",
     "val": "meta",
   },
   Object {
-    "col": 17,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 17,
+        "line": 15,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 19,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 19,
+        "line": 15,
+      },
+    },
     "mustEscape": true,
     "name": "charset",
     "type": "attribute",
     "val": "\'utf8\'",
   },
   Object {
-    "col": 34,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 34,
+        "line": 15,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 16,
-    "type": "newline",
-  },
-  Object {
-    "col": 13,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 13,
+        "line": 16,
+      },
+    },
     "type": "tag",
     "val": "title",
   },
   Object {
-    "col": 19,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 19,
+        "line": 16,
+      },
+    },
     "type": "text",
     "val": "sample",
   },
   Object {
-    "col": 1,
-    "line": 17,
-    "type": "newline",
-  },
-  Object {
-    "col": 13,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 13,
+        "line": 17,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "type": "indent",
     "val": 16,
   },
   Object {
-    "col": 17,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 17,
+        "line": 18,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "contents",
   },
   Object {
-    "col": 1,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
     "type": "indent",
     "val": 20,
   },
   Object {
-    "col": 21,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 21,
+        "line": 19,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 23,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 23,
+        "line": 19,
+      },
+    },
     "type": "text",
     "val": "all contetns",
   },
   Object {
-    "col": 17,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 13,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 9,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 5,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -2801,357 +6941,906 @@ Array [
 exports[`test case.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var friends = 1",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "case",
     "val": "friends",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "type": "when",
     "val": "0",
   },
   Object {
-    "col": 13,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 13,
+        "line": 5,
+      },
+    },
     "type": ":",
   },
   Object {
-    "col": 15,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 15,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 17,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 17,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "you have no friends",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 7,
+        "line": 6,
+      },
+    },
     "type": "when",
     "val": "1",
   },
   Object {
-    "col": 13,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 13,
+        "line": 6,
+      },
+    },
     "type": ":",
   },
   Object {
-    "col": 15,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 15,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 17,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 17,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "you have a friend",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 7,
+        "line": 7,
+      },
+    },
     "type": "default",
   },
   Object {
-    "col": 14,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 14,
+        "line": 7,
+      },
+    },
     "type": ":",
   },
   Object {
-    "col": 16,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 16,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 18,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 18,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "you have ",
   },
   Object {
     "buffer": true,
-    "col": 27,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 27,
+        "line": 7,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "friends",
   },
   Object {
-    "col": 37,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 37,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": " friends",
   },
   Object {
-    "col": 5,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 5,
+        "line": 8,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var friends = 0",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "case",
     "val": "friends",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 7,
+        "line": 10,
+      },
+    },
     "type": "when",
     "val": "0",
   },
   Object {
-    "col": 1,
-    "line": 11,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 7,
+        "line": 11,
+      },
+    },
     "type": "when",
     "val": "1",
   },
   Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 9,
+        "line": 12,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 11,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 11,
+        "line": 12,
+      },
+    },
     "type": "text",
     "val": "you have very few friends",
   },
   Object {
-    "col": 7,
-    "line": 13,
-    "type": "outdent",
-  },
-  Object {
-    "col": 7,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 7,
+        "line": 13,
+      },
+    },
     "type": "default",
   },
   Object {
-    "col": 1,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 9,
+        "line": 14,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 11,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 11,
+        "line": 14,
+      },
+    },
     "type": "text",
     "val": "you have ",
   },
   Object {
     "buffer": true,
-    "col": 20,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 20,
+        "line": 14,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "friends",
   },
   Object {
-    "col": 30,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 30,
+        "line": 14,
+      },
+    },
     "type": "text",
     "val": " friends",
   },
   Object {
-    "col": 7,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 5,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 5,
+        "line": 16,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var friend = \'Tim:G\'",
   },
   Object {
-    "col": 1,
-    "line": 17,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 5,
+        "line": 17,
+      },
+    },
     "type": "case",
     "val": "friend",
   },
   Object {
-    "col": 1,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 7,
+        "line": 18,
+      },
+    },
     "type": "when",
     "val": "\'Tim:G\'",
   },
   Object {
-    "col": 19,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 19,
+        "line": 18,
+      },
+    },
     "type": ":",
   },
   Object {
-    "col": 24,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 24,
+        "line": 18,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 26,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 26,
+        "line": 18,
+      },
+    },
     "type": "text",
     "val": "Friend is a string",
   },
   Object {
-    "col": 1,
-    "line": 19,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 7,
+        "line": 19,
+      },
+    },
     "type": "when",
     "val": "{tim: \'g\'}",
   },
   Object {
-    "col": 22,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 22,
+        "line": 19,
+      },
+    },
     "type": ":",
   },
   Object {
-    "col": 24,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 24,
+        "line": 19,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 26,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 26,
+        "line": 19,
+      },
+    },
     "type": "text",
     "val": "Friend is an object",
   },
   Object {
-    "col": 5,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -3160,172 +7849,433 @@ Array [
 exports[`test case-blocks.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var friends = 1",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "case",
     "val": "friends",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "type": "when",
     "val": "0",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 9,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 11,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 11,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "you have no friends",
   },
   Object {
-    "col": 7,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 7,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 7,
+        "line": 7,
+      },
+    },
     "type": "when",
     "val": "1",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 9,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 11,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 11,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "you have a friend",
   },
   Object {
-    "col": 7,
-    "line": 9,
-    "type": "outdent",
-  },
-  Object {
-    "col": 7,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 7,
+        "line": 9,
+      },
+    },
     "type": "default",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 9,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 11,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 11,
+        "line": 10,
+      },
+    },
     "type": "text",
     "val": "you have ",
   },
   Object {
     "buffer": true,
-    "col": 20,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 20,
+        "line": 10,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "friends",
   },
   Object {
-    "col": 30,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 30,
+        "line": 10,
+      },
+    },
     "type": "text",
     "val": " friends",
   },
   Object {
-    "col": 38,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 38,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 38,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 38,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 38,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 38,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 38,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 38,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 38,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 38,
+        "line": 10,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -3352,158 +8302,401 @@ Object {
 exports[`test classes.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 2,
+        "line": 1,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 3,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "[\'foo\', \'bar\', \'baz\']",
   },
   Object {
-    "col": 30,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 30,
+        "line": 1,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 2,
+        "line": 5,
+      },
+    },
     "type": "class",
     "val": "foo",
   },
   Object {
-    "col": 6,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 6,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'bar\'",
   },
   Object {
-    "col": 18,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 18,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 19,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 19,
+        "line": 5,
+      },
+    },
     "type": "class",
     "val": "baz",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 2,
+        "line": 9,
+      },
+    },
     "type": "class",
     "val": "foo-bar_baz",
   },
   Object {
-    "col": 1,
-    "line": 11,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 2,
+        "line": 11,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 43,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 3,
+        "line": 11,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "{foo: true, bar: false, baz: true}",
   },
   Object {
-    "col": 43,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 43,
+        "line": 11,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 2,
+        "line": 13,
+      },
+    },
     "type": "class",
     "val": "-foo",
   },
   Object {
-    "col": 1,
-    "line": 14,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 2,
+        "line": 14,
+      },
+    },
     "type": "class",
     "val": "3foo",
   },
   Object {
-    "col": 1,
-    "line": 15,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -3512,90 +8705,225 @@ Array [
 exports[`test classes-empty.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 2,
+        "line": 1,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 3,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'\'",
   },
   Object {
-    "col": 11,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 11,
+        "line": 1,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 2,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "null",
   },
   Object {
-    "col": 13,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 13,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 2,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "undefined",
   },
   Object {
-    "col": 18,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 18,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 19,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 19,
+        "line": 3,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -3604,506 +8932,1280 @@ Array [
 exports[`test code.conditionals.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "if (true)",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "else",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "if (true) {",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 5,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "} else {",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 5,
+        "line": 10,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "}",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "if",
     "val": "true",
   },
   Object {
-    "col": 1,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 14,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 5,
+        "line": 14,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 15,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 15,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 5,
+        "line": 15,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 16,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 16,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 5,
+        "line": 16,
+      },
+    },
     "type": "text",
     "val": "baz",
   },
   Object {
-    "col": 1,
-    "line": 17,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "else",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 18,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 5,
+        "line": 18,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "if",
     "val": "!(true)",
   },
   Object {
-    "col": 1,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 21,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 5,
+        "line": 21,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 22,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
     "type": "else",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 23,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 5,
+        "line": 23,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 25,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
     "type": "if",
     "val": "\'nested\'",
   },
   Object {
-    "col": 1,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 26,
+      },
+    },
     "type": "if",
     "val": "\'works\'",
   },
   Object {
-    "col": 1,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 27,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 5,
+        "line": 27,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 7,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 7,
+        "line": 27,
+      },
+    },
     "type": "text",
     "val": "yay",
   },
   Object {
-    "col": 3,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "comment",
     "val": " allow empty blocks",
   },
   Object {
-    "col": 1,
-    "line": 30,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 30,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 30,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 30,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 30,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 30,
+      },
+    },
     "type": "if",
     "val": "false",
   },
   Object {
-    "col": 1,
-    "line": 31,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "type": "else",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 32,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 32,
+      },
+    },
     "type": "class",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 33,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 33,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 33,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 33,
+      },
+    },
     "type": "if",
     "val": "true",
   },
   Object {
-    "col": 1,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 34,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 34,
+      },
+    },
     "type": "class",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 35,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 35,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 35,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 35,
+      },
+    },
     "type": "else",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 36,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
     "type": "class",
     "val": "bing",
   },
   Object {
-    "col": 1,
-    "line": 38,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 38,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 38,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 38,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 38,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 38,
+      },
+    },
     "type": "if",
     "val": "false",
   },
   Object {
-    "col": 1,
-    "line": 39,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 39,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 39,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 39,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 39,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 39,
+      },
+    },
     "type": "class",
     "val": "bing",
   },
   Object {
-    "col": 1,
-    "line": 40,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 40,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 40,
+      },
+    },
     "type": "else-if",
     "val": "false",
   },
   Object {
-    "col": 1,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 41,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 41,
+      },
+    },
     "type": "class",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 42,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 42,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 42,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 42,
+      },
+    },
     "type": "else",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 43,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 43,
+      },
+    },
     "type": "class",
     "val": "foo",
   },
   Object {
-    "col": 7,
-    "line": 43,
-    "type": "outdent",
-  },
-  Object {
-    "col": 7,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 7,
+        "line": 43,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 7,
+        "line": 43,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -4112,41 +10214,95 @@ Array [
 exports[`test code.escape.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.escape.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
     "buffer": true,
-    "col": 2,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.escape.pug",
+      "start": Object {
+        "column": 2,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "\'<script>\'",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.escape.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.escape.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
     "buffer": true,
-    "col": 2,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.escape.pug",
+      "start": Object {
+        "column": 2,
+        "line": 2,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "\'<script>\'",
   },
   Object {
-    "col": 15,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.escape.pug",
+      "start": Object {
+        "column": 15,
+        "line": 2,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -4155,450 +10311,1089 @@ Array [
 exports[`test code.iteration.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var items = [1,2,3]",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "buffer": false,
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "items.forEach(function(item){",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 7,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "item",
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "})",
   },
   Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var items = [1,2,3]",
   },
   Object {
-    "col": 1,
-    "line": 11,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "code": "items",
-    "col": 3,
     "key": "i",
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 3,
+        "line": 12,
+      },
+    },
     "type": "each",
     "val": "item",
   },
   Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 5,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 7,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 7,
+        "line": 13,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 8,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 8,
+        "line": 13,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'item-\' + i",
   },
   Object {
-    "col": 25,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 25,
+        "line": 13,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
     "buffer": true,
-    "col": 26,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 26,
+        "line": 13,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "item",
   },
   Object {
-    "col": 3,
-    "line": 15,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 15,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "code": "items",
-    "col": 3,
     "key": "i",
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 3,
+        "line": 16,
+      },
+    },
     "type": "each",
     "val": "item",
   },
   Object {
-    "col": 1,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 5,
+        "line": 17,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 7,
+        "line": 17,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "item",
   },
   Object {
-    "col": 3,
-    "line": 19,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 19,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "code": "items",
-    "col": 3,
     "key": null,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 3,
+        "line": 20,
+      },
+    },
     "type": "each",
     "val": "$item",
   },
   Object {
-    "col": 1,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 5,
+        "line": 21,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 7,
+        "line": 21,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "$item",
   },
   Object {
-    "col": 3,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var nums = [1, 2, 3]",
   },
   Object {
-    "col": 1,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 24,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 24,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var letters = [\'a\', \'b\', \'c\']",
   },
   Object {
-    "col": 1,
-    "line": 26,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 27,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "code": "letters",
-    "col": 3,
     "key": null,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 3,
+        "line": 27,
+      },
+    },
     "type": "each",
     "val": "l",
   },
   Object {
-    "col": 1,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 28,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "code": "nums",
-    "col": 5,
     "key": null,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 5,
+        "line": 28,
+      },
+    },
     "type": "each",
     "val": "n",
   },
   Object {
-    "col": 1,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 7,
+        "line": 29,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 10,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 10,
+        "line": 29,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "n",
   },
   Object {
-    "col": 14,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 14,
+        "line": 29,
+      },
+    },
     "type": "text",
     "val": ": ",
   },
   Object {
     "buffer": true,
-    "col": 16,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 16,
+        "line": 29,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "l",
   },
   Object {
-    "col": 5,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 3,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var count = 1",
   },
   Object {
-    "col": 1,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 32,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 66,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 32,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var counter = function() { return [count++, count++, count++] }",
   },
   Object {
-    "col": 1,
-    "line": 33,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 33,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 33,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 33,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 34,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "code": "counter()",
-    "col": 3,
     "key": null,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 3,
+        "line": 34,
+      },
+    },
     "type": "each",
     "val": "n",
   },
   Object {
-    "col": 1,
-    "line": 35,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 35,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 35,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 5,
+        "line": 35,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 8,
-    "line": 35,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 8,
+        "line": 35,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "n",
   },
   Object {
-    "col": 3,
-    "line": 36,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 36,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -4607,243 +11402,603 @@ Array [
 exports[`test code.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
     "buffer": true,
-    "col": 2,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 2,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "null",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
     "buffer": true,
-    "col": 2,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 2,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "undefined",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
     "buffer": true,
-    "col": 2,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 2,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "\'\'",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
     "buffer": true,
-    "col": 2,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 2,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "0",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
     "buffer": true,
-    "col": 2,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 2,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "false",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 2,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 2,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "null",
   },
   Object {
-    "col": 11,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 11,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 2,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 2,
+        "line": 7,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "undefined",
   },
   Object {
-    "col": 16,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 16,
+        "line": 7,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 2,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 2,
+        "line": 8,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "\'\'",
   },
   Object {
-    "col": 9,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 9,
+        "line": 8,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 2,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 2,
+        "line": 9,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "0",
   },
   Object {
-    "col": 8,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 8,
+        "line": 9,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 2,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 2,
+        "line": 10,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 3,
+        "line": 10,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "false",
   },
   Object {
-    "col": 12,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 12,
+        "line": 10,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 13,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 13,
+        "line": 10,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -4852,346 +12007,895 @@ Array [
 exports[`test comments.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": true,
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "comment",
     "val": " foo",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "buffer": true,
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "comment",
     "val": " bar",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 6,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 6,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "one",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": true,
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "comment",
     "val": " baz",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 6,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 6,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "two",
   },
   Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": true,
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "comment",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 10,
+      },
+    },
     "type": "text",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 11,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 11,
+      },
+    },
     "type": "text",
     "val": "  li foo",
   },
   Object {
-    "col": 1,
-    "line": 12,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": true,
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "comment",
     "val": " block",
   },
   Object {
-    "col": 9,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 9,
+        "line": 13,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 14,
+      },
+    },
     "type": "text",
     "val": "// inline follow",
   },
   Object {
-    "col": 1,
-    "line": 15,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 15,
+      },
+    },
     "type": "text",
     "val": "li three",
   },
   Object {
-    "col": 1,
-    "line": 16,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": true,
-    "col": 1,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "comment",
     "val": " block",
   },
   Object {
-    "col": 9,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 9,
+        "line": 17,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 18,
+      },
+    },
     "type": "text",
     "val": "// inline followed by tags",
   },
   Object {
-    "col": 1,
-    "line": 19,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 19,
+      },
+    },
     "type": "text",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 20,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 20,
+      },
+    },
     "type": "text",
     "val": "  li four",
   },
   Object {
-    "col": 1,
-    "line": 21,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": true,
-    "col": 1,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
     "type": "comment",
     "val": "if IE lt 9",
   },
   Object {
-    "col": 13,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 13,
+        "line": 22,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 23,
+      },
+    },
     "type": "text",
     "val": "// inline",
   },
   Object {
-    "col": 1,
-    "line": 24,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 24,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 24,
+      },
+    },
     "type": "text",
     "val": "script(src=\'/lame.js\')",
   },
   Object {
-    "col": 1,
-    "line": 25,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 25,
+      },
+    },
     "type": "text",
     "val": "// end-inline",
   },
   Object {
-    "col": 1,
-    "line": 26,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 27,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 27,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 27,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 27,
+      },
+    },
     "type": "text",
     "val": "five",
   },
   Object {
-    "col": 1,
-    "line": 29,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "class",
     "val": "foo",
   },
   Object {
-    "col": 6,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 6,
+        "line": 29,
+      },
+    },
     "type": "text",
     "val": "// not a comment",
   },
   Object {
-    "col": 22,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 22,
+        "line": 29,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -5201,103 +12905,265 @@ exports[`test comments.source.pug 1`] = `
 Array [
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "comment",
     "val": "",
   },
   Object {
-    "col": 4,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 4,
+        "line": 1,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "s/s.",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "comment",
     "val": " test/cases/comments.source.pug",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "comment",
     "val": "",
   },
   Object {
-    "col": 4,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 4,
+        "line": 6,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "test/cases/comments.source.pug",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "when",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "()",
   },
   Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -5306,153 +13172,387 @@ Array [
 exports[`test comments-in-case.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "doctype",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 3,
   },
   Object {
     "buffer": false,
-    "col": 4,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 4,
+        "line": 4,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var s = \'this\'",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 4,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 4,
+        "line": 5,
+      },
+    },
     "type": "case",
     "val": "s",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 5,
   },
   Object {
     "buffer": false,
-    "col": 6,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 6,
+        "line": 6,
+      },
+    },
     "type": "comment",
     "val": " Comment",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 6,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 6,
+        "line": 7,
+      },
+    },
     "type": "when",
     "val": "\'this\'",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 7,
   },
   Object {
-    "col": 8,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 8,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 10,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 10,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "It\'s this!",
   },
   Object {
-    "col": 6,
-    "line": 9,
-    "type": "outdent",
-  },
-  Object {
-    "col": 6,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 6,
+        "line": 9,
+      },
+    },
     "type": "when",
     "val": "\'that\'",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "indent",
     "val": 7,
   },
   Object {
-    "col": 8,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 8,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 10,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 10,
+        "line": 10,
+      },
+    },
     "type": "text",
     "val": "It\'s that!",
   },
   Object {
-    "col": 20,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 20,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 20,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 20,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 20,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 20,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 20,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 20,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 20,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 20,
+        "line": 10,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -5470,14 +13570,32 @@ Object {
 exports[`test doctype.custom.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "doctype",
     "val": "custom stuff",
   },
   Object {
-    "col": 21,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.custom.pug",
+      "start": Object {
+        "column": 21,
+        "line": 1,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -5486,65 +13604,164 @@ Array [
 exports[`test doctype.default.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.default.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "doctype",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.default.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.default.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.default.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.default.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.default.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.default.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
-    "col": 8,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.default.pug",
+      "start": Object {
+        "column": 8,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "Title",
   },
   Object {
-    "col": 13,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 13,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 13,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.default.pug",
+      "start": Object {
+        "column": 13,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.default.pug",
+      "start": Object {
+        "column": 13,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.default.pug",
+      "start": Object {
+        "column": 13,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -5553,14 +13770,32 @@ Array [
 exports[`test doctype.keyword.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.keyword.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "doctype",
     "val": "html",
   },
   Object {
-    "col": 13,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.keyword.pug",
+      "start": Object {
+        "column": 13,
+        "line": 1,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -5569,545 +13804,1337 @@ Array [
 exports[`test each.else.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var users = []",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "code": "users",
-    "col": 3,
     "key": null,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "each",
     "val": "user",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 7,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "user.name",
   },
   Object {
-    "col": 3,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "else",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 5,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 8,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 8,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "no users!",
   },
   Object {
-    "col": 3,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 70,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var users = [{ name: \'tobi\', friends: [\'loki\'] }, { name: \'loki\' }]",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "if",
     "val": "users",
   },
   Object {
-    "col": 1,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 3,
+        "line": 14,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "code": "users",
-    "col": 5,
     "key": null,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 5,
+        "line": 15,
+      },
+    },
     "type": "each",
     "val": "user",
   },
   Object {
-    "col": 1,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 7,
+        "line": 16,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 9,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 9,
+        "line": 16,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "user.name",
   },
   Object {
-    "col": 5,
-    "line": 17,
-    "type": "outdent",
-  },
-  Object {
-    "col": 5,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 5,
+        "line": 17,
+      },
+    },
     "type": "else",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 7,
+        "line": 18,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 10,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 10,
+        "line": 18,
+      },
+    },
     "type": "text",
     "val": "no users!",
   },
   Object {
-    "col": 5,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 3,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var user = { name: \'tobi\', age: 10 }",
   },
   Object {
-    "col": 1,
-    "line": 22,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "code": "user",
-    "col": 3,
     "key": "key",
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 3,
+        "line": 23,
+      },
+    },
     "type": "each",
     "val": "val",
   },
   Object {
-    "col": 1,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 24,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 5,
+        "line": 24,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 8,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 8,
+        "line": 24,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "key",
   },
   Object {
-    "col": 14,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 14,
+        "line": 24,
+      },
+    },
     "type": "text",
     "val": ": ",
   },
   Object {
     "buffer": true,
-    "col": 16,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 16,
+        "line": 24,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "val",
   },
   Object {
-    "col": 3,
-    "line": 25,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 3,
+        "line": 25,
+      },
+    },
     "type": "else",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 5,
+        "line": 26,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 8,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 8,
+        "line": 26,
+      },
+    },
     "type": "text",
     "val": "user has no details!",
   },
   Object {
-    "col": 3,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 28,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 28,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 28,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var user = {}",
   },
   Object {
-    "col": 1,
-    "line": 30,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 30,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 30,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 30,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 30,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 30,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "code": "user",
-    "col": 3,
     "key": "key",
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 3,
+        "line": 31,
+      },
+    },
     "type": "each",
     "val": "prop",
   },
   Object {
-    "col": 1,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 32,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 5,
+        "line": 32,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 8,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 8,
+        "line": 32,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "key",
   },
   Object {
-    "col": 14,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 14,
+        "line": 32,
+      },
+    },
     "type": "text",
     "val": ": ",
   },
   Object {
     "buffer": true,
-    "col": 16,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 16,
+        "line": 32,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "val",
   },
   Object {
-    "col": 3,
-    "line": 33,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 33,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 33,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 3,
+        "line": 33,
+      },
+    },
     "type": "else",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 34,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 5,
+        "line": 34,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 8,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 8,
+        "line": 34,
+      },
+    },
     "type": "text",
     "val": "user has no details!",
   },
   Object {
-    "col": 3,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var user = Object.create(null)",
   },
   Object {
-    "col": 1,
-    "line": 37,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 37,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 37,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 37,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 37,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 37,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "user.name = \'tobi\'",
   },
   Object {
-    "col": 1,
-    "line": 39,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 39,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 39,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 39,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 39,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 39,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 40,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "code": "user",
-    "col": 3,
     "key": "key",
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 3,
+        "line": 40,
+      },
+    },
     "type": "each",
     "val": "val",
   },
   Object {
-    "col": 1,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 41,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 5,
+        "line": 41,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 8,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 8,
+        "line": 41,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "key",
   },
   Object {
-    "col": 14,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 14,
+        "line": 41,
+      },
+    },
     "type": "text",
     "val": ": ",
   },
   Object {
     "buffer": true,
-    "col": 16,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 16,
+        "line": 41,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "val",
   },
   Object {
-    "col": 3,
-    "line": 42,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 42,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 42,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 3,
+        "line": 42,
+      },
+    },
     "type": "else",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 43,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 5,
+        "line": 43,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 8,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 8,
+        "line": 43,
+      },
+    },
     "type": "text",
     "val": "user has no details!",
   },
   Object {
-    "col": 3,
-    "line": 44,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 44,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 44,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 44,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 44,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 44,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -6125,35 +15152,89 @@ Object {
 exports[`test escape-chars.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-chars.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 7,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-chars.pug",
+      "start": Object {
+        "column": 7,
+        "line": 1,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 8,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-chars.pug",
+      "start": Object {
+        "column": 8,
+        "line": 1,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-chars.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "var re = /\\d+/;",
   },
   Object {
-    "col": 18,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-chars.pug",
+      "start": Object {
+        "column": 18,
+        "line": 2,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 18,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-chars.pug",
+      "start": Object {
+        "column": 18,
+        "line": 2,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -6162,120 +15243,300 @@ Array [
 exports[`test escape-test.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "doctype",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 9,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "title",
   },
   Object {
-    "col": 15,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 15,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "escape-test",
   },
   Object {
-    "col": 5,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 9,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "textarea",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "indent",
     "val": 12,
   },
   Object {
     "buffer": false,
-    "col": 13,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 108,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 13,
+        "line": 7,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var txt = \'<param name=\"flashvars\" value=\"a=&quot;value_a&quot;&b=&quot;value_b&quot;&c=3\"/>\'",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": true,
-    "col": 15,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 15,
+        "line": 8,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "txt",
   },
   Object {
-    "col": 9,
-    "line": 9,
-    "type": "outdent",
-  },
-  Object {
-    "col": 5,
-    "line": 9,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -6284,182 +15545,461 @@ Array [
 exports[`test escaping-class-attribute.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 4,
+        "line": 1,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 5,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "attr",
     "type": "attribute",
     "val": "\"<%= bar %>\"",
   },
   Object {
-    "col": 22,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 22,
+        "line": 1,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 4,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 5,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\"<%= bar %>\"",
   },
   Object {
-    "col": 23,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 23,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 4,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "mustEscape": false,
     "name": "attr",
     "type": "attribute",
     "val": "\"<%= bar %>\"",
   },
   Object {
-    "col": 23,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 23,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 4,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "mustEscape": false,
     "name": "class",
     "type": "attribute",
     "val": "\"<%= bar %>\"",
   },
   Object {
-    "col": 24,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 24,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 4,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "mustEscape": false,
     "name": "class",
     "type": "attribute",
     "val": "\"<%= bar %> lol rofl\"",
   },
   Object {
-    "col": 33,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 33,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 4,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "mustEscape": false,
     "name": "class",
     "type": "attribute",
     "val": "\"<%= bar %> lol rofl <%= lmao %>\"",
   },
   Object {
-    "col": 45,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 46,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 45,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -6477,24 +16017,60 @@ Object {
 exports[`test filter-in-include.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filter-in-include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 9,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filter-in-include.pug",
+      "start": Object {
+        "column": 9,
+        "line": 1,
+      },
+    },
     "type": "path",
     "val": "./auxiliary/filter-in-include.pug",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filter-in-include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filter-in-include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -6503,121 +16079,310 @@ Array [
 exports[`test filters.coffeescript.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 7,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 7,
+        "line": 1,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 8,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 8,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text/javascript\'",
   },
   Object {
-    "col": 30,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 30,
+        "line": 1,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "filter",
     "val": "coffee-script",
   },
   Object {
-    "col": 17,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 17,
+        "line": 2,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "regexp = /\\n/",
   },
   Object {
-    "col": 18,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 18,
+        "line": 3,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "filter",
     "val": "coffee-script",
   },
   Object {
-    "col": 17,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 17,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 18,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 18,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "minify",
     "type": "attribute",
     "val": "true",
   },
   Object {
-    "col": 29,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 29,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 30,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 30,
+        "line": 4,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "math =",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "  square: (value) -> value * value",
   },
   Object {
-    "col": 39,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 39,
+        "line": 6,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 39,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 39,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 39,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 39,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -6626,123 +16391,312 @@ Array [
 exports[`test filters.custom.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "filter",
     "val": "custom",
   },
   Object {
-    "col": 12,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 12,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 13,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 13,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "opt",
     "type": "attribute",
     "val": "\'val\'",
   },
   Object {
-    "col": 23,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 23,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "num",
     "type": "attribute",
     "val": "2",
   },
   Object {
-    "col": 28,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 28,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 29,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 29,
+        "line": 3,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "Line 1",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "Line 2",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 7,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "Line 4",
   },
   Object {
-    "col": 13,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 13,
+        "line": 7,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 13,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 13,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 13,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 13,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 13,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 13,
+        "line": 7,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -6751,102 +16705,255 @@ Array [
 exports[`test filters.include.custom.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "pre",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 14,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 14,
+        "line": 4,
+      },
+    },
     "type": "filter",
     "val": "custom",
   },
   Object {
-    "col": 21,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 21,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 22,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 22,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "opt",
     "type": "attribute",
     "val": "\'val\'",
   },
   Object {
-    "col": 32,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 32,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "num",
     "type": "attribute",
     "val": "2",
   },
   Object {
-    "col": 37,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 37,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 39,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 65,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 39,
+        "line": 4,
+      },
+    },
     "type": "path",
     "val": "filters.include.custom.pug",
   },
   Object {
-    "col": 5,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -6855,174 +16962,444 @@ Array [
 exports[`test filters.include.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 12,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 12,
+        "line": 3,
+      },
+    },
     "type": "filter",
     "val": "markdown-it",
   },
   Object {
-    "col": 25,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 25,
+        "line": 3,
+      },
+    },
     "type": "path",
     "val": "some.md",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 14,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 14,
+        "line": 5,
+      },
+    },
     "type": "filter",
     "val": "coffee-script",
   },
   Object {
-    "col": 28,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 28,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 29,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 40,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 29,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "minify",
     "type": "attribute",
     "val": "true",
   },
   Object {
-    "col": 40,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 40,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 42,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 70,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 42,
+        "line": 5,
+      },
+    },
     "type": "path",
     "val": "include-filter-coffee.coffee",
   },
   Object {
-    "col": 5,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 7,
+        "line": 7,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 14,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 14,
+        "line": 7,
+      },
+    },
     "type": "filter",
     "val": "cdata",
   },
   Object {
-    "col": 20,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 20,
+        "line": 7,
+      },
+    },
     "type": "filter",
     "val": "coffee-script",
   },
   Object {
-    "col": 34,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 34,
+        "line": 7,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 35,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 47,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 35,
+        "line": 7,
+      },
+    },
     "mustEscape": true,
     "name": "minify",
     "type": "attribute",
     "val": "false",
   },
   Object {
-    "col": 47,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 48,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 47,
+        "line": 7,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 49,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 77,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 49,
+        "line": 7,
+      },
+    },
     "type": "path",
     "val": "include-filter-coffee.coffee",
   },
   Object {
-    "col": 5,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -7031,48 +17408,120 @@ Array [
 exports[`test filters.inline.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.inline.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.inline.pug",
+      "start": Object {
+        "column": 3,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "before ",
   },
   Object {
-    "col": 10,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.inline.pug",
+      "start": Object {
+        "column": 10,
+        "line": 1,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
-    "col": 12,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.inline.pug",
+      "start": Object {
+        "column": 12,
+        "line": 1,
+      },
+    },
     "type": "filter",
     "val": "cdata",
   },
   Object {
-    "col": 19,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.inline.pug",
+      "start": Object {
+        "column": 19,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "inside",
   },
   Object {
-    "col": 25,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.inline.pug",
+      "start": Object {
+        "column": 25,
+        "line": 1,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 26,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.inline.pug",
+      "start": Object {
+        "column": 26,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": " after",
   },
   Object {
-    "col": 32,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.inline.pug",
+      "start": Object {
+        "column": 32,
+        "line": 1,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -7081,132 +17530,339 @@ Array [
 exports[`test filters.less.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "style",
   },
   Object {
-    "col": 10,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 10,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 11,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 11,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\"text/css\"",
   },
   Object {
-    "col": 26,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 26,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "filter",
     "val": "less",
   },
   Object {
-    "col": 12,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 12,
+        "line": 4,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "@pad: 15px;",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 9,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 9,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "body {",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 9,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 9,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "  padding: @pad;",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 9,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 9,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "}",
   },
   Object {
-    "col": 10,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 10,
+        "line": 8,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 10,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 10,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 10,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 10,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 10,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 10,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 10,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 10,
+        "line": 8,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -7215,75 +17871,192 @@ Array [
 exports[`test filters.markdown.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "filter",
     "val": "markdown-it",
   },
   Object {
-    "col": 17,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 17,
+        "line": 3,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "This is _some_ awesome **markdown**",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "whoop.",
   },
   Object {
-    "col": 13,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 13,
+        "line": 5,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 13,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 13,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 13,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 13,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 13,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 13,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -7292,148 +18065,382 @@ Array [
 exports[`test filters.nested.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "filter",
     "val": "cdata",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "filter",
     "val": "uglify-js",
   },
   Object {
-    "col": 19,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 19,
+        "line": 2,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "(function() {",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "  console.log(\'test\')",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "})()",
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "filter",
     "val": "cdata",
   },
   Object {
-    "col": 9,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 9,
+        "line": 7,
+      },
+    },
     "type": "filter",
     "val": "uglify-js",
   },
   Object {
-    "col": 19,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 19,
+        "line": 7,
+      },
+    },
     "type": "filter",
     "val": "coffee-script",
   },
   Object {
-    "col": 33,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 33,
+        "line": 7,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 5,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 5,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "(->",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "  console.log \'test\'",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 5,
+        "line": 10,
+      },
+    },
     "type": "text",
     "val": ")()",
   },
   Object {
-    "col": 8,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 8,
+        "line": 10,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 8,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 8,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 8,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 8,
+        "line": 10,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -7442,116 +18449,296 @@ Array [
 exports[`test filters.stylus.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "style",
   },
   Object {
-    "col": 10,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 10,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 11,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 11,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\"text/css\"",
   },
   Object {
-    "col": 26,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 26,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "filter",
     "val": "stylus",
   },
   Object {
-    "col": 14,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 14,
+        "line": 4,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 9,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 9,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "  padding: 50px",
   },
   Object {
-    "col": 24,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 24,
+        "line": 6,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 5,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -7560,75 +18747,192 @@ Array [
 exports[`test filters.verbatim.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 1,
   },
   Object {
-    "col": 2,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 2,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "filter",
     "val": "verbatim",
   },
   Object {
-    "col": 12,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 12,
+        "line": 3,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 40,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "filters are applied at compile time",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "with no #[b interpolation] at #{all}",
   },
   Object {
-    "col": 41,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 41,
+        "line": 5,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 41,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 41,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 41,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 41,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 41,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 41,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -7638,97 +18942,241 @@ exports[`test filters-empty.pug 1`] = `
 Array [
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var users = [{ name: \'tobi\', age: 2 }]",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "fb:users",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "code": "users",
-    "col": 3,
     "key": null,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "each",
     "val": "user",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "fb:user",
   },
   Object {
-    "col": 12,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 12,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 13,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 13,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "age",
     "type": "attribute",
     "val": "user.age",
   },
   Object {
-    "col": 25,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 25,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 7,
+        "line": 6,
+      },
+    },
     "type": "filter",
     "val": "cdata",
   },
   Object {
-    "col": 5,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -7738,151 +19186,385 @@ exports[`test html.pug 1`] = `
 Array [
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var version = 1449104952939",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "text-html",
     "val": "<ul>",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "text-html",
     "val": "<li>foo</li>",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "text-html",
     "val": "<li>bar</li>",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "text-html",
     "val": "<li>baz</li>",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "text-html",
     "val": "</ul>",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "text-html",
     "val": "<!--build:js /js/app.min.js?v=",
   },
   Object {
     "buffer": true,
-    "col": 31,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 31,
+        "line": 9,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "version",
   },
   Object {
-    "col": 41,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 41,
+        "line": 9,
+      },
+    },
     "type": "text-html",
     "val": "-->",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "text-html",
     "val": "<!--endbuild-->",
   },
   Object {
-    "col": 1,
-    "line": 12,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 3,
+        "line": 12,
+      },
+    },
     "type": "text",
     "val": "You can <em>embed</em> html as well.",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 2,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 2,
+        "line": 13,
+      },
+    },
     "type": ":",
   },
   Object {
-    "col": 4,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 59,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 4,
+        "line": 13,
+      },
+    },
     "type": "text-html",
     "val": "<strong>Even</strong> as the body of a block expansion.",
   },
   Object {
-    "col": 1,
-    "line": 14,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -7891,125 +19573,305 @@ Array [
 exports[`test html5.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "doctype",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 6,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 6,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 7,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 7,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'checkbox\'",
   },
   Object {
-    "col": 24,
-    "line": 2,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 24,
+        "line": 2,
+      },
+    },
+    "mustEscape": true,
     "name": "checked",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 31,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 31,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 6,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 6,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 7,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 7,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'checkbox\'",
   },
   Object {
-    "col": 24,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 24,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "checked",
     "type": "attribute",
     "val": "true",
   },
   Object {
-    "col": 36,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 36,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 6,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 6,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'checkbox\'",
   },
   Object {
-    "col": 24,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 24,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "checked",
     "type": "attribute",
     "val": "false",
   },
   Object {
-    "col": 37,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 37,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 38,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 38,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8018,60 +19880,150 @@ Array [
 exports[`test include.script.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.script.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 7,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.script.pug",
+      "start": Object {
+        "column": 7,
+        "line": 1,
+      },
+    },
     "type": "id",
     "val": "pet-template",
   },
   Object {
-    "col": 20,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.script.pug",
+      "start": Object {
+        "column": 20,
+        "line": 1,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 21,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 43,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.script.pug",
+      "start": Object {
+        "column": 21,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text/x-template\'",
   },
   Object {
-    "col": 43,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.script.pug",
+      "start": Object {
+        "column": 43,
+        "line": 1,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.script.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.script.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 11,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.script.pug",
+      "start": Object {
+        "column": 11,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "auxiliary/pet.pug",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.script.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.script.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8080,64 +20032,163 @@ Array [
 exports[`test include.yield.nested.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.yield.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.yield.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.yield.nested.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "auxiliary/yield-nested.pug",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.yield.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.yield.nested.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.yield.nested.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "some content",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.yield.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.yield.nested.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.yield.nested.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "and some more",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.yield.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.yield.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8146,24 +20197,60 @@ Array [
 exports[`test include-extends-from-root.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-from-root.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 9,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-from-root.pug",
+      "start": Object {
+        "column": 9,
+        "line": 1,
+      },
+    },
     "type": "path",
     "val": "/auxiliary/extends-from-root.pug",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-from-root.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-from-root.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8172,40 +20259,103 @@ Array [
 exports[`test include-extends-of-common-template.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-of-common-template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 9,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-of-common-template.pug",
+      "start": Object {
+        "column": 9,
+        "line": 1,
+      },
+    },
     "type": "path",
     "val": "auxiliary/extends-empty-block-1.pug",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-of-common-template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-of-common-template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-of-common-template.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "auxiliary/extends-empty-block-2.pug",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-of-common-template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-of-common-template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8214,24 +20364,60 @@ Array [
 exports[`test include-extends-relative.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-relative.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 9,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 48,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-relative.pug",
+      "start": Object {
+        "column": 9,
+        "line": 1,
+      },
+    },
     "type": "path",
     "val": "../cases/auxiliary/extends-relative.pug",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-relative.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-relative.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8276,93 +20462,237 @@ Object {
 exports[`test include-only-text.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 15,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 15,
+        "line": 4,
+      },
+    },
     "type": "path",
     "val": "include-only-text-body.pug",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "em",
   },
   Object {
-    "col": 12,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 12,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "hello world",
   },
   Object {
-    "col": 7,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 5,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8371,40 +20701,103 @@ Array [
 exports[`test include-only-text-body.pug 1`] = `
 Array [
   Object {
-    "col": 3,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text-body.pug",
+      "start": Object {
+        "column": 3,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "The message is \"",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text-body.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text-body.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "yield",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text-body.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text-body.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "\"",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text-body.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text-body.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8413,100 +20806,253 @@ Array [
 exports[`test include-with-text.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 11,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 11,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "include-with-text-head.pug",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 11,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 11,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 12,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 12,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/caustic.js\'",
   },
   Object {
-    "col": 29,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 29,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 11,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 11,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 12,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 12,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/app.js\'",
   },
   Object {
-    "col": 25,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 25,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 3,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8515,70 +21061,178 @@ Array [
 exports[`test include-with-text-head.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 10,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text/javascript\'",
   },
   Object {
-    "col": 32,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 32,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 33,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 33,
+        "line": 2,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 34,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 34,
+        "line": 2,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "alert(\'hello world\');",
   },
   Object {
-    "col": 26,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 26,
+        "line": 3,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 26,
-    "line": 3,
-    "type": "outdent",
-  },
-  Object {
-    "col": 26,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 26,
+        "line": 3,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 26,
+        "line": 3,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8587,142 +21241,367 @@ Array [
 exports[`test includes.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "auxiliary/mixins.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 11,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 11,
+        "line": 7,
+      },
+    },
     "type": "path",
     "val": "auxiliary/smile.html",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 11,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 11,
+        "line": 8,
+      },
+    },
     "type": "path",
     "val": "auxiliary/escapes.html",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 9,
+        "line": 9,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 10,
+        "line": 9,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\"text/javascript\"",
   },
   Object {
-    "col": 32,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 32,
+        "line": 9,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 5,
+        "line": 10,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 12,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 12,
+        "line": 10,
+      },
+    },
     "type": "filter",
     "val": "verbatim",
   },
   Object {
-    "col": 22,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 22,
+        "line": 10,
+      },
+    },
     "type": "path",
     "val": "auxiliary/includable.js",
   },
   Object {
-    "col": 3,
-    "line": 11,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 11,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8731,53 +21610,134 @@ Array [
 exports[`test includes-with-ext-js.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes-with-ext-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "pre",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes-with-ext-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes-with-ext-js.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "code",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes-with-ext-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes-with-ext-js.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 13,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes-with-ext-js.pug",
+      "start": Object {
+        "column": 13,
+        "line": 3,
+      },
+    },
     "type": "path",
     "val": "javascript-new-lines.js",
   },
   Object {
-    "col": 3,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes-with-ext-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes-with-ext-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes-with-ext-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8795,76 +21755,193 @@ Object {
 exports[`test inheritance.alert-dialog.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "auxiliary/dialog.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
-    "col": 6,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 6,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "Alert!",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "I\'m an alert!",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8873,142 +21950,358 @@ Array [
 exports[`test inheritance.defaults.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 13,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 13,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 14,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 14,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'jquery.js\'",
   },
   Object {
-    "col": 29,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 29,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 13,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 13,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 14,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 14,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'keymaster.js\'",
   },
   Object {
-    "col": 32,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 32,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 7,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 13,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 13,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 14,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 14,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'caustic.js\'",
   },
   Object {
-    "col": 30,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 30,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 31,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 31,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 31,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 31,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 31,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 31,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 31,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 31,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -9017,165 +22310,417 @@ Array [
 exports[`test inheritance.extend.include.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 8,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 8,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "auxiliary/layout.include.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 10,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'jquery.js\'",
   },
   Object {
-    "col": 25,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 25,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "h2",
   },
   Object {
-    "col": 6,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 6,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "Page",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "Some content",
   },
   Object {
-    "col": 1,
-    "line": 11,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "window-content",
   },
   Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 3,
+        "line": 12,
+      },
+    },
     "type": "tag",
     "val": "h2",
   },
   Object {
-    "col": 6,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 6,
+        "line": 12,
+      },
+    },
     "type": "text",
     "val": "Awesome",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 3,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 5,
+        "line": 13,
+      },
+    },
     "type": "text",
     "val": "Now we can extend included blocks!",
   },
   Object {
-    "col": 1,
-    "line": 14,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -9184,54 +22729,135 @@ Array [
 exports[`test inheritance.extend.mixins.block.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 8,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 52,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.block.pug",
+      "start": Object {
+        "column": 8,
+        "line": 1,
+      },
+    },
     "type": "path",
     "val": "auxiliary/inheritance.extend.mixin.block.pug",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.block.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.block.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "Hello World!",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -9240,131 +22866,329 @@ Array [
 exports[`test inheritance.extend.mixins.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 8,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 8,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "auxiliary/layout.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": "title",
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "mixin",
     "val": "article",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "if",
     "val": "title",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 7,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "title",
   },
   Object {
-    "col": 3,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "args": "\"The meaning of life\"",
-    "col": 3,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 3,
+        "line": 10,
+      },
+    },
     "type": "call",
     "val": "article",
   },
   Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 5,
+        "line": 11,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 7,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 7,
+        "line": 11,
+      },
+    },
     "type": "text",
     "val": "Foo bar baz!",
   },
   Object {
-    "col": 3,
-    "line": 12,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 12,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -9373,118 +23197,298 @@ Array [
 exports[`test inheritance.extend.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 8,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 8,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "auxiliary/layout.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 10,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'jquery.js\'",
   },
   Object {
-    "col": 25,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 25,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "h2",
   },
   Object {
-    "col": 6,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 6,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "Page",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "Some content",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -9493,54 +23497,135 @@ Array [
 exports[`test inheritance.extend.recursive.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.recursive.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 9,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 59,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.recursive.pug",
+      "start": Object {
+        "column": 9,
+        "line": 1,
+      },
+    },
     "type": "path",
     "val": "/auxiliary/inheritance.extend.recursive-parent.pug",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.recursive.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.recursive.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "parent",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.recursive.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.recursive.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "h4",
   },
   Object {
-    "col": 8,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.recursive.pug",
+      "start": Object {
+        "column": 8,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "child",
   },
   Object {
-    "col": 13,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 13,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.recursive.pug",
+      "start": Object {
+        "column": 13,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.recursive.pug",
+      "start": Object {
+        "column": 13,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -9549,118 +23634,298 @@ Array [
 exports[`test inheritance.extend.whitespace.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 8,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 8,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "auxiliary/layout.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 9,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 10,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'jquery.js\'",
   },
   Object {
-    "col": 25,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 25,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 3,
+        "line": 12,
+      },
+    },
     "type": "tag",
     "val": "h2",
   },
   Object {
-    "col": 6,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 6,
+        "line": 12,
+      },
+    },
     "type": "text",
     "val": "Page",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 3,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 5,
+        "line": 13,
+      },
+    },
     "type": "text",
     "val": "Some content",
   },
   Object {
-    "col": 1,
-    "line": 14,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -9669,118 +23934,298 @@ Array [
 exports[`test inheritance.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "auxiliary/layout.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 10,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'jquery.js\'",
   },
   Object {
-    "col": 25,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 25,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "h2",
   },
   Object {
-    "col": 6,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 6,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "Page",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "Some content",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -9789,65 +24234,155 @@ Array [
 exports[`test inline-block-comment.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-block-comment.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "content",
   },
   Object {
     "buffer": true,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 40,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-block-comment.pug",
+      "start": Object {
+        "column": 15,
+        "line": 1,
+      },
+    },
     "type": "comment",
     "val": " Main content goes here",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-block-comment.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-block-comment.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "mode": "append",
     "type": "block",
     "val": "content",
   },
   Object {
     "buffer": true,
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 46,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-block-comment.pug",
+      "start": Object {
+        "column": 16,
+        "line": 2,
+      },
+    },
     "type": "comment",
     "val": " adding something to content",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-block-comment.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-block-comment.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "mode": "prepend",
     "type": "block",
     "val": "content",
   },
   Object {
     "buffer": true,
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 60,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-block-comment.pug",
+      "start": Object {
+        "column": 17,
+        "line": 3,
+      },
+    },
     "type": "comment",
     "val": " adding something to other end of content",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-block-comment.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-block-comment.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -9856,437 +24391,1130 @@ Array [
 exports[`test inline-tag.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "bing ",
   },
   Object {
-    "col": 8,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 8,
+        "line": 1,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
-    "col": 10,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 10,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "strong",
   },
   Object {
-    "col": 17,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 17,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 20,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 20,
+        "line": 1,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 21,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 21,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": " bong",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 2,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 2,
+        "line": 3,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "bing",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "strong",
   },
   Object {
-    "col": 12,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 12,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 15,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 15,
+        "line": 5,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 16,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 16,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "strong",
   },
   Object {
     "buffer": true,
-    "col": 11,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 11,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "\'[foo]\'",
   },
   Object {
-    "col": 20,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 20,
+        "line": 6,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 21,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 21,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 7,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var foo = \'foo]\'",
   },
   Object {
-    "col": 23,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 23,
+        "line": 7,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 24,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 24,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "bong",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 5,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 11,
+      },
+    },
     "type": "text",
     "val": "bing",
   },
   Object {
-    "col": 1,
-    "line": 12,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 12,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 5,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 12,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
-    "col": 7,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 7,
+        "line": 12,
+      },
+    },
     "type": "tag",
     "val": "strong",
   },
   Object {
-    "col": 14,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 14,
+        "line": 12,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 17,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 17,
+        "line": 12,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 18,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 18,
+        "line": 12,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 13,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 5,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 13,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
-    "col": 7,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 7,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "strong",
   },
   Object {
     "buffer": true,
-    "col": 13,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 13,
+        "line": 13,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "\'[foo]\'",
   },
   Object {
-    "col": 22,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 22,
+        "line": 13,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 23,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 23,
+        "line": 13,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 14,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 14,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 5,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 14,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
     "buffer": false,
-    "col": 7,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 7,
+        "line": 14,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var foo = \'foo]\'",
   },
   Object {
-    "col": 25,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 25,
+        "line": 14,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 26,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 26,
+        "line": 14,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 15,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 15,
+      },
+    },
     "type": "text",
     "val": "bong",
   },
   Object {
-    "col": 1,
-    "line": 17,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 2,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 2,
+        "line": 17,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 3,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 17,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 18,
+      },
+    },
     "type": "text",
     "val": "#[strong escaped]",
   },
   Object {
-    "col": 1,
-    "line": 19,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 19,
+      },
+    },
     "type": "text",
     "val": "#[",
   },
   Object {
-    "col": 6,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 6,
+        "line": 19,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
-    "col": 8,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 8,
+        "line": 19,
+      },
+    },
     "type": "tag",
     "val": "strong",
   },
   Object {
-    "col": 15,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 15,
+        "line": 19,
+      },
+    },
     "type": "text",
     "val": "escaped",
   },
   Object {
-    "col": 22,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 22,
+        "line": 19,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 23,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 23,
+        "line": 19,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 23,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 23,
+        "line": 19,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 23,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 23,
+        "line": 19,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -10295,228 +25523,570 @@ Array [
 exports[`test intepolated-elements.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 3,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 3,
+        "line": 1,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
-    "col": 5,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 5,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 6,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 6,
+        "line": 1,
+      },
+    },
     "type": "class",
     "val": "rho",
   },
   Object {
-    "col": 10,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 10,
+        "line": 1,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 11,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 11,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'#\'",
   },
   Object {
-    "col": 21,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 21,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'rho--modifier\'",
   },
   Object {
-    "col": 42,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 43,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 42,
+        "line": 1,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 44,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 60,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 44,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "with inline link",
   },
   Object {
-    "col": 60,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 61,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 60,
+        "line": 1,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 61,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 61,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 61,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "Some text ",
   },
   Object {
-    "col": 13,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 13,
+        "line": 2,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
-    "col": 15,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 15,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 16,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 16,
+        "line": 2,
+      },
+    },
     "type": "class",
     "val": "rho",
   },
   Object {
-    "col": 20,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 20,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 21,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 21,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'#\'",
   },
   Object {
-    "col": 31,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 52,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 31,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'rho--modifier\'",
   },
   Object {
-    "col": 52,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 53,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 52,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 53,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 54,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 53,
+        "line": 2,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 54,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 54,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 54,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "Some text ",
   },
   Object {
-    "col": 13,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 13,
+        "line": 3,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
-    "col": 15,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 15,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 16,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 16,
+        "line": 3,
+      },
+    },
     "type": "class",
     "val": "rho",
   },
   Object {
-    "col": 20,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 20,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 21,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 21,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'#\'",
   },
   Object {
-    "col": 31,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 52,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 31,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'rho--modifier\'",
   },
   Object {
-    "col": 52,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 53,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 52,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 54,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 70,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 54,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "with inline link",
   },
   Object {
-    "col": 70,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 71,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 70,
+        "line": 3,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 71,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 71,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 71,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 71,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 71,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 71,
+        "line": 3,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -10535,92 +26105,227 @@ exports[`test interpolated-mixin.pug 1`] = `
 Array [
   Object {
     "args": "url",
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "mixin",
     "val": "linkit",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 4,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 4,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 5,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "url",
   },
   Object {
-    "col": 13,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 13,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
     "buffer": true,
-    "col": 14,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 14,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "url",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "This also works ",
   },
   Object {
-    "col": 19,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 19,
+        "line": 4,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
     "args": "\'http://www.bing.com\'",
-    "col": 21,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 51,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 21,
+        "line": 4,
+      },
+    },
     "type": "call",
     "val": "linkit",
   },
   Object {
-    "col": 51,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 52,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 51,
+        "line": 4,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 52,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 70,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 52,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": " so hurrah for Pug",
   },
   Object {
-    "col": 70,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 70,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 70,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -10629,90 +26334,225 @@ Array [
 exports[`test interpolation.escape.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var id = 42;",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "some",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "#{text}",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "here",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 5,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "My ID ",
   },
   Object {
     "buffer": true,
-    "col": 11,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 11,
+        "line": 7,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "\"is {\" + id + \"}\"",
   },
   Object {
-    "col": 31,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 31,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 31,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 31,
+        "line": 7,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -10757,100 +26597,253 @@ Object {
 exports[`test layout.append.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "../fixtures/append/app-layout.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "mode": "append",
     "type": "block",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 10,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'foo.js\'",
   },
   Object {
-    "col": 22,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 22,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 9,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 10,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'bar.js\'",
   },
   Object {
-    "col": 22,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 22,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -10859,100 +26852,253 @@ Array [
 exports[`test layout.append.without-block.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 56,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "../fixtures/append-without-block/app-layout.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "mode": "append",
     "type": "block",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 10,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'foo.js\'",
   },
   Object {
-    "col": 22,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 22,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 10,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'bar.js\'",
   },
   Object {
-    "col": 22,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 22,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -10961,276 +27107,690 @@ Array [
 exports[`test layout.multi.append.prepend.block.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 9,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 60,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 1,
+      },
+    },
     "type": "path",
     "val": "../fixtures/multi-append-prepend-block/redefine.pug",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "mode": "append",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 1,
   },
   Object {
-    "col": 2,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 2,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "class",
     "val": "first",
   },
   Object {
-    "col": 9,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 4,
+      },
+    },
     "type": "class",
     "val": "append",
   },
   Object {
-    "col": 17,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 46,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 17,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "Something appended to content",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "mode": "prepend",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "indent",
     "val": 1,
   },
   Object {
-    "col": 2,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 2,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "class",
     "val": "first",
   },
   Object {
-    "col": 9,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 7,
+      },
+    },
     "type": "class",
     "val": "prepend",
   },
   Object {
-    "col": 18,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 48,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 18,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "Something prepended to content",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "mode": "append",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "indent",
     "val": 1,
   },
   Object {
-    "col": 2,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 2,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 3,
+        "line": 10,
+      },
+    },
     "type": "class",
     "val": "last",
   },
   Object {
-    "col": 8,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 8,
+        "line": 10,
+      },
+    },
     "type": "class",
     "val": "append",
   },
   Object {
-    "col": 16,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 16,
+        "line": 10,
+      },
+    },
     "type": "text",
     "val": "Last append must be most last",
   },
   Object {
-    "col": 1,
-    "line": 12,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "mode": "prepend",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "indent",
     "val": 1,
   },
   Object {
-    "col": 2,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 2,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 3,
+        "line": 13,
+      },
+    },
     "type": "class",
     "val": "last",
   },
   Object {
-    "col": 8,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 8,
+        "line": 13,
+      },
+    },
     "type": "class",
     "val": "prepend",
   },
   Object {
-    "col": 17,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 48,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 17,
+        "line": 13,
+      },
+    },
     "type": "text",
     "val": "Last prepend must appear at top",
   },
   Object {
-    "col": 1,
-    "line": 15,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "mode": "append",
     "type": "block",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "indent",
     "val": 1,
   },
   Object {
-    "col": 2,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 2,
+        "line": 16,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 8,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 8,
+        "line": 16,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 9,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 16,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'jquery.js\'",
   },
   Object {
-    "col": 24,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 24,
+        "line": 16,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 18,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "mode": "prepend",
     "type": "block",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
     "type": "indent",
     "val": 1,
   },
   Object {
-    "col": 2,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 2,
+        "line": 19,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 8,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 8,
+        "line": 19,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 9,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 19,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'foo.js\'",
   },
   Object {
-    "col": 21,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 21,
+        "line": 19,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -11239,100 +27799,253 @@ Array [
 exports[`test layout.prepend.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 43,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "../fixtures/prepend/app-layout.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "mode": "prepend",
     "type": "block",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 10,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'foo.js\'",
   },
   Object {
-    "col": 22,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 22,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 9,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 10,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'bar.js\'",
   },
   Object {
-    "col": 22,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 22,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -11341,100 +28054,253 @@ Array [
 exports[`test layout.prepend.without-block.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 57,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "../fixtures/prepend-without-block/app-layout.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "mode": "prepend",
     "type": "block",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 10,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'foo.js\'",
   },
   Object {
-    "col": 22,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 22,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 10,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'bar.js\'",
   },
   Object {
-    "col": 22,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 22,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -11489,975 +28355,2397 @@ exports[`test mixin.attrs.pug 1`] = `
 Array [
   Object {
     "args": "title",
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "mixin",
     "val": "centered",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 6,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 6,
+        "line": 2,
+      },
+    },
     "type": "class",
     "val": "centered",
   },
   Object {
-    "col": 15,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 15,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 16,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 16,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "id",
     "type": "attribute",
     "val": "attributes.id",
   },
   Object {
-    "col": 32,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 32,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "if (title)",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
-    "col": 9,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 9,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 10,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "attributes.class",
   },
   Object {
-    "col": 32,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 32,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
     "buffer": true,
-    "col": 33,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 40,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 33,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "title",
   },
   Object {
-    "col": 5,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "if (attributes.href)",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 7,
+        "line": 7,
+      },
+    },
     "type": "class",
     "val": "footer",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 9,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 10,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 10,
+        "line": 8,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 11,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 11,
+        "line": 8,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "attributes.href",
   },
   Object {
-    "col": 31,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 31,
+        "line": 8,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 33,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 33,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "Back",
   },
   Object {
-    "col": 7,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 5,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 3,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": "title",
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "mixin",
     "val": "main",
   },
   Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 11,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 6,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 6,
+        "line": 11,
+      },
+    },
     "type": "class",
     "val": "stretch",
   },
   Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "args": "title",
-    "col": 5,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 12,
+      },
+    },
     "type": "call",
     "val": "centered",
   },
   Object {
-    "col": 21,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 21,
+        "line": 12,
+      },
+    },
     "type": "class",
     "val": "highlight",
   },
   Object {
-    "col": 31,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 54,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 31,
+        "line": 12,
+      },
+    },
     "type": "&attributes",
     "val": "attributes",
   },
   Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 7,
+        "line": 13,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 5,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 3,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "mixin",
     "val": "bottom",
   },
   Object {
-    "col": 1,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 16,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 6,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 6,
+        "line": 16,
+      },
+    },
     "type": "class",
     "val": "bottom",
   },
   Object {
-    "col": 13,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 13,
+        "line": 16,
+      },
+    },
     "type": "&attributes",
     "val": "attributes",
   },
   Object {
-    "col": 1,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 17,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 3,
-    "line": 19,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 19,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 20,
+      },
+    },
     "type": "call",
     "val": "centered",
   },
   Object {
-    "col": 12,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 12,
+        "line": 20,
+      },
+    },
     "type": "id",
     "val": "First",
   },
   Object {
-    "col": 19,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 19,
+        "line": 20,
+      },
+    },
     "type": "text",
     "val": "Hello World",
   },
   Object {
-    "col": 1,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": "\'Section 1\'",
-    "col": 3,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 21,
+      },
+    },
     "type": "call",
     "val": "centered",
   },
   Object {
-    "col": 25,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 25,
+        "line": 21,
+      },
+    },
     "type": "id",
     "val": "Second",
   },
   Object {
-    "col": 1,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 22,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 7,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 7,
+        "line": 22,
+      },
+    },
     "type": "text",
     "val": "Some important content.",
   },
   Object {
-    "col": 3,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": "\'Section 2\'",
-    "col": 3,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 23,
+      },
+    },
     "type": "call",
     "val": "centered",
   },
   Object {
-    "col": 25,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 25,
+        "line": 23,
+      },
+    },
     "type": "id",
     "val": "Third",
   },
   Object {
-    "col": 31,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 31,
+        "line": 23,
+      },
+    },
     "type": "class",
     "val": "foo",
   },
   Object {
-    "col": 35,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 35,
+        "line": 23,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 36,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 52,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 36,
+        "line": 23,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'menu.html\'",
   },
   Object {
-    "col": 54,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 65,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 54,
+        "line": 23,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'bar\'",
   },
   Object {
-    "col": 65,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 66,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 65,
+        "line": 23,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 24,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 24,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 7,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 7,
+        "line": 24,
+      },
+    },
     "type": "text",
     "val": "Even more important content.",
   },
   Object {
-    "col": 3,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": "\'Section 3\'",
-    "col": 3,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 25,
+      },
+    },
     "type": "call",
     "val": "main",
   },
   Object {
-    "col": 21,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 21,
+        "line": 25,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 22,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 22,
+        "line": 25,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'#\'",
   },
   Object {
-    "col": 30,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 30,
+        "line": 25,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 26,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 7,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 7,
+        "line": 26,
+      },
+    },
     "type": "text",
     "val": "Last content.",
   },
   Object {
-    "col": 3,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 27,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 27,
+      },
+    },
     "type": "call",
     "val": "bottom",
   },
   Object {
-    "col": 10,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 10,
+        "line": 27,
+      },
+    },
     "type": "class",
     "val": "foo",
   },
   Object {
-    "col": 14,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 14,
+        "line": 27,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 15,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 15,
+        "line": 27,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'bar\'",
   },
   Object {
-    "col": 28,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 28,
+        "line": 27,
+      },
+    },
     "mustEscape": true,
     "name": "name",
     "type": "attribute",
     "val": "\'end\'",
   },
   Object {
-    "col": 40,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 49,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 40,
+        "line": 27,
+      },
+    },
     "mustEscape": true,
     "name": "id",
     "type": "attribute",
     "val": "\'Last\'",
   },
   Object {
-    "col": 51,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 66,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 51,
+        "line": 27,
+      },
+    },
     "mustEscape": true,
     "name": "data-attr",
     "type": "attribute",
     "val": "\'baz\'",
   },
   Object {
-    "col": 66,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 67,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 66,
+        "line": 27,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 28,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 28,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 7,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 7,
+        "line": 28,
+      },
+    },
     "type": "text",
     "val": "Some final words.",
   },
   Object {
-    "col": 3,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 29,
+      },
+    },
     "type": "call",
     "val": "bottom",
   },
   Object {
-    "col": 10,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 10,
+        "line": 29,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 11,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 11,
+        "line": 29,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "[\'class1\', \'class2\']",
   },
   Object {
-    "col": 37,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 37,
+        "line": 29,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "type": "mixin",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 32,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 32,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 6,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 6,
+        "line": 32,
+      },
+    },
     "type": "class",
     "val": "thing",
   },
   Object {
-    "col": 12,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 12,
+        "line": 32,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 13,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 13,
+        "line": 32,
+      },
+    },
     "mustEscape": true,
     "name": "attr1",
     "type": "attribute",
     "val": "\'foo\'",
   },
   Object {
-    "col": 26,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 26,
+        "line": 32,
+      },
+    },
     "mustEscape": true,
     "name": "attr2",
     "type": "attribute",
     "val": "\'bar\'",
   },
   Object {
-    "col": 37,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 37,
+        "line": 32,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 38,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 61,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 38,
+        "line": 32,
+      },
+    },
     "type": "&attributes",
     "val": "attributes",
   },
   Object {
-    "col": 1,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 34,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 34,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var val = \'<biz>\'",
   },
   Object {
-    "col": 1,
-    "line": 35,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 35,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 35,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 35,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var classes = [\'foo\', \'bar\']",
   },
   Object {
-    "col": 1,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 5,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 36,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 6,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 6,
+        "line": 36,
+      },
+    },
     "mustEscape": true,
     "name": "attr3",
     "type": "attribute",
     "val": "\'baz\'",
   },
   Object {
-    "col": 18,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 18,
+        "line": 36,
+      },
+    },
     "mustEscape": true,
     "name": "data-foo",
     "type": "attribute",
     "val": "val",
   },
   Object {
-    "col": 31,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 31,
+        "line": 36,
+      },
+    },
     "mustEscape": false,
     "name": "data-bar",
     "type": "attribute",
     "val": "val",
   },
   Object {
-    "col": 45,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 58,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 45,
+        "line": 36,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "classes",
   },
   Object {
-    "col": 58,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 59,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 58,
+        "line": 36,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 59,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 65,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 59,
+        "line": 36,
+      },
+    },
     "type": "class",
     "val": "thunk",
   },
   Object {
-    "col": 1,
-    "line": 38,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 38,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 38,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 38,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 38,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 38,
+      },
+    },
     "type": "comment",
     "val": " Regression test for #1424",
   },
   Object {
-    "col": 1,
-    "line": 39,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 39,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 39,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": "work",
-    "col": 1,
-    "line": 39,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 39,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 39,
+      },
+    },
     "type": "mixin",
     "val": "work_filmstrip_item",
   },
   Object {
-    "col": 1,
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 40,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 40,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 6,
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 6,
+        "line": 40,
+      },
+    },
     "type": "&attributes",
     "val": "attributes",
   },
   Object {
     "buffer": true,
-    "col": 29,
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 29,
+        "line": 40,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "work",
   },
   Object {
-    "col": 1,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 41,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": "\'work\'",
-    "col": 1,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 41,
+      },
+    },
     "type": "call",
     "val": "work_filmstrip_item",
   },
   Object {
-    "col": 29,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 29,
+        "line": 41,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 31,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 54,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 30,
+        "line": 41,
+      },
+    },
     "mustEscape": true,
     "name": "data-profile",
     "type": "attribute",
     "val": "\'profile\'",
   },
   Object {
-    "col": 56,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 82,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 56,
+        "line": 41,
+      },
+    },
     "mustEscape": true,
     "name": "data-creator-name",
     "type": "attribute",
     "val": "\'name\'",
   },
   Object {
-    "col": 82,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 83,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 82,
+        "line": 41,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 43,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": "arg1, arg2, arg3, arg4",
-    "col": 1,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 43,
+      },
+    },
     "type": "mixin",
     "val": "my-mixin",
   },
   Object {
-    "col": 1,
-    "line": 44,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 44,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 44,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 44,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
     "buffer": true,
-    "col": 4,
-    "line": 44,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 44,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "arg1",
   },
   Object {
-    "col": 1,
-    "line": 45,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 45,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 45,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 45,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 45,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 45,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
     "buffer": true,
-    "col": 4,
-    "line": 45,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 45,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 45,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "arg2",
   },
   Object {
-    "col": 1,
-    "line": 46,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 46,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 46,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 46,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 46,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 46,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
     "buffer": true,
-    "col": 4,
-    "line": 46,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 46,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 46,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "arg3",
   },
   Object {
-    "col": 1,
-    "line": 47,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 47,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 47,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 47,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 47,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 47,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
     "buffer": true,
-    "col": 4,
-    "line": 47,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 47,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 47,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "arg4",
   },
   Object {
-    "col": 1,
-    "line": 49,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 49,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 49,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 49,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 49,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 49,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 5,
-    "line": 49,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 49,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 49,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 50,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 50,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 50,
+      },
+    },
     "mustEscape": true,
     "name": "attr3",
     "type": "attribute",
     "val": "\"qux\"",
   },
   Object {
-    "col": 3,
-    "line": 51,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 51,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 51,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\"baz\"",
   },
   Object {
-    "col": 1,
-    "line": 52,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 52,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 52,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 54,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 54,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 54,
+      },
+    },
     "type": "newline",
   },
   Object {
@@ -12467,19 +30755,46 @@ Array [
   \'3\',
       \'4\'
 ",
-    "col": 1,
-    "line": 54,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 59,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 54,
+      },
+    },
     "type": "call",
     "val": "my-mixin",
   },
   Object {
-    "col": 1,
-    "line": 60,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 60,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 60,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 60,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 60,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 60,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -12488,324 +30803,828 @@ Array [
 exports[`test mixin.block-tag-behaviour.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": "name",
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "mixin",
     "val": "article",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "section",
   },
   Object {
-    "col": 10,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 10,
+        "line": 3,
+      },
+    },
     "type": "class",
     "val": "article",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "name",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 3,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "args": "\'Foo\'",
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "call",
     "val": "article",
   },
   Object {
-    "col": 20,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 20,
+        "line": 9,
+      },
+    },
     "type": ":",
   },
   Object {
-    "col": 22,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 22,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 24,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 24,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "I\'m article foo",
   },
   Object {
-    "col": 3,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": "name",
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "mixin",
     "val": "article",
   },
   Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 3,
+        "line": 12,
+      },
+    },
     "type": "tag",
     "val": "section",
   },
   Object {
-    "col": 10,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 10,
+        "line": 12,
+      },
+    },
     "type": "class",
     "val": "article",
   },
   Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 5,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 7,
+        "line": 13,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "name",
   },
   Object {
-    "col": 1,
-    "line": 14,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 5,
+        "line": 14,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 7,
+        "line": 15,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 5,
-    "line": 17,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 17,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 17,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 3,
+        "line": 18,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "args": "\'Something\'",
-    "col": 5,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 5,
+        "line": 19,
+      },
+    },
     "type": "call",
     "val": "article",
   },
   Object {
-    "col": 26,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 26,
+        "line": 19,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 27,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 27,
+        "line": 19,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 7,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 7,
+        "line": 20,
+      },
+    },
     "type": "text",
     "val": "I\'m a much longer",
   },
   Object {
-    "col": 1,
-    "line": 21,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 7,
+        "line": 21,
+      },
+    },
     "type": "text",
     "val": "text-only article,",
   },
   Object {
-    "col": 1,
-    "line": 22,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 7,
+        "line": 22,
+      },
+    },
     "type": "text",
     "val": "but you can still",
   },
   Object {
-    "col": 1,
-    "line": 23,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 7,
+        "line": 23,
+      },
+    },
     "type": "text",
     "val": "inline html tags",
   },
   Object {
-    "col": 1,
-    "line": 24,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 24,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 7,
+        "line": 24,
+      },
+    },
     "type": "text",
     "val": "in me if you want.",
   },
   Object {
-    "col": 25,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 25,
+        "line": 24,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 25,
-    "line": 24,
-    "type": "outdent",
-  },
-  Object {
-    "col": 25,
-    "line": 24,
-    "type": "outdent",
-  },
-  Object {
-    "col": 25,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 25,
+        "line": 24,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 25,
+        "line": 24,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 25,
+        "line": 24,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -12814,653 +31633,1625 @@ Array [
 exports[`test mixin.blocks.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": "method, action",
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "mixin",
     "val": "form",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "form",
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 8,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 8,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "method",
     "type": "attribute",
     "val": "method",
   },
   Object {
-    "col": 23,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 23,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "action",
     "type": "attribute",
     "val": "action",
   },
   Object {
-    "col": 36,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 36,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var csrf_token_from_somewhere = \'hey\'",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 10,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 10,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 11,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 11,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'hidden\'",
   },
   Object {
-    "col": 26,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 26,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "name",
     "type": "attribute",
     "val": "\'_csrf\'",
   },
   Object {
-    "col": 40,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 71,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 40,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
     "val": "csrf_token_from_somewhere",
   },
   Object {
-    "col": 71,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 72,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 71,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 7,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 3,
-    "line": 9,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "args": "\'GET\', \'/search\'",
-    "col": 5,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 11,
+      },
+    },
     "type": "call",
     "val": "form",
   },
   Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 7,
+        "line": 12,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 12,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 12,
+        "line": 12,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 13,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 13,
+        "line": 12,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text\'",
   },
   Object {
-    "col": 26,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 26,
+        "line": 12,
+      },
+    },
     "mustEscape": true,
     "name": "name",
     "type": "attribute",
     "val": "\'query\'",
   },
   Object {
-    "col": 40,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 60,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 40,
+        "line": 12,
+      },
+    },
     "mustEscape": true,
     "name": "placeholder",
     "type": "attribute",
     "val": "\'Search\'",
   },
   Object {
-    "col": 60,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 61,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 60,
+        "line": 12,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 7,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 12,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 12,
+        "line": 13,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 13,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 13,
+        "line": 13,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'submit\'",
   },
   Object {
-    "col": 28,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 28,
+        "line": 13,
+      },
+    },
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
     "val": "\'Search\'",
   },
   Object {
-    "col": 42,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 43,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 42,
+        "line": 13,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 5,
-    "line": 15,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 15,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 15,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 16,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "args": "\'POST\', \'/search\'",
-    "col": 5,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 17,
+      },
+    },
     "type": "call",
     "val": "form",
   },
   Object {
-    "col": 1,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 7,
+        "line": 18,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 12,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 12,
+        "line": 18,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 13,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 13,
+        "line": 18,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text\'",
   },
   Object {
-    "col": 26,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 26,
+        "line": 18,
+      },
+    },
     "mustEscape": true,
     "name": "name",
     "type": "attribute",
     "val": "\'query\'",
   },
   Object {
-    "col": 40,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 60,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 40,
+        "line": 18,
+      },
+    },
     "mustEscape": true,
     "name": "placeholder",
     "type": "attribute",
     "val": "\'Search\'",
   },
   Object {
-    "col": 60,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 61,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 60,
+        "line": 18,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 19,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 7,
+        "line": 19,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 12,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 12,
+        "line": 19,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 13,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 13,
+        "line": 19,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'submit\'",
   },
   Object {
-    "col": 28,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 28,
+        "line": 19,
+      },
+    },
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
     "val": "\'Search\'",
   },
   Object {
-    "col": 42,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 43,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 42,
+        "line": 19,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 5,
-    "line": 21,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 21,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 21,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 22,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "args": "\'POST\', \'/search\'",
-    "col": 5,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 23,
+      },
+    },
     "type": "call",
     "val": "form",
   },
   Object {
-    "col": 3,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
     "type": "mixin",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 26,
+      },
+    },
     "type": "id",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 27,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 27,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 3,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "mixin",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 30,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 30,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 30,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 30,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 30,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 30,
+      },
+    },
     "type": "id",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "args": null,
-    "col": 5,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 31,
+      },
+    },
     "type": "call",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 32,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 7,
+        "line": 32,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 5,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 34,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 3,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 34,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 34,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 34,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 35,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 35,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 35,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 35,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 35,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 35,
+      },
+    },
     "type": "text",
     "val": "one",
   },
   Object {
-    "col": 1,
-    "line": 36,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 36,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 36,
+      },
+    },
     "type": "text",
     "val": "two",
   },
   Object {
-    "col": 1,
-    "line": 37,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 37,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 37,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 37,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 37,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 37,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 37,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 37,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 37,
+      },
+    },
     "type": "text",
     "val": "three",
   },
   Object {
-    "col": 1,
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 40,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 40,
+      },
+    },
     "type": "mixin",
     "val": "baz",
   },
   Object {
-    "col": 1,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 41,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 41,
+      },
+    },
     "type": "id",
     "val": "baz",
   },
   Object {
-    "col": 1,
-    "line": 42,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 42,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 42,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 9,
+        "line": 42,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 5,
-    "line": 44,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 44,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 44,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 44,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": "",
-    "col": 1,
-    "line": 44,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 44,
+      },
+    },
     "type": "call",
     "val": "baz",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 44,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 7,
+        "line": 44,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "\'123\'",
   },
   Object {
-    "col": 14,
-    "line": 44,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 14,
+        "line": 44,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -13470,346 +33261,868 @@ exports[`test mixin.merge.pug 1`] = `
 Array [
   Object {
     "args": null,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "mixin",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 4,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 4,
+        "line": 2,
+      },
+    },
     "type": "class",
     "val": "bar",
   },
   Object {
-    "col": 8,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 8,
+        "line": 2,
+      },
+    },
     "type": "&attributes",
     "val": "attributes",
   },
   Object {
-    "col": 32,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 32,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "One",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 4,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 4,
+        "line": 3,
+      },
+    },
     "type": "class",
     "val": "baz",
   },
   Object {
-    "col": 8,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 8,
+        "line": 3,
+      },
+    },
     "type": "class",
     "val": "quux",
   },
   Object {
-    "col": 13,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 13,
+        "line": 3,
+      },
+    },
     "type": "&attributes",
     "val": "attributes",
   },
   Object {
-    "col": 37,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 40,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 37,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "Two",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 4,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 4,
+        "line": 4,
+      },
+    },
     "type": "&attributes",
     "val": "attributes",
   },
   Object {
-    "col": 28,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 28,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "Three",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 4,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 4,
+        "line": 5,
+      },
+    },
     "type": "class",
     "val": "bar",
   },
   Object {
-    "col": 8,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 8,
+        "line": 5,
+      },
+    },
     "type": "&attributes",
     "val": "attributes",
   },
   Object {
-    "col": 31,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 31,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 32,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 43,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 32,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\"baz\"",
   },
   Object {
-    "col": 43,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 43,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 45,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 49,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 45,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "Four",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 7,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 7,
+        "line": 8,
+      },
+    },
     "type": "class",
     "val": "hello",
   },
   Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 7,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 7,
+        "line": 9,
+      },
+    },
     "type": "id",
     "val": "world",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 10,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 7,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 7,
+        "line": 10,
+      },
+    },
     "type": "class",
     "val": "hello",
   },
   Object {
-    "col": 13,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 13,
+        "line": 10,
+      },
+    },
     "type": "id",
     "val": "world",
   },
   Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 11,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 7,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 7,
+        "line": 11,
+      },
+    },
     "type": "class",
     "val": "hello",
   },
   Object {
-    "col": 13,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 13,
+        "line": 11,
+      },
+    },
     "type": "class",
     "val": "world",
   },
   Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 12,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 7,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 7,
+        "line": 12,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 8,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 8,
+        "line": 12,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\"hello\"",
   },
   Object {
-    "col": 21,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 21,
+        "line": 12,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 13,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 7,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 7,
+        "line": 13,
+      },
+    },
     "type": "class",
     "val": "hello",
   },
   Object {
-    "col": 13,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 13,
+        "line": 13,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 14,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 14,
+        "line": 13,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\"world\"",
   },
   Object {
-    "col": 27,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 27,
+        "line": 13,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 14,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 15,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 7,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 7,
+        "line": 15,
+      },
+    },
     "type": "&attributes",
     "val": "{class: \"hello\"}",
   },
   Object {
-    "col": 36,
-    "line": 15,
-    "type": "outdent",
-  },
-  Object {
-    "col": 36,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 36,
+        "line": 15,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 36,
+        "line": 15,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -13818,54 +34131,135 @@ Array [
 exports[`test mixin-at-end-of-file.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-at-end-of-file.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 9,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-at-end-of-file.pug",
+      "start": Object {
+        "column": 9,
+        "line": 1,
+      },
+    },
     "type": "path",
     "val": "./auxiliary/mixin-at-end-of-file.pug",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-at-end-of-file.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": "",
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-at-end-of-file.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "call",
     "val": "slide",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-at-end-of-file.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-at-end-of-file.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-at-end-of-file.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "some awesome content",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-at-end-of-file.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-at-end-of-file.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -13875,71 +34269,179 @@ exports[`test mixin-block-with-space.pug 1`] = `
 Array [
   Object {
     "args": "id",
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "mixin",
     "val": "m",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": "",
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "call",
     "val": "m",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "This text should appear",
   },
   Object {
-    "col": 28,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 28,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 28,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 28,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -13948,86 +34450,212 @@ Array [
 exports[`test mixin-hoist.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "mixin",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
     "buffer": true,
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "title",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "args": null,
-    "col": 5,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 5,
+        "line": 7,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 3,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -14037,42 +34665,105 @@ exports[`test mixin-via-include.pug 1`] = `
 Array [
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 65,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-via-include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "comment",
     "val": " regression test for https://github.com/pugjs/pug/issues/1435",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-via-include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-via-include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "include",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "include",
-  },
-  Object {
-    "col": 9,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-via-include.pug",
+      "start": Object {
+        "column": 9,
+        "line": 3,
+      },
+    },
     "type": "path",
     "val": "../fixtures/mixin-include.pug",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-via-include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-via-include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "call",
     "val": "bang",
   },
   Object {
-    "col": 6,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-via-include.pug",
+      "start": Object {
+        "column": 6,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -14082,394 +34773,979 @@ exports[`test mixins.pug 1`] = `
 Array [
   Object {
     "args": "title, str",
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "mixin",
     "val": "comment",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "class",
     "val": "comment",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "h2",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 7,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "title",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 6,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 6,
+        "line": 4,
+      },
+    },
     "type": "class",
     "val": "body",
   },
   Object {
     "buffer": true,
-    "col": 11,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 11,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "str",
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": "title, str",
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "mixin",
     "val": "comment",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "class",
     "val": "comment",
   },
   Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "h2",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 7,
+        "line": 9,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "title",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 5,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 6,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 6,
+        "line": 10,
+      },
+    },
     "type": "class",
     "val": "body",
   },
   Object {
     "buffer": true,
-    "col": 11,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 11,
+        "line": 10,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "str",
   },
   Object {
-    "col": 3,
-    "line": 12,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 12,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "id",
     "val": "user",
   },
   Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 3,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
-    "col": 6,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 6,
+        "line": 13,
+      },
+    },
     "type": "text",
     "val": "Tobi",
   },
   Object {
-    "col": 1,
-    "line": 14,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 3,
+        "line": 14,
+      },
+    },
     "type": "class",
     "val": "comments",
   },
   Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "args": "\'This\',
             ((\'is regular, javascript\'))",
-    "col": 5,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 5,
+        "line": 15,
+      },
+    },
     "type": "call",
     "val": "comment",
   },
   Object {
-    "col": 3,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "type": "mixin",
     "val": "list",
   },
   Object {
-    "col": 1,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 3,
+        "line": 19,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 5,
+        "line": 20,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 8,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 8,
+        "line": 20,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 21,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 5,
+        "line": 21,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 8,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 8,
+        "line": 21,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 22,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 5,
+        "line": 22,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 8,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 8,
+        "line": 22,
+      },
+    },
     "type": "text",
     "val": "baz",
   },
   Object {
-    "col": 3,
-    "line": 24,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 24,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 24,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 24,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 24,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "args": "",
-    "col": 3,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 3,
+        "line": 25,
+      },
+    },
     "type": "call",
     "val": "list",
   },
   Object {
-    "col": 1,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": "",
-    "col": 3,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 3,
+        "line": 26,
+      },
+    },
     "type": "call",
     "val": "list",
   },
   Object {
-    "col": 1,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 28,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": "str",
-    "col": 1,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 28,
+      },
+    },
     "type": "mixin",
     "val": "foobar",
   },
   Object {
-    "col": 1,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 3,
+        "line": 29,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 6,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 6,
+        "line": 29,
+      },
+    },
     "type": "id",
     "val": "interpolation",
   },
   Object {
     "buffer": true,
-    "col": 20,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 20,
+        "line": 29,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "str + \'interpolated\'",
   },
   Object {
-    "col": 1,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var suffix = \"bar\"",
   },
   Object {
-    "col": 1,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 32,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": "\'This is \'",
-    "col": 1,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 32,
+      },
+    },
     "type": "call",
     "val": "#{\'foo\' + suffix}",
   },
   Object {
-    "col": 1,
-    "line": 33,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 33,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 33,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 33,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -14479,87 +35755,213 @@ exports[`test mixins.rest-args.pug 1`] = `
 Array [
   Object {
     "args": "tag, ...items",
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "mixin",
     "val": "list",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "interpolation",
     "val": "tag",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "code": "items",
-    "col": 5,
     "key": null,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "each",
     "val": "item",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 9,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 9,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "item",
   },
   Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": "\'ul\', 1, 2, 3, 4",
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "call",
     "val": "list",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -14569,43 +35971,106 @@ exports[`test mixins-unused.pug 1`] = `
 Array [
   Object {
     "args": null,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins-unused.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "mixin",
     "val": "never-called",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins-unused.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins-unused.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "class",
     "val": "wtf",
   },
   Object {
-    "col": 8,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 51,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins-unused.pug",
+      "start": Object {
+        "column": 8,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "This isn\'t something we ever want to output",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins-unused.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins-unused.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins-unused.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -14623,49 +36088,121 @@ Object {
 exports[`test namespaces.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/namespaces.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "fb:user:role",
   },
   Object {
-    "col": 14,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/namespaces.pug",
+      "start": Object {
+        "column": 14,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "Something",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/namespaces.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/namespaces.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/namespaces.pug",
+      "start": Object {
+        "column": 4,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/namespaces.pug",
+      "start": Object {
+        "column": 5,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "fb:foo",
     "type": "attribute",
     "val": "\'bar\'",
   },
   Object {
-    "col": 17,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/namespaces.pug",
+      "start": Object {
+        "column": 17,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 18,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/namespaces.pug",
+      "start": Object {
+        "column": 18,
+        "line": 2,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -14674,134 +36211,341 @@ Array [
 exports[`test nesting.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 6,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 6,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "a",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 6,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 6,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "b",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 9,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 12,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 12,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "c",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 9,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 9,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 12,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 12,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "d",
   },
   Object {
-    "col": 5,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 6,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 6,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "e",
   },
   Object {
-    "col": 7,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 7,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 7,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 7,
+        "line": 8,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -14829,52 +36573,133 @@ exports[`test pipeless-comments.pug 1`] = `
 Array [
   Object {
     "buffer": true,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "comment",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 1,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "     .foo",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "	.bar",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": ".hey",
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-comments.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-comments.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -14883,52 +36708,133 @@ Array [
 exports[`test pipeless-filters.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-filters.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "filter",
     "val": "markdown-it",
   },
   Object {
-    "col": 13,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-filters.pug",
+      "start": Object {
+        "column": 13,
+        "line": 1,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-filters.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "    code sample",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-filters.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-filters.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-filters.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-filters.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "# Heading",
   },
   Object {
-    "col": 12,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-filters.pug",
+      "start": Object {
+        "column": 12,
+        "line": 4,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 12,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-filters.pug",
+      "start": Object {
+        "column": 12,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -14937,84 +36843,210 @@ Array [
 exports[`test pipeless-tag.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "pre",
   },
   Object {
-    "col": 4,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 4,
+        "line": 1,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 5,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 1,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "  what",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "is ",
   },
   Object {
     "buffer": true,
-    "col": 6,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 6,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "\'going\'",
   },
   Object {
-    "col": 16,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 16,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": " ",
   },
   Object {
-    "col": 17,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 17,
+        "line": 3,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
     "buffer": true,
-    "col": 21,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 21,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "\'on\'",
   },
   Object {
-    "col": 28,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 28,
+        "line": 3,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 29,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 29,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 29,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 29,
+        "line": 3,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 29,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 29,
+        "line": 3,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -15023,139 +37055,364 @@ Array [
 exports[`test pre.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "pre",
   },
   Object {
-    "col": 4,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 4,
+        "line": 1,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 5,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 5,
+        "line": 1,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "baz",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "pre",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "code",
   },
   Object {
-    "col": 7,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 7,
+        "line": 7,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 8,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 8,
+        "line": 7,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 5,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 5,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 5,
+        "line": 10,
+      },
+    },
     "type": "text",
     "val": "baz",
   },
   Object {
-    "col": 8,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 8,
+        "line": 10,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 8,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 8,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 8,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 8,
+        "line": 10,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -15164,37 +37421,91 @@ Array [
 exports[`test quotes.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/quotes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/quotes.pug",
+      "start": Object {
+        "column": 3,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "\"foo\"",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/quotes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/quotes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/quotes.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "\'foo\'",
   },
   Object {
-    "col": 8,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/quotes.pug",
+      "start": Object {
+        "column": 8,
+        "line": 2,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -15204,34 +37515,79 @@ exports[`test regression.784.pug 1`] = `
 Array [
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.784.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var url = \'http://www.google.com\'",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.784.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.784.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "class",
     "val": "url",
   },
   Object {
     "buffer": true,
-    "col": 6,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 57,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.784.pug",
+      "start": Object {
+        "column": 6,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "url.replace(\'http://\', \'\').replace(/^www\\./, \'\')",
   },
   Object {
-    "col": 57,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 57,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.784.pug",
+      "start": Object {
+        "column": 57,
+        "line": 2,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -15240,53 +37596,134 @@ Array [
 exports[`test regression.1794.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.1794.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 9,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.1794.pug",
+      "start": Object {
+        "column": 9,
+        "line": 1,
+      },
+    },
     "type": "path",
     "val": "./auxiliary/1794-extends.pug",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.1794.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.1794.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.1794.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.1794.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 11,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.1794.pug",
+      "start": Object {
+        "column": 11,
+        "line": 4,
+      },
+    },
     "type": "path",
     "val": "./auxiliary/1794-include.pug",
   },
   Object {
-    "col": 39,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 39,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.1794.pug",
+      "start": Object {
+        "column": 39,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.1794.pug",
+      "start": Object {
+        "column": 39,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -15295,79 +37732,205 @@ Array [
 exports[`test script.whitespace.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 7,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 7,
+        "line": 1,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 8,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 8,
+        "line": 1,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "if (foo) {",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "  ",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "  bar();",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "}",
   },
   Object {
-    "col": 4,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 4,
+        "line": 6,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 4,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 4,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -15376,168 +37939,429 @@ Array [
 exports[`test scripts.non-js.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 7,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 7,
+        "line": 1,
+      },
+    },
     "type": "id",
     "val": "user-template",
   },
   Object {
-    "col": 21,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 21,
+        "line": 1,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 22,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 22,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text/template\'",
   },
   Object {
-    "col": 42,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 43,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 42,
+        "line": 1,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "id",
     "val": "user",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
-    "col": 8,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 8,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "<%= user.name %>",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "<%= user.description %>",
   },
   Object {
-    "col": 3,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 7,
+        "line": 6,
+      },
+    },
     "type": "id",
     "val": "user-template",
   },
   Object {
-    "col": 21,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 21,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 22,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 22,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text/template\'",
   },
   Object {
-    "col": 42,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 43,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 42,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 43,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 43,
+        "line": 6,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 44,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 44,
+        "line": 6,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "if (foo) {",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "  bar();",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "}",
   },
   Object {
-    "col": 4,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 4,
+        "line": 9,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 4,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 4,
+        "line": 9,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -15546,115 +38370,295 @@ Array [
 exports[`test scripts.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 7,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 7,
+        "line": 1,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 8,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 8,
+        "line": 1,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "if (foo) {",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "  bar();",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "}",
   },
   Object {
-    "col": 4,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 4,
+        "line": 4,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "\'foo()\'",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 8,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 8,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "foo()",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 4,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 4,
+        "line": 8,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -15663,64 +38667,163 @@ Array [
 exports[`test self-closing-html.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/self-closing-html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "doctype",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/self-closing-html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/self-closing-html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/self-closing-html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/self-closing-html.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/self-closing-html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/self-closing-html.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "br",
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/self-closing-html.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "slash",
   },
   Object {
-    "col": 3,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/self-closing-html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/self-closing-html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/self-closing-html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -15729,20 +38832,47 @@ Array [
 exports[`test single-period.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/single-period.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "span",
   },
   Object {
-    "col": 6,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/single-period.pug",
+      "start": Object {
+        "column": 6,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": ".",
   },
   Object {
-    "col": 7,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/single-period.pug",
+      "start": Object {
+        "column": 7,
+        "line": 1,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -15751,129 +38881,318 @@ Array [
 exports[`test source.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "audio",
   },
   Object {
-    "col": 8,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 8,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "preload",
     "type": "attribute",
     "val": "\'auto\'",
   },
   Object {
-    "col": 25,
-    "line": 2,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 25,
+        "line": 2,
+      },
+    },
+    "mustEscape": true,
     "name": "autobuffer",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 37,
-    "line": 2,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 37,
+        "line": 2,
+      },
+    },
+    "mustEscape": true,
     "name": "controls",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 45,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 46,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 45,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "source",
   },
   Object {
-    "col": 11,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 11,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 12,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 12,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'foo\'",
   },
   Object {
-    "col": 21,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 21,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "source",
   },
   Object {
-    "col": 11,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 11,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 12,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 12,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'bar\'",
   },
   Object {
-    "col": 21,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 21,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 22,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 22,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 22,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 22,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 22,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 22,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -15882,374 +39201,950 @@ Array [
 exports[`test styles.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "style",
   },
   Object {
-    "col": 10,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 10,
+        "line": 3,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 11,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 11,
+        "line": 3,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "body {",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "  padding: 50px;",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 7,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "}",
   },
   Object {
-    "col": 8,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 8,
+        "line": 6,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 8,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 8,
+        "line": 8,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 9,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 43,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 9,
+        "line": 8,
+      },
+    },
     "mustEscape": true,
     "name": "style",
     "type": "attribute",
     "val": "\'color:red;background:green\'",
   },
   Object {
-    "col": 43,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 43,
+        "line": 8,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 8,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 8,
+        "line": 9,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 9,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 50,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 9,
+        "line": 9,
+      },
+    },
     "mustEscape": true,
     "name": "style",
     "type": "attribute",
     "val": "{color: \'red\', background: \'green\'}",
   },
   Object {
-    "col": 50,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 51,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 50,
+        "line": 9,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 8,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 58,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 8,
+        "line": 10,
+      },
+    },
     "type": "&attributes",
     "val": "{style: \'color:red;background:green\'}",
   },
   Object {
-    "col": 1,
-    "line": 11,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 11,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 8,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 65,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 8,
+        "line": 11,
+      },
+    },
     "type": "&attributes",
     "val": "{style: {color: \'red\', background: \'green\'}}",
   },
   Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 5,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 12,
+      },
+    },
     "type": "mixin",
     "val": "div",
   },
   Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 7,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 10,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 10,
+        "line": 13,
+      },
+    },
     "type": "&attributes",
     "val": "attributes",
   },
   Object {
-    "col": 5,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": null,
-    "col": 5,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 14,
+      },
+    },
     "type": "call",
     "val": "div",
   },
   Object {
-    "col": 9,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 9,
+        "line": 14,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 10,
+        "line": 14,
+      },
+    },
     "mustEscape": true,
     "name": "style",
     "type": "attribute",
     "val": "\'color:red;background:green\'",
   },
   Object {
-    "col": 44,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 44,
+        "line": 14,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 5,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 15,
+      },
+    },
     "type": "call",
     "val": "div",
   },
   Object {
-    "col": 9,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 9,
+        "line": 15,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 51,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 10,
+        "line": 15,
+      },
+    },
     "mustEscape": true,
     "name": "style",
     "type": "attribute",
     "val": "{color: \'red\', background: \'green\'}",
   },
   Object {
-    "col": 51,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 52,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 51,
+        "line": 15,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 16,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var bg = \'green\';",
   },
   Object {
-    "col": 1,
-    "line": 17,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 17,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 8,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 8,
+        "line": 17,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 9,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 9,
+        "line": 17,
+      },
+    },
     "mustEscape": true,
     "name": "style",
     "type": "attribute",
     "val": "{color: \'red\', background: bg}",
   },
   Object {
-    "col": 45,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 46,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 45,
+        "line": 17,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 18,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 18,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 8,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 60,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 8,
+        "line": 18,
+      },
+    },
     "type": "&attributes",
     "val": "{style: {color: \'red\', background: bg}}",
   },
   Object {
-    "col": 1,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 5,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 19,
+      },
+    },
     "type": "call",
     "val": "div",
   },
   Object {
-    "col": 9,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 9,
+        "line": 19,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 46,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 10,
+        "line": 19,
+      },
+    },
     "mustEscape": true,
     "name": "style",
     "type": "attribute",
     "val": "{color: \'red\', background: bg}",
   },
   Object {
-    "col": 46,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 47,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 46,
+        "line": 19,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 3,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -16258,387 +40153,981 @@ Array [
 exports[`test tag.interpolation.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var tag = \'p\'",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var foo = \'bar\'",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "interpolation",
     "val": "tag",
   },
   Object {
-    "col": 8,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 8,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "value",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "interpolation",
     "val": "tag",
   },
   Object {
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 7,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 8,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 8,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "\'bar\'",
   },
   Object {
-    "col": 17,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 17,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 19,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 19,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "value",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "interpolation",
     "val": "foo ? \'a\' : \'li\'",
   },
   Object {
-    "col": 20,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 20,
+        "line": 7,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 21,
-    "line": 7,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 21,
+        "line": 7,
+      },
+    },
+    "mustEscape": true,
     "name": "something",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 30,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 30,
+        "line": 7,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 32,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 32,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "here",
   },
   Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": "icon",
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "mixin",
     "val": "item",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 3,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 5,
+        "line": 11,
+      },
+    },
     "type": "if",
     "val": "attributes.href",
   },
   Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 7,
+        "line": 12,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 8,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 8,
+        "line": 12,
+      },
+    },
     "type": "&attributes",
     "val": "attributes",
   },
   Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 9,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "img",
   },
   Object {
-    "col": 12,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 12,
+        "line": 13,
+      },
+    },
     "type": "class",
     "val": "icon",
   },
   Object {
-    "col": 17,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 17,
+        "line": 13,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 18,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 18,
+        "line": 13,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "icon",
   },
   Object {
-    "col": 26,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 26,
+        "line": 13,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 14,
-    "type": "newline",
-  },
-  Object {
-    "col": 9,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 9,
+        "line": 14,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 7,
-    "line": 15,
-    "type": "outdent",
-  },
-  Object {
-    "col": 5,
-    "line": 15,
-    "type": "outdent",
-  },
-  Object {
-    "col": 5,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 5,
+        "line": 15,
+      },
+    },
     "type": "else",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 7,
+        "line": 16,
+      },
+    },
     "type": "tag",
     "val": "span",
   },
   Object {
-    "col": 11,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 11,
+        "line": 16,
+      },
+    },
     "type": "&attributes",
     "val": "attributes",
   },
   Object {
-    "col": 1,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 9,
+        "line": 17,
+      },
+    },
     "type": "tag",
     "val": "img",
   },
   Object {
-    "col": 12,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 12,
+        "line": 17,
+      },
+    },
     "type": "class",
     "val": "icon",
   },
   Object {
-    "col": 17,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 17,
+        "line": 17,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 18,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 18,
+        "line": 17,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "icon",
   },
   Object {
-    "col": 26,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 26,
+        "line": 17,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 18,
-    "type": "newline",
-  },
-  Object {
-    "col": 9,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 9,
+        "line": 18,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 7,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 5,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "args": "\'contact\'",
-    "col": 3,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 3,
+        "line": 21,
+      },
+    },
     "type": "call",
     "val": "item",
   },
   Object {
-    "col": 20,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 20,
+        "line": 21,
+      },
+    },
     "type": "text",
     "val": "Contact",
   },
   Object {
-    "col": 1,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 3,
+        "line": 22,
+      },
+    },
     "type": "call",
     "val": "item",
   },
   Object {
-    "col": 8,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 8,
+        "line": 22,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 9,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 9,
+        "line": 22,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'/contact\'",
   },
   Object {
-    "col": 24,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 24,
+        "line": 22,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 26,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 26,
+        "line": 22,
+      },
+    },
     "type": "text",
     "val": "Contact",
   },
   Object {
-    "col": 1,
-    "line": 23,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -16648,96 +41137,240 @@ exports[`test tag-blocks.pug 1`] = `
 Array [
   Object {
     "buffer": true,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "comment",
     "val": " we should not get blocks within blocks",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "We have sent an e-mail to ",
   },
   Object {
-    "col": 31,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 31,
+        "line": 3,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
-    "col": 33,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 33,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "strong",
   },
   Object {
     "buffer": true,
-    "col": 39,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 57,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 39,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "this.props.email",
   },
   Object {
-    "col": 57,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 58,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 57,
+        "line": 3,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 58,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 96,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 58,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": ".  Please click the link in the e-mail",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": true,
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "\'  \'",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "to confirm your e-mail address.",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -16746,345 +41379,885 @@ Array [
 exports[`test tags.self-closing.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 6,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 6,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "\'baz\'",
   },
   Object {
-    "col": 16,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 16,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 6,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 6,
+        "line": 5,
+      },
+    },
     "type": "slash",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 6,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 6,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 7,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "\'baz\'",
   },
   Object {
-    "col": 16,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 16,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 17,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 17,
+        "line": 6,
+      },
+    },
     "type": "slash",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 7,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 7,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "/",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 6,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 6,
+        "line": 8,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 7,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 7,
+        "line": 8,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "\'baz\'",
   },
   Object {
-    "col": 16,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 16,
+        "line": 8,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 18,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 18,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "/",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "type": "interpolation",
     "val": "\'foo\'",
   },
   Object {
-    "col": 11,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 11,
+        "line": 9,
+      },
+    },
     "type": "slash",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 10,
+      },
+    },
     "type": "interpolation",
     "val": "\'foo\'",
   },
   Object {
-    "col": 11,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 11,
+        "line": 10,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 12,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 12,
+        "line": 10,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "\'baz\'",
   },
   Object {
-    "col": 21,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 21,
+        "line": 10,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 22,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 22,
+        "line": 10,
+      },
+    },
     "type": "slash",
   },
   Object {
-    "col": 1,
-    "line": 11,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 11,
+      },
+    },
     "type": "interpolation",
     "val": "\'foo\'",
   },
   Object {
-    "col": 12,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 12,
+        "line": 11,
+      },
+    },
     "type": "text",
     "val": "/",
   },
   Object {
-    "col": 1,
-    "line": 12,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 12,
+      },
+    },
     "type": "interpolation",
     "val": "\'foo\'",
   },
   Object {
-    "col": 11,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 11,
+        "line": 12,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 12,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 12,
+        "line": 12,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "\'baz\'",
   },
   Object {
-    "col": 21,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 21,
+        "line": 12,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 23,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 23,
+        "line": 12,
+      },
+    },
     "type": "text",
     "val": "/",
   },
   Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 3,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 13,
+      },
+    },
     "type": "comment",
     "val": " can have a single space after them",
   },
   Object {
-    "col": 1,
-    "line": 14,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 14,
+      },
+    },
     "type": "tag",
     "val": "img",
   },
   Object {
-    "col": 6,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 6,
+        "line": 14,
+      },
+    },
     "type": "text",
     "val": " ",
   },
   Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 3,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 46,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 15,
+      },
+    },
     "type": "comment",
     "val": " can have lots of white space after them",
   },
   Object {
-    "col": 1,
-    "line": 16,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 16,
+      },
+    },
     "type": "tag",
     "val": "img",
   },
   Object {
-    "col": 7,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 7,
+        "line": 16,
+      },
+    },
     "type": "text",
     "val": "   ",
   },
   Object {
-    "col": 1,
-    "line": 17,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 17,
+      },
+    },
     "type": "interpolation",
     "val": "
     \'foo\'
   ",
   },
   Object {
-    "col": 4,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 4,
+        "line": 19,
+      },
+    },
     "type": "slash",
   },
   Object {
-    "col": 1,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -17093,156 +42266,399 @@ Array [
 exports[`test template.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 7,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 7,
+        "line": 1,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 8,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 8,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text/x-template\'",
   },
   Object {
-    "col": 30,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 30,
+        "line": 1,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "article",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "h2",
   },
   Object {
-    "col": 8,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 8,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "{{title}}",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "{{description}}",
   },
   Object {
-    "col": 3,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 7,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 8,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 8,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text/x-template\'",
   },
   Object {
-    "col": 30,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 30,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 31,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 31,
+        "line": 6,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 32,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 32,
+        "line": 6,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "article",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "  h2 {{title}}",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "  p {{description}}",
   },
   Object {
-    "col": 22,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 22,
+        "line": 9,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 22,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 22,
+        "line": 9,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -17251,501 +42667,1320 @@ Array [
 exports[`test text.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "option",
   },
   Object {
-    "col": 7,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 7,
+        "line": 1,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 8,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 8,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
     "val": "\'\'",
   },
   Object {
-    "col": 16,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 16,
+        "line": 1,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 18,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 18,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "-- (selected) --",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 2,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 2,
+        "line": 5,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 5,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 5,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 4,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 4,
+        "line": 10,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 11,
-    "type": "newline",
-  },
-  Object {
-    "col": 4,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 4,
+        "line": 11,
+      },
+    },
     "type": "text",
     "val": " ",
   },
   Object {
-    "col": 1,
-    "line": 12,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 5,
+        "line": 12,
+      },
+    },
     "type": "text",
     "val": "baz",
   },
   Object {
-    "col": 1,
-    "line": 14,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 2,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 2,
+        "line": 14,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 3,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 14,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 15,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 16,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 17,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 18,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 18,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 19,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 19,
+      },
+    },
     "type": "text",
     "val": "baz",
   },
   Object {
-    "col": 1,
-    "line": 20,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 21,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 1,
-    "line": 23,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 2,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 2,
+        "line": 23,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 24,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 25,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 26,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 27,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 27,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 27,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 28,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 28,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 28,
+      },
+    },
     "type": "text",
     "val": "baz",
   },
   Object {
-    "col": 1,
-    "line": 29,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 30,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 30,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 30,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 30,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 30,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 30,
+      },
+    },
     "type": "tag",
     "val": "pre",
   },
   Object {
-    "col": 1,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 5,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 5,
+        "line": 31,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 32,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 32,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 5,
+        "line": 32,
+      },
+    },
     "type": "text",
     "val": "  bar",
   },
   Object {
-    "col": 1,
-    "line": 33,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 33,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 33,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 5,
+        "line": 33,
+      },
+    },
     "type": "text",
     "val": "    baz",
   },
   Object {
-    "col": 1,
-    "line": 34,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 34,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 5,
+        "line": 34,
+      },
+    },
     "type": "text",
     "val": ".",
   },
   Object {
-    "col": 1,
-    "line": 36,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
     "type": "tag",
     "val": "pre",
   },
   Object {
-    "col": 4,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 4,
+        "line": 36,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 5,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 5,
+        "line": 36,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 37,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 37,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 37,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 38,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 38,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 38,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 38,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 38,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 38,
+      },
+    },
     "type": "text",
     "val": "  bar",
   },
   Object {
-    "col": 1,
-    "line": 39,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 39,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 39,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 39,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 39,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 39,
+      },
+    },
     "type": "text",
     "val": "    baz",
   },
   Object {
-    "col": 1,
-    "line": 40,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 40,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 40,
+      },
+    },
     "type": "text",
     "val": ".",
   },
   Object {
-    "col": 1,
-    "line": 41,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 41,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 41,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 41,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 42,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 42,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 42,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 42,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 2,
-    "line": 42,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 2,
+        "line": 42,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 43,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 44,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 44,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 44,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 44,
+      },
+    },
     "type": "text",
     "val": "  bar",
   },
   Object {
-    "col": 1,
-    "line": 45,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 45,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 45,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 45,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 45,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 45,
+      },
+    },
     "type": "text",
     "val": "    baz",
   },
   Object {
-    "col": 1,
-    "line": 46,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 46,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 46,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 46,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 46,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 46,
+      },
+    },
     "type": "text",
     "val": ".",
   },
   Object {
-    "col": 4,
-    "line": 46,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 46,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 4,
+        "line": 46,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 4,
-    "line": 46,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 46,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 4,
+        "line": 46,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -17754,123 +43989,303 @@ Array [
 exports[`test text-block.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "label",
   },
   Object {
-    "col": 7,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 7,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "Username:",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 8,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 8,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 9,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text\'",
   },
   Object {
-    "col": 22,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 22,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "name",
     "type": "attribute",
     "val": "\'user[name]\'",
   },
   Object {
-    "col": 39,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 40,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 39,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "label",
   },
   Object {
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "Password:",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 8,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 8,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 9,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text\'",
   },
   Object {
-    "col": 22,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 22,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "name",
     "type": "attribute",
     "val": "\'user[pass]\'",
   },
   Object {
-    "col": 39,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 40,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 39,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 40,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 40,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 40,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 40,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 40,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 40,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -17879,25 +44294,61 @@ Array [
 exports[`test utf8bom.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/utf8bom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/utf8bom.pug",
+      "start": Object {
+        "column": 3,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "\"foo\"",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/utf8bom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/utf8bom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -17907,65 +44358,155 @@ exports[`test vars.pug 1`] = `
 Array [
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/vars.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var foo = \'bar\'",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/vars.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/vars.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var list = [1,2,3]",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/vars.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/vars.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/vars.pug",
+      "start": Object {
+        "column": 2,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/vars.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "list",
   },
   Object {
-    "col": 15,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/vars.pug",
+      "start": Object {
+        "column": 15,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "id",
     "type": "attribute",
     "val": "foo",
   },
   Object {
-    "col": 21,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/vars.pug",
+      "start": Object {
+        "column": 21,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 22,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/vars.pug",
+      "start": Object {
+        "column": 22,
+        "line": 3,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -17984,81 +44525,198 @@ exports[`test while.pug 1`] = `
 Array [
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var x = 1;",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "while",
     "val": "x < 10",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "x++;",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "x",
   },
   Object {
-    "col": 3,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -18076,65 +44734,164 @@ Object {
 exports[`test xml.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/xml.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "doctype",
     "val": "xml",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/xml.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/xml.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "category",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/xml.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/xml.pug",
+      "start": Object {
+        "column": 10,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "term",
     "type": "attribute",
     "val": "\'some term\'",
   },
   Object {
-    "col": 26,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/xml.pug",
+      "start": Object {
+        "column": 26,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 27,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/xml.pug",
+      "start": Object {
+        "column": 27,
+        "line": 2,
+      },
+    },
     "type": "slash",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/xml.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/xml.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "link",
   },
   Object {
-    "col": 6,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/xml.pug",
+      "start": Object {
+        "column": 6,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "http://google.com",
   },
   Object {
-    "col": 23,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/xml.pug",
+      "start": Object {
+        "column": 23,
+        "line": 3,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -18143,117 +44900,297 @@ Array [
 exports[`test yield.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 13,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 13,
+        "line": 3,
+      },
+    },
     "type": "path",
     "val": "yield-head.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 13,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 13,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 14,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 14,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/caustic.js\'",
   },
   Object {
-    "col": 31,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 31,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 13,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 13,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 14,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 14,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/app.js\'",
   },
   Object {
-    "col": 27,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 27,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 5,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -18262,117 +45199,297 @@ Array [
 exports[`test yield-before-conditional.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 13,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 46,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 13,
+        "line": 3,
+      },
+    },
     "type": "path",
     "val": "yield-before-conditional-head.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 13,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 13,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 14,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 14,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/caustic.js\'",
   },
   Object {
-    "col": 31,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 31,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 13,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 13,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 14,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 14,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/app.js\'",
   },
   Object {
-    "col": 27,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 27,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 5,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -18381,105 +45498,267 @@ Array [
 exports[`test yield-before-conditional-head.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 10,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/jquery.js\'",
   },
   Object {
-    "col": 26,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 26,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "yield",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "if",
     "val": "false",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 11,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 11,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 12,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 12,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/jquery.ui.js\'",
   },
   Object {
-    "col": 31,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 31,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 3,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -18488,88 +45767,223 @@ Array [
 exports[`test yield-head.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 10,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/jquery.js\'",
   },
   Object {
-    "col": 26,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 26,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "yield",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 9,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 10,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/jquery.ui.js\'",
   },
   Object {
-    "col": 29,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 29,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -18578,70 +45992,178 @@ Array [
 exports[`test yield-title.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 13,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 13,
+        "line": 3,
+      },
+    },
     "type": "path",
     "val": "yield-title-head.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 9,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 9,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "My Title",
   },
   Object {
-    "col": 5,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -18650,100 +46172,253 @@ Array [
 exports[`test yield-title-head.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "title",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "yield",
   },
   Object {
-    "col": 3,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 9,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 10,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/jquery.js\'",
   },
   Object {
-    "col": 26,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 26,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 10,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/jquery.ui.js\'",
   },
   Object {
-    "col": 29,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 29,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
diff --git a/packages/pug-parser/index.js b/packages/pug-parser/index.js
index fe93b92e9..9036ca3bf 100644
--- a/packages/pug-parser/index.js
+++ b/packages/pug-parser/index.js
@@ -51,8 +51,8 @@ Parser.prototype = {
 
   error: function (code, message, token) {
     var err = error(code, message, {
-      line: token.line,
-      column: token.col,
+      line: token.loc.start.line,
+      column: token.loc.start.column,
       filename: this.filename,
       src: this.src
     });
@@ -229,7 +229,7 @@ Parser.prototype = {
       case 'start-pug-interpolation':
         return this.parseText({block: true});
       case 'text-html':
-        return this.initBlock(this.peek().line, this.parseTextHtml());
+        return this.initBlock(this.peek().loc.start.line, this.parseTextHtml());
       case 'dot':
         return this.parseDot();
       case 'each':
@@ -250,11 +250,11 @@ Parser.prototype = {
         return this.parseYield();
       case 'id':
       case 'class':
+        if (!this.peek().loc.start) debugger;
         this.tokens.defer({
           type: 'tag',
           val: 'div',
-          line: this.peek().line,
-          col: this.peek().col,
+          loc: this.peek().loc,
           filename: this.filename
         });
         return this.parseExpr();
@@ -276,7 +276,7 @@ Parser.prototype = {
 
   parseText: function(options){
     var tags = [];
-    var lineno = this.peek().line;
+    var lineno = this.peek().loc.start.line;
     var nextTok = this.peek();
     loop:
       while (true) {
@@ -286,8 +286,8 @@ Parser.prototype = {
             tags.push({
               type: 'Text',
               val: tok.val,
-              line: tok.line,
-              column: tok.col,
+              line: tok.loc.start.line,
+              column: tok.loc.start.column,
               filename: this.filename
             });
             break;
@@ -299,8 +299,8 @@ Parser.prototype = {
               buffer: tok.buffer,
               mustEscape: tok.mustEscape !== false,
               isInline: true,
-              line: tok.line,
-              column: tok.col,
+              line: tok.loc.start.line,
+              column: tok.loc.start.column,
               filename: this.filename
             });
             break;
@@ -312,8 +312,8 @@ Parser.prototype = {
               tags.push({
                 type: 'Text',
                 val: '\n',
-                line: tok.line,
-                column: tok.col,
+                line: tok.loc.start.line,
+                column: tok.loc.start.column,
                 filename: this.filename
               });
             }
@@ -347,8 +347,8 @@ loop:
               type: 'Text',
               val: text.val,
               filename: this.filename,
-              line: text.line,
-              column: text.col,
+              line: text.loc.start.line,
+              column: text.loc.start.column,
               isHtml: true
             };
             nodes.push(currentNode);
@@ -395,7 +395,7 @@ loop:
     var tok = this.accept(':');
     if (tok) {
       var expr = this.parseExpr();
-      return expr.type === 'Block' ? expr : this.initBlock(tok.line, [expr]);
+      return expr.type === 'Block' ? expr : this.initBlock(tok.loc.start.line, [expr]);
     } else {
       return this.block();
     }
@@ -410,12 +410,12 @@ loop:
     var node = {
       type: 'Case',
       expr: tok.val,
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
 
-    var block = this.emptyBlock(tok.line + 1);
+    var block = this.emptyBlock(tok.loc.start.line + 1);
     this.expect('indent');
     while ('outdent' != this.peek().type) {
       switch (this.peek().type) {
@@ -455,8 +455,8 @@ loop:
         expr: tok.val,
         block: this.parseBlockExpansion(),
         debug: false,
-        line: tok.line,
-        column: tok.col,
+        line: tok.loc.start.line,
+        column: tok.loc.start.column,
         filename: this.filename
       };
     } else {
@@ -464,8 +464,8 @@ loop:
         type: 'When',
         expr: tok.val,
         debug: false,
-        line: tok.line,
-        column: tok.col,
+        line: tok.loc.start.line,
+        column: tok.loc.start.column,
         filename: this.filename
       };
     }
@@ -482,8 +482,8 @@ loop:
       expr: 'default',
       block: this.parseBlockExpansion(),
       debug: false,
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
   },
@@ -501,8 +501,8 @@ loop:
       buffer: tok.buffer,
       mustEscape: tok.mustEscape !== false,
       isInline: !!noBlock,
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
     // todo: why is this here?  It seems like a hacky workaround
@@ -528,10 +528,10 @@ loop:
     var node = {
       type: 'Conditional',
       test: tok.val,
-      consequent: this.emptyBlock(tok.line),
+      consequent: this.emptyBlock(tok.loc.start.line),
       alternate: null,
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
 
@@ -550,10 +550,10 @@ loop:
           currentNode.alternate = {
             type: 'Conditional',
             test: tok.val,
-            consequent: this.emptyBlock(tok.line),
+            consequent: this.emptyBlock(tok.loc.start.line),
             alternate: null,
-            line: tok.line,
-            column: tok.col,
+            line: tok.loc.start.line,
+            column: tok.loc.start.column,
             filename: this.filename
           }
         );
@@ -578,8 +578,8 @@ loop:
     var node = {
       type: 'While',
       test: tok.val,
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
 
@@ -587,7 +587,7 @@ loop:
     if ('indent' == this.peek().type) {
       node.block = this.block();
     } else {
-      node.block = this.emptyBlock(tok.line);
+      node.block = this.emptyBlock(tok.loc.start.line);
     }
 
     return node;
@@ -599,8 +599,8 @@ loop:
 
   parseBlockCode: function(){
     var tok = this.expect('blockcode');
-    var line = tok.line;
-    var column = tok.col;
+    var line = tok.loc.start.line;
+    var column = tok.loc.start.column;
     var body = this.peek();
     var text = '';
     if (body.type === 'start-pipeless-text') {
@@ -649,8 +649,8 @@ loop:
         val: tok.val,
         block: block,
         buffer: tok.buffer,
-        line: tok.line,
-        column: tok.col,
+        line: tok.loc.start.line,
+        column: tok.loc.start.column,
         filename: this.filename
       };
     } else {
@@ -658,8 +658,8 @@ loop:
         type: 'Comment',
         val: tok.val,
         buffer: tok.buffer,
-        line: tok.line,
-        column: tok.col,
+        line: tok.loc.start.line,
+        column: tok.loc.start.column,
         filename: this.filename
       };
     }
@@ -674,8 +674,8 @@ loop:
     return {
       type: 'Doctype',
       val: tok.val,
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
   },
@@ -692,8 +692,8 @@ loop:
       type: 'IncludeFilter',
       name: tok.val,
       attrs: attrs,
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
   },
@@ -712,19 +712,19 @@ loop:
 
     if (this.peek().type === 'text') {
       var textToken = this.advance();
-      block = this.initBlock(textToken.line, [
+      block = this.initBlock(textToken.loc.start.line, [
         {
           type: 'Text',
           val: textToken.val,
-          line: textToken.line,
-          column: textToken.col,
+          line: textToken.loc.start.line,
+          column: textToken.loc.start.column,
           filename: this.filename
         }
       ]);
     } else if (this.peek().type === 'filter') {
-      block = this.initBlock(tok.line, [this.parseFilter()]);
+      block = this.initBlock(tok.loc.start.line, [this.parseFilter()]);
     } else {
-      block = this.parseTextBlock() || this.emptyBlock(tok.line);
+      block = this.parseTextBlock() || this.emptyBlock(tok.loc.start.line);
     }
 
     return {
@@ -732,8 +732,8 @@ loop:
       name: tok.val,
       block: block,
       attrs: attrs,
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
   },
@@ -750,8 +750,8 @@ loop:
       val: tok.val,
       key: tok.key,
       block: this.block(),
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
     if (this.peek().type == 'else') {
@@ -773,12 +773,12 @@ loop:
       file: {
         type: 'FileReference',
         path: path.val.trim(),
-        line: path.line,
-        column: path.col,
+        line: path.loc.start.line,
+        column: path.loc.start.column,
         filename: this.filename
       },
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
   },
@@ -790,12 +790,12 @@ loop:
   parseBlock: function(){
     var tok = this.expect('block');
 
-    var node = 'indent' == this.peek().type ? this.block() : this.emptyBlock(tok.line);
+    var node = 'indent' == this.peek().type ? this.block() : this.emptyBlock(tok.loc.start.line);
     node.type = 'NamedBlock';
     node.name = tok.val.trim();
     node.mode = tok.mode;
-    node.line = tok.line;
-    node.column = tok.col;
+    node.line = tok.loc.start.line;
+    node.column = tok.loc.start.column;
 
     return node;
   },
@@ -807,8 +807,8 @@ loop:
     }
     return {
       type: 'MixinBlock',
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
   },
@@ -817,8 +817,8 @@ loop:
     var tok = this.expect('yield');
     return {
       type: 'YieldBlock',
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
   },
@@ -835,8 +835,8 @@ loop:
         type: 'FileReference',
         filename: this.filename
       },
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
     var filters = [];
@@ -846,14 +846,14 @@ loop:
     var path = this.expect('path');
 
     node.file.path = path.val.trim();
-    node.file.line = path.line;
-    node.file.column = path.col;
+    node.file.line = path.loc.start.line;
+    node.file.column = path.loc.start.column;
 
     if ((/\.jade$/.test(node.file.path) || /\.pug$/.test(node.file.path)) && !filters.length) {
-      node.block = 'indent' == this.peek().type ? this.block() : this.emptyBlock(tok.line);
+      node.block = 'indent' == this.peek().type ? this.block() : this.emptyBlock(tok.loc.start.line);
       if (/\.jade$/.test(node.file.path)) {
         console.warn(
-          this.filename + ', line ' + tok.line +
+          this.filename + ', line ' + tok.loc.start.line +
           ':\nThe .jade extension is deprecated, use .pug for "' + node.file.path +'".'
         );
       }
@@ -879,12 +879,12 @@ loop:
       type: 'Mixin',
       name: name,
       args: args,
-      block: this.emptyBlock(tok.line),
+      block: this.emptyBlock(tok.loc.start.line),
       call: true,
       attrs: [],
       attributeBlocks: [],
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
 
@@ -914,8 +914,8 @@ loop:
         args: args,
         block: this.block(),
         call: false,
-        line: tok.line,
-        column: tok.col,
+        line: tok.loc.start.line,
+        column: tok.loc.start.column,
         filename: this.filename
       };
       this.inMixin--;
@@ -932,7 +932,7 @@ loop:
   parseTextBlock: function(){
     var tok = this.accept('start-pipeless-text');
     if (!tok) return;
-    var block = this.emptyBlock(tok.line);
+    var block = this.emptyBlock(tok.loc.start.line);
     while (this.peek().type !== 'end-pipeless-text') {
       var tok = this.advance();
       switch (tok.type) {
@@ -940,8 +940,8 @@ loop:
           block.nodes.push({
             type: 'Text',
             val: tok.val,
-            line: tok.line,
-            column: tok.col,
+            line: tok.loc.start.line,
+            column: tok.loc.start.column,
             filename: this.filename
           });
           break;
@@ -949,8 +949,8 @@ loop:
           block.nodes.push({
             type: 'Text',
             val: '\n',
-            line: tok.line,
-            column: tok.col,
+            line: tok.loc.start.line,
+            column: tok.loc.start.column,
             filename: this.filename
           });
           break;
@@ -965,8 +965,8 @@ loop:
             buffer: tok.buffer,
             mustEscape: tok.mustEscape !== false,
             isInline: true,
-            line: tok.line,
-            column: tok.col,
+            line: tok.loc.start.line,
+            column: tok.loc.start.column,
             filename: this.filename
           });
           break;
@@ -986,7 +986,7 @@ loop:
 
   block: function(){
     var tok = this.expect('indent');
-    var block = this.emptyBlock(tok.line);
+    var block = this.emptyBlock(tok.loc.start.line);
     while ('outdent' != this.peek().type) {
       if ('newline' == this.peek().type) {
         this.advance();
@@ -1015,12 +1015,12 @@ loop:
       type: 'InterpolatedTag',
       expr: tok.val,
       selfClosing: false,
-      block: this.emptyBlock(tok.line),
+      block: this.emptyBlock(tok.loc.start.line),
       attrs: [],
       attributeBlocks: [],
       isInline: false,
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
 
@@ -1037,12 +1037,12 @@ loop:
       type: 'Tag',
       name: tok.val,
       selfClosing: false,
-      block: this.emptyBlock(tok.line),
+      block: this.emptyBlock(tok.loc.start.line),
       attrs: [],
       attributeBlocks: [],
       isInline: inlineTags.indexOf(tok.val) !== -1,
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
 
@@ -1073,15 +1073,15 @@ loop:
             tag.attrs.push({
               name: tok.type,
               val: "'" + tok.val + "'",
-              line: tok.line,
-              column: tok.col,
+              line: tok.loc.start.line,
+              column: tok.loc.start.column,
               filename: this.filename,
               mustEscape: false
             });
             continue;
           case 'start-attributes':
             if (seenAttrs) {
-              console.warn(this.filename + ', line ' + this.peek().line + ':\nYou should not have pug tags with multiple attributes.');
+              console.warn(this.filename + ', line ' + this.peek().loc.start.line + ':\nYou should not have pug tags with multiple attributes.');
             }
             seenAttrs = true;
             tag.attrs = tag.attrs.concat(this.attrs(attributeNames));
@@ -1091,8 +1091,8 @@ loop:
             tag.attributeBlocks.push({
               type: 'AttributeBlock',
               val: tok.val,
-              line: tok.line,
-              column: tok.col,
+              line: tok.loc.start.line,
+              column: tok.loc.start.column,
               filename: this.filename
             });
             break;
@@ -1178,8 +1178,8 @@ loop:
       attrs.push({
         name: tok.name,
         val: tok.val,
-        line: tok.line,
-        column: tok.col,
+        line: tok.loc.start.line,
+        column: tok.loc.start.column,
         filename: this.filename,
         mustEscape: tok.mustEscape !== false
       });
@@ -1189,4 +1189,4 @@ loop:
     this.expect('end-attributes');
     return attrs;
   }
-};
+};
\ No newline at end of file
diff --git a/packages/pug-parser/test/__snapshots__/index.test.js.snap b/packages/pug-parser/test/__snapshots__/index.test.js.snap
index f5e7c5ee2..54a141c98 100644
--- a/packages/pug-parser/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-parser/test/__snapshots__/index.test.js.snap
@@ -588,7 +588,7 @@ Object {
           "column": 8,
           "filename": "attrs.tokens.json",
           "line": 3,
-          "mustEscape": false,
+          "mustEscape": true,
           "name": "bar",
           "val": true,
         },
@@ -596,7 +596,7 @@ Object {
           "column": 13,
           "filename": "attrs.tokens.json",
           "line": 3,
-          "mustEscape": false,
+          "mustEscape": true,
           "name": "baz",
           "val": true,
         },
@@ -705,7 +705,7 @@ Object {
                 "column": 23,
                 "filename": "attrs.tokens.json",
                 "line": 7,
-                "mustEscape": false,
+                "mustEscape": true,
                 "name": "selected",
                 "val": true,
               },
@@ -928,7 +928,7 @@ Object {
           "column": 7,
           "filename": "attrs.tokens.json",
           "line": 14,
-          "mustEscape": false,
+          "mustEscape": true,
           "name": "bar",
           "val": true,
         },
@@ -936,7 +936,7 @@ Object {
           "column": 11,
           "filename": "attrs.tokens.json",
           "line": 14,
-          "mustEscape": false,
+          "mustEscape": true,
           "name": "baz",
           "val": true,
         },
@@ -1045,7 +1045,7 @@ Object {
                 "column": 22,
                 "filename": "attrs.tokens.json",
                 "line": 18,
-                "mustEscape": false,
+                "mustEscape": true,
                 "name": "selected",
                 "val": true,
               },
@@ -1244,7 +1244,7 @@ Object {
           "column": 5,
           "filename": "attrs.tokens.json",
           "line": 26,
-          "mustEscape": false,
+          "mustEscape": true,
           "name": "def",
           "val": true,
         },
@@ -1278,7 +1278,7 @@ Object {
           "column": 5,
           "filename": "attrs.tokens.json",
           "line": 28,
-          "mustEscape": false,
+          "mustEscape": true,
           "name": "def",
           "val": true,
         },
@@ -1312,7 +1312,7 @@ Object {
           "column": 3,
           "filename": "attrs.tokens.json",
           "line": 30,
-          "mustEscape": false,
+          "mustEscape": true,
           "name": "def",
           "val": true,
         },
@@ -1346,7 +1346,7 @@ Object {
           "column": 4,
           "filename": "attrs.tokens.json",
           "line": 32,
-          "mustEscape": false,
+          "mustEscape": true,
           "name": "def",
           "val": true,
         },
@@ -1380,7 +1380,7 @@ Object {
           "column": 3,
           "filename": "attrs.tokens.json",
           "line": 34,
-          "mustEscape": false,
+          "mustEscape": true,
           "name": "def",
           "val": true,
         },
@@ -1414,7 +1414,7 @@ Object {
           "column": 5,
           "filename": "attrs.tokens.json",
           "line": 36,
-          "mustEscape": false,
+          "mustEscape": true,
           "name": "def",
           "val": true,
         },
@@ -1480,7 +1480,7 @@ Object {
           "val": "\'foo\'",
         },
         Object {
-          "column": 14,
+          "column": 13,
           "filename": "attrs.tokens.json",
           "line": 42,
           "mustEscape": true,
@@ -1514,7 +1514,7 @@ Object {
           "val": "\'foo\'",
         },
         Object {
-          "column": 14,
+          "column": 13,
           "filename": "attrs.tokens.json",
           "line": 43,
           "mustEscape": true,
@@ -3055,6 +3055,110 @@ Object {
                   "line": 9,
                   "type": "Case",
                 },
+                Object {
+                  "buffer": false,
+                  "column": 5,
+                  "filename": "case.tokens.json",
+                  "isInline": false,
+                  "line": 16,
+                  "mustEscape": false,
+                  "type": "Code",
+                  "val": "var friend = \'Tim:G\'",
+                },
+                Object {
+                  "block": Object {
+                    "filename": "case.tokens.json",
+                    "line": 18,
+                    "nodes": Array [
+                      Object {
+                        "block": Object {
+                          "filename": "case.tokens.json",
+                          "line": 18,
+                          "nodes": Array [
+                            Object {
+                              "attributeBlocks": Array [],
+                              "attrs": Array [],
+                              "block": Object {
+                                "filename": "case.tokens.json",
+                                "line": 18,
+                                "nodes": Array [
+                                  Object {
+                                    "column": 26,
+                                    "filename": "case.tokens.json",
+                                    "line": 18,
+                                    "type": "Text",
+                                    "val": "Friend is a string",
+                                  },
+                                ],
+                                "type": "Block",
+                              },
+                              "column": 24,
+                              "filename": "case.tokens.json",
+                              "isInline": false,
+                              "line": 18,
+                              "name": "p",
+                              "selfClosing": false,
+                              "type": "Tag",
+                            },
+                          ],
+                          "type": "Block",
+                        },
+                        "column": 7,
+                        "debug": false,
+                        "expr": "\'Tim:G\'",
+                        "filename": "case.tokens.json",
+                        "line": 18,
+                        "type": "When",
+                      },
+                      Object {
+                        "block": Object {
+                          "filename": "case.tokens.json",
+                          "line": 19,
+                          "nodes": Array [
+                            Object {
+                              "attributeBlocks": Array [],
+                              "attrs": Array [],
+                              "block": Object {
+                                "filename": "case.tokens.json",
+                                "line": 19,
+                                "nodes": Array [
+                                  Object {
+                                    "column": 26,
+                                    "filename": "case.tokens.json",
+                                    "line": 19,
+                                    "type": "Text",
+                                    "val": "Friend is an object",
+                                  },
+                                ],
+                                "type": "Block",
+                              },
+                              "column": 24,
+                              "filename": "case.tokens.json",
+                              "isInline": false,
+                              "line": 19,
+                              "name": "p",
+                              "selfClosing": false,
+                              "type": "Tag",
+                            },
+                          ],
+                          "type": "Block",
+                        },
+                        "column": 7,
+                        "debug": false,
+                        "expr": "{tim: \'g\'}",
+                        "filename": "case.tokens.json",
+                        "line": 19,
+                        "type": "When",
+                      },
+                    ],
+                    "type": "Block",
+                  },
+                  "column": 5,
+                  "expr": "friend",
+                  "filename": "case.tokens.json",
+                  "line": 17,
+                  "type": "Case",
+                },
               ],
               "type": "Block",
             },
@@ -3414,6 +3518,58 @@ Object {
       "selfClosing": false,
       "type": "Tag",
     },
+    Object {
+      "attributeBlocks": Array [],
+      "attrs": Array [
+        Object {
+          "column": 2,
+          "filename": "classes.tokens.json",
+          "line": 13,
+          "mustEscape": false,
+          "name": "class",
+          "val": "\'-foo\'",
+        },
+      ],
+      "block": Object {
+        "filename": "classes.tokens.json",
+        "line": 13,
+        "nodes": Array [],
+        "type": "Block",
+      },
+      "column": 1,
+      "filename": "classes.tokens.json",
+      "isInline": true,
+      "line": 13,
+      "name": "a",
+      "selfClosing": false,
+      "type": "Tag",
+    },
+    Object {
+      "attributeBlocks": Array [],
+      "attrs": Array [
+        Object {
+          "column": 2,
+          "filename": "classes.tokens.json",
+          "line": 14,
+          "mustEscape": false,
+          "name": "class",
+          "val": "\'3foo\'",
+        },
+      ],
+      "block": Object {
+        "filename": "classes.tokens.json",
+        "line": 14,
+        "nodes": Array [],
+        "type": "Block",
+      },
+      "column": 1,
+      "filename": "classes.tokens.json",
+      "isInline": true,
+      "line": 14,
+      "name": "a",
+      "selfClosing": false,
+      "type": "Tag",
+    },
   ],
   "type": "Block",
 }
@@ -5044,7 +5200,7 @@ Object {
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "comments.source.tokens.json",
             "line": 3,
             "type": "Text",
@@ -5258,7 +5414,7 @@ Object {
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "comments.tokens.json",
             "line": 12,
             "type": "Text",
@@ -5310,7 +5466,7 @@ Object {
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "comments.tokens.json",
             "line": 16,
             "type": "Text",
@@ -5377,7 +5533,7 @@ Object {
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "comments.tokens.json",
             "line": 21,
             "type": "Text",
@@ -5444,7 +5600,7 @@ Object {
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "comments.tokens.json",
             "line": 26,
             "type": "Text",
@@ -6942,7 +7098,7 @@ Object {
 ",
                       },
                       Object {
-                        "column": 7,
+                        "column": 1,
                         "filename": "filters.custom.tokens.json",
                         "line": 6,
                         "type": "Text",
@@ -7889,6 +8045,89 @@ Object {
 }
 `;
 
+exports[`test filters.verbatim.tokens.json 1`] = `
+Object {
+  "filename": "filters.verbatim.tokens.json",
+  "line": 0,
+  "nodes": Array [
+    Object {
+      "attributeBlocks": Array [],
+      "attrs": Array [],
+      "block": Object {
+        "filename": "filters.verbatim.tokens.json",
+        "line": 1,
+        "nodes": Array [
+          Object {
+            "attributeBlocks": Array [],
+            "attrs": Array [],
+            "block": Object {
+              "filename": "filters.verbatim.tokens.json",
+              "line": 2,
+              "nodes": Array [
+                Object {
+                  "attrs": Array [],
+                  "block": Object {
+                    "filename": "filters.verbatim.tokens.json",
+                    "line": 3,
+                    "nodes": Array [
+                      Object {
+                        "column": 5,
+                        "filename": "filters.verbatim.tokens.json",
+                        "line": 4,
+                        "type": "Text",
+                        "val": "filters are applied at compile time",
+                      },
+                      Object {
+                        "column": 1,
+                        "filename": "filters.verbatim.tokens.json",
+                        "line": 5,
+                        "type": "Text",
+                        "val": "
+",
+                      },
+                      Object {
+                        "column": 5,
+                        "filename": "filters.verbatim.tokens.json",
+                        "line": 5,
+                        "type": "Text",
+                        "val": "with no #[b interpolation] at #{all}",
+                      },
+                    ],
+                    "type": "Block",
+                  },
+                  "column": 3,
+                  "filename": "filters.verbatim.tokens.json",
+                  "line": 3,
+                  "name": "verbatim",
+                  "type": "Filter",
+                },
+              ],
+              "type": "Block",
+            },
+            "column": 2,
+            "filename": "filters.verbatim.tokens.json",
+            "isInline": false,
+            "line": 2,
+            "name": "div",
+            "selfClosing": false,
+            "type": "Tag",
+          },
+        ],
+        "type": "Block",
+      },
+      "column": 1,
+      "filename": "filters.verbatim.tokens.json",
+      "isInline": false,
+      "line": 1,
+      "name": "html",
+      "selfClosing": false,
+      "type": "Tag",
+    },
+  ],
+  "type": "Block",
+}
+`;
+
 exports[`test filters-empty.tokens.json 1`] = `
 Object {
   "filename": "filters-empty.tokens.json",
@@ -8114,7 +8353,7 @@ Object {
           "column": 24,
           "filename": "html5.tokens.json",
           "line": 2,
-          "mustEscape": false,
+          "mustEscape": true,
           "name": "checked",
           "val": true,
         },
@@ -9981,7 +10220,7 @@ Object {
     },
     Object {
       "buffer": true,
-      "column": 1,
+      "column": 15,
       "filename": "inline-block-comment.tokens.json",
       "line": 1,
       "type": "Comment",
@@ -9998,7 +10237,7 @@ Object {
     },
     Object {
       "buffer": true,
-      "column": 1,
+      "column": 16,
       "filename": "inline-block-comment.tokens.json",
       "line": 2,
       "type": "Comment",
@@ -10015,7 +10254,7 @@ Object {
     },
     Object {
       "buffer": true,
-      "column": 1,
+      "column": 17,
       "filename": "inline-block-comment.tokens.json",
       "line": 3,
       "type": "Comment",
@@ -10255,7 +10494,7 @@ Object {
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "inline-tag.tokens.json",
             "line": 9,
             "type": "Text",
@@ -12494,7 +12733,7 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
-          "column": 31,
+          "column": 30,
           "filename": "mixin.attrs.tokens.json",
           "line": 41,
           "mustEscape": true,
@@ -15552,7 +15791,7 @@ Object {
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "pipeless-filters.tokens.json",
             "line": 3,
             "type": "Text",
@@ -15730,7 +15969,7 @@ Object {
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "pre.tokens.json",
             "line": 5,
             "type": "Text",
@@ -16572,7 +16811,7 @@ Object {
                 "column": 25,
                 "filename": "source.tokens.json",
                 "line": 2,
-                "mustEscape": false,
+                "mustEscape": true,
                 "name": "autobuffer",
                 "val": true,
               },
@@ -16580,7 +16819,7 @@ Object {
                 "column": 37,
                 "filename": "source.tokens.json",
                 "line": 2,
-                "mustEscape": false,
+                "mustEscape": true,
                 "name": "controls",
                 "val": true,
               },
@@ -18179,10 +18418,40 @@ Object {
 ",
           },
           Object {
-            "column": 5,
+            "column": 4,
             "filename": "text.tokens.json",
             "line": 10,
             "type": "Text",
+            "val": "",
+          },
+          Object {
+            "column": 1,
+            "filename": "text.tokens.json",
+            "line": 11,
+            "type": "Text",
+            "val": "
+",
+          },
+          Object {
+            "column": 4,
+            "filename": "text.tokens.json",
+            "line": 11,
+            "type": "Text",
+            "val": " ",
+          },
+          Object {
+            "column": 1,
+            "filename": "text.tokens.json",
+            "line": 12,
+            "type": "Text",
+            "val": "
+",
+          },
+          Object {
+            "column": 5,
+            "filename": "text.tokens.json",
+            "line": 12,
+            "type": "Text",
             "val": "baz",
           },
         ],
@@ -18201,49 +18470,49 @@ Object {
       "attrs": Array [],
       "block": Object {
         "filename": "text.tokens.json",
-        "line": 12,
+        "line": 14,
         "nodes": Array [
           Object {
             "column": 3,
             "filename": "text.tokens.json",
-            "line": 13,
+            "line": 15,
             "type": "Text",
             "val": "foo",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 14,
+            "line": 16,
             "type": "Text",
             "val": "
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "text.tokens.json",
-            "line": 14,
+            "line": 16,
             "type": "Text",
             "val": "",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 15,
+            "line": 17,
             "type": "Text",
             "val": "
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "text.tokens.json",
-            "line": 15,
+            "line": 17,
             "type": "Text",
             "val": "",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 16,
+            "line": 18,
             "type": "Text",
             "val": "
 ",
@@ -18251,14 +18520,14 @@ Object {
           Object {
             "column": 3,
             "filename": "text.tokens.json",
-            "line": 16,
+            "line": 18,
             "type": "Text",
             "val": "bar",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 17,
+            "line": 19,
             "type": "Text",
             "val": "
 ",
@@ -18266,22 +18535,22 @@ Object {
           Object {
             "column": 3,
             "filename": "text.tokens.json",
-            "line": 17,
+            "line": 19,
             "type": "Text",
             "val": "baz",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 18,
+            "line": 20,
             "type": "Text",
             "val": "
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "text.tokens.json",
-            "line": 18,
+            "line": 20,
             "type": "Text",
             "val": "",
           },
@@ -18291,7 +18560,7 @@ Object {
       "column": 1,
       "filename": "text.tokens.json",
       "isInline": false,
-      "line": 12,
+      "line": 14,
       "name": "p",
       "selfClosing": false,
       "textOnly": true,
@@ -18300,44 +18569,44 @@ Object {
     Object {
       "column": 3,
       "filename": "text.tokens.json",
-      "line": 22,
+      "line": 24,
       "type": "Text",
       "val": "foo",
     },
     Object {
       "column": 1,
       "filename": "text.tokens.json",
-      "line": 23,
+      "line": 25,
       "type": "Text",
       "val": "
 ",
     },
     Object {
-      "column": 3,
+      "column": 1,
       "filename": "text.tokens.json",
-      "line": 23,
+      "line": 25,
       "type": "Text",
       "val": "",
     },
     Object {
       "column": 1,
       "filename": "text.tokens.json",
-      "line": 24,
+      "line": 26,
       "type": "Text",
       "val": "
 ",
     },
     Object {
-      "column": 3,
+      "column": 1,
       "filename": "text.tokens.json",
-      "line": 24,
+      "line": 26,
       "type": "Text",
       "val": "",
     },
     Object {
       "column": 1,
       "filename": "text.tokens.json",
-      "line": 25,
+      "line": 27,
       "type": "Text",
       "val": "
 ",
@@ -18345,14 +18614,14 @@ Object {
     Object {
       "column": 3,
       "filename": "text.tokens.json",
-      "line": 25,
+      "line": 27,
       "type": "Text",
       "val": "bar",
     },
     Object {
       "column": 1,
       "filename": "text.tokens.json",
-      "line": 26,
+      "line": 28,
       "type": "Text",
       "val": "
 ",
@@ -18360,22 +18629,22 @@ Object {
     Object {
       "column": 3,
       "filename": "text.tokens.json",
-      "line": 26,
+      "line": 28,
       "type": "Text",
       "val": "baz",
     },
     Object {
       "column": 1,
       "filename": "text.tokens.json",
-      "line": 27,
+      "line": 29,
       "type": "Text",
       "val": "
 ",
     },
     Object {
-      "column": 3,
+      "column": 1,
       "filename": "text.tokens.json",
-      "line": 27,
+      "line": 29,
       "type": "Text",
       "val": "",
     },
@@ -18384,19 +18653,19 @@ Object {
       "attrs": Array [],
       "block": Object {
         "filename": "text.tokens.json",
-        "line": 28,
+        "line": 30,
         "nodes": Array [
           Object {
             "column": 5,
             "filename": "text.tokens.json",
-            "line": 29,
+            "line": 31,
             "type": "Text",
             "val": "foo",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 30,
+            "line": 32,
             "type": "Text",
             "val": "
 ",
@@ -18404,14 +18673,14 @@ Object {
           Object {
             "column": 5,
             "filename": "text.tokens.json",
-            "line": 30,
+            "line": 32,
             "type": "Text",
             "val": "  bar",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 31,
+            "line": 33,
             "type": "Text",
             "val": "
 ",
@@ -18419,14 +18688,14 @@ Object {
           Object {
             "column": 5,
             "filename": "text.tokens.json",
-            "line": 31,
+            "line": 33,
             "type": "Text",
             "val": "    baz",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 32,
+            "line": 34,
             "type": "Text",
             "val": "
 ",
@@ -18434,7 +18703,7 @@ Object {
           Object {
             "column": 5,
             "filename": "text.tokens.json",
-            "line": 32,
+            "line": 34,
             "type": "Text",
             "val": ".",
           },
@@ -18444,7 +18713,7 @@ Object {
       "column": 1,
       "filename": "text.tokens.json",
       "isInline": false,
-      "line": 28,
+      "line": 30,
       "name": "pre",
       "selfClosing": false,
       "type": "Tag",
@@ -18454,19 +18723,19 @@ Object {
       "attrs": Array [],
       "block": Object {
         "filename": "text.tokens.json",
-        "line": 34,
+        "line": 36,
         "nodes": Array [
           Object {
             "column": 3,
             "filename": "text.tokens.json",
-            "line": 35,
+            "line": 37,
             "type": "Text",
             "val": "foo",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 36,
+            "line": 38,
             "type": "Text",
             "val": "
 ",
@@ -18474,14 +18743,14 @@ Object {
           Object {
             "column": 3,
             "filename": "text.tokens.json",
-            "line": 36,
+            "line": 38,
             "type": "Text",
             "val": "  bar",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 37,
+            "line": 39,
             "type": "Text",
             "val": "
 ",
@@ -18489,14 +18758,14 @@ Object {
           Object {
             "column": 3,
             "filename": "text.tokens.json",
-            "line": 37,
+            "line": 39,
             "type": "Text",
             "val": "    baz",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 38,
+            "line": 40,
             "type": "Text",
             "val": "
 ",
@@ -18504,22 +18773,22 @@ Object {
           Object {
             "column": 3,
             "filename": "text.tokens.json",
-            "line": 38,
+            "line": 40,
             "type": "Text",
             "val": ".",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 39,
+            "line": 41,
             "type": "Text",
             "val": "
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "text.tokens.json",
-            "line": 39,
+            "line": 41,
             "type": "Text",
             "val": "",
           },
@@ -18529,7 +18798,7 @@ Object {
       "column": 1,
       "filename": "text.tokens.json",
       "isInline": false,
-      "line": 34,
+      "line": 36,
       "name": "pre",
       "selfClosing": false,
       "textOnly": true,
@@ -18538,14 +18807,14 @@ Object {
     Object {
       "column": 3,
       "filename": "text.tokens.json",
-      "line": 41,
+      "line": 43,
       "type": "Text",
       "val": "foo",
     },
     Object {
       "column": 1,
       "filename": "text.tokens.json",
-      "line": 42,
+      "line": 44,
       "type": "Text",
       "val": "
 ",
@@ -18553,46 +18822,24 @@ Object {
     Object {
       "column": 3,
       "filename": "text.tokens.json",
-      "line": 42,
+      "line": 44,
       "type": "Text",
       "val": "  bar",
     },
     Object {
       "column": 1,
       "filename": "text.tokens.json",
-      "line": 43,
-      "type": "Text",
-      "val": "
-",
-    },
-    Object {
-      "column": 3,
-      "filename": "text.tokens.json",
-      "line": 43,
-      "type": "Text",
-      "val": "    baz",
-    },
-    Object {
-      "column": 1,
-      "filename": "text.tokens.json",
-      "line": 44,
+      "line": 45,
       "type": "Text",
       "val": "
 ",
     },
-    Object {
-      "column": 3,
-      "filename": "text.tokens.json",
-      "line": 44,
-      "type": "Text",
-      "val": ".",
-    },
     Object {
       "column": 3,
       "filename": "text.tokens.json",
       "line": 45,
       "type": "Text",
-      "val": "foo",
+      "val": "    baz",
     },
     Object {
       "column": 1,
@@ -18603,14 +18850,11 @@ Object {
 ",
     },
     Object {
-      "buffer": true,
       "column": 3,
       "filename": "text.tokens.json",
-      "isInline": true,
       "line": 46,
-      "mustEscape": true,
-      "type": "Code",
-      "val": "bar",
+      "type": "Text",
+      "val": ".",
     },
   ],
   "type": "Block",
diff --git a/packages/pug-parser/test/cases/attr-es2015.tokens.json b/packages/pug-parser/test/cases/attr-es2015.tokens.json
index 274f22690..8616bc66e 100644
--- a/packages/pug-parser/test/cases/attr-es2015.tokens.json
+++ b/packages/pug-parser/test/cases/attr-es2015.tokens.json
@@ -1,9 +1,9 @@
-{"type":"code","line":1,"col":1,"val":"var avatar = '219b77f9d21de75e81851b6b886057c7'","mustEscape":false,"buffer":false}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"div"}
-{"type":"class","line":3,"col":4,"val":"avatar-div"}
-{"type":"start-attributes","line":3,"col":15}
-{"type":"attribute","line":3,"col":16,"name":"style","val":"`background-image: url(https://www.gravatar.com/avatar/${avatar})`","mustEscape":true}
-{"type":"end-attributes","line":3,"col":88}
-{"type":"newline","line":4,"col":1}
-{"type":"eos","line":4,"col":1}
\ No newline at end of file
+{"type":"code","loc":{"start":{"line":1,"column":1},"filename":"/cases/attr-es2015.pug","end":{"line":1,"column":50}},"val":"var avatar = '219b77f9d21de75e81851b6b886057c7'","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/attr-es2015.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/attr-es2015.pug","end":{"line":3,"column":4}},"val":"div"}
+{"type":"class","loc":{"start":{"line":3,"column":4},"filename":"/cases/attr-es2015.pug","end":{"line":3,"column":15}},"val":"avatar-div"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":15},"filename":"/cases/attr-es2015.pug","end":{"line":3,"column":16}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":16},"filename":"/cases/attr-es2015.pug","end":{"line":3,"column":88}},"name":"style","mustEscape":true,"val":"`background-image: url(https://www.gravatar.com/avatar/${avatar})`"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":88},"filename":"/cases/attr-es2015.pug","end":{"line":3,"column":89}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/attr-es2015.pug","end":{"line":4,"column":1}}}
+{"type":"eos","loc":{"start":{"line":4,"column":1},"filename":"/cases/attr-es2015.pug","end":{"line":4,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/attrs-data.tokens.json b/packages/pug-parser/test/cases/attrs-data.tokens.json
index d81f4772c..8f4ee0245 100644
--- a/packages/pug-parser/test/cases/attrs-data.tokens.json
+++ b/packages/pug-parser/test/cases/attrs-data.tokens.json
@@ -1,33 +1,33 @@
-{"type":"code","line":1,"col":1,"val":"var user = { name: 'tobi' }","mustEscape":false,"buffer":false}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"foo"}
-{"type":"start-attributes","line":2,"col":4}
-{"type":"attribute","line":2,"col":5,"name":"data-user","val":"user","mustEscape":true}
-{"type":"end-attributes","line":2,"col":19}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"foo"}
-{"type":"start-attributes","line":3,"col":4}
-{"type":"attribute","line":3,"col":5,"name":"data-items","val":"[1,2,3]","mustEscape":true}
-{"type":"end-attributes","line":3,"col":23}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":1,"val":"foo"}
-{"type":"start-attributes","line":4,"col":4}
-{"type":"attribute","line":4,"col":5,"name":"data-username","val":"'tobi'","mustEscape":true}
-{"type":"end-attributes","line":4,"col":25}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":1,"val":"foo"}
-{"type":"start-attributes","line":5,"col":4}
-{"type":"attribute","line":5,"col":5,"name":"data-escaped","val":"{message: \"Let's rock!\"}","mustEscape":true}
-{"type":"end-attributes","line":5,"col":42}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":1,"val":"foo"}
-{"type":"start-attributes","line":6,"col":4}
-{"type":"attribute","line":6,"col":5,"name":"data-ampersand","val":"{message: \"a quote: &quot; this & that\"}","mustEscape":true}
-{"type":"end-attributes","line":6,"col":60}
-{"type":"newline","line":7,"col":1}
-{"type":"tag","line":7,"col":1,"val":"foo"}
-{"type":"start-attributes","line":7,"col":4}
-{"type":"attribute","line":7,"col":5,"name":"data-epoc","val":"new Date(0)","mustEscape":true}
-{"type":"end-attributes","line":7,"col":26}
-{"type":"newline","line":8,"col":1}
-{"type":"eos","line":8,"col":1}
\ No newline at end of file
+{"type":"code","loc":{"start":{"line":1,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":1,"column":30}},"val":"var user = { name: 'tobi' }","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":2,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":4},"filename":"/cases/attrs-data.pug","end":{"line":2,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":5},"filename":"/cases/attrs-data.pug","end":{"line":2,"column":19}},"name":"data-user","mustEscape":true,"val":"user"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":19},"filename":"/cases/attrs-data.pug","end":{"line":2,"column":20}}}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":3,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":4},"filename":"/cases/attrs-data.pug","end":{"line":3,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":5},"filename":"/cases/attrs-data.pug","end":{"line":3,"column":23}},"name":"data-items","mustEscape":true,"val":"[1,2,3]"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":23},"filename":"/cases/attrs-data.pug","end":{"line":3,"column":24}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":4,"column":1}}}
+{"type":"tag","loc":{"start":{"line":4,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":4,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":4},"filename":"/cases/attrs-data.pug","end":{"line":4,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":5},"filename":"/cases/attrs-data.pug","end":{"line":4,"column":25}},"name":"data-username","mustEscape":true,"val":"'tobi'"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":25},"filename":"/cases/attrs-data.pug","end":{"line":4,"column":26}}}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":5,"column":1}}}
+{"type":"tag","loc":{"start":{"line":5,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":5,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":4},"filename":"/cases/attrs-data.pug","end":{"line":5,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":5},"filename":"/cases/attrs-data.pug","end":{"line":5,"column":42}},"name":"data-escaped","mustEscape":true,"val":"{message: \"Let's rock!\"}"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":42},"filename":"/cases/attrs-data.pug","end":{"line":5,"column":43}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":6,"column":1}}}
+{"type":"tag","loc":{"start":{"line":6,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":6,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":4},"filename":"/cases/attrs-data.pug","end":{"line":6,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":5},"filename":"/cases/attrs-data.pug","end":{"line":6,"column":60}},"name":"data-ampersand","mustEscape":true,"val":"{message: \"a quote: &quot; this & that\"}"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":60},"filename":"/cases/attrs-data.pug","end":{"line":6,"column":61}}}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":7,"column":1}}}
+{"type":"tag","loc":{"start":{"line":7,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":7,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":7,"column":4},"filename":"/cases/attrs-data.pug","end":{"line":7,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":7,"column":5},"filename":"/cases/attrs-data.pug","end":{"line":7,"column":26}},"name":"data-epoc","mustEscape":true,"val":"new Date(0)"}
+{"type":"end-attributes","loc":{"start":{"line":7,"column":26},"filename":"/cases/attrs-data.pug","end":{"line":7,"column":27}}}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":8,"column":1}}}
+{"type":"eos","loc":{"start":{"line":8,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":8,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/attrs.js.tokens.json b/packages/pug-parser/test/cases/attrs.js.tokens.json
index 7d8500073..7da64d970 100644
--- a/packages/pug-parser/test/cases/attrs.js.tokens.json
+++ b/packages/pug-parser/test/cases/attrs.js.tokens.json
@@ -1,78 +1,78 @@
-{"type":"code","line":1,"col":1,"val":"var id = 5","mustEscape":false,"buffer":false}
-{"type":"newline","line":2,"col":1}
-{"type":"code","line":2,"col":1,"val":"function answer() { return 42; }","mustEscape":false,"buffer":false}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"a"}
-{"type":"start-attributes","line":3,"col":2}
-{"type":"attribute","line":3,"col":3,"name":"href","val":"'/user/' + id","mustEscape":true}
-{"type":"attribute","line":3,"col":23,"name":"class","val":"'button'","mustEscape":true}
-{"type":"end-attributes","line":3,"col":37}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":1,"val":"a"}
-{"type":"start-attributes","line":4,"col":2}
-{"type":"attribute","line":4,"col":3,"name":"href","val":"'/user/' + id","mustEscape":true}
-{"type":"attribute","line":4,"col":27,"name":"class","val":"'button'","mustEscape":true}
-{"type":"end-attributes","line":4,"col":45}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":1,"val":"meta"}
-{"type":"start-attributes","line":5,"col":5}
-{"type":"attribute","line":5,"col":6,"name":"key","val":"'answer'","mustEscape":true}
-{"type":"attribute","line":5,"col":20,"name":"value","val":"answer()","mustEscape":true}
-{"type":"end-attributes","line":5,"col":34}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":1,"val":"a"}
-{"type":"start-attributes","line":6,"col":2}
-{"type":"attribute","line":6,"col":3,"name":"class","val":"['class1', 'class2']","mustEscape":true}
-{"type":"end-attributes","line":6,"col":31}
-{"type":"newline","line":7,"col":1}
-{"type":"tag","line":7,"col":1,"val":"a"}
-{"type":"class","line":7,"col":2,"val":"tag-class"}
-{"type":"start-attributes","line":7,"col":12}
-{"type":"attribute","line":7,"col":13,"name":"class","val":"['class1', 'class2']","mustEscape":true}
-{"type":"end-attributes","line":7,"col":41}
-{"type":"newline","line":9,"col":1}
-{"type":"tag","line":9,"col":1,"val":"a"}
-{"type":"start-attributes","line":9,"col":2}
-{"type":"attribute","line":9,"col":3,"name":"href","val":"'/user/' + id","mustEscape":true}
-{"type":"attribute","line":9,"col":22,"name":"class","val":"'button'","mustEscape":true}
-{"type":"end-attributes","line":9,"col":36}
-{"type":"newline","line":10,"col":1}
-{"type":"tag","line":10,"col":1,"val":"a"}
-{"type":"start-attributes","line":10,"col":2}
-{"type":"attribute","line":10,"col":3,"name":"href","val":"'/user/' + id","mustEscape":true}
-{"type":"attribute","line":10,"col":26,"name":"class","val":"'button'","mustEscape":true}
-{"type":"end-attributes","line":10,"col":44}
-{"type":"newline","line":11,"col":1}
-{"type":"tag","line":11,"col":1,"val":"meta"}
-{"type":"start-attributes","line":11,"col":5}
-{"type":"attribute","line":11,"col":6,"name":"key","val":"'answer'","mustEscape":true}
-{"type":"attribute","line":11,"col":19,"name":"value","val":"answer()","mustEscape":true}
-{"type":"end-attributes","line":11,"col":33}
-{"type":"newline","line":12,"col":1}
-{"type":"tag","line":12,"col":1,"val":"a"}
-{"type":"start-attributes","line":12,"col":2}
-{"type":"attribute","line":12,"col":3,"name":"class","val":"['class1', 'class2']","mustEscape":true}
-{"type":"end-attributes","line":12,"col":31}
-{"type":"newline","line":13,"col":1}
-{"type":"tag","line":13,"col":1,"val":"a"}
-{"type":"class","line":13,"col":2,"val":"tag-class"}
-{"type":"start-attributes","line":13,"col":12}
-{"type":"attribute","line":13,"col":13,"name":"class","val":"['class1', 'class2']","mustEscape":true}
-{"type":"end-attributes","line":13,"col":41}
-{"type":"newline","line":15,"col":1}
-{"type":"tag","line":15,"col":1,"val":"div"}
-{"type":"start-attributes","line":15,"col":4}
-{"type":"attribute","line":15,"col":5,"name":"id","val":"id","mustEscape":true}
-{"type":"end-attributes","line":15,"col":10}
-{"type":"&attributes","line":15,"col":11,"val":"{foo: 'bar'}"}
-{"type":"newline","line":16,"col":1}
-{"type":"code","line":16,"col":1,"val":"var bar = null","mustEscape":false,"buffer":false}
-{"type":"newline","line":17,"col":1}
-{"type":"tag","line":17,"col":1,"val":"div"}
-{"type":"start-attributes","line":17,"col":4}
-{"type":"attribute","line":17,"col":5,"name":"foo","val":"null","mustEscape":true}
-{"type":"attribute","line":17,"col":14,"name":"bar","val":"bar","mustEscape":true}
-{"type":"end-attributes","line":17,"col":21}
-{"type":"&attributes","line":17,"col":22,"val":"{baz: 'baz'}"}
-{"type":"newline","line":18,"col":1}
-{"type":"eos","line":18,"col":1}
\ No newline at end of file
+{"type":"code","loc":{"start":{"line":1,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":1,"column":13}},"val":"var id = 5","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":2,"column":1}}}
+{"type":"code","loc":{"start":{"line":2,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":2,"column":35}},"val":"function answer() { return 42; }","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":3,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":2},"filename":"/cases/attrs.js.pug","end":{"line":3,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":3},"filename":"/cases/attrs.js.pug","end":{"line":3,"column":21}},"name":"href","mustEscape":true,"val":"'/user/' + id"}
+{"type":"attribute","loc":{"start":{"line":3,"column":23},"filename":"/cases/attrs.js.pug","end":{"line":3,"column":37}},"name":"class","mustEscape":true,"val":"'button'"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":37},"filename":"/cases/attrs.js.pug","end":{"line":3,"column":38}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":4,"column":1}}}
+{"type":"tag","loc":{"start":{"line":4,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":4,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":2},"filename":"/cases/attrs.js.pug","end":{"line":4,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":3},"filename":"/cases/attrs.js.pug","end":{"line":4,"column":25}},"name":"href","mustEscape":true,"val":"'/user/' + id"}
+{"type":"attribute","loc":{"start":{"line":4,"column":27},"filename":"/cases/attrs.js.pug","end":{"line":4,"column":45}},"name":"class","mustEscape":true,"val":"'button'"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":45},"filename":"/cases/attrs.js.pug","end":{"line":4,"column":46}}}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":5,"column":1}}}
+{"type":"tag","loc":{"start":{"line":5,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":5,"column":5}},"val":"meta"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":5},"filename":"/cases/attrs.js.pug","end":{"line":5,"column":6}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":6},"filename":"/cases/attrs.js.pug","end":{"line":5,"column":18}},"name":"key","mustEscape":true,"val":"'answer'"}
+{"type":"attribute","loc":{"start":{"line":5,"column":20},"filename":"/cases/attrs.js.pug","end":{"line":5,"column":34}},"name":"value","mustEscape":true,"val":"answer()"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":34},"filename":"/cases/attrs.js.pug","end":{"line":5,"column":35}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":6,"column":1}}}
+{"type":"tag","loc":{"start":{"line":6,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":6,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":2},"filename":"/cases/attrs.js.pug","end":{"line":6,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":3},"filename":"/cases/attrs.js.pug","end":{"line":6,"column":31}},"name":"class","mustEscape":true,"val":"['class1', 'class2']"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":31},"filename":"/cases/attrs.js.pug","end":{"line":6,"column":32}}}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":7,"column":1}}}
+{"type":"tag","loc":{"start":{"line":7,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":7,"column":2}},"val":"a"}
+{"type":"class","loc":{"start":{"line":7,"column":2},"filename":"/cases/attrs.js.pug","end":{"line":7,"column":12}},"val":"tag-class"}
+{"type":"start-attributes","loc":{"start":{"line":7,"column":12},"filename":"/cases/attrs.js.pug","end":{"line":7,"column":13}}}
+{"type":"attribute","loc":{"start":{"line":7,"column":13},"filename":"/cases/attrs.js.pug","end":{"line":7,"column":41}},"name":"class","mustEscape":true,"val":"['class1', 'class2']"}
+{"type":"end-attributes","loc":{"start":{"line":7,"column":41},"filename":"/cases/attrs.js.pug","end":{"line":7,"column":42}}}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":9,"column":1}}}
+{"type":"tag","loc":{"start":{"line":9,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":9,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":9,"column":2},"filename":"/cases/attrs.js.pug","end":{"line":9,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":9,"column":3},"filename":"/cases/attrs.js.pug","end":{"line":9,"column":21}},"name":"href","mustEscape":true,"val":"'/user/' + id"}
+{"type":"attribute","loc":{"start":{"line":9,"column":22},"filename":"/cases/attrs.js.pug","end":{"line":9,"column":36}},"name":"class","mustEscape":true,"val":"'button'"}
+{"type":"end-attributes","loc":{"start":{"line":9,"column":36},"filename":"/cases/attrs.js.pug","end":{"line":9,"column":37}}}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":10,"column":1}}}
+{"type":"tag","loc":{"start":{"line":10,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":10,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":10,"column":2},"filename":"/cases/attrs.js.pug","end":{"line":10,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":10,"column":3},"filename":"/cases/attrs.js.pug","end":{"line":10,"column":25}},"name":"href","mustEscape":true,"val":"'/user/' + id"}
+{"type":"attribute","loc":{"start":{"line":10,"column":26},"filename":"/cases/attrs.js.pug","end":{"line":10,"column":44}},"name":"class","mustEscape":true,"val":"'button'"}
+{"type":"end-attributes","loc":{"start":{"line":10,"column":44},"filename":"/cases/attrs.js.pug","end":{"line":10,"column":45}}}
+{"type":"newline","loc":{"start":{"line":11,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":11,"column":1}}}
+{"type":"tag","loc":{"start":{"line":11,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":11,"column":5}},"val":"meta"}
+{"type":"start-attributes","loc":{"start":{"line":11,"column":5},"filename":"/cases/attrs.js.pug","end":{"line":11,"column":6}}}
+{"type":"attribute","loc":{"start":{"line":11,"column":6},"filename":"/cases/attrs.js.pug","end":{"line":11,"column":18}},"name":"key","mustEscape":true,"val":"'answer'"}
+{"type":"attribute","loc":{"start":{"line":11,"column":19},"filename":"/cases/attrs.js.pug","end":{"line":11,"column":33}},"name":"value","mustEscape":true,"val":"answer()"}
+{"type":"end-attributes","loc":{"start":{"line":11,"column":33},"filename":"/cases/attrs.js.pug","end":{"line":11,"column":34}}}
+{"type":"newline","loc":{"start":{"line":12,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":12,"column":1}}}
+{"type":"tag","loc":{"start":{"line":12,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":12,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":12,"column":2},"filename":"/cases/attrs.js.pug","end":{"line":12,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":12,"column":3},"filename":"/cases/attrs.js.pug","end":{"line":12,"column":31}},"name":"class","mustEscape":true,"val":"['class1', 'class2']"}
+{"type":"end-attributes","loc":{"start":{"line":12,"column":31},"filename":"/cases/attrs.js.pug","end":{"line":12,"column":32}}}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":13,"column":1}}}
+{"type":"tag","loc":{"start":{"line":13,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":13,"column":2}},"val":"a"}
+{"type":"class","loc":{"start":{"line":13,"column":2},"filename":"/cases/attrs.js.pug","end":{"line":13,"column":12}},"val":"tag-class"}
+{"type":"start-attributes","loc":{"start":{"line":13,"column":12},"filename":"/cases/attrs.js.pug","end":{"line":13,"column":13}}}
+{"type":"attribute","loc":{"start":{"line":13,"column":13},"filename":"/cases/attrs.js.pug","end":{"line":13,"column":41}},"name":"class","mustEscape":true,"val":"['class1', 'class2']"}
+{"type":"end-attributes","loc":{"start":{"line":13,"column":41},"filename":"/cases/attrs.js.pug","end":{"line":13,"column":42}}}
+{"type":"newline","loc":{"start":{"line":15,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":15,"column":1}}}
+{"type":"tag","loc":{"start":{"line":15,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":15,"column":4}},"val":"div"}
+{"type":"start-attributes","loc":{"start":{"line":15,"column":4},"filename":"/cases/attrs.js.pug","end":{"line":15,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":15,"column":5},"filename":"/cases/attrs.js.pug","end":{"line":15,"column":10}},"name":"id","mustEscape":true,"val":"id"}
+{"type":"end-attributes","loc":{"start":{"line":15,"column":10},"filename":"/cases/attrs.js.pug","end":{"line":15,"column":11}}}
+{"type":"&attributes","loc":{"start":{"line":15,"column":11},"filename":"/cases/attrs.js.pug","end":{"line":15,"column":36}},"val":"{foo: 'bar'}"}
+{"type":"newline","loc":{"start":{"line":16,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":16,"column":1}}}
+{"type":"code","loc":{"start":{"line":16,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":16,"column":17}},"val":"var bar = null","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":17,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":17,"column":1}}}
+{"type":"tag","loc":{"start":{"line":17,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":17,"column":4}},"val":"div"}
+{"type":"start-attributes","loc":{"start":{"line":17,"column":4},"filename":"/cases/attrs.js.pug","end":{"line":17,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":17,"column":5},"filename":"/cases/attrs.js.pug","end":{"line":17,"column":13}},"name":"foo","mustEscape":true,"val":"null"}
+{"type":"attribute","loc":{"start":{"line":17,"column":14},"filename":"/cases/attrs.js.pug","end":{"line":17,"column":21}},"name":"bar","mustEscape":true,"val":"bar"}
+{"type":"end-attributes","loc":{"start":{"line":17,"column":21},"filename":"/cases/attrs.js.pug","end":{"line":17,"column":22}}}
+{"type":"&attributes","loc":{"start":{"line":17,"column":22},"filename":"/cases/attrs.js.pug","end":{"line":17,"column":47}},"val":"{baz: 'baz'}"}
+{"type":"newline","loc":{"start":{"line":18,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":18,"column":1}}}
+{"type":"eos","loc":{"start":{"line":18,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":18,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/attrs.tokens.json b/packages/pug-parser/test/cases/attrs.tokens.json
index 32a0ad3c8..d15ce773c 100644
--- a/packages/pug-parser/test/cases/attrs.tokens.json
+++ b/packages/pug-parser/test/cases/attrs.tokens.json
@@ -1,180 +1,180 @@
-{"type":"tag","line":1,"col":1,"val":"a"}
-{"type":"start-attributes","line":1,"col":2}
-{"type":"attribute","line":1,"col":3,"name":"href","val":"'/contact'","mustEscape":true}
-{"type":"end-attributes","line":1,"col":18}
-{"type":"text","line":1,"col":20,"val":"contact"}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"a"}
-{"type":"start-attributes","line":2,"col":2}
-{"type":"attribute","line":2,"col":3,"name":"href","val":"'/save'","mustEscape":true}
-{"type":"end-attributes","line":2,"col":15}
-{"type":"class","line":2,"col":16,"val":"button"}
-{"type":"text","line":2,"col":24,"val":"save"}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"a"}
-{"type":"start-attributes","line":3,"col":2}
-{"type":"attribute","line":3,"col":3,"name":"foo","val":true,"mustEscape":true}
-{"type":"attribute","line":3,"col":8,"name":"bar","val":true,"mustEscape":false}
-{"type":"attribute","line":3,"col":13,"name":"baz","val":true,"mustEscape":false}
-{"type":"end-attributes","line":3,"col":16}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":1,"val":"a"}
-{"type":"start-attributes","line":4,"col":2}
-{"type":"attribute","line":4,"col":3,"name":"foo","val":"'foo, bar, baz'","mustEscape":true}
-{"type":"attribute","line":4,"col":24,"name":"bar","val":"1","mustEscape":true}
-{"type":"end-attributes","line":4,"col":29}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":1,"val":"a"}
-{"type":"start-attributes","line":5,"col":2}
-{"type":"attribute","line":5,"col":3,"name":"foo","val":"'((foo))'","mustEscape":true}
-{"type":"attribute","line":5,"col":18,"name":"bar","val":"(1) ? 1 : 0","mustEscape":true}
-{"type":"end-attributes","line":5,"col":35}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":1,"val":"select"}
-{"type":"indent","line":7,"col":1,"val":2}
-{"type":"tag","line":7,"col":3,"val":"option"}
-{"type":"start-attributes","line":7,"col":9}
-{"type":"attribute","line":7,"col":10,"name":"value","val":"'foo'","mustEscape":true}
-{"type":"attribute","line":7,"col":23,"name":"selected","val":true,"mustEscape":false}
-{"type":"end-attributes","line":7,"col":31}
-{"type":"text","line":7,"col":33,"val":"Foo"}
-{"type":"newline","line":8,"col":1}
-{"type":"tag","line":8,"col":3,"val":"option"}
-{"type":"start-attributes","line":8,"col":9}
-{"type":"attribute","line":8,"col":10,"name":"selected","val":true,"mustEscape":true}
-{"type":"attribute","line":8,"col":20,"name":"value","val":"'bar'","mustEscape":true}
-{"type":"end-attributes","line":8,"col":31}
-{"type":"text","line":8,"col":33,"val":"Bar"}
-{"type":"outdent","line":9,"col":1}
-{"type":"tag","line":9,"col":1,"val":"a"}
-{"type":"start-attributes","line":9,"col":2}
-{"type":"attribute","line":9,"col":3,"name":"foo","val":"\"class:\"","mustEscape":true}
-{"type":"end-attributes","line":9,"col":15}
-{"type":"newline","line":10,"col":1}
-{"type":"tag","line":10,"col":1,"val":"input"}
-{"type":"start-attributes","line":10,"col":6}
-{"type":"attribute","line":10,"col":7,"name":"pattern","val":"'\\\\S+'","mustEscape":true}
-{"type":"end-attributes","line":10,"col":21}
-{"type":"newline","line":12,"col":1}
-{"type":"tag","line":12,"col":1,"val":"a"}
-{"type":"start-attributes","line":12,"col":2}
-{"type":"attribute","line":12,"col":3,"name":"href","val":"'/contact'","mustEscape":true}
-{"type":"end-attributes","line":12,"col":18}
-{"type":"text","line":12,"col":20,"val":"contact"}
-{"type":"newline","line":13,"col":1}
-{"type":"tag","line":13,"col":1,"val":"a"}
-{"type":"start-attributes","line":13,"col":2}
-{"type":"attribute","line":13,"col":3,"name":"href","val":"'/save'","mustEscape":true}
-{"type":"end-attributes","line":13,"col":15}
-{"type":"class","line":13,"col":16,"val":"button"}
-{"type":"text","line":13,"col":24,"val":"save"}
-{"type":"newline","line":14,"col":1}
-{"type":"tag","line":14,"col":1,"val":"a"}
-{"type":"start-attributes","line":14,"col":2}
-{"type":"attribute","line":14,"col":3,"name":"foo","val":true,"mustEscape":true}
-{"type":"attribute","line":14,"col":7,"name":"bar","val":true,"mustEscape":false}
-{"type":"attribute","line":14,"col":11,"name":"baz","val":true,"mustEscape":false}
-{"type":"end-attributes","line":14,"col":14}
-{"type":"newline","line":15,"col":1}
-{"type":"tag","line":15,"col":1,"val":"a"}
-{"type":"start-attributes","line":15,"col":2}
-{"type":"attribute","line":15,"col":3,"name":"foo","val":"'foo, bar, baz'","mustEscape":true}
-{"type":"attribute","line":15,"col":23,"name":"bar","val":"1","mustEscape":true}
-{"type":"end-attributes","line":15,"col":28}
-{"type":"newline","line":16,"col":1}
-{"type":"tag","line":16,"col":1,"val":"a"}
-{"type":"start-attributes","line":16,"col":2}
-{"type":"attribute","line":16,"col":3,"name":"foo","val":"'((foo))'","mustEscape":true}
-{"type":"attribute","line":16,"col":17,"name":"bar","val":"(1) ? 1 : 0","mustEscape":true}
-{"type":"end-attributes","line":16,"col":34}
-{"type":"newline","line":17,"col":1}
-{"type":"tag","line":17,"col":1,"val":"select"}
-{"type":"indent","line":18,"col":1,"val":2}
-{"type":"tag","line":18,"col":3,"val":"option"}
-{"type":"start-attributes","line":18,"col":9}
-{"type":"attribute","line":18,"col":10,"name":"value","val":"'foo'","mustEscape":true}
-{"type":"attribute","line":18,"col":22,"name":"selected","val":true,"mustEscape":false}
-{"type":"end-attributes","line":18,"col":30}
-{"type":"text","line":18,"col":32,"val":"Foo"}
-{"type":"newline","line":19,"col":1}
-{"type":"tag","line":19,"col":3,"val":"option"}
-{"type":"start-attributes","line":19,"col":9}
-{"type":"attribute","line":19,"col":10,"name":"selected","val":true,"mustEscape":true}
-{"type":"attribute","line":19,"col":19,"name":"value","val":"'bar'","mustEscape":true}
-{"type":"end-attributes","line":19,"col":30}
-{"type":"text","line":19,"col":32,"val":"Bar"}
-{"type":"outdent","line":20,"col":1}
-{"type":"tag","line":20,"col":1,"val":"a"}
-{"type":"start-attributes","line":20,"col":2}
-{"type":"attribute","line":20,"col":3,"name":"foo","val":"\"class:\"","mustEscape":true}
-{"type":"end-attributes","line":20,"col":15}
-{"type":"newline","line":21,"col":1}
-{"type":"tag","line":21,"col":1,"val":"input"}
-{"type":"start-attributes","line":21,"col":6}
-{"type":"attribute","line":21,"col":7,"name":"pattern","val":"'\\\\S+'","mustEscape":true}
-{"type":"end-attributes","line":21,"col":21}
-{"type":"newline","line":22,"col":1}
-{"type":"tag","line":22,"col":1,"val":"foo"}
-{"type":"start-attributes","line":22,"col":4}
-{"type":"attribute","line":22,"col":5,"name":"terse","val":"\"true\"","mustEscape":true}
-{"type":"end-attributes","line":22,"col":17}
-{"type":"newline","line":23,"col":1}
-{"type":"tag","line":23,"col":1,"val":"foo"}
-{"type":"start-attributes","line":23,"col":4}
-{"type":"attribute","line":23,"col":5,"name":"date","val":"new Date(0)","mustEscape":true}
-{"type":"end-attributes","line":23,"col":21}
-{"type":"newline","line":25,"col":1}
-{"type":"tag","line":25,"col":1,"val":"foo"}
-{"type":"start-attributes","line":25,"col":4}
-{"type":"attribute","line":25,"col":5,"name":"abc","val":true,"mustEscape":true}
-{"type":"attribute","line":26,"col":5,"name":"def","val":true,"mustEscape":false}
-{"type":"end-attributes","line":26,"col":8}
-{"type":"newline","line":27,"col":1}
-{"type":"tag","line":27,"col":1,"val":"foo"}
-{"type":"start-attributes","line":27,"col":4}
-{"type":"attribute","line":27,"col":5,"name":"abc","val":true,"mustEscape":true}
-{"type":"attribute","line":28,"col":5,"name":"def","val":true,"mustEscape":false}
-{"type":"end-attributes","line":28,"col":8}
-{"type":"newline","line":29,"col":1}
-{"type":"tag","line":29,"col":1,"val":"foo"}
-{"type":"start-attributes","line":29,"col":4}
-{"type":"attribute","line":29,"col":5,"name":"abc","val":true,"mustEscape":true}
-{"type":"attribute","line":30,"col":3,"name":"def","val":true,"mustEscape":false}
-{"type":"end-attributes","line":30,"col":6}
-{"type":"newline","line":31,"col":1}
-{"type":"tag","line":31,"col":1,"val":"foo"}
-{"type":"start-attributes","line":31,"col":4}
-{"type":"attribute","line":31,"col":5,"name":"abc","val":true,"mustEscape":true}
-{"type":"attribute","line":32,"col":4,"name":"def","val":true,"mustEscape":false}
-{"type":"end-attributes","line":32,"col":7}
-{"type":"newline","line":33,"col":1}
-{"type":"tag","line":33,"col":1,"val":"foo"}
-{"type":"start-attributes","line":33,"col":4}
-{"type":"attribute","line":33,"col":5,"name":"abc","val":true,"mustEscape":true}
-{"type":"attribute","line":34,"col":3,"name":"def","val":true,"mustEscape":false}
-{"type":"end-attributes","line":34,"col":6}
-{"type":"newline","line":35,"col":1}
-{"type":"tag","line":35,"col":1,"val":"foo"}
-{"type":"start-attributes","line":35,"col":4}
-{"type":"attribute","line":35,"col":5,"name":"abc","val":true,"mustEscape":true}
-{"type":"attribute","line":36,"col":5,"name":"def","val":true,"mustEscape":false}
-{"type":"end-attributes","line":36,"col":8}
-{"type":"newline","line":38,"col":1}
-{"type":"code","line":38,"col":1,"val":"var attrs = {foo: 'bar', bar: '<baz>'}","mustEscape":false,"buffer":false}
-{"type":"newline","line":40,"col":1}
-{"type":"tag","line":40,"col":1,"val":"div"}
-{"type":"&attributes","line":40,"col":4,"val":"attrs"}
-{"type":"newline","line":42,"col":1}
-{"type":"tag","line":42,"col":1,"val":"a"}
-{"type":"start-attributes","line":42,"col":2}
-{"type":"attribute","line":42,"col":3,"name":"foo","val":"'foo'","mustEscape":true}
-{"type":"attribute","line":42,"col":14,"name":"bar","val":"\"bar\"","mustEscape":true}
-{"type":"end-attributes","line":42,"col":24}
-{"type":"newline","line":43,"col":1}
-{"type":"tag","line":43,"col":1,"val":"a"}
-{"type":"start-attributes","line":43,"col":2}
-{"type":"attribute","line":43,"col":3,"name":"foo","val":"'foo'","mustEscape":true}
-{"type":"attribute","line":43,"col":14,"name":"bar","val":"'bar'","mustEscape":true}
-{"type":"end-attributes","line":43,"col":24}
-{"type":"newline","line":44,"col":1}
-{"type":"eos","line":44,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/attrs.pug","end":{"line":1,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":1,"column":2},"filename":"/cases/attrs.pug","end":{"line":1,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":1,"column":3},"filename":"/cases/attrs.pug","end":{"line":1,"column":18}},"name":"href","mustEscape":true,"val":"'/contact'"}
+{"type":"end-attributes","loc":{"start":{"line":1,"column":18},"filename":"/cases/attrs.pug","end":{"line":1,"column":19}}}
+{"type":"text","loc":{"start":{"line":1,"column":20},"filename":"/cases/attrs.pug","end":{"line":1,"column":27}},"val":"contact"}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/attrs.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/attrs.pug","end":{"line":2,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":2},"filename":"/cases/attrs.pug","end":{"line":2,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":3},"filename":"/cases/attrs.pug","end":{"line":2,"column":15}},"name":"href","mustEscape":true,"val":"'/save'"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":15},"filename":"/cases/attrs.pug","end":{"line":2,"column":16}}}
+{"type":"class","loc":{"start":{"line":2,"column":16},"filename":"/cases/attrs.pug","end":{"line":2,"column":23}},"val":"button"}
+{"type":"text","loc":{"start":{"line":2,"column":24},"filename":"/cases/attrs.pug","end":{"line":2,"column":28}},"val":"save"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/attrs.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/attrs.pug","end":{"line":3,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":2},"filename":"/cases/attrs.pug","end":{"line":3,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":3},"filename":"/cases/attrs.pug","end":{"line":3,"column":6}},"name":"foo","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":3,"column":8},"filename":"/cases/attrs.pug","end":{"line":3,"column":11}},"name":"bar","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":3,"column":13},"filename":"/cases/attrs.pug","end":{"line":3,"column":16}},"name":"baz","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":16},"filename":"/cases/attrs.pug","end":{"line":3,"column":17}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/attrs.pug","end":{"line":4,"column":1}}}
+{"type":"tag","loc":{"start":{"line":4,"column":1},"filename":"/cases/attrs.pug","end":{"line":4,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":2},"filename":"/cases/attrs.pug","end":{"line":4,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":3},"filename":"/cases/attrs.pug","end":{"line":4,"column":22}},"name":"foo","mustEscape":true,"val":"'foo, bar, baz'"}
+{"type":"attribute","loc":{"start":{"line":4,"column":24},"filename":"/cases/attrs.pug","end":{"line":4,"column":29}},"name":"bar","mustEscape":true,"val":"1"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":29},"filename":"/cases/attrs.pug","end":{"line":4,"column":30}}}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/attrs.pug","end":{"line":5,"column":1}}}
+{"type":"tag","loc":{"start":{"line":5,"column":1},"filename":"/cases/attrs.pug","end":{"line":5,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":2},"filename":"/cases/attrs.pug","end":{"line":5,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":3},"filename":"/cases/attrs.pug","end":{"line":5,"column":16}},"name":"foo","mustEscape":true,"val":"'((foo))'"}
+{"type":"attribute","loc":{"start":{"line":5,"column":18},"filename":"/cases/attrs.pug","end":{"line":5,"column":34}},"name":"bar","mustEscape":true,"val":"(1) ? 1 : 0"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":35},"filename":"/cases/attrs.pug","end":{"line":5,"column":36}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/attrs.pug","end":{"line":6,"column":1}}}
+{"type":"tag","loc":{"start":{"line":6,"column":1},"filename":"/cases/attrs.pug","end":{"line":6,"column":7}},"val":"select"}
+{"type":"indent","loc":{"start":{"line":7,"column":1},"filename":"/cases/attrs.pug","end":{"line":7,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":7,"column":3},"filename":"/cases/attrs.pug","end":{"line":7,"column":9}},"val":"option"}
+{"type":"start-attributes","loc":{"start":{"line":7,"column":9},"filename":"/cases/attrs.pug","end":{"line":7,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":7,"column":10},"filename":"/cases/attrs.pug","end":{"line":7,"column":21}},"name":"value","mustEscape":true,"val":"'foo'"}
+{"type":"attribute","loc":{"start":{"line":7,"column":23},"filename":"/cases/attrs.pug","end":{"line":7,"column":31}},"name":"selected","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":7,"column":31},"filename":"/cases/attrs.pug","end":{"line":7,"column":32}}}
+{"type":"text","loc":{"start":{"line":7,"column":33},"filename":"/cases/attrs.pug","end":{"line":7,"column":36}},"val":"Foo"}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/attrs.pug","end":{"line":8,"column":3}}}
+{"type":"tag","loc":{"start":{"line":8,"column":3},"filename":"/cases/attrs.pug","end":{"line":8,"column":9}},"val":"option"}
+{"type":"start-attributes","loc":{"start":{"line":8,"column":9},"filename":"/cases/attrs.pug","end":{"line":8,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":8,"column":10},"filename":"/cases/attrs.pug","end":{"line":8,"column":18}},"name":"selected","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":8,"column":20},"filename":"/cases/attrs.pug","end":{"line":8,"column":31}},"name":"value","mustEscape":true,"val":"'bar'"}
+{"type":"end-attributes","loc":{"start":{"line":8,"column":31},"filename":"/cases/attrs.pug","end":{"line":8,"column":32}}}
+{"type":"text","loc":{"start":{"line":8,"column":33},"filename":"/cases/attrs.pug","end":{"line":8,"column":36}},"val":"Bar"}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/attrs.pug","end":{"line":9,"column":1}}}
+{"type":"tag","loc":{"start":{"line":9,"column":1},"filename":"/cases/attrs.pug","end":{"line":9,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":9,"column":2},"filename":"/cases/attrs.pug","end":{"line":9,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":9,"column":3},"filename":"/cases/attrs.pug","end":{"line":9,"column":15}},"name":"foo","mustEscape":true,"val":"\"class:\""}
+{"type":"end-attributes","loc":{"start":{"line":9,"column":15},"filename":"/cases/attrs.pug","end":{"line":9,"column":16}}}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/attrs.pug","end":{"line":10,"column":1}}}
+{"type":"tag","loc":{"start":{"line":10,"column":1},"filename":"/cases/attrs.pug","end":{"line":10,"column":6}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":10,"column":6},"filename":"/cases/attrs.pug","end":{"line":10,"column":7}}}
+{"type":"attribute","loc":{"start":{"line":10,"column":7},"filename":"/cases/attrs.pug","end":{"line":10,"column":21}},"name":"pattern","mustEscape":true,"val":"'\\\\S+'"}
+{"type":"end-attributes","loc":{"start":{"line":10,"column":21},"filename":"/cases/attrs.pug","end":{"line":10,"column":22}}}
+{"type":"newline","loc":{"start":{"line":12,"column":1},"filename":"/cases/attrs.pug","end":{"line":12,"column":1}}}
+{"type":"tag","loc":{"start":{"line":12,"column":1},"filename":"/cases/attrs.pug","end":{"line":12,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":12,"column":2},"filename":"/cases/attrs.pug","end":{"line":12,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":12,"column":3},"filename":"/cases/attrs.pug","end":{"line":12,"column":18}},"name":"href","mustEscape":true,"val":"'/contact'"}
+{"type":"end-attributes","loc":{"start":{"line":12,"column":18},"filename":"/cases/attrs.pug","end":{"line":12,"column":19}}}
+{"type":"text","loc":{"start":{"line":12,"column":20},"filename":"/cases/attrs.pug","end":{"line":12,"column":27}},"val":"contact"}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/attrs.pug","end":{"line":13,"column":1}}}
+{"type":"tag","loc":{"start":{"line":13,"column":1},"filename":"/cases/attrs.pug","end":{"line":13,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":13,"column":2},"filename":"/cases/attrs.pug","end":{"line":13,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":13,"column":3},"filename":"/cases/attrs.pug","end":{"line":13,"column":15}},"name":"href","mustEscape":true,"val":"'/save'"}
+{"type":"end-attributes","loc":{"start":{"line":13,"column":15},"filename":"/cases/attrs.pug","end":{"line":13,"column":16}}}
+{"type":"class","loc":{"start":{"line":13,"column":16},"filename":"/cases/attrs.pug","end":{"line":13,"column":23}},"val":"button"}
+{"type":"text","loc":{"start":{"line":13,"column":24},"filename":"/cases/attrs.pug","end":{"line":13,"column":28}},"val":"save"}
+{"type":"newline","loc":{"start":{"line":14,"column":1},"filename":"/cases/attrs.pug","end":{"line":14,"column":1}}}
+{"type":"tag","loc":{"start":{"line":14,"column":1},"filename":"/cases/attrs.pug","end":{"line":14,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":14,"column":2},"filename":"/cases/attrs.pug","end":{"line":14,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":14,"column":3},"filename":"/cases/attrs.pug","end":{"line":14,"column":6}},"name":"foo","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":14,"column":7},"filename":"/cases/attrs.pug","end":{"line":14,"column":10}},"name":"bar","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":14,"column":11},"filename":"/cases/attrs.pug","end":{"line":14,"column":14}},"name":"baz","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":14,"column":14},"filename":"/cases/attrs.pug","end":{"line":14,"column":15}}}
+{"type":"newline","loc":{"start":{"line":15,"column":1},"filename":"/cases/attrs.pug","end":{"line":15,"column":1}}}
+{"type":"tag","loc":{"start":{"line":15,"column":1},"filename":"/cases/attrs.pug","end":{"line":15,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":15,"column":2},"filename":"/cases/attrs.pug","end":{"line":15,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":15,"column":3},"filename":"/cases/attrs.pug","end":{"line":15,"column":22}},"name":"foo","mustEscape":true,"val":"'foo, bar, baz'"}
+{"type":"attribute","loc":{"start":{"line":15,"column":23},"filename":"/cases/attrs.pug","end":{"line":15,"column":28}},"name":"bar","mustEscape":true,"val":"1"}
+{"type":"end-attributes","loc":{"start":{"line":15,"column":28},"filename":"/cases/attrs.pug","end":{"line":15,"column":29}}}
+{"type":"newline","loc":{"start":{"line":16,"column":1},"filename":"/cases/attrs.pug","end":{"line":16,"column":1}}}
+{"type":"tag","loc":{"start":{"line":16,"column":1},"filename":"/cases/attrs.pug","end":{"line":16,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":16,"column":2},"filename":"/cases/attrs.pug","end":{"line":16,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":16,"column":3},"filename":"/cases/attrs.pug","end":{"line":16,"column":16}},"name":"foo","mustEscape":true,"val":"'((foo))'"}
+{"type":"attribute","loc":{"start":{"line":16,"column":17},"filename":"/cases/attrs.pug","end":{"line":16,"column":33}},"name":"bar","mustEscape":true,"val":"(1) ? 1 : 0"}
+{"type":"end-attributes","loc":{"start":{"line":16,"column":34},"filename":"/cases/attrs.pug","end":{"line":16,"column":35}}}
+{"type":"newline","loc":{"start":{"line":17,"column":1},"filename":"/cases/attrs.pug","end":{"line":17,"column":1}}}
+{"type":"tag","loc":{"start":{"line":17,"column":1},"filename":"/cases/attrs.pug","end":{"line":17,"column":7}},"val":"select"}
+{"type":"indent","loc":{"start":{"line":18,"column":1},"filename":"/cases/attrs.pug","end":{"line":18,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":18,"column":3},"filename":"/cases/attrs.pug","end":{"line":18,"column":9}},"val":"option"}
+{"type":"start-attributes","loc":{"start":{"line":18,"column":9},"filename":"/cases/attrs.pug","end":{"line":18,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":18,"column":10},"filename":"/cases/attrs.pug","end":{"line":18,"column":21}},"name":"value","mustEscape":true,"val":"'foo'"}
+{"type":"attribute","loc":{"start":{"line":18,"column":22},"filename":"/cases/attrs.pug","end":{"line":18,"column":30}},"name":"selected","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":18,"column":30},"filename":"/cases/attrs.pug","end":{"line":18,"column":31}}}
+{"type":"text","loc":{"start":{"line":18,"column":32},"filename":"/cases/attrs.pug","end":{"line":18,"column":35}},"val":"Foo"}
+{"type":"newline","loc":{"start":{"line":19,"column":1},"filename":"/cases/attrs.pug","end":{"line":19,"column":3}}}
+{"type":"tag","loc":{"start":{"line":19,"column":3},"filename":"/cases/attrs.pug","end":{"line":19,"column":9}},"val":"option"}
+{"type":"start-attributes","loc":{"start":{"line":19,"column":9},"filename":"/cases/attrs.pug","end":{"line":19,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":19,"column":10},"filename":"/cases/attrs.pug","end":{"line":19,"column":18}},"name":"selected","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":19,"column":19},"filename":"/cases/attrs.pug","end":{"line":19,"column":30}},"name":"value","mustEscape":true,"val":"'bar'"}
+{"type":"end-attributes","loc":{"start":{"line":19,"column":30},"filename":"/cases/attrs.pug","end":{"line":19,"column":31}}}
+{"type":"text","loc":{"start":{"line":19,"column":32},"filename":"/cases/attrs.pug","end":{"line":19,"column":35}},"val":"Bar"}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/attrs.pug","end":{"line":20,"column":1}}}
+{"type":"tag","loc":{"start":{"line":20,"column":1},"filename":"/cases/attrs.pug","end":{"line":20,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":20,"column":2},"filename":"/cases/attrs.pug","end":{"line":20,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":20,"column":3},"filename":"/cases/attrs.pug","end":{"line":20,"column":15}},"name":"foo","mustEscape":true,"val":"\"class:\""}
+{"type":"end-attributes","loc":{"start":{"line":20,"column":15},"filename":"/cases/attrs.pug","end":{"line":20,"column":16}}}
+{"type":"newline","loc":{"start":{"line":21,"column":1},"filename":"/cases/attrs.pug","end":{"line":21,"column":1}}}
+{"type":"tag","loc":{"start":{"line":21,"column":1},"filename":"/cases/attrs.pug","end":{"line":21,"column":6}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":21,"column":6},"filename":"/cases/attrs.pug","end":{"line":21,"column":7}}}
+{"type":"attribute","loc":{"start":{"line":21,"column":7},"filename":"/cases/attrs.pug","end":{"line":21,"column":21}},"name":"pattern","mustEscape":true,"val":"'\\\\S+'"}
+{"type":"end-attributes","loc":{"start":{"line":21,"column":21},"filename":"/cases/attrs.pug","end":{"line":21,"column":22}}}
+{"type":"newline","loc":{"start":{"line":22,"column":1},"filename":"/cases/attrs.pug","end":{"line":22,"column":1}}}
+{"type":"tag","loc":{"start":{"line":22,"column":1},"filename":"/cases/attrs.pug","end":{"line":22,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":22,"column":4},"filename":"/cases/attrs.pug","end":{"line":22,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":22,"column":5},"filename":"/cases/attrs.pug","end":{"line":22,"column":17}},"name":"terse","mustEscape":true,"val":"\"true\""}
+{"type":"end-attributes","loc":{"start":{"line":22,"column":17},"filename":"/cases/attrs.pug","end":{"line":22,"column":18}}}
+{"type":"newline","loc":{"start":{"line":23,"column":1},"filename":"/cases/attrs.pug","end":{"line":23,"column":1}}}
+{"type":"tag","loc":{"start":{"line":23,"column":1},"filename":"/cases/attrs.pug","end":{"line":23,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":23,"column":4},"filename":"/cases/attrs.pug","end":{"line":23,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":23,"column":5},"filename":"/cases/attrs.pug","end":{"line":23,"column":21}},"name":"date","mustEscape":true,"val":"new Date(0)"}
+{"type":"end-attributes","loc":{"start":{"line":23,"column":21},"filename":"/cases/attrs.pug","end":{"line":23,"column":22}}}
+{"type":"newline","loc":{"start":{"line":25,"column":1},"filename":"/cases/attrs.pug","end":{"line":25,"column":1}}}
+{"type":"tag","loc":{"start":{"line":25,"column":1},"filename":"/cases/attrs.pug","end":{"line":25,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":25,"column":4},"filename":"/cases/attrs.pug","end":{"line":25,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":25,"column":5},"filename":"/cases/attrs.pug","end":{"line":25,"column":8}},"name":"abc","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":26,"column":5},"filename":"/cases/attrs.pug","end":{"line":26,"column":8}},"name":"def","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":26,"column":8},"filename":"/cases/attrs.pug","end":{"line":26,"column":9}}}
+{"type":"newline","loc":{"start":{"line":27,"column":1},"filename":"/cases/attrs.pug","end":{"line":27,"column":1}}}
+{"type":"tag","loc":{"start":{"line":27,"column":1},"filename":"/cases/attrs.pug","end":{"line":27,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":27,"column":4},"filename":"/cases/attrs.pug","end":{"line":27,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":27,"column":5},"filename":"/cases/attrs.pug","end":{"line":27,"column":8}},"name":"abc","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":28,"column":5},"filename":"/cases/attrs.pug","end":{"line":28,"column":8}},"name":"def","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":28,"column":8},"filename":"/cases/attrs.pug","end":{"line":28,"column":9}}}
+{"type":"newline","loc":{"start":{"line":29,"column":1},"filename":"/cases/attrs.pug","end":{"line":29,"column":1}}}
+{"type":"tag","loc":{"start":{"line":29,"column":1},"filename":"/cases/attrs.pug","end":{"line":29,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":29,"column":4},"filename":"/cases/attrs.pug","end":{"line":29,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":29,"column":5},"filename":"/cases/attrs.pug","end":{"line":29,"column":8}},"name":"abc","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":30,"column":3},"filename":"/cases/attrs.pug","end":{"line":30,"column":6}},"name":"def","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":30,"column":6},"filename":"/cases/attrs.pug","end":{"line":30,"column":7}}}
+{"type":"newline","loc":{"start":{"line":31,"column":1},"filename":"/cases/attrs.pug","end":{"line":31,"column":1}}}
+{"type":"tag","loc":{"start":{"line":31,"column":1},"filename":"/cases/attrs.pug","end":{"line":31,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":31,"column":4},"filename":"/cases/attrs.pug","end":{"line":31,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":31,"column":5},"filename":"/cases/attrs.pug","end":{"line":31,"column":8}},"name":"abc","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":32,"column":4},"filename":"/cases/attrs.pug","end":{"line":32,"column":7}},"name":"def","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":32,"column":7},"filename":"/cases/attrs.pug","end":{"line":32,"column":8}}}
+{"type":"newline","loc":{"start":{"line":33,"column":1},"filename":"/cases/attrs.pug","end":{"line":33,"column":1}}}
+{"type":"tag","loc":{"start":{"line":33,"column":1},"filename":"/cases/attrs.pug","end":{"line":33,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":33,"column":4},"filename":"/cases/attrs.pug","end":{"line":33,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":33,"column":5},"filename":"/cases/attrs.pug","end":{"line":33,"column":8}},"name":"abc","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":34,"column":3},"filename":"/cases/attrs.pug","end":{"line":34,"column":6}},"name":"def","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":34,"column":6},"filename":"/cases/attrs.pug","end":{"line":34,"column":7}}}
+{"type":"newline","loc":{"start":{"line":35,"column":1},"filename":"/cases/attrs.pug","end":{"line":35,"column":1}}}
+{"type":"tag","loc":{"start":{"line":35,"column":1},"filename":"/cases/attrs.pug","end":{"line":35,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":35,"column":4},"filename":"/cases/attrs.pug","end":{"line":35,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":35,"column":5},"filename":"/cases/attrs.pug","end":{"line":35,"column":8}},"name":"abc","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":36,"column":5},"filename":"/cases/attrs.pug","end":{"line":36,"column":8}},"name":"def","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":36,"column":8},"filename":"/cases/attrs.pug","end":{"line":36,"column":9}}}
+{"type":"newline","loc":{"start":{"line":38,"column":1},"filename":"/cases/attrs.pug","end":{"line":38,"column":1}}}
+{"type":"code","loc":{"start":{"line":38,"column":1},"filename":"/cases/attrs.pug","end":{"line":38,"column":41}},"val":"var attrs = {foo: 'bar', bar: '<baz>'}","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":40,"column":1},"filename":"/cases/attrs.pug","end":{"line":40,"column":1}}}
+{"type":"tag","loc":{"start":{"line":40,"column":1},"filename":"/cases/attrs.pug","end":{"line":40,"column":4}},"val":"div"}
+{"type":"&attributes","loc":{"start":{"line":40,"column":4},"filename":"/cases/attrs.pug","end":{"line":40,"column":22}},"val":"attrs"}
+{"type":"newline","loc":{"start":{"line":42,"column":1},"filename":"/cases/attrs.pug","end":{"line":42,"column":1}}}
+{"type":"tag","loc":{"start":{"line":42,"column":1},"filename":"/cases/attrs.pug","end":{"line":42,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":42,"column":2},"filename":"/cases/attrs.pug","end":{"line":42,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":42,"column":3},"filename":"/cases/attrs.pug","end":{"line":42,"column":12}},"name":"foo","mustEscape":true,"val":"'foo'"}
+{"type":"attribute","loc":{"start":{"line":42,"column":13},"filename":"/cases/attrs.pug","end":{"line":42,"column":24}},"name":"bar","mustEscape":true,"val":"\"bar\""}
+{"type":"end-attributes","loc":{"start":{"line":42,"column":24},"filename":"/cases/attrs.pug","end":{"line":42,"column":25}}}
+{"type":"newline","loc":{"start":{"line":43,"column":1},"filename":"/cases/attrs.pug","end":{"line":43,"column":1}}}
+{"type":"tag","loc":{"start":{"line":43,"column":1},"filename":"/cases/attrs.pug","end":{"line":43,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":43,"column":2},"filename":"/cases/attrs.pug","end":{"line":43,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":43,"column":3},"filename":"/cases/attrs.pug","end":{"line":43,"column":12}},"name":"foo","mustEscape":true,"val":"'foo'"}
+{"type":"attribute","loc":{"start":{"line":43,"column":13},"filename":"/cases/attrs.pug","end":{"line":43,"column":24}},"name":"bar","mustEscape":true,"val":"'bar'"}
+{"type":"end-attributes","loc":{"start":{"line":43,"column":24},"filename":"/cases/attrs.pug","end":{"line":43,"column":25}}}
+{"type":"newline","loc":{"start":{"line":44,"column":1},"filename":"/cases/attrs.pug","end":{"line":44,"column":1}}}
+{"type":"eos","loc":{"start":{"line":44,"column":1},"filename":"/cases/attrs.pug","end":{"line":44,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/attrs.unescaped.tokens.json b/packages/pug-parser/test/cases/attrs.unescaped.tokens.json
index bc7d33633..9cce52196 100644
--- a/packages/pug-parser/test/cases/attrs.unescaped.tokens.json
+++ b/packages/pug-parser/test/cases/attrs.unescaped.tokens.json
@@ -1,15 +1,15 @@
-{"type":"tag","line":1,"col":1,"val":"script"}
-{"type":"start-attributes","line":1,"col":7}
-{"type":"attribute","line":1,"col":8,"name":"type","val":"'text/x-template'","mustEscape":true}
-{"type":"end-attributes","line":1,"col":30}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"div"}
-{"type":"start-attributes","line":2,"col":6}
-{"type":"attribute","line":2,"col":7,"name":"id","val":"'user-<%= user.id %>'","mustEscape":false}
-{"type":"end-attributes","line":2,"col":32}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"h1"}
-{"type":"text","line":3,"col":8,"val":"<%= user.title %>"}
-{"type":"outdent","line":3,"col":25}
-{"type":"outdent","line":3,"col":25}
-{"type":"eos","line":3,"col":25}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/attrs.unescaped.pug","end":{"line":1,"column":7}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":1,"column":7},"filename":"/cases/attrs.unescaped.pug","end":{"line":1,"column":8}}}
+{"type":"attribute","loc":{"start":{"line":1,"column":8},"filename":"/cases/attrs.unescaped.pug","end":{"line":1,"column":30}},"name":"type","mustEscape":true,"val":"'text/x-template'"}
+{"type":"end-attributes","loc":{"start":{"line":1,"column":30},"filename":"/cases/attrs.unescaped.pug","end":{"line":1,"column":31}}}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/attrs.unescaped.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/attrs.unescaped.pug","end":{"line":2,"column":6}},"val":"div"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":6},"filename":"/cases/attrs.unescaped.pug","end":{"line":2,"column":7}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":7},"filename":"/cases/attrs.unescaped.pug","end":{"line":2,"column":32}},"name":"id","mustEscape":false,"val":"'user-<%= user.id %>'"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":32},"filename":"/cases/attrs.unescaped.pug","end":{"line":2,"column":33}}}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/attrs.unescaped.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/attrs.unescaped.pug","end":{"line":3,"column":7}},"val":"h1"}
+{"type":"text","loc":{"start":{"line":3,"column":8},"filename":"/cases/attrs.unescaped.pug","end":{"line":3,"column":25}},"val":"<%= user.title %>"}
+{"type":"outdent","loc":{"start":{"line":3,"column":25},"filename":"/cases/attrs.unescaped.pug","end":{"line":3,"column":25}}}
+{"type":"outdent","loc":{"start":{"line":3,"column":25},"filename":"/cases/attrs.unescaped.pug","end":{"line":3,"column":25}}}
+{"type":"eos","loc":{"start":{"line":3,"column":25},"filename":"/cases/attrs.unescaped.pug","end":{"line":3,"column":25}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/basic.tokens.json b/packages/pug-parser/test/cases/basic.tokens.json
index 7897d33f4..0d38aae15 100644
--- a/packages/pug-parser/test/cases/basic.tokens.json
+++ b/packages/pug-parser/test/cases/basic.tokens.json
@@ -1,9 +1,9 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"h1"}
-{"type":"text","line":3,"col":8,"val":"Title"}
-{"type":"outdent","line":3,"col":13}
-{"type":"outdent","line":3,"col":13}
-{"type":"eos","line":3,"col":13}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/basic.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/basic.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/basic.pug","end":{"line":2,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/basic.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/basic.pug","end":{"line":3,"column":7}},"val":"h1"}
+{"type":"text","loc":{"start":{"line":3,"column":8},"filename":"/cases/basic.pug","end":{"line":3,"column":13}},"val":"Title"}
+{"type":"outdent","loc":{"start":{"line":3,"column":13},"filename":"/cases/basic.pug","end":{"line":3,"column":13}}}
+{"type":"outdent","loc":{"start":{"line":3,"column":13},"filename":"/cases/basic.pug","end":{"line":3,"column":13}}}
+{"type":"eos","loc":{"start":{"line":3,"column":13},"filename":"/cases/basic.pug","end":{"line":3,"column":13}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/blanks.tokens.json b/packages/pug-parser/test/cases/blanks.tokens.json
index f20431ab6..1529f5c88 100644
--- a/packages/pug-parser/test/cases/blanks.tokens.json
+++ b/packages/pug-parser/test/cases/blanks.tokens.json
@@ -1,13 +1,13 @@
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"ul"}
-{"type":"indent","line":4,"col":1,"val":2}
-{"type":"tag","line":4,"col":3,"val":"li"}
-{"type":"text","line":4,"col":6,"val":"foo"}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":3,"val":"li"}
-{"type":"text","line":6,"col":6,"val":"bar"}
-{"type":"newline","line":8,"col":1}
-{"type":"tag","line":8,"col":3,"val":"li"}
-{"type":"text","line":8,"col":6,"val":"baz"}
-{"type":"outdent","line":9,"col":1}
-{"type":"eos","line":9,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/blanks.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/blanks.pug","end":{"line":3,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/blanks.pug","end":{"line":4,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/blanks.pug","end":{"line":4,"column":5}},"val":"li"}
+{"type":"text","loc":{"start":{"line":4,"column":6},"filename":"/cases/blanks.pug","end":{"line":4,"column":9}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/blanks.pug","end":{"line":6,"column":3}}}
+{"type":"tag","loc":{"start":{"line":6,"column":3},"filename":"/cases/blanks.pug","end":{"line":6,"column":5}},"val":"li"}
+{"type":"text","loc":{"start":{"line":6,"column":6},"filename":"/cases/blanks.pug","end":{"line":6,"column":9}},"val":"bar"}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/blanks.pug","end":{"line":8,"column":3}}}
+{"type":"tag","loc":{"start":{"line":8,"column":3},"filename":"/cases/blanks.pug","end":{"line":8,"column":5}},"val":"li"}
+{"type":"text","loc":{"start":{"line":8,"column":6},"filename":"/cases/blanks.pug","end":{"line":8,"column":9}},"val":"baz"}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/blanks.pug","end":{"line":9,"column":1}}}
+{"type":"eos","loc":{"start":{"line":9,"column":1},"filename":"/cases/blanks.pug","end":{"line":9,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/block-code.tokens.json b/packages/pug-parser/test/cases/block-code.tokens.json
index b2acbc132..bff169482 100644
--- a/packages/pug-parser/test/cases/block-code.tokens.json
+++ b/packages/pug-parser/test/cases/block-code.tokens.json
@@ -1,28 +1,28 @@
-{"type":"blockcode","line":1,"col":1}
-{"type":"start-pipeless-text","line":1,"col":2}
-{"type":"text","line":2,"col":3,"val":"list = [\"uno\", \"dos\", \"tres\","}
-{"type":"newline","line":3,"col":1}
-{"type":"text","line":3,"col":3,"val":"        \"cuatro\", \"cinco\", \"seis\"];"}
-{"type":"end-pipeless-text","line":3,"col":38}
-{"type":"newline","line":4,"col":1}
-{"type":"comment","line":4,"col":1,"val":" Without a block, the element is accepted and no code is generated","buffer":false}
-{"type":"newline","line":5,"col":1}
-{"type":"blockcode","line":5,"col":1}
-{"type":"newline","line":6,"col":1}
-{"type":"each","line":6,"col":1,"val":"item","key":null,"code":"list"}
-{"type":"indent","line":7,"col":1,"val":2}
-{"type":"blockcode","line":7,"col":3}
-{"type":"start-pipeless-text","line":7,"col":4}
-{"type":"text","line":8,"col":5,"val":"string = item.charAt(0)"}
-{"type":"newline","line":9,"col":1}
-{"type":"text","line":9,"col":5,"val":""}
-{"type":"newline","line":10,"col":1}
-{"type":"text","line":10,"col":5,"val":"  .toUpperCase() +"}
-{"type":"newline","line":11,"col":1}
-{"type":"text","line":11,"col":5,"val":"item.slice(1);"}
-{"type":"end-pipeless-text","line":11,"col":19}
-{"type":"newline","line":12,"col":1}
-{"type":"tag","line":12,"col":3,"val":"li"}
-{"type":"code","line":12,"col":5,"val":"string","mustEscape":true,"buffer":true}
-{"type":"outdent","line":13,"col":1}
-{"type":"eos","line":13,"col":1}
\ No newline at end of file
+{"type":"blockcode","loc":{"start":{"line":1,"column":1},"filename":"/cases/block-code.pug","end":{"line":1,"column":2}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":1,"column":2},"filename":"/cases/block-code.pug","end":{"line":1,"column":2}}}
+{"type":"text","loc":{"start":{"line":2,"column":3},"filename":"/cases/block-code.pug","end":{"line":2,"column":32}},"val":"list = [\"uno\", \"dos\", \"tres\","}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/block-code.pug","end":{"line":3,"column":3}}}
+{"type":"text","loc":{"start":{"line":3,"column":3},"filename":"/cases/block-code.pug","end":{"line":3,"column":38}},"val":"        \"cuatro\", \"cinco\", \"seis\"];"}
+{"type":"end-pipeless-text","loc":{"start":{"line":3,"column":38},"filename":"/cases/block-code.pug","end":{"line":3,"column":38}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/block-code.pug","end":{"line":4,"column":1}}}
+{"type":"comment","loc":{"start":{"line":4,"column":1},"filename":"/cases/block-code.pug","end":{"line":4,"column":70}},"val":" Without a block, the element is accepted and no code is generated","buffer":false}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/block-code.pug","end":{"line":5,"column":1}}}
+{"type":"blockcode","loc":{"start":{"line":5,"column":1},"filename":"/cases/block-code.pug","end":{"line":5,"column":2}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/block-code.pug","end":{"line":6,"column":1}}}
+{"type":"each","loc":{"start":{"line":6,"column":1},"filename":"/cases/block-code.pug","end":{"line":6,"column":18}},"val":"item","key":null,"code":"list"}
+{"type":"indent","loc":{"start":{"line":7,"column":1},"filename":"/cases/block-code.pug","end":{"line":7,"column":3}},"val":2}
+{"type":"blockcode","loc":{"start":{"line":7,"column":3},"filename":"/cases/block-code.pug","end":{"line":7,"column":4}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":7,"column":4},"filename":"/cases/block-code.pug","end":{"line":7,"column":4}}}
+{"type":"text","loc":{"start":{"line":8,"column":5},"filename":"/cases/block-code.pug","end":{"line":8,"column":28}},"val":"string = item.charAt(0)"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/block-code.pug","end":{"line":9,"column":5}}}
+{"type":"text","loc":{"start":{"line":9,"column":5},"filename":"/cases/block-code.pug","end":{"line":9,"column":5}},"val":""}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/block-code.pug","end":{"line":10,"column":5}}}
+{"type":"text","loc":{"start":{"line":10,"column":5},"filename":"/cases/block-code.pug","end":{"line":10,"column":23}},"val":"  .toUpperCase() +"}
+{"type":"newline","loc":{"start":{"line":11,"column":1},"filename":"/cases/block-code.pug","end":{"line":11,"column":5}}}
+{"type":"text","loc":{"start":{"line":11,"column":5},"filename":"/cases/block-code.pug","end":{"line":11,"column":19}},"val":"item.slice(1);"}
+{"type":"end-pipeless-text","loc":{"start":{"line":11,"column":19},"filename":"/cases/block-code.pug","end":{"line":11,"column":19}}}
+{"type":"newline","loc":{"start":{"line":12,"column":1},"filename":"/cases/block-code.pug","end":{"line":12,"column":3}}}
+{"type":"tag","loc":{"start":{"line":12,"column":3},"filename":"/cases/block-code.pug","end":{"line":12,"column":5}},"val":"li"}
+{"type":"code","loc":{"start":{"line":12,"column":5},"filename":"/cases/block-code.pug","end":{"line":12,"column":13}},"val":"string","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":13,"column":1},"filename":"/cases/block-code.pug","end":{"line":13,"column":1}}}
+{"type":"eos","loc":{"start":{"line":13,"column":1},"filename":"/cases/block-code.pug","end":{"line":13,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/block-expansion.shorthands.tokens.json b/packages/pug-parser/test/cases/block-expansion.shorthands.tokens.json
index 24c4ff968..055869e46 100644
--- a/packages/pug-parser/test/cases/block-expansion.shorthands.tokens.json
+++ b/packages/pug-parser/test/cases/block-expansion.shorthands.tokens.json
@@ -1,11 +1,11 @@
-{"type":"tag","line":1,"col":1,"val":"ul"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"li"}
-{"type":"class","line":2,"col":5,"val":"list-item"}
-{"type":":","line":2,"col":15}
-{"type":"class","line":2,"col":17,"val":"foo"}
-{"type":":","line":2,"col":21}
-{"type":"id","line":2,"col":23,"val":"bar"}
-{"type":"text","line":2,"col":28,"val":"baz"}
-{"type":"outdent","line":2,"col":31}
-{"type":"eos","line":2,"col":31}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/block-expansion.shorthands.pug","end":{"line":1,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/block-expansion.shorthands.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/block-expansion.shorthands.pug","end":{"line":2,"column":5}},"val":"li"}
+{"type":"class","loc":{"start":{"line":2,"column":5},"filename":"/cases/block-expansion.shorthands.pug","end":{"line":2,"column":15}},"val":"list-item"}
+{"type":":","loc":{"start":{"line":2,"column":15},"filename":"/cases/block-expansion.shorthands.pug","end":{"line":2,"column":17}}}
+{"type":"class","loc":{"start":{"line":2,"column":17},"filename":"/cases/block-expansion.shorthands.pug","end":{"line":2,"column":21}},"val":"foo"}
+{"type":":","loc":{"start":{"line":2,"column":21},"filename":"/cases/block-expansion.shorthands.pug","end":{"line":2,"column":23}}}
+{"type":"id","loc":{"start":{"line":2,"column":23},"filename":"/cases/block-expansion.shorthands.pug","end":{"line":2,"column":27}},"val":"bar"}
+{"type":"text","loc":{"start":{"line":2,"column":28},"filename":"/cases/block-expansion.shorthands.pug","end":{"line":2,"column":31}},"val":"baz"}
+{"type":"outdent","loc":{"start":{"line":2,"column":31},"filename":"/cases/block-expansion.shorthands.pug","end":{"line":2,"column":31}}}
+{"type":"eos","loc":{"start":{"line":2,"column":31},"filename":"/cases/block-expansion.shorthands.pug","end":{"line":2,"column":31}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/block-expansion.tokens.json b/packages/pug-parser/test/cases/block-expansion.tokens.json
index e975377c7..c49b6599a 100644
--- a/packages/pug-parser/test/cases/block-expansion.tokens.json
+++ b/packages/pug-parser/test/cases/block-expansion.tokens.json
@@ -1,21 +1,21 @@
-{"type":"tag","line":1,"col":1,"val":"ul"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"li"}
-{"type":":","line":2,"col":5}
-{"type":"tag","line":2,"col":7,"val":"a"}
-{"type":"start-attributes","line":2,"col":8}
-{"type":"attribute","line":2,"col":9,"name":"href","val":"'#'","mustEscape":true}
-{"type":"end-attributes","line":2,"col":17}
-{"type":"text","line":2,"col":19,"val":"foo"}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":3,"val":"li"}
-{"type":":","line":3,"col":5}
-{"type":"tag","line":3,"col":7,"val":"a"}
-{"type":"start-attributes","line":3,"col":8}
-{"type":"attribute","line":3,"col":9,"name":"href","val":"'#'","mustEscape":true}
-{"type":"end-attributes","line":3,"col":17}
-{"type":"text","line":3,"col":19,"val":"bar"}
-{"type":"outdent","line":5,"col":1}
-{"type":"tag","line":5,"col":1,"val":"p"}
-{"type":"text","line":5,"col":3,"val":"baz"}
-{"type":"eos","line":5,"col":6}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/block-expansion.pug","end":{"line":1,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/block-expansion.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/block-expansion.pug","end":{"line":2,"column":5}},"val":"li"}
+{"type":":","loc":{"start":{"line":2,"column":5},"filename":"/cases/block-expansion.pug","end":{"line":2,"column":7}}}
+{"type":"tag","loc":{"start":{"line":2,"column":7},"filename":"/cases/block-expansion.pug","end":{"line":2,"column":8}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":8},"filename":"/cases/block-expansion.pug","end":{"line":2,"column":9}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":9},"filename":"/cases/block-expansion.pug","end":{"line":2,"column":17}},"name":"href","mustEscape":true,"val":"'#'"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":17},"filename":"/cases/block-expansion.pug","end":{"line":2,"column":18}}}
+{"type":"text","loc":{"start":{"line":2,"column":19},"filename":"/cases/block-expansion.pug","end":{"line":2,"column":22}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/block-expansion.pug","end":{"line":3,"column":3}}}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/block-expansion.pug","end":{"line":3,"column":5}},"val":"li"}
+{"type":":","loc":{"start":{"line":3,"column":5},"filename":"/cases/block-expansion.pug","end":{"line":3,"column":7}}}
+{"type":"tag","loc":{"start":{"line":3,"column":7},"filename":"/cases/block-expansion.pug","end":{"line":3,"column":8}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":8},"filename":"/cases/block-expansion.pug","end":{"line":3,"column":9}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":9},"filename":"/cases/block-expansion.pug","end":{"line":3,"column":17}},"name":"href","mustEscape":true,"val":"'#'"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":17},"filename":"/cases/block-expansion.pug","end":{"line":3,"column":18}}}
+{"type":"text","loc":{"start":{"line":3,"column":19},"filename":"/cases/block-expansion.pug","end":{"line":3,"column":22}},"val":"bar"}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/block-expansion.pug","end":{"line":5,"column":1}}}
+{"type":"tag","loc":{"start":{"line":5,"column":1},"filename":"/cases/block-expansion.pug","end":{"line":5,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":5,"column":3},"filename":"/cases/block-expansion.pug","end":{"line":5,"column":6}},"val":"baz"}
+{"type":"eos","loc":{"start":{"line":5,"column":6},"filename":"/cases/block-expansion.pug","end":{"line":5,"column":6}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/blockquote.tokens.json b/packages/pug-parser/test/cases/blockquote.tokens.json
index d03499a1c..cb0b8f0c6 100644
--- a/packages/pug-parser/test/cases/blockquote.tokens.json
+++ b/packages/pug-parser/test/cases/blockquote.tokens.json
@@ -1,10 +1,10 @@
-{"type":"tag","line":1,"col":1,"val":"figure"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"blockquote"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"text","line":3,"col":7,"val":"Try to define yourself by what you do, and you&#8217;ll burnout every time. You are. That is enough. I rest in that."}
-{"type":"outdent","line":4,"col":3}
-{"type":"tag","line":4,"col":3,"val":"figcaption"}
-{"type":"text","line":4,"col":14,"val":"from @thefray at 1:43pm on May 10"}
-{"type":"outdent","line":4,"col":47}
-{"type":"eos","line":4,"col":47}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/blockquote.pug","end":{"line":1,"column":7}},"val":"figure"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/blockquote.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/blockquote.pug","end":{"line":2,"column":13}},"val":"blockquote"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/blockquote.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"text","loc":{"start":{"line":3,"column":7},"filename":"/cases/blockquote.pug","end":{"line":3,"column":123}},"val":"Try to define yourself by what you do, and you&#8217;ll burnout every time. You are. That is enough. I rest in that."}
+{"type":"outdent","loc":{"start":{"line":4,"column":1},"filename":"/cases/blockquote.pug","end":{"line":4,"column":3}}}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/blockquote.pug","end":{"line":4,"column":13}},"val":"figcaption"}
+{"type":"text","loc":{"start":{"line":4,"column":14},"filename":"/cases/blockquote.pug","end":{"line":4,"column":47}},"val":"from @thefray at 1:43pm on May 10"}
+{"type":"outdent","loc":{"start":{"line":4,"column":47},"filename":"/cases/blockquote.pug","end":{"line":4,"column":47}}}
+{"type":"eos","loc":{"start":{"line":4,"column":47},"filename":"/cases/blockquote.pug","end":{"line":4,"column":47}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/blocks-in-blocks.tokens.json b/packages/pug-parser/test/cases/blocks-in-blocks.tokens.json
index b02900153..c3cb941ea 100644
--- a/packages/pug-parser/test/cases/blocks-in-blocks.tokens.json
+++ b/packages/pug-parser/test/cases/blocks-in-blocks.tokens.json
@@ -1,9 +1,9 @@
-{"type":"extends","line":1,"col":1}
-{"type":"path","line":1,"col":9,"val":"./auxiliary/blocks-in-blocks-layout.pug"}
-{"type":"newline","line":3,"col":1}
-{"type":"block","line":3,"col":1,"val":"body","mode":"replace"}
-{"type":"indent","line":4,"col":1,"val":2}
-{"type":"tag","line":4,"col":3,"val":"h1"}
-{"type":"text","line":4,"col":6,"val":"Page 2"}
-{"type":"outdent","line":5,"col":1}
-{"type":"eos","line":5,"col":1}
\ No newline at end of file
+{"type":"extends","loc":{"start":{"line":1,"column":1},"filename":"/cases/blocks-in-blocks.pug","end":{"line":1,"column":8}}}
+{"type":"path","loc":{"start":{"line":1,"column":9},"filename":"/cases/blocks-in-blocks.pug","end":{"line":1,"column":48}},"val":"./auxiliary/blocks-in-blocks-layout.pug"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/blocks-in-blocks.pug","end":{"line":3,"column":1}}}
+{"type":"block","loc":{"start":{"line":3,"column":1},"filename":"/cases/blocks-in-blocks.pug","end":{"line":3,"column":11}},"val":"body","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/blocks-in-blocks.pug","end":{"line":4,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/blocks-in-blocks.pug","end":{"line":4,"column":5}},"val":"h1"}
+{"type":"text","loc":{"start":{"line":4,"column":6},"filename":"/cases/blocks-in-blocks.pug","end":{"line":4,"column":12}},"val":"Page 2"}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/blocks-in-blocks.pug","end":{"line":5,"column":1}}}
+{"type":"eos","loc":{"start":{"line":5,"column":1},"filename":"/cases/blocks-in-blocks.pug","end":{"line":5,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/blocks-in-if.tokens.json b/packages/pug-parser/test/cases/blocks-in-if.tokens.json
index cacfebd6f..3f30fc324 100644
--- a/packages/pug-parser/test/cases/blocks-in-if.tokens.json
+++ b/packages/pug-parser/test/cases/blocks-in-if.tokens.json
@@ -1,44 +1,44 @@
-{"type":"comment","line":1,"col":1,"val":" see https://github.com/pugjs/pug/issues/1589","buffer":false}
-{"type":"newline","line":3,"col":1}
-{"type":"code","line":3,"col":1,"val":"var ajax = true","mustEscape":false,"buffer":false}
-{"type":"newline","line":5,"col":1}
-{"type":"code","line":5,"col":1,"val":"if( ajax )","mustEscape":false,"buffer":false}
-{"type":"indent","line":6,"col":1,"val":4}
-{"type":"comment","line":6,"col":5,"val":" return only contents if ajax requests","buffer":false}
-{"type":"newline","line":7,"col":1}
-{"type":"block","line":7,"col":5,"val":"contents","mode":"replace"}
-{"type":"indent","line":8,"col":1,"val":8}
-{"type":"tag","line":8,"col":9,"val":"p"}
-{"type":"text","line":8,"col":11,"val":"ajax contents"}
-{"type":"outdent","line":10,"col":5}
-{"type":"outdent","line":10,"col":1}
-{"type":"code","line":10,"col":1,"val":"else","mustEscape":false,"buffer":false}
-{"type":"indent","line":11,"col":1,"val":4}
-{"type":"comment","line":11,"col":5,"val":" return all html","buffer":false}
-{"type":"newline","line":12,"col":1}
-{"type":"doctype","line":12,"col":5,"val":"html"}
-{"type":"newline","line":13,"col":1}
-{"type":"tag","line":13,"col":5,"val":"html"}
-{"type":"indent","line":14,"col":1,"val":8}
-{"type":"tag","line":14,"col":9,"val":"head"}
-{"type":"indent","line":15,"col":1,"val":12}
-{"type":"tag","line":15,"col":13,"val":"meta"}
-{"type":"start-attributes","line":15,"col":17}
-{"type":"attribute","line":15,"col":19,"name":"charset","val":"'utf8'","mustEscape":true}
-{"type":"end-attributes","line":15,"col":34}
-{"type":"newline","line":16,"col":1}
-{"type":"tag","line":16,"col":13,"val":"title"}
-{"type":"text","line":16,"col":19,"val":"sample"}
-{"type":"newline","line":17,"col":1}
-{"type":"tag","line":17,"col":13,"val":"body"}
-{"type":"indent","line":18,"col":1,"val":16}
-{"type":"block","line":18,"col":17,"val":"contents","mode":"replace"}
-{"type":"indent","line":19,"col":1,"val":20}
-{"type":"tag","line":19,"col":21,"val":"p"}
-{"type":"text","line":19,"col":23,"val":"all contetns"}
-{"type":"outdent","line":20,"col":17}
-{"type":"outdent","line":20,"col":13}
-{"type":"outdent","line":20,"col":9}
-{"type":"outdent","line":20,"col":5}
-{"type":"outdent","line":20,"col":1}
-{"type":"eos","line":20,"col":1}
\ No newline at end of file
+{"type":"comment","loc":{"start":{"line":1,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":1,"column":49}},"val":" see https://github.com/pugjs/pug/issues/1589","buffer":false}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":3,"column":1}}}
+{"type":"code","loc":{"start":{"line":3,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":3,"column":17}},"val":"var ajax = true","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":5,"column":1}}}
+{"type":"code","loc":{"start":{"line":5,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":5,"column":12}},"val":"if( ajax )","mustEscape":false,"buffer":false}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":6,"column":5}},"val":4}
+{"type":"comment","loc":{"start":{"line":6,"column":5},"filename":"/cases/blocks-in-if.pug","end":{"line":6,"column":46}},"val":" return only contents if ajax requests","buffer":false}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":7,"column":5}}}
+{"type":"block","loc":{"start":{"line":7,"column":5},"filename":"/cases/blocks-in-if.pug","end":{"line":7,"column":19}},"val":"contents","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":8,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":8,"column":9},"filename":"/cases/blocks-in-if.pug","end":{"line":8,"column":10}},"val":"p"}
+{"type":"text","loc":{"start":{"line":8,"column":11},"filename":"/cases/blocks-in-if.pug","end":{"line":8,"column":24}},"val":"ajax contents"}
+{"type":"outdent","loc":{"start":{"line":10,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":10,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":10,"column":1}}}
+{"type":"code","loc":{"start":{"line":10,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":10,"column":6}},"val":"else","mustEscape":false,"buffer":false}
+{"type":"indent","loc":{"start":{"line":11,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":11,"column":5}},"val":4}
+{"type":"comment","loc":{"start":{"line":11,"column":5},"filename":"/cases/blocks-in-if.pug","end":{"line":11,"column":24}},"val":" return all html","buffer":false}
+{"type":"newline","loc":{"start":{"line":12,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":12,"column":5}}}
+{"type":"doctype","loc":{"start":{"line":12,"column":5},"filename":"/cases/blocks-in-if.pug","end":{"line":12,"column":17}},"val":"html"}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":13,"column":5}}}
+{"type":"tag","loc":{"start":{"line":13,"column":5},"filename":"/cases/blocks-in-if.pug","end":{"line":13,"column":9}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":14,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":14,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":14,"column":9},"filename":"/cases/blocks-in-if.pug","end":{"line":14,"column":13}},"val":"head"}
+{"type":"indent","loc":{"start":{"line":15,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":15,"column":13}},"val":12}
+{"type":"tag","loc":{"start":{"line":15,"column":13},"filename":"/cases/blocks-in-if.pug","end":{"line":15,"column":17}},"val":"meta"}
+{"type":"start-attributes","loc":{"start":{"line":15,"column":17},"filename":"/cases/blocks-in-if.pug","end":{"line":15,"column":18}}}
+{"type":"attribute","loc":{"start":{"line":15,"column":19},"filename":"/cases/blocks-in-if.pug","end":{"line":15,"column":33}},"name":"charset","mustEscape":true,"val":"'utf8'"}
+{"type":"end-attributes","loc":{"start":{"line":15,"column":34},"filename":"/cases/blocks-in-if.pug","end":{"line":15,"column":35}}}
+{"type":"newline","loc":{"start":{"line":16,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":16,"column":13}}}
+{"type":"tag","loc":{"start":{"line":16,"column":13},"filename":"/cases/blocks-in-if.pug","end":{"line":16,"column":18}},"val":"title"}
+{"type":"text","loc":{"start":{"line":16,"column":19},"filename":"/cases/blocks-in-if.pug","end":{"line":16,"column":25}},"val":"sample"}
+{"type":"newline","loc":{"start":{"line":17,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":17,"column":13}}}
+{"type":"tag","loc":{"start":{"line":17,"column":13},"filename":"/cases/blocks-in-if.pug","end":{"line":17,"column":17}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":18,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":18,"column":17}},"val":16}
+{"type":"block","loc":{"start":{"line":18,"column":17},"filename":"/cases/blocks-in-if.pug","end":{"line":18,"column":31}},"val":"contents","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":19,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":19,"column":21}},"val":20}
+{"type":"tag","loc":{"start":{"line":19,"column":21},"filename":"/cases/blocks-in-if.pug","end":{"line":19,"column":22}},"val":"p"}
+{"type":"text","loc":{"start":{"line":19,"column":23},"filename":"/cases/blocks-in-if.pug","end":{"line":19,"column":35}},"val":"all contetns"}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":20,"column":1}}}
+{"type":"eos","loc":{"start":{"line":20,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":20,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/case-blocks.tokens.json b/packages/pug-parser/test/cases/case-blocks.tokens.json
index b56e19ac6..165b477ce 100644
--- a/packages/pug-parser/test/cases/case-blocks.tokens.json
+++ b/packages/pug-parser/test/cases/case-blocks.tokens.json
@@ -1,29 +1,29 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"code","line":3,"col":5,"val":"var friends = 1","mustEscape":false,"buffer":false}
-{"type":"newline","line":4,"col":1}
-{"type":"case","line":4,"col":5,"val":"friends"}
-{"type":"indent","line":5,"col":1,"val":6}
-{"type":"when","line":5,"col":7,"val":"0"}
-{"type":"indent","line":6,"col":1,"val":8}
-{"type":"tag","line":6,"col":9,"val":"p"}
-{"type":"text","line":6,"col":11,"val":"you have no friends"}
-{"type":"outdent","line":7,"col":7}
-{"type":"when","line":7,"col":7,"val":"1"}
-{"type":"indent","line":8,"col":1,"val":8}
-{"type":"tag","line":8,"col":9,"val":"p"}
-{"type":"text","line":8,"col":11,"val":"you have a friend"}
-{"type":"outdent","line":9,"col":7}
-{"type":"default","line":9,"col":7}
-{"type":"indent","line":10,"col":1,"val":8}
-{"type":"tag","line":10,"col":9,"val":"p"}
-{"type":"text","line":10,"col":11,"val":"you have "}
-{"type":"interpolated-code","line":10,"col":20,"val":"friends","mustEscape":true,"buffer":true}
-{"type":"text","line":10,"col":30,"val":" friends"}
-{"type":"outdent","line":10,"col":38}
-{"type":"outdent","line":10,"col":38}
-{"type":"outdent","line":10,"col":38}
-{"type":"outdent","line":10,"col":38}
-{"type":"eos","line":10,"col":38}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/case-blocks.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/case-blocks.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/case-blocks.pug","end":{"line":2,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/case-blocks.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"code","loc":{"start":{"line":3,"column":5},"filename":"/cases/case-blocks.pug","end":{"line":3,"column":22}},"val":"var friends = 1","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/case-blocks.pug","end":{"line":4,"column":5}}}
+{"type":"case","loc":{"start":{"line":4,"column":5},"filename":"/cases/case-blocks.pug","end":{"line":4,"column":17}},"val":"friends"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/case-blocks.pug","end":{"line":5,"column":7}},"val":6}
+{"type":"when","loc":{"start":{"line":5,"column":7},"filename":"/cases/case-blocks.pug","end":{"line":5,"column":13}},"val":"0"}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/case-blocks.pug","end":{"line":6,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":6,"column":9},"filename":"/cases/case-blocks.pug","end":{"line":6,"column":10}},"val":"p"}
+{"type":"text","loc":{"start":{"line":6,"column":11},"filename":"/cases/case-blocks.pug","end":{"line":6,"column":30}},"val":"you have no friends"}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/case-blocks.pug","end":{"line":7,"column":7}}}
+{"type":"when","loc":{"start":{"line":7,"column":7},"filename":"/cases/case-blocks.pug","end":{"line":7,"column":13}},"val":"1"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/case-blocks.pug","end":{"line":8,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":8,"column":9},"filename":"/cases/case-blocks.pug","end":{"line":8,"column":10}},"val":"p"}
+{"type":"text","loc":{"start":{"line":8,"column":11},"filename":"/cases/case-blocks.pug","end":{"line":8,"column":28}},"val":"you have a friend"}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/case-blocks.pug","end":{"line":9,"column":7}}}
+{"type":"default","loc":{"start":{"line":9,"column":7},"filename":"/cases/case-blocks.pug","end":{"line":9,"column":14}}}
+{"type":"indent","loc":{"start":{"line":10,"column":1},"filename":"/cases/case-blocks.pug","end":{"line":10,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":10,"column":9},"filename":"/cases/case-blocks.pug","end":{"line":10,"column":10}},"val":"p"}
+{"type":"text","loc":{"start":{"line":10,"column":11},"filename":"/cases/case-blocks.pug","end":{"line":10,"column":20}},"val":"you have "}
+{"type":"interpolated-code","loc":{"start":{"line":10,"column":20},"filename":"/cases/case-blocks.pug","end":{"line":10,"column":30}},"mustEscape":true,"buffer":true,"val":"friends"}
+{"type":"text","loc":{"start":{"line":10,"column":30},"filename":"/cases/case-blocks.pug","end":{"line":10,"column":38}},"val":" friends"}
+{"type":"outdent","loc":{"start":{"line":10,"column":38},"filename":"/cases/case-blocks.pug","end":{"line":10,"column":38}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":38},"filename":"/cases/case-blocks.pug","end":{"line":10,"column":38}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":38},"filename":"/cases/case-blocks.pug","end":{"line":10,"column":38}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":38},"filename":"/cases/case-blocks.pug","end":{"line":10,"column":38}}}
+{"type":"eos","loc":{"start":{"line":10,"column":38},"filename":"/cases/case-blocks.pug","end":{"line":10,"column":38}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/case.tokens.json b/packages/pug-parser/test/cases/case.tokens.json
index cbfdcb5fd..da7847e53 100644
--- a/packages/pug-parser/test/cases/case.tokens.json
+++ b/packages/pug-parser/test/cases/case.tokens.json
@@ -1,47 +1,61 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"code","line":3,"col":5,"val":"var friends = 1","mustEscape":false,"buffer":false}
-{"type":"newline","line":4,"col":1}
-{"type":"case","line":4,"col":5,"val":"friends"}
-{"type":"indent","line":5,"col":1,"val":6}
-{"type":"when","line":5,"col":7,"val":"0"}
-{"type":":","line":5,"col":13}
-{"type":"tag","line":5,"col":15,"val":"p"}
-{"type":"text","line":5,"col":17,"val":"you have no friends"}
-{"type":"newline","line":6,"col":1}
-{"type":"when","line":6,"col":7,"val":"1"}
-{"type":":","line":6,"col":13}
-{"type":"tag","line":6,"col":15,"val":"p"}
-{"type":"text","line":6,"col":17,"val":"you have a friend"}
-{"type":"newline","line":7,"col":1}
-{"type":"default","line":7,"col":7}
-{"type":":","line":7,"col":14}
-{"type":"tag","line":7,"col":16,"val":"p"}
-{"type":"text","line":7,"col":18,"val":"you have "}
-{"type":"interpolated-code","line":7,"col":27,"val":"friends","mustEscape":true,"buffer":true}
-{"type":"text","line":7,"col":37,"val":" friends"}
-{"type":"outdent","line":8,"col":5}
-{"type":"code","line":8,"col":5,"val":"var friends = 0","mustEscape":false,"buffer":false}
-{"type":"newline","line":9,"col":1}
-{"type":"case","line":9,"col":5,"val":"friends"}
-{"type":"indent","line":10,"col":1,"val":6}
-{"type":"when","line":10,"col":7,"val":"0"}
-{"type":"newline","line":11,"col":1}
-{"type":"when","line":11,"col":7,"val":"1"}
-{"type":"indent","line":12,"col":1,"val":8}
-{"type":"tag","line":12,"col":9,"val":"p"}
-{"type":"text","line":12,"col":11,"val":"you have very few friends"}
-{"type":"outdent","line":13,"col":7}
-{"type":"default","line":13,"col":7}
-{"type":"indent","line":14,"col":1,"val":8}
-{"type":"tag","line":14,"col":9,"val":"p"}
-{"type":"text","line":14,"col":11,"val":"you have "}
-{"type":"interpolated-code","line":14,"col":20,"val":"friends","mustEscape":true,"buffer":true}
-{"type":"text","line":14,"col":30,"val":" friends"}
-{"type":"outdent","line":14,"col":38}
-{"type":"outdent","line":14,"col":38}
-{"type":"outdent","line":14,"col":38}
-{"type":"outdent","line":14,"col":38}
-{"type":"eos","line":14,"col":38}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/case.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/case.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/case.pug","end":{"line":2,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/case.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"code","loc":{"start":{"line":3,"column":5},"filename":"/cases/case.pug","end":{"line":3,"column":22}},"val":"var friends = 1","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/case.pug","end":{"line":4,"column":5}}}
+{"type":"case","loc":{"start":{"line":4,"column":5},"filename":"/cases/case.pug","end":{"line":4,"column":17}},"val":"friends"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/case.pug","end":{"line":5,"column":7}},"val":6}
+{"type":"when","loc":{"start":{"line":5,"column":7},"filename":"/cases/case.pug","end":{"line":5,"column":13}},"val":"0"}
+{"type":":","loc":{"start":{"line":5,"column":13},"filename":"/cases/case.pug","end":{"line":5,"column":15}}}
+{"type":"tag","loc":{"start":{"line":5,"column":15},"filename":"/cases/case.pug","end":{"line":5,"column":16}},"val":"p"}
+{"type":"text","loc":{"start":{"line":5,"column":17},"filename":"/cases/case.pug","end":{"line":5,"column":36}},"val":"you have no friends"}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/case.pug","end":{"line":6,"column":7}}}
+{"type":"when","loc":{"start":{"line":6,"column":7},"filename":"/cases/case.pug","end":{"line":6,"column":13}},"val":"1"}
+{"type":":","loc":{"start":{"line":6,"column":13},"filename":"/cases/case.pug","end":{"line":6,"column":15}}}
+{"type":"tag","loc":{"start":{"line":6,"column":15},"filename":"/cases/case.pug","end":{"line":6,"column":16}},"val":"p"}
+{"type":"text","loc":{"start":{"line":6,"column":17},"filename":"/cases/case.pug","end":{"line":6,"column":34}},"val":"you have a friend"}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/case.pug","end":{"line":7,"column":7}}}
+{"type":"default","loc":{"start":{"line":7,"column":7},"filename":"/cases/case.pug","end":{"line":7,"column":14}}}
+{"type":":","loc":{"start":{"line":7,"column":14},"filename":"/cases/case.pug","end":{"line":7,"column":16}}}
+{"type":"tag","loc":{"start":{"line":7,"column":16},"filename":"/cases/case.pug","end":{"line":7,"column":17}},"val":"p"}
+{"type":"text","loc":{"start":{"line":7,"column":18},"filename":"/cases/case.pug","end":{"line":7,"column":27}},"val":"you have "}
+{"type":"interpolated-code","loc":{"start":{"line":7,"column":27},"filename":"/cases/case.pug","end":{"line":7,"column":37}},"mustEscape":true,"buffer":true,"val":"friends"}
+{"type":"text","loc":{"start":{"line":7,"column":37},"filename":"/cases/case.pug","end":{"line":7,"column":45}},"val":" friends"}
+{"type":"outdent","loc":{"start":{"line":8,"column":1},"filename":"/cases/case.pug","end":{"line":8,"column":5}}}
+{"type":"code","loc":{"start":{"line":8,"column":5},"filename":"/cases/case.pug","end":{"line":8,"column":22}},"val":"var friends = 0","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/case.pug","end":{"line":9,"column":5}}}
+{"type":"case","loc":{"start":{"line":9,"column":5},"filename":"/cases/case.pug","end":{"line":9,"column":17}},"val":"friends"}
+{"type":"indent","loc":{"start":{"line":10,"column":1},"filename":"/cases/case.pug","end":{"line":10,"column":7}},"val":6}
+{"type":"when","loc":{"start":{"line":10,"column":7},"filename":"/cases/case.pug","end":{"line":10,"column":13}},"val":"0"}
+{"type":"newline","loc":{"start":{"line":11,"column":1},"filename":"/cases/case.pug","end":{"line":11,"column":7}}}
+{"type":"when","loc":{"start":{"line":11,"column":7},"filename":"/cases/case.pug","end":{"line":11,"column":13}},"val":"1"}
+{"type":"indent","loc":{"start":{"line":12,"column":1},"filename":"/cases/case.pug","end":{"line":12,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":12,"column":9},"filename":"/cases/case.pug","end":{"line":12,"column":10}},"val":"p"}
+{"type":"text","loc":{"start":{"line":12,"column":11},"filename":"/cases/case.pug","end":{"line":12,"column":36}},"val":"you have very few friends"}
+{"type":"outdent","loc":{"start":{"line":13,"column":1},"filename":"/cases/case.pug","end":{"line":13,"column":7}}}
+{"type":"default","loc":{"start":{"line":13,"column":7},"filename":"/cases/case.pug","end":{"line":13,"column":14}}}
+{"type":"indent","loc":{"start":{"line":14,"column":1},"filename":"/cases/case.pug","end":{"line":14,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":14,"column":9},"filename":"/cases/case.pug","end":{"line":14,"column":10}},"val":"p"}
+{"type":"text","loc":{"start":{"line":14,"column":11},"filename":"/cases/case.pug","end":{"line":14,"column":20}},"val":"you have "}
+{"type":"interpolated-code","loc":{"start":{"line":14,"column":20},"filename":"/cases/case.pug","end":{"line":14,"column":30}},"mustEscape":true,"buffer":true,"val":"friends"}
+{"type":"text","loc":{"start":{"line":14,"column":30},"filename":"/cases/case.pug","end":{"line":14,"column":38}},"val":" friends"}
+{"type":"outdent","loc":{"start":{"line":16,"column":1},"filename":"/cases/case.pug","end":{"line":16,"column":5}}}
+{"type":"outdent","loc":{"start":{"line":16,"column":1},"filename":"/cases/case.pug","end":{"line":16,"column":5}}}
+{"type":"code","loc":{"start":{"line":16,"column":5},"filename":"/cases/case.pug","end":{"line":16,"column":27}},"val":"var friend = 'Tim:G'","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":17,"column":1},"filename":"/cases/case.pug","end":{"line":17,"column":5}}}
+{"type":"case","loc":{"start":{"line":17,"column":5},"filename":"/cases/case.pug","end":{"line":17,"column":16}},"val":"friend"}
+{"type":"indent","loc":{"start":{"line":18,"column":1},"filename":"/cases/case.pug","end":{"line":18,"column":7}},"val":6}
+{"type":"when","loc":{"start":{"line":18,"column":7},"filename":"/cases/case.pug","end":{"line":18,"column":19}},"val":"'Tim:G'"}
+{"type":":","loc":{"start":{"line":18,"column":19},"filename":"/cases/case.pug","end":{"line":18,"column":24}}}
+{"type":"tag","loc":{"start":{"line":18,"column":24},"filename":"/cases/case.pug","end":{"line":18,"column":25}},"val":"p"}
+{"type":"text","loc":{"start":{"line":18,"column":26},"filename":"/cases/case.pug","end":{"line":18,"column":44}},"val":"Friend is a string"}
+{"type":"newline","loc":{"start":{"line":19,"column":1},"filename":"/cases/case.pug","end":{"line":19,"column":7}}}
+{"type":"when","loc":{"start":{"line":19,"column":7},"filename":"/cases/case.pug","end":{"line":19,"column":22}},"val":"{tim: 'g'}"}
+{"type":":","loc":{"start":{"line":19,"column":22},"filename":"/cases/case.pug","end":{"line":19,"column":24}}}
+{"type":"tag","loc":{"start":{"line":19,"column":24},"filename":"/cases/case.pug","end":{"line":19,"column":25}},"val":"p"}
+{"type":"text","loc":{"start":{"line":19,"column":26},"filename":"/cases/case.pug","end":{"line":19,"column":45}},"val":"Friend is an object"}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/case.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/case.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/case.pug","end":{"line":20,"column":1}}}
+{"type":"eos","loc":{"start":{"line":20,"column":1},"filename":"/cases/case.pug","end":{"line":20,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/classes-empty.tokens.json b/packages/pug-parser/test/cases/classes-empty.tokens.json
index b470ebcda..1e9fe573b 100644
--- a/packages/pug-parser/test/cases/classes-empty.tokens.json
+++ b/packages/pug-parser/test/cases/classes-empty.tokens.json
@@ -1,15 +1,15 @@
-{"type":"tag","line":1,"col":1,"val":"a"}
-{"type":"start-attributes","line":1,"col":2}
-{"type":"attribute","line":1,"col":3,"name":"class","val":"''","mustEscape":true}
-{"type":"end-attributes","line":1,"col":11}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"a"}
-{"type":"start-attributes","line":2,"col":2}
-{"type":"attribute","line":2,"col":3,"name":"class","val":"null","mustEscape":true}
-{"type":"end-attributes","line":2,"col":13}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"a"}
-{"type":"start-attributes","line":3,"col":2}
-{"type":"attribute","line":3,"col":3,"name":"class","val":"undefined","mustEscape":true}
-{"type":"end-attributes","line":3,"col":18}
-{"type":"eos","line":3,"col":19}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/classes-empty.pug","end":{"line":1,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":1,"column":2},"filename":"/cases/classes-empty.pug","end":{"line":1,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":1,"column":3},"filename":"/cases/classes-empty.pug","end":{"line":1,"column":11}},"name":"class","mustEscape":true,"val":"''"}
+{"type":"end-attributes","loc":{"start":{"line":1,"column":11},"filename":"/cases/classes-empty.pug","end":{"line":1,"column":12}}}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/classes-empty.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/classes-empty.pug","end":{"line":2,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":2},"filename":"/cases/classes-empty.pug","end":{"line":2,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":3},"filename":"/cases/classes-empty.pug","end":{"line":2,"column":13}},"name":"class","mustEscape":true,"val":"null"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":13},"filename":"/cases/classes-empty.pug","end":{"line":2,"column":14}}}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/classes-empty.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/classes-empty.pug","end":{"line":3,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":2},"filename":"/cases/classes-empty.pug","end":{"line":3,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":3},"filename":"/cases/classes-empty.pug","end":{"line":3,"column":18}},"name":"class","mustEscape":true,"val":"undefined"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":18},"filename":"/cases/classes-empty.pug","end":{"line":3,"column":19}}}
+{"type":"eos","loc":{"start":{"line":3,"column":19},"filename":"/cases/classes-empty.pug","end":{"line":3,"column":19}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/classes.tokens.json b/packages/pug-parser/test/cases/classes.tokens.json
index df6b13055..e5fc7ee0a 100644
--- a/packages/pug-parser/test/cases/classes.tokens.json
+++ b/packages/pug-parser/test/cases/classes.tokens.json
@@ -1,21 +1,27 @@
-{"type":"tag","line":1,"col":1,"val":"a"}
-{"type":"start-attributes","line":1,"col":2}
-{"type":"attribute","line":1,"col":3,"name":"class","val":"['foo', 'bar', 'baz']","mustEscape":true}
-{"type":"end-attributes","line":1,"col":30}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":1,"val":"a"}
-{"type":"class","line":5,"col":2,"val":"foo"}
-{"type":"start-attributes","line":5,"col":6}
-{"type":"attribute","line":5,"col":7,"name":"class","val":"'bar'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":18}
-{"type":"class","line":5,"col":19,"val":"baz"}
-{"type":"newline","line":9,"col":1}
-{"type":"tag","line":9,"col":1,"val":"a"}
-{"type":"class","line":9,"col":2,"val":"foo-bar_baz"}
-{"type":"newline","line":11,"col":1}
-{"type":"tag","line":11,"col":1,"val":"a"}
-{"type":"start-attributes","line":11,"col":2}
-{"type":"attribute","line":11,"col":3,"name":"class","val":"{foo: true, bar: false, baz: true}","mustEscape":true}
-{"type":"end-attributes","line":11,"col":43}
-{"type":"newline","line":12,"col":1}
-{"type":"eos","line":12,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/classes.pug","end":{"line":1,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":1,"column":2},"filename":"/cases/classes.pug","end":{"line":1,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":1,"column":3},"filename":"/cases/classes.pug","end":{"line":1,"column":30}},"name":"class","mustEscape":true,"val":"['foo', 'bar', 'baz']"}
+{"type":"end-attributes","loc":{"start":{"line":1,"column":30},"filename":"/cases/classes.pug","end":{"line":1,"column":31}}}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/classes.pug","end":{"line":5,"column":1}}}
+{"type":"tag","loc":{"start":{"line":5,"column":1},"filename":"/cases/classes.pug","end":{"line":5,"column":2}},"val":"a"}
+{"type":"class","loc":{"start":{"line":5,"column":2},"filename":"/cases/classes.pug","end":{"line":5,"column":6}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":6},"filename":"/cases/classes.pug","end":{"line":5,"column":7}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":7},"filename":"/cases/classes.pug","end":{"line":5,"column":18}},"name":"class","mustEscape":true,"val":"'bar'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":18},"filename":"/cases/classes.pug","end":{"line":5,"column":19}}}
+{"type":"class","loc":{"start":{"line":5,"column":19},"filename":"/cases/classes.pug","end":{"line":5,"column":23}},"val":"baz"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/classes.pug","end":{"line":9,"column":1}}}
+{"type":"tag","loc":{"start":{"line":9,"column":1},"filename":"/cases/classes.pug","end":{"line":9,"column":2}},"val":"a"}
+{"type":"class","loc":{"start":{"line":9,"column":2},"filename":"/cases/classes.pug","end":{"line":9,"column":14}},"val":"foo-bar_baz"}
+{"type":"newline","loc":{"start":{"line":11,"column":1},"filename":"/cases/classes.pug","end":{"line":11,"column":1}}}
+{"type":"tag","loc":{"start":{"line":11,"column":1},"filename":"/cases/classes.pug","end":{"line":11,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":11,"column":2},"filename":"/cases/classes.pug","end":{"line":11,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":11,"column":3},"filename":"/cases/classes.pug","end":{"line":11,"column":43}},"name":"class","mustEscape":true,"val":"{foo: true, bar: false, baz: true}"}
+{"type":"end-attributes","loc":{"start":{"line":11,"column":43},"filename":"/cases/classes.pug","end":{"line":11,"column":44}}}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/classes.pug","end":{"line":13,"column":1}}}
+{"type":"tag","loc":{"start":{"line":13,"column":1},"filename":"/cases/classes.pug","end":{"line":13,"column":2}},"val":"a"}
+{"type":"class","loc":{"start":{"line":13,"column":2},"filename":"/cases/classes.pug","end":{"line":13,"column":7}},"val":"-foo"}
+{"type":"newline","loc":{"start":{"line":14,"column":1},"filename":"/cases/classes.pug","end":{"line":14,"column":1}}}
+{"type":"tag","loc":{"start":{"line":14,"column":1},"filename":"/cases/classes.pug","end":{"line":14,"column":2}},"val":"a"}
+{"type":"class","loc":{"start":{"line":14,"column":2},"filename":"/cases/classes.pug","end":{"line":14,"column":7}},"val":"3foo"}
+{"type":"newline","loc":{"start":{"line":15,"column":1},"filename":"/cases/classes.pug","end":{"line":15,"column":1}}}
+{"type":"eos","loc":{"start":{"line":15,"column":1},"filename":"/cases/classes.pug","end":{"line":15,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/code.conditionals.tokens.json b/packages/pug-parser/test/cases/code.conditionals.tokens.json
index 6136ca8fa..9f9d21b7b 100644
--- a/packages/pug-parser/test/cases/code.conditionals.tokens.json
+++ b/packages/pug-parser/test/cases/code.conditionals.tokens.json
@@ -1,86 +1,86 @@
-{"type":"newline","line":2,"col":1}
-{"type":"code","line":2,"col":1,"val":"if (true)","mustEscape":false,"buffer":false}
-{"type":"indent","line":3,"col":1,"val":2}
-{"type":"tag","line":3,"col":3,"val":"p"}
-{"type":"text","line":3,"col":5,"val":"foo"}
-{"type":"outdent","line":4,"col":1}
-{"type":"code","line":4,"col":1,"val":"else","mustEscape":false,"buffer":false}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"tag","line":5,"col":3,"val":"p"}
-{"type":"text","line":5,"col":5,"val":"bar"}
-{"type":"outdent","line":7,"col":1}
-{"type":"code","line":7,"col":1,"val":"if (true) {","mustEscape":false,"buffer":false}
-{"type":"indent","line":8,"col":1,"val":2}
-{"type":"tag","line":8,"col":3,"val":"p"}
-{"type":"text","line":8,"col":5,"val":"foo"}
-{"type":"outdent","line":9,"col":1}
-{"type":"code","line":9,"col":1,"val":"} else {","mustEscape":false,"buffer":false}
-{"type":"indent","line":10,"col":1,"val":2}
-{"type":"tag","line":10,"col":3,"val":"p"}
-{"type":"text","line":10,"col":5,"val":"bar"}
-{"type":"outdent","line":11,"col":1}
-{"type":"code","line":11,"col":1,"val":"}","mustEscape":false,"buffer":false}
-{"type":"newline","line":13,"col":1}
-{"type":"if","line":13,"col":1,"val":"true"}
-{"type":"indent","line":14,"col":1,"val":2}
-{"type":"tag","line":14,"col":3,"val":"p"}
-{"type":"text","line":14,"col":5,"val":"foo"}
-{"type":"newline","line":15,"col":1}
-{"type":"tag","line":15,"col":3,"val":"p"}
-{"type":"text","line":15,"col":5,"val":"bar"}
-{"type":"newline","line":16,"col":1}
-{"type":"tag","line":16,"col":3,"val":"p"}
-{"type":"text","line":16,"col":5,"val":"baz"}
-{"type":"outdent","line":17,"col":1}
-{"type":"else","line":17,"col":1,"val":""}
-{"type":"indent","line":18,"col":1,"val":2}
-{"type":"tag","line":18,"col":3,"val":"p"}
-{"type":"text","line":18,"col":5,"val":"bar"}
-{"type":"outdent","line":20,"col":1}
-{"type":"if","line":20,"col":1,"val":"!(true)"}
-{"type":"indent","line":21,"col":1,"val":2}
-{"type":"tag","line":21,"col":3,"val":"p"}
-{"type":"text","line":21,"col":5,"val":"foo"}
-{"type":"outdent","line":22,"col":1}
-{"type":"else","line":22,"col":1,"val":""}
-{"type":"indent","line":23,"col":1,"val":2}
-{"type":"tag","line":23,"col":3,"val":"p"}
-{"type":"text","line":23,"col":5,"val":"bar"}
-{"type":"outdent","line":25,"col":1}
-{"type":"if","line":25,"col":1,"val":"'nested'"}
-{"type":"indent","line":26,"col":1,"val":2}
-{"type":"if","line":26,"col":3,"val":"'works'"}
-{"type":"indent","line":27,"col":1,"val":4}
-{"type":"tag","line":27,"col":5,"val":"p"}
-{"type":"text","line":27,"col":7,"val":"yay"}
-{"type":"outdent","line":29,"col":3}
-{"type":"outdent","line":29,"col":1}
-{"type":"comment","line":29,"col":1,"val":" allow empty blocks","buffer":false}
-{"type":"newline","line":30,"col":1}
-{"type":"if","line":30,"col":1,"val":"false"}
-{"type":"newline","line":31,"col":1}
-{"type":"else","line":31,"col":1,"val":""}
-{"type":"indent","line":32,"col":1,"val":2}
-{"type":"class","line":32,"col":3,"val":"bar"}
-{"type":"outdent","line":33,"col":1}
-{"type":"if","line":33,"col":1,"val":"true"}
-{"type":"indent","line":34,"col":1,"val":2}
-{"type":"class","line":34,"col":3,"val":"bar"}
-{"type":"outdent","line":35,"col":1}
-{"type":"else","line":35,"col":1,"val":""}
-{"type":"newline","line":36,"col":1}
-{"type":"class","line":36,"col":1,"val":"bing"}
-{"type":"newline","line":38,"col":1}
-{"type":"if","line":38,"col":1,"val":"false"}
-{"type":"indent","line":39,"col":1,"val":2}
-{"type":"class","line":39,"col":3,"val":"bing"}
-{"type":"outdent","line":40,"col":1}
-{"type":"else-if","line":40,"col":1,"val":"false"}
-{"type":"indent","line":41,"col":1,"val":2}
-{"type":"class","line":41,"col":3,"val":"bar"}
-{"type":"outdent","line":42,"col":1}
-{"type":"else","line":42,"col":1,"val":""}
-{"type":"indent","line":43,"col":1,"val":2}
-{"type":"class","line":43,"col":3,"val":"foo"}
-{"type":"outdent","line":43,"col":7}
-{"type":"eos","line":43,"col":7}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":2,"column":1}}}
+{"type":"code","loc":{"start":{"line":2,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":2,"column":12}},"val":"if (true)","mustEscape":false,"buffer":false}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":3,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":3,"column":5},"filename":"/cases/code.conditionals.pug","end":{"line":3,"column":8}},"val":"foo"}
+{"type":"outdent","loc":{"start":{"line":4,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":4,"column":1}}}
+{"type":"code","loc":{"start":{"line":4,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":4,"column":7}},"val":"else","mustEscape":false,"buffer":false}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":5,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":5,"column":5},"filename":"/cases/code.conditionals.pug","end":{"line":5,"column":8}},"val":"bar"}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":7,"column":1}}}
+{"type":"code","loc":{"start":{"line":7,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":7,"column":14}},"val":"if (true) {","mustEscape":false,"buffer":false}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":8,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":8,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":8,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":8,"column":5},"filename":"/cases/code.conditionals.pug","end":{"line":8,"column":8}},"val":"foo"}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":9,"column":1}}}
+{"type":"code","loc":{"start":{"line":9,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":9,"column":11}},"val":"} else {","mustEscape":false,"buffer":false}
+{"type":"indent","loc":{"start":{"line":10,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":10,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":10,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":10,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":10,"column":5},"filename":"/cases/code.conditionals.pug","end":{"line":10,"column":8}},"val":"bar"}
+{"type":"outdent","loc":{"start":{"line":11,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":11,"column":1}}}
+{"type":"code","loc":{"start":{"line":11,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":11,"column":4}},"val":"}","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":13,"column":1}}}
+{"type":"if","loc":{"start":{"line":13,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":13,"column":8}},"val":"true"}
+{"type":"indent","loc":{"start":{"line":14,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":14,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":14,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":14,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":14,"column":5},"filename":"/cases/code.conditionals.pug","end":{"line":14,"column":8}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":15,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":15,"column":3}}}
+{"type":"tag","loc":{"start":{"line":15,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":15,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":15,"column":5},"filename":"/cases/code.conditionals.pug","end":{"line":15,"column":8}},"val":"bar"}
+{"type":"newline","loc":{"start":{"line":16,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":16,"column":3}}}
+{"type":"tag","loc":{"start":{"line":16,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":16,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":16,"column":5},"filename":"/cases/code.conditionals.pug","end":{"line":16,"column":8}},"val":"baz"}
+{"type":"outdent","loc":{"start":{"line":17,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":17,"column":1}}}
+{"type":"else","loc":{"start":{"line":17,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":17,"column":5}},"val":""}
+{"type":"indent","loc":{"start":{"line":18,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":18,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":18,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":18,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":18,"column":5},"filename":"/cases/code.conditionals.pug","end":{"line":18,"column":8}},"val":"bar"}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":20,"column":1}}}
+{"type":"if","loc":{"start":{"line":20,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":20,"column":12}},"val":"!(true)"}
+{"type":"indent","loc":{"start":{"line":21,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":21,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":21,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":21,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":21,"column":5},"filename":"/cases/code.conditionals.pug","end":{"line":21,"column":8}},"val":"foo"}
+{"type":"outdent","loc":{"start":{"line":22,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":22,"column":1}}}
+{"type":"else","loc":{"start":{"line":22,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":22,"column":5}},"val":""}
+{"type":"indent","loc":{"start":{"line":23,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":23,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":23,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":23,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":23,"column":5},"filename":"/cases/code.conditionals.pug","end":{"line":23,"column":8}},"val":"bar"}
+{"type":"outdent","loc":{"start":{"line":25,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":25,"column":1}}}
+{"type":"if","loc":{"start":{"line":25,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":25,"column":12}},"val":"'nested'"}
+{"type":"indent","loc":{"start":{"line":26,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":26,"column":3}},"val":2}
+{"type":"if","loc":{"start":{"line":26,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":26,"column":13}},"val":"'works'"}
+{"type":"indent","loc":{"start":{"line":27,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":27,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":27,"column":5},"filename":"/cases/code.conditionals.pug","end":{"line":27,"column":6}},"val":"p"}
+{"type":"text","loc":{"start":{"line":27,"column":7},"filename":"/cases/code.conditionals.pug","end":{"line":27,"column":10}},"val":"yay"}
+{"type":"outdent","loc":{"start":{"line":29,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":29,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":29,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":29,"column":1}}}
+{"type":"comment","loc":{"start":{"line":29,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":29,"column":23}},"val":" allow empty blocks","buffer":false}
+{"type":"newline","loc":{"start":{"line":30,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":30,"column":1}}}
+{"type":"if","loc":{"start":{"line":30,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":30,"column":9}},"val":"false"}
+{"type":"newline","loc":{"start":{"line":31,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":31,"column":1}}}
+{"type":"else","loc":{"start":{"line":31,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":31,"column":5}},"val":""}
+{"type":"indent","loc":{"start":{"line":32,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":32,"column":3}},"val":2}
+{"type":"class","loc":{"start":{"line":32,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":32,"column":7}},"val":"bar"}
+{"type":"outdent","loc":{"start":{"line":33,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":33,"column":1}}}
+{"type":"if","loc":{"start":{"line":33,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":33,"column":8}},"val":"true"}
+{"type":"indent","loc":{"start":{"line":34,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":34,"column":3}},"val":2}
+{"type":"class","loc":{"start":{"line":34,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":34,"column":7}},"val":"bar"}
+{"type":"outdent","loc":{"start":{"line":35,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":35,"column":1}}}
+{"type":"else","loc":{"start":{"line":35,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":35,"column":5}},"val":""}
+{"type":"newline","loc":{"start":{"line":36,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":36,"column":1}}}
+{"type":"class","loc":{"start":{"line":36,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":36,"column":6}},"val":"bing"}
+{"type":"newline","loc":{"start":{"line":38,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":38,"column":1}}}
+{"type":"if","loc":{"start":{"line":38,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":38,"column":9}},"val":"false"}
+{"type":"indent","loc":{"start":{"line":39,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":39,"column":3}},"val":2}
+{"type":"class","loc":{"start":{"line":39,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":39,"column":8}},"val":"bing"}
+{"type":"outdent","loc":{"start":{"line":40,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":40,"column":1}}}
+{"type":"else-if","loc":{"start":{"line":40,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":40,"column":14}},"val":"false"}
+{"type":"indent","loc":{"start":{"line":41,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":41,"column":3}},"val":2}
+{"type":"class","loc":{"start":{"line":41,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":41,"column":7}},"val":"bar"}
+{"type":"outdent","loc":{"start":{"line":42,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":42,"column":1}}}
+{"type":"else","loc":{"start":{"line":42,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":42,"column":5}},"val":""}
+{"type":"indent","loc":{"start":{"line":43,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":43,"column":3}},"val":2}
+{"type":"class","loc":{"start":{"line":43,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":43,"column":7}},"val":"foo"}
+{"type":"outdent","loc":{"start":{"line":43,"column":7},"filename":"/cases/code.conditionals.pug","end":{"line":43,"column":7}}}
+{"type":"eos","loc":{"start":{"line":43,"column":7},"filename":"/cases/code.conditionals.pug","end":{"line":43,"column":7}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/code.escape.tokens.json b/packages/pug-parser/test/cases/code.escape.tokens.json
index 4aebd6658..45fee43f0 100644
--- a/packages/pug-parser/test/cases/code.escape.tokens.json
+++ b/packages/pug-parser/test/cases/code.escape.tokens.json
@@ -1,6 +1,6 @@
-{"type":"tag","line":1,"col":1,"val":"p"}
-{"type":"code","line":1,"col":2,"val":"'<script>'","mustEscape":true,"buffer":true}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"p"}
-{"type":"code","line":2,"col":2,"val":"'<script>'","mustEscape":false,"buffer":true}
-{"type":"eos","line":2,"col":15}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/code.escape.pug","end":{"line":1,"column":2}},"val":"p"}
+{"type":"code","loc":{"start":{"line":1,"column":2},"filename":"/cases/code.escape.pug","end":{"line":1,"column":14}},"val":"'<script>'","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/code.escape.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/code.escape.pug","end":{"line":2,"column":2}},"val":"p"}
+{"type":"code","loc":{"start":{"line":2,"column":2},"filename":"/cases/code.escape.pug","end":{"line":2,"column":15}},"val":"'<script>'","mustEscape":false,"buffer":true}
+{"type":"eos","loc":{"start":{"line":2,"column":15},"filename":"/cases/code.escape.pug","end":{"line":2,"column":15}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/code.iteration.tokens.json b/packages/pug-parser/test/cases/code.iteration.tokens.json
index d1eb6970a..d5a4c6fd2 100644
--- a/packages/pug-parser/test/cases/code.iteration.tokens.json
+++ b/packages/pug-parser/test/cases/code.iteration.tokens.json
@@ -1,71 +1,71 @@
-{"type":"newline","line":2,"col":1}
-{"type":"code","line":2,"col":1,"val":"var items = [1,2,3]","mustEscape":false,"buffer":false}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":1,"val":"ul"}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"code","line":5,"col":3,"val":"items.forEach(function(item){","mustEscape":false,"buffer":false}
-{"type":"indent","line":6,"col":1,"val":4}
-{"type":"tag","line":6,"col":5,"val":"li"}
-{"type":"code","line":6,"col":7,"val":"item","mustEscape":true,"buffer":true}
-{"type":"outdent","line":7,"col":3}
-{"type":"code","line":7,"col":3,"val":"})","mustEscape":false,"buffer":false}
-{"type":"outdent","line":9,"col":1}
-{"type":"code","line":9,"col":1,"val":"var items = [1,2,3]","mustEscape":false,"buffer":false}
-{"type":"newline","line":11,"col":1}
-{"type":"tag","line":11,"col":1,"val":"ul"}
-{"type":"indent","line":12,"col":1,"val":2}
-{"type":"each","line":12,"col":3,"val":"item","key":"i","code":"items"}
-{"type":"indent","line":13,"col":1,"val":4}
-{"type":"tag","line":13,"col":5,"val":"li"}
-{"type":"start-attributes","line":13,"col":7}
-{"type":"attribute","line":13,"col":8,"name":"class","val":"'item-' + i","mustEscape":true}
-{"type":"end-attributes","line":13,"col":25}
-{"type":"code","line":13,"col":26,"val":"item","mustEscape":true,"buffer":true}
-{"type":"outdent","line":15,"col":3}
-{"type":"outdent","line":15,"col":1}
-{"type":"tag","line":15,"col":1,"val":"ul"}
-{"type":"indent","line":16,"col":1,"val":2}
-{"type":"each","line":16,"col":3,"val":"item","key":"i","code":"items"}
-{"type":"indent","line":17,"col":1,"val":4}
-{"type":"tag","line":17,"col":5,"val":"li"}
-{"type":"code","line":17,"col":7,"val":"item","mustEscape":true,"buffer":true}
-{"type":"outdent","line":19,"col":3}
-{"type":"outdent","line":19,"col":1}
-{"type":"tag","line":19,"col":1,"val":"ul"}
-{"type":"indent","line":20,"col":1,"val":2}
-{"type":"each","line":20,"col":3,"val":"$item","key":null,"code":"items"}
-{"type":"indent","line":21,"col":1,"val":4}
-{"type":"tag","line":21,"col":5,"val":"li"}
-{"type":"code","line":21,"col":7,"val":"$item","mustEscape":true,"buffer":true}
-{"type":"outdent","line":23,"col":3}
-{"type":"outdent","line":23,"col":1}
-{"type":"code","line":23,"col":1,"val":"var nums = [1, 2, 3]","mustEscape":false,"buffer":false}
-{"type":"newline","line":24,"col":1}
-{"type":"code","line":24,"col":1,"val":"var letters = ['a', 'b', 'c']","mustEscape":false,"buffer":false}
-{"type":"newline","line":26,"col":1}
-{"type":"tag","line":26,"col":1,"val":"ul"}
-{"type":"indent","line":27,"col":1,"val":2}
-{"type":"each","line":27,"col":3,"val":"l","key":null,"code":"letters"}
-{"type":"indent","line":28,"col":1,"val":4}
-{"type":"each","line":28,"col":5,"val":"n","key":null,"code":"nums"}
-{"type":"indent","line":29,"col":1,"val":6}
-{"type":"tag","line":29,"col":7,"val":"li"}
-{"type":"interpolated-code","line":29,"col":10,"val":"n","mustEscape":true,"buffer":true}
-{"type":"text","line":29,"col":14,"val":": "}
-{"type":"interpolated-code","line":29,"col":16,"val":"l","mustEscape":true,"buffer":true}
-{"type":"outdent","line":31,"col":5}
-{"type":"outdent","line":31,"col":3}
-{"type":"outdent","line":31,"col":1}
-{"type":"code","line":31,"col":1,"val":"var count = 1","mustEscape":false,"buffer":false}
-{"type":"newline","line":32,"col":1}
-{"type":"code","line":32,"col":1,"val":"var counter = function() { return [count++, count++, count++] }","mustEscape":false,"buffer":false}
-{"type":"newline","line":33,"col":1}
-{"type":"tag","line":33,"col":1,"val":"ul"}
-{"type":"indent","line":34,"col":1,"val":2}
-{"type":"each","line":34,"col":3,"val":"n","key":null,"code":"counter()"}
-{"type":"indent","line":35,"col":1,"val":4}
-{"type":"tag","line":35,"col":5,"val":"li"}
-{"type":"interpolated-code","line":35,"col":8,"val":"n","mustEscape":true,"buffer":true}
-{"type":"outdent","line":36,"col":3}
-{"type":"outdent","line":36,"col":1}
-{"type":"eos","line":36,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":2,"column":1}}}
+{"type":"code","loc":{"start":{"line":2,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":2,"column":22}},"val":"var items = [1,2,3]","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":4,"column":1}}}
+{"type":"tag","loc":{"start":{"line":4,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":4,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"code","loc":{"start":{"line":5,"column":3},"filename":"/cases/code.iteration.pug","end":{"line":5,"column":34}},"val":"items.forEach(function(item){","mustEscape":false,"buffer":false}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":6,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":6,"column":5},"filename":"/cases/code.iteration.pug","end":{"line":6,"column":7}},"val":"li"}
+{"type":"code","loc":{"start":{"line":6,"column":7},"filename":"/cases/code.iteration.pug","end":{"line":6,"column":13}},"val":"item","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":7,"column":3}}}
+{"type":"code","loc":{"start":{"line":7,"column":3},"filename":"/cases/code.iteration.pug","end":{"line":7,"column":7}},"val":"})","mustEscape":false,"buffer":false}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":9,"column":1}}}
+{"type":"code","loc":{"start":{"line":9,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":9,"column":22}},"val":"var items = [1,2,3]","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":11,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":11,"column":1}}}
+{"type":"tag","loc":{"start":{"line":11,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":11,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":12,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":12,"column":3}},"val":2}
+{"type":"each","loc":{"start":{"line":12,"column":3},"filename":"/cases/code.iteration.pug","end":{"line":12,"column":23}},"val":"item","key":"i","code":"items"}
+{"type":"indent","loc":{"start":{"line":13,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":13,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":13,"column":5},"filename":"/cases/code.iteration.pug","end":{"line":13,"column":7}},"val":"li"}
+{"type":"start-attributes","loc":{"start":{"line":13,"column":7},"filename":"/cases/code.iteration.pug","end":{"line":13,"column":8}}}
+{"type":"attribute","loc":{"start":{"line":13,"column":8},"filename":"/cases/code.iteration.pug","end":{"line":13,"column":25}},"name":"class","mustEscape":true,"val":"'item-' + i"}
+{"type":"end-attributes","loc":{"start":{"line":13,"column":25},"filename":"/cases/code.iteration.pug","end":{"line":13,"column":26}}}
+{"type":"code","loc":{"start":{"line":13,"column":26},"filename":"/cases/code.iteration.pug","end":{"line":13,"column":32}},"val":"item","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":15,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":15,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":15,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":15,"column":1}}}
+{"type":"tag","loc":{"start":{"line":15,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":15,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":16,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":16,"column":3}},"val":2}
+{"type":"each","loc":{"start":{"line":16,"column":3},"filename":"/cases/code.iteration.pug","end":{"line":16,"column":24}},"val":"item","key":"i","code":"items"}
+{"type":"indent","loc":{"start":{"line":17,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":17,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":17,"column":5},"filename":"/cases/code.iteration.pug","end":{"line":17,"column":7}},"val":"li"}
+{"type":"code","loc":{"start":{"line":17,"column":7},"filename":"/cases/code.iteration.pug","end":{"line":17,"column":13}},"val":"item","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":19,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":19,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":19,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":19,"column":1}}}
+{"type":"tag","loc":{"start":{"line":19,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":19,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":20,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":20,"column":3}},"val":2}
+{"type":"each","loc":{"start":{"line":20,"column":3},"filename":"/cases/code.iteration.pug","end":{"line":20,"column":22}},"val":"$item","key":null,"code":"items"}
+{"type":"indent","loc":{"start":{"line":21,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":21,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":21,"column":5},"filename":"/cases/code.iteration.pug","end":{"line":21,"column":7}},"val":"li"}
+{"type":"code","loc":{"start":{"line":21,"column":7},"filename":"/cases/code.iteration.pug","end":{"line":21,"column":14}},"val":"$item","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":23,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":23,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":23,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":23,"column":1}}}
+{"type":"code","loc":{"start":{"line":23,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":23,"column":23}},"val":"var nums = [1, 2, 3]","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":24,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":24,"column":1}}}
+{"type":"code","loc":{"start":{"line":24,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":24,"column":32}},"val":"var letters = ['a', 'b', 'c']","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":26,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":26,"column":1}}}
+{"type":"tag","loc":{"start":{"line":26,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":26,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":27,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":27,"column":3}},"val":2}
+{"type":"each","loc":{"start":{"line":27,"column":3},"filename":"/cases/code.iteration.pug","end":{"line":27,"column":19}},"val":"l","key":null,"code":"letters"}
+{"type":"indent","loc":{"start":{"line":28,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":28,"column":5}},"val":4}
+{"type":"each","loc":{"start":{"line":28,"column":5},"filename":"/cases/code.iteration.pug","end":{"line":28,"column":18}},"val":"n","key":null,"code":"nums"}
+{"type":"indent","loc":{"start":{"line":29,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":29,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":29,"column":7},"filename":"/cases/code.iteration.pug","end":{"line":29,"column":9}},"val":"li"}
+{"type":"interpolated-code","loc":{"start":{"line":29,"column":10},"filename":"/cases/code.iteration.pug","end":{"line":29,"column":14}},"mustEscape":true,"buffer":true,"val":"n"}
+{"type":"text","loc":{"start":{"line":29,"column":14},"filename":"/cases/code.iteration.pug","end":{"line":29,"column":16}},"val":": "}
+{"type":"interpolated-code","loc":{"start":{"line":29,"column":16},"filename":"/cases/code.iteration.pug","end":{"line":29,"column":20}},"mustEscape":true,"buffer":true,"val":"l"}
+{"type":"outdent","loc":{"start":{"line":31,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":31,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":31,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":31,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":31,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":31,"column":1}}}
+{"type":"code","loc":{"start":{"line":31,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":31,"column":16}},"val":"var count = 1","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":32,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":32,"column":1}}}
+{"type":"code","loc":{"start":{"line":32,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":32,"column":66}},"val":"var counter = function() { return [count++, count++, count++] }","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":33,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":33,"column":1}}}
+{"type":"tag","loc":{"start":{"line":33,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":33,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":34,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":34,"column":3}},"val":2}
+{"type":"each","loc":{"start":{"line":34,"column":3},"filename":"/cases/code.iteration.pug","end":{"line":34,"column":21}},"val":"n","key":null,"code":"counter()"}
+{"type":"indent","loc":{"start":{"line":35,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":35,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":35,"column":5},"filename":"/cases/code.iteration.pug","end":{"line":35,"column":7}},"val":"li"}
+{"type":"interpolated-code","loc":{"start":{"line":35,"column":8},"filename":"/cases/code.iteration.pug","end":{"line":35,"column":12}},"mustEscape":true,"buffer":true,"val":"n"}
+{"type":"outdent","loc":{"start":{"line":36,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":36,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":36,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":36,"column":1}}}
+{"type":"eos","loc":{"start":{"line":36,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":36,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/code.tokens.json b/packages/pug-parser/test/cases/code.tokens.json
index 90471ea33..0d836758e 100644
--- a/packages/pug-parser/test/cases/code.tokens.json
+++ b/packages/pug-parser/test/cases/code.tokens.json
@@ -1,40 +1,40 @@
-{"type":"tag","line":1,"col":1,"val":"p"}
-{"type":"code","line":1,"col":2,"val":"null","mustEscape":true,"buffer":true}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"p"}
-{"type":"code","line":2,"col":2,"val":"undefined","mustEscape":true,"buffer":true}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"p"}
-{"type":"code","line":3,"col":2,"val":"''","mustEscape":true,"buffer":true}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":1,"val":"p"}
-{"type":"code","line":4,"col":2,"val":"0","mustEscape":true,"buffer":true}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":1,"val":"p"}
-{"type":"code","line":5,"col":2,"val":"false","mustEscape":true,"buffer":true}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":1,"val":"p"}
-{"type":"start-attributes","line":6,"col":2}
-{"type":"attribute","line":6,"col":3,"name":"foo","val":"null","mustEscape":true}
-{"type":"end-attributes","line":6,"col":11}
-{"type":"newline","line":7,"col":1}
-{"type":"tag","line":7,"col":1,"val":"p"}
-{"type":"start-attributes","line":7,"col":2}
-{"type":"attribute","line":7,"col":3,"name":"foo","val":"undefined","mustEscape":true}
-{"type":"end-attributes","line":7,"col":16}
-{"type":"newline","line":8,"col":1}
-{"type":"tag","line":8,"col":1,"val":"p"}
-{"type":"start-attributes","line":8,"col":2}
-{"type":"attribute","line":8,"col":3,"name":"foo","val":"''","mustEscape":true}
-{"type":"end-attributes","line":8,"col":9}
-{"type":"newline","line":9,"col":1}
-{"type":"tag","line":9,"col":1,"val":"p"}
-{"type":"start-attributes","line":9,"col":2}
-{"type":"attribute","line":9,"col":3,"name":"foo","val":"0","mustEscape":true}
-{"type":"end-attributes","line":9,"col":8}
-{"type":"newline","line":10,"col":1}
-{"type":"tag","line":10,"col":1,"val":"p"}
-{"type":"start-attributes","line":10,"col":2}
-{"type":"attribute","line":10,"col":3,"name":"foo","val":"false","mustEscape":true}
-{"type":"end-attributes","line":10,"col":12}
-{"type":"eos","line":10,"col":13}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/code.pug","end":{"line":1,"column":2}},"val":"p"}
+{"type":"code","loc":{"start":{"line":1,"column":2},"filename":"/cases/code.pug","end":{"line":1,"column":8}},"val":"null","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/code.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/code.pug","end":{"line":2,"column":2}},"val":"p"}
+{"type":"code","loc":{"start":{"line":2,"column":2},"filename":"/cases/code.pug","end":{"line":2,"column":13}},"val":"undefined","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/code.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/code.pug","end":{"line":3,"column":2}},"val":"p"}
+{"type":"code","loc":{"start":{"line":3,"column":2},"filename":"/cases/code.pug","end":{"line":3,"column":6}},"val":"''","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/code.pug","end":{"line":4,"column":1}}}
+{"type":"tag","loc":{"start":{"line":4,"column":1},"filename":"/cases/code.pug","end":{"line":4,"column":2}},"val":"p"}
+{"type":"code","loc":{"start":{"line":4,"column":2},"filename":"/cases/code.pug","end":{"line":4,"column":5}},"val":"0","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/code.pug","end":{"line":5,"column":1}}}
+{"type":"tag","loc":{"start":{"line":5,"column":1},"filename":"/cases/code.pug","end":{"line":5,"column":2}},"val":"p"}
+{"type":"code","loc":{"start":{"line":5,"column":2},"filename":"/cases/code.pug","end":{"line":5,"column":9}},"val":"false","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/code.pug","end":{"line":6,"column":1}}}
+{"type":"tag","loc":{"start":{"line":6,"column":1},"filename":"/cases/code.pug","end":{"line":6,"column":2}},"val":"p"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":2},"filename":"/cases/code.pug","end":{"line":6,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":3},"filename":"/cases/code.pug","end":{"line":6,"column":11}},"name":"foo","mustEscape":true,"val":"null"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":11},"filename":"/cases/code.pug","end":{"line":6,"column":12}}}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/code.pug","end":{"line":7,"column":1}}}
+{"type":"tag","loc":{"start":{"line":7,"column":1},"filename":"/cases/code.pug","end":{"line":7,"column":2}},"val":"p"}
+{"type":"start-attributes","loc":{"start":{"line":7,"column":2},"filename":"/cases/code.pug","end":{"line":7,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":7,"column":3},"filename":"/cases/code.pug","end":{"line":7,"column":16}},"name":"foo","mustEscape":true,"val":"undefined"}
+{"type":"end-attributes","loc":{"start":{"line":7,"column":16},"filename":"/cases/code.pug","end":{"line":7,"column":17}}}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/code.pug","end":{"line":8,"column":1}}}
+{"type":"tag","loc":{"start":{"line":8,"column":1},"filename":"/cases/code.pug","end":{"line":8,"column":2}},"val":"p"}
+{"type":"start-attributes","loc":{"start":{"line":8,"column":2},"filename":"/cases/code.pug","end":{"line":8,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":8,"column":3},"filename":"/cases/code.pug","end":{"line":8,"column":9}},"name":"foo","mustEscape":true,"val":"''"}
+{"type":"end-attributes","loc":{"start":{"line":8,"column":9},"filename":"/cases/code.pug","end":{"line":8,"column":10}}}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/code.pug","end":{"line":9,"column":1}}}
+{"type":"tag","loc":{"start":{"line":9,"column":1},"filename":"/cases/code.pug","end":{"line":9,"column":2}},"val":"p"}
+{"type":"start-attributes","loc":{"start":{"line":9,"column":2},"filename":"/cases/code.pug","end":{"line":9,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":9,"column":3},"filename":"/cases/code.pug","end":{"line":9,"column":8}},"name":"foo","mustEscape":true,"val":"0"}
+{"type":"end-attributes","loc":{"start":{"line":9,"column":8},"filename":"/cases/code.pug","end":{"line":9,"column":9}}}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/code.pug","end":{"line":10,"column":1}}}
+{"type":"tag","loc":{"start":{"line":10,"column":1},"filename":"/cases/code.pug","end":{"line":10,"column":2}},"val":"p"}
+{"type":"start-attributes","loc":{"start":{"line":10,"column":2},"filename":"/cases/code.pug","end":{"line":10,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":10,"column":3},"filename":"/cases/code.pug","end":{"line":10,"column":12}},"name":"foo","mustEscape":true,"val":"false"}
+{"type":"end-attributes","loc":{"start":{"line":10,"column":12},"filename":"/cases/code.pug","end":{"line":10,"column":13}}}
+{"type":"eos","loc":{"start":{"line":10,"column":13},"filename":"/cases/code.pug","end":{"line":10,"column":13}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/comments-in-case.tokens.json b/packages/pug-parser/test/cases/comments-in-case.tokens.json
index 9ad2cd2b2..5dd9ffb93 100644
--- a/packages/pug-parser/test/cases/comments-in-case.tokens.json
+++ b/packages/pug-parser/test/cases/comments-in-case.tokens.json
@@ -1,26 +1,26 @@
-{"type":"doctype","line":1,"col":1,"val":"html"}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"html"}
-{"type":"indent","line":3,"col":1,"val":2}
-{"type":"tag","line":3,"col":3,"val":"body"}
-{"type":"indent","line":4,"col":1,"val":3}
-{"type":"code","line":4,"col":4,"val":"var s = 'this'","mustEscape":false,"buffer":false}
-{"type":"newline","line":5,"col":1}
-{"type":"case","line":5,"col":4,"val":"s"}
-{"type":"indent","line":6,"col":1,"val":5}
-{"type":"comment","line":6,"col":6,"val":" Comment","buffer":false}
-{"type":"newline","line":7,"col":1}
-{"type":"when","line":7,"col":6,"val":"'this'"}
-{"type":"indent","line":8,"col":1,"val":7}
-{"type":"tag","line":8,"col":8,"val":"p"}
-{"type":"text","line":8,"col":10,"val":"It's this!"}
-{"type":"outdent","line":9,"col":6}
-{"type":"when","line":9,"col":6,"val":"'that'"}
-{"type":"indent","line":10,"col":1,"val":7}
-{"type":"tag","line":10,"col":8,"val":"p"}
-{"type":"text","line":10,"col":10,"val":"It's that!"}
-{"type":"outdent","line":10,"col":20}
-{"type":"outdent","line":10,"col":20}
-{"type":"outdent","line":10,"col":20}
-{"type":"outdent","line":10,"col":20}
-{"type":"eos","line":10,"col":20}
\ No newline at end of file
+{"type":"doctype","loc":{"start":{"line":1,"column":1},"filename":"/cases/comments-in-case.pug","end":{"line":1,"column":13}},"val":"html"}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/comments-in-case.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/comments-in-case.pug","end":{"line":2,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/comments-in-case.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/comments-in-case.pug","end":{"line":3,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/comments-in-case.pug","end":{"line":4,"column":4}},"val":3}
+{"type":"code","loc":{"start":{"line":4,"column":4},"filename":"/cases/comments-in-case.pug","end":{"line":4,"column":20}},"val":"var s = 'this'","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/comments-in-case.pug","end":{"line":5,"column":4}}}
+{"type":"case","loc":{"start":{"line":5,"column":4},"filename":"/cases/comments-in-case.pug","end":{"line":5,"column":10}},"val":"s"}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/comments-in-case.pug","end":{"line":6,"column":6}},"val":5}
+{"type":"comment","loc":{"start":{"line":6,"column":6},"filename":"/cases/comments-in-case.pug","end":{"line":6,"column":17}},"val":" Comment","buffer":false}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/comments-in-case.pug","end":{"line":7,"column":6}}}
+{"type":"when","loc":{"start":{"line":7,"column":6},"filename":"/cases/comments-in-case.pug","end":{"line":7,"column":17}},"val":"'this'"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/comments-in-case.pug","end":{"line":8,"column":8}},"val":7}
+{"type":"tag","loc":{"start":{"line":8,"column":8},"filename":"/cases/comments-in-case.pug","end":{"line":8,"column":9}},"val":"p"}
+{"type":"text","loc":{"start":{"line":8,"column":10},"filename":"/cases/comments-in-case.pug","end":{"line":8,"column":20}},"val":"It's this!"}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/comments-in-case.pug","end":{"line":9,"column":6}}}
+{"type":"when","loc":{"start":{"line":9,"column":6},"filename":"/cases/comments-in-case.pug","end":{"line":9,"column":17}},"val":"'that'"}
+{"type":"indent","loc":{"start":{"line":10,"column":1},"filename":"/cases/comments-in-case.pug","end":{"line":10,"column":8}},"val":7}
+{"type":"tag","loc":{"start":{"line":10,"column":8},"filename":"/cases/comments-in-case.pug","end":{"line":10,"column":9}},"val":"p"}
+{"type":"text","loc":{"start":{"line":10,"column":10},"filename":"/cases/comments-in-case.pug","end":{"line":10,"column":20}},"val":"It's that!"}
+{"type":"outdent","loc":{"start":{"line":10,"column":20},"filename":"/cases/comments-in-case.pug","end":{"line":10,"column":20}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":20},"filename":"/cases/comments-in-case.pug","end":{"line":10,"column":20}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":20},"filename":"/cases/comments-in-case.pug","end":{"line":10,"column":20}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":20},"filename":"/cases/comments-in-case.pug","end":{"line":10,"column":20}}}
+{"type":"eos","loc":{"start":{"line":10,"column":20},"filename":"/cases/comments-in-case.pug","end":{"line":10,"column":20}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/comments.source.tokens.json b/packages/pug-parser/test/cases/comments.source.tokens.json
index b73465324..d4f31e28a 100644
--- a/packages/pug-parser/test/cases/comments.source.tokens.json
+++ b/packages/pug-parser/test/cases/comments.source.tokens.json
@@ -1,18 +1,18 @@
-{"type":"comment","line":1,"col":1,"val":"","buffer":false}
-{"type":"start-pipeless-text","line":1,"col":4}
-{"type":"text","line":2,"col":3,"val":"s/s."}
-{"type":"newline","line":3,"col":1}
-{"type":"text","line":3,"col":3,"val":""}
-{"type":"end-pipeless-text","line":3,"col":3}
-{"type":"newline","line":4,"col":1}
-{"type":"comment","line":4,"col":1,"val":" test/cases/comments.source.pug","buffer":false}
-{"type":"newline","line":6,"col":1}
-{"type":"comment","line":6,"col":1,"val":"","buffer":false}
-{"type":"start-pipeless-text","line":6,"col":4}
-{"type":"text","line":7,"col":3,"val":"test/cases/comments.source.pug"}
-{"type":"newline","line":8,"col":1}
-{"type":"text","line":8,"col":3,"val":"when"}
-{"type":"newline","line":9,"col":1}
-{"type":"text","line":9,"col":3,"val":"()"}
-{"type":"end-pipeless-text","line":9,"col":5}
-{"type":"eos","line":9,"col":5}
\ No newline at end of file
+{"type":"comment","loc":{"start":{"line":1,"column":1},"filename":"/cases/comments.source.pug","end":{"line":1,"column":4}},"val":"","buffer":false}
+{"type":"start-pipeless-text","loc":{"start":{"line":1,"column":4},"filename":"/cases/comments.source.pug","end":{"line":1,"column":4}}}
+{"type":"text","loc":{"start":{"line":2,"column":3},"filename":"/cases/comments.source.pug","end":{"line":2,"column":7}},"val":"s/s."}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/comments.source.pug","end":{"line":3,"column":1}}}
+{"type":"text","loc":{"start":{"line":3,"column":1},"filename":"/cases/comments.source.pug","end":{"line":3,"column":1}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":3,"column":1},"filename":"/cases/comments.source.pug","end":{"line":3,"column":1}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/comments.source.pug","end":{"line":4,"column":1}}}
+{"type":"comment","loc":{"start":{"line":4,"column":1},"filename":"/cases/comments.source.pug","end":{"line":4,"column":35}},"val":" test/cases/comments.source.pug","buffer":false}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/comments.source.pug","end":{"line":6,"column":1}}}
+{"type":"comment","loc":{"start":{"line":6,"column":1},"filename":"/cases/comments.source.pug","end":{"line":6,"column":4}},"val":"","buffer":false}
+{"type":"start-pipeless-text","loc":{"start":{"line":6,"column":4},"filename":"/cases/comments.source.pug","end":{"line":6,"column":4}}}
+{"type":"text","loc":{"start":{"line":7,"column":3},"filename":"/cases/comments.source.pug","end":{"line":7,"column":33}},"val":"test/cases/comments.source.pug"}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/comments.source.pug","end":{"line":8,"column":3}}}
+{"type":"text","loc":{"start":{"line":8,"column":3},"filename":"/cases/comments.source.pug","end":{"line":8,"column":7}},"val":"when"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/comments.source.pug","end":{"line":9,"column":3}}}
+{"type":"text","loc":{"start":{"line":9,"column":3},"filename":"/cases/comments.source.pug","end":{"line":9,"column":5}},"val":"()"}
+{"type":"end-pipeless-text","loc":{"start":{"line":9,"column":5},"filename":"/cases/comments.source.pug","end":{"line":9,"column":5}}}
+{"type":"eos","loc":{"start":{"line":9,"column":5},"filename":"/cases/comments.source.pug","end":{"line":9,"column":5}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/comments.tokens.json b/packages/pug-parser/test/cases/comments.tokens.json
index 4c377bfeb..84920ddc8 100644
--- a/packages/pug-parser/test/cases/comments.tokens.json
+++ b/packages/pug-parser/test/cases/comments.tokens.json
@@ -1,61 +1,61 @@
-{"type":"newline","line":2,"col":1}
-{"type":"comment","line":2,"col":1,"val":" foo","buffer":true}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"ul"}
-{"type":"indent","line":4,"col":1,"val":2}
-{"type":"comment","line":4,"col":3,"val":" bar","buffer":true}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":3,"val":"li"}
-{"type":"text","line":5,"col":6,"val":"one"}
-{"type":"newline","line":6,"col":1}
-{"type":"comment","line":6,"col":3,"val":" baz","buffer":true}
-{"type":"newline","line":7,"col":1}
-{"type":"tag","line":7,"col":3,"val":"li"}
-{"type":"text","line":7,"col":6,"val":"two"}
-{"type":"outdent","line":9,"col":1}
-{"type":"comment","line":9,"col":1,"val":"","buffer":true}
-{"type":"start-pipeless-text","line":9,"col":3}
-{"type":"text","line":10,"col":3,"val":"ul"}
-{"type":"newline","line":11,"col":1}
-{"type":"text","line":11,"col":3,"val":"  li foo"}
-{"type":"newline","line":12,"col":1}
-{"type":"text","line":12,"col":3,"val":""}
-{"type":"end-pipeless-text","line":12,"col":3}
-{"type":"newline","line":13,"col":1}
-{"type":"comment","line":13,"col":1,"val":" block","buffer":true}
-{"type":"start-pipeless-text","line":13,"col":9}
-{"type":"text","line":14,"col":3,"val":"// inline follow"}
-{"type":"newline","line":15,"col":1}
-{"type":"text","line":15,"col":3,"val":"li three"}
-{"type":"newline","line":16,"col":1}
-{"type":"text","line":16,"col":3,"val":""}
-{"type":"end-pipeless-text","line":16,"col":3}
-{"type":"newline","line":17,"col":1}
-{"type":"comment","line":17,"col":1,"val":" block","buffer":true}
-{"type":"start-pipeless-text","line":17,"col":9}
-{"type":"text","line":18,"col":3,"val":"// inline followed by tags"}
-{"type":"newline","line":19,"col":1}
-{"type":"text","line":19,"col":3,"val":"ul"}
-{"type":"newline","line":20,"col":1}
-{"type":"text","line":20,"col":3,"val":"  li four"}
-{"type":"newline","line":21,"col":1}
-{"type":"text","line":21,"col":3,"val":""}
-{"type":"end-pipeless-text","line":21,"col":3}
-{"type":"newline","line":22,"col":1}
-{"type":"comment","line":22,"col":1,"val":"if IE lt 9","buffer":true}
-{"type":"start-pipeless-text","line":22,"col":13}
-{"type":"text","line":23,"col":3,"val":"// inline"}
-{"type":"newline","line":24,"col":1}
-{"type":"text","line":24,"col":3,"val":"script(src='/lame.js')"}
-{"type":"newline","line":25,"col":1}
-{"type":"text","line":25,"col":3,"val":"// end-inline"}
-{"type":"newline","line":26,"col":1}
-{"type":"text","line":26,"col":3,"val":""}
-{"type":"end-pipeless-text","line":26,"col":3}
-{"type":"newline","line":27,"col":1}
-{"type":"tag","line":27,"col":1,"val":"p"}
-{"type":"text","line":27,"col":3,"val":"five"}
-{"type":"newline","line":29,"col":1}
-{"type":"class","line":29,"col":1,"val":"foo"}
-{"type":"text","line":29,"col":6,"val":"// not a comment"}
-{"type":"eos","line":29,"col":22}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/comments.pug","end":{"line":2,"column":1}}}
+{"type":"comment","loc":{"start":{"line":2,"column":1},"filename":"/cases/comments.pug","end":{"line":2,"column":7}},"val":" foo","buffer":true}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/comments.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/comments.pug","end":{"line":3,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/comments.pug","end":{"line":4,"column":3}},"val":2}
+{"type":"comment","loc":{"start":{"line":4,"column":3},"filename":"/cases/comments.pug","end":{"line":4,"column":9}},"val":" bar","buffer":true}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/comments.pug","end":{"line":5,"column":3}}}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/comments.pug","end":{"line":5,"column":5}},"val":"li"}
+{"type":"text","loc":{"start":{"line":5,"column":6},"filename":"/cases/comments.pug","end":{"line":5,"column":9}},"val":"one"}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/comments.pug","end":{"line":6,"column":3}}}
+{"type":"comment","loc":{"start":{"line":6,"column":3},"filename":"/cases/comments.pug","end":{"line":6,"column":9}},"val":" baz","buffer":true}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/comments.pug","end":{"line":7,"column":3}}}
+{"type":"tag","loc":{"start":{"line":7,"column":3},"filename":"/cases/comments.pug","end":{"line":7,"column":5}},"val":"li"}
+{"type":"text","loc":{"start":{"line":7,"column":6},"filename":"/cases/comments.pug","end":{"line":7,"column":9}},"val":"two"}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/comments.pug","end":{"line":9,"column":1}}}
+{"type":"comment","loc":{"start":{"line":9,"column":1},"filename":"/cases/comments.pug","end":{"line":9,"column":3}},"val":"","buffer":true}
+{"type":"start-pipeless-text","loc":{"start":{"line":9,"column":3},"filename":"/cases/comments.pug","end":{"line":9,"column":3}}}
+{"type":"text","loc":{"start":{"line":10,"column":3},"filename":"/cases/comments.pug","end":{"line":10,"column":5}},"val":"ul"}
+{"type":"newline","loc":{"start":{"line":11,"column":1},"filename":"/cases/comments.pug","end":{"line":11,"column":3}}}
+{"type":"text","loc":{"start":{"line":11,"column":3},"filename":"/cases/comments.pug","end":{"line":11,"column":11}},"val":"  li foo"}
+{"type":"newline","loc":{"start":{"line":12,"column":1},"filename":"/cases/comments.pug","end":{"line":12,"column":1}}}
+{"type":"text","loc":{"start":{"line":12,"column":1},"filename":"/cases/comments.pug","end":{"line":12,"column":1}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":12,"column":1},"filename":"/cases/comments.pug","end":{"line":12,"column":1}}}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/comments.pug","end":{"line":13,"column":1}}}
+{"type":"comment","loc":{"start":{"line":13,"column":1},"filename":"/cases/comments.pug","end":{"line":13,"column":9}},"val":" block","buffer":true}
+{"type":"start-pipeless-text","loc":{"start":{"line":13,"column":9},"filename":"/cases/comments.pug","end":{"line":13,"column":9}}}
+{"type":"text","loc":{"start":{"line":14,"column":3},"filename":"/cases/comments.pug","end":{"line":14,"column":19}},"val":"// inline follow"}
+{"type":"newline","loc":{"start":{"line":15,"column":1},"filename":"/cases/comments.pug","end":{"line":15,"column":3}}}
+{"type":"text","loc":{"start":{"line":15,"column":3},"filename":"/cases/comments.pug","end":{"line":15,"column":11}},"val":"li three"}
+{"type":"newline","loc":{"start":{"line":16,"column":1},"filename":"/cases/comments.pug","end":{"line":16,"column":1}}}
+{"type":"text","loc":{"start":{"line":16,"column":1},"filename":"/cases/comments.pug","end":{"line":16,"column":1}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":16,"column":1},"filename":"/cases/comments.pug","end":{"line":16,"column":1}}}
+{"type":"newline","loc":{"start":{"line":17,"column":1},"filename":"/cases/comments.pug","end":{"line":17,"column":1}}}
+{"type":"comment","loc":{"start":{"line":17,"column":1},"filename":"/cases/comments.pug","end":{"line":17,"column":9}},"val":" block","buffer":true}
+{"type":"start-pipeless-text","loc":{"start":{"line":17,"column":9},"filename":"/cases/comments.pug","end":{"line":17,"column":9}}}
+{"type":"text","loc":{"start":{"line":18,"column":3},"filename":"/cases/comments.pug","end":{"line":18,"column":29}},"val":"// inline followed by tags"}
+{"type":"newline","loc":{"start":{"line":19,"column":1},"filename":"/cases/comments.pug","end":{"line":19,"column":3}}}
+{"type":"text","loc":{"start":{"line":19,"column":3},"filename":"/cases/comments.pug","end":{"line":19,"column":5}},"val":"ul"}
+{"type":"newline","loc":{"start":{"line":20,"column":1},"filename":"/cases/comments.pug","end":{"line":20,"column":3}}}
+{"type":"text","loc":{"start":{"line":20,"column":3},"filename":"/cases/comments.pug","end":{"line":20,"column":12}},"val":"  li four"}
+{"type":"newline","loc":{"start":{"line":21,"column":1},"filename":"/cases/comments.pug","end":{"line":21,"column":1}}}
+{"type":"text","loc":{"start":{"line":21,"column":1},"filename":"/cases/comments.pug","end":{"line":21,"column":1}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":21,"column":1},"filename":"/cases/comments.pug","end":{"line":21,"column":1}}}
+{"type":"newline","loc":{"start":{"line":22,"column":1},"filename":"/cases/comments.pug","end":{"line":22,"column":1}}}
+{"type":"comment","loc":{"start":{"line":22,"column":1},"filename":"/cases/comments.pug","end":{"line":22,"column":13}},"val":"if IE lt 9","buffer":true}
+{"type":"start-pipeless-text","loc":{"start":{"line":22,"column":13},"filename":"/cases/comments.pug","end":{"line":22,"column":13}}}
+{"type":"text","loc":{"start":{"line":23,"column":3},"filename":"/cases/comments.pug","end":{"line":23,"column":12}},"val":"// inline"}
+{"type":"newline","loc":{"start":{"line":24,"column":1},"filename":"/cases/comments.pug","end":{"line":24,"column":3}}}
+{"type":"text","loc":{"start":{"line":24,"column":3},"filename":"/cases/comments.pug","end":{"line":24,"column":25}},"val":"script(src='/lame.js')"}
+{"type":"newline","loc":{"start":{"line":25,"column":1},"filename":"/cases/comments.pug","end":{"line":25,"column":3}}}
+{"type":"text","loc":{"start":{"line":25,"column":3},"filename":"/cases/comments.pug","end":{"line":25,"column":16}},"val":"// end-inline"}
+{"type":"newline","loc":{"start":{"line":26,"column":1},"filename":"/cases/comments.pug","end":{"line":26,"column":1}}}
+{"type":"text","loc":{"start":{"line":26,"column":1},"filename":"/cases/comments.pug","end":{"line":26,"column":1}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":26,"column":1},"filename":"/cases/comments.pug","end":{"line":26,"column":1}}}
+{"type":"newline","loc":{"start":{"line":27,"column":1},"filename":"/cases/comments.pug","end":{"line":27,"column":1}}}
+{"type":"tag","loc":{"start":{"line":27,"column":1},"filename":"/cases/comments.pug","end":{"line":27,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":27,"column":3},"filename":"/cases/comments.pug","end":{"line":27,"column":7}},"val":"five"}
+{"type":"newline","loc":{"start":{"line":29,"column":1},"filename":"/cases/comments.pug","end":{"line":29,"column":1}}}
+{"type":"class","loc":{"start":{"line":29,"column":1},"filename":"/cases/comments.pug","end":{"line":29,"column":5}},"val":"foo"}
+{"type":"text","loc":{"start":{"line":29,"column":6},"filename":"/cases/comments.pug","end":{"line":29,"column":22}},"val":"// not a comment"}
+{"type":"eos","loc":{"start":{"line":29,"column":22},"filename":"/cases/comments.pug","end":{"line":29,"column":22}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/doctype.custom.tokens.json b/packages/pug-parser/test/cases/doctype.custom.tokens.json
index ebec09790..b202f8217 100644
--- a/packages/pug-parser/test/cases/doctype.custom.tokens.json
+++ b/packages/pug-parser/test/cases/doctype.custom.tokens.json
@@ -1,2 +1,2 @@
-{"type":"doctype","line":1,"col":1,"val":"custom stuff"}
-{"type":"eos","line":1,"col":21}
\ No newline at end of file
+{"type":"doctype","loc":{"start":{"line":1,"column":1},"filename":"/cases/doctype.custom.pug","end":{"line":1,"column":21}},"val":"custom stuff"}
+{"type":"eos","loc":{"start":{"line":1,"column":21},"filename":"/cases/doctype.custom.pug","end":{"line":1,"column":21}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/doctype.default.tokens.json b/packages/pug-parser/test/cases/doctype.default.tokens.json
index 1ef74954f..391f61585 100644
--- a/packages/pug-parser/test/cases/doctype.default.tokens.json
+++ b/packages/pug-parser/test/cases/doctype.default.tokens.json
@@ -1,11 +1,11 @@
-{"type":"doctype","line":1,"col":1,"val":""}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"html"}
-{"type":"indent","line":3,"col":1,"val":2}
-{"type":"tag","line":3,"col":3,"val":"body"}
-{"type":"indent","line":4,"col":1,"val":4}
-{"type":"tag","line":4,"col":5,"val":"h1"}
-{"type":"text","line":4,"col":8,"val":"Title"}
-{"type":"outdent","line":4,"col":13}
-{"type":"outdent","line":4,"col":13}
-{"type":"eos","line":4,"col":13}
\ No newline at end of file
+{"type":"doctype","loc":{"start":{"line":1,"column":1},"filename":"/cases/doctype.default.pug","end":{"line":1,"column":8}},"val":""}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/doctype.default.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/doctype.default.pug","end":{"line":2,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/doctype.default.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/doctype.default.pug","end":{"line":3,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/doctype.default.pug","end":{"line":4,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":4,"column":5},"filename":"/cases/doctype.default.pug","end":{"line":4,"column":7}},"val":"h1"}
+{"type":"text","loc":{"start":{"line":4,"column":8},"filename":"/cases/doctype.default.pug","end":{"line":4,"column":13}},"val":"Title"}
+{"type":"outdent","loc":{"start":{"line":4,"column":13},"filename":"/cases/doctype.default.pug","end":{"line":4,"column":13}}}
+{"type":"outdent","loc":{"start":{"line":4,"column":13},"filename":"/cases/doctype.default.pug","end":{"line":4,"column":13}}}
+{"type":"eos","loc":{"start":{"line":4,"column":13},"filename":"/cases/doctype.default.pug","end":{"line":4,"column":13}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/doctype.keyword.tokens.json b/packages/pug-parser/test/cases/doctype.keyword.tokens.json
index 6ca25700c..aced767a4 100644
--- a/packages/pug-parser/test/cases/doctype.keyword.tokens.json
+++ b/packages/pug-parser/test/cases/doctype.keyword.tokens.json
@@ -1,2 +1,2 @@
-{"type":"doctype","line":1,"col":1,"val":"html"}
-{"type":"eos","line":1,"col":13}
\ No newline at end of file
+{"type":"doctype","loc":{"start":{"line":1,"column":1},"filename":"/cases/doctype.keyword.pug","end":{"line":1,"column":13}},"val":"html"}
+{"type":"eos","loc":{"start":{"line":1,"column":13},"filename":"/cases/doctype.keyword.pug","end":{"line":1,"column":13}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/each.else.tokens.json b/packages/pug-parser/test/cases/each.else.tokens.json
index 432b7c982..6e6e68a15 100644
--- a/packages/pug-parser/test/cases/each.else.tokens.json
+++ b/packages/pug-parser/test/cases/each.else.tokens.json
@@ -1,88 +1,88 @@
-{"type":"newline","line":2,"col":1}
-{"type":"code","line":2,"col":1,"val":"var users = []","mustEscape":false,"buffer":false}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":1,"val":"ul"}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"each","line":5,"col":3,"val":"user","key":null,"code":"users"}
-{"type":"indent","line":6,"col":1,"val":4}
-{"type":"tag","line":6,"col":5,"val":"li"}
-{"type":"code","line":6,"col":7,"val":"user.name","mustEscape":true,"buffer":true}
-{"type":"outdent","line":7,"col":3}
-{"type":"else","line":7,"col":3,"val":""}
-{"type":"indent","line":8,"col":1,"val":4}
-{"type":"tag","line":8,"col":5,"val":"li"}
-{"type":"text","line":8,"col":8,"val":"no users!"}
-{"type":"outdent","line":11,"col":3}
-{"type":"outdent","line":11,"col":1}
-{"type":"code","line":11,"col":1,"val":"var users = [{ name: 'tobi', friends: ['loki'] }, { name: 'loki' }]","mustEscape":false,"buffer":false}
-{"type":"newline","line":13,"col":1}
-{"type":"if","line":13,"col":1,"val":"users"}
-{"type":"indent","line":14,"col":1,"val":2}
-{"type":"tag","line":14,"col":3,"val":"ul"}
-{"type":"indent","line":15,"col":1,"val":4}
-{"type":"each","line":15,"col":5,"val":"user","key":null,"code":"users"}
-{"type":"indent","line":16,"col":1,"val":6}
-{"type":"tag","line":16,"col":7,"val":"li"}
-{"type":"code","line":16,"col":9,"val":"user.name","mustEscape":true,"buffer":true}
-{"type":"outdent","line":17,"col":5}
-{"type":"else","line":17,"col":5,"val":""}
-{"type":"indent","line":18,"col":1,"val":6}
-{"type":"tag","line":18,"col":7,"val":"li"}
-{"type":"text","line":18,"col":10,"val":"no users!"}
-{"type":"outdent","line":20,"col":5}
-{"type":"outdent","line":20,"col":3}
-{"type":"outdent","line":20,"col":1}
-{"type":"code","line":20,"col":1,"val":"var user = { name: 'tobi', age: 10 }","mustEscape":false,"buffer":false}
-{"type":"newline","line":22,"col":1}
-{"type":"tag","line":22,"col":1,"val":"ul"}
-{"type":"indent","line":23,"col":1,"val":2}
-{"type":"each","line":23,"col":3,"val":"val","key":"key","code":"user"}
-{"type":"indent","line":24,"col":1,"val":4}
-{"type":"tag","line":24,"col":5,"val":"li"}
-{"type":"interpolated-code","line":24,"col":8,"val":"key","mustEscape":true,"buffer":true}
-{"type":"text","line":24,"col":14,"val":": "}
-{"type":"interpolated-code","line":24,"col":16,"val":"val","mustEscape":true,"buffer":true}
-{"type":"outdent","line":25,"col":3}
-{"type":"else","line":25,"col":3,"val":""}
-{"type":"indent","line":26,"col":1,"val":4}
-{"type":"tag","line":26,"col":5,"val":"li"}
-{"type":"text","line":26,"col":8,"val":"user has no details!"}
-{"type":"outdent","line":28,"col":3}
-{"type":"outdent","line":28,"col":1}
-{"type":"code","line":28,"col":1,"val":"var user = {}","mustEscape":false,"buffer":false}
-{"type":"newline","line":30,"col":1}
-{"type":"tag","line":30,"col":1,"val":"ul"}
-{"type":"indent","line":31,"col":1,"val":2}
-{"type":"each","line":31,"col":3,"val":"prop","key":"key","code":"user"}
-{"type":"indent","line":32,"col":1,"val":4}
-{"type":"tag","line":32,"col":5,"val":"li"}
-{"type":"interpolated-code","line":32,"col":8,"val":"key","mustEscape":true,"buffer":true}
-{"type":"text","line":32,"col":14,"val":": "}
-{"type":"interpolated-code","line":32,"col":16,"val":"val","mustEscape":true,"buffer":true}
-{"type":"outdent","line":33,"col":3}
-{"type":"else","line":33,"col":3,"val":""}
-{"type":"indent","line":34,"col":1,"val":4}
-{"type":"tag","line":34,"col":5,"val":"li"}
-{"type":"text","line":34,"col":8,"val":"user has no details!"}
-{"type":"outdent","line":36,"col":3}
-{"type":"outdent","line":36,"col":1}
-{"type":"code","line":36,"col":1,"val":"var user = Object.create(null)","mustEscape":false,"buffer":false}
-{"type":"newline","line":37,"col":1}
-{"type":"code","line":37,"col":1,"val":"user.name = 'tobi'","mustEscape":false,"buffer":false}
-{"type":"newline","line":39,"col":1}
-{"type":"tag","line":39,"col":1,"val":"ul"}
-{"type":"indent","line":40,"col":1,"val":2}
-{"type":"each","line":40,"col":3,"val":"val","key":"key","code":"user"}
-{"type":"indent","line":41,"col":1,"val":4}
-{"type":"tag","line":41,"col":5,"val":"li"}
-{"type":"interpolated-code","line":41,"col":8,"val":"key","mustEscape":true,"buffer":true}
-{"type":"text","line":41,"col":14,"val":": "}
-{"type":"interpolated-code","line":41,"col":16,"val":"val","mustEscape":true,"buffer":true}
-{"type":"outdent","line":42,"col":3}
-{"type":"else","line":42,"col":3,"val":""}
-{"type":"indent","line":43,"col":1,"val":4}
-{"type":"tag","line":43,"col":5,"val":"li"}
-{"type":"text","line":43,"col":8,"val":"user has no details!"}
-{"type":"outdent","line":44,"col":3}
-{"type":"outdent","line":44,"col":1}
-{"type":"eos","line":44,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/each.else.pug","end":{"line":2,"column":1}}}
+{"type":"code","loc":{"start":{"line":2,"column":1},"filename":"/cases/each.else.pug","end":{"line":2,"column":17}},"val":"var users = []","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/each.else.pug","end":{"line":4,"column":1}}}
+{"type":"tag","loc":{"start":{"line":4,"column":1},"filename":"/cases/each.else.pug","end":{"line":4,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/each.else.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"each","loc":{"start":{"line":5,"column":3},"filename":"/cases/each.else.pug","end":{"line":5,"column":20}},"val":"user","key":null,"code":"users"}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/each.else.pug","end":{"line":6,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":6,"column":5},"filename":"/cases/each.else.pug","end":{"line":6,"column":7}},"val":"li"}
+{"type":"code","loc":{"start":{"line":6,"column":7},"filename":"/cases/each.else.pug","end":{"line":6,"column":18}},"val":"user.name","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/each.else.pug","end":{"line":7,"column":3}}}
+{"type":"else","loc":{"start":{"line":7,"column":3},"filename":"/cases/each.else.pug","end":{"line":7,"column":7}},"val":""}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/each.else.pug","end":{"line":8,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":8,"column":5},"filename":"/cases/each.else.pug","end":{"line":8,"column":7}},"val":"li"}
+{"type":"text","loc":{"start":{"line":8,"column":8},"filename":"/cases/each.else.pug","end":{"line":8,"column":17}},"val":"no users!"}
+{"type":"outdent","loc":{"start":{"line":11,"column":1},"filename":"/cases/each.else.pug","end":{"line":11,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":11,"column":1},"filename":"/cases/each.else.pug","end":{"line":11,"column":1}}}
+{"type":"code","loc":{"start":{"line":11,"column":1},"filename":"/cases/each.else.pug","end":{"line":11,"column":70}},"val":"var users = [{ name: 'tobi', friends: ['loki'] }, { name: 'loki' }]","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/each.else.pug","end":{"line":13,"column":1}}}
+{"type":"if","loc":{"start":{"line":13,"column":1},"filename":"/cases/each.else.pug","end":{"line":13,"column":9}},"val":"users"}
+{"type":"indent","loc":{"start":{"line":14,"column":1},"filename":"/cases/each.else.pug","end":{"line":14,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":14,"column":3},"filename":"/cases/each.else.pug","end":{"line":14,"column":5}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":15,"column":1},"filename":"/cases/each.else.pug","end":{"line":15,"column":5}},"val":4}
+{"type":"each","loc":{"start":{"line":15,"column":5},"filename":"/cases/each.else.pug","end":{"line":15,"column":22}},"val":"user","key":null,"code":"users"}
+{"type":"indent","loc":{"start":{"line":16,"column":1},"filename":"/cases/each.else.pug","end":{"line":16,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":16,"column":7},"filename":"/cases/each.else.pug","end":{"line":16,"column":9}},"val":"li"}
+{"type":"code","loc":{"start":{"line":16,"column":9},"filename":"/cases/each.else.pug","end":{"line":16,"column":20}},"val":"user.name","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":17,"column":1},"filename":"/cases/each.else.pug","end":{"line":17,"column":5}}}
+{"type":"else","loc":{"start":{"line":17,"column":5},"filename":"/cases/each.else.pug","end":{"line":17,"column":9}},"val":""}
+{"type":"indent","loc":{"start":{"line":18,"column":1},"filename":"/cases/each.else.pug","end":{"line":18,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":18,"column":7},"filename":"/cases/each.else.pug","end":{"line":18,"column":9}},"val":"li"}
+{"type":"text","loc":{"start":{"line":18,"column":10},"filename":"/cases/each.else.pug","end":{"line":18,"column":19}},"val":"no users!"}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/each.else.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/each.else.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/each.else.pug","end":{"line":20,"column":1}}}
+{"type":"code","loc":{"start":{"line":20,"column":1},"filename":"/cases/each.else.pug","end":{"line":20,"column":39}},"val":"var user = { name: 'tobi', age: 10 }","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":22,"column":1},"filename":"/cases/each.else.pug","end":{"line":22,"column":1}}}
+{"type":"tag","loc":{"start":{"line":22,"column":1},"filename":"/cases/each.else.pug","end":{"line":22,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":23,"column":1},"filename":"/cases/each.else.pug","end":{"line":23,"column":3}},"val":2}
+{"type":"each","loc":{"start":{"line":23,"column":3},"filename":"/cases/each.else.pug","end":{"line":23,"column":24}},"val":"val","key":"key","code":"user"}
+{"type":"indent","loc":{"start":{"line":24,"column":1},"filename":"/cases/each.else.pug","end":{"line":24,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":24,"column":5},"filename":"/cases/each.else.pug","end":{"line":24,"column":7}},"val":"li"}
+{"type":"interpolated-code","loc":{"start":{"line":24,"column":8},"filename":"/cases/each.else.pug","end":{"line":24,"column":14}},"mustEscape":true,"buffer":true,"val":"key"}
+{"type":"text","loc":{"start":{"line":24,"column":14},"filename":"/cases/each.else.pug","end":{"line":24,"column":16}},"val":": "}
+{"type":"interpolated-code","loc":{"start":{"line":24,"column":16},"filename":"/cases/each.else.pug","end":{"line":24,"column":22}},"mustEscape":true,"buffer":true,"val":"val"}
+{"type":"outdent","loc":{"start":{"line":25,"column":1},"filename":"/cases/each.else.pug","end":{"line":25,"column":3}}}
+{"type":"else","loc":{"start":{"line":25,"column":3},"filename":"/cases/each.else.pug","end":{"line":25,"column":7}},"val":""}
+{"type":"indent","loc":{"start":{"line":26,"column":1},"filename":"/cases/each.else.pug","end":{"line":26,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":26,"column":5},"filename":"/cases/each.else.pug","end":{"line":26,"column":7}},"val":"li"}
+{"type":"text","loc":{"start":{"line":26,"column":8},"filename":"/cases/each.else.pug","end":{"line":26,"column":28}},"val":"user has no details!"}
+{"type":"outdent","loc":{"start":{"line":28,"column":1},"filename":"/cases/each.else.pug","end":{"line":28,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":28,"column":1},"filename":"/cases/each.else.pug","end":{"line":28,"column":1}}}
+{"type":"code","loc":{"start":{"line":28,"column":1},"filename":"/cases/each.else.pug","end":{"line":28,"column":16}},"val":"var user = {}","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":30,"column":1},"filename":"/cases/each.else.pug","end":{"line":30,"column":1}}}
+{"type":"tag","loc":{"start":{"line":30,"column":1},"filename":"/cases/each.else.pug","end":{"line":30,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":31,"column":1},"filename":"/cases/each.else.pug","end":{"line":31,"column":3}},"val":2}
+{"type":"each","loc":{"start":{"line":31,"column":3},"filename":"/cases/each.else.pug","end":{"line":31,"column":25}},"val":"prop","key":"key","code":"user"}
+{"type":"indent","loc":{"start":{"line":32,"column":1},"filename":"/cases/each.else.pug","end":{"line":32,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":32,"column":5},"filename":"/cases/each.else.pug","end":{"line":32,"column":7}},"val":"li"}
+{"type":"interpolated-code","loc":{"start":{"line":32,"column":8},"filename":"/cases/each.else.pug","end":{"line":32,"column":14}},"mustEscape":true,"buffer":true,"val":"key"}
+{"type":"text","loc":{"start":{"line":32,"column":14},"filename":"/cases/each.else.pug","end":{"line":32,"column":16}},"val":": "}
+{"type":"interpolated-code","loc":{"start":{"line":32,"column":16},"filename":"/cases/each.else.pug","end":{"line":32,"column":22}},"mustEscape":true,"buffer":true,"val":"val"}
+{"type":"outdent","loc":{"start":{"line":33,"column":1},"filename":"/cases/each.else.pug","end":{"line":33,"column":3}}}
+{"type":"else","loc":{"start":{"line":33,"column":3},"filename":"/cases/each.else.pug","end":{"line":33,"column":7}},"val":""}
+{"type":"indent","loc":{"start":{"line":34,"column":1},"filename":"/cases/each.else.pug","end":{"line":34,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":34,"column":5},"filename":"/cases/each.else.pug","end":{"line":34,"column":7}},"val":"li"}
+{"type":"text","loc":{"start":{"line":34,"column":8},"filename":"/cases/each.else.pug","end":{"line":34,"column":28}},"val":"user has no details!"}
+{"type":"outdent","loc":{"start":{"line":36,"column":1},"filename":"/cases/each.else.pug","end":{"line":36,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":36,"column":1},"filename":"/cases/each.else.pug","end":{"line":36,"column":1}}}
+{"type":"code","loc":{"start":{"line":36,"column":1},"filename":"/cases/each.else.pug","end":{"line":36,"column":33}},"val":"var user = Object.create(null)","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":37,"column":1},"filename":"/cases/each.else.pug","end":{"line":37,"column":1}}}
+{"type":"code","loc":{"start":{"line":37,"column":1},"filename":"/cases/each.else.pug","end":{"line":37,"column":21}},"val":"user.name = 'tobi'","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":39,"column":1},"filename":"/cases/each.else.pug","end":{"line":39,"column":1}}}
+{"type":"tag","loc":{"start":{"line":39,"column":1},"filename":"/cases/each.else.pug","end":{"line":39,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":40,"column":1},"filename":"/cases/each.else.pug","end":{"line":40,"column":3}},"val":2}
+{"type":"each","loc":{"start":{"line":40,"column":3},"filename":"/cases/each.else.pug","end":{"line":40,"column":24}},"val":"val","key":"key","code":"user"}
+{"type":"indent","loc":{"start":{"line":41,"column":1},"filename":"/cases/each.else.pug","end":{"line":41,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":41,"column":5},"filename":"/cases/each.else.pug","end":{"line":41,"column":7}},"val":"li"}
+{"type":"interpolated-code","loc":{"start":{"line":41,"column":8},"filename":"/cases/each.else.pug","end":{"line":41,"column":14}},"mustEscape":true,"buffer":true,"val":"key"}
+{"type":"text","loc":{"start":{"line":41,"column":14},"filename":"/cases/each.else.pug","end":{"line":41,"column":16}},"val":": "}
+{"type":"interpolated-code","loc":{"start":{"line":41,"column":16},"filename":"/cases/each.else.pug","end":{"line":41,"column":22}},"mustEscape":true,"buffer":true,"val":"val"}
+{"type":"outdent","loc":{"start":{"line":42,"column":1},"filename":"/cases/each.else.pug","end":{"line":42,"column":3}}}
+{"type":"else","loc":{"start":{"line":42,"column":3},"filename":"/cases/each.else.pug","end":{"line":42,"column":7}},"val":""}
+{"type":"indent","loc":{"start":{"line":43,"column":1},"filename":"/cases/each.else.pug","end":{"line":43,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":43,"column":5},"filename":"/cases/each.else.pug","end":{"line":43,"column":7}},"val":"li"}
+{"type":"text","loc":{"start":{"line":43,"column":8},"filename":"/cases/each.else.pug","end":{"line":43,"column":28}},"val":"user has no details!"}
+{"type":"outdent","loc":{"start":{"line":44,"column":1},"filename":"/cases/each.else.pug","end":{"line":44,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":44,"column":1},"filename":"/cases/each.else.pug","end":{"line":44,"column":1}}}
+{"type":"eos","loc":{"start":{"line":44,"column":1},"filename":"/cases/each.else.pug","end":{"line":44,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/escape-chars.tokens.json b/packages/pug-parser/test/cases/escape-chars.tokens.json
index cba823a8f..902433352 100644
--- a/packages/pug-parser/test/cases/escape-chars.tokens.json
+++ b/packages/pug-parser/test/cases/escape-chars.tokens.json
@@ -1,6 +1,6 @@
-{"type":"tag","line":1,"col":1,"val":"script"}
-{"type":"dot","line":1,"col":7}
-{"type":"start-pipeless-text","line":1,"col":8}
-{"type":"text","line":2,"col":3,"val":"var re = /\\d+/;"}
-{"type":"end-pipeless-text","line":2,"col":18}
-{"type":"eos","line":2,"col":18}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/escape-chars.pug","end":{"line":1,"column":7}},"val":"script"}
+{"type":"dot","loc":{"start":{"line":1,"column":7},"filename":"/cases/escape-chars.pug","end":{"line":1,"column":8}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":1,"column":8},"filename":"/cases/escape-chars.pug","end":{"line":1,"column":8}}}
+{"type":"text","loc":{"start":{"line":2,"column":3},"filename":"/cases/escape-chars.pug","end":{"line":2,"column":18}},"val":"var re = /\\d+/;"}
+{"type":"end-pipeless-text","loc":{"start":{"line":2,"column":18},"filename":"/cases/escape-chars.pug","end":{"line":2,"column":18}}}
+{"type":"eos","loc":{"start":{"line":2,"column":18},"filename":"/cases/escape-chars.pug","end":{"line":2,"column":18}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/escape-test.tokens.json b/packages/pug-parser/test/cases/escape-test.tokens.json
index cf5dbb074..21e5824c8 100644
--- a/packages/pug-parser/test/cases/escape-test.tokens.json
+++ b/packages/pug-parser/test/cases/escape-test.tokens.json
@@ -1,20 +1,20 @@
-{"type":"doctype","line":1,"col":1,"val":"html"}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"html"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"head"}
-{"type":"indent","line":4,"col":1,"val":8}
-{"type":"tag","line":4,"col":9,"val":"title"}
-{"type":"text","line":4,"col":15,"val":"escape-test"}
-{"type":"outdent","line":5,"col":5}
-{"type":"tag","line":5,"col":5,"val":"body"}
-{"type":"indent","line":6,"col":1,"val":8}
-{"type":"tag","line":6,"col":9,"val":"textarea"}
-{"type":"indent","line":7,"col":1,"val":12}
-{"type":"code","line":7,"col":13,"val":"var txt = '<param name=\"flashvars\" value=\"a=&quot;value_a&quot;&b=&quot;value_b&quot;&c=3\"/>'","mustEscape":false,"buffer":false}
-{"type":"newline","line":8,"col":1}
-{"type":"interpolated-code","line":8,"col":15,"val":"txt","mustEscape":true,"buffer":true}
-{"type":"outdent","line":9,"col":9}
-{"type":"outdent","line":9,"col":5}
-{"type":"outdent","line":9,"col":1}
-{"type":"eos","line":9,"col":1}
\ No newline at end of file
+{"type":"doctype","loc":{"start":{"line":1,"column":1},"filename":"/cases/escape-test.pug","end":{"line":1,"column":13}},"val":"html"}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/escape-test.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/escape-test.pug","end":{"line":2,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/escape-test.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/escape-test.pug","end":{"line":3,"column":9}},"val":"head"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/escape-test.pug","end":{"line":4,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":4,"column":9},"filename":"/cases/escape-test.pug","end":{"line":4,"column":14}},"val":"title"}
+{"type":"text","loc":{"start":{"line":4,"column":15},"filename":"/cases/escape-test.pug","end":{"line":4,"column":26}},"val":"escape-test"}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/escape-test.pug","end":{"line":5,"column":5}}}
+{"type":"tag","loc":{"start":{"line":5,"column":5},"filename":"/cases/escape-test.pug","end":{"line":5,"column":9}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/escape-test.pug","end":{"line":6,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":6,"column":9},"filename":"/cases/escape-test.pug","end":{"line":6,"column":17}},"val":"textarea"}
+{"type":"indent","loc":{"start":{"line":7,"column":1},"filename":"/cases/escape-test.pug","end":{"line":7,"column":13}},"val":12}
+{"type":"code","loc":{"start":{"line":7,"column":13},"filename":"/cases/escape-test.pug","end":{"line":7,"column":108}},"val":"var txt = '<param name=\"flashvars\" value=\"a=&quot;value_a&quot;&b=&quot;value_b&quot;&c=3\"/>'","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/escape-test.pug","end":{"line":8,"column":13}}}
+{"type":"interpolated-code","loc":{"start":{"line":8,"column":15},"filename":"/cases/escape-test.pug","end":{"line":8,"column":21}},"mustEscape":true,"buffer":true,"val":"txt"}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/escape-test.pug","end":{"line":9,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/escape-test.pug","end":{"line":9,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/escape-test.pug","end":{"line":9,"column":1}}}
+{"type":"eos","loc":{"start":{"line":9,"column":1},"filename":"/cases/escape-test.pug","end":{"line":9,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/escaping-class-attribute.tokens.json b/packages/pug-parser/test/cases/escaping-class-attribute.tokens.json
index 1a99b13a9..f5818f306 100644
--- a/packages/pug-parser/test/cases/escaping-class-attribute.tokens.json
+++ b/packages/pug-parser/test/cases/escaping-class-attribute.tokens.json
@@ -1,31 +1,31 @@
-{"type":"tag","line":1,"col":1,"val":"foo"}
-{"type":"start-attributes","line":1,"col":4}
-{"type":"attribute","line":1,"col":5,"name":"attr","val":"\"<%= bar %>\"","mustEscape":true}
-{"type":"end-attributes","line":1,"col":22}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"foo"}
-{"type":"start-attributes","line":2,"col":4}
-{"type":"attribute","line":2,"col":5,"name":"class","val":"\"<%= bar %>\"","mustEscape":true}
-{"type":"end-attributes","line":2,"col":23}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"foo"}
-{"type":"start-attributes","line":3,"col":4}
-{"type":"attribute","line":3,"col":5,"name":"attr","val":"\"<%= bar %>\"","mustEscape":false}
-{"type":"end-attributes","line":3,"col":23}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":1,"val":"foo"}
-{"type":"start-attributes","line":4,"col":4}
-{"type":"attribute","line":4,"col":5,"name":"class","val":"\"<%= bar %>\"","mustEscape":false}
-{"type":"end-attributes","line":4,"col":24}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":1,"val":"foo"}
-{"type":"start-attributes","line":5,"col":4}
-{"type":"attribute","line":5,"col":5,"name":"class","val":"\"<%= bar %> lol rofl\"","mustEscape":false}
-{"type":"end-attributes","line":5,"col":33}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":1,"val":"foo"}
-{"type":"start-attributes","line":6,"col":4}
-{"type":"attribute","line":6,"col":5,"name":"class","val":"\"<%= bar %> lol rofl <%= lmao %>\"","mustEscape":false}
-{"type":"end-attributes","line":6,"col":45}
-{"type":"newline","line":7,"col":1}
-{"type":"eos","line":7,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":1,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":1,"column":4},"filename":"/cases/escaping-class-attribute.pug","end":{"line":1,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":1,"column":5},"filename":"/cases/escaping-class-attribute.pug","end":{"line":1,"column":22}},"name":"attr","mustEscape":true,"val":"\"<%= bar %>\""}
+{"type":"end-attributes","loc":{"start":{"line":1,"column":22},"filename":"/cases/escaping-class-attribute.pug","end":{"line":1,"column":23}}}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":2,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":4},"filename":"/cases/escaping-class-attribute.pug","end":{"line":2,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":5},"filename":"/cases/escaping-class-attribute.pug","end":{"line":2,"column":23}},"name":"class","mustEscape":true,"val":"\"<%= bar %>\""}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":23},"filename":"/cases/escaping-class-attribute.pug","end":{"line":2,"column":24}}}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":3,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":4},"filename":"/cases/escaping-class-attribute.pug","end":{"line":3,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":5},"filename":"/cases/escaping-class-attribute.pug","end":{"line":3,"column":23}},"name":"attr","mustEscape":false,"val":"\"<%= bar %>\""}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":23},"filename":"/cases/escaping-class-attribute.pug","end":{"line":3,"column":24}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":4,"column":1}}}
+{"type":"tag","loc":{"start":{"line":4,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":4,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":4},"filename":"/cases/escaping-class-attribute.pug","end":{"line":4,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":5},"filename":"/cases/escaping-class-attribute.pug","end":{"line":4,"column":24}},"name":"class","mustEscape":false,"val":"\"<%= bar %>\""}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":24},"filename":"/cases/escaping-class-attribute.pug","end":{"line":4,"column":25}}}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":5,"column":1}}}
+{"type":"tag","loc":{"start":{"line":5,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":5,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":4},"filename":"/cases/escaping-class-attribute.pug","end":{"line":5,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":5},"filename":"/cases/escaping-class-attribute.pug","end":{"line":5,"column":33}},"name":"class","mustEscape":false,"val":"\"<%= bar %> lol rofl\""}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":33},"filename":"/cases/escaping-class-attribute.pug","end":{"line":5,"column":34}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":6,"column":1}}}
+{"type":"tag","loc":{"start":{"line":6,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":6,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":4},"filename":"/cases/escaping-class-attribute.pug","end":{"line":6,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":5},"filename":"/cases/escaping-class-attribute.pug","end":{"line":6,"column":45}},"name":"class","mustEscape":false,"val":"\"<%= bar %> lol rofl <%= lmao %>\""}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":45},"filename":"/cases/escaping-class-attribute.pug","end":{"line":6,"column":46}}}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":7,"column":1}}}
+{"type":"eos","loc":{"start":{"line":7,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":7,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filter-in-include.tokens.json b/packages/pug-parser/test/cases/filter-in-include.tokens.json
index 4620c87ab..281073fcf 100644
--- a/packages/pug-parser/test/cases/filter-in-include.tokens.json
+++ b/packages/pug-parser/test/cases/filter-in-include.tokens.json
@@ -1,4 +1,4 @@
-{"type":"include","line":1,"col":1}
-{"type":"path","line":1,"col":9,"val":"./auxiliary/filter-in-include.pug"}
-{"type":"newline","line":2,"col":1}
-{"type":"eos","line":2,"col":1}
\ No newline at end of file
+{"type":"include","loc":{"start":{"line":1,"column":1},"filename":"/cases/filter-in-include.pug","end":{"line":1,"column":8}}}
+{"type":"path","loc":{"start":{"line":1,"column":9},"filename":"/cases/filter-in-include.pug","end":{"line":1,"column":42}},"val":"./auxiliary/filter-in-include.pug"}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/filter-in-include.pug","end":{"line":2,"column":1}}}
+{"type":"eos","loc":{"start":{"line":2,"column":1},"filename":"/cases/filter-in-include.pug","end":{"line":2,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filters-empty.tokens.json b/packages/pug-parser/test/cases/filters-empty.tokens.json
index 9ee079a93..2910b2a60 100644
--- a/packages/pug-parser/test/cases/filters-empty.tokens.json
+++ b/packages/pug-parser/test/cases/filters-empty.tokens.json
@@ -1,16 +1,16 @@
-{"type":"code","line":1,"col":1,"val":"var users = [{ name: 'tobi', age: 2 }]","mustEscape":false,"buffer":false}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"fb:users"}
-{"type":"indent","line":4,"col":1,"val":2}
-{"type":"each","line":4,"col":3,"val":"user","key":null,"code":"users"}
-{"type":"indent","line":5,"col":1,"val":4}
-{"type":"tag","line":5,"col":5,"val":"fb:user"}
-{"type":"start-attributes","line":5,"col":12}
-{"type":"attribute","line":5,"col":13,"name":"age","val":"user.age","mustEscape":true}
-{"type":"end-attributes","line":5,"col":25}
-{"type":"indent","line":6,"col":1,"val":6}
-{"type":"filter","line":6,"col":7,"val":"cdata"}
-{"type":"outdent","line":7,"col":5}
-{"type":"outdent","line":7,"col":3}
-{"type":"outdent","line":7,"col":1}
-{"type":"eos","line":7,"col":1}
\ No newline at end of file
+{"type":"code","loc":{"start":{"line":1,"column":1},"filename":"/cases/filters-empty.pug","end":{"line":1,"column":41}},"val":"var users = [{ name: 'tobi', age: 2 }]","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/filters-empty.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/filters-empty.pug","end":{"line":3,"column":9}},"val":"fb:users"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/filters-empty.pug","end":{"line":4,"column":3}},"val":2}
+{"type":"each","loc":{"start":{"line":4,"column":3},"filename":"/cases/filters-empty.pug","end":{"line":4,"column":20}},"val":"user","key":null,"code":"users"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/filters-empty.pug","end":{"line":5,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":5,"column":5},"filename":"/cases/filters-empty.pug","end":{"line":5,"column":12}},"val":"fb:user"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":12},"filename":"/cases/filters-empty.pug","end":{"line":5,"column":13}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":13},"filename":"/cases/filters-empty.pug","end":{"line":5,"column":25}},"name":"age","mustEscape":true,"val":"user.age"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":25},"filename":"/cases/filters-empty.pug","end":{"line":5,"column":26}}}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/filters-empty.pug","end":{"line":6,"column":7}},"val":6}
+{"type":"filter","loc":{"start":{"line":6,"column":7},"filename":"/cases/filters-empty.pug","end":{"line":6,"column":13}},"val":"cdata"}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/filters-empty.pug","end":{"line":7,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/filters-empty.pug","end":{"line":7,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/filters-empty.pug","end":{"line":7,"column":1}}}
+{"type":"eos","loc":{"start":{"line":7,"column":1},"filename":"/cases/filters-empty.pug","end":{"line":7,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filters.coffeescript.tokens.json b/packages/pug-parser/test/cases/filters.coffeescript.tokens.json
index c8449f5c2..95493914b 100644
--- a/packages/pug-parser/test/cases/filters.coffeescript.tokens.json
+++ b/packages/pug-parser/test/cases/filters.coffeescript.tokens.json
@@ -1,21 +1,21 @@
-{"type":"tag","line":1,"col":1,"val":"script"}
-{"type":"start-attributes","line":1,"col":7}
-{"type":"attribute","line":1,"col":8,"name":"type","val":"'text/javascript'","mustEscape":true}
-{"type":"end-attributes","line":1,"col":30}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"filter","line":2,"col":3,"val":"coffee-script"}
-{"type":"start-pipeless-text","line":2,"col":17}
-{"type":"text","line":3,"col":5,"val":"regexp = /\\n/"}
-{"type":"end-pipeless-text","line":3,"col":18}
-{"type":"newline","line":4,"col":1}
-{"type":"filter","line":4,"col":3,"val":"coffee-script"}
-{"type":"start-attributes","line":4,"col":17}
-{"type":"attribute","line":4,"col":18,"name":"minify","val":"true","mustEscape":true}
-{"type":"end-attributes","line":4,"col":29}
-{"type":"start-pipeless-text","line":4,"col":30}
-{"type":"text","line":5,"col":5,"val":"math ="}
-{"type":"newline","line":6,"col":1}
-{"type":"text","line":6,"col":5,"val":"  square: (value) -> value * value"}
-{"type":"end-pipeless-text","line":6,"col":39}
-{"type":"outdent","line":6,"col":39}
-{"type":"eos","line":6,"col":39}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/filters.coffeescript.pug","end":{"line":1,"column":7}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":1,"column":7},"filename":"/cases/filters.coffeescript.pug","end":{"line":1,"column":8}}}
+{"type":"attribute","loc":{"start":{"line":1,"column":8},"filename":"/cases/filters.coffeescript.pug","end":{"line":1,"column":30}},"name":"type","mustEscape":true,"val":"'text/javascript'"}
+{"type":"end-attributes","loc":{"start":{"line":1,"column":30},"filename":"/cases/filters.coffeescript.pug","end":{"line":1,"column":31}}}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/filters.coffeescript.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"filter","loc":{"start":{"line":2,"column":3},"filename":"/cases/filters.coffeescript.pug","end":{"line":2,"column":17}},"val":"coffee-script"}
+{"type":"start-pipeless-text","loc":{"start":{"line":2,"column":17},"filename":"/cases/filters.coffeescript.pug","end":{"line":2,"column":17}}}
+{"type":"text","loc":{"start":{"line":3,"column":5},"filename":"/cases/filters.coffeescript.pug","end":{"line":3,"column":18}},"val":"regexp = /\\n/"}
+{"type":"end-pipeless-text","loc":{"start":{"line":3,"column":18},"filename":"/cases/filters.coffeescript.pug","end":{"line":3,"column":18}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/filters.coffeescript.pug","end":{"line":4,"column":3}}}
+{"type":"filter","loc":{"start":{"line":4,"column":3},"filename":"/cases/filters.coffeescript.pug","end":{"line":4,"column":17}},"val":"coffee-script"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":17},"filename":"/cases/filters.coffeescript.pug","end":{"line":4,"column":18}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":18},"filename":"/cases/filters.coffeescript.pug","end":{"line":4,"column":29}},"name":"minify","mustEscape":true,"val":"true"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":29},"filename":"/cases/filters.coffeescript.pug","end":{"line":4,"column":30}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":4,"column":30},"filename":"/cases/filters.coffeescript.pug","end":{"line":4,"column":30}}}
+{"type":"text","loc":{"start":{"line":5,"column":5},"filename":"/cases/filters.coffeescript.pug","end":{"line":5,"column":11}},"val":"math ="}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/filters.coffeescript.pug","end":{"line":6,"column":5}}}
+{"type":"text","loc":{"start":{"line":6,"column":5},"filename":"/cases/filters.coffeescript.pug","end":{"line":6,"column":39}},"val":"  square: (value) -> value * value"}
+{"type":"end-pipeless-text","loc":{"start":{"line":6,"column":39},"filename":"/cases/filters.coffeescript.pug","end":{"line":6,"column":39}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":39},"filename":"/cases/filters.coffeescript.pug","end":{"line":6,"column":39}}}
+{"type":"eos","loc":{"start":{"line":6,"column":39},"filename":"/cases/filters.coffeescript.pug","end":{"line":6,"column":39}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filters.custom.tokens.json b/packages/pug-parser/test/cases/filters.custom.tokens.json
index 785c11514..6117b2b88 100644
--- a/packages/pug-parser/test/cases/filters.custom.tokens.json
+++ b/packages/pug-parser/test/cases/filters.custom.tokens.json
@@ -1,21 +1,21 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"filter","line":3,"col":5,"val":"custom"}
-{"type":"start-attributes","line":3,"col":12}
-{"type":"attribute","line":3,"col":13,"name":"opt","val":"'val'","mustEscape":true}
-{"type":"attribute","line":3,"col":23,"name":"num","val":"2","mustEscape":true}
-{"type":"end-attributes","line":3,"col":28}
-{"type":"start-pipeless-text","line":3,"col":29}
-{"type":"text","line":4,"col":7,"val":"Line 1"}
-{"type":"newline","line":5,"col":1}
-{"type":"text","line":5,"col":7,"val":"Line 2"}
-{"type":"newline","line":6,"col":1}
-{"type":"text","line":6,"col":7,"val":""}
-{"type":"newline","line":7,"col":1}
-{"type":"text","line":7,"col":7,"val":"Line 4"}
-{"type":"end-pipeless-text","line":7,"col":13}
-{"type":"outdent","line":7,"col":13}
-{"type":"outdent","line":7,"col":13}
-{"type":"eos","line":7,"col":13}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/filters.custom.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/filters.custom.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/filters.custom.pug","end":{"line":2,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/filters.custom.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"filter","loc":{"start":{"line":3,"column":5},"filename":"/cases/filters.custom.pug","end":{"line":3,"column":12}},"val":"custom"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":12},"filename":"/cases/filters.custom.pug","end":{"line":3,"column":13}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":13},"filename":"/cases/filters.custom.pug","end":{"line":3,"column":22}},"name":"opt","mustEscape":true,"val":"'val'"}
+{"type":"attribute","loc":{"start":{"line":3,"column":23},"filename":"/cases/filters.custom.pug","end":{"line":3,"column":28}},"name":"num","mustEscape":true,"val":"2"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":28},"filename":"/cases/filters.custom.pug","end":{"line":3,"column":29}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":3,"column":29},"filename":"/cases/filters.custom.pug","end":{"line":3,"column":29}}}
+{"type":"text","loc":{"start":{"line":4,"column":7},"filename":"/cases/filters.custom.pug","end":{"line":4,"column":13}},"val":"Line 1"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/filters.custom.pug","end":{"line":5,"column":7}}}
+{"type":"text","loc":{"start":{"line":5,"column":7},"filename":"/cases/filters.custom.pug","end":{"line":5,"column":13}},"val":"Line 2"}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/filters.custom.pug","end":{"line":6,"column":1}}}
+{"type":"text","loc":{"start":{"line":6,"column":1},"filename":"/cases/filters.custom.pug","end":{"line":6,"column":1}},"val":""}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/filters.custom.pug","end":{"line":7,"column":7}}}
+{"type":"text","loc":{"start":{"line":7,"column":7},"filename":"/cases/filters.custom.pug","end":{"line":7,"column":13}},"val":"Line 4"}
+{"type":"end-pipeless-text","loc":{"start":{"line":7,"column":13},"filename":"/cases/filters.custom.pug","end":{"line":7,"column":13}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":13},"filename":"/cases/filters.custom.pug","end":{"line":7,"column":13}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":13},"filename":"/cases/filters.custom.pug","end":{"line":7,"column":13}}}
+{"type":"eos","loc":{"start":{"line":7,"column":13},"filename":"/cases/filters.custom.pug","end":{"line":7,"column":13}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filters.include.custom.tokens.json b/packages/pug-parser/test/cases/filters.include.custom.tokens.json
index 63778a17d..f2a91e187 100644
--- a/packages/pug-parser/test/cases/filters.include.custom.tokens.json
+++ b/packages/pug-parser/test/cases/filters.include.custom.tokens.json
@@ -1,17 +1,17 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"pre"}
-{"type":"indent","line":4,"col":1,"val":6}
-{"type":"include","line":4,"col":7}
-{"type":"filter","line":4,"col":14,"val":"custom"}
-{"type":"start-attributes","line":4,"col":21}
-{"type":"attribute","line":4,"col":22,"name":"opt","val":"'val'","mustEscape":true}
-{"type":"attribute","line":4,"col":32,"name":"num","val":"2","mustEscape":true}
-{"type":"end-attributes","line":4,"col":37}
-{"type":"path","line":4,"col":39,"val":"filters.include.custom.pug"}
-{"type":"outdent","line":5,"col":5}
-{"type":"outdent","line":5,"col":3}
-{"type":"outdent","line":5,"col":1}
-{"type":"eos","line":5,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/filters.include.custom.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/filters.include.custom.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/filters.include.custom.pug","end":{"line":2,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/filters.include.custom.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/filters.include.custom.pug","end":{"line":3,"column":8}},"val":"pre"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/filters.include.custom.pug","end":{"line":4,"column":7}},"val":6}
+{"type":"include","loc":{"start":{"line":4,"column":7},"filename":"/cases/filters.include.custom.pug","end":{"line":4,"column":14}}}
+{"type":"filter","loc":{"start":{"line":4,"column":14},"filename":"/cases/filters.include.custom.pug","end":{"line":4,"column":21}},"val":"custom"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":21},"filename":"/cases/filters.include.custom.pug","end":{"line":4,"column":22}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":22},"filename":"/cases/filters.include.custom.pug","end":{"line":4,"column":31}},"name":"opt","mustEscape":true,"val":"'val'"}
+{"type":"attribute","loc":{"start":{"line":4,"column":32},"filename":"/cases/filters.include.custom.pug","end":{"line":4,"column":37}},"name":"num","mustEscape":true,"val":"2"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":37},"filename":"/cases/filters.include.custom.pug","end":{"line":4,"column":38}}}
+{"type":"path","loc":{"start":{"line":4,"column":39},"filename":"/cases/filters.include.custom.pug","end":{"line":4,"column":65}},"val":"filters.include.custom.pug"}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/filters.include.custom.pug","end":{"line":5,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/filters.include.custom.pug","end":{"line":5,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/filters.include.custom.pug","end":{"line":5,"column":1}}}
+{"type":"eos","loc":{"start":{"line":5,"column":1},"filename":"/cases/filters.include.custom.pug","end":{"line":5,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filters.include.tokens.json b/packages/pug-parser/test/cases/filters.include.tokens.json
index a2c1ac153..4ae9daea4 100644
--- a/packages/pug-parser/test/cases/filters.include.tokens.json
+++ b/packages/pug-parser/test/cases/filters.include.tokens.json
@@ -1,30 +1,30 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"include","line":3,"col":5}
-{"type":"filter","line":3,"col":12,"val":"markdown-it"}
-{"type":"path","line":3,"col":25,"val":"some.md"}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":5,"val":"script"}
-{"type":"indent","line":5,"col":1,"val":6}
-{"type":"include","line":5,"col":7}
-{"type":"filter","line":5,"col":14,"val":"coffee-script"}
-{"type":"start-attributes","line":5,"col":28}
-{"type":"attribute","line":5,"col":29,"name":"minify","val":"true","mustEscape":true}
-{"type":"end-attributes","line":5,"col":40}
-{"type":"path","line":5,"col":42,"val":"include-filter-coffee.coffee"}
-{"type":"outdent","line":6,"col":5}
-{"type":"tag","line":6,"col":5,"val":"script"}
-{"type":"indent","line":7,"col":1,"val":6}
-{"type":"include","line":7,"col":7}
-{"type":"filter","line":7,"col":14,"val":"cdata"}
-{"type":"filter","line":7,"col":20,"val":"coffee-script"}
-{"type":"start-attributes","line":7,"col":34}
-{"type":"attribute","line":7,"col":35,"name":"minify","val":"false","mustEscape":true}
-{"type":"end-attributes","line":7,"col":47}
-{"type":"path","line":7,"col":49,"val":"include-filter-coffee.coffee"}
-{"type":"outdent","line":8,"col":5}
-{"type":"outdent","line":8,"col":3}
-{"type":"outdent","line":8,"col":1}
-{"type":"eos","line":8,"col":1}
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/filters.include.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/filters.include.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/filters.include.pug","end":{"line":2,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/filters.include.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"include","loc":{"start":{"line":3,"column":5},"filename":"/cases/filters.include.pug","end":{"line":3,"column":12}}}
+{"type":"filter","loc":{"start":{"line":3,"column":12},"filename":"/cases/filters.include.pug","end":{"line":3,"column":24}},"val":"markdown-it"}
+{"type":"path","loc":{"start":{"line":3,"column":25},"filename":"/cases/filters.include.pug","end":{"line":3,"column":32}},"val":"some.md"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/filters.include.pug","end":{"line":4,"column":5}}}
+{"type":"tag","loc":{"start":{"line":4,"column":5},"filename":"/cases/filters.include.pug","end":{"line":4,"column":11}},"val":"script"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/filters.include.pug","end":{"line":5,"column":7}},"val":6}
+{"type":"include","loc":{"start":{"line":5,"column":7},"filename":"/cases/filters.include.pug","end":{"line":5,"column":14}}}
+{"type":"filter","loc":{"start":{"line":5,"column":14},"filename":"/cases/filters.include.pug","end":{"line":5,"column":28}},"val":"coffee-script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":28},"filename":"/cases/filters.include.pug","end":{"line":5,"column":29}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":29},"filename":"/cases/filters.include.pug","end":{"line":5,"column":40}},"name":"minify","mustEscape":true,"val":"true"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":40},"filename":"/cases/filters.include.pug","end":{"line":5,"column":41}}}
+{"type":"path","loc":{"start":{"line":5,"column":42},"filename":"/cases/filters.include.pug","end":{"line":5,"column":70}},"val":"include-filter-coffee.coffee"}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/filters.include.pug","end":{"line":6,"column":5}}}
+{"type":"tag","loc":{"start":{"line":6,"column":5},"filename":"/cases/filters.include.pug","end":{"line":6,"column":11}},"val":"script"}
+{"type":"indent","loc":{"start":{"line":7,"column":1},"filename":"/cases/filters.include.pug","end":{"line":7,"column":7}},"val":6}
+{"type":"include","loc":{"start":{"line":7,"column":7},"filename":"/cases/filters.include.pug","end":{"line":7,"column":14}}}
+{"type":"filter","loc":{"start":{"line":7,"column":14},"filename":"/cases/filters.include.pug","end":{"line":7,"column":20}},"val":"cdata"}
+{"type":"filter","loc":{"start":{"line":7,"column":20},"filename":"/cases/filters.include.pug","end":{"line":7,"column":34}},"val":"coffee-script"}
+{"type":"start-attributes","loc":{"start":{"line":7,"column":34},"filename":"/cases/filters.include.pug","end":{"line":7,"column":35}}}
+{"type":"attribute","loc":{"start":{"line":7,"column":35},"filename":"/cases/filters.include.pug","end":{"line":7,"column":47}},"name":"minify","mustEscape":true,"val":"false"}
+{"type":"end-attributes","loc":{"start":{"line":7,"column":47},"filename":"/cases/filters.include.pug","end":{"line":7,"column":48}}}
+{"type":"path","loc":{"start":{"line":7,"column":49},"filename":"/cases/filters.include.pug","end":{"line":7,"column":77}},"val":"include-filter-coffee.coffee"}
+{"type":"outdent","loc":{"start":{"line":8,"column":1},"filename":"/cases/filters.include.pug","end":{"line":8,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":8,"column":1},"filename":"/cases/filters.include.pug","end":{"line":8,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":8,"column":1},"filename":"/cases/filters.include.pug","end":{"line":8,"column":1}}}
+{"type":"eos","loc":{"start":{"line":8,"column":1},"filename":"/cases/filters.include.pug","end":{"line":8,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filters.inline.tokens.json b/packages/pug-parser/test/cases/filters.inline.tokens.json
index 556e1bf47..f0a3dcbcb 100644
--- a/packages/pug-parser/test/cases/filters.inline.tokens.json
+++ b/packages/pug-parser/test/cases/filters.inline.tokens.json
@@ -1,8 +1,8 @@
-{"type":"tag","line":1,"col":1,"val":"p"}
-{"type":"text","line":1,"col":3,"val":"before "}
-{"type":"start-pug-interpolation","line":1,"col":10}
-{"type":"filter","line":1,"col":12,"val":"cdata"}
-{"type":"text","line":1,"col":19,"val":"inside"}
-{"type":"end-pug-interpolation","line":1,"col":25}
-{"type":"text","line":1,"col":26,"val":" after"}
-{"type":"eos","line":1,"col":32}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/filters.inline.pug","end":{"line":1,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":1,"column":3},"filename":"/cases/filters.inline.pug","end":{"line":1,"column":10}},"val":"before "}
+{"type":"start-pug-interpolation","loc":{"start":{"line":1,"column":10},"filename":"/cases/filters.inline.pug","end":{"line":1,"column":12}}}
+{"type":"filter","loc":{"start":{"line":1,"column":12},"filename":"/cases/filters.inline.pug","end":{"line":1,"column":18}},"val":"cdata"}
+{"type":"text","loc":{"start":{"line":1,"column":19},"filename":"/cases/filters.inline.pug","end":{"line":1,"column":25}},"val":"inside"}
+{"type":"end-pug-interpolation","loc":{"start":{"line":1,"column":25},"filename":"/cases/filters.inline.pug","end":{"line":1,"column":26}}}
+{"type":"text","loc":{"start":{"line":1,"column":26},"filename":"/cases/filters.inline.pug","end":{"line":1,"column":32}},"val":" after"}
+{"type":"eos","loc":{"start":{"line":1,"column":32},"filename":"/cases/filters.inline.pug","end":{"line":1,"column":32}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filters.less.tokens.json b/packages/pug-parser/test/cases/filters.less.tokens.json
index 7b83b51f6..1e04ad19f 100644
--- a/packages/pug-parser/test/cases/filters.less.tokens.json
+++ b/packages/pug-parser/test/cases/filters.less.tokens.json
@@ -1,23 +1,23 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"head"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"style"}
-{"type":"start-attributes","line":3,"col":10}
-{"type":"attribute","line":3,"col":11,"name":"type","val":"\"text/css\"","mustEscape":true}
-{"type":"end-attributes","line":3,"col":26}
-{"type":"indent","line":4,"col":1,"val":6}
-{"type":"filter","line":4,"col":7,"val":"less"}
-{"type":"start-pipeless-text","line":4,"col":12}
-{"type":"text","line":5,"col":9,"val":"@pad: 15px;"}
-{"type":"newline","line":6,"col":1}
-{"type":"text","line":6,"col":9,"val":"body {"}
-{"type":"newline","line":7,"col":1}
-{"type":"text","line":7,"col":9,"val":"  padding: @pad;"}
-{"type":"newline","line":8,"col":1}
-{"type":"text","line":8,"col":9,"val":"}"}
-{"type":"end-pipeless-text","line":8,"col":10}
-{"type":"outdent","line":8,"col":10}
-{"type":"outdent","line":8,"col":10}
-{"type":"outdent","line":8,"col":10}
-{"type":"eos","line":8,"col":10}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/filters.less.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/filters.less.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/filters.less.pug","end":{"line":2,"column":7}},"val":"head"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/filters.less.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/filters.less.pug","end":{"line":3,"column":10}},"val":"style"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":10},"filename":"/cases/filters.less.pug","end":{"line":3,"column":11}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":11},"filename":"/cases/filters.less.pug","end":{"line":3,"column":26}},"name":"type","mustEscape":true,"val":"\"text/css\""}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":26},"filename":"/cases/filters.less.pug","end":{"line":3,"column":27}}}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/filters.less.pug","end":{"line":4,"column":7}},"val":6}
+{"type":"filter","loc":{"start":{"line":4,"column":7},"filename":"/cases/filters.less.pug","end":{"line":4,"column":12}},"val":"less"}
+{"type":"start-pipeless-text","loc":{"start":{"line":4,"column":12},"filename":"/cases/filters.less.pug","end":{"line":4,"column":12}}}
+{"type":"text","loc":{"start":{"line":5,"column":9},"filename":"/cases/filters.less.pug","end":{"line":5,"column":20}},"val":"@pad: 15px;"}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/filters.less.pug","end":{"line":6,"column":9}}}
+{"type":"text","loc":{"start":{"line":6,"column":9},"filename":"/cases/filters.less.pug","end":{"line":6,"column":15}},"val":"body {"}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/filters.less.pug","end":{"line":7,"column":9}}}
+{"type":"text","loc":{"start":{"line":7,"column":9},"filename":"/cases/filters.less.pug","end":{"line":7,"column":25}},"val":"  padding: @pad;"}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/filters.less.pug","end":{"line":8,"column":9}}}
+{"type":"text","loc":{"start":{"line":8,"column":9},"filename":"/cases/filters.less.pug","end":{"line":8,"column":10}},"val":"}"}
+{"type":"end-pipeless-text","loc":{"start":{"line":8,"column":10},"filename":"/cases/filters.less.pug","end":{"line":8,"column":10}}}
+{"type":"outdent","loc":{"start":{"line":8,"column":10},"filename":"/cases/filters.less.pug","end":{"line":8,"column":10}}}
+{"type":"outdent","loc":{"start":{"line":8,"column":10},"filename":"/cases/filters.less.pug","end":{"line":8,"column":10}}}
+{"type":"outdent","loc":{"start":{"line":8,"column":10},"filename":"/cases/filters.less.pug","end":{"line":8,"column":10}}}
+{"type":"eos","loc":{"start":{"line":8,"column":10},"filename":"/cases/filters.less.pug","end":{"line":8,"column":10}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filters.markdown.tokens.json b/packages/pug-parser/test/cases/filters.markdown.tokens.json
index 96fd94d91..64323a305 100644
--- a/packages/pug-parser/test/cases/filters.markdown.tokens.json
+++ b/packages/pug-parser/test/cases/filters.markdown.tokens.json
@@ -1,13 +1,13 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"filter","line":3,"col":5,"val":"markdown-it"}
-{"type":"start-pipeless-text","line":3,"col":17}
-{"type":"text","line":4,"col":7,"val":"This is _some_ awesome **markdown**"}
-{"type":"newline","line":5,"col":1}
-{"type":"text","line":5,"col":7,"val":"whoop."}
-{"type":"end-pipeless-text","line":5,"col":13}
-{"type":"outdent","line":5,"col":13}
-{"type":"outdent","line":5,"col":13}
-{"type":"eos","line":5,"col":13}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/filters.markdown.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/filters.markdown.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/filters.markdown.pug","end":{"line":2,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/filters.markdown.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"filter","loc":{"start":{"line":3,"column":5},"filename":"/cases/filters.markdown.pug","end":{"line":3,"column":17}},"val":"markdown-it"}
+{"type":"start-pipeless-text","loc":{"start":{"line":3,"column":17},"filename":"/cases/filters.markdown.pug","end":{"line":3,"column":17}}}
+{"type":"text","loc":{"start":{"line":4,"column":7},"filename":"/cases/filters.markdown.pug","end":{"line":4,"column":42}},"val":"This is _some_ awesome **markdown**"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/filters.markdown.pug","end":{"line":5,"column":7}}}
+{"type":"text","loc":{"start":{"line":5,"column":7},"filename":"/cases/filters.markdown.pug","end":{"line":5,"column":13}},"val":"whoop."}
+{"type":"end-pipeless-text","loc":{"start":{"line":5,"column":13},"filename":"/cases/filters.markdown.pug","end":{"line":5,"column":13}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":13},"filename":"/cases/filters.markdown.pug","end":{"line":5,"column":13}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":13},"filename":"/cases/filters.markdown.pug","end":{"line":5,"column":13}}}
+{"type":"eos","loc":{"start":{"line":5,"column":13},"filename":"/cases/filters.markdown.pug","end":{"line":5,"column":13}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filters.nested.tokens.json b/packages/pug-parser/test/cases/filters.nested.tokens.json
index d59cbfa2a..7d8856c9a 100644
--- a/packages/pug-parser/test/cases/filters.nested.tokens.json
+++ b/packages/pug-parser/test/cases/filters.nested.tokens.json
@@ -1,26 +1,26 @@
-{"type":"tag","line":1,"col":1,"val":"script"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"filter","line":2,"col":3,"val":"cdata"}
-{"type":"filter","line":2,"col":9,"val":"uglify-js"}
-{"type":"start-pipeless-text","line":2,"col":19}
-{"type":"text","line":3,"col":5,"val":"(function() {"}
-{"type":"newline","line":4,"col":1}
-{"type":"text","line":4,"col":5,"val":"  console.log('test')"}
-{"type":"newline","line":5,"col":1}
-{"type":"text","line":5,"col":5,"val":"})()"}
-{"type":"end-pipeless-text","line":5,"col":9}
-{"type":"outdent","line":6,"col":1}
-{"type":"tag","line":6,"col":1,"val":"script"}
-{"type":"indent","line":7,"col":1,"val":2}
-{"type":"filter","line":7,"col":3,"val":"cdata"}
-{"type":"filter","line":7,"col":9,"val":"uglify-js"}
-{"type":"filter","line":7,"col":19,"val":"coffee-script"}
-{"type":"start-pipeless-text","line":7,"col":33}
-{"type":"text","line":8,"col":5,"val":"(->"}
-{"type":"newline","line":9,"col":1}
-{"type":"text","line":9,"col":5,"val":"  console.log 'test'"}
-{"type":"newline","line":10,"col":1}
-{"type":"text","line":10,"col":5,"val":")()"}
-{"type":"end-pipeless-text","line":10,"col":8}
-{"type":"outdent","line":10,"col":8}
-{"type":"eos","line":10,"col":8}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/filters.nested.pug","end":{"line":1,"column":7}},"val":"script"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/filters.nested.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"filter","loc":{"start":{"line":2,"column":3},"filename":"/cases/filters.nested.pug","end":{"line":2,"column":9}},"val":"cdata"}
+{"type":"filter","loc":{"start":{"line":2,"column":9},"filename":"/cases/filters.nested.pug","end":{"line":2,"column":19}},"val":"uglify-js"}
+{"type":"start-pipeless-text","loc":{"start":{"line":2,"column":19},"filename":"/cases/filters.nested.pug","end":{"line":2,"column":19}}}
+{"type":"text","loc":{"start":{"line":3,"column":5},"filename":"/cases/filters.nested.pug","end":{"line":3,"column":18}},"val":"(function() {"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/filters.nested.pug","end":{"line":4,"column":5}}}
+{"type":"text","loc":{"start":{"line":4,"column":5},"filename":"/cases/filters.nested.pug","end":{"line":4,"column":26}},"val":"  console.log('test')"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/filters.nested.pug","end":{"line":5,"column":5}}}
+{"type":"text","loc":{"start":{"line":5,"column":5},"filename":"/cases/filters.nested.pug","end":{"line":5,"column":9}},"val":"})()"}
+{"type":"end-pipeless-text","loc":{"start":{"line":5,"column":9},"filename":"/cases/filters.nested.pug","end":{"line":5,"column":9}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/filters.nested.pug","end":{"line":6,"column":1}}}
+{"type":"tag","loc":{"start":{"line":6,"column":1},"filename":"/cases/filters.nested.pug","end":{"line":6,"column":7}},"val":"script"}
+{"type":"indent","loc":{"start":{"line":7,"column":1},"filename":"/cases/filters.nested.pug","end":{"line":7,"column":3}},"val":2}
+{"type":"filter","loc":{"start":{"line":7,"column":3},"filename":"/cases/filters.nested.pug","end":{"line":7,"column":9}},"val":"cdata"}
+{"type":"filter","loc":{"start":{"line":7,"column":9},"filename":"/cases/filters.nested.pug","end":{"line":7,"column":19}},"val":"uglify-js"}
+{"type":"filter","loc":{"start":{"line":7,"column":19},"filename":"/cases/filters.nested.pug","end":{"line":7,"column":33}},"val":"coffee-script"}
+{"type":"start-pipeless-text","loc":{"start":{"line":7,"column":33},"filename":"/cases/filters.nested.pug","end":{"line":7,"column":33}}}
+{"type":"text","loc":{"start":{"line":8,"column":5},"filename":"/cases/filters.nested.pug","end":{"line":8,"column":8}},"val":"(->"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/filters.nested.pug","end":{"line":9,"column":5}}}
+{"type":"text","loc":{"start":{"line":9,"column":5},"filename":"/cases/filters.nested.pug","end":{"line":9,"column":25}},"val":"  console.log 'test'"}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/filters.nested.pug","end":{"line":10,"column":5}}}
+{"type":"text","loc":{"start":{"line":10,"column":5},"filename":"/cases/filters.nested.pug","end":{"line":10,"column":8}},"val":")()"}
+{"type":"end-pipeless-text","loc":{"start":{"line":10,"column":8},"filename":"/cases/filters.nested.pug","end":{"line":10,"column":8}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":8},"filename":"/cases/filters.nested.pug","end":{"line":10,"column":8}}}
+{"type":"eos","loc":{"start":{"line":10,"column":8},"filename":"/cases/filters.nested.pug","end":{"line":10,"column":8}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filters.stylus.tokens.json b/packages/pug-parser/test/cases/filters.stylus.tokens.json
index e8fd8b56d..d23ec5b68 100644
--- a/packages/pug-parser/test/cases/filters.stylus.tokens.json
+++ b/packages/pug-parser/test/cases/filters.stylus.tokens.json
@@ -1,20 +1,20 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"head"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"style"}
-{"type":"start-attributes","line":3,"col":10}
-{"type":"attribute","line":3,"col":11,"name":"type","val":"\"text/css\"","mustEscape":true}
-{"type":"end-attributes","line":3,"col":26}
-{"type":"indent","line":4,"col":1,"val":6}
-{"type":"filter","line":4,"col":7,"val":"stylus"}
-{"type":"start-pipeless-text","line":4,"col":14}
-{"type":"text","line":5,"col":9,"val":"body"}
-{"type":"newline","line":6,"col":1}
-{"type":"text","line":6,"col":9,"val":"  padding: 50px"}
-{"type":"end-pipeless-text","line":6,"col":24}
-{"type":"outdent","line":7,"col":5}
-{"type":"outdent","line":7,"col":3}
-{"type":"tag","line":7,"col":3,"val":"body"}
-{"type":"outdent","line":8,"col":1}
-{"type":"eos","line":8,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/filters.stylus.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/filters.stylus.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/filters.stylus.pug","end":{"line":2,"column":7}},"val":"head"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/filters.stylus.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/filters.stylus.pug","end":{"line":3,"column":10}},"val":"style"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":10},"filename":"/cases/filters.stylus.pug","end":{"line":3,"column":11}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":11},"filename":"/cases/filters.stylus.pug","end":{"line":3,"column":26}},"name":"type","mustEscape":true,"val":"\"text/css\""}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":26},"filename":"/cases/filters.stylus.pug","end":{"line":3,"column":27}}}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/filters.stylus.pug","end":{"line":4,"column":7}},"val":6}
+{"type":"filter","loc":{"start":{"line":4,"column":7},"filename":"/cases/filters.stylus.pug","end":{"line":4,"column":14}},"val":"stylus"}
+{"type":"start-pipeless-text","loc":{"start":{"line":4,"column":14},"filename":"/cases/filters.stylus.pug","end":{"line":4,"column":14}}}
+{"type":"text","loc":{"start":{"line":5,"column":9},"filename":"/cases/filters.stylus.pug","end":{"line":5,"column":13}},"val":"body"}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/filters.stylus.pug","end":{"line":6,"column":9}}}
+{"type":"text","loc":{"start":{"line":6,"column":9},"filename":"/cases/filters.stylus.pug","end":{"line":6,"column":24}},"val":"  padding: 50px"}
+{"type":"end-pipeless-text","loc":{"start":{"line":6,"column":24},"filename":"/cases/filters.stylus.pug","end":{"line":6,"column":24}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/filters.stylus.pug","end":{"line":7,"column":3}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/filters.stylus.pug","end":{"line":7,"column":3}}}
+{"type":"tag","loc":{"start":{"line":7,"column":3},"filename":"/cases/filters.stylus.pug","end":{"line":7,"column":7}},"val":"body"}
+{"type":"outdent","loc":{"start":{"line":8,"column":1},"filename":"/cases/filters.stylus.pug","end":{"line":8,"column":1}}}
+{"type":"eos","loc":{"start":{"line":8,"column":1},"filename":"/cases/filters.stylus.pug","end":{"line":8,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filters.verbatim.tokens.json b/packages/pug-parser/test/cases/filters.verbatim.tokens.json
new file mode 100644
index 000000000..21a79d340
--- /dev/null
+++ b/packages/pug-parser/test/cases/filters.verbatim.tokens.json
@@ -0,0 +1,13 @@
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/filters.verbatim.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/filters.verbatim.pug","end":{"line":2,"column":2}},"val":1}
+{"type":"tag","loc":{"start":{"line":2,"column":2},"filename":"/cases/filters.verbatim.pug","end":{"line":2,"column":5}},"val":"div"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/filters.verbatim.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"filter","loc":{"start":{"line":3,"column":3},"filename":"/cases/filters.verbatim.pug","end":{"line":3,"column":12}},"val":"verbatim"}
+{"type":"start-pipeless-text","loc":{"start":{"line":3,"column":12},"filename":"/cases/filters.verbatim.pug","end":{"line":3,"column":12}}}
+{"type":"text","loc":{"start":{"line":4,"column":5},"filename":"/cases/filters.verbatim.pug","end":{"line":4,"column":40}},"val":"filters are applied at compile time"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/filters.verbatim.pug","end":{"line":5,"column":5}}}
+{"type":"text","loc":{"start":{"line":5,"column":5},"filename":"/cases/filters.verbatim.pug","end":{"line":5,"column":41}},"val":"with no #[b interpolation] at #{all}"}
+{"type":"end-pipeless-text","loc":{"start":{"line":5,"column":41},"filename":"/cases/filters.verbatim.pug","end":{"line":5,"column":41}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":41},"filename":"/cases/filters.verbatim.pug","end":{"line":5,"column":41}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":41},"filename":"/cases/filters.verbatim.pug","end":{"line":5,"column":41}}}
+{"type":"eos","loc":{"start":{"line":5,"column":41},"filename":"/cases/filters.verbatim.pug","end":{"line":5,"column":41}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/html.tokens.json b/packages/pug-parser/test/cases/html.tokens.json
index 9b2e5be11..77f475336 100644
--- a/packages/pug-parser/test/cases/html.tokens.json
+++ b/packages/pug-parser/test/cases/html.tokens.json
@@ -1,26 +1,26 @@
-{"type":"code","line":1,"col":1,"val":"var version = 1449104952939","mustEscape":false,"buffer":false}
-{"type":"newline","line":3,"col":1}
-{"type":"text-html","line":3,"col":1,"val":"<ul>"}
-{"type":"indent","line":4,"col":1,"val":2}
-{"type":"text-html","line":4,"col":3,"val":"<li>foo</li>"}
-{"type":"newline","line":5,"col":1}
-{"type":"text-html","line":5,"col":3,"val":"<li>bar</li>"}
-{"type":"newline","line":6,"col":1}
-{"type":"text-html","line":6,"col":3,"val":"<li>baz</li>"}
-{"type":"outdent","line":7,"col":1}
-{"type":"text-html","line":7,"col":1,"val":"</ul>"}
-{"type":"newline","line":9,"col":1}
-{"type":"text-html","line":9,"col":1,"val":"<!--build:js /js/app.min.js?v="}
-{"type":"interpolated-code","line":9,"col":31,"mustEscape":true,"buffer":true,"val":"version"}
-{"type":"text-html","line":9,"col":41,"val":"-->"}
-{"type":"newline","line":10,"col":1}
-{"type":"text-html","line":10,"col":1,"val":"<!--endbuild-->"}
-{"type":"newline","line":12,"col":1}
-{"type":"tag","line":12,"col":1,"val":"p"}
-{"type":"text","line":12,"col":3,"val":"You can <em>embed</em> html as well."}
-{"type":"newline","line":13,"col":1}
-{"type":"tag","line":13,"col":1,"val":"p"}
-{"type":":","line":13,"col":2}
-{"type":"text-html","line":13,"col":4,"val":"<strong>Even</strong> as the body of a block expansion."}
-{"type":"newline","line":14,"col":1}
-{"type":"eos","line":14,"col":1}
\ No newline at end of file
+{"type":"code","loc":{"start":{"line":1,"column":1},"filename":"/cases/html.pug","end":{"line":1,"column":30}},"val":"var version = 1449104952939","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/html.pug","end":{"line":3,"column":1}}}
+{"type":"text-html","loc":{"start":{"line":3,"column":1},"filename":"/cases/html.pug","end":{"line":3,"column":5}},"val":"<ul>"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/html.pug","end":{"line":4,"column":3}},"val":2}
+{"type":"text-html","loc":{"start":{"line":4,"column":3},"filename":"/cases/html.pug","end":{"line":4,"column":15}},"val":"<li>foo</li>"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/html.pug","end":{"line":5,"column":3}}}
+{"type":"text-html","loc":{"start":{"line":5,"column":3},"filename":"/cases/html.pug","end":{"line":5,"column":15}},"val":"<li>bar</li>"}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/html.pug","end":{"line":6,"column":3}}}
+{"type":"text-html","loc":{"start":{"line":6,"column":3},"filename":"/cases/html.pug","end":{"line":6,"column":15}},"val":"<li>baz</li>"}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/html.pug","end":{"line":7,"column":1}}}
+{"type":"text-html","loc":{"start":{"line":7,"column":1},"filename":"/cases/html.pug","end":{"line":7,"column":6}},"val":"</ul>"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/html.pug","end":{"line":9,"column":1}}}
+{"type":"text-html","loc":{"start":{"line":9,"column":1},"filename":"/cases/html.pug","end":{"line":9,"column":31}},"val":"<!--build:js /js/app.min.js?v="}
+{"type":"interpolated-code","loc":{"start":{"line":9,"column":31},"filename":"/cases/html.pug","end":{"line":9,"column":41}},"mustEscape":true,"buffer":true,"val":"version"}
+{"type":"text-html","loc":{"start":{"line":9,"column":41},"filename":"/cases/html.pug","end":{"line":9,"column":44}},"val":"-->"}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/html.pug","end":{"line":10,"column":1}}}
+{"type":"text-html","loc":{"start":{"line":10,"column":1},"filename":"/cases/html.pug","end":{"line":10,"column":16}},"val":"<!--endbuild-->"}
+{"type":"newline","loc":{"start":{"line":12,"column":1},"filename":"/cases/html.pug","end":{"line":12,"column":1}}}
+{"type":"tag","loc":{"start":{"line":12,"column":1},"filename":"/cases/html.pug","end":{"line":12,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":12,"column":3},"filename":"/cases/html.pug","end":{"line":12,"column":39}},"val":"You can <em>embed</em> html as well."}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/html.pug","end":{"line":13,"column":1}}}
+{"type":"tag","loc":{"start":{"line":13,"column":1},"filename":"/cases/html.pug","end":{"line":13,"column":2}},"val":"p"}
+{"type":":","loc":{"start":{"line":13,"column":2},"filename":"/cases/html.pug","end":{"line":13,"column":4}}}
+{"type":"text-html","loc":{"start":{"line":13,"column":4},"filename":"/cases/html.pug","end":{"line":13,"column":59}},"val":"<strong>Even</strong> as the body of a block expansion."}
+{"type":"newline","loc":{"start":{"line":14,"column":1},"filename":"/cases/html.pug","end":{"line":14,"column":1}}}
+{"type":"eos","loc":{"start":{"line":14,"column":1},"filename":"/cases/html.pug","end":{"line":14,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/html5.tokens.json b/packages/pug-parser/test/cases/html5.tokens.json
index 2368d7acb..8103566d3 100644
--- a/packages/pug-parser/test/cases/html5.tokens.json
+++ b/packages/pug-parser/test/cases/html5.tokens.json
@@ -1,20 +1,20 @@
-{"type":"doctype","line":1,"col":1,"val":"html"}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"input"}
-{"type":"start-attributes","line":2,"col":6}
-{"type":"attribute","line":2,"col":7,"name":"type","val":"'checkbox'","mustEscape":true}
-{"type":"attribute","line":2,"col":24,"name":"checked","val":true,"mustEscape":false}
-{"type":"end-attributes","line":2,"col":31}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"input"}
-{"type":"start-attributes","line":3,"col":6}
-{"type":"attribute","line":3,"col":7,"name":"type","val":"'checkbox'","mustEscape":true}
-{"type":"attribute","line":3,"col":24,"name":"checked","val":"true","mustEscape":true}
-{"type":"end-attributes","line":3,"col":36}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":1,"val":"input"}
-{"type":"start-attributes","line":4,"col":6}
-{"type":"attribute","line":4,"col":7,"name":"type","val":"'checkbox'","mustEscape":true}
-{"type":"attribute","line":4,"col":24,"name":"checked","val":"false","mustEscape":true}
-{"type":"end-attributes","line":4,"col":37}
-{"type":"eos","line":4,"col":38}
\ No newline at end of file
+{"type":"doctype","loc":{"start":{"line":1,"column":1},"filename":"/cases/html5.pug","end":{"line":1,"column":13}},"val":"html"}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/html5.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/html5.pug","end":{"line":2,"column":6}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":6},"filename":"/cases/html5.pug","end":{"line":2,"column":7}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":7},"filename":"/cases/html5.pug","end":{"line":2,"column":22}},"name":"type","mustEscape":true,"val":"'checkbox'"}
+{"type":"attribute","loc":{"start":{"line":2,"column":24},"filename":"/cases/html5.pug","end":{"line":2,"column":31}},"name":"checked","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":31},"filename":"/cases/html5.pug","end":{"line":2,"column":32}}}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/html5.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/html5.pug","end":{"line":3,"column":6}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":6},"filename":"/cases/html5.pug","end":{"line":3,"column":7}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":7},"filename":"/cases/html5.pug","end":{"line":3,"column":22}},"name":"type","mustEscape":true,"val":"'checkbox'"}
+{"type":"attribute","loc":{"start":{"line":3,"column":24},"filename":"/cases/html5.pug","end":{"line":3,"column":36}},"name":"checked","mustEscape":true,"val":"true"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":36},"filename":"/cases/html5.pug","end":{"line":3,"column":37}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/html5.pug","end":{"line":4,"column":1}}}
+{"type":"tag","loc":{"start":{"line":4,"column":1},"filename":"/cases/html5.pug","end":{"line":4,"column":6}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":6},"filename":"/cases/html5.pug","end":{"line":4,"column":7}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":7},"filename":"/cases/html5.pug","end":{"line":4,"column":22}},"name":"type","mustEscape":true,"val":"'checkbox'"}
+{"type":"attribute","loc":{"start":{"line":4,"column":24},"filename":"/cases/html5.pug","end":{"line":4,"column":37}},"name":"checked","mustEscape":true,"val":"false"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":37},"filename":"/cases/html5.pug","end":{"line":4,"column":38}}}
+{"type":"eos","loc":{"start":{"line":4,"column":38},"filename":"/cases/html5.pug","end":{"line":4,"column":38}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/include-extends-from-root.tokens.json b/packages/pug-parser/test/cases/include-extends-from-root.tokens.json
index 00b63d9a7..0cf1b16fe 100644
--- a/packages/pug-parser/test/cases/include-extends-from-root.tokens.json
+++ b/packages/pug-parser/test/cases/include-extends-from-root.tokens.json
@@ -1,4 +1,4 @@
-{"type":"include","line":1,"col":1}
-{"type":"path","line":1,"col":9,"val":"/auxiliary/extends-from-root.pug"}
-{"type":"newline","line":2,"col":1}
-{"type":"eos","line":2,"col":1}
\ No newline at end of file
+{"type":"include","loc":{"start":{"line":1,"column":1},"filename":"/cases/include-extends-from-root.pug","end":{"line":1,"column":8}}}
+{"type":"path","loc":{"start":{"line":1,"column":9},"filename":"/cases/include-extends-from-root.pug","end":{"line":1,"column":41}},"val":"/auxiliary/extends-from-root.pug"}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/include-extends-from-root.pug","end":{"line":2,"column":1}}}
+{"type":"eos","loc":{"start":{"line":2,"column":1},"filename":"/cases/include-extends-from-root.pug","end":{"line":2,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/include-extends-of-common-template.tokens.json b/packages/pug-parser/test/cases/include-extends-of-common-template.tokens.json
index a1c6608e1..fd4ffd122 100644
--- a/packages/pug-parser/test/cases/include-extends-of-common-template.tokens.json
+++ b/packages/pug-parser/test/cases/include-extends-of-common-template.tokens.json
@@ -1,7 +1,7 @@
-{"type":"include","line":1,"col":1}
-{"type":"path","line":1,"col":9,"val":"auxiliary/extends-empty-block-1.pug"}
-{"type":"newline","line":2,"col":1}
-{"type":"include","line":2,"col":1}
-{"type":"path","line":2,"col":9,"val":"auxiliary/extends-empty-block-2.pug"}
-{"type":"newline","line":3,"col":1}
-{"type":"eos","line":3,"col":1}
\ No newline at end of file
+{"type":"include","loc":{"start":{"line":1,"column":1},"filename":"/cases/include-extends-of-common-template.pug","end":{"line":1,"column":8}}}
+{"type":"path","loc":{"start":{"line":1,"column":9},"filename":"/cases/include-extends-of-common-template.pug","end":{"line":1,"column":44}},"val":"auxiliary/extends-empty-block-1.pug"}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/include-extends-of-common-template.pug","end":{"line":2,"column":1}}}
+{"type":"include","loc":{"start":{"line":2,"column":1},"filename":"/cases/include-extends-of-common-template.pug","end":{"line":2,"column":8}}}
+{"type":"path","loc":{"start":{"line":2,"column":9},"filename":"/cases/include-extends-of-common-template.pug","end":{"line":2,"column":44}},"val":"auxiliary/extends-empty-block-2.pug"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/include-extends-of-common-template.pug","end":{"line":3,"column":1}}}
+{"type":"eos","loc":{"start":{"line":3,"column":1},"filename":"/cases/include-extends-of-common-template.pug","end":{"line":3,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/include-extends-relative.tokens.json b/packages/pug-parser/test/cases/include-extends-relative.tokens.json
index 277513530..ee58db1da 100644
--- a/packages/pug-parser/test/cases/include-extends-relative.tokens.json
+++ b/packages/pug-parser/test/cases/include-extends-relative.tokens.json
@@ -1,4 +1,4 @@
-{"type":"include","line":1,"col":1}
-{"type":"path","line":1,"col":9,"val":"../cases/auxiliary/extends-relative.pug"}
-{"type":"newline","line":2,"col":1}
-{"type":"eos","line":2,"col":1}
\ No newline at end of file
+{"type":"include","loc":{"start":{"line":1,"column":1},"filename":"/cases/include-extends-relative.pug","end":{"line":1,"column":8}}}
+{"type":"path","loc":{"start":{"line":1,"column":9},"filename":"/cases/include-extends-relative.pug","end":{"line":1,"column":48}},"val":"../cases/auxiliary/extends-relative.pug"}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/include-extends-relative.pug","end":{"line":2,"column":1}}}
+{"type":"eos","loc":{"start":{"line":2,"column":1},"filename":"/cases/include-extends-relative.pug","end":{"line":2,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/include-only-text-body.tokens.json b/packages/pug-parser/test/cases/include-only-text-body.tokens.json
index 87071afbe..6dcf02f1a 100644
--- a/packages/pug-parser/test/cases/include-only-text-body.tokens.json
+++ b/packages/pug-parser/test/cases/include-only-text-body.tokens.json
@@ -1,7 +1,7 @@
-{"type":"text","line":1,"col":3,"val":"The message is \""}
-{"type":"newline","line":2,"col":1}
-{"type":"yield","line":2,"col":1}
-{"type":"newline","line":3,"col":1}
-{"type":"text","line":3,"col":3,"val":"\""}
-{"type":"newline","line":4,"col":1}
-{"type":"eos","line":4,"col":1}
\ No newline at end of file
+{"type":"text","loc":{"start":{"line":1,"column":3},"filename":"/cases/include-only-text-body.pug","end":{"line":1,"column":19}},"val":"The message is \""}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/include-only-text-body.pug","end":{"line":2,"column":1}}}
+{"type":"yield","loc":{"start":{"line":2,"column":1},"filename":"/cases/include-only-text-body.pug","end":{"line":2,"column":6}}}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/include-only-text-body.pug","end":{"line":3,"column":1}}}
+{"type":"text","loc":{"start":{"line":3,"column":3},"filename":"/cases/include-only-text-body.pug","end":{"line":3,"column":4}},"val":"\""}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/include-only-text-body.pug","end":{"line":4,"column":1}}}
+{"type":"eos","loc":{"start":{"line":4,"column":1},"filename":"/cases/include-only-text-body.pug","end":{"line":4,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/include-only-text.tokens.json b/packages/pug-parser/test/cases/include-only-text.tokens.json
index de01296ba..8e30ac138 100644
--- a/packages/pug-parser/test/cases/include-only-text.tokens.json
+++ b/packages/pug-parser/test/cases/include-only-text.tokens.json
@@ -1,16 +1,16 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"p"}
-{"type":"indent","line":4,"col":1,"val":6}
-{"type":"include","line":4,"col":7}
-{"type":"path","line":4,"col":15,"val":"include-only-text-body.pug"}
-{"type":"indent","line":5,"col":1,"val":8}
-{"type":"tag","line":5,"col":9,"val":"em"}
-{"type":"text","line":5,"col":12,"val":"hello world"}
-{"type":"outdent","line":6,"col":7}
-{"type":"outdent","line":6,"col":5}
-{"type":"outdent","line":6,"col":3}
-{"type":"outdent","line":6,"col":1}
-{"type":"eos","line":6,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/include-only-text.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/include-only-text.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/include-only-text.pug","end":{"line":2,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/include-only-text.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/include-only-text.pug","end":{"line":3,"column":6}},"val":"p"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/include-only-text.pug","end":{"line":4,"column":7}},"val":6}
+{"type":"include","loc":{"start":{"line":4,"column":7},"filename":"/cases/include-only-text.pug","end":{"line":4,"column":14}}}
+{"type":"path","loc":{"start":{"line":4,"column":15},"filename":"/cases/include-only-text.pug","end":{"line":4,"column":41}},"val":"include-only-text-body.pug"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/include-only-text.pug","end":{"line":5,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":5,"column":9},"filename":"/cases/include-only-text.pug","end":{"line":5,"column":11}},"val":"em"}
+{"type":"text","loc":{"start":{"line":5,"column":12},"filename":"/cases/include-only-text.pug","end":{"line":5,"column":23}},"val":"hello world"}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/include-only-text.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/include-only-text.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/include-only-text.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/include-only-text.pug","end":{"line":6,"column":1}}}
+{"type":"eos","loc":{"start":{"line":6,"column":1},"filename":"/cases/include-only-text.pug","end":{"line":6,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/include-with-text-head.tokens.json b/packages/pug-parser/test/cases/include-with-text-head.tokens.json
index 885812525..a469b42e4 100644
--- a/packages/pug-parser/test/cases/include-with-text-head.tokens.json
+++ b/packages/pug-parser/test/cases/include-with-text-head.tokens.json
@@ -1,12 +1,12 @@
-{"type":"tag","line":1,"col":1,"val":"head"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"script"}
-{"type":"start-attributes","line":2,"col":9}
-{"type":"attribute","line":2,"col":10,"name":"type","val":"'text/javascript'","mustEscape":true}
-{"type":"end-attributes","line":2,"col":32}
-{"type":"dot","line":2,"col":33}
-{"type":"start-pipeless-text","line":2,"col":34}
-{"type":"text","line":3,"col":5,"val":"alert('hello world');"}
-{"type":"end-pipeless-text","line":3,"col":26}
-{"type":"outdent","line":3,"col":26}
-{"type":"eos","line":3,"col":26}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/include-with-text-head.pug","end":{"line":1,"column":5}},"val":"head"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/include-with-text-head.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/include-with-text-head.pug","end":{"line":2,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":9},"filename":"/cases/include-with-text-head.pug","end":{"line":2,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":10},"filename":"/cases/include-with-text-head.pug","end":{"line":2,"column":32}},"name":"type","mustEscape":true,"val":"'text/javascript'"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":32},"filename":"/cases/include-with-text-head.pug","end":{"line":2,"column":33}}}
+{"type":"dot","loc":{"start":{"line":2,"column":33},"filename":"/cases/include-with-text-head.pug","end":{"line":2,"column":34}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":2,"column":34},"filename":"/cases/include-with-text-head.pug","end":{"line":2,"column":34}}}
+{"type":"text","loc":{"start":{"line":3,"column":5},"filename":"/cases/include-with-text-head.pug","end":{"line":3,"column":26}},"val":"alert('hello world');"}
+{"type":"end-pipeless-text","loc":{"start":{"line":3,"column":26},"filename":"/cases/include-with-text-head.pug","end":{"line":3,"column":26}}}
+{"type":"outdent","loc":{"start":{"line":3,"column":26},"filename":"/cases/include-with-text-head.pug","end":{"line":3,"column":26}}}
+{"type":"eos","loc":{"start":{"line":3,"column":26},"filename":"/cases/include-with-text-head.pug","end":{"line":3,"column":26}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/include-with-text.tokens.json b/packages/pug-parser/test/cases/include-with-text.tokens.json
index e2ee8a323..ed94f631e 100644
--- a/packages/pug-parser/test/cases/include-with-text.tokens.json
+++ b/packages/pug-parser/test/cases/include-with-text.tokens.json
@@ -1,17 +1,17 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"include","line":2,"col":3}
-{"type":"path","line":2,"col":11,"val":"include-with-text-head.pug"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"script"}
-{"type":"start-attributes","line":3,"col":11}
-{"type":"attribute","line":3,"col":12,"name":"src","val":"'/caustic.js'","mustEscape":true}
-{"type":"end-attributes","line":3,"col":29}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":5,"val":"script"}
-{"type":"start-attributes","line":4,"col":11}
-{"type":"attribute","line":4,"col":12,"name":"src","val":"'/app.js'","mustEscape":true}
-{"type":"end-attributes","line":4,"col":25}
-{"type":"outdent","line":5,"col":3}
-{"type":"outdent","line":5,"col":1}
-{"type":"eos","line":5,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/include-with-text.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/include-with-text.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"include","loc":{"start":{"line":2,"column":3},"filename":"/cases/include-with-text.pug","end":{"line":2,"column":10}}}
+{"type":"path","loc":{"start":{"line":2,"column":11},"filename":"/cases/include-with-text.pug","end":{"line":2,"column":37}},"val":"include-with-text-head.pug"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/include-with-text.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/include-with-text.pug","end":{"line":3,"column":11}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":11},"filename":"/cases/include-with-text.pug","end":{"line":3,"column":12}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":12},"filename":"/cases/include-with-text.pug","end":{"line":3,"column":29}},"name":"src","mustEscape":true,"val":"'/caustic.js'"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":29},"filename":"/cases/include-with-text.pug","end":{"line":3,"column":30}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/include-with-text.pug","end":{"line":4,"column":5}}}
+{"type":"tag","loc":{"start":{"line":4,"column":5},"filename":"/cases/include-with-text.pug","end":{"line":4,"column":11}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":11},"filename":"/cases/include-with-text.pug","end":{"line":4,"column":12}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":12},"filename":"/cases/include-with-text.pug","end":{"line":4,"column":25}},"name":"src","mustEscape":true,"val":"'/app.js'"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":25},"filename":"/cases/include-with-text.pug","end":{"line":4,"column":26}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/include-with-text.pug","end":{"line":5,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/include-with-text.pug","end":{"line":5,"column":1}}}
+{"type":"eos","loc":{"start":{"line":5,"column":1},"filename":"/cases/include-with-text.pug","end":{"line":5,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/include.script.tokens.json b/packages/pug-parser/test/cases/include.script.tokens.json
index b41e8f076..967373acc 100644
--- a/packages/pug-parser/test/cases/include.script.tokens.json
+++ b/packages/pug-parser/test/cases/include.script.tokens.json
@@ -1,10 +1,10 @@
-{"type":"tag","line":1,"col":1,"val":"script"}
-{"type":"id","line":1,"col":7,"val":"pet-template"}
-{"type":"start-attributes","line":1,"col":20}
-{"type":"attribute","line":1,"col":21,"name":"type","val":"'text/x-template'","mustEscape":true}
-{"type":"end-attributes","line":1,"col":43}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"include","line":2,"col":3}
-{"type":"path","line":2,"col":11,"val":"auxiliary/pet.pug"}
-{"type":"outdent","line":3,"col":1}
-{"type":"eos","line":3,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/include.script.pug","end":{"line":1,"column":7}},"val":"script"}
+{"type":"id","loc":{"start":{"line":1,"column":7},"filename":"/cases/include.script.pug","end":{"line":1,"column":20}},"val":"pet-template"}
+{"type":"start-attributes","loc":{"start":{"line":1,"column":20},"filename":"/cases/include.script.pug","end":{"line":1,"column":21}}}
+{"type":"attribute","loc":{"start":{"line":1,"column":21},"filename":"/cases/include.script.pug","end":{"line":1,"column":43}},"name":"type","mustEscape":true,"val":"'text/x-template'"}
+{"type":"end-attributes","loc":{"start":{"line":1,"column":43},"filename":"/cases/include.script.pug","end":{"line":1,"column":44}}}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/include.script.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"include","loc":{"start":{"line":2,"column":3},"filename":"/cases/include.script.pug","end":{"line":2,"column":10}}}
+{"type":"path","loc":{"start":{"line":2,"column":11},"filename":"/cases/include.script.pug","end":{"line":2,"column":28}},"val":"auxiliary/pet.pug"}
+{"type":"outdent","loc":{"start":{"line":3,"column":1},"filename":"/cases/include.script.pug","end":{"line":3,"column":1}}}
+{"type":"eos","loc":{"start":{"line":3,"column":1},"filename":"/cases/include.script.pug","end":{"line":3,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/include.yield.nested.tokens.json b/packages/pug-parser/test/cases/include.yield.nested.tokens.json
index 5ffe4f0cf..6bf6a8afd 100644
--- a/packages/pug-parser/test/cases/include.yield.nested.tokens.json
+++ b/packages/pug-parser/test/cases/include.yield.nested.tokens.json
@@ -1,11 +1,11 @@
-{"type":"newline","line":2,"col":1}
-{"type":"include","line":2,"col":1}
-{"type":"path","line":2,"col":9,"val":"auxiliary/yield-nested.pug"}
-{"type":"indent","line":3,"col":1,"val":2}
-{"type":"tag","line":3,"col":3,"val":"p"}
-{"type":"text","line":3,"col":5,"val":"some content"}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":3,"val":"p"}
-{"type":"text","line":4,"col":5,"val":"and some more"}
-{"type":"outdent","line":5,"col":1}
-{"type":"eos","line":5,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/include.yield.nested.pug","end":{"line":2,"column":1}}}
+{"type":"include","loc":{"start":{"line":2,"column":1},"filename":"/cases/include.yield.nested.pug","end":{"line":2,"column":8}}}
+{"type":"path","loc":{"start":{"line":2,"column":9},"filename":"/cases/include.yield.nested.pug","end":{"line":2,"column":35}},"val":"auxiliary/yield-nested.pug"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/include.yield.nested.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/include.yield.nested.pug","end":{"line":3,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":3,"column":5},"filename":"/cases/include.yield.nested.pug","end":{"line":3,"column":17}},"val":"some content"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/include.yield.nested.pug","end":{"line":4,"column":3}}}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/include.yield.nested.pug","end":{"line":4,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":4,"column":5},"filename":"/cases/include.yield.nested.pug","end":{"line":4,"column":18}},"val":"and some more"}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/include.yield.nested.pug","end":{"line":5,"column":1}}}
+{"type":"eos","loc":{"start":{"line":5,"column":1},"filename":"/cases/include.yield.nested.pug","end":{"line":5,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/includes-with-ext-js.tokens.json b/packages/pug-parser/test/cases/includes-with-ext-js.tokens.json
index 9cb6d5faf..040135fbf 100644
--- a/packages/pug-parser/test/cases/includes-with-ext-js.tokens.json
+++ b/packages/pug-parser/test/cases/includes-with-ext-js.tokens.json
@@ -1,9 +1,9 @@
-{"type":"tag","line":1,"col":1,"val":"pre"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"code"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"include","line":3,"col":5}
-{"type":"path","line":3,"col":13,"val":"javascript-new-lines.js"}
-{"type":"outdent","line":4,"col":3}
-{"type":"outdent","line":4,"col":1}
-{"type":"eos","line":4,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/includes-with-ext-js.pug","end":{"line":1,"column":4}},"val":"pre"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/includes-with-ext-js.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/includes-with-ext-js.pug","end":{"line":2,"column":7}},"val":"code"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/includes-with-ext-js.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"include","loc":{"start":{"line":3,"column":5},"filename":"/cases/includes-with-ext-js.pug","end":{"line":3,"column":12}}}
+{"type":"path","loc":{"start":{"line":3,"column":13},"filename":"/cases/includes-with-ext-js.pug","end":{"line":3,"column":36}},"val":"javascript-new-lines.js"}
+{"type":"outdent","loc":{"start":{"line":4,"column":1},"filename":"/cases/includes-with-ext-js.pug","end":{"line":4,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":4,"column":1},"filename":"/cases/includes-with-ext-js.pug","end":{"line":4,"column":1}}}
+{"type":"eos","loc":{"start":{"line":4,"column":1},"filename":"/cases/includes-with-ext-js.pug","end":{"line":4,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/includes.tokens.json b/packages/pug-parser/test/cases/includes.tokens.json
index 19592587b..c8a064f17 100644
--- a/packages/pug-parser/test/cases/includes.tokens.json
+++ b/packages/pug-parser/test/cases/includes.tokens.json
@@ -1,25 +1,25 @@
-{"type":"newline","line":2,"col":1}
-{"type":"include","line":2,"col":1}
-{"type":"path","line":2,"col":9,"val":"auxiliary/mixins.pug"}
-{"type":"newline","line":4,"col":1}
-{"type":"call","line":4,"col":1,"val":"foo","args":null}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":1,"val":"body"}
-{"type":"indent","line":7,"col":1,"val":2}
-{"type":"include","line":7,"col":3}
-{"type":"path","line":7,"col":11,"val":"auxiliary/smile.html"}
-{"type":"newline","line":8,"col":1}
-{"type":"include","line":8,"col":3}
-{"type":"path","line":8,"col":11,"val":"auxiliary/escapes.html"}
-{"type":"newline","line":9,"col":1}
-{"type":"tag","line":9,"col":3,"val":"script"}
-{"type":"start-attributes","line":9,"col":9}
-{"type":"attribute","line":9,"col":10,"name":"type","val":"\"text/javascript\"","mustEscape":true}
-{"type":"end-attributes","line":9,"col":32}
-{"type":"indent","line":10,"col":1,"val":4}
-{"type":"include","line":10,"col":5}
-{"type":"filter","line":10,"col":12,"val":"verbatim"}
-{"type":"path","line":10,"col":22,"val":"auxiliary/includable.js"}
-{"type":"outdent","line":11,"col":3}
-{"type":"outdent","line":11,"col":1}
-{"type":"eos","line":11,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/includes.pug","end":{"line":2,"column":1}}}
+{"type":"include","loc":{"start":{"line":2,"column":1},"filename":"/cases/includes.pug","end":{"line":2,"column":8}}}
+{"type":"path","loc":{"start":{"line":2,"column":9},"filename":"/cases/includes.pug","end":{"line":2,"column":29}},"val":"auxiliary/mixins.pug"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/includes.pug","end":{"line":4,"column":1}}}
+{"type":"call","loc":{"start":{"line":4,"column":1},"filename":"/cases/includes.pug","end":{"line":4,"column":5}},"val":"foo","args":null}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/includes.pug","end":{"line":6,"column":1}}}
+{"type":"tag","loc":{"start":{"line":6,"column":1},"filename":"/cases/includes.pug","end":{"line":6,"column":5}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":7,"column":1},"filename":"/cases/includes.pug","end":{"line":7,"column":3}},"val":2}
+{"type":"include","loc":{"start":{"line":7,"column":3},"filename":"/cases/includes.pug","end":{"line":7,"column":10}}}
+{"type":"path","loc":{"start":{"line":7,"column":11},"filename":"/cases/includes.pug","end":{"line":7,"column":31}},"val":"auxiliary/smile.html"}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/includes.pug","end":{"line":8,"column":3}}}
+{"type":"include","loc":{"start":{"line":8,"column":3},"filename":"/cases/includes.pug","end":{"line":8,"column":10}}}
+{"type":"path","loc":{"start":{"line":8,"column":11},"filename":"/cases/includes.pug","end":{"line":8,"column":33}},"val":"auxiliary/escapes.html"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/includes.pug","end":{"line":9,"column":3}}}
+{"type":"tag","loc":{"start":{"line":9,"column":3},"filename":"/cases/includes.pug","end":{"line":9,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":9,"column":9},"filename":"/cases/includes.pug","end":{"line":9,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":9,"column":10},"filename":"/cases/includes.pug","end":{"line":9,"column":32}},"name":"type","mustEscape":true,"val":"\"text/javascript\""}
+{"type":"end-attributes","loc":{"start":{"line":9,"column":32},"filename":"/cases/includes.pug","end":{"line":9,"column":33}}}
+{"type":"indent","loc":{"start":{"line":10,"column":1},"filename":"/cases/includes.pug","end":{"line":10,"column":5}},"val":4}
+{"type":"include","loc":{"start":{"line":10,"column":5},"filename":"/cases/includes.pug","end":{"line":10,"column":12}}}
+{"type":"filter","loc":{"start":{"line":10,"column":12},"filename":"/cases/includes.pug","end":{"line":10,"column":21}},"val":"verbatim"}
+{"type":"path","loc":{"start":{"line":10,"column":22},"filename":"/cases/includes.pug","end":{"line":10,"column":45}},"val":"auxiliary/includable.js"}
+{"type":"outdent","loc":{"start":{"line":11,"column":1},"filename":"/cases/includes.pug","end":{"line":11,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":11,"column":1},"filename":"/cases/includes.pug","end":{"line":11,"column":1}}}
+{"type":"eos","loc":{"start":{"line":11,"column":1},"filename":"/cases/includes.pug","end":{"line":11,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/inheritance.alert-dialog.tokens.json b/packages/pug-parser/test/cases/inheritance.alert-dialog.tokens.json
index 706f0bf0d..034dddaec 100644
--- a/packages/pug-parser/test/cases/inheritance.alert-dialog.tokens.json
+++ b/packages/pug-parser/test/cases/inheritance.alert-dialog.tokens.json
@@ -1,13 +1,13 @@
-{"type":"newline","line":2,"col":1}
-{"type":"extends","line":2,"col":1}
-{"type":"path","line":2,"col":9,"val":"auxiliary/dialog.pug"}
-{"type":"newline","line":4,"col":1}
-{"type":"block","line":4,"col":1,"val":"content","mode":"replace"}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"tag","line":5,"col":3,"val":"h1"}
-{"type":"text","line":5,"col":6,"val":"Alert!"}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":3,"val":"p"}
-{"type":"text","line":6,"col":5,"val":"I'm an alert!"}
-{"type":"outdent","line":7,"col":1}
-{"type":"eos","line":7,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":2,"column":1}}}
+{"type":"extends","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":2,"column":8}}}
+{"type":"path","loc":{"start":{"line":2,"column":9},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":2,"column":29}},"val":"auxiliary/dialog.pug"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":4,"column":1}}}
+{"type":"block","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":4,"column":14}},"val":"content","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":5,"column":5}},"val":"h1"}
+{"type":"text","loc":{"start":{"line":5,"column":6},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":5,"column":12}},"val":"Alert!"}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":6,"column":3}}}
+{"type":"tag","loc":{"start":{"line":6,"column":3},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":6,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":6,"column":5},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":6,"column":18}},"val":"I'm an alert!"}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":7,"column":1}}}
+{"type":"eos","loc":{"start":{"line":7,"column":1},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":7,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/inheritance.defaults.tokens.json b/packages/pug-parser/test/cases/inheritance.defaults.tokens.json
index d51e50c4e..947532541 100644
--- a/packages/pug-parser/test/cases/inheritance.defaults.tokens.json
+++ b/packages/pug-parser/test/cases/inheritance.defaults.tokens.json
@@ -1,24 +1,24 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"head"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"block","line":3,"col":5,"val":"head","mode":"replace"}
-{"type":"indent","line":4,"col":1,"val":6}
-{"type":"tag","line":4,"col":7,"val":"script"}
-{"type":"start-attributes","line":4,"col":13}
-{"type":"attribute","line":4,"col":14,"name":"src","val":"'jquery.js'","mustEscape":true}
-{"type":"end-attributes","line":4,"col":29}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":7,"val":"script"}
-{"type":"start-attributes","line":5,"col":13}
-{"type":"attribute","line":5,"col":14,"name":"src","val":"'keymaster.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":32}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":7,"val":"script"}
-{"type":"start-attributes","line":6,"col":13}
-{"type":"attribute","line":6,"col":14,"name":"src","val":"'caustic.js'","mustEscape":true}
-{"type":"end-attributes","line":6,"col":30}
-{"type":"outdent","line":6,"col":31}
-{"type":"outdent","line":6,"col":31}
-{"type":"outdent","line":6,"col":31}
-{"type":"eos","line":6,"col":31}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/inheritance.defaults.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.defaults.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/inheritance.defaults.pug","end":{"line":2,"column":7}},"val":"head"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/inheritance.defaults.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"block","loc":{"start":{"line":3,"column":5},"filename":"/cases/inheritance.defaults.pug","end":{"line":3,"column":15}},"val":"head","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.defaults.pug","end":{"line":4,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":4,"column":7},"filename":"/cases/inheritance.defaults.pug","end":{"line":4,"column":13}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":13},"filename":"/cases/inheritance.defaults.pug","end":{"line":4,"column":14}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":14},"filename":"/cases/inheritance.defaults.pug","end":{"line":4,"column":29}},"name":"src","mustEscape":true,"val":"'jquery.js'"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":29},"filename":"/cases/inheritance.defaults.pug","end":{"line":4,"column":30}}}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/inheritance.defaults.pug","end":{"line":5,"column":7}}}
+{"type":"tag","loc":{"start":{"line":5,"column":7},"filename":"/cases/inheritance.defaults.pug","end":{"line":5,"column":13}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":13},"filename":"/cases/inheritance.defaults.pug","end":{"line":5,"column":14}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":14},"filename":"/cases/inheritance.defaults.pug","end":{"line":5,"column":32}},"name":"src","mustEscape":true,"val":"'keymaster.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":32},"filename":"/cases/inheritance.defaults.pug","end":{"line":5,"column":33}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/inheritance.defaults.pug","end":{"line":6,"column":7}}}
+{"type":"tag","loc":{"start":{"line":6,"column":7},"filename":"/cases/inheritance.defaults.pug","end":{"line":6,"column":13}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":13},"filename":"/cases/inheritance.defaults.pug","end":{"line":6,"column":14}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":14},"filename":"/cases/inheritance.defaults.pug","end":{"line":6,"column":30}},"name":"src","mustEscape":true,"val":"'caustic.js'"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":30},"filename":"/cases/inheritance.defaults.pug","end":{"line":6,"column":31}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":31},"filename":"/cases/inheritance.defaults.pug","end":{"line":6,"column":31}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":31},"filename":"/cases/inheritance.defaults.pug","end":{"line":6,"column":31}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":31},"filename":"/cases/inheritance.defaults.pug","end":{"line":6,"column":31}}}
+{"type":"eos","loc":{"start":{"line":6,"column":31},"filename":"/cases/inheritance.defaults.pug","end":{"line":6,"column":31}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/inheritance.extend.include.tokens.json b/packages/pug-parser/test/cases/inheritance.extend.include.tokens.json
index a1477cd02..101687b91 100644
--- a/packages/pug-parser/test/cases/inheritance.extend.include.tokens.json
+++ b/packages/pug-parser/test/cases/inheritance.extend.include.tokens.json
@@ -1,28 +1,28 @@
-{"type":"newline","line":2,"col":1}
-{"type":"extends","line":2,"col":1}
-{"type":"path","line":2,"col":8,"val":"auxiliary/layout.include.pug"}
-{"type":"newline","line":4,"col":1}
-{"type":"block","line":4,"col":1,"val":"head","mode":"replace"}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"tag","line":5,"col":3,"val":"script"}
-{"type":"start-attributes","line":5,"col":9}
-{"type":"attribute","line":5,"col":10,"name":"src","val":"'jquery.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":25}
-{"type":"outdent","line":7,"col":1}
-{"type":"block","line":7,"col":1,"val":"content","mode":"replace"}
-{"type":"indent","line":8,"col":1,"val":2}
-{"type":"tag","line":8,"col":3,"val":"h2"}
-{"type":"text","line":8,"col":6,"val":"Page"}
-{"type":"newline","line":9,"col":1}
-{"type":"tag","line":9,"col":3,"val":"p"}
-{"type":"text","line":9,"col":5,"val":"Some content"}
-{"type":"outdent","line":11,"col":1}
-{"type":"block","line":11,"col":1,"val":"window-content","mode":"replace"}
-{"type":"indent","line":12,"col":1,"val":2}
-{"type":"tag","line":12,"col":3,"val":"h2"}
-{"type":"text","line":12,"col":6,"val":"Awesome"}
-{"type":"newline","line":13,"col":1}
-{"type":"tag","line":13,"col":3,"val":"p"}
-{"type":"text","line":13,"col":5,"val":"Now we can extend included blocks!"}
-{"type":"outdent","line":14,"col":1}
-{"type":"eos","line":14,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":2,"column":1}}}
+{"type":"extends","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":2,"column":7}}}
+{"type":"path","loc":{"start":{"line":2,"column":8},"filename":"/cases/inheritance.extend.include.pug","end":{"line":2,"column":36}},"val":"auxiliary/layout.include.pug"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":4,"column":1}}}
+{"type":"block","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":4,"column":11}},"val":"head","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/inheritance.extend.include.pug","end":{"line":5,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":9},"filename":"/cases/inheritance.extend.include.pug","end":{"line":5,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":10},"filename":"/cases/inheritance.extend.include.pug","end":{"line":5,"column":25}},"name":"src","mustEscape":true,"val":"'jquery.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":25},"filename":"/cases/inheritance.extend.include.pug","end":{"line":5,"column":26}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":7,"column":1}}}
+{"type":"block","loc":{"start":{"line":7,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":7,"column":14}},"val":"content","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":8,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":8,"column":3},"filename":"/cases/inheritance.extend.include.pug","end":{"line":8,"column":5}},"val":"h2"}
+{"type":"text","loc":{"start":{"line":8,"column":6},"filename":"/cases/inheritance.extend.include.pug","end":{"line":8,"column":10}},"val":"Page"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":9,"column":3}}}
+{"type":"tag","loc":{"start":{"line":9,"column":3},"filename":"/cases/inheritance.extend.include.pug","end":{"line":9,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":9,"column":5},"filename":"/cases/inheritance.extend.include.pug","end":{"line":9,"column":17}},"val":"Some content"}
+{"type":"outdent","loc":{"start":{"line":11,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":11,"column":1}}}
+{"type":"block","loc":{"start":{"line":11,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":11,"column":21}},"val":"window-content","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":12,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":12,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":12,"column":3},"filename":"/cases/inheritance.extend.include.pug","end":{"line":12,"column":5}},"val":"h2"}
+{"type":"text","loc":{"start":{"line":12,"column":6},"filename":"/cases/inheritance.extend.include.pug","end":{"line":12,"column":13}},"val":"Awesome"}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":13,"column":3}}}
+{"type":"tag","loc":{"start":{"line":13,"column":3},"filename":"/cases/inheritance.extend.include.pug","end":{"line":13,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":13,"column":5},"filename":"/cases/inheritance.extend.include.pug","end":{"line":13,"column":39}},"val":"Now we can extend included blocks!"}
+{"type":"outdent","loc":{"start":{"line":14,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":14,"column":1}}}
+{"type":"eos","loc":{"start":{"line":14,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":14,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/inheritance.extend.mixins.block.tokens.json b/packages/pug-parser/test/cases/inheritance.extend.mixins.block.tokens.json
index c8668e8af..5d425f34a 100644
--- a/packages/pug-parser/test/cases/inheritance.extend.mixins.block.tokens.json
+++ b/packages/pug-parser/test/cases/inheritance.extend.mixins.block.tokens.json
@@ -1,9 +1,9 @@
-{"type":"extends","line":1,"col":1}
-{"type":"path","line":1,"col":8,"val":"auxiliary/inheritance.extend.mixin.block.pug"}
-{"type":"newline","line":3,"col":1}
-{"type":"block","line":3,"col":1,"val":"content","mode":"replace"}
-{"type":"indent","line":4,"col":1,"val":2}
-{"type":"tag","line":4,"col":3,"val":"p"}
-{"type":"text","line":4,"col":5,"val":"Hello World!"}
-{"type":"outdent","line":5,"col":1}
-{"type":"eos","line":5,"col":1}
\ No newline at end of file
+{"type":"extends","loc":{"start":{"line":1,"column":1},"filename":"/cases/inheritance.extend.mixins.block.pug","end":{"line":1,"column":7}}}
+{"type":"path","loc":{"start":{"line":1,"column":8},"filename":"/cases/inheritance.extend.mixins.block.pug","end":{"line":1,"column":52}},"val":"auxiliary/inheritance.extend.mixin.block.pug"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/inheritance.extend.mixins.block.pug","end":{"line":3,"column":1}}}
+{"type":"block","loc":{"start":{"line":3,"column":1},"filename":"/cases/inheritance.extend.mixins.block.pug","end":{"line":3,"column":14}},"val":"content","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.extend.mixins.block.pug","end":{"line":4,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/inheritance.extend.mixins.block.pug","end":{"line":4,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":4,"column":5},"filename":"/cases/inheritance.extend.mixins.block.pug","end":{"line":4,"column":17}},"val":"Hello World!"}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/inheritance.extend.mixins.block.pug","end":{"line":5,"column":1}}}
+{"type":"eos","loc":{"start":{"line":5,"column":1},"filename":"/cases/inheritance.extend.mixins.block.pug","end":{"line":5,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/inheritance.extend.mixins.tokens.json b/packages/pug-parser/test/cases/inheritance.extend.mixins.tokens.json
index 135fb0215..595396f91 100644
--- a/packages/pug-parser/test/cases/inheritance.extend.mixins.tokens.json
+++ b/packages/pug-parser/test/cases/inheritance.extend.mixins.tokens.json
@@ -1,22 +1,22 @@
-{"type":"newline","line":2,"col":1}
-{"type":"extends","line":2,"col":1}
-{"type":"path","line":2,"col":8,"val":"auxiliary/layout.pug"}
-{"type":"newline","line":4,"col":1}
-{"type":"mixin","line":4,"col":1,"val":"article","args":"title"}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"if","line":5,"col":3,"val":"title"}
-{"type":"indent","line":6,"col":1,"val":4}
-{"type":"tag","line":6,"col":5,"val":"h1"}
-{"type":"code","line":6,"col":7,"val":"title","mustEscape":true,"buffer":true}
-{"type":"outdent","line":7,"col":3}
-{"type":"mixin-block","line":7,"col":3}
-{"type":"outdent","line":9,"col":1}
-{"type":"block","line":9,"col":1,"val":"content","mode":"replace"}
-{"type":"indent","line":10,"col":1,"val":2}
-{"type":"call","line":10,"col":3,"val":"article","args":"\"The meaning of life\""}
-{"type":"indent","line":11,"col":1,"val":4}
-{"type":"tag","line":11,"col":5,"val":"p"}
-{"type":"text","line":11,"col":7,"val":"Foo bar baz!"}
-{"type":"outdent","line":12,"col":3}
-{"type":"outdent","line":12,"col":1}
-{"type":"eos","line":12,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":2,"column":1}}}
+{"type":"extends","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":2,"column":7}}}
+{"type":"path","loc":{"start":{"line":2,"column":8},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":2,"column":28}},"val":"auxiliary/layout.pug"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":4,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":4,"column":21}},"val":"article","args":"title"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"if","loc":{"start":{"line":5,"column":3},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":5,"column":11}},"val":"title"}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":6,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":6,"column":5},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":6,"column":7}},"val":"h1"}
+{"type":"code","loc":{"start":{"line":6,"column":7},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":6,"column":14}},"val":"title","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":7,"column":3}}}
+{"type":"mixin-block","loc":{"start":{"line":7,"column":3},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":7,"column":8}}}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":9,"column":1}}}
+{"type":"block","loc":{"start":{"line":9,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":9,"column":14}},"val":"content","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":10,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":10,"column":3}},"val":2}
+{"type":"call","loc":{"start":{"line":10,"column":3},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":10,"column":34}},"val":"article","args":"\"The meaning of life\""}
+{"type":"indent","loc":{"start":{"line":11,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":11,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":11,"column":5},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":11,"column":6}},"val":"p"}
+{"type":"text","loc":{"start":{"line":11,"column":7},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":11,"column":19}},"val":"Foo bar baz!"}
+{"type":"outdent","loc":{"start":{"line":12,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":12,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":12,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":12,"column":1}}}
+{"type":"eos","loc":{"start":{"line":12,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":12,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/inheritance.extend.recursive.tokens.json b/packages/pug-parser/test/cases/inheritance.extend.recursive.tokens.json
index 817ec15f4..ed6ed9126 100644
--- a/packages/pug-parser/test/cases/inheritance.extend.recursive.tokens.json
+++ b/packages/pug-parser/test/cases/inheritance.extend.recursive.tokens.json
@@ -1,9 +1,9 @@
-{"type":"extends","line":1,"col":1}
-{"type":"path","line":1,"col":9,"val":"/auxiliary/inheritance.extend.recursive-parent.pug"}
-{"type":"newline","line":3,"col":1}
-{"type":"block","line":3,"col":1,"val":"parent","mode":"replace"}
-{"type":"indent","line":4,"col":1,"val":4}
-{"type":"tag","line":4,"col":5,"val":"h4"}
-{"type":"text","line":4,"col":8,"val":"child"}
-{"type":"outdent","line":4,"col":13}
-{"type":"eos","line":4,"col":13}
\ No newline at end of file
+{"type":"extends","loc":{"start":{"line":1,"column":1},"filename":"/cases/inheritance.extend.recursive.pug","end":{"line":1,"column":8}}}
+{"type":"path","loc":{"start":{"line":1,"column":9},"filename":"/cases/inheritance.extend.recursive.pug","end":{"line":1,"column":59}},"val":"/auxiliary/inheritance.extend.recursive-parent.pug"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/inheritance.extend.recursive.pug","end":{"line":3,"column":1}}}
+{"type":"block","loc":{"start":{"line":3,"column":1},"filename":"/cases/inheritance.extend.recursive.pug","end":{"line":3,"column":13}},"val":"parent","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.extend.recursive.pug","end":{"line":4,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":4,"column":5},"filename":"/cases/inheritance.extend.recursive.pug","end":{"line":4,"column":7}},"val":"h4"}
+{"type":"text","loc":{"start":{"line":4,"column":8},"filename":"/cases/inheritance.extend.recursive.pug","end":{"line":4,"column":13}},"val":"child"}
+{"type":"outdent","loc":{"start":{"line":4,"column":13},"filename":"/cases/inheritance.extend.recursive.pug","end":{"line":4,"column":13}}}
+{"type":"eos","loc":{"start":{"line":4,"column":13},"filename":"/cases/inheritance.extend.recursive.pug","end":{"line":4,"column":13}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/inheritance.extend.tokens.json b/packages/pug-parser/test/cases/inheritance.extend.tokens.json
index 9423547f0..77418592b 100644
--- a/packages/pug-parser/test/cases/inheritance.extend.tokens.json
+++ b/packages/pug-parser/test/cases/inheritance.extend.tokens.json
@@ -1,20 +1,20 @@
-{"type":"newline","line":2,"col":1}
-{"type":"extends","line":2,"col":1}
-{"type":"path","line":2,"col":8,"val":"auxiliary/layout.pug"}
-{"type":"newline","line":4,"col":1}
-{"type":"block","line":4,"col":1,"val":"head","mode":"replace"}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"tag","line":5,"col":3,"val":"script"}
-{"type":"start-attributes","line":5,"col":9}
-{"type":"attribute","line":5,"col":10,"name":"src","val":"'jquery.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":25}
-{"type":"outdent","line":7,"col":1}
-{"type":"block","line":7,"col":1,"val":"content","mode":"replace"}
-{"type":"indent","line":8,"col":1,"val":2}
-{"type":"tag","line":8,"col":3,"val":"h2"}
-{"type":"text","line":8,"col":6,"val":"Page"}
-{"type":"newline","line":9,"col":1}
-{"type":"tag","line":9,"col":3,"val":"p"}
-{"type":"text","line":9,"col":5,"val":"Some content"}
-{"type":"outdent","line":10,"col":1}
-{"type":"eos","line":10,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.extend.pug","end":{"line":2,"column":1}}}
+{"type":"extends","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.extend.pug","end":{"line":2,"column":7}}}
+{"type":"path","loc":{"start":{"line":2,"column":8},"filename":"/cases/inheritance.extend.pug","end":{"line":2,"column":28}},"val":"auxiliary/layout.pug"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.extend.pug","end":{"line":4,"column":1}}}
+{"type":"block","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.extend.pug","end":{"line":4,"column":11}},"val":"head","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/inheritance.extend.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/inheritance.extend.pug","end":{"line":5,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":9},"filename":"/cases/inheritance.extend.pug","end":{"line":5,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":10},"filename":"/cases/inheritance.extend.pug","end":{"line":5,"column":25}},"name":"src","mustEscape":true,"val":"'jquery.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":25},"filename":"/cases/inheritance.extend.pug","end":{"line":5,"column":26}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/inheritance.extend.pug","end":{"line":7,"column":1}}}
+{"type":"block","loc":{"start":{"line":7,"column":1},"filename":"/cases/inheritance.extend.pug","end":{"line":7,"column":14}},"val":"content","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/inheritance.extend.pug","end":{"line":8,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":8,"column":3},"filename":"/cases/inheritance.extend.pug","end":{"line":8,"column":5}},"val":"h2"}
+{"type":"text","loc":{"start":{"line":8,"column":6},"filename":"/cases/inheritance.extend.pug","end":{"line":8,"column":10}},"val":"Page"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/inheritance.extend.pug","end":{"line":9,"column":3}}}
+{"type":"tag","loc":{"start":{"line":9,"column":3},"filename":"/cases/inheritance.extend.pug","end":{"line":9,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":9,"column":5},"filename":"/cases/inheritance.extend.pug","end":{"line":9,"column":17}},"val":"Some content"}
+{"type":"outdent","loc":{"start":{"line":10,"column":1},"filename":"/cases/inheritance.extend.pug","end":{"line":10,"column":1}}}
+{"type":"eos","loc":{"start":{"line":10,"column":1},"filename":"/cases/inheritance.extend.pug","end":{"line":10,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/inheritance.extend.whitespace.tokens.json b/packages/pug-parser/test/cases/inheritance.extend.whitespace.tokens.json
index 8c85f5bcf..f22e409c9 100644
--- a/packages/pug-parser/test/cases/inheritance.extend.whitespace.tokens.json
+++ b/packages/pug-parser/test/cases/inheritance.extend.whitespace.tokens.json
@@ -1,20 +1,20 @@
-{"type":"newline","line":2,"col":1}
-{"type":"extends","line":2,"col":1}
-{"type":"path","line":2,"col":8,"val":"auxiliary/layout.pug"}
-{"type":"newline","line":4,"col":1}
-{"type":"block","line":4,"col":1,"val":"head","mode":"replace"}
-{"type":"indent","line":6,"col":1,"val":2}
-{"type":"tag","line":6,"col":3,"val":"script"}
-{"type":"start-attributes","line":6,"col":9}
-{"type":"attribute","line":6,"col":10,"name":"src","val":"'jquery.js'","mustEscape":true}
-{"type":"end-attributes","line":6,"col":25}
-{"type":"outdent","line":8,"col":1}
-{"type":"block","line":8,"col":1,"val":"content","mode":"replace"}
-{"type":"indent","line":12,"col":1,"val":2}
-{"type":"tag","line":12,"col":3,"val":"h2"}
-{"type":"text","line":12,"col":6,"val":"Page"}
-{"type":"newline","line":13,"col":1}
-{"type":"tag","line":13,"col":3,"val":"p"}
-{"type":"text","line":13,"col":5,"val":"Some content"}
-{"type":"outdent","line":14,"col":1}
-{"type":"eos","line":14,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":2,"column":1}}}
+{"type":"extends","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":2,"column":7}}}
+{"type":"path","loc":{"start":{"line":2,"column":8},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":2,"column":28}},"val":"auxiliary/layout.pug"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":4,"column":1}}}
+{"type":"block","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":4,"column":11}},"val":"head","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":6,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":6,"column":3},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":6,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":9},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":6,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":10},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":6,"column":25}},"name":"src","mustEscape":true,"val":"'jquery.js'"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":25},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":6,"column":26}}}
+{"type":"outdent","loc":{"start":{"line":8,"column":1},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":8,"column":1}}}
+{"type":"block","loc":{"start":{"line":8,"column":1},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":8,"column":14}},"val":"content","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":12,"column":1},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":12,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":12,"column":3},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":12,"column":5}},"val":"h2"}
+{"type":"text","loc":{"start":{"line":12,"column":6},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":12,"column":10}},"val":"Page"}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":13,"column":3}}}
+{"type":"tag","loc":{"start":{"line":13,"column":3},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":13,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":13,"column":5},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":13,"column":17}},"val":"Some content"}
+{"type":"outdent","loc":{"start":{"line":14,"column":1},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":14,"column":1}}}
+{"type":"eos","loc":{"start":{"line":14,"column":1},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":14,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/inheritance.tokens.json b/packages/pug-parser/test/cases/inheritance.tokens.json
index 27c5d259a..5e6703d3c 100644
--- a/packages/pug-parser/test/cases/inheritance.tokens.json
+++ b/packages/pug-parser/test/cases/inheritance.tokens.json
@@ -1,20 +1,20 @@
-{"type":"newline","line":2,"col":1}
-{"type":"extends","line":2,"col":1}
-{"type":"path","line":2,"col":9,"val":"auxiliary/layout.pug"}
-{"type":"newline","line":4,"col":1}
-{"type":"block","line":4,"col":1,"val":"head","mode":"replace"}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"tag","line":5,"col":3,"val":"script"}
-{"type":"start-attributes","line":5,"col":9}
-{"type":"attribute","line":5,"col":10,"name":"src","val":"'jquery.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":25}
-{"type":"outdent","line":7,"col":1}
-{"type":"block","line":7,"col":1,"val":"content","mode":"replace"}
-{"type":"indent","line":8,"col":1,"val":2}
-{"type":"tag","line":8,"col":3,"val":"h2"}
-{"type":"text","line":8,"col":6,"val":"Page"}
-{"type":"newline","line":9,"col":1}
-{"type":"tag","line":9,"col":3,"val":"p"}
-{"type":"text","line":9,"col":5,"val":"Some content"}
-{"type":"outdent","line":10,"col":1}
-{"type":"eos","line":10,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.pug","end":{"line":2,"column":1}}}
+{"type":"extends","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.pug","end":{"line":2,"column":8}}}
+{"type":"path","loc":{"start":{"line":2,"column":9},"filename":"/cases/inheritance.pug","end":{"line":2,"column":29}},"val":"auxiliary/layout.pug"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.pug","end":{"line":4,"column":1}}}
+{"type":"block","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.pug","end":{"line":4,"column":11}},"val":"head","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/inheritance.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/inheritance.pug","end":{"line":5,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":9},"filename":"/cases/inheritance.pug","end":{"line":5,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":10},"filename":"/cases/inheritance.pug","end":{"line":5,"column":25}},"name":"src","mustEscape":true,"val":"'jquery.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":25},"filename":"/cases/inheritance.pug","end":{"line":5,"column":26}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/inheritance.pug","end":{"line":7,"column":1}}}
+{"type":"block","loc":{"start":{"line":7,"column":1},"filename":"/cases/inheritance.pug","end":{"line":7,"column":14}},"val":"content","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/inheritance.pug","end":{"line":8,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":8,"column":3},"filename":"/cases/inheritance.pug","end":{"line":8,"column":5}},"val":"h2"}
+{"type":"text","loc":{"start":{"line":8,"column":6},"filename":"/cases/inheritance.pug","end":{"line":8,"column":10}},"val":"Page"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/inheritance.pug","end":{"line":9,"column":3}}}
+{"type":"tag","loc":{"start":{"line":9,"column":3},"filename":"/cases/inheritance.pug","end":{"line":9,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":9,"column":5},"filename":"/cases/inheritance.pug","end":{"line":9,"column":17}},"val":"Some content"}
+{"type":"outdent","loc":{"start":{"line":10,"column":1},"filename":"/cases/inheritance.pug","end":{"line":10,"column":1}}}
+{"type":"eos","loc":{"start":{"line":10,"column":1},"filename":"/cases/inheritance.pug","end":{"line":10,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/inline-block-comment.tokens.json b/packages/pug-parser/test/cases/inline-block-comment.tokens.json
index d4bbbfe5d..6aa644fe6 100644
--- a/packages/pug-parser/test/cases/inline-block-comment.tokens.json
+++ b/packages/pug-parser/test/cases/inline-block-comment.tokens.json
@@ -1,10 +1,10 @@
-{"type":"block","line":1,"col":1,"val":"content","mode":"replace"}
-{"type":"comment","line":1,"col":1,"val":" Main content goes here","buffer":true}
-{"type":"newline","line":2,"col":1}
-{"type":"block","line":2,"col":1,"val":"content","mode":"append"}
-{"type":"comment","line":2,"col":1,"val":" adding something to content","buffer":true}
-{"type":"newline","line":3,"col":1}
-{"type":"block","line":3,"col":1,"val":"content","mode":"prepend"}
-{"type":"comment","line":3,"col":1,"val":" adding something to other end of content","buffer":true}
-{"type":"newline","line":4,"col":1}
-{"type":"eos","line":4,"col":1}
\ No newline at end of file
+{"type":"block","loc":{"start":{"line":1,"column":1},"filename":"/cases/inline-block-comment.pug","end":{"line":1,"column":14}},"val":"content","mode":"replace"}
+{"type":"comment","loc":{"start":{"line":1,"column":15},"filename":"/cases/inline-block-comment.pug","end":{"line":1,"column":40}},"val":" Main content goes here","buffer":true}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/inline-block-comment.pug","end":{"line":2,"column":1}}}
+{"type":"block","loc":{"start":{"line":2,"column":1},"filename":"/cases/inline-block-comment.pug","end":{"line":2,"column":15}},"val":"content","mode":"append"}
+{"type":"comment","loc":{"start":{"line":2,"column":16},"filename":"/cases/inline-block-comment.pug","end":{"line":2,"column":46}},"val":" adding something to content","buffer":true}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/inline-block-comment.pug","end":{"line":3,"column":1}}}
+{"type":"block","loc":{"start":{"line":3,"column":1},"filename":"/cases/inline-block-comment.pug","end":{"line":3,"column":16}},"val":"content","mode":"prepend"}
+{"type":"comment","loc":{"start":{"line":3,"column":17},"filename":"/cases/inline-block-comment.pug","end":{"line":3,"column":60}},"val":" adding something to other end of content","buffer":true}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/inline-block-comment.pug","end":{"line":4,"column":1}}}
+{"type":"eos","loc":{"start":{"line":4,"column":1},"filename":"/cases/inline-block-comment.pug","end":{"line":4,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/inline-tag.tokens.json b/packages/pug-parser/test/cases/inline-tag.tokens.json
index 55a7d2e02..2179a4fb0 100644
--- a/packages/pug-parser/test/cases/inline-tag.tokens.json
+++ b/packages/pug-parser/test/cases/inline-tag.tokens.json
@@ -1,77 +1,77 @@
-{"type":"tag","line":1,"col":1,"val":"p"}
-{"type":"text","line":1,"col":3,"val":"bing "}
-{"type":"start-pug-interpolation","line":1,"col":8}
-{"type":"tag","line":1,"col":10,"val":"strong"}
-{"type":"text","line":1,"col":17,"val":"foo"}
-{"type":"end-pug-interpolation","line":1,"col":20}
-{"type":"text","line":1,"col":21,"val":" bong"}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"p"}
-{"type":"dot","line":3,"col":2}
-{"type":"start-pipeless-text","line":3,"col":3}
-{"type":"text","line":4,"col":3,"val":"bing"}
-{"type":"newline","line":5,"col":1}
-{"type":"text","line":5,"col":3,"val":""}
-{"type":"start-pug-interpolation","line":5,"col":3}
-{"type":"tag","line":5,"col":5,"val":"strong"}
-{"type":"text","line":5,"col":12,"val":"foo"}
-{"type":"end-pug-interpolation","line":5,"col":15}
-{"type":"text","line":5,"col":16,"val":""}
-{"type":"newline","line":6,"col":1}
-{"type":"text","line":6,"col":3,"val":""}
-{"type":"start-pug-interpolation","line":6,"col":3}
-{"type":"tag","line":6,"col":5,"val":"strong"}
-{"type":"code","line":6,"col":11,"val":"'[foo]'","mustEscape":true,"buffer":true}
-{"type":"end-pug-interpolation","line":6,"col":20}
-{"type":"text","line":6,"col":21,"val":""}
-{"type":"newline","line":7,"col":1}
-{"type":"text","line":7,"col":3,"val":""}
-{"type":"start-pug-interpolation","line":7,"col":3}
-{"type":"code","line":7,"col":5,"val":"var foo = 'foo]'","mustEscape":false,"buffer":false}
-{"type":"end-pug-interpolation","line":7,"col":23}
-{"type":"text","line":7,"col":24,"val":""}
-{"type":"newline","line":8,"col":1}
-{"type":"text","line":8,"col":3,"val":"bong"}
-{"type":"newline","line":9,"col":1}
-{"type":"text","line":9,"col":3,"val":""}
-{"type":"end-pipeless-text","line":9,"col":3}
-{"type":"newline","line":10,"col":1}
-{"type":"tag","line":10,"col":1,"val":"p"}
-{"type":"indent","line":11,"col":1,"val":2}
-{"type":"text","line":11,"col":5,"val":"bing"}
-{"type":"newline","line":12,"col":1}
-{"type":"text","line":12,"col":5,"val":""}
-{"type":"start-pug-interpolation","line":12,"col":5}
-{"type":"tag","line":12,"col":7,"val":"strong"}
-{"type":"text","line":12,"col":14,"val":"foo"}
-{"type":"end-pug-interpolation","line":12,"col":17}
-{"type":"text","line":12,"col":18,"val":""}
-{"type":"newline","line":13,"col":1}
-{"type":"text","line":13,"col":5,"val":""}
-{"type":"start-pug-interpolation","line":13,"col":5}
-{"type":"tag","line":13,"col":7,"val":"strong"}
-{"type":"code","line":13,"col":13,"val":"'[foo]'","mustEscape":true,"buffer":true}
-{"type":"end-pug-interpolation","line":13,"col":22}
-{"type":"text","line":13,"col":23,"val":""}
-{"type":"newline","line":14,"col":1}
-{"type":"text","line":14,"col":5,"val":""}
-{"type":"start-pug-interpolation","line":14,"col":5}
-{"type":"code","line":14,"col":7,"val":"var foo = 'foo]'","mustEscape":false,"buffer":false}
-{"type":"end-pug-interpolation","line":14,"col":25}
-{"type":"text","line":14,"col":26,"val":""}
-{"type":"newline","line":15,"col":1}
-{"type":"text","line":15,"col":5,"val":"bong"}
-{"type":"outdent","line":17,"col":1}
-{"type":"tag","line":17,"col":1,"val":"p"}
-{"type":"dot","line":17,"col":2}
-{"type":"start-pipeless-text","line":17,"col":3}
-{"type":"text","line":18,"col":3,"val":"#[strong escaped]"}
-{"type":"newline","line":19,"col":1}
-{"type":"text","line":19,"col":3,"val":"#["}
-{"type":"start-pug-interpolation","line":19,"col":6}
-{"type":"tag","line":19,"col":8,"val":"strong"}
-{"type":"text","line":19,"col":15,"val":"escaped"}
-{"type":"end-pug-interpolation","line":19,"col":22}
-{"type":"text","line":19,"col":23,"val":""}
-{"type":"end-pipeless-text","line":19,"col":23}
-{"type":"eos","line":19,"col":23}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":1,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":1,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":1,"column":8}},"val":"bing "}
+{"type":"start-pug-interpolation","loc":{"start":{"line":1,"column":8},"filename":"/cases/inline-tag.pug","end":{"line":1,"column":10}}}
+{"type":"tag","loc":{"start":{"line":1,"column":10},"filename":"/cases/inline-tag.pug","end":{"line":1,"column":16}},"val":"strong"}
+{"type":"text","loc":{"start":{"line":1,"column":17},"filename":"/cases/inline-tag.pug","end":{"line":1,"column":20}},"val":"foo"}
+{"type":"end-pug-interpolation","loc":{"start":{"line":1,"column":20},"filename":"/cases/inline-tag.pug","end":{"line":1,"column":21}}}
+{"type":"text","loc":{"start":{"line":1,"column":21},"filename":"/cases/inline-tag.pug","end":{"line":1,"column":26}},"val":" bong"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":3,"column":2}},"val":"p"}
+{"type":"dot","loc":{"start":{"line":3,"column":2},"filename":"/cases/inline-tag.pug","end":{"line":3,"column":3}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":3,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":3,"column":3}}}
+{"type":"text","loc":{"start":{"line":4,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":4,"column":7}},"val":"bing"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":5,"column":3}}}
+{"type":"text","loc":{"start":{"line":5,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":5,"column":3}},"val":""}
+{"type":"start-pug-interpolation","loc":{"start":{"line":5,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":5,"column":5}}}
+{"type":"tag","loc":{"start":{"line":5,"column":5},"filename":"/cases/inline-tag.pug","end":{"line":5,"column":11}},"val":"strong"}
+{"type":"text","loc":{"start":{"line":5,"column":12},"filename":"/cases/inline-tag.pug","end":{"line":5,"column":15}},"val":"foo"}
+{"type":"end-pug-interpolation","loc":{"start":{"line":5,"column":15},"filename":"/cases/inline-tag.pug","end":{"line":5,"column":16}}}
+{"type":"text","loc":{"start":{"line":5,"column":16},"filename":"/cases/inline-tag.pug","end":{"line":5,"column":16}},"val":""}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":6,"column":3}}}
+{"type":"text","loc":{"start":{"line":6,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":6,"column":3}},"val":""}
+{"type":"start-pug-interpolation","loc":{"start":{"line":6,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":6,"column":5}}}
+{"type":"tag","loc":{"start":{"line":6,"column":5},"filename":"/cases/inline-tag.pug","end":{"line":6,"column":11}},"val":"strong"}
+{"type":"code","loc":{"start":{"line":6,"column":11},"filename":"/cases/inline-tag.pug","end":{"line":6,"column":20}},"val":"'[foo]'","mustEscape":true,"buffer":true}
+{"type":"end-pug-interpolation","loc":{"start":{"line":6,"column":20},"filename":"/cases/inline-tag.pug","end":{"line":6,"column":21}}}
+{"type":"text","loc":{"start":{"line":6,"column":21},"filename":"/cases/inline-tag.pug","end":{"line":6,"column":21}},"val":""}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":7,"column":3}}}
+{"type":"text","loc":{"start":{"line":7,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":7,"column":3}},"val":""}
+{"type":"start-pug-interpolation","loc":{"start":{"line":7,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":7,"column":5}}}
+{"type":"code","loc":{"start":{"line":7,"column":5},"filename":"/cases/inline-tag.pug","end":{"line":7,"column":23}},"val":"var foo = 'foo]'","mustEscape":false,"buffer":false}
+{"type":"end-pug-interpolation","loc":{"start":{"line":7,"column":23},"filename":"/cases/inline-tag.pug","end":{"line":7,"column":24}}}
+{"type":"text","loc":{"start":{"line":7,"column":24},"filename":"/cases/inline-tag.pug","end":{"line":7,"column":24}},"val":""}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":8,"column":3}}}
+{"type":"text","loc":{"start":{"line":8,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":8,"column":7}},"val":"bong"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":9,"column":1}}}
+{"type":"text","loc":{"start":{"line":9,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":9,"column":1}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":9,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":9,"column":1}}}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":10,"column":1}}}
+{"type":"tag","loc":{"start":{"line":10,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":10,"column":2}},"val":"p"}
+{"type":"indent","loc":{"start":{"line":11,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":11,"column":3}},"val":2}
+{"type":"text","loc":{"start":{"line":11,"column":5},"filename":"/cases/inline-tag.pug","end":{"line":11,"column":9}},"val":"bing"}
+{"type":"newline","loc":{"start":{"line":12,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":12,"column":3}}}
+{"type":"text","loc":{"start":{"line":12,"column":5},"filename":"/cases/inline-tag.pug","end":{"line":12,"column":5}},"val":""}
+{"type":"start-pug-interpolation","loc":{"start":{"line":12,"column":5},"filename":"/cases/inline-tag.pug","end":{"line":12,"column":7}}}
+{"type":"tag","loc":{"start":{"line":12,"column":7},"filename":"/cases/inline-tag.pug","end":{"line":12,"column":13}},"val":"strong"}
+{"type":"text","loc":{"start":{"line":12,"column":14},"filename":"/cases/inline-tag.pug","end":{"line":12,"column":17}},"val":"foo"}
+{"type":"end-pug-interpolation","loc":{"start":{"line":12,"column":17},"filename":"/cases/inline-tag.pug","end":{"line":12,"column":18}}}
+{"type":"text","loc":{"start":{"line":12,"column":18},"filename":"/cases/inline-tag.pug","end":{"line":12,"column":18}},"val":""}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":13,"column":3}}}
+{"type":"text","loc":{"start":{"line":13,"column":5},"filename":"/cases/inline-tag.pug","end":{"line":13,"column":5}},"val":""}
+{"type":"start-pug-interpolation","loc":{"start":{"line":13,"column":5},"filename":"/cases/inline-tag.pug","end":{"line":13,"column":7}}}
+{"type":"tag","loc":{"start":{"line":13,"column":7},"filename":"/cases/inline-tag.pug","end":{"line":13,"column":13}},"val":"strong"}
+{"type":"code","loc":{"start":{"line":13,"column":13},"filename":"/cases/inline-tag.pug","end":{"line":13,"column":22}},"val":"'[foo]'","mustEscape":true,"buffer":true}
+{"type":"end-pug-interpolation","loc":{"start":{"line":13,"column":22},"filename":"/cases/inline-tag.pug","end":{"line":13,"column":23}}}
+{"type":"text","loc":{"start":{"line":13,"column":23},"filename":"/cases/inline-tag.pug","end":{"line":13,"column":23}},"val":""}
+{"type":"newline","loc":{"start":{"line":14,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":14,"column":3}}}
+{"type":"text","loc":{"start":{"line":14,"column":5},"filename":"/cases/inline-tag.pug","end":{"line":14,"column":5}},"val":""}
+{"type":"start-pug-interpolation","loc":{"start":{"line":14,"column":5},"filename":"/cases/inline-tag.pug","end":{"line":14,"column":7}}}
+{"type":"code","loc":{"start":{"line":14,"column":7},"filename":"/cases/inline-tag.pug","end":{"line":14,"column":25}},"val":"var foo = 'foo]'","mustEscape":false,"buffer":false}
+{"type":"end-pug-interpolation","loc":{"start":{"line":14,"column":25},"filename":"/cases/inline-tag.pug","end":{"line":14,"column":26}}}
+{"type":"text","loc":{"start":{"line":14,"column":26},"filename":"/cases/inline-tag.pug","end":{"line":14,"column":26}},"val":""}
+{"type":"newline","loc":{"start":{"line":15,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":15,"column":3}}}
+{"type":"text","loc":{"start":{"line":15,"column":5},"filename":"/cases/inline-tag.pug","end":{"line":15,"column":9}},"val":"bong"}
+{"type":"outdent","loc":{"start":{"line":17,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":17,"column":1}}}
+{"type":"tag","loc":{"start":{"line":17,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":17,"column":2}},"val":"p"}
+{"type":"dot","loc":{"start":{"line":17,"column":2},"filename":"/cases/inline-tag.pug","end":{"line":17,"column":3}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":17,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":17,"column":3}}}
+{"type":"text","loc":{"start":{"line":18,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":18,"column":21}},"val":"#[strong escaped]"}
+{"type":"newline","loc":{"start":{"line":19,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":19,"column":3}}}
+{"type":"text","loc":{"start":{"line":19,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":19,"column":6}},"val":"#["}
+{"type":"start-pug-interpolation","loc":{"start":{"line":19,"column":6},"filename":"/cases/inline-tag.pug","end":{"line":19,"column":8}}}
+{"type":"tag","loc":{"start":{"line":19,"column":8},"filename":"/cases/inline-tag.pug","end":{"line":19,"column":14}},"val":"strong"}
+{"type":"text","loc":{"start":{"line":19,"column":15},"filename":"/cases/inline-tag.pug","end":{"line":19,"column":22}},"val":"escaped"}
+{"type":"end-pug-interpolation","loc":{"start":{"line":19,"column":22},"filename":"/cases/inline-tag.pug","end":{"line":19,"column":23}}}
+{"type":"text","loc":{"start":{"line":19,"column":23},"filename":"/cases/inline-tag.pug","end":{"line":19,"column":23}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":19,"column":23},"filename":"/cases/inline-tag.pug","end":{"line":19,"column":23}}}
+{"type":"eos","loc":{"start":{"line":19,"column":23},"filename":"/cases/inline-tag.pug","end":{"line":19,"column":23}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/intepolated-elements.tokens.json b/packages/pug-parser/test/cases/intepolated-elements.tokens.json
index 48ff6917b..101b41c13 100644
--- a/packages/pug-parser/test/cases/intepolated-elements.tokens.json
+++ b/packages/pug-parser/test/cases/intepolated-elements.tokens.json
@@ -1,38 +1,38 @@
-{"type":"tag","line":1,"col":1,"val":"p"}
-{"type":"text","line":1,"col":3,"val":""}
-{"type":"start-pug-interpolation","line":1,"col":3}
-{"type":"tag","line":1,"col":5,"val":"a"}
-{"type":"class","line":1,"col":6,"val":"rho"}
-{"type":"start-attributes","line":1,"col":10}
-{"type":"attribute","line":1,"col":11,"name":"href","val":"'#'","mustEscape":true}
-{"type":"attribute","line":1,"col":21,"name":"class","val":"'rho--modifier'","mustEscape":true}
-{"type":"end-attributes","line":1,"col":42}
-{"type":"text","line":1,"col":44,"val":"with inline link"}
-{"type":"end-pug-interpolation","line":1,"col":60}
-{"type":"text","line":1,"col":61,"val":""}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"p"}
-{"type":"text","line":2,"col":3,"val":"Some text "}
-{"type":"start-pug-interpolation","line":2,"col":13}
-{"type":"tag","line":2,"col":15,"val":"a"}
-{"type":"class","line":2,"col":16,"val":"rho"}
-{"type":"start-attributes","line":2,"col":20}
-{"type":"attribute","line":2,"col":21,"name":"href","val":"'#'","mustEscape":true}
-{"type":"attribute","line":2,"col":31,"name":"class","val":"'rho--modifier'","mustEscape":true}
-{"type":"end-attributes","line":2,"col":52}
-{"type":"end-pug-interpolation","line":2,"col":53}
-{"type":"text","line":2,"col":54,"val":""}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"p"}
-{"type":"text","line":3,"col":3,"val":"Some text "}
-{"type":"start-pug-interpolation","line":3,"col":13}
-{"type":"tag","line":3,"col":15,"val":"a"}
-{"type":"class","line":3,"col":16,"val":"rho"}
-{"type":"start-attributes","line":3,"col":20}
-{"type":"attribute","line":3,"col":21,"name":"href","val":"'#'","mustEscape":true}
-{"type":"attribute","line":3,"col":31,"name":"class","val":"'rho--modifier'","mustEscape":true}
-{"type":"end-attributes","line":3,"col":52}
-{"type":"text","line":3,"col":54,"val":"with inline link"}
-{"type":"end-pug-interpolation","line":3,"col":70}
-{"type":"text","line":3,"col":71,"val":""}
-{"type":"eos","line":3,"col":71}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":1,"column":3},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":3}},"val":""}
+{"type":"start-pug-interpolation","loc":{"start":{"line":1,"column":3},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":5}}}
+{"type":"tag","loc":{"start":{"line":1,"column":5},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":6}},"val":"a"}
+{"type":"class","loc":{"start":{"line":1,"column":6},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":10}},"val":"rho"}
+{"type":"start-attributes","loc":{"start":{"line":1,"column":10},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":11}}}
+{"type":"attribute","loc":{"start":{"line":1,"column":11},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":19}},"name":"href","mustEscape":true,"val":"'#'"}
+{"type":"attribute","loc":{"start":{"line":1,"column":21},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":42}},"name":"class","mustEscape":true,"val":"'rho--modifier'"}
+{"type":"end-attributes","loc":{"start":{"line":1,"column":42},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":43}}}
+{"type":"text","loc":{"start":{"line":1,"column":44},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":60}},"val":"with inline link"}
+{"type":"end-pug-interpolation","loc":{"start":{"line":1,"column":60},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":61}}}
+{"type":"text","loc":{"start":{"line":1,"column":61},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":61}},"val":""}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":2,"column":3},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":13}},"val":"Some text "}
+{"type":"start-pug-interpolation","loc":{"start":{"line":2,"column":13},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":15}}}
+{"type":"tag","loc":{"start":{"line":2,"column":15},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":16}},"val":"a"}
+{"type":"class","loc":{"start":{"line":2,"column":16},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":20}},"val":"rho"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":20},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":21}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":21},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":29}},"name":"href","mustEscape":true,"val":"'#'"}
+{"type":"attribute","loc":{"start":{"line":2,"column":31},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":52}},"name":"class","mustEscape":true,"val":"'rho--modifier'"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":52},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":53}}}
+{"type":"end-pug-interpolation","loc":{"start":{"line":2,"column":53},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":54}}}
+{"type":"text","loc":{"start":{"line":2,"column":54},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":54}},"val":""}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":3,"column":3},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":13}},"val":"Some text "}
+{"type":"start-pug-interpolation","loc":{"start":{"line":3,"column":13},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":15}}}
+{"type":"tag","loc":{"start":{"line":3,"column":15},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":16}},"val":"a"}
+{"type":"class","loc":{"start":{"line":3,"column":16},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":20}},"val":"rho"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":20},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":21}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":21},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":29}},"name":"href","mustEscape":true,"val":"'#'"}
+{"type":"attribute","loc":{"start":{"line":3,"column":31},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":52}},"name":"class","mustEscape":true,"val":"'rho--modifier'"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":52},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":53}}}
+{"type":"text","loc":{"start":{"line":3,"column":54},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":70}},"val":"with inline link"}
+{"type":"end-pug-interpolation","loc":{"start":{"line":3,"column":70},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":71}}}
+{"type":"text","loc":{"start":{"line":3,"column":71},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":71}},"val":""}
+{"type":"eos","loc":{"start":{"line":3,"column":71},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":71}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/interpolated-mixin.tokens.json b/packages/pug-parser/test/cases/interpolated-mixin.tokens.json
index d8b533889..3ca752250 100644
--- a/packages/pug-parser/test/cases/interpolated-mixin.tokens.json
+++ b/packages/pug-parser/test/cases/interpolated-mixin.tokens.json
@@ -1,15 +1,15 @@
-{"type":"mixin","line":1,"col":1,"val":"linkit","args":"url"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"a"}
-{"type":"start-attributes","line":2,"col":4}
-{"type":"attribute","line":2,"col":5,"name":"href","val":"url","mustEscape":true}
-{"type":"end-attributes","line":2,"col":13}
-{"type":"code","line":2,"col":14,"val":"url","mustEscape":true,"buffer":true}
-{"type":"outdent","line":4,"col":1}
-{"type":"tag","line":4,"col":1,"val":"p"}
-{"type":"text","line":4,"col":3,"val":"This also works "}
-{"type":"start-pug-interpolation","line":4,"col":19}
-{"type":"call","line":4,"col":21,"val":"linkit","args":"'http://www.bing.com'"}
-{"type":"end-pug-interpolation","line":4,"col":51}
-{"type":"text","line":4,"col":52,"val":" so hurrah for Pug"}
-{"type":"eos","line":4,"col":70}
\ No newline at end of file
+{"type":"mixin","loc":{"start":{"line":1,"column":1},"filename":"/cases/interpolated-mixin.pug","end":{"line":1,"column":18}},"val":"linkit","args":"url"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/interpolated-mixin.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/interpolated-mixin.pug","end":{"line":2,"column":4}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":4},"filename":"/cases/interpolated-mixin.pug","end":{"line":2,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":5},"filename":"/cases/interpolated-mixin.pug","end":{"line":2,"column":13}},"name":"href","mustEscape":true,"val":"url"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":13},"filename":"/cases/interpolated-mixin.pug","end":{"line":2,"column":14}}}
+{"type":"code","loc":{"start":{"line":2,"column":14},"filename":"/cases/interpolated-mixin.pug","end":{"line":2,"column":19}},"val":"url","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":4,"column":1},"filename":"/cases/interpolated-mixin.pug","end":{"line":4,"column":1}}}
+{"type":"tag","loc":{"start":{"line":4,"column":1},"filename":"/cases/interpolated-mixin.pug","end":{"line":4,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":4,"column":3},"filename":"/cases/interpolated-mixin.pug","end":{"line":4,"column":19}},"val":"This also works "}
+{"type":"start-pug-interpolation","loc":{"start":{"line":4,"column":19},"filename":"/cases/interpolated-mixin.pug","end":{"line":4,"column":21}}}
+{"type":"call","loc":{"start":{"line":4,"column":21},"filename":"/cases/interpolated-mixin.pug","end":{"line":4,"column":51}},"val":"linkit","args":"'http://www.bing.com'"}
+{"type":"end-pug-interpolation","loc":{"start":{"line":4,"column":51},"filename":"/cases/interpolated-mixin.pug","end":{"line":4,"column":52}}}
+{"type":"text","loc":{"start":{"line":4,"column":52},"filename":"/cases/interpolated-mixin.pug","end":{"line":4,"column":70}},"val":" so hurrah for Pug"}
+{"type":"eos","loc":{"start":{"line":4,"column":70},"filename":"/cases/interpolated-mixin.pug","end":{"line":4,"column":70}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/interpolation.escape.tokens.json b/packages/pug-parser/test/cases/interpolation.escape.tokens.json
index 8f45d9d08..4eff64156 100644
--- a/packages/pug-parser/test/cases/interpolation.escape.tokens.json
+++ b/packages/pug-parser/test/cases/interpolation.escape.tokens.json
@@ -1,15 +1,15 @@
-{"type":"newline","line":2,"col":1}
-{"type":"code","line":2,"col":1,"val":"var id = 42;","mustEscape":false,"buffer":false}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"foo"}
-{"type":"indent","line":4,"col":1,"val":2}
-{"type":"text","line":4,"col":5,"val":"some"}
-{"type":"newline","line":5,"col":1}
-{"type":"text","line":5,"col":5,"val":"#{text}"}
-{"type":"newline","line":6,"col":1}
-{"type":"text","line":6,"col":5,"val":"here"}
-{"type":"newline","line":7,"col":1}
-{"type":"text","line":7,"col":5,"val":"My ID "}
-{"type":"interpolated-code","line":7,"col":11,"val":"\"is {\" + id + \"}\"","mustEscape":true,"buffer":true}
-{"type":"outdent","line":7,"col":31}
-{"type":"eos","line":7,"col":31}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/interpolation.escape.pug","end":{"line":2,"column":1}}}
+{"type":"code","loc":{"start":{"line":2,"column":1},"filename":"/cases/interpolation.escape.pug","end":{"line":2,"column":15}},"val":"var id = 42;","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/interpolation.escape.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/interpolation.escape.pug","end":{"line":3,"column":4}},"val":"foo"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/interpolation.escape.pug","end":{"line":4,"column":3}},"val":2}
+{"type":"text","loc":{"start":{"line":4,"column":5},"filename":"/cases/interpolation.escape.pug","end":{"line":4,"column":9}},"val":"some"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/interpolation.escape.pug","end":{"line":5,"column":3}}}
+{"type":"text","loc":{"start":{"line":5,"column":5},"filename":"/cases/interpolation.escape.pug","end":{"line":5,"column":13}},"val":"#{text}"}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/interpolation.escape.pug","end":{"line":6,"column":3}}}
+{"type":"text","loc":{"start":{"line":6,"column":5},"filename":"/cases/interpolation.escape.pug","end":{"line":6,"column":9}},"val":"here"}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/interpolation.escape.pug","end":{"line":7,"column":3}}}
+{"type":"text","loc":{"start":{"line":7,"column":5},"filename":"/cases/interpolation.escape.pug","end":{"line":7,"column":11}},"val":"My ID "}
+{"type":"interpolated-code","loc":{"start":{"line":7,"column":11},"filename":"/cases/interpolation.escape.pug","end":{"line":7,"column":31}},"mustEscape":true,"buffer":true,"val":"\"is {\" + id + \"}\""}
+{"type":"outdent","loc":{"start":{"line":7,"column":31},"filename":"/cases/interpolation.escape.pug","end":{"line":7,"column":31}}}
+{"type":"eos","loc":{"start":{"line":7,"column":31},"filename":"/cases/interpolation.escape.pug","end":{"line":7,"column":31}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/layout.append.tokens.json b/packages/pug-parser/test/cases/layout.append.tokens.json
index c3d6ef903..11390788e 100644
--- a/packages/pug-parser/test/cases/layout.append.tokens.json
+++ b/packages/pug-parser/test/cases/layout.append.tokens.json
@@ -1,17 +1,17 @@
-{"type":"newline","line":2,"col":1}
-{"type":"extends","line":2,"col":1}
-{"type":"path","line":2,"col":9,"val":"../fixtures/append/app-layout.pug"}
-{"type":"newline","line":4,"col":1}
-{"type":"block","line":4,"col":1,"val":"head","mode":"append"}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"tag","line":5,"col":3,"val":"script"}
-{"type":"start-attributes","line":5,"col":9}
-{"type":"attribute","line":5,"col":10,"name":"src","val":"'foo.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":22}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":3,"val":"script"}
-{"type":"start-attributes","line":6,"col":9}
-{"type":"attribute","line":6,"col":10,"name":"src","val":"'bar.js'","mustEscape":true}
-{"type":"end-attributes","line":6,"col":22}
-{"type":"outdent","line":7,"col":1}
-{"type":"eos","line":7,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/layout.append.pug","end":{"line":2,"column":1}}}
+{"type":"extends","loc":{"start":{"line":2,"column":1},"filename":"/cases/layout.append.pug","end":{"line":2,"column":8}}}
+{"type":"path","loc":{"start":{"line":2,"column":9},"filename":"/cases/layout.append.pug","end":{"line":2,"column":42}},"val":"../fixtures/append/app-layout.pug"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/layout.append.pug","end":{"line":4,"column":1}}}
+{"type":"block","loc":{"start":{"line":4,"column":1},"filename":"/cases/layout.append.pug","end":{"line":4,"column":18}},"val":"head","mode":"append"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/layout.append.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/layout.append.pug","end":{"line":5,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":9},"filename":"/cases/layout.append.pug","end":{"line":5,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":10},"filename":"/cases/layout.append.pug","end":{"line":5,"column":22}},"name":"src","mustEscape":true,"val":"'foo.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":22},"filename":"/cases/layout.append.pug","end":{"line":5,"column":23}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/layout.append.pug","end":{"line":6,"column":3}}}
+{"type":"tag","loc":{"start":{"line":6,"column":3},"filename":"/cases/layout.append.pug","end":{"line":6,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":9},"filename":"/cases/layout.append.pug","end":{"line":6,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":10},"filename":"/cases/layout.append.pug","end":{"line":6,"column":22}},"name":"src","mustEscape":true,"val":"'bar.js'"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":22},"filename":"/cases/layout.append.pug","end":{"line":6,"column":23}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/layout.append.pug","end":{"line":7,"column":1}}}
+{"type":"eos","loc":{"start":{"line":7,"column":1},"filename":"/cases/layout.append.pug","end":{"line":7,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/layout.append.without-block.tokens.json b/packages/pug-parser/test/cases/layout.append.without-block.tokens.json
index eddf3e8c4..fc737ffe7 100644
--- a/packages/pug-parser/test/cases/layout.append.without-block.tokens.json
+++ b/packages/pug-parser/test/cases/layout.append.without-block.tokens.json
@@ -1,17 +1,17 @@
-{"type":"newline","line":2,"col":1}
-{"type":"extends","line":2,"col":1}
-{"type":"path","line":2,"col":9,"val":"../fixtures/append-without-block/app-layout.pug"}
-{"type":"newline","line":4,"col":1}
-{"type":"block","line":4,"col":1,"val":"head","mode":"append"}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"tag","line":5,"col":3,"val":"script"}
-{"type":"start-attributes","line":5,"col":9}
-{"type":"attribute","line":5,"col":10,"name":"src","val":"'foo.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":22}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":3,"val":"script"}
-{"type":"start-attributes","line":6,"col":9}
-{"type":"attribute","line":6,"col":10,"name":"src","val":"'bar.js'","mustEscape":true}
-{"type":"end-attributes","line":6,"col":22}
-{"type":"outdent","line":7,"col":1}
-{"type":"eos","line":7,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/layout.append.without-block.pug","end":{"line":2,"column":1}}}
+{"type":"extends","loc":{"start":{"line":2,"column":1},"filename":"/cases/layout.append.without-block.pug","end":{"line":2,"column":8}}}
+{"type":"path","loc":{"start":{"line":2,"column":9},"filename":"/cases/layout.append.without-block.pug","end":{"line":2,"column":56}},"val":"../fixtures/append-without-block/app-layout.pug"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/layout.append.without-block.pug","end":{"line":4,"column":1}}}
+{"type":"block","loc":{"start":{"line":4,"column":1},"filename":"/cases/layout.append.without-block.pug","end":{"line":4,"column":12}},"val":"head","mode":"append"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/layout.append.without-block.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/layout.append.without-block.pug","end":{"line":5,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":9},"filename":"/cases/layout.append.without-block.pug","end":{"line":5,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":10},"filename":"/cases/layout.append.without-block.pug","end":{"line":5,"column":22}},"name":"src","mustEscape":true,"val":"'foo.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":22},"filename":"/cases/layout.append.without-block.pug","end":{"line":5,"column":23}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/layout.append.without-block.pug","end":{"line":6,"column":3}}}
+{"type":"tag","loc":{"start":{"line":6,"column":3},"filename":"/cases/layout.append.without-block.pug","end":{"line":6,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":9},"filename":"/cases/layout.append.without-block.pug","end":{"line":6,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":10},"filename":"/cases/layout.append.without-block.pug","end":{"line":6,"column":22}},"name":"src","mustEscape":true,"val":"'bar.js'"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":22},"filename":"/cases/layout.append.without-block.pug","end":{"line":6,"column":23}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/layout.append.without-block.pug","end":{"line":7,"column":1}}}
+{"type":"eos","loc":{"start":{"line":7,"column":1},"filename":"/cases/layout.append.without-block.pug","end":{"line":7,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/layout.multi.append.prepend.block.tokens.json b/packages/pug-parser/test/cases/layout.multi.append.prepend.block.tokens.json
index 9c9f9c9c9..b26acb825 100644
--- a/packages/pug-parser/test/cases/layout.multi.append.prepend.block.tokens.json
+++ b/packages/pug-parser/test/cases/layout.multi.append.prepend.block.tokens.json
@@ -1,46 +1,46 @@
-{"type":"extends","line":1,"col":1}
-{"type":"path","line":1,"col":9,"val":"../fixtures/multi-append-prepend-block/redefine.pug"}
-{"type":"newline","line":3,"col":1}
-{"type":"block","line":3,"col":1,"val":"content","mode":"append"}
-{"type":"indent","line":4,"col":1,"val":1}
-{"type":"tag","line":4,"col":2,"val":"p"}
-{"type":"class","line":4,"col":3,"val":"first"}
-{"type":"class","line":4,"col":9,"val":"append"}
-{"type":"text","line":4,"col":17,"val":"Something appended to content"}
-{"type":"outdent","line":6,"col":1}
-{"type":"block","line":6,"col":1,"val":"content","mode":"prepend"}
-{"type":"indent","line":7,"col":1,"val":1}
-{"type":"tag","line":7,"col":2,"val":"p"}
-{"type":"class","line":7,"col":3,"val":"first"}
-{"type":"class","line":7,"col":9,"val":"prepend"}
-{"type":"text","line":7,"col":18,"val":"Something prepended to content"}
-{"type":"outdent","line":9,"col":1}
-{"type":"block","line":9,"col":1,"val":"content","mode":"append"}
-{"type":"indent","line":10,"col":1,"val":1}
-{"type":"tag","line":10,"col":2,"val":"p"}
-{"type":"class","line":10,"col":3,"val":"last"}
-{"type":"class","line":10,"col":8,"val":"append"}
-{"type":"text","line":10,"col":16,"val":"Last append must be most last"}
-{"type":"outdent","line":12,"col":1}
-{"type":"block","line":12,"col":1,"val":"content","mode":"prepend"}
-{"type":"indent","line":13,"col":1,"val":1}
-{"type":"tag","line":13,"col":2,"val":"p"}
-{"type":"class","line":13,"col":3,"val":"last"}
-{"type":"class","line":13,"col":8,"val":"prepend"}
-{"type":"text","line":13,"col":17,"val":"Last prepend must appear at top"}
-{"type":"outdent","line":15,"col":1}
-{"type":"block","line":15,"col":1,"val":"head","mode":"append"}
-{"type":"indent","line":16,"col":1,"val":1}
-{"type":"tag","line":16,"col":2,"val":"script"}
-{"type":"start-attributes","line":16,"col":8}
-{"type":"attribute","line":16,"col":9,"name":"src","val":"'jquery.js'","mustEscape":true}
-{"type":"end-attributes","line":16,"col":24}
-{"type":"outdent","line":18,"col":1}
-{"type":"block","line":18,"col":1,"val":"head","mode":"prepend"}
-{"type":"indent","line":19,"col":1,"val":1}
-{"type":"tag","line":19,"col":2,"val":"script"}
-{"type":"start-attributes","line":19,"col":8}
-{"type":"attribute","line":19,"col":9,"name":"src","val":"'foo.js'","mustEscape":true}
-{"type":"end-attributes","line":19,"col":21}
-{"type":"outdent","line":20,"col":1}
-{"type":"eos","line":20,"col":1}
\ No newline at end of file
+{"type":"extends","loc":{"start":{"line":1,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":1,"column":8}}}
+{"type":"path","loc":{"start":{"line":1,"column":9},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":1,"column":60}},"val":"../fixtures/multi-append-prepend-block/redefine.pug"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":3,"column":1}}}
+{"type":"block","loc":{"start":{"line":3,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":3,"column":15}},"val":"content","mode":"append"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":4,"column":2}},"val":1}
+{"type":"tag","loc":{"start":{"line":4,"column":2},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":4,"column":3}},"val":"p"}
+{"type":"class","loc":{"start":{"line":4,"column":3},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":4,"column":9}},"val":"first"}
+{"type":"class","loc":{"start":{"line":4,"column":9},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":4,"column":16}},"val":"append"}
+{"type":"text","loc":{"start":{"line":4,"column":17},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":4,"column":46}},"val":"Something appended to content"}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":6,"column":1}}}
+{"type":"block","loc":{"start":{"line":6,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":6,"column":16}},"val":"content","mode":"prepend"}
+{"type":"indent","loc":{"start":{"line":7,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":7,"column":2}},"val":1}
+{"type":"tag","loc":{"start":{"line":7,"column":2},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":7,"column":3}},"val":"p"}
+{"type":"class","loc":{"start":{"line":7,"column":3},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":7,"column":9}},"val":"first"}
+{"type":"class","loc":{"start":{"line":7,"column":9},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":7,"column":17}},"val":"prepend"}
+{"type":"text","loc":{"start":{"line":7,"column":18},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":7,"column":48}},"val":"Something prepended to content"}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":9,"column":1}}}
+{"type":"block","loc":{"start":{"line":9,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":9,"column":15}},"val":"content","mode":"append"}
+{"type":"indent","loc":{"start":{"line":10,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":10,"column":2}},"val":1}
+{"type":"tag","loc":{"start":{"line":10,"column":2},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":10,"column":3}},"val":"p"}
+{"type":"class","loc":{"start":{"line":10,"column":3},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":10,"column":8}},"val":"last"}
+{"type":"class","loc":{"start":{"line":10,"column":8},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":10,"column":15}},"val":"append"}
+{"type":"text","loc":{"start":{"line":10,"column":16},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":10,"column":45}},"val":"Last append must be most last"}
+{"type":"outdent","loc":{"start":{"line":12,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":12,"column":1}}}
+{"type":"block","loc":{"start":{"line":12,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":12,"column":16}},"val":"content","mode":"prepend"}
+{"type":"indent","loc":{"start":{"line":13,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":13,"column":2}},"val":1}
+{"type":"tag","loc":{"start":{"line":13,"column":2},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":13,"column":3}},"val":"p"}
+{"type":"class","loc":{"start":{"line":13,"column":3},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":13,"column":8}},"val":"last"}
+{"type":"class","loc":{"start":{"line":13,"column":8},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":13,"column":16}},"val":"prepend"}
+{"type":"text","loc":{"start":{"line":13,"column":17},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":13,"column":48}},"val":"Last prepend must appear at top"}
+{"type":"outdent","loc":{"start":{"line":15,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":15,"column":1}}}
+{"type":"block","loc":{"start":{"line":15,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":15,"column":12}},"val":"head","mode":"append"}
+{"type":"indent","loc":{"start":{"line":16,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":16,"column":2}},"val":1}
+{"type":"tag","loc":{"start":{"line":16,"column":2},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":16,"column":8}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":16,"column":8},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":16,"column":9}}}
+{"type":"attribute","loc":{"start":{"line":16,"column":9},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":16,"column":24}},"name":"src","mustEscape":true,"val":"'jquery.js'"}
+{"type":"end-attributes","loc":{"start":{"line":16,"column":24},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":16,"column":25}}}
+{"type":"outdent","loc":{"start":{"line":18,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":18,"column":1}}}
+{"type":"block","loc":{"start":{"line":18,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":18,"column":13}},"val":"head","mode":"prepend"}
+{"type":"indent","loc":{"start":{"line":19,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":19,"column":2}},"val":1}
+{"type":"tag","loc":{"start":{"line":19,"column":2},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":19,"column":8}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":19,"column":8},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":19,"column":9}}}
+{"type":"attribute","loc":{"start":{"line":19,"column":9},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":19,"column":21}},"name":"src","mustEscape":true,"val":"'foo.js'"}
+{"type":"end-attributes","loc":{"start":{"line":19,"column":21},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":19,"column":22}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":20,"column":1}}}
+{"type":"eos","loc":{"start":{"line":20,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":20,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/layout.prepend.tokens.json b/packages/pug-parser/test/cases/layout.prepend.tokens.json
index 49d28746d..5651cfe66 100644
--- a/packages/pug-parser/test/cases/layout.prepend.tokens.json
+++ b/packages/pug-parser/test/cases/layout.prepend.tokens.json
@@ -1,17 +1,17 @@
-{"type":"newline","line":2,"col":1}
-{"type":"extends","line":2,"col":1}
-{"type":"path","line":2,"col":9,"val":"../fixtures/prepend/app-layout.pug"}
-{"type":"newline","line":4,"col":1}
-{"type":"block","line":4,"col":1,"val":"head","mode":"prepend"}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"tag","line":5,"col":3,"val":"script"}
-{"type":"start-attributes","line":5,"col":9}
-{"type":"attribute","line":5,"col":10,"name":"src","val":"'foo.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":22}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":3,"val":"script"}
-{"type":"start-attributes","line":6,"col":9}
-{"type":"attribute","line":6,"col":10,"name":"src","val":"'bar.js'","mustEscape":true}
-{"type":"end-attributes","line":6,"col":22}
-{"type":"outdent","line":7,"col":1}
-{"type":"eos","line":7,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/layout.prepend.pug","end":{"line":2,"column":1}}}
+{"type":"extends","loc":{"start":{"line":2,"column":1},"filename":"/cases/layout.prepend.pug","end":{"line":2,"column":8}}}
+{"type":"path","loc":{"start":{"line":2,"column":9},"filename":"/cases/layout.prepend.pug","end":{"line":2,"column":43}},"val":"../fixtures/prepend/app-layout.pug"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/layout.prepend.pug","end":{"line":4,"column":1}}}
+{"type":"block","loc":{"start":{"line":4,"column":1},"filename":"/cases/layout.prepend.pug","end":{"line":4,"column":19}},"val":"head","mode":"prepend"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/layout.prepend.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/layout.prepend.pug","end":{"line":5,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":9},"filename":"/cases/layout.prepend.pug","end":{"line":5,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":10},"filename":"/cases/layout.prepend.pug","end":{"line":5,"column":22}},"name":"src","mustEscape":true,"val":"'foo.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":22},"filename":"/cases/layout.prepend.pug","end":{"line":5,"column":23}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/layout.prepend.pug","end":{"line":6,"column":3}}}
+{"type":"tag","loc":{"start":{"line":6,"column":3},"filename":"/cases/layout.prepend.pug","end":{"line":6,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":9},"filename":"/cases/layout.prepend.pug","end":{"line":6,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":10},"filename":"/cases/layout.prepend.pug","end":{"line":6,"column":22}},"name":"src","mustEscape":true,"val":"'bar.js'"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":22},"filename":"/cases/layout.prepend.pug","end":{"line":6,"column":23}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/layout.prepend.pug","end":{"line":7,"column":1}}}
+{"type":"eos","loc":{"start":{"line":7,"column":1},"filename":"/cases/layout.prepend.pug","end":{"line":7,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/layout.prepend.without-block.tokens.json b/packages/pug-parser/test/cases/layout.prepend.without-block.tokens.json
index 459cb0604..8f2bbd62e 100644
--- a/packages/pug-parser/test/cases/layout.prepend.without-block.tokens.json
+++ b/packages/pug-parser/test/cases/layout.prepend.without-block.tokens.json
@@ -1,17 +1,17 @@
-{"type":"newline","line":2,"col":1}
-{"type":"extends","line":2,"col":1}
-{"type":"path","line":2,"col":9,"val":"../fixtures/prepend-without-block/app-layout.pug"}
-{"type":"newline","line":4,"col":1}
-{"type":"block","line":4,"col":1,"val":"head","mode":"prepend"}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"tag","line":5,"col":3,"val":"script"}
-{"type":"start-attributes","line":5,"col":9}
-{"type":"attribute","line":5,"col":10,"name":"src","val":"'foo.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":22}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":3,"val":"script"}
-{"type":"start-attributes","line":6,"col":9}
-{"type":"attribute","line":6,"col":10,"name":"src","val":"'bar.js'","mustEscape":true}
-{"type":"end-attributes","line":6,"col":22}
-{"type":"outdent","line":7,"col":1}
-{"type":"eos","line":7,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":2,"column":1}}}
+{"type":"extends","loc":{"start":{"line":2,"column":1},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":2,"column":8}}}
+{"type":"path","loc":{"start":{"line":2,"column":9},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":2,"column":57}},"val":"../fixtures/prepend-without-block/app-layout.pug"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":4,"column":1}}}
+{"type":"block","loc":{"start":{"line":4,"column":1},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":4,"column":13}},"val":"head","mode":"prepend"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":5,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":9},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":5,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":10},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":5,"column":22}},"name":"src","mustEscape":true,"val":"'foo.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":22},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":5,"column":23}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":6,"column":3}}}
+{"type":"tag","loc":{"start":{"line":6,"column":3},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":6,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":9},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":6,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":10},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":6,"column":22}},"name":"src","mustEscape":true,"val":"'bar.js'"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":22},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":6,"column":23}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":7,"column":1}}}
+{"type":"eos","loc":{"start":{"line":7,"column":1},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":7,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/mixin-at-end-of-file.tokens.json b/packages/pug-parser/test/cases/mixin-at-end-of-file.tokens.json
index 85fead42b..bbbc36733 100644
--- a/packages/pug-parser/test/cases/mixin-at-end-of-file.tokens.json
+++ b/packages/pug-parser/test/cases/mixin-at-end-of-file.tokens.json
@@ -1,9 +1,9 @@
-{"type":"include","line":1,"col":1}
-{"type":"path","line":1,"col":9,"val":"./auxiliary/mixin-at-end-of-file.pug"}
-{"type":"newline","line":3,"col":1}
-{"type":"call","line":3,"col":1,"val":"slide","args":""}
-{"type":"indent","line":4,"col":1,"val":2}
-{"type":"tag","line":4,"col":3,"val":"p"}
-{"type":"text","line":4,"col":5,"val":"some awesome content"}
-{"type":"outdent","line":5,"col":1}
-{"type":"eos","line":5,"col":1}
\ No newline at end of file
+{"type":"include","loc":{"start":{"line":1,"column":1},"filename":"/cases/mixin-at-end-of-file.pug","end":{"line":1,"column":8}}}
+{"type":"path","loc":{"start":{"line":1,"column":9},"filename":"/cases/mixin-at-end-of-file.pug","end":{"line":1,"column":45}},"val":"./auxiliary/mixin-at-end-of-file.pug"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin-at-end-of-file.pug","end":{"line":3,"column":1}}}
+{"type":"call","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin-at-end-of-file.pug","end":{"line":3,"column":9}},"val":"slide","args":""}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/mixin-at-end-of-file.pug","end":{"line":4,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/mixin-at-end-of-file.pug","end":{"line":4,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":4,"column":5},"filename":"/cases/mixin-at-end-of-file.pug","end":{"line":4,"column":25}},"val":"some awesome content"}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin-at-end-of-file.pug","end":{"line":5,"column":1}}}
+{"type":"eos","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin-at-end-of-file.pug","end":{"line":5,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/mixin-block-with-space.tokens.json b/packages/pug-parser/test/cases/mixin-block-with-space.tokens.json
index 650178dc1..9a882c980 100644
--- a/packages/pug-parser/test/cases/mixin-block-with-space.tokens.json
+++ b/packages/pug-parser/test/cases/mixin-block-with-space.tokens.json
@@ -1,12 +1,12 @@
-{"type":"mixin","line":1,"col":1,"val":"m","args":"id"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"div"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"mixin-block","line":3,"col":5}
-{"type":"outdent","line":5,"col":3}
-{"type":"outdent","line":5,"col":1}
-{"type":"call","line":5,"col":1,"val":"m","args":""}
-{"type":"indent","line":6,"col":1,"val":2}
-{"type":"text","line":6,"col":5,"val":"This text should appear"}
-{"type":"outdent","line":6,"col":28}
-{"type":"eos","line":6,"col":28}
\ No newline at end of file
+{"type":"mixin","loc":{"start":{"line":1,"column":1},"filename":"/cases/mixin-block-with-space.pug","end":{"line":1,"column":12}},"val":"m","args":"id"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/mixin-block-with-space.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/mixin-block-with-space.pug","end":{"line":2,"column":6}},"val":"div"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin-block-with-space.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"mixin-block","loc":{"start":{"line":3,"column":5},"filename":"/cases/mixin-block-with-space.pug","end":{"line":3,"column":10}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin-block-with-space.pug","end":{"line":5,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin-block-with-space.pug","end":{"line":5,"column":1}}}
+{"type":"call","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin-block-with-space.pug","end":{"line":5,"column":5}},"val":"m","args":""}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/mixin-block-with-space.pug","end":{"line":6,"column":3}},"val":2}
+{"type":"text","loc":{"start":{"line":6,"column":5},"filename":"/cases/mixin-block-with-space.pug","end":{"line":6,"column":28}},"val":"This text should appear"}
+{"type":"outdent","loc":{"start":{"line":6,"column":28},"filename":"/cases/mixin-block-with-space.pug","end":{"line":6,"column":28}}}
+{"type":"eos","loc":{"start":{"line":6,"column":28},"filename":"/cases/mixin-block-with-space.pug","end":{"line":6,"column":28}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/mixin-hoist.tokens.json b/packages/pug-parser/test/cases/mixin-hoist.tokens.json
index 692e9504a..927dcca69 100644
--- a/packages/pug-parser/test/cases/mixin-hoist.tokens.json
+++ b/packages/pug-parser/test/cases/mixin-hoist.tokens.json
@@ -1,14 +1,14 @@
-{"type":"newline","line":2,"col":1}
-{"type":"mixin","line":2,"col":1,"val":"foo","args":null}
-{"type":"indent","line":3,"col":1,"val":2}
-{"type":"tag","line":3,"col":3,"val":"h1"}
-{"type":"code","line":3,"col":5,"val":"title","mustEscape":true,"buffer":true}
-{"type":"outdent","line":5,"col":1}
-{"type":"tag","line":5,"col":1,"val":"html"}
-{"type":"indent","line":6,"col":1,"val":2}
-{"type":"tag","line":6,"col":3,"val":"body"}
-{"type":"indent","line":7,"col":1,"val":4}
-{"type":"call","line":7,"col":5,"val":"foo","args":null}
-{"type":"outdent","line":8,"col":3}
-{"type":"outdent","line":8,"col":1}
-{"type":"eos","line":8,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/mixin-hoist.pug","end":{"line":2,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":2,"column":1},"filename":"/cases/mixin-hoist.pug","end":{"line":2,"column":12}},"val":"foo","args":null}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin-hoist.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/mixin-hoist.pug","end":{"line":3,"column":5}},"val":"h1"}
+{"type":"code","loc":{"start":{"line":3,"column":5},"filename":"/cases/mixin-hoist.pug","end":{"line":3,"column":12}},"val":"title","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin-hoist.pug","end":{"line":5,"column":1}}}
+{"type":"tag","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin-hoist.pug","end":{"line":5,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/mixin-hoist.pug","end":{"line":6,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":6,"column":3},"filename":"/cases/mixin-hoist.pug","end":{"line":6,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixin-hoist.pug","end":{"line":7,"column":5}},"val":4}
+{"type":"call","loc":{"start":{"line":7,"column":5},"filename":"/cases/mixin-hoist.pug","end":{"line":7,"column":9}},"val":"foo","args":null}
+{"type":"outdent","loc":{"start":{"line":8,"column":1},"filename":"/cases/mixin-hoist.pug","end":{"line":8,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":8,"column":1},"filename":"/cases/mixin-hoist.pug","end":{"line":8,"column":1}}}
+{"type":"eos","loc":{"start":{"line":8,"column":1},"filename":"/cases/mixin-hoist.pug","end":{"line":8,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/mixin-via-include.tokens.json b/packages/pug-parser/test/cases/mixin-via-include.tokens.json
index b803fca29..95c3d4759 100644
--- a/packages/pug-parser/test/cases/mixin-via-include.tokens.json
+++ b/packages/pug-parser/test/cases/mixin-via-include.tokens.json
@@ -1,7 +1,7 @@
-{"type":"comment","line":1,"col":1,"val":" regression test for https://github.com/pugjs/pug/issues/1435","buffer":false}
-{"type":"newline","line":3,"col":1}
-{"type":"include","line":3,"col":1}
-{"type":"path","line":3,"col":9,"val":"../fixtures/mixin-include.pug"}
-{"type":"newline","line":5,"col":1}
-{"type":"call","line":5,"col":1,"val":"bang","args":null}
-{"type":"eos","line":5,"col":6}
\ No newline at end of file
+{"type":"comment","loc":{"start":{"line":1,"column":1},"filename":"/cases/mixin-via-include.pug","end":{"line":1,"column":65}},"val":" regression test for https://github.com/pugjs/pug/issues/1435","buffer":false}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin-via-include.pug","end":{"line":3,"column":1}}}
+{"type":"include","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin-via-include.pug","end":{"line":3,"column":8}}}
+{"type":"path","loc":{"start":{"line":3,"column":9},"filename":"/cases/mixin-via-include.pug","end":{"line":3,"column":38}},"val":"../fixtures/mixin-include.pug"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin-via-include.pug","end":{"line":5,"column":1}}}
+{"type":"call","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin-via-include.pug","end":{"line":5,"column":6}},"val":"bang","args":null}
+{"type":"eos","loc":{"start":{"line":5,"column":6},"filename":"/cases/mixin-via-include.pug","end":{"line":5,"column":6}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/mixin.attrs.tokens.json b/packages/pug-parser/test/cases/mixin.attrs.tokens.json
index 7ba476c61..a36079e67 100644
--- a/packages/pug-parser/test/cases/mixin.attrs.tokens.json
+++ b/packages/pug-parser/test/cases/mixin.attrs.tokens.json
@@ -1,161 +1,161 @@
-{"type":"mixin","line":1,"col":1,"val":"centered","args":"title"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"div"}
-{"type":"class","line":2,"col":6,"val":"centered"}
-{"type":"start-attributes","line":2,"col":15}
-{"type":"attribute","line":2,"col":16,"name":"id","val":"attributes.id","mustEscape":true}
-{"type":"end-attributes","line":2,"col":32}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"code","line":3,"col":5,"val":"if (title)","mustEscape":false,"buffer":false}
-{"type":"indent","line":4,"col":1,"val":6}
-{"type":"tag","line":4,"col":7,"val":"h1"}
-{"type":"start-attributes","line":4,"col":9}
-{"type":"attribute","line":4,"col":10,"name":"class","val":"attributes.class","mustEscape":true}
-{"type":"end-attributes","line":4,"col":32}
-{"type":"code","line":4,"col":33,"val":"title","mustEscape":true,"buffer":true}
-{"type":"outdent","line":5,"col":5}
-{"type":"mixin-block","line":5,"col":5}
-{"type":"newline","line":6,"col":1}
-{"type":"code","line":6,"col":5,"val":"if (attributes.href)","mustEscape":false,"buffer":false}
-{"type":"indent","line":7,"col":1,"val":6}
-{"type":"class","line":7,"col":7,"val":"footer"}
-{"type":"indent","line":8,"col":1,"val":8}
-{"type":"tag","line":8,"col":9,"val":"a"}
-{"type":"start-attributes","line":8,"col":10}
-{"type":"attribute","line":8,"col":11,"name":"href","val":"attributes.href","mustEscape":true}
-{"type":"end-attributes","line":8,"col":31}
-{"type":"text","line":8,"col":33,"val":"Back"}
-{"type":"outdent","line":10,"col":7}
-{"type":"outdent","line":10,"col":5}
-{"type":"outdent","line":10,"col":3}
-{"type":"outdent","line":10,"col":1}
-{"type":"mixin","line":10,"col":1,"val":"main","args":"title"}
-{"type":"indent","line":11,"col":1,"val":2}
-{"type":"tag","line":11,"col":3,"val":"div"}
-{"type":"class","line":11,"col":6,"val":"stretch"}
-{"type":"indent","line":12,"col":1,"val":4}
-{"type":"call","line":12,"col":5,"val":"centered","args":"title"}
-{"type":"class","line":12,"col":21,"val":"highlight"}
-{"type":"&attributes","line":12,"col":31,"val":"attributes"}
-{"type":"indent","line":13,"col":1,"val":6}
-{"type":"mixin-block","line":13,"col":7}
-{"type":"outdent","line":15,"col":5}
-{"type":"outdent","line":15,"col":3}
-{"type":"outdent","line":15,"col":1}
-{"type":"mixin","line":15,"col":1,"val":"bottom","args":null}
-{"type":"indent","line":16,"col":1,"val":2}
-{"type":"tag","line":16,"col":3,"val":"div"}
-{"type":"class","line":16,"col":6,"val":"bottom"}
-{"type":"&attributes","line":16,"col":13,"val":"attributes"}
-{"type":"indent","line":17,"col":1,"val":4}
-{"type":"mixin-block","line":17,"col":5}
-{"type":"outdent","line":19,"col":3}
-{"type":"outdent","line":19,"col":1}
-{"type":"tag","line":19,"col":1,"val":"body"}
-{"type":"indent","line":20,"col":1,"val":2}
-{"type":"call","line":20,"col":3,"val":"centered","args":null}
-{"type":"id","line":20,"col":12,"val":"First"}
-{"type":"text","line":20,"col":19,"val":"Hello World"}
-{"type":"newline","line":21,"col":1}
-{"type":"call","line":21,"col":3,"val":"centered","args":"'Section 1'"}
-{"type":"id","line":21,"col":25,"val":"Second"}
-{"type":"indent","line":22,"col":1,"val":4}
-{"type":"tag","line":22,"col":5,"val":"p"}
-{"type":"text","line":22,"col":7,"val":"Some important content."}
-{"type":"outdent","line":23,"col":3}
-{"type":"call","line":23,"col":3,"val":"centered","args":"'Section 2'"}
-{"type":"id","line":23,"col":25,"val":"Third"}
-{"type":"class","line":23,"col":31,"val":"foo"}
-{"type":"start-attributes","line":23,"col":35}
-{"type":"attribute","line":23,"col":36,"name":"href","val":"'menu.html'","mustEscape":true}
-{"type":"attribute","line":23,"col":54,"name":"class","val":"'bar'","mustEscape":true}
-{"type":"end-attributes","line":23,"col":65}
-{"type":"indent","line":24,"col":1,"val":4}
-{"type":"tag","line":24,"col":5,"val":"p"}
-{"type":"text","line":24,"col":7,"val":"Even more important content."}
-{"type":"outdent","line":25,"col":3}
-{"type":"call","line":25,"col":3,"val":"main","args":"'Section 3'"}
-{"type":"start-attributes","line":25,"col":21}
-{"type":"attribute","line":25,"col":22,"name":"href","val":"'#'","mustEscape":true}
-{"type":"end-attributes","line":25,"col":30}
-{"type":"indent","line":26,"col":1,"val":4}
-{"type":"tag","line":26,"col":5,"val":"p"}
-{"type":"text","line":26,"col":7,"val":"Last content."}
-{"type":"outdent","line":27,"col":3}
-{"type":"call","line":27,"col":3,"val":"bottom","args":null}
-{"type":"class","line":27,"col":10,"val":"foo"}
-{"type":"start-attributes","line":27,"col":14}
-{"type":"attribute","line":27,"col":15,"name":"class","val":"'bar'","mustEscape":true}
-{"type":"attribute","line":27,"col":28,"name":"name","val":"'end'","mustEscape":true}
-{"type":"attribute","line":27,"col":40,"name":"id","val":"'Last'","mustEscape":true}
-{"type":"attribute","line":27,"col":51,"name":"data-attr","val":"'baz'","mustEscape":true}
-{"type":"end-attributes","line":27,"col":66}
-{"type":"indent","line":28,"col":1,"val":4}
-{"type":"tag","line":28,"col":5,"val":"p"}
-{"type":"text","line":28,"col":7,"val":"Some final words."}
-{"type":"outdent","line":29,"col":3}
-{"type":"call","line":29,"col":3,"val":"bottom","args":null}
-{"type":"start-attributes","line":29,"col":10}
-{"type":"attribute","line":29,"col":11,"name":"class","val":"['class1', 'class2']","mustEscape":true}
-{"type":"end-attributes","line":29,"col":37}
-{"type":"outdent","line":31,"col":1}
-{"type":"mixin","line":31,"col":1,"val":"foo","args":null}
-{"type":"indent","line":32,"col":1,"val":2}
-{"type":"tag","line":32,"col":3,"val":"div"}
-{"type":"class","line":32,"col":6,"val":"thing"}
-{"type":"start-attributes","line":32,"col":12}
-{"type":"attribute","line":32,"col":13,"name":"attr1","val":"'foo'","mustEscape":true}
-{"type":"attribute","line":32,"col":26,"name":"attr2","val":"'bar'","mustEscape":true}
-{"type":"end-attributes","line":32,"col":37}
-{"type":"&attributes","line":32,"col":38,"val":"attributes"}
-{"type":"outdent","line":34,"col":1}
-{"type":"code","line":34,"col":1,"val":"var val = '<biz>'","mustEscape":false,"buffer":false}
-{"type":"newline","line":35,"col":1}
-{"type":"code","line":35,"col":1,"val":"var classes = ['foo', 'bar']","mustEscape":false,"buffer":false}
-{"type":"newline","line":36,"col":1}
-{"type":"call","line":36,"col":1,"val":"foo","args":null}
-{"type":"start-attributes","line":36,"col":5}
-{"type":"attribute","line":36,"col":6,"name":"attr3","val":"'baz'","mustEscape":true}
-{"type":"attribute","line":36,"col":18,"name":"data-foo","val":"val","mustEscape":true}
-{"type":"attribute","line":36,"col":31,"name":"data-bar","val":"val","mustEscape":false}
-{"type":"attribute","line":36,"col":45,"name":"class","val":"classes","mustEscape":true}
-{"type":"end-attributes","line":36,"col":58}
-{"type":"class","line":36,"col":59,"val":"thunk"}
-{"type":"newline","line":38,"col":1}
-{"type":"comment","line":38,"col":1,"val":" Regression test for #1424","buffer":false}
-{"type":"newline","line":39,"col":1}
-{"type":"mixin","line":39,"col":1,"val":"work_filmstrip_item","args":"work"}
-{"type":"indent","line":40,"col":1,"val":2}
-{"type":"tag","line":40,"col":3,"val":"div"}
-{"type":"&attributes","line":40,"col":6,"val":"attributes"}
-{"type":"code","line":40,"col":29,"val":"work","mustEscape":true,"buffer":true}
-{"type":"outdent","line":41,"col":1}
-{"type":"call","line":41,"col":1,"val":"work_filmstrip_item","args":"'work'"}
-{"type":"start-attributes","line":41,"col":29}
-{"type":"attribute","line":41,"col":31,"name":"data-profile","val":"'profile'","mustEscape":true}
-{"type":"attribute","line":41,"col":56,"name":"data-creator-name","val":"'name'","mustEscape":true}
-{"type":"end-attributes","line":41,"col":82}
-{"type":"newline","line":43,"col":1}
-{"type":"mixin","line":43,"col":1,"val":"my-mixin","args":"arg1, arg2, arg3, arg4"}
-{"type":"indent","line":44,"col":1,"val":2}
-{"type":"tag","line":44,"col":3,"val":"p"}
-{"type":"code","line":44,"col":4,"val":"arg1","mustEscape":true,"buffer":true}
-{"type":"newline","line":45,"col":1}
-{"type":"tag","line":45,"col":3,"val":"p"}
-{"type":"code","line":45,"col":4,"val":"arg2","mustEscape":true,"buffer":true}
-{"type":"newline","line":46,"col":1}
-{"type":"tag","line":46,"col":3,"val":"p"}
-{"type":"code","line":46,"col":4,"val":"arg3","mustEscape":true,"buffer":true}
-{"type":"newline","line":47,"col":1}
-{"type":"tag","line":47,"col":3,"val":"p"}
-{"type":"code","line":47,"col":4,"val":"arg4","mustEscape":true,"buffer":true}
-{"type":"outdent","line":49,"col":1}
-{"type":"call","line":49,"col":1,"val":"foo","args":null}
-{"type":"start-attributes","line":49,"col":5}
-{"type":"attribute","line":50,"col":3,"name":"attr3","val":"\"qux\"","mustEscape":true}
-{"type":"attribute","line":51,"col":3,"name":"class","val":"\"baz\"","mustEscape":true}
-{"type":"end-attributes","line":52,"col":1}
-{"type":"newline","line":54,"col":1}
-{"type":"call","line":54,"col":1,"val":"my-mixin","args":"\n'1',\n      '2',\n  '3',\n      '4'\n"}
-{"type":"newline","line":60,"col":1}
-{"type":"eos","line":60,"col":1}
\ No newline at end of file
+{"type":"mixin","loc":{"start":{"line":1,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":1,"column":22}},"val":"centered","args":"title"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":2,"column":6}},"val":"div"}
+{"type":"class","loc":{"start":{"line":2,"column":6},"filename":"/cases/mixin.attrs.pug","end":{"line":2,"column":15}},"val":"centered"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":15},"filename":"/cases/mixin.attrs.pug","end":{"line":2,"column":16}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":16},"filename":"/cases/mixin.attrs.pug","end":{"line":2,"column":32}},"name":"id","mustEscape":true,"val":"attributes.id"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":32},"filename":"/cases/mixin.attrs.pug","end":{"line":2,"column":33}}}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"code","loc":{"start":{"line":3,"column":5},"filename":"/cases/mixin.attrs.pug","end":{"line":3,"column":17}},"val":"if (title)","mustEscape":false,"buffer":false}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":4,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":4,"column":7},"filename":"/cases/mixin.attrs.pug","end":{"line":4,"column":9}},"val":"h1"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":9},"filename":"/cases/mixin.attrs.pug","end":{"line":4,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":10},"filename":"/cases/mixin.attrs.pug","end":{"line":4,"column":32}},"name":"class","mustEscape":true,"val":"attributes.class"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":32},"filename":"/cases/mixin.attrs.pug","end":{"line":4,"column":33}}}
+{"type":"code","loc":{"start":{"line":4,"column":33},"filename":"/cases/mixin.attrs.pug","end":{"line":4,"column":40}},"val":"title","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":5,"column":5}}}
+{"type":"mixin-block","loc":{"start":{"line":5,"column":5},"filename":"/cases/mixin.attrs.pug","end":{"line":5,"column":10}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":6,"column":5}}}
+{"type":"code","loc":{"start":{"line":6,"column":5},"filename":"/cases/mixin.attrs.pug","end":{"line":6,"column":27}},"val":"if (attributes.href)","mustEscape":false,"buffer":false}
+{"type":"indent","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":7,"column":7}},"val":6}
+{"type":"class","loc":{"start":{"line":7,"column":7},"filename":"/cases/mixin.attrs.pug","end":{"line":7,"column":14}},"val":"footer"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":8,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":8,"column":9},"filename":"/cases/mixin.attrs.pug","end":{"line":8,"column":10}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":8,"column":10},"filename":"/cases/mixin.attrs.pug","end":{"line":8,"column":11}}}
+{"type":"attribute","loc":{"start":{"line":8,"column":11},"filename":"/cases/mixin.attrs.pug","end":{"line":8,"column":31}},"name":"href","mustEscape":true,"val":"attributes.href"}
+{"type":"end-attributes","loc":{"start":{"line":8,"column":31},"filename":"/cases/mixin.attrs.pug","end":{"line":8,"column":32}}}
+{"type":"text","loc":{"start":{"line":8,"column":33},"filename":"/cases/mixin.attrs.pug","end":{"line":8,"column":37}},"val":"Back"}
+{"type":"outdent","loc":{"start":{"line":10,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":10,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":10,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":10,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":10,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":10,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":10,"column":18}},"val":"main","args":"title"}
+{"type":"indent","loc":{"start":{"line":11,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":11,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":11,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":11,"column":6}},"val":"div"}
+{"type":"class","loc":{"start":{"line":11,"column":6},"filename":"/cases/mixin.attrs.pug","end":{"line":11,"column":14}},"val":"stretch"}
+{"type":"indent","loc":{"start":{"line":12,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":12,"column":5}},"val":4}
+{"type":"call","loc":{"start":{"line":12,"column":5},"filename":"/cases/mixin.attrs.pug","end":{"line":12,"column":21}},"val":"centered","args":"title"}
+{"type":"class","loc":{"start":{"line":12,"column":21},"filename":"/cases/mixin.attrs.pug","end":{"line":12,"column":31}},"val":"highlight"}
+{"type":"&attributes","loc":{"start":{"line":12,"column":31},"filename":"/cases/mixin.attrs.pug","end":{"line":12,"column":54}},"val":"attributes"}
+{"type":"indent","loc":{"start":{"line":13,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":13,"column":7}},"val":6}
+{"type":"mixin-block","loc":{"start":{"line":13,"column":7},"filename":"/cases/mixin.attrs.pug","end":{"line":13,"column":12}}}
+{"type":"outdent","loc":{"start":{"line":15,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":15,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":15,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":15,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":15,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":15,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":15,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":15,"column":13}},"val":"bottom","args":null}
+{"type":"indent","loc":{"start":{"line":16,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":16,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":16,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":16,"column":6}},"val":"div"}
+{"type":"class","loc":{"start":{"line":16,"column":6},"filename":"/cases/mixin.attrs.pug","end":{"line":16,"column":13}},"val":"bottom"}
+{"type":"&attributes","loc":{"start":{"line":16,"column":13},"filename":"/cases/mixin.attrs.pug","end":{"line":16,"column":36}},"val":"attributes"}
+{"type":"indent","loc":{"start":{"line":17,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":17,"column":5}},"val":4}
+{"type":"mixin-block","loc":{"start":{"line":17,"column":5},"filename":"/cases/mixin.attrs.pug","end":{"line":17,"column":10}}}
+{"type":"outdent","loc":{"start":{"line":19,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":19,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":19,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":19,"column":1}}}
+{"type":"tag","loc":{"start":{"line":19,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":19,"column":5}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":20,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":20,"column":3}},"val":2}
+{"type":"call","loc":{"start":{"line":20,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":20,"column":12}},"val":"centered","args":null}
+{"type":"id","loc":{"start":{"line":20,"column":12},"filename":"/cases/mixin.attrs.pug","end":{"line":20,"column":18}},"val":"First"}
+{"type":"text","loc":{"start":{"line":20,"column":19},"filename":"/cases/mixin.attrs.pug","end":{"line":20,"column":30}},"val":"Hello World"}
+{"type":"newline","loc":{"start":{"line":21,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":21,"column":3}}}
+{"type":"call","loc":{"start":{"line":21,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":21,"column":25}},"val":"centered","args":"'Section 1'"}
+{"type":"id","loc":{"start":{"line":21,"column":25},"filename":"/cases/mixin.attrs.pug","end":{"line":21,"column":32}},"val":"Second"}
+{"type":"indent","loc":{"start":{"line":22,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":22,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":22,"column":5},"filename":"/cases/mixin.attrs.pug","end":{"line":22,"column":6}},"val":"p"}
+{"type":"text","loc":{"start":{"line":22,"column":7},"filename":"/cases/mixin.attrs.pug","end":{"line":22,"column":30}},"val":"Some important content."}
+{"type":"outdent","loc":{"start":{"line":23,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":23,"column":3}}}
+{"type":"call","loc":{"start":{"line":23,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":23,"column":25}},"val":"centered","args":"'Section 2'"}
+{"type":"id","loc":{"start":{"line":23,"column":25},"filename":"/cases/mixin.attrs.pug","end":{"line":23,"column":31}},"val":"Third"}
+{"type":"class","loc":{"start":{"line":23,"column":31},"filename":"/cases/mixin.attrs.pug","end":{"line":23,"column":35}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":23,"column":35},"filename":"/cases/mixin.attrs.pug","end":{"line":23,"column":36}}}
+{"type":"attribute","loc":{"start":{"line":23,"column":36},"filename":"/cases/mixin.attrs.pug","end":{"line":23,"column":52}},"name":"href","mustEscape":true,"val":"'menu.html'"}
+{"type":"attribute","loc":{"start":{"line":23,"column":54},"filename":"/cases/mixin.attrs.pug","end":{"line":23,"column":65}},"name":"class","mustEscape":true,"val":"'bar'"}
+{"type":"end-attributes","loc":{"start":{"line":23,"column":65},"filename":"/cases/mixin.attrs.pug","end":{"line":23,"column":66}}}
+{"type":"indent","loc":{"start":{"line":24,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":24,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":24,"column":5},"filename":"/cases/mixin.attrs.pug","end":{"line":24,"column":6}},"val":"p"}
+{"type":"text","loc":{"start":{"line":24,"column":7},"filename":"/cases/mixin.attrs.pug","end":{"line":24,"column":35}},"val":"Even more important content."}
+{"type":"outdent","loc":{"start":{"line":25,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":25,"column":3}}}
+{"type":"call","loc":{"start":{"line":25,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":25,"column":21}},"val":"main","args":"'Section 3'"}
+{"type":"start-attributes","loc":{"start":{"line":25,"column":21},"filename":"/cases/mixin.attrs.pug","end":{"line":25,"column":22}}}
+{"type":"attribute","loc":{"start":{"line":25,"column":22},"filename":"/cases/mixin.attrs.pug","end":{"line":25,"column":30}},"name":"href","mustEscape":true,"val":"'#'"}
+{"type":"end-attributes","loc":{"start":{"line":25,"column":30},"filename":"/cases/mixin.attrs.pug","end":{"line":25,"column":31}}}
+{"type":"indent","loc":{"start":{"line":26,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":26,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":26,"column":5},"filename":"/cases/mixin.attrs.pug","end":{"line":26,"column":6}},"val":"p"}
+{"type":"text","loc":{"start":{"line":26,"column":7},"filename":"/cases/mixin.attrs.pug","end":{"line":26,"column":20}},"val":"Last content."}
+{"type":"outdent","loc":{"start":{"line":27,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":27,"column":3}}}
+{"type":"call","loc":{"start":{"line":27,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":27,"column":10}},"val":"bottom","args":null}
+{"type":"class","loc":{"start":{"line":27,"column":10},"filename":"/cases/mixin.attrs.pug","end":{"line":27,"column":14}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":27,"column":14},"filename":"/cases/mixin.attrs.pug","end":{"line":27,"column":15}}}
+{"type":"attribute","loc":{"start":{"line":27,"column":15},"filename":"/cases/mixin.attrs.pug","end":{"line":27,"column":26}},"name":"class","mustEscape":true,"val":"'bar'"}
+{"type":"attribute","loc":{"start":{"line":27,"column":28},"filename":"/cases/mixin.attrs.pug","end":{"line":27,"column":38}},"name":"name","mustEscape":true,"val":"'end'"}
+{"type":"attribute","loc":{"start":{"line":27,"column":40},"filename":"/cases/mixin.attrs.pug","end":{"line":27,"column":49}},"name":"id","mustEscape":true,"val":"'Last'"}
+{"type":"attribute","loc":{"start":{"line":27,"column":51},"filename":"/cases/mixin.attrs.pug","end":{"line":27,"column":66}},"name":"data-attr","mustEscape":true,"val":"'baz'"}
+{"type":"end-attributes","loc":{"start":{"line":27,"column":66},"filename":"/cases/mixin.attrs.pug","end":{"line":27,"column":67}}}
+{"type":"indent","loc":{"start":{"line":28,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":28,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":28,"column":5},"filename":"/cases/mixin.attrs.pug","end":{"line":28,"column":6}},"val":"p"}
+{"type":"text","loc":{"start":{"line":28,"column":7},"filename":"/cases/mixin.attrs.pug","end":{"line":28,"column":24}},"val":"Some final words."}
+{"type":"outdent","loc":{"start":{"line":29,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":29,"column":3}}}
+{"type":"call","loc":{"start":{"line":29,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":29,"column":10}},"val":"bottom","args":null}
+{"type":"start-attributes","loc":{"start":{"line":29,"column":10},"filename":"/cases/mixin.attrs.pug","end":{"line":29,"column":11}}}
+{"type":"attribute","loc":{"start":{"line":29,"column":11},"filename":"/cases/mixin.attrs.pug","end":{"line":29,"column":37}},"name":"class","mustEscape":true,"val":"['class1', 'class2']"}
+{"type":"end-attributes","loc":{"start":{"line":29,"column":37},"filename":"/cases/mixin.attrs.pug","end":{"line":29,"column":38}}}
+{"type":"outdent","loc":{"start":{"line":31,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":31,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":31,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":31,"column":10}},"val":"foo","args":null}
+{"type":"indent","loc":{"start":{"line":32,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":32,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":32,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":32,"column":6}},"val":"div"}
+{"type":"class","loc":{"start":{"line":32,"column":6},"filename":"/cases/mixin.attrs.pug","end":{"line":32,"column":12}},"val":"thing"}
+{"type":"start-attributes","loc":{"start":{"line":32,"column":12},"filename":"/cases/mixin.attrs.pug","end":{"line":32,"column":13}}}
+{"type":"attribute","loc":{"start":{"line":32,"column":13},"filename":"/cases/mixin.attrs.pug","end":{"line":32,"column":24}},"name":"attr1","mustEscape":true,"val":"'foo'"}
+{"type":"attribute","loc":{"start":{"line":32,"column":26},"filename":"/cases/mixin.attrs.pug","end":{"line":32,"column":37}},"name":"attr2","mustEscape":true,"val":"'bar'"}
+{"type":"end-attributes","loc":{"start":{"line":32,"column":37},"filename":"/cases/mixin.attrs.pug","end":{"line":32,"column":38}}}
+{"type":"&attributes","loc":{"start":{"line":32,"column":38},"filename":"/cases/mixin.attrs.pug","end":{"line":32,"column":61}},"val":"attributes"}
+{"type":"outdent","loc":{"start":{"line":34,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":34,"column":1}}}
+{"type":"code","loc":{"start":{"line":34,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":34,"column":20}},"val":"var val = '<biz>'","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":35,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":35,"column":1}}}
+{"type":"code","loc":{"start":{"line":35,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":35,"column":31}},"val":"var classes = ['foo', 'bar']","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":36,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":36,"column":1}}}
+{"type":"call","loc":{"start":{"line":36,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":36,"column":5}},"val":"foo","args":null}
+{"type":"start-attributes","loc":{"start":{"line":36,"column":5},"filename":"/cases/mixin.attrs.pug","end":{"line":36,"column":6}}}
+{"type":"attribute","loc":{"start":{"line":36,"column":6},"filename":"/cases/mixin.attrs.pug","end":{"line":36,"column":17}},"name":"attr3","mustEscape":true,"val":"'baz'"}
+{"type":"attribute","loc":{"start":{"line":36,"column":18},"filename":"/cases/mixin.attrs.pug","end":{"line":36,"column":30}},"name":"data-foo","mustEscape":true,"val":"val"}
+{"type":"attribute","loc":{"start":{"line":36,"column":31},"filename":"/cases/mixin.attrs.pug","end":{"line":36,"column":44}},"name":"data-bar","mustEscape":false,"val":"val"}
+{"type":"attribute","loc":{"start":{"line":36,"column":45},"filename":"/cases/mixin.attrs.pug","end":{"line":36,"column":58}},"name":"class","mustEscape":true,"val":"classes"}
+{"type":"end-attributes","loc":{"start":{"line":36,"column":58},"filename":"/cases/mixin.attrs.pug","end":{"line":36,"column":59}}}
+{"type":"class","loc":{"start":{"line":36,"column":59},"filename":"/cases/mixin.attrs.pug","end":{"line":36,"column":65}},"val":"thunk"}
+{"type":"newline","loc":{"start":{"line":38,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":38,"column":1}}}
+{"type":"comment","loc":{"start":{"line":38,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":38,"column":30}},"val":" Regression test for #1424","buffer":false}
+{"type":"newline","loc":{"start":{"line":39,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":39,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":39,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":39,"column":32}},"val":"work_filmstrip_item","args":"work"}
+{"type":"indent","loc":{"start":{"line":40,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":40,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":40,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":40,"column":6}},"val":"div"}
+{"type":"&attributes","loc":{"start":{"line":40,"column":6},"filename":"/cases/mixin.attrs.pug","end":{"line":40,"column":29}},"val":"attributes"}
+{"type":"code","loc":{"start":{"line":40,"column":29},"filename":"/cases/mixin.attrs.pug","end":{"line":40,"column":35}},"val":"work","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":41,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":41,"column":1}}}
+{"type":"call","loc":{"start":{"line":41,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":41,"column":29}},"val":"work_filmstrip_item","args":"'work'"}
+{"type":"start-attributes","loc":{"start":{"line":41,"column":29},"filename":"/cases/mixin.attrs.pug","end":{"line":41,"column":30}}}
+{"type":"attribute","loc":{"start":{"line":41,"column":30},"filename":"/cases/mixin.attrs.pug","end":{"line":41,"column":54}},"name":"data-profile","mustEscape":true,"val":"'profile'"}
+{"type":"attribute","loc":{"start":{"line":41,"column":56},"filename":"/cases/mixin.attrs.pug","end":{"line":41,"column":82}},"name":"data-creator-name","mustEscape":true,"val":"'name'"}
+{"type":"end-attributes","loc":{"start":{"line":41,"column":82},"filename":"/cases/mixin.attrs.pug","end":{"line":41,"column":83}}}
+{"type":"newline","loc":{"start":{"line":43,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":43,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":43,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":43,"column":39}},"val":"my-mixin","args":"arg1, arg2, arg3, arg4"}
+{"type":"indent","loc":{"start":{"line":44,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":44,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":44,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":44,"column":4}},"val":"p"}
+{"type":"code","loc":{"start":{"line":44,"column":4},"filename":"/cases/mixin.attrs.pug","end":{"line":44,"column":10}},"val":"arg1","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":45,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":45,"column":3}}}
+{"type":"tag","loc":{"start":{"line":45,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":45,"column":4}},"val":"p"}
+{"type":"code","loc":{"start":{"line":45,"column":4},"filename":"/cases/mixin.attrs.pug","end":{"line":45,"column":10}},"val":"arg2","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":46,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":46,"column":3}}}
+{"type":"tag","loc":{"start":{"line":46,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":46,"column":4}},"val":"p"}
+{"type":"code","loc":{"start":{"line":46,"column":4},"filename":"/cases/mixin.attrs.pug","end":{"line":46,"column":10}},"val":"arg3","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":47,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":47,"column":3}}}
+{"type":"tag","loc":{"start":{"line":47,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":47,"column":4}},"val":"p"}
+{"type":"code","loc":{"start":{"line":47,"column":4},"filename":"/cases/mixin.attrs.pug","end":{"line":47,"column":10}},"val":"arg4","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":49,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":49,"column":1}}}
+{"type":"call","loc":{"start":{"line":49,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":49,"column":5}},"val":"foo","args":null}
+{"type":"start-attributes","loc":{"start":{"line":49,"column":5},"filename":"/cases/mixin.attrs.pug","end":{"line":49,"column":6}}}
+{"type":"attribute","loc":{"start":{"line":50,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":50,"column":14}},"name":"attr3","mustEscape":true,"val":"\"qux\""}
+{"type":"attribute","loc":{"start":{"line":51,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":51,"column":14}},"name":"class","mustEscape":true,"val":"\"baz\""}
+{"type":"end-attributes","loc":{"start":{"line":52,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":52,"column":2}}}
+{"type":"newline","loc":{"start":{"line":54,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":54,"column":1}}}
+{"type":"call","loc":{"start":{"line":54,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":59,"column":2}},"val":"my-mixin","args":"\n'1',\n      '2',\n  '3',\n      '4'\n"}
+{"type":"newline","loc":{"start":{"line":60,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":60,"column":1}}}
+{"type":"eos","loc":{"start":{"line":60,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":60,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/mixin.block-tag-behaviour.tokens.json b/packages/pug-parser/test/cases/mixin.block-tag-behaviour.tokens.json
index 97fc55f13..a59e52ad7 100644
--- a/packages/pug-parser/test/cases/mixin.block-tag-behaviour.tokens.json
+++ b/packages/pug-parser/test/cases/mixin.block-tag-behaviour.tokens.json
@@ -1,56 +1,56 @@
-{"type":"newline","line":2,"col":1}
-{"type":"mixin","line":2,"col":1,"val":"article","args":"name"}
-{"type":"indent","line":3,"col":1,"val":2}
-{"type":"tag","line":3,"col":3,"val":"section"}
-{"type":"class","line":3,"col":10,"val":"article"}
-{"type":"indent","line":4,"col":1,"val":4}
-{"type":"tag","line":4,"col":5,"val":"h1"}
-{"type":"code","line":4,"col":7,"val":"name","mustEscape":true,"buffer":true}
-{"type":"newline","line":5,"col":1}
-{"type":"mixin-block","line":5,"col":5}
-{"type":"outdent","line":7,"col":3}
-{"type":"outdent","line":7,"col":1}
-{"type":"tag","line":7,"col":1,"val":"html"}
-{"type":"indent","line":8,"col":1,"val":2}
-{"type":"tag","line":8,"col":3,"val":"body"}
-{"type":"indent","line":9,"col":1,"val":4}
-{"type":"call","line":9,"col":5,"val":"article","args":"'Foo'"}
-{"type":":","line":9,"col":20}
-{"type":"tag","line":9,"col":22,"val":"p"}
-{"type":"text","line":9,"col":24,"val":"I'm article foo"}
-{"type":"outdent","line":11,"col":3}
-{"type":"outdent","line":11,"col":1}
-{"type":"mixin","line":11,"col":1,"val":"article","args":"name"}
-{"type":"indent","line":12,"col":1,"val":2}
-{"type":"tag","line":12,"col":3,"val":"section"}
-{"type":"class","line":12,"col":10,"val":"article"}
-{"type":"indent","line":13,"col":1,"val":4}
-{"type":"tag","line":13,"col":5,"val":"h1"}
-{"type":"code","line":13,"col":7,"val":"name","mustEscape":true,"buffer":true}
-{"type":"newline","line":14,"col":1}
-{"type":"tag","line":14,"col":5,"val":"p"}
-{"type":"indent","line":15,"col":1,"val":6}
-{"type":"mixin-block","line":15,"col":7}
-{"type":"outdent","line":17,"col":5}
-{"type":"outdent","line":17,"col":3}
-{"type":"outdent","line":17,"col":1}
-{"type":"tag","line":17,"col":1,"val":"html"}
-{"type":"indent","line":18,"col":1,"val":2}
-{"type":"tag","line":18,"col":3,"val":"body"}
-{"type":"indent","line":19,"col":1,"val":4}
-{"type":"call","line":19,"col":5,"val":"article","args":"'Something'"}
-{"type":"dot","line":19,"col":26}
-{"type":"start-pipeless-text","line":19,"col":27}
-{"type":"text","line":20,"col":7,"val":"I'm a much longer"}
-{"type":"newline","line":21,"col":1}
-{"type":"text","line":21,"col":7,"val":"text-only article,"}
-{"type":"newline","line":22,"col":1}
-{"type":"text","line":22,"col":7,"val":"but you can still"}
-{"type":"newline","line":23,"col":1}
-{"type":"text","line":23,"col":7,"val":"inline html tags"}
-{"type":"newline","line":24,"col":1}
-{"type":"text","line":24,"col":7,"val":"in me if you want."}
-{"type":"end-pipeless-text","line":24,"col":25}
-{"type":"outdent","line":24,"col":25}
-{"type":"outdent","line":24,"col":25}
-{"type":"eos","line":24,"col":25}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":2,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":2,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":2,"column":20}},"val":"article","args":"name"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":3,"column":10}},"val":"section"}
+{"type":"class","loc":{"start":{"line":3,"column":10},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":3,"column":18}},"val":"article"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":4,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":4,"column":5},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":4,"column":7}},"val":"h1"}
+{"type":"code","loc":{"start":{"line":4,"column":7},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":4,"column":13}},"val":"name","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":5,"column":5}}}
+{"type":"mixin-block","loc":{"start":{"line":5,"column":5},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":5,"column":10}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":7,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":7,"column":1}}}
+{"type":"tag","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":7,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":8,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":8,"column":3},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":8,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":9,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":9,"column":5}},"val":4}
+{"type":"call","loc":{"start":{"line":9,"column":5},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":9,"column":20}},"val":"article","args":"'Foo'"}
+{"type":":","loc":{"start":{"line":9,"column":20},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":9,"column":22}}}
+{"type":"tag","loc":{"start":{"line":9,"column":22},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":9,"column":23}},"val":"p"}
+{"type":"text","loc":{"start":{"line":9,"column":24},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":9,"column":39}},"val":"I'm article foo"}
+{"type":"outdent","loc":{"start":{"line":11,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":11,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":11,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":11,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":11,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":11,"column":20}},"val":"article","args":"name"}
+{"type":"indent","loc":{"start":{"line":12,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":12,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":12,"column":3},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":12,"column":10}},"val":"section"}
+{"type":"class","loc":{"start":{"line":12,"column":10},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":12,"column":18}},"val":"article"}
+{"type":"indent","loc":{"start":{"line":13,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":13,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":13,"column":5},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":13,"column":7}},"val":"h1"}
+{"type":"code","loc":{"start":{"line":13,"column":7},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":13,"column":13}},"val":"name","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":14,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":14,"column":5}}}
+{"type":"tag","loc":{"start":{"line":14,"column":5},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":14,"column":6}},"val":"p"}
+{"type":"indent","loc":{"start":{"line":15,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":15,"column":7}},"val":6}
+{"type":"mixin-block","loc":{"start":{"line":15,"column":7},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":15,"column":12}}}
+{"type":"outdent","loc":{"start":{"line":17,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":17,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":17,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":17,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":17,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":17,"column":1}}}
+{"type":"tag","loc":{"start":{"line":17,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":17,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":18,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":18,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":18,"column":3},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":18,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":19,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":19,"column":5}},"val":4}
+{"type":"call","loc":{"start":{"line":19,"column":5},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":19,"column":26}},"val":"article","args":"'Something'"}
+{"type":"dot","loc":{"start":{"line":19,"column":26},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":19,"column":27}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":19,"column":27},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":19,"column":27}}}
+{"type":"text","loc":{"start":{"line":20,"column":7},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":20,"column":24}},"val":"I'm a much longer"}
+{"type":"newline","loc":{"start":{"line":21,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":21,"column":7}}}
+{"type":"text","loc":{"start":{"line":21,"column":7},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":21,"column":25}},"val":"text-only article,"}
+{"type":"newline","loc":{"start":{"line":22,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":22,"column":7}}}
+{"type":"text","loc":{"start":{"line":22,"column":7},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":22,"column":24}},"val":"but you can still"}
+{"type":"newline","loc":{"start":{"line":23,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":23,"column":7}}}
+{"type":"text","loc":{"start":{"line":23,"column":7},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":23,"column":23}},"val":"inline html tags"}
+{"type":"newline","loc":{"start":{"line":24,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":24,"column":7}}}
+{"type":"text","loc":{"start":{"line":24,"column":7},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":24,"column":25}},"val":"in me if you want."}
+{"type":"end-pipeless-text","loc":{"start":{"line":24,"column":25},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":24,"column":25}}}
+{"type":"outdent","loc":{"start":{"line":24,"column":25},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":24,"column":25}}}
+{"type":"outdent","loc":{"start":{"line":24,"column":25},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":24,"column":25}}}
+{"type":"eos","loc":{"start":{"line":24,"column":25},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":24,"column":25}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/mixin.blocks.tokens.json b/packages/pug-parser/test/cases/mixin.blocks.tokens.json
index ddf60bcd7..7fc8a0cd3 100644
--- a/packages/pug-parser/test/cases/mixin.blocks.tokens.json
+++ b/packages/pug-parser/test/cases/mixin.blocks.tokens.json
@@ -1,108 +1,108 @@
-{"type":"newline","line":3,"col":1}
-{"type":"mixin","line":3,"col":1,"val":"form","args":"method, action"}
-{"type":"indent","line":4,"col":1,"val":2}
-{"type":"tag","line":4,"col":3,"val":"form"}
-{"type":"start-attributes","line":4,"col":7}
-{"type":"attribute","line":4,"col":8,"name":"method","val":"method","mustEscape":true}
-{"type":"attribute","line":4,"col":23,"name":"action","val":"action","mustEscape":true}
-{"type":"end-attributes","line":4,"col":36}
-{"type":"indent","line":5,"col":1,"val":4}
-{"type":"code","line":5,"col":5,"val":"var csrf_token_from_somewhere = 'hey'","mustEscape":false,"buffer":false}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":5,"val":"input"}
-{"type":"start-attributes","line":6,"col":10}
-{"type":"attribute","line":6,"col":11,"name":"type","val":"'hidden'","mustEscape":true}
-{"type":"attribute","line":6,"col":26,"name":"name","val":"'_csrf'","mustEscape":true}
-{"type":"attribute","line":6,"col":40,"name":"value","val":"csrf_token_from_somewhere","mustEscape":true}
-{"type":"end-attributes","line":6,"col":71}
-{"type":"newline","line":7,"col":1}
-{"type":"mixin-block","line":7,"col":5}
-{"type":"outdent","line":9,"col":3}
-{"type":"outdent","line":9,"col":1}
-{"type":"tag","line":9,"col":1,"val":"html"}
-{"type":"indent","line":10,"col":1,"val":2}
-{"type":"tag","line":10,"col":3,"val":"body"}
-{"type":"indent","line":11,"col":1,"val":4}
-{"type":"call","line":11,"col":5,"val":"form","args":"'GET', '/search'"}
-{"type":"indent","line":12,"col":1,"val":6}
-{"type":"tag","line":12,"col":7,"val":"input"}
-{"type":"start-attributes","line":12,"col":12}
-{"type":"attribute","line":12,"col":13,"name":"type","val":"'text'","mustEscape":true}
-{"type":"attribute","line":12,"col":26,"name":"name","val":"'query'","mustEscape":true}
-{"type":"attribute","line":12,"col":40,"name":"placeholder","val":"'Search'","mustEscape":true}
-{"type":"end-attributes","line":12,"col":60}
-{"type":"newline","line":13,"col":1}
-{"type":"tag","line":13,"col":7,"val":"input"}
-{"type":"start-attributes","line":13,"col":12}
-{"type":"attribute","line":13,"col":13,"name":"type","val":"'submit'","mustEscape":true}
-{"type":"attribute","line":13,"col":28,"name":"value","val":"'Search'","mustEscape":true}
-{"type":"end-attributes","line":13,"col":42}
-{"type":"outdent","line":15,"col":5}
-{"type":"outdent","line":15,"col":3}
-{"type":"outdent","line":15,"col":1}
-{"type":"tag","line":15,"col":1,"val":"html"}
-{"type":"indent","line":16,"col":1,"val":2}
-{"type":"tag","line":16,"col":3,"val":"body"}
-{"type":"indent","line":17,"col":1,"val":4}
-{"type":"call","line":17,"col":5,"val":"form","args":"'POST', '/search'"}
-{"type":"indent","line":18,"col":1,"val":6}
-{"type":"tag","line":18,"col":7,"val":"input"}
-{"type":"start-attributes","line":18,"col":12}
-{"type":"attribute","line":18,"col":13,"name":"type","val":"'text'","mustEscape":true}
-{"type":"attribute","line":18,"col":26,"name":"name","val":"'query'","mustEscape":true}
-{"type":"attribute","line":18,"col":40,"name":"placeholder","val":"'Search'","mustEscape":true}
-{"type":"end-attributes","line":18,"col":60}
-{"type":"newline","line":19,"col":1}
-{"type":"tag","line":19,"col":7,"val":"input"}
-{"type":"start-attributes","line":19,"col":12}
-{"type":"attribute","line":19,"col":13,"name":"type","val":"'submit'","mustEscape":true}
-{"type":"attribute","line":19,"col":28,"name":"value","val":"'Search'","mustEscape":true}
-{"type":"end-attributes","line":19,"col":42}
-{"type":"outdent","line":21,"col":5}
-{"type":"outdent","line":21,"col":3}
-{"type":"outdent","line":21,"col":1}
-{"type":"tag","line":21,"col":1,"val":"html"}
-{"type":"indent","line":22,"col":1,"val":2}
-{"type":"tag","line":22,"col":3,"val":"body"}
-{"type":"indent","line":23,"col":1,"val":4}
-{"type":"call","line":23,"col":5,"val":"form","args":"'POST', '/search'"}
-{"type":"outdent","line":25,"col":3}
-{"type":"outdent","line":25,"col":1}
-{"type":"mixin","line":25,"col":1,"val":"bar","args":null}
-{"type":"indent","line":26,"col":1,"val":2}
-{"type":"id","line":26,"col":3,"val":"bar"}
-{"type":"indent","line":27,"col":1,"val":4}
-{"type":"mixin-block","line":27,"col":5}
-{"type":"outdent","line":29,"col":3}
-{"type":"outdent","line":29,"col":1}
-{"type":"mixin","line":29,"col":1,"val":"foo","args":null}
-{"type":"indent","line":30,"col":1,"val":2}
-{"type":"id","line":30,"col":3,"val":"foo"}
-{"type":"indent","line":31,"col":1,"val":4}
-{"type":"call","line":31,"col":5,"val":"bar","args":null}
-{"type":"indent","line":32,"col":1,"val":6}
-{"type":"mixin-block","line":32,"col":7}
-{"type":"outdent","line":34,"col":5}
-{"type":"outdent","line":34,"col":3}
-{"type":"outdent","line":34,"col":1}
-{"type":"call","line":34,"col":1,"val":"foo","args":null}
-{"type":"indent","line":35,"col":1,"val":2}
-{"type":"tag","line":35,"col":3,"val":"p"}
-{"type":"text","line":35,"col":5,"val":"one"}
-{"type":"newline","line":36,"col":1}
-{"type":"tag","line":36,"col":3,"val":"p"}
-{"type":"text","line":36,"col":5,"val":"two"}
-{"type":"newline","line":37,"col":1}
-{"type":"tag","line":37,"col":3,"val":"p"}
-{"type":"text","line":37,"col":5,"val":"three"}
-{"type":"outdent","line":40,"col":1}
-{"type":"mixin","line":40,"col":1,"val":"baz","args":null}
-{"type":"indent","line":41,"col":1,"val":4}
-{"type":"id","line":41,"col":5,"val":"baz"}
-{"type":"indent","line":42,"col":1,"val":8}
-{"type":"mixin-block","line":42,"col":9}
-{"type":"outdent","line":44,"col":5}
-{"type":"outdent","line":44,"col":1}
-{"type":"call","line":44,"col":1,"val":"baz","args":""}
-{"type":"code","line":44,"col":7,"val":"'123'","mustEscape":true,"buffer":true}
-{"type":"eos","line":44,"col":14}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":3,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":3,"column":27}},"val":"form","args":"method, action"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":4,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/mixin.blocks.pug","end":{"line":4,"column":7}},"val":"form"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":7},"filename":"/cases/mixin.blocks.pug","end":{"line":4,"column":8}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":8},"filename":"/cases/mixin.blocks.pug","end":{"line":4,"column":21}},"name":"method","mustEscape":true,"val":"method"}
+{"type":"attribute","loc":{"start":{"line":4,"column":23},"filename":"/cases/mixin.blocks.pug","end":{"line":4,"column":36}},"name":"action","mustEscape":true,"val":"action"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":36},"filename":"/cases/mixin.blocks.pug","end":{"line":4,"column":37}}}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":5,"column":5}},"val":4}
+{"type":"code","loc":{"start":{"line":5,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":5,"column":44}},"val":"var csrf_token_from_somewhere = 'hey'","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":6,"column":5}}}
+{"type":"tag","loc":{"start":{"line":6,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":6,"column":10}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":10},"filename":"/cases/mixin.blocks.pug","end":{"line":6,"column":11}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":11},"filename":"/cases/mixin.blocks.pug","end":{"line":6,"column":24}},"name":"type","mustEscape":true,"val":"'hidden'"}
+{"type":"attribute","loc":{"start":{"line":6,"column":26},"filename":"/cases/mixin.blocks.pug","end":{"line":6,"column":38}},"name":"name","mustEscape":true,"val":"'_csrf'"}
+{"type":"attribute","loc":{"start":{"line":6,"column":40},"filename":"/cases/mixin.blocks.pug","end":{"line":6,"column":71}},"name":"value","mustEscape":true,"val":"csrf_token_from_somewhere"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":71},"filename":"/cases/mixin.blocks.pug","end":{"line":6,"column":72}}}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":7,"column":5}}}
+{"type":"mixin-block","loc":{"start":{"line":7,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":7,"column":10}}}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":9,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":9,"column":1}}}
+{"type":"tag","loc":{"start":{"line":9,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":9,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":10,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":10,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":10,"column":3},"filename":"/cases/mixin.blocks.pug","end":{"line":10,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":11,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":11,"column":5}},"val":4}
+{"type":"call","loc":{"start":{"line":11,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":11,"column":28}},"val":"form","args":"'GET', '/search'"}
+{"type":"indent","loc":{"start":{"line":12,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":12,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":12,"column":7},"filename":"/cases/mixin.blocks.pug","end":{"line":12,"column":12}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":12,"column":12},"filename":"/cases/mixin.blocks.pug","end":{"line":12,"column":13}}}
+{"type":"attribute","loc":{"start":{"line":12,"column":13},"filename":"/cases/mixin.blocks.pug","end":{"line":12,"column":24}},"name":"type","mustEscape":true,"val":"'text'"}
+{"type":"attribute","loc":{"start":{"line":12,"column":26},"filename":"/cases/mixin.blocks.pug","end":{"line":12,"column":38}},"name":"name","mustEscape":true,"val":"'query'"}
+{"type":"attribute","loc":{"start":{"line":12,"column":40},"filename":"/cases/mixin.blocks.pug","end":{"line":12,"column":60}},"name":"placeholder","mustEscape":true,"val":"'Search'"}
+{"type":"end-attributes","loc":{"start":{"line":12,"column":60},"filename":"/cases/mixin.blocks.pug","end":{"line":12,"column":61}}}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":13,"column":7}}}
+{"type":"tag","loc":{"start":{"line":13,"column":7},"filename":"/cases/mixin.blocks.pug","end":{"line":13,"column":12}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":13,"column":12},"filename":"/cases/mixin.blocks.pug","end":{"line":13,"column":13}}}
+{"type":"attribute","loc":{"start":{"line":13,"column":13},"filename":"/cases/mixin.blocks.pug","end":{"line":13,"column":26}},"name":"type","mustEscape":true,"val":"'submit'"}
+{"type":"attribute","loc":{"start":{"line":13,"column":28},"filename":"/cases/mixin.blocks.pug","end":{"line":13,"column":42}},"name":"value","mustEscape":true,"val":"'Search'"}
+{"type":"end-attributes","loc":{"start":{"line":13,"column":42},"filename":"/cases/mixin.blocks.pug","end":{"line":13,"column":43}}}
+{"type":"outdent","loc":{"start":{"line":15,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":15,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":15,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":15,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":15,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":15,"column":1}}}
+{"type":"tag","loc":{"start":{"line":15,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":15,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":16,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":16,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":16,"column":3},"filename":"/cases/mixin.blocks.pug","end":{"line":16,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":17,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":17,"column":5}},"val":4}
+{"type":"call","loc":{"start":{"line":17,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":17,"column":29}},"val":"form","args":"'POST', '/search'"}
+{"type":"indent","loc":{"start":{"line":18,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":18,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":18,"column":7},"filename":"/cases/mixin.blocks.pug","end":{"line":18,"column":12}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":18,"column":12},"filename":"/cases/mixin.blocks.pug","end":{"line":18,"column":13}}}
+{"type":"attribute","loc":{"start":{"line":18,"column":13},"filename":"/cases/mixin.blocks.pug","end":{"line":18,"column":24}},"name":"type","mustEscape":true,"val":"'text'"}
+{"type":"attribute","loc":{"start":{"line":18,"column":26},"filename":"/cases/mixin.blocks.pug","end":{"line":18,"column":38}},"name":"name","mustEscape":true,"val":"'query'"}
+{"type":"attribute","loc":{"start":{"line":18,"column":40},"filename":"/cases/mixin.blocks.pug","end":{"line":18,"column":60}},"name":"placeholder","mustEscape":true,"val":"'Search'"}
+{"type":"end-attributes","loc":{"start":{"line":18,"column":60},"filename":"/cases/mixin.blocks.pug","end":{"line":18,"column":61}}}
+{"type":"newline","loc":{"start":{"line":19,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":19,"column":7}}}
+{"type":"tag","loc":{"start":{"line":19,"column":7},"filename":"/cases/mixin.blocks.pug","end":{"line":19,"column":12}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":19,"column":12},"filename":"/cases/mixin.blocks.pug","end":{"line":19,"column":13}}}
+{"type":"attribute","loc":{"start":{"line":19,"column":13},"filename":"/cases/mixin.blocks.pug","end":{"line":19,"column":26}},"name":"type","mustEscape":true,"val":"'submit'"}
+{"type":"attribute","loc":{"start":{"line":19,"column":28},"filename":"/cases/mixin.blocks.pug","end":{"line":19,"column":42}},"name":"value","mustEscape":true,"val":"'Search'"}
+{"type":"end-attributes","loc":{"start":{"line":19,"column":42},"filename":"/cases/mixin.blocks.pug","end":{"line":19,"column":43}}}
+{"type":"outdent","loc":{"start":{"line":21,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":21,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":21,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":21,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":21,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":21,"column":1}}}
+{"type":"tag","loc":{"start":{"line":21,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":21,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":22,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":22,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":22,"column":3},"filename":"/cases/mixin.blocks.pug","end":{"line":22,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":23,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":23,"column":5}},"val":4}
+{"type":"call","loc":{"start":{"line":23,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":23,"column":29}},"val":"form","args":"'POST', '/search'"}
+{"type":"outdent","loc":{"start":{"line":25,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":25,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":25,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":25,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":25,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":25,"column":12}},"val":"bar","args":null}
+{"type":"indent","loc":{"start":{"line":26,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":26,"column":3}},"val":2}
+{"type":"id","loc":{"start":{"line":26,"column":3},"filename":"/cases/mixin.blocks.pug","end":{"line":26,"column":7}},"val":"bar"}
+{"type":"indent","loc":{"start":{"line":27,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":27,"column":5}},"val":4}
+{"type":"mixin-block","loc":{"start":{"line":27,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":27,"column":10}}}
+{"type":"outdent","loc":{"start":{"line":29,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":29,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":29,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":29,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":29,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":29,"column":12}},"val":"foo","args":null}
+{"type":"indent","loc":{"start":{"line":30,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":30,"column":3}},"val":2}
+{"type":"id","loc":{"start":{"line":30,"column":3},"filename":"/cases/mixin.blocks.pug","end":{"line":30,"column":7}},"val":"foo"}
+{"type":"indent","loc":{"start":{"line":31,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":31,"column":5}},"val":4}
+{"type":"call","loc":{"start":{"line":31,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":31,"column":9}},"val":"bar","args":null}
+{"type":"indent","loc":{"start":{"line":32,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":32,"column":7}},"val":6}
+{"type":"mixin-block","loc":{"start":{"line":32,"column":7},"filename":"/cases/mixin.blocks.pug","end":{"line":32,"column":12}}}
+{"type":"outdent","loc":{"start":{"line":34,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":34,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":34,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":34,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":34,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":34,"column":1}}}
+{"type":"call","loc":{"start":{"line":34,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":34,"column":5}},"val":"foo","args":null}
+{"type":"indent","loc":{"start":{"line":35,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":35,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":35,"column":3},"filename":"/cases/mixin.blocks.pug","end":{"line":35,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":35,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":35,"column":8}},"val":"one"}
+{"type":"newline","loc":{"start":{"line":36,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":36,"column":3}}}
+{"type":"tag","loc":{"start":{"line":36,"column":3},"filename":"/cases/mixin.blocks.pug","end":{"line":36,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":36,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":36,"column":8}},"val":"two"}
+{"type":"newline","loc":{"start":{"line":37,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":37,"column":3}}}
+{"type":"tag","loc":{"start":{"line":37,"column":3},"filename":"/cases/mixin.blocks.pug","end":{"line":37,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":37,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":37,"column":10}},"val":"three"}
+{"type":"outdent","loc":{"start":{"line":40,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":40,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":40,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":40,"column":10}},"val":"baz","args":null}
+{"type":"indent","loc":{"start":{"line":41,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":41,"column":5}},"val":4}
+{"type":"id","loc":{"start":{"line":41,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":41,"column":9}},"val":"baz"}
+{"type":"indent","loc":{"start":{"line":42,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":42,"column":9}},"val":8}
+{"type":"mixin-block","loc":{"start":{"line":42,"column":9},"filename":"/cases/mixin.blocks.pug","end":{"line":42,"column":14}}}
+{"type":"outdent","loc":{"start":{"line":44,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":44,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":44,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":44,"column":1}}}
+{"type":"call","loc":{"start":{"line":44,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":44,"column":7}},"val":"baz","args":""}
+{"type":"code","loc":{"start":{"line":44,"column":7},"filename":"/cases/mixin.blocks.pug","end":{"line":44,"column":14}},"val":"'123'","mustEscape":true,"buffer":true}
+{"type":"eos","loc":{"start":{"line":44,"column":14},"filename":"/cases/mixin.blocks.pug","end":{"line":44,"column":14}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/mixin.merge.tokens.json b/packages/pug-parser/test/cases/mixin.merge.tokens.json
index 3e4dbf18b..97d8d55e0 100644
--- a/packages/pug-parser/test/cases/mixin.merge.tokens.json
+++ b/packages/pug-parser/test/cases/mixin.merge.tokens.json
@@ -1,58 +1,58 @@
-{"type":"mixin","line":1,"col":1,"val":"foo","args":null}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"p"}
-{"type":"class","line":2,"col":4,"val":"bar"}
-{"type":"&attributes","line":2,"col":8,"val":"attributes"}
-{"type":"text","line":2,"col":32,"val":"One"}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":3,"val":"p"}
-{"type":"class","line":3,"col":4,"val":"baz"}
-{"type":"class","line":3,"col":8,"val":"quux"}
-{"type":"&attributes","line":3,"col":13,"val":"attributes"}
-{"type":"text","line":3,"col":37,"val":"Two"}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":3,"val":"p"}
-{"type":"&attributes","line":4,"col":4,"val":"attributes"}
-{"type":"text","line":4,"col":28,"val":"Three"}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":3,"val":"p"}
-{"type":"class","line":5,"col":4,"val":"bar"}
-{"type":"&attributes","line":5,"col":8,"val":"attributes"}
-{"type":"start-attributes","line":5,"col":31}
-{"type":"attribute","line":5,"col":32,"name":"class","val":"\"baz\"","mustEscape":true}
-{"type":"end-attributes","line":5,"col":43}
-{"type":"text","line":5,"col":45,"val":"Four"}
-{"type":"outdent","line":7,"col":1}
-{"type":"tag","line":7,"col":1,"val":"body"}
-{"type":"indent","line":8,"col":1,"val":2}
-{"type":"call","line":8,"col":3,"val":"foo","args":null}
-{"type":"class","line":8,"col":7,"val":"hello"}
-{"type":"newline","line":9,"col":1}
-{"type":"call","line":9,"col":3,"val":"foo","args":null}
-{"type":"id","line":9,"col":7,"val":"world"}
-{"type":"newline","line":10,"col":1}
-{"type":"call","line":10,"col":3,"val":"foo","args":null}
-{"type":"class","line":10,"col":7,"val":"hello"}
-{"type":"id","line":10,"col":13,"val":"world"}
-{"type":"newline","line":11,"col":1}
-{"type":"call","line":11,"col":3,"val":"foo","args":null}
-{"type":"class","line":11,"col":7,"val":"hello"}
-{"type":"class","line":11,"col":13,"val":"world"}
-{"type":"newline","line":12,"col":1}
-{"type":"call","line":12,"col":3,"val":"foo","args":null}
-{"type":"start-attributes","line":12,"col":7}
-{"type":"attribute","line":12,"col":8,"name":"class","val":"\"hello\"","mustEscape":true}
-{"type":"end-attributes","line":12,"col":21}
-{"type":"newline","line":13,"col":1}
-{"type":"call","line":13,"col":3,"val":"foo","args":null}
-{"type":"class","line":13,"col":7,"val":"hello"}
-{"type":"start-attributes","line":13,"col":13}
-{"type":"attribute","line":13,"col":14,"name":"class","val":"\"world\"","mustEscape":true}
-{"type":"end-attributes","line":13,"col":27}
-{"type":"newline","line":14,"col":1}
-{"type":"call","line":14,"col":3,"val":"foo","args":null}
-{"type":"newline","line":15,"col":1}
-{"type":"call","line":15,"col":3,"val":"foo","args":null}
-{"type":"&attributes","line":15,"col":7,"val":"{class: \"hello\"}"}
-{"type":"outdent","line":15,"col":36}
-{"type":"eos","line":15,"col":36}
\ No newline at end of file
+{"type":"mixin","loc":{"start":{"line":1,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":1,"column":10}},"val":"foo","args":null}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":2,"column":4}},"val":"p"}
+{"type":"class","loc":{"start":{"line":2,"column":4},"filename":"/cases/mixin.merge.pug","end":{"line":2,"column":8}},"val":"bar"}
+{"type":"&attributes","loc":{"start":{"line":2,"column":8},"filename":"/cases/mixin.merge.pug","end":{"line":2,"column":31}},"val":"attributes"}
+{"type":"text","loc":{"start":{"line":2,"column":32},"filename":"/cases/mixin.merge.pug","end":{"line":2,"column":35}},"val":"One"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":3,"column":3}}}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":3,"column":4}},"val":"p"}
+{"type":"class","loc":{"start":{"line":3,"column":4},"filename":"/cases/mixin.merge.pug","end":{"line":3,"column":8}},"val":"baz"}
+{"type":"class","loc":{"start":{"line":3,"column":8},"filename":"/cases/mixin.merge.pug","end":{"line":3,"column":13}},"val":"quux"}
+{"type":"&attributes","loc":{"start":{"line":3,"column":13},"filename":"/cases/mixin.merge.pug","end":{"line":3,"column":36}},"val":"attributes"}
+{"type":"text","loc":{"start":{"line":3,"column":37},"filename":"/cases/mixin.merge.pug","end":{"line":3,"column":40}},"val":"Two"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":4,"column":3}}}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":4,"column":4}},"val":"p"}
+{"type":"&attributes","loc":{"start":{"line":4,"column":4},"filename":"/cases/mixin.merge.pug","end":{"line":4,"column":27}},"val":"attributes"}
+{"type":"text","loc":{"start":{"line":4,"column":28},"filename":"/cases/mixin.merge.pug","end":{"line":4,"column":33}},"val":"Three"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":5,"column":3}}}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":5,"column":4}},"val":"p"}
+{"type":"class","loc":{"start":{"line":5,"column":4},"filename":"/cases/mixin.merge.pug","end":{"line":5,"column":8}},"val":"bar"}
+{"type":"&attributes","loc":{"start":{"line":5,"column":8},"filename":"/cases/mixin.merge.pug","end":{"line":5,"column":31}},"val":"attributes"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":31},"filename":"/cases/mixin.merge.pug","end":{"line":5,"column":32}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":32},"filename":"/cases/mixin.merge.pug","end":{"line":5,"column":43}},"name":"class","mustEscape":true,"val":"\"baz\""}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":43},"filename":"/cases/mixin.merge.pug","end":{"line":5,"column":44}}}
+{"type":"text","loc":{"start":{"line":5,"column":45},"filename":"/cases/mixin.merge.pug","end":{"line":5,"column":49}},"val":"Four"}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":7,"column":1}}}
+{"type":"tag","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":7,"column":5}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":8,"column":3}},"val":2}
+{"type":"call","loc":{"start":{"line":8,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":8,"column":7}},"val":"foo","args":null}
+{"type":"class","loc":{"start":{"line":8,"column":7},"filename":"/cases/mixin.merge.pug","end":{"line":8,"column":13}},"val":"hello"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":9,"column":3}}}
+{"type":"call","loc":{"start":{"line":9,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":9,"column":7}},"val":"foo","args":null}
+{"type":"id","loc":{"start":{"line":9,"column":7},"filename":"/cases/mixin.merge.pug","end":{"line":9,"column":13}},"val":"world"}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":10,"column":3}}}
+{"type":"call","loc":{"start":{"line":10,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":10,"column":7}},"val":"foo","args":null}
+{"type":"class","loc":{"start":{"line":10,"column":7},"filename":"/cases/mixin.merge.pug","end":{"line":10,"column":13}},"val":"hello"}
+{"type":"id","loc":{"start":{"line":10,"column":13},"filename":"/cases/mixin.merge.pug","end":{"line":10,"column":19}},"val":"world"}
+{"type":"newline","loc":{"start":{"line":11,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":11,"column":3}}}
+{"type":"call","loc":{"start":{"line":11,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":11,"column":7}},"val":"foo","args":null}
+{"type":"class","loc":{"start":{"line":11,"column":7},"filename":"/cases/mixin.merge.pug","end":{"line":11,"column":13}},"val":"hello"}
+{"type":"class","loc":{"start":{"line":11,"column":13},"filename":"/cases/mixin.merge.pug","end":{"line":11,"column":19}},"val":"world"}
+{"type":"newline","loc":{"start":{"line":12,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":12,"column":3}}}
+{"type":"call","loc":{"start":{"line":12,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":12,"column":7}},"val":"foo","args":null}
+{"type":"start-attributes","loc":{"start":{"line":12,"column":7},"filename":"/cases/mixin.merge.pug","end":{"line":12,"column":8}}}
+{"type":"attribute","loc":{"start":{"line":12,"column":8},"filename":"/cases/mixin.merge.pug","end":{"line":12,"column":21}},"name":"class","mustEscape":true,"val":"\"hello\""}
+{"type":"end-attributes","loc":{"start":{"line":12,"column":21},"filename":"/cases/mixin.merge.pug","end":{"line":12,"column":22}}}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":13,"column":3}}}
+{"type":"call","loc":{"start":{"line":13,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":13,"column":7}},"val":"foo","args":null}
+{"type":"class","loc":{"start":{"line":13,"column":7},"filename":"/cases/mixin.merge.pug","end":{"line":13,"column":13}},"val":"hello"}
+{"type":"start-attributes","loc":{"start":{"line":13,"column":13},"filename":"/cases/mixin.merge.pug","end":{"line":13,"column":14}}}
+{"type":"attribute","loc":{"start":{"line":13,"column":14},"filename":"/cases/mixin.merge.pug","end":{"line":13,"column":27}},"name":"class","mustEscape":true,"val":"\"world\""}
+{"type":"end-attributes","loc":{"start":{"line":13,"column":27},"filename":"/cases/mixin.merge.pug","end":{"line":13,"column":28}}}
+{"type":"newline","loc":{"start":{"line":14,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":14,"column":3}}}
+{"type":"call","loc":{"start":{"line":14,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":14,"column":7}},"val":"foo","args":null}
+{"type":"newline","loc":{"start":{"line":15,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":15,"column":3}}}
+{"type":"call","loc":{"start":{"line":15,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":15,"column":7}},"val":"foo","args":null}
+{"type":"&attributes","loc":{"start":{"line":15,"column":7},"filename":"/cases/mixin.merge.pug","end":{"line":15,"column":36}},"val":"{class: \"hello\"}"}
+{"type":"outdent","loc":{"start":{"line":15,"column":36},"filename":"/cases/mixin.merge.pug","end":{"line":15,"column":36}}}
+{"type":"eos","loc":{"start":{"line":15,"column":36},"filename":"/cases/mixin.merge.pug","end":{"line":15,"column":36}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/mixins-unused.tokens.json b/packages/pug-parser/test/cases/mixins-unused.tokens.json
index 384f1ffd9..edba36a54 100644
--- a/packages/pug-parser/test/cases/mixins-unused.tokens.json
+++ b/packages/pug-parser/test/cases/mixins-unused.tokens.json
@@ -1,7 +1,7 @@
-{"type":"mixin","line":1,"col":1,"val":"never-called","args":null}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"class","line":2,"col":3,"val":"wtf"}
-{"type":"text","line":2,"col":8,"val":"This isn't something we ever want to output"}
-{"type":"outdent","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"body"}
-{"type":"eos","line":3,"col":5}
\ No newline at end of file
+{"type":"mixin","loc":{"start":{"line":1,"column":1},"filename":"/cases/mixins-unused.pug","end":{"line":1,"column":19}},"val":"never-called","args":null}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/mixins-unused.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"class","loc":{"start":{"line":2,"column":3},"filename":"/cases/mixins-unused.pug","end":{"line":2,"column":7}},"val":"wtf"}
+{"type":"text","loc":{"start":{"line":2,"column":8},"filename":"/cases/mixins-unused.pug","end":{"line":2,"column":51}},"val":"This isn't something we ever want to output"}
+{"type":"outdent","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixins-unused.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixins-unused.pug","end":{"line":3,"column":5}},"val":"body"}
+{"type":"eos","loc":{"start":{"line":3,"column":5},"filename":"/cases/mixins-unused.pug","end":{"line":3,"column":5}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/mixins.rest-args.tokens.json b/packages/pug-parser/test/cases/mixins.rest-args.tokens.json
index 9f1a88641..36f67157c 100644
--- a/packages/pug-parser/test/cases/mixins.rest-args.tokens.json
+++ b/packages/pug-parser/test/cases/mixins.rest-args.tokens.json
@@ -1,14 +1,14 @@
-{"type":"mixin","line":1,"col":1,"val":"list","args":"tag, ...items"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"interpolation","line":2,"col":3,"val":"tag"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"each","line":3,"col":5,"val":"item","key":null,"code":"items"}
-{"type":"indent","line":4,"col":1,"val":6}
-{"type":"tag","line":4,"col":7,"val":"li"}
-{"type":"code","line":4,"col":9,"val":"item","mustEscape":true,"buffer":true}
-{"type":"outdent","line":6,"col":5}
-{"type":"outdent","line":6,"col":3}
-{"type":"outdent","line":6,"col":1}
-{"type":"call","line":6,"col":1,"val":"list","args":"'ul', 1, 2, 3, 4"}
-{"type":"newline","line":7,"col":1}
-{"type":"eos","line":7,"col":1}
\ No newline at end of file
+{"type":"mixin","loc":{"start":{"line":1,"column":1},"filename":"/cases/mixins.rest-args.pug","end":{"line":1,"column":26}},"val":"list","args":"tag, ...items"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/mixins.rest-args.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"interpolation","loc":{"start":{"line":2,"column":3},"filename":"/cases/mixins.rest-args.pug","end":{"line":2,"column":9}},"val":"tag"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixins.rest-args.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"each","loc":{"start":{"line":3,"column":5},"filename":"/cases/mixins.rest-args.pug","end":{"line":3,"column":23}},"val":"item","key":null,"code":"items"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/mixins.rest-args.pug","end":{"line":4,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":4,"column":7},"filename":"/cases/mixins.rest-args.pug","end":{"line":4,"column":9}},"val":"li"}
+{"type":"code","loc":{"start":{"line":4,"column":9},"filename":"/cases/mixins.rest-args.pug","end":{"line":4,"column":15}},"val":"item","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/mixins.rest-args.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/mixins.rest-args.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/mixins.rest-args.pug","end":{"line":6,"column":1}}}
+{"type":"call","loc":{"start":{"line":6,"column":1},"filename":"/cases/mixins.rest-args.pug","end":{"line":6,"column":24}},"val":"list","args":"'ul', 1, 2, 3, 4"}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixins.rest-args.pug","end":{"line":7,"column":1}}}
+{"type":"eos","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixins.rest-args.pug","end":{"line":7,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/mixins.tokens.json b/packages/pug-parser/test/cases/mixins.tokens.json
index 34716d7cb..71dfaf8e9 100644
--- a/packages/pug-parser/test/cases/mixins.tokens.json
+++ b/packages/pug-parser/test/cases/mixins.tokens.json
@@ -1,65 +1,65 @@
-{"type":"mixin","line":1,"col":1,"val":"comment","args":"title, str"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"class","line":2,"col":3,"val":"comment"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"h2"}
-{"type":"code","line":3,"col":7,"val":"title","mustEscape":true,"buffer":true}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":5,"val":"p"}
-{"type":"class","line":4,"col":6,"val":"body"}
-{"type":"code","line":4,"col":11,"val":"str","mustEscape":true,"buffer":true}
-{"type":"outdent","line":7,"col":3}
-{"type":"outdent","line":7,"col":1}
-{"type":"mixin","line":7,"col":1,"val":"comment","args":"title, str"}
-{"type":"indent","line":8,"col":1,"val":2}
-{"type":"class","line":8,"col":3,"val":"comment"}
-{"type":"indent","line":9,"col":1,"val":4}
-{"type":"tag","line":9,"col":5,"val":"h2"}
-{"type":"code","line":9,"col":7,"val":"title","mustEscape":true,"buffer":true}
-{"type":"newline","line":10,"col":1}
-{"type":"tag","line":10,"col":5,"val":"p"}
-{"type":"class","line":10,"col":6,"val":"body"}
-{"type":"code","line":10,"col":11,"val":"str","mustEscape":true,"buffer":true}
-{"type":"outdent","line":12,"col":3}
-{"type":"outdent","line":12,"col":1}
-{"type":"id","line":12,"col":1,"val":"user"}
-{"type":"indent","line":13,"col":1,"val":2}
-{"type":"tag","line":13,"col":3,"val":"h1"}
-{"type":"text","line":13,"col":6,"val":"Tobi"}
-{"type":"newline","line":14,"col":1}
-{"type":"class","line":14,"col":3,"val":"comments"}
-{"type":"indent","line":15,"col":1,"val":4}
-{"type":"call","line":15,"col":5,"val":"comment","args":"'This',\n            (('is regular, javascript'))"}
-{"type":"outdent","line":18,"col":3}
-{"type":"outdent","line":18,"col":1}
-{"type":"mixin","line":18,"col":1,"val":"list","args":null}
-{"type":"indent","line":19,"col":1,"val":2}
-{"type":"tag","line":19,"col":3,"val":"ul"}
-{"type":"indent","line":20,"col":1,"val":4}
-{"type":"tag","line":20,"col":5,"val":"li"}
-{"type":"text","line":20,"col":8,"val":"foo"}
-{"type":"newline","line":21,"col":1}
-{"type":"tag","line":21,"col":5,"val":"li"}
-{"type":"text","line":21,"col":8,"val":"bar"}
-{"type":"newline","line":22,"col":1}
-{"type":"tag","line":22,"col":5,"val":"li"}
-{"type":"text","line":22,"col":8,"val":"baz"}
-{"type":"outdent","line":24,"col":3}
-{"type":"outdent","line":24,"col":1}
-{"type":"tag","line":24,"col":1,"val":"body"}
-{"type":"indent","line":25,"col":1,"val":2}
-{"type":"call","line":25,"col":3,"val":"list","args":""}
-{"type":"newline","line":26,"col":1}
-{"type":"call","line":26,"col":3,"val":"list","args":""}
-{"type":"outdent","line":28,"col":1}
-{"type":"mixin","line":28,"col":1,"val":"foobar","args":"str"}
-{"type":"indent","line":29,"col":1,"val":2}
-{"type":"tag","line":29,"col":3,"val":"div"}
-{"type":"id","line":29,"col":6,"val":"interpolation"}
-{"type":"code","line":29,"col":20,"val":"str + 'interpolated'","mustEscape":true,"buffer":true}
-{"type":"outdent","line":31,"col":1}
-{"type":"code","line":31,"col":1,"val":"var suffix = \"bar\"","mustEscape":false,"buffer":false}
-{"type":"newline","line":32,"col":1}
-{"type":"call","line":32,"col":1,"val":"#{'foo' + suffix}","args":"'This is '"}
-{"type":"newline","line":33,"col":1}
-{"type":"eos","line":33,"col":1}
\ No newline at end of file
+{"type":"mixin","loc":{"start":{"line":1,"column":1},"filename":"/cases/mixins.pug","end":{"line":1,"column":26}},"val":"comment","args":"title, str"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/mixins.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"class","loc":{"start":{"line":2,"column":3},"filename":"/cases/mixins.pug","end":{"line":2,"column":11}},"val":"comment"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixins.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/mixins.pug","end":{"line":3,"column":7}},"val":"h2"}
+{"type":"code","loc":{"start":{"line":3,"column":7},"filename":"/cases/mixins.pug","end":{"line":3,"column":14}},"val":"title","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/mixins.pug","end":{"line":4,"column":5}}}
+{"type":"tag","loc":{"start":{"line":4,"column":5},"filename":"/cases/mixins.pug","end":{"line":4,"column":6}},"val":"p"}
+{"type":"class","loc":{"start":{"line":4,"column":6},"filename":"/cases/mixins.pug","end":{"line":4,"column":11}},"val":"body"}
+{"type":"code","loc":{"start":{"line":4,"column":11},"filename":"/cases/mixins.pug","end":{"line":4,"column":16}},"val":"str","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixins.pug","end":{"line":7,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixins.pug","end":{"line":7,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixins.pug","end":{"line":7,"column":27}},"val":"comment","args":"title, str"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/mixins.pug","end":{"line":8,"column":3}},"val":2}
+{"type":"class","loc":{"start":{"line":8,"column":3},"filename":"/cases/mixins.pug","end":{"line":8,"column":11}},"val":"comment"}
+{"type":"indent","loc":{"start":{"line":9,"column":1},"filename":"/cases/mixins.pug","end":{"line":9,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":9,"column":5},"filename":"/cases/mixins.pug","end":{"line":9,"column":7}},"val":"h2"}
+{"type":"code","loc":{"start":{"line":9,"column":7},"filename":"/cases/mixins.pug","end":{"line":9,"column":14}},"val":"title","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/mixins.pug","end":{"line":10,"column":5}}}
+{"type":"tag","loc":{"start":{"line":10,"column":5},"filename":"/cases/mixins.pug","end":{"line":10,"column":6}},"val":"p"}
+{"type":"class","loc":{"start":{"line":10,"column":6},"filename":"/cases/mixins.pug","end":{"line":10,"column":11}},"val":"body"}
+{"type":"code","loc":{"start":{"line":10,"column":11},"filename":"/cases/mixins.pug","end":{"line":10,"column":16}},"val":"str","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":12,"column":1},"filename":"/cases/mixins.pug","end":{"line":12,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":12,"column":1},"filename":"/cases/mixins.pug","end":{"line":12,"column":1}}}
+{"type":"id","loc":{"start":{"line":12,"column":1},"filename":"/cases/mixins.pug","end":{"line":12,"column":6}},"val":"user"}
+{"type":"indent","loc":{"start":{"line":13,"column":1},"filename":"/cases/mixins.pug","end":{"line":13,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":13,"column":3},"filename":"/cases/mixins.pug","end":{"line":13,"column":5}},"val":"h1"}
+{"type":"text","loc":{"start":{"line":13,"column":6},"filename":"/cases/mixins.pug","end":{"line":13,"column":10}},"val":"Tobi"}
+{"type":"newline","loc":{"start":{"line":14,"column":1},"filename":"/cases/mixins.pug","end":{"line":14,"column":3}}}
+{"type":"class","loc":{"start":{"line":14,"column":3},"filename":"/cases/mixins.pug","end":{"line":14,"column":12}},"val":"comments"}
+{"type":"indent","loc":{"start":{"line":15,"column":1},"filename":"/cases/mixins.pug","end":{"line":15,"column":5}},"val":4}
+{"type":"call","loc":{"start":{"line":15,"column":5},"filename":"/cases/mixins.pug","end":{"line":16,"column":42}},"val":"comment","args":"'This',\n            (('is regular, javascript'))"}
+{"type":"outdent","loc":{"start":{"line":18,"column":1},"filename":"/cases/mixins.pug","end":{"line":18,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":18,"column":1},"filename":"/cases/mixins.pug","end":{"line":18,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":18,"column":1},"filename":"/cases/mixins.pug","end":{"line":18,"column":11}},"val":"list","args":null}
+{"type":"indent","loc":{"start":{"line":19,"column":1},"filename":"/cases/mixins.pug","end":{"line":19,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":19,"column":3},"filename":"/cases/mixins.pug","end":{"line":19,"column":5}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":20,"column":1},"filename":"/cases/mixins.pug","end":{"line":20,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":20,"column":5},"filename":"/cases/mixins.pug","end":{"line":20,"column":7}},"val":"li"}
+{"type":"text","loc":{"start":{"line":20,"column":8},"filename":"/cases/mixins.pug","end":{"line":20,"column":11}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":21,"column":1},"filename":"/cases/mixins.pug","end":{"line":21,"column":5}}}
+{"type":"tag","loc":{"start":{"line":21,"column":5},"filename":"/cases/mixins.pug","end":{"line":21,"column":7}},"val":"li"}
+{"type":"text","loc":{"start":{"line":21,"column":8},"filename":"/cases/mixins.pug","end":{"line":21,"column":11}},"val":"bar"}
+{"type":"newline","loc":{"start":{"line":22,"column":1},"filename":"/cases/mixins.pug","end":{"line":22,"column":5}}}
+{"type":"tag","loc":{"start":{"line":22,"column":5},"filename":"/cases/mixins.pug","end":{"line":22,"column":7}},"val":"li"}
+{"type":"text","loc":{"start":{"line":22,"column":8},"filename":"/cases/mixins.pug","end":{"line":22,"column":11}},"val":"baz"}
+{"type":"outdent","loc":{"start":{"line":24,"column":1},"filename":"/cases/mixins.pug","end":{"line":24,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":24,"column":1},"filename":"/cases/mixins.pug","end":{"line":24,"column":1}}}
+{"type":"tag","loc":{"start":{"line":24,"column":1},"filename":"/cases/mixins.pug","end":{"line":24,"column":5}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":25,"column":1},"filename":"/cases/mixins.pug","end":{"line":25,"column":3}},"val":2}
+{"type":"call","loc":{"start":{"line":25,"column":3},"filename":"/cases/mixins.pug","end":{"line":25,"column":10}},"val":"list","args":""}
+{"type":"newline","loc":{"start":{"line":26,"column":1},"filename":"/cases/mixins.pug","end":{"line":26,"column":3}}}
+{"type":"call","loc":{"start":{"line":26,"column":3},"filename":"/cases/mixins.pug","end":{"line":26,"column":11}},"val":"list","args":""}
+{"type":"outdent","loc":{"start":{"line":28,"column":1},"filename":"/cases/mixins.pug","end":{"line":28,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":28,"column":1},"filename":"/cases/mixins.pug","end":{"line":28,"column":18}},"val":"foobar","args":"str"}
+{"type":"indent","loc":{"start":{"line":29,"column":1},"filename":"/cases/mixins.pug","end":{"line":29,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":29,"column":3},"filename":"/cases/mixins.pug","end":{"line":29,"column":6}},"val":"div"}
+{"type":"id","loc":{"start":{"line":29,"column":6},"filename":"/cases/mixins.pug","end":{"line":29,"column":20}},"val":"interpolation"}
+{"type":"code","loc":{"start":{"line":29,"column":20},"filename":"/cases/mixins.pug","end":{"line":29,"column":42}},"val":"str + 'interpolated'","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":31,"column":1},"filename":"/cases/mixins.pug","end":{"line":31,"column":1}}}
+{"type":"code","loc":{"start":{"line":31,"column":1},"filename":"/cases/mixins.pug","end":{"line":31,"column":21}},"val":"var suffix = \"bar\"","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":32,"column":1},"filename":"/cases/mixins.pug","end":{"line":32,"column":1}}}
+{"type":"call","loc":{"start":{"line":32,"column":1},"filename":"/cases/mixins.pug","end":{"line":32,"column":31}},"val":"#{'foo' + suffix}","args":"'This is '"}
+{"type":"newline","loc":{"start":{"line":33,"column":1},"filename":"/cases/mixins.pug","end":{"line":33,"column":1}}}
+{"type":"eos","loc":{"start":{"line":33,"column":1},"filename":"/cases/mixins.pug","end":{"line":33,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/namespaces.tokens.json b/packages/pug-parser/test/cases/namespaces.tokens.json
index 6935020b6..3454fca3a 100644
--- a/packages/pug-parser/test/cases/namespaces.tokens.json
+++ b/packages/pug-parser/test/cases/namespaces.tokens.json
@@ -1,8 +1,8 @@
-{"type":"tag","line":1,"col":1,"val":"fb:user:role"}
-{"type":"text","line":1,"col":14,"val":"Something"}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"foo"}
-{"type":"start-attributes","line":2,"col":4}
-{"type":"attribute","line":2,"col":5,"name":"fb:foo","val":"'bar'","mustEscape":true}
-{"type":"end-attributes","line":2,"col":17}
-{"type":"eos","line":2,"col":18}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/namespaces.pug","end":{"line":1,"column":13}},"val":"fb:user:role"}
+{"type":"text","loc":{"start":{"line":1,"column":14},"filename":"/cases/namespaces.pug","end":{"line":1,"column":23}},"val":"Something"}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/namespaces.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/namespaces.pug","end":{"line":2,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":4},"filename":"/cases/namespaces.pug","end":{"line":2,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":5},"filename":"/cases/namespaces.pug","end":{"line":2,"column":17}},"name":"fb:foo","mustEscape":true,"val":"'bar'"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":17},"filename":"/cases/namespaces.pug","end":{"line":2,"column":18}}}
+{"type":"eos","loc":{"start":{"line":2,"column":18},"filename":"/cases/namespaces.pug","end":{"line":2,"column":18}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/nesting.tokens.json b/packages/pug-parser/test/cases/nesting.tokens.json
index dce4f1206..5b3481728 100644
--- a/packages/pug-parser/test/cases/nesting.tokens.json
+++ b/packages/pug-parser/test/cases/nesting.tokens.json
@@ -1,23 +1,23 @@
-{"type":"tag","line":1,"col":1,"val":"ul"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"li"}
-{"type":"text","line":2,"col":6,"val":"a"}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":3,"val":"li"}
-{"type":"text","line":3,"col":6,"val":"b"}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":3,"val":"li"}
-{"type":"indent","line":5,"col":1,"val":4}
-{"type":"tag","line":5,"col":5,"val":"ul"}
-{"type":"indent","line":6,"col":1,"val":8}
-{"type":"tag","line":6,"col":9,"val":"li"}
-{"type":"text","line":6,"col":12,"val":"c"}
-{"type":"newline","line":7,"col":1}
-{"type":"tag","line":7,"col":9,"val":"li"}
-{"type":"text","line":7,"col":12,"val":"d"}
-{"type":"outdent","line":8,"col":5}
-{"type":"outdent","line":8,"col":3}
-{"type":"tag","line":8,"col":3,"val":"li"}
-{"type":"text","line":8,"col":6,"val":"e"}
-{"type":"outdent","line":8,"col":7}
-{"type":"eos","line":8,"col":7}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/nesting.pug","end":{"line":1,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/nesting.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/nesting.pug","end":{"line":2,"column":5}},"val":"li"}
+{"type":"text","loc":{"start":{"line":2,"column":6},"filename":"/cases/nesting.pug","end":{"line":2,"column":7}},"val":"a"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/nesting.pug","end":{"line":3,"column":3}}}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/nesting.pug","end":{"line":3,"column":5}},"val":"li"}
+{"type":"text","loc":{"start":{"line":3,"column":6},"filename":"/cases/nesting.pug","end":{"line":3,"column":7}},"val":"b"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/nesting.pug","end":{"line":4,"column":3}}}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/nesting.pug","end":{"line":4,"column":5}},"val":"li"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/nesting.pug","end":{"line":5,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":5,"column":5},"filename":"/cases/nesting.pug","end":{"line":5,"column":7}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/nesting.pug","end":{"line":6,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":6,"column":9},"filename":"/cases/nesting.pug","end":{"line":6,"column":11}},"val":"li"}
+{"type":"text","loc":{"start":{"line":6,"column":12},"filename":"/cases/nesting.pug","end":{"line":6,"column":13}},"val":"c"}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/nesting.pug","end":{"line":7,"column":9}}}
+{"type":"tag","loc":{"start":{"line":7,"column":9},"filename":"/cases/nesting.pug","end":{"line":7,"column":11}},"val":"li"}
+{"type":"text","loc":{"start":{"line":7,"column":12},"filename":"/cases/nesting.pug","end":{"line":7,"column":13}},"val":"d"}
+{"type":"outdent","loc":{"start":{"line":8,"column":1},"filename":"/cases/nesting.pug","end":{"line":8,"column":3}}}
+{"type":"outdent","loc":{"start":{"line":8,"column":1},"filename":"/cases/nesting.pug","end":{"line":8,"column":3}}}
+{"type":"tag","loc":{"start":{"line":8,"column":3},"filename":"/cases/nesting.pug","end":{"line":8,"column":5}},"val":"li"}
+{"type":"text","loc":{"start":{"line":8,"column":6},"filename":"/cases/nesting.pug","end":{"line":8,"column":7}},"val":"e"}
+{"type":"outdent","loc":{"start":{"line":8,"column":7},"filename":"/cases/nesting.pug","end":{"line":8,"column":7}}}
+{"type":"eos","loc":{"start":{"line":8,"column":7},"filename":"/cases/nesting.pug","end":{"line":8,"column":7}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/pipeless-comments.tokens.json b/packages/pug-parser/test/cases/pipeless-comments.tokens.json
index 2363807ce..86e1ae5bf 100644
--- a/packages/pug-parser/test/cases/pipeless-comments.tokens.json
+++ b/packages/pug-parser/test/cases/pipeless-comments.tokens.json
@@ -1,9 +1,9 @@
-{"type":"comment","line":1,"col":1,"val":"","buffer":true}
-{"type":"start-pipeless-text","line":1,"col":3}
-{"type":"text","line":2,"col":3,"val":"     .foo"}
-{"type":"newline","line":3,"col":1}
-{"type":"text","line":3,"col":3,"val":"\t.bar"}
-{"type":"newline","line":4,"col":1}
-{"type":"text","line":4,"col":3,"val":".hey"}
-{"type":"end-pipeless-text","line":4,"col":7}
-{"type":"eos","line":4,"col":7}
\ No newline at end of file
+{"type":"comment","loc":{"start":{"line":1,"column":1},"filename":"/cases/pipeless-comments.pug","end":{"line":1,"column":3}},"val":"","buffer":true}
+{"type":"start-pipeless-text","loc":{"start":{"line":1,"column":3},"filename":"/cases/pipeless-comments.pug","end":{"line":1,"column":3}}}
+{"type":"text","loc":{"start":{"line":2,"column":3},"filename":"/cases/pipeless-comments.pug","end":{"line":2,"column":12}},"val":"     .foo"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/pipeless-comments.pug","end":{"line":3,"column":3}}}
+{"type":"text","loc":{"start":{"line":3,"column":3},"filename":"/cases/pipeless-comments.pug","end":{"line":3,"column":8}},"val":"\t.bar"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/pipeless-comments.pug","end":{"line":4,"column":3}}}
+{"type":"text","loc":{"start":{"line":4,"column":3},"filename":"/cases/pipeless-comments.pug","end":{"line":4,"column":7}},"val":".hey"}
+{"type":"end-pipeless-text","loc":{"start":{"line":4,"column":7},"filename":"/cases/pipeless-comments.pug","end":{"line":4,"column":7}}}
+{"type":"eos","loc":{"start":{"line":4,"column":7},"filename":"/cases/pipeless-comments.pug","end":{"line":4,"column":7}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/pipeless-filters.tokens.json b/packages/pug-parser/test/cases/pipeless-filters.tokens.json
index e92262005..390f039cc 100644
--- a/packages/pug-parser/test/cases/pipeless-filters.tokens.json
+++ b/packages/pug-parser/test/cases/pipeless-filters.tokens.json
@@ -1,9 +1,9 @@
-{"type":"filter","line":1,"col":1,"val":"markdown-it"}
-{"type":"start-pipeless-text","line":1,"col":13}
-{"type":"text","line":2,"col":3,"val":"    code sample"}
-{"type":"newline","line":3,"col":1}
-{"type":"text","line":3,"col":3,"val":""}
-{"type":"newline","line":4,"col":1}
-{"type":"text","line":4,"col":3,"val":"# Heading"}
-{"type":"end-pipeless-text","line":4,"col":12}
-{"type":"eos","line":4,"col":12}
\ No newline at end of file
+{"type":"filter","loc":{"start":{"line":1,"column":1},"filename":"/cases/pipeless-filters.pug","end":{"line":1,"column":13}},"val":"markdown-it"}
+{"type":"start-pipeless-text","loc":{"start":{"line":1,"column":13},"filename":"/cases/pipeless-filters.pug","end":{"line":1,"column":13}}}
+{"type":"text","loc":{"start":{"line":2,"column":3},"filename":"/cases/pipeless-filters.pug","end":{"line":2,"column":18}},"val":"    code sample"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/pipeless-filters.pug","end":{"line":3,"column":1}}}
+{"type":"text","loc":{"start":{"line":3,"column":1},"filename":"/cases/pipeless-filters.pug","end":{"line":3,"column":1}},"val":""}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/pipeless-filters.pug","end":{"line":4,"column":3}}}
+{"type":"text","loc":{"start":{"line":4,"column":3},"filename":"/cases/pipeless-filters.pug","end":{"line":4,"column":12}},"val":"# Heading"}
+{"type":"end-pipeless-text","loc":{"start":{"line":4,"column":12},"filename":"/cases/pipeless-filters.pug","end":{"line":4,"column":12}}}
+{"type":"eos","loc":{"start":{"line":4,"column":12},"filename":"/cases/pipeless-filters.pug","end":{"line":4,"column":12}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/pipeless-tag.tokens.json b/packages/pug-parser/test/cases/pipeless-tag.tokens.json
index 63ce5decc..beb9ce45e 100644
--- a/packages/pug-parser/test/cases/pipeless-tag.tokens.json
+++ b/packages/pug-parser/test/cases/pipeless-tag.tokens.json
@@ -1,14 +1,14 @@
-{"type":"tag","line":1,"col":1,"val":"pre"}
-{"type":"dot","line":1,"col":4}
-{"type":"start-pipeless-text","line":1,"col":5}
-{"type":"text","line":2,"col":3,"val":"  what"}
-{"type":"newline","line":3,"col":1}
-{"type":"text","line":3,"col":3,"val":"is "}
-{"type":"interpolated-code","line":3,"col":6,"val":"'going'","mustEscape":true,"buffer":true}
-{"type":"text","line":3,"col":16,"val":" "}
-{"type":"start-pug-interpolation","line":3,"col":17}
-{"type":"interpolated-code","line":3,"col":21,"val":"'on'","mustEscape":true,"buffer":true}
-{"type":"end-pug-interpolation","line":3,"col":28}
-{"type":"text","line":3,"col":29,"val":""}
-{"type":"end-pipeless-text","line":3,"col":29}
-{"type":"eos","line":3,"col":29}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/pipeless-tag.pug","end":{"line":1,"column":4}},"val":"pre"}
+{"type":"dot","loc":{"start":{"line":1,"column":4},"filename":"/cases/pipeless-tag.pug","end":{"line":1,"column":5}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":1,"column":5},"filename":"/cases/pipeless-tag.pug","end":{"line":1,"column":5}}}
+{"type":"text","loc":{"start":{"line":2,"column":3},"filename":"/cases/pipeless-tag.pug","end":{"line":2,"column":9}},"val":"  what"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/pipeless-tag.pug","end":{"line":3,"column":3}}}
+{"type":"text","loc":{"start":{"line":3,"column":3},"filename":"/cases/pipeless-tag.pug","end":{"line":3,"column":6}},"val":"is "}
+{"type":"interpolated-code","loc":{"start":{"line":3,"column":6},"filename":"/cases/pipeless-tag.pug","end":{"line":3,"column":16}},"mustEscape":true,"buffer":true,"val":"'going'"}
+{"type":"text","loc":{"start":{"line":3,"column":16},"filename":"/cases/pipeless-tag.pug","end":{"line":3,"column":17}},"val":" "}
+{"type":"start-pug-interpolation","loc":{"start":{"line":3,"column":17},"filename":"/cases/pipeless-tag.pug","end":{"line":3,"column":19}}}
+{"type":"interpolated-code","loc":{"start":{"line":3,"column":21},"filename":"/cases/pipeless-tag.pug","end":{"line":3,"column":28}},"mustEscape":true,"buffer":true,"val":"'on'"}
+{"type":"end-pug-interpolation","loc":{"start":{"line":3,"column":28},"filename":"/cases/pipeless-tag.pug","end":{"line":3,"column":29}}}
+{"type":"text","loc":{"start":{"line":3,"column":29},"filename":"/cases/pipeless-tag.pug","end":{"line":3,"column":29}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":3,"column":29},"filename":"/cases/pipeless-tag.pug","end":{"line":3,"column":29}}}
+{"type":"eos","loc":{"start":{"line":3,"column":29},"filename":"/cases/pipeless-tag.pug","end":{"line":3,"column":29}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/pre.tokens.json b/packages/pug-parser/test/cases/pre.tokens.json
index de60efbba..2a1fb132a 100644
--- a/packages/pug-parser/test/cases/pre.tokens.json
+++ b/packages/pug-parser/test/cases/pre.tokens.json
@@ -1,25 +1,25 @@
-{"type":"tag","line":1,"col":1,"val":"pre"}
-{"type":"dot","line":1,"col":4}
-{"type":"start-pipeless-text","line":1,"col":5}
-{"type":"text","line":2,"col":3,"val":"foo"}
-{"type":"newline","line":3,"col":1}
-{"type":"text","line":3,"col":3,"val":"bar"}
-{"type":"newline","line":4,"col":1}
-{"type":"text","line":4,"col":3,"val":"baz"}
-{"type":"newline","line":5,"col":1}
-{"type":"text","line":5,"col":3,"val":""}
-{"type":"end-pipeless-text","line":5,"col":3}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":1,"val":"pre"}
-{"type":"indent","line":7,"col":1,"val":2}
-{"type":"tag","line":7,"col":3,"val":"code"}
-{"type":"dot","line":7,"col":7}
-{"type":"start-pipeless-text","line":7,"col":8}
-{"type":"text","line":8,"col":5,"val":"foo"}
-{"type":"newline","line":9,"col":1}
-{"type":"text","line":9,"col":5,"val":"bar"}
-{"type":"newline","line":10,"col":1}
-{"type":"text","line":10,"col":5,"val":"baz"}
-{"type":"end-pipeless-text","line":10,"col":8}
-{"type":"outdent","line":10,"col":8}
-{"type":"eos","line":10,"col":8}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/pre.pug","end":{"line":1,"column":4}},"val":"pre"}
+{"type":"dot","loc":{"start":{"line":1,"column":4},"filename":"/cases/pre.pug","end":{"line":1,"column":5}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":1,"column":5},"filename":"/cases/pre.pug","end":{"line":1,"column":5}}}
+{"type":"text","loc":{"start":{"line":2,"column":3},"filename":"/cases/pre.pug","end":{"line":2,"column":6}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/pre.pug","end":{"line":3,"column":3}}}
+{"type":"text","loc":{"start":{"line":3,"column":3},"filename":"/cases/pre.pug","end":{"line":3,"column":6}},"val":"bar"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/pre.pug","end":{"line":4,"column":3}}}
+{"type":"text","loc":{"start":{"line":4,"column":3},"filename":"/cases/pre.pug","end":{"line":4,"column":6}},"val":"baz"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/pre.pug","end":{"line":5,"column":1}}}
+{"type":"text","loc":{"start":{"line":5,"column":1},"filename":"/cases/pre.pug","end":{"line":5,"column":1}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":5,"column":1},"filename":"/cases/pre.pug","end":{"line":5,"column":1}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/pre.pug","end":{"line":6,"column":1}}}
+{"type":"tag","loc":{"start":{"line":6,"column":1},"filename":"/cases/pre.pug","end":{"line":6,"column":4}},"val":"pre"}
+{"type":"indent","loc":{"start":{"line":7,"column":1},"filename":"/cases/pre.pug","end":{"line":7,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":7,"column":3},"filename":"/cases/pre.pug","end":{"line":7,"column":7}},"val":"code"}
+{"type":"dot","loc":{"start":{"line":7,"column":7},"filename":"/cases/pre.pug","end":{"line":7,"column":8}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":7,"column":8},"filename":"/cases/pre.pug","end":{"line":7,"column":8}}}
+{"type":"text","loc":{"start":{"line":8,"column":5},"filename":"/cases/pre.pug","end":{"line":8,"column":8}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/pre.pug","end":{"line":9,"column":5}}}
+{"type":"text","loc":{"start":{"line":9,"column":5},"filename":"/cases/pre.pug","end":{"line":9,"column":8}},"val":"bar"}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/pre.pug","end":{"line":10,"column":5}}}
+{"type":"text","loc":{"start":{"line":10,"column":5},"filename":"/cases/pre.pug","end":{"line":10,"column":8}},"val":"baz"}
+{"type":"end-pipeless-text","loc":{"start":{"line":10,"column":8},"filename":"/cases/pre.pug","end":{"line":10,"column":8}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":8},"filename":"/cases/pre.pug","end":{"line":10,"column":8}}}
+{"type":"eos","loc":{"start":{"line":10,"column":8},"filename":"/cases/pre.pug","end":{"line":10,"column":8}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/quotes.tokens.json b/packages/pug-parser/test/cases/quotes.tokens.json
index 681b853cd..c53e9c0ee 100644
--- a/packages/pug-parser/test/cases/quotes.tokens.json
+++ b/packages/pug-parser/test/cases/quotes.tokens.json
@@ -1,6 +1,6 @@
-{"type":"tag","line":1,"col":1,"val":"p"}
-{"type":"text","line":1,"col":3,"val":"\"foo\""}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"p"}
-{"type":"text","line":2,"col":3,"val":"'foo'"}
-{"type":"eos","line":2,"col":8}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/quotes.pug","end":{"line":1,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":1,"column":3},"filename":"/cases/quotes.pug","end":{"line":1,"column":8}},"val":"\"foo\""}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/quotes.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/quotes.pug","end":{"line":2,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":2,"column":3},"filename":"/cases/quotes.pug","end":{"line":2,"column":8}},"val":"'foo'"}
+{"type":"eos","loc":{"start":{"line":2,"column":8},"filename":"/cases/quotes.pug","end":{"line":2,"column":8}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/regression.1794.tokens.json b/packages/pug-parser/test/cases/regression.1794.tokens.json
index e1589d85d..d1d8c5b67 100644
--- a/packages/pug-parser/test/cases/regression.1794.tokens.json
+++ b/packages/pug-parser/test/cases/regression.1794.tokens.json
@@ -1,9 +1,9 @@
-{"type":"extends","line":1,"col":1}
-{"type":"path","line":1,"col":9,"val":"./auxiliary/1794-extends.pug"}
-{"type":"newline","line":3,"col":1}
-{"type":"block","line":3,"col":1,"val":"content","mode":"replace"}
-{"type":"indent","line":4,"col":1,"val":2}
-{"type":"include","line":4,"col":3}
-{"type":"path","line":4,"col":11,"val":"./auxiliary/1794-include.pug"}
-{"type":"outdent","line":4,"col":39}
-{"type":"eos","line":4,"col":39}
\ No newline at end of file
+{"type":"extends","loc":{"start":{"line":1,"column":1},"filename":"/cases/regression.1794.pug","end":{"line":1,"column":8}}}
+{"type":"path","loc":{"start":{"line":1,"column":9},"filename":"/cases/regression.1794.pug","end":{"line":1,"column":37}},"val":"./auxiliary/1794-extends.pug"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/regression.1794.pug","end":{"line":3,"column":1}}}
+{"type":"block","loc":{"start":{"line":3,"column":1},"filename":"/cases/regression.1794.pug","end":{"line":3,"column":14}},"val":"content","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/regression.1794.pug","end":{"line":4,"column":3}},"val":2}
+{"type":"include","loc":{"start":{"line":4,"column":3},"filename":"/cases/regression.1794.pug","end":{"line":4,"column":10}}}
+{"type":"path","loc":{"start":{"line":4,"column":11},"filename":"/cases/regression.1794.pug","end":{"line":4,"column":39}},"val":"./auxiliary/1794-include.pug"}
+{"type":"outdent","loc":{"start":{"line":4,"column":39},"filename":"/cases/regression.1794.pug","end":{"line":4,"column":39}}}
+{"type":"eos","loc":{"start":{"line":4,"column":39},"filename":"/cases/regression.1794.pug","end":{"line":4,"column":39}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/regression.784.tokens.json b/packages/pug-parser/test/cases/regression.784.tokens.json
index 3caea3778..52a0b397e 100644
--- a/packages/pug-parser/test/cases/regression.784.tokens.json
+++ b/packages/pug-parser/test/cases/regression.784.tokens.json
@@ -1,5 +1,5 @@
-{"type":"code","line":1,"col":1,"val":"var url = 'http://www.google.com'","mustEscape":false,"buffer":false}
-{"type":"newline","line":2,"col":1}
-{"type":"class","line":2,"col":1,"val":"url"}
-{"type":"interpolated-code","line":2,"col":6,"val":"url.replace('http://', '').replace(/^www\\./, '')","mustEscape":true,"buffer":true}
-{"type":"eos","line":2,"col":57}
\ No newline at end of file
+{"type":"code","loc":{"start":{"line":1,"column":1},"filename":"/cases/regression.784.pug","end":{"line":1,"column":36}},"val":"var url = 'http://www.google.com'","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/regression.784.pug","end":{"line":2,"column":1}}}
+{"type":"class","loc":{"start":{"line":2,"column":1},"filename":"/cases/regression.784.pug","end":{"line":2,"column":5}},"val":"url"}
+{"type":"interpolated-code","loc":{"start":{"line":2,"column":6},"filename":"/cases/regression.784.pug","end":{"line":2,"column":57}},"mustEscape":true,"buffer":true,"val":"url.replace('http://', '').replace(/^www\\./, '')"}
+{"type":"eos","loc":{"start":{"line":2,"column":57},"filename":"/cases/regression.784.pug","end":{"line":2,"column":57}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/script.whitespace.tokens.json b/packages/pug-parser/test/cases/script.whitespace.tokens.json
index 2414caa48..d6facf1a1 100644
--- a/packages/pug-parser/test/cases/script.whitespace.tokens.json
+++ b/packages/pug-parser/test/cases/script.whitespace.tokens.json
@@ -1,14 +1,14 @@
-{"type":"tag","line":1,"col":1,"val":"script"}
-{"type":"dot","line":1,"col":7}
-{"type":"start-pipeless-text","line":1,"col":8}
-{"type":"text","line":2,"col":3,"val":"if (foo) {"}
-{"type":"newline","line":3,"col":1}
-{"type":"text","line":3,"col":3,"val":"  "}
-{"type":"newline","line":4,"col":1}
-{"type":"text","line":4,"col":3,"val":"  bar();"}
-{"type":"newline","line":5,"col":1}
-{"type":"text","line":5,"col":3,"val":""}
-{"type":"newline","line":6,"col":1}
-{"type":"text","line":6,"col":3,"val":"}"}
-{"type":"end-pipeless-text","line":6,"col":4}
-{"type":"eos","line":6,"col":4}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/script.whitespace.pug","end":{"line":1,"column":7}},"val":"script"}
+{"type":"dot","loc":{"start":{"line":1,"column":7},"filename":"/cases/script.whitespace.pug","end":{"line":1,"column":8}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":1,"column":8},"filename":"/cases/script.whitespace.pug","end":{"line":1,"column":8}}}
+{"type":"text","loc":{"start":{"line":2,"column":3},"filename":"/cases/script.whitespace.pug","end":{"line":2,"column":13}},"val":"if (foo) {"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/script.whitespace.pug","end":{"line":3,"column":3}}}
+{"type":"text","loc":{"start":{"line":3,"column":3},"filename":"/cases/script.whitespace.pug","end":{"line":3,"column":5}},"val":"  "}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/script.whitespace.pug","end":{"line":4,"column":3}}}
+{"type":"text","loc":{"start":{"line":4,"column":3},"filename":"/cases/script.whitespace.pug","end":{"line":4,"column":11}},"val":"  bar();"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/script.whitespace.pug","end":{"line":5,"column":3}}}
+{"type":"text","loc":{"start":{"line":5,"column":3},"filename":"/cases/script.whitespace.pug","end":{"line":5,"column":3}},"val":""}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/script.whitespace.pug","end":{"line":6,"column":3}}}
+{"type":"text","loc":{"start":{"line":6,"column":3},"filename":"/cases/script.whitespace.pug","end":{"line":6,"column":4}},"val":"}"}
+{"type":"end-pipeless-text","loc":{"start":{"line":6,"column":4},"filename":"/cases/script.whitespace.pug","end":{"line":6,"column":4}}}
+{"type":"eos","loc":{"start":{"line":6,"column":4},"filename":"/cases/script.whitespace.pug","end":{"line":6,"column":4}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/scripts.non-js.tokens.json b/packages/pug-parser/test/cases/scripts.non-js.tokens.json
index 745a45d86..7a78b63b8 100644
--- a/packages/pug-parser/test/cases/scripts.non-js.tokens.json
+++ b/packages/pug-parser/test/cases/scripts.non-js.tokens.json
@@ -1,29 +1,29 @@
-{"type":"tag","line":1,"col":1,"val":"script"}
-{"type":"id","line":1,"col":7,"val":"user-template"}
-{"type":"start-attributes","line":1,"col":21}
-{"type":"attribute","line":1,"col":22,"name":"type","val":"'text/template'","mustEscape":true}
-{"type":"end-attributes","line":1,"col":42}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"id","line":2,"col":3,"val":"user"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"h1"}
-{"type":"text","line":3,"col":8,"val":"<%= user.name %>"}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":5,"val":"p"}
-{"type":"text","line":4,"col":7,"val":"<%= user.description %>"}
-{"type":"outdent","line":6,"col":3}
-{"type":"outdent","line":6,"col":1}
-{"type":"tag","line":6,"col":1,"val":"script"}
-{"type":"id","line":6,"col":7,"val":"user-template"}
-{"type":"start-attributes","line":6,"col":21}
-{"type":"attribute","line":6,"col":22,"name":"type","val":"'text/template'","mustEscape":true}
-{"type":"end-attributes","line":6,"col":42}
-{"type":"dot","line":6,"col":43}
-{"type":"start-pipeless-text","line":6,"col":44}
-{"type":"text","line":7,"col":3,"val":"if (foo) {"}
-{"type":"newline","line":8,"col":1}
-{"type":"text","line":8,"col":3,"val":"  bar();"}
-{"type":"newline","line":9,"col":1}
-{"type":"text","line":9,"col":3,"val":"}"}
-{"type":"end-pipeless-text","line":9,"col":4}
-{"type":"eos","line":9,"col":4}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/scripts.non-js.pug","end":{"line":1,"column":7}},"val":"script"}
+{"type":"id","loc":{"start":{"line":1,"column":7},"filename":"/cases/scripts.non-js.pug","end":{"line":1,"column":21}},"val":"user-template"}
+{"type":"start-attributes","loc":{"start":{"line":1,"column":21},"filename":"/cases/scripts.non-js.pug","end":{"line":1,"column":22}}}
+{"type":"attribute","loc":{"start":{"line":1,"column":22},"filename":"/cases/scripts.non-js.pug","end":{"line":1,"column":42}},"name":"type","mustEscape":true,"val":"'text/template'"}
+{"type":"end-attributes","loc":{"start":{"line":1,"column":42},"filename":"/cases/scripts.non-js.pug","end":{"line":1,"column":43}}}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/scripts.non-js.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"id","loc":{"start":{"line":2,"column":3},"filename":"/cases/scripts.non-js.pug","end":{"line":2,"column":8}},"val":"user"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/scripts.non-js.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/scripts.non-js.pug","end":{"line":3,"column":7}},"val":"h1"}
+{"type":"text","loc":{"start":{"line":3,"column":8},"filename":"/cases/scripts.non-js.pug","end":{"line":3,"column":24}},"val":"<%= user.name %>"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/scripts.non-js.pug","end":{"line":4,"column":5}}}
+{"type":"tag","loc":{"start":{"line":4,"column":5},"filename":"/cases/scripts.non-js.pug","end":{"line":4,"column":6}},"val":"p"}
+{"type":"text","loc":{"start":{"line":4,"column":7},"filename":"/cases/scripts.non-js.pug","end":{"line":4,"column":30}},"val":"<%= user.description %>"}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/scripts.non-js.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/scripts.non-js.pug","end":{"line":6,"column":1}}}
+{"type":"tag","loc":{"start":{"line":6,"column":1},"filename":"/cases/scripts.non-js.pug","end":{"line":6,"column":7}},"val":"script"}
+{"type":"id","loc":{"start":{"line":6,"column":7},"filename":"/cases/scripts.non-js.pug","end":{"line":6,"column":21}},"val":"user-template"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":21},"filename":"/cases/scripts.non-js.pug","end":{"line":6,"column":22}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":22},"filename":"/cases/scripts.non-js.pug","end":{"line":6,"column":42}},"name":"type","mustEscape":true,"val":"'text/template'"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":42},"filename":"/cases/scripts.non-js.pug","end":{"line":6,"column":43}}}
+{"type":"dot","loc":{"start":{"line":6,"column":43},"filename":"/cases/scripts.non-js.pug","end":{"line":6,"column":44}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":6,"column":44},"filename":"/cases/scripts.non-js.pug","end":{"line":6,"column":44}}}
+{"type":"text","loc":{"start":{"line":7,"column":3},"filename":"/cases/scripts.non-js.pug","end":{"line":7,"column":13}},"val":"if (foo) {"}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/scripts.non-js.pug","end":{"line":8,"column":3}}}
+{"type":"text","loc":{"start":{"line":8,"column":3},"filename":"/cases/scripts.non-js.pug","end":{"line":8,"column":11}},"val":"  bar();"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/scripts.non-js.pug","end":{"line":9,"column":3}}}
+{"type":"text","loc":{"start":{"line":9,"column":3},"filename":"/cases/scripts.non-js.pug","end":{"line":9,"column":4}},"val":"}"}
+{"type":"end-pipeless-text","loc":{"start":{"line":9,"column":4},"filename":"/cases/scripts.non-js.pug","end":{"line":9,"column":4}}}
+{"type":"eos","loc":{"start":{"line":9,"column":4},"filename":"/cases/scripts.non-js.pug","end":{"line":9,"column":4}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/scripts.tokens.json b/packages/pug-parser/test/cases/scripts.tokens.json
index c990ab187..9b0600065 100644
--- a/packages/pug-parser/test/cases/scripts.tokens.json
+++ b/packages/pug-parser/test/cases/scripts.tokens.json
@@ -1,20 +1,20 @@
-{"type":"tag","line":1,"col":1,"val":"script"}
-{"type":"dot","line":1,"col":7}
-{"type":"start-pipeless-text","line":1,"col":8}
-{"type":"text","line":2,"col":3,"val":"if (foo) {"}
-{"type":"newline","line":3,"col":1}
-{"type":"text","line":3,"col":3,"val":"  bar();"}
-{"type":"newline","line":4,"col":1}
-{"type":"text","line":4,"col":3,"val":"}"}
-{"type":"end-pipeless-text","line":4,"col":4}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":1,"val":"script"}
-{"type":"code","line":5,"col":7,"val":"'foo()'","mustEscape":false,"buffer":true}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":1,"val":"script"}
-{"type":"text","line":6,"col":8,"val":"foo()"}
-{"type":"newline","line":7,"col":1}
-{"type":"tag","line":7,"col":1,"val":"script"}
-{"type":"newline","line":8,"col":1}
-{"type":"tag","line":8,"col":1,"val":"div"}
-{"type":"eos","line":8,"col":4}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/scripts.pug","end":{"line":1,"column":7}},"val":"script"}
+{"type":"dot","loc":{"start":{"line":1,"column":7},"filename":"/cases/scripts.pug","end":{"line":1,"column":8}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":1,"column":8},"filename":"/cases/scripts.pug","end":{"line":1,"column":8}}}
+{"type":"text","loc":{"start":{"line":2,"column":3},"filename":"/cases/scripts.pug","end":{"line":2,"column":13}},"val":"if (foo) {"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/scripts.pug","end":{"line":3,"column":3}}}
+{"type":"text","loc":{"start":{"line":3,"column":3},"filename":"/cases/scripts.pug","end":{"line":3,"column":11}},"val":"  bar();"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/scripts.pug","end":{"line":4,"column":3}}}
+{"type":"text","loc":{"start":{"line":4,"column":3},"filename":"/cases/scripts.pug","end":{"line":4,"column":4}},"val":"}"}
+{"type":"end-pipeless-text","loc":{"start":{"line":4,"column":4},"filename":"/cases/scripts.pug","end":{"line":4,"column":4}}}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/scripts.pug","end":{"line":5,"column":1}}}
+{"type":"tag","loc":{"start":{"line":5,"column":1},"filename":"/cases/scripts.pug","end":{"line":5,"column":7}},"val":"script"}
+{"type":"code","loc":{"start":{"line":5,"column":7},"filename":"/cases/scripts.pug","end":{"line":5,"column":17}},"val":"'foo()'","mustEscape":false,"buffer":true}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/scripts.pug","end":{"line":6,"column":1}}}
+{"type":"tag","loc":{"start":{"line":6,"column":1},"filename":"/cases/scripts.pug","end":{"line":6,"column":7}},"val":"script"}
+{"type":"text","loc":{"start":{"line":6,"column":8},"filename":"/cases/scripts.pug","end":{"line":6,"column":13}},"val":"foo()"}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/scripts.pug","end":{"line":7,"column":1}}}
+{"type":"tag","loc":{"start":{"line":7,"column":1},"filename":"/cases/scripts.pug","end":{"line":7,"column":7}},"val":"script"}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/scripts.pug","end":{"line":8,"column":1}}}
+{"type":"tag","loc":{"start":{"line":8,"column":1},"filename":"/cases/scripts.pug","end":{"line":8,"column":4}},"val":"div"}
+{"type":"eos","loc":{"start":{"line":8,"column":4},"filename":"/cases/scripts.pug","end":{"line":8,"column":4}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/self-closing-html.tokens.json b/packages/pug-parser/test/cases/self-closing-html.tokens.json
index 12762fd12..3bd62262c 100644
--- a/packages/pug-parser/test/cases/self-closing-html.tokens.json
+++ b/packages/pug-parser/test/cases/self-closing-html.tokens.json
@@ -1,11 +1,11 @@
-{"type":"doctype","line":1,"col":1,"val":"html"}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"html"}
-{"type":"indent","line":3,"col":1,"val":2}
-{"type":"tag","line":3,"col":3,"val":"body"}
-{"type":"indent","line":4,"col":1,"val":4}
-{"type":"tag","line":4,"col":5,"val":"br"}
-{"type":"slash","line":4,"col":7}
-{"type":"outdent","line":5,"col":3}
-{"type":"outdent","line":5,"col":1}
-{"type":"eos","line":5,"col":1}
\ No newline at end of file
+{"type":"doctype","loc":{"start":{"line":1,"column":1},"filename":"/cases/self-closing-html.pug","end":{"line":1,"column":13}},"val":"html"}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/self-closing-html.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/self-closing-html.pug","end":{"line":2,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/self-closing-html.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/self-closing-html.pug","end":{"line":3,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/self-closing-html.pug","end":{"line":4,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":4,"column":5},"filename":"/cases/self-closing-html.pug","end":{"line":4,"column":7}},"val":"br"}
+{"type":"slash","loc":{"start":{"line":4,"column":7},"filename":"/cases/self-closing-html.pug","end":{"line":4,"column":8}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/self-closing-html.pug","end":{"line":5,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/self-closing-html.pug","end":{"line":5,"column":1}}}
+{"type":"eos","loc":{"start":{"line":5,"column":1},"filename":"/cases/self-closing-html.pug","end":{"line":5,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/single-period.tokens.json b/packages/pug-parser/test/cases/single-period.tokens.json
index a0d1c81d0..ad94eaed9 100644
--- a/packages/pug-parser/test/cases/single-period.tokens.json
+++ b/packages/pug-parser/test/cases/single-period.tokens.json
@@ -1,3 +1,3 @@
-{"type":"tag","line":1,"col":1,"val":"span"}
-{"type":"text","line":1,"col":6,"val":"."}
-{"type":"eos","line":1,"col":7}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/single-period.pug","end":{"line":1,"column":5}},"val":"span"}
+{"type":"text","loc":{"start":{"line":1,"column":6},"filename":"/cases/single-period.pug","end":{"line":1,"column":7}},"val":"."}
+{"type":"eos","loc":{"start":{"line":1,"column":7},"filename":"/cases/single-period.pug","end":{"line":1,"column":7}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/source.tokens.json b/packages/pug-parser/test/cases/source.tokens.json
index 05cc23b6e..9027d9708 100644
--- a/packages/pug-parser/test/cases/source.tokens.json
+++ b/packages/pug-parser/test/cases/source.tokens.json
@@ -1,21 +1,21 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"audio"}
-{"type":"start-attributes","line":2,"col":8}
-{"type":"attribute","line":2,"col":9,"name":"preload","val":"'auto'","mustEscape":true}
-{"type":"attribute","line":2,"col":25,"name":"autobuffer","val":true,"mustEscape":false}
-{"type":"attribute","line":2,"col":37,"name":"controls","val":true,"mustEscape":false}
-{"type":"end-attributes","line":2,"col":45}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"source"}
-{"type":"start-attributes","line":3,"col":11}
-{"type":"attribute","line":3,"col":12,"name":"src","val":"'foo'","mustEscape":true}
-{"type":"end-attributes","line":3,"col":21}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":5,"val":"source"}
-{"type":"start-attributes","line":4,"col":11}
-{"type":"attribute","line":4,"col":12,"name":"src","val":"'bar'","mustEscape":true}
-{"type":"end-attributes","line":4,"col":21}
-{"type":"outdent","line":4,"col":22}
-{"type":"outdent","line":4,"col":22}
-{"type":"eos","line":4,"col":22}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/source.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/source.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/source.pug","end":{"line":2,"column":8}},"val":"audio"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":8},"filename":"/cases/source.pug","end":{"line":2,"column":9}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":9},"filename":"/cases/source.pug","end":{"line":2,"column":23}},"name":"preload","mustEscape":true,"val":"'auto'"}
+{"type":"attribute","loc":{"start":{"line":2,"column":25},"filename":"/cases/source.pug","end":{"line":2,"column":35}},"name":"autobuffer","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":2,"column":37},"filename":"/cases/source.pug","end":{"line":2,"column":45}},"name":"controls","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":45},"filename":"/cases/source.pug","end":{"line":2,"column":46}}}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/source.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/source.pug","end":{"line":3,"column":11}},"val":"source"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":11},"filename":"/cases/source.pug","end":{"line":3,"column":12}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":12},"filename":"/cases/source.pug","end":{"line":3,"column":21}},"name":"src","mustEscape":true,"val":"'foo'"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":21},"filename":"/cases/source.pug","end":{"line":3,"column":22}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/source.pug","end":{"line":4,"column":5}}}
+{"type":"tag","loc":{"start":{"line":4,"column":5},"filename":"/cases/source.pug","end":{"line":4,"column":11}},"val":"source"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":11},"filename":"/cases/source.pug","end":{"line":4,"column":12}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":12},"filename":"/cases/source.pug","end":{"line":4,"column":21}},"name":"src","mustEscape":true,"val":"'bar'"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":21},"filename":"/cases/source.pug","end":{"line":4,"column":22}}}
+{"type":"outdent","loc":{"start":{"line":4,"column":22},"filename":"/cases/source.pug","end":{"line":4,"column":22}}}
+{"type":"outdent","loc":{"start":{"line":4,"column":22},"filename":"/cases/source.pug","end":{"line":4,"column":22}}}
+{"type":"eos","loc":{"start":{"line":4,"column":22},"filename":"/cases/source.pug","end":{"line":4,"column":22}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/styles.tokens.json b/packages/pug-parser/test/cases/styles.tokens.json
index 44bf2f325..037392c94 100644
--- a/packages/pug-parser/test/cases/styles.tokens.json
+++ b/packages/pug-parser/test/cases/styles.tokens.json
@@ -1,64 +1,64 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"head"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"style"}
-{"type":"dot","line":3,"col":10}
-{"type":"start-pipeless-text","line":3,"col":11}
-{"type":"text","line":4,"col":7,"val":"body {"}
-{"type":"newline","line":5,"col":1}
-{"type":"text","line":5,"col":7,"val":"  padding: 50px;"}
-{"type":"newline","line":6,"col":1}
-{"type":"text","line":6,"col":7,"val":"}"}
-{"type":"end-pipeless-text","line":6,"col":8}
-{"type":"outdent","line":7,"col":3}
-{"type":"tag","line":7,"col":3,"val":"body"}
-{"type":"indent","line":8,"col":1,"val":4}
-{"type":"tag","line":8,"col":5,"val":"div"}
-{"type":"start-attributes","line":8,"col":8}
-{"type":"attribute","line":8,"col":9,"name":"style","val":"'color:red;background:green'","mustEscape":true}
-{"type":"end-attributes","line":8,"col":43}
-{"type":"newline","line":9,"col":1}
-{"type":"tag","line":9,"col":5,"val":"div"}
-{"type":"start-attributes","line":9,"col":8}
-{"type":"attribute","line":9,"col":9,"name":"style","val":"{color: 'red', background: 'green'}","mustEscape":true}
-{"type":"end-attributes","line":9,"col":50}
-{"type":"newline","line":10,"col":1}
-{"type":"tag","line":10,"col":5,"val":"div"}
-{"type":"&attributes","line":10,"col":8,"val":"{style: 'color:red;background:green'}"}
-{"type":"newline","line":11,"col":1}
-{"type":"tag","line":11,"col":5,"val":"div"}
-{"type":"&attributes","line":11,"col":8,"val":"{style: {color: 'red', background: 'green'}}"}
-{"type":"newline","line":12,"col":1}
-{"type":"mixin","line":12,"col":5,"val":"div","args":null}
-{"type":"indent","line":13,"col":1,"val":6}
-{"type":"tag","line":13,"col":7,"val":"div"}
-{"type":"&attributes","line":13,"col":10,"val":"attributes"}
-{"type":"outdent","line":14,"col":5}
-{"type":"call","line":14,"col":5,"val":"div","args":null}
-{"type":"start-attributes","line":14,"col":9}
-{"type":"attribute","line":14,"col":10,"name":"style","val":"'color:red;background:green'","mustEscape":true}
-{"type":"end-attributes","line":14,"col":44}
-{"type":"newline","line":15,"col":1}
-{"type":"call","line":15,"col":5,"val":"div","args":null}
-{"type":"start-attributes","line":15,"col":9}
-{"type":"attribute","line":15,"col":10,"name":"style","val":"{color: 'red', background: 'green'}","mustEscape":true}
-{"type":"end-attributes","line":15,"col":51}
-{"type":"newline","line":16,"col":1}
-{"type":"code","line":16,"col":5,"val":"var bg = 'green';","mustEscape":false,"buffer":false}
-{"type":"newline","line":17,"col":1}
-{"type":"tag","line":17,"col":5,"val":"div"}
-{"type":"start-attributes","line":17,"col":8}
-{"type":"attribute","line":17,"col":9,"name":"style","val":"{color: 'red', background: bg}","mustEscape":true}
-{"type":"end-attributes","line":17,"col":45}
-{"type":"newline","line":18,"col":1}
-{"type":"tag","line":18,"col":5,"val":"div"}
-{"type":"&attributes","line":18,"col":8,"val":"{style: {color: 'red', background: bg}}"}
-{"type":"newline","line":19,"col":1}
-{"type":"call","line":19,"col":5,"val":"div","args":null}
-{"type":"start-attributes","line":19,"col":9}
-{"type":"attribute","line":19,"col":10,"name":"style","val":"{color: 'red', background: bg}","mustEscape":true}
-{"type":"end-attributes","line":19,"col":46}
-{"type":"outdent","line":20,"col":3}
-{"type":"outdent","line":20,"col":1}
-{"type":"eos","line":20,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/styles.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/styles.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/styles.pug","end":{"line":2,"column":7}},"val":"head"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/styles.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/styles.pug","end":{"line":3,"column":10}},"val":"style"}
+{"type":"dot","loc":{"start":{"line":3,"column":10},"filename":"/cases/styles.pug","end":{"line":3,"column":11}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":3,"column":11},"filename":"/cases/styles.pug","end":{"line":3,"column":11}}}
+{"type":"text","loc":{"start":{"line":4,"column":7},"filename":"/cases/styles.pug","end":{"line":4,"column":13}},"val":"body {"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/styles.pug","end":{"line":5,"column":7}}}
+{"type":"text","loc":{"start":{"line":5,"column":7},"filename":"/cases/styles.pug","end":{"line":5,"column":23}},"val":"  padding: 50px;"}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/styles.pug","end":{"line":6,"column":7}}}
+{"type":"text","loc":{"start":{"line":6,"column":7},"filename":"/cases/styles.pug","end":{"line":6,"column":8}},"val":"}"}
+{"type":"end-pipeless-text","loc":{"start":{"line":6,"column":8},"filename":"/cases/styles.pug","end":{"line":6,"column":8}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/styles.pug","end":{"line":7,"column":3}}}
+{"type":"tag","loc":{"start":{"line":7,"column":3},"filename":"/cases/styles.pug","end":{"line":7,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/styles.pug","end":{"line":8,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":8,"column":5},"filename":"/cases/styles.pug","end":{"line":8,"column":8}},"val":"div"}
+{"type":"start-attributes","loc":{"start":{"line":8,"column":8},"filename":"/cases/styles.pug","end":{"line":8,"column":9}}}
+{"type":"attribute","loc":{"start":{"line":8,"column":9},"filename":"/cases/styles.pug","end":{"line":8,"column":43}},"name":"style","mustEscape":true,"val":"'color:red;background:green'"}
+{"type":"end-attributes","loc":{"start":{"line":8,"column":43},"filename":"/cases/styles.pug","end":{"line":8,"column":44}}}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/styles.pug","end":{"line":9,"column":5}}}
+{"type":"tag","loc":{"start":{"line":9,"column":5},"filename":"/cases/styles.pug","end":{"line":9,"column":8}},"val":"div"}
+{"type":"start-attributes","loc":{"start":{"line":9,"column":8},"filename":"/cases/styles.pug","end":{"line":9,"column":9}}}
+{"type":"attribute","loc":{"start":{"line":9,"column":9},"filename":"/cases/styles.pug","end":{"line":9,"column":50}},"name":"style","mustEscape":true,"val":"{color: 'red', background: 'green'}"}
+{"type":"end-attributes","loc":{"start":{"line":9,"column":50},"filename":"/cases/styles.pug","end":{"line":9,"column":51}}}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/styles.pug","end":{"line":10,"column":5}}}
+{"type":"tag","loc":{"start":{"line":10,"column":5},"filename":"/cases/styles.pug","end":{"line":10,"column":8}},"val":"div"}
+{"type":"&attributes","loc":{"start":{"line":10,"column":8},"filename":"/cases/styles.pug","end":{"line":10,"column":58}},"val":"{style: 'color:red;background:green'}"}
+{"type":"newline","loc":{"start":{"line":11,"column":1},"filename":"/cases/styles.pug","end":{"line":11,"column":5}}}
+{"type":"tag","loc":{"start":{"line":11,"column":5},"filename":"/cases/styles.pug","end":{"line":11,"column":8}},"val":"div"}
+{"type":"&attributes","loc":{"start":{"line":11,"column":8},"filename":"/cases/styles.pug","end":{"line":11,"column":65}},"val":"{style: {color: 'red', background: 'green'}}"}
+{"type":"newline","loc":{"start":{"line":12,"column":1},"filename":"/cases/styles.pug","end":{"line":12,"column":5}}}
+{"type":"mixin","loc":{"start":{"line":12,"column":5},"filename":"/cases/styles.pug","end":{"line":12,"column":16}},"val":"div","args":null}
+{"type":"indent","loc":{"start":{"line":13,"column":1},"filename":"/cases/styles.pug","end":{"line":13,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":13,"column":7},"filename":"/cases/styles.pug","end":{"line":13,"column":10}},"val":"div"}
+{"type":"&attributes","loc":{"start":{"line":13,"column":10},"filename":"/cases/styles.pug","end":{"line":13,"column":33}},"val":"attributes"}
+{"type":"outdent","loc":{"start":{"line":14,"column":1},"filename":"/cases/styles.pug","end":{"line":14,"column":5}}}
+{"type":"call","loc":{"start":{"line":14,"column":5},"filename":"/cases/styles.pug","end":{"line":14,"column":9}},"val":"div","args":null}
+{"type":"start-attributes","loc":{"start":{"line":14,"column":9},"filename":"/cases/styles.pug","end":{"line":14,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":14,"column":10},"filename":"/cases/styles.pug","end":{"line":14,"column":44}},"name":"style","mustEscape":true,"val":"'color:red;background:green'"}
+{"type":"end-attributes","loc":{"start":{"line":14,"column":44},"filename":"/cases/styles.pug","end":{"line":14,"column":45}}}
+{"type":"newline","loc":{"start":{"line":15,"column":1},"filename":"/cases/styles.pug","end":{"line":15,"column":5}}}
+{"type":"call","loc":{"start":{"line":15,"column":5},"filename":"/cases/styles.pug","end":{"line":15,"column":9}},"val":"div","args":null}
+{"type":"start-attributes","loc":{"start":{"line":15,"column":9},"filename":"/cases/styles.pug","end":{"line":15,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":15,"column":10},"filename":"/cases/styles.pug","end":{"line":15,"column":51}},"name":"style","mustEscape":true,"val":"{color: 'red', background: 'green'}"}
+{"type":"end-attributes","loc":{"start":{"line":15,"column":51},"filename":"/cases/styles.pug","end":{"line":15,"column":52}}}
+{"type":"newline","loc":{"start":{"line":16,"column":1},"filename":"/cases/styles.pug","end":{"line":16,"column":5}}}
+{"type":"code","loc":{"start":{"line":16,"column":5},"filename":"/cases/styles.pug","end":{"line":16,"column":24}},"val":"var bg = 'green';","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":17,"column":1},"filename":"/cases/styles.pug","end":{"line":17,"column":5}}}
+{"type":"tag","loc":{"start":{"line":17,"column":5},"filename":"/cases/styles.pug","end":{"line":17,"column":8}},"val":"div"}
+{"type":"start-attributes","loc":{"start":{"line":17,"column":8},"filename":"/cases/styles.pug","end":{"line":17,"column":9}}}
+{"type":"attribute","loc":{"start":{"line":17,"column":9},"filename":"/cases/styles.pug","end":{"line":17,"column":45}},"name":"style","mustEscape":true,"val":"{color: 'red', background: bg}"}
+{"type":"end-attributes","loc":{"start":{"line":17,"column":45},"filename":"/cases/styles.pug","end":{"line":17,"column":46}}}
+{"type":"newline","loc":{"start":{"line":18,"column":1},"filename":"/cases/styles.pug","end":{"line":18,"column":5}}}
+{"type":"tag","loc":{"start":{"line":18,"column":5},"filename":"/cases/styles.pug","end":{"line":18,"column":8}},"val":"div"}
+{"type":"&attributes","loc":{"start":{"line":18,"column":8},"filename":"/cases/styles.pug","end":{"line":18,"column":60}},"val":"{style: {color: 'red', background: bg}}"}
+{"type":"newline","loc":{"start":{"line":19,"column":1},"filename":"/cases/styles.pug","end":{"line":19,"column":5}}}
+{"type":"call","loc":{"start":{"line":19,"column":5},"filename":"/cases/styles.pug","end":{"line":19,"column":9}},"val":"div","args":null}
+{"type":"start-attributes","loc":{"start":{"line":19,"column":9},"filename":"/cases/styles.pug","end":{"line":19,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":19,"column":10},"filename":"/cases/styles.pug","end":{"line":19,"column":46}},"name":"style","mustEscape":true,"val":"{color: 'red', background: bg}"}
+{"type":"end-attributes","loc":{"start":{"line":19,"column":46},"filename":"/cases/styles.pug","end":{"line":19,"column":47}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/styles.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/styles.pug","end":{"line":20,"column":1}}}
+{"type":"eos","loc":{"start":{"line":20,"column":1},"filename":"/cases/styles.pug","end":{"line":20,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/tag-blocks.tokens.json b/packages/pug-parser/test/cases/tag-blocks.tokens.json
index d1d140c7d..1c250eec1 100644
--- a/packages/pug-parser/test/cases/tag-blocks.tokens.json
+++ b/packages/pug-parser/test/cases/tag-blocks.tokens.json
@@ -1,16 +1,16 @@
-{"type":"comment","line":1,"col":1,"val":" we should not get blocks within blocks","buffer":true}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"div"}
-{"type":"indent","line":3,"col":1,"val":2}
-{"type":"text","line":3,"col":5,"val":"We have sent an e-mail to "}
-{"type":"start-pug-interpolation","line":3,"col":31}
-{"type":"tag","line":3,"col":33,"val":"strong"}
-{"type":"code","line":3,"col":39,"val":"this.props.email","mustEscape":true,"buffer":true}
-{"type":"end-pug-interpolation","line":3,"col":57}
-{"type":"text","line":3,"col":58,"val":".  Please click the link in the e-mail"}
-{"type":"newline","line":4,"col":1}
-{"type":"code","line":4,"col":3,"val":"'  '","mustEscape":true,"buffer":true}
-{"type":"newline","line":5,"col":1}
-{"type":"text","line":5,"col":5,"val":"to confirm your e-mail address."}
-{"type":"outdent","line":6,"col":1}
-{"type":"eos","line":6,"col":1}
\ No newline at end of file
+{"type":"comment","loc":{"start":{"line":1,"column":1},"filename":"/cases/tag-blocks.pug","end":{"line":1,"column":42}},"val":" we should not get blocks within blocks","buffer":true}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/tag-blocks.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/tag-blocks.pug","end":{"line":2,"column":4}},"val":"div"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/tag-blocks.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"text","loc":{"start":{"line":3,"column":5},"filename":"/cases/tag-blocks.pug","end":{"line":3,"column":31}},"val":"We have sent an e-mail to "}
+{"type":"start-pug-interpolation","loc":{"start":{"line":3,"column":31},"filename":"/cases/tag-blocks.pug","end":{"line":3,"column":33}}}
+{"type":"tag","loc":{"start":{"line":3,"column":33},"filename":"/cases/tag-blocks.pug","end":{"line":3,"column":39}},"val":"strong"}
+{"type":"code","loc":{"start":{"line":3,"column":39},"filename":"/cases/tag-blocks.pug","end":{"line":3,"column":57}},"val":"this.props.email","mustEscape":true,"buffer":true}
+{"type":"end-pug-interpolation","loc":{"start":{"line":3,"column":57},"filename":"/cases/tag-blocks.pug","end":{"line":3,"column":58}}}
+{"type":"text","loc":{"start":{"line":3,"column":58},"filename":"/cases/tag-blocks.pug","end":{"line":3,"column":96}},"val":".  Please click the link in the e-mail"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/tag-blocks.pug","end":{"line":4,"column":3}}}
+{"type":"code","loc":{"start":{"line":4,"column":3},"filename":"/cases/tag-blocks.pug","end":{"line":4,"column":9}},"val":"'  '","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/tag-blocks.pug","end":{"line":5,"column":3}}}
+{"type":"text","loc":{"start":{"line":5,"column":5},"filename":"/cases/tag-blocks.pug","end":{"line":5,"column":36}},"val":"to confirm your e-mail address."}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/tag-blocks.pug","end":{"line":6,"column":1}}}
+{"type":"eos","loc":{"start":{"line":6,"column":1},"filename":"/cases/tag-blocks.pug","end":{"line":6,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/tag.interpolation.tokens.json b/packages/pug-parser/test/cases/tag.interpolation.tokens.json
index 37268943c..3dae845f0 100644
--- a/packages/pug-parser/test/cases/tag.interpolation.tokens.json
+++ b/packages/pug-parser/test/cases/tag.interpolation.tokens.json
@@ -1,66 +1,66 @@
-{"type":"newline","line":2,"col":1}
-{"type":"code","line":2,"col":1,"val":"var tag = 'p'","mustEscape":false,"buffer":false}
-{"type":"newline","line":3,"col":1}
-{"type":"code","line":3,"col":1,"val":"var foo = 'bar'","mustEscape":false,"buffer":false}
-{"type":"newline","line":5,"col":1}
-{"type":"interpolation","line":5,"col":1,"val":"tag"}
-{"type":"text","line":5,"col":8,"val":"value"}
-{"type":"newline","line":6,"col":1}
-{"type":"interpolation","line":6,"col":1,"val":"tag"}
-{"type":"start-attributes","line":6,"col":7}
-{"type":"attribute","line":6,"col":8,"name":"foo","val":"'bar'","mustEscape":true}
-{"type":"end-attributes","line":6,"col":17}
-{"type":"text","line":6,"col":19,"val":"value"}
-{"type":"newline","line":7,"col":1}
-{"type":"interpolation","line":7,"col":1,"val":"foo ? 'a' : 'li'"}
-{"type":"start-attributes","line":7,"col":20}
-{"type":"attribute","line":7,"col":21,"name":"something","val":true,"mustEscape":true}
-{"type":"end-attributes","line":7,"col":30}
-{"type":"text","line":7,"col":32,"val":"here"}
-{"type":"newline","line":9,"col":1}
-{"type":"mixin","line":9,"col":1,"val":"item","args":"icon"}
-{"type":"indent","line":10,"col":1,"val":2}
-{"type":"tag","line":10,"col":3,"val":"li"}
-{"type":"indent","line":11,"col":1,"val":4}
-{"type":"if","line":11,"col":5,"val":"attributes.href"}
-{"type":"indent","line":12,"col":1,"val":6}
-{"type":"tag","line":12,"col":7,"val":"a"}
-{"type":"&attributes","line":12,"col":8,"val":"attributes"}
-{"type":"indent","line":13,"col":1,"val":8}
-{"type":"tag","line":13,"col":9,"val":"img"}
-{"type":"class","line":13,"col":12,"val":"icon"}
-{"type":"start-attributes","line":13,"col":17}
-{"type":"attribute","line":13,"col":18,"name":"src","val":"icon","mustEscape":true}
-{"type":"end-attributes","line":13,"col":26}
-{"type":"newline","line":14,"col":1}
-{"type":"mixin-block","line":14,"col":9}
-{"type":"outdent","line":15,"col":7}
-{"type":"outdent","line":15,"col":5}
-{"type":"else","line":15,"col":5,"val":""}
-{"type":"indent","line":16,"col":1,"val":6}
-{"type":"tag","line":16,"col":7,"val":"span"}
-{"type":"&attributes","line":16,"col":11,"val":"attributes"}
-{"type":"indent","line":17,"col":1,"val":8}
-{"type":"tag","line":17,"col":9,"val":"img"}
-{"type":"class","line":17,"col":12,"val":"icon"}
-{"type":"start-attributes","line":17,"col":17}
-{"type":"attribute","line":17,"col":18,"name":"src","val":"icon","mustEscape":true}
-{"type":"end-attributes","line":17,"col":26}
-{"type":"newline","line":18,"col":1}
-{"type":"mixin-block","line":18,"col":9}
-{"type":"outdent","line":20,"col":7}
-{"type":"outdent","line":20,"col":5}
-{"type":"outdent","line":20,"col":3}
-{"type":"outdent","line":20,"col":1}
-{"type":"tag","line":20,"col":1,"val":"ul"}
-{"type":"indent","line":21,"col":1,"val":2}
-{"type":"call","line":21,"col":3,"val":"item","args":"'contact'"}
-{"type":"text","line":21,"col":20,"val":"Contact"}
-{"type":"newline","line":22,"col":1}
-{"type":"call","line":22,"col":3,"val":"item","args":null}
-{"type":"start-attributes","line":22,"col":8}
-{"type":"attribute","line":22,"col":9,"name":"href","val":"'/contact'","mustEscape":true}
-{"type":"end-attributes","line":22,"col":24}
-{"type":"text","line":22,"col":26,"val":"Contact"}
-{"type":"outdent","line":23,"col":1}
-{"type":"eos","line":23,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":2,"column":1}}}
+{"type":"code","loc":{"start":{"line":2,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":2,"column":16}},"val":"var tag = 'p'","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":3,"column":1}}}
+{"type":"code","loc":{"start":{"line":3,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":3,"column":18}},"val":"var foo = 'bar'","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":5,"column":1}}}
+{"type":"interpolation","loc":{"start":{"line":5,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":5,"column":7}},"val":"tag"}
+{"type":"text","loc":{"start":{"line":5,"column":8},"filename":"/cases/tag.interpolation.pug","end":{"line":5,"column":13}},"val":"value"}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":6,"column":1}}}
+{"type":"interpolation","loc":{"start":{"line":6,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":6,"column":7}},"val":"tag"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":7},"filename":"/cases/tag.interpolation.pug","end":{"line":6,"column":8}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":8},"filename":"/cases/tag.interpolation.pug","end":{"line":6,"column":17}},"name":"foo","mustEscape":true,"val":"'bar'"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":17},"filename":"/cases/tag.interpolation.pug","end":{"line":6,"column":18}}}
+{"type":"text","loc":{"start":{"line":6,"column":19},"filename":"/cases/tag.interpolation.pug","end":{"line":6,"column":24}},"val":"value"}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":7,"column":1}}}
+{"type":"interpolation","loc":{"start":{"line":7,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":7,"column":20}},"val":"foo ? 'a' : 'li'"}
+{"type":"start-attributes","loc":{"start":{"line":7,"column":20},"filename":"/cases/tag.interpolation.pug","end":{"line":7,"column":21}}}
+{"type":"attribute","loc":{"start":{"line":7,"column":21},"filename":"/cases/tag.interpolation.pug","end":{"line":7,"column":30}},"name":"something","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":7,"column":30},"filename":"/cases/tag.interpolation.pug","end":{"line":7,"column":31}}}
+{"type":"text","loc":{"start":{"line":7,"column":32},"filename":"/cases/tag.interpolation.pug","end":{"line":7,"column":36}},"val":"here"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":9,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":9,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":9,"column":17}},"val":"item","args":"icon"}
+{"type":"indent","loc":{"start":{"line":10,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":10,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":10,"column":3},"filename":"/cases/tag.interpolation.pug","end":{"line":10,"column":5}},"val":"li"}
+{"type":"indent","loc":{"start":{"line":11,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":11,"column":5}},"val":4}
+{"type":"if","loc":{"start":{"line":11,"column":5},"filename":"/cases/tag.interpolation.pug","end":{"line":11,"column":23}},"val":"attributes.href"}
+{"type":"indent","loc":{"start":{"line":12,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":12,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":12,"column":7},"filename":"/cases/tag.interpolation.pug","end":{"line":12,"column":8}},"val":"a"}
+{"type":"&attributes","loc":{"start":{"line":12,"column":8},"filename":"/cases/tag.interpolation.pug","end":{"line":12,"column":31}},"val":"attributes"}
+{"type":"indent","loc":{"start":{"line":13,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":13,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":13,"column":9},"filename":"/cases/tag.interpolation.pug","end":{"line":13,"column":12}},"val":"img"}
+{"type":"class","loc":{"start":{"line":13,"column":12},"filename":"/cases/tag.interpolation.pug","end":{"line":13,"column":17}},"val":"icon"}
+{"type":"start-attributes","loc":{"start":{"line":13,"column":17},"filename":"/cases/tag.interpolation.pug","end":{"line":13,"column":18}}}
+{"type":"attribute","loc":{"start":{"line":13,"column":18},"filename":"/cases/tag.interpolation.pug","end":{"line":13,"column":26}},"name":"src","mustEscape":true,"val":"icon"}
+{"type":"end-attributes","loc":{"start":{"line":13,"column":26},"filename":"/cases/tag.interpolation.pug","end":{"line":13,"column":27}}}
+{"type":"newline","loc":{"start":{"line":14,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":14,"column":9}}}
+{"type":"mixin-block","loc":{"start":{"line":14,"column":9},"filename":"/cases/tag.interpolation.pug","end":{"line":14,"column":14}}}
+{"type":"outdent","loc":{"start":{"line":15,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":15,"column":5}}}
+{"type":"outdent","loc":{"start":{"line":15,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":15,"column":5}}}
+{"type":"else","loc":{"start":{"line":15,"column":5},"filename":"/cases/tag.interpolation.pug","end":{"line":15,"column":9}},"val":""}
+{"type":"indent","loc":{"start":{"line":16,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":16,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":16,"column":7},"filename":"/cases/tag.interpolation.pug","end":{"line":16,"column":11}},"val":"span"}
+{"type":"&attributes","loc":{"start":{"line":16,"column":11},"filename":"/cases/tag.interpolation.pug","end":{"line":16,"column":34}},"val":"attributes"}
+{"type":"indent","loc":{"start":{"line":17,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":17,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":17,"column":9},"filename":"/cases/tag.interpolation.pug","end":{"line":17,"column":12}},"val":"img"}
+{"type":"class","loc":{"start":{"line":17,"column":12},"filename":"/cases/tag.interpolation.pug","end":{"line":17,"column":17}},"val":"icon"}
+{"type":"start-attributes","loc":{"start":{"line":17,"column":17},"filename":"/cases/tag.interpolation.pug","end":{"line":17,"column":18}}}
+{"type":"attribute","loc":{"start":{"line":17,"column":18},"filename":"/cases/tag.interpolation.pug","end":{"line":17,"column":26}},"name":"src","mustEscape":true,"val":"icon"}
+{"type":"end-attributes","loc":{"start":{"line":17,"column":26},"filename":"/cases/tag.interpolation.pug","end":{"line":17,"column":27}}}
+{"type":"newline","loc":{"start":{"line":18,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":18,"column":9}}}
+{"type":"mixin-block","loc":{"start":{"line":18,"column":9},"filename":"/cases/tag.interpolation.pug","end":{"line":18,"column":14}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":20,"column":1}}}
+{"type":"tag","loc":{"start":{"line":20,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":20,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":21,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":21,"column":3}},"val":2}
+{"type":"call","loc":{"start":{"line":21,"column":3},"filename":"/cases/tag.interpolation.pug","end":{"line":21,"column":19}},"val":"item","args":"'contact'"}
+{"type":"text","loc":{"start":{"line":21,"column":20},"filename":"/cases/tag.interpolation.pug","end":{"line":21,"column":27}},"val":"Contact"}
+{"type":"newline","loc":{"start":{"line":22,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":22,"column":3}}}
+{"type":"call","loc":{"start":{"line":22,"column":3},"filename":"/cases/tag.interpolation.pug","end":{"line":22,"column":8}},"val":"item","args":null}
+{"type":"start-attributes","loc":{"start":{"line":22,"column":8},"filename":"/cases/tag.interpolation.pug","end":{"line":22,"column":9}}}
+{"type":"attribute","loc":{"start":{"line":22,"column":9},"filename":"/cases/tag.interpolation.pug","end":{"line":22,"column":24}},"name":"href","mustEscape":true,"val":"'/contact'"}
+{"type":"end-attributes","loc":{"start":{"line":22,"column":24},"filename":"/cases/tag.interpolation.pug","end":{"line":22,"column":25}}}
+{"type":"text","loc":{"start":{"line":22,"column":26},"filename":"/cases/tag.interpolation.pug","end":{"line":22,"column":33}},"val":"Contact"}
+{"type":"outdent","loc":{"start":{"line":23,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":23,"column":1}}}
+{"type":"eos","loc":{"start":{"line":23,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":23,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/tags.self-closing.tokens.json b/packages/pug-parser/test/cases/tags.self-closing.tokens.json
index 31f573796..adff52082 100644
--- a/packages/pug-parser/test/cases/tags.self-closing.tokens.json
+++ b/packages/pug-parser/test/cases/tags.self-closing.tokens.json
@@ -1,60 +1,60 @@
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":2}
-{"type":"tag","line":3,"col":3,"val":"foo"}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":3,"val":"foo"}
-{"type":"start-attributes","line":4,"col":6}
-{"type":"attribute","line":4,"col":7,"name":"bar","val":"'baz'","mustEscape":true}
-{"type":"end-attributes","line":4,"col":16}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":3,"val":"foo"}
-{"type":"slash","line":5,"col":6}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":3,"val":"foo"}
-{"type":"start-attributes","line":6,"col":6}
-{"type":"attribute","line":6,"col":7,"name":"bar","val":"'baz'","mustEscape":true}
-{"type":"end-attributes","line":6,"col":16}
-{"type":"slash","line":6,"col":17}
-{"type":"newline","line":7,"col":1}
-{"type":"tag","line":7,"col":3,"val":"foo"}
-{"type":"text","line":7,"col":7,"val":"/"}
-{"type":"newline","line":8,"col":1}
-{"type":"tag","line":8,"col":3,"val":"foo"}
-{"type":"start-attributes","line":8,"col":6}
-{"type":"attribute","line":8,"col":7,"name":"bar","val":"'baz'","mustEscape":true}
-{"type":"end-attributes","line":8,"col":16}
-{"type":"text","line":8,"col":18,"val":"/"}
-{"type":"newline","line":9,"col":1}
-{"type":"interpolation","line":9,"col":3,"val":"'foo'"}
-{"type":"slash","line":9,"col":11}
-{"type":"newline","line":10,"col":1}
-{"type":"interpolation","line":10,"col":3,"val":"'foo'"}
-{"type":"start-attributes","line":10,"col":11}
-{"type":"attribute","line":10,"col":12,"name":"bar","val":"'baz'","mustEscape":true}
-{"type":"end-attributes","line":10,"col":21}
-{"type":"slash","line":10,"col":22}
-{"type":"newline","line":11,"col":1}
-{"type":"interpolation","line":11,"col":3,"val":"'foo'"}
-{"type":"text","line":11,"col":12,"val":"/"}
-{"type":"newline","line":12,"col":1}
-{"type":"interpolation","line":12,"col":3,"val":"'foo'"}
-{"type":"start-attributes","line":12,"col":11}
-{"type":"attribute","line":12,"col":12,"name":"bar","val":"'baz'","mustEscape":true}
-{"type":"end-attributes","line":12,"col":21}
-{"type":"text","line":12,"col":23,"val":"/"}
-{"type":"newline","line":13,"col":1}
-{"type":"comment","line":13,"col":3,"val":" can have a single space after them","buffer":false}
-{"type":"newline","line":14,"col":1}
-{"type":"tag","line":14,"col":3,"val":"img"}
-{"type":"text","line":14,"col":6,"val":" "}
-{"type":"newline","line":15,"col":1}
-{"type":"comment","line":15,"col":3,"val":" can have lots of white space after them","buffer":false}
-{"type":"newline","line":16,"col":1}
-{"type":"tag","line":16,"col":3,"val":"img"}
-{"type":"text","line":16,"col":7,"val":"   "}
-{"type":"newline","line":17,"col":1}
-{"type":"interpolation","line":17,"col":3,"val":"\n    'foo'\n  "}
-{"type":"slash","line":19,"col":4}
-{"type":"outdent","line":20,"col":1}
-{"type":"eos","line":20,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":2,"column":5}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":3,"column":6}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":4,"column":3}}}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":4,"column":6}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":6},"filename":"/cases/tags.self-closing.pug","end":{"line":4,"column":7}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":7},"filename":"/cases/tags.self-closing.pug","end":{"line":4,"column":16}},"name":"bar","mustEscape":true,"val":"'baz'"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":16},"filename":"/cases/tags.self-closing.pug","end":{"line":4,"column":17}}}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":5,"column":3}}}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":5,"column":6}},"val":"foo"}
+{"type":"slash","loc":{"start":{"line":5,"column":6},"filename":"/cases/tags.self-closing.pug","end":{"line":5,"column":7}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":6,"column":3}}}
+{"type":"tag","loc":{"start":{"line":6,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":6,"column":6}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":6},"filename":"/cases/tags.self-closing.pug","end":{"line":6,"column":7}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":7},"filename":"/cases/tags.self-closing.pug","end":{"line":6,"column":16}},"name":"bar","mustEscape":true,"val":"'baz'"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":16},"filename":"/cases/tags.self-closing.pug","end":{"line":6,"column":17}}}
+{"type":"slash","loc":{"start":{"line":6,"column":17},"filename":"/cases/tags.self-closing.pug","end":{"line":6,"column":18}}}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":7,"column":3}}}
+{"type":"tag","loc":{"start":{"line":7,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":7,"column":6}},"val":"foo"}
+{"type":"text","loc":{"start":{"line":7,"column":7},"filename":"/cases/tags.self-closing.pug","end":{"line":7,"column":8}},"val":"/"}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":8,"column":3}}}
+{"type":"tag","loc":{"start":{"line":8,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":8,"column":6}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":8,"column":6},"filename":"/cases/tags.self-closing.pug","end":{"line":8,"column":7}}}
+{"type":"attribute","loc":{"start":{"line":8,"column":7},"filename":"/cases/tags.self-closing.pug","end":{"line":8,"column":16}},"name":"bar","mustEscape":true,"val":"'baz'"}
+{"type":"end-attributes","loc":{"start":{"line":8,"column":16},"filename":"/cases/tags.self-closing.pug","end":{"line":8,"column":17}}}
+{"type":"text","loc":{"start":{"line":8,"column":18},"filename":"/cases/tags.self-closing.pug","end":{"line":8,"column":19}},"val":"/"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":9,"column":3}}}
+{"type":"interpolation","loc":{"start":{"line":9,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":9,"column":11}},"val":"'foo'"}
+{"type":"slash","loc":{"start":{"line":9,"column":11},"filename":"/cases/tags.self-closing.pug","end":{"line":9,"column":12}}}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":10,"column":3}}}
+{"type":"interpolation","loc":{"start":{"line":10,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":10,"column":11}},"val":"'foo'"}
+{"type":"start-attributes","loc":{"start":{"line":10,"column":11},"filename":"/cases/tags.self-closing.pug","end":{"line":10,"column":12}}}
+{"type":"attribute","loc":{"start":{"line":10,"column":12},"filename":"/cases/tags.self-closing.pug","end":{"line":10,"column":21}},"name":"bar","mustEscape":true,"val":"'baz'"}
+{"type":"end-attributes","loc":{"start":{"line":10,"column":21},"filename":"/cases/tags.self-closing.pug","end":{"line":10,"column":22}}}
+{"type":"slash","loc":{"start":{"line":10,"column":22},"filename":"/cases/tags.self-closing.pug","end":{"line":10,"column":23}}}
+{"type":"newline","loc":{"start":{"line":11,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":11,"column":3}}}
+{"type":"interpolation","loc":{"start":{"line":11,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":11,"column":11}},"val":"'foo'"}
+{"type":"text","loc":{"start":{"line":11,"column":12},"filename":"/cases/tags.self-closing.pug","end":{"line":11,"column":13}},"val":"/"}
+{"type":"newline","loc":{"start":{"line":12,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":12,"column":3}}}
+{"type":"interpolation","loc":{"start":{"line":12,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":12,"column":11}},"val":"'foo'"}
+{"type":"start-attributes","loc":{"start":{"line":12,"column":11},"filename":"/cases/tags.self-closing.pug","end":{"line":12,"column":12}}}
+{"type":"attribute","loc":{"start":{"line":12,"column":12},"filename":"/cases/tags.self-closing.pug","end":{"line":12,"column":21}},"name":"bar","mustEscape":true,"val":"'baz'"}
+{"type":"end-attributes","loc":{"start":{"line":12,"column":21},"filename":"/cases/tags.self-closing.pug","end":{"line":12,"column":22}}}
+{"type":"text","loc":{"start":{"line":12,"column":23},"filename":"/cases/tags.self-closing.pug","end":{"line":12,"column":24}},"val":"/"}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":13,"column":3}}}
+{"type":"comment","loc":{"start":{"line":13,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":13,"column":41}},"val":" can have a single space after them","buffer":false}
+{"type":"newline","loc":{"start":{"line":14,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":14,"column":3}}}
+{"type":"tag","loc":{"start":{"line":14,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":14,"column":6}},"val":"img"}
+{"type":"text","loc":{"start":{"line":14,"column":6},"filename":"/cases/tags.self-closing.pug","end":{"line":14,"column":7}},"val":" "}
+{"type":"newline","loc":{"start":{"line":15,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":15,"column":3}}}
+{"type":"comment","loc":{"start":{"line":15,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":15,"column":46}},"val":" can have lots of white space after them","buffer":false}
+{"type":"newline","loc":{"start":{"line":16,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":16,"column":3}}}
+{"type":"tag","loc":{"start":{"line":16,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":16,"column":6}},"val":"img"}
+{"type":"text","loc":{"start":{"line":16,"column":7},"filename":"/cases/tags.self-closing.pug","end":{"line":16,"column":10}},"val":"   "}
+{"type":"newline","loc":{"start":{"line":17,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":17,"column":3}}}
+{"type":"interpolation","loc":{"start":{"line":17,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":19,"column":4}},"val":"\n    'foo'\n  "}
+{"type":"slash","loc":{"start":{"line":19,"column":4},"filename":"/cases/tags.self-closing.pug","end":{"line":19,"column":5}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":20,"column":1}}}
+{"type":"eos","loc":{"start":{"line":20,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":20,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/template.tokens.json b/packages/pug-parser/test/cases/template.tokens.json
index 20a1c4c9b..183caac5b 100644
--- a/packages/pug-parser/test/cases/template.tokens.json
+++ b/packages/pug-parser/test/cases/template.tokens.json
@@ -1,27 +1,27 @@
-{"type":"tag","line":1,"col":1,"val":"script"}
-{"type":"start-attributes","line":1,"col":7}
-{"type":"attribute","line":1,"col":8,"name":"type","val":"'text/x-template'","mustEscape":true}
-{"type":"end-attributes","line":1,"col":30}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"article"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"h2"}
-{"type":"text","line":3,"col":8,"val":"{{title}}"}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":5,"val":"p"}
-{"type":"text","line":4,"col":7,"val":"{{description}}"}
-{"type":"outdent","line":6,"col":3}
-{"type":"outdent","line":6,"col":1}
-{"type":"tag","line":6,"col":1,"val":"script"}
-{"type":"start-attributes","line":6,"col":7}
-{"type":"attribute","line":6,"col":8,"name":"type","val":"'text/x-template'","mustEscape":true}
-{"type":"end-attributes","line":6,"col":30}
-{"type":"dot","line":6,"col":31}
-{"type":"start-pipeless-text","line":6,"col":32}
-{"type":"text","line":7,"col":3,"val":"article"}
-{"type":"newline","line":8,"col":1}
-{"type":"text","line":8,"col":3,"val":"  h2 {{title}}"}
-{"type":"newline","line":9,"col":1}
-{"type":"text","line":9,"col":3,"val":"  p {{description}}"}
-{"type":"end-pipeless-text","line":9,"col":22}
-{"type":"eos","line":9,"col":22}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/template.pug","end":{"line":1,"column":7}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":1,"column":7},"filename":"/cases/template.pug","end":{"line":1,"column":8}}}
+{"type":"attribute","loc":{"start":{"line":1,"column":8},"filename":"/cases/template.pug","end":{"line":1,"column":30}},"name":"type","mustEscape":true,"val":"'text/x-template'"}
+{"type":"end-attributes","loc":{"start":{"line":1,"column":30},"filename":"/cases/template.pug","end":{"line":1,"column":31}}}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/template.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/template.pug","end":{"line":2,"column":10}},"val":"article"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/template.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/template.pug","end":{"line":3,"column":7}},"val":"h2"}
+{"type":"text","loc":{"start":{"line":3,"column":8},"filename":"/cases/template.pug","end":{"line":3,"column":17}},"val":"{{title}}"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/template.pug","end":{"line":4,"column":5}}}
+{"type":"tag","loc":{"start":{"line":4,"column":5},"filename":"/cases/template.pug","end":{"line":4,"column":6}},"val":"p"}
+{"type":"text","loc":{"start":{"line":4,"column":7},"filename":"/cases/template.pug","end":{"line":4,"column":22}},"val":"{{description}}"}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/template.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/template.pug","end":{"line":6,"column":1}}}
+{"type":"tag","loc":{"start":{"line":6,"column":1},"filename":"/cases/template.pug","end":{"line":6,"column":7}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":7},"filename":"/cases/template.pug","end":{"line":6,"column":8}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":8},"filename":"/cases/template.pug","end":{"line":6,"column":30}},"name":"type","mustEscape":true,"val":"'text/x-template'"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":30},"filename":"/cases/template.pug","end":{"line":6,"column":31}}}
+{"type":"dot","loc":{"start":{"line":6,"column":31},"filename":"/cases/template.pug","end":{"line":6,"column":32}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":6,"column":32},"filename":"/cases/template.pug","end":{"line":6,"column":32}}}
+{"type":"text","loc":{"start":{"line":7,"column":3},"filename":"/cases/template.pug","end":{"line":7,"column":10}},"val":"article"}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/template.pug","end":{"line":8,"column":3}}}
+{"type":"text","loc":{"start":{"line":8,"column":3},"filename":"/cases/template.pug","end":{"line":8,"column":17}},"val":"  h2 {{title}}"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/template.pug","end":{"line":9,"column":3}}}
+{"type":"text","loc":{"start":{"line":9,"column":3},"filename":"/cases/template.pug","end":{"line":9,"column":22}},"val":"  p {{description}}"}
+{"type":"end-pipeless-text","loc":{"start":{"line":9,"column":22},"filename":"/cases/template.pug","end":{"line":9,"column":22}}}
+{"type":"eos","loc":{"start":{"line":9,"column":22},"filename":"/cases/template.pug","end":{"line":9,"column":22}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/text-block.tokens.json b/packages/pug-parser/test/cases/text-block.tokens.json
index 1c12f99aa..d6d0bdab4 100644
--- a/packages/pug-parser/test/cases/text-block.tokens.json
+++ b/packages/pug-parser/test/cases/text-block.tokens.json
@@ -1,20 +1,20 @@
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"label"}
-{"type":"text","line":2,"col":7,"val":"Username:"}
-{"type":"indent","line":3,"col":1,"val":2}
-{"type":"tag","line":3,"col":3,"val":"input"}
-{"type":"start-attributes","line":3,"col":8}
-{"type":"attribute","line":3,"col":9,"name":"type","val":"'text'","mustEscape":true}
-{"type":"attribute","line":3,"col":22,"name":"name","val":"'user[name]'","mustEscape":true}
-{"type":"end-attributes","line":3,"col":39}
-{"type":"outdent","line":5,"col":1}
-{"type":"tag","line":5,"col":1,"val":"label"}
-{"type":"text","line":5,"col":7,"val":"Password:"}
-{"type":"indent","line":6,"col":1,"val":2}
-{"type":"tag","line":6,"col":3,"val":"input"}
-{"type":"start-attributes","line":6,"col":8}
-{"type":"attribute","line":6,"col":9,"name":"type","val":"'text'","mustEscape":true}
-{"type":"attribute","line":6,"col":22,"name":"name","val":"'user[pass]'","mustEscape":true}
-{"type":"end-attributes","line":6,"col":39}
-{"type":"outdent","line":6,"col":40}
-{"type":"eos","line":6,"col":40}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/text-block.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/text-block.pug","end":{"line":2,"column":6}},"val":"label"}
+{"type":"text","loc":{"start":{"line":2,"column":7},"filename":"/cases/text-block.pug","end":{"line":2,"column":16}},"val":"Username:"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/text-block.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/text-block.pug","end":{"line":3,"column":8}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":8},"filename":"/cases/text-block.pug","end":{"line":3,"column":9}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":9},"filename":"/cases/text-block.pug","end":{"line":3,"column":20}},"name":"type","mustEscape":true,"val":"'text'"}
+{"type":"attribute","loc":{"start":{"line":3,"column":22},"filename":"/cases/text-block.pug","end":{"line":3,"column":39}},"name":"name","mustEscape":true,"val":"'user[name]'"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":39},"filename":"/cases/text-block.pug","end":{"line":3,"column":40}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/text-block.pug","end":{"line":5,"column":1}}}
+{"type":"tag","loc":{"start":{"line":5,"column":1},"filename":"/cases/text-block.pug","end":{"line":5,"column":6}},"val":"label"}
+{"type":"text","loc":{"start":{"line":5,"column":7},"filename":"/cases/text-block.pug","end":{"line":5,"column":16}},"val":"Password:"}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/text-block.pug","end":{"line":6,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":6,"column":3},"filename":"/cases/text-block.pug","end":{"line":6,"column":8}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":8},"filename":"/cases/text-block.pug","end":{"line":6,"column":9}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":9},"filename":"/cases/text-block.pug","end":{"line":6,"column":20}},"name":"type","mustEscape":true,"val":"'text'"}
+{"type":"attribute","loc":{"start":{"line":6,"column":22},"filename":"/cases/text-block.pug","end":{"line":6,"column":39}},"name":"name","mustEscape":true,"val":"'user[pass]'"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":39},"filename":"/cases/text-block.pug","end":{"line":6,"column":40}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":40},"filename":"/cases/text-block.pug","end":{"line":6,"column":40}}}
+{"type":"eos","loc":{"start":{"line":6,"column":40},"filename":"/cases/text-block.pug","end":{"line":6,"column":40}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/text.tokens.json b/packages/pug-parser/test/cases/text.tokens.json
index 50553de04..18d4059fc 100644
--- a/packages/pug-parser/test/cases/text.tokens.json
+++ b/packages/pug-parser/test/cases/text.tokens.json
@@ -1,91 +1,91 @@
-{"type":"tag","line":1,"col":1,"val":"option"}
-{"type":"start-attributes","line":1,"col":7}
-{"type":"attribute","line":1,"col":8,"name":"value","val":"''","mustEscape":true}
-{"type":"end-attributes","line":1,"col":16}
-{"type":"text","line":1,"col":18,"val":"-- (selected) --"}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"p"}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":1,"val":"p"}
-{"type":"dot","line":5,"col":2}
-{"type":"newline","line":7,"col":1}
-{"type":"tag","line":7,"col":1,"val":"p"}
-{"type":"indent","line":8,"col":1,"val":2}
-{"type":"text","line":8,"col":5,"val":"foo"}
-{"type":"newline","line":9,"col":1}
-{"type":"text","line":9,"col":5,"val":"bar"}
-{"type":"newline","line":10,"col":1}
-{"type":"text","line":10,"col":5,"val":"baz"}
-{"type":"outdent","line":12,"col":1}
-{"type":"tag","line":12,"col":1,"val":"p"}
-{"type":"dot","line":12,"col":2}
-{"type":"start-pipeless-text","line":12,"col":3}
-{"type":"text","line":13,"col":3,"val":"foo"}
-{"type":"newline","line":14,"col":1}
-{"type":"text","line":14,"col":3,"val":""}
-{"type":"newline","line":15,"col":1}
-{"type":"text","line":15,"col":3,"val":""}
-{"type":"newline","line":16,"col":1}
-{"type":"text","line":16,"col":3,"val":"bar"}
-{"type":"newline","line":17,"col":1}
-{"type":"text","line":17,"col":3,"val":"baz"}
-{"type":"newline","line":18,"col":1}
-{"type":"text","line":18,"col":3,"val":""}
-{"type":"end-pipeless-text","line":18,"col":3}
-{"type":"newline","line":19,"col":1}
-{"type":"dot","line":19,"col":1}
-{"type":"newline","line":21,"col":1}
-{"type":"dot","line":21,"col":1}
-{"type":"start-pipeless-text","line":21,"col":2}
-{"type":"text","line":22,"col":3,"val":"foo"}
-{"type":"newline","line":23,"col":1}
-{"type":"text","line":23,"col":3,"val":""}
-{"type":"newline","line":24,"col":1}
-{"type":"text","line":24,"col":3,"val":""}
-{"type":"newline","line":25,"col":1}
-{"type":"text","line":25,"col":3,"val":"bar"}
-{"type":"newline","line":26,"col":1}
-{"type":"text","line":26,"col":3,"val":"baz"}
-{"type":"newline","line":27,"col":1}
-{"type":"text","line":27,"col":3,"val":""}
-{"type":"end-pipeless-text","line":27,"col":3}
-{"type":"newline","line":28,"col":1}
-{"type":"tag","line":28,"col":1,"val":"pre"}
-{"type":"indent","line":29,"col":1,"val":2}
-{"type":"text","line":29,"col":5,"val":"foo"}
-{"type":"newline","line":30,"col":1}
-{"type":"text","line":30,"col":5,"val":"  bar"}
-{"type":"newline","line":31,"col":1}
-{"type":"text","line":31,"col":5,"val":"    baz"}
-{"type":"newline","line":32,"col":1}
-{"type":"text","line":32,"col":5,"val":"."}
-{"type":"outdent","line":34,"col":1}
-{"type":"tag","line":34,"col":1,"val":"pre"}
-{"type":"dot","line":34,"col":4}
-{"type":"start-pipeless-text","line":34,"col":5}
-{"type":"text","line":35,"col":3,"val":"foo"}
-{"type":"newline","line":36,"col":1}
-{"type":"text","line":36,"col":3,"val":"  bar"}
-{"type":"newline","line":37,"col":1}
-{"type":"text","line":37,"col":3,"val":"    baz"}
-{"type":"newline","line":38,"col":1}
-{"type":"text","line":38,"col":3,"val":"."}
-{"type":"newline","line":39,"col":1}
-{"type":"text","line":39,"col":3,"val":""}
-{"type":"end-pipeless-text","line":39,"col":3}
-{"type":"newline","line":40,"col":1}
-{"type":"dot","line":40,"col":1}
-{"type":"start-pipeless-text","line":40,"col":2}
-{"type":"text","line":41,"col":3,"val":"foo"}
-{"type":"newline","line":42,"col":1}
-{"type":"text","line":42,"col":3,"val":"  bar"}
-{"type":"newline","line":43,"col":1}
-{"type":"text","line":43,"col":3,"val":"    baz"}
-{"type":"newline","line":44,"col":1}
-{"type":"text","line":44,"col":3,"val":"."}
-{"type":"end-pipeless-text","line":44,"col":4}
-{"type":"newline","line":45,"col": 1}
-{"type":"text","line":45,"col": 3,"val":"foo"}
-{"type":"newline","line":46,"col": 1}
-{"type":"interpolated-code","line":46,"col":3,"val":"bar","mustEscape":true,"buffer":true}
-{"type":"eos","line":46,"col":9}
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/text.pug","end":{"line":1,"column":7}},"val":"option"}
+{"type":"start-attributes","loc":{"start":{"line":1,"column":7},"filename":"/cases/text.pug","end":{"line":1,"column":8}}}
+{"type":"attribute","loc":{"start":{"line":1,"column":8},"filename":"/cases/text.pug","end":{"line":1,"column":16}},"name":"value","mustEscape":true,"val":"''"}
+{"type":"end-attributes","loc":{"start":{"line":1,"column":16},"filename":"/cases/text.pug","end":{"line":1,"column":17}}}
+{"type":"text","loc":{"start":{"line":1,"column":18},"filename":"/cases/text.pug","end":{"line":1,"column":34}},"val":"-- (selected) --"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/text.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/text.pug","end":{"line":3,"column":2}},"val":"p"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/text.pug","end":{"line":5,"column":1}}}
+{"type":"tag","loc":{"start":{"line":5,"column":1},"filename":"/cases/text.pug","end":{"line":5,"column":2}},"val":"p"}
+{"type":"dot","loc":{"start":{"line":5,"column":2},"filename":"/cases/text.pug","end":{"line":5,"column":3}}}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/text.pug","end":{"line":7,"column":1}}}
+{"type":"tag","loc":{"start":{"line":7,"column":1},"filename":"/cases/text.pug","end":{"line":7,"column":2}},"val":"p"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/text.pug","end":{"line":8,"column":3}},"val":2}
+{"type":"text","loc":{"start":{"line":8,"column":5},"filename":"/cases/text.pug","end":{"line":8,"column":8}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/text.pug","end":{"line":9,"column":3}}}
+{"type":"text","loc":{"start":{"line":9,"column":5},"filename":"/cases/text.pug","end":{"line":9,"column":8}},"val":"bar"}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/text.pug","end":{"line":10,"column":3}}}
+{"type":"text","loc":{"start":{"line":10,"column":4},"filename":"/cases/text.pug","end":{"line":10,"column":4}},"val":""}
+{"type":"newline","loc":{"start":{"line":11,"column":1},"filename":"/cases/text.pug","end":{"line":11,"column":3}}}
+{"type":"text","loc":{"start":{"line":11,"column":4},"filename":"/cases/text.pug","end":{"line":11,"column":5}},"val":" "}
+{"type":"newline","loc":{"start":{"line":12,"column":1},"filename":"/cases/text.pug","end":{"line":12,"column":3}}}
+{"type":"text","loc":{"start":{"line":12,"column":5},"filename":"/cases/text.pug","end":{"line":12,"column":8}},"val":"baz"}
+{"type":"outdent","loc":{"start":{"line":14,"column":1},"filename":"/cases/text.pug","end":{"line":14,"column":1}}}
+{"type":"tag","loc":{"start":{"line":14,"column":1},"filename":"/cases/text.pug","end":{"line":14,"column":2}},"val":"p"}
+{"type":"dot","loc":{"start":{"line":14,"column":2},"filename":"/cases/text.pug","end":{"line":14,"column":3}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":14,"column":3},"filename":"/cases/text.pug","end":{"line":14,"column":3}}}
+{"type":"text","loc":{"start":{"line":15,"column":3},"filename":"/cases/text.pug","end":{"line":15,"column":6}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":16,"column":1},"filename":"/cases/text.pug","end":{"line":16,"column":1}}}
+{"type":"text","loc":{"start":{"line":16,"column":1},"filename":"/cases/text.pug","end":{"line":16,"column":1}},"val":""}
+{"type":"newline","loc":{"start":{"line":17,"column":1},"filename":"/cases/text.pug","end":{"line":17,"column":1}}}
+{"type":"text","loc":{"start":{"line":17,"column":1},"filename":"/cases/text.pug","end":{"line":17,"column":1}},"val":""}
+{"type":"newline","loc":{"start":{"line":18,"column":1},"filename":"/cases/text.pug","end":{"line":18,"column":3}}}
+{"type":"text","loc":{"start":{"line":18,"column":3},"filename":"/cases/text.pug","end":{"line":18,"column":6}},"val":"bar"}
+{"type":"newline","loc":{"start":{"line":19,"column":1},"filename":"/cases/text.pug","end":{"line":19,"column":3}}}
+{"type":"text","loc":{"start":{"line":19,"column":3},"filename":"/cases/text.pug","end":{"line":19,"column":6}},"val":"baz"}
+{"type":"newline","loc":{"start":{"line":20,"column":1},"filename":"/cases/text.pug","end":{"line":20,"column":1}}}
+{"type":"text","loc":{"start":{"line":20,"column":1},"filename":"/cases/text.pug","end":{"line":20,"column":1}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":20,"column":1},"filename":"/cases/text.pug","end":{"line":20,"column":1}}}
+{"type":"newline","loc":{"start":{"line":21,"column":1},"filename":"/cases/text.pug","end":{"line":21,"column":1}}}
+{"type":"dot","loc":{"start":{"line":21,"column":1},"filename":"/cases/text.pug","end":{"line":21,"column":2}}}
+{"type":"newline","loc":{"start":{"line":23,"column":1},"filename":"/cases/text.pug","end":{"line":23,"column":1}}}
+{"type":"dot","loc":{"start":{"line":23,"column":1},"filename":"/cases/text.pug","end":{"line":23,"column":2}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":23,"column":2},"filename":"/cases/text.pug","end":{"line":23,"column":2}}}
+{"type":"text","loc":{"start":{"line":24,"column":3},"filename":"/cases/text.pug","end":{"line":24,"column":6}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":25,"column":1},"filename":"/cases/text.pug","end":{"line":25,"column":1}}}
+{"type":"text","loc":{"start":{"line":25,"column":1},"filename":"/cases/text.pug","end":{"line":25,"column":1}},"val":""}
+{"type":"newline","loc":{"start":{"line":26,"column":1},"filename":"/cases/text.pug","end":{"line":26,"column":1}}}
+{"type":"text","loc":{"start":{"line":26,"column":1},"filename":"/cases/text.pug","end":{"line":26,"column":1}},"val":""}
+{"type":"newline","loc":{"start":{"line":27,"column":1},"filename":"/cases/text.pug","end":{"line":27,"column":3}}}
+{"type":"text","loc":{"start":{"line":27,"column":3},"filename":"/cases/text.pug","end":{"line":27,"column":6}},"val":"bar"}
+{"type":"newline","loc":{"start":{"line":28,"column":1},"filename":"/cases/text.pug","end":{"line":28,"column":3}}}
+{"type":"text","loc":{"start":{"line":28,"column":3},"filename":"/cases/text.pug","end":{"line":28,"column":6}},"val":"baz"}
+{"type":"newline","loc":{"start":{"line":29,"column":1},"filename":"/cases/text.pug","end":{"line":29,"column":1}}}
+{"type":"text","loc":{"start":{"line":29,"column":1},"filename":"/cases/text.pug","end":{"line":29,"column":1}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":29,"column":1},"filename":"/cases/text.pug","end":{"line":29,"column":1}}}
+{"type":"newline","loc":{"start":{"line":30,"column":1},"filename":"/cases/text.pug","end":{"line":30,"column":1}}}
+{"type":"tag","loc":{"start":{"line":30,"column":1},"filename":"/cases/text.pug","end":{"line":30,"column":4}},"val":"pre"}
+{"type":"indent","loc":{"start":{"line":31,"column":1},"filename":"/cases/text.pug","end":{"line":31,"column":3}},"val":2}
+{"type":"text","loc":{"start":{"line":31,"column":5},"filename":"/cases/text.pug","end":{"line":31,"column":8}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":32,"column":1},"filename":"/cases/text.pug","end":{"line":32,"column":3}}}
+{"type":"text","loc":{"start":{"line":32,"column":5},"filename":"/cases/text.pug","end":{"line":32,"column":10}},"val":"  bar"}
+{"type":"newline","loc":{"start":{"line":33,"column":1},"filename":"/cases/text.pug","end":{"line":33,"column":3}}}
+{"type":"text","loc":{"start":{"line":33,"column":5},"filename":"/cases/text.pug","end":{"line":33,"column":12}},"val":"    baz"}
+{"type":"newline","loc":{"start":{"line":34,"column":1},"filename":"/cases/text.pug","end":{"line":34,"column":3}}}
+{"type":"text","loc":{"start":{"line":34,"column":5},"filename":"/cases/text.pug","end":{"line":34,"column":6}},"val":"."}
+{"type":"outdent","loc":{"start":{"line":36,"column":1},"filename":"/cases/text.pug","end":{"line":36,"column":1}}}
+{"type":"tag","loc":{"start":{"line":36,"column":1},"filename":"/cases/text.pug","end":{"line":36,"column":4}},"val":"pre"}
+{"type":"dot","loc":{"start":{"line":36,"column":4},"filename":"/cases/text.pug","end":{"line":36,"column":5}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":36,"column":5},"filename":"/cases/text.pug","end":{"line":36,"column":5}}}
+{"type":"text","loc":{"start":{"line":37,"column":3},"filename":"/cases/text.pug","end":{"line":37,"column":6}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":38,"column":1},"filename":"/cases/text.pug","end":{"line":38,"column":3}}}
+{"type":"text","loc":{"start":{"line":38,"column":3},"filename":"/cases/text.pug","end":{"line":38,"column":8}},"val":"  bar"}
+{"type":"newline","loc":{"start":{"line":39,"column":1},"filename":"/cases/text.pug","end":{"line":39,"column":3}}}
+{"type":"text","loc":{"start":{"line":39,"column":3},"filename":"/cases/text.pug","end":{"line":39,"column":10}},"val":"    baz"}
+{"type":"newline","loc":{"start":{"line":40,"column":1},"filename":"/cases/text.pug","end":{"line":40,"column":3}}}
+{"type":"text","loc":{"start":{"line":40,"column":3},"filename":"/cases/text.pug","end":{"line":40,"column":4}},"val":"."}
+{"type":"newline","loc":{"start":{"line":41,"column":1},"filename":"/cases/text.pug","end":{"line":41,"column":1}}}
+{"type":"text","loc":{"start":{"line":41,"column":1},"filename":"/cases/text.pug","end":{"line":41,"column":1}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":41,"column":1},"filename":"/cases/text.pug","end":{"line":41,"column":1}}}
+{"type":"newline","loc":{"start":{"line":42,"column":1},"filename":"/cases/text.pug","end":{"line":42,"column":1}}}
+{"type":"dot","loc":{"start":{"line":42,"column":1},"filename":"/cases/text.pug","end":{"line":42,"column":2}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":42,"column":2},"filename":"/cases/text.pug","end":{"line":42,"column":2}}}
+{"type":"text","loc":{"start":{"line":43,"column":3},"filename":"/cases/text.pug","end":{"line":43,"column":6}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":44,"column":1},"filename":"/cases/text.pug","end":{"line":44,"column":3}}}
+{"type":"text","loc":{"start":{"line":44,"column":3},"filename":"/cases/text.pug","end":{"line":44,"column":8}},"val":"  bar"}
+{"type":"newline","loc":{"start":{"line":45,"column":1},"filename":"/cases/text.pug","end":{"line":45,"column":3}}}
+{"type":"text","loc":{"start":{"line":45,"column":3},"filename":"/cases/text.pug","end":{"line":45,"column":10}},"val":"    baz"}
+{"type":"newline","loc":{"start":{"line":46,"column":1},"filename":"/cases/text.pug","end":{"line":46,"column":3}}}
+{"type":"text","loc":{"start":{"line":46,"column":3},"filename":"/cases/text.pug","end":{"line":46,"column":4}},"val":"."}
+{"type":"end-pipeless-text","loc":{"start":{"line":46,"column":4},"filename":"/cases/text.pug","end":{"line":46,"column":4}}}
+{"type":"eos","loc":{"start":{"line":46,"column":4},"filename":"/cases/text.pug","end":{"line":46,"column":4}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/utf8bom.tokens.json b/packages/pug-parser/test/cases/utf8bom.tokens.json
index 50680b7bf..02ea7b4eb 100644
--- a/packages/pug-parser/test/cases/utf8bom.tokens.json
+++ b/packages/pug-parser/test/cases/utf8bom.tokens.json
@@ -1,4 +1,4 @@
-{"type":"tag","line":1,"col":1,"val":"p"}
-{"type":"text","line":1,"col":3,"val":"\"foo\""}
-{"type":"newline","line":2,"col":1}
-{"type":"eos","line":2,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/utf8bom.pug","end":{"line":1,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":1,"column":3},"filename":"/cases/utf8bom.pug","end":{"line":1,"column":8}},"val":"\"foo\""}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/utf8bom.pug","end":{"line":2,"column":1}}}
+{"type":"eos","loc":{"start":{"line":2,"column":1},"filename":"/cases/utf8bom.pug","end":{"line":2,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/vars.tokens.json b/packages/pug-parser/test/cases/vars.tokens.json
index e9ba1e825..6e145a162 100644
--- a/packages/pug-parser/test/cases/vars.tokens.json
+++ b/packages/pug-parser/test/cases/vars.tokens.json
@@ -1,10 +1,10 @@
-{"type":"code","line":1,"col":1,"val":"var foo = 'bar'","mustEscape":false,"buffer":false}
-{"type":"newline","line":2,"col":1}
-{"type":"code","line":2,"col":1,"val":"var list = [1,2,3]","mustEscape":false,"buffer":false}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"a"}
-{"type":"start-attributes","line":3,"col":2}
-{"type":"attribute","line":3,"col":3,"name":"class","val":"list","mustEscape":true}
-{"type":"attribute","line":3,"col":15,"name":"id","val":"foo","mustEscape":true}
-{"type":"end-attributes","line":3,"col":21}
-{"type":"eos","line":3,"col":22}
\ No newline at end of file
+{"type":"code","loc":{"start":{"line":1,"column":1},"filename":"/cases/vars.pug","end":{"line":1,"column":18}},"val":"var foo = 'bar'","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/vars.pug","end":{"line":2,"column":1}}}
+{"type":"code","loc":{"start":{"line":2,"column":1},"filename":"/cases/vars.pug","end":{"line":2,"column":21}},"val":"var list = [1,2,3]","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/vars.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/vars.pug","end":{"line":3,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":2},"filename":"/cases/vars.pug","end":{"line":3,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":3},"filename":"/cases/vars.pug","end":{"line":3,"column":13}},"name":"class","mustEscape":true,"val":"list"}
+{"type":"attribute","loc":{"start":{"line":3,"column":15},"filename":"/cases/vars.pug","end":{"line":3,"column":21}},"name":"id","mustEscape":true,"val":"foo"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":21},"filename":"/cases/vars.pug","end":{"line":3,"column":22}}}
+{"type":"eos","loc":{"start":{"line":3,"column":22},"filename":"/cases/vars.pug","end":{"line":3,"column":22}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/while.tokens.json b/packages/pug-parser/test/cases/while.tokens.json
index d3ded85a7..72a10293f 100644
--- a/packages/pug-parser/test/cases/while.tokens.json
+++ b/packages/pug-parser/test/cases/while.tokens.json
@@ -1,13 +1,13 @@
-{"type":"code","line":1,"col":1,"val":"var x = 1;","mustEscape":false,"buffer":false}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"ul"}
-{"type":"indent","line":3,"col":1,"val":2}
-{"type":"while","line":3,"col":3,"val":"x < 10"}
-{"type":"indent","line":4,"col":1,"val":4}
-{"type":"code","line":4,"col":5,"val":"x++;","mustEscape":false,"buffer":false}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":5,"val":"li"}
-{"type":"code","line":5,"col":7,"val":"x","mustEscape":true,"buffer":true}
-{"type":"outdent","line":6,"col":3}
-{"type":"outdent","line":6,"col":1}
-{"type":"eos","line":6,"col":1}
\ No newline at end of file
+{"type":"code","loc":{"start":{"line":1,"column":1},"filename":"/cases/while.pug","end":{"line":1,"column":13}},"val":"var x = 1;","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/while.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/while.pug","end":{"line":2,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/while.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"while","loc":{"start":{"line":3,"column":3},"filename":"/cases/while.pug","end":{"line":3,"column":15}},"val":"x < 10"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/while.pug","end":{"line":4,"column":5}},"val":4}
+{"type":"code","loc":{"start":{"line":4,"column":5},"filename":"/cases/while.pug","end":{"line":4,"column":11}},"val":"x++;","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/while.pug","end":{"line":5,"column":5}}}
+{"type":"tag","loc":{"start":{"line":5,"column":5},"filename":"/cases/while.pug","end":{"line":5,"column":7}},"val":"li"}
+{"type":"code","loc":{"start":{"line":5,"column":7},"filename":"/cases/while.pug","end":{"line":5,"column":10}},"val":"x","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/while.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/while.pug","end":{"line":6,"column":1}}}
+{"type":"eos","loc":{"start":{"line":6,"column":1},"filename":"/cases/while.pug","end":{"line":6,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/xml.tokens.json b/packages/pug-parser/test/cases/xml.tokens.json
index 10d93c83e..444a826e5 100644
--- a/packages/pug-parser/test/cases/xml.tokens.json
+++ b/packages/pug-parser/test/cases/xml.tokens.json
@@ -1,11 +1,11 @@
-{"type":"doctype","line":1,"col":1,"val":"xml"}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"category"}
-{"type":"start-attributes","line":2,"col":9}
-{"type":"attribute","line":2,"col":10,"name":"term","val":"'some term'","mustEscape":true}
-{"type":"end-attributes","line":2,"col":26}
-{"type":"slash","line":2,"col":27}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"link"}
-{"type":"text","line":3,"col":6,"val":"http://google.com"}
-{"type":"eos","line":3,"col":23}
\ No newline at end of file
+{"type":"doctype","loc":{"start":{"line":1,"column":1},"filename":"/cases/xml.pug","end":{"line":1,"column":12}},"val":"xml"}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/xml.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/xml.pug","end":{"line":2,"column":9}},"val":"category"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":9},"filename":"/cases/xml.pug","end":{"line":2,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":10},"filename":"/cases/xml.pug","end":{"line":2,"column":26}},"name":"term","mustEscape":true,"val":"'some term'"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":26},"filename":"/cases/xml.pug","end":{"line":2,"column":27}}}
+{"type":"slash","loc":{"start":{"line":2,"column":27},"filename":"/cases/xml.pug","end":{"line":2,"column":28}}}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/xml.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/xml.pug","end":{"line":3,"column":5}},"val":"link"}
+{"type":"text","loc":{"start":{"line":3,"column":6},"filename":"/cases/xml.pug","end":{"line":3,"column":23}},"val":"http://google.com"}
+{"type":"eos","loc":{"start":{"line":3,"column":23},"filename":"/cases/xml.pug","end":{"line":3,"column":23}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/yield-before-conditional-head.tokens.json b/packages/pug-parser/test/cases/yield-before-conditional-head.tokens.json
index d105fc83b..12c29b879 100644
--- a/packages/pug-parser/test/cases/yield-before-conditional-head.tokens.json
+++ b/packages/pug-parser/test/cases/yield-before-conditional-head.tokens.json
@@ -1,18 +1,18 @@
-{"type":"tag","line":1,"col":1,"val":"head"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"script"}
-{"type":"start-attributes","line":2,"col":9}
-{"type":"attribute","line":2,"col":10,"name":"src","val":"'/jquery.js'","mustEscape":true}
-{"type":"end-attributes","line":2,"col":26}
-{"type":"newline","line":3,"col":1}
-{"type":"yield","line":3,"col":3}
-{"type":"newline","line":4,"col":1}
-{"type":"if","line":4,"col":3,"val":"false"}
-{"type":"indent","line":5,"col":1,"val":4}
-{"type":"tag","line":5,"col":5,"val":"script"}
-{"type":"start-attributes","line":5,"col":11}
-{"type":"attribute","line":5,"col":12,"name":"src","val":"'/jquery.ui.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":31}
-{"type":"outdent","line":6,"col":3}
-{"type":"outdent","line":6,"col":1}
-{"type":"eos","line":6,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":1,"column":5}},"val":"head"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":2,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":9},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":2,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":10},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":2,"column":26}},"name":"src","mustEscape":true,"val":"'/jquery.js'"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":26},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":2,"column":27}}}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":3,"column":3}}}
+{"type":"yield","loc":{"start":{"line":3,"column":3},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":3,"column":8}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":4,"column":3}}}
+{"type":"if","loc":{"start":{"line":4,"column":3},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":4,"column":11}},"val":"false"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":5,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":5,"column":5},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":5,"column":11}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":11},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":5,"column":12}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":12},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":5,"column":31}},"name":"src","mustEscape":true,"val":"'/jquery.ui.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":31},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":5,"column":32}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":6,"column":1}}}
+{"type":"eos","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":6,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/yield-before-conditional.tokens.json b/packages/pug-parser/test/cases/yield-before-conditional.tokens.json
index 446087f14..c09c3b3a0 100644
--- a/packages/pug-parser/test/cases/yield-before-conditional.tokens.json
+++ b/packages/pug-parser/test/cases/yield-before-conditional.tokens.json
@@ -1,20 +1,20 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"include","line":3,"col":5}
-{"type":"path","line":3,"col":13,"val":"yield-before-conditional-head.pug"}
-{"type":"indent","line":4,"col":1,"val":6}
-{"type":"tag","line":4,"col":7,"val":"script"}
-{"type":"start-attributes","line":4,"col":13}
-{"type":"attribute","line":4,"col":14,"name":"src","val":"'/caustic.js'","mustEscape":true}
-{"type":"end-attributes","line":4,"col":31}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":7,"val":"script"}
-{"type":"start-attributes","line":5,"col":13}
-{"type":"attribute","line":5,"col":14,"name":"src","val":"'/app.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":27}
-{"type":"outdent","line":6,"col":5}
-{"type":"outdent","line":6,"col":3}
-{"type":"outdent","line":6,"col":1}
-{"type":"eos","line":6,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/yield-before-conditional.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/yield-before-conditional.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/yield-before-conditional.pug","end":{"line":2,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/yield-before-conditional.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"include","loc":{"start":{"line":3,"column":5},"filename":"/cases/yield-before-conditional.pug","end":{"line":3,"column":12}}}
+{"type":"path","loc":{"start":{"line":3,"column":13},"filename":"/cases/yield-before-conditional.pug","end":{"line":3,"column":46}},"val":"yield-before-conditional-head.pug"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/yield-before-conditional.pug","end":{"line":4,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":4,"column":7},"filename":"/cases/yield-before-conditional.pug","end":{"line":4,"column":13}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":13},"filename":"/cases/yield-before-conditional.pug","end":{"line":4,"column":14}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":14},"filename":"/cases/yield-before-conditional.pug","end":{"line":4,"column":31}},"name":"src","mustEscape":true,"val":"'/caustic.js'"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":31},"filename":"/cases/yield-before-conditional.pug","end":{"line":4,"column":32}}}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/yield-before-conditional.pug","end":{"line":5,"column":7}}}
+{"type":"tag","loc":{"start":{"line":5,"column":7},"filename":"/cases/yield-before-conditional.pug","end":{"line":5,"column":13}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":13},"filename":"/cases/yield-before-conditional.pug","end":{"line":5,"column":14}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":14},"filename":"/cases/yield-before-conditional.pug","end":{"line":5,"column":27}},"name":"src","mustEscape":true,"val":"'/app.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":27},"filename":"/cases/yield-before-conditional.pug","end":{"line":5,"column":28}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield-before-conditional.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield-before-conditional.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield-before-conditional.pug","end":{"line":6,"column":1}}}
+{"type":"eos","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield-before-conditional.pug","end":{"line":6,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/yield-head.tokens.json b/packages/pug-parser/test/cases/yield-head.tokens.json
index f443372ef..e70fba79f 100644
--- a/packages/pug-parser/test/cases/yield-head.tokens.json
+++ b/packages/pug-parser/test/cases/yield-head.tokens.json
@@ -1,15 +1,15 @@
-{"type":"tag","line":1,"col":1,"val":"head"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"script"}
-{"type":"start-attributes","line":2,"col":9}
-{"type":"attribute","line":2,"col":10,"name":"src","val":"'/jquery.js'","mustEscape":true}
-{"type":"end-attributes","line":2,"col":26}
-{"type":"newline","line":3,"col":1}
-{"type":"yield","line":3,"col":3}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":3,"val":"script"}
-{"type":"start-attributes","line":4,"col":9}
-{"type":"attribute","line":4,"col":10,"name":"src","val":"'/jquery.ui.js'","mustEscape":true}
-{"type":"end-attributes","line":4,"col":29}
-{"type":"outdent","line":5,"col":1}
-{"type":"eos","line":5,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/yield-head.pug","end":{"line":1,"column":5}},"val":"head"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/yield-head.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/yield-head.pug","end":{"line":2,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":9},"filename":"/cases/yield-head.pug","end":{"line":2,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":10},"filename":"/cases/yield-head.pug","end":{"line":2,"column":26}},"name":"src","mustEscape":true,"val":"'/jquery.js'"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":26},"filename":"/cases/yield-head.pug","end":{"line":2,"column":27}}}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/yield-head.pug","end":{"line":3,"column":3}}}
+{"type":"yield","loc":{"start":{"line":3,"column":3},"filename":"/cases/yield-head.pug","end":{"line":3,"column":8}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/yield-head.pug","end":{"line":4,"column":3}}}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/yield-head.pug","end":{"line":4,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":9},"filename":"/cases/yield-head.pug","end":{"line":4,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":10},"filename":"/cases/yield-head.pug","end":{"line":4,"column":29}},"name":"src","mustEscape":true,"val":"'/jquery.ui.js'"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":29},"filename":"/cases/yield-head.pug","end":{"line":4,"column":30}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/yield-head.pug","end":{"line":5,"column":1}}}
+{"type":"eos","loc":{"start":{"line":5,"column":1},"filename":"/cases/yield-head.pug","end":{"line":5,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/yield-title-head.tokens.json b/packages/pug-parser/test/cases/yield-title-head.tokens.json
index 4736bc0c7..5c41eb490 100644
--- a/packages/pug-parser/test/cases/yield-title-head.tokens.json
+++ b/packages/pug-parser/test/cases/yield-title-head.tokens.json
@@ -1,17 +1,17 @@
-{"type":"tag","line":1,"col":1,"val":"head"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"title"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"yield","line":3,"col":5}
-{"type":"outdent","line":4,"col":3}
-{"type":"tag","line":4,"col":3,"val":"script"}
-{"type":"start-attributes","line":4,"col":9}
-{"type":"attribute","line":4,"col":10,"name":"src","val":"'/jquery.js'","mustEscape":true}
-{"type":"end-attributes","line":4,"col":26}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":3,"val":"script"}
-{"type":"start-attributes","line":5,"col":9}
-{"type":"attribute","line":5,"col":10,"name":"src","val":"'/jquery.ui.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":29}
-{"type":"outdent","line":6,"col":1}
-{"type":"eos","line":6,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/yield-title-head.pug","end":{"line":1,"column":5}},"val":"head"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/yield-title-head.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/yield-title-head.pug","end":{"line":2,"column":8}},"val":"title"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/yield-title-head.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"yield","loc":{"start":{"line":3,"column":5},"filename":"/cases/yield-title-head.pug","end":{"line":3,"column":10}}}
+{"type":"outdent","loc":{"start":{"line":4,"column":1},"filename":"/cases/yield-title-head.pug","end":{"line":4,"column":3}}}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/yield-title-head.pug","end":{"line":4,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":9},"filename":"/cases/yield-title-head.pug","end":{"line":4,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":10},"filename":"/cases/yield-title-head.pug","end":{"line":4,"column":26}},"name":"src","mustEscape":true,"val":"'/jquery.js'"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":26},"filename":"/cases/yield-title-head.pug","end":{"line":4,"column":27}}}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/yield-title-head.pug","end":{"line":5,"column":3}}}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/yield-title-head.pug","end":{"line":5,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":9},"filename":"/cases/yield-title-head.pug","end":{"line":5,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":10},"filename":"/cases/yield-title-head.pug","end":{"line":5,"column":29}},"name":"src","mustEscape":true,"val":"'/jquery.ui.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":29},"filename":"/cases/yield-title-head.pug","end":{"line":5,"column":30}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield-title-head.pug","end":{"line":6,"column":1}}}
+{"type":"eos","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield-title-head.pug","end":{"line":6,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/yield-title.tokens.json b/packages/pug-parser/test/cases/yield-title.tokens.json
index d8ab522ca..bfba33371 100644
--- a/packages/pug-parser/test/cases/yield-title.tokens.json
+++ b/packages/pug-parser/test/cases/yield-title.tokens.json
@@ -1,12 +1,12 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"include","line":3,"col":5}
-{"type":"path","line":3,"col":13,"val":"yield-title-head.pug"}
-{"type":"indent","line":4,"col":1,"val":6}
-{"type":"text","line":4,"col":9,"val":"My Title"}
-{"type":"outdent","line":5,"col":5}
-{"type":"outdent","line":5,"col":3}
-{"type":"outdent","line":5,"col":1}
-{"type":"eos","line":5,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/yield-title.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/yield-title.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/yield-title.pug","end":{"line":2,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/yield-title.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"include","loc":{"start":{"line":3,"column":5},"filename":"/cases/yield-title.pug","end":{"line":3,"column":12}}}
+{"type":"path","loc":{"start":{"line":3,"column":13},"filename":"/cases/yield-title.pug","end":{"line":3,"column":33}},"val":"yield-title-head.pug"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/yield-title.pug","end":{"line":4,"column":7}},"val":6}
+{"type":"text","loc":{"start":{"line":4,"column":9},"filename":"/cases/yield-title.pug","end":{"line":4,"column":17}},"val":"My Title"}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/yield-title.pug","end":{"line":5,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/yield-title.pug","end":{"line":5,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/yield-title.pug","end":{"line":5,"column":1}}}
+{"type":"eos","loc":{"start":{"line":5,"column":1},"filename":"/cases/yield-title.pug","end":{"line":5,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/yield.tokens.json b/packages/pug-parser/test/cases/yield.tokens.json
index 9240a0193..26e546499 100644
--- a/packages/pug-parser/test/cases/yield.tokens.json
+++ b/packages/pug-parser/test/cases/yield.tokens.json
@@ -1,20 +1,20 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"include","line":3,"col":5}
-{"type":"path","line":3,"col":13,"val":"yield-head.pug"}
-{"type":"indent","line":4,"col":1,"val":6}
-{"type":"tag","line":4,"col":7,"val":"script"}
-{"type":"start-attributes","line":4,"col":13}
-{"type":"attribute","line":4,"col":14,"name":"src","val":"'/caustic.js'","mustEscape":true}
-{"type":"end-attributes","line":4,"col":31}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":7,"val":"script"}
-{"type":"start-attributes","line":5,"col":13}
-{"type":"attribute","line":5,"col":14,"name":"src","val":"'/app.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":27}
-{"type":"outdent","line":6,"col":5}
-{"type":"outdent","line":6,"col":3}
-{"type":"outdent","line":6,"col":1}
-{"type":"eos","line":6,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/yield.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/yield.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/yield.pug","end":{"line":2,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/yield.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"include","loc":{"start":{"line":3,"column":5},"filename":"/cases/yield.pug","end":{"line":3,"column":12}}}
+{"type":"path","loc":{"start":{"line":3,"column":13},"filename":"/cases/yield.pug","end":{"line":3,"column":27}},"val":"yield-head.pug"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/yield.pug","end":{"line":4,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":4,"column":7},"filename":"/cases/yield.pug","end":{"line":4,"column":13}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":13},"filename":"/cases/yield.pug","end":{"line":4,"column":14}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":14},"filename":"/cases/yield.pug","end":{"line":4,"column":31}},"name":"src","mustEscape":true,"val":"'/caustic.js'"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":31},"filename":"/cases/yield.pug","end":{"line":4,"column":32}}}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/yield.pug","end":{"line":5,"column":7}}}
+{"type":"tag","loc":{"start":{"line":5,"column":7},"filename":"/cases/yield.pug","end":{"line":5,"column":13}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":13},"filename":"/cases/yield.pug","end":{"line":5,"column":14}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":14},"filename":"/cases/yield.pug","end":{"line":5,"column":27}},"name":"src","mustEscape":true,"val":"'/app.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":27},"filename":"/cases/yield.pug","end":{"line":5,"column":28}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield.pug","end":{"line":6,"column":1}}}
+{"type":"eos","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield.pug","end":{"line":6,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug/lib/index.js b/packages/pug/lib/index.js
index a3c8968a5..36b40f64d 100644
--- a/packages/pug/lib/index.js
+++ b/packages/pug/lib/index.js
@@ -103,8 +103,7 @@ function compileBody(str, options){
         if (token.type === 'path' && path.extname(token.val) === '') {
           return {
             type: 'path',
-            line: token.line,
-            col: token.col,
+            loc: token.loc,
             val: token.val + '.pug'
           };
         }