SF.net SVN: geany: [1281] branches/geany-0.10.1

[ntrel at users.sourceforge.net]

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

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

Modified Paths:
--------------
    branches/geany-0.10.1/NEWS
    branches/geany-0.10.1/tagmanager/c.c

Modified: branches/geany-0.10.1/NEWS
===================================================================
--- branches/geany-0.10.1/NEWS	2007-02-14 17:35:54 UTC (rev 1280)
+++ branches/geany-0.10.1/NEWS	2007-02-14 17:43:19 UTC (rev 1281)
@@ -29,6 +29,7 @@
     * Fixed several issues while opening files and improved code.
     * Improved the auto scrolling of documents and fixed a bug when
       opening files remotely.
+    * Fixed wrong D function return type after a class definition.
 
     Internationalisation:
     * New translations: fi (thanks to Harri Koskinen).

Modified: branches/geany-0.10.1/tagmanager/c.c
===================================================================
--- branches/geany-0.10.1/tagmanager/c.c	2007-02-14 17:35:54 UTC (rev 1280)
+++ branches/geany-0.10.1/tagmanager/c.c	2007-02-14 17:43:19 UTC (rev 1281)
@@ -2220,12 +2220,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.