From c7c9d8b49fc5ea4103781c6480b3e924792518bf Mon Sep 17 00:00:00 2001 From: jesslin02 Date: Tue, 21 Mar 2023 02:47:36 +0800 Subject: [PATCH 01/14] updated build --- package-lock.json | 2190 +++++++++++++++++++++++------------------ package.json | 42 +- src/build_commands.ts | 2 +- src/extension.ts | 4 +- 4 files changed, 1234 insertions(+), 1004 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0934c1fa5..c470f6ac1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,36 +10,36 @@ "hasInstallScript": true, "license": "BSD-2-Clause", "dependencies": { - "vscode-languageclient": "^6.1.3" + "vscode-languageclient": "^8.0.2" }, "devDependencies": { - "@types/chai": "^4.3.1", - "@types/chai-spies": "^1.0.0", - "@types/mocha": "^9.1.1", - "@types/node": "^17.0.21", + "@types/chai": "^4.3.4", + "@types/chai-spies": "^1.0.3", + "@types/mocha": "^10.0.1", + "@types/node": "^18.11.18", "@types/rimraf": "^3.0.2", - "@types/vscode": "^1.49.0", + "@types/vscode": "^1.74.0", "@types/which": "^2.0.1", - "@vscode/test-electron": "^2.1.3", - "chai": "^4.3.4", + "@vscode/test-electron": "^2.2.3", + "chai": "^4.3.7", "chai-spies": "^1.0.0", - "colorette": "^2.0.16", - "commander": "^8.3.0", - "esbuild": "^0.14.2", - "glob": "^8.0.3", + "colorette": "^2.0.19", + "commander": "^10.0.0", + "esbuild": "^0.17.5", + "glob": "^8.1.0", "maven": "^5.0.0", - "mocha": "^10.0.0", - "node": "^17.3.0", - "rimraf": "^3.0.2", - "simple-git": "^3.7.1", + "mocha": "^10.2.0", + "node": "^18.13.0", + "rimraf": "^4.1.2", + "simple-git": "^3.16.0", "ts-node": "^10.9.1", - "typescript": "^4.6.4", - "url-exist": "^3.0.0", - "vsce": "^2.7.0", - "which": "^2.0.2" + "typescript": "^4.9.5", + "url-exist": "^3.0.1", + "vsce": "^2.15.0", + "which": "^3.0.0" }, "engines": { - "vscode": "^1.49.0" + "vscode": "^1.74.0" } }, "node_modules/@cspotcode/source-map-support": { @@ -54,6 +54,358 @@ "node": ">=12" } }, + "node_modules/@esbuild/android-arm": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.12.tgz", + "integrity": "sha512-E/sgkvwoIfj4aMAPL2e35VnUJspzVYl7+M1B2cqeubdBhADV4uPon0KCc8p2G+LqSJ6i8ocYPCqY3A4GGq0zkQ==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.12.tgz", + "integrity": "sha512-WQ9p5oiXXYJ33F2EkE3r0FRDFVpEdcDiwNX3u7Xaibxfx6vQE0Sb8ytrfQsA5WO6kDn6mDfKLh6KrPBjvkk7xA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.12.tgz", + "integrity": "sha512-m4OsaCr5gT+se25rFPHKQXARMyAehHTQAz4XX1Vk3d27VtqiX0ALMBPoXZsGaB6JYryCLfgGwUslMqTfqeLU0w==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.12.tgz", + "integrity": "sha512-O3GCZghRIx+RAN0NDPhyyhRgwa19MoKlzGonIb5hgTj78krqp9XZbYCvFr9N1eUxg0ZQEpiiZ4QvsOQwBpP+lg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.12.tgz", + "integrity": "sha512-5D48jM3tW27h1qjaD9UNRuN+4v0zvksqZSPZqeSWggfMlsVdAhH3pwSfQIFJwcs9QJ9BRibPS4ViZgs3d2wsCA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.12.tgz", + "integrity": "sha512-OWvHzmLNTdF1erSvrfoEBGlN94IE6vCEaGEkEH29uo/VoONqPnoDFfShi41Ew+yKimx4vrmmAJEGNoyyP+OgOQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.12.tgz", + "integrity": "sha512-A0Xg5CZv8MU9xh4a+7NUpi5VHBKh1RaGJKqjxe4KG87X+mTjDE6ZvlJqpWoeJxgfXHT7IMP9tDFu7IZ03OtJAw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.12.tgz", + "integrity": "sha512-WsHyJ7b7vzHdJ1fv67Yf++2dz3D726oO3QCu8iNYik4fb5YuuReOI9OtA+n7Mk0xyQivNTPbl181s+5oZ38gyA==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.12.tgz", + "integrity": "sha512-cK3AjkEc+8v8YG02hYLQIQlOznW+v9N+OI9BAFuyqkfQFR+DnDLhEM5N8QRxAUz99cJTo1rLNXqRrvY15gbQUg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.12.tgz", + "integrity": "sha512-jdOBXJqcgHlah/nYHnj3Hrnl9l63RjtQ4vn9+bohjQPI2QafASB5MtHAoEv0JQHVb/xYQTFOeuHnNYE1zF7tYw==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.12.tgz", + "integrity": "sha512-GTOEtj8h9qPKXCyiBBnHconSCV9LwFyx/gv3Phw0pa25qPYjVuuGZ4Dk14bGCfGX3qKF0+ceeQvwmtI+aYBbVA==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.12.tgz", + "integrity": "sha512-o8CIhfBwKcxmEENOH9RwmUejs5jFiNoDw7YgS0EJTF6kgPgcqLFjgoc5kDey5cMHRVCIWc6kK2ShUePOcc7RbA==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.12.tgz", + "integrity": "sha512-biMLH6NR/GR4z+ap0oJYb877LdBpGac8KfZoEnDiBKd7MD/xt8eaw1SFfYRUeMVx519kVkAOL2GExdFmYnZx3A==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.12.tgz", + "integrity": "sha512-jkphYUiO38wZGeWlfIBMB72auOllNA2sLfiZPGDtOBb1ELN8lmqBrlMiucgL8awBw1zBXN69PmZM6g4yTX84TA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.12.tgz", + "integrity": "sha512-j3ucLdeY9HBcvODhCY4b+Ds3hWGO8t+SAidtmWu/ukfLLG/oYDMaA+dnugTVAg5fnUOGNbIYL9TOjhWgQB8W5g==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.12.tgz", + "integrity": "sha512-uo5JL3cgaEGotaqSaJdRfFNSCUJOIliKLnDGWaVCgIKkHxwhYMm95pfMbWZ9l7GeW9kDg0tSxcy9NYdEtjwwmA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.12.tgz", + "integrity": "sha512-DNdoRg8JX+gGsbqt2gPgkgb00mqOgOO27KnrWZtdABl6yWTST30aibGJ6geBq3WM2TIeW6COs5AScnC7GwtGPg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.12.tgz", + "integrity": "sha512-aVsENlr7B64w8I1lhHShND5o8cW6sB9n9MUtLumFlPhG3elhNWtE7M1TFpj3m7lT3sKQUMkGFjTQBrvDDO1YWA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.12.tgz", + "integrity": "sha512-qbHGVQdKSwi0JQJuZznS4SyY27tYXYF0mrgthbxXrZI3AHKuRvU+Eqbg/F0rmLDpW/jkIZBlCO1XfHUBMNJ1pg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.12.tgz", + "integrity": "sha512-zsCp8Ql+96xXTVTmm6ffvoTSZSV2B/LzzkUXAY33F/76EajNw1m+jZ9zPfNJlJ3Rh4EzOszNDHsmG/fZOhtqDg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.12.tgz", + "integrity": "sha512-FfrFjR4id7wcFYOdqbDfDET3tjxCozUgbqdkOABsSFzoZGFC92UK7mg4JKRc/B3NNEf1s2WHxJ7VfTdVDPN3ng==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.12.tgz", + "integrity": "sha512-JOOxw49BVZx2/5tW3FqkdjSD/5gXYeVGPDcB0lvap0gLQshkh1Nyel1QazC+wNxus3xPlsYAgqU1BUmrmCvWtw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", @@ -128,15 +480,15 @@ "dev": true }, "node_modules/@types/chai": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.1.tgz", - "integrity": "sha512-/zPMqDkzSZ8t3VtxOa4KPq7uzzW978M9Tvh+j7GHKuo6k6GTLxPJ4J5gE5cjfJ26pnXst0N5Hax8Sr0T2Mi9zQ==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.4.tgz", + "integrity": "sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw==", "dev": true }, "node_modules/@types/chai-spies": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@types/chai-spies/-/chai-spies-1.0.0.tgz", - "integrity": "sha512-Bj/froHomMnlAPEYEeqhmSuNSjTWW/VuSvCVdhLdcb67+dy4ffjTR6fC0YYw9tHP6KR3U8fkF1mgzmzlChHc5Q==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@types/chai-spies/-/chai-spies-1.0.3.tgz", + "integrity": "sha512-RBZjhVuK7vrg4rWMt04UF5zHYwfHnpk5mIWu3nQvU3AKGDixXzSjZ6v0zke6pBcaJqMv3IBZ5ibLWPMRDL0sLw==", "dev": true, "dependencies": { "@types/chai": "*" @@ -159,15 +511,15 @@ "dev": true }, "node_modules/@types/mocha": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz", - "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.1.tgz", + "integrity": "sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q==", "dev": true }, "node_modules/@types/node": { - "version": "17.0.45", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz", - "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==", + "version": "18.15.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.3.tgz", + "integrity": "sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw==", "dev": true }, "node_modules/@types/rimraf": { @@ -181,9 +533,9 @@ } }, "node_modules/@types/vscode": { - "version": "1.67.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.67.0.tgz", - "integrity": "sha512-GH8BDf8cw9AC9080uneJfulhSa7KHSMI2s/CyKePXoGNos9J486w2V4YKoeNUqIEkW4hKoEAWp6/cXTwyGj47g==", + "version": "1.76.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.76.0.tgz", + "integrity": "sha512-CQcY3+Fe5hNewHnOEAVYj4dd1do/QHliXaknAEYSXx2KEHUzFibDZSKptCon+HPgK55xx20pR+PBJjf0MomnBA==", "dev": true }, "node_modules/@types/which": { @@ -192,25 +544,19 @@ "integrity": "sha512-Jjakcv8Roqtio6w1gr0D7y6twbhx6gGgFGF5BLwajPpnOIOxFkakFhCq+LmyyeAz7BX6ULrjBOxdKaCDy+4+dQ==", "dev": true }, - "node_modules/@ungap/promise-all-settled": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", - "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", - "dev": true - }, "node_modules/@vscode/test-electron": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.1.3.tgz", - "integrity": "sha512-ps/yJ/9ToUZtR1dHfWi1mDXtep1VoyyrmGKC3UnIbScToRQvbUjyy1VMqnMEW3EpMmC3g7+pyThIPtPyCLHyow==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.3.0.tgz", + "integrity": "sha512-fwzA9RtazH1GT/sckYlbxu6t5e4VaMXwCVtyLv4UAG0hP6NTfnMaaG25XCfWqlVwFhBMcQXHBCy5dmz2eLUnkw==", "dev": true, "dependencies": { "http-proxy-agent": "^4.0.1", "https-proxy-agent": "^5.0.0", - "rimraf": "^3.0.2", - "unzipper": "^0.10.11" + "jszip": "^3.10.1", + "semver": "^7.3.8" }, "engines": { - "node": ">=8.9.3" + "node": ">=16" } }, "node_modules/@vscode/test-electron/node_modules/agent-base": { @@ -363,8 +709,7 @@ "node_modules/balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "node_modules/base64-js": { "version": "1.5.1", @@ -383,30 +728,8 @@ { "type": "consulting", "url": "https://feross.org/support" - } - ] - }, - "node_modules/big-integer": { - "version": "1.6.51", - "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", - "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==", - "dev": true, - "engines": { - "node": ">=0.6" - } - }, - "node_modules/binary": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz", - "integrity": "sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==", - "dev": true, - "dependencies": { - "buffers": "~0.1.1", - "chainsaw": "~0.1.0" - }, - "engines": { - "node": "*" - } + } + ] }, "node_modules/binary-extensions": { "version": "2.2.0", @@ -442,12 +765,6 @@ "node": ">= 6" } }, - "node_modules/bluebird": { - "version": "3.4.7", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz", - "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==", - "dev": true - }, "node_modules/boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", @@ -515,24 +832,6 @@ "node": "*" } }, - "node_modules/buffer-indexof-polyfill": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz", - "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==", - "dev": true, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/buffers": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz", - "integrity": "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==", - "dev": true, - "engines": { - "node": ">=0.2.0" - } - }, "node_modules/call-bind": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", @@ -547,15 +846,16 @@ } }, "node_modules/chai": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz", - "integrity": "sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz", + "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==", "dev": true, "dependencies": { "assertion-error": "^1.1.0", "check-error": "^1.0.2", - "deep-eql": "^3.0.1", + "deep-eql": "^4.1.2", "get-func-name": "^2.0.0", + "loupe": "^2.3.1", "pathval": "^1.1.1", "type-detect": "^4.0.5" }, @@ -575,18 +875,6 @@ "chai": "*" } }, - "node_modules/chainsaw": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz", - "integrity": "sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==", - "dev": true, - "dependencies": { - "traverse": ">=0.3.0 <0.4" - }, - "engines": { - "node": "*" - } - }, "node_modules/chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", @@ -760,18 +1048,18 @@ "dev": true }, "node_modules/colorette": { - "version": "2.0.16", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", - "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==", + "version": "2.0.19", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz", + "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", "dev": true }, "node_modules/commander": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", - "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.0.tgz", + "integrity": "sha512-zS5PnTI22FIRM6ylNW8G4Ap0IEOyk62fhLSD0+uHRT9McRCLGpkVNvao4bjimpK/GShynyQkFFxHhwMcETmduA==", "dev": true, "engines": { - "node": ">= 12" + "node": ">=14" } }, "node_modules/concat-map": { @@ -827,12 +1115,12 @@ } }, "node_modules/data-uri-to-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz", - "integrity": "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", + "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==", "dev": true, "engines": { - "node": ">= 6" + "node": ">= 12" } }, "node_modules/debug": { @@ -883,15 +1171,15 @@ } }, "node_modules/deep-eql": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz", + "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==", "dev": true, "dependencies": { "type-detect": "^4.0.0" }, "engines": { - "node": ">=0.12" + "node": ">=6" } }, "node_modules/deep-extend": { @@ -985,15 +1273,6 @@ "url": "https://github.com/fb55/domutils?sponsor=1" } }, - "node_modules/duplexer2": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", - "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", - "dev": true, - "dependencies": { - "readable-stream": "^2.0.2" - } - }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -1019,254 +1298,41 @@ } }, "node_modules/esbuild": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.3.tgz", - "integrity": "sha512-zyEC5hkguW2oieXRXp8VJzQdcO/1FxCS5GjzqOHItRlojXnx/cTavsrkxdWvBH9li2lUq0bN+LeeVEmyCwiR/Q==", + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.12.tgz", + "integrity": "sha512-bX/zHl7Gn2CpQwcMtRogTTBf9l1nl+H6R8nUbjk+RuKqAE3+8FDulLA+pHvX7aA7Xe07Iwa+CWvy9I8Y2qqPKQ==", "dev": true, "hasInstallScript": true, "bin": { "esbuild": "bin/esbuild" }, + "engines": { + "node": ">=12" + }, "optionalDependencies": { - "esbuild-android-arm64": "0.14.3", - "esbuild-darwin-64": "0.14.3", - "esbuild-darwin-arm64": "0.14.3", - "esbuild-freebsd-64": "0.14.3", - "esbuild-freebsd-arm64": "0.14.3", - "esbuild-linux-32": "0.14.3", - "esbuild-linux-64": "0.14.3", - "esbuild-linux-arm": "0.14.3", - "esbuild-linux-arm64": "0.14.3", - "esbuild-linux-mips64le": "0.14.3", - "esbuild-linux-ppc64le": "0.14.3", - "esbuild-netbsd-64": "0.14.3", - "esbuild-openbsd-64": "0.14.3", - "esbuild-sunos-64": "0.14.3", - "esbuild-windows-32": "0.14.3", - "esbuild-windows-64": "0.14.3", - "esbuild-windows-arm64": "0.14.3" - } - }, - "node_modules/esbuild-android-arm64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.3.tgz", - "integrity": "sha512-v/vdnGJiSGWOAXzg422T9qb4S+P3tOaYtc5n3FDR27Bh3/xQDS7PdYz/yY7HhOlVp0eGwWNbPHEi8FcEhXjsuw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/esbuild-darwin-64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.3.tgz", - "integrity": "sha512-swY5OtEg6cfWdgc/XEjkBP7wXSyXXeZHEsWMdh1bDiN1D6GmRphk9SgKFKTj+P3ZHhOGIcC1+UdIwHk5bUcOig==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/esbuild-darwin-arm64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.3.tgz", - "integrity": "sha512-6i9dXPk8oT87wF6VHmwzSad76eMRU2Rt+GXrwF3Y4DCJgnPssJbabNQ9gurkuEX8M0YnEyJF0d1cR7rpTzcEiA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/esbuild-freebsd-64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.3.tgz", - "integrity": "sha512-WDY5ENsmyceeE+95U3eI+FM8yARY5akWkf21M/x/+v2P5OVsYqCYELglSeAI5Y7bhteCVV3g4i2fRqtkmprdSA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ] - }, - "node_modules/esbuild-freebsd-arm64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.3.tgz", - "integrity": "sha512-4BEEGcP0wBzg04pCCWXlgaPuksQHHfwHvYgCIsi+7IsuB17ykt6MHhTkHR5b5pjI/jNtRhPfMsDODUyftQJgvw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ] - }, - "node_modules/esbuild-linux-32": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.3.tgz", - "integrity": "sha512-8yhsnjLG/GwCA1RAIndjmCHWViRB2Ol0XeOh2fCXS9qF8tlVrJB7qAiHZpm2vXx+yjOA/bFLTxzU+5pMKqkn5A==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/esbuild-linux-64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.3.tgz", - "integrity": "sha512-eNq4aixfbwXHIJq4bQDe+XaSNV1grxqpZYs/zHbp0HGHf6SBNlTI02uyTbYGpIzlXmCEPS9tpPCi7BTU45kcJQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/esbuild-linux-arm": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.3.tgz", - "integrity": "sha512-YcMvJHAQnWrWKb+eLxN9e/iWUC/3w01UF/RXuMknqOW3prX8UQ63QknWz9/RI8BY/sdrdgPEbSmsTU2jy2cayQ==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/esbuild-linux-arm64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.3.tgz", - "integrity": "sha512-wPLyRoqoV/tEMQ7M24DpAmCMyKqBmtgZY35w2tXM8X5O5b2Ohi7fkPSmd6ZgLIxZIApWt88toA8RT0S7qoxcOA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/esbuild-linux-mips64le": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.3.tgz", - "integrity": "sha512-DdmfM5rcuoqjQL3px5MbquAjZWnySB5LdTrg52SSapp0gXMnGcsM6GY2WVta02CMKn5qi7WPVG4WbqTWE++tJw==", - "cpu": [ - "mips64el" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/esbuild-linux-ppc64le": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.3.tgz", - "integrity": "sha512-ujdqryj0m135Ms9yaNDVFAcLeRtyftM/v2v7Osji5zElf2TivSMdFxdrYnYICuHfkm8c8gHg1ncwqitL0r+nnA==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/esbuild-netbsd-64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.3.tgz", - "integrity": "sha512-Z/UB9OUdwo1KDJCSGnVueDuKowRZRkduLvRMegHtDBHC3lS5LfZ3RdM1i+4MMN9iafyk8Q9FNcqIXI178ZujvA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "netbsd" - ] - }, - "node_modules/esbuild-openbsd-64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.3.tgz", - "integrity": "sha512-9I1uoMDeogq3zQuTe3qygmXYjImnvc6rBn51LLbLniQDlfvqHPBMnAZ/5KshwtXXIIMkCwByytDZdiuzRRlTvQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "openbsd" - ] - }, - "node_modules/esbuild-sunos-64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.3.tgz", - "integrity": "sha512-pldqx/Adxl4V4ymiyKxOOyJmHn6nUIo3wqk2xBx07iDgmL2XTcDDQd7N4U4QGu9LnYN4ZF+8IdOYa3oRRpbjtg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "sunos" - ] - }, - "node_modules/esbuild-windows-32": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.3.tgz", - "integrity": "sha512-AqzvA/KbkC2m3kTXGpljLin3EttRbtoPTfBn6w6n2m9MWkTEbhQbE1ONoOBxhO5tExmyJdL/6B87TJJD5jEFBQ==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/esbuild-windows-64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.3.tgz", - "integrity": "sha512-HGg3C6113zLGB5hN41PROTnBuoh/arG2lQdOird6xFl9giff1cAfMQOUJUfODKD57dDqHjQ1YGW8gOkg0/IrWw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/esbuild-windows-arm64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.3.tgz", - "integrity": "sha512-qB2izYu4VpigGnOrAN2Yv7ICYLZWY/AojZtwFfteViDnHgW4jXPYkHQIXTISJbRz25H2cYiv+MfRQYK31RNjlw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] + "@esbuild/android-arm": "0.17.12", + "@esbuild/android-arm64": "0.17.12", + "@esbuild/android-x64": "0.17.12", + "@esbuild/darwin-arm64": "0.17.12", + "@esbuild/darwin-x64": "0.17.12", + "@esbuild/freebsd-arm64": "0.17.12", + "@esbuild/freebsd-x64": "0.17.12", + "@esbuild/linux-arm": "0.17.12", + "@esbuild/linux-arm64": "0.17.12", + "@esbuild/linux-ia32": "0.17.12", + "@esbuild/linux-loong64": "0.17.12", + "@esbuild/linux-mips64el": "0.17.12", + "@esbuild/linux-ppc64": "0.17.12", + "@esbuild/linux-riscv64": "0.17.12", + "@esbuild/linux-s390x": "0.17.12", + "@esbuild/linux-x64": "0.17.12", + "@esbuild/netbsd-x64": "0.17.12", + "@esbuild/openbsd-x64": "0.17.12", + "@esbuild/sunos-x64": "0.17.12", + "@esbuild/win32-arm64": "0.17.12", + "@esbuild/win32-ia32": "0.17.12", + "@esbuild/win32-x64": "0.17.12" + } }, "node_modules/escalade": { "version": "3.1.1", @@ -1314,17 +1380,26 @@ } }, "node_modules/fetch-blob": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-2.1.2.tgz", - "integrity": "sha512-YKqtUDwqLyfyMnmbw8XD6Q8j9i/HggKtPEI+pZ1+8bvheBu78biSmNaXWusx1TauGqtUUGx/cBb1mKdq2rLYow==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz", + "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==", "dev": true, - "engines": { - "node": "^10.17.0 || >=12.3.0" - }, - "peerDependenciesMeta": { - "domexception": { - "optional": true + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/jimmywarting" + }, + { + "type": "paypal", + "url": "https://paypal.me/jimmywarting" } + ], + "dependencies": { + "node-domexception": "^1.0.0", + "web-streams-polyfill": "^3.0.3" + }, + "engines": { + "node": "^12.20 || >= 14.13" } }, "node_modules/fill-range": { @@ -1348,6 +1423,18 @@ "flat": "cli.js" } }, + "node_modules/formdata-polyfill": { + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", + "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==", + "dev": true, + "dependencies": { + "fetch-blob": "^3.1.2" + }, + "engines": { + "node": ">=12.20.0" + } + }, "node_modules/fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", @@ -1356,69 +1443,22 @@ }, "node_modules/fs.realpath": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/fstream": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", - "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.2", - "inherits": "~2.0.0", - "mkdirp": ">=0.5 0", - "rimraf": "2" - }, - "engines": { - "node": ">=0.6" - } - }, - "node_modules/fstream/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true }, - "node_modules/fstream/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, "node_modules/function-bind": { @@ -1482,9 +1522,9 @@ "dev": true }, "node_modules/glob": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz", - "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", @@ -1533,12 +1573,6 @@ "node": ">=10" } }, - "node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true - }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -1638,6 +1672,12 @@ } ] }, + "node_modules/immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==", + "dev": true + }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -1736,12 +1776,12 @@ } }, "node_modules/is-url-superb": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-url-superb/-/is-url-superb-5.0.0.tgz", - "integrity": "sha512-jGkG59ra7/JlcV8ap3dsc0M79IgpuFU/obfsSf6X5D0z1NVvFTFuzt4ob7nfBTZEPbTwjGXVKNQDfWfPghapKQ==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/is-url-superb/-/is-url-superb-6.1.0.tgz", + "integrity": "sha512-LXdhGlYqUPdvEyIhWPEEwYYK3yrUiPcBjmFGlZNv1u5GtIL5qQRf7ddDyPNAvsMFqdzS923FROpTQU97tLe3JQ==", "dev": true, "engines": { - "node": ">=10" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -1759,6 +1799,18 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, + "node_modules/jszip": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", + "dev": true, + "dependencies": { + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "setimmediate": "^1.0.5" + } + }, "node_modules/keytar": { "version": "7.7.0", "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz", @@ -1771,9 +1823,9 @@ } }, "node_modules/ky": { - "version": "0.26.0", - "resolved": "https://registry.npmjs.org/ky/-/ky-0.26.0.tgz", - "integrity": "sha512-j2YwAGYuD/XXoyzzUYn1N9NEGoAukkONMea2uLanMPWTqumkwme9eWgf2SjhRKNRb/60FDYStJYL582dbbt9Mw==", + "version": "0.27.0", + "resolved": "https://registry.npmjs.org/ky/-/ky-0.27.0.tgz", + "integrity": "sha512-pgaBuB6wI9DdMSOZBVh2WkcbkAdEG5AUEWuNhtThu6FLIpDbzqzC/fSMmqr/j1wwQyW3SP3KGau7EbzWNkQ/yg==", "dev": true, "engines": { "node": ">=12" @@ -1783,13 +1835,13 @@ } }, "node_modules/ky-universal": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/ky-universal/-/ky-universal-0.9.1.tgz", - "integrity": "sha512-o0u8z6Lp8bZAevZWJkZXuQH4JGFIUM1FeHRdtdmcgSsEoP8Ane4TNJWtiv0UOYKRmYGlYsF15zX6kR1S31Q8sg==", + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/ky-universal/-/ky-universal-0.10.1.tgz", + "integrity": "sha512-r8909k+ELKZAxhVA5c440x22hqw5XcMRwLRbgpPQk4JHy3/ddJnvzcnSo5Ww3HdKdNeS3Y8dBgcIYyVahMa46g==", "dev": true, "dependencies": { "abort-controller": "^3.0.0", - "node-fetch": "3.0.0-beta.9" + "node-fetch": "^3.2.2" }, "engines": { "node": ">=14" @@ -1816,6 +1868,15 @@ "node": ">=6" } }, + "node_modules/lie": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "dev": true, + "dependencies": { + "immediate": "~3.0.5" + } + }, "node_modules/linkify-it": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz", @@ -1825,12 +1886,6 @@ "uc.micro": "^1.0.1" } }, - "node_modules/listenercount": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz", - "integrity": "sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=", - "dev": true - }, "node_modules/log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -1917,11 +1972,19 @@ "node": ">=8" } }, + "node_modules/loupe": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz", + "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==", + "dev": true, + "dependencies": { + "get-func-name": "^2.0.0" + } + }, "node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, "dependencies": { "yallist": "^4.0.0" }, @@ -2023,16 +2086,13 @@ "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, - "node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "node_modules/minipass": { + "version": "4.2.5", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz", + "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==", "dev": true, - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" + "engines": { + "node": ">=8" } }, "node_modules/mkdirp-classic": { @@ -2042,12 +2102,11 @@ "dev": true }, "node_modules/mocha": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.0.0.tgz", - "integrity": "sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz", + "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==", "dev": true, "dependencies": { - "@ungap/promise-all-settled": "1.1.2", "ansi-colors": "4.1.1", "browser-stdout": "1.3.1", "chokidar": "3.5.3", @@ -2383,9 +2442,9 @@ "dev": true }, "node_modules/node": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/node/-/node-17.3.0.tgz", - "integrity": "sha512-Qftg93Mt+OkF0zmCELRFtBvpC7tian7sNg+I1vE97Mn6wV5gPj+jsii0B1K3NNqYgJac8Em50QZMbU8p/M9mCQ==", + "version": "18.15.0", + "resolved": "https://registry.npmjs.org/node/-/node-18.15.0.tgz", + "integrity": "sha512-y6G6jOU7iZ4QjFLCc1srvPBtk+K8Lak0JbNS6ocGSAI30+wvIWaolbhj3f+jqOv58gSIAlDMyTJckQO9lD5wwQ==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -2428,17 +2487,37 @@ "integrity": "sha512-uPIxXNis1CRbv1DwqAxkgBk5NFV3s7cMN/Gf556jSw6jBvV7ca4F9lRL/8cALcZecRibeqU+5dFYqFFmzv5a0Q==", "dev": true }, + "node_modules/node-domexception": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", + "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/jimmywarting" + }, + { + "type": "github", + "url": "https://paypal.me/jimmywarting" + } + ], + "engines": { + "node": ">=10.5.0" + } + }, "node_modules/node-fetch": { - "version": "3.0.0-beta.9", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.0.0-beta.9.tgz", - "integrity": "sha512-RdbZCEynH2tH46+tj0ua9caUHVWrd/RHnRfvly2EVdqGmI3ndS1Vn/xjm5KuGejDt2RNDQsVRLPNd2QPwcewVg==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.1.tgz", + "integrity": "sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==", "dev": true, "dependencies": { - "data-uri-to-buffer": "^3.0.1", - "fetch-blob": "^2.1.1" + "data-uri-to-buffer": "^4.0.0", + "fetch-blob": "^3.1.4", + "formdata-polyfill": "^4.0.10" }, "engines": { - "node": "^10.17 || >=12.3" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, "funding": { "type": "opencollective", @@ -2514,6 +2593,12 @@ "wrappy": "1" } }, + "node_modules/pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "dev": true + }, "node_modules/parse-semver": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/parse-semver/-/parse-semver-1.1.1.tgz", @@ -2565,6 +2650,31 @@ "node": ">=0.10.0" } }, + "node_modules/path-scurry": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.6.1.tgz", + "integrity": "sha512-OW+5s+7cw6253Q4E+8qQ/u1fVvcJQCJo/VFD8pje+dbJCF1n5ZRMV2AEHbGp+5Q7jxQIYJxkHopnj6nzdGeZLA==", + "dev": true, + "dependencies": { + "lru-cache": "^7.14.1", + "minipass": "^4.0.2" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-scurry/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "engines": { + "node": ">=12" + } + }, "node_modules/pathval": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", @@ -2723,35 +2833,60 @@ } }, "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.0.tgz", + "integrity": "sha512-X36S+qpCUR0HjXlkDe4NAOhS//aHH0Z+h8Ckf2auGJk3PTnx5rLmrHkwNdbVQuCSUhOyFrlRvFEllZOYE+yZGQ==", "dev": true, "dependencies": { - "glob": "^7.1.3" + "glob": "^9.2.0" }, "bin": { - "rimraf": "bin.js" + "rimraf": "dist/cjs/src/bin.js" + }, + "engines": { + "node": ">=14" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/rimraf/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/rimraf/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.0.tgz", + "integrity": "sha512-EAZejC7JvnQINayvB/7BJbpZpNOJ8Lrw2OZNEvQxe0vaLn1SuwMcfV7/MNaX8L/T0wmptBFI4YMtDvSBxYDc7w==", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "minimatch": "^7.4.1", + "minipass": "^4.2.4", + "path-scurry": "^1.6.1" }, "engines": { - "node": "*" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/minimatch": { + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.2.tgz", + "integrity": "sha512-xy4q7wou3vUoC9k1xGTXc+awNdGaGVHtFUaey8tiX4H1QRc04DZ/rmDFwNm2EBsuYEhAZ6SgMmYf3InGY6OauA==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -2770,11 +2905,17 @@ "dev": true }, "node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dependencies": { + "lru-cache": "^6.0.0" + }, "bin": { "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" } }, "node_modules/serialize-javascript": { @@ -2795,7 +2936,7 @@ "node_modules/setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", "dev": true }, "node_modules/side-channel": { @@ -2974,6 +3115,41 @@ "node": ">=8.17.0" } }, + "node_modules/tmp/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/tmp/node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -2986,15 +3162,6 @@ "node": ">=8.0" } }, - "node_modules/traverse": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz", - "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=", - "dev": true, - "engines": { - "node": "*" - } - }, "node_modules/ts-node": { "version": "10.9.1", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", @@ -3095,9 +3262,9 @@ } }, "node_modules/typescript": { - "version": "4.6.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz", - "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -3119,33 +3286,15 @@ "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==", "dev": true }, - "node_modules/unzipper": { - "version": "0.10.11", - "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.11.tgz", - "integrity": "sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw==", - "dev": true, - "dependencies": { - "big-integer": "^1.6.17", - "binary": "~0.3.0", - "bluebird": "~3.4.1", - "buffer-indexof-polyfill": "~1.0.0", - "duplexer2": "~0.1.4", - "fstream": "^1.0.12", - "graceful-fs": "^4.2.2", - "listenercount": "~1.0.1", - "readable-stream": "~2.3.6", - "setimmediate": "~1.0.4" - } - }, "node_modules/url-exist": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/url-exist/-/url-exist-3.0.0.tgz", - "integrity": "sha512-hRO5udC8UhWKLh/weeTSMujDHmVBDS9KpLY7FGVilrLBKlHBwx6Gpe0fIkkYRkMaGuYHVqpdkNa0sO4wJfYEnA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/url-exist/-/url-exist-3.0.1.tgz", + "integrity": "sha512-37KEE2gj60C4hTh2mGkFeqODO2KVG9TOJWpE3sOLEeLGt/p50VxemPiJ30v4m1dcw/wDEGUpYcmBV2e8jM5/FA==", "dev": true, "dependencies": { - "is-url-superb": "^5.0.0", - "ky": "^0.26.0", - "ky-universal": "^0.9.1" + "is-url-superb": "^6.1.0", + "ky": "^0.27.0", + "ky-universal": "^0.10.1" }, "engines": { "node": ">=14.8" @@ -3170,9 +3319,10 @@ "dev": true }, "node_modules/vsce": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/vsce/-/vsce-2.7.0.tgz", - "integrity": "sha512-CKU34wrQlbKDeJCRBkd1a8iwF9EvNxcYMg9hAUH6AxFGR6Wo2IKWwt3cJIcusHxx6XdjDHWlfAS/fJN30uvVnA==", + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/vsce/-/vsce-2.15.0.tgz", + "integrity": "sha512-P8E9LAZvBCQnoGoizw65JfGvyMqNGlHdlUXD1VAuxtvYAaHBKLBdKPnpy60XKVDAkQCfmMu53g+gq9FM+ydepw==", + "deprecated": "vsce has been renamed to @vscode/vsce. Install using @vscode/vsce instead.", "dev": true, "dependencies": { "azure-devops-node-api": "^11.0.1", @@ -3242,52 +3392,81 @@ } }, "node_modules/vscode-jsonrpc": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz", - "integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz", + "integrity": "sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw==", "engines": { - "node": ">=8.0.0 || >=10.0.0" + "node": ">=14.0.0" } }, "node_modules/vscode-languageclient": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.3.tgz", - "integrity": "sha512-YciJxk08iU5LmWu7j5dUt9/1OLjokKET6rME3cI4BRpiF6HZlusm2ZwPt0MYJ0lV5y43sZsQHhyon2xBg4ZJVA==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.1.0.tgz", + "integrity": "sha512-GL4QdbYUF/XxQlAsvYWZRV3V34kOkpRlvV60/72ghHfsYFnS/v2MANZ9P6sHmxFcZKOse8O+L9G7Czg0NUWing==", + "dependencies": { + "minimatch": "^5.1.0", + "semver": "^7.3.7", + "vscode-languageserver-protocol": "3.17.3" + }, + "engines": { + "vscode": "^1.67.0" + } + }, + "node_modules/vscode-languageclient/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/vscode-languageclient/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dependencies": { - "semver": "^6.3.0", - "vscode-languageserver-protocol": "^3.15.3" + "brace-expansion": "^2.0.1" }, "engines": { - "vscode": "^1.41.0" + "node": ">=10" } }, "node_modules/vscode-languageserver-protocol": { - "version": "3.15.3", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz", - "integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==", + "version": "3.17.3", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3.tgz", + "integrity": "sha512-924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA==", "dependencies": { - "vscode-jsonrpc": "^5.0.1", - "vscode-languageserver-types": "3.15.1" + "vscode-jsonrpc": "8.1.0", + "vscode-languageserver-types": "3.17.3" } }, "node_modules/vscode-languageserver-types": { - "version": "3.15.1", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz", - "integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==" + "version": "3.17.3", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz", + "integrity": "sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA==" + }, + "node_modules/web-streams-polyfill": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz", + "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==", + "dev": true, + "engines": { + "node": ">= 8" + } }, "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", + "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", "dev": true, "dependencies": { "isexe": "^2.0.0" }, "bin": { - "node-which": "bin/node-which" + "node-which": "bin/which.js" }, "engines": { - "node": ">= 8" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/wide-align": { @@ -3439,8 +3618,7 @@ "node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/yargs-unparser": { "version": "2.0.0", @@ -3516,9 +3694,163 @@ "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", "dev": true, - "requires": { - "@jridgewell/trace-mapping": "0.3.9" - } + "requires": { + "@jridgewell/trace-mapping": "0.3.9" + } + }, + "@esbuild/android-arm": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.12.tgz", + "integrity": "sha512-E/sgkvwoIfj4aMAPL2e35VnUJspzVYl7+M1B2cqeubdBhADV4uPon0KCc8p2G+LqSJ6i8ocYPCqY3A4GGq0zkQ==", + "dev": true, + "optional": true + }, + "@esbuild/android-arm64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.12.tgz", + "integrity": "sha512-WQ9p5oiXXYJ33F2EkE3r0FRDFVpEdcDiwNX3u7Xaibxfx6vQE0Sb8ytrfQsA5WO6kDn6mDfKLh6KrPBjvkk7xA==", + "dev": true, + "optional": true + }, + "@esbuild/android-x64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.12.tgz", + "integrity": "sha512-m4OsaCr5gT+se25rFPHKQXARMyAehHTQAz4XX1Vk3d27VtqiX0ALMBPoXZsGaB6JYryCLfgGwUslMqTfqeLU0w==", + "dev": true, + "optional": true + }, + "@esbuild/darwin-arm64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.12.tgz", + "integrity": "sha512-O3GCZghRIx+RAN0NDPhyyhRgwa19MoKlzGonIb5hgTj78krqp9XZbYCvFr9N1eUxg0ZQEpiiZ4QvsOQwBpP+lg==", + "dev": true, + "optional": true + }, + "@esbuild/darwin-x64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.12.tgz", + "integrity": "sha512-5D48jM3tW27h1qjaD9UNRuN+4v0zvksqZSPZqeSWggfMlsVdAhH3pwSfQIFJwcs9QJ9BRibPS4ViZgs3d2wsCA==", + "dev": true, + "optional": true + }, + "@esbuild/freebsd-arm64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.12.tgz", + "integrity": "sha512-OWvHzmLNTdF1erSvrfoEBGlN94IE6vCEaGEkEH29uo/VoONqPnoDFfShi41Ew+yKimx4vrmmAJEGNoyyP+OgOQ==", + "dev": true, + "optional": true + }, + "@esbuild/freebsd-x64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.12.tgz", + "integrity": "sha512-A0Xg5CZv8MU9xh4a+7NUpi5VHBKh1RaGJKqjxe4KG87X+mTjDE6ZvlJqpWoeJxgfXHT7IMP9tDFu7IZ03OtJAw==", + "dev": true, + "optional": true + }, + "@esbuild/linux-arm": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.12.tgz", + "integrity": "sha512-WsHyJ7b7vzHdJ1fv67Yf++2dz3D726oO3QCu8iNYik4fb5YuuReOI9OtA+n7Mk0xyQivNTPbl181s+5oZ38gyA==", + "dev": true, + "optional": true + }, + "@esbuild/linux-arm64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.12.tgz", + "integrity": "sha512-cK3AjkEc+8v8YG02hYLQIQlOznW+v9N+OI9BAFuyqkfQFR+DnDLhEM5N8QRxAUz99cJTo1rLNXqRrvY15gbQUg==", + "dev": true, + "optional": true + }, + "@esbuild/linux-ia32": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.12.tgz", + "integrity": "sha512-jdOBXJqcgHlah/nYHnj3Hrnl9l63RjtQ4vn9+bohjQPI2QafASB5MtHAoEv0JQHVb/xYQTFOeuHnNYE1zF7tYw==", + "dev": true, + "optional": true + }, + "@esbuild/linux-loong64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.12.tgz", + "integrity": "sha512-GTOEtj8h9qPKXCyiBBnHconSCV9LwFyx/gv3Phw0pa25qPYjVuuGZ4Dk14bGCfGX3qKF0+ceeQvwmtI+aYBbVA==", + "dev": true, + "optional": true + }, + "@esbuild/linux-mips64el": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.12.tgz", + "integrity": "sha512-o8CIhfBwKcxmEENOH9RwmUejs5jFiNoDw7YgS0EJTF6kgPgcqLFjgoc5kDey5cMHRVCIWc6kK2ShUePOcc7RbA==", + "dev": true, + "optional": true + }, + "@esbuild/linux-ppc64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.12.tgz", + "integrity": "sha512-biMLH6NR/GR4z+ap0oJYb877LdBpGac8KfZoEnDiBKd7MD/xt8eaw1SFfYRUeMVx519kVkAOL2GExdFmYnZx3A==", + "dev": true, + "optional": true + }, + "@esbuild/linux-riscv64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.12.tgz", + "integrity": "sha512-jkphYUiO38wZGeWlfIBMB72auOllNA2sLfiZPGDtOBb1ELN8lmqBrlMiucgL8awBw1zBXN69PmZM6g4yTX84TA==", + "dev": true, + "optional": true + }, + "@esbuild/linux-s390x": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.12.tgz", + "integrity": "sha512-j3ucLdeY9HBcvODhCY4b+Ds3hWGO8t+SAidtmWu/ukfLLG/oYDMaA+dnugTVAg5fnUOGNbIYL9TOjhWgQB8W5g==", + "dev": true, + "optional": true + }, + "@esbuild/linux-x64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.12.tgz", + "integrity": "sha512-uo5JL3cgaEGotaqSaJdRfFNSCUJOIliKLnDGWaVCgIKkHxwhYMm95pfMbWZ9l7GeW9kDg0tSxcy9NYdEtjwwmA==", + "dev": true, + "optional": true + }, + "@esbuild/netbsd-x64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.12.tgz", + "integrity": "sha512-DNdoRg8JX+gGsbqt2gPgkgb00mqOgOO27KnrWZtdABl6yWTST30aibGJ6geBq3WM2TIeW6COs5AScnC7GwtGPg==", + "dev": true, + "optional": true + }, + "@esbuild/openbsd-x64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.12.tgz", + "integrity": "sha512-aVsENlr7B64w8I1lhHShND5o8cW6sB9n9MUtLumFlPhG3elhNWtE7M1TFpj3m7lT3sKQUMkGFjTQBrvDDO1YWA==", + "dev": true, + "optional": true + }, + "@esbuild/sunos-x64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.12.tgz", + "integrity": "sha512-qbHGVQdKSwi0JQJuZznS4SyY27tYXYF0mrgthbxXrZI3AHKuRvU+Eqbg/F0rmLDpW/jkIZBlCO1XfHUBMNJ1pg==", + "dev": true, + "optional": true + }, + "@esbuild/win32-arm64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.12.tgz", + "integrity": "sha512-zsCp8Ql+96xXTVTmm6ffvoTSZSV2B/LzzkUXAY33F/76EajNw1m+jZ9zPfNJlJ3Rh4EzOszNDHsmG/fZOhtqDg==", + "dev": true, + "optional": true + }, + "@esbuild/win32-ia32": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.12.tgz", + "integrity": "sha512-FfrFjR4id7wcFYOdqbDfDET3tjxCozUgbqdkOABsSFzoZGFC92UK7mg4JKRc/B3NNEf1s2WHxJ7VfTdVDPN3ng==", + "dev": true, + "optional": true + }, + "@esbuild/win32-x64": { + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.12.tgz", + "integrity": "sha512-JOOxw49BVZx2/5tW3FqkdjSD/5gXYeVGPDcB0lvap0gLQshkh1Nyel1QazC+wNxus3xPlsYAgqU1BUmrmCvWtw==", + "dev": true, + "optional": true }, "@jridgewell/resolve-uri": { "version": "3.1.0", @@ -3588,15 +3920,15 @@ "dev": true }, "@types/chai": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.1.tgz", - "integrity": "sha512-/zPMqDkzSZ8t3VtxOa4KPq7uzzW978M9Tvh+j7GHKuo6k6GTLxPJ4J5gE5cjfJ26pnXst0N5Hax8Sr0T2Mi9zQ==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.4.tgz", + "integrity": "sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw==", "dev": true }, "@types/chai-spies": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@types/chai-spies/-/chai-spies-1.0.0.tgz", - "integrity": "sha512-Bj/froHomMnlAPEYEeqhmSuNSjTWW/VuSvCVdhLdcb67+dy4ffjTR6fC0YYw9tHP6KR3U8fkF1mgzmzlChHc5Q==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@types/chai-spies/-/chai-spies-1.0.3.tgz", + "integrity": "sha512-RBZjhVuK7vrg4rWMt04UF5zHYwfHnpk5mIWu3nQvU3AKGDixXzSjZ6v0zke6pBcaJqMv3IBZ5ibLWPMRDL0sLw==", "dev": true, "requires": { "@types/chai": "*" @@ -3619,15 +3951,15 @@ "dev": true }, "@types/mocha": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz", - "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.1.tgz", + "integrity": "sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q==", "dev": true }, "@types/node": { - "version": "17.0.45", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz", - "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==", + "version": "18.15.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.3.tgz", + "integrity": "sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw==", "dev": true }, "@types/rimraf": { @@ -3641,9 +3973,9 @@ } }, "@types/vscode": { - "version": "1.67.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.67.0.tgz", - "integrity": "sha512-GH8BDf8cw9AC9080uneJfulhSa7KHSMI2s/CyKePXoGNos9J486w2V4YKoeNUqIEkW4hKoEAWp6/cXTwyGj47g==", + "version": "1.76.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.76.0.tgz", + "integrity": "sha512-CQcY3+Fe5hNewHnOEAVYj4dd1do/QHliXaknAEYSXx2KEHUzFibDZSKptCon+HPgK55xx20pR+PBJjf0MomnBA==", "dev": true }, "@types/which": { @@ -3652,22 +3984,16 @@ "integrity": "sha512-Jjakcv8Roqtio6w1gr0D7y6twbhx6gGgFGF5BLwajPpnOIOxFkakFhCq+LmyyeAz7BX6ULrjBOxdKaCDy+4+dQ==", "dev": true }, - "@ungap/promise-all-settled": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", - "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", - "dev": true - }, "@vscode/test-electron": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.1.3.tgz", - "integrity": "sha512-ps/yJ/9ToUZtR1dHfWi1mDXtep1VoyyrmGKC3UnIbScToRQvbUjyy1VMqnMEW3EpMmC3g7+pyThIPtPyCLHyow==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.3.0.tgz", + "integrity": "sha512-fwzA9RtazH1GT/sckYlbxu6t5e4VaMXwCVtyLv4UAG0hP6NTfnMaaG25XCfWqlVwFhBMcQXHBCy5dmz2eLUnkw==", "dev": true, "requires": { "http-proxy-agent": "^4.0.1", "https-proxy-agent": "^5.0.0", - "rimraf": "^3.0.2", - "unzipper": "^0.10.11" + "jszip": "^3.10.1", + "semver": "^7.3.8" }, "dependencies": { "agent-base": { @@ -3789,8 +4115,7 @@ "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "base64-js": { "version": "1.5.1", @@ -3798,22 +4123,6 @@ "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", "dev": true }, - "big-integer": { - "version": "1.6.51", - "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", - "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==", - "dev": true - }, - "binary": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz", - "integrity": "sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==", - "dev": true, - "requires": { - "buffers": "~0.1.1", - "chainsaw": "~0.1.0" - } - }, "binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", @@ -3844,12 +4153,6 @@ } } }, - "bluebird": { - "version": "3.4.7", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz", - "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==", - "dev": true - }, "boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", @@ -3897,18 +4200,6 @@ "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", "dev": true }, - "buffer-indexof-polyfill": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz", - "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==", - "dev": true - }, - "buffers": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz", - "integrity": "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==", - "dev": true - }, "call-bind": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", @@ -3920,15 +4211,16 @@ } }, "chai": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz", - "integrity": "sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz", + "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==", "dev": true, "requires": { "assertion-error": "^1.1.0", "check-error": "^1.0.2", - "deep-eql": "^3.0.1", + "deep-eql": "^4.1.2", "get-func-name": "^2.0.0", + "loupe": "^2.3.1", "pathval": "^1.1.1", "type-detect": "^4.0.5" } @@ -3940,15 +4232,6 @@ "dev": true, "requires": {} }, - "chainsaw": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz", - "integrity": "sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==", - "dev": true, - "requires": { - "traverse": ">=0.3.0 <0.4" - } - }, "chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", @@ -4083,15 +4366,15 @@ "dev": true }, "colorette": { - "version": "2.0.16", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", - "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==", + "version": "2.0.19", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz", + "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", "dev": true }, "commander": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", - "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.0.tgz", + "integrity": "sha512-zS5PnTI22FIRM6ylNW8G4Ap0IEOyk62fhLSD0+uHRT9McRCLGpkVNvao4bjimpK/GShynyQkFFxHhwMcETmduA==", "dev": true }, "concat-map": { @@ -4138,9 +4421,9 @@ "dev": true }, "data-uri-to-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz", - "integrity": "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", + "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==", "dev": true }, "debug": { @@ -4176,9 +4459,9 @@ } }, "deep-eql": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz", + "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==", "dev": true, "requires": { "type-detect": "^4.0.0" @@ -4245,15 +4528,6 @@ "domhandler": "^4.2.0" } }, - "duplexer2": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", - "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", - "dev": true, - "requires": { - "readable-stream": "^2.0.2" - } - }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -4276,148 +4550,34 @@ "dev": true }, "esbuild": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.3.tgz", - "integrity": "sha512-zyEC5hkguW2oieXRXp8VJzQdcO/1FxCS5GjzqOHItRlojXnx/cTavsrkxdWvBH9li2lUq0bN+LeeVEmyCwiR/Q==", + "version": "0.17.12", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.12.tgz", + "integrity": "sha512-bX/zHl7Gn2CpQwcMtRogTTBf9l1nl+H6R8nUbjk+RuKqAE3+8FDulLA+pHvX7aA7Xe07Iwa+CWvy9I8Y2qqPKQ==", "dev": true, "requires": { - "esbuild-android-arm64": "0.14.3", - "esbuild-darwin-64": "0.14.3", - "esbuild-darwin-arm64": "0.14.3", - "esbuild-freebsd-64": "0.14.3", - "esbuild-freebsd-arm64": "0.14.3", - "esbuild-linux-32": "0.14.3", - "esbuild-linux-64": "0.14.3", - "esbuild-linux-arm": "0.14.3", - "esbuild-linux-arm64": "0.14.3", - "esbuild-linux-mips64le": "0.14.3", - "esbuild-linux-ppc64le": "0.14.3", - "esbuild-netbsd-64": "0.14.3", - "esbuild-openbsd-64": "0.14.3", - "esbuild-sunos-64": "0.14.3", - "esbuild-windows-32": "0.14.3", - "esbuild-windows-64": "0.14.3", - "esbuild-windows-arm64": "0.14.3" - } - }, - "esbuild-android-arm64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.3.tgz", - "integrity": "sha512-v/vdnGJiSGWOAXzg422T9qb4S+P3tOaYtc5n3FDR27Bh3/xQDS7PdYz/yY7HhOlVp0eGwWNbPHEi8FcEhXjsuw==", - "dev": true, - "optional": true - }, - "esbuild-darwin-64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.3.tgz", - "integrity": "sha512-swY5OtEg6cfWdgc/XEjkBP7wXSyXXeZHEsWMdh1bDiN1D6GmRphk9SgKFKTj+P3ZHhOGIcC1+UdIwHk5bUcOig==", - "dev": true, - "optional": true - }, - "esbuild-darwin-arm64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.3.tgz", - "integrity": "sha512-6i9dXPk8oT87wF6VHmwzSad76eMRU2Rt+GXrwF3Y4DCJgnPssJbabNQ9gurkuEX8M0YnEyJF0d1cR7rpTzcEiA==", - "dev": true, - "optional": true - }, - "esbuild-freebsd-64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.3.tgz", - "integrity": "sha512-WDY5ENsmyceeE+95U3eI+FM8yARY5akWkf21M/x/+v2P5OVsYqCYELglSeAI5Y7bhteCVV3g4i2fRqtkmprdSA==", - "dev": true, - "optional": true - }, - "esbuild-freebsd-arm64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.3.tgz", - "integrity": "sha512-4BEEGcP0wBzg04pCCWXlgaPuksQHHfwHvYgCIsi+7IsuB17ykt6MHhTkHR5b5pjI/jNtRhPfMsDODUyftQJgvw==", - "dev": true, - "optional": true - }, - "esbuild-linux-32": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.3.tgz", - "integrity": "sha512-8yhsnjLG/GwCA1RAIndjmCHWViRB2Ol0XeOh2fCXS9qF8tlVrJB7qAiHZpm2vXx+yjOA/bFLTxzU+5pMKqkn5A==", - "dev": true, - "optional": true - }, - "esbuild-linux-64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.3.tgz", - "integrity": "sha512-eNq4aixfbwXHIJq4bQDe+XaSNV1grxqpZYs/zHbp0HGHf6SBNlTI02uyTbYGpIzlXmCEPS9tpPCi7BTU45kcJQ==", - "dev": true, - "optional": true - }, - "esbuild-linux-arm": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.3.tgz", - "integrity": "sha512-YcMvJHAQnWrWKb+eLxN9e/iWUC/3w01UF/RXuMknqOW3prX8UQ63QknWz9/RI8BY/sdrdgPEbSmsTU2jy2cayQ==", - "dev": true, - "optional": true - }, - "esbuild-linux-arm64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.3.tgz", - "integrity": "sha512-wPLyRoqoV/tEMQ7M24DpAmCMyKqBmtgZY35w2tXM8X5O5b2Ohi7fkPSmd6ZgLIxZIApWt88toA8RT0S7qoxcOA==", - "dev": true, - "optional": true - }, - "esbuild-linux-mips64le": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.3.tgz", - "integrity": "sha512-DdmfM5rcuoqjQL3px5MbquAjZWnySB5LdTrg52SSapp0gXMnGcsM6GY2WVta02CMKn5qi7WPVG4WbqTWE++tJw==", - "dev": true, - "optional": true - }, - "esbuild-linux-ppc64le": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.3.tgz", - "integrity": "sha512-ujdqryj0m135Ms9yaNDVFAcLeRtyftM/v2v7Osji5zElf2TivSMdFxdrYnYICuHfkm8c8gHg1ncwqitL0r+nnA==", - "dev": true, - "optional": true - }, - "esbuild-netbsd-64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.3.tgz", - "integrity": "sha512-Z/UB9OUdwo1KDJCSGnVueDuKowRZRkduLvRMegHtDBHC3lS5LfZ3RdM1i+4MMN9iafyk8Q9FNcqIXI178ZujvA==", - "dev": true, - "optional": true - }, - "esbuild-openbsd-64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.3.tgz", - "integrity": "sha512-9I1uoMDeogq3zQuTe3qygmXYjImnvc6rBn51LLbLniQDlfvqHPBMnAZ/5KshwtXXIIMkCwByytDZdiuzRRlTvQ==", - "dev": true, - "optional": true - }, - "esbuild-sunos-64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.3.tgz", - "integrity": "sha512-pldqx/Adxl4V4ymiyKxOOyJmHn6nUIo3wqk2xBx07iDgmL2XTcDDQd7N4U4QGu9LnYN4ZF+8IdOYa3oRRpbjtg==", - "dev": true, - "optional": true - }, - "esbuild-windows-32": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.3.tgz", - "integrity": "sha512-AqzvA/KbkC2m3kTXGpljLin3EttRbtoPTfBn6w6n2m9MWkTEbhQbE1ONoOBxhO5tExmyJdL/6B87TJJD5jEFBQ==", - "dev": true, - "optional": true - }, - "esbuild-windows-64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.3.tgz", - "integrity": "sha512-HGg3C6113zLGB5hN41PROTnBuoh/arG2lQdOird6xFl9giff1cAfMQOUJUfODKD57dDqHjQ1YGW8gOkg0/IrWw==", - "dev": true, - "optional": true - }, - "esbuild-windows-arm64": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.3.tgz", - "integrity": "sha512-qB2izYu4VpigGnOrAN2Yv7ICYLZWY/AojZtwFfteViDnHgW4jXPYkHQIXTISJbRz25H2cYiv+MfRQYK31RNjlw==", - "dev": true, - "optional": true + "@esbuild/android-arm": "0.17.12", + "@esbuild/android-arm64": "0.17.12", + "@esbuild/android-x64": "0.17.12", + "@esbuild/darwin-arm64": "0.17.12", + "@esbuild/darwin-x64": "0.17.12", + "@esbuild/freebsd-arm64": "0.17.12", + "@esbuild/freebsd-x64": "0.17.12", + "@esbuild/linux-arm": "0.17.12", + "@esbuild/linux-arm64": "0.17.12", + "@esbuild/linux-ia32": "0.17.12", + "@esbuild/linux-loong64": "0.17.12", + "@esbuild/linux-mips64el": "0.17.12", + "@esbuild/linux-ppc64": "0.17.12", + "@esbuild/linux-riscv64": "0.17.12", + "@esbuild/linux-s390x": "0.17.12", + "@esbuild/linux-x64": "0.17.12", + "@esbuild/netbsd-x64": "0.17.12", + "@esbuild/openbsd-x64": "0.17.12", + "@esbuild/sunos-x64": "0.17.12", + "@esbuild/win32-arm64": "0.17.12", + "@esbuild/win32-ia32": "0.17.12", + "@esbuild/win32-x64": "0.17.12" + } }, "escalade": { "version": "3.1.1", @@ -4453,10 +4613,14 @@ } }, "fetch-blob": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-2.1.2.tgz", - "integrity": "sha512-YKqtUDwqLyfyMnmbw8XD6Q8j9i/HggKtPEI+pZ1+8bvheBu78biSmNaXWusx1TauGqtUUGx/cBb1mKdq2rLYow==", - "dev": true + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz", + "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==", + "dev": true, + "requires": { + "node-domexception": "^1.0.0", + "web-streams-polyfill": "^3.0.3" + } }, "fill-range": { "version": "7.0.1", @@ -4473,6 +4637,15 @@ "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", "dev": true }, + "formdata-polyfill": { + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", + "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==", + "dev": true, + "requires": { + "fetch-blob": "^3.1.2" + } + }, "fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", @@ -4492,43 +4665,6 @@ "dev": true, "optional": true }, - "fstream": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", - "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "inherits": "~2.0.0", - "mkdirp": ">=0.5 0", - "rimraf": "2" - }, - "dependencies": { - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - } - } - }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -4581,9 +4717,9 @@ "dev": true }, "glob": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz", - "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -4622,12 +4758,6 @@ "is-glob": "^4.0.1" } }, - "graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true - }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -4688,6 +4818,12 @@ "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", "dev": true }, + "immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==", + "dev": true + }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -4762,9 +4898,9 @@ "dev": true }, "is-url-superb": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-url-superb/-/is-url-superb-5.0.0.tgz", - "integrity": "sha512-jGkG59ra7/JlcV8ap3dsc0M79IgpuFU/obfsSf6X5D0z1NVvFTFuzt4ob7nfBTZEPbTwjGXVKNQDfWfPghapKQ==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/is-url-superb/-/is-url-superb-6.1.0.tgz", + "integrity": "sha512-LXdhGlYqUPdvEyIhWPEEwYYK3yrUiPcBjmFGlZNv1u5GtIL5qQRf7ddDyPNAvsMFqdzS923FROpTQU97tLe3JQ==", "dev": true }, "isarray": { @@ -4779,6 +4915,18 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, + "jszip": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", + "dev": true, + "requires": { + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "setimmediate": "^1.0.5" + } + }, "keytar": { "version": "7.7.0", "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz", @@ -4790,19 +4938,19 @@ } }, "ky": { - "version": "0.26.0", - "resolved": "https://registry.npmjs.org/ky/-/ky-0.26.0.tgz", - "integrity": "sha512-j2YwAGYuD/XXoyzzUYn1N9NEGoAukkONMea2uLanMPWTqumkwme9eWgf2SjhRKNRb/60FDYStJYL582dbbt9Mw==", + "version": "0.27.0", + "resolved": "https://registry.npmjs.org/ky/-/ky-0.27.0.tgz", + "integrity": "sha512-pgaBuB6wI9DdMSOZBVh2WkcbkAdEG5AUEWuNhtThu6FLIpDbzqzC/fSMmqr/j1wwQyW3SP3KGau7EbzWNkQ/yg==", "dev": true }, "ky-universal": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/ky-universal/-/ky-universal-0.9.1.tgz", - "integrity": "sha512-o0u8z6Lp8bZAevZWJkZXuQH4JGFIUM1FeHRdtdmcgSsEoP8Ane4TNJWtiv0UOYKRmYGlYsF15zX6kR1S31Q8sg==", + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/ky-universal/-/ky-universal-0.10.1.tgz", + "integrity": "sha512-r8909k+ELKZAxhVA5c440x22hqw5XcMRwLRbgpPQk4JHy3/ddJnvzcnSo5Ww3HdKdNeS3Y8dBgcIYyVahMa46g==", "dev": true, "requires": { "abort-controller": "^3.0.0", - "node-fetch": "3.0.0-beta.9" + "node-fetch": "^3.2.2" } }, "leven": { @@ -4811,6 +4959,15 @@ "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", "dev": true }, + "lie": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "dev": true, + "requires": { + "immediate": "~3.0.5" + } + }, "linkify-it": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz", @@ -4820,12 +4977,6 @@ "uc.micro": "^1.0.1" } }, - "listenercount": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz", - "integrity": "sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=", - "dev": true - }, "log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -4887,11 +5038,19 @@ } } }, + "loupe": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz", + "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==", + "dev": true, + "requires": { + "get-func-name": "^2.0.0" + } + }, "lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, "requires": { "yallist": "^4.0.0" } @@ -4968,14 +5127,11 @@ "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, - "mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "requires": { - "minimist": "^1.2.6" - } + "minipass": { + "version": "4.2.5", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz", + "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==", + "dev": true }, "mkdirp-classic": { "version": "0.5.3", @@ -4984,12 +5140,11 @@ "dev": true }, "mocha": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.0.0.tgz", - "integrity": "sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz", + "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==", "dev": true, "requires": { - "@ungap/promise-all-settled": "1.1.2", "ansi-colors": "4.1.1", "browser-stdout": "1.3.1", "chokidar": "3.5.3", @@ -5231,9 +5386,9 @@ "dev": true }, "node": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/node/-/node-17.3.0.tgz", - "integrity": "sha512-Qftg93Mt+OkF0zmCELRFtBvpC7tian7sNg+I1vE97Mn6wV5gPj+jsii0B1K3NNqYgJac8Em50QZMbU8p/M9mCQ==", + "version": "18.15.0", + "resolved": "https://registry.npmjs.org/node/-/node-18.15.0.tgz", + "integrity": "sha512-y6G6jOU7iZ4QjFLCc1srvPBtk+K8Lak0JbNS6ocGSAI30+wvIWaolbhj3f+jqOv58gSIAlDMyTJckQO9lD5wwQ==", "dev": true, "requires": { "node-bin-setup": "^1.0.0" @@ -5268,14 +5423,21 @@ "integrity": "sha512-uPIxXNis1CRbv1DwqAxkgBk5NFV3s7cMN/Gf556jSw6jBvV7ca4F9lRL/8cALcZecRibeqU+5dFYqFFmzv5a0Q==", "dev": true }, + "node-domexception": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", + "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==", + "dev": true + }, "node-fetch": { - "version": "3.0.0-beta.9", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.0.0-beta.9.tgz", - "integrity": "sha512-RdbZCEynH2tH46+tj0ua9caUHVWrd/RHnRfvly2EVdqGmI3ndS1Vn/xjm5KuGejDt2RNDQsVRLPNd2QPwcewVg==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.1.tgz", + "integrity": "sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==", "dev": true, "requires": { - "data-uri-to-buffer": "^3.0.1", - "fetch-blob": "^2.1.1" + "data-uri-to-buffer": "^4.0.0", + "fetch-blob": "^3.1.4", + "formdata-polyfill": "^4.0.10" } }, "normalize-path": { @@ -5332,6 +5494,12 @@ "wrappy": "1" } }, + "pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "dev": true + }, "parse-semver": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/parse-semver/-/parse-semver-1.1.1.tgz", @@ -5376,6 +5544,24 @@ "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", "dev": true }, + "path-scurry": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.6.1.tgz", + "integrity": "sha512-OW+5s+7cw6253Q4E+8qQ/u1fVvcJQCJo/VFD8pje+dbJCF1n5ZRMV2AEHbGp+5Q7jxQIYJxkHopnj6nzdGeZLA==", + "dev": true, + "requires": { + "lru-cache": "^7.14.1", + "minipass": "^4.0.2" + }, + "dependencies": { + "lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true + } + } + }, "pathval": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", @@ -5501,26 +5687,42 @@ "dev": true }, "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.0.tgz", + "integrity": "sha512-X36S+qpCUR0HjXlkDe4NAOhS//aHH0Z+h8Ckf2auGJk3PTnx5rLmrHkwNdbVQuCSUhOyFrlRvFEllZOYE+yZGQ==", "dev": true, "requires": { - "glob": "^7.1.3" + "glob": "^9.2.0" }, "dependencies": { + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0" + } + }, "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.0.tgz", + "integrity": "sha512-EAZejC7JvnQINayvB/7BJbpZpNOJ8Lrw2OZNEvQxe0vaLn1SuwMcfV7/MNaX8L/T0wmptBFI4YMtDvSBxYDc7w==", "dev": true, "requires": { "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "minimatch": "^7.4.1", + "minipass": "^4.2.4", + "path-scurry": "^1.6.1" + } + }, + "minimatch": { + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.2.tgz", + "integrity": "sha512-xy4q7wou3vUoC9k1xGTXc+awNdGaGVHtFUaey8tiX4H1QRc04DZ/rmDFwNm2EBsuYEhAZ6SgMmYf3InGY6OauA==", + "dev": true, + "requires": { + "brace-expansion": "^2.0.1" } } } @@ -5538,9 +5740,12 @@ "dev": true }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "requires": { + "lru-cache": "^6.0.0" + } }, "serialize-javascript": { "version": "6.0.0", @@ -5560,7 +5765,7 @@ "setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", "dev": true }, "side-channel": { @@ -5697,6 +5902,31 @@ "dev": true, "requires": { "rimraf": "^3.0.0" + }, + "dependencies": { + "glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + } } }, "to-regex-range": { @@ -5708,12 +5938,6 @@ "is-number": "^7.0.0" } }, - "traverse": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz", - "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=", - "dev": true - }, "ts-node": { "version": "10.9.1", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", @@ -5782,9 +6006,9 @@ } }, "typescript": { - "version": "4.6.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz", - "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "dev": true }, "uc.micro": { @@ -5799,33 +6023,15 @@ "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==", "dev": true }, - "unzipper": { - "version": "0.10.11", - "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.11.tgz", - "integrity": "sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw==", - "dev": true, - "requires": { - "big-integer": "^1.6.17", - "binary": "~0.3.0", - "bluebird": "~3.4.1", - "buffer-indexof-polyfill": "~1.0.0", - "duplexer2": "~0.1.4", - "fstream": "^1.0.12", - "graceful-fs": "^4.2.2", - "listenercount": "~1.0.1", - "readable-stream": "~2.3.6", - "setimmediate": "~1.0.4" - } - }, "url-exist": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/url-exist/-/url-exist-3.0.0.tgz", - "integrity": "sha512-hRO5udC8UhWKLh/weeTSMujDHmVBDS9KpLY7FGVilrLBKlHBwx6Gpe0fIkkYRkMaGuYHVqpdkNa0sO4wJfYEnA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/url-exist/-/url-exist-3.0.1.tgz", + "integrity": "sha512-37KEE2gj60C4hTh2mGkFeqODO2KVG9TOJWpE3sOLEeLGt/p50VxemPiJ30v4m1dcw/wDEGUpYcmBV2e8jM5/FA==", "dev": true, "requires": { - "is-url-superb": "^5.0.0", - "ky": "^0.26.0", - "ky-universal": "^0.9.1" + "is-url-superb": "^6.1.0", + "ky": "^0.27.0", + "ky-universal": "^0.10.1" } }, "url-join": { @@ -5847,9 +6053,9 @@ "dev": true }, "vsce": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/vsce/-/vsce-2.7.0.tgz", - "integrity": "sha512-CKU34wrQlbKDeJCRBkd1a8iwF9EvNxcYMg9hAUH6AxFGR6Wo2IKWwt3cJIcusHxx6XdjDHWlfAS/fJN30uvVnA==", + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/vsce/-/vsce-2.15.0.tgz", + "integrity": "sha512-P8E9LAZvBCQnoGoizw65JfGvyMqNGlHdlUXD1VAuxtvYAaHBKLBdKPnpy60XKVDAkQCfmMu53g+gq9FM+ydepw==", "dev": true, "requires": { "azure-devops-node-api": "^11.0.1", @@ -5903,37 +6109,62 @@ } }, "vscode-jsonrpc": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz", - "integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A==" + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz", + "integrity": "sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw==" }, "vscode-languageclient": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.3.tgz", - "integrity": "sha512-YciJxk08iU5LmWu7j5dUt9/1OLjokKET6rME3cI4BRpiF6HZlusm2ZwPt0MYJ0lV5y43sZsQHhyon2xBg4ZJVA==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.1.0.tgz", + "integrity": "sha512-GL4QdbYUF/XxQlAsvYWZRV3V34kOkpRlvV60/72ghHfsYFnS/v2MANZ9P6sHmxFcZKOse8O+L9G7Czg0NUWing==", "requires": { - "semver": "^6.3.0", - "vscode-languageserver-protocol": "^3.15.3" + "minimatch": "^5.1.0", + "semver": "^7.3.7", + "vscode-languageserver-protocol": "3.17.3" + }, + "dependencies": { + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "requires": { + "balanced-match": "^1.0.0" + } + }, + "minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "requires": { + "brace-expansion": "^2.0.1" + } + } } }, "vscode-languageserver-protocol": { - "version": "3.15.3", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz", - "integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==", + "version": "3.17.3", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3.tgz", + "integrity": "sha512-924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA==", "requires": { - "vscode-jsonrpc": "^5.0.1", - "vscode-languageserver-types": "3.15.1" + "vscode-jsonrpc": "8.1.0", + "vscode-languageserver-types": "3.17.3" } }, "vscode-languageserver-types": { - "version": "3.15.1", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz", - "integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==" + "version": "3.17.3", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz", + "integrity": "sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA==" + }, + "web-streams-polyfill": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz", + "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==", + "dev": true }, "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", + "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", "dev": true, "requires": { "isexe": "^2.0.0" @@ -6054,8 +6285,7 @@ "yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "yargs-unparser": { "version": "2.0.0", diff --git a/package.json b/package.json index 397cf4dce..f87568dc1 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "url": "https://github.com/lf-lang/vscode-lingua-franca/issues" }, "engines": { - "vscode": "^1.49.0" + "vscode": "^1.74.0" }, "categories": [ "Programming Languages" @@ -118,33 +118,33 @@ } }, "devDependencies": { - "@types/chai": "^4.3.1", - "@types/chai-spies": "^1.0.0", - "@types/mocha": "^9.1.1", - "@types/node": "^17.0.21", + "@types/chai": "^4.3.4", + "@types/chai-spies": "^1.0.3", + "@types/mocha": "^10.0.1", + "@types/node": "^18.11.18", "@types/rimraf": "^3.0.2", - "@types/vscode": "^1.49.0", + "@types/vscode": "^1.74.0", "@types/which": "^2.0.1", - "@vscode/test-electron": "^2.1.3", - "chai": "^4.3.4", + "@vscode/test-electron": "^2.2.3", + "chai": "^4.3.7", "chai-spies": "^1.0.0", - "colorette": "^2.0.16", - "commander": "^8.3.0", - "esbuild": "^0.14.2", - "glob": "^8.0.3", + "colorette": "^2.0.19", + "commander": "^10.0.0", + "esbuild": "^0.17.5", + "glob": "^8.1.0", "maven": "^5.0.0", - "mocha": "^10.0.0", - "node": "^17.3.0", - "rimraf": "^3.0.2", - "simple-git": "^3.7.1", + "mocha": "^10.2.0", + "node": "^18.13.0", + "rimraf": "^4.1.2", + "simple-git": "^3.16.0", "ts-node": "^10.9.1", - "typescript": "^4.6.4", - "url-exist": "^3.0.0", - "vsce": "^2.7.0", - "which": "^2.0.2" + "typescript": "^4.9.5", + "url-exist": "^3.0.1", + "vsce": "^2.15.0", + "which": "^3.0.0" }, "dependencies": { - "vscode-languageclient": "^6.1.3" + "vscode-languageclient": "^8.0.2" }, "scripts": { "clean": "rm -rf out && rm -rf lib && rm -f vscode-lingua-franca-*.vsix", diff --git a/src/build_commands.ts b/src/build_commands.ts index 455d93d7b..f4e2d724d 100644 --- a/src/build_commands.ts +++ b/src/build_commands.ts @@ -1,5 +1,5 @@ import * as vscode from 'vscode'; -import { LanguageClient } from 'vscode-languageclient'; +import { LanguageClient } from 'vscode-languageclient/node'; import { getTerminal, MessageDisplayHelper } from './utils'; /** diff --git a/src/extension.ts b/src/extension.ts index 7bb42c8f4..4a47fd6c4 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -7,7 +7,7 @@ import * as fs from 'fs'; import { Trace } from 'vscode-jsonrpc'; import * as vscode from 'vscode'; import { connect, NetConnectOpts, Socket } from 'net'; -import { LanguageClient, LanguageClientOptions, ServerOptions, StreamInfo } from 'vscode-languageclient'; +import { LanguageClient, LanguageClientOptions, ServerOptions, StreamInfo } from 'vscode-languageclient/node'; import { legend, semanticTokensProvider } from './highlight'; import * as config from './config'; import { registerBuildCommands } from './build_commands'; @@ -44,7 +44,7 @@ export async function activate(context: vscode.ExtensionContext) { client = new LanguageClient('LF Language Server', serverOptions, clientOptions); // enable tracing (.Off, .Messages, Verbose) - client.trace = Trace.Verbose; + client.setTrace(Trace.Verbose); // Register with Klighd Diagram extension const refId = await vscode.commands.executeCommand( From 4fb3b9e8e1d8740940dbade4212b8df7a501687e Mon Sep 17 00:00:00 2001 From: jesslin02 Date: Tue, 21 Mar 2023 02:48:11 +0800 Subject: [PATCH 02/14] initial regex updates --- {syntax => syntaxes}/lflang.tmLanguage.json | 44 ++++++++++++++++----- 1 file changed, 34 insertions(+), 10 deletions(-) rename {syntax => syntaxes}/lflang.tmLanguage.json (91%) diff --git a/syntax/lflang.tmLanguage.json b/syntaxes/lflang.tmLanguage.json similarity index 91% rename from syntax/lflang.tmLanguage.json rename to syntaxes/lflang.tmLanguage.json index bdd364014..0abb404a0 100644 --- a/syntax/lflang.tmLanguage.json +++ b/syntaxes/lflang.tmLanguage.json @@ -148,7 +148,19 @@ "begin": "(?=\\btarget\\s+C?Cpp\\b)", "patterns": [ { - "begin": "(?<=(input|output|action|state).*:)", + "begin": "(?<=(input|state)).*:(.*);\n", + "end": "[\\(;\\n]", + "patterns": [ + { + "include": "source.cpp" + }, + { + "include": "#type" + } + ] + }, + { + "begin": "(?<=(output|action)).*:(.*);\n", "end": "[\\(;\\n]", "patterns": [ { @@ -219,7 +231,11 @@ "patterns": [ { "name": "entity.name.type.lflang", - "match": "(?<=(input|output|action|state).*:(\\s*))(\\b(\\w+)\\b)" + "match": "(?<=(input|state)).*:\\s*(\\b(\\w+)\\b)" + }, + { + "name": "entity.name.type.lflang", + "match": "(?<=(output|action)).*:\\s*(\\b(\\w+)\\b)" }, { "include": "#post-targetspec" @@ -252,7 +268,7 @@ }, { "name": "variable.parameter.lflang", - "match": "(?<=(^|,|\\{)(\\s)*)\\b([\\w\\-]+)\\b(?=(\\s)*:)" + "match": "(^|(?<=(,|\\{)))(\\s)*\\b([\\w\\-]+)\\b(?=(\\s)*:)" } ] }, @@ -301,7 +317,7 @@ }, { "name": "entity.name.type.lflang", - "match": "(?<=\\breactor\\b\\s*)(?!at)(?!extends)(\\w+)\\b" + "match": "(?<=\\breactor\\b)\\s*(?!at)(?!extends)(\\w+)\\b" } ] }, @@ -325,7 +341,7 @@ }, { "name": "entity.name.function.member.lflang", - "match": "(?<=\\bmethod\\b\\s+)\\w+\\b" + "match": "(?<=\\bmethod\\b)\\s+(\\w+)\\b" } ] }, @@ -381,11 +397,19 @@ "patterns": [ { "name": "entity.name.type.lflang", - "match": "(?<=(input|output|action|state).*:(\\s*))(\\b([A-Z]\\w*)\\b)" + "match": "(?<=(input|state)).*:\\s*(\\b([A-Z]\\w*)\\b)" + }, + { + "name": "entity.name.type.lflang", + "match": "(?<=(output|action)).*:\\s*(\\b([A-Z]\\w*)\\b)" + }, + { + "name": "storage.type.lflang", + "match": "(?<=(input|state).*:\\s*(\\b(\\w+)\\b)" }, { "name": "storage.type.lflang", - "match": "(?<=(input|output|action|state).*:(\\s*))(\\b(\\w+)\\b)" + "match": "(?<=(output|action).*:\\s*(\\b(\\w+)\\b)" } ] }, @@ -422,7 +446,7 @@ { "name": "string.quoted.double.lflang", "begin": "\"", - "end": "(?<=(\\\\.|[^\"\\\\])*)(\"|$)", + "end": "(? Date: Tue, 21 Mar 2023 03:17:11 +0800 Subject: [PATCH 03/14] simplify entity, import, target regex --- syntaxes/lflang.tmLanguage.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/syntaxes/lflang.tmLanguage.json b/syntaxes/lflang.tmLanguage.json index 0abb404a0..7c84cc948 100644 --- a/syntaxes/lflang.tmLanguage.json +++ b/syntaxes/lflang.tmLanguage.json @@ -253,7 +253,7 @@ "target-specification": { "name": "meta.targetspec.lflang", "begin": "(?=\\btarget\\b)", - "end": ";|(?<=}.*)$|(?<=target[^\\{]*)$", + "end": ";|(?<=})$|(?<=target)[^\\{]*$", "patterns": [ { "include": "#context-insensitive" @@ -274,7 +274,7 @@ }, "import-statement": { "begin": "(?=^\\s*import\\b)", - "end": ";|(?<=}.*)$|(?<=import[^\\{]*)$", + "end": ";|(?<=})$|(?<=import)[^\\{]*$", "patterns": [ { "include": "#context-insensitive" @@ -501,7 +501,7 @@ }, { "name": "entity.name.type.lflang", - "match": "(?<=\\s*=\\s*new\\s*(\\[[^\\]]*\\])?\\s+)\\w+\\b" + "match": "(?<=new)\\s*(\\[[^\\]]*\\])?\\s+(\\w+)\\b" } ] }, From 473b55d50e3cfbc14e3e98d4c400dd6dd6d05297 Mon Sep 17 00:00:00 2001 From: jesslin02 Date: Tue, 21 Mar 2023 03:44:17 +0800 Subject: [PATCH 04/14] simplify c target regex and fix typos --- syntaxes/lflang.tmLanguage.json | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/syntaxes/lflang.tmLanguage.json b/syntaxes/lflang.tmLanguage.json index 7c84cc948..d3755e961 100644 --- a/syntaxes/lflang.tmLanguage.json +++ b/syntaxes/lflang.tmLanguage.json @@ -120,7 +120,19 @@ "begin": "(?=\\btarget\\s+C\\b)", "patterns": [ { - "begin": "(?<=(input|output|action|state).*:)", + "begin": "(?<=(input|state)).*:(.*);\n", + "end": "[\\(;\\n]", + "patterns": [ + { + "include": "source.cpp" + }, + { + "include": "#type" + } + ] + }, + { + "begin": "(?<=(output|action)).*:(.*);\n", "end": "[\\(;\\n]", "patterns": [ { @@ -405,11 +417,11 @@ }, { "name": "storage.type.lflang", - "match": "(?<=(input|state).*:\\s*(\\b(\\w+)\\b)" + "match": "(?<=(input|state)).*:\\s*(\\b(\\w+)\\b)" }, { "name": "storage.type.lflang", - "match": "(?<=(output|action).*:\\s*(\\b(\\w+)\\b)" + "match": "(?<=(output|action)).*:\\s*(\\b(\\w+)\\b)" } ] }, From 0e80718a43bb29e0fa92d43d1e56f1fe951c0cfb Mon Sep 17 00:00:00 2001 From: jesslin02 Date: Tue, 21 Mar 2023 04:55:29 +0800 Subject: [PATCH 05/14] update path after renaming syntax directory --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f87568dc1..0ea51dc74 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ { "language": "lflang", "scopeName": "source.lf", - "path": "./syntax/lflang.tmLanguage.json", + "path": "./syntaxes/lflang.tmLanguage.json", "embeddedLanguages": { "meta.embedded.block.c": "c", "meta.embedded.block.cpp": "cpp", From 06fa17360cfdc29f043320a745af82386d3e016e Mon Sep 17 00:00:00 2001 From: jesslin02 Date: Tue, 11 Apr 2023 00:39:27 +0800 Subject: [PATCH 06/14] update string regex --- syntaxes/lflang.tmLanguage.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/syntaxes/lflang.tmLanguage.json b/syntaxes/lflang.tmLanguage.json index d3755e961..7f84a8ae6 100644 --- a/syntaxes/lflang.tmLanguage.json +++ b/syntaxes/lflang.tmLanguage.json @@ -458,7 +458,7 @@ { "name": "string.quoted.double.lflang", "begin": "\"", - "end": "(? Date: Tue, 11 Apr 2023 03:27:39 +0800 Subject: [PATCH 07/14] improved entity and storage type regex --- syntaxes/lflang.tmLanguage.json | 45 ++++++++------------------------- 1 file changed, 10 insertions(+), 35 deletions(-) diff --git a/syntaxes/lflang.tmLanguage.json b/syntaxes/lflang.tmLanguage.json index 7f84a8ae6..07394e284 100644 --- a/syntaxes/lflang.tmLanguage.json +++ b/syntaxes/lflang.tmLanguage.json @@ -43,6 +43,9 @@ }, { "include": "#context-insensitive" + }, + { + "include": "#type" } ] }, @@ -75,9 +78,6 @@ { "include": "#timer" }, - { - "include": "#type" - }, { "include": "#number" }, @@ -125,9 +125,6 @@ "patterns": [ { "include": "source.cpp" - }, - { - "include": "#type" } ] }, @@ -137,9 +134,6 @@ "patterns": [ { "include": "source.cpp" - }, - { - "include": "#type" } ] }, @@ -165,9 +159,6 @@ "patterns": [ { "include": "source.cpp" - }, - { - "include": "#type" } ] }, @@ -177,9 +168,6 @@ "patterns": [ { "include": "source.cpp" - }, - { - "include": "#type" } ] }, @@ -241,14 +229,6 @@ "rs-target": { "begin": "(?=\\btarget\\s+Rust\\b)", "patterns": [ - { - "name": "entity.name.type.lflang", - "match": "(?<=(input|state)).*:\\s*(\\b(\\w+)\\b)" - }, - { - "name": "entity.name.type.lflang", - "match": "(?<=(output|action)).*:\\s*(\\b(\\w+)\\b)" - }, { "include": "#post-targetspec" }, @@ -291,6 +271,9 @@ { "include": "#context-insensitive" }, + { + "include": "#type" + }, { "name": "keyword.control.import.lflang", "match": "\\b(import)\\b|\\b(as)\\b|\\b(from)\\b" @@ -329,7 +312,7 @@ }, { "name": "entity.name.type.lflang", - "match": "(?<=\\breactor\\b)\\s*(?!at)(?!extends)(\\w+)\\b" + "match": "(?<=\\breactor\\b\\s)\\s*(?!at)(?!extends)(\\w+)\\b" } ] }, @@ -409,19 +392,11 @@ "patterns": [ { "name": "entity.name.type.lflang", - "match": "(?<=(input|state)).*:\\s*(\\b([A-Z]\\w*)\\b)" - }, - { - "name": "entity.name.type.lflang", - "match": "(?<=(output|action)).*:\\s*(\\b([A-Z]\\w*)\\b)" - }, - { - "name": "storage.type.lflang", - "match": "(?<=(input|state)).*:\\s*(\\b(\\w+)\\b)" + "match": "(?<=:)\\s*(\\b([A-Z]\\w*)\\b)" }, { "name": "storage.type.lflang", - "match": "(?<=(output|action)).*:\\s*(\\b(\\w+)\\b)" + "match": "(?<=:)\\s*(\\b(\\w+)\\b)" } ] }, @@ -513,7 +488,7 @@ }, { "name": "entity.name.type.lflang", - "match": "(?<=new)\\s*(\\[[^\\]]*\\])?\\s+(\\w+)\\b" + "match": "(?<=new\\s)\\s*(\\[[^\\]]*\\])?\\s*(\\w+)\\b" } ] }, From 9f880ce0886533230f9899b66ade4f54b31fee05 Mon Sep 17 00:00:00 2001 From: jesslin02 Date: Wed, 12 Apr 2023 13:55:33 +0800 Subject: [PATCH 08/14] update known good for syntax tests --- test/known-good/C/src/ActionDelay.txt | 10 +++--- test/known-good/C/src/ActionIsPresent.txt | 4 +-- .../known-good/C/src/ActionWithNoReaction.txt | 12 +++---- test/known-good/C/src/After.txt | 14 ++++---- test/known-good/C/src/AfterCycles.txt | 8 ++--- test/known-good/C/src/AfterOverlapped.txt | 10 +++--- test/known-good/C/src/AfterZero.txt | 14 ++++---- test/known-good/C/src/Alignment.txt | 22 ++++++------ test/known-good/C/src/ArrayAsParameter.txt | 12 +++---- test/known-good/C/src/ArrayAsType.txt | 6 ++-- test/known-good/C/src/ArrayFree.txt | 8 ++--- test/known-good/C/src/ArrayFreeMultiple.txt | 12 +++---- test/known-good/C/src/ArrayParallel.txt | 4 +-- test/known-good/C/src/ArrayPrint.txt | 16 ++++----- test/known-good/C/src/ArrayScale.txt | 10 +++--- .../C/src/CharLiteralInitializer.txt | 2 +- test/known-good/C/src/Composition.txt | 14 ++++---- test/known-good/C/src/CompositionAfter.txt | 16 ++++----- test/known-good/C/src/CompositionGain.txt | 8 ++--- .../C/src/CompositionInheritance.txt | 18 +++++----- test/known-good/C/src/CountSelf.txt | 10 +++--- test/known-good/C/src/CountTest.txt | 6 ++-- test/known-good/C/src/DanglingOutput.txt | 6 ++-- test/known-good/C/src/Deadline.txt | 14 ++++---- test/known-good/C/src/DeadlineAnytime.txt | 2 +- .../known-good/C/src/DeadlineHandledAbove.txt | 8 ++--- test/known-good/C/src/DeadlineInherited.txt | 4 +-- test/known-good/C/src/DeadlinePriority.txt | 4 +-- .../C/src/DeadlineWithAfterDelay.txt | 8 ++--- test/known-good/C/src/DeadlineWithBanks.txt | 16 ++++----- test/known-good/C/src/DeadlineZero.txt | 8 ++--- test/known-good/C/src/DelayArray.txt | 16 ++++----- test/known-good/C/src/DelayArrayWithAfter.txt | 16 ++++----- test/known-good/C/src/DelayInt.txt | 14 ++++---- test/known-good/C/src/DelayPointer.txt | 16 ++++----- test/known-good/C/src/DelayString.txt | 12 +++---- test/known-good/C/src/DelayStruct.txt | 16 ++++----- .../known-good/C/src/DelayStructWithAfter.txt | 8 ++--- .../C/src/DelayStructWithAfterOverlapped.txt | 14 ++++---- test/known-good/C/src/DelayedAction.txt | 6 ++-- test/known-good/C/src/DelayedReaction.txt | 4 +-- test/known-good/C/src/Determinism.txt | 10 +++--- test/known-good/C/src/DoubleInvocation.txt | 16 ++++----- test/known-good/C/src/DoublePort.txt | 14 ++++---- test/known-good/C/src/DoubleReaction.txt | 16 ++++----- test/known-good/C/src/DoubleTrigger.txt | 6 ++-- test/known-good/C/src/FloatLiteral.txt | 8 ++--- test/known-good/C/src/Gain.txt | 10 +++--- test/known-good/C/src/GetMicroStep.txt | 2 +- test/known-good/C/src/GetTime.txt | 4 +-- test/known-good/C/src/Hello.txt | 14 ++++---- test/known-good/C/src/HelloWorld.txt | 12 +++---- test/known-good/C/src/Hierarchy.txt | 14 ++++---- test/known-good/C/src/Hierarchy2.txt | 24 ++++++------- test/known-good/C/src/IdentifierLength.txt | 14 ++++---- test/known-good/C/src/ImportComposition.txt | 2 +- test/known-good/C/src/InheritanceAction.txt | 10 +++--- .../C/src/ManualDelayedReaction.txt | 12 +++---- test/known-good/C/src/Methods.txt | 6 ++-- test/known-good/C/src/MethodsRecursive.txt | 6 ++-- test/known-good/C/src/MethodsSameName.txt | 8 ++--- test/known-good/C/src/Microsteps.txt | 4 +-- test/known-good/C/src/MovingAverage.txt | 16 ++++----- test/known-good/C/src/MultipleContained.txt | 8 ++--- test/known-good/C/src/MultipleOutputs.txt | 10 +++--- test/known-good/C/src/NativeListsAndTimes.txt | 18 +++++----- .../C/src/NestedTriggeredReactions.txt | 8 ++--- test/known-good/C/src/ParameterHierarchy.txt | 6 ++-- test/known-good/C/src/ParameterizedState.txt | 2 +- test/known-good/C/src/PeriodicDesugared.txt | 6 ++-- test/known-good/C/src/PhysicalConnection.txt | 4 +-- test/known-good/C/src/PingPong.txt | 18 +++++----- test/known-good/C/src/Preamble.txt | 4 +-- .../C/src/ReadOutputOfContainedReactor.txt | 4 +-- test/known-good/C/src/RepeatedInheritance.txt | 14 ++++---- test/known-good/C/src/Schedule.txt | 2 +- .../C/src/ScheduleLogicalAction.txt | 14 ++++---- test/known-good/C/src/ScheduleValue.txt | 4 +-- test/known-good/C/src/SelfLoop.txt | 12 +++---- test/known-good/C/src/SendingInside.txt | 10 +++--- test/known-good/C/src/SendingInside2.txt | 2 +- test/known-good/C/src/SendsPointerTest.txt | 6 ++-- test/known-good/C/src/SetArray.txt | 6 ++-- test/known-good/C/src/SetToken.txt | 8 ++--- test/known-good/C/src/SimpleDeadline.txt | 8 ++--- test/known-good/C/src/SlowingClock.txt | 8 ++--- .../known-good/C/src/SlowingClockPhysical.txt | 6 ++-- .../known-good/C/src/StartupOutFromInside.txt | 2 +- test/known-good/C/src/Starvation.txt | 10 +++--- test/known-good/C/src/Stop.txt | 6 ++-- test/known-good/C/src/StopZero.txt | 6 ++-- test/known-good/C/src/Stride.txt | 14 ++++---- test/known-good/C/src/StructAsState.txt | 2 +- test/known-good/C/src/StructAsType.txt | 8 ++--- test/known-good/C/src/StructAsTypeDirect.txt | 8 ++--- test/known-good/C/src/StructParallel.txt | 14 ++++---- test/known-good/C/src/StructPrint.txt | 8 ++--- test/known-good/C/src/StructScale.txt | 16 ++++----- .../known-good/C/src/SubclassesAndStartup.txt | 6 ++-- .../C/src/TestForPreviousOutput.txt | 4 +-- test/known-good/C/src/TimeLimit.txt | 14 ++++---- test/known-good/C/src/TimeState.txt | 4 +-- test/known-good/C/src/Timeout.txt | 6 ++-- test/known-good/C/src/TimeoutZero.txt | 6 ++-- test/known-good/C/src/ToReactionNested.txt | 10 +++--- .../C/src/TriggerDownstreamOnlyIfPresent2.txt | 12 +++---- test/known-good/C/src/UnconnectedInput.txt | 18 +++++----- test/known-good/C/src/Wcet.txt | 12 +++---- .../C/src/arduino/AnalogReadSerial.txt | 6 ++-- test/known-good/C/src/arduino/Blink.txt | 6 ++-- .../C/src/arduino/BlinkAttemptThreading.txt | 10 +++--- test/known-good/C/src/arduino/BlinkMBED.txt | 6 ++-- .../C/src/arduino/DigitalReadSerial.txt | 8 ++--- test/known-good/C/src/arduino/Fade.txt | 12 +++---- .../C/src/arduino/ReadAnalogVoltage.txt | 6 ++-- .../C/src/concurrent/AsyncCallback.txt | 14 ++++---- .../C/src/concurrent/AsyncCallbackDrop.txt | 14 ++++---- .../C/src/concurrent/AsyncCallbackReplace.txt | 14 ++++---- .../C/src/concurrent/CompositionThreaded.txt | 14 ++++---- .../DeadlineHandledAboveThreaded.txt | 8 ++--- .../C/src/concurrent/DeadlineThreaded.txt | 14 ++++---- .../C/src/concurrent/DelayIntThreaded.txt | 14 ++++---- .../C/src/concurrent/DeterminismThreaded.txt | 10 +++--- .../src/concurrent/DoubleReactionThreaded.txt | 16 ++++----- .../C/src/concurrent/GainThreaded.txt | 10 +++--- .../C/src/concurrent/HelloThreaded.txt | 14 ++++---- .../C/src/concurrent/PingPongThreaded.txt | 18 +++++----- .../C/src/concurrent/ScheduleAt.txt | 14 ++++---- .../C/src/concurrent/ScheduleTwice.txt | 4 +-- .../src/concurrent/ScheduleTwiceThreaded.txt | 4 +-- .../src/concurrent/SendingInsideThreaded.txt | 10 +++--- .../C/src/concurrent/StarvationThreaded.txt | 14 ++++---- .../C/src/concurrent/StopThreaded.txt | 12 +++---- .../C/src/concurrent/StopZeroThreaded.txt | 10 +++--- test/known-good/C/src/concurrent/Threaded.txt | 22 ++++++------ .../C/src/concurrent/ThreadedMultiport.txt | 26 +++++++------- .../C/src/concurrent/ThreadedThreaded.txt | 24 ++++++------- .../C/src/concurrent/TimeLimitThreaded.txt | 14 ++++---- .../C/src/concurrent/TimeoutThreaded.txt | 10 +++--- .../C/src/concurrent/TimeoutZeroThreaded.txt | 10 +++--- test/known-good/C/src/concurrent/Tracing.txt | 32 ++++++++--------- test/known-good/C/src/concurrent/Workers.txt | 2 +- .../src/docker/FilesPropertyContainerized.txt | 4 +-- .../C/src/docker/HelloWorldContainerized.txt | 12 +++---- .../C/src/docker/PingPongContainerized.txt | 4 +-- .../DistributedCountContainerized.txt | 10 +++--- .../DistributedDoublePortContainerized.txt | 8 ++--- .../DistributedMultiportContainerized.txt | 6 ++-- ...tributedStopDecentralizedContainerized.txt | 4 +-- .../C/src/federated/BroadcastFeedback.txt | 12 +++---- .../BroadcastFeedbackWithHierarchy.txt | 14 ++++---- .../C/src/federated/ChainWithDelay.txt | 2 +- .../C/src/federated/CycleDetection.txt | 14 ++++---- .../C/src/federated/DecentralizedP2PComm.txt | 22 ++++++------ .../DecentralizedP2PUnbalancedTimeout.txt | 16 ++++----- ...entralizedP2PUnbalancedTimeoutPhysical.txt | 16 ++++----- .../C/src/federated/DistributedBank.txt | 8 ++--- .../federated/DistributedBankToMultiport.txt | 8 ++--- .../C/src/federated/DistributedCount.txt | 10 +++--- .../DistributedCountDecentralized.txt | 8 ++--- .../DistributedCountDecentralizedLate.txt | 12 +++---- ...ributedCountDecentralizedLateHierarchy.txt | 18 +++++----- .../federated/DistributedCountPhysical.txt | 10 +++--- .../DistributedCountPhysicalAfterDelay.txt | 4 +-- .../DistributedCountPhysicalDecentralized.txt | 12 +++---- .../C/src/federated/DistributedDoublePort.txt | 16 ++++----- .../DistributedLogicalActionUpstreamLong.txt | 10 +++--- .../src/federated/DistributedLoopedAction.txt | 12 +++---- .../DistributedLoopedActionDecentralized.txt | 24 ++++++------- .../DistributedLoopedPhysicalAction.txt | 22 ++++++------ ...butedLoopedPhysicalActionDecentralized.txt | 4 +-- .../C/src/federated/DistributedMultiport.txt | 12 +++---- .../federated/DistributedMultiportToBank.txt | 12 +++---- .../federated/DistributedMultiportToken.txt | 10 +++--- .../src/federated/DistributedNetworkOrder.txt | 10 +++--- .../DistributedPhysicalActionUpstream.txt | 12 +++---- .../DistributedPhysicalActionUpstreamLong.txt | 12 +++---- .../C/src/federated/DistributedStop.txt | 10 +++--- .../DistributedStopDecentralized.txt | 2 +- .../C/src/federated/DistributedStopZero.txt | 4 +-- .../C/src/federated/DistributedToken.txt | 14 ++++---- .../C/src/federated/FeedbackDelay.txt | 28 +++++++-------- .../C/src/federated/FeedbackDelaySimple.txt | 8 ++--- .../C/src/federated/HelloDistributed.txt | 6 ++-- .../federated/LoopDistributedCentralized.txt | 24 ++++++------- .../federated/LoopDistributedCentralized2.txt | 30 ++++++++-------- ...opDistributedCentralizedPhysicalAction.txt | 22 ++++++------ .../LoopDistributedCentralizedPrecedence.txt | 24 ++++++------- ...tributedCentralizedPrecedenceHierarchy.txt | 30 ++++++++-------- .../LoopDistributedDecentralized.txt | 14 ++++---- .../C/src/federated/LoopDistributedDouble.txt | 26 +++++++------- .../C/src/federated/ParallelDestinations.txt | 4 +-- .../C/src/federated/ParallelSources.txt | 4 +-- .../federated/ParallelSourcesMultiport.txt | 6 ++-- .../C/src/federated/PhysicalSTP.txt | 10 +++--- .../C/src/federated/PingPongDistributed.txt | 2 +- .../federated/PingPongDistributedPhysical.txt | 18 +++++----- .../C/src/federated/SimpleFederated.txt | 8 ++--- .../C/src/federated/StopAtShutdown.txt | 6 ++-- .../C/src/federated/TopLevelArtifacts.txt | 4 +-- .../C/src/federated/failing/ClockSync.txt | 26 +++++++------- .../failing/DistributedDoublePortLooped.txt | 34 +++++++++---------- .../failing/DistributedDoublePortLooped2.txt | 24 ++++++------- .../DistributedNetworkOrderDecentralized.txt | 10 +++--- ...LoopDistributedDecentralizedPrecedence.txt | 18 +++++----- ...ibutedDecentralizedPrecedenceHierarchy.txt | 8 ++--- .../failing/SimpleFederatedAuthenticated.txt | 12 +++---- test/known-good/C/src/lib/Count.txt | 6 ++-- test/known-good/C/src/lib/Imported.txt | 2 +- test/known-good/C/src/lib/ImportedAgain.txt | 2 +- .../C/src/lib/ImportedComposition.txt | 8 ++--- test/known-good/C/src/lib/InternalDelay.txt | 8 ++--- .../C/src/lib/LoopedActionSender.txt | 6 ++-- test/known-good/C/src/lib/PassThrough.txt | 4 +-- test/known-good/C/src/lib/Test.txt | 6 ++-- test/known-good/C/src/lib/TestCount.txt | 8 ++--- .../C/src/lib/TestCountMultiport.txt | 14 ++++---- .../modal_models/BanksCount3ModesComplex.txt | 24 ++++++------- .../modal_models/BanksCount3ModesSimple.txt | 6 ++-- .../src/modal_models/BanksModalStateReset.txt | 8 ++--- .../C/src/modal_models/ConvertCaseTest.txt | 26 +++++++------- .../C/src/modal_models/Count3Modes.txt | 10 +++--- .../C/src/modal_models/MixedReactions.txt | 8 ++--- .../C/src/modal_models/ModalActions.txt | 16 ++++----- .../C/src/modal_models/ModalAfter.txt | 26 +++++++------- .../C/src/modal_models/ModalCycleBreaker.txt | 16 ++++----- .../src/modal_models/ModalNestedReactions.txt | 16 ++++----- .../src/modal_models/ModalStartupShutdown.txt | 34 +++++++++---------- .../C/src/modal_models/ModalStateReset.txt | 20 +++++------ .../src/modal_models/ModalStateResetAuto.txt | 20 +++++------ .../C/src/modal_models/ModalTimers.txt | 12 +++---- .../MultipleOutputFeeder_2Connections.txt | 14 ++++---- ...ltipleOutputFeeder_ReactionConnections.txt | 14 ++++---- .../C/src/modal_models/util/TraceTesting.txt | 18 +++++----- .../C/src/multiport/BankGangedConnections.txt | 12 +++---- .../C/src/multiport/BankIndexInitializer.txt | 14 ++++---- .../C/src/multiport/BankMulticast.txt | 14 ++++---- .../src/multiport/BankMultiportToReaction.txt | 12 +++---- .../multiport/BankReactionsInContainer.txt | 14 ++++---- .../C/src/multiport/BankSelfBroadcast.txt | 10 +++--- .../known-good/C/src/multiport/BankToBank.txt | 22 ++++++------ .../C/src/multiport/BankToBankMultiport.txt | 22 ++++++------ .../multiport/BankToBankMultiportAfter.txt | 22 ++++++------ .../C/src/multiport/BankToMultiport.txt | 14 ++++---- .../C/src/multiport/BankToReaction.txt | 8 ++--- test/known-good/C/src/multiport/Broadcast.txt | 14 ++++---- .../C/src/multiport/BroadcastAfter.txt | 14 ++++---- .../src/multiport/BroadcastMultipleAfter.txt | 16 ++++----- test/known-good/C/src/multiport/DualBanks.txt | 10 +++--- .../C/src/multiport/DualBanksMultiport.txt | 10 +++--- .../C/src/multiport/FullyConnected.txt | 12 +++---- .../multiport/FullyConnectedAddressable.txt | 18 +++++----- .../FullyConnectedAddressableAfter.txt | 6 ++-- .../C/src/multiport/MultiportFromBank.txt | 18 +++++----- .../multiport/MultiportFromBankHierarchy.txt | 12 +++---- .../MultiportFromBankHierarchyAfter.txt | 4 +-- .../src/multiport/MultiportFromHierarchy.txt | 26 +++++++------- .../C/src/multiport/MultiportFromReaction.txt | 14 ++++---- .../C/src/multiport/MultiportIn.txt | 16 ++++----- .../multiport/MultiportInParameterized.txt | 18 +++++----- .../C/src/multiport/MultiportMutableInput.txt | 12 +++---- .../multiport/MultiportMutableInputArray.txt | 12 +++---- .../C/src/multiport/MultiportOut.txt | 16 ++++----- .../C/src/multiport/MultiportToBank.txt | 20 +++++------ .../C/src/multiport/MultiportToBankAfter.txt | 18 +++++----- .../C/src/multiport/MultiportToBankDouble.txt | 14 ++++---- .../multiport/MultiportToBankHierarchy.txt | 22 ++++++------ .../C/src/multiport/MultiportToHierarchy.txt | 22 ++++++------ .../C/src/multiport/MultiportToMultiport.txt | 18 +++++----- .../C/src/multiport/MultiportToMultiport2.txt | 14 ++++---- .../multiport/MultiportToMultiport2After.txt | 8 ++--- .../multiport/MultiportToMultiportArray.txt | 12 +++---- .../MultiportToMultiportParameter.txt | 18 +++++----- .../C/src/multiport/MultiportToPort.txt | 12 +++---- .../C/src/multiport/MultiportToReaction.txt | 12 +++---- .../C/src/multiport/NestedBanks.txt | 30 ++++++++-------- .../src/multiport/NestedInterleavedBanks.txt | 14 ++++---- .../C/src/multiport/PipelineAfter.txt | 8 ++--- .../src/multiport/ReactionToContainedBank.txt | 10 +++--- .../multiport/ReactionToContainedBank2.txt | 12 +++---- .../ReactionToContainedBankMultiport.txt | 10 +++--- .../C/src/multiport/ReactionsToNested.txt | 10 +++--- test/known-good/C/src/multiport/Sparse.txt | 14 ++++---- .../C/src/multiport/SparseFallback.txt | 14 ++++---- .../TriggerDownstreamOnlyIfPresent.txt | 18 +++++----- .../serialization/PersonProtocolBuffers.txt | 2 +- .../C/src/serialization/ProtoNoPacking.txt | 6 ++-- .../serialization/ROSBuiltInSerialization.txt | 12 +++---- .../ROSBuiltInSerializationSharedPtr.txt | 12 +++---- test/known-good/C/src/target/CMakeInclude.txt | 4 +-- .../C/src/target/DistributedCMakeInclude.txt | 4 +-- ...DistributedCMakeIncludeSeparateCompile.txt | 2 +- test/known-good/C/src/target/Files.txt | 2 +- .../C/src/target/HelloWorldCCPP.txt | 6 ++-- .../C/src/target/HelloWorldFederatedCCPP.txt | 6 ++-- .../C/src/target/HelloWorldThreadedCPP.txt | 4 +-- test/known-good/C/src/target/Platform.txt | 2 +- .../C/src/target/lib/ImportedCMakeInclude.txt | 2 +- .../C/src/token/TokenContainedPrint.txt | 4 +-- .../C/src/token/TokenContainedPrintBank.txt | 6 ++-- .../C/src/token/TokenContainedSource.txt | 8 ++--- .../C/src/token/TokenContainedSourceBank.txt | 10 +++--- .../known-good/C/src/token/TokenDelayTest.txt | 2 +- test/known-good/C/src/token/TokenMutable.txt | 2 +- .../C/src/token/TokenSourcePrint.txt | 2 +- .../C/src/token/TokenSourceScalePrint.txt | 2 +- test/known-good/C/src/token/lib/Token.txt | 26 +++++++------- test/known-good/C/src/zephyr/Blinky2.txt | 10 +++--- test/known-good/C/src/zephyr/HelloZephyr.txt | 8 ++--- test/known-good/C/src/zephyr/Timer.txt | 10 +++--- test/known-good/Cpp/src/ActionDelay.txt | 12 +++---- test/known-good/Cpp/src/ActionIsPresent.txt | 6 ++-- test/known-good/Cpp/src/ActionValues.txt | 6 ++-- .../Cpp/src/ActionWithNoReaction.txt | 10 +++--- test/known-good/Cpp/src/After.txt | 14 ++++---- test/known-good/Cpp/src/AfterOverlapped.txt | 8 ++--- test/known-good/Cpp/src/AfterZero.txt | 14 ++++---- test/known-good/Cpp/src/Alignment.txt | 24 ++++++------- test/known-good/Cpp/src/ArrayAsParameter.txt | 12 +++---- test/known-good/Cpp/src/ArrayAsType.txt | 4 +-- test/known-good/Cpp/src/ArrayPrint.txt | 6 ++-- test/known-good/Cpp/src/ArrayScale.txt | 6 ++-- .../Cpp/src/CharLiteralInitializer.txt | 2 +- test/known-good/Cpp/src/Composition.txt | 14 ++++---- test/known-good/Cpp/src/CompositionAfter.txt | 16 ++++----- test/known-good/Cpp/src/CompositionGain.txt | 8 ++--- test/known-good/Cpp/src/CountTest.txt | 8 ++--- test/known-good/Cpp/src/DanglingOutput.txt | 6 ++-- test/known-good/Cpp/src/Deadline.txt | 14 ++++---- .../Cpp/src/DeadlineHandledAbove.txt | 8 ++--- test/known-good/Cpp/src/DelayInt.txt | 12 +++---- test/known-good/Cpp/src/DelayedAction.txt | 8 ++--- test/known-good/Cpp/src/DelayedReaction.txt | 4 +-- test/known-good/Cpp/src/Determinism.txt | 10 +++--- test/known-good/Cpp/src/DoubleInvocation.txt | 16 ++++----- test/known-good/Cpp/src/DoublePort.txt | 14 ++++---- test/known-good/Cpp/src/DoubleReaction.txt | 18 +++++----- test/known-good/Cpp/src/DoubleTrigger.txt | 6 ++-- test/known-good/Cpp/src/FloatLiteral.txt | 8 ++--- test/known-good/Cpp/src/Gain.txt | 8 ++--- test/known-good/Cpp/src/GetMicroStep.txt | 4 +-- test/known-good/Cpp/src/GetTime.txt | 4 +-- test/known-good/Cpp/src/Hello.txt | 16 ++++----- test/known-good/Cpp/src/HelloWorld.txt | 2 +- test/known-good/Cpp/src/Hierarchy.txt | 14 ++++---- test/known-good/Cpp/src/Hierarchy2.txt | 24 ++++++------- test/known-good/Cpp/src/ImportComposition.txt | 2 +- .../Cpp/src/ManualDelayedReaction.txt | 12 +++---- test/known-good/Cpp/src/Methods.txt | 6 ++-- test/known-good/Cpp/src/Microsteps.txt | 6 ++-- test/known-good/Cpp/src/Minimal.txt | 2 +- test/known-good/Cpp/src/MovingAverage.txt | 20 +++++------ test/known-good/Cpp/src/MultipleContained.txt | 6 ++-- .../Cpp/src/NativeListsAndTimes.txt | 18 +++++----- .../Cpp/src/NestedTriggeredReactions.txt | 8 ++--- .../known-good/Cpp/src/ParameterHierarchy.txt | 6 ++-- .../known-good/Cpp/src/ParameterizedState.txt | 2 +- .../Cpp/src/ParametersOutOfOrder.txt | 2 +- test/known-good/Cpp/src/PeriodicDesugared.txt | 10 +++--- .../known-good/Cpp/src/PhysicalConnection.txt | 6 ++-- test/known-good/Cpp/src/Pipeline.txt | 8 ++--- test/known-good/Cpp/src/PreambleTest.txt | 2 +- .../Cpp/src/ReadOutputOfContainedReactor.txt | 4 +-- test/known-good/Cpp/src/Schedule.txt | 4 +-- .../Cpp/src/ScheduleLogicalAction.txt | 14 ++++---- test/known-good/Cpp/src/SelfLoop.txt | 12 +++---- test/known-good/Cpp/src/SendingInside.txt | 10 +++--- test/known-good/Cpp/src/SendingInside2.txt | 2 +- test/known-good/Cpp/src/SimpleDeadline.txt | 8 ++--- test/known-good/Cpp/src/SlowingClock.txt | 8 ++--- .../Cpp/src/SlowingClockPhysical.txt | 6 ++-- .../Cpp/src/StartupOutFromInside.txt | 2 +- test/known-good/Cpp/src/Stride.txt | 14 ++++---- test/known-good/Cpp/src/StructAsState.txt | 2 +- test/known-good/Cpp/src/StructAsType.txt | 2 +- .../known-good/Cpp/src/StructAsTypeDirect.txt | 2 +- test/known-good/Cpp/src/StructPrint.txt | 6 ++-- test/known-good/Cpp/src/StructScale.txt | 6 ++-- .../Cpp/src/TestForPreviousOutput.txt | 4 +-- test/known-good/Cpp/src/TimeLimit.txt | 14 ++++---- test/known-good/Cpp/src/TimeState.txt | 4 +-- test/known-good/Cpp/src/Timeout_Test.txt | 6 ++-- test/known-good/Cpp/src/TimerIsPresent.txt | 2 +- test/known-good/Cpp/src/ToReactionNested.txt | 10 +++--- .../src/TriggerDownstreamOnlyIfPresent2.txt | 12 +++---- .../Cpp/src/concurrent/AsyncCallback.txt | 14 ++++---- .../Cpp/src/concurrent/AsyncCallback2.txt | 10 +++--- .../src/concurrent/CompositionThreaded.txt | 14 ++++---- .../DeadlineHandledAboveThreaded.txt | 8 ++--- .../Cpp/src/concurrent/DeadlineThreaded.txt | 14 ++++---- .../Cpp/src/concurrent/DelayIntThreaded.txt | 12 +++---- .../src/concurrent/DeterminismThreaded.txt | 10 +++--- .../src/concurrent/DoubleReactionThreaded.txt | 18 +++++----- .../Cpp/src/concurrent/GainThreaded.txt | 8 ++--- .../Cpp/src/concurrent/HelloThreaded.txt | 14 ++++---- .../Cpp/src/concurrent/MinimalThreaded.txt | 2 +- .../src/concurrent/SendingInsideThreaded.txt | 10 +++--- .../Cpp/src/concurrent/Threaded.txt | 20 +++++------ .../Cpp/src/concurrent/ThreadedThreaded.txt | 16 ++++----- .../Cpp/src/concurrent/TimeLimitThreaded.txt | 14 ++++---- .../known-good/Cpp/src/concurrent/Workers.txt | 2 +- .../Cpp/src/enclave/EnclaveBank.txt | 14 ++++---- .../Cpp/src/enclave/EnclaveBankEach.txt | 10 +++--- .../Cpp/src/enclave/EnclaveHelloWorld.txt | 6 ++-- .../Cpp/src/enclave/EnclaveHierarchy.txt | 8 ++--- .../Cpp/src/enclave/EnclaveShutdown.txt | 8 ++--- .../Cpp/src/enclave/EnclaveTimeout.txt | 6 ++-- .../Cpp/src/enclave/FastAndSlow.txt | 2 +- test/known-good/Cpp/src/lib/Count.txt | 4 +-- test/known-good/Cpp/src/lib/Imported.txt | 2 +- test/known-good/Cpp/src/lib/ImportedAgain.txt | 4 +-- .../Cpp/src/lib/ImportedComposition.txt | 8 ++--- .../Cpp/src/lib/LoopedActionSender.txt | 6 ++-- .../Cpp/src/multiport/BankSelfBroadcast.txt | 10 +++--- .../Cpp/src/multiport/BankToBank.txt | 22 ++++++------ .../Cpp/src/multiport/BankToBankMultiport.txt | 24 ++++++------- .../multiport/BankToBankMultiportAfter.txt | 26 +++++++------- .../Cpp/src/multiport/BankToMultiport.txt | 10 +++--- .../Cpp/src/multiport/Broadcast.txt | 8 ++--- .../Cpp/src/multiport/BroadcastAfter.txt | 12 +++---- .../src/multiport/BroadcastMultipleAfter.txt | 14 ++++---- .../Cpp/src/multiport/FullyConnected.txt | 14 ++++---- .../multiport/FullyConnectedAddressable.txt | 18 +++++----- .../FullyConnectedAddressableAfter.txt | 6 ++-- .../src/multiport/IndexIntoMultiportInput.txt | 10 +++--- .../multiport/IndexIntoMultiportOutput.txt | 20 +++++------ .../Cpp/src/multiport/Multiport.txt | 8 ++--- .../Cpp/src/multiport/MultiportFromBank.txt | 18 +++++----- .../multiport/MultiportFromBankHierarchy.txt | 16 ++++----- .../MultiportFromBankHierarchyAfter.txt | 16 ++++----- .../src/multiport/MultiportFromHierarchy.txt | 18 +++++----- .../Cpp/src/multiport/MultiportIn.txt | 16 ++++----- .../src/multiport/MultiportMultipleSet.txt | 14 ++++---- .../Cpp/src/multiport/MultiportOut.txt | 18 +++++----- .../Cpp/src/multiport/MultiportToBank.txt | 8 ++--- .../src/multiport/MultiportToBankAfter.txt | 8 ++--- .../multiport/MultiportToBankHierarchy.txt | 16 ++++----- .../src/multiport/MultiportToHierarchy.txt | 24 ++++++------- .../src/multiport/MultiportToMultiport.txt | 6 ++-- .../src/multiport/MultiportToMultiport2.txt | 10 +++--- .../multiport/MultiportToMultiport2After.txt | 8 ++--- .../multiport/MultiportToMultiportArray.txt | 14 ++++---- .../MultiportToMultiportPhysical.txt | 6 ++-- .../Cpp/src/multiport/MultiportToPort.txt | 12 +++---- .../Cpp/src/multiport/PipelineAfter.txt | 8 ++--- .../ReadMultiportOutputOfContainedBank.txt | 10 +++--- .../multiport/ReadOutputOfContainedBank.txt | 8 ++--- .../Cpp/src/multiport/SparseMultiport.txt | 16 ++++----- .../Cpp/src/multiport/WidthGivenByCode.txt | 10 +++--- .../multiport/WriteInputOfContainedBank.txt | 8 ++--- .../WriteMultiportInputOfContainedBank.txt | 8 ++--- test/known-good/Cpp/src/properties/Fast.txt | 4 +-- .../known-good/Cpp/src/properties/Timeout.txt | 4 +-- .../Cpp/src/properties/TimeoutZero.txt | 4 +-- test/known-good/Cpp/src/target/AfterVoid.txt | 12 +++---- .../target/BraceAndParenInitialization.txt | 12 +++---- .../Cpp/src/target/CMakeInclude.txt | 4 +-- .../src/target/CliParserGenericArguments.txt | 22 ++++++------ .../Cpp/src/target/CombinedTypeNames.txt | 4 +-- .../Cpp/src/target/GenericAfter.txt | 8 ++--- .../Cpp/src/target/GenericDelay.txt | 8 ++--- .../src/target/GenericParameterAndState.txt | 4 +-- .../src/target/MultipleContainedGeneric.txt | 6 ++-- .../Cpp/src/target/PointerParameters.txt | 2 +- .../Cpp/src/target/PreambleFile.txt | 4 +-- .../Python/src/ActionWithNoReaction.txt | 4 +-- test/known-good/Python/src/After.txt | 4 +-- .../known-good/Python/src/AfterOverlapped.txt | 4 +-- test/known-good/Python/src/CompareTags.txt | 4 +-- test/known-good/Python/src/Composition.txt | 4 +-- .../Python/src/CompositionAfter.txt | 4 +-- .../Python/src/CompositionInheritance.txt | 4 +-- test/known-good/Python/src/CountSelf.txt | 4 +-- test/known-good/Python/src/CountTest.txt | 4 +-- test/known-good/Python/src/Deadline.txt | 2 +- .../Python/src/DelayArrayWithAfter.txt | 4 +-- test/known-good/Python/src/DelayStruct.txt | 2 +- .../Python/src/DelayStructWithAfter.txt | 2 +- .../src/DelayStructWithAfterOverlapped.txt | 6 ++-- test/known-good/Python/src/DelayedAction.txt | 4 +-- .../Python/src/DoubleInvocation.txt | 4 +-- test/known-good/Python/src/DoubleReaction.txt | 4 +-- test/known-good/Python/src/GetMicroStep.txt | 2 +- test/known-good/Python/src/GetTime.txt | 4 +-- test/known-good/Python/src/Hello.txt | 4 +-- test/known-good/Python/src/HelloWorld.txt | 2 +- test/known-good/Python/src/Hierarchy2.txt | 4 +-- .../Python/src/IdentifierLength.txt | 4 +-- .../Python/src/ManualDelayedReaction.txt | 2 +- test/known-good/Python/src/Methods.txt | 4 +-- .../Python/src/MethodsRecursive.txt | 4 +-- .../known-good/Python/src/MethodsSameName.txt | 4 +-- test/known-good/Python/src/MovingAverage.txt | 4 +-- .../Python/src/PeriodicDesugared.txt | 4 +-- test/known-good/Python/src/PingPong.txt | 2 +- test/known-good/Python/src/Pipeline.txt | 2 +- test/known-good/Python/src/Preamble.txt | 4 +-- .../Python/src/ScheduleLogicalAction.txt | 4 +-- test/known-good/Python/src/ScheduleValue.txt | 2 +- test/known-good/Python/src/SelfLoop.txt | 4 +-- test/known-good/Python/src/SendingInside.txt | 4 +-- test/known-good/Python/src/SlowingClock.txt | 4 +-- .../Python/src/SlowingClockPhysical.txt | 2 +- test/known-good/Python/src/Stride.txt | 4 +-- test/known-good/Python/src/StructAsType.txt | 2 +- .../Python/src/StructAsTypeDirect.txt | 2 +- test/known-good/Python/src/StructParallel.txt | 2 +- test/known-good/Python/src/StructPrint.txt | 2 +- test/known-good/Python/src/StructScale.txt | 2 +- test/known-good/Python/src/TimeLimit.txt | 2 +- test/known-good/Python/src/Timers.txt | 2 +- .../src/TriggerDownstreamOnlyIfPresent.txt | 8 ++--- .../src/TriggerDownstreamOnlyIfPresent2.txt | 6 ++-- .../Python/src/UnconnectedInput.txt | 4 +-- .../Python/src/concurrent/AsyncCallback.txt | 2 +- .../src/concurrent/AsyncCallbackNoTimer.txt | 2 +- .../src/docker/FilesPropertyContainerized.txt | 4 +-- .../src/docker/HelloWorldContainerized.txt | 2 +- .../src/docker/PingPongContainerized.txt | 4 +-- .../DistributedCountContainerized.txt | 8 ++--- .../DistributedDoublePortContainerized.txt | 8 ++--- .../DistributedMultiportContainerized.txt | 6 ++-- .../DistributedSendClassContainerized.txt | 4 +-- ...tributedStopDecentralizedContainerized.txt | 4 +-- .../src/federated/BroadcastFeedback.txt | 4 +-- .../BroadcastFeedbackWithHierarchy.txt | 4 +-- .../Python/src/federated/ChainWithDelay.txt | 2 +- .../src/federated/DecentralizedP2PComm.txt | 8 ++--- .../DecentralizedP2PUnbalancedTimeout.txt | 4 +-- ...entralizedP2PUnbalancedTimeoutPhysical.txt | 4 +-- .../Python/src/federated/DistributedBank.txt | 6 ++-- .../federated/DistributedBankToMultiport.txt | 4 +-- .../Python/src/federated/DistributedCount.txt | 4 +-- .../DistributedCountDecentralized.txt | 4 +-- .../DistributedCountDecentralizedLate.txt | 4 +-- ...ibutedCountDecentralizedLateDownstream.txt | 4 +-- ...ributedCountDecentralizedLateHierarchy.txt | 4 +-- .../federated/DistributedCountPhysical.txt | 2 +- .../DistributedCountPhysicalAfterDelay.txt | 2 +- .../DistributedCountPhysicalDecentralized.txt | 4 +-- .../src/federated/DistributedDoublePort.txt | 6 ++-- .../src/federated/DistributedLoopedAction.txt | 2 +- .../DistributedLoopedPhysicalAction.txt | 4 +-- ...butedLoopedPhysicalActionDecentralized.txt | 4 +-- .../src/federated/DistributedMultiport.txt | 4 +-- .../federated/DistributedMultiportToBank.txt | 4 +-- .../federated/DistributedMultiportToken.txt | 4 +-- .../src/federated/DistributedNoReact.txt | 2 +- .../DistributedStopDecentralized.txt | 2 +- .../src/federated/DistributedStructAsType.txt | 4 +-- .../DistributedStructAsTypeDirect.txt | 4 +-- .../federated/DistributedStructParallel.txt | 4 +-- .../src/federated/DistributedStructPrint.txt | 4 +-- .../src/federated/DistributedStructScale.txt | 4 +-- ...tributedCentralizedPrecedenceHierarchy.txt | 10 +++--- .../src/federated/ParallelDestinations.txt | 2 +- .../Python/src/federated/ParallelSources.txt | 2 +- .../federated/ParallelSourcesMultiport.txt | 2 +- .../Python/src/federated/PhysicalSTP.txt | 4 +-- .../Python/src/federated/StopAtShutdown.txt | 2 +- .../src/federated/failing/ClockSync.txt | 20 +++++------ .../DistributedLoopedActionDecentralized.txt | 4 +-- .../failing/DistributedNetworkOrder.txt | 2 +- .../failing/LoopDistributedCentralized.txt | 10 +++--- .../LoopDistributedCentralizedPrecedence.txt | 12 +++---- .../failing/LoopDistributedDecentralized.txt | 4 +-- .../failing/LoopDistributedDouble.txt | 4 +-- .../federated/failing/TopLevelArtifacts.txt | 2 +- .../modal_models/BanksCount3ModesComplex.txt | 14 ++++---- .../modal_models/BanksCount3ModesSimple.txt | 6 ++-- .../src/modal_models/BanksModalStateReset.txt | 8 ++--- .../src/modal_models/ConvertCaseTest.txt | 4 +-- .../Python/src/modal_models/Count3Modes.txt | 4 +-- .../Python/src/modal_models/ModalActions.txt | 4 +-- .../Python/src/modal_models/ModalAfter.txt | 4 +-- .../src/modal_models/ModalCycleBreaker.txt | 4 +-- .../src/modal_models/ModalNestedReactions.txt | 4 +-- .../src/modal_models/ModalStartupShutdown.txt | 4 +-- .../src/modal_models/ModalStateReset.txt | 4 +-- .../src/modal_models/ModalStateResetAuto.txt | 4 +-- .../Python/src/modal_models/ModalTimers.txt | 4 +-- .../MultipleOutputFeeder_2Connections.txt | 4 +-- ...ltipleOutputFeeder_ReactionConnections.txt | 4 +-- .../src/multiport/BankIndexInitializer.txt | 2 +- .../multiport/BankReactionsInContainer.txt | 4 +-- .../Python/src/multiport/BankToBank.txt | 8 ++--- .../src/multiport/BankToBankMultiport.txt | 8 ++--- .../multiport/BankToBankMultiportAfter.txt | 8 ++--- .../Python/src/multiport/BankToMultiport.txt | 2 +- .../Python/src/multiport/Broadcast.txt | 6 ++-- .../Python/src/multiport/BroadcastAfter.txt | 6 ++-- .../src/multiport/BroadcastMultipleAfter.txt | 6 ++-- .../src/multiport/MultiportFromBank.txt | 6 ++-- .../multiport/MultiportFromBankHierarchy.txt | 6 ++-- .../MultiportFromBankHierarchyAfter.txt | 4 +-- .../src/multiport/MultiportFromHierarchy.txt | 4 +-- .../src/multiport/MultiportFromReaction.txt | 4 +-- .../Python/src/multiport/MultiportIn.txt | 4 +-- .../multiport/MultiportInParameterized.txt | 4 +-- .../Python/src/multiport/MultiportOut.txt | 4 +-- .../Python/src/multiport/MultiportToBank.txt | 6 ++-- .../src/multiport/MultiportToBankAfter.txt | 6 ++-- .../multiport/MultiportToBankHierarchy.txt | 6 ++-- .../src/multiport/MultiportToHierarchy.txt | 4 +-- .../src/multiport/MultiportToMultiport.txt | 4 +-- .../multiport/MultiportToMultiportArray.txt | 4 +-- .../MultiportToMultiportParameter.txt | 4 +-- .../Python/src/multiport/MultiportToPort.txt | 4 +-- .../src/multiport/MultiportToReaction.txt | 4 +-- .../Python/src/multiport/NestedBanks.txt | 6 ++-- .../src/multiport/NestedInterleavedBanks.txt | 4 +-- .../src/multiport/ReactionsToNested.txt | 2 +- .../serialization/PersonProtocolBuffers.txt | 2 +- .../src/serialization/ProtoNoPacking.txt | 2 +- .../Python/src/target/AfterNoTypes.txt | 4 +-- test/known-good/Rust/src/ActionDelay.txt | 2 +- .../Rust/src/ActionImplicitDelay.txt | 2 +- test/known-good/Rust/src/ActionIsPresent.txt | 4 +-- .../Rust/src/ActionScheduleMicrostep.txt | 2 +- test/known-good/Rust/src/ActionValues.txt | 6 ++-- .../Rust/src/ActionValuesCleanup.txt | 6 ++-- .../Rust/src/CompositionWithPorts.txt | 4 +-- test/known-good/Rust/src/CtorParamDefault.txt | 4 +-- test/known-good/Rust/src/CtorParamMixed.txt | 6 ++-- test/known-good/Rust/src/CtorParamSimple.txt | 4 +-- .../Rust/src/DependencyOnChildPort.txt | 6 ++-- .../Rust/src/DependencyThroughChildPort.txt | 6 ++-- .../Rust/src/DependencyUseAccessible.txt | 12 +++---- .../Rust/src/DependencyUseNonTrigger.txt | 6 ++-- .../Rust/src/DependencyUseOnLogicalAction.txt | 6 ++-- test/known-good/Rust/src/FloatLiteral.txt | 8 ++--- test/known-good/Rust/src/MainReactorParam.txt | 2 +- test/known-good/Rust/src/MovingAverage.txt | 20 +++++------ .../Rust/src/NativeListsAndTimes.txt | 22 ++++++------ ...sicalActionCanBeScheduledSynchronously.txt | 4 +-- .../src/PhysicalActionKeepaliveIsSmart.txt | 4 +-- .../PhysicalActionWakesSleepingScheduler.txt | 2 +- .../Rust/src/PhysicalActionWithKeepalive.txt | 4 +-- .../Rust/src/PortConnectionInSelfInChild.txt | 6 ++-- .../Rust/src/PortConnectionInSelfOutSelf.txt | 10 +++--- .../src/PortConnectionOutChildOutSelf.txt | 10 +++--- test/known-good/Rust/src/PortRefCleanup.txt | 8 ++--- test/known-good/Rust/src/PortValueCleanup.txt | 8 ++--- test/known-good/Rust/src/Preamble.txt | 2 +- test/known-good/Rust/src/ReservedKeywords.txt | 8 ++--- .../Rust/src/SingleFileGeneration.txt | 6 ++-- .../known-good/Rust/src/StateDefaultValue.txt | 6 ++-- .../Rust/src/StateInitializerVisibility.txt | 4 +-- test/known-good/Rust/src/Stop.txt | 12 +++---- test/known-good/Rust/src/StopCleanup.txt | 4 +-- .../known-good/Rust/src/StopDuringStartup.txt | 2 +- test/known-good/Rust/src/StopIdempotence.txt | 4 +-- test/known-good/Rust/src/StopTimeout.txt | 2 +- test/known-good/Rust/src/StopTimeoutExact.txt | 4 +-- test/known-good/Rust/src/StopTopology.txt | 4 +-- test/known-good/Rust/src/StructAsState.txt | 6 ++-- test/known-good/Rust/src/StructAsType.txt | 14 ++++---- test/known-good/Rust/src/TimeState.txt | 2 +- test/known-good/Rust/src/TimerDefaults.txt | 2 +- test/known-good/Rust/src/TimerIsPresent.txt | 6 ++-- test/known-good/Rust/src/TimerPeriodic.txt | 4 +-- test/known-good/Rust/src/Timers.txt | 4 +-- .../known-good/Rust/src/TypeVarLengthList.txt | 4 +-- .../Rust/src/concurrent/AsyncCallback.txt | 16 ++++----- .../Rust/src/concurrent/Workers.txt | 2 +- .../Rust/src/generics/CtorParamGeneric.txt | 8 ++--- .../src/generics/CtorParamGenericInst.txt | 14 ++++---- .../Rust/src/generics/GenericComplexType.txt | 4 +-- .../Rust/src/generics/GenericReactor.txt | 8 ++--- test/known-good/Rust/src/lib/Imported.txt | 2 +- .../known-good/Rust/src/lib/ImportedAgain.txt | 2 +- .../Rust/src/lib/SomethingWithAPreamble.txt | 2 +- .../src/multiport/ConnectionToSelfBank.txt | 10 +++--- .../multiport/ConnectionToSelfMultiport.txt | 8 ++--- .../Rust/src/multiport/CycledLhs_SelfLoop.txt | 12 +++---- .../Rust/src/multiport/CycledLhs_Single.txt | 10 +++--- .../Rust/src/multiport/FullyConnected.txt | 14 ++++---- .../multiport/FullyConnectedAddressable.txt | 14 ++++---- .../Rust/src/multiport/MultiportFromBank.txt | 12 +++---- .../src/multiport/MultiportFromHierarchy.txt | 16 ++++----- .../Rust/src/multiport/MultiportIn.txt | 18 +++++----- .../Rust/src/multiport/MultiportOut.txt | 14 ++++---- .../Rust/src/multiport/MultiportToBank.txt | 10 +++--- .../multiport/MultiportToBankHierarchy.txt | 14 ++++---- .../src/multiport/MultiportToMultiport.txt | 4 +-- .../src/multiport/MultiportToMultiport2.txt | 8 ++--- .../multiport/ReadOutputOfContainedBank.txt | 8 ++--- .../Rust/src/multiport/WidthWithParameter.txt | 4 +-- .../multiport/WriteInputOfContainedBank.txt | 8 ++--- .../Rust/src/target/BuildProfileRelease.txt | 2 +- .../Rust/src/target/CargoDependency.txt | 8 ++--- .../src/target/CargoDependencyOnRuntime.txt | 6 ++-- .../known-good/Rust/src/target/CliFeature.txt | 6 ++-- .../target/MainParameterCanBeExpression.txt | 6 ++-- .../Rust/src/target/ModuleDependency.txt | 2 +- .../target/ModuleDependencyWithDirModule.txt | 2 +- .../known-good/TypeScript/src/ActionDelay.txt | 10 +++--- .../TypeScript/src/ActionWithNoReaction.txt | 10 +++--- test/known-good/TypeScript/src/After.txt | 12 +++---- .../TypeScript/src/ArrayAsParameter.txt | 8 ++--- .../known-good/TypeScript/src/ArrayAsType.txt | 2 +- test/known-good/TypeScript/src/ArrayPrint.txt | 2 +- test/known-good/TypeScript/src/ArrayScale.txt | 2 +- .../known-good/TypeScript/src/Composition.txt | 12 +++---- .../TypeScript/src/CompositionAfter.txt | 16 ++++----- test/known-good/TypeScript/src/CountTest.txt | 6 ++-- .../TypeScript/src/DanglingOutput.txt | 6 ++-- test/known-good/TypeScript/src/Deadline.txt | 14 ++++---- .../TypeScript/src/DeadlineHandledAbove.txt | 10 +++--- test/known-good/TypeScript/src/DelayInt.txt | 14 ++++---- .../TypeScript/src/DelayedAction.txt | 4 +-- .../TypeScript/src/DelayedReaction.txt | 4 +-- .../known-good/TypeScript/src/Determinism.txt | 10 +++--- .../TypeScript/src/DoubleInvocation.txt | 16 ++++----- .../TypeScript/src/DoubleReaction.txt | 16 ++++----- .../TypeScript/src/DoubleTrigger.txt | 6 ++-- .../TypeScript/src/FloatLiteral.txt | 10 +++--- test/known-good/TypeScript/src/Gain.txt | 10 +++--- test/known-good/TypeScript/src/GetTime.txt | 2 +- test/known-good/TypeScript/src/Hello.txt | 14 ++++---- test/known-good/TypeScript/src/Hierarchy.txt | 14 ++++---- test/known-good/TypeScript/src/Hierarchy2.txt | 24 ++++++------- test/known-good/TypeScript/src/Import.txt | 2 +- test/known-good/TypeScript/src/Microsteps.txt | 4 +-- .../TypeScript/src/MovingAverage.txt | 18 +++++----- .../TypeScript/src/MultipleContained.txt | 6 ++-- .../TypeScript/src/NativeListsAndTimes.txt | 18 +++++----- .../TypeScript/src/ParameterizedState.txt | 2 +- .../TypeScript/src/PeriodicDesugared.txt | 4 +-- .../TypeScript/src/PhysicalConnection.txt | 4 +-- test/known-good/TypeScript/src/Preamble.txt | 4 +-- .../src/ReadOutputOfContainedReactor.txt | 4 +-- test/known-good/TypeScript/src/Schedule.txt | 2 +- .../TypeScript/src/ScheduleLogicalAction.txt | 12 +++---- .../TypeScript/src/SendingInside.txt | 10 +++--- .../TypeScript/src/SendingInside2.txt | 2 +- .../TypeScript/src/SendsPointerTest.txt | 10 +++--- .../TypeScript/src/SimpleDeadline.txt | 8 ++--- .../TypeScript/src/SlowingClock.txt | 10 +++--- .../TypeScript/src/SlowingClockPhysical.txt | 6 ++-- test/known-good/TypeScript/src/Stop.txt | 14 ++++---- test/known-good/TypeScript/src/Stride.txt | 12 +++---- .../TypeScript/src/StructAsState.txt | 6 ++-- .../TypeScript/src/StructAsType.txt | 12 +++---- .../TypeScript/src/StructAsTypeDirect.txt | 12 +++---- .../known-good/TypeScript/src/StructPrint.txt | 12 +++---- .../known-good/TypeScript/src/StructScale.txt | 6 ++-- .../TypeScript/src/TestForPreviousOutput.txt | 4 +-- test/known-good/TypeScript/src/TimeLimit.txt | 16 ++++----- test/known-good/TypeScript/src/TimeState.txt | 4 +-- test/known-good/TypeScript/src/Wcet.txt | 14 ++++---- .../src/concurrent/AsyncCallback.txt | 14 ++++---- .../src/docker/HelloWorldContainerized.txt | 2 +- .../DistributedCountContainerized.txt | 6 ++-- .../src/federated/ChainWithDelay.txt | 2 +- .../src/federated/DistributedCount.txt | 8 ++--- .../federated/DistributedCountPhysical.txt | 18 +++++----- .../src/federated/DistributedDoublePort.txt | 20 +++++------ .../src/federated/DistributedLoopedAction.txt | 12 +++---- .../DistributedLoopedPhysicalAction.txt | 18 +++++----- .../src/federated/DistributedStop.txt | 18 +++++----- .../src/federated/DistributedStopZero.txt | 12 +++---- .../src/federated/HelloDistributed.txt | 6 ++-- .../federated/LoopDistributedCentralized.txt | 14 ++++---- .../src/federated/LoopDistributedDouble.txt | 24 ++++++------- .../src/federated/PingPongDistributed.txt | 18 +++++----- .../federated/PingPongDistributedPhysical.txt | 18 +++++----- .../src/federated/SimpleFederated.txt | 6 ++-- .../src/federated/StopAtShutdown.txt | 6 ++-- .../src/federated/TopLevelArtifacts.txt | 4 +-- test/known-good/TypeScript/src/lib/Count.txt | 6 ++-- .../TypeScript/src/lib/Imported.txt | 4 +-- .../TypeScript/src/lib/ImportedAgain.txt | 4 +-- .../TypeScript/src/lib/InternalDelay.txt | 8 ++--- .../TypeScript/src/lib/LoopedActionSender.txt | 6 ++-- .../TypeScript/src/lib/TestCount.txt | 8 ++--- .../src/multiport/BankMulticast.txt | 12 +++---- .../src/multiport/BankMultiportToReaction.txt | 10 +++--- .../multiport/BankReactionsInContainer.txt | 12 +++---- .../src/multiport/BankSelfBroadcast.txt | 8 ++--- .../TypeScript/src/multiport/BankToBank.txt | 16 ++++----- .../src/multiport/BankToBankMultiport.txt | 20 +++++------ .../multiport/BankToBankMultiportAfter.txt | 20 +++++------ .../src/multiport/BankToMultiport.txt | 8 ++--- .../src/multiport/BankToReaction.txt | 6 ++-- .../TypeScript/src/multiport/Broadcast.txt | 6 ++-- .../src/multiport/BroadcastAfter.txt | 10 +++--- .../src/multiport/BroadcastMultipleAfter.txt | 12 +++---- .../src/multiport/FullyConnected.txt | 12 +++---- .../src/multiport/MultiportFromBank.txt | 14 ++++---- .../multiport/MultiportFromBankHierarchy.txt | 8 ++--- .../MultiportFromBankHierarchyAfter.txt | 2 +- .../src/multiport/MultiportFromHierarchy.txt | 24 ++++++------- .../src/multiport/MultiportFromReaction.txt | 12 +++---- .../TypeScript/src/multiport/MultiportIn.txt | 14 ++++---- .../multiport/MultiportInParameterized.txt | 16 ++++----- .../src/multiport/MultiportMutableInput.txt | 12 +++---- .../multiport/MultiportMutableInputArray.txt | 4 +-- .../TypeScript/src/multiport/MultiportOut.txt | 14 ++++---- .../src/multiport/MultiportToBank.txt | 6 ++-- .../src/multiport/MultiportToBankAfter.txt | 14 ++++---- .../src/multiport/MultiportToBankDouble.txt | 10 +++--- .../multiport/MultiportToBankHierarchy.txt | 12 +++---- .../src/multiport/MultiportToHierarchy.txt | 20 +++++------ .../src/multiport/MultiportToMultiport.txt | 6 ++-- .../src/multiport/MultiportToMultiport2.txt | 8 ++--- .../multiport/MultiportToMultiport2After.txt | 8 ++--- .../multiport/MultiportToMultiportArray.txt | 6 ++-- .../MultiportToMultiportParameter.txt | 16 ++++----- .../src/multiport/MultiportToPort.txt | 10 +++--- .../src/multiport/MultiportToReaction.txt | 10 +++--- .../TypeScript/src/multiport/NestedBanks.txt | 26 +++++++------- .../src/multiport/PipelineAfter.txt | 8 ++--- .../src/multiport/ReactionToContainedBank.txt | 8 ++--- .../src/multiport/ReactionsToNested.txt | 10 +++--- .../src/serialization/ProtoNoPacking.txt | 8 ++--- .../TypeScript/src/target/AfterNoTypes.txt | 6 ++-- 817 files changed, 3716 insertions(+), 3716 deletions(-) diff --git a/test/known-good/C/src/ActionDelay.txt b/test/known-good/C/src/ActionDelay.txt index 2535f0f42..3e96e2301 100644 --- a/test/known-good/C/src/ActionDelay.txt +++ b/test/known-good/C/src/ActionDelay.txt @@ -2,9 +2,9 @@ target C reactor GeneratedDelay { - input y_in: int - output y_out: int - state y_state: int(0) + input y_in: int + output y_out: int + state y_state: int(0) logical action act(100 msec) reaction(y_in) -> act {= @@ -16,13 +16,13 @@ } reactor Source { - output out: int + output out: int reaction(startup) -> out {= lf_set(out, 1); =} } reactor Sink { - input in: int + input in: int reaction(in) {= interval_t elapsed_logical = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/ActionIsPresent.txt b/test/known-good/C/src/ActionIsPresent.txt index 6f07cdf4a..6f2edd974 100644 --- a/test/known-good/C/src/ActionIsPresent.txt +++ b/test/known-good/C/src/ActionIsPresent.txt @@ -1,9 +1,9 @@ // Tests the is_present variable for actions. target C -main reactor ActionIsPresent(offset: time(1 nsec), period: time(500 msec)) { +main reactor ActionIsPresent(offset: time(1 nsec), period: time(500 msec)) { logical action a - state success: bool(false) + state success: bool(false) reaction(startup, a) -> a {= if (!a->is_present) { diff --git a/test/known-good/C/src/ActionWithNoReaction.txt b/test/known-good/C/src/ActionWithNoReaction.txt index 17382a542..04d280352 100644 --- a/test/known-good/C/src/ActionWithNoReaction.txt +++ b/test/known-good/C/src/ActionWithNoReaction.txt @@ -2,14 +2,14 @@ // test passes merely by compiling and executing without a segfault. Its other // functionality is tested by other tests. target C { - fast: true, - timeout: 3 sec + fast: true, + timeout: 3 sec } reactor foo { - input x: int - output y: int - logical action a: int* + input x: int + output y: int + logical action a: int* reaction(x) -> y, a {= // reaction(a) {= =} lf_set(y, 2*x->value); @@ -18,7 +18,7 @@ } reactor print { - input x: int + input x: int reaction(x) {= printf("Result is %d\n", x->value); diff --git a/test/known-good/C/src/After.txt b/test/known-good/C/src/After.txt index be2e1fc68..d157eb9e0 100644 --- a/test/known-good/C/src/After.txt +++ b/test/known-good/C/src/After.txt @@ -1,21 +1,21 @@ // This checks that the after keyword adjusts logical time, not using physical // time. target C { - fast: false, - timeout: 3 sec + fast: false, + timeout: 3 sec } reactor foo { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= lf_set(y, 2*x->value); =} } reactor print { - state expected_time: time(10 msec) - state received: int(0) - input x: int + state expected_time: time(10 msec) + state received: int(0) + input x: int reaction(x) {= self->received++; diff --git a/test/known-good/C/src/AfterCycles.txt b/test/known-good/C/src/AfterCycles.txt index 6c0d77b54..8f401c285 100644 --- a/test/known-good/C/src/AfterCycles.txt +++ b/test/known-good/C/src/AfterCycles.txt @@ -3,20 +3,20 @@ target C reactor Source { - output out: unsigned + output out: unsigned reaction(startup) -> out {= lf_set(out, 1); =} } reactor Work { - input in: unsigned - output out: unsigned + input in: unsigned + output out: unsigned reaction(in) -> out {= lf_set(out, in->value); =} } main reactor AfterCycles { - state count: int(0) + state count: int(0) s = new Source() w0 = new Work() w1 = new Work() diff --git a/test/known-good/C/src/AfterOverlapped.txt b/test/known-good/C/src/AfterOverlapped.txt index aa1a8e183..3af8848a5 100644 --- a/test/known-good/C/src/AfterOverlapped.txt +++ b/test/known-good/C/src/AfterOverlapped.txt @@ -1,15 +1,15 @@ // This the after keyword with overlapped time intervals. target C { - fast: true, - timeout: 5 sec + fast: true, + timeout: 5 sec } import Count from "lib/Count.lf" reactor Test { - input c: int - state i: int(0) - state received: int(0) + input c: int + state i: int(0) + state received: int(0) reaction(c) {= self->received++; diff --git a/test/known-good/C/src/AfterZero.txt b/test/known-good/C/src/AfterZero.txt index bfdfbaf58..7ee28f444 100644 --- a/test/known-good/C/src/AfterZero.txt +++ b/test/known-good/C/src/AfterZero.txt @@ -1,21 +1,21 @@ // This checks that the after keyword adjusts logical time, not using physical // time. target C { - fast: false, - timeout: 3 sec + fast: false, + timeout: 3 sec } reactor foo { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= SET(y, 2*x->value); =} } reactor print { - state expected_time: time(0) - state received: int(0) - input x: int + state expected_time: time(0) + state received: int(0) + input x: int reaction(x) {= self->received++; diff --git a/test/known-good/C/src/Alignment.txt b/test/known-good/C/src/Alignment.txt index 30757d297..e4e11540e 100644 --- a/test/known-good/C/src/Alignment.txt +++ b/test/known-good/C/src/Alignment.txt @@ -1,23 +1,23 @@ // This test checks that the downstream reaction is not invoked more than once // at a logical time. target C { - logging: LOG, - timeout: 1 sec + logging: LOG, + timeout: 1 sec } reactor Source { - output out: int - state count: int(1) + output out: int + state count: int(1) timer t(0, 100 msec) reaction(t) -> out {= lf_set(out, self->count++); =} } reactor Sieve { - input in: int - output out: bool - state primes: int*({= NULL =}) - state last_prime: int(0) + input in: int + output out: bool + state primes: int*({= NULL =}) + state last_prime: int(0) reaction(startup) {= // There are 1229 primes between 1 and 10,000. @@ -72,9 +72,9 @@ } reactor Destination { - input ok: bool - input in: int - state last_invoked: tag_t({= NEVER_TAG_INITIALIZER =}) + input ok: bool + input in: int + state last_invoked: tag_t({= NEVER_TAG_INITIALIZER =}) reaction(ok, in) {= if (ok->is_present && in->is_present) { diff --git a/test/known-good/C/src/ArrayAsParameter.txt b/test/known-good/C/src/ArrayAsParameter.txt index 53815a7cd..4252c1bc1 100644 --- a/test/known-good/C/src/ArrayAsParameter.txt +++ b/test/known-good/C/src/ArrayAsParameter.txt @@ -3,9 +3,9 @@ // encode their own length. target C -reactor Source(sequence: int[](0, 1, 2), n_sequence: int(3)) { - output out: int - state count: int(0) +reactor Source(sequence: int[](0, 1, 2), n_sequence: int(3)) { + output out: int + state count: int(0) logical action next reaction(startup, next) -> out, next {= @@ -18,9 +18,9 @@ } reactor Print { - input in: int - state count: int(1) - state received: int(0) + input in: int + state count: int(1) + state received: int(0) reaction(in) {= self->received++; diff --git a/test/known-good/C/src/ArrayAsType.txt b/test/known-good/C/src/ArrayAsType.txt index 16b02cff7..b77223094 100644 --- a/test/known-good/C/src/ArrayAsType.txt +++ b/test/known-good/C/src/ArrayAsType.txt @@ -3,7 +3,7 @@ target C reactor Source { - output out: int[3] + output out: int[3] reaction(startup) -> out {= out->value[0] = 0; @@ -13,8 +13,8 @@ =} } -reactor Print(scale: int(1)) { // The scale parameter is just for testing. - input in: int[3] +reactor Print(scale: int(1)) { // The scale parameter is just for testing. + input in: int[3] reaction(in) {= int count = 0; // For testing. diff --git a/test/known-good/C/src/ArrayFree.txt b/test/known-good/C/src/ArrayFree.txt index 6d9f87edc..0c3f6d61d 100644 --- a/test/known-good/C/src/ArrayFree.txt +++ b/test/known-good/C/src/ArrayFree.txt @@ -3,15 +3,15 @@ // of the original array. It then does nothing further with it. This test checks // that the memory gets freed automatically even with the mutable input. target C { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } import Source, Print from "ArrayPrint.lf" import Scale from "ArrayScale.lf" -reactor Free(scale: int(2), size: int(3)) { - mutable input in: int[] +reactor Free(scale: int(2), size: int(3)) { + mutable input in: int[] reaction(in) {= for(int i = 0; i < self->size; i++) { diff --git a/test/known-good/C/src/ArrayFreeMultiple.txt b/test/known-good/C/src/ArrayFreeMultiple.txt index 886321039..7282ed1b9 100644 --- a/test/known-good/C/src/ArrayFreeMultiple.txt +++ b/test/known-good/C/src/ArrayFreeMultiple.txt @@ -3,16 +3,16 @@ // of the original array. It then does nothing further with it. This test checks // that the memory gets freed automatically even with the mutable input. target C { - timeout: 5 sec, - fast: true + timeout: 5 sec, + fast: true } import Scale from "ArrayScale.lf" import Print from "ArrayPrint.lf" reactor Source { - output out: int[] - state c: int(0) + output out: int[] + state c: int(0) timer t(0, 1 sec) reaction(t) -> out {= @@ -26,8 +26,8 @@ =} } -reactor Free(scale: int(2)) { - mutable input in: int[] +reactor Free(scale: int(2)) { + mutable input in: int[] reaction(in) {= for(int i = 0; i < in->length; i++) { diff --git a/test/known-good/C/src/ArrayParallel.txt b/test/known-good/C/src/ArrayParallel.txt index f5ad826cf..bdb6dcc9f 100644 --- a/test/known-good/C/src/ArrayParallel.txt +++ b/test/known-good/C/src/ArrayParallel.txt @@ -2,8 +2,8 @@ // of which want to modify it. NOTE: Ideally, only one copy would be made, but // this requires modifying the precedence graph between reactions. target C { - timeout: 3 sec, - fast: true + timeout: 3 sec, + fast: true } import Scale from "ArrayScale.lf" diff --git a/test/known-good/C/src/ArrayPrint.txt b/test/known-good/C/src/ArrayPrint.txt index eb23f617b..008252de1 100644 --- a/test/known-good/C/src/ArrayPrint.txt +++ b/test/known-good/C/src/ArrayPrint.txt @@ -2,13 +2,13 @@ // Reference counting ensures that the array is freed. The array size here must // be known to all reactors. target C { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } -reactor Source(size: int(3)) { - output out: int[] - state count: int(0) +reactor Source(size: int(3)) { + output out: int[] + state count: int(0) timer t(0, 1 sec) reaction(t) -> out {= @@ -26,9 +26,9 @@ } // The scale parameter is just for testing. -reactor Print(scale: int(1), size: int(3)) { - input in: int[] - state count: int(0) +reactor Print(scale: int(1), size: int(3)) { + input in: int[] + state count: int(0) reaction(in) {= bool failed = false; // For testing. diff --git a/test/known-good/C/src/ArrayScale.txt b/test/known-good/C/src/ArrayScale.txt index f6a531147..8d6e644b7 100644 --- a/test/known-good/C/src/ArrayScale.txt +++ b/test/known-good/C/src/ArrayScale.txt @@ -3,15 +3,15 @@ // ownership of the original array. It modifies it and passes it to Print. It // gets freed after Print is done with it. target C { - timeout: 3 sec, - fast: true + timeout: 3 sec, + fast: true } import Print, Source from "ArrayPrint.lf" -reactor Scale(scale: int(2)) { - mutable input in: int[] - output out: int[] +reactor Scale(scale: int(2)) { + mutable input in: int[] + output out: int[] reaction(in) -> out {= for(int i = 0; i < in->length; i++) { diff --git a/test/known-good/C/src/CharLiteralInitializer.txt b/test/known-good/C/src/CharLiteralInitializer.txt index b8241bff9..6931b1224 100644 --- a/test/known-good/C/src/CharLiteralInitializer.txt +++ b/test/known-good/C/src/CharLiteralInitializer.txt @@ -2,7 +2,7 @@ target C main reactor CharLiteralInitializer { - state c: char('x') + state c: char('x') reaction(startup) {= if (self->c != 'x') { diff --git a/test/known-good/C/src/Composition.txt b/test/known-good/C/src/Composition.txt index 3cf6ba43c..bd0d0c719 100644 --- a/test/known-good/C/src/Composition.txt +++ b/test/known-good/C/src/Composition.txt @@ -1,14 +1,14 @@ // This test connects a simple counting source to tester that checks against its // own count. target C { - fast: true, - timeout: 10 sec + fast: true, + timeout: 10 sec } -reactor Source(period: time(2 sec)) { - output y: int +reactor Source(period: time(2 sec)) { + output y: int timer t(1 sec, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= (self->count)++; @@ -18,8 +18,8 @@ } reactor Test { - input x: int - state count: int(0) + input x: int + state count: int(0) reaction(x) {= (self->count)++; diff --git a/test/known-good/C/src/CompositionAfter.txt b/test/known-good/C/src/CompositionAfter.txt index ed66bb9a2..17e28270a 100644 --- a/test/known-good/C/src/CompositionAfter.txt +++ b/test/known-good/C/src/CompositionAfter.txt @@ -1,14 +1,14 @@ // This test connects a simple counting source to tester that checks against its // own count. target C { - fast: true, - timeout: 10 sec + fast: true, + timeout: 10 sec } -reactor Source(period: time(2 sec)) { - output y: int +reactor Source(period: time(2 sec)) { + output y: int timer t(1 sec, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= (self->count)++; @@ -17,8 +17,8 @@ } reactor Test { - input x: int - state count: int(0) + input x: int + state count: int(0) reaction(x) {= (self->count)++; @@ -30,7 +30,7 @@ =} } -main reactor CompositionAfter(delay: time(5 sec)) { +main reactor CompositionAfter(delay: time(5 sec)) { s = new Source() d = new Test() s.y -> d.x after delay diff --git a/test/known-good/C/src/CompositionGain.txt b/test/known-good/C/src/CompositionGain.txt index 91e93b8e4..1e598e3b0 100644 --- a/test/known-good/C/src/CompositionGain.txt +++ b/test/known-good/C/src/CompositionGain.txt @@ -2,8 +2,8 @@ target C reactor Gain { - input gainin: int - output y: int + input gainin: int + output y: int reaction(gainin) -> y {= printf("Gain received %d\n", gainin->value); @@ -12,8 +12,8 @@ } reactor Wrapper { - input x: int - output y: int + input x: int + output y: int gain = new Gain() x -> gain.gainin gain.y -> y diff --git a/test/known-good/C/src/CompositionInheritance.txt b/test/known-good/C/src/CompositionInheritance.txt index 97b4b2120..2ddffb4f0 100644 --- a/test/known-good/C/src/CompositionInheritance.txt +++ b/test/known-good/C/src/CompositionInheritance.txt @@ -1,15 +1,15 @@ // This test connects a simple counting source to tester that checks against its // own count. target C { - fast: true, - timeout: 10 sec + fast: true, + timeout: 10 sec } -reactor Source(period: time(2 sec)) { - input foo: int - output y: int +reactor Source(period: time(2 sec)) { + input foo: int + output y: int timer t(1 sec, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= printf("Hello World. At time %lld, my count is: %d.\n", lf_time_logical_elapsed(), self->count); @@ -18,7 +18,7 @@ } reactor SourceExtended extends Source { - output y2: int + output y2: int timer t2(1 sec, 3 sec) reaction(t2) -> y2 {= @@ -29,8 +29,8 @@ } reactor Test { - input x: int - state count: int(0) + input x: int + state count: int(0) reaction(x) {= (self->count)++; diff --git a/test/known-good/C/src/CountSelf.txt b/test/known-good/C/src/CountSelf.txt index 4bd10050f..77c9733fa 100644 --- a/test/known-good/C/src/CountSelf.txt +++ b/test/known-good/C/src/CountSelf.txt @@ -1,14 +1,14 @@ // This tests actions with payloads by delaying an input by a fixed amount. target C { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } import TestCount from "lib/TestCount.lf" -reactor CountSelf2(delay: time(100 msec)) { - output out: int - logical action a: int +reactor CountSelf2(delay: time(100 msec)) { + output out: int + logical action a: int reaction(startup) -> a, out {= lf_set(out, 0); diff --git a/test/known-good/C/src/CountTest.txt b/test/known-good/C/src/CountTest.txt index 473ca59da..1ff64c2ce 100644 --- a/test/known-good/C/src/CountTest.txt +++ b/test/known-good/C/src/CountTest.txt @@ -1,7 +1,7 @@ target C { - timeout: 3 sec, - tracing: true, - fast: true + timeout: 3 sec, + tracing: true, + fast: true } import Count from "lib/Count.lf" diff --git a/test/known-good/C/src/DanglingOutput.txt b/test/known-good/C/src/DanglingOutput.txt index 3f2d353bc..e16a4b696 100644 --- a/test/known-good/C/src/DanglingOutput.txt +++ b/test/known-good/C/src/DanglingOutput.txt @@ -3,15 +3,15 @@ target C reactor Source { - output out: int + output out: int timer t reaction(t) -> out {= lf_set(out, 1); =} } reactor Gain { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= printf("Received %d.\n", in->value); diff --git a/test/known-good/C/src/Deadline.txt b/test/known-good/C/src/Deadline.txt index 3630cc062..4fb239a2a 100644 --- a/test/known-good/C/src/Deadline.txt +++ b/test/known-good/C/src/Deadline.txt @@ -2,13 +2,13 @@ // the Source immediately, whereas odd numbers are sent after a big enough delay // to violate the deadline. target C { - timeout: 6 sec + timeout: 6 sec } -reactor Source(period: time(3 sec)) { - output y: int +reactor Source(period: time(3 sec)) { + output y: int timer t(0, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= if (2 * (self->count / 2) != self->count) { @@ -22,9 +22,9 @@ =} } -reactor Destination(timeout: time(1 sec)) { - input x: int - state count: int(0) +reactor Destination(timeout: time(1 sec)) { + input x: int + state count: int(0) reaction(x) {= printf("Destination receives: %d\n", x->value); diff --git a/test/known-good/C/src/DeadlineAnytime.txt b/test/known-good/C/src/DeadlineAnytime.txt index 5a21eed94..4c5a101b7 100644 --- a/test/known-good/C/src/DeadlineAnytime.txt +++ b/test/known-good/C/src/DeadlineAnytime.txt @@ -2,7 +2,7 @@ target C reactor A { - state i: int + state i: int logical action a reaction(startup) -> a {= diff --git a/test/known-good/C/src/DeadlineHandledAbove.txt b/test/known-good/C/src/DeadlineHandledAbove.txt index 24e0d7717..a7e5d9657 100644 --- a/test/known-good/C/src/DeadlineHandledAbove.txt +++ b/test/known-good/C/src/DeadlineHandledAbove.txt @@ -2,9 +2,9 @@ // container reacts to that output. target C -reactor Deadline(threshold: time(100 msec)) { - input x: int - output deadline_violation: bool +reactor Deadline(threshold: time(100 msec)) { + input x: int + output deadline_violation: bool reaction(x) -> deadline_violation {= printf("ERROR: Deadline violation was not detected!\n"); @@ -16,7 +16,7 @@ } main reactor DeadlineHandledAbove { - state violation_detected: bool(false) + state violation_detected: bool(false) d = new Deadline(threshold = 10 msec) reaction(startup) -> d.x {= diff --git a/test/known-good/C/src/DeadlineInherited.txt b/test/known-good/C/src/DeadlineInherited.txt index eb7487b7b..589ad0b7d 100644 --- a/test/known-good/C/src/DeadlineInherited.txt +++ b/test/known-good/C/src/DeadlineInherited.txt @@ -1,7 +1,7 @@ // Test to verify that deadline priority are inherited target C { - timeout: 1 sec, - threading: false + timeout: 1 sec, + threading: false } preamble {= int global_cnt = 0; =} diff --git a/test/known-good/C/src/DeadlinePriority.txt b/test/known-good/C/src/DeadlinePriority.txt index 8b3051188..b14ddaeaf 100644 --- a/test/known-good/C/src/DeadlinePriority.txt +++ b/test/known-good/C/src/DeadlinePriority.txt @@ -1,7 +1,7 @@ // Test to verify that deadline gives priority target C { - timeout: 1 sec, - threading: false + timeout: 1 sec, + threading: false } preamble {= int global_cnt = 0; =} diff --git a/test/known-good/C/src/DeadlineWithAfterDelay.txt b/test/known-good/C/src/DeadlineWithAfterDelay.txt index 7ca4a28f0..c73ec2fe3 100644 --- a/test/known-good/C/src/DeadlineWithAfterDelay.txt +++ b/test/known-good/C/src/DeadlineWithAfterDelay.txt @@ -1,13 +1,13 @@ // Test to verify that deadline priority are inherited when using after delays target C { - timeout: 1 sec, - threading: false + timeout: 1 sec, + threading: false } preamble {= int global_cnt = 0; =} reactor Source { - output out: int + output out: int timer t(0 msec, 100 msec) reaction(t) -> out {= @@ -17,7 +17,7 @@ } reactor SinkWithDeadline { - input in: int + input in: int reaction(in) {= global_cnt--; diff --git a/test/known-good/C/src/DeadlineWithBanks.txt b/test/known-good/C/src/DeadlineWithBanks.txt index d2199753b..ebb50c486 100644 --- a/test/known-good/C/src/DeadlineWithBanks.txt +++ b/test/known-good/C/src/DeadlineWithBanks.txt @@ -4,16 +4,16 @@ * execution order. Threading is disabled */ target C { - threading: false, - timeout: 300 msec, - build-type: Debug + threading: false, + timeout: 300 msec, + build-type: Debug } preamble {= volatile int global_cnt = 0; =} -reactor Bank(bank_index: int(0)) { +reactor Bank(bank_index: int(0)) { timer t(0, 100 msec) - output out: int + output out: int reaction(t) -> out {= int exp_cnt; @@ -46,14 +46,14 @@ =} } -reactor Sink(dead: time(0)) { - input in: int +reactor Sink(dead: time(0)) { + input in: int reaction(in) {= =} deadline(dead) {= =} } main reactor { - rp = new[4] Bank() + rp = new[4] Bank() s1 = new Sink(dead = 14 msec) s2 = new Sink(dead = 12 msec) s3 = new Sink(dead = 11 msec) diff --git a/test/known-good/C/src/DeadlineZero.txt b/test/known-good/C/src/DeadlineZero.txt index 5c261cf0f..4d8db3816 100644 --- a/test/known-good/C/src/DeadlineZero.txt +++ b/test/known-good/C/src/DeadlineZero.txt @@ -1,11 +1,11 @@ // Tests that specified deadlines with zero duration are always violated. target C { - timeout: 1 sec + timeout: 1 sec } reactor Detector { - input trigger: int - state cnt: int(0) + input trigger: int + state cnt: int(0) reaction(trigger) {= printf("ERROR: failed to detect zero-duration deadline at iteration %d.\n", self->cnt); @@ -14,7 +14,7 @@ } reactor Generator { - output pulse: int + output pulse: int timer t(0, 100 msec) reaction(t) -> pulse {= lf_set(pulse, 0); =} diff --git a/test/known-good/C/src/DelayArray.txt b/test/known-good/C/src/DelayArray.txt index 13b125a22..5e73b7a08 100644 --- a/test/known-good/C/src/DelayArray.txt +++ b/test/known-good/C/src/DelayArray.txt @@ -1,13 +1,13 @@ // This tests delaying an array type. The array length has to be agreed upon by // all reactors. target C { - build-type: RelWithDebInfo + build-type: RelWithDebInfo } -reactor DelayPointer(delay: time(100 msec)) { - input in: int[] - output out: int[] - logical action a: int[] +reactor DelayPointer(delay: time(100 msec)) { + input in: int[] + output out: int[] + logical action a: int[] reaction(in) -> a {= lf_schedule_token(a, self->delay, in->token); =} @@ -15,7 +15,7 @@ } reactor Source { - output out: int[] + output out: int[] reaction(startup) -> out {= // Dynamically allocate an output array of length 3. @@ -30,8 +30,8 @@ =} } -reactor Print(scale: int(1)) { // The scale parameter is just for testing. - input in: int[] +reactor Print(scale: int(1)) { // The scale parameter is just for testing. + input in: int[] reaction(in) {= int count = 0; // For testing. diff --git a/test/known-good/C/src/DelayArrayWithAfter.txt b/test/known-good/C/src/DelayArrayWithAfter.txt index fd532ba27..922f4114f 100644 --- a/test/known-good/C/src/DelayArrayWithAfter.txt +++ b/test/known-good/C/src/DelayArrayWithAfter.txt @@ -1,13 +1,13 @@ // This tests transport of dynamically allocated arrays over connections with // 'after'. target C { - timeout: 5 sec, - fast: true + timeout: 5 sec, + fast: true } reactor Source { - output out: int[] - state iteration: int(1) + output out: int[] + state iteration: int(1) timer t(0, 1 sec) reaction(t) -> out {= @@ -23,10 +23,10 @@ =} } -reactor Print(scale: int(1)) { // The scale parameter is just for testing. - input in: int[] - state iteration: int(1) - state inputs_received: int(0) +reactor Print(scale: int(1)) { // The scale parameter is just for testing. + input in: int[] + state iteration: int(1) + state inputs_received: int(0) reaction(in) {= self->inputs_received++; diff --git a/test/known-good/C/src/DelayInt.txt b/test/known-good/C/src/DelayInt.txt index fbe81d169..f0fd698f1 100644 --- a/test/known-good/C/src/DelayInt.txt +++ b/test/known-good/C/src/DelayInt.txt @@ -1,10 +1,10 @@ // This tests actions with payloads by delaying an input by a fixed amount. target C -reactor Delay(delay: time(100 msec)) { - input in: int - output out: int - logical action a: int +reactor Delay(delay: time(100 msec)) { + input in: int + output out: int + logical action a: int reaction(a) -> out {= if (a->has_value && a->is_present) lf_set(out, a->value); @@ -17,9 +17,9 @@ } reactor Test { - input in: int - state start_time: time(0) - state received_value: bool(false) + input in: int + state start_time: time(0) + state received_value: bool(false) reaction(startup) {= // Record the logical time at the start. diff --git a/test/known-good/C/src/DelayPointer.txt b/test/known-good/C/src/DelayPointer.txt index 50013f59d..4e2954b22 100644 --- a/test/known-good/C/src/DelayPointer.txt +++ b/test/known-good/C/src/DelayPointer.txt @@ -1,10 +1,10 @@ // Test delaying a pointer type. target C -reactor DelayPointer2(delay: time(100 msec)) { - input in: int* - output out: int* - logical action a: int* +reactor DelayPointer2(delay: time(100 msec)) { + input in: int* + output out: int* + logical action a: int* reaction(a) -> out {= // Using lf_set_token delegates responsibility for @@ -20,7 +20,7 @@ } reactor Source { - output out: int* + output out: int* reaction(startup) -> out {= SET_NEW(out); @@ -29,9 +29,9 @@ } reactor Test { - input in: int* - state start_time: time(0) - state received_value: bool(false) + input in: int* + state start_time: time(0) + state received_value: bool(false) reaction(startup) {= // Record the logical time at the start. diff --git a/test/known-good/C/src/DelayString.txt b/test/known-good/C/src/DelayString.txt index d9f0f6be5..d69a56344 100644 --- a/test/known-good/C/src/DelayString.txt +++ b/test/known-good/C/src/DelayString.txt @@ -2,10 +2,10 @@ // freed. target C -reactor DelayString2(delay: time(100 msec)) { - input in: string - output out: string - logical action a: string +reactor DelayString2(delay: time(100 msec)) { + input in: string + output out: string + logical action a: string reaction(a) -> out {= lf_set(out, a->value); =} @@ -16,8 +16,8 @@ } reactor Test { - input in: string - state start_time: time(0) + input in: string + state start_time: time(0) reaction(in) {= printf("Received: %s.\n", in->value); diff --git a/test/known-good/C/src/DelayStruct.txt b/test/known-good/C/src/DelayStruct.txt index ac220d738..d5fa507f4 100644 --- a/test/known-good/C/src/DelayStruct.txt +++ b/test/known-good/C/src/DelayStruct.txt @@ -1,16 +1,16 @@ // Test delaying a struct pointer type. target C { - files: ["include/hello.h"] + files: ["include/hello.h"] } preamble {= #include "hello.h" =} -reactor DelayPointer(delay: time(100 msec)) { - input in: hello_t* - output out: hello_t* - logical action a: hello_t* +reactor DelayPointer(delay: time(100 msec)) { + input in: hello_t* + output out: hello_t* + logical action a: hello_t* reaction(a) -> out {= // Using lf_set_token delegates responsibility for @@ -26,7 +26,7 @@ } reactor Source { - output out: hello_t* + output out: hello_t* reaction(startup) -> out {= // Dynamically allocate an output struct. @@ -38,8 +38,8 @@ =} } -reactor Print(expected: int(42)) { // expected parameter is for testing. - input in: hello_t* +reactor Print(expected: int(42)) { // expected parameter is for testing. + input in: hello_t* reaction(in) {= printf("Received: name = %s, value = %d\n", in->value->name, in->value->value); diff --git a/test/known-good/C/src/DelayStructWithAfter.txt b/test/known-good/C/src/DelayStructWithAfter.txt index a9afeafc0..a49dd7c35 100644 --- a/test/known-good/C/src/DelayStructWithAfter.txt +++ b/test/known-good/C/src/DelayStructWithAfter.txt @@ -1,6 +1,6 @@ // This tests delaying a struct using after. target C { - files: include/hello.h + files: include/hello.h } preamble {= @@ -8,7 +8,7 @@ =} reactor Source { - output out: hello_t* + output out: hello_t* reaction(startup) -> out {= // Dynamically allocate an output struct. @@ -20,8 +20,8 @@ =} } -reactor Print(expected: int(42)) { // expected parameter is for testing. - input in: hello_t* +reactor Print(expected: int(42)) { // expected parameter is for testing. + input in: hello_t* reaction(in) {= printf("Received: name = %s, value = %d\n", in->value->name, in->value->value); diff --git a/test/known-good/C/src/DelayStructWithAfterOverlapped.txt b/test/known-good/C/src/DelayStructWithAfterOverlapped.txt index 5cc0b40b6..f8d8b9301 100644 --- a/test/known-good/C/src/DelayStructWithAfterOverlapped.txt +++ b/test/known-good/C/src/DelayStructWithAfterOverlapped.txt @@ -1,8 +1,8 @@ // This tests delaying a struct using after. target C { - timeout: 5 sec, - fast: true, - files: ["include/hello.h"] + timeout: 5 sec, + fast: true, + files: ["include/hello.h"] } preamble {= @@ -10,9 +10,9 @@ =} reactor Source { - output out: hello_t* + output out: hello_t* timer t(0, 1 sec) - state s: int(0) + state s: int(0) reaction(t) -> out {= self->s++; @@ -26,8 +26,8 @@ } reactor Print { // expected parameter is for testing. - input in: hello_t* - state s: int(0) + input in: hello_t* + state s: int(0) reaction(in) {= self->s++; diff --git a/test/known-good/C/src/DelayedAction.txt b/test/known-good/C/src/DelayedAction.txt index c1b666611..e5925abff 100644 --- a/test/known-good/C/src/DelayedAction.txt +++ b/test/known-good/C/src/DelayedAction.txt @@ -1,12 +1,12 @@ target C { - fast: true, - timeout: 5 sec + fast: true, + timeout: 5 sec } main reactor DelayedAction { timer t(0, 1 sec) logical action a - state count: int(0) + state count: int(0) reaction(t) -> a {= lf_schedule(a, MSEC(100)); =} diff --git a/test/known-good/C/src/DelayedReaction.txt b/test/known-good/C/src/DelayedReaction.txt index 674333716..53fa1f5b4 100644 --- a/test/known-good/C/src/DelayedReaction.txt +++ b/test/known-good/C/src/DelayedReaction.txt @@ -2,14 +2,14 @@ target C reactor Source { - output out: int + output out: int timer t reaction(t) -> out {= lf_set(out, 1); =} } reactor Sink { - input in: int + input in: int reaction(in) {= interval_t elapsed = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/Determinism.txt b/test/known-good/C/src/Determinism.txt index f92801ced..3b1bd7d33 100644 --- a/test/known-good/C/src/Determinism.txt +++ b/test/known-good/C/src/Determinism.txt @@ -1,15 +1,15 @@ target C reactor Source { - output y: int + output y: int timer t reaction(t) -> y {= lf_set(y, 1); =} } reactor Destination { - input x: int - input y: int + input x: int + input y: int reaction(x, y) {= int sum = 0; @@ -28,8 +28,8 @@ } reactor Pass { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= lf_set(y, x->value); =} } diff --git a/test/known-good/C/src/DoubleInvocation.txt b/test/known-good/C/src/DoubleInvocation.txt index dc4d07d60..8e4a1adee 100644 --- a/test/known-good/C/src/DoubleInvocation.txt +++ b/test/known-good/C/src/DoubleInvocation.txt @@ -6,14 +6,14 @@ // * Removing the startup reaction in Print. // * Sending only position, not velocity from Ball. target C { - timeout: 5 sec, - fast: true + timeout: 5 sec, + fast: true } reactor Ball { - output position: int - output velocity: int - state p: int(200) + output position: int + output velocity: int + state p: int(200) timer trigger(0, 1 sec) reaction(trigger) -> position, velocity {= @@ -24,9 +24,9 @@ } reactor Print { - input velocity: int - input position: int - state previous: int(-1) + input velocity: int + input position: int + state previous: int(-1) reaction(startup) {= printf("####### Print startup\n"); diff --git a/test/known-good/C/src/DoublePort.txt b/test/known-good/C/src/DoublePort.txt index 0181b6013..44073a6b5 100644 --- a/test/known-good/C/src/DoublePort.txt +++ b/test/known-good/C/src/DoublePort.txt @@ -6,16 +6,16 @@ * @author Soroush Bateni */ target C { - timeout: 900 msec, - fast: true + timeout: 900 msec, + fast: true } import Count from "lib/Count.lf" reactor CountMicrostep { - state count: int(1) - output out: int - logical action act: int + state count: int(1) + output out: int + logical action act: int timer t(0, 1 sec) reaction(t) -> act {= lf_schedule_int(act, 0, self->count++); =} @@ -24,8 +24,8 @@ } reactor Print { - input in: int - input in2: int + input in: int + input in2: int reaction(in, in2) {= interval_t elapsed_time = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/DoubleReaction.txt b/test/known-good/C/src/DoubleReaction.txt index 1c7743b60..6e83761fc 100644 --- a/test/known-good/C/src/DoubleReaction.txt +++ b/test/known-good/C/src/DoubleReaction.txt @@ -1,14 +1,14 @@ // Test that two simultaneous inputs that trigger a reaction trigger it only // once. Correct output for this 2, 4, 6, 8, etc. target C { - timeout: 10 sec, - fast: true + timeout: 10 sec, + fast: true } -reactor Clock(offset: time(0), period: time(1 sec)) { - output y: int +reactor Clock(offset: time(0), period: time(1 sec)) { + output y: int timer t(offset, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= (self->count)++; @@ -17,9 +17,9 @@ } reactor Destination { - input x: int - input w: int - state s: int(2) + input x: int + input w: int + state s: int(2) reaction(x, w) {= int sum = 0; diff --git a/test/known-good/C/src/DoubleTrigger.txt b/test/known-good/C/src/DoubleTrigger.txt index 38afe27ab..d956b12ab 100644 --- a/test/known-good/C/src/DoubleTrigger.txt +++ b/test/known-good/C/src/DoubleTrigger.txt @@ -1,14 +1,14 @@ // Test that two simultaneous triggers don't cause a reaction to execute twice // at the same tag. target C { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } main reactor DoubleTrigger { timer t1 timer t2 - state s: int(0) + state s: int(0) reaction(t1, t2) {= self->s++; diff --git a/test/known-good/C/src/FloatLiteral.txt b/test/known-good/C/src/FloatLiteral.txt index 76c965854..b48bc40c8 100644 --- a/test/known-good/C/src/FloatLiteral.txt +++ b/test/known-good/C/src/FloatLiteral.txt @@ -6,10 +6,10 @@ #include =} - state N: double(6.0221409e+23) - state charge: double(-1.6021766E-19) - state minus_epsilon: double(-.01e0) - state expected: double(.964853323188E5) + state N: double(6.0221409e+23) + state charge: double(-1.6021766E-19) + state minus_epsilon: double(-.01e0) + state expected: double(.964853323188E5) reaction(startup) {= double F = - self->N * self->charge; diff --git a/test/known-good/C/src/Gain.txt b/test/known-good/C/src/Gain.txt index e7be35643..6a152795c 100644 --- a/test/known-good/C/src/Gain.txt +++ b/test/known-good/C/src/Gain.txt @@ -1,16 +1,16 @@ // Example in the Wiki. target C -reactor Scale(scale: int(2)) { - input x: int - output y: int +reactor Scale(scale: int(2)) { + input x: int + output y: int reaction(x) -> y {= lf_set(y, x->value * self->scale); =} } reactor Test { - input x: int - state received_value: bool(false) + input x: int + state received_value: bool(false) reaction(x) {= printf("Received %d.\n", x->value); diff --git a/test/known-good/C/src/GetMicroStep.txt b/test/known-good/C/src/GetMicroStep.txt index d979b68e0..23204f74e 100644 --- a/test/known-good/C/src/GetMicroStep.txt +++ b/test/known-good/C/src/GetMicroStep.txt @@ -2,7 +2,7 @@ target C main reactor GetMicroStep { - state s: int(1) + state s: int(1) logical action l diff --git a/test/known-good/C/src/GetTime.txt b/test/known-good/C/src/GetTime.txt index c2f8eaa94..1dddbe4b3 100644 --- a/test/known-good/C/src/GetTime.txt +++ b/test/known-good/C/src/GetTime.txt @@ -1,8 +1,8 @@ // This file includes code documented on the Wiki. For this test, success is // just compiling and running. target C { - timeout: 2 sec, - fast: false + timeout: 2 sec, + fast: false } main reactor GetTime { diff --git a/test/known-good/C/src/Hello.txt b/test/known-good/C/src/Hello.txt index 18d3cc48c..5e80c7d02 100644 --- a/test/known-good/C/src/Hello.txt +++ b/test/known-good/C/src/Hello.txt @@ -4,13 +4,13 @@ // has a period of 4 seconds, the second of 2 seconds, and the third (composite) // or 1 second. target C { - timeout: 10 sec, - fast: true + timeout: 10 sec, + fast: true } -reactor Reschedule(period: time(2 sec), message: string("Hello C")) { - state count: int(0) - state previous_time: time(0) +reactor Reschedule(period: time(2 sec), message: string("Hello C")) { + state count: int(0) + state previous_time: time(0) timer t(1 sec, period) logical action a @@ -43,8 +43,8 @@ } reactor Inside( - period: time(1 sec), - message: string("Composite default message.") + period: time(1 sec), + message: string("Composite default message.") ) { third_instance = new Reschedule(period = period, message = message) } diff --git a/test/known-good/C/src/HelloWorld.txt b/test/known-good/C/src/HelloWorld.txt index c90535061..d0fb5cf13 100644 --- a/test/known-good/C/src/HelloWorld.txt +++ b/test/known-good/C/src/HelloWorld.txt @@ -1,13 +1,13 @@ target C { - tracing: { // To test generating a custom trace file name. - trace-file-name: "HelloWorldTrace" + tracing: { // To test generating a custom trace file name. + trace-file-name: "HelloWorldTrace" }, - logging: error, - build-type: Debug -} + logging: error, + build-type: Debug +} reactor HelloWorld2 { - state success: bool(false) + state success: bool(false) reaction(startup) {= printf("Hello World.\n"); diff --git a/test/known-good/C/src/Hierarchy.txt b/test/known-good/C/src/Hierarchy.txt index 07626fe8b..6e1156088 100644 --- a/test/known-good/C/src/Hierarchy.txt +++ b/test/known-good/C/src/Hierarchy.txt @@ -2,15 +2,15 @@ target C reactor Source { - output out: int + output out: int timer t reaction(t) -> out {= lf_set(out, 1); =} } reactor Gain { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= printf("Gain received %d.\n", in->value); @@ -19,7 +19,7 @@ } reactor Print { - input in: int + input in: int reaction(in) {= printf("Received: %d.\n", in->value); @@ -31,9 +31,9 @@ } reactor GainContainer { - input in: int - output out: int - output out2: int + input in: int + output out: int + output out2: int gain = new Gain() in -> gain.in gain.out -> out diff --git a/test/known-good/C/src/Hierarchy2.txt b/test/known-good/C/src/Hierarchy2.txt index c49a099fb..75f145645 100644 --- a/test/known-good/C/src/Hierarchy2.txt +++ b/test/known-good/C/src/Hierarchy2.txt @@ -1,20 +1,20 @@ // Test data transport across hierarchy. target C { - timeout: 5 sec, - fast: true + timeout: 5 sec, + fast: true } reactor Source { - output out: int + output out: int timer t(0, 1 sec) reaction(t) -> out {= lf_set(out, 1); =} } reactor Count { - output out: int + output out: int timer t(0, 1 sec) - state i: int(0) + state i: int(0) reaction(t) -> out {= (self->i)++; @@ -23,9 +23,9 @@ } reactor Add { - input in1: int - input in2: int - output out: int + input in1: int + input in2: int + output out: int reaction(in1, in2) -> out {= int result = 0; @@ -36,8 +36,8 @@ } reactor Print { - input in: int - state expected: int(2) + input in: int + state expected: int(2) reaction(in) {= printf("Received: %d.\n", in->value); @@ -50,8 +50,8 @@ } reactor AddCount { - input in: int - output out: int + input in: int + output out: int count = new Count() add = new Add() in -> add.in1 diff --git a/test/known-good/C/src/IdentifierLength.txt b/test/known-good/C/src/IdentifierLength.txt index a3c6bea27..c4186e605 100644 --- a/test/known-good/C/src/IdentifierLength.txt +++ b/test/known-good/C/src/IdentifierLength.txt @@ -1,14 +1,14 @@ // This test connects a simple counting source to tester that checks against its // own count. target C { - timeout: 10 sec, - fast: true + timeout: 10 sec, + fast: true } -reactor A_Really_Long_Name_For_A_Source(period: time(2 sec)) { - output y: int +reactor A_Really_Long_Name_For_A_Source(period: time(2 sec)) { + output y: int timer t(1 sec, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= (self->count)++; @@ -17,8 +17,8 @@ } reactor Another_Really_Long_Name_For_A_Test_Class { - input x: int - state count: int(0) + input x: int + state count: int(0) reaction(x) {= (self->count)++; diff --git a/test/known-good/C/src/ImportComposition.txt b/test/known-good/C/src/ImportComposition.txt index 987419a55..6a9978dc0 100644 --- a/test/known-good/C/src/ImportComposition.txt +++ b/test/known-good/C/src/ImportComposition.txt @@ -6,7 +6,7 @@ main reactor ImportComposition { a = new ImportedComposition() - state received: bool(false) + state received: bool(false) reaction(startup) -> a.x {= lf_set(a.x, 42); =} diff --git a/test/known-good/C/src/InheritanceAction.txt b/test/known-good/C/src/InheritanceAction.txt index d677e9d72..4f9ce7571 100644 --- a/test/known-good/C/src/InheritanceAction.txt +++ b/test/known-good/C/src/InheritanceAction.txt @@ -1,12 +1,12 @@ // This test connects a simple counting source to tester that checks against its // own count. target C { - fast: true + fast: true } reactor Source { - logical action foo: int - output y: int + logical action foo: int + output y: int reaction(foo) -> y {= lf_set(y, foo->value); =} } @@ -16,8 +16,8 @@ } reactor Test { - input x: int - state count: int(0) + input x: int + state count: int(0) reaction(x) {= (self->count)++; diff --git a/test/known-good/C/src/ManualDelayedReaction.txt b/test/known-good/C/src/ManualDelayedReaction.txt index c961aed1d..80eb2bcb4 100644 --- a/test/known-good/C/src/ManualDelayedReaction.txt +++ b/test/known-good/C/src/ManualDelayedReaction.txt @@ -2,14 +2,14 @@ // Set keepalive to false since this is a test and schedule is called on a // physical action from within a reaction. This is one of the special rare // cases where the user might want to manually override keepalive. - keepalive: false + keepalive: false } // That's the stuff that shall be generated for the after reactor GeneratedDelay { - input y_in: int - output y_out: int - state y_state: int(0) + input y_in: int + output y_out: int + state y_state: int(0) physical action act(0 msec) // TODO: delay in act or the schedule call? @@ -22,7 +22,7 @@ } reactor Source { - output out: int + output out: int timer t // reaction(t) -> out after 100 msec @@ -30,7 +30,7 @@ } reactor Sink { - input in: int + input in: int reaction(in) {= interval_t elapsed_logical = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/Methods.txt b/test/known-good/C/src/Methods.txt index 4e89c15d6..681bb143d 100644 --- a/test/known-good/C/src/Methods.txt +++ b/test/known-good/C/src/Methods.txt @@ -1,11 +1,11 @@ target C main reactor { - state foo: int(2) + state foo: int(2) - method getFoo(): int {= return self->foo; =} + method getFoo(): int {= return self->foo; =} - method add(x: int) {= self->foo += x; =} + method add(x: int) {= self->foo += x; =} reaction(startup) {= lf_print("Foo is initialized to %d", getFoo()); diff --git a/test/known-good/C/src/MethodsRecursive.txt b/test/known-good/C/src/MethodsRecursive.txt index a720f50f7..4c28e9263 100644 --- a/test/known-good/C/src/MethodsRecursive.txt +++ b/test/known-good/C/src/MethodsRecursive.txt @@ -2,14 +2,14 @@ target C main reactor { - state foo: int(2) + state foo: int(2) - method fib(n: int): int {= // Return the n-th Fibonacci number. + method fib(n: int): int {= // Return the n-th Fibonacci number. if (n <= 1) return 1; return add(fib(n-1), fib(n-2)); =} - method add(x: int, y: int): int {= return x + y; =} + method add(x: int, y: int): int {= return x + y; =} reaction(startup) {= for (int n = 1; n < 10; n++) { diff --git a/test/known-good/C/src/MethodsSameName.txt b/test/known-good/C/src/MethodsSameName.txt index 0b1644f23..12fcce2ac 100644 --- a/test/known-good/C/src/MethodsSameName.txt +++ b/test/known-good/C/src/MethodsSameName.txt @@ -2,9 +2,9 @@ target C reactor Foo { - state foo: int(2) + state foo: int(2) - method add(x: int) {= self->foo += x; =} + method add(x: int) {= self->foo += x; =} reaction(startup) {= add(40); @@ -16,11 +16,11 @@ } main reactor { - state foo: int(2) + state foo: int(2) a = new Foo() - method add(x: int) {= self->foo += x; =} + method add(x: int) {= self->foo += x; =} reaction(startup) {= add(40); diff --git a/test/known-good/C/src/Microsteps.txt b/test/known-good/C/src/Microsteps.txt index 91faebe25..cd74fb8c5 100644 --- a/test/known-good/C/src/Microsteps.txt +++ b/test/known-good/C/src/Microsteps.txt @@ -1,8 +1,8 @@ target C reactor Destination { - input x: int - input y: int + input x: int + input y: int reaction(x, y) {= interval_t elapsed = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/MovingAverage.txt b/test/known-good/C/src/MovingAverage.txt index 1b9af5977..15fedede0 100644 --- a/test/known-good/C/src/MovingAverage.txt +++ b/test/known-good/C/src/MovingAverage.txt @@ -2,15 +2,15 @@ // computes the moving average of the last four inputs and produces that as // output. The source is a counting sequence. target C { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } import TestDouble from "lib/Test.lf" reactor MASource { - output out: double - state count: int(0) + output out: double + state count: int(0) timer clock(0, 200 msec) reaction(clock) -> out {= @@ -20,10 +20,10 @@ } reactor MovingAverageImpl { - state delay_line: double[](0.0, 0.0, 0.0) - state index: int(0) - input in: double - output out: double + state delay_line: double[](0.0, 0.0, 0.0) + state index: int(0) + input in: double + output out: double reaction(in) -> out {= // Calculate the output. diff --git a/test/known-good/C/src/MultipleContained.txt b/test/known-good/C/src/MultipleContained.txt index 5ea97e963..ac9488512 100644 --- a/test/known-good/C/src/MultipleContained.txt +++ b/test/known-good/C/src/MultipleContained.txt @@ -3,10 +3,10 @@ target C reactor Contained { - output trigger: int - input in1: int - input in2: int - state count: int(0) + output trigger: int + input in1: int + input in2: int + state count: int(0) reaction(startup) -> trigger {= lf_set(trigger, 42); =} diff --git a/test/known-good/C/src/MultipleOutputs.txt b/test/known-good/C/src/MultipleOutputs.txt index 1b41de85b..231c1eb03 100644 --- a/test/known-good/C/src/MultipleOutputs.txt +++ b/test/known-good/C/src/MultipleOutputs.txt @@ -3,13 +3,13 @@ // which is dangling. The generated code should not have any segmentation // faults. target C { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } reactor C { - output x: int - output z: int + output x: int + output z: int timer t(0, 100 msec) reaction(t) -> x, z {= @@ -20,7 +20,7 @@ main reactor { c = new C() - state triggered: bool(true) + state triggered: bool(true) reaction(c.z) {= lf_print("c.z = %d", c.z->value); diff --git a/test/known-good/C/src/NativeListsAndTimes.txt b/test/known-good/C/src/NativeListsAndTimes.txt index ffea09986..8e6037c4d 100644 --- a/test/known-good/C/src/NativeListsAndTimes.txt +++ b/test/known-good/C/src/NativeListsAndTimes.txt @@ -2,17 +2,17 @@ // This test passes if it is successfully compiled into valid target code. main reactor( - x: int(0), - y: time(0), // Units are missing but not required + x: int(0), + y: time(0), // Units are missing but not required z(1 msec), // Type is missing but not required - p: int[](1, 2, 3, 4), // List of integers - q: interval_t[](1 msec, 2 msec, 3 msec), // list of time values - g: time[](1 msec, 2 msec) // List of time values + p: int[](1, 2, 3, 4), // List of integers + q: interval_t[](1 msec, 2 msec, 3 msec), // list of time values + g: time[](1 msec, 2 msec) // List of time values ) { - state s: time(y) // Reference to explicitly typed time parameter - state t: time(z) // Reference to implicitly typed time parameter - state v: bool // Uninitialized boolean state variable - state w: time // Uninitialized time state variable + state s: time(y) // Reference to explicitly typed time parameter + state t: time(z) // Reference to implicitly typed time parameter + state v: bool // Uninitialized boolean state variable + state w: time // Uninitialized time state variable timer tick(0) // Units missing but not required timer tock(1 sec) // Implicit type time timer toe(z) // Implicit type time diff --git a/test/known-good/C/src/NestedTriggeredReactions.txt b/test/known-good/C/src/NestedTriggeredReactions.txt index 520f31fa4..2bb473e9b 100644 --- a/test/known-good/C/src/NestedTriggeredReactions.txt +++ b/test/known-good/C/src/NestedTriggeredReactions.txt @@ -1,9 +1,9 @@ target C reactor Container { - input in: bool + input in: bool - state triggered: bool(false) + state triggered: bool(false) contained = new Contained() @@ -19,9 +19,9 @@ } reactor Contained { - input in: bool + input in: bool - state triggered: bool(false) + state triggered: bool(false) reaction(in) {= self->triggered = true; =} diff --git a/test/known-good/C/src/ParameterHierarchy.txt b/test/known-good/C/src/ParameterHierarchy.txt index 9114e346f..8b081dcae 100644 --- a/test/known-good/C/src/ParameterHierarchy.txt +++ b/test/known-good/C/src/ParameterHierarchy.txt @@ -1,7 +1,7 @@ // Test that parameter values pass down a deep hierarchy. target C -reactor Deep(p: int(0)) { +reactor Deep(p: int(0)) { reaction(startup) {= if (self->p != 42) { lf_print_error_and_exit("Parameter value is %d. Should have been 42."); @@ -11,11 +11,11 @@ =} } -reactor Intermediate(p: int(10)) { +reactor Intermediate(p: int(10)) { a = new Deep(p = p) } -reactor Another(p: int(20)) { +reactor Another(p: int(20)) { a = new Intermediate(p = p) } diff --git a/test/known-good/C/src/ParameterizedState.txt b/test/known-good/C/src/ParameterizedState.txt index d137781ee..a010505e9 100644 --- a/test/known-good/C/src/ParameterizedState.txt +++ b/test/known-good/C/src/ParameterizedState.txt @@ -1,6 +1,6 @@ target C -reactor Foo(bar: int(42)) { +reactor Foo(bar: int(42)) { state baz(bar) reaction(startup) {= printf("Baz: %d\n", self->baz); =} diff --git a/test/known-good/C/src/PeriodicDesugared.txt b/test/known-good/C/src/PeriodicDesugared.txt index 9f02ab0fc..57bf45f68 100644 --- a/test/known-good/C/src/PeriodicDesugared.txt +++ b/test/known-good/C/src/PeriodicDesugared.txt @@ -1,9 +1,9 @@ target C { - fast: true, - timeout: 1 sec + fast: true, + timeout: 1 sec } -main reactor(offset: time(0), period: time(500 msec)) { +main reactor(offset: time(0), period: time(500 msec)) { logical action init(offset) logical action recur(period) diff --git a/test/known-good/C/src/PhysicalConnection.txt b/test/known-good/C/src/PhysicalConnection.txt index ef7bc0b90..98e445f0c 100644 --- a/test/known-good/C/src/PhysicalConnection.txt +++ b/test/known-good/C/src/PhysicalConnection.txt @@ -2,13 +2,13 @@ target C reactor Source { - output out: int + output out: int reaction(startup) -> out {= lf_set(out, 42); =} } reactor Destination { - input in: int + input in: int reaction(in) {= interval_t time = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/PingPong.txt b/test/known-good/C/src/PingPong.txt index 1a1ae4887..0dfdabda0 100644 --- a/test/known-good/C/src/PingPong.txt +++ b/test/known-good/C/src/PingPong.txt @@ -22,13 +22,13 @@ * @author Edward A. Lee */ target C { - fast: true + fast: true } -reactor Ping(count: int(10)) { - input receive: int - output send: int - state pingsLeft: int(count) +reactor Ping(count: int(10)) { + input receive: int + output send: int + state pingsLeft: int(count) logical action serve reaction(startup, serve) -> send {= lf_set(send, self->pingsLeft--); =} @@ -42,10 +42,10 @@ =} } -reactor Pong(expected: int(10)) { - input receive: int - output send: int - state count: int(0) +reactor Pong(expected: int(10)) { + input receive: int + output send: int + state count: int(0) reaction(receive) -> send {= self->count++; diff --git a/test/known-good/C/src/Preamble.txt b/test/known-good/C/src/Preamble.txt index 025a55191..f5ea8c76e 100644 --- a/test/known-good/C/src/Preamble.txt +++ b/test/known-good/C/src/Preamble.txt @@ -1,6 +1,6 @@ target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } main reactor Preamble { diff --git a/test/known-good/C/src/ReadOutputOfContainedReactor.txt b/test/known-good/C/src/ReadOutputOfContainedReactor.txt index 671e053e7..d08642c20 100644 --- a/test/known-good/C/src/ReadOutputOfContainedReactor.txt +++ b/test/known-good/C/src/ReadOutputOfContainedReactor.txt @@ -3,14 +3,14 @@ target C reactor Contained { - output out: int + output out: int reaction(startup) -> out {= lf_set(out, 42); =} } main reactor ReadOutputOfContainedReactor { c = new Contained() - state count: int(0) + state count: int(0) reaction(startup) c.out {= printf("Startup reaction reading output of contained reactor: %d.\n", c.out->value); diff --git a/test/known-good/C/src/RepeatedInheritance.txt b/test/known-good/C/src/RepeatedInheritance.txt index d5838aa00..73b1b7eed 100644 --- a/test/known-good/C/src/RepeatedInheritance.txt +++ b/test/known-good/C/src/RepeatedInheritance.txt @@ -4,28 +4,28 @@ * @author{Edward A. Lee} */ target C { - timeout: 5 sec, - fast: true + timeout: 5 sec, + fast: true } import Count from "lib/Count.lf" import TestCount from "lib/TestCount.lf" reactor D { - input d: int + input d: int } reactor C extends D { - input c: int + input c: int } reactor B extends D { - input b: int + input b: int } reactor A extends B, C { - input a: int - output out: int + input a: int + output out: int reaction(a, b, c, d) -> out {= lf_set(out, a->value + b->value + c->value + d->value); diff --git a/test/known-good/C/src/Schedule.txt b/test/known-good/C/src/Schedule.txt index 584844403..1fa71b5f5 100644 --- a/test/known-good/C/src/Schedule.txt +++ b/test/known-good/C/src/Schedule.txt @@ -2,7 +2,7 @@ target C reactor Schedule2 { - input x: int + input x: int logical action a reaction(x) -> a {= lf_schedule(a, MSEC(200)); =} diff --git a/test/known-good/C/src/ScheduleLogicalAction.txt b/test/known-good/C/src/ScheduleLogicalAction.txt index 7f974c1ea..630949235 100644 --- a/test/known-good/C/src/ScheduleLogicalAction.txt +++ b/test/known-good/C/src/ScheduleLogicalAction.txt @@ -1,14 +1,14 @@ // This checks that a logical action is scheduled the specified logical time // after the current logical time. target C { - fast: true, - timeout: 3 sec + fast: true, + timeout: 3 sec } reactor foo { - input x: int - output y: int - logical action a: int* + input x: int + output y: int + logical action a: int* reaction(x) -> y, a {= lf_set(y, 2*x->value); @@ -20,8 +20,8 @@ } reactor print { - state expected_time: time(0) - input x: int + state expected_time: time(0) + input x: int reaction(x) {= interval_t elapsed_time = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/ScheduleValue.txt b/test/known-good/C/src/ScheduleValue.txt index ec1b16d96..908fb00cf 100644 --- a/test/known-good/C/src/ScheduleValue.txt +++ b/test/known-good/C/src/ScheduleValue.txt @@ -1,10 +1,10 @@ /** Test of schedule_value. */ target C { - timeout: 3 sec + timeout: 3 sec } main reactor ScheduleValue { - logical action a: char* + logical action a: char* reaction(startup) -> a {= char* value = (char*)malloc(6); diff --git a/test/known-good/C/src/SelfLoop.txt b/test/known-good/C/src/SelfLoop.txt index 8cbb96ebb..4297b1ae4 100644 --- a/test/known-good/C/src/SelfLoop.txt +++ b/test/known-good/C/src/SelfLoop.txt @@ -1,13 +1,13 @@ target C { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } reactor Self { - input x: int - output y: int - logical action a: int - state expected: int(43) + input x: int + output y: int + logical action a: int + state expected: int(43) reaction(a) -> y {= printf("a = %d\n", a->value); diff --git a/test/known-good/C/src/SendingInside.txt b/test/known-good/C/src/SendingInside.txt index 44985bd65..7b58dee7c 100644 --- a/test/known-good/C/src/SendingInside.txt +++ b/test/known-good/C/src/SendingInside.txt @@ -1,13 +1,13 @@ // This tests a reactor that contains another reactor and also has its own // reaction that routes inputs to the contained reactor. target C { - timeout: 10 sec, - fast: true + timeout: 10 sec, + fast: true } reactor Printer { - input x: int - state count: int(1) + input x: int + state count: int(1) reaction(x) {= printf("Inside reactor received: %d\n", x->value); @@ -20,7 +20,7 @@ } main reactor SendingInside { - state count: int(0) + state count: int(0) timer t(0, 1 sec) p = new Printer() diff --git a/test/known-good/C/src/SendingInside2.txt b/test/known-good/C/src/SendingInside2.txt index 410bfbb80..ab715d141 100644 --- a/test/known-good/C/src/SendingInside2.txt +++ b/test/known-good/C/src/SendingInside2.txt @@ -1,7 +1,7 @@ target C reactor Printer { - input x: int + input x: int reaction(x) {= printf("Inside reactor received: %d\n", x->value); diff --git a/test/known-good/C/src/SendsPointerTest.txt b/test/known-good/C/src/SendsPointerTest.txt index 6412c2550..eef358821 100644 --- a/test/known-good/C/src/SendsPointerTest.txt +++ b/test/known-good/C/src/SendsPointerTest.txt @@ -5,7 +5,7 @@ preamble {= typedef int* int_pointer; =} reactor SendsPointer { - output out: int_pointer + output out: int_pointer reaction(startup) -> out {= static int my_constant = 42; @@ -13,8 +13,8 @@ =} } -reactor Print(expected: int(42)) { // expected parameter is for testing. - input in: int_pointer +reactor Print(expected: int(42)) { // expected parameter is for testing. + input in: int_pointer reaction(in) {= printf("Received: %d\n", *in->value); diff --git a/test/known-good/C/src/SetArray.txt b/test/known-good/C/src/SetArray.txt index d55c95acd..85c751e72 100644 --- a/test/known-good/C/src/SetArray.txt +++ b/test/known-good/C/src/SetArray.txt @@ -3,7 +3,7 @@ target C reactor Source { - output out: int[] + output out: int[] reaction(startup) -> out {= // Dynamically allocate an output array of length 3. @@ -17,8 +17,8 @@ =} } -reactor Print(scale: int(1)) { // The scale parameter is just for testing. - input in: int[] +reactor Print(scale: int(1)) { // The scale parameter is just for testing. + input in: int[] reaction(in) {= int count = 0; // For testing. diff --git a/test/known-good/C/src/SetToken.txt b/test/known-good/C/src/SetToken.txt index 94d87e63d..4d642072a 100644 --- a/test/known-good/C/src/SetToken.txt +++ b/test/known-good/C/src/SetToken.txt @@ -2,16 +2,16 @@ target C reactor Source { - output out: int* - logical action a: int + output out: int* + logical action a: int reaction(startup) -> a {= lf_schedule_int(a, MSEC(200), 42); =} reaction(a) -> out {= lf_set_token(out, a->token); =} } -reactor Print(expected: int(42)) { // expected parameter is for testing. - input in: int* +reactor Print(expected: int(42)) { // expected parameter is for testing. + input in: int* reaction(in) {= printf("Received %d\n", *(in->value)); diff --git a/test/known-good/C/src/SimpleDeadline.txt b/test/known-good/C/src/SimpleDeadline.txt index 1e15cea90..685d7c668 100644 --- a/test/known-good/C/src/SimpleDeadline.txt +++ b/test/known-good/C/src/SimpleDeadline.txt @@ -3,9 +3,9 @@ // violation. target C -reactor Deadline(threshold: time(100 msec)) { - input x: int - output deadlineViolation: bool +reactor Deadline(threshold: time(100 msec)) { + input x: int + output deadlineViolation: bool reaction(x) -> deadlineViolation {= printf("ERROR: Deadline violation was not detected!\n"); @@ -17,7 +17,7 @@ } reactor Print { - input in: bool + input in: bool reaction(in) {= if (in) { diff --git a/test/known-good/C/src/SlowingClock.txt b/test/known-good/C/src/SlowingClock.txt index 0382f7dd6..b18ca75e1 100644 --- a/test/known-good/C/src/SlowingClock.txt +++ b/test/known-good/C/src/SlowingClock.txt @@ -5,14 +5,14 @@ * 600, and 1000 msec. */ target C { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } main reactor SlowingClock { logical action a(100 msec) - state interval: time(100 msec) - state expected_time: time(100 msec) + state interval: time(100 msec) + state expected_time: time(100 msec) reaction(startup) -> a {= lf_schedule(a, 0); =} diff --git a/test/known-good/C/src/SlowingClockPhysical.txt b/test/known-good/C/src/SlowingClockPhysical.txt index 15be67a22..a94c3465e 100644 --- a/test/known-good/C/src/SlowingClockPhysical.txt +++ b/test/known-good/C/src/SlowingClockPhysical.txt @@ -6,13 +6,13 @@ * new event. */ target C { - timeout: 1500 msec + timeout: 1500 msec } main reactor SlowingClockPhysical { physical action a(100 msec) - state interval: time(100 msec) - state expected_time: time(100 msec) + state interval: time(100 msec) + state expected_time: time(100 msec) reaction(startup) -> a {= self->expected_time = MSEC(100); diff --git a/test/known-good/C/src/StartupOutFromInside.txt b/test/known-good/C/src/StartupOutFromInside.txt index 9cf29741a..61993f18f 100644 --- a/test/known-good/C/src/StartupOutFromInside.txt +++ b/test/known-good/C/src/StartupOutFromInside.txt @@ -1,7 +1,7 @@ target C reactor Bar { - output out: int + output out: int reaction(startup) -> out {= lf_set(out, 42); =} } diff --git a/test/known-good/C/src/Starvation.txt b/test/known-good/C/src/Starvation.txt index e65c8be27..cee7bbc6d 100644 --- a/test/known-good/C/src/Starvation.txt +++ b/test/known-good/C/src/Starvation.txt @@ -6,10 +6,10 @@ */ target C -reactor SuperDenseSender(number_of_iterations: int(10)) { +reactor SuperDenseSender(number_of_iterations: int(10)) { logical action loop - output out: int - state iterator: int(0) + output out: int + state iterator: int(0) reaction(startup, loop) -> out {= if (self->iterator < self->number_of_iterations) { @@ -34,8 +34,8 @@ =} } -reactor SuperDenseReceiver(number_of_iterations: int(10)) { - input in: int +reactor SuperDenseReceiver(number_of_iterations: int(10)) { + input in: int reaction(in) {= tag_t current_tag = lf_tag(); diff --git a/test/known-good/C/src/Stop.txt b/test/known-good/C/src/Stop.txt index a40129865..5bdfb3c37 100644 --- a/test/known-good/C/src/Stop.txt +++ b/test/known-good/C/src/Stop.txt @@ -4,14 +4,14 @@ * @author Soroush Bateni */ target C { - timeout: 11 msec + timeout: 11 msec } import Sender from "lib/LoopedActionSender.lf" reactor Consumer { - input in: int - state reaction_invoked_correctly: bool(false) + input in: int + state reaction_invoked_correctly: bool(false) reaction(in) {= tag_t current_tag = lf_tag(); diff --git a/test/known-good/C/src/StopZero.txt b/test/known-good/C/src/StopZero.txt index 4f451bb84..df6c1777d 100644 --- a/test/known-good/C/src/StopZero.txt +++ b/test/known-good/C/src/StopZero.txt @@ -7,8 +7,8 @@ target C reactor Sender { - output out: int - state reaction_invoked_correctly: bool(false) + output out: int + state reaction_invoked_correctly: bool(false) timer t(0, 1 usec) logical action act @@ -64,7 +64,7 @@ } reactor Receiver { - input in: int + input in: int reaction(in) {= printf("Received %d at (%lld, %u).\n", diff --git a/test/known-good/C/src/Stride.txt b/test/known-good/C/src/Stride.txt index 55bc473bb..8803acd17 100644 --- a/test/known-good/C/src/Stride.txt +++ b/test/known-good/C/src/Stride.txt @@ -1,13 +1,13 @@ // This example illustrates state variables and parameters on the wiki. For this // test, success is just compiling and running. target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Count(stride: int(1)) { - state count: int(1) - output y: int +reactor Count(stride: int(1)) { + state count: int(1) + output y: int timer t(0, 100 msec) reaction(t) -> y {= @@ -17,8 +17,8 @@ } reactor Display { - input x: int - state expected: int(1) // for testing. + input x: int + state expected: int(1) // for testing. reaction(x) {= printf("Received: %d.\n", x->value); diff --git a/test/known-good/C/src/StructAsState.txt b/test/known-good/C/src/StructAsState.txt index d9f412e8d..00bdc6950 100644 --- a/test/known-good/C/src/StructAsState.txt +++ b/test/known-good/C/src/StructAsState.txt @@ -10,7 +10,7 @@ } hello_t; =} // Notice that target code delimiters are no longer necessary. - state s: hello_t("Earth", 42) + state s: hello_t("Earth", 42) reaction(startup) {= printf("State s.name=\"%s\", value=%d.\n", self->s.name, self->s.value); diff --git a/test/known-good/C/src/StructAsType.txt b/test/known-good/C/src/StructAsType.txt index 2b3c216c3..d11367eeb 100644 --- a/test/known-good/C/src/StructAsType.txt +++ b/test/known-good/C/src/StructAsType.txt @@ -1,6 +1,6 @@ // Source produces a struct directly, rather than a pointer to a struct. target C { - files: include/hello.h + files: include/hello.h } preamble {= @@ -8,7 +8,7 @@ =} reactor Source { - output out: hello_t + output out: hello_t reaction(startup) -> out {= // Create the struct on the stack and then copy @@ -23,8 +23,8 @@ =} } -reactor Print(expected: int(42)) { // expected parameter is for testing. - input in: hello_t +reactor Print(expected: int(42)) { // expected parameter is for testing. + input in: hello_t reaction(in) {= printf("Received: name = %s, value = %d\n", in->value.name, in->value.value); diff --git a/test/known-good/C/src/StructAsTypeDirect.txt b/test/known-good/C/src/StructAsTypeDirect.txt index e73b1c151..33326f47b 100644 --- a/test/known-good/C/src/StructAsTypeDirect.txt +++ b/test/known-good/C/src/StructAsTypeDirect.txt @@ -1,6 +1,6 @@ // Source produces a struct directly, rather than a pointer to a struct. target C { - files: include/hello.h + files: include/hello.h } preamble {= @@ -8,7 +8,7 @@ =} reactor Source { - output out: hello_t + output out: hello_t reaction(startup) -> out {= out->value.name = "Earth"; @@ -17,8 +17,8 @@ =} } -reactor Print(expected: int(42)) { // expected parameter is for testing. - input in: hello_t +reactor Print(expected: int(42)) { // expected parameter is for testing. + input in: hello_t reaction(in) {= printf("Received: name = %s, value = %d\n", in->value.name, in->value.value); diff --git a/test/known-good/C/src/StructParallel.txt b/test/known-good/C/src/StructParallel.txt index a330d876c..f9c59d1fb 100644 --- a/test/known-good/C/src/StructParallel.txt +++ b/test/known-good/C/src/StructParallel.txt @@ -2,7 +2,7 @@ // of which want to modify it. NOTE: Ideally, only one copy would be made, but // this requires modifying the precedence graph between reactions. target C { - files: ["include/hello.h"] + files: ["include/hello.h"] } import Source from "StructScale.lf" @@ -11,9 +11,9 @@ #include "hello.h" =} -reactor Check(expected: int(42)) { - input in: hello_t* - state invoked: bool(false) +reactor Check(expected: int(42)) { + input in: hello_t* + state invoked: bool(false) reaction(in) {= printf("Received: name = %s, value = %d\n", in->value->name, in->value->value); @@ -32,12 +32,12 @@ =} } -reactor Print(scale: int(2)) { +reactor Print(scale: int(2)) { // Mutable keyword indicates that this reactor wants a writable copy of the // input. - mutable input in: hello_t* + mutable input in: hello_t* - output out: hello_t* + output out: hello_t* reaction(in) -> out {= in->value->value *= self->scale; diff --git a/test/known-good/C/src/StructPrint.txt b/test/known-good/C/src/StructPrint.txt index eb8b68d8a..f84728074 100644 --- a/test/known-good/C/src/StructPrint.txt +++ b/test/known-good/C/src/StructPrint.txt @@ -1,7 +1,7 @@ // Source produces a dynamically allocated struct, which it passes to Print. // Reference counting ensures that the struct is freed. target C { - files: ["include/hello.h"] + files: ["include/hello.h"] } preamble {= @@ -9,7 +9,7 @@ =} reactor Print { - output out: hello_t* + output out: hello_t* reaction(startup) -> out {= // Dynamically allocate an output struct. @@ -20,8 +20,8 @@ =} } -reactor Check(expected: int(42)) { // expected parameter is for testing. - input in: hello_t* +reactor Check(expected: int(42)) { // expected parameter is for testing. + input in: hello_t* reaction(in) {= printf("Received: name = %s, value = %d\n", in->value->name, in->value->value); diff --git a/test/known-good/C/src/StructScale.txt b/test/known-good/C/src/StructScale.txt index 29bd57130..ea5327c29 100644 --- a/test/known-good/C/src/StructScale.txt +++ b/test/known-good/C/src/StructScale.txt @@ -3,7 +3,7 @@ // ownership of the original struct. It modifies it and passes it to Print. It // gets freed after Print is done with it. target C { - files: ["include/hello.h"] + files: ["include/hello.h"] } preamble {= @@ -11,7 +11,7 @@ =} reactor Source { - output out: hello_t* + output out: hello_t* reaction(startup) -> out {= // Dynamically allocate an output struct. @@ -22,9 +22,9 @@ =} } -reactor TestInput(expected: int(42)) { // expected parameter is for testing. - input in: hello_t* - state invoked: bool(false) +reactor TestInput(expected: int(42)) { // expected parameter is for testing. + input in: hello_t* + state invoked: bool(false) reaction(in) {= printf("Received: name = %s, value = %d\n", in->value->name, in->value->value); @@ -43,12 +43,12 @@ =} } -reactor Print(scale: int(2)) { +reactor Print(scale: int(2)) { // Mutable keyword indicates that this reactor wants a writable copy of the // input. - mutable input in: hello_t* + mutable input in: hello_t* - output out: hello_t* + output out: hello_t* reaction(in) -> out {= in->value->value *= self->scale; diff --git a/test/known-good/C/src/SubclassesAndStartup.txt b/test/known-good/C/src/SubclassesAndStartup.txt index 72320f6e2..698c44f7b 100644 --- a/test/known-good/C/src/SubclassesAndStartup.txt +++ b/test/known-good/C/src/SubclassesAndStartup.txt @@ -1,7 +1,7 @@ target C reactor Super { - state count: int(0) + state count: int(0) reaction(startup) {= printf("%s(Super) started\n", self->name); @@ -16,7 +16,7 @@ =} } -reactor SubA(name: string("SubA")) extends Super { +reactor SubA(name: string("SubA")) extends Super { reaction(startup) {= printf("%s started\n", self->name); if (self->count == 0) { @@ -26,7 +26,7 @@ =} } -reactor SubB(name: string("SubB")) extends Super { +reactor SubB(name: string("SubB")) extends Super { reaction(startup) {= printf("%s started\n", self->name); if (self->count == 0) { diff --git a/test/known-good/C/src/TestForPreviousOutput.txt b/test/known-good/C/src/TestForPreviousOutput.txt index cfdb71408..a901216ed 100644 --- a/test/known-good/C/src/TestForPreviousOutput.txt +++ b/test/known-good/C/src/TestForPreviousOutput.txt @@ -3,7 +3,7 @@ target C reactor Source { - output out: int + output out: int reaction(startup) -> out {= // Set a seed for random number generation based on the current time. @@ -24,7 +24,7 @@ } reactor Sink { - input in: int + input in: int reaction(in) {= printf("Received %d.\n", in->value); diff --git a/test/known-good/C/src/TimeLimit.txt b/test/known-good/C/src/TimeLimit.txt index 10fbf5ea5..23543685e 100644 --- a/test/known-good/C/src/TimeLimit.txt +++ b/test/known-good/C/src/TimeLimit.txt @@ -2,13 +2,13 @@ // Correct output for this 1, 2, 3, 4. Failure for this test is failing to halt // or getting the wrong data. target C { - fast: true + fast: true } -reactor Clock(offset: time(0), period: time(1 sec)) { - output y: int +reactor Clock(offset: time(0), period: time(1 sec)) { + output y: int timer t(offset, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= (self->count)++; @@ -18,8 +18,8 @@ } reactor Destination { - input x: int - state s: int(1) + input x: int + state s: int(1) reaction(x) {= // printf("%d\n", x->value); @@ -39,7 +39,7 @@ =} } -main reactor TimeLimit(period: time(1 sec)) { +main reactor TimeLimit(period: time(1 sec)) { timer stop(10 sec) c = new Clock(period = period) d = new Destination() diff --git a/test/known-good/C/src/TimeState.txt b/test/known-good/C/src/TimeState.txt index 9dca68d56..8d2af818b 100644 --- a/test/known-good/C/src/TimeState.txt +++ b/test/known-good/C/src/TimeState.txt @@ -1,7 +1,7 @@ target C -reactor Foo(bar: int(42)) { - state baz: time(500 msec) +reactor Foo(bar: int(42)) { + state baz: time(500 msec) reaction(startup) {= printf("Baz: %lld\n", self->baz); =} } diff --git a/test/known-good/C/src/Timeout.txt b/test/known-good/C/src/Timeout.txt index 2bed33090..9d20b6a44 100644 --- a/test/known-good/C/src/Timeout.txt +++ b/test/known-good/C/src/Timeout.txt @@ -4,14 +4,14 @@ * @author Soroush Bateni */ target C { - timeout: 11 msec + timeout: 11 msec } import Sender from "lib/LoopedActionSender.lf" reactor Consumer { - input in: int - state success: bool(false) + input in: int + state success: bool(false) reaction(in) {= tag_t current_tag = lf_tag(); diff --git a/test/known-good/C/src/TimeoutZero.txt b/test/known-good/C/src/TimeoutZero.txt index f2bf99aad..e94b87944 100644 --- a/test/known-good/C/src/TimeoutZero.txt +++ b/test/known-good/C/src/TimeoutZero.txt @@ -5,14 +5,14 @@ * @author Soroush Bateni */ target C { - timeout: 0 sec + timeout: 0 sec } import Sender from "lib/LoopedActionSender.lf" reactor Consumer { - input in: int - state success: bool(false) + input in: int + state success: bool(false) reaction(in) {= tag_t current_tag = lf_tag(); diff --git a/test/known-good/C/src/ToReactionNested.txt b/test/known-good/C/src/ToReactionNested.txt index 95387a898..ac9625898 100644 --- a/test/known-good/C/src/ToReactionNested.txt +++ b/test/known-good/C/src/ToReactionNested.txt @@ -1,19 +1,19 @@ target C { - timeout: 5 sec, - fast: true + timeout: 5 sec, + fast: true } import Count from "lib/Count.lf" reactor CountContainer { - output out: int + output out: int c1 = new Count() c1.out -> out } main reactor { - state count: int(1) - state received: bool(false) + state count: int(1) + state received: bool(false) s = new CountContainer() diff --git a/test/known-good/C/src/TriggerDownstreamOnlyIfPresent2.txt b/test/known-good/C/src/TriggerDownstreamOnlyIfPresent2.txt index 96e23b108..4d4c364c1 100644 --- a/test/known-good/C/src/TriggerDownstreamOnlyIfPresent2.txt +++ b/test/known-good/C/src/TriggerDownstreamOnlyIfPresent2.txt @@ -3,13 +3,13 @@ * is present. */ target C { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } reactor Source { - output[2] out: int - state count: int(0) + output[2] out: int + state count: int(0) timer t(0, 200 msec) reaction(t) -> out {= @@ -22,7 +22,7 @@ } reactor Destination { - input in: int + input in: int reaction(in) {= if (!in->is_present) { @@ -34,7 +34,7 @@ main reactor TriggerDownstreamOnlyIfPresent2 { s = new Source() - d = new[2] Destination() + d = new[2] Destination() s.out -> d.in } diff --git a/test/known-good/C/src/UnconnectedInput.txt b/test/known-good/C/src/UnconnectedInput.txt index 5ddb6acfa..1505d18d1 100644 --- a/test/known-good/C/src/UnconnectedInput.txt +++ b/test/known-good/C/src/UnconnectedInput.txt @@ -1,21 +1,21 @@ // Test unconnected input. target C { - timeout: 5 sec, - fast: true + timeout: 5 sec, + fast: true } reactor Source { - output out: int + output out: int timer t(0, 1 sec) - state s: int(1) + state s: int(1) reaction(t) -> out {= lf_set(out, self->s++); =} } reactor Add { - input in1: int - input in2: int - output out: int + input in1: int + input in2: int + output out: int reaction(in1, in2) -> out {= int result = 0; @@ -26,8 +26,8 @@ } reactor Print { - input in: int - state expected: int(1) + input in: int + state expected: int(1) reaction(in) {= printf("Received: %d.\n", in->value); diff --git a/test/known-good/C/src/Wcet.txt b/test/known-good/C/src/Wcet.txt index 8b2f9c1fa..621f08f54 100644 --- a/test/known-good/C/src/Wcet.txt +++ b/test/known-good/C/src/Wcet.txt @@ -2,8 +2,8 @@ target C reactor Source { - output out1: int - output out2: int + output out1: int + output out2: int timer t reaction(t) -> out1, out2 {= @@ -13,9 +13,9 @@ } reactor Work { - input in1: int - input in2: int - output out: int + input in1: int + input in2: int + output out: int reaction(in1, in2) -> out {= int ret; @@ -29,7 +29,7 @@ } reactor Print { - input in: int + input in: int reaction(in) {= printf("Received: %d\n", in->value); =} } diff --git a/test/known-good/C/src/arduino/AnalogReadSerial.txt b/test/known-good/C/src/arduino/AnalogReadSerial.txt index 01deac6c8..e82968603 100644 --- a/test/known-good/C/src/arduino/AnalogReadSerial.txt +++ b/test/known-good/C/src/arduino/AnalogReadSerial.txt @@ -5,9 +5,9 @@ * the outside pins to +5V and ground. */ target C { - platform: { - name: "arduino", - board: "arduino:avr:mega" + platform: { + name: "arduino", + board: "arduino:avr:mega" } } diff --git a/test/known-good/C/src/arduino/Blink.txt b/test/known-good/C/src/arduino/Blink.txt index a549857e5..fb45e0ddb 100644 --- a/test/known-good/C/src/arduino/Blink.txt +++ b/test/known-good/C/src/arduino/Blink.txt @@ -4,9 +4,9 @@ * half-second. */ target C { - platform: { - name: "arduino", - board: "arduino:avr:mega" + platform: { + name: "arduino", + board: "arduino:avr:mega" } } diff --git a/test/known-good/C/src/arduino/BlinkAttemptThreading.txt b/test/known-good/C/src/arduino/BlinkAttemptThreading.txt index 8d0aa4040..7226f1cb0 100644 --- a/test/known-good/C/src/arduino/BlinkAttemptThreading.txt +++ b/test/known-good/C/src/arduino/BlinkAttemptThreading.txt @@ -5,12 +5,12 @@ * warning and default back to no threading. */ target C { - platform: { - name: "arduino", - board: "arduino:avr:mega" + platform: { + name: "arduino", + board: "arduino:avr:mega" }, - threading: true -} + threading: true +} main reactor BlinkAttemptThreading { timer t1(0, 1 sec) diff --git a/test/known-good/C/src/arduino/BlinkMBED.txt b/test/known-good/C/src/arduino/BlinkMBED.txt index a4918ccce..c763345d3 100644 --- a/test/known-good/C/src/arduino/BlinkMBED.txt +++ b/test/known-good/C/src/arduino/BlinkMBED.txt @@ -4,9 +4,9 @@ * half-second. */ target C { - platform: { - name: "arduino", - board: "arduino:mbed:nano33ble" + platform: { + name: "arduino", + board: "arduino:mbed:nano33ble" } } diff --git a/test/known-good/C/src/arduino/DigitalReadSerial.txt b/test/known-good/C/src/arduino/DigitalReadSerial.txt index bc7ad5939..2579ec457 100644 --- a/test/known-good/C/src/arduino/DigitalReadSerial.txt +++ b/test/known-good/C/src/arduino/DigitalReadSerial.txt @@ -3,15 +3,15 @@ * Monitor */ target C { - platform: { - name: "arduino", - board: "arduino:avr:mega" + platform: { + name: "arduino", + board: "arduino:avr:mega" } } main reactor DigitalReadSerial { timer t1(0, 1 msec) - state pushButton: int(2) + state pushButton: int(2) reaction(startup) {= pinMode(self->pushButton, INPUT); =} diff --git a/test/known-good/C/src/arduino/Fade.txt b/test/known-good/C/src/arduino/Fade.txt index 08a51d502..cdd49e297 100644 --- a/test/known-good/C/src/arduino/Fade.txt +++ b/test/known-good/C/src/arduino/Fade.txt @@ -6,17 +6,17 @@ * ~11. */ target C { - platform: { - name: "arduino", - board: "arduino:avr:mega" + platform: { + name: "arduino", + board: "arduino:avr:mega" } } main reactor Fade { timer t1(0, 30 msec) - state led: int(9) - state brightness: int(9) - state fadeAmount: int(5) + state led: int(9) + state brightness: int(9) + state fadeAmount: int(5) reaction(startup) {= pinMode(self->led, OUTPUT); =} diff --git a/test/known-good/C/src/arduino/ReadAnalogVoltage.txt b/test/known-good/C/src/arduino/ReadAnalogVoltage.txt index 89252251d..f35d7319d 100644 --- a/test/known-good/C/src/arduino/ReadAnalogVoltage.txt +++ b/test/known-good/C/src/arduino/ReadAnalogVoltage.txt @@ -6,9 +6,9 @@ * ground. */ target C { - platform: { - name: "arduino", - board: "arduino:avr:mega" + platform: { + name: "arduino", + board: "arduino:avr:mega" } } diff --git a/test/known-good/C/src/concurrent/AsyncCallback.txt b/test/known-good/C/src/concurrent/AsyncCallback.txt index edd0fac8b..5173ec6cd 100644 --- a/test/known-good/C/src/concurrent/AsyncCallback.txt +++ b/test/known-good/C/src/concurrent/AsyncCallback.txt @@ -8,8 +8,8 @@ * platforms. */ target C { - tracing: true, - timeout: 2 sec + tracing: true, + timeout: 2 sec } main reactor AsyncCallback { @@ -33,12 +33,12 @@ lf_thread_t threadId; =} timer t(0, 200 msec) - state thread_id: lf_thread_t(0) - state expected_time: time(100 msec) - state toggle: bool(false) + state thread_id: lf_thread_t(0) + state expected_time: time(100 msec) + state toggle: bool(false) - physical action a(100 msec): int - state i: int(0) + physical action a(100 msec): int + state i: int(0) reaction(t) -> a {= // start new thread, provide callback diff --git a/test/known-good/C/src/concurrent/AsyncCallbackDrop.txt b/test/known-good/C/src/concurrent/AsyncCallbackDrop.txt index 1e33b906b..347793f09 100644 --- a/test/known-good/C/src/concurrent/AsyncCallbackDrop.txt +++ b/test/known-good/C/src/concurrent/AsyncCallbackDrop.txt @@ -3,8 +3,8 @@ // will not work with the unthreaded C target because that target does not // implement any mutex protecting the event queue. target C { - keepalive: true, // To silence warning. - timeout: 2 sec + keepalive: true, // To silence warning. + timeout: 2 sec } main reactor { @@ -28,12 +28,12 @@ lf_thread_t threadId; =} timer t(0, 200 msec) - state thread_id: lf_thread_t(0) - state expected_time: time(100 msec) - state toggle: bool(false) + state thread_id: lf_thread_t(0) + state expected_time: time(100 msec) + state toggle: bool(false) - physical action a(100 msec, 100 msec, "drop"): int - state i: int(0) + physical action a(100 msec, 100 msec, "drop"): int + state i: int(0) reaction(t) -> a {= // start new thread, provide callback diff --git a/test/known-good/C/src/concurrent/AsyncCallbackReplace.txt b/test/known-good/C/src/concurrent/AsyncCallbackReplace.txt index 52f1fda6a..6b22a05a4 100644 --- a/test/known-good/C/src/concurrent/AsyncCallbackReplace.txt +++ b/test/known-good/C/src/concurrent/AsyncCallbackReplace.txt @@ -3,8 +3,8 @@ // will not work with the unthreaded C target because that target does not // implement any mutex protecting the event queue. target C { - keepalive: true, - timeout: 2 sec + keepalive: true, + timeout: 2 sec } main reactor { @@ -28,12 +28,12 @@ lf_thread_t threadId; =} timer t(0, 200 msec) - state thread_id: lf_thread_t(0) - state expected_time: time(100 msec) - state toggle: bool(false) + state thread_id: lf_thread_t(0) + state expected_time: time(100 msec) + state toggle: bool(false) - physical action a(100 msec, 100 msec, "replace"): int - state i: int(0) + physical action a(100 msec, 100 msec, "replace"): int + state i: int(0) reaction(t) -> a {= // start new thread, provide callback diff --git a/test/known-good/C/src/concurrent/CompositionThreaded.txt b/test/known-good/C/src/concurrent/CompositionThreaded.txt index 0192bb3ca..b3f983950 100644 --- a/test/known-good/C/src/concurrent/CompositionThreaded.txt +++ b/test/known-good/C/src/concurrent/CompositionThreaded.txt @@ -1,14 +1,14 @@ // This test connects a simple counting source to tester that checks against its // own count. target C { - fast: true, - timeout: 10 sec + fast: true, + timeout: 10 sec } -reactor Source(period: time(2 sec)) { - output y: int +reactor Source(period: time(2 sec)) { + output y: int timer t(1 sec, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= (self->count)++; @@ -17,8 +17,8 @@ } reactor Test { - input x: int - state count: int(0) + input x: int + state count: int(0) reaction(x) {= (self->count)++; diff --git a/test/known-good/C/src/concurrent/DeadlineHandledAboveThreaded.txt b/test/known-good/C/src/concurrent/DeadlineHandledAboveThreaded.txt index cdec4e8d7..d5a80a099 100644 --- a/test/known-good/C/src/concurrent/DeadlineHandledAboveThreaded.txt +++ b/test/known-good/C/src/concurrent/DeadlineHandledAboveThreaded.txt @@ -2,9 +2,9 @@ // container reacts to that output. target C -reactor Deadline(threshold: time(100 msec)) { - input x: int - output deadline_violation: bool +reactor Deadline(threshold: time(100 msec)) { + input x: int + output deadline_violation: bool reaction(x) -> deadline_violation {= printf("ERROR: Deadline violation was not detected!\n"); @@ -16,7 +16,7 @@ } main reactor { - state violation_detected: bool(false) + state violation_detected: bool(false) d = new Deadline(threshold = 10 msec) reaction(startup) -> d.x {= diff --git a/test/known-good/C/src/concurrent/DeadlineThreaded.txt b/test/known-good/C/src/concurrent/DeadlineThreaded.txt index 2c20cad99..e82e9497b 100644 --- a/test/known-good/C/src/concurrent/DeadlineThreaded.txt +++ b/test/known-good/C/src/concurrent/DeadlineThreaded.txt @@ -2,13 +2,13 @@ // the Source immediately, whereas odd numbers are sent after a big enough delay // to violate the deadline. target C { - timeout: 6 sec + timeout: 6 sec } -reactor Source(period: time(3000 msec)) { - output y: int +reactor Source(period: time(3000 msec)) { + output y: int timer t(0, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= if (2 * (self->count / 2) != self->count) { @@ -22,9 +22,9 @@ =} } -reactor Destination(timeout: time(1 sec)) { - input x: int - state count: int(0) +reactor Destination(timeout: time(1 sec)) { + input x: int + state count: int(0) reaction(x) {= printf("Destination receives: %d\n", x->value); diff --git a/test/known-good/C/src/concurrent/DelayIntThreaded.txt b/test/known-good/C/src/concurrent/DelayIntThreaded.txt index 11003d493..402a25815 100644 --- a/test/known-good/C/src/concurrent/DelayIntThreaded.txt +++ b/test/known-good/C/src/concurrent/DelayIntThreaded.txt @@ -1,10 +1,10 @@ // This tests actions with payloads by delaying an input by a fixed amount. target C -reactor Delay(delay: time(100 msec)) { - input in: int - output out: int - logical action a: int +reactor Delay(delay: time(100 msec)) { + input in: int + output out: int + logical action a: int reaction(a) -> out {= lf_set(out, a->value); =} @@ -15,9 +15,9 @@ } reactor Test { - input in: int - state start_time: time(0) - state received_value: bool(false) + input in: int + state start_time: time(0) + state received_value: bool(false) reaction(startup) {= // Record the logical time at the start. diff --git a/test/known-good/C/src/concurrent/DeterminismThreaded.txt b/test/known-good/C/src/concurrent/DeterminismThreaded.txt index e7750e5fa..c65007f62 100644 --- a/test/known-good/C/src/concurrent/DeterminismThreaded.txt +++ b/test/known-good/C/src/concurrent/DeterminismThreaded.txt @@ -1,15 +1,15 @@ target C reactor Source { - output y: int + output y: int timer t reaction(t) -> y {= lf_set(y, 1); =} } reactor Destination { - input x: int - input y: int + input x: int + input y: int reaction(x, y) {= int sum = 0; @@ -28,8 +28,8 @@ } reactor Pass { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= lf_set(y, x->value); =} } diff --git a/test/known-good/C/src/concurrent/DoubleReactionThreaded.txt b/test/known-good/C/src/concurrent/DoubleReactionThreaded.txt index cf7eae4eb..44a22b4c6 100644 --- a/test/known-good/C/src/concurrent/DoubleReactionThreaded.txt +++ b/test/known-good/C/src/concurrent/DoubleReactionThreaded.txt @@ -1,14 +1,14 @@ // Test that two simultaneous inputs that trigger a reaction trigger it only // once. Correct output for this 2, 4, 6, 8, etc. target C { - timeout: 10 sec, - fast: true + timeout: 10 sec, + fast: true } -reactor Clock(offset: time(0), period: time(1 sec)) { - output y: int +reactor Clock(offset: time(0), period: time(1 sec)) { + output y: int timer t(offset, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= (self->count)++; @@ -17,9 +17,9 @@ } reactor Destination { - input x: int - input w: int - state s: int(2) + input x: int + input w: int + state s: int(2) reaction(x, w) {= int sum = 0; diff --git a/test/known-good/C/src/concurrent/GainThreaded.txt b/test/known-good/C/src/concurrent/GainThreaded.txt index 149b95fb1..590ac8c84 100644 --- a/test/known-good/C/src/concurrent/GainThreaded.txt +++ b/test/known-good/C/src/concurrent/GainThreaded.txt @@ -1,16 +1,16 @@ // Example in the Wiki. target C -reactor Scale(scale: int(2)) { - input x: int - output y: int +reactor Scale(scale: int(2)) { + input x: int + output y: int reaction(x) -> y {= lf_set(y, x->value * self->scale); =} } reactor Test { - input x: int - state received_value: bool(false) + input x: int + state received_value: bool(false) reaction(x) {= printf("Received %d.\n", x->value); diff --git a/test/known-good/C/src/concurrent/HelloThreaded.txt b/test/known-good/C/src/concurrent/HelloThreaded.txt index 1976955ad..a42ec0637 100644 --- a/test/known-good/C/src/concurrent/HelloThreaded.txt +++ b/test/known-good/C/src/concurrent/HelloThreaded.txt @@ -4,13 +4,13 @@ // has a period of 4 seconds, the second of 2 seconds, and the third (composite) // or 1 second. target C { - timeout: 10 sec, - fast: true + timeout: 10 sec, + fast: true } -reactor Reschedule(period: time(2 sec), message: string("Hello C")) { - state count: int(0) - state previous_time: time(0) +reactor Reschedule(period: time(2 sec), message: string("Hello C")) { + state count: int(0) + state previous_time: time(0) timer t(1 sec, period) logical action a @@ -43,8 +43,8 @@ } reactor Inside( - period: time(1 sec), - message: string("Composite default message.") + period: time(1 sec), + message: string("Composite default message.") ) { third_instance = new Reschedule(period = period, message = message) } diff --git a/test/known-good/C/src/concurrent/PingPongThreaded.txt b/test/known-good/C/src/concurrent/PingPongThreaded.txt index 69a2c816c..1c1dca0a7 100644 --- a/test/known-good/C/src/concurrent/PingPongThreaded.txt +++ b/test/known-good/C/src/concurrent/PingPongThreaded.txt @@ -22,13 +22,13 @@ * @author Edward A. Lee */ target C { - fast: true + fast: true } -reactor Ping(count: int(10)) { - input receive: int - output send: int - state pingsLeft: int(count) +reactor Ping(count: int(10)) { + input receive: int + output send: int + state pingsLeft: int(count) logical action serve reaction(startup, serve) -> send {= lf_set(send, self->pingsLeft--); =} @@ -42,10 +42,10 @@ =} } -reactor Pong(expected: int(10)) { - input receive: int - output send: int - state count: int(0) +reactor Pong(expected: int(10)) { + input receive: int + output send: int + state count: int(0) reaction(receive) -> send {= self->count++; diff --git a/test/known-good/C/src/concurrent/ScheduleAt.txt b/test/known-good/C/src/concurrent/ScheduleAt.txt index adf237f74..7ad13865d 100644 --- a/test/known-good/C/src/concurrent/ScheduleAt.txt +++ b/test/known-good/C/src/concurrent/ScheduleAt.txt @@ -5,14 +5,14 @@ * @author Soroush Bateni */ target C { - timeout: 1 sec, - keepalive: true + timeout: 1 sec, + keepalive: true } reactor Scheduler { logical action act // List of microsteps. Size = 16 - state microstep_delay_list: uint32_t[]( + state microstep_delay_list: uint32_t[]( 0, 1, 1, @@ -30,7 +30,7 @@ 4, 5 ) - state times: int[]( + state times: int[]( 0, 0, 0, @@ -49,8 +49,8 @@ 900 msec ) // Size = 9 - state action_hit_list_microstep: int[](1, 2, 0, 1, 0, 2, 3, 4, 5) - state action_hit_list_times: int[]( + state action_hit_list_microstep: int[](1, 2, 0, 1, 0, 2, 3, 4, 5) + state action_hit_list_times: int[]( 0, 0, 400 msec, @@ -62,7 +62,7 @@ 900 msec ) // Size = 9 - state action_hit_list_index: int(0) + state action_hit_list_index: int(0) reaction(startup) -> act {= for (int i=0; i < 16; i++) { diff --git a/test/known-good/C/src/concurrent/ScheduleTwice.txt b/test/known-good/C/src/concurrent/ScheduleTwice.txt index 61f9a7193..8e156520f 100644 --- a/test/known-good/C/src/concurrent/ScheduleTwice.txt +++ b/test/known-good/C/src/concurrent/ScheduleTwice.txt @@ -1,8 +1,8 @@ target C main reactor ScheduleTwice { - logical action a: int - state rc_count: int(0) + logical action a: int + state rc_count: int(0) preamble {= #define VERBOSE =} diff --git a/test/known-good/C/src/concurrent/ScheduleTwiceThreaded.txt b/test/known-good/C/src/concurrent/ScheduleTwiceThreaded.txt index e8a7687bb..4d5212de2 100644 --- a/test/known-good/C/src/concurrent/ScheduleTwiceThreaded.txt +++ b/test/known-good/C/src/concurrent/ScheduleTwiceThreaded.txt @@ -1,8 +1,8 @@ target C main reactor { - logical action a: int - state rc_count: int(0) + logical action a: int + state rc_count: int(0) reaction(startup) -> a {= lf_schedule_int(a, MSEC(100), 42); diff --git a/test/known-good/C/src/concurrent/SendingInsideThreaded.txt b/test/known-good/C/src/concurrent/SendingInsideThreaded.txt index 5d635439d..8dd262468 100644 --- a/test/known-good/C/src/concurrent/SendingInsideThreaded.txt +++ b/test/known-good/C/src/concurrent/SendingInsideThreaded.txt @@ -1,13 +1,13 @@ // This tests a reactor that contains another reactor and also has its own // reaction that routes inputs to the contained reactor. target C { - timeout: 10 sec, - fast: true + timeout: 10 sec, + fast: true } reactor Printer { - input x: int - state count: int(1) + input x: int + state count: int(1) reaction(x) {= printf("Inside reactor received: %d\n", x->value); @@ -20,7 +20,7 @@ } main reactor SendingInsideThreaded { - state count: int(0) + state count: int(0) timer t(0, 1 sec) p = new Printer() diff --git a/test/known-good/C/src/concurrent/StarvationThreaded.txt b/test/known-good/C/src/concurrent/StarvationThreaded.txt index 1f638e658..fe4fde094 100644 --- a/test/known-good/C/src/concurrent/StarvationThreaded.txt +++ b/test/known-good/C/src/concurrent/StarvationThreaded.txt @@ -7,10 +7,10 @@ */ target C -reactor SuperDenseSender(number_of_iterations: int(10)) { +reactor SuperDenseSender(number_of_iterations: int(10)) { logical action loop - output out: int - state iterator: int(0) + output out: int + state iterator: int(0) reaction(startup, loop) -> out {= if (self->iterator < self->number_of_iterations) { @@ -35,8 +35,8 @@ =} } -reactor SuperDenseReceiver(number_of_iterations: int(10)) { - input in: int +reactor SuperDenseReceiver(number_of_iterations: int(10)) { + input in: int reaction(in) {= tag_t current_tag = lf_tag(); @@ -62,8 +62,8 @@ } main reactor StarvationThreaded { - sender = new[8] SuperDenseSender() - receiver = new[8] SuperDenseReceiver() + sender = new[8] SuperDenseSender() + receiver = new[8] SuperDenseReceiver() sender.out -> receiver.in } diff --git a/test/known-good/C/src/concurrent/StopThreaded.txt b/test/known-good/C/src/concurrent/StopThreaded.txt index 77cdb951f..24936381c 100644 --- a/test/known-good/C/src/concurrent/StopThreaded.txt +++ b/test/known-good/C/src/concurrent/StopThreaded.txt @@ -5,15 +5,15 @@ * @author Soroush Bateni */ target C { - timeout: 11 msec, - build-type: RelWithDebInfo // logging: DEBUG + timeout: 11 msec, + build-type: RelWithDebInfo // logging: DEBUG } import Sender from "../lib/LoopedActionSender.lf" reactor Consumer { - input in: int - state reaction_invoked_correctly: bool(false) + input in: int + state reaction_invoked_correctly: bool(false) reaction(in) {= tag_t current_tag = lf_tag(); @@ -58,8 +58,8 @@ } main reactor { - consumer = new[4] Consumer() - producer = new[4] Sender(break_interval = 1 msec) + consumer = new[4] Consumer() + producer = new[4] Sender(break_interval = 1 msec) producer.out -> consumer.in } diff --git a/test/known-good/C/src/concurrent/StopZeroThreaded.txt b/test/known-good/C/src/concurrent/StopZeroThreaded.txt index d3fa9dcdc..e079f383c 100644 --- a/test/known-good/C/src/concurrent/StopZeroThreaded.txt +++ b/test/known-good/C/src/concurrent/StopZeroThreaded.txt @@ -7,8 +7,8 @@ target C reactor Sender { - output out: int - state reaction_invoked_correctly: bool(false) + output out: int + state reaction_invoked_correctly: bool(false) timer t(0, 1 usec) logical action act @@ -64,7 +64,7 @@ } reactor Receiver { - input in: int + input in: int reaction(in) {= printf("Received %d at (%lld, %u).\n", @@ -99,8 +99,8 @@ } main reactor StopZeroThreaded { - sender = new[4] Sender() - receiver = new[4] Receiver() + sender = new[4] Sender() + receiver = new[4] Receiver() sender.out -> receiver.in } diff --git a/test/known-good/C/src/concurrent/Threaded.txt b/test/known-good/C/src/concurrent/Threaded.txt index 13addcdcb..c799825ec 100644 --- a/test/known-good/C/src/concurrent/Threaded.txt +++ b/test/known-good/C/src/concurrent/Threaded.txt @@ -8,15 +8,15 @@ // complete 200 msec of logical time. See ThreadedMultiport for a parameterized // version of this. target C { - timeout: 2 sec, + timeout: 2 sec, // Disable compiler optimization so that TakeTime actually takes time. - flags: "" + flags: "" } reactor Source { timer t(0, 200 msec) - output out: int - state s: int(0) + output out: int + state s: int(0) reaction(t) -> out {= lf_set(out, self->s); @@ -25,8 +25,8 @@ } reactor TakeTime { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= // struct timespec sleep_time = {(time_t) 0, (long)200000000}; @@ -40,9 +40,9 @@ =} } -reactor Destination(width: int(4)) { - state s: int(400000000) - input[width] in: int +reactor Destination(width: int(4)) { + state s: int(400000000) + input[width] in: int reaction(in) {= int sum = 0; @@ -58,9 +58,9 @@ =} } -main reactor(width: int(4)) { +main reactor(width: int(4)) { a = new Source() - t = new[width] TakeTime() + t = new[width] TakeTime() (a.out)+ -> t.in b = new Destination(width = width) t.out -> b.in diff --git a/test/known-good/C/src/concurrent/ThreadedMultiport.txt b/test/known-good/C/src/concurrent/ThreadedMultiport.txt index 300680071..21d24cbbf 100644 --- a/test/known-good/C/src/concurrent/ThreadedMultiport.txt +++ b/test/known-good/C/src/concurrent/ThreadedMultiport.txt @@ -1,14 +1,14 @@ // Check multiport capabilities on Outputs. target C { - timeout: 2 sec, + timeout: 2 sec, // Disable compiler optimization so that TakeTime actually takes time. - flags: "" + flags: "" } -reactor Source(width: int(4)) { +reactor Source(width: int(4)) { timer t(0, 200 msec) - output[width] out: int - state s: int(0) + output[width] out: int + state s: int(0) reaction(t) -> out {= for(int i = 0; i < out_width; i++) { @@ -18,9 +18,9 @@ =} } -reactor Computation(iterations: int(100000000)) { - input in: int - output out: int +reactor Computation(iterations: int(100000000)) { + input in: int + output out: int reaction(in) -> out {= // struct timespec sleep_time = {(time_t) 0, (long)200000000}; @@ -34,9 +34,9 @@ =} } -reactor Destination(width: int(4), iterations: int(100000000)) { - state s: int(0) - input[width] in: int +reactor Destination(width: int(4), iterations: int(100000000)) { + state s: int(0) + input[width] in: int reaction(in) {= int expected = self->iterations * self->width + self->s; @@ -61,9 +61,9 @@ =} } -main reactor ThreadedMultiport(width: int(4), iterations: int(100000000)) { +main reactor ThreadedMultiport(width: int(4), iterations: int(100000000)) { a = new Source(width = width) - t = new[width] Computation(iterations = iterations) + t = new[width] Computation(iterations = iterations) b = new Destination(width = width, iterations = iterations) a.out -> t.in t.out -> b.in diff --git a/test/known-good/C/src/concurrent/ThreadedThreaded.txt b/test/known-good/C/src/concurrent/ThreadedThreaded.txt index ee0f0c0d5..10f45c087 100644 --- a/test/known-good/C/src/concurrent/ThreadedThreaded.txt +++ b/test/known-good/C/src/concurrent/ThreadedThreaded.txt @@ -6,16 +6,16 @@ // completing 800 msec of work in about 225 msec. See ThreadedMultiport for a // parameterized version of this. target C { - timeout: 2 sec, - tracing: true, + timeout: 2 sec, + tracing: true, // Disable compiler optimization so that TakeTime actually takes time. - flags: "" + flags: "" } reactor Source { timer t(0, 200 msec) - output out: int - state s: int(0) + output out: int + state s: int(0) reaction(t) -> out {= lf_set(out, self->s); @@ -24,8 +24,8 @@ } reactor TakeTime { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= // struct timespec sleep_time = {(time_t) 0, (long)200000000}; @@ -39,9 +39,9 @@ =} } -reactor Destination(width: int(4)) { - state s: int(400000000) - input[width] in: int +reactor Destination(width: int(4)) { + state s: int(400000000) + input[width] in: int reaction(in) {= int sum = 0; @@ -57,9 +57,9 @@ =} } -main reactor ThreadedThreaded(width: int(4)) { +main reactor ThreadedThreaded(width: int(4)) { a = new Source() - t = new[width] TakeTime() + t = new[width] TakeTime() (a.out)+ -> t.in b = new Destination(width = width) t.out -> b.in diff --git a/test/known-good/C/src/concurrent/TimeLimitThreaded.txt b/test/known-good/C/src/concurrent/TimeLimitThreaded.txt index 508d5d228..483670ca3 100644 --- a/test/known-good/C/src/concurrent/TimeLimitThreaded.txt +++ b/test/known-good/C/src/concurrent/TimeLimitThreaded.txt @@ -1,13 +1,13 @@ // Test that the stop function can be used to internally impose a a time limit. // Correct output for this 1, 2, 3, 4. Failure for this test is failing to halt. target C { - fast: true + fast: true } -reactor Clock(offset: time(0), period: time(1 sec)) { - output y: int +reactor Clock(offset: time(0), period: time(1 sec)) { + output y: int timer t(offset, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= (self->count)++; @@ -17,8 +17,8 @@ } reactor Destination { - input x: int - state s: int(1) + input x: int + state s: int(1) reaction(x) {= // printf("%d\n", x->value); @@ -38,7 +38,7 @@ =} } -main reactor(period: time(1 sec)) { +main reactor(period: time(1 sec)) { timer stop(10 sec) c = new Clock(period = period) d = new Destination() diff --git a/test/known-good/C/src/concurrent/TimeoutThreaded.txt b/test/known-good/C/src/concurrent/TimeoutThreaded.txt index 62c0ec162..e9933eee2 100644 --- a/test/known-good/C/src/concurrent/TimeoutThreaded.txt +++ b/test/known-good/C/src/concurrent/TimeoutThreaded.txt @@ -5,14 +5,14 @@ * @author Soroush Bateni */ target C { - timeout: 11 msec + timeout: 11 msec } import Sender from "../lib/LoopedActionSender.lf" reactor Consumer { - input in: int - state success: bool(false) + input in: int + state success: bool(false) reaction(in) {= tag_t current_tag = lf_tag(); @@ -42,8 +42,8 @@ } main reactor { - consumer = new[4] Consumer() - producer = new[4] Sender(break_interval = 1 msec) + consumer = new[4] Consumer() + producer = new[4] Sender(break_interval = 1 msec) producer.out -> consumer.in } diff --git a/test/known-good/C/src/concurrent/TimeoutZeroThreaded.txt b/test/known-good/C/src/concurrent/TimeoutZeroThreaded.txt index 45484d1ba..c15204724 100644 --- a/test/known-good/C/src/concurrent/TimeoutZeroThreaded.txt +++ b/test/known-good/C/src/concurrent/TimeoutZeroThreaded.txt @@ -5,14 +5,14 @@ * @author Soroush Bateni */ target C { - timeout: 0 sec + timeout: 0 sec } import Sender from "../lib/LoopedActionSender.lf" reactor Consumer { - input in: int - state success: bool(false) + input in: int + state success: bool(false) reaction(in) {= tag_t current_tag = lf_tag(); @@ -42,8 +42,8 @@ } main reactor { - consumer = new[4] Consumer() - producer = new[4] Sender(break_interval = 1 msec) + consumer = new[4] Consumer() + producer = new[4] Sender(break_interval = 1 msec) producer.out -> consumer.in } diff --git a/test/known-good/C/src/concurrent/Tracing.txt b/test/known-good/C/src/concurrent/Tracing.txt index cf026b49e..acfdff7a9 100644 --- a/test/known-good/C/src/concurrent/Tracing.txt +++ b/test/known-good/C/src/concurrent/Tracing.txt @@ -1,16 +1,16 @@ // Version of ThreadedThreaded used to test tracing functions. target C { - timeout: 2 sec, - tracing: true, + timeout: 2 sec, + tracing: true, // Disable compiler optimization so that TakeTime actually takes time. - flags: "", - logging: DEBUG + flags: "", + logging: DEBUG } reactor Source { timer t(0, 200 msec) - output out: int - state s: int(0) + output out: int + state s: int(0) reaction(t) -> out {= lf_set(out, self->s); @@ -18,10 +18,10 @@ =} } -reactor TakeTime(bank_index: int(0)) { - input in: int - output out: int - state event: char*("No ID") +reactor TakeTime(bank_index: int(0)) { + input in: int + output out: int + state event: char*("No ID") reaction(startup) {= // Construct an id string for a user trace event. @@ -57,10 +57,10 @@ =} } -reactor Destination(width: int(4)) { - state s: int(400000000) - state count: int(0) - input[width] in: int +reactor Destination(width: int(4)) { + state s: int(400000000) + state count: int(0) + input[width] in: int reaction(startup) {= // Register the user value event. @@ -86,9 +86,9 @@ =} } -main reactor(width: int(4)) { +main reactor(width: int(4)) { a = new Source() - t = new[width] TakeTime() + t = new[width] TakeTime() (a.out)+ -> t.in b = new Destination(width = width) t.out -> b.in diff --git a/test/known-good/C/src/concurrent/Workers.txt b/test/known-good/C/src/concurrent/Workers.txt index e8a7f3526..5b3d3937d 100644 --- a/test/known-good/C/src/concurrent/Workers.txt +++ b/test/known-good/C/src/concurrent/Workers.txt @@ -1,5 +1,5 @@ target C { - workers: 16 + workers: 16 } main reactor { diff --git a/test/known-good/C/src/docker/FilesPropertyContainerized.txt b/test/known-good/C/src/docker/FilesPropertyContainerized.txt index 10c99119e..96327f8de 100644 --- a/test/known-good/C/src/docker/FilesPropertyContainerized.txt +++ b/test/known-good/C/src/docker/FilesPropertyContainerized.txt @@ -1,6 +1,6 @@ target C { - files: "../include/hello.h", - docker: true + files: "../include/hello.h", + docker: true } preamble {= diff --git a/test/known-good/C/src/docker/HelloWorldContainerized.txt b/test/known-good/C/src/docker/HelloWorldContainerized.txt index 96ac1bfe1..e6664e5f8 100644 --- a/test/known-good/C/src/docker/HelloWorldContainerized.txt +++ b/test/known-good/C/src/docker/HelloWorldContainerized.txt @@ -1,11 +1,11 @@ target C { - tracing: { // To test generating a custom trace file name. - trace-file-name: "HelloWorldTrace" + tracing: { // To test generating a custom trace file name. + trace-file-name: "HelloWorldTrace" }, - logging: error, - docker: true, - build-type: Debug -} + logging: error, + docker: true, + build-type: Debug +} import HelloWorld2 from "../HelloWorld.lf" diff --git a/test/known-good/C/src/docker/PingPongContainerized.txt b/test/known-good/C/src/docker/PingPongContainerized.txt index 411700071..75864c96c 100644 --- a/test/known-good/C/src/docker/PingPongContainerized.txt +++ b/test/known-good/C/src/docker/PingPongContainerized.txt @@ -21,8 +21,8 @@ * @author Edward A. Lee */ target C { - fast: true, - docker: true + fast: true, + docker: true } import Ping from "../PingPong.lf" diff --git a/test/known-good/C/src/docker/federated/DistributedCountContainerized.txt b/test/known-good/C/src/docker/federated/DistributedCountContainerized.txt index 64980e626..c29566e2e 100644 --- a/test/known-good/C/src/docker/federated/DistributedCountContainerized.txt +++ b/test/known-good/C/src/docker/federated/DistributedCountContainerized.txt @@ -6,16 +6,16 @@ * @author Edward A. Lee */ target C { - timeout: 5 sec, - logging: DEBUG, - coordination: centralized, - docker: true + timeout: 5 sec, + logging: DEBUG, + coordination: centralized, + docker: true } import Count from "../../lib/Count.lf" import Print from "../../federated/DistributedCount.lf" -federated reactor DistributedCountContainerized(offset: time(200 msec)) at rti { +federated reactor DistributedCountContainerized(offset: time(200 msec)) at rti { c = new Count() p = new Print() c.out -> p.in after offset diff --git a/test/known-good/C/src/docker/federated/DistributedDoublePortContainerized.txt b/test/known-good/C/src/docker/federated/DistributedDoublePortContainerized.txt index ee1c31623..de31a6e2b 100644 --- a/test/known-good/C/src/docker/federated/DistributedDoublePortContainerized.txt +++ b/test/known-good/C/src/docker/federated/DistributedDoublePortContainerized.txt @@ -6,10 +6,10 @@ * @author Soroush Bateni */ target C { - timeout: 900 msec, - logging: DEBUG, - coordination: centralized, - docker: true + timeout: 900 msec, + logging: DEBUG, + coordination: centralized, + docker: true } import Count from "../../lib/Count.lf" diff --git a/test/known-good/C/src/docker/federated/DistributedMultiportContainerized.txt b/test/known-good/C/src/docker/federated/DistributedMultiportContainerized.txt index 605e3d936..97a42a168 100644 --- a/test/known-good/C/src/docker/federated/DistributedMultiportContainerized.txt +++ b/test/known-good/C/src/docker/federated/DistributedMultiportContainerized.txt @@ -1,8 +1,8 @@ // Check multiport connections between federates. target C { - timeout: 1 sec, - coordination: centralized, - docker: true + timeout: 1 sec, + coordination: centralized, + docker: true } import Source, Destination from "../../federated/DistributedMultiport.lf" diff --git a/test/known-good/C/src/docker/federated/DistributedStopDecentralizedContainerized.txt b/test/known-good/C/src/docker/federated/DistributedStopDecentralizedContainerized.txt index 7c1570512..dd6abdf23 100644 --- a/test/known-good/C/src/docker/federated/DistributedStopDecentralizedContainerized.txt +++ b/test/known-good/C/src/docker/federated/DistributedStopDecentralizedContainerized.txt @@ -5,8 +5,8 @@ * @author Soroush Bateni */ target C { - coordination: decentralized, - docker: true + coordination: decentralized, + docker: true } import Sender, Receiver from "../../federated/DistributedStop.lf" diff --git a/test/known-good/C/src/federated/BroadcastFeedback.txt b/test/known-good/C/src/federated/BroadcastFeedback.txt index ea74808d7..bbc96dcf7 100644 --- a/test/known-good/C/src/federated/BroadcastFeedback.txt +++ b/test/known-good/C/src/federated/BroadcastFeedback.txt @@ -2,14 +2,14 @@ * This tests an output that is broadcast back to a multiport input of a bank. */ target C { - timeout: 1 sec, - build-type: RelWithDebInfo + timeout: 1 sec, + build-type: RelWithDebInfo } reactor SenderAndReceiver { - output out: int - input[2] in: int - state received: bool(false) + output out: int + input[2] in: int + state received: bool(false) reaction(startup) -> out {= lf_set(out, 42); =} @@ -28,7 +28,7 @@ } federated reactor { - s = new[2] SenderAndReceiver() + s = new[2] SenderAndReceiver() (s.out)+ -> s.in } diff --git a/test/known-good/C/src/federated/BroadcastFeedbackWithHierarchy.txt b/test/known-good/C/src/federated/BroadcastFeedbackWithHierarchy.txt index 37f26e681..5a00b4291 100644 --- a/test/known-good/C/src/federated/BroadcastFeedbackWithHierarchy.txt +++ b/test/known-good/C/src/federated/BroadcastFeedbackWithHierarchy.txt @@ -2,13 +2,13 @@ * This tests an output that is broadcast back to a multiport input of a bank. */ target C { - timeout: 1 sec + timeout: 1 sec } reactor SenderAndReceiver { - output out: int - input[2] in: int - state received: bool(false) + output out: int + input[2] in: int + state received: bool(false) r = new Receiver() in -> r.in @@ -17,8 +17,8 @@ } reactor Receiver { - input[2] in: int - state received: bool(false) + input[2] in: int + state received: bool(false) reaction(in) {= if (in[0]->is_present && in[1]->is_present && in[0]->value == 42 && in[1]->value == 42) { @@ -35,7 +35,7 @@ } federated reactor { - s = new[2] SenderAndReceiver() + s = new[2] SenderAndReceiver() (s.out)+ -> s.in } diff --git a/test/known-good/C/src/federated/ChainWithDelay.txt b/test/known-good/C/src/federated/ChainWithDelay.txt index f4a208440..c1d4c964f 100644 --- a/test/known-good/C/src/federated/ChainWithDelay.txt +++ b/test/known-good/C/src/federated/ChainWithDelay.txt @@ -4,7 +4,7 @@ * @author Edward A. Lee */ target C { - timeout: 3 msec + timeout: 3 msec } import Count from "../lib/Count.lf" diff --git a/test/known-good/C/src/federated/CycleDetection.txt b/test/known-good/C/src/federated/CycleDetection.txt index b4be8b9b7..8cfba0ce7 100644 --- a/test/known-good/C/src/federated/CycleDetection.txt +++ b/test/known-good/C/src/federated/CycleDetection.txt @@ -6,13 +6,13 @@ target C reactor CAReplica { - input local_update: int - input remote_update: int - input query: int + input local_update: int + input remote_update: int + input query: int - state balance: int(0) + state balance: int(0) - output response: int + output response: int reaction(local_update, remote_update) {= if (local_update->is_present) { @@ -27,8 +27,8 @@ } reactor UserInput { - input balance: int - output deposit: int + input balance: int + output deposit: int reaction(startup) -> deposit {= lf_set(deposit, 100); =} diff --git a/test/known-good/C/src/federated/DecentralizedP2PComm.txt b/test/known-good/C/src/federated/DecentralizedP2PComm.txt index 97c37b0b1..8191008a6 100644 --- a/test/known-good/C/src/federated/DecentralizedP2PComm.txt +++ b/test/known-good/C/src/federated/DecentralizedP2PComm.txt @@ -1,20 +1,20 @@ target C { - timeout: 1 sec, - tracing: true, - clock-sync: off, - coordination: decentralized + timeout: 1 sec, + tracing: true, + clock-sync: off, + coordination: decentralized } reactor Platform( - start: int(0), - expected_start: int(0), - stp_offset_param: time(0) + start: int(0), + expected_start: int(0), + stp_offset_param: time(0) ) { - input in: int - output out: int + input in: int + output out: int timer t(0, 100 msec) - state count: int(start) - state expected: int(expected_start) + state count: int(start) + state expected: int(expected_start) reaction(t) -> out {= lf_set(out, self->count++); =} diff --git a/test/known-good/C/src/federated/DecentralizedP2PUnbalancedTimeout.txt b/test/known-good/C/src/federated/DecentralizedP2PUnbalancedTimeout.txt index 6e2911ac1..58b1b39ed 100644 --- a/test/known-good/C/src/federated/DecentralizedP2PUnbalancedTimeout.txt +++ b/test/known-good/C/src/federated/DecentralizedP2PUnbalancedTimeout.txt @@ -7,14 +7,14 @@ * The test fails if the federation does not exit. */ target C { - timeout: 1 msec, - coordination: decentralized + timeout: 1 msec, + coordination: decentralized } -reactor Clock(offset: time(0), period: time(1 sec)) { - output y: int +reactor Clock(offset: time(0), period: time(1 sec)) { + output y: int timer t(offset, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= (self->count)++; @@ -28,8 +28,8 @@ } reactor Destination { - input x: int - state s: int(1) + input x: int + state s: int(1) reaction(x) {= lf_print("Received %d", x->value); @@ -48,7 +48,7 @@ =} } -federated reactor(period: time(10 usec)) { +federated reactor(period: time(10 usec)) { c = new Clock(period = period) d = new Destination() c.y -> d.x diff --git a/test/known-good/C/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.txt b/test/known-good/C/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.txt index 5f55d2212..b6931b9c9 100644 --- a/test/known-good/C/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.txt +++ b/test/known-good/C/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.txt @@ -8,14 +8,14 @@ * physical connection between source and destination. */ target C { - timeout: 1 msec, - coordination: decentralized + timeout: 1 msec, + coordination: decentralized } -reactor Clock(offset: time(0), period: time(1 sec)) { - output y: int +reactor Clock(offset: time(0), period: time(1 sec)) { + output y: int timer t(offset, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= (self->count)++; @@ -29,8 +29,8 @@ } reactor Destination { - input x: int - state s: int(1) + input x: int + state s: int(1) reaction(x) {= // printf("%d\n", x->value); @@ -46,7 +46,7 @@ =} } -federated reactor(period: time(10 usec)) { +federated reactor(period: time(10 usec)) { c = new Clock(period = period) d = new Destination() c.y ~> d.x diff --git a/test/known-good/C/src/federated/DistributedBank.txt b/test/known-good/C/src/federated/DistributedBank.txt index a542a2027..801968a99 100644 --- a/test/known-good/C/src/federated/DistributedBank.txt +++ b/test/known-good/C/src/federated/DistributedBank.txt @@ -1,12 +1,12 @@ // Check bank of federates. target C { - timeout: 1 sec, - coordination: centralized + timeout: 1 sec, + coordination: centralized } reactor Node { timer t(0, 100 msec) - state count: int(0) + state count: int(0) reaction(t) {= lf_print("Hello world %d.", self->count++); =} @@ -18,6 +18,6 @@ } federated reactor DistributedBank { - n = new[2] Node() + n = new[2] Node() } diff --git a/test/known-good/C/src/federated/DistributedBankToMultiport.txt b/test/known-good/C/src/federated/DistributedBankToMultiport.txt index 6a71d11c1..a971f804c 100644 --- a/test/known-good/C/src/federated/DistributedBankToMultiport.txt +++ b/test/known-good/C/src/federated/DistributedBankToMultiport.txt @@ -1,13 +1,13 @@ // Check multiport to bank connections between federates. target C { - timeout: 3 sec + timeout: 3 sec } import Count from "../lib/Count.lf" reactor Destination { - input[2] in: int - state count: int(1) + input[2] in: int + state count: int(1) reaction(in) {= for (int i = 0; i < in_width; i++) { @@ -27,7 +27,7 @@ } federated reactor { - s = new[2] Count() + s = new[2] Count() d = new Destination() s.out -> d.in } diff --git a/test/known-good/C/src/federated/DistributedCount.txt b/test/known-good/C/src/federated/DistributedCount.txt index 08536a889..b5a821562 100644 --- a/test/known-good/C/src/federated/DistributedCount.txt +++ b/test/known-good/C/src/federated/DistributedCount.txt @@ -6,15 +6,15 @@ * @author Edward A. Lee */ target C { - timeout: 5 sec, - coordination: centralized + timeout: 5 sec, + coordination: centralized } import Count from "../lib/Count.lf" reactor Print { - input in: int - state c: int(1) + input in: int + state c: int(1) reaction(in) {= interval_t elapsed_time = lf_time_logical_elapsed(); @@ -35,7 +35,7 @@ =} } -federated reactor DistributedCount(offset: time(200 msec)) { +federated reactor DistributedCount(offset: time(200 msec)) { c = new Count() p = new Print() c.out -> p.in after offset diff --git a/test/known-good/C/src/federated/DistributedCountDecentralized.txt b/test/known-good/C/src/federated/DistributedCountDecentralized.txt index ac77d768c..278628cf0 100644 --- a/test/known-good/C/src/federated/DistributedCountDecentralized.txt +++ b/test/known-good/C/src/federated/DistributedCountDecentralized.txt @@ -6,15 +6,15 @@ * @author Edward A. Lee */ target C { - timeout: 5 sec, - coordination: decentralized + timeout: 5 sec, + coordination: decentralized } import Count from "../lib/Count.lf" reactor Print { - input in: int - state c: int(1) + input in: int + state c: int(1) reaction(in) {= interval_t elapsed_time = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/federated/DistributedCountDecentralizedLate.txt b/test/known-good/C/src/federated/DistributedCountDecentralizedLate.txt index d538dec97..d155e5ccb 100644 --- a/test/known-good/C/src/federated/DistributedCountDecentralizedLate.txt +++ b/test/known-good/C/src/federated/DistributedCountDecentralizedLate.txt @@ -7,20 +7,20 @@ * @author Soroush Bateni */ target C { - timeout: 4900 msec, - coordination: decentralized + timeout: 4900 msec, + coordination: decentralized } import Count from "../lib/Count.lf" reactor Print { - input in: int // STP () - state success: int(0) // STP(in, 30 msec); - state success_stp_violation: int(0) + input in: int // STP () + state success: int(0) // STP(in, 30 msec); + state success_stp_violation: int(0) // Force a timer to be invoke periodically to ensure logical time will // advance in the absence of incoming messages. timer t(0, 10 msec) - state c: int(0) + state c: int(0) reaction(in) {= tag_t current_tag = lf_tag(); diff --git a/test/known-good/C/src/federated/DistributedCountDecentralizedLateHierarchy.txt b/test/known-good/C/src/federated/DistributedCountDecentralizedLateHierarchy.txt index 396914da1..546aca25f 100644 --- a/test/known-good/C/src/federated/DistributedCountDecentralizedLateHierarchy.txt +++ b/test/known-good/C/src/federated/DistributedCountDecentralizedLateHierarchy.txt @@ -9,20 +9,20 @@ * @author Soroush Bateni */ target C { - timeout: 4900 msec, - coordination: decentralized + timeout: 4900 msec, + coordination: decentralized } import Count from "../lib/Count.lf" reactor ImportantActuator { - input in: int - state success: int(0) - state success_stp_violation: int(0) + input in: int + state success: int(0) + state success_stp_violation: int(0) // Force a timer to be invoke periodically timer t(0, 10 msec) // to ensure logical time will advance in the absence of incoming messages. - state c: int(0) + state c: int(0) reaction(in) {= tag_t current_tag = lf_tag(); @@ -61,7 +61,7 @@ } reactor Print { - input in: int + input in: int reaction(in) {= tag_t current_tag = lf_tag(); @@ -75,11 +75,11 @@ } reactor Receiver { - input in: int + input in: int // Force a timer to be invoke periodically timer t(0, 10 msec) // to ensure logical time will advance in the absence of incoming messages. - state c: int(0) + state c: int(0) p = new Print() a = new ImportantActuator() in -> p.in diff --git a/test/known-good/C/src/federated/DistributedCountPhysical.txt b/test/known-good/C/src/federated/DistributedCountPhysical.txt index d84451ad7..c8c0e5fa4 100644 --- a/test/known-good/C/src/federated/DistributedCountPhysical.txt +++ b/test/known-good/C/src/federated/DistributedCountPhysical.txt @@ -8,13 +8,13 @@ * @author Soroush Bateni */ target C { - timeout: 1 sec + timeout: 1 sec } reactor Count { timer t(200 msec, 1 sec) - state s: int(0) - output out: int + state s: int(0) + output out: int reaction(t) -> out {= lf_set(out, self->s); @@ -23,8 +23,8 @@ } reactor Print { - input in: int - state c: int(0) + input in: int + state c: int(0) reaction(in) {= interval_t elapsed_time = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/federated/DistributedCountPhysicalAfterDelay.txt b/test/known-good/C/src/federated/DistributedCountPhysicalAfterDelay.txt index 9370d1f62..dd764554d 100644 --- a/test/known-good/C/src/federated/DistributedCountPhysicalAfterDelay.txt +++ b/test/known-good/C/src/federated/DistributedCountPhysicalAfterDelay.txt @@ -11,8 +11,8 @@ import Count from "../lib/Count.lf" reactor Print { - input in: int - state c: int(1) + input in: int + state c: int(1) reaction(in) {= interval_t elapsed_time = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/federated/DistributedCountPhysicalDecentralized.txt b/test/known-good/C/src/federated/DistributedCountPhysicalDecentralized.txt index 9e8ac872d..e3be619a8 100644 --- a/test/known-good/C/src/federated/DistributedCountPhysicalDecentralized.txt +++ b/test/known-good/C/src/federated/DistributedCountPhysicalDecentralized.txt @@ -8,14 +8,14 @@ * @author Soroush Bateni */ target C { - timeout: 1 sec, - coordination: decentralized + timeout: 1 sec, + coordination: decentralized } reactor Count { timer t(200 msec, 1 sec) - state s: int(0) - output out: int + state s: int(0) + output out: int reaction(t) -> out {= lf_set(out, self->s); @@ -24,8 +24,8 @@ } reactor Print { - input in: int - state c: int(0) + input in: int + state c: int(0) reaction(in) {= interval_t elapsed_time = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/federated/DistributedDoublePort.txt b/test/known-good/C/src/federated/DistributedDoublePort.txt index 425edd89a..a8b0888b9 100644 --- a/test/known-good/C/src/federated/DistributedDoublePort.txt +++ b/test/known-good/C/src/federated/DistributedDoublePort.txt @@ -6,17 +6,17 @@ * @author Soroush Bateni */ target C { - timeout: 900 msec, - logging: DEBUG, - coordination: centralized + timeout: 900 msec, + logging: DEBUG, + coordination: centralized } import Count from "../lib/Count.lf" reactor CountMicrostep { - state count: int(1) - output out: int - logical action act: int + state count: int(1) + output out: int + logical action act: int timer t(0, 1 sec) reaction(t) -> act {= lf_schedule_int(act, 0, self->count++); =} @@ -25,8 +25,8 @@ } reactor Print { - input in: int - input in2: int + input in: int + input in2: int reaction(in, in2) {= interval_t elapsed_time = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/federated/DistributedLogicalActionUpstreamLong.txt b/test/known-good/C/src/federated/DistributedLogicalActionUpstreamLong.txt index 3e930d785..47eac9329 100644 --- a/test/known-good/C/src/federated/DistributedLogicalActionUpstreamLong.txt +++ b/test/known-good/C/src/federated/DistributedLogicalActionUpstreamLong.txt @@ -3,17 +3,17 @@ * properly handled in a long chain of federates. */ target C { - timeout: 1 msec + timeout: 1 msec } import PassThrough from "../lib/PassThrough.lf" import TestCount from "../lib/TestCount.lf" reactor WithLogicalAction { - output out: int - state thread_id: lf_thread_t(0) - state counter: int(1) - logical action act(0): int + output out: int + state thread_id: lf_thread_t(0) + state counter: int(1) + logical action act(0): int reaction(startup, act) -> act, out {= lf_set(out, self->counter); diff --git a/test/known-good/C/src/federated/DistributedLoopedAction.txt b/test/known-good/C/src/federated/DistributedLoopedAction.txt index 868a8b610..9fc296951 100644 --- a/test/known-good/C/src/federated/DistributedLoopedAction.txt +++ b/test/known-good/C/src/federated/DistributedLoopedAction.txt @@ -5,16 +5,16 @@ * @author Soroush Bateni */ target C { - timeout: 1 sec + timeout: 1 sec } import Sender from "../lib/LoopedActionSender.lf" -reactor Receiver(take_a_break_after: int(10), break_interval: time(400 msec)) { - input in: int - state received_messages: int(0) - state total_received_messages: int(0) - state breaks: int(0) +reactor Receiver(take_a_break_after: int(10), break_interval: time(400 msec)) { + input in: int + state received_messages: int(0) + state total_received_messages: int(0) + state breaks: int(0) timer t(0, 1 msec) // This will impact the performance // but forces the logical time to advance Comment this line for a more diff --git a/test/known-good/C/src/federated/DistributedLoopedActionDecentralized.txt b/test/known-good/C/src/federated/DistributedLoopedActionDecentralized.txt index ca2103312..d85ca0067 100644 --- a/test/known-good/C/src/federated/DistributedLoopedActionDecentralized.txt +++ b/test/known-good/C/src/federated/DistributedLoopedActionDecentralized.txt @@ -14,17 +14,17 @@ * @author Soroush Bateni */ target C { - timeout: 1 sec, - coordination: decentralized + timeout: 1 sec, + coordination: decentralized } import Sender from "../lib/LoopedActionSender.lf" -reactor Receiver(take_a_break_after: int(10), break_interval: time(400 msec)) { - input in: int - state received_messages: int(0) - state total_received_messages: int(0) - state breaks: int(0) +reactor Receiver(take_a_break_after: int(10), break_interval: time(400 msec)) { + input in: int + state received_messages: int(0) + state total_received_messages: int(0) + state breaks: int(0) reaction(in) {= tag_t current_tag = lf_tag(); @@ -77,12 +77,12 @@ } reactor STPReceiver( - take_a_break_after: int(10), - break_interval: time(400 msec), - stp_offset: time(0) + take_a_break_after: int(10), + break_interval: time(400 msec), + stp_offset: time(0) ) { - input in: int - state last_time_updated_stp: time(0) + input in: int + state last_time_updated_stp: time(0) receiver = new Receiver(take_a_break_after = 10, break_interval = 400 msec) timer t(0, 1 msec) // Force advancement of logical time diff --git a/test/known-good/C/src/federated/DistributedLoopedPhysicalAction.txt b/test/known-good/C/src/federated/DistributedLoopedPhysicalAction.txt index 765f34775..ee5e89c1c 100644 --- a/test/known-good/C/src/federated/DistributedLoopedPhysicalAction.txt +++ b/test/known-good/C/src/federated/DistributedLoopedPhysicalAction.txt @@ -10,16 +10,16 @@ * @author Soroush Bateni */ target C { - timeout: 1 sec, - coordination-options: { // Silences warning. - advance-message-interval: 10 msec + timeout: 1 sec, + coordination-options: { // Silences warning. + advance-message-interval: 10 msec } } -reactor Sender(take_a_break_after: int(10), break_interval: time(550 msec)) { - output out: int +reactor Sender(take_a_break_after: int(10), break_interval: time(550 msec)) { + output out: int physical action act - state sent_messages: int(0) + state sent_messages: int(0) reaction(startup, act) -> act, out {= // Send a message on out @@ -35,11 +35,11 @@ =} } -reactor Receiver(take_a_break_after: int(10), break_interval: time(550 msec)) { - input in: int - state received_messages: int(0) - state total_received_messages: int(0) - state breaks: int(0) +reactor Receiver(take_a_break_after: int(10), break_interval: time(550 msec)) { + input in: int + state received_messages: int(0) + state total_received_messages: int(0) + state breaks: int(0) timer t(0, 1 msec) // This will impact the performance // but forces the logical time to advance Comment this line for a more diff --git a/test/known-good/C/src/federated/DistributedLoopedPhysicalActionDecentralized.txt b/test/known-good/C/src/federated/DistributedLoopedPhysicalActionDecentralized.txt index aad18e6fd..83662bda6 100644 --- a/test/known-good/C/src/federated/DistributedLoopedPhysicalActionDecentralized.txt +++ b/test/known-good/C/src/federated/DistributedLoopedPhysicalActionDecentralized.txt @@ -5,8 +5,8 @@ * @author Soroush Bateni */ target C { - timeout: 1 sec, - coordination: decentralized + timeout: 1 sec, + coordination: decentralized } import Sender, Receiver from "DistributedLoopedPhysicalAction.lf" diff --git a/test/known-good/C/src/federated/DistributedMultiport.txt b/test/known-good/C/src/federated/DistributedMultiport.txt index 450021370..4627a3f76 100644 --- a/test/known-good/C/src/federated/DistributedMultiport.txt +++ b/test/known-good/C/src/federated/DistributedMultiport.txt @@ -1,13 +1,13 @@ // Check multiport connections between federates. target C { - timeout: 1 sec, - coordination: centralized + timeout: 1 sec, + coordination: centralized } reactor Source { - output[4] out: int + output[4] out: int timer t(0, 100 msec) - state count: int(0) + state count: int(0) reaction(t) -> out {= for (int i = 0; i < out_width; i++) { @@ -17,8 +17,8 @@ } reactor Destination { - input[4] in: int - state count: int(0) + input[4] in: int + state count: int(0) reaction(in) {= for (int i = 0; i < in_width; i++) { diff --git a/test/known-good/C/src/federated/DistributedMultiportToBank.txt b/test/known-good/C/src/federated/DistributedMultiportToBank.txt index 3af49907b..09ed55cb0 100644 --- a/test/known-good/C/src/federated/DistributedMultiportToBank.txt +++ b/test/known-good/C/src/federated/DistributedMultiportToBank.txt @@ -1,12 +1,12 @@ // Check multiport to bank connections between federates. target C { - timeout: 1 sec + timeout: 1 sec } reactor Source { - output[2] out: int + output[2] out: int timer t(0, 100 msec) - state count: int(0) + state count: int(0) reaction(t) -> out {= for (int i = 0; i < out_width; i++) { @@ -17,8 +17,8 @@ } reactor Destination { - input in: int - state count: int(0) + input in: int + state count: int(0) reaction(in) {= lf_print("Received %d.", in->value); @@ -36,7 +36,7 @@ federated reactor DistributedMultiportToBank { s = new Source() - d = new[2] Destination() + d = new[2] Destination() s.out -> d.in } diff --git a/test/known-good/C/src/federated/DistributedMultiportToken.txt b/test/known-good/C/src/federated/DistributedMultiportToken.txt index 605a11c0a..ebed96eb7 100644 --- a/test/known-good/C/src/federated/DistributedMultiportToken.txt +++ b/test/known-good/C/src/federated/DistributedMultiportToken.txt @@ -1,14 +1,14 @@ // Check multiport connections between federates where the message is carried by // a Token (in this case, with an array of char). target C { - timeout: 1 sec, - coordination: centralized + timeout: 1 sec, + coordination: centralized } reactor Source { - output[4] out: char* + output[4] out: char* timer t(0, 200 msec) - state count: int(0) + state count: int(0) reaction(t) -> out {= for (int i = 0; i < out_width; i++) { @@ -28,7 +28,7 @@ } reactor Destination { - input[4] in: char* + input[4] in: char* reaction(in) {= for (int i = 0; i < in_width; i++) { diff --git a/test/known-good/C/src/federated/DistributedNetworkOrder.txt b/test/known-good/C/src/federated/DistributedNetworkOrder.txt index 1962e5f91..8bb889ab6 100644 --- a/test/known-good/C/src/federated/DistributedNetworkOrder.txt +++ b/test/known-good/C/src/federated/DistributedNetworkOrder.txt @@ -9,12 +9,12 @@ * @author Soroush Bateni */ target C { - timeout: 1 sec, - build-type: RelWithDebInfo // Release with debug info + timeout: 1 sec, + build-type: RelWithDebInfo // Release with debug info } reactor Sender { - output out: int + output out: int timer t(0, 1 msec) reaction(t) -> out {= @@ -31,8 +31,8 @@ } reactor Receiver { - input in: int - state success: int(0) + input in: int + state success: int(0) reaction(in) {= tag_t current_tag = lf_tag(); diff --git a/test/known-good/C/src/federated/DistributedPhysicalActionUpstream.txt b/test/known-good/C/src/federated/DistributedPhysicalActionUpstream.txt index ace6b3b62..c2210b5e6 100644 --- a/test/known-good/C/src/federated/DistributedPhysicalActionUpstream.txt +++ b/test/known-good/C/src/federated/DistributedPhysicalActionUpstream.txt @@ -3,9 +3,9 @@ * properly handled in federated execution. */ target C { - timeout: 10 secs, - coordination-options: { - advance-message-interval: 30 msec + timeout: 10 secs, + coordination-options: { + advance-message-interval: 30 msec } } @@ -29,9 +29,9 @@ =} reactor WithPhysicalAction { - output out: int - state thread_id: lf_thread_t(0) - physical action act(0): int + output out: int + state thread_id: lf_thread_t(0) + physical action act(0): int reaction(startup) -> act {= // start new thread, provide callback diff --git a/test/known-good/C/src/federated/DistributedPhysicalActionUpstreamLong.txt b/test/known-good/C/src/federated/DistributedPhysicalActionUpstreamLong.txt index 82bd823e3..a380dadb5 100644 --- a/test/known-good/C/src/federated/DistributedPhysicalActionUpstreamLong.txt +++ b/test/known-good/C/src/federated/DistributedPhysicalActionUpstreamLong.txt @@ -3,9 +3,9 @@ * properly handled in a long chain of federates. */ target C { - timeout: 1 sec, - coordination-options: { - advance-message-interval: 500 usec + timeout: 1 sec, + coordination-options: { + advance-message-interval: 500 usec } } @@ -29,9 +29,9 @@ =} reactor WithPhysicalAction { - output out: int - state thread_id: lf_thread_t(0) - physical action act(0): int + output out: int + state thread_id: lf_thread_t(0) + physical action act(0): int reaction(startup) -> act {= // start new thread, provide callback diff --git a/test/known-good/C/src/federated/DistributedStop.txt b/test/known-good/C/src/federated/DistributedStop.txt index 61125f57c..befdb1d5f 100644 --- a/test/known-good/C/src/federated/DistributedStop.txt +++ b/test/known-good/C/src/federated/DistributedStop.txt @@ -7,10 +7,10 @@ target C reactor Sender { - output out: int + output out: int timer t(0, 1 usec) logical action act - state reaction_invoked_correctly: bool(false) + state reaction_invoked_correctly: bool(false) reaction(t, act) -> out, act {= lf_print("Sending 42 at (%lld, %u).", @@ -63,10 +63,10 @@ } reactor Receiver( - stp_offset: time(10 msec) // Used in the decentralized variant of the test + stp_offset: time(10 msec) // Used in the decentralized variant of the test ) { - input in: int - state reaction_invoked_correctly: bool(false) + input in: int + state reaction_invoked_correctly: bool(false) reaction(in) {= lf_print("Received %d at (%lld, %u).", diff --git a/test/known-good/C/src/federated/DistributedStopDecentralized.txt b/test/known-good/C/src/federated/DistributedStopDecentralized.txt index 8d28291cf..a2f16c3cf 100644 --- a/test/known-good/C/src/federated/DistributedStopDecentralized.txt +++ b/test/known-good/C/src/federated/DistributedStopDecentralized.txt @@ -5,7 +5,7 @@ * @author Soroush Bateni */ target C { - coordination: decentralized + coordination: decentralized } import Sender, Receiver from "DistributedStop.lf" diff --git a/test/known-good/C/src/federated/DistributedStopZero.txt b/test/known-good/C/src/federated/DistributedStopZero.txt index 8193974ad..90c8e1580 100644 --- a/test/known-good/C/src/federated/DistributedStopZero.txt +++ b/test/known-good/C/src/federated/DistributedStopZero.txt @@ -7,7 +7,7 @@ target C reactor Sender { - output out: int + output out: int timer t(0, 1 usec) reaction(t) -> out {= @@ -42,7 +42,7 @@ } reactor Receiver { - input in: int + input in: int reaction(in) {= printf("Received %d at (%lld, %u).\n", diff --git a/test/known-good/C/src/federated/DistributedToken.txt b/test/known-good/C/src/federated/DistributedToken.txt index bcb618309..c976236ef 100644 --- a/test/known-good/C/src/federated/DistributedToken.txt +++ b/test/known-good/C/src/federated/DistributedToken.txt @@ -16,8 +16,8 @@ * @author Edward A. Lee */ target C { - timeout: 5 secs, - coordination: decentralized + timeout: 5 secs, + coordination: decentralized } /** @@ -26,11 +26,11 @@ * @param root The root string. * @output message The message. */ -reactor MessageGenerator(root: string("")) { +reactor MessageGenerator(root: string("")) { // Output type char* instead of string is used for dynamically allocated // character arrays (as opposed to static constant strings). - output message: char* - state count: int(1) + output message: char* + state count: int(1) // Send first message after 1 sec so that the startup reactions do not // factor into the transport time measurement on the first message. timer t(1 sec, 1 sec) @@ -56,8 +56,8 @@ * @input message The message. */ reactor PrintMessage { - input message: char* - state count: int(0) + input message: char* + state count: int(0) reaction(message) {= printf("PrintMessage: At (elapsed) logical time %lld, receiver receives: %s\n", diff --git a/test/known-good/C/src/federated/FeedbackDelay.txt b/test/known-good/C/src/federated/FeedbackDelay.txt index 84f2961a0..43ff63891 100644 --- a/test/known-good/C/src/federated/FeedbackDelay.txt +++ b/test/known-good/C/src/federated/FeedbackDelay.txt @@ -1,14 +1,14 @@ target C { - timeout: 1 sec, - logging: DEBUG + timeout: 1 sec, + logging: DEBUG } reactor PhysicalPlant { - input control: double - output sensor: double + input control: double + output sensor: double timer t(0, 33 msec) - state last_sensor_time: time(0) - state previous_sensor_time: time(0) + state last_sensor_time: time(0) + state previous_sensor_time: time(0) reaction(t) -> sensor {= lf_set(sensor, 42); @@ -24,14 +24,14 @@ } reactor Controller { - input sensor: double - output control: double + input sensor: double + output control: double - state latest_control: double(0.0) - state first: bool(true) + state latest_control: double(0.0) + state first: bool(true) - output request_for_planning: double - input planning: double + output request_for_planning: double + input planning: double reaction(planning) {= self->latest_control = planning->value; =} @@ -45,8 +45,8 @@ } reactor Planner { - input request: double - output response: double + input request: double + output response: double reaction(request) -> response {= lf_sleep(MSEC(10)); diff --git a/test/known-good/C/src/federated/FeedbackDelaySimple.txt b/test/known-good/C/src/federated/FeedbackDelaySimple.txt index 2c1bf0ce7..ac05930ac 100644 --- a/test/known-good/C/src/federated/FeedbackDelaySimple.txt +++ b/test/known-good/C/src/federated/FeedbackDelaySimple.txt @@ -1,12 +1,12 @@ target C { - timeout: 1 sec + timeout: 1 sec } reactor Loop { - input in: int - output out: int + input in: int + output out: int timer t(0, 100 msec) - state count: int(1) + state count: int(1) reaction(in) {= lf_print("Received %d.", in->value); diff --git a/test/known-good/C/src/federated/HelloDistributed.txt b/test/known-good/C/src/federated/HelloDistributed.txt index 111a8e823..9297f5c1d 100644 --- a/test/known-good/C/src/federated/HelloDistributed.txt +++ b/test/known-good/C/src/federated/HelloDistributed.txt @@ -8,7 +8,7 @@ target C reactor Source { - output out: string + output out: string reaction(startup) -> out {= lf_print("Sending 'Hello World!' message from source federate."); @@ -18,8 +18,8 @@ } reactor Destination { - input in: string - state received: bool(false) + input in: string + state received: bool(false) reaction(startup) {= lf_print("Destination started."); =} diff --git a/test/known-good/C/src/federated/LoopDistributedCentralized.txt b/test/known-good/C/src/federated/LoopDistributedCentralized.txt index 75d95b1b8..b1c89a554 100644 --- a/test/known-good/C/src/federated/LoopDistributedCentralized.txt +++ b/test/known-good/C/src/federated/LoopDistributedCentralized.txt @@ -5,20 +5,20 @@ * @author Edward A. Lee */ target C { - flags: "-Wall", - coordination: centralized, - coordination-options: { - advance-message-interval: 100 msec + flags: "-Wall", + coordination: centralized, + coordination-options: { + advance-message-interval: 100 msec }, - timeout: 4 sec, - logging: DEBUG -} + timeout: 4 sec, + logging: DEBUG +} -reactor Looper(incr: int(1), delay: time(0 msec)) { - input in: int - output out: int +reactor Looper(incr: int(1), delay: time(0 msec)) { + input in: int + output out: int physical action a(delay) - state count: int(0) + state count: int(0) timer t(0, 1 sec) @@ -42,7 +42,7 @@ =} } -federated reactor LoopDistributedCentralized(delay: time(0)) { +federated reactor LoopDistributedCentralized(delay: time(0)) { left = new Looper() right = new Looper(incr = -1) left.out -> right.in diff --git a/test/known-good/C/src/federated/LoopDistributedCentralized2.txt b/test/known-good/C/src/federated/LoopDistributedCentralized2.txt index 06654f279..780c75eb6 100644 --- a/test/known-good/C/src/federated/LoopDistributedCentralized2.txt +++ b/test/known-good/C/src/federated/LoopDistributedCentralized2.txt @@ -5,19 +5,19 @@ * @author Edward A. Lee */ target C { - flags: "-Wall", - coordination: centralized, - coordination-options: { - advance-message-interval: 100 msec + flags: "-Wall", + coordination: centralized, + coordination-options: { + advance-message-interval: 100 msec }, - timeout: 4 sec -} + timeout: 4 sec +} -reactor Looper(incr: int(1), delay: time(0 msec)) { - input in: int - output out: int +reactor Looper(incr: int(1), delay: time(0 msec)) { + input in: int + output out: int physical action a(delay) - state count: int(0) + state count: int(0) timer t(0, 1 sec) @@ -41,11 +41,11 @@ =} } -reactor Looper2(incr: int(1), delay: time(0 msec)) { - input in: int - output out: int +reactor Looper2(incr: int(1), delay: time(0 msec)) { + input in: int + output out: int physical action a(delay) - state count: int(0) + state count: int(0) timer t(0, 1 sec) @@ -69,7 +69,7 @@ =} } -federated reactor(delay: time(0)) { +federated reactor(delay: time(0)) { left = new Looper() right = new Looper2(incr = -1) left.out -> right.in diff --git a/test/known-good/C/src/federated/LoopDistributedCentralizedPhysicalAction.txt b/test/known-good/C/src/federated/LoopDistributedCentralizedPhysicalAction.txt index 02dcf01e2..7f66ddf88 100644 --- a/test/known-good/C/src/federated/LoopDistributedCentralizedPhysicalAction.txt +++ b/test/known-good/C/src/federated/LoopDistributedCentralizedPhysicalAction.txt @@ -5,13 +5,13 @@ * @author Edward A. Lee */ target C { - flags: "-Wall", - coordination: centralized, - coordination-options: { - advance-message-interval: 100 msec + flags: "-Wall", + coordination: centralized, + coordination-options: { + advance-message-interval: 100 msec }, - timeout: 5 sec -} + timeout: 5 sec +} preamble {= #include // Defines sleep() @@ -27,11 +27,11 @@ } =} -reactor Looper(incr: int(1), delay: time(0 msec)) { - input in: int - output out: int +reactor Looper(incr: int(1), delay: time(0 msec)) { + input in: int + output out: int physical action a(delay) - state count: int(0) + state count: int(0) reaction(startup) -> a {= // Start the thread that listens for Enter or Return. @@ -62,7 +62,7 @@ =} } -federated reactor(delay: time(0)) { +federated reactor(delay: time(0)) { left = new Looper() right = new Looper(incr = -1) left.out -> right.in diff --git a/test/known-good/C/src/federated/LoopDistributedCentralizedPrecedence.txt b/test/known-good/C/src/federated/LoopDistributedCentralizedPrecedence.txt index 3a1d9c3b1..2f8a5ef94 100644 --- a/test/known-good/C/src/federated/LoopDistributedCentralizedPrecedence.txt +++ b/test/known-good/C/src/federated/LoopDistributedCentralizedPrecedence.txt @@ -6,19 +6,19 @@ * @author Soroush Bateni */ target C { - flags: "-Wall", - coordination: centralized, - coordination-options: { - advance-message-interval: 100 msec + flags: "-Wall", + coordination: centralized, + coordination-options: { + advance-message-interval: 100 msec }, - timeout: 5 sec -} + timeout: 5 sec +} -reactor Looper(incr: int(1), delay: time(0 msec)) { - input in: int - output out: int - state count: int(0) - state received_count: int(0) +reactor Looper(incr: int(1), delay: time(0 msec)) { + input in: int + output out: int + state count: int(0) + state received_count: int(0) timer t(0, 1 sec) reaction(t) -> out {= @@ -48,7 +48,7 @@ =} } -federated reactor(delay: time(0)) { +federated reactor(delay: time(0)) { left = new Looper() right = new Looper(incr = -1) left.out -> right.in diff --git a/test/known-good/C/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.txt b/test/known-good/C/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.txt index 5059d6693..3885e7a0f 100644 --- a/test/known-good/C/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.txt +++ b/test/known-good/C/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.txt @@ -7,19 +7,19 @@ * @author Soroush Bateni */ target C { - flags: "-Wall", - coordination: centralized, - coordination-options: { - advance-message-interval: 100 msec + flags: "-Wall", + coordination: centralized, + coordination-options: { + advance-message-interval: 100 msec }, - timeout: 5 sec -} + timeout: 5 sec +} -reactor Contained(incr: int(1)) { +reactor Contained(incr: int(1)) { timer t(0, 1 sec) - input in: int - state count: int(0) - state received_count: int(0) + input in: int + state count: int(0) + state received_count: int(0) reaction(t) {= self->count += self->incr; =} @@ -32,10 +32,10 @@ =} } -reactor Looper(incr: int(1), delay: time(0 msec)) { - input in: int - output out: int - state count: int(0) +reactor Looper(incr: int(1), delay: time(0 msec)) { + input in: int + output out: int + state count: int(0) timer t(0, 1 sec) c = new Contained(incr = incr) @@ -62,7 +62,7 @@ =} } -federated reactor(delay: time(0)) { +federated reactor(delay: time(0)) { left = new Looper() right = new Looper(incr = -1) left.out -> right.in diff --git a/test/known-good/C/src/federated/LoopDistributedDecentralized.txt b/test/known-good/C/src/federated/LoopDistributedDecentralized.txt index 8171bedf0..a724a3d22 100644 --- a/test/known-good/C/src/federated/LoopDistributedDecentralized.txt +++ b/test/known-good/C/src/federated/LoopDistributedDecentralized.txt @@ -5,8 +5,8 @@ * @author Edward A. Lee */ target C { - coordination: decentralized, - timeout: 5 sec + coordination: decentralized, + timeout: 5 sec } preamble {= @@ -23,11 +23,11 @@ } =} -reactor Looper(incr: int(1), delay: time(0 msec), stp_offset: time(0)) { - input in: int - output out: int +reactor Looper(incr: int(1), delay: time(0 msec), stp_offset: time(0)) { + input in: int + output out: int physical action a(stp_offset) - state count: int(0) + state count: int(0) reaction(startup) -> a {= // Start the thread that listens for Enter or Return. @@ -69,7 +69,7 @@ =} } -federated reactor LoopDistributedDecentralized(delay: time(0)) { +federated reactor LoopDistributedDecentralized(delay: time(0)) { left = new Looper(stp_offset = 900 usec) right = new Looper(incr = -1, stp_offset = 2400 usec) left.out -> right.in diff --git a/test/known-good/C/src/federated/LoopDistributedDouble.txt b/test/known-good/C/src/federated/LoopDistributedDouble.txt index ff5307d13..f5f51c2f1 100644 --- a/test/known-good/C/src/federated/LoopDistributedDouble.txt +++ b/test/known-good/C/src/federated/LoopDistributedDouble.txt @@ -5,13 +5,13 @@ * @author Edward A. Lee */ target C { - flags: "-Wall", - coordination: centralized, - coordination-options: { - advance-message-interval: 100 msec + flags: "-Wall", + coordination: centralized, + coordination-options: { + advance-message-interval: 100 msec }, - timeout: 5 sec -} + timeout: 5 sec +} preamble {= #include // Defines sleep() @@ -27,13 +27,13 @@ } =} -reactor Looper(incr: int(1), delay: time(0 msec)) { - input in: int - input in2: int - output out: int - output out2: int +reactor Looper(incr: int(1), delay: time(0 msec)) { + input in: int + input in2: int + output out: int + output out2: int physical action a(delay) - state count: int(0) + state count: int(0) timer t(0, 1 sec) reaction(startup) -> a {= @@ -82,7 +82,7 @@ =} } -federated reactor(delay: time(0)) { +federated reactor(delay: time(0)) { left = new Looper() right = new Looper(incr = -1) left.out -> right.in diff --git a/test/known-good/C/src/federated/ParallelDestinations.txt b/test/known-good/C/src/federated/ParallelDestinations.txt index 933f43ce6..b44ad92b0 100644 --- a/test/known-good/C/src/federated/ParallelDestinations.txt +++ b/test/known-good/C/src/federated/ParallelDestinations.txt @@ -1,13 +1,13 @@ /** Test parallel connections for federated execution. */ target C { - timeout: 2 sec + timeout: 2 sec } import Count from "../lib/Count.lf" import TestCount from "../lib/TestCount.lf" reactor Source { - output[2] out: int + output[2] out: int c1 = new Count() c2 = new Count() diff --git a/test/known-good/C/src/federated/ParallelSources.txt b/test/known-good/C/src/federated/ParallelSources.txt index d733c2191..9684fd6ad 100644 --- a/test/known-good/C/src/federated/ParallelSources.txt +++ b/test/known-good/C/src/federated/ParallelSources.txt @@ -1,13 +1,13 @@ /** Test parallel connections for federated execution. */ target C { - timeout: 2 sec + timeout: 2 sec } import Count from "../lib/Count.lf" import TestCount from "../lib/TestCount.lf" reactor Destination { - input[2] in: int + input[2] in: int t1 = new TestCount(num_inputs = 3) t2 = new TestCount(num_inputs = 3) diff --git a/test/known-good/C/src/federated/ParallelSourcesMultiport.txt b/test/known-good/C/src/federated/ParallelSourcesMultiport.txt index 77eb6b287..bf881bb7c 100644 --- a/test/known-good/C/src/federated/ParallelSourcesMultiport.txt +++ b/test/known-good/C/src/federated/ParallelSourcesMultiport.txt @@ -1,13 +1,13 @@ /** Test parallel connections for federated execution. */ target C { - timeout: 2 sec + timeout: 2 sec } import Count from "../lib/Count.lf" import TestCount from "../lib/TestCount.lf" reactor Source { - output[2] out: int + output[2] out: int c1 = new Count() c2 = new Count() @@ -15,7 +15,7 @@ } reactor Destination1 { - input[3] in: int + input[3] in: int t1 = new TestCount(num_inputs = 3) t2 = new TestCount(num_inputs = 3) diff --git a/test/known-good/C/src/federated/PhysicalSTP.txt b/test/known-good/C/src/federated/PhysicalSTP.txt index eeb8e7bff..0f588783f 100644 --- a/test/known-good/C/src/federated/PhysicalSTP.txt +++ b/test/known-good/C/src/federated/PhysicalSTP.txt @@ -3,15 +3,15 @@ * message arrival. */ target C { - timeout: 1900 msec, - coordination: decentralized + timeout: 1900 msec, + coordination: decentralized } import Count from "../lib/Count.lf" -reactor Print(STP_offset_param: time(0)) { - input in: int - state c: int(1) +reactor Print(STP_offset_param: time(0)) { + input in: int + state c: int(1) reaction(in) {= interval_t elapsed_time = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/federated/PingPongDistributed.txt b/test/known-good/C/src/federated/PingPongDistributed.txt index 3007f51f7..36febe234 100644 --- a/test/known-good/C/src/federated/PingPongDistributed.txt +++ b/test/known-good/C/src/federated/PingPongDistributed.txt @@ -23,7 +23,7 @@ import Ping, Pong from "PingPongDistributedPhysical.lf" -federated reactor(count: int(10)) { +federated reactor(count: int(10)) { ping = new Ping(count = count) pong = new Pong(expected = count) ping.send -> pong.receive diff --git a/test/known-good/C/src/federated/PingPongDistributedPhysical.txt b/test/known-good/C/src/federated/PingPongDistributedPhysical.txt index 0fb41ed63..3456f4083 100644 --- a/test/known-good/C/src/federated/PingPongDistributedPhysical.txt +++ b/test/known-good/C/src/federated/PingPongDistributedPhysical.txt @@ -26,10 +26,10 @@ */ target C -reactor Ping(count: int(10)) { - input receive: int - output send: int - state pingsLeft: int(count) +reactor Ping(count: int(10)) { + input receive: int + output send: int + state pingsLeft: int(count) logical action serve reaction(startup, serve) -> send {= @@ -46,10 +46,10 @@ =} } -reactor Pong(expected: int(10)) { - input receive: int - output send: int - state count: int(0) +reactor Pong(expected: int(10)) { + input receive: int + output send: int + state count: int(0) reaction(receive) -> send {= self->count++; @@ -71,7 +71,7 @@ =} } -federated reactor(count: int(10)) { +federated reactor(count: int(10)) { ping = new Ping(count = count) pong = new Pong(expected = count) ping.send ~> pong.receive diff --git a/test/known-good/C/src/federated/SimpleFederated.txt b/test/known-good/C/src/federated/SimpleFederated.txt index ae8c687e4..b1a0373d2 100644 --- a/test/known-good/C/src/federated/SimpleFederated.txt +++ b/test/known-good/C/src/federated/SimpleFederated.txt @@ -1,11 +1,11 @@ target C { - timeout: 2 secs, - build-type: RelWithDebInfo + timeout: 2 secs, + build-type: RelWithDebInfo } reactor Fed { - input in: int - output out: int + input in: int + output out: int } federated reactor { diff --git a/test/known-good/C/src/federated/StopAtShutdown.txt b/test/known-good/C/src/federated/StopAtShutdown.txt index 7a1394289..0b3e8907f 100644 --- a/test/known-good/C/src/federated/StopAtShutdown.txt +++ b/test/known-good/C/src/federated/StopAtShutdown.txt @@ -6,11 +6,11 @@ * @author Steven Wong */ target C { - timeout: 2 sec + timeout: 2 sec } reactor A { - input in: int + input in: int reaction(startup) {= lf_print("Hello World!"); =} @@ -20,7 +20,7 @@ } reactor B { - output out: int + output out: int timer t(1 sec) reaction(t) -> out {= lf_set(out, 1); =} diff --git a/test/known-good/C/src/federated/TopLevelArtifacts.txt b/test/known-good/C/src/federated/TopLevelArtifacts.txt index ab2c83a98..5f1a875c8 100644 --- a/test/known-good/C/src/federated/TopLevelArtifacts.txt +++ b/test/known-good/C/src/federated/TopLevelArtifacts.txt @@ -8,14 +8,14 @@ * top-level artifacts might be disallowed in the future. */ target C { - timeout: 1 msec + timeout: 1 msec } import Count from "../lib/Count.lf" import TestCount from "../lib/TestCount.lf" federated reactor { - state successes: int(0) + state successes: int(0) timer t(0, 1 sec) logical action act(0) diff --git a/test/known-good/C/src/federated/failing/ClockSync.txt b/test/known-good/C/src/federated/failing/ClockSync.txt index b7681f176..051cd653c 100644 --- a/test/known-good/C/src/federated/failing/ClockSync.txt +++ b/test/known-good/C/src/federated/failing/ClockSync.txt @@ -6,31 +6,31 @@ * @author Edward A. Lee */ target C { - coordination: decentralized, - timeout: 10 sec, - clock-sync: on, // Turn on runtime clock synchronization. - clock-sync-options: { + coordination: decentralized, + timeout: 10 sec, + clock-sync: on, // Turn on runtime clock synchronization. + clock-sync-options: { // Forces all federates to perform clock sync. - local-federates-on: true, + local-federates-on: true, // Collect useful statistics like average network delay and the standard // deviation for the network delay over one clock synchronization cycle. // Generates a warning if the standard deviation is higher than the // clock sync guard. Artificially offsets clocks by multiples of 200 // msec. - collect-stats: true, - test-offset: 200 msec, + collect-stats: true, + test-offset: 200 msec, // Period with which runtime clock sync is performed. - period: 5 msec, + period: 5 msec, // Number of messages exchanged to perform clock sync. - trials: 10, + trials: 10, // Attenuation applied to runtime clock sync adjustments. - attenuation: 10 + attenuation: 10 } } /** Reactor that outputs periodically. */ -reactor Ticker(period: time(1600 msec)) { - output out: int +reactor Ticker(period: time(1600 msec)) { + output out: int timer tick(0, period) @@ -39,7 +39,7 @@ /** Print a message when an input arrives. */ reactor Printer { - input in: int + input in: int reaction(startup) {= interval_t offset = _lf_time_physical_clock_offset + _lf_time_test_physical_clock_offset; diff --git a/test/known-good/C/src/federated/failing/DistributedDoublePortLooped.txt b/test/known-good/C/src/federated/failing/DistributedDoublePortLooped.txt index 0d5175ab4..7a931fd7c 100644 --- a/test/known-good/C/src/federated/failing/DistributedDoublePortLooped.txt +++ b/test/known-good/C/src/federated/failing/DistributedDoublePortLooped.txt @@ -6,25 +6,25 @@ * @author Soroush Bateni */ target C { - timeout: 900 msec, - logging: LOG, - coordination: centralized + timeout: 900 msec, + logging: LOG, + coordination: centralized } reactor Foo { timer t(0, 700 usec) - output out: int + output out: int reaction(t) -> out {= lf_set(out, 0); =} } reactor Count { - state count: int(1) - input in1: int - input in2: int - input in3: int - output out1: int - output out2: int + state count: int(1) + input in1: int + input in2: int + input in3: int + output out1: int + output out2: int timer t(0, 1 msec) reaction(in1) -> out1 {= =} @@ -37,9 +37,9 @@ } reactor CountMicrostep { - state count: int(1) - output out: int - logical action act: int + state count: int(1) + output out: int + logical action act: int timer t(0, 1 msec) reaction(t) -> act {= lf_schedule_int(act, 0, self->count++); =} @@ -48,10 +48,10 @@ } reactor Print { - input in1: int - input in2: int - input in3: int - output out: int + input in1: int + input in2: int + input in3: int + output out: int timer t(0, 2 msec) reaction(in1, in2, in3, t) -> out {= diff --git a/test/known-good/C/src/federated/failing/DistributedDoublePortLooped2.txt b/test/known-good/C/src/federated/failing/DistributedDoublePortLooped2.txt index 1d36c687b..f50aa2170 100644 --- a/test/known-good/C/src/federated/failing/DistributedDoublePortLooped2.txt +++ b/test/known-good/C/src/federated/failing/DistributedDoublePortLooped2.txt @@ -6,15 +6,15 @@ * @author Soroush Bateni */ target C { - timeout: 5 msec, - logging: LOG, - coordination: centralized + timeout: 5 msec, + logging: LOG, + coordination: centralized } reactor Count { - state count: int(1) - input in: int - output out: int + state count: int(1) + input in: int + output out: int timer t(0, 1 msec) reaction(t) -> out {= @@ -26,9 +26,9 @@ } reactor CountMicrostep { - state count: int(1) - output out: int - logical action act: int + state count: int(1) + output out: int + logical action act: int timer t(0, 1 msec) reaction(t) -> act {= lf_schedule_int(act, 0, self->count++); =} @@ -37,9 +37,9 @@ } reactor Print { - input in: int - input in2: int - output out: int + input in: int + input in2: int + output out: int timer t(0, 2 msec) reaction(in, in2) -> out {= diff --git a/test/known-good/C/src/federated/failing/DistributedNetworkOrderDecentralized.txt b/test/known-good/C/src/federated/failing/DistributedNetworkOrderDecentralized.txt index aa1b5233e..92f9b924f 100644 --- a/test/known-good/C/src/federated/failing/DistributedNetworkOrderDecentralized.txt +++ b/test/known-good/C/src/federated/failing/DistributedNetworkOrderDecentralized.txt @@ -8,12 +8,12 @@ * @author Soroush Bateni */ target C { - timeout: 1 sec, - coordination: decentralized + timeout: 1 sec, + coordination: decentralized } reactor Sender { - output out: int + output out: int timer t(0, 1 msec) reaction(t) {= @@ -30,8 +30,8 @@ } reactor Receiver { - input in: int - state success: int(0) + input in: int + state success: int(0) reaction(in) {= tag_t current_tag = lf_tag(); diff --git a/test/known-good/C/src/federated/failing/LoopDistributedDecentralizedPrecedence.txt b/test/known-good/C/src/federated/failing/LoopDistributedDecentralizedPrecedence.txt index c2bba9783..9dada9040 100644 --- a/test/known-good/C/src/federated/failing/LoopDistributedDecentralizedPrecedence.txt +++ b/test/known-good/C/src/federated/failing/LoopDistributedDecentralizedPrecedence.txt @@ -6,16 +6,16 @@ * @author Soroush Bateni */ target C { - flags: "-Wall", - coordination: decentralized, - timeout: 4900 msec + flags: "-Wall", + coordination: decentralized, + timeout: 4900 msec } -reactor Looper(incr: int(1), delay: time(0 msec), stp_offset: time(0)) { - input in: int - output out: int - state count: int(0) - state received_count: int(0) +reactor Looper(incr: int(1), delay: time(0 msec), stp_offset: time(0)) { + input in: int + output out: int + state count: int(0) + state received_count: int(0) timer t(0, 1 sec) reaction(t) -> out {= @@ -57,7 +57,7 @@ =} } -federated reactor(delay: time(0)) { +federated reactor(delay: time(0)) { left = new Looper(stp_offset = 5 msec) right = new Looper(incr = -1, stp_offset = 5 msec) left.out -> right.in diff --git a/test/known-good/C/src/federated/failing/LoopDistributedDecentralizedPrecedenceHierarchy.txt b/test/known-good/C/src/federated/failing/LoopDistributedDecentralizedPrecedenceHierarchy.txt index 6f2ce9f33..c7cf3e682 100644 --- a/test/known-good/C/src/federated/failing/LoopDistributedDecentralizedPrecedenceHierarchy.txt +++ b/test/known-good/C/src/federated/failing/LoopDistributedDecentralizedPrecedenceHierarchy.txt @@ -6,14 +6,14 @@ * @author Soroush Bateni */ target C { - flags: "-Wall", - coordination: decentralized, - timeout: 4900 msec + flags: "-Wall", + coordination: decentralized, + timeout: 4900 msec } import Contained from "../LoopDistributedCentralizedPrecedenceHierarchy.lf"; -reactor Looper(incr:int(1), delay:time(0 msec), stp_offset:time(0)) { +reactor Looper(incr:int(1), delay:time(0 msec), stp_offset:time(0)) { input in:int; output out:int; state count:int(0); diff --git a/test/known-good/C/src/federated/failing/SimpleFederatedAuthenticated.txt b/test/known-good/C/src/federated/failing/SimpleFederatedAuthenticated.txt index 7ee9de1cd..5260ef32e 100644 --- a/test/known-good/C/src/federated/failing/SimpleFederatedAuthenticated.txt +++ b/test/known-good/C/src/federated/failing/SimpleFederatedAuthenticated.txt @@ -3,15 +3,15 @@ * target property. */ target C { - timeout: 2 secs, - build-type: RelWithDebInfo, - auth: true, - logging: DEBUG + timeout: 2 secs, + build-type: RelWithDebInfo, + auth: true, + logging: DEBUG } reactor Fed { - input in: int - output out: int + input in: int + output out: int } federated reactor { diff --git a/test/known-good/C/src/lib/Count.txt b/test/known-good/C/src/lib/Count.txt index 9e7631a91..51f056e41 100644 --- a/test/known-good/C/src/lib/Count.txt +++ b/test/known-good/C/src/lib/Count.txt @@ -1,8 +1,8 @@ target C -reactor Count(offset: time(0), period: time(1 sec)) { - state count: int(1) - output out: int +reactor Count(offset: time(0), period: time(1 sec)) { + state count: int(1) + output out: int timer t(offset, period) reaction(t) -> out {= lf_set(out, self->count++); =} diff --git a/test/known-good/C/src/lib/Imported.txt b/test/known-good/C/src/lib/Imported.txt index 75017d4fe..fc23d3498 100644 --- a/test/known-good/C/src/lib/Imported.txt +++ b/test/known-good/C/src/lib/Imported.txt @@ -5,7 +5,7 @@ import ImportedAgain from "./ImportedAgain.lf" reactor Imported { - input x: int + input x: int a = new ImportedAgain() reaction(x) -> a.x {= lf_set(a.x, x->value); =} diff --git a/test/known-good/C/src/lib/ImportedAgain.txt b/test/known-good/C/src/lib/ImportedAgain.txt index 7f987ff17..1c69fabbe 100644 --- a/test/known-good/C/src/lib/ImportedAgain.txt +++ b/test/known-good/C/src/lib/ImportedAgain.txt @@ -3,7 +3,7 @@ target C reactor ImportedAgain { - input x: int + input x: int reaction(x) {= printf("Received: %d.\n", x->value); diff --git a/test/known-good/C/src/lib/ImportedComposition.txt b/test/known-good/C/src/lib/ImportedComposition.txt index 2b5166dd5..d1dc4ea7d 100644 --- a/test/known-good/C/src/lib/ImportedComposition.txt +++ b/test/known-good/C/src/lib/ImportedComposition.txt @@ -3,15 +3,15 @@ target C reactor Gain { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= lf_set(y, x->value * 2); =} } reactor ImportedComposition { - input x: int - output y: int + input x: int + output y: int g1 = new Gain() g2 = new Gain() x -> g1.x after 10 msec diff --git a/test/known-good/C/src/lib/InternalDelay.txt b/test/known-good/C/src/lib/InternalDelay.txt index 1e083d030..285e5e743 100644 --- a/test/known-good/C/src/lib/InternalDelay.txt +++ b/test/known-good/C/src/lib/InternalDelay.txt @@ -1,9 +1,9 @@ target C -reactor InternalDelay(delay: int(10 msec)) { - input in: int - output out: int - logical action d: int +reactor InternalDelay(delay: int(10 msec)) { + input in: int + output out: int + logical action d: int reaction(in) -> d {= lf_schedule_int(d, self->delay, in->value); =} diff --git a/test/known-good/C/src/lib/LoopedActionSender.txt b/test/known-good/C/src/lib/LoopedActionSender.txt index 779923f04..49200db46 100644 --- a/test/known-good/C/src/lib/LoopedActionSender.txt +++ b/test/known-good/C/src/lib/LoopedActionSender.txt @@ -11,10 +11,10 @@ * @param break_interval: Determines how long the reactor should take a break * after sending take_a_break_after messages. */ -reactor Sender(take_a_break_after: int(10), break_interval: time(400 msec)) { - output out: int +reactor Sender(take_a_break_after: int(10), break_interval: time(400 msec)) { + output out: int logical action act - state sent_messages: int(0) + state sent_messages: int(0) reaction(startup, act) -> act, out {= // Send a message on out diff --git a/test/known-good/C/src/lib/PassThrough.txt b/test/known-good/C/src/lib/PassThrough.txt index af152010a..2c2450d9b 100644 --- a/test/known-good/C/src/lib/PassThrough.txt +++ b/test/known-good/C/src/lib/PassThrough.txt @@ -2,8 +2,8 @@ target C reactor PassThrough { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= lf_set(out, in->value); =} } diff --git a/test/known-good/C/src/lib/Test.txt b/test/known-good/C/src/lib/Test.txt index 52125a84a..cfa50a0e2 100644 --- a/test/known-good/C/src/lib/Test.txt +++ b/test/known-good/C/src/lib/Test.txt @@ -1,8 +1,8 @@ target C -reactor TestDouble(expected: double[](1.0, 1.0, 1.0, 1.0)) { - input in: double - state count: int(0) +reactor TestDouble(expected: double[](1.0, 1.0, 1.0, 1.0)) { + input in: double + state count: int(0) reaction(in) {= printf("Received: %f\n", in->value); diff --git a/test/known-good/C/src/lib/TestCount.txt b/test/known-good/C/src/lib/TestCount.txt index cca987b10..cb16eaf71 100644 --- a/test/known-good/C/src/lib/TestCount.txt +++ b/test/known-good/C/src/lib/TestCount.txt @@ -9,10 +9,10 @@ */ target C -reactor TestCount(start: int(1), stride: int(1), num_inputs: int(1)) { - state count: int(start) - state inputs_received: int(0) - input in: int +reactor TestCount(start: int(1), stride: int(1), num_inputs: int(1)) { + state count: int(start) + state inputs_received: int(0) + input in: int reaction(in) {= lf_print("Received %d.", in->value); diff --git a/test/known-good/C/src/lib/TestCountMultiport.txt b/test/known-good/C/src/lib/TestCountMultiport.txt index d8eeabd94..586868d59 100644 --- a/test/known-good/C/src/lib/TestCountMultiport.txt +++ b/test/known-good/C/src/lib/TestCountMultiport.txt @@ -12,14 +12,14 @@ target C reactor TestCountMultiport( - start: int(1), - stride: int(1), - num_inputs: int(1), - width: int(2) + start: int(1), + stride: int(1), + num_inputs: int(1), + width: int(2) ) { - state count: int(start) - state inputs_received: int(0) - input[width] in: int + state count: int(start) + state inputs_received: int(0) + input[width] in: int reaction(in) {= for (int i = 0; i < in_width; i++) { diff --git a/test/known-good/C/src/modal_models/BanksCount3ModesComplex.txt b/test/known-good/C/src/modal_models/BanksCount3ModesComplex.txt index 60352d53b..ce2823ef8 100644 --- a/test/known-good/C/src/modal_models/BanksCount3ModesComplex.txt +++ b/test/known-good/C/src/modal_models/BanksCount3ModesComplex.txt @@ -3,26 +3,26 @@ * complex nesting. */ target C { - fast: false, - timeout: 3 sec + fast: false, + timeout: 3 sec } import TraceTesting from "util/TraceTesting.lf" import CounterCycle from "Count3Modes.lf" reactor MetaCounter { - input next: bool - output[2] always: int - output[2] mode1: int - output[2] mode2: int - output[2] never: int + input next: bool + output[2] always: int + output[2] mode1: int + output[2] mode2: int + output[2] never: int - outer_counters = new[2] CounterCycle() + outer_counters = new[2] CounterCycle() (next)+ -> outer_counters.next outer_counters.count -> always initial mode One { - mode1_counters = new[2] CounterCycle() + mode1_counters = new[2] CounterCycle() (next)+ -> mode1_counters.next mode1_counters.count -> mode1 @@ -32,7 +32,7 @@ } mode Two { - mode2_counters = new[2] CounterCycle() + mode2_counters = new[2] CounterCycle() (next)+ -> mode2_counters.next mode2_counters.count -> mode2 @@ -42,7 +42,7 @@ } mode Three { - mode3_counters = new[2] CounterCycle() + mode3_counters = new[2] CounterCycle() (next)+ -> mode3_counters.next mode3_counters.count -> never @@ -51,7 +51,7 @@ main reactor { timer stepper(0, 250 msec) - counters = new[2] MetaCounter() + counters = new[2] MetaCounter() test = new TraceTesting( // keep-format events_size = 16, trace_size = 429, diff --git a/test/known-good/C/src/modal_models/BanksCount3ModesSimple.txt b/test/known-good/C/src/modal_models/BanksCount3ModesSimple.txt index bda97388d..45948cf33 100644 --- a/test/known-good/C/src/modal_models/BanksCount3ModesSimple.txt +++ b/test/known-good/C/src/modal_models/BanksCount3ModesSimple.txt @@ -1,7 +1,7 @@ /** Modal Reactor Test. Tests cycling through modes with banks of reactors. */ target C { - fast: false, - timeout: 2 sec + fast: false, + timeout: 2 sec } import TraceTesting from "util/TraceTesting.lf" @@ -9,7 +9,7 @@ main reactor { timer stepper(0, 250 msec) - counters = new[3] CounterCycle() + counters = new[3] CounterCycle() test = new TraceTesting( events_size = 3, trace_size = 63, diff --git a/test/known-good/C/src/modal_models/BanksModalStateReset.txt b/test/known-good/C/src/modal_models/BanksModalStateReset.txt index 894c750fd..5bdceb18b 100644 --- a/test/known-good/C/src/modal_models/BanksModalStateReset.txt +++ b/test/known-good/C/src/modal_models/BanksModalStateReset.txt @@ -3,8 +3,8 @@ * reactors. */ target C { - fast: false, - timeout: 4 sec + fast: false, + timeout: 4 sec } import TraceTesting from "util/TraceTesting.lf" @@ -14,8 +14,8 @@ main reactor { timer stepper(1 sec, 1 sec) - reset1 = new[2] ResetReaction() - reset2 = new[2] AutoReset() + reset1 = new[2] ResetReaction() + reset2 = new[2] AutoReset() test = new TraceTesting(events_size = 16, trace_size = 627, trace = ( // keep-format 0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0, 0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0, 250000000,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0, 0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0, diff --git a/test/known-good/C/src/modal_models/ConvertCaseTest.txt b/test/known-good/C/src/modal_models/ConvertCaseTest.txt index 9568b6996..d5980901e 100644 --- a/test/known-good/C/src/modal_models/ConvertCaseTest.txt +++ b/test/known-good/C/src/modal_models/ConvertCaseTest.txt @@ -1,15 +1,15 @@ /** Modal Reactor Test. Tests nested reactors with modes. */ target C { - fast: false, - timeout: 4 sec // logging: debug + fast: false, + timeout: 4 sec // logging: debug } import TraceTesting from "util/TraceTesting.lf" reactor ResetProcessor { - input discard: bool - input character: char - output converted: int + input discard: bool + input character: char + output converted: int initial mode Converting { converter = new Converter() @@ -26,9 +26,9 @@ } reactor HistoryProcessor { - input discard: bool - input character: char - output converted: int + input discard: bool + input character: char + output converted: int initial mode Converting { converter = new Converter() @@ -47,8 +47,8 @@ } reactor Converter { - input raw: char - output converted: int + input raw: char + output converted: int preamble {= #include @@ -83,9 +83,9 @@ } } -reactor InputFeeder(message: string("")) { - output character: char - state idx: int(0) +reactor InputFeeder(message: string("")) { + output character: char + state idx: int(0) timer t(0, 250 msec) diff --git a/test/known-good/C/src/modal_models/Count3Modes.txt b/test/known-good/C/src/modal_models/Count3Modes.txt index 45f45d7ce..afd6e2650 100644 --- a/test/known-good/C/src/modal_models/Count3Modes.txt +++ b/test/known-good/C/src/modal_models/Count3Modes.txt @@ -1,12 +1,12 @@ /** Modal Reactor Test. Tests cycling through modes. */ target C { - fast: false, - timeout: 2 sec + fast: false, + timeout: 2 sec } reactor CounterCycle { - input next: bool - output count: int + input next: bool + output count: int initial mode One { reaction(next) -> count, reset(Two) {= @@ -34,7 +34,7 @@ timer stepper(0, 250 msec) counter = new CounterCycle() - state expected_value: int(1) + state expected_value: int(1) // Trigger reaction(stepper) -> counter.next {= lf_set(counter.next, true); =} diff --git a/test/known-good/C/src/modal_models/MixedReactions.txt b/test/known-good/C/src/modal_models/MixedReactions.txt index 8018e325c..159d86c82 100644 --- a/test/known-good/C/src/modal_models/MixedReactions.txt +++ b/test/known-good/C/src/modal_models/MixedReactions.txt @@ -3,13 +3,13 @@ * and should be ordered accordingly. */ target C { - fast: true, - timeout: 110 msec + fast: true, + timeout: 110 msec } main reactor { - state x: int(0) - state first: bool(true) + state x: int(0) + state first: bool(true) timer t(0, 100 msec) diff --git a/test/known-good/C/src/modal_models/ModalActions.txt b/test/known-good/C/src/modal_models/ModalActions.txt index d2bd47179..097bf7459 100644 --- a/test/known-good/C/src/modal_models/ModalActions.txt +++ b/test/known-good/C/src/modal_models/ModalActions.txt @@ -3,20 +3,20 @@ * and continuation of delays with history transitions. */ target C { - fast: false, - timeout: 4 sec + fast: false, + timeout: 4 sec } import TraceTesting from "util/TraceTesting.lf" reactor Modal { - input next: bool + input next: bool - output mode_switch: int - output action1_sched: int - output action1_exec: int - output action2_sched: int - output action2_exec: int + output mode_switch: int + output action1_sched: int + output action1_exec: int + output action2_sched: int + output action2_exec: int initial mode One { timer T1(0, 750 msec) diff --git a/test/known-good/C/src/modal_models/ModalAfter.txt b/test/known-good/C/src/modal_models/ModalAfter.txt index f4f98c82f..1edb1cfe4 100644 --- a/test/known-good/C/src/modal_models/ModalAfter.txt +++ b/test/known-good/C/src/modal_models/ModalAfter.txt @@ -3,20 +3,20 @@ * and continuation with history transitions. */ target C { - fast: false, - timeout: 4 sec + fast: false, + timeout: 4 sec } import TraceTesting from "util/TraceTesting.lf" reactor Modal { - input next: bool + input next: bool - output mode_switch: int - output produced1: int - output consumed1: int - output produced2: int - output consumed2: int + output mode_switch: int + output produced1: int + output consumed1: int + output produced2: int + output consumed2: int initial mode One { producer1 = new Producer(mode_id = 1) @@ -45,8 +45,8 @@ } } -reactor Producer(mode_id: int(0)) { - output product: int +reactor Producer(mode_id: int(0)) { + output product: int timer t(0, 750 msec) @@ -56,9 +56,9 @@ =} } -reactor Consumer(mode_id: int(0)) { - input product: int - output report: int +reactor Consumer(mode_id: int(0)) { + input product: int + output report: int reaction(product) -> report {= printf("Consumed in %d\n", self->mode_id); diff --git a/test/known-good/C/src/modal_models/ModalCycleBreaker.txt b/test/known-good/C/src/modal_models/ModalCycleBreaker.txt index df031ba48..8eed49f11 100644 --- a/test/known-good/C/src/modal_models/ModalCycleBreaker.txt +++ b/test/known-good/C/src/modal_models/ModalCycleBreaker.txt @@ -5,16 +5,16 @@ * if they are located in separate modes. */ target C { - fast: false, - timeout: 1 sec + fast: false, + timeout: 1 sec } import TraceTesting from "util/TraceTesting.lf" reactor Modal { - input in1: int - input in2: int - output out: int + input in1: int + input in2: int + output out: int // Defining reaction to in2 before in1 would cause cycle if no mode were // present @@ -42,11 +42,11 @@ } } -reactor Counter(period: time(1 sec)) { - output value: int +reactor Counter(period: time(1 sec)) { + output value: int timer t(0, period) - state curval: int(0) + state curval: int(0) reaction(t) -> value {= lf_set(value, self->curval++); =} } diff --git a/test/known-good/C/src/modal_models/ModalNestedReactions.txt b/test/known-good/C/src/modal_models/ModalNestedReactions.txt index 709a08b03..2df60ea61 100644 --- a/test/known-good/C/src/modal_models/ModalNestedReactions.txt +++ b/test/known-good/C/src/modal_models/ModalNestedReactions.txt @@ -3,16 +3,16 @@ * inactive mode */ target C { - fast: false, - timeout: 2 sec + fast: false, + timeout: 2 sec } reactor CounterCycle { - input next: bool + input next: bool - output count: int - output only_in_two: bool - output never: int + output count: int + output only_in_two: bool + output never: int initial mode One { reaction(next) -> count, reset(Two) {= @@ -37,8 +37,8 @@ } reactor Forward { - input in: bool - output out: bool + input in: bool + output out: bool reaction(in) -> out {= lf_set(out, in->value); =} } diff --git a/test/known-good/C/src/modal_models/ModalStartupShutdown.txt b/test/known-good/C/src/modal_models/ModalStartupShutdown.txt index caf5a2502..83de44163 100644 --- a/test/known-good/C/src/modal_models/ModalStartupShutdown.txt +++ b/test/known-good/C/src/modal_models/ModalStartupShutdown.txt @@ -1,29 +1,29 @@ /** Modal Reactor Test. Test startup/shutdown reactions in modes. */ target C { - fast: false, - timeout: 3000 msec + fast: false, + timeout: 3000 msec } -import TraceTesting from "util/TraceTesting.lf" +import TraceTesting from "util/TraceTesting.lf" reactor Modal { - input next: bool - - output mode_switch: int - output startup1: int - output startup2: int - output shutdown2: int - output shutdown3: int - output startup4: int - output reset4: int - output shutdown4: int - output startup5: int - output reset5: int - output shutdown5: int + input next: bool + + output mode_switch: int + output startup1: int + output startup2: int + output shutdown2: int + output shutdown3: int + output startup4: int + output reset4: int + output shutdown4: int + output startup5: int + output reset5: int + output shutdown5: int initial mode One { reaction(startup) -> startup1 {= - printf("Startup 1 at (%lld, %u).\n", lf_time_logical_elapsed(), lf_tag().microstep); + printf("Startup 1 at (%lld, %u).\n", lf_time_logical_elapsed(), lf_tag().microstep); lf_set(startup1, 1); =} diff --git a/test/known-good/C/src/modal_models/ModalStateReset.txt b/test/known-good/C/src/modal_models/ModalStateReset.txt index d29f542e3..7b1c10af5 100644 --- a/test/known-good/C/src/modal_models/ModalStateReset.txt +++ b/test/known-good/C/src/modal_models/ModalStateReset.txt @@ -1,20 +1,20 @@ /** Modal Reactor Test. Tests reset of state variables in modes. */ target C { - fast: false, - timeout: 4 sec + fast: false, + timeout: 4 sec } import TraceTesting from "util/TraceTesting.lf" reactor Modal { - input next: bool + input next: bool - output mode_switch: int - output count0: int - output count1: int - output count2: int + output mode_switch: int + output count0: int + output count1: int + output count2: int - state counter0: int(0) + state counter0: int(0) reaction(next) -> count0 {= printf("Counter0: %d\n", self->counter0); @@ -22,7 +22,7 @@ =} initial mode One { - state counter1: int(0) + state counter1: int(0) timer T1(0 msec, 250 msec) reaction(reset) {= self->counter1 = 0; =} @@ -39,7 +39,7 @@ } mode Two { - state counter2: int(-2) + state counter2: int(-2) timer T2(0 msec, 250 msec) reaction(reset) {= self->counter2 = -2; =} diff --git a/test/known-good/C/src/modal_models/ModalStateResetAuto.txt b/test/known-good/C/src/modal_models/ModalStateResetAuto.txt index a566e00cf..93a4c1530 100644 --- a/test/known-good/C/src/modal_models/ModalStateResetAuto.txt +++ b/test/known-good/C/src/modal_models/ModalStateResetAuto.txt @@ -1,20 +1,20 @@ /** Modal Reactor Test. Tests reset of state variables in modes. */ target C { - fast: false, - timeout: 4 sec + fast: false, + timeout: 4 sec } import TraceTesting from "util/TraceTesting.lf" reactor Modal { - input next: bool + input next: bool - output mode_switch: int - output count0: int - output count1: int - output count2: int + output mode_switch: int + output count0: int + output count1: int + output count2: int - state counter0: int(0) + state counter0: int(0) reaction(next) -> count0 {= printf("Counter0: %d\n", self->counter0); @@ -22,7 +22,7 @@ =} initial mode One { - state counter1: int(0) + state counter1: int(0) timer T1(0 msec, 250 msec) reaction(T1) -> count1 {= printf("Counter1: %d\n", self->counter1); @@ -37,7 +37,7 @@ } mode Two { - reset state counter2: int(-2) + reset state counter2: int(-2) timer T2(0 msec, 250 msec) reaction(T2) -> count2 {= printf("Counter2: %d\n", self->counter2); diff --git a/test/known-good/C/src/modal_models/ModalTimers.txt b/test/known-good/C/src/modal_models/ModalTimers.txt index 629cb22ce..4b3242dfe 100644 --- a/test/known-good/C/src/modal_models/ModalTimers.txt +++ b/test/known-good/C/src/modal_models/ModalTimers.txt @@ -1,17 +1,17 @@ /** Modal Reactor Test. Tests timers, their deactivation and reset in modes. */ target C { - fast: false, - timeout: 4 sec + fast: false, + timeout: 4 sec } import TraceTesting from "util/TraceTesting.lf" reactor Modal { - input next: bool + input next: bool - output mode_switch: int - output timer1: int - output timer2: int + output mode_switch: int + output timer1: int + output timer2: int initial mode One { timer T1(0, 750 msec) diff --git a/test/known-good/C/src/modal_models/MultipleOutputFeeder_2Connections.txt b/test/known-good/C/src/modal_models/MultipleOutputFeeder_2Connections.txt index f4eadb7b4..c89edec54 100644 --- a/test/known-good/C/src/modal_models/MultipleOutputFeeder_2Connections.txt +++ b/test/known-good/C/src/modal_models/MultipleOutputFeeder_2Connections.txt @@ -5,15 +5,15 @@ * if they are located in separate modes. */ target C { - fast: false, - timeout: 2 sec + fast: false, + timeout: 2 sec } import TraceTesting from "util/TraceTesting.lf" reactor Modal { - input next: bool - output count: int + input next: bool + output count: int initial mode One { counter1 = new Counter(period = 250 msec) @@ -28,11 +28,11 @@ } } -reactor Counter(period: time(1 sec)) { - output value: int +reactor Counter(period: time(1 sec)) { + output value: int timer t(0, period) - reset state curval: int(0) + reset state curval: int(0) reaction(t) -> value {= lf_set(value, self->curval++); =} } diff --git a/test/known-good/C/src/modal_models/MultipleOutputFeeder_ReactionConnections.txt b/test/known-good/C/src/modal_models/MultipleOutputFeeder_ReactionConnections.txt index 662d46391..599b88008 100644 --- a/test/known-good/C/src/modal_models/MultipleOutputFeeder_ReactionConnections.txt +++ b/test/known-good/C/src/modal_models/MultipleOutputFeeder_ReactionConnections.txt @@ -5,15 +5,15 @@ * destination if they are located in separate modes. */ target C { - fast: false, - timeout: 2 sec + fast: false, + timeout: 2 sec } import TraceTesting from "util/TraceTesting.lf" reactor Modal { - input next: bool - output count: int + input next: bool + output count: int initial mode One { counter1 = new Counter(period = 250 msec) @@ -31,11 +31,11 @@ } } -reactor Counter(period: time(1 sec)) { - output value: int +reactor Counter(period: time(1 sec)) { + output value: int timer t(0, period) - reset state curval: int(0) + reset state curval: int(0) reaction(t) -> value {= lf_set(value, self->curval++); =} } diff --git a/test/known-good/C/src/modal_models/util/TraceTesting.txt b/test/known-good/C/src/modal_models/util/TraceTesting.txt index e45eb0883..e216faf93 100644 --- a/test/known-good/C/src/modal_models/util/TraceTesting.txt +++ b/test/known-good/C/src/modal_models/util/TraceTesting.txt @@ -6,17 +6,17 @@ =} reactor TraceTesting( - events_size: int(0), - trace_size: int(0), - trace: int[](0), - training: bool(false) + events_size: int(0), + trace_size: int(0), + trace: int[](0), + training: bool(false) ) { - input[events_size] events: int + input[events_size] events: int - state last_reaction_time: int(0) - state trace_idx: int(0) - state recorded_events: int*(0) - state recorded_events_next: int(0) + state last_reaction_time: int(0) + state trace_idx: int(0) + state recorded_events: int*(0) + state recorded_events_next: int(0) reaction(startup) {= self->last_reaction_time = lf_time_logical(); =} diff --git a/test/known-good/C/src/multiport/BankGangedConnections.txt b/test/known-good/C/src/multiport/BankGangedConnections.txt index 459f36e1f..ee7d3db43 100644 --- a/test/known-good/C/src/multiport/BankGangedConnections.txt +++ b/test/known-good/C/src/multiport/BankGangedConnections.txt @@ -1,26 +1,26 @@ target C { - timeout: 0 sec + timeout: 0 sec } import Count from "../lib/Count.lf" import TestCount from "../lib/TestCount.lf" reactor Through { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= lf_set(out, in->value); =} } reactor Bank { - input in: int - output out: int + input in: int + output out: int t = new Through() in, t.out -> t.in, out } main reactor { - b = new[2] Bank() + b = new[2] Bank() s = new Count() t = new TestCount() s.out, b.out -> b.in, t.in diff --git a/test/known-good/C/src/multiport/BankIndexInitializer.txt b/test/known-good/C/src/multiport/BankIndexInitializer.txt index 2455b6055..79b45e13e 100644 --- a/test/known-good/C/src/multiport/BankIndexInitializer.txt +++ b/test/known-good/C/src/multiport/BankIndexInitializer.txt @@ -3,15 +3,15 @@ preamble {= int table[] = {4, 3, 2, 1}; =} -reactor Source(bank_index: int(0), value: int(0)) { - output out: int +reactor Source(bank_index: int(0), value: int(0)) { + output out: int reaction(startup) -> out {= lf_set(out, self->value); =} } -reactor Sink(width: int(4)) { - input[width] in: int - state received: bool(false) +reactor Sink(width: int(4)) { + input[width] in: int + state received: bool(false) reaction(in) {= for (int idx = 0; idx < in_width; idx++) { @@ -32,8 +32,8 @@ =} } -main reactor(width: int(4)) { - source = new[width] Source(value = {= table[bank_index] =}) +main reactor(width: int(4)) { + source = new[width] Source(value = {= table[bank_index] =}) sink = new Sink(width = width) source.out -> sink.in } diff --git a/test/known-good/C/src/multiport/BankMulticast.txt b/test/known-good/C/src/multiport/BankMulticast.txt index bf83a708c..e30627856 100644 --- a/test/known-good/C/src/multiport/BankMulticast.txt +++ b/test/known-good/C/src/multiport/BankMulticast.txt @@ -3,16 +3,16 @@ * also multicast via the container's output port. */ target C { - timeout: 3 sec, - fast: true + timeout: 3 sec, + fast: true } import Count from "../lib/Count.lf" import TestCount from "../lib/TestCount.lf" reactor Foo { - input in: int - output out: int + input in: int + output out: int c = new Count() c.out -> out @@ -22,9 +22,9 @@ } reactor Bar { - output[4] out: int + output[4] out: int - foo = new[4] Foo() + foo = new[4] Foo() foo.out -> foo.in foo.out -> out @@ -33,7 +33,7 @@ main reactor { bar = new Bar() - d = new[4] TestCount(num_inputs = 4) + d = new[4] TestCount(num_inputs = 4) bar.out -> d.in } diff --git a/test/known-good/C/src/multiport/BankMultiportToReaction.txt b/test/known-good/C/src/multiport/BankMultiportToReaction.txt index 548c0bd73..40b8157b8 100644 --- a/test/known-good/C/src/multiport/BankMultiportToReaction.txt +++ b/test/known-good/C/src/multiport/BankMultiportToReaction.txt @@ -1,22 +1,22 @@ target C { - timeout: 5 sec, - fast: true + timeout: 5 sec, + fast: true } import Count from "../lib/Count.lf" reactor DoubleCount { - output[2] out: int + output[2] out: int c1 = new Count() c2 = new Count() c1.out, c2.out -> out } main reactor { - state count: int(1) - state received: bool(false) + state count: int(1) + state received: bool(false) - s = new[2] DoubleCount() + s = new[2] DoubleCount() reaction(s.out) {= for (int i = 0; i < s_width; i++) { diff --git a/test/known-good/C/src/multiport/BankReactionsInContainer.txt b/test/known-good/C/src/multiport/BankReactionsInContainer.txt index 34d66b26f..06e000a7a 100644 --- a/test/known-good/C/src/multiport/BankReactionsInContainer.txt +++ b/test/known-good/C/src/multiport/BankReactionsInContainer.txt @@ -2,13 +2,13 @@ * This tests an output that is broadcast back to a multiport input of a bank. */ target C { - timeout: 1 sec + timeout: 1 sec } -reactor R(bank_index: int(0)) { - output[2] out: int - input[2] in: int - state received: bool(false) +reactor R(bank_index: int(0)) { + output[2] out: int + input[2] in: int + state received: bool(false) reaction(startup) -> out {= for (int i = 0; i < out_width; i++) { @@ -41,8 +41,8 @@ } main reactor { - s = new[2] R() - state received: bool(false) + s = new[2] R() + state received: bool(false) reaction(startup) -> s.in {= int count = 0; diff --git a/test/known-good/C/src/multiport/BankSelfBroadcast.txt b/test/known-good/C/src/multiport/BankSelfBroadcast.txt index 0ca423aaa..eb68c338c 100644 --- a/test/known-good/C/src/multiport/BankSelfBroadcast.txt +++ b/test/known-good/C/src/multiport/BankSelfBroadcast.txt @@ -7,10 +7,10 @@ */ target C -reactor A(bank_index: int(0)) { - input[4] in: int - output out: int - state received: bool(false) +reactor A(bank_index: int(0)) { + input[4] in: int + output out: int + state received: bool(false) reaction(startup) -> out {= lf_set(out, self->bank_index); =} @@ -43,7 +43,7 @@ } main reactor { - a = new[4] A() + a = new[4] A() (a.out)+ -> a.in } diff --git a/test/known-good/C/src/multiport/BankToBank.txt b/test/known-good/C/src/multiport/BankToBank.txt index 778353187..85e8efa48 100644 --- a/test/known-good/C/src/multiport/BankToBank.txt +++ b/test/known-good/C/src/multiport/BankToBank.txt @@ -1,13 +1,13 @@ // Check bank of reactors sending to bank of reactors. target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Source(bank_index: int(0)) { +reactor Source(bank_index: int(0)) { timer t(0, 200 msec) - output out: int - state s: int(0) + output out: int + state s: int(0) reaction(t) -> out {= lf_set(out, self->s); @@ -15,9 +15,9 @@ =} } -reactor Destination(bank_index: int(0)) { - state s: int(0) - input in: int +reactor Destination(bank_index: int(0)) { + state s: int(0) + input in: int reaction(in) {= printf("Destination %d received: %d.\n", self->bank_index, in->value); @@ -37,9 +37,9 @@ =} } -main reactor BankToBank(width: int(4)) { - a = new[width] Source() - b = new[width] Destination() +main reactor BankToBank(width: int(4)) { + a = new[width] Source() + b = new[width] Destination() a.out -> b.in } diff --git a/test/known-good/C/src/multiport/BankToBankMultiport.txt b/test/known-good/C/src/multiport/BankToBankMultiport.txt index 1104d1025..5dae36803 100644 --- a/test/known-good/C/src/multiport/BankToBankMultiport.txt +++ b/test/known-good/C/src/multiport/BankToBankMultiport.txt @@ -1,13 +1,13 @@ // Check bank of reactors sending to bank of reactors with multiports. target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Source(width: int(1)) { +reactor Source(width: int(1)) { timer t(0, 200 msec) - output[width] out: int - state s: int(0) + output[width] out: int + state s: int(0) reaction(t) -> out {= for(int i = 0; i < out_width; i++) { @@ -16,9 +16,9 @@ =} } -reactor Destination(width: int(1)) { - state s: int(6) - input[width] in: int +reactor Destination(width: int(1)) { + state s: int(6) + input[width] in: int reaction(in) {= int sum = 0; @@ -42,9 +42,9 @@ =} } -main reactor BankToBankMultiport(bank_width: int(4)) { - a = new[bank_width] Source(width = 4) - b = new[bank_width] Destination(width = 4) +main reactor BankToBankMultiport(bank_width: int(4)) { + a = new[bank_width] Source(width = 4) + b = new[bank_width] Destination(width = 4) a.out -> b.in } diff --git a/test/known-good/C/src/multiport/BankToBankMultiportAfter.txt b/test/known-good/C/src/multiport/BankToBankMultiportAfter.txt index b87b122b9..24ff3786b 100644 --- a/test/known-good/C/src/multiport/BankToBankMultiportAfter.txt +++ b/test/known-good/C/src/multiport/BankToBankMultiportAfter.txt @@ -1,13 +1,13 @@ // Check bank of reactors sending to bank of reactors with multiports. target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Source(width: int(1)) { +reactor Source(width: int(1)) { timer t(0, 200 msec) - output[width] out: int - state s: int(0) + output[width] out: int + state s: int(0) reaction(t) -> out {= for(int i = 0; i < out_width; i++) { @@ -16,9 +16,9 @@ =} } -reactor Destination(width: int(1)) { - state s: int(6) - input[width] in: int +reactor Destination(width: int(1)) { + state s: int(6) + input[width] in: int reaction(in) {= int sum = 0; @@ -42,9 +42,9 @@ =} } -main reactor(bank_width: int(4)) { - a = new[bank_width] Source(width = 4) - b = new[bank_width] Destination(width = 4) +main reactor(bank_width: int(4)) { + a = new[bank_width] Source(width = 4) + b = new[bank_width] Destination(width = 4) a.out -> b.in after 200 msec } diff --git a/test/known-good/C/src/multiport/BankToMultiport.txt b/test/known-good/C/src/multiport/BankToMultiport.txt index 358918876..ba9da0b7c 100644 --- a/test/known-good/C/src/multiport/BankToMultiport.txt +++ b/test/known-good/C/src/multiport/BankToMultiport.txt @@ -1,15 +1,15 @@ // Test bank of reactors to multiport input with id parameter in the bank. target C -reactor Source(bank_index: int(0)) { - output out: int +reactor Source(bank_index: int(0)) { + output out: int reaction(startup) -> out {= lf_set(out, self->bank_index); =} } -reactor Sink(width: int(4)) { - input[width] in: int - state received: bool(false) +reactor Sink(width: int(4)) { + input[width] in: int + state received: bool(false) reaction(in) {= for (int i = 0; i < in_width; i++) { @@ -32,8 +32,8 @@ =} } -main reactor BankToMultiport(width: int(5)) { - source = new[width] Source() +main reactor BankToMultiport(width: int(5)) { + source = new[width] Source() sink = new Sink(width = width) source.out -> sink.in } diff --git a/test/known-good/C/src/multiport/BankToReaction.txt b/test/known-good/C/src/multiport/BankToReaction.txt index 1cdb3caa2..0acff88b8 100644 --- a/test/known-good/C/src/multiport/BankToReaction.txt +++ b/test/known-good/C/src/multiport/BankToReaction.txt @@ -1,14 +1,14 @@ target C { - timeout: 5 sec, - fast: true + timeout: 5 sec, + fast: true } import Count from "../lib/Count.lf" main reactor { - state count: int(1) + state count: int(1) - s = new[2] Count() + s = new[2] Count() reaction(s.out) {= for (int i = 0; i < s_width; i++) { diff --git a/test/known-good/C/src/multiport/Broadcast.txt b/test/known-good/C/src/multiport/Broadcast.txt index 2d4a45f4e..c463fd403 100644 --- a/test/known-good/C/src/multiport/Broadcast.txt +++ b/test/known-good/C/src/multiport/Broadcast.txt @@ -1,17 +1,17 @@ target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { - output out: int + output out: int reaction(startup) -> out {= lf_set(out, 42); =} } -reactor Destination(bank_index: int(0)) { - input in: int - state received: bool(false) +reactor Destination(bank_index: int(0)) { + input in: int + state received: bool(false) reaction(in) {= printf("Destination %d received %d.\n", self->bank_index, in->value); @@ -33,7 +33,7 @@ main reactor { a = new Source() - b = new[4] Destination() + b = new[4] Destination() (a.out)+ -> b.in } diff --git a/test/known-good/C/src/multiport/BroadcastAfter.txt b/test/known-good/C/src/multiport/BroadcastAfter.txt index 29b2e1f94..c6a39c8b2 100644 --- a/test/known-good/C/src/multiport/BroadcastAfter.txt +++ b/test/known-good/C/src/multiport/BroadcastAfter.txt @@ -1,17 +1,17 @@ target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { - output out: int + output out: int reaction(startup) -> out {= lf_set(out, 42); =} } -reactor Destination(bank_index: int(0)) { - input in: int - state received: bool(false) +reactor Destination(bank_index: int(0)) { + input in: int + state received: bool(false) reaction(in) {= printf("Destination %d received %d.\n", self->bank_index, in->value); @@ -37,7 +37,7 @@ main reactor { a = new Source() - b = new[4] Destination() + b = new[4] Destination() (a.out)+ -> b.in after 1 sec } diff --git a/test/known-good/C/src/multiport/BroadcastMultipleAfter.txt b/test/known-good/C/src/multiport/BroadcastMultipleAfter.txt index 9d0a62caf..27614341b 100644 --- a/test/known-good/C/src/multiport/BroadcastMultipleAfter.txt +++ b/test/known-good/C/src/multiport/BroadcastMultipleAfter.txt @@ -1,17 +1,17 @@ target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Source(value: int(42)) { - output out: int +reactor Source(value: int(42)) { + output out: int reaction(startup) -> out {= lf_set(out, self->value); =} } -reactor Destination(bank_index: int(0)) { - input in: int - state received: bool(false) +reactor Destination(bank_index: int(0)) { + input in: int + state received: bool(false) reaction(in) {= printf("Destination %d received %d.\n", self->bank_index, in->value); @@ -40,7 +40,7 @@ a1 = new Source(value = 1) a2 = new Source(value = 2) a3 = new Source(value = 3) - b = new[9] Destination() + b = new[9] Destination() (a1.out, a2.out, a3.out)+ -> b.in after 1 sec } diff --git a/test/known-good/C/src/multiport/DualBanks.txt b/test/known-good/C/src/multiport/DualBanks.txt index 5ae8b6cfa..7d87494a2 100644 --- a/test/known-good/C/src/multiport/DualBanks.txt +++ b/test/known-good/C/src/multiport/DualBanks.txt @@ -1,8 +1,8 @@ target C -reactor Base(bank_index: int(0)) { - input I: int - state received: bool(false) +reactor Base(bank_index: int(0)) { + input I: int + state received: bool(false) reaction(shutdown) {= if(!self->received) { @@ -28,8 +28,8 @@ } main reactor { - hellos = new[3] Hello() - worlds = new[3] World() + hellos = new[3] Hello() + worlds = new[3] World() reaction(startup) -> hellos.I, worlds.I {= for(int i = 0; i < hellos_width; i++) { diff --git a/test/known-good/C/src/multiport/DualBanksMultiport.txt b/test/known-good/C/src/multiport/DualBanksMultiport.txt index 6227f3793..6ed5ce84a 100644 --- a/test/known-good/C/src/multiport/DualBanksMultiport.txt +++ b/test/known-good/C/src/multiport/DualBanksMultiport.txt @@ -1,8 +1,8 @@ target C -reactor Base(bank_index: int(0)) { - input[2] I: int - state received: bool(false) +reactor Base(bank_index: int(0)) { + input[2] I: int + state received: bool(false) reaction(shutdown) {= if(!self->received) { @@ -32,8 +32,8 @@ } main reactor { - hellos = new[3] Hello() - worlds = new[3] World() + hellos = new[3] Hello() + worlds = new[3] World() reaction(startup) -> hellos.I, worlds.I {= for(int i = 0; i < hellos_width; i++) { diff --git a/test/known-good/C/src/multiport/FullyConnected.txt b/test/known-good/C/src/multiport/FullyConnected.txt index 435d23864..87db77f8c 100644 --- a/test/known-good/C/src/multiport/FullyConnected.txt +++ b/test/known-good/C/src/multiport/FullyConnected.txt @@ -1,10 +1,10 @@ target C -reactor Node(num_nodes: size_t(4), bank_index: int(0)) { - input[num_nodes] in: int - output out: int +reactor Node(num_nodes: size_t(4), bank_index: int(0)) { + input[num_nodes] in: int + output out: int - state received: bool(false) + state received: bool(false) reaction(startup) -> out {= lf_print("Hello from node %d!", self->bank_index); @@ -35,8 +35,8 @@ =} } -main reactor(num_nodes: size_t(4)) { - nodes = new[num_nodes] Node(num_nodes = num_nodes) +main reactor(num_nodes: size_t(4)) { + nodes = new[num_nodes] Node(num_nodes = num_nodes) (nodes.out)+ -> nodes.in } diff --git a/test/known-good/C/src/multiport/FullyConnectedAddressable.txt b/test/known-good/C/src/multiport/FullyConnectedAddressable.txt index 1c526da2b..aee868363 100644 --- a/test/known-good/C/src/multiport/FullyConnectedAddressable.txt +++ b/test/known-good/C/src/multiport/FullyConnectedAddressable.txt @@ -1,12 +1,12 @@ // In this pattern, each node can send direct messages to individual other nodes target C -reactor Node(num_nodes: size_t(4), bank_index: int(0)) { - input[num_nodes] in: int - output[num_nodes] out: int +reactor Node(num_nodes: size_t(4), bank_index: int(0)) { + input[num_nodes] in: int + output[num_nodes] out: int - state received: int(0) - state triggered: bool(false) + state received: int(0) + state triggered: bool(false) reaction(startup) -> out {= int outChannel = (self->bank_index + 1) % self->num_nodes; @@ -29,7 +29,7 @@ } } printf("\n"); - int expected = self->bank_index == 0 ? self->num_nodes - 1 : self->bank_index - 1; + int expected = self->bank_index == 0 ? self->num_nodes - 1 : self->bank_index - 1; if (count != 1) { lf_print_error_and_exit("Received %d messages, but expecting only one!"); } @@ -45,11 +45,11 @@ =} } -main reactor(num_nodes: size_t(4)) { - nodes1 = new[num_nodes] Node(num_nodes = num_nodes) +main reactor(num_nodes: size_t(4)) { + nodes1 = new[num_nodes] Node(num_nodes = num_nodes) nodes1.out -> interleaved (nodes1.in) - nodes2 = new[num_nodes] Node(num_nodes = num_nodes) + nodes2 = new[num_nodes] Node(num_nodes = num_nodes) interleaved (nodes2.out) -> nodes2.in } diff --git a/test/known-good/C/src/multiport/FullyConnectedAddressableAfter.txt b/test/known-good/C/src/multiport/FullyConnectedAddressableAfter.txt index 395ee8b1b..925d31319 100644 --- a/test/known-good/C/src/multiport/FullyConnectedAddressableAfter.txt +++ b/test/known-good/C/src/multiport/FullyConnectedAddressableAfter.txt @@ -3,11 +3,11 @@ import Node from "FullyConnectedAddressable.lf" -main reactor(num_nodes: size_t(4)) { - nodes1 = new[num_nodes] Node(num_nodes = num_nodes) +main reactor(num_nodes: size_t(4)) { + nodes1 = new[num_nodes] Node(num_nodes = num_nodes) nodes1.out -> interleaved (nodes1.in) after 200 msec - nodes2 = new[num_nodes] Node(num_nodes = num_nodes) + nodes2 = new[num_nodes] Node(num_nodes = num_nodes) interleaved (nodes2.out) -> nodes2.in after 400 msec } diff --git a/test/known-good/C/src/multiport/MultiportFromBank.txt b/test/known-good/C/src/multiport/MultiportFromBank.txt index 50bc7de77..4347a62cb 100644 --- a/test/known-good/C/src/multiport/MultiportFromBank.txt +++ b/test/known-good/C/src/multiport/MultiportFromBank.txt @@ -1,21 +1,21 @@ // Check multiport output to bank of recipients. Here, the bank is smaller than // the width of the sending port. target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Source(check_override: int(0), bank_index: int(0)) { - output out: int +reactor Source(check_override: int(0), bank_index: int(0)) { + output out: int reaction(startup) -> out {= lf_set(out, self->bank_index * self->check_override); =} } -reactor Destination(port_width: int(3)) { - input[port_width] in: int - state received: bool(false) +reactor Destination(port_width: int(3)) { + input[port_width] in: int + state received: bool(false) reaction(in) {= for (int i = 0; i < in_width; i++) { @@ -37,8 +37,8 @@ =} } -main reactor MultiportFromBank(width: int(4)) { - a = new[width] Source(check_override = 1) +main reactor MultiportFromBank(width: int(4)) { + a = new[width] Source(check_override = 1) b = new Destination(port_width = width) a.out -> b.in } diff --git a/test/known-good/C/src/multiport/MultiportFromBankHierarchy.txt b/test/known-good/C/src/multiport/MultiportFromBankHierarchy.txt index 8d7e338a6..40b3c2437 100644 --- a/test/known-good/C/src/multiport/MultiportFromBankHierarchy.txt +++ b/test/known-good/C/src/multiport/MultiportFromBankHierarchy.txt @@ -1,19 +1,19 @@ // Check multiport output to bank of recipients. Here, the bank is smaller than // the width of the sending port. target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } import Source, Destination from "MultiportFromBank.lf" -reactor Container(port_width: int(3)) { - output[port_width] out: int - s = new[port_width] Source(check_override = 1) +reactor Container(port_width: int(3)) { + output[port_width] out: int + s = new[port_width] Source(check_override = 1) s.out -> out } -main reactor(width: int(4)) { +main reactor(width: int(4)) { a = new Container(port_width = width) b = new Destination(port_width = width) a.out -> b.in diff --git a/test/known-good/C/src/multiport/MultiportFromBankHierarchyAfter.txt b/test/known-good/C/src/multiport/MultiportFromBankHierarchyAfter.txt index 90df5da23..c8ba81020 100644 --- a/test/known-good/C/src/multiport/MultiportFromBankHierarchyAfter.txt +++ b/test/known-good/C/src/multiport/MultiportFromBankHierarchyAfter.txt @@ -1,8 +1,8 @@ // Check multiport output to bank of recipients. Here, the bank is smaller than // the width of the sending port. target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } import Destination from "MultiportFromBank.lf" diff --git a/test/known-good/C/src/multiport/MultiportFromHierarchy.txt b/test/known-good/C/src/multiport/MultiportFromHierarchy.txt index ab27e370d..4e63b8e15 100644 --- a/test/known-good/C/src/multiport/MultiportFromHierarchy.txt +++ b/test/known-good/C/src/multiport/MultiportFromHierarchy.txt @@ -1,14 +1,14 @@ // Check multiport output to multiport input, where the former is a hierarchical // reactor. target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Source(width: int(3)) { +reactor Source(width: int(3)) { timer t(0, 200 msec) - output[width] out: int - state s: int(0) + output[width] out: int + state s: int(0) reaction(t) -> out {= for(int i = 0; i < out_width; i++) { @@ -17,9 +17,9 @@ =} } -reactor Destination(width: int(3)) { - state s: int(6) - input[width] in: int +reactor Destination(width: int(3)) { + state s: int(6) + input[width] in: int reaction(in) {= int sum = 0; @@ -43,19 +43,19 @@ =} } -reactor Container(width: int(3)) { - output[width] out: int +reactor Container(width: int(3)) { + output[width] out: int src = new InsideContainer(width = width) src.out -> out } -reactor InsideContainer(width: int(3)) { - output[width] out: int +reactor InsideContainer(width: int(3)) { + output[width] out: int src = new Source(width = width) src.out -> out } -main reactor MultiportFromHierarchy(width: int(4)) { +main reactor MultiportFromHierarchy(width: int(4)) { a = new Container(width = width) b = new Destination(width = width) a.out -> b.in diff --git a/test/known-good/C/src/multiport/MultiportFromReaction.txt b/test/known-good/C/src/multiport/MultiportFromReaction.txt index f2819c486..62e146986 100644 --- a/test/known-good/C/src/multiport/MultiportFromReaction.txt +++ b/test/known-good/C/src/multiport/MultiportFromReaction.txt @@ -1,12 +1,12 @@ // Check reaction to multiport input of a contained reactor. target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Destination(width: int(1)) { - state s: int(6) - input[width] in: int +reactor Destination(width: int(1)) { + state s: int(6) + input[width] in: int reaction(in) {= int sum = 0; @@ -30,9 +30,9 @@ =} } -main reactor MultiportFromReaction(width: int(4)) { +main reactor MultiportFromReaction(width: int(4)) { timer t(0, 200 msec) - state s: int(0) + state s: int(0) b = new Destination(width = width) reaction(t) -> b.in {= diff --git a/test/known-good/C/src/multiport/MultiportIn.txt b/test/known-good/C/src/multiport/MultiportIn.txt index f3d933882..9bd36606e 100644 --- a/test/known-good/C/src/multiport/MultiportIn.txt +++ b/test/known-good/C/src/multiport/MultiportIn.txt @@ -1,14 +1,14 @@ // This is a version fo the Threaded test that uses a multiport input at the // destination. Its purpose is to test multiport inputs. target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { timer t(0, 200 msec) - output out: int - state s: int(0) + output out: int + state s: int(0) reaction(t) -> out {= lf_set(out, self->s); @@ -17,15 +17,15 @@ } reactor Computation { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= lf_set(out, in->value); =} } reactor Destination { - state s: int(0) - input[4] in: int + state s: int(0) + input[4] in: int reaction(in) {= int sum = 0; diff --git a/test/known-good/C/src/multiport/MultiportInParameterized.txt b/test/known-good/C/src/multiport/MultiportInParameterized.txt index f8bfdd346..05feadf19 100644 --- a/test/known-good/C/src/multiport/MultiportInParameterized.txt +++ b/test/known-good/C/src/multiport/MultiportInParameterized.txt @@ -1,14 +1,14 @@ // This is a version of the Threaded test that uses a multiport input at the // destination. Its purpose is to test multiport inputs. target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { timer t(0, 200 msec) - output out: int - state s: int(0) + output out: int + state s: int(0) reaction(t) -> out {= lf_set(out, self->s); @@ -17,15 +17,15 @@ } reactor Computation { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= lf_set(out, in->value); =} } -reactor Destination(width: int(1)) { - state s: int(0) - input[width] in: int +reactor Destination(width: int(1)) { + state s: int(0) + input[width] in: int reaction(in) {= int sum = 0; diff --git a/test/known-good/C/src/multiport/MultiportMutableInput.txt b/test/known-good/C/src/multiport/MultiportMutableInput.txt index 29dc61b4f..27fa9a34d 100644 --- a/test/known-good/C/src/multiport/MultiportMutableInput.txt +++ b/test/known-good/C/src/multiport/MultiportMutableInput.txt @@ -4,7 +4,7 @@ target C reactor Source { - output[2] out: int + output[2] out: int reaction(startup) -> out {= lf_set(out[0], 21); @@ -12,8 +12,8 @@ =} } -reactor Print(scale: int(1)) { // The scale parameter is just for testing. - input[2] in: int +reactor Print(scale: int(1)) { // The scale parameter is just for testing. + input[2] in: int reaction(in) {= int expected = 42; @@ -27,9 +27,9 @@ =} } -reactor Scale(scale: int(2)) { - mutable input[2] in: int - output[2] out: int +reactor Scale(scale: int(2)) { + mutable input[2] in: int + output[2] out: int reaction(in) -> out {= for(int j = 0; j < 2; j++) { diff --git a/test/known-good/C/src/multiport/MultiportMutableInputArray.txt b/test/known-good/C/src/multiport/MultiportMutableInputArray.txt index 01587e644..d26aaef4a 100644 --- a/test/known-good/C/src/multiport/MultiportMutableInputArray.txt +++ b/test/known-good/C/src/multiport/MultiportMutableInputArray.txt @@ -5,7 +5,7 @@ target C reactor Source { - output[2] out: int[] + output[2] out: int[] reaction(startup) -> out {= // Dynamically allocate an output array of length 3. @@ -26,8 +26,8 @@ =} } -reactor Print(scale: int(1)) { // The scale parameter is just for testing. - input[2] in: int[] +reactor Print(scale: int(1)) { // The scale parameter is just for testing. + input[2] in: int[] reaction(in) {= int count = 0; // For testing. @@ -52,9 +52,9 @@ =} } -reactor Scale(scale: int(2)) { - mutable input[2] in: int[] - output[2] out: int[] +reactor Scale(scale: int(2)) { + mutable input[2] in: int[] + output[2] out: int[] reaction(in) -> out {= for(int j = 0; j < in_width; j++) { diff --git a/test/known-good/C/src/multiport/MultiportOut.txt b/test/known-good/C/src/multiport/MultiportOut.txt index b74dd2381..3cab55d47 100644 --- a/test/known-good/C/src/multiport/MultiportOut.txt +++ b/test/known-good/C/src/multiport/MultiportOut.txt @@ -1,13 +1,13 @@ // Check multiport capabilities on Outputs. target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { timer t(0, 200 msec) - output[4] out: int - state s: int(0) + output[4] out: int + state s: int(0) reaction(t) -> out {= for(int i = 0; i < 4; i++) { @@ -18,8 +18,8 @@ } reactor Computation { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= // No need to sleep for this test. @@ -31,8 +31,8 @@ } reactor Destination { - state s: int(0) - input[4] in: int + state s: int(0) + input[4] in: int reaction(in) {= int sum = 0; diff --git a/test/known-good/C/src/multiport/MultiportToBank.txt b/test/known-good/C/src/multiport/MultiportToBank.txt index 977b44e60..6ed14f822 100644 --- a/test/known-good/C/src/multiport/MultiportToBank.txt +++ b/test/known-good/C/src/multiport/MultiportToBank.txt @@ -1,12 +1,12 @@ // Check multiport output to bank of recipients. target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Source(width: int(2)) { - output[width] out: int // Connected to a bank of Destination reactors - input dummy: int // Not connected to anything +reactor Source(width: int(2)) { + output[width] out: int // Connected to a bank of Destination reactors + input dummy: int // Not connected to anything reaction(startup) -> out {= for(int i = 0; i < out_width; i++) { @@ -24,9 +24,9 @@ =} } -reactor Destination(bank_index: int(0)) { - input in: int - state received: bool(false) +reactor Destination(bank_index: int(0)) { + input in: int + state received: bool(false) reaction(in) {= printf("Destination %d received %d.\n", self->bank_index, in->value); @@ -46,9 +46,9 @@ =} } -main reactor MultiportToBank(width: int(3)) { +main reactor MultiportToBank(width: int(3)) { a = new Source(width = width) - b = new[width] Destination() + b = new[width] Destination() a.out -> b.in } diff --git a/test/known-good/C/src/multiport/MultiportToBankAfter.txt b/test/known-good/C/src/multiport/MultiportToBankAfter.txt index 7d0863478..fdb4e8a2e 100644 --- a/test/known-good/C/src/multiport/MultiportToBankAfter.txt +++ b/test/known-good/C/src/multiport/MultiportToBankAfter.txt @@ -1,12 +1,12 @@ // Check multiport output to bank of recipients where the width of the bank is // inferred. target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Source(width: int(2)) { - output[width] out: int +reactor Source(width: int(2)) { + output[width] out: int reaction(startup) -> out {= for(int i = 0; i < out_width; i++) { @@ -15,9 +15,9 @@ =} } -reactor Destination(bank_index: int(0)) { - input in: int - state received: bool(false) +reactor Destination(bank_index: int(0)) { + input in: int + state received: bool(false) reaction(in) {= printf("Destination %d received %d.\n", self->bank_index, in->value); @@ -41,9 +41,9 @@ =} } -main reactor(width: int(3)) { +main reactor(width: int(3)) { a = new Source(width = width) - b = new[width] Destination() + b = new[width] Destination() a.out -> b.in after 1 sec // Width of the bank of delays will be inferred. } diff --git a/test/known-good/C/src/multiport/MultiportToBankDouble.txt b/test/known-good/C/src/multiport/MultiportToBankDouble.txt index 8fe0e1fd3..7329fac87 100644 --- a/test/known-good/C/src/multiport/MultiportToBankDouble.txt +++ b/test/known-good/C/src/multiport/MultiportToBankDouble.txt @@ -1,12 +1,12 @@ // Check multiport output to bank of recipients where the source has two // reactions that write to the output. target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { - output[3] out: int // Connected to a bank of Destination reactors + output[3] out: int // Connected to a bank of Destination reactors reaction(startup) -> out {= for(int i = 0; i < out_width; i++) { @@ -24,9 +24,9 @@ =} } -reactor Destination(bank_index: int(0)) { - input in: int - state received: bool(false) +reactor Destination(bank_index: int(0)) { + input in: int + state received: bool(false) reaction(in) {= printf("Destination %d received %d.\n", self->bank_index, in->value); @@ -48,7 +48,7 @@ main reactor { a = new Source() - b = new[3] Destination() + b = new[3] Destination() a.out -> b.in } diff --git a/test/known-good/C/src/multiport/MultiportToBankHierarchy.txt b/test/known-good/C/src/multiport/MultiportToBankHierarchy.txt index 8ec968cd3..7f21a1165 100644 --- a/test/known-good/C/src/multiport/MultiportToBankHierarchy.txt +++ b/test/known-good/C/src/multiport/MultiportToBankHierarchy.txt @@ -1,12 +1,12 @@ // Check multiport output to bank of recipients. Here, the bank is smaller than // the width of the sending port. target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Source(width: int(2)) { - output[width] out: int +reactor Source(width: int(2)) { + output[width] out: int reaction(startup) -> out {= for(int i = 0; i < out_width; i++) { @@ -15,9 +15,9 @@ =} } -reactor Destination(bank_index: int(0)) { - input in: int - state received: bool(false) +reactor Destination(bank_index: int(0)) { + input in: int + state received: bool(false) reaction(in) {= printf("Destination %d received %d.\n", self->bank_index, in->value); @@ -37,13 +37,13 @@ =} } -reactor Container(width: int(2)) { - input[width] in: int - c = new[width] Destination() +reactor Container(width: int(2)) { + input[width] in: int + c = new[width] Destination() in -> c.in } -main reactor MultiportToBankHierarchy(width: int(3)) { +main reactor MultiportToBankHierarchy(width: int(3)) { a = new Source(width = width) b = new Container(width = width) a.out -> b.in diff --git a/test/known-good/C/src/multiport/MultiportToHierarchy.txt b/test/known-good/C/src/multiport/MultiportToHierarchy.txt index 979b30f53..49c26fe35 100644 --- a/test/known-good/C/src/multiport/MultiportToHierarchy.txt +++ b/test/known-good/C/src/multiport/MultiportToHierarchy.txt @@ -2,14 +2,14 @@ // reactor. Note that the destination reactor has width wider than the sender, // so one input is dangling. target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Source(width: int(2)) { +reactor Source(width: int(2)) { timer t(0, 200 msec) - output[width] out: int - state s: int(0) + output[width] out: int + state s: int(0) reaction(t) -> out {= for(int i = 0; i < 4; i++) { @@ -18,9 +18,9 @@ =} } -reactor Destination(width: int(4)) { - state s: int(6) - input[width] in: int +reactor Destination(width: int(4)) { + state s: int(6) + input[width] in: int reaction(in) {= int sum = 0; @@ -44,13 +44,13 @@ =} } -reactor Container(width: int(4)) { - input[width] in: int +reactor Container(width: int(4)) { + input[width] in: int dst = new Destination() in -> dst.in } -main reactor MultiportToHierarchy(width: int(4)) { +main reactor MultiportToHierarchy(width: int(4)) { a = new Source(width = width) b = new Container(width = width) a.out -> b.in diff --git a/test/known-good/C/src/multiport/MultiportToMultiport.txt b/test/known-good/C/src/multiport/MultiportToMultiport.txt index c3c9162ca..cc920d8ff 100644 --- a/test/known-good/C/src/multiport/MultiportToMultiport.txt +++ b/test/known-good/C/src/multiport/MultiportToMultiport.txt @@ -1,13 +1,13 @@ // Check multiport output to multiport input. target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Source(width: int(1)) { +reactor Source(width: int(1)) { timer t(0, 200 msec) - output[width] out: int - state s: int(0) + output[width] out: int + state s: int(0) reaction(t) -> out {= for(int i = 0; i < out_width; i++) { @@ -19,9 +19,9 @@ =} } -reactor Destination(width: int(1)) { - state s: int(6) - input[width] in: int +reactor Destination(width: int(1)) { + state s: int(6) + input[width] in: int reaction(in) {= int sum = 0; @@ -45,7 +45,7 @@ =} } -main reactor MultiportToMultiport(width: int(4)) { +main reactor MultiportToMultiport(width: int(4)) { a = new Source(width = width) b = new Destination(width = width) a.out -> b.in diff --git a/test/known-good/C/src/multiport/MultiportToMultiport2.txt b/test/known-good/C/src/multiport/MultiportToMultiport2.txt index 3965fd9e4..c41cdc09a 100644 --- a/test/known-good/C/src/multiport/MultiportToMultiport2.txt +++ b/test/known-good/C/src/multiport/MultiportToMultiport2.txt @@ -1,8 +1,8 @@ // Test multiport to multiport connections. See also MultiportToMultiport. target C -reactor Source(width: int(2)) { - output[width] out: int +reactor Source(width: int(2)) { + output[width] out: int reaction(startup) -> out {= for (int i = 0; i < out_width; i++) { @@ -11,8 +11,8 @@ =} } -reactor Destination(width: int(2)) { - input[width] in: int +reactor Destination(width: int(2)) { + input[width] in: int reaction(in) {= for (int i = 0; i < in_width; i++) { @@ -30,9 +30,9 @@ } main reactor MultiportToMultiport2( - width1: int(3), - width2: int(2), - width3: int(5) + width1: int(3), + width2: int(2), + width3: int(5) ) { a1 = new Source(width = width1) a2 = new Source(width = width2) diff --git a/test/known-good/C/src/multiport/MultiportToMultiport2After.txt b/test/known-good/C/src/multiport/MultiportToMultiport2After.txt index fd8c5f66a..69cb2cc32 100644 --- a/test/known-good/C/src/multiport/MultiportToMultiport2After.txt +++ b/test/known-good/C/src/multiport/MultiportToMultiport2After.txt @@ -1,8 +1,8 @@ // Test multiport to multiport connections. See also MultiportToMultiport. target C -reactor Source(width: int(2)) { - output[width] out: int +reactor Source(width: int(2)) { + output[width] out: int reaction(startup) -> out {= for (int i = 0; i < out_width; i++) { @@ -11,8 +11,8 @@ =} } -reactor Destination(width: int(2)) { - input[width] in: int +reactor Destination(width: int(2)) { + input[width] in: int reaction(in) {= for (int i = 0; i < in_width; i++) { diff --git a/test/known-good/C/src/multiport/MultiportToMultiportArray.txt b/test/known-good/C/src/multiport/MultiportToMultiportArray.txt index b46346bbd..b32874d19 100644 --- a/test/known-good/C/src/multiport/MultiportToMultiportArray.txt +++ b/test/known-good/C/src/multiport/MultiportToMultiportArray.txt @@ -1,14 +1,14 @@ // Check multiport output to multiport input. Destination port is wider than // sending port. target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { timer t(0, 200 msec) - output[2] out: int[] - state s: int(0) + output[2] out: int[] + state s: int(0) reaction(t) -> out {= for(int i = 0; i < 2; i++) { @@ -24,8 +24,8 @@ } reactor Destination { - state s: int(15) - input[2] in: int[] + state s: int(15) + input[2] in: int[] reaction(in) {= int sum = 0; diff --git a/test/known-good/C/src/multiport/MultiportToMultiportParameter.txt b/test/known-good/C/src/multiport/MultiportToMultiportParameter.txt index f73002814..2a4ddf08a 100644 --- a/test/known-good/C/src/multiport/MultiportToMultiportParameter.txt +++ b/test/known-good/C/src/multiport/MultiportToMultiportParameter.txt @@ -1,13 +1,13 @@ // Check multiport output to multiport input. target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Source(width: int(1)) { +reactor Source(width: int(1)) { timer t(0, 200 msec) - output[width] out: int - state s: int(0) + output[width] out: int + state s: int(0) reaction(t) -> out {= for(int i = 0; i < out_width; i++) { @@ -19,9 +19,9 @@ =} } -reactor Destination(width: int(1)) { - state s: int(6) - input[width] in: int // Width is one larger than that of the source. +reactor Destination(width: int(1)) { + state s: int(6) + input[width] in: int // Width is one larger than that of the source. reaction(in) {= int sum = 0; @@ -45,7 +45,7 @@ =} } -main reactor(width: int(4)) { +main reactor(width: int(4)) { a = new Source(width = width) b = new Destination(width = width) a.out -> b.in diff --git a/test/known-good/C/src/multiport/MultiportToPort.txt b/test/known-good/C/src/multiport/MultiportToPort.txt index ac0672a28..8430bd197 100644 --- a/test/known-good/C/src/multiport/MultiportToPort.txt +++ b/test/known-good/C/src/multiport/MultiportToPort.txt @@ -1,12 +1,12 @@ // Check multiport output to multiport input. Destination port is wider than // sending port. target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { - output[2] out: int + output[2] out: int reaction(startup) -> out {= for(int i = 0; i < out_width; i++) { @@ -16,9 +16,9 @@ =} } -reactor Destination(expected: int(0)) { - input in: int - state received: bool(false) +reactor Destination(expected: int(0)) { + input in: int + state received: bool(false) reaction(in) {= printf("Received: %d.\n", in->value); diff --git a/test/known-good/C/src/multiport/MultiportToReaction.txt b/test/known-good/C/src/multiport/MultiportToReaction.txt index 0ec525497..14242a7f7 100644 --- a/test/known-good/C/src/multiport/MultiportToReaction.txt +++ b/test/known-good/C/src/multiport/MultiportToReaction.txt @@ -1,13 +1,13 @@ // Check reaction to multiport output of a contained reactor. target C { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Source(width: int(1)) { +reactor Source(width: int(1)) { timer t(0, 200 msec) - state s: int(0) - output[width] out: int + state s: int(0) + output[width] out: int reaction(t) -> out {= printf("Sending.\n"); @@ -18,7 +18,7 @@ } main reactor MultiportToReaction { - state s: int(6) + state s: int(6) b = new Source(width = 4) reaction(b.out) {= diff --git a/test/known-good/C/src/multiport/NestedBanks.txt b/test/known-good/C/src/multiport/NestedBanks.txt index 4934e8d9e..7743d8345 100644 --- a/test/known-good/C/src/multiport/NestedBanks.txt +++ b/test/known-good/C/src/multiport/NestedBanks.txt @@ -5,22 +5,22 @@ target C main reactor { - a = new[2] A() - c = new[3] C() + a = new[2] A() + c = new[3] C() d = new D() e = new E() (a.x)+ -> c.z, d.u, e.t } -reactor A(bank_index: int(0)) { - output[4] x: int - b = new[2] B(a_bank_index = bank_index) +reactor A(bank_index: int(0)) { + output[4] x: int + b = new[2] B(a_bank_index = bank_index) b.y -> x } -reactor B(a_bank_index: int(0), bank_index: int(0)) { - output[2] y: int +reactor B(a_bank_index: int(0), bank_index: int(0)) { + output[2] y: int reaction(startup) -> y {= int base = self->a_bank_index * 4 + self->bank_index * 2; @@ -29,15 +29,15 @@ =} } -reactor C(bank_index: int(0)) { - input[2] z: int +reactor C(bank_index: int(0)) { + input[2] z: int f = new F(c_bank_index = bank_index) g = new G(c_bank_index = bank_index) z -> f.w, g.s } reactor D { - input[2] u: int + input[2] u: int reaction(u) {= for (int i = 0; i < u_width; i++) { @@ -50,7 +50,7 @@ } reactor E { - input[8] t: int + input[8] t: int reaction(t) {= for (int i = 0; i < t_width; i++) { @@ -59,8 +59,8 @@ =} } -reactor F(c_bank_index: int(0)) { - input w: int +reactor F(c_bank_index: int(0)) { + input w: int reaction(w) {= lf_print("c[%d].f.w received %d.", self->c_bank_index, w->value); @@ -70,8 +70,8 @@ =} } -reactor G(c_bank_index: int(0)) { - input s: int +reactor G(c_bank_index: int(0)) { + input s: int reaction(s) {= lf_print("c[%d].g.s received %d.", self->c_bank_index, s->value); diff --git a/test/known-good/C/src/multiport/NestedInterleavedBanks.txt b/test/known-good/C/src/multiport/NestedInterleavedBanks.txt index 71f9d4301..dd8e59d15 100644 --- a/test/known-good/C/src/multiport/NestedInterleavedBanks.txt +++ b/test/known-good/C/src/multiport/NestedInterleavedBanks.txt @@ -4,8 +4,8 @@ */ target C -reactor A(bank_index: int(0), outer_bank_index: int(0)) { - output[2] p: int +reactor A(bank_index: int(0), outer_bank_index: int(0)) { + output[2] p: int reaction(startup) -> p {= for (int i = 0; i < p_width; i++) { @@ -15,14 +15,14 @@ =} } -reactor B(bank_index: int(0)) { - output[4] q: int - a = new[2] A(outer_bank_index = bank_index) +reactor B(bank_index: int(0)) { + output[4] q: int + a = new[2] A(outer_bank_index = bank_index) interleaved (a.p) -> q } reactor C { - input[8] i: int + input[8] i: int reaction(i) {= int expected[] = {1, 3, 2, 4, 5, 7, 6, 8}; @@ -36,7 +36,7 @@ } main reactor { - b = new[2] B() + b = new[2] B() c = new C() b.q -> c.i } diff --git a/test/known-good/C/src/multiport/PipelineAfter.txt b/test/known-good/C/src/multiport/PipelineAfter.txt index d3b28e84d..b45af433e 100644 --- a/test/known-good/C/src/multiport/PipelineAfter.txt +++ b/test/known-good/C/src/multiport/PipelineAfter.txt @@ -1,20 +1,20 @@ target C reactor Source { - output out: unsigned + output out: unsigned reaction(startup) -> out {= lf_set(out, 40); =} } reactor Compute { - input in: unsigned - output out: unsigned + input in: unsigned + output out: unsigned reaction(in) -> out {= lf_set(out, in->value + 2); =} } reactor Sink { - input in: unsigned + input in: unsigned reaction(in) {= printf("Received %d\n", in->value); diff --git a/test/known-good/C/src/multiport/ReactionToContainedBank.txt b/test/known-good/C/src/multiport/ReactionToContainedBank.txt index 33c82b83f..88af87bbc 100644 --- a/test/known-good/C/src/multiport/ReactionToContainedBank.txt +++ b/test/known-good/C/src/multiport/ReactionToContainedBank.txt @@ -1,16 +1,16 @@ // Test reaction sending messages to a contained bank of reactors. target C { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } import TestCount from "../lib/TestCount.lf" -main reactor ReactionToContainedBank(width: int(2)) { +main reactor ReactionToContainedBank(width: int(2)) { timer t(0, 100 msec) - state count: int(1) + state count: int(1) - test = new[width] TestCount(num_inputs = 11) + test = new[width] TestCount(num_inputs = 11) reaction(t) -> test.in {= for (int i = 0; i < self->width; i++) { diff --git a/test/known-good/C/src/multiport/ReactionToContainedBank2.txt b/test/known-good/C/src/multiport/ReactionToContainedBank2.txt index 5354a3559..67b67fe0c 100644 --- a/test/known-good/C/src/multiport/ReactionToContainedBank2.txt +++ b/test/known-good/C/src/multiport/ReactionToContainedBank2.txt @@ -1,16 +1,16 @@ // Test reaction sending messages to a contained bank of reactors. target C { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } import TestCount from "../lib/TestCount.lf" -reactor ReactionToContainedBank(width: int(2)) { +reactor ReactionToContainedBank(width: int(2)) { timer t(0, 100 msec) - state count: int(1) + state count: int(1) - test = new[width] TestCount(num_inputs = 11) + test = new[width] TestCount(num_inputs = 11) reaction(t) -> test.in {= for (int i = 0; i < self->width; i++) { @@ -20,7 +20,7 @@ =} } -main reactor(width: int(2)) { +main reactor(width: int(2)) { a = new ReactionToContainedBank(width = width) b = new ReactionToContainedBank(width = 4) } diff --git a/test/known-good/C/src/multiport/ReactionToContainedBankMultiport.txt b/test/known-good/C/src/multiport/ReactionToContainedBankMultiport.txt index b6051562e..04e6202c4 100644 --- a/test/known-good/C/src/multiport/ReactionToContainedBankMultiport.txt +++ b/test/known-good/C/src/multiport/ReactionToContainedBankMultiport.txt @@ -1,17 +1,17 @@ // Test reaction sending messages to a contained bank of reactors with a // multiport input. target C { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } import TestCountMultiport from "../lib/TestCountMultiport.lf" -main reactor(width: int(2)) { +main reactor(width: int(2)) { timer t(0, 100 msec) - state count: int(1) + state count: int(1) - test = new[width] TestCountMultiport(num_inputs = 11, width = width) + test = new[width] TestCountMultiport(num_inputs = 11, width = width) reaction(t) -> test.in {= for (int i = 0; i < self->width; i++) { diff --git a/test/known-good/C/src/multiport/ReactionsToNested.txt b/test/known-good/C/src/multiport/ReactionsToNested.txt index a8d5204dc..2699a42c9 100644 --- a/test/known-good/C/src/multiport/ReactionsToNested.txt +++ b/test/known-good/C/src/multiport/ReactionsToNested.txt @@ -1,12 +1,12 @@ // This test connects a simple counting source to tester that checks against its // own count. target C { - timeout: 1 sec + timeout: 1 sec } -reactor T(expected: int(0)) { - input z: int - state received: bool(false) +reactor T(expected: int(0)) { + input z: int + state received: bool(false) reaction(z) {= lf_print("T received %d", z->value); @@ -24,7 +24,7 @@ } reactor D { - input[2] y: int + input[2] y: int t1 = new T(expected = 42) t2 = new T(expected = 43) y -> t1.z, t2.z diff --git a/test/known-good/C/src/multiport/Sparse.txt b/test/known-good/C/src/multiport/Sparse.txt index e514cfd90..469738cf8 100644 --- a/test/known-good/C/src/multiport/Sparse.txt +++ b/test/known-good/C/src/multiport/Sparse.txt @@ -1,11 +1,11 @@ /** Test reading of sparse inputs on a multiport. */ target C { - timeout: 20 ms + timeout: 20 ms } -reactor SparseSource(width: int(20)) { - output[width] out: int - state count: int(0) +reactor SparseSource(width: int(20)) { + output[width] out: int + state count: int(0) timer t(0, 1 msec) reaction(t) -> out {= @@ -19,8 +19,8 @@ =} } -reactor SparseSink(width: int(20)) { - input[width] in: int +reactor SparseSink(width: int(20)) { + input[width] in: int reaction(in) {= struct lf_multiport_iterator_t i = lf_multiport_iterator(in); @@ -43,7 +43,7 @@ =} } -main reactor(width: int(20)) { +main reactor(width: int(20)) { s = new SparseSource(width = width) d = new SparseSink(width = width) s.out -> d.in diff --git a/test/known-good/C/src/multiport/SparseFallback.txt b/test/known-good/C/src/multiport/SparseFallback.txt index ae44e0fc4..92d3df435 100644 --- a/test/known-good/C/src/multiport/SparseFallback.txt +++ b/test/known-good/C/src/multiport/SparseFallback.txt @@ -3,12 +3,12 @@ * the multiport is high enough to force the fallback policy to kick in. */ target C { - timeout: 20 ms + timeout: 20 ms } -reactor SparseSource(width: int(20)) { - output[width] out: int - state count: int(0) +reactor SparseSource(width: int(20)) { + output[width] out: int + state count: int(0) timer t(0, 1 msec) reaction(t) -> out {= @@ -22,8 +22,8 @@ =} } -reactor SparseSink(width: int(20)) { - input[width] in: int +reactor SparseSink(width: int(20)) { + input[width] in: int reaction(in) {= struct lf_multiport_iterator_t i = lf_multiport_iterator(in); @@ -46,7 +46,7 @@ =} } -main reactor(width: int(10)) { +main reactor(width: int(10)) { s = new SparseSource(width = width) d = new SparseSink(width = width) s.out -> d.in diff --git a/test/known-good/C/src/multiport/TriggerDownstreamOnlyIfPresent.txt b/test/known-good/C/src/multiport/TriggerDownstreamOnlyIfPresent.txt index 8ff8d9aba..acb0f26c8 100644 --- a/test/known-good/C/src/multiport/TriggerDownstreamOnlyIfPresent.txt +++ b/test/known-good/C/src/multiport/TriggerDownstreamOnlyIfPresent.txt @@ -3,14 +3,14 @@ * is present. */ target C { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } reactor Source { - output a: int - output b: int - state count: int(0) + output a: int + output b: int + state count: int(0) timer t(0, 200 msec) reaction(t) -> a, b {= @@ -23,8 +23,8 @@ } reactor Destination { - input a: int - input b: int + input a: int + input b: int reaction(a) {= if (!a->is_present) { @@ -42,8 +42,8 @@ } main reactor TriggerDownstreamOnlyIfPresent { - s = new[2] Source() - d = new[2] Destination() + s = new[2] Source() + d = new[2] Destination() s.a -> d.a s.b -> d.b } diff --git a/test/known-good/C/src/serialization/PersonProtocolBuffers.txt b/test/known-good/C/src/serialization/PersonProtocolBuffers.txt index 7b3805bbd..45ddf2810 100644 --- a/test/known-good/C/src/serialization/PersonProtocolBuffers.txt +++ b/test/known-good/C/src/serialization/PersonProtocolBuffers.txt @@ -20,7 +20,7 @@ * a Mac, this is typically at /usr/local/bin. */ target C { - protobufs: Person.proto + protobufs: Person.proto } main reactor { diff --git a/test/known-good/C/src/serialization/ProtoNoPacking.txt b/test/known-good/C/src/serialization/ProtoNoPacking.txt index 9773ac8c4..4932399ef 100644 --- a/test/known-good/C/src/serialization/ProtoNoPacking.txt +++ b/test/known-good/C/src/serialization/ProtoNoPacking.txt @@ -19,11 +19,11 @@ * a Mac, this is typically at /usr/local/bin. */ target C { - protobufs: [ProtoHelloWorld.proto] + protobufs: [ProtoHelloWorld.proto] } reactor SourceProto { - output out: ProtoHelloWorld + output out: ProtoHelloWorld reaction(startup) -> out {= out->value.name = "Hello World"; @@ -33,7 +33,7 @@ } reactor SinkProto { - input in: ProtoHelloWorld + input in: ProtoHelloWorld reaction(in) {= printf("Received: name=\"%s\", number=%d.\n", in->value.name, in->value.number); diff --git a/test/known-good/C/src/serialization/ROSBuiltInSerialization.txt b/test/known-good/C/src/serialization/ROSBuiltInSerialization.txt index c6fb56e6d..50ca4c3d8 100644 --- a/test/known-good/C/src/serialization/ROSBuiltInSerialization.txt +++ b/test/known-good/C/src/serialization/ROSBuiltInSerialization.txt @@ -20,8 +20,8 @@ * @author Soroush Bateni */ target CCpp { - cmake-include: "include/CMakeListsExtension.txt", - timeout: 2 sec + cmake-include: "include/CMakeListsExtension.txt", + timeout: 2 sec } preamble {= @@ -29,10 +29,10 @@ =} reactor Sender { - output out: std_msgs::msg::Int32 + output out: std_msgs::msg::Int32 // state serialized_msg_pcl:rclcpp::SerializedMessage({=0u=}); - state count: int(0) + state count: int(0) timer t(0, 1 sec) @@ -44,8 +44,8 @@ } reactor Receiver { - input in: std_msgs::msg::Int32 - state count: int(0) + input in: std_msgs::msg::Int32 + state count: int(0) reaction(in) {= // Print the ROS2 message data diff --git a/test/known-good/C/src/serialization/ROSBuiltInSerializationSharedPtr.txt b/test/known-good/C/src/serialization/ROSBuiltInSerializationSharedPtr.txt index a9ba5ef42..655a1132b 100644 --- a/test/known-good/C/src/serialization/ROSBuiltInSerializationSharedPtr.txt +++ b/test/known-good/C/src/serialization/ROSBuiltInSerializationSharedPtr.txt @@ -20,8 +20,8 @@ * @author Soroush Bateni */ target CCpp { - cmake-include: "include/CMakeListsExtension.txt", - timeout: 2 sec + cmake-include: "include/CMakeListsExtension.txt", + timeout: 2 sec } preamble {= @@ -29,9 +29,9 @@ =} reactor Sender { - output out: std::shared_ptrmsg::Int32> + output out: std::shared_ptr<std_msgs::msg::Int32> - state count: int(0) + state count: int(0) timer t(0, 1 sec) @@ -43,8 +43,8 @@ } reactor Receiver { - input in: std::shared_ptrmsg::Int32> - state count: int(0) + input in: std::shared_ptr<std_msgs::msg::Int32> + state count: int(0) reaction(in) {= // Print the ROS2 message data diff --git a/test/known-good/C/src/target/CMakeInclude.txt b/test/known-good/C/src/target/CMakeInclude.txt index 05b1f67fa..ba14700ee 100644 --- a/test/known-good/C/src/target/CMakeInclude.txt +++ b/test/known-good/C/src/target/CMakeInclude.txt @@ -3,11 +3,11 @@ * failure to compile. */ target C { - cmake-include: [ + cmake-include: [ "../include/mlib-cmake-extension.cmake", "../include/foo-cmake-compile-definition.txt" ], - timeout: 0 sec + timeout: 0 sec } reactor Foo { diff --git a/test/known-good/C/src/target/DistributedCMakeInclude.txt b/test/known-good/C/src/target/DistributedCMakeInclude.txt index 78a437654..ced3deeaa 100644 --- a/test/known-good/C/src/target/DistributedCMakeInclude.txt +++ b/test/known-good/C/src/target/DistributedCMakeInclude.txt @@ -4,8 +4,8 @@ * compile. */ target C { - timeout: 0 sec, - cmake-include: "include/bar-cmake-compile-definition.cmake" + timeout: 0 sec, + cmake-include: "include/bar-cmake-compile-definition.cmake" } import Baz from "lib/ImportedCMakeInclude.lf" diff --git a/test/known-good/C/src/target/DistributedCMakeIncludeSeparateCompile.txt b/test/known-good/C/src/target/DistributedCMakeIncludeSeparateCompile.txt index b8db83090..fcd01e87d 100644 --- a/test/known-good/C/src/target/DistributedCMakeIncludeSeparateCompile.txt +++ b/test/known-good/C/src/target/DistributedCMakeIncludeSeparateCompile.txt @@ -4,7 +4,7 @@ * The failure for this test is failure to compile. */ target C { - timeout: 0 sec + timeout: 0 sec } import Foo from "CMakeInclude.lf" diff --git a/test/known-good/C/src/target/Files.txt b/test/known-good/C/src/target/Files.txt index 7e054fbfa..b6c5b5e26 100644 --- a/test/known-good/C/src/target/Files.txt +++ b/test/known-good/C/src/target/Files.txt @@ -1,6 +1,6 @@ /** Test the files target property. */ target C { - files: ["../include", "include/dummy.h"] + files: ["../include", "include/dummy.h"] } preamble {= diff --git a/test/known-good/C/src/target/HelloWorldCCPP.txt b/test/known-good/C/src/target/HelloWorldCCPP.txt index 208924270..9f74d7256 100644 --- a/test/known-good/C/src/target/HelloWorldCCPP.txt +++ b/test/known-good/C/src/target/HelloWorldCCPP.txt @@ -3,15 +3,15 @@ * CMake build system. This test should not pass if it does not compile. */ target CCpp { - tracing: true, - logging: DEBUG + tracing: true, + logging: DEBUG } reactor HelloWorld { preamble {= #include =} - state success: bool(false) + state success: bool(false) reaction(startup) {= std::cout << "Hello World." << std::endl; diff --git a/test/known-good/C/src/target/HelloWorldFederatedCCPP.txt b/test/known-good/C/src/target/HelloWorldFederatedCCPP.txt index 2620a994d..3583dcea4 100644 --- a/test/known-good/C/src/target/HelloWorldFederatedCCPP.txt +++ b/test/known-good/C/src/target/HelloWorldFederatedCCPP.txt @@ -3,9 +3,9 @@ * target. This test should not pass if it does not compile. */ target CCpp { - tracing: true, - coordination: centralized, - timeout: 1 sec + tracing: true, + coordination: centralized, + timeout: 1 sec } import HelloWorld from "HelloWorldCCPP.lf" diff --git a/test/known-good/C/src/target/HelloWorldThreadedCPP.txt b/test/known-good/C/src/target/HelloWorldThreadedCPP.txt index e5839e29c..2fe1f8b13 100644 --- a/test/known-good/C/src/target/HelloWorldThreadedCPP.txt +++ b/test/known-good/C/src/target/HelloWorldThreadedCPP.txt @@ -3,8 +3,8 @@ * should not pass if it does not compile. */ target CCpp { - tracing: true, - logging: DEBUG + tracing: true, + logging: DEBUG } import HelloWorld from "HelloWorldCCPP.lf" diff --git a/test/known-good/C/src/target/Platform.txt b/test/known-good/C/src/target/Platform.txt index 31790fd00..4a651a44a 100644 --- a/test/known-good/C/src/target/Platform.txt +++ b/test/known-good/C/src/target/Platform.txt @@ -1,6 +1,6 @@ /** Test that the cross-compile capability works as expected. */ target C { - platform: "Mac" + platform: "Mac" } main reactor { diff --git a/test/known-good/C/src/target/lib/ImportedCMakeInclude.txt b/test/known-good/C/src/target/lib/ImportedCMakeInclude.txt index 24b6706ab..3313f1891 100644 --- a/test/known-good/C/src/target/lib/ImportedCMakeInclude.txt +++ b/test/known-good/C/src/target/lib/ImportedCMakeInclude.txt @@ -1,5 +1,5 @@ target C { - cmake-include: "../include/baz-cmake-compile-definition.cmake" + cmake-include: "../include/baz-cmake-compile-definition.cmake" } reactor Baz { diff --git a/test/known-good/C/src/token/TokenContainedPrint.txt b/test/known-good/C/src/token/TokenContainedPrint.txt index bf787d571..2b9e900b1 100644 --- a/test/known-good/C/src/token/TokenContainedPrint.txt +++ b/test/known-good/C/src/token/TokenContainedPrint.txt @@ -3,13 +3,13 @@ * @author Edward A. Lee (eal@berkeley.edu) */ target C { - timeout: 2 ms + timeout: 2 ms } import TokenPrint from "lib/Token.lf" main reactor { - state count: int(0) + state count: int(0) timer t(0, 1 ms) p = new TokenPrint() diff --git a/test/known-good/C/src/token/TokenContainedPrintBank.txt b/test/known-good/C/src/token/TokenContainedPrintBank.txt index a6092a25b..40ceb6edf 100644 --- a/test/known-good/C/src/token/TokenContainedPrintBank.txt +++ b/test/known-good/C/src/token/TokenContainedPrintBank.txt @@ -4,15 +4,15 @@ * @author Edward A. Lee (eal@berkeley.edu) */ target C { - timeout: 2 ms + timeout: 2 ms } import TokenPrint from "lib/Token.lf" main reactor { - state count: int(0) + state count: int(0) timer t(0, 1 ms) - p = new[2] TokenPrint() + p = new[2] TokenPrint() reaction(startup) -> p.in {= for (int j = 0; j < p_width; j++) { diff --git a/test/known-good/C/src/token/TokenContainedSource.txt b/test/known-good/C/src/token/TokenContainedSource.txt index 48f0bf827..5c6dd0c33 100644 --- a/test/known-good/C/src/token/TokenContainedSource.txt +++ b/test/known-good/C/src/token/TokenContainedSource.txt @@ -4,14 +4,14 @@ * @author Edward A. Lee (eal@berkeley.edu) */ target C { - timeout: 2 ms + timeout: 2 ms } import TokenSource from "lib/Token.lf" -main reactor(scale: int(1)) { - state count: int(0) - state input_received: bool(false) +main reactor(scale: int(1)) { + state count: int(0) + state input_received: bool(false) s = new TokenSource() diff --git a/test/known-good/C/src/token/TokenContainedSourceBank.txt b/test/known-good/C/src/token/TokenContainedSourceBank.txt index 85054fb6b..480624442 100644 --- a/test/known-good/C/src/token/TokenContainedSourceBank.txt +++ b/test/known-good/C/src/token/TokenContainedSourceBank.txt @@ -5,16 +5,16 @@ * @author Edward A. Lee (eal@berkeley.edu) */ target C { - timeout: 2 ms + timeout: 2 ms } import TokenSource from "lib/Token.lf" -main reactor(scale: int(1)) { - state count: int(0) - state input_received: bool(false) +main reactor(scale: int(1)) { + state count: int(0) + state input_received: bool(false) - s = new[2] TokenSource() + s = new[2] TokenSource() reaction(s.out) {= self->input_received = true; diff --git a/test/known-good/C/src/token/TokenDelayTest.txt b/test/known-good/C/src/token/TokenDelayTest.txt index 83e39d822..b3c1c35b6 100644 --- a/test/known-good/C/src/token/TokenDelayTest.txt +++ b/test/known-good/C/src/token/TokenDelayTest.txt @@ -3,7 +3,7 @@ * @author Edward A. Lee (eal@berkeley.edu) */ target C { - timeout: 2 ms + timeout: 2 ms } import TokenSource, TokenPrint, TokenDelay from "lib/Token.lf" diff --git a/test/known-good/C/src/token/TokenMutable.txt b/test/known-good/C/src/token/TokenMutable.txt index 6dcd854ae..35457941c 100644 --- a/test/known-good/C/src/token/TokenMutable.txt +++ b/test/known-good/C/src/token/TokenMutable.txt @@ -5,7 +5,7 @@ * @author Edward A. Lee (eal@berkeley.edu) */ target C { - timeout: 2 ms + timeout: 2 ms } import TokenSource, TokenPrint, TokenScale from "lib/Token.lf" diff --git a/test/known-good/C/src/token/TokenSourcePrint.txt b/test/known-good/C/src/token/TokenSourcePrint.txt index c637cebb5..05dba15a6 100644 --- a/test/known-good/C/src/token/TokenSourcePrint.txt +++ b/test/known-good/C/src/token/TokenSourcePrint.txt @@ -4,7 +4,7 @@ * @author Edward A. Lee (eal@berkeley.edu) */ target C { - timeout: 2 ms + timeout: 2 ms } import TokenSource, TokenPrint from "lib/Token.lf" diff --git a/test/known-good/C/src/token/TokenSourceScalePrint.txt b/test/known-good/C/src/token/TokenSourceScalePrint.txt index deb02f883..dbeaeabf3 100644 --- a/test/known-good/C/src/token/TokenSourceScalePrint.txt +++ b/test/known-good/C/src/token/TokenSourceScalePrint.txt @@ -5,7 +5,7 @@ * @author Edward A. Lee (eal@berkeley.edu) */ target C { - timeout: 2 ms + timeout: 2 ms } import TokenSource, TokenPrint, TokenScale from "lib/Token.lf" diff --git a/test/known-good/C/src/token/lib/Token.txt b/test/known-good/C/src/token/lib/Token.txt index 965f5f650..3543d5dc2 100644 --- a/test/known-good/C/src/token/lib/Token.txt +++ b/test/known-good/C/src/token/lib/Token.txt @@ -4,7 +4,7 @@ * @author Edward A. Lee (eal@berkeley.edu) */ target C { - files: ["../include/array.h"] + files: ["../include/array.h"] } preamble {= @@ -19,8 +19,8 @@ * managed automatically by the C runtime. */ reactor TokenSource { - output out: int_array_t* - state count: int(0) + output out: int_array_t* + state count: int(0) timer t(0, 1 ms) reaction(startup) -> out {= @@ -42,10 +42,10 @@ * value is a scaled version of the sequence of values produced by the * TokenSource, where the scaling factor is given by the scale parameter. */ -reactor TokenPrint(scale: int(1)) { - input in: int_array_t* - state count: int(0) - state input_received: bool(false) +reactor TokenPrint(scale: int(1)) { + input in: int_array_t* + state count: int(0) + state input_received: bool(false) reaction(in) {= self->input_received = true; @@ -79,9 +79,9 @@ * input is declared mutable so, if possible, the input token will be modified * rather than allocating a new token. */ -reactor TokenScale(scale: int(2)) { - mutable input in: int_array_t* - output out: int_array_t* +reactor TokenScale(scale: int(2)) { + mutable input in: int_array_t* + output out: int_array_t* reaction(in) -> out {= for (int i = 0; i < in->value->length; i++) { @@ -93,9 +93,9 @@ /** @brief Delay a token using a logical action. The delay is 1 ms. */ reactor TokenDelay { - input in: int_array_t* - output out: int_array_t* - logical action a: int_array_t* + input in: int_array_t* + output out: int_array_t* + logical action a: int_array_t* reaction(a) -> out {= lf_set_token(out, a->token); =} diff --git a/test/known-good/C/src/zephyr/Blinky2.txt b/test/known-good/C/src/zephyr/Blinky2.txt index b7cdbb51f..883e1851e 100644 --- a/test/known-good/C/src/zephyr/Blinky2.txt +++ b/test/known-good/C/src/zephyr/Blinky2.txt @@ -1,10 +1,10 @@ target C { - platform: { - name: Zephyr, - board: nrf52dk_nrf52832 + platform: { + name: Zephyr, + board: nrf52dk_nrf52832 }, - threading: false -} + threading: false +} import NrfLeds from "lib/Led.lf" diff --git a/test/known-good/C/src/zephyr/HelloZephyr.txt b/test/known-good/C/src/zephyr/HelloZephyr.txt index e905b2d5f..2351cd7d6 100644 --- a/test/known-good/C/src/zephyr/HelloZephyr.txt +++ b/test/known-good/C/src/zephyr/HelloZephyr.txt @@ -1,8 +1,8 @@ target C { - threading: false, - platform: { - name: Zephyr, - board: qemu_cortex_m3 + threading: false, + platform: { + name: Zephyr, + board: qemu_cortex_m3 } } diff --git a/test/known-good/C/src/zephyr/Timer.txt b/test/known-good/C/src/zephyr/Timer.txt index f5741b235..989ed20d8 100644 --- a/test/known-good/C/src/zephyr/Timer.txt +++ b/test/known-good/C/src/zephyr/Timer.txt @@ -1,10 +1,10 @@ target C { - platform: { - name: Zephyr, - board: qemu_cortex_m3 + platform: { + name: Zephyr, + board: qemu_cortex_m3 }, - threading: false -} + threading: false +} main reactor { timer t(0, 1 sec) diff --git a/test/known-good/Cpp/src/ActionDelay.txt b/test/known-good/Cpp/src/ActionDelay.txt index a29f28571..30de7d107 100644 --- a/test/known-good/Cpp/src/ActionDelay.txt +++ b/test/known-good/Cpp/src/ActionDelay.txt @@ -2,10 +2,10 @@ target Cpp reactor GeneratedDelay { - input y_in: int - output y_out: int - state y_state: int{0} - logical action act(100 msec): void + input y_in: int + output y_out: int + state y_state: int{0} + logical action act(100 msec): void reaction(y_in) -> act {= y_state = *y_in.get(); @@ -16,13 +16,13 @@ } reactor Source { - output out: int + output out: int reaction(startup) -> out {= out.set(1); =} } reactor Sink { - input in: int + input in: int reaction(in) {= auto elapsed_logical = get_elapsed_logical_time(); diff --git a/test/known-good/Cpp/src/ActionIsPresent.txt b/test/known-good/Cpp/src/ActionIsPresent.txt index 4c4f08b83..ba045cfa3 100644 --- a/test/known-good/Cpp/src/ActionIsPresent.txt +++ b/test/known-good/Cpp/src/ActionIsPresent.txt @@ -1,10 +1,10 @@ // Tests the is_present variable for actions in cpp target Cpp -main reactor ActionIsPresent(offset: time(1 nsec), period: time(500 msec)) { +main reactor ActionIsPresent(offset: time(1 nsec), period: time(500 msec)) { logical action a - state success: bool(false) - state zero: time(0 nsec) + state success: bool(false) + state zero: time(0 nsec) reaction(startup, a) -> a {= if (!a.is_present()) { diff --git a/test/known-good/Cpp/src/ActionValues.txt b/test/known-good/Cpp/src/ActionValues.txt index 189a2663c..724564a9a 100644 --- a/test/known-good/Cpp/src/ActionValues.txt +++ b/test/known-good/Cpp/src/ActionValues.txt @@ -2,9 +2,9 @@ target Cpp main reactor ActionValues { - state r1done: bool(false) - state r2done: bool(false) - logical action act(100 msec): int + state r1done: bool(false) + state r2done: bool(false) + logical action act(100 msec): int reaction(startup) -> act {= act.schedule(100); // scheduled in 100 ms diff --git a/test/known-good/Cpp/src/ActionWithNoReaction.txt b/test/known-good/Cpp/src/ActionWithNoReaction.txt index b93bc579d..f109761b2 100644 --- a/test/known-good/Cpp/src/ActionWithNoReaction.txt +++ b/test/known-good/Cpp/src/ActionWithNoReaction.txt @@ -2,13 +2,13 @@ // test passes merely by compiling and executing without a segfault. Its other // functionality is tested by other tests. target Cpp { - fast: true, - timeout: 3 sec + fast: true, + timeout: 3 sec } reactor foo { - input x: int - output y: int + input x: int + output y: int logical action a reaction(x) -> y, a {= @@ -18,7 +18,7 @@ } reactor print { - input x: int + input x: int reaction(x) {= std::cout << "Result is " << *x.get() << '\n'; diff --git a/test/known-good/Cpp/src/After.txt b/test/known-good/Cpp/src/After.txt index d2e712349..897af476c 100644 --- a/test/known-good/Cpp/src/After.txt +++ b/test/known-good/Cpp/src/After.txt @@ -1,21 +1,21 @@ // This checks that the after keyword adjusts logical time, not using physical // time. target Cpp { - fast: false, - timeout: 3 sec + fast: false, + timeout: 3 sec } reactor foo { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= y.set(2*(*x.get())); =} } reactor print { - state expected_time: time(10 msec) - state i: int(0) - input x: int + state expected_time: time(10 msec) + state i: int(0) + input x: int reaction(x) {= i++; diff --git a/test/known-good/Cpp/src/AfterOverlapped.txt b/test/known-good/Cpp/src/AfterOverlapped.txt index ed59425a3..c3355c60f 100644 --- a/test/known-good/Cpp/src/AfterOverlapped.txt +++ b/test/known-good/Cpp/src/AfterOverlapped.txt @@ -1,14 +1,14 @@ // This the after keyword with overlapped time intervals. target Cpp { - fast: true, - timeout: 5 sec + fast: true, + timeout: 5 sec } import Count from "lib/Count.lf" reactor Test { - input c: int - state i: int(0) + input c: int + state i: int(0) reaction(c) {= std::cout << "Received " << *c.get() << '\n'; diff --git a/test/known-good/Cpp/src/AfterZero.txt b/test/known-good/Cpp/src/AfterZero.txt index 2461bb92a..f33d91831 100644 --- a/test/known-good/Cpp/src/AfterZero.txt +++ b/test/known-good/Cpp/src/AfterZero.txt @@ -1,21 +1,21 @@ // This checks that the after keyword adjusts logical time, not using physical // time. target Cpp { - fast: false, - timeout: 3 sec + fast: false, + timeout: 3 sec } reactor foo { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= y.set(2*(*x.get())); =} } reactor print { - state expected_time: time(0) - state i: int(0) - input x: int + state expected_time: time(0) + state i: int(0) + input x: int reaction(x) {= i++; diff --git a/test/known-good/Cpp/src/Alignment.txt b/test/known-good/Cpp/src/Alignment.txt index 522178fbd..843088288 100644 --- a/test/known-good/Cpp/src/Alignment.txt +++ b/test/known-good/Cpp/src/Alignment.txt @@ -1,14 +1,14 @@ // This test checks that the downstream reaction is not invoked more than once // at a logical time. target Cpp { - logging: LOG, - timeout: 1 sec, - build-type: Debug + logging: LOG, + timeout: 1 sec, + build-type: Debug } reactor Source { - output out: int - state count: int(1) + output out: int + state count: int(1) timer t(0, 100 msec) reaction(t) -> out {= @@ -21,9 +21,9 @@ private preamble {= #include "reactor-cpp/logging.hh" =} - input in: int - output out: bool - state primes: std::vector + input in: int + output out: bool + state primes: std::vector reaction(startup) {= // There are 1229 primes between 1 and 10,000. @@ -49,7 +49,7 @@ while (*in.get() > primes.back()) { candidate += 2; bool prime = true; - for (auto i : primes) { + for (auto i : primes) { if(candidate % i == 0) { // Candidate is not prime. Break and add 2 by starting the loop again prime = false; @@ -77,9 +77,9 @@ } reactor Destination { - input ok: bool - input in: int - state last_invoked: {= reactor::TimePoint =} + input ok: bool + input in: int + state last_invoked: {= reactor::TimePoint =} reaction(ok, in) {= if (ok.is_present() && in.is_present()) { diff --git a/test/known-good/Cpp/src/ArrayAsParameter.txt b/test/known-good/Cpp/src/ArrayAsParameter.txt index e4de1aab9..83fb9c5b1 100644 --- a/test/known-good/Cpp/src/ArrayAsParameter.txt +++ b/test/known-good/Cpp/src/ArrayAsParameter.txt @@ -2,10 +2,10 @@ // passes to Print. target Cpp -reactor Source(sequence: int[]{0, 1, 2}) { - output out: size_t - state count: size_t{0} - logical action next: void +reactor Source(sequence: int[]{0, 1, 2}) { + output out: size_t + state count: size_t{0} + logical action next: void reaction(startup, next) -> out, next {= out.set(sequence[count]); @@ -17,8 +17,8 @@ } reactor Print { - input in: size_t - state count: size_t{1} + input in: size_t + state count: size_t{1} reaction(in) {= std::cout << "Received: " << *in.get() << '\n'; diff --git a/test/known-good/Cpp/src/ArrayAsType.txt b/test/known-good/Cpp/src/ArrayAsType.txt index dc476914e..e4b6f6d82 100644 --- a/test/known-good/Cpp/src/ArrayAsType.txt +++ b/test/known-good/Cpp/src/ArrayAsType.txt @@ -3,7 +3,7 @@ target Cpp reactor Source { - output out: int[3] + output out: int[3] reaction(startup) -> out {= // create a statically allocated array @@ -14,7 +14,7 @@ } reactor Print { - input in: int[3] + input in: int[3] reaction(in) {= int expected = 3; diff --git a/test/known-good/Cpp/src/ArrayPrint.txt b/test/known-good/Cpp/src/ArrayPrint.txt index d6e7fa772..8a54ae112 100644 --- a/test/known-good/Cpp/src/ArrayPrint.txt +++ b/test/known-good/Cpp/src/ArrayPrint.txt @@ -4,7 +4,7 @@ target Cpp reactor Source { - output out: int[3] + output out: int[3] reaction(startup) -> out {= // create a dynamically allocated mutable array @@ -18,8 +18,8 @@ =} } -reactor Print(scale: int(1)) { - input in: int[3] +reactor Print(scale: int(1)) { + input in: int[3] reaction(in) {= int expected = 0; diff --git a/test/known-good/Cpp/src/ArrayScale.txt b/test/known-good/Cpp/src/ArrayScale.txt index 387846e78..e5a12a03c 100644 --- a/test/known-good/Cpp/src/ArrayScale.txt +++ b/test/known-good/Cpp/src/ArrayScale.txt @@ -5,10 +5,10 @@ import Source, Print from "ArrayPrint.lf" -reactor Scale(scale: int(2)) { - input in: int[3] +reactor Scale(scale: int(2)) { + input in: int[3] - output out: int[3] + output out: int[3] reaction(in) -> out {= // create a mutable copy of the received input diff --git a/test/known-good/Cpp/src/CharLiteralInitializer.txt b/test/known-good/Cpp/src/CharLiteralInitializer.txt index 368a050bb..e60ba8cd1 100644 --- a/test/known-good/Cpp/src/CharLiteralInitializer.txt +++ b/test/known-good/Cpp/src/CharLiteralInitializer.txt @@ -2,7 +2,7 @@ target Cpp main reactor CharLiteralInitializer { - state c: char('x') + state c: char('x') reaction(startup) {= if (c != 'x') { diff --git a/test/known-good/Cpp/src/Composition.txt b/test/known-good/Cpp/src/Composition.txt index 59f613104..ff6b04eba 100644 --- a/test/known-good/Cpp/src/Composition.txt +++ b/test/known-good/Cpp/src/Composition.txt @@ -1,14 +1,14 @@ // This test connects a simple counting source to tester that checks against its // own count. target Cpp { - fast: true, - timeout: 10 sec + fast: true, + timeout: 10 sec } -reactor Source(period: time(2 sec)) { - output y: int +reactor Source(period: time(2 sec)) { + output y: int timer t(1 sec, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= count++; @@ -17,8 +17,8 @@ } reactor Test { - input x: int - state count: int(0) + input x: int + state count: int(0) reaction(x) {= count++; diff --git a/test/known-good/Cpp/src/CompositionAfter.txt b/test/known-good/Cpp/src/CompositionAfter.txt index 855cd7de2..671d82613 100644 --- a/test/known-good/Cpp/src/CompositionAfter.txt +++ b/test/known-good/Cpp/src/CompositionAfter.txt @@ -1,14 +1,14 @@ // This test connects a simple counting source to tester that checks against its // own count. target Cpp { - fast: true, - timeout: 10 sec + fast: true, + timeout: 10 sec } -reactor Source(period: time(2 sec)) { - output y: int +reactor Source(period: time(2 sec)) { + output y: int timer t(1 sec, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= count++; @@ -17,8 +17,8 @@ } reactor Test { - input x: int - state count: int(0) + input x: int + state count: int(0) reaction(x) {= count++; @@ -38,7 +38,7 @@ =} } -main reactor(delay: time(5 sec)) { +main reactor(delay: time(5 sec)) { s = new Source() d = new Test() s.y -> d.x after delay diff --git a/test/known-good/Cpp/src/CompositionGain.txt b/test/known-good/Cpp/src/CompositionGain.txt index 010e9b032..ee0694d44 100644 --- a/test/known-good/Cpp/src/CompositionGain.txt +++ b/test/known-good/Cpp/src/CompositionGain.txt @@ -2,8 +2,8 @@ target Cpp reactor Gain { - input gainin: int - output y: int + input gainin: int + output y: int reaction(gainin) -> y {= reactor::log::Info() << "Gain received " << *gainin.get(); @@ -12,8 +12,8 @@ } reactor Wrapper { - input x: int - output y: int + input x: int + output y: int gain = new Gain() x -> gain.gainin gain.y -> y diff --git a/test/known-good/Cpp/src/CountTest.txt b/test/known-good/Cpp/src/CountTest.txt index caf02aebb..8ac50b094 100644 --- a/test/known-good/Cpp/src/CountTest.txt +++ b/test/known-good/Cpp/src/CountTest.txt @@ -1,13 +1,13 @@ target Cpp { - timeout: 3 sec, - fast: true + timeout: 3 sec, + fast: true } import Count from "lib/Count.lf" reactor Test { - input c: int - state i: int(0) + input c: int + state i: int(0) reaction(c) {= i++; diff --git a/test/known-good/Cpp/src/DanglingOutput.txt b/test/known-good/Cpp/src/DanglingOutput.txt index 0cf9b552d..4e5ba86ca 100644 --- a/test/known-good/Cpp/src/DanglingOutput.txt +++ b/test/known-good/Cpp/src/DanglingOutput.txt @@ -3,15 +3,15 @@ target Cpp reactor Source { - output out: int + output out: int timer t reaction(t) -> out {= out.set(1); =} } reactor Gain { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= std::cout << "Received " << *in.get() << std::endl; diff --git a/test/known-good/Cpp/src/Deadline.txt b/test/known-good/Cpp/src/Deadline.txt index 739aee0b6..d4957ea7e 100644 --- a/test/known-good/Cpp/src/Deadline.txt +++ b/test/known-good/Cpp/src/Deadline.txt @@ -2,16 +2,16 @@ // the Source immediately, whereas odd numbers are sent after a big enough delay // to violate the deadline. target Cpp { - timeout: 4 sec + timeout: 4 sec } -reactor Source(period: time(2 sec)) { +reactor Source(period: time(2 sec)) { private preamble {= #include =} - output y: int + output y: int timer t(0, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= if (count % 2 == 1) { @@ -25,9 +25,9 @@ =} } -reactor Destination(timeout: time(1 sec)) { - input x: int - state count: int(0) +reactor Destination(timeout: time(1 sec)) { + input x: int + state count: int(0) reaction(x) {= std::cout << "Destination receives: " << *x.get() << std::endl; diff --git a/test/known-good/Cpp/src/DeadlineHandledAbove.txt b/test/known-good/Cpp/src/DeadlineHandledAbove.txt index d8f298bed..71c408cbc 100644 --- a/test/known-good/Cpp/src/DeadlineHandledAbove.txt +++ b/test/known-good/Cpp/src/DeadlineHandledAbove.txt @@ -2,9 +2,9 @@ // container reacts to that output. target Cpp -reactor Deadline(threshold: time(100 msec)) { - input x: int - output deadline_violation: bool +reactor Deadline(threshold: time(100 msec)) { + input x: int + output deadline_violation: bool reaction(x) -> deadline_violation {= std::cerr << "ERROR: Deadline violation was not detected!" << std::endl; @@ -16,7 +16,7 @@ } main reactor DeadlineHandledAbove { - state violation_detected: bool({= false =}) + state violation_detected: bool({= false =}) d = new Deadline(threshold = 10 msec) reaction(startup) -> d.x {= diff --git a/test/known-good/Cpp/src/DelayInt.txt b/test/known-good/Cpp/src/DelayInt.txt index dc6171ae0..cfb8edee7 100644 --- a/test/known-good/Cpp/src/DelayInt.txt +++ b/test/known-good/Cpp/src/DelayInt.txt @@ -1,10 +1,10 @@ // This tests actions with payloads by delaying an input by a fixed amount. target Cpp -reactor Delay(delay: time(100 msec)) { - input in: int - output out: int - logical action d: int +reactor Delay(delay: time(100 msec)) { + input in: int + output out: int + logical action d: int reaction(in) -> d {= d.schedule(in.get(), delay); =} @@ -16,8 +16,8 @@ } reactor Test { - input in: int - state start_time: {= reactor::TimePoint =} + input in: int + state start_time: {= reactor::TimePoint =} timer start reaction(start) {= diff --git a/test/known-good/Cpp/src/DelayedAction.txt b/test/known-good/Cpp/src/DelayedAction.txt index 3a626380a..d8da324d1 100644 --- a/test/known-good/Cpp/src/DelayedAction.txt +++ b/test/known-good/Cpp/src/DelayedAction.txt @@ -1,12 +1,12 @@ target Cpp { - timeout: 5 sec, - fast: true + timeout: 5 sec, + fast: true } main reactor DelayedAction { timer t(0, 1 sec) - logical action a: void - state count: int(0) + logical action a: void + state count: int(0) reaction(t) -> a {= a.schedule(100ms); =} diff --git a/test/known-good/Cpp/src/DelayedReaction.txt b/test/known-good/Cpp/src/DelayedReaction.txt index f2c6c4f02..86ff113c2 100644 --- a/test/known-good/Cpp/src/DelayedReaction.txt +++ b/test/known-good/Cpp/src/DelayedReaction.txt @@ -2,13 +2,13 @@ target Cpp reactor Source { - output out: void + output out: void reaction(startup) -> out {= out.set(); =} } reactor Sink { - input in: void + input in: void reaction(in) {= auto elapsed = get_elapsed_logical_time(); diff --git a/test/known-good/Cpp/src/Determinism.txt b/test/known-good/Cpp/src/Determinism.txt index ab444c6e3..ea6cdc9b9 100644 --- a/test/known-good/Cpp/src/Determinism.txt +++ b/test/known-good/Cpp/src/Determinism.txt @@ -1,15 +1,15 @@ target Cpp reactor Source { - output y: int + output y: int timer t reaction(t) -> y {= y.set(1); =} } reactor Destination { - input x: int - input y: int + input x: int + input y: int reaction(x, y) {= int sum = 0; @@ -28,8 +28,8 @@ } reactor Pass { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= y.set(x.get()); =} } diff --git a/test/known-good/Cpp/src/DoubleInvocation.txt b/test/known-good/Cpp/src/DoubleInvocation.txt index 990cc69ae..d49b2754e 100644 --- a/test/known-good/Cpp/src/DoubleInvocation.txt +++ b/test/known-good/Cpp/src/DoubleInvocation.txt @@ -7,14 +7,14 @@ // * Sending only position, not velocity from Ball. (copied from the c version // of the test) target Cpp { - timeout: 5 sec, - fast: true + timeout: 5 sec, + fast: true } reactor Ball { - output position: int - output velocity: int - state p: int(200) + output position: int + output velocity: int + state p: int(200) timer trigger(0, 1 sec) reaction(trigger) -> position, velocity {= @@ -25,9 +25,9 @@ } reactor Print { - input velocity: int - input position: int - state previous: int(-1) + input velocity: int + input position: int + state previous: int(-1) reaction(startup) {= reactor::log::Info() << "####### Print startup"; diff --git a/test/known-good/Cpp/src/DoublePort.txt b/test/known-good/Cpp/src/DoublePort.txt index 1ef4fee18..2652bb818 100644 --- a/test/known-good/Cpp/src/DoublePort.txt +++ b/test/known-good/Cpp/src/DoublePort.txt @@ -6,16 +6,16 @@ * @author Maiko Brants */ target Cpp { - timeout: 900 msec, - fast: true + timeout: 900 msec, + fast: true } import Count from "lib/Count.lf" reactor CountMicrostep { - state count: int(1) - output out: int - logical action act: int + state count: int(1) + output out: int + logical action act: int timer t(0, 1 sec) reaction(t) -> act {= @@ -27,8 +27,8 @@ } reactor Print { - input in: int - input in2: int + input in: int + input in2: int reaction(in, in2) {= if(in.is_present()){ diff --git a/test/known-good/Cpp/src/DoubleReaction.txt b/test/known-good/Cpp/src/DoubleReaction.txt index 9ad2ddc40..67de428f6 100644 --- a/test/known-good/Cpp/src/DoubleReaction.txt +++ b/test/known-good/Cpp/src/DoubleReaction.txt @@ -1,14 +1,14 @@ // Test that two simultaneous inputs that trigger a reaction trigger it only // once. Correct output for this 2, 4, 6, 8, etc. target Cpp { - timeout: 10 sec, - fast: true + timeout: 10 sec, + fast: true } -reactor Clock(offset: time(0), period: time(1 sec)) { - output y: int +reactor Clock(offset: time(0), period: time(1 sec)) { + output y: int timer t(offset, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= count++; @@ -17,9 +17,9 @@ } reactor Destination { - input x: int - input w: int - state s: int(2) + input x: int + input w: int + state s: int(2) reaction(x, w) {= int sum = 0; @@ -29,7 +29,7 @@ if (w.is_present()) { sum += *w.get(); } - std::cout << "Sum of inputs is: " << sum << std::endl; + std::cout << "Sum of inputs is: " << sum << std::endl; if (sum != s) { std::cerr << "FAILURE: Expected sum to be " << s << "but it was " << sum << std::endl; diff --git a/test/known-good/Cpp/src/DoubleTrigger.txt b/test/known-good/Cpp/src/DoubleTrigger.txt index c6689dba0..86bc29e3e 100644 --- a/test/known-good/Cpp/src/DoubleTrigger.txt +++ b/test/known-good/Cpp/src/DoubleTrigger.txt @@ -5,12 +5,12 @@ main reactor DoubleTrigger { timer t1 timer t2 - state s: int(0) + state s: int(0) reaction(t1, t2) {= s++; if (s > 1) { - std::cout << "FAILURE: Reaction got triggered twice." << std::endl; + std::cout << "FAILURE: Reaction got triggered twice." << std::endl; exit(1); } =} @@ -19,7 +19,7 @@ if (s == 1) { std::cout << "SUCCESS" << std::endl; } else { - std::cerr << "FAILURE: Reaction was never triggered." << std::endl; + std::cerr << "FAILURE: Reaction was never triggered." << std::endl; exit(1); } =} diff --git a/test/known-good/Cpp/src/FloatLiteral.txt b/test/known-good/Cpp/src/FloatLiteral.txt index 813ef0b17..13428db45 100644 --- a/test/known-good/Cpp/src/FloatLiteral.txt +++ b/test/known-good/Cpp/src/FloatLiteral.txt @@ -2,10 +2,10 @@ // This test verifies that floating-point literals are handled correctly. main reactor { - state N: double(6.0221409e+23) - state charge: double(-1.6021766E-19) - state minus_epsilon: double(-.01e0) - state expected: double(.964853323188E5) + state N: double(6.0221409e+23) + state charge: double(-1.6021766E-19) + state minus_epsilon: double(-.01e0) + state expected: double(.964853323188E5) reaction(startup) {= auto F = - N * charge; diff --git a/test/known-good/Cpp/src/Gain.txt b/test/known-good/Cpp/src/Gain.txt index 015db8508..8b69ca818 100644 --- a/test/known-good/Cpp/src/Gain.txt +++ b/test/known-good/Cpp/src/Gain.txt @@ -1,15 +1,15 @@ // Example in the Wiki. target Cpp -reactor Scale(scale: int(2)) { - input x: int - output y: int +reactor Scale(scale: int(2)) { + input x: int + output y: int reaction(x) -> y {= y.set(*x.get() * scale); =} } reactor Test { - input x: int + input x: int reaction(x) {= auto value = *x.get(); diff --git a/test/known-good/Cpp/src/GetMicroStep.txt b/test/known-good/Cpp/src/GetMicroStep.txt index 4eb3584d1..5761914fd 100644 --- a/test/known-good/Cpp/src/GetMicroStep.txt +++ b/test/known-good/Cpp/src/GetMicroStep.txt @@ -2,11 +2,11 @@ target Cpp main reactor GetMicroStep { - state s: {= reactor::mstep_t =}(1) + state s: {= reactor::mstep_t =}(1) logical action l - reaction(startup) -> l {= l.schedule(reactor::Duration::zero()); =} + reaction(startup) -> l {= l.schedule(reactor::Duration::zero()); =} reaction(l) -> l {= auto microstep = get_microstep(); diff --git a/test/known-good/Cpp/src/GetTime.txt b/test/known-good/Cpp/src/GetTime.txt index 30b09c538..438d57a55 100644 --- a/test/known-good/Cpp/src/GetTime.txt +++ b/test/known-good/Cpp/src/GetTime.txt @@ -1,8 +1,8 @@ // This file includes code documented on the Wiki. For this test, success is // just compiling and running. target Cpp { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } main reactor GetTime { diff --git a/test/known-good/Cpp/src/Hello.txt b/test/known-good/Cpp/src/Hello.txt index 7325a81c2..91fdfc223 100644 --- a/test/known-good/Cpp/src/Hello.txt +++ b/test/known-good/Cpp/src/Hello.txt @@ -4,15 +4,15 @@ // has a period of 4 seconds, the second of 2 seconds, and the third (composite) // or 1 second. target Cpp { - timeout: 10 sec, - fast: true + timeout: 10 sec, + fast: true } -reactor HelloCpp(period: time(2 sec), message: {= std::string =}("Hello C++")) { - state count: int(0) - state previous_time: {= reactor::TimePoint =} +reactor HelloCpp(period: time(2 sec), message: {= std::string =}("Hello C++")) { + state count: int(0) + state previous_time: {= reactor::TimePoint =} timer t(1 sec, period) - logical action a: void + logical action a: void reaction(t) -> a {= std::cout << message << std::endl; @@ -37,8 +37,8 @@ } reactor Inside( - period: time(1 sec), - message: std::string("Composite default message.") + period: time(1 sec), + message: std::string("Composite default message.") ) { third_instance = new HelloCpp(period = period, message = message) } diff --git a/test/known-good/Cpp/src/HelloWorld.txt b/test/known-good/Cpp/src/HelloWorld.txt index 620a5922d..bd3f7812d 100644 --- a/test/known-good/Cpp/src/HelloWorld.txt +++ b/test/known-good/Cpp/src/HelloWorld.txt @@ -3,7 +3,7 @@ reactor HelloWorld2 { timer t - reaction(t) {= std::cout << "Hello World." << std::endl; =} + reaction(t) {= std::cout << "Hello World." << std::endl; =} } main reactor { diff --git a/test/known-good/Cpp/src/Hierarchy.txt b/test/known-good/Cpp/src/Hierarchy.txt index 8d6231a55..43d70324f 100644 --- a/test/known-good/Cpp/src/Hierarchy.txt +++ b/test/known-good/Cpp/src/Hierarchy.txt @@ -2,21 +2,21 @@ target Cpp reactor Source { - output out: int + output out: int timer t reaction(t) -> out {= out.set(1); =} } reactor Gain { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= out.set((*in.get()) * 2); =} } reactor Print { - input in: int + input in: int reaction(in) {= auto value = *in.get(); @@ -29,9 +29,9 @@ } reactor GainContainer { - input in: int - output out: int - output out2: int + input in: int + output out: int + output out2: int gain = new Gain() in -> gain.in gain.out -> out diff --git a/test/known-good/Cpp/src/Hierarchy2.txt b/test/known-good/Cpp/src/Hierarchy2.txt index da5c23fe8..29d892221 100644 --- a/test/known-good/Cpp/src/Hierarchy2.txt +++ b/test/known-good/Cpp/src/Hierarchy2.txt @@ -1,20 +1,20 @@ // Test data transport across hierarchy. target Cpp { - timeout: 5 sec, - fast: true + timeout: 5 sec, + fast: true } reactor Source { - output out: int + output out: int timer t(0, 1 sec) reaction(t) -> out {= out.set(1); =} } reactor Count { - output out: int + output out: int timer t(0, 1 sec) - state i: int(0) + state i: int(0) reaction(t) -> out {= i++; @@ -23,9 +23,9 @@ } reactor Add { - input in1: int - input in2: int - output out: int + input in1: int + input in2: int + output out: int reaction(in1, in2) -> out {= int result = 0; @@ -36,8 +36,8 @@ } reactor Print { - input in: int - state expected: int(2) + input in: int + state expected: int(2) reaction(in) {= auto value = *in.get(); @@ -51,8 +51,8 @@ } reactor AddCount { - input in: int - output out: int + input in: int + output out: int count = new Count() add = new Add() in -> add.in1 diff --git a/test/known-good/Cpp/src/ImportComposition.txt b/test/known-good/Cpp/src/ImportComposition.txt index dde29ea97..2108a3126 100644 --- a/test/known-good/Cpp/src/ImportComposition.txt +++ b/test/known-good/Cpp/src/ImportComposition.txt @@ -16,7 +16,7 @@ =} imp_comp = new ImportedComposition() - state received: bool(false) + state received: bool(false) reaction(startup) -> imp_comp.x {= imp_comp.x.set(42); =} diff --git a/test/known-good/Cpp/src/ManualDelayedReaction.txt b/test/known-good/Cpp/src/ManualDelayedReaction.txt index 5f9982875..284493098 100644 --- a/test/known-good/Cpp/src/ManualDelayedReaction.txt +++ b/test/known-good/Cpp/src/ManualDelayedReaction.txt @@ -2,11 +2,11 @@ // That's the stuff that shall be generated for the after reactor GeneratedDelay { - input y_in: int - output y_out: int - state y_state: int(0) + input y_in: int + output y_out: int + state y_state: int(0) - logical action act(100 msec): int + logical action act(100 msec): int reaction(y_in) -> act {= act.schedule(y_in.get()); =} @@ -14,7 +14,7 @@ } reactor Source { - output out: int + output out: int timer t // reaction(t) -> out after 100 msec {= @@ -22,7 +22,7 @@ } reactor Sink { - input in: int + input in: int reaction(in) {= auto elapsed_logical = get_elapsed_logical_time(); diff --git a/test/known-good/Cpp/src/Methods.txt b/test/known-good/Cpp/src/Methods.txt index 1b83d3e58..cb1e6e48c 100644 --- a/test/known-good/Cpp/src/Methods.txt +++ b/test/known-good/Cpp/src/Methods.txt @@ -1,11 +1,11 @@ target Cpp main reactor { - state foo: int(2) + state foo: int(2) - const method getFoo(): int {= return foo; =} + const method getFoo(): int {= return foo; =} - method add(x: int) {= foo += x; =} + method add(x: int) {= foo += x; =} reaction(startup) {= std::cout << "Foo is initialized to " << getFoo() << '\n'; diff --git a/test/known-good/Cpp/src/Microsteps.txt b/test/known-good/Cpp/src/Microsteps.txt index c0c37cd99..f39516639 100644 --- a/test/known-good/Cpp/src/Microsteps.txt +++ b/test/known-good/Cpp/src/Microsteps.txt @@ -1,8 +1,8 @@ target Cpp reactor Destination { - input x: int - input y: int + input x: int + input y: int reaction(x, y) {= auto elapsed = get_elapsed_logical_time(); @@ -31,7 +31,7 @@ main reactor Microsteps { timer start - logical action repeat: void + logical action repeat: void d = new Destination() reaction(start) -> d.x, repeat {= diff --git a/test/known-good/Cpp/src/Minimal.txt b/test/known-good/Cpp/src/Minimal.txt index eb7360f59..d5586a3b0 100644 --- a/test/known-good/Cpp/src/Minimal.txt +++ b/test/known-good/Cpp/src/Minimal.txt @@ -2,6 +2,6 @@ target Cpp main reactor Minimal { - reaction(startup) {= std::cout << "Hello World!\n"; =} + reaction(startup) {= std::cout << "Hello World!\n"; =} } diff --git a/test/known-good/Cpp/src/MovingAverage.txt b/test/known-good/Cpp/src/MovingAverage.txt index 32a54f629..8d2239334 100644 --- a/test/known-good/Cpp/src/MovingAverage.txt +++ b/test/known-good/Cpp/src/MovingAverage.txt @@ -2,13 +2,13 @@ // MovingAverage reactor computes the moving average of the last four inputs and // produces that as output. The source is a counting sequence. target Cpp { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } reactor Source { - output out: double - state count: int{0} + output out: double + state count: int{0} timer clock(0, 200 msec) reaction(clock) -> out {= @@ -18,10 +18,10 @@ } reactor MovingAverageImpl { - state delay_line: double[3]{0.0, 0.0, 0.0} - state index: int{0} - input in: double - output out: double + state delay_line: double[3]{0.0, 0.0, 0.0} + state index: int{0} + input in: double + output out: double reaction(in) -> out {= // Calculate the output. @@ -43,8 +43,8 @@ } reactor Print { - input in: double - state count: int{0} + input in: double + state count: int{0} reaction(in) {= std::cout << "Received: " << *in.get() << '\n'; diff --git a/test/known-good/Cpp/src/MultipleContained.txt b/test/known-good/Cpp/src/MultipleContained.txt index 82927abe6..a85f98d29 100644 --- a/test/known-good/Cpp/src/MultipleContained.txt +++ b/test/known-good/Cpp/src/MultipleContained.txt @@ -3,9 +3,9 @@ target Cpp reactor Contained { - output trigger: int - input in1: int - input in2: int + output trigger: int + input in1: int + input in2: int reaction(startup) -> trigger {= trigger.set(42); =} diff --git a/test/known-good/Cpp/src/NativeListsAndTimes.txt b/test/known-good/Cpp/src/NativeListsAndTimes.txt index 62d5c0911..c465d31b4 100644 --- a/test/known-good/Cpp/src/NativeListsAndTimes.txt +++ b/test/known-good/Cpp/src/NativeListsAndTimes.txt @@ -2,25 +2,25 @@ // This test passes if it is successfully compiled into valid target code. reactor Foo( - x: int(0), - y: time(0), // Units are missing but not required + x: int(0), + y: time(0), // Units are missing but not required z(1 msec), // Type is missing but not required - p: int[]{1, 2, 3, 4}, // List of integers + p: int[]{1, 2, 3, 4}, // List of integers q: {= // list of time values std::vector<reactor::Duration> =}{1 msec, 2 msec, 3 msec}, - g: time[]{1 msec, 2 msec} // List of time values + g: time[]{1 msec, 2 msec} // List of time values ) { - state s: time(y) // Reference to explicitly typed time parameter - state t: time(z) // Reference to implicitly typed time parameter - state v: bool // Uninitialized boolean state variable - state w: time // Uninitialized time state variable + state s: time(y) // Reference to explicitly typed time parameter + state t: time(z) // Reference to implicitly typed time parameter + state v: bool // Uninitialized boolean state variable + state w: time // Uninitialized time state variable timer tick(0) // Units missing but not required timer tock(1 sec) // Implicit type time timer toe(z) // Implicit type time state baz(p) // Implicit type int[] state period(z) // Implicit type time - state times: std::vector< // a list of lists + state times: std::vector< // a list of lists std::vector<{= reactor::Duration =}> >{q, g} diff --git a/test/known-good/Cpp/src/NestedTriggeredReactions.txt b/test/known-good/Cpp/src/NestedTriggeredReactions.txt index 9a30e8265..3cb39e48a 100644 --- a/test/known-good/Cpp/src/NestedTriggeredReactions.txt +++ b/test/known-good/Cpp/src/NestedTriggeredReactions.txt @@ -1,9 +1,9 @@ target Cpp reactor Container { - input in: void + input in: void - state triggered: bool{false} + state triggered: bool{false} contained = new Contained() @@ -20,9 +20,9 @@ } reactor Contained { - input in: void + input in: void - state triggered: bool{false} + state triggered: bool{false} reaction(in) {= triggered = true; =} diff --git a/test/known-good/Cpp/src/ParameterHierarchy.txt b/test/known-good/Cpp/src/ParameterHierarchy.txt index f40715300..35a9298c4 100644 --- a/test/known-good/Cpp/src/ParameterHierarchy.txt +++ b/test/known-good/Cpp/src/ParameterHierarchy.txt @@ -7,7 +7,7 @@ */ target Cpp -reactor Deep(p: int(0)) { +reactor Deep(p: int(0)) { reaction(startup) {= if(p != 42) { reactor::log::Error() << "Parameter value is: " << p << ". Should have been 42."; @@ -18,11 +18,11 @@ =} } -reactor Intermediate(p: int(10)) { +reactor Intermediate(p: int(10)) { a = new Deep(p = p) } -reactor Another(p: int(20)) { +reactor Another(p: int(20)) { // also test forwarding parameters via target code blocks a = new Intermediate(p = {= p =}) } diff --git a/test/known-good/Cpp/src/ParameterizedState.txt b/test/known-good/Cpp/src/ParameterizedState.txt index 3ddf90c8a..fe4082498 100644 --- a/test/known-good/Cpp/src/ParameterizedState.txt +++ b/test/known-good/Cpp/src/ParameterizedState.txt @@ -1,6 +1,6 @@ target Cpp -reactor Foo(bar: int(4)) { +reactor Foo(bar: int(4)) { state baz(bar) reaction(startup) {= diff --git a/test/known-good/Cpp/src/ParametersOutOfOrder.txt b/test/known-good/Cpp/src/ParametersOutOfOrder.txt index 016b12be1..41df7674e 100644 --- a/test/known-good/Cpp/src/ParametersOutOfOrder.txt +++ b/test/known-good/Cpp/src/ParametersOutOfOrder.txt @@ -2,7 +2,7 @@ // definition order. Compilation without errors is success. target Cpp -reactor Foo(a: int(0), b: std::string(""), c: float(0.0)) { +reactor Foo(a: int(0), b: std::string(""), c: float(0.0)) { reaction(startup) {= if (a != 42 || b != "bar" || c < 3.1) { reactor::log::Error() << "received an unexpected parameter!"; diff --git a/test/known-good/Cpp/src/PeriodicDesugared.txt b/test/known-good/Cpp/src/PeriodicDesugared.txt index 630a10392..757730d53 100644 --- a/test/known-good/Cpp/src/PeriodicDesugared.txt +++ b/test/known-good/Cpp/src/PeriodicDesugared.txt @@ -1,11 +1,11 @@ target Cpp { - fast: true, - timeout: 5 secs + fast: true, + timeout: 5 secs } -main reactor(offset: time(50 msec), period: time(500 msec)) { - logical action init(offset): void - logical action recur(period): void +main reactor(offset: time(50 msec), period: time(500 msec)) { + logical action init(offset): void + logical action recur(period): void state expected(offset) reaction(startup) -> init {= diff --git a/test/known-good/Cpp/src/PhysicalConnection.txt b/test/known-good/Cpp/src/PhysicalConnection.txt index e39c6e5b7..86a4270a6 100644 --- a/test/known-good/Cpp/src/PhysicalConnection.txt +++ b/test/known-good/Cpp/src/PhysicalConnection.txt @@ -2,15 +2,15 @@ target Cpp reactor Source { - output out: int + output out: int reaction(startup) -> out {= out.set(42); =} } reactor Destination { - input in: int + input in: int - state received: bool(false) + state received: bool(false) reaction(in) {= auto time = get_elapsed_logical_time(); diff --git a/test/known-good/Cpp/src/Pipeline.txt b/test/known-good/Cpp/src/Pipeline.txt index 2ee20cb66..6fb0a9625 100644 --- a/test/known-good/Cpp/src/Pipeline.txt +++ b/test/known-good/Cpp/src/Pipeline.txt @@ -1,12 +1,12 @@ target Cpp { - timeout: 2 sec + timeout: 2 sec } import Computation from "concurrent/Threaded.lf" reactor Print { - input in: int - state count: int(0) + input in: int + state count: int(0) reaction(in) {= std::cout << "Received: " << *in.get() << '\n'; @@ -27,7 +27,7 @@ main reactor Pipeline { timer t(0, 200 msec) - state count: int(0) + state count: int(0) c1 = new Computation() c2 = new Computation() diff --git a/test/known-good/Cpp/src/PreambleTest.txt b/test/known-good/Cpp/src/PreambleTest.txt index 8249a073f..7bf1f2319 100644 --- a/test/known-good/Cpp/src/PreambleTest.txt +++ b/test/known-good/Cpp/src/PreambleTest.txt @@ -20,7 +20,7 @@ return i + 42; } =} - logical action a: MyStruct + logical action a: MyStruct reaction(startup) -> a {= a.schedule({add_42(42), "baz"}); =} diff --git a/test/known-good/Cpp/src/ReadOutputOfContainedReactor.txt b/test/known-good/Cpp/src/ReadOutputOfContainedReactor.txt index 52b3dacfe..1848c644b 100644 --- a/test/known-good/Cpp/src/ReadOutputOfContainedReactor.txt +++ b/test/known-good/Cpp/src/ReadOutputOfContainedReactor.txt @@ -3,14 +3,14 @@ target Cpp reactor Contained { - output out: int + output out: int reaction(startup) -> out {= out.set(42); =} } main reactor ReadOutputOfContainedReactor { c = new Contained() - state count: int(0) + state count: int(0) reaction(startup) c.out {= std::cout << "Startup reaction reading output of contained " diff --git a/test/known-good/Cpp/src/Schedule.txt b/test/known-good/Cpp/src/Schedule.txt index 177eb2046..eb8da865b 100644 --- a/test/known-good/Cpp/src/Schedule.txt +++ b/test/known-good/Cpp/src/Schedule.txt @@ -2,8 +2,8 @@ target Cpp reactor ScheduleTest { - input x: int - logical action a: void + input x: int + logical action a: void reaction(x) -> a {= a.schedule(200ms); =} diff --git a/test/known-good/Cpp/src/ScheduleLogicalAction.txt b/test/known-good/Cpp/src/ScheduleLogicalAction.txt index 13e26cd19..10851557b 100644 --- a/test/known-good/Cpp/src/ScheduleLogicalAction.txt +++ b/test/known-good/Cpp/src/ScheduleLogicalAction.txt @@ -7,14 +7,14 @@ * Modeled after the C version of this test. */ target Cpp { - fast: true, - timeout: 3 sec + fast: true, + timeout: 3 sec } reactor foo { - input x: int - output y: int - logical action a: void + input x: int + output y: int + logical action a: void reaction(x) -> y, a {= y.set( 2*(*x.get())); @@ -26,8 +26,8 @@ } reactor print { - state expected_time: time(0) - input x: int + state expected_time: time(0) + input x: int reaction(x) {= auto elapsed_time = get_elapsed_logical_time(); diff --git a/test/known-good/Cpp/src/SelfLoop.txt b/test/known-good/Cpp/src/SelfLoop.txt index 9497e7b76..7e06dbc83 100644 --- a/test/known-good/Cpp/src/SelfLoop.txt +++ b/test/known-good/Cpp/src/SelfLoop.txt @@ -4,15 +4,15 @@ * Modeled after the C version of this test. */ target Cpp { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } reactor Self { - input x: int - output y: int - logical action a: int - state expected: int(43) + input x: int + output y: int + logical action a: int + state expected: int(43) reaction(a) -> y {= reactor::log::Info() << "a = " << *a.get(); diff --git a/test/known-good/Cpp/src/SendingInside.txt b/test/known-good/Cpp/src/SendingInside.txt index cddf30246..4fa203397 100644 --- a/test/known-good/Cpp/src/SendingInside.txt +++ b/test/known-good/Cpp/src/SendingInside.txt @@ -1,13 +1,13 @@ // This tests a reactor that contains another reactor and also has its own // reaction that routes inputs to the contained reactor. target Cpp { - timeout: 10 sec, - fast: true + timeout: 10 sec, + fast: true } reactor Printer { - input x: int - state count: int(1) + input x: int + state count: int(1) reaction(x) {= std::cout << "Inside reactor received: " << *x.get() << std::endl; @@ -20,7 +20,7 @@ } main reactor SendingInside { - state count: int(0) + state count: int(0) timer t(0, 1 sec) p = new Printer() diff --git a/test/known-good/Cpp/src/SendingInside2.txt b/test/known-good/Cpp/src/SendingInside2.txt index a0aad1310..2dae7747d 100644 --- a/test/known-good/Cpp/src/SendingInside2.txt +++ b/test/known-good/Cpp/src/SendingInside2.txt @@ -1,7 +1,7 @@ target Cpp reactor Printer { - input x: int + input x: int reaction(x) {= std::cout << "Inside reactor received: " << *x.get() << std::endl; diff --git a/test/known-good/Cpp/src/SimpleDeadline.txt b/test/known-good/Cpp/src/SimpleDeadline.txt index f4aa85cdd..e1997db70 100644 --- a/test/known-good/Cpp/src/SimpleDeadline.txt +++ b/test/known-good/Cpp/src/SimpleDeadline.txt @@ -3,12 +3,12 @@ // violation. target Cpp -reactor Deadline(threshold: time(100 msec)) { +reactor Deadline(threshold: time(100 msec)) { private preamble {= #include =} - input x: int - output deadlineViolation: bool + input x: int + output deadlineViolation: bool reaction(x) -> deadlineViolation {= std::cerr << "ERROR: Deadline violation was not detected!" << std::endl; @@ -20,7 +20,7 @@ } reactor Print { - input in: bool + input in: bool reaction(in) {= if (*in.get()) { diff --git a/test/known-good/Cpp/src/SlowingClock.txt b/test/known-good/Cpp/src/SlowingClock.txt index 181b3ecb4..2e2db85c0 100644 --- a/test/known-good/Cpp/src/SlowingClock.txt +++ b/test/known-good/Cpp/src/SlowingClock.txt @@ -9,14 +9,14 @@ * Modeled after the C version of this test. */ target Cpp { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } main reactor SlowingClock { logical action a(100 msec) - state interval: time(100 msec) - state expected_time: time(100 msec) + state interval: time(100 msec) + state expected_time: time(100 msec) reaction(startup) -> a {= a.schedule(0ns); =} diff --git a/test/known-good/Cpp/src/SlowingClockPhysical.txt b/test/known-good/Cpp/src/SlowingClockPhysical.txt index 1faa21531..1a96cbfde 100644 --- a/test/known-good/Cpp/src/SlowingClockPhysical.txt +++ b/test/known-good/Cpp/src/SlowingClockPhysical.txt @@ -10,13 +10,13 @@ * Modeled after the C version of this test. */ target Cpp { - timeout: 1500 msec + timeout: 1500 msec } main reactor SlowingClockPhysical { physical action a - state interval: time(100 msec) - state expected_time: time(100 msec) + state interval: time(100 msec) + state expected_time: time(100 msec) reaction(startup) -> a {= expected_time=100ms; diff --git a/test/known-good/Cpp/src/StartupOutFromInside.txt b/test/known-good/Cpp/src/StartupOutFromInside.txt index f2412c439..4056e2d9a 100644 --- a/test/known-good/Cpp/src/StartupOutFromInside.txt +++ b/test/known-good/Cpp/src/StartupOutFromInside.txt @@ -6,7 +6,7 @@ target Cpp reactor Bar { - output out: int + output out: int reaction(startup) -> out {= out.set(42); =} } diff --git a/test/known-good/Cpp/src/Stride.txt b/test/known-good/Cpp/src/Stride.txt index 67763577b..c90b32a7c 100644 --- a/test/known-good/Cpp/src/Stride.txt +++ b/test/known-good/Cpp/src/Stride.txt @@ -1,13 +1,13 @@ // This example illustrates state variables and parameters on the wiki. For this // test, success is just compiling and running. target Cpp { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Count(stride: int(1)) { - state count: int(0) - output y: int +reactor Count(stride: int(1)) { + state count: int(0) + output y: int timer t(0, 100 msec) reaction(t) -> y {= @@ -17,9 +17,9 @@ } reactor Display { - input x: int + input x: int - reaction(x) {= std::cout << "Received " << *x.get() << std::endl; =} + reaction(x) {= std::cout << "Received " << *x.get() << std::endl; =} } main reactor Stride { diff --git a/test/known-good/Cpp/src/StructAsState.txt b/test/known-good/Cpp/src/StructAsState.txt index 539341c64..02d620e27 100644 --- a/test/known-good/Cpp/src/StructAsState.txt +++ b/test/known-good/Cpp/src/StructAsState.txt @@ -6,7 +6,7 @@ =} main reactor StructAsState { - state s: Hello{"Earth", 42} + state s: Hello{"Earth", 42} reaction(startup) {= std::cout << "State s.name=" << s.name << ", s.value=" << s.value << '\n'; diff --git a/test/known-good/Cpp/src/StructAsType.txt b/test/known-good/Cpp/src/StructAsType.txt index dba4556ff..297ed17e0 100644 --- a/test/known-good/Cpp/src/StructAsType.txt +++ b/test/known-good/Cpp/src/StructAsType.txt @@ -8,7 +8,7 @@ =} reactor StaticSource { - output out: Hello + output out: Hello reaction(startup) -> out {= Hello hello{"Earth", 42}; diff --git a/test/known-good/Cpp/src/StructAsTypeDirect.txt b/test/known-good/Cpp/src/StructAsTypeDirect.txt index db8736748..ccf6db9ee 100644 --- a/test/known-good/Cpp/src/StructAsTypeDirect.txt +++ b/test/known-good/Cpp/src/StructAsTypeDirect.txt @@ -8,7 +8,7 @@ =} reactor DirectSource { - output out: Hello + output out: Hello reaction(startup) -> out {= // this implicitly creates a new hello object which is then send diff --git a/test/known-good/Cpp/src/StructPrint.txt b/test/known-good/Cpp/src/StructPrint.txt index cffe7ef69..b3a903f1f 100644 --- a/test/known-good/Cpp/src/StructPrint.txt +++ b/test/known-good/Cpp/src/StructPrint.txt @@ -6,7 +6,7 @@ =} reactor Source { - output out: Hello + output out: Hello reaction(startup) -> out {= // create an dynamically allocated mutable Hello object @@ -19,10 +19,10 @@ } reactor Print( - expected_value: int(42), + expected_value: int(42), expected_name: {= std::string =}("Earth") ) { - input in: Hello + input in: Hello reaction(in) {= // get a reference to the received struct for convenience diff --git a/test/known-good/Cpp/src/StructScale.txt b/test/known-good/Cpp/src/StructScale.txt index 9be3e7c02..6d74e3b55 100644 --- a/test/known-good/Cpp/src/StructScale.txt +++ b/test/known-good/Cpp/src/StructScale.txt @@ -9,10 +9,10 @@ #include "include/hello.h" =} -reactor Scale(scale: int(2)) { - input in: Hello +reactor Scale(scale: int(2)) { + input in: Hello - output out: Hello + output out: Hello reaction(in) -> out {= auto hello = in.get().get_mutable_copy(); diff --git a/test/known-good/Cpp/src/TestForPreviousOutput.txt b/test/known-good/Cpp/src/TestForPreviousOutput.txt index f12eb2504..b16062637 100644 --- a/test/known-good/Cpp/src/TestForPreviousOutput.txt +++ b/test/known-good/Cpp/src/TestForPreviousOutput.txt @@ -3,7 +3,7 @@ target Cpp reactor Source { - output out: int + output out: int reaction(startup) -> out {= // Set a seed for random number generation based on the current time. @@ -25,7 +25,7 @@ } reactor Sink { - input in: int + input in: int reaction(in) {= std::cout << "Received: " << *in.get() << '\n'; diff --git a/test/known-good/Cpp/src/TimeLimit.txt b/test/known-good/Cpp/src/TimeLimit.txt index 6fcff5178..b2ecf50bc 100644 --- a/test/known-good/Cpp/src/TimeLimit.txt +++ b/test/known-good/Cpp/src/TimeLimit.txt @@ -2,13 +2,13 @@ // limit. Correct output for this 1, 2, 3, 4. Failure for this test is failing // to halt or getting the wrong data. target Cpp { - fast: true + fast: true } -reactor Clock(offset: time(0), period: time(1 sec)) { - output y: int +reactor Clock(offset: time(0), period: time(1 sec)) { + output y: int timer t(offset, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= count++; @@ -18,8 +18,8 @@ } reactor Destination { - input x: int - state s: int(1) + input x: int + state s: int(1) reaction(x) {= //std::cout << "Received " << *x.get() << '\n'; @@ -39,7 +39,7 @@ =} } -main reactor TimeLimit(period: time(1 sec)) { +main reactor TimeLimit(period: time(1 sec)) { timer stop(10 sec) c = new Clock(period = period) d = new Destination() diff --git a/test/known-good/Cpp/src/TimeState.txt b/test/known-good/Cpp/src/TimeState.txt index a2782be51..ef8ee1fda 100644 --- a/test/known-good/Cpp/src/TimeState.txt +++ b/test/known-good/Cpp/src/TimeState.txt @@ -1,9 +1,9 @@ target Cpp -reactor Foo(bar: time(42 msec)) { +reactor Foo(bar: time(42 msec)) { state baz(bar) - reaction(startup) {= std::cout << "Baz: " << baz << std::endl; =} + reaction(startup) {= std::cout << "Baz: " << baz << std::endl; =} } main reactor { diff --git a/test/known-good/Cpp/src/Timeout_Test.txt b/test/known-good/Cpp/src/Timeout_Test.txt index 24d3dd14e..7a1e47a76 100644 --- a/test/known-good/Cpp/src/Timeout_Test.txt +++ b/test/known-good/Cpp/src/Timeout_Test.txt @@ -6,14 +6,14 @@ * Modeled after the C version of this test. */ target Cpp { - timeout: 11 msec + timeout: 11 msec } import Sender from "lib/LoopedActionSender.lf" reactor Consumer { - input in: int - state success: bool(false) + input in: int + state success: bool(false) reaction(in) {= auto current{get_elapsed_logical_time()}; diff --git a/test/known-good/Cpp/src/TimerIsPresent.txt b/test/known-good/Cpp/src/TimerIsPresent.txt index 11ff7a633..10da9ca3b 100644 --- a/test/known-good/Cpp/src/TimerIsPresent.txt +++ b/test/known-good/Cpp/src/TimerIsPresent.txt @@ -1,5 +1,5 @@ target Cpp { - timeout: 1 sec + timeout: 1 sec } main reactor { diff --git a/test/known-good/Cpp/src/ToReactionNested.txt b/test/known-good/Cpp/src/ToReactionNested.txt index 129c9f2a4..dcab0f58f 100644 --- a/test/known-good/Cpp/src/ToReactionNested.txt +++ b/test/known-good/Cpp/src/ToReactionNested.txt @@ -1,19 +1,19 @@ target Cpp { - timeout: 5 sec, - fast: true + timeout: 5 sec, + fast: true } import Count from "lib/Count.lf" reactor CountContainer { - output out: int + output out: int c1 = new Count() c1.c -> out } main reactor { - state count: int(1) - state received: bool(false) + state count: int(1) + state received: bool(false) s = new CountContainer() diff --git a/test/known-good/Cpp/src/TriggerDownstreamOnlyIfPresent2.txt b/test/known-good/Cpp/src/TriggerDownstreamOnlyIfPresent2.txt index db76fb54e..c5ea1c967 100644 --- a/test/known-good/Cpp/src/TriggerDownstreamOnlyIfPresent2.txt +++ b/test/known-good/Cpp/src/TriggerDownstreamOnlyIfPresent2.txt @@ -7,13 +7,13 @@ * Modeled after the C version of this test. */ target Cpp { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } reactor Source { - output[2] out: int - state count: int(0) + output[2] out: int + state count: int(0) timer t(0, 200 msec) reaction(t) -> out {= @@ -26,7 +26,7 @@ } reactor Destination { - input in: int + input in: int reaction(in) {= if(!in.is_present()){ @@ -38,7 +38,7 @@ main reactor TriggerDownstreamOnlyIfPresent2 { s = new Source() - d = new[2] Destination() + d = new[2] Destination() s.out -> d.in } diff --git a/test/known-good/Cpp/src/concurrent/AsyncCallback.txt b/test/known-good/Cpp/src/concurrent/AsyncCallback.txt index e4116c7a8..f3b77cabe 100644 --- a/test/known-good/Cpp/src/concurrent/AsyncCallback.txt +++ b/test/known-good/Cpp/src/concurrent/AsyncCallback.txt @@ -1,7 +1,7 @@ // Test asynchronous callbacks that trigger a physical action. target Cpp { - timeout: 2 sec, - cmake-include: "AsyncCallback.cmake" + timeout: 2 sec, + cmake-include: "AsyncCallback.cmake" } main reactor AsyncCallback { @@ -10,12 +10,12 @@ =} timer t(0, 200 msec) - state thread: {= std::thread =} - state expected_time: time(100 msec) - state toggle: bool(false) + state thread: {= std::thread =} + state expected_time: time(100 msec) + state toggle: bool(false) - physical action a: int - state i: int(0) + physical action a: int + state i: int(0) reaction(t) -> a {= // make sure to join the old thread first diff --git a/test/known-good/Cpp/src/concurrent/AsyncCallback2.txt b/test/known-good/Cpp/src/concurrent/AsyncCallback2.txt index 087cb601b..804c4c4b6 100644 --- a/test/known-good/Cpp/src/concurrent/AsyncCallback2.txt +++ b/test/known-good/Cpp/src/concurrent/AsyncCallback2.txt @@ -1,7 +1,7 @@ // Test asynchronous callbacks that trigger a non-physical action. target Cpp { - timeout: 2 sec, - cmake-include: "AsyncCallback.cmake" + timeout: 2 sec, + cmake-include: "AsyncCallback.cmake" } main reactor AsyncCallback2 { @@ -10,10 +10,10 @@ =} timer t(0, 200 msec) - state expected_time: time(0) + state expected_time: time(0) - logical action a: int - state i: int(0) + logical action a: int + state i: int(0) reaction(t) -> a {= // start new thread diff --git a/test/known-good/Cpp/src/concurrent/CompositionThreaded.txt b/test/known-good/Cpp/src/concurrent/CompositionThreaded.txt index 33bd02a29..84256fdf2 100644 --- a/test/known-good/Cpp/src/concurrent/CompositionThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/CompositionThreaded.txt @@ -1,14 +1,14 @@ // This test connects a simple counting source to tester that checks against its // own count. target Cpp { - fast: true, - timeout: 10 sec + fast: true, + timeout: 10 sec } -reactor Source(period: time(2 sec)) { - output y: int +reactor Source(period: time(2 sec)) { + output y: int timer t(1 sec, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= count++; @@ -17,8 +17,8 @@ } reactor Test { - input x: int - state count: int(0) + input x: int + state count: int(0) reaction(x) {= count++; diff --git a/test/known-good/Cpp/src/concurrent/DeadlineHandledAboveThreaded.txt b/test/known-good/Cpp/src/concurrent/DeadlineHandledAboveThreaded.txt index 080389262..6d95df04f 100644 --- a/test/known-good/Cpp/src/concurrent/DeadlineHandledAboveThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/DeadlineHandledAboveThreaded.txt @@ -2,9 +2,9 @@ // container reacts to that output. target Cpp -reactor Deadline(threshold: time(100 msec)) { - input x: int - output deadline_violation: bool +reactor Deadline(threshold: time(100 msec)) { + input x: int + output deadline_violation: bool reaction(x) -> deadline_violation {= std::cerr << "ERROR: Deadline violation was not detected!" << std::endl; @@ -16,7 +16,7 @@ } main reactor { - state violation_detected: bool({= false =}) + state violation_detected: bool({= false =}) d = new Deadline(threshold = 10 msec) reaction(startup) -> d.x {= diff --git a/test/known-good/Cpp/src/concurrent/DeadlineThreaded.txt b/test/known-good/Cpp/src/concurrent/DeadlineThreaded.txt index 11757331c..0d26cbb0d 100644 --- a/test/known-good/Cpp/src/concurrent/DeadlineThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/DeadlineThreaded.txt @@ -2,16 +2,16 @@ // the Source immediately, whereas odd numbers are sent after a big enough delay // to violate the deadline. target Cpp { - timeout: 4 sec + timeout: 4 sec } -reactor Source(period: time(2 sec)) { +reactor Source(period: time(2 sec)) { private preamble {= #include =} - output y: int + output y: int timer t(0, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= if (count % 2 == 1) { @@ -25,9 +25,9 @@ =} } -reactor Destination(timeout: time(1 sec)) { - input x: int - state count: int(0) +reactor Destination(timeout: time(1 sec)) { + input x: int + state count: int(0) reaction(x) {= std::cout << "Destination receives: " << *x.get() << std::endl; diff --git a/test/known-good/Cpp/src/concurrent/DelayIntThreaded.txt b/test/known-good/Cpp/src/concurrent/DelayIntThreaded.txt index b3cf7e8da..cb420da4e 100644 --- a/test/known-good/Cpp/src/concurrent/DelayIntThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/DelayIntThreaded.txt @@ -1,10 +1,10 @@ // This tests actions with payloads by delaying an input by a fixed amount. target Cpp -reactor Delay(delay: time(100 msec)) { - input in: int - output out: int - logical action d: int +reactor Delay(delay: time(100 msec)) { + input in: int + output out: int + logical action d: int reaction(in) -> d {= d.schedule(in.get(), delay); =} @@ -16,8 +16,8 @@ } reactor Test { - input in: int - state start_time: {= reactor::TimePoint =} + input in: int + state start_time: {= reactor::TimePoint =} timer start reaction(start) {= diff --git a/test/known-good/Cpp/src/concurrent/DeterminismThreaded.txt b/test/known-good/Cpp/src/concurrent/DeterminismThreaded.txt index d4b7db87c..75a2db022 100644 --- a/test/known-good/Cpp/src/concurrent/DeterminismThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/DeterminismThreaded.txt @@ -1,15 +1,15 @@ target Cpp reactor Source { - output y: int + output y: int timer t reaction(t) -> y {= y.set(1); =} } reactor Destination { - input x: int - input y: int + input x: int + input y: int reaction(x, y) {= int sum = 0; @@ -28,8 +28,8 @@ } reactor Pass { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= y.set(x.get()); =} } diff --git a/test/known-good/Cpp/src/concurrent/DoubleReactionThreaded.txt b/test/known-good/Cpp/src/concurrent/DoubleReactionThreaded.txt index 88cdd3d3d..1e2fb2136 100644 --- a/test/known-good/Cpp/src/concurrent/DoubleReactionThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/DoubleReactionThreaded.txt @@ -1,14 +1,14 @@ // Test that two simultaneous inputs that trigger a reaction trigger it only // once. Correct output for this 2, 4, 6, 8, etc. target Cpp { - timeout: 10 sec, - fast: true + timeout: 10 sec, + fast: true } -reactor Clock(offset: time(0), period: time(1 sec)) { - output y: int +reactor Clock(offset: time(0), period: time(1 sec)) { + output y: int timer t(offset, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= count++; @@ -17,9 +17,9 @@ } reactor Destination { - input x: int - input w: int - state s: int(2) + input x: int + input w: int + state s: int(2) reaction(x, w) {= int sum = 0; @@ -29,7 +29,7 @@ if (w.is_present()) { sum += *w.get(); } - std::cout << "Sum of inputs is: " << sum << std::endl; + std::cout << "Sum of inputs is: " << sum << std::endl; if (sum != s) { std::cerr << "FAILURE: Expected sum to be " << s << "but it was " << sum << std::endl; diff --git a/test/known-good/Cpp/src/concurrent/GainThreaded.txt b/test/known-good/Cpp/src/concurrent/GainThreaded.txt index c3a7b41a5..b468bd180 100644 --- a/test/known-good/Cpp/src/concurrent/GainThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/GainThreaded.txt @@ -1,15 +1,15 @@ // Example in the Wiki. target Cpp -reactor Scale(scale: int(2)) { - input x: int - output y: int +reactor Scale(scale: int(2)) { + input x: int + output y: int reaction(x) -> y {= y.set(*x.get() * scale); =} } reactor Test { - input x: int + input x: int reaction(x) {= auto value = *x.get(); diff --git a/test/known-good/Cpp/src/concurrent/HelloThreaded.txt b/test/known-good/Cpp/src/concurrent/HelloThreaded.txt index 0ef4353fc..4a56f151e 100644 --- a/test/known-good/Cpp/src/concurrent/HelloThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/HelloThreaded.txt @@ -4,15 +4,15 @@ // has a period of 4 seconds, the second of 2 seconds, and the third (composite) // or 1 second. target Cpp { - timeout: 10 sec, - fast: true + timeout: 10 sec, + fast: true } -reactor HelloCpp(period: time(2 sec), message: {= std::string =}("Hello C++")) { - state count: int(0) - state previous_time: {= reactor::TimePoint =} +reactor HelloCpp(period: time(2 sec), message: {= std::string =}("Hello C++")) { + state count: int(0) + state previous_time: {= reactor::TimePoint =} timer t(1 sec, period) - logical action a: void + logical action a: void reaction(t) -> a {= std::cout << message << std::endl; @@ -37,7 +37,7 @@ } reactor Inside( - period: time(1 sec), + period: time(1 sec), message: {= std::string =}("Composite default message.") ) { third_instance = new HelloCpp(period = period, message = message) diff --git a/test/known-good/Cpp/src/concurrent/MinimalThreaded.txt b/test/known-good/Cpp/src/concurrent/MinimalThreaded.txt index 651452f0d..1a4556f3a 100644 --- a/test/known-good/Cpp/src/concurrent/MinimalThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/MinimalThreaded.txt @@ -2,6 +2,6 @@ target Cpp main reactor { - reaction(startup) {= std::cout << "Hello World!\n"; =} + reaction(startup) {= std::cout << "Hello World!\n"; =} } diff --git a/test/known-good/Cpp/src/concurrent/SendingInsideThreaded.txt b/test/known-good/Cpp/src/concurrent/SendingInsideThreaded.txt index f569707ed..353136867 100644 --- a/test/known-good/Cpp/src/concurrent/SendingInsideThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/SendingInsideThreaded.txt @@ -1,13 +1,13 @@ // This tests a reactor that contains another reactor and also has its own // reaction that routes inputs to the contained reactor. target Cpp { - timeout: 10 sec, - fast: true + timeout: 10 sec, + fast: true } reactor Printer { - input x: int - state count: int(1) + input x: int + state count: int(1) reaction(x) {= std::cout << "Inside reactor received: " << *x.get() << std::endl; @@ -20,7 +20,7 @@ } main reactor { - state count: int(0) + state count: int(0) timer t(0, 1 sec) p = new Printer() diff --git a/test/known-good/Cpp/src/concurrent/Threaded.txt b/test/known-good/Cpp/src/concurrent/Threaded.txt index 131cf3579..c083cae93 100644 --- a/test/known-good/Cpp/src/concurrent/Threaded.txt +++ b/test/known-good/Cpp/src/concurrent/Threaded.txt @@ -7,13 +7,13 @@ // version, showing that without threads, this takes more than 800 msec to // complete 200 msec of logical time. target Cpp { - timeout: 2 sec + timeout: 2 sec } reactor Source { timer t(0, 200 msec) - output out: int - state s: int(0) + output out: int + state s: int(0) reaction(t) -> out {= out.set(s); @@ -25,8 +25,8 @@ private preamble {= #include =} - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= std::this_thread::sleep_for(200ms); @@ -35,11 +35,11 @@ } reactor Destination { - state s: int(0) - input in1: int - input in2: int - input in3: int - input in4: int + state s: int(0) + input in1: int + input in2: int + input in3: int + input in4: int reaction(in1, in2, in3, in4) {= int sum = *in1.get() + *in2.get() + *in3.get() + *in4.get(); diff --git a/test/known-good/Cpp/src/concurrent/ThreadedThreaded.txt b/test/known-good/Cpp/src/concurrent/ThreadedThreaded.txt index ad2172e32..6dd1c844f 100644 --- a/test/known-good/Cpp/src/concurrent/ThreadedThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/ThreadedThreaded.txt @@ -7,13 +7,13 @@ // version, showing that without threads, this takes more than 800 msec to // complete 200 msec of logical time. target Cpp { - timeout: 2 sec + timeout: 2 sec } reactor Source { timer t(0, 200 msec) - output out: int - state s: int(0) + output out: int + state s: int(0) reaction(t) -> out {= out.set(s); @@ -25,8 +25,8 @@ private preamble {= #include =} - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= std::this_thread::sleep_for(200ms); @@ -35,8 +35,8 @@ } reactor Destination { - state s: int(0) - input[4] in: int + state s: int(0) + input[4] in: int reaction(in) {= int sum = 0; @@ -54,7 +54,7 @@ main reactor { a = new Source() - t = new[4] Computation() + t = new[4] Computation() b = new Destination() (a.out)+ -> t.in t.out -> b.in diff --git a/test/known-good/Cpp/src/concurrent/TimeLimitThreaded.txt b/test/known-good/Cpp/src/concurrent/TimeLimitThreaded.txt index 66add4a83..0f9228b2a 100644 --- a/test/known-good/Cpp/src/concurrent/TimeLimitThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/TimeLimitThreaded.txt @@ -3,13 +3,13 @@ // second). Correct output for this 1, 2, 3, 4. Failure for this test is failing // to halt or getting the wrong data. target Cpp { - fast: true + fast: true } -reactor Clock(offset: time(0), period: time(1 sec)) { - output y: int +reactor Clock(offset: time(0), period: time(1 sec)) { + output y: int timer t(offset, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= count++; @@ -19,8 +19,8 @@ } reactor Destination { - input x: int - state s: int(1) + input x: int + state s: int(1) reaction(x) {= //std::cout << "Received " << *x.get() << '\n'; @@ -40,7 +40,7 @@ =} } -main reactor(period: time(1 sec)) { +main reactor(period: time(1 sec)) { timer stop(10 sec) c = new Clock(period = period) d = new Destination() diff --git a/test/known-good/Cpp/src/concurrent/Workers.txt b/test/known-good/Cpp/src/concurrent/Workers.txt index 6951a1b8a..e3151c26b 100644 --- a/test/known-good/Cpp/src/concurrent/Workers.txt +++ b/test/known-good/Cpp/src/concurrent/Workers.txt @@ -1,5 +1,5 @@ target Cpp { - workers: 16 + workers: 16 } main reactor { diff --git a/test/known-good/Cpp/src/enclave/EnclaveBank.txt b/test/known-good/Cpp/src/enclave/EnclaveBank.txt index 77c264fb4..6d1129431 100644 --- a/test/known-good/Cpp/src/enclave/EnclaveBank.txt +++ b/test/known-good/Cpp/src/enclave/EnclaveBank.txt @@ -1,15 +1,15 @@ // This is a smoke test for an enclaved bank target Cpp { - timeout: 3 sec + timeout: 3 sec } reactor Node( - bank_index: size_t(0), - id: std::string({= "node" + std::to_string(bank_index) =}), - period: time(500 msec), - duration: time(10 msec) + bank_index: size_t(0), + id: std::string({= "node" + std::to_string(bank_index) =}), + period: time(500 msec), + duration: time(10 msec) ) { - logical action a: void + logical action a: void reaction(startup, a) -> a {= reactor::log::Info() << id << " reaction executes."; @@ -25,6 +25,6 @@ main reactor { slow = new Node(id = "slow", period = 1 sec, duration = 500 msec) @enclave - nodes = new[2] Node() + nodes = new[2] Node() } diff --git a/test/known-good/Cpp/src/enclave/EnclaveBankEach.txt b/test/known-good/Cpp/src/enclave/EnclaveBankEach.txt index e9a443952..3ec417c25 100644 --- a/test/known-good/Cpp/src/enclave/EnclaveBankEach.txt +++ b/test/known-good/Cpp/src/enclave/EnclaveBankEach.txt @@ -1,16 +1,16 @@ // This is a smoke test for an enclaved bank where each individual instance is // an enclave target Cpp { - timeout: 1 sec + timeout: 1 sec } reactor Node( - bank_index: size_t(0), - id: std::string({= "node" + std::to_string(bank_index) =}), + bank_index: size_t(0), + id: std::string({= "node" + std::to_string(bank_index) =}), period: {= reactor::Duration =}({= 100ms * (bank_index+1) =}), duration: {= reactor::Duration =}({= 50ms + 100ms * bank_index =}) ) { - logical action a: void + logical action a: void reaction(startup, a) -> a {= reactor::log::Info() << id << " reaction executes."; @@ -26,6 +26,6 @@ main reactor { slow = new Node(id = "slow", period = {= 1s =}, duration = {= 700ms =}) @enclave(each = true) - nodes = new[2] Node() + nodes = new[2] Node() } diff --git a/test/known-good/Cpp/src/enclave/EnclaveHelloWorld.txt b/test/known-good/Cpp/src/enclave/EnclaveHelloWorld.txt index 648232abe..ac4be17bb 100644 --- a/test/known-good/Cpp/src/enclave/EnclaveHelloWorld.txt +++ b/test/known-good/Cpp/src/enclave/EnclaveHelloWorld.txt @@ -1,10 +1,10 @@ target Cpp -reactor Hello(msg: std::string("World")) { - reaction(startup) {= reactor::log::Info() << "Hello " << msg << '!'; =} +reactor Hello(msg: std::string("World")) { + reaction(startup) {= reactor::log::Info() << "Hello " << msg << '!'; =} } -main reactor(msg1: std::string("World"), msg2: std::string("Enclave")) { +main reactor(msg1: std::string("World"), msg2: std::string("Enclave")) { hello1 = new Hello(msg = msg1) @enclave diff --git a/test/known-good/Cpp/src/enclave/EnclaveHierarchy.txt b/test/known-good/Cpp/src/enclave/EnclaveHierarchy.txt index f4e4386c4..674b6ec82 100644 --- a/test/known-good/Cpp/src/enclave/EnclaveHierarchy.txt +++ b/test/known-good/Cpp/src/enclave/EnclaveHierarchy.txt @@ -1,12 +1,12 @@ // This is a smoke test for nested enclaves target Cpp { - timeout: 3 sec + timeout: 3 sec } reactor Node( - id: std::string("node"), - period: time(100 msec), - duration: time(50 msec) + id: std::string("node"), + period: time(100 msec), + duration: time(50 msec) ) { timer t(0, period) diff --git a/test/known-good/Cpp/src/enclave/EnclaveShutdown.txt b/test/known-good/Cpp/src/enclave/EnclaveShutdown.txt index e6fe7ac98..2baab5918 100644 --- a/test/known-good/Cpp/src/enclave/EnclaveShutdown.txt +++ b/test/known-good/Cpp/src/enclave/EnclaveShutdown.txt @@ -1,14 +1,14 @@ target Cpp reactor Node( - message: std::string("Hello"), - period: time(1 sec), - stop: time(3 sec) + message: std::string("Hello"), + period: time(1 sec), + stop: time(3 sec) ) { timer t(0, period) timer s(stop) - reaction(t) {= reactor::log::Info() << message; =} + reaction(t) {= reactor::log::Info() << message; =} reaction(s) {= request_stop(); =} diff --git a/test/known-good/Cpp/src/enclave/EnclaveTimeout.txt b/test/known-good/Cpp/src/enclave/EnclaveTimeout.txt index 043da19a8..60dc54776 100644 --- a/test/known-good/Cpp/src/enclave/EnclaveTimeout.txt +++ b/test/known-good/Cpp/src/enclave/EnclaveTimeout.txt @@ -1,11 +1,11 @@ target Cpp { - timeout: 1 sec + timeout: 1 sec } -reactor Node(message: std::string("Hello"), period: time(1 sec)) { +reactor Node(message: std::string("Hello"), period: time(1 sec)) { timer t(0, period) - reaction(t) {= reactor::log::Info() << message; =} + reaction(t) {= reactor::log::Info() << message; =} reaction(shutdown) {= reactor::log::Info() << "Goodbye!"; diff --git a/test/known-good/Cpp/src/enclave/FastAndSlow.txt b/test/known-good/Cpp/src/enclave/FastAndSlow.txt index 166aa8997..6d4677f66 100644 --- a/test/known-good/Cpp/src/enclave/FastAndSlow.txt +++ b/test/known-good/Cpp/src/enclave/FastAndSlow.txt @@ -1,7 +1,7 @@ // This is a basic test for enclaved execution. The deadlines shiuld never be // violated for the test to pass. target Cpp { - timeout: 3 sec + timeout: 3 sec } reactor Slow { diff --git a/test/known-good/Cpp/src/lib/Count.txt b/test/known-good/Cpp/src/lib/Count.txt index 1a0936d39..496346fcd 100644 --- a/test/known-good/Cpp/src/lib/Count.txt +++ b/test/known-good/Cpp/src/lib/Count.txt @@ -1,9 +1,9 @@ target Cpp reactor Count { - output c: int + output c: int timer t(0, 1 sec) - state i: int(0) + state i: int(0) reaction(t) -> c {= i++; diff --git a/test/known-good/Cpp/src/lib/Imported.txt b/test/known-good/Cpp/src/lib/Imported.txt index 2f6386604..61dad474a 100644 --- a/test/known-good/Cpp/src/lib/Imported.txt +++ b/test/known-good/Cpp/src/lib/Imported.txt @@ -5,7 +5,7 @@ import ImportedAgain from "ImportedAgain.lf" reactor Imported { - input x: int + input x: int a = new ImportedAgain() reaction(x) -> a.x {= a.x.set(x.get()); =} diff --git a/test/known-good/Cpp/src/lib/ImportedAgain.txt b/test/known-good/Cpp/src/lib/ImportedAgain.txt index afc7828e1..b34d4a8c7 100644 --- a/test/known-good/Cpp/src/lib/ImportedAgain.txt +++ b/test/known-good/Cpp/src/lib/ImportedAgain.txt @@ -3,12 +3,12 @@ target Cpp reactor ImportedAgain { - input x: int + input x: int reaction(x) {= auto value = *x.get(); if (value != 42) { - std::cerr << "ERROR: Expected input to be 42. Got: " << value << std::endl; + std::cerr << "ERROR: Expected input to be 42. Got: " << value << std::endl; exit(1); } else { std::cout << "Received " << value << std::endl; diff --git a/test/known-good/Cpp/src/lib/ImportedComposition.txt b/test/known-good/Cpp/src/lib/ImportedComposition.txt index a84444750..34e0e2238 100644 --- a/test/known-good/Cpp/src/lib/ImportedComposition.txt +++ b/test/known-good/Cpp/src/lib/ImportedComposition.txt @@ -9,15 +9,15 @@ target Cpp reactor Gain { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= y.set(*x.get() * 2); =} } reactor ImportedComposition { - input x: int - output y: int + input x: int + output y: int g1 = new Gain() g2 = new Gain() x -> g1.x after 10 msec diff --git a/test/known-good/Cpp/src/lib/LoopedActionSender.txt b/test/known-good/Cpp/src/lib/LoopedActionSender.txt index 903bf7480..c5e50738d 100644 --- a/test/known-good/Cpp/src/lib/LoopedActionSender.txt +++ b/test/known-good/Cpp/src/lib/LoopedActionSender.txt @@ -13,10 +13,10 @@ * @param break_interval: Determines how long the reactor should take a break * after sending take_a_break_after messages. */ -reactor Sender(take_a_break_after: int(10), break_interval: time(400 msec)) { - output out: int +reactor Sender(take_a_break_after: int(10), break_interval: time(400 msec)) { + output out: int logical action act - state sent_messages: int(0) + state sent_messages: int(0) reaction(startup, act) -> act, out {= out.set(sent_messages); diff --git a/test/known-good/Cpp/src/multiport/BankSelfBroadcast.txt b/test/known-good/Cpp/src/multiport/BankSelfBroadcast.txt index ffb971dfb..c0d8b4185 100644 --- a/test/known-good/Cpp/src/multiport/BankSelfBroadcast.txt +++ b/test/known-good/Cpp/src/multiport/BankSelfBroadcast.txt @@ -8,10 +8,10 @@ */ target Cpp -reactor A(bank_index: size_t(0)) { - input[4] in: size_t - output out: size_t - state received: bool(false) +reactor A(bank_index: size_t(0)) { + input[4] in: size_t + output out: size_t + state received: bool(false) reaction(startup) -> out {= out.set(bank_index); =} @@ -43,7 +43,7 @@ } main reactor { - a = new[4] A() + a = new[4] A() (a.out)+ -> a.in } diff --git a/test/known-good/Cpp/src/multiport/BankToBank.txt b/test/known-good/Cpp/src/multiport/BankToBank.txt index 694c46bfe..18e08604f 100644 --- a/test/known-good/Cpp/src/multiport/BankToBank.txt +++ b/test/known-good/Cpp/src/multiport/BankToBank.txt @@ -1,13 +1,13 @@ // Check bank of reactors sending to bank of reactors. target Cpp { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Source(bank_index: size_t(0)) { +reactor Source(bank_index: size_t(0)) { timer t(0, 200 msec) - output out: int - state s: int(0) + output out: int + state s: int(0) reaction(t) -> out {= out.set(s); @@ -15,9 +15,9 @@ =} } -reactor Destination(bank_index: size_t(0)) { - state s: int(0) - input in: int +reactor Destination(bank_index: size_t(0)) { + state s: int(0) + input in: int reaction(in) {= std::cout << "Destination " << bank_index << " received: " << *in.get() << "\n"; @@ -37,10 +37,10 @@ =} } -main reactor BankToBank(width: int(4)) { +main reactor BankToBank(width: int(4)) { // FIXME: Should set the width to "width" rather than "4". - a = new[4] Source() - b = new[4] Destination() + a = new[4] Source() + b = new[4] Destination() a.out -> b.in } diff --git a/test/known-good/Cpp/src/multiport/BankToBankMultiport.txt b/test/known-good/Cpp/src/multiport/BankToBankMultiport.txt index 6435665a2..8d1cb13d3 100644 --- a/test/known-good/Cpp/src/multiport/BankToBankMultiport.txt +++ b/test/known-good/Cpp/src/multiport/BankToBankMultiport.txt @@ -1,13 +1,13 @@ // Check bank of reactors sending to bank of reactors with multiports. target Cpp { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Source(width: size_t(1)) { +reactor Source(width: size_t(1)) { timer t(0, 200 msec) - output[width] out: int - state s: int(0) + output[width] out: int + state s: int(0) reaction(t) -> out {= for(size_t i = 0; i < out.size(); i++) { @@ -16,14 +16,14 @@ =} } -reactor Destination(width: size_t(1)) { - state s: int(6) - input[width] in: int +reactor Destination(width: size_t(1)) { + state s: int(6) + input[width] in: int reaction(in) {= int sum = 0; - for (auto i : in.present_indices_unsorted()) { + for (auto i : in.present_indices_unsorted()) { sum += *in[i].get(); } @@ -44,9 +44,9 @@ =} } -main reactor(bank_width: size_t(4)) { - a = new[bank_width] Source(width = 4) - b = new[bank_width] Destination(width = 4) +main reactor(bank_width: size_t(4)) { + a = new[bank_width] Source(width = 4) + b = new[bank_width] Destination(width = 4) a.out -> b.in } diff --git a/test/known-good/Cpp/src/multiport/BankToBankMultiportAfter.txt b/test/known-good/Cpp/src/multiport/BankToBankMultiportAfter.txt index a978455af..73ac253ab 100644 --- a/test/known-good/Cpp/src/multiport/BankToBankMultiportAfter.txt +++ b/test/known-good/Cpp/src/multiport/BankToBankMultiportAfter.txt @@ -1,13 +1,13 @@ // Check bank of reactors sending to bank of reactors with multiports. target Cpp { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Source(width: size_t(1)) { +reactor Source(width: size_t(1)) { timer t(0, 200 msec) - output[width] out: int - state s: int(0) + output[width] out: int + state s: int(0) reaction(t) -> out {= for(size_t i = 0; i < out.size(); i++) { @@ -16,10 +16,10 @@ =} } -reactor Destination(width: size_t(1)) { - state s: int(6) - state iterations: unsigned(0) - input[width] in: int +reactor Destination(width: size_t(1)) { + state s: int(6) + state iterations: unsigned(0) + input[width] in: int reaction(in) {= iterations++; @@ -31,7 +31,7 @@ } int sum = 0; - for (auto i : in.present_indices_unsorted()) { + for (auto i : in.present_indices_unsorted()) { sum += *in[i].get(); } @@ -52,9 +52,9 @@ =} } -main reactor(bank_width: size_t(4)) { - a = new[bank_width] Source(width = 4) - b = new[bank_width] Destination(width = 4) +main reactor(bank_width: size_t(4)) { + a = new[bank_width] Source(width = 4) + b = new[bank_width] Destination(width = 4) a.out -> b.in after 200 msec } diff --git a/test/known-good/Cpp/src/multiport/BankToMultiport.txt b/test/known-good/Cpp/src/multiport/BankToMultiport.txt index d14015162..0a4e7a173 100644 --- a/test/known-good/Cpp/src/multiport/BankToMultiport.txt +++ b/test/known-good/Cpp/src/multiport/BankToMultiport.txt @@ -1,15 +1,15 @@ // Test bank of reactors to multiport input with id parameter in the bank. target Cpp -reactor Source(bank_index: size_t(0)) { - output out: unsigned +reactor Source(bank_index: size_t(0)) { + output out: unsigned reaction(startup) -> out {= out.set(bank_index); =} } reactor Sink { - input[4] in: unsigned - state received: bool(false) + input[4] in: unsigned + state received: bool(false) reaction(in) {= for (unsigned i = 0; i < in.size(); i++) { @@ -31,7 +31,7 @@ } main reactor BankToMultiport { - source = new[4] Source() + source = new[4] Source() sink = new Sink() source.out -> sink.in } diff --git a/test/known-good/Cpp/src/multiport/Broadcast.txt b/test/known-good/Cpp/src/multiport/Broadcast.txt index 0c0958b2c..c16817c11 100644 --- a/test/known-good/Cpp/src/multiport/Broadcast.txt +++ b/test/known-good/Cpp/src/multiport/Broadcast.txt @@ -1,13 +1,13 @@ target Cpp reactor Source { - output out: unsigned + output out: unsigned reaction(startup) -> out {= out.set(42); =} } -reactor Sink(bank_index: size_t(0)) { - input in: unsigned +reactor Sink(bank_index: size_t(0)) { + input in: unsigned reaction(in) {= std::cout << "Received " << *in.get() << '\n'; @@ -20,7 +20,7 @@ main reactor { source = new Source() - sink = new[4] Sink() + sink = new[4] Sink() (source.out)+ -> sink.in } diff --git a/test/known-good/Cpp/src/multiport/BroadcastAfter.txt b/test/known-good/Cpp/src/multiport/BroadcastAfter.txt index af53b1ffe..e1821b8cb 100644 --- a/test/known-good/Cpp/src/multiport/BroadcastAfter.txt +++ b/test/known-good/Cpp/src/multiport/BroadcastAfter.txt @@ -1,16 +1,16 @@ target Cpp { - fast: true + fast: true } reactor Source { - output out: unsigned + output out: unsigned reaction(startup) -> out {= out.set(42); =} } -reactor Sink(bank_index: size_t(0)) { - input in: unsigned - state received: bool{false} +reactor Sink(bank_index: size_t(0)) { + input in: unsigned + state received: bool{false} reaction(in) {= std::cout << bank_index << " received " << *in.get() << '\n'; @@ -36,7 +36,7 @@ main reactor { source = new Source() - sink = new[4] Sink() + sink = new[4] Sink() (source.out)+ -> sink.in after 1 sec } diff --git a/test/known-good/Cpp/src/multiport/BroadcastMultipleAfter.txt b/test/known-good/Cpp/src/multiport/BroadcastMultipleAfter.txt index f78315e5e..34fdd6409 100644 --- a/test/known-good/Cpp/src/multiport/BroadcastMultipleAfter.txt +++ b/test/known-good/Cpp/src/multiport/BroadcastMultipleAfter.txt @@ -1,16 +1,16 @@ target Cpp { - fast: true + fast: true } -reactor Source(value: unsigned(42)) { - output out: unsigned +reactor Source(value: unsigned(42)) { + output out: unsigned reaction(startup) -> out {= out.set(value); =} } -reactor Sink(bank_index: size_t(0)) { - input in: unsigned - state received: bool{false} +reactor Sink(bank_index: size_t(0)) { + input in: unsigned + state received: bool{false} reaction(in) {= std::cout << bank_index << " received " << *in.get() << '\n'; @@ -39,7 +39,7 @@ source1 = new Source(value = 1) source2 = new Source(value = 2) source3 = new Source(value = 3) - sink = new[9] Sink() + sink = new[9] Sink() (source1.out, source2.out, source3.out)+ -> sink.in after 1 sec } diff --git a/test/known-good/Cpp/src/multiport/FullyConnected.txt b/test/known-good/Cpp/src/multiport/FullyConnected.txt index af6a4ce1b..b443ce1dd 100644 --- a/test/known-good/Cpp/src/multiport/FullyConnected.txt +++ b/test/known-good/Cpp/src/multiport/FullyConnected.txt @@ -1,10 +1,10 @@ target Cpp -reactor Node(bank_index: size_t(0), num_nodes: size_t(4)) { - input[num_nodes] in: size_t - output out: size_t +reactor Node(bank_index: size_t(0), num_nodes: size_t(4)) { + input[num_nodes] in: size_t + output out: size_t - state received: bool{false} + state received: bool{false} reaction(startup) -> out {= std::cout << "Hello from node " << bank_index << "!\n"; @@ -16,7 +16,7 @@ std::cout << "Node " << bank_index << " received messages from "; received = true; size_t count{0}; - for (auto i: in.present_indices_unsorted()) { + for (auto i: in.present_indices_unsorted()) { count++; std::cout << *in[i].get() << ", "; } @@ -36,8 +36,8 @@ =} } -main reactor(num_nodes: size_t(4)) { - nodes = new[num_nodes] Node(num_nodes = num_nodes) +main reactor(num_nodes: size_t(4)) { + nodes = new[num_nodes] Node(num_nodes = num_nodes) (nodes.out)+ -> nodes.in } diff --git a/test/known-good/Cpp/src/multiport/FullyConnectedAddressable.txt b/test/known-good/Cpp/src/multiport/FullyConnectedAddressable.txt index 6eff22013..f61dae8b5 100644 --- a/test/known-good/Cpp/src/multiport/FullyConnectedAddressable.txt +++ b/test/known-good/Cpp/src/multiport/FullyConnectedAddressable.txt @@ -1,11 +1,11 @@ // In this pattern, each node can send direct messages to individual other nodes target Cpp -reactor Node(bank_index: size_t(0), num_nodes: size_t(4)) { - input[num_nodes] in: size_t - output[num_nodes] out: size_t +reactor Node(bank_index: size_t(0), num_nodes: size_t(4)) { + input[num_nodes] in: size_t + output[num_nodes] out: size_t - state received: bool{false} + state received: bool{false} reaction(startup) -> out {= std::cout << "Hello from node " << bank_index << "!\n"; @@ -18,7 +18,7 @@ received = true; size_t count{0}; size_t result{0}; - for (auto i : in.present_indices_unsorted()) { + for (auto i : in.present_indices_unsorted()) { count++; result = *in[i].get(); std::cout << result << ", "; @@ -26,7 +26,7 @@ std::cout << '\n'; - size_t expected = bank_index == 0 ? num_nodes - 1 : bank_index - 1; + size_t expected = bank_index == 0 ? num_nodes - 1 : bank_index - 1; if (count != 1 || result != expected) { std::cerr << "ERROR: received an unexpected message!\n"; exit(1); @@ -41,11 +41,11 @@ =} } -main reactor(num_nodes: size_t(4)) { - nodes1 = new[num_nodes] Node(num_nodes = num_nodes) +main reactor(num_nodes: size_t(4)) { + nodes1 = new[num_nodes] Node(num_nodes = num_nodes) nodes1.out -> interleaved (nodes1.in) - nodes2 = new[num_nodes] Node(num_nodes = num_nodes) + nodes2 = new[num_nodes] Node(num_nodes = num_nodes) interleaved (nodes2.out) -> nodes2.in } diff --git a/test/known-good/Cpp/src/multiport/FullyConnectedAddressableAfter.txt b/test/known-good/Cpp/src/multiport/FullyConnectedAddressableAfter.txt index 9cf15ca85..a9223949d 100644 --- a/test/known-good/Cpp/src/multiport/FullyConnectedAddressableAfter.txt +++ b/test/known-good/Cpp/src/multiport/FullyConnectedAddressableAfter.txt @@ -3,11 +3,11 @@ import Node from "FullyConnectedAddressable.lf" -main reactor(num_nodes: size_t(4)) { - nodes1 = new[num_nodes] Node(num_nodes = num_nodes) +main reactor(num_nodes: size_t(4)) { + nodes1 = new[num_nodes] Node(num_nodes = num_nodes) nodes1.out -> interleaved (nodes1.in) after 200 msec - nodes2 = new[num_nodes] Node(num_nodes = num_nodes) + nodes2 = new[num_nodes] Node(num_nodes = num_nodes) interleaved (nodes2.out) -> nodes2.in after 400 msec } diff --git a/test/known-good/Cpp/src/multiport/IndexIntoMultiportInput.txt b/test/known-good/Cpp/src/multiport/IndexIntoMultiportInput.txt index 45a38c24a..c3e9aa820 100644 --- a/test/known-good/Cpp/src/multiport/IndexIntoMultiportInput.txt +++ b/test/known-good/Cpp/src/multiport/IndexIntoMultiportInput.txt @@ -9,7 +9,7 @@ target Cpp reactor ReactorWithMultiport { - input[3] in: int + input[3] in: int reaction(startup, in) {= bool error{false}; @@ -31,11 +31,11 @@ } reactor MultiportSplitter { - output[3] out: int + output[3] out: int - input in0: int - input in1: int - input in2: int + input in0: int + input in1: int + input in2: int in0, in1, in2 -> out } diff --git a/test/known-good/Cpp/src/multiport/IndexIntoMultiportOutput.txt b/test/known-good/Cpp/src/multiport/IndexIntoMultiportOutput.txt index c803e8858..989ad19b9 100644 --- a/test/known-good/Cpp/src/multiport/IndexIntoMultiportOutput.txt +++ b/test/known-good/Cpp/src/multiport/IndexIntoMultiportOutput.txt @@ -8,8 +8,8 @@ */ target Cpp -reactor ReactorWithMultiport(width: size_t(3)) { - output[width] out: int +reactor ReactorWithMultiport(width: size_t(3)) { + output[width] out: int reaction(startup) -> out {= for (size_t i{0}; i < width; i++) { @@ -18,12 +18,12 @@ =} } -reactor MultiportSplitter(width: size_t(3)) { - input[width] in: int +reactor MultiportSplitter(width: size_t(3)) { + input[width] in: int - output out0: int - output out1: int - output out2: int + output out0: int + output out1: int + output out2: int in -> out0, out1, out2 } @@ -34,9 +34,9 @@ source.out -> splitter.in - state received0: bool{false} - state received1: bool{false} - state received2: bool{false} + state received0: bool{false} + state received1: bool{false} + state received2: bool{false} reaction(splitter.out0) {= received0 = true; diff --git a/test/known-good/Cpp/src/multiport/Multiport.txt b/test/known-good/Cpp/src/multiport/Multiport.txt index 1f10309fd..80950a660 100644 --- a/test/known-good/Cpp/src/multiport/Multiport.txt +++ b/test/known-good/Cpp/src/multiport/Multiport.txt @@ -9,11 +9,11 @@ target Cpp reactor Test { - input[3000] sink: void - output[3000] source: void + input[3000] sink: void + output[3000] source: void reaction(sink) -> source {= - for (auto i: sink.present_indices_unsorted()) { + for (auto i: sink.present_indices_unsorted()) { source[i].set(); } =} @@ -21,7 +21,7 @@ main reactor Multiport { test = new Test() - state received: bool(false) + state received: bool(false) reaction(startup) -> test.sink {= for (auto i = 0; i < 30; i++) { diff --git a/test/known-good/Cpp/src/multiport/MultiportFromBank.txt b/test/known-good/Cpp/src/multiport/MultiportFromBank.txt index fb15e328a..6eb5994e9 100644 --- a/test/known-good/Cpp/src/multiport/MultiportFromBank.txt +++ b/test/known-good/Cpp/src/multiport/MultiportFromBank.txt @@ -1,19 +1,19 @@ // Check multiport output to bank of recipients. Here, the bank is smaller than // the width of the sending port. target Cpp { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Source(bank_index: size_t(0)) { - output out: unsigned +reactor Source(bank_index: size_t(0)) { + output out: unsigned reaction(startup) -> out {= out.set(bank_index); =} } -reactor Destination(port_width: size_t(2)) { - input[port_width] in: unsigned - state received: bool(false) +reactor Destination(port_width: size_t(2)) { + input[port_width] in: unsigned + state received: bool(false) reaction(in) {= for (size_t i = 0; i < in.size(); i++) { @@ -35,8 +35,8 @@ =} } -main reactor(width: size_t(4)) { - a = new[width] Source() +main reactor(width: size_t(4)) { + a = new[width] Source() b = new Destination(port_width = width) a.out -> b.in } diff --git a/test/known-good/Cpp/src/multiport/MultiportFromBankHierarchy.txt b/test/known-good/Cpp/src/multiport/MultiportFromBankHierarchy.txt index 575a7962f..c900069c4 100644 --- a/test/known-good/Cpp/src/multiport/MultiportFromBankHierarchy.txt +++ b/test/known-good/Cpp/src/multiport/MultiportFromBankHierarchy.txt @@ -1,25 +1,25 @@ // Check multiport output to bank of recipients. Here, the bank is smaller than // the width of the sending port. target Cpp { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Source(bank_index: size_t(0)) { - output out: unsigned +reactor Source(bank_index: size_t(0)) { + output out: unsigned reaction(startup) -> out {= out.set(bank_index); =} } reactor Container { - output[3] out: unsigned - s = new[3] Source() + output[3] out: unsigned + s = new[3] Source() s.out -> out } reactor Destination { - input[3] in: unsigned - state received: bool(false) + input[3] in: unsigned + state received: bool(false) reaction(in) {= for (size_t i = 0; i < in.size(); i++) { diff --git a/test/known-good/Cpp/src/multiport/MultiportFromBankHierarchyAfter.txt b/test/known-good/Cpp/src/multiport/MultiportFromBankHierarchyAfter.txt index 4cda03f94..43a18cdf9 100644 --- a/test/known-good/Cpp/src/multiport/MultiportFromBankHierarchyAfter.txt +++ b/test/known-good/Cpp/src/multiport/MultiportFromBankHierarchyAfter.txt @@ -1,25 +1,25 @@ // Check multiport output to bank of recipients. Here, the bank is smaller than // the width of the sending port. target Cpp { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Source(bank_index: size_t(0)) { - output out: int +reactor Source(bank_index: size_t(0)) { + output out: int reaction(startup) -> out {= out.set(bank_index); =} } reactor Container { - output[3] out: int - s = new[3] Source() + output[3] out: int + s = new[3] Source() s.out -> out } reactor Destination { - input[3] in: int - state received: bool(false) + input[3] in: int + state received: bool(false) reaction(in) {= for (int i = 0; i < in.size(); i++) { diff --git a/test/known-good/Cpp/src/multiport/MultiportFromHierarchy.txt b/test/known-good/Cpp/src/multiport/MultiportFromHierarchy.txt index f6d1aa2a4..db100e5a5 100644 --- a/test/known-good/Cpp/src/multiport/MultiportFromHierarchy.txt +++ b/test/known-good/Cpp/src/multiport/MultiportFromHierarchy.txt @@ -1,14 +1,14 @@ // Check multiport output to multiport input, where the former is a hierarchical // reactor. target Cpp { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { timer t(0, 200 msec) - output[4] out: int - state s: int(0) + output[4] out: int + state s: int(0) reaction(t) -> out {= for(int i = 0; i < 4; i++) { @@ -18,12 +18,12 @@ } reactor Destination { - state s: int(6) - input[4] in: int + state s: int(6) + input[4] in: int reaction(in) {= int sum = 0; - for (auto i : in.present_indices_unsorted()) { + for (auto i : in.present_indices_unsorted()) { sum += *in[i].get(); } @@ -45,13 +45,13 @@ } reactor Container { - output[4] out: int + output[4] out: int src = new InsideContainer() src.out -> out } reactor InsideContainer { - output[4] out: int + output[4] out: int src = new Source() src.out -> out } diff --git a/test/known-good/Cpp/src/multiport/MultiportIn.txt b/test/known-good/Cpp/src/multiport/MultiportIn.txt index 648333fe4..919531735 100644 --- a/test/known-good/Cpp/src/multiport/MultiportIn.txt +++ b/test/known-good/Cpp/src/multiport/MultiportIn.txt @@ -1,28 +1,28 @@ // This is a version fo the Threaded test that uses a multiport input at the // destination. Its purpose is to test multiport inputs. target Cpp { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { timer t(0, 200 msec) - output out: int - state s: int(0) + output out: int + state s: int(0) reaction(t) -> out {= out.set(s++); =} } reactor Computation { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= out.set(*in.get()); =} } reactor Destination { - state s: int(0) - input[4] in: int + state s: int(0) + input[4] in: int reaction(in) {= int sum = 0; diff --git a/test/known-good/Cpp/src/multiport/MultiportMultipleSet.txt b/test/known-good/Cpp/src/multiport/MultiportMultipleSet.txt index e44248e81..a4bb4a501 100644 --- a/test/known-good/Cpp/src/multiport/MultiportMultipleSet.txt +++ b/test/known-good/Cpp/src/multiport/MultiportMultipleSet.txt @@ -1,16 +1,16 @@ target Cpp { - timeout: 1 s + timeout: 1 s } reactor Producer { timer t(0, 100 ms) - output[10] out: int + output[10] out: int - state odd: bool(true) + state odd: bool(true) reaction(t) -> out {= - for (int i{odd ? 1 : 0}; i < 10; i += 2) { + for (int i{odd ? 1 : 0}; i < 10; i += 2) { for (int j{0}; j < 10; j++) { out[i].set(j); } @@ -21,14 +21,14 @@ } reactor Consumer { - state odd: bool(true) - input[10] in: int + state odd: bool(true) + input[10] in: int reaction(in) {= int count = 0; int last = -1; - for (int i : in.present_indices_unsorted()) { + for (int i : in.present_indices_unsorted()) { count++; if (odd && i%2 == 0) { reactor::log::Error() << "Expected values only on odd ports, but received one on port " << i; diff --git a/test/known-good/Cpp/src/multiport/MultiportOut.txt b/test/known-good/Cpp/src/multiport/MultiportOut.txt index 256ebee86..5e878a1a0 100644 --- a/test/known-good/Cpp/src/multiport/MultiportOut.txt +++ b/test/known-good/Cpp/src/multiport/MultiportOut.txt @@ -1,13 +1,13 @@ // Check multiport capabilities on Outputs. target Cpp { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { timer t(0, 200 msec) - output[4] out: int - state s: int(0) + output[4] out: int + state s: int(0) reaction(t) -> out {= for(int i = 0; i < 4; i++) { @@ -18,8 +18,8 @@ } reactor Computation { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= // No need to sleep for this test. @@ -31,12 +31,12 @@ } reactor Destination { - state s: int(0) - input[4] in: int + state s: int(0) + input[4] in: int reaction(in) {= int sum = 0; - for (auto i : in.present_indices_unsorted()) { + for (auto i : in.present_indices_unsorted()) { sum += *in[i].get(); } std::cout << "Sum of received: " << sum << ".\n"; diff --git a/test/known-good/Cpp/src/multiport/MultiportToBank.txt b/test/known-good/Cpp/src/multiport/MultiportToBank.txt index f3e1b62fd..77f153fb0 100644 --- a/test/known-good/Cpp/src/multiport/MultiportToBank.txt +++ b/test/known-good/Cpp/src/multiport/MultiportToBank.txt @@ -1,7 +1,7 @@ target Cpp reactor Source { - output[4] out: unsigned + output[4] out: unsigned reaction(startup) -> out {= for (unsigned i = 0 ; i < out.size(); i++) { @@ -10,8 +10,8 @@ =} } -reactor Sink(bank_index: size_t(0)) { - input in: unsigned +reactor Sink(bank_index: size_t(0)) { + input in: unsigned reaction(in) {= std::cout << "Received " << *in.get() << '\n'; @@ -24,7 +24,7 @@ main reactor MultiportToBank { source = new Source() - sink = new[4] Sink() + sink = new[4] Sink() source.out -> sink.in } diff --git a/test/known-good/Cpp/src/multiport/MultiportToBankAfter.txt b/test/known-good/Cpp/src/multiport/MultiportToBankAfter.txt index 01cf6f37e..272a86a28 100644 --- a/test/known-good/Cpp/src/multiport/MultiportToBankAfter.txt +++ b/test/known-good/Cpp/src/multiport/MultiportToBankAfter.txt @@ -1,7 +1,7 @@ target Cpp reactor Source { - output[4] out: unsigned + output[4] out: unsigned reaction(startup) -> out {= for (unsigned i = 0 ; i < out.size(); i++) { @@ -10,8 +10,8 @@ =} } -reactor Sink(bank_index: size_t(0)) { - input in: unsigned +reactor Sink(bank_index: size_t(0)) { + input in: unsigned reaction(in) {= std::cout << "Received " << *in.get() << '\n'; @@ -28,7 +28,7 @@ main reactor MultiportToBankAfter { source = new Source() - sink = new[4] Sink() + sink = new[4] Sink() source.out -> sink.in after 1 sec } diff --git a/test/known-good/Cpp/src/multiport/MultiportToBankHierarchy.txt b/test/known-good/Cpp/src/multiport/MultiportToBankHierarchy.txt index b4229dd1b..d355d5ac2 100644 --- a/test/known-good/Cpp/src/multiport/MultiportToBankHierarchy.txt +++ b/test/known-good/Cpp/src/multiport/MultiportToBankHierarchy.txt @@ -1,12 +1,12 @@ // Check multiport output to bank of recipients. Here, the bank is smaller than // the width of the sending port. target Cpp { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { - output[3] out: unsigned + output[3] out: unsigned reaction(startup) -> out {= for(size_t i = 0; i < out.size(); i++) { @@ -15,9 +15,9 @@ =} } -reactor Destination(bank_index: size_t(0)) { - input in: unsigned - state received: bool(false) +reactor Destination(bank_index: size_t(0)) { + input in: unsigned + state received: bool(false) reaction(in) {= std::cout << "Destination " << bank_index << " received " << *in.get() << ".\n"; @@ -38,8 +38,8 @@ } reactor Container { - input[3] in: unsigned - c = new[3] Destination() + input[3] in: unsigned + c = new[3] Destination() in -> c.in } diff --git a/test/known-good/Cpp/src/multiport/MultiportToHierarchy.txt b/test/known-good/Cpp/src/multiport/MultiportToHierarchy.txt index 624b37bae..b0a96ae68 100644 --- a/test/known-good/Cpp/src/multiport/MultiportToHierarchy.txt +++ b/test/known-good/Cpp/src/multiport/MultiportToHierarchy.txt @@ -2,14 +2,14 @@ // reactor. Note that the destination reactor has width wider than the sender, // so one input is dangling. target Cpp { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Source(width: size_t(4)) { +reactor Source(width: size_t(4)) { timer t(0, 200 msec) - output[width] out: int - state s: int(0) + output[width] out: int + state s: int(0) reaction(t) -> out {= for(size_t i = 0; i < 4; i++) { @@ -18,13 +18,13 @@ =} } -reactor Destination(width: size_t(4)) { - state s: int(6) - input[width] in: int +reactor Destination(width: size_t(4)) { + state s: int(6) + input[width] in: int reaction(in) {= int sum = 0; - for (auto i : in.present_indices_unsorted()) { + for (auto i : in.present_indices_unsorted()) { sum += *in[i].get(); } @@ -45,13 +45,13 @@ =} } -reactor Container(width: size_t(4)) { - input[width] in: int +reactor Container(width: size_t(4)) { + input[width] in: int dst = new Destination() in -> dst.in } -main reactor MultiportToHierarchy(width: size_t(4)) { +main reactor MultiportToHierarchy(width: size_t(4)) { a = new Source(width = width) b = new Container(width = width) a.out -> b.in diff --git a/test/known-good/Cpp/src/multiport/MultiportToMultiport.txt b/test/known-good/Cpp/src/multiport/MultiportToMultiport.txt index 608eb276b..7f7504aae 100644 --- a/test/known-good/Cpp/src/multiport/MultiportToMultiport.txt +++ b/test/known-good/Cpp/src/multiport/MultiportToMultiport.txt @@ -1,7 +1,7 @@ target Cpp reactor Source { - output[4] out: unsigned + output[4] out: unsigned reaction(startup) -> out {= for (unsigned i = 0; i < out.size(); i++) { @@ -11,8 +11,8 @@ } reactor Sink { - input[4] in: unsigned - state received: bool(false) + input[4] in: unsigned + state received: bool(false) reaction(in) {= for (unsigned i = 0; i < in.size(); i++) { diff --git a/test/known-good/Cpp/src/multiport/MultiportToMultiport2.txt b/test/known-good/Cpp/src/multiport/MultiportToMultiport2.txt index b9e420a58..e8bc492e7 100644 --- a/test/known-good/Cpp/src/multiport/MultiportToMultiport2.txt +++ b/test/known-good/Cpp/src/multiport/MultiportToMultiport2.txt @@ -1,8 +1,8 @@ // Test multiport to multiport connections. See also MultiportToMultiport. target Cpp -reactor Source(width: size_t(2)) { - output[width] out: size_t +reactor Source(width: size_t(2)) { + output[width] out: size_t reaction(startup) -> out {= for (size_t i = 0; i < out.size(); i++) { @@ -11,11 +11,11 @@ =} } -reactor Destination(width: size_t(2)) { - input[width] in: size_t +reactor Destination(width: size_t(2)) { + input[width] in: size_t reaction(in) {= - for (auto i: in.present_indices_unsorted()) { + for (auto i: in.present_indices_unsorted()) { size_t value = *in[i].get(); std::cout << "Received on channel " << i << ": " << value << '\n'; // NOTE: For testing purposes, this assumes the specific diff --git a/test/known-good/Cpp/src/multiport/MultiportToMultiport2After.txt b/test/known-good/Cpp/src/multiport/MultiportToMultiport2After.txt index ed150bddc..cd44d9afa 100644 --- a/test/known-good/Cpp/src/multiport/MultiportToMultiport2After.txt +++ b/test/known-good/Cpp/src/multiport/MultiportToMultiport2After.txt @@ -1,8 +1,8 @@ // Test multiport to multiport connections. See also MultiportToMultiport. target Cpp -reactor Source(width: size_t(2)) { - output[width] out: size_t +reactor Source(width: size_t(2)) { + output[width] out: size_t reaction(startup) -> out {= for (size_t i = 0; i < out.size(); i++) { @@ -11,8 +11,8 @@ =} } -reactor Destination(width: size_t(2)) { - input[width] in: size_t +reactor Destination(width: size_t(2)) { + input[width] in: size_t reaction(in) {= for (size_t i = 0; i < in.size(); i++) { diff --git a/test/known-good/Cpp/src/multiport/MultiportToMultiportArray.txt b/test/known-good/Cpp/src/multiport/MultiportToMultiportArray.txt index 36768affe..9646c4363 100644 --- a/test/known-good/Cpp/src/multiport/MultiportToMultiportArray.txt +++ b/test/known-good/Cpp/src/multiport/MultiportToMultiportArray.txt @@ -1,14 +1,14 @@ // Check multiport output to multiport input. Destination port is wider than // sending port. target Cpp { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { timer t(0, 200 msec) - output[2] out: int[3] - state s: int(0) + output[2] out: int[3] + state s: int(0) reaction(t) -> out {= for(int i = 0; i < 2; i++) { @@ -25,12 +25,12 @@ } reactor Destination { - state s: int(15) - input[2] in: int[3] + state s: int(15) + input[2] in: int[3] reaction(in) {= int sum = 0; - for (auto i : in.present_indices_unsorted()) { + for (auto i : in.present_indices_unsorted()) { const auto& a = *in[i].get(); for (int j = 0; j < a.size(); j++) { sum += a[j]; diff --git a/test/known-good/Cpp/src/multiport/MultiportToMultiportPhysical.txt b/test/known-good/Cpp/src/multiport/MultiportToMultiportPhysical.txt index 61eaf2d98..031139d0f 100644 --- a/test/known-good/Cpp/src/multiport/MultiportToMultiportPhysical.txt +++ b/test/known-good/Cpp/src/multiport/MultiportToMultiportPhysical.txt @@ -1,7 +1,7 @@ target Cpp reactor Source { - output[4] out: unsigned + output[4] out: unsigned reaction(startup) -> out {= for (unsigned i = 0; i < out.size(); i++) { @@ -11,8 +11,8 @@ } reactor Sink { - input[4] in: unsigned - state received: int(-1) + input[4] in: unsigned + state received: int(-1) reaction(in) {= auto present_ports = in.present_indices_unsorted(); diff --git a/test/known-good/Cpp/src/multiport/MultiportToPort.txt b/test/known-good/Cpp/src/multiport/MultiportToPort.txt index 1720e2bfb..443f392af 100644 --- a/test/known-good/Cpp/src/multiport/MultiportToPort.txt +++ b/test/known-good/Cpp/src/multiport/MultiportToPort.txt @@ -1,12 +1,12 @@ // Check multiport output to multiport input. Destination port is wider than // sending port. target Cpp { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { - output[2] out: int + output[2] out: int reaction(startup) -> out {= for(int i = 0; i < out.size(); i++) { @@ -16,9 +16,9 @@ =} } -reactor Destination(expected: int(0)) { - input in: int - state received: bool(false) +reactor Destination(expected: int(0)) { + input in: int + state received: bool(false) reaction(in) {= std::cout << "Received: " << *in.get() << ".\n"; diff --git a/test/known-good/Cpp/src/multiport/PipelineAfter.txt b/test/known-good/Cpp/src/multiport/PipelineAfter.txt index 56046e3fe..59346b7a7 100644 --- a/test/known-good/Cpp/src/multiport/PipelineAfter.txt +++ b/test/known-good/Cpp/src/multiport/PipelineAfter.txt @@ -1,20 +1,20 @@ target Cpp reactor Source { - output out: unsigned + output out: unsigned reaction(startup) -> out {= out.set(40); =} } reactor Compute { - input in: unsigned - output out: unsigned + input in: unsigned + output out: unsigned reaction(in) -> out {= out.set(*in.get() + 2); =} } reactor Sink { - input in: unsigned + input in: unsigned reaction(in) {= std::cout << "Received " << *in.get() << '\n'; diff --git a/test/known-good/Cpp/src/multiport/ReadMultiportOutputOfContainedBank.txt b/test/known-good/Cpp/src/multiport/ReadMultiportOutputOfContainedBank.txt index 8bfa00ac1..2f8fea11b 100644 --- a/test/known-good/Cpp/src/multiport/ReadMultiportOutputOfContainedBank.txt +++ b/test/known-good/Cpp/src/multiport/ReadMultiportOutputOfContainedBank.txt @@ -2,8 +2,8 @@ // multiport target Cpp -reactor Contained(bank_index: size_t(0)) { - output[3] out: unsigned +reactor Contained(bank_index: size_t(0)) { + output[3] out: unsigned reaction(startup) -> out {= for (size_t i = 0; i < 3; i++) { @@ -13,8 +13,8 @@ } main reactor { - c = new[3] Contained() - state count: int(0) + c = new[3] Contained() + state count: int(0) reaction(startup) c.out {= for (size_t i = 0; i < c.size(); i++) { @@ -35,7 +35,7 @@ for (size_t i = 0; i < c.size(); i++) { for (size_t j = 0; j < c[i].out.size(); j++) { unsigned result = *c[i].out[j].get(); - std::cout << "Reading output of contained reactor: " << result << std::endl; + std::cout << "Reading output of contained reactor: " << result << std::endl; if (result != i * j) { std::cout << "FAILURE: expected " << i * j << std::endl; exit(2); diff --git a/test/known-good/Cpp/src/multiport/ReadOutputOfContainedBank.txt b/test/known-good/Cpp/src/multiport/ReadOutputOfContainedBank.txt index 841dc0120..604b0f121 100644 --- a/test/known-good/Cpp/src/multiport/ReadOutputOfContainedBank.txt +++ b/test/known-good/Cpp/src/multiport/ReadOutputOfContainedBank.txt @@ -2,15 +2,15 @@ // permutations. target Cpp -reactor Contained(bank_index: size_t(0)) { - output out: unsigned +reactor Contained(bank_index: size_t(0)) { + output out: unsigned reaction(startup) -> out {= out.set(42 * bank_index); =} } main reactor { - c = new[4] Contained() - state count: int(0) + c = new[4] Contained() + state count: int(0) reaction(startup) c.out {= for (size_t i = 0; i < c.size(); i++) { diff --git a/test/known-good/Cpp/src/multiport/SparseMultiport.txt b/test/known-good/Cpp/src/multiport/SparseMultiport.txt index 507f42368..caadf4f74 100644 --- a/test/known-good/Cpp/src/multiport/SparseMultiport.txt +++ b/test/known-good/Cpp/src/multiport/SparseMultiport.txt @@ -1,16 +1,16 @@ target Cpp { - timeout: 1 s + timeout: 1 s } reactor Producer { timer t(0, 100 ms) - output[10] out: int + output[10] out: int - state odd: bool(true) + state odd: bool(true) reaction(t) -> out {= - for (int i{odd ? 1 : 0}; i < 10; i += 2) { + for (int i{odd ? 1 : 0}; i < 10; i += 2) { out[i].set(i); } @@ -19,8 +19,8 @@ } reactor Consumer { - state odd: bool(true) - input[10] in: int + state odd: bool(true) + input[10] in: int reaction(in) {= reactor::log::Info() << "Received:"; @@ -42,7 +42,7 @@ reaction(in) {= int count = 0; int last = -1; - for (int i : in.present_indices_sorted()) { + for (int i : in.present_indices_sorted()) { count++; if (odd && i%2 == 0) { reactor::log::Error() << "Expected values only on odd ports, but received one on port " << i; @@ -57,7 +57,7 @@ exit(1); } } - for (int i : in.present_indices_unsorted()) { + for (int i : in.present_indices_unsorted()) { count++; if (odd && i%2 == 0) { reactor::log::Error() << "Expected values only on odd ports, but received one on port " << i; diff --git a/test/known-good/Cpp/src/multiport/WidthGivenByCode.txt b/test/known-good/Cpp/src/multiport/WidthGivenByCode.txt index 3012aa549..5a279ee23 100644 --- a/test/known-good/Cpp/src/multiport/WidthGivenByCode.txt +++ b/test/known-good/Cpp/src/multiport/WidthGivenByCode.txt @@ -1,8 +1,8 @@ target Cpp -reactor Foo(a: size_t{8}, b: size_t{2}) { - input[{= a*b =}] in: size_t - output[{= a/b =}] out: size_t +reactor Foo(a: size_t{8}, b: size_t{2}) { + input[{= a*b =}] in: size_t + output[{= a/b =}] out: size_t reaction(startup) in -> out {= if (in.size() != a*b) { @@ -20,14 +20,14 @@ foo1 = new Foo() foo2 = new Foo(a = 10, b = 3) foo3 = new Foo(a = 9, b = 9) - foo_bank = new[{= 42 =}] Foo() + foo_bank = new[{= 42 =}] Foo() reaction(startup) foo_bank.out {= if (foo_bank.size() != 42) { std::cerr << "ERROR: expected foo_bank to have a width of " << 42 << '\n'; exit(3); } - for (auto& foo : foo_bank) { + for (auto& foo : foo_bank) { if (foo.out.size() != 4) { std::cerr << "ERROR: expected foo_bank.out to have a width of " << 4 << '\n'; exit(4); diff --git a/test/known-good/Cpp/src/multiport/WriteInputOfContainedBank.txt b/test/known-good/Cpp/src/multiport/WriteInputOfContainedBank.txt index 659dc33b0..a1f7d1131 100644 --- a/test/known-good/Cpp/src/multiport/WriteInputOfContainedBank.txt +++ b/test/known-good/Cpp/src/multiport/WriteInputOfContainedBank.txt @@ -1,9 +1,9 @@ // Test writing inputs to a contained reactor bank target Cpp -reactor Contained(bank_index: size_t(0)) { - input in: unsigned - state count: int(0) +reactor Contained(bank_index: size_t(0)) { + input in: unsigned + state count: int(0) reaction(in) {= unsigned result = *in.get(); @@ -24,7 +24,7 @@ } main reactor { - c = new[4] Contained() + c = new[4] Contained() reaction(startup) -> c.in {= for (size_t i = 0; i < c.size(); i++) { diff --git a/test/known-good/Cpp/src/multiport/WriteMultiportInputOfContainedBank.txt b/test/known-good/Cpp/src/multiport/WriteMultiportInputOfContainedBank.txt index 7144c3918..1cb41a7a5 100644 --- a/test/known-good/Cpp/src/multiport/WriteMultiportInputOfContainedBank.txt +++ b/test/known-good/Cpp/src/multiport/WriteMultiportInputOfContainedBank.txt @@ -1,9 +1,9 @@ // Test writing multiport inputs to a contained reactor bank target Cpp -reactor Contained(bank_index: size_t(0)) { - input[4] in: unsigned - state count: int(0) +reactor Contained(bank_index: size_t(0)) { + input[4] in: unsigned + state count: int(0) reaction(in) {= for (size_t i = 0; i < 3; i++) { @@ -26,7 +26,7 @@ } main reactor { - c = new[4] Contained() + c = new[4] Contained() reaction(startup) -> c.in {= for (size_t i = 0; i < c.size(); i++) { diff --git a/test/known-good/Cpp/src/properties/Fast.txt b/test/known-good/Cpp/src/properties/Fast.txt index d52588600..307b33667 100644 --- a/test/known-good/Cpp/src/properties/Fast.txt +++ b/test/known-good/Cpp/src/properties/Fast.txt @@ -1,11 +1,11 @@ target Cpp { - fast: true + fast: true } main reactor { logical action a - state triggered: bool{false} + state triggered: bool{false} reaction(startup) -> a {= a.schedule(2s); =} diff --git a/test/known-good/Cpp/src/properties/Timeout.txt b/test/known-good/Cpp/src/properties/Timeout.txt index c458da871..82024bff8 100644 --- a/test/known-good/Cpp/src/properties/Timeout.txt +++ b/test/known-good/Cpp/src/properties/Timeout.txt @@ -1,11 +1,11 @@ target Cpp { - timeout: 1 sec + timeout: 1 sec } main reactor { timer t(1 sec, 1 sec) - state triggered: bool{false} + state triggered: bool{false} reaction(t) {= triggered = true; diff --git a/test/known-good/Cpp/src/properties/TimeoutZero.txt b/test/known-good/Cpp/src/properties/TimeoutZero.txt index c4f8a3d6b..88d4cb391 100644 --- a/test/known-good/Cpp/src/properties/TimeoutZero.txt +++ b/test/known-good/Cpp/src/properties/TimeoutZero.txt @@ -1,11 +1,11 @@ target Cpp { - timeout: 0 sec + timeout: 0 sec } main reactor { timer t(0, 1 sec) - state triggered: bool{false} + state triggered: bool{false} reaction(t) {= triggered = true; diff --git a/test/known-good/Cpp/src/target/AfterVoid.txt b/test/known-good/Cpp/src/target/AfterVoid.txt index a7ca4a871..929f8bec5 100644 --- a/test/known-good/Cpp/src/target/AfterVoid.txt +++ b/test/known-good/Cpp/src/target/AfterVoid.txt @@ -1,20 +1,20 @@ // This checks that the after keyword also works with void ports target Cpp { - fast: false, - timeout: 3 sec + fast: false, + timeout: 3 sec } reactor foo { timer t(0, 1 sec) - output y: void + output y: void reaction(t) -> y {= y.set(); =} } reactor print { - state expected_time: time(10 msec) - state i: int(0) - input x: void + state expected_time: time(10 msec) + state i: int(0) + input x: void reaction(x) {= i++; diff --git a/test/known-good/Cpp/src/target/BraceAndParenInitialization.txt b/test/known-good/Cpp/src/target/BraceAndParenInitialization.txt index 74488ccbe..98e65f05b 100644 --- a/test/known-good/Cpp/src/target/BraceAndParenInitialization.txt +++ b/test/known-good/Cpp/src/target/BraceAndParenInitialization.txt @@ -1,15 +1,15 @@ target Cpp reactor Foo( - param_list_1: std::vector(4, 2), // list containing [2,2,2,2] - param_list_2: std::vector{4, 2}, // list containing [4,2] - param_list_3: std::vector(4, 2), // list containing [2,2,2,2] - param_list_4: std::vector{4, 2} // list containing [4,2] + param_list_1: std::vector(4, 2), // list containing [2,2,2,2] + param_list_2: std::vector{4, 2}, // list containing [4,2] + param_list_3: std::vector(4, 2), // list containing [2,2,2,2] + param_list_4: std::vector{4, 2} // list containing [4,2] ) { // list containing [42,42,42,42,42,42] - state state_list_1: std::vector(6, 42) + state state_list_1: std::vector(6, 42) // list containing [6,42] - state state_list_2: std::vector{6, 42} + state state_list_2: std::vector{6, 42} reaction(startup) {= std::cerr << "Hello!\n"; diff --git a/test/known-good/Cpp/src/target/CMakeInclude.txt b/test/known-good/Cpp/src/target/CMakeInclude.txt index 198285488..76f52b682 100644 --- a/test/known-good/Cpp/src/target/CMakeInclude.txt +++ b/test/known-good/Cpp/src/target/CMakeInclude.txt @@ -3,11 +3,11 @@ * failure to compile. */ target Cpp { - cmake-include: [ + cmake-include: [ "../include/mlib-cmake-extension.cmake", "../include/bar-cmake-compile-definition.txt" ], - timeout: 0 sec + timeout: 0 sec } main reactor { diff --git a/test/known-good/Cpp/src/target/CliParserGenericArguments.txt b/test/known-good/Cpp/src/target/CliParserGenericArguments.txt index 1c44cfe92..9edc55d13 100644 --- a/test/known-good/Cpp/src/target/CliParserGenericArguments.txt +++ b/test/known-good/Cpp/src/target/CliParserGenericArguments.txt @@ -17,7 +17,7 @@ class CustomClass { public: std::string name; - CustomClass(std::string new_name="John") : name{new_name} + CustomClass(std::string new_name="John") : name{new_name} {} std::string get_name() const {return this->name;} void set_name(std::string updated_name){this->name = updated_name;} @@ -43,21 +43,21 @@ =} main reactor CliParserGenericArguments( - int_value: int(10), - signed_value: signed(-10), - unsigned_value: unsigned(11), - long_value: long(-100), + int_value: int(10), + signed_value: signed(-10), + unsigned_value: unsigned(11), + long_value: long(-100), unsigned_long_value: {= unsigned_long =}(42), long_long_value: {= long_long =}(-42), ull_value: {= uns_long_long =}(42), - bool_value: bool(false), - char_value: char('T'), - double_value: double(4.2), + bool_value: bool(false), + char_value: char('T'), + double_value: double(4.2), long_double_value: {= long_double =}(4.2), - float_value: float(10.5), - string_value: string("This is a testvalue"), + float_value: float(10.5), + string_value: string("This is a testvalue"), custom_class_value: {= CustomClass =}("Peter") ) { - reaction(startup) {= std::cout << "Hello World!\n"; =} + reaction(startup) {= std::cout << "Hello World!\n"; =} } diff --git a/test/known-good/Cpp/src/target/CombinedTypeNames.txt b/test/known-good/Cpp/src/target/CombinedTypeNames.txt index b51c75cd3..31ade97b1 100644 --- a/test/known-good/Cpp/src/target/CombinedTypeNames.txt +++ b/test/known-good/Cpp/src/target/CombinedTypeNames.txt @@ -6,8 +6,8 @@ bar: {= unsigned int =}(0), baz: {= const unsigned int* =}({= nullptr =}) ) { - state s_bar: {= unsigned int =}(bar) - state s_baz: {= const unsigned int* =}(baz) + state s_bar: {= unsigned int =}(bar) + state s_baz: {= const unsigned int* =}(baz) reaction(startup) {= if (bar != 42 || s_bar != 42 || *baz != 42 || *s_baz != 42) { diff --git a/test/known-good/Cpp/src/target/GenericAfter.txt b/test/known-good/Cpp/src/target/GenericAfter.txt index cd38469fa..aaca2063d 100644 --- a/test/known-good/Cpp/src/target/GenericAfter.txt +++ b/test/known-good/Cpp/src/target/GenericAfter.txt @@ -2,10 +2,10 @@ import Test from "../DelayInt.lf" -reactor Delay(delay: time(0)) { - output out: T - input in: T - logical action a(delay): T +reactor Delay(delay: time(0)) { + output out: T + input in: T + logical action a(delay): T reaction(a) -> out {= out.set(a.get()); =} diff --git a/test/known-good/Cpp/src/target/GenericDelay.txt b/test/known-good/Cpp/src/target/GenericDelay.txt index 2b176375a..7506efb0e 100644 --- a/test/known-good/Cpp/src/target/GenericDelay.txt +++ b/test/known-good/Cpp/src/target/GenericDelay.txt @@ -2,10 +2,10 @@ import Test from "../DelayInt.lf" -reactor Delay(delay: time(0)) { - output out: T - input in: T - logical action a(delay): T +reactor Delay(delay: time(0)) { + output out: T + input in: T + logical action a(delay): T reaction(a) -> out {= out.set(a.get()); =} diff --git a/test/known-good/Cpp/src/target/GenericParameterAndState.txt b/test/known-good/Cpp/src/target/GenericParameterAndState.txt index 0e070a499..bd6c9f5e3 100644 --- a/test/known-good/Cpp/src/target/GenericParameterAndState.txt +++ b/test/known-good/Cpp/src/target/GenericParameterAndState.txt @@ -1,7 +1,7 @@ target Cpp -reactor Foo(bar: T(0), expected: T(14542135)) { - state baz: T(bar) +reactor Foo(bar: T(0), expected: T(14542135)) { + state baz: T(bar) reaction(startup) {= if (bar != expected) { diff --git a/test/known-good/Cpp/src/target/MultipleContainedGeneric.txt b/test/known-good/Cpp/src/target/MultipleContainedGeneric.txt index 25e172705..afa2d5b9f 100644 --- a/test/known-good/Cpp/src/target/MultipleContainedGeneric.txt +++ b/test/known-good/Cpp/src/target/MultipleContainedGeneric.txt @@ -3,9 +3,9 @@ target Cpp reactor Contained { - output trigger: T - input in1: T - input in2: T + output trigger: T + input in1: T + input in2: T reaction(startup) -> trigger {= trigger.set(42); =} diff --git a/test/known-good/Cpp/src/target/PointerParameters.txt b/test/known-good/Cpp/src/target/PointerParameters.txt index 0e3ac4ba2..5734a4ec8 100644 --- a/test/known-good/Cpp/src/target/PointerParameters.txt +++ b/test/known-good/Cpp/src/target/PointerParameters.txt @@ -2,7 +2,7 @@ // Compilation without errors is success. target Cpp -reactor Foo(ptr: int*{{= nullptr =}}) { +reactor Foo(ptr: int*{{= nullptr =}}) { reaction(startup) {= if (ptr == nullptr || *ptr != 42) { reactor::log::Error() << "received an unexpected value!"; diff --git a/test/known-good/Cpp/src/target/PreambleFile.txt b/test/known-good/Cpp/src/target/PreambleFile.txt index 91f779b01..3999843bb 100644 --- a/test/known-good/Cpp/src/target/PreambleFile.txt +++ b/test/known-good/Cpp/src/target/PreambleFile.txt @@ -21,7 +21,7 @@ =} reactor Source { - output x: MyStruct + output x: MyStruct reaction(startup) -> x {= int a = add_42(0); @@ -38,7 +38,7 @@ std::cout << "Received " << x.foo << " and '" << x.bar << "'\n"; } =} - input x: MyStruct + input x: MyStruct reaction(x) {= MyStruct value = *x.get(); // implicit copy diff --git a/test/known-good/Python/src/ActionWithNoReaction.txt b/test/known-good/Python/src/ActionWithNoReaction.txt index cf6451f10..dce8a20d0 100644 --- a/test/known-good/Python/src/ActionWithNoReaction.txt +++ b/test/known-good/Python/src/ActionWithNoReaction.txt @@ -2,8 +2,8 @@ # passes merely by compiling and executing without a segfault. Its other # functionality is tested by other tests. target Python { - fast: true, - timeout: 3 sec + fast: true, + timeout: 3 sec } reactor foo { diff --git a/test/known-good/Python/src/After.txt b/test/known-good/Python/src/After.txt index 38ab01aa8..795afd237 100644 --- a/test/known-good/Python/src/After.txt +++ b/test/known-good/Python/src/After.txt @@ -1,8 +1,8 @@ # This checks that the after keyword adjusts logical time, not using physical # time. target Python { - fast: false, - timeout: 3 sec + fast: false, + timeout: 3 sec } reactor foo { diff --git a/test/known-good/Python/src/AfterOverlapped.txt b/test/known-good/Python/src/AfterOverlapped.txt index 144059ab7..45310c49f 100644 --- a/test/known-good/Python/src/AfterOverlapped.txt +++ b/test/known-good/Python/src/AfterOverlapped.txt @@ -1,7 +1,7 @@ # This the after keyword with overlapped time intervals. target Python { - fast: true, - timeout: 5 sec + fast: true, + timeout: 5 sec } import Count from "lib/Count.lf" diff --git a/test/known-good/Python/src/CompareTags.txt b/test/known-good/Python/src/CompareTags.txt index e1638acd6..98903e66d 100644 --- a/test/known-good/Python/src/CompareTags.txt +++ b/test/known-good/Python/src/CompareTags.txt @@ -1,7 +1,7 @@ # Tests the lf.tag_compare() function in the python target. target Python { - timeout: 10 msec, - fast: false + timeout: 10 msec, + fast: false } main reactor CompareTags { diff --git a/test/known-good/Python/src/Composition.txt b/test/known-good/Python/src/Composition.txt index 4fb4ba387..4e7b0ab63 100644 --- a/test/known-good/Python/src/Composition.txt +++ b/test/known-good/Python/src/Composition.txt @@ -1,8 +1,8 @@ # This test connects a simple counting source to tester that checks against its # own count. target Python { - fast: true, - timeout: 10 sec + fast: true, + timeout: 10 sec } reactor Source(period(2 sec)) { diff --git a/test/known-good/Python/src/CompositionAfter.txt b/test/known-good/Python/src/CompositionAfter.txt index 6a765384f..8c2b6d58f 100644 --- a/test/known-good/Python/src/CompositionAfter.txt +++ b/test/known-good/Python/src/CompositionAfter.txt @@ -1,8 +1,8 @@ # This test connects a simple counting source to tester that checks against its # own count. target Python { - fast: true, - timeout: 10 sec + fast: true, + timeout: 10 sec } reactor Source(period(2 sec)) { diff --git a/test/known-good/Python/src/CompositionInheritance.txt b/test/known-good/Python/src/CompositionInheritance.txt index f4f443650..81b9c161f 100644 --- a/test/known-good/Python/src/CompositionInheritance.txt +++ b/test/known-good/Python/src/CompositionInheritance.txt @@ -1,8 +1,8 @@ # This test connects a simple counting source to tester that checks against its # own count. target Python { - fast: true, - timeout: 10 sec + fast: true, + timeout: 10 sec } reactor Source(period(2 sec)) { diff --git a/test/known-good/Python/src/CountSelf.txt b/test/known-good/Python/src/CountSelf.txt index da923a41e..712072674 100644 --- a/test/known-good/Python/src/CountSelf.txt +++ b/test/known-good/Python/src/CountSelf.txt @@ -1,7 +1,7 @@ # This tests actions with payloads by delaying an input by a fixed amount. target Python { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } reactor CountSelf2(delay(100 msec)) { diff --git a/test/known-good/Python/src/CountTest.txt b/test/known-good/Python/src/CountTest.txt index 61b5c4b0d..e9111e062 100644 --- a/test/known-good/Python/src/CountTest.txt +++ b/test/known-good/Python/src/CountTest.txt @@ -1,6 +1,6 @@ target Python { - timeout: 3 sec, - fast: true + timeout: 3 sec, + fast: true } import Count from "lib/Count.lf" diff --git a/test/known-good/Python/src/Deadline.txt b/test/known-good/Python/src/Deadline.txt index 37e41ca1e..03d142b10 100644 --- a/test/known-good/Python/src/Deadline.txt +++ b/test/known-good/Python/src/Deadline.txt @@ -2,7 +2,7 @@ # Source immediately, whereas odd numbers are sent after a big enough delay to # violate the deadline. target Python { - timeout: 6 sec + timeout: 6 sec } preamble {= import time =} diff --git a/test/known-good/Python/src/DelayArrayWithAfter.txt b/test/known-good/Python/src/DelayArrayWithAfter.txt index 1a70bd0cd..dbc2b69f5 100644 --- a/test/known-good/Python/src/DelayArrayWithAfter.txt +++ b/test/known-good/Python/src/DelayArrayWithAfter.txt @@ -1,8 +1,8 @@ # This tests transport of dynamically allocated arrays over connections with # 'after'. target Python { - timeout: 5 sec, - fast: true + timeout: 5 sec, + fast: true } reactor Source { diff --git a/test/known-good/Python/src/DelayStruct.txt b/test/known-good/Python/src/DelayStruct.txt index 72bc84ab2..011995953 100644 --- a/test/known-good/Python/src/DelayStruct.txt +++ b/test/known-good/Python/src/DelayStruct.txt @@ -1,6 +1,6 @@ # Test delaying a struct pointer type. target Python { - files: ["include/hello.py"] + files: ["include/hello.py"] } preamble {= import hello =} diff --git a/test/known-good/Python/src/DelayStructWithAfter.txt b/test/known-good/Python/src/DelayStructWithAfter.txt index 012285a10..935fb6888 100644 --- a/test/known-good/Python/src/DelayStructWithAfter.txt +++ b/test/known-good/Python/src/DelayStructWithAfter.txt @@ -1,6 +1,6 @@ # This tests delaying a struct using after. target Python { - files: include/hello.py + files: include/hello.py } preamble {= import hello =} diff --git a/test/known-good/Python/src/DelayStructWithAfterOverlapped.txt b/test/known-good/Python/src/DelayStructWithAfterOverlapped.txt index dec821e57..4d00db176 100644 --- a/test/known-good/Python/src/DelayStructWithAfterOverlapped.txt +++ b/test/known-good/Python/src/DelayStructWithAfterOverlapped.txt @@ -1,8 +1,8 @@ # This tests delaying a struct using after. target Python { - timeout: 5 sec, - fast: true, - files: ["include/hello.py"] + timeout: 5 sec, + fast: true, + files: ["include/hello.py"] } preamble {= import hello =} diff --git a/test/known-good/Python/src/DelayedAction.txt b/test/known-good/Python/src/DelayedAction.txt index 5426ee70b..f995945c4 100644 --- a/test/known-good/Python/src/DelayedAction.txt +++ b/test/known-good/Python/src/DelayedAction.txt @@ -1,6 +1,6 @@ target Python { - fast: true, - timeout: 5 sec + fast: true, + timeout: 5 sec } main reactor DelayedAction { diff --git a/test/known-good/Python/src/DoubleInvocation.txt b/test/known-good/Python/src/DoubleInvocation.txt index be06a2739..93122d247 100644 --- a/test/known-good/Python/src/DoubleInvocation.txt +++ b/test/known-good/Python/src/DoubleInvocation.txt @@ -6,8 +6,8 @@ # * Removing the startup reaction in Print. # * Sending only position, not velocity from Ball. target Python { - timeout: 5 sec, - fast: true + timeout: 5 sec, + fast: true } reactor Ball { diff --git a/test/known-good/Python/src/DoubleReaction.txt b/test/known-good/Python/src/DoubleReaction.txt index 255a17990..5290d4161 100644 --- a/test/known-good/Python/src/DoubleReaction.txt +++ b/test/known-good/Python/src/DoubleReaction.txt @@ -1,8 +1,8 @@ # Test that two simultaneous inputs that trigger a reaction trigger it only # once. Correct output for this 2, 4, 6, 8, etc. target Python { - timeout: 10 sec, - fast: true + timeout: 10 sec, + fast: true } reactor Clock(offset(0), period(1 sec)) { diff --git a/test/known-good/Python/src/GetMicroStep.txt b/test/known-good/Python/src/GetMicroStep.txt index 2c1e03cb0..bc4c3501f 100644 --- a/test/known-good/Python/src/GetMicroStep.txt +++ b/test/known-good/Python/src/GetMicroStep.txt @@ -1,6 +1,6 @@ # Tests the get_microstep() function in the python target. target Python { - fast: false + fast: false } main reactor GetMicroStep { diff --git a/test/known-good/Python/src/GetTime.txt b/test/known-good/Python/src/GetTime.txt index d4ed8d7e8..29a88361d 100644 --- a/test/known-good/Python/src/GetTime.txt +++ b/test/known-good/Python/src/GetTime.txt @@ -1,8 +1,8 @@ # This file includes code documented on the Wiki. For this test, success is just # compiling and running. target Python { - timeout: 2 sec, - fast: false + timeout: 2 sec, + fast: false } main reactor GetTime { diff --git a/test/known-good/Python/src/Hello.txt b/test/known-good/Python/src/Hello.txt index 17d75abff..241602b78 100644 --- a/test/known-good/Python/src/Hello.txt +++ b/test/known-good/Python/src/Hello.txt @@ -4,8 +4,8 @@ # has a period of 4 seconds, the second of 2 seconds, and the third (composite) # or 1 second. target Python { - timeout: 10 sec, - fast: true + timeout: 10 sec, + fast: true } reactor Reschedule(period(2 sec), message("Hello Python")) { diff --git a/test/known-good/Python/src/HelloWorld.txt b/test/known-good/Python/src/HelloWorld.txt index e93d74332..c3b661eb8 100644 --- a/test/known-good/Python/src/HelloWorld.txt +++ b/test/known-good/Python/src/HelloWorld.txt @@ -1,5 +1,5 @@ target Python { - tracing: true + tracing: true } reactor HelloWorld2 { diff --git a/test/known-good/Python/src/Hierarchy2.txt b/test/known-good/Python/src/Hierarchy2.txt index 9fe89499f..754f80b06 100644 --- a/test/known-good/Python/src/Hierarchy2.txt +++ b/test/known-good/Python/src/Hierarchy2.txt @@ -1,7 +1,7 @@ # Test data transport across hierarchy. target Python { - timeout: 5 sec, - fast: true + timeout: 5 sec, + fast: true } reactor Source { diff --git a/test/known-good/Python/src/IdentifierLength.txt b/test/known-good/Python/src/IdentifierLength.txt index 443cee5a8..d5e6b4672 100644 --- a/test/known-good/Python/src/IdentifierLength.txt +++ b/test/known-good/Python/src/IdentifierLength.txt @@ -1,8 +1,8 @@ # This test connects a simple counting source to tester that checks against its # own count. target Python { - timeout: 10 sec, - fast: true + timeout: 10 sec, + fast: true } reactor A_Really_Long_Name_For_A_Source_But_Not_Quite_255_Characters_Which_Is_The_Maximum_For_The_Python_Target( diff --git a/test/known-good/Python/src/ManualDelayedReaction.txt b/test/known-good/Python/src/ManualDelayedReaction.txt index 097d2d381..e0d405644 100644 --- a/test/known-good/Python/src/ManualDelayedReaction.txt +++ b/test/known-good/Python/src/ManualDelayedReaction.txt @@ -2,7 +2,7 @@ # Set keepalive to false since this is a test and schedule is called on a # physical action from within a reaction. This is one of the special rare # cases where the user might want to manually override keepalive. - keepalive: false + keepalive: false } # That's the stuff that shall be generated for the after diff --git a/test/known-good/Python/src/Methods.txt b/test/known-good/Python/src/Methods.txt index 77b36af1b..516e383ab 100644 --- a/test/known-good/Python/src/Methods.txt +++ b/test/known-good/Python/src/Methods.txt @@ -4,9 +4,9 @@ main reactor { state foo(2) - method getFoo() {= return self.foo =} + method getFoo() {= return self.foo =} - method add(x) {= self.foo += x =} + method add(x) {= self.foo += x =} reaction(startup) {= print(f"Foo is initialized to {self.getFoo()}") diff --git a/test/known-good/Python/src/MethodsRecursive.txt b/test/known-good/Python/src/MethodsRecursive.txt index f2bbbcc4c..c4c7a56fb 100644 --- a/test/known-good/Python/src/MethodsRecursive.txt +++ b/test/known-good/Python/src/MethodsRecursive.txt @@ -4,13 +4,13 @@ main reactor { state foo(2) - method fib(n) {= # Return the n-th Fibonacci number. + method fib(n) {= # Return the n-th Fibonacci number. if n <= 1: return 1 return self.add(self.fib(n-1), self.fib(n-2)) =} - method add(x, y) {= return x + y =} + method add(x, y) {= return x + y =} reaction(startup) {= for n in range(1, 10): diff --git a/test/known-good/Python/src/MethodsSameName.txt b/test/known-good/Python/src/MethodsSameName.txt index 86ab7a452..4f4fd2121 100644 --- a/test/known-good/Python/src/MethodsSameName.txt +++ b/test/known-good/Python/src/MethodsSameName.txt @@ -4,7 +4,7 @@ reactor Foo { state foo(2) - method add(x) {= self.foo += x =} + method add(x) {= self.foo += x =} reaction(startup) {= self.add(40) @@ -20,7 +20,7 @@ a = new Foo() - method add(x) {= self.foo += x =} + method add(x) {= self.foo += x =} reaction(startup) {= self.add(40) diff --git a/test/known-good/Python/src/MovingAverage.txt b/test/known-good/Python/src/MovingAverage.txt index 296248f49..99ae8754e 100644 --- a/test/known-good/Python/src/MovingAverage.txt +++ b/test/known-good/Python/src/MovingAverage.txt @@ -2,8 +2,8 @@ # computes the moving average of the last four inputs and produces that as # output. The source is a counting sequence. target Python { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } import TestDouble from "lib/Test.lf" diff --git a/test/known-good/Python/src/PeriodicDesugared.txt b/test/known-good/Python/src/PeriodicDesugared.txt index 0da6c25c0..1d6c56aa4 100644 --- a/test/known-good/Python/src/PeriodicDesugared.txt +++ b/test/known-good/Python/src/PeriodicDesugared.txt @@ -1,6 +1,6 @@ target Python { - fast: true, - timeout: 1 sec + fast: true, + timeout: 1 sec } main reactor(offset(0), period(500 msec)) { diff --git a/test/known-good/Python/src/PingPong.txt b/test/known-good/Python/src/PingPong.txt index 6049ad9e0..f8ada9f89 100644 --- a/test/known-good/Python/src/PingPong.txt +++ b/test/known-good/Python/src/PingPong.txt @@ -21,7 +21,7 @@ * @author Edward A. Lee */ target Python { - fast: true + fast: true } reactor Ping(count(10)) { diff --git a/test/known-good/Python/src/Pipeline.txt b/test/known-good/Python/src/Pipeline.txt index 294c20c72..7df1a7b30 100644 --- a/test/known-good/Python/src/Pipeline.txt +++ b/test/known-good/Python/src/Pipeline.txt @@ -1,5 +1,5 @@ target Python { - timeout: 2 sec + timeout: 2 sec } reactor TakeTime { diff --git a/test/known-good/Python/src/Preamble.txt b/test/known-good/Python/src/Preamble.txt index 04a9ea19d..d616c0555 100644 --- a/test/known-good/Python/src/Preamble.txt +++ b/test/known-good/Python/src/Preamble.txt @@ -1,8 +1,8 @@ # Preambles are put inside the Python reactor class Therefore, accessing them # requires the use of self. target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } main reactor Preamble { diff --git a/test/known-good/Python/src/ScheduleLogicalAction.txt b/test/known-good/Python/src/ScheduleLogicalAction.txt index 34bb61371..352149e40 100644 --- a/test/known-good/Python/src/ScheduleLogicalAction.txt +++ b/test/known-good/Python/src/ScheduleLogicalAction.txt @@ -1,8 +1,8 @@ # This checks that a logical action is scheduled the specified logical time # after the current logical time. target Python { - fast: true, - timeout: 3 sec + fast: true, + timeout: 3 sec } reactor foo { diff --git a/test/known-good/Python/src/ScheduleValue.txt b/test/known-good/Python/src/ScheduleValue.txt index d741b6368..02b2eaecc 100644 --- a/test/known-good/Python/src/ScheduleValue.txt +++ b/test/known-good/Python/src/ScheduleValue.txt @@ -1,6 +1,6 @@ /** Test of schedule_value. */ target Python { - timeout: 3 sec + timeout: 3 sec } main reactor ScheduleValue { diff --git a/test/known-good/Python/src/SelfLoop.txt b/test/known-good/Python/src/SelfLoop.txt index 24387db66..7b6ce59e0 100644 --- a/test/known-good/Python/src/SelfLoop.txt +++ b/test/known-good/Python/src/SelfLoop.txt @@ -1,6 +1,6 @@ target Python { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } reactor Self { diff --git a/test/known-good/Python/src/SendingInside.txt b/test/known-good/Python/src/SendingInside.txt index ca73acc7d..08adbbcf5 100644 --- a/test/known-good/Python/src/SendingInside.txt +++ b/test/known-good/Python/src/SendingInside.txt @@ -1,8 +1,8 @@ # This tests a reactor that contains another reactor and also has its own # reaction that routes inputs to the contained reactor. target Python { - timeout: 10 sec, - fast: true + timeout: 10 sec, + fast: true } reactor Printer { diff --git a/test/known-good/Python/src/SlowingClock.txt b/test/known-good/Python/src/SlowingClock.txt index feae11d86..b4767a04c 100644 --- a/test/known-good/Python/src/SlowingClock.txt +++ b/test/known-good/Python/src/SlowingClock.txt @@ -4,8 +4,8 @@ * additional delays provided as arguments to the schedule() function. */ target Python { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } main reactor SlowingClock { diff --git a/test/known-good/Python/src/SlowingClockPhysical.txt b/test/known-good/Python/src/SlowingClockPhysical.txt index 9fa9844fd..598a46a89 100644 --- a/test/known-good/Python/src/SlowingClockPhysical.txt +++ b/test/known-good/Python/src/SlowingClockPhysical.txt @@ -9,7 +9,7 @@ * next event. */ target Python { - timeout: 1500 msec + timeout: 1500 msec } main reactor SlowingClockPhysical { diff --git a/test/known-good/Python/src/Stride.txt b/test/known-good/Python/src/Stride.txt index 98c2d3b07..764e04be4 100644 --- a/test/known-good/Python/src/Stride.txt +++ b/test/known-good/Python/src/Stride.txt @@ -1,8 +1,8 @@ # This example illustrates state variables and parameters on the wiki. For this # test, success is just compiling and running. target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Count(stride(1)) { diff --git a/test/known-good/Python/src/StructAsType.txt b/test/known-good/Python/src/StructAsType.txt index 596d9396f..aabfdc219 100644 --- a/test/known-good/Python/src/StructAsType.txt +++ b/test/known-good/Python/src/StructAsType.txt @@ -1,5 +1,5 @@ target Python { - files: include/hello.py + files: include/hello.py } preamble {= import hello =} diff --git a/test/known-good/Python/src/StructAsTypeDirect.txt b/test/known-good/Python/src/StructAsTypeDirect.txt index 7ab750431..620036148 100644 --- a/test/known-good/Python/src/StructAsTypeDirect.txt +++ b/test/known-good/Python/src/StructAsTypeDirect.txt @@ -1,5 +1,5 @@ target Python { - files: include/hello.py + files: include/hello.py } preamble {= import hello =} diff --git a/test/known-good/Python/src/StructParallel.txt b/test/known-good/Python/src/StructParallel.txt index e491e5bc8..328ca25fc 100644 --- a/test/known-good/Python/src/StructParallel.txt +++ b/test/known-good/Python/src/StructParallel.txt @@ -1,7 +1,7 @@ # Source allocates a class object and then sends it to two reactors, each of # which want to modify it. target Python { - files: ["include/hello.py"] + files: ["include/hello.py"] } import Source from "StructScale.lf" diff --git a/test/known-good/Python/src/StructPrint.txt b/test/known-good/Python/src/StructPrint.txt index 40f55f192..8355e2b82 100644 --- a/test/known-good/Python/src/StructPrint.txt +++ b/test/known-good/Python/src/StructPrint.txt @@ -1,7 +1,7 @@ # Source produces a dynamically allocated class object, which it passes to # Print. Reference counting ensures that the struct is freed. target Python { - files: ["include/hello.py"] + files: ["include/hello.py"] } preamble {= import hello =} diff --git a/test/known-good/Python/src/StructScale.txt b/test/known-good/Python/src/StructScale.txt index abad5606c..1c8f61eb1 100644 --- a/test/known-good/Python/src/StructScale.txt +++ b/test/known-good/Python/src/StructScale.txt @@ -1,7 +1,7 @@ # Source produces a dynamically allocated class object, which it passes to # Scale. Scale modifies it and passes it to Print. target Python { - files: ["include/hello.py"] + files: ["include/hello.py"] } preamble {= import hello =} diff --git a/test/known-good/Python/src/TimeLimit.txt b/test/known-good/Python/src/TimeLimit.txt index fb2e8fcaf..87d6495e4 100644 --- a/test/known-good/Python/src/TimeLimit.txt +++ b/test/known-good/Python/src/TimeLimit.txt @@ -2,7 +2,7 @@ # Correct output for this 1, 2, 3, 4. Failure for this test is failing to halt # or getting the wrong data. target Python { - fast: true + fast: true } reactor Clock(offset(0), period(1 sec)) { diff --git a/test/known-good/Python/src/Timers.txt b/test/known-good/Python/src/Timers.txt index b7eceb2b9..9b3a46ba1 100644 --- a/test/known-good/Python/src/Timers.txt +++ b/test/known-good/Python/src/Timers.txt @@ -1,6 +1,6 @@ /** Test whether timers with different periods are triggered correctly. */ target Python { - timeout: 2 sec + timeout: 2 sec } main reactor { diff --git a/test/known-good/Python/src/TriggerDownstreamOnlyIfPresent.txt b/test/known-good/Python/src/TriggerDownstreamOnlyIfPresent.txt index 040624a25..9e04df74a 100644 --- a/test/known-good/Python/src/TriggerDownstreamOnlyIfPresent.txt +++ b/test/known-good/Python/src/TriggerDownstreamOnlyIfPresent.txt @@ -3,8 +3,8 @@ * is present. */ target Python { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } reactor Source { @@ -39,8 +39,8 @@ } main reactor TriggerDownstreamOnlyIfPresent { - s = new[2] Source() - d = new[2] Destination() + s = new[2] Source() + d = new[2] Destination() s.a -> d.a s.b -> d.b } diff --git a/test/known-good/Python/src/TriggerDownstreamOnlyIfPresent2.txt b/test/known-good/Python/src/TriggerDownstreamOnlyIfPresent2.txt index 67fae52db..ad0c6bc06 100644 --- a/test/known-good/Python/src/TriggerDownstreamOnlyIfPresent2.txt +++ b/test/known-good/Python/src/TriggerDownstreamOnlyIfPresent2.txt @@ -3,8 +3,8 @@ * is present. */ target Python { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } reactor Source { @@ -35,7 +35,7 @@ main reactor TriggerDownstreamOnlyIfPresent2 { s = new Source() - d = new[2] Destination() + d = new[2] Destination() s.out -> d._in } diff --git a/test/known-good/Python/src/UnconnectedInput.txt b/test/known-good/Python/src/UnconnectedInput.txt index a44f6abdb..73f7be179 100644 --- a/test/known-good/Python/src/UnconnectedInput.txt +++ b/test/known-good/Python/src/UnconnectedInput.txt @@ -1,7 +1,7 @@ # Test unconnected input. target Python { - timeout: 5 sec, - fast: true + timeout: 5 sec, + fast: true } reactor Source { diff --git a/test/known-good/Python/src/concurrent/AsyncCallback.txt b/test/known-good/Python/src/concurrent/AsyncCallback.txt index 8678948da..f7856e207 100644 --- a/test/known-good/Python/src/concurrent/AsyncCallback.txt +++ b/test/known-good/Python/src/concurrent/AsyncCallback.txt @@ -4,7 +4,7 @@ * action twice. */ target Python { - timeout: 2 sec + timeout: 2 sec } main reactor AsyncCallback { diff --git a/test/known-good/Python/src/concurrent/AsyncCallbackNoTimer.txt b/test/known-good/Python/src/concurrent/AsyncCallbackNoTimer.txt index 9887e5d8a..0fbf4c639 100644 --- a/test/known-good/Python/src/concurrent/AsyncCallbackNoTimer.txt +++ b/test/known-good/Python/src/concurrent/AsyncCallbackNoTimer.txt @@ -8,7 +8,7 @@ * the C runtime polling the Python context with a reaction to a timer. */ target Python { - timeout: 2 sec + timeout: 2 sec } main reactor { diff --git a/test/known-good/Python/src/docker/FilesPropertyContainerized.txt b/test/known-good/Python/src/docker/FilesPropertyContainerized.txt index 096bc4448..c09736ccc 100644 --- a/test/known-good/Python/src/docker/FilesPropertyContainerized.txt +++ b/test/known-good/Python/src/docker/FilesPropertyContainerized.txt @@ -1,6 +1,6 @@ target Python { - files: "../include/hello.py", - docker: true + files: "../include/hello.py", + docker: true } preamble {= diff --git a/test/known-good/Python/src/docker/HelloWorldContainerized.txt b/test/known-good/Python/src/docker/HelloWorldContainerized.txt index 03d916804..21f60223e 100644 --- a/test/known-good/Python/src/docker/HelloWorldContainerized.txt +++ b/test/known-good/Python/src/docker/HelloWorldContainerized.txt @@ -1,5 +1,5 @@ target Python { - docker: true + docker: true } import HelloWorld2 from "../HelloWorld.lf" diff --git a/test/known-good/Python/src/docker/PingPongContainerized.txt b/test/known-good/Python/src/docker/PingPongContainerized.txt index aa3f76290..7677bff5c 100644 --- a/test/known-good/Python/src/docker/PingPongContainerized.txt +++ b/test/known-good/Python/src/docker/PingPongContainerized.txt @@ -21,8 +21,8 @@ * @author Edward A. Lee */ target Python { - fast: true, - docker: true + fast: true, + docker: true } import Ping from "../PingPong.lf" diff --git a/test/known-good/Python/src/docker/federated/DistributedCountContainerized.txt b/test/known-good/Python/src/docker/federated/DistributedCountContainerized.txt index 372f0b308..b0c0f43cf 100644 --- a/test/known-good/Python/src/docker/federated/DistributedCountContainerized.txt +++ b/test/known-good/Python/src/docker/federated/DistributedCountContainerized.txt @@ -6,10 +6,10 @@ * @author Edward A. Lee */ target Python { - timeout: 5 sec, - logging: DEBUG, - coordination: centralized, - docker: true + timeout: 5 sec, + logging: DEBUG, + coordination: centralized, + docker: true } import Count from "../../lib/Count.lf" diff --git a/test/known-good/Python/src/docker/federated/DistributedDoublePortContainerized.txt b/test/known-good/Python/src/docker/federated/DistributedDoublePortContainerized.txt index 4e9922672..377461827 100644 --- a/test/known-good/Python/src/docker/federated/DistributedDoublePortContainerized.txt +++ b/test/known-good/Python/src/docker/federated/DistributedDoublePortContainerized.txt @@ -6,10 +6,10 @@ * @author Soroush Bateni */ target Python { - timeout: 900 msec, - logging: DEBUG, - coordination: centralized, - docker: true + timeout: 900 msec, + logging: DEBUG, + coordination: centralized, + docker: true } import Count from "../../lib/Count.lf" diff --git a/test/known-good/Python/src/docker/federated/DistributedMultiportContainerized.txt b/test/known-good/Python/src/docker/federated/DistributedMultiportContainerized.txt index 6128968bd..95dffcfd3 100644 --- a/test/known-good/Python/src/docker/federated/DistributedMultiportContainerized.txt +++ b/test/known-good/Python/src/docker/federated/DistributedMultiportContainerized.txt @@ -1,8 +1,8 @@ # Check multiport connections between federates. target Python { - timeout: 1 sec, - coordination: centralized, - docker: true + timeout: 1 sec, + coordination: centralized, + docker: true } import Source, Destination from "../../federated/DistributedMultiport.lf" diff --git a/test/known-good/Python/src/docker/federated/DistributedSendClassContainerized.txt b/test/known-good/Python/src/docker/federated/DistributedSendClassContainerized.txt index 4023f9a78..92f78bbaf 100644 --- a/test/known-good/Python/src/docker/federated/DistributedSendClassContainerized.txt +++ b/test/known-good/Python/src/docker/federated/DistributedSendClassContainerized.txt @@ -1,6 +1,6 @@ target Python { - coordination: centralized, - docker: true + coordination: centralized, + docker: true } import A, B from "../../federated/DistributedSendClass.lf" diff --git a/test/known-good/Python/src/docker/federated/DistributedStopDecentralizedContainerized.txt b/test/known-good/Python/src/docker/federated/DistributedStopDecentralizedContainerized.txt index 2736d662f..fdf85124d 100644 --- a/test/known-good/Python/src/docker/federated/DistributedStopDecentralizedContainerized.txt +++ b/test/known-good/Python/src/docker/federated/DistributedStopDecentralizedContainerized.txt @@ -5,8 +5,8 @@ * @author Soroush Bateni */ target Python { - coordination: decentralized, - docker: true + coordination: decentralized, + docker: true } import Sender, Receiver from "../../federated/DistributedStop.lf" diff --git a/test/known-good/Python/src/federated/BroadcastFeedback.txt b/test/known-good/Python/src/federated/BroadcastFeedback.txt index 43c727b9c..98d03bf22 100644 --- a/test/known-good/Python/src/federated/BroadcastFeedback.txt +++ b/test/known-good/Python/src/federated/BroadcastFeedback.txt @@ -2,7 +2,7 @@ * This tests an output that is broadcast back to a multiport input of a bank. */ target Python { - timeout: 1 sec + timeout: 1 sec } reactor SenderAndReceiver { @@ -26,7 +26,7 @@ } federated reactor { - s = new[2] SenderAndReceiver() + s = new[2] SenderAndReceiver() (s.out)+ -> s.inp } diff --git a/test/known-good/Python/src/federated/BroadcastFeedbackWithHierarchy.txt b/test/known-good/Python/src/federated/BroadcastFeedbackWithHierarchy.txt index e190391ff..80ee4d639 100644 --- a/test/known-good/Python/src/federated/BroadcastFeedbackWithHierarchy.txt +++ b/test/known-good/Python/src/federated/BroadcastFeedbackWithHierarchy.txt @@ -2,7 +2,7 @@ * This tests an output that is broadcast back to a multiport input of a bank. */ target Python { - timeout: 1 sec + timeout: 1 sec } reactor SenderAndReceiver { @@ -35,7 +35,7 @@ } federated reactor { - s = new[2] SenderAndReceiver() + s = new[2] SenderAndReceiver() (s.out)+ -> s.in_ } diff --git a/test/known-good/Python/src/federated/ChainWithDelay.txt b/test/known-good/Python/src/federated/ChainWithDelay.txt index f6c8c55c7..eee5d7a73 100644 --- a/test/known-good/Python/src/federated/ChainWithDelay.txt +++ b/test/known-good/Python/src/federated/ChainWithDelay.txt @@ -4,7 +4,7 @@ * @author Edward A. Lee */ target Python { - timeout: 3 msec + timeout: 3 msec } import Count from "../lib/Count.lf" diff --git a/test/known-good/Python/src/federated/DecentralizedP2PComm.txt b/test/known-good/Python/src/federated/DecentralizedP2PComm.txt index 81e8ac2f7..6ff51ebc9 100644 --- a/test/known-good/Python/src/federated/DecentralizedP2PComm.txt +++ b/test/known-good/Python/src/federated/DecentralizedP2PComm.txt @@ -1,8 +1,8 @@ target Python { - timeout: 1 sec, - tracing: true, - clock-sync: off, - coordination: decentralized + timeout: 1 sec, + tracing: true, + clock-sync: off, + coordination: decentralized } reactor Platform(start(0), expected_start(0), stp_offset_param(0)) { diff --git a/test/known-good/Python/src/federated/DecentralizedP2PUnbalancedTimeout.txt b/test/known-good/Python/src/federated/DecentralizedP2PUnbalancedTimeout.txt index fc8088be5..e04a5c099 100644 --- a/test/known-good/Python/src/federated/DecentralizedP2PUnbalancedTimeout.txt +++ b/test/known-good/Python/src/federated/DecentralizedP2PUnbalancedTimeout.txt @@ -7,8 +7,8 @@ * The test fails if the federation does not exit. */ target Python { - timeout: 1 msec, - coordination: decentralized + timeout: 1 msec, + coordination: decentralized } # reason for failing: lf_tag() not supported by the python target diff --git a/test/known-good/Python/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.txt b/test/known-good/Python/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.txt index 85cc5c7c3..eec72b44e 100644 --- a/test/known-good/Python/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.txt +++ b/test/known-good/Python/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.txt @@ -8,8 +8,8 @@ * physical connection between source and destination. */ target Python { - timeout: 1 msec, - coordination: decentralized + timeout: 1 msec, + coordination: decentralized } reactor Clock(offset(0), period(1 sec)) { diff --git a/test/known-good/Python/src/federated/DistributedBank.txt b/test/known-good/Python/src/federated/DistributedBank.txt index 0b63b0b8c..e86513eaf 100644 --- a/test/known-good/Python/src/federated/DistributedBank.txt +++ b/test/known-good/Python/src/federated/DistributedBank.txt @@ -1,7 +1,7 @@ # Check bank of federates. target Python { - timeout: 1 sec, - coordination: centralized + timeout: 1 sec, + coordination: centralized } reactor Node { @@ -22,6 +22,6 @@ } federated reactor DistributedBank { - n = new[2] Node() + n = new[2] Node() } diff --git a/test/known-good/Python/src/federated/DistributedBankToMultiport.txt b/test/known-good/Python/src/federated/DistributedBankToMultiport.txt index 9c75ee5a3..c1481571a 100644 --- a/test/known-good/Python/src/federated/DistributedBankToMultiport.txt +++ b/test/known-good/Python/src/federated/DistributedBankToMultiport.txt @@ -1,6 +1,6 @@ # Check multiport to bank connections between federates. target Python { - timeout: 3 sec + timeout: 3 sec } import Count from "../lib/Count.lf" @@ -27,7 +27,7 @@ } federated reactor { - s = new[2] Count() + s = new[2] Count() d = new Destination() s.out -> d.in_ } diff --git a/test/known-good/Python/src/federated/DistributedCount.txt b/test/known-good/Python/src/federated/DistributedCount.txt index 124398eac..f33b252d7 100644 --- a/test/known-good/Python/src/federated/DistributedCount.txt +++ b/test/known-good/Python/src/federated/DistributedCount.txt @@ -6,8 +6,8 @@ * @author Edward A. Lee */ target Python { - timeout: 5 sec, - coordination: centralized + timeout: 5 sec, + coordination: centralized } import Count from "../lib/Count.lf" diff --git a/test/known-good/Python/src/federated/DistributedCountDecentralized.txt b/test/known-good/Python/src/federated/DistributedCountDecentralized.txt index db7541187..361636254 100644 --- a/test/known-good/Python/src/federated/DistributedCountDecentralized.txt +++ b/test/known-good/Python/src/federated/DistributedCountDecentralized.txt @@ -7,8 +7,8 @@ */ # reason for failing: in_.intended_tag are not supported in python target target Python { - timeout: 5 sec, - coordination: decentralized + timeout: 5 sec, + coordination: decentralized } import Count from "../lib/Count.lf" diff --git a/test/known-good/Python/src/federated/DistributedCountDecentralizedLate.txt b/test/known-good/Python/src/federated/DistributedCountDecentralizedLate.txt index 7d972839f..7ce7790c5 100644 --- a/test/known-good/Python/src/federated/DistributedCountDecentralizedLate.txt +++ b/test/known-good/Python/src/federated/DistributedCountDecentralizedLate.txt @@ -7,8 +7,8 @@ * @author Soroush Bateni */ target Python { - timeout: 4900 msec, - coordination: decentralized + timeout: 4900 msec, + coordination: decentralized } import Count from "../lib/Count.lf" diff --git a/test/known-good/Python/src/federated/DistributedCountDecentralizedLateDownstream.txt b/test/known-good/Python/src/federated/DistributedCountDecentralizedLateDownstream.txt index e3c55126f..abdc559c1 100644 --- a/test/known-good/Python/src/federated/DistributedCountDecentralizedLateDownstream.txt +++ b/test/known-good/Python/src/federated/DistributedCountDecentralizedLateDownstream.txt @@ -19,8 +19,8 @@ */ target Python { # 9 msec headroom for the last (probably tardy) message to arrive. - timeout: 1900 msec, - coordination: decentralized + timeout: 1900 msec, + coordination: decentralized } import Count from "../lib/Count.lf" diff --git a/test/known-good/Python/src/federated/DistributedCountDecentralizedLateHierarchy.txt b/test/known-good/Python/src/federated/DistributedCountDecentralizedLateHierarchy.txt index e9926485b..fe92b465b 100644 --- a/test/known-good/Python/src/federated/DistributedCountDecentralizedLateHierarchy.txt +++ b/test/known-good/Python/src/federated/DistributedCountDecentralizedLateHierarchy.txt @@ -9,8 +9,8 @@ * @author Soroush Bateni */ target Python { - timeout: 4900 msec, - coordination: decentralized + timeout: 4900 msec, + coordination: decentralized } import Count from "../lib/Count.lf" diff --git a/test/known-good/Python/src/federated/DistributedCountPhysical.txt b/test/known-good/Python/src/federated/DistributedCountPhysical.txt index 5cefd3e9c..bfb35d558 100644 --- a/test/known-good/Python/src/federated/DistributedCountPhysical.txt +++ b/test/known-good/Python/src/federated/DistributedCountPhysical.txt @@ -8,7 +8,7 @@ * @author Soroush Bateni */ target Python { - timeout: 1 sec + timeout: 1 sec } reactor Count { diff --git a/test/known-good/Python/src/federated/DistributedCountPhysicalAfterDelay.txt b/test/known-good/Python/src/federated/DistributedCountPhysicalAfterDelay.txt index d429ea5be..d6af7d086 100644 --- a/test/known-good/Python/src/federated/DistributedCountPhysicalAfterDelay.txt +++ b/test/known-good/Python/src/federated/DistributedCountPhysicalAfterDelay.txt @@ -8,7 +8,7 @@ * @author Soroush Bateni */ target Python { - timeout: 1 sec + timeout: 1 sec } reactor Count { diff --git a/test/known-good/Python/src/federated/DistributedCountPhysicalDecentralized.txt b/test/known-good/Python/src/federated/DistributedCountPhysicalDecentralized.txt index f42c737ec..a4d0626de 100644 --- a/test/known-good/Python/src/federated/DistributedCountPhysicalDecentralized.txt +++ b/test/known-good/Python/src/federated/DistributedCountPhysicalDecentralized.txt @@ -8,8 +8,8 @@ * @author Soroush Bateni */ target Python { - timeout: 1 sec, - coordination: decentralized + timeout: 1 sec, + coordination: decentralized } reactor Count { diff --git a/test/known-good/Python/src/federated/DistributedDoublePort.txt b/test/known-good/Python/src/federated/DistributedDoublePort.txt index 5c5aea03a..64805e8ad 100644 --- a/test/known-good/Python/src/federated/DistributedDoublePort.txt +++ b/test/known-good/Python/src/federated/DistributedDoublePort.txt @@ -6,9 +6,9 @@ * @author Soroush Bateni */ target Python { - timeout: 900 msec, - logging: DEBUG, - coordination: centralized + timeout: 900 msec, + logging: DEBUG, + coordination: centralized } import Count from "../lib/Count.lf" diff --git a/test/known-good/Python/src/federated/DistributedLoopedAction.txt b/test/known-good/Python/src/federated/DistributedLoopedAction.txt index b534ead9b..000c92df8 100644 --- a/test/known-good/Python/src/federated/DistributedLoopedAction.txt +++ b/test/known-good/Python/src/federated/DistributedLoopedAction.txt @@ -5,7 +5,7 @@ * @author Soroush Bateni */ target Python { - timeout: 1 sec + timeout: 1 sec } import Sender from "../lib/LoopedActionSender.lf" diff --git a/test/known-good/Python/src/federated/DistributedLoopedPhysicalAction.txt b/test/known-good/Python/src/federated/DistributedLoopedPhysicalAction.txt index f6a4e1afb..7ce5b048f 100644 --- a/test/known-good/Python/src/federated/DistributedLoopedPhysicalAction.txt +++ b/test/known-good/Python/src/federated/DistributedLoopedPhysicalAction.txt @@ -10,8 +10,8 @@ * @author Soroush Bateni */ target Python { - timeout: 1 sec, - keepalive: true + timeout: 1 sec, + keepalive: true } reactor Sender(take_a_break_after(10), break_interval(550 msec)) { diff --git a/test/known-good/Python/src/federated/DistributedLoopedPhysicalActionDecentralized.txt b/test/known-good/Python/src/federated/DistributedLoopedPhysicalActionDecentralized.txt index 0715789b9..946322555 100644 --- a/test/known-good/Python/src/federated/DistributedLoopedPhysicalActionDecentralized.txt +++ b/test/known-good/Python/src/federated/DistributedLoopedPhysicalActionDecentralized.txt @@ -5,8 +5,8 @@ * @author Soroush Bateni */ target Python { - timeout: 1 sec, - coordination: decentralized + timeout: 1 sec, + coordination: decentralized } import Sender, Receiver from "DistributedLoopedPhysicalAction.lf" diff --git a/test/known-good/Python/src/federated/DistributedMultiport.txt b/test/known-good/Python/src/federated/DistributedMultiport.txt index b29417fe0..27475505b 100644 --- a/test/known-good/Python/src/federated/DistributedMultiport.txt +++ b/test/known-good/Python/src/federated/DistributedMultiport.txt @@ -1,7 +1,7 @@ # Check multiport connections between federates. target Python { - timeout: 1 sec, - coordination: centralized + timeout: 1 sec, + coordination: centralized } reactor Source { diff --git a/test/known-good/Python/src/federated/DistributedMultiportToBank.txt b/test/known-good/Python/src/federated/DistributedMultiportToBank.txt index d29ce934f..fa15d88b5 100644 --- a/test/known-good/Python/src/federated/DistributedMultiportToBank.txt +++ b/test/known-good/Python/src/federated/DistributedMultiportToBank.txt @@ -1,6 +1,6 @@ # Check multiport to bank connections between federates. target Python { - timeout: 1 sec + timeout: 1 sec } reactor Source { @@ -37,7 +37,7 @@ federated reactor DistributedMultiportToBank { s = new Source() - d = new[2] Destination() + d = new[2] Destination() s.out -> d.in_ } diff --git a/test/known-good/Python/src/federated/DistributedMultiportToken.txt b/test/known-good/Python/src/federated/DistributedMultiportToken.txt index 366509691..d06e59317 100644 --- a/test/known-good/Python/src/federated/DistributedMultiportToken.txt +++ b/test/known-good/Python/src/federated/DistributedMultiportToken.txt @@ -1,8 +1,8 @@ # Check multiport connections between federates where the message is carried by # a Token (in this case, with an array of char). target Python { - timeout: 1 sec, - coordination: centralized + timeout: 1 sec, + coordination: centralized } reactor Source { diff --git a/test/known-good/Python/src/federated/DistributedNoReact.txt b/test/known-good/Python/src/federated/DistributedNoReact.txt index 37d47bea5..305e14dab 100644 --- a/test/known-good/Python/src/federated/DistributedNoReact.txt +++ b/test/known-good/Python/src/federated/DistributedNoReact.txt @@ -1,5 +1,5 @@ target Python { - timeout: 2 sec + timeout: 2 sec } preamble {= diff --git a/test/known-good/Python/src/federated/DistributedStopDecentralized.txt b/test/known-good/Python/src/federated/DistributedStopDecentralized.txt index d307d9343..766fce767 100644 --- a/test/known-good/Python/src/federated/DistributedStopDecentralized.txt +++ b/test/known-good/Python/src/federated/DistributedStopDecentralized.txt @@ -7,7 +7,7 @@ # reason for failing: lf_tag().microstep and lf.tag_compare() are not not # supported in python target target Python { - coordination: decentralized + coordination: decentralized } import Sender, Receiver from "DistributedStop.lf" diff --git a/test/known-good/Python/src/federated/DistributedStructAsType.txt b/test/known-good/Python/src/federated/DistributedStructAsType.txt index 404466791..12ff094e4 100644 --- a/test/known-good/Python/src/federated/DistributedStructAsType.txt +++ b/test/known-good/Python/src/federated/DistributedStructAsType.txt @@ -1,6 +1,6 @@ target Python { - files: ../include/hello.py, - timeout: 2 secs + files: ../include/hello.py, + timeout: 2 secs } import Source, Print from "../StructAsType.lf" diff --git a/test/known-good/Python/src/federated/DistributedStructAsTypeDirect.txt b/test/known-good/Python/src/federated/DistributedStructAsTypeDirect.txt index 1c1bece7a..8086766d0 100644 --- a/test/known-good/Python/src/federated/DistributedStructAsTypeDirect.txt +++ b/test/known-good/Python/src/federated/DistributedStructAsTypeDirect.txt @@ -1,6 +1,6 @@ target Python { - files: ../include/hello.py, - timeout: 2 secs + files: ../include/hello.py, + timeout: 2 secs } import Source, Print from "../StructAsTypeDirect.lf" diff --git a/test/known-good/Python/src/federated/DistributedStructParallel.txt b/test/known-good/Python/src/federated/DistributedStructParallel.txt index 9c2b8ee4f..659f9b1d7 100644 --- a/test/known-good/Python/src/federated/DistributedStructParallel.txt +++ b/test/known-good/Python/src/federated/DistributedStructParallel.txt @@ -1,8 +1,8 @@ # Source allocates a class object and then sends it to two reactors, each of # which want to modify it. target Python { - files: ["../include/hello.py"], - timeout: 2 secs + files: ["../include/hello.py"], + timeout: 2 secs } import Source from "../StructScale.lf" diff --git a/test/known-good/Python/src/federated/DistributedStructPrint.txt b/test/known-good/Python/src/federated/DistributedStructPrint.txt index a7999468e..7f0d5c5a6 100644 --- a/test/known-good/Python/src/federated/DistributedStructPrint.txt +++ b/test/known-good/Python/src/federated/DistributedStructPrint.txt @@ -1,8 +1,8 @@ # Source produces a dynamically allocated class object, which it passes to # Print. Reference counting ensures that the struct is freed. target Python { - files: ["../include/hello.py"], - timeout: 2 sec + files: ["../include/hello.py"], + timeout: 2 sec } import Print, Check from "../StructPrint.lf" diff --git a/test/known-good/Python/src/federated/DistributedStructScale.txt b/test/known-good/Python/src/federated/DistributedStructScale.txt index 202c57e69..293e2ca0d 100644 --- a/test/known-good/Python/src/federated/DistributedStructScale.txt +++ b/test/known-good/Python/src/federated/DistributedStructScale.txt @@ -1,8 +1,8 @@ # Source produces a dynamically allocated class object, which it passes to # Scale. Scale modifies it and passes it to Print. target Python { - files: ["../include/hello.py"], - timeout: 2 sec + files: ["../include/hello.py"], + timeout: 2 sec } import Source, TestInput, Print from "../StructScale.lf" diff --git a/test/known-good/Python/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.txt b/test/known-good/Python/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.txt index f6b6f2cb0..ddd50498f 100644 --- a/test/known-good/Python/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.txt +++ b/test/known-good/Python/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.txt @@ -7,12 +7,12 @@ * @author Soroush Bateni */ target Python { - coordination: centralized, - coordination-options: { - advance-message-interval: 100 msec + coordination: centralized, + coordination-options: { + advance-message-interval: 100 msec }, - timeout: 5 sec -} + timeout: 5 sec +} reactor Contained(incr(1)) { timer t(0, 1 sec) diff --git a/test/known-good/Python/src/federated/ParallelDestinations.txt b/test/known-good/Python/src/federated/ParallelDestinations.txt index 28c3bce3d..a690bb5b8 100644 --- a/test/known-good/Python/src/federated/ParallelDestinations.txt +++ b/test/known-good/Python/src/federated/ParallelDestinations.txt @@ -1,6 +1,6 @@ /** Test parallel connections for federated execution. */ target Python { - timeout: 2 sec + timeout: 2 sec } import Count from "../lib/Count.lf" diff --git a/test/known-good/Python/src/federated/ParallelSources.txt b/test/known-good/Python/src/federated/ParallelSources.txt index ca5df6663..6d4fc283d 100644 --- a/test/known-good/Python/src/federated/ParallelSources.txt +++ b/test/known-good/Python/src/federated/ParallelSources.txt @@ -1,6 +1,6 @@ /** Test parallel connections for federated execution. */ target Python { - timeout: 2 sec + timeout: 2 sec } import Count from "../lib/Count.lf" diff --git a/test/known-good/Python/src/federated/ParallelSourcesMultiport.txt b/test/known-good/Python/src/federated/ParallelSourcesMultiport.txt index bc202d4be..e08457b1f 100644 --- a/test/known-good/Python/src/federated/ParallelSourcesMultiport.txt +++ b/test/known-good/Python/src/federated/ParallelSourcesMultiport.txt @@ -1,6 +1,6 @@ /** Test parallel connections for federated execution. */ target Python { - timeout: 2 sec + timeout: 2 sec } import Count from "../lib/Count.lf" diff --git a/test/known-good/Python/src/federated/PhysicalSTP.txt b/test/known-good/Python/src/federated/PhysicalSTP.txt index 65afe7fac..5a62169ec 100644 --- a/test/known-good/Python/src/federated/PhysicalSTP.txt +++ b/test/known-good/Python/src/federated/PhysicalSTP.txt @@ -3,8 +3,8 @@ * message arrival. */ target Python { - timeout: 1900 msec, - coordination: decentralized + timeout: 1900 msec, + coordination: decentralized } import Count from "../lib/Count.lf" diff --git a/test/known-good/Python/src/federated/StopAtShutdown.txt b/test/known-good/Python/src/federated/StopAtShutdown.txt index 0e0c96a03..a8c793a68 100644 --- a/test/known-good/Python/src/federated/StopAtShutdown.txt +++ b/test/known-good/Python/src/federated/StopAtShutdown.txt @@ -6,7 +6,7 @@ * @author Steven Wong */ target Python { - timeout: 2 sec + timeout: 2 sec } reactor A { diff --git a/test/known-good/Python/src/federated/failing/ClockSync.txt b/test/known-good/Python/src/federated/failing/ClockSync.txt index 070704d52..802d95c5b 100644 --- a/test/known-good/Python/src/federated/failing/ClockSync.txt +++ b/test/known-good/Python/src/federated/failing/ClockSync.txt @@ -8,25 +8,25 @@ # reason for failing: clock-sync and clock-sync-options not supported in the # python target target Python { - coordination: decentralized, - timeout: 10 sec, - clock-sync: on, # Turn on runtime clock synchronization. - clock-sync-options: { + coordination: decentralized, + timeout: 10 sec, + clock-sync: on, # Turn on runtime clock synchronization. + clock-sync-options: { # Forces all federates to perform clock sync. - local-federates-on: true, + local-federates-on: true, # Collect useful statistics like average network delay - collect-stats: true, + collect-stats: true, # and the standard deviation for the network delay over one clock # synchronization cycle. Generates a warning if the standard deviation # is higher than the clock sync guard. Artificially offsets clocks by # multiples of 200 msec. - test-offset: 200 msec, + test-offset: 200 msec, # Period with which runtime clock sync is performed. - period: 5 msec, + period: 5 msec, # Number of messages exchanged to perform clock sync. - trials: 10, + trials: 10, # Attenuation applied to runtime clock sync adjustments. - attenuation: 10 + attenuation: 10 } } diff --git a/test/known-good/Python/src/federated/failing/DistributedLoopedActionDecentralized.txt b/test/known-good/Python/src/federated/failing/DistributedLoopedActionDecentralized.txt index ad46dfcc2..772574bb4 100644 --- a/test/known-good/Python/src/federated/failing/DistributedLoopedActionDecentralized.txt +++ b/test/known-good/Python/src/federated/failing/DistributedLoopedActionDecentralized.txt @@ -15,8 +15,8 @@ */ # reason for failing: in_.intended_tag are not supported in python target target Python { - timeout: 1 sec, - coordination: decentralized + timeout: 1 sec, + coordination: decentralized } import Sender from "../lib/LoopedActionSender.lf" diff --git a/test/known-good/Python/src/federated/failing/DistributedNetworkOrder.txt b/test/known-good/Python/src/federated/failing/DistributedNetworkOrder.txt index 7514624ed..b14be5d48 100644 --- a/test/known-good/Python/src/federated/failing/DistributedNetworkOrder.txt +++ b/test/known-good/Python/src/federated/failing/DistributedNetworkOrder.txt @@ -10,7 +10,7 @@ */ # reason for failing: send_timed_message() is not not supported in python target target Python { - timeout: 1 sec + timeout: 1 sec } reactor Sender { diff --git a/test/known-good/Python/src/federated/failing/LoopDistributedCentralized.txt b/test/known-good/Python/src/federated/failing/LoopDistributedCentralized.txt index dd6884e2a..b1609ec92 100644 --- a/test/known-good/Python/src/federated/failing/LoopDistributedCentralized.txt +++ b/test/known-good/Python/src/federated/failing/LoopDistributedCentralized.txt @@ -7,12 +7,12 @@ # reason for failing: lf_comma_separated_time() not supported in the python # target target Python { - coordination: centralized, - coordination-options: { - advance-message-interval: 100 msec + coordination: centralized, + coordination-options: { + advance-message-interval: 100 msec }, - timeout: 5 sec -} + timeout: 5 sec +} preamble {= #include // Defines sleep() diff --git a/test/known-good/Python/src/federated/failing/LoopDistributedCentralizedPrecedence.txt b/test/known-good/Python/src/federated/failing/LoopDistributedCentralizedPrecedence.txt index 2708a63d9..083a92c6f 100644 --- a/test/known-good/Python/src/federated/failing/LoopDistributedCentralizedPrecedence.txt +++ b/test/known-good/Python/src/federated/failing/LoopDistributedCentralizedPrecedence.txt @@ -8,13 +8,13 @@ # reason for failing: lf_comma_separated_time() not supported in the python # target target Python { - flags: "-Wall", - coordination: centralized, - coordination-options: { - advance-message-interval: 100 msec + flags: "-Wall", + coordination: centralized, + coordination-options: { + advance-message-interval: 100 msec }, - timeout: 5 sec -} + timeout: 5 sec +} reactor Looper(incr(1), delay(0 msec)) { input in_ diff --git a/test/known-good/Python/src/federated/failing/LoopDistributedDecentralized.txt b/test/known-good/Python/src/federated/failing/LoopDistributedDecentralized.txt index f08744706..ab2552be3 100644 --- a/test/known-good/Python/src/federated/failing/LoopDistributedDecentralized.txt +++ b/test/known-good/Python/src/federated/failing/LoopDistributedDecentralized.txt @@ -7,8 +7,8 @@ # reason for failing: lf_comma_separated_time() not supported in the python # target target Python { - coordination: decentralized, - timeout: 5 sec + coordination: decentralized, + timeout: 5 sec } preamble {= diff --git a/test/known-good/Python/src/federated/failing/LoopDistributedDouble.txt b/test/known-good/Python/src/federated/failing/LoopDistributedDouble.txt index 5ea1c63d3..18a756249 100644 --- a/test/known-good/Python/src/federated/failing/LoopDistributedDouble.txt +++ b/test/known-good/Python/src/federated/failing/LoopDistributedDouble.txt @@ -6,8 +6,8 @@ */ # reason for failing: current tag struct not supported in the python target target Python { - coordination: centralized, - timeout: 5 sec + coordination: centralized, + timeout: 5 sec } preamble {= diff --git a/test/known-good/Python/src/federated/failing/TopLevelArtifacts.txt b/test/known-good/Python/src/federated/failing/TopLevelArtifacts.txt index 94eb687f4..9b3d6978b 100644 --- a/test/known-good/Python/src/federated/failing/TopLevelArtifacts.txt +++ b/test/known-good/Python/src/federated/failing/TopLevelArtifacts.txt @@ -10,7 +10,7 @@ // reason for failing: strange error during compile time. lfc seeems to treat this file as C target. target Python { - timeout: 1 msec + timeout: 1 msec }; import Count from "../lib/Count.lf"; diff --git a/test/known-good/Python/src/modal_models/BanksCount3ModesComplex.txt b/test/known-good/Python/src/modal_models/BanksCount3ModesComplex.txt index 4d3936922..8b9ed1405 100644 --- a/test/known-good/Python/src/modal_models/BanksCount3ModesComplex.txt +++ b/test/known-good/Python/src/modal_models/BanksCount3ModesComplex.txt @@ -3,8 +3,8 @@ * complex nesting. */ target Python { - fast: false, - timeout: 3 sec + fast: false, + timeout: 3 sec } import TraceTesting from "util/TraceTesting.lf" @@ -17,12 +17,12 @@ output[2] mode2 output[2] never - outer_counters = new[2] CounterCycle() + outer_counters = new[2] CounterCycle() (next)+ -> outer_counters.next outer_counters.count -> always initial mode One { - mode1_counters = new[2] CounterCycle() + mode1_counters = new[2] CounterCycle() (next)+ -> mode1_counters.next mode1_counters.count -> mode1 @@ -32,7 +32,7 @@ } mode Two { - mode2_counters = new[2] CounterCycle() + mode2_counters = new[2] CounterCycle() (next)+ -> mode2_counters.next mode2_counters.count -> mode2 @@ -42,7 +42,7 @@ } mode Three { - mode3_counters = new[2] CounterCycle() + mode3_counters = new[2] CounterCycle() (next)+ -> mode3_counters.next mode3_counters.count -> never @@ -51,7 +51,7 @@ main reactor { timer stepper(0, 250 msec) - counters = new[2] MetaCounter() + counters = new[2] MetaCounter() test = new TraceTesting(events_size = 16, trace = ( // keep-format 0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 250000000,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, diff --git a/test/known-good/Python/src/modal_models/BanksCount3ModesSimple.txt b/test/known-good/Python/src/modal_models/BanksCount3ModesSimple.txt index 919ccd370..3bf55cff8 100644 --- a/test/known-good/Python/src/modal_models/BanksCount3ModesSimple.txt +++ b/test/known-good/Python/src/modal_models/BanksCount3ModesSimple.txt @@ -1,7 +1,7 @@ /** Modal Reactor Test. Tests cycling through modes with banks of reactors. */ target Python { - fast: false, - timeout: 2 sec + fast: false, + timeout: 2 sec } import TraceTesting from "util/TraceTesting.lf" @@ -9,7 +9,7 @@ main reactor { timer stepper(0, 250 msec) - counters = new[3] CounterCycle() + counters = new[3] CounterCycle() test = new TraceTesting(events_size = 3, trace = ( // keep-format 0,1,1,1,1,1,1, 250000000,1,2,1,2,1,2, diff --git a/test/known-good/Python/src/modal_models/BanksModalStateReset.txt b/test/known-good/Python/src/modal_models/BanksModalStateReset.txt index 2d44fb9f4..f2b941a63 100644 --- a/test/known-good/Python/src/modal_models/BanksModalStateReset.txt +++ b/test/known-good/Python/src/modal_models/BanksModalStateReset.txt @@ -3,8 +3,8 @@ * reactors. */ target Python { - fast: false, - timeout: 4 sec + fast: false, + timeout: 4 sec } import TraceTesting from "util/TraceTesting.lf" @@ -14,8 +14,8 @@ main reactor { timer stepper(1 sec, 1 sec) - reset1 = new[2] ResetReaction() - reset2 = new[2] AutoReset() + reset1 = new[2] ResetReaction() + reset2 = new[2] AutoReset() test = new TraceTesting(events_size = 16, trace = ( // keep-format 0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0, 0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0, 250000000,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0, 0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0, diff --git a/test/known-good/Python/src/modal_models/ConvertCaseTest.txt b/test/known-good/Python/src/modal_models/ConvertCaseTest.txt index 52221f71b..29ce86751 100644 --- a/test/known-good/Python/src/modal_models/ConvertCaseTest.txt +++ b/test/known-good/Python/src/modal_models/ConvertCaseTest.txt @@ -1,7 +1,7 @@ /** Modal Reactor Test. Tests nested reactors with modes. */ target Python { - fast: false, - timeout: 4 sec + fast: false, + timeout: 4 sec } import TraceTesting from "util/TraceTesting.lf" diff --git a/test/known-good/Python/src/modal_models/Count3Modes.txt b/test/known-good/Python/src/modal_models/Count3Modes.txt index 69aa06fbd..2cb10bf53 100644 --- a/test/known-good/Python/src/modal_models/Count3Modes.txt +++ b/test/known-good/Python/src/modal_models/Count3Modes.txt @@ -1,7 +1,7 @@ /** Modal Reactor Test. Tests cycling through modes. */ target Python { - fast: false, - timeout: 2 sec + fast: false, + timeout: 2 sec } reactor CounterCycle { diff --git a/test/known-good/Python/src/modal_models/ModalActions.txt b/test/known-good/Python/src/modal_models/ModalActions.txt index dce9e2e8a..ddd6a3453 100644 --- a/test/known-good/Python/src/modal_models/ModalActions.txt +++ b/test/known-good/Python/src/modal_models/ModalActions.txt @@ -3,8 +3,8 @@ * and continuation of delays with history transitions. */ target Python { - fast: false, - timeout: 4 sec + fast: false, + timeout: 4 sec } import TraceTesting from "util/TraceTesting.lf" diff --git a/test/known-good/Python/src/modal_models/ModalAfter.txt b/test/known-good/Python/src/modal_models/ModalAfter.txt index 18dbea992..ed2c49509 100644 --- a/test/known-good/Python/src/modal_models/ModalAfter.txt +++ b/test/known-good/Python/src/modal_models/ModalAfter.txt @@ -3,8 +3,8 @@ * and continuation with history transitions. */ target Python { - fast: false, - timeout: 4 sec + fast: false, + timeout: 4 sec } import TraceTesting from "util/TraceTesting.lf" diff --git a/test/known-good/Python/src/modal_models/ModalCycleBreaker.txt b/test/known-good/Python/src/modal_models/ModalCycleBreaker.txt index 0bf77cdc5..28cabfed0 100644 --- a/test/known-good/Python/src/modal_models/ModalCycleBreaker.txt +++ b/test/known-good/Python/src/modal_models/ModalCycleBreaker.txt @@ -5,8 +5,8 @@ * if they are located in separate modes. */ target Python { - fast: false, - timeout: 1 sec + fast: false, + timeout: 1 sec } import TraceTesting from "util/TraceTesting.lf" diff --git a/test/known-good/Python/src/modal_models/ModalNestedReactions.txt b/test/known-good/Python/src/modal_models/ModalNestedReactions.txt index 0b15a22d7..75a0f63d9 100644 --- a/test/known-good/Python/src/modal_models/ModalNestedReactions.txt +++ b/test/known-good/Python/src/modal_models/ModalNestedReactions.txt @@ -3,8 +3,8 @@ * inactive mode */ target Python { - fast: false, - timeout: 2 sec + fast: false, + timeout: 2 sec } reactor CounterCycle { diff --git a/test/known-good/Python/src/modal_models/ModalStartupShutdown.txt b/test/known-good/Python/src/modal_models/ModalStartupShutdown.txt index 897a42b3e..7de90024a 100644 --- a/test/known-good/Python/src/modal_models/ModalStartupShutdown.txt +++ b/test/known-good/Python/src/modal_models/ModalStartupShutdown.txt @@ -1,7 +1,7 @@ /** Modal Reactor Test. Test startup/shutdown reactions in modes. */ target Python { - fast: false, - timeout: 3000 msec + fast: false, + timeout: 3000 msec } import TraceTesting from "util/TraceTesting.lf" diff --git a/test/known-good/Python/src/modal_models/ModalStateReset.txt b/test/known-good/Python/src/modal_models/ModalStateReset.txt index 997264d3b..2c85fef07 100644 --- a/test/known-good/Python/src/modal_models/ModalStateReset.txt +++ b/test/known-good/Python/src/modal_models/ModalStateReset.txt @@ -1,7 +1,7 @@ /** Modal Reactor Test. Tests reset of state variables in modes. */ target Python { - fast: false, - timeout: 4 sec + fast: false, + timeout: 4 sec } import TraceTesting from "util/TraceTesting.lf" diff --git a/test/known-good/Python/src/modal_models/ModalStateResetAuto.txt b/test/known-good/Python/src/modal_models/ModalStateResetAuto.txt index dbd5fae09..b28606040 100644 --- a/test/known-good/Python/src/modal_models/ModalStateResetAuto.txt +++ b/test/known-good/Python/src/modal_models/ModalStateResetAuto.txt @@ -1,7 +1,7 @@ /** Modal Reactor Test. Tests reset of state variables in modes. */ target Python { - fast: false, - timeout: 4 sec + fast: false, + timeout: 4 sec } import TraceTesting from "util/TraceTesting.lf" diff --git a/test/known-good/Python/src/modal_models/ModalTimers.txt b/test/known-good/Python/src/modal_models/ModalTimers.txt index 5075dc0c5..71cb94dd9 100644 --- a/test/known-good/Python/src/modal_models/ModalTimers.txt +++ b/test/known-good/Python/src/modal_models/ModalTimers.txt @@ -1,7 +1,7 @@ /** Modal Reactor Test. Tests timers, their deactivation and reset in modes. */ target Python { - fast: false, - timeout: 4 sec + fast: false, + timeout: 4 sec } import TraceTesting from "util/TraceTesting.lf" diff --git a/test/known-good/Python/src/modal_models/MultipleOutputFeeder_2Connections.txt b/test/known-good/Python/src/modal_models/MultipleOutputFeeder_2Connections.txt index 2b1cb305c..6d5542001 100644 --- a/test/known-good/Python/src/modal_models/MultipleOutputFeeder_2Connections.txt +++ b/test/known-good/Python/src/modal_models/MultipleOutputFeeder_2Connections.txt @@ -5,8 +5,8 @@ * if they are located in separate modes. */ target Python { - fast: false, - timeout: 2 sec + fast: false, + timeout: 2 sec } import TraceTesting from "util/TraceTesting.lf" diff --git a/test/known-good/Python/src/modal_models/MultipleOutputFeeder_ReactionConnections.txt b/test/known-good/Python/src/modal_models/MultipleOutputFeeder_ReactionConnections.txt index 7415a81a9..43d5e0c56 100644 --- a/test/known-good/Python/src/modal_models/MultipleOutputFeeder_ReactionConnections.txt +++ b/test/known-good/Python/src/modal_models/MultipleOutputFeeder_ReactionConnections.txt @@ -5,8 +5,8 @@ * destination if they are located in separate modes. */ target Python { - fast: false, - timeout: 2 sec + fast: false, + timeout: 2 sec } import TraceTesting from "util/TraceTesting.lf" diff --git a/test/known-good/Python/src/multiport/BankIndexInitializer.txt b/test/known-good/Python/src/multiport/BankIndexInitializer.txt index a113beadc..11bfdb861 100644 --- a/test/known-good/Python/src/multiport/BankIndexInitializer.txt +++ b/test/known-good/Python/src/multiport/BankIndexInitializer.txt @@ -31,7 +31,7 @@ } main reactor(width(4)) { - source = new[width] Source(value = {= table[bank_index] =}) + source = new[width] Source(value = {= table[bank_index] =}) sink = new Sink(width = width) source.out -> sink._in } diff --git a/test/known-good/Python/src/multiport/BankReactionsInContainer.txt b/test/known-good/Python/src/multiport/BankReactionsInContainer.txt index ebba7f931..1ed696e49 100644 --- a/test/known-good/Python/src/multiport/BankReactionsInContainer.txt +++ b/test/known-good/Python/src/multiport/BankReactionsInContainer.txt @@ -2,7 +2,7 @@ * This tests an output that is broadcast back to a multiport input of a bank. */ target Python { - timeout: 1 sec + timeout: 1 sec } reactor R(bank_index(0)) { @@ -36,7 +36,7 @@ } main reactor { - s = new[2] R() + s = new[2] R() state received(false) reaction(startup) -> s.inp {= diff --git a/test/known-good/Python/src/multiport/BankToBank.txt b/test/known-good/Python/src/multiport/BankToBank.txt index 70da94eaf..6eb5a52b7 100644 --- a/test/known-good/Python/src/multiport/BankToBank.txt +++ b/test/known-good/Python/src/multiport/BankToBank.txt @@ -1,7 +1,7 @@ # Check bank of reactors sending to bank of reactors. target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source(bank_index(0)) { @@ -36,8 +36,8 @@ } main reactor BankToBank(width(4)) { - a = new[width] Source() - b = new[width] Destination() + a = new[width] Source() + b = new[width] Destination() a.out -> b._in } diff --git a/test/known-good/Python/src/multiport/BankToBankMultiport.txt b/test/known-good/Python/src/multiport/BankToBankMultiport.txt index e33b9f005..c7a943bee 100644 --- a/test/known-good/Python/src/multiport/BankToBankMultiport.txt +++ b/test/known-good/Python/src/multiport/BankToBankMultiport.txt @@ -1,7 +1,7 @@ # Check bank of reactors sending to bank of reactors with multiports. target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source(width(1)) { @@ -44,8 +44,8 @@ } main reactor BankToBankMultiport(bank_width(4)) { - a = new[bank_width] Source(width = 4) - b = new[bank_width] Destination(width = 4) + a = new[bank_width] Source(width = 4) + b = new[bank_width] Destination(width = 4) a.out -> b._in } diff --git a/test/known-good/Python/src/multiport/BankToBankMultiportAfter.txt b/test/known-good/Python/src/multiport/BankToBankMultiportAfter.txt index efcab2552..330290ac3 100644 --- a/test/known-good/Python/src/multiport/BankToBankMultiportAfter.txt +++ b/test/known-good/Python/src/multiport/BankToBankMultiportAfter.txt @@ -1,14 +1,14 @@ # Check bank of reactors sending to bank of reactors with multiports. target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } import Source, Destination from "BankToBankMultiport.lf" main reactor BankToBankMultiportAfter(bank_width(4)) { - a = new[bank_width] Source(width = 4) - b = new[bank_width] Destination(width = 4) + a = new[bank_width] Source(width = 4) + b = new[bank_width] Destination(width = 4) a.out -> b._in after 200 msec } diff --git a/test/known-good/Python/src/multiport/BankToMultiport.txt b/test/known-good/Python/src/multiport/BankToMultiport.txt index 96766d708..c7780567b 100644 --- a/test/known-good/Python/src/multiport/BankToMultiport.txt +++ b/test/known-good/Python/src/multiport/BankToMultiport.txt @@ -29,7 +29,7 @@ } main reactor BankToMultiport(width(5)) { - source = new[width] Source() + source = new[width] Source() sink = new Sink(width = width) source.out -> sink._in } diff --git a/test/known-good/Python/src/multiport/Broadcast.txt b/test/known-good/Python/src/multiport/Broadcast.txt index 3407a8d90..739eff717 100644 --- a/test/known-good/Python/src/multiport/Broadcast.txt +++ b/test/known-good/Python/src/multiport/Broadcast.txt @@ -1,6 +1,6 @@ target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source(value(42)) { @@ -35,7 +35,7 @@ main reactor { a = new Source() - b = new[4] Destination() + b = new[4] Destination() (a.out)+ -> b._in } diff --git a/test/known-good/Python/src/multiport/BroadcastAfter.txt b/test/known-good/Python/src/multiport/BroadcastAfter.txt index ff4e3e9e1..87ae4018b 100644 --- a/test/known-good/Python/src/multiport/BroadcastAfter.txt +++ b/test/known-good/Python/src/multiport/BroadcastAfter.txt @@ -1,13 +1,13 @@ target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } import Source, Destination from "Broadcast.lf" main reactor { a = new Source() - b = new[4] Destination(delay = 1 sec) + b = new[4] Destination(delay = 1 sec) (a.out)+ -> b._in after 1 sec } diff --git a/test/known-good/Python/src/multiport/BroadcastMultipleAfter.txt b/test/known-good/Python/src/multiport/BroadcastMultipleAfter.txt index 61baacfab..6dc9e0d4c 100644 --- a/test/known-good/Python/src/multiport/BroadcastMultipleAfter.txt +++ b/test/known-good/Python/src/multiport/BroadcastMultipleAfter.txt @@ -1,6 +1,6 @@ target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } import Source from "Broadcast.lf" @@ -34,7 +34,7 @@ a1 = new Source(value = 1) a2 = new Source(value = 2) a3 = new Source(value = 3) - b = new[9] Destination(delay = 1 sec) + b = new[9] Destination(delay = 1 sec) (a1.out, a2.out, a3.out)+ -> b._in after 1 sec } diff --git a/test/known-good/Python/src/multiport/MultiportFromBank.txt b/test/known-good/Python/src/multiport/MultiportFromBank.txt index a01ed4348..55520c323 100644 --- a/test/known-good/Python/src/multiport/MultiportFromBank.txt +++ b/test/known-good/Python/src/multiport/MultiportFromBank.txt @@ -1,8 +1,8 @@ # Check multiport output to bank of recipients. Here, the bank is smaller than # the width of the sending port. target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source(check_override(0), bank_index(0)) { @@ -37,7 +37,7 @@ } main reactor MultiportFromBank { - a = new[3] Source(check_override = 1) + a = new[3] Source(check_override = 1) b = new Destination() a.out -> b._in } diff --git a/test/known-good/Python/src/multiport/MultiportFromBankHierarchy.txt b/test/known-good/Python/src/multiport/MultiportFromBankHierarchy.txt index 7dc962ef5..98963ae6c 100644 --- a/test/known-good/Python/src/multiport/MultiportFromBankHierarchy.txt +++ b/test/known-good/Python/src/multiport/MultiportFromBankHierarchy.txt @@ -1,8 +1,8 @@ # Check multiport output to bank of recipients. Here, the bank is smaller than # the width of the sending port. target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } import Destination from "MultiportFromBank.lf" @@ -15,7 +15,7 @@ reactor Container { output[3] out - s = new[3] Source() + s = new[3] Source() s.out -> out } diff --git a/test/known-good/Python/src/multiport/MultiportFromBankHierarchyAfter.txt b/test/known-good/Python/src/multiport/MultiportFromBankHierarchyAfter.txt index 1ccc4b977..bc052ac32 100644 --- a/test/known-good/Python/src/multiport/MultiportFromBankHierarchyAfter.txt +++ b/test/known-good/Python/src/multiport/MultiportFromBankHierarchyAfter.txt @@ -1,8 +1,8 @@ # Check multiport output to bank of recipients. Here, the bank is smaller than # the width of the sending port. target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } import Container from "MultiportFromBankHierarchy.lf" diff --git a/test/known-good/Python/src/multiport/MultiportFromHierarchy.txt b/test/known-good/Python/src/multiport/MultiportFromHierarchy.txt index 1035f1956..ddfd928c8 100644 --- a/test/known-good/Python/src/multiport/MultiportFromHierarchy.txt +++ b/test/known-good/Python/src/multiport/MultiportFromHierarchy.txt @@ -1,8 +1,8 @@ # Check multiport output to multiport input, where the former is a hierarchical # reactor. target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { diff --git a/test/known-good/Python/src/multiport/MultiportFromReaction.txt b/test/known-good/Python/src/multiport/MultiportFromReaction.txt index 3ba94d277..5a7b01522 100644 --- a/test/known-good/Python/src/multiport/MultiportFromReaction.txt +++ b/test/known-good/Python/src/multiport/MultiportFromReaction.txt @@ -1,7 +1,7 @@ # Check reaction to multiport input of a contained reactor. target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Destination(width(1)) { diff --git a/test/known-good/Python/src/multiport/MultiportIn.txt b/test/known-good/Python/src/multiport/MultiportIn.txt index 60e4dd191..43cf1c3ed 100644 --- a/test/known-good/Python/src/multiport/MultiportIn.txt +++ b/test/known-good/Python/src/multiport/MultiportIn.txt @@ -1,8 +1,8 @@ # This is a version fo the Threaded test that uses a multiport input at the # destination. Its purpose is to test multiport inputs. target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { diff --git a/test/known-good/Python/src/multiport/MultiportInParameterized.txt b/test/known-good/Python/src/multiport/MultiportInParameterized.txt index 7a81e4fea..4be4992e6 100644 --- a/test/known-good/Python/src/multiport/MultiportInParameterized.txt +++ b/test/known-good/Python/src/multiport/MultiportInParameterized.txt @@ -1,8 +1,8 @@ # This is a version of the Threaded test that uses a multiport input at the # destination. Its purpose is to test multiport inputs. target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { diff --git a/test/known-good/Python/src/multiport/MultiportOut.txt b/test/known-good/Python/src/multiport/MultiportOut.txt index 8d27032ee..9d6b5fd89 100644 --- a/test/known-good/Python/src/multiport/MultiportOut.txt +++ b/test/known-good/Python/src/multiport/MultiportOut.txt @@ -1,7 +1,7 @@ # Check multiport capabilities on Outputs. target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { diff --git a/test/known-good/Python/src/multiport/MultiportToBank.txt b/test/known-good/Python/src/multiport/MultiportToBank.txt index e0920d0d1..553997b55 100644 --- a/test/known-good/Python/src/multiport/MultiportToBank.txt +++ b/test/known-good/Python/src/multiport/MultiportToBank.txt @@ -1,7 +1,7 @@ # Check multiport output to bank of recipients. target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { @@ -35,7 +35,7 @@ main reactor MultiportToBank { a = new Source() - b = new[3] Destination() + b = new[3] Destination() a.out -> b._in } diff --git a/test/known-good/Python/src/multiport/MultiportToBankAfter.txt b/test/known-good/Python/src/multiport/MultiportToBankAfter.txt index d1c34f920..db4e6eca8 100644 --- a/test/known-good/Python/src/multiport/MultiportToBankAfter.txt +++ b/test/known-good/Python/src/multiport/MultiportToBankAfter.txt @@ -1,8 +1,8 @@ # Check multiport output to bank of recipients where the width of the bank is # inferred. target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } import Source from "MultiportToBank.lf" @@ -32,7 +32,7 @@ main reactor MultiportToBankAfter { a = new Source() - b = new[3] Destination() + b = new[3] Destination() a.out -> b._in after 1 sec # Width of the bank of delays will be inferred. } diff --git a/test/known-good/Python/src/multiport/MultiportToBankHierarchy.txt b/test/known-good/Python/src/multiport/MultiportToBankHierarchy.txt index a30e1d312..2adc0ed3c 100644 --- a/test/known-good/Python/src/multiport/MultiportToBankHierarchy.txt +++ b/test/known-good/Python/src/multiport/MultiportToBankHierarchy.txt @@ -1,8 +1,8 @@ # Check multiport output to bank of recipients. Here, the bank is smaller than # the width of the sending port. target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } import Source from "MultiportToBank.lf" @@ -29,7 +29,7 @@ reactor Container { input[3] _in - c = new[3] Destination() + c = new[3] Destination() _in -> c._in } diff --git a/test/known-good/Python/src/multiport/MultiportToHierarchy.txt b/test/known-good/Python/src/multiport/MultiportToHierarchy.txt index 7cce85249..ba80d53fa 100644 --- a/test/known-good/Python/src/multiport/MultiportToHierarchy.txt +++ b/test/known-good/Python/src/multiport/MultiportToHierarchy.txt @@ -2,8 +2,8 @@ # reactor. Note that the destination reactor has width wider than the sender, so # one input is dangling. target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { diff --git a/test/known-good/Python/src/multiport/MultiportToMultiport.txt b/test/known-good/Python/src/multiport/MultiportToMultiport.txt index ec5d3cb85..f1d68b880 100644 --- a/test/known-good/Python/src/multiport/MultiportToMultiport.txt +++ b/test/known-good/Python/src/multiport/MultiportToMultiport.txt @@ -1,7 +1,7 @@ # Check multiport output to multiport input. target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } import Destination from "MultiportToHierarchy.lf" diff --git a/test/known-good/Python/src/multiport/MultiportToMultiportArray.txt b/test/known-good/Python/src/multiport/MultiportToMultiportArray.txt index 0f37a6e11..769518436 100644 --- a/test/known-good/Python/src/multiport/MultiportToMultiportArray.txt +++ b/test/known-good/Python/src/multiport/MultiportToMultiportArray.txt @@ -1,8 +1,8 @@ # Check multiport output to multiport input. Destination port is wider than # sending port. target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { diff --git a/test/known-good/Python/src/multiport/MultiportToMultiportParameter.txt b/test/known-good/Python/src/multiport/MultiportToMultiportParameter.txt index 9fb8d0062..ed2e2acdb 100644 --- a/test/known-good/Python/src/multiport/MultiportToMultiportParameter.txt +++ b/test/known-good/Python/src/multiport/MultiportToMultiportParameter.txt @@ -1,7 +1,7 @@ # Check multiport output to multiport input. target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } import Source from "MultiportToMultiport.lf" diff --git a/test/known-good/Python/src/multiport/MultiportToPort.txt b/test/known-good/Python/src/multiport/MultiportToPort.txt index c0febc18c..2268fee10 100644 --- a/test/known-good/Python/src/multiport/MultiportToPort.txt +++ b/test/known-good/Python/src/multiport/MultiportToPort.txt @@ -1,8 +1,8 @@ # Check multiport output to multiport input. Destination port is wider than # sending port. target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { diff --git a/test/known-good/Python/src/multiport/MultiportToReaction.txt b/test/known-good/Python/src/multiport/MultiportToReaction.txt index 2aa5fc872..1192a1409 100644 --- a/test/known-good/Python/src/multiport/MultiportToReaction.txt +++ b/test/known-good/Python/src/multiport/MultiportToReaction.txt @@ -1,7 +1,7 @@ # Check reaction to multiport output of a contained reactor. target Python { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source(width(1)) { diff --git a/test/known-good/Python/src/multiport/NestedBanks.txt b/test/known-good/Python/src/multiport/NestedBanks.txt index 636f52729..f8b208524 100644 --- a/test/known-good/Python/src/multiport/NestedBanks.txt +++ b/test/known-good/Python/src/multiport/NestedBanks.txt @@ -5,8 +5,8 @@ target Python main reactor { - a = new[2] A() - c = new[3] C() + a = new[2] A() + c = new[3] C() d = new D() e = new E() @@ -15,7 +15,7 @@ reactor A(bank_index(0)) { output[4] x - b = new[2] B(a_bank_index = bank_index) + b = new[2] B(a_bank_index = bank_index) b.y -> x } diff --git a/test/known-good/Python/src/multiport/NestedInterleavedBanks.txt b/test/known-good/Python/src/multiport/NestedInterleavedBanks.txt index 4e3c59323..500cf72e4 100644 --- a/test/known-good/Python/src/multiport/NestedInterleavedBanks.txt +++ b/test/known-good/Python/src/multiport/NestedInterleavedBanks.txt @@ -16,7 +16,7 @@ reactor B(bank_index(0)) { output[4] q - a = new[2] A(outer_bank_index = bank_index) + a = new[2] A(outer_bank_index = bank_index) interleaved (a.p) -> q } @@ -34,7 +34,7 @@ } main reactor { - b = new[2] B() + b = new[2] B() c = new C() b.q -> c.i } diff --git a/test/known-good/Python/src/multiport/ReactionsToNested.txt b/test/known-good/Python/src/multiport/ReactionsToNested.txt index a51bae3c8..6fcb9970c 100644 --- a/test/known-good/Python/src/multiport/ReactionsToNested.txt +++ b/test/known-good/Python/src/multiport/ReactionsToNested.txt @@ -1,7 +1,7 @@ # This test connects a simple counting source to tester that checks against its # own count. target Python { - timeout: 1 sec + timeout: 1 sec } reactor T(expected(0)) { diff --git a/test/known-good/Python/src/serialization/PersonProtocolBuffers.txt b/test/known-good/Python/src/serialization/PersonProtocolBuffers.txt index 06736fafd..e8c9d12cc 100644 --- a/test/known-good/Python/src/serialization/PersonProtocolBuffers.txt +++ b/test/known-good/Python/src/serialization/PersonProtocolBuffers.txt @@ -20,7 +20,7 @@ * a Mac, this is typically at /usr/local/bin. */ target Python { - protobufs: Person.proto + protobufs: Person.proto } main reactor { diff --git a/test/known-good/Python/src/serialization/ProtoNoPacking.txt b/test/known-good/Python/src/serialization/ProtoNoPacking.txt index 125bfecdb..820ab703d 100644 --- a/test/known-good/Python/src/serialization/ProtoNoPacking.txt +++ b/test/known-good/Python/src/serialization/ProtoNoPacking.txt @@ -19,7 +19,7 @@ * a Mac, this is typically at /usr/local/bin. */ target Python { - protobufs: ProtoHelloWorld.proto + protobufs: ProtoHelloWorld.proto } reactor SourceProto { diff --git a/test/known-good/Python/src/target/AfterNoTypes.txt b/test/known-good/Python/src/target/AfterNoTypes.txt index 13080efc4..29957a2b1 100644 --- a/test/known-good/Python/src/target/AfterNoTypes.txt +++ b/test/known-good/Python/src/target/AfterNoTypes.txt @@ -1,8 +1,8 @@ # This test demonstrates that after can be used on connections with ports that # have no types. The test passes if the compile is succeeded target Python { - fast: false, - timeout: 3 sec + fast: false, + timeout: 3 sec } reactor Foo { diff --git a/test/known-good/Rust/src/ActionDelay.txt b/test/known-good/Rust/src/ActionDelay.txt index 101efdc4c..0009c7b30 100644 --- a/test/known-good/Rust/src/ActionDelay.txt +++ b/test/known-good/Rust/src/ActionDelay.txt @@ -4,7 +4,7 @@ main reactor ActionDelay { logical action act0 logical action act1(100 msec) - state count: u32(0) + state count: u32(0) reaction(startup) -> act0, act1 {= ctx.schedule(act0, after!(100 ms)); diff --git a/test/known-good/Rust/src/ActionImplicitDelay.txt b/test/known-good/Rust/src/ActionImplicitDelay.txt index da2dabf20..1ee3ad0a6 100644 --- a/test/known-good/Rust/src/ActionImplicitDelay.txt +++ b/test/known-good/Rust/src/ActionImplicitDelay.txt @@ -3,7 +3,7 @@ main reactor ActionImplicitDelay { logical action act(40 msec) - state count: u64(1) + state count: u64(1) reaction(startup) -> act {= ctx.schedule(act, Asap); =} diff --git a/test/known-good/Rust/src/ActionIsPresent.txt b/test/known-good/Rust/src/ActionIsPresent.txt index 20d4fbc4c..b05e6a4bd 100644 --- a/test/known-good/Rust/src/ActionIsPresent.txt +++ b/test/known-good/Rust/src/ActionIsPresent.txt @@ -3,8 +3,8 @@ main reactor ActionIsPresent { logical action a - state success: bool(false) - state tried: bool(false) + state success: bool(false) + state tried: bool(false) reaction(startup, a) -> a {= if !ctx.is_present(a) { diff --git a/test/known-good/Rust/src/ActionScheduleMicrostep.txt b/test/known-good/Rust/src/ActionScheduleMicrostep.txt index aa57b8633..a6d3ba7c1 100644 --- a/test/known-good/Rust/src/ActionScheduleMicrostep.txt +++ b/test/known-good/Rust/src/ActionScheduleMicrostep.txt @@ -3,7 +3,7 @@ main reactor ActionScheduleMicrostep { logical action act - state count: u32(1) + state count: u32(1) reaction(startup) -> act {= assert_tag_is!(ctx, T0); diff --git a/test/known-good/Rust/src/ActionValues.txt b/test/known-good/Rust/src/ActionValues.txt index ad97614a0..b051ae3dd 100644 --- a/test/known-good/Rust/src/ActionValues.txt +++ b/test/known-good/Rust/src/ActionValues.txt @@ -2,9 +2,9 @@ target Rust main reactor ActionValues { - state r1done: bool(false) - state r2done: bool(false) - logical action act(100 msec): i32 + state r1done: bool(false) + state r2done: bool(false) + logical action act(100 msec): i32 reaction(startup) -> act {= ctx.schedule_with_v(act, Some(100), Asap); // scheduled in 100 ms diff --git a/test/known-good/Rust/src/ActionValuesCleanup.txt b/test/known-good/Rust/src/ActionValuesCleanup.txt index 7bae84953..16305b817 100644 --- a/test/known-good/Rust/src/ActionValuesCleanup.txt +++ b/test/known-good/Rust/src/ActionValuesCleanup.txt @@ -6,7 +6,7 @@ use std::sync::atomic::AtomicBool; use std::sync::atomic::Ordering; // set to true when destructor is called - static mut DROPPED: AtomicBool = AtomicBool::new(false); + static mut DROPPED: AtomicBool = AtomicBool::new(false); #[derive(Clone, Debug)] struct FooDrop { } @@ -19,8 +19,8 @@ } =} - logical action act: FooDrop - state count: u32(0) + logical action act: FooDrop + state count: u32(0) reaction(startup) -> act {= ctx.schedule_with_v(act, Some(FooDrop { }), Asap) diff --git a/test/known-good/Rust/src/CompositionWithPorts.txt b/test/known-good/Rust/src/CompositionWithPorts.txt index a4f729d6e..9bcdd4bfb 100644 --- a/test/known-good/Rust/src/CompositionWithPorts.txt +++ b/test/known-good/Rust/src/CompositionWithPorts.txt @@ -1,13 +1,13 @@ target Rust reactor Source { - output out: i32 + output out: i32 reaction(startup) -> out {= ctx.set(out, 76600) =} } reactor Sink { - input inport: i32 + input inport: i32 reaction(inport) {= if let Some(value) = ctx.get(inport) { diff --git a/test/known-good/Rust/src/CtorParamDefault.txt b/test/known-good/Rust/src/CtorParamDefault.txt index a03a566fb..ec106fbe6 100644 --- a/test/known-good/Rust/src/CtorParamDefault.txt +++ b/test/known-good/Rust/src/CtorParamDefault.txt @@ -1,7 +1,7 @@ target Rust -reactor Print(value: i32(42)) { - state v: i32(value) +reactor Print(value: i32(42)) { + state v: i32(value) reaction(startup) {= assert_eq!(42, self.v); diff --git a/test/known-good/Rust/src/CtorParamMixed.txt b/test/known-good/Rust/src/CtorParamMixed.txt index 7e99c11be..a4e0eaa80 100644 --- a/test/known-good/Rust/src/CtorParamMixed.txt +++ b/test/known-good/Rust/src/CtorParamMixed.txt @@ -1,9 +1,9 @@ target Rust reactor Print( - value: i32(42), - name: String({= "xxx".into() =}), - other: bool(false) + value: i32(42), + name: String({= "xxx".into() =}), + other: bool(false) ) { state value(value) state name(name) diff --git a/test/known-good/Rust/src/CtorParamSimple.txt b/test/known-good/Rust/src/CtorParamSimple.txt index 174d55ece..594b46a8b 100644 --- a/test/known-good/Rust/src/CtorParamSimple.txt +++ b/test/known-good/Rust/src/CtorParamSimple.txt @@ -1,7 +1,7 @@ target Rust -reactor Print(value: i32(42)) { - state v: i32(value) +reactor Print(value: i32(42)) { + state v: i32(value) reaction(startup) {= assert_eq!(self.v, 23); diff --git a/test/known-good/Rust/src/DependencyOnChildPort.txt b/test/known-good/Rust/src/DependencyOnChildPort.txt index f46ede6d9..07c3462fc 100644 --- a/test/known-good/Rust/src/DependencyOnChildPort.txt +++ b/test/known-good/Rust/src/DependencyOnChildPort.txt @@ -2,14 +2,14 @@ target Rust reactor Box { - input inp: u32 - output out: u32 + input inp: u32 + output out: u32 inp -> out } main reactor { - state done: bool(false) + state done: bool(false) box0 = new Box() box1 = new Box() diff --git a/test/known-good/Rust/src/DependencyThroughChildPort.txt b/test/known-good/Rust/src/DependencyThroughChildPort.txt index 6c23afef9..ad2ad831a 100644 --- a/test/known-good/Rust/src/DependencyThroughChildPort.txt +++ b/test/known-good/Rust/src/DependencyThroughChildPort.txt @@ -1,10 +1,10 @@ target Rust reactor Destination { - input x: u32 - input y: u32 + input x: u32 + input y: u32 - state exec_count: u32 + state exec_count: u32 reaction(x, y) {= let tag = ctx.get_tag(); diff --git a/test/known-good/Rust/src/DependencyUseAccessible.txt b/test/known-good/Rust/src/DependencyUseAccessible.txt index 0ca013cd2..f01056566 100644 --- a/test/known-good/Rust/src/DependencyUseAccessible.txt +++ b/test/known-good/Rust/src/DependencyUseAccessible.txt @@ -2,9 +2,9 @@ target Rust reactor Source { - output clock: u32 - output o1: u32 - output o2: u32 + output clock: u32 + output o1: u32 + output o2: u32 timer t1(35 msec) timer t2(70 msec) @@ -17,9 +17,9 @@ } reactor Sink { - input clock: u32 - input in1: u32 - input in2: u32 + input clock: u32 + input in1: u32 + input in2: u32 reaction(clock) in1, in2 {= match ctx.get(clock) { diff --git a/test/known-good/Rust/src/DependencyUseNonTrigger.txt b/test/known-good/Rust/src/DependencyUseNonTrigger.txt index 3f3838122..349e7c1a4 100644 --- a/test/known-good/Rust/src/DependencyUseNonTrigger.txt +++ b/test/known-good/Rust/src/DependencyUseNonTrigger.txt @@ -2,14 +2,14 @@ target Rust reactor Source { - output clock: u32 + output clock: u32 reaction(startup) -> clock {= ctx.set(clock, 0); =} } reactor Sink { - input clock: u32 - input bogus: u32 + input clock: u32 + input bogus: u32 reaction(bogus) clock {= panic!("Should not be executed") =} diff --git a/test/known-good/Rust/src/DependencyUseOnLogicalAction.txt b/test/known-good/Rust/src/DependencyUseOnLogicalAction.txt index 0311a09bc..49b7bc996 100644 --- a/test/known-good/Rust/src/DependencyUseOnLogicalAction.txt +++ b/test/known-good/Rust/src/DependencyUseOnLogicalAction.txt @@ -1,16 +1,16 @@ /** Test that use-dependencies may be declared on logical actions and timers. */ target Rust { - timeout: 10 msec + timeout: 10 msec } main reactor { - logical action clock: u32 + logical action clock: u32 logical action a timer t(0, 2 msec) - state tick: u32(0) + state tick: u32(0) reaction(startup) -> clock, a {= ctx.schedule(a, after!(3 ms)); // out of order on purpose diff --git a/test/known-good/Rust/src/FloatLiteral.txt b/test/known-good/Rust/src/FloatLiteral.txt index 94d7e2d8e..c60a6057f 100644 --- a/test/known-good/Rust/src/FloatLiteral.txt +++ b/test/known-good/Rust/src/FloatLiteral.txt @@ -2,10 +2,10 @@ // This test verifies that floating-point literals are handled correctly. main reactor { - state N: f64(6.0221409e+23) - state charge: f64(-1.6021766E-19) - state minus_epsilon: f64(-.01e0) - state expected: f64(.964853323188E5) + state N: f64(6.0221409e+23) + state charge: f64(-1.6021766E-19) + state minus_epsilon: f64(-.01e0) + state expected: f64(.964853323188E5) reaction(startup) {= let F = - self.N * self.charge; diff --git a/test/known-good/Rust/src/MainReactorParam.txt b/test/known-good/Rust/src/MainReactorParam.txt index ee1e80f6e..20df3007c 100644 --- a/test/known-good/Rust/src/MainReactorParam.txt +++ b/test/known-good/Rust/src/MainReactorParam.txt @@ -1,6 +1,6 @@ target Rust -main reactor(one: u64(1152921504606846976), two: u64({= 1 << 60 =})) { +main reactor(one: u64(1152921504606846976), two: u64({= 1 << 60 =})) { state one(one) state two(two) diff --git a/test/known-good/Rust/src/MovingAverage.txt b/test/known-good/Rust/src/MovingAverage.txt index c93ef9fa5..3e01e3067 100644 --- a/test/known-good/Rust/src/MovingAverage.txt +++ b/test/known-good/Rust/src/MovingAverage.txt @@ -2,12 +2,12 @@ // MovingAverage reactor computes the moving average of the last four inputs and // produces that as output. The source is a counting sequence. target Rust { - timeout: 50 msec + timeout: 50 msec } reactor Source { - output out: f64 - state count: u32(0) + output out: f64 + state count: u32(0) timer clock(0, 10 msec) reaction(clock) -> out {= @@ -18,10 +18,10 @@ reactor MovingAverageImpl { // fixme inaccessible ({=[0.0 ; 4]=}); - state delay_line: f64[4](0.0, 0.0, 0.0, 0.0) - state index: usize(0) - input in_: f64 - output out: f64 + state delay_line: f64[4](0.0, 0.0, 0.0, 0.0) + state index: usize(0) + input in_: f64 + output out: f64 reaction(in_) -> out {= let in_ = ctx.get(in_).unwrap(); @@ -32,14 +32,14 @@ self.index = (self.index + 1) % 4; // Calculate the output. - let sum: f64 = self.delay_line.iter().sum(); + let sum: f64 = self.delay_line.iter().sum(); ctx.set(out, sum / 4.0); =} } reactor Print { - input in_: f64 - state count: usize(0) + input in_: f64 + state count: usize(0) preamble {= const EXPECTED: [ f64 ; 6 ] = [0.0, 0.25, 0.75, 1.5, 2.5, 3.5]; diff --git a/test/known-good/Rust/src/NativeListsAndTimes.txt b/test/known-good/Rust/src/NativeListsAndTimes.txt index 594e1adc2..fffef6f83 100644 --- a/test/known-good/Rust/src/NativeListsAndTimes.txt +++ b/test/known-good/Rust/src/NativeListsAndTimes.txt @@ -2,20 +2,20 @@ // This test passes if it is successfully compiled into valid target code. reactor Foo( - x: i32(0), - y: time(0), // Units are missing but not required + x: i32(0), + y: time(0), // Units are missing but not required z(1 msec), // Type is missing but not required - p: i32[](1, 2, 3, 4), // List of integers - p2: i32[]({= vec![1] =}), // List of integers with single element + p: i32[](1, 2, 3, 4), // List of integers + p2: i32[]({= vec![1] =}), // List of integers with single element // todo // p2: i32[](1), // List of integers with single element p3: // i32[](), // Empty list of integers List of time values - q: Vec(1 msec, 2 msec, 3 msec), - g: time[](1 msec, 2 msec) // List of time values + q: Vec(1 msec, 2 msec, 3 msec), + g: time[](1 msec, 2 msec) // List of time values ) { - state s: time(y) // Reference to explicitly typed time parameter - state t: time(z) // Reference to implicitly typed time parameter - state v: bool // Uninitialized boolean state variable - state w: time // Uninitialized time state variable + state s: time(y) // Reference to explicitly typed time parameter + state t: time(z) // Reference to implicitly typed time parameter + state v: bool // Uninitialized boolean state variable + state w: time // Uninitialized time state variable timer tick(0) // Units missing but not required timer tock(1 sec) // Implicit type time timer toe(z) // Implicit type time @@ -30,7 +30,7 @@ // state baz(p); // Implicit type i32[] fixme this interplays badly with // syntax for array init Implicit type time state period(z) - state times: Vec= Duration =}>>(q, g) // a list of lists + state times: Vec= Duration =}>>(q, g) // a list of lists /** * reactor Foo (p: i32[](1, 2)) { state baz(p); // Implicit type i32[] state diff --git a/test/known-good/Rust/src/PhysicalActionCanBeScheduledSynchronously.txt b/test/known-good/Rust/src/PhysicalActionCanBeScheduledSynchronously.txt index a60dd3419..c613904ed 100644 --- a/test/known-good/Rust/src/PhysicalActionCanBeScheduledSynchronously.txt +++ b/test/known-good/Rust/src/PhysicalActionCanBeScheduledSynchronously.txt @@ -3,9 +3,9 @@ target Rust main reactor { - physical action act: u32 + physical action act: u32 - state count: u32 + state count: u32 reaction(startup) -> act {= ctx.schedule(act, Asap); diff --git a/test/known-good/Rust/src/PhysicalActionKeepaliveIsSmart.txt b/test/known-good/Rust/src/PhysicalActionKeepaliveIsSmart.txt index cbbded062..2cd8577cf 100644 --- a/test/known-good/Rust/src/PhysicalActionKeepaliveIsSmart.txt +++ b/test/known-good/Rust/src/PhysicalActionKeepaliveIsSmart.txt @@ -1,11 +1,11 @@ // Tests that the scheduler ends up shutting down if there are no live Sender // that can send messages back to the scheduler. target Rust { - keepalive: true + keepalive: true } main reactor { - physical action act: u32 + physical action act: u32 reaction(startup) -> act {= std::thread::spawn(|| { diff --git a/test/known-good/Rust/src/PhysicalActionWakesSleepingScheduler.txt b/test/known-good/Rust/src/PhysicalActionWakesSleepingScheduler.txt index dfd1b2f40..6813b3232 100644 --- a/test/known-good/Rust/src/PhysicalActionWakesSleepingScheduler.txt +++ b/test/known-good/Rust/src/PhysicalActionWakesSleepingScheduler.txt @@ -10,7 +10,7 @@ main reactor { timer t(250 msec) // this is unused but important - physical action act: u32 + physical action act: u32 reaction(startup) -> act {= let act = act.clone(); diff --git a/test/known-good/Rust/src/PhysicalActionWithKeepalive.txt b/test/known-good/Rust/src/PhysicalActionWithKeepalive.txt index 4f0d5cba0..fce480b99 100644 --- a/test/known-good/Rust/src/PhysicalActionWithKeepalive.txt +++ b/test/known-good/Rust/src/PhysicalActionWithKeepalive.txt @@ -1,9 +1,9 @@ target Rust { - keepalive: true + keepalive: true } main reactor { - physical action act: u32 + physical action act: u32 reaction(startup) -> act {= let act = act.clone(); diff --git a/test/known-good/Rust/src/PortConnectionInSelfInChild.txt b/test/known-good/Rust/src/PortConnectionInSelfInChild.txt index 9fecd8800..644fb6843 100644 --- a/test/known-good/Rust/src/PortConnectionInSelfInChild.txt +++ b/test/known-good/Rust/src/PortConnectionInSelfInChild.txt @@ -2,8 +2,8 @@ target Rust reactor Child { - input inp: i32 - state done: bool(false) + input inp: i32 + state done: bool(false) reaction(inp) {= assert_eq!(ctx.get(inp), Some(76600)); @@ -17,7 +17,7 @@ } reactor Parent { - input inp: i32 + input inp: i32 child = new Child() inp -> child.inp } diff --git a/test/known-good/Rust/src/PortConnectionInSelfOutSelf.txt b/test/known-good/Rust/src/PortConnectionInSelfOutSelf.txt index ffd4f92e6..7666e8d9d 100644 --- a/test/known-good/Rust/src/PortConnectionInSelfOutSelf.txt +++ b/test/known-good/Rust/src/PortConnectionInSelfOutSelf.txt @@ -2,7 +2,7 @@ target Rust reactor Source { - output out: i32 + output out: i32 reaction(startup) -> out {= ctx.set(out, 76600); @@ -11,14 +11,14 @@ } reactor TestCase { - input inp: i32 - output out: i32 + input inp: i32 + output out: i32 inp -> out } reactor Sink { - input inp: i32 - state done: bool(false) + input inp: i32 + state done: bool(false) reaction(inp) {= assert_eq!(ctx.get(inp), Some(76600)); diff --git a/test/known-good/Rust/src/PortConnectionOutChildOutSelf.txt b/test/known-good/Rust/src/PortConnectionOutChildOutSelf.txt index ea3c85bd0..4a4e0a19c 100644 --- a/test/known-good/Rust/src/PortConnectionOutChildOutSelf.txt +++ b/test/known-good/Rust/src/PortConnectionOutChildOutSelf.txt @@ -2,7 +2,7 @@ target Rust reactor Child { - output out: i32 + output out: i32 reaction(startup) -> out {= ctx.set(out, 76600); @@ -11,15 +11,15 @@ } reactor Parent { - output out: i32 + output out: i32 child = new Child() child.out -> out } reactor Sink { - input inp: i32 - state done: bool(false) + input inp: i32 + state done: bool(false) reaction(inp) {= assert_eq!(ctx.get(inp), Some(76600)); @@ -33,7 +33,7 @@ main reactor { parent = new Parent() - state done: bool(false) + state done: bool(false) reaction(parent.out) {= assert_eq!(ctx.get(parent__out), Some(76600)); diff --git a/test/known-good/Rust/src/PortRefCleanup.txt b/test/known-good/Rust/src/PortRefCleanup.txt index e40503582..c51b2ef00 100644 --- a/test/known-good/Rust/src/PortRefCleanup.txt +++ b/test/known-good/Rust/src/PortRefCleanup.txt @@ -2,8 +2,8 @@ target Rust reactor Box { - input inp: u32 - output out: u32 + input inp: u32 + output out: u32 inp -> out } @@ -14,8 +14,8 @@ timer t1(0) timer t2(15 msec) - state reaction_num: u32(0) - state done: bool(false) + state reaction_num: u32(0) + state done: bool(false) reaction(t1) -> boxr.inp {= ctx.set(boxr__inp, 150); diff --git a/test/known-good/Rust/src/PortValueCleanup.txt b/test/known-good/Rust/src/PortValueCleanup.txt index 99b62c84a..6e4148363 100644 --- a/test/known-good/Rust/src/PortValueCleanup.txt +++ b/test/known-good/Rust/src/PortValueCleanup.txt @@ -2,7 +2,7 @@ target Rust reactor Source { - output out: u32 + output out: u32 reaction(startup) -> out {= ctx.set(out, 150); =} } @@ -10,9 +10,9 @@ reactor Sink { timer t2(15 msec) - input in: u32 - state reaction_num: u32(0) - state done: bool(false) + input in: u32 + state reaction_num: u32(0) + state done: bool(false) reaction(in, t2) {= if self.reaction_num == 0 { diff --git a/test/known-good/Rust/src/Preamble.txt b/test/known-good/Rust/src/Preamble.txt index 9cabace8b..976064cf9 100644 --- a/test/known-good/Rust/src/Preamble.txt +++ b/test/known-good/Rust/src/Preamble.txt @@ -2,7 +2,7 @@ main reactor Preamble { preamble {= - fn add_42(i: i32) -> i32 { + fn add_42(i: i32) -> i32 { return i + 42; } =} diff --git a/test/known-good/Rust/src/ReservedKeywords.txt b/test/known-good/Rust/src/ReservedKeywords.txt index fc5504a43..1b1446415 100644 --- a/test/known-good/Rust/src/ReservedKeywords.txt +++ b/test/known-good/Rust/src/ReservedKeywords.txt @@ -3,19 +3,19 @@ target Rust reactor box { - input in: u32 - output struct: u32 + input in: u32 + output struct: u32 in -> struct - state foo: bool(true) // not escaped + state foo: bool(true) // not escaped reaction(in) {= ctx.get(r#in); =} } -main reactor ReservedKeywords(struct: u32(0)) { +main reactor ReservedKeywords(struct: u32(0)) { box = new box() timer t1(0) diff --git a/test/known-good/Rust/src/SingleFileGeneration.txt b/test/known-good/Rust/src/SingleFileGeneration.txt index ec4b249bd..75e32c0f1 100644 --- a/test/known-good/Rust/src/SingleFileGeneration.txt +++ b/test/known-good/Rust/src/SingleFileGeneration.txt @@ -1,16 +1,16 @@ // The same as CompositionWithPorts.lf, but as a single file project target Rust { - single-file-project: true + single-file-project: true } reactor Source { - output out: i32 + output out: i32 reaction(startup) -> out {= ctx.set(out, 76600) =} } reactor Sink { - input inport: i32 + input inport: i32 reaction(inport) {= if let Some(value) = ctx.get(inport) { diff --git a/test/known-good/Rust/src/StateDefaultValue.txt b/test/known-good/Rust/src/StateDefaultValue.txt index 22a158ad9..d91084649 100644 --- a/test/known-good/Rust/src/StateDefaultValue.txt +++ b/test/known-good/Rust/src/StateDefaultValue.txt @@ -2,9 +2,9 @@ main reactor { // missing initializers are taken to mean "initialize to Default::default()" - state foo_default: u32 - state vec_default: Vec - state option: Option> + state foo_default: u32 + state vec_default: Vec + state option: Option> reaction(startup) {= assert_eq!(self.foo_default, 0); diff --git a/test/known-good/Rust/src/StateInitializerVisibility.txt b/test/known-good/Rust/src/StateInitializerVisibility.txt index e202fae70..c13382a14 100644 --- a/test/known-good/Rust/src/StateInitializerVisibility.txt +++ b/test/known-good/Rust/src/StateInitializerVisibility.txt @@ -3,8 +3,8 @@ target Rust main reactor { - state foo: u32(123) - state x: u32({= *&foo =}) + state foo: u32(123) + state x: u32({= *&foo =}) reaction(startup) {= assert_eq!(self.x, self.foo); diff --git a/test/known-good/Rust/src/Stop.txt b/test/known-good/Rust/src/Stop.txt index 4dedddbf4..bd027d997 100644 --- a/test/known-good/Rust/src/Stop.txt +++ b/test/known-good/Rust/src/Stop.txt @@ -4,7 +4,7 @@ * @author Soroush Bateni */ target Rust { - timeout: 11 msec + timeout: 11 msec } /** @@ -13,10 +13,10 @@ * @param break_interval: Determines how long the reactor should take a break * after sending take_a_break_after messages. */ -reactor Sender(take_a_break_after: u32(10), break_interval: time(400 msec)) { - output out: u32 +reactor Sender(take_a_break_after: u32(10), break_interval: time(400 msec)) { + output out: u32 logical action act - state sent_messages: u32(0) + state sent_messages: u32(0) state take_a_break_after(take_a_break_after) state break_interval(break_interval) @@ -39,8 +39,8 @@ } reactor Consumer { - input in_: u32 - state reaction_invoked_correctly: bool(false) + input in_: u32 + state reaction_invoked_correctly: bool(false) reaction(in_) {= let current_tag = ctx.get_tag(); diff --git a/test/known-good/Rust/src/StopCleanup.txt b/test/known-good/Rust/src/StopCleanup.txt index 554babe4f..d1c8e685e 100644 --- a/test/known-good/Rust/src/StopCleanup.txt +++ b/test/known-good/Rust/src/StopCleanup.txt @@ -2,7 +2,7 @@ target Rust reactor Sender { - output out: u32 + output out: u32 reaction(startup) -> out {= assert_tag_is!(ctx, (T0, 0)); @@ -12,7 +12,7 @@ } reactor Consumer { - input in_: u32 + input in_: u32 reaction(shutdown) in_ {= assert!(ctx.get(in_).is_none(), "Port should have been cleaned up before shutdown"); diff --git a/test/known-good/Rust/src/StopDuringStartup.txt b/test/known-good/Rust/src/StopDuringStartup.txt index 8a601c9b5..817633690 100644 --- a/test/known-good/Rust/src/StopDuringStartup.txt +++ b/test/known-good/Rust/src/StopDuringStartup.txt @@ -1,6 +1,6 @@ // tests that a request_stop called during startup is acted upon. target Rust { - timeout: 30 msec + timeout: 30 msec } main reactor { diff --git a/test/known-good/Rust/src/StopIdempotence.txt b/test/known-good/Rust/src/StopIdempotence.txt index 3f76cd149..8a62be2b4 100644 --- a/test/known-good/Rust/src/StopIdempotence.txt +++ b/test/known-good/Rust/src/StopIdempotence.txt @@ -1,10 +1,10 @@ /** Tests that ports are cleaned up before the shutdown wave executes. */ target Rust { - timeout: 30 msec + timeout: 30 msec } main reactor StopIdempotence { - state count: u32(0) + state count: u32(0) reaction(startup) {= ctx.request_stop(Asap); // requested for (T0, 1) diff --git a/test/known-good/Rust/src/StopTimeout.txt b/test/known-good/Rust/src/StopTimeout.txt index 8a52ee86e..4cd504207 100644 --- a/test/known-good/Rust/src/StopTimeout.txt +++ b/test/known-good/Rust/src/StopTimeout.txt @@ -3,7 +3,7 @@ * timeout target property. */ target Rust { - timeout: 30 msec + timeout: 30 msec } main reactor StopTimeout { diff --git a/test/known-good/Rust/src/StopTimeoutExact.txt b/test/known-good/Rust/src/StopTimeoutExact.txt index 6f0042440..f9ef48023 100644 --- a/test/known-good/Rust/src/StopTimeoutExact.txt +++ b/test/known-good/Rust/src/StopTimeoutExact.txt @@ -3,13 +3,13 @@ * reactions are properly executed (in addition to the shutdown ones). */ target Rust { - timeout: 50 msec + timeout: 50 msec } main reactor StopTimeoutExact { timer t(0, 10 msec) // the fifth triggering will coincide with the timeout - state reacted_on_shutdown: bool(false) + state reacted_on_shutdown: bool(false) reaction(t) {= if ctx.get_tag() == tag!(T0 + 50 ms) { diff --git a/test/known-good/Rust/src/StopTopology.txt b/test/known-good/Rust/src/StopTopology.txt index 56e204324..3380b69df 100644 --- a/test/known-good/Rust/src/StopTopology.txt +++ b/test/known-good/Rust/src/StopTopology.txt @@ -1,11 +1,11 @@ /** Tests that shutdown wave occurs in topological order like a normal wave. */ target Rust { - timeout: 30 msec + timeout: 30 msec } main reactor StopTopology { timer end(30 msec) // collides with timeout - state count: u32 + state count: u32 reaction(end) {= assert_eq!(self.count, 0); diff --git a/test/known-good/Rust/src/StructAsState.txt b/test/known-good/Rust/src/StructAsState.txt index 4220fe09d..275de4cb4 100644 --- a/test/known-good/Rust/src/StructAsState.txt +++ b/test/known-good/Rust/src/StructAsState.txt @@ -5,8 +5,8 @@ main reactor StructAsState { preamble {= struct Hello { - name: String, - value: i32, + name: String, + value: i32, } =} /** @@ -15,7 +15,7 @@ * - state s: Hello(name: "Earth".into(), value: 42); * - state s: Hello { name: "Earth".into(), value: 42 }; */ - state s: Hello({= Hello { name: "Earth".into(), value: 42 } =}) + state s: Hello({= Hello { name: "Earth".into(), value: 42 } =}) reaction(startup) {= println!("State s.name=\"{}\", s.value={}.", self.s.name, self.s.value); diff --git a/test/known-good/Rust/src/StructAsType.txt b/test/known-good/Rust/src/StructAsType.txt index 0961719fe..565992940 100644 --- a/test/known-good/Rust/src/StructAsType.txt +++ b/test/known-good/Rust/src/StructAsType.txt @@ -2,25 +2,25 @@ target Rust reactor Source { - output out: Hello + output out: Hello preamble {= pub struct Hello { - pub name: String, - pub value: i32, + pub name: String, + pub value: i32, } =} reaction(startup) -> out {= // Create the struct on the stack and then copy // it to the output - ctx.set(out, Hello { name: "Earth".into(), value: 42 }) + ctx.set(out, Hello { name: "Earth".into(), value: 42 }) =} } -reactor Print(expected: i32(42)) { // expected parameter is for testing. - input inp: {= super::source::Hello =} - state expected: i32(expected) +reactor Print(expected: i32(42)) { // expected parameter is for testing. + input inp: {= super::source::Hello =} + state expected: i32(expected) reaction(inp) {= ctx.use_ref_opt(inp, |hello| { diff --git a/test/known-good/Rust/src/TimeState.txt b/test/known-good/Rust/src/TimeState.txt index 5e54b08c4..11971081b 100644 --- a/test/known-good/Rust/src/TimeState.txt +++ b/test/known-good/Rust/src/TimeState.txt @@ -1,7 +1,7 @@ target Rust reactor Foo { - state baz: time(500 msec) + state baz: time(500 msec) reaction(startup) {= assert_eq!(500, self.baz.as_millis()); =} } diff --git a/test/known-good/Rust/src/TimerDefaults.txt b/test/known-good/Rust/src/TimerDefaults.txt index a25e1bb04..f16f5b23c 100644 --- a/test/known-good/Rust/src/TimerDefaults.txt +++ b/test/known-good/Rust/src/TimerDefaults.txt @@ -1,7 +1,7 @@ target Rust main reactor TimerDefaults { - state i: i32(0) + state i: i32(0) timer t reaction(t) {= diff --git a/test/known-good/Rust/src/TimerIsPresent.txt b/test/known-good/Rust/src/TimerIsPresent.txt index 0f66315ce..7575c1411 100644 --- a/test/known-good/Rust/src/TimerIsPresent.txt +++ b/test/known-good/Rust/src/TimerIsPresent.txt @@ -1,6 +1,6 @@ // Tests the is_present function for timers. target Rust { - timeout: 7 msec + timeout: 7 msec } main reactor { @@ -8,8 +8,8 @@ timer b(1 msec, 5 msec) timer c(1 msec) - state success: bool(false) - state tick: u32(0) + state success: bool(false) + state tick: u32(0) reaction(startup, a, b, c) {= match self.tick { diff --git a/test/known-good/Rust/src/TimerPeriodic.txt b/test/known-good/Rust/src/TimerPeriodic.txt index 28e82158d..2f779120b 100644 --- a/test/known-good/Rust/src/TimerPeriodic.txt +++ b/test/known-good/Rust/src/TimerPeriodic.txt @@ -1,9 +1,9 @@ target Rust { - timeout: 15 msec // fast: true + timeout: 15 msec // fast: true } main reactor TimerPeriodic { - state i: i32(0) + state i: i32(0) timer t2(0, 3 msec) reaction(t2) {= diff --git a/test/known-good/Rust/src/Timers.txt b/test/known-good/Rust/src/Timers.txt index a9496e37c..089df2a17 100644 --- a/test/known-good/Rust/src/Timers.txt +++ b/test/known-good/Rust/src/Timers.txt @@ -1,12 +1,12 @@ /** Test whether timers with different periods are triggered correctly. */ target Rust { - timeout: 2 sec + timeout: 2 sec } main reactor Timers { timer t(0, 1 sec) timer t2(0, 2 sec) - state counter: i32(0) + state counter: i32(0) reaction(t2) {= self.counter += 2; =} diff --git a/test/known-good/Rust/src/TypeVarLengthList.txt b/test/known-good/Rust/src/TypeVarLengthList.txt index b6fcda019..0820e6319 100644 --- a/test/known-good/Rust/src/TypeVarLengthList.txt +++ b/test/known-good/Rust/src/TypeVarLengthList.txt @@ -3,7 +3,7 @@ // this thing must compile needs to be modified when // https://github.com/lf-lang/lingua-franca/discussions/492 is implemented main reactor TypeVarLengthList { - state l0: i32[]({= Vec::new() =}) // generates l0: Vec::new() + state l0: i32[]({= Vec::new() =}) // generates l0: Vec::new() // generates l1: vec![1, 2] /** * - state l2: i32[](1); // generates l2: 1 // doesn't compile... @@ -11,6 +11,6 @@ * * - state l1: Vec(1, 2); // does not compile... */ - state l1: i32[](1, 2) + state l1: i32[](1, 2) } diff --git a/test/known-good/Rust/src/concurrent/AsyncCallback.txt b/test/known-good/Rust/src/concurrent/AsyncCallback.txt index d46f588ac..71ba21990 100644 --- a/test/known-good/Rust/src/concurrent/AsyncCallback.txt +++ b/test/known-good/Rust/src/concurrent/AsyncCallback.txt @@ -1,20 +1,20 @@ // Test asynchronous callbacks that trigger a physical action. target Rust { - timeout: 1000 ms, - cargo-features: ["cli"] + timeout: 1000 ms, + cargo-features: ["cli"] } -main reactor AsyncCallback(period: time(10 msec)) { +main reactor AsyncCallback(period: time(10 msec)) { preamble {= use std::thread; =} timer t(0, period) - state thread: Option<thread::JoinHandle> - state expected_time: time(period) - state period: time(period) - state toggle: bool(false) + state thread: Option<thread::JoinHandle> + state expected_time: time(period) + state period: time(period) + state toggle: bool(false) physical action act - state i: u32(0) + state i: u32(0) reaction(t) -> act {= let act = act.clone(); diff --git a/test/known-good/Rust/src/concurrent/Workers.txt b/test/known-good/Rust/src/concurrent/Workers.txt index 76e2ca7ee..280006e3b 100644 --- a/test/known-good/Rust/src/concurrent/Workers.txt +++ b/test/known-good/Rust/src/concurrent/Workers.txt @@ -1,5 +1,5 @@ target Rust { - workers: 16 + workers: 16 } main reactor { diff --git a/test/known-good/Rust/src/generics/CtorParamGeneric.txt b/test/known-good/Rust/src/generics/CtorParamGeneric.txt index cbe0d3d9c..496621a89 100644 --- a/test/known-good/Rust/src/generics/CtorParamGeneric.txt +++ b/test/known-good/Rust/src/generics/CtorParamGeneric.txt @@ -1,11 +1,11 @@ // tests that ctor parameters may refer to type parameters. target Rust -reactor Generic<{= T: Default + Eq + Sync + std::fmt::Debug =}>( - value: T({= Default::default() =}) +reactor Generic<{= T: Default + Eq + Sync + std::fmt::Debug =}>( + value: T({= Default::default() =}) ) { - input in: T - state v: T(value) + input in: T + state v: T(value) reaction(in) {= ctx.use_ref_opt(r#in, |i| { diff --git a/test/known-good/Rust/src/generics/CtorParamGenericInst.txt b/test/known-good/Rust/src/generics/CtorParamGenericInst.txt index 9660f7404..d36dfd838 100644 --- a/test/known-good/Rust/src/generics/CtorParamGenericInst.txt +++ b/test/known-good/Rust/src/generics/CtorParamGenericInst.txt @@ -3,12 +3,12 @@ target Rust reactor Generic2< - {= T: Default + Eq + Sync + std::fmt::Debug + Send + 'static =} + {= T: Default + Eq + Sync + std::fmt::Debug + Send + 'static =} >( - value: T({= Default::default() =}) + value: T({= Default::default() =}) ) { - input in: T - state v: T(value) + input in: T + state v: T(value) reaction(in) {= ctx.use_ref_opt(r#in, |i| { @@ -19,11 +19,11 @@ } reactor Generic< - {= T: Default + Eq + Sync + std::fmt::Debug + Copy + Send + 'static =} + {= T: Default + Eq + Sync + std::fmt::Debug + Copy + Send + 'static =} >( - value: T({= Default::default() =}) + value: T({= Default::default() =}) ) { - input in: T + input in: T inner = new Generic2(value = value) diff --git a/test/known-good/Rust/src/generics/GenericComplexType.txt b/test/known-good/Rust/src/generics/GenericComplexType.txt index 8e6756b55..cb830df3c 100644 --- a/test/known-good/Rust/src/generics/GenericComplexType.txt +++ b/test/known-good/Rust/src/generics/GenericComplexType.txt @@ -2,8 +2,8 @@ target Rust reactor R { - input in: Vec<time> - output out: Vec<time> + input in: Vec<time> + output out: Vec<time> in -> out diff --git a/test/known-good/Rust/src/generics/GenericReactor.txt b/test/known-good/Rust/src/generics/GenericReactor.txt index 8e150cd3e..f9d1e8009 100644 --- a/test/known-good/Rust/src/generics/GenericReactor.txt +++ b/test/known-good/Rust/src/generics/GenericReactor.txt @@ -1,15 +1,15 @@ // Tests a port connection between (input of self -> input of child) target Rust -reactor Box<{= T: Sync =}> { - input inp: T - output out: T +reactor Box<{= T: Sync =}> { + input inp: T + output out: T inp -> out } main reactor { - state done: bool(false) + state done: bool(false) box0 = new Box() box1 = new Box() diff --git a/test/known-good/Rust/src/lib/Imported.txt b/test/known-good/Rust/src/lib/Imported.txt index 75a9247ef..ce675821e 100644 --- a/test/known-good/Rust/src/lib/Imported.txt +++ b/test/known-good/Rust/src/lib/Imported.txt @@ -5,7 +5,7 @@ import ImportedAgain from "ImportedAgain.lf" reactor Imported { - input x: u32 + input x: u32 a = new ImportedAgain() reaction(x) -> a.x {= ctx.set(a__x, ctx.get(x).unwrap()); =} diff --git a/test/known-good/Rust/src/lib/ImportedAgain.txt b/test/known-good/Rust/src/lib/ImportedAgain.txt index ec3c5e601..e48273027 100644 --- a/test/known-good/Rust/src/lib/ImportedAgain.txt +++ b/test/known-good/Rust/src/lib/ImportedAgain.txt @@ -3,7 +3,7 @@ target Rust reactor ImportedAgain { - input x: u32 + input x: u32 reaction(x) {= assert_eq!(Some(42), ctx.get(x)); diff --git a/test/known-good/Rust/src/lib/SomethingWithAPreamble.txt b/test/known-good/Rust/src/lib/SomethingWithAPreamble.txt index cfbfcb24d..ef0f09cf4 100644 --- a/test/known-good/Rust/src/lib/SomethingWithAPreamble.txt +++ b/test/known-good/Rust/src/lib/SomethingWithAPreamble.txt @@ -3,7 +3,7 @@ target Rust reactor SomethingWithAPreamble { - input a: u32 + input a: u32 preamble {= pub fn some_fun() -> u32 { 4 diff --git a/test/known-good/Rust/src/multiport/ConnectionToSelfBank.txt b/test/known-good/Rust/src/multiport/ConnectionToSelfBank.txt index 22e4fe676..7a607d181 100644 --- a/test/known-good/Rust/src/multiport/ConnectionToSelfBank.txt +++ b/test/known-good/Rust/src/multiport/ConnectionToSelfBank.txt @@ -1,8 +1,8 @@ target Rust -reactor Node(bank_index: usize(0), num_nodes: usize(4)) { - input[num_nodes] in: usize - output out: usize +reactor Node(bank_index: usize(0), num_nodes: usize(4)) { + input[num_nodes] in: usize + output out: usize state bank_index(bank_index) state num_nodes(num_nodes) @@ -15,8 +15,8 @@ =} } -main reactor(num_nodes: usize(4)) { - nodes = new[num_nodes] Node(num_nodes = num_nodes) +main reactor(num_nodes: usize(4)) { + nodes = new[num_nodes] Node(num_nodes = num_nodes) (nodes.out)+ -> nodes.in } diff --git a/test/known-good/Rust/src/multiport/ConnectionToSelfMultiport.txt b/test/known-good/Rust/src/multiport/ConnectionToSelfMultiport.txt index 1c907cb2b..86b4faf86 100644 --- a/test/known-good/Rust/src/multiport/ConnectionToSelfMultiport.txt +++ b/test/known-good/Rust/src/multiport/ConnectionToSelfMultiport.txt @@ -1,9 +1,9 @@ // test a connection from a multiport to another multiport of the same reactor target Rust -reactor Node(num_nodes: usize(4)) { - input[num_nodes] in: usize - output[num_nodes] out: usize +reactor Node(num_nodes: usize(4)) { + input[num_nodes] in: usize + output[num_nodes] out: usize state num_nodes(num_nodes) reaction(startup) -> out {= @@ -19,7 +19,7 @@ =} } -main reactor(num_nodes: usize(4)) { +main reactor(num_nodes: usize(4)) { nodes = new Node(num_nodes = num_nodes) nodes.out -> nodes.in // todo: (nodes.out)+ -> nodes.in; } diff --git a/test/known-good/Rust/src/multiport/CycledLhs_SelfLoop.txt b/test/known-good/Rust/src/multiport/CycledLhs_SelfLoop.txt index 75c4b1b01..3c385f3de 100644 --- a/test/known-good/Rust/src/multiport/CycledLhs_SelfLoop.txt +++ b/test/known-good/Rust/src/multiport/CycledLhs_SelfLoop.txt @@ -1,14 +1,14 @@ // test a cycled connection which has ports of the same reactor on the LHS and // rhs (single port)+ -> multiport target Rust { - timeout: 16 usec + timeout: 16 usec } reactor Test { - output out: u32 - input[2] in: u32 - logical action act: u32 - state last: u32(1) + output out: u32 + input[2] in: u32 + logical action act: u32 + state last: u32(1) reaction(startup) -> act {= ctx.schedule_with_v(act, Some(1), after!(1 us)); @@ -17,7 +17,7 @@ reaction(act) -> out {= ctx.set_opt(out, ctx.get(act)); =} reaction(in) -> act {= - let sum: u32 = r#in.iterate_values().sum(); + let sum: u32 = r#in.iterate_values().sum(); println!("Sum of received: {}", sum); assert_eq!(self.last * 2, sum); self.last = sum; diff --git a/test/known-good/Rust/src/multiport/CycledLhs_Single.txt b/test/known-good/Rust/src/multiport/CycledLhs_Single.txt index 7a174fbe2..5553798bb 100644 --- a/test/known-good/Rust/src/multiport/CycledLhs_Single.txt +++ b/test/known-good/Rust/src/multiport/CycledLhs_Single.txt @@ -1,14 +1,14 @@ // test a cycled connection which has ports of the same reactor on the LHS and // rhs (multiport)+ -> multiport target Rust { - timeout: 16 usec + timeout: 16 usec } reactor Test { - output[2] out: u32 - input[4] in: u32 + output[2] out: u32 + input[4] in: u32 logical action act: {= (u32, u32) =} - state last: u32(1) + state last: u32(1) reaction(startup) -> act {= ctx.schedule_with_v(act, Some((0, 1)), after!(1 us)); @@ -25,7 +25,7 @@ // r#in is [fib(n-2), fib(n-1), fib(n-2), fib(n-1)] let fib_n_1 = ctx.get(&r#in[1]).unwrap(); let fib_n_2 = ctx.get(&r#in[0]).unwrap(); - let fib_n: u32 = fib_n_2 + fib_n_1; + let fib_n: u32 = fib_n_2 + fib_n_1; assert_eq!(ctx.get(&r#in[2]).unwrap(), fib_n_2); assert_eq!(ctx.get(&r#in[3]).unwrap(), fib_n_1); println!("{} + {} = {}", fib_n_2, fib_n_1, fib_n); diff --git a/test/known-good/Rust/src/multiport/FullyConnected.txt b/test/known-good/Rust/src/multiport/FullyConnected.txt index 93689a27c..6536682e6 100644 --- a/test/known-good/Rust/src/multiport/FullyConnected.txt +++ b/test/known-good/Rust/src/multiport/FullyConnected.txt @@ -1,15 +1,15 @@ // test iterated connection on the left target Rust -reactor Left(bank_index: usize(0)) { - output out: usize +reactor Left(bank_index: usize(0)) { + output out: usize state bank_index(bank_index) reaction(startup) -> out {= ctx.set(out, self.bank_index); =} } -reactor Right(bank_index: usize(0), num_nodes: usize(4)) { - input[num_nodes] in: usize +reactor Right(bank_index: usize(0), num_nodes: usize(4)) { + input[num_nodes] in: usize state num_nodes(num_nodes) reaction(in) {= @@ -19,9 +19,9 @@ =} } -main reactor(num_nodes: usize(4)) { - left = new[num_nodes] Left() - right = new[num_nodes] Right(num_nodes = num_nodes) +main reactor(num_nodes: usize(4)) { + left = new[num_nodes] Left() + right = new[num_nodes] Right(num_nodes = num_nodes) (left.out)+ -> right.in } diff --git a/test/known-good/Rust/src/multiport/FullyConnectedAddressable.txt b/test/known-good/Rust/src/multiport/FullyConnectedAddressable.txt index db6bd5612..57c3974e9 100644 --- a/test/known-good/Rust/src/multiport/FullyConnectedAddressable.txt +++ b/test/known-good/Rust/src/multiport/FullyConnectedAddressable.txt @@ -1,14 +1,14 @@ // In this pattern, each node can send direct messages to individual other nodes target Rust -reactor Node(bank_index: usize(0), num_nodes: usize(4)) { +reactor Node(bank_index: usize(0), num_nodes: usize(4)) { state bank_index(bank_index) state num_nodes(num_nodes) - input[num_nodes] inpt: usize - output[num_nodes] out: usize + input[num_nodes] inpt: usize + output[num_nodes] out: usize - state received: bool(false) + state received: bool(false) reaction(startup) -> out {= println!("Hello from node {}!", self.bank_index); @@ -43,11 +43,11 @@ =} } -main reactor(num_nodes: usize(4)) { - nodes1 = new[num_nodes] Node(num_nodes = num_nodes) +main reactor(num_nodes: usize(4)) { + nodes1 = new[num_nodes] Node(num_nodes = num_nodes) nodes1.out -> interleaved (nodes1.inpt) - nodes2 = new[num_nodes] Node(num_nodes = num_nodes) + nodes2 = new[num_nodes] Node(num_nodes = num_nodes) interleaved (nodes2.out) -> nodes2.inpt } diff --git a/test/known-good/Rust/src/multiport/MultiportFromBank.txt b/test/known-good/Rust/src/multiport/MultiportFromBank.txt index 754a17180..2e21b9e1e 100644 --- a/test/known-good/Rust/src/multiport/MultiportFromBank.txt +++ b/test/known-good/Rust/src/multiport/MultiportFromBank.txt @@ -1,17 +1,17 @@ // Check bank output to multiport input. target Rust { - timeout: 2 sec + timeout: 2 sec } -reactor Source(bank_index: usize(0)) { - output out: usize +reactor Source(bank_index: usize(0)) { + output out: usize state bank_index(bank_index) reaction(startup) -> out {= ctx.set(out, self.bank_index); =} } -reactor Destination(port_width: usize(2)) { - input[port_width] in: usize +reactor Destination(port_width: usize(2)) { + input[port_width] in: usize reaction(in) {= for (i, port) in r#in.enumerate_set() { @@ -22,7 +22,7 @@ } main reactor { - a = new[4] Source() + a = new[4] Source() b = new Destination(port_width = 4) a.out -> b.in } diff --git a/test/known-good/Rust/src/multiport/MultiportFromHierarchy.txt b/test/known-good/Rust/src/multiport/MultiportFromHierarchy.txt index 9ae774d7e..b5de6bf3f 100644 --- a/test/known-good/Rust/src/multiport/MultiportFromHierarchy.txt +++ b/test/known-good/Rust/src/multiport/MultiportFromHierarchy.txt @@ -1,13 +1,13 @@ // Check multiport output to multiport input, where the former is a hierarchical // reactor. target Rust { - timeout: 2 sec + timeout: 2 sec } reactor Source { timer t(0, 200 msec) - output[4] out: u32 - state s: u32(0) + output[4] out: u32 + state s: u32(0) reaction(t) -> out {= for chan in out { @@ -18,11 +18,11 @@ } reactor Destination { - state s: u32(6) - input[4] in: u32 + state s: u32(6) + input[4] in: u32 reaction(in) {= - let sum: u32 = r#in.iterate_values().sum(); + let sum: u32 = r#in.iterate_values().sum(); println!("Sum of received: {}", sum); assert_eq!(sum, self.s); self.s += 16; @@ -35,13 +35,13 @@ } reactor Container { - output[4] out: u32 + output[4] out: u32 src = new InsideContainer() src.out -> out } reactor InsideContainer { - output[4] out: u32 + output[4] out: u32 src = new Source() src.out -> out } diff --git a/test/known-good/Rust/src/multiport/MultiportIn.txt b/test/known-good/Rust/src/multiport/MultiportIn.txt index 17e499711..6f6437beb 100644 --- a/test/known-good/Rust/src/multiport/MultiportIn.txt +++ b/test/known-good/Rust/src/multiport/MultiportIn.txt @@ -1,14 +1,14 @@ // This is a version fo the Threaded test that uses a multiport input at the // destination. Its purpose is to test multiport inputs. target Rust { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } reactor Source { timer t(0, 200 msec) - output out: u32 - state s: u32(0) + output out: u32 + state s: u32(0) reaction(t) -> out {= ctx.set(out, self.s); @@ -17,8 +17,8 @@ } reactor Computation { - input in: u32 - output out: u32 + input in: u32 + output out: u32 reaction(in) -> out {= ctx.set(out, ctx.get(r#in).unwrap()); @@ -26,11 +26,11 @@ } reactor Destination { - state s: u32(0) - input[4] in: u32 + state s: u32(0) + input[4] in: u32 reaction(in) {= - let sum: u32 = r#in.iterate_values().sum(); + let sum: u32 = r#in.iterate_values().sum(); println!("Sum of received: {}", sum); assert_eq!(sum, self.s); self.s += 4; diff --git a/test/known-good/Rust/src/multiport/MultiportOut.txt b/test/known-good/Rust/src/multiport/MultiportOut.txt index c5f94ccfe..2588a2b3c 100644 --- a/test/known-good/Rust/src/multiport/MultiportOut.txt +++ b/test/known-good/Rust/src/multiport/MultiportOut.txt @@ -1,12 +1,12 @@ // Check multiport capabilities on Outputs. target Rust { - timeout: 2 sec + timeout: 2 sec } reactor Source { timer t(0, 200 msec) - output[4] out: u32 - state s: u32(0) + output[4] out: u32 + state s: u32(0) reaction(t) -> out {= for i in 0..out.len() { @@ -17,8 +17,8 @@ } reactor Computation { - input in: u32 - output out: u32 + input in: u32 + output out: u32 reaction(in) -> out {= // No need to sleep for this test. @@ -30,8 +30,8 @@ } reactor Destination { - state s: u32(0) - input[4] in: u32 + state s: u32(0) + input[4] in: u32 reaction(in) {= let mut sum = 0; diff --git a/test/known-good/Rust/src/multiport/MultiportToBank.txt b/test/known-good/Rust/src/multiport/MultiportToBank.txt index b09943391..221bff330 100644 --- a/test/known-good/Rust/src/multiport/MultiportToBank.txt +++ b/test/known-good/Rust/src/multiport/MultiportToBank.txt @@ -2,7 +2,7 @@ target Rust reactor Source { - output[4] out: usize + output[4] out: usize reaction(startup) -> out {= for (i, out) in out.into_iter().enumerate() { @@ -11,11 +11,11 @@ =} } -reactor Sink(bank_index: usize(0)) { - input in: usize +reactor Sink(bank_index: usize(0)) { + input in: usize state bank_index(bank_index) - state asserts_done: u32(0) + state asserts_done: u32(0) reaction(in) {= assert_eq!(ctx.get(r#in), Some(self.bank_index)); @@ -30,7 +30,7 @@ main reactor MultiportToBank { source = new Source() - sink = new[4] Sink() + sink = new[4] Sink() source.out -> sink.in } diff --git a/test/known-good/Rust/src/multiport/MultiportToBankHierarchy.txt b/test/known-good/Rust/src/multiport/MultiportToBankHierarchy.txt index e6add2092..627ad4fee 100644 --- a/test/known-good/Rust/src/multiport/MultiportToBankHierarchy.txt +++ b/test/known-good/Rust/src/multiport/MultiportToBankHierarchy.txt @@ -1,10 +1,10 @@ // Check multiport output to bank of recipients within a hierarchy. target Rust { - timeout: 2 sec + timeout: 2 sec } reactor Source { - output[3] out: usize + output[3] out: usize reaction(startup) -> out {= for (i, out) in out.into_iter().enumerate() { @@ -13,11 +13,11 @@ =} } -reactor Destination(bank_index: usize(0)) { - input in: usize +reactor Destination(bank_index: usize(0)) { + input in: usize state bank_index(bank_index) - state asserts_done: u32(0) + state asserts_done: u32(0) reaction(in) {= assert_eq!(ctx.get(r#in), Some(self.bank_index)); @@ -31,8 +31,8 @@ } reactor Container { - input[3] in: usize - c = new[3] Destination() + input[3] in: usize + c = new[3] Destination() in -> c.in } diff --git a/test/known-good/Rust/src/multiport/MultiportToMultiport.txt b/test/known-good/Rust/src/multiport/MultiportToMultiport.txt index 7e3da0f71..7c788729b 100644 --- a/test/known-good/Rust/src/multiport/MultiportToMultiport.txt +++ b/test/known-good/Rust/src/multiport/MultiportToMultiport.txt @@ -2,7 +2,7 @@ target Rust reactor Source { - output[4] out: usize + output[4] out: usize reaction(startup) -> out {= for (i, out) in out.into_iter().enumerate() { @@ -12,7 +12,7 @@ } reactor Sink { - input[4] in: usize + input[4] in: usize reaction(in) {= for (i, port) in r#in.iter().enumerate() { diff --git a/test/known-good/Rust/src/multiport/MultiportToMultiport2.txt b/test/known-good/Rust/src/multiport/MultiportToMultiport2.txt index 1106ec065..74a9b0da3 100644 --- a/test/known-good/Rust/src/multiport/MultiportToMultiport2.txt +++ b/test/known-good/Rust/src/multiport/MultiportToMultiport2.txt @@ -2,8 +2,8 @@ // disconnected) target Rust -reactor Source(width: usize(2)) { - output[width] out: usize +reactor Source(width: usize(2)) { + output[width] out: usize reaction(startup) -> out {= for (i, out) in out.iter_mut().enumerate() { @@ -12,8 +12,8 @@ =} } -reactor Destination(width: usize(2)) { - input[width] in: usize +reactor Destination(width: usize(2)) { + input[width] in: usize reaction(in) {= for (i, v) in r#in.enumerate_values() { diff --git a/test/known-good/Rust/src/multiport/ReadOutputOfContainedBank.txt b/test/known-good/Rust/src/multiport/ReadOutputOfContainedBank.txt index b4d5d63d8..905ffae85 100644 --- a/test/known-good/Rust/src/multiport/ReadOutputOfContainedBank.txt +++ b/test/known-good/Rust/src/multiport/ReadOutputOfContainedBank.txt @@ -2,17 +2,17 @@ // permutations. target Rust -reactor Contained(bank_index: usize(0)) { +reactor Contained(bank_index: usize(0)) { state bank_index(bank_index) - output out: usize + output out: usize reaction(startup) -> out {= ctx.set(out, 42 * self.bank_index); =} } main reactor { - c = new[4] Contained() - state count: usize(0) + c = new[4] Contained() + state count: usize(0) reaction(startup) c.out {= for (i, chan) in c__out.iter().enumerate() { diff --git a/test/known-good/Rust/src/multiport/WidthWithParameter.txt b/test/known-good/Rust/src/multiport/WidthWithParameter.txt index f1e8df5b5..cafe7bf52 100644 --- a/test/known-good/Rust/src/multiport/WidthWithParameter.txt +++ b/test/known-good/Rust/src/multiport/WidthWithParameter.txt @@ -1,7 +1,7 @@ target Rust -reactor Some(value: usize(30)) { - output[value] finished: unit +reactor Some(value: usize(30)) { + output[value] finished: unit reaction(startup) -> finished {= for p in finished { diff --git a/test/known-good/Rust/src/multiport/WriteInputOfContainedBank.txt b/test/known-good/Rust/src/multiport/WriteInputOfContainedBank.txt index e4e6e064e..920f81219 100644 --- a/test/known-good/Rust/src/multiport/WriteInputOfContainedBank.txt +++ b/test/known-good/Rust/src/multiport/WriteInputOfContainedBank.txt @@ -1,11 +1,11 @@ // Test writing inputs to a contained reactor bank target Rust -reactor Contained(bank_index: usize(0)) { +reactor Contained(bank_index: usize(0)) { state bank_index(bank_index) - input inpt: usize - state count: usize(0) + input inpt: usize + state count: usize(0) reaction(inpt) {= let result = ctx.get(inpt).unwrap(); @@ -20,7 +20,7 @@ } main reactor { - c = new[4] Contained() + c = new[4] Contained() reaction(startup) -> c.inpt {= for i in 0..c__inpt.len() { diff --git a/test/known-good/Rust/src/target/BuildProfileRelease.txt b/test/known-good/Rust/src/target/BuildProfileRelease.txt index a0f667b76..3d9e839ad 100644 --- a/test/known-good/Rust/src/target/BuildProfileRelease.txt +++ b/test/known-good/Rust/src/target/BuildProfileRelease.txt @@ -1,7 +1,7 @@ // Tests that the we can enable the release profile A proxy for checking this is // to check that debug assertions are disabled. target Rust { - build-type: "Release" + build-type: "Release" } main reactor { diff --git a/test/known-good/Rust/src/target/CargoDependency.txt b/test/known-good/Rust/src/target/CargoDependency.txt index fecc3c00a..dad68f0a6 100644 --- a/test/known-good/Rust/src/target/CargoDependency.txt +++ b/test/known-good/Rust/src/target/CargoDependency.txt @@ -1,10 +1,10 @@ // This tests the ability to depend on crates with carg if this compiles it's // fine target Rust { - cargo-dependencies: { - rand: "0.8", - regex: { - version: "1" + cargo-dependencies: { + rand: "0.8", + regex: { + version: "1" } } } diff --git a/test/known-good/Rust/src/target/CargoDependencyOnRuntime.txt b/test/known-good/Rust/src/target/CargoDependencyOnRuntime.txt index e5d42cdf8..ce99707f9 100644 --- a/test/known-good/Rust/src/target/CargoDependencyOnRuntime.txt +++ b/test/known-good/Rust/src/target/CargoDependencyOnRuntime.txt @@ -1,9 +1,9 @@ // This tests the ability to depend on crates with carg if this compiles it's // fine target Rust { - cargo-dependencies: { - reactor_rt: { - features: ["parallel-runtime"] + cargo-dependencies: { + reactor_rt: { + features: ["parallel-runtime"] } } } diff --git a/test/known-good/Rust/src/target/CliFeature.txt b/test/known-good/Rust/src/target/CliFeature.txt index 67d8a728d..6af8458f4 100644 --- a/test/known-good/Rust/src/target/CliFeature.txt +++ b/test/known-good/Rust/src/target/CliFeature.txt @@ -1,10 +1,10 @@ target Rust { - build-type: Release, - cargo-features: ["cli"] + build-type: Release, + cargo-features: ["cli"] } // todo allow test framework to pass CLI arguments. -main reactor CliFeature(size: u32(4), t: time(4 sec)) { +main reactor CliFeature(size: u32(4), t: time(4 sec)) { reaction(startup) {= println!("success"); =} } diff --git a/test/known-good/Rust/src/target/MainParameterCanBeExpression.txt b/test/known-good/Rust/src/target/MainParameterCanBeExpression.txt index d215b885b..142795a54 100644 --- a/test/known-good/Rust/src/target/MainParameterCanBeExpression.txt +++ b/test/known-good/Rust/src/target/MainParameterCanBeExpression.txt @@ -1,9 +1,9 @@ target Rust { - build-type: Release, - cargo-features: ["cli"] + build-type: Release, + cargo-features: ["cli"] } -main reactor(size: u32({= 1u32 << 23 =})) { +main reactor(size: u32({= 1u32 << 23 =})) { state s(size) reaction(startup) {= diff --git a/test/known-good/Rust/src/target/ModuleDependency.txt b/test/known-good/Rust/src/target/ModuleDependency.txt index 14f273cff..2c67917c9 100644 --- a/test/known-good/Rust/src/target/ModuleDependency.txt +++ b/test/known-good/Rust/src/target/ModuleDependency.txt @@ -1,6 +1,6 @@ // Test that we can include modules into main target Rust { - rust-include: "some_module.rs" + rust-include: "some_module.rs" } main reactor { diff --git a/test/known-good/Rust/src/target/ModuleDependencyWithDirModule.txt b/test/known-good/Rust/src/target/ModuleDependencyWithDirModule.txt index f2716fa72..47322a945 100644 --- a/test/known-good/Rust/src/target/ModuleDependencyWithDirModule.txt +++ b/test/known-good/Rust/src/target/ModuleDependencyWithDirModule.txt @@ -1,6 +1,6 @@ // The same as CompositionWithPorts.lf, but as a single file project target Rust { - rust-include: "testmod" + rust-include: "testmod" } main reactor { diff --git a/test/known-good/TypeScript/src/ActionDelay.txt b/test/known-good/TypeScript/src/ActionDelay.txt index 1d27ed3ed..32dda22e5 100644 --- a/test/known-good/TypeScript/src/ActionDelay.txt +++ b/test/known-good/TypeScript/src/ActionDelay.txt @@ -2,9 +2,9 @@ target TypeScript reactor GeneratedDelay { - input y_in: number - output y_out: number - state y_state: number(0) + input y_in: number + output y_out: number + state y_state: number(0) logical action act(100 msec) reaction(y_in) -> act {= @@ -16,13 +16,13 @@ } reactor Source { - output out: number + output out: number reaction(startup) -> out {= out = 1; =} } reactor Sink { - input x: number + input x: number reaction(x) {= const elapsed_logical = util.getElapsedLogicalTime(); diff --git a/test/known-good/TypeScript/src/ActionWithNoReaction.txt b/test/known-good/TypeScript/src/ActionWithNoReaction.txt index f93a81acc..ec2a64277 100644 --- a/test/known-good/TypeScript/src/ActionWithNoReaction.txt +++ b/test/known-good/TypeScript/src/ActionWithNoReaction.txt @@ -2,13 +2,13 @@ // test passes merely by compiling and executing without a segfault. Its other // functionality is tested by other tests. target TypeScript { - fast: true, - timeout: 3 sec + fast: true, + timeout: 3 sec } reactor foo { - input x: number - output y: number + input x: number + output y: number logical action a reaction(x) -> y, a {= @@ -18,7 +18,7 @@ } reactor print { - input x: number + input x: number reaction(x) {= console.log("Result is " + (x as number)); diff --git a/test/known-good/TypeScript/src/After.txt b/test/known-good/TypeScript/src/After.txt index 153507b80..465861bcb 100644 --- a/test/known-good/TypeScript/src/After.txt +++ b/test/known-good/TypeScript/src/After.txt @@ -1,20 +1,20 @@ // This checks that the after keyword adjusts logical time, not using physical // time. target TypeScript { - fast: true, - timeout: 3 sec + fast: true, + timeout: 3 sec } reactor Foo { - input x: number - output y: number + input x: number + output y: number reaction(x) -> y {= y = 2 * (x as number); =} } reactor Print { - state expected_time: time(10 msec) - input x: number + state expected_time: time(10 msec) + input x: number reaction(x) {= let elapsed_time = util.getElapsedLogicalTime(); diff --git a/test/known-good/TypeScript/src/ArrayAsParameter.txt b/test/known-good/TypeScript/src/ArrayAsParameter.txt index 26588b952..97cecbd08 100644 --- a/test/known-good/TypeScript/src/ArrayAsParameter.txt +++ b/test/known-good/TypeScript/src/ArrayAsParameter.txt @@ -2,8 +2,8 @@ target TypeScript reactor Source(sequence: {= Array =}({= [0, 1, 2] =})) { - output out: number - state count: number(0) + output out: number + state count: number(0) logical action next reaction(startup, next) -> out, next {= @@ -16,8 +16,8 @@ } reactor Print { - input x: number - state count: number(1) + input x: number + state count: number(1) reaction(x) {= console.log("Received: " + x + "."); diff --git a/test/known-good/TypeScript/src/ArrayAsType.txt b/test/known-good/TypeScript/src/ArrayAsType.txt index f80816f19..e6f1c1fc4 100644 --- a/test/known-good/TypeScript/src/ArrayAsType.txt +++ b/test/known-good/TypeScript/src/ArrayAsType.txt @@ -15,7 +15,7 @@ =} } -reactor Print(scale: number(1)) { // The scale parameter is just for testing. +reactor Print(scale: number(1)) { // The scale parameter is just for testing. input x: {= Array =} reaction(x) {= diff --git a/test/known-good/TypeScript/src/ArrayPrint.txt b/test/known-good/TypeScript/src/ArrayPrint.txt index 88944cb42..43a4e8af7 100644 --- a/test/known-good/TypeScript/src/ArrayPrint.txt +++ b/test/known-good/TypeScript/src/ArrayPrint.txt @@ -15,7 +15,7 @@ =} } -reactor Print(scale: number(1)) { // The scale parameter is just for testing. +reactor Print(scale: number(1)) { // The scale parameter is just for testing. input x: {= Array =} reaction(x) {= diff --git a/test/known-good/TypeScript/src/ArrayScale.txt b/test/known-good/TypeScript/src/ArrayScale.txt index e217d78fb..2c82c765e 100644 --- a/test/known-good/TypeScript/src/ArrayScale.txt +++ b/test/known-good/TypeScript/src/ArrayScale.txt @@ -6,7 +6,7 @@ import Source, Print from "ArrayPrint.lf" -reactor Scale(scale: number(2)) { +reactor Scale(scale: number(2)) { mutable input x: {= Array =} output out: {= Array =} diff --git a/test/known-good/TypeScript/src/Composition.txt b/test/known-good/TypeScript/src/Composition.txt index ee51a8e62..fe1d03164 100644 --- a/test/known-good/TypeScript/src/Composition.txt +++ b/test/known-good/TypeScript/src/Composition.txt @@ -1,13 +1,13 @@ // This test connects a simple counting source to tester that checks against its // own count. target TypeScript { - timeout: 5 sec + timeout: 5 sec } -reactor Source(period: time(2 sec)) { - output y: number +reactor Source(period: time(2 sec)) { + output y: number timer t(1 sec, period) - state count: number(0) + state count: number(0) reaction(t) -> y {= count++; @@ -16,8 +16,8 @@ } reactor Test { - input x: number - state count: number(0) + input x: number + state count: number(0) reaction(x) {= count++; diff --git a/test/known-good/TypeScript/src/CompositionAfter.txt b/test/known-good/TypeScript/src/CompositionAfter.txt index ee06c0133..1690b6f9b 100644 --- a/test/known-good/TypeScript/src/CompositionAfter.txt +++ b/test/known-good/TypeScript/src/CompositionAfter.txt @@ -1,14 +1,14 @@ // This test connects a simple counting source that checks against its own // count. target TypeScript { - fast: true, - timeout: 10 sec + fast: true, + timeout: 10 sec } -reactor Source(period: time(2 sec)) { - output y: number +reactor Source(period: time(2 sec)) { + output y: number timer t(1 sec, period) - state count: number(0) + state count: number(0) reaction(t) -> y {= count++; @@ -17,8 +17,8 @@ } reactor Test { - input x: number - state count: number(0) + input x: number + state count: number(0) reaction(x) {= count++; @@ -29,7 +29,7 @@ =} } -main reactor(delay: time(5 sec)) { +main reactor(delay: time(5 sec)) { s = new Source() d = new Test() s.y -> d.x after delay diff --git a/test/known-good/TypeScript/src/CountTest.txt b/test/known-good/TypeScript/src/CountTest.txt index f1c9aee58..0a987184d 100644 --- a/test/known-good/TypeScript/src/CountTest.txt +++ b/test/known-good/TypeScript/src/CountTest.txt @@ -1,12 +1,12 @@ target TypeScript { - timeout: 3 sec + timeout: 3 sec } import Count from "lib/Count.lf" reactor Test { - input c: number - state i: number(0) + input c: number + state i: number(0) reaction(c) {= console.log("Received " + c); diff --git a/test/known-good/TypeScript/src/DanglingOutput.txt b/test/known-good/TypeScript/src/DanglingOutput.txt index c10548528..6de6f0570 100644 --- a/test/known-good/TypeScript/src/DanglingOutput.txt +++ b/test/known-good/TypeScript/src/DanglingOutput.txt @@ -3,15 +3,15 @@ target TypeScript reactor Source { - output out: number + output out: number timer t reaction(t) -> out {= out = 1; =} } reactor Gain { - input x: number - output out: number + input x: number + output out: number reaction(x) -> out {= console.log("Received " + x); diff --git a/test/known-good/TypeScript/src/Deadline.txt b/test/known-good/TypeScript/src/Deadline.txt index ee183f319..8b01d764f 100644 --- a/test/known-good/TypeScript/src/Deadline.txt +++ b/test/known-good/TypeScript/src/Deadline.txt @@ -2,13 +2,13 @@ // the Source immediately, whereas odd numbers are sent after a big enough delay // to violate the deadline. target TypeScript { - timeout: 4 sec + timeout: 4 sec } -reactor Source(period: time(2 sec)) { // run = "bin/Deadline -timeout 4 sec" - output y: number +reactor Source(period: time(2 sec)) { // run = "bin/Deadline -timeout 4 sec" + output y: number timer t(0, period) - state count: number(0) + state count: number(0) reaction(t) -> y {= if (2 * Math.floor(count / 2) != count){ @@ -25,9 +25,9 @@ =} } -reactor Destination(timeout: time(1 sec)) { - input x: number - state count: number(0) +reactor Destination(timeout: time(1 sec)) { + input x: number + state count: number(0) reaction(x) {= console.log("Destination receives: " + x); diff --git a/test/known-good/TypeScript/src/DeadlineHandledAbove.txt b/test/known-good/TypeScript/src/DeadlineHandledAbove.txt index 419c63f0c..039e66792 100644 --- a/test/known-good/TypeScript/src/DeadlineHandledAbove.txt +++ b/test/known-good/TypeScript/src/DeadlineHandledAbove.txt @@ -1,12 +1,12 @@ // Test a deadline where the deadline violation produces an output and the // container reacts to that output. target TypeScript { - timeout: 2 sec + timeout: 2 sec } -reactor Deadline(threshold: time(100 msec)) { - input x: number - output deadline_violation: boolean +reactor Deadline(threshold: time(100 msec)) { + input x: number + output deadline_violation: boolean reaction(x) -> deadline_violation {= util.requestErrorStop("ERROR: Deadline violation was not detected!") @@ -19,7 +19,7 @@ } main reactor DeadlineHandledAbove { - state violation_detected: boolean(false) + state violation_detected: boolean(false) d = new Deadline(threshold = 10 msec) reaction(startup) -> d.x {= diff --git a/test/known-good/TypeScript/src/DelayInt.txt b/test/known-good/TypeScript/src/DelayInt.txt index 86960cd28..1f5b4fa13 100644 --- a/test/known-good/TypeScript/src/DelayInt.txt +++ b/test/known-good/TypeScript/src/DelayInt.txt @@ -2,10 +2,10 @@ // is a start at handling dynamic memory allocation for such actions. target TypeScript -reactor Delay(delay: time(100 msec)) { - input x: number - output out: number - logical action a: number +reactor Delay(delay: time(100 msec)) { + input x: number + output out: number + logical action a: number reaction(x) -> a {= actions.a.schedule( delay, x as number); =} @@ -17,9 +17,9 @@ } reactor Test { - input x: number - state start_time: time(0) - state received_value: boolean(false) + input x: number + state start_time: time(0) + state received_value: boolean(false) reaction(startup) {= // Record the logical time at the start. diff --git a/test/known-good/TypeScript/src/DelayedAction.txt b/test/known-good/TypeScript/src/DelayedAction.txt index 32f03c67c..cee8fc624 100644 --- a/test/known-good/TypeScript/src/DelayedAction.txt +++ b/test/known-good/TypeScript/src/DelayedAction.txt @@ -1,11 +1,11 @@ target TypeScript { - timeout: 5 sec + timeout: 5 sec } main reactor DelayedAction { timer t(0, 1 sec) logical action a - state count: number(0) + state count: number(0) reaction(t) -> a {= actions.a.schedule(TimeValue.msec(100), null); =} diff --git a/test/known-good/TypeScript/src/DelayedReaction.txt b/test/known-good/TypeScript/src/DelayedReaction.txt index 65b123e89..e57f7a4a1 100644 --- a/test/known-good/TypeScript/src/DelayedReaction.txt +++ b/test/known-good/TypeScript/src/DelayedReaction.txt @@ -2,14 +2,14 @@ target TypeScript reactor Source { - output out: number + output out: number timer t reaction(t) -> out {= out = 1; =} } reactor Sink { - input x: number + input x: number reaction(x) {= let elapsed = util.getElapsedLogicalTime(); diff --git a/test/known-good/TypeScript/src/Determinism.txt b/test/known-good/TypeScript/src/Determinism.txt index 83c7bda50..528b74917 100644 --- a/test/known-good/TypeScript/src/Determinism.txt +++ b/test/known-good/TypeScript/src/Determinism.txt @@ -1,15 +1,15 @@ target TypeScript reactor Source { - output y: number + output y: number timer t reaction(t) -> y {= y = 1; =} } reactor Destination { - input x: number - input y: number + input x: number + input y: number reaction(x, y) {= let sum = 0; @@ -27,8 +27,8 @@ } reactor Pass { - input x: number - output y: number + input x: number + output y: number reaction(x) -> y {= y = x as number; =} } diff --git a/test/known-good/TypeScript/src/DoubleInvocation.txt b/test/known-good/TypeScript/src/DoubleInvocation.txt index a3611a5c3..755cf78e2 100644 --- a/test/known-good/TypeScript/src/DoubleInvocation.txt +++ b/test/known-good/TypeScript/src/DoubleInvocation.txt @@ -6,14 +6,14 @@ // * Removing the startup reaction in Print. // * Sending only position, not velocity from Ball. target TypeScript { - timeout: 5 sec, - fast: true + timeout: 5 sec, + fast: true } reactor Ball { - output position: number - output velocity: number - state p: number(200) + output position: number + output velocity: number + state p: number(200) timer trigger(0, 1 sec) reaction(trigger) -> position, velocity {= @@ -24,9 +24,9 @@ } reactor Print { - input velocity: number - input position: number - state previous: number(-1) + input velocity: number + input position: number + state previous: number(-1) reaction(startup) {= console.log("####### Print startup"); diff --git a/test/known-good/TypeScript/src/DoubleReaction.txt b/test/known-good/TypeScript/src/DoubleReaction.txt index 5dd275c6d..2d40a5dd6 100644 --- a/test/known-good/TypeScript/src/DoubleReaction.txt +++ b/test/known-good/TypeScript/src/DoubleReaction.txt @@ -1,14 +1,14 @@ // Test that two simultaneous inputs that trigger a reaction trigger it only // once. Correct output for this 2, 4, 6, 8, etc. target TypeScript { - timeout: 10 sec, - fast: true + timeout: 10 sec, + fast: true } -reactor Clock(offset: time(0), period: time(1 sec)) { - output y: number +reactor Clock(offset: time(0), period: time(1 sec)) { + output y: number timer t(offset, period) - state count: number(0) + state count: number(0) reaction(t) -> y {= count++; @@ -17,9 +17,9 @@ } reactor Destination { - input x: number - input w: number - state s: number(2) + input x: number + input w: number + state s: number(2) reaction(x, w) {= let sum = 0; diff --git a/test/known-good/TypeScript/src/DoubleTrigger.txt b/test/known-good/TypeScript/src/DoubleTrigger.txt index b3af85667..7cfdd3824 100644 --- a/test/known-good/TypeScript/src/DoubleTrigger.txt +++ b/test/known-good/TypeScript/src/DoubleTrigger.txt @@ -1,14 +1,14 @@ // Test that two simultaneous triggers don't cause a reaction to execute twice // at the same tag. target TypeScript { - fast: true, - timeout: 1 sec + fast: true, + timeout: 1 sec } main reactor DoubleTrigger { timer t1 timer t2 - state s: number(0) + state s: number(0) reaction(t1, t2) {= s++; diff --git a/test/known-good/TypeScript/src/FloatLiteral.txt b/test/known-good/TypeScript/src/FloatLiteral.txt index 01198a1fe..eaa665965 100644 --- a/test/known-good/TypeScript/src/FloatLiteral.txt +++ b/test/known-good/TypeScript/src/FloatLiteral.txt @@ -2,13 +2,13 @@ // This test verifies that floating-point literals are handled correctly. main reactor { - state N: number(6.0221409e+23) - state charge: number(-1.6021766E-19) - state minus_epsilon: number(-.01e0) - state expected: number(.964853323188E5) + state N: number(6.0221409e+23) + state charge: number(-1.6021766E-19) + state minus_epsilon: number(-.01e0) + state expected: number(.964853323188E5) reaction(startup) {= - const F: number = - N * charge; + const F: number = - N * charge; if (Math.abs(F - expected) < Math.abs(minus_epsilon)) { console.log("The Faraday constant is roughly " + F + "."); } else { diff --git a/test/known-good/TypeScript/src/Gain.txt b/test/known-good/TypeScript/src/Gain.txt index 017a9a662..0eb95a2f5 100644 --- a/test/known-good/TypeScript/src/Gain.txt +++ b/test/known-good/TypeScript/src/Gain.txt @@ -1,16 +1,16 @@ // Example in the Wiki. target TypeScript -reactor Scale(scale: number(2)) { - input x: number - output y: number +reactor Scale(scale: number(2)) { + input x: number + output y: number reaction(x) -> y {= y = (x as number) * scale; =} } reactor Test { - input x: number - state received_value: boolean(false) + input x: number + state received_value: boolean(false) reaction(x) {= console.log("Received " + x + "."); diff --git a/test/known-good/TypeScript/src/GetTime.txt b/test/known-good/TypeScript/src/GetTime.txt index 7ad4de20c..3c1b27d40 100644 --- a/test/known-good/TypeScript/src/GetTime.txt +++ b/test/known-good/TypeScript/src/GetTime.txt @@ -3,7 +3,7 @@ target TypeScript { // FIXME the C version of this test is fast, but in TS it's illegal to // subtract TimeValues and get a negative result fast: true - timeout: 2 sec + timeout: 2 sec } main reactor GetTime { diff --git a/test/known-good/TypeScript/src/Hello.txt b/test/known-good/TypeScript/src/Hello.txt index 216d2446e..0f5105119 100644 --- a/test/known-good/TypeScript/src/Hello.txt +++ b/test/known-good/TypeScript/src/Hello.txt @@ -4,13 +4,13 @@ // has a period of 4 seconds, the second of 2 seconds, and the third (composite) // or 1 second. target TypeScript { - timeout: 10 sec, - fast: true + timeout: 10 sec, + fast: true } -reactor Reschedule(period: time(2 sec), message: string("Hello TypeScript")) { - state count: number(0) - state previous_time: time(0) +reactor Reschedule(period: time(2 sec), message: string("Hello TypeScript")) { + state count: number(0) + state previous_time: time(0) timer t(1 sec, period) logical action a @@ -38,8 +38,8 @@ } reactor Inside( - period: time(1 sec), - message: string("Composite default message.") + period: time(1 sec), + message: string("Composite default message.") ) { third_instance = new Reschedule(period = period, message = message) } diff --git a/test/known-good/TypeScript/src/Hierarchy.txt b/test/known-good/TypeScript/src/Hierarchy.txt index 09c1b7b52..f9fd6f924 100644 --- a/test/known-good/TypeScript/src/Hierarchy.txt +++ b/test/known-good/TypeScript/src/Hierarchy.txt @@ -2,7 +2,7 @@ target TypeScript reactor Source { - output out: number + output out: number timer t reaction(t) -> out {= @@ -12,8 +12,8 @@ } reactor Gain { - input x: number - output out: number + input x: number + output out: number reaction(x) -> out {= console.log("Gain received " + x); @@ -22,7 +22,7 @@ } reactor Print { - input x: number + input x: number reaction(x) {= x = x as number; @@ -34,9 +34,9 @@ } reactor GainContainer { - input x: number - output out: number - output out2: number + input x: number + output out: number + output out2: number gain = new Gain() x -> gain.x gain.out -> out diff --git a/test/known-good/TypeScript/src/Hierarchy2.txt b/test/known-good/TypeScript/src/Hierarchy2.txt index 1277a811c..669300073 100644 --- a/test/known-good/TypeScript/src/Hierarchy2.txt +++ b/test/known-good/TypeScript/src/Hierarchy2.txt @@ -1,20 +1,20 @@ // Test data transport across hierarchy. target TypeScript { - timeout: 5 sec, - fast: true + timeout: 5 sec, + fast: true } reactor Source { - output out: number + output out: number timer t(0, 1 sec) reaction(t) -> out {= out = 1; =} } reactor Count { - output out: number + output out: number timer t(0, 1 sec) - state i: number(0) + state i: number(0) reaction(t) -> out {= i++; @@ -23,9 +23,9 @@ } reactor Add { - input in1: number - input in2: number - output out: number + input in1: number + input in2: number + output out: number reaction(in1, in2) -> out {= let result = 0; @@ -36,8 +36,8 @@ } reactor Print { - input x: number - state expected: number(2) + input x: number + state expected: number(2) reaction(x) {= x = x as number; @@ -49,8 +49,8 @@ } reactor AddCount { - input x: number - output out: number + input x: number + output out: number count = new Count() add = new Add() x -> add.in1 diff --git a/test/known-good/TypeScript/src/Import.txt b/test/known-good/TypeScript/src/Import.txt index 89f2b3da3..ac03ff036 100644 --- a/test/known-good/TypeScript/src/Import.txt +++ b/test/known-good/TypeScript/src/Import.txt @@ -1,7 +1,7 @@ // This tests the ability to import a reactor definition that itself imports a // reactor definition. target TypeScript { - timeout: 2 sec + timeout: 2 sec } import Imported from "lib/Imported.lf" diff --git a/test/known-good/TypeScript/src/Microsteps.txt b/test/known-good/TypeScript/src/Microsteps.txt index d42db3cc4..9e37b2cba 100644 --- a/test/known-good/TypeScript/src/Microsteps.txt +++ b/test/known-good/TypeScript/src/Microsteps.txt @@ -1,8 +1,8 @@ target TypeScript reactor Destination { - input x: number - input y: number + input x: number + input y: number reaction(x, y) {= let elapsed = util.getElapsedLogicalTime(); diff --git a/test/known-good/TypeScript/src/MovingAverage.txt b/test/known-good/TypeScript/src/MovingAverage.txt index 8ad640301..d160f535e 100644 --- a/test/known-good/TypeScript/src/MovingAverage.txt +++ b/test/known-good/TypeScript/src/MovingAverage.txt @@ -2,13 +2,13 @@ // computes the moving average of the last four inputs and produces that as // output. The source is a counting sequence. target TypeScript { - timeout: 1 sec, - fast: true + timeout: 1 sec, + fast: true } reactor Source { - output out: number - state count: number(0) + output out: number + state count: number(0) timer clock(0, 200 msec) reaction(clock) -> out {= @@ -19,9 +19,9 @@ reactor MovingAverageImpl { state delay_line: {= Array =}({= [0.0, 0.0, 0.0] =}) - state index: number(0) - input x: number - output out: number + state index: number(0) + input x: number + output out: number reaction(x) -> out {= x = x as number; @@ -44,8 +44,8 @@ } reactor Print { - input x: number - state count: number(0) + input x: number + state count: number(0) reaction(x) {= x = x as number; diff --git a/test/known-good/TypeScript/src/MultipleContained.txt b/test/known-good/TypeScript/src/MultipleContained.txt index c4243f0f5..20f08a114 100644 --- a/test/known-good/TypeScript/src/MultipleContained.txt +++ b/test/known-good/TypeScript/src/MultipleContained.txt @@ -3,9 +3,9 @@ target TypeScript reactor Contained { - output trigger: number - input in1: number - input in2: number + output trigger: number + input in1: number + input in2: number reaction(startup) -> trigger {= trigger = 42; =} diff --git a/test/known-good/TypeScript/src/NativeListsAndTimes.txt b/test/known-good/TypeScript/src/NativeListsAndTimes.txt index f0209565d..81060f3c2 100644 --- a/test/known-good/TypeScript/src/NativeListsAndTimes.txt +++ b/test/known-good/TypeScript/src/NativeListsAndTimes.txt @@ -2,17 +2,17 @@ // This test passes if it is successfully compiled into valid target code. main reactor( - x: number(0), - y: time(0), // Units are missing but not required + x: number(0), + y: time(0), // Units are missing but not required z(1 msec), // Type is missing but not required - p: number[](1, 2, 3, 4), // List of integers - q: TimeValue[](1 msec, 2 msec, 3 msec), // list of time values - g: time[](1 msec, 2 msec) // List of time values + p: number[](1, 2, 3, 4), // List of integers + q: TimeValue[](1 msec, 2 msec, 3 msec), // list of time values + g: time[](1 msec, 2 msec) // List of time values ) { - state s: time(y) // Reference to explicitly typed time parameter - state t: time(z) // Reference to implicitly typed time parameter - state v: boolean // Uninitialized boolean state variable - state w: time // Uninitialized time state variable + state s: time(y) // Reference to explicitly typed time parameter + state t: time(z) // Reference to implicitly typed time parameter + state v: boolean // Uninitialized boolean state variable + state w: time // Uninitialized time state variable timer tick(0) // Units missing but not required timer tock(1 sec) // Implicit type time timer toe(z) // Implicit type time diff --git a/test/known-good/TypeScript/src/ParameterizedState.txt b/test/known-good/TypeScript/src/ParameterizedState.txt index fae4d8003..e8b2a1014 100644 --- a/test/known-good/TypeScript/src/ParameterizedState.txt +++ b/test/known-good/TypeScript/src/ParameterizedState.txt @@ -1,6 +1,6 @@ target TypeScript -reactor Foo(bar: number(42)) { +reactor Foo(bar: number(42)) { state baz(bar) reaction(startup) {= console.log("Baz: " + baz); =} diff --git a/test/known-good/TypeScript/src/PeriodicDesugared.txt b/test/known-good/TypeScript/src/PeriodicDesugared.txt index 9ecae2119..70b54f263 100644 --- a/test/known-good/TypeScript/src/PeriodicDesugared.txt +++ b/test/known-good/TypeScript/src/PeriodicDesugared.txt @@ -1,9 +1,9 @@ target TypeScript -main reactor(offset: time(0), period: time(500 msec)) { +main reactor(offset: time(0), period: time(500 msec)) { logical action init(offset) logical action recur(period) - state count: number(0) + state count: number(0) reaction(startup) -> init, recur {= if (offset.isZero()) { diff --git a/test/known-good/TypeScript/src/PhysicalConnection.txt b/test/known-good/TypeScript/src/PhysicalConnection.txt index db51bc132..9f984b62a 100644 --- a/test/known-good/TypeScript/src/PhysicalConnection.txt +++ b/test/known-good/TypeScript/src/PhysicalConnection.txt @@ -2,13 +2,13 @@ target TypeScript reactor Source { - output y: number + output y: number reaction(startup) -> y {= y = 42 =} } reactor Destination { - input x: number + input x: number reaction(x) {= let time = util.getElapsedLogicalTime(); diff --git a/test/known-good/TypeScript/src/Preamble.txt b/test/known-good/TypeScript/src/Preamble.txt index f1f684933..06f7b7b4a 100644 --- a/test/known-good/TypeScript/src/Preamble.txt +++ b/test/known-good/TypeScript/src/Preamble.txt @@ -1,10 +1,10 @@ target TypeScript { - timeout: 2 sec + timeout: 2 sec } main reactor Preamble { preamble {= - function add42( i:number) { + function add42( i:number) { return i + 42; } =} diff --git a/test/known-good/TypeScript/src/ReadOutputOfContainedReactor.txt b/test/known-good/TypeScript/src/ReadOutputOfContainedReactor.txt index 322da8f98..dcec81114 100644 --- a/test/known-good/TypeScript/src/ReadOutputOfContainedReactor.txt +++ b/test/known-good/TypeScript/src/ReadOutputOfContainedReactor.txt @@ -3,14 +3,14 @@ target TypeScript reactor Contained { - output out: number + output out: number reaction(startup) -> out {= out = 42; =} } main reactor ReadOutputOfContainedReactor { c = new Contained() - state count: number(0) + state count: number(0) reaction(startup) c.out {= console.log("Startup reaction reading output of contained reactor: " + c.out); diff --git a/test/known-good/TypeScript/src/Schedule.txt b/test/known-good/TypeScript/src/Schedule.txt index 39ecd7d15..fba99c4a8 100644 --- a/test/known-good/TypeScript/src/Schedule.txt +++ b/test/known-good/TypeScript/src/Schedule.txt @@ -3,7 +3,7 @@ target TypeScript reactor ScheduleLogicalAction { - input x: number + input x: number logical action a reaction(x) -> a {= actions.a.schedule(TimeValue.msec(200), null) =} diff --git a/test/known-good/TypeScript/src/ScheduleLogicalAction.txt b/test/known-good/TypeScript/src/ScheduleLogicalAction.txt index a85865478..fe5466bc1 100644 --- a/test/known-good/TypeScript/src/ScheduleLogicalAction.txt +++ b/test/known-good/TypeScript/src/ScheduleLogicalAction.txt @@ -1,13 +1,13 @@ // This checks that a logical action is scheduled the specified logical time // after the current logical time. target TypeScript { - fast: true, - timeout: 3 sec + fast: true, + timeout: 3 sec } reactor foo { - input x: number - output y: number + input x: number + output y: number logical action a reaction(x) -> y, a {= @@ -21,8 +21,8 @@ } reactor print { - state expected_time: time(0) - input x: number + state expected_time: time(0) + input x: number reaction(x) {= let elapsed_time = util.getElapsedLogicalTime(); diff --git a/test/known-good/TypeScript/src/SendingInside.txt b/test/known-good/TypeScript/src/SendingInside.txt index 2c624506c..500116de1 100644 --- a/test/known-good/TypeScript/src/SendingInside.txt +++ b/test/known-good/TypeScript/src/SendingInside.txt @@ -1,13 +1,13 @@ // This tests a reactor that contains another reactor and also has its own // reaction that routes inputs to the contained reactor. target TypeScript { - timeout: 10 sec, - fast: true + timeout: 10 sec, + fast: true } reactor Printer { - input x: number - state count: number(1) + input x: number + state count: number(1) reaction(x) {= console.log("Inside reactor received: " + x); @@ -19,7 +19,7 @@ } main reactor SendingInside { - state count: number(0) + state count: number(0) timer t(0, 1 sec) p = new Printer() diff --git a/test/known-good/TypeScript/src/SendingInside2.txt b/test/known-good/TypeScript/src/SendingInside2.txt index 94e04340a..2653088ae 100644 --- a/test/known-good/TypeScript/src/SendingInside2.txt +++ b/test/known-good/TypeScript/src/SendingInside2.txt @@ -1,7 +1,7 @@ target TypeScript reactor Printer { - input x: number + input x: number reaction(x) {= console.log("Inside reactor received:" + x ); diff --git a/test/known-good/TypeScript/src/SendsPointerTest.txt b/test/known-good/TypeScript/src/SendsPointerTest.txt index a8d3d7916..eea31217a 100644 --- a/test/known-good/TypeScript/src/SendsPointerTest.txt +++ b/test/known-good/TypeScript/src/SendsPointerTest.txt @@ -3,20 +3,20 @@ target TypeScript reactor SendsPointer { - output out: {= {value: number} =} + output out: {= {value: number} =} reaction(startup) -> out {= - let my_object = { value: 42 }; + let my_object = { value: 42 }; out = my_object; =} } // expected parameter is for testing. -reactor Print(expected: {= {value: number} =}({= { value: 42 } =})) { - input x: {= {value: number} =} +reactor Print(expected: {= {value: number} =}({= { value: 42 } =})) { + input x: {= {value: number} =} reaction(x) {= - x = x as {value: number}; + x = x as {value: number}; console.log("Received: " + JSON.stringify(x)); if (x.value != expected.value) { util.requestErrorStop("ERROR: Expected x.value to be " + expected.value); diff --git a/test/known-good/TypeScript/src/SimpleDeadline.txt b/test/known-good/TypeScript/src/SimpleDeadline.txt index 7bc63e3b0..9d5544b98 100644 --- a/test/known-good/TypeScript/src/SimpleDeadline.txt +++ b/test/known-good/TypeScript/src/SimpleDeadline.txt @@ -3,9 +3,9 @@ // violation. target TypeScript -reactor Deadline(threshold: time(100 msec)) { - input x: number - output deadlineViolation: boolean +reactor Deadline(threshold: time(100 msec)) { + input x: number + output deadlineViolation: boolean reaction(x) -> deadlineViolation {= util.requestErrorStop("ERROR: Deadline violation was not detected!") @@ -18,7 +18,7 @@ } reactor Print { - input x: boolean + input x: boolean reaction(x) {= if (x) { diff --git a/test/known-good/TypeScript/src/SlowingClock.txt b/test/known-good/TypeScript/src/SlowingClock.txt index a00c9ec4c..1ac19a987 100644 --- a/test/known-good/TypeScript/src/SlowingClock.txt +++ b/test/known-good/TypeScript/src/SlowingClock.txt @@ -1,17 +1,17 @@ target TypeScript { - timeout: 5 sec, - fast: true + timeout: 5 sec, + fast: true } main reactor SlowingClock { logical action a(100 msec) - state interval: time(100 msec) - state expected_time: time(100 msec) + state interval: time(100 msec) + state expected_time: time(100 msec) reaction(startup) -> a {= actions.a.schedule(0, null); =} reaction(a) -> a {= - let elapsed_logical_time : TimeValue = util.getElapsedLogicalTime(); + let elapsed_logical_time : TimeValue = util.getElapsedLogicalTime(); console.log("Logical time since start: " + elapsed_logical_time); if (!elapsed_logical_time.isEqualTo(expected_time)) { util.requestErrorStop("ERROR: Expected time to be: " + expected_time) diff --git a/test/known-good/TypeScript/src/SlowingClockPhysical.txt b/test/known-good/TypeScript/src/SlowingClockPhysical.txt index a98535f05..89e3b60f1 100644 --- a/test/known-good/TypeScript/src/SlowingClockPhysical.txt +++ b/test/known-good/TypeScript/src/SlowingClockPhysical.txt @@ -9,13 +9,13 @@ * next event. */ target TypeScript { - timeout: 1 sec + timeout: 1 sec } main reactor SlowingClockPhysical { physical action a(100 msec) - state interval: time(100 msec) - state expected_time: time(100 msec) + state interval: time(100 msec) + state expected_time: time(100 msec) reaction(startup) -> a {= expected_time = TimeValue.msec(100); diff --git a/test/known-good/TypeScript/src/Stop.txt b/test/known-good/TypeScript/src/Stop.txt index 95bd3edfa..52719f568 100644 --- a/test/known-good/TypeScript/src/Stop.txt +++ b/test/known-good/TypeScript/src/Stop.txt @@ -6,21 +6,21 @@ * @author Byeong-gil Jun */ target TypeScript { - timeout: 11 msec + timeout: 11 msec } import Sender from "lib/LoopedActionSender.lf" reactor Consumer { - input in1: number - state reactionInvokedCorrectly: boolean(false) + input in1: number + state reactionInvokedCorrectly: boolean(false) reaction(in1) {= const currentTag = util.getCurrentTag(); const compareTag = util.getStartTag().getLaterTag(TimeValue.msec(10)); if (compareTag.getMicroStepsLater(9).isSmallerThan(currentTag)) { // The reaction should not have been called at tags larger than (10 msec, 9) - util.requestErrorStop(`ERROR: Invoked reaction(in) at tag bigger than shutdown.`); + util.requestErrorStop(`ERROR: Invoked reaction(in) at tag bigger than shutdown.`); } else if (currentTag.isSimultaneousWith(compareTag.getMicroStepsLater(8))) { // Call util.requestStop() at relative tag (10 msec, 8) console.log(`Requesting stop.`); @@ -37,15 +37,15 @@ // Check to see if shutdown is called at relative tag (10 msec, 9) if (currentTag.isSimultaneousWith(compareTag.getMicroStepsLater(9)) && reactionInvokedCorrectly === true) { - console.log(`SUCCESS: successfully enforced stop.`); + console.log(`SUCCESS: successfully enforced stop.`); } else if(!currentTag.isSmallerThan(compareTag.getMicroStepsLater(9)) && !currentTag.isSimultaneousWith(compareTag.getMicroStepsLater(9))) { - util.requestErrorStop(`ERROR: Shutdown invoked at tag ` + util.requestErrorStop(`ERROR: Shutdown invoked at tag ` + `(${currentTag.time.subtract(util.getStartTime())}, ` + `${currentTag.microstep}). Failed to enforce timeout.`); } else if (reactionInvokedCorrectly === false) { // Check to see if reactions were called correctly - util.requestErrorStop(`ERROR: Failed to invoke reaction(in) at tag ` + util.requestErrorStop(`ERROR: Failed to invoke reaction(in) at tag ` + `(${currentTag.time.subtract(util.getStartTime())}, ` + `${currentTag.microstep}). Failed to enforce timeout.`); } diff --git a/test/known-good/TypeScript/src/Stride.txt b/test/known-good/TypeScript/src/Stride.txt index 58b849d7a..5e38ee276 100644 --- a/test/known-good/TypeScript/src/Stride.txt +++ b/test/known-good/TypeScript/src/Stride.txt @@ -1,13 +1,13 @@ // This example illustrates state variables and parameters on the wiki. For this // test, success is just compiling and running. target TypeScript { - timeout: 2 sec, - fast: true + timeout: 2 sec, + fast: true } -reactor Count(stride: number(1)) { - state count: number(0) - output y: number +reactor Count(stride: number(1)) { + state count: number(0) + output y: number timer t(0, 100 msec) reaction(t) -> y {= @@ -17,7 +17,7 @@ } reactor Display { - input x: number + input x: number reaction(x) {= console.log("Received: " + x); =} } diff --git a/test/known-good/TypeScript/src/StructAsState.txt b/test/known-good/TypeScript/src/StructAsState.txt index 56f1153de..7535ff315 100644 --- a/test/known-good/TypeScript/src/StructAsState.txt +++ b/test/known-good/TypeScript/src/StructAsState.txt @@ -4,11 +4,11 @@ main reactor StructAsState { preamble {= type hello_t = { - name: string ; - value: number; + name: string ; + value: number; } =} - state s: hello_t({= {name: "Earth", value: 42} =}) + state s: hello_t({= {name: "Earth", value: 42} =}) reaction(startup) {= console.log("State s.name=" + s.name + ", s.value=" + s.value); diff --git a/test/known-good/TypeScript/src/StructAsType.txt b/test/known-good/TypeScript/src/StructAsType.txt index 3b5890bb4..7c8b9723e 100644 --- a/test/known-good/TypeScript/src/StructAsType.txt +++ b/test/known-good/TypeScript/src/StructAsType.txt @@ -4,22 +4,22 @@ reactor Source { preamble {= type hello_t = { - name: string ; - value: number; + name: string ; + value: number; } =} - output out: hello_t + output out: hello_t reaction(startup) -> out {= // Create the struct on the stack and then copy // it to the output as follows: - let temp: hello_t = {name: "Earth", value: 42} + let temp: hello_t = {name: "Earth", value: 42} out = temp; =} } -reactor Print(expected: number(42)) { // expected parameter is for testing. - input x: hello_t +reactor Print(expected: number(42)) { // expected parameter is for testing. + input x: hello_t reaction(x) {= x = x as hello_t; diff --git a/test/known-good/TypeScript/src/StructAsTypeDirect.txt b/test/known-good/TypeScript/src/StructAsTypeDirect.txt index 8fa17ffd0..7c9ee832f 100644 --- a/test/known-good/TypeScript/src/StructAsTypeDirect.txt +++ b/test/known-good/TypeScript/src/StructAsTypeDirect.txt @@ -4,22 +4,22 @@ reactor Source { preamble {= type hello_t = { - name: string ; - value: number; + name: string ; + value: number; } =} - output out: hello_t + output out: hello_t reaction(startup) -> out {= - let temp: hello_t = {name: "", value: 0}; + let temp: hello_t = {name: "", value: 0}; temp.name = "Earth"; temp.value = 42; out = temp; =} } -reactor Print(expected: number(42)) { // expected parameter is for testing. - input x: hello_t +reactor Print(expected: number(42)) { // expected parameter is for testing. + input x: hello_t reaction(x) {= x = x as hello_t; diff --git a/test/known-good/TypeScript/src/StructPrint.txt b/test/known-good/TypeScript/src/StructPrint.txt index 2cc54e49b..fb7cdc80a 100644 --- a/test/known-good/TypeScript/src/StructPrint.txt +++ b/test/known-good/TypeScript/src/StructPrint.txt @@ -5,20 +5,20 @@ reactor Source { preamble {= type hello_t = { - name: string ; - value: number; + name: string ; + value: number; } =} - output out: hello_t + output out: hello_t reaction(startup) -> out {= - let temp: hello_t = {name: "Earth", value: 42} + let temp: hello_t = {name: "Earth", value: 42} out = temp; =} } -reactor Print(expected: number(42)) { // expected parameter is for testing. - input x: hello_t +reactor Print(expected: number(42)) { // expected parameter is for testing. + input x: hello_t reaction(x) {= x = x as hello_t; diff --git a/test/known-good/TypeScript/src/StructScale.txt b/test/known-good/TypeScript/src/StructScale.txt index 0d17bf3ef..56b226b9c 100644 --- a/test/known-good/TypeScript/src/StructScale.txt +++ b/test/known-good/TypeScript/src/StructScale.txt @@ -6,11 +6,11 @@ import Print, Source from "StructPrint.lf" -reactor Scale(scale: number(2)) { +reactor Scale(scale: number(2)) { // Mutable keyword indicates that this reactor wants a writable copy of the // input. - mutable input x: hello_t - output out: hello_t + mutable input x: hello_t + output out: hello_t reaction(x) -> out {= x = x as hello_t diff --git a/test/known-good/TypeScript/src/TestForPreviousOutput.txt b/test/known-good/TypeScript/src/TestForPreviousOutput.txt index f083a3538..c0b8dceaf 100644 --- a/test/known-good/TypeScript/src/TestForPreviousOutput.txt +++ b/test/known-good/TypeScript/src/TestForPreviousOutput.txt @@ -3,7 +3,7 @@ target TypeScript reactor Source { - output out: number + output out: number reaction(startup) -> out {= // Note: Math.random can't be seeded @@ -24,7 +24,7 @@ } reactor Sink { - input x: number + input x: number reaction(x) {= x = x as number; diff --git a/test/known-good/TypeScript/src/TimeLimit.txt b/test/known-good/TypeScript/src/TimeLimit.txt index 7fb45b86b..48aacfb2d 100644 --- a/test/known-good/TypeScript/src/TimeLimit.txt +++ b/test/known-good/TypeScript/src/TimeLimit.txt @@ -3,14 +3,14 @@ // Correct output for this 1, 2, 3, 4. Failure for this test is failing to halt // or getting the wrong data. target TypeScript { - fast: true, - logging: INFO + fast: true, + logging: INFO } -reactor Clock(offset: time(0), period: time(1 sec)) { - output y: number +reactor Clock(offset: time(0), period: time(1 sec)) { + output y: number timer t(offset, period) - state count: number(0) + state count: number(0) reaction(t) -> y {= count++; @@ -19,8 +19,8 @@ } reactor Destination { - input x: number - state s: number(1) + input x: number + state s: number(1) reaction(x) {= if (x != s) { @@ -30,7 +30,7 @@ =} } -main reactor TimeLimit(period: time(1 msec)) { // usecs take a little too long +main reactor TimeLimit(period: time(1 msec)) { // usecs take a little too long timer stop(10 sec) c = new Clock(period = period) diff --git a/test/known-good/TypeScript/src/TimeState.txt b/test/known-good/TypeScript/src/TimeState.txt index 0fbfb9cc3..56c5747b1 100644 --- a/test/known-good/TypeScript/src/TimeState.txt +++ b/test/known-good/TypeScript/src/TimeState.txt @@ -1,7 +1,7 @@ target TypeScript -reactor Foo(bar: number(42)) { - state baz: time(500 msec) +reactor Foo(bar: number(42)) { + state baz: time(500 msec) reaction(startup) {= console.log("Baz: " + baz); =} } diff --git a/test/known-good/TypeScript/src/Wcet.txt b/test/known-good/TypeScript/src/Wcet.txt index 669448ce9..f2a59eaf4 100644 --- a/test/known-good/TypeScript/src/Wcet.txt +++ b/test/known-good/TypeScript/src/Wcet.txt @@ -2,8 +2,8 @@ target TypeScript reactor Source { - output out1: number - output out2: number + output out1: number + output out2: number timer t reaction(t) -> out1, out2 {= @@ -13,12 +13,12 @@ } reactor Work { - input in1: number - input in2: number - output out: number + input in1: number + input in2: number + output out: number reaction(in1, in2) -> out {= - let ret:number; + let ret:number; if ((in1 as number) > 10) { ret = (in2 as number) * (in1 as number); } else { @@ -29,7 +29,7 @@ } reactor Print { - input x: number + input x: number reaction(x) {= console.log("Received: " + x); =} } diff --git a/test/known-good/TypeScript/src/concurrent/AsyncCallback.txt b/test/known-good/TypeScript/src/concurrent/AsyncCallback.txt index d4591e838..906b1672e 100644 --- a/test/known-good/TypeScript/src/concurrent/AsyncCallback.txt +++ b/test/known-good/TypeScript/src/concurrent/AsyncCallback.txt @@ -1,12 +1,12 @@ // Test asynchronous callbacks that trigger a physical action. target TypeScript { - timeout: 2 sec, - keepalive: true // Not really needed here because there is a timer. + timeout: 2 sec, + keepalive: true // Not really needed here because there is a timer. } main reactor AsyncCallback { preamble {= - function callback(a : Sched) { + function callback(a : Sched) { // Schedule twice. If the action is not physical, these should // get consolidated into a single action triggering. If it is, // then they cause two separate triggerings with close but not @@ -17,11 +17,11 @@ } =} timer t(0, 200 msec) - state expected_time: time(100 msec) - state toggle: boolean(false) + state expected_time: time(100 msec) + state toggle: boolean(false) - physical action a(100 msec): number - state i: number(0) + physical action a(100 msec): number + state i: number(0) reaction(t) -> a {= // set a timeout for the callback diff --git a/test/known-good/TypeScript/src/docker/HelloWorldContainerized.txt b/test/known-good/TypeScript/src/docker/HelloWorldContainerized.txt index 4ab1419e8..66376336b 100644 --- a/test/known-good/TypeScript/src/docker/HelloWorldContainerized.txt +++ b/test/known-good/TypeScript/src/docker/HelloWorldContainerized.txt @@ -1,5 +1,5 @@ target TypeScript { - docker: true + docker: true } import HelloWorldInside from "../HelloWorld.lf" diff --git a/test/known-good/TypeScript/src/docker/federated/DistributedCountContainerized.txt b/test/known-good/TypeScript/src/docker/federated/DistributedCountContainerized.txt index 27281402e..ea1e169a1 100644 --- a/test/known-good/TypeScript/src/docker/federated/DistributedCountContainerized.txt +++ b/test/known-good/TypeScript/src/docker/federated/DistributedCountContainerized.txt @@ -4,14 +4,14 @@ * @author Hou Seng (Steven) Wong */ target TypeScript { - timeout: 5 sec, - docker: true + timeout: 5 sec, + docker: true } import Count from "../../lib/Count.lf" import Print from "../../federated/DistributedCount.lf" -federated reactor(offset: time(200 msec)) at rti { +federated reactor(offset: time(200 msec)) at rti { c = new Count() p = new Print() c.out -> p.inp after offset diff --git a/test/known-good/TypeScript/src/federated/ChainWithDelay.txt b/test/known-good/TypeScript/src/federated/ChainWithDelay.txt index fb7ac7689..87b9fb4ec 100644 --- a/test/known-good/TypeScript/src/federated/ChainWithDelay.txt +++ b/test/known-good/TypeScript/src/federated/ChainWithDelay.txt @@ -5,7 +5,7 @@ * @author Youri Su */ target TypeScript { - timeout: 3 msec + timeout: 3 msec } import Count from "../lib/Count.lf" diff --git a/test/known-good/TypeScript/src/federated/DistributedCount.txt b/test/known-good/TypeScript/src/federated/DistributedCount.txt index f6ccdd347..d09bbd177 100644 --- a/test/known-good/TypeScript/src/federated/DistributedCount.txt +++ b/test/known-good/TypeScript/src/federated/DistributedCount.txt @@ -7,14 +7,14 @@ * @author Hokeun Kim */ target TypeScript { - timeout: 5 sec + timeout: 5 sec } import Count from "../lib/Count.lf" reactor Print { - input inp: number - state c: number(1) + input inp: number + state c: number(1) reaction(inp) {= const elapsedTime = util.getElapsedLogicalTime(); @@ -35,7 +35,7 @@ =} } -federated reactor DistributedCount(offset: time(200 msec)) { +federated reactor DistributedCount(offset: time(200 msec)) { c = new Count() p = new Print() c.out -> p.inp after offset diff --git a/test/known-good/TypeScript/src/federated/DistributedCountPhysical.txt b/test/known-good/TypeScript/src/federated/DistributedCountPhysical.txt index 2169ed7b3..14400f06e 100644 --- a/test/known-good/TypeScript/src/federated/DistributedCountPhysical.txt +++ b/test/known-good/TypeScript/src/federated/DistributedCountPhysical.txt @@ -9,13 +9,13 @@ * @author Byeong-gil Jun */ target TypeScript { - timeout: 1 sec + timeout: 1 sec } reactor Count { timer t(200 msec, 1 sec) - state s: number(0) - output out: number + state s: number(0) + output out: number reaction(t) -> out {= out = s; @@ -24,18 +24,18 @@ } reactor Print { - input inp: number - state c: number(0) - state compareTime: time(200 msec) + input inp: number + state c: number(0) + state compareTime: time(200 msec) reaction(inp) {= let elapsedTime = util.getElapsedLogicalTime(); console.log(`At time ${elapsedTime}, received ${inp}.`); if (inp !== c) { - util.requestErrorStop(`ERROR: Expected to receive ${c}.`); + util.requestErrorStop(`ERROR: Expected to receive ${c}.`); } if (!(elapsedTime.isLaterThan(compareTime))) { - util.requestErrorStop(`ERROR: Expected time to be strictly greater than ${compareTime}. Got ${elapsedTime}.`); + util.requestErrorStop(`ERROR: Expected time to be strictly greater than ${compareTime}. Got ${elapsedTime}.`); } compareTime = compareTime.add(TimeValue.sec(1)); c++; @@ -43,7 +43,7 @@ reaction(shutdown) {= if (c !== 1) { - util.requestErrorStop(`ERROR: Expected to receive 1 item. Received ${c}.`); + util.requestErrorStop(`ERROR: Expected to receive 1 item. Received ${c}.`); } console.log("SUCCESS: Successfully received 1 item."); =} diff --git a/test/known-good/TypeScript/src/federated/DistributedDoublePort.txt b/test/known-good/TypeScript/src/federated/DistributedDoublePort.txt index 48b259d38..40fb73177 100644 --- a/test/known-good/TypeScript/src/federated/DistributedDoublePort.txt +++ b/test/known-good/TypeScript/src/federated/DistributedDoublePort.txt @@ -7,19 +7,19 @@ * @author Hokeun Kim */ target TypeScript { - timeout: 900 msec, - coordination-options: { - advance-message-interval: 100 msec + timeout: 900 msec, + coordination-options: { + advance-message-interval: 100 msec }, - logging: DEBUG -} + logging: DEBUG +} import Count from "../lib/Count.lf" reactor CountMicrostep { - state count: number(1) - output out: number - logical action act: number + state count: number(1) + output out: number + logical action act: number timer t(0, 1 sec) reaction(t) -> act {= actions.act.schedule(0, count++); =} @@ -28,8 +28,8 @@ } reactor Print { - input inp: number - input inp2: number + input inp: number + input inp2: number reaction(inp, inp2) {= const elapsedTime = util.getElapsedLogicalTime(); diff --git a/test/known-good/TypeScript/src/federated/DistributedLoopedAction.txt b/test/known-good/TypeScript/src/federated/DistributedLoopedAction.txt index 7cede4104..6c7858e49 100644 --- a/test/known-good/TypeScript/src/federated/DistributedLoopedAction.txt +++ b/test/known-good/TypeScript/src/federated/DistributedLoopedAction.txt @@ -6,16 +6,16 @@ * @author Hokeun Kim */ target TypeScript { - timeout: 1 sec + timeout: 1 sec } import Sender from "../lib/LoopedActionSender.lf" -reactor Receiver(takeBreakAfter: number(10), breakInterval: time(400 msec)) { - input inp: number - state receivedMessages: number(0) - state totalReceivedMessages: number(0) - state breaks: number(0) +reactor Receiver(takeBreakAfter: number(10), breakInterval: time(400 msec)) { + input inp: number + state receivedMessages: number(0) + state totalReceivedMessages: number(0) + state breaks: number(0) timer t(0, 1 msec) // This will impact the performance // but forces the logical time to advance Comment this line for a more diff --git a/test/known-good/TypeScript/src/federated/DistributedLoopedPhysicalAction.txt b/test/known-good/TypeScript/src/federated/DistributedLoopedPhysicalAction.txt index d1ee89de1..12e28a4fb 100644 --- a/test/known-good/TypeScript/src/federated/DistributedLoopedPhysicalAction.txt +++ b/test/known-good/TypeScript/src/federated/DistributedLoopedPhysicalAction.txt @@ -7,13 +7,13 @@ * @author Hokeun Kim */ target TypeScript { - timeout: 1 sec + timeout: 1 sec } -reactor Sender(takeBreakAfter: number(10), breakInterval: time(550 msec)) { - output out: number +reactor Sender(takeBreakAfter: number(10), breakInterval: time(550 msec)) { + output out: number physical action act - state sentMessages: number(0) + state sentMessages: number(0) reaction(startup, act) -> act, out {= // Send a message on out @@ -29,11 +29,11 @@ =} } -reactor Receiver(takeBreakAfter: number(10), breakInterval: time(550 msec)) { - input inp: number - state receivedMessages: number(0) - state totalReceivedMessages: number(0) - state breaks: number(0) +reactor Receiver(takeBreakAfter: number(10), breakInterval: time(550 msec)) { + input inp: number + state receivedMessages: number(0) + state totalReceivedMessages: number(0) + state breaks: number(0) timer t(0, 1 msec) // This will impact the performance // but forces the logical time to advance Comment this line for a more diff --git a/test/known-good/TypeScript/src/federated/DistributedStop.txt b/test/known-good/TypeScript/src/federated/DistributedStop.txt index 19ffba2e5..b56253836 100644 --- a/test/known-good/TypeScript/src/federated/DistributedStop.txt +++ b/test/known-good/TypeScript/src/federated/DistributedStop.txt @@ -8,10 +8,10 @@ target TypeScript reactor Sender { - output out: number + output out: number timer t(0, 1 usec) logical action act - state reaction_invoked_correctly: boolean(false) + state reaction_invoked_correctly: boolean(false) reaction(t, act) -> out, act {= console.log(`Sending 42 at (${util.getElapsedLogicalTime()}, ` @@ -45,23 +45,23 @@ reaction(shutdown) {= if (!util.getElapsedLogicalTime().isEqualTo(TimeValue.usec(1)) || util.getCurrentTag().microstep !== 1) { - util.requestErrorStop(`ERROR: Sender failed to stop the federation in time.` + util.requestErrorStop(`ERROR: Sender failed to stop the federation in time.` + `Stopping at (${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`); } else if (reaction_invoked_correctly === false) { util.requestErrorStop("ERROR: Sender reaction(t, act) was not invoked at (1usec, 1)." + `Stopping at (${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep})`); } else { - console.log(`SUCCESS: Successfully stopped the federation at ` + console.log(`SUCCESS: Successfully stopped the federation at ` + `(${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`); } =} } reactor Receiver( - stp_offset: time(10 msec) // Used in the decentralized variant of the test + stp_offset: time(10 msec) // Used in the decentralized variant of the test ) { - input in1: number - state reaction_invoked_correctly: boolean(false) + input in1: number + state reaction_invoked_correctly: boolean(false) reaction(in1) {= console.log(`Received ${in1} at (${util.getElapsedLogicalTime()}, ` @@ -87,13 +87,13 @@ // receiver. if (!util.getElapsedLogicalTime().isEqualTo(TimeValue.usec(1)) || util.getCurrentTag().microstep !== 1) { - util.requestErrorStop(`ERROR: Receiver failed to stop the federation at the right time. ` + util.requestErrorStop(`ERROR: Receiver failed to stop the federation at the right time. ` + `Stopping at (${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`); } else if (reaction_invoked_correctly === false) { util.requestErrorStop("Receiver reaction(in) was not invoked the correct number of times. " + `Stopping at (${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep})`); } - console.log(`SUCCESS: Successfully stopped the federation at ` + console.log(`SUCCESS: Successfully stopped the federation at ` + `(${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`); =} } diff --git a/test/known-good/TypeScript/src/federated/DistributedStopZero.txt b/test/known-good/TypeScript/src/federated/DistributedStopZero.txt index cc20dd014..0d2c78ede 100644 --- a/test/known-good/TypeScript/src/federated/DistributedStopZero.txt +++ b/test/known-good/TypeScript/src/federated/DistributedStopZero.txt @@ -8,7 +8,7 @@ target TypeScript reactor Sender { - output out: number + output out: number timer t(0, 1 usec) reaction(t) -> out {= @@ -28,16 +28,16 @@ reaction(shutdown) {= if (!util.getElapsedLogicalTime().isEqualTo(TimeValue.usec(0))|| util.getCurrentTag().microstep !== 1) { - util.requestErrorStop(`ERROR: Sender failed to stop the federation in time. ` + util.requestErrorStop(`ERROR: Sender failed to stop the federation in time. ` + `Stopping at (${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`); } - console.log(`SUCCESS: Successfully stopped the federation at ` + console.log(`SUCCESS: Successfully stopped the federation at ` + `(${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`); =} } reactor Receiver { - input in1: number + input in1: number reaction(in1) {= console.log(`Received ${in1} at (${util.getElapsedLogicalTime()}, ` @@ -57,10 +57,10 @@ // receiver. if (!util.getElapsedLogicalTime().isEqualTo(TimeValue.usec(0)) || util.getCurrentTag().microstep !== 1) { - util.requestErrorStop(`ERROR: Receiver failed to stop the federation at the right time. ` + util.requestErrorStop(`ERROR: Receiver failed to stop the federation at the right time. ` + `Stopping at (${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`); } - console.log(`SUCCESS: Successfully stopped the federation at ` + console.log(`SUCCESS: Successfully stopped the federation at ` + `(${util.getElapsedLogicalTime()}, ${util.getCurrentTag().microstep}).`); =} } diff --git a/test/known-good/TypeScript/src/federated/HelloDistributed.txt b/test/known-good/TypeScript/src/federated/HelloDistributed.txt index 542407af9..cda22c634 100644 --- a/test/known-good/TypeScript/src/federated/HelloDistributed.txt +++ b/test/known-good/TypeScript/src/federated/HelloDistributed.txt @@ -9,7 +9,7 @@ target TypeScript reactor Source { - output out: string + output out: string reaction(startup) -> out {= console.log("Sending 'Hello World!' message from source federate."); @@ -19,8 +19,8 @@ } reactor Destination { - input inp: string - state received: boolean(false) + input inp: string + state received: boolean(false) reaction(startup) {= console.log("Destination started."); =} diff --git a/test/known-good/TypeScript/src/federated/LoopDistributedCentralized.txt b/test/known-good/TypeScript/src/federated/LoopDistributedCentralized.txt index 8b44c8a4e..3d0ee7058 100644 --- a/test/known-good/TypeScript/src/federated/LoopDistributedCentralized.txt +++ b/test/known-good/TypeScript/src/federated/LoopDistributedCentralized.txt @@ -6,19 +6,19 @@ * @author Hokeun Kim */ target TypeScript { - timeout: 5 sec + timeout: 5 sec } -reactor Looper(incr: number(1), delay: time(0 msec)) { - input inp: number - output out: number +reactor Looper(incr: number(1), delay: time(0 msec)) { + input inp: number + output out: number physical action a(delay) - state count: number(0) + state count: number(0) preamble {= let stop = false; // Function to trigger an action once every second. - function ping(act: any) { + function ping(act: any) { if (!stop) { console.log("Scheduling action."); act.schedule(0, null); @@ -57,7 +57,7 @@ =} } -federated reactor LoopDistributedCentralized(delay: time(0)) { +federated reactor LoopDistributedCentralized(delay: time(0)) { left = new Looper() right = new Looper(incr = -1) left.out -> right.inp diff --git a/test/known-good/TypeScript/src/federated/LoopDistributedDouble.txt b/test/known-good/TypeScript/src/federated/LoopDistributedDouble.txt index 0d3468896..76f7bc641 100644 --- a/test/known-good/TypeScript/src/federated/LoopDistributedDouble.txt +++ b/test/known-good/TypeScript/src/federated/LoopDistributedDouble.txt @@ -6,26 +6,26 @@ * @author Hokeun Kim */ target TypeScript { - timeout: 5 sec, - keepAlive: true, - coordination-options: { - advance-message-interval: 100 msec + timeout: 5 sec, + keepAlive: true, + coordination-options: { + advance-message-interval: 100 msec } } -reactor Looper(incr: number(1), delay: time(0 msec)) { - input inp: number - input inp2: number - output out: number - output out2: number +reactor Looper(incr: number(1), delay: time(0 msec)) { + input inp: number + input inp2: number + output out: number + output out2: number physical action a(delay) - state count: number(0) + state count: number(0) timer t(0, 1 sec) preamble {= let stop = false; // Function to trigger an action once every second. - function ping(act: any) { + function ping(act: any) { if (!stop) { console.log("Scheduling action."); act.schedule(0, null); @@ -71,7 +71,7 @@ =} } -federated reactor(delay: time(0)) { +federated reactor(delay: time(0)) { left = new Looper() right = new Looper(incr = -1) left.out -> right.inp diff --git a/test/known-good/TypeScript/src/federated/PingPongDistributed.txt b/test/known-good/TypeScript/src/federated/PingPongDistributed.txt index 4a75fb29f..9e58bb989 100644 --- a/test/known-good/TypeScript/src/federated/PingPongDistributed.txt +++ b/test/known-good/TypeScript/src/federated/PingPongDistributed.txt @@ -1,10 +1,10 @@ /** This checks communication between federates */ target TypeScript -reactor Ping(count: number(10)) { - input receive: number - output send: number - state pingsLeft: number(count) +reactor Ping(count: number(10)) { + input receive: number + output send: number + state pingsLeft: number(count) logical action serve reaction(startup, serve) -> send {= @@ -23,10 +23,10 @@ =} } -reactor Pong(expected: number(10)) { - input receive: number - output send: number - state count: number(0) +reactor Pong(expected: number(10)) { + input receive: number + output send: number + state count: number(0) reaction(receive) -> send {= count += 1; @@ -45,7 +45,7 @@ =} } -federated reactor PingPongDistributed(count: number(10)) { +federated reactor PingPongDistributed(count: number(10)) { ping = new Ping(count = count) pong = new Pong(expected = count) ping.send -> pong.receive diff --git a/test/known-good/TypeScript/src/federated/PingPongDistributedPhysical.txt b/test/known-good/TypeScript/src/federated/PingPongDistributedPhysical.txt index d6e1f8a3d..be3c28c93 100644 --- a/test/known-good/TypeScript/src/federated/PingPongDistributedPhysical.txt +++ b/test/known-good/TypeScript/src/federated/PingPongDistributedPhysical.txt @@ -27,10 +27,10 @@ */ target TypeScript -reactor Ping(count: number(10)) { - input receive: number - output send: number - state pingsLeft: number(count) +reactor Ping(count: number(10)) { + input receive: number + output send: number + state pingsLeft: number(count) logical action serve reaction(startup, serve) -> send {= @@ -47,10 +47,10 @@ =} } -reactor Pong(expected: number(10)) { - input receive: number - output send: number - state count: number(0) +reactor Pong(expected: number(10)) { + input receive: number + output send: number + state count: number(0) reaction(receive) -> send {= count++; @@ -69,7 +69,7 @@ =} } -federated reactor(count: number(10)) { +federated reactor(count: number(10)) { ping = new Ping(count = count) pong = new Pong(expected = count) ping.send ~> pong.receive diff --git a/test/known-good/TypeScript/src/federated/SimpleFederated.txt b/test/known-good/TypeScript/src/federated/SimpleFederated.txt index 0985d176c..07b5364c7 100644 --- a/test/known-good/TypeScript/src/federated/SimpleFederated.txt +++ b/test/known-good/TypeScript/src/federated/SimpleFederated.txt @@ -1,10 +1,10 @@ target TypeScript { - timeout: 2 secs + timeout: 2 secs } reactor Fed { - input inp: number - output out: number + input inp: number + output out: number } federated reactor { diff --git a/test/known-good/TypeScript/src/federated/StopAtShutdown.txt b/test/known-good/TypeScript/src/federated/StopAtShutdown.txt index 0bf3cf36b..7cbd05112 100644 --- a/test/known-good/TypeScript/src/federated/StopAtShutdown.txt +++ b/test/known-good/TypeScript/src/federated/StopAtShutdown.txt @@ -4,11 +4,11 @@ * Original bug discovered by Steven Wong */ target TypeScript { - timeout: 2 sec + timeout: 2 sec } reactor A { - input inp: number + input inp: number reaction(startup) {= console.log("Hello World!"); =} @@ -18,7 +18,7 @@ } reactor B { - output out: number + output out: number timer t(1 sec) reaction(t) -> out {= out = 1; =} diff --git a/test/known-good/TypeScript/src/federated/TopLevelArtifacts.txt b/test/known-good/TypeScript/src/federated/TopLevelArtifacts.txt index 513688b48..e6947e152 100644 --- a/test/known-good/TypeScript/src/federated/TopLevelArtifacts.txt +++ b/test/known-good/TypeScript/src/federated/TopLevelArtifacts.txt @@ -9,14 +9,14 @@ * @author Youri Su */ target TypeScript { - timeout: 1 msec + timeout: 1 msec } import Count from "../lib/Count.lf" import TestCount from "../lib/TestCount.lf" federated reactor { - state successes: number(0) + state successes: number(0) logical action act timer t(0, 1 sec) diff --git a/test/known-good/TypeScript/src/lib/Count.txt b/test/known-good/TypeScript/src/lib/Count.txt index bc51d561d..d99b0a927 100644 --- a/test/known-good/TypeScript/src/lib/Count.txt +++ b/test/known-good/TypeScript/src/lib/Count.txt @@ -1,9 +1,9 @@ target TypeScript -reactor Count(offset: time(0), period: time(1 sec)) { - output out: number +reactor Count(offset: time(0), period: time(1 sec)) { + output out: number timer t(offset, period) - state count: number(1) + state count: number(1) reaction(t) -> out {= out = count++; =} } diff --git a/test/known-good/TypeScript/src/lib/Imported.txt b/test/known-good/TypeScript/src/lib/Imported.txt index cc0bf5d0a..9fff8e385 100644 --- a/test/known-good/TypeScript/src/lib/Imported.txt +++ b/test/known-good/TypeScript/src/lib/Imported.txt @@ -1,13 +1,13 @@ // This is used by the test for the ability to import a reactor definition that // itself imports a reactor definition. target TypeScript { - timeout: 2 sec + timeout: 2 sec } import ImportedAgain from "ImportedAgain.lf" reactor Imported { - input x: number + input x: number a = new ImportedAgain() reaction(x) -> a.x {= a.x = (x as number); =} diff --git a/test/known-good/TypeScript/src/lib/ImportedAgain.txt b/test/known-good/TypeScript/src/lib/ImportedAgain.txt index 643237b99..e56b11558 100644 --- a/test/known-good/TypeScript/src/lib/ImportedAgain.txt +++ b/test/known-good/TypeScript/src/lib/ImportedAgain.txt @@ -1,11 +1,11 @@ // This is used by the test for the ability to import a reactor definition that // itself imports a reactor definition. target TypeScript { - timeout: 2 sec + timeout: 2 sec } reactor ImportedAgain { - input x: number + input x: number reaction(x) {= console.log("Received: " + x); diff --git a/test/known-good/TypeScript/src/lib/InternalDelay.txt b/test/known-good/TypeScript/src/lib/InternalDelay.txt index 3759578b0..b17fd9e08 100644 --- a/test/known-good/TypeScript/src/lib/InternalDelay.txt +++ b/test/known-good/TypeScript/src/lib/InternalDelay.txt @@ -1,10 +1,10 @@ /** @author Youri Su */ target TypeScript -reactor InternalDelay(delay: TimeValue(10 msec)) { - input inp: number - output out: number - logical action d: number +reactor InternalDelay(delay: TimeValue(10 msec)) { + input inp: number + output out: number + logical action d: number reaction(inp) -> d {= actions.d.schedule(delay, inp as number); =} diff --git a/test/known-good/TypeScript/src/lib/LoopedActionSender.txt b/test/known-good/TypeScript/src/lib/LoopedActionSender.txt index 76591c120..5503eca08 100644 --- a/test/known-good/TypeScript/src/lib/LoopedActionSender.txt +++ b/test/known-good/TypeScript/src/lib/LoopedActionSender.txt @@ -12,10 +12,10 @@ * @param breakInterval: Determines how long the reactor should take a break * after sending takeBreakAfter messages. */ -reactor Sender(takeBreakAfter: number(10), breakInterval: time(400 msec)) { - output out: number +reactor Sender(takeBreakAfter: number(10), breakInterval: time(400 msec)) { + output out: number logical action act - state sentMessages: number(0) + state sentMessages: number(0) reaction(startup, act) -> act, out {= // Send a message on out diff --git a/test/known-good/TypeScript/src/lib/TestCount.txt b/test/known-good/TypeScript/src/lib/TestCount.txt index 0f9d5560b..575cd024e 100644 --- a/test/known-good/TypeScript/src/lib/TestCount.txt +++ b/test/known-good/TypeScript/src/lib/TestCount.txt @@ -9,10 +9,10 @@ */ target TypeScript -reactor TestCount(start: number(1), stride: number(1), numInputs: number(1)) { - state count: number(start) - state inputsReceived: number(0) - input inp: number +reactor TestCount(start: number(1), stride: number(1), numInputs: number(1)) { + state count: number(start) + state inputsReceived: number(0) + input inp: number reaction(inp) {= console.log("Received " + inp + "."); diff --git a/test/known-good/TypeScript/src/multiport/BankMulticast.txt b/test/known-good/TypeScript/src/multiport/BankMulticast.txt index 4f71ecdfe..9820c2d94 100644 --- a/test/known-good/TypeScript/src/multiport/BankMulticast.txt +++ b/test/known-good/TypeScript/src/multiport/BankMulticast.txt @@ -3,15 +3,15 @@ * also multicast via the container's output port. */ target TypeScript { - timeout: 3 sec + timeout: 3 sec } import Count from "../lib/Count.lf" import TestCount from "../lib/TestCount.lf" reactor Foo { - input inp: number - output out: number + input inp: number + output out: number c = new Count() c.out -> out @@ -21,9 +21,9 @@ } reactor Bar { - output[4] out: number + output[4] out: number - foo = new[4] Foo() + foo = new[4] Foo() foo.out -> foo.inp foo.out -> out @@ -32,7 +32,7 @@ main reactor { bar = new Bar() - d = new[4] TestCount(numInputs = 4) + d = new[4] TestCount(numInputs = 4) bar.out -> d.inp } diff --git a/test/known-good/TypeScript/src/multiport/BankMultiportToReaction.txt b/test/known-good/TypeScript/src/multiport/BankMultiportToReaction.txt index d41d3b4db..befbb0017 100644 --- a/test/known-good/TypeScript/src/multiport/BankMultiportToReaction.txt +++ b/test/known-good/TypeScript/src/multiport/BankMultiportToReaction.txt @@ -1,21 +1,21 @@ target TypeScript { - timeout: 5 sec + timeout: 5 sec } import Count from "../lib/Count.lf" reactor DoubleCount { - output[2] out: number + output[2] out: number c1 = new Count() c2 = new Count() c1.out, c2.out -> out } main reactor { - state count: number(1) - state received: boolean(false) + state count: number(1) + state received: boolean(false) - s = new[2] DoubleCount() + s = new[2] DoubleCount() reaction(s.out) {= for (let i = 0; i < s.length; i++) { diff --git a/test/known-good/TypeScript/src/multiport/BankReactionsInContainer.txt b/test/known-good/TypeScript/src/multiport/BankReactionsInContainer.txt index 385684fe1..190438207 100644 --- a/test/known-good/TypeScript/src/multiport/BankReactionsInContainer.txt +++ b/test/known-good/TypeScript/src/multiport/BankReactionsInContainer.txt @@ -2,13 +2,13 @@ * This tests an output that is broadcast back to a multiport input of a bank. */ target TypeScript { - timeout: 1 sec + timeout: 1 sec } reactor R { - output[2] out: number - input[2] inp: number - state received: boolean(false) + output[2] out: number + input[2] inp: number + state received: boolean(false) reaction(startup) -> out {= for (let i = 0; i < out.length; i++) { @@ -40,8 +40,8 @@ } main reactor { - s = new[2] R() - state received: boolean(false) + s = new[2] R() + state received: boolean(false) reaction(startup) -> s.inp {= let count = 0; diff --git a/test/known-good/TypeScript/src/multiport/BankSelfBroadcast.txt b/test/known-good/TypeScript/src/multiport/BankSelfBroadcast.txt index 93e930aff..4ab2dfb5b 100644 --- a/test/known-good/TypeScript/src/multiport/BankSelfBroadcast.txt +++ b/test/known-good/TypeScript/src/multiport/BankSelfBroadcast.txt @@ -10,9 +10,9 @@ target TypeScript reactor A { - input[4] inp: number - output out: number - state received: boolean(false) + input[4] inp: number + output out: number + state received: boolean(false) reaction(startup) -> out {= out = this.getBankIndex(); =} @@ -40,7 +40,7 @@ } main reactor { - a = new[4] A() + a = new[4] A() (a.out)+ -> a.inp } diff --git a/test/known-good/TypeScript/src/multiport/BankToBank.txt b/test/known-good/TypeScript/src/multiport/BankToBank.txt index 59db38494..05a397b9b 100644 --- a/test/known-good/TypeScript/src/multiport/BankToBank.txt +++ b/test/known-good/TypeScript/src/multiport/BankToBank.txt @@ -1,12 +1,12 @@ // Check bank of reactors sending to bank of reactors. target TypeScript { - timeout: 2 sec + timeout: 2 sec } reactor Source { timer t(0, 200 msec) - output out: number - state s: number(0) + output out: number + state s: number(0) reaction(t) -> out {= out = s; @@ -15,8 +15,8 @@ } reactor Destination { - state s: number(0) - input inp: number + state s: number(0) + input inp: number reaction(inp) {= console.log("Destination " + this.getBankIndex() + " received: " + inp); @@ -34,10 +34,10 @@ =} } -main reactor BankToBank(width: number(4)) { +main reactor BankToBank(width: number(4)) { // FIXME: Should set the width to "width" rather than "4". - a = new[4] Source() - b = new[4] Destination() + a = new[4] Source() + b = new[4] Destination() a.out -> b.inp } diff --git a/test/known-good/TypeScript/src/multiport/BankToBankMultiport.txt b/test/known-good/TypeScript/src/multiport/BankToBankMultiport.txt index 0af84747b..ff1de69a9 100644 --- a/test/known-good/TypeScript/src/multiport/BankToBankMultiport.txt +++ b/test/known-good/TypeScript/src/multiport/BankToBankMultiport.txt @@ -1,12 +1,12 @@ // Check bank of reactors sending to bank of reactors with multiports. target TypeScript { - timeout: 2 sec + timeout: 2 sec } -reactor Source(width: number(1)) { +reactor Source(width: number(1)) { timer t(0, 200 msec) - output[width] out: number - state s: number(0) + output[width] out: number + state s: number(0) reaction(t) -> out {= for(let i = 0; i < out.length; i++) { @@ -15,9 +15,9 @@ =} } -reactor Destination(width: number(1)) { - state s: number(6) - input[width] inp: number +reactor Destination(width: number(1)) { + state s: number(6) + input[width] inp: number reaction(inp) {= let sum = 0; @@ -40,9 +40,9 @@ =} } -main reactor BankToBankMultiport(bankWidth: number(4)) { - a = new[bankWidth] Source(width = 4) - b = new[bankWidth] Destination(width = 4) +main reactor BankToBankMultiport(bankWidth: number(4)) { + a = new[bankWidth] Source(width = 4) + b = new[bankWidth] Destination(width = 4) a.out -> b.inp } diff --git a/test/known-good/TypeScript/src/multiport/BankToBankMultiportAfter.txt b/test/known-good/TypeScript/src/multiport/BankToBankMultiportAfter.txt index 4b57537b0..7c46c7617 100644 --- a/test/known-good/TypeScript/src/multiport/BankToBankMultiportAfter.txt +++ b/test/known-good/TypeScript/src/multiport/BankToBankMultiportAfter.txt @@ -1,12 +1,12 @@ // Check bank of reactors sending to bank of reactors with multiports. target TypeScript { - timeout: 2 sec + timeout: 2 sec } -reactor Source(width: number(1)) { +reactor Source(width: number(1)) { timer t(0, 200 msec) - output[width] out: number - state s: number(0) + output[width] out: number + state s: number(0) reaction(t) -> out {= for(let i = 0; i < out.length; i++) { @@ -15,9 +15,9 @@ =} } -reactor Destination(width: number(1)) { - state s: number(6) - input[width] inp: number +reactor Destination(width: number(1)) { + state s: number(6) + input[width] inp: number reaction(inp) {= let sum = 0; @@ -40,9 +40,9 @@ =} } -main reactor(bankWidth: number(4)) { - a = new[bankWidth] Source(width = 4) - b = new[bankWidth] Destination(width = 4) +main reactor(bankWidth: number(4)) { + a = new[bankWidth] Source(width = 4) + b = new[bankWidth] Destination(width = 4) a.out -> b.inp after 200 msec } diff --git a/test/known-good/TypeScript/src/multiport/BankToMultiport.txt b/test/known-good/TypeScript/src/multiport/BankToMultiport.txt index 0e1cdc297..ef926c5f4 100644 --- a/test/known-good/TypeScript/src/multiport/BankToMultiport.txt +++ b/test/known-good/TypeScript/src/multiport/BankToMultiport.txt @@ -2,14 +2,14 @@ target TypeScript reactor Source { - output out: number + output out: number reaction(startup) -> out {= out = this.getBankIndex(); =} } reactor Sink { - input[4] inp: number - state received: boolean(false) + input[4] inp: number + state received: boolean(false) reaction(inp) {= for (let i = 0; i < inp.length; i++) { @@ -29,7 +29,7 @@ } main reactor BankToMultiport { - source = new[4] Source() + source = new[4] Source() sink = new Sink() source.out -> sink.inp } diff --git a/test/known-good/TypeScript/src/multiport/BankToReaction.txt b/test/known-good/TypeScript/src/multiport/BankToReaction.txt index 71bbd05a9..a6855d4bd 100644 --- a/test/known-good/TypeScript/src/multiport/BankToReaction.txt +++ b/test/known-good/TypeScript/src/multiport/BankToReaction.txt @@ -1,13 +1,13 @@ target TypeScript { - timeout: 5 sec + timeout: 5 sec } import Count from "../lib/Count.lf" main reactor { - state count: number(1) + state count: number(1) - s = new[2] Count() + s = new[2] Count() reaction(s.out) {= for (let i = 0; i < s.length; i++) { diff --git a/test/known-good/TypeScript/src/multiport/Broadcast.txt b/test/known-good/TypeScript/src/multiport/Broadcast.txt index ff007334c..cf84a8899 100644 --- a/test/known-good/TypeScript/src/multiport/Broadcast.txt +++ b/test/known-good/TypeScript/src/multiport/Broadcast.txt @@ -1,13 +1,13 @@ target TypeScript reactor Source { - output out: number + output out: number reaction(startup) -> out {= out = 42; =} } reactor Sink { - input inp: number + input inp: number reaction(inp) {= console.log("Received " + inp); @@ -19,7 +19,7 @@ main reactor { source = new Source() - sink = new[4] Sink() + sink = new[4] Sink() (source.out)+ -> sink.inp } diff --git a/test/known-good/TypeScript/src/multiport/BroadcastAfter.txt b/test/known-good/TypeScript/src/multiport/BroadcastAfter.txt index 39ee64724..12bd8a0d3 100644 --- a/test/known-good/TypeScript/src/multiport/BroadcastAfter.txt +++ b/test/known-good/TypeScript/src/multiport/BroadcastAfter.txt @@ -1,16 +1,16 @@ target TypeScript { - timeout: 2 sec + timeout: 2 sec } reactor Source { - output out: number + output out: number reaction(startup) -> out {= out = 42; =} } reactor Destination { - input inp: number - state received: boolean(false) + input inp: number + state received: boolean(false) reaction(inp) {= console.log("Destination " + this.getBankIndex() + " received " + inp + "."); @@ -34,7 +34,7 @@ main reactor { a = new Source() - b = new[4] Destination() + b = new[4] Destination() (a.out)+ -> b.inp after 1 sec } diff --git a/test/known-good/TypeScript/src/multiport/BroadcastMultipleAfter.txt b/test/known-good/TypeScript/src/multiport/BroadcastMultipleAfter.txt index 7bb3cbd93..c26822ae6 100644 --- a/test/known-good/TypeScript/src/multiport/BroadcastMultipleAfter.txt +++ b/test/known-good/TypeScript/src/multiport/BroadcastMultipleAfter.txt @@ -1,16 +1,16 @@ target TypeScript { - timeout: 2 sec + timeout: 2 sec } -reactor Source(value: number(42)) { - output out: number +reactor Source(value: number(42)) { + output out: number reaction(startup) -> out {= out = value; =} } reactor Destination { - input inp: number - state received: boolean(false) + input inp: number + state received: boolean(false) reaction(inp) {= console.log("Destination " + this.getBankIndex() + " received " + inp + "."); @@ -37,7 +37,7 @@ a1 = new Source(value = 1) a2 = new Source(value = 2) a3 = new Source(value = 3) - b = new[9] Destination() + b = new[9] Destination() (a1.out, a2.out, a3.out)+ -> b.inp after 1 sec } diff --git a/test/known-good/TypeScript/src/multiport/FullyConnected.txt b/test/known-good/TypeScript/src/multiport/FullyConnected.txt index 6b89c1421..b29f93a5a 100644 --- a/test/known-good/TypeScript/src/multiport/FullyConnected.txt +++ b/test/known-good/TypeScript/src/multiport/FullyConnected.txt @@ -1,10 +1,10 @@ target TypeScript -reactor Node(numNodes: number(4)) { - input[numNodes] inp: number - output out: number +reactor Node(numNodes: number(4)) { + input[numNodes] inp: number + output out: number - state received: boolean(false) + state received: boolean(false) reaction(startup) -> out {= console.log("Hello from node " + this.getBankIndex() + "!"); @@ -36,8 +36,8 @@ =} } -main reactor(numNodes: number(4)) { - nodes = new[numNodes] Node(numNodes = numNodes) +main reactor(numNodes: number(4)) { + nodes = new[numNodes] Node(numNodes = numNodes) (nodes.out)+ -> nodes.inp } diff --git a/test/known-good/TypeScript/src/multiport/MultiportFromBank.txt b/test/known-good/TypeScript/src/multiport/MultiportFromBank.txt index 5304572da..47e78900e 100644 --- a/test/known-good/TypeScript/src/multiport/MultiportFromBank.txt +++ b/test/known-good/TypeScript/src/multiport/MultiportFromBank.txt @@ -1,18 +1,18 @@ // Check multiport output to bank of recipients. Here, the bank is smaller than // the width of the sending port. target TypeScript { - timeout: 2 sec + timeout: 2 sec } reactor Source { - output out: number + output out: number reaction(startup) -> out {= out = this.getBankIndex(); =} } -reactor Destination(portWidth: number(3)) { - input[portWidth] inp: number - state received: boolean(false) +reactor Destination(portWidth: number(3)) { + input[portWidth] inp: number + state received: boolean(false) reaction(inp) {= for (let i = 0; i < inp.length; i++) { @@ -32,8 +32,8 @@ =} } -main reactor(width: number(4)) { - a = new[width] Source() +main reactor(width: number(4)) { + a = new[width] Source() b = new Destination(portWidth = width) a.out -> b.inp } diff --git a/test/known-good/TypeScript/src/multiport/MultiportFromBankHierarchy.txt b/test/known-good/TypeScript/src/multiport/MultiportFromBankHierarchy.txt index c0b62c420..a3658e645 100644 --- a/test/known-good/TypeScript/src/multiport/MultiportFromBankHierarchy.txt +++ b/test/known-good/TypeScript/src/multiport/MultiportFromBankHierarchy.txt @@ -1,14 +1,14 @@ // Check multiport output to bank of recipients. Here, the bank is smaller than // the width of the sending port. target TypeScript { - timeout: 2 sec + timeout: 2 sec } import Source, Destination from "MultiportFromBank.lf" -reactor Container(portWidth: number(3)) { - output[portWidth] out: number - s = new[portWidth] Source() +reactor Container(portWidth: number(3)) { + output[portWidth] out: number + s = new[portWidth] Source() s.out -> out } diff --git a/test/known-good/TypeScript/src/multiport/MultiportFromBankHierarchyAfter.txt b/test/known-good/TypeScript/src/multiport/MultiportFromBankHierarchyAfter.txt index ea5e77032..e2eba90c0 100644 --- a/test/known-good/TypeScript/src/multiport/MultiportFromBankHierarchyAfter.txt +++ b/test/known-good/TypeScript/src/multiport/MultiportFromBankHierarchyAfter.txt @@ -1,7 +1,7 @@ // Check multiport output to bank of recipients. Here, the bank is smaller than // the width of the sending port. target TypeScript { - timeout: 2 sec + timeout: 2 sec } import Destination from "MultiportFromBank.lf" diff --git a/test/known-good/TypeScript/src/multiport/MultiportFromHierarchy.txt b/test/known-good/TypeScript/src/multiport/MultiportFromHierarchy.txt index a4728352d..8740c6f07 100644 --- a/test/known-good/TypeScript/src/multiport/MultiportFromHierarchy.txt +++ b/test/known-good/TypeScript/src/multiport/MultiportFromHierarchy.txt @@ -1,13 +1,13 @@ // Check multiport output to multiport input, where the former is a hierarchical // reactor. target TypeScript { - timeout: 2 sec + timeout: 2 sec } -reactor Source(width: number(3)) { +reactor Source(width: number(3)) { timer t(0, 200 msec) - output[width] out: number - state s: number(0) + output[width] out: number + state s: number(0) reaction(t) -> out {= for(let i = 0; i < out.length; i++) { @@ -16,9 +16,9 @@ =} } -reactor Destination(width: number(3)) { - state s: number(6) - input[width] inp: number +reactor Destination(width: number(3)) { + state s: number(6) + input[width] inp: number reaction(inp) {= let sum = 0; @@ -41,19 +41,19 @@ =} } -reactor Container(width: number(3)) { - output[width] out: number +reactor Container(width: number(3)) { + output[width] out: number src = new InsideContainer(width = width) src.out -> out } -reactor InsideContainer(width: number(3)) { - output[width] out: number +reactor InsideContainer(width: number(3)) { + output[width] out: number src = new Source(width = width) src.out -> out } -main reactor MultiportFromHierarchy(width: number(4)) { +main reactor MultiportFromHierarchy(width: number(4)) { a = new Container(width = width) b = new Destination(width = width) a.out -> b.inp diff --git a/test/known-good/TypeScript/src/multiport/MultiportFromReaction.txt b/test/known-good/TypeScript/src/multiport/MultiportFromReaction.txt index 15a1c89f4..3f2b657d4 100644 --- a/test/known-good/TypeScript/src/multiport/MultiportFromReaction.txt +++ b/test/known-good/TypeScript/src/multiport/MultiportFromReaction.txt @@ -1,11 +1,11 @@ // Check reaction to multiport input of a contained reactor. target TypeScript { - timeout: 2 sec + timeout: 2 sec } -reactor Destination(width: number(1)) { - state s: number(6) - input[width] inp: number +reactor Destination(width: number(1)) { + state s: number(6) + input[width] inp: number reaction(inp) {= let sum = 0; @@ -28,9 +28,9 @@ =} } -main reactor MultiportFromReaction(width: number(4)) { +main reactor MultiportFromReaction(width: number(4)) { timer t(0, 200 msec) - state s: number(0) + state s: number(0) b = new Destination(width = width) reaction(t) -> b.inp {= diff --git a/test/known-good/TypeScript/src/multiport/MultiportIn.txt b/test/known-good/TypeScript/src/multiport/MultiportIn.txt index 9ea08e786..d73cff447 100644 --- a/test/known-good/TypeScript/src/multiport/MultiportIn.txt +++ b/test/known-good/TypeScript/src/multiport/MultiportIn.txt @@ -1,27 +1,27 @@ // This is a version of the test that uses a multiport input at the destination. // Its purpose is to test multiport inputs. target TypeScript { - timeout: 2 sec + timeout: 2 sec } reactor Source { timer t(0, 200 msec) - output out: number - state s: number(0) + output out: number + state s: number(0) reaction(t) -> out {= out = s++; =} } reactor Computation { - input inp: number - output out: number + input inp: number + output out: number reaction(inp) -> out {= out = inp; =} } reactor Destination { - state s: number(0) - input[4] inp: number + state s: number(0) + input[4] inp: number reaction(inp) {= let sum = 0; diff --git a/test/known-good/TypeScript/src/multiport/MultiportInParameterized.txt b/test/known-good/TypeScript/src/multiport/MultiportInParameterized.txt index 610648485..341bdc8a5 100644 --- a/test/known-good/TypeScript/src/multiport/MultiportInParameterized.txt +++ b/test/known-good/TypeScript/src/multiport/MultiportInParameterized.txt @@ -1,13 +1,13 @@ // This is a version of the Threaded test that uses a multiport input at the // destination. Its purpose is to test multiport inputs. target TypeScript { - timeout: 2 sec + timeout: 2 sec } reactor Source { timer t(0, 200 msec) - output out: number - state s: number(0) + output out: number + state s: number(0) reaction(t) -> out {= out = s; @@ -16,15 +16,15 @@ } reactor Computation { - input inp: number - output out: number + input inp: number + output out: number reaction(inp) -> out {= out = inp; =} } -reactor Destination(width: number(1)) { - state s: number(0) - input[width] inp: number +reactor Destination(width: number(1)) { + state s: number(0) + input[width] inp: number reaction(inp) {= let sum = 0; diff --git a/test/known-good/TypeScript/src/multiport/MultiportMutableInput.txt b/test/known-good/TypeScript/src/multiport/MultiportMutableInput.txt index 0e3dc1efd..d5344943d 100644 --- a/test/known-good/TypeScript/src/multiport/MultiportMutableInput.txt +++ b/test/known-good/TypeScript/src/multiport/MultiportMutableInput.txt @@ -4,7 +4,7 @@ target TypeScript reactor Source { - output[2] out: number + output[2] out: number reaction(startup) -> out {= out[0] = 21; @@ -12,8 +12,8 @@ =} } -reactor Print(scale: number(1)) { // The scale parameter is just for testing. - input[2] inp: number +reactor Print(scale: number(1)) { // The scale parameter is just for testing. + input[2] inp: number reaction(inp) {= let expected = 42; @@ -27,9 +27,9 @@ =} } -reactor Scale(scale: number(2)) { - mutable input[2] inp: number - output[2] out: number +reactor Scale(scale: number(2)) { + mutable input[2] inp: number + output[2] out: number reaction(inp) -> out {= for (let j = 0; j < 2; j++) { diff --git a/test/known-good/TypeScript/src/multiport/MultiportMutableInputArray.txt b/test/known-good/TypeScript/src/multiport/MultiportMutableInputArray.txt index a19526ad3..74531e6be 100644 --- a/test/known-good/TypeScript/src/multiport/MultiportMutableInputArray.txt +++ b/test/known-good/TypeScript/src/multiport/MultiportMutableInputArray.txt @@ -26,7 +26,7 @@ =} } -reactor Print(scale: number(1)) { // The scale parameter is just for testing. +reactor Print(scale: number(1)) { // The scale parameter is just for testing. input[2] inp: {= Array =} reaction(inp) {= @@ -55,7 +55,7 @@ =} } -reactor Scale(scale: number(2)) { +reactor Scale(scale: number(2)) { mutable input[2] inp: {= Array =} output[2] out: {= Array =} diff --git a/test/known-good/TypeScript/src/multiport/MultiportOut.txt b/test/known-good/TypeScript/src/multiport/MultiportOut.txt index dde4eaf1c..c20afab67 100644 --- a/test/known-good/TypeScript/src/multiport/MultiportOut.txt +++ b/test/known-good/TypeScript/src/multiport/MultiportOut.txt @@ -1,12 +1,12 @@ // Check multiport capabilities on Outputs. target TypeScript { - timeout: 2 sec + timeout: 2 sec } reactor Source { timer t(0, 200 msec) - output[4] out: number - state s: number(0) + output[4] out: number + state s: number(0) reaction(t) -> out {= for(let i = 0; i < 4; i++) { @@ -17,8 +17,8 @@ } reactor Computation { - input inp: number - output out: number + input inp: number + output out: number reaction(inp) -> out {= // No need to sleep for this test. @@ -27,8 +27,8 @@ } reactor Destination { - state s: number(0) - input[4] inp: number + state s: number(0) + input[4] inp: number reaction(inp) {= let sum = 0; diff --git a/test/known-good/TypeScript/src/multiport/MultiportToBank.txt b/test/known-good/TypeScript/src/multiport/MultiportToBank.txt index b18ee464a..3029f411f 100644 --- a/test/known-good/TypeScript/src/multiport/MultiportToBank.txt +++ b/test/known-good/TypeScript/src/multiport/MultiportToBank.txt @@ -1,7 +1,7 @@ target TypeScript reactor Source { - output[4] out: number + output[4] out: number reaction(startup) -> out {= for (let i = 0 ; i < out.length; i++) { @@ -11,7 +11,7 @@ } reactor Sink { - input inp: number + input inp: number reaction(inp) {= console.log("Received " + inp); @@ -23,7 +23,7 @@ main reactor MultiportToBank { source = new Source() - sink = new[4] Sink() + sink = new[4] Sink() source.out -> sink.inp } diff --git a/test/known-good/TypeScript/src/multiport/MultiportToBankAfter.txt b/test/known-good/TypeScript/src/multiport/MultiportToBankAfter.txt index 99cd8422b..207bfe629 100644 --- a/test/known-good/TypeScript/src/multiport/MultiportToBankAfter.txt +++ b/test/known-good/TypeScript/src/multiport/MultiportToBankAfter.txt @@ -1,11 +1,11 @@ // Check multiport output to bank of recipients where the width of the bank is // inferred. target TypeScript { - timeout: 2 sec + timeout: 2 sec } -reactor Source(width: number(2)) { - output[width] out: number +reactor Source(width: number(2)) { + output[width] out: number reaction(startup) -> out {= for (let i = 0; i < out.length; i++) { @@ -15,8 +15,8 @@ } reactor Destination { - input inp: number - state received: boolean(false) + input inp: number + state received: boolean(false) reaction(inp) {= console.log("Destination " + this.getBankIndex() + " received " + inp + "."); @@ -39,9 +39,9 @@ =} } -main reactor(width: number(3)) { +main reactor(width: number(3)) { a = new Source(width = width) - b = new[width] Destination() + b = new[width] Destination() a.out -> b.inp after 1 sec // Width of the bank of delays will be inferred. } diff --git a/test/known-good/TypeScript/src/multiport/MultiportToBankDouble.txt b/test/known-good/TypeScript/src/multiport/MultiportToBankDouble.txt index 716d94c34..bbcd374f3 100644 --- a/test/known-good/TypeScript/src/multiport/MultiportToBankDouble.txt +++ b/test/known-good/TypeScript/src/multiport/MultiportToBankDouble.txt @@ -1,11 +1,11 @@ // Check multiport output to bank of recipients where the source has two // reactions that write to the output. target TypeScript { - timeout: 2 sec + timeout: 2 sec } reactor Source { - output[3] out: number // Connected to a bank of Destination reactors + output[3] out: number // Connected to a bank of Destination reactors reaction(startup) -> out {= for (let i = 0; i < out.length; i++) { @@ -24,8 +24,8 @@ } reactor Destination { - input inp: number - state received: boolean(false) + input inp: number + state received: boolean(false) reaction(inp) {= console.log("Destination " + this.getBankIndex() + " received " + inp + "."); @@ -45,7 +45,7 @@ main reactor { a = new Source() - b = new[3] Destination() + b = new[3] Destination() a.out -> b.inp } diff --git a/test/known-good/TypeScript/src/multiport/MultiportToBankHierarchy.txt b/test/known-good/TypeScript/src/multiport/MultiportToBankHierarchy.txt index 089a546c2..ec948d1f7 100644 --- a/test/known-good/TypeScript/src/multiport/MultiportToBankHierarchy.txt +++ b/test/known-good/TypeScript/src/multiport/MultiportToBankHierarchy.txt @@ -1,11 +1,11 @@ // Check multiport output to bank of recipients. Here, the bank is smaller than // the width of the sending port. target TypeScript { - timeout: 2 sec + timeout: 2 sec } reactor Source { - output[3] out: number + output[3] out: number reaction(startup) -> out {= for(let i = 0; i < out.length; i++) { @@ -15,8 +15,8 @@ } reactor Destination { - input inp: number - state received: boolean(false) + input inp: number + state received: boolean(false) reaction(inp) {= console.log("Destination " + this.getBankIndex() + " received " + inp + "."); @@ -35,8 +35,8 @@ } reactor Container { - input[3] inp: number - c = new[3] Destination() + input[3] inp: number + c = new[3] Destination() inp -> c.inp } diff --git a/test/known-good/TypeScript/src/multiport/MultiportToHierarchy.txt b/test/known-good/TypeScript/src/multiport/MultiportToHierarchy.txt index 8a18ed233..0bced7c9f 100644 --- a/test/known-good/TypeScript/src/multiport/MultiportToHierarchy.txt +++ b/test/known-good/TypeScript/src/multiport/MultiportToHierarchy.txt @@ -2,13 +2,13 @@ // reactor. Note that the destination reactor has width wider than the sender, // so one input is dangling. target TypeScript { - timeout: 2 sec + timeout: 2 sec } -reactor Source(width: number(4)) { +reactor Source(width: number(4)) { timer t(0, 200 msec) - output[width] out: number - state s: number(0) + output[width] out: number + state s: number(0) reaction(t) -> out {= for(let i = 0; i < 4; i++) { @@ -17,9 +17,9 @@ =} } -reactor Destination(width: number(4)) { - state s: number(6) - input[width] inp: number +reactor Destination(width: number(4)) { + state s: number(6) + input[width] inp: number reaction(inp) {= let sum = 0; @@ -42,13 +42,13 @@ =} } -reactor Container(width: number(4)) { - input[width] inp: number +reactor Container(width: number(4)) { + input[width] inp: number dst = new Destination() inp -> dst.inp } -main reactor MultiportToHierarchy(width: number(4)) { +main reactor MultiportToHierarchy(width: number(4)) { a = new Source(width = width) b = new Container(width = width) a.out -> b.inp diff --git a/test/known-good/TypeScript/src/multiport/MultiportToMultiport.txt b/test/known-good/TypeScript/src/multiport/MultiportToMultiport.txt index 53eee2eb0..7ad405920 100644 --- a/test/known-good/TypeScript/src/multiport/MultiportToMultiport.txt +++ b/test/known-good/TypeScript/src/multiport/MultiportToMultiport.txt @@ -1,7 +1,7 @@ target TypeScript reactor Source { - output[4] out: number + output[4] out: number reaction(startup) -> out {= for (let i = 0; i < out.length; i++) { @@ -11,8 +11,8 @@ } reactor Sink { - input[4] inp: number - state received: boolean(false) + input[4] inp: number + state received: boolean(false) reaction(inp) {= for (let i = 0; i < inp.length; i++) { diff --git a/test/known-good/TypeScript/src/multiport/MultiportToMultiport2.txt b/test/known-good/TypeScript/src/multiport/MultiportToMultiport2.txt index 695c15193..5b4c446af 100644 --- a/test/known-good/TypeScript/src/multiport/MultiportToMultiport2.txt +++ b/test/known-good/TypeScript/src/multiport/MultiportToMultiport2.txt @@ -1,8 +1,8 @@ // Test multiport to multiport connections. See also MultiportToMultiport. target TypeScript -reactor Source(width: number(2)) { - output[width] out: number +reactor Source(width: number(2)) { + output[width] out: number reaction(startup) -> out {= for (let i = 0; i < out.length; i++) { @@ -11,8 +11,8 @@ =} } -reactor Destination(width: number(2)) { - input[width] inp: number +reactor Destination(width: number(2)) { + input[width] inp: number reaction(inp) {= for (let i = 0; i < inp.length; i++) { diff --git a/test/known-good/TypeScript/src/multiport/MultiportToMultiport2After.txt b/test/known-good/TypeScript/src/multiport/MultiportToMultiport2After.txt index c1431f204..933715c13 100644 --- a/test/known-good/TypeScript/src/multiport/MultiportToMultiport2After.txt +++ b/test/known-good/TypeScript/src/multiport/MultiportToMultiport2After.txt @@ -1,8 +1,8 @@ // Test multiport to multiport connections. See also MultiportToMultiport. target TypeScript -reactor Source(width: number(2)) { - output[width] out: number +reactor Source(width: number(2)) { + output[width] out: number reaction(startup) -> out {= for (let i = 0; i < out.length; i++) { @@ -11,8 +11,8 @@ =} } -reactor Destination(width: number(2)) { - input[width] inp: number +reactor Destination(width: number(2)) { + input[width] inp: number reaction(inp) {= for (let i = 0; i < inp.length; i++) { diff --git a/test/known-good/TypeScript/src/multiport/MultiportToMultiportArray.txt b/test/known-good/TypeScript/src/multiport/MultiportToMultiportArray.txt index 1f160a5e7..5abed1963 100644 --- a/test/known-good/TypeScript/src/multiport/MultiportToMultiportArray.txt +++ b/test/known-good/TypeScript/src/multiport/MultiportToMultiportArray.txt @@ -1,13 +1,13 @@ // Check multiport output to multiport input. Destination port is wider than // sending port. target TypeScript { - timeout: 2 sec + timeout: 2 sec } reactor Source { timer t(0, 200 msec) output[2] out: {= Array =} - state s: number(0) + state s: number(0) reaction(t) -> out {= for(let i = 0; i < 2; i++) { @@ -24,7 +24,7 @@ } reactor Destination { - state s: number(15) + state s: number(15) input[2] inp: {= Array =} reaction(inp) {= diff --git a/test/known-good/TypeScript/src/multiport/MultiportToMultiportParameter.txt b/test/known-good/TypeScript/src/multiport/MultiportToMultiportParameter.txt index 458a0c679..da630f83f 100644 --- a/test/known-good/TypeScript/src/multiport/MultiportToMultiportParameter.txt +++ b/test/known-good/TypeScript/src/multiport/MultiportToMultiportParameter.txt @@ -1,12 +1,12 @@ // Check multiport output to multiport input. target TypeScript { - timeout: 2 sec + timeout: 2 sec } -reactor Source(width: number(1)) { +reactor Source(width: number(1)) { timer t(0, 200 msec) - output[width] out: number - state s: number(0) + output[width] out: number + state s: number(0) reaction(t) -> out {= for (let i = 0; i < out.length; i++) { @@ -15,9 +15,9 @@ =} } -reactor Destination(width: number(1)) { - state s: number(6) - input[width] inp: number // Width is one larger than that of the source. +reactor Destination(width: number(1)) { + state s: number(6) + input[width] inp: number // Width is one larger than that of the source. reaction(inp) {= let sum = 0; @@ -39,7 +39,7 @@ =} } -main reactor(width: number(4)) { +main reactor(width: number(4)) { a = new Source(width = width) b = new Destination(width = width) a.out -> b.inp diff --git a/test/known-good/TypeScript/src/multiport/MultiportToPort.txt b/test/known-good/TypeScript/src/multiport/MultiportToPort.txt index 02b7370e2..7aabd07a4 100644 --- a/test/known-good/TypeScript/src/multiport/MultiportToPort.txt +++ b/test/known-good/TypeScript/src/multiport/MultiportToPort.txt @@ -1,11 +1,11 @@ // Check multiport output to multiport input. Destination port is wider than // sending port. target TypeScript { - timeout: 2 sec + timeout: 2 sec } reactor Source { - output[2] out: number + output[2] out: number reaction(startup) -> out {= for(let i = 0; i < out.length; i++) { @@ -15,9 +15,9 @@ =} } -reactor Destination(expected: number(0)) { - input inp: number - state received: boolean(false) +reactor Destination(expected: number(0)) { + input inp: number + state received: boolean(false) reaction(inp) {= console.log("Received " + inp); diff --git a/test/known-good/TypeScript/src/multiport/MultiportToReaction.txt b/test/known-good/TypeScript/src/multiport/MultiportToReaction.txt index c9ac1e43e..09cc37f9a 100644 --- a/test/known-good/TypeScript/src/multiport/MultiportToReaction.txt +++ b/test/known-good/TypeScript/src/multiport/MultiportToReaction.txt @@ -1,12 +1,12 @@ // Check reaction to multiport output of a contained reactor. target TypeScript { - timeout: 2 sec + timeout: 2 sec } -reactor Source(width: number(1)) { +reactor Source(width: number(1)) { timer t(0, 200 msec) - state s: number(0) - output[width] out: number + state s: number(0) + output[width] out: number reaction(t) -> out {= console.log("Sending."); @@ -17,7 +17,7 @@ } main reactor MultiportToReaction { - state s: number(6) + state s: number(6) b = new Source(width = 4) reaction(b.out) {= diff --git a/test/known-good/TypeScript/src/multiport/NestedBanks.txt b/test/known-good/TypeScript/src/multiport/NestedBanks.txt index c74b666c7..fd8abf601 100644 --- a/test/known-good/TypeScript/src/multiport/NestedBanks.txt +++ b/test/known-good/TypeScript/src/multiport/NestedBanks.txt @@ -6,8 +6,8 @@ target TypeScript main reactor { - a = new[2] A() - c = new[3] C() + a = new[2] A() + c = new[3] C() d = new D() e = new E() @@ -15,13 +15,13 @@ } reactor A { - output[4] x: number - b = new[2] B(aBankIndex = {= this.getBankIndex() =}) + output[4] x: number + b = new[2] B(aBankIndex = {= this.getBankIndex() =}) b.y -> x } -reactor B(aBankIndex: number(0)) { - output[2] y: number +reactor B(aBankIndex: number(0)) { + output[2] y: number reaction(startup) -> y {= let base = aBankIndex * 4 + this.getBankIndex() * 2; @@ -31,14 +31,14 @@ } reactor C { - input[2] z: number + input[2] z: number f = new F(cBankIndex = {= this.getBankIndex() =}) g = new G(cBankIndex = {= this.getBankIndex() =}) z -> f.w, g.s } reactor D { - input[2] u: number + input[2] u: number reaction(u) {= for (let i = 0; i < u.length; i++) { @@ -51,7 +51,7 @@ } reactor E { - input[8] t: number + input[8] t: number reaction(t) {= for (let i = 0; i < t.length; i++) { @@ -60,8 +60,8 @@ =} } -reactor F(cBankIndex: number(0)) { - input w: number +reactor F(cBankIndex: number(0)) { + input w: number reaction(w) {= console.log("c[" + cBankIndex + "].f.w received " + w + "."); @@ -71,8 +71,8 @@ =} } -reactor G(cBankIndex: number(0)) { - input s: number +reactor G(cBankIndex: number(0)) { + input s: number reaction(s) {= console.log("c[" + cBankIndex + "].g.s received " + s + "."); diff --git a/test/known-good/TypeScript/src/multiport/PipelineAfter.txt b/test/known-good/TypeScript/src/multiport/PipelineAfter.txt index b951a1796..a0c1e8b2e 100644 --- a/test/known-good/TypeScript/src/multiport/PipelineAfter.txt +++ b/test/known-good/TypeScript/src/multiport/PipelineAfter.txt @@ -1,20 +1,20 @@ target TypeScript reactor Source { - output out: number + output out: number reaction(startup) -> out {= out = 40; =} } reactor Compute { - input inp: number - output out: number + input inp: number + output out: number reaction(inp) -> out {= out = (inp as number) + 2; =} } reactor Sink { - input inp: number + input inp: number reaction(inp) {= console.log("Received " + inp); diff --git a/test/known-good/TypeScript/src/multiport/ReactionToContainedBank.txt b/test/known-good/TypeScript/src/multiport/ReactionToContainedBank.txt index 981b52542..a46b46b99 100644 --- a/test/known-good/TypeScript/src/multiport/ReactionToContainedBank.txt +++ b/test/known-good/TypeScript/src/multiport/ReactionToContainedBank.txt @@ -1,15 +1,15 @@ // Test reaction sending messages to a contained bank of reactors. target TypeScript { - timeout: 1 sec + timeout: 1 sec } import TestCount from "../lib/TestCount.lf" -main reactor ReactionToContainedBank(width: number(2)) { +main reactor ReactionToContainedBank(width: number(2)) { timer t(0, 100 msec) - state count: number(1) + state count: number(1) - test = new[width] TestCount(numInputs = 11) + test = new[width] TestCount(numInputs = 11) reaction(t) -> test.inp {= for (let i = 0; i < width; i++) { diff --git a/test/known-good/TypeScript/src/multiport/ReactionsToNested.txt b/test/known-good/TypeScript/src/multiport/ReactionsToNested.txt index 09750abaf..a48eb4089 100644 --- a/test/known-good/TypeScript/src/multiport/ReactionsToNested.txt +++ b/test/known-good/TypeScript/src/multiport/ReactionsToNested.txt @@ -1,12 +1,12 @@ // This test connects a simple counting source to tester that checks against its // own count. target TypeScript { - timeout: 1 sec + timeout: 1 sec } -reactor T(expected: number(0)) { - input z: number - state received: boolean(false) +reactor T(expected: number(0)) { + input z: number + state received: boolean(false) reaction(z) {= console.log("T received " + z); @@ -24,7 +24,7 @@ } reactor D { - input[2] y: number + input[2] y: number t1 = new T(expected = 42) t2 = new T(expected = 43) y -> t1.z, t2.z diff --git a/test/known-good/TypeScript/src/serialization/ProtoNoPacking.txt b/test/known-good/TypeScript/src/serialization/ProtoNoPacking.txt index 7efe57fba..751a7f7f2 100644 --- a/test/known-good/TypeScript/src/serialization/ProtoNoPacking.txt +++ b/test/known-good/TypeScript/src/serialization/ProtoNoPacking.txt @@ -13,11 +13,11 @@ * Building protobuf from source is slow, so avoid doing that if possible. */ target TypeScript { - protobufs: ProtoHelloWorld.proto + protobufs: ProtoHelloWorld.proto } reactor SourceProto { - output out: ProtoHelloWorld.ProtoHelloWorld + output out: ProtoHelloWorld.ProtoHelloWorld reaction(startup) -> out {= // The contents of a compiled proto file are imported in @@ -32,11 +32,11 @@ } reactor SinkProto { - input x: ProtoHelloWorld.ProtoHelloWorld + input x: ProtoHelloWorld.ProtoHelloWorld reaction(x) {= if (x !== undefined) { - console.log(`Received: name=${x.getName()}, number=${x.getNumber()}.`) + console.log(`Received: name=${x.getName()}, number=${x.getNumber()}.`) } =} } diff --git a/test/known-good/TypeScript/src/target/AfterNoTypes.txt b/test/known-good/TypeScript/src/target/AfterNoTypes.txt index 92e955113..22aeb1477 100644 --- a/test/known-good/TypeScript/src/target/AfterNoTypes.txt +++ b/test/known-good/TypeScript/src/target/AfterNoTypes.txt @@ -1,8 +1,8 @@ // This test demonstrates that after can be used on connections with ports that // have no types. target TypeScript { - fast: false, - timeout: 3 sec + fast: false, + timeout: 3 sec } reactor Foo { @@ -15,7 +15,7 @@ } reactor Print { - state expected_time: time(10 msec) + state expected_time: time(10 msec) input x reaction(x) {= From d0a7c9eb64ed27a03fddb63f6df2ae8603dd1384 Mon Sep 17 00:00:00 2001 From: jesslin02 Date: Wed, 12 Apr 2023 13:56:08 +0800 Subject: [PATCH 09/14] improve import and target regex --- syntaxes/lflang.tmLanguage.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/syntaxes/lflang.tmLanguage.json b/syntaxes/lflang.tmLanguage.json index 07394e284..101f1ce9e 100644 --- a/syntaxes/lflang.tmLanguage.json +++ b/syntaxes/lflang.tmLanguage.json @@ -245,7 +245,7 @@ "target-specification": { "name": "meta.targetspec.lflang", "begin": "(?=\\btarget\\b)", - "end": ";|(?<=})$|(?<=target)[^\\{]*$", + "end": "(?<=;)\\s*$|(?<=})\\s*$|(?<=Python)\\s*$|(?<=(CCpp|Rust))\\s*$|(?<=C)\\s*$|(?<=Cpp)\\s*$|(?<=TypeScript)\\s*$", "patterns": [ { "include": "#context-insensitive" @@ -266,7 +266,7 @@ }, "import-statement": { "begin": "(?=^\\s*import\\b)", - "end": ";|(?<=})$|(?<=import)[^\\{]*$", + "end": ";|(?<=\")\\s*$", "patterns": [ { "include": "#context-insensitive" From c586d45d92023507b6975b7beeac2ae30a2a053d Mon Sep 17 00:00:00 2001 From: jesslin02 Date: Mon, 17 Apr 2023 19:37:55 +0800 Subject: [PATCH 10/14] small regex updates to c target --- syntaxes/lflang.tmLanguage.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/syntaxes/lflang.tmLanguage.json b/syntaxes/lflang.tmLanguage.json index 101f1ce9e..3e6a87ada 100644 --- a/syntaxes/lflang.tmLanguage.json +++ b/syntaxes/lflang.tmLanguage.json @@ -120,7 +120,7 @@ "begin": "(?=\\btarget\\s+C\\b)", "patterns": [ { - "begin": "(?<=(input|state)).*:(.*);\n", + "begin": "(?<=(input|state)).*:", "end": "[\\(;\\n]", "patterns": [ { @@ -129,7 +129,7 @@ ] }, { - "begin": "(?<=(output|action)).*:(.*);\n", + "begin": "(?<=(output|action)).*:", "end": "[\\(;\\n]", "patterns": [ { @@ -154,7 +154,7 @@ "begin": "(?=\\btarget\\s+C?Cpp\\b)", "patterns": [ { - "begin": "(?<=(input|state)).*:(.*);\n", + "begin": "(?<=(input|state)).*:", "end": "[\\(;\\n]", "patterns": [ { @@ -163,7 +163,7 @@ ] }, { - "begin": "(?<=(output|action)).*:(.*);\n", + "begin": "(?<=(output|action)).*:", "end": "[\\(;\\n]", "patterns": [ { @@ -260,7 +260,7 @@ }, { "name": "variable.parameter.lflang", - "match": "(^|(?<=(,|\\{)))(\\s)*\\b([\\w\\-]+)\\b(?=(\\s)*:)" + "match": "(^|(?<=(,|\\{)))\\s*\\b([\\w\\-]+)\\b(?=\\s*:)" } ] }, From 3b7e40a6afd535e7d85ebe55d47eac3832d4ad64 Mon Sep 17 00:00:00 2001 From: Peter Donovan Date: Mon, 15 May 2023 15:08:06 -0700 Subject: [PATCH 11/14] Fix regression in type highlighting for C++. It can help to use both our own rule and a C++ rule. --- syntaxes/lflang.tmLanguage.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/syntaxes/lflang.tmLanguage.json b/syntaxes/lflang.tmLanguage.json index 3e6a87ada..2e097e785 100644 --- a/syntaxes/lflang.tmLanguage.json +++ b/syntaxes/lflang.tmLanguage.json @@ -125,6 +125,9 @@ "patterns": [ { "include": "source.cpp" + }, + { + "include": "#type" } ] }, @@ -134,6 +137,9 @@ "patterns": [ { "include": "source.cpp" + }, + { + "include": "#type" } ] }, @@ -159,6 +165,9 @@ "patterns": [ { "include": "source.cpp" + }, + { + "include": "#type" } ] }, @@ -168,6 +177,9 @@ "patterns": [ { "include": "source.cpp" + }, + { + "include": "#type" } ] }, @@ -175,7 +187,7 @@ "include": "#post-targetspec" }, { - "begin": "\\{=(?!=\\})", + "begin": "\\{=", "end": "([<>]?[<>+\\-*/%&\\^|]?=\\})", "name": "meta.embedded.block.cpp", "patterns": [{ From cf6f2f3835b06bb6d161198ed82b8954de1984d9 Mon Sep 17 00:00:00 2001 From: Peter Donovan Date: Mon, 15 May 2023 15:50:30 -0700 Subject: [PATCH 12/14] Fix problem involving colons and target code. --- syntaxes/lflang.tmLanguage.json | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/syntaxes/lflang.tmLanguage.json b/syntaxes/lflang.tmLanguage.json index 2e097e785..1df2b1de3 100644 --- a/syntaxes/lflang.tmLanguage.json +++ b/syntaxes/lflang.tmLanguage.json @@ -120,8 +120,9 @@ "begin": "(?=\\btarget\\s+C\\b)", "patterns": [ { - "begin": "(?<=(input|state)).*:", + "begin": "(?<=(input|state))\\s+\\w+\\s*:", "end": "[\\(;\\n]", + "name": "meta.embedded.block.c", "patterns": [ { "include": "source.cpp" @@ -132,8 +133,9 @@ ] }, { - "begin": "(?<=(output|action)).*:", + "begin": "(?<=(output|action))\\s+\\w+\\s*:", "end": "[\\(;\\n]", + "name": "meta.embedded.block.c", "patterns": [ { "include": "source.cpp" @@ -160,8 +162,9 @@ "begin": "(?=\\btarget\\s+C?Cpp\\b)", "patterns": [ { - "begin": "(?<=(input|state)).*:", - "end": "[\\(;\\n]", + "begin": "(?<=(input|state))\\s+\\w+\\s*:", + "end": "[\\(;\\n]|(\\{=)", + "name": "meta.embedded.block.cpp", "patterns": [ { "include": "source.cpp" @@ -172,8 +175,9 @@ ] }, { - "begin": "(?<=(output|action)).*:", - "end": "[\\(;\\n]", + "begin": "(?<=(output|action))\\s+\\w+\\s*:", + "end": "[\\(;\\n]|(\\{=)", + "name": "meta.embedded.block.cpp", "patterns": [ { "include": "source.cpp" @@ -188,7 +192,7 @@ }, { "begin": "\\{=", - "end": "([<>]?[<>+\\-*/%&\\^|]?=\\})", + "end": "(([<>]?[<>+\\-*/%&\\^|]?=\\}))", "name": "meta.embedded.block.cpp", "patterns": [{ "include": "source.cpp" From 0a93069e049fab78cf32e6a62395c23578415328 Mon Sep 17 00:00:00 2001 From: Peter Donovan Date: Mon, 15 May 2023 16:21:07 -0700 Subject: [PATCH 13/14] Refactor a bit. --- syntaxes/lflang.tmLanguage.json | 51 +++++++-------------------------- 1 file changed, 10 insertions(+), 41 deletions(-) diff --git a/syntaxes/lflang.tmLanguage.json b/syntaxes/lflang.tmLanguage.json index 1df2b1de3..d1cfef91e 100644 --- a/syntaxes/lflang.tmLanguage.json +++ b/syntaxes/lflang.tmLanguage.json @@ -118,52 +118,21 @@ }, "c-target": { "begin": "(?=\\btarget\\s+C\\b)", - "patterns": [ - { - "begin": "(?<=(input|state))\\s+\\w+\\s*:", - "end": "[\\(;\\n]", - "name": "meta.embedded.block.c", - "patterns": [ - { - "include": "source.cpp" - }, - { - "include": "#type" - } - ] - }, - { - "begin": "(?<=(output|action))\\s+\\w+\\s*:", - "end": "[\\(;\\n]", - "name": "meta.embedded.block.c", - "patterns": [ - { - "include": "source.cpp" - }, - { - "include": "#type" - } - ] - }, - { - "include": "#post-targetspec" - }, - { - "begin": "\\{=(?!=\\})", - "end": "([<>]?[<>+\\-*/%&\\^|]?=\\})", - "name": "meta.embedded.block.c", - "patterns": [{ - "include": "source.cpp" - }] - } - ] + "patterns": [{ + "include": "#c-or-cpp-target" + }] }, "cpp-target": { "begin": "(?=\\btarget\\s+C?Cpp\\b)", + "patterns": [{ + "include": "#c-or-cpp-target" + }] + }, + "c-or-cpp-target": { "patterns": [ { "begin": "(?<=(input|state))\\s+\\w+\\s*:", - "end": "[\\(;\\n]|(\\{=)", + "end": "[\\(;\\n]|(?=\\{=)", "name": "meta.embedded.block.cpp", "patterns": [ { @@ -176,7 +145,7 @@ }, { "begin": "(?<=(output|action))\\s+\\w+\\s*:", - "end": "[\\(;\\n]|(\\{=)", + "end": "[\\(;\\n]|(?=\\{=)", "name": "meta.embedded.block.cpp", "patterns": [ { From 1941acf87fe7d3f476163f8b8118cc14517acbb8 Mon Sep 17 00:00:00 2001 From: Peter Donovan Date: Tue, 16 May 2023 08:37:35 -0700 Subject: [PATCH 14/14] Update known-good according to C/C++ adjustments. --- test/known-good/C/src/ActionDelay.txt | 10 +++---- test/known-good/C/src/ActionIsPresent.txt | 2 +- .../known-good/C/src/ActionWithNoReaction.txt | 8 ++--- test/known-good/C/src/After.txt | 10 +++---- test/known-good/C/src/AfterCycles.txt | 8 ++--- test/known-good/C/src/AfterOverlapped.txt | 6 ++-- test/known-good/C/src/AfterZero.txt | 10 +++---- test/known-good/C/src/Alignment.txt | 18 +++++------ test/known-good/C/src/ArrayAsParameter.txt | 10 +++---- test/known-good/C/src/ArrayAsType.txt | 4 +-- test/known-good/C/src/ArrayFree.txt | 2 +- test/known-good/C/src/ArrayFreeMultiple.txt | 6 ++-- test/known-good/C/src/ArrayPrint.txt | 8 ++--- test/known-good/C/src/ArrayScale.txt | 4 +-- .../C/src/CharLiteralInitializer.txt | 2 +- test/known-good/C/src/Composition.txt | 8 ++--- test/known-good/C/src/CompositionAfter.txt | 8 ++--- test/known-good/C/src/CompositionGain.txt | 8 ++--- .../C/src/CompositionInheritance.txt | 12 ++++---- test/known-good/C/src/CountSelf.txt | 4 +-- test/known-good/C/src/DanglingOutput.txt | 6 ++-- test/known-good/C/src/Deadline.txt | 8 ++--- test/known-good/C/src/DeadlineAnytime.txt | 2 +- .../known-good/C/src/DeadlineHandledAbove.txt | 6 ++-- .../C/src/DeadlineWithAfterDelay.txt | 4 +-- test/known-good/C/src/DeadlineWithBanks.txt | 4 +-- test/known-good/C/src/DeadlineZero.txt | 6 ++-- test/known-good/C/src/DelayArray.txt | 10 +++---- test/known-good/C/src/DelayArrayWithAfter.txt | 10 +++---- test/known-good/C/src/DelayInt.txt | 12 ++++---- test/known-good/C/src/DelayPointer.txt | 14 ++++----- test/known-good/C/src/DelayString.txt | 10 +++---- test/known-good/C/src/DelayStruct.txt | 10 +++---- .../known-good/C/src/DelayStructWithAfter.txt | 4 +-- .../C/src/DelayStructWithAfterOverlapped.txt | 8 ++--- test/known-good/C/src/DelayedAction.txt | 2 +- test/known-good/C/src/DelayedReaction.txt | 4 +-- test/known-good/C/src/Determinism.txt | 10 +++---- test/known-good/C/src/DoubleInvocation.txt | 12 ++++---- test/known-good/C/src/DoublePort.txt | 10 +++---- test/known-good/C/src/DoubleReaction.txt | 10 +++---- test/known-good/C/src/DoubleTrigger.txt | 2 +- test/known-good/C/src/FloatLiteral.txt | 8 ++--- test/known-good/C/src/Gain.txt | 8 ++--- test/known-good/C/src/GetMicroStep.txt | 2 +- test/known-good/C/src/Hello.txt | 4 +-- test/known-good/C/src/HelloWorld.txt | 2 +- test/known-good/C/src/Hierarchy.txt | 14 ++++----- test/known-good/C/src/Hierarchy2.txt | 20 ++++++------- test/known-good/C/src/IdentifierLength.txt | 8 ++--- test/known-good/C/src/ImportComposition.txt | 2 +- test/known-good/C/src/InheritanceAction.txt | 8 ++--- .../C/src/ManualDelayedReaction.txt | 10 +++---- test/known-good/C/src/Methods.txt | 2 +- test/known-good/C/src/MethodsRecursive.txt | 2 +- test/known-good/C/src/MethodsSameName.txt | 4 +-- test/known-good/C/src/Microsteps.txt | 4 +-- test/known-good/C/src/MovingAverage.txt | 12 ++++---- test/known-good/C/src/MultipleContained.txt | 8 ++--- test/known-good/C/src/MultipleOutputs.txt | 6 ++-- test/known-good/C/src/NativeListsAndTimes.txt | 8 ++--- .../C/src/NestedTriggeredReactions.txt | 8 ++--- test/known-good/C/src/PhysicalConnection.txt | 4 +-- test/known-good/C/src/PingPong.txt | 12 ++++---- .../C/src/ReadOutputOfContainedReactor.txt | 4 +-- test/known-good/C/src/RepeatedInheritance.txt | 10 +++---- test/known-good/C/src/Schedule.txt | 2 +- .../C/src/ScheduleLogicalAction.txt | 10 +++---- test/known-good/C/src/ScheduleValue.txt | 2 +- test/known-good/C/src/SelfLoop.txt | 8 ++--- test/known-good/C/src/SendingInside.txt | 6 ++-- test/known-good/C/src/SendingInside2.txt | 2 +- test/known-good/C/src/SendsPointerTest.txt | 4 +-- test/known-good/C/src/SetArray.txt | 4 +-- test/known-good/C/src/SetToken.txt | 6 ++-- test/known-good/C/src/SimpleDeadline.txt | 6 ++-- test/known-good/C/src/SlowingClock.txt | 4 +-- .../known-good/C/src/SlowingClockPhysical.txt | 4 +-- .../known-good/C/src/StartupOutFromInside.txt | 2 +- test/known-good/C/src/Starvation.txt | 6 ++-- test/known-good/C/src/Stop.txt | 4 +-- test/known-good/C/src/StopZero.txt | 6 ++-- test/known-good/C/src/Stride.txt | 8 ++--- test/known-good/C/src/StructAsState.txt | 2 +- test/known-good/C/src/StructAsType.txt | 4 +-- test/known-good/C/src/StructAsTypeDirect.txt | 4 +-- test/known-good/C/src/StructParallel.txt | 8 ++--- test/known-good/C/src/StructPrint.txt | 4 +-- test/known-good/C/src/StructScale.txt | 10 +++---- .../known-good/C/src/SubclassesAndStartup.txt | 2 +- .../C/src/TestForPreviousOutput.txt | 4 +-- test/known-good/C/src/TimeLimit.txt | 8 ++--- test/known-good/C/src/TimeState.txt | 2 +- test/known-good/C/src/Timeout.txt | 4 +-- test/known-good/C/src/TimeoutZero.txt | 4 +-- test/known-good/C/src/ToReactionNested.txt | 6 ++-- .../C/src/TriggerDownstreamOnlyIfPresent2.txt | 4 +-- test/known-good/C/src/UnconnectedInput.txt | 14 ++++----- test/known-good/C/src/Wcet.txt | 12 ++++---- .../C/src/arduino/DigitalReadSerial.txt | 2 +- test/known-good/C/src/arduino/Fade.txt | 6 ++-- .../C/src/concurrent/AsyncCallback.txt | 8 ++--- .../C/src/concurrent/AsyncCallbackDrop.txt | 8 ++--- .../C/src/concurrent/AsyncCallbackReplace.txt | 8 ++--- .../C/src/concurrent/CompositionThreaded.txt | 8 ++--- .../DeadlineHandledAboveThreaded.txt | 6 ++-- .../C/src/concurrent/DeadlineThreaded.txt | 8 ++--- .../C/src/concurrent/DelayIntThreaded.txt | 12 ++++---- .../C/src/concurrent/DeterminismThreaded.txt | 10 +++---- .../src/concurrent/DoubleReactionThreaded.txt | 10 +++---- .../C/src/concurrent/GainThreaded.txt | 8 ++--- .../C/src/concurrent/HelloThreaded.txt | 4 +-- .../C/src/concurrent/PingPongThreaded.txt | 12 ++++---- .../C/src/concurrent/ScheduleAt.txt | 10 +++---- .../C/src/concurrent/ScheduleTwice.txt | 4 +-- .../src/concurrent/ScheduleTwiceThreaded.txt | 4 +-- .../src/concurrent/SendingInsideThreaded.txt | 6 ++-- .../C/src/concurrent/StarvationThreaded.txt | 6 ++-- .../C/src/concurrent/StopThreaded.txt | 4 +-- .../C/src/concurrent/StopZeroThreaded.txt | 6 ++-- test/known-good/C/src/concurrent/Threaded.txt | 10 +++---- .../C/src/concurrent/ThreadedMultiport.txt | 8 ++--- .../C/src/concurrent/ThreadedThreaded.txt | 10 +++---- .../C/src/concurrent/TimeLimitThreaded.txt | 8 ++--- .../C/src/concurrent/TimeoutThreaded.txt | 4 +-- .../C/src/concurrent/TimeoutZeroThreaded.txt | 4 +-- test/known-good/C/src/concurrent/Tracing.txt | 14 ++++----- .../C/src/federated/BroadcastFeedback.txt | 4 +-- .../BroadcastFeedbackWithHierarchy.txt | 6 ++-- .../C/src/federated/CycleDetection.txt | 14 ++++----- .../C/src/federated/DecentralizedP2PComm.txt | 8 ++--- .../DecentralizedP2PUnbalancedTimeout.txt | 8 ++--- ...entralizedP2PUnbalancedTimeoutPhysical.txt | 8 ++--- .../C/src/federated/DistributedBank.txt | 2 +- .../federated/DistributedBankToMultiport.txt | 2 +- .../C/src/federated/DistributedCount.txt | 4 +-- .../DistributedCountDecentralized.txt | 4 +-- .../DistributedCountDecentralizedLate.txt | 8 ++--- ...ributedCountDecentralizedLateHierarchy.txt | 14 ++++----- .../federated/DistributedCountPhysical.txt | 8 ++--- .../DistributedCountPhysicalAfterDelay.txt | 4 +-- .../DistributedCountPhysicalDecentralized.txt | 8 ++--- .../C/src/federated/DistributedDoublePort.txt | 10 +++---- .../DistributedLogicalActionUpstreamLong.txt | 6 ++-- .../src/federated/DistributedLoopedAction.txt | 8 ++--- .../DistributedLoopedActionDecentralized.txt | 12 ++++---- .../DistributedLoopedPhysicalAction.txt | 12 ++++---- .../C/src/federated/DistributedMultiport.txt | 4 +-- .../federated/DistributedMultiportToBank.txt | 6 ++-- .../federated/DistributedMultiportToken.txt | 2 +- .../src/federated/DistributedNetworkOrder.txt | 6 ++-- .../DistributedPhysicalActionUpstream.txt | 4 +-- .../DistributedPhysicalActionUpstreamLong.txt | 4 +-- .../C/src/federated/DistributedStop.txt | 8 ++--- .../C/src/federated/DistributedStopZero.txt | 4 +-- .../C/src/federated/DistributedToken.txt | 8 ++--- .../C/src/federated/FeedbackDelay.txt | 24 +++++++-------- .../C/src/federated/FeedbackDelaySimple.txt | 6 ++-- .../C/src/federated/HelloDistributed.txt | 6 ++-- .../federated/LoopDistributedCentralized.txt | 6 ++-- .../federated/LoopDistributedCentralized2.txt | 12 ++++---- ...opDistributedCentralizedPhysicalAction.txt | 6 ++-- .../LoopDistributedCentralizedPrecedence.txt | 8 ++--- ...tributedCentralizedPrecedenceHierarchy.txt | 12 ++++---- .../LoopDistributedDecentralized.txt | 6 ++-- .../C/src/federated/LoopDistributedDouble.txt | 10 +++---- .../C/src/federated/PhysicalSTP.txt | 4 +-- .../federated/PingPongDistributedPhysical.txt | 12 ++++---- .../C/src/federated/SimpleFederated.txt | 4 +-- .../C/src/federated/StopAtShutdown.txt | 4 +-- .../C/src/federated/TopLevelArtifacts.txt | 2 +- .../C/src/federated/failing/ClockSync.txt | 4 +-- .../failing/DistributedDoublePortLooped.txt | 28 ++++++++--------- .../failing/DistributedDoublePortLooped2.txt | 18 +++++------ .../DistributedNetworkOrderDecentralized.txt | 6 ++-- ...LoopDistributedDecentralizedPrecedence.txt | 8 ++--- ...ibutedDecentralizedPrecedenceHierarchy.txt | 6 ++-- .../failing/SimpleFederatedAuthenticated.txt | 4 +-- test/known-good/C/src/lib/Count.txt | 4 +-- test/known-good/C/src/lib/Imported.txt | 2 +- test/known-good/C/src/lib/ImportedAgain.txt | 2 +- .../C/src/lib/ImportedComposition.txt | 8 ++--- test/known-good/C/src/lib/InternalDelay.txt | 6 ++-- .../C/src/lib/LoopedActionSender.txt | 4 +-- test/known-good/C/src/lib/PassThrough.txt | 4 +-- test/known-good/C/src/lib/Test.txt | 4 +-- test/known-good/C/src/lib/TestCount.txt | 6 ++-- .../C/src/lib/TestCountMultiport.txt | 4 +-- .../modal_models/BanksCount3ModesComplex.txt | 2 +- .../C/src/modal_models/ConvertCaseTest.txt | 20 ++++++------- .../C/src/modal_models/Count3Modes.txt | 6 ++-- .../C/src/modal_models/MixedReactions.txt | 4 +-- .../C/src/modal_models/ModalActions.txt | 12 ++++---- .../C/src/modal_models/ModalAfter.txt | 18 +++++------ .../C/src/modal_models/ModalCycleBreaker.txt | 10 +++---- .../src/modal_models/ModalNestedReactions.txt | 12 ++++---- .../src/modal_models/ModalStartupShutdown.txt | 30 +++++++++---------- .../C/src/modal_models/ModalStateReset.txt | 16 +++++----- .../src/modal_models/ModalStateResetAuto.txt | 16 +++++----- .../C/src/modal_models/ModalTimers.txt | 8 ++--- .../MultipleOutputFeeder_2Connections.txt | 8 ++--- ...ltipleOutputFeeder_ReactionConnections.txt | 8 ++--- .../C/src/modal_models/util/TraceTesting.txt | 8 ++--- .../C/src/multiport/BankGangedConnections.txt | 8 ++--- .../C/src/multiport/BankIndexInitializer.txt | 4 +-- .../C/src/multiport/BankMulticast.txt | 4 +-- .../src/multiport/BankMultiportToReaction.txt | 4 +-- .../multiport/BankReactionsInContainer.txt | 4 +-- .../C/src/multiport/BankSelfBroadcast.txt | 4 +-- .../known-good/C/src/multiport/BankToBank.txt | 8 ++--- .../C/src/multiport/BankToBankMultiport.txt | 4 +-- .../multiport/BankToBankMultiportAfter.txt | 4 +-- .../C/src/multiport/BankToMultiport.txt | 4 +-- .../C/src/multiport/BankToReaction.txt | 2 +- test/known-good/C/src/multiport/Broadcast.txt | 6 ++-- .../C/src/multiport/BroadcastAfter.txt | 6 ++-- .../src/multiport/BroadcastMultipleAfter.txt | 6 ++-- test/known-good/C/src/multiport/DualBanks.txt | 4 +-- .../C/src/multiport/DualBanksMultiport.txt | 2 +- .../C/src/multiport/FullyConnected.txt | 4 +-- .../multiport/FullyConnectedAddressable.txt | 4 +-- .../C/src/multiport/MultiportFromBank.txt | 4 +-- .../src/multiport/MultiportFromHierarchy.txt | 4 +-- .../C/src/multiport/MultiportFromReaction.txt | 4 +-- .../C/src/multiport/MultiportIn.txt | 10 +++---- .../multiport/MultiportInParameterized.txt | 10 +++---- .../C/src/multiport/MultiportOut.txt | 8 ++--- .../C/src/multiport/MultiportToBank.txt | 6 ++-- .../C/src/multiport/MultiportToBankAfter.txt | 4 +-- .../C/src/multiport/MultiportToBankDouble.txt | 4 +-- .../multiport/MultiportToBankHierarchy.txt | 4 +-- .../C/src/multiport/MultiportToHierarchy.txt | 4 +-- .../C/src/multiport/MultiportToMultiport.txt | 4 +-- .../multiport/MultiportToMultiportArray.txt | 4 +-- .../MultiportToMultiportParameter.txt | 4 +-- .../C/src/multiport/MultiportToPort.txt | 4 +-- .../C/src/multiport/MultiportToReaction.txt | 4 +-- .../C/src/multiport/NestedBanks.txt | 4 +-- .../C/src/multiport/PipelineAfter.txt | 8 ++--- .../src/multiport/ReactionToContainedBank.txt | 2 +- .../multiport/ReactionToContainedBank2.txt | 2 +- .../ReactionToContainedBankMultiport.txt | 2 +- .../C/src/multiport/ReactionsToNested.txt | 4 +-- test/known-good/C/src/multiport/Sparse.txt | 2 +- .../C/src/multiport/SparseFallback.txt | 2 +- .../TriggerDownstreamOnlyIfPresent.txt | 10 +++---- .../C/src/serialization/ProtoNoPacking.txt | 4 +-- .../serialization/ROSBuiltInSerialization.txt | 8 ++--- .../ROSBuiltInSerializationSharedPtr.txt | 8 ++--- .../C/src/target/HelloWorldCCPP.txt | 2 +- .../C/src/token/TokenContainedPrint.txt | 2 +- .../C/src/token/TokenContainedPrintBank.txt | 2 +- .../C/src/token/TokenContainedSource.txt | 4 +-- .../C/src/token/TokenContainedSourceBank.txt | 4 +-- test/known-good/C/src/token/lib/Token.txt | 20 ++++++------- test/known-good/Cpp/src/ActionDelay.txt | 10 +++---- test/known-good/Cpp/src/ActionIsPresent.txt | 4 +-- test/known-good/Cpp/src/ActionValues.txt | 4 +-- .../Cpp/src/ActionWithNoReaction.txt | 6 ++-- test/known-good/Cpp/src/After.txt | 10 +++---- test/known-good/Cpp/src/AfterOverlapped.txt | 4 +-- test/known-good/Cpp/src/AfterZero.txt | 10 +++---- test/known-good/Cpp/src/Alignment.txt | 16 +++++----- test/known-good/Cpp/src/ArrayAsParameter.txt | 10 +++---- test/known-good/Cpp/src/ArrayAsType.txt | 4 +-- test/known-good/Cpp/src/ArrayPrint.txt | 4 +-- test/known-good/Cpp/src/ArrayScale.txt | 4 +-- .../Cpp/src/CharLiteralInitializer.txt | 2 +- test/known-good/Cpp/src/Composition.txt | 8 ++--- test/known-good/Cpp/src/CompositionAfter.txt | 8 ++--- test/known-good/Cpp/src/CompositionGain.txt | 8 ++--- test/known-good/Cpp/src/CountTest.txt | 4 +-- test/known-good/Cpp/src/DanglingOutput.txt | 6 ++-- test/known-good/Cpp/src/Deadline.txt | 8 ++--- .../Cpp/src/DeadlineHandledAbove.txt | 6 ++-- test/known-good/Cpp/src/DelayInt.txt | 10 +++---- test/known-good/Cpp/src/DelayedAction.txt | 4 +-- test/known-good/Cpp/src/DelayedReaction.txt | 4 +-- test/known-good/Cpp/src/Determinism.txt | 10 +++---- test/known-good/Cpp/src/DoubleInvocation.txt | 12 ++++---- test/known-good/Cpp/src/DoublePort.txt | 10 +++---- test/known-good/Cpp/src/DoubleReaction.txt | 10 +++---- test/known-good/Cpp/src/DoubleTrigger.txt | 2 +- test/known-good/Cpp/src/FloatLiteral.txt | 8 ++--- test/known-good/Cpp/src/Gain.txt | 6 ++-- test/known-good/Cpp/src/GetMicroStep.txt | 2 +- test/known-good/Cpp/src/Hello.txt | 6 ++-- test/known-good/Cpp/src/Hierarchy.txt | 14 ++++----- test/known-good/Cpp/src/Hierarchy2.txt | 20 ++++++------- test/known-good/Cpp/src/ImportComposition.txt | 2 +- .../Cpp/src/ManualDelayedReaction.txt | 10 +++---- test/known-good/Cpp/src/Methods.txt | 2 +- test/known-good/Cpp/src/Microsteps.txt | 6 ++-- test/known-good/Cpp/src/MovingAverage.txt | 16 +++++----- test/known-good/Cpp/src/MultipleContained.txt | 6 ++-- .../Cpp/src/NativeListsAndTimes.txt | 10 +++---- .../Cpp/src/NestedTriggeredReactions.txt | 8 ++--- .../known-good/Cpp/src/PhysicalConnection.txt | 6 ++-- test/known-good/Cpp/src/Pipeline.txt | 6 ++-- test/known-good/Cpp/src/PreambleTest.txt | 2 +- .../Cpp/src/ReadOutputOfContainedReactor.txt | 4 +-- test/known-good/Cpp/src/Schedule.txt | 4 +-- .../Cpp/src/ScheduleLogicalAction.txt | 10 +++---- test/known-good/Cpp/src/SelfLoop.txt | 8 ++--- test/known-good/Cpp/src/SendingInside.txt | 6 ++-- test/known-good/Cpp/src/SendingInside2.txt | 2 +- test/known-good/Cpp/src/SimpleDeadline.txt | 6 ++-- test/known-good/Cpp/src/SlowingClock.txt | 4 +-- .../Cpp/src/SlowingClockPhysical.txt | 4 +-- .../Cpp/src/StartupOutFromInside.txt | 2 +- test/known-good/Cpp/src/Stride.txt | 6 ++-- test/known-good/Cpp/src/StructAsState.txt | 2 +- test/known-good/Cpp/src/StructAsType.txt | 2 +- .../known-good/Cpp/src/StructAsTypeDirect.txt | 2 +- test/known-good/Cpp/src/StructPrint.txt | 4 +-- test/known-good/Cpp/src/StructScale.txt | 4 +-- .../Cpp/src/TestForPreviousOutput.txt | 4 +-- test/known-good/Cpp/src/TimeLimit.txt | 8 ++--- test/known-good/Cpp/src/Timeout_Test.txt | 4 +-- test/known-good/Cpp/src/ToReactionNested.txt | 6 ++-- .../src/TriggerDownstreamOnlyIfPresent2.txt | 4 +-- .../Cpp/src/concurrent/AsyncCallback.txt | 10 +++---- .../Cpp/src/concurrent/AsyncCallback2.txt | 6 ++-- .../src/concurrent/CompositionThreaded.txt | 8 ++--- .../DeadlineHandledAboveThreaded.txt | 6 ++-- .../Cpp/src/concurrent/DeadlineThreaded.txt | 8 ++--- .../Cpp/src/concurrent/DelayIntThreaded.txt | 10 +++---- .../src/concurrent/DeterminismThreaded.txt | 10 +++---- .../src/concurrent/DoubleReactionThreaded.txt | 10 +++---- .../Cpp/src/concurrent/GainThreaded.txt | 6 ++-- .../Cpp/src/concurrent/HelloThreaded.txt | 6 ++-- .../src/concurrent/SendingInsideThreaded.txt | 6 ++-- .../Cpp/src/concurrent/Threaded.txt | 18 +++++------ .../Cpp/src/concurrent/ThreadedThreaded.txt | 10 +++---- .../Cpp/src/concurrent/TimeLimitThreaded.txt | 8 ++--- .../Cpp/src/enclave/EnclaveBank.txt | 2 +- .../Cpp/src/enclave/EnclaveBankEach.txt | 2 +- test/known-good/Cpp/src/lib/Count.txt | 4 +-- test/known-good/Cpp/src/lib/Imported.txt | 2 +- test/known-good/Cpp/src/lib/ImportedAgain.txt | 2 +- .../Cpp/src/lib/ImportedComposition.txt | 8 ++--- .../Cpp/src/lib/LoopedActionSender.txt | 4 +-- .../Cpp/src/multiport/BankSelfBroadcast.txt | 4 +-- .../Cpp/src/multiport/BankToBank.txt | 8 ++--- .../Cpp/src/multiport/BankToBankMultiport.txt | 4 +-- .../multiport/BankToBankMultiportAfter.txt | 6 ++-- .../Cpp/src/multiport/BankToMultiport.txt | 4 +-- .../Cpp/src/multiport/Broadcast.txt | 4 +-- .../Cpp/src/multiport/BroadcastAfter.txt | 6 ++-- .../src/multiport/BroadcastMultipleAfter.txt | 6 ++-- .../Cpp/src/multiport/FullyConnected.txt | 4 +-- .../multiport/FullyConnectedAddressable.txt | 2 +- .../src/multiport/IndexIntoMultiportInput.txt | 6 ++-- .../multiport/IndexIntoMultiportOutput.txt | 12 ++++---- .../Cpp/src/multiport/Multiport.txt | 2 +- .../Cpp/src/multiport/MultiportFromBank.txt | 4 +-- .../multiport/MultiportFromBankHierarchy.txt | 4 +-- .../MultiportFromBankHierarchyAfter.txt | 4 +-- .../src/multiport/MultiportFromHierarchy.txt | 4 +-- .../Cpp/src/multiport/MultiportIn.txt | 10 +++---- .../src/multiport/MultiportMultipleSet.txt | 4 +-- .../Cpp/src/multiport/MultiportOut.txt | 8 ++--- .../Cpp/src/multiport/MultiportToBank.txt | 2 +- .../src/multiport/MultiportToBankAfter.txt | 2 +- .../multiport/MultiportToBankHierarchy.txt | 4 +-- .../src/multiport/MultiportToHierarchy.txt | 4 +-- .../src/multiport/MultiportToMultiport.txt | 2 +- .../multiport/MultiportToMultiportArray.txt | 4 +-- .../MultiportToMultiportPhysical.txt | 2 +- .../Cpp/src/multiport/MultiportToPort.txt | 4 +-- .../Cpp/src/multiport/PipelineAfter.txt | 8 ++--- .../ReadMultiportOutputOfContainedBank.txt | 2 +- .../multiport/ReadOutputOfContainedBank.txt | 4 +-- .../Cpp/src/multiport/SparseMultiport.txt | 4 +-- .../multiport/WriteInputOfContainedBank.txt | 4 +-- .../WriteMultiportInputOfContainedBank.txt | 2 +- test/known-good/Cpp/src/properties/Fast.txt | 2 +- .../known-good/Cpp/src/properties/Timeout.txt | 2 +- .../Cpp/src/properties/TimeoutZero.txt | 2 +- test/known-good/Cpp/src/target/AfterVoid.txt | 8 ++--- .../target/BraceAndParenInitialization.txt | 4 +-- .../Cpp/src/target/CombinedTypeNames.txt | 4 +-- .../Cpp/src/target/GenericAfter.txt | 4 +-- .../Cpp/src/target/GenericDelay.txt | 4 +-- .../src/target/GenericParameterAndState.txt | 2 +- .../src/target/MultipleContainedGeneric.txt | 6 ++-- .../Cpp/src/target/PreambleFile.txt | 4 +-- .../federated/failing/TopLevelArtifacts.txt | 2 +- 388 files changed, 1251 insertions(+), 1251 deletions(-) diff --git a/test/known-good/C/src/ActionDelay.txt b/test/known-good/C/src/ActionDelay.txt index 3e96e2301..f8cdc7926 100644 --- a/test/known-good/C/src/ActionDelay.txt +++ b/test/known-good/C/src/ActionDelay.txt @@ -2,9 +2,9 @@ target C reactor GeneratedDelay { - input y_in: int - output y_out: int - state y_state: int(0) + input y_in: int + output y_out: int + state y_state: int(0) logical action act(100 msec) reaction(y_in) -> act {= @@ -16,13 +16,13 @@ } reactor Source { - output out: int + output out: int reaction(startup) -> out {= lf_set(out, 1); =} } reactor Sink { - input in: int + input in: int reaction(in) {= interval_t elapsed_logical = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/ActionIsPresent.txt b/test/known-good/C/src/ActionIsPresent.txt index 6f2edd974..fade84e8a 100644 --- a/test/known-good/C/src/ActionIsPresent.txt +++ b/test/known-good/C/src/ActionIsPresent.txt @@ -3,7 +3,7 @@ main reactor ActionIsPresent(offset: time(1 nsec), period: time(500 msec)) { logical action a - state success: bool(false) + state success: bool(false) reaction(startup, a) -> a {= if (!a->is_present) { diff --git a/test/known-good/C/src/ActionWithNoReaction.txt b/test/known-good/C/src/ActionWithNoReaction.txt index 04d280352..9cd913bbd 100644 --- a/test/known-good/C/src/ActionWithNoReaction.txt +++ b/test/known-good/C/src/ActionWithNoReaction.txt @@ -7,9 +7,9 @@ } reactor foo { - input x: int - output y: int - logical action a: int* + input x: int + output y: int + logical action a: int* reaction(x) -> y, a {= // reaction(a) {= =} lf_set(y, 2*x->value); @@ -18,7 +18,7 @@ } reactor print { - input x: int + input x: int reaction(x) {= printf("Result is %d\n", x->value); diff --git a/test/known-good/C/src/After.txt b/test/known-good/C/src/After.txt index d157eb9e0..07dfc8630 100644 --- a/test/known-good/C/src/After.txt +++ b/test/known-good/C/src/After.txt @@ -6,16 +6,16 @@ } reactor foo { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= lf_set(y, 2*x->value); =} } reactor print { - state expected_time: time(10 msec) - state received: int(0) - input x: int + state expected_time: time(10 msec) + state received: int(0) + input x: int reaction(x) {= self->received++; diff --git a/test/known-good/C/src/AfterCycles.txt b/test/known-good/C/src/AfterCycles.txt index 8f401c285..df61337e4 100644 --- a/test/known-good/C/src/AfterCycles.txt +++ b/test/known-good/C/src/AfterCycles.txt @@ -3,20 +3,20 @@ target C reactor Source { - output out: unsigned + output out: unsigned reaction(startup) -> out {= lf_set(out, 1); =} } reactor Work { - input in: unsigned - output out: unsigned + input in: unsigned + output out: unsigned reaction(in) -> out {= lf_set(out, in->value); =} } main reactor AfterCycles { - state count: int(0) + state count: int(0) s = new Source() w0 = new Work() w1 = new Work() diff --git a/test/known-good/C/src/AfterOverlapped.txt b/test/known-good/C/src/AfterOverlapped.txt index 3af8848a5..42eeb585f 100644 --- a/test/known-good/C/src/AfterOverlapped.txt +++ b/test/known-good/C/src/AfterOverlapped.txt @@ -7,9 +7,9 @@ import Count from "lib/Count.lf" reactor Test { - input c: int - state i: int(0) - state received: int(0) + input c: int + state i: int(0) + state received: int(0) reaction(c) {= self->received++; diff --git a/test/known-good/C/src/AfterZero.txt b/test/known-good/C/src/AfterZero.txt index 7ee28f444..cc5ffe7f5 100644 --- a/test/known-good/C/src/AfterZero.txt +++ b/test/known-good/C/src/AfterZero.txt @@ -6,16 +6,16 @@ } reactor foo { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= SET(y, 2*x->value); =} } reactor print { - state expected_time: time(0) - state received: int(0) - input x: int + state expected_time: time(0) + state received: int(0) + input x: int reaction(x) {= self->received++; diff --git a/test/known-good/C/src/Alignment.txt b/test/known-good/C/src/Alignment.txt index e4e11540e..37dd73d57 100644 --- a/test/known-good/C/src/Alignment.txt +++ b/test/known-good/C/src/Alignment.txt @@ -6,18 +6,18 @@ } reactor Source { - output out: int - state count: int(1) + output out: int + state count: int(1) timer t(0, 100 msec) reaction(t) -> out {= lf_set(out, self->count++); =} } reactor Sieve { - input in: int - output out: bool - state primes: int*({= NULL =}) - state last_prime: int(0) + input in: int + output out: bool + state primes: int*({= NULL =}) + state last_prime: int(0) reaction(startup) {= // There are 1229 primes between 1 and 10,000. @@ -72,9 +72,9 @@ } reactor Destination { - input ok: bool - input in: int - state last_invoked: tag_t({= NEVER_TAG_INITIALIZER =}) + input ok: bool + input in: int + state last_invoked: tag_t({= NEVER_TAG_INITIALIZER =}) reaction(ok, in) {= if (ok->is_present && in->is_present) { diff --git a/test/known-good/C/src/ArrayAsParameter.txt b/test/known-good/C/src/ArrayAsParameter.txt index 4252c1bc1..63ee33c1e 100644 --- a/test/known-good/C/src/ArrayAsParameter.txt +++ b/test/known-good/C/src/ArrayAsParameter.txt @@ -4,8 +4,8 @@ target C reactor Source(sequence: int[](0, 1, 2), n_sequence: int(3)) { - output out: int - state count: int(0) + output out: int + state count: int(0) logical action next reaction(startup, next) -> out, next {= @@ -18,9 +18,9 @@ } reactor Print { - input in: int - state count: int(1) - state received: int(0) + input in: int + state count: int(1) + state received: int(0) reaction(in) {= self->received++; diff --git a/test/known-good/C/src/ArrayAsType.txt b/test/known-good/C/src/ArrayAsType.txt index b77223094..8e0b7386d 100644 --- a/test/known-good/C/src/ArrayAsType.txt +++ b/test/known-good/C/src/ArrayAsType.txt @@ -3,7 +3,7 @@ target C reactor Source { - output out: int[3] + output out: int[3] reaction(startup) -> out {= out->value[0] = 0; @@ -14,7 +14,7 @@ } reactor Print(scale: int(1)) { // The scale parameter is just for testing. - input in: int[3] + input in: int[3] reaction(in) {= int count = 0; // For testing. diff --git a/test/known-good/C/src/ArrayFree.txt b/test/known-good/C/src/ArrayFree.txt index 0c3f6d61d..fcbb955cc 100644 --- a/test/known-good/C/src/ArrayFree.txt +++ b/test/known-good/C/src/ArrayFree.txt @@ -11,7 +11,7 @@ import Scale from "ArrayScale.lf" reactor Free(scale: int(2), size: int(3)) { - mutable input in: int[] + mutable input in: int[] reaction(in) {= for(int i = 0; i < self->size; i++) { diff --git a/test/known-good/C/src/ArrayFreeMultiple.txt b/test/known-good/C/src/ArrayFreeMultiple.txt index 7282ed1b9..6497c0f13 100644 --- a/test/known-good/C/src/ArrayFreeMultiple.txt +++ b/test/known-good/C/src/ArrayFreeMultiple.txt @@ -11,8 +11,8 @@ import Print from "ArrayPrint.lf" reactor Source { - output out: int[] - state c: int(0) + output out: int[] + state c: int(0) timer t(0, 1 sec) reaction(t) -> out {= @@ -27,7 +27,7 @@ } reactor Free(scale: int(2)) { - mutable input in: int[] + mutable input in: int[] reaction(in) {= for(int i = 0; i < in->length; i++) { diff --git a/test/known-good/C/src/ArrayPrint.txt b/test/known-good/C/src/ArrayPrint.txt index 008252de1..363aace29 100644 --- a/test/known-good/C/src/ArrayPrint.txt +++ b/test/known-good/C/src/ArrayPrint.txt @@ -7,8 +7,8 @@ } reactor Source(size: int(3)) { - output out: int[] - state count: int(0) + output out: int[] + state count: int(0) timer t(0, 1 sec) reaction(t) -> out {= @@ -27,8 +27,8 @@ // The scale parameter is just for testing. reactor Print(scale: int(1), size: int(3)) { - input in: int[] - state count: int(0) + input in: int[] + state count: int(0) reaction(in) {= bool failed = false; // For testing. diff --git a/test/known-good/C/src/ArrayScale.txt b/test/known-good/C/src/ArrayScale.txt index 8d6e644b7..ed0751997 100644 --- a/test/known-good/C/src/ArrayScale.txt +++ b/test/known-good/C/src/ArrayScale.txt @@ -10,8 +10,8 @@ import Print, Source from "ArrayPrint.lf" reactor Scale(scale: int(2)) { - mutable input in: int[] - output out: int[] + mutable input in: int[] + output out: int[] reaction(in) -> out {= for(int i = 0; i < in->length; i++) { diff --git a/test/known-good/C/src/CharLiteralInitializer.txt b/test/known-good/C/src/CharLiteralInitializer.txt index 6931b1224..fd7875f3f 100644 --- a/test/known-good/C/src/CharLiteralInitializer.txt +++ b/test/known-good/C/src/CharLiteralInitializer.txt @@ -2,7 +2,7 @@ target C main reactor CharLiteralInitializer { - state c: char('x') + state c: char('x') reaction(startup) {= if (self->c != 'x') { diff --git a/test/known-good/C/src/Composition.txt b/test/known-good/C/src/Composition.txt index bd0d0c719..be3ee9f72 100644 --- a/test/known-good/C/src/Composition.txt +++ b/test/known-good/C/src/Composition.txt @@ -6,9 +6,9 @@ } reactor Source(period: time(2 sec)) { - output y: int + output y: int timer t(1 sec, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= (self->count)++; @@ -18,8 +18,8 @@ } reactor Test { - input x: int - state count: int(0) + input x: int + state count: int(0) reaction(x) {= (self->count)++; diff --git a/test/known-good/C/src/CompositionAfter.txt b/test/known-good/C/src/CompositionAfter.txt index 17e28270a..7c828a050 100644 --- a/test/known-good/C/src/CompositionAfter.txt +++ b/test/known-good/C/src/CompositionAfter.txt @@ -6,9 +6,9 @@ } reactor Source(period: time(2 sec)) { - output y: int + output y: int timer t(1 sec, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= (self->count)++; @@ -17,8 +17,8 @@ } reactor Test { - input x: int - state count: int(0) + input x: int + state count: int(0) reaction(x) {= (self->count)++; diff --git a/test/known-good/C/src/CompositionGain.txt b/test/known-good/C/src/CompositionGain.txt index 1e598e3b0..889447b2c 100644 --- a/test/known-good/C/src/CompositionGain.txt +++ b/test/known-good/C/src/CompositionGain.txt @@ -2,8 +2,8 @@ target C reactor Gain { - input gainin: int - output y: int + input gainin: int + output y: int reaction(gainin) -> y {= printf("Gain received %d\n", gainin->value); @@ -12,8 +12,8 @@ } reactor Wrapper { - input x: int - output y: int + input x: int + output y: int gain = new Gain() x -> gain.gainin gain.y -> y diff --git a/test/known-good/C/src/CompositionInheritance.txt b/test/known-good/C/src/CompositionInheritance.txt index 2ddffb4f0..08262e554 100644 --- a/test/known-good/C/src/CompositionInheritance.txt +++ b/test/known-good/C/src/CompositionInheritance.txt @@ -6,10 +6,10 @@ } reactor Source(period: time(2 sec)) { - input foo: int - output y: int + input foo: int + output y: int timer t(1 sec, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= printf("Hello World. At time %lld, my count is: %d.\n", lf_time_logical_elapsed(), self->count); @@ -18,7 +18,7 @@ } reactor SourceExtended extends Source { - output y2: int + output y2: int timer t2(1 sec, 3 sec) reaction(t2) -> y2 {= @@ -29,8 +29,8 @@ } reactor Test { - input x: int - state count: int(0) + input x: int + state count: int(0) reaction(x) {= (self->count)++; diff --git a/test/known-good/C/src/CountSelf.txt b/test/known-good/C/src/CountSelf.txt index 77c9733fa..6e28b2be5 100644 --- a/test/known-good/C/src/CountSelf.txt +++ b/test/known-good/C/src/CountSelf.txt @@ -7,8 +7,8 @@ import TestCount from "lib/TestCount.lf" reactor CountSelf2(delay: time(100 msec)) { - output out: int - logical action a: int + output out: int + logical action a: int reaction(startup) -> a, out {= lf_set(out, 0); diff --git a/test/known-good/C/src/DanglingOutput.txt b/test/known-good/C/src/DanglingOutput.txt index e16a4b696..1a5c20548 100644 --- a/test/known-good/C/src/DanglingOutput.txt +++ b/test/known-good/C/src/DanglingOutput.txt @@ -3,15 +3,15 @@ target C reactor Source { - output out: int + output out: int timer t reaction(t) -> out {= lf_set(out, 1); =} } reactor Gain { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= printf("Received %d.\n", in->value); diff --git a/test/known-good/C/src/Deadline.txt b/test/known-good/C/src/Deadline.txt index 4fb239a2a..425217a56 100644 --- a/test/known-good/C/src/Deadline.txt +++ b/test/known-good/C/src/Deadline.txt @@ -6,9 +6,9 @@ } reactor Source(period: time(3 sec)) { - output y: int + output y: int timer t(0, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= if (2 * (self->count / 2) != self->count) { @@ -23,8 +23,8 @@ } reactor Destination(timeout: time(1 sec)) { - input x: int - state count: int(0) + input x: int + state count: int(0) reaction(x) {= printf("Destination receives: %d\n", x->value); diff --git a/test/known-good/C/src/DeadlineAnytime.txt b/test/known-good/C/src/DeadlineAnytime.txt index 4c5a101b7..e51a8a56b 100644 --- a/test/known-good/C/src/DeadlineAnytime.txt +++ b/test/known-good/C/src/DeadlineAnytime.txt @@ -2,7 +2,7 @@ target C reactor A { - state i: int + state i: int logical action a reaction(startup) -> a {= diff --git a/test/known-good/C/src/DeadlineHandledAbove.txt b/test/known-good/C/src/DeadlineHandledAbove.txt index a7e5d9657..3c9beddb7 100644 --- a/test/known-good/C/src/DeadlineHandledAbove.txt +++ b/test/known-good/C/src/DeadlineHandledAbove.txt @@ -3,8 +3,8 @@ target C reactor Deadline(threshold: time(100 msec)) { - input x: int - output deadline_violation: bool + input x: int + output deadline_violation: bool reaction(x) -> deadline_violation {= printf("ERROR: Deadline violation was not detected!\n"); @@ -16,7 +16,7 @@ } main reactor DeadlineHandledAbove { - state violation_detected: bool(false) + state violation_detected: bool(false) d = new Deadline(threshold = 10 msec) reaction(startup) -> d.x {= diff --git a/test/known-good/C/src/DeadlineWithAfterDelay.txt b/test/known-good/C/src/DeadlineWithAfterDelay.txt index c73ec2fe3..b057d594f 100644 --- a/test/known-good/C/src/DeadlineWithAfterDelay.txt +++ b/test/known-good/C/src/DeadlineWithAfterDelay.txt @@ -7,7 +7,7 @@ preamble {= int global_cnt = 0; =} reactor Source { - output out: int + output out: int timer t(0 msec, 100 msec) reaction(t) -> out {= @@ -17,7 +17,7 @@ } reactor SinkWithDeadline { - input in: int + input in: int reaction(in) {= global_cnt--; diff --git a/test/known-good/C/src/DeadlineWithBanks.txt b/test/known-good/C/src/DeadlineWithBanks.txt index ebb50c486..d6a357ea1 100644 --- a/test/known-good/C/src/DeadlineWithBanks.txt +++ b/test/known-good/C/src/DeadlineWithBanks.txt @@ -13,7 +13,7 @@ reactor Bank(bank_index: int(0)) { timer t(0, 100 msec) - output out: int + output out: int reaction(t) -> out {= int exp_cnt; @@ -47,7 +47,7 @@ } reactor Sink(dead: time(0)) { - input in: int + input in: int reaction(in) {= =} deadline(dead) {= =} } diff --git a/test/known-good/C/src/DeadlineZero.txt b/test/known-good/C/src/DeadlineZero.txt index 4d8db3816..f74c6d47c 100644 --- a/test/known-good/C/src/DeadlineZero.txt +++ b/test/known-good/C/src/DeadlineZero.txt @@ -4,8 +4,8 @@ } reactor Detector { - input trigger: int - state cnt: int(0) + input trigger: int + state cnt: int(0) reaction(trigger) {= printf("ERROR: failed to detect zero-duration deadline at iteration %d.\n", self->cnt); @@ -14,7 +14,7 @@ } reactor Generator { - output pulse: int + output pulse: int timer t(0, 100 msec) reaction(t) -> pulse {= lf_set(pulse, 0); =} diff --git a/test/known-good/C/src/DelayArray.txt b/test/known-good/C/src/DelayArray.txt index 5e73b7a08..c5688d2aa 100644 --- a/test/known-good/C/src/DelayArray.txt +++ b/test/known-good/C/src/DelayArray.txt @@ -5,9 +5,9 @@ } reactor DelayPointer(delay: time(100 msec)) { - input in: int[] - output out: int[] - logical action a: int[] + input in: int[] + output out: int[] + logical action a: int[] reaction(in) -> a {= lf_schedule_token(a, self->delay, in->token); =} @@ -15,7 +15,7 @@ } reactor Source { - output out: int[] + output out: int[] reaction(startup) -> out {= // Dynamically allocate an output array of length 3. @@ -31,7 +31,7 @@ } reactor Print(scale: int(1)) { // The scale parameter is just for testing. - input in: int[] + input in: int[] reaction(in) {= int count = 0; // For testing. diff --git a/test/known-good/C/src/DelayArrayWithAfter.txt b/test/known-good/C/src/DelayArrayWithAfter.txt index 922f4114f..365d2e4fc 100644 --- a/test/known-good/C/src/DelayArrayWithAfter.txt +++ b/test/known-good/C/src/DelayArrayWithAfter.txt @@ -6,8 +6,8 @@ } reactor Source { - output out: int[] - state iteration: int(1) + output out: int[] + state iteration: int(1) timer t(0, 1 sec) reaction(t) -> out {= @@ -24,9 +24,9 @@ } reactor Print(scale: int(1)) { // The scale parameter is just for testing. - input in: int[] - state iteration: int(1) - state inputs_received: int(0) + input in: int[] + state iteration: int(1) + state inputs_received: int(0) reaction(in) {= self->inputs_received++; diff --git a/test/known-good/C/src/DelayInt.txt b/test/known-good/C/src/DelayInt.txt index f0fd698f1..326c942f2 100644 --- a/test/known-good/C/src/DelayInt.txt +++ b/test/known-good/C/src/DelayInt.txt @@ -2,9 +2,9 @@ target C reactor Delay(delay: time(100 msec)) { - input in: int - output out: int - logical action a: int + input in: int + output out: int + logical action a: int reaction(a) -> out {= if (a->has_value && a->is_present) lf_set(out, a->value); @@ -17,9 +17,9 @@ } reactor Test { - input in: int - state start_time: time(0) - state received_value: bool(false) + input in: int + state start_time: time(0) + state received_value: bool(false) reaction(startup) {= // Record the logical time at the start. diff --git a/test/known-good/C/src/DelayPointer.txt b/test/known-good/C/src/DelayPointer.txt index 4e2954b22..7f7c2f1c6 100644 --- a/test/known-good/C/src/DelayPointer.txt +++ b/test/known-good/C/src/DelayPointer.txt @@ -2,9 +2,9 @@ target C reactor DelayPointer2(delay: time(100 msec)) { - input in: int* - output out: int* - logical action a: int* + input in: int* + output out: int* + logical action a: int* reaction(a) -> out {= // Using lf_set_token delegates responsibility for @@ -20,7 +20,7 @@ } reactor Source { - output out: int* + output out: int* reaction(startup) -> out {= SET_NEW(out); @@ -29,9 +29,9 @@ } reactor Test { - input in: int* - state start_time: time(0) - state received_value: bool(false) + input in: int* + state start_time: time(0) + state received_value: bool(false) reaction(startup) {= // Record the logical time at the start. diff --git a/test/known-good/C/src/DelayString.txt b/test/known-good/C/src/DelayString.txt index d69a56344..adbe8bdb6 100644 --- a/test/known-good/C/src/DelayString.txt +++ b/test/known-good/C/src/DelayString.txt @@ -3,9 +3,9 @@ target C reactor DelayString2(delay: time(100 msec)) { - input in: string - output out: string - logical action a: string + input in: string + output out: string + logical action a: string reaction(a) -> out {= lf_set(out, a->value); =} @@ -16,8 +16,8 @@ } reactor Test { - input in: string - state start_time: time(0) + input in: string + state start_time: time(0) reaction(in) {= printf("Received: %s.\n", in->value); diff --git a/test/known-good/C/src/DelayStruct.txt b/test/known-good/C/src/DelayStruct.txt index d5fa507f4..aa3d33bbc 100644 --- a/test/known-good/C/src/DelayStruct.txt +++ b/test/known-good/C/src/DelayStruct.txt @@ -8,9 +8,9 @@ =} reactor DelayPointer(delay: time(100 msec)) { - input in: hello_t* - output out: hello_t* - logical action a: hello_t* + input in: hello_t* + output out: hello_t* + logical action a: hello_t* reaction(a) -> out {= // Using lf_set_token delegates responsibility for @@ -26,7 +26,7 @@ } reactor Source { - output out: hello_t* + output out: hello_t* reaction(startup) -> out {= // Dynamically allocate an output struct. @@ -39,7 +39,7 @@ } reactor Print(expected: int(42)) { // expected parameter is for testing. - input in: hello_t* + input in: hello_t* reaction(in) {= printf("Received: name = %s, value = %d\n", in->value->name, in->value->value); diff --git a/test/known-good/C/src/DelayStructWithAfter.txt b/test/known-good/C/src/DelayStructWithAfter.txt index a49dd7c35..de24824fd 100644 --- a/test/known-good/C/src/DelayStructWithAfter.txt +++ b/test/known-good/C/src/DelayStructWithAfter.txt @@ -8,7 +8,7 @@ =} reactor Source { - output out: hello_t* + output out: hello_t* reaction(startup) -> out {= // Dynamically allocate an output struct. @@ -21,7 +21,7 @@ } reactor Print(expected: int(42)) { // expected parameter is for testing. - input in: hello_t* + input in: hello_t* reaction(in) {= printf("Received: name = %s, value = %d\n", in->value->name, in->value->value); diff --git a/test/known-good/C/src/DelayStructWithAfterOverlapped.txt b/test/known-good/C/src/DelayStructWithAfterOverlapped.txt index f8d8b9301..aa8a330ab 100644 --- a/test/known-good/C/src/DelayStructWithAfterOverlapped.txt +++ b/test/known-good/C/src/DelayStructWithAfterOverlapped.txt @@ -10,9 +10,9 @@ =} reactor Source { - output out: hello_t* + output out: hello_t* timer t(0, 1 sec) - state s: int(0) + state s: int(0) reaction(t) -> out {= self->s++; @@ -26,8 +26,8 @@ } reactor Print { // expected parameter is for testing. - input in: hello_t* - state s: int(0) + input in: hello_t* + state s: int(0) reaction(in) {= self->s++; diff --git a/test/known-good/C/src/DelayedAction.txt b/test/known-good/C/src/DelayedAction.txt index e5925abff..583fed83c 100644 --- a/test/known-good/C/src/DelayedAction.txt +++ b/test/known-good/C/src/DelayedAction.txt @@ -6,7 +6,7 @@ main reactor DelayedAction { timer t(0, 1 sec) logical action a - state count: int(0) + state count: int(0) reaction(t) -> a {= lf_schedule(a, MSEC(100)); =} diff --git a/test/known-good/C/src/DelayedReaction.txt b/test/known-good/C/src/DelayedReaction.txt index 53fa1f5b4..987c3aa97 100644 --- a/test/known-good/C/src/DelayedReaction.txt +++ b/test/known-good/C/src/DelayedReaction.txt @@ -2,14 +2,14 @@ target C reactor Source { - output out: int + output out: int timer t reaction(t) -> out {= lf_set(out, 1); =} } reactor Sink { - input in: int + input in: int reaction(in) {= interval_t elapsed = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/Determinism.txt b/test/known-good/C/src/Determinism.txt index 3b1bd7d33..4219c148b 100644 --- a/test/known-good/C/src/Determinism.txt +++ b/test/known-good/C/src/Determinism.txt @@ -1,15 +1,15 @@ target C reactor Source { - output y: int + output y: int timer t reaction(t) -> y {= lf_set(y, 1); =} } reactor Destination { - input x: int - input y: int + input x: int + input y: int reaction(x, y) {= int sum = 0; @@ -28,8 +28,8 @@ } reactor Pass { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= lf_set(y, x->value); =} } diff --git a/test/known-good/C/src/DoubleInvocation.txt b/test/known-good/C/src/DoubleInvocation.txt index 8e4a1adee..56c9a261c 100644 --- a/test/known-good/C/src/DoubleInvocation.txt +++ b/test/known-good/C/src/DoubleInvocation.txt @@ -11,9 +11,9 @@ } reactor Ball { - output position: int - output velocity: int - state p: int(200) + output position: int + output velocity: int + state p: int(200) timer trigger(0, 1 sec) reaction(trigger) -> position, velocity {= @@ -24,9 +24,9 @@ } reactor Print { - input velocity: int - input position: int - state previous: int(-1) + input velocity: int + input position: int + state previous: int(-1) reaction(startup) {= printf("####### Print startup\n"); diff --git a/test/known-good/C/src/DoublePort.txt b/test/known-good/C/src/DoublePort.txt index 44073a6b5..f68f1797e 100644 --- a/test/known-good/C/src/DoublePort.txt +++ b/test/known-good/C/src/DoublePort.txt @@ -13,9 +13,9 @@ import Count from "lib/Count.lf" reactor CountMicrostep { - state count: int(1) - output out: int - logical action act: int + state count: int(1) + output out: int + logical action act: int timer t(0, 1 sec) reaction(t) -> act {= lf_schedule_int(act, 0, self->count++); =} @@ -24,8 +24,8 @@ } reactor Print { - input in: int - input in2: int + input in: int + input in2: int reaction(in, in2) {= interval_t elapsed_time = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/DoubleReaction.txt b/test/known-good/C/src/DoubleReaction.txt index 6e83761fc..007e4be0f 100644 --- a/test/known-good/C/src/DoubleReaction.txt +++ b/test/known-good/C/src/DoubleReaction.txt @@ -6,9 +6,9 @@ } reactor Clock(offset: time(0), period: time(1 sec)) { - output y: int + output y: int timer t(offset, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= (self->count)++; @@ -17,9 +17,9 @@ } reactor Destination { - input x: int - input w: int - state s: int(2) + input x: int + input w: int + state s: int(2) reaction(x, w) {= int sum = 0; diff --git a/test/known-good/C/src/DoubleTrigger.txt b/test/known-good/C/src/DoubleTrigger.txt index d956b12ab..74c89b160 100644 --- a/test/known-good/C/src/DoubleTrigger.txt +++ b/test/known-good/C/src/DoubleTrigger.txt @@ -8,7 +8,7 @@ main reactor DoubleTrigger { timer t1 timer t2 - state s: int(0) + state s: int(0) reaction(t1, t2) {= self->s++; diff --git a/test/known-good/C/src/FloatLiteral.txt b/test/known-good/C/src/FloatLiteral.txt index b48bc40c8..b847d906d 100644 --- a/test/known-good/C/src/FloatLiteral.txt +++ b/test/known-good/C/src/FloatLiteral.txt @@ -6,10 +6,10 @@ #include =} - state N: double(6.0221409e+23) - state charge: double(-1.6021766E-19) - state minus_epsilon: double(-.01e0) - state expected: double(.964853323188E5) + state N: double(6.0221409e+23) + state charge: double(-1.6021766E-19) + state minus_epsilon: double(-.01e0) + state expected: double(.964853323188E5) reaction(startup) {= double F = - self->N * self->charge; diff --git a/test/known-good/C/src/Gain.txt b/test/known-good/C/src/Gain.txt index 6a152795c..2fcd73693 100644 --- a/test/known-good/C/src/Gain.txt +++ b/test/known-good/C/src/Gain.txt @@ -2,15 +2,15 @@ target C reactor Scale(scale: int(2)) { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= lf_set(y, x->value * self->scale); =} } reactor Test { - input x: int - state received_value: bool(false) + input x: int + state received_value: bool(false) reaction(x) {= printf("Received %d.\n", x->value); diff --git a/test/known-good/C/src/GetMicroStep.txt b/test/known-good/C/src/GetMicroStep.txt index 23204f74e..3d801359f 100644 --- a/test/known-good/C/src/GetMicroStep.txt +++ b/test/known-good/C/src/GetMicroStep.txt @@ -2,7 +2,7 @@ target C main reactor GetMicroStep { - state s: int(1) + state s: int(1) logical action l diff --git a/test/known-good/C/src/Hello.txt b/test/known-good/C/src/Hello.txt index 5e80c7d02..d4a1b3b38 100644 --- a/test/known-good/C/src/Hello.txt +++ b/test/known-good/C/src/Hello.txt @@ -9,8 +9,8 @@ } reactor Reschedule(period: time(2 sec), message: string("Hello C")) { - state count: int(0) - state previous_time: time(0) + state count: int(0) + state previous_time: time(0) timer t(1 sec, period) logical action a diff --git a/test/known-good/C/src/HelloWorld.txt b/test/known-good/C/src/HelloWorld.txt index d0fb5cf13..38fa34632 100644 --- a/test/known-good/C/src/HelloWorld.txt +++ b/test/known-good/C/src/HelloWorld.txt @@ -7,7 +7,7 @@ } reactor HelloWorld2 { - state success: bool(false) + state success: bool(false) reaction(startup) {= printf("Hello World.\n"); diff --git a/test/known-good/C/src/Hierarchy.txt b/test/known-good/C/src/Hierarchy.txt index 6e1156088..5cff37b41 100644 --- a/test/known-good/C/src/Hierarchy.txt +++ b/test/known-good/C/src/Hierarchy.txt @@ -2,15 +2,15 @@ target C reactor Source { - output out: int + output out: int timer t reaction(t) -> out {= lf_set(out, 1); =} } reactor Gain { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= printf("Gain received %d.\n", in->value); @@ -19,7 +19,7 @@ } reactor Print { - input in: int + input in: int reaction(in) {= printf("Received: %d.\n", in->value); @@ -31,9 +31,9 @@ } reactor GainContainer { - input in: int - output out: int - output out2: int + input in: int + output out: int + output out2: int gain = new Gain() in -> gain.in gain.out -> out diff --git a/test/known-good/C/src/Hierarchy2.txt b/test/known-good/C/src/Hierarchy2.txt index 75f145645..84207ae84 100644 --- a/test/known-good/C/src/Hierarchy2.txt +++ b/test/known-good/C/src/Hierarchy2.txt @@ -5,16 +5,16 @@ } reactor Source { - output out: int + output out: int timer t(0, 1 sec) reaction(t) -> out {= lf_set(out, 1); =} } reactor Count { - output out: int + output out: int timer t(0, 1 sec) - state i: int(0) + state i: int(0) reaction(t) -> out {= (self->i)++; @@ -23,9 +23,9 @@ } reactor Add { - input in1: int - input in2: int - output out: int + input in1: int + input in2: int + output out: int reaction(in1, in2) -> out {= int result = 0; @@ -36,8 +36,8 @@ } reactor Print { - input in: int - state expected: int(2) + input in: int + state expected: int(2) reaction(in) {= printf("Received: %d.\n", in->value); @@ -50,8 +50,8 @@ } reactor AddCount { - input in: int - output out: int + input in: int + output out: int count = new Count() add = new Add() in -> add.in1 diff --git a/test/known-good/C/src/IdentifierLength.txt b/test/known-good/C/src/IdentifierLength.txt index c4186e605..b4402f454 100644 --- a/test/known-good/C/src/IdentifierLength.txt +++ b/test/known-good/C/src/IdentifierLength.txt @@ -6,9 +6,9 @@ } reactor A_Really_Long_Name_For_A_Source(period: time(2 sec)) { - output y: int + output y: int timer t(1 sec, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= (self->count)++; @@ -17,8 +17,8 @@ } reactor Another_Really_Long_Name_For_A_Test_Class { - input x: int - state count: int(0) + input x: int + state count: int(0) reaction(x) {= (self->count)++; diff --git a/test/known-good/C/src/ImportComposition.txt b/test/known-good/C/src/ImportComposition.txt index 6a9978dc0..b54440a4f 100644 --- a/test/known-good/C/src/ImportComposition.txt +++ b/test/known-good/C/src/ImportComposition.txt @@ -6,7 +6,7 @@ main reactor ImportComposition { a = new ImportedComposition() - state received: bool(false) + state received: bool(false) reaction(startup) -> a.x {= lf_set(a.x, 42); =} diff --git a/test/known-good/C/src/InheritanceAction.txt b/test/known-good/C/src/InheritanceAction.txt index 4f9ce7571..6c4c362c5 100644 --- a/test/known-good/C/src/InheritanceAction.txt +++ b/test/known-good/C/src/InheritanceAction.txt @@ -5,8 +5,8 @@ } reactor Source { - logical action foo: int - output y: int + logical action foo: int + output y: int reaction(foo) -> y {= lf_set(y, foo->value); =} } @@ -16,8 +16,8 @@ } reactor Test { - input x: int - state count: int(0) + input x: int + state count: int(0) reaction(x) {= (self->count)++; diff --git a/test/known-good/C/src/ManualDelayedReaction.txt b/test/known-good/C/src/ManualDelayedReaction.txt index 80eb2bcb4..70bdcd6d1 100644 --- a/test/known-good/C/src/ManualDelayedReaction.txt +++ b/test/known-good/C/src/ManualDelayedReaction.txt @@ -7,9 +7,9 @@ // That's the stuff that shall be generated for the after reactor GeneratedDelay { - input y_in: int - output y_out: int - state y_state: int(0) + input y_in: int + output y_out: int + state y_state: int(0) physical action act(0 msec) // TODO: delay in act or the schedule call? @@ -22,7 +22,7 @@ } reactor Source { - output out: int + output out: int timer t // reaction(t) -> out after 100 msec @@ -30,7 +30,7 @@ } reactor Sink { - input in: int + input in: int reaction(in) {= interval_t elapsed_logical = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/Methods.txt b/test/known-good/C/src/Methods.txt index 681bb143d..4178035af 100644 --- a/test/known-good/C/src/Methods.txt +++ b/test/known-good/C/src/Methods.txt @@ -1,7 +1,7 @@ target C main reactor { - state foo: int(2) + state foo: int(2) method getFoo(): int {= return self->foo; =} diff --git a/test/known-good/C/src/MethodsRecursive.txt b/test/known-good/C/src/MethodsRecursive.txt index 4c28e9263..86df0f207 100644 --- a/test/known-good/C/src/MethodsRecursive.txt +++ b/test/known-good/C/src/MethodsRecursive.txt @@ -2,7 +2,7 @@ target C main reactor { - state foo: int(2) + state foo: int(2) method fib(n: int): int {= // Return the n-th Fibonacci number. if (n <= 1) return 1; diff --git a/test/known-good/C/src/MethodsSameName.txt b/test/known-good/C/src/MethodsSameName.txt index 12fcce2ac..5b1c4cb9c 100644 --- a/test/known-good/C/src/MethodsSameName.txt +++ b/test/known-good/C/src/MethodsSameName.txt @@ -2,7 +2,7 @@ target C reactor Foo { - state foo: int(2) + state foo: int(2) method add(x: int) {= self->foo += x; =} @@ -16,7 +16,7 @@ } main reactor { - state foo: int(2) + state foo: int(2) a = new Foo() diff --git a/test/known-good/C/src/Microsteps.txt b/test/known-good/C/src/Microsteps.txt index cd74fb8c5..1f9581650 100644 --- a/test/known-good/C/src/Microsteps.txt +++ b/test/known-good/C/src/Microsteps.txt @@ -1,8 +1,8 @@ target C reactor Destination { - input x: int - input y: int + input x: int + input y: int reaction(x, y) {= interval_t elapsed = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/MovingAverage.txt b/test/known-good/C/src/MovingAverage.txt index 15fedede0..63632e8da 100644 --- a/test/known-good/C/src/MovingAverage.txt +++ b/test/known-good/C/src/MovingAverage.txt @@ -9,8 +9,8 @@ import TestDouble from "lib/Test.lf" reactor MASource { - output out: double - state count: int(0) + output out: double + state count: int(0) timer clock(0, 200 msec) reaction(clock) -> out {= @@ -20,10 +20,10 @@ } reactor MovingAverageImpl { - state delay_line: double[](0.0, 0.0, 0.0) - state index: int(0) - input in: double - output out: double + state delay_line: double[](0.0, 0.0, 0.0) + state index: int(0) + input in: double + output out: double reaction(in) -> out {= // Calculate the output. diff --git a/test/known-good/C/src/MultipleContained.txt b/test/known-good/C/src/MultipleContained.txt index ac9488512..d0d0e8212 100644 --- a/test/known-good/C/src/MultipleContained.txt +++ b/test/known-good/C/src/MultipleContained.txt @@ -3,10 +3,10 @@ target C reactor Contained { - output trigger: int - input in1: int - input in2: int - state count: int(0) + output trigger: int + input in1: int + input in2: int + state count: int(0) reaction(startup) -> trigger {= lf_set(trigger, 42); =} diff --git a/test/known-good/C/src/MultipleOutputs.txt b/test/known-good/C/src/MultipleOutputs.txt index 231c1eb03..aff3695a5 100644 --- a/test/known-good/C/src/MultipleOutputs.txt +++ b/test/known-good/C/src/MultipleOutputs.txt @@ -8,8 +8,8 @@ } reactor C { - output x: int - output z: int + output x: int + output z: int timer t(0, 100 msec) reaction(t) -> x, z {= @@ -20,7 +20,7 @@ main reactor { c = new C() - state triggered: bool(true) + state triggered: bool(true) reaction(c.z) {= lf_print("c.z = %d", c.z->value); diff --git a/test/known-good/C/src/NativeListsAndTimes.txt b/test/known-good/C/src/NativeListsAndTimes.txt index 8e6037c4d..80d4b05df 100644 --- a/test/known-good/C/src/NativeListsAndTimes.txt +++ b/test/known-good/C/src/NativeListsAndTimes.txt @@ -9,10 +9,10 @@ q: interval_t[](1 msec, 2 msec, 3 msec), // list of time values g: time[](1 msec, 2 msec) // List of time values ) { - state s: time(y) // Reference to explicitly typed time parameter - state t: time(z) // Reference to implicitly typed time parameter - state v: bool // Uninitialized boolean state variable - state w: time // Uninitialized time state variable + state s: time(y) // Reference to explicitly typed time parameter + state t: time(z) // Reference to implicitly typed time parameter + state v: bool // Uninitialized boolean state variable + state w: time // Uninitialized time state variable timer tick(0) // Units missing but not required timer tock(1 sec) // Implicit type time timer toe(z) // Implicit type time diff --git a/test/known-good/C/src/NestedTriggeredReactions.txt b/test/known-good/C/src/NestedTriggeredReactions.txt index 2bb473e9b..93d8a0bed 100644 --- a/test/known-good/C/src/NestedTriggeredReactions.txt +++ b/test/known-good/C/src/NestedTriggeredReactions.txt @@ -1,9 +1,9 @@ target C reactor Container { - input in: bool + input in: bool - state triggered: bool(false) + state triggered: bool(false) contained = new Contained() @@ -19,9 +19,9 @@ } reactor Contained { - input in: bool + input in: bool - state triggered: bool(false) + state triggered: bool(false) reaction(in) {= self->triggered = true; =} diff --git a/test/known-good/C/src/PhysicalConnection.txt b/test/known-good/C/src/PhysicalConnection.txt index 98e445f0c..2c8a563bc 100644 --- a/test/known-good/C/src/PhysicalConnection.txt +++ b/test/known-good/C/src/PhysicalConnection.txt @@ -2,13 +2,13 @@ target C reactor Source { - output out: int + output out: int reaction(startup) -> out {= lf_set(out, 42); =} } reactor Destination { - input in: int + input in: int reaction(in) {= interval_t time = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/PingPong.txt b/test/known-good/C/src/PingPong.txt index 0dfdabda0..355019495 100644 --- a/test/known-good/C/src/PingPong.txt +++ b/test/known-good/C/src/PingPong.txt @@ -26,9 +26,9 @@ } reactor Ping(count: int(10)) { - input receive: int - output send: int - state pingsLeft: int(count) + input receive: int + output send: int + state pingsLeft: int(count) logical action serve reaction(startup, serve) -> send {= lf_set(send, self->pingsLeft--); =} @@ -43,9 +43,9 @@ } reactor Pong(expected: int(10)) { - input receive: int - output send: int - state count: int(0) + input receive: int + output send: int + state count: int(0) reaction(receive) -> send {= self->count++; diff --git a/test/known-good/C/src/ReadOutputOfContainedReactor.txt b/test/known-good/C/src/ReadOutputOfContainedReactor.txt index d08642c20..d52a63a80 100644 --- a/test/known-good/C/src/ReadOutputOfContainedReactor.txt +++ b/test/known-good/C/src/ReadOutputOfContainedReactor.txt @@ -3,14 +3,14 @@ target C reactor Contained { - output out: int + output out: int reaction(startup) -> out {= lf_set(out, 42); =} } main reactor ReadOutputOfContainedReactor { c = new Contained() - state count: int(0) + state count: int(0) reaction(startup) c.out {= printf("Startup reaction reading output of contained reactor: %d.\n", c.out->value); diff --git a/test/known-good/C/src/RepeatedInheritance.txt b/test/known-good/C/src/RepeatedInheritance.txt index 73b1b7eed..58f537b24 100644 --- a/test/known-good/C/src/RepeatedInheritance.txt +++ b/test/known-good/C/src/RepeatedInheritance.txt @@ -12,20 +12,20 @@ import TestCount from "lib/TestCount.lf" reactor D { - input d: int + input d: int } reactor C extends D { - input c: int + input c: int } reactor B extends D { - input b: int + input b: int } reactor A extends B, C { - input a: int - output out: int + input a: int + output out: int reaction(a, b, c, d) -> out {= lf_set(out, a->value + b->value + c->value + d->value); diff --git a/test/known-good/C/src/Schedule.txt b/test/known-good/C/src/Schedule.txt index 1fa71b5f5..107486fd4 100644 --- a/test/known-good/C/src/Schedule.txt +++ b/test/known-good/C/src/Schedule.txt @@ -2,7 +2,7 @@ target C reactor Schedule2 { - input x: int + input x: int logical action a reaction(x) -> a {= lf_schedule(a, MSEC(200)); =} diff --git a/test/known-good/C/src/ScheduleLogicalAction.txt b/test/known-good/C/src/ScheduleLogicalAction.txt index 630949235..c6ef7491c 100644 --- a/test/known-good/C/src/ScheduleLogicalAction.txt +++ b/test/known-good/C/src/ScheduleLogicalAction.txt @@ -6,9 +6,9 @@ } reactor foo { - input x: int - output y: int - logical action a: int* + input x: int + output y: int + logical action a: int* reaction(x) -> y, a {= lf_set(y, 2*x->value); @@ -20,8 +20,8 @@ } reactor print { - state expected_time: time(0) - input x: int + state expected_time: time(0) + input x: int reaction(x) {= interval_t elapsed_time = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/ScheduleValue.txt b/test/known-good/C/src/ScheduleValue.txt index 908fb00cf..cb84db1c4 100644 --- a/test/known-good/C/src/ScheduleValue.txt +++ b/test/known-good/C/src/ScheduleValue.txt @@ -4,7 +4,7 @@ } main reactor ScheduleValue { - logical action a: char* + logical action a: char* reaction(startup) -> a {= char* value = (char*)malloc(6); diff --git a/test/known-good/C/src/SelfLoop.txt b/test/known-good/C/src/SelfLoop.txt index 4297b1ae4..f50157f03 100644 --- a/test/known-good/C/src/SelfLoop.txt +++ b/test/known-good/C/src/SelfLoop.txt @@ -4,10 +4,10 @@ } reactor Self { - input x: int - output y: int - logical action a: int - state expected: int(43) + input x: int + output y: int + logical action a: int + state expected: int(43) reaction(a) -> y {= printf("a = %d\n", a->value); diff --git a/test/known-good/C/src/SendingInside.txt b/test/known-good/C/src/SendingInside.txt index 7b58dee7c..b7938b598 100644 --- a/test/known-good/C/src/SendingInside.txt +++ b/test/known-good/C/src/SendingInside.txt @@ -6,8 +6,8 @@ } reactor Printer { - input x: int - state count: int(1) + input x: int + state count: int(1) reaction(x) {= printf("Inside reactor received: %d\n", x->value); @@ -20,7 +20,7 @@ } main reactor SendingInside { - state count: int(0) + state count: int(0) timer t(0, 1 sec) p = new Printer() diff --git a/test/known-good/C/src/SendingInside2.txt b/test/known-good/C/src/SendingInside2.txt index ab715d141..b018902c0 100644 --- a/test/known-good/C/src/SendingInside2.txt +++ b/test/known-good/C/src/SendingInside2.txt @@ -1,7 +1,7 @@ target C reactor Printer { - input x: int + input x: int reaction(x) {= printf("Inside reactor received: %d\n", x->value); diff --git a/test/known-good/C/src/SendsPointerTest.txt b/test/known-good/C/src/SendsPointerTest.txt index eef358821..e23e4848f 100644 --- a/test/known-good/C/src/SendsPointerTest.txt +++ b/test/known-good/C/src/SendsPointerTest.txt @@ -5,7 +5,7 @@ preamble {= typedef int* int_pointer; =} reactor SendsPointer { - output out: int_pointer + output out: int_pointer reaction(startup) -> out {= static int my_constant = 42; @@ -14,7 +14,7 @@ } reactor Print(expected: int(42)) { // expected parameter is for testing. - input in: int_pointer + input in: int_pointer reaction(in) {= printf("Received: %d\n", *in->value); diff --git a/test/known-good/C/src/SetArray.txt b/test/known-good/C/src/SetArray.txt index 85c751e72..ec76d5fd2 100644 --- a/test/known-good/C/src/SetArray.txt +++ b/test/known-good/C/src/SetArray.txt @@ -3,7 +3,7 @@ target C reactor Source { - output out: int[] + output out: int[] reaction(startup) -> out {= // Dynamically allocate an output array of length 3. @@ -18,7 +18,7 @@ } reactor Print(scale: int(1)) { // The scale parameter is just for testing. - input in: int[] + input in: int[] reaction(in) {= int count = 0; // For testing. diff --git a/test/known-good/C/src/SetToken.txt b/test/known-good/C/src/SetToken.txt index 4d642072a..38ef224cd 100644 --- a/test/known-good/C/src/SetToken.txt +++ b/test/known-good/C/src/SetToken.txt @@ -2,8 +2,8 @@ target C reactor Source { - output out: int* - logical action a: int + output out: int* + logical action a: int reaction(startup) -> a {= lf_schedule_int(a, MSEC(200), 42); =} @@ -11,7 +11,7 @@ } reactor Print(expected: int(42)) { // expected parameter is for testing. - input in: int* + input in: int* reaction(in) {= printf("Received %d\n", *(in->value)); diff --git a/test/known-good/C/src/SimpleDeadline.txt b/test/known-good/C/src/SimpleDeadline.txt index 685d7c668..b3193606b 100644 --- a/test/known-good/C/src/SimpleDeadline.txt +++ b/test/known-good/C/src/SimpleDeadline.txt @@ -4,8 +4,8 @@ target C reactor Deadline(threshold: time(100 msec)) { - input x: int - output deadlineViolation: bool + input x: int + output deadlineViolation: bool reaction(x) -> deadlineViolation {= printf("ERROR: Deadline violation was not detected!\n"); @@ -17,7 +17,7 @@ } reactor Print { - input in: bool + input in: bool reaction(in) {= if (in) { diff --git a/test/known-good/C/src/SlowingClock.txt b/test/known-good/C/src/SlowingClock.txt index b18ca75e1..7d3f86c32 100644 --- a/test/known-good/C/src/SlowingClock.txt +++ b/test/known-good/C/src/SlowingClock.txt @@ -11,8 +11,8 @@ main reactor SlowingClock { logical action a(100 msec) - state interval: time(100 msec) - state expected_time: time(100 msec) + state interval: time(100 msec) + state expected_time: time(100 msec) reaction(startup) -> a {= lf_schedule(a, 0); =} diff --git a/test/known-good/C/src/SlowingClockPhysical.txt b/test/known-good/C/src/SlowingClockPhysical.txt index a94c3465e..53d66a803 100644 --- a/test/known-good/C/src/SlowingClockPhysical.txt +++ b/test/known-good/C/src/SlowingClockPhysical.txt @@ -11,8 +11,8 @@ main reactor SlowingClockPhysical { physical action a(100 msec) - state interval: time(100 msec) - state expected_time: time(100 msec) + state interval: time(100 msec) + state expected_time: time(100 msec) reaction(startup) -> a {= self->expected_time = MSEC(100); diff --git a/test/known-good/C/src/StartupOutFromInside.txt b/test/known-good/C/src/StartupOutFromInside.txt index 61993f18f..683b9dbfb 100644 --- a/test/known-good/C/src/StartupOutFromInside.txt +++ b/test/known-good/C/src/StartupOutFromInside.txt @@ -1,7 +1,7 @@ target C reactor Bar { - output out: int + output out: int reaction(startup) -> out {= lf_set(out, 42); =} } diff --git a/test/known-good/C/src/Starvation.txt b/test/known-good/C/src/Starvation.txt index cee7bbc6d..fff28405c 100644 --- a/test/known-good/C/src/Starvation.txt +++ b/test/known-good/C/src/Starvation.txt @@ -8,8 +8,8 @@ reactor SuperDenseSender(number_of_iterations: int(10)) { logical action loop - output out: int - state iterator: int(0) + output out: int + state iterator: int(0) reaction(startup, loop) -> out {= if (self->iterator < self->number_of_iterations) { @@ -35,7 +35,7 @@ } reactor SuperDenseReceiver(number_of_iterations: int(10)) { - input in: int + input in: int reaction(in) {= tag_t current_tag = lf_tag(); diff --git a/test/known-good/C/src/Stop.txt b/test/known-good/C/src/Stop.txt index 5bdfb3c37..82a8965db 100644 --- a/test/known-good/C/src/Stop.txt +++ b/test/known-good/C/src/Stop.txt @@ -10,8 +10,8 @@ import Sender from "lib/LoopedActionSender.lf" reactor Consumer { - input in: int - state reaction_invoked_correctly: bool(false) + input in: int + state reaction_invoked_correctly: bool(false) reaction(in) {= tag_t current_tag = lf_tag(); diff --git a/test/known-good/C/src/StopZero.txt b/test/known-good/C/src/StopZero.txt index df6c1777d..13f09f568 100644 --- a/test/known-good/C/src/StopZero.txt +++ b/test/known-good/C/src/StopZero.txt @@ -7,8 +7,8 @@ target C reactor Sender { - output out: int - state reaction_invoked_correctly: bool(false) + output out: int + state reaction_invoked_correctly: bool(false) timer t(0, 1 usec) logical action act @@ -64,7 +64,7 @@ } reactor Receiver { - input in: int + input in: int reaction(in) {= printf("Received %d at (%lld, %u).\n", diff --git a/test/known-good/C/src/Stride.txt b/test/known-good/C/src/Stride.txt index 8803acd17..2b70ee0d1 100644 --- a/test/known-good/C/src/Stride.txt +++ b/test/known-good/C/src/Stride.txt @@ -6,8 +6,8 @@ } reactor Count(stride: int(1)) { - state count: int(1) - output y: int + state count: int(1) + output y: int timer t(0, 100 msec) reaction(t) -> y {= @@ -17,8 +17,8 @@ } reactor Display { - input x: int - state expected: int(1) // for testing. + input x: int + state expected: int(1) // for testing. reaction(x) {= printf("Received: %d.\n", x->value); diff --git a/test/known-good/C/src/StructAsState.txt b/test/known-good/C/src/StructAsState.txt index 00bdc6950..2b07595e9 100644 --- a/test/known-good/C/src/StructAsState.txt +++ b/test/known-good/C/src/StructAsState.txt @@ -10,7 +10,7 @@ } hello_t; =} // Notice that target code delimiters are no longer necessary. - state s: hello_t("Earth", 42) + state s: hello_t("Earth", 42) reaction(startup) {= printf("State s.name=\"%s\", value=%d.\n", self->s.name, self->s.value); diff --git a/test/known-good/C/src/StructAsType.txt b/test/known-good/C/src/StructAsType.txt index d11367eeb..c1779436e 100644 --- a/test/known-good/C/src/StructAsType.txt +++ b/test/known-good/C/src/StructAsType.txt @@ -8,7 +8,7 @@ =} reactor Source { - output out: hello_t + output out: hello_t reaction(startup) -> out {= // Create the struct on the stack and then copy @@ -24,7 +24,7 @@ } reactor Print(expected: int(42)) { // expected parameter is for testing. - input in: hello_t + input in: hello_t reaction(in) {= printf("Received: name = %s, value = %d\n", in->value.name, in->value.value); diff --git a/test/known-good/C/src/StructAsTypeDirect.txt b/test/known-good/C/src/StructAsTypeDirect.txt index 33326f47b..865612974 100644 --- a/test/known-good/C/src/StructAsTypeDirect.txt +++ b/test/known-good/C/src/StructAsTypeDirect.txt @@ -8,7 +8,7 @@ =} reactor Source { - output out: hello_t + output out: hello_t reaction(startup) -> out {= out->value.name = "Earth"; @@ -18,7 +18,7 @@ } reactor Print(expected: int(42)) { // expected parameter is for testing. - input in: hello_t + input in: hello_t reaction(in) {= printf("Received: name = %s, value = %d\n", in->value.name, in->value.value); diff --git a/test/known-good/C/src/StructParallel.txt b/test/known-good/C/src/StructParallel.txt index f9c59d1fb..4b42057c8 100644 --- a/test/known-good/C/src/StructParallel.txt +++ b/test/known-good/C/src/StructParallel.txt @@ -12,8 +12,8 @@ =} reactor Check(expected: int(42)) { - input in: hello_t* - state invoked: bool(false) + input in: hello_t* + state invoked: bool(false) reaction(in) {= printf("Received: name = %s, value = %d\n", in->value->name, in->value->value); @@ -35,9 +35,9 @@ reactor Print(scale: int(2)) { // Mutable keyword indicates that this reactor wants a writable copy of the // input. - mutable input in: hello_t* + mutable input in: hello_t* - output out: hello_t* + output out: hello_t* reaction(in) -> out {= in->value->value *= self->scale; diff --git a/test/known-good/C/src/StructPrint.txt b/test/known-good/C/src/StructPrint.txt index f84728074..ddde6a2f0 100644 --- a/test/known-good/C/src/StructPrint.txt +++ b/test/known-good/C/src/StructPrint.txt @@ -9,7 +9,7 @@ =} reactor Print { - output out: hello_t* + output out: hello_t* reaction(startup) -> out {= // Dynamically allocate an output struct. @@ -21,7 +21,7 @@ } reactor Check(expected: int(42)) { // expected parameter is for testing. - input in: hello_t* + input in: hello_t* reaction(in) {= printf("Received: name = %s, value = %d\n", in->value->name, in->value->value); diff --git a/test/known-good/C/src/StructScale.txt b/test/known-good/C/src/StructScale.txt index ea5327c29..e877fb386 100644 --- a/test/known-good/C/src/StructScale.txt +++ b/test/known-good/C/src/StructScale.txt @@ -11,7 +11,7 @@ =} reactor Source { - output out: hello_t* + output out: hello_t* reaction(startup) -> out {= // Dynamically allocate an output struct. @@ -23,8 +23,8 @@ } reactor TestInput(expected: int(42)) { // expected parameter is for testing. - input in: hello_t* - state invoked: bool(false) + input in: hello_t* + state invoked: bool(false) reaction(in) {= printf("Received: name = %s, value = %d\n", in->value->name, in->value->value); @@ -46,9 +46,9 @@ reactor Print(scale: int(2)) { // Mutable keyword indicates that this reactor wants a writable copy of the // input. - mutable input in: hello_t* + mutable input in: hello_t* - output out: hello_t* + output out: hello_t* reaction(in) -> out {= in->value->value *= self->scale; diff --git a/test/known-good/C/src/SubclassesAndStartup.txt b/test/known-good/C/src/SubclassesAndStartup.txt index 698c44f7b..916a8650a 100644 --- a/test/known-good/C/src/SubclassesAndStartup.txt +++ b/test/known-good/C/src/SubclassesAndStartup.txt @@ -1,7 +1,7 @@ target C reactor Super { - state count: int(0) + state count: int(0) reaction(startup) {= printf("%s(Super) started\n", self->name); diff --git a/test/known-good/C/src/TestForPreviousOutput.txt b/test/known-good/C/src/TestForPreviousOutput.txt index a901216ed..5b723bad0 100644 --- a/test/known-good/C/src/TestForPreviousOutput.txt +++ b/test/known-good/C/src/TestForPreviousOutput.txt @@ -3,7 +3,7 @@ target C reactor Source { - output out: int + output out: int reaction(startup) -> out {= // Set a seed for random number generation based on the current time. @@ -24,7 +24,7 @@ } reactor Sink { - input in: int + input in: int reaction(in) {= printf("Received %d.\n", in->value); diff --git a/test/known-good/C/src/TimeLimit.txt b/test/known-good/C/src/TimeLimit.txt index 23543685e..7db897e57 100644 --- a/test/known-good/C/src/TimeLimit.txt +++ b/test/known-good/C/src/TimeLimit.txt @@ -6,9 +6,9 @@ } reactor Clock(offset: time(0), period: time(1 sec)) { - output y: int + output y: int timer t(offset, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= (self->count)++; @@ -18,8 +18,8 @@ } reactor Destination { - input x: int - state s: int(1) + input x: int + state s: int(1) reaction(x) {= // printf("%d\n", x->value); diff --git a/test/known-good/C/src/TimeState.txt b/test/known-good/C/src/TimeState.txt index 8d2af818b..965cd9231 100644 --- a/test/known-good/C/src/TimeState.txt +++ b/test/known-good/C/src/TimeState.txt @@ -1,7 +1,7 @@ target C reactor Foo(bar: int(42)) { - state baz: time(500 msec) + state baz: time(500 msec) reaction(startup) {= printf("Baz: %lld\n", self->baz); =} } diff --git a/test/known-good/C/src/Timeout.txt b/test/known-good/C/src/Timeout.txt index 9d20b6a44..851281e11 100644 --- a/test/known-good/C/src/Timeout.txt +++ b/test/known-good/C/src/Timeout.txt @@ -10,8 +10,8 @@ import Sender from "lib/LoopedActionSender.lf" reactor Consumer { - input in: int - state success: bool(false) + input in: int + state success: bool(false) reaction(in) {= tag_t current_tag = lf_tag(); diff --git a/test/known-good/C/src/TimeoutZero.txt b/test/known-good/C/src/TimeoutZero.txt index e94b87944..5452db356 100644 --- a/test/known-good/C/src/TimeoutZero.txt +++ b/test/known-good/C/src/TimeoutZero.txt @@ -11,8 +11,8 @@ import Sender from "lib/LoopedActionSender.lf" reactor Consumer { - input in: int - state success: bool(false) + input in: int + state success: bool(false) reaction(in) {= tag_t current_tag = lf_tag(); diff --git a/test/known-good/C/src/ToReactionNested.txt b/test/known-good/C/src/ToReactionNested.txt index ac9625898..18fc7840f 100644 --- a/test/known-good/C/src/ToReactionNested.txt +++ b/test/known-good/C/src/ToReactionNested.txt @@ -6,14 +6,14 @@ import Count from "lib/Count.lf" reactor CountContainer { - output out: int + output out: int c1 = new Count() c1.out -> out } main reactor { - state count: int(1) - state received: bool(false) + state count: int(1) + state received: bool(false) s = new CountContainer() diff --git a/test/known-good/C/src/TriggerDownstreamOnlyIfPresent2.txt b/test/known-good/C/src/TriggerDownstreamOnlyIfPresent2.txt index 4d4c364c1..97116cba2 100644 --- a/test/known-good/C/src/TriggerDownstreamOnlyIfPresent2.txt +++ b/test/known-good/C/src/TriggerDownstreamOnlyIfPresent2.txt @@ -9,7 +9,7 @@ reactor Source { output[2] out: int - state count: int(0) + state count: int(0) timer t(0, 200 msec) reaction(t) -> out {= @@ -22,7 +22,7 @@ } reactor Destination { - input in: int + input in: int reaction(in) {= if (!in->is_present) { diff --git a/test/known-good/C/src/UnconnectedInput.txt b/test/known-good/C/src/UnconnectedInput.txt index 1505d18d1..fdd1b9366 100644 --- a/test/known-good/C/src/UnconnectedInput.txt +++ b/test/known-good/C/src/UnconnectedInput.txt @@ -5,17 +5,17 @@ } reactor Source { - output out: int + output out: int timer t(0, 1 sec) - state s: int(1) + state s: int(1) reaction(t) -> out {= lf_set(out, self->s++); =} } reactor Add { - input in1: int - input in2: int - output out: int + input in1: int + input in2: int + output out: int reaction(in1, in2) -> out {= int result = 0; @@ -26,8 +26,8 @@ } reactor Print { - input in: int - state expected: int(1) + input in: int + state expected: int(1) reaction(in) {= printf("Received: %d.\n", in->value); diff --git a/test/known-good/C/src/Wcet.txt b/test/known-good/C/src/Wcet.txt index 621f08f54..267427bf9 100644 --- a/test/known-good/C/src/Wcet.txt +++ b/test/known-good/C/src/Wcet.txt @@ -2,8 +2,8 @@ target C reactor Source { - output out1: int - output out2: int + output out1: int + output out2: int timer t reaction(t) -> out1, out2 {= @@ -13,9 +13,9 @@ } reactor Work { - input in1: int - input in2: int - output out: int + input in1: int + input in2: int + output out: int reaction(in1, in2) -> out {= int ret; @@ -29,7 +29,7 @@ } reactor Print { - input in: int + input in: int reaction(in) {= printf("Received: %d\n", in->value); =} } diff --git a/test/known-good/C/src/arduino/DigitalReadSerial.txt b/test/known-good/C/src/arduino/DigitalReadSerial.txt index 2579ec457..19ccc70e6 100644 --- a/test/known-good/C/src/arduino/DigitalReadSerial.txt +++ b/test/known-good/C/src/arduino/DigitalReadSerial.txt @@ -11,7 +11,7 @@ main reactor DigitalReadSerial { timer t1(0, 1 msec) - state pushButton: int(2) + state pushButton: int(2) reaction(startup) {= pinMode(self->pushButton, INPUT); =} diff --git a/test/known-good/C/src/arduino/Fade.txt b/test/known-good/C/src/arduino/Fade.txt index cdd49e297..18e092980 100644 --- a/test/known-good/C/src/arduino/Fade.txt +++ b/test/known-good/C/src/arduino/Fade.txt @@ -14,9 +14,9 @@ main reactor Fade { timer t1(0, 30 msec) - state led: int(9) - state brightness: int(9) - state fadeAmount: int(5) + state led: int(9) + state brightness: int(9) + state fadeAmount: int(5) reaction(startup) {= pinMode(self->led, OUTPUT); =} diff --git a/test/known-good/C/src/concurrent/AsyncCallback.txt b/test/known-good/C/src/concurrent/AsyncCallback.txt index 5173ec6cd..aa8dda5de 100644 --- a/test/known-good/C/src/concurrent/AsyncCallback.txt +++ b/test/known-good/C/src/concurrent/AsyncCallback.txt @@ -33,12 +33,12 @@ lf_thread_t threadId; =} timer t(0, 200 msec) - state thread_id: lf_thread_t(0) - state expected_time: time(100 msec) - state toggle: bool(false) + state thread_id: lf_thread_t(0) + state expected_time: time(100 msec) + state toggle: bool(false) physical action a(100 msec): int - state i: int(0) + state i: int(0) reaction(t) -> a {= // start new thread, provide callback diff --git a/test/known-good/C/src/concurrent/AsyncCallbackDrop.txt b/test/known-good/C/src/concurrent/AsyncCallbackDrop.txt index 347793f09..93f9669fa 100644 --- a/test/known-good/C/src/concurrent/AsyncCallbackDrop.txt +++ b/test/known-good/C/src/concurrent/AsyncCallbackDrop.txt @@ -28,12 +28,12 @@ lf_thread_t threadId; =} timer t(0, 200 msec) - state thread_id: lf_thread_t(0) - state expected_time: time(100 msec) - state toggle: bool(false) + state thread_id: lf_thread_t(0) + state expected_time: time(100 msec) + state toggle: bool(false) physical action a(100 msec, 100 msec, "drop"): int - state i: int(0) + state i: int(0) reaction(t) -> a {= // start new thread, provide callback diff --git a/test/known-good/C/src/concurrent/AsyncCallbackReplace.txt b/test/known-good/C/src/concurrent/AsyncCallbackReplace.txt index 6b22a05a4..b877c06bc 100644 --- a/test/known-good/C/src/concurrent/AsyncCallbackReplace.txt +++ b/test/known-good/C/src/concurrent/AsyncCallbackReplace.txt @@ -28,12 +28,12 @@ lf_thread_t threadId; =} timer t(0, 200 msec) - state thread_id: lf_thread_t(0) - state expected_time: time(100 msec) - state toggle: bool(false) + state thread_id: lf_thread_t(0) + state expected_time: time(100 msec) + state toggle: bool(false) physical action a(100 msec, 100 msec, "replace"): int - state i: int(0) + state i: int(0) reaction(t) -> a {= // start new thread, provide callback diff --git a/test/known-good/C/src/concurrent/CompositionThreaded.txt b/test/known-good/C/src/concurrent/CompositionThreaded.txt index b3f983950..5062ec0ca 100644 --- a/test/known-good/C/src/concurrent/CompositionThreaded.txt +++ b/test/known-good/C/src/concurrent/CompositionThreaded.txt @@ -6,9 +6,9 @@ } reactor Source(period: time(2 sec)) { - output y: int + output y: int timer t(1 sec, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= (self->count)++; @@ -17,8 +17,8 @@ } reactor Test { - input x: int - state count: int(0) + input x: int + state count: int(0) reaction(x) {= (self->count)++; diff --git a/test/known-good/C/src/concurrent/DeadlineHandledAboveThreaded.txt b/test/known-good/C/src/concurrent/DeadlineHandledAboveThreaded.txt index d5a80a099..d9832cde4 100644 --- a/test/known-good/C/src/concurrent/DeadlineHandledAboveThreaded.txt +++ b/test/known-good/C/src/concurrent/DeadlineHandledAboveThreaded.txt @@ -3,8 +3,8 @@ target C reactor Deadline(threshold: time(100 msec)) { - input x: int - output deadline_violation: bool + input x: int + output deadline_violation: bool reaction(x) -> deadline_violation {= printf("ERROR: Deadline violation was not detected!\n"); @@ -16,7 +16,7 @@ } main reactor { - state violation_detected: bool(false) + state violation_detected: bool(false) d = new Deadline(threshold = 10 msec) reaction(startup) -> d.x {= diff --git a/test/known-good/C/src/concurrent/DeadlineThreaded.txt b/test/known-good/C/src/concurrent/DeadlineThreaded.txt index e82e9497b..c2ab289df 100644 --- a/test/known-good/C/src/concurrent/DeadlineThreaded.txt +++ b/test/known-good/C/src/concurrent/DeadlineThreaded.txt @@ -6,9 +6,9 @@ } reactor Source(period: time(3000 msec)) { - output y: int + output y: int timer t(0, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= if (2 * (self->count / 2) != self->count) { @@ -23,8 +23,8 @@ } reactor Destination(timeout: time(1 sec)) { - input x: int - state count: int(0) + input x: int + state count: int(0) reaction(x) {= printf("Destination receives: %d\n", x->value); diff --git a/test/known-good/C/src/concurrent/DelayIntThreaded.txt b/test/known-good/C/src/concurrent/DelayIntThreaded.txt index 402a25815..32e9fd65a 100644 --- a/test/known-good/C/src/concurrent/DelayIntThreaded.txt +++ b/test/known-good/C/src/concurrent/DelayIntThreaded.txt @@ -2,9 +2,9 @@ target C reactor Delay(delay: time(100 msec)) { - input in: int - output out: int - logical action a: int + input in: int + output out: int + logical action a: int reaction(a) -> out {= lf_set(out, a->value); =} @@ -15,9 +15,9 @@ } reactor Test { - input in: int - state start_time: time(0) - state received_value: bool(false) + input in: int + state start_time: time(0) + state received_value: bool(false) reaction(startup) {= // Record the logical time at the start. diff --git a/test/known-good/C/src/concurrent/DeterminismThreaded.txt b/test/known-good/C/src/concurrent/DeterminismThreaded.txt index c65007f62..8dad00557 100644 --- a/test/known-good/C/src/concurrent/DeterminismThreaded.txt +++ b/test/known-good/C/src/concurrent/DeterminismThreaded.txt @@ -1,15 +1,15 @@ target C reactor Source { - output y: int + output y: int timer t reaction(t) -> y {= lf_set(y, 1); =} } reactor Destination { - input x: int - input y: int + input x: int + input y: int reaction(x, y) {= int sum = 0; @@ -28,8 +28,8 @@ } reactor Pass { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= lf_set(y, x->value); =} } diff --git a/test/known-good/C/src/concurrent/DoubleReactionThreaded.txt b/test/known-good/C/src/concurrent/DoubleReactionThreaded.txt index 44a22b4c6..5378c88fc 100644 --- a/test/known-good/C/src/concurrent/DoubleReactionThreaded.txt +++ b/test/known-good/C/src/concurrent/DoubleReactionThreaded.txt @@ -6,9 +6,9 @@ } reactor Clock(offset: time(0), period: time(1 sec)) { - output y: int + output y: int timer t(offset, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= (self->count)++; @@ -17,9 +17,9 @@ } reactor Destination { - input x: int - input w: int - state s: int(2) + input x: int + input w: int + state s: int(2) reaction(x, w) {= int sum = 0; diff --git a/test/known-good/C/src/concurrent/GainThreaded.txt b/test/known-good/C/src/concurrent/GainThreaded.txt index 590ac8c84..6aa427585 100644 --- a/test/known-good/C/src/concurrent/GainThreaded.txt +++ b/test/known-good/C/src/concurrent/GainThreaded.txt @@ -2,15 +2,15 @@ target C reactor Scale(scale: int(2)) { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= lf_set(y, x->value * self->scale); =} } reactor Test { - input x: int - state received_value: bool(false) + input x: int + state received_value: bool(false) reaction(x) {= printf("Received %d.\n", x->value); diff --git a/test/known-good/C/src/concurrent/HelloThreaded.txt b/test/known-good/C/src/concurrent/HelloThreaded.txt index a42ec0637..6ae98c0d3 100644 --- a/test/known-good/C/src/concurrent/HelloThreaded.txt +++ b/test/known-good/C/src/concurrent/HelloThreaded.txt @@ -9,8 +9,8 @@ } reactor Reschedule(period: time(2 sec), message: string("Hello C")) { - state count: int(0) - state previous_time: time(0) + state count: int(0) + state previous_time: time(0) timer t(1 sec, period) logical action a diff --git a/test/known-good/C/src/concurrent/PingPongThreaded.txt b/test/known-good/C/src/concurrent/PingPongThreaded.txt index 1c1dca0a7..9d50231b5 100644 --- a/test/known-good/C/src/concurrent/PingPongThreaded.txt +++ b/test/known-good/C/src/concurrent/PingPongThreaded.txt @@ -26,9 +26,9 @@ } reactor Ping(count: int(10)) { - input receive: int - output send: int - state pingsLeft: int(count) + input receive: int + output send: int + state pingsLeft: int(count) logical action serve reaction(startup, serve) -> send {= lf_set(send, self->pingsLeft--); =} @@ -43,9 +43,9 @@ } reactor Pong(expected: int(10)) { - input receive: int - output send: int - state count: int(0) + input receive: int + output send: int + state count: int(0) reaction(receive) -> send {= self->count++; diff --git a/test/known-good/C/src/concurrent/ScheduleAt.txt b/test/known-good/C/src/concurrent/ScheduleAt.txt index 7ad13865d..4e57f60e7 100644 --- a/test/known-good/C/src/concurrent/ScheduleAt.txt +++ b/test/known-good/C/src/concurrent/ScheduleAt.txt @@ -12,7 +12,7 @@ reactor Scheduler { logical action act // List of microsteps. Size = 16 - state microstep_delay_list: uint32_t[]( + state microstep_delay_list: uint32_t[]( 0, 1, 1, @@ -30,7 +30,7 @@ 4, 5 ) - state times: int[]( + state times: int[]( 0, 0, 0, @@ -49,8 +49,8 @@ 900 msec ) // Size = 9 - state action_hit_list_microstep: int[](1, 2, 0, 1, 0, 2, 3, 4, 5) - state action_hit_list_times: int[]( + state action_hit_list_microstep: int[](1, 2, 0, 1, 0, 2, 3, 4, 5) + state action_hit_list_times: int[]( 0, 0, 400 msec, @@ -62,7 +62,7 @@ 900 msec ) // Size = 9 - state action_hit_list_index: int(0) + state action_hit_list_index: int(0) reaction(startup) -> act {= for (int i=0; i < 16; i++) { diff --git a/test/known-good/C/src/concurrent/ScheduleTwice.txt b/test/known-good/C/src/concurrent/ScheduleTwice.txt index 8e156520f..8d1617650 100644 --- a/test/known-good/C/src/concurrent/ScheduleTwice.txt +++ b/test/known-good/C/src/concurrent/ScheduleTwice.txt @@ -1,8 +1,8 @@ target C main reactor ScheduleTwice { - logical action a: int - state rc_count: int(0) + logical action a: int + state rc_count: int(0) preamble {= #define VERBOSE =} diff --git a/test/known-good/C/src/concurrent/ScheduleTwiceThreaded.txt b/test/known-good/C/src/concurrent/ScheduleTwiceThreaded.txt index 4d5212de2..69381da88 100644 --- a/test/known-good/C/src/concurrent/ScheduleTwiceThreaded.txt +++ b/test/known-good/C/src/concurrent/ScheduleTwiceThreaded.txt @@ -1,8 +1,8 @@ target C main reactor { - logical action a: int - state rc_count: int(0) + logical action a: int + state rc_count: int(0) reaction(startup) -> a {= lf_schedule_int(a, MSEC(100), 42); diff --git a/test/known-good/C/src/concurrent/SendingInsideThreaded.txt b/test/known-good/C/src/concurrent/SendingInsideThreaded.txt index 8dd262468..71c857117 100644 --- a/test/known-good/C/src/concurrent/SendingInsideThreaded.txt +++ b/test/known-good/C/src/concurrent/SendingInsideThreaded.txt @@ -6,8 +6,8 @@ } reactor Printer { - input x: int - state count: int(1) + input x: int + state count: int(1) reaction(x) {= printf("Inside reactor received: %d\n", x->value); @@ -20,7 +20,7 @@ } main reactor SendingInsideThreaded { - state count: int(0) + state count: int(0) timer t(0, 1 sec) p = new Printer() diff --git a/test/known-good/C/src/concurrent/StarvationThreaded.txt b/test/known-good/C/src/concurrent/StarvationThreaded.txt index fe4fde094..519ad9f7c 100644 --- a/test/known-good/C/src/concurrent/StarvationThreaded.txt +++ b/test/known-good/C/src/concurrent/StarvationThreaded.txt @@ -9,8 +9,8 @@ reactor SuperDenseSender(number_of_iterations: int(10)) { logical action loop - output out: int - state iterator: int(0) + output out: int + state iterator: int(0) reaction(startup, loop) -> out {= if (self->iterator < self->number_of_iterations) { @@ -36,7 +36,7 @@ } reactor SuperDenseReceiver(number_of_iterations: int(10)) { - input in: int + input in: int reaction(in) {= tag_t current_tag = lf_tag(); diff --git a/test/known-good/C/src/concurrent/StopThreaded.txt b/test/known-good/C/src/concurrent/StopThreaded.txt index 24936381c..96f1fcf1b 100644 --- a/test/known-good/C/src/concurrent/StopThreaded.txt +++ b/test/known-good/C/src/concurrent/StopThreaded.txt @@ -12,8 +12,8 @@ import Sender from "../lib/LoopedActionSender.lf" reactor Consumer { - input in: int - state reaction_invoked_correctly: bool(false) + input in: int + state reaction_invoked_correctly: bool(false) reaction(in) {= tag_t current_tag = lf_tag(); diff --git a/test/known-good/C/src/concurrent/StopZeroThreaded.txt b/test/known-good/C/src/concurrent/StopZeroThreaded.txt index e079f383c..bd5f808f0 100644 --- a/test/known-good/C/src/concurrent/StopZeroThreaded.txt +++ b/test/known-good/C/src/concurrent/StopZeroThreaded.txt @@ -7,8 +7,8 @@ target C reactor Sender { - output out: int - state reaction_invoked_correctly: bool(false) + output out: int + state reaction_invoked_correctly: bool(false) timer t(0, 1 usec) logical action act @@ -64,7 +64,7 @@ } reactor Receiver { - input in: int + input in: int reaction(in) {= printf("Received %d at (%lld, %u).\n", diff --git a/test/known-good/C/src/concurrent/Threaded.txt b/test/known-good/C/src/concurrent/Threaded.txt index c799825ec..8bcac926f 100644 --- a/test/known-good/C/src/concurrent/Threaded.txt +++ b/test/known-good/C/src/concurrent/Threaded.txt @@ -15,8 +15,8 @@ reactor Source { timer t(0, 200 msec) - output out: int - state s: int(0) + output out: int + state s: int(0) reaction(t) -> out {= lf_set(out, self->s); @@ -25,8 +25,8 @@ } reactor TakeTime { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= // struct timespec sleep_time = {(time_t) 0, (long)200000000}; @@ -41,7 +41,7 @@ } reactor Destination(width: int(4)) { - state s: int(400000000) + state s: int(400000000) input[width] in: int reaction(in) {= diff --git a/test/known-good/C/src/concurrent/ThreadedMultiport.txt b/test/known-good/C/src/concurrent/ThreadedMultiport.txt index 21d24cbbf..d52423ff3 100644 --- a/test/known-good/C/src/concurrent/ThreadedMultiport.txt +++ b/test/known-good/C/src/concurrent/ThreadedMultiport.txt @@ -8,7 +8,7 @@ reactor Source(width: int(4)) { timer t(0, 200 msec) output[width] out: int - state s: int(0) + state s: int(0) reaction(t) -> out {= for(int i = 0; i < out_width; i++) { @@ -19,8 +19,8 @@ } reactor Computation(iterations: int(100000000)) { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= // struct timespec sleep_time = {(time_t) 0, (long)200000000}; @@ -35,7 +35,7 @@ } reactor Destination(width: int(4), iterations: int(100000000)) { - state s: int(0) + state s: int(0) input[width] in: int reaction(in) {= diff --git a/test/known-good/C/src/concurrent/ThreadedThreaded.txt b/test/known-good/C/src/concurrent/ThreadedThreaded.txt index 10f45c087..cb5152c92 100644 --- a/test/known-good/C/src/concurrent/ThreadedThreaded.txt +++ b/test/known-good/C/src/concurrent/ThreadedThreaded.txt @@ -14,8 +14,8 @@ reactor Source { timer t(0, 200 msec) - output out: int - state s: int(0) + output out: int + state s: int(0) reaction(t) -> out {= lf_set(out, self->s); @@ -24,8 +24,8 @@ } reactor TakeTime { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= // struct timespec sleep_time = {(time_t) 0, (long)200000000}; @@ -40,7 +40,7 @@ } reactor Destination(width: int(4)) { - state s: int(400000000) + state s: int(400000000) input[width] in: int reaction(in) {= diff --git a/test/known-good/C/src/concurrent/TimeLimitThreaded.txt b/test/known-good/C/src/concurrent/TimeLimitThreaded.txt index 483670ca3..636703a9b 100644 --- a/test/known-good/C/src/concurrent/TimeLimitThreaded.txt +++ b/test/known-good/C/src/concurrent/TimeLimitThreaded.txt @@ -5,9 +5,9 @@ } reactor Clock(offset: time(0), period: time(1 sec)) { - output y: int + output y: int timer t(offset, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= (self->count)++; @@ -17,8 +17,8 @@ } reactor Destination { - input x: int - state s: int(1) + input x: int + state s: int(1) reaction(x) {= // printf("%d\n", x->value); diff --git a/test/known-good/C/src/concurrent/TimeoutThreaded.txt b/test/known-good/C/src/concurrent/TimeoutThreaded.txt index e9933eee2..45d4999c7 100644 --- a/test/known-good/C/src/concurrent/TimeoutThreaded.txt +++ b/test/known-good/C/src/concurrent/TimeoutThreaded.txt @@ -11,8 +11,8 @@ import Sender from "../lib/LoopedActionSender.lf" reactor Consumer { - input in: int - state success: bool(false) + input in: int + state success: bool(false) reaction(in) {= tag_t current_tag = lf_tag(); diff --git a/test/known-good/C/src/concurrent/TimeoutZeroThreaded.txt b/test/known-good/C/src/concurrent/TimeoutZeroThreaded.txt index c15204724..3dd3bd43b 100644 --- a/test/known-good/C/src/concurrent/TimeoutZeroThreaded.txt +++ b/test/known-good/C/src/concurrent/TimeoutZeroThreaded.txt @@ -11,8 +11,8 @@ import Sender from "../lib/LoopedActionSender.lf" reactor Consumer { - input in: int - state success: bool(false) + input in: int + state success: bool(false) reaction(in) {= tag_t current_tag = lf_tag(); diff --git a/test/known-good/C/src/concurrent/Tracing.txt b/test/known-good/C/src/concurrent/Tracing.txt index acfdff7a9..da2e7b048 100644 --- a/test/known-good/C/src/concurrent/Tracing.txt +++ b/test/known-good/C/src/concurrent/Tracing.txt @@ -9,8 +9,8 @@ reactor Source { timer t(0, 200 msec) - output out: int - state s: int(0) + output out: int + state s: int(0) reaction(t) -> out {= lf_set(out, self->s); @@ -19,9 +19,9 @@ } reactor TakeTime(bank_index: int(0)) { - input in: int - output out: int - state event: char*("No ID") + input in: int + output out: int + state event: char*("No ID") reaction(startup) {= // Construct an id string for a user trace event. @@ -58,8 +58,8 @@ } reactor Destination(width: int(4)) { - state s: int(400000000) - state count: int(0) + state s: int(400000000) + state count: int(0) input[width] in: int reaction(startup) {= diff --git a/test/known-good/C/src/federated/BroadcastFeedback.txt b/test/known-good/C/src/federated/BroadcastFeedback.txt index bbc96dcf7..a58906bd3 100644 --- a/test/known-good/C/src/federated/BroadcastFeedback.txt +++ b/test/known-good/C/src/federated/BroadcastFeedback.txt @@ -7,9 +7,9 @@ } reactor SenderAndReceiver { - output out: int + output out: int input[2] in: int - state received: bool(false) + state received: bool(false) reaction(startup) -> out {= lf_set(out, 42); =} diff --git a/test/known-good/C/src/federated/BroadcastFeedbackWithHierarchy.txt b/test/known-good/C/src/federated/BroadcastFeedbackWithHierarchy.txt index 5a00b4291..56d318a18 100644 --- a/test/known-good/C/src/federated/BroadcastFeedbackWithHierarchy.txt +++ b/test/known-good/C/src/federated/BroadcastFeedbackWithHierarchy.txt @@ -6,9 +6,9 @@ } reactor SenderAndReceiver { - output out: int + output out: int input[2] in: int - state received: bool(false) + state received: bool(false) r = new Receiver() in -> r.in @@ -18,7 +18,7 @@ reactor Receiver { input[2] in: int - state received: bool(false) + state received: bool(false) reaction(in) {= if (in[0]->is_present && in[1]->is_present && in[0]->value == 42 && in[1]->value == 42) { diff --git a/test/known-good/C/src/federated/CycleDetection.txt b/test/known-good/C/src/federated/CycleDetection.txt index 8cfba0ce7..45ce47b9a 100644 --- a/test/known-good/C/src/federated/CycleDetection.txt +++ b/test/known-good/C/src/federated/CycleDetection.txt @@ -6,13 +6,13 @@ target C reactor CAReplica { - input local_update: int - input remote_update: int - input query: int + input local_update: int + input remote_update: int + input query: int - state balance: int(0) + state balance: int(0) - output response: int + output response: int reaction(local_update, remote_update) {= if (local_update->is_present) { @@ -27,8 +27,8 @@ } reactor UserInput { - input balance: int - output deposit: int + input balance: int + output deposit: int reaction(startup) -> deposit {= lf_set(deposit, 100); =} diff --git a/test/known-good/C/src/federated/DecentralizedP2PComm.txt b/test/known-good/C/src/federated/DecentralizedP2PComm.txt index 8191008a6..3222fe69e 100644 --- a/test/known-good/C/src/federated/DecentralizedP2PComm.txt +++ b/test/known-good/C/src/federated/DecentralizedP2PComm.txt @@ -10,11 +10,11 @@ expected_start: int(0), stp_offset_param: time(0) ) { - input in: int - output out: int + input in: int + output out: int timer t(0, 100 msec) - state count: int(start) - state expected: int(expected_start) + state count: int(start) + state expected: int(expected_start) reaction(t) -> out {= lf_set(out, self->count++); =} diff --git a/test/known-good/C/src/federated/DecentralizedP2PUnbalancedTimeout.txt b/test/known-good/C/src/federated/DecentralizedP2PUnbalancedTimeout.txt index 58b1b39ed..75baf29bd 100644 --- a/test/known-good/C/src/federated/DecentralizedP2PUnbalancedTimeout.txt +++ b/test/known-good/C/src/federated/DecentralizedP2PUnbalancedTimeout.txt @@ -12,9 +12,9 @@ } reactor Clock(offset: time(0), period: time(1 sec)) { - output y: int + output y: int timer t(offset, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= (self->count)++; @@ -28,8 +28,8 @@ } reactor Destination { - input x: int - state s: int(1) + input x: int + state s: int(1) reaction(x) {= lf_print("Received %d", x->value); diff --git a/test/known-good/C/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.txt b/test/known-good/C/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.txt index b6931b9c9..95969290e 100644 --- a/test/known-good/C/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.txt +++ b/test/known-good/C/src/federated/DecentralizedP2PUnbalancedTimeoutPhysical.txt @@ -13,9 +13,9 @@ } reactor Clock(offset: time(0), period: time(1 sec)) { - output y: int + output y: int timer t(offset, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= (self->count)++; @@ -29,8 +29,8 @@ } reactor Destination { - input x: int - state s: int(1) + input x: int + state s: int(1) reaction(x) {= // printf("%d\n", x->value); diff --git a/test/known-good/C/src/federated/DistributedBank.txt b/test/known-good/C/src/federated/DistributedBank.txt index 801968a99..fda456a8a 100644 --- a/test/known-good/C/src/federated/DistributedBank.txt +++ b/test/known-good/C/src/federated/DistributedBank.txt @@ -6,7 +6,7 @@ reactor Node { timer t(0, 100 msec) - state count: int(0) + state count: int(0) reaction(t) {= lf_print("Hello world %d.", self->count++); =} diff --git a/test/known-good/C/src/federated/DistributedBankToMultiport.txt b/test/known-good/C/src/federated/DistributedBankToMultiport.txt index a971f804c..e173fe84a 100644 --- a/test/known-good/C/src/federated/DistributedBankToMultiport.txt +++ b/test/known-good/C/src/federated/DistributedBankToMultiport.txt @@ -7,7 +7,7 @@ reactor Destination { input[2] in: int - state count: int(1) + state count: int(1) reaction(in) {= for (int i = 0; i < in_width; i++) { diff --git a/test/known-good/C/src/federated/DistributedCount.txt b/test/known-good/C/src/federated/DistributedCount.txt index b5a821562..494d55165 100644 --- a/test/known-good/C/src/federated/DistributedCount.txt +++ b/test/known-good/C/src/federated/DistributedCount.txt @@ -13,8 +13,8 @@ import Count from "../lib/Count.lf" reactor Print { - input in: int - state c: int(1) + input in: int + state c: int(1) reaction(in) {= interval_t elapsed_time = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/federated/DistributedCountDecentralized.txt b/test/known-good/C/src/federated/DistributedCountDecentralized.txt index 278628cf0..cc2fdc081 100644 --- a/test/known-good/C/src/federated/DistributedCountDecentralized.txt +++ b/test/known-good/C/src/federated/DistributedCountDecentralized.txt @@ -13,8 +13,8 @@ import Count from "../lib/Count.lf" reactor Print { - input in: int - state c: int(1) + input in: int + state c: int(1) reaction(in) {= interval_t elapsed_time = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/federated/DistributedCountDecentralizedLate.txt b/test/known-good/C/src/federated/DistributedCountDecentralizedLate.txt index d155e5ccb..e329e71b0 100644 --- a/test/known-good/C/src/federated/DistributedCountDecentralizedLate.txt +++ b/test/known-good/C/src/federated/DistributedCountDecentralizedLate.txt @@ -14,13 +14,13 @@ import Count from "../lib/Count.lf" reactor Print { - input in: int // STP () - state success: int(0) // STP(in, 30 msec); - state success_stp_violation: int(0) + input in: int // STP () + state success: int(0) // STP(in, 30 msec); + state success_stp_violation: int(0) // Force a timer to be invoke periodically to ensure logical time will // advance in the absence of incoming messages. timer t(0, 10 msec) - state c: int(0) + state c: int(0) reaction(in) {= tag_t current_tag = lf_tag(); diff --git a/test/known-good/C/src/federated/DistributedCountDecentralizedLateHierarchy.txt b/test/known-good/C/src/federated/DistributedCountDecentralizedLateHierarchy.txt index 546aca25f..8a8555c1e 100644 --- a/test/known-good/C/src/federated/DistributedCountDecentralizedLateHierarchy.txt +++ b/test/known-good/C/src/federated/DistributedCountDecentralizedLateHierarchy.txt @@ -16,13 +16,13 @@ import Count from "../lib/Count.lf" reactor ImportantActuator { - input in: int - state success: int(0) - state success_stp_violation: int(0) + input in: int + state success: int(0) + state success_stp_violation: int(0) // Force a timer to be invoke periodically timer t(0, 10 msec) // to ensure logical time will advance in the absence of incoming messages. - state c: int(0) + state c: int(0) reaction(in) {= tag_t current_tag = lf_tag(); @@ -61,7 +61,7 @@ } reactor Print { - input in: int + input in: int reaction(in) {= tag_t current_tag = lf_tag(); @@ -75,11 +75,11 @@ } reactor Receiver { - input in: int + input in: int // Force a timer to be invoke periodically timer t(0, 10 msec) // to ensure logical time will advance in the absence of incoming messages. - state c: int(0) + state c: int(0) p = new Print() a = new ImportantActuator() in -> p.in diff --git a/test/known-good/C/src/federated/DistributedCountPhysical.txt b/test/known-good/C/src/federated/DistributedCountPhysical.txt index c8c0e5fa4..d8c3a51ab 100644 --- a/test/known-good/C/src/federated/DistributedCountPhysical.txt +++ b/test/known-good/C/src/federated/DistributedCountPhysical.txt @@ -13,8 +13,8 @@ reactor Count { timer t(200 msec, 1 sec) - state s: int(0) - output out: int + state s: int(0) + output out: int reaction(t) -> out {= lf_set(out, self->s); @@ -23,8 +23,8 @@ } reactor Print { - input in: int - state c: int(0) + input in: int + state c: int(0) reaction(in) {= interval_t elapsed_time = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/federated/DistributedCountPhysicalAfterDelay.txt b/test/known-good/C/src/federated/DistributedCountPhysicalAfterDelay.txt index dd764554d..feb316f1a 100644 --- a/test/known-good/C/src/federated/DistributedCountPhysicalAfterDelay.txt +++ b/test/known-good/C/src/federated/DistributedCountPhysicalAfterDelay.txt @@ -11,8 +11,8 @@ import Count from "../lib/Count.lf" reactor Print { - input in: int - state c: int(1) + input in: int + state c: int(1) reaction(in) {= interval_t elapsed_time = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/federated/DistributedCountPhysicalDecentralized.txt b/test/known-good/C/src/federated/DistributedCountPhysicalDecentralized.txt index e3be619a8..bf17e0732 100644 --- a/test/known-good/C/src/federated/DistributedCountPhysicalDecentralized.txt +++ b/test/known-good/C/src/federated/DistributedCountPhysicalDecentralized.txt @@ -14,8 +14,8 @@ reactor Count { timer t(200 msec, 1 sec) - state s: int(0) - output out: int + state s: int(0) + output out: int reaction(t) -> out {= lf_set(out, self->s); @@ -24,8 +24,8 @@ } reactor Print { - input in: int - state c: int(0) + input in: int + state c: int(0) reaction(in) {= interval_t elapsed_time = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/federated/DistributedDoublePort.txt b/test/known-good/C/src/federated/DistributedDoublePort.txt index a8b0888b9..b2fd70f94 100644 --- a/test/known-good/C/src/federated/DistributedDoublePort.txt +++ b/test/known-good/C/src/federated/DistributedDoublePort.txt @@ -14,9 +14,9 @@ import Count from "../lib/Count.lf" reactor CountMicrostep { - state count: int(1) - output out: int - logical action act: int + state count: int(1) + output out: int + logical action act: int timer t(0, 1 sec) reaction(t) -> act {= lf_schedule_int(act, 0, self->count++); =} @@ -25,8 +25,8 @@ } reactor Print { - input in: int - input in2: int + input in: int + input in2: int reaction(in, in2) {= interval_t elapsed_time = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/federated/DistributedLogicalActionUpstreamLong.txt b/test/known-good/C/src/federated/DistributedLogicalActionUpstreamLong.txt index 47eac9329..1a806c446 100644 --- a/test/known-good/C/src/federated/DistributedLogicalActionUpstreamLong.txt +++ b/test/known-good/C/src/federated/DistributedLogicalActionUpstreamLong.txt @@ -10,9 +10,9 @@ import TestCount from "../lib/TestCount.lf" reactor WithLogicalAction { - output out: int - state thread_id: lf_thread_t(0) - state counter: int(1) + output out: int + state thread_id: lf_thread_t(0) + state counter: int(1) logical action act(0): int reaction(startup, act) -> act, out {= diff --git a/test/known-good/C/src/federated/DistributedLoopedAction.txt b/test/known-good/C/src/federated/DistributedLoopedAction.txt index 9fc296951..eb4bf7c94 100644 --- a/test/known-good/C/src/federated/DistributedLoopedAction.txt +++ b/test/known-good/C/src/federated/DistributedLoopedAction.txt @@ -11,10 +11,10 @@ import Sender from "../lib/LoopedActionSender.lf" reactor Receiver(take_a_break_after: int(10), break_interval: time(400 msec)) { - input in: int - state received_messages: int(0) - state total_received_messages: int(0) - state breaks: int(0) + input in: int + state received_messages: int(0) + state total_received_messages: int(0) + state breaks: int(0) timer t(0, 1 msec) // This will impact the performance // but forces the logical time to advance Comment this line for a more diff --git a/test/known-good/C/src/federated/DistributedLoopedActionDecentralized.txt b/test/known-good/C/src/federated/DistributedLoopedActionDecentralized.txt index d85ca0067..060bd4b81 100644 --- a/test/known-good/C/src/federated/DistributedLoopedActionDecentralized.txt +++ b/test/known-good/C/src/federated/DistributedLoopedActionDecentralized.txt @@ -21,10 +21,10 @@ import Sender from "../lib/LoopedActionSender.lf" reactor Receiver(take_a_break_after: int(10), break_interval: time(400 msec)) { - input in: int - state received_messages: int(0) - state total_received_messages: int(0) - state breaks: int(0) + input in: int + state received_messages: int(0) + state total_received_messages: int(0) + state breaks: int(0) reaction(in) {= tag_t current_tag = lf_tag(); @@ -81,8 +81,8 @@ break_interval: time(400 msec), stp_offset: time(0) ) { - input in: int - state last_time_updated_stp: time(0) + input in: int + state last_time_updated_stp: time(0) receiver = new Receiver(take_a_break_after = 10, break_interval = 400 msec) timer t(0, 1 msec) // Force advancement of logical time diff --git a/test/known-good/C/src/federated/DistributedLoopedPhysicalAction.txt b/test/known-good/C/src/federated/DistributedLoopedPhysicalAction.txt index ee5e89c1c..a45cea39f 100644 --- a/test/known-good/C/src/federated/DistributedLoopedPhysicalAction.txt +++ b/test/known-good/C/src/federated/DistributedLoopedPhysicalAction.txt @@ -17,9 +17,9 @@ } reactor Sender(take_a_break_after: int(10), break_interval: time(550 msec)) { - output out: int + output out: int physical action act - state sent_messages: int(0) + state sent_messages: int(0) reaction(startup, act) -> act, out {= // Send a message on out @@ -36,10 +36,10 @@ } reactor Receiver(take_a_break_after: int(10), break_interval: time(550 msec)) { - input in: int - state received_messages: int(0) - state total_received_messages: int(0) - state breaks: int(0) + input in: int + state received_messages: int(0) + state total_received_messages: int(0) + state breaks: int(0) timer t(0, 1 msec) // This will impact the performance // but forces the logical time to advance Comment this line for a more diff --git a/test/known-good/C/src/federated/DistributedMultiport.txt b/test/known-good/C/src/federated/DistributedMultiport.txt index 4627a3f76..06c746550 100644 --- a/test/known-good/C/src/federated/DistributedMultiport.txt +++ b/test/known-good/C/src/federated/DistributedMultiport.txt @@ -7,7 +7,7 @@ reactor Source { output[4] out: int timer t(0, 100 msec) - state count: int(0) + state count: int(0) reaction(t) -> out {= for (int i = 0; i < out_width; i++) { @@ -18,7 +18,7 @@ reactor Destination { input[4] in: int - state count: int(0) + state count: int(0) reaction(in) {= for (int i = 0; i < in_width; i++) { diff --git a/test/known-good/C/src/federated/DistributedMultiportToBank.txt b/test/known-good/C/src/federated/DistributedMultiportToBank.txt index 09ed55cb0..238133d94 100644 --- a/test/known-good/C/src/federated/DistributedMultiportToBank.txt +++ b/test/known-good/C/src/federated/DistributedMultiportToBank.txt @@ -6,7 +6,7 @@ reactor Source { output[2] out: int timer t(0, 100 msec) - state count: int(0) + state count: int(0) reaction(t) -> out {= for (int i = 0; i < out_width; i++) { @@ -17,8 +17,8 @@ } reactor Destination { - input in: int - state count: int(0) + input in: int + state count: int(0) reaction(in) {= lf_print("Received %d.", in->value); diff --git a/test/known-good/C/src/federated/DistributedMultiportToken.txt b/test/known-good/C/src/federated/DistributedMultiportToken.txt index ebed96eb7..bac767b2f 100644 --- a/test/known-good/C/src/federated/DistributedMultiportToken.txt +++ b/test/known-good/C/src/federated/DistributedMultiportToken.txt @@ -8,7 +8,7 @@ reactor Source { output[4] out: char* timer t(0, 200 msec) - state count: int(0) + state count: int(0) reaction(t) -> out {= for (int i = 0; i < out_width; i++) { diff --git a/test/known-good/C/src/federated/DistributedNetworkOrder.txt b/test/known-good/C/src/federated/DistributedNetworkOrder.txt index 8bb889ab6..daac31a0d 100644 --- a/test/known-good/C/src/federated/DistributedNetworkOrder.txt +++ b/test/known-good/C/src/federated/DistributedNetworkOrder.txt @@ -14,7 +14,7 @@ } reactor Sender { - output out: int + output out: int timer t(0, 1 msec) reaction(t) -> out {= @@ -31,8 +31,8 @@ } reactor Receiver { - input in: int - state success: int(0) + input in: int + state success: int(0) reaction(in) {= tag_t current_tag = lf_tag(); diff --git a/test/known-good/C/src/federated/DistributedPhysicalActionUpstream.txt b/test/known-good/C/src/federated/DistributedPhysicalActionUpstream.txt index c2210b5e6..d07534fbc 100644 --- a/test/known-good/C/src/federated/DistributedPhysicalActionUpstream.txt +++ b/test/known-good/C/src/federated/DistributedPhysicalActionUpstream.txt @@ -29,8 +29,8 @@ =} reactor WithPhysicalAction { - output out: int - state thread_id: lf_thread_t(0) + output out: int + state thread_id: lf_thread_t(0) physical action act(0): int reaction(startup) -> act {= diff --git a/test/known-good/C/src/federated/DistributedPhysicalActionUpstreamLong.txt b/test/known-good/C/src/federated/DistributedPhysicalActionUpstreamLong.txt index a380dadb5..2352a9ae5 100644 --- a/test/known-good/C/src/federated/DistributedPhysicalActionUpstreamLong.txt +++ b/test/known-good/C/src/federated/DistributedPhysicalActionUpstreamLong.txt @@ -29,8 +29,8 @@ =} reactor WithPhysicalAction { - output out: int - state thread_id: lf_thread_t(0) + output out: int + state thread_id: lf_thread_t(0) physical action act(0): int reaction(startup) -> act {= diff --git a/test/known-good/C/src/federated/DistributedStop.txt b/test/known-good/C/src/federated/DistributedStop.txt index befdb1d5f..594211457 100644 --- a/test/known-good/C/src/federated/DistributedStop.txt +++ b/test/known-good/C/src/federated/DistributedStop.txt @@ -7,10 +7,10 @@ target C reactor Sender { - output out: int + output out: int timer t(0, 1 usec) logical action act - state reaction_invoked_correctly: bool(false) + state reaction_invoked_correctly: bool(false) reaction(t, act) -> out, act {= lf_print("Sending 42 at (%lld, %u).", @@ -65,8 +65,8 @@ reactor Receiver( stp_offset: time(10 msec) // Used in the decentralized variant of the test ) { - input in: int - state reaction_invoked_correctly: bool(false) + input in: int + state reaction_invoked_correctly: bool(false) reaction(in) {= lf_print("Received %d at (%lld, %u).", diff --git a/test/known-good/C/src/federated/DistributedStopZero.txt b/test/known-good/C/src/federated/DistributedStopZero.txt index 90c8e1580..4ca5c58ba 100644 --- a/test/known-good/C/src/federated/DistributedStopZero.txt +++ b/test/known-good/C/src/federated/DistributedStopZero.txt @@ -7,7 +7,7 @@ target C reactor Sender { - output out: int + output out: int timer t(0, 1 usec) reaction(t) -> out {= @@ -42,7 +42,7 @@ } reactor Receiver { - input in: int + input in: int reaction(in) {= printf("Received %d at (%lld, %u).\n", diff --git a/test/known-good/C/src/federated/DistributedToken.txt b/test/known-good/C/src/federated/DistributedToken.txt index c976236ef..b4ccab542 100644 --- a/test/known-good/C/src/federated/DistributedToken.txt +++ b/test/known-good/C/src/federated/DistributedToken.txt @@ -29,8 +29,8 @@ reactor MessageGenerator(root: string("")) { // Output type char* instead of string is used for dynamically allocated // character arrays (as opposed to static constant strings). - output message: char* - state count: int(1) + output message: char* + state count: int(1) // Send first message after 1 sec so that the startup reactions do not // factor into the transport time measurement on the first message. timer t(1 sec, 1 sec) @@ -56,8 +56,8 @@ * @input message The message. */ reactor PrintMessage { - input message: char* - state count: int(0) + input message: char* + state count: int(0) reaction(message) {= printf("PrintMessage: At (elapsed) logical time %lld, receiver receives: %s\n", diff --git a/test/known-good/C/src/federated/FeedbackDelay.txt b/test/known-good/C/src/federated/FeedbackDelay.txt index 43ff63891..cb0518193 100644 --- a/test/known-good/C/src/federated/FeedbackDelay.txt +++ b/test/known-good/C/src/federated/FeedbackDelay.txt @@ -4,11 +4,11 @@ } reactor PhysicalPlant { - input control: double - output sensor: double + input control: double + output sensor: double timer t(0, 33 msec) - state last_sensor_time: time(0) - state previous_sensor_time: time(0) + state last_sensor_time: time(0) + state previous_sensor_time: time(0) reaction(t) -> sensor {= lf_set(sensor, 42); @@ -24,14 +24,14 @@ } reactor Controller { - input sensor: double - output control: double + input sensor: double + output control: double - state latest_control: double(0.0) - state first: bool(true) + state latest_control: double(0.0) + state first: bool(true) - output request_for_planning: double - input planning: double + output request_for_planning: double + input planning: double reaction(planning) {= self->latest_control = planning->value; =} @@ -45,8 +45,8 @@ } reactor Planner { - input request: double - output response: double + input request: double + output response: double reaction(request) -> response {= lf_sleep(MSEC(10)); diff --git a/test/known-good/C/src/federated/FeedbackDelaySimple.txt b/test/known-good/C/src/federated/FeedbackDelaySimple.txt index ac05930ac..84e553f61 100644 --- a/test/known-good/C/src/federated/FeedbackDelaySimple.txt +++ b/test/known-good/C/src/federated/FeedbackDelaySimple.txt @@ -3,10 +3,10 @@ } reactor Loop { - input in: int - output out: int + input in: int + output out: int timer t(0, 100 msec) - state count: int(1) + state count: int(1) reaction(in) {= lf_print("Received %d.", in->value); diff --git a/test/known-good/C/src/federated/HelloDistributed.txt b/test/known-good/C/src/federated/HelloDistributed.txt index 9297f5c1d..119a513f5 100644 --- a/test/known-good/C/src/federated/HelloDistributed.txt +++ b/test/known-good/C/src/federated/HelloDistributed.txt @@ -8,7 +8,7 @@ target C reactor Source { - output out: string + output out: string reaction(startup) -> out {= lf_print("Sending 'Hello World!' message from source federate."); @@ -18,8 +18,8 @@ } reactor Destination { - input in: string - state received: bool(false) + input in: string + state received: bool(false) reaction(startup) {= lf_print("Destination started."); =} diff --git a/test/known-good/C/src/federated/LoopDistributedCentralized.txt b/test/known-good/C/src/federated/LoopDistributedCentralized.txt index b1c89a554..c88e967d4 100644 --- a/test/known-good/C/src/federated/LoopDistributedCentralized.txt +++ b/test/known-good/C/src/federated/LoopDistributedCentralized.txt @@ -15,10 +15,10 @@ } reactor Looper(incr: int(1), delay: time(0 msec)) { - input in: int - output out: int + input in: int + output out: int physical action a(delay) - state count: int(0) + state count: int(0) timer t(0, 1 sec) diff --git a/test/known-good/C/src/federated/LoopDistributedCentralized2.txt b/test/known-good/C/src/federated/LoopDistributedCentralized2.txt index 780c75eb6..02b185f11 100644 --- a/test/known-good/C/src/federated/LoopDistributedCentralized2.txt +++ b/test/known-good/C/src/federated/LoopDistributedCentralized2.txt @@ -14,10 +14,10 @@ } reactor Looper(incr: int(1), delay: time(0 msec)) { - input in: int - output out: int + input in: int + output out: int physical action a(delay) - state count: int(0) + state count: int(0) timer t(0, 1 sec) @@ -42,10 +42,10 @@ } reactor Looper2(incr: int(1), delay: time(0 msec)) { - input in: int - output out: int + input in: int + output out: int physical action a(delay) - state count: int(0) + state count: int(0) timer t(0, 1 sec) diff --git a/test/known-good/C/src/federated/LoopDistributedCentralizedPhysicalAction.txt b/test/known-good/C/src/federated/LoopDistributedCentralizedPhysicalAction.txt index 7f66ddf88..c5ad736ed 100644 --- a/test/known-good/C/src/federated/LoopDistributedCentralizedPhysicalAction.txt +++ b/test/known-good/C/src/federated/LoopDistributedCentralizedPhysicalAction.txt @@ -28,10 +28,10 @@ =} reactor Looper(incr: int(1), delay: time(0 msec)) { - input in: int - output out: int + input in: int + output out: int physical action a(delay) - state count: int(0) + state count: int(0) reaction(startup) -> a {= // Start the thread that listens for Enter or Return. diff --git a/test/known-good/C/src/federated/LoopDistributedCentralizedPrecedence.txt b/test/known-good/C/src/federated/LoopDistributedCentralizedPrecedence.txt index 2f8a5ef94..4f464e890 100644 --- a/test/known-good/C/src/federated/LoopDistributedCentralizedPrecedence.txt +++ b/test/known-good/C/src/federated/LoopDistributedCentralizedPrecedence.txt @@ -15,10 +15,10 @@ } reactor Looper(incr: int(1), delay: time(0 msec)) { - input in: int - output out: int - state count: int(0) - state received_count: int(0) + input in: int + output out: int + state count: int(0) + state received_count: int(0) timer t(0, 1 sec) reaction(t) -> out {= diff --git a/test/known-good/C/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.txt b/test/known-good/C/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.txt index 3885e7a0f..80efe6016 100644 --- a/test/known-good/C/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.txt +++ b/test/known-good/C/src/federated/LoopDistributedCentralizedPrecedenceHierarchy.txt @@ -17,9 +17,9 @@ reactor Contained(incr: int(1)) { timer t(0, 1 sec) - input in: int - state count: int(0) - state received_count: int(0) + input in: int + state count: int(0) + state received_count: int(0) reaction(t) {= self->count += self->incr; =} @@ -33,9 +33,9 @@ } reactor Looper(incr: int(1), delay: time(0 msec)) { - input in: int - output out: int - state count: int(0) + input in: int + output out: int + state count: int(0) timer t(0, 1 sec) c = new Contained(incr = incr) diff --git a/test/known-good/C/src/federated/LoopDistributedDecentralized.txt b/test/known-good/C/src/federated/LoopDistributedDecentralized.txt index a724a3d22..94a15f2d4 100644 --- a/test/known-good/C/src/federated/LoopDistributedDecentralized.txt +++ b/test/known-good/C/src/federated/LoopDistributedDecentralized.txt @@ -24,10 +24,10 @@ =} reactor Looper(incr: int(1), delay: time(0 msec), stp_offset: time(0)) { - input in: int - output out: int + input in: int + output out: int physical action a(stp_offset) - state count: int(0) + state count: int(0) reaction(startup) -> a {= // Start the thread that listens for Enter or Return. diff --git a/test/known-good/C/src/federated/LoopDistributedDouble.txt b/test/known-good/C/src/federated/LoopDistributedDouble.txt index f5f51c2f1..29d238974 100644 --- a/test/known-good/C/src/federated/LoopDistributedDouble.txt +++ b/test/known-good/C/src/federated/LoopDistributedDouble.txt @@ -28,12 +28,12 @@ =} reactor Looper(incr: int(1), delay: time(0 msec)) { - input in: int - input in2: int - output out: int - output out2: int + input in: int + input in2: int + output out: int + output out2: int physical action a(delay) - state count: int(0) + state count: int(0) timer t(0, 1 sec) reaction(startup) -> a {= diff --git a/test/known-good/C/src/federated/PhysicalSTP.txt b/test/known-good/C/src/federated/PhysicalSTP.txt index 0f588783f..e0777392a 100644 --- a/test/known-good/C/src/federated/PhysicalSTP.txt +++ b/test/known-good/C/src/federated/PhysicalSTP.txt @@ -10,8 +10,8 @@ import Count from "../lib/Count.lf" reactor Print(STP_offset_param: time(0)) { - input in: int - state c: int(1) + input in: int + state c: int(1) reaction(in) {= interval_t elapsed_time = lf_time_logical_elapsed(); diff --git a/test/known-good/C/src/federated/PingPongDistributedPhysical.txt b/test/known-good/C/src/federated/PingPongDistributedPhysical.txt index 3456f4083..f038abb0b 100644 --- a/test/known-good/C/src/federated/PingPongDistributedPhysical.txt +++ b/test/known-good/C/src/federated/PingPongDistributedPhysical.txt @@ -27,9 +27,9 @@ target C reactor Ping(count: int(10)) { - input receive: int - output send: int - state pingsLeft: int(count) + input receive: int + output send: int + state pingsLeft: int(count) logical action serve reaction(startup, serve) -> send {= @@ -47,9 +47,9 @@ } reactor Pong(expected: int(10)) { - input receive: int - output send: int - state count: int(0) + input receive: int + output send: int + state count: int(0) reaction(receive) -> send {= self->count++; diff --git a/test/known-good/C/src/federated/SimpleFederated.txt b/test/known-good/C/src/federated/SimpleFederated.txt index b1a0373d2..d1f172414 100644 --- a/test/known-good/C/src/federated/SimpleFederated.txt +++ b/test/known-good/C/src/federated/SimpleFederated.txt @@ -4,8 +4,8 @@ } reactor Fed { - input in: int - output out: int + input in: int + output out: int } federated reactor { diff --git a/test/known-good/C/src/federated/StopAtShutdown.txt b/test/known-good/C/src/federated/StopAtShutdown.txt index 0b3e8907f..06b5714d3 100644 --- a/test/known-good/C/src/federated/StopAtShutdown.txt +++ b/test/known-good/C/src/federated/StopAtShutdown.txt @@ -10,7 +10,7 @@ } reactor A { - input in: int + input in: int reaction(startup) {= lf_print("Hello World!"); =} @@ -20,7 +20,7 @@ } reactor B { - output out: int + output out: int timer t(1 sec) reaction(t) -> out {= lf_set(out, 1); =} diff --git a/test/known-good/C/src/federated/TopLevelArtifacts.txt b/test/known-good/C/src/federated/TopLevelArtifacts.txt index 5f1a875c8..231f8ce36 100644 --- a/test/known-good/C/src/federated/TopLevelArtifacts.txt +++ b/test/known-good/C/src/federated/TopLevelArtifacts.txt @@ -15,7 +15,7 @@ import TestCount from "../lib/TestCount.lf" federated reactor { - state successes: int(0) + state successes: int(0) timer t(0, 1 sec) logical action act(0) diff --git a/test/known-good/C/src/federated/failing/ClockSync.txt b/test/known-good/C/src/federated/failing/ClockSync.txt index 051cd653c..9b40358f9 100644 --- a/test/known-good/C/src/federated/failing/ClockSync.txt +++ b/test/known-good/C/src/federated/failing/ClockSync.txt @@ -30,7 +30,7 @@ /** Reactor that outputs periodically. */ reactor Ticker(period: time(1600 msec)) { - output out: int + output out: int timer tick(0, period) @@ -39,7 +39,7 @@ /** Print a message when an input arrives. */ reactor Printer { - input in: int + input in: int reaction(startup) {= interval_t offset = _lf_time_physical_clock_offset + _lf_time_test_physical_clock_offset; diff --git a/test/known-good/C/src/federated/failing/DistributedDoublePortLooped.txt b/test/known-good/C/src/federated/failing/DistributedDoublePortLooped.txt index 7a931fd7c..a6022bab6 100644 --- a/test/known-good/C/src/federated/failing/DistributedDoublePortLooped.txt +++ b/test/known-good/C/src/federated/failing/DistributedDoublePortLooped.txt @@ -13,18 +13,18 @@ reactor Foo { timer t(0, 700 usec) - output out: int + output out: int reaction(t) -> out {= lf_set(out, 0); =} } reactor Count { - state count: int(1) - input in1: int - input in2: int - input in3: int - output out1: int - output out2: int + state count: int(1) + input in1: int + input in2: int + input in3: int + output out1: int + output out2: int timer t(0, 1 msec) reaction(in1) -> out1 {= =} @@ -37,9 +37,9 @@ } reactor CountMicrostep { - state count: int(1) - output out: int - logical action act: int + state count: int(1) + output out: int + logical action act: int timer t(0, 1 msec) reaction(t) -> act {= lf_schedule_int(act, 0, self->count++); =} @@ -48,10 +48,10 @@ } reactor Print { - input in1: int - input in2: int - input in3: int - output out: int + input in1: int + input in2: int + input in3: int + output out: int timer t(0, 2 msec) reaction(in1, in2, in3, t) -> out {= diff --git a/test/known-good/C/src/federated/failing/DistributedDoublePortLooped2.txt b/test/known-good/C/src/federated/failing/DistributedDoublePortLooped2.txt index f50aa2170..7fcf52115 100644 --- a/test/known-good/C/src/federated/failing/DistributedDoublePortLooped2.txt +++ b/test/known-good/C/src/federated/failing/DistributedDoublePortLooped2.txt @@ -12,9 +12,9 @@ } reactor Count { - state count: int(1) - input in: int - output out: int + state count: int(1) + input in: int + output out: int timer t(0, 1 msec) reaction(t) -> out {= @@ -26,9 +26,9 @@ } reactor CountMicrostep { - state count: int(1) - output out: int - logical action act: int + state count: int(1) + output out: int + logical action act: int timer t(0, 1 msec) reaction(t) -> act {= lf_schedule_int(act, 0, self->count++); =} @@ -37,9 +37,9 @@ } reactor Print { - input in: int - input in2: int - output out: int + input in: int + input in2: int + output out: int timer t(0, 2 msec) reaction(in, in2) -> out {= diff --git a/test/known-good/C/src/federated/failing/DistributedNetworkOrderDecentralized.txt b/test/known-good/C/src/federated/failing/DistributedNetworkOrderDecentralized.txt index 92f9b924f..5f90fdcf5 100644 --- a/test/known-good/C/src/federated/failing/DistributedNetworkOrderDecentralized.txt +++ b/test/known-good/C/src/federated/failing/DistributedNetworkOrderDecentralized.txt @@ -13,7 +13,7 @@ } reactor Sender { - output out: int + output out: int timer t(0, 1 msec) reaction(t) {= @@ -30,8 +30,8 @@ } reactor Receiver { - input in: int - state success: int(0) + input in: int + state success: int(0) reaction(in) {= tag_t current_tag = lf_tag(); diff --git a/test/known-good/C/src/federated/failing/LoopDistributedDecentralizedPrecedence.txt b/test/known-good/C/src/federated/failing/LoopDistributedDecentralizedPrecedence.txt index 9dada9040..63908e4f4 100644 --- a/test/known-good/C/src/federated/failing/LoopDistributedDecentralizedPrecedence.txt +++ b/test/known-good/C/src/federated/failing/LoopDistributedDecentralizedPrecedence.txt @@ -12,10 +12,10 @@ } reactor Looper(incr: int(1), delay: time(0 msec), stp_offset: time(0)) { - input in: int - output out: int - state count: int(0) - state received_count: int(0) + input in: int + output out: int + state count: int(0) + state received_count: int(0) timer t(0, 1 sec) reaction(t) -> out {= diff --git a/test/known-good/C/src/federated/failing/LoopDistributedDecentralizedPrecedenceHierarchy.txt b/test/known-good/C/src/federated/failing/LoopDistributedDecentralizedPrecedenceHierarchy.txt index c7cf3e682..853be28b6 100644 --- a/test/known-good/C/src/federated/failing/LoopDistributedDecentralizedPrecedenceHierarchy.txt +++ b/test/known-good/C/src/federated/failing/LoopDistributedDecentralizedPrecedenceHierarchy.txt @@ -14,9 +14,9 @@ import Contained from "../LoopDistributedCentralizedPrecedenceHierarchy.lf"; reactor Looper(incr:int(1), delay:time(0 msec), stp_offset:time(0)) { - input in:int; - output out:int; - state count:int(0); + input in:int; + output out:int; + state count:int(0); timer t(0, 1 sec); c = new Contained(incr = incr); diff --git a/test/known-good/C/src/federated/failing/SimpleFederatedAuthenticated.txt b/test/known-good/C/src/federated/failing/SimpleFederatedAuthenticated.txt index 5260ef32e..e3aa22780 100644 --- a/test/known-good/C/src/federated/failing/SimpleFederatedAuthenticated.txt +++ b/test/known-good/C/src/federated/failing/SimpleFederatedAuthenticated.txt @@ -10,8 +10,8 @@ } reactor Fed { - input in: int - output out: int + input in: int + output out: int } federated reactor { diff --git a/test/known-good/C/src/lib/Count.txt b/test/known-good/C/src/lib/Count.txt index 51f056e41..3bdcca8d1 100644 --- a/test/known-good/C/src/lib/Count.txt +++ b/test/known-good/C/src/lib/Count.txt @@ -1,8 +1,8 @@ target C reactor Count(offset: time(0), period: time(1 sec)) { - state count: int(1) - output out: int + state count: int(1) + output out: int timer t(offset, period) reaction(t) -> out {= lf_set(out, self->count++); =} diff --git a/test/known-good/C/src/lib/Imported.txt b/test/known-good/C/src/lib/Imported.txt index fc23d3498..c5d18272a 100644 --- a/test/known-good/C/src/lib/Imported.txt +++ b/test/known-good/C/src/lib/Imported.txt @@ -5,7 +5,7 @@ import ImportedAgain from "./ImportedAgain.lf" reactor Imported { - input x: int + input x: int a = new ImportedAgain() reaction(x) -> a.x {= lf_set(a.x, x->value); =} diff --git a/test/known-good/C/src/lib/ImportedAgain.txt b/test/known-good/C/src/lib/ImportedAgain.txt index 1c69fabbe..e4732d606 100644 --- a/test/known-good/C/src/lib/ImportedAgain.txt +++ b/test/known-good/C/src/lib/ImportedAgain.txt @@ -3,7 +3,7 @@ target C reactor ImportedAgain { - input x: int + input x: int reaction(x) {= printf("Received: %d.\n", x->value); diff --git a/test/known-good/C/src/lib/ImportedComposition.txt b/test/known-good/C/src/lib/ImportedComposition.txt index d1dc4ea7d..8eaeb0793 100644 --- a/test/known-good/C/src/lib/ImportedComposition.txt +++ b/test/known-good/C/src/lib/ImportedComposition.txt @@ -3,15 +3,15 @@ target C reactor Gain { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= lf_set(y, x->value * 2); =} } reactor ImportedComposition { - input x: int - output y: int + input x: int + output y: int g1 = new Gain() g2 = new Gain() x -> g1.x after 10 msec diff --git a/test/known-good/C/src/lib/InternalDelay.txt b/test/known-good/C/src/lib/InternalDelay.txt index 285e5e743..a64940810 100644 --- a/test/known-good/C/src/lib/InternalDelay.txt +++ b/test/known-good/C/src/lib/InternalDelay.txt @@ -1,9 +1,9 @@ target C reactor InternalDelay(delay: int(10 msec)) { - input in: int - output out: int - logical action d: int + input in: int + output out: int + logical action d: int reaction(in) -> d {= lf_schedule_int(d, self->delay, in->value); =} diff --git a/test/known-good/C/src/lib/LoopedActionSender.txt b/test/known-good/C/src/lib/LoopedActionSender.txt index 49200db46..97d77973d 100644 --- a/test/known-good/C/src/lib/LoopedActionSender.txt +++ b/test/known-good/C/src/lib/LoopedActionSender.txt @@ -12,9 +12,9 @@ * after sending take_a_break_after messages. */ reactor Sender(take_a_break_after: int(10), break_interval: time(400 msec)) { - output out: int + output out: int logical action act - state sent_messages: int(0) + state sent_messages: int(0) reaction(startup, act) -> act, out {= // Send a message on out diff --git a/test/known-good/C/src/lib/PassThrough.txt b/test/known-good/C/src/lib/PassThrough.txt index 2c2450d9b..d9e333656 100644 --- a/test/known-good/C/src/lib/PassThrough.txt +++ b/test/known-good/C/src/lib/PassThrough.txt @@ -2,8 +2,8 @@ target C reactor PassThrough { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= lf_set(out, in->value); =} } diff --git a/test/known-good/C/src/lib/Test.txt b/test/known-good/C/src/lib/Test.txt index cfa50a0e2..5127be65d 100644 --- a/test/known-good/C/src/lib/Test.txt +++ b/test/known-good/C/src/lib/Test.txt @@ -1,8 +1,8 @@ target C reactor TestDouble(expected: double[](1.0, 1.0, 1.0, 1.0)) { - input in: double - state count: int(0) + input in: double + state count: int(0) reaction(in) {= printf("Received: %f\n", in->value); diff --git a/test/known-good/C/src/lib/TestCount.txt b/test/known-good/C/src/lib/TestCount.txt index cb16eaf71..d051f40dd 100644 --- a/test/known-good/C/src/lib/TestCount.txt +++ b/test/known-good/C/src/lib/TestCount.txt @@ -10,9 +10,9 @@ target C reactor TestCount(start: int(1), stride: int(1), num_inputs: int(1)) { - state count: int(start) - state inputs_received: int(0) - input in: int + state count: int(start) + state inputs_received: int(0) + input in: int reaction(in) {= lf_print("Received %d.", in->value); diff --git a/test/known-good/C/src/lib/TestCountMultiport.txt b/test/known-good/C/src/lib/TestCountMultiport.txt index 586868d59..3724f8fed 100644 --- a/test/known-good/C/src/lib/TestCountMultiport.txt +++ b/test/known-good/C/src/lib/TestCountMultiport.txt @@ -17,8 +17,8 @@ num_inputs: int(1), width: int(2) ) { - state count: int(start) - state inputs_received: int(0) + state count: int(start) + state inputs_received: int(0) input[width] in: int reaction(in) {= diff --git a/test/known-good/C/src/modal_models/BanksCount3ModesComplex.txt b/test/known-good/C/src/modal_models/BanksCount3ModesComplex.txt index ce2823ef8..4f22d1060 100644 --- a/test/known-good/C/src/modal_models/BanksCount3ModesComplex.txt +++ b/test/known-good/C/src/modal_models/BanksCount3ModesComplex.txt @@ -11,7 +11,7 @@ import CounterCycle from "Count3Modes.lf" reactor MetaCounter { - input next: bool + input next: bool output[2] always: int output[2] mode1: int output[2] mode2: int diff --git a/test/known-good/C/src/modal_models/ConvertCaseTest.txt b/test/known-good/C/src/modal_models/ConvertCaseTest.txt index d5980901e..f84e04c6b 100644 --- a/test/known-good/C/src/modal_models/ConvertCaseTest.txt +++ b/test/known-good/C/src/modal_models/ConvertCaseTest.txt @@ -7,9 +7,9 @@ import TraceTesting from "util/TraceTesting.lf" reactor ResetProcessor { - input discard: bool - input character: char - output converted: int + input discard: bool + input character: char + output converted: int initial mode Converting { converter = new Converter() @@ -26,9 +26,9 @@ } reactor HistoryProcessor { - input discard: bool - input character: char - output converted: int + input discard: bool + input character: char + output converted: int initial mode Converting { converter = new Converter() @@ -47,8 +47,8 @@ } reactor Converter { - input raw: char - output converted: int + input raw: char + output converted: int preamble {= #include @@ -84,8 +84,8 @@ } reactor InputFeeder(message: string("")) { - output character: char - state idx: int(0) + output character: char + state idx: int(0) timer t(0, 250 msec) diff --git a/test/known-good/C/src/modal_models/Count3Modes.txt b/test/known-good/C/src/modal_models/Count3Modes.txt index afd6e2650..b05ced214 100644 --- a/test/known-good/C/src/modal_models/Count3Modes.txt +++ b/test/known-good/C/src/modal_models/Count3Modes.txt @@ -5,8 +5,8 @@ } reactor CounterCycle { - input next: bool - output count: int + input next: bool + output count: int initial mode One { reaction(next) -> count, reset(Two) {= @@ -34,7 +34,7 @@ timer stepper(0, 250 msec) counter = new CounterCycle() - state expected_value: int(1) + state expected_value: int(1) // Trigger reaction(stepper) -> counter.next {= lf_set(counter.next, true); =} diff --git a/test/known-good/C/src/modal_models/MixedReactions.txt b/test/known-good/C/src/modal_models/MixedReactions.txt index 159d86c82..49fdc6701 100644 --- a/test/known-good/C/src/modal_models/MixedReactions.txt +++ b/test/known-good/C/src/modal_models/MixedReactions.txt @@ -8,8 +8,8 @@ } main reactor { - state x: int(0) - state first: bool(true) + state x: int(0) + state first: bool(true) timer t(0, 100 msec) diff --git a/test/known-good/C/src/modal_models/ModalActions.txt b/test/known-good/C/src/modal_models/ModalActions.txt index 097bf7459..4adf13ac9 100644 --- a/test/known-good/C/src/modal_models/ModalActions.txt +++ b/test/known-good/C/src/modal_models/ModalActions.txt @@ -10,13 +10,13 @@ import TraceTesting from "util/TraceTesting.lf" reactor Modal { - input next: bool + input next: bool - output mode_switch: int - output action1_sched: int - output action1_exec: int - output action2_sched: int - output action2_exec: int + output mode_switch: int + output action1_sched: int + output action1_exec: int + output action2_sched: int + output action2_exec: int initial mode One { timer T1(0, 750 msec) diff --git a/test/known-good/C/src/modal_models/ModalAfter.txt b/test/known-good/C/src/modal_models/ModalAfter.txt index 1edb1cfe4..b6b30aec0 100644 --- a/test/known-good/C/src/modal_models/ModalAfter.txt +++ b/test/known-good/C/src/modal_models/ModalAfter.txt @@ -10,13 +10,13 @@ import TraceTesting from "util/TraceTesting.lf" reactor Modal { - input next: bool + input next: bool - output mode_switch: int - output produced1: int - output consumed1: int - output produced2: int - output consumed2: int + output mode_switch: int + output produced1: int + output consumed1: int + output produced2: int + output consumed2: int initial mode One { producer1 = new Producer(mode_id = 1) @@ -46,7 +46,7 @@ } reactor Producer(mode_id: int(0)) { - output product: int + output product: int timer t(0, 750 msec) @@ -57,8 +57,8 @@ } reactor Consumer(mode_id: int(0)) { - input product: int - output report: int + input product: int + output report: int reaction(product) -> report {= printf("Consumed in %d\n", self->mode_id); diff --git a/test/known-good/C/src/modal_models/ModalCycleBreaker.txt b/test/known-good/C/src/modal_models/ModalCycleBreaker.txt index 8eed49f11..a3c4e0f1e 100644 --- a/test/known-good/C/src/modal_models/ModalCycleBreaker.txt +++ b/test/known-good/C/src/modal_models/ModalCycleBreaker.txt @@ -12,9 +12,9 @@ import TraceTesting from "util/TraceTesting.lf" reactor Modal { - input in1: int - input in2: int - output out: int + input in1: int + input in2: int + output out: int // Defining reaction to in2 before in1 would cause cycle if no mode were // present @@ -43,10 +43,10 @@ } reactor Counter(period: time(1 sec)) { - output value: int + output value: int timer t(0, period) - state curval: int(0) + state curval: int(0) reaction(t) -> value {= lf_set(value, self->curval++); =} } diff --git a/test/known-good/C/src/modal_models/ModalNestedReactions.txt b/test/known-good/C/src/modal_models/ModalNestedReactions.txt index 2df60ea61..8a8e39448 100644 --- a/test/known-good/C/src/modal_models/ModalNestedReactions.txt +++ b/test/known-good/C/src/modal_models/ModalNestedReactions.txt @@ -8,11 +8,11 @@ } reactor CounterCycle { - input next: bool + input next: bool - output count: int - output only_in_two: bool - output never: int + output count: int + output only_in_two: bool + output never: int initial mode One { reaction(next) -> count, reset(Two) {= @@ -37,8 +37,8 @@ } reactor Forward { - input in: bool - output out: bool + input in: bool + output out: bool reaction(in) -> out {= lf_set(out, in->value); =} } diff --git a/test/known-good/C/src/modal_models/ModalStartupShutdown.txt b/test/known-good/C/src/modal_models/ModalStartupShutdown.txt index 83de44163..6cf83129f 100644 --- a/test/known-good/C/src/modal_models/ModalStartupShutdown.txt +++ b/test/known-good/C/src/modal_models/ModalStartupShutdown.txt @@ -4,26 +4,26 @@ timeout: 3000 msec } -import TraceTesting from "util/TraceTesting.lf" +import TraceTesting from "util/TraceTesting.lf" reactor Modal { - input next: bool - - output mode_switch: int - output startup1: int - output startup2: int - output shutdown2: int - output shutdown3: int - output startup4: int - output reset4: int - output shutdown4: int - output startup5: int - output reset5: int - output shutdown5: int + input next: bool + + output mode_switch: int + output startup1: int + output startup2: int + output shutdown2: int + output shutdown3: int + output startup4: int + output reset4: int + output shutdown4: int + output startup5: int + output reset5: int + output shutdown5: int initial mode One { reaction(startup) -> startup1 {= - printf("Startup 1 at (%lld, %u).\n", lf_time_logical_elapsed(), lf_tag().microstep); + printf("Startup 1 at (%lld, %u).\n", lf_time_logical_elapsed(), lf_tag().microstep); lf_set(startup1, 1); =} diff --git a/test/known-good/C/src/modal_models/ModalStateReset.txt b/test/known-good/C/src/modal_models/ModalStateReset.txt index 7b1c10af5..5eb37f5ee 100644 --- a/test/known-good/C/src/modal_models/ModalStateReset.txt +++ b/test/known-good/C/src/modal_models/ModalStateReset.txt @@ -7,14 +7,14 @@ import TraceTesting from "util/TraceTesting.lf" reactor Modal { - input next: bool + input next: bool - output mode_switch: int - output count0: int - output count1: int - output count2: int + output mode_switch: int + output count0: int + output count1: int + output count2: int - state counter0: int(0) + state counter0: int(0) reaction(next) -> count0 {= printf("Counter0: %d\n", self->counter0); @@ -22,7 +22,7 @@ =} initial mode One { - state counter1: int(0) + state counter1: int(0) timer T1(0 msec, 250 msec) reaction(reset) {= self->counter1 = 0; =} @@ -39,7 +39,7 @@ } mode Two { - state counter2: int(-2) + state counter2: int(-2) timer T2(0 msec, 250 msec) reaction(reset) {= self->counter2 = -2; =} diff --git a/test/known-good/C/src/modal_models/ModalStateResetAuto.txt b/test/known-good/C/src/modal_models/ModalStateResetAuto.txt index 93a4c1530..ab590e1fe 100644 --- a/test/known-good/C/src/modal_models/ModalStateResetAuto.txt +++ b/test/known-good/C/src/modal_models/ModalStateResetAuto.txt @@ -7,14 +7,14 @@ import TraceTesting from "util/TraceTesting.lf" reactor Modal { - input next: bool + input next: bool - output mode_switch: int - output count0: int - output count1: int - output count2: int + output mode_switch: int + output count0: int + output count1: int + output count2: int - state counter0: int(0) + state counter0: int(0) reaction(next) -> count0 {= printf("Counter0: %d\n", self->counter0); @@ -22,7 +22,7 @@ =} initial mode One { - state counter1: int(0) + state counter1: int(0) timer T1(0 msec, 250 msec) reaction(T1) -> count1 {= printf("Counter1: %d\n", self->counter1); @@ -37,7 +37,7 @@ } mode Two { - reset state counter2: int(-2) + reset state counter2: int(-2) timer T2(0 msec, 250 msec) reaction(T2) -> count2 {= printf("Counter2: %d\n", self->counter2); diff --git a/test/known-good/C/src/modal_models/ModalTimers.txt b/test/known-good/C/src/modal_models/ModalTimers.txt index 4b3242dfe..85becaa38 100644 --- a/test/known-good/C/src/modal_models/ModalTimers.txt +++ b/test/known-good/C/src/modal_models/ModalTimers.txt @@ -7,11 +7,11 @@ import TraceTesting from "util/TraceTesting.lf" reactor Modal { - input next: bool + input next: bool - output mode_switch: int - output timer1: int - output timer2: int + output mode_switch: int + output timer1: int + output timer2: int initial mode One { timer T1(0, 750 msec) diff --git a/test/known-good/C/src/modal_models/MultipleOutputFeeder_2Connections.txt b/test/known-good/C/src/modal_models/MultipleOutputFeeder_2Connections.txt index c89edec54..3608913b6 100644 --- a/test/known-good/C/src/modal_models/MultipleOutputFeeder_2Connections.txt +++ b/test/known-good/C/src/modal_models/MultipleOutputFeeder_2Connections.txt @@ -12,8 +12,8 @@ import TraceTesting from "util/TraceTesting.lf" reactor Modal { - input next: bool - output count: int + input next: bool + output count: int initial mode One { counter1 = new Counter(period = 250 msec) @@ -29,10 +29,10 @@ } reactor Counter(period: time(1 sec)) { - output value: int + output value: int timer t(0, period) - reset state curval: int(0) + reset state curval: int(0) reaction(t) -> value {= lf_set(value, self->curval++); =} } diff --git a/test/known-good/C/src/modal_models/MultipleOutputFeeder_ReactionConnections.txt b/test/known-good/C/src/modal_models/MultipleOutputFeeder_ReactionConnections.txt index 599b88008..1bd2be3e5 100644 --- a/test/known-good/C/src/modal_models/MultipleOutputFeeder_ReactionConnections.txt +++ b/test/known-good/C/src/modal_models/MultipleOutputFeeder_ReactionConnections.txt @@ -12,8 +12,8 @@ import TraceTesting from "util/TraceTesting.lf" reactor Modal { - input next: bool - output count: int + input next: bool + output count: int initial mode One { counter1 = new Counter(period = 250 msec) @@ -32,10 +32,10 @@ } reactor Counter(period: time(1 sec)) { - output value: int + output value: int timer t(0, period) - reset state curval: int(0) + reset state curval: int(0) reaction(t) -> value {= lf_set(value, self->curval++); =} } diff --git a/test/known-good/C/src/modal_models/util/TraceTesting.txt b/test/known-good/C/src/modal_models/util/TraceTesting.txt index e216faf93..cb1b3ae55 100644 --- a/test/known-good/C/src/modal_models/util/TraceTesting.txt +++ b/test/known-good/C/src/modal_models/util/TraceTesting.txt @@ -13,10 +13,10 @@ ) { input[events_size] events: int - state last_reaction_time: int(0) - state trace_idx: int(0) - state recorded_events: int*(0) - state recorded_events_next: int(0) + state last_reaction_time: int(0) + state trace_idx: int(0) + state recorded_events: int*(0) + state recorded_events_next: int(0) reaction(startup) {= self->last_reaction_time = lf_time_logical(); =} diff --git a/test/known-good/C/src/multiport/BankGangedConnections.txt b/test/known-good/C/src/multiport/BankGangedConnections.txt index ee7d3db43..50328db1c 100644 --- a/test/known-good/C/src/multiport/BankGangedConnections.txt +++ b/test/known-good/C/src/multiport/BankGangedConnections.txt @@ -6,15 +6,15 @@ import TestCount from "../lib/TestCount.lf" reactor Through { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= lf_set(out, in->value); =} } reactor Bank { - input in: int - output out: int + input in: int + output out: int t = new Through() in, t.out -> t.in, out } diff --git a/test/known-good/C/src/multiport/BankIndexInitializer.txt b/test/known-good/C/src/multiport/BankIndexInitializer.txt index 79b45e13e..758446079 100644 --- a/test/known-good/C/src/multiport/BankIndexInitializer.txt +++ b/test/known-good/C/src/multiport/BankIndexInitializer.txt @@ -4,14 +4,14 @@ preamble {= int table[] = {4, 3, 2, 1}; =} reactor Source(bank_index: int(0), value: int(0)) { - output out: int + output out: int reaction(startup) -> out {= lf_set(out, self->value); =} } reactor Sink(width: int(4)) { input[width] in: int - state received: bool(false) + state received: bool(false) reaction(in) {= for (int idx = 0; idx < in_width; idx++) { diff --git a/test/known-good/C/src/multiport/BankMulticast.txt b/test/known-good/C/src/multiport/BankMulticast.txt index e30627856..15898b21c 100644 --- a/test/known-good/C/src/multiport/BankMulticast.txt +++ b/test/known-good/C/src/multiport/BankMulticast.txt @@ -11,8 +11,8 @@ import TestCount from "../lib/TestCount.lf" reactor Foo { - input in: int - output out: int + input in: int + output out: int c = new Count() c.out -> out diff --git a/test/known-good/C/src/multiport/BankMultiportToReaction.txt b/test/known-good/C/src/multiport/BankMultiportToReaction.txt index 40b8157b8..348b04cd6 100644 --- a/test/known-good/C/src/multiport/BankMultiportToReaction.txt +++ b/test/known-good/C/src/multiport/BankMultiportToReaction.txt @@ -13,8 +13,8 @@ } main reactor { - state count: int(1) - state received: bool(false) + state count: int(1) + state received: bool(false) s = new[2] DoubleCount() diff --git a/test/known-good/C/src/multiport/BankReactionsInContainer.txt b/test/known-good/C/src/multiport/BankReactionsInContainer.txt index 06e000a7a..2ac802894 100644 --- a/test/known-good/C/src/multiport/BankReactionsInContainer.txt +++ b/test/known-good/C/src/multiport/BankReactionsInContainer.txt @@ -8,7 +8,7 @@ reactor R(bank_index: int(0)) { output[2] out: int input[2] in: int - state received: bool(false) + state received: bool(false) reaction(startup) -> out {= for (int i = 0; i < out_width; i++) { @@ -42,7 +42,7 @@ main reactor { s = new[2] R() - state received: bool(false) + state received: bool(false) reaction(startup) -> s.in {= int count = 0; diff --git a/test/known-good/C/src/multiport/BankSelfBroadcast.txt b/test/known-good/C/src/multiport/BankSelfBroadcast.txt index eb68c338c..7c6ef62ce 100644 --- a/test/known-good/C/src/multiport/BankSelfBroadcast.txt +++ b/test/known-good/C/src/multiport/BankSelfBroadcast.txt @@ -9,8 +9,8 @@ reactor A(bank_index: int(0)) { input[4] in: int - output out: int - state received: bool(false) + output out: int + state received: bool(false) reaction(startup) -> out {= lf_set(out, self->bank_index); =} diff --git a/test/known-good/C/src/multiport/BankToBank.txt b/test/known-good/C/src/multiport/BankToBank.txt index 85e8efa48..3e60cd2f2 100644 --- a/test/known-good/C/src/multiport/BankToBank.txt +++ b/test/known-good/C/src/multiport/BankToBank.txt @@ -6,8 +6,8 @@ reactor Source(bank_index: int(0)) { timer t(0, 200 msec) - output out: int - state s: int(0) + output out: int + state s: int(0) reaction(t) -> out {= lf_set(out, self->s); @@ -16,8 +16,8 @@ } reactor Destination(bank_index: int(0)) { - state s: int(0) - input in: int + state s: int(0) + input in: int reaction(in) {= printf("Destination %d received: %d.\n", self->bank_index, in->value); diff --git a/test/known-good/C/src/multiport/BankToBankMultiport.txt b/test/known-good/C/src/multiport/BankToBankMultiport.txt index 5dae36803..ccdf1fd7a 100644 --- a/test/known-good/C/src/multiport/BankToBankMultiport.txt +++ b/test/known-good/C/src/multiport/BankToBankMultiport.txt @@ -7,7 +7,7 @@ reactor Source(width: int(1)) { timer t(0, 200 msec) output[width] out: int - state s: int(0) + state s: int(0) reaction(t) -> out {= for(int i = 0; i < out_width; i++) { @@ -17,7 +17,7 @@ } reactor Destination(width: int(1)) { - state s: int(6) + state s: int(6) input[width] in: int reaction(in) {= diff --git a/test/known-good/C/src/multiport/BankToBankMultiportAfter.txt b/test/known-good/C/src/multiport/BankToBankMultiportAfter.txt index 24ff3786b..d66e5c847 100644 --- a/test/known-good/C/src/multiport/BankToBankMultiportAfter.txt +++ b/test/known-good/C/src/multiport/BankToBankMultiportAfter.txt @@ -7,7 +7,7 @@ reactor Source(width: int(1)) { timer t(0, 200 msec) output[width] out: int - state s: int(0) + state s: int(0) reaction(t) -> out {= for(int i = 0; i < out_width; i++) { @@ -17,7 +17,7 @@ } reactor Destination(width: int(1)) { - state s: int(6) + state s: int(6) input[width] in: int reaction(in) {= diff --git a/test/known-good/C/src/multiport/BankToMultiport.txt b/test/known-good/C/src/multiport/BankToMultiport.txt index ba9da0b7c..64f562f30 100644 --- a/test/known-good/C/src/multiport/BankToMultiport.txt +++ b/test/known-good/C/src/multiport/BankToMultiport.txt @@ -2,14 +2,14 @@ target C reactor Source(bank_index: int(0)) { - output out: int + output out: int reaction(startup) -> out {= lf_set(out, self->bank_index); =} } reactor Sink(width: int(4)) { input[width] in: int - state received: bool(false) + state received: bool(false) reaction(in) {= for (int i = 0; i < in_width; i++) { diff --git a/test/known-good/C/src/multiport/BankToReaction.txt b/test/known-good/C/src/multiport/BankToReaction.txt index 0acff88b8..759e82813 100644 --- a/test/known-good/C/src/multiport/BankToReaction.txt +++ b/test/known-good/C/src/multiport/BankToReaction.txt @@ -6,7 +6,7 @@ import Count from "../lib/Count.lf" main reactor { - state count: int(1) + state count: int(1) s = new[2] Count() diff --git a/test/known-good/C/src/multiport/Broadcast.txt b/test/known-good/C/src/multiport/Broadcast.txt index c463fd403..6dd266543 100644 --- a/test/known-good/C/src/multiport/Broadcast.txt +++ b/test/known-good/C/src/multiport/Broadcast.txt @@ -4,14 +4,14 @@ } reactor Source { - output out: int + output out: int reaction(startup) -> out {= lf_set(out, 42); =} } reactor Destination(bank_index: int(0)) { - input in: int - state received: bool(false) + input in: int + state received: bool(false) reaction(in) {= printf("Destination %d received %d.\n", self->bank_index, in->value); diff --git a/test/known-good/C/src/multiport/BroadcastAfter.txt b/test/known-good/C/src/multiport/BroadcastAfter.txt index c6a39c8b2..52f2fef37 100644 --- a/test/known-good/C/src/multiport/BroadcastAfter.txt +++ b/test/known-good/C/src/multiport/BroadcastAfter.txt @@ -4,14 +4,14 @@ } reactor Source { - output out: int + output out: int reaction(startup) -> out {= lf_set(out, 42); =} } reactor Destination(bank_index: int(0)) { - input in: int - state received: bool(false) + input in: int + state received: bool(false) reaction(in) {= printf("Destination %d received %d.\n", self->bank_index, in->value); diff --git a/test/known-good/C/src/multiport/BroadcastMultipleAfter.txt b/test/known-good/C/src/multiport/BroadcastMultipleAfter.txt index 27614341b..42089f987 100644 --- a/test/known-good/C/src/multiport/BroadcastMultipleAfter.txt +++ b/test/known-good/C/src/multiport/BroadcastMultipleAfter.txt @@ -4,14 +4,14 @@ } reactor Source(value: int(42)) { - output out: int + output out: int reaction(startup) -> out {= lf_set(out, self->value); =} } reactor Destination(bank_index: int(0)) { - input in: int - state received: bool(false) + input in: int + state received: bool(false) reaction(in) {= printf("Destination %d received %d.\n", self->bank_index, in->value); diff --git a/test/known-good/C/src/multiport/DualBanks.txt b/test/known-good/C/src/multiport/DualBanks.txt index 7d87494a2..db28e97c7 100644 --- a/test/known-good/C/src/multiport/DualBanks.txt +++ b/test/known-good/C/src/multiport/DualBanks.txt @@ -1,8 +1,8 @@ target C reactor Base(bank_index: int(0)) { - input I: int - state received: bool(false) + input I: int + state received: bool(false) reaction(shutdown) {= if(!self->received) { diff --git a/test/known-good/C/src/multiport/DualBanksMultiport.txt b/test/known-good/C/src/multiport/DualBanksMultiport.txt index 6ed5ce84a..a53ed1b45 100644 --- a/test/known-good/C/src/multiport/DualBanksMultiport.txt +++ b/test/known-good/C/src/multiport/DualBanksMultiport.txt @@ -2,7 +2,7 @@ reactor Base(bank_index: int(0)) { input[2] I: int - state received: bool(false) + state received: bool(false) reaction(shutdown) {= if(!self->received) { diff --git a/test/known-good/C/src/multiport/FullyConnected.txt b/test/known-good/C/src/multiport/FullyConnected.txt index 87db77f8c..54416058f 100644 --- a/test/known-good/C/src/multiport/FullyConnected.txt +++ b/test/known-good/C/src/multiport/FullyConnected.txt @@ -2,9 +2,9 @@ reactor Node(num_nodes: size_t(4), bank_index: int(0)) { input[num_nodes] in: int - output out: int + output out: int - state received: bool(false) + state received: bool(false) reaction(startup) -> out {= lf_print("Hello from node %d!", self->bank_index); diff --git a/test/known-good/C/src/multiport/FullyConnectedAddressable.txt b/test/known-good/C/src/multiport/FullyConnectedAddressable.txt index aee868363..18c1a54e7 100644 --- a/test/known-good/C/src/multiport/FullyConnectedAddressable.txt +++ b/test/known-good/C/src/multiport/FullyConnectedAddressable.txt @@ -5,8 +5,8 @@ input[num_nodes] in: int output[num_nodes] out: int - state received: int(0) - state triggered: bool(false) + state received: int(0) + state triggered: bool(false) reaction(startup) -> out {= int outChannel = (self->bank_index + 1) % self->num_nodes; diff --git a/test/known-good/C/src/multiport/MultiportFromBank.txt b/test/known-good/C/src/multiport/MultiportFromBank.txt index 4347a62cb..c4d110ce7 100644 --- a/test/known-good/C/src/multiport/MultiportFromBank.txt +++ b/test/known-good/C/src/multiport/MultiportFromBank.txt @@ -6,7 +6,7 @@ } reactor Source(check_override: int(0), bank_index: int(0)) { - output out: int + output out: int reaction(startup) -> out {= lf_set(out, self->bank_index * self->check_override); @@ -15,7 +15,7 @@ reactor Destination(port_width: int(3)) { input[port_width] in: int - state received: bool(false) + state received: bool(false) reaction(in) {= for (int i = 0; i < in_width; i++) { diff --git a/test/known-good/C/src/multiport/MultiportFromHierarchy.txt b/test/known-good/C/src/multiport/MultiportFromHierarchy.txt index 4e63b8e15..af4ec2605 100644 --- a/test/known-good/C/src/multiport/MultiportFromHierarchy.txt +++ b/test/known-good/C/src/multiport/MultiportFromHierarchy.txt @@ -8,7 +8,7 @@ reactor Source(width: int(3)) { timer t(0, 200 msec) output[width] out: int - state s: int(0) + state s: int(0) reaction(t) -> out {= for(int i = 0; i < out_width; i++) { @@ -18,7 +18,7 @@ } reactor Destination(width: int(3)) { - state s: int(6) + state s: int(6) input[width] in: int reaction(in) {= diff --git a/test/known-good/C/src/multiport/MultiportFromReaction.txt b/test/known-good/C/src/multiport/MultiportFromReaction.txt index 62e146986..42a268a29 100644 --- a/test/known-good/C/src/multiport/MultiportFromReaction.txt +++ b/test/known-good/C/src/multiport/MultiportFromReaction.txt @@ -5,7 +5,7 @@ } reactor Destination(width: int(1)) { - state s: int(6) + state s: int(6) input[width] in: int reaction(in) {= @@ -32,7 +32,7 @@ main reactor MultiportFromReaction(width: int(4)) { timer t(0, 200 msec) - state s: int(0) + state s: int(0) b = new Destination(width = width) reaction(t) -> b.in {= diff --git a/test/known-good/C/src/multiport/MultiportIn.txt b/test/known-good/C/src/multiport/MultiportIn.txt index 9bd36606e..8c8a590e1 100644 --- a/test/known-good/C/src/multiport/MultiportIn.txt +++ b/test/known-good/C/src/multiport/MultiportIn.txt @@ -7,8 +7,8 @@ reactor Source { timer t(0, 200 msec) - output out: int - state s: int(0) + output out: int + state s: int(0) reaction(t) -> out {= lf_set(out, self->s); @@ -17,14 +17,14 @@ } reactor Computation { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= lf_set(out, in->value); =} } reactor Destination { - state s: int(0) + state s: int(0) input[4] in: int reaction(in) {= diff --git a/test/known-good/C/src/multiport/MultiportInParameterized.txt b/test/known-good/C/src/multiport/MultiportInParameterized.txt index 05feadf19..c7106ee6e 100644 --- a/test/known-good/C/src/multiport/MultiportInParameterized.txt +++ b/test/known-good/C/src/multiport/MultiportInParameterized.txt @@ -7,8 +7,8 @@ reactor Source { timer t(0, 200 msec) - output out: int - state s: int(0) + output out: int + state s: int(0) reaction(t) -> out {= lf_set(out, self->s); @@ -17,14 +17,14 @@ } reactor Computation { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= lf_set(out, in->value); =} } reactor Destination(width: int(1)) { - state s: int(0) + state s: int(0) input[width] in: int reaction(in) {= diff --git a/test/known-good/C/src/multiport/MultiportOut.txt b/test/known-good/C/src/multiport/MultiportOut.txt index 3cab55d47..4d451c0da 100644 --- a/test/known-good/C/src/multiport/MultiportOut.txt +++ b/test/known-good/C/src/multiport/MultiportOut.txt @@ -7,7 +7,7 @@ reactor Source { timer t(0, 200 msec) output[4] out: int - state s: int(0) + state s: int(0) reaction(t) -> out {= for(int i = 0; i < 4; i++) { @@ -18,8 +18,8 @@ } reactor Computation { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= // No need to sleep for this test. @@ -31,7 +31,7 @@ } reactor Destination { - state s: int(0) + state s: int(0) input[4] in: int reaction(in) {= diff --git a/test/known-good/C/src/multiport/MultiportToBank.txt b/test/known-good/C/src/multiport/MultiportToBank.txt index 6ed14f822..92e664f64 100644 --- a/test/known-good/C/src/multiport/MultiportToBank.txt +++ b/test/known-good/C/src/multiport/MultiportToBank.txt @@ -6,7 +6,7 @@ reactor Source(width: int(2)) { output[width] out: int // Connected to a bank of Destination reactors - input dummy: int // Not connected to anything + input dummy: int // Not connected to anything reaction(startup) -> out {= for(int i = 0; i < out_width; i++) { @@ -25,8 +25,8 @@ } reactor Destination(bank_index: int(0)) { - input in: int - state received: bool(false) + input in: int + state received: bool(false) reaction(in) {= printf("Destination %d received %d.\n", self->bank_index, in->value); diff --git a/test/known-good/C/src/multiport/MultiportToBankAfter.txt b/test/known-good/C/src/multiport/MultiportToBankAfter.txt index fdb4e8a2e..54264bc97 100644 --- a/test/known-good/C/src/multiport/MultiportToBankAfter.txt +++ b/test/known-good/C/src/multiport/MultiportToBankAfter.txt @@ -16,8 +16,8 @@ } reactor Destination(bank_index: int(0)) { - input in: int - state received: bool(false) + input in: int + state received: bool(false) reaction(in) {= printf("Destination %d received %d.\n", self->bank_index, in->value); diff --git a/test/known-good/C/src/multiport/MultiportToBankDouble.txt b/test/known-good/C/src/multiport/MultiportToBankDouble.txt index 7329fac87..687f1806a 100644 --- a/test/known-good/C/src/multiport/MultiportToBankDouble.txt +++ b/test/known-good/C/src/multiport/MultiportToBankDouble.txt @@ -25,8 +25,8 @@ } reactor Destination(bank_index: int(0)) { - input in: int - state received: bool(false) + input in: int + state received: bool(false) reaction(in) {= printf("Destination %d received %d.\n", self->bank_index, in->value); diff --git a/test/known-good/C/src/multiport/MultiportToBankHierarchy.txt b/test/known-good/C/src/multiport/MultiportToBankHierarchy.txt index 7f21a1165..75375622b 100644 --- a/test/known-good/C/src/multiport/MultiportToBankHierarchy.txt +++ b/test/known-good/C/src/multiport/MultiportToBankHierarchy.txt @@ -16,8 +16,8 @@ } reactor Destination(bank_index: int(0)) { - input in: int - state received: bool(false) + input in: int + state received: bool(false) reaction(in) {= printf("Destination %d received %d.\n", self->bank_index, in->value); diff --git a/test/known-good/C/src/multiport/MultiportToHierarchy.txt b/test/known-good/C/src/multiport/MultiportToHierarchy.txt index 49c26fe35..b9ff07536 100644 --- a/test/known-good/C/src/multiport/MultiportToHierarchy.txt +++ b/test/known-good/C/src/multiport/MultiportToHierarchy.txt @@ -9,7 +9,7 @@ reactor Source(width: int(2)) { timer t(0, 200 msec) output[width] out: int - state s: int(0) + state s: int(0) reaction(t) -> out {= for(int i = 0; i < 4; i++) { @@ -19,7 +19,7 @@ } reactor Destination(width: int(4)) { - state s: int(6) + state s: int(6) input[width] in: int reaction(in) {= diff --git a/test/known-good/C/src/multiport/MultiportToMultiport.txt b/test/known-good/C/src/multiport/MultiportToMultiport.txt index cc920d8ff..b5ed2090c 100644 --- a/test/known-good/C/src/multiport/MultiportToMultiport.txt +++ b/test/known-good/C/src/multiport/MultiportToMultiport.txt @@ -7,7 +7,7 @@ reactor Source(width: int(1)) { timer t(0, 200 msec) output[width] out: int - state s: int(0) + state s: int(0) reaction(t) -> out {= for(int i = 0; i < out_width; i++) { @@ -20,7 +20,7 @@ } reactor Destination(width: int(1)) { - state s: int(6) + state s: int(6) input[width] in: int reaction(in) {= diff --git a/test/known-good/C/src/multiport/MultiportToMultiportArray.txt b/test/known-good/C/src/multiport/MultiportToMultiportArray.txt index b32874d19..003b5e86f 100644 --- a/test/known-good/C/src/multiport/MultiportToMultiportArray.txt +++ b/test/known-good/C/src/multiport/MultiportToMultiportArray.txt @@ -8,7 +8,7 @@ reactor Source { timer t(0, 200 msec) output[2] out: int[] - state s: int(0) + state s: int(0) reaction(t) -> out {= for(int i = 0; i < 2; i++) { @@ -24,7 +24,7 @@ } reactor Destination { - state s: int(15) + state s: int(15) input[2] in: int[] reaction(in) {= diff --git a/test/known-good/C/src/multiport/MultiportToMultiportParameter.txt b/test/known-good/C/src/multiport/MultiportToMultiportParameter.txt index 2a4ddf08a..fdfe9444e 100644 --- a/test/known-good/C/src/multiport/MultiportToMultiportParameter.txt +++ b/test/known-good/C/src/multiport/MultiportToMultiportParameter.txt @@ -7,7 +7,7 @@ reactor Source(width: int(1)) { timer t(0, 200 msec) output[width] out: int - state s: int(0) + state s: int(0) reaction(t) -> out {= for(int i = 0; i < out_width; i++) { @@ -20,7 +20,7 @@ } reactor Destination(width: int(1)) { - state s: int(6) + state s: int(6) input[width] in: int // Width is one larger than that of the source. reaction(in) {= diff --git a/test/known-good/C/src/multiport/MultiportToPort.txt b/test/known-good/C/src/multiport/MultiportToPort.txt index 8430bd197..e71cbfbe4 100644 --- a/test/known-good/C/src/multiport/MultiportToPort.txt +++ b/test/known-good/C/src/multiport/MultiportToPort.txt @@ -17,8 +17,8 @@ } reactor Destination(expected: int(0)) { - input in: int - state received: bool(false) + input in: int + state received: bool(false) reaction(in) {= printf("Received: %d.\n", in->value); diff --git a/test/known-good/C/src/multiport/MultiportToReaction.txt b/test/known-good/C/src/multiport/MultiportToReaction.txt index 14242a7f7..46773a278 100644 --- a/test/known-good/C/src/multiport/MultiportToReaction.txt +++ b/test/known-good/C/src/multiport/MultiportToReaction.txt @@ -6,7 +6,7 @@ reactor Source(width: int(1)) { timer t(0, 200 msec) - state s: int(0) + state s: int(0) output[width] out: int reaction(t) -> out {= @@ -18,7 +18,7 @@ } main reactor MultiportToReaction { - state s: int(6) + state s: int(6) b = new Source(width = 4) reaction(b.out) {= diff --git a/test/known-good/C/src/multiport/NestedBanks.txt b/test/known-good/C/src/multiport/NestedBanks.txt index 7743d8345..8e21f3b74 100644 --- a/test/known-good/C/src/multiport/NestedBanks.txt +++ b/test/known-good/C/src/multiport/NestedBanks.txt @@ -60,7 +60,7 @@ } reactor F(c_bank_index: int(0)) { - input w: int + input w: int reaction(w) {= lf_print("c[%d].f.w received %d.", self->c_bank_index, w->value); @@ -71,7 +71,7 @@ } reactor G(c_bank_index: int(0)) { - input s: int + input s: int reaction(s) {= lf_print("c[%d].g.s received %d.", self->c_bank_index, s->value); diff --git a/test/known-good/C/src/multiport/PipelineAfter.txt b/test/known-good/C/src/multiport/PipelineAfter.txt index b45af433e..dda0e6cfc 100644 --- a/test/known-good/C/src/multiport/PipelineAfter.txt +++ b/test/known-good/C/src/multiport/PipelineAfter.txt @@ -1,20 +1,20 @@ target C reactor Source { - output out: unsigned + output out: unsigned reaction(startup) -> out {= lf_set(out, 40); =} } reactor Compute { - input in: unsigned - output out: unsigned + input in: unsigned + output out: unsigned reaction(in) -> out {= lf_set(out, in->value + 2); =} } reactor Sink { - input in: unsigned + input in: unsigned reaction(in) {= printf("Received %d\n", in->value); diff --git a/test/known-good/C/src/multiport/ReactionToContainedBank.txt b/test/known-good/C/src/multiport/ReactionToContainedBank.txt index 88af87bbc..167ab516f 100644 --- a/test/known-good/C/src/multiport/ReactionToContainedBank.txt +++ b/test/known-good/C/src/multiport/ReactionToContainedBank.txt @@ -8,7 +8,7 @@ main reactor ReactionToContainedBank(width: int(2)) { timer t(0, 100 msec) - state count: int(1) + state count: int(1) test = new[width] TestCount(num_inputs = 11) diff --git a/test/known-good/C/src/multiport/ReactionToContainedBank2.txt b/test/known-good/C/src/multiport/ReactionToContainedBank2.txt index 67b67fe0c..512e6f501 100644 --- a/test/known-good/C/src/multiport/ReactionToContainedBank2.txt +++ b/test/known-good/C/src/multiport/ReactionToContainedBank2.txt @@ -8,7 +8,7 @@ reactor ReactionToContainedBank(width: int(2)) { timer t(0, 100 msec) - state count: int(1) + state count: int(1) test = new[width] TestCount(num_inputs = 11) diff --git a/test/known-good/C/src/multiport/ReactionToContainedBankMultiport.txt b/test/known-good/C/src/multiport/ReactionToContainedBankMultiport.txt index 04e6202c4..23a9e92d2 100644 --- a/test/known-good/C/src/multiport/ReactionToContainedBankMultiport.txt +++ b/test/known-good/C/src/multiport/ReactionToContainedBankMultiport.txt @@ -9,7 +9,7 @@ main reactor(width: int(2)) { timer t(0, 100 msec) - state count: int(1) + state count: int(1) test = new[width] TestCountMultiport(num_inputs = 11, width = width) diff --git a/test/known-good/C/src/multiport/ReactionsToNested.txt b/test/known-good/C/src/multiport/ReactionsToNested.txt index 2699a42c9..fd8873d40 100644 --- a/test/known-good/C/src/multiport/ReactionsToNested.txt +++ b/test/known-good/C/src/multiport/ReactionsToNested.txt @@ -5,8 +5,8 @@ } reactor T(expected: int(0)) { - input z: int - state received: bool(false) + input z: int + state received: bool(false) reaction(z) {= lf_print("T received %d", z->value); diff --git a/test/known-good/C/src/multiport/Sparse.txt b/test/known-good/C/src/multiport/Sparse.txt index 469738cf8..7d5082592 100644 --- a/test/known-good/C/src/multiport/Sparse.txt +++ b/test/known-good/C/src/multiport/Sparse.txt @@ -5,7 +5,7 @@ reactor SparseSource(width: int(20)) { output[width] out: int - state count: int(0) + state count: int(0) timer t(0, 1 msec) reaction(t) -> out {= diff --git a/test/known-good/C/src/multiport/SparseFallback.txt b/test/known-good/C/src/multiport/SparseFallback.txt index 92d3df435..426e52634 100644 --- a/test/known-good/C/src/multiport/SparseFallback.txt +++ b/test/known-good/C/src/multiport/SparseFallback.txt @@ -8,7 +8,7 @@ reactor SparseSource(width: int(20)) { output[width] out: int - state count: int(0) + state count: int(0) timer t(0, 1 msec) reaction(t) -> out {= diff --git a/test/known-good/C/src/multiport/TriggerDownstreamOnlyIfPresent.txt b/test/known-good/C/src/multiport/TriggerDownstreamOnlyIfPresent.txt index acb0f26c8..599826f0a 100644 --- a/test/known-good/C/src/multiport/TriggerDownstreamOnlyIfPresent.txt +++ b/test/known-good/C/src/multiport/TriggerDownstreamOnlyIfPresent.txt @@ -8,9 +8,9 @@ } reactor Source { - output a: int - output b: int - state count: int(0) + output a: int + output b: int + state count: int(0) timer t(0, 200 msec) reaction(t) -> a, b {= @@ -23,8 +23,8 @@ } reactor Destination { - input a: int - input b: int + input a: int + input b: int reaction(a) {= if (!a->is_present) { diff --git a/test/known-good/C/src/serialization/ProtoNoPacking.txt b/test/known-good/C/src/serialization/ProtoNoPacking.txt index 4932399ef..06705e708 100644 --- a/test/known-good/C/src/serialization/ProtoNoPacking.txt +++ b/test/known-good/C/src/serialization/ProtoNoPacking.txt @@ -23,7 +23,7 @@ } reactor SourceProto { - output out: ProtoHelloWorld + output out: ProtoHelloWorld reaction(startup) -> out {= out->value.name = "Hello World"; @@ -33,7 +33,7 @@ } reactor SinkProto { - input in: ProtoHelloWorld + input in: ProtoHelloWorld reaction(in) {= printf("Received: name=\"%s\", number=%d.\n", in->value.name, in->value.number); diff --git a/test/known-good/C/src/serialization/ROSBuiltInSerialization.txt b/test/known-good/C/src/serialization/ROSBuiltInSerialization.txt index 50ca4c3d8..b08c4e3bf 100644 --- a/test/known-good/C/src/serialization/ROSBuiltInSerialization.txt +++ b/test/known-good/C/src/serialization/ROSBuiltInSerialization.txt @@ -29,10 +29,10 @@ =} reactor Sender { - output out: std_msgs::msg::Int32 + output out: std_msgs::msg::Int32 // state serialized_msg_pcl:rclcpp::SerializedMessage({=0u=}); - state count: int(0) + state count: int(0) timer t(0, 1 sec) @@ -44,8 +44,8 @@ } reactor Receiver { - input in: std_msgs::msg::Int32 - state count: int(0) + input in: std_msgs::msg::Int32 + state count: int(0) reaction(in) {= // Print the ROS2 message data diff --git a/test/known-good/C/src/serialization/ROSBuiltInSerializationSharedPtr.txt b/test/known-good/C/src/serialization/ROSBuiltInSerializationSharedPtr.txt index 655a1132b..f2f520794 100644 --- a/test/known-good/C/src/serialization/ROSBuiltInSerializationSharedPtr.txt +++ b/test/known-good/C/src/serialization/ROSBuiltInSerializationSharedPtr.txt @@ -29,9 +29,9 @@ =} reactor Sender { - output out: std::shared_ptr<std_msgs::msg::Int32> + output out: std::shared_ptrmsg::Int32> - state count: int(0) + state count: int(0) timer t(0, 1 sec) @@ -43,8 +43,8 @@ } reactor Receiver { - input in: std::shared_ptr<std_msgs::msg::Int32> - state count: int(0) + input in: std::shared_ptrmsg::Int32> + state count: int(0) reaction(in) {= // Print the ROS2 message data diff --git a/test/known-good/C/src/target/HelloWorldCCPP.txt b/test/known-good/C/src/target/HelloWorldCCPP.txt index 9f74d7256..ef6110c50 100644 --- a/test/known-good/C/src/target/HelloWorldCCPP.txt +++ b/test/known-good/C/src/target/HelloWorldCCPP.txt @@ -11,7 +11,7 @@ preamble {= #include =} - state success: bool(false) + state success: bool(false) reaction(startup) {= std::cout << "Hello World." << std::endl; diff --git a/test/known-good/C/src/token/TokenContainedPrint.txt b/test/known-good/C/src/token/TokenContainedPrint.txt index 2b9e900b1..0f3c1b1a1 100644 --- a/test/known-good/C/src/token/TokenContainedPrint.txt +++ b/test/known-good/C/src/token/TokenContainedPrint.txt @@ -9,7 +9,7 @@ import TokenPrint from "lib/Token.lf" main reactor { - state count: int(0) + state count: int(0) timer t(0, 1 ms) p = new TokenPrint() diff --git a/test/known-good/C/src/token/TokenContainedPrintBank.txt b/test/known-good/C/src/token/TokenContainedPrintBank.txt index 40ceb6edf..1d65b5154 100644 --- a/test/known-good/C/src/token/TokenContainedPrintBank.txt +++ b/test/known-good/C/src/token/TokenContainedPrintBank.txt @@ -10,7 +10,7 @@ import TokenPrint from "lib/Token.lf" main reactor { - state count: int(0) + state count: int(0) timer t(0, 1 ms) p = new[2] TokenPrint() diff --git a/test/known-good/C/src/token/TokenContainedSource.txt b/test/known-good/C/src/token/TokenContainedSource.txt index 5c6dd0c33..ae23478ed 100644 --- a/test/known-good/C/src/token/TokenContainedSource.txt +++ b/test/known-good/C/src/token/TokenContainedSource.txt @@ -10,8 +10,8 @@ import TokenSource from "lib/Token.lf" main reactor(scale: int(1)) { - state count: int(0) - state input_received: bool(false) + state count: int(0) + state input_received: bool(false) s = new TokenSource() diff --git a/test/known-good/C/src/token/TokenContainedSourceBank.txt b/test/known-good/C/src/token/TokenContainedSourceBank.txt index 480624442..32100f7b7 100644 --- a/test/known-good/C/src/token/TokenContainedSourceBank.txt +++ b/test/known-good/C/src/token/TokenContainedSourceBank.txt @@ -11,8 +11,8 @@ import TokenSource from "lib/Token.lf" main reactor(scale: int(1)) { - state count: int(0) - state input_received: bool(false) + state count: int(0) + state input_received: bool(false) s = new[2] TokenSource() diff --git a/test/known-good/C/src/token/lib/Token.txt b/test/known-good/C/src/token/lib/Token.txt index 3543d5dc2..32b60d184 100644 --- a/test/known-good/C/src/token/lib/Token.txt +++ b/test/known-good/C/src/token/lib/Token.txt @@ -19,8 +19,8 @@ * managed automatically by the C runtime. */ reactor TokenSource { - output out: int_array_t* - state count: int(0) + output out: int_array_t* + state count: int(0) timer t(0, 1 ms) reaction(startup) -> out {= @@ -43,9 +43,9 @@ * TokenSource, where the scaling factor is given by the scale parameter. */ reactor TokenPrint(scale: int(1)) { - input in: int_array_t* - state count: int(0) - state input_received: bool(false) + input in: int_array_t* + state count: int(0) + state input_received: bool(false) reaction(in) {= self->input_received = true; @@ -80,8 +80,8 @@ * rather than allocating a new token. */ reactor TokenScale(scale: int(2)) { - mutable input in: int_array_t* - output out: int_array_t* + mutable input in: int_array_t* + output out: int_array_t* reaction(in) -> out {= for (int i = 0; i < in->value->length; i++) { @@ -93,9 +93,9 @@ /** @brief Delay a token using a logical action. The delay is 1 ms. */ reactor TokenDelay { - input in: int_array_t* - output out: int_array_t* - logical action a: int_array_t* + input in: int_array_t* + output out: int_array_t* + logical action a: int_array_t* reaction(a) -> out {= lf_set_token(out, a->token); =} diff --git a/test/known-good/Cpp/src/ActionDelay.txt b/test/known-good/Cpp/src/ActionDelay.txt index 30de7d107..8263d9eb3 100644 --- a/test/known-good/Cpp/src/ActionDelay.txt +++ b/test/known-good/Cpp/src/ActionDelay.txt @@ -2,9 +2,9 @@ target Cpp reactor GeneratedDelay { - input y_in: int - output y_out: int - state y_state: int{0} + input y_in: int + output y_out: int + state y_state: int{0} logical action act(100 msec): void reaction(y_in) -> act {= @@ -16,13 +16,13 @@ } reactor Source { - output out: int + output out: int reaction(startup) -> out {= out.set(1); =} } reactor Sink { - input in: int + input in: int reaction(in) {= auto elapsed_logical = get_elapsed_logical_time(); diff --git a/test/known-good/Cpp/src/ActionIsPresent.txt b/test/known-good/Cpp/src/ActionIsPresent.txt index ba045cfa3..c1861737e 100644 --- a/test/known-good/Cpp/src/ActionIsPresent.txt +++ b/test/known-good/Cpp/src/ActionIsPresent.txt @@ -3,8 +3,8 @@ main reactor ActionIsPresent(offset: time(1 nsec), period: time(500 msec)) { logical action a - state success: bool(false) - state zero: time(0 nsec) + state success: bool(false) + state zero: time(0 nsec) reaction(startup, a) -> a {= if (!a.is_present()) { diff --git a/test/known-good/Cpp/src/ActionValues.txt b/test/known-good/Cpp/src/ActionValues.txt index 724564a9a..ce460edb9 100644 --- a/test/known-good/Cpp/src/ActionValues.txt +++ b/test/known-good/Cpp/src/ActionValues.txt @@ -2,8 +2,8 @@ target Cpp main reactor ActionValues { - state r1done: bool(false) - state r2done: bool(false) + state r1done: bool(false) + state r2done: bool(false) logical action act(100 msec): int reaction(startup) -> act {= diff --git a/test/known-good/Cpp/src/ActionWithNoReaction.txt b/test/known-good/Cpp/src/ActionWithNoReaction.txt index f109761b2..b9fd15a75 100644 --- a/test/known-good/Cpp/src/ActionWithNoReaction.txt +++ b/test/known-good/Cpp/src/ActionWithNoReaction.txt @@ -7,8 +7,8 @@ } reactor foo { - input x: int - output y: int + input x: int + output y: int logical action a reaction(x) -> y, a {= @@ -18,7 +18,7 @@ } reactor print { - input x: int + input x: int reaction(x) {= std::cout << "Result is " << *x.get() << '\n'; diff --git a/test/known-good/Cpp/src/After.txt b/test/known-good/Cpp/src/After.txt index 897af476c..f981ac15f 100644 --- a/test/known-good/Cpp/src/After.txt +++ b/test/known-good/Cpp/src/After.txt @@ -6,16 +6,16 @@ } reactor foo { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= y.set(2*(*x.get())); =} } reactor print { - state expected_time: time(10 msec) - state i: int(0) - input x: int + state expected_time: time(10 msec) + state i: int(0) + input x: int reaction(x) {= i++; diff --git a/test/known-good/Cpp/src/AfterOverlapped.txt b/test/known-good/Cpp/src/AfterOverlapped.txt index c3355c60f..9e551b3c0 100644 --- a/test/known-good/Cpp/src/AfterOverlapped.txt +++ b/test/known-good/Cpp/src/AfterOverlapped.txt @@ -7,8 +7,8 @@ import Count from "lib/Count.lf" reactor Test { - input c: int - state i: int(0) + input c: int + state i: int(0) reaction(c) {= std::cout << "Received " << *c.get() << '\n'; diff --git a/test/known-good/Cpp/src/AfterZero.txt b/test/known-good/Cpp/src/AfterZero.txt index f33d91831..603f7d154 100644 --- a/test/known-good/Cpp/src/AfterZero.txt +++ b/test/known-good/Cpp/src/AfterZero.txt @@ -6,16 +6,16 @@ } reactor foo { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= y.set(2*(*x.get())); =} } reactor print { - state expected_time: time(0) - state i: int(0) - input x: int + state expected_time: time(0) + state i: int(0) + input x: int reaction(x) {= i++; diff --git a/test/known-good/Cpp/src/Alignment.txt b/test/known-good/Cpp/src/Alignment.txt index 843088288..b1f6226e4 100644 --- a/test/known-good/Cpp/src/Alignment.txt +++ b/test/known-good/Cpp/src/Alignment.txt @@ -7,8 +7,8 @@ } reactor Source { - output out: int - state count: int(1) + output out: int + state count: int(1) timer t(0, 100 msec) reaction(t) -> out {= @@ -21,9 +21,9 @@ private preamble {= #include "reactor-cpp/logging.hh" =} - input in: int - output out: bool - state primes: std::vector + input in: int + output out: bool + state primes: std::vector reaction(startup) {= // There are 1229 primes between 1 and 10,000. @@ -77,9 +77,9 @@ } reactor Destination { - input ok: bool - input in: int - state last_invoked: {= reactor::TimePoint =} + input ok: bool + input in: int + state last_invoked: {= reactor::TimePoint =} reaction(ok, in) {= if (ok.is_present() && in.is_present()) { diff --git a/test/known-good/Cpp/src/ArrayAsParameter.txt b/test/known-good/Cpp/src/ArrayAsParameter.txt index 83fb9c5b1..0b9bb8450 100644 --- a/test/known-good/Cpp/src/ArrayAsParameter.txt +++ b/test/known-good/Cpp/src/ArrayAsParameter.txt @@ -3,9 +3,9 @@ target Cpp reactor Source(sequence: int[]{0, 1, 2}) { - output out: size_t - state count: size_t{0} - logical action next: void + output out: size_t + state count: size_t{0} + logical action next: void reaction(startup, next) -> out, next {= out.set(sequence[count]); @@ -17,8 +17,8 @@ } reactor Print { - input in: size_t - state count: size_t{1} + input in: size_t + state count: size_t{1} reaction(in) {= std::cout << "Received: " << *in.get() << '\n'; diff --git a/test/known-good/Cpp/src/ArrayAsType.txt b/test/known-good/Cpp/src/ArrayAsType.txt index e4b6f6d82..b02924782 100644 --- a/test/known-good/Cpp/src/ArrayAsType.txt +++ b/test/known-good/Cpp/src/ArrayAsType.txt @@ -3,7 +3,7 @@ target Cpp reactor Source { - output out: int[3] + output out: int[3] reaction(startup) -> out {= // create a statically allocated array @@ -14,7 +14,7 @@ } reactor Print { - input in: int[3] + input in: int[3] reaction(in) {= int expected = 3; diff --git a/test/known-good/Cpp/src/ArrayPrint.txt b/test/known-good/Cpp/src/ArrayPrint.txt index 8a54ae112..02bbaa0b5 100644 --- a/test/known-good/Cpp/src/ArrayPrint.txt +++ b/test/known-good/Cpp/src/ArrayPrint.txt @@ -4,7 +4,7 @@ target Cpp reactor Source { - output out: int[3] + output out: int[3] reaction(startup) -> out {= // create a dynamically allocated mutable array @@ -19,7 +19,7 @@ } reactor Print(scale: int(1)) { - input in: int[3] + input in: int[3] reaction(in) {= int expected = 0; diff --git a/test/known-good/Cpp/src/ArrayScale.txt b/test/known-good/Cpp/src/ArrayScale.txt index e5a12a03c..e6d1566e2 100644 --- a/test/known-good/Cpp/src/ArrayScale.txt +++ b/test/known-good/Cpp/src/ArrayScale.txt @@ -6,9 +6,9 @@ import Source, Print from "ArrayPrint.lf" reactor Scale(scale: int(2)) { - input in: int[3] + input in: int[3] - output out: int[3] + output out: int[3] reaction(in) -> out {= // create a mutable copy of the received input diff --git a/test/known-good/Cpp/src/CharLiteralInitializer.txt b/test/known-good/Cpp/src/CharLiteralInitializer.txt index e60ba8cd1..f1ee48329 100644 --- a/test/known-good/Cpp/src/CharLiteralInitializer.txt +++ b/test/known-good/Cpp/src/CharLiteralInitializer.txt @@ -2,7 +2,7 @@ target Cpp main reactor CharLiteralInitializer { - state c: char('x') + state c: char('x') reaction(startup) {= if (c != 'x') { diff --git a/test/known-good/Cpp/src/Composition.txt b/test/known-good/Cpp/src/Composition.txt index ff6b04eba..da21e423f 100644 --- a/test/known-good/Cpp/src/Composition.txt +++ b/test/known-good/Cpp/src/Composition.txt @@ -6,9 +6,9 @@ } reactor Source(period: time(2 sec)) { - output y: int + output y: int timer t(1 sec, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= count++; @@ -17,8 +17,8 @@ } reactor Test { - input x: int - state count: int(0) + input x: int + state count: int(0) reaction(x) {= count++; diff --git a/test/known-good/Cpp/src/CompositionAfter.txt b/test/known-good/Cpp/src/CompositionAfter.txt index 671d82613..91294936d 100644 --- a/test/known-good/Cpp/src/CompositionAfter.txt +++ b/test/known-good/Cpp/src/CompositionAfter.txt @@ -6,9 +6,9 @@ } reactor Source(period: time(2 sec)) { - output y: int + output y: int timer t(1 sec, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= count++; @@ -17,8 +17,8 @@ } reactor Test { - input x: int - state count: int(0) + input x: int + state count: int(0) reaction(x) {= count++; diff --git a/test/known-good/Cpp/src/CompositionGain.txt b/test/known-good/Cpp/src/CompositionGain.txt index ee0694d44..bfcc6af78 100644 --- a/test/known-good/Cpp/src/CompositionGain.txt +++ b/test/known-good/Cpp/src/CompositionGain.txt @@ -2,8 +2,8 @@ target Cpp reactor Gain { - input gainin: int - output y: int + input gainin: int + output y: int reaction(gainin) -> y {= reactor::log::Info() << "Gain received " << *gainin.get(); @@ -12,8 +12,8 @@ } reactor Wrapper { - input x: int - output y: int + input x: int + output y: int gain = new Gain() x -> gain.gainin gain.y -> y diff --git a/test/known-good/Cpp/src/CountTest.txt b/test/known-good/Cpp/src/CountTest.txt index 8ac50b094..a6fd5303c 100644 --- a/test/known-good/Cpp/src/CountTest.txt +++ b/test/known-good/Cpp/src/CountTest.txt @@ -6,8 +6,8 @@ import Count from "lib/Count.lf" reactor Test { - input c: int - state i: int(0) + input c: int + state i: int(0) reaction(c) {= i++; diff --git a/test/known-good/Cpp/src/DanglingOutput.txt b/test/known-good/Cpp/src/DanglingOutput.txt index 4e5ba86ca..cde5d62d1 100644 --- a/test/known-good/Cpp/src/DanglingOutput.txt +++ b/test/known-good/Cpp/src/DanglingOutput.txt @@ -3,15 +3,15 @@ target Cpp reactor Source { - output out: int + output out: int timer t reaction(t) -> out {= out.set(1); =} } reactor Gain { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= std::cout << "Received " << *in.get() << std::endl; diff --git a/test/known-good/Cpp/src/Deadline.txt b/test/known-good/Cpp/src/Deadline.txt index d4957ea7e..c282a0bc7 100644 --- a/test/known-good/Cpp/src/Deadline.txt +++ b/test/known-good/Cpp/src/Deadline.txt @@ -9,9 +9,9 @@ private preamble {= #include =} - output y: int + output y: int timer t(0, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= if (count % 2 == 1) { @@ -26,8 +26,8 @@ } reactor Destination(timeout: time(1 sec)) { - input x: int - state count: int(0) + input x: int + state count: int(0) reaction(x) {= std::cout << "Destination receives: " << *x.get() << std::endl; diff --git a/test/known-good/Cpp/src/DeadlineHandledAbove.txt b/test/known-good/Cpp/src/DeadlineHandledAbove.txt index 71c408cbc..6675653f6 100644 --- a/test/known-good/Cpp/src/DeadlineHandledAbove.txt +++ b/test/known-good/Cpp/src/DeadlineHandledAbove.txt @@ -3,8 +3,8 @@ target Cpp reactor Deadline(threshold: time(100 msec)) { - input x: int - output deadline_violation: bool + input x: int + output deadline_violation: bool reaction(x) -> deadline_violation {= std::cerr << "ERROR: Deadline violation was not detected!" << std::endl; @@ -16,7 +16,7 @@ } main reactor DeadlineHandledAbove { - state violation_detected: bool({= false =}) + state violation_detected: bool({= false =}) d = new Deadline(threshold = 10 msec) reaction(startup) -> d.x {= diff --git a/test/known-good/Cpp/src/DelayInt.txt b/test/known-good/Cpp/src/DelayInt.txt index cfb8edee7..2e957252c 100644 --- a/test/known-good/Cpp/src/DelayInt.txt +++ b/test/known-good/Cpp/src/DelayInt.txt @@ -2,9 +2,9 @@ target Cpp reactor Delay(delay: time(100 msec)) { - input in: int - output out: int - logical action d: int + input in: int + output out: int + logical action d: int reaction(in) -> d {= d.schedule(in.get(), delay); =} @@ -16,8 +16,8 @@ } reactor Test { - input in: int - state start_time: {= reactor::TimePoint =} + input in: int + state start_time: {= reactor::TimePoint =} timer start reaction(start) {= diff --git a/test/known-good/Cpp/src/DelayedAction.txt b/test/known-good/Cpp/src/DelayedAction.txt index d8da324d1..a2db96f5f 100644 --- a/test/known-good/Cpp/src/DelayedAction.txt +++ b/test/known-good/Cpp/src/DelayedAction.txt @@ -5,8 +5,8 @@ main reactor DelayedAction { timer t(0, 1 sec) - logical action a: void - state count: int(0) + logical action a: void + state count: int(0) reaction(t) -> a {= a.schedule(100ms); =} diff --git a/test/known-good/Cpp/src/DelayedReaction.txt b/test/known-good/Cpp/src/DelayedReaction.txt index 86ff113c2..e52ce70b2 100644 --- a/test/known-good/Cpp/src/DelayedReaction.txt +++ b/test/known-good/Cpp/src/DelayedReaction.txt @@ -2,13 +2,13 @@ target Cpp reactor Source { - output out: void + output out: void reaction(startup) -> out {= out.set(); =} } reactor Sink { - input in: void + input in: void reaction(in) {= auto elapsed = get_elapsed_logical_time(); diff --git a/test/known-good/Cpp/src/Determinism.txt b/test/known-good/Cpp/src/Determinism.txt index ea6cdc9b9..d40c79fc3 100644 --- a/test/known-good/Cpp/src/Determinism.txt +++ b/test/known-good/Cpp/src/Determinism.txt @@ -1,15 +1,15 @@ target Cpp reactor Source { - output y: int + output y: int timer t reaction(t) -> y {= y.set(1); =} } reactor Destination { - input x: int - input y: int + input x: int + input y: int reaction(x, y) {= int sum = 0; @@ -28,8 +28,8 @@ } reactor Pass { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= y.set(x.get()); =} } diff --git a/test/known-good/Cpp/src/DoubleInvocation.txt b/test/known-good/Cpp/src/DoubleInvocation.txt index d49b2754e..8301dff67 100644 --- a/test/known-good/Cpp/src/DoubleInvocation.txt +++ b/test/known-good/Cpp/src/DoubleInvocation.txt @@ -12,9 +12,9 @@ } reactor Ball { - output position: int - output velocity: int - state p: int(200) + output position: int + output velocity: int + state p: int(200) timer trigger(0, 1 sec) reaction(trigger) -> position, velocity {= @@ -25,9 +25,9 @@ } reactor Print { - input velocity: int - input position: int - state previous: int(-1) + input velocity: int + input position: int + state previous: int(-1) reaction(startup) {= reactor::log::Info() << "####### Print startup"; diff --git a/test/known-good/Cpp/src/DoublePort.txt b/test/known-good/Cpp/src/DoublePort.txt index 2652bb818..f6f90a90e 100644 --- a/test/known-good/Cpp/src/DoublePort.txt +++ b/test/known-good/Cpp/src/DoublePort.txt @@ -13,9 +13,9 @@ import Count from "lib/Count.lf" reactor CountMicrostep { - state count: int(1) - output out: int - logical action act: int + state count: int(1) + output out: int + logical action act: int timer t(0, 1 sec) reaction(t) -> act {= @@ -27,8 +27,8 @@ } reactor Print { - input in: int - input in2: int + input in: int + input in2: int reaction(in, in2) {= if(in.is_present()){ diff --git a/test/known-good/Cpp/src/DoubleReaction.txt b/test/known-good/Cpp/src/DoubleReaction.txt index 67de428f6..5d815b1c3 100644 --- a/test/known-good/Cpp/src/DoubleReaction.txt +++ b/test/known-good/Cpp/src/DoubleReaction.txt @@ -6,9 +6,9 @@ } reactor Clock(offset: time(0), period: time(1 sec)) { - output y: int + output y: int timer t(offset, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= count++; @@ -17,9 +17,9 @@ } reactor Destination { - input x: int - input w: int - state s: int(2) + input x: int + input w: int + state s: int(2) reaction(x, w) {= int sum = 0; diff --git a/test/known-good/Cpp/src/DoubleTrigger.txt b/test/known-good/Cpp/src/DoubleTrigger.txt index 86bc29e3e..b10cce55d 100644 --- a/test/known-good/Cpp/src/DoubleTrigger.txt +++ b/test/known-good/Cpp/src/DoubleTrigger.txt @@ -5,7 +5,7 @@ main reactor DoubleTrigger { timer t1 timer t2 - state s: int(0) + state s: int(0) reaction(t1, t2) {= s++; diff --git a/test/known-good/Cpp/src/FloatLiteral.txt b/test/known-good/Cpp/src/FloatLiteral.txt index 13428db45..d6708b640 100644 --- a/test/known-good/Cpp/src/FloatLiteral.txt +++ b/test/known-good/Cpp/src/FloatLiteral.txt @@ -2,10 +2,10 @@ // This test verifies that floating-point literals are handled correctly. main reactor { - state N: double(6.0221409e+23) - state charge: double(-1.6021766E-19) - state minus_epsilon: double(-.01e0) - state expected: double(.964853323188E5) + state N: double(6.0221409e+23) + state charge: double(-1.6021766E-19) + state minus_epsilon: double(-.01e0) + state expected: double(.964853323188E5) reaction(startup) {= auto F = - N * charge; diff --git a/test/known-good/Cpp/src/Gain.txt b/test/known-good/Cpp/src/Gain.txt index 8b69ca818..a620b416c 100644 --- a/test/known-good/Cpp/src/Gain.txt +++ b/test/known-good/Cpp/src/Gain.txt @@ -2,14 +2,14 @@ target Cpp reactor Scale(scale: int(2)) { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= y.set(*x.get() * scale); =} } reactor Test { - input x: int + input x: int reaction(x) {= auto value = *x.get(); diff --git a/test/known-good/Cpp/src/GetMicroStep.txt b/test/known-good/Cpp/src/GetMicroStep.txt index 5761914fd..ed22677a8 100644 --- a/test/known-good/Cpp/src/GetMicroStep.txt +++ b/test/known-good/Cpp/src/GetMicroStep.txt @@ -2,7 +2,7 @@ target Cpp main reactor GetMicroStep { - state s: {= reactor::mstep_t =}(1) + state s: {= reactor::mstep_t =}(1) logical action l diff --git a/test/known-good/Cpp/src/Hello.txt b/test/known-good/Cpp/src/Hello.txt index 91fdfc223..b5379ff3c 100644 --- a/test/known-good/Cpp/src/Hello.txt +++ b/test/known-good/Cpp/src/Hello.txt @@ -9,10 +9,10 @@ } reactor HelloCpp(period: time(2 sec), message: {= std::string =}("Hello C++")) { - state count: int(0) - state previous_time: {= reactor::TimePoint =} + state count: int(0) + state previous_time: {= reactor::TimePoint =} timer t(1 sec, period) - logical action a: void + logical action a: void reaction(t) -> a {= std::cout << message << std::endl; diff --git a/test/known-good/Cpp/src/Hierarchy.txt b/test/known-good/Cpp/src/Hierarchy.txt index 43d70324f..0db87d1f8 100644 --- a/test/known-good/Cpp/src/Hierarchy.txt +++ b/test/known-good/Cpp/src/Hierarchy.txt @@ -2,21 +2,21 @@ target Cpp reactor Source { - output out: int + output out: int timer t reaction(t) -> out {= out.set(1); =} } reactor Gain { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= out.set((*in.get()) * 2); =} } reactor Print { - input in: int + input in: int reaction(in) {= auto value = *in.get(); @@ -29,9 +29,9 @@ } reactor GainContainer { - input in: int - output out: int - output out2: int + input in: int + output out: int + output out2: int gain = new Gain() in -> gain.in gain.out -> out diff --git a/test/known-good/Cpp/src/Hierarchy2.txt b/test/known-good/Cpp/src/Hierarchy2.txt index 29d892221..9603dac73 100644 --- a/test/known-good/Cpp/src/Hierarchy2.txt +++ b/test/known-good/Cpp/src/Hierarchy2.txt @@ -5,16 +5,16 @@ } reactor Source { - output out: int + output out: int timer t(0, 1 sec) reaction(t) -> out {= out.set(1); =} } reactor Count { - output out: int + output out: int timer t(0, 1 sec) - state i: int(0) + state i: int(0) reaction(t) -> out {= i++; @@ -23,9 +23,9 @@ } reactor Add { - input in1: int - input in2: int - output out: int + input in1: int + input in2: int + output out: int reaction(in1, in2) -> out {= int result = 0; @@ -36,8 +36,8 @@ } reactor Print { - input in: int - state expected: int(2) + input in: int + state expected: int(2) reaction(in) {= auto value = *in.get(); @@ -51,8 +51,8 @@ } reactor AddCount { - input in: int - output out: int + input in: int + output out: int count = new Count() add = new Add() in -> add.in1 diff --git a/test/known-good/Cpp/src/ImportComposition.txt b/test/known-good/Cpp/src/ImportComposition.txt index 2108a3126..6bff7fb76 100644 --- a/test/known-good/Cpp/src/ImportComposition.txt +++ b/test/known-good/Cpp/src/ImportComposition.txt @@ -16,7 +16,7 @@ =} imp_comp = new ImportedComposition() - state received: bool(false) + state received: bool(false) reaction(startup) -> imp_comp.x {= imp_comp.x.set(42); =} diff --git a/test/known-good/Cpp/src/ManualDelayedReaction.txt b/test/known-good/Cpp/src/ManualDelayedReaction.txt index 284493098..87264a945 100644 --- a/test/known-good/Cpp/src/ManualDelayedReaction.txt +++ b/test/known-good/Cpp/src/ManualDelayedReaction.txt @@ -2,9 +2,9 @@ // That's the stuff that shall be generated for the after reactor GeneratedDelay { - input y_in: int - output y_out: int - state y_state: int(0) + input y_in: int + output y_out: int + state y_state: int(0) logical action act(100 msec): int @@ -14,7 +14,7 @@ } reactor Source { - output out: int + output out: int timer t // reaction(t) -> out after 100 msec {= @@ -22,7 +22,7 @@ } reactor Sink { - input in: int + input in: int reaction(in) {= auto elapsed_logical = get_elapsed_logical_time(); diff --git a/test/known-good/Cpp/src/Methods.txt b/test/known-good/Cpp/src/Methods.txt index cb1e6e48c..71e2e2a44 100644 --- a/test/known-good/Cpp/src/Methods.txt +++ b/test/known-good/Cpp/src/Methods.txt @@ -1,7 +1,7 @@ target Cpp main reactor { - state foo: int(2) + state foo: int(2) const method getFoo(): int {= return foo; =} diff --git a/test/known-good/Cpp/src/Microsteps.txt b/test/known-good/Cpp/src/Microsteps.txt index f39516639..0cedf2915 100644 --- a/test/known-good/Cpp/src/Microsteps.txt +++ b/test/known-good/Cpp/src/Microsteps.txt @@ -1,8 +1,8 @@ target Cpp reactor Destination { - input x: int - input y: int + input x: int + input y: int reaction(x, y) {= auto elapsed = get_elapsed_logical_time(); @@ -31,7 +31,7 @@ main reactor Microsteps { timer start - logical action repeat: void + logical action repeat: void d = new Destination() reaction(start) -> d.x, repeat {= diff --git a/test/known-good/Cpp/src/MovingAverage.txt b/test/known-good/Cpp/src/MovingAverage.txt index 8d2239334..b6759bdbd 100644 --- a/test/known-good/Cpp/src/MovingAverage.txt +++ b/test/known-good/Cpp/src/MovingAverage.txt @@ -7,8 +7,8 @@ } reactor Source { - output out: double - state count: int{0} + output out: double + state count: int{0} timer clock(0, 200 msec) reaction(clock) -> out {= @@ -18,10 +18,10 @@ } reactor MovingAverageImpl { - state delay_line: double[3]{0.0, 0.0, 0.0} - state index: int{0} - input in: double - output out: double + state delay_line: double[3]{0.0, 0.0, 0.0} + state index: int{0} + input in: double + output out: double reaction(in) -> out {= // Calculate the output. @@ -43,8 +43,8 @@ } reactor Print { - input in: double - state count: int{0} + input in: double + state count: int{0} reaction(in) {= std::cout << "Received: " << *in.get() << '\n'; diff --git a/test/known-good/Cpp/src/MultipleContained.txt b/test/known-good/Cpp/src/MultipleContained.txt index a85f98d29..f6bc604b0 100644 --- a/test/known-good/Cpp/src/MultipleContained.txt +++ b/test/known-good/Cpp/src/MultipleContained.txt @@ -3,9 +3,9 @@ target Cpp reactor Contained { - output trigger: int - input in1: int - input in2: int + output trigger: int + input in1: int + input in2: int reaction(startup) -> trigger {= trigger.set(42); =} diff --git a/test/known-good/Cpp/src/NativeListsAndTimes.txt b/test/known-good/Cpp/src/NativeListsAndTimes.txt index c465d31b4..79cc1fffc 100644 --- a/test/known-good/Cpp/src/NativeListsAndTimes.txt +++ b/test/known-good/Cpp/src/NativeListsAndTimes.txt @@ -11,16 +11,16 @@ =}{1 msec, 2 msec, 3 msec}, g: time[]{1 msec, 2 msec} // List of time values ) { - state s: time(y) // Reference to explicitly typed time parameter - state t: time(z) // Reference to implicitly typed time parameter - state v: bool // Uninitialized boolean state variable - state w: time // Uninitialized time state variable + state s: time(y) // Reference to explicitly typed time parameter + state t: time(z) // Reference to implicitly typed time parameter + state v: bool // Uninitialized boolean state variable + state w: time // Uninitialized time state variable timer tick(0) // Units missing but not required timer tock(1 sec) // Implicit type time timer toe(z) // Implicit type time state baz(p) // Implicit type int[] state period(z) // Implicit type time - state times: std::vector< // a list of lists + state times: std::vector< // a list of lists std::vector<{= reactor::Duration =}> >{q, g} diff --git a/test/known-good/Cpp/src/NestedTriggeredReactions.txt b/test/known-good/Cpp/src/NestedTriggeredReactions.txt index 3cb39e48a..74e5e75f2 100644 --- a/test/known-good/Cpp/src/NestedTriggeredReactions.txt +++ b/test/known-good/Cpp/src/NestedTriggeredReactions.txt @@ -1,9 +1,9 @@ target Cpp reactor Container { - input in: void + input in: void - state triggered: bool{false} + state triggered: bool{false} contained = new Contained() @@ -20,9 +20,9 @@ } reactor Contained { - input in: void + input in: void - state triggered: bool{false} + state triggered: bool{false} reaction(in) {= triggered = true; =} diff --git a/test/known-good/Cpp/src/PhysicalConnection.txt b/test/known-good/Cpp/src/PhysicalConnection.txt index 86a4270a6..ecbf469e8 100644 --- a/test/known-good/Cpp/src/PhysicalConnection.txt +++ b/test/known-good/Cpp/src/PhysicalConnection.txt @@ -2,15 +2,15 @@ target Cpp reactor Source { - output out: int + output out: int reaction(startup) -> out {= out.set(42); =} } reactor Destination { - input in: int + input in: int - state received: bool(false) + state received: bool(false) reaction(in) {= auto time = get_elapsed_logical_time(); diff --git a/test/known-good/Cpp/src/Pipeline.txt b/test/known-good/Cpp/src/Pipeline.txt index 6fb0a9625..d91eaa112 100644 --- a/test/known-good/Cpp/src/Pipeline.txt +++ b/test/known-good/Cpp/src/Pipeline.txt @@ -5,8 +5,8 @@ import Computation from "concurrent/Threaded.lf" reactor Print { - input in: int - state count: int(0) + input in: int + state count: int(0) reaction(in) {= std::cout << "Received: " << *in.get() << '\n'; @@ -27,7 +27,7 @@ main reactor Pipeline { timer t(0, 200 msec) - state count: int(0) + state count: int(0) c1 = new Computation() c2 = new Computation() diff --git a/test/known-good/Cpp/src/PreambleTest.txt b/test/known-good/Cpp/src/PreambleTest.txt index 7bf1f2319..2fe9d0c8b 100644 --- a/test/known-good/Cpp/src/PreambleTest.txt +++ b/test/known-good/Cpp/src/PreambleTest.txt @@ -20,7 +20,7 @@ return i + 42; } =} - logical action a: MyStruct + logical action a: MyStruct reaction(startup) -> a {= a.schedule({add_42(42), "baz"}); =} diff --git a/test/known-good/Cpp/src/ReadOutputOfContainedReactor.txt b/test/known-good/Cpp/src/ReadOutputOfContainedReactor.txt index 1848c644b..b69787bee 100644 --- a/test/known-good/Cpp/src/ReadOutputOfContainedReactor.txt +++ b/test/known-good/Cpp/src/ReadOutputOfContainedReactor.txt @@ -3,14 +3,14 @@ target Cpp reactor Contained { - output out: int + output out: int reaction(startup) -> out {= out.set(42); =} } main reactor ReadOutputOfContainedReactor { c = new Contained() - state count: int(0) + state count: int(0) reaction(startup) c.out {= std::cout << "Startup reaction reading output of contained " diff --git a/test/known-good/Cpp/src/Schedule.txt b/test/known-good/Cpp/src/Schedule.txt index eb8da865b..270c3bd33 100644 --- a/test/known-good/Cpp/src/Schedule.txt +++ b/test/known-good/Cpp/src/Schedule.txt @@ -2,8 +2,8 @@ target Cpp reactor ScheduleTest { - input x: int - logical action a: void + input x: int + logical action a: void reaction(x) -> a {= a.schedule(200ms); =} diff --git a/test/known-good/Cpp/src/ScheduleLogicalAction.txt b/test/known-good/Cpp/src/ScheduleLogicalAction.txt index 10851557b..3d8fa229a 100644 --- a/test/known-good/Cpp/src/ScheduleLogicalAction.txt +++ b/test/known-good/Cpp/src/ScheduleLogicalAction.txt @@ -12,9 +12,9 @@ } reactor foo { - input x: int - output y: int - logical action a: void + input x: int + output y: int + logical action a: void reaction(x) -> y, a {= y.set( 2*(*x.get())); @@ -26,8 +26,8 @@ } reactor print { - state expected_time: time(0) - input x: int + state expected_time: time(0) + input x: int reaction(x) {= auto elapsed_time = get_elapsed_logical_time(); diff --git a/test/known-good/Cpp/src/SelfLoop.txt b/test/known-good/Cpp/src/SelfLoop.txt index 7e06dbc83..cb4d3d128 100644 --- a/test/known-good/Cpp/src/SelfLoop.txt +++ b/test/known-good/Cpp/src/SelfLoop.txt @@ -9,10 +9,10 @@ } reactor Self { - input x: int - output y: int - logical action a: int - state expected: int(43) + input x: int + output y: int + logical action a: int + state expected: int(43) reaction(a) -> y {= reactor::log::Info() << "a = " << *a.get(); diff --git a/test/known-good/Cpp/src/SendingInside.txt b/test/known-good/Cpp/src/SendingInside.txt index 4fa203397..634b18744 100644 --- a/test/known-good/Cpp/src/SendingInside.txt +++ b/test/known-good/Cpp/src/SendingInside.txt @@ -6,8 +6,8 @@ } reactor Printer { - input x: int - state count: int(1) + input x: int + state count: int(1) reaction(x) {= std::cout << "Inside reactor received: " << *x.get() << std::endl; @@ -20,7 +20,7 @@ } main reactor SendingInside { - state count: int(0) + state count: int(0) timer t(0, 1 sec) p = new Printer() diff --git a/test/known-good/Cpp/src/SendingInside2.txt b/test/known-good/Cpp/src/SendingInside2.txt index 2dae7747d..4755825f1 100644 --- a/test/known-good/Cpp/src/SendingInside2.txt +++ b/test/known-good/Cpp/src/SendingInside2.txt @@ -1,7 +1,7 @@ target Cpp reactor Printer { - input x: int + input x: int reaction(x) {= std::cout << "Inside reactor received: " << *x.get() << std::endl; diff --git a/test/known-good/Cpp/src/SimpleDeadline.txt b/test/known-good/Cpp/src/SimpleDeadline.txt index e1997db70..d2a470e71 100644 --- a/test/known-good/Cpp/src/SimpleDeadline.txt +++ b/test/known-good/Cpp/src/SimpleDeadline.txt @@ -7,8 +7,8 @@ private preamble {= #include =} - input x: int - output deadlineViolation: bool + input x: int + output deadlineViolation: bool reaction(x) -> deadlineViolation {= std::cerr << "ERROR: Deadline violation was not detected!" << std::endl; @@ -20,7 +20,7 @@ } reactor Print { - input in: bool + input in: bool reaction(in) {= if (*in.get()) { diff --git a/test/known-good/Cpp/src/SlowingClock.txt b/test/known-good/Cpp/src/SlowingClock.txt index 2e2db85c0..f82bc945d 100644 --- a/test/known-good/Cpp/src/SlowingClock.txt +++ b/test/known-good/Cpp/src/SlowingClock.txt @@ -15,8 +15,8 @@ main reactor SlowingClock { logical action a(100 msec) - state interval: time(100 msec) - state expected_time: time(100 msec) + state interval: time(100 msec) + state expected_time: time(100 msec) reaction(startup) -> a {= a.schedule(0ns); =} diff --git a/test/known-good/Cpp/src/SlowingClockPhysical.txt b/test/known-good/Cpp/src/SlowingClockPhysical.txt index 1a96cbfde..293c3ede5 100644 --- a/test/known-good/Cpp/src/SlowingClockPhysical.txt +++ b/test/known-good/Cpp/src/SlowingClockPhysical.txt @@ -15,8 +15,8 @@ main reactor SlowingClockPhysical { physical action a - state interval: time(100 msec) - state expected_time: time(100 msec) + state interval: time(100 msec) + state expected_time: time(100 msec) reaction(startup) -> a {= expected_time=100ms; diff --git a/test/known-good/Cpp/src/StartupOutFromInside.txt b/test/known-good/Cpp/src/StartupOutFromInside.txt index 4056e2d9a..a16d53828 100644 --- a/test/known-good/Cpp/src/StartupOutFromInside.txt +++ b/test/known-good/Cpp/src/StartupOutFromInside.txt @@ -6,7 +6,7 @@ target Cpp reactor Bar { - output out: int + output out: int reaction(startup) -> out {= out.set(42); =} } diff --git a/test/known-good/Cpp/src/Stride.txt b/test/known-good/Cpp/src/Stride.txt index c90b32a7c..46e92eece 100644 --- a/test/known-good/Cpp/src/Stride.txt +++ b/test/known-good/Cpp/src/Stride.txt @@ -6,8 +6,8 @@ } reactor Count(stride: int(1)) { - state count: int(0) - output y: int + state count: int(0) + output y: int timer t(0, 100 msec) reaction(t) -> y {= @@ -17,7 +17,7 @@ } reactor Display { - input x: int + input x: int reaction(x) {= std::cout << "Received " << *x.get() << std::endl; =} } diff --git a/test/known-good/Cpp/src/StructAsState.txt b/test/known-good/Cpp/src/StructAsState.txt index 02d620e27..a55694456 100644 --- a/test/known-good/Cpp/src/StructAsState.txt +++ b/test/known-good/Cpp/src/StructAsState.txt @@ -6,7 +6,7 @@ =} main reactor StructAsState { - state s: Hello{"Earth", 42} + state s: Hello{"Earth", 42} reaction(startup) {= std::cout << "State s.name=" << s.name << ", s.value=" << s.value << '\n'; diff --git a/test/known-good/Cpp/src/StructAsType.txt b/test/known-good/Cpp/src/StructAsType.txt index 297ed17e0..f89f7e402 100644 --- a/test/known-good/Cpp/src/StructAsType.txt +++ b/test/known-good/Cpp/src/StructAsType.txt @@ -8,7 +8,7 @@ =} reactor StaticSource { - output out: Hello + output out: Hello reaction(startup) -> out {= Hello hello{"Earth", 42}; diff --git a/test/known-good/Cpp/src/StructAsTypeDirect.txt b/test/known-good/Cpp/src/StructAsTypeDirect.txt index ccf6db9ee..7b8901df2 100644 --- a/test/known-good/Cpp/src/StructAsTypeDirect.txt +++ b/test/known-good/Cpp/src/StructAsTypeDirect.txt @@ -8,7 +8,7 @@ =} reactor DirectSource { - output out: Hello + output out: Hello reaction(startup) -> out {= // this implicitly creates a new hello object which is then send diff --git a/test/known-good/Cpp/src/StructPrint.txt b/test/known-good/Cpp/src/StructPrint.txt index b3a903f1f..66e9876f3 100644 --- a/test/known-good/Cpp/src/StructPrint.txt +++ b/test/known-good/Cpp/src/StructPrint.txt @@ -6,7 +6,7 @@ =} reactor Source { - output out: Hello + output out: Hello reaction(startup) -> out {= // create an dynamically allocated mutable Hello object @@ -22,7 +22,7 @@ expected_value: int(42), expected_name: {= std::string =}("Earth") ) { - input in: Hello + input in: Hello reaction(in) {= // get a reference to the received struct for convenience diff --git a/test/known-good/Cpp/src/StructScale.txt b/test/known-good/Cpp/src/StructScale.txt index 6d74e3b55..4d243c9de 100644 --- a/test/known-good/Cpp/src/StructScale.txt +++ b/test/known-good/Cpp/src/StructScale.txt @@ -10,9 +10,9 @@ =} reactor Scale(scale: int(2)) { - input in: Hello + input in: Hello - output out: Hello + output out: Hello reaction(in) -> out {= auto hello = in.get().get_mutable_copy(); diff --git a/test/known-good/Cpp/src/TestForPreviousOutput.txt b/test/known-good/Cpp/src/TestForPreviousOutput.txt index b16062637..efc84f1d5 100644 --- a/test/known-good/Cpp/src/TestForPreviousOutput.txt +++ b/test/known-good/Cpp/src/TestForPreviousOutput.txt @@ -3,7 +3,7 @@ target Cpp reactor Source { - output out: int + output out: int reaction(startup) -> out {= // Set a seed for random number generation based on the current time. @@ -25,7 +25,7 @@ } reactor Sink { - input in: int + input in: int reaction(in) {= std::cout << "Received: " << *in.get() << '\n'; diff --git a/test/known-good/Cpp/src/TimeLimit.txt b/test/known-good/Cpp/src/TimeLimit.txt index b2ecf50bc..559351e44 100644 --- a/test/known-good/Cpp/src/TimeLimit.txt +++ b/test/known-good/Cpp/src/TimeLimit.txt @@ -6,9 +6,9 @@ } reactor Clock(offset: time(0), period: time(1 sec)) { - output y: int + output y: int timer t(offset, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= count++; @@ -18,8 +18,8 @@ } reactor Destination { - input x: int - state s: int(1) + input x: int + state s: int(1) reaction(x) {= //std::cout << "Received " << *x.get() << '\n'; diff --git a/test/known-good/Cpp/src/Timeout_Test.txt b/test/known-good/Cpp/src/Timeout_Test.txt index 7a1e47a76..41eaff558 100644 --- a/test/known-good/Cpp/src/Timeout_Test.txt +++ b/test/known-good/Cpp/src/Timeout_Test.txt @@ -12,8 +12,8 @@ import Sender from "lib/LoopedActionSender.lf" reactor Consumer { - input in: int - state success: bool(false) + input in: int + state success: bool(false) reaction(in) {= auto current{get_elapsed_logical_time()}; diff --git a/test/known-good/Cpp/src/ToReactionNested.txt b/test/known-good/Cpp/src/ToReactionNested.txt index dcab0f58f..72c922993 100644 --- a/test/known-good/Cpp/src/ToReactionNested.txt +++ b/test/known-good/Cpp/src/ToReactionNested.txt @@ -6,14 +6,14 @@ import Count from "lib/Count.lf" reactor CountContainer { - output out: int + output out: int c1 = new Count() c1.c -> out } main reactor { - state count: int(1) - state received: bool(false) + state count: int(1) + state received: bool(false) s = new CountContainer() diff --git a/test/known-good/Cpp/src/TriggerDownstreamOnlyIfPresent2.txt b/test/known-good/Cpp/src/TriggerDownstreamOnlyIfPresent2.txt index c5ea1c967..d34a10fe8 100644 --- a/test/known-good/Cpp/src/TriggerDownstreamOnlyIfPresent2.txt +++ b/test/known-good/Cpp/src/TriggerDownstreamOnlyIfPresent2.txt @@ -13,7 +13,7 @@ reactor Source { output[2] out: int - state count: int(0) + state count: int(0) timer t(0, 200 msec) reaction(t) -> out {= @@ -26,7 +26,7 @@ } reactor Destination { - input in: int + input in: int reaction(in) {= if(!in.is_present()){ diff --git a/test/known-good/Cpp/src/concurrent/AsyncCallback.txt b/test/known-good/Cpp/src/concurrent/AsyncCallback.txt index f3b77cabe..07784be58 100644 --- a/test/known-good/Cpp/src/concurrent/AsyncCallback.txt +++ b/test/known-good/Cpp/src/concurrent/AsyncCallback.txt @@ -10,12 +10,12 @@ =} timer t(0, 200 msec) - state thread: {= std::thread =} - state expected_time: time(100 msec) - state toggle: bool(false) + state thread: {= std::thread =} + state expected_time: time(100 msec) + state toggle: bool(false) - physical action a: int - state i: int(0) + physical action a: int + state i: int(0) reaction(t) -> a {= // make sure to join the old thread first diff --git a/test/known-good/Cpp/src/concurrent/AsyncCallback2.txt b/test/known-good/Cpp/src/concurrent/AsyncCallback2.txt index 804c4c4b6..4c4b400e1 100644 --- a/test/known-good/Cpp/src/concurrent/AsyncCallback2.txt +++ b/test/known-good/Cpp/src/concurrent/AsyncCallback2.txt @@ -10,10 +10,10 @@ =} timer t(0, 200 msec) - state expected_time: time(0) + state expected_time: time(0) - logical action a: int - state i: int(0) + logical action a: int + state i: int(0) reaction(t) -> a {= // start new thread diff --git a/test/known-good/Cpp/src/concurrent/CompositionThreaded.txt b/test/known-good/Cpp/src/concurrent/CompositionThreaded.txt index 84256fdf2..6c847b93a 100644 --- a/test/known-good/Cpp/src/concurrent/CompositionThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/CompositionThreaded.txt @@ -6,9 +6,9 @@ } reactor Source(period: time(2 sec)) { - output y: int + output y: int timer t(1 sec, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= count++; @@ -17,8 +17,8 @@ } reactor Test { - input x: int - state count: int(0) + input x: int + state count: int(0) reaction(x) {= count++; diff --git a/test/known-good/Cpp/src/concurrent/DeadlineHandledAboveThreaded.txt b/test/known-good/Cpp/src/concurrent/DeadlineHandledAboveThreaded.txt index 6d95df04f..937613b4a 100644 --- a/test/known-good/Cpp/src/concurrent/DeadlineHandledAboveThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/DeadlineHandledAboveThreaded.txt @@ -3,8 +3,8 @@ target Cpp reactor Deadline(threshold: time(100 msec)) { - input x: int - output deadline_violation: bool + input x: int + output deadline_violation: bool reaction(x) -> deadline_violation {= std::cerr << "ERROR: Deadline violation was not detected!" << std::endl; @@ -16,7 +16,7 @@ } main reactor { - state violation_detected: bool({= false =}) + state violation_detected: bool({= false =}) d = new Deadline(threshold = 10 msec) reaction(startup) -> d.x {= diff --git a/test/known-good/Cpp/src/concurrent/DeadlineThreaded.txt b/test/known-good/Cpp/src/concurrent/DeadlineThreaded.txt index 0d26cbb0d..bcff9fc47 100644 --- a/test/known-good/Cpp/src/concurrent/DeadlineThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/DeadlineThreaded.txt @@ -9,9 +9,9 @@ private preamble {= #include =} - output y: int + output y: int timer t(0, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= if (count % 2 == 1) { @@ -26,8 +26,8 @@ } reactor Destination(timeout: time(1 sec)) { - input x: int - state count: int(0) + input x: int + state count: int(0) reaction(x) {= std::cout << "Destination receives: " << *x.get() << std::endl; diff --git a/test/known-good/Cpp/src/concurrent/DelayIntThreaded.txt b/test/known-good/Cpp/src/concurrent/DelayIntThreaded.txt index cb420da4e..371e80e3f 100644 --- a/test/known-good/Cpp/src/concurrent/DelayIntThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/DelayIntThreaded.txt @@ -2,9 +2,9 @@ target Cpp reactor Delay(delay: time(100 msec)) { - input in: int - output out: int - logical action d: int + input in: int + output out: int + logical action d: int reaction(in) -> d {= d.schedule(in.get(), delay); =} @@ -16,8 +16,8 @@ } reactor Test { - input in: int - state start_time: {= reactor::TimePoint =} + input in: int + state start_time: {= reactor::TimePoint =} timer start reaction(start) {= diff --git a/test/known-good/Cpp/src/concurrent/DeterminismThreaded.txt b/test/known-good/Cpp/src/concurrent/DeterminismThreaded.txt index 75a2db022..05a7416d7 100644 --- a/test/known-good/Cpp/src/concurrent/DeterminismThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/DeterminismThreaded.txt @@ -1,15 +1,15 @@ target Cpp reactor Source { - output y: int + output y: int timer t reaction(t) -> y {= y.set(1); =} } reactor Destination { - input x: int - input y: int + input x: int + input y: int reaction(x, y) {= int sum = 0; @@ -28,8 +28,8 @@ } reactor Pass { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= y.set(x.get()); =} } diff --git a/test/known-good/Cpp/src/concurrent/DoubleReactionThreaded.txt b/test/known-good/Cpp/src/concurrent/DoubleReactionThreaded.txt index 1e2fb2136..7a6155215 100644 --- a/test/known-good/Cpp/src/concurrent/DoubleReactionThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/DoubleReactionThreaded.txt @@ -6,9 +6,9 @@ } reactor Clock(offset: time(0), period: time(1 sec)) { - output y: int + output y: int timer t(offset, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= count++; @@ -17,9 +17,9 @@ } reactor Destination { - input x: int - input w: int - state s: int(2) + input x: int + input w: int + state s: int(2) reaction(x, w) {= int sum = 0; diff --git a/test/known-good/Cpp/src/concurrent/GainThreaded.txt b/test/known-good/Cpp/src/concurrent/GainThreaded.txt index b468bd180..78439dafa 100644 --- a/test/known-good/Cpp/src/concurrent/GainThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/GainThreaded.txt @@ -2,14 +2,14 @@ target Cpp reactor Scale(scale: int(2)) { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= y.set(*x.get() * scale); =} } reactor Test { - input x: int + input x: int reaction(x) {= auto value = *x.get(); diff --git a/test/known-good/Cpp/src/concurrent/HelloThreaded.txt b/test/known-good/Cpp/src/concurrent/HelloThreaded.txt index 4a56f151e..8ca001820 100644 --- a/test/known-good/Cpp/src/concurrent/HelloThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/HelloThreaded.txt @@ -9,10 +9,10 @@ } reactor HelloCpp(period: time(2 sec), message: {= std::string =}("Hello C++")) { - state count: int(0) - state previous_time: {= reactor::TimePoint =} + state count: int(0) + state previous_time: {= reactor::TimePoint =} timer t(1 sec, period) - logical action a: void + logical action a: void reaction(t) -> a {= std::cout << message << std::endl; diff --git a/test/known-good/Cpp/src/concurrent/SendingInsideThreaded.txt b/test/known-good/Cpp/src/concurrent/SendingInsideThreaded.txt index 353136867..f764ace4c 100644 --- a/test/known-good/Cpp/src/concurrent/SendingInsideThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/SendingInsideThreaded.txt @@ -6,8 +6,8 @@ } reactor Printer { - input x: int - state count: int(1) + input x: int + state count: int(1) reaction(x) {= std::cout << "Inside reactor received: " << *x.get() << std::endl; @@ -20,7 +20,7 @@ } main reactor { - state count: int(0) + state count: int(0) timer t(0, 1 sec) p = new Printer() diff --git a/test/known-good/Cpp/src/concurrent/Threaded.txt b/test/known-good/Cpp/src/concurrent/Threaded.txt index c083cae93..136ff7596 100644 --- a/test/known-good/Cpp/src/concurrent/Threaded.txt +++ b/test/known-good/Cpp/src/concurrent/Threaded.txt @@ -12,8 +12,8 @@ reactor Source { timer t(0, 200 msec) - output out: int - state s: int(0) + output out: int + state s: int(0) reaction(t) -> out {= out.set(s); @@ -25,8 +25,8 @@ private preamble {= #include =} - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= std::this_thread::sleep_for(200ms); @@ -35,11 +35,11 @@ } reactor Destination { - state s: int(0) - input in1: int - input in2: int - input in3: int - input in4: int + state s: int(0) + input in1: int + input in2: int + input in3: int + input in4: int reaction(in1, in2, in3, in4) {= int sum = *in1.get() + *in2.get() + *in3.get() + *in4.get(); diff --git a/test/known-good/Cpp/src/concurrent/ThreadedThreaded.txt b/test/known-good/Cpp/src/concurrent/ThreadedThreaded.txt index 6dd1c844f..d81e79596 100644 --- a/test/known-good/Cpp/src/concurrent/ThreadedThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/ThreadedThreaded.txt @@ -12,8 +12,8 @@ reactor Source { timer t(0, 200 msec) - output out: int - state s: int(0) + output out: int + state s: int(0) reaction(t) -> out {= out.set(s); @@ -25,8 +25,8 @@ private preamble {= #include =} - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= std::this_thread::sleep_for(200ms); @@ -35,7 +35,7 @@ } reactor Destination { - state s: int(0) + state s: int(0) input[4] in: int reaction(in) {= diff --git a/test/known-good/Cpp/src/concurrent/TimeLimitThreaded.txt b/test/known-good/Cpp/src/concurrent/TimeLimitThreaded.txt index 0f9228b2a..93ee1a501 100644 --- a/test/known-good/Cpp/src/concurrent/TimeLimitThreaded.txt +++ b/test/known-good/Cpp/src/concurrent/TimeLimitThreaded.txt @@ -7,9 +7,9 @@ } reactor Clock(offset: time(0), period: time(1 sec)) { - output y: int + output y: int timer t(offset, period) - state count: int(0) + state count: int(0) reaction(t) -> y {= count++; @@ -19,8 +19,8 @@ } reactor Destination { - input x: int - state s: int(1) + input x: int + state s: int(1) reaction(x) {= //std::cout << "Received " << *x.get() << '\n'; diff --git a/test/known-good/Cpp/src/enclave/EnclaveBank.txt b/test/known-good/Cpp/src/enclave/EnclaveBank.txt index 6d1129431..9126932ec 100644 --- a/test/known-good/Cpp/src/enclave/EnclaveBank.txt +++ b/test/known-good/Cpp/src/enclave/EnclaveBank.txt @@ -9,7 +9,7 @@ period: time(500 msec), duration: time(10 msec) ) { - logical action a: void + logical action a: void reaction(startup, a) -> a {= reactor::log::Info() << id << " reaction executes."; diff --git a/test/known-good/Cpp/src/enclave/EnclaveBankEach.txt b/test/known-good/Cpp/src/enclave/EnclaveBankEach.txt index 3ec417c25..92bce66fc 100644 --- a/test/known-good/Cpp/src/enclave/EnclaveBankEach.txt +++ b/test/known-good/Cpp/src/enclave/EnclaveBankEach.txt @@ -10,7 +10,7 @@ period: {= reactor::Duration =}({= 100ms * (bank_index+1) =}), duration: {= reactor::Duration =}({= 50ms + 100ms * bank_index =}) ) { - logical action a: void + logical action a: void reaction(startup, a) -> a {= reactor::log::Info() << id << " reaction executes."; diff --git a/test/known-good/Cpp/src/lib/Count.txt b/test/known-good/Cpp/src/lib/Count.txt index 496346fcd..6de8e956d 100644 --- a/test/known-good/Cpp/src/lib/Count.txt +++ b/test/known-good/Cpp/src/lib/Count.txt @@ -1,9 +1,9 @@ target Cpp reactor Count { - output c: int + output c: int timer t(0, 1 sec) - state i: int(0) + state i: int(0) reaction(t) -> c {= i++; diff --git a/test/known-good/Cpp/src/lib/Imported.txt b/test/known-good/Cpp/src/lib/Imported.txt index 61dad474a..8b8466994 100644 --- a/test/known-good/Cpp/src/lib/Imported.txt +++ b/test/known-good/Cpp/src/lib/Imported.txt @@ -5,7 +5,7 @@ import ImportedAgain from "ImportedAgain.lf" reactor Imported { - input x: int + input x: int a = new ImportedAgain() reaction(x) -> a.x {= a.x.set(x.get()); =} diff --git a/test/known-good/Cpp/src/lib/ImportedAgain.txt b/test/known-good/Cpp/src/lib/ImportedAgain.txt index b34d4a8c7..1ca1a4463 100644 --- a/test/known-good/Cpp/src/lib/ImportedAgain.txt +++ b/test/known-good/Cpp/src/lib/ImportedAgain.txt @@ -3,7 +3,7 @@ target Cpp reactor ImportedAgain { - input x: int + input x: int reaction(x) {= auto value = *x.get(); diff --git a/test/known-good/Cpp/src/lib/ImportedComposition.txt b/test/known-good/Cpp/src/lib/ImportedComposition.txt index 34e0e2238..e5f373982 100644 --- a/test/known-good/Cpp/src/lib/ImportedComposition.txt +++ b/test/known-good/Cpp/src/lib/ImportedComposition.txt @@ -9,15 +9,15 @@ target Cpp reactor Gain { - input x: int - output y: int + input x: int + output y: int reaction(x) -> y {= y.set(*x.get() * 2); =} } reactor ImportedComposition { - input x: int - output y: int + input x: int + output y: int g1 = new Gain() g2 = new Gain() x -> g1.x after 10 msec diff --git a/test/known-good/Cpp/src/lib/LoopedActionSender.txt b/test/known-good/Cpp/src/lib/LoopedActionSender.txt index c5e50738d..de171f23b 100644 --- a/test/known-good/Cpp/src/lib/LoopedActionSender.txt +++ b/test/known-good/Cpp/src/lib/LoopedActionSender.txt @@ -14,9 +14,9 @@ * after sending take_a_break_after messages. */ reactor Sender(take_a_break_after: int(10), break_interval: time(400 msec)) { - output out: int + output out: int logical action act - state sent_messages: int(0) + state sent_messages: int(0) reaction(startup, act) -> act, out {= out.set(sent_messages); diff --git a/test/known-good/Cpp/src/multiport/BankSelfBroadcast.txt b/test/known-good/Cpp/src/multiport/BankSelfBroadcast.txt index c0d8b4185..d99611abc 100644 --- a/test/known-good/Cpp/src/multiport/BankSelfBroadcast.txt +++ b/test/known-good/Cpp/src/multiport/BankSelfBroadcast.txt @@ -10,8 +10,8 @@ reactor A(bank_index: size_t(0)) { input[4] in: size_t - output out: size_t - state received: bool(false) + output out: size_t + state received: bool(false) reaction(startup) -> out {= out.set(bank_index); =} diff --git a/test/known-good/Cpp/src/multiport/BankToBank.txt b/test/known-good/Cpp/src/multiport/BankToBank.txt index 18e08604f..7b88461fd 100644 --- a/test/known-good/Cpp/src/multiport/BankToBank.txt +++ b/test/known-good/Cpp/src/multiport/BankToBank.txt @@ -6,8 +6,8 @@ reactor Source(bank_index: size_t(0)) { timer t(0, 200 msec) - output out: int - state s: int(0) + output out: int + state s: int(0) reaction(t) -> out {= out.set(s); @@ -16,8 +16,8 @@ } reactor Destination(bank_index: size_t(0)) { - state s: int(0) - input in: int + state s: int(0) + input in: int reaction(in) {= std::cout << "Destination " << bank_index << " received: " << *in.get() << "\n"; diff --git a/test/known-good/Cpp/src/multiport/BankToBankMultiport.txt b/test/known-good/Cpp/src/multiport/BankToBankMultiport.txt index 8d1cb13d3..b8614dc3c 100644 --- a/test/known-good/Cpp/src/multiport/BankToBankMultiport.txt +++ b/test/known-good/Cpp/src/multiport/BankToBankMultiport.txt @@ -7,7 +7,7 @@ reactor Source(width: size_t(1)) { timer t(0, 200 msec) output[width] out: int - state s: int(0) + state s: int(0) reaction(t) -> out {= for(size_t i = 0; i < out.size(); i++) { @@ -17,7 +17,7 @@ } reactor Destination(width: size_t(1)) { - state s: int(6) + state s: int(6) input[width] in: int reaction(in) {= diff --git a/test/known-good/Cpp/src/multiport/BankToBankMultiportAfter.txt b/test/known-good/Cpp/src/multiport/BankToBankMultiportAfter.txt index 73ac253ab..148b93f94 100644 --- a/test/known-good/Cpp/src/multiport/BankToBankMultiportAfter.txt +++ b/test/known-good/Cpp/src/multiport/BankToBankMultiportAfter.txt @@ -7,7 +7,7 @@ reactor Source(width: size_t(1)) { timer t(0, 200 msec) output[width] out: int - state s: int(0) + state s: int(0) reaction(t) -> out {= for(size_t i = 0; i < out.size(); i++) { @@ -17,8 +17,8 @@ } reactor Destination(width: size_t(1)) { - state s: int(6) - state iterations: unsigned(0) + state s: int(6) + state iterations: unsigned(0) input[width] in: int reaction(in) {= diff --git a/test/known-good/Cpp/src/multiport/BankToMultiport.txt b/test/known-good/Cpp/src/multiport/BankToMultiport.txt index 0a4e7a173..622e5d961 100644 --- a/test/known-good/Cpp/src/multiport/BankToMultiport.txt +++ b/test/known-good/Cpp/src/multiport/BankToMultiport.txt @@ -2,14 +2,14 @@ target Cpp reactor Source(bank_index: size_t(0)) { - output out: unsigned + output out: unsigned reaction(startup) -> out {= out.set(bank_index); =} } reactor Sink { input[4] in: unsigned - state received: bool(false) + state received: bool(false) reaction(in) {= for (unsigned i = 0; i < in.size(); i++) { diff --git a/test/known-good/Cpp/src/multiport/Broadcast.txt b/test/known-good/Cpp/src/multiport/Broadcast.txt index c16817c11..9431341e6 100644 --- a/test/known-good/Cpp/src/multiport/Broadcast.txt +++ b/test/known-good/Cpp/src/multiport/Broadcast.txt @@ -1,13 +1,13 @@ target Cpp reactor Source { - output out: unsigned + output out: unsigned reaction(startup) -> out {= out.set(42); =} } reactor Sink(bank_index: size_t(0)) { - input in: unsigned + input in: unsigned reaction(in) {= std::cout << "Received " << *in.get() << '\n'; diff --git a/test/known-good/Cpp/src/multiport/BroadcastAfter.txt b/test/known-good/Cpp/src/multiport/BroadcastAfter.txt index e1821b8cb..4fdbbb05b 100644 --- a/test/known-good/Cpp/src/multiport/BroadcastAfter.txt +++ b/test/known-good/Cpp/src/multiport/BroadcastAfter.txt @@ -3,14 +3,14 @@ } reactor Source { - output out: unsigned + output out: unsigned reaction(startup) -> out {= out.set(42); =} } reactor Sink(bank_index: size_t(0)) { - input in: unsigned - state received: bool{false} + input in: unsigned + state received: bool{false} reaction(in) {= std::cout << bank_index << " received " << *in.get() << '\n'; diff --git a/test/known-good/Cpp/src/multiport/BroadcastMultipleAfter.txt b/test/known-good/Cpp/src/multiport/BroadcastMultipleAfter.txt index 34fdd6409..ee2169ca9 100644 --- a/test/known-good/Cpp/src/multiport/BroadcastMultipleAfter.txt +++ b/test/known-good/Cpp/src/multiport/BroadcastMultipleAfter.txt @@ -3,14 +3,14 @@ } reactor Source(value: unsigned(42)) { - output out: unsigned + output out: unsigned reaction(startup) -> out {= out.set(value); =} } reactor Sink(bank_index: size_t(0)) { - input in: unsigned - state received: bool{false} + input in: unsigned + state received: bool{false} reaction(in) {= std::cout << bank_index << " received " << *in.get() << '\n'; diff --git a/test/known-good/Cpp/src/multiport/FullyConnected.txt b/test/known-good/Cpp/src/multiport/FullyConnected.txt index b443ce1dd..d15590f7a 100644 --- a/test/known-good/Cpp/src/multiport/FullyConnected.txt +++ b/test/known-good/Cpp/src/multiport/FullyConnected.txt @@ -2,9 +2,9 @@ reactor Node(bank_index: size_t(0), num_nodes: size_t(4)) { input[num_nodes] in: size_t - output out: size_t + output out: size_t - state received: bool{false} + state received: bool{false} reaction(startup) -> out {= std::cout << "Hello from node " << bank_index << "!\n"; diff --git a/test/known-good/Cpp/src/multiport/FullyConnectedAddressable.txt b/test/known-good/Cpp/src/multiport/FullyConnectedAddressable.txt index f61dae8b5..96dd97cda 100644 --- a/test/known-good/Cpp/src/multiport/FullyConnectedAddressable.txt +++ b/test/known-good/Cpp/src/multiport/FullyConnectedAddressable.txt @@ -5,7 +5,7 @@ input[num_nodes] in: size_t output[num_nodes] out: size_t - state received: bool{false} + state received: bool{false} reaction(startup) -> out {= std::cout << "Hello from node " << bank_index << "!\n"; diff --git a/test/known-good/Cpp/src/multiport/IndexIntoMultiportInput.txt b/test/known-good/Cpp/src/multiport/IndexIntoMultiportInput.txt index c3e9aa820..d3c6aabe0 100644 --- a/test/known-good/Cpp/src/multiport/IndexIntoMultiportInput.txt +++ b/test/known-good/Cpp/src/multiport/IndexIntoMultiportInput.txt @@ -33,9 +33,9 @@ reactor MultiportSplitter { output[3] out: int - input in0: int - input in1: int - input in2: int + input in0: int + input in1: int + input in2: int in0, in1, in2 -> out } diff --git a/test/known-good/Cpp/src/multiport/IndexIntoMultiportOutput.txt b/test/known-good/Cpp/src/multiport/IndexIntoMultiportOutput.txt index 989ad19b9..c56238812 100644 --- a/test/known-good/Cpp/src/multiport/IndexIntoMultiportOutput.txt +++ b/test/known-good/Cpp/src/multiport/IndexIntoMultiportOutput.txt @@ -21,9 +21,9 @@ reactor MultiportSplitter(width: size_t(3)) { input[width] in: int - output out0: int - output out1: int - output out2: int + output out0: int + output out1: int + output out2: int in -> out0, out1, out2 } @@ -34,9 +34,9 @@ source.out -> splitter.in - state received0: bool{false} - state received1: bool{false} - state received2: bool{false} + state received0: bool{false} + state received1: bool{false} + state received2: bool{false} reaction(splitter.out0) {= received0 = true; diff --git a/test/known-good/Cpp/src/multiport/Multiport.txt b/test/known-good/Cpp/src/multiport/Multiport.txt index 80950a660..8bc2d2032 100644 --- a/test/known-good/Cpp/src/multiport/Multiport.txt +++ b/test/known-good/Cpp/src/multiport/Multiport.txt @@ -21,7 +21,7 @@ main reactor Multiport { test = new Test() - state received: bool(false) + state received: bool(false) reaction(startup) -> test.sink {= for (auto i = 0; i < 30; i++) { diff --git a/test/known-good/Cpp/src/multiport/MultiportFromBank.txt b/test/known-good/Cpp/src/multiport/MultiportFromBank.txt index 6eb5994e9..d37d90d61 100644 --- a/test/known-good/Cpp/src/multiport/MultiportFromBank.txt +++ b/test/known-good/Cpp/src/multiport/MultiportFromBank.txt @@ -6,14 +6,14 @@ } reactor Source(bank_index: size_t(0)) { - output out: unsigned + output out: unsigned reaction(startup) -> out {= out.set(bank_index); =} } reactor Destination(port_width: size_t(2)) { input[port_width] in: unsigned - state received: bool(false) + state received: bool(false) reaction(in) {= for (size_t i = 0; i < in.size(); i++) { diff --git a/test/known-good/Cpp/src/multiport/MultiportFromBankHierarchy.txt b/test/known-good/Cpp/src/multiport/MultiportFromBankHierarchy.txt index c900069c4..5e90b6d6c 100644 --- a/test/known-good/Cpp/src/multiport/MultiportFromBankHierarchy.txt +++ b/test/known-good/Cpp/src/multiport/MultiportFromBankHierarchy.txt @@ -6,7 +6,7 @@ } reactor Source(bank_index: size_t(0)) { - output out: unsigned + output out: unsigned reaction(startup) -> out {= out.set(bank_index); =} } @@ -19,7 +19,7 @@ reactor Destination { input[3] in: unsigned - state received: bool(false) + state received: bool(false) reaction(in) {= for (size_t i = 0; i < in.size(); i++) { diff --git a/test/known-good/Cpp/src/multiport/MultiportFromBankHierarchyAfter.txt b/test/known-good/Cpp/src/multiport/MultiportFromBankHierarchyAfter.txt index 43a18cdf9..0af98ade9 100644 --- a/test/known-good/Cpp/src/multiport/MultiportFromBankHierarchyAfter.txt +++ b/test/known-good/Cpp/src/multiport/MultiportFromBankHierarchyAfter.txt @@ -6,7 +6,7 @@ } reactor Source(bank_index: size_t(0)) { - output out: int + output out: int reaction(startup) -> out {= out.set(bank_index); =} } @@ -19,7 +19,7 @@ reactor Destination { input[3] in: int - state received: bool(false) + state received: bool(false) reaction(in) {= for (int i = 0; i < in.size(); i++) { diff --git a/test/known-good/Cpp/src/multiport/MultiportFromHierarchy.txt b/test/known-good/Cpp/src/multiport/MultiportFromHierarchy.txt index db100e5a5..682ba9825 100644 --- a/test/known-good/Cpp/src/multiport/MultiportFromHierarchy.txt +++ b/test/known-good/Cpp/src/multiport/MultiportFromHierarchy.txt @@ -8,7 +8,7 @@ reactor Source { timer t(0, 200 msec) output[4] out: int - state s: int(0) + state s: int(0) reaction(t) -> out {= for(int i = 0; i < 4; i++) { @@ -18,7 +18,7 @@ } reactor Destination { - state s: int(6) + state s: int(6) input[4] in: int reaction(in) {= diff --git a/test/known-good/Cpp/src/multiport/MultiportIn.txt b/test/known-good/Cpp/src/multiport/MultiportIn.txt index 919531735..0a3d63c66 100644 --- a/test/known-good/Cpp/src/multiport/MultiportIn.txt +++ b/test/known-good/Cpp/src/multiport/MultiportIn.txt @@ -7,21 +7,21 @@ reactor Source { timer t(0, 200 msec) - output out: int - state s: int(0) + output out: int + state s: int(0) reaction(t) -> out {= out.set(s++); =} } reactor Computation { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= out.set(*in.get()); =} } reactor Destination { - state s: int(0) + state s: int(0) input[4] in: int reaction(in) {= diff --git a/test/known-good/Cpp/src/multiport/MultiportMultipleSet.txt b/test/known-good/Cpp/src/multiport/MultiportMultipleSet.txt index a4bb4a501..78d3adf6f 100644 --- a/test/known-good/Cpp/src/multiport/MultiportMultipleSet.txt +++ b/test/known-good/Cpp/src/multiport/MultiportMultipleSet.txt @@ -7,7 +7,7 @@ output[10] out: int - state odd: bool(true) + state odd: bool(true) reaction(t) -> out {= for (int i{odd ? 1 : 0}; i < 10; i += 2) { @@ -21,7 +21,7 @@ } reactor Consumer { - state odd: bool(true) + state odd: bool(true) input[10] in: int reaction(in) {= diff --git a/test/known-good/Cpp/src/multiport/MultiportOut.txt b/test/known-good/Cpp/src/multiport/MultiportOut.txt index 5e878a1a0..ebf2364bf 100644 --- a/test/known-good/Cpp/src/multiport/MultiportOut.txt +++ b/test/known-good/Cpp/src/multiport/MultiportOut.txt @@ -7,7 +7,7 @@ reactor Source { timer t(0, 200 msec) output[4] out: int - state s: int(0) + state s: int(0) reaction(t) -> out {= for(int i = 0; i < 4; i++) { @@ -18,8 +18,8 @@ } reactor Computation { - input in: int - output out: int + input in: int + output out: int reaction(in) -> out {= // No need to sleep for this test. @@ -31,7 +31,7 @@ } reactor Destination { - state s: int(0) + state s: int(0) input[4] in: int reaction(in) {= diff --git a/test/known-good/Cpp/src/multiport/MultiportToBank.txt b/test/known-good/Cpp/src/multiport/MultiportToBank.txt index 77f153fb0..e0fc7e591 100644 --- a/test/known-good/Cpp/src/multiport/MultiportToBank.txt +++ b/test/known-good/Cpp/src/multiport/MultiportToBank.txt @@ -11,7 +11,7 @@ } reactor Sink(bank_index: size_t(0)) { - input in: unsigned + input in: unsigned reaction(in) {= std::cout << "Received " << *in.get() << '\n'; diff --git a/test/known-good/Cpp/src/multiport/MultiportToBankAfter.txt b/test/known-good/Cpp/src/multiport/MultiportToBankAfter.txt index 272a86a28..5643d9a37 100644 --- a/test/known-good/Cpp/src/multiport/MultiportToBankAfter.txt +++ b/test/known-good/Cpp/src/multiport/MultiportToBankAfter.txt @@ -11,7 +11,7 @@ } reactor Sink(bank_index: size_t(0)) { - input in: unsigned + input in: unsigned reaction(in) {= std::cout << "Received " << *in.get() << '\n'; diff --git a/test/known-good/Cpp/src/multiport/MultiportToBankHierarchy.txt b/test/known-good/Cpp/src/multiport/MultiportToBankHierarchy.txt index d355d5ac2..50a1c2657 100644 --- a/test/known-good/Cpp/src/multiport/MultiportToBankHierarchy.txt +++ b/test/known-good/Cpp/src/multiport/MultiportToBankHierarchy.txt @@ -16,8 +16,8 @@ } reactor Destination(bank_index: size_t(0)) { - input in: unsigned - state received: bool(false) + input in: unsigned + state received: bool(false) reaction(in) {= std::cout << "Destination " << bank_index << " received " << *in.get() << ".\n"; diff --git a/test/known-good/Cpp/src/multiport/MultiportToHierarchy.txt b/test/known-good/Cpp/src/multiport/MultiportToHierarchy.txt index b0a96ae68..07f36a68f 100644 --- a/test/known-good/Cpp/src/multiport/MultiportToHierarchy.txt +++ b/test/known-good/Cpp/src/multiport/MultiportToHierarchy.txt @@ -9,7 +9,7 @@ reactor Source(width: size_t(4)) { timer t(0, 200 msec) output[width] out: int - state s: int(0) + state s: int(0) reaction(t) -> out {= for(size_t i = 0; i < 4; i++) { @@ -19,7 +19,7 @@ } reactor Destination(width: size_t(4)) { - state s: int(6) + state s: int(6) input[width] in: int reaction(in) {= diff --git a/test/known-good/Cpp/src/multiport/MultiportToMultiport.txt b/test/known-good/Cpp/src/multiport/MultiportToMultiport.txt index 7f7504aae..e5243f6ee 100644 --- a/test/known-good/Cpp/src/multiport/MultiportToMultiport.txt +++ b/test/known-good/Cpp/src/multiport/MultiportToMultiport.txt @@ -12,7 +12,7 @@ reactor Sink { input[4] in: unsigned - state received: bool(false) + state received: bool(false) reaction(in) {= for (unsigned i = 0; i < in.size(); i++) { diff --git a/test/known-good/Cpp/src/multiport/MultiportToMultiportArray.txt b/test/known-good/Cpp/src/multiport/MultiportToMultiportArray.txt index 9646c4363..b9bce4f01 100644 --- a/test/known-good/Cpp/src/multiport/MultiportToMultiportArray.txt +++ b/test/known-good/Cpp/src/multiport/MultiportToMultiportArray.txt @@ -8,7 +8,7 @@ reactor Source { timer t(0, 200 msec) output[2] out: int[3] - state s: int(0) + state s: int(0) reaction(t) -> out {= for(int i = 0; i < 2; i++) { @@ -25,7 +25,7 @@ } reactor Destination { - state s: int(15) + state s: int(15) input[2] in: int[3] reaction(in) {= diff --git a/test/known-good/Cpp/src/multiport/MultiportToMultiportPhysical.txt b/test/known-good/Cpp/src/multiport/MultiportToMultiportPhysical.txt index 031139d0f..83635c435 100644 --- a/test/known-good/Cpp/src/multiport/MultiportToMultiportPhysical.txt +++ b/test/known-good/Cpp/src/multiport/MultiportToMultiportPhysical.txt @@ -12,7 +12,7 @@ reactor Sink { input[4] in: unsigned - state received: int(-1) + state received: int(-1) reaction(in) {= auto present_ports = in.present_indices_unsorted(); diff --git a/test/known-good/Cpp/src/multiport/MultiportToPort.txt b/test/known-good/Cpp/src/multiport/MultiportToPort.txt index 443f392af..bc3c58618 100644 --- a/test/known-good/Cpp/src/multiport/MultiportToPort.txt +++ b/test/known-good/Cpp/src/multiport/MultiportToPort.txt @@ -17,8 +17,8 @@ } reactor Destination(expected: int(0)) { - input in: int - state received: bool(false) + input in: int + state received: bool(false) reaction(in) {= std::cout << "Received: " << *in.get() << ".\n"; diff --git a/test/known-good/Cpp/src/multiport/PipelineAfter.txt b/test/known-good/Cpp/src/multiport/PipelineAfter.txt index 59346b7a7..a4f9a3a22 100644 --- a/test/known-good/Cpp/src/multiport/PipelineAfter.txt +++ b/test/known-good/Cpp/src/multiport/PipelineAfter.txt @@ -1,20 +1,20 @@ target Cpp reactor Source { - output out: unsigned + output out: unsigned reaction(startup) -> out {= out.set(40); =} } reactor Compute { - input in: unsigned - output out: unsigned + input in: unsigned + output out: unsigned reaction(in) -> out {= out.set(*in.get() + 2); =} } reactor Sink { - input in: unsigned + input in: unsigned reaction(in) {= std::cout << "Received " << *in.get() << '\n'; diff --git a/test/known-good/Cpp/src/multiport/ReadMultiportOutputOfContainedBank.txt b/test/known-good/Cpp/src/multiport/ReadMultiportOutputOfContainedBank.txt index 2f8fea11b..0644d814f 100644 --- a/test/known-good/Cpp/src/multiport/ReadMultiportOutputOfContainedBank.txt +++ b/test/known-good/Cpp/src/multiport/ReadMultiportOutputOfContainedBank.txt @@ -14,7 +14,7 @@ main reactor { c = new[3] Contained() - state count: int(0) + state count: int(0) reaction(startup) c.out {= for (size_t i = 0; i < c.size(); i++) { diff --git a/test/known-good/Cpp/src/multiport/ReadOutputOfContainedBank.txt b/test/known-good/Cpp/src/multiport/ReadOutputOfContainedBank.txt index 604b0f121..ecd4e0c31 100644 --- a/test/known-good/Cpp/src/multiport/ReadOutputOfContainedBank.txt +++ b/test/known-good/Cpp/src/multiport/ReadOutputOfContainedBank.txt @@ -3,14 +3,14 @@ target Cpp reactor Contained(bank_index: size_t(0)) { - output out: unsigned + output out: unsigned reaction(startup) -> out {= out.set(42 * bank_index); =} } main reactor { c = new[4] Contained() - state count: int(0) + state count: int(0) reaction(startup) c.out {= for (size_t i = 0; i < c.size(); i++) { diff --git a/test/known-good/Cpp/src/multiport/SparseMultiport.txt b/test/known-good/Cpp/src/multiport/SparseMultiport.txt index caadf4f74..a5d9e455f 100644 --- a/test/known-good/Cpp/src/multiport/SparseMultiport.txt +++ b/test/known-good/Cpp/src/multiport/SparseMultiport.txt @@ -7,7 +7,7 @@ output[10] out: int - state odd: bool(true) + state odd: bool(true) reaction(t) -> out {= for (int i{odd ? 1 : 0}; i < 10; i += 2) { @@ -19,7 +19,7 @@ } reactor Consumer { - state odd: bool(true) + state odd: bool(true) input[10] in: int reaction(in) {= diff --git a/test/known-good/Cpp/src/multiport/WriteInputOfContainedBank.txt b/test/known-good/Cpp/src/multiport/WriteInputOfContainedBank.txt index a1f7d1131..4bdd01748 100644 --- a/test/known-good/Cpp/src/multiport/WriteInputOfContainedBank.txt +++ b/test/known-good/Cpp/src/multiport/WriteInputOfContainedBank.txt @@ -2,8 +2,8 @@ target Cpp reactor Contained(bank_index: size_t(0)) { - input in: unsigned - state count: int(0) + input in: unsigned + state count: int(0) reaction(in) {= unsigned result = *in.get(); diff --git a/test/known-good/Cpp/src/multiport/WriteMultiportInputOfContainedBank.txt b/test/known-good/Cpp/src/multiport/WriteMultiportInputOfContainedBank.txt index 1cb41a7a5..ef51149f8 100644 --- a/test/known-good/Cpp/src/multiport/WriteMultiportInputOfContainedBank.txt +++ b/test/known-good/Cpp/src/multiport/WriteMultiportInputOfContainedBank.txt @@ -3,7 +3,7 @@ reactor Contained(bank_index: size_t(0)) { input[4] in: unsigned - state count: int(0) + state count: int(0) reaction(in) {= for (size_t i = 0; i < 3; i++) { diff --git a/test/known-good/Cpp/src/properties/Fast.txt b/test/known-good/Cpp/src/properties/Fast.txt index 307b33667..be050e094 100644 --- a/test/known-good/Cpp/src/properties/Fast.txt +++ b/test/known-good/Cpp/src/properties/Fast.txt @@ -5,7 +5,7 @@ main reactor { logical action a - state triggered: bool{false} + state triggered: bool{false} reaction(startup) -> a {= a.schedule(2s); =} diff --git a/test/known-good/Cpp/src/properties/Timeout.txt b/test/known-good/Cpp/src/properties/Timeout.txt index 82024bff8..90ec10f76 100644 --- a/test/known-good/Cpp/src/properties/Timeout.txt +++ b/test/known-good/Cpp/src/properties/Timeout.txt @@ -5,7 +5,7 @@ main reactor { timer t(1 sec, 1 sec) - state triggered: bool{false} + state triggered: bool{false} reaction(t) {= triggered = true; diff --git a/test/known-good/Cpp/src/properties/TimeoutZero.txt b/test/known-good/Cpp/src/properties/TimeoutZero.txt index 88d4cb391..26be20a73 100644 --- a/test/known-good/Cpp/src/properties/TimeoutZero.txt +++ b/test/known-good/Cpp/src/properties/TimeoutZero.txt @@ -5,7 +5,7 @@ main reactor { timer t(0, 1 sec) - state triggered: bool{false} + state triggered: bool{false} reaction(t) {= triggered = true; diff --git a/test/known-good/Cpp/src/target/AfterVoid.txt b/test/known-good/Cpp/src/target/AfterVoid.txt index 929f8bec5..5ae76d77f 100644 --- a/test/known-good/Cpp/src/target/AfterVoid.txt +++ b/test/known-good/Cpp/src/target/AfterVoid.txt @@ -6,15 +6,15 @@ reactor foo { timer t(0, 1 sec) - output y: void + output y: void reaction(t) -> y {= y.set(); =} } reactor print { - state expected_time: time(10 msec) - state i: int(0) - input x: void + state expected_time: time(10 msec) + state i: int(0) + input x: void reaction(x) {= i++; diff --git a/test/known-good/Cpp/src/target/BraceAndParenInitialization.txt b/test/known-good/Cpp/src/target/BraceAndParenInitialization.txt index 98e65f05b..dcd18b8e8 100644 --- a/test/known-good/Cpp/src/target/BraceAndParenInitialization.txt +++ b/test/known-good/Cpp/src/target/BraceAndParenInitialization.txt @@ -7,9 +7,9 @@ param_list_4: std::vector{4, 2} // list containing [4,2] ) { // list containing [42,42,42,42,42,42] - state state_list_1: std::vector(6, 42) + state state_list_1: std::vector(6, 42) // list containing [6,42] - state state_list_2: std::vector{6, 42} + state state_list_2: std::vector{6, 42} reaction(startup) {= std::cerr << "Hello!\n"; diff --git a/test/known-good/Cpp/src/target/CombinedTypeNames.txt b/test/known-good/Cpp/src/target/CombinedTypeNames.txt index 31ade97b1..e794fb19f 100644 --- a/test/known-good/Cpp/src/target/CombinedTypeNames.txt +++ b/test/known-good/Cpp/src/target/CombinedTypeNames.txt @@ -6,8 +6,8 @@ bar: {= unsigned int =}(0), baz: {= const unsigned int* =}({= nullptr =}) ) { - state s_bar: {= unsigned int =}(bar) - state s_baz: {= const unsigned int* =}(baz) + state s_bar: {= unsigned int =}(bar) + state s_baz: {= const unsigned int* =}(baz) reaction(startup) {= if (bar != 42 || s_bar != 42 || *baz != 42 || *s_baz != 42) { diff --git a/test/known-good/Cpp/src/target/GenericAfter.txt b/test/known-good/Cpp/src/target/GenericAfter.txt index aaca2063d..75cde67e4 100644 --- a/test/known-good/Cpp/src/target/GenericAfter.txt +++ b/test/known-good/Cpp/src/target/GenericAfter.txt @@ -3,8 +3,8 @@ import Test from "../DelayInt.lf" reactor Delay(delay: time(0)) { - output out: T - input in: T + output out: T + input in: T logical action a(delay): T reaction(a) -> out {= out.set(a.get()); =} diff --git a/test/known-good/Cpp/src/target/GenericDelay.txt b/test/known-good/Cpp/src/target/GenericDelay.txt index 7506efb0e..14fe3579b 100644 --- a/test/known-good/Cpp/src/target/GenericDelay.txt +++ b/test/known-good/Cpp/src/target/GenericDelay.txt @@ -3,8 +3,8 @@ import Test from "../DelayInt.lf" reactor Delay(delay: time(0)) { - output out: T - input in: T + output out: T + input in: T logical action a(delay): T reaction(a) -> out {= out.set(a.get()); =} diff --git a/test/known-good/Cpp/src/target/GenericParameterAndState.txt b/test/known-good/Cpp/src/target/GenericParameterAndState.txt index bd6c9f5e3..92db1cbd5 100644 --- a/test/known-good/Cpp/src/target/GenericParameterAndState.txt +++ b/test/known-good/Cpp/src/target/GenericParameterAndState.txt @@ -1,7 +1,7 @@ target Cpp reactor Foo(bar: T(0), expected: T(14542135)) { - state baz: T(bar) + state baz: T(bar) reaction(startup) {= if (bar != expected) { diff --git a/test/known-good/Cpp/src/target/MultipleContainedGeneric.txt b/test/known-good/Cpp/src/target/MultipleContainedGeneric.txt index afa2d5b9f..a20d14635 100644 --- a/test/known-good/Cpp/src/target/MultipleContainedGeneric.txt +++ b/test/known-good/Cpp/src/target/MultipleContainedGeneric.txt @@ -3,9 +3,9 @@ target Cpp reactor Contained { - output trigger: T - input in1: T - input in2: T + output trigger: T + input in1: T + input in2: T reaction(startup) -> trigger {= trigger.set(42); =} diff --git a/test/known-good/Cpp/src/target/PreambleFile.txt b/test/known-good/Cpp/src/target/PreambleFile.txt index 3999843bb..04ff463bf 100644 --- a/test/known-good/Cpp/src/target/PreambleFile.txt +++ b/test/known-good/Cpp/src/target/PreambleFile.txt @@ -21,7 +21,7 @@ =} reactor Source { - output x: MyStruct + output x: MyStruct reaction(startup) -> x {= int a = add_42(0); @@ -38,7 +38,7 @@ std::cout << "Received " << x.foo << " and '" << x.bar << "'\n"; } =} - input x: MyStruct + input x: MyStruct reaction(x) {= MyStruct value = *x.get(); // implicit copy diff --git a/test/known-good/Python/src/federated/failing/TopLevelArtifacts.txt b/test/known-good/Python/src/federated/failing/TopLevelArtifacts.txt index 9b3d6978b..289b4adf0 100644 --- a/test/known-good/Python/src/federated/failing/TopLevelArtifacts.txt +++ b/test/known-good/Python/src/federated/failing/TopLevelArtifacts.txt @@ -11,7 +11,7 @@ target Python { timeout: 1 msec -}; +}; import Count from "../lib/Count.lf"; import TestCount from "../lib/TestCount.lf";