rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into library-use-case

Browse Source 
# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	src/http.rs
#	src/machine/mock_wam.rs
#	src/machine/mod.rs
#	src/machine/system_calls.rs
This commit is contained in:
Nicolas Luck
2023-10-05 12:06:30 +02:00
parent fab5ca9440 1e60eeef34
commit 640c637ca8
35 changed files with 2010 additions and 1300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/machine/mod.rs
View File

@@ -60,6 +60,9 @@ use std::sync::atomic::AtomicBool;
use self::config::MachineConfig;
use self::parsed_results::*;
use tokio::runtime::Runtime;
use rand::rngs::StdRng;
use rand::SeedableRng;
lazy_static! {
pub static ref INTERRUPT: AtomicBool = AtomicBool::new(false);
@@ -76,6 +79,7 @@ pub struct Machine {
pub(super) load_contexts: Vec<LoadContext>,
#[cfg(feature = "ffi")]
pub(super) foreign_function_table: ForeignFunctionTable,
pub(super) rng: StdRng,
}
#[derive(Debug)]
@@ -487,6 +491,7 @@ impl Machine {
load_contexts: vec![],
#[cfg(feature = "ffi")]
foreign_function_table: Default::default(),
rng: StdRng::from_entropy(),
};
let mut lib_path = current_dir();
@@ -1178,7 +1183,7 @@ impl Machine {
let stub = functor_stub(name, arity);
let err = self
.machine_st
.module_resolution_error(module_name, name, arity);
.existence_error(ExistenceError::QualifiedProcedure { module_name, name, arity });
Err(self.machine_st.error_form(err, stub))
}
@@ -1206,7 +1211,7 @@ impl Machine {
let stub = functor_stub(name, arity);
let err = self
.machine_st
.module_resolution_error(module_name, name, arity);
.existence_error(ExistenceError::QualifiedProcedure { module_name, name, arity });
Err(self.machine_st.error_form(err, stub))
}