SF.net SVN: geany: [1016] trunk

[eht16 at users.sourceforge.net]

Revision: 1016
          http://svn.sourceforge.net/geany/?rev=1016&view=rev
Author:   eht16
Date:     2006-11-21 11:20:21 -0800 (Tue, 21 Nov 2006)

Log Message:
-----------
Applied patch from Bob Doan to parse PHP compile errors better (thanks).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/msgwindow.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-11-21 18:39:23 UTC (rev 1015)
+++ trunk/ChangeLog	2006-11-21 19:20:21 UTC (rev 1016)
@@ -8,6 +8,8 @@
    DnD for moving file tabs. Dropping files into Geany when file tabs
    are open still works because then it is handled by the Scintilla
    widget.
+ * src/msgwin.c: Applied patch from Bob Doan to parse PHP compile
+                 errors better (thanks).
 
 
 2006-11-18  Nick Treleaven  <nick.treleaven at btinternet.com>

Modified: trunk/src/msgwindow.c
===================================================================
--- trunk/src/msgwindow.c	2006-11-21 18:39:23 UTC (rev 1015)
+++ trunk/src/msgwindow.c	2006-11-21 19:20:21 UTC (rev 1016)
@@ -414,10 +414,24 @@
 		case GEANY_FILETYPES_PHP:
 		{
 			// Parse error: parse error, unexpected T_CASE in brace_bug.php on line 3
-			data.pattern = " ";
-			data.min_fields = 11;
-			data.line_idx = 10;
-			data.file_idx = 7;
+			// Parse error: syntax error, unexpected T_LNUMBER, expecting T_FUNCTION in bob.php on line 16
+			gchar *tmp = strstr(string, " in ");
+
+			if(tmp != NULL)
+			{
+				data.string = tmp;
+				data.pattern = " ";
+				data.min_fields = 6;
+				data.line_idx = 5;
+				data.file_idx = 2;
+			}
+			else
+			{
+				data.pattern = " ";
+				data.min_fields = 11;
+				data.line_idx = 10;
+				data.file_idx = 7;
+			}
 			break;
 		}
 		case GEANY_FILETYPES_PERL:
@@ -597,7 +611,7 @@
 																			gpointer user_data)
 {
 	// user_data might be NULL, GPOINTER_TO_INT returns 0 if called with NULL
-	
+
 	if (event->button == 1)
 	{
 		switch (GPOINTER_TO_INT(user_data))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.