Slight modifications following full code review

Author: cpp-tutor

Expr.d

@@ -120,19 +120,18 @@ class Dim2 : Expr {
     private Expr row, col;
     this(int i, Expr idx1, Expr idx2) {
         ident = i;
-        row = idx1;
-        col = idx2;
+        left = new Node(idx1, idx2);
     }
     override void codegen() {
-        row.codegen();
-        writeln("\tvcvt.s32.f64\ts0, d", row.result);
+        left.left.codegen();
+        writeln("\tvcvt.s32.f64\ts0, d", (cast(Expr)(left.left)).result);
         writeln("\tvmov\tr0, s0");
-        deallocateReg(row.result);
+        deallocateReg((cast(Expr)(left.left)).result);
         writeln("\tpush\t{ r0 }");
-        col.codegen();
-        writeln("\tvcvt.s32.f64\ts0, d", col.result);
+        left.right.codegen();
+        writeln("\tvcvt.s32.f64\ts0, d", (cast(Expr)(left.right)).result);
         writeln("\tvmov\tr2, s0");
-        setResult(col.result);
+        setResult((cast(Expr)(left.right)).result);
         writeln("\tpop\t{ r1 }");
         writeln("\tadrl\tr0, ._size2", symtab.getId(ident));
         writeln("\tldr\tr3, [r0, #4]"); // sz2

Mat.d

@@ -86,7 +86,6 @@ class MatPrint : Node {
     this(int id, bool p = false) {
         ident = id;
         packed = p;
-        //symtab.initializeMat(ident);
         type = symtab.getMatType(ident);
         if (type == 0) {
             symtab.error("NOT A MATRIX");

Node.d

@@ -48,7 +48,7 @@ class Node {
         writeln(".basic_end:");
         writeln("\tpop\t{ r0 }");
         writeln("\tcmn\tr0, #1");
-        writeln("\tmovne\tr0, #1"); // error: end within GOSUB/FN
+        writeln("\tmovne\tr0, #2"); // error: end within GOSUB/FN
         writeln("\tmovne\tr1, #", symtab.line & 0xff00);
         writeln("\torrne\tr1, r1, #", symtab.line & 0xff);
         writeln("\tblne\truntime_error(PLT)");

README.md

@@ -2,17 +2,15 @@
 
 Modern implementation of the original Dartmouth BASIC compilers from the 1960s in the D programming language.
 
-This software is currently under a state of rapid development and should therefore be considered alpha quaality.
-
-**Important Note**: The original version targeting 32-bit ARM is being moved to a separate branch (target-arm32), and it is unlikely much further work will be done. The focus of development is currently to support an LLVM target which will ultimately allow for compilation to native code (instead of ARM assembly language), as well as use of the LLVM optimizer.
+**Important Note**: This original version targeting 32-bit ARM is now in a separate branch (target-arm32), and it is unlikely much further work will be done. The focus of development for the main branch is currently to support an LLVM target which will ultimately allow for compilation to native code (instead of ARM assembly language), as well as use of the LLVM optimizer.
 
 ## Building
 
 ### Windows
 
 **Prerequisites:**
 
-* Bison parser generator `win_bison.exe` from https://github.com/lexxmark/winflexbison (to compile `grammar.y`). Note that a patch to the D skeleton file `d.m4` is currently required (see below); if running or patching WinFlexBison is not possible simply copy `Parser.d` out of the `autogen` directory.
+* Bison parser generator `win_bison.exe` from https://github.com/lexxmark/winflexbison (to compile `grammar.y`). Note that a patch to the D skeleton file `d.m4` is currently required (see below); if running or patching WinFlexBison is not possible simply copy `Parser.d` out of the `autogen` directory and remember to time-stamp it.
 
 * Recent D compiler `dmd.exe`, tested with Digital Mars D (DMD) v2.098.1 from https://dlang.org/download.html#dmd
 
@@ -38,7 +36,7 @@ This software is currently under a state of rapid development and should therefo
 
 **Prerequisites:**
 
-* Recent `bison` (ideally trunk from https://github.com/akimd/bison), versions available with a "testing" or rolling release distro (3.8.2.x or above) may work. Note that a patch to the D skeleton file `/usr/share/bison/skeletons/d.m4` is currently required (see below); if running or patching `bison` is not possible simply copy `Parser.d` out of the `autogen` directory.
+* Recent `bison` (ideally trunk from https://github.com/akimd/bison), versions available with a "testing" or rolling release distro (3.8.2 or above) may work. Note that a patch to the D skeleton file `/usr/share/bison/skeletons/d.m4` is currently required (see below); if running or patching `bison` is not possible simply copy `Parser.d` out of the `autogen` directory and `touch` it.
 
 * Recent D compiler, tested with both GNU `gdc` and LLVM `ldc`
 
@@ -90,7 +88,7 @@ The file `data\skeletons\d.m4` (WinFlexBison) or `/usr/share/bison/skeletons/d.m
 
 ### Windows
 
-The executable `dbasic.exe` reads from standard input and writes to standard output, optionally with the required numerical Language Edition (only 1-3 currently supported).
+The executable `dbasic.exe` reads from standard input and writes to standard output, optionally with the required numerical Language Edition (only 1-4 currently supported).
 
 The following command will compile the first example program `example-p12.bas` from the `examples` directory with First Edition compatibility, outputting the result to `test.s`:
 
@@ -115,7 +113,7 @@ gcc -o test test.s basic_lib.s -lm
 ./test
 ```
 
-### Linux (Debian/Ubuntu)
+### Linux (Debian/Ubuntu etc.)
 
 To compile the assembly language output and support library, the ARM cross-compiler toolchain is required, including `arm-linux-gnueabihf-gcc`, from issuing `apt install gcc-arm-linux-gnueabihf libc-dev-armhf-cross`
 
@@ -140,6 +138,12 @@ arm-linux-gnueabihf-gcc -o test test.s basic_lib.s -lm
 QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf qemu-arm ./test
 ```
 
+Alternatively use the executable shell script `run-linux.sh` to create and execute `a.out` with`qemu-arm`, eg:
+
+```
+./runtime/run-linux.sh examples/example-p12.bas
+```
+
 ### Linux (Arch-based)
 
 To compile the assembly language output and support library, the ARM cross-compiler toolchain is required, including `arm-none-linux-gnueabihf-gcc`, from AUR package `arm-none-linux-gnueabihf-toolchain-bin`
@@ -165,6 +169,12 @@ arm-none-linux-gnueabihf-gcc -o test test.s basic_lib.s -lm
 QEMU_LD_PREFIX=/usr/arm-none-linux-gnueabihf/libc qemu-arm ./test
 ```
 
+Alternatively use the executable shell script `run-arch.sh` to create and execute `a.out` with`qemu-arm`, eg:
+
+```
+./runtime/run-arch.sh examples/example-p12.bas
+```
+
 ## Resources
 
 Manual for the original 1964 Dartmouth BASIC: https://cs.bris.ac.uk/~dave/basic.pdf
@@ -193,6 +203,8 @@ Ultimately support for all of the early Dartmouth BASICs (First thru Sixth) is e
 
 * 2023/07/01: Tag 0.40.3 (bug fixes and code improvements) Basic The Fourth update
 
+* 2023/07/09: Tag 0.45.0 (bug fixes and code improvements) Basic The Fourth update **likely to be the final ARM release**
+
 ## Bugs
 
 Please do report bugs, together with correct or incorrect BASIC input files. I would recommend testing against the latest release or master branch, even if an earlier BASIC Edition is being used, as bugs will have been fixed while new features are being added.

runtime/basic_lib.c

@@ -4,7 +4,8 @@
 #include <string.h>
 #include <stdbool.h>
 
-#define TmpBufSz 16
+#define TmpBufSz 80
+#define MaxString 256
 
 extern int basic_run();
 
@@ -28,7 +29,7 @@ struct Data {
 };
 
 unsigned pos = 0, vpos = 0;
-const unsigned PrintWidth = 75, Comma = 15, SemiColon = 3, MaxString = 255;
+const unsigned PrintWidth = 75, Comma = 15, SemiColon = 3;
 
 void print_string(const char *s) {
     while (*s) {