From eb24199c8be87ba9006b1d92c5b9d3d2870a2a91 Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Mon, 22 Feb 2021 20:45:19 +0100
Subject: [PATCH] Simplify

---
 actor.ts | 6 +-----
 main.ts  | 9 ++++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/actor.ts b/actor.ts
index 8f055b6..8742c88 100644
--- a/actor.ts
+++ b/actor.ts
@@ -55,10 +55,6 @@ export class Actor {
         }
     }
 
-    ref<T>(t: T): Ref<T> {
-        return new Ref(this, t);
-    }
-
     execute(proc: () => void): void {
         queueMicrotask(() => {
             if (this.alive) {
@@ -101,7 +97,7 @@ export class Turn {
     }
 
     ref<T>(t: T, what: string = "ref"): Ref<T> {
-        return this._ensureActor(what).ref(t);
+        return new Ref(this._ensureActor(what), t);
     }
 
     spawn(bootProc: (t: Turn) => void, initialAssertions?: IdentitySet<Handle>): void {
diff --git a/main.ts b/main.ts
index 0ef0399..84f0314 100644
--- a/main.ts
+++ b/main.ts
@@ -14,7 +14,7 @@ import { Bag, ChangeDescription } from './bag';
 
 const Observe = Record.makeConstructor<Ref<Entity>>('Observe', ['label', 'observer']);
 
-function makeDataspace(): Ref<Entity> {
+function makeDataspace(): Entity {
     const handleMap: IdentityMap<Handle, Assertion> = new IdentityMap();
     const assertions = new Bag<Ref<Entity>>();
     const subscriptions: Dictionary<Dictionary<Dictionary<Handle>>> = new Dictionary();
@@ -32,8 +32,7 @@ function makeDataspace(): Ref<Entity> {
         }
     }
 
-    const a = new Actor();
-    return a.ref<Entity>({
+    return {
         [assert](turn: Turn, assertion: Assertion, handle: Handle): void {
             // console.log(`DS: assert ${assertion.asPreservesText()} :: ${handle}`);
             handleMap.set(handle, assertion);
@@ -90,7 +89,7 @@ function makeDataspace(): Ref<Entity> {
             // console.log(`DS: message ${message.asPreservesText()}`);
             forEachSubscription(message, (_handleMap, peer) => turn.message(peer, message));
         }
-    });
+    };
 }
 
 const BoxState = Record.makeConstructor<Ref<Entity>>('BoxState', ['value']);
@@ -99,7 +98,7 @@ const SetBox = Record.makeConstructor<Ref<Entity>>('SetBox', ['newValue']);
 let startTime = Date.now();
 let prevValue = 0;
 Turn.for(null, async (t: Turn) => {
-    const ds = makeDataspace();
+    const ds = new Ref(new Actor(), makeDataspace());
 
     // Box
     t.spawn(t => {