ref: make thor reference explicit

Author: panstromek

crates/engine/src/zebra.rs

@@ -212,7 +212,7 @@ pub fn next_state<
     ComputeMoveOut: ComputeMoveOutput,
     FE: FrontEnd,
     Thor: ThorDatabase
->(play_state: &mut PlayGame<Source>, move_attempt: Option<MoveAttempt>) -> PlayGameState {
+>(play_state: &mut PlayGame<Source>, move_attempt: Option<MoveAttempt>, thor: &Thor) -> PlayGameState {
     play_state.state = match play_state.state {
         PlayGameState::Initial => {
             /* Decode the predefined move sequence */

crates/legacy-zebra/src/error.rs

@@ -78,8 +78,7 @@ pub fn fatal_error_(args: std::fmt::Arguments<'_>) -> ! {
     std::process::exit(1);
 }
 
-pub struct LibcFatalError; // FIXME rename this, it's not only error anymore
-pub type FE = LibcFatalError;
+pub struct LibcFatalError;
 
 impl LibcFatalError {
     pub fn choose_thor_opening_move_report(freq_sum: i32, match_count: i32, move_list: &[C2RustUnnamed; 64]) {

crates/legacy-zebra/src/zebra.rs

@@ -26,7 +26,7 @@ use engine::src::zebra::EvalResult::{LOST_POSITION, WON_POSITION};
 use engine::src::zebra::GameMode::{PRIVATE_GAME, PUBLIC_GAME};
 use libc_wrapper::{scanf, stdout, time, c_time, time_t};
 use crate::src::display::{dumpch, display_state, TO_SQUARE};
-use crate::src::error::{FE, LibcFatalError};
+use crate::src::error::LibcFatalError;
 use crate::src::game::{legacy_compute_move, global_setup, BasicBoardFileSource, LibcZebraOutput, LogFileHandler};
 use crate::src::learn::{init_learn, LibcLearner};
 use crate::src::osfbook::print_move_alternatives;
@@ -757,7 +757,7 @@ fn play_game(mut file_name: &str,
     loop {
         let state = next_state::<
             ZF, Source, BoardSrc, ComputeMoveLog, ComputeMoveOut, FE, Thor
-        >(&mut play_state, move_attempt.take());
+        >(&mut play_state, move_attempt.take(), &LegacyThor);
         match state {
             // TODO here in all these branches, we should ideally not need mutable reference to play_state
             PlayGameState::End => {
@@ -1107,15 +1107,15 @@ unsafe fn analyze_game(mut move_string: &str, g_state : &mut FullState) {
     } else {
         provided_move_count = (move_string.len()).wrapping_div(2) as i32;
         if provided_move_count > 60 || (move_string.len()).wrapping_rem(2) == 1 {
-            FE::invalid_move_string_provided();
+            LibcFatalError::invalid_move_string_provided();
         }
         i = 0;
         let move_string = move_string.as_bytes();
         while i < provided_move_count {
             col = (*move_string.offset((2 * i) as isize) as char).to_ascii_lowercase() as u8 - b'a' + 1;
             row = *move_string.offset((2 * i + 1) as isize) - b'0';
             if col < 1 || col > 8 || row < 1 || row > 8 {
-                FE::unexpected_character_in_a_move_string();
+                LibcFatalError::unexpected_character_in_a_move_string();
             }
             provided_move[i as usize] = (10 * row + col) as i8;
             i += 1

webzebra/crate/src/lib.rs

@@ -296,7 +296,7 @@ impl ZebraGame {
         let mut play_state = &mut self.game;
         let state = next_state::<
             WasmFrontend, WasmInitialMoveSource, WasmBoardSource, WasmComputeMoveLogger, WasmFrontend, WasmFrontend, WasmThor
-        >(&mut play_state, move_attempt.take());
+        >(&mut play_state, move_attempt.take(), &WasmThor{});
         match state {
             PlayGameState::GetPass { provided_move_count } => {
                 // TODO signal this to frontend