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

big refactoring of ruleset.js, move eval code to eval()

Browse Source
This commit is contained in:
cloudhead 2010-07-07 13:53:09 +02:00
parent f30aa915c7
commit 45b97a6054
3 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/less/tree/mixin.js
View File

@ -73,7 +73,7 @@ tree.mixin.Definition.prototype = {
}
}
}
return new(tree.Ruleset)(null, this.rules).eval({
return new(tree.Ruleset)(null, this.rules.slice(0)).eval({
frames: [this, frame].concat(this.frames, env.frames)
});
},

78
lib/less/tree/ruleset.js
View File

@ -9,18 +9,48 @@ tree.Ruleset.prototype = {
eval: function (env) {
if (this.evaled) { return this }
var rules = [];
// push the current ruleset to the frames stack
env.frames.unshift(this);
this.rules.forEach(function (rule) {
if (rule instanceof tree.mixin.Call) {
Array.prototype.push.apply(rules, rule.eval(env));
} else if (! (rule instanceof tree.mixin.Definition)) {
rules.push(rule.eval ? rule.eval(env) : '');
// Store the frames around mixin definitions,
// so they can be evaluated like closures when the time comes.
for (var i = 0; i < this.rules.length; i++) {
if (this.rules[i] instanceof tree.mixin.Definition) {
this.rules[i].frames = env.frames.slice(0);
}
});
this.rules = rules;
}
// Evaluate imports
if (this.root) {
for (var i = 0; i < this.rules.length; i++) {
if (this.rules[i] instanceof tree.Import) {
Array.prototype.splice
.apply(this.rules, [i, 1].concat(this.rules[i].eval(env)));
}
}
}
// Evaluate mixin calls.
for (var i = 0; i < this.rules.length; i++) {
if (this.rules[i] instanceof tree.mixin.Call) {
Array.prototype.splice
.apply(this.rules, [i, 1].concat(this.rules[i].eval(env)));
}
}
// Evaluate everything else
for (var i = 0, rule; i < this.rules.length; i++) {
rule = this.rules[i];
if (! (rule instanceof tree.mixin.Definition)) {
this.rules[i] = rule.eval ? rule.eval(env) : rule;
}
}
this.evaled = true;
// Pop the stack
env.frames.shift();
return this;
},
match: function (args) {
@ -92,36 +122,15 @@ tree.Ruleset.prototype = {
}
}
}
} else {
for (var i = 0; i < this.rules.length; i++) {
if (this.rules[i] instanceof tree.Import) {
Array.prototype.splice
.apply(this.rules, [i, 1].concat(this.rules[i].eval(env)));
}
}
}
// push the current ruleset to the frames stack
env.frames.unshift(this);
this.eval(env);
// Evaluate mixin calls and store the frames around mixin definitions,
// so they can be evaluated like closures when the time comes.
for (var i = 0; i < this.rules.length; i++) {
if (this.rules[i] instanceof tree.mixin.Call) {
Array.prototype.splice
.apply(this.rules, [i, 1].concat(this.rules[i].eval(env)));
} else if (this.rules[i] instanceof tree.mixin.Definition) {
this.rules[i].frames = env.frames.slice(0);
}
}
// Evaluate rules and rulesets
// Compile rules and rulesets
for (var i = 0; i < this.rules.length; i++) {
rule = this.rules[i];
if (rule instanceof tree.Directive) {
rulesets.push(rule.eval(env).toCSS(paths, env));
} else if (rule.rules) {
if (rule.rules || (rule instanceof tree.Directive)) {
rulesets.push(rule.toCSS(paths, env));
} else if (rule instanceof tree.Comment) {
if (!rule.silent) {
@ -133,7 +142,7 @@ tree.Ruleset.prototype = {
}
} else {
if (rule.toCSS && !rule.variable) {
rules.push(rule.eval(env).toCSS(env));
rules.push(rule.toCSS(env));
} else if (rule.value && !rule.variable) {
rules.push(rule.value.toString());
}
@ -162,9 +171,6 @@ tree.Ruleset.prototype = {
}
css.push(rulesets);
// Pop the stack
env.frames.shift();
return css.join('') + (env.compress ? '\n' : '');
}
};

4
test/less/scope.less
View File

@ -7,8 +7,8 @@
}
.tiny-scope {
color: @mix; // #989
.mixin;
color: @mix; // #989
}
.scope1 {
@ -29,4 +29,4 @@
background-color: @local; // white
}
}
}
}