Allow eval_## to happen in more places

trueagi-io · Aug 20, 2024 · 884118c · 884118c
1 parent ccaff48
commit 884118c
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/canary/metta_eval.pl b/src/canary/metta_eval.pl
@@ -54,8 +54,6 @@
 %
 % post match modew
 %:- style_check(-singleton).
-:- multifile(nop/1).
-:- meta_predicate(nop(0)).
 :- multifile(fake_notrace/1).
 :- meta_predicate(fake_notrace(0)).
 :- meta_predicate(color_g_mesg(+,0)).
@@ -237,6 +235,7 @@
 
 :- discontiguous eval_20/6.
 :- discontiguous eval_40/6.
+:- discontiguous eval_70/6.
 %:- discontiguous eval_30fz/5.
 %:- discontiguous eval_31/5.
 %:- discontiguous eval_maybe_defn/5.
@@ -1766,19 +1765,25 @@
 naive_eval_args:-
     false.
 
-eval_40(Eq,RetType,Depth,Self,[AE|More],Res):- naive_eval_args,!,
+eval_41(Eq,RetType,Depth,Self,[AE|More],Res):- naive_eval_args,!,
   maplist(must_eval_args(Eq,_,Depth,Self),More,Adjusted),
   eval_70(Eq,RetType,Depth,Self,[AE|Adjusted],Res),
   check_returnval(Eq,RetType,Res).
 
-eval_40(Eq,RetType,Depth,Self,AEMore,ResOut):- \+ naive_eval_args,!,
+eval_41(Eq,RetType,Depth,Self,AEMore,ResOut):- \+ naive_eval_args,!,
   eval_adjust_args(Eq,RetType,ResIn,ResOut,Depth,Self,AEMore,AEAdjusted),
   if_trace((e;args),
      (AEMore\==AEAdjusted -> color_g_mesg('#773733',indentq2(Depth,AEMore -> AEAdjusted))
        ; nop(indentq2(Depth,same(AEMore))))),
   eval_70(Eq,RetType,Depth,Self,AEAdjusted,ResIn),
   check_returnval(Eq,RetType,ResOut).
 
+
+eval_20(Eq,RetType,Depth,Self,X,Y):-
+  (eval_40(Eq,RetType,Depth,Self,X,M)*-> M=Y ;
+     % finish_eval(Depth,Self,M,Y);
+    (eval_failed(Depth,Self,X,Y)*->true;X=Y)).
+eval_40(Eq,RetType,Depth,Self,AEMore,ResOut):- eval_41(Eq,RetType,Depth,Self,AEMore,ResOut).
 eval_70(Eq,RetType,Depth,Self,PredDecl,Res):-
     if_or_else(eval_maybe_python(Eq,RetType,Depth,Self,PredDecl,Res),
     if_or_else(eval_maybe_host_predicate(Eq,RetType,Depth,Self,PredDecl,Res),