faster function index lookup

Author: TeamSPoon

prolog/metta_lang/metta_eval.pl

@@ -606,6 +606,12 @@
    is_list(Args),!,
    Y=[Fn|RArgs], mapl_eval_args(Eq,RetType,Depth,Self,Args,RArgs).
 
+
+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).

prolog/metta_lang/metta_interp.pl

@@ -4151,13 +4151,10 @@
 %     ?- load_hook1(my_load, '&corelib', '=', head, body).
 
 % load_hook1(_Load, '&corelib', _Eq, _H, _B) :- !.
-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, [Eq,H,B]) :- 
+  Eq == '=', assertz_if_new(metta_function_asserted(Self,H,B)),fail.
+
 
 load_hook1(Load, Self, Fact) :-
     % Ensure the Metta compiler is ready for use.
@@ -4166,6 +4163,13 @@
     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):-
@@ -4450,6 +4454,15 @@
 %   @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 =='=', !, 
+    woct(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).
@@ -4491,10 +4504,6 @@
    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(_Inherit,_KB, Atom) :- dont_bother(Atom),!,fail.
 
@@ -4801,8 +4810,7 @@
 % 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]),
-  EQ == Eq.
+  metta_atom0(inherit([KB]),KB,[Eq, H, B]).
 
 % Original commented-out code, retained as-is for potential future use:
 % metta_defn(KB,Head,Body):- metta_eq_def(_Eq,KB,Head,Body).