diff --git a/codemirror b/codemirror index 4334727f..ebf81921 160000 --- a/codemirror +++ b/codemirror @@ -1 +1 @@ -Subproject commit 4334727f0e07acd4541b0a7b8f81a5984cd4aafe +Subproject commit ebf81921f80024e3e94c7a8e1235ab59464fa5ef diff --git a/package.json b/package.json index d3b96819..a8ac7082 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,6 @@ "@types/jquery": "^2.x", "@types/bootstrap": "^3.x", "mocha": "^5.2.0", - "mocha-phantomjs": "^4.1.0", "wavedrom-cli": "^0.5.0" }, "description": "8bitworkshop.com", @@ -20,11 +19,10 @@ }, "scripts": { "build": "tsc", - "test": "npm run test-node && npm run test-browser", + "test": "npm run test-node", "test-one": "mocha --recursive --timeout 60000", "test-node": "mocha --recursive --timeout 60000 test/cli", - "test-profile": "mocha --recursive --timeout 60000 --prof test/cli", - "test-browser": "mocha-phantomjs ./testemu.html" + "test-profile": "mocha --recursive --timeout 60000 --prof test/cli" }, "repository": { "type": "git", diff --git a/src/worker/workermain.js b/src/worker/workermain.js index ad14e597..3e78824f 100644 --- a/src/worker/workermain.js +++ b/src/worker/workermain.js @@ -394,6 +394,8 @@ function extractErrors(regex, strings) { return errors; } +// TODO: "of" doesn't work in MSIE + function parseListing(code, lineMatch, iline, ioffset, iinsns, origin) { var lines = []; origin |= 0; @@ -725,7 +727,7 @@ function compileCC65(step) { load("cc65"); var params = step.params; // stderr - var re_err1 = /.*?(\d+).*?: (.+)/; + var re_err1 = /.*?[(](\d+)[)].*?: (.+)/; var errors = []; var errline = 0; function match_fn(s) {