Skip to content

Commit

Permalink
re-indent only, no changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@olado
olado committed May 31, 2011
1 parent 95584b9 commit de69c92
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 56 deletions.
56 changes: 28 additions & 28 deletions benchmarks/templating/doT.js
View file
Expand Up @@ -10,7 +10,7 @@
// Licensed under the MIT license.
//
(function() {
var doT = { version : '0.1.4' };
var doT = { version : '0.1.5' };

if (typeof module !== 'undefined' && module.exports) {
module.exports = doT;
Expand All @@ -31,41 +31,41 @@

function resolveDefs(define, use, str, defs) {
return str.replace(define, function (match, code, value) {
if (!(code in defs)) defs[code]=value;
return '';
})
.replace(use, function(match, code) {
var value;// todo: detect circular use and convert into compiled functions
with(defs) {try { value = eval(code);} catch(e) { value='';} }
return value ? resolveDefs(define, use, value.toString(), defs) : value;
});
if (!(code in defs)) defs[code]=value;
return '';
})
.replace(use, function(match, code) {
var value; // todo: detect circular use and convert into compiled functions
with(defs) {try { value = eval(code);} catch(e) { value='';} }
return value ? resolveDefs(define, use, value.toString(), defs) : value;
});
}

doT.template = function(tmpl, c, defs) {
c = c || doT.templateSettings;
var cstart = c.append ? "'+(" : "';out+=(",// optimal choice depends on platform/size of templates
var cstart = c.append ? "'+(" : "';out+=(", // optimal choice depends on platform/size of templates
cend = c.append ? ")+'" : ");out+='";
var str = (c.use || c.define) ? resolveDefs(c.define, c.use, tmpl, defs || {}) : tmpl;

str = ("var out='" +
((c.strip) ? str.replace(/\s*<!\[CDATA\[\s*|\s*\]\]>\s*|[\r\n\t]|(\/\*[\s\S]*?\*\/)/g, ''): str)
.replace(/\\/g, '\\\\')
.replace(/'/g, "\\'")
.replace(c.interpolate, function(match, code) {
return cstart + code.replace(/\\'/g, "'").replace(/\\\\/g,"\\").replace(/[\r\t\n]/g, ' ') + cend;
})
.replace(c.encode, function(match, code) {
return cstart + code.replace(/\\'/g, "'").replace(/\\\\/g, "\\").replace(/[\r\t\n]/g, ' ') + ").toString().replace(/&(?!\\w+;)/g, '&#38;').split('<').join('&#60;').split('>').join('&#62;').split('" + '"' + "').join('&#34;').split(" + '"' + "'" + '"' + ").join('&#39;').split('/').join('&#x2F;'" + cend;
})
.replace(c.evaluate, function(match, code) {
return "';" + code.replace(/\\'/g, "'").replace(/\\\\/g,"\\").replace(/[\r\t\n]/g, ' ') + "out+='";
})
+ "';return out;")
.replace(/\n/g, '\\n')
.replace(/\t/g, '\\t')
.replace(/\r/g, '\\r')
.split("out+='';").join('')
.split('var out="";out+=').join('var out=');
((c.strip) ? str.replace(/\s*<!\[CDATA\[\s*|\s*\]\]>\s*|[\r\n\t]|(\/\*[\s\S]*?\*\/)/g, ''): str)
.replace(/\\/g, '\\\\')
.replace(/'/g, "\\'")
.replace(c.interpolate, function(match, code) {
return cstart + code.replace(/\\'/g, "'").replace(/\\\\/g,"\\").replace(/[\r\t\n]/g, ' ') + cend;
})
.replace(c.encode, function(match, code) {
return cstart + code.replace(/\\'/g, "'").replace(/\\\\/g, "\\").replace(/[\r\t\n]/g, ' ') + ").toString().replace(/&(?!\\w+;)/g, '&#38;').split('<').join('&#60;').split('>').join('&#62;').split('" + '"' + "').join('&#34;').split(" + '"' + "'" + '"' + ").join('&#39;').split('/').join('&#x2F;'" + cend;
})
.replace(c.evaluate, function(match, code) {
return "';" + code.replace(/\\'/g, "'").replace(/\\\\/g,"\\").replace(/[\r\t\n]/g, ' ') + "out+='";
})
+ "';return out;")
.replace(/\n/g, '\\n')
.replace(/\t/g, '\\t')
.replace(/\r/g, '\\r')
.split("out+='';").join('')
.split('var out="";out+=').join('var out=');

try {
return new Function(c.varname, str);
Expand Down
56 changes: 28 additions & 28 deletions doT.js
View file
Expand Up @@ -10,7 +10,7 @@
// Licensed under the MIT license.
//
(function() {
var doT = { version : '0.1.4' };
var doT = { version : '0.1.5' };

if (typeof module !== 'undefined' && module.exports) {
module.exports = doT;
Expand All @@ -31,41 +31,41 @@

function resolveDefs(define, use, str, defs) {
return str.replace(define, function (match, code, value) {
if (!(code in defs)) defs[code]=value;
return '';
})
.replace(use, function(match, code) {
var value;// todo: detect circular use and convert into compiled functions
with(defs) {try { value = eval(code);} catch(e) { value='';} }
return value ? resolveDefs(define, use, value.toString(), defs) : value;
});
if (!(code in defs)) defs[code]=value;
return '';
})
.replace(use, function(match, code) {
var value; // todo: detect circular use and convert into compiled functions
with(defs) {try { value = eval(code);} catch(e) { value='';} }
return value ? resolveDefs(define, use, value.toString(), defs) : value;
});
}

doT.template = function(tmpl, c, defs) {
c = c || doT.templateSettings;
var cstart = c.append ? "'+(" : "';out+=(",// optimal choice depends on platform/size of templates
var cstart = c.append ? "'+(" : "';out+=(", // optimal choice depends on platform/size of templates
cend = c.append ? ")+'" : ");out+='";
var str = (c.use || c.define) ? resolveDefs(c.define, c.use, tmpl, defs || {}) : tmpl;

str = ("var out='" +
((c.strip) ? str.replace(/\s*<!\[CDATA\[\s*|\s*\]\]>\s*|[\r\n\t]|(\/\*[\s\S]*?\*\/)/g, ''): str)
.replace(/\\/g, '\\\\')
.replace(/'/g, "\\'")
.replace(c.interpolate, function(match, code) {
return cstart + code.replace(/\\'/g, "'").replace(/\\\\/g,"\\").replace(/[\r\t\n]/g, ' ') + cend;
})
.replace(c.encode, function(match, code) {
return cstart + code.replace(/\\'/g, "'").replace(/\\\\/g, "\\").replace(/[\r\t\n]/g, ' ') + ").toString().replace(/&(?!\\w+;)/g, '&#38;').split('<').join('&#60;').split('>').join('&#62;').split('" + '"' + "').join('&#34;').split(" + '"' + "'" + '"' + ").join('&#39;').split('/').join('&#x2F;'" + cend;
})
.replace(c.evaluate, function(match, code) {
return "';" + code.replace(/\\'/g, "'").replace(/\\\\/g,"\\").replace(/[\r\t\n]/g, ' ') + "out+='";
})
+ "';return out;")
.replace(/\n/g, '\\n')
.replace(/\t/g, '\\t')
.replace(/\r/g, '\\r')
.split("out+='';").join('')
.split('var out="";out+=').join('var out=');
((c.strip) ? str.replace(/\s*<!\[CDATA\[\s*|\s*\]\]>\s*|[\r\n\t]|(\/\*[\s\S]*?\*\/)/g, ''): str)
.replace(/\\/g, '\\\\')
.replace(/'/g, "\\'")
.replace(c.interpolate, function(match, code) {
return cstart + code.replace(/\\'/g, "'").replace(/\\\\/g,"\\").replace(/[\r\t\n]/g, ' ') + cend;
})
.replace(c.encode, function(match, code) {
return cstart + code.replace(/\\'/g, "'").replace(/\\\\/g, "\\").replace(/[\r\t\n]/g, ' ') + ").toString().replace(/&(?!\\w+;)/g, '&#38;').split('<').join('&#60;').split('>').join('&#62;').split('" + '"' + "').join('&#34;').split(" + '"' + "'" + '"' + ").join('&#39;').split('/').join('&#x2F;'" + cend;
})
.replace(c.evaluate, function(match, code) {
return "';" + code.replace(/\\'/g, "'").replace(/\\\\/g,"\\").replace(/[\r\t\n]/g, ' ') + "out+='";
})
+ "';return out;")
.replace(/\n/g, '\\n')
.replace(/\t/g, '\\t')
.replace(/\r/g, '\\r')
.split("out+='';").join('')
.split('var out="";out+=').join('var out=');

try {
return new Function(c.varname, str);
Expand Down

0 comments on commit de69c92

Please sign in to comment.