Changeset 4275

Timestamp:

05/24/08 08:23:23 (3 months ago)

Author:

pmoura

Message:

Small performance improvement to the caching of category predicates when using static binding.

Location:

trunk

Files:

• compiler/logtalk.pl (modified) (20 diffs)
• RELEASE_NOTES.txt (modified) (1 diff)

trunk/compiler/logtalk.pl

@@ -65 +65 @@
 
 :- dynamic('$lgt_current_protocol_'/3).         % '$lgt_current_protocol_'(Ptc, Prefix, Type)
-:- dynamic('$lgt_current_category_'/5).         % '$lgt_current_category_'(Ctg, Prefix, Def, Type, Synchronized)
+:- dynamic('$lgt_current_category_'/6).         % '$lgt_current_category_'(Ctg, Prefix, Dcl, Def, Type, Synchronized)
 :- dynamic('$lgt_current_object_'/8).           % '$lgt_current_object_'(Obj, Prefix, Dcl, Def, Super, Type, Synchronized, Threaded)
                                                 
@@ -76 +76 @@
 :- dynamic('$lgt_extends_protocol_'/3).         % '$lgt_extends_protocol_'(Ptc1, Ptc2, Scope)
                                                 
-:- dynamic('$lgt_complemented_object_'/4).      % '$lgt_complemented_object_'(Object, Category, Dcl, Def)
+:- dynamic('$lgt_complemented_object_'/4).      % '$lgt_complemented_object_'(Obj, Ctg, Dcl, Def)
 
 
@@ -314 +314 @@
     ;   '$lgt_extends_protocol_'(_, CtgOrPtc, _), \+ '$lgt_current_protocol_'(CtgOrPtc, _, _) ->
         throw(error(existence_error(protocol, CtgOrPtc), _, _))
-    ;   '$lgt_imports_category_'(_, CtgOrPtc, _), \+ '$lgt_current_category_'(CtgOrPtc, _, _, _, _) ->
+    ;   '$lgt_imports_category_'(_, CtgOrPtc, _), \+ '$lgt_current_category_'(CtgOrPtc, _, _, _, _, _) ->
         throw(error(existence_error(category, CtgOrPtc), _, _))
-    ;   '$lgt_extends_category_'(_, CtgOrPtc, _), \+ '$lgt_current_category_'(CtgOrPtc, _, _, _, _) ->
+    ;   '$lgt_extends_category_'(_, CtgOrPtc, _), \+ '$lgt_current_category_'(CtgOrPtc, _, _, _, _, _) ->
         throw(error(existence_error(category, CtgOrPtc), _, _))
     ).
@@ -408 +408 @@
 
 current_category(Ctg) :-
-    '$lgt_current_category_'(Ctg, _, _, _, _).
+    '$lgt_current_category_'(Ctg, _, _, _, _, _).
 
 
@@ -452 +452 @@
 
 category_property(Ctg, Prop) :-             % static/dynamic property
-    '$lgt_current_category_'(Ctg, _, _, Prop, _).
+    '$lgt_current_category_'(Ctg, _, _, _, Prop, _).
 
 category_property(Ctg, synchronized) :-
-    '$lgt_current_category_'(Ctg, _, _, _, yes).
+    '$lgt_current_category_'(Ctg, _, _, _, _, yes).
 
 
@@ -491 +491 @@
 
 create_object(Obj, Rels, Dirs, Clauses) :-
-    '$lgt_current_category_'(Obj, _, _, _, _),
+    '$lgt_current_category_'(Obj, _, _, _, _, _),
     throw(error(permission_error(modify, category, Obj), create_object(Obj, Rels, Dirs, Clauses))).
 
@@ -537 +537 @@
 
 create_category(Ctg, Rels, Dirs, Clauses) :-
-    '$lgt_current_category_'(Ctg, _, _, _, _),
+    '$lgt_current_category_'(Ctg, _, _, _, _, _),
     throw(error(permission_error(modify, category, Ctg), create_category(Ctg, Rels, Dirs, Clauses))).
 
@@ -594 +594 @@
 
 create_protocol(Ptc, Rels, Dirs) :-
-    '$lgt_current_category_'(Ptc, _, _, _, _),
+    '$lgt_current_category_'(Ptc, _, _, _, _, _),
     throw(error(permission_error(modify, category, Ptc), create_protocol(Ptc, Rels, Dirs))).
 
@@ -670 +670 @@
 
 abolish_category(Ctg) :-
-    (   '$lgt_current_category_'(Ctg, Prefix, _, Type, _) ->
+    (   '$lgt_current_category_'(Ctg, Prefix, _, _, Type, _) ->
         (   Type == (dynamic) ->
             call_with_args(Prefix, Dcl, Def, Rnm),
@@ -679 +679 @@
             abolish(Rnm/3),
             abolish(Prefix/3),
-            retractall('$lgt_current_category_'(Ctg, _, _, _, _)),
+            retractall('$lgt_current_category_'(Ctg, _, _, _, _, _)),
             retractall('$lgt_extends_category_'(Ctg, _, _)),
             retractall('$lgt_implements_protocol_'(Ctg, _, _)),
@@ -1963 +1963 @@
 '$lgt_alias_pred'(Ctg1, _, Alias, Pred, _) :-
     '$lgt_extends_category_'(Ctg1, Ctg2, _),
-    '$lgt_current_category_'(Ctg2, Prefix, _, _, _),
+    '$lgt_current_category_'(Ctg2, Prefix, _, _, _, _),
     '$lgt_alias_pred'(Ctg2, Prefix, Alias, Pred, _).
 
 '$lgt_alias_pred'(Obj, _, Alias, Pred, _) :-
     '$lgt_imports_category_'(Obj, Ctg, _),
-    '$lgt_current_category_'(Ctg, Prefix, _, _, _),
+    '$lgt_current_category_'(Ctg, Prefix, _, _, _, _),
     '$lgt_alias_pred'(Ctg, Prefix, Alias, Pred, _).
 
@@ -3161 +3161 @@
     (   call_with_args(Dcl, Pred, _, _, _, _, _, _, _) ->
         (   '$lgt_imports_category_'(This, Ctg, _),
-            '$lgt_current_category_'(Ctg, _, Def, _, _),
+            '$lgt_current_category_'(Ctg, _, _, Def, _, _),
             call_with_args(Def, Pred, Sender, This, Self, Call, _) ->
             call(Call)
@@ -3323 +3323 @@
 
 '$lgt_hidden_functor'(Functor) :-
-    '$lgt_current_category_'(_, Prefix, _, _, _),
+    '$lgt_current_category_'(_, Prefix, _, _, _, _),
     atom_concat(Prefix, _, Functor),
     !.
@@ -4065 +4065 @@
 
 '$lgt_redefined_entity'(Entity, category) :-
-    '$lgt_current_category_'(Entity, _, _, _, _).
+    '$lgt_current_category_'(Entity, _, _, _, _, _).
 
 
@@ -4921 +4921 @@
     !.
 
-'$lgt_pp_rclause'('$lgt_current_category_'(Ctg, Prefix, Def, Mode, Synchronized)) :-
-    '$lgt_pp_category_'(Ctg, Prefix, _, Def, _, Mode),
+'$lgt_pp_rclause'('$lgt_current_category_'(Ctg, Prefix, Dcl, Def, Mode, Synchronized)) :-
+    '$lgt_pp_category_'(Ctg, Prefix, Dcl, Def, _, Mode),
     (   '$lgt_pp_synchronized_' ->
         Synchronized = yes
@@ -8775 +8775 @@
 '$lgt_unknown_category'(Ctg) :-
     '$lgt_pp_referenced_category_'(Ctg),
-    \+ '$lgt_current_category_'(Ctg, _, _, _, _),   % not a currently loaded category
-    \+ '$lgt_pp_category_'(Ctg, _, _, _, _, _),     % not the category being compiled (self references)
-    \+ '$lgt_pp_entity_init_'(category, Ctg, _).    % not a category defined in the source file being compiled
+    \+ '$lgt_current_category_'(Ctg, _, _, _, _, _),    % not a currently loaded category
+    \+ '$lgt_pp_category_'(Ctg, _, _, _, _, _),         % not the category being compiled (self references)
+    \+ '$lgt_pp_entity_init_'(category, Ctg, _).        % not a category defined in the source file being compiled
 
 
@@ -10605 +10605 @@
     retractall('$lgt_current_object_'(Entity, _, _, _, _, _, _, _)),
     retractall('$lgt_current_protocol_'(Entity, _, _)),
-    retractall('$lgt_current_category_'(Entity, _, _, _, _)),
+    retractall('$lgt_current_category_'(Entity, _, _, _, _, _)),
     retractall('$lgt_implements_protocol_'(Entity, _, _)),
     retractall('$lgt_imports_category_'(Entity, _, _)),
@@ -10672 +10672 @@
 '$lgt_construct_category_functors'(Ctg, Prefix, Dcl, Def, Rnm) :-
     (   '$lgt_built_in_category'(Ctg) ->
-        '$lgt_current_category_'(Ctg, Prefix, _, _, _),
+        '$lgt_current_category_'(Ctg, Prefix, _, _, _, _),
         Call =.. [Prefix, Dcl, Def, Rnm],
         once(Call)
@@ -10721 +10721 @@
     (   '$lgt_current_object_'(Entity, Prefix, _, _, _, _, _, _),
         Type = object
-    ;   '$lgt_current_category_'(Entity, Prefix, _, _, _),
+    ;   '$lgt_current_category_'(Entity, Prefix, _, _, _, _),
         Type = category
     ),
@@ -13332 +13332 @@
         true
     ;   '$lgt_static_binding_entity_'(Ctg),
-        '$lgt_current_category_'(Ctg, Prefix, _, _, _),
-        Clause =.. [Prefix, Dcl, Def, _],
-        call(Clause),
+        '$lgt_current_category_'(Ctg, _, Dcl, Def, _, _),
         call_with_args(Dcl, Pred, _, static, _, _, _, DclCtn), !,
         functor(Pred, PredFunctor, PredArity),

trunk/RELEASE_NOTES.txt

@@ -23 +23 @@
     category that extends other categories.  Thanks to Victor Noel for 
     the bug report.
+
+    Small performance improvement to the caching of category predicates 
+    when using static binding.
 
     Removed from the YAP config file the definition of the forall/2