429 | 12 | 97% | Total for before_commit

Author: TeamSPoon

mettalog

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-debug_this_script=false
+debug_this_script=true
 
 generate_junit_report=0
 ADD_COMPILE_ARG=()
@@ -903,8 +903,9 @@ function handle_args {
            --test=unit)
 		handle_args "${UNIT_TESTING_OPTS}"
 		add_to_list "--no-regen" RC_OPTIONS
-		add_to_list "$arg" PRE_METTALOG_OPTIONS
-		add_to_list "$arg" ADD_COMPILE_ARG
+		#add_to_list "$arg" PRE_METTALOG_OPTIONS
+		#add_to_list "$arg" ADD_COMPILE_ARG
+		use_test_script=1
                 continue
 		;;
 

prolog/metta_lang/metta_debug.pl

@@ -659,7 +659,7 @@
 % By default spawned threads would need nodebug=false
 is_nodebug :- is_mettalog_rt, !.
 is_nodebug :- is_mettalog_release, !.
-is_nodebug :- is_user_repl, !.
+%is_nodebug :- is_user_repl, !.
 is_nodebug :- thread_self(Self), Self \== main, Self \== 0.
 is_nodebug :-
     % Check if the option 'nodebug' is set to true.
@@ -802,8 +802,8 @@
 is_extreme_debug(G):- is_douglas, !, call(G).
 is_extreme_debug(_).
 
-sub_var_safely(Sub,Source):- assertion(acyclic_term(Source)),!,sub_var(Sub,Source).
-sub_term_safely(Sub,Source):- assertion(acyclic_term(Source)),!,sub_term(Sub,Source).
+sub_var_safely(Sub,Source):- woct(sub_var(Sub,Source)).
+sub_term_safely(Sub,Source):- woct(sub_term(Sub,Source)).
 
 maybe_abort_trace:- \+ is_flag(abort_trace), !.
 maybe_abort_trace:- abort_trace.
@@ -1392,7 +1392,10 @@
 %   ?- trace_eval(my_predicate, trace_type, 1, self, input, output).
 %
 
-trace_eval(P4, _, D1, Self, X, Y) :- is_nodebug, !, call(P4, D1, Self, X, Y).
+trace_eval(P4, _, D1, Self, X, Y) :-
+  \+ is_debugging(e),
+  \+ is_debugging(eval), !,
+  call(P4, D1, Self, X, Y).
 
 
 trace_eval(P4, ReasonsToTrace, D1, Self, X, Y) :- !,
@@ -1404,7 +1407,7 @@
             TraceLen is EX0 mod 500,               % Calculate TraceLen modulo 500.
             DR is 99 - (D1 mod 100),         % Calculate DR based on depth.
             PrintRet = _,                    % Initialize PrintRet.
-            option_else('trace-length', MaxTraceLen, 500), % Get trace-length option.
+            option_else('trace-length', MaxTraceLen, 5000), % Get trace-length option.
             %option_else('trace-depth', MaxTraceDepth, 30),   % Get trace-depth option.
             !
         )),
@@ -1413,9 +1416,10 @@
 
         quietly((
             if_t((nop(stop_rtrace), TraceLen > MaxTraceLen), (
-                set_debug(eval, false),
+                set_option_value_interp(eval, notrace),
+                set_option_value_interp(e, notrace),
                 MaxP1 is MaxTraceLen + 1,
-                nop(format('; Switched off tracing. For a longer trace: !(pragma! trace-length ~w)', [MaxP1])),
+                (format(user_error,'; Switched off tracing. For a longer trace: !(pragma! trace-length ~w)', [MaxP1])),
                 TraceTooLong = 1,
                 nop((start_rtrace, rtrace))
             ))
@@ -1427,7 +1431,7 @@
 
     if_t(D1<0, (set_debug(devel,true))),
 
-    (\+ \+ if_trace((eval; ReasonsToTrace), (
+    ( if_trace((e;eval;ReasonsToTrace), (
         PrintRet = 1,
         if_t( TraceTooLong \== 1, indentq(DR, TraceLen, '-->', [Why, X]))
     ))),
@@ -1440,7 +1444,7 @@
            flag(eval_num, EX1, EX1 + 1),
            PrintRet == 1,
            TraceTooLong \== 1,
-           ((Ret \=@= retval(fail), nonvar(Y))
+           ((Ret \=@= retval(fail), nop(nonvar(Y)))
                 -> indentq(DR, EX1, '<--', [Why, Y])
                 ; indentq(DR, EX1, '<--', [Why, Ret])
             )
@@ -1456,7 +1460,7 @@
 
     Ret \=@= retval(fail).
 
-
+/*
 trace_eval(P4, ReasonsToTrace, D1, Self, X, Y) :-
     must_det_ll((
         notrace((
@@ -1496,6 +1500,7 @@
        (notrace(ignore((( % Y\=@=X,
          if_t(DR<MaxTraceDepth,if_trace((eval;Why),one_shot(Display))))))))))),
         Ret \=@= retval(fail).
+*/
 
 %  (Ret\=@=retval(fail)->true;(fail,trace,(call(P4,D1,Self,X,Y)),fail)).
 one_shot(Display):- ignore(once(Display)),setarg(1,Display,true).

prolog/metta_lang/metta_eval.pl

@@ -267,8 +267,7 @@
 
 %:- set_prolog_flag(optimise, false).
 %:- set_prolog_flag(access_level, system).
-check_term_depth(X,Y):- find_term_cycles(X), X=Y.
-check_term_depth(X,Y):- find_term_cycles(Y), X=Y.
+check_term_depth(X,Y):- fail, (find_term_cycles(X);find_term_cycles(Y)), X=Y.
 find_term_cycles(X):- find_term_cycles(100,X).
 find_term_cycles(_,X):- \+ acyclic_term_nat(X), notrace, nl,nl, writeq(X), nl,nl, break.
 find_term_cycles(N,X):- term_depth(X,Deep), Deep>N, notrace, nl,nl, writeq(X), nl,nl, break.
@@ -537,6 +536,11 @@
          ((copy_term(X+Y,YC), YC = YY) -> (debug(metta(todo),'no_repeat in ~w: ~q',[ThisNth,X->Y])) ; (debug(metta(todo),'repeats in ~w: ~q',[ThisNth,X->Y]),fail))),
        nb_setval(previous_nths,NthL)).
 
+
+depth_overflow:- fail, notrace,ignore(nortrace),
+   trace,dumpST,break,throw(depth_limit_exceeded).
+
+maybe_bt(Why):- Why == depth, depth_overflow,fail.
 maybe_bt(Why):- maybe_trace(bt(Why)),!.
 %   maybe_bt:- notrace,maybe_trace(depth),bt.
 /*
@@ -551,6 +555,7 @@
 
 eval_10(_Eq,_RetType,_Dpth,_Self,X,_YO):- X==[empty],!,fail.
 eval_10(_Eq,_RetType,_Dpth,_Self,X,_YO):- X==['Empty'],!,fail.
+eval_10(_Eq,_RetType,_Dpth,_Self,X,Y):- X=@=['runreduction',_],!,Y=X.
 eval_10(_Eq,_RetType,Depth,_Self,X,Y):- overflow_depth(Depth),maybe_bt(depth),!,unify_woc(X,Y).
 eval_10(Eq,RetType,Depth,Self,X,Y):- var(X), !, % sanity_check_eval(eval_10_var,X),
   eval_20(Eq,RetType,Depth,Self,X,Y).
@@ -2711,9 +2716,19 @@
 pop_scope_item(N,V):- ppp_default_value(N,V),!.
 
 
+
+eval_10(Eq,RetType,Depth,Self,['with-pragma!',List,X],Y):- !,
+ setup_call_cleanup(maplist(undoable_set_pragma(Self),List,Restore),
+                    eval_args(Eq,RetType,Depth,Self,X,Y),
+                    maplist(set_pragma(Self),Restore)).
+
+% @TODO so someting with Self
+set_pragma(_Self,[N,V]):- set_option_value_interp(N,V),!.
+undoable_set_pragma(Self,[N,V],[N,Was]):- (option_value(N,Was)->true;Was='Empty'), set_pragma(Self,[N,V]),!.
+
 eval_20(Eq,RetType,Depth,Self,['pragma!',Other,Expr],RetVal):- !,
    must_det_lls((into_name(Self,Other,Name),nd_ignore((eval_args(Eq,RetType,Depth,Self,Expr,Value),
-   set_option_value_interp(Name,Value))),  make_nop(RetType,Value,RetVal),
+   set_pragma(Self,[Name,Value]))),  make_nop(RetType,Value,RetVal),
     check_returnval(Eq,RetType,RetVal))).
 eval_20(Eq,RetType,_Dpth,Self,['transfer!',File],RetVal):- !, must((include_metta(Self,File),
    make_nop(RetType,Self,RetVal),check_returnval(Eq,RetType,RetVal))).
@@ -3632,13 +3647,13 @@
 maybe_non_eval(AE,Len,N,Type):- assert(arg_type_n(AE,Len,N,eval(Type))),!.
 
 
-do_each_arg(_Eq, _RetType, _ResIn, _Depth, _Self, _AE, _Len, _N, [], []):-!.
-do_each_arg(_Eq, _RetType, _ResIn, _Depth, _Self, _AE, Len, N, _, []) :- N > Len, !.
+do_each_arg(_Eq, _RetType, _ResIn, _Depth, _Self, _AE, _Len, _N, [], Out):- !, Out=[].
+do_each_arg(_Eq, _RetType, _ResIn, _Depth, _Self, _AE, Len, N, _, Out) :- N > Len, !, Out=[].
 do_each_arg(Eq, RetType, ResIn, Depth, Self, AE, Len, N, [In|More], [Out|Adjusted]) :-
     do_arg(Eq, RetType, ResIn, Depth, Self, AE, Len, N, In, Out), succ(N, Np1),
     do_each_arg(Eq, RetType, ResIn, Depth, Self, AE, Len, Np1, More, Adjusted).
 
-do_arg(_Eq, _RetType, _RsIn, _Dpth, _Slf, AE, Len, N, InOut, InOut) :- nonvar(AE), arg_type_n(AE, Len, N, no_eval(_)), !.
+do_arg(_Eq, _RetType, _RsIn, _Dpth, _Slf,  AE, Len,   N, InOut, InOut) :- nonvar(AE), arg_type_n(AE, Len, N, non_eval(_)), !.
 do_arg( Eq, _RetType, _RsIn, Depth, Self, _AE, _Len, _N, In, Out) :-
   eval_args(Eq, _, Depth, Self, In, Out).
 
@@ -4126,7 +4141,7 @@
   BL\==[],!,
  must_or_die((
   member(H->B0,BL),%nl,
-  print_templates(Depth,HC,rule(H,B0,_Nth,_Types)),
+  if_trace((e;eval;defn),print_templates(Depth,HC,rule(H,B0,_Nth,_Types))),
   eval_args(Eq,RetType,Depth,Self,B0,BO))).
 
 
@@ -4158,9 +4173,9 @@
   variable_count(B0,Bc1),variable_count(XX,Xc1),
   if_trace(e,color_g_mesg('#773700',indentq2(Depth,defs_used(XX-->B0,def(USED))))),
   if_trace(e,color_g_mesg('#993700',indentq2(Depth,variable_count(xc0=Xc0,wc1=Xc1,bc0=Bc0,bc1=Bc1)))),
-  if_trace(e,((
+  nop((if_trace(e,((
   ignore(show_tf((Bc0*2>=Bc1))),
-  ignore(show_tf((Xc0==Bc1)))))),
+  ignore(show_tf((Xc0==Bc1)))))))),
   if_trace(occurs,((ignore(find_term_cycles(300,X))))),
   maybe_trace(eval_defn_success).
 /*
@@ -4297,20 +4312,24 @@
 
 
 
-eval_30(Eq,RetType,Depth,Self,X,Y):- \+ old_sys, !, must_or_die((mapl_eval_args(Eq,RetType,Depth,Self,X,Y))).
-eval_30(Eq,RetType,Depth,Self,X,Y):-
-  subst_args_here(Eq,RetType,Depth,Self,X,Y).
-
+%eval_30(Eq,RetType,Depth,Self,X,Y):- \+ old_sys, !, must_or_die((mapl_eval_args(Eq,RetType,Depth,Self,X,Y))).
+%eval_30(Eq,RetType,Depth,Self,X,Y):-  subst_args_here(Eq,RetType,Depth,Self,X,Y).
+eval_30(_Eq,_RetType,_Depth,_Self,X,Y):- unify_woc(X,Y).
 
 % functs_to_preds([Eq, H, B], Preds)
 eval_40_disabled(_Eq,_RetType,_Dpth,_Slf,[H|PredDecl],Res):- fail,
       is_rust_operation([H|PredDecl]),!, % run
       must_det_ll((rust_metta_run(exec([H|PredDecl]),Res),
       nop(write_src(res(Res))))).
 
-eval_40(Eq,RetType,Depth,Self,X,Y):- \+ old_sys, !, mapl_eval_args(Eq,RetType,Depth,Self,X,Y).
+eval_40(Eq,_RetType,Depth,Self,[AIn|More],[AE|More]):- nonvar(AE),!,
+  (eval_args(Eq, _, Depth, Self, AIn, AE) *-> true ; AIn=AE).
+
+eval_40(_Eq,_RetType,_Depth,_Self,X,Y):- unify_woc(X,Y).
+
+eval_40_disabled(Eq,RetType,Depth,Self,X,Y):- \+ old_sys, !, mapl_eval_args(Eq,RetType,Depth,Self,X,Y).
 
-eval_40(Eq,RetType,Depth,Self,[H|PredDecl],Res):-
+eval_40_disabled(Eq,RetType,Depth,Self,[H|PredDecl],Res):-
    eval_args(Eq,_,Depth,Self,H,HH),
    % maybe_eval_subst ?
    subst_args_here(Eq,RetType,Depth,Self,[HH|PredDecl],Res).

prolog/metta_lang/metta_interp.pl

@@ -1567,7 +1567,6 @@
 
 on_set_value(_Note,noninteractive,true):- nocut, ignore(noninteractive),!.
 on_set_value(_Note,abort_trace,true):- nocut, ignore(abort_trace),!.
-on_set_value(_Note,abolish_trace,true):- nocut, ignore(abolish_trace),!.
 
 on_set_value(_Note,show, Value):-
     if_t( \+ prolog_debug:debugging(filter_default,_,_), set_debug(default,false)),
@@ -4152,7 +4151,7 @@
 
 % load_hook1(_Load, '&corelib', _Eq, _H, _B) :- !.
 
-load_hook1(_Load, Self, [Eq,H,B]) :- 
+load_hook1(_Load, Self, [Eq,H,B]) :-
   Eq == '=', assertz_if_new(metta_function_asserted(Self,H,B)),fail.
 
 
@@ -4460,7 +4459,7 @@
 dont_bother(Atom):- Atom = [V1, [Colon, Thing, V2], V3], Colon==':', nonvar(Thing),maplist(var,[V1,V2,V3]).
 
 metta_atom_added(_KB, Atom) :- dont_bother(Atom),!,fail.
-metta_atom_added(X, [Eq,A,B]) :- Eq =='=', !, 
+metta_atom_added(X, [Eq,A,B]) :- Eq =='=', !,
     woct(metta_function_asserted(X,A,B)).
 
 metta_atom_added(X, Y) :- nocut,