v0.1.9

* Fixed issues where notNode was not retracting all contexts when a fact was retracted
* Fixed issue #50 in compiling rule with or condition
* Fixed issue #53 in constraints with hash refrences.
* Merged pull request #49
* Added tests for logicalNot and truthy statements

docs/History.html

@@ -178,6 +178,14 @@
 
 
 
+<h1>0.1.9</h1>
+<ul>
+<li>Fixed issues where notNode was not retracting all contexts when a fact was retracted</li>
+<li>Fixed issue <a href="https://github.com/C2FO/nools/issues/50">50</a> in compiling rule with or condition</li>
+<li>Fixed issue <a href="https://github.com/C2FO/nools/issues/53">53</a> in constraints with hash refrences.</li>
+<li>Merged pull request <a href="https://github.com/C2FO/nools/pull/49">49</a></li>
+<li>Added tests for logicalNot and truthy statements</li>
+</ul>
 <h1>0.1.8 / 2013-08-14</h1>
 <ul>
 <li>Fixed scoping issue where scoped variables defined in compile were not available to defined classes or functions.</li>

history.md

@@ -1,19 +1,27 @@
-#0.1.8 / 2013-08-14
+# 0.1.9
+
+* Fixed issues where notNode was not retracting all contexts when a fact was retracted
+* Fixed issue [50](https://github.com/C2FO/nools/issues/50) in compiling rule with or condition
+* Fixed issue [53](https://github.com/C2FO/nools/issues/53) in constraints with hash refrences.
+* Merged pull request [49](https://github.com/C2FO/nools/pull/49)
+* Added tests for logicalNot and truthy statements
+
+# 0.1.8 / 2013-08-14
 
 * Fixed scoping issue where scoped variables defined in compile were not available to defined classes or functions.
 
-#0.1.7 / 2013-06-25
+# 0.1.7 / 2013-06-25
 
 * Fixed constraint parser to not evaluate functions that have the same name as operators as operators.
 * Fixed the `getMatcher` to properly return an equality expression for constraints that do not have an explicit equality
 * Added new diganosis example
 * Changed Fibonacci example to support larger number
 
-#v0.1.6 / 2012-06-17
+# v0.1.6 / 2012-06-17
 
 * Fixed issue with the use of next in async actions
 
-#v0.1.5 / 2013-06-17
+# v0.1.5 / 2013-06-17
 
 * More Examples
 * Changed nools compile to transpile to Javascript!
@@ -22,7 +30,7 @@
   * Manners Benchmark (32): Before ~10s, Now ~4sec
   * WaltzDB: Before ~30sec, Now ~15sec
 
-#v0.1.4 / 2013-05-25
+# v0.1.4 / 2013-05-25
 
 * Added new agenda-group (#29)
 * More documentation
@@ -32,15 +40,15 @@
   * Scope
 * Cleaned up agenda and made more modular
 
-#v0.1.3 / 2013-05-24
+# v0.1.3 / 2013-05-24
 
 * Fixed memory leak with FactHashes for the agendas
 
-#v0.1.2 / 2013-05-24
+# v0.1.2 / 2013-05-24
 
 * Removed unneeded calls to `.then` to address performance degredation (#30)
 
-#v0.1.1 / 2013-05-23
+# v0.1.1 / 2013-05-23
 
 * Updated grunt
 * Fixed nextTick issues for node v0.10 #32
@@ -52,7 +60,7 @@
 * Rebuilt nools.js and nools.min.js
 * Added more tests for new globals feature
 
-#0.1.0 / 2013-02-27
+# 0.1.0 / 2013-02-27
 
 * Browser support!
 * Support for compiling nools dsl from string source or path
@@ -71,18 +79,18 @@
 * More Examples (requirejs, browser, conways game of life)
 * More tests and better coverage on or and not nodes.
 
-#0.0.5 / 2012-09-10
+# 0.0.5 / 2012-09-10
 * Fix for issue [#13](https://github.com/C2FO/nools/issues/13) where identifiers were not gathered in property chains that contained functions.
 
-#0.0.4 / 2012-09-10
+# 0.0.4 / 2012-09-10
 * Added travis CI
 
-#0.0.3 / 2012-09-06
+# 0.0.3 / 2012-09-06
 * Updates for repo rename
 * code clean up
 
 
-#0.0.2 / 2012-05-22
+# 0.0.2 / 2012-05-22
 * Increased performance
   * Manners benchmark 800%
 * Added Parser for nools DSL

lib/compile/transpile.js

@@ -63,10 +63,10 @@ function constraintsToJs(constraint, identifiers) {
     constraint = constraint.slice(0);
     var ret = [];
     if (constraint[0] === "or") {
-        ret.push('"' + constraint.shift() + '", ');
-        ret = ret.concat(extd.map(constraint, function (c) {
+        ret.push('["' + constraint.shift() + '"');
+        ret.push(extd.map(constraint,function (c) {
             return constraintsToJs(c, identifiers);
-        }));
+        }).join(",") + "]");
         return ret;
     } else if (constraint[0] === "not") {
         ret.push('"', constraint.shift(), '", ');

lib/constraintMatcher.js

@@ -89,7 +89,7 @@ var lang = {
             if (c1[2] === c2[2]) {
                 if (indexOf(["string", "number", "boolean", "regexp", "identifier", "null"], c1[2]) !== -1) {
                     ret = c1[0] === c2[0];
-                } else if (c1[2] === "unminus") {
+                } else if (c1[2] === "unary" || c1[2] === "logicalNot") {
                     ret = this.equal(c1[0], c2[0]);
                 } else {
                     ret = this.equal(c1[0], c2[0]) && this.equal(c1[1], c2[1]);
@@ -113,7 +113,8 @@ var lang = {
             rule2 !== "number" &&
             rule2 !== "boolean" &&
             rule2 !== "regexp" &&
-            rule2 !== "unminus") {
+            rule2 !== "unary" &&
+            rule2 !== "unary") {
             //its an expression so keep going
             if (rule2 === "prop") {
                 ret = ret.concat(this.getIdentifiers(rule[0]));
@@ -167,7 +168,8 @@ var lang = {
                 rule2 === "in" ||
                 rule2 === "notIn" ||
                 rule2 === "prop" ||
-                rule2 === "function") {
+                rule2 === "function" ||
+                rule2 === "logicalNot") {
             if (some(this.getIdentifiers(rule), function (i) {
                 return i !== alias && !(i in definedFuncs) && !(i in scope);
             })) {
@@ -189,11 +191,11 @@ var lang = {
     },
 
     and: function (lhs, rhs) {
-        return [this.parse(lhs), "&&", this.parse(rhs)].join(" ");
+        return ["(", this.parse(lhs), "&&", this.parse(rhs), ")"].join(" ");
     },
 
     or: function (lhs, rhs) {
-        return [this.parse(lhs), "||", this.parse(rhs)].join(" ");
+        return ["(", this.parse(lhs), "||", this.parse(rhs), ")"].join(" ");
     },
 
     prop: function (name, prop) {
@@ -204,7 +206,7 @@ var lang = {
         }
     },
 
-    unminus: function (lhs) {
+    unary: function (lhs) {
         return -1 * this.parse(lhs);
     },
 
@@ -311,6 +313,10 @@ var lang = {
 
     "null": function () {
         return "null";
+    },
+
+    logicalNot: function (lhs) {
+        return ["!(", this.parse(lhs), ")"].join("");
     }
 };
 

lib/nodes/notNode.js

@@ -9,6 +9,7 @@ JoinNode.extend({
         constructor: function () {
             this._super(arguments);
             this.leftTupleMemory = {};
+            this.allTuples = {};
         },
 
 
@@ -50,25 +51,24 @@ JoinNode.extend({
 
 
         retractLeft: function (fact) {
-            var contexts = this.leftMemory[fact.id], i, l;
-            if (!contexts) {
-                var leftContexts = this.leftTupleMemory[fact.id], leftContext;
-                delete this.leftTupleMemory[fact.id];
-                if (leftContexts) {
-                    for (i = 0, l = leftContexts.length; i < l; i++) {
-                        leftContext = leftContexts[i];
-                        var blocking = leftContext.blocker.blocking;
-                        blocking.splice(indexOf(blocking, leftContext), 1);
+            var factId = fact.id, tuples = this.allTuples[fact.id] || [], context, blocking, blocker;
+            while (tuples.length) {
+                context = tuples.pop();
+                if (indexOf(context.factIds, factId) !== -1) {
+                    this.__removeFromAllTupleMemory(context);
+                    this.__removeFromLeftMemory(context);
+                    this.__removeFromLeftTupleMemory(context);
+                    if ((blocker = context.blocker)) {
+                        blocking = blocker.blocking;
+                        blocking.splice(indexOf(blocking, context), 1);
+                        context.blocker = null;
                     }
                 }
-            } else {
-                delete this.leftMemory[fact.id];
-                var tuples = this.leftTuples;
-                for (i = 0, l = contexts.length; i < l; i++) {
-                    tuples.splice(indexOf(tuples, contexts[i]), 1);
-                }
             }
+            delete this.leftMemory[factId];
+            delete this.leftTupleMemory[factId];
             this.propagateRetract(fact);
+
         },
 
         assertLeft: function (context) {
@@ -111,20 +111,20 @@ JoinNode.extend({
         },
 
         __removeFromLeftMemory: function (context) {
-            var leftMemories = this.leftMemory[context.fact.id], lc, tuples = this.leftTuples;
-            for (var i = 0, l = leftMemories.length; i < l; i++) {
-                lc = leftMemories[i];
+            var leftMemories = this.leftMemory[context.fact.id] || [], lc, tuples = this.leftTuples;
+            for (var i = 0, l = tuples.length; i < l; i++) {
+                lc = tuples[i];
                 if (lc === context) {
-                    leftMemories.splice(i, 1);
-                    tuples.splice(indexOf(tuples, lc), 1);
+                    tuples.splice(i, 1);
+                    leftMemories.splice(indexOf(leftMemories, lc), 1);
                     break;
                 }
             }
             return this;
         },
 
         __removeFromLeftTupleMemory: function (context) {
-            var leftMemories = this.leftTupleMemory[context.fact.id], lc;
+            var leftMemories = this.leftTupleMemory[context.fact.id] || [], lc;
             for (var i = 0, l = leftMemories.length; i < l; i++) {
                 lc = leftMemories[i];
                 if (lc === context) {
@@ -135,6 +135,40 @@ JoinNode.extend({
             return this;
         },
 
+        __addToAllTupleMemory: function (context) {
+            var factIds = context.factIds, i = -1, l = factIds.length, factId, allTuples = this.allTuples, tuples;
+            while (++i < l) {
+                factId = factIds[i];
+                tuples = allTuples[factId] = (allTuples[factId] || []);
+                if (indexOf(tuples, context) === -1) {
+                    tuples.push(context);
+                }
+            }
+            return this;
+
+        },
+
+        __removeFromAllTupleMemory: function (context) {
+            var factIds = context.factIds, i = -1, l = factIds.length, factId, allTuples = this.allTuples, tuples, index;
+            while (++i < l) {
+                factId = factIds[i];
+                tuples = allTuples[factId];
+                index = indexOf(tuples, context);
+                if (index !== -1) {
+                    tuples.splice(i, 1);
+                }
+            }
+            return this;
+
+        },
+
+
+        __addToLeftMemory: function (context) {
+            this._super(arguments);
+            this.__addToAllTupleMemory(context);
+            return this;
+        },
+
         __addToLeftTupleMemory: function (context) {
             var o = context.fact;
             var lm = this.leftTupleMemory[o.id];
@@ -143,6 +177,7 @@ JoinNode.extend({
                 this.leftTupleMemory[o.id] = lm;
             }
             lm.push(context);
+            this.__addToAllTupleMemory(context);
             return this;
         }
     }

lib/parser/constraint/grammar.js

@@ -48,6 +48,7 @@ var grammar = {
             ["\\]", "return ']';"],
             ["\\[", "return '[';"],
             ["\\)", "return ')';"],
+            ["!", "return '!';"],
             ["$", "return 'EOF';"]
         ]
     },
@@ -59,7 +60,8 @@ var grammar = {
 
         "UNARY_EXPRESSION": [
             "LITERAL_EXPRESSION",
-            [ "- UNARY_EXPRESSION", "$$ = [$2, null, 'unminus'];"]
+            [ "- UNARY_EXPRESSION", "$$ = [$2, null, 'unary'];"],
+            [ "! UNARY_EXPRESSION", "$$ = [$2, null, 'logicalNot'];"]
         ],
 
         "MULTIPLICATIVE_EXPRESSION": [