[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdevplatform/language/duchain/builders
From:       David Nolden <david.nolden.kde () art-master ! de>
Date:       2009-01-28 17:05:53
Message-ID: 1233162353.603946.2221.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 917857 by zwabel:

Assign namespace-contexts to namespace-declarations within \
eventuallyAssignInternalContext


 M  +8 -1      abstractdeclarationbuilder.h  


--- trunk/KDE/kdevplatform/language/duchain/builders/abstractdeclarationbuilder.h \
#917856:917857 @@ -189,7 +189,14 @@
       if( dynamic_cast<ClassFunctionDeclaration*>(currentDeclaration()) )
         Q_ASSERT( !static_cast<ClassFunctionDeclaration*>(currentDeclaration())->isConstructor() \
|| currentDeclaration()->context()->type() == DUContext::Class );  
-      if(LanguageSpecificDeclarationBuilderBase::lastContext() && \
(LanguageSpecificDeclarationBuilderBase::lastContext()->type() == DUContext::Class || \
LanguageSpecificDeclarationBuilderBase::lastContext()->type() == DUContext::Other || \
LanguageSpecificDeclarationBuilderBase::lastContext()->type() == DUContext::Function \
|| LanguageSpecificDeclarationBuilderBase::lastContext()->type() == \
DUContext::Template || LanguageSpecificDeclarationBuilderBase::lastContext()->type() \
== DUContext::Enum) ) +      if(LanguageSpecificDeclarationBuilderBase::lastContext() \
&&  +        (LanguageSpecificDeclarationBuilderBase::lastContext()->type() == \
DUContext::Class ||  +         \
LanguageSpecificDeclarationBuilderBase::lastContext()->type() == DUContext::Other ||  \
+         LanguageSpecificDeclarationBuilderBase::lastContext()->type() == \
DUContext::Function ||  +         \
LanguageSpecificDeclarationBuilderBase::lastContext()->type() == DUContext::Template \
||  +         LanguageSpecificDeclarationBuilderBase::lastContext()->type() == \
DUContext::Enum || +         \
(LanguageSpecificDeclarationBuilderBase::lastContext()->type() == \
DUContext::Namespace && currentDeclaration()->kind() == Declaration::Namespace) +     \
) )  {
         if( !LanguageSpecificDeclarationBuilderBase::lastContext()->owner() || \
!LanguageSpecificDeclarationBuilderBase::wasEncountered(LanguageSpecificDeclarationBuilderBase::lastContext()->owner()) \
) { //if the context is already internalContext of another declaration, leave it \
                alone
           currentDeclaration()->setInternalContext(LanguageSpecificDeclarationBuilderBase::lastContext());



[prev in list] [next in list] [prev in thread] [next in thread]