SF.net SVN: geany:[4603] branches/geany-0.18.1
eht16 at users.sourceforge.net
eht16 at xxxxx
Sun Jan 31 16:23:31 UTC 2010
Revision: 4603
http://geany.svn.sourceforge.net/geany/?rev=4603&view=rev
Author: eht16
Date: 2010-01-31 16:23:31 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
Backport from trunk:
Merge recent changes from the CTags project to further improve PHP symbol parsing.
Modified Paths:
--------------
branches/geany-0.18.1/ChangeLog
branches/geany-0.18.1/tagmanager/php.c
Modified: branches/geany-0.18.1/ChangeLog
===================================================================
--- branches/geany-0.18.1/ChangeLog 2010-01-31 16:22:59 UTC (rev 4602)
+++ branches/geany-0.18.1/ChangeLog 2010-01-31 16:23:31 UTC (rev 4603)
@@ -78,6 +78,13 @@
browser delay on displaying a big directory, e.g. /usr/bin.
+2009-09-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * tagmanager/php.c:
+ Merge recent changes from the CTags project to further improve
+ PHP symbol parsing.
+
+
2009-09-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/printing.c:
Modified: branches/geany-0.18.1/tagmanager/php.c
===================================================================
--- branches/geany-0.18.1/tagmanager/php.c 2010-01-31 16:22:59 UTC (rev 4602)
+++ branches/geany-0.18.1/tagmanager/php.c 2010-01-31 16:23:31 UTC (rev 4603)
@@ -70,18 +70,20 @@
static void installPHPRegex (const langType language)
{
- addTagRegex(language, "(^|[ \t])class[ \t]+([" ALPHA "_][" ALNUM "_]*)",
- "\\2", "c,class,classes", NULL);
- addTagRegex(language, "(^|[ \t])interface[ \t]+([" ALPHA "_][" ALNUM "_]*)",
- "\\2", "i,interface,interfaces", NULL);
- addTagRegex(language, "(^|[ \t])define[ \t]*\\([ \t]*['\"]?([" ALPHA "_][" ALNUM "_]*)",
- "\\2", "d,macro,constant definitions", NULL);
+ 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);
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]*=",
+ addTagRegex(language, "^[ \t]*(\\$|::\\$|\\$this->)([" ALPHA "_][" ALNUM "_]*)[ \t]*=",
+ "\\2", "v,variable,variables", NULL);
+ addTagRegex(language, "^[ \t]*((var|public|protected|private|static)[ \t]+)+\\$([" ALPHA "_][" ALNUM "_]*)[ \t]*[=;]",
"\\3", "v,variable,variables", NULL);
- addTagRegex(language, "(^|[ \t])(var|public|protected|private|static)[ \t]+\\$([" ALPHA "_][" ALNUM "_]*)[ \t]*[=;]",
- "\\3", "v,variable,variables", NULL);
/* function regex is covered by PHP regex */
addTagRegex (language, "(^|[ \t])([A-Za-z0-9_]+)[ \t]*[=:][ \t]*function[ \t]*\\(",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list