SF.net SVN: geany:[4618] branches/geany-0.18.1

[eht16 at users.sourceforge.net]

Revision: 4618
          http://geany.svn.sourceforge.net/geany/?rev=4618&view=rev
Author:   eht16
Date:     2010-01-31 21:51:00 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
Backport from trunk:
Remove duplicate regular expression for parsing classes.
Fix and improve parsing of constants (patch by Harold Aling, thanks).

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:29:12 UTC (rev 4617)
+++ branches/geany-0.18.1/ChangeLog	2010-01-31 21:51:00 UTC (rev 4618)
@@ -30,12 +30,20 @@
    Kurt de Bree into section of previous translators.
 
 
+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>
 
  * tagmanager/latex.c:
    Improve parsing of sections and chapters by ignoring shortnames
    like \section[shortname]{label} (closes #2890477).
 
+
 2009-11-17  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * doc/geany.txt:

Modified: branches/geany-0.18.1/tagmanager/php.c
===================================================================
--- branches/geany-0.18.1/tagmanager/php.c	2010-01-31 16:29:12 UTC (rev 4617)
+++ branches/geany-0.18.1/tagmanager/php.c	2010-01-31 21:51:00 UTC (rev 4618)
@@ -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.