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

run cargo fmt

Browse Source
This commit is contained in:
Mark Thom
2025-03-01 13:58:50 -08:00
committed by Mark Thom
parent ae4d12a123
commit 57f76169fd
4 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/heap_iter.rs
View File

@@ -2220,8 +2220,14 @@ mod tests {
assert_eq!(iter.next(), None);
}
assert_eq!(wam.machine_st.heap.slice_to_str(0, "a string".len()), "a string");
assert_eq!(wam.machine_st.heap[1], HeapCellValue::build_with(HeapCellValueTag::Cons, 0));
assert_eq!(
wam.machine_st.heap.slice_to_str(0, "a string".len()),
"a string"
);
assert_eq!(
wam.machine_st.heap[1],
HeapCellValue::build_with(HeapCellValueTag::Cons, 0)
);
for idx in 2..=3 {
assert!(!wam.machine_st.heap[idx].get_mark_bit());
@@ -2970,7 +2976,6 @@ mod tests {
assert_eq!(wam.machine_st.heap[4], heap_loc_as_cell!(0));
wam.machine_st.heap.clear();
}
#[test]

1
src/lib.rs
View File

@@ -2,7 +2,6 @@
#![recursion_limit = "4112"]
#![deny(missing_docs)]
#[macro_use]
extern crate static_assertions;

20
src/machine/gc.rs
View File

@@ -142,7 +142,10 @@ impl PStrLocValuesMap {
None => heap_slice.len(),
};
match heap_slice[pstr_loc..delimiter].iter().position(|b| *b == 0u8) {
match heap_slice[pstr_loc..delimiter]
.iter()
.position(|b| *b == 0u8)
{
Some(zero_byte_offset) => {
let tail_idx = if (zero_byte_offset + 1) % Heap::heap_cell_alignment() == 0 {
cell_index!(pstr_loc + zero_byte_offset) + 2
@@ -354,7 +357,8 @@ impl<'a, UMP: UnmarkPolicy> StacklessPreOrderHeapIter<'a, UMP> {
.pstr_loc_values
.progress_pstr_marking(self.heap.as_slice(), pstr_loc);
self.pstr_loc_values.insert_pstr_loc_value(self.current, pstr_loc);
self.pstr_loc_values
.insert_pstr_loc_value(self.current, pstr_loc);
if self.heap[tail_idx].get_forwarding_bit() {
return Some(self.backward_and_return());
@@ -379,10 +383,18 @@ impl<'a, UMP: UnmarkPolicy> StacklessPreOrderHeapIter<'a, UMP> {
}
}
HeapCellValueTag::Cons => {
match self.pstr_loc_values.hit_set.range(.. heap_index!(self.current + 1)).next_back() {
match self
.pstr_loc_values
.hit_set
.range(..heap_index!(self.current + 1))
.next_back()
{
Some((_prev_pstr_loc, &tail_idx)) if self.current + 1 == tail_idx => {
let pstr_loc_loc = self.heap[self.current].get_value() as usize;
let pstr_loc_val = self.pstr_loc_values.pstr_loc_loc_value(pstr_loc_loc).unwrap();
let pstr_loc_val = self
.pstr_loc_values
.pstr_loc_loc_value(pstr_loc_loc)
.unwrap();
self.heap[self.current].set_value(self.next);

21
src/machine/mock_wam.rs
View File

@@ -439,14 +439,23 @@ mod tests {
assert!(!wam.fail);
assert_eq!(wam.heap.slice_to_str(heap_index!(0), "this is a string".len()),
"this is a string");
assert_eq!(
wam.heap
.slice_to_str(heap_index!(0), "this is a string".len()),
"this is a string"
);
assert_eq!(wam.heap[3], pstr_loc_as_cell!(heap_index!(8)));
assert_eq!(wam.heap.slice_to_str(heap_index!(4), "this is a string".len()),
"this is a string");
assert_eq!(
wam.heap
.slice_to_str(heap_index!(4), "this is a string".len()),
"this is a string"
);
assert_eq!(wam.heap[7], pstr_loc_as_cell!(heap_index!(8)));
assert_eq!(wam.heap.slice_to_str(heap_index!(8), "this is a string".len()),
"this is a string");
assert_eq!(
wam.heap
.slice_to_str(heap_index!(8), "this is a string".len()),
"this is a string"
);
assert_eq!(wam.heap[11], pstr_loc_as_cell!(heap_index!(8)));
wam.heap.clear();