Remove duplicate regular expression for parsing classes.

Fix and improve parsing of constants (patch by Harold Aling, thanks).

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4439 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2009-11-23 20:42:30 +00:00
parent 20c64d5efa
commit 97c43a05d3
2 changed files with 10 additions and 3 deletions

View File

@ -1,3 +1,10 @@
2009-11-23 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* tagmanager/php.c:
Remove duplicate regular expression for parsing classes.
Fix and improve parsing of constants (patch by Harold Aling, thanks).
2009-11-22 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/toolbar.c, src/geanymenubuttonaction.c,

View File

@ -70,14 +70,14 @@ static kindOption PhpKinds [] = {
static void installPHPRegex (const langType language)
{
addTagRegex(language, "^[ \t]*((final|abstract)[ \t]+)*class[ \t]+([" ALPHA "_][" ALNUM "_]*)",
"\\3", "c,class,classes", NULL);
addTagRegex(language, "^[ \t]*((final|abstract)[ \t]+)*class[ \t]+([" ALPHA "_][" ALNUM "_]*)",
"\\3", "c,class,classes", NULL);
addTagRegex(language, "^[ \t]*interface[ \t]+([" ALPHA "_][" ALNUM "_]*)",
"\\1", "i,interface,interfaces", NULL);
addTagRegex(language, "^[ \t]*define[ \t]*\\([ \t]*['\"]?([" ALPHA "_][" ALNUM "_]*)",
"\\1", "d,define,constant definitions", NULL);
"\\1", "m,macro,macros", NULL);
addTagRegex(language, "^[ \t]*const[ \t]*([" ALPHA "_][" ALNUM "_]*)[ \t]*[=;]",
"\\1", "m,macro,macros", NULL);
addTagRegex(language, "^[ \t]*((public|protected|private|static)[ \t]+)*function[ \t]+&?[ \t]*([" ALPHA "_][" ALNUM "_]*)",
"\\3", "f,function,functions", NULL);
addTagRegex(language, "^[ \t]*(\\$|::\\$|\\$this->)([" ALPHA "_][" ALNUM "_]*)[ \t]*=",