fixed catch_nowarn

mettalog

@@ -21,7 +21,7 @@ verbose="${VERBOSE:-0}"  # Use the VERBOSE environment variable or default to '0
 OUTPUT_DIR="${METTALOG_OUTPUT}"
 
 cd $METTALOG_DIR
-source ./scripts/ensure_venv
+#source ./scripts/ensure_venv
 cd $RPWD
 
 use_docker=auto

prolog/metta_lang/metta_eval.pl

@@ -515,8 +515,8 @@
 eval_until_unify(_Eq,_RetType,_Dpth,_Slf,X,X):- !.
 eval_until_unify(Eq,RetType,Depth,Self,X,Y):- eval_until_eq(Eq,RetType,Depth,Self,X,Y),!.
 
-eval_until_eq(_Eq,_RetType,_Dpth,_Slf,X,Y):- catch_nowarn(X=:=Y),!.
-eval_until_eq(_Eq,_RetType,_Dpth,_Slf,X,Y):- catch_nowarn('#='(X,Y)),!.
+eval_until_eq(_Eq,_RetType,_Dpth,_Slf,X,Y):- notrace(catch_nowarn(X=:=Y)),!.
+eval_until_eq(_Eq,_RetType,_Dpth,_Slf,X,Y):- notrace(catch_nowarn('#='(X,Y))),!.
 eval_until_eq(Eq,RetType,_Dpth,_Slf,X,Y):-  X=Y,check_returnval(Eq,RetType,Y).
 %eval_until_eq(Eq,RetType,Depth,Self,X,Y):- var(Y),!,eval_in_steps_or_same(Eq,RetType,Depth,Self,X,XX),Y=XX.
 %eval_until_eq(Eq,RetType,Depth,Self,Y,X):- var(Y),!,eval_in_steps_or_same(Eq,RetType,Depth,Self,X,XX),Y=XX.
@@ -2517,9 +2517,9 @@
 
 
 
-
+%catch_err(G,E,C):- catch(G,E,(always_rethrow(E)->(throw(E));C)).
 catch_warn(G):- (catch_err(G,E,(fbug(catch_warn(G)-->E),fail))).
-catch_nowarn(G):- (catch_err(G,error(_,_),fail)).
+catch_nowarn(G):- catch(G,E,(always_rethrow(E)->(throw(E)),fail)).
 
 
 % less Macro-ey Functions

prolog/metta_lang/metta_utils.pl

@@ -1237,7 +1237,8 @@
 always_rethrow(time_limit_exceeded).
 always_rethrow(depth_limit_exceeded).
 always_rethrow(restart_reading).
-always_rethrow(E):- never_rrtrace,!,throw(E).
+%always_rethrow(E):- never_rrtrace,!,throw(E).
+%always_rethrow(_).
 
 %!  catch_non_abort(:Goal) is det.
 %