syndicate-lang
/
syndicate-2017
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use immutable sets/lists for projection results

This commit is contained in:
Tony Garnock-Jones 2016-02-06 05:47:14 -05:00
parent bfd8203a7a
commit 7d1a0c58c2
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/src/route.js
View File

@ -902,10 +902,10 @@ function project(m, compiledProjection) {
}
function trieKeys(m) {
if (is_emptyTrie(m)) return [];
if (is_emptyTrie(m)) return Immutable.Set();
var result = walkSeq(m, function (vss, vsk) { return vss; });
if (result === null) return null;
return result.map(function (vs) { return vs.toArray() });
return Immutable.Set(result);
function walk(m, k) {
if (m instanceof $WildcardSequence) return null;
@ -968,16 +968,13 @@ function trieKeys(m) {
function trieKeysToObjects(trieKeysResult, compiledProjection) {
if (trieKeysResult === null) return null;
var result = [];
for (var i = 0; i < trieKeysResult.length; i++) {
var e = trieKeysResult[i];
return trieKeysResult.toList().map(function (e) {
var d = {};
for (var j = 0; j < e.length; j++) {
d[compiledProjection.names[j] || ('$' + j)] = e[j];
}
result.push(d);
}
return result;
e.forEach(function (key, index) {
d[compiledProjection.names[index] || ('$' + index)] = key;
});
return d;
});
}
function projectObjects(m, compiledProjection) {

13
js/test/test-route.js
View File

@ -10,8 +10,7 @@ function checkPrettyTrie(m, expected) {
}
function checkTrieKeys(actual, expected) {
expect((Immutable.Set(actual).map(Immutable.List))
.equals(Immutable.Set(expected).map(Immutable.List))).to.be(true);
expect(actual.equals(Immutable.Set(expected).map(Immutable.List))).to.be(true);
}
describe("basic pattern compilation", function () {
@ -282,9 +281,9 @@ describe("trieKeys using multiple-values in projections", function () {
});
it("should be convertible into objects with $-indexed fields", function () {
expect(r.trieKeysToObjects(r.trieKeys(M2), proj))
expect(r.trieKeysToObjects(r.trieKeys(M2), proj).toArray())
.to.eql([{'$0': 3, '$1': 4}, {'$0': 1, '$1': 2}, {'$0': 1, '$1': 3}]);
expect(r.projectObjects(M, proj))
expect(r.projectObjects(M, proj).toArray())
.to.eql([{'$0': 3, '$1': 4}, {'$0': 1, '$1': 2}, {'$0': 1, '$1': 3}]);
});
});
@ -295,14 +294,14 @@ describe("trieKeys using multiple-values in projections, with names", function (
r.compilePattern(Immutable.Set(['B']), [3, 4]));
it("should yield named fields", function () {
expect(r.projectObjects(M, r.compileProjection([r._$("fst"), r._$("snd")])))
expect(r.projectObjects(M, r.compileProjection([r._$("fst"), r._$("snd")])).toArray())
.to.eql([{'fst': 3, 'snd': 4}, {'fst': 1, 'snd': 2}, {'fst': 1, 'snd': 3}]);
});
it("should yield numbered fields where names are missing", function () {
expect(r.projectObjects(M, r.compileProjection([r._$, r._$("snd")])))
expect(r.projectObjects(M, r.compileProjection([r._$, r._$("snd")])).toArray())
.to.eql([{'$0': 3, 'snd': 4}, {'$0': 1, 'snd': 2}, {'$0': 1, 'snd': 3}]);
expect(r.projectObjects(M, r.compileProjection([r._$("fst"), r._$])))
expect(r.projectObjects(M, r.compileProjection([r._$("fst"), r._$])).toArray())
.to.eql([{'fst': 3, '$1': 4}, {'fst': 1, '$1': 2}, {'fst': 1, '$1': 3}]);
});
});