From 4e9dcf71e02a9cdd0403c9b1eca872bb5169976f Mon Sep 17 00:00:00 2001 From: minjaesong Date: Tue, 16 Jun 2020 08:15:57 +0900 Subject: [PATCH] ^C works now --- assets/JS_INIT.js | 4 ++-- assets/tbas/basic.js | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/assets/JS_INIT.js b/assets/JS_INIT.js index 899d977..b967967 100644 --- a/assets/JS_INIT.js +++ b/assets/JS_INIT.js @@ -33,11 +33,11 @@ con.getyx = function() { }; con.hitterminate = function() { // ^C sys.poke(-40, 1); - return (sys.peek(-41) == 31 && (sys.peek(-41) == 129 || sys.peek(-41) == 130)); + return (sys.peek(-41) == 31 && (sys.peek(-42) == 129 || sys.peek(-42) == 130)); }; con.hiteof = function() { // ^D sys.poke(-40, 1); - return (sys.peek(-41) == 32 && (sys.peek(-41) == 129 || sys.peek(-41) == 130)); + return (sys.peek(-41) == 32 && (sys.peek(-42) == 129 || sys.peek(-42) == 130)); }; con.color_fore = function(n) { // 0..7; -1 for transparent if (n < 0) diff --git a/assets/tbas/basic.js b/assets/tbas/basic.js index 94f833a..bd123d9 100644 --- a/assets/tbas/basic.js +++ b/assets/tbas/basic.js @@ -17,9 +17,9 @@ var cmdbufMemFootPrint = 0; var prompt = "Ok"; var lang = {}; -lang.badNumberFormat = "Bad number format"; -lang.badOperatorFormat = "Bad number format"; -lang.badFunctionCallFormat = "Bad function call format"; +lang.badNumberFormat = "Illegal number format"; +lang.badOperatorFormat = "Illegal number format"; +lang.badFunctionCallFormat = "Illegal function call"; lang.unmatchedBrackets = "Unmatched brackets"; lang.syntaxfehler = function(line, reason) { return "Syntax error" + ((line !== undefined) ? (" in "+line) : "") + (reason !== undefined) ? (": "+reason) : ""; @@ -1170,9 +1170,6 @@ basicFunctions.fre = function(args) { basicFunctions.run = function(args) { // RUN function var linenumber = 1; var oldnum = 1; - - var countup = 0; - do { if (cmdbuf[linenumber] !== undefined) { oldnum = linenumber; @@ -1181,8 +1178,7 @@ basicFunctions.run = function(args) { // RUN function else { linenumber += 1; } - countup += 1; - if (con.hitterminate() || countup >= 100) { + if (con.hitterminate()) { println("Break in "+oldnum); break; }