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

add domain and type errors for compare/3 (#296)

Browse Source
This commit is contained in:
Mark Thom
2020-04-18 14:37:14 -06:00
parent 0c6d9b1d3b
commit 1d964ef921
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/prolog/machine/machine_errors.rs
View File

@@ -505,6 +505,7 @@ impl ValidType {
#[derive(Clone, Copy)]
pub enum DomainErrorType {
NotLessThanZero,
Order,
Stream,
StreamOrAlias,
}
@@ -513,6 +514,7 @@ impl DomainErrorType {
pub fn as_str(self) -> &'static str {
match self {
DomainErrorType::NotLessThanZero => "not_less_than_zero",
DomainErrorType::Order => "order",
DomainErrorType::Stream => "stream",
DomainErrorType::StreamOrAlias => "stream_or_alias",
}

30
src/prolog/machine/machine_state.rs
View File

@@ -1076,10 +1076,38 @@ pub(crate) trait CallPolicy: Any {
return_from_clause!(machine_st.last_call, machine_st)
}
&BuiltInClauseType::Compare => {
let a1 = machine_st[temp_v!(1)];
let a1 = machine_st.store(machine_st.deref(machine_st[temp_v!(1)]));
let a2 = machine_st[temp_v!(2)];
let a3 = machine_st[temp_v!(3)];
match a1 {
Addr::Con(h) if machine_st.heap.atom_at(h) => {
if let HeapCellValue::Atom(ref atom, _) = &machine_st.heap[h] {
match atom.as_str() {
">" | "<" | "=" => {
}
_ => {
let stub =
MachineError::functor_stub(clause_name!("compare"), 3);
let err = MachineError::domain_error(DomainErrorType::Order, a1);
return Err(machine_st.error_form(err, stub));
}
}
} else {
unreachable!()
}
}
addr if !addr.is_ref() => {
let h = machine_st.heap.h();
let stub = MachineError::functor_stub(clause_name!("compare"), 3);
let err = MachineError::type_error(h, ValidType::Atom, a1);
return Err(machine_st.error_form(err, stub));
}
_ => {
}
}
let atom = match machine_st.compare_term_test(&a2, &a3) {
Some(Ordering::Greater) => {
let spec = fetch_atom_op_spec(clause_name!(">"), None, &indices.op_dir);