Changeset 4599 for trunk/wenv

Show
Ignore:
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/wenv
Files:
21 modified

Legend:

Unmodified
Added
Removed

  • trunk/wenv/emacs/logtalk.el

    r4582 r4599  
    55;; Author: Paulo Moura <pmoura@logtalk.org> 
    66;; Creation date: November 15, 2003 
    7 ;; Last modification date: November 8, 2008 
    8 ;; Version: 1.5 
     7;; Last modification date: November 21, 2008 
     8;; Version: 1.6 
    99 
    1010;; Installation: 
    … …  
    114114        ("\\<\\(bagof\\|f\\(?:\\(?:ind\\|or\\)all\\)\\|setof\\)\\([(]\\)" 1 'logtalk-built-in-method-face) 
    115115        ("\\<\\(after\\|before\\)\\([(]\\)" 1 'logtalk-built-in-method-face) 
    116         ("\\<\\(phrase\\|expand_term\\|\\(?:goal\\|term\\)_expansion\\)\\([(]\\)" 1 'logtalk-built-in-method-face) 
     116        ("\\<\\(phrase\\|expand_\\(?:goal\\|term\\)\\|\\(?:goal\\|term\\)_expansion\\)\\([(]\\)" 1 'logtalk-built-in-method-face) 
    117117    )) 
    118118 

  • trunk/wenv/geshi/logtalk.php

    r4582 r4599  
    1313 * 
    1414 * Based on GeSHi release 1.0.7.21 
    15  * Last Change: November 8, 2008 
     15 * Last Change: November 21, 2008 
    1616 * 
    1717 ************************************************************************************* 
    … …  
    185185            //DCGs and term expansion 
    186186        7 => array( 
    187                     GESHI_SEARCH => '(phrase|expand_term|((goal|term)_expansion))(?=[(])', 
     187                    GESHI_SEARCH => '(phrase|expand_(goal|term)|((goal|term)_expansion))(?=[(])', 
    188188                    GESHI_REPLACE => '\\1', 
    189189                    GESHI_MODIFIERS => '', 

  • trunk/wenv/gtksourceview2/logtalk.lang

    r4585 r4599  
    146146            <keyword>(after)(?=[(])</keyword> 
    147147            <!-- DCGs --> 
    148             <keyword>(expand_term)(?=[(])</keyword> 
     148            <keyword>(expand_(goal|term))(?=[(])</keyword> 
    149149            <keyword>((goal|term)_expansion)(?=[(])</keyword> 
    150150            <keyword>(phrase)(?=[(])</keyword> 

  • trunk/wenv/highlight/lgt.lang

    r4587 r4599  
    55#  Author: Paulo Moura 
    66#    Mail: pmoura@logtalk.org 
    7 #    Date: 11.11.08 
    8 # Version: 1.2 
     7#    Date: 21.11.08 
     8# Version: 1.3 
    99# ------------------------------------------ 
    1010# This file is a part of highlight, a free source code converter released under the GPL. 
    … …  
    3838$KEYWORDS(kwc)=regex((current_predicate|predicate_property)(?=[(]), 1) 
    3939# DCGs 
    40 $KEYWORDS(kwc)=regex((expand_term|(?:goal|term)_expansion|phrase)(?=[(]), 1) 
     40$KEYWORDS(kwc)=regex((expand_(goal|term))(?=[(]), 1) 
     41$KEYWORDS(kwc)=regex(((?:goal|term)_expansion|phrase)(?=[(]), 1) 
    4142# entity 
    4243$KEYWORDS(kwc)=regex(((abolish|c(reate|urrent))_(object|protocol|category))(?=[(]), 1) 

  • trunk/wenv/jedit/logtalk.xml

    r4582 r4599  
    66 
    77    written by      Paulo Moura 
    8     version         1.6 
     8    version         1.7 
    99    created on      5 May 2002 
    10     last revised    8 November 2008 
     10    last revised    21 November 2008 
    1111 
    1212    To install, copy this file to the "modes" subdirectory in jEdit  
    … …  
    6363        <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(current_predicate|predicate_property)(?=[(])</SEQ_REGEXP> 
    6464        <!-- DCGs --> 
    65         <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(expand_term|(goal|term)_expansion|phrase)(?=[(])</SEQ_REGEXP> 
     65        <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(expand_(goal|term)|(goal|term)_expansion|phrase)(?=[(])</SEQ_REGEXP> 
    6666        <!-- Entity --> 
    6767        <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD2">\b(abolish|c(reate|urrent))_(object|protocol|category)(?=[(])</SEQ_REGEXP> 

  • trunk/wenv/kate/logtalk.xml

    r4583 r4599  
    22<!DOCTYPE language SYSTEM "language.dtd"> 
    33 
    4 <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"> 
     4<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"> 
    55 
    66    <highlighting> 
    … …  
    1818                <RegExpr String = "\b(current_predicate|predicate_property)(?=[(])" attribute = "Built-in" context = "#stay" /> 
    1919                <!-- DCGs --> 
    20                 <RegExpr String = "\b(expand_term|(goal|term)_expansion|phrase)(?=[(])" attribute = "Built-in" context = "#stay" /> 
     20                <RegExpr String = "\b(expand_(goal|term)|(goal|term)_expansion|phrase)(?=[(])" attribute = "Built-in" context = "#stay" /> 
    2121                <!-- Entity --> 
    2222                <RegExpr String = "\b(abolish|c(reate|urrent))_(object|protocol|category)(?=[(])" attribute = "Built-in" context = "#stay" /> 

  • trunk/wenv/nedit/logtalk.pats

    r4582 r4599  
    33! Author: Paulo Moura (pmoura at logtalk.org) 
    44! 
    5 ! Last changed in: November 8, 2008 
     5! Last changed in: November 21, 2008 
    66! 
    77! 
    … …  
    4545    Quoted atoms:"'":"'"::String::\n\ 
    4646    Escape sequences:"\\\\([\\\\abfnrtv""']|(x[a-fA-F0-9]+|[0-7]+)\\\\)":::String1:Quoted atoms:\n\ 
    47     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\ 
     47    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\ 
    4848    Arithmetic operators:"<is>|\\+|\\*|\\-|/|=:=|=\\\\=|=\\<|\\>=|\\<|\\>":::Subroutine::\n\ 
    4949    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

    r4582 r4599  
    6060end_protocol 
    6161exp 
     62expand_goal 
    6263expand_term 
    6364extends 

  • trunk/wenv/pygments/logtalk.py

    r4582 r4599  
    5050            (r'(current_predicate|predicate_property)(?=[(])', Keyword), 
    5151            # DCGs and term expansion 
    52             (r'(expand_term|(goal|term)_expansion|phrase)(?=[(])', Keyword), 
     52            (r'(expand_(goal|term)|(goal|term)_expansion|phrase)(?=[(])', Keyword), 
    5353            # Entity 
    5454            (r'(abolish|c(reate|urrent))_(object|protocol|category)(?=[(])', Keyword), 

  • trunk/wenv/smultron/logtalk.plist

    r4582 r4599  
    7373            <string>after</string> 
    7474            <string>phrase</string> 
     75            <string>expand_goal</string> 
    7576            <string>expand_term</string> 
    7677            <string>goal_expansion</string> 

  • trunk/wenv/source-highlight/logtalk.lang

    r4582 r4599  
    22# 
    33#   written by Paulo Moura (pmoura@logtalk.org) 
    4 #   last revised on 8 November 2008 
     4#   last revised on 21 November 2008 
    55 
    66comment start "%" 
    … …  
    2626            '\<(parameter|this|se(lf|nder))(?=\()', 
    2727            '\<(current_predicate|predicate_property)(?=\()', 
    28             '\<(expand_term|(goal|term)_expansion|phrase)(?=\()', 
     28            '\<(expand_(goal|term)|(goal|term)_expansion|phrase)(?=\()', 
    2929            '\<(clause|retract(all)?)(?=\()', 
    3030            '\<a(bolish|ssert(a|z))(?=\()', 

  • trunk/wenv/subethaedit/logtalk.plist

    r4582 r4599  
    231231                <string>[^A-Za-z0-9_](after)\(</string> 
    232232                <string>[^A-Za-z0-9_](expand_term)\(</string> 
     233                <string>[^A-Za-z0-9_](expand_goal)\(</string> 
    233234                <string>[^A-Za-z0-9_](goal_expansion)\(</string> 
    234235                <string>[^A-Za-z0-9_](term_expansion)\(</string> 

  • trunk/wenv/subethaedit2/Logtalk.mode/Contents/Resources/AutocompleteAdditions.txt

    r4582 r4599  
    9393term_expansion(, ) 
    9494expand_term(, ) 
     95expand_goal(, ) 
    9596 
    9697unify_with_occurs_check(, ) 

  • trunk/wenv/subethaedit2/Logtalk.mode/Contents/Resources/SyntaxDefinition.xml

    r4582 r4599  
    8989                <regex>\b(before)\(</regex> 
    9090                <regex>\b(after)\(</regex> 
    91                 <regex>\b(expand_term)\(</regex> 
     91                <regex>\b(expand_(goal|term))\(</regex> 
    9292                <regex>\b((goal|term)_expansion)\(</regex> 
    9393                <regex>\b(phrase)\(</regex> 

  • trunk/wenv/superedi/Logtalk.syn

    r4586 r4599  
    185185after 
    186186expand_term 
     187expand_goal 
    187188goal_expansion 
    188189term_expansion 

  • trunk/wenv/tests/source.lgt

    r4249 r4599  
    148148    term_expansion_methods :- 
    149149        expand_term(Term, Expanded), 
     150        expand_goal(Goal, Expanded), 
    150151        term_expansion(Term, Expanded), 
    151152        goal_expansion(Goal, Expanded). 

  • trunk/wenv/textmate/Logtalk.tmbundle/Preferences/Completions.plist

    r4582 r4599  
    8686            <string>phrase</string> 
    8787            <string>expand_term</string> 
     88            <string>expand_goal</string> 
    8889            <string>goal_expansion</string> 
    8990            <string>term_expansion</string> 

  • trunk/wenv/textmate/Logtalk.tmbundle/Syntaxes/Logtalk.plist

    r4582 r4599  
    344344        <dict> 
    345345            <key>match</key> 
    346             <string>\b(expand_term|(goal|term)_expansion|phrase)(?=[(])</string> 
     346            <string>\b(expand_(goal|term)|(goal|term)_expansion|phrase)(?=[(])</string> 
    347347            <key>name</key> 
    348348            <string>support.function.grammar-rule.logtalk</string> 

  • trunk/wenv/textpad/logtalk.syn

    r4586 r4599  
    185185after 
    186186expand_term 
     187expand_goal 
    187188goal_expansion 
    188189term_expansion 

  • trunk/wenv/vim/completion/logtalk.dict

    r4582 r4599  
    7474phrase 
    7575expand_term 
     76expand_goal 
    7677goal_expansion 
    7778term_expansion 

  • trunk/wenv/vim/syntax/logtalk.vim

    r4582 r4599  
    33" Language: Logtalk 
    44" Maintainer:   Paulo Moura <pmoura@logtalk.org> 
    5 " Last Change:  November 8, 2008 
     5" Last Change:  November 21, 2008 
    66 
    77 
    … …  
    150150syn match   logtalkBuiltInMethod    "\<after\ze(" 
    151151 
    152 syn match   logtalkBuiltInMethod    "\<expand_term\ze(" 
     152syn match   logtalkBuiltInMethod    "\<expand_\(goal\|term\)\ze(" 
    153153syn match   logtalkBuiltInMethod    "\<\(goal\|term\)_expansion\ze(" 
    154154syn match   logtalkBuiltInMethod    "\<phrase\ze("