SF.net SVN: geany:[4212] trunk

[eht16 at users.sourceforge.net]

Revision: 4212
          http://geany.svn.sourceforge.net/geany/?rev=4212&view=rev
Author:   eht16
Date:     2009-09-20 19:06:48 +0000 (Sun, 20 Sep 2009)

Log Message:
-----------
Merge recent changes from the CTags project to further improve PHP symbol parsing.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tagmanager/php.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-09-20 18:46:56 UTC (rev 4211)
+++ trunk/ChangeLog	2009-09-20 19:06:48 UTC (rev 4212)
@@ -4,9 +4,12 @@
    tagmanager/parsers.h, tagmanager/makefile.win32,
    tagmanager/abc.c, tagmanager/Makefile.am, data/filetypes.abc,
    data/filetype_extensions.conf, wscript:
+   Add new filetype: Abc (patch by Eric Forgeot, thanks).
+ * 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: trunk/tagmanager/php.c
===================================================================
--- trunk/tagmanager/php.c	2009-09-20 18:46:56 UTC (rev 4211)
+++ trunk/tagmanager/php.c	2009-09-20 19:06:48 UTC (rev 4212)
@@ -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.