vnamed do_load

Author: TeamSPoon

prolog/metta_lang/metta_compiler.pl

@@ -431,11 +431,21 @@
       )
    ;
       % new, insert clause
-      compiler_assertz(transpiler_predicate_store(user,FnName,LenArgs,todo,todo,FinalLazyArgsAdj,FinalLazyRetAdj)),
-      setup_mi_me(FnName,LenArgs,FinalLazyArgsAdj,FinalLazyRetAdj),
+      current_compiler_context(CompCtx), % where expected to be stored (builtin,user,etc)
+      setup_library_call(CompCtx,FnName,LenArgs,todo,todo,FinalLazyArgsAdj,FinalLazyRetAdj),
       recompile_from_depends(FnName,LenArgs)
    ).
 
+create_mc_name(LenArgs,FnName,String) :-
+   length(LenArgs,L),
+   append(['mc_',L|LenArgs],[FnName],Parts),
+   atomic_list_concat(Parts,'_',String).
+
+current_compiler_context(Self):- current_self(Self), Self\=='&top', Self\==[], !. % atom(Self),
+current_compiler_context(Filename):- option_value(loading_file, Filename), Filename\==[], !.
+current_compiler_context(CompCtx):- option_value(compiler_context, CompCtx),!.
+current_compiler_context(user).
+
 get_curried_name_structure(null,'',[],[]) :- !. % special null case
 get_curried_name_structure([],[],[],[]) :- !.
 get_curried_name_structure([FnList|Args],Fn,TotalArgs,[L|LenArgs]) :- is_list(FnList),!,
@@ -486,7 +496,7 @@
 
 number_vars_wo_conficts(X,XX):-
    copy_term(X,XX),
-   woc(max_integer_in_term(XX,0,N)),
+   woct(max_integer_in_term(XX,0,N)),
    succ(N,N2),
    numbervars(XX,N2,_,[attvar(skip)]).
 
@@ -499,10 +509,10 @@
    %retract(transpiler_predicate_store(_,Fn,Arity,_,_,_,_)),
    create_prefixed_name('mc_',Arity,Fn,FnWPrefix),
    abolish(FnWPrefix/ArityP1),
-   create_prefixed_name('mc_',Arity,Fn,FnWMiPrefix),
-   %abolish(FnWMiPrefix/ArityP1),
-   create_prefixed_name('mc_',Arity,Fn,FnWMePrefix),
-   %abolish(FnWMePrefix/ArityP1),
+ %  create_prefixed_name('mi_',Arity,Fn,FnWMiPrefix),
+ %  abolish(FnWMiPrefix/ArityP1),
+ %  create_prefixed_name('me_',Arity,Fn,FnWMePrefix),
+ %  abolish(FnWMePrefix/ArityP1),
    % retract(transpiler_stub_created(Fn,Arity)),
    % create an ordered list of integers to make sure to do them in order
    findall(ClauseIDt,transpiler_clause_store(Fn,Arity,ClauseIDt,_,_,_,_,_,_),ClauseIdList),
@@ -2532,10 +2542,16 @@
 call4(G):- call(G).
 call5(G):- call(G).
 
-trace_break:- trace,break.
+trace_break:- trace_break((trace,break)).
+trace_break(G):-
+   stream_property(Err, file_no(2)),
+   current_output(Cur), Cur\=@=Err,!,
+   with_output_to(Err, trace_break(G)).
+trace_break(G):- nl, writeq(call(G)), trace,break.
+%    :- set_prolog_flag(gc,false).
 
 :- if(debugging(metta(compiler_bugs))).
-:- set_prolog_flag(gc,false).
+   :- set_prolog_flag(gc,false).
 :- endif.
 
 call_fr(G,Result,FA):- current_predicate(FA),!,call(G,Result).

prolog/metta_lang/metta_compiler_lib.pl

@@ -361,14 +361,18 @@
 convert_space('&self','&top') :- !.
 convert_space(S,S).
 
-:- initialization(setup_library_call(builtin, 'add-atom', [2], '@doc', '@doc', [x(doeval,eager,[]), x(noeval,eager,[])], x(doeval,eager,[])), program).
-'mc__1_2_add-atom'(Space,PredDecl,[]) :- convert_space(Space,Space1),A=metta_atom_asserted(Space1,PredDecl),(call(A) -> true ; assertz(A)).
-
-:- initialization(setup_library_call(builtin, 'remove-atom', [2], '@doc', '@doc', [x(doeval,eager,[]), x(noeval,eager,[])], x(doeval,eager,[])), program).
-'mc__1_2_remove-atom'(Space,PredDecl,[]) :- convert_space(Space,Space1),retractall(metta_atom_asserted(Space1,PredDecl)).
-
-:- initialization(setup_library_call(builtin, 'get-atoms', [1], '@doc', '@doc', [x(noeval,eager,[])], x(noeval,eager,[])), program).
-'mc__1_1_get-atoms'(Space,Atoms) :- metta_atom(Space, Atoms).
+transpiler_predicate_store(builtin, 'add-atom', [2], '@doc', '@doc', [x(doeval,eager,[]), x(noeval,eager,[])], x(doeval,eager,[])).
+'mc__1_2_add-atom'(Space,PredDecl,[]) :- convert_space(Space,Space1),!,A=metta_atom_asserted(Space1,PredDecl),(call(A) -> true ; assertz(A)).
+'mc__1_2_add-atom'(Space,PredDecl,TF) :- convert_space(Space,Space1), %A=metta_atom_asserted(Space1,PredDecl),(call(A) -> true ; assertz(A)).
+             do_metta(python,load,Space1,PredDecl,TF).
+
+transpiler_predicate_store(builtin, 'remove-atom', [2], '@doc', '@doc', [x(doeval,eager,[]), x(noeval,eager,[])], x(doeval,eager,[])).
+'mc__1_2_remove-atom'(Space,PredDecl,[]) :- convert_space(Space,Space1),!,retractall(metta_atom_asserted(Space1,PredDecl)).
+'mc__1_2_remove-atom'(Space,PredDecl,TF) :- convert_space(Space,Space1), %A=metta_atom_asserted(Space1,PredDecl),(call(A) -> true ; assertz(A)).
+             do_metta(python,unload,Space1,PredDecl,TF).
+
+transpiler_predicate_store(builtin, 'get-atoms', [1], '@doc', '@doc', [x(noeval,eager,[])], x(noeval,eager,[])).
+'mc__1_1_get-atoms'(Space,Atoms) :- metta_atom(Space, Atom),unify_with_occurs_check(Atoms,Atom).
 
 % This allows match to supply hits to the correct metta_atom/2 (Rather than sending a variable
 match_pattern(Space, Pattern):-

prolog/metta_lang/metta_python.pl

@@ -910,7 +910,6 @@
 %
 %   @arg O The input object to check.
 py_is_function(O):- \+ py_is_object(O),!,fail.
-%py_is_function(PyObject) :- maybe_py_deref(PyObject,PyObject2),!,py_is_function(PyObject2).
 py_is_function(PyObject) :-
     py_type(PyObject, Type),
     py_is_method_type(Type),!.
@@ -2037,29 +2036,25 @@
 %       ?- rust_to_pl([rust_atom1, rust_atom2], PrologTerm).
 %
 rust_to_pl(L,P):- var(L),!,L=P.
-% nb_current(last_debug_info, debug_info(always(porting), hyperon_throws_error(should_be(number, W)))), py_call(W:get_object(),O),py_call(O:value,OO).
 % rust_to_pl([],P):- !,P=[].
 rust_to_pl(L,P):- is_list(L),!,maplist(rust_to_pl,L,P).
 rust_to_pl(R,P):- compound(R),!,compound_name_arguments(R,F,RR),maplist(rust_to_pl,RR,PP),
     compound_name_arguments(P,F,PP).
 rust_to_pl(R,P):- \+ py_is_object(R),!,P = R.
-
-% rust_to_pl(R,PT):- py_type(R,'GroundedAtom'), py_call(W:get_grounded_type(),O), py_call(repr(O),OO).
-
-rust_to_pl(R,P):- py_type(R,'ValueObject'),py_ocall(R:'value',L),!,rust_to_pl(L,P).
-rust_to_pl(R,PT):-
-            py_type(R,'GroundedAtom'),
-            py_ocall(R:get_grounded_type(),T),
-            rust_to_pl(T,TT),
-            py_ocall(R:get_object(),L), L\==R,
-            rust_to_pl(L,P),
-            combine_term_l(TT,P,PT), !.
 rust_to_pl(R,P):- py_type(R,'ExpressionAtom'),py_mcall(R:get_children(),L),!,maplist(rust_to_pl,L,P).
 rust_to_pl(R,P):- py_type(R,'SymbolAtom'),py_acall(R:get_name(),P),!.
 rust_to_pl(R,P):- py_type(R,'VariableAtom'),py_scall(R:get_name(),N),!,as_var(N,P),!.
 %rust_to_pl(R,P):- py_type(R,'VariableAtom'),py_acall(R:get_name(),N),!,atom_concat('$',N,P).
 rust_to_pl(R,N):- py_type(R,'OperationObject'),py_acall(R:name(),N),!,cache_op(N,R).
 rust_to_pl(R,P):- py_type(R,'SpaceRef'),!,P = R.
+rust_to_pl(R,P):- py_type(R,'ValueObject'),py_ocall(R:'value'(),L),!,rust_to_pl(L,P).
+rust_to_pl(R,PT):-
+    py_type(R,'GroundedAtom'),
+    py_ocall(R:get_grounded_type(),T),
+    rust_to_pl(T,TT),
+    py_ocall(R:get_object(),L),!,
+    rust_to_pl(L,P),
+    combine_term_l(TT,P,PT).
 rust_to_pl(R,P):- py_is_list(R),py_m(R,L),R \== L,!,rust_to_pl(L,P).
 rust_to_pl(R,PT):- py_type(R,T),combine_term_l(T,R,PT),!.
 %rust_to_pl(R,P):- py_acall(R:'__repr__'(),P),!.
@@ -2148,9 +2143,8 @@
 %       ?- combine_term_l('Number', 42, PrologTerm).
 %
 combine_term_l('OperationObject',P,P):-!.
-combine_term_l(_,P,V):- py_is_object(P), py_type(P,'ValueObject'),py_call(P:value,V),!.
-combine_term_l('Bool',P,P):-!.
 combine_term_l('Number',P,P):-!.
+combine_term_l('Bool',P,P):-!.
 combine_term_l('ValueObject',R,P):-R=P,!. %rust_to_pl(R,P),!.
 combine_term_l('%Undefined%',R,P):-rust_to_pl(R,P),!.
 combine_term_l('hyperon::space::DynSpace',P,P):-!.