assertNotAlphaEqual + show_tf

Author: TeamSPoon

prolog/metta_lang/metta_compiler_lib.pl

@@ -442,6 +442,14 @@
          'mc__1_1_collapse'(B,BB)),
          equal_enough_for_test_renumbered_l(alpha_equ,AA,BB), C).
 
+transpiler_predicate_store(builtin, 'assertNotAlphaEqual', [2], '@doc', '@doc', [x(doeval,lazy,[]),x(noeval,lazy,[])], x(doeval,eager,[])).
+'mc__1_2_assertNotAlphaEqual'(A,B,C) :-
+   loonit_assert_source_tf_empty(
+        ['assertNotAlphaEqual',A,B],AA,BB,
+        ('mc__1_1_collapse'(A,AA),
+         'mc__1_1_collapse'(B,BB)),
+         equal_enough_for_test_renumbered_l(not_alpha_equ,AA,BB), C).
+
 transpiler_predicate_store(builtin, 'quote', [1], '@doc', '@doc', [x(noeval,eager,[])], x(noeval,eager,[])).
 'mc__1_1_quote'(A,['quote',A]).
 compile_flow_control(HeadIs,LazyVars,RetResult,RetResultN,LazyRetQuoted,Convert, QuotedCode1a, QuotedCode1N) :-
@@ -740,6 +748,7 @@
 %metta_body_macro_pass(bu,[eval,Next], Next).
 
 % metta_body_macro_pass(td,[eval,Eval], Eval).
+metta_body_macro_pass(td1,['capture',Eval], Eval).
 
 metta_body_macro_pass(td2,['unique',Eval],
    ['let',Var,['call-fn!','no_repeats_var'],

prolog/metta_lang/metta_debug.pl

@@ -216,7 +216,7 @@
 
 ss_unify(W,T):- copy_term(T,TT),W=T,T=@=TT.
 
-indentq2(Depth, Term) :- fail, ss_unify(defs_used(X-->Y,R),Term),
+indentq2(Depth, Term) :- ss_unify(defs_used(X-->Y,R),Term),
   indentq2(Depth, lhs(X)),
   indentq2(Depth, rhs(Y)),
   indentq2(Depth, R),!.
@@ -860,9 +860,10 @@
                       set_prolog_flag(occurs_check,Was)).
 
 woc(TFE,Goal):- current_prolog_flag(occurs_check,TFE),!,call(Goal).
-woc(TFE,Goal):- current_prolog_flag(occurs_check,TFE),!,precopy_term(Goal,CGoal),!,call(CGoal),uncopy_term(Goal,CGoal).
+%woc(TFE,Goal):- current_prolog_flag(occurs_check,TFE),!,precopy_term(Goal,CGoal),!,call(CGoal),uncopy_term(Goal,CGoal).
 woc(TFE,Goal):- current_prolog_flag(occurs_check,Was),redo_call_cleanup(set_prolog_flag(occurs_check,TFE),Goal,set_prolog_flag(occurs_check,Was)).
 
+catch_oce(CGoal):- !, call(CGoal).
 catch_oce(CGoal):-
    Error = error(occurs_check(_,_),_),
    precopy_term(CGoal,Goal), catch(Goal,Error,(rtrace(Goal),maybe_rethrow(Error))), uncopy_term(CGoal,Goal).

prolog/metta_lang/metta_eval.pl

@@ -6,12 +6,15 @@
 
 :- dynamic use_evaluator/3.
 
+use_evaluator(fa(Fn,_), compiler, disabled):- nb_current(disable_compiler,Was), member(Fn,Was),!.
+use_evaluator(fa(Fn,_), interp, disabled):- nb_current(disable_interp,Was), member(Fn,Was),!.
 use_evaluator(FA, Type, only):- nonvar(Type),
    use_evaluator(FA, Other, disabled), Type\==Other.
 use_evaluator(FA, Type, enabled):- use_evaluator(FA, Type, only).
 
 use_evaluator(fa('help!', 1), compiler, disabled).
 use_evaluator(fa('help!', 0), compiler, disabled).
+use_evaluator(fa('listing!', 1), interp, disabled).
 use_evaluator(fa('compiled-info', 1), interp, disabled).
 
 some_evaluator(interp).
@@ -43,6 +46,15 @@
     must(assumed_functor(X, FA)), !,
     use_right_thing(FA, Eq, RetType, Depth, Self, X, Y).
 
+use_right_thing(_FA, Eq,RetType,Depth,Self,X,Y):-
+  nb_current('eval_in_only', interp), !,
+  eval_09(Eq,RetType,Depth,Self,X,Y).
+use_right_thing(_FA, Eq,RetType,Depth,Self,X,Y):-
+  nb_current('eval_in_only', compiler), !,
+  with_scope(Eq, RetType, Depth, Self, transpile_eval(X,Y)).
+use_right_thing(_FA, Eq,RetType,Depth,Self,X,Y):-
+  nb_current('eval_in_only', rust), !,
+  with_scope(Eq, RetType, Depth, Self, rust_metta_run(exec(X),Y)).
 use_right_thing(FA, Eq, RetType, Depth, Self, X, Y):-
    with_scope(Eq, RetType, Depth, Self, use_right_thing(FA, X, Y)).
 
@@ -56,10 +68,23 @@
    findall(Use=Status, (some_evaluator(Use),use_evaluator(FA, Use, Status)), Info),
    (nb_current('eval_in_only', OnlyIn)->true;OnlyIn=[]),
    (nb_current('eval_fallback', FallBack)->true;FallBack=[]),
-   ppt(use_right_thing(onlyIn=OnlyIn,fallBack=FallBack,FA=Info)),
+   (nb_current('disable_compiler', DC)->true;DC=[]),
+   (nb_current('disable_interp', DI)->true;DI=[]),
+   ppt(use_right_thing(onlyIn=OnlyIn,fallBack=FallBack,dC=DC,dI=DI,FA=Info)),
    fail.
 
-use_right_thing(FA, X, Y) :-
+
+use_right_thing(_FA, X,Y):-
+  nb_current('eval_in_only', interp), !,
+  peek_scope(Eq,RetType,Depth,Self),!,
+  eval_09(Eq,RetType,Depth,Self,X,Y).
+use_right_thing(_FA, X,Y):-
+  nb_current('eval_in_only', compiler), !,
+  transpile_eval(X,Y).
+use_right_thing(_FA, X,Y):-
+  nb_current('eval_in_only', rust), !,
+  rust_metta_run(exec(X),Y).
+use_right_thing( FA, X, Y) :-
     use_evaluator(FA, compiler, disabled), !,
     eval_in_only(interp, X, Y).
 
@@ -151,14 +176,18 @@
     ).
 
 
-eval_in_only(OnlyIn, X, Y):-
+eval_in_only(OnlyIn, Goal):-
   locally(nb_setval('eval_in_only', OnlyIn),
+   Goal).
+
+eval_in_only(OnlyIn, X, Y):-
+   eval_in_only(OnlyIn,
    eval_in(OnlyIn, X, Y)).
 
 eval_in(interp, X, Y):-
    peek_scope(Eq, RetType, Depth, Self),
-    woc(eval_10(Eq, RetType, Depth, Self, X, Y)).
-
+    eval_09(Eq, RetType, Depth, Self, X, Y).
 eval_in(compiler, X, Y):-
     transpile_eval(X, Y).
-
+eval_in(rust, X, Y):-
+  rust_metta_run(exec(X),Y).

prolog/metta_lang/metta_improve.pl

@@ -1564,6 +1564,9 @@
     on_set_value(Note,N,true).    % true
 on_set_value(Note,N,'False'):- nocut,
     on_set_value(Note,N,false).   % false
+
+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):-
@@ -2722,7 +2725,7 @@
     % Mark that the prescan has been executed.
     assert(has_run_cmd_args),
     % Perform the prescan using `do_cmdline_load_metta/1`.
-    do_cmdline_load_metta(prescan).
+    do_cmdline_load_metta(prescan), setup_show_hide_debug.
 
 %!  run_cmd_args is det.
 %
@@ -3110,23 +3113,26 @@
     if_phase(Phase, execute, catch_abort(['-G', Str], ignore(call_sexpr('!', Self, Str, _S, _Out)))), !,
     cmdline_load_metta(Phase, Self, Rest).
 
-% Handle file loading when the argument does not start with `-`.
-cmdline_load_metta(Phase, Self, [Filemask | Rest]) :-
-    symbol(Filemask),
-    \+ symbol_concat('-', _, Filemask), !,
-    if_phase(Phase, execute, cmdline_load_file(Self, Filemask)), !,
-    cmdline_load_metta(Phase, Self, Rest).
 % Handle command-line options by setting their corresponding values.
 
 cmdline_load_metta(Phase, Self, [Skip, _ | Rest]) :- skip_cmdarg(Skip), !,
     cmdline_load_metta(Phase, Self, Rest).
 
+% forces whatver is after -D to bve treated as flag-like
 cmdline_load_metta(Phase, Self, ['-D', M | Rest]) :- !,
-    process_flag(M), !,
+    process_as_flag(M), !,
     cmdline_load_metta(Phase, Self, Rest).
+
+% picks up on  name=value
 cmdline_load_metta(Phase, Self, [M | Rest]) :-
     process_flag(M), !,
     cmdline_load_metta(Phase, Self, Rest).
+% Handle file loading when the argument does not start with `-`.
+cmdline_load_metta(Phase, Self, [Filemask | Rest]) :-
+    symbol(Filemask),
+    \+ symbol_concat('-', _, Filemask), !,
+    if_phase(Phase, execute, cmdline_load_file(Self, Filemask)), !,
+    cmdline_load_metta(Phase, Self, Rest).
 % Handle unrecognized command-line options by logging a warning.
 cmdline_load_metta(Phase, Self, [M | Rest]) :-
     format('~N'),
@@ -3965,6 +3971,8 @@
 %     % Execute a goal and trace errors:
 %     ?- rtrace_on_error(writeln('Hello, World!')).
 %
+
+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):-
@@ -4440,7 +4448,7 @@
 %
 metta_atom_added(X, Y) :- nocut,
     % Check if the atom was explicitly asserted.
-    metta_atom_asserted(X, Y).
+    metta_atom_asserted_ocw(X, Y).
 metta_atom_added(X, Y) :- nocut,
     % Check if the atom is associated with a file.
     metta_atom_in_file(X, Y).
@@ -4452,6 +4460,11 @@
     % Check if the atom was recently asserted.
     metta_atom_asserted_last(X, Y).
 
+
+metta_atom_asserted_ocw(X, Y):-
+    woct(metta_atom_asserted(X, Y)).
+   %clause_occurs_warning(metta_atom_asserted(X, Y)).
+
 %!  metta_atom(+Space, -Atom) is nondet.
 %
 %   Retrieves atoms associated with a given space or knowledge base (`Space`).
@@ -4490,7 +4503,7 @@
 metta_atom0(Inherit,X, Y) :- maybe_into_top_self(X, TopSelf), !, metta_atom0(Inherit,TopSelf, Y).
 
 
-metta_atom0(_Inherit,KB, Atom) :- metta_atom_added(KB, Atom).
+metta_atom0(_Inherit,KB, Atom) :- woce(metta_atom_added(KB, Atom)).
 
 
 
@@ -6056,9 +6069,16 @@
 eval_H(_StackMax, _Self, Term, Term) :-
     % If the `compile` option is set to `save`, return the term unchanged.
     fast_option_value(compile, save), !.
-eval_H(StackMax, Self, Term, X) :-
+eval_H(StackMax, Self, Term, XO) :-
+    copy_term(Term+X,CTerm+CX),
     % Otherwise, perform evaluation with error handling, passing the stack limit.
-    woc(catch_metta_return(eval_args('=', _, StackMax, Self, Term, X), X)).
+    woc(catch_metta_return(eval_args_stack_max('=', _, StackMax, Self, CTerm, CX), CX)),
+    CX\=='Empty',
+    CTerm=Term,CX=X,
+    XO=CX.
+
+eval_args_stack_max('=', _, StackMax, Self, Term, X):-
+  eval_args('=', _, StackMax, Self, Term, X).
 /*
 eval_H(StackMax,Self,Term,X).
 
@@ -7198,7 +7218,7 @@
 %   is allowed, it handles modifications to `system:notrace/1` to customize its behavior.
 %
 
-nts1 :- !. % Disable redefinition by cutting execution.
+%nts1 :- !. % Disable redefinition by cutting execution.
 %nts1 :- is_flag(notrace),!.
 nts1 :- no_interupts(nts1r).
 nts1r :-
@@ -7213,7 +7233,8 @@
   meta_predicate(system:notrace(0)),
     % Define the new behavior for `system:notrace/1`.
     % The redefined version executes the goal (`G`) with `once/1` and succeeds deterministically.
-    asserta(( system:notrace(G) :- (!, unotrace(G),! ))).
+    asserta(( system:notrace(G) :- (!, once(G),! ))).
+    %asserta(( system:notrace(G) :- (!, unotrace(G),! )))
 nts1r :-
     % Ensure that further redefinitions of `nts1` are not allowed after the first.
     !.

prolog/metta_lang/metta_interp.pl

@@ -898,6 +898,7 @@
     exists_file(RelFilename),!,
     % Convert the relative filename to an absolute path.
     afn_from(RelFilename, Filename),
+    set_exec_num(Filename, 0),
     % Generate a temporary file if necessary, based on the absolute filename.
     gen_tmp_file(false, Filename),
     % Extract the directory path from the filename.
@@ -912,6 +913,25 @@
     pfcAdd_Now(user:loaded_into_kb(Self, Filename)),
     nop(listing(user:loaded_into_kb/2)).
 
+
+test_file(Filename):- test_file([], Filename).
+test_file(Self, Filename) :- maybe_into_top_self(Self, TopSelf), !, test_file(TopSelf, Filename).
+test_file(Self, Filename):-
+    % Use without_circular_error/2 to handle circular dependencies for including files.
+    without_circular_error(test_file1(Self, Filename),
+        missing_exception(test_file(Self, Filename))).
+
+handle_pragmas(Self,[N,V|More]):- symbol(N), !, set_option_value_interp(N,V),handle_pragmas(Self,More).
+handle_pragmas(Self,[H|T]):- is_list(T), !,handle_pragmas(Self,H),handle_pragmas(Self,T).
+handle_pragmas(_,_).
+
+test_file1(Self, Filename):-
+  if_t(is_list(Self), handle_pragmas('&self',Self)),
+  loonit_reset,
+  user_io(format(';=== !(test-file! ~w ~w) ===;',[Self, Filename])),
+  include_metta1('&self', Filename),!,
+  loonit_reset,!.
+
 %!  count_lines_up_to(+TwoK, +Filename, -Count) is det.
 %
 %   Counts lines in a file up to a specified limit.
@@ -2077,7 +2097,7 @@
          (must_det_lls(maybe_name_vars(NamedVarsList)),
           (must_det_lls(do_metta(file(Filename), Mode, Self, Expr, _O)) -> true
         ;  (ignore(rtrace(do_metta(file(Filename), Mode, Self, Expr, _O2))),
-                   trace, epp_m(unknown_do_metta(file(Filename), Mode, Self, Expr))))))).
+                   trace, pp_m(unknown_do_metta(file(Filename), Mode, Self, Expr))))))).
 
 
 %!  is_file_stream_and_size(+Stream, -Size) is nondet.
@@ -3033,12 +3053,14 @@
 %   calling `really_use_corelib_file/0`. It uses a dynamic flag `using_corelib_file` to track
 %   whether the core library has been loaded.
 %
-use_corelib_file :- using_corelib_file, !.
-use_corelib_file :-
+
+use_corelib_file:- use_corelib_file_now, nb_setval(debug_context, 'running').
+use_corelib_file_now :- using_corelib_file, !.
+use_corelib_file_now :-
      % Mark core library as in use and attempt to load it.
      asserta(using_corelib_file), fail.
-use_corelib_file :- really_use_corelib_file, !.
-use_corelib_file :- !.
+use_corelib_file_now :- really_use_corelib_file, !.
+use_corelib_file_now :- !.
 %use_corelib_file :- really_use_corelib_file, !.
 
 %!  really_use_corelib_file is det.

prolog/metta_lang/metta_loader.pl

@@ -736,7 +736,7 @@
     uses_call_only(H), !.
 clause_match(H, B, Ref) :-
     % Match an asserted clause for head 'H' and body 'B', retrieving 'Ref' as the clause reference.
-    clause_asserted(H, B, Ref), !.
+    locally_clause_asserted(H, B, Ref), !.
 clause_match(H, B, Ref) :-
     % Copy the head 'H' to a temporary variable 'HH' and check for clause matching.
     % Ensure that 'H' is structurally equal to 'HH' (using '=@=') and that the body is not reserved.