From 368fb4307b853bf1a9494469318743e2c250f80c Mon Sep 17 00:00:00 2001 From: Swen Mulderij Date: Mon, 12 Jun 2023 22:02:41 +0200 Subject: [PATCH] UI is back --- package-lock.json | 316 ++++++++++++++++++++++++++++++++++++- package.json | 10 +- src/Main.elm | 33 ++-- src/TortoiseParser.elm | 62 ++++---- src/Utils/Stringifiers.elm | 4 +- src/index.html | 14 -- tests/ParserTests.elm | 14 +- 7 files changed, 393 insertions(+), 60 deletions(-) delete mode 100644 src/index.html diff --git a/package-lock.json b/package-lock.json index 2bee68f..61ad680 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,16 @@ "packages": { "": { "devDependencies": { - "elm-test": "^0.19.1-revision12" + "elm-test": "^0.19.1-revision12", + "nodemon": "^2.0.22" } }, + "node_modules/abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "dev": true + }, "node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -142,6 +149,12 @@ "node": "^12.20.0 || >=14" } }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -156,6 +169,15 @@ "node": ">= 8" } }, + "node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, "node_modules/elm-solve-deps-wasm": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/elm-solve-deps-wasm/-/elm-solve-deps-wasm-1.0.2.tgz", @@ -264,6 +286,12 @@ "node": ">=8" } }, + "node_modules/ignore-by-default": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", + "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", + "dev": true + }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -340,6 +368,98 @@ "node": ">=10" } }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + }, + "node_modules/nodemon": { + "version": "2.0.22", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz", + "integrity": "sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==", + "dev": true, + "dependencies": { + "chokidar": "^3.5.2", + "debug": "^3.2.7", + "ignore-by-default": "^1.0.1", + "minimatch": "^3.1.2", + "pstree.remy": "^1.1.8", + "semver": "^5.7.1", + "simple-update-notifier": "^1.0.7", + "supports-color": "^5.5.0", + "touch": "^3.1.0", + "undefsafe": "^2.0.5" + }, + "bin": { + "nodemon": "bin/nodemon.js" + }, + "engines": { + "node": ">=8.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/nodemon" + } + }, + "node_modules/nodemon/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/nodemon/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/nodemon/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/nodemon/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/nopt": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", + "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==", + "dev": true, + "dependencies": { + "abbrev": "1" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "*" + } + }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -379,6 +499,12 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/pstree.remy": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", + "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", + "dev": true + }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -391,6 +517,15 @@ "node": ">=8.10.0" } }, + "node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -412,6 +547,27 @@ "node": ">=8" } }, + "node_modules/simple-update-notifier": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz", + "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==", + "dev": true, + "dependencies": { + "semver": "~7.0.0" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/simple-update-notifier/node_modules/semver": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", + "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/split": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", @@ -454,6 +610,24 @@ "node": ">=8.0" } }, + "node_modules/touch": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", + "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", + "dev": true, + "dependencies": { + "nopt": "~1.0.10" + }, + "bin": { + "nodetouch": "bin/nodetouch.js" + } + }, + "node_modules/undefsafe": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", + "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", + "dev": true + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -486,6 +660,12 @@ } }, "dependencies": { + "abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "dev": true + }, "ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -582,6 +762,12 @@ "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==", "dev": true }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, "cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -593,6 +779,15 @@ "which": "^2.0.1" } }, + "debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, "elm-solve-deps-wasm": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/elm-solve-deps-wasm/-/elm-solve-deps-wasm-1.0.2.tgz", @@ -673,6 +868,12 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, + "ignore-by-default": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", + "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", + "dev": true + }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -734,6 +935,75 @@ "brace-expansion": "^2.0.1" } }, + "ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + }, + "nodemon": { + "version": "2.0.22", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz", + "integrity": "sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==", + "dev": true, + "requires": { + "chokidar": "^3.5.2", + "debug": "^3.2.7", + "ignore-by-default": "^1.0.1", + "minimatch": "^3.1.2", + "pstree.remy": "^1.1.8", + "semver": "^5.7.1", + "simple-update-notifier": "^1.0.7", + "supports-color": "^5.5.0", + "touch": "^3.1.0", + "undefsafe": "^2.0.5" + }, + "dependencies": { + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true + }, + "minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "nopt": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", + "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==", + "dev": true, + "requires": { + "abbrev": "1" + } + }, "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -761,6 +1031,12 @@ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true }, + "pstree.remy": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", + "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", + "dev": true + }, "readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -770,6 +1046,12 @@ "picomatch": "^2.2.1" } }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + }, "shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -785,6 +1067,23 @@ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true }, + "simple-update-notifier": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz", + "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==", + "dev": true, + "requires": { + "semver": "~7.0.0" + }, + "dependencies": { + "semver": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", + "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", + "dev": true + } + } + }, "split": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", @@ -818,6 +1117,21 @@ "is-number": "^7.0.0" } }, + "touch": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", + "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", + "dev": true, + "requires": { + "nopt": "~1.0.10" + } + }, + "undefsafe": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", + "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", + "dev": true + }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", diff --git a/package.json b/package.json index aaa9861..15fcea3 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,14 @@ { "devDependencies": { - "elm-test": "^0.19.1-revision12" + "elm-test": "^0.19.1-revision12", + "nodemon": "^2.0.22" + }, + "nodemonConfig": { + "execMap": { + "elm": "elm make"} }, "scripts": { - "test": "elm-test" + "test": "elm-test", + "build": "nodemon src/Main.elm --output=dist/main.js" } } diff --git a/src/Main.elm b/src/Main.elm index ad8a7fe..bbb4d9f 100644 --- a/src/Main.elm +++ b/src/Main.elm @@ -5,7 +5,7 @@ import Html exposing (..) import Html.Attributes exposing (..) import Html.Events exposing (onClick, onInput) import TortoiseParser exposing (parse) -import Utils.Stringifiers exposing (tokensToString) +import Utils.Stringifiers exposing (deadEndsToString, tokensToString) main = @@ -27,7 +27,7 @@ subscriptions model = type alias Model = { code : String - , result : Maybe (Result String String) + , result : Maybe (Result (List String) String) } @@ -56,7 +56,15 @@ update msg model = ( { model | code = s }, Cmd.none ) ParseCode -> - ( { model | result = Just <| Result.map tokensToString (parse model.code) }, Cmd.none ) + ( { model + | result = + Just <| + Result.mapError deadEndsToString <| + Result.map tokensToString <| + parse model.code + } + , Cmd.none + ) @@ -65,12 +73,11 @@ update msg model = view : Model -> Html Msg view model = - div [] + div [ class "container" ] [ textarea [ onInput UpdateCode , value model.code - , rows 20 - , cols 60 + , spellcheck False ] [] , button [ onClick ParseCode ] [ text "parse" ] @@ -78,7 +85,7 @@ view model = ] -outputView : Maybe (Result String String) -> Html Msg +outputView : Maybe (Result (List String) String) -> Html Msg outputView maybeResult = case maybeResult of Just result -> @@ -89,11 +96,13 @@ outputView maybeResult = , p [] [ text res ] ] - Err err -> - div [] - [ p [] [ text "Error" ] - , p [] [ text err ] - ] + Err errs -> + div [ class "errors" ] <| List.map error errs Nothing -> p [] [] + + +error : String -> Html Msg +error err = + p [ class "error" ] [ text err ] diff --git a/src/TortoiseParser.elm b/src/TortoiseParser.elm index 8389b00..61c3238 100644 --- a/src/TortoiseParser.elm +++ b/src/TortoiseParser.elm @@ -1,6 +1,6 @@ module TortoiseParser exposing (TrtDeadend, TrtToken(..), parse, problemToString, tortoiseParser) -import Parser.Advanced exposing ((|.), (|=), DeadEnd, Step(..), Token(..), Trailing(..), chompIf, chompWhile, end, int, keyword, loop, map, oneOf, run, succeed, token) +import Parser.Advanced exposing ((|.), (|=), DeadEnd, Step(..), Token(..), Trailing(..), backtrackable, chompIf, chompWhile, end, int, keyword, loop, map, oneOf, run, succeed, token) import String exposing (fromInt) @@ -30,9 +30,7 @@ type TrtContext type TrtProblem - = TrtProblem - | CommandExpected Int - | BadWhiteSpace + = CommandExpected Int | NumberExpected | NumberInvalid | NewLineExpected @@ -42,6 +40,15 @@ type TrtProblem problemToString : TrtProblem -> String problemToString pr = case pr of + NumberExpected -> + "Expected number" + + NumberInvalid -> + "Expected a round number" + + EndExpected -> + "Expected end of script" + NewLineExpected -> "Expected a newline" @@ -56,9 +63,6 @@ problemToString pr = m -> "Expected a command with " ++ fromInt m ++ " arguments" - _ -> - "UNKNOWN PROBLEM" - type alias TrtParser target = Parser.Advanced.Parser TrtContext TrtProblem target @@ -76,27 +80,31 @@ statements = statementsHelp revStmts = - oneOf - [ succeed (\stmt -> Loop (stmt :: revStmts)) - |. multipleSpaces - |= oneOf - [ singleArgCommand "FORWARD" FORWARD - , singleArgCommand "LEFT" LEFT - , singleArgCommand "RIGHT" RIGHT - , singleArgCommand "REPEAT" REPEAT_start - , noArgCommand "ENDREPEAT" REPEAT_end - , noArgCommand "PENUP" PENUP - , noArgCommand "PENDOWN" PENDOWN - ] - |. multipleSpaces + succeed identity + |. multipleSpaces + |= oneOf + [ backtrackable <| + succeed (\stmt -> Loop (stmt :: revStmts)) + |= oneOf + [ singleArgCommand "FORWARD" FORWARD + , singleArgCommand "LEFT" LEFT + , singleArgCommand "RIGHT" RIGHT + , singleArgCommand "REPEAT" REPEAT_start + , noArgCommand "ENDREPEAT" REPEAT_end + , noArgCommand "PENUP" PENUP + , noArgCommand "PENDOWN" PENDOWN + ] + |. multipleSpaces + |. oneOf [ newLine, end EndExpected ] - -- allow empty lines - , succeed (Loop revStmts) - |. multipleSpaces - |. newLine - |. multipleSpaces - , succeed (Done (List.reverse revStmts)) |. end EndExpected - ] + -- allow empty lines + , backtrackable <| + succeed (Loop revStmts) + |. newLine + |. multipleSpaces + , succeed (Done (List.reverse revStmts)) + |. end EndExpected + ] multipleSpaces : TrtParser () diff --git a/src/Utils/Stringifiers.elm b/src/Utils/Stringifiers.elm index 71c7c94..9168ac1 100644 --- a/src/Utils/Stringifiers.elm +++ b/src/Utils/Stringifiers.elm @@ -34,9 +34,9 @@ tokenToString t = "FORWARD " ++ fromInt n -deadEndsToString : List TrtDeadend -> String +deadEndsToString : List TrtDeadend -> List String deadEndsToString deadEnds = - String.concat (List.intersperse "; " (List.map deadEndToString deadEnds)) + List.map deadEndToString deadEnds deadEndToString : TrtDeadend -> String diff --git a/src/index.html b/src/index.html deleted file mode 100644 index b90af38..0000000 --- a/src/index.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - Tortoise - - - -
- -
- - - \ No newline at end of file diff --git a/tests/ParserTests.elm b/tests/ParserTests.elm index 2e97f9d..3ebbd69 100644 --- a/tests/ParserTests.elm +++ b/tests/ParserTests.elm @@ -35,8 +35,18 @@ suite = \_ -> Expect.err <| run tortoiseParser "lfi" , test "Fails on unknown " <| \_ -> Expect.err <| run tortoiseParser "FORWARD 10\nFORWARD 20\nLEFT 25\nblooob" - , test "Succeeds on trailing whitespace" <| + , test "Fails on no newline " <| + \_ -> Expect.err <| run tortoiseParser "FORWARD 10 LEFT 25" + , test "Succeeds on trailing newline and whitespace" <| \_ -> testScript " FORWARD 10\nFORWARD 20\nLEFT 25\n " [ FORWARD 10, FORWARD 20, LEFT 25 ] + , test "Succeeds on trailing newline" <| + \_ -> testScript " FORWARD 10\nFORWARD 20\nLEFT 25\n" [ FORWARD 10, FORWARD 20, LEFT 25 ] + , test "Succeeds on trailing whitespace" <| + \_ -> testScript " FORWARD 10\nFORWARD 20\nLEFT 25 " [ FORWARD 10, FORWARD 20, LEFT 25 ] + , test "Succeeds on newline script" <| + \_ -> testScript "\n \n " [] + , test "Succeeds on space script" <| + \_ -> testScript " " [] ] ] @@ -52,4 +62,4 @@ testScript inp exp = Expect.equal result exp Err des -> - Expect.fail <| deadEndsToString des + Expect.fail <| String.concat <| List.intersperse "\n" <| deadEndsToString des