Changeset 4599

Timestamp:

11/21/08 12:47:26 (7 weeks ago)

Author:

pmoura

Message:

Added an expand_goal/2 built-in method to support explicit calls to the goal_expansion/2 user-defined hook. Updated the term expansion mechanism to allow the expansion to be a single term instead of a list of terms. Improved the documentation of the term and goal expansion predicates.

Added syntax coloring support for the new expand_goal/2 method to the supported text editors and syntax highlighters.

Location:

trunk

Files:

• compiler/logtalk.pl (modified) (11 diffs)
• manuals/index.html (modified) (1 diff)
• manuals/refman/index.html (modified) (2 diffs)
• manuals/refman/methods/expand_term2.html (modified) (2 diffs)
• manuals/refman/methods/goal_expansion2.html (modified) (2 diffs)
• manuals/refman/methods/term_expansion2.html (modified) (2 diffs)
• manuals/refman/refman.header (modified) (1 diff)
• manuals/userman/index.html (modified) (2 diffs)
• manuals/userman/predicates.html (modified) (2 diffs)
• manuals/userman/userman.header (modified) (1 diff)
• RELEASE_NOTES.txt (modified) (2 diffs)
• wenv/emacs/logtalk.el (modified) (2 diffs)
• wenv/geshi/logtalk.php (modified) (2 diffs)
• wenv/gtksourceview2/logtalk.lang (modified) (1 diff)
• wenv/highlight/lgt.lang (modified) (2 diffs)
• wenv/jedit/logtalk.xml (modified) (2 diffs)
• wenv/kate/logtalk.xml (modified) (2 diffs)
• wenv/nedit/logtalk.pats (modified) (2 diffs)
• wenv/npp/logtalk.api (modified) (1 diff)
• wenv/pygments/logtalk.py (modified) (1 diff)
• wenv/smultron/logtalk.plist (modified) (1 diff)
• wenv/source-highlight/logtalk.lang (modified) (2 diffs)
• wenv/subethaedit/logtalk.plist (modified) (1 diff)
• wenv/subethaedit2/Logtalk.mode/Contents/Resources/AutocompleteAdditions.txt (modified) (1 diff)
• wenv/subethaedit2/Logtalk.mode/Contents/Resources/SyntaxDefinition.xml (modified) (1 diff)
• wenv/superedi/Logtalk.syn (modified) (1 diff)
• wenv/tests/source.lgt (modified) (1 diff)
• wenv/textmate/Logtalk.tmbundle/Preferences/Completions.plist (modified) (1 diff)
• wenv/textmate/Logtalk.tmbundle/Syntaxes/Logtalk.plist (modified) (1 diff)
• wenv/textpad/logtalk.syn (modified) (1 diff)
• wenv/vim/completion/logtalk.dict (modified) (1 diff)
• wenv/vim/syntax/logtalk.vim (modified) (2 diffs)

trunk/compiler/logtalk.pl

@@ -255 +255 @@
 
 :- dynamic('$lgt_pp_hook_term_expansion_'/2).   % '$lgt_pp_hook_term_expansion_'(Term, Terms)
-:- dynamic('$lgt_pp_hook_goal_expansion_'/2).   % '$lgt_pp_hook_goal_expansion_'(Term, Terms)
+:- dynamic('$lgt_pp_hook_goal_expansion_'/2).   % '$lgt_pp_hook_goal_expansion_'(Goal, EGoal)
 
 :- dynamic('$lgt_pp_threaded_'/0).              % '$lgt_pp_threaded_'
@@ -1772 +1772 @@
         (   Obj == user ->                                          % to speed up entity compilation
             TermExpansionGoal = term_expansion(Term, Terms),
-            GoalExpansionGoal = goal_expansion(Term, Terms)
+            GoalExpansionGoal = goal_expansion(Goal, EGoal)
         ;   '$lgt_tr_msg'(term_expansion(Term, Terms), Obj, TermExpansionGoal, user),
-            '$lgt_tr_msg'(goal_expansion(Term, Terms), Obj, GoalExpansionGoal, user)
+            '$lgt_tr_msg'(goal_expansion(Goal, EGoal), Obj, GoalExpansionGoal, user)
         ),
         assertz(('$lgt_pp_hook_term_expansion_'(Term, Terms) :- catch(TermExpansionGoal, _, fail))),
-        assertz(('$lgt_pp_hook_goal_expansion_'(Term, Terms) :- catch(GoalExpansionGoal, _, fail)))
+        assertz(('$lgt_pp_hook_goal_expansion_'(Goal, EGoal) :- catch(GoalExpansionGoal, _, fail)))
     ;   true
     ).
@@ -2945 +2945 @@
 
 
+
 % '$lgt_term_expansion'(+object_identifier, ?term, ?term, +object_identifier, @scope)
 %
@@ -2964 +2965 @@
             true
         ;   call_with_args(DDef, term_expansion(Term, Expansion), Obj, Obj, Obj, Call)
+        )
+    ),
+    !,
+    once(Call).
+
+
+
+% '$lgt_expand_goal'(+object_identifier, ?term, ?term, +object_identifier, @scope)
+%
+% expand_goal/2 built-in method
+
+'$lgt_expand_goal'(Obj, Goal, Expansion, Sender, Scope) :-
+    (    var(Goal) ->
+         Expansion = Goal
+    ;    '$lgt_goal_expansion'(Obj, Goal, Expand, Sender, Scope) ->
+         Expansion = Expand
+    ;    Expansion = Goal
+    ). 
+
+
+
+% '$lgt_goal_expansion'(+object_identifier, ?term, ?term, +object_identifier, @scope)
+%
+% calls the goal_expansion/2 user-defined predicate
+%
+% if there is a scope directive, then the call fails if the sender is not within scope;
+% when there is no scope directive, then we call any local definition when the sender
+% and the target object are the same
+
+'$lgt_goal_expansion'(Obj, Goal, Expansion, Sender, Scope) :-
+    '$lgt_current_object_'(Obj, _, Dcl, Def, _, _, _, _, DDef, _, _),
+    (   (   call_with_args(Dcl, goal_expansion(_, _), PScope, _, _, _, _, SCtn, _) ->
+            (   (\+ \+ PScope = Scope; Sender = SCtn) ->
+                call_with_args(Def, goal_expansion(Goal, Expansion), Sender, Obj, Obj, Call, _)
+            )
+        )
+    ;   Obj = Sender,
+        (   call_with_args(Def, goal_expansion(Goal, Expansion), Obj, Obj, Obj, Call) ->
+            true
+        ;   call_with_args(DDef, goal_expansion(Goal, Expansion), Obj, Obj, Obj, Call)
         )
     ),
@@ -5278 +5319 @@
 
 
-% '$lgt_tr_term'(+term, +integer, @stream, @stream)
+% '$lgt_tr_term'(@term, +integer, @stream, @stream)
 %
 % translates a source file term (clauses, directives, and grammar rules)
@@ -5295 +5336 @@
 
 
-% '$lgt_tr_expanded_terms'(+list, +integer, @stream, @stream)
-%
-% translates a list of source file terms
-
-'$lgt_tr_expanded_terms'([], _, _, _).
+% '$lgt_tr_expanded_terms'(@term, +integer, @stream, @stream)
+%
+% translates the expanded terms (which can be a list of terms)
+
+'$lgt_tr_expanded_terms'([], _, _, _) :-
+    !.
 
 '$lgt_tr_expanded_terms'([Term| Terms], Line, Input, Output) :-
+    !,
     '$lgt_tr_expanded_term'(Term, Line, Input, Output),
     '$lgt_tr_expanded_terms'(Terms, Line, Input, Output).
+
+'$lgt_tr_expanded_terms'(Term, Line, Input, Output) :-
+    !,
+    '$lgt_tr_expanded_term'(Term, Line, Input, Output).
 
 
@@ -7655 +7702 @@
 
 
-% DCG predicates
+% term and goal expansion predicates
 
 '$lgt_tr_body'(expand_term(Term, Clause), '$lgt_expand_term'(This, Term, Clause, This, p(_)), '$lgt_dbg_goal'(expand_term(Term, Clause), '$lgt_expand_term'(This, Term, Clause, This, p(_)), DbgCtx), Ctx) :-
@@ -7661 +7708 @@
     '$lgt_ctx_this'(Ctx, This),
     '$lgt_ctx_dbg_ctx'(Ctx, DbgCtx).
+
+'$lgt_tr_body'(expand_goal(Goal, EGoal), '$lgt_expand_goal'(This, Goal, EGoal, This, p(_)), '$lgt_dbg_goal'(expand_goal(Goal, EGoal), '$lgt_expand_goal'(This, Goal, EGoal, This, p(_)), DbgCtx), Ctx) :-
+    !,
+    '$lgt_ctx_this'(Ctx, This),
+    '$lgt_ctx_dbg_ctx'(Ctx, DbgCtx).
+
+
+% DCG predicates
 
 '$lgt_tr_body'(phrase(GRBody, Input), '$lgt_phrase'(This, GRBody, Input, This, _), '$lgt_dbg_goal'(phrase(GRBody, Input), '$lgt_phrase'(This, GRBody, Input, This, _), DbgCtx), Ctx) :-
@@ -8445 +8500 @@
 
 
-% DCG predicates
+% term and goal expansion predicates
 
 '$lgt_tr_msg'(expand_term(Term, Clause), Obj, '$lgt_expand_term'(Obj, Term, Clause, This, p(p(p))), This) :-
     !.
+
+'$lgt_tr_msg'(expand_goal(Goal, EGoal), Obj, '$lgt_expand_goal'(Obj, Goal, EGoal, This, p(p(p))), This) :-
+    !.
+
+
+% DCG predicates
 
 '$lgt_tr_msg'(phrase(GRBody, List), Obj, '$lgt_phrase'(Obj, GRBody, List, This, p(p(p))), This) :-
@@ -8656 +8717 @@
 
 
-
-% DCG predicates
+% term and goal expansion predicates
 
 '$lgt_tr_self_msg'(expand_term(Term, Clause), '$lgt_expand_term'(Self, Term, Clause, This, p(_)), This, Self) :-
     !.
+
+'$lgt_tr_self_msg'(expand_goal(Goal, EGoal), '$lgt_expand_goal'(Self, Goal, EGoal, This, p(_)), This, Self) :-
+    !.
+
+
+% DCG predicates
 
 '$lgt_tr_self_msg'(phrase(GRBody, List), '$lgt_phrase'(Self, GRBody, List, This, p(_)), This, Self) :-
@@ -11557 +11623 @@
 
 '$lgt_built_in_method'(expand_term(_, _), p(p(p))).
+'$lgt_built_in_method'(expand_goal(_, _), p(p(p))).
+
 '$lgt_built_in_method'(phrase(_, _), p(p(p))).
 '$lgt_built_in_method'(phrase(_, _, _), p(p(p))).

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: November 7, 2008</span>
+        <span>Last updated on: November 21, 2008</span>
     </div>
     <div class="navbottom">

trunk/manuals/refman/index.html

@@ -294 +294 @@
 </dl>
 
-<h3>Term expansion methods</h3>
+<h3>Term and goal expansion methods</h3>
 
 <dl class="toc-entries">
     <dt><code><a href="methods/expand_term2.html">expand_term/2</a></code><span class="leader"></span><span class="page-ref"><span class="methods_expand_term2"></span></span></dt>
     <dt><code><a href="methods/term_expansion2.html">term_expansion/2</a></code><span class="leader"></span><span class="page-ref"><span class="methods_term_expansion2"></span></span></dt>
+    <dt><code><a href="methods/expand_goal2.html">expand_goal/2</a></code><span class="leader"></span><span class="page-ref"><span class="methods_expand_goal2"></span></span></dt>
     <dt><code><a href="methods/goal_expansion2.html">goal_expansion/2</a></code><span class="leader"></span><span class="page-ref"><span class="methods_goal_expansion2"></span></span></dt>
 </dl>
@@ -333 +334 @@
     <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: November 7, 2008</span>
+        <span>Last updated on: November 21, 2008</span>
     </div>
     <div class="navbottom">

trunk/manuals/refman/methods/expand_term2.html

@@ -29 +29 @@
 </p>
 <p>
-The expansion works as follows: if the first argument is a variable, then it is unified with the second argument; if the first argument is not a variable and clauses for the <code>term_expansion/2</code> predicate are within scope, then this predicate is called to provide an expansion that is then unified with the second argument; if the <code>term_expansion/2</code> predicate is not used and the first argument is a compound term with functor <code>--&gt;/2</code> then the default Logtalk grammar rule translator is used, with the resulting clause being unified with the second argument; when the translator is not used, the two arguments are unified.
+The expansion works as follows: if the first argument is a variable, then it is unified with the second argument; if the first argument is not a variable and clauses for the <code>term_expansion/2</code> predicate are within scope, then this predicate is called to provide an expansion that is then unified with the second argument; if the <code>term_expansion/2</code> predicate is not used and the first argument is a compound term with functor <code>--&gt;/2</code> then the default Logtalk grammar rule translator is used, with the resulting clause being unified with the second argument; when the translator is not used, the two arguments are unified. The <code>expand_term/2</code> predicate may return a list of terms.
 </p>
 <p>
@@ -54 +54 @@
     <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: October 26, 2006</span>
+        <span>Last updated on: November 21, 2008</span>
     </div>
     <div class="navbottom">

trunk/manuals/refman/methods/goal_expansion2.html

@@ -26 +26 @@
 <pre>goal_expansion(Goal, ExpandedGoal)</pre>
 <p>
-Defines an expansion for a goal. The first argument is the goal to be expanded. The expanded goal is returned in the second argument. This predicate is called recursively on the expanded goal. Thus, care must be taken to avoid compilation loops. This predicate is called when compiling source files, when dynamically creating new objects, and when asserting predicate clauses. 
+Defines an expansion for a goal. The first argument is the goal to be expanded. The expanded goal is returned in the second argument. This predicate is called recursively on the expanded goal. Thus, care must be taken to avoid compilation loops. This predicate, when defined, is automatically called by the <a href="expand_goal2.html"><code>expand_goal/2</code></a> method. Use of this predicate by the <code>expand_goal/2</code> method may be restricted by using a scope directive for it. This predicate is called when compiling source files, when dynamically creating new objects, and when asserting predicate clauses. 
 </p>
 
@@ -48 +48 @@
     <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 3, 2007</span>
+        <span>Last updated on: November 21, 2008</span>
     </div>
     <div class="navbottom">
-        <span><a href="term_expansion2.html">previous</a> | <a href="../../glossary.html">glossary</a> | <a href="../index.html#methods">next</a></span><br/>
+        <span><a href="expand_goal2.html">previous</a> | <a href="../../glossary.html">glossary</a> | <a href="../index.html#methods">next</a></span><br/>
         <span><a href="http://validator.w3.org/check/referer">XHTML</a> + <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></span>
     </div>

trunk/manuals/refman/methods/term_expansion2.html

@@ -26 +26 @@
 <pre>term_expansion(Term, Expansion)</pre>
 <p>
-Defines an expansion for a term. This predicate, when defined, is automatically called by the <a href="expand_term2.html"><code>expand_term/2</code></a> method. Use of this predicate by the <code>expand_term/2</code> method may be restricted by using a scope directive for it. The <code>term_expansion/2</code> clauses are only used by the <code>expand_term/2</code> method if they are within the scope of the <em>sender</em>. When that is not the case, the <code>expand_term/2</code> method only uses the default expansions.
+Defines an expansion for a term. This predicate, when defined, is automatically called by the <a href="expand_term2.html"><code>expand_term/2</code></a> method. Use of this predicate by the <code>expand_term/2</code> method may be restricted by using a scope directive for it. The <code>term_expansion/2</code> clauses are only used by the <code>expand_term/2</code> method if they are within the scope of the <em>sender</em>. When that is not the case, the <code>expand_term/2</code> method only uses the default expansions. The <code>term_expansion/2</code> predicate may return a list of terms.
 </p>
 
@@ -48 +48 @@
     <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: October 26, 2006</span>
+        <span>Last updated on: November 21, 2008</span>
     </div>
     <div class="navbottom">
-        <span><a href="expand_term2.html">previous</a> | <a href="../../glossary.html">glossary</a> | <a href="goal_expansion2.html">next</a></span><br/>
+        <span><a href="expand_term2.html">previous</a> | <a href="../../glossary.html">glossary</a> | <a href="expand_goal2.html">next</a></span><br/>
         <span><a href="http://validator.w3.org/check/referer">XHTML</a> + <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></span>
     </div>

trunk/manuals/refman/refman.header

@@ -36 +36 @@
         <span>http://logtalk.org/</span>
     </p>
-    <p class="date">Last updated on November 7, 2008</p>
+    <p class="date">Last updated on November 21, 2008</p>
 </div>
 

trunk/manuals/userman/index.html

@@ -171 +171 @@
         <dd><a href="predicates.html#predicates_reflection">Reflection methods</a><span class="leader"></span><span class="page-ref"><span class="predicates_reflection"></span></span></dd>
         <dd><a href="predicates.html#predicates_parsing">Definite clause grammar parsing methods</a><span class="leader"></span><span class="page-ref"><span class="predicates_parsing"></span></span></dd>
-        <dd><a href="predicates.html#predicates_expanding">Term expansion methods</a><span class="leader"></span><span class="page-ref"><span class="predicates_expanding"></span></span></dd>
+        <dd><a href="predicates.html#predicates_expanding">Term and goal expansion methods</a><span class="leader"></span><span class="page-ref"><span class="predicates_expanding"></span></span></dd>
     <dt><a href="predicates.html#predicates_properties">Predicate properties</a><span class="leader"></span><span class="page-ref"><span class="predicates_properties"></span></span></dt>
     <dt><a href="predicates.html#predicates_finding">Finding declared predicates</a><span class="leader"></span><span class="page-ref"><span class="predicates_finding"></span></span></dt>
@@ -299 +299 @@
     <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: November 7, 2008</span>
+        <span>Last updated on: November 21, 2008</span>
     </div>
     <div class="navbottom">

trunk/manuals/userman/predicates.html

@@ -584 +584 @@
 </p>
 
-<h3 id="predicates_expanding">Term expansion methods</h3>
-
-<p>
-Logtalk supports a <a title="Consult reference manual" href="../refman/methods/expand_term2.html"><code>expand_term/2</code></a> built-in method for expanding a term into another. This method is mostly used to translate grammar rules into Prolog clauses. It can be customized, e.g. for bypassing the default Logtalk grammar rule translator, by defining clause for the predicate <a title="Consult reference manual" href="../refman/methods/term_expansion2.html"><code>term_expansion/2</code></a>.
+<h3 id="predicates_expanding">Term and goal expansion methods</h3>
+
+<p>
+Logtalk supports a <a title="Consult reference manual" href="../refman/methods/expand_term2.html"><code>expand_term/2</code></a> built-in method for expanding a term into a list of terms. This method is mostly used to translate grammar rules into Prolog clauses. It can be customized, e.g. for bypassing the default Logtalk grammar rule translator, by defining clause for the predicate <a title="Consult reference manual" href="../refman/methods/term_expansion2.html"><code>term_expansion/2</code></a>.
+</p>
+<p>
+Logtalk supports a <a title="Consult reference manual" href="../refman/methods/expand_goal2.html"><code>expand_goal/2</code></a> built-in method for expanding a goal. This method can be customized by defining clause for the predicate <a title="Consult reference manual" href="../refman/methods/goal_expansion2.html"><code>goal_expansion/2</code></a>.
 </p>
 
@@ -679 +682 @@
     <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: October 20, 2008</span>
+        <span>Last updated on: November 21, 2008</span>
     </div>
     <div class="navbottom">

trunk/manuals/userman/userman.header

@@ -36 +36 @@
         <span>http://logtalk.org/</span>
     </p>
-    <p class="date">Last updated on November 7, 2008</p>
+    <p class="date">Last updated on November 21, 2008</p>
 </div>
 

trunk/RELEASE_NOTES.txt

@@ -24 +24 @@
     compilation of Prolog specific code.
 
+    Added an expand_goal/2 built-in method to support explicit calls to the
+    goal_expansion/2 user-defined hook. Updated the term expansion mechanism
+    to allow the expansion to be a single term instead of a list of terms.
+    Improved the documentation of the term and goal expansion predicates.
+
     Simplified the implementation of the threaded/1 built-in predicate.
 
@@ -58 +63 @@
     Prolog compilers.
 
-    Added syntax coloring support for the new conditional compilation
-    directives to the supported text editors and syntax highlighters.
+    Added syntax coloring support for the new expand_goal/2 method and for the
+    new conditional compilation directives to the supported text editors and 
+    syntax highlighters.
 
     Fixed a block comment syntax coloring bug in the support for the Highlight

trunk/wenv/emacs/logtalk.el

@@ -5 +5 @@
 ;; Author: Paulo Moura <pmoura@logtalk.org>
 ;; Creation date: November 15, 2003
-;; Last modification date: November 8, 2008
-;; Version: 1.5
+;; Last modification date: November 21, 2008
+;; Version: 1.6
 
 ;; Installation:
@@ -114 +114 @@
         ("\\<\\(bagof\\|f\\(?:\\(?:ind\\|or\\)all\\)\\|setof\\)\\([(]\\)" 1 'logtalk-built-in-method-face)
         ("\\<\\(after\\|before\\)\\([(]\\)" 1 'logtalk-built-in-method-face)
-        ("\\<\\(phrase\\|expand_term\\|\\(?:goal\\|term\\)_expansion\\)\\([(]\\)" 1 'logtalk-built-in-method-face)
+        ("\\<\\(phrase\\|expand_\\(?:goal\\|term\\)\\|\\(?:goal\\|term\\)_expansion\\)\\([(]\\)" 1 'logtalk-built-in-method-face)
     ))
 

trunk/wenv/geshi/logtalk.php

@@ -13 +13 @@
  *
  * Based on GeSHi release 1.0.7.21
- * Last Change: November 8, 2008
+ * Last Change: November 21, 2008
  *
  *************************************************************************************
@@ -185 +185 @@
             //DCGs and term expansion
         7 => array(
-                    GESHI_SEARCH => '(phrase|expand_term|((goal|term)_expansion))(?=[(])',
+                    GESHI_SEARCH => '(phrase|expand_(goal|term)|((goal|term)_expansion))(?=[(])',
                     GESHI_REPLACE => '\\1',
                     GESHI_MODIFIERS => '',

trunk/wenv/gtksourceview2/logtalk.lang

@@ -146 +146 @@
             <keyword>(after)(?=[(])</keyword>
             <!-- DCGs -->
-            <keyword>(expand_term)(?=[(])</keyword>
+            <keyword>(expand_(goal|term))(?=[(])</keyword>
             <keyword>((goal|term)_expansion)(?=[(])</keyword>
             <keyword>(phrase)(?=[(])</keyword>

trunk/wenv/highlight/lgt.lang

@@ -5 +5 @@
 #  Author: Paulo Moura
 #    Mail: pmoura@logtalk.org
-#    Date: 11.11.08
-# Version: 1.2
+#    Date: 21.11.08
+# Version: 1.3
 # ------------------------------------------
 # This file is a part of highlight, a free source code converter released under the GPL.
@@ -38 +38 @@
 $KEYWORDS(kwc)=regex((current_predicate|predicate_property)(?=[(]), 1)
 # DCGs
-$KEYWORDS(kwc)=regex((expand_term|(?:goal|term)_expansion|phrase)(?=[(]), 1)
+$KEYWORDS(kwc)=regex((expand_(goal|term))(?=[(]), 1)
+$KEYWORDS(kwc)=regex(((?:goal|term)_expansion|phrase)(?=[(]), 1)
 # entity
 $KEYWORDS(kwc)=regex(((abolish|c(reate|urrent))_(object|protocol|category))(?=[(]), 1)

trunk/wenv/jedit/logtalk.xml

@@ -6 +6 @@
 
     written by      Paulo Moura
-    version         1.6
+    version         1.7
     created on      5 May 2002
-    last revised    8 November 2008
+    last revised    21 November 2008
 
     To install, copy this file to the "modes" subdirectory in jEdit 
@@ -63 +63 @@
         <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(current_predicate|predicate_property)(?=[(])</SEQ_REGEXP>
         <!-- DCGs -->
-        <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(expand_term|(goal|term)_expansion|phrase)(?=[(])</SEQ_REGEXP>
+        <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(expand_(goal|term)|(goal|term)_expansion|phrase)(?=[(])</SEQ_REGEXP>
         <!-- Entity -->
         <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(abolish|c(reate|urrent))_(object|protocol|category)(?=[(])</SEQ_REGEXP>

trunk/wenv/kate/logtalk.xml

@@ -2 +2 @@
 <!DOCTYPE language SYSTEM "language.dtd">
 
-<language name="Logtalk" version="2.2" kateversion="2.4" section="Sources" extensions="*.lgt;*.config" mimetype="text/x-logtalk" author="Paulo Moura (pmoura@logtalk.org)" license="Artistic License 2.0">
+<language name="Logtalk" version="2.3" kateversion="2.4" section="Sources" extensions="*.lgt;*.config" mimetype="text/x-logtalk" author="Paulo Moura (pmoura@logtalk.org)" license="Artistic License 2.0">
 
     <highlighting>
@@ -18 +18 @@
                 <RegExpr String = "\b(current_predicate|predicate_property)(?=[(])" attribute = "Built-in" context = "#stay" />
                 <!-- DCGs -->
-                <RegExpr String = "\b(expand_term|(goal|term)_expansion|phrase)(?=[(])" attribute = "Built-in" context = "#stay" />
+                <RegExpr String = "\b(expand_(goal|term)|(goal|term)_expansion|phrase)(?=[(])" attribute = "Built-in" context = "#stay" />
                 <!-- Entity -->
                 <RegExpr String = "\b(abolish|c(reate|urrent))_(object|protocol|category)(?=[(])" attribute = "Built-in" context = "#stay" />

trunk/wenv/nedit/logtalk.pats

@@ -3 +3 @@
 ! Author: Paulo Moura (pmoura at logtalk.org)
 !
-! Last changed in: November 8, 2008
+! Last changed in: November 21, 2008
 !
 !
@@ -45 +45 @@
     Quoted atoms:"'":"'"::String::\n\
     Escape sequences:"\\\\([\\\\abfnrtv""']|(x[a-fA-F0-9]+|[0-7]+)\\\\)":::String1:Quoted atoms:\n\
-    Built-in methods:"<(parameter|self|sender|this|current_predicate|predicate_property|abolish|asserta|assertz|clause|retractall|retract|bagof|findall|forall|setof|before|after|expand_term|goal_expansion|term_expansion|phrase|threaded|threaded_call|threaded_once|threaded_ignore|threaded_exit|threaded_peek|threaded_wait|threaded_notify)(?=[(])":::Subroutine::\n\
+    Built-in methods:"<(parameter|self|sender|this|current_predicate|predicate_property|abolish|asserta|assertz|clause|retractall|retract|bagof|findall|forall|setof|before|after|expand_goal|expand_term|goal_expansion|term_expansion|phrase|threaded|threaded_call|threaded_once|threaded_ignore|threaded_exit|threaded_peek|threaded_wait|threaded_notify)(?=[(])":::Subroutine::\n\
     Arithmetic operators:"<is>|\\+|\\*|\\-|/|=:=|=\\\\=|=\\<|\\>=|\\<|\\>":::Subroutine::\n\
     Built-in predicates:"<(current_object|current_protocol|current_category|create_object|create_protocol|create_category|object_property|protocol_property|category_property|abolish_object|abolish_protocol|abolish_category|complements_object|extends_object|extends_protocol|extends_category|implements_protocol|instantiates_class|specializes_class|imports_category|abolish_events|current_event|define_events|current_logtalk_flag|set_logtalk_flag|logtalk_compile|logtalk_load|logtalk_library_path|forall|retractall)(?=[(])":::Subroutine::\n\

trunk/wenv/npp/logtalk.api

@@ -60 +60 @@
 end_protocol
 exp
+expand_goal
 expand_term
 extends

trunk/wenv/pygments/logtalk.py

@@ -50 +50 @@
             (r'(current_predicate|predicate_property)(?=[(])', Keyword),
             # DCGs and term expansion
-            (r'(expand_term|(goal|term)_expansion|phrase)(?=[(])', Keyword),
+            (r'(expand_(goal|term)|(goal|term)_expansion|phrase)(?=[(])', Keyword),
             # Entity
             (r'(abolish|c(reate|urrent))_(object|protocol|category)(?=[(])', Keyword),