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

List:       kde-commits
Subject:    KDE/kdevplatform/language/duchain
From:       David Nolden <david.nolden.kde () art-master ! de>
Date:       2008-05-31 19:06:08
Message-ID: 1212260768.033406.12896.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 814955 by zwabel:

Make the handling of visible declarations when searching from within class-contexts \
fit the specification in iso c++



 M  +5 -5      ducontext.cpp  


--- trunk/KDE/kdevplatform/language/duchain/ducontext.cpp #814954:814955
@@ -494,7 +494,7 @@
 
   foreach (Declaration* declaration, resolved)
     if (!dataType || dataType == declaration->abstractType())
-      if (type() == Class || type() == Template || position > \
declaration->range().start || !position.isValid()) +      if (type() == Class || \
type() == Template || position > declaration->range().start || !position.isValid()) \
///@todo This is C++-specific  ret.append(declaration);
 
   if (tryToResolve.isEmpty() && ensureResolution.isEmpty())
@@ -517,7 +517,7 @@
 
   foreach (Declaration* declaration, resolved)
     if (!dataType || dataType == declaration->abstractType())
-      if (type() == Class || position >= declaration->range().start || \
!position.isValid()) +      if (type() == Class || position >= \
declaration->range().start || !position.isValid()) ///@todo This is C++-specific  \
ret.append(declaration);  
   if (!ret.isEmpty())
@@ -541,7 +541,7 @@
 
   foreach (Declaration* declaration, resolved)
     if (!dataType || dataType == declaration->abstractType())
-      if (type() == Class || position >= declaration->range().start || \
!position.isValid()) +      if (type() == Class || position >= \
declaration->range().start || !position.isValid()) ///@todo This is C++-specific  \
ret.append(declaration);  
   //if (!ret.isEmpty())
@@ -764,7 +764,7 @@
 
   QHash<const DUContext*, bool> hadContexts;
   // Iterate back up the chain
-  mergeDeclarationsInternal(ret, type() == DUContext::Class ? \
SimpleCursor::invalid() : position, hadContexts, topContext ? \
topContext->importTrace(this->topContext()) : ImportTrace(), searchInParents); +  \
mergeDeclarationsInternal(ret, position, hadContexts, topContext ? \
topContext->importTrace(this->topContext()) : ImportTrace(), searchInParents);  
   return ret;
 }
@@ -819,7 +819,7 @@
   }
 
   if (searchInParents && parentContext())                            ///Only respect \
                the position if the parent-context is not a class(@todo this is \
                language-dependent)
-    parentContext()->mergeDeclarationsInternal(definitions, (parentContext()->type() \
!= DUContext::Class) ? position : SimpleCursor::invalid(), hadContexts, trace, true, \
currentDepth+1); +    parentContext()->mergeDeclarationsInternal(definitions, \
position, hadContexts, trace, true, currentDepth+1);  }
 
 void DUContext::deleteLocalDeclarations()


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