read modifications

diff --git a/src/prolog/machine/machine_state.rs b/src/prolog/machine/machine_state.rs
index 6d85fd02ab6693eeb1345416d4bae62c97275750..f2e05c7b64f1c26a651abdf9c3f66feea946610d 100644 (file)
--- a/src/prolog/machine/machine_state.rs
+++ b/src/prolog/machine/machine_state.rs
@@ -43,10 +43,6 @@ pub(crate) struct CodeDirs<'a> {
 }
 
 impl<'a> CodeDirs<'a> {
-    pub(super) fn new(code_dir: &'a CodeDir, op_dir: &'a OpDir, modules: &'a ModuleDir) -> Self {
-        CodeDirs { code_dir, op_dir, modules }
-    }
-
     fn get_internal(&self, name: ClauseName, arity: usize, in_mod: ClauseName) -> Option<ModuleCodeIndex> {
         self.modules.get(&in_mod)
             .and_then(|ref module| module.code_dir.get(&(name, arity)))

diff --git a/src/prolog/read.rs b/src/prolog/read.rs
index ffba2635a02c850fc62240e5044acac2a875ae8e..7762923861367ec3ad1faa37e17f69ff8ae84160 100644 (file)
--- a/src/prolog/read.rs
+++ b/src/prolog/read.rs
@@ -30,27 +30,49 @@ impl<'a> Reader<'a> {
         Reader { machine_st }
     }
 
-    pub fn read_stdin(&mut self, op_dir: &'a OpDir) -> Result<usize, ParserError> {
-        let mut buffer = String::new();
+    fn read_term(&self, buffer: &String, op_dir: &'a OpDir) -> Result<Term, ParserError>  {
+        let mut parser = Parser::new(buffer.as_bytes(), self.machine_st.atom_tbl.clone(),
+                                     self.machine_st.machine_flags());
 
+        parser.read_term(op_dir)
+    }
+    
+    fn read_term_loop(&mut self, buffer: &mut String, op_dir: &'a OpDir) -> Result<Term, ParserError> {
         let stdin = stdin();
-        let flags = self.machine_st.machine_flags();
-
+        
         loop {
-            let mut append_buf = String::new();
+            match self.read_term(&buffer, op_dir) {
+                Err(ParserError::UnexpectedEOF) => {},
+                result => return result
+            };
+             
+            let mut append_buf = String::new();            
             stdin.read_line(&mut append_buf).unwrap();
+            *buffer += append_buf.as_str();            
+        }
+    }
+/*    
+    pub fn repl_read(&mut self, op_dir: &'a OpDir) -> Result<Vec<Term>, ParserError> {
+        let mut buffer = String::new();
 
-            buffer += append_buf.as_str();
+        stdin().read_line(&mut buffer);
 
-            let mut parser = Parser::new(buffer.as_bytes(), self.machine_st.atom_tbl.clone(), flags);
+        if buffer.as_str() == "[user]" {
+            let locked = stdin().lock();
+            let mut parser = Parser::new(locked, self.machine_st.atom_tbl.clone(),
+                                         self.machine_st.flags());
 
-            match parser.read_term(op_dir) {
-                Err(ParserError::UnexpectedEOF) => continue,
-                Err(e) => return Err(e),
-                Ok(term) => return Ok(self.write_term_to_heap(term))
-            };
+            parser.read(op_dir)
+        } else {
+            Ok(vec![self.read_term_loop(buffer, op_dir)?])
         }
     }
+*/
+    pub fn read_stdin(&mut self, op_dir: &'a OpDir) -> Result<usize, ParserError>
+    {
+        let term = self.read_term_loop(&mut String::new(), op_dir)?;
+        Ok(self.write_term_to_heap(term))
+    }
 
     fn push_stub_addr(&mut self) {
         let h = self.machine_st.heap.h;