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

removal of old stackless iterator, implementation of new more faithful one

Browse Source
This commit is contained in:
Mark Thom
2022-04-02 17:30:04 -06:00
parent 7f85c682b8
commit c9a34bde3f
4 changed files with 285 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/machine/arithmetic_ops.rs
View File

@@ -1098,7 +1098,7 @@ impl MachineState {
pub(crate) fn arith_eval_by_metacall(&mut self, value: HeapCellValue) -> Result<Number, MachineStub> {
let stub_gen = || functor_stub(atom!("is"), 2);
let mut iter = stackless_post_order_iter(&mut self.heap, value);
let mut iter = stackful_post_order_iter(&mut self.heap, value); // was stackless!
while let Some(value) = iter.next() {
if value.is_forwarded() {
@@ -1125,8 +1125,8 @@ impl MachineState {
read_heap_cell!(value,
(HeapCellValueTag::Atom, (name, arity)) => {
if arity == 2 {
let a1 = self.interms.pop().unwrap();
let a2 = self.interms.pop().unwrap();
let a1 = self.interms.pop().unwrap();
match name {
atom!("+") => self.interms.push(drop_iter_on_err!(