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

Merge pull request #1861 from aarroyoc/fix-1855

Browse Source 
Allow comparisons with stream terms
This commit is contained in:
Mark Thom
2023-07-04 15:11:59 -06:00
committed by GitHub
parent c58d8804a1 076a75d138
commit d2db66b9f7
2 changed files with 155 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
src/machine/machine_state_impl.rs
View File

@@ -11,6 +11,7 @@ use crate::machine::machine_indices::*;
use crate::machine::machine_state::*;
use crate::machine::partial_string::*;
use crate::machine::stack::*;
use crate::machine::Stream;
use crate::machine::unify::*;
use crate::parser::ast::*;
use crate::parser::rug::{Integer, Rational};
@@ -514,6 +515,14 @@ impl MachineState {
return Some(n1.cmp(&n2));
}
}
(HeapCellValueTag::Cons, ptr) => {
let stream = cell_as_stream!(ptr);
let n2 = stream.options().get_alias().unwrap();
if n1 != n2 {
self.pdl.clear();
return Some(n1.cmp(&n2));
}
}
_ => {
unreachable!();
}
@@ -558,7 +567,22 @@ impl MachineState {
);
}
}
_ => {
(HeapCellValueTag::Cons, ptr) => {
let stream = cell_as_stream!(ptr);
let n2 = stream.options().get_alias().unwrap();
if let Some(c2) = n2.as_char() {
if c1 != c2 {
self.pdl.clear();
return Some(c1.cmp(&c2));
}
} else {
self.pdl.clear();
return Some(
Some(c1).cmp(&n2.chars().next())
.then(Ordering::Less)
);
}
} _ => {
unreachable!()
}
)
@@ -597,11 +621,65 @@ impl MachineState {
return Some(n1.cmp(&n2));
}
}
(HeapCellValueTag::Cons, ptr) => {
let stream = cell_as_stream!(ptr);
let n2 = stream.options().get_alias().unwrap();
if n1 != n2 {
self.pdl.clear();
return Some(n1.cmp(&n2));
}
}
_ => {
unreachable!();
}
)
}
(HeapCellValueTag::Cons, ptr) => {
let stream = cell_as_stream!(ptr);
let n1 = stream.options().get_alias().unwrap();
read_heap_cell!(v2,
(HeapCellValueTag::Atom, (n2, _a2)) => {
if n1 != n2 {
self.pdl.clear();
return Some(n1.cmp(&n2));
}
}
(HeapCellValueTag::Char, c2) => {
if let Some(c1) = n1.as_char() {
if c1 != c2 {
self.pdl.clear();
return Some(c1.cmp(&c2));
}
} else {
self.pdl.clear();
return Some(
n1.chars().next().cmp(&Some(c2))
.then(Ordering::Greater)
);
}
}
(HeapCellValueTag::Str, s) => {
let n2 = cell_as_atom_cell!(self.heap[s])
.get_name();
if n1 != n2 {
self.pdl.clear();
return Some(n1.cmp(&n2));
}
}
(HeapCellValueTag::Cons, ptr) => {
let stream = cell_as_stream!(ptr);
let n2 = stream.options().get_alias().unwrap();
if n1 != n2 {
self.pdl.clear();
return Some(n1.cmp(&n2));
}
}
_ => {
unreachable!();
}
)
}
_ => {
unreachable!()
}
@@ -658,6 +736,9 @@ impl MachineState {
Some((2, atom!(".")).cmp(&(arity, name)))
}
}
(HeapCellValueTag::Cons, _s) => {
Some(Ordering::Greater)
}
_ => {
unreachable!()
}
@@ -761,6 +842,10 @@ impl MachineState {
}
}
}
(HeapCellValueTag::Cons, _ptr) => {
self.pdl.clear();
return Some(Ordering::Greater);
}
_ => {
unreachable!();
}
@@ -862,11 +947,68 @@ impl MachineState {
self.heap.pop();
self.heap.pop();
}
(HeapCellValueTag::Cons, s2) => {
let stream = cell_as_stream!(s2);
let ptr = stream.as_ptr() as u64;
let (n1, a1) = cell_as_atom_cell!(self.heap[s1])
.get_name_and_arity();
match (a1, n1).cmp(&(1, atom!("$stream"))) {
Ordering::Equal => {
self.pdl.push(HeapCellValue::from(ptr));
self.pdl.push(self.heap[s1+1]);
}
ordering => {
self.pdl.clear();
return Some(ordering);
}
}
}
_ => {
unreachable!()
}
)
}
(HeapCellValueTag::Cons, s1) => {
let stream = cell_as_stream!(s1);
let ptr = stream.as_ptr() as u64;
read_heap_cell!(v2,
(HeapCellValueTag::Str, s2) => {
let (n2, a2) = cell_as_atom_cell!(self.heap[s2])
.get_name_and_arity();
match (1, atom!("$stream")).cmp(&(a2, n2)) {
Ordering::Equal => {
self.pdl.push(self.heap[s2+1]);
self.pdl.push(HeapCellValue::from(ptr));
}
ordering => {
self.pdl.clear();
return Some(ordering);
}
}
}
(HeapCellValueTag::Lis, _l2) => {
self.pdl.clear();
return Some(Ordering::Less);
}
(HeapCellValueTag::CStr | HeapCellValueTag::PStrLoc) => {
self.pdl.clear();
return Some(Ordering::Less);
}
(HeapCellValueTag::Cons, s2) => {
let stream2 = cell_as_stream!(s2);
let ptr2 = stream2.as_ptr() as u64;
self.pdl.clear();
return Some(ptr.cmp(&ptr2));
}
_ => {
unreachable!()
}
)
}
_ => {
unreachable!()
}

12
src/types.rs
View File

@@ -616,6 +616,18 @@ impl HeapCellValue {
Some(TermOrderCategory::Compound)
}
}
HeapCellValueTag::Cons => {
let ptr = cell_as_untyped_arena_ptr!(self);
match_untyped_arena_ptr!(ptr,
(ArenaHeaderTag::Stream, stream) => {
match stream.options().get_alias() {
Some(_) => Some(TermOrderCategory::Atom),
None => Some(TermOrderCategory::Compound)
}
},
_ => None
)
}
_ => {
None
}