From: Mark Thom <markjordanthom@gmail.com>
Date: Mon, 25 Jun 2018 06:21:33 +0000 (-0600)
Subject: prepare module code
X-Git-Tag: v0.8.110~450
X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=fc11fda947e24520b8158255cc73c081c21aab49;p=scryer-prolog.git

prepare module code
---

diff --git a/src/prolog/compile.rs b/src/prolog/compile.rs
index 85414de1..815a4259 100644
--- a/src/prolog/compile.rs
+++ b/src/prolog/compile.rs
@@ -42,7 +42,7 @@ pub fn parse_code(wam: &mut Machine, buffer: &str) -> Result<TopLevelPacket, Par
     };
 
     let mut worker = TopLevelWorker::new(buffer.as_bytes(), atom_tbl, index);
-    worker.parse_code()
+    worker.parse_code(clause_name!("user"))
 }
 
 // throw errors if declaration or query found.
@@ -165,7 +165,7 @@ pub fn compile_listing(wam: &mut Machine, src_str: &str) -> EvalSession
         let indices = machine_code_index!(&mut code_dir, &mut op_dir, &wam.modules);
         let mut worker = TopLevelWorker::new(src_str.as_bytes(), wam.atom_tbl(), indices);
 
-        try_eval_session!(worker.parse_batch())
+        try_eval_session!(worker.parse_batch(clause_name!("user")))
     };
 
     for tl in tls {
diff --git a/src/prolog/machine/mod.rs b/src/prolog/machine/mod.rs
index 817b3063..888ddfe9 100644
--- a/src/prolog/machine/mod.rs
+++ b/src/prolog/machine/mod.rs
@@ -23,19 +23,19 @@ pub struct MachineCodeIndex<'a> {
     pub modules: &'a ModuleDir
 }
 
-impl ClauseType {
+impl<'a> MachineCodeIndex<'a> {
     pub(super)
-    fn lookup(indices: &mut MachineCodeIndex, name: ClauseName, arity: usize, fixity: Option<Fixity>) -> Self
+    fn lookup(&mut self, name: ClauseName, arity: usize, fixity: Option<Fixity>) -> ClauseType
     {
         match ClauseType::from(name, arity, fixity) {
             ClauseType::Named(name, _) => {
-                let idx = indices.code_dir.entry((name.clone(), arity))
+                let idx = self.code_dir.entry((name.clone(), arity))
                     .or_insert(CodeIndex::default());
 
                 ClauseType::Named(name, idx.clone())
             },
             ClauseType::Op(name, fixity, _) => {
-                let idx = indices.code_dir.entry((name.clone(), arity))
+                let idx = self.code_dir.entry((name.clone(), arity))
                     .or_insert(CodeIndex::default());
 
                 ClauseType::Op(name, fixity, idx.clone())
diff --git a/src/prolog/toplevel.rs b/src/prolog/toplevel.rs
index 7e106c58..982543bf 100644
--- a/src/prolog/toplevel.rs
+++ b/src/prolog/toplevel.rs
@@ -295,12 +295,13 @@ pub enum TopLevelPacket {
 }
 
 struct RelationWorker {
-    queue: VecDeque<VecDeque<Term>>
+    queue: VecDeque<VecDeque<Term>>,
+    source_mod: ClauseName
 }
 
 impl RelationWorker {
-    fn new() -> Self {
-        RelationWorker { queue: VecDeque::new() }
+    fn new(source_mod: ClauseName) -> Self {
+        RelationWorker { queue: VecDeque::new(), source_mod }
     }
 
     fn compute_head(&self, term: &Term) -> Vec<Term>
@@ -399,7 +400,7 @@ impl RelationWorker {
                 if name.as_str() == "!" || name.as_str() == "blocked_!" {
                     Ok(QueryTerm::BlockedCut)
                 } else {
-                    let ct = ClauseType::lookup(indices, name, 0, None);
+                    let ct = indices.lookup(name, 0, None);
                     Ok(QueryTerm::Clause(r, ct, vec![]))
                 },
             Term::Var(_, ref v) if v.as_str() == "!" =>
@@ -426,7 +427,7 @@ impl RelationWorker {
                         Err(ParserError::InadmissibleQueryTerm)
                     }
                 } else {
-                    let ct = ClauseType::lookup(indices, name, terms.len(), fixity);
+                    let ct = indices.lookup(name, terms.len(), fixity);
                     Ok(QueryTerm::Clause(Cell::default(), ct, terms))
                 },
             Term::Var(_, _) =>
@@ -581,18 +582,18 @@ impl<'a, R: Read> TopLevelWorker<'a, R> {
         }
     }
 
-    pub fn parse_batch(&mut self) -> Result<Vec<TopLevelPacket>, SessionError>
+    pub fn parse_batch(&mut self, source_mod: ClauseName) -> Result<Vec<TopLevelPacket>, SessionError>
     {
         let mut preds      = vec![];
         let mut results    = vec![];
         let mut mod_name   = clause_name!("user");
-        let mut rel_worker = RelationWorker::new();
+        let mut rel_worker = RelationWorker::new(source_mod.clone());
 
         while !self.parser.eof() {
             self.parser.reset(); // empty the parser stack of token descriptions.
             let term = self.parser.read_term(&self.indices.op_dir)?;
 
-            let mut new_rel_worker = RelationWorker::new();
+            let mut new_rel_worker = RelationWorker::new(source_mod.clone());
             let tl = new_rel_worker.try_term_to_tl(&mut self.indices, term, true)?;
 
             if !is_consistent(&tl, &preds) {  // if is_consistent returns false, preds is non-empty.
@@ -634,9 +635,9 @@ impl<'a, R: Read> TopLevelWorker<'a, R> {
         Ok(results)
     }
 
-    pub fn parse_code(&mut self) -> Result<TopLevelPacket, ParserError>
+    pub fn parse_code(&mut self, source_mod: ClauseName) -> Result<TopLevelPacket, ParserError>
     {
-        let mut rel_worker = RelationWorker::new();
+        let mut rel_worker = RelationWorker::new(source_mod);
 
         let terms   = self.parser.read(self.indices.op_dir)?;
         let mut tls = rel_worker.try_terms_to_tls(&mut self.indices, terms, true)?;