From 33948be6b138b2fe3ac8af01b1840ea87160b0da Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Fri, 3 Dec 2021 01:00:47 +0100 Subject: [PATCH] Get the JS target basics working --- packages/compiler/src/compiler/codegen.ts | 4 ++-- packages/syndicatec/examples/javascript/src/index.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/compiler/src/compiler/codegen.ts b/packages/compiler/src/compiler/codegen.ts index 4b20258..c1f81b2 100644 --- a/packages/compiler/src/compiler/codegen.ts +++ b/packages/compiler/src/compiler/codegen.ts @@ -69,7 +69,7 @@ export class ExpansionContext { } argDecl(t: TemplateFunction, name: Substitution, type: Substitution): Items { - return (this.typescript) ? t`${name}: ${type}` : t`name`; + return (this.typescript) ? t`${name}: ${type}` : t`${name}`; } turnDecl(t: TemplateFunction): Items { @@ -215,7 +215,7 @@ ${joinItems(sa.captureBinders.map(binderTypeGuard(t)), '\n')} switch (s.triggerType) { case 'asserted': entity = t`{ - assert(${ctx.turnDecl(t)}, ${ctx.argDecl(t, '__vs', '__SYNDICATE__.AnyValue')}, __handle: __SYNDICATE__.Handle) { + assert(${ctx.turnDecl(t)}, ${ctx.argDecl(t, '__vs', '__SYNDICATE__.AnyValue')}, ${ctx.argDecl(t, '__handle', '__SYNDICATE__.Handle')}) { ${guardBody(terminalWrap(t, s.terminal, walk(s.body)))} } }`; diff --git a/packages/syndicatec/examples/javascript/src/index.js b/packages/syndicatec/examples/javascript/src/index.js index 14451a5..e81a4c6 100644 --- a/packages/syndicatec/examples/javascript/src/index.js +++ b/packages/syndicatec/examples/javascript/src/index.js @@ -10,6 +10,6 @@ console.time('box-and-client-' + N.toString()); boot() { thisTurn.activeFacet.preventInertCheck(); const ds = create new Dataspace(); - Box.boot(ds); - Client.boot(ds, () => console.timeEnd('box-and-client-' + N.toString())); + Box.boot(thisTurn, ds); + Client.boot(thisTurn, ds, () => console.timeEnd('box-and-client-' + N.toString())); }