SF.net SVN: geany:[4439] trunk - Commits

23 Nov 2009

Revision: 4439
          http://geany.svn.sourceforge.net/geany/?rev=4439&view=rev
Author:   eht16
Date:     2009-11-23 20:42:30 +0000 (Mon, 23 Nov 2009)
Log Message:
-----------
Remove duplicate regular expression for parsing classes.
Fix and improve parsing of constants (patch by Harold Aling, thanks).
Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tagmanager/php.c
Modified: trunk/ChangeLog
===================================================================

--- trunk/ChangeLog	2009-11-23 14:35:19 UTC (rev 4438)
+++ trunk/ChangeLog	2009-11-23 20:42:30 UTC (rev 4439)
@@ -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,
Modified: trunk/tagmanager/php.c
===================================================================
--- trunk/tagmanager/php.c	2009-11-23 14:35:19 UTC (rev 4438)
+++ trunk/tagmanager/php.c	2009-11-23 20:42:30 UTC (rev 4439)
@@ -72,12 +72,12 @@
 {
    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]*=",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

    