From ec6ce6b448f218a606731003ef769a70ea2f3c2e Mon Sep 17 00:00:00 2001 From: Steven Hugg Date: Sat, 9 Nov 2019 20:38:09 -0600 Subject: [PATCH] minor fixes --- src/codemirror/6502.js | 3 +-- src/codemirror/bataribasic.js | 3 +-- src/platform/nes.ts | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/codemirror/6502.js b/src/codemirror/6502.js index 28747d8b..52d4ea7d 100644 --- a/src/codemirror/6502.js +++ b/src/codemirror/6502.js @@ -23,8 +23,7 @@ CodeMirror.defineMode('6502', function(_config, parserConfig) { 'align','subroutine','equ','eqm','set','mac','endm','mexit','ifconst', 'ifnconst','if','else','endif','eif','repeat','repend']; var directives = {}; - for (var s of directives_list) - directives[s] = 'keyword'; + directives_list.forEach(function(s) { directives[s] = 'keyword'; }); var opcodes = /^[a-z][a-z][a-z]\b/i; var numbers = /^([\da-f]+h|[0-7]+o|[01]+b|\d+d?)\b/i; diff --git a/src/codemirror/bataribasic.js b/src/codemirror/bataribasic.js index db5a04b8..b7a3aa49 100644 --- a/src/codemirror/bataribasic.js +++ b/src/codemirror/bataribasic.js @@ -43,8 +43,7 @@ CodeMirror.defineMode('bataribasic', function(_config, parserConfig) { "cyclescore","cycles","legacy" ]; var directives = {}; - for (var s of directives_list) - directives[s] = 'keyword'; + directives_list.forEach(function(s) { directives[s] = 'keyword'; }); var numbers = /^([$][0-9a-f]+|[%][01]+|[0-9.]+)/i; diff --git a/src/platform/nes.ts b/src/platform/nes.ts index 36b8198a..6a35d188 100644 --- a/src/platform/nes.ts +++ b/src/platform/nes.ts @@ -133,7 +133,7 @@ class JSNESPlatform extends Base6502Platform implements Platform, Probeable { this.nes.stop = () => { // TODO: trigger breakpoint console.log(this.nes.cpu.toJSON()); - throw new EmuHalt("CPU STOPPED @ PC $" + hex(this.nes.cpu.REG_PC)); + throw new EmuHalt("CPU STOPPED"); }; // insert debug hook this.nes.cpu._emulate = this.nes.cpu.emulate;