[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [syntax-highlighting] /: Update SQL (Oracle) syntax file
From: Dominik Haumann <null () kde ! org>
Date: 2017-07-23 10:34:38
Message-ID: E1dZEDe-0005mf-2F () code ! kde ! org
[Download RAW message or body]
Git commit ee8011dfa68e2d633229b24b1c5b662f8045389d by Dominik Haumann.
Committed on 23/07/2017 at 10:34.
Pushed by dhaumann into branch 'master'.
Update SQL (Oracle) syntax file
Thanks to Andrey Karepin for the patch - and sorry for the delay.
FIXED-IN: 5.37
BUG: 368755
M +1 -1 autotests/folding/test_syntax.sql.fold
M +8 -8 autotests/html/test_syntax.sql.html
M +8 -8 autotests/reference/test_syntax.sql.ref
M +51 -112 data/syntax/sql-oracle.xml
https://commits.kde.org/syntax-highlighting/ee8011dfa68e2d633229b24b1c5b662f8045389d
diff --git a/autotests/folding/test_syntax.sql.fold \
b/autotests/folding/test_syntax.sql.fold index 62db7f0..a809c73 100644
--- a/autotests/folding/test_syntax.sql.fold
+++ b/autotests/folding/test_syntax.sql.fold
@@ -1,5 +1,5 @@
-- kate: hl SQL (Oracle)
--- test <beginfold id='2'>case</beginfold id='2'> shipped with highlighting in \
bugzilla, LGPL +-- test case shipped with highlighting in bugzilla, LGPL
<beginfold id='4'>begin</beginfold id='4'>
q'{adfasdf'sadfasdf j}'{' hkjhkhkjhkjh khlkhklj'fghdfghdfgh'hkjh'jkhkh'a'
diff --git a/autotests/html/test_syntax.sql.html \
b/autotests/html/test_syntax.sql.html index eee648a..6c27160 100644
--- a/autotests/html/test_syntax.sql.html
+++ b/autotests/html/test_syntax.sql.html
@@ -4,13 +4,13 @@
<title>test_syntax.sql</title>
<meta name="generator" content="KF5::SyntaxHighlighting (SQL (Oracle))"/>
</head><body style="color:#1f1c1b"><pre>
--- kate: hl <span style="font-weight:bold;">SQL</span> (Oracle)
--- <span style="font-weight:bold;">test</span> <span \
style="font-weight:bold;">case</span> shipped <span \
style="font-weight:bold;">with</span> highlighting <span \
style="font-weight:bold;">in</span> bugzilla, LGPL +<span style="color:#898887;">-- \
kate: hl SQL (Oracle)</span> +<span style="color:#898887;">-- test case shipped with \
highlighting in bugzilla, LGPL</span>
<span style="font-weight:bold;">begin</span>
q'{<span style="color:#bf0303;">adfasdf'sadfasdf j</span>}'{<span \
style="color:#bf0303;">' hkjhkhkjhkjh khlkhklj'</span>fghdfghdfgh<span \
style="color:#bf0303;">'hkjh'</span>jkhkh<span style="color:#bf0303;">'a'</span> \
Q'(<span style="color:#bf0303;">asldflahsl;'dkjfhklsdfh</span>)'
- q'[<span style="color:#bf0303;">asdasd;'asdasd'a]sd'asd'asasd</span>]';11111111[1<span \
style="color:#bf0303;">']; asdasdasdasd'</span>errrrrrrrrrrrrrr-p + q'[<span \
style="color:#bf0303;">asdasd;'asdasd'a]sd'asd'asasd</span>]';11111111[<span \
style="color:#b08000;">1</span><span style="color:#bf0303;">']; \
asdasdasdasd'</span>errrrrrrrrrrrrrr-p
q'a<span style="color:#bf0303;">gdfgsdfgfhfghjfgh'f'f'sdfg'sdfg'dfg#</span>a' \
dafdfadasfasdf;
@@ -18,16 +18,16 @@
<span style="font-weight:bold;">if</span> sldfjsdj <span \
style="font-weight:bold;">then</span> <span style="font-weight:bold;">case</span>
- <span style="font-weight:bold;">when</span> 1=1 <span \
style="font-weight:bold;">then</span> + <span style="font-weight:bold;">when</span> \
<span style="color:#b08000;">1</span>=1 <span style="font-weight:bold;">then</span> \
aslfjsldkfj;
- <span style="font-weight:bold;">when</span> 2=2 <span \
style="font-weight:bold;">then</span> + <span style="font-weight:bold;">when</span> \
<span style="color:#b08000;">2</span>=2 <span style="font-weight:bold;">then</span> \
asdfg; <span style="font-weight:bold;">else</span>
- <span style="font-weight:bold;">null</span>;
+ null;
<span style="font-weight:bold;">end case</span>;
<span style="font-weight:bold;">if</span> sdfjh <span \
style="font-weight:bold;">then</span>
- <span style="font-weight:bold;">for</span> i <span \
style="font-weight:bold;">in</span> 1 .. 2 + <span \
style="font-weight:bold;">for</span> i <span style="font-weight:bold;">in</span> \
<span style="color:#b08000;">1</span> .. <span style="color:#b08000;">2</span> <span \
style="font-weight:bold;">LOOP</span> dbms_output.put_line(q';<span \
style="color:#bf0303;">ololo</span>;'); <span style="font-weight:bold;">END \
Loop</span>; @@ -39,7 +39,7 @@
<span style="font-weight:bold;">end if</span>;
ksjfklasjd;
fklj;
- elsif
+ <span style="font-weight:bold;">elsif</span>
sdklfjsdklfj;
<span style="font-weight:bold;">else</span>
sdfdfsdf;
diff --git a/autotests/reference/test_syntax.sql.ref \
b/autotests/reference/test_syntax.sql.ref index 9a41ecf..82d2dfb 100644
--- a/autotests/reference/test_syntax.sql.ref
+++ b/autotests/reference/test_syntax.sql.ref
@@ -1,10 +1,10 @@
-<Normal Text>-- kate: hl </Normal Text><Keyword>SQL</Keyword><Normal Text> \
(Oracle)</Normal Text><br/>
-<Normal Text>-- </Normal Text><Keyword>test</Keyword><Normal Text> </Normal \
Text><Keyword>case</Keyword><Normal Text> shipped </Normal \
Text><Keyword>with</Keyword><Normal Text> highlighting </Normal \
Text><Keyword>in</Keyword><Normal Text> bugzilla, LGPL</Normal Text><br/> \
+<Comment>-- kate: hl SQL (Oracle)</Comment><br/> +<Comment>-- test case shipped with \
highlighting in bugzilla, LGPL</Comment><br/> <dsNormal></dsNormal><br/>
<Keyword>begin</Keyword><br/>
<Normal Text> </Normal Text><Operator>q'{</Operator><String>adfasdf'sadfasdf \
j</String><Operator>}'</Operator><Normal Text>{</Normal Text><String>' hkjhkhkjhkjh \
khlkhklj'</String><Normal Text>fghdfghdfgh</Normal \
Text><String>'hkjh'</String><Normal Text>jkhkh</Normal Text><String>'a'</String><br/> \
<Normal Text> </Normal \
Text><Operator>Q'(</Operator><String>asldflahsl;'dkjfhklsdfh</String><Operator>)'</Operator><br/>
-<Normal Text> </Normal \
Text><Operator>q'[</Operator><String>asdasd;'asdasd'a]sd'asd'asasd</String><Operator>]'</Operator><Normal \
Text>;11111111[1</Normal Text><String>']; asdasdasdasd'</String><Normal \
Text>errrrrrrrrrrrrrr-p</Normal Text><br/> +<Normal Text> </Normal \
Text><Operator>q'[</Operator><String>asdasd;'asdasd'a]sd'asd'asasd</String><Operator>]'</Operator><Normal \
Text>;11111111[</Normal Text><Number>1</Number><String>']; \
asdasdasdasd'</String><Normal Text>errrrrrrrrrrrrrr-p</Normal Text><br/> \
<dsNormal></dsNormal><br/> <Normal Text> </Normal \
Text><Operator>q'a</Operator><String>gdfgsdfgfhfghjfgh'f'f'sdfg'sdfg'dfg#</String><Operator>a'</Operator><Normal \
Text> dafdfadasfasdf;</Normal Text><br/> <dsNormal></dsNormal><br/>
@@ -12,16 +12,16 @@
<dsNormal></dsNormal><br/>
<Normal Text> </Normal Text><Keyword>if</Keyword><Normal Text> sldfjsdj </Normal \
Text><Keyword>then</Keyword><br/> <Normal Text> </Normal \
Text><Keyword>case</Keyword><br/>
-<Normal Text> </Normal Text><Keyword>when</Keyword><Normal Text> 1=1 </Normal \
Text><Keyword>then</Keyword><br/> +<Normal Text> </Normal \
Text><Keyword>when</Keyword><Normal Text> </Normal Text><Number>1</Number><Normal \
Text>=1 </Normal Text><Keyword>then</Keyword><br/> <Normal \
Text> aslfjsldkfj;</Normal Text><br/>
-<Normal Text> </Normal Text><Keyword>when</Keyword><Normal Text> 2=2 </Normal \
Text><Keyword>then</Keyword><br/> +<Normal Text> </Normal \
Text><Keyword>when</Keyword><Normal Text> </Normal Text><Number>2</Number><Normal \
Text>=2 </Normal Text><Keyword>then</Keyword><br/> <Normal Text> asdfg;</Normal \
Text><br/> <Normal Text> </Normal Text><Keyword>else</Keyword><br/>
-<Normal Text> </Normal Text><Keyword>null</Keyword><Normal Text>;</Normal \
Text><br/> +<Normal Text> null;</Normal Text><br/>
<Normal Text> </Normal Text><Keyword>end case</Keyword><Normal Text>;</Normal \
Text><br/> <Normal Text> </Normal Text><br/>
<Normal Text> </Normal Text><Keyword>if</Keyword><Normal Text> sdfjh </Normal \
Text><Keyword>then</Keyword><br/>
-<Normal Text> </Normal Text><Keyword>for</Keyword><Normal Text> i </Normal \
Text><Keyword>in</Keyword><Normal Text> 1 </Normal \
Text><Operator>..</Operator><Normal Text> 2</Normal Text><br/> +<Normal \
Text> </Normal Text><Keyword>for</Keyword><Normal Text> i </Normal \
Text><Keyword>in</Keyword><Normal Text> </Normal Text><Number>1</Number><Normal Text> \
</Normal Text><Operator>..</Operator><Normal Text> </Normal \
Text><Number>2</Number><br/> <Normal Text> </Normal \
Text><Keyword>LOOP</Keyword><br/> <Normal Text> dbms_output.put_line(</Normal \
Text><Operator>q';</Operator><String>ololo</String><Operator>;'</Operator><Normal \
Text>);</Normal Text><br/> <Normal Text> </Normal Text><Keyword>END \
Loop</Keyword><Normal Text>;</Normal Text><br/> @@ -33,7 +33,7 @@
<Normal Text> </Normal Text><Keyword>end if</Keyword><Normal Text>;</Normal \
Text><br/> <Normal Text> ksjfklasjd;</Normal Text><br/>
<Normal Text> fklj;</Normal Text><br/>
-<Normal Text> elsif</Normal Text><br/>
+<Normal Text> </Normal Text><Keyword>elsif</Keyword><br/>
<Normal Text> sdklfjsdklfj;</Normal Text><br/>
<Normal Text> </Normal Text><Keyword>else</Keyword><br/>
<Normal Text> sdfdfsdf;</Normal Text><br/>
diff --git a/data/syntax/sql-oracle.xml b/data/syntax/sql-oracle.xml
index dd7245d..1b876f6 100644
--- a/data/syntax/sql-oracle.xml
+++ b/data/syntax/sql-oracle.xml
@@ -1,24 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
<!-- Oracle SQL, syntax definition based on sql.xml by Yury Lebedev -->
-<language name="SQL (Oracle)" version="2" kateversion="2.4" section="Database" \
extensions="*.sql;*.SQL;*.ddl;*.DDL;*.trg;*.TRG;*.spc;*.SPC;*.bdy;*.DBY" \
mimetype="text/x-sql" casesensitive="0" author="Andrey Karepin \
(egdfree@opensuse.org)" license="LGPL"> +<language name="SQL (Oracle)" version="3" \
kateversion="2.4" section="Database" \
extensions="*.sql;*.SQL;*.ddl;*.DDL;*.trg;*.TRG;*.spc;*.SPC;*.bdy;*.DBY" \
mimetype="text/x-sql" casesensitive="0" author="Andrey Karepin \
(egdfree@opensuse.org)" license="LGPL"> <highlighting>
<list name="keywords">
- <item> A </item>
<item> ABORT </item>
- <item> ABS </item>
+ <item> ACCEPT </item>
<item> ACCESS </item>
<item> ACCESSED </item>
<item> ACCOUNT </item>
- <item> ACOS </item>
<item> ACTIVATE </item>
- <item> ACTIVE_COMPONENT </item>
- <item> ACTIVE_FUNCTION </item>
- <item> ACTIVE_TAG </item>
<item> ADD </item>
<item> ADD_COLUMN </item>
<item> ADD_GROUP </item>
- <item> ADD_MONTHS </item>
<item> ADJ_DATE </item>
<item> ADMIN </item>
<item> ADMINISTER </item>
@@ -51,14 +45,11 @@
<item> ASC </item>
<item> ASCII </item>
<item> ASCIISTR </item>
- <item> ASIN </item>
<item> ASSEMBLY </item>
<item> ASSOCIATE </item>
<item> ASYNC </item>
<item> ASYNCHRONOUS </item>
<item> AT </item>
- <item> ATAN </item>
- <item> ATAN2 </item>
<item> ATTRIBUTE </item>
<item> ATTRIBUTES </item>
<item> AUDIT </item>
@@ -71,7 +62,6 @@
<item> AUTOEXTEND </item>
<item> AUTOMATIC </item>
<item> AVAILABILITY </item>
- <item> AVG </item>
<item> BACKUP </item>
<item> BASIC </item>
<item> BASICFILE </item>
@@ -82,25 +72,14 @@
<item> BEGIN_OUTLINE_DATA </item>
<item> BEHALF </item>
<item> BETWEEN </item>
- <item> BFILE </item>
- <item> BFILENAME </item>
<item> BIGFILE </item>
- <item> BINARY </item>
- <item> BINARY_DOUBLE </item>
- <item> BINARY_DOUBLE_INFINITY </item>
- <item> BINARY_DOUBLE_NAN </item>
- <item> BINARY_FLOAT </item>
- <item> BINARY_FLOAT_INFINITY </item>
- <item> BINARY_FLOAT_NAN </item>
<item> BIND_AWARE </item>
<item> BINDING </item>
- <item> BIN_TO_NUM </item>
<item> BITAND </item>
<item> BITMAP </item>
<item> BITMAPS </item>
<item> BITMAP_TREE </item>
<item> BITS </item>
- <item> BLOB </item>
<item> BLOCK </item>
<item> BLOCK_RANGE </item>
<item> BLOCKS </item>
@@ -151,7 +130,6 @@
<item> CHUNK </item>
<item> CLASS </item>
<item> CLEAR </item>
- <item> CLOB </item>
<item> CLONE </item>
<item> CLOSE </item>
<item> CLOSE_CACHED_OPEN_CURSORS </item>
@@ -218,8 +196,6 @@
<item> CORRUPTION </item>
<item> CORRUPT_XID </item>
<item> CORRUPT_XID_ALL </item>
- <item> COS </item>
- <item> COSH </item>
<item> COST </item>
<item> COST_XML_QUERY_REWRITE </item>
<item> COUNT </item>
@@ -251,7 +227,6 @@
<item> CURSOR_SPECIFIC_SEGMENT </item>
<item> CV </item>
<item> CYCLE </item>
- <item> D </item>
<item> DANGLING </item>
<item> DATA </item>
<item> DATABASE </item>
@@ -274,9 +249,7 @@
<item> DEBUG </item>
<item> DEBUGGER </item>
<item> DEC </item>
- <item> DECIMAL </item>
<item> DECLARE </item>
- <item> DECODE </item>
<item> DECOMPOSE </item>
<item> DECR </item>
<item> DECREMENT </item>
@@ -286,6 +259,7 @@
<item> DEFAULTS </item>
<item> DEFERRABLE </item>
<item> DEFERRED </item>
+ <item> DEFINE </item>
<item> DEFINED </item>
<item> DEFINER </item>
<item> DEGREE </item>
@@ -338,7 +312,6 @@
<item> DYNAMIC </item>
<item> DYNAMIC_SAMPLING </item>
<item> DYNAMIC_SAMPLING_EST_CDN </item>
- <item> E </item>
<item> EACH </item>
<item> EDITION </item>
<item> EDITIONING </item>
@@ -348,6 +321,7 @@
<item> ELIMINATE_OBY </item>
<item> ELIMINATE_OUTER_JOIN </item>
<item> ELSE </item>
+ <item> ELSIF </item>
<item> EMPTY </item>
<item> EMPTY_BLOB </item>
<item> EMPTY_CLOB </item>
@@ -447,7 +421,6 @@
<item> FULL </item>
<item> FUNCTION </item>
<item> FUNCTIONS </item>
- <item> G </item>
<item> GATHER_PLAN_STATISTICS </item>
<item> GBY_CONC_ROLLUP </item>
<item> GBY_PUSHDOWN </item>
@@ -467,7 +440,6 @@
<item> GUARANTEE </item>
<item> GUARANTEED </item>
<item> GUARD </item>
- <item> H </item>
<item> HASH </item>
<item> HASH_AJ </item>
<item> HASHKEYS </item>
@@ -580,7 +552,6 @@
<item> JAVA </item>
<item> JOB </item>
<item> JOIN </item>
- <item> K </item>
<item> KEEP </item>
<item> KEEP_DUPLICATES </item>
<item> KERBEROS </item>
@@ -650,7 +621,6 @@
<item> LOWER </item>
<item> LPAD </item>
<item> LTRIM </item>
- <item> M </item>
<item> MAIN </item>
<item> MAKE_REF </item>
<item> MANAGE </item>
@@ -732,10 +702,6 @@
<item> NATIVE_FULL_OUTER_JOIN </item>
<item> NATURAL </item>
<item> NAV </item>
- <item> NCHAR </item>
- <item> NCHAR_CS </item>
- <item> NCHR </item>
- <item> NCLOB </item>
<item> NEEDED </item>
<item> NESTED </item>
<item> NESTED_TABLE_FAST_INSERT </item>
@@ -906,7 +872,6 @@
<item> NUM_INDEX_KEYS </item>
<item> NUMTODSINTERVAL </item>
<item> NUMTOYMINTERVAL </item>
- <item> NVARCHAR2 </item>
<item> NVL </item>
<item> NVL2 </item>
<item> OBJECT </item>
@@ -973,7 +938,6 @@
<item> OWN </item>
<item> OWNER </item>
<item> OWNERSHIP </item>
- <item> P </item>
<item> PACKAGE </item>
<item> PACKAGES </item>
<item> PARALLEL </item>
@@ -1070,6 +1034,7 @@
<item> PROFILE </item>
<item> PROGRAM </item>
<item> PROJECT </item>
+ <item> PROMPT </item>
<item> PROPAGATE </item>
<item> PROTECTED </item>
<item> PROTECTION </item>
@@ -1331,7 +1296,6 @@
<item> SUBSTR2 </item>
<item> SUBSTR4 </item>
<item> SUCCESSFUL </item>
- <item> SUM </item>
<item> SUMMARY </item>
<item> SUPPLEMENTAL </item>
<item> SUSPEND </item>
@@ -1347,7 +1311,6 @@
<item> SYS_CHECKACL </item>
<item> SYS_CONNECT_BY_PATH </item>
<item> SYS_CONTEXT </item>
- <item> SYSDATE </item>
<item> SYSDBA </item>
<item> SYS_DBURIGEN </item>
<item> SYS_DL_CURSOR </item>
@@ -1592,15 +1555,12 @@
<item> SYS_XQTREATAS </item>
<item> SYS_XQ_UPKXML2SQL </item>
<item> SYS_XQXFORM </item>
- <item> T </item>
<item> TABLE </item>
<item> TABLES </item>
<item> TABLESPACE </item>
<item> TABLESPACE_NO </item>
<item> TABLE_STATS </item>
<item> TABNO </item>
- <item> TAN </item>
- <item> TANH </item>
<item> TBL$OR$IDX$PART$NUM </item>
<item> TEMPFILE </item>
<item> TEMPLATE </item>
@@ -1625,25 +1585,6 @@
<item> TIV_GB </item>
<item> TIV_SSF </item>
<item> TO </item>
- <item> TO_BINARY_DOUBLE </item>
- <item> TO_BINARY_FLOAT </item>
- <item> TO_BLOB </item>
- <item> TO_CHAR </item>
- <item> TO_CLOB </item>
- <item> TO_DATE </item>
- <item> TO_DSINTERVAL </item>
- <item> TO_LOB </item>
- <item> TO_MULTI_BYTE </item>
- <item> TO_NCHAR </item>
- <item> TO_NCLOB </item>
- <item> TO_NUMBER </item>
- <item> TOPLEVEL </item>
- <item> TO_SINGLE_BYTE </item>
- <item> TO_TIME </item>
- <item> TO_TIMESTAMP </item>
- <item> TO_TIMESTAMP_TZ </item>
- <item> TO_TIME_TZ </item>
- <item> TO_YMINTERVAL </item>
<item> TRACE </item>
<item> TRACING </item>
<item> TRACKING </item>
@@ -1666,13 +1607,13 @@
<item> TYPE </item>
<item> TYPES </item>
<item> TZ_OFFSET </item>
- <item> U </item>
<item> UBA </item>
<item> UB2 </item>
<item> UID </item>
<item> UNARCHIVED </item>
<item> UNBOUND </item>
<item> UNBOUNDED </item>
+ <item> UNDEFINE </item>
<item> UNDER </item>
<item> UNDO </item>
<item> UNDROP </item>
@@ -1699,7 +1640,6 @@
<item> UPD_INDEXES </item>
<item> UPD_JOININDEX </item>
<item> UPGRADE </item>
- <item> UPPER </item>
<item> UPSERT </item>
<item> UROWID </item>
<item> USAGE </item>
@@ -1714,9 +1654,7 @@
<item> USE_NL </item>
<item> USE_NL_WITH_INDEX </item>
<item> USE_PRIVATE_OUTLINES </item>
- <item> USER </item>
<item> USER_DEFINED </item>
- <item> USERENV </item>
<item> USERGROUP </item>
<item> USER_RECYCLEBIN </item>
<item> USERS </item>
@@ -1729,12 +1667,10 @@
<item> VALIDATION </item>
<item> VALUE </item>
<item> VALUES </item>
- <item> VARCHAR </item>
- <item> VARCHAR2 </item>
<item> VARIANCE </item>
<item> VAR_POP </item>
- <item> VARRAY </item>
<item> VARRAYS </item>
+ <item> VARIABLE </item>
<item> VAR_SAMP </item>
<item> VARYING </item>
<item> VECTOR_READ </item>
@@ -2046,9 +1982,13 @@
<item> ANYTYPE </item>
<item> ARRAY </item>
<item> BFILE </item>
+ <item> BINARY </item>
<item> BINARY_DOUBLE </item>
+ <item> BINARY_DOUBLE_INFINITY </item>
+ <item> BINARY_DOUBLE_NAN </item>
<item> BINARY_FLOAT </item>
- <item> BINARY_INTEGER </item>
+ <item> BINARY_FLOAT_INFINITY </item>
+ <item> BINARY_FLOAT_NAN </item>
<item> BLOB </item>
<item> BOOLEAN </item>
<item> CFILE </item>
@@ -2056,13 +1996,11 @@
<item> CHARACTER </item>
<item> CLOB </item>
<item> DATE </item>
- <item> DAY </item>
<item> DBURITYPE </item>
<item> DEC </item>
<item> DECIMAL </item>
<item> DOUBLE </item>
<item> FLOAT </item>
- <item> FLOB </item>
<item> HTTPURITYPE </item>
<item> INT </item>
<item> INTEGER </item>
@@ -2070,13 +2008,11 @@
<item> LOB </item>
<item> LONG </item>
<item> MLSLABEL </item>
- <item> MONTH </item>
- <item> NATIONAL </item>
<item> NCHAR </item>
<item> NCLOB </item>
<item> NUMBER </item>
<item> NUMERIC </item>
- <item> NVARCHAR </item>
+ <item> NVARCHAR2 </item>
<item> OBJECT </item>
<item> PLS_INTEGER </item>
<item> PRECISION </item>
@@ -2098,18 +2034,15 @@
<item> VARYING </item>
<item> VARRAY </item>
<item> XMLTYPE </item>
- <item> YEAR </item>
<item> ZONE </item>
</list>
<contexts>
<context name="Normal" attribute="Normal Text" lineEndContext="#stay">
<DetectSpaces />
- <!-- quoting -->
- <RegExpr attribute="Operator" context="Quote operator brace" String="\bq'\{" \
insensitive="true"/>
- <RegExpr attribute="Operator" context="Quote operator bracket" \
String="\bq'\[" insensitive="true"/>
- <RegExpr attribute="Operator" context="Quote operator parenthesis" \
String="\bq'\(" insensitive="true"/>
- <RegExpr attribute="Operator" context="Quote operator" String="\bq'(\S)" \
insensitive="true"/>
- <DetectChar attribute="String" context="String literal" char="'"/>
+ <!-- comments -->
+ <Detect2Chars attribute="Comment" context="singleLineComment" char="-" \
char1="-"/> + <Detect2Chars attribute="Comment" context="multiLineComment" \
char="/" char1="*"/> +
<!-- block's -->
<StringDetect attribute="Keyword" context="#stay" String="if" \
beginRegion="if_block" insensitive="true"/>
<RegExpr attribute="Keyword" context="#stay" String="end\s+if" \
endRegion="if_block" insensitive="true"/> @@ -2118,50 +2051,56 @@
<StringDetect attribute="Keyword" context="#stay" String="loop" \
beginRegion="loop_block" insensitive="true"/>
<RegExpr attribute="Keyword" context="#stay" String="\bend\s+loop\b" \
endRegion="loop_block" insensitive="true"/>
<StringDetect attribute="Keyword" context="#stay" String="begin" \
beginRegion="block" insensitive="true"/>
- <StringDetect attribute="Keyword" context="#stay" String="end" \
endRegion="block" insensitive="true"/> + <RegExpr attribute="Keyword" \
context="#stay" String="\bend\b" endRegion="block" insensitive="true"/> <keyword \
attribute="Keyword" String="keywords" context="#stay"/>
-
+
+ <Int attribute="Number" context="#stay"/>
+ <Float attribute="Number" context="#stay"/>
<keyword attribute="Operator" String="operators" context="#stay"/>
<keyword attribute="Function" String="functions" context="#stay"/>
<keyword attribute="Data Type" String="types" context="#stay"/>
-
+ <RegExpr attribute="External Variable" context="#stay" String="&\w+\b"/>
+
+ <!-- quoting -->
+ <RegExpr attribute="Operator" context="QuoteOperatorBrace" String="\bq'\{" \
insensitive="true"/> + <RegExpr attribute="Operator" \
context="QuoteOperatorBracket" String="\bq'\[" insensitive="true"/> + <RegExpr \
attribute="Operator" context="QuoteOperatorParenthesis" String="\bq'\(" \
insensitive="true"/> + <RegExpr attribute="Operator" context="QuoteOperator" \
String="\bq'(\S)" insensitive="true"/> + <DetectChar attribute="String" \
context="StringLiteral" char="'"/> +
<DetectIdentifier />
</context>
-
- <context name="String literal" attribute="String" lineEndContext="#stay">
- <Detect2Chars attribute="String" context="#pop" char="\" char1="'" />
- <HlCStringChar attribute="String Char" context="#stay"/>
- <RegExpr attribute="External Variable" context="#stay" \
String="&&?\w+"/>
- <Detect2Chars attribute="String Char" context="#stay" char="'" char1="'" />
+
+ <context name="StringLiteral" attribute="String" lineEndContext="#stay">
<DetectChar attribute="String" context="#pop" char="'"/>
</context>
- <context name="Quote operator" attribute="String" lineEndContext="#stay" \
dynamic="true">
- <RegExpr attribute="Operator" context="#pop" String="%1'" dynamic="true"/>
+ <context name="QuoteOperator" attribute="String" lineEndContext="#stay" \
dynamic="true"> + <RegExpr attribute="Operator" context="#pop" String="%1'" \
dynamic="true"/> </context>
- <context name="Quote operator brace" attribute="String" \
lineEndContext="#stay"> + <context name="QuoteOperatorBrace" attribute="String" \
lineEndContext="#stay">
<Detect2Chars attribute="Operator" context="#pop" char="}" char1="'"/>
</context>
- <context name="Quote operator bracket" attribute="String" \
lineEndContext="#stay"> + <context name="QuoteOperatorBracket" \
attribute="String" lineEndContext="#stay">
<Detect2Chars attribute="Operator" context="#pop" char="]" char1="'"/>
</context>
- <context name="Quote operator parenthesis" attribute="String" \
lineEndContext="#stay"> + <context name="QuoteOperatorParenthesis" \
attribute="String" lineEndContext="#stay">
<Detect2Chars attribute="Operator" context="#pop" char=")" char1="'"/>
</context>
+ <context name="singleLineComment" attribute="Comment" lineEndContext="#pop"/>
+ <context name="multiLineComment" attribute="Comment" lineEndContext="#stay">
+ <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/"/>
+ </context>
</contexts>
<itemDatas>
- <itemData name="Normal Text" defStyleNum="dsNormal"/>
- <itemData name="Keyword" defStyleNum="dsKeyword"/>
- <itemData name="Operator" defStyleNum="dsNormal"/>
- <itemData name="Function" defStyleNum="dsFunction"/>
- <itemData name="Data Type" defStyleNum="dsDataType"/>
- <itemData name="Decimal" defStyleNum="dsDecVal"/>
- <itemData name="Float" defStyleNum="dsFloat"/>
- <itemData name="String" defStyleNum="dsString"/>
- <itemData name="String Char" defStyleNum="dsChar"/>
- <itemData name="Comment" defStyleNum="dsComment"/>
- <itemData name="Identifier" defStyleNum="dsOthers"/>
- <itemData name="Symbol" defStyleNum="dsChar"/>
- <itemData name="Preprocessor" defStyleNum="dsOthers"/>
+ <itemData name="Normal Text" defStyleNum="dsNormal"/>
+ <itemData name="Keyword" defStyleNum="dsKeyword" \
spellChecking="false"/> + <itemData name="Operator" \
defStyleNum="dsNormal" spellChecking="false"/> + <itemData name="Function" \
defStyleNum="dsFunction" spellChecking="false"/> + <itemData name="Data Type" \
defStyleNum="dsDataType" spellChecking="false"/> + <itemData name="Number" \
defStyleNum="dsDecVal" spellChecking="false"/> + <itemData name="String" \
defStyleNum="dsString"/> + <itemData name="External Variable" \
defStyleNum="dsNormal" spellChecking="false"/> + <itemData name="Comment" \
defStyleNum="dsComment"/> </itemDatas>
</highlighting>
<general>
@@ -2169,6 +2108,6 @@
<comment name="singleLine" start="--"/>
<comment name="multiLine" start="/*" end="*/"/>
</comments>
- <keywords casesensitive="0" weakDeliminator="+-*/|!@&#<>%^=~:.?"/>
+ <keywords casesensitive="0" weakDeliminator="+-*/|!@&#<>%^=~:.?;"/>
</general>
</language>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic