github/coffeescript
1
1
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2026-02-19 03:44:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

647: fixed quote/newline escaping in here documents

Browse Source
This commit is contained in:
satyr
2010-10-03 07:45:23 +09:00
parent 769870b493
commit ae55c70ac5
3 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/lexer.js
View File

@@ -124,9 +124,13 @@
quote: quote,
indent: null
});
this.interpolateString(quote + doc + quote, {
heredoc: true
});
if (quote === '"') {
this.interpolateString(quote + doc + quote, {
heredoc: true
});
} else {
this.token('STRING', quote + doc + quote);
}
this.line += count(heredoc, '\n');
this.i += heredoc.length;
return true;
@@ -362,7 +366,7 @@
return accessor ? 'accessor' : false;
};
Lexer.prototype.sanitizeHeredoc = function(doc, options) {
var _ref2, attempt, herecomment, indent, match;
var _ref2, attempt, herecomment, indent, match, quote;
_ref2 = options, indent = _ref2.indent, herecomment = _ref2.herecomment;
if (herecomment && !include(doc, '\n')) {
return doc;
@@ -381,8 +385,13 @@
if (herecomment) {
return doc;
}
doc = doc.replace(/^\n/, '').replace(RegExp("" + (options.quote), "g"), '\\$&');
if (options.quote === "'") {
quote = options.quote;
doc = doc.replace(/^\n/, '');
doc = doc.replace(/\\([\s\S])/g, function(m, c) {
return ('\n' === c || quote === c) ? c : m;
});
doc = doc.replace(RegExp("" + (quote), "g"), '\\$&');
if (quote === "'") {
doc = this.escapeLines(doc, true);
}
return doc;