From: Mark Thom Date: Tue, 27 Mar 2018 00:16:23 +0000 (-0600) Subject: clean up call clause stuff. X-Git-Tag: v0.8.110~514 X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=b7f926bade78d3373cdbd8affc78e15eeb2d1980;p=scryer-prolog.git clean up call clause stuff. --- diff --git a/src/prolog/ast.rs b/src/prolog/ast.rs index 62e507f8..d8385283 100644 --- a/src/prolog/ast.rs +++ b/src/prolog/ast.rs @@ -1196,8 +1196,8 @@ pub enum BuiltInInstruction { CleanUpBlock, CompareNumber(CompareNumberQT, ArithmeticTerm, ArithmeticTerm), DefaultRetryMeElse(usize), - DefaultTrustMe, DefaultSetCutPoint(RegType), + DefaultTrustMe, EraseBall, Fail, GetArg(bool), // last call. diff --git a/src/prolog/builtins.rs b/src/prolog/builtins.rs index 9484a786..1d5b80a2 100644 --- a/src/prolog/builtins.rs +++ b/src/prolog/builtins.rs @@ -536,7 +536,7 @@ fn get_builtins() -> Code { put_value!(perm_v!(2), 3), put_value!(perm_v!(5), 4), put_value!(perm_v!(1), 5)], - goto_call!(404, 5), // goto call_with_inference_limit/4, 404. + goto_call!(404, 5), // goto call_with_inference_limit/5, 404. query![put_value!(perm_v!(1), 1)], deallocate!(), remove_call_policy_check!(), diff --git a/src/prolog/io.rs b/src/prolog/io.rs index c7f28b97..66c6cf13 100644 --- a/src/prolog/io.rs +++ b/src/prolog/io.rs @@ -161,10 +161,10 @@ impl fmt::Display for BuiltInInstruction { write!(f, "clean_up_block"), &BuiltInInstruction::CompareNumber(cmp, ref at_1, ref at_2) => write!(f, "number_test {}, {}, {} ", cmp, at_1, at_2), + &BuiltInInstruction::DefaultRetryMeElse(o) => + write!(f, "default_retry_me_else {}", o), &BuiltInInstruction::DefaultSetCutPoint(r) => write!(f, "default_set_cp {}", r), - &BuiltInInstruction::DefaultRetryMeElse(o) => - write!(f, "default_retry_me_else {}", o), &BuiltInInstruction::DefaultTrustMe => write!(f, "default_trust_me"), &BuiltInInstruction::InstallInferenceCounter(r1, r2, r3) =>