diff options
author | John Camelon | 2003-10-01 21:15:45 +0000 |
---|---|---|
committer | John Camelon | 2003-10-01 21:15:45 +0000 |
commit | e63b06fc5fb272921fc03697c3b8acb14d3f7283 (patch) | |
tree | 760f1371ac7eb6c0c97719e5ac39ba78b5fc6c07 /core/org.eclipse.cdt.core/parser | |
parent | 9b33f17d3f9e3c295cf830f4d3a26130e318ede0 (diff) | |
download | org.eclipse.cdt-e63b06fc5fb272921fc03697c3b8acb14d3f7283.tar.gz org.eclipse.cdt-e63b06fc5fb272921fc03697c3b8acb14d3f7283.tar.xz org.eclipse.cdt-e63b06fc5fb272921fc03697c3b8acb14d3f7283.zip |
Patch for Andrew Niefer
core:
PST changes:
- modify lookupConstructor to copy the constructor list before resolving
on it
- modify checkUserDefinedConversionSequence the same way
- modify isValidFunctionOverload to check for forward declarations
core.tests:
- added testBug43951 to CompleteParseASTTest
Diffstat (limited to 'core/org.eclipse.cdt.core/parser')
-rw-r--r-- | core/org.eclipse.cdt.core/parser/ChangeLog | 7 | ||||
-rw-r--r-- | core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/pst/ParserSymbolTable.java | 15 |
2 files changed, 20 insertions, 2 deletions
diff --git a/core/org.eclipse.cdt.core/parser/ChangeLog b/core/org.eclipse.cdt.core/parser/ChangeLog index 24411a308bf..326074b112d 100644 --- a/core/org.eclipse.cdt.core/parser/ChangeLog +++ b/core/org.eclipse.cdt.core/parser/ChangeLog @@ -3,6 +3,13 @@ Fixed Bug 43997 : Search results: selection includes preceding whitespace Fixed Bug 44034 : Scanner failure on #undef +2003-10-01 Andrew Niefer + bug43951 - search on ctor declarations returns definition too. + PST changes: + - modify lookupConstructor to copy the constructor list before resolving on it + - modify checkUserDefinedConversionSequence the same way + - modify isValidFunctionOverload to check for forward declarations + 2003-10-01 Bogdan Gheorghe Modified CDT log dump in Parser.fetchToken to include error message diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/pst/ParserSymbolTable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/pst/ParserSymbolTable.java index 869c4523184..bedd39d3cfb 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/pst/ParserSymbolTable.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/pst/ParserSymbolTable.java @@ -512,6 +512,12 @@ public class ParserSymbolTable { return false; } + //handle forward decls + if( origSymbol.getTypeInfo().isForwardDeclaration() && + origSymbol.getTypeSymbol() == newSymbol ) + { + return true; + } if( origSymbol.hasSameParameters( newSymbol ) ){ //functions with the same name and same parameter types cannot be overloaded if any of them //is static @@ -1473,7 +1479,8 @@ public class ParserSymbolTable { } if( container.getConstructors() != null ){ - constructor = resolveFunction( data, container.getConstructors() ); + LinkedList constructors = new LinkedList( container.getConstructors() ); + constructor = resolveFunction( data, constructors ); } if( constructor != null && constructor.getTypeInfo().checkBit( TypeInfo.isExplicit ) ){ constructor = null; @@ -3294,7 +3301,11 @@ public class ParserSymbolTable { LookupData data = new LookupData( EMPTY_NAME, TypeInfo.t_constructor, null ); data.parameters = parameters; - return ParserSymbolTable.resolveFunction( data, getConstructors() ); + List constructors = new LinkedList(); + if( getConstructors() != null ) + constructors.addAll( getConstructors() ); + + return ParserSymbolTable.resolveFunction( data, constructors ); } /** |