Changeset 4271

Timestamp:

05/23/08 15:12:42 (6 months ago)

Author:

pmoura

Message:

Fixed a Logtalk runtime bug when using the :/1 control construct to call a predicate defined in a category extended by a category that is imported by the object making the call. Reverted the changes that allowed the use of the :/1 control construct within categories that extend other categories.

Location:

trunk

Files:

• compiler/logtalk.pl (modified) (22 diffs)
• manuals/refman/control/direct1.html (modified) (2 diffs)
• manuals/refman/index.html (modified) (1 diff)
• manuals/userman/index.html (modified) (1 diff)
• manuals/userman/messages.html (modified) (1 diff)
• RELEASE_NOTES.txt (modified) (1 diff)
• UPGRADING.txt (modified) (1 diff)

trunk/compiler/logtalk.pl

@@ -41 +41 @@
 
 
-% category predicate direct call operator
+% imported/inherited predicate call operator
 
 :- op(600,  fy,  :).
@@ -65 +65 @@
 
 :- dynamic('$lgt_current_protocol_'/3).         % '$lgt_current_protocol_'(Ptc, Prefix, Type)
-:- dynamic('$lgt_current_category_'/4).         % '$lgt_current_category_'(Ctg, Prefix, Type, Synchronized)
+:- dynamic('$lgt_current_category_'/5).         % '$lgt_current_category_'(Ctg, Prefix, Def, Type, Synchronized)
 :- dynamic('$lgt_current_object_'/8).           % '$lgt_current_object_'(Obj, Prefix, Dcl, Def, Super, Type, Synchronized, Threaded)
                                                 
@@ -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, _).
 
@@ -3154 +3154 @@
 
 
-% '$lgt_call_pred_from_this'(+atom, +object_identifier, +atom, +atom, +callable, +object_identifier, +object_identifier, +object_identifier)
-% '$lgt_call_pred_from_this'(+atom, +category_identifier, +atom, +atom, +callable, +object_identifier, +object_identifier, +object_identifier)
-%
-% calls a predicate from "this", without using the message sending mechanism
-% prevent loops by ensuring that we look for an inherited or imported definition
-
-'$lgt_call_pred_from_this'(object, Obj, Dcl, Def, Pred, Sender, This, Self) :-
+% '$lgt_call_ctg_pred'(+atom, +callable, +object_identifier, +object_identifier, +object_identifier)
+%
+% calls a category predicate directly, without using the message sending mechanism
+
+'$lgt_call_ctg_pred'(Dcl, Pred, Sender, This, Self) :-
     (   call_with_args(Dcl, Pred, _, _, _, _, _, _, _) ->
-        (   call_with_args(Def, Pred, Sender, This, Self, Call, Ctn), Obj \= Ctn ->
-            call(Call)
-        )
-    ;   throw(error(existence_error(predicate_declaration, Pred), ':'(Pred), This))
-    ).
-
-'$lgt_call_pred_from_this'(category, Ctg, Dcl, Def, Pred, Sender, This, Self) :-
-    (   call_with_args(Dcl, Pred, _, _, _, _, _, _) ->
-        (   call_with_args(Def, Pred, Sender, This, Self, Call, Ctn), Ctg \= Ctn ->
+        (   '$lgt_imports_category_'(This, Ctg, _),
+            '$lgt_current_category_'(Ctg, _, Def, _, _),
+            call_with_args(Def, Pred, Sender, This, Self, Call, _) ->
             call(Call)
         )
@@ -3331 +3323 @@
 
 '$lgt_hidden_functor'(Functor) :-
-    '$lgt_current_category_'(_, Prefix, _, _),
+    '$lgt_current_category_'(_, Prefix, _, _, _),
     atom_concat(Prefix, _, Functor),
     !.
@@ -4073 +4065 @@
 
 '$lgt_redefined_entity'(Entity, category) :-
-    '$lgt_current_category_'(Entity, _, _, _).
+    '$lgt_current_category_'(Entity, _, _, _, _).
 
 
@@ -4929 +4921 @@
     !.
 
-'$lgt_pp_rclause'('$lgt_current_category_'(Ctg, Prefix, Mode, Synchronized)) :-
-    '$lgt_pp_category_'(Ctg, Prefix, _, _, _, Mode),
+'$lgt_pp_rclause'('$lgt_current_category_'(Ctg, Prefix, Def, Mode, Synchronized)) :-
+    '$lgt_pp_category_'(Ctg, Prefix, _, Def, _, Mode),
     (   '$lgt_pp_synchronized_' ->
         Synchronized = yes
@@ -6933 +6925 @@
 '$lgt_tr_body'(':'(Pred), _, _, _) :-
     \+ '$lgt_pp_imported_category_'(_, _, _, _, _),
-    \+ '$lgt_pp_extended_category_'(_, _, _, _, _),
-    \+ '$lgt_pp_extended_object_'(_, _, _, _, _, _, _, _, _, _),
-    \+ '$lgt_pp_instantiated_class_'(_, _, _, _, _, _, _, _, _, _),
-    \+ '$lgt_pp_specialized_class_'(_, _, _, _, _, _, _, _, _, _),
     throw(existence_error(procedure, Pred)).
 
 '$lgt_tr_body'(':'(Alias), TPred, '$lgt_dbg_goal'(':'(Alias), TPred, DbgCtx), Ctx) :-
-    '$lgt_pp_object_'(Obj, _, Dcl, Def, _, IDcl, IDef, _, _, _, _),
-    !,
     '$lgt_ctx_ctx'(Ctx, _, Sender, This, Self, _, _, _),
     '$lgt_ctx_dbg_ctx'(Ctx, DbgCtx),
@@ -6952 +6938 @@
         true
     ;   Pred = Alias,
+        '$lgt_pp_object_'(_, _, Dcl, _, _, IDcl, _, _, _, _, _),
         (   ('$lgt_pp_instantiated_class_'(_, _, _, _, _, _, _, _, _, _); '$lgt_pp_specialized_class_'(_, _, _, _, _, _, _, _, _, _)) ->
-            TPred = '$lgt_call_pred_from_this'(object, Obj, IDcl, IDef, Pred, Sender, This, Self)
-        ;   TPred = '$lgt_call_pred_from_this'(object, Obj, Dcl, Def, Pred, Sender, This, Self)
+            TPred = '$lgt_call_ctg_pred'(IDcl, Pred, Sender, This, Self)
+        ;   TPred = '$lgt_call_ctg_pred'(Dcl, Pred, Sender, This, Self)
         )
-    ).
-
-'$lgt_tr_body'(':'(Alias), TPred, '$lgt_dbg_goal'(':'(Alias), TPred, DbgCtx), Ctx) :-
-    '$lgt_pp_category_'(Ctg, _, Dcl, Def, _, _),
-    '$lgt_ctx_ctx'(Ctx, _, Sender, This, Self, _, _, _),
-    '$lgt_ctx_dbg_ctx'(Ctx, DbgCtx),
-    (   '$lgt_pp_extended_category_'(Ctg2, _, _, _, _),
-        (   '$lgt_pp_alias_'(Ctg2, Pred, Alias) ->
-            true
-        ;   Pred = Alias
-        ),
-        '$lgt_ctg_static_binding_cache'(Ctg2, Pred, Sender, This, Self, TPred) ->
-        true
-    ;   Pred = Alias,
-        TPred = '$lgt_call_pred_from_this'(category, Ctg, Dcl, Def, Pred, Sender, This, Self)
     ).
 
@@ -8801 +8773 @@
 '$lgt_unknown_category'(Ctg) :-
     '$lgt_pp_referenced_category_'(Ctg),
-    \+ '$lgt_current_category_'(Ctg, _, _, _),      % not a currently loaded category
+    \+ '$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
@@ -10631 +10603 @@
     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, _, _)),
@@ -10698 +10670 @@
 '$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)
@@ -10747 +10719 @@
     (   '$lgt_current_object_'(Entity, Prefix, _, _, _, _, _, _),
         Type = object
-    ;   '$lgt_current_category_'(Entity, Prefix, _, _),
+    ;   '$lgt_current_category_'(Entity, Prefix, _, _, _),
         Type = category
     ),
@@ -13358 +13330 @@
         true
     ;   '$lgt_static_binding_entity_'(Ctg),
-        '$lgt_current_category_'(Ctg, Prefix, _, _),
+        '$lgt_current_category_'(Ctg, Prefix, _, _, _),
         Clause =.. [Prefix, Dcl, Def, _],
         call(Clause),

trunk/manuals/refman/control/direct1.html

@@ -26 +26 @@
 <pre>:Goal</pre>
 <p>
-Calls an inherited or imported predicate with the lookup for both the predicate declaration and the predicate definition beginning in <em>this</em> instead of <em>self</em>. As a consequence, any redeclaration or redefinition of the predicate in a descendant of the object containing the call will be ignored. The predicate is called with the same execution context (<em>sender</em>, <em>this</em>, and <em>self</em>) as the predicate whose body contains the call. When the predicate is defined in an imported category compiled using static binding, this control construct allows the predicate to be called with the same performance as a local object predicate.
+Calls an <strong>imported</strong> predicate with the lookup for the predicate declaration beginning in <em>this</em> instead of <em>self</em> and with the lookup for the predicate definition restricted to the imported categories. As a consequence, any redeclaration or redefinition of the predicate in a descendant of the object containing the call will be ignored. The predicate is called with the same execution context (<em>sender</em>, <em>this</em>, and <em>self</em>) as the predicate whose body contains the call. When the predicate is defined in an imported category compiled using static binding, this control construct allows the predicate to be called with the same performance as a local object predicate.
 </p>
 
@@ -40 +40 @@
     <dt>Goal is neither a variable nor a callable term:</dt>
         <dd><code>type_error(callable, Goal)</code></dd>
-    <dt>The entity containing the call does not import or inherit from any entity:</dt>
+    <dt>The object containing the call does not import any category:</dt>
         <dd><code>existence_error(procedure, Goal)</code></dd>
 </dl>

trunk/manuals/refman/index.html

@@ -311 +311 @@
 </dl>
 
-<h3>Direct calls of inherited or imported predicates</h3>
+<h3>Direct calls of imported predicates</h3>
 
 <dl class="toc-entries">

trunk/manuals/userman/index.html

@@ -79 +79 @@
     <dt><a href="messages.html#messages_self">Sending a message to <em>self</em></a><span class="leader"></span><span class="page-ref"><span class="messages_self"></span></span></dt>
     <dt><a href="messages.html#messages_super">Calling an overridden predicate definition</a><span class="leader"></span><span class="page-ref"><span class="messages_super"></span></span></dt>
-    <dt><a href="messages.html#messages_direct">Direct calls of imported and inherited predicates</a><span class="leader"></span><span class="page-ref"><span class="messages_direct"></span></span></dt>
+    <dt><a href="messages.html#messages_direct">Direct calls of imported predicates</a><span class="leader"></span><span class="page-ref"><span class="messages_direct"></span></span></dt>
     <dt><a href="messages.html#messages_events">Message sending and event generation</a><span class="leader"></span><span class="page-ref"><span class="messages_events"></span></span></dt>
     <dt><a href="messages.html#messages_performance">Message sending performance</a><span class="leader"></span><span class="page-ref"><span class="messages_performance"></span></span></dt>

trunk/manuals/userman/messages.html

@@ -121 +121 @@
     ... .           % do something more</pre>
 
-<h2 id="messages_direct">Direct calls of imported and inherited predicates</h2>
-
-<p>
-It is possible to call an imported or inherited predicate starting the lookups for the predicate declaration and definition from <em>this</em> instead of <em>self</em> by using the <a title="Consult reference manual" href="../refman/control/direct1.html"><code>:/1</code></a> control construct.
+<h2 id="messages_direct">Direct calls of imported predicates</h2>
+
+<p>
+It is possible to call an imported predicate without using the message sending mechanisms with the <a title="Consult reference manual" href="../refman/control/direct1.html"><code>:/1</code></a> control construct.
 </p>
 

trunk/RELEASE_NOTES.txt

@@ -13 +13 @@
 2.31.6 - May ??, 2008
 
-    Generalized the :/1 control construct to allow its use from within 
-    categories that extend other categories.
+    Fixed a Logtalk runtime bug when using the :/1 control construct to 
+    call a predicate defined in a category extended by a category that 
+    is imported by the object making the call.
 
     Fixed a Logtalk compiler bug when compiling a class that imports a  

trunk/UPGRADING.txt

@@ -193 +193 @@
 encoding/1). Older config files are incompatible with this new Logtalk 
 version.
+
+Logtalk version 2.31.6 changes representation of loaded categories in order 
+to correct a bug in the use of the :/1 control construct, therefore implying 
+recompilation of all categories.