Fix handling of template string substitutions in scanner/reader; timer driver; flappy bird demo; associated repairs

This commit is contained in:
Tony Garnock-Jones 2021-01-29 19:56:12 +01:00
parent 65bae07fc1
commit 63a2146f87
44 changed files with 544 additions and 1087 deletions

View file

@ -98,6 +98,10 @@ export class ExpansionContext {
this._collectedFields = oldCollectedFields;
}
}
argDecl(t: TemplateFunction, name: Substitution, type: Substitution): Substitution {
return (this.typescript) ? t`${name}: ${type}` : name;
}
}
function stringifyId(i: Identifier): Items {
@ -206,7 +210,8 @@ export function expand(tree: Items, ctx: ExpansionContext): Items {
${s.body}
}
on retracted ${patternText(s.pattern)} => {
const _Key = [${commaJoin(sa.captureBinders.map(t=>[t.id]))}];
const ${ctx.argDecl(t, '_Key', '__SYNDICATE__.Value[]')} =
[${commaJoin(sa.captureBinders.map(t=>[t.id]))}];
_Facets.get(_Key)?._stop();
_Facets.delete(_Key);
}
@ -271,9 +276,9 @@ export function expand(tree: Items, ctx: ExpansionContext): Items {
constPaths: ${JSON.stringify(sa.constPaths)},
constVals: [${commaJoin(sa.constVals.map(walk))}],
capturePaths: ${JSON.stringify(sa.capturePaths)},
callback: thisFacet.wrap((thisFacet, __Evt, __vs: Array<__SYNDICATE__.Value>) => {
callback: thisFacet.wrap((thisFacet, __Evt, ${ctx.argDecl(t, '__vs', 'Array<__SYNDICATE__.Value>')}) => {
if (__Evt === __SYNDICATE__.Skeleton.EventType.${expectedEvt}) {
${ctx.typescript ? joinItems(sa.captureBinders.map(binderTypeGuard(t)), '\n') : ''}
${joinItems(sa.captureBinders.map(binderTypeGuard(t)), '\n')}
thisFacet.scheduleScript(() => {${terminalWrap(t, s.terminal, walk(s.body))}});
}
})

View file

@ -57,54 +57,112 @@ export class LaxReader implements IterableIterator<Item> {
return 'eof';
}
_eofClose(): Token {
return this.scanner.makeToken(this.scanner.mark(), TokenType.CLOSE, '');
}
peek(): Token {
return this.scanner.peek() ?? this.scanner.makeToken(this.scanner.mark(), TokenType.CLOSE, '');
return this.scanner.peek() ?? this._eofClose();
}
drop() {
this.scanner.drop();
}
inTemplateString(): boolean {
const i = this.stackTop();
return (i !== null) && (i.open.text[0] === '`');
}
expectTemplateVariablePart() {
const variablePartOpen = this.peek();
if (variablePartOpen.type !== TokenType.OPEN || variablePartOpen.text !== '{')
{
throw new Error("Internal parser error: template string variable part mismatch");
}
this.drop();
this.stack.push(this.scanner.makeGroupInProgress(variablePartOpen));
}
read(): Item | null {
while (true) {
let g = this.stackTop();
const t = this.peek();
switch (t.type) {
case TokenType.SPACE:
case TokenType.NEWLINE:
case TokenType.ATOM:
case TokenType.STRING:
if (g === null) {
this.drop();
return t;
}
if (t.text === ';') {
while ('(['.indexOf(g.open.text) >= 0) {
this.stack.pop();
const outer = this.stackTop();
if (outer === null) {
// do not drop the semicolon here
return finishGroup(g, t.start);
if (this.inTemplateString()) {
const t = this.scanner.templateConstantFragment() ?? this._eofClose();
switch (t.type) {
case TokenType.CLOSE: // always means eof, in this case
return this.popUntilMatch(t) as Group; // will always be a Group
case TokenType.STRING:
if (t.text[t.text.length - 1] === '`') {
const inner = finishGroup(this.stack.pop()!, t.end);
inner.close = t;
if (this.stack.length === 0) {
return inner;
} else {
this.stackTop()!.items.push(inner);
break;
}
outer.items.push(finishGroup(g, t.start));
g = outer;
} else {
// Another unclosed fragment. Expect {...} again.
this.stackTop()!.items.push(t);
this.expectTemplateVariablePart();
break;
}
default:
throw new Error("Internal error: LaxReader.read()");
}
} else {
let g = this.stackTop();
const t = this.peek();
switch (t.type) {
case TokenType.STRING:
if (t.text[0] === '`' && t.text[t.text.length - 1] !== '`') {
// Unclosed template string - so expect {...} followed by more
// fragments. Encode this as a group with opener the first constant
// template fragment and closer the last template fragment.
this.drop();
this.stack.push(this.scanner.makeGroupInProgress(t));
// We know, from the implementation of the scanner, that the current
// character is '{'.
this.expectTemplateVariablePart();
break;
} else {
// fall through
}
case TokenType.SPACE:
case TokenType.NEWLINE:
case TokenType.ATOM:
if (g === null) {
this.drop();
return t;
}
if (t.text === ';') {
while ('(['.indexOf(g.open.text) >= 0) {
this.stack.pop();
const outer = this.stackTop();
if (outer === null) {
// do not drop the semicolon here
return finishGroup(g, t.start);
}
outer.items.push(finishGroup(g, t.start));
g = outer;
}
}
this.drop();
g.items.push(t);
break;
case TokenType.OPEN:
this.drop();
this.stack.push(this.scanner.makeGroupInProgress(t));
break;
case TokenType.CLOSE: {
this.drop();
const i = this.popUntilMatch(t);
if (i === 'eof') return null;
if (i === 'continue') break;
return i;
}
this.drop();
g.items.push(t);
break;
case TokenType.OPEN:
this.drop();
this.stack.push(this.scanner.makeGroupInProgress(t));
break;
case TokenType.CLOSE: {
this.drop();
const i = this.popUntilMatch(t);
if (i === 'eof') return null;
if (i === 'continue') break;
return i;
}
}
}

View file

@ -71,17 +71,20 @@ export abstract class Scanner implements IterableIterator<Token> {
return this.makeToken(this.mark(), type, this.shiftChar()!);
}
_str(forbidNewlines: boolean): Token {
_str(q: string, buf: string, isTemplate: boolean): Token {
const start = this.mark();
const q = this.shiftChar()!;
let buf = q;
let ch: string | null;
while (true) {
ch = this.shiftChar();
if (ch !== null) buf = buf + ch;
if (ch === null || ch === q || (forbidNewlines && (ch === '\n'))) {
if (ch === null ||
ch === q ||
(isTemplate ? (ch === '$' && this.peekChar() === '{') : (ch === '\n')))
{
return this.makeToken(start, TokenType.STRING, buf);
}
if (ch === '\\') {
ch = this.shiftChar();
if (ch === '\n') {
@ -93,6 +96,12 @@ export abstract class Scanner implements IterableIterator<Token> {
}
}
templateConstantFragment(): Token | null {
if (this.tokenBuffer !== null) throw new Error("Internal error: templateConstantFragment");
const t = this._str('`', '', true);
return (t.text.length === 0) ? null : t;
}
isSpace(ch: string): boolean {
return ' \t\r'.indexOf(ch) >= 0;
}
@ -167,9 +176,12 @@ export abstract class Scanner implements IterableIterator<Token> {
case '\'':
case '"':
return this._str(true);
this.dropChar();
return this._str(ch, ch, false);
case '`':
return this._str(false);
this.dropChar();
return this._str(ch, ch, true);
case '/':
return this._maybeComment();

View file

@ -1,13 +0,0 @@
{
"name": "@syndicate-lang/core",
"version": "0.5.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"preserves": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/preserves/-/preserves-0.4.0.tgz",
"integrity": "sha512-z38SBzivZ32q0eO6n2qsPR7GjVCuCPvaGnve0o6F5YWploI1vwpdrh/DAC/U6mwqaRmXnmpx+Vk0YwufIvzADw=="
}
}
}

View file

@ -22,6 +22,6 @@
"types": "lib/index.d.ts",
"author": "Tony Garnock-Jones <tonyg@leastfixedpoint.com>",
"dependencies": {
"preserves": "0.5.1"
"preserves": "0.5.2"
}
}

View file

@ -55,33 +55,34 @@ export class NestedDataspace extends Dataspace {
// completely-constant patterns, which cause skeleton to be null!
const innerDs = this;
this.hookEndpointLifecycle(innerEp, this.outerFacet.addEndpoint(() => {
const assertion = Observe(wrapper[0]);
const h = innerEp.spec.analysis!;
const innerCallback = h.callback;
const callback = (innerCallback === void 0) ? void 0 :
function (evt: EventType, captures: Array<Value>) {
innerCallback.call(null, evt, captures);
innerDs.start();
};
const analysis: Analysis | null = (h === null) ? null :
(h.skeleton === null
? {
skeleton: null,
constPaths: h.constPaths,
constVals: h.constVals.map(v => (v as Record)[0]),
capturePaths: h.capturePaths.map(p => p.slice(1)),
callback
}
: {
skeleton: h.skeleton.members[0],
constPaths: h.constPaths.map(p => p.slice(1)),
constVals: h.constVals,
capturePaths: h.capturePaths.map(p => p.slice(1)),
callback
});
return { assertion, analysis };
}, false));
this.hookEndpointLifecycle(innerEp, this.outerFacet.withNonScriptContext(() =>
this.outerFacet.addEndpoint(() => {
const assertion = Observe(wrapper[0]);
const h = innerEp.spec.analysis!;
const innerCallback = h.callback;
const callback = (innerCallback === void 0) ? void 0 :
function (evt: EventType, captures: Array<Value>) {
innerCallback.call(null, evt, captures);
innerDs.start();
};
const analysis: Analysis | null = (h === null) ? null :
(h.skeleton === null
? {
skeleton: null,
constPaths: h.constPaths,
constVals: h.constVals.map(v => (v as Record)[0]),
capturePaths: h.capturePaths.map(p => p.slice(1)),
callback
}
: {
skeleton: h.skeleton.members[0],
constPaths: h.constPaths.map(p => p.slice(1)),
constVals: h.constVals,
capturePaths: h.capturePaths.map(p => p.slice(1)),
callback
});
return { assertion, analysis };
}, false)));
}
adjustIndex(a: Value, count: number) {

View file

@ -210,9 +210,10 @@ class Node {
walkContinuation(node.continuation);
Object.entries(node.edges).forEach(([selectorStr, table]) => {
const selector = parseSelector(selectorStr);
let nextStack = Stack.dropNonEmpty(termStack, selector.popCount);
let nextValue = step(nextStack.item, selector.index);
let nextNode = table[classOf(nextValue)];
const nextStack = Stack.dropNonEmpty(termStack, selector.popCount);
const nextValue = step(nextStack.item, selector.index);
const nextClass = classOf(nextValue);
const nextNode = nextClass && table[nextClass];
if (nextNode) walkNode(nextNode, Stack.push(nextValue as Array<Value>, nextStack));
});
}
@ -283,13 +284,13 @@ export function constructorInfoSignature(ci: RecordConstructorInfo): string {
return canonicalString(ci.label) + '/' + ci.arity;
}
function classOf(v: any): Shape {
function classOf(v: any): Shape | null {
if (Record.isRecord(v)) {
return constructorInfoSignature(v.getConstructorInfo());
} else if (Array.isArray(v)) {
return '' + v.length;
} else {
throw new Error(preserves`Cannot route based on ${v}`);
return null;
}
}

View file

@ -0,0 +1,2 @@
index.js
index.js.map

View file

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View file

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

View file

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

View file

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

View file

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

View file

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

View file

@ -1,6 +1,9 @@
<!DOCTYPE html>
<html>
<meta charset=utf-8>
<script src="node_modules/@syndicate-lang/core/dist/syndicate.js"></script>
<script src="node_modules/@syndicate-lang/html/dist/syndicate-html.js"></script>
<script src="node_modules/@syndicate-lang/timer/dist/syndicate-timer.js"></script>
<head>
<meta name="viewport" content="width=device-width, initial-scale=0.67, maximum-scale=0.67, user-scalable=no">
<link href="css/style.css" rel="stylesheet" type="text/css">
@ -10,6 +13,7 @@
<div id="board-area" class="board">
</div>
</div>
<script src="dist/main.js"></script>
<script src="index.js"></script>
<script>Syndicate.bootModule(Main.__SYNDICATE__bootProc);</script>
</body>
</html>

View file

@ -0,0 +1,26 @@
{
"name": "@syndicate-lang/html-flappy-bird-example",
"version": "0.0.0",
"description": "HTML UI Flappy Bird Syndicate example",
"main": "index.js",
"scripts": {
"prepare": "npm run compile && npm run rollup",
"compile": "npx syndicate-tsc",
"rollup": "npx rollup -c",
"clean": "rm -rf lib/ index.js index.js.map"
},
"author": "Tony Garnock-Jones <tonyg@leastfixedpoint.com>",
"license": "GPL-3.0+",
"dependencies": {
"@syndicate-lang/core": "file:../../../core",
"@syndicate-lang/html": "file:../..",
"@syndicate-lang/timer": "file:../../../timer"
},
"devDependencies": {
"@syndicate-lang/ts-plugin": "file:../../../ts-plugin",
"@syndicate-lang/tsc": "file:../../../tsc",
"rollup": "^2.37.0",
"rollup-plugin-sourcemaps": "^0.6.3",
"typescript": "^4.1.3"
}
}

View file

@ -0,0 +1,17 @@
import sourcemaps from 'rollup-plugin-sourcemaps';
export default {
input: 'lib/index.js',
plugins: [sourcemaps()],
output: {
file: 'index.js',
format: 'umd',
name: 'Main',
sourcemap: true,
globals: {
'@syndicate-lang/core': 'Syndicate',
'@syndicate-lang/html': 'SyndicateHtml',
'@syndicate-lang/timer': 'SyndicateTimer',
},
},
};

View file

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View file

@ -0,0 +1,170 @@
//---------------------------------------------------------------------------
// @syndicate-lang/flappy-bird-demo
// Copyright (C) 2016-2021 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
//---------------------------------------------------------------------------
import { $QuitDataspace, Double, Facet, Inbound, Outbound } from '@syndicate-lang/core';
activate import { WindowEvent, template, Anchor } from '@syndicate-lang/html';
activate import { PeriodicTick } from '@syndicate-lang/timer';
assertion type Position(x, y);
assertion type GameOver();
assertion type Score(count);
message type IncreaseScore();
message type Reset();
const BOARD_HEIGHT = 567;
const FLAPPY_WIDTH = 57;
const FLAPPY_HEIGHT = 41;
const FLAPPY_XPOS = 212;
const PILLAR_WIDTH = 86;
const PILLAR_GAP = 158;
const FIELD_HEIGHT = 561;
const PILLAR_HEAD_HEIGHT = 40;
boot {
spawn named 'game-factory' {
on start spawnGame(thisFacet);
during GameOver() => {
on stop spawnGame(thisFacet);
on message WindowEvent('+keypress', $_e) => send message Reset();
on message WindowEvent('+click', $_e) => send message Reset();
}
}
}
function spawnGame<T>(thisFacet: Facet<T>) {
spawn dataspace named 'GameInstance' {
spawn named 'game-instance-control' {
during GameOver() => assert Outbound(GameOver());
on message Inbound(Reset()) => send message $QuitDataspace;
}
spawn named 'score' {
let ui = new Anchor();
field score: number = 0;
assert Score(this.score);
on start react {
assert Outbound(ui.html('#board-area',
template`<h1 class="score">${this.score}</h1>`));
stop on asserted GameOver() => react {
assert Outbound(ui.html('#board-area',
template`<h1 class="score">${this.score}<br/>GAME OVER</h1>`));
}
}
on message IncreaseScore() => this.score++;
}
spawn named 'flappy' {
let ui = new Anchor();
field xpos: number = 0;
field ypos: number = 312;
field yvel: number = 0;
assert Position(new Double(this.xpos), new Double(this.ypos));
assert Outbound(
ui.html('#board-area',
template`<div class="flappy"
style="${`transform: rotate(${2 * this.yvel}deg);
top: ${this.ypos}px`}"></div>`));
on (this.ypos > BOARD_HEIGHT - FLAPPY_HEIGHT) {
this.ypos = BOARD_HEIGHT - FLAPPY_HEIGHT;
react {
assert GameOver();
}
}
on start react {
stop on asserted GameOver();
on message Inbound(WindowEvent('+keypress', $_e)) => this.yvel = -10;
on message Inbound(WindowEvent('+click', $_e)) => this.yvel = -10;
const ms_per_tick = 1000.0 / 60;
on message Inbound(PeriodicTick(new Double(ms_per_tick))) => {
this.xpos += 0.15 * ms_per_tick;
this.ypos = (this.ypos + this.yvel);
this.yvel += ms_per_tick * 0.05;
}
}
}
spawn named 'border-scroll' {
let ui = new Anchor();
field pos: number = 0;
on asserted Position($xpos, _) => this.pos = Double.unwrap(xpos as any) % 23;
assert Outbound(ui.html(
'#board-area',
template`<div class="scrolling-border" style="${`background-position-x: ${-this.pos}px`}"></div>`,
0));
}
spawn named 'pipe-factory' {
field nextPipe: number = 0;
on asserted Score(this.nextPipe) => spawnPipe(thisFacet, this.nextPipe++);
}
function spawnPipe<T>(thisFacet: Facet<T>, i: number) {
spawn named ['pipe', i] {
let ui = new Anchor();
const xlocation = (i + 1) * 324;
const upperHeight =
Math.random() * (FIELD_HEIGHT - PILLAR_GAP - PILLAR_HEAD_HEIGHT * 6)
+ PILLAR_HEAD_HEIGHT * 3;
const lowerHeight = FIELD_HEIGHT - upperHeight - PILLAR_GAP;
stop on (this.xpos < -(PILLAR_WIDTH + FLAPPY_XPOS));
on start react { stop on (this.xpos <= 0) send message IncreaseScore(); };
field xpos: number = xlocation;
on asserted Position($xpos, _) => this.xpos = xlocation - Double.unwrap(xpos as any);
on asserted Position($xpos, $ypos) => {
if (touchingPillar(Double.unwrap(xpos as any), Double.unwrap(ypos as any))) {
react {
assert GameOver();
}
}
}
assert Outbound(ui.html(
'#board-area',
template`<div class="pillars">
<div class="pillar pillar-upper"
style="${`left: ${this.xpos + FLAPPY_XPOS}px; height: ${upperHeight}px;`}"></div>
<div class="pillar pillar-lower"
style="${`left: ${this.xpos + FLAPPY_XPOS}px; height: ${lowerHeight}px;`}"></div>
</div>`));
function touchingPillar(xpos: number, ypos: number): boolean {
const inHorizontalRange =
(xpos + FLAPPY_WIDTH >= xlocation) && (xpos <= xlocation + PILLAR_WIDTH);
const aboveGapTop = (ypos <= upperHeight);
const belowGapBottom = (ypos + FLAPPY_HEIGHT >= upperHeight + PILLAR_GAP);
return inHorizontalRange && (aboveGapTop || belowGapBottom);
}
}
}
}
}

View file

@ -0,0 +1,20 @@
{
"compilerOptions": {
"target": "ES2017",
"lib": ["ES2017", "DOM"],
"declaration": true,
"baseUrl": "./src",
"rootDir": "./src",
"outDir": "./lib",
"declarationDir": "./lib",
"esModuleInterop": true,
"moduleResolution": "node",
"module": "es6",
"sourceMap": true,
"strict": true,
"plugins": [
{ "name": "@syndicate-lang/ts-plugin" }
]
},
"include": ["src/**/*"]
}

View file

@ -1,4 +1,4 @@
<!doctype HTML>
<!DOCTYPE html>
<html>
<head>
<title>Syndicate: Table Example</title>

View file

@ -1,7 +1,7 @@
{
"name": "@syndicate-lang/syndicatec-ts-plugin-example",
"name": "@syndicate-lang/html-table-example",
"version": "0.0.0",
"description": "Simple syndicatec example in TypeScript",
"description": "Simple HTML UI Syndicate example",
"main": "index.js",
"scripts": {
"prepare": "npm run compile && npm run rollup",

View file

@ -1,4 +1,4 @@
<!doctype HTML>
<!DOCTYPE html>
<html>
<meta charset=utf-8>
<title>Demo</title>

View file

@ -1,4 +1,4 @@
<!doctype HTML>
<!DOCTYPE html>
<html>
<meta charset=utf-8>
<title>Demo</title>

1
packages/timer/Makefile Symbolic link
View file

@ -0,0 +1 @@
../../Makefile.generic-package

View file

@ -0,0 +1,31 @@
{
"name": "@syndicate-lang/timer",
"version": "0.0.0",
"description": "Time and timer driver for Syndicate",
"homepage": "https://github.com/syndicate-lang/syndicate-js/tree/master/packages/timer",
"license": "GPL-3.0+",
"publishConfig": {
"access": "public"
},
"repository": "github:syndicate-lang/syndicate-js",
"main": "dist/syndicate-timer.js",
"module": "lib/index.js",
"types": "lib/index.d.ts",
"author": "Tony Garnock-Jones <tonyg@leastfixedpoint.com>",
"scripts": {
"prepare": "npm run compile && npm run rollup",
"compile": "npx syndicate-tsc",
"compile-watch": "npx syndicate-tsc -w --verbose --intermediate-directory src.ts",
"rollup": "npx rollup -c",
"rollup-watch": "npx rollup -c -w",
"clean": "rm -rf lib/ dist/ index.js index.js.map"
},
"dependencies": {
"@syndicate-lang/core": "file:../core"
},
"devDependencies": {
"@syndicate-lang/ts-plugin": "file:../ts-plugin",
"@syndicate-lang/tsc": "file:../tsc",
"typescript": "^4.1.3"
}
}

View file

@ -0,0 +1,6 @@
import { SyndicateRollup } from '../../rollup.js';
const r = new SyndicateRollup('syndicate-timer', { globalName: 'SyndicateTimer' });
export default [
r.configNoCore('lib/index.js', r.umd),
r.configNoCore('lib/index.js', r.es6),
];

View file

@ -0,0 +1,84 @@
//---------------------------------------------------------------------------
// @syndicate-lang/driver-timer, a Syndicate driver for time-related events.
// Copyright (C) 2016-2018 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
//---------------------------------------------------------------------------
import { preserves, Observe, Dataspace, Float, Facet } from "@syndicate-lang/core";
export message type PeriodicTick(intervalMS);
export assertion type TimeLaterThan(deadlineMS);
export function sleep<T>(thisFacet: Facet<T>, ms: number, cb: () => void): void {
react {
stop on asserted TimeLaterThan(+(new Date()) + ms) {
cb();
}
}
}
boot {
spawn named 'timer/PeriodicTick' {
during Observe(PeriodicTick($intervalMS)) =>
spawn named (preserves`PeriodicTick(${intervalMS})`) {
let handle: any | null = null;
let finish: (() => void) | null = thisFacet.actor.dataspace.backgroundTask();
on start {
handle = setInterval(thisFacet.wrapExternal((thisFacet) => {
send message PeriodicTick(intervalMS);
}), Float.unwrap(intervalMS as any));
}
on stop {
if (handle) {
clearInterval(handle);
handle = null;
}
if (finish) {
finish();
finish = null;
}
}
}
}
spawn named 'timer/TimeLaterThan' {
during Observe(TimeLaterThan($deadlineMS)) =>
spawn named (preserves`TimeLaterThan(${deadlineMS})`) {
let handle: any | null = null;
let finish: (() => void) | null = thisFacet.actor.dataspace.backgroundTask();
on start {
let delta = Float.unwrap(deadlineMS as any) - (+(new Date()));
handle = setTimeout(thisFacet.wrapExternal((thisFacet) => {
handle = null;
if (finish) finish();
finish = null;
react {
assert TimeLaterThan(deadlineMS);
}
}), delta);
}
on stop {
if (handle) {
clearTimeout(handle);
handle = null;
}
if (finish) {
finish();
finish = null;
}
}
}
}
}

View file

@ -0,0 +1,20 @@
{
"compilerOptions": {
"target": "ES2017",
"lib": ["ES2017", "DOM"],
"declaration": true,
"baseUrl": "./src",
"rootDir": "./src",
"outDir": "./lib",
"declarationDir": "./lib",
"esModuleInterop": true,
"moduleResolution": "node",
"module": "es6",
"sourceMap": true,
"strict": true,
"plugins": [
{ "name": "@syndicate-lang/ts-plugin" }
]
},
"include": ["src/**/*"]
}

View file

@ -1,4 +1,4 @@
<!doctype HTML>
<!DOCTYPE html>
<html>
<meta charset=utf-8>
<title>Demo</title>

View file

@ -1,4 +1,4 @@
<!doctype HTML>
<!DOCTYPE html>
<html>
<meta charset=utf-8>
<title>Demo</title>

View file

@ -1,4 +0,0 @@
{
"presets": [ "@babel/preset-env" ],
"plugins": [ "@syndicate-lang/syntax/plugin" ]
}

View file

@ -1,22 +0,0 @@
{
"name": "@syndicate-lang/driver-timer",
"version": "0.4.1",
"description": "Time and timer driver for Syndicate/js",
"main": "lib/index.js",
"repository": "github:syndicate-lang/syndicate-js",
"author": "Tony Garnock-Jones <tonyg@leastfixedpoint.com>",
"license": "GPL-3.0+",
"publishConfig": {
"access": "public"
},
"scripts": {
"prepare": "which redo >/dev/null && redo || ../../do"
},
"homepage": "https://github.com/syndicate-lang/syndicate-js/tree/master/packages/driver-timer",
"devDependencies": {
"@syndicate-lang/syntax": "file:../syntax"
},
"dependencies": {
"@syndicate-lang/core": "file:../core"
}
}

View file

@ -1,81 +0,0 @@
//---------------------------------------------------------------------------
// @syndicate-lang/driver-timer, a Syndicate driver for time-related events.
// Copyright (C) 2016-2018 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
//---------------------------------------------------------------------------
import { Observe, Dataspace, Float } from "@syndicate-lang/core";
export { PeriodicTick, TimeLaterThan };
message type PeriodicTick(intervalMS);
assertion type TimeLaterThan(deadlineMS);
export function sleep(ms, cb) {
react {
stop on asserted TimeLaterThan(+(new Date()) + ms) {
cb();
}
}
}
spawn named 'driver-timer/PeriodicTick' {
during Observe(PeriodicTick($intervalMS)) spawn named ('PeriodicTick('+intervalMS+')') {
let handle = null;
let finish = Dataspace.backgroundTask();
on start {
handle = setInterval(Dataspace.wrapExternal(() => { send PeriodicTick(intervalMS); }),
Float.unwrap(intervalMS));
}
on stop {
if (handle) {
clearInterval(handle);
handle = null;
}
if (finish) {
finish();
finish = null;
}
}
}
}
spawn named 'driver-timer/TimeLaterThan' {
during Observe(TimeLaterThan($deadlineMS)) spawn named ('TimeLaterThan('+deadlineMS+')') {
let handle = null;
let finish = Dataspace.backgroundTask();
on start {
let delta = Float.unwrap(deadlineMS) - (+(new Date()));
handle = setTimeout(Dataspace.wrapExternal(() => {
handle = null;
finish();
finish = null;
react {
assert TimeLaterThan(deadlineMS);
}
}), delta);
}
on stop {
if (handle) {
clearTimeout(handle);
handle = null;
}
if (finish) {
finish();
finish = null;
}
}
}
}

View file

@ -1,8 +0,0 @@
{
"presets": [ "@babel/preset-env" ],
"plugins": [
"@syndicate-lang/syntax/plugin",
"@babel/plugin-transform-react-jsx",
"@babel/plugin-syntax-jsx"
]
}

View file

@ -1,674 +0,0 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a