merge with master

2020-05-03 18:49:15 -06:00
parent b8400e0c92
commit b5368207d6
18 changed files with 852 additions and 166 deletions
--- a/src/prolog/machine/mod.rs
+++ b/src/prolog/machine/mod.rs
@@ -297,7 +297,7 @@ impl Machine {

            Ok(self.indices.insert_module(module))
        } else {
-            let err = ExistenceError::SourceSink(ModuleSource::File(
+            let err = ExistenceError::ModuleSource(ModuleSource::File(
                clause_name!("$toplevel"),
            ));

@@ -409,6 +409,15 @@ impl Machine {
                            )
        );

+        compile_user_module(&mut wam,
+                            Stream::from(PAIRS),
+                            true,
+                            ListingSource::from_file_and_path(
+                                clause_name!("pairs"),
+                                lib_path.clone(),
+                            )
+        );
+
        compile_user_module(&mut wam,
                            Stream::from(LISTS),
                            true,