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

instantiate variables in numerical comparisons

Browse Source
This commit is contained in:
Mark Thom
2019-04-22 18:54:03 -06:00
parent 29848a51ee
commit f745b077a9
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/prolog/codegen.rs
View File

@@ -304,6 +304,14 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<TermMarker>
{
match ct {
&InlinedClauseType::CompareNumber(cmp, ..) => {
if let &Term::Var(ref vr, ref name) = terms[0].as_ref() {
self.mark_non_callable(name.clone(), 2, term_loc, vr, code);
}
if let &Term::Var(ref vr, ref name) = terms[1].as_ref() {
self.mark_non_callable(name.clone(), 2, term_loc, vr, code);
}
let (mut lcode, at_1) = self.call_arith_eval(terms[0].as_ref(), 1)?;
let (mut rcode, at_2) = self.call_arith_eval(terms[1].as_ref(), 2)?;

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

@@ -251,7 +251,7 @@ pub enum EvalError {
// FloatOverflow,
// IntOverflow,
// Undefined,
// Underflow,
// FloatUnderflow,
ZeroDivisor,
NoRoots
}
@@ -262,7 +262,7 @@ impl EvalError {
// EvalError::FloatOverflow => "float_overflow",
// EvalError::IntOverflow => "int_overflow",
// EvalError::Undefined => "undefined",
// EvalError::Underflow => "underflow",
// EvalError::FloatUnderflow => "underflow",
EvalError::ZeroDivisor => "zero_divisor",
EvalError::NoRoots => "no_roots"
}