Patch for Hoda Amer:

"Function template with body" bug fix + JUnit test

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/CModelBuilder.java

@@ -481,8 +481,13 @@ public class CModelBuilder {
 				// this will not be known until we have cross reference information
 				
 				// function
-				Function newElement = new Function( parent, declaratorName );
+				if(!isTemplate){
-				element = newElement;				
+					Function newElement = new Function( parent, declaratorName );
+					element = newElement;				
+				} else {
+					FunctionTemplate newElement = new FunctionTemplate( parent, declaratorName );
+					element = newElement;
+				}
 			}
 			else
 			{

core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/CModelElementsTests.java

@@ -120,6 +120,8 @@ public class CModelElementsTests extends TestCase {
 		ArrayList tuPackages = tu.getChildrenOfType(ICElement.C_NAMESPACE);
 		INamespace namespace = (INamespace) tuPackages.get(0);
 		assertEquals(namespace.getElementName(), new String("MyPackage"));
+		assertEquals(namespace.getStartLine(), 8);
+		assertEquals(namespace.getEndLine(), 121);
 		
 		checkClass(namespace);
 				
@@ -142,12 +144,16 @@ public class CModelElementsTests extends TestCase {
 		ArrayList tuIncludes = tu.getChildrenOfType(ICElement.C_INCLUDE);
 		IInclude inc1 = (IInclude) tuIncludes.get(0);
 		assertEquals(inc1.getElementName(), new String("stdio.h"));
+		assertEquals(inc1.getStartLine(), 2);
+		assertEquals(inc1.getEndLine(), 2);
 	}
 	
 	private void checkMacro(IParent tu){
 		ArrayList tuMacros = tu.getChildrenOfType(ICElement.C_MACRO);
 		IMacro mac1 = (IMacro) tuMacros.get(0);
 		assertEquals(mac1.getElementName(), new String("PRINT"));
+		assertEquals(mac1.getStartLine(), 5);
+		assertEquals(mac1.getEndLine(), 5);
 	}
 	
 	private void checkClass(IParent namespace){
@@ -155,12 +161,17 @@ public class CModelElementsTests extends TestCase {
 		ArrayList nsClasses = namespace.getChildrenOfType(ICElement.C_CLASS);		
 		IStructure classHello = (IStructure) nsClasses.get(0);
 		assertEquals(classHello.getElementName(), new String("Hello"));
+		assertEquals(classHello.getStartLine(), 12);
+		assertEquals(classHello.getEndLine(), 53);
 		
 		// Hello --> field: int x
 		ArrayList helloFields = classHello.getChildrenOfType(ICElement.C_FIELD);
 		IField intX = (IField) helloFields.get(0);
 		assertEquals(intX.getElementName(), new String("x"));
 		assertEquals(intX.getTypeName(), new String("int"));
+		assertEquals(intX.getStartLine(), 17);
+		assertEquals(intX.getEndLine(), 17);
+		
 		int xVisibility = intX.getVisibility(); 
 		if (xVisibility != IMember.V_PROTECTED)
 			fail("visibility should be protected!");
@@ -170,6 +181,8 @@ public class CModelElementsTests extends TestCase {
 		IMethod setX = (IMethod) helloMethods.get(0);
 		assertEquals(setX.getElementName(), new String("setX"));
 		assertEquals(setX.getReturnType(), new String("void"));
+		assertEquals(setX.getStartLine(), 19);
+		assertEquals(setX.getEndLine(), 22);
 		int setXNumOfParam = setX.getNumberOfParameters();
 		if(setXNumOfParam != 1)
 			fail("setX should have one parameter!");
@@ -185,7 +198,9 @@ public class CModelElementsTests extends TestCase {
 		ArrayList helloNamespaces = classHello.getChildrenOfType(ICElement.C_NAMESPACE);
 		INamespace myNestedPackage = (INamespace) helloNamespaces.get(0);
 		assertEquals(myNestedPackage.getElementName(), new String("MyNestedPackage"));
-	
+		assertEquals(myNestedPackage.getStartLine(), 25);
+		assertEquals(myNestedPackage.getEndLine(), 52);
+
 		checkParentNestedClass(myNestedPackage);	
 		checkDerivedNestedClass(myNestedPackage);
 	}
@@ -194,17 +209,23 @@ public class CModelElementsTests extends TestCase {
 		ArrayList nestedClasses = myNestedPackage.getChildrenOfType(ICElement.C_CLASS);		
 		IStructure classY = (IStructure) nestedClasses.get(0);
 		assertEquals(classY.getElementName(), new String("Y"));
+		assertEquals(classY.getStartLine(), 28);
+		assertEquals(classY.getEndLine(), 35);
 		
 		// Y ---> constructor: Y
 		ArrayList yMethods = classY.getChildrenOfType(ICElement.C_METHOD_DECLARATION);
 		IMethodDeclaration constructor  = (IMethodDeclaration) yMethods.get(0);
 		assertEquals(constructor.getElementName(), new String("Y"));
 		assertTrue (constructor.isConstructor());
+		assertEquals(constructor.getStartLine(), 32);
+		assertEquals(constructor.getEndLine(), 32);
 		
 		// Y ---> destructor: ~Y
 		IMethodDeclaration destructor  = (IMethodDeclaration) yMethods.get(1);
 		assertEquals(destructor.getElementName(), new String("~Y"));
 		assertTrue (destructor.isDestructor());
+		assertEquals(destructor.getStartLine(), 34);
+		assertEquals(destructor.getEndLine(), 34);
 		// TODO: check for virtual on destructors
 		
 	}
@@ -214,6 +235,8 @@ public class CModelElementsTests extends TestCase {
 		ArrayList nestedClasses = myNestedPackage.getChildrenOfType(ICElement.C_CLASS);		
 		IStructure classX = (IStructure) nestedClasses.get(1);
 		assertEquals(classX.getElementName(), new String("X"));
+		assertEquals(classX.getStartLine(), 38);
+		assertEquals(classX.getEndLine(), 51);
 		// TODO : Check for base classes here
 		
 		// X --> field: B b
@@ -221,6 +244,8 @@ public class CModelElementsTests extends TestCase {
 		IField bB = (IField) xFieldChildren.get(0);
 		assertEquals(bB.getElementName(), new String("b"));
 		assertEquals(bB.getTypeName(), new String("B"));
+		assertEquals(bB.getStartLine(), 42);
+		assertEquals(bB.getEndLine(), 42);
 		int bVisibility = bB.getVisibility(); 
 		if (bVisibility != IMember.V_PRIVATE)
 			fail("visibility should be private!");
@@ -230,12 +255,16 @@ public class CModelElementsTests extends TestCase {
 		IMethod xconstructor  = (IMethod) xMethodChildren.get(0);
 		assertEquals(xconstructor.getElementName(), new String("X"));
 		assertTrue (xconstructor.isConstructor());
+		assertEquals(xconstructor.getStartLine(), 46);
+		assertEquals(xconstructor.getEndLine(), 48);
 
 		// X ---> method declaration: doNothing
 		ArrayList xMethodDeclarations = classX.getChildrenOfType(ICElement.C_METHOD_DECLARATION);
 		IMethodDeclaration xDoNothing = (IMethodDeclaration) xMethodDeclarations.get(0);
 		assertEquals(xDoNothing.getElementName(), new String("doNothing"));
 		assertEquals(xDoNothing.getReturnType(), new String("int"));						
+		assertEquals(xDoNothing.getStartLine(), 50);
+		assertEquals(xDoNothing.getEndLine(), 50);
 	}
 	
 	private void checkEnums(IParent namespace){
@@ -243,6 +272,10 @@ public class CModelElementsTests extends TestCase {
 		ArrayList nsEnums = namespace.getChildrenOfType(ICElement.C_ENUMERATION);		
 		IEnumeration enum = (IEnumeration) nsEnums.get(0);
 		assertEquals(enum.getElementName(), new String(""));
+		int enumstart = enum.getStartLine();
+		int enumend = enum.getEndLine();
+		assertEquals(enum.getStartLine(), 57);
+		assertEquals(enum.getEndLine(), 61);
 	
 		// 	enum ---> enumerator: first
 		ArrayList enumEnumerators = enum.getChildrenOfType(ICElement.C_ENUMERATOR);
@@ -258,6 +291,10 @@ public class CModelElementsTests extends TestCase {
 		// MyPackage ---> enum: MyEnum
 		IEnumeration myEnum = (IEnumeration) nsEnums.get(1);
 		assertEquals(myEnum.getElementName(), new String("MyEnum"));
+		enumstart = myEnum.getStartLine();
+		enumend = myEnum.getEndLine();
+		assertEquals(myEnum.getStartLine(), 64);
+		assertEquals(myEnum.getEndLine(), 67);
 	
 		// 	enum ---> enumerator: first
 		ArrayList myEnumEnumerators = myEnum.getChildrenOfType(ICElement.C_ENUMERATOR);
@@ -277,16 +314,23 @@ public class CModelElementsTests extends TestCase {
 		IVariable var1 = (IVariable) nsVars.get(0);
 		assertEquals(var1.getElementName(), new String("v"));
 		assertEquals(var1.getTypeName(), new String("int"));
+		assertEquals(var1.getStartLine(), 71);
+		assertEquals(var1.getEndLine(), 71);
 		
 		// MyPackage ---> unsigned long vuLong
 		IVariable var2 = (IVariable) nsVars.get(1);
 		assertEquals(var2.getElementName(), new String("vuLong"));
 		assertEquals(var2.getTypeName(), new String("unsigned long "));
+		assertEquals(var2.getStartLine(), 73);
+		assertEquals(var2.getEndLine(), 73);
 		
 		// MyPackage ---> unsigned short vuShort
 		IVariable var3 = (IVariable) nsVars.get(2);
 		assertEquals(var3.getElementName(), new String("vuShort"));
 		assertEquals(var3.getTypeName(), new String("unsigned short "));
+		assertEquals(var3.getStartLine(), 75);
+		assertEquals(var3.getEndLine(), 75);
+		
 	}
 
 	private void checkVariableDeclarations(IParent namespace){
@@ -295,11 +339,15 @@ public class CModelElementsTests extends TestCase {
 		IVariableDeclaration vDecl1 = (IVariableDeclaration) nsVarDecls.get(0);
 		assertEquals(vDecl1.getElementName(), new String("evar"));
 		assertEquals(vDecl1.getTypeName(), new String("int"));
+		assertEquals(vDecl1.getStartLine(), 79);
+		assertEquals(vDecl1.getEndLine(), 79);
 
 		// MyPackage ---> function pointer: orig_malloc_hook
 		IVariableDeclaration vDecl2 = (IVariableDeclaration) nsVarDecls.get(1);
 		assertEquals(vDecl2.getElementName(), new String("orig_malloc_hook"));
 		assertEquals(vDecl2.getTypeName(), new String ("void*(*)(const char*, int, size_t)"));
+		assertEquals(vDecl2.getStartLine(), 81);
+		assertEquals(vDecl2.getEndLine(), 81);
 	}
 	
 	private void checkFunctions(IParent namespace){
@@ -308,11 +356,15 @@ public class CModelElementsTests extends TestCase {
 		IFunctionDeclaration f1 = (IFunctionDeclaration) nsFunctionDeclarations.get(0);
 		assertEquals(f1.getElementName(), new String("foo"));
 		assertEquals(f1.getReturnType(), new String("void"));
+		assertEquals(f1.getStartLine(), 85);
+		assertEquals(f1.getEndLine(), 85);
 		
 		//	MyPackage ---> function: char* foo(int&, char**)
 		IFunctionDeclaration f2 = (IFunctionDeclaration) nsFunctionDeclarations.get(1);
 		assertEquals(f2.getElementName(), new String("foo"));
 		assertEquals(f2.getReturnType(), new String("char*"));
+		assertEquals(f2.getStartLine(), 87);
+		assertEquals(f2.getEndLine(), 88);
 		int fooNumOfParam = f2.getNumberOfParameters();
 		if(fooNumOfParam != 2)
 			fail("foo should have two parameter!");
@@ -325,6 +377,8 @@ public class CModelElementsTests extends TestCase {
 		IFunction f3 = (IFunction) nsFunctions.get(0);		
 		assertEquals(f3.getElementName(), new String("boo"));
 		assertEquals(f3.getReturnType(), new String("void"));
+		assertEquals(f3.getStartLine(), 90);
+		assertEquals(f3.getEndLine(), 92);		
 	}
 
 	private void checkStructs(IParent namespace){
@@ -332,20 +386,29 @@ public class CModelElementsTests extends TestCase {
 		ArrayList nsStructs = namespace.getChildrenOfType(ICElement.C_STRUCT);
 		IStructure struct1 = (IStructure) nsStructs.get(0);
 		assertEquals(struct1.getElementName(), new String ("MyStruct"));
+		assertEquals(struct1.getStartLine(), 95);
+		assertEquals(struct1.getEndLine(), 97);		
 		ArrayList struct1Fields = struct1.getChildrenOfType(ICElement.C_FIELD);
 		IField field1 = (IField) struct1Fields.get(0);
 		assertEquals(field1.getElementName(), new String("sint"));
 		assertEquals(field1.getTypeName(), new String("int"));
+		assertEquals(field1.getStartLine(), 96);
+		assertEquals(field1.getEndLine(), 96);		
+		
 		if(field1.getVisibility() != IMember.V_PUBLIC)
 			fail("field visibility should be public!");
 		
 		// struct no name
 		IStructure struct2 = (IStructure) nsStructs.get(1);
 		assertEquals(struct2.getElementName(), new String (""));
+		assertEquals(struct2.getStartLine(), 101);
+		assertEquals(struct2.getEndLine(), 103);		
 		ArrayList struct2Fields = struct2.getChildrenOfType(ICElement.C_FIELD);
 		IField field2 = (IField) struct2Fields.get(0);
 		assertEquals(field2.getElementName(), new String("ss"));
 		assertEquals(field2.getTypeName(), new String("int"));
+		assertEquals(field2.getStartLine(), 102);
+		assertEquals(field2.getEndLine(), 102);		
 		if(field2.getVisibility() != IMember.V_PUBLIC)
 			fail("field visibility should be public!");
 		
@@ -354,18 +417,26 @@ public class CModelElementsTests extends TestCase {
 		ITypeDef td1 = (ITypeDef) nsTypeDefs.get(0);
 		assertEquals(td1.getElementName(), new String ("myStruct"));
 		assertEquals(td1.getTypeName(), new String ("struct MyStruct"));
+		assertEquals(td1.getStartLine(), 99);
+		assertEquals(td1.getEndLine(), 99);
 		ITypeDef td2 = (ITypeDef) nsTypeDefs.get(1);
 		assertEquals(td2.getElementName(), new String ("myTypedef"));
 		assertEquals(td2.getTypeName(), new String (""));
+		assertEquals(td2.getStartLine(), 101);
+		assertEquals(td2.getEndLine(), 103);
 
 		// union
 		ArrayList nsUnions = namespace.getChildrenOfType(ICElement.C_UNION);
 		IStructure u0 = (IStructure) nsUnions.get(0);
 		assertEquals(u0.getElementName(), new String("U"));		
+		assertEquals(u0.getStartLine(), 105);
+		assertEquals(u0.getEndLine(), 107);
 		ArrayList u0Fields = u0.getChildrenOfType(ICElement.C_FIELD);
 		IField field3 = (IField) u0Fields.get(0);
 		assertEquals(field3.getElementName(), new String("U1"));
 		assertEquals(field3.getTypeName(), new String("int"));
+		assertEquals(field3.getStartLine(), 106);
+		assertEquals(field3.getEndLine(), 106);
 		if(field3.getVisibility() != IMember.V_PUBLIC)
 			fail("field visibility should be public!");
 	}
@@ -376,14 +447,20 @@ public class CModelElementsTests extends TestCase {
 		FunctionTemplate ft = (FunctionTemplate)functionTemplates.get(0);
 		assertEquals(ft.getElementName(), new String("aTemplatedFunction"));
 		assertEquals(ft.getTemplateSignature(), new String("aTemplatedFunction<A, B>(B) : A"));
+		assertEquals(ft.getStartLine(), 112);
+		assertEquals(ft.getEndLine(), 112);
 		
 		// template method
 		ArrayList nsClasses = namespace.getChildrenOfType(ICElement.C_CLASS);
 		IStructure enclosingClass = (IStructure) nsClasses.get(1);
+		assertEquals(enclosingClass.getStartLine(), 114);
+		assertEquals(enclosingClass.getEndLine(), 118);		
 		ArrayList methodTemplates = enclosingClass.getChildrenOfType(ICElement.C_TEMPLATE_METHOD);
 		MethodTemplate mt = (MethodTemplate)methodTemplates.get(0);
 		assertEquals(mt.getElementName(), new String("aTemplatedMethod"));
 		assertEquals(mt.getTemplateSignature(), new String("aTemplatedMethod<A, B>(B) : A"));
+		assertEquals(mt.getStartLine(), 117);
+		assertEquals(mt.getEndLine(), 117);
 		assertEquals(mt.getVisibility(), IMember.V_PUBLIC);
 		
 		// template class
@@ -391,6 +468,8 @@ public class CModelElementsTests extends TestCase {
 		ClassTemplate ct = (ClassTemplate)classTemplates.get(0);
 		assertEquals(ct.getElementName(), new String("myarray"));
 		assertEquals(ct.getTemplateSignature(), new String("myarray<T, Tibor>"));
+		assertEquals(ct.getStartLine(), 120);
+		assertEquals(ct.getEndLine(), 120);
 	}
 	
 	private void checkArrays(IParent tu){
@@ -399,12 +478,16 @@ public class CModelElementsTests extends TestCase {
 		IVariable arrayVar = (IVariable) variables.get(0);
 		assertEquals(arrayVar.getElementName(), new String("myArray"));
 		assertEquals(arrayVar.getTypeName(), new String("int[][]"));
+		assertEquals(arrayVar.getStartLine(), 125);
+		assertEquals(arrayVar.getEndLine(), 125);
 		
 		// array parameter in function main
 		ArrayList functions = tu.getChildrenOfType(ICElement.C_FUNCTION);
 		IFunction mainFunction  = (IFunction) functions.get(0);
 		assertEquals(mainFunction.getElementName(), new String("main"));
 		assertEquals(mainFunction.getReturnType(), new String("int"));
+		assertEquals(mainFunction.getStartLine(), 126);
+		assertEquals(mainFunction.getEndLine(), 128);
 		int NumOfParam = mainFunction.getNumberOfParameters();
 		if(NumOfParam != 2)
 			fail("main should have two parameter!");

core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/resources/cfiles/CModelElementsTestStart.h

@@ -54,9 +54,17 @@ namespace MyPackage
 
 	// check enums
 	// enum without name
-	enum { first, second, third };
+	enum { 
+		first, 
+		second, 
+		third 
+	}
+	;
 	// enum with name
-	enum MyEnum { f, s, t };
+	enum MyEnum { 
+		f, 
+		s, 
+		t };
 
 	// check variables
 	// variable 
@@ -76,12 +84,12 @@ namespace MyPackage
 	// simple function declaration
 	void foo();
 	// function declaration with parameters
-	char* foo(int& x, char**y);
+	char* foo(int& x, 
+		char**y);
 	// simple function definition
 	void boo(){
 		int g = 0;
 	};
-
 	// check Structs
 	// struct 
 	struct MyStruct{
@@ -90,7 +98,9 @@ namespace MyPackage
 	// typedef and elaborated types
 	typedef struct MyStruct myStruct;
 	// typedef 
-	typedef struct{ int ss; } myTypedef;
+	typedef struct{ 
+		int ss; 
+	} myTypedef;
 	// unions
 	union U{
 		int U1;
@@ -113,6 +123,8 @@ namespace MyPackage
 	// check arrays
 	// arrays
 	int myArray [5][];
-	int main(int argc, char * argv[]) { }
+	int main(int argc, char * argv[]) 
+	{ 
+	}