restore parse_term to toplevel

diff --git a/src/prolog/compile.rs b/src/prolog/compile.rs
index a8949429b6215c68ac9dffd4d28f08532ef2dca9..4eaafc8a77317d6e99458a27085015d4445ced0f 100644 (file)
--- a/src/prolog/compile.rs
+++ b/src/prolog/compile.rs
@@ -271,7 +271,7 @@ fn compile_listing<'a, R: Read>(wam: &mut Machine, src: R, mut indices: MachineC
     let mut compiler = ListingCompiler::new();
     let mut toplevel_results = vec![];
 
-    while let Some(decl) = try_eval_session!(worker.consume(&wam.op_dir, &mut indices)) {
+    while let Some(decl) = try_eval_session!(worker.consume(wam, &mut indices)) {
         if decl.is_module_decl() {
             toplevel_indices.copy_and_swap(&mut indices);
             mem::swap(&mut worker.results, &mut toplevel_results);

diff --git a/src/prolog/instructions.rs b/src/prolog/instructions.rs
index d2d6636c5ffbccdbd887826f1d371aecec47ca59..8e5168afcdb4cba416ed0fadb04d36b9f41db71e 100644 (file)
--- a/src/prolog/instructions.rs
+++ b/src/prolog/instructions.rs
@@ -195,7 +195,7 @@ pub type ModuleCodeDir = HashMap<PredicateKey, ModuleCodeIndex>;
 
 pub type CodeDir = HashMap<PredicateKey, CodeIndex>;
 
-//pub type TermDir = HashMap<PredicateKey, Predicate>;
+pub type TermDir = HashMap<PredicateKey, Predicate>;
 
 pub type ModuleDir = HashMap<ClauseName, Module>;
 

diff --git a/src/prolog/machine/mod.rs b/src/prolog/machine/mod.rs
index 234907477514eee9f762f1e2de74fa403148225a..de4c613f059a95dcdce8ee94134db17a24a595e9 100644 (file)
--- a/src/prolog/machine/mod.rs
+++ b/src/prolog/machine/mod.rs
@@ -53,7 +53,7 @@ pub struct Machine {
     code: Code,
     pub(super) code_dir: Rc<RefCell<CodeDir>>,
     pub(super) op_dir: OpDir,
-    // term_dir: TermDir,
+//    term_dir: TermDir,
     pub(super) modules: ModuleDir,
     cached_query: Option<Code>
 }

diff --git a/src/prolog/term_writer.rs b/src/prolog/term_writer.rs
deleted file mode 100644 (file)
index 84cb149..0000000
--- a/src/prolog/term_writer.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use prolog_parser::ast::*;
-
-use prolog::heap_iter::*;
-use prolog::instructions::HeapCellValue;
-use prolog::machine::machine_state::MachineState;
-
-pub fn term_write(machine_st: &'a MachineState, addr: Addr) -> Result<Term, ParserError> {
-    let pre_order_iter  = HCPreOrderIterator::new(machine_st, addr);
-    let post_order_iter = HCPostOrderIterator::new(pre_order_iter);
-    let acyclic_post_order_iter = HCAcyclicIterator::new(post_order_iter);
-
-    let mut stack = vec![];
-    
-    for value in acyclic_post_order_iter {
-        match value {
-            HeapCellValue::NamedStr(arity, name, fixity)
-                if stack.len() >= arity => {
-                    let subterms: Vec<_> = stack[stack.len() - arity ..].drain().collect();
-                    stack.push(Box::new(Term::Clause(Cell::default(), name, subterms, fixity)));
-                },
-            HeapCellValue::Addr(Addr::Con(constant)) =>
-                stack.push(Box::new(Term::Constant(Cell::default(), constant))),
-            HeapCellValue::Addr(Addr::Lis(_))
-                if stack.len() >= 2 => {
-                    let subterms: Vec<_> = stack[stack.len() - 2 ..].drain().collect();                    
-                    stack.push(Box::new(Term::Cons(Cell::default(), subterms[0], subterms[1])));
-                },
-            HeapCellValue::Addr(Addr::HeapCell(h)) =>
-                stack.push(Box::new(Term::Var(Cell::default(), Rc::new(format!("_{}", h))))),
-            HeapCellValue::Addr(Addr::StackCell(fr, sc)) =>
-                stack.push(Box::new(Term::Var(Cell::default(), Rc::new(format!("_{}_{}", sc, fr))))),
-            _ => return Err(ParserError::IncompleteReduction)
-        }
-    }
-
-    if let Some(term) = stack.pop() {
-        if stack.is_empty() {
-            return Ok(term);
-        } 
-    }
-
-    Err(ParserError::IncompleteReduction)
-}

diff --git a/src/prolog/toplevel.rs b/src/prolog/toplevel.rs
index 27b0ce24fbdf3aa31fb43c480274b3490d9786eb..2c752f96eff73ee3ca2490615b755a582c862e4c 100644 (file)
--- a/src/prolog/toplevel.rs
+++ b/src/prolog/toplevel.rs
@@ -669,6 +669,13 @@ impl RelationWorker {
     }
 }
 
+// used to parse queries in test. mostly.
+pub fn parse_term<R: Read>(wam: &Machine, buf: R) -> Result<Term, ParserError>
+{
+    let mut parser = Parser::new(buf, wam.atom_tbl(), wam.machine_flags());
+    parser.read_term(composite_op!(&wam.op_dir))
+}
+
 pub
 fn consume_term<'a>(static_code_dir: Rc<RefCell<CodeDir>>, term: Term,
                     mut indices: MachineCodeIndices<'a>)
@@ -710,7 +717,7 @@ impl<R: Read> TopLevelBatchWorker<R> {
     }
 
     pub
-    fn consume<'a, 'b : 'a>(&mut self, op_dir: &OpDir, indices: &'a mut MachineCodeIndices<'b>)
+    fn consume<'a, 'b : 'a>(&mut self, wam: &mut Machine, indices: &'a mut MachineCodeIndices<'b>)
                            -> Result<Option<Declaration>, SessionError>
     {
         let mut preds = vec![];
@@ -721,7 +728,7 @@ impl<R: Read> TopLevelBatchWorker<R> {
             self.parser.reset(); // empty the parser stack of token descriptions.
 
             let mut new_rel_worker = RelationWorker::new();
-            let term = self.read_term(op_dir, &indices.local.op_dir)?;          
+            let term = self.read_term(&wam.op_dir, &indices.local.op_dir)?;          
                 
             let tl = new_rel_worker.try_term_to_tl(&mut indices, term, true)?;