From a0fb65a1da034283b4809b1d555ee0868bb80c75 Mon Sep 17 00:00:00 2001 From: Bibiko Date: Tue, 14 Apr 2009 08:27:38 +0000 Subject: =?UTF-8?q?=E2=80=A2=20syntax=20highlighting=20and=20completion=20?= =?UTF-8?q?list=20updated?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/CMTextView.m | 135 +++++++++++++++++++++++++++++++----------------- Source/SPEditorTokens.l | 3 +- 2 files changed, 90 insertions(+), 48 deletions(-) diff --git a/Source/CMTextView.m b/Source/CMTextView.m index b717c0b5..45d0421f 100644 --- a/Source/CMTextView.m +++ b/Source/CMTextView.m @@ -566,15 +566,19 @@ YY_BUFFER_STATE yy_scan_string (const char *); @"ALGORITHM", @"ALL", @"ALTER", - @"ALTER TABLE", - @"ALTER VIEW", - @"ALTER SCHEMA", - @"ALTER SCHEMA", - @"ALTER FUNCTION", @"ALTER COLUMN", @"ALTER DATABASE", + @"ALTER EVENT", + @"ALTER FUNCTION", + @"ALTER LOGFILE GROUP", @"ALTER PROCEDURE", + @"ALTER SCHEMA", + @"ALTER SERVER", + @"ALTER TABLE", + @"ALTER TABLESPACE", + @"ALTER VIEW", @"ANALYZE", + @"ANALYZE TABLE", @"AND", @"ANY", @"AS", @@ -588,6 +592,7 @@ YY_BUFFER_STATE yy_scan_string (const char *); @"AVG", @"AVG_ROW_LENGTH", @"BACKUP", + @"BACKUP TABLE", @"BEFORE", @"BEGIN", @"BETWEEN", @@ -603,6 +608,7 @@ YY_BUFFER_STATE yy_scan_string (const char *); @"BY", @"BYTE", @"CACHE", + @"CACHE INDEX", @"CALL", @"CASCADE", @"CASCADED", @@ -612,9 +618,12 @@ YY_BUFFER_STATE yy_scan_string (const char *); @"CHANGED", @"CHAR", @"CHARACTER", + @"CHARACTER SET", @"CHARSET", @"CHECK", + @"CHECK TABLE", @"CHECKSUM", + @"CHECKSUM TABLE", @"CIPHER", @"CLIENT", @"CLOSE", @@ -640,15 +649,18 @@ YY_BUFFER_STATE yy_scan_string (const char *); @"CONTRIBUTORS", @"CONVERT", @"CREATE", - @"CREATE VIEW", - @"CREATE INDEX", - @"CREATE FUNCTION", @"CREATE DATABASE", + @"CREATE EVENT", + @"CREATE FUNCTION", + @"CREATE INDEX", + @"CREATE LOGFILE GROUP", @"CREATE PROCEDURE", @"CREATE SCHEMA", - @"CREATE TRIGGER", @"CREATE TABLE", + @"CREATE TABLESPACE", + @"CREATE TRIGGER", @"CREATE USER", + @"CREATE VIEW", @"CROSS", @"CUBE", @"CURRENT_DATE", @@ -668,6 +680,7 @@ YY_BUFFER_STATE yy_scan_string (const char *); @"DAY_MINUTE", @"DAY_SECOND", @"DEALLOCATE", + @"DEALLOCATE PREPARE", @"DEC", @"DECIMAL", @"DECLARE", @@ -690,18 +703,23 @@ YY_BUFFER_STATE yy_scan_string (const char *); @"DO", @"DOUBLE", @"DROP", - @"DROP TABLE", - @"DROP TRIGGER", - @"DROP VIEW", - @"DROP SCHEMA", - @"DROP USER", - @"DROP PROCEDURE", - @"DROP FUNCTION", + @"DROP DATABASE", + @"DROP EVENT", @"DROP FOREIGN KEY", + @"DROP FUNCTION", @"DROP INDEX", + @"DROP LOGFILE GROUP", @"DROP PREPARE", @"DROP PRIMARY KEY", - @"DROP DATABASE", + @"DROP PREPARE", + @"DROP PROCEDURE", + @"DROP SCHEMA", + @"DROP SERVER", + @"DROP TABLE", + @"DROP TABLESPACE", + @"DROP TRIGGER", + @"DROP USER", + @"DROP VIEW", @"DUAL", @"DUMPFILE", @"DUPLICATE", @@ -742,8 +760,8 @@ YY_BUFFER_STATE yy_scan_string (const char *); @"FLUSH", @"FOR", @"FORCE", - @"FOREIGN", @"FOREIGN KEY", + @"FOREIGN", @"FOUND", @"FRAC_SECOND", @"FROM", @@ -784,6 +802,7 @@ YY_BUFFER_STATE yy_scan_string (const char *); @"INSERT", @"INSERT_METHOD", @"INSTALL", + @"INSTALL PLUGIN", @"INT", @"INT1", @"INT2", @@ -819,10 +838,12 @@ YY_BUFFER_STATE yy_scan_string (const char *); @"LINESTRING", @"LIST", @"LOAD DATA", + @"LOAD INDEX INTO CACHE", @"LOCAL", @"LOCALTIME", @"LOCALTIMESTAMP", @"LOCK", + @"LOCK TABLES", @"LOCKS", @"LOGFILE", @"LOGS", @@ -901,8 +922,10 @@ YY_BUFFER_STATE yy_scan_string (const char *); @"ONE_SHOT", @"OPEN", @"OPTIMIZE", + @"OPTIMIZE TABLE", @"OPTION", @"OPTIONALLY", + @"OPTIONS", @"OR", @"ORDER", @"OUT", @@ -953,15 +976,20 @@ YY_BUFFER_STATE yy_scan_string (const char *); @"RELOAD", @"REMOVE", @"RENAME", + @"RENAME DATABASE", + @"RENAME TABLE", @"REORGANIZE", @"REPAIR", + @"REPAIR TABLE", @"REPEAT", @"REPEATABLE", @"REPLACE", @"REPLICATION", @"REQUIRE", @"RESET", + @"RESET MASTER", @"RESTORE", + @"RESTORE TABLE", @"RESTRICT", @"RESUME", @"RETURN", @@ -991,47 +1019,57 @@ YY_BUFFER_STATE yy_scan_string (const char *); @"SERIALIZABLE", @"SESSION", @"SET", + @"SET PASSWORD", @"SHARE", @"SHOW", - @"SHOW PROCEDURE STATUS", - @"SHOW PROCESSLIST", - @"SHOW SCHEMAS", - @"SHOW SLAVE HOSTS", - @"SHOW PRIVILEGES", - @"SHOW OPEN TABLES", - @"SHOW MASTER STATUS", - @"SHOW SLAVE STATUS", - @"SHOW PLUGIN", - @"SHOW STORAGE ENGINES", - @"SHOW VARIABLES", - @"SHOW WARNINGS", - @"SHOW TRIGGERS", - @"SHOW TABLES", - @"SHOW MASTER LOGS", - @"SHOW TABLE STATUS", - @"SHOW TABLE TYPES", - @"SHOW STATUS", - @"SHOW INNODB STATUS", + @"SHOW BINARY LOGS", + @"SHOW BINLOG EVENTS", + @"SHOW CHARACTER SET", + @"SHOW COLLATION", + @"SHOW COLUMNS", + @"SHOW CONTRIBUTORS", @"SHOW CREATE DATABASE", + @"SHOW CREATE EVENT", @"SHOW CREATE FUNCTION", @"SHOW CREATE PROCEDURE", @"SHOW CREATE SCHEMA", - @"SHOW COLUMNS", - @"SHOW COLLATION", - @"SHOW BINARY LOGS", - @"SHOW BINLOG EVENTS", - @"SHOW CHARACTER SET", @"SHOW CREATE TABLE", + @"SHOW CREATE TRIGGERS", @"SHOW CREATE VIEW", - @"SHOW FUNCTION STATUS", - @"SHOW GRANTS", - @"SHOW INDEX", - @"SHOW FIELDS", - @"SHOW ERRORS", @"SHOW DATABASES", @"SHOW ENGINE", @"SHOW ENGINES", + @"SHOW ERRORS", + @"SHOW EVENTS", + @"SHOW FIELDS", + @"SHOW FUNCTION CODE", + @"SHOW FUNCTION STATUS", + @"SHOW GRANTS", + @"SHOW INDEX", + @"SHOW INNODB STATUS", @"SHOW KEYS", + @"SHOW MASTER LOGS", + @"SHOW MASTER STATUS", + @"SHOW OPEN TABLES", + @"SHOW PLUGINS", + @"SHOW PRIVILEGES", + @"SHOW PROCEDURE CODE", + @"SHOW PROCEDURE STATUS", + @"SHOW PROFILE", + @"SHOW PROFILES", + @"SHOW PROCESSLIST", + @"SHOW SCHEDULER STATUS", + @"SHOW SCHEMAS", + @"SHOW SLAVE HOSTS", + @"SHOW SLAVE STATUS", + @"SHOW STATUS", + @"SHOW STORAGE ENGINES", + @"SHOW TABLE STATUS", + @"SHOW TABLE TYPES", + @"SHOW TABLES", + @"SHOW TRIGGERS", + @"SHOW VARIABLES", + @"SHOW WARNINGS", @"SHUTDOWN", @"SIGNED", @"SIMPLE", @@ -1065,6 +1103,7 @@ YY_BUFFER_STATE yy_scan_string (const char *); @"SQL_TSI_YEAR", @"SSL", @"START", + @"START TRANSACTION", @"STARTING", @"STARTS", @"STATUS", @@ -1109,10 +1148,12 @@ YY_BUFFER_STATE yy_scan_string (const char *); @"UNDO_BUFFER_SIZE", @"UNICODE", @"UNINSTALL", + @"UNINSTALL PLUGIN", @"UNION", @"UNIQUE", @"UNKNOWN", @"UNLOCK", + @"UNLOCK TABLES", @"UNSIGNED", @"UNTIL", @"UPDATE", diff --git a/Source/SPEditorTokens.l b/Source/SPEditorTokens.l index b3d5ef42..be10ac07 100644 --- a/Source/SPEditorTokens.l +++ b/Source/SPEditorTokens.l @@ -34,7 +34,7 @@ word [a-z_\.0-9À-ﾟ@] variable @{1,2}[a-z_\.0-9À-ﾟ$]+ nonword [^a-z_0-9À-ﾟ#\n\t] keyworda (G(R(OUP{s}BY|ANT(S)?)|E(T_FORMAT|OMETRY(COLLECTION)?)|LOBAL)|B(Y(TE)?|TREE|I(GINT|N(LOG|ARY)|T)|O(TH|OL(EAN)?)|E(GIN|TWEEN|FORE)|LOB|ACKUP{s}TABLE)|H(IGH_PRIORITY|O(STS|UR(_(MI(NUTE|CROSECOND)|SECOND))?)|ELP|A(SH|NDLER|VING))|C(R(OSS|EATE)|H(ECK(SUM{s}TABLE)?|A(R(SET|ACTER)?|NGE(D)?|IN))|IPHER|O(M(M(IT(TED)?|ENT)|P(RESSED|LETION|ACT))|N(S(TRAINT|ISTENT)|NECTION|CURRENT|T(RIBUTORS|INUE|AINS)|DITION|VERT)|DE|L(UMN|LATE)|ALESCE{s}PARTITION)|U(R(RENT_(TIME(STAMP)?|DATE|USER)|SOR)|BE)|L(IENT|OSE)|A(S(CADE(D)?|E)|CHE{s}INDEX|LL))|I(GNORE|MPORT{s}TABLESPACE|S(SUER|OLATION)?|N(S(TALL|E(RT(_METHOD)?|NSITIVE))|N(O(BASE|DB)|ER)|T(1|2|8|3|O({s}(DUMP|OUT)FILE)?|4|E(RVAL|GER))?|ITIAL_SIZE|OUT|DEX(ES)?|VOKER|FILE)?|TERATE|O_THREAD|DENTIFIED|F)|D(ROP|YNAMIC|I(RECTORY|S(CARD{s}TABLESPACE|TINCT(ROW)?|K|ABLE{s}KEYS)|V)|O(UBLE)?|U(MPFILE|PLICATE|AL)|E(S(C(RIBE)?|_KEY_FILE)|C(IMAL|LARE)?|TERMINISTIC|F(INER|AULT)|L(ETE|AY(_KEY_WRITE|ED))|ALLOCATE)|A(Y(_(MI(NUTE|CROSECOND)|SECOND|HOUR))?|T(E(TIME)?|A(BASE(S)?|FILE)?)))|JOIN|E(RRORS|X(TEN(T_SIZE|DED)|I(STS|T)|P(LAIN|ANSION)|ECUTE)|SCAPE(D{s}BY)?|N(GINE(S)?|CLOSED{s}BY|D(S)?|UM|ABLE{s}KEYS)|VE(RY|NT)|LSE(IF)?|ACH)|K(ILL({s}(CONNECTION|QUERY))?|EY(S|_BLOCK_SIZE)?)|F(R(OM|AC_SECOND)|I(RST|XED|LE)|O(R(CE|EIGN)?|UND)|U(NCTION|LL(TEXT)?)|ETCH|L(OAT(8|4)?|USH)|A(ST|LSE))|A(G(GREGATE|AINST)|S(C(II)?|ENSITIVE)?|N(Y|D|ALYZE)|C(CESSIBLE|TION)|T|DD|UT(HORS|O(_INCREMENT|EXTEND_SIZE))|VG(_ROW_LENGTH)?|FTER|L(GORITHM|TER|L))) -keywordl (R(TREE|IGHT|O(UTINE|W(S|_FORMAT)?|LL(BACK|UP))|E(GEXP|MOVE{s}PARTITIONING|BUILD{s}PARTITION|S(T(RICT|ORE{s}TABLE)|UME|ET)|NAME|COVER|TURN(S)?|ORGANIZE{s}PARTITION|D(O(_BUFFER_SIZE|FILE)|UNDANT)|P(EAT(ABLE)?|L(ICATION|ACE)|AIR)|VOKE|QUIRE|FERENCES|L(OAD|EASE|AY_(THREAD|LOG_(POS|FILE)))|A(D(S|_(ONLY|WRITE))?|L))|LIKE|ANGE)|M(I(GRATE|N(_ROWS|UTE(_(MICROSECOND|SECOND))?)|CROSECOND|DDLEINT)|O(NTH|D(IF(Y|IES)|E)?)|U(TEX|LTI(PO(INT|LYGON)|LINESTRING))|E(RGE|MORY|DIUM(BLOB|TEXT|INT)?)|A(X(_(ROWS|SIZE|CONNECTIONS_PER_HOUR|U(SER_CONNECTIONS|PDATES_PER_HOUR)|QUERIES_PER_HOUR)|VALUE)|STER(_(S(SL(_(C(IPHER|ERT|A(PATH)?)|VERIFY_SERVER_CERT|KEY))?|ERVER_ID)|HOST|CONNECT_RETRY|USER|P(ORT|ASSWORD)|LOG_(POS|FILE)))?|TCH))|N(CHAR|O(NE|_W(RITE_TO_BINLOG|AIT)|T|DEGROUP)?|DB(CLUSTER)?|U(MERIC|LL)|E(XT|W)|VARCHAR|A(ME(S)?|T(IONAL|URAL)))|O(R(DER{s}BY)?|N({s}(DUPLICATE{s}KEY{s}UPDATE)?|E(_SHOT)?|LINE)|UT(ER|FILE)?|P(TI(MIZE|ON(ALLY)?)|EN)|FF(SET|LINE)|LD_PASSWORD)|P(R(I(MARY|VILEGES)|OCE(SS|DURE)|E(SERVE|CISION|PARE|V))|HASE|O(INT|LYGON)|URGE|A(R(SER|TI(TION(S|ING)?|AL))|SSWORD|CK_KEYS))|QU(ICK|ERY|ARTER)|L(I(MIT|ST|NE(S(TRING)?|AR)|KE)|O(G(S|FILE)|NG(BLOB|TEXT)?|C(K(S)?|AL(TIME(STAMP)?)?)|OP|W_PRIORITY|AD{s}(DATA|INDEX{s}INTO{s}CACHE))|E(SS|VEL|FT|A(DING|VE(S)?))|A(ST|NGUAGE))) +keywordl (R(TREE|IGHT|O(UTINE|W(S|_FORMAT)?|LL(BACK|UP))|E(GEXP|MOVE{s}PARTITIONING|BUILD{s}PARTITION|S(T(RICT|ORE{s}TABLE)|UME|ET)|NAME|COVER|TURN(S)?|ORGANIZE{s}PARTITION|D(O(_BUFFER_SIZE|FILE)|UNDANT)|P(EAT(ABLE)?|L(ICATION|ACE)|AIR)|VOKE|QUIRE|FERENCES|L(OAD|EASE|AY_(THREAD|LOG_(POS|FILE)))|A(D(S|_(ONLY|WRITE))?|L))|LIKE|ANGE)|M(I(GRATE|N(_ROWS|UTE(_(MICROSECOND|SECOND))?)|CROSECOND|DDLEINT)|O(NTH|D(IF(Y|IES)|E)?)|U(TEX|LTI(PO(INT|LYGON)|LINESTRING))|E(RGE|MORY|DIUM(BLOB|TEXT|INT)?)|A(X(_(ROWS|SIZE|CONNECTIONS_PER_HOUR|U(SER_CONNECTIONS|PDATES_PER_HOUR)|QUERIES_PER_HOUR)|VALUE)|STER(_(S(SL(_(C(IPHER|ERT|A(PATH)?)|VERIFY_SERVER_CERT|KEY))?|ERVER_ID)|HOST|CONNECT_RETRY|USER|P(ORT|ASSWORD)|LOG_(POS|FILE)))?|TCH))|N(CHAR|O(NE|_W(RITE_TO_BINLOG|AIT)|T|DEGROUP)?|DB(CLUSTER)?|U(MERIC|LL)|E(XT|W)|VARCHAR|A(ME(S)?|T(IONAL|URAL)))|O(R(DER{s}BY)?|N({s}(DUPLICATE{s}KEY{s}UPDATE)?|E(_SHOT)?|LINE)|UT(ER|FILE)?|P(TI(MIZE|ON(S|ALLY)?)|EN)|FF(SET|LINE)|LD_PASSWORD)|P(R(I(MARY|VILEGES)|OCE(SS|DURE)|E(SERVE|CISION|PARE|V))|HASE|O(INT|LYGON)|URGE|A(R(SER|TI(TION(S|ING)?|AL))|SSWORD|CK_KEYS))|QU(ICK|ERY|ARTER)|L(I(MIT|ST|NE(S(TRING)?|AR)|KE)|O(G(S|FILE)|NG(BLOB|TEXT)?|C(K(S)?|AL(TIME(STAMP)?)?)|OP|W_PRIORITY|AD{s}(DATA|INDEX{s}INTO{s}CACHE))|E(SS|VEL|FT|A(DING|VE(S)?))|A(ST|NGUAGE))) keywords (X(OR|509|A)|S(MALLINT|SL|H(OW({s}(E(NGINE(S)?|RRORS)|M(ASTER|UTEX)|BINLOG|GRANTS|INNODB|P(RIVILEGES|ROFILE(S)?|ROCEDURE{s}CODE)|SLAVE{s}(HOSTS|STATUS)|TRIGGERS|VARIABLES|WARNINGS|PROCESSLIST|FIELDS|PLUGIN(S)?|STORAGE{s}ENGINES|TABLE{s}TYPES|CO(LUMNS|LLATION)|BINLOG{s}EVENTS))?|UTDOWN|ARE)|NAPSHOT|CHE(MA(S)?|DULE(R)?)|T(R(ING|AIGHT_JOIN)|OP|A(RT(S|ING{s}BY)?|TUS))|I(GNED|MPLE)|O(ME|NAME|UNDS)|U(B(JECT|PARTITION(S)?)|SPEND|PER)|P(ECIFIC|ATIAL)|E(RIAL(IZABLE)?|SSION|NSITIVE|C(OND(_MICROSECOND)?|URITY)|T({s}(PASSWORD|NAMES|ONE_SHOT))?|PARATOR|LECT)|QL(STATE|_(B(IG_RESULT|UFFER_RESULT)|SMALL_RESULT|NO_CACHE|CA(CHE|LC_FOUND_ROWS)|T(SI_(M(INUTE|ONTH)|SECOND|HOUR|YEAR|DAY|QUARTER|FRAC_SECOND|WEEK)|HREAD))|EXCEPTION|WARNING)?|LAVE|AVEPOINT)|YEAR(_MONTH)?|T(R(IGGER(S)?|U(NCATE|E)|A(NSACTION|ILING))|H(EN|AN)|YPE|I(ME(STAMP(DIFF|ADD)?)?|NY(BLOB|TEXT|INT))|O|E(RMINATED{s}BY|XT|MP(TABLE|ORARY))|ABLE(S(PACE)?)?)|ZEROFILL|U(S(ING|E(R(_RESOURCES)?|_FRM)?|AGE)|N(SIGNED|COMMITTED|TIL|I(NSTALL|CODE|ON|QUE)|D(O(_BUFFER_SIZE|FILE)?|EFINED)|KNOWN|LOCK)|TC_(TIME(STAMP)?|DATE)|P(GRADE|DATE))|V(IEW|A(R(BINARY|YING|CHAR(ACTER)?|IABLES)|LUE(S)?))|W(RITE|H(ILE|E(RE|N))|ITH({s}PARSER)?|ORK|EEK|A(RNINGS|IT))) @@ -457,6 +457,7 @@ ON{s}(DUPLICATE{s}KEY{s}UPDATE)? OPEN OPTIMIZE OPTION +OPTIONS OPTIONALLY OR ORDER{s}BY -- cgit v1.2.3