SF.net SVN: geany: [1280] trunk

[ntrel at users.sourceforge.net]

Revision: 1280
          http://svn.sourceforge.net/geany/?rev=1280&view=rev
Author:   ntrel
Date:     2007-02-14 09:35:54 -0800 (Wed, 14 Feb 2007)

Log Message:
-----------
Fix wrong D function return type after a class definition.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-02-14 12:50:15 UTC (rev 1279)
+++ trunk/ChangeLog	2007-02-14 17:35:54 UTC (rev 1280)
@@ -6,6 +6,8 @@
    Redraw instead of scrolling in ScintillaGTK::ScrollText if there is
    an existing update region.
    Revert earlier ScintillaGTK::ExposeTextThis change.
+ * tagmanager/c.c:
+   Fix wrong D function return type after a class definition.
 
 
 2007-02-13  Nick Treleaven  <nick.treleaven at btinternet.com>

Modified: trunk/tagmanager/c.c
===================================================================
--- trunk/tagmanager/c.c	2007-02-14 12:50:15 UTC (rev 1279)
+++ trunk/tagmanager/c.c	2007-02-14 17:35:54 UTC (rev 1280)
@@ -2309,11 +2309,15 @@
     boolean isEnd;
 
     if (isType (token, TOKEN_SEMICOLON))
-	isEnd = TRUE;
+		isEnd = TRUE;
     else if (isType (token, TOKEN_BRACE_CLOSE))
-	isEnd = (boolean) (isLanguage (Lang_java) || ! isContextualStatement (st));
+		/* Java, D, C# do not require semicolons to end a block. Neither do C++
+		 * namespaces. All other blocks require a semicolon to terminate them.
+		 */
+		isEnd = (boolean) (isLanguage (Lang_java) || isLanguage (Lang_d) ||
+				! isContextualStatement (st));
     else
-	isEnd = FALSE;
+		isEnd = FALSE;
 
     return isEnd;
 }


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