renumbas: warn if input is A+ or Integer.

4 files changed, 33 insertions, 15 deletions

diff --git a/bas.c b/bas.c
index 59324cf..5758110 100644
--- a/bas.c
+++ b/bas.c
@@ -150,6 +150,7 @@ void parse_header(void) {
 
 	/* these checks are actually kind of conservative. */
 	if(lomem == 0x77) {
+		numconst_size = 2;
 		if(verbose)
 			fprintf(stderr, "OSS Integer BASIC $7700 signature found, OK.\n");
 	} else if(lomem == 0) {
diff --git a/renumbas.1 b/renumbas.1
index e09480c..1d52523 100644
--- a/renumbas.1
+++ b/renumbas.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "RENUMBAS" 1 "2025-03-11" "0.2.2" "Urchlay's Atari 8-bit Tools"
+.TH "RENUMBAS" 1 "2025-03-27" "0.2.2" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 renumbas \- Renumber Atari 8-bit BASIC programs
 .SH SYNOPSIS
@@ -38,9 +38,10 @@ renumbas [\fB\-v\fP] [\fB\-s\fP \fIstart\-lineno\fP] [\fB\-i\fP \fIincrement\fP]
 \fBrenumbas\fP reads a tokenized Atari 8\-bit BASIC program and writes a
 renumbered copy of the program.
 .sp
-\fBinput\-file\fP must be a tokenized (SAVEd) Atari BASIC program. Use
-\fI\-\fP to read from standard input, but \fBrenumbas\fP will refuse to
-read from standard input if it\(aqs a terminal.
+\fBinput\-file\fP must be a tokenized (SAVEd) Atari BASIC, BASIC XL,
+BASIC XE, or Turbo BASIC program. Use \fI\-\fP to read from standard input,
+but \fBrenumbas\fP will refuse to read from standard input if it\(aqs a
+terminal.
 .sp
 \fBoutput\-file\fP will be the renumbered BASIC program. If it already
 exists, it will be overwritten. Use \fI\-\fP to write to standard output,
@@ -48,10 +49,12 @@ but \fBrenumbas\fP will refuse to write to standard output if it\(aqs a
 terminal (since tokenized BASIC is binary data and may confuse the
 terminal).
 .sp
-Line number references are changed in every line where they occur, so
-e.g. if line 100 gets changed to 200, any other line that does a \fIGOTO\fP
-\fI100\fP (or \fIGOSUB\fP, \fIRESTORE\fP, \fITRAP\fP, etc) will be updated with the new line
-number.
+Line number references are changed in every line where they occur,
+so e.g. if line 100 gets changed to 200, any other line that does a
+\fIGOTO\fP \fI100\fP (or \fIGOSUB\fP, \fIRESTORE\fP, \fITRAP\fP, etc) will be updated with
+the new line number. If the input is BASIC/A+ or OSS Integer BASIC,
+the line numbers will be changed, but references to them \fIwill not\fP
+be updated (a warning will be printed to stderr, in that case).
 .sp
 Computed line numbers can\(aqt be updated (e.g. \fIGOTO A or GOSUB
 1000+A*100\fP). These will cause warnings on stderr, so you can fix them
diff --git a/renumbas.c b/renumbas.c
index 6f4f51e..963f7c1 100644
--- a/renumbas.c
+++ b/renumbas.c
@@ -122,6 +122,14 @@ void renumber(void) {
 	walk_all_code();
 }
 
+void check_basic_type(void) {
+	if(lomem == 0x77) {
+		fprintf(stderr, "%s: Warning: OSS Integer BASIC not fully supported.\n", self);
+	} else if(save_command_tok == 0x1d || save_command_tok == 0x48) {
+		fprintf(stderr, "%s: Warning: BASIC/A+ not fully supported.\n", self);
+	}
+}
+
 int main(int argc, char **argv) {
 	set_self(*argv);
 	parse_general_args(argc, argv, print_help);
@@ -129,6 +137,7 @@ int main(int argc, char **argv) {
 
 	readfile();
 	parse_header();
+	check_basic_type();
 
 	build_ref_table();
 	renumber();
diff --git a/renumbas.rst b/renumbas.rst
index a442ccb..bcfa996 100644
--- a/renumbas.rst
+++ b/renumbas.rst
@@ -14,12 +14,14 @@ renumbas [**-v**] [**-s** *start-lineno*] [**-i** *increment*] [**-f** *first-li
 
 DESCRIPTION
 ===========
+
 **renumbas** reads a tokenized Atari 8-bit BASIC program and writes a
 renumbered copy of the program. 
 
-**input-file** must be a tokenized (SAVEd) Atari BASIC program. Use
-*-* to read from standard input, but **renumbas** will refuse to
-read from standard input if it's a terminal.
+**input-file** must be a tokenized (SAVEd) Atari BASIC, BASIC XL,
+BASIC XE, or Turbo BASIC program. Use *-* to read from standard input,
+but **renumbas** will refuse to read from standard input if it's a
+terminal.
 
 **output-file** will be the renumbered BASIC program. If it already
 exists, it will be overwritten. Use *-* to write to standard output,
@@ -27,10 +29,13 @@ but **renumbas** will refuse to write to standard output if it's a
 terminal (since tokenized BASIC is binary data and may confuse the
 terminal).
 
-Line number references are changed in every line where they occur, so
-e.g. if line 100 gets changed to 200, any other line that does a *GOTO*
-*100* (or *GOSUB*, *RESTORE*, *TRAP*, etc) will be updated with the new line
-number.
+Line number references are changed in every line where they occur,
+so e.g. if line 100 gets changed to 200, any other line that does a
+*GOTO* *100* (or *GOSUB*, *RESTORE*, *TRAP*, etc) will be updated with
+the new line number. If the input is BASIC/A+ or OSS Integer BASIC,
+the line numbers will be changed, but references to them *will not*
+be updated (a warning will be printed to stderr, in that case).
+
 
 Computed line numbers can't be updated (e.g. *GOTO A or GOSUB
 1000+A*100*). These will cause warnings on stderr, so you can fix them