From 182232cf54cb7dde4ac9e9f80f3f96f1d11d48df Mon Sep 17 00:00:00 2001 From: Sergey Belov Date: Thu, 23 May 2013 00:16:00 +0300 Subject: [PATCH] Refactor `bem decl intersect` and `bem decl subtract` commands to use Deps.parseDepsDecl() method This also fixes #385 --- lib/commands/decl/intersect.js | 6 ++++-- lib/commands/decl/subtract.js | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/commands/decl/intersect.js b/lib/commands/decl/intersect.js index 0c815f20..36fbda2f 100644 --- a/lib/commands/decl/intersect.js +++ b/lib/commands/decl/intersect.js @@ -30,11 +30,13 @@ module.exports = function() { var deps1 = new DEPS.Deps(), decl1 = decls.shift(), - res = deps1.parse(decl1.blocks || decl1.deps), deps2, decl2; + + deps1.parseDepsDecl(decl1); + while(decl2 = decls.shift()) { deps2 = new DEPS.Deps(); - deps2.parse(decl2.blocks || decl2.deps); + deps2.parseDepsDecl(decl2); deps1.intersect(deps2); } diff --git a/lib/commands/decl/subtract.js b/lib/commands/decl/subtract.js index 3c4deb7c..bf3f0803 100644 --- a/lib/commands/decl/subtract.js +++ b/lib/commands/decl/subtract.js @@ -30,11 +30,13 @@ module.exports = function() { var deps1 = new DEPS.Deps(), decl1 = decls.shift(), - res = deps1.parse(decl1.blocks || decl1.deps), deps2, decl2; + + deps1.parseDepsDecl(decl1); + while(decl2 = decls.shift()) { deps2 = new DEPS.Deps(); - deps2.parse(decl2.blocks || decl2.deps); + deps2.parseDepsDecl(decl2); deps1.subtract(deps2); }