From 1ec831b2e24cfa22983de603b5a83e51b38e072e Mon Sep 17 00:00:00 2001
From: Mark Thom <markjordanthom@gmail.com>
Date: Mon, 30 Sep 2019 14:09:02 -0600
Subject: [PATCH] limit scope of raw mode on stdout to allow interrupts to work

---
 src/prolog/machine/machine_state_impl.rs |  1 +
 src/prolog/machine/mod.rs                | 34 +++++++++++-------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/prolog/machine/machine_state_impl.rs b/src/prolog/machine/machine_state_impl.rs
index 836742bb..ba4f1b1b 100644
--- a/src/prolog/machine/machine_state_impl.rs
+++ b/src/prolog/machine/machine_state_impl.rs
@@ -3180,6 +3180,7 @@ impl MachineState {
 	let interrupted = INTERRUPT.load(std::sync::atomic::Ordering::Relaxed);
 
 	if INTERRUPT.compare_and_swap(interrupted, false, std::sync::atomic::Ordering::Relaxed) {
+	    self.reset();
 	    self.fail = true;
 	    return;
 	}
diff --git a/src/prolog/machine/mod.rs b/src/prolog/machine/mod.rs
index ece7bbea..0e6f3536 100644
--- a/src/prolog/machine/mod.rs
+++ b/src/prolog/machine/mod.rs
@@ -604,44 +604,42 @@ impl Machine {
                     stdout().flush().unwrap();
                 }
 
-                let mut raw_stdout = stdout().into_raw_mode().unwrap();
-
                 if !attr_goals.is_empty() {
                     if bindings.is_empty() {
-                        write!(raw_stdout, "{}", attr_goals).unwrap();
+			print!("{}", attr_goals);
                     } else {
-                        write!(raw_stdout, "{}, {}", bindings, attr_goals).unwrap();
+			print!("{}, {}", bindings, attr_goals);
                     }
                 } else if !bindings.is_empty() {
-                    write!(raw_stdout, "{}", bindings).unwrap();
+		    print!("{}", bindings);
                 }
 
                 if self.machine_st.b > 0 {
-                    raw_stdout.flush().unwrap();
-
-                    let result = match next_keypress() {
+		    let keypress = {
+			let mut raw_stdout = stdout().into_raw_mode().unwrap();
+			raw_stdout.flush().unwrap();
+			next_keypress()
+		    };
+		    
+                    let result = match keypress {
                         ContinueResult::ContinueQuery => {
-                            write!(raw_stdout, " ;\r\n").unwrap();
+			    print!(" ;\r\n");
                             self.continue_query(&alloc_locs)
                         }
                         ContinueResult::Conclude => {
-                            write!(raw_stdout, " ...\r\n").unwrap();
+			    print!(" ...\r\n");
                             self.machine_st.absorb_snapshot(snapshot);
                             return;
                         }
                     };
 
-                    let mut raw_stdout = stdout().into_raw_mode().unwrap();
-
                     match result {
                         EvalSession::QueryFailure => {
                             if self.machine_st.ball.stub.len() > 0 {
                                 self.propagate_exception_to_toplevel(snapshot);
                                 return;
                             } else {
-                                write!(raw_stdout, "false.\r\n").unwrap();
-                                raw_stdout.flush().unwrap();
-
+				print!("false.\r\n");
                                 self.machine_st.absorb_snapshot(snapshot);
                                 return;
                             }
@@ -655,7 +653,7 @@ impl Machine {
                     }
                 } else {
                     if bindings.is_empty() && attr_goals.is_empty() {
-                        write!(raw_stdout, "true.\r\n").unwrap();
+                        print!("true.\r\n");
                     } else {
                         let space = if !attr_goals.is_empty() {
                             if requires_space(&attr_goals, ".") {
@@ -671,7 +669,7 @@ impl Machine {
                             }
                         };
 
-                        write!(raw_stdout, "{}.\r\n", space).unwrap();
+			print!("{}.\r\n", space);
                     }
 
                     break;
@@ -693,7 +691,7 @@ impl Machine {
 
         self.machine_st.absorb_snapshot(snapshot);
     }
-
+    
     pub(super) fn run_query(&mut self, alloc_locs: &AllocVarDict) {
 	self.machine_st.cp = LocalCodePtr::TopLevel(0, self.code_repo.size_of_cached_query());
         let end_ptr = CodePtr::Local(self.machine_st.cp);
-- 
2.54.0