Clean up TODOs

lib/coffee-script/lexer.js

@@ -21,7 +21,6 @@
       }
       code = code.replace(/\r/g, '').replace(TRAILING_SPACES, '');
       this.code = code;
-      this.line = opts.line || 0;
       this.chunkLine = opts.line || 0;
       this.chunkColumn = opts.column || 0;
       this.indent = 0;
@@ -182,7 +181,6 @@
       if (octalEsc = /^(?:\\.|[^\\])*\\(?:0[0-7]|[1-7])/.test(string)) {
         this.error("octal escape sequences " + string + " are not allowed");
       }
-      this.line += count(string, '\n');
       return string.length;
     };
 
@@ -205,7 +203,6 @@
       } else {
         this.token('STRING', this.makeString(doc, quote, true), 0, heredoc.length);
       }
-      this.line += count(heredoc, '\n');
       return heredoc.length;
     };
 
@@ -221,7 +218,6 @@
           indent: Array(this.indent + 1).join(' ')
         }), 0, comment.length);
       }
-      this.line += count(comment, '\n');
       return comment.length;
     };
 
@@ -231,7 +227,6 @@
         return 0;
       }
       this.token('JS', (script = match[0]).slice(1, -1), 0, script.length);
-      this.line += count(script, '\n');
       return script.length;
     };
 
@@ -242,7 +237,6 @@
       }
       if (match = HEREGEX.exec(this.chunk)) {
         length = this.heregexToken(match);
-        this.line += count(match[0], '\n');
         return length;
       }
       prev = last(this.tokens);
@@ -332,10 +326,8 @@
         } else {
           this.newlineToken(0);
         }
-        this.line += count(indent, '\n');
         return indent.length;
       }
-      this.line += count(indent, '\n');
       if (size > this.indent) {
         if (noNewlines) {
           this.indebt = size - this.indent;
@@ -582,7 +574,7 @@
     };
 
     Lexer.prototype.interpolateString = function(str, options) {
-      var column, expr, heredoc, i, inner, interpolated, len, letter, lexedLength, line, nested, offsetInChunk, originalOffsetInChunk, pi, popped, regex, tag, token, tokens, value, _i, _len, _ref2, _ref3, _ref4;
+      var column, expr, heredoc, i, inner, interpolated, len, letter, lexedLength, line, locationToken, nested, offsetInChunk, originalOffsetInChunk, pi, plusToken, popped, regex, tag, token, tokens, value, _i, _len, _ref2, _ref3, _ref4;
       if (options == null) {
         options = {};
       }
@@ -650,7 +642,16 @@
         token = tokens[i];
         tag = token[0], value = token[1];
         if (i) {
-          this.token('+', '+');
+          if (i) {
+            plusToken = this.token('+', '+');
+          }
+          locationToken = tag === 'TOKENS' ? value[0] : token;
+          plusToken.locationData = {
+            first_line: locationToken.locationData.first_line,
+            first_column: locationToken.locationData.first_column,
+            last_line: locationToken.locationData.first_line,
+            last_column: locationToken.locationData.first_column
+          };
         }
         if (tag === 'TOKENS') {
           (_ref4 = this.tokens).push.apply(_ref4, value);
@@ -758,7 +759,7 @@
     };
 
     Lexer.prototype.error = function(message) {
-      throw SyntaxError("" + message + " on line " + (this.line + 1));
+      throw SyntaxError("" + message + " on line " + (this.chunkLine + 1));
     };
 
     return Lexer;

lib/coffee-script/sourcemap.js

@@ -0,0 +1,139 @@
+// Generated by CoffeeScript 1.4.0
+(function() {
+  var BASE64_CHARS, LineMapping, MAX_BASE64_VALUE, VLQ_CONTINUATION_BIT, VLQ_MASK, VLQ_SHIFT, encodeBase64Char;
+
+  LineMapping = (function() {
+
+    function LineMapping(generatedLine) {
+      this.generatedLine = generatedLine;
+      this.columnMap = {};
+      this.columnMappings = [];
+    }
+
+    LineMapping.prototype.addMapping = function(generatedColumn, sourceLine, sourceColumn) {
+      if (this.columnMap[generatedColumn]) {
+        return;
+      }
+      this.columnMap[generatedColumn] = {
+        generatedLine: this.generatedLine,
+        generatedColumn: generatedColumn,
+        sourceLine: sourceLine,
+        sourceColumn: sourceColumn
+      };
+      return this.columnMappings.push(this.columnMap[generatedColumn]);
+    };
+
+    return LineMapping;
+
+  })();
+
+  exports.SourceMap = (function() {
+
+    function SourceMap() {
+      this.generatedLines = [];
+    }
+
+    SourceMap.prototype.addMapping = function(generatedLine, generatedColumn, sourceLine, sourceColumn) {
+      var lineArray;
+      lineArray = this.generatedLines[generatedLine];
+      if (!lineArray) {
+        lineArray = this.generatedLines[generatedLine] = LineMapping(generatedLine);
+      }
+      return lineArray.addMapping(generatedColumn, sourceLine, sourceColumn);
+    };
+
+    SourceMap.prototype.forEachMapping = function(fn) {
+      var columnMapping, generatedLineNumber, lineMapping, _i, _len, _ref, _results;
+      _ref = this.generatedLines;
+      _results = [];
+      for (generatedLineNumber = _i = 0, _len = _ref.length; _i < _len; generatedLineNumber = ++_i) {
+        lineMapping = _ref[generatedLineNumber];
+        if (lineMapping) {
+          _results.push((function() {
+            var _j, _len1, _ref1, _results1;
+            _ref1 = lineMapping.columnMappings;
+            _results1 = [];
+            for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
+              columnMapping = _ref1[_j];
+              _results1.push(fn(columnMapping));
+            }
+            return _results1;
+          })());
+        } else {
+          _results.push(void 0);
+        }
+      }
+      return _results;
+    };
+
+    return SourceMap;
+
+  })();
+
+  exports.generateV3SourceMap = function(sourceMap) {
+    var lastGeneratedColumnWritten, lastSourceColumnWritten, lastSourceLineWritten, mappings, needComma, writingGeneratedLine;
+    writingGeneratedLine = 0;
+    lastGeneratedColumnWritten = 0;
+    lastSourceLineWritten = 0;
+    lastSourceColumnWritten = 0;
+    needComma = false;
+    mappings = "";
+    return sourceMap.forEachMapping(function(mapping) {
+      while (writingGeneratedLine < mapping.generatedLine) {
+        lastGeneratedColumnWritten = 0;
+        needComma = false;
+        mappings += ";";
+        writingGeneratedLine++;
+      }
+      if (needComma) {
+        mappings += ",";
+        needComma = false;
+      }
+      exports.vlqEncodeValue(mapping.generatedColumn - lastGeneratedColumnWritten);
+      lastGeneratedColumnWritten = mapping.generatedColumn;
+      exports.vlqEncodeValue(0);
+      exports.vlqEncodeValue(mapping.sourceLine - lastSourceLineWritten);
+      lastSourceLineWritten = mapping.sourceLine;
+      exports.vlqEncodeValue(mapping.sourceColumn - lastSourceColumnWritten);
+      lastSourceColumnWritten = mapping.sourceColumn;
+      return needComma = true;
+    });
+  };
+
+  BASE64_CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+
+  MAX_BASE64_VALUE = BASE64_CHARS.length - 1;
+
+  VLQ_SHIFT = 5;
+
+  VLQ_MASK = 0x1F;
+
+  VLQ_CONTINUATION_BIT = 0x20;
+
+  encodeBase64Char = function(value) {
+    if (value > MAX_BASE64_VALUE) {
+      throw Error("Cannot encode value " + value + " > " + MAX_BASE64_VALUE);
+    } else if (value < 0) {
+      throw Error("Cannot encode value " + value + " < 0");
+    }
+    return BASE64_CHARS[value];
+  };
+
+  exports.vlqEncodeValue = function(value) {
+    var answer, nextVlqChunk, _results;
+    value = value < 0 ? 1 : 0;
+    value += Math.abs(value) << 1;
+    answer = "";
+    _results = [];
+    while (value) {
+      nextVlqChunk = value & VLQ_MASK;
+      value >> VLQ_SHIFT;
+      if (value) {
+        nextVlqChunk |= VLQ_CONTINUATION_BIT;
+      }
+      _results.push(answer += encodeBase64Char(nextVlqChunk));
+    }
+    return _results;
+  };
+
+}).call(this);