mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

Patch for Bogdan : Search for function with no parameters VS ignore parameters.

Browse source
This commit is contained in:
Hoda Amer 2004-02-09 15:46:40 +00:00
parent 90c0309950
commit 2937f68a8c
6 changed files with 314 additions and 269 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/org.eclipse.cdt.core.tests/ChangeLog
View file

@ -1,3 +1,6 @@
2004-02-06 Bogdan Gheorghe
Added FunctionMethodPatternTests.testMethodDeclarationWithNoParameters
2004-02-08 John Camelon
Moved testErrorHandling_1() from failed tests to CompleteParseASTTest.
Moved testBug44340() from failed tests to CompleteParseASTTest.

2
core/org.eclipse.cdt.core.tests/resources/search/include.h
View file

@ -27,6 +27,8 @@ void forwardFunction();
class Direction{
void turn();
void turn(int);
void turnAgain(void);
};
class Right : public Direction {
void turn() { }

23
core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/FunctionMethodPatternTests.java
View file

@ -105,6 +105,27 @@ public class FunctionMethodPatternTests extends BaseSearchTest {
assertEquals( matches.size(), 1 );
}
public void testMethodWithNoParameters(){
ICSearchPattern pattern = SearchEngine.createSearchPattern( "turn( )", METHOD, DECLARATIONS, true );
search( workspace, pattern, scope, resultCollector );
Set matches = resultCollector.getSearchResults();
assertEquals( matches.size(), 2 );
pattern = SearchEngine.createSearchPattern( "turn(void)", METHOD, DECLARATIONS, true );
search( workspace, pattern, scope, resultCollector );
matches = resultCollector.getSearchResults();
assertEquals( matches.size(), 2 );
pattern = SearchEngine.createSearchPattern( "turnAgain()", METHOD, DECLARATIONS, true );
search( workspace, pattern, scope, resultCollector );
matches = resultCollector.getSearchResults();
assertEquals( matches.size(), 1 );
}
public void testOperators_bug43063_bug42979(){
ICSearchPattern pattern = SearchEngine.createSearchPattern( "operator \\*", METHOD, DECLARATIONS, true );
@ -196,7 +217,7 @@ public class FunctionMethodPatternTests extends BaseSearchTest {
ICSearchPattern pattern = SearchEngine.createSearchPattern( "turn", METHOD, DECLARATIONS, true );
search( workspace, pattern, scope, resultCollector );
Set matches = resultCollector.getSearchResults();
assertEquals( matches.size(), 2 );
assertEquals( matches.size(), 3 );
pattern = SearchEngine.createSearchPattern( "Direction::turn", METHOD, DEFINITIONS, true );
search( workspace, pattern, scope, resultCollector );

7
core/org.eclipse.cdt.core/search/ChangeLog
View file

@ -1,3 +1,10 @@
2004-02-06 Bogdan Gheorghe
- Modified CSearchPattern.scanforParameters. If no parameters are passed in
as part of a function/method search, void is assigned as a parameter type.
- Modified MethodDeclarationPattern to check for void parameter types
2004-02-05 Alain Magloire
PR 51221
Reformat Patch from Bogdan base on Thomas Fletcher original patch

6
core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/CSearchPattern.java
View file

@ -452,6 +452,12 @@ public abstract class CSearchPattern implements ICSearchConstants, ICSearchPatte
param = getParamString( (IASTParameterDeclaration)parameters.next() );
list.add( param );
}
if (param == null){
//This means that no params have been added (i.e. empty brackets - void case)
param = "void ".toCharArray();
list.add (param);
}
}
return list;

6
core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MethodDeclarationPattern.java
View file

@ -96,11 +96,17 @@ public class MethodDeclarationPattern extends CSearchPattern {
}
}
//parameters
if( parameterNames != null && parameterNames.length > 0 && parameterNames[0].length > 0 ){
Iterator params = function.getParameters();
if (!params.hasNext() && CharOperation.equals(parameterNames[0], "void ".toCharArray())){
//All empty lists have transformed to void, this function has no parms
return ACCURATE_MATCH;
}
for( int i = 0; i < parameterNames.length; i++ ){
//if this function doesn't have this many parameters, it is not a match.