rewrite compiler again, bringing more in line with standard, and add readme

bench/bench_window.cpp

@@ -254,7 +254,7 @@ void bench_window::on_add_warrior_dialog_response(int response_id, Gtk::FileChoo
       on_click_new_round();
     }
     catch (const lib94::compiler_exception &ex) {
-      Gtk::MessageDialog *md = new Gtk::MessageDialog(std::string("failed to compile: ") + ex.message + " on line " + std::to_string(ex.line_number));
+      Gtk::MessageDialog *md = new Gtk::MessageDialog(std::string("failed to compile: ") + ex.message + " on line " + std::to_string(ex.source_line_number));
       md->set_transient_for(*this);
       md->set_modal();
       md->signal_response().connect([md](int) {delete md;});

include/lib94/lib94.hpp

@@ -60,13 +60,11 @@ namespace lib94 {
   std::string instruction_to_string(const instruction &instr);
 
   struct compiler_exception : public std::exception {
-    unsigned line_number;
+    unsigned source_line_number;
     std::string message;
   };
 
   warrior *compile_warrior(std::string source);
-  bool save_warrior(const warrior &w, const std::filesystem::path &to);
-  std::optional<warrior *> load_warrior(const std::filesystem::path &from);
 
   void clear_core(const instruction &background);
   void clear_core_random();

readme.txt

@@ -0,0 +1,38 @@
+=== building ===
+
+In order to compile this, you will need GNU Make, GCC, GNU LD, pkg-config, Open MPI, and gtkmm 4.
+
+On Debian, you can install all of these with
+  apt install make gcc binutils pkg-config openmpi-bin libgtkmm-4.0-dev
+
+On macOS with Homebrew, you can install all of these with
+  brew install make gcc binutils pkg-config open-mpi gtkmm4
+
+Then, to build all of the software, just run make.
+
+=== core war standard ===
+
+lib94 attempts to follow the draft standard at <https://corewar.co.uk/standards/icws94.txt>, minus P-space. There are no read/write
+limits (or if you prefer, they are the same as the core size). The minimum separation is always 0, and the core size is set at 8000.
+To change the core size, change LIB94_CORE_SIZE in include/lib94/lib94.hpp, run make clean, and then run make.
+
+=== bench ===
+
+The "bench" program (short for test bench) is intended for testing out warriors and seeing exactly what they do. It allows you to
+single step, or run at a variety of rates. It has a large display which shows core reads/writes/executions as they happen, and a
+listing of all of the instructions in the core. It also shows "alive" warriors, their instruction pointer for the next step, and
+how many processes they have.
+
+To open bench, just run bin/bench after building as above.
+
+=== tabulator ===
+
+The "tabulator" program runs every possible pairing of warriors from a selection against each other a number of times, and then shows
+the number of wins of each warrior against each other warrior in a table format. This program uses MPI to run batches of these rounds
+in different processes, and communicate the results back to a head process.
+
+To run all of the included warriors against each other, run
+  mpirun bin/tabulator-mpi warriors/*.red
+
+Note that tabulator expects at least two processes (one head process and at least one worker). If you only have one core, you may run
+  mpirun -np 2 --oversubscribe bin/tabulator-mpi warriors/*.red

tabulator-mpi/main.cpp

@@ -21,7 +21,7 @@ const lib94::warrior *load_warrior(const char *file) {
   }
 
   catch (const lib94::compiler_exception &ex) {
-    fprintf(stderr, "error in %s on line %u: %s\n", file, ex.line_number, ex.message.c_str());
+    fprintf(stderr, "error in %s on line %u: %s\n", file, ex.source_line_number, ex.message.c_str());
     exit(1);
   }
 }

warriors/epson.red

@@ -4,10 +4,10 @@
 intrascan_period equ 10
 interscan_period equ 2
 
-;interscan period must divide intrascan period
-;intrascan period must divide 8000
+;assert intrascan_period % interscan_period == 0
+;assert CORESIZE % intrascan_period == 0
 
-scan_init equ the_end - scan - (the_end - scan) % intrascan_period + intrascan_period
+scan_init equ (the_end - scan - (the_end - scan) % intrascan_period + intrascan_period)
 
 scan
   seq.i -intrascan_period, scan_init