cartodb/carto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix parser's use of underscore's template method to work with modern use of it.

Browse Source
This commit is contained in:
nobuti 2016-05-30 14:05:42 +02:00
parent 176886f1ad
commit d3e23dcb5d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/carto/parser.js
View File

@ -114,8 +114,9 @@ carto.Parser = function Parser(env) {
// - `index`: Char. index where the error occurred. // - `index`: Char. index where the error occurred.
function makeError(err) { function makeError(err) {
var einput; var einput;
var errorTemplate;
_(err).defaults({ _.defaults(err, {
index: furthest, index: furthest,
filename: env.filename, filename: env.filename,
message: 'Parse error.', message: 'Parse error.',
@ -133,8 +134,8 @@ carto.Parser = function Parser(env) {
for (var n = err.index; n >= 0 && einput.charAt(n) !== '\n'; n--) { for (var n = err.index; n >= 0 && einput.charAt(n) !== '\n'; n--) {
err.column++; err.column++;
} }
errorTemplate = _.template('<%=filename%>:<%=line%>:<%=column%> <%=message%>');
return new Error(_('<%=filename%>:<%=line%>:<%=column%> <%=message%>').template(err)); return new Error(errorTemplate(err));
} }
this.env = env = env || {}; this.env = env = env || {};