Thread: [Lxr-commits] CVS: lxr/lib/LXR/Lang ectags.conf,1.2,1.3 generic.conf,1.12,1.13
Brought to you by:
ajlittoz
From: Dave B. <bro...@us...> - 2004-07-13 13:35:57
|
Update of /cvsroot/lxr/lxr/lib/LXR/Lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8011/lib/LXR/Lang Modified Files: ectags.conf generic.conf Log Message: fix shell comment terminator; more SQL regex tweaking (isn't this fun?) Index: ectags.conf =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/ectags.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ectags.conf 7 Jul 2004 20:46:42 -0000 1.2 +++ ectags.conf 13 Jul 2004 13:35:48 -0000 1.3 @@ -11,17 +11,18 @@ --regex-VB=/^[ \t]*(Public|Private|\b)[ \t]*Enum[ \t]+([a-zA-Z0-9_]+)/\2/e,enum/i --regex-VB=/^([a-zA-Z_]+):/\1/l,label/i ---regex-comment= we define SQL2 with regexps because the built-in SQL parsing doesn't work right +--regex-comment= we define SQL2 with regexps because the built-in SQL parsing doesn't work right; unfortunately this indexes supposed identifiers in comments so we have to make the regexps as restrictive as possible. Often we get invalid field matches because comments include datatype keywords like 'date', so the field regexp has an ugly hack that you can't have any words between the beginning of a line and the identifier before the datatype --langdef=SQL2 --langmap=SQL2:.sql ---regex-SQL2=/CREATE[ \t]+TABLE[ \t]+([a-zA-Z_][a-zA-Z0-9_]*)/\1/t,table/i ---regex-SQL2=/([a-zA-Z_][a-zA-Z0-9_]*)[ \t]+(number|varchar|varchar2|bool|boolean|bit|character|char|text|smallint|int|bigint|integer|real|double|float|date|time|timestamp|interval|long|wchar|varwchar|longwvarchar|decimal|numeric|binary|varbinary|guid)[^a-zA-Z0-9_]/\1/f,field/i +--regex-SQL2=/^[ \t]*CREATE[ \t]+([a-zA-Z0-9 \t]*)?TABLE[ \t]+([^.]+\.)?"?([a-zA-Z0-9_@.]+)/\3/t,table/i +--regex-SQL2=/^[ \t]*CREATE[ \t]+([a-zA-Z0-9 \t]*)?VIEW[ \t]+([^.]+\.)?"?([a-zA-Z0-9_@.]+)/\3/v,view/i +--regex-SQL2=/^[^a-zA-Z0-9_]*([a-zA-Z_][a-zA-Z0-9_]*)[ \t]+(number|varchar|varchar2|bool|boolean|bit|character|char|text|smallint|int|bigint|integer|real|double|float|date|time|timestamp|interval|long|wchar|varwchar|longwvarchar|decimal|numeric|binary|varbinary|guid)([^a-zA-Z0-9_]|$)/\1/f,field/i --regex-SQL2=/[^a-zA-Z0-9_]CONSTRAINT[ \t]+([a-zA-Z_][a-zA-Z0-9_]*)/\1/c,constraint/i ---regex-SQL2=/[^a-zA-Z0-9_]FUNCTION[ \t]+([a-zA-Z_][a-zA-Z0-9_]*)/\1/F,function/i ---regex-SQL2=/[^a-zA-Z0-9_]PROCEDURE[ \t]+([a-zA-Z_][a-zA-Z0-9_]*)/\1/P,procedure/i ---regex-SQL2=/[^a-zA-Z0-9_]CURSOR[ \t]+([a-zA-Z_][a-zA-Z0-9_]*)/\1/C,cursor/i ---regex-SQL2=/CREATE[ \t]+INDEX[ \t]+([a-zA-Z_][a-zA-Z0-9_]*)/\1/i,index/i ---regex-SQL2=/CREATE[ \t]+SEQUENCE[ \t]+([a-zA-Z_][a-zA-Z0-9_]*)/\1/s,sequence/i ---regex-SQL2=/CREATE[ \t+](OR[ \t]+REPLACE[ \t]+)?TRIGGER[ \t]+([a-zA-Z_][a-zA-Z0-9_]*)/\2/T,trigger/i ---regex-SQL2=/CREATE[ \t+](OR[ \t]+REPLACE[ \t]+)?PACKAGE[ \t]+(BODY){0}([a-zA-Z_][a-zA-Z0-9_]*)/\3/p,package/i +--regex-SQL2=/^[ \t]*FUNCTION[ \t]+([a-zA-Z_][a-zA-Z0-9_]*)/\1/F,function/i +--regex-SQL2=/^[ \t]*PROCEDURE[ \t]+([a-zA-Z_][a-zA-Z0-9_]*)/\1/P,procedure/i +--regex-SQL2=/^[ \t]*CURSOR[ \t]+([a-zA-Z_][a-zA-Z0-9_]*)/\1/C,cursor/i +--regex-SQL2=/^[ \t]*CREATE[ \t]+([a-zA-Z0-9 \t]*)?INDEX[ \t]+([a-zA-Z_][a-zA-Z0-9_]*)/\2/i,index/i +--regex-SQL2=/^[ \t]*CREATE[ \t]+SEQUENCE[ \t]+([a-zA-Z_][a-zA-Z0-9_]*)/\1/s,sequence/i +--regex-SQL2=/^[ \t]*CREATE[ \t+](OR[ \t]+REPLACE[ \t]+)?TRIGGER[ \t]+([a-zA-Z_][a-zA-Z0-9_]*)/\2/T,trigger/i +--regex-SQL2=/^[ \t]*CREATE[ \t+](OR[ \t]+REPLACE[ \t]+)?PACKAGE[ \t]+(BODY[ \t]+)?([a-zA-Z_][a-zA-Z0-9_]*)/\3/p,package/i Index: generic.conf =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/generic.conf,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- generic.conf 7 Jul 2004 20:46:42 -0000 1.12 +++ generic.conf 13 Jul 2004 13:35:48 -0000 1.13 @@ -605,6 +605,7 @@ 'p' => 'package', 'i' => 'index', 's' => 'sequence', + 'v' => 'view', }, 'langid' => '11', }, @@ -669,7 +670,7 @@ 'for', 'do', 'done', 'case', 'esac', 'while', 'in', 'if', 'then', 'else', 'elif', 'fi', 'until', ], - 'spec' => ['comment', '#', '\$', + 'spec' => ['comment', '#', '$', 'string', '"', '"', 'string', "'", "'", ], |