SF.net SVN: geany:[5296] trunk

[ntrel at users.sourceforge.net]

Revision: 5296
          http://geany.svn.sourceforge.net/geany/?rev=5296&view=rev
Author:   ntrel
Date:     2010-10-15 16:04:38 +0000 (Fri, 15 Oct 2010)

Log Message:
-----------
Ignore D unittest blocks.
Parse D template functions with constraints.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-10-15 12:17:22 UTC (rev 5295)
+++ trunk/ChangeLog	2010-10-15 16:04:38 UTC (rev 5296)
@@ -2,6 +2,9 @@
 
  * tagmanager/get.c:
    Ignore D /+ +/ comments.
+ * tagmanager/c.c:
+   Ignore D unittest blocks.
+   Parse D template functions with constraints.
 
 
 2010-10-08  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/tagmanager/c.c
===================================================================
--- trunk/tagmanager/c.c	2010-10-15 12:17:22 UTC (rev 5295)
+++ trunk/tagmanager/c.c	2010-10-15 16:04:38 UTC (rev 5296)
@@ -421,7 +421,7 @@
 	{ "explicit",       KEYWORD_EXPLICIT,       { 0, 1, 1, 0, 0, 0, 1 } },
 	{ "extends",        KEYWORD_EXTENDS,        { 0, 0, 0, 1, 1, 0, 0 } },
 	{ "extern",         KEYWORD_EXTERN,         { 1, 1, 1, 0, 1, 1, 0 } },
-	{ "extern",         KEYWORD_NAMESPACE,      { 0, 0, 0, 0, 0, 0, 1 } },	/* hack to ignore extern */
+	{ "extern",         KEYWORD_NAMESPACE,      { 0, 0, 0, 0, 0, 0, 1 } },	/* parse block */
 	{ "final",          KEYWORD_FINAL,          { 0, 0, 0, 1, 0, 0, 1 } },
 	{ "finally",        KEYWORD_FINALLY,        { 0, 0, 0, 0, 0, 1, 1 } },
 	{ "float",          KEYWORD_FLOAT,          { 1, 1, 1, 1, 0, 1, 1 } },
@@ -494,10 +494,11 @@
 	{ "uint",           KEYWORD_UINT,           { 0, 0, 1, 0, 0, 1, 1 } },
 	{ "ulong",          KEYWORD_ULONG,          { 0, 0, 1, 0, 0, 1, 1 } },
 	{ "union",          KEYWORD_UNION,          { 1, 1, 0, 0, 0, 0, 1 } },
+	{ "unittest",       KEYWORD_BODY,           { 0, 0, 0, 0, 0, 0, 1 } },	/* ignore */
 	{ "unsigned",       KEYWORD_UNSIGNED,       { 1, 1, 1, 0, 0, 0, 1 } },
 	{ "ushort",         KEYWORD_USHORT,         { 0, 0, 1, 0, 0, 1, 1 } },
 	{ "using",          KEYWORD_USING,          { 0, 1, 1, 0, 0, 1, 0 } },
-	{ "version",        KEYWORD_NAMESPACE,      { 0, 0, 0, 0, 0, 0, 1 } },	/* hack to ignore version */
+	{ "version",        KEYWORD_NAMESPACE,      { 0, 0, 0, 0, 0, 0, 1 } },	/* parse block */
 	{ "virtual",        KEYWORD_VIRTUAL,        { 0, 1, 1, 0, 1, 1, 0 } },
 	{ "void",           KEYWORD_VOID,           { 1, 1, 1, 1, 1, 1, 1 } },
 	{ "volatile",       KEYWORD_VOLATILE,       { 1, 1, 1, 1, 0, 0, 1 } },
@@ -2183,9 +2184,12 @@
 				{
 					readIdentifier (token, c);
 					if (isLanguage(Lang_d))
-					{	/* parse D contracts */
+					{
 						switch (token->keyword)
 						{
+							/* template constraint */
+							case KEYWORD_IF:
+							/* contracts */
 							case KEYWORD_IN:
 							case KEYWORD_OUT:
 							case KEYWORD_BODY:


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