100% on roman chainer (not the tests yet) and nils ai-dsl

Author: TeamSPoon

prolog/metta_lang/metta_eval.pl

@@ -69,7 +69,6 @@
 
 %self_eval0(X):- var(X),!,fail.
 self_eval0(X):- \+ callable(X),!.
-self_eval0(X):- is_list(X),maplist(var,X),!.
 self_eval0(X):- is_valid_nb_state(X),!.
 %self_eval0(X):- string(X),!.
 %self_eval0(X):- number(X),!.
@@ -301,6 +300,8 @@
 
 eval_args(Eq,RetType,Depth,Self,X,Y):- atom(Eq),  ( Eq \== ('='),  Eq \== ('match')) ,!,
    call(call,Eq,'=',RetType,Depth,Self,X,Y).
+
+eval_args(_Eq,_RetType,_Dpth,_Slf,X,Y):- self_eval(X),!,Y=X.
 eval_args(Eq,RetType,Depth,Self,X,Y):-
   eval_00(Eq,RetType,Depth,Self,X,Y).
 %eval_ret(Eq,RetType,1000,Self,X,Y):- !,
@@ -355,14 +356,10 @@
    if_t((Depth<1, trace_on_overflow), debug(metta(e))),
 
    trace_eval(eval_10(Eq,RetType),e,Depth2,Self,X,M),
-   %ignore(find_term_cycles(M)),
+
    ((M=@=XX;M==X;M=@=X) -> Y=M ; eval_03(Eq,RetType,Depth2,Self,M,Y)).
 
 %eval_03(_Eq,RetType,_Depth2,_Self,M,Y):- RetType=='Atom',!,M=Y.
-
-%eval_03(_Eq,_RetType,_Dpth,_Self,X,Y):- check_term_depth(X,Y),!.
-eval_03(_Eq,_RetType,_Dpth,_Slf,X,Y):- self_eval(X),!,Y=X.
-
 eval_03(Eq,RetType,Depth2,Self,M,Y):- eval_01(Eq,RetType,Depth2,Self,M,Y).
 
 eval_02(Eq,RetType,Depth,Self,Y,YO):- var(Y),!,YO=Y,var_pass(Eq,RetType,Depth,Self,Y).
@@ -609,13 +606,6 @@
    is_list(Args),!,
    Y=[Fn|RArgs], mapl_eval_args(Eq,RetType,Depth,Self,Args,RArgs).
 
-
-% DMILES @ TODO make sure this isnt an implicit curry
-eval_10(Eq,RetType,Depth,Self,[V|VI],[V|VO]):-  V==':',is_list(VI),!,
-  mapl_eval_args(Eq,RetType,Depth,Self,VI,VO).
-eval_10(Eq,RetType,Depth,Self,[V|VI],VO):-  is_list(V),V=[HV,_,_],HV==':',is_list(VI),!,
-  mapl_eval_args(Eq,RetType,Depth,Self,[V|VI],VO).
-
 eval_10(Eq,RetType,Depth,Self,[Sym|Args],Y):- \+ atom(Sym), !,
   maplist(as_prolog_x(Depth,Self), [Sym|Args] , [ASym|Adjusted]),
   eval_20(Eq,RetType,Depth,Self, [ASym|Adjusted], Y),sanity_check_eval(eval_20_not_atom,Y).
@@ -818,11 +808,6 @@
   ((eval_args(Eq,_FRype,Depth,Self,V,VV), V\=@=VV)*-> true; VV = V),
   eval_args(Eq,RetType,Depth,Self,[VV|VI],VO).
 
-
-% DMILES @ TODO make sure this isnt an implicit curry
-eval_20(Eq,RetType,Depth,Self,[V|VI],VO):-  is_list(V),V=[HV,_,_],HV==':',is_list(VI),!,
-  mapl_eval_args(Eq,RetType,Depth,Self,[V|VI],VO).
-
 % DMILES @ TODO make sure this isnt an implicit curry
 eval_20(Eq,RetType,Depth,Self,[V|VI],VO):-  \+ callable(V), is_list(VI),!,
   mapl_eval_args(Eq,RetType,Depth,Self,[V|VI],VO).
@@ -1029,7 +1014,6 @@
 
 
 eval_until_eq(_Flags, Eq, XType, YType,_Dpth,_Slf,X,Y,TF):-  X==Y,!,check_returnval(Eq,XType,X),check_returnval(Eq,YType,Y),TF='True'.
-eval_until_eq(_Flags, Eq, XType, YType,_Dpth,_Slf,X,Y,TF):-  X=@=Y,!,check_returnval(Eq,XType,X),check_returnval(Eq,YType,Y),TF='True'.
 eval_until_eq(_Flags,_Eq,_XType,_YType,_Dpth,_Slf,X,Y,TF):- notrace(as_tf_nowarn(X=:=Y,TF)),!.
 eval_until_eq(_Flags,_Eq,_XType,_YType,_Dpth,_Slf,X,Y,TF):- notrace(as_tf_nowarn('#='(X,Y),TF)),!.
 %eval_until_eq(Flags,Eq,XType,YType,_Dpth,_Slf,X,Y,TF):-  X\=@=Y,unify_woc(X,Y),!,check_returnval(Eq,XType,YType,Y,TF).
@@ -2193,9 +2177,10 @@
 */
 
 eval_10(Eq,RetType,Depth,Self,['if-unify',X,Y,Then|ElseL],Res):- !,
-       (eval_args_true(Eq,'Bool',Depth,Self,['metta-unify',X,Y])
-         *-> eval_args(Eq,RetType,Depth,Self,Then,Res)
-        ; (ElseL=[Else],eval_args(Eq,RetType,Depth,Self,Else,Res))).
+       %(eval_args_true(Eq,'Bool',Depth,Self,['metta-unify',X,Y])
+       (as_tf( \+ \+ unify_woc(X,Y),TF),if_or_else((TF=='True',X=Y),eval_args_true(Eq,'Bool',Depth,Self,['metta-unify',X,Y]))
+     *-> eval_args(Eq,RetType,Depth,Self,Then,Res)
+    ; (ElseL=[Else],eval_args(Eq,RetType,Depth,Self,Else,Res))).
 
 
 
@@ -3510,7 +3495,7 @@
 */
 %eval_40(Eq,RetType,_Dpth,_Slf,['==',X,Y],Res):-  !, subst_args(Eq,RetType,_Dpth,_Slf,['==',X,Y],Res).
 
-eval_20(_Eq,_RetType,_Depth,_Self,['==', X,Y],TF):- X=@=Y, X\==Y, !,TF='False'.
+%eval_20(_Eq,_RetType,_Depth,_Self,['==', X,Y],TF):- X=@=Y, X\==Y, !,TF='False'.
 eval_20(_Eq,_RetType,_Depth,_Self,['==', X,Y],TF):- copy_term(X+Y,XX+YY,_),XX=@=YY,XX\==YY, !,TF='False'.
 eval_20(_Eq,_RetType,_Depth,_Self,['==', X,Y],TF):- (var(X) , var(Y)), !, as_tf(X==Y,TF),!.
 eval_40(_Eq,_RetType,_Depth,_Self,['==', X,Y],TF):- (var(X) , var(Y)), !, as_tf(X==Y,TF),!.
@@ -3519,7 +3504,7 @@
    woc((ignore(get_operator_typedef(Self,'metta-unify',2,[XType,YType],RetType)),
          eval_until_eq_tf(['metta-unify',double_sided],Eq, XType, YType, Depth,Self, X, Y, TF))).
 
-eval_20(Eq,RetType,Depth,Self,['==',X,Y],TF):- !,
+eval_20(Eq,RetType,Depth,Self,['==',X,Y],TF):- fail, !,
   ignore(get_operator_typedef(Self,'==',2,[XType,YType],RetType)),
   eval_until_eq_tf(['==',dont_eval],Eq, XType, YType, Depth,Self, X, Y, TF).
 

prolog/metta_lang/metta_improve.pl

@@ -186,7 +186,7 @@
 
 eval_in(interp, X, Y):-
    peek_scope(Eq, RetType, Depth, Self),
-    eval_09(Eq, RetType, Depth, Self, X, Y).
+    woc(eval_10(Eq, RetType, Depth, Self, X, Y)).
 eval_in(compiler, X, Y):-
     transpile_eval(X, Y).
 eval_in(rust, X, Y):-

prolog/metta_lang/metta_interp.pl

@@ -3974,7 +3974,7 @@
 %     ?- rtrace_on_error(writeln('Hello, World!')).
 %
 
-rtrace_on_error(G):- is_user_repl, !, call(G).
+%rtrace_on_error(G):- is_user_repl, !, call(G).
 rtrace_on_error(G):- !, call(G).
 %rtrace_on_error(G):- catch(G,_,fail).
 rtrace_on_error(G):-
@@ -4151,9 +4151,13 @@
 %     ?- load_hook1(my_load, '&corelib', '=', head, body).
 
 % load_hook1(_Load, '&corelib', _Eq, _H, _B) :- !.
-
-load_hook1(_Load, Self, [Eq,H,B]) :- Eq == '=', assertz_if_new(metta_function_asserted(Self,H,B)),fail.
-
+load_hook1(Load, Self, Fact) :-
+    % Skip processing if the `metta_interp` flag is not set to `ready`.
+    % \+ is_metta_interp_ready,
+    % debug_info(assert_hooks,load_hook_not_ready(Load, Self, Fact)),
+    %fail,
+    !,
+    woc(load_hook_compiler(Load, Self, Fact)).
 
 load_hook1(Load, Self, Fact) :-
     % Ensure the Metta compiler is ready for use.
@@ -4162,13 +4166,6 @@
     woc(load_hook_compiler(Load, Self, Fact)).
 load_hook1(Load, Self, Fact):-
     %debug_info(assert_hooks,not_use_metta_compiler(Load, Self, Fact)),
-    woc(load_hook_compiler(Load, Self, Fact)),!.
-load_hook1(Load, Self, Fact) :-
-    % Skip processing if the `metta_interp` flag is not set to `ready`.
-    % \+ is_metta_interp_ready,
-    % debug_info(assert_hooks,load_hook_not_ready(Load, Self, Fact)),
-    %fail,
-    !,
     woc(load_hook_compiler(Load, Self, Fact)).
 
 metta_atom_asserted_hook(Self,Assertion):-
@@ -4453,15 +4450,6 @@
 %   @arg X The context or space.
 %   @arg Y The atom to check.
 %
-
-dont_bother(Atom):- Atom=@=[_, :, _].
-dont_bother(Atom):- Atom=@=[=, [_, _], _]. % maybe
-dont_bother(Atom):- Atom=@=[=, [_, _, _], _].
-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_function_asserted(X,A,B).
-
 metta_atom_added(X, Y) :- nocut,
     % Check if the atom was explicitly asserted.
     metta_atom_asserted_ocw(X, Y).
@@ -4503,8 +4491,12 @@
    transform_about(Fact, Rule, Cond), Cond=='True',!,
    fact_store(KB, Rule, Fact, Cond).
 */
+dont_bother(Atom):- Atom=@=[_, :, _].
+dont_bother(Atom):- Atom=@=[=, [_, _, _], _].
+dont_bother(Atom):- Atom=@=[=, [_, _], _]. % maybe
+dont_bother(Atom):- Atom = [V1, [Colon, Thing, V2], V3], Colon==':', nonvar(Thing),maplist(var,[V1,V2,V3]).
 
-metta_atom0(_KB, Atom) :- dont_bother(Atom),!,fail.
+metta_atom0(_Inherit,_KB, Atom) :- dont_bother(Atom),!,fail.
 
 % metta_atom([Superpose,ListOf], Atom) :-   Superpose == 'superpose',    is_list(ListOf), !,      member(KB, ListOf),    get_metta_atom_from(KB, Atom).
 metta_atom0(_Inherit,Space, Atom) :- typed_list(Space, _, L), !, member(Atom, L).
@@ -4809,7 +4801,8 @@
 % metta_eq_def(Eq,KB,H,B):-  ignore(Eq = '='),metta_atom(KB,[Eq,H,B]).
 metta_eq_def(Eq, KB, H, B) :-
    ignore(Eq = '='),
-  metta_atom0(inherit([KB]),KB,[Eq, H, B]).
+  metta_atom0(inherit([KB]),KB,[EQ, H, B]),
+  EQ == Eq.
 
 % Original commented-out code, retained as-is for potential future use:
 % metta_defn(KB,Head,Body):- metta_eq_def(_Eq,KB,Head,Body).
@@ -5328,6 +5321,7 @@
 toplevel_interp_only_symbol('compiled-info').
 toplevel_interp_only_symbol('listing!').
 toplevel_interp_only_symbol('eval-in-only!').
+toplevel_interp_only_symbol('set-debug!').
 toplevel_interp_only_symbol('repl!').
 toplevel_interp_only_symbol('eval').
 toplevel_interp_only_symbol('pragma!').
@@ -5670,7 +5664,7 @@
     do_metta(From, comment(Load), Self, Expr, Out).
 do_metta(From, comment(Load), Self, Cmt, Out) :-
     % Write the comment and handle specific cases of MettaLog comments.
-    if_trace((loading;load),write_comment(Cmt)), !,
+    if_trace((loading;load,comment),write_comment(Cmt)), !,
     ignore((symbolic(Cmt),
             symbolic_list_concat([_, Src], 'MeTTaLog only: ', Cmt),
             !,

prolog/metta_lang/stdlib_mettalog.metta

@@ -2651,7 +2651,7 @@ For example:
     (@param "List of values")
     (@param "List of values")))
   (@return "Union of sets based on predicate"))
-(ALT= (union-atom-by $Pred $L1 $L2)
+(= (union-atom-by $Pred $L1 $L2)
   (collapse (union-by $Pred (superpose $L1) (superpose $L2))))
 (: union-atom-by (-> Atom Expression Expression Expression))