diff options
Diffstat (limited to 'listbas.c')
| -rw-r--r-- | listbas.c | 47 |
1 files changed, 34 insertions, 13 deletions
@@ -18,6 +18,7 @@ #include "bxl_tokens.h" #include "bxe_tokens.h" #include "int_tokens.h" +#include "int_disk_tokens.h" #include "atables.h" #include "whichbas.h" @@ -26,7 +27,8 @@ #define B_APLUS SRET_APLUS #define B_BXL SRET_BXL #define B_BXE SRET_BXE -#define B_INT SRET_OSSINT +#define B_INT_C SRET_OSSINT_CART +#define B_INT_D SRET_OSSINT_DISK #define COLOR_FMT "\x1b[%d;3%dm" /* 1st %d is 1 for bold, 2nd is color */ @@ -137,8 +139,12 @@ int get_bas_type(char *arg) { if(arg[0] == 't') return B_TURBO; - if(arg[0] == 'i') - return B_INT; + if(arg[0] == 'i') { + if(arg[1] == 'd') + return B_INT_D; + else if(arg[1] == 'c') + return B_INT_C; + } if(arg[0] == 'a') { if(arg[1] == '+') @@ -377,7 +383,7 @@ void print_bcd_number(unsigned int pos, int hex) { } void print_number(unsigned int pos, int hex) { - if(bas_type == B_INT) + if(bas_type == B_INT_C || bas_type == B_INT_D) print_int_number(pos, hex); else print_bcd_number(pos, hex); @@ -756,7 +762,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; */ + /* TODO: case B_INT_C: int_indent_line(tok); return; */ case B_ATARI: default: return; @@ -772,8 +778,10 @@ CALLBACK(print_cmd) { if(bas_type == B_APLUS) { if(tok == 0x52) return; - } else if(bas_type == B_INT) { + } else if(bas_type == B_INT_C) { if(tok == 0x37) return; + } else if(bas_type == B_INT_D) { + if(tok == 0x35) return; } else { if(tok == CMD_ILET) return; } @@ -942,11 +950,11 @@ CALLBACK(print_op) { return; case OP_EOL: /* in Integer BASIC, this token is TO */ - if(bas_type != B_INT) return; + if((bas_type != B_INT_D) && (bas_type != B_INT_D)) return; break; case 0x13: /* in Integer BASIC, this is the real end-of-line token */ - if(bas_type == B_INT) return; + if(bas_type == B_INT_D || bas_type == B_INT_C) return; default: break; } @@ -956,7 +964,7 @@ CALLBACK(print_op) { fprintf(outfh, "(bad op token $%02x)", tok); badtok = 1; } else { - if(bas_type == B_BXL || bas_type == B_BXE || bas_type == B_INT) + if(bas_type == B_BXL || bas_type == B_BXE || bas_type == B_INT_C || bas_type == B_INT_D) print_mixed_case(name); else fprintf(outfh, "%s", name); @@ -1040,11 +1048,17 @@ void init_aplus_tables() { memmove(op_tokens, aplus_ops, aplus_ops_size); } +/* cartridge version */ void init_int_tables() { memmove(cmd_tokens, int_cmds, int_cmd_size); memmove(op_tokens, int_ops, int_ops_size); } +void init_int_disk_tables() { + memmove(cmd_tokens, int_disk_cmds, int_disk_cmd_size); + memmove(op_tokens, int_disk_ops, int_disk_ops_size); +} + void init_turbo_tables() { memmove(cmd_tokens + last_command + 1, turbo_cmds, turbo_cmd_size); memmove(op_tokens + last_operator + 1, turbo_ops, turbo_ops_size); @@ -1066,9 +1080,12 @@ void init_token_tables() { if(bas_type == B_APLUS) { init_aplus_tables(); return; - } else if(bas_type == B_INT) { + } else if(bas_type == B_INT_C) { init_int_tables(); return; + } else if(bas_type == B_INT_D) { + init_int_disk_tables(); + return; } init_bas_tables(); @@ -1106,7 +1123,8 @@ void set_bas_dialect(int d) { case SRET_TURBO: case SRET_BXL: case SRET_BXE: - case SRET_OSSINT: + case SRET_OSSINT_CART: + case SRET_OSSINT_DISK: bas_type = d; break; case SRET_AMSB: @@ -1161,9 +1179,12 @@ void init_bas_dialect() { if(autodetect) detect_bas_dialect(); - if(bas_type == B_INT) { + if(bas_type == B_INT_C || bas_type == B_INT_D) { numconst_size = 2; - error_token = 0x38; + if(bas_type == B_INT_C) + error_token = 0x38; + else + error_token = 0x36; allow_hex_const = 1; mixed_case = 1; } |