remove unnecessary parameter in compile_listing

diff --git a/src/prolog/compile.rs b/src/prolog/compile.rs
index 343a364bd5bbff08c26c000bde7a621fbeb40e1b..aa09b1b7600c61a4bc8f1165cb91aebf011bf476 100644 (file)
--- a/src/prolog/compile.rs
+++ b/src/prolog/compile.rs
@@ -99,8 +99,8 @@ fn compile_query(terms: Vec<QueryTerm>, queue: Vec<TopLevel>, flags: MachineFlag
 
 fn package_term(wam: &mut Machine, term: Term) -> Result<TopLevelPacket, ParserError> {
     let mut code_dir = wam.take_code_dir();
-    let packet = consume_term(&mut code_dir, term, &mut wam.indices)?;    
-    wam.swap_code_dir(&mut code_dir); 
+    let packet = consume_term(&mut code_dir, term, &mut wam.indices)?;
+    wam.swap_code_dir(&mut code_dir);
     Ok(packet)
 }
 
@@ -269,17 +269,16 @@ impl ListingCompiler {
 }
 
 pub
-fn compile_listing<R: Read>(wam: &mut Machine, src: R, mut indices: IndexStore,
-                            mut toplevel_indices: IndexStore)
-                            -> EvalSession
+fn compile_listing<R: Read>(wam: &mut Machine, src: R, mut indices: IndexStore) -> EvalSession
 {
     let code_dir = wam.take_code_dir();
     let mut worker = TopLevelBatchWorker::new(src, wam.indices.atom_tbl.clone(),
                                               wam.machine_flags(),
                                               code_dir);
-    
+
     let mut compiler = ListingCompiler::new();
     let mut toplevel_results = vec![];
+    let mut toplevel_indices = default_index_store!(wam.indices.atom_tbl.clone());
 
     while let Some(decl) = try_eval_session!(worker.consume(wam, &mut indices)) {
         if decl.is_module_decl() {
@@ -298,7 +297,7 @@ fn compile_listing<R: Read>(wam: &mut Machine, src: R, mut indices: IndexStore,
     }
 
     wam.swap_code_dir(&mut worker.static_code_dir);
-    
+
     let module_code = try_eval_session!(compiler.generate_code(worker.results, wam,
                                                                &mut indices.code_dir));
     let toplvl_code = try_eval_session!(compiler.generate_code(toplevel_results, wam,
@@ -319,10 +318,7 @@ fn setup_indices(wam: &Machine, indices: &mut IndexStore) -> Result<(), SessionE
 }
 
 pub fn compile_user_module<R: Read>(wam: &mut Machine, src: R) -> EvalSession {
-    let atom_tbl = wam.indices.atom_tbl.clone();    
-    let mut indices = default_index_store!(atom_tbl.clone());
-    
+    let mut indices = default_index_store!(wam.indices.atom_tbl.clone());
     try_eval_session!(setup_indices(&wam, &mut indices));
-    
-    compile_listing(wam, src, indices, default_index_store!(atom_tbl))
+    compile_listing(wam, src, indices)
 }

diff --git a/src/prolog/machine/mod.rs b/src/prolog/machine/mod.rs
index 49b421ae4657845facc1abe52be884e999360ef6..30dd08701b7a5d16719be4fc7961f035deb5a552 100644 (file)
--- a/src/prolog/machine/mod.rs
+++ b/src/prolog/machine/mod.rs
@@ -222,8 +222,7 @@ impl Machine {
         let atom_tbl = wam.indices.atom_tbl.clone();
         
         compile_listing(&mut wam, BUILTINS.as_bytes(),
-                        default_index_store!(atom_tbl.clone()),
-                        default_index_store!(atom_tbl));
+                        default_index_store!(atom_tbl.clone()));
 
         compile_user_module(&mut wam, LISTS.as_bytes());
         compile_user_module(&mut wam, CONTROL.as_bytes());