archive-gh-me/marko
1
0
Fork 0
mirror of https://github.com/marko-js/marko.git synced 2025-12-08 19:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Improved how vars can be added to compiled template

Browse Source
This commit is contained in:
Patrick Steele-Idem 2014-06-04 21:54:12 -06:00
parent 5d483c3af8
commit 37bbc0d51f
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/TemplateBuilder.js
View File

@ -49,6 +49,17 @@ function writeArgs(writer, args) {
} }
} }
function safeVarName(varName) {
return varName.replace(/[^A-Za-z0-9_]/g, '_').replace(/^[0-9]+/, function(match) {
var str = '';
for (var i=0; i<match.length; i++) {
str += '_';
}
return str;
});
}
function CodeWriter(concatWrites, indent) { function CodeWriter(concatWrites, indent) {
this._indent = indent != null ? indent : INDENT + INDENT; this._indent = indent != null ? indent : INDENT + INDENT;
this._code = new StringBuilder(); this._code = new StringBuilder();
@ -270,6 +281,8 @@ TemplateBuilder.prototype = {
return this.staticVarsLookup[name] === true; return this.staticVarsLookup[name] === true;
}, },
addStaticVar: function (name, expression) { addStaticVar: function (name, expression) {
name = safeVarName(name);
if (!this.staticVarsLookup[name]) { if (!this.staticVarsLookup[name]) {
this.staticVarsLookup[name] = true; this.staticVarsLookup[name] = true;
this.staticVars.push({ this.staticVars.push({
@ -277,11 +290,14 @@ TemplateBuilder.prototype = {
expression: expression expression: expression
}); });
} }
return name;
}, },
hasVar: function (name) { hasVar: function (name) {
return this.vars[name] === true; return this.vars[name] === true;
}, },
addVar: function (name, expression) { addVar: function (name, expression) {
name = safeVarName(name);
this.vars[name] = true; this.vars[name] = true;
this.vars.push({ this.vars.push({
name: name, name: name,