[cdt-patch] [FIXED][76685] Outline view doesn't expand no param macros c

[Devin Steffler <Devin_Steffler@xxxxxxxxxx>]

[FIXED][76685] Outline view doesn't
expand no param macros correctly

Note:  patch only made for 2.0
stream as the bug doesn't effect CVS HEAD

Devin Steffler
IBM's Eclipse CDT
Ottawa (Palladium), Ontario, Canada

Index: parser/org/eclipse/cdt/core/parser/tests/CompleteParseASTTest.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/CompleteParseASTTest.java,v
retrieving revision 1.107.2.6
diff -u -r1.107.2.6 CompleteParseASTTest.java
--- parser/org/eclipse/cdt/core/parser/tests/CompleteParseASTTest.java	5 Oct 2004 18:51:46 -0000	1.107.2.6
+++ parser/org/eclipse/cdt/core/parser/tests/CompleteParseASTTest.java	21 Oct 2004 13:48:21 -0000
@@ -2121,4 +2121,12 @@
 		IASTTypeId typeId = (IASTTypeId) typeIds.next();
 		assertEquals(typeId.getTypeOrClassName(), "Thrown");
 	}
+    
+    public void testBug76685() throws Exception
+	{
+    	Writer writer = new StringWriter();
+    	writer.write( "#define foo() int\n" );
+    	writer.write( "foo() i;" );
+    	parse( writer.toString() );
+	}
 }

Index: parser/org/eclipse/cdt/internal/core/parser/scanner2/Scanner2.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/Scanner2.java,v
retrieving revision 1.15.2.16
diff -u -r1.15.2.16 Scanner2.java
--- parser/org/eclipse/cdt/internal/core/parser/scanner2/Scanner2.java	8 Oct 2004 20:29:01 -0000	1.15.2.16
+++ parser/org/eclipse/cdt/internal/core/parser/scanner2/Scanner2.java	21 Oct 2004 13:47:26 -0000
@@ -1715,7 +1715,7 @@
 		text = removedEscapedNewline( text, 0, text.length );
 			
 		// Throw it in
-		definitions.put(name, 	arglist == null
+		definitions.put(name, 	arglist == null || arglist[0] == null
 				? new ObjectStyleMacro(name, text)
 						: new FunctionStyleMacro(name, text, arglist) );