From fd7f24e26598ce04df13a08b0b6a7542c76c8dae Mon Sep 17 00:00:00 2001 From: Mark Date: Sat, 22 Jul 2023 21:42:40 -0600 Subject: [PATCH] remove EMIT_NEWLINE (#1900) --- src/machine/mod.rs | 2 +- src/machine/system_calls.rs | 1 - src/read.rs | 14 ++------------ 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/machine/mod.rs b/src/machine/mod.rs index d52dba69..afbdda67 100644 --- a/src/machine/mod.rs +++ b/src/machine/mod.rs @@ -437,7 +437,7 @@ impl Machine { user_error, load_contexts: vec![], runtime, - foreign_function_table: Default::default(), + foreign_function_table: Default::default(), }; let mut lib_path = current_dir(); diff --git a/src/machine/system_calls.rs b/src/machine/system_calls.rs index f6bc90d8..85d26922 100644 --- a/src/machine/system_calls.rs +++ b/src/machine/system_calls.rs @@ -5797,7 +5797,6 @@ impl Machine { pub(crate) fn read_query_term(&mut self) -> CallResult { self.user_input.reset(); - set_emit_newline(true); set_prompt(true); // let result = self.machine_st.read_term(self.user_input, &mut self.indices); let result = self.machine_st.read_term_from_user_input(self.user_input, &mut self.indices); diff --git a/src/read.rs b/src/read.rs index e5b3e8ba..e23dc302 100644 --- a/src/read.rs +++ b/src/read.rs @@ -81,16 +81,8 @@ impl MachineState { } static mut PROMPT: bool = false; -static mut EMIT_NEWLINE: bool = false; - const HISTORY_FILE: &'static str = ".scryer_history"; -pub(crate) fn set_emit_newline(value: bool) { - unsafe { - EMIT_NEWLINE = value; - } -} - pub(crate) fn set_prompt(value: bool) { unsafe { PROMPT = value; @@ -171,10 +163,8 @@ impl ReadlineStream { PROMPT = false; } - if EMIT_NEWLINE { - if self.pending_input.get_ref().get_ref().chars().last() != Some('\n') { - *self.pending_input.get_mut().get_mut() += "\n"; - } + if self.pending_input.get_ref().get_ref().chars().last() != Some('\n') { + *self.pending_input.get_mut().get_mut() += "\n"; } } -- 2.54.0