Changeset 4272 for trunk

Timestamp:

05/24/08 03:24:58 (4 months ago)

Author:

pmoura

Message:

Minor documentation improvements.

Location:

trunk/manuals

Files:

• refman/control/direct1.html (modified) (2 diffs)
• userman/categories.html (modified) (2 diffs)
• userman/running.html (modified) (1 diff)

trunk/manuals/refman/control/direct1.html

@@ -24 +24 @@
 <h4>Description</h4>
 
-<pre>:Goal</pre>
+<pre>:Predicate</pre>
 <p>
 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.
@@ -36 +36 @@
 
 <dl>
-    <dt>Goal is a variable:</dt>
+    <dt>Predicate is a variable:</dt>
         <dd><code>instantiation_error</code></dd>
-    <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>
-        <dd><code>existence_error(procedure, Goal)</code></dd>
+    <dt>Predicate is neither a variable nor a callable term:</dt>
+        <dd><code>type_error(callable, Predicate)</code></dd>
+    <dt>Predicate is not declared:</dt>
+        <dd><code>existence_error(predicate_declaration, Predicate)</code></dd>
 </dl>
 

trunk/manuals/userman/categories.html

@@ -58 +58 @@
 :- end_category.</pre>
 <p>
-This feature should only be used when extending a category without breaking its functional cohesion (for example, when a modified version of a category is needed for importing on several unrelated objects). The prefered way of composing several categories is by importing them into an object.
+This feature should only be used when extending a category without breaking its functional cohesion (for example, when a modified version of a category is needed for importing on several unrelated objects). The preferred way of composing several categories is by importing them into an object. When a category overrides a predicate defined in an extended category, the overridden definition can still be used by using the <a title="Consult reference manual" href="../refman/directives/alias3.html"><code>alias/3</code></a> predicate directive.
 </p>
 <p>
@@ -330 +330 @@
 </p>
 <p>
-It is also possible to call category predicates such that the predicate declaration and definition lookups will start 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. For example:
+It is also possible to perform direct calls to predicates from imported categories without using the message sending mechanisms with the <a title="Consult reference manual" href="../refman/control/direct1.html"><code>:/1</code></a> control construct. For example:
 </p>
 <pre>:- object(worker,

trunk/manuals/userman/running.html

@@ -182 +182 @@
     <dl>
         <dt><code>hook(Object)</code></dt>
-            <dd>Allows the definition of a compiler hooks that are called for each term read form a source file and for each compiled goal. This option specifies an object (which can be the pseudo-object <code>user</code>) implementing the <code>expanding</code> built-in protocol. The object is expected to define clauses for the <a title="Consult reference manual" href="../refman/methods/term_expansion2.html"><code>term_expansion/2</code></a> and <a title="Consult reference manual" href="../refman/methods/goal_expansion2.html"><code>goal_expansion/2</code></a> predicates. In the case of the <code>term_expansion/2</code> predicate, the first argument is the term read form the source file while the second argument returns a list of terms corresponding to the expansion of the first argument. In the case of the <code>goal_expansion/2</code> predicate, the second argument should be a goal resulting from the expansion of the goal in the first argument. The predicate <code>goal_expansion/2</code> is called on the expanded goals so care must be taken to avoid compilation loops.</dd>
+            <dd>Allows the definition of compiler hooks that are called for each term read form a source file and for each compiled goal. This option specifies an object (which can be the pseudo-object <code>user</code>) implementing the <code>expanding</code> built-in protocol. The object is expected to define clauses for the <a title="Consult reference manual" href="../refman/methods/term_expansion2.html"><code>term_expansion/2</code></a> and <a title="Consult reference manual" href="../refman/methods/goal_expansion2.html"><code>goal_expansion/2</code></a> predicates. In the case of the <code>term_expansion/2</code> predicate, the first argument is the term read form the source file while the second argument returns a list of terms corresponding to the expansion of the first argument. In the case of the <code>goal_expansion/2</code> predicate, the second argument should be a goal resulting from the expansion of the goal in the first argument. The predicate <code>goal_expansion/2</code> is called on the expanded goals so care must be taken to avoid compilation loops.</dd>
     </dl>
     <dl>