From 24bba952c7dcac7073cdc9582493910a968c08c2 Mon Sep 17 00:00:00 2001 From: cloudhead Date: Sat, 27 Mar 2010 02:26:55 -0400 Subject: [PATCH] removed lib/ext, moved lib/less.js to /index.js, moved Array/find to tree.find --- bin/lessc | 2 +- lib/less.js => index.js | 3 +-- lib/ext/array.js | 6 ------ lib/less/tree.js | 6 ++++++ lib/less/tree/variable.js | 4 ++-- test/less-test.js | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) rename lib/less.js => index.js (97%) delete mode 100644 lib/ext/array.js diff --git a/bin/lessc b/bin/lessc index 28d71d9..cd07ae7 100755 --- a/bin/lessc +++ b/bin/lessc @@ -6,7 +6,7 @@ var path = require('path'), require.paths.unshift(__dirname, path.join(__dirname, '..')); -var less = require('lib/less'); +var less = require('index'); var args = process.argv.slice(1); args = args.filter(function (arg) { diff --git a/lib/less.js b/index.js similarity index 97% rename from lib/less.js rename to index.js index c9265b1..993e81e 100644 --- a/lib/less.js +++ b/index.js @@ -1,7 +1,7 @@ var path = require('path'), fs = require('fs'); -require.paths.unshift(__dirname); +require.paths.unshift(path.join(__dirname, 'lib')); var less = { version: [2, 0, 0], @@ -86,7 +86,6 @@ less.Parser.importer = function (file, paths, callback) { } require('less/functions'); -require('ext/array'); for (var k in less) { exports[k] = less[k] } diff --git a/lib/ext/array.js b/lib/ext/array.js deleted file mode 100644 index 8611bcf..0000000 --- a/lib/ext/array.js +++ /dev/null @@ -1,6 +0,0 @@ -Array.prototype.find = function (fun) { - for (var i = 0, r; i < this.length; i++) { - if (r = fun.call(this, this[i])) { return r } - } - return null; -}; diff --git a/lib/less/tree.js b/lib/less/tree.js index c546f28..0c6ab09 100644 --- a/lib/less/tree.js +++ b/lib/less/tree.js @@ -9,3 +9,9 @@ tree.operate = function (op, a, b) { } }; +tree.find = function (obj, fun) { + for (var i = 0, r; i < obj.length; i++) { + if (r = fun.call(obj, obj[i])) { return r } + } + return null; +}; diff --git a/lib/less/tree/variable.js b/lib/less/tree/variable.js index 853d20c..cc4f0c7 100644 --- a/lib/less/tree/variable.js +++ b/lib/less/tree/variable.js @@ -6,8 +6,8 @@ tree.Variable.prototype = { eval: function (env) { var variable, name = this.name; - if (variable = env.frames.find(function (frame) { - return frame.variables().find(function (variable) { + if (variable = tree.find(env.frames, function (frame) { + return tree.find(frame.variables(), function (variable) { if (variable.name === name) { return variable.value.eval ? variable.value.eval(env) : variable.value; diff --git a/test/less-test.js b/test/less-test.js index 05f0087..4e0e314 100644 --- a/test/less-test.js +++ b/test/less-test.js @@ -4,7 +4,7 @@ var path = require('path'), require.paths.unshift(__dirname, path.join(__dirname, '..')); -var less = require('lib/less'); +var less = require('index'); less.tree.functions.add = function (a, b) { return new(less.tree.Dimension)(a.value + b.value);