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

Convert to Immutable.js collections on the way in to Structures etc.

This commit is contained in:
Tony Garnock-Jones 2018-10-21 13:38:50 +01:00
parent 9bc38ac6ff
commit 925ebb7bea
3 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/skeleton.js
View File

@ -222,6 +222,7 @@ function del_from_handler(h, vs) {
Index.prototype.adjustAssertion = function(outerValue, delta) {
let net;
outerValue = Immutable.fromJS(outerValue);
({bag: this.allAssertions, net: net} = Bag.change(this.allAssertions, outerValue, delta));
switch (net) {
case Bag.ABSENT_TO_PRESENT:
@ -237,7 +238,7 @@ Index.prototype.addAssertion = function(v) { this.adjustAssertion(v, +1); };
Index.prototype.removeAssertion = function (v) { this.adjustAssertion(v, -1); };
Index.prototype.sendMessage = function(v) {
this.root.modify(v, ()=>{}, ()=>{}, (h, vs) => {
this.root.modify(Immutable.fromJS(v), ()=>{}, ()=>{}, (h, vs) => {
h.callbacks.forEach((cb) => {
cb(EVENT_MESSAGE, vs);
return true;

2
src/struct.js
View File

@ -54,7 +54,7 @@ function Structure(meta, fields) {
this.length = meta.arity;
this.fields = fields.slice(0);
for (var i = 0; i < fields.length; i++) {
this[i] = fields[i];
this[i] = fields[i] = Immutable.fromJS(fields[i]);
}
}

58
test/test-skeleton.js
View File

@ -39,17 +39,17 @@ describe('skeleton tests', () => {
Immutable.fromJS([]),
eventCallback(traceHolder, "2-EVENT"));
i.addAssertion(Immutable.fromJS(["hi", 123]));
i.addAssertion(Immutable.fromJS(["hi", 234]));
i.removeAssertion(Immutable.fromJS(["hi", 123]));
i.removeAssertion(Immutable.fromJS(["hi", 234]));
i.addAssertion(["hi", 123]);
i.addAssertion(["hi", 234]);
i.removeAssertion(["hi", 123]);
i.removeAssertion(["hi", 234]);
});
it('should have one add and one remove', () => {
expect(trace)
.to.equal(Immutable.List([
Event("2-EVENT", Skeleton.EVENT_ADDED, Immutable.List([])),
Event("2-EVENT", Skeleton.EVENT_REMOVED, Immutable.List([]))]));
Event("2-EVENT", Skeleton.EVENT_ADDED, []),
Event("2-EVENT", Skeleton.EVENT_REMOVED, [])]));
});
});
@ -66,21 +66,21 @@ describe('skeleton tests', () => {
Immutable.fromJS([]),
eventCallback(traceHolder, "2-EVENT"));
i.addAssertion(Immutable.fromJS(["hi", 123, 234]));
i.addAssertion(Immutable.fromJS(["hi", 999, 999]));
i.addAssertion(Immutable.fromJS(["hi", 123]));
i.addAssertion(Immutable.fromJS(["hi", 123, 234]));
i.sendMessage(Immutable.fromJS(["hi", 303]));
i.sendMessage(Immutable.fromJS(["hi", 303, 404]));
i.sendMessage(Immutable.fromJS(["hi", 303, 404, 808]));
i.removeAssertion(Immutable.fromJS(["hi", 123, 234]));
i.removeAssertion(Immutable.fromJS(["hi", 999, 999]));
i.removeAssertion(Immutable.fromJS(["hi", 123, 234]));
i.addAssertion(Immutable.fromJS(["hi", 123]));
i.addAssertion(Immutable.fromJS(["hi", 234]));
i.removeAssertion(Immutable.fromJS(["hi", 123]));
i.removeAssertion(Immutable.fromJS(["hi", 123]));
i.removeAssertion(Immutable.fromJS(["hi", 234]));
i.addAssertion(["hi", 123, 234]);
i.addAssertion(["hi", 999, 999]);
i.addAssertion(["hi", 123]);
i.addAssertion(["hi", 123, 234]);
i.sendMessage(["hi", 303]);
i.sendMessage(["hi", 303, 404]);
i.sendMessage(["hi", 303, 404, 808]);
i.removeAssertion(["hi", 123, 234]);
i.removeAssertion(["hi", 999, 999]);
i.removeAssertion(["hi", 123, 234]);
i.addAssertion(["hi", 123]);
i.addAssertion(["hi", 234]);
i.removeAssertion(["hi", 123]);
i.removeAssertion(["hi", 123]);
i.removeAssertion(["hi", 234]);
});
it('should have 8 entries', () => {
@ -89,18 +89,18 @@ describe('skeleton tests', () => {
it('should have a correct 3-EVENT subtrace', () => {
expect(trace.filter((e) => { return e[0] === "3-EVENT"; }))
.to.equal(Immutable.List([
Event("3-EVENT", Skeleton.EVENT_ADDED, Immutable.List([123, 234])),
Event("3-EVENT", Skeleton.EVENT_ADDED, Immutable.List([999, 999])),
Event("3-EVENT", Skeleton.EVENT_MESSAGE, Immutable.List([303, 404])),
Event("3-EVENT", Skeleton.EVENT_REMOVED, Immutable.List([999, 999])),
Event("3-EVENT", Skeleton.EVENT_REMOVED, Immutable.List([123, 234]))]));
Event("3-EVENT", Skeleton.EVENT_ADDED, [123, 234]),
Event("3-EVENT", Skeleton.EVENT_ADDED, [999, 999]),
Event("3-EVENT", Skeleton.EVENT_MESSAGE, [303, 404]),
Event("3-EVENT", Skeleton.EVENT_REMOVED, [999, 999]),
Event("3-EVENT", Skeleton.EVENT_REMOVED, [123, 234])]));
});
it('should have a correct 2-EVENT subtrace', () => {
expect(trace.filter((e) => { return e[0] === "2-EVENT"; }))
.to.equal(Immutable.List([
Event("2-EVENT", Skeleton.EVENT_ADDED, Immutable.List([])),
Event("2-EVENT", Skeleton.EVENT_MESSAGE, Immutable.List([])),
Event("2-EVENT", Skeleton.EVENT_REMOVED, Immutable.List([]))]));
Event("2-EVENT", Skeleton.EVENT_ADDED, []),
Event("2-EVENT", Skeleton.EVENT_MESSAGE, []),
Event("2-EVENT", Skeleton.EVENT_REMOVED, [])]));
});
// trace.forEach((e) => { console.log(e.toString()) });
});