From 6366242989d797ace5590e4f792192bc60d67d3f Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Tue, 25 Mar 2025 00:16:41 -0400 Subject: listbas: improve support for OSS Integer BASIC. --- bas.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'bas.c') diff --git a/bas.c b/bas.c index 6973876..c582c2e 100644 --- a/bas.c +++ b/bas.c @@ -22,15 +22,16 @@ int verbose = 0; in sync with the token stream. */ int allow_hex_const = 0; -/* BASIC/A+ uses the same cmd tokens for REM and DATA that BASIC does, - but not for the ERROR- token. Unfortunately bas.c needs to know it's - an A+ program so it can handle this token correctly. */ -int aplus_errtok_hack = 0; - /* BASIC XL token 0x5a is followed by a single "subtoken", this skips it. */ int bxl_exttok_hack = 0; -int numconst_size = 6; /* 2 for OSS Integer BASIC */ +/* 2 for OSS Integer BASIC, 6 for the BCD constants in all others. */ +int numconst_size = 6; + +/* BASIC/A+ and OSS Integer use the same cmd tokens for REM and DATA that + BASIC does, but not for the ERROR- token. bas.c needs to know what + token is ERROR- so it can handle it correctly. */ +int error_token = CMD_ERROR; unsigned short lomem; unsigned short vntp; @@ -381,9 +382,8 @@ void walk_code(unsigned int startlineno, unsigned int endlineno) { CALL(on_cmd_token); tok = program[pos]; - if((tok == CMD_REM) || (tok == CMD_DATA) || /* same in A+ */ - (aplus_errtok_hack && tok == 0x53) || /* A+'s ERROR- */ - (!aplus_errtok_hack && tok == CMD_ERROR)) + if((tok == CMD_REM) || (tok == CMD_DATA) || /* same in all */ + tok == error_token) { pos++; CALL(on_text); -- cgit v1.2.3