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

Merge pull request #2026 from infogulch/master

Browse Source 
Simplify fn maybe
This commit is contained in:
Mark Thom
2023-09-21 11:31:35 -06:00
committed by GitHub
parent 54a0313d72 eecfeb2d03
commit 7484433e2b
3 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/machine/mock_wam.rs
View File

@@ -246,7 +246,7 @@ impl Machine {
runtime,
#[cfg(feature = "ffi")]
foreign_function_table: Default::default(),
rng: StdRng::from_entropy(),
rng: StdRng::from_entropy(),
};
let mut lib_path = current_dir();

2
src/machine/mod.rs
View File

@@ -475,7 +475,7 @@ impl Machine {
runtime,
#[cfg(feature = "ffi")]
foreign_function_table: Default::default(),
rng: StdRng::from_entropy(),
rng: StdRng::from_entropy(),
};
let mut lib_path = current_dir();

24
src/machine/system_calls.rs
View File

@@ -4215,23 +4215,7 @@ impl Machine {
#[inline(always)]
pub(crate) fn maybe(&mut self) {
fn generate_random_bits(rng: &mut rand::rngs::StdRng, num_bits: usize) -> u64 {
let mut random_bits: u64 = 0;
for _ in 0..num_bits {
random_bits <<= 1;
if rng.gen_bool(0.5) {
random_bits |= 1;
}
}
random_bits
}
let result = { generate_random_bits(&mut self.rng, 1) == 0 };
self.machine_st.fail = result;
self.machine_st.fail = self.rng.gen();
}
#[cfg(not(target_arch = "wasm32"))]
@@ -6182,18 +6166,18 @@ impl Machine {
Ok(Number::Fixnum(n)) => {
let n: u64 = Integer::from(n).try_into().unwrap();
let rng: StdRng = SeedableRng::seed_from_u64(n);
self.rng = rng;
self.rng = rng;
},
Ok(Number::Integer(n)) => {
let n: u64 = (&*n).try_into().unwrap();
let rng: StdRng = SeedableRng::seed_from_u64(n);
self.rng = rng;
self.rng = rng;
},
Ok(Number::Rational(n)) => {
if n.denominator() == &UBig::from(1 as u32) {
let n: u64 = n.numerator().try_into().unwrap();
let rng: StdRng = SeedableRng::seed_from_u64(n);
self.rng = rng;
self.rng = rng;
}
}
_ => {