Rename datasets fragments

Author: fritzo

lib/assert.js

@@ -87,4 +87,19 @@ assert.inverses = function (fwd, bwd, items) {
     });
 };
 
+assert.injects = function (fwd, items) {
+    var seen = {};
+    items.forEach(function (item) {
+        var result = fwd(item);
+        assert(
+            !_.has(seen, result),
+            'duplicate result:' +
+            '\n  ' + JSON.stringify(seen[result]) +
+            '\n  ' + JSON.stringify(item) +
+            '\nboth map to ' +
+            '\n  ' + result);
+        seen[result] = item;
+    });
+};
+
 module.exports = assert;

lib/compiler.js

@@ -137,6 +137,7 @@ fragments.curry = fragment([
     'CI', 'CB', 'U', 'V', 'P', 'A', 
     'APP', 'COMP', 'JOIN', 'RAND', 'VAR',
     'QUOTE', 'QLESS', 'QNLESS', 'QEQUAL',
+    //'ASSERT', 'DEFINE',
 ]);
 
 fragments.church = fragment([

test/lib/datasets.js

@@ -9,11 +9,13 @@ var tree = require('../../lib/tree');
 var SAMPLE_COUNT = 1000;
 
 var codes = stats.sampleUnique(grammar.sampleCode, SAMPLE_COUNT);
-var terms = _.map(codes, compiler.load);
-var nodes = _.map(terms, tree.load);
+var curryTerms = _.map(codes, compiler.parse);
+var churchTerms = _.map(codes, compiler.load);
+var nodes = _.map(churchTerms, tree.load);
 
 module.exports = {
     codes: codes,
-    terms: terms,
+    curryTerms: curryTerms,
+    churchTerms: churchTerms,
     nodes: nodes,
 };

test/pretty.js

@@ -18,19 +18,7 @@ mocha.suite('pretty', function () {
         assert.forward(_.compose(pretty, compiler.parse), examples);
     });
 
-    mocha.test('is one-to-one', function () {
-        var seen = {};
-        datasets.codes.forEach(function (code) {
-            var term = compiler.load(code);
-            var result = pretty(term);
-            assert(
-                !_.has(seen, result),
-                'pretty conflict:' +
-                '\n  ' + seen[result] +
-                '\n  ' + code +
-                '\nboth map to ' +
-                '\n  ' + result);
-            seen[result] = code;
-        });
+    mocha.test('is one-to-one on churchTerms', function () {
+        assert.injects(pretty, datasets.churchTerms);
     });
 });

test/serialize.js

@@ -20,7 +20,7 @@ mocha.suite('serialize', function () {
         assert.inverses(compiler.parse, compiler.print, datasets.codes);
     });
 
-    mocha.test('works on datasets.terms', function () {
-        assert.inverses(compiler.print, compiler.parse, datasets.terms);
+    mocha.test('works on datasets.curryTerms', function () {
+        assert.inverses(compiler.print, compiler.parse, datasets.curryTerms);
     });
 });

test/tree.js

@@ -18,7 +18,7 @@ mocha.suite('tree', function () {
         assert.inverses(tree.load, tree.dump, _.map(examples, compiler.load));
     });
 
-    mocha.test('load;dump on datasets.terms', function () {
-        assert.inverses(tree.load, tree.dump, datasets.terms);
+    mocha.test('load;dump on datasets.churchTerms', function () {
+        assert.inverses(tree.load, tree.dump, datasets.churchTerms);
     });
 });