remove EMIT_NEWLINE (#1900)

diff --git a/src/machine/mod.rs b/src/machine/mod.rs
index d52dba694ad518aa983389af7653a423a248cf58..afbdda67d2c8d160b11e6951bf0a7d3b88e947b2 100644 (file)
--- 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 f6bc90d819606996e960ce4679a2175a2bed1af3..85d2692237cf68d536783ef8d3df61cbd67d294b 100644 (file)
--- 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 e5b3e8ba5d633e3710ff855348a4b6eec0448e8b..e23dc3028d4c2444e0860ea78c0e546c32856ba4 100644 (file)
--- 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";
                     }
                 }