diff options
| -rw-r--r-- | bas.c | 18 | ||||
| -rw-r--r-- | bas.h | 2 | ||||
| -rw-r--r-- | int_tokens.c | 18 | ||||
| -rw-r--r-- | listbas.c | 16 |
4 files changed, 30 insertions, 24 deletions
@@ -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); @@ -203,9 +203,9 @@ extern char *output_filename; extern int verbose; extern int allow_hex_const; -extern int aplus_errtok_hack; extern int bxl_exttok_hack; extern int numconst_size; +extern int error_token; extern void set_self(const char *argv0); extern void die(const char *msg); diff --git a/int_tokens.c b/int_tokens.c index 8daccbc..9875e75 100644 --- a/int_tokens.c +++ b/int_tokens.c @@ -100,14 +100,14 @@ const char *int_ops[] = { ",", /* $10 */ ":", /* $11 */ ";", /* $12 */ - "\x1b", /* $13 */ - "GOTO", /* $14 */ - "GOSUB", /* $15 */ - "TO", /* $16 */ - "STEP", /* $17 */ + "", /* $13 */ + " GOTO ", /* $14 */ + " GOSUB ", /* $15 */ + " TO ", /* $16 */ + " STEP ", /* $17 */ "=", /* $18 */ "=", /* $19 */ - "THEN", /* $1A */ + " THEN ", /* $1A */ "#", /* $1B */ "^&", /* $1C */ "^!", /* $1D */ @@ -126,9 +126,9 @@ const char *int_ops[] = { "-", /* $2A */ "/", /* $2B */ "%", /* $2C */ - "NOT", /* $2D */ - "OR", /* $2E */ - "AND", /* $2F */ + " NOT ", /* $2D */ + " OR ", /* $2E */ + " AND ", /* $2F */ "!", /* $30 */ "&", /* $31 */ "(", /* $32 */ @@ -360,7 +360,6 @@ void print_int_number(unsigned int pos, int hex) { fprintf(outfh, "%d", num); } if(color) color_off(); - printf("end of print_int_number()\n"); } void print_bcd_number(unsigned int pos, int hex) { @@ -757,6 +756,7 @@ void indent_line(const unsigned char tok) { case B_TURBO: turbo_indent_line(tok); return; case B_BXL: bxl_indent_line(tok); return; case B_BXE: bxe_indent_line(tok); return; + /* TODO: case B_INT: int_indent_line(tok); return; */ case B_ATARI: default: return; @@ -772,6 +772,8 @@ CALLBACK(print_cmd) { if(bas_type == B_APLUS) { if(tok == 0x52) return; + } else if(bas_type == B_INT) { + if(tok == 0x37) return; } else { if(tok == CMD_ILET) return; } @@ -785,7 +787,7 @@ CALLBACK(print_cmd) { if(bas_type == B_BXL && tok == 0x5a) name = get_bxl_ext_name(program[pos + 1]); - if(mixed_case && (bas_type == B_BXL || bas_type == B_BXE)) { + if(mixed_case /* && (bas_type == B_BXL || bas_type == B_BXE) */) { print_mixed_case(name); outchr(' '); } else { @@ -1154,14 +1156,18 @@ void init_bas_dialect() { if(autodetect) detect_bas_dialect(); - if(bas_type == B_INT) + if(bas_type == B_INT) { numconst_size = 2; + error_token = 0x38; + allow_hex_const = 1; + mixed_case = 1; + } - if(bas_type == B_TURBO || bas_type == B_BXL || bas_type == B_BXE || bas_type == B_INT) + if(bas_type == B_TURBO || bas_type == B_BXL || bas_type == B_BXE) allow_hex_const = 1; if(bas_type == B_APLUS) - aplus_errtok_hack = 1; + error_token = 0x53; if(bas_type == B_BXL) bxl_exttok_hack = 1; |