Fix TSP

CHANGELOG.md

@@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file. See [Keep a
 
 ### Changed
 
+- `TSP` is now correctly identified by the disassembler, rather than becoming `BNG`.
 - The web interface now indicates when the URL is invalid.
 
 ## [1.8.2] - 2024-05-03

src/instruction.hh

@@ -69,6 +69,12 @@ public:
         return instruction(operation::BNG, arg);
     }
 
+    static CONSTEXPR_UNION instruction spawn_to(pair<pair<size_t>> choice) noexcept {
+        argument arg;
+        arg.choice = choice;
+        return instruction(operation::TSP, arg);
+    }
+
     constexpr bool is_exit() const noexcept { return m_op == operation::EXT || m_op == operation::TKL; }
     constexpr bool is_join() const noexcept { return m_op == operation::TJN; }
     constexpr bool is_nop() const noexcept { return m_op == operation::NOP; }

src/instruction_scanner.cpp

@@ -134,7 +134,11 @@ void instruction_scanner::build_state() {
                     second_dest = loc->second;
                 }
 
-                fragment->push_back(instruction::branch_to({ first_dest, second_dest }));
+                if (op == static_cast<int24_t>(THR_E) || op == static_cast<int24_t>(THR_W)) {
+                    fragment->push_back(instruction::spawn_to({ first_dest, second_dest }));
+                } else {
+                    fragment->push_back(instruction::branch_to({ first_dest, second_dest }));
+                }
             } else {
                 fragment->push_back(instruction::jump_to(loc->second));
             }

tests/cli/disassembler/cat.trg

@@ -0,0 +1,4 @@
+   <
+  > i
+ , @ #
+# o . .

tests/cli/disassembler/index.sh

@@ -1,8 +1,40 @@
 #!/bin/bash
 
-set -euo pipefail
+set -uo pipefail
 
 folder=$(dirname "$0")
 
+# https://stackoverflow.com/a/20460402/6253337
+string_contain () {
+    case "$2" in
+        *"$1"*)
+            return 0
+            ;;
+        *)
+            return 1
+            ;;
+    esac
+}
+
+tsp_disassembly=$($TRILANGLE -D "${folder}/tsp.trg")
+
+if string_contain BNG "$tsp_disassembly"
+then
+  exit 1
+fi
+
+set -e
+
+string_contain TSP "$tsp_disassembly"
+
 test 6 -eq "$($TRILANGLE -D "${folder}/nopful.trg" | wc -l)"
 test 1 -eq "$($TRILANGLE -Dn "${folder}/nopful.trg" | wc -l)"
+
+cat_disassembly=$($TRILANGLE -Dn "${folder}/cat.trg")
+test "${cat_disassembly//$'\r'/}" = $'0.1:\tGTC
+0.2:\tBNG 2.0
+1.0:\tPTC
+1.1:\tPOP
+1.5:\tJMP 0.1
+2.0:\tPOP
+2.2:\tEXT'

tests/cli/disassembler/tsp.trg

@@ -0,0 +1,2 @@
+ .
+\ {