SF.net SVN: geany:[4830] trunk

eht16 at users.sourceforge.net eht16 at xxxxx
Sat Apr 17 16:12:32 UTC 2010


Revision: 4830
          http://geany.svn.sourceforge.net/geany/?rev=4830&view=rev
Author:   eht16
Date:     2010-04-17 16:12:32 +0000 (Sat, 17 Apr 2010)

Log Message:
-----------
Fix wrong parsing of function arguments when those contain nested brackets (as reported by Harold Aling).

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-04-17 16:12:22 UTC (rev 4829)
+++ trunk/ChangeLog	2010-04-17 16:12:32 UTC (rev 4830)
@@ -10,6 +10,8 @@
    Add missing documentation for 'Reset Zoom' keybinding.
  * tagmanager/php.c:
    Another attempt to fix the PHP parser regexp for parsing functions.
+   Fix wrong parsing of function arguments when those contain nested
+   brackets (as reported by Harold Aling).
 
 
 2010-04-11  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/tagmanager/php.c
===================================================================
--- trunk/tagmanager/php.c	2010-04-17 16:12:22 UTC (rev 4829)
+++ trunk/tagmanager/php.c	2010-04-17 16:12:32 UTC (rev 4830)
@@ -80,7 +80,7 @@
 	addTagRegex(language, "^[ \t]*const[ \t]*([" ALPHA "_][" ALNUM "_]*)[ \t]*[=;]",
 		"\\1", "m,macro,macros", NULL);
 	addCallbackRegex(language,
-	"^[ \t]*[(public|protected|private|static)[ \t]*]*[ \t]*function[ \t]+&?[ \t]*([" ALPHA "_][" ALNUM "_]*)[[:space:]]*(\\([^)]*\\))",
+	"^[ \t]*[(public|protected|private|static)[ \t]*]*[ \t]*function[ \t]+&?[ \t]*([" ALPHA "_][" ALNUM "_]*)[[:space:]]*(\\(.*\\))",
 			NULL, function_cb);
 	addTagRegex(language, "^[ \t]*(\\$|::\\$|\\$this->)([" ALPHA "_][" ALNUM "_]*)[ \t]*=",
 		"\\2", "v,variable,variables", NULL);


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