From: <be...@us...> - 2008-08-29 16:07:10
|
Revision: 1846 http://geshi.svn.sourceforge.net/geshi/?rev=1846&view=rev Author: benbe Date: 2008-08-29 16:07:19 +0000 (Fri, 29 Aug 2008) Log Message: ----------- fix: INDEX wasn't highlighted as a keyword, although it should have been fix: Redid the keyword list to not contain spaces in keywords Modified Paths: -------------- trunk/geshi-1.0.X/src/geshi/mysql.php Modified: trunk/geshi-1.0.X/src/geshi/mysql.php =================================================================== --- trunk/geshi-1.0.X/src/geshi/mysql.php 2008-08-28 17:42:19 UTC (rev 1845) +++ trunk/geshi-1.0.X/src/geshi/mysql.php 2008-08-29 16:07:19 UTC (rev 1846) @@ -35,28 +35,31 @@ 'COMMENT_SINGLE' => array(1 =>'--', 2 => '#'), 'COMMENT_MULTI' => array('/*' => '*/'), 'CASE_KEYWORDS' => 1, - 'QUOTEMARKS' => array("'", '"'), + 'QUOTEMARKS' => array("'", '"', '`'), 'ESCAPE_CHAR' => '\\', 'KEYWORDS' => array( 1 => array( /* Mix */ - 'ALTER DATABASE', 'ALTER TABLE', 'CREATE DATABASE', 'CREATE INDEX', 'CREATE TABLE', 'DROP DATABASE', - 'DROP INDEX', 'DROP TABLE', 'RENAME TABLE', 'DELETE', 'DO', 'HANDLER', 'INSERT', 'LOAD DATA INFILE', - 'REPLACE', 'SELECT', 'TRUNCATE', 'UPDATE', 'DESCRIBE', 'USE', 'START TRANSACTION', 'COMMIT', 'ROLLBACK', - 'SAVEPOINT', 'ROLLBACK TO SAVEPOINT', 'LOCK TABLES', 'UNLOCK_TABLES', 'SET TRANACTIONS', 'SET', 'SHOW', - 'CREATE PROCEDURE', 'CREATE FUNCTION', 'ALTER PROCEDURE', 'ALTER FUNCTION', 'DROP PROCEDURE', 'DROP FUNCTION', - 'SHOW CREATE PROCEDURE', 'SHOW CREATE FUNCTION', 'SHOW PROCEDURE STATUS', 'SHOW FUNCTION STATUS', - 'CALL', 'BEGIN', 'END', 'DECLARE', 'CREATE ROUTINE', 'ALTER ROUTINE', 'CREATE', 'ALTER', 'DROP', - 'PRIMARY KEY', 'VALUES', 'INTO', 'FROM', - 'ANALYZE', 'BDB', 'BERKELEYDB', 'BTREE', 'BY', 'CASCADE', 'CHECK', 'COLUMN', 'COLUMNS', 'CONSTRAINT', - 'CROSS', 'DATABASES', 'DELAYED', 'DISTINCT', 'DISTINCTROW', 'ENCLOSED', 'ERRORS', 'ESCAPED', 'EXISTS', - 'EXPLAIN', 'FALSE', 'FIELDS', 'FORCE', 'FOREIGN', 'FULLTEXT', 'GEOMETRY', 'GRANT', 'GROUP', 'HASH', - 'HAVING', 'HELP', 'HIGH_PRIORITY', 'IGNORE', 'INNER', 'INNODB', 'INTERVAL', 'JOIN', 'KEYS', 'KILL', - 'LINES', 'LOW_PRIORITY', 'MASTER_SERVER_ID', 'MATCH', 'MIDDLEINT', 'MRG_MYISAM', 'NATURAL', 'OPTIMIZE', - 'OPTION', 'OPTIONALLY', 'ORDER', 'OUTER', 'OUTFILE', 'PRIVILEGES', 'PURGE', 'READ', 'REFERENCES', - 'REQUIRE', 'RESTRICT', 'RETURNS', 'REVOKE', 'RLIKE', 'RTREE', 'SOME', 'SONAME', 'SPATIAL', 'SQL_BIG_RESULT', - 'SQL_CALC_FOUND_ROWS', 'SQL_SMALL_RESULT', 'SSL', 'STARTING', 'STRAIGHT_JOIN', 'STRIPED', 'TERMINATED', - 'TRUE', 'TYPES', 'UNION', 'USAGE', 'USER_RESOURCES', 'USING', 'VARCHARACTER', 'WARNINGS', 'WHERE', 'WRITE', + 'ADD','ALTER','ANALYZE','BDB','BEGIN','BERKELEYDB','BTREE','BY', + 'CALL','CASCADE','CHECK','COLUMN','COLUMNS','COMMIT','CONSTRAINT', + 'CREATE','CROSS','DATA','DATABASE','DATABASES','DECLARE','DELAYED', + 'DELETE','DESCRIBE','DISTINCT','DISTINCTROW','DO','DROP','ENCLOSED', + 'END','ERRORS','ESCAPED','EXISTS','EXPLAIN','FALSE','FIELDS', + 'FORCE','FOREIGN','FROM','FULLTEXT','FUNCTION','GEOMETRY','GRANT', + 'GROUP','HANDLER','HASH','HAVING','HELP','HIGH_PRIORITY','IGNORE', + 'INDEX','INFILE','INNER','INNODB','INSERT','INTERVAL','INTO','JOIN', + 'KEY','KEYS','KILL','LINES','LOAD','LOCK','LOW_PRIORITY', + 'MASTER_SERVER_ID','MATCH','MIDDLEINT','MODIFY','MRG_MYISAM', + 'NATURAL','ON','OPTIMIZE','OPTION','OPTIONALLY','ORDER','OUTER', + 'OUTFILE','PRIMARY','PRIVILEGES','PROCEDURE','PURGE','READ', + 'REFERENCES','RENAME','REPLACE','REQUIRE','RESTRICT','RETURNS', + 'REVOKE','RLIKE','ROLLBACK','ROUTINE','RTREE','SAVEPOINT','SELECT', + 'SET','SHOW','SOME','SONAME','SPATIAL','SQL_BIG_RESULT', + 'SQL_CALC_FOUND_ROWS','SQL_SMALL_RESULT','SSL','START','STARTING', + 'STATUS','STRAIGHT_JOIN','STRIPED','TABLE','TABLES','TERMINATED', + 'TO','TRANSACTIONS','TRANSACTION','TRUE','TRUNCATE','TYPES','UNION', + 'UNLOCK_TABLES','UPDATE','USAGE','USE','USER_RESOURCES','USING', + 'VALUES','VARCHARACTER','WARNINGS','WHERE','WRITE', /* Control Flow Functions */ 'CASE', 'WHEN', 'THEN', 'ELSE', 'END', @@ -110,20 +113,17 @@ ), 'SYMBOLS' => array( ':=', - '||', 'OR', 'XOR', - '&&', 'AND', - 'NOT', - 'BETWEEN', 'CASE', 'WHEN', 'THEN', 'ELSE', - '=', '<=>', '>=', '>', '<=', '<', '<>', '!=', 'IS', 'LIKE', 'REGEXP', 'IN', + '||', + '&&', + '=', '<=>', '>=', '>', '<=', '<', '<>', '!=', '|', '&', '<<', '>>', '-', '+', - '*', '/', 'DIV', '%', 'MOD', + '*', '/', '%', '^', '~', '!', - 'BINARY', 'COLLATE', '(', ')', ), 'CASE_SENSITIVE' => array( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |