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

compare TypedArenaPtr<T> by value not pointer (#1362)

Browse Source
This commit is contained in:
Mark Thom
2022-03-22 00:55:44 -06:00
parent d916da9ba8
commit 067e2633af
4 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/machine/machine_state_impl.rs
View File

@@ -147,8 +147,9 @@ impl MachineState {
h as u64,
));
self.trail.push(TrailEntry::from_bytes(
list_loc_as_cell!(l).into_bytes()
self.trail.push(TrailEntry::build_with(
TrailEntryTag::TrailedAttachedValue,
l as u64,
));
self.tr += 2;
@@ -2379,15 +2380,14 @@ impl MachineState {
value: HeapCellValue,
stub_gen: impl Fn() -> FunctorStub,
) -> Result<Vec<HeapCellValue>, MachineStub> {
let deref_v = self.deref(value);
let store_v = self.store(deref_v);
let value = self.store(self.deref(value));
read_heap_cell!(store_v,
read_heap_cell!(value,
(HeapCellValueTag::Lis, l) => {
self.try_from_inner_list(vec![], l, stub_gen, store_v)
self.try_from_inner_list(vec![], l, stub_gen, value)
}
(HeapCellValueTag::PStrLoc, h) => {
self.try_from_partial_string(vec![], h, stub_gen, store_v)
self.try_from_partial_string(vec![], h, stub_gen, value)
}
(HeapCellValueTag::AttrVar | HeapCellValueTag::StackVar | HeapCellValueTag::Var) => {
let err = self.instantiation_error();
@@ -2397,7 +2397,7 @@ impl MachineState {
if name == atom!("[]") && arity == 0 {
Ok(vec![])
} else {
let err = self.type_error(ValidType::List, store_v);
let err = self.type_error(ValidType::List, value);
Err(self.error_form(err, stub_gen()))
}
}
@@ -2406,7 +2406,7 @@ impl MachineState {
Ok(cstr.chars().map(|c| char_as_cell!(c)).collect())
}
_ => {
let err = self.type_error(ValidType::List, store_v);
let err = self.type_error(ValidType::List, value);
Err(self.error_form(err, stub_gen()))
}
)
@@ -2423,16 +2423,15 @@ impl MachineState {
l += 1;
loop {
let deref_v = self.deref(self.heap[l]);
let store_v = self.store(self.heap[l]);
let value = self.store(self.deref(self.heap[l]));
read_heap_cell!(store_v,
read_heap_cell!(value,
(HeapCellValueTag::Lis, hcp) => {
result.push(self.heap[hcp]);
l = hcp + 1;
}
(HeapCellValueTag::PStrOffset) => {
return self.try_from_partial_string(result, deref_v.get_value(), stub_gen, a1);
(HeapCellValueTag::PStrLoc, l) => {
return self.try_from_partial_string(result, l, stub_gen, a1);
}
(HeapCellValueTag::Atom, (name, arity)) => {
if name == atom!("[]") && arity == 0 {
@@ -2443,7 +2442,7 @@ impl MachineState {
}
}
_ => {
if store_v.is_var() {
if value.is_var() {
let err = self.instantiation_error();
return Err(self.error_form(err, stub_gen()));
} else {