Changeset 1024 for trunk/wenv

Timestamp:

06/02/04 02:20:06 (5 years ago)

Author:

pmoura

Message:

Optimized some of the regular expressions.

Files:

• trunk/wenv/kate/logtalk.xml (modified) (6 diffs)

trunk/wenv/kate/logtalk.xml

@@ -39 +39 @@
                 <RegExpr String = "\blogtalk_(compile|load)(?=[(])" attribute="Built-in" context="#stay" />
                 <!-- Database -->
-                <RegExpr String = "\b(abolish|clause|retract|retractall)(?=[(])" attribute="Built-in" context="#stay" />
-                <RegExpr String = "\bassert(a|z)(?=[(])" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\b(clause|retract|retractall)(?=[(])" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\b(a(bolish|ssert(a|z))(?=[(])" attribute="Built-in" context="#stay" />
                 <!-- Control -->
                 <RegExpr String = "\b(ca(ll|tch)|throw)(?=[(])" attribute="Built-in" context="#stay" />
@@ -55 +55 @@
                 <RegExpr String = "\b(floor|truncate|round|ceiling)(?=[(])" attribute="Built-in" context="#stay" />
                 <!-- Other arithemtic functors -->
-                <RegExpr String = "\b(sin|cos|atan|exp|log|sqrt)(?=[(])" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\b(cos|atan|exp|log|s(in|qrt))(?=[(])" attribute="Built-in" context="#stay" />
                 <!-- Term testing -->
-                <RegExpr String = "\b(var|atom|integer|float|atomic|compound|nonvar|number)(?=[(])" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\b(var|atom|integer|float|atomic|compound|n(onvar|umber))(?=[(])" attribute="Built-in" context="#stay" />
                 <!-- Stream selection and control -->
                 <RegExpr String = "\bcurrent_(input|output)(?=[(])" attribute="Built-in" context="#stay" />
@@ -65 +65 @@
                 <RegExpr String = "\bflush_output(?=[(])" attribute="Built-in" context="#stay" />
                 <RegExpr String = "\b(stream_property|at_end_of_stream|set_stream_position)(?=[(])" attribute="Built-in" context="#stay" />
-                <!-- Character input/output -->
-                <RegExpr String = "\b(get|peek|put)_char(?=[(])" attribute="Built-in" context="#stay" />
-                <RegExpr String = "\b((get|peek|put)_code|nl)(?=[(])" attribute="Built-in" context="#stay" />
+                <!-- Character and byte input/output -->
+                <RegExpr String = "\b(get|peek|put)_(byte|c(har|ode))(?=[(])" attribute="Built-in" context="#stay" />
                 <RegExpr String = "\bnl\b" attribute="Built-in" context="#stay" />
-                <!-- Byte input/output -->
-                <RegExpr String = "\b(get|peek|put)_byte(?=[(])" attribute="Built-in" context="#stay" />
                 <!-- Term input/output -->
                 <RegExpr String = "\b(read_term|read)(?=[(])" attribute="Built-in" context="#stay" />
@@ -77 +74 @@
                 <RegExpr String = "\b(char_conversion|current_char_conversion)(?=[(])" attribute="Built-in" context="#stay" />
                 <!-- Atomic term processing -->
-                <RegExpr String = "\batom_(length|concat)(?=[(])" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\batom_(length|c(hars|o(ncat|des)))(?=[(])" attribute="Built-in" context="#stay" />
                 <RegExpr String = "\b(char_code|sub_atom)(?=[(])" attribute="Built-in" context="#stay" />
-                <RegExpr String = "\batom_(chars|codes)(?=[(])" attribute="Built-in" context="#stay" />
                 <RegExpr String = "\bnumber_(chars|codes)(?=[(])" attribute="Built-in" context="#stay" />
                 <!-- Implementation defined hooks functions -->
@@ -167 +163 @@
                 <RegExpr String = "\bend_(category|object|protocol)[.]" attribute="Directive" context="#pop" />
                 <!-- Predicate scope directives -->
-                <RegExpr String = "\b(public|protected|private)(?=[(])" attribute="Directive" context="#pop" />
+                <RegExpr String = "\bp(ublic|r(otected|ivate))(?=[(])" attribute="Directive" context="#pop" />
                 <!-- Other directives -->
-                <RegExpr String = "\binitialization(?=[(])" attribute="Directive" context="#pop" />
-                <RegExpr String = "\b(info|mode)(?=[(])" attribute="Directive" context="#pop" />
+                <RegExpr String = "\bin(fo|itialization)(?=[(])" attribute="Directive" context="#pop" />
+                <RegExpr String = "\bmode(?=[(])" attribute="Directive" context="#pop" />
                 <RegExpr String = "\bdynamic[.]" attribute="Directive" context="#pop" />
-                <RegExpr String = "\b(dynamic|discontiguous|metapredicate)(?=[(])" attribute="Directive" context="#pop" />
+                <RegExpr String = "\b(d(ynamic|iscontiguous)|metapredicate)(?=[(])" attribute="Directive" context="#pop" />
                 <RegExpr String = "\bop(?=[(])" attribute="Directive" context="#pop" />
                 <RegExpr String = "\b(calls|uses)(?=[(])" attribute="Directive" context="#pop" />
@@ -178 +174 @@
 
             <context name="entityrelations" attribute="Normal" lineEndContext="#stay">
-                <RegExpr String = "\b(extends|imp(lements|orts)|instantiates|specializes)(?=[(])" attribute="Directive" context="#stay" />
+                <RegExpr String = "\b(extends|i(nstantiates|mp(lements|orts)))|specializes)(?=[(])" attribute="Directive" context="#stay" />
                 <Detect2Chars attribute="Normal" context="normal" char=")" char1="." />
             </context>