88/57 interp/compiled on tests/quick_quality/

Author: TeamSPoon

libraries/logicmoo_utils/prolog/xlisting/xlisting_web.pl

@@ -1219,7 +1219,53 @@ export RUST_BACKTRACE=full
 # Set default reference file name based on hostname
 DefaultSav="Sav.$(hostname).MeTTaLog"
 need_compile=0  # Ensure this is initialized
+INTERP_SRC_DIR="${INTERP_SRC_DIR:-.}"
+checksum_file="$INTERP_SRC_DIR/lastbuilt.checksum"
+
+# Function to calculate and save checksums in $INTERP_SRC_DIR
+save_checksums() {
+  local dir="${INTERP_SRC_DIR:-.}"
+  # Set checksum_file if not already set
+  if [[ -z "$checksum_file" ]]; then
+    checksum_file="$dir/lastbuilt.checksum"
+  fi
+  find "$dir" -type f \( -name "*.pl" -o -name "*.metta" \) \
+    -exec sha256sum "{}" + | sort > "$checksum_file"
+  DEBUG "Checksums saved to $checksum_file"
+}
+# Function to check if any files have changed in $INTERP_SRC_DIR
+check_for_changes() {
+  local dir="${INTERP_SRC_DIR:-.}"
+
+  # Set checksum_file if not already set
+  if [[ -z "$checksum_file" ]]; then
+    checksum_file="$dir/lastbuilt.checksum"
+  fi
+
+  if [[ ! -f "$checksum_file" ]]; then
+    #echo "No checksum file found in $dir. Needs rebuilt."
+    #need_compile=1
+    return 1
+  fi
 
+  local temp_file
+  temp_file=$(mktemp)
+
+  find "$dir" -type f \( -name "*.pl" -o -name "*.metta" \) \
+    -exec sha256sum "{}" + | sort > "$temp_file"
+
+  if diff -q "$checksum_file" "$temp_file" &> /dev/null; then
+    #echo "No changes detected in $dir."
+    rm "$temp_file"
+    return 0
+  else
+    # echo "Changes detected in $dir!"
+    # Suppress diff output completely
+    # (you could log it somewhere instead if needed)
+    rm "$temp_file"
+    return 2
+  fi
+}
 
 
 # Check if any .pl file is newer than the skip_compile file
@@ -1236,6 +1282,7 @@ if [[ -f "$INTERP_SRC_DIR/skip_compile" ]]; then
     done
 fi
 
+
 if [[ "$exe" == "force" ]]; then
     exe=true
     rm -f "$INTERP_SRC_DIR/skip_compile"
@@ -1258,16 +1305,16 @@ if [[ "$exe" == "true" ]]; then
         need_compile=1
     else
         # Check if any .pl file is newer than the reference file
-        for pl_file in "$INTERP_SRC_DIR"/*_*.*; do
-            if [[ ! -e "$pl_file" ]]; then
-                DEBUG "{ORANGE}No matching .pl files found in $INTERP_SRC_DIR."
-            # If a .pl file is newer than the reference file, trigger recompilation
-            elif [[ "$pl_file" -nt "$reference_file" ]]; then
-                DEBUG "${ORANGE}$pl_file is newer than $reference_file."
-                need_compile=1
-                break  # Exit loop early as compilation is already needed
-            fi
-        done
+	if check_for_changes; then
+	  DEBUG "✅ Checksum OK: No changes detected in \$INTERP_SRC_DIR"
+	elif [[ $? -eq 1 ]]; then
+	  DEBUG "⚠️  Checksum file not found."
+	  need_compile=1
+	else
+	  DEBUG "❌ Checksum MISMATCH: removing $INTERP_SRC_DIR/skip_compile"
+	  rm -f "$INTERP_SRC_DIR/skip_compile"
+	  need_compile=1
+	fi
     fi
 fi
 
@@ -1310,6 +1357,8 @@ if [[ -f "$INTERP_SRC_DIR/skip_compile" ]]; then
     rm -f "$TEMP_DIR/tmp.??*"
 fi
 
+had_display=0
+original_display=""
 NEED_CLEANUP=0
 STYLE=EXE
 
@@ -1321,13 +1370,20 @@ fi
 
 # Function to cleanup compiled file if execution is interrupted or unsuccessful
 compiler_cleanup() {
+
+    if [[ $had_display -eq 1 ]]; then
+	export DISPLAY="$original_display"
+	DEBUG "Restored DISPLAY=$DISPLAY"
+    fi
+
     if [[ $NEED_CLEANUP -eq 1 ]]; then
 	NEED_CLEANUP=0
 
 	# If the success file is missing, remove the binary
 
 	if [[ -f "$reference_file" && -f "$METTALOG_COMPILE_SUCCESS" ]]; then
 	    rm -f "$METTALOG_COMPILE_SUCCESS"
+	    save_checksums
 	    DEBUG "{$GREEN}CREATED $reference_file"
 	    STYLE=EXE
 	else
@@ -1364,8 +1420,17 @@ compiler_cleanup() {
 
 }
 
+
 if [[ $need_compile -eq 1 && "$exe" == "true" ]]; then
 
+
+    if [[ -n "$DISPLAY" ]]; then
+	had_display=1
+	original_display="$DISPLAY"
+	unset DISPLAY
+	DEBUG "Temporarily unset DISPLAY (was $original_display)"
+    fi
+
     NEED_CLEANUP=1
     # Register cleanup before starting compilation
     (
@@ -1383,11 +1448,9 @@ if [[ $need_compile -eq 1 && "$exe" == "true" ]]; then
     MAKE_REF_FILE="swipl ${SWI_OPTIONS[*]} -l '$INTERP_SRC_DIR/metta_interp.pl' -g 'qcompile_mettalog.' --  ${ADD_COMPILE_ARG[*]} --exeout=$reference_file"
     DEBUG "MAKE_REF_FILE = $MAKE_REF_FILE"
 
-    unset DISPLAY
-
     # Execute the compilation command
     set +e
-    DEBUG "${BOLD}Compiling $reference_file..."
+    DEBUG "${BOLD}Compiling $reference_file..."    
     eval "$MAKE_REF_FILE" 
     # trap reset_settings  compiler_cleanup SIGINT SIGTERM EXIT
     )

mettalog

@@ -1,2 +1,2 @@
 
-; TODO: Let the "importPaths" be modifiable, but I want better string manipulation atoms
+; The contents of this file are evaluated for each new runner in the runner's top context

prolog/metta_lang/init.default.metta

@@ -245,6 +245,92 @@
    partial_combine_lists(L1,L2,Lcomb,L1a,L2a).
 partial_combine_lists(L1,L2,[],L1,L2).
 
+is_proper_arg(O):- compound(O),iz_conz(O), \+ is_list(O),!,bt, trace.
+is_proper_arg(_).
+% This hook is called when an attributed var is unified
+proper_list_attr:attr_unify_hook(_, Value) :- \+ compound(Value),!.
+proper_list_attr:attr_unify_hook(_, Value) :- is_list(Value),!.
+proper_list_attr:attr_unify_hook(_, Value) :- iz_conz(Value),!,trace.
+proper_list_attr:attr_unify_hook(_, _Value).
+% Attach the attribute if not already present and not already a proper list
+ensure_proper_list_var(Var) :- var(Var),!, put_attr(Var, proper_list_attr, is_proper_arg).
+ensure_proper_list_var(Var) :- is_proper_arg(Var),!.
+
+
+eval_at(_Fn,Where):- nb_current('eval_in_only',NonNil),NonNil\==[],!,Where=NonNil.
+eval_at( Fn,Where):- use_evaluator(fa(Fn, _), Only, only),!,Only=Where.
+eval_at(_Fn,Where):- option_value(compile,false),!,Where=interp.
+eval_at( Fn,Where):- use_evaluator(fa(Fn, _), Where, enabled),!.
+eval_at( Fn,Where):- nb_current(disable_compiler,WasDC),member(Fn,WasDC), Where==compiler,!,fail.
+eval_at( Fn,Where):- nb_current(disable_interp,WasDC),member(Fn,WasDC), Where==interp,!,fail.
+eval_at(_Fn,Where):- option_value(compile,full),!,Where=compiler.
+eval_at(_Fn, _Any):- !.
+
+must_use_interp(Fn, only_interp(Fn), true):- use_evaluator(fa(Fn, _), interp, only).
+must_use_interp(_ , eval_in_only(compiler), never):- nb_current('eval_in_only',compiler).
+must_use_interp(_ , eval_in_only(interp), true):- nb_current('eval_in_only',interp).
+must_use_interp(Fn, disable_compiler(Fn), true):- nb_current(disable_compiler,WasDC), member(Fn,WasDC).
+must_use_interp(Fn,compiler_disabled(Fn), true):- use_evaluator(fa(Fn, _), compiler, disabled).
+must_use_interp(Fn,unknown(Fn), unknown).
+
+must_use_compiler(_ ,eval_in_only(compiler)):- nb_current('eval_in_only',compiler).
+must_use_compiler(_ ,eval_in_only(interp)):- nb_current('eval_in_only',interp), fail.
+must_use_compiler(Fn,only_compiler(Fn)):- use_evaluator(fa(Fn, _), compiler, only).
+must_use_compiler(Fn,disable_interp(Fn)):- nb_current(disable_interp,WasDC), member(Fn,WasDC).
+must_use_compiler(Fn,interp_disabled(Fn)):- use_evaluator(fa(Fn, _), interp, disabled).
+
+% Compiler is Disabled for Fn
+ci(PreInterp,Fn,Len,Eval,RetVal,_PreComp,_Compiled):- fail,
+    once(must_use_interp(Fn,Why,TF)),
+    TF \== unknown, TF \== never,
+    debug_info(must_use_interp,why(Why,Fn=TF)),
+    TF == true, !,
+
+    % \+ nb_current(disable_interp,WasDI),member(Fn,WasDI),
+    call(PreInterp),
+    maplist(lazy_eval_to_src,Eval,Src),
+    if_t(Eval\=@=Src,
+       debug_info(lazy_eval_to_src,ci(Fn,Len,Eval,RetVal))),
+    %eval_fn_disable(Fn,disable_compiler,interp,((call(PreComp),call(Compiled)))),
+    debug_info(Why,eval_args(Src,RetVal)),!,
+    eval_args(Src,RetVal).
+
+ci(_PreInterp,Fn,Len,_Eval,_RetVal,PreComp,Compiled):-
+    %(nb_current(disable_interp,WasDI),member(Fn,WasDI);
+    %\+ nb_current(disable_compiler,WasDC),member(Fn,WasDC)),!,
+    %\+ \+ (maplist(lazy_eval_to_src,Eval,Src),
+    %       if_t(Eval\=@=Src, debug_info(lazy_eval_to_src,ci(Fn,Len,Eval,RetVal)))),
+    if_t(false,debug_info(call_in_only_compiler,ci(Fn,Len,Compiled))),!,
+    % eval_fn_disable(Fn,disable_compiler,eval_args(EvalM,Ret))
+    %show_eval_into_src(PreInterp,Eval,_EvalM),
+    (call(PreComp),call(Compiled)),
+    %eval_fn_disable(Fn,disable_compiler,(call(PreComp),call(Compiled))),
+    true.
+
+eval_fn_disable(Fn,DisableCompiler,Call):-
+   (nb_current(DisableCompiler,Was)->true;Was=[]),
+   (New = [Fn|Was]),
+   Setup = nb_setval(DisableCompiler,New),
+   Restore = nb_setval(DisableCompiler,Was),
+   redo_call_cleanup(Setup,Call,Restore).
+
+
+lazy_eval_to_src(A,O):- nonvar(O),trace,A=O.
+%lazy_eval_to_src(A,O):- var(A),!,O=A,ensure_proper_list_var(A).
+lazy_eval_to_src(A,O):- \+ compound(A),!,O=A.
+%lazy_eval_to_src(A,P):- is_list(A), maplist(lazy_eval_to_src,A,P),!.
+lazy_eval_to_src(A,P):- [H|T] = A, lazy_eval_to_src(H,HH),lazy_eval_to_src(T,TT),!,P= [HH|TT].
+lazy_eval_to_src(A,P):- as_p1_expr(A,P),!.
+
+delistify(L,D):- is_list(L),L=[D],!.
+delistify(L,L).
+
+create_prefixed_name(Prefix,LenArgs,FnName,String) :-
+   %(sub_string(FnName, 0, _, _, "f") -> break ; true),
+   length(LenArgs,L),
+   append([Prefix,L|LenArgs],[FnName],Parts),
+   atomic_list_concat(Parts,'_',String).
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%% Evaluation (!)
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

prolog/metta_lang/metta_compiler.pl

@@ -1,7 +1,10 @@
 :- dynamic(transpiler_predicate_store/7).
-:- discontiguous transpiler_predicate_store/7.
-:- discontiguous transpiler_predicate_nary_store/9.
-:- discontiguous compile_flow_control/8.
+:- discontiguous(transpiler_predicate_store/7).
+:- dynamic(transpiler_predicate_nary_store/9).
+:- discontiguous(transpiler_predicate_nary_store/9).
+:- multifile(compile_flow_control/8).
+:- discontiguous(compile_flow_control/8).
+:- ensure_loaded(metta_compiler).
 
 from_prolog_args(_,X,X).
 :-dynamic(pred_uses_fallback/2).
@@ -236,16 +239,19 @@
 %%%%%%%%%%%%%%%%%%%%% lists
 
 transpiler_predicate_store(builtin, 'car-atom', [1], '@doc', '@doc', [x(noeval,eager,[list])], x(noeval,eager,[])).
-'mc__1_1_car-atom'([H|_],H).
+'mc__1_1_car-atom'(HT,H):- check_type_error( \+ is_list(HT),'car-atom'(HT,H)),HT=[H|_].
 
 transpiler_predicate_store(builtin, 'cdr-atom', [1], '@doc', '@doc', [x(noeval,eager,[list])], x(noeval,eager,[list])).
-'mc__1_1_cdr-atom'([_|T],T).
+'mc__1_1_cdr-atom'(HT,T):- check_type_error( \+ is_list(HT),'cdr-atom'(HT,T)),HT=[_|T].
 
 transpiler_predicate_store(builtin, 'cons-atom', [2], '@doc', '@doc', [x(noeval,eager,[]), x(noeval,eager,[list])], x(noeval,eager,[list])).
-'mc__1_2_cons-atom'(A,B,[A|B]).
+'mc__1_2_cons-atom'(A,B,AB):- check_type_error( \+ is_list(B),'cons-atom'(A,B,AB)),AB=[A|B].
 
 transpiler_predicate_store(builtin, 'decons-atom', [1], '@doc', '@doc', [x(noeval,eager,[list])], x(noeval,eager,[list])).
-'mc__1_1_decons-atom'([A|B],[A,B]).
+'mc__1_1_decons-atom'(AB1,AB2):- check_type_error( \+ is_list(AB1), decons_atom(AB1,AB2)),!,[A|B]=AB1,AB2=[A,B].
+
+check_type_error( Check, Error):- if_t(Check, raise_type_error( Check, Error)).
+raise_type_error( Check, Error):- trace,throw(raise_type_error( Check, Error)).
 
 %transpiler_predicate_store(builtin, 'length', [1], '@doc', '@doc', [x(noeval,eager,[list])], x(noeval,eager,[number])).
 %'mc__1_1_length'(L,S) :- length(L,S).
@@ -292,6 +298,7 @@
 'mc__1_1_collapse'(ispuU(Ret,Code),R) :- fullvar(Ret),!,findall(Ret,Code,R).
 'mc__1_1_collapse'(ispuU(X,true),[X]) :- !.
 'mc__1_1_collapse'(ispuU(A,Code),X) :- atom(A),!,findall(_,Code,X),maplist(=(A),X).
+'mc__1_1_collapse'(ispuU(A,Code),X) :- !, findall(A,Code,X). %,maplist(=(A),X).
 'mc__1_1_collapse'(ispen(Ret,Code,_),R) :- fullvar(Ret),!,findall(Ret,Code,R).
 'mc__1_1_collapse'(ispeEn(X,true,_),[X]) :- !.
 'mc__1_1_collapse'(ispeEn(A,Code,_),X) :- atom(A),!,findall(_,Code,X),maplist(=(A),X).
@@ -446,6 +453,10 @@
   assign_or_direct_var_only(QuotedCode2,RetResult,QuotedResult2,QuotedCode1a),
   assign_or_direct_var_only(QuotedCode2,RetResultN,QuotedResult2,QuotedCode1N).
 
+%:- initialization(setup_library_call(builtin, 'chain', [3], '@doc', '@doc', [x(eval,eager,[]), x(noeval,eager,[]), x(eval,lazy,[])], x(noeval,eager,[])), program).
+
+
+
 %%%%%%%%%%%%%%%%%%%%% random number generation
 
 use_python_main_rng('&rng'):-!.
@@ -610,6 +621,10 @@
 'mc__1_1_eval-string'(String,Res) :-
     eval_string(String,Res).
 
+transpiler_predicate_store(builtin,'eval-in-only', [1], ['Symbol','Atom'], 'Atom', [x(doeval,eager,[]), x(noeval,eager,[])], x(doeval,eager,[])).
+'mc__1_1_eval-in-only'(Where,Eval,Res) :-
+    eval_in_only(Where,Eval,Res).
+    
 transpiler_predicate_nary_store(builtin, 'py-atom', 1, ['Atom'], 'Atom', 'Atom', [x(doeval,eager,[])], x(noeval,eager,[]), x(doeval,eager,[])).
 'mc_n_1__py-atom'(SymRef,Specialize,ResO) :-
    py_atom(SymRef,Res), specialize_res(Res,Specialize,ResO).
@@ -625,9 +640,7 @@
 transpiler_predicate_nary_store(builtin, 'py-dot-call!', 1, ['Atom'], 'Atom', 'Atom', [x(doeval,eager,[])], x(noeval,eager,[]), x(doeval,eager,[])).
 'mc_n_1__py-dot-call!'(SymRef,Args,Ret) :-
     eval_in_only(interp,[['py-dot'|SymRef]|Args],Ret).
-    %make_py_dot(Arg1,Arg2,Res)
-    %py_call_method_and_args(SymRef,Args,Res),
-    %py_metta_return_value(_RetType,Ret,Res)
+
 
 
 this_is_in_compiler_lib.
@@ -668,8 +681,9 @@
 metta_body_macro(HeadIs, AsBodyFn, AsBodyFnOut):-
    must_det_lls((
     nop((term_variables(HeadIs+AsBodyFn,Vars),copy_term(Vars,Copy),ss_freeze_vars(Vars,Copy))),
-    metta_body_macro_stack(bu,HeadIs, [], AsBodyFn, AsBodyFnE),
-    metta_body_macro_stack(td,HeadIs, [], AsBodyFnE, AsBodyFnMid),
+    metta_body_macro_stack(td1,HeadIs, [], AsBodyFn, AsBodyFnE),
+    metta_body_macro_stack(bu,HeadIs, [], AsBodyFnE, AsBodyFnMidE),
+    metta_body_macro_stack(td2,HeadIs, [], AsBodyFnMidE, AsBodyFnMid),
    (AsBodyFn =@= AsBodyFnMid -> AsBodyFnMid = AsBodyFnOut ;
      metta_body_macro(HeadIs, AsBodyFnMid, AsBodyFnOut)),
     nop((ss_unfreeze_vars(Vars,Copy))))).
@@ -720,15 +734,15 @@
 metta_body_macro_pass(bu,['chain',[Ceval,Eval],Var|Rest], ['let',Var,Eval|Rest]):- Ceval == eval,!.
 metta_body_macro_pass(bu,['chain',Eval,Var|Rest], ['let',Var,Eval|Rest]).
 
-metta_body_macro_pass(td,[['py-dot'|Args]|Rest], ['py-dot-call',Args|Rest]).
-metta_body_macro_pass(td,[['py-atom'|Args]|Rest], ['py-atom-call',Args|Rest]).
+metta_body_macro_pass(td1,[['py-dot'|Args]|Rest], ['py-dot-call',Args|Rest]).
+metta_body_macro_pass(td1,[['py-atom'|Args]|Rest], ['py-atom-call',Args|Rest]).
 %metta_body_macro_pass(bu,[eval,Next], Next).
-metta_body_macro_pass(td,[NonOp|More], AsBodyFn):- \+ callable(NonOp),!,[NonOp|More]= AsBodyFn.
+
 % metta_body_macro_pass(td,[eval,Eval], Eval).
 
-metta_body_macro_pass(td,['unique',Eval],
+metta_body_macro_pass(td2,['unique',Eval],
    ['let',Var,['call-fn!','no_repeats_var'],
-     ['let',Res,Eval,['metta-unify',Var,Res],Res]]).
+     ['let',Res,Eval,['metta-unify',Var,Res],Res]]):- fail.
 
 metta_body_macro_pass(_,AsBodyFnOut, AsBodyFnOut).
 

prolog/metta_lang/metta_compiler_lib.pl

@@ -790,10 +790,8 @@
 is_extreme_debug(G):- is_douglas, !, call(G).
 is_extreme_debug(_).
 
-sub_var_safely(Var,Source):-
-  woc(sub_var(Var,Source)).
-
-sub_term_safely(Sub,Source):- acyclic_term(Source),!,sub_term(Sub,Source).
+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).
 
 
 maybe_abolish_trace:- \+ is_flag(abolish_trace), !.
@@ -964,10 +962,16 @@
          debug_info( Topic, Info):- notrace(debug_info0( Topic, Info)).
         debug_info0( Topic, Info):- ignore(catch(((nop(setup_show_hide_debug),!,ignore(debug_info_filtered( Topic, Info)))),_,fail)),!.
 
+debug_info_filtered( Topic, Info):- var(Topic),!, debug_info_filtered(unknown, Info).
 debug_info_filtered( always(Topic), Info):- !, once((filter_matches_var(hide,Topic);filter_matches_var(hideall,Topic);debug_info_now([always,Topic], Info))),!.
 debug_info_filtered( Topic,_Info):- filter_matches_var(hideall,Topic), !.
 debug_info_filtered( Topic, Info):- filter_matches_var(showall,Topic), !, debug_info_now([showall,Topic], Info),!.
 debug_info_filtered(_Topic,_Info):- is_qcompiling, dont_show_any_qcompile,!.
+
+% Roy requested to make it easy to hide stdlib building in transpiler
+debug_info_filtered(_Topic,_Info):- currently_stdlib,   (filter_matches_var(hideall,stdlib);    filter_matches_var(hide,stdlib)),!.
+debug_info_filtered(_Topic,_Info):- currently_stdlib, \+ filter_matches_var(showall,stdlib), \+ filter_matches_var(show,stdlib),!.
+
 debug_info_filtered( Topic, Info):- filter_matches_var(show, Topic), !, ignore(debug_info_now( Topic, Info)),!.
 
 %debug_info_filtered( Topic, Info):- some_debug_show(Why,Topic), !, debug_info_now([Why,Topic], Info),!.