Add comp_thic

src/instrs.rs

@@ -8,3 +8,4 @@ pub type Slot = (State, Color);
 pub type Instr = (Color, Shift, State);
 
 pub type CompThin = HashMap<Slot, Instr>;
+pub type CompThic = HashMap<Slot, Option<Instr>>;

src/lib.rs

@@ -30,7 +30,7 @@ mod rust_stuff {
 
     #[pymodule_export]
     use crate::parse::{
-        comp_thin, init_prog, parse_to_vec, read_slot, show_instr, show_slot, show_state,
+        comp_thic, comp_thin, init_prog, parse_to_vec, read_slot, show_instr, show_slot, show_state,
     };
 
     #[pymodule_export]

src/parse.rs

@@ -1,6 +1,6 @@
 use pyo3::prelude::*;
 
-use crate::instrs::{Color, CompThin, Instr, Shift, Slot, State};
+use crate::instrs::{Color, CompThic, CompThin, Instr, Shift, Slot, State};
 
 const UNDF: char = '.';
 
@@ -33,6 +33,19 @@ pub fn comp_thin(prog: &str) -> CompThin {
     program
 }
 
+#[pyfunction]
+pub fn comp_thic(prog: &str) -> CompThic {
+    let mut program = CompThic::new();
+
+    for (state, instrs) in parse(prog).enumerate() {
+        for (color, instr) in instrs.enumerate() {
+            program.insert((state as State, color as Color), instr);
+        }
+    }
+
+    program
+}
+
 /**************************************/
 
 fn read_color(color: char) -> Color {

tm/parse.py

@@ -3,6 +3,7 @@
 from tm.rust_stuff import (
     parse_to_vec as parse,
     comp_thin,
+    comp_thic,
     read_slot,
     init_prog,
 )
@@ -18,6 +19,7 @@
 Instr = tuple[Color, Shift, State]
 
 CompThin = dict[Slot, Instr]
+CompThic = dict[Slot, Instr | None]
 
 Switch = dict[Color, Instr | None]
 

tm/rust_stuff.pyi

@@ -23,13 +23,16 @@ Slot = tuple[State, Color]
 Instr = tuple[Color, Shift, State]
 
 CompThin = dict[Slot, Instr]
+CompThic = dict[Slot, Instr | None]
 
 LetterState = str
 
 def parse_to_vec(program: str) -> list[list[Instr | None]]: ...
 
 def comp_thin(program: str) -> CompThin: ...
 
+def comp_thic(program: str) -> CompThic: ...
+
 def halt_slots(prog: str) -> list[Slot]: ...
 
 def erase_slots(prog: str) -> list[Slot]: ...