diff --git a/lib/ejs.js b/lib/ejs.js index ca304a13..98958241 100644 --- a/lib/ejs.js +++ b/lib/ejs.js @@ -8,7 +8,7 @@ * Module dependencies. */ -var utils = require('./utils') +let utils = require('./utils') , path = require('path') , dirname = path.dirname , extname = path.extname @@ -22,7 +22,7 @@ var utils = require('./utils') * @type Object */ -var filters = exports.filters = require('./filters'); +let filters = exports.filters = require('./filters'); /** * Intermediate js cache. @@ -30,7 +30,7 @@ var filters = exports.filters = require('./filters'); * @type Object */ -var cache = {}; +let cache = {}; /** * Clear intermediate js cache. @@ -52,7 +52,7 @@ exports.clearCache = function(){ function filtered(js) { return js.substr(1).split('|').reduce(function(js, filter){ - var parts = filter.split(':') + let parts = filter.split(':') , name = parts.shift() , args = parts.join(':') || ''; if (args) args = ', ' + args; @@ -72,13 +72,13 @@ function filtered(js) { */ function rethrow(err, str, filename, lineno){ - var lines = str.split('\n') + let lines = str.split('\n') , start = Math.max(lineno - 3, 0) , end = Math.min(lines.length, lineno + 3); // Error context - var context = lines.slice(start, end).map(function(line, i){ - var curr = i + start + 1; + let context = lines.slice(start, end).map(function(line, i){ + let curr = i + start + 1; return (curr == lineno ? ' >> ' : ' ') + curr + '| ' @@ -103,8 +103,8 @@ function rethrow(err, str, filename, lineno){ * @api public */ -var parse = exports.parse = function(str, options){ - var options = options || {} +let parse = exports.parse = function(str, options){ + let options = options || {} , open = options.open || exports.open || '<%' , close = options.close || exports.close || '%>' , filename = options.filename @@ -115,9 +115,9 @@ var parse = exports.parse = function(str, options){ if (false !== options._with) buf += '\nwith (locals || {}) { (function(){ '; buf += '\n buf.push(\''; - var lineno = 1; + let lineno = 1; - var consumeEOL = false; + let consumeEOL = false; for (var i = 0, len = str.length; i < len; ++i) { var stri = str[i]; if (str.slice(i, open.length + i) == open) {