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

core/org.eclipse.cdt.core.tests/ChangeLog

@@ -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.

core/org.eclipse.cdt.core.tests/resources/search/include.h

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

core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/FunctionMethodPatternTests.java

@@ -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 );

core/org.eclipse.cdt.core/search/ChangeLog

@@ -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

core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/CSearchPattern.java

@@ -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;

core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MethodDeclarationPattern.java

@@ -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.