Patch for Victor Mozgin

Implemented correct handling of nested declarators in CModelBuilder.
Added proper support for function pointers as parameters.

core/org.eclipse.cdt.core/parser/ChangeLog

@@ -1,3 +1,8 @@
+2003-06-17 Victor Mozgin
+	Implemented correct handling of nested declarators in CModelBuilder.
+	Added proper support for function pointers as parameters.
+	This fixes PR 38921 and 39002.
+
 2003-06-14 Victor Mozgin
 	Fixed handling of parameter lists for typedefs for functions.
 	More errorhandling in CModelBuilder.

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

@@ -202,25 +202,19 @@ public class CModelBuilder {
 
 	}
 		
-	protected void createElement(Parent parent, SimpleDeclaration simpleDeclaration, Declarator declarator){
+	protected void createElement(Parent parent, SimpleDeclaration simpleDeclaration, Declarator declarator)
-        ParameterDeclarationClause pdc = declarator.getParms();
+    {
 		// typedef
 		if(simpleDeclaration.getDeclSpecifier().isTypedef()){
-			createTypeDef(parent, declarator, simpleDeclaration, pdc);
+			createTypeDef(parent, declarator, simpleDeclaration);
 		} else {
-			// variable or field
+			if (isFunctionSpecification(declarator)) {
-			if (pdc == null){	
+                // function or method 
+                createFunctionSpecification(parent, simpleDeclaration, declarator, false);
+            } else {
+                // variable or field	
 				createVariableSpecification(parent, simpleDeclaration, declarator, false); 
 			}
-			else{
-				// pointer to function 
-				if(declarator.getDeclarator() != null){
-					createPointerToFunction(parent, simpleDeclaration, declarator, pdc, false);				
-				}else {
-				// function or method 
-					createFunctionSpecification(parent, simpleDeclaration, declarator, pdc, false);
-				}
-			}
 		}				
 	}
 
@@ -232,7 +226,7 @@ public class CModelBuilder {
 		}
 		else{
 			// template of function or method
-			template = (ITemplate) createFunctionSpecification(parent, simpleDeclaration, declarator, pdc, true);
+			template = (ITemplate) createFunctionSpecification(parent, simpleDeclaration, declarator, true);
 		}
 
 		if(template != null){
@@ -400,39 +394,19 @@ public class CModelBuilder {
 		return element;
 	}
 	
-	protected TypeDef createTypeDef(Parent parent, Declarator declarator, SimpleDeclaration simpleDeclaration, ParameterDeclarationClause pdc){
+	protected TypeDef createTypeDef(Parent parent, Declarator declarator, SimpleDeclaration simpleDeclaration){
 		// create the element
-		Name domName = ( declarator.getDeclarator() != null ) ? declarator.getDeclarator().getName() : 
+		Name domName = getDOMName(declarator);
-			declarator.getName(); 
+        if (domName == null) {
+            // Something is wrong, skip this element
+            return null;             
+        }
+        
 		String declaratorName = domName.toString();
         
         TypeDef element = new TypeDef( parent, declaratorName );
-        StringBuffer typeName = new StringBuffer(getType(simpleDeclaration, declarator));
-	
-        if (pdc != null) {
-            // getParameterTypes
-            List parameterList = pdc.getDeclarations();
-            String[] parameterTypes = new String[parameterList.size()];
-
-            for (int j = 0; j < parameterList.size(); ++j) {
-                ParameterDeclaration param = (ParameterDeclaration) parameterList.get(j);
-                parameterTypes[j] = new String(getType(param, (Declarator) param.getDeclarators().get(0)));
-            }
-
-            if (parameterTypes.length > 0) {
-                typeName.append("(");
-                int i = 0;
-                typeName.append(parameterTypes[i++]);
-                while (i < parameterTypes.length) {
-                    typeName.append(", ");
-                    typeName.append(parameterTypes[i++]);
-                }
-                typeName.append(")");
-            } else {
-                typeName.append("()");
-            }
-        }
         
+        StringBuffer typeName = new StringBuffer(getType(simpleDeclaration, declarator));
 		element.setTypeName(typeName.toString());
 		
 		// add to parent
@@ -448,11 +422,9 @@ public class CModelBuilder {
 		return element;	
 	}
 
-	protected VariableDeclaration createVariableSpecification(Parent parent, SimpleDeclaration simpleDeclaration, Declarator declarator, boolean isTemplate){
+	protected VariableDeclaration createVariableSpecification(Parent parent, SimpleDeclaration simpleDeclaration, Declarator declarator, boolean isTemplate)
-		Name domName = ( declarator.getDeclarator() != null ) ? 
+    {
-			declarator.getDeclarator().getName() : 
+		Name domName = getDOMName(declarator); 
-			declarator.getName(); 
-
 		if (domName == null) {
 			// TODO : improve errorhandling
 			// When parsing syntactically incorrect code, we might
@@ -519,22 +491,21 @@ public class CModelBuilder {
 		return element;
 	}
 
-	protected FunctionDeclaration createFunctionSpecification(Parent parent, SimpleDeclaration simpleDeclaration, Declarator declarator, ParameterDeclarationClause pdc, boolean isTemplate){
+	protected FunctionDeclaration createFunctionSpecification(Parent parent, SimpleDeclaration simpleDeclaration, Declarator declarator, boolean isTemplate)
-		Name domName = ( declarator.getDeclarator() != null ) ? 
+    {
-			declarator.getDeclarator().getName() : 
+		Name domName = getDOMName(declarator);
-			declarator.getName(); 
+        if (domName == null) {
+            // Something is wrong, skip this element
+            return null;             
+        } 
 
 		String declaratorName = domName.toString();
 		DeclSpecifier declSpecifier = simpleDeclaration.getDeclSpecifier();
-		// getParameterTypes
+		
-		List parameterList = pdc.getDeclarations();
+		// get parameters types
-		String[] parameterTypes = new String[parameterList.size()];
+		String[] parameterTypes = getFunctionParameterTypes(declarator);
+		
 		FunctionDeclaration element = null;
-		for( int j = 0; j< parameterList.size(); ++j )
-		{
-			ParameterDeclaration param = (ParameterDeclaration )parameterList.get(j);
-			parameterTypes[j] = new String(getType(param, (Declarator)param.getDeclarators().get(0)));
-		}
 		
 		if( parent instanceof IStructure )
 		{
@@ -597,7 +568,7 @@ public class CModelBuilder {
 			}
 		}						
 		element.setParameterTypes(parameterTypes);
-		element.setReturnType( getType(simpleDeclaration, declarator) );
+		element.setReturnType( getFunctionReturnType(simpleDeclaration, declarator) );
 		element.setVolatile(declSpecifier.isVolatile());
 		element.setStatic(declSpecifier.isStatic());
 		element.setConst(declarator.isConst());				
@@ -618,60 +589,6 @@ public class CModelBuilder {
 		return element;
 	}
 
-	protected VariableDeclaration createPointerToFunction(Parent parent, SimpleDeclaration simpleDeclaration, Declarator declarator, ParameterDeclarationClause pdc, boolean isTemplate){
-		String declaratorName = declarator.getDeclarator().getName().toString();
-		DeclSpecifier declSpecifier = simpleDeclaration.getDeclSpecifier();
-		// getParameterTypes
-		List parameterList = pdc.getDeclarations();
-		String[] parameterTypes = new String[parameterList.size()];
-		VariableDeclaration element = null;
-		for( int j = 0; j< parameterList.size(); ++j )
-		{
-			ParameterDeclaration param = (ParameterDeclaration )parameterList.get(j);
-			parameterTypes[j] = new String(getType(param, (Declarator)param.getDeclarators().get(0)));
-		}
-		if(( parent instanceof ITranslationUnit ) 
-			|| ( parent instanceof INamespace ))
-		{		
-			element = new VariableDeclaration(parent, declaratorName);
-		} else if( parent instanceof IStructure){
-			Field newElement = new Field(parent, declaratorName);
-			newElement.setVisibility(simpleDeclaration.getAccessSpecifier().getAccess());
-			element = newElement;
-		}
-							
-		StringBuffer typeName = new StringBuffer();
-		typeName.append(getType(simpleDeclaration, declarator));
-		if(parameterTypes.length > 0){
-			typeName.append("(");
-			int i = 0;
-			typeName.append(parameterTypes[i++]);
-			while (i < parameterTypes.length){
-				typeName.append(", ");
-				typeName.append(parameterTypes[i++]);
-			}
-			typeName.append(")");
-		}
-		else{
-			typeName.append("()");
-		}
-		element.setTypeName( typeName.toString() );
-		element.setVolatile(declSpecifier.isVolatile());
-		element.setStatic(declSpecifier.isStatic());
-		element.setConst(declarator.isConst());				
-
-		// add to parent
-		parent.addChild( element ); 	
-
-		// hook up the offsets
-		element.setIdPos( declarator.getDeclarator().getName().getStartOffset(), declarator.getDeclarator().getName().length() );
-		element.setPos(simpleDeclaration.getStartingOffset(), simpleDeclaration.getTotalLength());	
-		// set the element lines
-		element.setLines(simpleDeclaration.getTopLine(), simpleDeclaration.getBottomLine());
-
-		this.newElements.put(element, element.getElementInfo());
-		return element;
-	}	
 	
 	private String[] getTemplateParameters(ITemplateParameterListOwner templateDeclaration){
 		// add the parameters
@@ -720,33 +637,140 @@ public class CModelBuilder {
 		return parameterTypes;		
 	}
 	
-	private String getType(Declaration declaration, Declarator declarator){
+	private String getType(Declaration declaration, Declarator declarator)
+	{
 		StringBuffer type = new StringBuffer();
+			
 		// get type from declaration
 		type.append(getDeclarationType(declaration));
+		
+		type.append(getSubType(declarator, new SubTypeProcessingFlags(false)));
+		
+		return type.toString();
+	}
+	
+	private String getFunctionReturnType(Declaration declaration, Declarator declarator)
+	{
+		StringBuffer type = new StringBuffer();
+		
+		// get type from declaration
+		type.append(getDeclarationType(declaration));
+	
+		type.append(getSubType(declarator, new SubTypeProcessingFlags(true)));
+	
+		return type.toString();
+	}
+    
+    private class SubTypeProcessingFlags {
+        boolean returnTypeForFunction = false;
+        boolean processedInnermostParameterList = false;
+        
+        SubTypeProcessingFlags(boolean returnTypeForFunction) {
+            this.returnTypeForFunction = returnTypeForFunction;
+        }
+    }
+	
+	private String getSubType(Declarator declarator, SubTypeProcessingFlags flags) {
+		StringBuffer type = new StringBuffer();
+						
 		// add pointer or reference from declarator if any
-        String declaratorPointerOperation = getDeclaratorPointerOperation(declarator);
+		String declaratorPointerOperation = getDeclaratorPointerOperation(declarator);
-        try  {
+		try  {
-            switch (declaratorPointerOperation.charAt(0)) {
+			switch (declaratorPointerOperation.charAt(0)) {
-                case '*':
+				case '*':
-                case '&':
+				case '&':
-                    break; // pointer/reference
+					break; // pointer/reference
-                default:
+				default:
-                    type.append(" "); // pointer to member
+					type.append(" "); // pointer to member
-            }
+			}
-        } catch (Exception e) {} // Empty/null strings
+		} catch (Exception e) {} // Empty/null strings
 		type.append(declaratorPointerOperation);
-		if(declarator.getDeclarator() != null){
+        
-			// pointer to function or array of functions
+        String subType = null;
-			type.append("(");
+						
-			// add pointer or reference from declarator if any
+		if (declarator.getDeclarator() != null){
-			type.append(getDeclaratorPointerOperation(declarator.getDeclarator()));
+			// process inner declarator
-			type.append(")");
+			subType = getSubType(declarator.getDeclarator(), flags);
+			boolean appendParen = true;
+			
+			if (  (subType == null) || (subType.length() == 0)
+			    ||
+			    	((subType.charAt(0) == '(') 
+			      && 
+			        (subType.charAt(subType.length()-1) == ')'))) {
+			        	
+			        		// Additional () are not necessary
+			        		appendParen = false;
+	        }
+			
+			if (appendParen) type.append("(");
+			type.append(subType);
+			if (appendParen) type.append(")");
+		}			
+			
+		// parameters
+		if (declarator.getParms() != null) { 
+            // If we process return type for a function,
+            // skip innermost parameter list - it is a part
+            // of function's signature
+            if ( !flags.returnTypeForFunction 
+               || flags.processedInnermostParameterList) {
+                   
+                   if ((subType == null) || (subType.length() == 0)) {
+                       type.append("()");
+                   }
+
+                   type.append(getParametersString(declarator));
+            }
+            flags.processedInnermostParameterList = true;
 		}
+				 
 		// arrays
 		type.append(getDeclaratorArrayQualifiers(declarator));
-		return type.toString();		
+			
+		return type.toString();
 	}
+    
+    
+    /**
+     *  Here is a tricky one. Determines if a declarator represents a function
+     * specification, or a variable declaration (that includes pointers to functions).
+     * If none of the nested declarators contain parameter list, then it is obviously a variable.
+     * It is a function specification only if no declarators in (A..B] range
+     * contain any pointer/array specificators. A is the declarator containing 
+     * the innermost parameter list (which corresponds to parameters of the function),
+     * and B is the innermost declarator (should contain the name of the element).
+     * 
+     * @param declarator
+     * @return True, if the declarator represents a function specification
+     */
+    
+    private boolean isFunctionSpecification(Declarator declarator)
+    {
+        Declarator currentDeclarator = declarator;
+        boolean result = false;
+        
+        while (currentDeclarator != null) {
+            if (currentDeclarator.getParms() != null) {
+                result = true;
+            } else {          
+                List ptrOps = currentDeclarator.getPointerOperators();
+                List arrayQs = currentDeclarator.getArrayQualifiers();
+                
+                if (    ((ptrOps != null) && (ptrOps.size() > 0)) 
+                     || ((arrayQs != null) && (arrayQs.size() > 0)) 
+                   )  
+                   {
+                    result = false;
+                } 
+            }
+            
+            currentDeclarator = currentDeclarator.getDeclarator();
+        }
+        
+        return result;
+    }
+
 	
 	private String getDeclarationType(Declaration declaration){
 		StringBuffer type = new StringBuffer();
@@ -847,4 +871,83 @@ public class CModelBuilder {
 		}
 		return arrayString.toString();
 	}
+	
+	
+	private String[] getParameterTypes(Declarator declarator) 
+	{	
+		if (declarator == null) return null;
+		
+		ParameterDeclarationClause pdc = declarator.getParms();
+		String[] parameterTypes = null;
+		
+		if (pdc != null) {
+			List parameterList = pdc.getDeclarations();
+			parameterTypes = new String[parameterList.size()];
+
+			for (int j = 0; j < parameterList.size(); ++j) {
+				ParameterDeclaration param = (ParameterDeclaration) parameterList.get(j);
+				parameterTypes[j] =	getType(param, (Declarator) param.getDeclarators().get(0));
+			}
+		}
+		
+		return parameterTypes;
+	}
+    
+    private String[] getFunctionParameterTypes(Declarator declarator)
+    {
+        Declarator currentDeclarator = declarator;
+        Declarator innermostPDCDeclarator = null;
+
+        while (currentDeclarator != null) {
+            if (currentDeclarator.getParms() != null) {
+                innermostPDCDeclarator = currentDeclarator;
+            }
+            currentDeclarator = currentDeclarator.getDeclarator();
+        }
+
+        return getParameterTypes(innermostPDCDeclarator);
+    }
+	
+	private String getParametersString(String[] parameterTypes) 
+	{
+		StringBuffer parameters = new StringBuffer("");
+		
+		if ((parameterTypes != null) && (parameterTypes.length > 0)) {
+			parameters.append("(");
+			int i = 0;
+			parameters.append(parameterTypes[i++]);
+			while (i < parameterTypes.length) {
+				parameters.append(", ");
+				parameters.append(parameterTypes[i++]);
+			}
+			parameters.append(")");
+		} else {
+			if (parameterTypes != null) parameters.append("()");
+		}
+		
+		return parameters.toString();
+	}
+	
+	private String getParametersString(Declarator declarator) 
+	{
+		return getParametersString(getParameterTypes(declarator));
+	}
+    
+    private Name getDOMName(Declarator declarator) 
+    {
+        Declarator currentDeclarator = declarator;
+        Name name = null;
+        
+        if (currentDeclarator != null) {
+            while (currentDeclarator.getDeclarator() != null) {
+                currentDeclarator = currentDeclarator.getDeclarator();
+            }
+        }
+        // The innermost declarator must contain the name
+        if (currentDeclarator != null) {
+               name = currentDeclarator.getName();
+        }
+        
+        return name;
+    }
 }

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

@@ -8,6 +8,10 @@
 	Added class AISResultPrinter to format test results.  
 	Class AutomatedIntegrationSuite now implements IPlatformRunnable.
 
+2003-06-17 Victor Mozgin
+	Added DeclaratorsTests.java (invocation in AllCoreTests).
+	Added DeclaratorsTests.cpp to org.eclipse.cdt.core.model.tests.resources.
+
 2003-06-14 Victor Mozgin
 	Moved testBugSingleton192() from LokiFailures to DOMTests.
 	Added testPointersToMembers() and testPointersToMemberFunctions() to DOMTests.

core/org.eclipse.cdt.ui.tests/model/org.eclipse.cdt.core.model.tests.resources/DeclaratorsTests.cpp

@@ -0,0 +1,24 @@
+void decl_0001(char);
+void (decl_0002)(char);
+void ((decl_0003))(char);
+
+void *decl_0004(char);
+void (*decl_0005)(char);
+void (*(decl_0006))(char);
+void ((*decl_0007))(char);
+
+typedef void decl_0011(char);
+typedef void (decl_0012)(char);
+typedef void ((decl_0013))(char);
+
+typedef void *decl_0014(char);
+typedef void (*decl_0015)(char);
+typedef void (*(decl_0016))(char);
+typedef void ((*decl_0017))(char);
+
+typedef void decl_0021(char);
+void (*decl_0022)(char);
+void (*(*decl_0023(int a)))(char) { return &decl_0021; }
+void (*(*(*((decl_0024)))(int))(float))(char);
+
+int (*decl_0031)(char(*yyy)(bool));

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

@@ -35,6 +35,7 @@ public class AllCoreTests {
         suite.addTest(FlagTests.suite());
         suite.addTest(ArchiveTests.suite());
         suite.addTest(TranslationUnitTests.suite());
+        suite.addTest(DeclaratorsTests.suite());
 		
         return suite;
         

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

@@ -304,6 +304,12 @@ public class CModelElementsTests extends TestCase {
 		assertEquals(var3.getElementName(), new String("vuShort"));
 		assertEquals(var3.getTypeName(), new String("unsigned short "));
 		checkLineNumbers((CElement)var3, 75, 75);
+		
+		// MyPackage ---> function pointer: orig_malloc_hook
+		IVariable vDecl2 = (IVariable) nsVars.get(3);
+		assertEquals(vDecl2.getElementName(), new String("orig_malloc_hook"));
+		assertEquals(vDecl2.getTypeName(), new String ("void*(*)(const char*, int, size_t)"));
+		checkLineNumbers((CElement)vDecl2, 81, 81);
 	}
 
 	private void checkVariableDeclarations(IParent namespace){
@@ -313,12 +319,6 @@ public class CModelElementsTests extends TestCase {
 		assertEquals(vDecl1.getElementName(), new String("evar"));
 		assertEquals(vDecl1.getTypeName(), new String("int"));
 		checkLineNumbers((CElement)vDecl1, 79, 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)"));
-		checkLineNumbers((CElement)vDecl2, 81, 81);
 	}
 	
 	private void checkFunctions(IParent namespace){

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

@@ -0,0 +1,212 @@
+/*
+ * Created on Jun 9, 2003
+ * by bnicolle
+ */
+package org.eclipse.cdt.core.model.tests;
+
+import org.eclipse.cdt.core.model.CModelException;
+import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.core.model.IFunction;
+import org.eclipse.cdt.core.model.IFunctionDeclaration;
+import org.eclipse.cdt.core.model.ITranslationUnit;
+import org.eclipse.cdt.core.model.ITypeDef;
+import org.eclipse.cdt.core.model.IVariable;
+
+
+import junit.framework.*;
+
+
+/**
+ * @author bnicolle
+ *
+ */
+public class DeclaratorsTests extends IntegratedCModelTest {
+	/**
+	 * @param name
+	 */
+	public DeclaratorsTests(String name) {
+		super(name);
+	}
+	
+	/**
+	 * @see org.eclipse.cdt.internal.core.model.IntegratedCModelTest
+	 */
+	public String getSourcefileSubdir() {
+		return "model/org.eclipse.cdt.core.model.tests.resources/";
+	}
+
+	/**
+	 * @see org.eclipse.cdt.internal.core.model.IntegratedCModelTest
+	 */
+	public String getSourcefileResource() {
+		return "DeclaratorsTests.cpp";
+	}
+	
+	/**
+	 * @returns a test suite named after this class
+	 *          containing all its public members named "test*"
+	 */
+	public static Test suite() {
+		TestSuite suite= new TestSuite(DeclaratorsTests.class);
+		return suite;
+	}
+
+
+    public void testDeclarators_0001() throws CModelException {
+        ITranslationUnit tu = getTU();
+        ICElement element = tu.getElement("decl_0001");
+        assertNotNull(element);
+        assertEquals(element.getElementType(), ICElement.C_FUNCTION_DECLARATION);
+        IFunctionDeclaration decl = (IFunctionDeclaration)element;
+        assertEquals(decl.getSignature(), "decl_0001(char)");
+        assertEquals(decl.getReturnType(), "void");
+    }
+
+    public void testDeclarators_0002() throws CModelException {
+        ITranslationUnit tu = getTU();
+        ICElement element = tu.getElement("decl_0002");
+        assertNotNull(element);
+        assertEquals(element.getElementType(), ICElement.C_FUNCTION_DECLARATION);
+        IFunctionDeclaration decl = (IFunctionDeclaration)element;
+        assertEquals(decl.getSignature(), "decl_0002(char)");
+        assertEquals(decl.getReturnType(), "void");
+    }
+
+    public void testDeclarators_0003() throws CModelException {
+        ITranslationUnit tu = getTU();
+        ICElement element = tu.getElement("decl_0003");
+        assertNotNull(element);
+        assertEquals(element.getElementType(), ICElement.C_FUNCTION_DECLARATION);
+        IFunctionDeclaration decl = (IFunctionDeclaration)element;
+        assertEquals(decl.getSignature(), "decl_0003(char)");
+        assertEquals(decl.getReturnType(), "void");
+    }
+
+    public void testDeclarators_0004() throws CModelException {
+        ITranslationUnit tu = getTU();
+        ICElement element = tu.getElement("decl_0004");
+        assertNotNull(element);
+        assertEquals(element.getElementType(), ICElement.C_FUNCTION_DECLARATION);
+        IFunctionDeclaration decl = (IFunctionDeclaration)element;
+        assertEquals(decl.getSignature(), "decl_0004(char)");
+        assertEquals(decl.getReturnType(), "void*");
+    }
+
+    public void testDeclarators_0005() throws CModelException {
+        ITranslationUnit tu = getTU();
+        ICElement element = tu.getElement("decl_0005");
+        assertNotNull(element);
+        assertEquals(element.getElementType(), ICElement.C_VARIABLE);
+        IVariable decl = (IVariable)element;
+        assertEquals(decl.getTypeName(), "void(*)(char)");
+    }
+
+    public void testDeclarators_0006() throws CModelException {
+        ITranslationUnit tu = getTU();
+        ICElement element = tu.getElement("decl_0006");
+        assertNotNull(element);
+        assertEquals(element.getElementType(), ICElement.C_VARIABLE);
+        IVariable decl = (IVariable)element;
+        assertEquals(decl.getTypeName(), "void(*)(char)");
+    }
+
+    public void testDeclarators_0007() throws CModelException {
+        ITranslationUnit tu = getTU();
+        ICElement element = tu.getElement("decl_0007");
+        assertNotNull(element);
+        assertEquals(element.getElementType(), ICElement.C_VARIABLE);
+        IVariable decl = (IVariable)element;
+        assertEquals(decl.getTypeName(), "void(*)(char)");
+    }
+
+	public void testDeclarators_0011() throws CModelException {
+		ITranslationUnit tu = getTU();
+        ICElement element = tu.getElement("decl_0011");
+        assertNotNull(element);
+        assertEquals(element.getElementType(), ICElement.C_TYPEDEF);
+        ITypeDef decl = (ITypeDef)element;
+        assertEquals(decl.getTypeName(), "void()(char)");
+	}
+    
+    public void testDeclarators_0012() throws CModelException {
+        ITranslationUnit tu = getTU();
+        ICElement element = tu.getElement("decl_0012");
+        assertNotNull(element);
+        assertEquals(element.getElementType(), ICElement.C_TYPEDEF);
+        ITypeDef decl = (ITypeDef)element;
+        assertEquals(decl.getTypeName(), "void()(char)");
+    }
+
+    public void testDeclarators_0013() throws CModelException {
+        ITranslationUnit tu = getTU();
+        ICElement element = tu.getElement("decl_0013");
+        assertNotNull(element);
+        assertEquals(element.getElementType(), ICElement.C_TYPEDEF);
+        ITypeDef decl = (ITypeDef)element;
+        assertEquals(decl.getTypeName(), "void()(char)");
+    }
+
+    public void testDeclarators_0014() throws CModelException {
+        ITranslationUnit tu = getTU();
+        ICElement element = tu.getElement("decl_0014");
+        assertNotNull(element);
+        assertEquals(element.getElementType(), ICElement.C_TYPEDEF);
+        ITypeDef decl = (ITypeDef)element;
+        assertEquals(decl.getTypeName(), "void*()(char)");
+    }
+
+    public void testDeclarators_0015() throws CModelException {
+        ITranslationUnit tu = getTU();
+        ICElement element = tu.getElement("decl_0015");
+        assertNotNull(element);
+        assertEquals(element.getElementType(), ICElement.C_TYPEDEF);
+        ITypeDef decl = (ITypeDef)element;
+        assertEquals(decl.getTypeName(), "void(*)(char)");
+    }
+    
+    public void testDeclarators_0016() throws CModelException {
+        ITranslationUnit tu = getTU();
+        ICElement element = tu.getElement("decl_0016");
+        assertNotNull(element);
+        assertEquals(element.getElementType(), ICElement.C_TYPEDEF);
+        ITypeDef decl = (ITypeDef)element;
+        assertEquals(decl.getTypeName(), "void(*)(char)");
+    }
+    
+    public void testDeclarators_0017() throws CModelException {
+        ITranslationUnit tu = getTU();
+        ICElement element = tu.getElement("decl_0017");
+        assertNotNull(element);
+        assertEquals(element.getElementType(), ICElement.C_TYPEDEF);
+        ITypeDef decl = (ITypeDef)element;
+        assertEquals(decl.getTypeName(), "void(*)(char)");
+    }
+    
+    public void testDeclarators_0023() throws CModelException {
+        ITranslationUnit tu = getTU();
+        ICElement element = tu.getElement("decl_0023");
+        assertNotNull(element);
+        assertEquals(element.getElementType(), ICElement.C_FUNCTION);
+        IFunction decl = (IFunction)element;
+        assertEquals(decl.getSignature(), "decl_0023(int)");
+        assertEquals(decl.getReturnType(), "void(*(*))(char)");
+    }    
+
+    public void testDeclarators_0024() throws CModelException {
+        ITranslationUnit tu = getTU();
+        ICElement element = tu.getElement("decl_0024");
+        assertNotNull(element);
+        assertEquals(element.getElementType(), ICElement.C_VARIABLE);
+        IVariable decl = (IVariable)element;
+        assertEquals(decl.getTypeName(), "void(*(*(*)(int))(float))(char)");
+    }    
+    
+    public void testDeclarators_0031() throws CModelException {
+        ITranslationUnit tu = getTU();
+        ICElement element = tu.getElement("decl_0031");
+        assertNotNull(element);
+        assertEquals(element.getElementType(), ICElement.C_VARIABLE);
+        IVariable decl = (IVariable)element;
+        assertEquals(decl.getTypeName(), "int(*)(char(*)(bool))");
+    }
+}