Changeset 3952

Show
Ignore:
Timestamp:
12/10/07 08:35:13 (13 months ago)
Author:
pmoura
Message:

Added syntax coloring and completion support for the "complements" category relation.

Location:
trunk/wenv
Files:
16 modified

Legend:

Unmodified
Added
Removed

  • trunk/wenv/emacs/logtalk.el

    r3951 r3952  
    104104        ("\\(:- \\)\\(alias\\|calls\\|d\\(?:iscontiguous\\|ynamic\\)\\|e\\(?:ncoding\\|xport\\)\\|in\\(?:fo\\|itialization\\)\\|m\\(?:\\(?:eta_predicat\\|od\\)e\\)\\|op\\|use\\(?:s\\|_module\\)\\|synchronized\\)\\([(]\\)" 2 'logtalk-directive-face) 
    105105        ("\\(:- \\)\\(dynamic\\|synchronized\\|threaded\\)\\([\.]\\)" 2 'logtalk-directive-face) 
    106         ("\\(\\(?:extend\\|i\\(?:mp\\(?:\\(?:lemen\\|or\\)t\\)\\|nstantiate\\)\\|specialize\\)s\\)\\([(]\\)" 1 'logtalk-directive-face) 
     106        ("\\(\\(?:complement\\|extend\\|i\\(?:mp\\(?:\\(?:lemen\\|or\\)t\\)\\|nstantiate\\)\\|specialize\\)s\\)\\([(]\\)" 1 'logtalk-directive-face) 
    107107    )) 
    108108 

  • trunk/wenv/gtksourceview2/logtalk.lang

    r3951 r3952  
    8383 
    8484        <context id="entity-relations" style-ref="entity"> 
    85             <keyword>(specializes)(?=[(])</keyword> 
     85            <keyword>(complements)(?=[(])</keyword> 
    8686            <keyword>(extends)(?=[(])</keyword> 
    8787            <keyword>(i(mp(orts|lements)|nstantiates))(?=[(])</keyword> 
     88            <keyword>(specializes)(?=[(])</keyword> 
    8889        </context> 
    8990 

  • trunk/wenv/jedit/logtalk.xml

    r3951 r3952  
    5151        <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\sop(?=[(])</SEQ_REGEXP> 
    5252        <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">^\s*:-\s(calls|use(s|_module))(?=[(])</SEQ_REGEXP> 
    53         <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">(extends|i(nstantiates|mp(lements|orts))|specializes)(?=[(])</SEQ_REGEXP> 
     53        <SEQ_REGEXP AT_WORD_START="TRUE" TYPE="KEYWORD1">(complements|extends|i(nstantiates|mp(lements|orts))|specializes)(?=[(])</SEQ_REGEXP> 
    5454 
    5555        <!-- Event handlers --> 
    … …  
    256256            <NULL>clause</NULL> 
    257257            <NULL>close</NULL> 
     258            <NULL>complements</NULL> 
    258259            <NULL>complements_object</NULL> 
    259260            <NULL>compound</NULL> 

  • trunk/wenv/kate/logtalk.xml

    r3951 r3952  
    167167 
    168168            <context name = "entityrelations" attribute = "Normal" lineEndContext = "#stay" > 
    169                 <RegExpr String = "\b(extends|i(nstantiates|mp(lements|orts))|specializes)(?=[(])" attribute = "Directive" context = "#stay" /> 
     169                <RegExpr String = "\b(complements|extends|i(nstantiates|mp(lements|orts))|specializes)(?=[(])" attribute = "Directive" context = "#stay" /> 
    170170                <Detect2Chars attribute = "Normal" context = "normal" char = ")" char1 = "." /> 
    171171            </context> 

  • trunk/wenv/nedit/logtalk.pats

    r3951 r3952  
    2424    Entity directives:"(?<=:\\-\\s)(object|protocol|category|module)(?=[(])":::Preprocessor::\n\ 
    2525    Entity directives:"(?<=:\\-\\s)(end_object|end_protocol|end_category)(?=[.])":::Preprocessor::\n\ 
    26     Entity relations:"<(instantiates|specializes|extends|imports|implements)(?=[(])":::Preprocessor::\n\ 
     26    Entity relations:"<(complements|instantiates|specializes|extends|imports|implements)(?=[(])":::Preprocessor::\n\ 
    2727    Directives:"(?<=:\\-\\s)(alias|synchronized|encoding|export|initialization|info|mode|dynamic|discontiguous|public|protected|private|meta_predicate|multifile|op|calls|uses|use_module)(?=[(])":::Preprocessor::\n\ 
    2828    Directives:"(?<=:\\-\\s)(dynamic|synchronized|threaded)>":::Preprocessor::\n\ 

  • trunk/wenv/npp/logtalk.api

    r3951 r3952  
    2727clause 
    2828close 
     29complements 
    2930complements_object 
    3031compound 

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

    r3951 r3952  
    6060            '^[[:blank:]]*:-[[:blank:]](end_(category|object|protocol)|dynamic|synchronized|threaded)\.' 
    6161 
    62 preproc =   '\<(extends|i(nstantiates|mp(lements|orts))|specializes)(?=\()' 
     62preproc =   '\<(complements|extends|i(nstantiates|mp(lements|orts))|specializes)(?=\()' 
    6363 
    6464normal =    '\<[a-z][A-Za-z0-9_]*' 

  • trunk/wenv/subethaedit/logtalk.plist

    r3951 r3952  
    109109            <key>Regular Expressions</key> 
    110110            <array> 
     111                <string>[^A-Za-z0-9_](complements)\(</string> 
    111112                <string>[^A-Za-z0-9_](instantiates)\(</string> 
    112113                <string>[^A-Za-z0-9_](specializes)\(</string> 

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

    r3951 r3952  
    66protocol(, extends()). 
    77protocol(). 
     8category(, complements()). 
     9category(, extends()). 
    810category(, implements()). 
    911category(). 
    1012encoding() 
     13complements() 
    1114extends() 
    1215implements() 

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

    r3951 r3952  
    4343 
    4444            <keywords id="Entity Relations" color="#881280" useforautocomplete="yes"> 
    45                 <regex>\b(specializes)\(</regex> 
     45                <regex>\b(complements)\(</regex> 
    4646                <regex>\b(extends)\(</regex> 
    4747                <regex>\b(i(mp(orts|lements)|nstantiates))\(</regex> 
     48                <regex>\b(specializes)\(</regex> 
    4849            </keywords> 
    4950 

  • trunk/wenv/superedi/Logtalk.syn

    r3951 r3952  
    8282 
    8383; Logtalk entity relations 
     84complements 
    8485instantiates 
    8586specializes 

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

    r3951 r3952  
    4545            <string>abolish_protocol</string> 
    4646            <string>abolish_category</string> 
     47            <string>complements</string> 
    4748            <string>extends</string> 
    4849            <string>complements_object</string> 

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

    r3951 r3952  
    8686        <dict> 
    8787            <key>match</key> 
    88             <string>\b(extends|i(nstantiates|mp(orts|lements))|specializes)(?=[(])</string> 
     88            <string>\b(complements|extends|i(nstantiates|mp(orts|lements))|specializes)(?=[(])</string> 
    8989            <key>name</key> 
    9090            <string>storage.type.relations.logtalk</string> 

  • trunk/wenv/textpad/logtalk.syn

    r3951 r3952  
    8282 
    8383; Logtalk entity relations 
     84complements 
    8485instantiates 
    8586specializes 

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

    r3951 r3952  
    3333abolish_protocol 
    3434abolish_category 
     35complements 
    3536complements_object 
    3637extends 

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

    r3951 r3952  
    6969syn region  logtalkEntityRel    matchgroup=logtalkEntityRelTag  start="imports("    matchgroup=logtalkEntityRelTag  end=")"     contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator    contained 
    7070syn region  logtalkEntityRel    matchgroup=logtalkEntityRelTag  start="implements(" matchgroup=logtalkEntityRelTag  end=")"     contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator    contained 
     71syn region  logtalkEntityRel    matchgroup=logtalkEntityRelTag  start="complements("    matchgroup=logtalkEntityRelTag  end=")"     contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator    contained 
    7172 
    7273