6502
/
8bitworkshop
mirror of https://github.com/sehugg/8bitworkshop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed re bug for firefox; removed phantomjs

This commit is contained in:
Steven Hugg 2018-07-29 22:33:15 -04:00
parent 0b2e6e4e65
commit 5836b5abb4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codemirror

@ -1 +1 @@
Subproject commit 4334727f0e07acd4541b0a7b8f81a5984cd4aafe
Subproject commit ebf81921f80024e3e94c7a8e1235ab59464fa5ef

6
package.json
View File

@ -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",

4
src/worker/workermain.js
View File

@ -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) {