From faa7a2eb4f05974fb88c0c4f19a1d5b853542b23 Mon Sep 17 00:00:00 2001 From: Nick Treleaven Date: Fri, 6 Nov 2009 17:24:31 +0000 Subject: [PATCH] Quick hack to parse contents of D extern{} and version{} blocks. git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4408 ea778897-0a13-0410-b9d1-a72fbfd435f5 --- ChangeLog | 2 ++ tagmanager/c.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 702633ee..6898ba9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ (Ignore some more D keywords). * tagmanager/c.c: Fix creating D interface tags properly. + * tagmanager/c.c: + Parse contents of D extern{} and version{} blocks. 2009-11-05 Enrico Tröger diff --git a/tagmanager/c.c b/tagmanager/c.c index d00099f2..d7b9c8fa 100644 --- a/tagmanager/c.c +++ b/tagmanager/c.c @@ -394,7 +394,8 @@ static const keywordDesc KeywordTable [] = { { "event", KEYWORD_EVENT, { 0, 0, 1, 0, 1, 0, 0 } }, { "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, 1 } }, + { "extern", KEYWORD_EXTERN, { 1, 1, 1, 0, 1, 1, 0 } }, + { "extern", KEYWORD_NAMESPACE, { 0, 0, 0, 0, 0, 0, 1 } }, /* hack to ignore extern */ { "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 } }, @@ -470,6 +471,7 @@ static const keywordDesc KeywordTable [] = { { "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 */ { "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 } },