From 264df78e4dd5f2ac89f4f410cc2092dbb6b91c7a Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Sat, 3 Nov 2018 22:26:52 +0000 Subject: [PATCH] Change message send syntax from prefix "<<" to prefix "^" --- packages/driver-timer/src/index.js | 2 +- packages/syntax-playground/src/assertionspeed.js | 2 +- packages/syntax-playground/src/messagespeed.js | 4 ++-- packages/syntax/src/generators.js | 2 +- packages/syntax/src/parser.js | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/driver-timer/src/index.js b/packages/driver-timer/src/index.js index 2a236cb..06329a9 100644 --- a/packages/driver-timer/src/index.js +++ b/packages/driver-timer/src/index.js @@ -29,7 +29,7 @@ spawn named 'driver-timer/PeriodicTick' { let finish = Dataspace.backgroundTask(); on start { handle = setInterval(Dataspace.wrapExternal(() => { - << PeriodicTick(intervalMS); + ^ PeriodicTick(intervalMS); }, intervalMS)); } on stop { diff --git a/packages/syntax-playground/src/assertionspeed.js b/packages/syntax-playground/src/assertionspeed.js index 3ff0842..af70189 100644 --- a/packages/syntax-playground/src/assertionspeed.js +++ b/packages/syntax-playground/src/assertionspeed.js @@ -37,7 +37,7 @@ spawn named 'box' { spawn named 'client' { on asserted Protocol.BoxState($v) { console.log('client sending SetBox', v + 1); - << Protocol.SetBox(v + 1); + ^ Protocol.SetBox(v + 1); } on retracted Protocol.BoxState(_) { diff --git a/packages/syntax-playground/src/messagespeed.js b/packages/syntax-playground/src/messagespeed.js index 6931f1f..568a027 100644 --- a/packages/syntax-playground/src/messagespeed.js +++ b/packages/syntax-playground/src/messagespeed.js @@ -23,13 +23,13 @@ const N = 100000; spawn { on start { - << 0; + ^ 0; } on message $v { if (v === N) { Dataspace.currentFacet().stop(() => { }); } else { - << v + 1; + ^ v + 1; } } } diff --git a/packages/syntax/src/generators.js b/packages/syntax/src/generators.js index 5185465..41c4a41 100644 --- a/packages/syntax/src/generators.js +++ b/packages/syntax/src/generators.js @@ -115,7 +115,7 @@ export function SyndicateTypeDefinition(node) { } export function MessageSendStatement(node) { - this.token("<<"); + this.token("^"); this.space(); this.print(node.body, node); this.semicolon(); diff --git a/packages/syntax/src/parser.js b/packages/syntax/src/parser.js index e02722b..651bfbd 100644 --- a/packages/syntax/src/parser.js +++ b/packages/syntax/src/parser.js @@ -54,8 +54,8 @@ export default class SyndicateParser extends _original_Parser { let previousError = null; switch (this.state.type) { - case tt.bitShift: - if (this.hasPlugin("syndicate") && (this.state.value === "<<")) { + case tt.bitwiseXOR: + if (this.hasPlugin("syndicate")) { let result = this.withBacktracking( () => { this.next();