[cdt-patch] Fix for bug 43862

[Andrew Niefer <aniefer@xxxxxxxxxx>]

Core:
-fix bug43862 - Cannot find macro delcarations using all occurences.
  * modified CSearchPattern.createMacroPattern()

Core.tests:
Updated OtherPatternTests::testMacroPattern() to test for bug43862

tested on Windows & linux

-Andrew

Index: search/ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/search/ChangeLog,v
retrieving revision 1.33
diff -u -r1.33 ChangeLog
--- search/ChangeLog	30 Sep 2003 14:10:23 -0000	1.33
+++ search/ChangeLog	30 Sep 2003 17:18:38 -0000
@@ -1,3 +1,7 @@
+2003-09-30 Andrew Niefer
+	-fix bug43862 - Cannot find macro delcarations using all occurences.
+	  * modified CSearchPattern.createMacroPattern
+
 2003-09-29 Andrew Niefer
 	- fix bug 43062 outline is confused on operator methods containing spaces
 		- modify CSearchPattern.scanForNames to use same naming convention as TokenDuple.toString()
Index: search/org/eclipse/cdt/internal/core/search/matching/CSearchPattern.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/CSearchPattern.java,v
retrieving revision 1.26
diff -u -r1.26 CSearchPattern.java
--- search/org/eclipse/cdt/internal/core/search/matching/CSearchPattern.java	30 Sep 2003 13:42:40 -0000	1.26
+++ search/org/eclipse/cdt/internal/core/search/matching/CSearchPattern.java	30 Sep 2003 17:18:38 -0000
@@ -132,10 +132,11 @@
 	 * @return
 	 */
 	private static CSearchPattern createMacroPattern(String patternString, LimitTo limitTo, int matchMode, boolean caseSensitive) {
-		if( limitTo != DECLARATIONS )
+		if( limitTo != DECLARATIONS && limitTo != ALL_OCCURRENCES )
 			return null;
 			
-		return new MacroDeclarationPattern( patternString.toCharArray(), matchMode, limitTo, caseSensitive );	}
+		return new MacroDeclarationPattern( patternString.toCharArray(), matchMode, DECLARATIONS, caseSensitive );	
+	}
 
 	/**
 	 * @param patternString

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core.tests/ChangeLog,v
retrieving revision 1.124
diff -u -r1.124 ChangeLog
--- ChangeLog	30 Sep 2003 14:10:28 -0000	1.124
+++ ChangeLog	30 Sep 2003 17:10:46 -0000
@@ -1,3 +1,6 @@
+2003-09-30 Andrew Niefer
+	Updated OtherPatternTests::testMacroPattern() to test for bug43862
+
 2003-09-29 Andrew Niefer
 	added testBug43062 and testConstructorDestructor to FunctionMethodPatternTests
 	modified resources/search/classDecl.cpp & include.h to include more operators and a constructor
Index: search/org/eclipse/cdt/core/search/tests/OtherPatternTests.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/OtherPatternTests.java,v
retrieving revision 1.16
diff -u -r1.16 OtherPatternTests.java
--- search/org/eclipse/cdt/core/search/tests/OtherPatternTests.java	30 Sep 2003 14:10:28 -0000	1.16
+++ search/org/eclipse/cdt/core/search/tests/OtherPatternTests.java	30 Sep 2003 17:10:46 -0000
@@ -195,6 +195,11 @@
 		IMatch match = (IMatch) matches.iterator().next();
 		assertTrue( match.getName().equals( "FOO" ) );
 		assertTrue( match.getParentName().equals( "" ));
+		
+		pattern = SearchEngine.createSearchPattern( "FOO", MACRO, ALL_OCCURRENCES, true );
+		search( workspace, pattern, scope, resultCollector );
+		matches = resultCollector.getSearchResults();
+		assertEquals( matches.size(), 1 );
 	}
 	
 	public void testEnumerators(){