Changeset 4270

Timestamp:

05/23/08 09:49:25 (4 months ago)

Author:

pmoura

Message:

Generalized the :/1 control construct to allow its use from within categories that extend other categories.

Location:

trunk

Files:

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

trunk/compiler/logtalk.pl

@@ -3154 +3154 @@
 
 
-% '$lgt_call_ctg_pred'(+atom, +atom, +callable, +object_identifier, +object_identifier, +object_identifier)
-%
-% calls a category predicate directly, without using the message sending mechanism
-
-'$lgt_call_ctg_pred'(Dcl, Def, Pred, Sender, This, Self) :-
+% '$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) :-
     (   call_with_args(Dcl, Pred, _, _, _, _, _, _, _) ->
-        (   '$lgt_imports_category_'(This, Ctg, _),
-            call_with_args(Def, Pred, Sender, This, Self, Call, Ctg) ->
+        (   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 ->
             call(Call)
         )
@@ -6924 +6933 @@
 '$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, _, _, _),
@@ -6938 +6952 @@
         true
     ;   Pred = Alias,
-        '$lgt_pp_object_'(_, _, Dcl, Def, _, IDcl, _, _, _, _, _),
         (   ('$lgt_pp_instantiated_class_'(_, _, _, _, _, _, _, _, _, _); '$lgt_pp_specialized_class_'(_, _, _, _, _, _, _, _, _, _)) ->
-            TPred = '$lgt_call_ctg_pred'(IDcl, Def, Pred, Sender, This, Self)
-        ;   TPred = '$lgt_call_ctg_pred'(Dcl, Def, Pred, Sender, This, Self)
+            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)
         )
+    ).
+
+'$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)
     ).
 

trunk/manuals/index.html

@@ -32 +32 @@
     <div class="copyright">
         <span>Copyright &copy; <a href="mailto:pmoura@logtalk.org">Paulo Moura</a> &mdash; <a href="http://logtalk.org">Logtalk.org</a></span><br/> 
-        <span>Last updated on: April 21, 2008</span>
+        <span>Last updated on: May 23, 2008</span>
     </div>
     <div class="navbottom">

trunk/manuals/refman/control/direct1.html

@@ -26 +26 @@
 <pre>:Goal</pre>
 <p>
-Calls an imported category predicate without using the message sending mechanisms. The category 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. The lookup for both the predicate declaration and the predicate definition begins in <em>this</em> instead of <em>self</em>. Furthermore, the lookup of the predicate definition is 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.
+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.
 </p>
 
@@ -40 +40 @@
     <dt>Goal is neither a variable nor a callable term:</dt>
         <dd><code>type_error(callable, Goal)</code></dd>
-    <dt>The object containing the call does not import any category:</dt>
+    <dt>The entity containing the call does not import or inherit from any entity:</dt>
         <dd><code>existence_error(procedure, Goal)</code></dd>
 </dl>
@@ -59 +59 @@
     <div class="copyright">
         <span>Copyright &copy; <a href="mailto:pmoura@logtalk.org">Paulo Moura</a> &mdash; <a href="http://logtalk.org">Logtalk.org</a></span><br/> 
-        <span>Last updated on: August 27, 2007</span>
+        <span>Last updated on: May 23, 2008</span>
     </div>
     <div class="navbottom">

trunk/manuals/refman/control/to_super1.html

@@ -26 +26 @@
 <pre>^^Predicate</pre>
 <p>
-Calls a redefined/inherited definition for a message. Normally only used in the body of a predicate definition for the message. Predicate should match a public or protected predicate of <a class="glossary" title="Go to glossary definition" href="../../glossary.html#self">self</a> or be within the scope of <a class="glossary" title="Go to glossary definition" href="../../glossary.html#this">this</a>.
+Calls a redefined/inherited definition for a message. Normally only used in the body of a predicate definition for the message. Predicate should match a public or protected predicate of <a class="glossary" title="Go to glossary definition" href="../../glossary.html#self"><em>self</em></a> or be within the scope of <a class="glossary" title="Go to glossary definition" href="../../glossary.html#this"><em>this</em></a>.
 </p>
 

trunk/manuals/refman/index.html

@@ -311 +311 @@
 </dl>
 
-<h3>Direct calls of category predicates</h3>
+<h3>Direct calls of inherited or imported predicates</h3>
 
 <dl class="toc-entries">
@@ -320 +320 @@
     <div class="copyright">
         <span>Copyright &copy; <a href="mailto:pmoura@logtalk.org">Paulo Moura</a> &mdash; <a href="http://logtalk.org">Logtalk.org</a></span><br/> 
-        <span>Last updated on: April 18, 2008</span>
+        <span>Last updated on: May 23, 2008</span>
     </div>
     <div class="navbottom">

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_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>
@@ -302 +303 @@
     <div class="copyright">
         <span>Copyright &copy; <a href="mailto:pmoura@logtalk.org">Paulo Moura</a> &mdash; <a href="http://logtalk.org">Logtalk.org</a></span><br/>
-        <span>Last updated on: April 21, 2008</span>
+        <span>Last updated on: May 23, 2008</span>
     </div>
     <div class="navbottom">

trunk/manuals/userman/messages.html

@@ -120 +120 @@
     ^^Predicate,    % call inherited definition
     ... .           % 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.
+</p>
 
 <h2 id="messages_events">Message sending and event generation</h2>
@@ -236 +242 @@
     <div class="copyright">
         <span>Copyright &copy; <a href="mailto:pmoura@logtalk.org">Paulo Moura</a> &mdash; <a href="http://logtalk.org">Logtalk.org</a></span><br/> 
-        <span>Last updated on: September 15, 2007</span>
+        <span>Last updated on: May 23, 2008</span>
     </div>
     <div class="navbottom">

trunk/manuals/userman/objects.html

@@ -304 +304 @@
 <pre>:- synchronized.</pre>
 <p>
-This directive results in using internally the same mutex for synchronizing the execution of all defined object predicates.
+This directive results in using internally the same mutex for synchronizing the execution of all defined object predicates. For fine-grained predicate synchronization, the <a title="Consult reference manual" href="../refman/directives/synchronized1.html"><code>synchronized/1</code></a> directive may be used instead.
 </p>
 
@@ -439 +439 @@
     <div class="copyright">
         <span>Copyright &copy; <a href="mailto:pmoura@logtalk.org">Paulo Moura</a> &mdash; <a href="http://logtalk.org">Logtalk.org</a></span><br/> 
-        <span>Last updated on: December 9, 2007</span>
+        <span>Last updated on: May 21, 2008</span>
     </div>
     <div class="navbottom">

trunk/RELEASE_NOTES.txt

@@ -11 +11 @@
 
 
-2.31.6 - May 26, 2008
+2.31.6 - May ??, 2008
+
+    Generalized the :/1 control construct to allow its use from within 
+    categories that extend other categories.
 
     Fixed a Logtalk compiler bug when compiling a class that imports a