HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore D unittest blocks.

Browse Source 
Parse D template functions with constraints.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5296 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2010-10-15 16:04:38 +00:00
parent 0007f904e6
commit 6a012dd73e
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -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>

10
tagmanager/c.c
View File

@ -421,7 +421,7 @@ static const keywordDesc KeywordTable [] = {
{ "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 @@ static const keywordDesc KeywordTable [] = {
{ "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 @@ static boolean skipPostArgumentStuff (statementInfo *const st,
{
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: